Remove Metadata from ServerHandlerContext

Author: stepancheg

grpc/src/server/ctx.rs

@@ -15,8 +15,6 @@ use tokio::runtime::Handle;
 /// An object passed to server handlers.
 pub struct ServerHandlerContext {
     pub ctx: httpbis::ServerHandlerContext,
-    // TODO: move to request
-    pub metadata: Metadata,
 }
 
 impl ServerHandlerContext {

grpc/src/server/method.rs

@@ -19,6 +19,7 @@ use crate::server::req_handler::ServerRequestUntyped;
 use crate::server::req_single::ServerRequestSingle;
 use crate::server::resp_sink::ServerResponseSink;
 use crate::server::resp_sink_untyped::ServerResponseUntypedSink;
+use crate::Metadata;
 use crate::ServerResponseUnarySink;
 use std::marker;
 
@@ -184,6 +185,7 @@ where
                 + 'static,
         {
             ctx: ServerHandlerContext,
+            metadata: Metadata,
             f: Arc<F>,
             resp: ServerResponseSink<Resp>,
             _marker: marker::PhantomData<Req>,
@@ -207,17 +209,19 @@ where
                     ctx,
                     f,
                     resp,
+                    metadata,
                     _marker,
                 } = self.take().unwrap();
-                let metadata = ctx.metadata.clone();
                 let req = ServerRequestSingle { metadata, message };
                 let resp = ServerResponseUnarySink { sink: resp };
                 f(ctx, req, resp)
             }
         }
 
+        let metadata = req.metadata()?;
         req.register_unary_handler(Some(HandlerImpl {
             ctx,
+            metadata,
             f: self.f.clone(),
             resp,
             _marker: marker::PhantomData,
@@ -284,6 +288,7 @@ where
                 + 'static,
         {
             ctx: ServerHandlerContext,
+            metadata: Metadata,
             f: Arc<F>,
             resp: ServerResponseSink<Resp>,
             _marker: marker::PhantomData<Req>,
@@ -306,10 +311,10 @@ where
                 let HandlerImpl {
                     ctx,
                     f,
+                    metadata,
                     resp,
                     _marker,
                 } = self.take().unwrap();
-                let metadata = ctx.metadata.clone();
                 let req = ServerRequestSingle {
                     metadata,
                     message: req,
@@ -318,8 +323,10 @@ where
             }
         }
 
+        let metadata = req.metadata()?;
         req.register_unary_handler(Some(HandlerImpl {
             ctx,
+            metadata,
             f: self.f.clone(),
             resp,
             _marker: marker::PhantomData,

grpc/src/server/mod.rs

@@ -185,10 +185,7 @@ impl httpbis::ServerHandler for GrpcServerHandler {
             common: SinkCommonUntyped { http: resp },
         };
 
-        let context = ServerHandlerContext {
-            ctx: context,
-            metadata,
-        };
+        let context = ServerHandlerContext { ctx: context };
 
         // TODO: catch unwind
         self.service_definition

grpc/src/server/req_handler.rs

@@ -140,6 +140,12 @@ pub(crate) struct ServerRequestUntyped<'a> {
 }
 
 impl<'a> ServerRequestUntyped<'a> {
+    pub fn metadata(&self) -> crate::Result<Metadata> {
+        // TODO: take, not clone
+        // TODO: do not unwrap
+        Ok(Metadata::from_headers(self.req.headers.clone())?)
+    }
+
     pub fn register_stream_handler<F, H, R>(self, handler: F) -> R
     where
         H: ServerRequestStreamHandlerUntyped,
@@ -168,10 +174,8 @@ pub struct ServerRequest<'a, M: 'static> {
 
 impl<'a, M: Send + 'static> ServerRequest<'a, M> {
     /// Get request metadata.
-    pub fn metadata(&self) -> Metadata {
-        // TODO: take, not clone
-        // TODO: do not unwrap
-        Metadata::from_headers(self.req.req.headers.clone()).unwrap()
+    pub fn metadata(&self) -> crate::Result<Metadata> {
+        self.req.metadata()
     }
 
     /// Register server stream handler.

interop/src/bin/interop_server.rs

@@ -165,7 +165,7 @@ impl TestService for TestServerImpl {
         req: ServerRequest<StreamingOutputCallRequest>,
         mut resp: ServerResponseSink<StreamingOutputCallResponse>,
     ) -> grpc::Result<()> {
-        let metadata = req.metadata();
+        let metadata = req.metadata()?;
         debug!("sending custom metadata");
         resp.send_metadata(echo_custom_metadata(&metadata))?;
         let mut req = req.into_stream();