Feature/new registry (#2612)

* wip

* overhaul boot process

* wip: new registry

* wip

* wip

* wip

* wip

* wip

* wip

* os registry complete

* ui fixes

* fixes

* fixes

* more fixes

* fix merkle archive

core/startos/src/net/net_controller.rs

@@ -6,12 +6,10 @@ use color_eyre::eyre::eyre;
 use imbl::OrdMap;
 use lazy_format::lazy_format;
 use models::{HostId, OptionExt, PackageId};
-use patch_db::PatchDb;
-use tokio::sync::Mutex;
 use torut::onion::{OnionAddressV3, TorSecretKeyV3};
 use tracing::instrument;
 
-use crate::db::prelude::PatchDbExt;
+use crate::db::model::Database;
 use crate::error::ErrorCollection;
 use crate::hostname::Hostname;
 use crate::net::dns::DnsController;
@@ -21,11 +19,12 @@ use crate::net::host::binding::{AddSslOptions, BindOptions};
 use crate::net::host::{Host, HostKind};
 use crate::net::tor::TorController;
 use crate::net::vhost::{AlpnInfo, VHostController};
+use crate::prelude::*;
 use crate::util::serde::MaybeUtf8String;
-use crate::{Error, HOST_IP};
+use crate::HOST_IP;
 
 pub struct NetController {
-    db: PatchDb,
+    db: TypedPatchDb<Database>,
     pub(super) tor: TorController,
     pub(super) vhost: VHostController,
     pub(super) dns: DnsController,
@@ -36,7 +35,7 @@ pub struct NetController {
 impl NetController {
     #[instrument(skip_all)]
     pub async fn init(
-        db: PatchDb,
+        db: TypedPatchDb<Database>,
         tor_control: SocketAddr,
         tor_socks: SocketAddr,
         dns_bind: &[SocketAddr],
@@ -394,14 +393,23 @@ impl NetService {
     pub fn get_ext_port(&self, host_id: HostId, internal_port: u16) -> Result<u16, Error> {
         let host_id_binds = self.binds.get_key_value(&host_id);
         match host_id_binds {
-            Some((id, binds)) => {
+            Some((_, binds)) => {
                 if let Some(ext_port_info) = binds.lan.get(&internal_port) {
                     Ok(ext_port_info.0)
                 } else {
-                    Err(Error::new(eyre!("Internal Port {} not found in NetService binds", internal_port), crate::ErrorKind::NotFound))
+                    Err(Error::new(
+                        eyre!(
+                            "Internal Port {} not found in NetService binds",
+                            internal_port
+                        ),
+                        crate::ErrorKind::NotFound,
+                    ))
                 }
-            },
-            None => Err(Error::new(eyre!("HostID {} not found in NetService binds", host_id), crate::ErrorKind::NotFound))
+            }
+            None => Err(Error::new(
+                eyre!("HostID {} not found in NetService binds", host_id),
+                crate::ErrorKind::NotFound,
+            )),
         }
     }
 }