chore(volo-http): put client_ip to cx.ext (#541)

Signed-off-by: Yu Li <[email protected]>
cloudwego · Nov 29, 2024 · 0d39960 · 0d39960
1 parent 519c1f4
commit 0d39960
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/volo-http/Cargo.toml b/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

diff --git a/volo-http/src/server/extract.rs b/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))
+        }
     }
 }
 

diff --git a/volo-http/src/server/utils/client_ip.rs b/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
     }