Migrate ntex-connect to async fn in trait

ntex-tls/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [1.0.0] - 2024-01-0x
+
+* Use "async fn" in trait for Service definition
+
 ## [0.3.3] - 2023-11-12
 
 * Attempt to fix #190

ntex-tls/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-tls"
-version = "0.3.3"
+version = "1.0.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 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.21"
-ntex-io = "0.3.7"
-ntex-util = "0.3.4"
-ntex-service = "1.2.7"
+ntex-io = "1.0"
+ntex-util = "1.0"
+ntex-service = "2.0"
 log = "0.4"
 pin-project-lite = "0.2"
 

ntex-tls/src/openssl/accept.rs

@@ -1,12 +1,12 @@
 use std::task::{Context, Poll};
-use std::{error::Error, future::Future, marker::PhantomData, pin::Pin};
+use std::{error::Error, marker::PhantomData};
 
 use ntex_io::{Filter, FilterFactory, Io, Layer};
 use ntex_service::{Service, ServiceCtx, ServiceFactory};
-use ntex_util::{future::Ready, time::Millis};
+use ntex_util::time::Millis;
 use tls_openssl::ssl::SslAcceptor;
 
-use crate::counter::{Counter, CounterGuard};
+use crate::counter::Counter;
 use crate::MAX_SSL_ACCEPT_COUNTER;
 
 use super::{SslAcceptor as IoSslAcceptor, SslFilter};
@@ -58,12 +58,10 @@ impl<F: Filter, C: 'static> ServiceFactory<Io<F>, C> for Acceptor<F> {
     type Error = Box<dyn Error>;
     type Service = AcceptorService<F>;
     type InitError = ();
-    type Future<'f> = Ready<Self::Service, Self::InitError>;
 
-    #[inline]
-    fn create(&self, _: C) -> Self::Future<'_> {
+    async fn create(&self, _: C) -> Result<Self::Service, Self::InitError> {
         MAX_SSL_ACCEPT_COUNTER.with(|conns| {
-            Ready::Ok(AcceptorService {
+            Ok(AcceptorService {
                 acceptor: self.acceptor.clone(),
                 conns: conns.clone(),
                 _t: PhantomData,
@@ -85,9 +83,7 @@ pub struct AcceptorService<F> {
 impl<F: Filter> Service<Io<F>> for AcceptorService<F> {
     type Response = Io<Layer<SslFilter, F>>;
     type Error = Box<dyn Error>;
-    type Future<'f> = AcceptorServiceResponse<F>;
 
-    #[inline]
     fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         if self.conns.available(cx) {
             Poll::Ready(Ok(()))
@@ -96,30 +92,12 @@ impl<F: Filter> Service<Io<F>> for AcceptorService<F> {
         }
     }
 
-    #[inline]
-    fn call<'a>(&'a self, req: Io<F>, _: ServiceCtx<'a, Self>) -> Self::Future<'a> {
-        AcceptorServiceResponse {
-            _guard: self.conns.get(),
-            fut: self.acceptor.clone().create(req),
-        }
-    }
-}
-
-pin_project_lite::pin_project! {
-    pub struct AcceptorServiceResponse<F>
-    where
-        F: Filter,
-    {
-        #[pin]
-        fut: <IoSslAcceptor as FilterFactory<F>>::Future,
-        _guard: CounterGuard,
-    }
-}
-
-impl<F: Filter> Future for AcceptorServiceResponse<F> {
-    type Output = Result<Io<Layer<SslFilter, F>>, Box<dyn Error>>;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        self.project().fut.poll(cx)
+    async fn call(
+        &self,
+        req: Io<F>,
+        _: ServiceCtx<'_, Self>,
+    ) -> Result<Self::Response, Self::Error> {
+        let _guard = self.conns.get();
+        self.acceptor.clone().create(req).await
     }
 }

ntex-tls/src/rustls/accept.rs

@@ -1,14 +1,14 @@
 use std::task::{Context, Poll};
-use std::{future::Future, io, marker::PhantomData, pin::Pin, sync::Arc};
+use std::{io, marker::PhantomData, sync::Arc};
 
 use tls_rust::ServerConfig;
 
 use ntex_io::{Filter, FilterFactory, Io, Layer};
 use ntex_service::{Service, ServiceCtx, ServiceFactory};
-use ntex_util::{future::Ready, time::Millis};
+use ntex_util::time::Millis;
 
 use super::{TlsAcceptor, TlsFilter};
-use crate::{counter::Counter, counter::CounterGuard, MAX_SSL_ACCEPT_COUNTER};
+use crate::{counter::Counter, MAX_SSL_ACCEPT_COUNTER};
 
 #[derive(Debug)]
 /// Support `SSL` connections via rustls package
@@ -56,14 +56,11 @@ impl<F: Filter, C: 'static> ServiceFactory<Io<F>, C> for Acceptor<F> {
     type Response = Io<Layer<TlsFilter, F>>;
     type Error = io::Error;
     type Service = AcceptorService<F>;
-
     type InitError = ();
-    type Future<'f> = Ready<Self::Service, Self::InitError> where Self: 'f, C: 'f;
 
-    #[inline]
-    fn create(&self, _: C) -> Self::Future<'_> {
+    async fn create(&self, _: C) -> Result<Self::Service, Self::InitError> {
         MAX_SSL_ACCEPT_COUNTER.with(|conns| {
-            Ready::Ok(AcceptorService {
+            Ok(AcceptorService {
                 acceptor: self.inner.clone(),
                 conns: conns.clone(),
                 io: PhantomData,
@@ -83,9 +80,7 @@ pub struct AcceptorService<F> {
 impl<F: Filter> Service<Io<F>> for AcceptorService<F> {
     type Response = Io<Layer<TlsFilter, F>>;
     type Error = io::Error;
-    type Future<'f> = AcceptorServiceFut<F>;
 
-    #[inline]
     fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         if self.conns.available(cx) {
             Poll::Ready(Ok(()))
@@ -94,30 +89,12 @@ impl<F: Filter> Service<Io<F>> for AcceptorService<F> {
         }
     }
 
-    #[inline]
-    fn call<'a>(&'a self, req: Io<F>, _: ServiceCtx<'a, Self>) -> Self::Future<'a> {
-        AcceptorServiceFut {
-            _guard: self.conns.get(),
-            fut: self.acceptor.clone().create(req),
-        }
-    }
-}
-
-pin_project_lite::pin_project! {
-    pub struct AcceptorServiceFut<F>
-    where
-        F: Filter,
-    {
-        #[pin]
-        fut: <TlsAcceptor as FilterFactory<F>>::Future,
-        _guard: CounterGuard,
-    }
-}
-
-impl<F: Filter> Future for AcceptorServiceFut<F> {
-    type Output = Result<Io<Layer<TlsFilter, F>>, io::Error>;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        self.project().fut.poll(cx)
+    async fn call(
+        &self,
+        req: Io<F>,
+        _: ServiceCtx<'_, Self>,
+    ) -> Result<Self::Response, Self::Error> {
+        let _guard = self.conns.get();
+        self.acceptor.clone().create(req).await
     }
 }

ntex-tls/src/rustls/client.rs

@@ -1,10 +1,10 @@
 //! An implementation of SSL streams for ntex backed by OpenSSL
 use std::io::{self, Read as IoRead, Write as IoWrite};
-use std::{any, cell::RefCell, sync::Arc, task::Poll};
+use std::{any, cell::RefCell, future::poll_fn, sync::Arc, task::Poll};
 
 use ntex_bytes::BufMut;
 use ntex_io::{types, Filter, FilterLayer, Io, Layer, ReadBuf, WriteBuf};
-use ntex_util::{future::poll_fn, ready};
+use ntex_util::ready;
 use tls_rust::{ClientConfig, ClientConnection, ServerName};
 
 use crate::rustls::{TlsFilter, Wrapper};

ntex-tls/src/rustls/server.rs

@@ -1,10 +1,10 @@
 //! An implementation of SSL streams for ntex backed by OpenSSL
 use std::io::{self, Read as IoRead, Write as IoWrite};
-use std::{any, cell::RefCell, sync::Arc, task::Poll};
+use std::{any, cell::RefCell, future::poll_fn, sync::Arc, task::Poll};
 
 use ntex_bytes::BufMut;
 use ntex_io::{types, Filter, FilterLayer, Io, Layer, ReadBuf, WriteBuf};
-use ntex_util::{future::poll_fn, ready, time, time::Millis};
+use ntex_util::{ready, time, time::Millis};
 use tls_rust::{ServerConfig, ServerConnection};
 
 use crate::rustls::{TlsFilter, Wrapper};