Bonus: removed unnecessary boxing

Signed-off-by: slinkydeveloper <[email protected]>
hyperium · Oct 25, 2022 · ceed9c1 · ceed9c1
1 parent 5cefddf
commit ceed9c1
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 15 deletions.
diff --git a/tonic-web/src/lib.rs b/tonic-web/src/lib.rs
@@ -95,8 +95,6 @@ mod layer;
 mod service;
 
 use http::header::HeaderName;
-use std::future::Future;
-use std::pin::Pin;
 use std::time::Duration;
 use tonic::body::BoxBody;
 use tower_http::cors::{AllowOrigin, Cors, CorsLayer};
@@ -110,7 +108,6 @@ const DEFAULT_ALLOW_HEADERS: [&str; 4] =
     ["x-grpc-web", "content-type", "x-user-agent", "grpc-timeout"];
 
 type BoxError = Box<dyn std::error::Error + Send + Sync>;
-type BoxFuture<T, E> = Pin<Box<dyn Future<Output = Result<T, E>> + Send>>;
 
 /// Enable a tonic service to handle grpc-web requests with the default configuration.
 ///

diff --git a/tonic-web/src/service.rs b/tonic-web/src/service.rs
@@ -1,15 +1,19 @@
+use futures_core::ready;
+use std::future::Future;
+use std::pin::Pin;
 use std::task::{Context, Poll};
 
 use http::{header, HeaderMap, HeaderValue, Method, Request, Response, StatusCode, Version};
 use hyper::Body;
+use pin_project::pin_project;
 use tonic::body::{empty_body, BoxBody};
 use tonic::transport::NamedService;
 use tower_service::Service;
 use tracing::{debug, trace};
 
 use crate::call::content_types::is_grpc_web;
 use crate::call::{Encoding, GrpcWebCall};
-use crate::{BoxError, BoxFuture};
+use crate::BoxError;
 
 const GRPC: &str = "application/grpc";
 
@@ -47,13 +51,17 @@ impl<S> GrpcWebService<S>
 where
     S: Service<Request<Body>, Response = Response<BoxBody>> + Send + 'static,
 {
-    fn response(&self, status: StatusCode) -> BoxFuture<S::Response, S::Error> {
-        Box::pin(async move {
-            Ok(Response::builder()
-                .status(status)
-                .body(empty_body())
-                .unwrap())
-        })
+    fn response(&self, status: StatusCode) -> ResponseFuture<S::Future> {
+        ResponseFuture {
+            case: Case::ImmediateResponse {
+                res: Some(
+                    Response::builder()
+                        .status(status)
+                        .body(empty_body())
+                        .unwrap(),
+                ),
+            },
+        }
     }
 }
 
@@ -65,7 +73,7 @@ where
 {
     type Response = S::Response;
     type Error = S::Error;
-    type Future = BoxFuture<Self::Response, Self::Error>;
+    type Future = ResponseFuture<S::Future>;
 
     fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.inner.poll_ready(cx)
@@ -89,8 +97,12 @@ where
             } => {
                 trace!(kind = "simple", path = ?req.uri().path(), ?encoding, ?accept);
 
-                let fut = self.inner.call(coerce_request(req, encoding));
-                Box::pin(async move { Ok(coerce_response(fut.await?, accept)) })
+                ResponseFuture {
+                    case: Case::GrpcWeb {
+                        future: self.inner.call(coerce_request(req, encoding)),
+                        accept,
+                    },
+                }
             }
 
             // The request's content-type matches one of the 4 supported grpc-web
@@ -105,7 +117,11 @@ where
             // whatever they are.
             RequestKind::Other(Version::HTTP_2) => {
                 debug!(kind = "other h2", content_type = ?req.headers().get(header::CONTENT_TYPE));
-                Box::pin(self.inner.call(req))
+                ResponseFuture {
+                    case: Case::Other {
+                        future: self.inner.call(req),
+                    },
+                }
             }
 
             // Return HTTP 400 for all other requests.
@@ -117,6 +133,54 @@ where
     }
 }
 
+#[allow(missing_debug_implementations)]
+#[pin_project]
+pub struct ResponseFuture<F> {
+    #[pin]
+    case: Case<F>,
+}
+
+#[pin_project(project = CaseProj)]
+enum Case<F> {
+    GrpcWeb {
+        #[pin]
+        future: F,
+        accept: Encoding,
+    },
+    Other {
+        #[pin]
+        future: F,
+    },
+    ImmediateResponse {
+        res: Option<Response<BoxBody>>,
+    },
+}
+
+impl<F, E> Future for ResponseFuture<F>
+where
+    F: Future<Output = Result<Response<BoxBody>, E>> + Send + 'static,
+    E: Into<BoxError> + Send,
+{
+    type Output = Result<Response<BoxBody>, E>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let mut this = self.project();
+
+        match this.case.as_mut().project() {
+            CaseProj::GrpcWeb { future, accept } => {
+                let res = match ready!(future.poll(cx)) {
+                    Ok(b) => b,
+                    Err(e) => return Poll::Ready(Err(e)),
+                };
+
+                Poll::Ready(Ok(coerce_response(res, *accept)))
+            }
+            CaseProj::Other { future } => future.poll(cx),
+            CaseProj::ImmediateResponse { res } => Poll::Ready(Ok(res.take().unwrap())),
+        }
+    }
+}
+
 impl<S: NamedService> NamedService for GrpcWebService<S> {
     const NAME: &'static str = S::NAME;
 }
@@ -177,6 +241,8 @@ mod tests {
         ACCESS_CONTROL_REQUEST_HEADERS, ACCESS_CONTROL_REQUEST_METHOD, CONTENT_TYPE, ORIGIN,
     };
 
+    type BoxFuture<T, E> = Pin<Box<dyn Future<Output = Result<T, E>> + Send>>;
+
     #[derive(Debug, Clone)]
     struct Svc;