Add how to adjust Zenoh configuration. (#5)

Signed-off-by: ChenYing Kuo <[email protected]>

Cargo.toml

@@ -17,8 +17,8 @@ async-std = "1.12.0"
 async-trait = "0.1"
 chrono = "0.4.31"
 env_logger = "0.10.0"
-up-rust = { git = "https://github.com/eclipse-uprotocol/up-rust", rev = "c705ac97602ad6917a93d23651e8a504ec7bb718" }
-up-client-zenoh = { git = "https://github.com/eclipse-uprotocol/up-client-zenoh-rust", rev = "dc0a3a95564ab1c83771fe71f0da5a261d469fb6" }
+up-rust = { git = "https://github.com/eclipse-uprotocol/up-rust", rev = "1bb08ba7a3666e58c316489fbcf3da3e29dee611" }
+up-client-zenoh = { git = "https://github.com/eclipse-uprotocol/up-client-zenoh-rust", rev = "cb592dc5abbaf9dcd204f592733404ea7c61e999" }
 zenoh = { version = "0.10.1-rc", features = ["unstable"]}
 
 [[bin]]

src/common_uuri.rs

@@ -13,6 +13,7 @@
 //
 
 use up_rust::{Number, UAuthority, UEntity, UResource, UResourceBuilder};
+use zenoh::config::Config;
 
 pub enum ExampleType {
     Publisher,
@@ -61,3 +62,19 @@ pub fn pub_resource() -> UResource {
 pub fn rpc_resource() -> UResource {
     UResourceBuilder::for_rpc_request(Some("getTime".to_string()), Some(5678))
 }
+
+#[allow(clippy::must_use_candidate, clippy::missing_panics_doc)]
+pub fn get_zenoh_config() -> Config {
+    // Load the config from file path
+    // Config Examples: https://github.com/eclipse-zenoh/zenoh/blob/0.10.1-rc/DEFAULT_CONFIG.json5
+    // let mut zenoh_cfg = Config::from_file("./DEFAULT_CONFIG.json5").unwrap();
+
+    // Loat the default config struct
+    let mut zenoh_cfg = Config::default();
+    // You can choose from Router, Peer, Client
+    zenoh_cfg
+        .set_mode(Some(zenoh::config::WhatAmI::Peer))
+        .unwrap();
+
+    zenoh_cfg
+}

src/publisher.rs

@@ -18,7 +18,6 @@ use common_uuri::ExampleType;
 use std::time;
 use up_client_zenoh::UPClientZenoh;
 use up_rust::{UMessageBuilder, UPayloadFormat, UTransport, UUIDBuilder, UUri};
-use zenoh::config::Config;
 
 #[async_std::main]
 async fn main() {
@@ -27,7 +26,7 @@ async fn main() {
 
     println!("uProtocol publisher example");
     let publisher = UPClientZenoh::new(
-        Config::default(),
+        common_uuri::get_zenoh_config(),
         common_uuri::authority(),
         common_uuri::entity(&ExampleType::Publisher),
     )

src/rpc_client.rs

@@ -16,7 +16,6 @@ pub mod common_uuri;
 use common_uuri::ExampleType;
 use up_client_zenoh::UPClientZenoh;
 use up_rust::{CallOptions, Data, RpcClient, UPayload, UPayloadFormat, UUri};
-use zenoh::config::Config;
 
 #[async_std::main]
 async fn main() {
@@ -25,7 +24,7 @@ async fn main() {
 
     println!("uProtocol RPC client example");
     let rpc_client = UPClientZenoh::new(
-        Config::default(),
+        common_uuri::get_zenoh_config(),
         common_uuri::authority(),
         common_uuri::entity(&ExampleType::RpcClient),
     )

src/rpc_server.rs

@@ -23,7 +23,6 @@ use up_rust::{
     Data, UListener, UMessage, UMessageBuilder, UPayloadFormat, UStatus, UTransport, UUIDBuilder,
     UUri,
 };
-use zenoh::config::Config;
 
 struct RpcListener {
     up_client: Arc<UPClientZenoh>,
@@ -72,7 +71,7 @@ async fn main() {
     println!("uProtocol RPC server example");
     let rpc_server = Arc::new(
         UPClientZenoh::new(
-            Config::default(),
+            common_uuri::get_zenoh_config(),
             common_uuri::authority(),
             common_uuri::entity(&ExampleType::RpcServer),
         )

src/subscriber.rs

@@ -19,7 +19,6 @@ use common_uuri::ExampleType;
 use std::{sync::Arc, time};
 use up_client_zenoh::UPClientZenoh;
 use up_rust::{Data, UListener, UMessage, UStatus, UTransport, UUri};
-use zenoh::config::Config;
 
 struct SubscriberListener;
 #[async_trait]
@@ -43,7 +42,7 @@ async fn main() {
 
     println!("uProtocol subscriber example");
     let subscriber = UPClientZenoh::new(
-        Config::default(),
+        common_uuri::get_zenoh_config(),
         common_uuri::authority(),
         common_uuri::entity(&ExampleType::Subscriber),
     )