From 17ffaf105e8f2fd89cb19134bd4853e3df45e521 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Sat, 12 Aug 2023 17:55:00 +0600 Subject: [PATCH] Add .apply_fn() for chain and chain factory (#220) * Add .apply_fn() for chain and chain factory --- ntex-service/CHANGES.md | 6 ++++ ntex-service/Cargo.toml | 2 +- ntex-service/src/apply.rs | 61 +++++++++++++++++++++++++++++++++++---- ntex-service/src/chain.rs | 42 +++++++++++++++++++++++++-- 4 files changed, 102 insertions(+), 9 deletions(-) diff --git a/ntex-service/CHANGES.md b/ntex-service/CHANGES.md index 66279266..5ef8da47 100644 --- a/ntex-service/CHANGES.md +++ b/ntex-service/CHANGES.md @@ -1,5 +1,11 @@ # Changes +## [1.2.4] - 2023-08-12 + +* Forward readiness check for Apply service + +* Add .apply_fn() for chain and chanin factory + ## [1.2.3] - 2023-08-10 * Check readiness for pipeline calls diff --git a/ntex-service/Cargo.toml b/ntex-service/Cargo.toml index 4b4a909a..0c303df6 100644 --- a/ntex-service/Cargo.toml +++ b/ntex-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-service" -version = "1.2.3" +version = "1.2.4" authors = ["ntex contributors "] description = "ntex service" keywords = ["network", "framework", "async", "futures"] diff --git a/ntex-service/src/apply.rs b/ntex-service/src/apply.rs index 72632c9c..3f498ac2 100644 --- a/ntex-service/src/apply.rs +++ b/ntex-service/src/apply.rs @@ -15,11 +15,7 @@ where R: Future>, U: IntoService, { - Apply { - f, - service: Pipeline::new(service.into_service()), - r: marker::PhantomData, - } + Apply::new(service.into_service(), f) } /// Service factory that produces `apply_fn` service. @@ -60,6 +56,21 @@ impl ApplyService { } } +impl Apply +where + T: Service, + F: Fn(In, ApplyService) -> R, + R: Future>, +{ + pub(crate) fn new(service: T, f: F) -> Self { + Apply { + f, + service: Pipeline::new(service), + r: marker::PhantomData, + } + } +} + impl Clone for Apply where T: Service + Clone, @@ -85,6 +96,7 @@ where type Error = Err; type Future<'f> = R where Self: 'f, In: 'f, R: 'f; + crate::forward_poll_ready!(service); crate::forward_poll_shutdown!(service); #[inline] @@ -115,7 +127,7 @@ where R: Future>, { /// Create new `ApplyNewService` new service instance - fn new(service: T, f: F) -> Self { + pub(crate) fn new(service: T, f: F) -> Self { Self { f, service, @@ -246,6 +258,25 @@ mod tests { assert_eq!(res.unwrap(), ("srv", ())); } + #[ntex::test] + async fn test_call_chain() { + let srv = chain(Srv) + .apply_fn(|req: &'static str, svc| async move { + svc.call(()).await.unwrap(); + Ok((req, ())) + }) + .clone() + .pipeline(); + + assert_eq!(lazy(|cx| srv.poll_ready(cx)).await, Poll::Ready(Ok(()))); + let res = lazy(|cx| srv.poll_shutdown(cx)).await; + assert_eq!(res, Poll::Ready(())); + + let res = srv.call("srv").await; + assert!(res.is_ok()); + assert_eq!(res.unwrap(), ("srv", ())); + } + #[ntex::test] async fn test_create() { let new_srv = chain_factory( @@ -267,4 +298,22 @@ mod tests { assert!(res.is_ok()); assert_eq!(res.unwrap(), ("srv", ())); } + + #[ntex::test] + async fn test_create_chain() { + let new_srv = chain_factory(|| Ready::<_, ()>::Ok(Srv)) + .apply_fn(|req: &'static str, srv| async move { + srv.call(()).await.unwrap(); + Ok((req, ())) + }) + .clone(); + + let srv = new_srv.pipeline(&()).await.unwrap(); + + assert_eq!(lazy(|cx| srv.poll_ready(cx)).await, Poll::Ready(Ok(()))); + + let res = srv.call("srv").await; + assert!(res.is_ok()); + assert_eq!(res.unwrap(), ("srv", ())); + } } diff --git a/ntex-service/src/chain.rs b/ntex-service/src/chain.rs index 79155100..fa73556a 100644 --- a/ntex-service/src/chain.rs +++ b/ntex-service/src/chain.rs @@ -1,6 +1,8 @@ -use std::marker::PhantomData; +#![allow(clippy::type_complexity)] +use std::{future::Future, marker::PhantomData}; use crate::and_then::{AndThen, AndThenFactory}; +use crate::apply::{Apply, ApplyFactory, ApplyService}; use crate::ctx::{ServiceCall, ServiceCtx}; use crate::map::{Map, MapFactory}; use crate::map_err::{MapErr, MapErrFactory}; @@ -118,6 +120,24 @@ impl, Req> ServiceChain { } } + /// Use function as middleware for current service. + /// + /// Short version of `apply_fn(chain(...), fn)` + pub fn apply_fn( + self, + f: F, + ) -> ServiceChain, In> + where + F: Fn(In, ApplyService) -> R, + R: Future>, + Svc: Service, + { + ServiceChain { + service: Apply::new(self.service, f), + _t: PhantomData, + } + } + /// Create service pipeline pub fn pipeline(self) -> Pipeline { Pipeline::new(self.service) @@ -175,7 +195,7 @@ impl, Req, C> ServiceChainFactory { /// Apply middleware to current service factory. /// - /// Short version of `apply(middleware, pipeline_factory(...))` + /// Short version of `apply(middleware, chain_factory(...))` pub fn apply(self, tr: U) -> ServiceChainFactory, Req, C> where U: Middleware, @@ -186,6 +206,24 @@ impl, Req, C> ServiceChainFactory { } } + /// Apply function middleware to current service factory. + /// + /// Short version of `apply_fn_factory(chain_factory(...), fn)` + pub fn apply_fn( + self, + f: F, + ) -> ServiceChainFactory, In, C> + where + F: Fn(In, ApplyService) -> R + Clone, + R: Future>, + T: ServiceFactory, + { + ServiceChainFactory { + factory: ApplyFactory::new(self.factory, f), + _t: PhantomData, + } + } + /// Create `NewService` to chain on a computation for when a call to the /// service finished, passing the result of the call to the next /// service `U`.