feat: Move Request server util method to RequestExt

examples/src/autoreload/server.rs

@@ -1,4 +1,7 @@
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{
+    transport::{RequestExt, Server},
+    Request, Response, Status,
+};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/cancellation/server.rs

@@ -1,7 +1,10 @@
 use std::future::Future;
 
 use tokio_util::sync::CancellationToken;
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{
+    transport::{RequestExt, Server},
+    Request, Response, Status,
+};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/codec_buffers/server.rs

@@ -5,7 +5,10 @@
 //! The generated code assumes that a module `crate::common` exists which defines
 //! `SmallBufferCodec`, and `SmallBufferCodec` must have a Default implementation.
 
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{
+    transport::{RequestExt, Server},
+    Request, Response, Status,
+};
 
 pub mod common;
 

examples/src/compression/server.rs

@@ -1,4 +1,7 @@
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{
+    transport::{RequestExt, Server},
+    Request, Response, Status,
+};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/dynamic/server.rs

@@ -1,5 +1,9 @@
 use std::env;
-use tonic::{service::RoutesBuilder, transport::Server, Request, Response, Status};
+use tonic::{
+    service::RoutesBuilder,
+    transport::{RequestExt, Server},
+    Request, Response, Status,
+};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/grpc-web/server.rs

@@ -1,4 +1,7 @@
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{
+    transport::{RequestExt, Server},
+    Request, Response, Status,
+};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/h2c/server.rs

@@ -4,7 +4,7 @@ use hyper_util::rt::{TokioExecutor, TokioIo};
 use hyper_util::server::conn::auto::Builder;
 use hyper_util::service::TowerToHyperService;
 use tokio::net::TcpListener;
-use tonic::{service::Routes, Request, Response, Status};
+use tonic::{service::Routes, transport::RequestExt, Request, Response, Status};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/health/server.rs

@@ -1,4 +1,7 @@
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{
+    transport::{RequestExt, Server},
+    Request, Response, Status,
+};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/helloworld/server.rs

@@ -1,4 +1,7 @@
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{
+    transport::{RequestExt, Server},
+    Request, Response, Status,
+};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/json-codec/server.rs

@@ -4,7 +4,10 @@
 //! in the `examples/build.rs` file. As defined there, the generated code assumes that a module
 //! `crate::common` exists which defines `HelloRequest`, `HelloResponse`, and `JsonCodec`.
 
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{
+    transport::{RequestExt, Server},
+    Request, Response, Status,
+};
 
 pub mod common;
 use common::{HelloRequest, HelloResponse};

examples/src/reflection/server.rs

@@ -1,4 +1,4 @@
-use tonic::transport::Server;
+use tonic::transport::{RequestExt, Server};
 use tonic::{Request, Response, Status};
 
 mod proto {

examples/src/richer-error/server.rs

@@ -1,4 +1,7 @@
-use tonic::{transport::Server, Code, Request, Response, Status};
+use tonic::{
+    transport::{server::RequestExt, Server},
+    Code, Request, Response, Status,
+};
 use tonic_types::{ErrorDetails, StatusExt};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};

examples/src/richer-error/server_vec.rs

@@ -1,4 +1,7 @@
-use tonic::{transport::Server, Code, Request, Response, Status};
+use tonic::{
+    transport::{RequestExt, Server},
+    Code, Request, Response, Status,
+};
 use tonic_types::{BadRequest, Help, LocalizedMessage, StatusExt};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};

examples/src/streaming/server.rs

@@ -5,7 +5,10 @@ pub mod pb {
 use std::{error::Error, io::ErrorKind, net::ToSocketAddrs, pin::Pin, time::Duration};
 use tokio::sync::mpsc;
 use tokio_stream::{wrappers::ReceiverStream, Stream, StreamExt};
-use tonic::{transport::Server, Request, Response, Status, Streaming};
+use tonic::{
+    transport::{RequestExt, Server},
+    Request, Response, Status, Streaming,
+};
 
 use pb::{EchoRequest, EchoResponse};
 

examples/src/timeout/server.rs

@@ -1,6 +1,9 @@
 use std::time::Duration;
 use tokio::time::sleep;
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{
+    transport::{RequestExt, Server},
+    Request, Response, Status,
+};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};

examples/src/tls/server.rs

@@ -6,7 +6,7 @@ use pb::{EchoRequest, EchoResponse};
 use tonic::{
     transport::{
         server::{TcpConnectInfo, TlsConnectInfo},
-        Identity, Server, ServerTlsConfig,
+        Identity, RequestExt, Server, ServerTlsConfig,
     },
     Request, Response, Status,
 };

examples/src/tls_client_auth/server.rs

@@ -3,7 +3,7 @@ pub mod pb {
 }
 
 use pb::{EchoRequest, EchoResponse};
-use tonic::transport::{Certificate, Identity, Server, ServerTlsConfig};
+use tonic::transport::{Certificate, Identity, RequestExt, Server, ServerTlsConfig};
 use tonic::{Request, Response, Status};
 
 type EchoResult<T> = Result<Response<T>, Status>;

examples/src/tower/server.rs

@@ -3,7 +3,11 @@ use std::{
     task::{Context, Poll},
     time::Duration,
 };
-use tonic::{body::BoxBody, transport::Server, Request, Response, Status};
+use tonic::{
+    body::BoxBody,
+    transport::{RequestExt, Server},
+    Request, Response, Status,
+};
 use tower::{Layer, Service};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};

tests/integration_tests/tests/connect_info.rs

@@ -2,7 +2,7 @@ use integration_tests::pb::{test_client, test_server, Input, Output};
 use std::time::Duration;
 use tokio::sync::oneshot;
 use tonic::{
-    transport::{server::TcpConnectInfo, Endpoint, Server},
+    transport::{server::TcpConnectInfo, Endpoint, RequestExt, Server},
     Request, Response, Status,
 };
 
@@ -60,7 +60,7 @@ pub mod unix {
     };
     use tokio_stream::wrappers::UnixListenerStream;
     use tonic::{
-        transport::{server::UdsConnectInfo, Endpoint, Server, Uri},
+        transport::{server::UdsConnectInfo, Endpoint, RequestExt, Server, Uri},
         Request, Response, Status,
     };
     use tower::service_fn;

tonic/src/request.rs

@@ -1,18 +1,10 @@
-use crate::metadata::{MetadataMap, MetadataValue};
-#[cfg(feature = "server")]
-use crate::transport::server::TcpConnectInfo;
-#[cfg(all(feature = "server", feature = "tls"))]
-use crate::transport::server::TlsConnectInfo;
-use http::Extensions;
-#[cfg(feature = "server")]
-use std::net::SocketAddr;
-#[cfg(all(feature = "server", feature = "tls"))]
-use std::sync::Arc;
 use std::time::Duration;
-#[cfg(all(feature = "server", feature = "tls"))]
-use tokio_rustls::rustls::pki_types::CertificateDer;
+
+use http::Extensions;
 use tokio_stream::Stream;
 
+use crate::metadata::{MetadataMap, MetadataValue};
+
 /// A gRPC request and metadata from an RPC call.
 #[derive(Debug)]
 pub struct Request<T> {
@@ -206,63 +198,6 @@ impl<T> Request<T> {
         }
     }
 
-    /// Get the local address of this connection.
-    ///
-    /// This will return `None` if the `IO` type used
-    /// does not implement `Connected` or when using a unix domain socket.
-    /// This currently only works on the server side.
-    #[cfg(feature = "server")]
-    pub fn local_addr(&self) -> Option<SocketAddr> {
-        let addr = self
-            .extensions()
-            .get::<TcpConnectInfo>()
-            .and_then(|i| i.local_addr());
-
-        #[cfg(feature = "tls")]
-        let addr = addr.or_else(|| {
-            self.extensions()
-                .get::<TlsConnectInfo<TcpConnectInfo>>()
-                .and_then(|i| i.get_ref().local_addr())
-        });
-
-        addr
-    }
-
-    /// Get the remote address of this connection.
-    ///
-    /// This will return `None` if the `IO` type used
-    /// does not implement `Connected` or when using a unix domain socket.
-    /// This currently only works on the server side.
-    #[cfg(feature = "server")]
-    pub fn remote_addr(&self) -> Option<SocketAddr> {
-        let addr = self
-            .extensions()
-            .get::<TcpConnectInfo>()
-            .and_then(|i| i.remote_addr());
-
-        #[cfg(feature = "tls")]
-        let addr = addr.or_else(|| {
-            self.extensions()
-                .get::<TlsConnectInfo<TcpConnectInfo>>()
-                .and_then(|i| i.get_ref().remote_addr())
-        });
-
-        addr
-    }
-
-    /// Get the peer certificates of the connected client.
-    ///
-    /// This is used to fetch the certificates from the TLS session
-    /// and is mostly used for mTLS. This currently only returns
-    /// `Some` on the server side of the `transport` server with
-    /// TLS enabled connections.
-    #[cfg(all(feature = "server", feature = "tls"))]
-    pub fn peer_certs(&self) -> Option<Arc<Vec<CertificateDer<'static>>>> {
-        self.extensions()
-            .get::<TlsConnectInfo<TcpConnectInfo>>()
-            .and_then(|i| i.peer_certs())
-    }
-
     /// Set the max duration the request is allowed to take.
     ///
     /// Requires the server to support the `grpc-timeout` metadata, which Tonic does.

tonic/src/transport/mod.rs

@@ -105,7 +105,7 @@ pub use self::channel::{Channel, Endpoint};
 pub use self::error::Error;
 #[doc(inline)]
 #[cfg(feature = "server")]
-pub use self::server::Server;
+pub use self::server::{RequestExt, Server};
 /// Deprecated. Please use [`crate::status::TimeoutExpired`] instead.
 pub use crate::status::TimeoutExpired;
 

tonic/src/transport/server/mod.rs

@@ -2,6 +2,7 @@
 
 mod conn;
 mod incoming;
+mod request_ext;
 mod service;
 #[cfg(feature = "tls")]
 mod tls;
@@ -25,6 +26,8 @@ pub use tls::ServerTlsConfig;
 #[cfg(feature = "tls")]
 pub use conn::TlsConnectInfo;
 
+pub use self::request_ext::RequestExt;
+
 #[cfg(feature = "tls")]
 use self::service::TlsAcceptor;
 

tonic/src/transport/server/request_ext.rs

@@ -0,0 +1,84 @@
+use std::net::SocketAddr;
+#[cfg(feature = "tls")]
+use std::sync::Arc;
+
+#[cfg(feature = "tls")]
+use tokio_rustls::rustls::pki_types::CertificateDer;
+
+use super::TcpConnectInfo;
+#[cfg(feature = "tls")]
+use super::TlsConnectInfo;
+use crate::Request;
+
+mod sealed {
+    pub trait Sealed {}
+}
+
+impl<T> sealed::Sealed for Request<T> {}
+
+/// An extension trait adding utility methods to [`Request`].
+pub trait RequestExt: sealed::Sealed {
+    /// Get the local address of this connection.
+    ///
+    /// This will return `None` if the `IO` type used
+    /// does not implement `Connected` or when using a unix domain socket.
+    /// This currently only works on the server side.
+    fn local_addr(&self) -> Option<SocketAddr>;
+
+    /// Get the remote address of this connection.
+    ///
+    /// This will return `None` if the `IO` type used
+    /// does not implement `Connected` or when using a unix domain socket.
+    /// This currently only works on the server side.
+    fn remote_addr(&self) -> Option<SocketAddr>;
+
+    /// Get the peer certificates of the connected client.
+    ///
+    /// This is used to fetch the certificates from the TLS session
+    /// and is mostly used for mTLS. This currently only returns
+    /// `Some` on the server side of the `transport` server with
+    /// TLS enabled connections.
+    #[cfg(feature = "tls")]
+    fn peer_certs(&self) -> Option<Arc<Vec<CertificateDer<'static>>>>;
+}
+
+impl<T> RequestExt for Request<T> {
+    fn local_addr(&self) -> Option<SocketAddr> {
+        let addr = self
+            .extensions()
+            .get::<TcpConnectInfo>()
+            .and_then(|i| i.local_addr());
+
+        #[cfg(feature = "tls")]
+        let addr = addr.or_else(|| {
+            self.extensions()
+                .get::<TlsConnectInfo<TcpConnectInfo>>()
+                .and_then(|i| i.get_ref().local_addr())
+        });
+
+        addr
+    }
+
+    fn remote_addr(&self) -> Option<SocketAddr> {
+        let addr = self
+            .extensions()
+            .get::<TcpConnectInfo>()
+            .and_then(|i| i.remote_addr());
+
+        #[cfg(feature = "tls")]
+        let addr = addr.or_else(|| {
+            self.extensions()
+                .get::<TlsConnectInfo<TcpConnectInfo>>()
+                .and_then(|i| i.get_ref().remote_addr())
+        });
+
+        addr
+    }
+
+    #[cfg(feature = "tls")]
+    fn peer_certs(&self) -> Option<Arc<Vec<CertificateDer<'static>>>> {
+        self.extensions()
+            .get::<TlsConnectInfo<TcpConnectInfo>>()
+            .and_then(|i| i.peer_certs())
+    }
+}