nacos-sdk-rust-binding-node 0.3.7-alpha → 0.4.2

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "nacos-sdk-rust-binding-node"
-version = "0.3.7-alpha"
+version = "0.4.2"
 authors = ["CheirshCai <785427346@qq.com>"]
 license = "Apache-2.0"
 readme = "README.md"
@@ -18,8 +18,8 @@ crate-type = ["cdylib"]
 napi = { version = "2", default-features = false, features = ["napi4", "async"] }
 napi-derive = "2"
 
-nacos-sdk = { version = "0.3.6", features = ["async"] }
-#nacos-sdk = { git = "https://github.com/nacos-group/nacos-sdk-rust.git", branch = "main", features = ["async"] }
+nacos-sdk = { version = "0.4.2", features = ["default", "auth-by-aliyun"] }
+#nacos-sdk = { git = "https://github.com/nacos-group/nacos-sdk-rust.git", branch = "main", features = ["default"] }
 
 tracing-subscriber = { version = "0.3", features = ["default"] }
 #tracing-subscriber = { version = "0.3", features = ["env-filter", "local-time"] } # occur `<unknown time>`

package/example/config.js

@@ -6,22 +6,22 @@ const { NacosConfigClient, NacosConfigResponse } = require('../index')
 // 请注意！一般情况下，应用下仅需一个 Config 客户端，而且需要长期持有直至应用停止。
 // 因为它内部会初始化与服务端的长链接，后续的数据交互及变更订阅，都是实时地通过长链接告知客户端的。
 const nacos_config_client = new NacosConfigClient({
-    serverAddr: '0.0.0.0:8848',
-    namespace: "hongwen",
+    serverAddr: '127.0.0.1:8848',
+    namespace: "love",
     appName: "binding-node-example-app"
 });
 
 try {
     // If it fails, pay attention to err
-    nacos_config_client.getConfig('hongwen.properties', 'LOVE').then(data => {
+    nacos_config_client.getConfig('todo-dataid', 'LOVE').then(data => {
         console.log('getConfig => ' + data);
     });
 
-    nacos_config_client.getConfigResp('hongwen.properties', 'LOVE').then(data => {
+    nacos_config_client.getConfigResp('todo-dataid', 'LOVE').then(data => {
         console.log('getConfigResp => ' + JSON.stringify(data));
     });
 } catch(e) {
     console.log(e);
 }
 
-nacos_config_client.addListener('hongwen.properties', 'LOVE', (err, config_resp) => { console.log(config_resp) });
+nacos_config_client.addListener('todo-dataid', 'LOVE', (err, config_resp) => { console.log(config_resp) });

package/example/config_decrypt.js

@@ -8,7 +8,7 @@ const { NacosConfigClient, NacosConfigResponse } = require('../index')
 const nacos_config_client = new NacosConfigClient(
 {
     serverAddr: '127.0.0.1:8848',
-    namespace: "hongwen",
+    namespace: "love",
     appName: "binding-node-example-app"
 },
 (err, config_req, config_resp) => {
@@ -29,15 +29,15 @@ const nacos_config_client = new NacosConfigClient(
 
 try {
     // If it fails, pay attention to err
-    nacos_config_client.getConfig('hongwen.properties', 'LOVE').then(data => {
+    nacos_config_client.getConfig('todo-dataid', 'LOVE').then(data => {
         console.log('getConfig => ' + data);
     });
    
-    nacos_config_client.getConfigResp('hongwen.properties', 'LOVE').then((data) => {
+    nacos_config_client.getConfigResp('todo-dataid', 'LOVE').then((data) => {
         console.log('getConfigResp => ' + JSON.stringify(data));
     });
 } catch(e) {
     console.log(e);
 }
 
-nacos_config_client.addListener('hongwen.properties', 'LOVE', (err, config_resp) => { console.log(config_resp) });
+nacos_config_client.addListener('todo-dataid', 'LOVE', (err, config_resp) => { console.log(config_resp) });

package/example/naming.js

@@ -6,8 +6,8 @@ const { NacosNamingClient, NacosServiceInstance } = require('../index')
 // 请注意！一般情况下，应用下仅需一个 Naming 客户端，而且需要长期持有直至应用停止。
 // 因为它内部会初始化与服务端的长链接，后续的数据交互及变更订阅，都是实时地通过长链接告知客户端的。
 const nacos_naming_client = new NacosNamingClient({
-    serverAddr: '0.0.0.0:8848',
-    namespace: "hongwen",
+    serverAddr: '127.0.0.1:8848',
+    namespace: "love",
     appName: "binding-node-example-app"
 });
 

package/index.d.ts

@@ -3,7 +3,7 @@
 
 /* auto-generated by NAPI-RS */
 
-export function sum(a: number, b: number): number
+export declare function sum(a: number, b: number): number
 export interface ClientOptions {
   /** Server Addr, e.g. address:port[,address:port],...] */
   serverAddr: string
@@ -11,10 +11,16 @@ export interface ClientOptions {
   namespace: string
   /** AppName */
   appName?: string
-  /** Username for Auth */
+  /** Username for Auth, Login by Http with Token */
   username?: string
-  /** Password for Auth */
+  /** Password for Auth, Login by Http with Token */
   password?: string
+  /** Access_Key for Auth, Login by Aliyun Ram */
+  accessKey?: string
+  /** Access_Secret for Auth, Login by Aliyun Ram */
+  accessSecret?: string
+  /** Signature_Region_Id for Auth, Login by Aliyun Ram */
+  signatureRegionId?: string
   /** naming push_empty_protection, default true */
   namingPushEmptyProtection?: boolean
   /** naming load_cache_at_start, default false */

package/package.json

@@ -7,7 +7,7 @@
     "binding",
     "ffi"
   ],
-  "version": "0.3.7-alpha",
+  "version": "0.4.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.3.7-alpha",
-    "nacos-sdk-rust-binding-node-darwin-x64": "0.3.7-alpha",
-    "nacos-sdk-rust-binding-node-linux-x64-gnu": "0.3.7-alpha",
-    "nacos-sdk-rust-binding-node-darwin-arm64": "0.3.7-alpha",
-    "nacos-sdk-rust-binding-node-android-arm64": "0.3.7-alpha",
-    "nacos-sdk-rust-binding-node-linux-arm64-gnu": "0.3.7-alpha",
-    "nacos-sdk-rust-binding-node-linux-arm64-musl": "0.3.7-alpha",
-    "nacos-sdk-rust-binding-node-win32-arm64-msvc": "0.3.7-alpha",
-    "nacos-sdk-rust-binding-node-linux-arm-gnueabihf": "0.3.7-alpha",
-    "nacos-sdk-rust-binding-node-linux-x64-musl": "0.3.7-alpha",
-    "nacos-sdk-rust-binding-node-freebsd-x64": "0.3.7-alpha",
-    "nacos-sdk-rust-binding-node-win32-ia32-msvc": "0.3.7-alpha",
-    "nacos-sdk-rust-binding-node-android-arm-eabi": "0.3.7-alpha",
-    "nacos-sdk-rust-binding-node-darwin-universal": "0.3.7-alpha"
+    "nacos-sdk-rust-binding-node-win32-x64-msvc": "0.4.2",
+    "nacos-sdk-rust-binding-node-darwin-x64": "0.4.2",
+    "nacos-sdk-rust-binding-node-linux-x64-gnu": "0.4.2",
+    "nacos-sdk-rust-binding-node-darwin-arm64": "0.4.2",
+    "nacos-sdk-rust-binding-node-android-arm64": "0.4.2",
+    "nacos-sdk-rust-binding-node-linux-arm64-gnu": "0.4.2",
+    "nacos-sdk-rust-binding-node-linux-arm64-musl": "0.4.2",
+    "nacos-sdk-rust-binding-node-win32-arm64-msvc": "0.4.2",
+    "nacos-sdk-rust-binding-node-linux-arm-gnueabihf": "0.4.2",
+    "nacos-sdk-rust-binding-node-linux-x64-musl": "0.4.2",
+    "nacos-sdk-rust-binding-node-freebsd-x64": "0.4.2",
+    "nacos-sdk-rust-binding-node-win32-ia32-msvc": "0.4.2",
+    "nacos-sdk-rust-binding-node-android-arm-eabi": "0.4.2",
+    "nacos-sdk-rust-binding-node-darwin-universal": "0.4.2"
   }
 }

package/src/config.rs

@@ -35,18 +35,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)
     };

package/src/lib.rs

@@ -50,10 +50,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

@@ -29,18 +29,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)
     };