Small Service Discovery Architecture: Client/Transport/Service registry etc. for out of process handlers

Cargo.toml

@@ -22,12 +22,16 @@ members = [
     "device/thunder_ripple_sdk",
     "core/main",
     "device/mock_device",
-    "openrpc_validator"]
+    "openrpc_validator", 
+    "ssda/ssda_types",
+    "ssda/ssda_client",
+    "ssda/ssda_service"]
 
 [workspace.package]
 version = "1.1.0"
 
 [workspace.dependencies]
+base64ct= {version = "=1.7.3"}
 base64 = { version = "0.22.1", default-features = false, features=["alloc"] }
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
 futures = { version = "0.3.21", default-features = false }
@@ -39,7 +43,7 @@ serde_json = { version = "1.0", default-features = false}
 serde = { version = "1.0", features = ["derive"], default-features =  false  }
 tokio = { version = "1.44.1", default-features = false }
 tokio-tungstenite = { version = "0.20.1", default-features = false }
-url = { version = "=2.5.0", default-features = false}
+url = { version = "=2.5.4", default-features = false}
 urlencoding = { version = "2.1.0", default-features = false}
 uuid = { version = "1.13.1", default-features = false }
 ripple_sdk = { path = "./core/sdk" }

core/main/Cargo.toml

@@ -43,9 +43,12 @@ contract_tests = [
     "websocket_contract_tests",
 ]
 tdk=[]
+ssda=[]
 [dependencies]
 base64.workspace = true
-ripple_sdk = { workspace = true, features = ["full"] }
+ripple_sdk = { path = "../sdk" }
+
+
 jsonrpsee = { workspace = true, features = ["macros"] }
 futures-channel.workspace = true
 futures.workspace = true
@@ -71,6 +74,10 @@ strum_macros = "0.24"
 
 openrpc_validator = { path = "../../openrpc_validator" }
 proc-macro2.workspace = true
+ssda_service = { path="../../ssda/ssda_service" }
+ssda_types= { path = "../../ssda/ssda_types"}
+
+
 
 [build-dependencies]
 vergen = "1"
@@ -81,4 +88,4 @@ rstest = "0.18.0"
 # serial_test is used to provide determinism around monotonic counter generation
 # using AtomicU64
 serial_test = "3"
-httpmock = "0.7.0"
+httpmock = "0.7.0"

core/main/src/bootstrap/start_communication_broker.rs

@@ -46,7 +46,7 @@ impl Bootstep<BootstrapState> for StartCommunicationBroker {
         }
         // Setup the endpoints from the manifests
         let mut endpoint_state = ps.clone().endpoint_state;
-        endpoint_state.build_thunder_endpoint(Some(state.platform_state.clone()));
+        endpoint_state.build_thunder_endpoint().await;
         Ok(())
     }
 }
@@ -67,7 +67,9 @@ impl Bootstep<BootstrapState> for StartOtherBrokers {
         }
         // Setup the endpoints from the manifests
         let mut endpoint_state = ps.clone().endpoint_state;
-        endpoint_state.build_other_endpoints(ps.clone(), ps.session_state.get_account_session());
+        endpoint_state
+            .build_other_endpoints(ps.clone(), ps.session_state.get_account_session())
+            .await;
         Ok(())
     }
 }

core/main/src/bootstrap/start_ws_step.rs

@@ -37,19 +37,38 @@ impl Bootstep<BootstrapState> for StartWsStep {
         let ws_enabled = manifest.get_web_socket_enabled();
         let internal_ws_enabled = manifest.get_internal_ws_enabled();
         let iai_c = iai.clone();
+
         if ws_enabled {
+            let api_gateway_state_ws = state.platform_state.services_gateway_api.clone();
             let ws_addr = manifest.get_ws_gateway_host();
             let state_for_ws = state.platform_state.clone();
+
             tokio::spawn(async move {
-                FireboltWs::start(ws_addr.as_str(), state_for_ws, true, iai.clone()).await;
+                FireboltWs::start(
+                    ws_addr.as_str(),
+                    state_for_ws,
+                    true,
+                    iai.clone(),
+                    api_gateway_state_ws,
+                )
+                .await;
             });
         }
 
         if internal_ws_enabled {
+            let api_gateway_state_internal_ws = state.platform_state.services_gateway_api.clone();
+
             let ws_addr = manifest.get_internal_gateway_host();
             let state_for_ws = state.platform_state;
             tokio::spawn(async move {
-                FireboltWs::start(ws_addr.as_str(), state_for_ws, false, iai_c).await;
+                FireboltWs::start(
+                    ws_addr.as_str(),
+                    state_for_ws,
+                    false,
+                    iai_c,
+                    api_gateway_state_internal_ws,
+                )
+                .await;
             });
         }
 

core/main/src/broker/broker_utils.rs

@@ -85,13 +85,9 @@ impl BrokerUtils {
         if let Some(app_id) = app_id {
             rpc_request.ctx.app_id = app_id.to_owned();
         }
-        state.endpoint_state.handle_brokerage(
-            rpc_request,
-            None,
-            callback,
-            Vec::new(),
-            None,
-            Vec::new(),
-        )
+        state
+            .endpoint_state
+            .handle_brokerage(rpc_request, None, callback, Vec::new(), None, Vec::new())
+            .await
     }
 }