appmgr: minor fixes

appmgr/src/context/cli.rs

@@ -45,7 +45,7 @@ impl CliContext {
         } else {
             CliContextConfig::default()
         };
-        if let Some(bind) = base.server_config.bind {
+        if let Some(bind) = base.server_config.bind_rpc {
             if base.host.is_none() {
                 base.host = Some(match bind.ip() {
                     IpAddr::V4(a) => Host::Ipv4(a),

appmgr/src/context/rpc.rs

@@ -11,38 +11,48 @@ use serde::Deserialize;
 use sqlx::SqlitePool;
 use tokio::fs::File;
 
-use crate::util::{from_yaml_async_reader, AsyncFileExt};
+use crate::net::mdns::LanHandle;
+use crate::util::{from_toml_async_reader, AsyncFileExt, Container};
 use crate::{Error, ResultExt};
 
 #[derive(Debug, Default, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct RpcContextConfig {
-    pub bind: Option<SocketAddr>,
+    pub bind_rpc: Option<SocketAddr>,
+    pub bind_ws: Option<SocketAddr>,
     pub db: Option<PathBuf>,
     pub secret_store: Option<PathBuf>,
 }
+
 pub struct RpcContextSeed {
-    pub bind: SocketAddr,
+    pub bind_rpc: SocketAddr,
+    pub bind_ws: SocketAddr,
     pub db: PatchDb,
     pub secret_store: SqlitePool,
     pub docker: Docker,
+    // pub lan_handle: Container<LanHandle>,
+    // pub
 }
 
 #[derive(Clone)]
 pub struct RpcContext(Arc<RpcContextSeed>);
 impl RpcContext {
-    pub async fn init() -> Result<Self, Error> {
-        let cfg_path = Path::new(crate::CONFIG_PATH);
+    pub async fn init<P: AsRef<Path>>(cfg_path: Option<P>) -> Result<Self, Error> {
+        let cfg_path = cfg_path
+            .as_ref()
+            .map(|p| p.as_ref())
+            .unwrap_or(Path::new(crate::CONFIG_PATH));
         let base = if let Some(f) = File::maybe_open(cfg_path)
             .await
             .with_ctx(|_| (crate::ErrorKind::Filesystem, cfg_path.display().to_string()))?
         {
-            from_yaml_async_reader(f).await?
+            from_toml_async_reader(f).await?
         } else {
             RpcContextConfig::default()
         };
         let seed = Arc::new(RpcContextSeed {
-            bind: base.bind.unwrap_or(([127, 0, 0, 1], 5959).into()),
+            bind_rpc: base.bind_rpc.unwrap_or(([127, 0, 0, 1], 5959).into()),
+            bind_ws: base.bind_ws.unwrap_or(([127, 0, 0, 1], 5960).into()),
             db: PatchDb::open(
                 base.db
                     .unwrap_or_else(|| Path::new("/mnt/embassy-os/embassy.db").to_owned()),
@@ -62,13 +72,13 @@ impl RpcContext {
 }
 impl Context for RpcContext {
     fn host(&self) -> Host<&str> {
-        match self.0.bind.ip() {
+        match self.0.bind_rpc.ip() {
             IpAddr::V4(a) => Host::Ipv4(a),
             IpAddr::V6(a) => Host::Ipv6(a),
         }
     }
     fn port(&self) -> u16 {
-        self.0.bind.port()
+        self.0.bind_rpc.port()
     }
 }
 impl Deref for RpcContext {