clean up tech debt, bump dependencies

core/startos/src/auth.rs

@@ -24,7 +24,6 @@ use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 use crate::{ensure_code, Error, ResultExt};
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize, TS)]
-#[ts(as = "BTreeMap::<String, Session>")]
 pub struct Sessions(pub BTreeMap<InternedString, Session>);
 impl Sessions {
     pub fn new() -> Self {

core/startos/src/db/model/package.rs

@@ -375,7 +375,6 @@ pub struct PackageDataEntry {
     pub last_backup: Option<DateTime<Utc>>,
     pub current_dependencies: CurrentDependencies,
     pub actions: BTreeMap<ActionId, ActionMetadata>,
-    #[ts(as = "BTreeMap::<String, TaskEntry>")]
     pub tasks: BTreeMap<ReplayId, TaskEntry>,
     pub service_interfaces: BTreeMap<ServiceInterfaceId, ServiceInterface>,
     pub hosts: Hosts,

core/startos/src/db/model/public.rs

@@ -92,7 +92,6 @@ impl Public {
                     },
                     gateways: OrdMap::new(),
                     acme: BTreeMap::new(),
-                    domains: BTreeMap::new(),
                     dns: Default::default(),
                 },
                 status_info: ServerStatus {
@@ -195,9 +194,6 @@ pub struct NetworkInfo {
     #[serde(default)]
     pub acme: BTreeMap<AcmeProvider, AcmeSettings>,
     #[serde(default)]
-    #[ts(as = "BTreeMap::<String, DomainSettings>")]
-    pub domains: BTreeMap<InternedString, DomainSettings>,
-    #[serde(default)]
     pub dns: DnsSettings,
 }
 
@@ -206,8 +202,7 @@ pub struct NetworkInfo {
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct DnsSettings {
-    pub dhcp: Vec<IpAddr>,
-    #[serde(rename = "static")]
+    pub dhcp_servers: Vec<IpAddr>,
     pub static_servers: Option<Vec<IpAddr>>,
 }
 

core/startos/src/dependencies.rs

@@ -37,7 +37,6 @@ pub struct DepInfo {
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
-#[ts(export)]
 pub struct DependencyMetadata {
     #[ts(type = "string")]
     pub title: InternedString,

core/startos/src/net/dns.rs

@@ -21,11 +21,14 @@ use hickory_server::ServerFuture;
 use imbl::OrdMap;
 use imbl_value::InternedString;
 use models::{GatewayId, PackageId};
-use rpc_toolkit::{from_fn_blocking, Context, HandlerArgs, HandlerExt, ParentHandler};
+use rpc_toolkit::{
+    from_fn_async, from_fn_blocking, Context, HandlerArgs, HandlerExt, ParentHandler,
+};
 use serde::{Deserialize, Serialize};
 use tokio::net::{TcpListener, UdpSocket};
 use tracing::instrument;
 
+use crate::context::RpcContext;
 use crate::db::model::public::NetworkInterfaceInfo;
 use crate::net::gateway::NetworkInterfaceWatcher;
 use crate::util::serde::{display_serializable, HandlerExtSerde};
@@ -33,23 +36,30 @@ use crate::util::sync::{SyncRwLock, Watch};
 use crate::{Error, ErrorKind, ResultExt};
 
 pub fn dns_api<C: Context>() -> ParentHandler<C> {
-    ParentHandler::new().subcommand(
-        "query",
-        from_fn_blocking(query_dns::<C>)
-            .with_display_serializable()
-            .with_custom_display_fn(|HandlerArgs { params, .. }, res| {
-                if let Some(format) = params.format {
-                    return display_serializable(format, res);
-                }
+    ParentHandler::new()
+        .subcommand(
+            "query",
+            from_fn_blocking(query_dns::<C>)
+                .with_display_serializable()
+                .with_custom_display_fn(|HandlerArgs { params, .. }, res| {
+                    if let Some(format) = params.format {
+                        return display_serializable(format, res);
+                    }
 
-                if let Some(ip) = res {
-                    println!("{}", ip)
-                }
+                    if let Some(ip) = res {
+                        println!("{}", ip)
+                    }
 
-                Ok(())
-            })
-            .with_about("Test the DNS configuration for a domain"),
-    )
+                    Ok(())
+                })
+                .with_about("Test the DNS configuration for a domain"),
+        )
+        .subcommand(
+            "set-static",
+            from_fn_async(set_static_dns)
+                .no_display()
+                .with_about("Set static DNS servers"),
+        )
 }
 
 #[derive(Deserialize, Serialize, Parser)]
@@ -91,17 +101,17 @@ pub fn query_dns<C: Context>(
         .map_err(Error::from)
 }
 
-// #[test]
-// fn test_dns() {
-//     assert!(query_dns(
-//         (),
-//         QueryDnsParams {
-//             fqdn: "fakedomain-definitely-not-real.com"
-//         }
-//     )
-//     .unwrap()
-//     .is_none())
-// }
+#[derive(Deserialize, Serialize, Parser)]
+pub struct SetStaticDnsParams {
+    pub servers: Option<Vec<IpAddr>>,
+}
+
+pub async fn set_static_dns(
+    ctx: RpcContext,
+    SetStaticDnsParams { servers }: SetStaticDnsParams,
+) -> Result<(), Error> {
+    todo!()
+}
 
 #[derive(Default)]
 struct ResolveMap {

core/startos/src/net/gateway.rs

@@ -856,7 +856,7 @@ impl NetworkInterfaceController {
 
         db.mutate(|db| {
             let net = db.as_public_mut().as_server_info_mut().as_network_mut();
-            net.as_dns_mut().as_dhcp_mut().ser(&dns)?;
+            net.as_dns_mut().as_dhcp_servers_mut().ser(&dns)?;
             net.as_gateways_mut().ser(info)
         })
         .await

core/startos/src/registry/info.rs

@@ -51,7 +51,6 @@ pub fn info_api<C: Context>() -> ParentHandler<C, WithIoFormat<Empty>> {
 pub struct RegistryInfo {
     pub name: Option<String>,
     pub icon: Option<DataUrl<'static>>,
-    #[ts(as = "BTreeMap::<String, Category>")]
     pub categories: BTreeMap<InternedString, Category>,
 }
 

core/startos/src/registry/os/index.rs

@@ -8,8 +8,8 @@ use ts_rs::TS;
 use crate::prelude::*;
 use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
-use crate::sign::commitment::blake3::Blake3Commitment;
 use crate::rpc_continuations::Guid;
+use crate::sign::commitment::blake3::Blake3Commitment;
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
@@ -44,11 +44,8 @@ pub struct OsVersionInfo {
     #[ts(type = "string")]
     pub source_version: VersionRange,
     pub authorized: BTreeSet<Guid>,
-    #[ts(as = "BTreeMap::<String, RegistryAsset::<Blake3Commitment>>")]
     pub iso: BTreeMap<InternedString, RegistryAsset<Blake3Commitment>>, // platform (i.e. x86_64-nonfree) -> asset
-    #[ts(as = "BTreeMap::<String, RegistryAsset::<Blake3Commitment>>")]
     pub squashfs: BTreeMap<InternedString, RegistryAsset<Blake3Commitment>>, // platform (i.e. x86_64-nonfree) -> asset
-    #[ts(as = "BTreeMap::<String, RegistryAsset::<Blake3Commitment>>")]
     pub img: BTreeMap<InternedString, RegistryAsset<Blake3Commitment>>, // platform (i.e. raspberrypi) -> asset
 }
 

core/startos/src/registry/package/index.rs

@@ -12,20 +12,19 @@ use crate::prelude::*;
 use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
 use crate::registry::device_info::DeviceInfo;
-use crate::sign::commitment::merkle_archive::MerkleArchiveCommitment;
-use crate::sign::{AnySignature, AnyVerifyingKey};
 use crate::rpc_continuations::Guid;
 use crate::s9pk::git_hash::GitHash;
 use crate::s9pk::manifest::{Alerts, Description, HardwareRequirements};
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
+use crate::sign::commitment::merkle_archive::MerkleArchiveCommitment;
+use crate::sign::{AnySignature, AnyVerifyingKey};
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct PackageIndex {
-    #[ts(as = "BTreeMap::<String, Category>")]
     pub categories: BTreeMap<InternedString, Category>,
     pub packages: BTreeMap<PackageId, PackageInfo>,
 }