nacos-sdk-rust-binding-node 0.0.1 → 0.0.2

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "nacos-sdk-rust-binding-node"
-version = "0.0.1"
+version = "0.0.2"
 authors = ["CheirshCai <785427346@qq.com>"]
 license = "Apache-2.0"
 readme = "README.md"
@@ -18,8 +18,7 @@ crate-type = ["cdylib"]
 napi = { version = "2", default-features = false, features = ["napi4", "async"] }
 napi-derive = "2"
 
-# version = ^0.2
-nacos-sdk = { git = "https://github.com/nacos-group/nacos-sdk-rust.git"}
+nacos-sdk = { version = "0.2.3", features = ["async"] }
 tracing-subscriber = "0.3"
 tracing-appender = "0.2"
 lazy_static = "1.4.0"

package/package.json

@@ -1,6 +1,19 @@
 {
   "name": "nacos-sdk-rust-binding-node",
-  "version": "0.0.1",
+  "description": "nacos-sdk-rust binding for NodeJs with napi.",
+  "keywords": [
+    "nacos",
+    "napi",
+    "binding",
+    "ffi"
+  ],
+  "version": "0.0.2",
+  "bugs": "https://github.com/opc-source/nacos-sdk-rust-binding-node/issues",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/opc-source/nacos-sdk-rust-binding-node.git"
+  },
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {
@@ -21,7 +34,6 @@
       ]
     }
   },
-  "license": "MIT",
   "devDependencies": {
     "@napi-rs/cli": "^2.14.6",
     "ava": "^5.1.1"
@@ -43,19 +55,19 @@
   },
   "packageManager": "yarn@3.4.1",
   "optionalDependencies": {
-    "nacos-sdk-rust-binding-node-win32-x64-msvc": "0.0.1",
-    "nacos-sdk-rust-binding-node-darwin-x64": "0.0.1",
-    "nacos-sdk-rust-binding-node-linux-x64-gnu": "0.0.1",
-    "nacos-sdk-rust-binding-node-darwin-arm64": "0.0.1",
-    "nacos-sdk-rust-binding-node-android-arm64": "0.0.1",
-    "nacos-sdk-rust-binding-node-linux-arm64-gnu": "0.0.1",
-    "nacos-sdk-rust-binding-node-linux-arm64-musl": "0.0.1",
-    "nacos-sdk-rust-binding-node-win32-arm64-msvc": "0.0.1",
-    "nacos-sdk-rust-binding-node-linux-arm-gnueabihf": "0.0.1",
-    "nacos-sdk-rust-binding-node-linux-x64-musl": "0.0.1",
-    "nacos-sdk-rust-binding-node-freebsd-x64": "0.0.1",
-    "nacos-sdk-rust-binding-node-win32-ia32-msvc": "0.0.1",
-    "nacos-sdk-rust-binding-node-android-arm-eabi": "0.0.1",
-    "nacos-sdk-rust-binding-node-darwin-universal": "0.0.1"
+    "nacos-sdk-rust-binding-node-win32-x64-msvc": "0.0.2",
+    "nacos-sdk-rust-binding-node-darwin-x64": "0.0.2",
+    "nacos-sdk-rust-binding-node-linux-x64-gnu": "0.0.2",
+    "nacos-sdk-rust-binding-node-darwin-arm64": "0.0.2",
+    "nacos-sdk-rust-binding-node-android-arm64": "0.0.2",
+    "nacos-sdk-rust-binding-node-linux-arm64-gnu": "0.0.2",
+    "nacos-sdk-rust-binding-node-linux-arm64-musl": "0.0.2",
+    "nacos-sdk-rust-binding-node-win32-arm64-msvc": "0.0.2",
+    "nacos-sdk-rust-binding-node-linux-arm-gnueabihf": "0.0.2",
+    "nacos-sdk-rust-binding-node-linux-x64-musl": "0.0.2",
+    "nacos-sdk-rust-binding-node-freebsd-x64": "0.0.2",
+    "nacos-sdk-rust-binding-node-win32-ia32-msvc": "0.0.2",
+    "nacos-sdk-rust-binding-node-android-arm-eabi": "0.0.2",
+    "nacos-sdk-rust-binding-node-darwin-universal": "0.0.2"
   }
 }

package/src/config.rs

@@ -1,12 +1,12 @@
 #![deny(clippy::all)]
 
-use napi::{bindgen_prelude::*, threadsafe_function::*, tokio::sync::Mutex};
+use napi::{bindgen_prelude::*, threadsafe_function::*};
 use std::sync::Arc;
 
 /// Client api of Nacos Config.
 #[napi]
 pub struct NacosConfigClient {
-  inner: Arc<Mutex<dyn nacos_sdk::api::config::ConfigService + Send + Sync + 'static>>,
+  inner: Arc<dyn nacos_sdk::api::config::ConfigService + Send + Sync + 'static>,
 }
 
 #[napi]
@@ -64,7 +64,7 @@ impl NacosConfigClient {
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))?;
 
     Ok(NacosConfigClient {
-      inner: Arc::new(Mutex::new(config_service)),
+      inner: Arc::new(config_service),
     })
   }
 
@@ -84,9 +84,10 @@ impl NacosConfigClient {
     data_id: String,
     group: String,
   ) -> Result<NacosConfigResponse> {
-    let mut inner = self.inner.lock().await;
-    let config_resp = inner
+    let config_resp = self
+      .inner
       .get_config(data_id, group)
+      .await
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))?;
     Ok(transfer_conf_resp(config_resp))
   }
@@ -100,9 +101,10 @@ impl NacosConfigClient {
     group: String,
     content: String,
   ) -> Result<bool> {
-    let mut inner = self.inner.lock().await;
-    inner
+    self
+      .inner
       .publish_config(data_id, group, content, None)
+      .await
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))
   }
 
@@ -110,9 +112,10 @@ impl NacosConfigClient {
   /// If it fails, pay attention to err
   #[napi]
   pub async fn remove_config(&self, data_id: String, group: String) -> Result<bool> {
-    let mut inner = self.inner.lock().await;
-    inner
+    self
+      .inner
       .remove_config(data_id, group)
+      .await
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))
   }
 
@@ -125,8 +128,8 @@ impl NacosConfigClient {
     group: String,
     listener: ThreadsafeFunction<NacosConfigResponse>,
   ) -> Result<()> {
-    let mut inner = self.inner.lock().await;
-    inner
+    self
+      .inner
       .add_listener(
         data_id,
         group,
@@ -134,6 +137,7 @@ impl NacosConfigClient {
           func: Arc::new(listener),
         }),
       )
+      .await
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))?;
     Ok(())
   }

package/src/naming.rs

@@ -1,12 +1,12 @@
 #![deny(clippy::all)]
 
-use napi::{bindgen_prelude::*, threadsafe_function::*, tokio::sync::Mutex};
+use napi::{bindgen_prelude::*, threadsafe_function::*};
 use std::sync::Arc;
 
 /// Client api of Nacos Naming.
 #[napi]
 pub struct NacosNamingClient {
-  inner: Arc<Mutex<dyn nacos_sdk::api::naming::NamingService + Send + Sync + 'static>>,
+  inner: Arc<dyn nacos_sdk::api::naming::NamingService + Send + Sync + 'static>,
 }
 
 #[napi]
@@ -48,7 +48,7 @@ impl NacosNamingClient {
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))?;
 
     Ok(NacosNamingClient {
-      inner: Arc::new(Mutex::new(naming_service)),
+      inner: Arc::new(naming_service),
     })
   }
 
@@ -61,13 +61,14 @@ impl NacosNamingClient {
     group: String,
     service_instance: NacosServiceInstance,
   ) -> Result<()> {
-    let inner = self.inner.lock().await;
-    inner
-      .register_service(
+    self
+      .inner
+      .register_instance(
         service_name,
         Some(group),
         transfer_js_instance_to_rust(&service_instance),
       )
+      .await
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))
   }
 
@@ -80,13 +81,14 @@ impl NacosNamingClient {
     group: String,
     service_instance: NacosServiceInstance,
   ) -> Result<()> {
-    let inner = self.inner.lock().await;
-    inner
+    self
+      .inner
       .deregister_instance(
         service_name,
         Some(group),
         transfer_js_instance_to_rust(&service_instance),
       )
+      .await
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))
   }
 
@@ -104,9 +106,10 @@ impl NacosNamingClient {
       .map(transfer_js_instance_to_rust)
       .collect();
 
-    let inner = self.inner.lock().await;
-    inner
+    self
+      .inner
       .batch_register_instance(service_name, Some(group), rust_instances)
+      .await
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))
   }
 
@@ -120,14 +123,15 @@ impl NacosNamingClient {
     clusters: Option<Vec<String>>,
     #[napi(ts_arg_type = "boolean = true")] subscribe: Option<bool>,
   ) -> Result<Vec<NacosServiceInstance>> {
-    let inner = self.inner.lock().await;
-    let rust_instances = inner
+    let rust_instances = self
+      .inner
       .get_all_instances(
         service_name,
         Some(group),
         clusters.unwrap_or_default(),
         subscribe.unwrap_or(true),
       )
+      .await
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))?;
 
     Ok(
@@ -149,15 +153,16 @@ impl NacosNamingClient {
     #[napi(ts_arg_type = "boolean = true")] subscribe: Option<bool>,
     #[napi(ts_arg_type = "boolean = true")] healthy: Option<bool>,
   ) -> Result<Vec<NacosServiceInstance>> {
-    let inner = self.inner.lock().await;
-    let rust_instances = inner
-      .select_instance(
+    let rust_instances = self
+      .inner
+      .select_instances(
         service_name,
         Some(group),
         clusters.unwrap_or_default(),
         subscribe.unwrap_or(true),
         healthy.unwrap_or(true),
       )
+      .await
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))?;
 
     Ok(
@@ -178,14 +183,15 @@ impl NacosNamingClient {
     clusters: Option<Vec<String>>,
     #[napi(ts_arg_type = "boolean = true")] subscribe: Option<bool>,
   ) -> Result<NacosServiceInstance> {
-    let inner = self.inner.lock().await;
-    let rust_instance = inner
+    let rust_instance = self
+      .inner
       .select_one_healthy_instance(
         service_name,
         Some(group),
         clusters.unwrap_or_default(),
         subscribe.unwrap_or(true),
       )
+      .await
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))?;
 
     Ok(transfer_rust_instance_to_js(&rust_instance))
@@ -201,8 +207,8 @@ impl NacosNamingClient {
     clusters: Option<Vec<String>>,
     listener: ThreadsafeFunction<Vec<NacosServiceInstance>>,
   ) -> Result<()> {
-    let inner = self.inner.lock().await;
-    inner
+    self
+      .inner
       .subscribe(
         service_name,
         Some(group),
@@ -211,6 +217,7 @@ impl NacosNamingClient {
           func: Arc::new(listener),
         }),
       )
+      .await
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))?;
     Ok(())
   }