diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e3f79738..b3cf8669 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -8,7 +8,7 @@ jobs: fail-fast: false matrix: version: - - 1.60.0 # MSRV + - 1.65.0 # MSRV - stable - nightly @@ -43,7 +43,7 @@ jobs: key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo tarpaulin - if: matrix.version == '1.60.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') + if: matrix.version == '1.65.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') uses: actions/cache@v1 with: path: ~/.cargo/bin @@ -64,26 +64,26 @@ jobs: cargo test --no-default-features --no-fail-fast --features="async-std,cookie,url,compress,openssl,rustls" --lib -- --test-threads 1 - name: Install tarpaulin - if: matrix.version == '1.60.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') + if: matrix.version == '1.65.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') continue-on-error: true run: | cargo install cargo-tarpaulin - name: Generate coverage report - if: matrix.version == '1.60.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') + if: matrix.version == '1.65.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') continue-on-error: true run: | cargo tarpaulin --out Xml --all --all-features - name: Generate coverage report (glommio) - if: matrix.version == '1.60.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') + if: matrix.version == '1.65.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') continue-on-error: true run: | cd ntex sudo -E env PATH="$PATH" bash -c "ulimit -l 512 && ulimit -a && cargo tarpaulin --out Xml --no-default-features --features=\"glommio,cookie,url,compress,openssl,rustls\"" - name: Upload to Codecov - if: matrix.version == '1.60.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') + if: matrix.version == '1.65.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') continue-on-error: true uses: codecov/codecov-action@v2 with: diff --git a/Cargo.toml b/Cargo.toml index abc4bf39..6ea62c64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,3 +34,5 @@ ntex-util = { path = "ntex-util" } ntex-glommio = { path = "ntex-glommio" } ntex-tokio = { path = "ntex-tokio" } ntex-async-std = { path = "ntex-async-std" } + +ntex-h2 = { git = "https://github.com/ntex-rs/ntex-h2.git", branch = "service-0-4" } diff --git a/ntex-async-std/Cargo.toml b/ntex-async-std/Cargo.toml index 1e389818..e8793b48 100644 --- a/ntex-async-std/Cargo.toml +++ b/ntex-async-std/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-async-std" -version = "0.1.1" +version = "0.2.0-alpha.0" authors = ["ntex contributors "] description = "async-std intergration for ntex framework" keywords = ["network", "framework", "async", "futures"] @@ -17,8 +17,8 @@ path = "src/lib.rs" [dependencies] ntex-bytes = "0.1.11" -ntex-io = "0.1.7" -ntex-util = "0.1.13" +ntex-io = "0.2.0-alpha.0" +ntex-util = "0.2.0-alpha.0" async-oneshot = "0.5.0" log = "0.4" pin-project-lite = "0.2" diff --git a/ntex-bytes/Cargo.toml b/ntex-bytes/Cargo.toml index 383504e9..260edb68 100644 --- a/ntex-bytes/Cargo.toml +++ b/ntex-bytes/Cargo.toml @@ -27,4 +27,4 @@ simdutf8 = { version = "0.1.4", optional = true } [dev-dependencies] serde_test = "1.0" serde_json = "1.0" -ntex = { version = "0.5", features = ["tokio"] } +ntex = { version = "0.6.0-alpha.0", features = ["tokio"] } diff --git a/ntex-connect/Cargo.toml b/ntex-connect/Cargo.toml index 335e765c..d50e402d 100644 --- a/ntex-connect/Cargo.toml +++ b/ntex-connect/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-connect" -version = "0.1.1" +version = "0.2.0-alpha.0" authors = ["ntex contributors "] description = "ntexwork connect utils for ntex framework" keywords = ["network", "framework", "async", "futures"] @@ -34,19 +34,19 @@ glommio = ["ntex-rt/glommio", "ntex-glommio"] async-std = ["ntex-rt/async-std", "ntex-async-std"] [dependencies] -ntex-service = "0.3.1" +ntex-service = "0.4.0-alpha.0" ntex-bytes = "0.1.15" ntex-http = "0.1.8" -ntex-io = "0.1.11" +ntex-io = "0.2.0-alpha.0" ntex-rt = "0.4.5" -ntex-tls = "0.1.5" -ntex-util = "0.1.18" +ntex-tls = "0.2.0-alpha.0" +ntex-util = "0.2.0-alpha.0" log = "0.4" thiserror = "1.0" -ntex-tokio = { version = "0.1.3", optional = true } -ntex-glommio = { version = "0.1.2", optional = true } -ntex-async-std = { version = "0.1.1", optional = true } +ntex-tokio = { version = "0.2.0-alpha.0", optional = true } +ntex-glommio = { version = "0.2.0-alpha.0", optional = true } +ntex-async-std = { version = "0.2.0-alpha.0", optional = true } # openssl tls-openssl = { version="0.10", package = "openssl", optional = true } @@ -58,4 +58,4 @@ webpki-roots = { version = "0.22", optional = true } [dev-dependencies] rand = "0.8" env_logger = "0.10" -ntex = { version = "0.5", features = ["tokio"] } +ntex = { version = "0.6.0-alpha.0", features = ["tokio"] } diff --git a/ntex-connect/src/lib.rs b/ntex-connect/src/lib.rs index cb9db257..c018c538 100644 --- a/ntex-connect/src/lib.rs +++ b/ntex-connect/src/lib.rs @@ -2,8 +2,6 @@ #[macro_use] extern crate log; -use std::future::Future; - mod error; mod message; mod resolve; @@ -22,14 +20,15 @@ pub use self::resolve::Resolver; pub use self::service::Connector; use ntex_io::Io; +use ntex_service::Service; /// Resolve and connect to remote host -pub fn connect(message: U) -> impl Future> +pub async fn connect(message: U) -> Result where - T: Address + 'static, + T: Address, Connect: From, { - service::ConnectServiceResponse::new(Box::pin(Resolver::new().lookup(message.into()))) + service::ConnectServiceResponse::new(Resolver::new().call(message.into())).await } #[allow(unused_imports)] diff --git a/ntex-connect/src/openssl.rs b/ntex-connect/src/openssl.rs index ef8689af..43666005 100644 --- a/ntex-connect/src/openssl.rs +++ b/ntex-connect/src/openssl.rs @@ -1,4 +1,4 @@ -use std::{future::Future, io, pin::Pin, task::Context, task::Poll}; +use std::io; pub use ntex_tls::openssl::SslFilter; pub use tls_openssl::ssl::{Error as SslError, HandshakeError, SslConnector, SslMethod}; @@ -7,7 +7,7 @@ use ntex_bytes::PoolId; use ntex_io::{Base, Io}; use ntex_service::{Service, ServiceFactory}; use ntex_tls::openssl::SslConnector as IoSslConnector; -use ntex_util::future::Ready; +use ntex_util::future::{BoxFuture, Ready}; use super::{Address, Connect, ConnectError, Connector as BaseConnector}; @@ -39,10 +39,7 @@ impl Connector { impl Connector { /// Resolve and connect to remote host - pub fn connect( - &self, - message: U, - ) -> impl Future>, ConnectError>> + pub async fn connect(&self, message: U) -> Result>, ConnectError> where Connect: From, { @@ -51,26 +48,23 @@ impl Connector { let conn = self.connector.call(message); let openssl = self.openssl.clone(); - async move { - let io = conn.await?; - trace!("SSL Handshake start for: {:?}", host); + let io = conn.await?; + trace!("SSL Handshake start for: {:?}", host); - match openssl.configure() { - Err(e) => Err(io::Error::new(io::ErrorKind::Other, e).into()), - Ok(config) => { - let ssl = config - .into_ssl(&host) - .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?; - match io.add_filter(IoSslConnector::new(ssl)).await { - Ok(io) => { - trace!("SSL Handshake success: {:?}", host); - Ok(io) - } - Err(e) => { - trace!("SSL Handshake error: {:?}", e); - Err(io::Error::new(io::ErrorKind::Other, format!("{}", e)) - .into()) - } + match openssl.configure() { + Err(e) => Err(io::Error::new(io::ErrorKind::Other, e).into()), + Ok(config) => { + let ssl = config + .into_ssl(&host) + .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?; + match io.add_filter(IoSslConnector::new(ssl)).await { + Ok(io) => { + trace!("SSL Handshake success: {:?}", host); + Ok(io) + } + Err(e) => { + trace!("SSL Handshake error: {:?}", e); + Err(io::Error::new(io::ErrorKind::Other, format!("{}", e)).into()) } } } @@ -87,15 +81,15 @@ impl Clone for Connector { } } -impl ServiceFactory, C> for Connector { +impl ServiceFactory, C> for Connector { type Response = Io>; type Error = ConnectError; type Service = Connector; type InitError = (); - type Future = Ready; + type Future<'f> = Ready where Self: 'f; #[inline] - fn new_service(&self, _: C) -> Self::Future { + fn create(&self, _: C) -> Self::Future<'_> { Ready::Ok(self.clone()) } } @@ -103,15 +97,10 @@ impl ServiceFactory, C> for Connector { impl Service> for Connector { type Response = Io>; type Error = ConnectError; - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result>; #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - #[inline] - fn call(&self, req: Connect) -> Self::Future { + fn call(&self, req: Connect) -> Self::Future<'_> { Box::pin(self.connect(req)) } } @@ -130,7 +119,7 @@ mod tests { let ssl = SslConnector::builder(SslMethod::tls()).unwrap(); let factory = Connector::new(ssl.build()).clone().memory_pool(PoolId::P5); - let srv = factory.new_service(()).await.unwrap(); + let srv = factory.create(&()).await.unwrap(); let result = srv .call(Connect::new("").set_addr(Some(server.addr()))) .await; diff --git a/ntex-connect/src/resolve.rs b/ntex-connect/src/resolve.rs index d41de341..013fca79 100644 --- a/ntex-connect/src/resolve.rs +++ b/ntex-connect/src/resolve.rs @@ -1,8 +1,8 @@ -use std::{fmt, future::Future, io, marker, net, pin::Pin, task::Context, task::Poll}; +use std::{fmt, io, marker, net}; use ntex_rt::spawn_blocking; use ntex_service::{Service, ServiceFactory}; -use ntex_util::future::{Either, Ready}; +use ntex_util::future::{BoxFuture, Either, Ready}; use crate::{Address, Connect, ConnectError}; @@ -24,69 +24,62 @@ impl Resolver { impl Resolver { /// Lookup ip addresses for provided host - pub fn lookup( - &self, - mut req: Connect, - ) -> impl Future, ConnectError>> { + pub async fn lookup(&self, mut req: Connect) -> Result, ConnectError> { if req.addr.is_some() || req.req.addr().is_some() { - Either::Right(Ready::Ok(req)) + Ok(req) } else if let Ok(ip) = req.host().parse() { req.addr = Some(Either::Left(net::SocketAddr::new(ip, req.port()))); - Either::Right(Ready::Ok(req)) + Ok(req) } else { trace!("DNS resolver: resolving host {:?}", req.host()); - Either::Left(async move { - let host = if req.host().contains(':') { - req.host().to_string() - } else { - format!("{}:{}", req.host(), req.port()) - }; + let host = if req.host().contains(':') { + req.host().to_string() + } else { + format!("{}:{}", req.host(), req.port()) + }; - let fut = - spawn_blocking(move || net::ToSocketAddrs::to_socket_addrs(&host)); + let fut = spawn_blocking(move || net::ToSocketAddrs::to_socket_addrs(&host)); + match fut.await { + Ok(Ok(ips)) => { + let port = req.port(); + let req = req.set_addrs(ips.map(|mut ip| { + ip.set_port(port); + ip + })); - match fut.await { - Ok(Ok(ips)) => { - let port = req.port(); - let req = req.set_addrs(ips.map(|mut ip| { - ip.set_port(port); - ip - })); + trace!( + "DNS resolver: host {:?} resolved to {:?}", + req.host(), + req.addrs() + ); - trace!( - "DNS resolver: host {:?} resolved to {:?}", - req.host(), - req.addrs() - ); - - if req.addr.is_none() { - Err(ConnectError::NoRecords) - } else { - Ok(req) - } - } - Ok(Err(e)) => { - trace!( - "DNS resolver: failed to resolve host {:?} err: {}", - req.host(), - e - ); - Err(ConnectError::Resolver(e)) - } - Err(e) => { - trace!( - "DNS resolver: failed to resolve host {:?} err: {}", - req.host(), - e - ); - Err(ConnectError::Resolver(io::Error::new( - io::ErrorKind::Other, - e, - ))) + if req.addr.is_none() { + Err(ConnectError::NoRecords) + } else { + Ok(req) } } - }) + Ok(Err(e)) => { + trace!( + "DNS resolver: failed to resolve host {:?} err: {}", + req.host(), + e + ); + Err(ConnectError::Resolver(e)) + } + Err(e) => { + trace!( + "DNS resolver: failed to resolve host {:?} err: {}", + req.host(), + e + ); + Err(ConnectError::Resolver(io::Error::new( + io::ErrorKind::Other, + e, + ))) + } + } } } } @@ -103,15 +96,15 @@ impl Clone for Resolver { } } -impl ServiceFactory, C> for Resolver { +impl ServiceFactory, C> for Resolver { type Response = Connect; type Error = ConnectError; type Service = Resolver; type InitError = (); - type Future = Ready; + type Future<'f> = Ready; #[inline] - fn new_service(&self, _: C) -> Self::Future { + fn create(&self, _: C) -> Self::Future<'_> { Ready::Ok(self.clone()) } } @@ -119,15 +112,10 @@ impl ServiceFactory, C> for Resolver { impl Service> for Resolver { type Response = Connect; type Error = ConnectError; - type Future = Pin, Self::Error>>>>; + type Future<'f> = BoxFuture<'f, Result, Self::Error>>; #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - #[inline] - fn call(&self, req: Connect) -> Self::Future { + fn call(&self, req: Connect) -> Self::Future<'_> { Box::pin(self.lookup(req)) } } @@ -141,7 +129,7 @@ mod tests { async fn resolver() { let resolver = Resolver::default().clone(); assert!(format!("{:?}", resolver).contains("Resolver")); - let srv = resolver.new_service(()).await.unwrap(); + let srv = resolver.create(()).await.unwrap(); assert!(lazy(|cx| srv.poll_ready(cx)).await.is_ready()); let res = srv.call(Connect::new("www.rust-lang.org")).await; diff --git a/ntex-connect/src/rustls.rs b/ntex-connect/src/rustls.rs index 35da51b7..e93fa62e 100644 --- a/ntex-connect/src/rustls.rs +++ b/ntex-connect/src/rustls.rs @@ -1,4 +1,4 @@ -use std::{convert::TryFrom, future::Future, io, pin::Pin, task::Context, task::Poll}; +use std::{convert::TryFrom, io}; pub use ntex_tls::rustls::TlsFilter; pub use tls_rustls::{ClientConfig, ServerName}; @@ -7,7 +7,7 @@ use ntex_bytes::PoolId; use ntex_io::{Base, Io}; use ntex_service::{Service, ServiceFactory}; use ntex_tls::rustls::TlsConnector; -use ntex_util::future::Ready; +use ntex_util::future::{BoxFuture, Ready}; use super::{Address, Connect, ConnectError, Connector as BaseConnector}; @@ -48,10 +48,7 @@ impl Connector { impl Connector { /// Resolve and connect to remote host - pub fn connect( - &self, - message: U, - ) -> impl Future>, ConnectError>> + pub async fn connect(&self, message: U) -> Result>, ConnectError> where Connect: From, { @@ -60,23 +57,21 @@ impl Connector { let conn = self.connector.call(req); let connector = self.inner.clone(); - async move { - let io = conn.await?; - trace!("SSL Handshake start for: {:?}", host); + let io = conn.await?; + trace!("SSL Handshake start for: {:?}", host); - let host = ServerName::try_from(host.as_str()) - .map_err(|e| io::Error::new(io::ErrorKind::Other, format!("{}", e)))?; - let connector = connector.server_name(host.clone()); + let host = ServerName::try_from(host.as_str()) + .map_err(|e| io::Error::new(io::ErrorKind::Other, format!("{}", e)))?; + let connector = connector.server_name(host.clone()); - match io.add_filter(connector).await { - Ok(io) => { - trace!("TLS Handshake success: {:?}", &host); - Ok(io) - } - Err(e) => { - trace!("TLS Handshake error: {:?}", e); - Err(io::Error::new(io::ErrorKind::Other, format!("{}", e)).into()) - } + match io.add_filter(connector).await { + Ok(io) => { + trace!("TLS Handshake success: {:?}", &host); + Ok(io) + } + Err(e) => { + trace!("TLS Handshake error: {:?}", e); + Err(io::Error::new(io::ErrorKind::Other, format!("{}", e)).into()) } } } @@ -91,15 +86,15 @@ impl Clone for Connector { } } -impl ServiceFactory, C> for Connector { +impl ServiceFactory, C> for Connector { type Response = Io>; type Error = ConnectError; type Service = Connector; type InitError = (); - type Future = Ready; + type Future<'f> = Ready where C: 'f; #[inline] - fn new_service(&self, _: C) -> Self::Future { + fn create(&self, _: C) -> Self::Future<'_> { Ready::Ok(self.clone()) } } @@ -107,14 +102,9 @@ impl ServiceFactory, C> for Connector { impl Service> for Connector { type Response = Io>; type Error = ConnectError; - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result>; - #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - fn call(&self, req: Connect) -> Self::Future { + fn call(&self, req: Connect) -> Self::Future<'_> { Box::pin(self.connect(req)) } } @@ -151,7 +141,7 @@ mod tests { let _ = Connector::<&'static str>::new(config.clone()).clone(); let factory = Connector::from(Arc::new(config)).memory_pool(PoolId::P5); - let srv = factory.new_service(()).await.unwrap(); + let srv = factory.create(&()).await.unwrap(); // always ready assert!(lazy(|cx| srv.poll_ready(cx)).await.is_ready()); let result = srv diff --git a/ntex-connect/src/service.rs b/ntex-connect/src/service.rs index b43714ee..cf4cfd7b 100644 --- a/ntex-connect/src/service.rs +++ b/ntex-connect/src/service.rs @@ -4,7 +4,7 @@ use std::{collections::VecDeque, future::Future, io, net::SocketAddr, pin::Pin}; use ntex_bytes::{PoolId, PoolRef}; use ntex_io::{types, Io}; use ntex_service::{Service, ServiceFactory}; -use ntex_util::future::{Either, Ready}; +use ntex_util::future::{BoxFuture, Either, Ready}; use crate::{net::tcp_connect_in, Address, Connect, ConnectError, Resolver}; @@ -34,7 +34,7 @@ impl Connector { impl Connector { /// Resolve and connect to remote host - pub fn connect(&self, message: U) -> impl Future> + pub async fn connect(&self, message: U) -> Result where Connect: From, { @@ -42,6 +42,7 @@ impl Connector { state: ConnectState::Resolve(self.resolver.call(message.into())), pool: self.pool, } + .await } } @@ -60,15 +61,15 @@ impl Clone for Connector { } } -impl ServiceFactory, C> for Connector { +impl ServiceFactory, C> for Connector { type Response = Io; type Error = ConnectError; type Service = Connector; type InitError = (); - type Future = Ready; + type Future<'f> = Ready where Self: 'f; #[inline] - fn new_service(&self, _: C) -> Self::Future { + fn create(&self, _: C) -> Self::Future<'_> { Ready::Ok(self.clone()) } } @@ -76,32 +77,27 @@ impl ServiceFactory, C> for Connector { impl Service> for Connector { type Response = Io; type Error = ConnectError; - type Future = ConnectServiceResponse; + type Future<'f> = ConnectServiceResponse<'f, T>; #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - #[inline] - fn call(&self, req: Connect) -> Self::Future { + fn call(&self, req: Connect) -> Self::Future<'_> { ConnectServiceResponse::new(self.resolver.call(req)) } } -enum ConnectState { - Resolve( as Service>>::Future), +enum ConnectState<'f, T: Address> { + Resolve( as Service>>::Future<'f>), Connect(TcpConnectorResponse), } #[doc(hidden)] -pub struct ConnectServiceResponse { - state: ConnectState, +pub struct ConnectServiceResponse<'f, T: Address> { + state: ConnectState<'f, T>, pool: PoolRef, } -impl ConnectServiceResponse { - pub(super) fn new(fut: as Service>>::Future) -> Self { +impl<'f, T: Address> ConnectServiceResponse<'f, T> { + pub(super) fn new(fut: as Service>>::Future<'f>) -> Self { Self { state: ConnectState::Resolve(fut), pool: PoolId::P0.pool_ref(), @@ -109,7 +105,7 @@ impl ConnectServiceResponse { } } -impl Future for ConnectServiceResponse { +impl<'f, T: Address> Future for ConnectServiceResponse<'f, T> { type Output = Result; fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { @@ -150,7 +146,7 @@ struct TcpConnectorResponse { port: u16, addrs: Option>, #[allow(clippy::type_complexity)] - stream: Option>>>>, + stream: Option>>, pool: PoolRef, } diff --git a/ntex-glommio/Cargo.toml b/ntex-glommio/Cargo.toml index 5791fc97..958850fc 100644 --- a/ntex-glommio/Cargo.toml +++ b/ntex-glommio/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-glommio" -version = "0.1.2" +version = "0.2.0-alpha.0" authors = ["ntex contributors "] description = "glommio intergration for ntex framework" keywords = ["network", "framework", "async", "futures"] @@ -17,8 +17,8 @@ path = "src/lib.rs" [dependencies] ntex-bytes = "0.1.14" -ntex-io = "0.1.8" -ntex-util = "0.1.16" +ntex-io = "0.2.0-alpha.0" +ntex-util = "0.2.0-alpha.0" async-oneshot = "0.5.0" futures-lite = "1.12" log = "0.4" diff --git a/ntex-io/Cargo.toml b/ntex-io/Cargo.toml index eff71a0e..2a52125b 100644 --- a/ntex-io/Cargo.toml +++ b/ntex-io/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-io" -version = "0.1.11" +version = "0.2.0-alpha.0" authors = ["ntex contributors "] description = "Utilities for encoding and decoding frames" keywords = ["network", "framework", "async", "futures"] @@ -18,8 +18,8 @@ path = "src/lib.rs" [dependencies] ntex-codec = "0.6.2" ntex-bytes = "0.1.14" -ntex-util = "0.1.16" -ntex-service = "0.3.1" +ntex-util = "0.2.0-alpha.0" +ntex-service = "0.4.0-alpha.0" bitflags = "1.3" log = "0.4" @@ -29,4 +29,4 @@ pin-project-lite = "0.2" rand = "0.8" env_logger = "0.10" -ntex = { version = "0.5", features = ["tokio"] } +ntex = { version = "0.6.0-alpha.0", features = ["tokio"] } diff --git a/ntex-io/src/dispatcher.rs b/ntex-io/src/dispatcher.rs index 7eacf784..21d90b62 100644 --- a/ntex-io/src/dispatcher.rs +++ b/ntex-io/src/dispatcher.rs @@ -7,7 +7,7 @@ use ntex_service::{IntoService, Service}; use ntex_util::time::Seconds; use ntex_util::{future::Either, ready, spawn}; -use crate::{DispatchItem, IoBoxed, IoRef, IoStatusUpdate, RecvError}; +use crate::{DispatchItem, IoBoxed, IoStatusUpdate, RecvError}; type Response = ::Item; @@ -17,14 +17,10 @@ pin_project_lite::pin_project! { pub struct Dispatcher where S: Service, Response = Option>>, - S: 'static, U: Encoder, U: Decoder, { - service: S, inner: DispatcherInner, - #[pin] - fut: Option, } } @@ -40,7 +36,6 @@ where S: Service, Response = Option>>, U: Encoder + Decoder, { - io: IoBoxed, st: Cell, ka_timeout: Cell, error: Cell>, @@ -49,12 +44,14 @@ where pool: Pool, } -struct DispatcherShared +pub struct DispatcherShared where S: Service, Response = Option>>, U: Encoder + Decoder, { + io: IoBoxed, codec: U, + service: S, error: Cell::Error>>>, inflight: Cell, } @@ -89,11 +86,11 @@ impl From> for DispatcherError { impl Dispatcher where - S: Service, Response = Option>> + 'static, - U: Decoder + Encoder + 'static, + S: Service, Response = Option>>, + U: Decoder + Encoder, { /// Construct new `Dispatcher` instance. - pub fn new(io: Io, codec: U, service: F) -> Self + pub fn new(io: Io, codec: U, service: F) -> Dispatcher where IoBoxed: From, F: IntoService>, @@ -104,25 +101,33 @@ where // register keepalive timer io.start_keepalive_timer(ka_timeout.get()); - Dispatcher { + let pool = io.memory_pool().pool(); + let shared = Rc::new(DispatcherShared { + io, + codec, + error: Cell::new(None), + inflight: Cell::new(0), service: service.into_service(), - fut: None, + }); + + Dispatcher { inner: DispatcherInner { - pool: io.memory_pool().pool(), + pool, + shared, + ka_timeout, error: Cell::new(None), flags: Cell::new(Flags::empty()), st: Cell::new(DispatcherState::Processing), - shared: Rc::new(DispatcherShared { - codec, - error: Cell::new(None), - inflight: Cell::new(0), - }), - io, - ka_timeout, }, } } +} +impl Dispatcher +where + S: Service, Response = Option>>, + U: Decoder + Encoder, +{ /// Set keep-alive timeout. /// /// To disable timeout set value to 0. @@ -132,7 +137,7 @@ where let ka_timeout = time::Duration::from(timeout); // register keepalive timer - self.inner.io.start_keepalive_timer(ka_timeout); + self.inner.shared.io.start_keepalive_timer(ka_timeout); self.inner.ka_timeout.set(ka_timeout); self @@ -147,17 +152,17 @@ where /// /// By default disconnect timeout is set to 1 seconds. pub fn disconnect_timeout(self, val: Seconds) -> Self { - self.inner.io.set_disconnect_timeout(val.into()); + self.inner.shared.io.set_disconnect_timeout(val.into()); self } } impl DispatcherShared where - S: Service, Response = Option>> + 'static, - U: Encoder + Decoder + 'static, + S: Service, Response = Option>>, + U: Encoder + Decoder, { - fn handle_result(&self, item: Result, io: &IoRef) { + fn handle_result(&self, item: Result, io: &IoBoxed) { self.inflight.set(self.inflight.get() - 1); match item { Ok(Some(val)) => { @@ -166,7 +171,7 @@ where } } Err(err) => self.error.set(Some(DispatcherError::Service(err))), - Ok(None) => return, + Ok(None) => (), } io.wake(); } @@ -179,23 +184,10 @@ where { type Output = Result<(), S::Error>; - fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - let mut this = self.as_mut().project(); + fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { + let this = self.project(); let slf = &this.inner; - let io = &slf.io; - let ioref = io.as_ref(); - - // handle service response future - if let Some(fut) = this.fut.as_mut().as_pin_mut() { - match fut.poll(cx) { - Poll::Pending => (), - Poll::Ready(item) => { - this.fut.set(None); - slf.shared.inflight.set(slf.shared.inflight.get() - 1); - slf.handle_result(item, ioref); - } - } - } + let io = &slf.shared.io; // handle memory pool pressure if slf.pool.poll_ready(cx).is_pending() { @@ -206,7 +198,11 @@ where loop { match slf.st.get() { DispatcherState::Processing => { - let item = match ready!(slf.poll_service(this.service, cx, io)) { + let item = match ready!(slf.poll_service( + &this.inner.shared.service, + cx, + io + )) { PollService::Ready => { // decode incoming bytes if buffer is ready match ready!(io.poll_recv(&slf.shared.codec, cx)) { @@ -252,28 +248,20 @@ where }; // call service - if this.fut.is_none() { - // optimize first service call - this.fut.set(Some(this.service.call(item))); - match this.fut.as_mut().as_pin_mut().unwrap().poll(cx) { - Poll::Ready(res) => { - this.fut.set(None); - slf.handle_result(res, ioref); - } - Poll::Pending => { - slf.shared.inflight.set(slf.shared.inflight.get() + 1) - } - } - } else { - slf.spawn_service_call(this.service.call(item)); - } + let shared = slf.shared.clone(); + shared.inflight.set(shared.inflight.get() + 1); + spawn(async move { + let result = shared.service.call(item).await; + shared.handle_result(result, &shared.io); + }); } // handle write back-pressure DispatcherState::Backpressure => { - let result = ready!(slf.poll_service(this.service, cx, io)); + let result = + ready!(slf.poll_service(&this.inner.shared.service, cx, io)); let item = match result { PollService::Ready => { - if slf.io.poll_flush(cx, false).is_ready() { + if slf.shared.io.poll_flush(cx, false).is_ready() { slf.st.set(DispatcherState::Processing); DispatchItem::WBackPressureDisabled } else { @@ -285,21 +273,12 @@ where }; // call service - if this.fut.is_none() { - // optimize first service call - this.fut.set(Some(this.service.call(item))); - match this.fut.as_mut().as_pin_mut().unwrap().poll(cx) { - Poll::Ready(res) => { - this.fut.set(None); - slf.handle_result(res, ioref); - } - Poll::Pending => { - slf.shared.inflight.set(slf.shared.inflight.get() + 1) - } - } - } else { - slf.spawn_service_call(this.service.call(item)); - } + let shared = slf.shared.clone(); + shared.inflight.set(shared.inflight.get() + 1); + spawn(async move { + let result = shared.service.call(item).await; + shared.handle_result(result, &shared.io); + }); } // drain service responses and shutdown io DispatcherState::Stop => { @@ -307,7 +286,7 @@ where // service may relay on poll_ready for response results if !slf.flags.get().contains(Flags::READY_ERR) { - let _ = this.service.poll_ready(cx); + let _ = this.inner.shared.service.poll_ready(cx); } if slf.shared.inflight.get() == 0 { @@ -316,7 +295,7 @@ where continue; } } else if !slf.flags.get().contains(Flags::IO_ERR) { - match ready!(slf.io.poll_status_update(cx)) { + match ready!(slf.shared.io.poll_status_update(cx)) { IoStatusUpdate::PeerGone(_) | IoStatusUpdate::Stop | IoStatusUpdate::KeepAlive => { @@ -324,12 +303,14 @@ where continue; } IoStatusUpdate::WriteBackpressure => { - if ready!(slf.io.poll_flush(cx, true)).is_err() { + if ready!(slf.shared.io.poll_flush(cx, true)).is_err() { slf.insert_flags(Flags::IO_ERR); } continue; } } + } else { + io.poll_dispatch(cx); } return Poll::Pending; } @@ -337,7 +318,7 @@ where DispatcherState::Shutdown => { let err = slf.error.take(); - return if this.service.poll_shutdown(cx, err.is_some()).is_ready() { + return if this.inner.shared.service.poll_shutdown(cx).is_ready() { log::trace!("service shutdown is completed, stop"); Poll::Ready(if let Some(err) = err { @@ -360,34 +341,6 @@ where S: Service, Response = Option>> + 'static, U: Decoder + Encoder + 'static, { - /// spawn service call - fn spawn_service_call(&self, fut: S::Future) { - self.shared.inflight.set(self.shared.inflight.get() + 1); - - let st = self.io.get_ref(); - let shared = self.shared.clone(); - spawn(async move { - let item = fut.await; - shared.handle_result(item, &st); - }); - } - - fn handle_result( - &self, - item: Result::Item>, S::Error>, - io: &IoRef, - ) { - match item { - Ok(Some(item)) => { - if let Err(err) = io.encode(item, &self.shared.codec) { - self.shared.error.set(Some(DispatcherError::Encoder(err))) - } - } - Err(err) => self.shared.error.set(Some(DispatcherError::Service(err))), - Ok(None) => (), - } - } - fn poll_service( &self, srv: &S, @@ -439,12 +392,12 @@ where /// update keep-alive timer fn update_keepalive(&self) { - self.io.start_keepalive_timer(self.ka_timeout.get()); + self.shared.io.start_keepalive_timer(self.ka_timeout.get()); } /// unregister keep-alive timer fn unregister_keepalive(&self) { - self.io.stop_keepalive_timer(); + self.shared.io.stop_keepalive_timer(); self.ka_timeout.set(time::Duration::ZERO); } } @@ -498,25 +451,27 @@ mod tests { service: F, ) -> (Self, State) { let state = Io::new(io); + let pool = state.memory_pool().pool(); let ka_timeout = Cell::new(Seconds(1).into()); - let shared = Rc::new(DispatcherShared { - codec, - error: Cell::new(None), - inflight: Cell::new(0), - }); + let inner = State(state.get_ref()); state.start_keepalive_timer(Duration::from_millis(500)); + let shared = Rc::new(DispatcherShared { + codec, + io: state.into(), + error: Cell::new(None), + inflight: Cell::new(0), + service: service.into_service(), + }); + ( Dispatcher { - service: service.into_service(), - fut: None, inner: DispatcherInner { error: Cell::new(None), flags: Cell::new(super::Flags::empty()), st: Cell::new(DispatcherState::Processing), - pool: state.memory_pool().pool(), - io: state.into(), + pool, shared, ka_timeout, }, @@ -649,14 +604,14 @@ mod tests { impl Service> for Srv { type Response = Option>; type Error = (); - type Future = Ready>, ()>; + type Future<'f> = Ready>, ()>; fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { self.0.set(self.0.get() + 1); Poll::Ready(Err(())) } - fn call(&self, _: DispatchItem) -> Self::Future { + fn call(&self, _: DispatchItem) -> Self::Future<'_> { Ready::Ok(None) } } @@ -800,7 +755,7 @@ mod tests { let buf = client.read().await.unwrap(); assert_eq!(buf, Bytes::from_static(b"GET /test HTTP/1\r\n\r\n")); - sleep(Millis(3500)).await; + sleep(Millis(1500)).await; // write side must be closed, dispatcher should fail with keep-alive let flags = state.flags(); diff --git a/ntex-io/src/io.rs b/ntex-io/src/io.rs index c86cfdb4..465a57a6 100644 --- a/ntex-io/src/io.rs +++ b/ntex-io/src/io.rs @@ -658,6 +658,12 @@ impl Io { Poll::Pending } } + + #[inline] + /// Register dispatch task + pub fn poll_dispatch(&self, cx: &mut Context<'_>) { + self.0 .0.dispatch_task.register(cx.waker()); + } } impl AsRef for Io { diff --git a/ntex-io/src/utils.rs b/ntex-io/src/utils.rs index 41526f6c..d6b3c4de 100644 --- a/ntex-io/src/utils.rs +++ b/ntex-io/src/utils.rs @@ -1,6 +1,6 @@ use std::{marker::PhantomData, task::Context, task::Poll}; -use ntex_service::{fn_factory_with_config, into_service, Service, ServiceFactory}; +use ntex_service::{fn_service, pipeline_factory, Service, ServiceFactory}; use ntex_util::future::Ready; use crate::{Filter, FilterFactory, Io, IoBoxed}; @@ -18,14 +18,12 @@ pub fn seal( where F: Filter, S: ServiceFactory, + C: Clone, { - fn_factory_with_config(move |cfg: C| { - let fut = srv.new_service(cfg); - async move { - let srv = fut.await?; - Ok(into_service(move |io: Io| srv.call(IoBoxed::from(io)))) - } - }) + pipeline_factory( + fn_service(|io: Io| Ready::Ok(IoBoxed::from(io))).map_init_err(|_| panic!()), + ) + .and_then(srv) } /// Create filter factory service @@ -45,7 +43,7 @@ pub struct FilterServiceFactory { _t: PhantomData, } -impl ServiceFactory, ()> for FilterServiceFactory +impl ServiceFactory> for FilterServiceFactory where T: FilterFactory + Clone, F: Filter, @@ -54,9 +52,9 @@ where type Error = T::Error; type Service = FilterService; type InitError = (); - type Future = Ready; + type Future<'f> = Ready where Self: 'f; - fn new_service(&self, _: ()) -> Self::Future { + fn create(&self, _: ()) -> Self::Future<'_> { Ready::Ok(FilterService { filter: self.filter.clone(), _t: PhantomData, @@ -76,13 +74,13 @@ where { type Response = Io; type Error = T::Error; - type Future = T::Future; + type Future<'f> = T::Future where T: 'f; fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { Poll::Ready(Ok(())) } - fn call(&self, req: Io) -> Self::Future { + fn call(&self, req: Io) -> Self::Future<'_> { req.add_filter(self.filter.clone()) } } diff --git a/ntex-macros/Cargo.toml b/ntex-macros/Cargo.toml index 453b13ae..c0472089 100644 --- a/ntex-macros/Cargo.toml +++ b/ntex-macros/Cargo.toml @@ -16,6 +16,6 @@ syn = { version = "^1", features = ["full", "parsing"] } proc-macro2 = "^1" [dev-dependencies] -ntex = { version = "0.5.0", features = ["tokio"] } +ntex = { version = "0.6.0-alpha.0", features = ["tokio"] } futures = "0.3" env_logger = "0.10" \ No newline at end of file diff --git a/ntex-service/CHANGES.md b/ntex-service/CHANGES.md index adf53a58..114046be 100644 --- a/ntex-service/CHANGES.md +++ b/ntex-service/CHANGES.md @@ -1,5 +1,15 @@ # Changes +## [0.4.0-alpha.0] - 2022-12-xx + +* Rename Transform to Middleware + +* Drop FnService's shutdown helper + +* Simplify Service::poll_shutdown() method + +* Add forward_poll_ready and forward_poll_shutdown macros + ## [0.3.3] - 2022-07-08 * Revert cleanups diff --git a/ntex-service/Cargo.toml b/ntex-service/Cargo.toml index fe775463..426288cb 100644 --- a/ntex-service/Cargo.toml +++ b/ntex-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-service" -version = "0.3.3" +version = "0.4.0-alpha.0" authors = ["ntex contributors "] description = "ntex service" keywords = ["network", "framework", "async", "futures"] @@ -19,5 +19,5 @@ path = "src/lib.rs" pin-project-lite = "0.2.6" [dev-dependencies] -ntex = { version = "0.5", features = ["tokio"] } -ntex-util = "0.1.5" +ntex = { version = "0.6.0-alpha.0", features = ["tokio"] } +ntex-util = "0.2.0-alpha.0" diff --git a/ntex-service/src/and_then.rs b/ntex-service/src/and_then.rs index 8721fa49..b4392914 100644 --- a/ntex-service/src/and_then.rs +++ b/ntex-service/src/and_then.rs @@ -1,6 +1,4 @@ -use std::{ - future::Future, marker::PhantomData, pin::Pin, rc::Rc, task::Context, task::Poll, -}; +use std::{future::Future, pin::Pin, task::Context, task::Poll}; use super::{Service, ServiceFactory}; @@ -8,49 +6,51 @@ use super::{Service, ServiceFactory}; /// of another service which completes successfully. /// /// This is created by the `ServiceExt::and_then` method. -pub struct AndThen(Rc<(A, B)>, PhantomData); +pub struct AndThen { + svc1: A, + svc2: B, +} -impl AndThen { +impl AndThen { /// Create new `AndThen` combinator - pub(crate) fn new(a: A, b: B) -> Self - where - A: Service, - B: Service, - { - Self(Rc::new((a, b)), PhantomData) + pub(crate) fn new(svc1: A, svc2: B) -> Self { + Self { svc1, svc2 } } } -impl Clone for AndThen { +impl Clone for AndThen +where + A: Clone, + B: Clone, +{ fn clone(&self) -> Self { - AndThen(self.0.clone(), PhantomData) + AndThen { + svc1: self.svc1.clone(), + svc2: self.svc2.clone(), + } } } -impl Service for AndThen +impl Service for AndThen where A: Service, B: Service, { type Response = B::Response; type Error = A::Error; - type Future = AndThenServiceResponse; + type Future<'f> = AndThenServiceResponse<'f, A, B, Req> where Self: 'f, Req: 'f; fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - let srv = self.0.as_ref(); - let not_ready = !srv.0.poll_ready(cx)?.is_ready(); - if !srv.1.poll_ready(cx)?.is_ready() || not_ready { + let not_ready = !self.svc1.poll_ready(cx)?.is_ready(); + if !self.svc2.poll_ready(cx)?.is_ready() || not_ready { Poll::Pending } else { Poll::Ready(Ok(())) } } - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - let srv = self.0.as_ref(); - - if srv.0.poll_shutdown(cx, is_error).is_ready() - && srv.1.poll_shutdown(cx, is_error).is_ready() + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + if self.svc1.poll_shutdown(cx).is_ready() && self.svc2.poll_shutdown(cx).is_ready() { Poll::Ready(()) } else { @@ -59,41 +59,45 @@ where } #[inline] - fn call(&self, req: Req) -> Self::Future { + fn call(&self, req: Req) -> Self::Future<'_> { AndThenServiceResponse { + slf: self, state: State::A { - fut: self.0.as_ref().0.call(req), - b: Some(self.0.clone()), + fut: self.svc1.call(req), }, } } } pin_project_lite::pin_project! { - pub struct AndThenServiceResponse + pub struct AndThenServiceResponse<'f, A, B, Req> where A: Service, B: Service, { + slf: &'f AndThen, #[pin] - state: State, + state: State<'f, A, B, Req>, } } pin_project_lite::pin_project! { #[project = StateProject] - enum State + enum State<'f, A, B, Req> where A: Service, + A: 'f, + Req: 'f, B: Service, + B: 'f, { - A { #[pin] fut: A::Future, b: Option> }, - B { #[pin] fut: B::Future }, + A { #[pin] fut: A::Future<'f> }, + B { #[pin] fut: B::Future<'f> }, Empty, } } -impl Future for AndThenServiceResponse +impl<'f, A, B, Req> Future for AndThenServiceResponse<'f, A, B, Req> where A: Service, B: Service, @@ -104,11 +108,9 @@ where let mut this = self.as_mut().project(); match this.state.as_mut().project() { - StateProject::A { fut, b } => match fut.poll(cx)? { + StateProject::A { fut } => match fut.poll(cx)? { Poll::Ready(res) => { - let b = b.take().unwrap(); - this.state.set(State::Empty); // drop fut A - let fut = b.as_ref().1.call(res); + let fut = this.slf.svc2.call(res); this.state.set(State::B { fut }); self.poll(cx) } @@ -126,27 +128,19 @@ where } /// `.and_then()` service factory combinator -pub struct AndThenFactory { - inner: Rc<(A, B)>, - _t: PhantomData, +pub struct AndThenFactory { + svc1: A, + svc2: B, } -impl AndThenFactory -where - A: ServiceFactory, - B: ServiceFactory, - Cfg: Clone, -{ +impl AndThenFactory { /// Create new `AndThenFactory` combinator - pub fn new(a: A, b: B) -> Self { - Self { - inner: Rc::new((a, b)), - _t: PhantomData, - } + pub fn new(svc1: A, svc2: B) -> Self { + Self { svc1, svc2 } } } -impl ServiceFactory for AndThenFactory +impl ServiceFactory for AndThenFactory where A: ServiceFactory, B: ServiceFactory, @@ -155,83 +149,77 @@ where type Response = B::Response; type Error = A::Error; - type Service = AndThen; + type Service = AndThen; type InitError = A::InitError; - type Future = AndThenServiceFactoryResponse; + type Future<'f> = AndThenFactoryResponse<'f, A, B, Req, Cfg> where Self: 'f, Cfg: 'f; - fn new_service(&self, cfg: Cfg) -> Self::Future { - let inner = &*self.inner; - AndThenServiceFactoryResponse::new( - inner.0.new_service(cfg.clone()), - inner.1.new_service(cfg), - ) + #[inline] + fn create(&self, cfg: Cfg) -> Self::Future<'_> { + AndThenFactoryResponse { + fut1: self.svc1.create(cfg.clone()), + fut2: self.svc2.create(cfg), + svc1: None, + svc2: None, + } } } -impl Clone for AndThenFactory { +impl Clone for AndThenFactory +where + A: Clone, + B: Clone, +{ fn clone(&self) -> Self { Self { - inner: self.inner.clone(), - _t: PhantomData, + svc1: self.svc1.clone(), + svc2: self.svc2.clone(), } } } pin_project_lite::pin_project! { - pub struct AndThenServiceFactoryResponse + pub struct AndThenFactoryResponse<'f, A, B, Req, Cfg> where A: ServiceFactory, + A: 'f, B: ServiceFactory, + B: 'f, + Cfg: 'f { #[pin] - fut_a: A::Future, + fut1: A::Future<'f>, #[pin] - fut_b: B::Future, + fut2: B::Future<'f>, - a: Option, - b: Option, + svc1: Option, + svc2: Option, } } -impl AndThenServiceFactoryResponse -where - A: ServiceFactory, - B: ServiceFactory, -{ - fn new(fut_a: A::Future, fut_b: B::Future) -> Self { - AndThenServiceFactoryResponse { - fut_a, - fut_b, - a: None, - b: None, - } - } -} - -impl Future for AndThenServiceFactoryResponse +impl<'f, A, B, Req, Cfg> Future for AndThenFactoryResponse<'f, A, B, Req, Cfg> where A: ServiceFactory, B: ServiceFactory, { - type Output = Result, A::InitError>; + type Output = Result, A::InitError>; fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { let this = self.project(); - if this.a.is_none() { - if let Poll::Ready(service) = this.fut_a.poll(cx)? { - *this.a = Some(service); + if this.svc1.is_none() { + if let Poll::Ready(service) = this.fut1.poll(cx)? { + *this.svc1 = Some(service); } } - if this.b.is_none() { - if let Poll::Ready(service) = this.fut_b.poll(cx)? { - *this.b = Some(service); + if this.svc2.is_none() { + if let Poll::Ready(service) = this.fut2.poll(cx)? { + *this.svc2 = Some(service); } } - if this.a.is_some() && this.b.is_some() { + if this.svc1.is_some() && this.svc2.is_some() { Poll::Ready(Ok(AndThen::new( - this.a.take().unwrap(), - this.b.take().unwrap(), + this.svc1.take().unwrap(), + this.svc2.take().unwrap(), ))) } else { Poll::Pending @@ -246,19 +234,20 @@ mod tests { use crate::{fn_factory, pipeline, pipeline_factory, Service, ServiceFactory}; use ntex_util::future::{lazy, Ready}; + #[derive(Clone)] struct Srv1(Rc>); impl Service<&'static str> for Srv1 { type Response = &'static str; type Error = (); - type Future = Ready; + type Future<'f> = Ready; fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { self.0.set(self.0.get() + 1); Poll::Ready(Ok(())) } - fn call(&self, req: &'static str) -> Self::Future { + fn call(&self, req: &'static str) -> Self::Future<'_> { Ready::Ok(req) } } @@ -269,14 +258,14 @@ mod tests { impl Service<&'static str> for Srv2 { type Response = (&'static str, &'static str); type Error = (); - type Future = Ready; + type Future<'f> = Ready; fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { self.0.set(self.0.get() + 1); Poll::Ready(Ok(())) } - fn call(&self, req: &'static str) -> Self::Future { + fn call(&self, req: &'static str) -> Self::Future<'_> { Ready::Ok((req, "srv2")) } } @@ -290,7 +279,7 @@ mod tests { let res = lazy(|cx| srv.poll_ready(cx)).await; assert_eq!(res, Poll::Ready(Ok(()))); assert_eq!(cnt.get(), 2); - let res = lazy(|cx| srv.poll_shutdown(cx, true)).await; + let res = lazy(|cx| srv.poll_shutdown(cx)).await; assert_eq!(res, Poll::Ready(())); } @@ -313,7 +302,7 @@ mod tests { .and_then(move || Ready::from(Ok(Srv2(cnt.clone())))) .clone(); - let srv = new_srv.new_service(()).await.unwrap(); + let srv = new_srv.create(&()).await.unwrap(); let res = srv.call("srv1").await; assert!(res.is_ok()); assert_eq!(res.unwrap(), ("srv1", "srv2")); diff --git a/ntex-service/src/apply.rs b/ntex-service/src/apply.rs index 61014c19..8fa41ad4 100644 --- a/ntex-service/src/apply.rs +++ b/ntex-service/src/apply.rs @@ -1,4 +1,6 @@ -use std::{future::Future, marker::PhantomData, pin::Pin, task::Context, task::Poll}; +use std::{ + future::Future, marker::PhantomData, pin::Pin, rc::Rc, task::Context, task::Poll, +}; use super::{IntoService, IntoServiceFactory, Service, ServiceFactory}; @@ -9,7 +11,7 @@ pub fn apply_fn( ) -> Apply where T: Service, - F: Fn(In, &T) -> R, + F: Fn(In, Rc) -> R, R: Future>, U: IntoService, { @@ -20,14 +22,14 @@ where pub fn apply_fn_factory( service: U, f: F, -) -> ApplyServiceFactory +) -> ApplyFactory where T: ServiceFactory, - F: Fn(In, &T::Service) -> R + Clone, + F: Fn(In, Rc) -> R + Clone, R: Future>, U: IntoServiceFactory, { - ApplyServiceFactory::new(service.into_factory(), f) + ApplyFactory::new(service.into_factory(), f) } /// `Apply` service combinator @@ -35,7 +37,7 @@ pub struct Apply where T: Service, { - service: T, + service: Rc, f: F, r: PhantomData (In, Out, R)>, } @@ -43,14 +45,14 @@ where impl Apply where T: Service, - F: Fn(In, &T) -> R, + F: Fn(In, Rc) -> R, R: Future>, { /// Create new `Apply` combinator fn new(service: T, f: F) -> Self { Self { - service, f, + service: Rc::new(service), r: PhantomData, } } @@ -59,7 +61,7 @@ where impl Clone for Apply where T: Service + Clone, - F: Fn(In, &T) -> R + Clone, + F: Fn(In, Rc) -> R + Clone, R: Future>, { fn clone(&self) -> Self { @@ -74,34 +76,27 @@ where impl Service for Apply where T: Service, - F: Fn(In, &T) -> R, + F: Fn(In, Rc) -> R, R: Future>, { type Response = Out; type Error = Err; - type Future = R; + type Future<'f> = R where Self: 'f, In: 'f, R: 'f; + + crate::forward_poll_ready!(service); + crate::forward_poll_shutdown!(service); #[inline] - fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - self.service.poll_ready(cx) - } - - #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) - } - - #[inline] - fn call(&self, req: In) -> Self::Future { - (self.f)(req, &self.service) + fn call(&self, req: In) -> Self::Future<'_> { + (self.f)(req, self.service.clone()) } } /// `apply()` service factory -pub struct ApplyServiceFactory +pub struct ApplyFactory where T: ServiceFactory, - F: Fn(In, &T::Service) -> R + Clone, + F: Fn(In, Rc) -> R + Clone, R: Future>, { service: T, @@ -109,10 +104,10 @@ where r: PhantomData (R, In, Out)>, } -impl ApplyServiceFactory +impl ApplyFactory where T: ServiceFactory, - F: Fn(In, &T::Service) -> R + Clone, + F: Fn(In, Rc) -> R + Clone, R: Future>, { /// Create new `ApplyNewService` new service instance @@ -126,10 +121,10 @@ where } impl Clone - for ApplyServiceFactory + for ApplyFactory where T: ServiceFactory + Clone, - F: Fn(In, &T::Service) -> R + Clone, + F: Fn(In, Rc) -> R + Clone, R: Future>, { fn clone(&self) -> Self { @@ -142,10 +137,10 @@ where } impl ServiceFactory - for ApplyServiceFactory + for ApplyFactory where T: ServiceFactory, - F: Fn(In, &T::Service) -> R + Clone, + F: Fn(In, Rc) -> R + Clone, R: Future>, { type Response = Out; @@ -153,48 +148,39 @@ where type Service = Apply; type InitError = T::InitError; - type Future = ApplyServiceFactoryResponse; + type Future<'f> = ApplyFactoryResponse<'f, T, Req, Cfg, F, R, In, Out, Err> where Self: 'f, Cfg: 'f; - fn new_service(&self, cfg: Cfg) -> Self::Future { - ApplyServiceFactoryResponse::new(self.service.new_service(cfg), self.f.clone()) - } -} - -pin_project_lite::pin_project! { - pub struct ApplyServiceFactoryResponse - where - T: ServiceFactory, - F: Fn(In, &T::Service) -> R, - R: Future>, - { - #[pin] - fut: T::Future, - f: Option, - r: PhantomData<(In, Out)>, - } -} - -impl - ApplyServiceFactoryResponse -where - T: ServiceFactory, - F: Fn(In, &T::Service) -> R, - R: Future>, -{ - fn new(fut: T::Future, f: F) -> Self { - Self { - f: Some(f), - fut, - r: PhantomData, + #[inline] + fn create(&self, cfg: Cfg) -> Self::Future<'_> { + ApplyFactoryResponse { + fut: self.service.create(cfg), + f: Some(self.f.clone()), + _t: PhantomData, } } } -impl Future - for ApplyServiceFactoryResponse +pin_project_lite::pin_project! { + pub struct ApplyFactoryResponse<'f, T, Req, Cfg, F, R, In, Out, Err> + where + T: ServiceFactory, + T: 'f, + F: Fn(In, Rc) -> R, + R: Future>, + Cfg: 'f, + { + #[pin] + fut: T::Future<'f>, + f: Option, + _t: PhantomData<(In, Out)>, + } +} + +impl<'f, T, Req, Cfg, F, R, In, Out, Err> Future + for ApplyFactoryResponse<'f, T, Req, Cfg, F, R, In, Out, Err> where T: ServiceFactory, - F: Fn(In, &T::Service) -> R, + F: Fn(In, Rc) -> R, R: Future>, { type Output = Result, T::InitError>; @@ -213,7 +199,7 @@ where #[cfg(test)] mod tests { use ntex_util::future::{lazy, Ready}; - use std::task::{Context, Poll}; + use std::task::Poll; use super::*; use crate::{pipeline, pipeline_factory, Service, ServiceFactory}; @@ -224,13 +210,9 @@ mod tests { impl Service<()> for Srv { type Response = (); type Error = (); - type Future = Ready<(), ()>; + type Future<'f> = Ready<(), ()>; - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - fn call(&self, _: ()) -> Self::Future { + fn call(&self, _: ()) -> Self::Future<'_> { Ready::Ok(()) } } @@ -249,7 +231,7 @@ mod tests { ); assert_eq!(lazy(|cx| srv.poll_ready(cx)).await, Poll::Ready(Ok(()))); - let res = lazy(|cx| srv.poll_shutdown(cx, true)).await; + let res = lazy(|cx| srv.poll_shutdown(cx)).await; assert_eq!(res, Poll::Ready(())); let res = srv.call("srv").await; @@ -258,7 +240,7 @@ mod tests { } #[ntex::test] - async fn test_new_service() { + async fn test_create() { let new_srv = pipeline_factory( apply_fn_factory( || Ready::<_, ()>::Ok(Srv), @@ -273,7 +255,7 @@ mod tests { .clone(), ); - let srv = new_srv.new_service(()).await.unwrap(); + let srv = new_srv.create(&()).await.unwrap(); assert_eq!(lazy(|cx| srv.poll_ready(cx)).await, Poll::Ready(Ok(()))); diff --git a/ntex-service/src/boxed.rs b/ntex-service/src/boxed.rs index 8b2d0a4b..9b3a10d9 100644 --- a/ntex-service/src/boxed.rs +++ b/ntex-service/src/boxed.rs @@ -1,141 +1,174 @@ -use std::{ - future::Future, marker::PhantomData, pin::Pin, rc::Rc, task::Context, task::Poll, -}; +use std::{future::Future, pin::Pin, rc::Rc, task::Context, task::Poll}; -use crate::{Service, ServiceFactory}; - -pub type BoxFuture = Pin>>>; - -pub type BoxService = - Box>>; - -pub type RcService = - Rc>>; - -pub struct BoxServiceFactory(Inner); +pub type BoxFuture<'a, I, E> = Pin> + 'a>>; /// Create boxed service factory -pub fn factory( - factory: T, -) -> BoxServiceFactory +pub fn factory( + factory: F, +) -> BoxServiceFactory where - C: 'static, R: 'static, - T: ServiceFactory + 'static, - T::Response: 'static, - T::Error: 'static, - T::InitError: 'static, + C: 'static, + F: crate::ServiceFactory + 'static, + F::Service: 'static, { - BoxServiceFactory(Box::new(FactoryWrapper { - factory, - _t: std::marker::PhantomData, - })) + BoxServiceFactory(Box::new(factory)) +} + +/// Create rc boxed service factory +pub fn rcfactory( + factory: F, +) -> RcServiceFactory +where + R: 'static, + C: 'static, + F: crate::ServiceFactory + 'static, + F::Service: 'static, +{ + RcServiceFactory(Rc::new(factory)) } /// Create boxed service -pub fn service(service: T) -> BoxService +pub fn service(service: S) -> BoxService where R: 'static, - T: Service + 'static, - T::Future: 'static, + S: crate::Service + 'static, { - Box::new(ServiceWrapper(service, PhantomData)) + BoxService(Box::new(service)) } /// Create rc service -pub fn rcservice(service: T) -> RcService +pub fn rcservice(service: S) -> RcService where R: 'static, - T: Service + 'static, - T::Future: 'static, + S: crate::Service + 'static, { - Rc::new(ServiceWrapper(service, PhantomData)) + RcService(Rc::new(service)) } -type Inner = Box< - dyn ServiceFactory< - Req, - C, - Response = Res, - Error = Err, - InitError = InitErr, - Service = BoxService, - Future = BoxFuture, InitErr>, - >, ->; +pub trait ServiceObj { + type Response; + type Error; -impl ServiceFactory - for BoxServiceFactory + fn poll_ready(&self, cx: &mut Context<'_>) -> Poll>; + + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()>; + + fn call<'a>(&'a self, req: Req) -> BoxFuture<'a, Self::Response, Self::Error> + where + Req: 'a; +} + +impl ServiceObj for S where Req: 'static, - Res: 'static, - Err: 'static, - InitErr: 'static, + S: crate::Service, { - type Response = Res; - type Error = Err; - type InitError = InitErr; - type Service = BoxService; + type Response = S::Response; + type Error = S::Error; - type Future = BoxFuture; + #[inline] + fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { + crate::Service::poll_ready(self, cx) + } - fn new_service(&self, cfg: C) -> Self::Future { - self.0.new_service(cfg) + #[inline] + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + crate::Service::poll_shutdown(self, cx) + } + + #[inline] + fn call<'a>(&'a self, req: Req) -> BoxFuture<'a, Self::Response, Self::Error> + where + Req: 'a, + { + Box::pin(crate::Service::call(self, req)) } } -struct FactoryWrapper> { - factory: T, - _t: std::marker::PhantomData<(C, R)>, +trait ServiceFactoryObj { + type Response; + type Error; + type InitError; + + fn create<'a>( + &'a self, + cfg: Cfg, + ) -> BoxFuture<'a, BoxService, Self::InitError> + where + Cfg: 'a; } -impl ServiceFactory for FactoryWrapper -where - R: 'static, - Res: 'static, - Err: 'static, - InitErr: 'static, - T: ServiceFactory + 'static, - T::Service: 'static, - T::Future: 'static, - >::Future: 'static, -{ - type Response = Res; - type Error = Err; - type InitError = InitErr; - type Service = BoxService; - type Future = BoxFuture; +trait ServiceFactoryRcObj { + type Response; + type Error; + type InitError; - fn new_service(&self, cfg: C) -> Self::Future { - let fut = self.factory.new_service(cfg); - Box::pin(async move { - let srv = fut.await?; - Ok(ServiceWrapper::boxed(srv)) - }) + fn create<'a>( + &'a self, + cfg: Cfg, + ) -> BoxFuture<'a, RcService, Self::InitError> + where + Cfg: 'a; +} + +impl ServiceFactoryObj for F +where + Cfg: 'static, + Req: 'static, + F: crate::ServiceFactory, + F::Service: 'static, +{ + type Response = F::Response; + type Error = F::Error; + type InitError = F::InitError; + + #[inline] + fn create<'a>( + &'a self, + cfg: Cfg, + ) -> BoxFuture<'a, BoxService, Self::InitError> + where + Cfg: 'a, + { + let fut = crate::ServiceFactory::create(self, cfg); + Box::pin(async move { fut.await.map(service) }) } } -struct ServiceWrapper, R>(T, PhantomData); - -impl ServiceWrapper +impl ServiceFactoryRcObj for F where - R: 'static, - T: Service + 'static, - T::Future: 'static, + Cfg: 'static, + Req: 'static, + F: crate::ServiceFactory, + F::Service: 'static, { - fn boxed(service: T) -> BoxService { - Box::new(ServiceWrapper(service, PhantomData)) + type Response = F::Response; + type Error = F::Error; + type InitError = F::InitError; + + #[inline] + fn create<'a>( + &'a self, + cfg: Cfg, + ) -> BoxFuture<'a, RcService, Self::InitError> + where + Cfg: 'a, + { + let fut = crate::ServiceFactory::create(self, cfg); + Box::pin(async move { fut.await.map(rcservice) }) } } -impl Service for ServiceWrapper +pub struct BoxService(Box>); + +impl crate::Service for BoxService where - T: Service, - T::Future: 'static, + Req: 'static, { type Response = Res; type Error = Err; - type Future = BoxFuture; + type Future<'f> = BoxFuture<'f, Res, Err> where Self: 'f, Req: 'f; #[inline] fn poll_ready(&self, ctx: &mut Context<'_>) -> Poll> { @@ -143,12 +176,94 @@ where } #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.0.poll_shutdown(cx, is_error) + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + self.0.poll_shutdown(cx) } #[inline] - fn call(&self, req: R) -> Self::Future { - Box::pin(self.0.call(req)) + fn call(&self, req: Req) -> Self::Future<'_> { + self.0.call(req) + } +} + +pub struct RcService(Rc>); + +impl Clone for RcService { + fn clone(&self) -> Self { + Self(self.0.clone()) + } +} + +impl crate::Service for RcService +where + Req: 'static, +{ + type Response = Res; + type Error = Err; + type Future<'f> = BoxFuture<'f, Res, Err> where Self: 'f, Req: 'f; + + #[inline] + fn poll_ready(&self, ctx: &mut Context<'_>) -> Poll> { + self.0.poll_ready(ctx) + } + + #[inline] + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + self.0.poll_shutdown(cx) + } + + #[inline] + fn call(&self, req: Req) -> Self::Future<'_> { + self.0.call(req) + } +} + +pub struct BoxServiceFactory( + Box>, +); + +impl crate::ServiceFactory + for BoxServiceFactory +where + Req: 'static, +{ + type Response = Res; + type Error = Err; + + type Service = BoxService; + type InitError = InitErr; + type Future<'f> = BoxFuture<'f, Self::Service, InitErr> where Self: 'f, C: 'f; + + #[inline] + fn create(&self, cfg: C) -> Self::Future<'_> { + self.0.create(cfg) + } +} + +pub struct RcServiceFactory( + Rc>, +); + +impl Clone for RcServiceFactory { + fn clone(&self) -> Self { + Self(self.0.clone()) + } +} + +impl crate::ServiceFactory + for RcServiceFactory +where + Req: 'static, +{ + type Response = Res; + type Error = Err; + + type Service = RcService; + type InitError = InitErr; + type Future<'f> = BoxFuture<'f, Self::Service, InitErr> where Self: 'f, C: 'f; + + #[inline] + fn create(&self, cfg: C) -> Self::Future<'_> { + self.0.create(cfg) } } diff --git a/ntex-service/src/fn_service.rs b/ntex-service/src/fn_service.rs index bf4fb56f..1e91ba9b 100644 --- a/ntex-service/src/fn_service.rs +++ b/ntex-service/src/fn_service.rs @@ -1,5 +1,4 @@ -use std::task::{Context, Poll}; -use std::{cell::Cell, future::ready, future::Future, future::Ready, marker::PhantomData}; +use std::{future::ready, future::Future, future::Ready, marker::PhantomData}; use crate::{IntoService, IntoServiceFactory, Service, ServiceFactory}; @@ -41,7 +40,7 @@ where /// }); /// /// // construct new service -/// let srv = factory.new_service(()).await?; +/// let srv = factory.create(&()).await?; /// /// // now we can use `div` service /// let result = srv.call((10, 20)).await?; @@ -51,12 +50,10 @@ where /// Ok(()) /// } /// ``` -pub fn fn_factory( - f: F, -) -> FnServiceNoConfig +pub fn fn_factory(f: F) -> FnServiceNoConfig where - Srv: Service, F: Fn() -> Fut, + Srv: Service, Fut: Future>, { FnServiceNoConfig::new(f) @@ -78,12 +75,13 @@ where /// async fn main() -> io::Result<()> { /// // Create service factory. factory uses config argument for /// // services it generates. -/// let factory = fn_factory_with_config(|y: usize| { +/// let factory = fn_factory_with_config(|y: &usize| { +/// let y = *y; /// async move { Ok::<_, io::Error>(fn_service(move |x: usize| async move { Ok::<_, io::Error>(x * y) })) } /// }); /// /// // construct new service with config argument -/// let srv = factory.new_service(10).await?; +/// let srv = factory.create(&10).await?; /// /// let result = srv.call(10).await?; /// assert_eq!(result, 100); @@ -100,114 +98,61 @@ where Fut: Future>, Srv: Service, { - FnServiceConfig::new(f) + FnServiceConfig { f, _t: PhantomData } } -#[inline] -pub fn fn_shutdown() {} - -pub struct FnService -where - F: Fn(Req) -> Fut, - Fut: Future>, -{ +pub struct FnService { f: F, - f_shutdown: Cell>, _t: PhantomData, } -impl FnService +impl Clone for FnService where - F: Fn(Req) -> Fut, - Fut: Future>, + F: Clone, { - pub(crate) fn new(f: F) -> Self { - Self { - f, - f_shutdown: Cell::new(Some(fn_shutdown)), - _t: PhantomData, - } - } - - /// Set function that get called oin poll_shutdown method of Service trait. - pub fn on_shutdown(self, f: FShut) -> FnService - where - FShut: FnOnce(), - { - FnService { - f: self.f, - f_shutdown: Cell::new(Some(f)), - _t: PhantomData, - } - } -} - -impl Clone for FnService -where - F: Fn(Req) -> Fut + Clone, - FShut: FnOnce() + Clone, - Fut: Future>, -{ - #[inline] fn clone(&self) -> Self { - let f = self.f_shutdown.take(); - self.f_shutdown.set(f.clone()); - Self { f: self.f.clone(), - f_shutdown: Cell::new(f), _t: PhantomData, } } } -impl Service for FnService +impl Service for FnService where F: Fn(Req) -> Fut, - FShut: FnOnce(), Fut: Future>, { type Response = Res; type Error = Err; - type Future = Fut; + type Future<'f> = Fut where Self: 'f, Req: 'f; #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - #[inline] - fn poll_shutdown(&self, _: &mut Context<'_>, _: bool) -> Poll<()> { - if let Some(f) = self.f_shutdown.take() { - (f)() - } - Poll::Ready(()) - } - - #[inline] - fn call(&self, req: Req) -> Self::Future { + fn call(&self, req: Req) -> Self::Future<'_> { (self.f)(req) } } -impl IntoService, Req> for F +impl IntoService, Req> for F where - F: Fn(Req) -> Fut, + F: Fn(Req) -> Fut + 'static, Fut: Future>, { #[inline] - fn into_service(self) -> FnService { - FnService::new(self) + fn into_service(self) -> FnService { + FnService { + f: self, + _t: PhantomData, + } } } -pub struct FnServiceFactory +pub struct FnServiceFactory where F: Fn(Req) -> Fut, Fut: Future>, { f: F, - f_shutdown: Cell>, _t: PhantomData<(Req, Cfg)>, } @@ -217,101 +162,56 @@ where Fut: Future>, { fn new(f: F) -> Self { - FnServiceFactory { - f, - f_shutdown: Cell::new(Some(fn_shutdown)), - _t: PhantomData, - } - } - - /// Set function that get called oin poll_shutdown method of Service trait. - pub fn on_shutdown( - self, - f: FShut, - ) -> FnServiceFactory - where - FShut: FnOnce(), - { - FnServiceFactory { - f: self.f, - f_shutdown: Cell::new(Some(f)), - _t: PhantomData, - } + FnServiceFactory { f, _t: PhantomData } } } -impl Clone - for FnServiceFactory +impl Clone for FnServiceFactory where F: Fn(Req) -> Fut + Clone, - FShut: FnOnce() + Clone, Fut: Future>, { #[inline] fn clone(&self) -> Self { - let f = self.f_shutdown.take(); - self.f_shutdown.set(f.clone()); - Self { f: self.f.clone(), - f_shutdown: Cell::new(f), _t: PhantomData, } } } -impl Service - for FnServiceFactory +impl Service for FnServiceFactory where F: Fn(Req) -> Fut, - FShut: FnOnce(), Fut: Future>, { type Response = Res; type Error = Err; - type Future = Fut; + type Future<'f> = Fut where Self: 'f; #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - #[inline] - fn poll_shutdown(&self, _: &mut Context<'_>, _: bool) -> Poll<()> { - if let Some(f) = self.f_shutdown.take() { - (f)() - } - Poll::Ready(()) - } - - #[inline] - fn call(&self, req: Req) -> Self::Future { + fn call(&self, req: Req) -> Self::Future<'_> { (self.f)(req) } } -impl ServiceFactory - for FnServiceFactory +impl ServiceFactory + for FnServiceFactory where - F: Fn(Req) -> Fut + Clone, - FShut: FnOnce() + Clone, + F: Fn(Req) -> Fut + Clone + 'static, Fut: Future>, { type Response = Res; type Error = Err; - type Service = FnService; + type Service = FnService; type InitError = (); - type Future = Ready>; + type Future<'f> = Ready> where Self: 'f; #[inline] - fn new_service(&self, _: Cfg) -> Self::Future { - let f = self.f_shutdown.take(); - self.f_shutdown.set(f.clone()); - + fn create(&self, _: Cfg) -> Self::Future<'_> { ready(Ok(FnService { f: self.f.clone(), - f_shutdown: Cell::new(f), _t: PhantomData, })) } @@ -320,7 +220,7 @@ where impl IntoServiceFactory, Req, Cfg> for F where - F: Fn(Req) -> Fut + Clone, + F: Fn(Req) -> Fut + Clone + 'static, Fut: Future>, { #[inline] @@ -329,7 +229,7 @@ where } } -/// Convert `Fn(&Config) -> Future` fn to NewService +/// Convert `Fn(Config) -> Future` fn to NewService pub struct FnServiceConfig where F: Fn(Cfg) -> Fut, @@ -340,17 +240,6 @@ where _t: PhantomData<(Fut, Cfg, Srv, Req, Err)>, } -impl FnServiceConfig -where - F: Fn(Cfg) -> Fut, - Fut: Future>, - Srv: Service, -{ - fn new(f: F) -> Self { - FnServiceConfig { f, _t: PhantomData } - } -} - impl Clone for FnServiceConfig where F: Fn(Cfg) -> Fut + Clone, @@ -378,26 +267,26 @@ where type Service = Srv; type InitError = Err; - type Future = Fut; + type Future<'f> = Fut where Self: 'f, Fut: 'f; #[inline] - fn new_service(&self, cfg: Cfg) -> Self::Future { + fn create(&self, cfg: Cfg) -> Self::Future<'_> { (self.f)(cfg) } } /// Converter for `Fn() -> Future` fn -pub struct FnServiceNoConfig +pub struct FnServiceNoConfig where F: Fn() -> R, S: Service, R: Future>, { f: F, - _t: PhantomData<(Req, C)>, + _t: PhantomData, } -impl FnServiceNoConfig +impl FnServiceNoConfig where F: Fn() -> R, R: Future>, @@ -408,25 +297,26 @@ where } } -impl ServiceFactory for FnServiceNoConfig +impl ServiceFactory for FnServiceNoConfig where F: Fn() -> R, R: Future>, S: Service, + C: 'static, { type Response = S::Response; type Error = S::Error; type Service = S; type InitError = E; - type Future = R; + type Future<'f> = R where Self: 'f, R: 'f; #[inline] - fn new_service(&self, _: C) -> Self::Future { + fn create(&self, _: C) -> Self::Future<'_> { (self.f)() } } -impl Clone for FnServiceNoConfig +impl Clone for FnServiceNoConfig where F: Fn() -> R + Clone, R: Future>, @@ -438,15 +328,16 @@ where } } -impl IntoServiceFactory, Req, C> +impl IntoServiceFactory, Req, C> for F where F: Fn() -> R, R: Future>, S: Service, + C: 'static, { #[inline] - fn into_factory(self) -> FnServiceNoConfig { + fn into_factory(self) -> FnServiceNoConfig { FnServiceNoConfig::new(self) } } @@ -454,21 +345,16 @@ where #[cfg(test)] mod tests { use ntex_util::future::lazy; - use std::{cell::RefCell, rc::Rc, task::Poll}; + use std::task::Poll; use super::*; use crate::{Service, ServiceFactory}; #[ntex::test] async fn test_fn_service() { - let shutdown = Rc::new(RefCell::new(false)); - let new_srv = fn_service(|()| async { Ok::<_, ()>("srv") }) - .on_shutdown(|| { - *shutdown.borrow_mut() = true; - }) - .clone(); + let new_srv = fn_service(|()| async { Ok::<_, ()>("srv") }).clone(); - let srv = new_srv.new_service(()).await.unwrap(); + let srv = new_srv.create(()).await.unwrap(); let res = srv.call(()).await; assert_eq!(lazy(|cx| srv.poll_ready(cx)).await, Poll::Ready(Ok(()))); assert!(res.is_ok()); @@ -479,22 +365,14 @@ mod tests { assert!(res.is_ok()); assert_eq!(res.unwrap(), "srv"); - assert_eq!( - lazy(|cx| srv2.poll_shutdown(cx, false)).await, - Poll::Ready(()) - ); - assert!(*shutdown.borrow()); + assert_eq!(lazy(|cx| srv2.poll_shutdown(cx)).await, Poll::Ready(())); } #[ntex::test] async fn test_fn_service_service() { - let shutdown = Rc::new(RefCell::new(false)); let srv = fn_service(|()| async { Ok::<_, ()>("srv") }) - .on_shutdown(|| { - *shutdown.borrow_mut() = true; - }) .clone() - .new_service(()) + .create(&()) .await .unwrap() .clone(); @@ -503,23 +381,22 @@ mod tests { assert_eq!(lazy(|cx| srv.poll_ready(cx)).await, Poll::Ready(Ok(()))); assert!(res.is_ok()); assert_eq!(res.unwrap(), "srv"); - assert_eq!( - lazy(|cx| srv.poll_shutdown(cx, false)).await, - Poll::Ready(()) - ); - assert!(*shutdown.borrow()); + assert_eq!(lazy(|cx| srv.poll_shutdown(cx)).await, Poll::Ready(())); } #[ntex::test] async fn test_fn_service_with_config() { - let new_srv = fn_factory_with_config(|cfg: usize| async move { - Ok::<_, ()>(fn_service( - move |()| async move { Ok::<_, ()>(("srv", cfg)) }, - )) + let new_srv = fn_factory_with_config(|cfg: &usize| { + let cfg = *cfg; + async move { + Ok::<_, ()>(fn_service( + move |()| async move { Ok::<_, ()>(("srv", cfg)) }, + )) + } }) .clone(); - let srv = new_srv.new_service(1).await.unwrap(); + let srv = new_srv.create(&1).await.unwrap(); let res = srv.call(()).await; assert_eq!(lazy(|cx| srv.poll_ready(cx)).await, Poll::Ready(Ok(()))); assert!(res.is_ok()); diff --git a/ntex-service/src/lib.rs b/ntex-service/src/lib.rs index 9593ce68..00260cae 100644 --- a/ntex-service/src/lib.rs +++ b/ntex-service/src/lib.rs @@ -11,6 +11,7 @@ mod and_then; mod apply; pub mod boxed; mod fn_service; +mod macros; mod map; mod map_config; mod map_err; @@ -21,10 +22,11 @@ mod transform; pub use self::apply::{apply_fn, apply_fn_factory}; pub use self::fn_service::{fn_factory, fn_factory_with_config, fn_service}; -pub use self::map_config::{map_config, map_config_service, unit_config}; +pub use self::map_config::{map_config, unit_config}; pub use self::pipeline::{pipeline, pipeline_factory, Pipeline, PipelineFactory}; -pub use self::transform::{apply, Identity, Transform}; +pub use self::transform::{apply, Identity, Middleware, Stack}; +#[allow(unused_variables)] /// An asynchronous function of `Request` to a `Response`. /// /// The `Service` trait represents a request/response interaction, receiving requests and returning @@ -62,13 +64,9 @@ pub use self::transform::{apply, Identity, Transform}; /// impl Service for MyService { /// type Response = u64; /// type Error = Infallible; -/// type Future = Pin>>>; +/// type Future<'f> = Pin>>>; /// -/// fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { -/// Poll::Ready(Ok(())) -/// } -/// -/// fn call(&self, req: u8) -> Self::Future { +/// fn call(&self, req: u8) -> Self::Future<'_> { /// Box::pin(std::future::ready(Ok(req as u64))) /// } /// } @@ -88,8 +86,22 @@ pub trait Service { type Error; /// The future response value. - type Future: Future>; + type Future<'f>: Future> + where + Req: 'f, + Self: 'f; + /// Process the request and return the response asynchronously. + /// + /// This function is expected to be callable off-task. As such, implementations of `call` + /// should take care to not call `poll_ready`. If the service is at capacity and the request + /// is unable to be handled, the returned `Future` should resolve to an error. + /// + /// Invoking `call` without first invoking `poll_ready` is permitted. Implementations must be + /// resilient to this fact. + fn call(&self, req: Req) -> Self::Future<'_>; + + #[inline] /// Returns `Ready` when the service is able to process requests. /// /// If the service is at capacity, then `Pending` is returned and the task is notified when @@ -103,28 +115,19 @@ pub trait Service { /// /// 1. `.poll_ready()` might be called on different task from actual service call. /// 1. In case of chained services, `.poll_ready()` is called for all services at once. - fn poll_ready(&self, ctx: &mut task::Context<'_>) -> Poll>; + fn poll_ready(&self, cx: &mut task::Context<'_>) -> Poll> { + Poll::Ready(Ok(())) + } #[inline] - #[allow(unused_variables)] /// Shutdown service. /// /// Returns `Ready` when the service is properly shutdowns. This method might be called /// after it returns `Ready`. - fn poll_shutdown(&self, ctx: &mut task::Context<'_>, is_error: bool) -> Poll<()> { + fn poll_shutdown(&self, cx: &mut task::Context<'_>) -> Poll<()> { Poll::Ready(()) } - /// Process the request and return the response asynchronously. - /// - /// This function is expected to be callable off-task. As such, implementations of `call` - /// should take care to not call `poll_ready`. If the service is at capacity and the request - /// is unable to be handled, the returned `Future` should resolve to an error. - /// - /// Invoking `call` without first invoking `poll_ready` is permitted. Implementations must be - /// resilient to this fact. - fn call(&self, req: Req) -> Self::Future; - #[inline] /// Map this service's output to a different type, returning a new service of the resulting type. /// @@ -136,7 +139,7 @@ pub trait Service { fn map(self, f: F) -> crate::dev::Map where Self: Sized, - F: FnMut(Self::Response) -> Res, + F: Fn(Self::Response) -> Res, { crate::dev::Map::new(self, f) } @@ -183,33 +186,33 @@ pub trait ServiceFactory { type InitError; /// The future of the `ServiceFactory` instance. - type Future: Future>; + type Future<'f>: Future> + where + Cfg: 'f, + Self: 'f; /// Create and return a new service value asynchronously. - fn new_service(&self, cfg: Cfg) -> Self::Future; + fn create(&self, cfg: Cfg) -> Self::Future<'_>; #[inline] /// Map this service's output to a different type, returning a new service /// of the resulting type. - fn map(self, f: F) -> crate::map::MapServiceFactory + fn map(self, f: F) -> crate::map::MapFactory where Self: Sized, - F: FnMut(Self::Response) -> Res + Clone, + F: Fn(Self::Response) -> Res + Clone, { - crate::map::MapServiceFactory::new(self, f) + crate::map::MapFactory::new(self, f) } #[inline] /// Map this service's error to a different error, returning a new service. - fn map_err( - self, - f: F, - ) -> crate::map_err::MapErrServiceFactory + fn map_err(self, f: F) -> crate::map_err::MapErrFactory where Self: Sized, F: Fn(Self::Error) -> E + Clone, { - crate::map_err::MapErrServiceFactory::<_, _, Cfg, _, _>::new(self, f) + crate::map_err::MapErrFactory::new(self, f) } #[inline] @@ -226,13 +229,13 @@ pub trait ServiceFactory { } } -impl Service for Box +impl<'a, S, Req> Service for &'a S where S: Service + ?Sized, { type Response = S::Response; type Error = S::Error; - type Future = S::Future; + type Future<'f> = S::Future<'f> where 'a: 'f, Req: 'f; #[inline] fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { @@ -240,12 +243,36 @@ where } #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - (**self).poll_shutdown(cx, is_error) + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + (**self).poll_shutdown(cx) } #[inline] - fn call(&self, request: Req) -> S::Future { + fn call(&self, request: Req) -> S::Future<'_> { + (**self).call(request) + } +} + +impl Service for Box +where + S: Service + ?Sized, +{ + type Response = S::Response; + type Error = S::Error; + type Future<'f> = S::Future<'f> where S: 'f, Req: 'f; + + #[inline] + fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { + (**self).poll_ready(cx) + } + + #[inline] + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + (**self).poll_shutdown(cx) + } + + #[inline] + fn call(&self, request: Req) -> S::Future<'_> { (**self).call(request) } } @@ -256,18 +283,18 @@ where { type Response = S::Response; type Error = S::Error; - type Future = S::Future; + type Future<'f> = S::Future<'f> where S: 'f, Req: 'f; fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { (**self).poll_ready(cx) } #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - (**self).poll_shutdown(cx, is_error) + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + (**self).poll_shutdown(cx) } - fn call(&self, request: Req) -> S::Future { + fn call(&self, request: Req) -> S::Future<'_> { (**self).call(request) } } @@ -280,20 +307,20 @@ where type Error = S::Error; type Service = S::Service; type InitError = S::InitError; - type Future = S::Future; + type Future<'f> = S::Future<'f> where S: 'f, Cfg: 'f; - fn new_service(&self, cfg: Cfg) -> S::Future { - self.as_ref().new_service(cfg) + fn create(&self, cfg: Cfg) -> S::Future<'_> { + self.as_ref().create(cfg) } } /// Trait for types that can be converted to a `Service` -pub trait IntoService +pub trait IntoService where - T: Service, + Svc: Service, { /// Convert to a `Service` - fn into_service(self) -> T; + fn into_service(self) -> Svc; } /// Trait for types that can be converted to a `ServiceFactory` @@ -305,11 +332,11 @@ where fn into_factory(self) -> T; } -impl IntoService for T +impl IntoService for Svc where - T: Service, + Svc: Service, { - fn into_service(self) -> T { + fn into_service(self) -> Svc { self } } @@ -324,24 +351,24 @@ where } /// Convert object of type `T` to a service `S` -pub fn into_service(tp: T) -> S +pub fn into_service(tp: F) -> Svc where - S: Service, - T: IntoService, + Svc: Service, + F: IntoService, { tp.into_service() } pub mod dev { pub use crate::and_then::{AndThen, AndThenFactory}; - pub use crate::apply::{Apply, ApplyServiceFactory}; + pub use crate::apply::{Apply, ApplyFactory}; pub use crate::fn_service::{ FnService, FnServiceConfig, FnServiceFactory, FnServiceNoConfig, }; - pub use crate::map::{Map, MapServiceFactory}; + pub use crate::map::{Map, MapFactory}; pub use crate::map_config::{MapConfig, UnitConfig}; - pub use crate::map_err::{MapErr, MapErrServiceFactory}; + pub use crate::map_err::{MapErr, MapErrFactory}; pub use crate::map_init_err::MapInitErr; pub use crate::then::{Then, ThenFactory}; - pub use crate::transform::ApplyTransform; + pub use crate::transform::ApplyMiddleware; } diff --git a/ntex-service/src/macros.rs b/ntex-service/src/macros.rs new file mode 100644 index 00000000..ee15b02e --- /dev/null +++ b/ntex-service/src/macros.rs @@ -0,0 +1,38 @@ +/// An implementation of [`poll_ready`] that forwards readiness checks to a field. +#[macro_export] +macro_rules! forward_poll_ready { + ($field:ident) => { + #[inline] + fn poll_ready( + &self, + cx: &mut ::core::task::Context<'_>, + ) -> ::core::task::Poll> { + self.$field + .poll_ready(cx) + .map_err(::core::convert::Into::into) + } + }; + ($field:ident, $err:expr) => { + #[inline] + fn poll_ready( + &self, + cx: &mut ::core::task::Context<'_>, + ) -> ::core::task::Poll> { + self.$field.poll_ready(cx).map_err($err) + } + }; +} + +/// An implementation of [`poll_shutdown`] that forwards readiness checks to a field. +#[macro_export] +macro_rules! forward_poll_shutdown { + ($field:ident) => { + #[inline] + fn poll_shutdown( + &self, + cx: &mut ::core::task::Context<'_>, + ) -> ::core::task::Poll<()> { + self.$field.poll_shutdown(cx) + } + }; +} diff --git a/ntex-service/src/map.rs b/ntex-service/src/map.rs index 0c6ad082..d502acc0 100644 --- a/ntex-service/src/map.rs +++ b/ntex-service/src/map.rs @@ -16,7 +16,7 @@ impl Map { pub(crate) fn new(service: A, f: F) -> Self where A: Service, - F: FnMut(A::Response) -> Res, + F: Fn(A::Response) -> Res, { Self { service, @@ -44,62 +44,51 @@ where impl Service for Map where A: Service, - F: FnMut(A::Response) -> Res + Clone, + F: Fn(A::Response) -> Res, { type Response = Res; type Error = A::Error; - type Future = MapFuture; + type Future<'f> = MapFuture<'f, A, F, Req, Res> where Self: 'f, Req: 'f; + + crate::forward_poll_ready!(service); + crate::forward_poll_shutdown!(service); #[inline] - fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - self.service.poll_ready(cx) - } - - #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) - } - - #[inline] - fn call(&self, req: Req) -> Self::Future { - MapFuture::new(self.service.call(req), self.f.clone()) + fn call(&self, req: Req) -> Self::Future<'_> { + MapFuture { + fut: self.service.call(req), + slf: self, + } } } pin_project_lite::pin_project! { - pub struct MapFuture + pub struct MapFuture<'f, A, F, Req, Res> where A: Service, - F: FnMut(A::Response) -> Res, + A: 'f, + Req: 'f, + F: Fn(A::Response) -> Res, { - f: F, + slf: &'f Map, #[pin] - fut: A::Future, + fut: A::Future<'f>, } } -impl MapFuture +impl<'f, A, F, Req, Res> Future for MapFuture<'f, A, F, Req, Res> where - A: Service, - F: FnMut(A::Response) -> Res, -{ - fn new(fut: A::Future, f: F) -> Self { - MapFuture { f, fut } - } -} - -impl Future for MapFuture -where - A: Service, - F: FnMut(A::Response) -> Res, + A: Service + 'f, + Req: 'f, + F: Fn(A::Response) -> Res, { type Output = Result; - fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - let this = self.project(); + fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { + let this = self.as_mut().project(); match this.fut.poll(cx) { - Poll::Ready(Ok(resp)) => Poll::Ready(Ok((this.f)(resp))), + Poll::Ready(Ok(resp)) => Poll::Ready(Ok((self.project().slf.f)(resp))), Poll::Ready(Err(e)) => Poll::Ready(Err(e)), Poll::Pending => Poll::Pending, } @@ -107,19 +96,19 @@ where } /// `MapNewService` new service combinator -pub struct MapServiceFactory { +pub struct MapFactory { a: A, f: F, r: PhantomData Res>, } -impl MapServiceFactory { +impl MapFactory +where + A: ServiceFactory, + F: Fn(A::Response) -> Res, +{ /// Create new `Map` new service instance - pub(crate) fn new(a: A, f: F) -> Self - where - A: ServiceFactory, - F: FnMut(A::Response) -> Res, - { + pub(crate) fn new(a: A, f: F) -> Self { Self { a, f, @@ -128,7 +117,7 @@ impl MapServiceFactory { } } -impl Clone for MapServiceFactory +impl Clone for MapFactory where A: Clone, F: Clone, @@ -143,51 +132,45 @@ where } } -impl ServiceFactory - for MapServiceFactory +impl ServiceFactory for MapFactory where A: ServiceFactory, - F: FnMut(A::Response) -> Res + Clone, + F: Fn(A::Response) -> Res + Clone, { type Response = Res; type Error = A::Error; type Service = Map; type InitError = A::InitError; - type Future = MapServiceFuture; + type Future<'f> = MapFactoryFuture<'f, A, F, Req, Res, Cfg> where Self: 'f, Cfg: 'f; #[inline] - fn new_service(&self, cfg: Cfg) -> Self::Future { - MapServiceFuture::new(self.a.new_service(cfg), self.f.clone()) + fn create(&self, cfg: Cfg) -> Self::Future<'_> { + MapFactoryFuture { + fut: self.a.create(cfg), + f: Some(self.f.clone()), + } } } pin_project_lite::pin_project! { - pub struct MapServiceFuture + pub struct MapFactoryFuture<'f, A, F, Req, Res, Cfg> where A: ServiceFactory, - F: FnMut(A::Response) -> Res, + A: 'f, + F: Fn(A::Response) -> Res, + Cfg: 'f, { #[pin] - fut: A::Future, + fut: A::Future<'f>, f: Option, } } -impl MapServiceFuture +impl<'f, A, F, Req, Res, Cfg> Future for MapFactoryFuture<'f, A, F, Req, Res, Cfg> where A: ServiceFactory, - F: FnMut(A::Response) -> Res, -{ - fn new(fut: A::Future, f: F) -> Self { - MapServiceFuture { f: Some(f), fut } - } -} - -impl Future for MapServiceFuture -where - A: ServiceFactory, - F: FnMut(A::Response) -> Res, + F: Fn(A::Response) -> Res, { type Output = Result, A::InitError>; @@ -207,7 +190,7 @@ mod tests { use ntex_util::future::{lazy, Ready}; use super::*; - use crate::{IntoServiceFactory, Service, ServiceFactory}; + use crate::{fn_factory, Service, ServiceFactory}; #[derive(Clone)] struct Srv; @@ -215,13 +198,13 @@ mod tests { impl Service<()> for Srv { type Response = (); type Error = (); - type Future = Ready<(), ()>; + type Future<'f> = Ready<(), ()>; fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { Poll::Ready(Ok(())) } - fn call(&self, _: ()) -> Self::Future { + fn call(&self, _: ()) -> Self::Future<'_> { Ready::Ok(()) } } @@ -236,7 +219,7 @@ mod tests { let res = lazy(|cx| srv.poll_ready(cx)).await; assert_eq!(res, Poll::Ready(Ok(()))); - let res = lazy(|cx| srv.poll_shutdown(cx, true)).await; + let res = lazy(|cx| srv.poll_shutdown(cx)).await; assert_eq!(res, Poll::Ready(())); } @@ -250,17 +233,16 @@ mod tests { let res = lazy(|cx| srv.poll_ready(cx)).await; assert_eq!(res, Poll::Ready(Ok(()))); - let res = lazy(|cx| srv.poll_shutdown(cx, true)).await; + let res = lazy(|cx| srv.poll_shutdown(cx)).await; assert_eq!(res, Poll::Ready(())); } #[ntex::test] async fn test_factory() { - let new_srv = (|| async { Ok::<_, ()>(Srv) }) - .into_factory() + let new_srv = fn_factory(|| async { Ok::<_, ()>(Srv) }) .map(|_| "ok") .clone(); - let srv = new_srv.new_service(&()).await.unwrap(); + let srv = new_srv.create(&()).await.unwrap(); let res = srv.call(()).await; assert!(res.is_ok()); assert_eq!(res.unwrap(), ("ok")); @@ -268,11 +250,10 @@ mod tests { #[ntex::test] async fn test_pipeline_factory() { - let new_srv = - crate::pipeline_factory((|| async { Ok::<_, ()>(Srv) }).into_factory()) - .map(|_| "ok") - .clone(); - let srv = new_srv.new_service(&()).await.unwrap(); + let new_srv = crate::pipeline_factory(fn_factory(|| async { Ok::<_, ()>(Srv) })) + .map(|_| "ok") + .clone(); + let srv = new_srv.create(&()).await.unwrap(); let res = srv.call(()).await; assert!(res.is_ok()); assert_eq!(res.unwrap(), ("ok")); diff --git a/ntex-service/src/map_config.rs b/ntex-service/src/map_config.rs index dc602a22..1b6cea4d 100644 --- a/ntex-service/src/map_config.rs +++ b/ntex-service/src/map_config.rs @@ -1,13 +1,12 @@ -use std::task::{Context, Poll}; -use std::{cell::RefCell, future::Future, marker::PhantomData, pin::Pin, rc::Rc}; +use std::{future::Future, marker::PhantomData, pin::Pin, task::Context, task::Poll}; -use super::{IntoServiceFactory, Service, ServiceFactory}; +use super::{IntoServiceFactory, ServiceFactory}; /// Adapt external config argument to a config for provided service factory /// /// Note that this function consumes the receiving service factory and returns /// a wrapped version of it. -pub fn map_config(factory: U, f: F) -> MapConfig +pub fn map_config(factory: U, f: F) -> MapConfig where T: ServiceFactory, U: IntoServiceFactory, @@ -16,45 +15,25 @@ where MapConfig::new(factory.into_factory(), f) } -/// Adapt external config argument to a config for provided service factory -/// -/// This function uses service for converting config. -pub fn map_config_service( - factory: U1, - mapper: U2, -) -> MapConfigService -where - T: ServiceFactory, - M: ServiceFactory, - U1: IntoServiceFactory, - U2: IntoServiceFactory, -{ - MapConfigService::new(factory.into_factory(), mapper.into_factory()) -} - /// Replace config with unit -pub fn unit_config(factory: U) -> UnitConfig +pub fn unit_config(factory: U) -> UnitConfig where - T: ServiceFactory, - U: IntoServiceFactory, + T: ServiceFactory, + U: IntoServiceFactory, { UnitConfig::new(factory.into_factory()) } /// `map_config()` adapter service factory -pub struct MapConfig { +pub struct MapConfig { a: A, f: F, - e: PhantomData<(R, C, C2)>, + e: PhantomData<(C, C2)>, } -impl MapConfig { +impl MapConfig { /// Create new `MapConfig` combinator - pub(crate) fn new(a: A, f: F) -> Self - where - A: ServiceFactory, - F: Fn(C) -> C2, - { + pub(crate) fn new(a: A, f: F) -> Self { Self { a, f, @@ -63,7 +42,7 @@ impl MapConfig { } } -impl Clone for MapConfig +impl Clone for MapConfig where A: Clone, F: Clone, @@ -77,7 +56,7 @@ where } } -impl ServiceFactory for MapConfig +impl ServiceFactory for MapConfig where A: ServiceFactory, F: Fn(C) -> C2, @@ -87,195 +66,74 @@ where type Service = A::Service; type InitError = A::InitError; - type Future = A::Future; + type Future<'f> = A::Future<'f> where Self: 'f; - fn new_service(&self, cfg: C) -> Self::Future { - self.a.new_service((self.f)(cfg)) + fn create(&self, cfg: C) -> Self::Future<'_> { + let cfg = (self.f)(cfg); + self.a.create(cfg) } } /// `unit_config()` config combinator -pub struct UnitConfig { +pub struct UnitConfig { a: A, - e: PhantomData<(C, R)>, } -impl UnitConfig -where - A: ServiceFactory, -{ +impl UnitConfig { /// Create new `UnitConfig` combinator pub(crate) fn new(a: A) -> Self { - Self { a, e: PhantomData } + Self { a } } } -impl Clone for UnitConfig +impl Clone for UnitConfig where A: Clone, { fn clone(&self) -> Self { - Self { - a: self.a.clone(), - e: PhantomData, - } + Self { a: self.a.clone() } } } -impl ServiceFactory for UnitConfig +impl ServiceFactory for UnitConfig where - A: ServiceFactory, + A: ServiceFactory, { type Response = A::Response; type Error = A::Error; type Service = A::Service; type InitError = A::InitError; - type Future = A::Future; + type Future<'f> = UnitConfigFuture<'f, A, R, C> where Self: 'f, C: 'f; - fn new_service(&self, _: C) -> Self::Future { - self.a.new_service(()) - } -} - -/// `map_config_service()` adapter service factory -pub struct MapConfigService, C, C2>( - Rc>, -); - -struct Inner, C, C2> { - a: A, - m: M, - mapper: RefCell>, - e: PhantomData<(R, C, C2)>, -} - -impl, C, C2> Clone for MapConfigService { - fn clone(&self) -> Self { - Self(self.0.clone()) - } -} - -impl, C, C2> MapConfigService { - /// Create new `MapConfigService` combinator - pub(crate) fn new(a: A, m: M) -> Self - where - A: ServiceFactory, - M: ServiceFactory< - C, - (), - Response = C2, - Error = A::InitError, - InitError = A::InitError, - >, - { - Self(Rc::new(Inner { - a, - m, - mapper: RefCell::new(None), - e: PhantomData, - })) - } -} - -impl ServiceFactory for MapConfigService -where - A: ServiceFactory, - M: ServiceFactory, -{ - type Response = A::Response; - type Error = A::Error; - - type Service = A::Service; - type InitError = A::InitError; - type Future = MapConfigServiceResponse; - - fn new_service(&self, cfg: C) -> Self::Future { - let inner = self.0.clone(); - if self.0.mapper.borrow().is_some() { - MapConfigServiceResponse { - inner, - config: Some(cfg), - state: ResponseState::MapReady, - } - } else { - MapConfigServiceResponse { - inner, - config: Some(cfg), - state: ResponseState::CreateMapper { - fut: self.0.m.new_service(()), - }, - } + fn create(&self, _: C) -> Self::Future<'_> { + UnitConfigFuture { + fut: self.a.create(()), + _t: PhantomData, } } } pin_project_lite::pin_project! { - pub struct MapConfigServiceResponse - where - A: ServiceFactory, - M: ServiceFactory, + pub struct UnitConfigFuture<'f, A, R, C> + where A: ServiceFactory, + A: 'f, + C: 'f, { - inner: Rc>, - config: Option, #[pin] - state: ResponseState, + fut: A::Future<'f>, + _t: PhantomData, } } -pin_project_lite::pin_project! { - #[project = ResponseStateProject] - enum ResponseState, R, M: ServiceFactory, C, C2> { - CreateMapper { #[pin] fut: M::Future }, - MapReady, - MapConfig { #[pin] fut: >::Future }, - CreateService { #[pin] fut: A::Future }, - } -} - -impl Future for MapConfigServiceResponse +impl<'f, A, R, C> Future for UnitConfigFuture<'f, A, R, C> where - A: ServiceFactory, - M: ServiceFactory, + A: ServiceFactory, { type Output = Result; - fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - let mut this = self.as_mut().project(); - - match this.state.as_mut().project() { - ResponseStateProject::CreateMapper { fut } => { - let mapper = match fut.poll(cx) { - Poll::Ready(result) => result?, - Poll::Pending => return Poll::Pending, - }; - *this.inner.mapper.borrow_mut() = Some(mapper); - this.state.set(ResponseState::MapReady); - self.poll(cx) - } - ResponseStateProject::MapReady => { - let mapper = this.inner.mapper.borrow(); - match mapper.as_ref().unwrap().poll_ready(cx) { - Poll::Ready(result) => result?, - Poll::Pending => return Poll::Pending, - }; - - let fut = mapper.as_ref().unwrap().call(this.config.take().unwrap()); - this.state.set(ResponseState::MapConfig { fut }); - drop(mapper); - self.poll(cx) - } - ResponseStateProject::MapConfig { fut } => { - let config = match fut.poll(cx) { - Poll::Ready(result) => result?, - Poll::Pending => return Poll::Pending, - }; - let fut = this.inner.a.new_service(config); - this.state.set(ResponseState::CreateService { fut }); - self.poll(cx) - } - ResponseStateProject::CreateService { fut } => fut.poll(cx), - } + fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { + self.project().fut.poll(cx) } } @@ -286,7 +144,7 @@ mod tests { use std::{cell::Cell, rc::Rc}; use super::*; - use crate::{fn_factory_with_config, fn_service, ServiceFactory}; + use crate::{fn_service, ServiceFactory}; #[ntex::test] async fn test_map_config() { @@ -294,13 +152,13 @@ mod tests { let factory = map_config( fn_service(|item: usize| Ready::<_, ()>::Ok(item)), - |t: usize| { - item.set(item.get() + t); + |t: &usize| { + item.set(item.get() + *t); }, ) .clone(); - let _ = factory.new_service(10).await; + let _ = factory.create(&10).await; assert_eq!(item.get(), 11); } @@ -308,31 +166,31 @@ mod tests { async fn test_unit_config() { let _ = unit_config(fn_service(|item: usize| Ready::<_, ()>::Ok(item))) .clone() - .new_service(10) + .create(&10) .await; } - #[ntex::test] - async fn test_map_config_service() { - let item = Rc::new(Cell::new(10usize)); - let item2 = item.clone(); + // #[ntex::test] + // async fn test_map_config_service() { + // let item = Rc::new(Cell::new(10usize)); + // let item2 = item.clone(); - let srv = map_config_service( - fn_factory_with_config(move |next: usize| { - let item = item2.clone(); - async move { - item.set(next); - Ok::<_, ()>(fn_service(|id: usize| Ready::<_, ()>::Ok(id * 2))) - } - }), - fn_service(move |item: usize| Ready::<_, ()>::Ok(item + 1)), - ) - .clone() - .new_service(10) - .await - .unwrap(); + // let srv = map_config_service( + // fn_factory_with_config(move |next: usize| { + // let item = item2.clone(); + // async move { + // item.set(next); + // Ok::<_, ()>(fn_service(|id: usize| Ready::<_, ()>::Ok(id * 2))) + // } + // }), + // fn_service(move |item: usize| Ready::<_, ()>::Ok(item + 1)), + // ) + // .clone() + // .create(10) + // .await + // .unwrap(); - assert_eq!(srv.call(10usize).await.unwrap(), 20); - assert_eq!(item.get(), 11); - } + // assert_eq!(srv.call(10usize).await.unwrap(), 20); + // assert_eq!(item.get(), 11); + // } } diff --git a/ntex-service/src/map_err.rs b/ntex-service/src/map_err.rs index b581013e..fa2867e2 100644 --- a/ntex-service/src/map_err.rs +++ b/ntex-service/src/map_err.rs @@ -45,11 +45,11 @@ where impl Service for MapErr where A: Service, - F: Fn(A::Error) -> E + Clone, + F: Fn(A::Error) -> E, { type Response = A::Response; type Error = E; - type Future = MapErrFuture; + type Future<'f> = MapErrFuture<'f, A, R, F, E> where A: 'f, R: 'f, F: 'f, E: 'f; #[inline] fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { @@ -57,48 +57,40 @@ where } #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) + fn call(&self, req: R) -> Self::Future<'_> { + MapErrFuture { + slf: self, + fut: self.service.call(req), + } } - #[inline] - fn call(&self, req: R) -> Self::Future { - MapErrFuture::new(self.service.call(req), self.f.clone()) - } + crate::forward_poll_shutdown!(service); } pin_project_lite::pin_project! { - pub struct MapErrFuture + pub struct MapErrFuture<'f, A, R, F, E> where A: Service, + A: 'f, + R: 'f, F: Fn(A::Error) -> E, { - f: F, + slf: &'f MapErr, #[pin] - fut: A::Future, + fut: A::Future<'f>, } } -impl MapErrFuture +impl<'f, A, R, F, E> Future for MapErrFuture<'f, A, R, F, E> where - A: Service, - F: Fn(A::Error) -> E, -{ - fn new(fut: A::Future, f: F) -> Self { - MapErrFuture { f, fut } - } -} - -impl Future for MapErrFuture -where - A: Service, + A: Service + 'f, F: Fn(A::Error) -> E, { type Output = Result; - fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - let this = self.project(); - this.fut.poll(cx).map_err(this.f) + fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { + let this = self.as_mut().project(); + this.fut.poll(cx).map_err(|e| (self.project().slf.f)(e)) } } @@ -106,7 +98,7 @@ where /// service's error. /// /// This is created by the `NewServiceExt::map_err` method. -pub struct MapErrServiceFactory +pub struct MapErrFactory where A: ServiceFactory, F: Fn(A::Error) -> E + Clone, @@ -116,7 +108,7 @@ where e: PhantomData E>, } -impl MapErrServiceFactory +impl MapErrFactory where A: ServiceFactory, F: Fn(A::Error) -> E + Clone, @@ -131,7 +123,7 @@ where } } -impl Clone for MapErrServiceFactory +impl Clone for MapErrFactory where A: ServiceFactory + Clone, F: Fn(A::Error) -> E + Clone, @@ -145,7 +137,7 @@ where } } -impl ServiceFactory for MapErrServiceFactory +impl ServiceFactory for MapErrFactory where A: ServiceFactory, F: Fn(A::Error) -> E + Clone, @@ -155,37 +147,32 @@ where type Service = MapErr; type InitError = A::InitError; - type Future = MapErrServiceFuture; + type Future<'f> = MapErrFactoryFuture<'f, A, R, C, F, E> where Self: 'f, C: 'f; #[inline] - fn new_service(&self, cfg: C) -> Self::Future { - MapErrServiceFuture::new(self.a.new_service(cfg), self.f.clone()) + fn create(&self, cfg: C) -> Self::Future<'_> { + MapErrFactoryFuture { + f: self.f.clone(), + fut: self.a.create(cfg), + } } } pin_project_lite::pin_project! { - pub struct MapErrServiceFuture + pub struct MapErrFactoryFuture<'f, A, R, C, F, E> where A: ServiceFactory, + A: 'f, F: Fn(A::Error) -> E, + C: 'f, { - #[pin] - fut: A::Future, f: F, + #[pin] + fut: A::Future<'f>, } } -impl MapErrServiceFuture -where - A: ServiceFactory, - F: Fn(A::Error) -> E, -{ - fn new(fut: A::Future, f: F) -> Self { - MapErrServiceFuture { fut, f } - } -} - -impl Future for MapErrServiceFuture +impl<'f, A, R, C, F, E> Future for MapErrFactoryFuture<'f, A, R, C, F, E> where A: ServiceFactory, F: Fn(A::Error) -> E + Clone, @@ -205,7 +192,7 @@ where #[cfg(test)] mod tests { use super::*; - use crate::{IntoServiceFactory, Service, ServiceFactory}; + use crate::{fn_factory, Service, ServiceFactory}; use ntex_util::future::{lazy, Ready}; #[derive(Clone)] @@ -214,13 +201,13 @@ mod tests { impl Service<()> for Srv { type Response = (); type Error = (); - type Future = Ready<(), ()>; + type Future<'f> = Ready<(), ()>; fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { Poll::Ready(Err(())) } - fn call(&self, _: ()) -> Self::Future { + fn call(&self, _: ()) -> Self::Future<'_> { Ready::Err(()) } } @@ -231,7 +218,7 @@ mod tests { let res = lazy(|cx| srv.poll_ready(cx)).await; assert_eq!(res, Poll::Ready(Err("error"))); - let res = lazy(|cx| srv.poll_shutdown(cx, true)).await; + let res = lazy(|cx| srv.poll_shutdown(cx)).await; assert_eq!(res, Poll::Ready(())); } @@ -253,11 +240,10 @@ mod tests { #[ntex::test] async fn test_factory() { - let new_srv = (|| Ready::<_, ()>::Ok(Srv)) - .into_factory() + let new_srv = fn_factory(|| Ready::<_, ()>::Ok(Srv)) .map_err(|_| "error") .clone(); - let srv = new_srv.new_service(&()).await.unwrap(); + let srv = new_srv.create(&()).await.unwrap(); let res = srv.call(()).await; assert!(res.is_err()); assert_eq!(res.err().unwrap(), "error"); @@ -265,11 +251,10 @@ mod tests { #[ntex::test] async fn test_pipeline_factory() { - let new_srv = - crate::pipeline_factory((|| async { Ok::<_, ()>(Srv) }).into_factory()) - .map_err(|_| "error") - .clone(); - let srv = new_srv.new_service(&()).await.unwrap(); + let new_srv = crate::pipeline_factory(fn_factory(|| async { Ok::(Srv) })) + .map_err(|_| "error") + .clone(); + let srv = new_srv.create(&()).await.unwrap(); let res = srv.call(()).await; assert!(res.is_err()); assert_eq!(res.err().unwrap(), "error"); diff --git a/ntex-service/src/map_init_err.rs b/ntex-service/src/map_init_err.rs index f37b57f6..d8dd6e46 100644 --- a/ntex-service/src/map_init_err.rs +++ b/ntex-service/src/map_init_err.rs @@ -48,58 +48,64 @@ where type Service = A::Service; type InitError = E; - type Future = MapInitErrFuture; + type Future<'f> = MapInitErrFuture<'f, A, R, C, F, E> where Self: 'f, C: 'f; - fn new_service(&self, cfg: C) -> Self::Future { + #[inline] + fn create(&self, cfg: C) -> Self::Future<'_> { MapInitErrFuture { - fut: self.a.new_service(cfg), f: self.f.clone(), + fut: self.a.create(cfg), } } } pin_project_lite::pin_project! { - pub struct MapInitErrFuture + pub struct MapInitErrFuture<'f, A, R, C, F, E> where A: ServiceFactory, + A: 'f, F: Fn(A::InitError) -> E, + C: 'f, { f: F, #[pin] - fut: A::Future, + fut: A::Future<'f>, } } -impl Future for MapInitErrFuture +impl<'f, A, R, C, F, E> Future for MapInitErrFuture<'f, A, R, C, F, E> where A: ServiceFactory, F: Fn(A::InitError) -> E, { type Output = Result; - fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - let this = self.project(); - this.fut.poll(cx).map_err(this.f) + fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { + let this = self.as_mut().project(); + this.fut.poll(cx).map_err(|e| (self.project().f)(e)) } } #[cfg(test)] mod tests { - use crate::{fn_factory_with_config, fn_service, pipeline_factory, ServiceFactory}; + use crate::{fn_factory_with_config, into_service, pipeline_factory, ServiceFactory}; #[ntex::test] async fn map_init_err() { - let factory = pipeline_factory(fn_factory_with_config(|err: bool| async move { - if err { - Err(()) - } else { - Ok(fn_service(|i: usize| async move { Ok::<_, ()>(i * 2) })) + let factory = pipeline_factory(fn_factory_with_config(|err: &bool| { + let err = *err; + async move { + if err { + Err(()) + } else { + Ok(into_service(|i: usize| async move { Ok::<_, ()>(i * 2) })) + } } })) .map_init_err(|_| std::io::Error::new(std::io::ErrorKind::Other, "err")) .clone(); - assert!(factory.new_service(true).await.is_err()); - assert!(factory.new_service(false).await.is_ok()); + assert!(factory.create(&true).await.is_err()); + assert!(factory.create(&false).await.is_ok()); } } diff --git a/ntex-service/src/pipeline.rs b/ntex-service/src/pipeline.rs index 7d2630eb..1e256693 100644 --- a/ntex-service/src/pipeline.rs +++ b/ntex-service/src/pipeline.rs @@ -1,18 +1,18 @@ -use std::{marker::PhantomData, task::Context, task::Poll}; +use std::marker::PhantomData; use crate::and_then::{AndThen, AndThenFactory}; -use crate::map::{Map, MapServiceFactory}; -use crate::map_err::{MapErr, MapErrServiceFactory}; +use crate::map::{Map, MapFactory}; +use crate::map_err::{MapErr, MapErrFactory}; use crate::map_init_err::MapInitErr; use crate::then::{Then, ThenFactory}; -use crate::transform::{ApplyTransform, Transform}; +use crate::transform::{ApplyMiddleware, Middleware}; use crate::{IntoService, IntoServiceFactory, Service, ServiceFactory}; /// Constructs new pipeline with one service in pipeline chain. -pub fn pipeline(service: F) -> Pipeline +pub fn pipeline(service: F) -> Pipeline where - T: Service, - F: IntoService, + Svc: Service, + F: IntoService, { Pipeline { service: service.into_service(), @@ -21,7 +21,7 @@ where } /// Constructs new pipeline factory with one service factory. -pub fn pipeline_factory(factory: F) -> PipelineFactory +pub fn pipeline_factory(factory: F) -> PipelineFactory where T: ServiceFactory, F: IntoServiceFactory, @@ -33,12 +33,12 @@ where } /// Pipeline service - pipeline allows to compose multiple service into one service. -pub struct Pipeline { - service: T, - _t: PhantomData, +pub struct Pipeline { + service: Svc, + _t: PhantomData, } -impl, R> Pipeline { +impl> Pipeline { /// Call another service after call to this one has resolved successfully. /// /// This function can be used to chain two services together and ensure that @@ -48,11 +48,11 @@ impl, R> Pipeline { /// /// Note that this function consumes the receiving service and returns a /// wrapped version of it. - pub fn and_then(self, service: F) -> Pipeline, R> + pub fn and_then(self, service: F) -> Pipeline> where Self: Sized, - F: IntoService, - U: Service, + F: IntoService, + Next: Service, { Pipeline { service: AndThen::new(self.service, service.into_service()), @@ -65,11 +65,11 @@ impl, R> Pipeline { /// /// Note that this function consumes the receiving pipeline and returns a /// wrapped version of it. - pub fn then(self, service: F) -> Pipeline, R> + pub fn then(self, service: F) -> Pipeline> where Self: Sized, - F: IntoService>, - U: Service, Error = T::Error>, + F: IntoService>, + Next: Service, Error = Svc::Error>, { Pipeline { service: Then::new(self.service, service.into_service()), @@ -86,10 +86,10 @@ impl, R> Pipeline { /// Note that this function consumes the receiving service and returns a /// wrapped version of it, similar to the existing `map` methods in the /// standard library. - pub fn map(self, f: F) -> Pipeline, R> + pub fn map(self, f: F) -> Pipeline> where Self: Sized, - F: FnMut(T::Response) -> Res, + F: Fn(Svc::Response) -> Res, { Pipeline { service: Map::new(self.service, f), @@ -105,10 +105,10 @@ impl, R> Pipeline { /// /// Note that this function consumes the receiving service and returns a /// wrapped version of it. - pub fn map_err(self, f: F) -> Pipeline, R> + pub fn map_err(self, f: F) -> Pipeline> where Self: Sized, - F: Fn(T::Error) -> E, + F: Fn(Svc::Error) -> Err, { Pipeline { service: MapErr::new(self.service, f), @@ -117,9 +117,9 @@ impl, R> Pipeline { } } -impl Clone for Pipeline +impl Clone for Pipeline where - T: Clone, + Svc: Clone, { fn clone(&self) -> Self { Pipeline { @@ -129,42 +129,31 @@ where } } -impl, R> Service for Pipeline { - type Response = T::Response; - type Error = T::Error; - type Future = T::Future; +impl> Service for Pipeline { + type Response = Svc::Response; + type Error = Svc::Error; + type Future<'f> = Svc::Future<'f> where Self: 'f, Req: 'f; + + crate::forward_poll_ready!(service); + crate::forward_poll_shutdown!(service); #[inline] - fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - self.service.poll_ready(cx) - } - - #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) - } - - #[inline] - fn call(&self, req: R) -> Self::Future { + fn call(&self, req: Req) -> Self::Future<'_> { self.service.call(req) } } /// Pipeline factory -pub struct PipelineFactory { +pub struct PipelineFactory { factory: T, - _t: PhantomData<(R, C)>, + _t: PhantomData<(Req, C)>, } -impl, R, C> PipelineFactory { +impl, C> PipelineFactory { /// Call another service after call to this one has resolved successfully. - pub fn and_then( - self, - factory: F, - ) -> PipelineFactory, R, C> + pub fn and_then(self, factory: F) -> PipelineFactory, C> where Self: Sized, - C: Clone, F: IntoServiceFactory, U: ServiceFactory, { @@ -174,15 +163,15 @@ impl, R, C> PipelineFactory { } } - /// Apply transform to current service factory. + /// Apply middleware to current service factory. /// - /// Short version of `apply(transform, pipeline_factory(...))` - pub fn apply(self, tr: U) -> PipelineFactory, R, C> + /// Short version of `apply(middleware, pipeline_factory(...))` + pub fn apply(self, tr: U) -> PipelineFactory, C> where - U: Transform, + U: Middleware, { PipelineFactory { - factory: ApplyTransform::new(tr, self.factory), + factory: ApplyMiddleware::new(tr, self.factory), _t: PhantomData, } } @@ -193,7 +182,7 @@ impl, R, C> PipelineFactory { /// /// Note that this function consumes the receiving pipeline and returns a /// wrapped version of it. - pub fn then(self, factory: F) -> PipelineFactory, R, C> + pub fn then(self, factory: F) -> PipelineFactory, C> where Self: Sized, C: Clone, @@ -213,16 +202,13 @@ impl, R, C> PipelineFactory { /// Map this service's output to a different type, returning a new service /// of the resulting type. - pub fn map( - self, - f: F, - ) -> PipelineFactory, R, C> + pub fn map(self, f: F) -> PipelineFactory, C> where Self: Sized, - F: FnMut(T::Response) -> Res + Clone, + F: Fn(T::Response) -> Res + Clone, { PipelineFactory { - factory: MapServiceFactory::new(self.factory, f), + factory: MapFactory::new(self.factory, f), _t: PhantomData, } } @@ -231,13 +217,13 @@ impl, R, C> PipelineFactory { pub fn map_err( self, f: F, - ) -> PipelineFactory, R, C> + ) -> PipelineFactory, C> where Self: Sized, F: Fn(T::Error) -> E + Clone, { PipelineFactory { - factory: MapErrServiceFactory::new(self.factory, f), + factory: MapErrFactory::new(self.factory, f), _t: PhantomData, } } @@ -246,7 +232,7 @@ impl, R, C> PipelineFactory { pub fn map_init_err( self, f: F, - ) -> PipelineFactory, R, C> + ) -> PipelineFactory, C> where Self: Sized, F: Fn(T::InitError) -> E + Clone, @@ -258,7 +244,7 @@ impl, R, C> PipelineFactory { } } -impl Clone for PipelineFactory +impl Clone for PipelineFactory where T: Clone, { @@ -270,15 +256,17 @@ where } } -impl, R, C> ServiceFactory for PipelineFactory { +impl, C> ServiceFactory + for PipelineFactory +{ type Response = T::Response; type Error = T::Error; type Service = T::Service; type InitError = T::InitError; - type Future = T::Future; + type Future<'f> = T::Future<'f> where Self: 'f; #[inline] - fn new_service(&self, cfg: C) -> Self::Future { - self.factory.new_service(cfg) + fn create(&self, cfg: C) -> Self::Future<'_> { + self.factory.create(cfg) } } diff --git a/ntex-service/src/then.rs b/ntex-service/src/then.rs index 4be63f30..2949dc49 100644 --- a/ntex-service/src/then.rs +++ b/ntex-service/src/then.rs @@ -1,6 +1,4 @@ -use std::{ - future::Future, marker::PhantomData, pin::Pin, rc::Rc, task::Context, task::Poll, -}; +use std::{future::Future, pin::Pin, task::Context, task::Poll}; use super::{Service, ServiceFactory}; @@ -8,50 +6,52 @@ use super::{Service, ServiceFactory}; /// another service. /// /// This is created by the `Pipeline::then` method. -pub struct Then(Rc<(A, B)>, PhantomData); +pub struct Then { + svc1: A, + svc2: B, +} -impl Then { +impl Then { /// Create new `.then()` combinator - pub(crate) fn new(a: A, b: B) -> Then - where - A: Service, - B: Service, Error = A::Error>, - { - Self(Rc::new((a, b)), PhantomData) + pub(crate) fn new(svc1: A, svc2: B) -> Then { + Self { svc1, svc2 } } } -impl Clone for Then { +impl Clone for Then +where + A: Clone, + B: Clone, +{ fn clone(&self) -> Self { - Then(self.0.clone(), PhantomData) + Then { + svc1: self.svc1.clone(), + svc2: self.svc2.clone(), + } } } -impl Service for Then +impl Service for Then where A: Service, B: Service, Error = A::Error>, { type Response = B::Response; type Error = B::Error; - type Future = ThenServiceResponse; + type Future<'f> = ThenServiceResponse<'f, A, B, R> where Self: 'f, R: 'f; #[inline] fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - let srv = self.0.as_ref(); - let not_ready = !srv.0.poll_ready(cx)?.is_ready(); - if !srv.1.poll_ready(cx)?.is_ready() || not_ready { + let not_ready = !self.svc1.poll_ready(cx)?.is_ready(); + if !self.svc2.poll_ready(cx)?.is_ready() || not_ready { Poll::Pending } else { Poll::Ready(Ok(())) } } - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - let srv = self.0.as_ref(); - - if srv.0.poll_shutdown(cx, is_error).is_ready() - && srv.1.poll_shutdown(cx, is_error).is_ready() + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + if self.svc1.poll_shutdown(cx).is_ready() && self.svc2.poll_shutdown(cx).is_ready() { Poll::Ready(()) } else { @@ -60,41 +60,46 @@ where } #[inline] - fn call(&self, req: R) -> Self::Future { + fn call(&self, req: R) -> Self::Future<'_> { ThenServiceResponse { + slf: self, state: State::A { - fut: self.0.as_ref().0.call(req), - b: Some(self.0.clone()), + fut: self.svc1.call(req), }, } } } pin_project_lite::pin_project! { - pub struct ThenServiceResponse + pub struct ThenServiceResponse<'f, A, B, R> where A: Service, B: Service>, { + slf: &'f Then, #[pin] - state: State, + state: State<'f, A, B, R>, } } pin_project_lite::pin_project! { #[project = StateProject] - enum State + enum State<'f, A, B, R> where A: Service, + A: 'f, + A::Response: 'f, B: Service>, + B: 'f, + R: 'f, { - A { #[pin] fut: A::Future, b: Option> }, - B { #[pin] fut: B::Future }, + A { #[pin] fut: A::Future<'f> }, + B { #[pin] fut: B::Future<'f> }, Empty, } } -impl Future for ThenServiceResponse +impl<'a, A, B, R> Future for ThenServiceResponse<'a, A, B, R> where A: Service, B: Service>, @@ -105,11 +110,9 @@ where let mut this = self.as_mut().project(); match this.state.as_mut().project() { - StateProject::A { fut, b } => match fut.poll(cx) { + StateProject::A { fut } => match fut.poll(cx) { Poll::Ready(res) => { - let b = b.take().unwrap(); - this.state.set(State::Empty); // drop fut A - let fut = b.as_ref().1.call(res); + let fut = this.slf.svc2.call(res); this.state.set(State::B { fut }); self.poll(cx) } @@ -127,84 +130,81 @@ where } /// `.then()` service factory combinator -pub struct ThenFactory(Rc<(A, B)>, PhantomData); +pub struct ThenFactory { + svc1: A, + svc2: B, +} -impl ThenFactory { - /// Create new `AndThen` combinator - pub(crate) fn new(a: A, b: B) -> Self { - Self(Rc::new((a, b)), PhantomData) +impl ThenFactory { + /// Create new factory for `Then` combinator + pub(crate) fn new(svc1: A, svc2: B) -> Self { + Self { svc1, svc2 } } } -impl ServiceFactory for ThenFactory +impl ServiceFactory for ThenFactory where A: ServiceFactory, - C: Clone, B: ServiceFactory< Result, C, Error = A::Error, InitError = A::InitError, >, + C: Clone, { type Response = B::Response; type Error = A::Error; - type Service = Then; + type Service = Then; type InitError = A::InitError; - type Future = ThenFactoryResponse; + type Future<'f> = ThenFactoryResponse<'f, A, B, R, C> where Self: 'f, C: 'f; - fn new_service(&self, cfg: C) -> Self::Future { - let srv = &*self.0; - ThenFactoryResponse::new(srv.0.new_service(cfg.clone()), srv.1.new_service(cfg)) - } -} - -impl Clone for ThenFactory { - fn clone(&self) -> Self { - Self(self.0.clone(), PhantomData) - } -} - -pin_project_lite::pin_project! { - pub struct ThenFactoryResponse - where - A: ServiceFactory, - B: ServiceFactory, C, - Error = A::Error, - InitError = A::InitError, - >, - { - #[pin] - fut_b: B::Future, - #[pin] - fut_a: A::Future, - a: Option, - b: Option, - } -} - -impl ThenFactoryResponse -where - A: ServiceFactory, - B: ServiceFactory< - Result, - C, - Error = A::Error, - InitError = A::InitError, - >, -{ - fn new(fut_a: A::Future, fut_b: B::Future) -> Self { - Self { - fut_a, - fut_b, + fn create(&self, cfg: C) -> Self::Future<'_> { + ThenFactoryResponse { + fut_a: self.svc1.create(cfg.clone()), + fut_b: self.svc2.create(cfg), a: None, b: None, } } } -impl Future for ThenFactoryResponse +impl Clone for ThenFactory +where + A: Clone, + B: Clone, +{ + fn clone(&self) -> Self { + Self { + svc1: self.svc1.clone(), + svc2: self.svc2.clone(), + } + } +} + +pin_project_lite::pin_project! { + pub struct ThenFactoryResponse<'f, A, B, R, C> + where + A: ServiceFactory, + B: ServiceFactory, C, + Error = A::Error, + InitError = A::InitError, + >, + A: 'f, + B: 'f, + C: 'f, + { + #[pin] + fut_b: B::Future<'f>, + #[pin] + fut_a: A::Future<'f>, + a: Option, + b: Option, + } +} + +impl<'f, A, B, R, C> Future for ThenFactoryResponse<'f, A, B, R, C> where A: ServiceFactory, B: ServiceFactory< @@ -214,7 +214,7 @@ where InitError = A::InitError, >, { - type Output = Result, A::InitError>; + type Output = Result, A::InitError>; fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { let this = self.project(); @@ -253,14 +253,14 @@ mod tests { impl Service> for Srv1 { type Response = &'static str; type Error = (); - type Future = Ready; + type Future<'f> = Ready; fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { self.0.set(self.0.get() + 1); Poll::Ready(Ok(())) } - fn call(&self, req: Result<&'static str, &'static str>) -> Self::Future { + fn call(&self, req: Result<&'static str, &'static str>) -> Self::Future<'_> { match req { Ok(msg) => Ready::Ok(msg), Err(_) => Ready::Err(()), @@ -268,19 +268,20 @@ mod tests { } } + #[derive(Clone)] struct Srv2(Rc>); impl Service> for Srv2 { type Response = (&'static str, &'static str); type Error = (); - type Future = Ready; + type Future<'f> = Ready; fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { self.0.set(self.0.get() + 1); Poll::Ready(Err(())) } - fn call(&self, req: Result<&'static str, ()>) -> Self::Future { + fn call(&self, req: Result<&'static str, ()>) -> Self::Future<'_> { match req { Ok(msg) => Ready::Ok((msg, "ok")), Err(()) => Ready::Ok(("srv2", "err")), @@ -295,7 +296,7 @@ mod tests { let res = lazy(|cx| srv.poll_ready(cx)).await; assert_eq!(res, Poll::Ready(Err(()))); assert_eq!(cnt.get(), 2); - let res = lazy(|cx| srv.poll_shutdown(cx, false)).await; + let res = lazy(|cx| srv.poll_shutdown(cx)).await; assert_eq!(res, Poll::Ready(())); } @@ -321,7 +322,7 @@ mod tests { let factory = pipeline_factory(blank) .then(move || Ready::Ok(Srv2(cnt.clone()))) .clone(); - let srv = factory.new_service(&()).await.unwrap(); + let srv = factory.create(&()).await.unwrap(); let res = srv.call(Ok("srv1")).await; assert!(res.is_ok()); assert_eq!(res.unwrap(), ("srv1", "ok")); diff --git a/ntex-service/src/transform.rs b/ntex-service/src/transform.rs index 8c90b1b0..969fc2aa 100644 --- a/ntex-service/src/transform.rs +++ b/ntex-service/src/transform.rs @@ -1,27 +1,25 @@ -use std::{ - future::Future, marker::PhantomData, pin::Pin, rc::Rc, task::Context, task::Poll, -}; +use std::{future::Future, marker, pin::Pin, rc::Rc, task::Context, task::Poll}; use crate::{IntoServiceFactory, Service, ServiceFactory}; -/// Apply transform to a service. -pub fn apply(t: T, factory: U) -> ApplyTransform +/// Apply middleware to a service. +pub fn apply(t: T, factory: U) -> ApplyMiddleware where S: ServiceFactory, - T: Transform, + T: Middleware, U: IntoServiceFactory, { - ApplyTransform::new(t, factory.into_factory()) + ApplyMiddleware::new(t, factory.into_factory()) } -/// The `Transform` trait defines the interface of a service factory that wraps inner service +/// The `Middleware` trait defines the interface of a service factory that wraps inner service /// during construction. /// -/// Transform(middleware) wraps inner service and runs during +/// Middleware wraps inner service and runs during /// inbound and/or outbound processing in the request/response lifecycle. /// It may modify request and/or response. /// -/// For example, timeout transform: +/// For example, timeout middleware: /// /// ```rust,ignore /// pub struct Timeout { @@ -36,13 +34,13 @@ where /// type Request = S::Request; /// type Response = S::Response; /// type Error = TimeoutError; -/// type Future = TimeoutServiceResponse; +/// type Future = TimeoutResponse; /// -/// fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll> { +/// fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { /// ready!(self.service.poll_ready(cx)).map_err(TimeoutError::Service) /// } /// -/// fn call(&mut self, req: S::Request) -> Self::Future { +/// fn call(&self, req: S::Request) -> Self::Future { /// TimeoutServiceResponse { /// fut: self.service.call(req), /// sleep: Delay::new(clock::now() + self.timeout), @@ -54,76 +52,71 @@ where /// Timeout service in above example is decoupled from underlying service implementation /// and could be applied to any service. /// -/// The `Transform` trait defines the interface of a Service factory. `Transform` -/// is often implemented for middleware, defining how to construct a -/// middleware Service. A Service that is constructed by the factory takes +/// The `Middleware` trait defines the interface of a middleware factory, defining how to +/// construct a middleware Service. A Service that is constructed by the factory takes /// the Service that follows it during execution as a parameter, assuming /// ownership of the next Service. /// /// Factory for `Timeout` middleware from the above example could look like this: /// /// ```rust,ignore -/// pub struct TimeoutTransform { +/// pub struct TimeoutMiddleware { /// timeout: Duration, /// } /// -/// impl Transform for TimeoutTransform +/// impl Middleware for TimeoutMiddleware /// where /// S: Service, /// { -/// type Transform = Timeout; +/// type Service = Timeout; /// -/// fn new_transform(&self, service: S) -> Self::Transform { -/// ok(TimeoutService { +/// fn create(&self, service: S) -> Self::Service { +/// ok(Timeout { /// service, /// timeout: self.timeout, /// }) /// } /// } /// ``` -pub trait Transform { - /// The `TransformService` value created by this factory +pub trait Middleware { + /// The middleware `Service` value created by this factory type Service; - /// Creates and returns a new Transform component, asynchronously - fn new_transform(&self, service: S) -> Self::Service; + /// Creates and returns a new middleware Service + fn create(&self, service: S) -> Self::Service; } -impl Transform for Rc +impl Middleware for Rc where - T: Transform, + T: Middleware, { type Service = T::Service; - fn new_transform(&self, service: S) -> T::Service { - self.as_ref().new_transform(service) + fn create(&self, service: S) -> T::Service { + self.as_ref().create(service) } } -/// `Apply` transform to new service -pub struct ApplyTransform(Rc<(T, S)>, PhantomData<(R, C)>); +/// `Apply` middleware to a service factory. +pub struct ApplyMiddleware(Rc<(T, S)>, marker::PhantomData); -impl ApplyTransform -where - S: ServiceFactory, - T: Transform, -{ - /// Create new `ApplyTransform` new service instance - pub(crate) fn new(t: T, service: S) -> Self { - Self(Rc::new((t, service)), PhantomData) +impl ApplyMiddleware { + /// Create new `ApplyMiddleware` service factory instance + pub(crate) fn new(mw: T, svc: S) -> Self { + Self(Rc::new((mw, svc)), marker::PhantomData) } } -impl Clone for ApplyTransform { +impl Clone for ApplyMiddleware { fn clone(&self) -> Self { - ApplyTransform(self.0.clone(), PhantomData) + Self(self.0.clone(), marker::PhantomData) } } -impl ServiceFactory for ApplyTransform +impl ServiceFactory for ApplyMiddleware where S: ServiceFactory, - T: Transform, + T: Middleware, T::Service: Service, { type Response = >::Response; @@ -131,34 +124,35 @@ where type Service = T::Service; type InitError = S::InitError; - type Future = ApplyTransformFuture; + type Future<'f> = ApplyMiddlewareFuture<'f, T, S, R, C> where Self: 'f, C: 'f; - fn new_service(&self, cfg: C) -> Self::Future { - ApplyTransformFuture { - store: self.0.clone(), - fut: self.0.as_ref().1.new_service(cfg), - _t: PhantomData, + #[inline] + fn create(&self, cfg: C) -> Self::Future<'_> { + ApplyMiddlewareFuture { + slf: self.0.clone(), + fut: self.0 .1.create(cfg), } } } pin_project_lite::pin_project! { - pub struct ApplyTransformFuture + pub struct ApplyMiddlewareFuture<'f, T, S, R, C> where S: ServiceFactory, - T: Transform, + S: 'f, + T: Middleware, + C: 'f, { - store: Rc<(T, S)>, + slf: Rc<(T, S)>, #[pin] - fut: S::Future, - _t: PhantomData + fut: S::Future<'f>, } } -impl Future for ApplyTransformFuture +impl<'f, T, S, R, C> Future for ApplyMiddlewareFuture<'f, T, S, R, C> where S: ServiceFactory, - T: Transform, + T: Middleware, { type Output = Result; @@ -166,59 +160,85 @@ where let this = self.as_mut().project(); match this.fut.poll(cx)? { - Poll::Ready(srv) => Poll::Ready(Ok(this.store.0.new_transform(srv))), + Poll::Ready(srv) => Poll::Ready(Ok(this.slf.0.create(srv))), Poll::Pending => Poll::Pending, } } } -/// Identity is a transform. +/// Identity is a middleware. /// /// It returns service without modifications. #[derive(Debug, Clone, Copy)] pub struct Identity; -impl Transform for Identity { +impl Middleware for Identity { type Service = S; #[inline] - fn new_transform(&self, service: S) -> Self::Service { + fn create(&self, service: S) -> Self::Service { service } } +/// Stack of middlewares. +#[derive(Debug, Clone)] +pub struct Stack { + inner: Inner, + outer: Outer, +} + +impl Stack { + pub fn new(inner: Inner, outer: Outer) -> Self { + Stack { inner, outer } + } +} + +impl Middleware for Stack +where + Inner: Middleware, + Outer: Middleware, +{ + type Service = Outer::Service; + + fn create(&self, service: S) -> Self::Service { + self.outer.create(self.inner.create(service)) + } +} + #[cfg(test)] #[allow(clippy::redundant_clone)] mod tests { use ntex_util::future::{lazy, Ready}; + use std::marker; use super::*; use crate::{fn_service, Service, ServiceFactory}; #[derive(Clone)] - struct Tr(PhantomData); + struct Tr(marker::PhantomData); - impl Transform for Tr { + impl Middleware for Tr { type Service = Srv; - fn new_transform(&self, service: S) -> Self::Service { - Srv(service, PhantomData) + fn create(&self, service: S) -> Self::Service { + Srv(service, marker::PhantomData) } } #[derive(Clone)] - struct Srv(S, PhantomData); + struct Srv(S, marker::PhantomData); impl, R> Service for Srv { type Response = S::Response; type Error = S::Error; - type Future = S::Future; + type Future<'f> = S::Future<'f> where Self: 'f, R: 'f; fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { self.0.poll_ready(cx) } - fn call(&self, req: R) -> Self::Future { + fn call(&self, req: R) -> Self::Future<'_> { self.0.call(req) } } @@ -226,12 +246,12 @@ mod tests { #[ntex::test] async fn transform() { let factory = apply( - Rc::new(Tr(PhantomData).clone()), + Rc::new(Tr(marker::PhantomData).clone()), fn_service(|i: usize| Ready::<_, ()>::Ok(i * 2)), ) .clone(); - let srv = factory.new_service(()).await.unwrap(); + let srv = factory.create(&()).await.unwrap(); let res = srv.call(10).await; assert!(res.is_ok()); assert_eq!(res.unwrap(), 20); @@ -239,7 +259,7 @@ mod tests { let res = lazy(|cx| srv.poll_ready(cx)).await; assert_eq!(res, Poll::Ready(Ok(()))); - let res = lazy(|cx| srv.poll_shutdown(cx, true)).await; + let res = lazy(|cx| srv.poll_shutdown(cx)).await; assert_eq!(res, Poll::Ready(())); } } diff --git a/ntex-tls/Cargo.toml b/ntex-tls/Cargo.toml index 8f65f6ba..27d0e113 100644 --- a/ntex-tls/Cargo.toml +++ b/ntex-tls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-tls" -version = "0.1.7" +version = "0.2.0-alpha.0" authors = ["ntex contributors "] description = "An implementation of SSL streams for ntex backed by OpenSSL" keywords = ["network", "framework", "async", "futures"] @@ -26,9 +26,9 @@ rustls = ["tls_rust"] [dependencies] ntex-bytes = "0.1.14" -ntex-io = "0.1.8" -ntex-util = "0.1.15" -ntex-service = "0.3.1" +ntex-io = "0.2.0-alpha.0" +ntex-util = "0.2.0-alpha.0" +ntex-service = "0.4.0-alpha.0" log = "0.4" pin-project-lite = "0.2" @@ -39,7 +39,7 @@ tls_openssl = { version="0.10.42", package = "openssl", optional = true } tls_rust = { version = "0.20", package = "rustls", optional = true } [dev-dependencies] -ntex = { version = "0.5", features = ["openssl", "rustls", "tokio"] } +ntex = { version = "0.6.0-alpha.0", features = ["openssl", "rustls", "tokio"] } env_logger = "0.10" rustls-pemfile = { version = "0.2" } webpki-roots = { version = "0.22" } diff --git a/ntex-tls/src/openssl/accept.rs b/ntex-tls/src/openssl/accept.rs index 70c83075..1c384757 100644 --- a/ntex-tls/src/openssl/accept.rs +++ b/ntex-tls/src/openssl/accept.rs @@ -52,15 +52,15 @@ impl Clone for Acceptor { } } -impl ServiceFactory, C> for Acceptor { +impl ServiceFactory, C> for Acceptor { type Response = Io>; type Error = Box; type Service = AcceptorService; type InitError = (); - type Future = Ready; + type Future<'f> = Ready; #[inline] - fn new_service(&self, _: C) -> Self::Future { + fn create(&self, _: C) -> Self::Future<'_> { MAX_SSL_ACCEPT_COUNTER.with(|conns| { Ready::Ok(AcceptorService { acceptor: self.acceptor.clone(), @@ -83,7 +83,7 @@ pub struct AcceptorService { impl Service> for AcceptorService { type Response = Io>; type Error = Box; - type Future = AcceptorServiceResponse; + type Future<'f> = AcceptorServiceResponse; #[inline] fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { @@ -95,7 +95,7 @@ impl Service> for AcceptorService { } #[inline] - fn call(&self, req: Io) -> Self::Future { + fn call(&self, req: Io) -> Self::Future<'_> { AcceptorServiceResponse { _guard: self.conns.get(), fut: self.acceptor.clone().create(req), diff --git a/ntex-tls/src/openssl/mod.rs b/ntex-tls/src/openssl/mod.rs index 9d835705..f427716b 100644 --- a/ntex-tls/src/openssl/mod.rs +++ b/ntex-tls/src/openssl/mod.rs @@ -1,13 +1,11 @@ #![allow(clippy::type_complexity)] //! An implementation of SSL streams for ntex backed by OpenSSL use std::cell::{Cell, RefCell}; -use std::{ - any, cmp, error::Error, future::Future, io, pin::Pin, task::Context, task::Poll, -}; +use std::{any, cmp, error::Error, io, task::Context, task::Poll}; use ntex_bytes::{BufMut, BytesVec, PoolRef}; use ntex_io::{types, Base, Filter, FilterFactory, Io, IoRef, ReadStatus, WriteStatus}; -use ntex_util::{future::poll_fn, ready, time, time::Millis}; +use ntex_util::{future::poll_fn, future::BoxFuture, ready, time, time::Millis}; use tls_openssl::ssl::{self, NameType, SslStream}; use tls_openssl::x509::X509; @@ -288,7 +286,7 @@ impl FilterFactory for SslAcceptor { type Filter = SslFilter; type Error = Box; - type Future = Pin, Self::Error>>>>; + type Future = BoxFuture<'static, Result, Self::Error>>; fn create(self, st: Io) -> Self::Future { let timeout = self.timeout; @@ -346,7 +344,7 @@ impl FilterFactory for SslConnector { type Filter = SslFilter; type Error = Box; - type Future = Pin, Self::Error>>>>; + type Future = BoxFuture<'static, Result, Self::Error>>; fn create(self, st: Io) -> Self::Future { Box::pin(async move { diff --git a/ntex-tls/src/rustls/accept.rs b/ntex-tls/src/rustls/accept.rs index c18f410a..6c87e9d3 100644 --- a/ntex-tls/src/rustls/accept.rs +++ b/ntex-tls/src/rustls/accept.rs @@ -51,15 +51,16 @@ impl Clone for Acceptor { } } -impl ServiceFactory, C> for Acceptor { +impl ServiceFactory, C> for Acceptor { type Response = Io>; type Error = io::Error; type Service = AcceptorService; type InitError = (); - type Future = Ready; + type Future<'f> = Ready where Self: 'f, C: 'f; - fn new_service(&self, _: C) -> Self::Future { + #[inline] + fn create(&self, _: C) -> Self::Future<'_> { MAX_SSL_ACCEPT_COUNTER.with(|conns| { Ready::Ok(AcceptorService { acceptor: self.inner.clone(), @@ -80,7 +81,7 @@ pub struct AcceptorService { impl Service> for AcceptorService { type Response = Io>; type Error = io::Error; - type Future = AcceptorServiceFut; + type Future<'f> = AcceptorServiceFut; #[inline] fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { @@ -92,7 +93,7 @@ impl Service> for AcceptorService { } #[inline] - fn call(&self, req: Io) -> Self::Future { + fn call(&self, req: Io) -> Self::Future<'_> { AcceptorServiceFut { _guard: self.conns.get(), fut: self.acceptor.clone().create(req), diff --git a/ntex-tokio/Cargo.toml b/ntex-tokio/Cargo.toml index 680407f9..4b1af3e4 100644 --- a/ntex-tokio/Cargo.toml +++ b/ntex-tokio/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-tokio" -version = "0.1.3" +version = "0.2.0-alpha.0" authors = ["ntex contributors "] description = "tokio intergration for ntex framework" keywords = ["network", "framework", "async", "futures"] @@ -17,8 +17,8 @@ path = "src/lib.rs" [dependencies] ntex-bytes = "0.1.11" -ntex-io = "0.1.7" -ntex-util = "0.1.13" +ntex-io = "0.2.0-alpha.0" +ntex-util = "0.2.0-alpha.0" log = "0.4" pin-project-lite = "0.2" tokio = { version = "1", default-features = false, features = ["rt", "net", "sync", "signal"] } diff --git a/ntex-util/CHANGES.md b/ntex-util/CHANGES.md index a0252d6c..2e13f39d 100644 --- a/ntex-util/CHANGES.md +++ b/ntex-util/CHANGES.md @@ -1,5 +1,9 @@ # Changes +## [0.2.0-alpha.0] - 2022-12-xx + +* Migrate to ntex-service 0.4 + ## [0.1.19] - 2022-12-13 * Add `BoxFuture` helper type alias diff --git a/ntex-util/Cargo.toml b/ntex-util/Cargo.toml index 065769af..5f6b4f25 100644 --- a/ntex-util/Cargo.toml +++ b/ntex-util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-util" -version = "0.1.19" +version = "0.2.0-alpha.0" authors = ["ntex contributors "] description = "Utilities for ntex framework" keywords = ["network", "framework", "async", "futures"] @@ -17,7 +17,7 @@ path = "src/lib.rs" [dependencies] ntex-rt = "0.4.6" -ntex-service = "0.3.3" +ntex-service = "0.4.0-alpha.0" bitflags = "1.3" fxhash = "0.2.1" log = "0.4" @@ -28,7 +28,7 @@ futures-sink = { version = "0.3", default-features = false, features = ["alloc"] pin-project-lite = "0.2.9" [dev-dependencies] -ntex = { version = "0.5", features = ["tokio"] } +ntex = { version = "0.6.0-alpha.0", features = ["tokio"] } ntex-bytes = "0.1.14" ntex-macros = "0.1.3" futures-util = { version = "0.3", default-features = false, features = ["alloc"] } diff --git a/ntex-util/src/services/buffer.rs b/ntex-util/src/services/buffer.rs index 51292d7f..5ea9a990 100644 --- a/ntex-util/src/services/buffer.rs +++ b/ntex-util/src/services/buffer.rs @@ -3,7 +3,7 @@ use std::cell::{Cell, RefCell}; use std::task::{Context, Poll}; use std::{collections::VecDeque, future::Future, marker::PhantomData, pin::Pin, rc::Rc}; -use ntex_service::{IntoService, Service, Transform}; +use ntex_service::{IntoService, Middleware, Service}; use crate::{channel::oneshot, future::Either, task::LocalWaker}; @@ -44,22 +44,20 @@ impl Clone for Buffer { } } -impl Transform for Buffer +impl Middleware for Buffer where S: Service, { type Service = BufferService; - fn new_transform(&self, service: S) -> Self::Service { + fn create(&self, service: S) -> Self::Service { BufferService { + service, size: self.buf_size, - inner: Rc::new(Inner { - service, - err: self.err.clone(), - ready: Cell::new(false), - waker: LocalWaker::default(), - buf: RefCell::new(VecDeque::with_capacity(self.buf_size)), - }), + err: self.err.clone(), + ready: Cell::new(false), + waker: LocalWaker::default(), + buf: RefCell::new(VecDeque::with_capacity(self.buf_size)), } } } @@ -69,10 +67,6 @@ where /// Default number of buffered requests is 16 pub struct BufferService, E> { size: usize, - inner: Rc>, -} - -struct Inner, E> { ready: Cell, service: S, waker: LocalWaker, @@ -91,13 +85,11 @@ where { Self { size, - inner: Rc::new(Inner { - err: Rc::new(err), - ready: Cell::new(false), - service: service.into_service(), - waker: LocalWaker::default(), - buf: RefCell::new(VecDeque::with_capacity(size)), - }), + err: Rc::new(err), + ready: Cell::new(false), + service: service.into_service(), + waker: LocalWaker::default(), + buf: RefCell::new(VecDeque::with_capacity(size)), } } } @@ -109,13 +101,11 @@ where fn clone(&self) -> Self { Self { size: self.size, - inner: Rc::new(Inner { - err: self.inner.err.clone(), - ready: Cell::new(false), - service: self.inner.service.clone(), - waker: LocalWaker::default(), - buf: RefCell::new(VecDeque::with_capacity(self.size)), - }), + err: self.err.clone(), + ready: Cell::new(false), + service: self.service.clone(), + waker: LocalWaker::default(), + buf: RefCell::new(VecDeque::with_capacity(self.size)), } } } @@ -126,18 +116,17 @@ where { type Response = S::Response; type Error = S::Error; - type Future = Either>; + type Future<'f> = Either, BufferServiceResponse<'f, R, S, E>> where Self: 'f, R: 'f; #[inline] fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - let inner = self.inner.as_ref(); - inner.waker.register(cx.waker()); - let mut buffer = inner.buf.borrow_mut(); + self.waker.register(cx.waker()); + let mut buffer = self.buf.borrow_mut(); - if inner.service.poll_ready(cx)?.is_pending() { + if self.service.poll_ready(cx)?.is_pending() { if buffer.len() < self.size { // buffer next request - inner.ready.set(false); + self.ready.set(false); Poll::Ready(Ok(())) } else { log::trace!("Buffer limit exceeded"); @@ -145,55 +134,57 @@ where } } else if let Some((sender, req)) = buffer.pop_front() { let _ = sender.send(req); - inner.ready.set(false); + self.ready.set(false); Poll::Ready(Ok(())) } else { - inner.ready.set(true); + self.ready.set(true); Poll::Ready(Ok(())) } } #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.inner.service.poll_shutdown(cx, is_error) - } - - #[inline] - fn call(&self, req: R) -> Self::Future { - if self.inner.ready.get() { - self.inner.ready.set(false); - Either::Left(self.inner.service.call(req)) + fn call(&self, req: R) -> Self::Future<'_> { + if self.ready.get() { + self.ready.set(false); + Either::Left(self.service.call(req)) } else { let (tx, rx) = oneshot::channel(); - self.inner.buf.borrow_mut().push_back((tx, req)); + self.buf.borrow_mut().push_back((tx, req)); Either::Right(BufferServiceResponse { - state: State::Tx { - rx, - inner: self.inner.clone(), - }, + slf: self, + state: State::Tx { rx }, }) } } + + ntex_service::forward_poll_shutdown!(service); } pin_project_lite::pin_project! { #[doc(hidden)] - pub struct BufferServiceResponse, E> { + pub struct BufferServiceResponse<'f, R, S: Service, E> + { + slf: &'f BufferService, #[pin] - state: State, + state: State>, } } pin_project_lite::pin_project! { #[project = StateProject] - enum State, E> { - Tx { rx: oneshot::Receiver, inner: Rc> }, - Srv { #[pin] fut: S::Future, inner: Rc> }, + enum State + where F: Future, + { + Tx { rx: oneshot::Receiver }, + Srv { #[pin] fut: F }, } } -impl, E> Future for BufferServiceResponse { +impl<'f, R, S, E> Future for BufferServiceResponse<'f, R, S, E> +where + S: Service, +{ type Output = Result; fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { @@ -201,24 +192,23 @@ impl, E> Future for BufferServiceResponse { loop { match this.state.project() { - StateProject::Tx { rx, inner } => match Pin::new(rx).poll(cx) { + StateProject::Tx { rx } => match Pin::new(rx).poll(cx) { Poll::Ready(Ok(req)) => { let state = State::Srv { - fut: inner.service.call(req), - inner: inner.clone(), + fut: this.slf.service.call(req), }; this = self.as_mut().project(); this.state.set(state); } - Poll::Ready(Err(_)) => return Poll::Ready(Err((*inner.err)())), + Poll::Ready(Err(_)) => return Poll::Ready(Err((*this.slf.err)())), Poll::Pending => return Poll::Pending, }, - StateProject::Srv { fut, inner } => { + StateProject::Srv { fut } => { let res = match fut.poll(cx) { Poll::Ready(res) => res, Poll::Pending => return Poll::Pending, }; - inner.waker.wake(); + this.slf.waker.wake(); return Poll::Ready(res); } } @@ -246,7 +236,7 @@ mod tests { impl Service<()> for TestService { type Response = (); type Error = (); - type Future = Ready<(), ()>; + type Future<'f> = Ready<(), ()> where Self: 'f; fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { self.0.waker.register(cx.waker()); @@ -257,7 +247,7 @@ mod tests { } } - fn call(&self, _: ()) -> Self::Future { + fn call(&self, _: ()) -> Self::Future<'_> { self.0.ready.set(false); self.0.count.set(self.0.count.get() + 1); Ready::Ok(()) @@ -308,8 +298,7 @@ mod tests { let _ = srv.call(()).await; assert_eq!(inner.count.get(), 1); assert_eq!(lazy(|cx| srv.poll_ready(cx)).await, Poll::Ready(Ok(()))); - - assert!(lazy(|cx| srv.poll_shutdown(cx, false)).await.is_ready()); + assert!(lazy(|cx| srv.poll_shutdown(cx)).await.is_ready()); } #[ntex_macros::rt_test2] @@ -325,7 +314,7 @@ mod tests { fn_factory(|| async { Ok::<_, ()>(TestService(inner.clone())) }), ); - let srv = srv.new_service(&()).await.unwrap(); + let srv = srv.create(&()).await.unwrap(); assert_eq!(lazy(|cx| srv.poll_ready(cx)).await, Poll::Ready(Ok(()))); let fut1 = srv.call(()); diff --git a/ntex-util/src/services/inflight.rs b/ntex-util/src/services/inflight.rs index 232f9ed1..e8075940 100644 --- a/ntex-util/src/services/inflight.rs +++ b/ntex-util/src/services/inflight.rs @@ -1,7 +1,7 @@ //! Service that limits number of in-flight async requests. use std::{future::Future, marker::PhantomData, pin::Pin, task::Context, task::Poll}; -use ntex_service::{IntoService, Service, Transform}; +use ntex_service::{IntoService, Middleware, Service}; use super::counter::{Counter, CounterGuard}; @@ -25,10 +25,10 @@ impl Default for InFlight { } } -impl Transform for InFlight { +impl Middleware for InFlight { type Service = InFlightService; - fn new_transform(&self, service: S) -> Self::Service { + fn create(&self, service: S) -> Self::Service { InFlightService { service, count: Counter::new(self.max_inflight), @@ -60,7 +60,7 @@ where { type Response = T::Response; type Error = T::Error; - type Future = InFlightServiceResponse; + type Future<'f> = InFlightServiceResponse<'f, T, R> where Self: 'f, R: 'f; #[inline] fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { @@ -75,31 +75,30 @@ where } #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) - } - - #[inline] - fn call(&self, req: R) -> Self::Future { + fn call(&self, req: R) -> Self::Future<'_> { InFlightServiceResponse { fut: self.service.call(req), _guard: self.count.get(), _t: PhantomData, } } + + ntex_service::forward_poll_shutdown!(service); } pin_project_lite::pin_project! { #[doc(hidden)] - pub struct InFlightServiceResponse, R> { + pub struct InFlightServiceResponse<'f, T: Service, R> + where T: 'f, R: 'f + { #[pin] - fut: T::Future, + fut: T::Future<'f>, _guard: CounterGuard, _t: PhantomData } } -impl, R> Future for InFlightServiceResponse { +impl<'f, T: Service, R> Future for InFlightServiceResponse<'f, T, R> { type Output = Result; fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { @@ -110,23 +109,19 @@ impl, R> Future for InFlightServiceResponse { #[cfg(test)] mod tests { use ntex_service::{apply, fn_factory, Service, ServiceFactory}; - use std::{task::Context, task::Poll, time::Duration}; + use std::{task::Poll, time::Duration}; use super::*; - use crate::future::lazy; + use crate::future::{lazy, BoxFuture}; struct SleepService(Duration); impl Service<()> for SleepService { type Response = (); type Error = (); - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result<(), ()>>; - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - fn call(&self, _: ()) -> Self::Future { + fn call(&self, _: ()) -> Self::Future<'_> { let fut = crate::time::sleep(self.0); Box::pin(async move { let _ = fut.await; @@ -147,8 +142,7 @@ mod tests { let _ = res.await; assert_eq!(lazy(|cx| srv.poll_ready(cx)).await, Poll::Ready(Ok(()))); - - assert!(lazy(|cx| srv.poll_shutdown(cx, false)).await.is_ready()); + assert!(lazy(|cx| srv.poll_shutdown(cx)).await.is_ready()); } #[ntex_macros::rt_test2] @@ -160,7 +154,7 @@ mod tests { fn_factory(|| async { Ok::<_, ()>(SleepService(wait_time)) }), ); - let srv = srv.new_service(&()).await.unwrap(); + let srv = srv.create(&()).await.unwrap(); assert_eq!(lazy(|cx| srv.poll_ready(cx)).await, Poll::Ready(Ok(()))); let res = srv.call(()); diff --git a/ntex-util/src/services/keepalive.rs b/ntex-util/src/services/keepalive.rs index cc6169ff..b112a8fb 100644 --- a/ntex-util/src/services/keepalive.rs +++ b/ntex-util/src/services/keepalive.rs @@ -48,7 +48,7 @@ where } } -impl ServiceFactory for KeepAlive +impl ServiceFactory for KeepAlive where F: Fn() -> E + Clone, { @@ -56,10 +56,10 @@ where type Error = E; type InitError = Infallible; type Service = KeepAliveService; - type Future = Ready; + type Future<'f> = Ready where Self: 'f, C: 'f; #[inline] - fn new_service(&self, _: C) -> Self::Future { + fn create(&self, _: C) -> Self::Future<'_> { Ready::Ok(KeepAliveService::new(self.ka, self.f.clone())) } } @@ -95,7 +95,7 @@ where { type Response = R; type Error = E; - type Future = Ready; + type Future<'f> = Ready where Self: 'f, R: 'f; fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { match self.sleep.poll_elapsed(cx) { @@ -116,7 +116,7 @@ where } } - fn call(&self, req: R) -> Self::Future { + fn call(&self, req: R) -> Self::Future<'_> { self.expire.set(now()); Ready::Ok(req) } @@ -137,7 +137,7 @@ mod tests { let factory = KeepAlive::new(Millis(100), || TestErr); let _ = factory.clone(); - let service = factory.new_service(()).await.unwrap(); + let service = factory.create(&()).await.unwrap(); assert_eq!(service.call(1usize).await, Ok(1usize)); assert!(lazy(|cx| service.poll_ready(cx)).await.is_ready()); diff --git a/ntex-util/src/services/timeout.rs b/ntex-util/src/services/timeout.rs index 7821b5ed..b2521075 100644 --- a/ntex-util/src/services/timeout.rs +++ b/ntex-util/src/services/timeout.rs @@ -6,7 +6,7 @@ use std::{ fmt, future::Future, marker, marker::PhantomData, pin::Pin, task::Context, task::Poll, }; -use ntex_service::{IntoService, Service, Transform}; +use ntex_service::{IntoService, Middleware, Service}; use crate::future::Either; use crate::time::{sleep, Millis, Sleep}; @@ -87,10 +87,10 @@ impl Clone for Timeout { } } -impl Transform for Timeout { +impl Middleware for Timeout { type Service = TimeoutService; - fn new_transform(&self, service: S) -> Self::Service { + fn create(&self, service: S) -> Self::Service { TimeoutService { service, timeout: self.timeout, @@ -125,19 +125,9 @@ where { type Response = S::Response; type Error = TimeoutError; - type Future = Either, TimeoutServiceResponse2>; + type Future<'f> = Either, TimeoutServiceResponse2<'f, S, R>> where Self: 'f, R: 'f; - #[inline] - fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - self.service.poll_ready(cx).map_err(TimeoutError::Service) - } - - #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) - } - - fn call(&self, request: R) -> Self::Future { + fn call(&self, request: R) -> Self::Future<'_> { if self.timeout.is_zero() { Either::Right(TimeoutServiceResponse2 { fut: self.service.call(request), @@ -151,21 +141,26 @@ where }) } } + + ntex_service::forward_poll_ready!(service, TimeoutError::Service); + ntex_service::forward_poll_shutdown!(service); } pin_project_lite::pin_project! { /// `TimeoutService` response future #[doc(hidden)] #[derive(Debug)] - pub struct TimeoutServiceResponse, R> { + pub struct TimeoutServiceResponse<'f, T: Service, R> + where T: 'f, R: 'f, + { #[pin] - fut: T::Future, + fut: T::Future<'f>, sleep: Sleep, _t: PhantomData } } -impl Future for TimeoutServiceResponse +impl<'f, T, R> Future for TimeoutServiceResponse<'f, T, R> where T: Service, { @@ -193,14 +188,16 @@ pin_project_lite::pin_project! { /// `TimeoutService` response future #[doc(hidden)] #[derive(Debug)] - pub struct TimeoutServiceResponse2, R> { + pub struct TimeoutServiceResponse2<'f, T: Service, R> + where T: 'f, R: 'f, + { #[pin] - fut: T::Future, + fut: T::Future<'f>, _t: PhantomData, } } -impl Future for TimeoutServiceResponse2 +impl<'f, T, R> Future for TimeoutServiceResponse2<'f, T, R> where T: Service, { @@ -217,12 +214,12 @@ where #[cfg(test)] mod tests { - use std::{fmt, task::Context, task::Poll, time::Duration}; + use std::{fmt, time::Duration}; use ntex_service::{apply, fn_factory, Service, ServiceFactory}; use super::*; - use crate::future::lazy; + use crate::future::{lazy, BoxFuture}; #[derive(Clone, Debug, PartialEq)] struct SleepService(Duration); @@ -239,21 +236,9 @@ mod tests { impl Service<()> for SleepService { type Response = (); type Error = SrvError; - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result<(), SrvError>>; - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - fn poll_shutdown(&self, _: &mut Context<'_>, is_error: bool) -> Poll<()> { - if is_error { - Poll::Ready(()) - } else { - Poll::Pending - } - } - - fn call(&self, _: ()) -> Self::Future { + fn call(&self, _: ()) -> Self::Future<'_> { let fut = crate::time::sleep(self.0); Box::pin(async move { let _ = fut.await; @@ -270,10 +255,7 @@ mod tests { let timeout = TimeoutService::new(resolution, SleepService(wait_time)).clone(); assert_eq!(timeout.call(()).await, Ok(())); assert!(lazy(|cx| timeout.poll_ready(cx)).await.is_ready()); - assert!(lazy(|cx| timeout.poll_shutdown(cx, true)).await.is_ready()); - assert!(lazy(|cx| timeout.poll_shutdown(cx, false)) - .await - .is_pending()); + assert!(lazy(|cx| timeout.poll_shutdown(cx)).await.is_ready()); } #[ntex_macros::rt_test2] @@ -305,7 +287,7 @@ mod tests { Timeout::new(resolution).clone(), fn_factory(|| async { Ok::<_, ()>(SleepService(wait_time)) }), ); - let srv = timeout.new_service(&()).await.unwrap(); + let srv = timeout.create(&()).await.unwrap(); let res = srv.call(()).await.unwrap_err(); assert_eq!(res, TimeoutError::Timeout); diff --git a/ntex-util/src/services/variant.rs b/ntex-util/src/services/variant.rs index 584c308e..df0974ee 100644 --- a/ntex-util/src/services/variant.rs +++ b/ntex-util/src/services/variant.rs @@ -52,7 +52,6 @@ macro_rules! variant_impl_and ({$fac1_type:ident, $fac2_type:ident, $name:ident, impl $fac1_type where V1: ServiceFactory, - V1C: Clone, { /// Convert to a Variant with more request types pub fn $m_name<$name, $r_name, F>(self, factory: F) -> $fac2_type @@ -104,7 +103,7 @@ macro_rules! variant_impl ({$mod_name:ident, $enum_type:ident, $srv_type:ident, { type Response = V1::Response; type Error = V1::Error; - type Future = $mod_name::ServiceResponse; + type Future<'f> = $mod_name::ServiceResponse, $($T::Future<'f>),+> where Self: 'f, V1: 'f; fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { let mut ready = self.V1.poll_ready(cx)?.is_ready(); @@ -117,9 +116,9 @@ macro_rules! variant_impl ({$mod_name:ident, $enum_type:ident, $srv_type:ident, } } - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - let mut ready = self.V1.poll_shutdown(cx, is_error).is_ready(); - $(ready = self.$T.poll_shutdown(cx, is_error).is_ready() && ready;)+ + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + let mut ready = self.V1.poll_shutdown(cx).is_ready(); + $(ready = self.$T.poll_shutdown(cx).is_ready() && ready;)+ if ready { Poll::Ready(()) @@ -128,7 +127,7 @@ macro_rules! variant_impl ({$mod_name:ident, $enum_type:ident, $srv_type:ident, } } - fn call(&self, req: $enum_type) -> Self::Future { + fn call(&self, req: $enum_type) -> Self::Future<'_> { match req { $enum_type::V1(req) => $mod_name::ServiceResponse::V1 { fut: self.V1.call(req) }, $($enum_type::$T(req) => $mod_name::ServiceResponse::$T { fut: self.$T.call(req) },)+ @@ -157,20 +156,20 @@ macro_rules! variant_impl ({$mod_name:ident, $enum_type:ident, $srv_type:ident, where V1: ServiceFactory, V1C: Clone, - $($T: ServiceFactory<$R, V1C, Response = V1::Response, Error = V1::Error, InitError = V1::InitError>),+ + $($T: ServiceFactory< $R, V1C, Response = V1::Response, Error = V1::Error, InitError = V1::InitError>),+ { type Response = V1::Response; type Error = V1::Error; type InitError = V1::InitError; type Service = $srv_type; - type Future = $mod_name::ServiceFactoryResponse; + type Future<'f> = $mod_name::ServiceFactoryResponse<'f, V1, V1C, $($T,)+ V1R, $($R,)+> where Self: 'f, V1C: 'f; - fn new_service(&self, cfg: V1C) -> Self::Future { + fn create(&self, cfg: V1C) -> Self::Future<'_> { $mod_name::ServiceFactoryResponse { V1: None, items: Default::default(), - $($T: self.$T.new_service(cfg.clone()),)+ - V1_fut: self.V1.new_service(cfg), + $($T: self.$T.create(cfg.clone()),)+ + V1_fut: self.V1.create(cfg), } } } @@ -182,7 +181,8 @@ macro_rules! variant_impl ({$mod_name:ident, $enum_type:ident, $srv_type:ident, pin_project_lite::pin_project! { #[project = ServiceResponseProject] - pub enum ServiceResponse { + pub enum ServiceResponse + { V1{ #[pin] fut: V1 }, $($T{ #[pin] fut: $T },)+ } @@ -206,18 +206,23 @@ macro_rules! variant_impl ({$mod_name:ident, $enum_type:ident, $srv_type:ident, pin_project_lite::pin_project! { #[doc(hidden)] - pub struct ServiceFactoryResponse, V1C, $($T: ServiceFactory<$R, V1C>,)+ V1R, $($R,)+> { + pub struct ServiceFactoryResponse<'f, V1: ServiceFactory, V1C, $($T: ServiceFactory<$R, V1C>,)+ V1R, $($R,)+> + where + V1C: 'f, + V1: 'f, + $($T: 'f,)+ + { pub(super) V1: Option, pub(super) items: ($(Option<$T::Service>,)+), - #[pin] pub(super) V1_fut: V1::Future, - $(#[pin] pub(super) $T: $T::Future),+ + #[pin] pub(super) V1_fut: V1::Future<'f>, + $(#[pin] pub(super) $T: $T::Future<'f>),+ } } - impl Future for ServiceFactoryResponse + impl<'f, V1, V1C, $($T,)+ V1R, $($R,)+> Future for ServiceFactoryResponse<'f, V1, V1C, $($T,)+ V1R, $($R,)+> where - V1: ServiceFactory, - $($T: ServiceFactory<$R, V1C, Response = V1::Response, Error = V1::Error, InitError = V1::InitError,>),+ + V1: ServiceFactory + 'f, + $($T: ServiceFactory<$R, V1C, Response = V1::Response, Error = V1::Error, InitError = V1::InitError,> + 'f),+ { type Output = Result<$srv_type, V1::InitError>; @@ -304,17 +309,17 @@ mod tests { impl Service<()> for Srv1 { type Response = usize; type Error = (); - type Future = Ready; + type Future<'f> = Ready where Self: 'f; fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { Poll::Ready(Ok(())) } - fn poll_shutdown(&self, _: &mut Context<'_>, _: bool) -> Poll<()> { + fn poll_shutdown(&self, _: &mut Context<'_>) -> Poll<()> { Poll::Ready(()) } - fn call(&self, _: ()) -> Self::Future { + fn call(&self, _: ()) -> Self::Future<'_> { Ready::<_, ()>::Ok(1) } } @@ -325,17 +330,17 @@ mod tests { impl Service<()> for Srv2 { type Response = usize; type Error = (); - type Future = Ready; + type Future<'f> = Ready where Self: 'f; fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { Poll::Ready(Ok(())) } - fn poll_shutdown(&self, _: &mut Context<'_>, _: bool) -> Poll<()> { + fn poll_shutdown(&self, _: &mut Context<'_>) -> Poll<()> { Poll::Ready(()) } - fn call(&self, _: ()) -> Self::Future { + fn call(&self, _: ()) -> Self::Future<'_> { Ready::<_, ()>::Ok(2) } } @@ -346,10 +351,10 @@ mod tests { .v2(fn_factory(|| async { Ok::<_, ()>(Srv2) })) .v3(fn_factory(|| async { Ok::<_, ()>(Srv2) })) .clone(); - let service = factory.new_service(&()).await.unwrap(); + let service = factory.create(&()).await.unwrap(); assert!(lazy(|cx| service.poll_ready(cx)).await.is_ready()); - assert!(lazy(|cx| service.poll_shutdown(cx, true)).await.is_ready()); + assert!(lazy(|cx| service.poll_shutdown(cx)).await.is_ready()); assert_eq!(service.call(Variant3::V1(())).await, Ok(1)); assert_eq!(service.call(Variant3::V2(())).await, Ok(2)); diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml index 10218c83..dd99f0d3 100644 --- a/ntex/Cargo.toml +++ b/ntex/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex" -version = "0.5.31" +version = "0.6.0-alpha.0" authors = ["ntex contributors "] description = "Framework for composable network services" readme = "README.md" @@ -49,20 +49,20 @@ async-std = ["ntex-rt/async-std", "ntex-async-std", "ntex-connect/async-std"] [dependencies] ntex-codec = "0.6.2" -ntex-connect = "0.1.1" +ntex-connect = "0.2.0-alpha.0" ntex-http = "0.1.9" ntex-router = "0.5.1" -ntex-service = "0.3.2" +ntex-service = "0.4.0-alpha.0" ntex-macros = "0.1.3" -ntex-util = "0.1.19" +ntex-util = "0.2.0-alpha.0" ntex-bytes = "0.1.18" -ntex-h2 = "0.1.6" +ntex-h2 = "0.2.0-alpha.0" ntex-rt = "0.4.6" -ntex-io = "0.1.11" -ntex-tls = "0.1.5" -ntex-tokio = { version = "0.1.3", optional = true } -ntex-glommio = { version = "0.1.2", optional = true } -ntex-async-std = { version = "0.1.1", optional = true } +ntex-io = "0.2.0-alpha.0" +ntex-tls = "0.2.0-alpha.0" +ntex-tokio = { version = "0.2.0-alpha.0", optional = true } +ntex-glommio = { version = "0.2.0-alpha.0", optional = true } +ntex-async-std = { version = "0.2.0-alpha.0", optional = true } async-oneshot = "0.5.0" async-channel = "1.8.0" diff --git a/ntex/src/http/builder.rs b/ntex/src/http/builder.rs index 0de19575..a4e7cae9 100644 --- a/ntex/src/http/builder.rs +++ b/ntex/src/http/builder.rs @@ -209,7 +209,6 @@ where S::Error: ResponseError + 'static, S::InitError: fmt::Debug, S::Response: Into> + 'static, - >::Future: 'static, { let cfg = ServiceConfig::new( self.keep_alive, @@ -230,8 +229,6 @@ where S::Error: ResponseError + 'static, S::InitError: fmt::Debug, S::Response: Into> + 'static, - S::Future: 'static, - >::Future: 'static, { let cfg = ServiceConfig::new( self.keep_alive, diff --git a/ntex/src/http/client/connect.rs b/ntex/src/http/client/connect.rs index 6dcf2a35..981baa75 100644 --- a/ntex/src/http/client/connect.rs +++ b/ntex/src/http/client/connect.rs @@ -1,8 +1,7 @@ -use std::{future::Future, net, pin::Pin}; +use std::net; -use crate::http::body::Body; -use crate::http::RequestHeadType; -use crate::service::Service; +use crate::http::{body::Body, RequestHeadType}; +use crate::{service::Service, util::BoxFuture}; use super::error::{ConnectError, SendRequestError}; use super::response::ClientResponse; @@ -16,27 +15,26 @@ pub(super) trait Connect { head: RequestHeadType, body: Body, addr: Option, - ) -> Pin>>>; + ) -> BoxFuture<'_, Result>; } impl Connect for ConnectorWrapper where T: Service, - T::Future: 'static, { fn send_request( &self, head: RequestHeadType, body: Body, addr: Option, - ) -> Pin>>> { - // connect to the host - let fut = self.0.call(ClientConnect { - uri: head.as_ref().uri.clone(), - addr, - }); - + ) -> BoxFuture<'_, Result> { Box::pin(async move { + // connect to the host + let fut = self.0.call(ClientConnect { + uri: head.as_ref().uri.clone(), + addr, + }); + let connection = fut.await?; // send request diff --git a/ntex/src/http/client/connector.rs b/ntex/src/http/client/connector.rs index 1b8f9607..fccd7866 100644 --- a/ntex/src/http/client/connector.rs +++ b/ntex/src/http/client/connector.rs @@ -1,4 +1,4 @@ -use std::{future::Future, rc::Rc, task::Context, task::Poll, time::Duration}; +use std::{rc::Rc, task::Context, task::Poll, time::Duration}; use ntex_h2::{self as h2}; @@ -8,10 +8,7 @@ use crate::time::{Millis, Seconds}; use crate::util::{timeout::TimeoutError, timeout::TimeoutService, Either, Ready}; use crate::{http::Uri, io::IoBoxed}; -use super::connection::Connection; -use super::error::ConnectError; -use super::pool::ConnectionPool; -use super::Connect; +use super::{connection::Connection, error::ConnectError, pool::ConnectionPool, Connect}; #[cfg(feature = "openssl")] use crate::connect::openssl::SslConnector; @@ -252,16 +249,13 @@ fn connector( connector: BoxedConnector, timeout: Millis, disconnect_timeout: Millis, -) -> impl Service< - Connect, - Response = IoBoxed, - Error = ConnectError, - Future = impl Unpin + Future, -> + Unpin { +) -> impl Service { TimeoutService::new( timeout, apply_fn(connector, |msg: Connect, srv| { - srv.call(TcpConnect::new(msg.uri).set_addr(msg.addr)) + Box::pin( + async move { srv.call(TcpConnect::new(msg.uri).set_addr(msg.addr)).await }, + ) }) .map(move |io: IoBoxed| { io.set_disconnect_timeout(disconnect_timeout); @@ -282,13 +276,12 @@ struct InnerConnector { impl Service for InnerConnector where - T: Service + Unpin + 'static, - T::Future: Unpin, + T: Service + 'static, { type Response = as Service>::Response; type Error = ConnectError; - type Future = Either< - as Service>::Future, + type Future<'f> = Either< + as Service>::Future<'f>, Ready, >; @@ -308,12 +301,12 @@ where } #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - let tcp_ready = self.tcp_pool.poll_shutdown(cx, is_error).is_ready(); + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + let tcp_ready = self.tcp_pool.poll_shutdown(cx).is_ready(); let ssl_ready = self .ssl_pool .as_ref() - .map(|pool| pool.poll_shutdown(cx, is_error).is_ready()) + .map(|pool| pool.poll_shutdown(cx).is_ready()) .unwrap_or(true); if tcp_ready && ssl_ready { Poll::Ready(()) @@ -322,7 +315,7 @@ where } } - fn call(&self, req: Connect) -> Self::Future { + fn call(&self, req: Connect) -> Self::Future<'_> { match req.uri.scheme_str() { Some("https") | Some("wss") => { if let Some(ref conn) = self.ssl_pool { @@ -345,6 +338,6 @@ mod tests { async fn test_readiness() { let conn = Connector::default().finish(); assert!(lazy(|cx| conn.poll_ready(cx).is_ready()).await); - assert!(lazy(|cx| conn.poll_shutdown(cx, true).is_ready()).await); + assert!(lazy(|cx| conn.poll_shutdown(cx).is_ready()).await); } } diff --git a/ntex/src/http/client/frozen.rs b/ntex/src/http/client/frozen.rs index 106d7312..fa7348bc 100644 --- a/ntex/src/http/client/frozen.rs +++ b/ntex/src/http/client/frozen.rs @@ -45,7 +45,7 @@ impl FrozenClientRequest { self.addr, self.response_decompress, self.timeout, - self.config.as_ref(), + self.config.clone(), body, ) } @@ -56,7 +56,7 @@ impl FrozenClientRequest { self.addr, self.response_decompress, self.timeout, - self.config.as_ref(), + self.config.clone(), value, ) } @@ -67,7 +67,7 @@ impl FrozenClientRequest { self.addr, self.response_decompress, self.timeout, - self.config.as_ref(), + self.config.clone(), value, ) } @@ -82,7 +82,7 @@ impl FrozenClientRequest { self.addr, self.response_decompress, self.timeout, - self.config.as_ref(), + self.config.clone(), stream, ) } @@ -93,7 +93,7 @@ impl FrozenClientRequest { self.addr, self.response_decompress, self.timeout, - self.config.as_ref(), + self.config.clone(), ) } @@ -181,7 +181,7 @@ impl FrozenSendBuilder { self.req.addr, self.req.response_decompress, self.req.timeout, - self.req.config.as_ref(), + self.req.config, body, ) } @@ -196,7 +196,7 @@ impl FrozenSendBuilder { self.req.addr, self.req.response_decompress, self.req.timeout, - self.req.config.as_ref(), + self.req.config, value, ) } @@ -211,7 +211,7 @@ impl FrozenSendBuilder { self.req.addr, self.req.response_decompress, self.req.timeout, - self.req.config.as_ref(), + self.req.config, value, ) } @@ -230,7 +230,7 @@ impl FrozenSendBuilder { self.req.addr, self.req.response_decompress, self.req.timeout, - self.req.config.as_ref(), + self.req.config, stream, ) } @@ -245,7 +245,7 @@ impl FrozenSendBuilder { self.req.addr, self.req.response_decompress, self.req.timeout, - self.req.config.as_ref(), + self.req.config, ) } } diff --git a/ntex/src/http/client/h2proto.rs b/ntex/src/http/client/h2proto.rs index d468130d..28649bcd 100644 --- a/ntex/src/http/client/h2proto.rs +++ b/ntex/src/http/client/h2proto.rs @@ -1,4 +1,4 @@ -use std::{cell::RefCell, convert::TryFrom, io, rc::Rc, task::Context, task::Poll}; +use std::{cell::RefCell, convert::TryFrom, io, rc::Rc}; use ntex_h2::{self as h2, client::Client, frame}; @@ -223,19 +223,9 @@ impl H2PublishService { impl Service for H2PublishService { type Response = (); type Error = &'static str; - type Future = Ready; + type Future<'f> = Ready; - #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - #[inline] - fn poll_shutdown(&self, _: &mut Context<'_>, _: bool) -> Poll<()> { - Poll::Ready(()) - } - - fn call(&self, mut msg: h2::Message) -> Self::Future { + fn call(&self, mut msg: h2::Message) -> Self::Future<'_> { match msg.kind().take() { h2::MessageKind::Headers { pseudo, diff --git a/ntex/src/http/client/pool.rs b/ntex/src/http/client/pool.rs index 0bd75fea..d605f661 100644 --- a/ntex/src/http/client/pool.rs +++ b/ntex/src/http/client/pool.rs @@ -7,7 +7,7 @@ use ntex_h2::{self as h2}; use crate::http::uri::{Authority, Scheme, Uri}; use crate::io::{types::HttpProtocol, IoBoxed}; use crate::time::{now, Millis}; -use crate::util::{ready, ByteString, HashMap, HashSet}; +use crate::util::{ready, BoxFuture, ByteString, HashMap, HashSet}; use crate::{channel::pool, rt::spawn, service::Service, task::LocalWaker}; use super::connection::{Connection, ConnectionType}; @@ -50,8 +50,7 @@ pub(super) struct ConnectionPool { impl ConnectionPool where - T: Service + Unpin + 'static, - T::Future: Unpin, + T: Service + 'static, { pub(super) fn new( connector: T, @@ -113,24 +112,16 @@ impl Clone for ConnectionPool { impl Service for ConnectionPool where T: Service + 'static, - T::Future: Unpin, { type Response = Connection; type Error = ConnectError; - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result>; + + crate::forward_poll_ready!(connector); + crate::forward_poll_shutdown!(connector); #[inline] - fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - self.connector.poll_ready(cx) - } - - #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.connector.poll_shutdown(cx, is_error) - } - - #[inline] - fn call(&self, req: Connect) -> Self::Future { + fn call(&self, req: Connect) -> Self::Future<'_> { trace!("Get connection for {:?}", req.uri); let connector = self.connector.clone(); let inner = self.inner.clone(); @@ -160,7 +151,7 @@ where trace!("Connecting to {:?}", req.uri); let uri = req.uri.clone(); let (tx, rx) = waiters.borrow_mut().pool.channel(); - OpenConnection::spawn(key, tx, uri, inner, connector.call(req)); + OpenConnection::spawn(key, tx, uri, inner, connector, req); match rx.await { Err(_) => Err(ConnectError::Disconnected(None)), @@ -317,15 +308,14 @@ impl Inner { } struct ConnectionPoolSupport { - connector: T, + connector: Rc, inner: Rc>, waiters: Rc>, } impl Future for ConnectionPoolSupport where - T: Service + Unpin, - T::Future: Unpin + 'static, + T: Service + 'static, { type Output = (); @@ -379,7 +369,8 @@ where tx, uri, this.inner.clone(), - this.connector.call(connect), + this.connector.clone(), + connect, ); } } @@ -394,46 +385,61 @@ where } } -struct OpenConnection { - key: Key, - fut: F, - uri: Uri, - tx: Option, - guard: Option, - disconnect_timeout: Millis, - inner: Rc>, +pin_project_lite::pin_project! { + struct OpenConnection<'f, T: Service> + where T: 'f + { + key: Key, + #[pin] + fut: T::Future<'f>, + uri: Uri, + tx: Option, + guard: Option, + disconnect_timeout: Millis, + inner: Rc>, + } } -impl OpenConnection +impl<'f, T> OpenConnection<'f, T> where - F: Future> + Unpin + 'static, + T: Service + 'static, { - fn spawn(key: Key, tx: Waiter, uri: Uri, inner: Rc>, fut: F) { + fn spawn( + key: Key, + tx: Waiter, + uri: Uri, + inner: Rc>, + connector: Rc, + msg: Connect, + ) { let disconnect_timeout = inner.borrow().disconnect_timeout; - spawn(OpenConnection { - fut, - uri, - disconnect_timeout, - tx: Some(tx), - key: key.clone(), - inner: inner.clone(), - guard: Some(OpenGuard::new(key, inner)), + spawn(async move { + OpenConnection:: { + fut: connector.call(msg), + tx: Some(tx), + key: key.clone(), + inner: inner.clone(), + guard: Some(OpenGuard::new(key, inner)), + uri, + disconnect_timeout, + } + .await }); } } -impl Future for OpenConnection +impl<'f, T> Future for OpenConnection<'f, T> where - F: Future> + Unpin, + T: Service, { type Output = (); - fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - let this = self.as_mut().get_mut(); + fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { + let this = self.project(); // open tcp connection - match ready!(Pin::new(&mut this.fut).poll(cx)) { + match ready!(this.fut.poll(cx)) { Err(err) => { trace!( "Failed to open client connection for {:?} with error {:?}", @@ -447,7 +453,7 @@ where Poll::Ready(()) } Ok(io) => { - io.set_disconnect_timeout(this.disconnect_timeout); + io.set_disconnect_timeout(*this.disconnect_timeout); // handle http2 proto if io.query::().get() == Some(HttpProtocol::Http2) { @@ -723,6 +729,6 @@ mod tests { assert_eq!(pool.inner.borrow().available.len(), 2); assert!(lazy(|cx| pool.poll_ready(cx)).await.is_ready()); - assert!(lazy(|cx| pool.poll_shutdown(cx, false)).await.is_ready()); + assert!(lazy(|cx| pool.poll_shutdown(cx)).await.is_ready()); } } diff --git a/ntex/src/http/client/request.rs b/ntex/src/http/client/request.rs index ec4309d1..8b8d8ce9 100644 --- a/ntex/src/http/client/request.rs +++ b/ntex/src/http/client/request.rs @@ -397,7 +397,7 @@ impl ClientRequest { slf.addr, slf.response_decompress, slf.timeout, - slf.config.as_ref(), + slf.config, body, ) } @@ -413,7 +413,7 @@ impl ClientRequest { slf.addr, slf.response_decompress, slf.timeout, - slf.config.as_ref(), + slf.config, value, ) } @@ -431,7 +431,7 @@ impl ClientRequest { slf.addr, slf.response_decompress, slf.timeout, - slf.config.as_ref(), + slf.config, value, ) } @@ -451,7 +451,7 @@ impl ClientRequest { slf.addr, slf.response_decompress, slf.timeout, - slf.config.as_ref(), + slf.config, stream, ) } @@ -467,7 +467,7 @@ impl ClientRequest { slf.addr, slf.response_decompress, slf.timeout, - slf.config.as_ref(), + slf.config, ) } diff --git a/ntex/src/http/client/sender.rs b/ntex/src/http/client/sender.rs index 0191352a..ddac1b9c 100644 --- a/ntex/src/http/client/sender.rs +++ b/ntex/src/http/client/sender.rs @@ -1,5 +1,5 @@ use std::task::{Context, Poll}; -use std::{convert::TryFrom, error::Error, future::Future, net, pin::Pin}; +use std::{convert::TryFrom, error::Error, future::Future, net, pin::Pin, rc::Rc}; use serde::Serialize; @@ -8,7 +8,7 @@ use crate::http::error::HttpError; use crate::http::header::{self, HeaderMap, HeaderName, HeaderValue}; use crate::http::RequestHeadType; use crate::time::{sleep, Millis, Sleep}; -use crate::util::{Bytes, Stream}; +use crate::util::{BoxFuture, Bytes, Stream}; #[cfg(feature = "compress")] use crate::http::encoding::Decoder; @@ -49,7 +49,7 @@ impl From for SendRequestError { #[must_use = "futures do nothing unless polled"] pub enum SendClientRequest { Fut( - Pin>>>, + BoxFuture<'static, Result>, Option, bool, ), @@ -58,7 +58,7 @@ pub enum SendClientRequest { impl SendClientRequest { pub(crate) fn new( - send: Pin>>>, + send: BoxFuture<'static, Result>, response_decompress: bool, timeout: Millis, ) -> SendClientRequest { @@ -132,7 +132,7 @@ impl RequestHeadType { addr: Option, response_decompress: bool, mut timeout: Millis, - config: &ClientConfig, + config: Rc, body: B, ) -> SendClientRequest where @@ -141,12 +141,12 @@ impl RequestHeadType { if timeout.is_zero() { timeout = config.timeout; } + let body = body.into(); - SendClientRequest::new( - config.connector.send_request(self, body.into(), addr), - response_decompress, - timeout, - ) + let fut = + Box::pin(async move { config.connector.send_request(self, body, addr).await }); + + SendClientRequest::new(fut, response_decompress, timeout) } pub(super) fn send_json( @@ -154,7 +154,7 @@ impl RequestHeadType { addr: Option, response_decompress: bool, timeout: Millis, - config: &ClientConfig, + config: Rc, value: &T, ) -> SendClientRequest { let body = match serde_json::to_string(value) { @@ -180,7 +180,7 @@ impl RequestHeadType { addr: Option, response_decompress: bool, timeout: Millis, - config: &ClientConfig, + config: Rc, value: &T, ) -> SendClientRequest { let body = match serde_urlencoded::to_string(value) { @@ -209,7 +209,7 @@ impl RequestHeadType { addr: Option, response_decompress: bool, timeout: Millis, - config: &ClientConfig, + config: Rc, stream: S, ) -> SendClientRequest where @@ -230,7 +230,7 @@ impl RequestHeadType { addr: Option, response_decompress: bool, timeout: Millis, - config: &ClientConfig, + config: Rc, ) -> SendClientRequest { self.send_body(addr, response_decompress, timeout, config, Body::None) } diff --git a/ntex/src/http/h1/dispatcher.rs b/ntex/src/http/h1/dispatcher.rs index 2b511a5b..a38a37dc 100644 --- a/ntex/src/http/h1/dispatcher.rs +++ b/ntex/src/http/h1/dispatcher.rs @@ -1,9 +1,9 @@ //! Framed transport dispatcher use std::task::{Context, Poll}; -use std::{cell::RefCell, error::Error, future::Future, io, marker, pin::Pin, rc::Rc}; +use std::{cell::RefCell, error::Error, future::Future, io, marker, mem, pin::Pin, rc::Rc}; use crate::io::{Filter, Io, IoBoxed, IoStatusUpdate, RecvError}; -use crate::{service::Service, util::ready, util::Bytes}; +use crate::{service::Service, util::ready, util::BoxFuture, util::Bytes}; use crate::http; use crate::http::body::{BodySize, MessageBody, ResponseBody}; @@ -36,7 +36,9 @@ bitflags::bitflags! { pin_project_lite::pin_project! { /// Dispatcher for HTTP/1.1 protocol - pub struct Dispatcher, B, X: Service, U: Service<(Request, Io, Codec)>> { + pub struct Dispatcher, B, X: Service, U: Service<(Request, Io, Codec)>> + where S: 'static, X: 'static, U: 'static + { #[pin] call: CallState, st: State, @@ -66,12 +68,14 @@ enum State { pin_project_lite::pin_project! { #[project = CallStateProject] - enum CallState, X: Service> { + enum CallState, X: Service> + where S: 'static, X: 'static + { None, - Service { #[pin] fut: S::Future }, - ServiceUpgrade { #[pin] fut: S::Future }, - Expect { #[pin] fut: X::Future }, - Filter { fut: Pin>>> } + Service { #[pin] fut: S::Future<'static> }, + ServiceUpgrade { #[pin] fut: S::Future<'static> }, + Expect { #[pin] fut: X::Future<'static> }, + Filter { fut: BoxFuture<'static, Result> } } } @@ -247,13 +251,19 @@ where continue; } else if this.inner.flags.contains(Flags::UPGRADE_HND) { // Handle upgrade requests - Some(CallState::ServiceUpgrade { - fut: this.inner.config.service.call(req), - }) + let fut = this.inner.config.service.call(req); + let st = Some(CallState::ServiceUpgrade { + fut: unsafe { mem::transmute_copy(&fut) }, + }); + mem::forget(fut); + st } else { - Some(CallState::Service { - fut: this.inner.config.service.call(req), - }) + let fut = this.inner.config.service.call(req); + let st = Some(CallState::Service { + fut: unsafe { mem::transmute_copy(&fut) }, + }); + mem::forget(fut); + st } } Err(e) => { @@ -270,20 +280,29 @@ where .set_ctype(req.head().connection_type()); if req.head().expect() { // Handle normal requests with EXPECT: 100-Continue` header - Some(CallState::Expect { - fut: this.inner.config.expect.call(req), - }) + let fut = this.inner.config.expect.call(req); + let st = Some(CallState::Expect { + fut: unsafe { mem::transmute_copy(&fut) }, + }); + mem::forget(fut); + st } else if this.inner.flags.contains(Flags::UPGRADE_HND) { // Handle upgrade requests - Some(CallState::ServiceUpgrade { - fut: this.inner.config.service.call(req), - }) + let fut = this.inner.config.service.call(req); + let st = Some(CallState::ServiceUpgrade { + fut: unsafe { mem::transmute_copy(&fut) }, + }); + mem::forget(fut); + st } else { // Handle normal requests - Some(CallState::Service { - fut: this.inner.config.service.call(req), - }) + let fut = this.inner.config.service.call(req); + let st = Some(CallState::Service { + fut: unsafe { mem::transmute_copy(&fut) }, + }); + mem::forget(fut); + st } } Err(res) => { @@ -347,11 +366,16 @@ where log::trace!("switching to upgrade service for {:?}", req); // Handle UPGRADE request - crate::rt::spawn(this.inner.config.upgrade.as_ref().unwrap().call(( - req, - io, - this.inner.codec.clone(), - ))); + let config = this.inner.config.clone(); + let codec = this.inner.codec.clone(); + crate::rt::spawn(async move { + let _ = config + .upgrade + .as_ref() + .unwrap() + .call((req, io, codec)) + .await; + }); return Poll::Ready(Ok(())); } // prepare to shutdown @@ -492,24 +516,36 @@ where } call_state.set(if let Some(ref f) = self.config.on_request { // Handle filter fut - CallState::Filter { - fut: f.call((req, self.io.get_ref())), - } + let fut = f.call((req, self.io.get_ref())); + let st = CallState::Filter { + fut: unsafe { mem::transmute_copy(&fut) }, + }; + mem::forget(fut); + st } else if req.head().expect() { // Handle normal requests with EXPECT: 100-Continue` header - CallState::Expect { - fut: self.config.expect.call(req), - } + let fut = self.config.expect.call(req); + let st = CallState::Expect { + fut: unsafe { mem::transmute_copy(&fut) }, + }; + mem::forget(fut); + st } else if self.flags.contains(Flags::UPGRADE_HND) { // Handle upgrade requests - CallState::ServiceUpgrade { - fut: self.config.service.call(req), - } + let fut = self.config.service.call(req); + let st = CallState::ServiceUpgrade { + fut: unsafe { mem::transmute_copy(&fut) }, + }; + mem::forget(fut); + st } else { // Handle normal requests - CallState::Service { - fut: self.config.service.call(req), - } + let fut = self.config.service.call(req); + let st = CallState::Service { + fut: unsafe { mem::transmute_copy(&fut) }, + }; + mem::forget(fut); + st }); Poll::Ready(State::Call) } diff --git a/ntex/src/http/h1/expect.rs b/ntex/src/http/h1/expect.rs index 5668fb31..3090d0d7 100644 --- a/ntex/src/http/h1/expect.rs +++ b/ntex/src/http/h1/expect.rs @@ -1,5 +1,4 @@ use std::io; -use std::task::{Context, Poll}; use crate::http::request::Request; use crate::{service::Service, service::ServiceFactory, util::Ready}; @@ -11,10 +10,10 @@ impl ServiceFactory for ExpectHandler { type Error = io::Error; type Service = ExpectHandler; type InitError = io::Error; - type Future = Ready; + type Future<'f> = Ready; #[inline] - fn new_service(&self, _: ()) -> Self::Future { + fn create(&self, _: ()) -> Self::Future<'_> { Ready::Ok(ExpectHandler) } } @@ -22,15 +21,10 @@ impl ServiceFactory for ExpectHandler { impl Service for ExpectHandler { type Response = Request; type Error = io::Error; - type Future = Ready; + type Future<'f> = Ready; #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - #[inline] - fn call(&self, req: Request) -> Self::Future { + fn call(&self, req: Request) -> Self::Future<'_> { Ready::Ok(req) } } diff --git a/ntex/src/http/h1/service.rs b/ntex/src/http/h1/service.rs index 3a0b0b7a..8e556dcd 100644 --- a/ntex/src/http/h1/service.rs +++ b/ntex/src/http/h1/service.rs @@ -1,6 +1,4 @@ -use std::{ - cell::RefCell, error::Error, fmt, future::Future, marker, pin::Pin, rc::Rc, task, -}; +use std::{cell::RefCell, error::Error, fmt, marker, rc::Rc, task}; use crate::http::body::MessageBody; use crate::http::config::{DispatcherConfig, OnRequest, ServiceConfig}; @@ -9,7 +7,7 @@ use crate::http::request::Request; use crate::http::response::Response; use crate::io::{types, Filter, Io}; use crate::service::{IntoServiceFactory, Service, ServiceFactory}; -use crate::time::Millis; +use crate::{time::Millis, util::BoxFuture}; use super::codec::Codec; use super::dispatcher::Dispatcher; @@ -213,12 +211,12 @@ where type Error = DispatchError; type InitError = (); type Service = H1ServiceHandler; - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result>; - fn new_service(&self, _: ()) -> Self::Future { - let fut = self.srv.new_service(()); - let fut_ex = self.expect.new_service(()); - let fut_upg = self.upgrade.as_ref().map(|f| f.new_service(())); + fn create(&self, _: ()) -> Self::Future<'_> { + let fut = self.srv.create(()); + let fut_ex = self.expect.create(()); + let fut_upg = self.upgrade.as_ref().map(|f| f.create(())); let on_request = self.on_request.borrow_mut().take(); let cfg = self.cfg.clone(); @@ -270,7 +268,7 @@ where { type Response = (); type Error = DispatchError; - type Future = Dispatcher; + type Future<'f> = Dispatcher; fn poll_ready( &self, @@ -316,11 +314,11 @@ where } } - fn poll_shutdown(&self, cx: &mut task::Context<'_>, is_error: bool) -> task::Poll<()> { - let ready = self.config.expect.poll_shutdown(cx, is_error).is_ready(); - let ready = self.config.service.poll_shutdown(cx, is_error).is_ready() && ready; + fn poll_shutdown(&self, cx: &mut task::Context<'_>) -> task::Poll<()> { + let ready = self.config.expect.poll_shutdown(cx).is_ready(); + let ready = self.config.service.poll_shutdown(cx).is_ready() && ready; let ready = if let Some(ref upg) = self.config.upgrade { - upg.poll_shutdown(cx, is_error).is_ready() && ready + upg.poll_shutdown(cx).is_ready() && ready } else { ready }; @@ -332,7 +330,7 @@ where } } - fn call(&self, io: Io) -> Self::Future { + fn call(&self, io: Io) -> Self::Future<'_> { log::trace!( "New http1 connection, peer address {:?}", io.query::().get() diff --git a/ntex/src/http/h1/upgrade.rs b/ntex/src/http/h1/upgrade.rs index 0570e7ba..fd6eea47 100644 --- a/ntex/src/http/h1/upgrade.rs +++ b/ntex/src/http/h1/upgrade.rs @@ -1,4 +1,4 @@ -use std::{io, marker::PhantomData, task::Context, task::Poll}; +use std::{io, marker::PhantomData}; use crate::http::{h1::Codec, request::Request}; use crate::{io::Io, service::Service, service::ServiceFactory, util::Ready}; @@ -11,10 +11,10 @@ impl ServiceFactory<(Request, Io, Codec)> for UpgradeHandler { type Service = UpgradeHandler; type InitError = io::Error; - type Future = Ready; + type Future<'f> = Ready where Self: 'f; #[inline] - fn new_service(&self, _: ()) -> Self::Future { + fn create(&self, _: ()) -> Self::Future<'_> { unimplemented!() } } @@ -22,15 +22,10 @@ impl ServiceFactory<(Request, Io, Codec)> for UpgradeHandler { impl Service<(Request, Io, Codec)> for UpgradeHandler { type Response = (); type Error = io::Error; - type Future = Ready; + type Future<'f> = Ready where F: 'f; #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - #[inline] - fn call(&self, _: (Request, Io, Codec)) -> Self::Future { + fn call(&self, _: (Request, Io, Codec)) -> Self::Future<'_> { unimplemented!() } } diff --git a/ntex/src/http/h2/service.rs b/ntex/src/http/h2/service.rs index 84500e40..8ef9334d 100644 --- a/ntex/src/http/h2/service.rs +++ b/ntex/src/http/h2/service.rs @@ -1,5 +1,5 @@ use std::{cell::RefCell, io, task::Context, task::Poll}; -use std::{convert::TryFrom, future::Future, marker::PhantomData, mem, pin::Pin, rc::Rc}; +use std::{convert::TryFrom, marker::PhantomData, mem, rc::Rc}; use ntex_h2::{self as h2, frame::StreamId, server}; @@ -11,7 +11,7 @@ use crate::http::message::{CurrentIo, ResponseHead}; use crate::http::{DateService, Method, Request, Response, StatusCode, Uri, Version}; use crate::io::{types, Filter, Io, IoBoxed, IoRef}; use crate::service::{IntoServiceFactory, Service, ServiceFactory}; -use crate::util::{poll_fn, Bytes, BytesMut, Either, HashMap, Ready}; +use crate::util::{poll_fn, BoxFuture, Bytes, BytesMut, Either, HashMap, Ready}; use super::payload::{Payload, PayloadSender}; @@ -136,10 +136,10 @@ where type Error = DispatchError; type InitError = S::InitError; type Service = H2ServiceHandler; - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result>; - fn new_service(&self, _: ()) -> Self::Future { - let fut = self.srv.new_service(()); + fn create(&self, _: ()) -> Self::Future<'_> { + let fut = self.srv.create(()); let cfg = self.cfg.clone(); let h2config = self.h2config.clone(); @@ -173,7 +173,7 @@ where { type Response = (); type Error = DispatchError; - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result>; #[inline] fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { @@ -184,11 +184,11 @@ where } #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.config.service.poll_shutdown(cx, is_error) + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + self.config.service.poll_shutdown(cx) } - fn call(&self, io: Io) -> Self::Future { + fn call(&self, io: Io) -> Self::Future<'_> { log::trace!( "New http2 connection, peer address {:?}", io.query::().get() @@ -240,19 +240,9 @@ impl ControlService { impl Service> for ControlService { type Response = h2::ControlResult; type Error = (); - type Future = Ready; + type Future<'f> = Ready; - #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - #[inline] - fn poll_shutdown(&self, _: &mut Context<'_>, _: bool) -> Poll<()> { - Poll::Ready(()) - } - - fn call(&self, msg: h2::ControlMessage) -> Self::Future { + fn call(&self, msg: h2::ControlMessage) -> Self::Future<'_> { log::trace!("Control message: {:?}", msg); Ready::Ok::<_, ()>(msg.ack()) } @@ -293,22 +283,12 @@ where { type Response = (); type Error = H2Error; - type Future = Either< - Pin>>>, + type Future<'f> = Either< + BoxFuture<'f, Result>, Ready, >; - #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - #[inline] - fn poll_shutdown(&self, _: &mut Context<'_>, _: bool) -> Poll<()> { - Poll::Ready(()) - } - - fn call(&self, mut msg: h2::Message) -> Self::Future { + fn call(&self, mut msg: h2::Message) -> Self::Future<'_> { let (io, pseudo, headers, eof, payload) = match msg.kind().take() { h2::MessageKind::Headers { pseudo, diff --git a/ntex/src/http/service.rs b/ntex/src/http/service.rs index b973c24c..fb338840 100644 --- a/ntex/src/http/service.rs +++ b/ntex/src/http/service.rs @@ -1,9 +1,10 @@ use std::task::{Context, Poll}; -use std::{cell, error, fmt, future, future::Future, marker, pin::Pin, rc::Rc}; +use std::{cell, error, fmt, future, marker, pin::Pin, rc::Rc}; use crate::io::{types, Filter, Io}; use crate::service::{IntoServiceFactory, Service, ServiceFactory}; use crate::time::{Millis, Seconds}; +use crate::util::BoxFuture; use super::body::MessageBody; use super::builder::HttpServiceBuilder; @@ -250,13 +251,12 @@ where type Error = DispatchError; type InitError = (); type Service = HttpServiceHandler; - type Future = - Pin>>>; + type Future<'f> = BoxFuture<'f, Result>; - fn new_service(&self, _: ()) -> Self::Future { - let fut = self.srv.new_service(()); - let fut_ex = self.expect.new_service(()); - let fut_upg = self.upgrade.as_ref().map(|f| f.new_service(())); + fn create(&self, _: ()) -> Self::Future<'_> { + let fut = self.srv.create(()); + let fut_ex = self.expect.create(()); + let fut_upg = self.upgrade.as_ref().map(|f| f.create(())); let on_request = self.on_request.borrow_mut().take(); let cfg = self.cfg.clone(); @@ -311,7 +311,7 @@ where { type Response = (); type Error = DispatchError; - type Future = HttpServiceHandlerResponse; + type Future<'f> = HttpServiceHandlerResponse; fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { let cfg = self.config.as_ref(); @@ -354,11 +354,11 @@ where } } - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - let ready = self.config.expect.poll_shutdown(cx, is_error).is_ready(); - let ready = self.config.service.poll_shutdown(cx, is_error).is_ready() && ready; + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + let ready = self.config.expect.poll_shutdown(cx).is_ready(); + let ready = self.config.service.poll_shutdown(cx).is_ready() && ready; let ready = if let Some(ref upg) = self.config.upgrade { - upg.poll_shutdown(cx, is_error).is_ready() && ready + upg.poll_shutdown(cx).is_ready() && ready } else { ready }; @@ -370,7 +370,7 @@ where } } - fn call(&self, io: Io) -> Self::Future { + fn call(&self, io: Io) -> Self::Future<'_> { log::trace!( "New http connection, peer address {:?}", io.query::().get() @@ -406,9 +406,11 @@ pin_project_lite::pin_project! { S::Response: Into>, B: MessageBody, X: Service, + X: 'static, X::Error: ResponseError, X::Error: 'static, U: Service<(Request, Io, h1::Codec), Response = ()>, + U: 'static, U::Error: fmt::Display, U::Error: error::Error, U: 'static, @@ -428,15 +430,17 @@ pin_project_lite::pin_project! { S::Error: ResponseError, B: MessageBody, X: Service, + X: 'static, X::Error: ResponseError, X::Error: 'static, U: Service<(Request, Io, h1::Codec), Response = ()>, + U: 'static, U::Error: fmt::Display, U::Error: error::Error, U: 'static, { H1 { #[pin] fut: h1::Dispatcher }, - H2 { fut: Pin>>> }, + H2 { fut: BoxFuture<'static, Result<(), DispatchError>> }, } } diff --git a/ntex/src/lib.rs b/ntex/src/lib.rs index 4d1ca16c..8672aff8 100644 --- a/ntex/src/lib.rs +++ b/ntex/src/lib.rs @@ -30,6 +30,8 @@ pub use ntex_macros::{rt_main as main, rt_test as test}; #[cfg(test)] pub(crate) use ntex_macros::rt_test2 as rt_test; +pub use ntex_service::{forward_poll_ready, forward_poll_shutdown}; + pub mod http; pub mod server; pub mod web; @@ -37,7 +39,7 @@ pub mod ws; pub use self::service::{ fn_service, into_service, pipeline, pipeline_factory, IntoService, IntoServiceFactory, - Service, ServiceFactory, Transform, + Middleware, Service, ServiceFactory, }; pub use ntex_util::channel; diff --git a/ntex/src/server/config.rs b/ntex/src/server/config.rs index 88668759..252e5bc0 100644 --- a/ntex/src/server/config.rs +++ b/ntex/src/server/config.rs @@ -1,12 +1,13 @@ use std::{ cell::Cell, cell::RefCell, fmt, future::Future, io, marker::PhantomData, mem, net, - pin::Pin, rc::Rc, + rc::Rc, }; use log::error; -use crate::util::{HashMap, Ready}; -use crate::{io::Io, service, util::PoolId}; +use crate::service::{self, boxed, ServiceFactory as NServiceFactory}; +use crate::util::{BoxFuture, HashMap, Ready}; +use crate::{io::Io, util::PoolId}; use super::service::{ BoxedServerService, InternalServiceFactory, ServerMessage, StreamService, @@ -156,9 +157,7 @@ impl InternalServiceFactory for ConfiguredService { }) } - fn create( - &self, - ) -> Pin, ()>>>> { + fn create(&self) -> BoxFuture<'static, Result, ()>> { // configure services let rt = ServiceRuntime::new(self.topics.clone()); let cfg_fut = self.rt.configure(ServiceRuntime(rt.0.clone())); @@ -179,7 +178,7 @@ impl InternalServiceFactory for ConfiguredService { let mut res = vec![]; for token in tokens { if let Some(srv) = services.remove(&token) { - let newserv = srv.new_service(()); + let newserv = srv.create(()); match newserv.await { Ok(serv) => { res.push((token, serv)); @@ -193,7 +192,7 @@ impl InternalServiceFactory for ConfiguredService { let name = names.remove(&token).unwrap().0; res.push(( token, - Box::new(StreamService::new( + boxed::rcservice(StreamService::new( service::fn_service(move |_: Io| { error!("Service {:?} is not configured", name); Ready::<_, ()>::Ok(()) @@ -211,10 +210,7 @@ impl InternalServiceFactory for ConfiguredService { pub(super) trait ServiceRuntimeConfiguration { fn clone(&self) -> Box; - fn configure( - &self, - rt: ServiceRuntime, - ) -> Pin>>>; + fn configure(&self, rt: ServiceRuntime) -> BoxFuture<'static, Result<(), ()>>; } pub(super) struct ConfigWrapper { @@ -238,10 +234,7 @@ where }) } - fn configure( - &self, - rt: ServiceRuntime, - ) -> Pin>>> { + fn configure(&self, rt: ServiceRuntime) -> BoxFuture<'static, Result<(), ()>> { let f = self.f.clone(); Box::pin(async move { (f)(rt).await.map_err(|e| { @@ -259,8 +252,8 @@ pub struct ServiceRuntime(Rc>); struct ServiceRuntimeInner { names: HashMap, - services: HashMap, - onstart: Vec>>>, + services: HashMap, + onstart: Vec>, } impl ServiceRuntime { @@ -289,7 +282,6 @@ impl ServiceRuntime { where F: service::IntoServiceFactory, T: service::ServiceFactory + 'static, - T::Future: 'static, T::Service: 'static, T::InitError: fmt::Debug, { @@ -304,7 +296,6 @@ impl ServiceRuntime { where F: service::IntoServiceFactory, T: service::ServiceFactory + 'static, - T::Future: 'static, T::Service: 'static, T::InitError: fmt::Debug, { @@ -313,7 +304,7 @@ impl ServiceRuntime { let token = *token; inner.services.insert( token, - Box::new(ServiceFactory { + boxed::rcfactory(ServiceFactory { pool, inner: service.into_factory(), }), @@ -332,16 +323,8 @@ impl ServiceRuntime { } } -type BoxedNewService = Box< - dyn service::ServiceFactory< - (Option, ServerMessage), - Response = (), - Error = (), - InitError = (), - Service = BoxedServerService, - Future = Pin>>>, - >, ->; +type BoxServiceFactory = + service::boxed::RcServiceFactory<(), (Option, ServerMessage), (), (), ()>; struct ServiceFactory { inner: T, @@ -351,7 +334,6 @@ struct ServiceFactory { impl service::ServiceFactory<(Option, ServerMessage)> for ServiceFactory where T: service::ServiceFactory, - T::Future: 'static, T::Service: 'static, T::Error: 'static, T::InitError: fmt::Debug + 'static, @@ -360,14 +342,14 @@ where type Error = (); type InitError = (); type Service = BoxedServerService; - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result> where Self: 'f; - fn new_service(&self, _: ()) -> Self::Future { + fn create(&self, _: ()) -> Self::Future<'_> { let pool = self.pool; - let fut = self.inner.new_service(()); + let fut = self.inner.create(()); Box::pin(async move { match fut.await { - Ok(s) => Ok(Box::new(StreamService::new(s, pool)) as BoxedServerService), + Ok(s) => Ok(boxed::rcservice(StreamService::new(s, pool))), Err(e) => { error!("Cannot construct service: {:?}", e); Err(()) diff --git a/ntex/src/server/service.rs b/ntex/src/server/service.rs index ee4893d6..a8ff5c05 100644 --- a/ntex/src/server/service.rs +++ b/ntex/src/server/service.rs @@ -1,11 +1,10 @@ -use std::convert::TryInto; -use std::{future::Future, net::SocketAddr, pin::Pin, task::Context, task::Poll}; +use std::{convert::TryInto, net::SocketAddr, rc::Rc, task::Context, task::Poll}; use log::error; use crate::io::Io; -use crate::service::{Service, ServiceFactory}; -use crate::util::{Pool, PoolId, Ready}; +use crate::service::{boxed, Service, ServiceFactory}; +use crate::util::{BoxFuture, Pool, PoolId, Ready}; use crate::{rt::spawn, time::Millis}; use super::{counter::CounterGuard, socket::Stream, Config, Token}; @@ -31,43 +30,37 @@ pub(super) trait InternalServiceFactory: Send { fn clone_factory(&self) -> Box; - fn create( - &self, - ) -> Pin, ()>>>>; + fn create(&self) -> BoxFuture<'static, Result, ()>>; } -pub(super) type BoxedServerService = Box< - dyn Service< - (Option, ServerMessage), - Response = (), - Error = (), - Future = Ready<(), ()>, - >, ->; +pub(super) type BoxedServerService = + boxed::RcService<(Option, ServerMessage), (), ()>; +#[derive(Clone)] pub(super) struct StreamService { - service: T, + service: Rc, pool: Pool, } impl StreamService { pub(crate) fn new(service: T, pid: PoolId) -> Self { StreamService { - service, pool: pid.pool(), + service: Rc::new(service), } } } impl Service<(Option, ServerMessage)> for StreamService where - T: Service, - T::Future: 'static, + T: Service + 'static, T::Error: 'static, { type Response = (); type Error = (); - type Future = Ready<(), ()>; + type Future<'f> = Ready<(), ()> where T: 'f; + + crate::forward_poll_shutdown!(service); #[inline] fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { @@ -80,12 +73,10 @@ where } } - #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) - } - - fn call(&self, (guard, req): (Option, ServerMessage)) -> Self::Future { + fn call( + &self, + (guard, req): (Option, ServerMessage), + ) -> Self::Future<'_> { match req { ServerMessage::Connect(stream) => { let stream = stream.try_into().map_err(|e| { @@ -95,9 +86,9 @@ where if let Ok(stream) = stream { let stream: Io<_> = stream; stream.set_memory_pool(self.pool.pool_ref()); - let f = self.service.call(stream); + let svc = self.service.clone(); spawn(async move { - let _ = f.await; + let _ = svc.call(stream).await; drop(guard); }); Ready::Ok(()) @@ -153,18 +144,17 @@ where }) } - fn create( - &self, - ) -> Pin, ()>>>> { + fn create(&self) -> BoxFuture<'static, Result, ()>> { let token = self.token; let cfg = Config::default(); - let fut = self.inner.create(cfg.clone()).new_service(()); + let pool = cfg.get_pool_id(); + let factory = self.inner.create(cfg); Box::pin(async move { - match fut.await { + match factory.create(()).await { Ok(inner) => { let service: BoxedServerService = - Box::new(StreamService::new(inner, cfg.get_pool_id())); + boxed::rcservice(StreamService::new(inner, pool)); Ok(vec![(token, service)]) } Err(_) => Err(()), @@ -182,9 +172,7 @@ impl InternalServiceFactory for Box { self.as_ref().clone_factory() } - fn create( - &self, - ) -> Pin, ()>>>> { + fn create(&self) -> BoxFuture<'static, Result, ()>> { self.as_ref().create() } } diff --git a/ntex/src/server/worker.rs b/ntex/src/server/worker.rs index be2ebdef..80a44740 100644 --- a/ntex/src/server/worker.rs +++ b/ntex/src/server/worker.rs @@ -5,8 +5,11 @@ use async_channel::{unbounded, Receiver, Sender}; use async_oneshot as oneshot; use crate::rt::{spawn, Arbiter}; +use crate::service::Service; use crate::time::{sleep, Millis, Sleep}; -use crate::util::{join_all, ready, select, stream_recv, Either, Stream as FutStream}; +use crate::util::{ + join_all, ready, select, stream_recv, BoxFuture, Either, Stream as FutStream, +}; use super::accept::{AcceptNotify, Command}; use super::service::{BoxedServerService, InternalServiceFactory, ServerMessage}; @@ -204,7 +207,7 @@ impl Worker { state: WorkerState::Unavailable, }); - let mut fut: Vec>>> = Vec::new(); + let mut fut: Vec> = Vec::new(); for (idx, factory) in wrk.factories.iter().enumerate() { let f = factory.create(); fut.push(Box::pin(async move { @@ -252,9 +255,9 @@ impl Worker { self.services.iter_mut().for_each(|srv| { if srv.status == WorkerServiceStatus::Available { srv.status = WorkerServiceStatus::Stopped; - let fut = srv.service.call((None, ServerMessage::ForceShutdown)); + let svc = srv.service.clone(); spawn(async move { - let _ = fut.await; + let _ = svc.call((None, ServerMessage::ForceShutdown)).await; }); } }); @@ -264,9 +267,9 @@ impl Worker { if srv.status == WorkerServiceStatus::Available { srv.status = WorkerServiceStatus::Stopping; - let fut = srv.service.call((None, ServerMessage::Shutdown(timeout))); + let svc = srv.service.clone(); spawn(async move { - let _ = fut.await; + let _ = svc.call((None, ServerMessage::Shutdown(timeout))).await; }); } }); @@ -326,7 +329,7 @@ enum WorkerState { Restarting( usize, Token, - Pin, ()>>>>, + BoxFuture<'static, Result, ()>>, ), Shutdown(Sleep, Sleep, Option>), } @@ -527,9 +530,9 @@ mod tests { type Error = (); type Service = Srv; type InitError = (); - type Future = Ready; + type Future<'f> = Ready; - fn new_service(&self, _: ()) -> Self::Future { + fn create(&self, _: ()) -> Self::Future<'_> { let mut cnt = self.counter.lock().unwrap(); *cnt += 1; Ready::Ok(Srv { @@ -545,7 +548,7 @@ mod tests { impl Service for Srv { type Response = (); type Error = (); - type Future = Ready<(), ()>; + type Future<'f> = Ready<(), ()>; fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { let st: St = { *self.st.lock().unwrap() }; @@ -559,14 +562,14 @@ mod tests { } } - fn poll_shutdown(&self, _: &mut Context<'_>, _: bool) -> Poll<()> { + fn poll_shutdown(&self, _: &mut Context<'_>) -> Poll<()> { match *self.st.lock().unwrap() { St::Ready => Poll::Ready(()), St::Fail | St::Pending => Poll::Pending, } } - fn call(&self, _: Io) -> Self::Future { + fn call(&self, _: Io) -> Self::Future<'_> { Ready::Ok(()) } } diff --git a/ntex/src/web/app.rs b/ntex/src/web/app.rs index 0da43ac7..3e02602b 100644 --- a/ntex/src/web/app.rs +++ b/ntex/src/web/app.rs @@ -1,13 +1,11 @@ -use std::{ - cell::RefCell, fmt, future::Future, marker::PhantomData, pin::Pin, rc::Rc, task, -}; +use std::{cell::RefCell, fmt, future::Future, marker::PhantomData, rc::Rc}; use crate::http::Request; use crate::router::ResourceDef; use crate::service::boxed::{self, BoxServiceFactory}; -use crate::service::{map_config, pipeline_factory, PipelineFactory}; -use crate::service::{Identity, IntoServiceFactory, Service, ServiceFactory, Transform}; -use crate::util::{Extensions, Ready}; +use crate::service::{map_config, pipeline_factory, IntoServiceFactory, PipelineFactory}; +use crate::service::{Identity, Middleware, Service, ServiceFactory, Stack}; +use crate::util::{BoxFuture, Extensions, Ready}; use super::app_service::{AppFactory, AppService}; use super::config::{AppConfig, ServiceConfig}; @@ -20,14 +18,13 @@ use super::{DefaultError, ErrorRenderer}; type HttpNewService = BoxServiceFactory<(), WebRequest, WebResponse, Err::Container, ()>; -type FnStateFactory = - Box Pin>>>>; +type FnStateFactory = Box BoxFuture<'static, Result>>; /// Application builder - structure that follows the builder pattern /// for building application instances. pub struct App { middleware: M, - filter: PipelineFactory>, + filter: PipelineFactory, F>, services: Vec>>, default: Option>>, external: Vec, @@ -79,7 +76,6 @@ where Error = Err::Container, InitError = (), >, - T::Future: 'static, Err: ErrorRenderer, { /// Set application level arbitrary state item. @@ -422,7 +418,7 @@ where impl App where - M: Transform> + 'static, + M: Middleware> + 'static, M::Service: Service, Response = WebResponse, Error = Err::Container>, F: ServiceFactory< WebRequest, @@ -430,7 +426,6 @@ where Error = Err::Container, InitError = (), >, - F::Future: 'static, Err: ErrorRenderer, { /// Construct service factory with default `AppConfig`, suitable for `http::HttpService`. @@ -459,7 +454,7 @@ where Error = Err::Container, InitError = (), > { - IntoServiceFactory::, Request, ()>::into_factory(self) + IntoServiceFactory::, Request>::into_factory(self) } /// Construct service factory suitable for `http::HttpService`. @@ -488,7 +483,10 @@ where Response = WebResponse, Error = Err::Container, InitError = (), - > { + > + where + M::Service: 'static, + { let app = AppFactory { filter: self.filter, middleware: Rc::new(self.middleware), @@ -506,7 +504,7 @@ where impl IntoServiceFactory, Request, AppConfig> for App where - M: Transform> + 'static, + M: Middleware> + 'static, M::Service: Service, Response = WebResponse, Error = Err::Container>, F: ServiceFactory< WebRequest, @@ -514,7 +512,6 @@ where Error = Err::Container, InitError = (), >, - F::Future: 'static, Err: ErrorRenderer, { fn into_factory(self) -> AppFactory { @@ -531,9 +528,9 @@ where } } -impl IntoServiceFactory, Request, ()> for App +impl IntoServiceFactory, Request> for App where - M: Transform> + 'static, + M: Middleware> + 'static, M::Service: Service, Response = WebResponse, Error = Err::Container>, F: ServiceFactory< WebRequest, @@ -541,7 +538,6 @@ where Error = Err::Container, InitError = (), >, - F::Future: 'static, Err: ErrorRenderer, { fn into_factory(self) -> AppFactory { @@ -558,29 +554,6 @@ where } } -pub struct Stack { - inner: Inner, - outer: Outer, -} - -impl Stack { - pub(super) fn new(inner: Inner, outer: Outer) -> Self { - Stack { inner, outer } - } -} - -impl Transform for Stack -where - Inner: Transform, - Outer: Transform, -{ - type Service = Outer::Service; - - fn new_transform(&self, service: S) -> Self::Service { - self.outer.new_transform(self.inner.new_transform(service)) - } -} - pub struct Filter(PhantomData); impl Filter { @@ -594,10 +567,10 @@ impl ServiceFactory> for Filter { type Error = Err::Container; type InitError = (); type Service = Filter; - type Future = Ready, ()>; + type Future<'f> = Ready, ()>; #[inline] - fn new_service(&self, _: ()) -> Self::Future { + fn create(&self, _: ()) -> Self::Future<'_> { Ready::Ok(Filter(PhantomData)) } } @@ -605,15 +578,10 @@ impl ServiceFactory> for Filter { impl Service> for Filter { type Response = WebRequest; type Error = Err::Container; - type Future = Ready, Err::Container>; + type Future<'f> = Ready, Err::Container>; #[inline] - fn poll_ready(&self, _: &mut task::Context<'_>) -> task::Poll> { - task::Poll::Ready(Ok(())) - } - - #[inline] - fn call(&self, req: WebRequest) -> Self::Future { + fn call(&self, req: WebRequest) -> Self::Future<'_> { Ready::Ok(req) } } @@ -636,7 +604,7 @@ mod tests { let srv = App::new() .service(web::resource("/test").to(|| async { HttpResponse::Ok() })) .finish() - .new_service(()) + .create(()) .await .unwrap(); let req = TestRequest::with_uri("/test").to_request(); @@ -660,7 +628,7 @@ mod tests { Ok(r.into_response(HttpResponse::MethodNotAllowed())) }) .with_config(Default::default()) - .new_service(()) + .create(()) .await .unwrap(); diff --git a/ntex/src/web/app_service.rs b/ntex/src/web/app_service.rs index 5872252f..dbf35e64 100644 --- a/ntex/src/web/app_service.rs +++ b/ntex/src/web/app_service.rs @@ -4,8 +4,8 @@ use std::{cell::RefCell, future::Future, marker::PhantomData, pin::Pin, rc::Rc}; use crate::http::{Request, Response}; use crate::router::{Path, ResourceDef, Router}; use crate::service::boxed::{self, BoxService, BoxServiceFactory}; -use crate::service::{fn_service, PipelineFactory, Service, ServiceFactory, Transform}; -use crate::util::Extensions; +use crate::service::{fn_service, Middleware, PipelineFactory, Service, ServiceFactory}; +use crate::util::{BoxFuture, Extensions}; use super::config::AppConfig; use super::error::ErrorRenderer; @@ -21,10 +21,9 @@ type HttpService = BoxService, WebResponse, Err::Container>; type HttpNewService = BoxServiceFactory<(), WebRequest, WebResponse, Err::Container, ()>; -type BoxResponse = - Pin>>>; -type FnStateFactory = - Box Pin>>>>; +type BoxResponse<'f, Err: ErrorRenderer> = + BoxFuture<'f, Result>; +type FnStateFactory = Box BoxFuture<'static, Result>>; /// Service factory to convert `Request` to a `WebRequest`. /// It also executes state factories. @@ -36,11 +35,10 @@ where Error = Err::Container, InitError = (), >, - F::Future: 'static, Err: ErrorRenderer, { pub(super) middleware: Rc, - pub(super) filter: PipelineFactory>, + pub(super) filter: PipelineFactory, F>, pub(super) extensions: RefCell>, pub(super) state_factories: Rc>, pub(super) services: Rc>>>>, @@ -51,7 +49,7 @@ where impl ServiceFactory for AppFactory where - T: Transform> + 'static, + T: Middleware> + 'static, T::Service: Service, Response = WebResponse, Error = Err::Container>, F: ServiceFactory< WebRequest, @@ -59,23 +57,22 @@ where Error = Err::Container, InitError = (), >, - F::Future: 'static, Err: ErrorRenderer, { type Response = WebResponse; type Error = Err::Container; type InitError = (); type Service = AppFactoryService; - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result> where Self: 'f; - fn new_service(&self, _: ()) -> Self::Future { - ServiceFactory::::new_service(self, AppConfig::default()) + fn create(&self, _: ()) -> Self::Future<'_> { + ServiceFactory::create(self, AppConfig::default()) } } impl ServiceFactory for AppFactory where - T: Transform> + 'static, + T: Middleware> + 'static, T::Service: Service, Response = WebResponse, Error = Err::Container>, F: ServiceFactory< WebRequest, @@ -83,16 +80,15 @@ where Error = Err::Container, InitError = (), >, - F::Future: 'static, Err: ErrorRenderer, { type Response = WebResponse; type Error = Err::Container; type InitError = (); type Service = AppFactoryService; - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result> where Self: 'f; - fn new_service(&self, config: AppConfig) -> Self::Future { + fn create(&self, config: AppConfig) -> Self::Future<'_> { let services = std::mem::take(&mut *self.services.borrow_mut()); // update resource default service @@ -104,7 +100,7 @@ where ))) }); - let filter_fut = self.filter.new_service(()); + let filter_fut = self.filter.create(()); let state_factories = self.state_factories.clone(); let mut extensions = self .extensions @@ -124,7 +120,7 @@ where for fut in state_factories.iter() { extensions = fut(extensions).await?; } - let state = AppState::new(extensions, None, config); + let state = AppState::new(extensions, None, config.clone()); // App config let mut config = WebServiceConfig::new(state.clone(), default.clone()); @@ -156,25 +152,25 @@ where // create http services for (path, factory, guards) in &mut services.iter() { - let service = factory.new_service(()).await?; + let service = factory.create(()).await?; router.rdef(path.clone(), service).2 = guards.borrow_mut().take(); } let routing = AppRouting { router: router.finish(), - default: Some(default.new_service(()).await?), + default: Some(default.create(()).await?), }; // main service let service = AppService { + routing, filter: filter_fut.await?, - routing: Rc::new(routing), }; Ok(AppFactoryService { rmap, state, - service: middleware.new_transform(service), + service: middleware.create(service), pool: HttpRequestPool::create(), _t: PhantomData, }) @@ -202,19 +198,12 @@ where { type Response = WebResponse; type Error = T::Error; - type Future = T::Future; + type Future<'f> = T::Future<'f> where T: 'f; - #[inline] - fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - self.service.poll_ready(cx) - } + crate::forward_poll_ready!(service); + crate::forward_poll_shutdown!(service); - #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) - } - - fn call(&self, req: Request) -> Self::Future { + fn call(&self, req: Request) -> Self::Future<'_> { let (head, payload) = req.into_parts(); let req = if let Some(mut req) = self.pool.get_request() { @@ -256,14 +245,9 @@ struct AppRouting { impl Service> for AppRouting { type Response = WebResponse; type Error = Err::Container; - type Future = BoxResponse; + type Future<'f> = BoxResponse<'f, Err>; - #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - fn call(&self, mut req: WebRequest) -> Self::Future { + fn call(&self, mut req: WebRequest) -> Self::Future<'_> { let res = self.router.recognize_checked(&mut req, |req, guards| { if let Some(guards) = guards { for f in guards { @@ -289,7 +273,7 @@ impl Service> for AppRouting { /// Web app service pub struct AppService { filter: F, - routing: Rc>, + routing: AppRouting, } impl Service> for AppService @@ -299,7 +283,7 @@ where { type Response = WebResponse; type Error = Err::Container; - type Future = AppServiceResponse; + type Future<'f> = AppServiceResponse<'f, F, Err> where F: 'f; #[inline] fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { @@ -312,25 +296,27 @@ where } } - fn call(&self, req: WebRequest) -> Self::Future { + fn call(&self, req: WebRequest) -> Self::Future<'_> { AppServiceResponse { filter: self.filter.call(req), - routing: self.routing.clone(), + routing: &self.routing, endpoint: None, } } } pin_project_lite::pin_project! { - pub struct AppServiceResponse>, Err: ErrorRenderer> { + pub struct AppServiceResponse<'f, F: Service>, Err: ErrorRenderer> + where F: 'f + { #[pin] - filter: F::Future, - routing: Rc>, - endpoint: Option>, + filter: F::Future<'f>, + routing: &'f AppRouting, + endpoint: Option>, } } -impl Future for AppServiceResponse +impl<'f, F, Err> Future for AppServiceResponse<'f, F, Err> where F: Service, Response = WebRequest, Error = Err::Container>, Err: ErrorRenderer, @@ -338,18 +324,20 @@ where type Output = Result; fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - let this = self.as_mut().project(); + let mut this = self.as_mut().project(); - if let Some(fut) = this.endpoint.as_mut() { - Pin::new(fut).poll(cx) - } else { - let res = if let Poll::Ready(res) = this.filter.poll(cx) { - res? + loop { + if let Some(fut) = this.endpoint.as_mut() { + return Pin::new(fut).poll(cx); } else { - return Poll::Pending; - }; - *this.endpoint = Some(this.routing.call(res)); - self.poll(cx) + let res = if let Poll::Ready(res) = this.filter.poll(cx) { + res? + } else { + return Poll::Pending; + }; + *this.endpoint = Some(this.routing.call(res)); + this = self.as_mut().project(); + } } } } diff --git a/ntex/src/web/extract.rs b/ntex/src/web/extract.rs index 2c6da049..1ea594c0 100644 --- a/ntex/src/web/extract.rs +++ b/ntex/src/web/extract.rs @@ -3,7 +3,7 @@ use std::{future::Future, pin::Pin, task::Context, task::Poll}; use super::error::ErrorRenderer; use super::httprequest::HttpRequest; -use crate::{http::Payload, util::Ready}; +use crate::{http::Payload, util::BoxFuture, util::Ready}; /// Trait implemented by types that can be extracted from request. /// @@ -79,7 +79,7 @@ where >::Error: Into, { type Error = Err::Container; - type Future = Pin, Self::Error>>>>; + type Future = BoxFuture<'static, Result, Self::Error>>; #[inline] fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future { @@ -147,7 +147,7 @@ where E: ErrorRenderer, { type Error = T::Error; - type Future = Pin, Self::Error>>>>; + type Future = BoxFuture<'static, Result, Self::Error>>; #[inline] fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future { diff --git a/ntex/src/web/handler.rs b/ntex/src/web/handler.rs index 5d311bcd..1354d38f 100644 --- a/ntex/src/web/handler.rs +++ b/ntex/src/web/handler.rs @@ -1,5 +1,7 @@ use std::{future::Future, marker::PhantomData, pin::Pin, task::Context, task::Poll}; +use crate::util::BoxFuture; + use super::error::ErrorRenderer; use super::extract::FromRequest; use super::httprequest::HttpRequest; @@ -37,7 +39,7 @@ pub(super) trait HandlerFn { fn call( &self, _: WebRequest, - ) -> Pin>>>; + ) -> BoxFuture<'static, Result>; fn clone_handler(&self) -> Box>; } @@ -81,7 +83,7 @@ where fn call( &self, req: WebRequest, - ) -> Pin>>> { + ) -> BoxFuture<'static, Result> { let (req, mut payload) = req.into_parts(); Box::pin(HandlerWrapperResponse { diff --git a/ntex/src/web/middleware/compress.rs b/ntex/src/web/middleware/compress.rs index a32d47b4..ee6a12c5 100644 --- a/ntex/src/web/middleware/compress.rs +++ b/ntex/src/web/middleware/compress.rs @@ -4,7 +4,7 @@ use std::{cmp, future::Future, marker, pin::Pin, str::FromStr}; use crate::http::encoding::Encoder; use crate::http::header::{ContentEncoding, ACCEPT_ENCODING}; -use crate::service::{Service, Transform}; +use crate::service::{Middleware, Service}; use crate::web::{BodyEncoding, ErrorRenderer, WebRequest, WebResponse}; #[derive(Debug, Clone)] @@ -43,10 +43,10 @@ impl Default for Compress { } } -impl Transform for Compress { +impl Middleware for Compress { type Service = CompressMiddleware; - fn new_transform(&self, service: S) -> Self::Service { + fn create(&self, service: S) -> Self::Service { CompressMiddleware { service, encoding: self.enc, @@ -66,19 +66,12 @@ where { type Response = WebResponse; type Error = S::Error; - type Future = CompressResponse; + type Future<'f> = CompressResponse<'f, S, E> where S: 'f; - #[inline] - fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - self.service.poll_ready(cx) - } + crate::forward_poll_ready!(service); + crate::forward_poll_shutdown!(service); - #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) - } - - fn call(&self, req: WebRequest) -> Self::Future { + fn call(&self, req: WebRequest) -> Self::Future<'_> { // negotiate content-encoding let encoding = if let Some(val) = req.headers().get(&ACCEPT_ENCODING) { if let Ok(enc) = val.to_str() { @@ -100,16 +93,17 @@ where pin_project_lite::pin_project! { #[doc(hidden)] - pub struct CompressResponse>, E> + pub struct CompressResponse<'f, S: Service>, E> + where S: 'f, E: 'f { #[pin] - fut: S::Future, + fut: S::Future<'f>, encoding: ContentEncoding, _t: marker::PhantomData, } } -impl Future for CompressResponse +impl<'f, S, E> Future for CompressResponse<'f, S, E> where S: Service, Response = WebResponse>, E: ErrorRenderer, diff --git a/ntex/src/web/middleware/defaultheaders.rs b/ntex/src/web/middleware/defaultheaders.rs index ce703aa0..9851b25d 100644 --- a/ntex/src/web/middleware/defaultheaders.rs +++ b/ntex/src/web/middleware/defaultheaders.rs @@ -1,10 +1,10 @@ //! Middleware for setting default response headers -use std::task::{Context, Poll}; -use std::{convert::TryFrom, future::Future, pin::Pin, rc::Rc}; +use std::{convert::TryFrom, rc::Rc}; use crate::http::error::HttpError; use crate::http::header::{HeaderMap, HeaderName, HeaderValue, CONTENT_TYPE}; -use crate::service::{Service, Transform}; +use crate::service::{Middleware, Service}; +use crate::util::BoxFuture; use crate::web::{WebRequest, WebResponse}; /// `Middleware` for setting default response headers. @@ -86,10 +86,10 @@ impl DefaultHeaders { } } -impl Transform for DefaultHeaders { +impl Middleware for DefaultHeaders { type Service = DefaultHeadersMiddleware; - fn new_transform(&self, service: S) -> Self::Service { + fn create(&self, service: S) -> Self::Service { DefaultHeadersMiddleware { service, inner: self.inner.clone(), @@ -105,37 +105,28 @@ pub struct DefaultHeadersMiddleware { impl Service> for DefaultHeadersMiddleware where S: Service, Response = WebResponse>, - S::Future: 'static, + E: 'static, { type Response = WebResponse; type Error = S::Error; - type Future = Pin>>>; + type Future<'f> = + BoxFuture<'f, Result> where S: 'f, E: 'f; - #[inline] - fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - self.service.poll_ready(cx) - } - - #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) - } - - fn call(&self, req: WebRequest) -> Self::Future { - let inner = self.inner.clone(); - let fut = self.service.call(req); + crate::forward_poll_ready!(service); + crate::forward_poll_shutdown!(service); + fn call(&self, req: WebRequest) -> Self::Future<'_> { Box::pin(async move { - let mut res = fut.await?; + let mut res = self.service.call(req).await?; // set response headers - for (key, value) in inner.headers.iter() { + for (key, value) in self.inner.headers.iter() { if !res.headers().contains_key(key) { res.headers_mut().insert(key.clone(), value.clone()); } } // default content-type - if inner.ct && !res.headers().contains_key(&CONTENT_TYPE) { + if self.inner.ct && !res.headers().contains_key(&CONTENT_TYPE) { res.headers_mut().insert( CONTENT_TYPE, HeaderValue::from_static("application/octet-stream"), @@ -160,10 +151,10 @@ mod tests { async fn test_default_headers() { let mw = DefaultHeaders::new() .header(CONTENT_TYPE, "0001") - .new_transform(ok_service()); + .create(ok_service()); assert!(lazy(|cx| mw.poll_ready(cx).is_ready()).await); - assert!(lazy(|cx| mw.poll_shutdown(cx, true).is_ready()).await); + assert!(lazy(|cx| mw.poll_shutdown(cx).is_ready()).await); let req = TestRequest::default().to_srv_request(); let resp = mw.call(req).await.unwrap(); @@ -177,7 +168,7 @@ mod tests { }; let mw = DefaultHeaders::new() .header(CONTENT_TYPE, "0001") - .new_transform(srv.into_service()); + .create(srv.into_service()); let resp = mw.call(req).await.unwrap(); assert_eq!(resp.headers().get(CONTENT_TYPE).unwrap(), "0002"); } @@ -189,7 +180,7 @@ mod tests { }; let mw = DefaultHeaders::new() .content_type() - .new_transform(srv.into_service()); + .create(srv.into_service()); let req = TestRequest::default().to_srv_request(); let resp = mw.call(req).await.unwrap(); diff --git a/ntex/src/web/middleware/logger.rs b/ntex/src/web/middleware/logger.rs index 12ccdf41..a9054300 100644 --- a/ntex/src/web/middleware/logger.rs +++ b/ntex/src/web/middleware/logger.rs @@ -7,7 +7,7 @@ use regex::Regex; use crate::http::body::{Body, BodySize, MessageBody, ResponseBody}; use crate::http::header::HeaderName; -use crate::service::{Service, Transform}; +use crate::service::{Middleware, Service}; use crate::util::{Bytes, Either, HashSet}; use crate::web::{HttpResponse, WebRequest, WebResponse}; @@ -113,10 +113,10 @@ impl Default for Logger { } } -impl Transform for Logger { +impl Middleware for Logger { type Service = LoggerMiddleware; - fn new_transform(&self, service: S) -> Self::Service { + fn create(&self, service: S) -> Self::Service { LoggerMiddleware { service, inner: self.inner.clone(), @@ -136,20 +136,13 @@ where { type Response = WebResponse; type Error = S::Error; - type Future = Either, S::Future>; + type Future<'f> = Either, S::Future<'f>> where S: 'f, E: 'f; + + crate::forward_poll_ready!(service); + crate::forward_poll_shutdown!(service); #[inline] - fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - self.service.poll_ready(cx) - } - - #[inline] - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) - } - - #[inline] - fn call(&self, req: WebRequest) -> Self::Future { + fn call(&self, req: WebRequest) -> Self::Future<'_> { if self.inner.exclude.contains(req.path()) { Either::Right(self.service.call(req)) } else { @@ -171,17 +164,18 @@ where pin_project_lite::pin_project! { #[doc(hidden)] - pub struct LoggerResponse>, E> + pub struct LoggerResponse<'f, S: Service>, E> + where S: 'f, E: 'f { #[pin] - fut: S::Future, + fut: S::Future<'f>, time: time::SystemTime, format: Option, _t: PhantomData } } -impl Future for LoggerResponse +impl<'f, S, E> Future for LoggerResponse<'f, S, E> where S: Service, Response = WebResponse>, { @@ -458,7 +452,7 @@ impl<'a> fmt::Display for FormatDisplay<'a> { mod tests { use super::*; use crate::http::{header, StatusCode}; - use crate::service::{IntoService, Transform}; + use crate::service::{IntoService, Middleware}; use crate::util::lazy; use crate::web::test::{self, TestRequest}; use crate::web::{DefaultError, Error}; @@ -478,9 +472,9 @@ mod tests { let logger = Logger::new("%% %{User-Agent}i %{X-Test}o %{HOME}e %D %% test") .exclude("/test"); - let srv = Transform::new_transform(&logger, srv.into_service()); + let srv = Middleware::create(&logger, srv.into_service()); assert!(lazy(|cx| srv.poll_ready(cx).is_ready()).await); - assert!(lazy(|cx| srv.poll_shutdown(cx, true).is_ready()).await); + assert!(lazy(|cx| srv.poll_shutdown(cx).is_ready()).await); let req = TestRequest::with_header( header::USER_AGENT, diff --git a/ntex/src/web/resource.rs b/ntex/src/web/resource.rs index 9da97a75..fd58c766 100644 --- a/ntex/src/web/resource.rs +++ b/ntex/src/web/resource.rs @@ -1,13 +1,13 @@ -use std::{ - cell::RefCell, fmt, future::Future, pin::Pin, rc::Rc, task::Context, task::Poll, -}; +use std::{cell::RefCell, fmt, rc::Rc}; use crate::http::Response; use crate::router::{IntoPattern, ResourceDef}; use crate::service::boxed::{self, BoxService, BoxServiceFactory}; -use crate::service::{pipeline_factory, PipelineFactory}; -use crate::service::{Identity, IntoServiceFactory, Service, ServiceFactory, Transform}; -use crate::util::{Either, Extensions, Ready}; +use crate::service::{dev::AndThen, pipeline, pipeline_factory, Pipeline, PipelineFactory}; +use crate::service::{ + Identity, IntoServiceFactory, Middleware, Service, ServiceFactory, Stack, +}; +use crate::util::{BoxFuture, Either, Extensions, Ready}; use super::dev::{insert_slesh, WebServiceConfig, WebServiceFactory}; use super::error::ErrorRenderer; @@ -17,12 +17,13 @@ use super::request::WebRequest; use super::responder::Responder; use super::response::WebResponse; use super::route::{IntoRoutes, Route, RouteService}; -use super::{app::Filter, app::Stack, guard::Guard, service::AppState}; +use super::{app::Filter, guard::Guard, service::AppState}; type HttpService = BoxService, WebResponse, Err::Container>; type HttpNewService = BoxServiceFactory<(), WebRequest, WebResponse, Err::Container, ()>; +type ResourcePipeline = Pipeline, AndThen>>; /// *Resource* is an entry in resources table which corresponds to requested URL. /// @@ -48,7 +49,7 @@ type HttpNewService = /// Default behavior could be overriden with `default_resource()` method. pub struct Resource> { middleware: M, - filter: PipelineFactory>, + filter: PipelineFactory, T>, rdef: Vec, name: Option, routes: Vec>, @@ -316,7 +317,7 @@ where Error = Err::Container, InitError = (), > + 'static, - M: Transform> + 'static, + M: Middleware> + 'static, M::Service: Service, Response = WebResponse, Error = Err::Container>, Err: ErrorRenderer, { @@ -346,14 +347,14 @@ where let router_factory = ResourceRouterFactory { state, routes: self.routes, - default: self.default, + default: self.default.borrow_mut().take(), }; config.register_service( rdef, guards, ResourceServiceFactory { - middleware: Rc::new(self.middleware), + middleware: self.middleware, filter: self.filter, routing: router_factory, }, @@ -362,33 +363,33 @@ where } } -impl +impl IntoServiceFactory< - ResourceServiceFactory>>, + ResourceServiceFactory, F>>, WebRequest, - > for Resource + > for Resource where - T: ServiceFactory< + F: ServiceFactory< WebRequest, Response = WebRequest, Error = Err::Container, InitError = (), > + 'static, - M: Transform> + 'static, + M: Middleware> + 'static, M::Service: Service, Response = WebResponse, Error = Err::Container>, Err: ErrorRenderer, { fn into_factory( self, - ) -> ResourceServiceFactory>> { + ) -> ResourceServiceFactory, F>> { let router_factory = ResourceRouterFactory { state: None, routes: self.routes, - default: self.default, + default: self.default.borrow_mut().take(), }; ResourceServiceFactory { - middleware: Rc::new(self.middleware), + middleware: self.middleware, filter: self.filter, routing: router_factory, } @@ -396,15 +397,15 @@ where } /// Resource service -pub struct ResourceServiceFactory { - middleware: Rc, - filter: T, +pub struct ResourceServiceFactory { + middleware: M, + filter: F, routing: ResourceRouterFactory, } impl ServiceFactory> for ResourceServiceFactory where - M: Transform> + 'static, + M: Middleware> + 'static, M::Service: Service, Response = WebResponse, Error = Err::Container>, F: ServiceFactory< WebRequest, @@ -418,91 +419,20 @@ where type Error = Err::Container; type Service = M::Service; type InitError = (); - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result>; - fn new_service(&self, _: ()) -> Self::Future { - let filter_fut = self.filter.new_service(()); - let routing_fut = self.routing.new_service(()); - let middleware = self.middleware.clone(); + fn create(&self, _: ()) -> Self::Future<'_> { Box::pin(async move { - Ok(middleware.new_transform(ResourceService { - filter: filter_fut.await?, - routing: Rc::new(routing_fut.await?), - })) + let filter = self.filter.create(()).await?; + let routing = self.routing.create(()).await?; + Ok(self.middleware.create(pipeline(filter).and_then(routing))) }) } } -pub struct ResourceService { - filter: F, - routing: Rc>, -} - -impl Service> for ResourceService -where - F: Service, Response = WebRequest, Error = Err::Container>, - Err: ErrorRenderer, -{ - type Response = WebResponse; - type Error = Err::Container; - type Future = ResourceServiceResponse; - - #[inline] - fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - let ready1 = self.filter.poll_ready(cx)?.is_ready(); - let ready2 = self.routing.poll_ready(cx)?.is_ready(); - if ready1 && ready2 { - Poll::Ready(Ok(())) - } else { - Poll::Pending - } - } - - fn call(&self, req: WebRequest) -> Self::Future { - ResourceServiceResponse { - filter: self.filter.call(req), - routing: self.routing.clone(), - endpoint: None, - } - } -} - -pin_project_lite::pin_project! { - pub struct ResourceServiceResponse>, Err: ErrorRenderer> { - #[pin] - filter: F::Future, - routing: Rc>, - endpoint: Option< as Service>>::Future>, - } -} - -impl Future for ResourceServiceResponse -where - F: Service, Response = WebRequest, Error = Err::Container>, - Err: ErrorRenderer, -{ - type Output = Result; - - fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - let this = self.as_mut().project(); - - if let Some(fut) = this.endpoint.as_mut() { - Pin::new(fut).poll(cx) - } else { - let res = if let Poll::Ready(res) = this.filter.poll(cx) { - res? - } else { - return Poll::Pending; - }; - *this.endpoint = Some(this.routing.call(res)); - self.poll(cx) - } - } -} - struct ResourceRouterFactory { routes: Vec>, - default: Rc>>>>, + default: Option>>, state: Option, } @@ -511,30 +441,25 @@ impl ServiceFactory> for ResourceRouterFacto type Error = Err::Container; type InitError = (); type Service = ResourceRouter; - type Future = Pin>>>; - - fn new_service(&self, _: ()) -> Self::Future { - let state = self.state.clone(); - let routes = self.routes.iter().map(|route| route.service()).collect(); - let default_fut = self.default.borrow().as_ref().map(|f| f.new_service(())); + type Future<'f> = BoxFuture<'f, Result>; + fn create(&self, _: ()) -> Self::Future<'_> { Box::pin(async move { - let default = if let Some(fut) = default_fut { - Some(fut.await?) + let default = if let Some(ref default) = self.default { + Some(default.create(()).await?) } else { None }; - Ok(ResourceRouter { - state, - routes, default, + state: self.state.clone(), + routes: self.routes.iter().map(|route| route.service()).collect(), }) }) } } -struct ResourceRouter { +pub struct ResourceRouter { state: Option, routes: Vec>, default: Option>, @@ -543,17 +468,12 @@ struct ResourceRouter { impl Service> for ResourceRouter { type Response = WebResponse; type Error = Err::Container; - type Future = Either< + type Future<'f> = Either< Ready, - Pin>>>, + BoxFuture<'f, Result>, >; - #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - fn call(&self, mut req: WebRequest) -> Self::Future { + fn call(&self, mut req: WebRequest) -> Self::Future<'_> { for route in self.routes.iter() { if route.check(&mut req) { if let Some(ref state) = self.state { diff --git a/ntex/src/web/route.rs b/ntex/src/web/route.rs index 5c6af0a2..9dd99dd4 100644 --- a/ntex/src/web/route.rs +++ b/ntex/src/web/route.rs @@ -1,6 +1,7 @@ -use std::{future::Future, mem, pin::Pin, rc::Rc, task::Context, task::Poll}; +use std::{mem, rc::Rc}; -use crate::{http::Method, service::Service, service::ServiceFactory, util::Ready}; +use crate::util::{BoxFuture, Ready}; +use crate::{http::Method, service::Service, service::ServiceFactory}; use super::error::ErrorRenderer; use super::error_default::DefaultError; @@ -56,9 +57,9 @@ impl ServiceFactory> for Route { type Error = Err::Container; type InitError = (); type Service = RouteService; - type Future = Ready, ()>; + type Future<'f> = Ready, ()>; - fn new_service(&self, _: ()) -> Self::Future { + fn create(&self, _: ()) -> Self::Future<'_> { Ok(self.service()).into() } } @@ -87,15 +88,10 @@ impl RouteService { impl Service> for RouteService { type Response = WebResponse; type Error = Err::Container; - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result>; #[inline] - fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - #[inline] - fn call(&self, req: WebRequest) -> Self::Future { + fn call(&self, req: WebRequest) -> Self::Future<'_> { self.handler.call(req) } } diff --git a/ntex/src/web/scope.rs b/ntex/src/web/scope.rs index acead12e..cc182767 100644 --- a/ntex/src/web/scope.rs +++ b/ntex/src/web/scope.rs @@ -5,11 +5,11 @@ use std::{ use crate::http::Response; use crate::router::{IntoPattern, ResourceDef, Router}; use crate::service::boxed::{self, BoxService, BoxServiceFactory}; -use crate::service::{pipeline_factory, PipelineFactory}; -use crate::service::{Identity, IntoServiceFactory, Service, ServiceFactory, Transform}; -use crate::util::{Either, Extensions, Ready}; +use crate::service::{pipeline_factory, IntoServiceFactory, PipelineFactory}; +use crate::service::{Identity, Middleware, Service, ServiceFactory, Stack}; +use crate::util::{BoxFuture, Either, Extensions, Ready}; -use super::app::{Filter, Stack}; +use super::app::Filter; use super::config::ServiceConfig; use super::dev::{WebServiceConfig, WebServiceFactory}; use super::error::ErrorRenderer; @@ -26,8 +26,8 @@ type HttpService = BoxService, WebResponse, Err::Container>; type HttpNewService = BoxServiceFactory<(), WebRequest, WebResponse, Err::Container, ()>; -type BoxResponse = - Pin>>>; +type BoxResponse<'a, Err: ErrorRenderer> = + BoxFuture<'a, Result>; /// Resources scope. /// @@ -60,7 +60,7 @@ type BoxResponse = /// pub struct Scope> { middleware: M, - filter: PipelineFactory>, + filter: PipelineFactory, T>, rdef: Vec, state: Option, services: Vec>>, @@ -368,7 +368,7 @@ where Error = Err::Container, InitError = (), > + 'static, - M: Transform> + 'static, + M: Middleware> + 'static, M::Service: Service, Response = WebResponse, Error = Err::Container>, Err: ErrorRenderer, { @@ -403,24 +403,23 @@ where // complete scope pipeline creation let router_factory = ScopeRouterFactory { state, - default: self.default.clone(), + default: self.default.borrow_mut().take(), case_insensitive: self.case_insensitive, - services: Rc::new( - cfg.into_services() - .into_iter() - .map(|(rdef, srv, guards, nested)| { - // case for scope prefix ends with '/' and - // resource is empty pattern - let mut rdef = if slesh && rdef.pattern() == "" { - ResourceDef::new("/") - } else { - rdef - }; - rmap.add(&mut rdef, nested); - (rdef, srv, RefCell::new(guards)) - }) - .collect(), - ), + services: cfg + .into_services() + .into_iter() + .map(|(rdef, srv, guards, nested)| { + // case for scope prefix ends with '/' and + // resource is empty pattern + let mut rdef = if slesh && rdef.pattern() == "" { + ResourceDef::new("/") + } else { + rdef + }; + rmap.add(&mut rdef, nested); + (rdef, srv, RefCell::new(guards)) + }) + .collect(), }; // get guards @@ -435,7 +434,7 @@ where ResourceDef::root_prefix(self.rdef), guards, ScopeServiceFactory { - middleware: Rc::new(self.middleware), + middleware: self.middleware, filter: self.filter, routing: router_factory, }, @@ -446,14 +445,14 @@ where /// Scope service struct ScopeServiceFactory { - middleware: Rc, + middleware: M, filter: F, routing: ScopeRouterFactory, } impl ServiceFactory> for ScopeServiceFactory where - M: Transform> + 'static, + M: Middleware> + 'static, M::Service: Service, Response = WebResponse, Error = Err::Container>, F: ServiceFactory< WebRequest, @@ -467,16 +466,13 @@ where type Error = Err::Container; type Service = M::Service; type InitError = (); - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result>; - fn new_service(&self, _: ()) -> Self::Future { - let filter_fut = self.filter.new_service(()); - let routing_fut = self.routing.new_service(()); - let middleware = self.middleware.clone(); + fn create(&self, _: ()) -> Self::Future<'_> { Box::pin(async move { - Ok(middleware.new_transform(ScopeService { - filter: filter_fut.await?, - routing: Rc::new(routing_fut.await?), + Ok(self.middleware.create(ScopeService { + filter: self.filter.create(()).await?, + routing: self.routing.create(()).await?, })) }) } @@ -484,7 +480,7 @@ where pub struct ScopeService { filter: F, - routing: Rc>, + routing: ScopeRouter, } impl Service> for ScopeService @@ -494,7 +490,7 @@ where { type Response = WebResponse; type Error = Err::Container; - type Future = ScopeServiceResponse; + type Future<'f> = ScopeServiceResponse<'f, F, Err> where F: 'f; #[inline] fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { @@ -507,25 +503,27 @@ where } } - fn call(&self, req: WebRequest) -> Self::Future { + fn call(&self, req: WebRequest) -> Self::Future<'_> { ScopeServiceResponse { filter: self.filter.call(req), - routing: self.routing.clone(), + routing: &self.routing, endpoint: None, } } } pin_project_lite::pin_project! { - pub struct ScopeServiceResponse>, Err: ErrorRenderer> { + pub struct ScopeServiceResponse<'f, F: Service>, Err: ErrorRenderer> + where F: 'f + { #[pin] - filter: F::Future, - routing: Rc>, - endpoint: Option< as Service>>::Future>, + filter: F::Future<'f>, + routing: &'f ScopeRouter, + endpoint: Option< as Service>>::Future<'f>>, } } -impl Future for ScopeServiceResponse +impl<'f, F, Err> Future for ScopeServiceResponse<'f, F, Err> where F: Service, Response = WebRequest, Error = Err::Container>, Err: ErrorRenderer, @@ -533,26 +531,28 @@ where type Output = Result; fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - let this = self.as_mut().project(); + let mut this = self.as_mut().project(); - if let Some(fut) = this.endpoint.as_mut() { - Pin::new(fut).poll(cx) - } else { - let res = if let Poll::Ready(res) = this.filter.poll(cx) { - res? + loop { + if let Some(fut) = this.endpoint.as_mut() { + return Pin::new(fut).poll(cx); } else { - return Poll::Pending; - }; - *this.endpoint = Some(this.routing.call(res)); - self.poll(cx) + let res = if let Poll::Ready(res) = this.filter.poll(cx) { + res? + } else { + return Poll::Pending; + }; + *this.endpoint = Some(this.routing.call(res)); + this = self.as_mut().project(); + } } } } struct ScopeRouterFactory { state: Option, - services: Rc, RefCell>)>>, - default: Rc>>>>, + services: Vec<(ResourceDef, HttpNewService, RefCell>)>, + default: Option>>, case_insensitive: bool, } @@ -561,39 +561,30 @@ impl ServiceFactory> for ScopeRouterFactory< type Error = Err::Container; type InitError = (); type Service = ScopeRouter; - type Future = Pin>>>; - - fn new_service(&self, _: ()) -> Self::Future { - let services = self.services.clone(); - let state = self.state.clone(); - let case_insensitive = self.case_insensitive; - let default_fut = self - .default - .borrow() - .as_ref() - .map(|srv| srv.new_service(())); + type Future<'f> = BoxFuture<'f, Result>; + fn create(&self, _: ()) -> Self::Future<'_> { Box::pin(async move { // create http services let mut router = Router::build(); - if case_insensitive { + if self.case_insensitive { router.case_insensitive(); } - for (path, factory, guards) in &mut services.iter() { - let service = factory.new_service(()).await?; + for (path, factory, guards) in &mut self.services.iter() { + let service = factory.create(()).await?; router.rdef(path.clone(), service).2 = guards.borrow_mut().take(); } - let default = if let Some(fut) = default_fut { - Some(fut.await?) + let default = if let Some(ref default) = self.default { + Some(default.create(()).await?) } else { None }; Ok(ScopeRouter { - state, default, router: router.finish(), + state: self.state.clone(), }) }) } @@ -608,14 +599,14 @@ struct ScopeRouter { impl Service> for ScopeRouter { type Response = WebResponse; type Error = Err::Container; - type Future = Either, Ready>; + type Future<'f> = Either, Ready>; #[inline] fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { Poll::Ready(Ok(())) } - fn call(&self, mut req: WebRequest) -> Self::Future { + fn call(&self, mut req: WebRequest) -> Self::Future<'_> { let res = self.router.recognize_checked(&mut req, |req, guards| { if let Some(guards) = guards { for f in guards { diff --git a/ntex/src/web/test.rs b/ntex/src/web/test.rs index d405ef1c..fe422f3b 100644 --- a/ntex/src/web/test.rs +++ b/ntex/src/web/test.rs @@ -79,7 +79,7 @@ where S::InitError: std::fmt::Debug, { let srv = app.into_factory(); - srv.new_service(AppConfig::default()).await.unwrap() + srv.create(AppConfig::default()).await.unwrap() } /// Calls service and waits for response future completion. diff --git a/ntex/src/web/types/form.rs b/ntex/src/web/types/form.rs index d36d117b..861dab63 100644 --- a/ntex/src/web/types/form.rs +++ b/ntex/src/web/types/form.rs @@ -8,7 +8,7 @@ use serde::{de::DeserializeOwned, Serialize}; use crate::http::encoding::Decoder; use crate::http::header::{CONTENT_LENGTH, CONTENT_TYPE}; use crate::http::{HttpMessage, Payload, Response, StatusCode}; -use crate::util::{stream_recv, BytesMut}; +use crate::util::{stream_recv, BoxFuture, BytesMut}; use crate::web::error::{ErrorRenderer, UrlencodedError, WebResponseError}; use crate::web::responder::{Ready, Responder}; use crate::web::{FromRequest, HttpRequest}; @@ -101,7 +101,7 @@ where Err: ErrorRenderer, { type Error = UrlencodedError; - type Future = Pin>>>; + type Future = BoxFuture<'static, Result>; #[inline] fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future { @@ -218,7 +218,7 @@ struct UrlEncoded { length: Option, encoding: &'static Encoding, err: Option, - fut: Option>>>>, + fut: Option>>, } impl UrlEncoded { diff --git a/ntex/src/web/types/json.rs b/ntex/src/web/types/json.rs index 73b77032..be34bee2 100644 --- a/ntex/src/web/types/json.rs +++ b/ntex/src/web/types/json.rs @@ -7,7 +7,7 @@ use serde::{de::DeserializeOwned, Serialize}; use crate::http::encoding::Decoder; use crate::http::header::CONTENT_LENGTH; use crate::http::{HttpMessage, Payload, Response, StatusCode}; -use crate::util::{stream_recv, BytesMut}; +use crate::util::{stream_recv, BoxFuture, BytesMut}; use crate::web::error::{ErrorRenderer, JsonError, JsonPayloadError, WebResponseError}; use crate::web::responder::{Ready, Responder}; use crate::web::{FromRequest, HttpRequest}; @@ -164,7 +164,7 @@ where T: DeserializeOwned + 'static, { type Error = JsonPayloadError; - type Future = Pin>>>; + type Future = BoxFuture<'static, Result>; #[inline] fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future { @@ -269,7 +269,7 @@ struct JsonBody { #[cfg(not(feature = "compress"))] stream: Option, err: Option, - fut: Option>>>>, + fut: Option>>, } impl JsonBody diff --git a/ntex/src/web/types/payload.rs b/ntex/src/web/types/payload.rs index 5ca4efc1..3216a953 100644 --- a/ntex/src/web/types/payload.rs +++ b/ntex/src/web/types/payload.rs @@ -5,7 +5,7 @@ use encoding_rs::UTF_8; use mime::Mime; use crate::http::{error, header, HttpMessage}; -use crate::util::{stream_recv, Bytes, BytesMut, Either, Ready, Stream}; +use crate::util::{stream_recv, BoxFuture, Bytes, BytesMut, Either, Ready, Stream}; use crate::web::error::{ErrorRenderer, PayloadError}; use crate::web::{FromRequest, HttpRequest}; @@ -141,10 +141,8 @@ impl FromRequest for Payload { /// ``` impl FromRequest for Bytes { type Error = PayloadError; - type Future = Either< - Pin>>>, - Ready, - >; + type Future = + Either>, Ready>; #[inline] fn from_request(req: &HttpRequest, payload: &mut crate::http::Payload) -> Self::Future { @@ -195,10 +193,8 @@ impl FromRequest for Bytes { /// ``` impl FromRequest for String { type Error = PayloadError; - type Future = Either< - Pin>>>, - Ready, - >; + type Future = + Either>, Ready>; #[inline] fn from_request(req: &HttpRequest, payload: &mut crate::http::Payload) -> Self::Future { @@ -315,7 +311,7 @@ struct HttpMessageBody { #[cfg(not(feature = "compress"))] stream: Option, err: Option, - fut: Option>>>>, + fut: Option>>, } impl HttpMessageBody { diff --git a/ntex/src/web/ws.rs b/ntex/src/web/ws.rs index eb52741b..10c29e9e 100644 --- a/ntex/src/web/ws.rs +++ b/ntex/src/web/ws.rs @@ -1,5 +1,5 @@ //! WebSockets protocol support -use std::fmt; +use std::{fmt, rc::Rc}; pub use crate::ws::{CloseCode, CloseReason, Frame, Message, WsSink}; @@ -8,8 +8,8 @@ use crate::service::{ apply_fn, fn_factory_with_config, IntoServiceFactory, Service, ServiceFactory, }; use crate::web::{HttpRequest, HttpResponse}; -use crate::ws::{error::HandshakeError, error::WsError, handshake}; -use crate::{io::DispatchItem, rt, time::Seconds, util::Either, util::Ready, ws}; +use crate::ws::{self, error::HandshakeError, error::WsError, handshake}; +use crate::{io::DispatchItem, rt, time::Seconds, util::Either, util::Ready}; /// Do websocket handshake and start websockets service. pub async fn start(req: HttpRequest, factory: F) -> Result @@ -19,23 +19,24 @@ where F: IntoServiceFactory, Err: From + From, { - let inner_factory = factory.into_factory().map_err(WsError::Service); + let inner_factory = Rc::new(factory.into_factory().map_err(WsError::Service)); let factory = fn_factory_with_config(move |sink: WsSink| { - let fut = inner_factory.new_service(sink.clone()); + let factory = inner_factory.clone(); async move { - let srv = fut.await?; + let srv = factory.create(sink.clone()).await?; + let sink = sink.clone(); + Ok::<_, T::InitError>(apply_fn(srv, move |req, srv| match req { - DispatchItem::Item(item) => { + DispatchItem::::Item(item) => { let s = if matches!(item, Frame::Close(_)) { Some(sink.clone()) } else { None }; - let fut = srv.call(item); Either::Left(async move { - let result = fut.await; + let result = srv.call(item).await; if let Some(s) = s { rt::spawn(async move { s.io().close() }); } @@ -94,7 +95,7 @@ where let sink = WsSink::new(io.get_ref(), codec.clone()); // create ws service - let srv = factory.into_factory().new_service(sink).await?; + let srv = factory.into_factory().create(sink.clone()).await?; // start websockets service dispatcher rt::spawn(async move { diff --git a/ntex/src/ws/client.rs b/ntex/src/ws/client.rs index 444e8ed1..6edfd5f2 100644 --- a/ntex/src/ws/client.rs +++ b/ntex/src/ws/client.rs @@ -1,5 +1,4 @@ //! Websockets client -use std::future::Future; use std::{cell::RefCell, convert::TryFrom, fmt, marker, net, rc::Rc, str}; #[cfg(feature = "openssl")] @@ -17,8 +16,8 @@ use crate::http::{body::BodySize, client::ClientResponse, error::HttpError, h1}; use crate::http::{ConnectionType, RequestHead, RequestHeadType, StatusCode, Uri}; use crate::io::{Base, DispatchItem, Dispatcher, Filter, Io, Sealed}; use crate::service::{apply_fn, into_service, IntoService, Service}; -use crate::util::{Either, Ready}; -use crate::{channel::mpsc, rt, time::timeout, time::Millis, time::Seconds, ws}; +use crate::time::{timeout, Millis, Seconds}; +use crate::{channel::mpsc, rt, util::Ready, ws}; use super::error::{WsClientBuilderError, WsClientError, WsError}; use super::transport::{WsTransport, WsTransportFactory}; @@ -131,7 +130,7 @@ where T: Service, Response = Io, Error = ConnectError>, { /// Complete request construction and connect to a websockets server. - pub fn connect(&self) -> impl Future, WsClientError>> { + pub async fn connect(&self) -> Result, WsClientError> { let head = self.head.clone(); let max_size = self.max_size; let server_mode = self.server_mode; @@ -156,107 +155,104 @@ where ); let msg = Connect::new(head.uri.clone()).set_addr(self.addr); - let fut = self.connector.call(msg); log::trace!("Open ws connection to {:?} addr: {:?}", head.uri, self.addr); - async move { - let io = fut.await?; + let io = self.connector.call(msg).await?; - // create Framed and send request - let codec = h1::ClientCodec::default(); + // create Framed and send request + let codec = h1::ClientCodec::default(); - // send request and read response - let fut = async { - log::trace!("Sending ws handshake http message"); - io.send( - (RequestHeadType::Rc(head, Some(headers)), BodySize::None).into(), - &codec, - ) - .await?; - log::trace!("Waiting for ws handshake response"); - io.recv(&codec) - .await? - .ok_or(WsClientError::Disconnected(None)) - }; + // send request and read response + let fut = async { + log::trace!("Sending ws handshake http message"); + io.send( + (RequestHeadType::Rc(head, Some(headers)), BodySize::None).into(), + &codec, + ) + .await?; + log::trace!("Waiting for ws handshake response"); + io.recv(&codec) + .await? + .ok_or(WsClientError::Disconnected(None)) + }; - // set request timeout - let response = if to.non_zero() { - timeout(to, fut) - .await - .map_err(|_| WsClientError::Timeout) - .and_then(|res| res)? - } else { - fut.await? - }; - log::trace!("Ws handshake response is received {:?}", response); + // set request timeout + let response = if to.non_zero() { + timeout(to, fut) + .await + .map_err(|_| WsClientError::Timeout) + .and_then(|res| res)? + } else { + fut.await? + }; + log::trace!("Ws handshake response is received {:?}", response); - // verify response - if response.status != StatusCode::SWITCHING_PROTOCOLS { - return Err(WsClientError::InvalidResponseStatus(response.status)); - } + // verify response + if response.status != StatusCode::SWITCHING_PROTOCOLS { + return Err(WsClientError::InvalidResponseStatus(response.status)); + } - // Check for "UPGRADE" to websocket header - let has_hdr = if let Some(hdr) = response.headers.get(&header::UPGRADE) { - if let Ok(s) = hdr.to_str() { - s.to_ascii_lowercase().contains("websocket") - } else { - false - } + // Check for "UPGRADE" to websocket header + let has_hdr = if let Some(hdr) = response.headers.get(&header::UPGRADE) { + if let Ok(s) = hdr.to_str() { + s.to_ascii_lowercase().contains("websocket") } else { false - }; - if !has_hdr { - log::trace!("Invalid upgrade header"); - return Err(WsClientError::InvalidUpgradeHeader); } + } else { + false + }; + if !has_hdr { + log::trace!("Invalid upgrade header"); + return Err(WsClientError::InvalidUpgradeHeader); + } - // Check for "CONNECTION" header - if let Some(conn) = response.headers.get(&header::CONNECTION) { - if let Ok(s) = conn.to_str() { - if !s.to_ascii_lowercase().contains("upgrade") { - log::trace!("Invalid connection header: {}", s); - return Err(WsClientError::InvalidConnectionHeader(conn.clone())); - } - } else { - log::trace!("Invalid connection header: {:?}", conn); + // Check for "CONNECTION" header + if let Some(conn) = response.headers.get(&header::CONNECTION) { + if let Ok(s) = conn.to_str() { + if !s.to_ascii_lowercase().contains("upgrade") { + log::trace!("Invalid connection header: {}", s); return Err(WsClientError::InvalidConnectionHeader(conn.clone())); } } else { - log::trace!("Missing connection header"); - return Err(WsClientError::MissingConnectionHeader); + log::trace!("Invalid connection header: {:?}", conn); + return Err(WsClientError::InvalidConnectionHeader(conn.clone())); } - - if let Some(hdr_key) = response.headers.get(&header::SEC_WEBSOCKET_ACCEPT) { - let encoded = ws::hash_key(key.as_ref()); - if hdr_key.as_bytes() != encoded.as_bytes() { - log::trace!( - "Invalid challenge response: expected: {} received: {:?}", - encoded, - key - ); - return Err(WsClientError::InvalidChallengeResponse( - encoded, - hdr_key.clone(), - )); - } - } else { - log::trace!("Missing SEC-WEBSOCKET-ACCEPT header"); - return Err(WsClientError::MissingWebSocketAcceptHeader); - }; - log::trace!("Ws handshake response verification is completed"); - - // response and ws io - Ok(WsConnection::new( - io, - ClientResponse::with_empty_payload(response), - if server_mode { - ws::Codec::new().max_size(max_size) - } else { - ws::Codec::new().max_size(max_size).client_mode() - }, - keepalive_timeout, - )) + } else { + log::trace!("Missing connection header"); + return Err(WsClientError::MissingConnectionHeader); } + + if let Some(hdr_key) = response.headers.get(&header::SEC_WEBSOCKET_ACCEPT) { + let encoded = ws::hash_key(key.as_ref()); + if hdr_key.as_bytes() != encoded.as_bytes() { + log::trace!( + "Invalid challenge response: expected: {} received: {:?}", + encoded, + key + ); + return Err(WsClientError::InvalidChallengeResponse( + encoded, + hdr_key.clone(), + )); + } + } else { + log::trace!("Missing SEC-WEBSOCKET-ACCEPT header"); + return Err(WsClientError::MissingWebSocketAcceptHeader); + }; + log::trace!("Ws handshake response verification is completed"); + + // response and ws io + Ok(WsConnection::new( + io, + ClientResponse::with_empty_payload(response), + if server_mode { + ws::Codec::new().max_size(max_size) + } else { + ws::Codec::new().max_size(max_size).client_mode() + }, + keepalive_timeout, + )) } } @@ -758,18 +754,16 @@ impl WsConnection { { let service = apply_fn( service.into_service().map_err(WsError::Service), - |req, srv| match req { - DispatchItem::Item(item) => Either::Left(srv.call(item)), - DispatchItem::WBackPressureEnabled - | DispatchItem::WBackPressureDisabled => Either::Right(Ready::Ok(None)), - DispatchItem::KeepAliveTimeout => { - Either::Right(Ready::Err(WsError::KeepAlive)) - } - DispatchItem::DecoderError(e) | DispatchItem::EncoderError(e) => { - Either::Right(Ready::Err(WsError::Protocol(e))) - } - DispatchItem::Disconnect(e) => { - Either::Right(Ready::Err(WsError::Disconnected(e))) + |req, svc| async move { + match req { + DispatchItem::::Item(item) => svc.call(item).await, + DispatchItem::WBackPressureEnabled + | DispatchItem::WBackPressureDisabled => Ok(None), + DispatchItem::KeepAliveTimeout => Err(WsError::KeepAlive), + DispatchItem::DecoderError(e) | DispatchItem::EncoderError(e) => { + Err(WsError::Protocol(e)) + } + DispatchItem::Disconnect(e) => Err(WsError::Disconnected(e)), } }, ); diff --git a/ntex/tests/connect.rs b/ntex/tests/connect.rs index 9703234a..09869431 100644 --- a/ntex/tests/connect.rs +++ b/ntex/tests/connect.rs @@ -237,7 +237,7 @@ async fn test_static_str() { } #[ntex::test] -async fn test_new_service() { +async fn test_create() { let srv = test_server(|| { fn_service(|io: Io| async move { io.send(Bytes::from_static(b"test"), &BytesCodec) @@ -248,7 +248,7 @@ async fn test_new_service() { }); let factory = ntex::connect::Connector::new(); - let conn = factory.new_service(()).await.unwrap(); + let conn = factory.create(()).await.unwrap(); let io = conn.call(Connect::with("10", srv.addr())).await.unwrap(); assert_eq!(io.query::().get().unwrap(), srv.addr().into()); } diff --git a/ntex/tests/http_ws.rs b/ntex/tests/http_ws.rs index 7732bece..f7d788d1 100644 --- a/ntex/tests/http_ws.rs +++ b/ntex/tests/http_ws.rs @@ -1,12 +1,12 @@ -use std::task::{Context, Poll}; -use std::{cell::Cell, future::Future, io, pin::Pin, sync::Arc, sync::Mutex}; +use std::{cell::Cell, io, sync::Arc, sync::Mutex, task::Context, task::Poll}; +use ntex::codec::BytesCodec; use ntex::http::test::server as test_server; use ntex::http::{body, h1, test, HttpService, Request, Response, StatusCode}; use ntex::io::{DispatchItem, Dispatcher, Io}; use ntex::service::{fn_factory, Service}; +use ntex::util::{BoxFuture, ByteString, Bytes, Ready}; use ntex::ws::{self, handshake, handshake_response}; -use ntex::{codec::BytesCodec, util::ByteString, util::Bytes, util::Ready}; struct WsService(Arc>>); @@ -33,14 +33,14 @@ impl Clone for WsService { impl Service<(Request, Io, h1::Codec)> for WsService { type Response = (); type Error = io::Error; - type Future = Pin>>>; + type Future<'f> = BoxFuture<'f, Result<(), io::Error>>; fn poll_ready(&self, _ctx: &mut Context<'_>) -> Poll> { self.set_polled(); Poll::Ready(Ok(())) } - fn call(&self, (req, io, codec): (Request, Io, h1::Codec)) -> Self::Future { + fn call(&self, (req, io, codec): (Request, Io, h1::Codec)) -> Self::Future<'_> { let fut = async move { let res = handshake(req.head()).unwrap().message_body(()); diff --git a/ntex/tests/server.rs b/ntex/tests/server.rs index cf398350..d978d201 100644 --- a/ntex/tests/server.rs +++ b/ntex/tests/server.rs @@ -247,9 +247,9 @@ fn test_configure_async() { #[test] #[cfg(feature = "tokio")] -#[cfg(not(target_os = "macos"))] #[allow(unreachable_code)] fn test_panic_in_worker() { + env_logger::init(); let counter = Arc::new(AtomicUsize::new(0)); let counter2 = counter.clone(); @@ -293,7 +293,7 @@ fn test_panic_in_worker() { thread::sleep(time::Duration::from_millis(300)); assert!(net::TcpStream::connect(addr).is_ok()); thread::sleep(time::Duration::from_millis(500)); - assert_eq!(counter.load(Relaxed), 2); + assert_eq!(counter.load(Relaxed), 3); sys.stop(); let _ = h.join();