mirror of
https://github.com/ntex-rs/ntex.git
synced 2025-04-04 21:37:58 +03:00
Add fn_transform fn, allows to use function as transform service
This commit is contained in:
Nikolay Kim
parent
9b88f7d0ff
commit
86dcbb4abd
3 changed files with 120 additions and 272 deletions
|
|
@ -1,5 +1,9 @@
|
|||
# Changes
|
||||
|
||||
## [0.1.4] - 2020-09-24
|
||||
|
||||
* Add `fn_transform` fn, allows to use function as transform service
|
||||
|
||||
## [0.1.3] - 2020-04-15
|
||||
|
||||
* Upgrade pin-project
|
||||
|
|
@ -19,275 +23,3 @@
|
|||
* Change Service trait to use `&self` instead of `&mut self`
|
||||
|
||||
* Add `fn_mut_service` for `FnMut` functions
|
||||
|
||||
## [1.0.5] - 2020-01-16
|
||||
|
||||
### Fixed
|
||||
|
||||
* Fixed unsoundness in .and_then()/.then() service combinators
|
||||
|
||||
## [1.0.4] - 2020-01-15
|
||||
|
||||
### Fixed
|
||||
|
||||
* Revert 1.0.3 change
|
||||
|
||||
## [1.0.3] - 2020-01-15
|
||||
|
||||
### Fixed
|
||||
|
||||
* Fixed unsoundness in `AndThenService` impl
|
||||
|
||||
## [1.0.2] - 2020-01-08
|
||||
|
||||
### Added
|
||||
|
||||
* Add `into_service` helper function
|
||||
|
||||
|
||||
## [1.0.1] - 2019-12-22
|
||||
|
||||
### Changed
|
||||
|
||||
* `map_config()` and `unit_config()` accepts `IntoServiceFactory` type
|
||||
|
||||
|
||||
## [1.0.0] - 2019-12-11
|
||||
|
||||
### Added
|
||||
|
||||
* Add Clone impl for Apply service
|
||||
|
||||
|
||||
## [1.0.0-alpha.4] - 2019-12-08
|
||||
|
||||
### Changed
|
||||
|
||||
* Renamed `service_fn` to `fn_service`
|
||||
|
||||
* Renamed `factory_fn` to `fn_factory`
|
||||
|
||||
* Renamed `factory_fn_cfg` to `fn_factory_with_config`
|
||||
|
||||
|
||||
## [1.0.0-alpha.3] - 2019-12-06
|
||||
|
||||
### Changed
|
||||
|
||||
* Add missing Clone impls
|
||||
|
||||
* Restore `Transform::map_init_err()` combinator
|
||||
|
||||
* Restore `Service/Factory::apply_fn()` in form of `Pipeline/Factory::and_then_apply_fn()`
|
||||
|
||||
* Optimize service combinators and futures memory layout
|
||||
|
||||
|
||||
## [1.0.0-alpha.2] - 2019-12-02
|
||||
|
||||
### Changed
|
||||
|
||||
* Use owned config value for service factory
|
||||
|
||||
* Renamed BoxedNewService/BoxedService to BoxServiceFactory/BoxService
|
||||
|
||||
|
||||
## [1.0.0-alpha.1] - 2019-11-25
|
||||
|
||||
### Changed
|
||||
|
||||
* Migraded to `std::future`
|
||||
|
||||
* `NewService` renamed to `ServiceFactory`
|
||||
|
||||
* Added `pipeline` and `pipeline_factory` function
|
||||
|
||||
|
||||
## [0.4.2] - 2019-08-27
|
||||
|
||||
### Fixed
|
||||
|
||||
* Check service readiness for `new_apply_cfg` combinator
|
||||
|
||||
|
||||
## [0.4.1] - 2019-06-06
|
||||
|
||||
### Added
|
||||
|
||||
* Add `new_apply_cfg` function
|
||||
|
||||
## [0.4.0] - 2019-05-12
|
||||
|
||||
### Changed
|
||||
|
||||
* Use associated type for `NewService` config
|
||||
|
||||
* Change `apply_cfg` function
|
||||
|
||||
* Renamed helper functions
|
||||
|
||||
### Added
|
||||
|
||||
* Add `NewService::map_config` and `NewService::unit_config` combinators
|
||||
|
||||
|
||||
## [0.3.6] - 2019-04-07
|
||||
|
||||
### Changed
|
||||
|
||||
* Poll boxed service call result immediately
|
||||
|
||||
|
||||
## [0.3.5] - 2019-03-29
|
||||
|
||||
### Added
|
||||
|
||||
* Add `impl<S: Service> Service for Rc<RefCell<S>>`
|
||||
|
||||
|
||||
## [0.3.4] - 2019-03-12
|
||||
|
||||
### Added
|
||||
|
||||
* Add `Transform::from_err()` combinator
|
||||
|
||||
* Add `apply_fn` helper
|
||||
|
||||
* Add `apply_fn_factory` helper
|
||||
|
||||
* Add `apply_transform` helper
|
||||
|
||||
* Add `apply_cfg` helper
|
||||
|
||||
|
||||
## [0.3.3] - 2019-03-09
|
||||
|
||||
### Added
|
||||
|
||||
* Add `ApplyTransform` new service for transform and new service.
|
||||
|
||||
* Add `NewService::apply_cfg()` combinator, allows to use
|
||||
nested `NewService` with different config parameter.
|
||||
|
||||
### Changed
|
||||
|
||||
* Revert IntoFuture change
|
||||
|
||||
|
||||
## [0.3.2] - 2019-03-04
|
||||
|
||||
### Changed
|
||||
|
||||
* Change `NewService::Future` and `Transform::Future` to the `IntoFuture` trait.
|
||||
|
||||
* Export `AndThenTransform` type
|
||||
|
||||
|
||||
## [0.3.1] - 2019-03-04
|
||||
|
||||
### Changed
|
||||
|
||||
* Simplify Transform trait
|
||||
|
||||
|
||||
## [0.3.0] - 2019-03-02
|
||||
|
||||
## Added
|
||||
|
||||
* Added boxed NewService and Service.
|
||||
|
||||
## Changed
|
||||
|
||||
* Added `Config` parameter to `NewService` trait.
|
||||
|
||||
* Added `Config` parameter to `NewTransform` trait.
|
||||
|
||||
|
||||
## [0.2.2] - 2019-02-19
|
||||
|
||||
### Added
|
||||
|
||||
* Added `NewService` impl for `Rc<S> where S: NewService`
|
||||
|
||||
* Added `NewService` impl for `Arc<S> where S: NewService`
|
||||
|
||||
|
||||
## [0.2.1] - 2019-02-03
|
||||
|
||||
### Changed
|
||||
|
||||
* Generalize `.apply` combinator with Transform trait
|
||||
|
||||
|
||||
## [0.2.0] - 2019-02-01
|
||||
|
||||
### Changed
|
||||
|
||||
* Use associated type instead of generic for Service definition.
|
||||
|
||||
* Before:
|
||||
|
||||
```rust
|
||||
impl Service<Request> for Client {
|
||||
type Response = Response;
|
||||
// ...
|
||||
}
|
||||
```
|
||||
* After:
|
||||
|
||||
```rust
|
||||
impl Service for Client {
|
||||
type Request = Request;
|
||||
type Response = Response;
|
||||
// ...
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
## [0.1.6] - 2019-01-24
|
||||
|
||||
### Changed
|
||||
|
||||
* Use `FnMut` instead of `Fn` for .apply() and .map() combinators and `FnService` type
|
||||
|
||||
* Change `.apply()` error semantic, new service's error is `From<Self::Error>`
|
||||
|
||||
|
||||
## [0.1.5] - 2019-01-13
|
||||
|
||||
### Changed
|
||||
|
||||
* Make `Out::Error` convertable from `T::Error` for apply combinator
|
||||
|
||||
|
||||
## [0.1.4] - 2019-01-11
|
||||
|
||||
### Changed
|
||||
|
||||
* Use `FnMut` instead of `Fn` for `FnService`
|
||||
|
||||
|
||||
## [0.1.3] - 2018-12-12
|
||||
|
||||
### Changed
|
||||
|
||||
* Split service combinators to separate trait
|
||||
|
||||
|
||||
## [0.1.2] - 2018-12-12
|
||||
|
||||
### Fixed
|
||||
|
||||
* Release future early for `.and_then()` and `.then()` combinators
|
||||
|
||||
|
||||
## [0.1.1] - 2018-12-09
|
||||
|
||||
### Added
|
||||
|
||||
* Added Service impl for Box<S: Service>
|
||||
|
||||
|
||||
## [0.1.0] - 2018-12-09
|
||||
|
||||
* Initial import
|
||||
|
|
|
|||
114
ntex-service/src/fn_transform.rs
Normal file
114
ntex-service/src/fn_transform.rs
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
use futures_util::future::{ok, Ready};
|
||||
use std::{future::Future, marker::PhantomData};
|
||||
|
||||
use crate::{apply_fn, dev::Apply, Service, Transform};
|
||||
|
||||
/// Use function as transform service
|
||||
pub fn fn_transform<S, F, R, Req, Res, Err>(
|
||||
f: F,
|
||||
) -> impl Transform<S, Request = Req, Response = Res, Error = Err, InitError = ()> + Clone
|
||||
where
|
||||
S: Service<Error = Err>,
|
||||
F: Fn(Req, &S) -> R + Clone,
|
||||
R: Future<Output = Result<Res, Err>>,
|
||||
{
|
||||
FnTransform::new(f)
|
||||
}
|
||||
|
||||
pub struct FnTransform<S, F, R, Req, Res, Err>
|
||||
where
|
||||
S: Service<Error = Err>,
|
||||
F: Fn(Req, &S) -> R + Clone,
|
||||
R: Future<Output = Result<Res, Err>>,
|
||||
{
|
||||
f: F,
|
||||
_t: PhantomData<(S, R, Req)>,
|
||||
}
|
||||
|
||||
impl<S, F, R, Req, Res, Err> FnTransform<S, F, R, Req, Res, Err>
|
||||
where
|
||||
S: Service<Error = Err>,
|
||||
F: Fn(Req, &S) -> R + Clone,
|
||||
R: Future<Output = Result<Res, Err>>,
|
||||
{
|
||||
fn new(f: F) -> Self {
|
||||
FnTransform { f, _t: PhantomData }
|
||||
}
|
||||
}
|
||||
|
||||
impl<S, F, R, Req, Res, Err> Transform<S> for FnTransform<S, F, R, Req, Res, Err>
|
||||
where
|
||||
S: Service<Error = Err>,
|
||||
F: Fn(Req, &S) -> R + Clone,
|
||||
R: Future<Output = Result<Res, Err>>,
|
||||
{
|
||||
type Request = Req;
|
||||
type Response = Res;
|
||||
type Error = Err;
|
||||
type Transform = Apply<S, F, R, Req, Res, Err>;
|
||||
type InitError = ();
|
||||
type Future = Ready<Result<Self::Transform, Self::InitError>>;
|
||||
|
||||
fn new_transform(&self, service: S) -> Self::Future {
|
||||
ok(apply_fn(service, self.f.clone()))
|
||||
}
|
||||
}
|
||||
|
||||
impl<S, F, R, Req, Res, Err> Clone for FnTransform<S, F, R, Req, Res, Err>
|
||||
where
|
||||
S: Service<Error = Err>,
|
||||
F: Fn(Req, &S) -> R + Clone,
|
||||
R: Future<Output = Result<Res, Err>>,
|
||||
{
|
||||
fn clone(&self) -> Self {
|
||||
Self::new(self.f.clone())
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
#[allow(clippy::redundant_clone)]
|
||||
mod tests {
|
||||
use futures_util::future::{lazy, ok};
|
||||
use std::task::{Context, Poll};
|
||||
|
||||
use super::*;
|
||||
use crate::Service;
|
||||
|
||||
#[derive(Clone)]
|
||||
struct Srv;
|
||||
|
||||
impl Service for Srv {
|
||||
type Request = usize;
|
||||
type Response = usize;
|
||||
type Error = ();
|
||||
type Future = Ready<Result<usize, ()>>;
|
||||
|
||||
fn poll_ready(&self, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
|
||||
Poll::Ready(Ok(()))
|
||||
}
|
||||
|
||||
fn call(&self, i: usize) -> Self::Future {
|
||||
ok(i * 2)
|
||||
}
|
||||
}
|
||||
|
||||
#[ntex_rt::test]
|
||||
async fn transform() {
|
||||
let srv =
|
||||
fn_transform::<Srv, _, _, _, _, _>(|i: usize, srv: &_| srv.call(i + 1))
|
||||
.clone()
|
||||
.new_transform(Srv)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let res = srv.call(10usize).await;
|
||||
assert!(res.is_ok());
|
||||
assert_eq!(res.unwrap(), 22);
|
||||
|
||||
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;
|
||||
assert_eq!(res, Poll::Ready(()));
|
||||
}
|
||||
}
|
||||
|
|
@ -11,6 +11,7 @@ mod apply;
|
|||
mod apply_cfg;
|
||||
pub mod boxed;
|
||||
mod fn_service;
|
||||
mod fn_transform;
|
||||
mod map;
|
||||
mod map_config;
|
||||
mod map_err;
|
||||
|
|
@ -24,6 +25,7 @@ pub use self::apply::{apply_fn, apply_fn_factory};
|
|||
pub use self::fn_service::{
|
||||
fn_factory, fn_factory_with_config, fn_mut_service, fn_service,
|
||||
};
|
||||
pub use self::fn_transform::fn_transform;
|
||||
pub use self::map_config::{map_config, map_config_service, unit_config};
|
||||
pub use self::pipeline::{pipeline, pipeline_factory, Pipeline, PipelineFactory};
|
||||
pub use self::transform::{apply, Transform};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue