Merge remote-tracking branch 'origin/feature/better-grpc-split' into …

…feature/better-grpc-split

# Conflicts:
#	tests/code-generation-workspace-split-grpc/.gitignore
#	tests/code-generation-workspace-split-grpc/Cargo.toml
#	tests/code-generation-workspace-split-grpc/volo.workspace.yml

tests/code-generation-workspace-split-grpc/proto/echo.proto

@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+package echo;
+
+message EchoRequest {
+    string message = 1;
+}
+
+message EchoResponse {
+    string message = 1;
+}
+
+service Echo {
+    rpc Echo(EchoRequest) returns (EchoResponse) {}
+}

volo-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "volo-http"
-version = "0.3.0"
+version = "0.3.1"
 edition.workspace = true
 homepage.workspace = true
 repository.workspace = true

volo-http/src/server/extract.rs

@@ -295,13 +295,11 @@ impl FromContext for ClientIp {
     type Rejection = Infallible;
 
     async fn from_context(cx: &mut ServerContext, _: &mut Parts) -> Result<Self, Self::Rejection> {
-        Ok(ClientIp(
-            cx.rpc_info
-                .caller()
-                .tags
-                .get::<ClientIp>()
-                .and_then(|v| v.0),
-        ))
+        if let Some(client_ip) = cx.extensions().get::<ClientIp>() {
+            Ok(client_ip.to_owned())
+        } else {
+            Ok(ClientIp(None))
+        }
     }
 }
 

volo-http/src/server/utils/client_ip.rs

@@ -268,7 +268,7 @@ where
         req: Request<B>,
     ) -> Result<Self::Response, Self::Error> {
         let client_ip = self.get_client_ip(cx, req.headers());
-        cx.rpc_info_mut().caller_mut().insert(client_ip);
+        cx.extensions_mut().insert(client_ip);
 
         self.service.call(cx, req).await
     }