backup commit

core/archipelago/src/api/rpc/mod.rs

@@ -23,6 +23,7 @@ mod peers;
 mod router;
 mod security;
 mod tor;
+mod transport;
 mod totp;
 mod system;
 mod update;
@@ -166,6 +167,8 @@ pub struct RpcHandler {
     login_rate_limiter: LoginRateLimiter,
     endpoint_rate_limiter: EndpointRateLimiter,
     response_cache: ResponseCache,
+    mesh_service: Arc<tokio::sync::RwLock<Option<crate::mesh::MeshService>>>,
+    transport_router: Arc<tokio::sync::RwLock<Option<Arc<crate::transport::TransportRouter>>>>,
 }
 
 impl RpcHandler {
@@ -196,9 +199,26 @@ impl RpcHandler {
             login_rate_limiter: LoginRateLimiter::new(),
             endpoint_rate_limiter: EndpointRateLimiter::new(),
             response_cache: ResponseCache::new(5),
+            mesh_service: Arc::new(tokio::sync::RwLock::new(None)),
+            transport_router: Arc::new(tokio::sync::RwLock::new(None)),
         })
     }
 
+    /// Set the mesh service (called after identity is loaded).
+    pub async fn set_mesh_service(&self, service: crate::mesh::MeshService) {
+        *self.mesh_service.write().await = Some(service);
+    }
+
+    /// Set the transport router (called after all transports are initialized).
+    pub async fn set_transport_router(&self, router: Arc<crate::transport::TransportRouter>) {
+        *self.transport_router.write().await = Some(router);
+    }
+
+    /// Get reference to the mesh service Arc (for MeshTransport wrapper).
+    pub fn mesh_service_arc(&self) -> Arc<tokio::sync::RwLock<Option<crate::mesh::MeshService>>> {
+        Arc::clone(&self.mesh_service)
+    }
+
     fn cookie_suffix(&self) -> &'static str {
         if self.config.dev_mode { "" } else { "; Secure" }
     }
@@ -471,6 +491,7 @@ impl RpcHandler {
             "lnd.create-psbt" => self.handle_lnd_create_psbt(params).await,
             "lnd.finalize-psbt" => self.handle_lnd_finalize_psbt(params).await,
             "lnd.gettransactions" => self.handle_lnd_gettransactions().await,
+            "lnd.connect-info" => self.handle_lnd_connect_info().await,
 
             // Multi-identity management
             "identity.list" => self.handle_identity_list(params).await,
@@ -618,12 +639,20 @@ impl RpcHandler {
             "marketplace.create-invoice" => self.handle_marketplace_create_invoice(params).await,
             "marketplace.check-payment" => self.handle_marketplace_check_payment(params).await,
 
-            // Mesh networking
+            // Mesh networking (Meshcore LoRa)
             "mesh.status" => self.handle_mesh_status().await,
-            "mesh.discover" => self.handle_mesh_discover(params).await,
+            "mesh.peers" => self.handle_mesh_peers().await,
+            "mesh.messages" => self.handle_mesh_messages(params).await,
+            "mesh.send" => self.handle_mesh_send(params).await,
             "mesh.broadcast" => self.handle_mesh_broadcast().await,
             "mesh.configure" => self.handle_mesh_configure(params).await,
 
+            // Transport layer (unified routing)
+            "transport.status" => self.handle_transport_status().await,
+            "transport.peers" => self.handle_transport_peers().await,
+            "transport.send" => self.handle_transport_send(params).await,
+            "transport.set-mode" => self.handle_transport_set_mode(params).await,
+
             // Server settings
             "server.set-name" => self.handle_server_set_name(params).await,