make config_json available to providers (#142)

* make config_json available to providers Signed-off-by: stevelr <[email protected]> * clippy fixes, fix doc test Signed-off-by: stevelr <[email protected]> * config_json just return string Signed-off-by: stevelr <[email protected]> * rename config_json to config_json_raw. and return &str to avoid copying Signed-off-by: stevelr <[email protected]> --------- Signed-off-by: stevelr <[email protected]>
wasmCloud · Feb 24, 2023 · 619b2f9 · 619b2f9
1 parent cd7b4a6
commit 619b2f9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/rpc-rs/src/document.rs b/rpc-rs/src/document.rs
@@ -8,7 +8,7 @@ use std::collections::HashMap;
 /// Open content is useful for modeling unstructured data that has no schema, data that can't be
 /// modeled using rigid types, or data that has a schema that evolves outside of the purview of a model.
 /// The serialization format of a document is an implementation detail of a protocol.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 pub enum Document {
     /// object
     // n(0)
@@ -40,7 +40,7 @@ pub enum Document {
 /// Open content is useful for modeling unstructured data that has no schema, data that can't be
 /// modeled using rigid types, or data that has a schema that evolves outside of the purview of a model.
 /// The serialization format of a document is an implementation detail of a protocol.
-#[derive(Clone, Debug, PartialEq, Serialize, Default)]
+#[derive(Clone, Debug, Default, PartialEq, Serialize)]
 pub enum DocumentRef<'v> {
     /// object
     // n(0)

diff --git a/rpc-rs/src/provider.rs b/rpc-rs/src/provider.rs
@@ -151,10 +151,8 @@ pub struct HostBridge {
 }
 
 impl HostBridge {
-    pub(crate) fn new_client(
-        nats: async_nats::Client,
-        host_data: &HostData,
-    ) -> RpcResult<HostBridge> {
+    #[doc(hidden)]
+    pub fn new_client(nats: async_nats::Client, host_data: &HostData) -> RpcResult<HostBridge> {
         let key = Arc::new(if host_data.is_test() {
             KeyPair::new_user()
         } else {
@@ -199,6 +197,28 @@ impl HostBridge {
     pub fn lattice_prefix(&self) -> &str {
         &self.host_data.lattice_rpc_prefix
     }
+
+    /// Returns the configuration values as a json string.
+    /// Caller may need to deserialize, and may want to cache the results
+    /// if the data is large or this method is called frequently.
+    /// If there is no configuration defined, returns None.
+    /// ```no_run
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// # use std::collections::HashMap;
+    /// # let host_bridge = wasmbus_rpc::provider::HostBridge::new_client(async_nats::connect("demo.nats.io").await.unwrap(), &wasmbus_rpc::core::HostData::default()).unwrap();
+    /// // Example: deserialize to a hashmap
+    /// let settings: HashMap<String,String>  = if let Some(json) = host_bridge.config_json_raw() {
+    ///    serde_json::from_str(&json).unwrap() // handle error
+    /// } else {
+    ///    Default::default()
+    /// };
+    /// println!("config: {:?}", &settings);
+    /// # }
+    /// ```    
+    pub fn config_json_raw(&self) -> Option<&str> {
+        self.host_data.config_json.as_deref()
+    }
 }
 
 impl Deref for HostBridge {

diff --git a/rpc-rs/src/rpc_client.rs b/rpc-rs/src/rpc_client.rs
@@ -158,7 +158,7 @@ impl RpcClient {
     }
 
     /// Send an rpc message using json-encoded data
-    pub async fn send_json<Target, Arg, Resp>(
+    pub async fn send_json<Target, Resp>(
         &self,
         origin: WasmCloudEntity,
         target: Target,
@@ -167,7 +167,6 @@ impl RpcClient {
         data: JsonValue,
     ) -> RpcResult<JsonValue>
     where
-        Arg: DeserializeOwned + Serialize,
         Resp: DeserializeOwned + Serialize,
         Target: Into<WasmCloudEntity>,
     {