Merge pull request #160 from nacos-group/0.3.x

Enhance: 0.3.x tonic instead of tikv/grpc-rs

.clippy.toml

@@ -0,0 +1,14 @@
+type-complexity-threshold = 500
+disallowed-methods = [
+    # Mutating environment variables in a multi-threaded context can cause data races.
+    # see https://github.com/rust-lang/rust/issues/90308 for details.
+    "std::env::set_var",
+    "std::env::remove_var",
+
+    # Use tokio::time::sleep instead.
+    "std::time::sleep",
+]
+disallowed-types = [
+    # Use tokio::time::Instant instead.
+    "std::time::Instant",
+]

.gitignore

@@ -12,9 +12,9 @@ Cargo.lock
 # IDE
 .idea
 .vscode
+.history
+.DS_Store
 
 # Customize
 ### google.protobuf.rs build by prost-build, exclude it because no content.
 **/google.protobuf.rs
-.DS_Store
-.history

CHANGELOG.md

@@ -1,5 +1,9 @@
 # 变更日志 | Change log
 
+### 0.3.0
+- Refactor: tonic instead of tikv/grpc-rs
+- TODO
+
 ### 0.2.6
 
 - 修复 `ServiceInfoUpdateTask` 丢失 auth header

Cargo.toml

@@ -18,7 +18,7 @@
 
 [package]
 name = "nacos-sdk"
-version = "0.2.6"
+version = "0.3.0-alpha"
 edition = "2021"
 authors = ["nacos-group", "CheirshCai <785427346@qq.com>", "onewe <2583021406@qq.com>"]
 license = "Apache-2.0"
@@ -49,34 +49,36 @@ async = ["async-trait"]
 nacos-macro = { version = "0.1.0", path = "nacos-macro" }
 thiserror = "1.0"
 tokio = { version = "1.21", features = ["full"] }
-#tokio-stream = { version = "0.1", features = ["net"] }
+
 futures = "0.3"
-grpcio = { version = "0.12", default-features = false, features = ["prost-codec"] }
 prost = "0.11"
 prost-types = "0.11"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-serde_repr = "0.1"
 lazy_static = "1.4"
-#crossbeam = "0"
-#async_once = "0"
 
-#opentelemetry = "0"
 tracing = "0.1"
 local_ipaddress = "0.1.3"
 rand = "0.8.5"
-url="2.3.1"
 
 # now only for feature="auth-by-http"
 reqwest = { version = "0.11", default-features = false, features = [], optional = true }
-async-trait = {version = "0.1", optional = true}
+# for feature="async"
+async-trait = { version = "0.1", optional = true }
 
+async-stream = "0.3.5"
+tonic = "0.9"
+tower = { version = "0.4.13", features = ["filter", "log"] }
+pin-project = "1.0.12"
+futures-util = "0.3.28"
+want = "0.3.0"
+dashmap = "5.4.0"
+home = "0.5.4"
 
-[dev-dependencies]
-grpcio-compiler = { version = "0.12", default-features = false, features = ["prost-codec"] }
-prost-build = "0.11"
 
+[dev-dependencies]
 tracing-subscriber = { version = "0.3", features = ["default"] }
+tonic-build = "0.9"
 
 [[example]]
 name = "simple_app"

README.md

@@ -18,7 +18,7 @@ Add the dependency in `Cargo.toml`:
 ```toml
 [dependencies]
 # If you need async API, which can be enabled via `features = ["async"]`
-nacos-sdk = { version = "0.2", features = ["default"] }
+nacos-sdk = { version = "0.3", features = ["default"] }
 ```
 
 ### Usage of Config

examples/simple_app.rs

@@ -6,8 +6,6 @@ use nacos_sdk::api::naming::{
     NamingChangeEvent, NamingEventListener, NamingService, NamingServiceBuilder, ServiceInstance,
 };
 use nacos_sdk::api::props::ClientProps;
-use std::time::Duration;
-use tokio::time::sleep;
 
 /// enable https auth run with command:
 /// cargo run --example simple_app --features default,tls
@@ -73,7 +71,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         Some(constants::DEFAULT_GROUP.to_string()),
         vec![service_instance1],
     );
-    sleep(Duration::from_millis(111)).await;
+    tokio::time::sleep(tokio::time::Duration::from_millis(666)).await;
 
     let instances_ret = naming_service.get_all_instances(
         "test-service".to_string(),
@@ -86,7 +84,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         Err(err) => tracing::error!("naming get_all_instances error {:?}", err),
     }
 
-    sleep(Duration::from_secs(300)).await;
+    tokio::time::sleep(tokio::time::Duration::from_secs(300)).await;
 
     Ok(())
 }