Service readiness refactoring

ntex-service/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-service"
-version = "3.1.0"
+version = "4.0.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "ntex service"
 keywords = ["network", "framework", "async", "futures"]
@@ -17,6 +17,8 @@ path = "src/lib.rs"
 
 [dependencies]
 slab = "0.4"
+bitflags = "2"
+pin-project-lite = "0.2"
 
 [dev-dependencies]
 ntex = "2"

ntex-service/src/and_then.rs

@@ -1,3 +1,5 @@
+use std::future::Future;
+
 use super::{util, Service, ServiceCtx, ServiceFactory};
 
 #[derive(Clone, Debug)]
@@ -26,8 +28,8 @@
     type Error = A::Error;
 
     #[inline]
-    async fn ready(&self, ctx: ServiceCtx<'_, Self>) -> Result<(), Self::Error> {
-        util::ready(&self.svc1, &self.svc2, ctx).await
+    async fn ready(&self) -> Option<impl Future<Output = Result<(), Self::Error>>> {
+        util::ready(&self.svc1, &self.svc2).await
     }
 
     #[inline]
@@ -94,7 +96,7 @@
         type Response = &'static str;
         type Error = ();
 
         async fn ready(&self, _: ServiceCtx<'_, Self>) -> Result<(), Self::Error> {
             self.0.set(self.0.get() + 1);
             Ok(())
         }
@@ -119,7 +121,7 @@
         type Response = (&'static str, &'static str);
         type Error = ();
 
         async fn ready(&self, _: ServiceCtx<'_, Self>) -> Result<(), Self::Error> {
             self.0.set(self.0.get() + 1);
             Ok(())
         }
@@ -148,7 +150,7 @@
         )
         .into_pipeline();
         let res = srv.ready().await;
         assert_eq!(res, Ok(()));
         assert_eq!(cnt.get(), 2);
         srv.shutdown().await;
         assert_eq!(cnt_sht.get(), 2);

ntex-service/src/apply.rs

@@ -100,8 +100,11 @@ where
     type Error = Err;
 
     #[inline]
-    async fn ready(&self, _: ServiceCtx<'_, Self>) -> Result<(), Err> {
-        self.service.ready().await.map_err(From::from)
+    async fn ready(&self) -> Option<impl Future<Output = Result<(), Err>>> {
+        self.service
+            .ready()
+            .await
+            .map(|fut| async move { fut.await.map_err(From::from) })
     }
 
     #[inline]

ntex-service/src/boxed.rs

@@ -3,6 +3,7 @@ use std::{fmt, future::Future, pin::Pin};
 use crate::ctx::{ServiceCtx, WaitersRef};
 
 type BoxFuture<'a, I, E> = Pin<Box<dyn Future<Output = Result<I, E>> + 'a>>;
+type BoxFutureOne<'a, T> = Pin<Box<dyn Future<Output = T> + 'a>>;
 pub struct BoxService<Req, Res, Err>(Box<dyn ServiceObj<Req, Response = Res, Error = Err>>);
 pub struct BoxServiceFactory<Cfg, Req, Res, Err, InitErr>(
     Box<dyn ServiceFactoryObj<Req, Cfg, Response = Res, Error = Err, InitError = InitErr>>,
@@ -48,16 +49,12 @@ trait ServiceObj<Req> {
     type Response;
     type Error;
 
-    fn ready<'a>(
-        &'a self,
-        idx: usize,
-        waiters: &'a WaitersRef,
-    ) -> BoxFuture<'a, (), Self::Error>;
+    fn ready<'a>(&'a self) -> BoxFutureOne<'a, Option<BoxFuture<'a, (), Self::Error>>>;
 
     fn call<'a>(
         &'a self,
         req: Req,
-        idx: usize,
+        idx: u32,
         waiters: &'a WaitersRef,
     ) -> BoxFuture<'a, Self::Response, Self::Error>;
 
@@ -73,15 +70,14 @@ where
     type Error = S::Error;
 
     #[inline]
-    fn ready<'a>(
-        &'a self,
-        idx: usize,
-        waiters: &'a WaitersRef,
-    ) -> BoxFuture<'a, (), Self::Error> {
+    fn ready<'a>(&'a self) -> BoxFutureOne<'a, Option<BoxFuture<'a, (), Self::Error>>> {
         Box::pin(async move {
-            ServiceCtx::<'a, S>::from_ref(idx, waiters)
-                .ready(self)
-                .await
+            if let Some(fut) = self.ready().await {
+                let r: BoxFuture<'a, (), Self::Error> = Box::pin(fut);
+                Some(r)
+            } else {
+                None
+            }
         })
     }
 
@@ -94,7 +90,7 @@ where
     fn call<'a>(
         &'a self,
         req: Req,
-        idx: usize,
+        idx: u32,
         waiters: &'a WaitersRef,
     ) -> BoxFuture<'a, Self::Response, Self::Error> {
         Box::pin(async move {
@@ -150,9 +146,8 @@ where
     type Error = Err;
 
     #[inline]
-    async fn ready(&self, ctx: ServiceCtx<'_, Self>) -> Result<(), Self::Error> {
-        let (idx, waiters) = ctx.inner();
-        self.0.ready(idx, waiters).await
+    async fn ready(&self) -> Option<impl Future<Output = Result<(), Self::Error>>> {
+        self.0.ready().await
     }
 
     #[inline]