nacos-sdk-rust-binding-node 0.2.0 → 0.2.2

package/Cargo.toml

@@ -18,12 +18,14 @@ crate-type = ["cdylib"]
 napi = { version = "2", default-features = false, features = ["napi4", "async"] }
 napi-derive = "2"
 
-nacos-sdk = { version = "0.3.0-alpha", features = ["async"] }
-#nacos-sdk = { git = "https://github.com/nacos-group/nacos-sdk-rust.git", features = ["async"] }
+#nacos-sdk = { version = "0.3.0-beta", features = ["async"] }
+nacos-sdk = { git = "https://github.com/nacos-group/nacos-sdk-rust.git", features = ["async"] }
 
-tracing-subscriber = { version = "0.3", features = ["env-filter", "local-time"] }
+tracing-subscriber = { version = "0.3", features = ["default"] }
+#tracing-subscriber = { version = "0.3", features = ["env-filter", "local-time"] } # occur `<unknown time>`
 tracing-appender = "0.2"
 lazy_static = "1.4.0"
+async-trait = "0.1"
 
 [build-dependencies]
 napi-build = "2"

package/package.json

@@ -7,7 +7,7 @@
     "binding",
     "ffi"
   ],
-  "version": "0.2.0",
+  "version": "0.2.2",
   "bugs": "https://github.com/opc-source/nacos-sdk-rust-binding-node/issues",
   "license": "MIT",
   "repository": {
@@ -55,19 +55,19 @@
   },
   "packageManager": "yarn@3.4.1",
   "optionalDependencies": {
-    "nacos-sdk-rust-binding-node-win32-x64-msvc": "0.2.0",
-    "nacos-sdk-rust-binding-node-darwin-x64": "0.2.0",
-    "nacos-sdk-rust-binding-node-linux-x64-gnu": "0.2.0",
-    "nacos-sdk-rust-binding-node-darwin-arm64": "0.2.0",
-    "nacos-sdk-rust-binding-node-android-arm64": "0.2.0",
-    "nacos-sdk-rust-binding-node-linux-arm64-gnu": "0.2.0",
-    "nacos-sdk-rust-binding-node-linux-arm64-musl": "0.2.0",
-    "nacos-sdk-rust-binding-node-win32-arm64-msvc": "0.2.0",
-    "nacos-sdk-rust-binding-node-linux-arm-gnueabihf": "0.2.0",
-    "nacos-sdk-rust-binding-node-linux-x64-musl": "0.2.0",
-    "nacos-sdk-rust-binding-node-freebsd-x64": "0.2.0",
-    "nacos-sdk-rust-binding-node-win32-ia32-msvc": "0.2.0",
-    "nacos-sdk-rust-binding-node-android-arm-eabi": "0.2.0",
-    "nacos-sdk-rust-binding-node-darwin-universal": "0.2.0"
+    "nacos-sdk-rust-binding-node-win32-x64-msvc": "0.2.2",
+    "nacos-sdk-rust-binding-node-darwin-x64": "0.2.2",
+    "nacos-sdk-rust-binding-node-linux-x64-gnu": "0.2.2",
+    "nacos-sdk-rust-binding-node-darwin-arm64": "0.2.2",
+    "nacos-sdk-rust-binding-node-android-arm64": "0.2.2",
+    "nacos-sdk-rust-binding-node-linux-arm64-gnu": "0.2.2",
+    "nacos-sdk-rust-binding-node-linux-arm64-musl": "0.2.2",
+    "nacos-sdk-rust-binding-node-win32-arm64-msvc": "0.2.2",
+    "nacos-sdk-rust-binding-node-linux-arm-gnueabihf": "0.2.2",
+    "nacos-sdk-rust-binding-node-linux-x64-musl": "0.2.2",
+    "nacos-sdk-rust-binding-node-freebsd-x64": "0.2.2",
+    "nacos-sdk-rust-binding-node-win32-ia32-msvc": "0.2.2",
+    "nacos-sdk-rust-binding-node-android-arm-eabi": "0.2.2",
+    "nacos-sdk-rust-binding-node-darwin-universal": "0.2.2"
   }
 }

package/src/lib.rs

@@ -10,6 +10,13 @@ pub fn sum(a: i32, b: i32) -> i32 {
 
 lazy_static::lazy_static! {
     static ref LOG_GUARD: tracing_appender::non_blocking::WorkerGuard = {
+      use std::str::FromStr;
+      use tracing_subscriber::filter::LevelFilter;
+      let log_level = match std::env::var("NACOS_CLIENT_LOGGER_LEVEL") {
+        Ok(level) => LevelFilter::from_str(&level).unwrap_or(LevelFilter::INFO),
+        Err(_) => LevelFilter::INFO,
+      };
+
       let home_dir = match std::env::var("HOME") {
         Ok(dir) => dir,
         Err(_) => "/tmp".to_string(),
@@ -19,10 +26,10 @@ lazy_static::lazy_static! {
 
       tracing_subscriber::fmt()
         .with_writer(non_blocking)
-        .with_timer(tracing_subscriber::fmt::time::LocalTime::rfc_3339())
+        // .with_timer(tracing_subscriber::fmt::time::LocalTime::rfc_3339()) // occur `<unknown time>`
         .with_thread_names(true)
         .with_thread_ids(true)
-        .with_max_level(tracing_subscriber::filter::LevelFilter::INFO)
+        .with_max_level(log_level)
         .init();
 
       guard

package/src/plugin.rs

@@ -7,8 +7,9 @@ pub struct NacosConfigFilter {
   pub(crate) func: Arc<ThreadsafeFunction<(Option<NacosConfigReq>, Option<NacosConfigResp>)>>,
 }
 
+#[async_trait::async_trait]
 impl nacos_sdk::api::plugin::ConfigFilter for NacosConfigFilter {
-  fn filter(
+  async fn filter(
     &self,
     config_req: Option<&mut nacos_sdk::api::plugin::ConfigReq>,
     config_resp: Option<&mut nacos_sdk::api::plugin::ConfigResp>,
@@ -22,21 +23,13 @@ impl nacos_sdk::api::plugin::ConfigFilter for NacosConfigFilter {
         encrypted_data_key: config_req.encrypted_data_key.clone(),
       };
 
-      let (tx, rx) = std::sync::mpsc::channel();
-      self.func.clone().call_with_return_value(
-        Ok((Some(js_config_req), None)),
-        ThreadsafeFunctionCallMode::Blocking,
-        move |(after_js_config_req, _after_js_config_resp): (
-          Option<NacosConfigReq>,
-          Option<NacosConfigResp>,
-        )| {
-          let after_js_config_req = after_js_config_req.unwrap();
-          let _ = tx.send(after_js_config_req);
-          Ok(())
-        },
-      );
+      let (after_js_config_req, _): (Option<NacosConfigReq>, Option<NacosConfigResp>) = self
+        .func
+        .call_async(Ok((Some(js_config_req), None)))
+        .await
+        .unwrap();
 
-      let ret = rx.recv().unwrap();
+      let ret = after_js_config_req.unwrap();
       config_req.data_id = ret.data_id;
       config_req.group = ret.group;
       config_req.namespace = ret.namespace;
@@ -53,21 +46,13 @@ impl nacos_sdk::api::plugin::ConfigFilter for NacosConfigFilter {
         encrypted_data_key: config_resp.encrypted_data_key.clone(),
       };
 
-      let (tx, rx) = std::sync::mpsc::channel();
-      self.func.clone().call_with_return_value(
-        Ok((None, Some(js_config_resp))),
-        ThreadsafeFunctionCallMode::Blocking,
-        move |(_after_js_config_req, after_js_config_resp): (
-          Option<NacosConfigReq>,
-          Option<NacosConfigResp>,
-        )| {
-          let after_js_config_resp = after_js_config_resp.unwrap();
-          let _ = tx.send(after_js_config_resp);
-          Ok(())
-        },
-      );
+      let (_, after_js_config_resp): (Option<NacosConfigReq>, Option<NacosConfigResp>) = self
+        .func
+        .call_async(Ok((None, Some(js_config_resp))))
+        .await
+        .unwrap();
 
-      let ret = rx.recv().unwrap();
+      let ret = after_js_config_resp.unwrap();
       config_resp.data_id = ret.data_id;
       config_resp.group = ret.group;
       config_resp.namespace = ret.namespace;