chore(volo-grpc): make grpc-web as a feature (#479)

* chore(volo-grpc): make grpc-web as a feature * fix cargo clippy
cloudwego · Aug 1, 2024 · 0536f8b · 0536f8b
1 parent eb90e1f
commit 0536f8b
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -131,7 +131,7 @@ tracing-subscriber.workspace = true
 
 pilota.workspace = true
 volo = { path = "../volo" }
-volo-grpc = { path = "../volo-grpc" }
+volo-grpc = { path = "../volo-grpc", features = ["grpc-web"] }
 volo-thrift = { path = "../volo-thrift", features = ["multiplex"] }
 volo-http = { path = "../volo-http", features = [
     "default_client",

diff --git a/examples/src/thrift/hello/client.rs b/examples/src/thrift/hello/client.rs
@@ -12,8 +12,6 @@ lazy_static! {
     };
 }
 
-pub struct LogService<S>(S);
-
 #[volo::main]
 async fn main() {
     let req = volo_gen::thrift_gen::hello::HelloRequest {

diff --git a/examples/src/thrift/multiplex/client.rs b/examples/src/thrift/multiplex/client.rs
@@ -13,8 +13,6 @@ lazy_static! {
     };
 }
 
-pub struct LogService<S>(S);
-
 #[volo::main]
 async fn main() {
     let subscriber = tracing_subscriber::FmtSubscriber::builder()

diff --git a/examples/src/thrift/unknown/client.rs b/examples/src/thrift/unknown/client.rs
@@ -12,8 +12,6 @@ lazy_static! {
     };
 }
 
-pub struct LogService<S>(S);
-
 #[volo::main]
 async fn main() {
     tracing_subscriber::fmt::init();

diff --git a/scripts/clippy-and-test.sh b/scripts/clippy-and-test.sh
@@ -28,6 +28,7 @@ echo_command cargo clippy -p volo-grpc --no-default-features -- --deny warnings
 echo_command cargo clippy -p volo-grpc --no-default-features --features rustls -- --deny warnings
 echo_command cargo clippy -p volo-grpc --no-default-features --features native-tls -- --deny warnings
 echo_command cargo clippy -p volo-grpc --no-default-features --features native-tls-vendored -- --deny warnings
+echo_command cargo clippy -p volo-grpc --no-default-features --features grpc-web -- --deny warnings
 echo_command cargo clippy -p volo-http --no-default-features -- --deny warnings
 echo_command cargo clippy -p volo-http --no-default-features --features default_client -- --deny warnings
 echo_command cargo clippy -p volo-http --no-default-features --features default_server -- --deny warnings

diff --git a/volo-grpc/Cargo.toml b/volo-grpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "volo-grpc"
-version = "0.10.2"
+version = "0.10.3"
 edition.workspace = true
 homepage.workspace = true
 repository.workspace = true
@@ -55,8 +55,8 @@ pin-project.workspace = true
 tokio = { workspace = true, features = ["time", "rt", "net", "sync", "signal"] }
 tokio-stream.workspace = true
 tokio-util = { workspace = true, features = ["codec", "compat"] }
-tonic.workspace = true
-tonic-web.workspace = true
+tonic = { workspace = true, optional = true }
+tonic-web = { workspace = true, optional = true }
 tower = { workspace = true, features = [
     "buffer",
     "limit",
@@ -80,3 +80,5 @@ __tls = []
 rustls = ["__tls", "dep:tokio-rustls", "volo/rustls"]
 native-tls = ["__tls", "dep:tokio-native-tls", "volo/native-tls"]
 native-tls-vendored = ["native-tls", "volo/native-tls-vendored"]
+
+grpc-web = ["dep:tonic", "dep:tonic-web"]
diff --git a/volo-grpc/src/layer/mod.rs b/volo-grpc/src/layer/mod.rs
@@ -1,5 +1,6 @@
 pub mod cross_origin;
 pub mod grpc_timeout;
+#[cfg(feature = "grpc-web")]
 pub mod grpc_web;
 pub mod loadbalance;
 pub mod user_agent;