nacos-sdk-rust-binding-node 0.4.0 → 0.5.3-BETA2

package/package.json

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

package/src/config.rs

@@ -6,7 +6,7 @@ use std::sync::Arc;
 /// Client api of Nacos Config.
 #[napi]
 pub struct NacosConfigClient {
-  inner: Arc<dyn nacos_sdk::api::config::ConfigService + Send + Sync + 'static>,
+  inner: nacos_sdk::api::config::ConfigService,
 }
 
 #[napi]
@@ -22,9 +22,6 @@ impl NacosConfigClient {
       )>,
     >,
   ) -> Result<NacosConfigClient> {
-    // print to console or file
-    let _ = crate::init_logger();
-
     let props = nacos_sdk::api::props::ClientProps::new()
       .server_addr(client_options.server_addr)
       .namespace(client_options.namespace)
@@ -35,18 +32,29 @@ impl NacosConfigClient {
       );
 
     // need enable_auth_plugin_http with username & password
-    let is_enable_auth = client_options.username.is_some() && client_options.password.is_some();
+    let is_enable_auth_http =
+      client_options.username.is_some() && client_options.password.is_some();
+    // need enable_auth_plugin_aliyun with access_key & access_secret
+    let is_enable_auth_aliyun =
+      client_options.access_key.is_some() && client_options.access_secret.is_some();
 
-    let props = if is_enable_auth {
+    let props = if is_enable_auth_http {
       props
         .auth_username(client_options.username.unwrap())
         .auth_password(client_options.password.unwrap())
+    } else if is_enable_auth_aliyun {
+      props
+        .auth_access_key(client_options.access_key.unwrap())
+        .auth_access_secret(client_options.access_secret.unwrap())
+        .auth_signature_region_id(client_options.signature_region_id.unwrap())
     } else {
       props
     };
 
-    let config_service_builder = if is_enable_auth {
+    let config_service_builder = if is_enable_auth_http {
       nacos_sdk::api::config::ConfigServiceBuilder::new(props).enable_auth_plugin_http()
+    } else if is_enable_auth_aliyun {
+      nacos_sdk::api::config::ConfigServiceBuilder::new(props).enable_auth_plugin_aliyun()
     } else {
       nacos_sdk::api::config::ConfigServiceBuilder::new(props)
     };
@@ -64,7 +72,7 @@ impl NacosConfigClient {
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))?;
 
     Ok(NacosConfigClient {
-      inner: Arc::new(config_service),
+      inner: config_service,
     })
   }
 

package/src/lib.rs

@@ -8,40 +8,6 @@ pub fn sum(a: i32, b: i32) -> i32 {
   a + b
 }
 
-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(),
-      };
-      let file_appender = tracing_appender::rolling::daily(home_dir + "/logs/nacos", "nacos.log");
-      let (non_blocking, guard) = tracing_appender::non_blocking(file_appender);
-
-      tracing_subscriber::fmt()
-        .with_writer(non_blocking)
-        // .with_timer(tracing_subscriber::fmt::time::LocalTime::rfc_3339()) // occur `<unknown time>`
-        .with_thread_names(true)
-        .with_thread_ids(true)
-        .with_max_level(log_level)
-        .init();
-
-      guard
-    };
-
-}
-
-/// log print to console or file
-fn init_logger() -> &'static tracing_appender::non_blocking::WorkerGuard {
-  &LOG_GUARD
-}
-
 #[napi(object)]
 pub struct ClientOptions {
   /// Server Addr, e.g. address:port[,address:port],...]
@@ -50,10 +16,16 @@ pub struct ClientOptions {
   pub namespace: String,
   /// AppName
   pub app_name: Option<String>,
-  /// Username for Auth
+  /// Username for Auth, Login by Http with Token
   pub username: Option<String>,
-  /// Password for Auth
+  /// Password for Auth, Login by Http with Token
   pub password: Option<String>,
+  /// Access_Key for Auth, Login by Aliyun Ram
+  pub access_key: Option<String>,
+  /// Access_Secret for Auth, Login by Aliyun Ram
+  pub access_secret: Option<String>,
+  /// Signature_Region_Id for Auth, Login by Aliyun Ram
+  pub signature_region_id: Option<String>,
   /// naming push_empty_protection, default true
   pub naming_push_empty_protection: Option<bool>,
   /// naming load_cache_at_start, default false

package/src/naming.rs

@@ -6,7 +6,7 @@ use std::sync::Arc;
 /// Client api of Nacos Naming.
 #[napi]
 pub struct NacosNamingClient {
-  inner: Arc<dyn nacos_sdk::api::naming::NamingService + Send + Sync + 'static>,
+  inner: nacos_sdk::api::naming::NamingService,
 }
 
 #[napi]
@@ -14,9 +14,6 @@ impl NacosNamingClient {
   /// Build a Naming Client.
   #[napi(constructor)]
   pub fn new(client_options: crate::ClientOptions) -> Result<NacosNamingClient> {
-    // print to console or file
-    let _ = crate::init_logger();
-
     let props = nacos_sdk::api::props::ClientProps::new()
       .server_addr(client_options.server_addr)
       .namespace(client_options.namespace)
@@ -29,18 +26,29 @@ impl NacosNamingClient {
       .naming_load_cache_at_start(client_options.naming_load_cache_at_start.unwrap_or(false));
 
     // need enable_auth_plugin_http with username & password
-    let is_enable_auth = client_options.username.is_some() && client_options.password.is_some();
+    let is_enable_auth_http =
+      client_options.username.is_some() && client_options.password.is_some();
+    // need enable_auth_plugin_aliyun with access_key & access_secret
+    let is_enable_auth_aliyun =
+      client_options.access_key.is_some() && client_options.access_secret.is_some();
 
-    let props = if is_enable_auth {
+    let props = if is_enable_auth_http {
       props
         .auth_username(client_options.username.unwrap())
         .auth_password(client_options.password.unwrap())
+    } else if is_enable_auth_aliyun {
+      props
+        .auth_access_key(client_options.access_key.unwrap())
+        .auth_access_secret(client_options.access_secret.unwrap())
+        .auth_signature_region_id(client_options.signature_region_id.unwrap())
     } else {
       props
     };
 
-    let naming_service_builder = if is_enable_auth {
+    let naming_service_builder = if is_enable_auth_http {
       nacos_sdk::api::naming::NamingServiceBuilder::new(props).enable_auth_plugin_http()
+    } else if is_enable_auth_aliyun {
+      nacos_sdk::api::naming::NamingServiceBuilder::new(props).enable_auth_plugin_aliyun()
     } else {
       nacos_sdk::api::naming::NamingServiceBuilder::new(props)
     };
@@ -50,7 +58,7 @@ impl NacosNamingClient {
       .map_err(|nacos_err| Error::from_reason(nacos_err.to_string()))?;
 
     Ok(NacosNamingClient {
-      inner: Arc::new(naming_service),
+      inner: naming_service,
     })
   }