prep actix-utils

Cargo.toml

@@ -1,18 +1,3 @@
-[package]
-name = "actix-net"
-version = "0.3.0"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-description = "Actix net - framework for the compisible network services for Rust (experimental)"
-readme = "README.md"
-keywords = ["network", "framework", "async", "futures"]
-homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-net.git"
-documentation = "https://docs.rs/actix-net/"
-categories = ["network-programming", "asynchronous"]
-license = "MIT/Apache-2.0"
-exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"]
-edition = "2018"
-
 [workspace]
 members = [
   "actix-codec",
@@ -24,13 +9,3 @@ members = [
   "actix-utils",
   "router",
 ]
-
-[dev-dependencies]
-actix-service = "0.2.0"
-actix-codec = "0.1.0"
-actix-rt = { path="actix-rt" }
-actix-server = { path="actix-server", features=["ssl"] }
-env_logger = "0.5"
-futures = "0.1.24"
-openssl = { version="0.10" }
-tokio-openssl = { version="0.3" }

actix-connector/CHANGES.md

@@ -1,6 +1,6 @@
 # Changes
 
-## [0.2.0] - 2019-01-xx
+## [0.2.0] - 2019-02-01
 
 ### Changes
 
@@ -8,7 +8,7 @@
 
 * Upgrade trust-dns-resolver
 
-* Use tokio-current-thread instead of diract actix-rt dipendency
+* Use tokio-current-thread instead of direct actix-rt dipendency
 
 
 ## [0.1.1] - 2019-01-13

actix-connector/Cargo.toml

@@ -27,8 +27,7 @@ default = []
 ssl = ["openssl", "tokio-openssl"]
 
 [dependencies]
-#actix-service = "0.1.6"
-actix-service = { path="../actix-service" }
+actix-service = "0.2.0"
 actix-codec = "0.1.0"
 futures = "0.1"
 tokio-tcp = "0.1"

actix-server/CHANGES.md

@@ -1,6 +1,6 @@
 # Changes
 
-## [0.2.0] - 2019-02-xx
+## [0.2.0] - 2019-02-01
 
 ## Changes
 

actix-server/Cargo.toml

@@ -33,8 +33,7 @@ ssl = ["openssl", "tokio-openssl"]
 rust-tls = ["rustls", "tokio-rustls", "webpki", "webpki-roots"]
 
 [dependencies]
-#actix-service = "0.2.0"
-actix-service = { path="../actix-service" }
+actix-service = "0.2.0"
 actix-rt = "0.1.0"
 
 log = "0.4"

actix-service/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## [0.2.1] - 2019-02-03
+
+### Changed
+
+* Generalize `.apply` combinator with Transform trait
+
+
 ## [0.2.0] - 2019-02-01
 
 ### Changed

actix-service/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-service"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix Service"
 keywords = ["network", "framework", "async", "futures"]

actix-service/src/and_then_apply.rs

@@ -1,125 +1,120 @@
-use std::marker::PhantomData;
+use futures::{Async, Future, Poll};
 
-use futures::{try_ready, Async, Future, IntoFuture, Poll};
-
-use super::{IntoNewService, IntoService, NewService, Service};
+use super::{NewService, NewTransform, Service, Transform};
 use crate::cell::Cell;
 
 /// `Apply` service combinator
-pub struct AndThenApply<A, B, F, Out>
+pub struct AndThenTransform<T, A, B>
 where
     A: Service,
     B: Service<Error = A::Error>,
-    F: FnMut(A::Response, &mut B) -> Out,
-    Out: IntoFuture,
-    Out::Error: Into<A::Error>,
+    T: Transform<B, Request = A::Response>,
+    T::Error: From<A::Error>,
 {
     a: A,
     b: Cell<B>,
-    f: Cell<F>,
-    r: PhantomData<(Out,)>,
+    t: Cell<T>,
 }
 
-impl<A, B, F, Out> AndThenApply<A, B, F, Out>
+impl<T, A, B> AndThenTransform<T, A, B>
 where
     A: Service,
     B: Service<Error = A::Error>,
-    F: FnMut(A::Response, &mut B) -> Out,
-    Out: IntoFuture,
-    Out::Error: Into<A::Error>,
+    T: Transform<B, Request = A::Response>,
+    T::Error: From<A::Error>,
 {
     /// Create new `Apply` combinator
-    pub fn new<A1: IntoService<A>, B1: IntoService<B>>(a: A1, b: B1, f: F) -> Self {
+    pub fn new(t: T, a: A, b: B) -> Self {
         Self {
-            f: Cell::new(f),
-            a: a.into_service(),
-            b: Cell::new(b.into_service()),
-            r: PhantomData,
+            a,
+            b: Cell::new(b),
+            t: Cell::new(t),
         }
     }
 }
 
-impl<A, B, F, Out> Clone for AndThenApply<A, B, F, Out>
+impl<T, A, B> Clone for AndThenTransform<T, A, B>
 where
     A: Service + Clone,
     B: Service<Error = A::Error>,
-    F: FnMut(A::Response, &mut B) -> Out,
-    Out: IntoFuture,
-    Out::Error: Into<A::Error>,
+    T: Transform<B, Request = A::Response>,
+    T::Error: From<A::Error>,
 {
     fn clone(&self) -> Self {
-        AndThenApply {
+        AndThenTransform {
             a: self.a.clone(),
             b: self.b.clone(),
-            f: self.f.clone(),
-            r: PhantomData,
+            t: self.t.clone(),
         }
     }
 }
 
-impl<A, B, F, Out> Service for AndThenApply<A, B, F, Out>
+impl<T, A, B> Service for AndThenTransform<T, A, B>
 where
     A: Service,
     B: Service<Error = A::Error>,
-    F: FnMut(A::Response, &mut B) -> Out,
-    Out: IntoFuture,
-    Out::Error: Into<A::Error>,
+    T: Transform<B, Request = A::Response>,
+    T::Error: From<A::Error>,
 {
     type Request = A::Request;
-    type Response = Out::Item;
-    type Error = A::Error;
-    type Future = AndThenApplyFuture<A, B, F, Out>;
+    type Response = T::Response;
+    type Error = T::Error;
+    type Future = AndThenTransformFuture<T, A, B>;
 
     fn poll_ready(&mut self) -> Poll<(), Self::Error> {
-        try_ready!(self.a.poll_ready());
-        self.b.get_mut().poll_ready().map_err(|e| e.into())
+        let notready = Async::NotReady == self.a.poll_ready()?;
+        let notready = Async::NotReady == self.b.get_mut().poll_ready()? || notready;
+        let notready = Async::NotReady == self.t.get_mut().poll_ready()? || notready;
+
+        if notready {
+            Ok(Async::NotReady)
+        } else {
+            Ok(Async::Ready(()))
+        }
     }
 
     fn call(&mut self, req: A::Request) -> Self::Future {
-        AndThenApplyFuture {
+        AndThenTransformFuture {
             b: self.b.clone(),
-            f: self.f.clone(),
-            fut_b: None,
+            t: self.t.clone(),
+            fut_t: None,
             fut_a: Some(self.a.call(req)),
         }
     }
 }
 
-pub struct AndThenApplyFuture<A, B, F, Out>
+pub struct AndThenTransformFuture<T, A, B>
 where
     A: Service,
     B: Service<Error = A::Error>,
-    F: FnMut(A::Response, &mut B) -> Out,
-    Out: IntoFuture,
-    Out::Error: Into<A::Error>,
+    T: Transform<B, Request = A::Response>,
+    T::Error: From<A::Error>,
 {
     b: Cell<B>,
-    f: Cell<F>,
+    t: Cell<T>,
     fut_a: Option<A::Future>,
-    fut_b: Option<Out::Future>,
+    fut_t: Option<T::Future>,
 }
 
-impl<A, B, F, Out> Future for AndThenApplyFuture<A, B, F, Out>
+impl<T, A, B> Future for AndThenTransformFuture<T, A, B>
 where
     A: Service,
     B: Service<Error = A::Error>,
-    F: FnMut(A::Response, &mut B) -> Out,
-    Out: IntoFuture,
-    Out::Error: Into<A::Error>,
+    T: Transform<B, Request = A::Response>,
+    T::Error: From<A::Error>,
 {
-    type Item = Out::Item;
-    type Error = A::Error;
+    type Item = T::Response;
+    type Error = T::Error;
 
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
-        if let Some(ref mut fut) = self.fut_b {
-            return fut.poll().map_err(|e| e.into());
+        if let Some(ref mut fut) = self.fut_t {
+            return fut.poll();
         }
 
         match self.fut_a.as_mut().expect("Bug in actix-service").poll() {
             Ok(Async::Ready(resp)) => {
                 let _ = self.fut_a.take();
-                self.fut_b =
-                    Some((&mut *self.f.get_mut())(resp, self.b.get_mut()).into_future());
+                self.fut_t = Some(self.t.get_mut().call(resp, self.b.get_mut()));
                 self.poll()
             }
             Ok(Async::NotReady) => Ok(Async::NotReady),
@@ -128,102 +123,100 @@ where
     }
 }
 
-/// `ApplyNewService` new service combinator
-pub struct AndThenApplyNewService<A, B, F, Out> {
+/// `Apply` new service combinator
+pub struct AndThenTransformNewService<T, A, B> {
     a: A,
     b: B,
-    f: Cell<F>,
-    r: PhantomData<(Out)>,
+    t: T,
 }
 
-impl<A, B, F, Out> AndThenApplyNewService<A, B, F, Out>
+impl<T, A, B> AndThenTransformNewService<T, A, B>
 where
     A: NewService,
     B: NewService<Error = A::Error, InitError = A::InitError>,
-    F: FnMut(A::Response, &mut B::Service) -> Out,
-    Out: IntoFuture,
-    Out::Error: Into<A::Error>,
+    T: NewTransform<B::Service, Request = A::Response, InitError = A::InitError>,
+    T::Error: From<A::Error>,
 {
     /// Create new `ApplyNewService` new service instance
-    pub fn new<A1: IntoNewService<A>, B1: IntoNewService<B>>(a: A1, b: B1, f: F) -> Self {
-        Self {
-            f: Cell::new(f),
-            a: a.into_new_service(),
-            b: b.into_new_service(),
-            r: PhantomData,
-        }
+    pub fn new(t: T, a: A, b: B) -> Self {
+        Self { a, b, t }
     }
 }
 
-impl<A, B, F, Out> Clone for AndThenApplyNewService<A, B, F, Out>
+impl<T, A, B> Clone for AndThenTransformNewService<T, A, B>
 where
     A: Clone,
     B: Clone,
+    T: Clone,
 {
     fn clone(&self) -> Self {
         Self {
             a: self.a.clone(),
             b: self.b.clone(),
-            f: self.f.clone(),
-            r: PhantomData,
+            t: self.t.clone(),
         }
     }
 }
 
-impl<A, B, F, Out> NewService for AndThenApplyNewService<A, B, F, Out>
+impl<T, A, B> NewService for AndThenTransformNewService<T, A, B>
 where
     A: NewService,
     B: NewService<Error = A::Error, InitError = A::InitError>,
-    F: FnMut(A::Response, &mut B::Service) -> Out,
-    Out: IntoFuture,
-    Out::Error: Into<A::Error>,
+    T: NewTransform<B::Service, Request = A::Response, InitError = A::InitError>,
+    T::Error: From<A::Error>,
 {
     type Request = A::Request;
-    type Response = Out::Item;
-    type Error = A::Error;
+    type Response = T::Response;
+    type Error = T::Error;
 
-    type InitError = A::InitError;
-    type Service = AndThenApply<A::Service, B::Service, F, Out>;
-    type Future = AndThenApplyNewServiceFuture<A, B, F, Out>;
+    type InitError = T::InitError;
+    type Service = AndThenTransform<T::Transform, A::Service, B::Service>;
+    type Future = AndThenTransformNewServiceFuture<T, A, B>;
 
     fn new_service(&self) -> Self::Future {
-        AndThenApplyNewServiceFuture {
+        AndThenTransformNewServiceFuture {
             a: None,
             b: None,
-            f: self.f.clone(),
+            t: None,
             fut_a: self.a.new_service(),
             fut_b: self.b.new_service(),
+            fut_t: self.t.new_transform(),
         }
     }
 }
 
-pub struct AndThenApplyNewServiceFuture<A, B, F, Out>
+pub struct AndThenTransformNewServiceFuture<T, A, B>
 where
     A: NewService,
     B: NewService<Error = A::Error, InitError = A::InitError>,
-    F: FnMut(A::Response, &mut B::Service) -> Out,
-    Out: IntoFuture,
-    Out::Error: Into<A::Error>,
+    T: NewTransform<B::Service, Request = A::Response, InitError = A::InitError>,
+    T::Error: From<A::Error>,
 {
     fut_b: B::Future,
     fut_a: A::Future,
-    f: Cell<F>,
+    fut_t: T::Future,
     a: Option<A::Service>,
     b: Option<B::Service>,
+    t: Option<T::Transform>,
 }
 
-impl<A, B, F, Out> Future for AndThenApplyNewServiceFuture<A, B, F, Out>
+impl<T, A, B> Future for AndThenTransformNewServiceFuture<T, A, B>
 where
     A: NewService,
     B: NewService<Error = A::Error, InitError = A::InitError>,
-    F: FnMut(A::Response, &mut B::Service) -> Out,
-    Out: IntoFuture,
-    Out::Error: Into<A::Error>,
+    T: NewTransform<B::Service, Request = A::Response, InitError = A::InitError>,
+    T::Error: From<A::Error>,
 {
-    type Item = AndThenApply<A::Service, B::Service, F, Out>;
-    type Error = A::InitError;
+    type Item = AndThenTransform<T::Transform, A::Service, B::Service>;
+    type Error = T::InitError;
 
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
+        if self.t.is_none() {
+            if let Async::Ready(transform) = self.fut_t.poll()? {
+                self.t = Some(transform);
+            }
+        }
+
         if self.a.is_none() {
             if let Async::Ready(service) = self.fut_a.poll()? {
                 self.a = Some(service);
@@ -236,12 +229,11 @@ where
             }
         }
 
-        if self.a.is_some() && self.b.is_some() {
-            Ok(Async::Ready(AndThenApply {
-                f: self.f.clone(),
+        if self.a.is_some() && self.b.is_some() && self.t.is_some() {
+            Ok(Async::Ready(AndThenTransform {
                 a: self.a.take().unwrap(),
+                t: Cell::new(self.t.take().unwrap()),
                 b: Cell::new(self.b.take().unwrap()),
-                r: PhantomData,
             }))
         } else {
             Ok(Async::NotReady)
@@ -274,12 +266,13 @@ mod tests {
     }
 
     #[test]
-    fn test_call() {
+    fn test_apply() {
         let blank = |req| Ok(req);
 
-        let mut srv = blank.into_service().apply(Srv, |req: &'static str, srv| {
-            srv.call(()).map(move |res| (req, res))
-        });
+        let mut srv = blank.into_service().apply(
+            |req: &'static str, srv: &mut Srv| srv.call(()).map(move |res| (req, res)),
+            Srv,
+        );
         assert!(srv.poll_ready().is_ok());
         let res = srv.call("srv").poll();
         assert!(res.is_ok());
@@ -291,8 +284,8 @@ mod tests {
         let blank = || Ok::<_, ()>((|req| Ok(req)).into_service());
 
         let new_srv = blank.into_new_service().apply(
+            |req: &'static str, srv: &mut Srv| srv.call(()).map(move |res| (req, res)),
             || Ok(Srv),
-            |req: &'static str, srv| srv.call(()).map(move |res| (req, res)),
         );
         if let Async::Ready(mut srv) = new_srv.new_service().poll().unwrap() {
             assert!(srv.poll_ready().is_ok());

actix-service/src/and_then_apply_fn.rs

@@ -0,0 +1,302 @@
+use std::marker::PhantomData;
+
+use futures::{try_ready, Async, Future, IntoFuture, Poll};
+
+use super::{IntoNewService, IntoService, NewService, Service};
+use crate::cell::Cell;
+
+/// `Apply` service combinator
+pub struct AndThenApply<A, B, F, Out>
+where
+    A: Service,
+    B: Service<Error = A::Error>,
+    F: FnMut(A::Response, &mut B) -> Out,
+    Out: IntoFuture,
+    Out::Error: Into<A::Error>,
+{
+    a: A,
+    b: Cell<B>,
+    f: Cell<F>,
+    r: PhantomData<(Out,)>,
+}
+
+impl<A, B, F, Out> AndThenApply<A, B, F, Out>
+where
+    A: Service,
+    B: Service<Error = A::Error>,
+    F: FnMut(A::Response, &mut B) -> Out,
+    Out: IntoFuture,
+    Out::Error: Into<A::Error>,
+{
+    /// Create new `Apply` combinator
+    pub fn new<A1: IntoService<A>, B1: IntoService<B>>(a: A1, b: B1, f: F) -> Self {
+        Self {
+            f: Cell::new(f),
+            a: a.into_service(),
+            b: Cell::new(b.into_service()),
+            r: PhantomData,
+        }
+    }
+}
+
+impl<A, B, F, Out> Clone for AndThenApply<A, B, F, Out>
+where
+    A: Service + Clone,
+    B: Service<Error = A::Error>,
+    F: FnMut(A::Response, &mut B) -> Out,
+    Out: IntoFuture,
+    Out::Error: Into<A::Error>,
+{
+    fn clone(&self) -> Self {
+        AndThenApply {
+            a: self.a.clone(),
+            b: self.b.clone(),
+            f: self.f.clone(),
+            r: PhantomData,
+        }
+    }
+}
+
+impl<A, B, F, Out> Service for AndThenApply<A, B, F, Out>
+where
+    A: Service,
+    B: Service<Error = A::Error>,
+    F: FnMut(A::Response, &mut B) -> Out,
+    Out: IntoFuture,
+    Out::Error: Into<A::Error>,
+{
+    type Request = A::Request;
+    type Response = Out::Item;
+    type Error = A::Error;
+    type Future = AndThenApplyFuture<A, B, F, Out>;
+
+    fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+        try_ready!(self.a.poll_ready());
+        self.b.get_mut().poll_ready()
+    }
+
+    fn call(&mut self, req: A::Request) -> Self::Future {
+        AndThenApplyFuture {
+            b: self.b.clone(),
+            f: self.f.clone(),
+            fut_b: None,
+            fut_a: Some(self.a.call(req)),
+        }
+    }
+}
+
+pub struct AndThenApplyFuture<A, B, F, Out>
+where
+    A: Service,
+    B: Service<Error = A::Error>,
+    F: FnMut(A::Response, &mut B) -> Out,
+    Out: IntoFuture,
+    Out::Error: Into<A::Error>,
+{
+    b: Cell<B>,
+    f: Cell<F>,
+    fut_a: Option<A::Future>,
+    fut_b: Option<Out::Future>,
+}
+
+impl<A, B, F, Out> Future for AndThenApplyFuture<A, B, F, Out>
+where
+    A: Service,
+    B: Service<Error = A::Error>,
+    F: FnMut(A::Response, &mut B) -> Out,
+    Out: IntoFuture,
+    Out::Error: Into<A::Error>,
+{
+    type Item = Out::Item;
+    type Error = A::Error;
+
+    fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
+        if let Some(ref mut fut) = self.fut_b {
+            return fut.poll().map_err(|e| e.into());
+        }
+
+        match self.fut_a.as_mut().expect("Bug in actix-service").poll() {
+            Ok(Async::Ready(resp)) => {
+                let _ = self.fut_a.take();
+                self.fut_b =
+                    Some((&mut *self.f.get_mut())(resp, self.b.get_mut()).into_future());
+                self.poll()
+            }
+            Ok(Async::NotReady) => Ok(Async::NotReady),
+            Err(err) => Err(err),
+        }
+    }
+}
+
+/// `ApplyNewService` new service combinator
+pub struct AndThenApplyNewService<A, B, F, Out> {
+    a: A,
+    b: B,
+    f: Cell<F>,
+    r: PhantomData<(Out)>,
+}
+
+impl<A, B, F, Out> AndThenApplyNewService<A, B, F, Out>
+where
+    A: NewService,
+    B: NewService<Error = A::Error, InitError = A::InitError>,
+    F: FnMut(A::Response, &mut B::Service) -> Out,
+    Out: IntoFuture,
+    Out::Error: Into<A::Error>,
+{
+    /// Create new `ApplyNewService` new service instance
+    pub fn new<A1: IntoNewService<A>, B1: IntoNewService<B>>(a: A1, b: B1, f: F) -> Self {
+        Self {
+            f: Cell::new(f),
+            a: a.into_new_service(),
+            b: b.into_new_service(),
+            r: PhantomData,
+        }
+    }
+}
+
+impl<A, B, F, Out> Clone for AndThenApplyNewService<A, B, F, Out>
+where
+    A: Clone,
+    B: Clone,
+{
+    fn clone(&self) -> Self {
+        Self {
+            a: self.a.clone(),
+            b: self.b.clone(),
+            f: self.f.clone(),
+            r: PhantomData,
+        }
+    }
+}
+
+impl<A, B, F, Out> NewService for AndThenApplyNewService<A, B, F, Out>
+where
+    A: NewService,
+    B: NewService<Error = A::Error, InitError = A::InitError>,
+    F: FnMut(A::Response, &mut B::Service) -> Out,
+    Out: IntoFuture,
+    Out::Error: Into<A::Error>,
+{
+    type Request = A::Request;
+    type Response = Out::Item;
+    type Error = A::Error;
+
+    type InitError = A::InitError;
+    type Service = AndThenApply<A::Service, B::Service, F, Out>;
+    type Future = AndThenApplyNewServiceFuture<A, B, F, Out>;
+
+    fn new_service(&self) -> Self::Future {
+        AndThenApplyNewServiceFuture {
+            a: None,
+            b: None,
+            f: self.f.clone(),
+            fut_a: self.a.new_service(),
+            fut_b: self.b.new_service(),
+        }
+    }
+}
+
+pub struct AndThenApplyNewServiceFuture<A, B, F, Out>
+where
+    A: NewService,
+    B: NewService<Error = A::Error, InitError = A::InitError>,
+    F: FnMut(A::Response, &mut B::Service) -> Out,
+    Out: IntoFuture,
+    Out::Error: Into<A::Error>,
+{
+    fut_b: B::Future,
+    fut_a: A::Future,
+    f: Cell<F>,
+    a: Option<A::Service>,
+    b: Option<B::Service>,
+}
+
+impl<A, B, F, Out> Future for AndThenApplyNewServiceFuture<A, B, F, Out>
+where
+    A: NewService,
+    B: NewService<Error = A::Error, InitError = A::InitError>,
+    F: FnMut(A::Response, &mut B::Service) -> Out,
+    Out: IntoFuture,
+    Out::Error: Into<A::Error>,
+{
+    type Item = AndThenApply<A::Service, B::Service, F, Out>;
+    type Error = A::InitError;
+
+    fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
+        if self.a.is_none() {
+            if let Async::Ready(service) = self.fut_a.poll()? {
+                self.a = Some(service);
+            }
+        }
+
+        if self.b.is_none() {
+            if let Async::Ready(service) = self.fut_b.poll()? {
+                self.b = Some(service);
+            }
+        }
+
+        if self.a.is_some() && self.b.is_some() {
+            Ok(Async::Ready(AndThenApply {
+                f: self.f.clone(),
+                a: self.a.take().unwrap(),
+                b: Cell::new(self.b.take().unwrap()),
+                r: PhantomData,
+            }))
+        } else {
+            Ok(Async::NotReady)
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use futures::future::{ok, FutureResult};
+    use futures::{Async, Future, Poll};
+
+    use crate::{Blank, BlankNewService, NewService, Service, ServiceExt};
+
+    #[derive(Clone)]
+    struct Srv;
+    impl Service for Srv {
+        type Request = ();
+        type Response = ();
+        type Error = ();
+        type Future = FutureResult<(), ()>;
+
+        fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+            Ok(Async::Ready(()))
+        }
+
+        fn call(&mut self, _: ()) -> Self::Future {
+            ok(())
+        }
+    }
+
+    #[test]
+    fn test_call() {
+        let mut srv = Blank::new().apply_fn(Srv, |req: &'static str, srv| {
+            srv.call(()).map(move |res| (req, res))
+        });
+        assert!(srv.poll_ready().is_ok());
+        let res = srv.call("srv").poll();
+        assert!(res.is_ok());
+        assert_eq!(res.unwrap(), Async::Ready(("srv", ())));
+    }
+
+    #[test]
+    fn test_new_service() {
+        let new_srv = BlankNewService::new_unit().apply_fn(
+            || Ok(Srv),
+            |req: &'static str, srv| srv.call(()).map(move |res| (req, res)),
+        );
+        if let Async::Ready(mut srv) = new_srv.new_service().poll().unwrap() {
+            assert!(srv.poll_ready().is_ok());
+            let res = srv.call("srv").poll();
+            assert!(res.is_ok());
+            assert_eq!(res.unwrap(), Async::Ready(("srv", ())));
+        } else {
+            panic!()
+        }
+    }
+}

actix-service/src/apply.rs

@@ -1,172 +1,214 @@
-use std::marker::PhantomData;
+use futures::{try_ready, Async, Future, IntoFuture, Poll};
 
-use futures::{Async, Future, IntoFuture, Poll};
-
-use super::{IntoNewService, IntoService, NewService, Service};
+use super::{FnNewTransform, FnTransform};
+use super::{
+    IntoNewService, IntoNewTransform, IntoService, IntoTransform, NewService, NewTransform,
+    Service, Transform,
+};
 
 /// `Apply` service combinator
-pub struct Apply<T, F, In, Out>
+pub struct Apply<T, S>
 where
-    T: Service,
+    T: Transform<S>,
+    T::Error: From<S::Error>,
+    S: Service,
 {
-    service: T,
-    f: F,
-    r: PhantomData<(In, Out)>,
+    transform: T,
+    service: S,
 }
 
-impl<T, F, In, Out> Apply<T, F, In, Out>
+impl<T, S> Apply<T, S>
 where
-    T: Service,
-    F: FnMut(In, &mut T) -> Out,
-    Out: IntoFuture,
-    Out::Error: From<T::Error>,
+    T: Transform<S>,
+    T::Error: From<S::Error>,
+    S: Service,
 {
     /// Create new `Apply` combinator
-    pub fn new<I: IntoService<T>>(service: I, f: F) -> Self {
+    pub fn new<T1: IntoTransform<T, S>, S1: IntoService<S>>(
+        transform: T1,
+        service: S1,
+    ) -> Self {
         Self {
+            transform: transform.into_transform(),
             service: service.into_service(),
-            f,
-            r: PhantomData,
         }
     }
 }
 
-impl<T, F, In, Out> Clone for Apply<T, F, In, Out>
+impl<F, S, Req, Out> Apply<FnTransform<F, S, Req, Out>, S>
 where
-    T: Service + Clone,
-    F: Clone,
+    F: FnMut(Req, &mut S) -> Out,
+    Out: IntoFuture,
+    Out::Error: From<S::Error>,
+    S: Service,
+{
+    /// Create new `Apply` combinator
+    pub fn new_fn<S1: IntoService<S>>(service: S1, transform: F) -> Self {
+        Self {
+            service: service.into_service(),
+            transform: transform.into_transform(),
+        }
+    }
+}
+
+impl<T, S> Clone for Apply<T, S>
+where
+    S: Service + Clone,
+    T::Error: From<S::Error>,
+    T: Transform<S> + Clone,
 {
     fn clone(&self) -> Self {
         Apply {
             service: self.service.clone(),
-            f: self.f.clone(),
-            r: PhantomData,
+            transform: self.transform.clone(),
         }
     }
 }
 
-impl<T, F, In, Out> Service for Apply<T, F, In, Out>
+impl<T, S> Service for Apply<T, S>
 where
-    T: Service,
-    F: FnMut(In, &mut T) -> Out,
-    Out: IntoFuture,
-    Out::Error: From<T::Error>,
+    T: Transform<S>,
+    T::Error: From<S::Error>,
+    S: Service,
 {
-    type Request = In;
-    type Response = Out::Item;
-    type Error = Out::Error;
-    type Future = Out::Future;
+    type Request = T::Request;
+    type Response = T::Response;
+    type Error = T::Error;
+    type Future = T::Future;
 
     fn poll_ready(&mut self) -> Poll<(), Self::Error> {
-        self.service.poll_ready().map_err(|e| e.into())
+        try_ready!(self.service.poll_ready());
+        self.transform.poll_ready()
     }
 
-    fn call(&mut self, req: In) -> Self::Future {
-        (self.f)(req, &mut self.service).into_future()
+    fn call(&mut self, req: Self::Request) -> Self::Future {
+        self.transform.call(req, &mut self.service).into_future()
     }
 }
 
 /// `ApplyNewService` new service combinator
-pub struct ApplyNewService<T, F, In, Out>
+pub struct ApplyNewService<T, S>
 where
-    T: NewService,
+    // T::InitError: From<S::InitError>,
+    T: NewTransform<S::Service, InitError = S::InitError>,
+    T::Error: From<S::Error>,
+    S: NewService,
 {
-    service: T,
-    f: F,
-    r: PhantomData<(In, Out)>,
+    transform: T,
+    service: S,
 }
 
-impl<T, F, In, Out> ApplyNewService<T, F, In, Out>
+impl<T, S> ApplyNewService<T, S>
 where
-    T: NewService,
-    F: FnMut(In, &mut T::Service) -> Out + Clone,
-    Out: IntoFuture,
-    Out::Error: From<T::Error>,
+    T: NewTransform<S::Service, InitError = S::InitError>,
+    T::Error: From<S::Error>,
+    S: NewService,
 {
     /// Create new `ApplyNewService` new service instance
-    pub fn new<F1: IntoNewService<T>>(service: F1, f: F) -> Self {
+    pub fn new<T1: IntoNewTransform<T, S::Service>, S1: IntoNewService<S>>(
+        transform: T1,
+        service: S1,
+    ) -> Self {
         Self {
-            f,
+            transform: transform.into_new_transform(),
             service: service.into_new_service(),
-            r: PhantomData,
         }
     }
 }
 
-impl<T, F, In, Out> Clone for ApplyNewService<T, F, In, Out>
+impl<F, S, In, Out> ApplyNewService<FnNewTransform<F, S::Service, In, Out, S::InitError>, S>
 where
-    T: NewService + Clone,
-    F: FnMut(In, &mut T::Service) -> Out + Clone,
+    F: FnMut(In, &mut S::Service) -> Out + Clone,
     Out: IntoFuture,
+    Out::Error: From<S::Error>,
+    S: NewService,
+{
+    /// Create new `Apply` combinator factory
+    pub fn new_fn<S1: IntoNewService<S>>(service: S1, transform: F) -> Self {
+        Self {
+            service: service.into_new_service(),
+            transform: FnNewTransform::new(transform),
+        }
+    }
+}
+
+impl<T, S> Clone for ApplyNewService<T, S>
+where
+    T: NewTransform<S::Service, InitError = S::InitError> + Clone,
+    T::Error: From<S::Error>,
+    S: NewService + Clone,
 {
     fn clone(&self) -> Self {
         Self {
             service: self.service.clone(),
-            f: self.f.clone(),
-            r: PhantomData,
+            transform: self.transform.clone(),
         }
     }
 }
 
-impl<T, F, In, Out> NewService for ApplyNewService<T, F, In, Out>
+impl<T, S> NewService for ApplyNewService<T, S>
 where
-    T: NewService,
-    F: FnMut(In, &mut T::Service) -> Out + Clone,
-    Out: IntoFuture,
-    Out::Error: From<T::Error>,
+    T: NewTransform<S::Service, InitError = S::InitError>,
+    T::Error: From<S::Error>,
+    S: NewService,
 {
-    type Request = In;
-    type Response = Out::Item;
-    type Error = Out::Error;
-    type Service = Apply<T::Service, F, In, Out>;
+    type Request = T::Request;
+    type Response = T::Response;
+    type Error = T::Error;
+    type Service = Apply<T::Transform, S::Service>;
 
     type InitError = T::InitError;
-    type Future = ApplyNewServiceFuture<T, F, In, Out>;
+    type Future = ApplyNewServiceFuture<T, S>;
 
     fn new_service(&self) -> Self::Future {
-        ApplyNewServiceFuture::new(self.service.new_service(), self.f.clone())
-    }
-}
-
-pub struct ApplyNewServiceFuture<T, F, In, Out>
-where
-    T: NewService,
-    F: FnMut(In, &mut T::Service) -> Out + Clone,
-    Out: IntoFuture,
-{
-    fut: T::Future,
-    f: Option<F>,
-    r: PhantomData<(In, Out)>,
-}
-
-impl<T, F, In, Out> ApplyNewServiceFuture<T, F, In, Out>
-where
-    T: NewService,
-    F: FnMut(In, &mut T::Service) -> Out + Clone,
-    Out: IntoFuture,
-{
-    fn new(fut: T::Future, f: F) -> Self {
         ApplyNewServiceFuture {
-            f: Some(f),
-            fut,
-            r: PhantomData,
+            fut_t: self.transform.new_transform(),
+            fut_s: self.service.new_service(),
+            service: None,
+            transform: None,
         }
     }
 }
 
-impl<T, F, In, Out> Future for ApplyNewServiceFuture<T, F, In, Out>
+pub struct ApplyNewServiceFuture<T, S>
 where
-    T: NewService,
-    F: FnMut(In, &mut T::Service) -> Out + Clone,
-    Out: IntoFuture,
-    Out::Error: From<T::Error>,
+    T: NewTransform<S::Service, InitError = S::InitError>,
+    T::Error: From<S::Error>,
+    S: NewService,
 {
-    type Item = Apply<T::Service, F, In, Out>;
+    fut_s: S::Future,
+    fut_t: T::Future,
+    service: Option<S::Service>,
+    transform: Option<T::Transform>,
+}
+
+impl<T, S> Future for ApplyNewServiceFuture<T, S>
+where
+    T: NewTransform<S::Service, InitError = S::InitError>,
+    T::Error: From<S::Error>,
+    S: NewService,
+{
+    type Item = Apply<T::Transform, S::Service>;
     type Error = T::InitError;
 
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
-        if let Async::Ready(service) = self.fut.poll()? {
-            Ok(Async::Ready(Apply::new(service, self.f.take().unwrap())))
+        if self.transform.is_none() {
+            if let Async::Ready(transform) = self.fut_t.poll()? {
+                self.transform = Some(transform);
+            }
+        }
+
+        if self.service.is_none() {
+            if let Async::Ready(service) = self.fut_s.poll()? {
+                self.service = Some(service);
+            }
+        }
+
+        if self.transform.is_some() && self.service.is_some() {
+            Ok(Async::Ready(Apply {
+                service: self.service.take().unwrap(),
+                transform: self.transform.take().unwrap(),
+            }))
         } else {
             Ok(Async::NotReady)
         }
@@ -178,7 +220,8 @@ mod tests {
     use futures::future::{ok, FutureResult};
     use futures::{Async, Future, Poll};
 
-    use crate::{IntoNewService, IntoService, NewService, Service, ServiceExt};
+    use super::*;
+    use crate::{NewService, Service};
 
     #[derive(Clone)]
     struct Srv;
@@ -198,10 +241,8 @@ mod tests {
     }
 
     #[test]
-    fn test_call() {
-        let blank = |req| Ok(req);
-
-        let mut srv = blank.into_service().apply(Srv, |req: &'static str, srv| {
+    fn test_apply() {
+        let mut srv = Apply::new_fn(Srv, |req: &'static str, srv| {
             srv.call(()).map(move |res| (req, res))
         });
         assert!(srv.poll_ready().is_ok());
@@ -212,10 +253,24 @@ mod tests {
 
     #[test]
     fn test_new_service() {
-        let blank = || Ok::<_, ()>((|req| Ok(req)).into_service());
+        let new_srv = ApplyNewService::new(
+            |req: &'static str, srv: &mut Srv| srv.call(()).map(move |res| (req, res)),
+            || Ok::<_, ()>(Srv),
+        );
+        if let Async::Ready(mut srv) = new_srv.new_service().poll().unwrap() {
+            assert!(srv.poll_ready().is_ok());
+            let res = srv.call("srv").poll();
+            assert!(res.is_ok());
+            assert_eq!(res.unwrap(), Async::Ready(("srv", ())));
+        } else {
+            panic!()
+        }
+    }
 
-        let new_srv = blank.into_new_service().apply(
-            || Ok(Srv),
+    #[test]
+    fn test_new_service_fn() {
+        let new_srv = ApplyNewService::new_fn(
+            || Ok::<_, ()>(Srv),
             |req: &'static str, srv| srv.call(()).map(move |res| (req, res)),
         );
         if let Async::Ready(mut srv) = new_srv.new_service().poll().unwrap() {

actix-service/src/blank.rs

@@ -0,0 +1,82 @@
+use std::marker::PhantomData;
+
+use futures::future::{ok, FutureResult};
+use futures::{Async, Poll};
+
+use super::{NewService, Service};
+
+/// Empty service
+#[derive(Clone)]
+pub struct Blank<R, E> {
+    _t: PhantomData<(R, E)>,
+}
+
+impl<R, E> Blank<R, E> {
+    pub fn err<E1>(self) -> Blank<R, E1> {
+        Blank { _t: PhantomData }
+    }
+}
+
+impl<R> Blank<R, ()> {
+    #[allow(clippy::new_ret_no_self)]
+    pub fn new<E>() -> Blank<R, E> {
+        Blank { _t: PhantomData }
+    }
+}
+
+impl<R, E> Default for Blank<R, E> {
+    fn default() -> Blank<R, E> {
+        Blank { _t: PhantomData }
+    }
+}
+
+impl<R, E> Service for Blank<R, E> {
+    type Request = R;
+    type Response = R;
+    type Error = E;
+    type Future = FutureResult<R, E>;
+
+    fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+        Ok(Async::Ready(()))
+    }
+
+    fn call(&mut self, req: R) -> Self::Future {
+        ok(req)
+    }
+}
+
+/// Empty service factory
+pub struct BlankNewService<R, E1, E2 = ()> {
+    _t: PhantomData<(R, E1, E2)>,
+}
+
+impl<R, E1, E2> BlankNewService<R, E1, E2> {
+    pub fn new() -> BlankNewService<R, E1, E2> {
+        BlankNewService { _t: PhantomData }
+    }
+}
+
+impl<R, E1> BlankNewService<R, E1, ()> {
+    pub fn new_unit() -> BlankNewService<R, E1, ()> {
+        BlankNewService { _t: PhantomData }
+    }
+}
+
+impl<R, E1, E2> Default for BlankNewService<R, E1, E2> {
+    fn default() -> BlankNewService<R, E1, E2> {
+        Self::new()
+    }
+}
+
+impl<R, E1, E2> NewService for BlankNewService<R, E1, E2> {
+    type Request = R;
+    type Response = R;
+    type Error = E1;
+    type InitError = E2;
+    type Service = Blank<R, E1>;
+    type Future = FutureResult<Self::Service, Self::InitError>;
+
+    fn new_service(&self) -> Self::Future {
+        ok(Blank::default())
+    }
+}

actix-service/src/fn_service.rs

@@ -1,56 +1,51 @@
-use std::marker;
+use std::marker::PhantomData;
 
-use futures::{
-    future::{ok, FutureResult},
-    Async, IntoFuture, Poll,
-};
+use futures::future::{ok, FutureResult};
+use futures::{Async, IntoFuture, Poll};
 
 use super::{IntoNewService, IntoService, NewService, Service};
 
-pub struct FnService<F, Req, Resp, E, Fut>
+pub struct FnService<F, Req, Out>
 where
-    F: FnMut(Req) -> Fut,
-    Fut: IntoFuture<Item = Resp, Error = E>,
+    F: FnMut(Req) -> Out,
+    Out: IntoFuture,
 {
     f: F,
-    _t: marker::PhantomData<(Req, Resp, E)>,
+    _t: PhantomData<(Req,)>,
 }
 
-impl<F, Req, Resp, E, Fut> FnService<F, Req, Resp, E, Fut>
+impl<F, Req, Out> FnService<F, Req, Out>
 where
-    F: FnMut(Req) -> Fut,
-    Fut: IntoFuture<Item = Resp, Error = E>,
+    F: FnMut(Req) -> Out,
+    Out: IntoFuture,
 {
     pub fn new(f: F) -> Self {
-        FnService {
-            f,
-            _t: marker::PhantomData,
-        }
+        FnService { f, _t: PhantomData }
     }
 }
 
-impl<F, Req, Resp, E, Fut> Clone for FnService<F, Req, Resp, E, Fut>
+impl<F, Req, Out> Clone for FnService<F, Req, Out>
 where
-    F: FnMut(Req) -> Fut + Clone,
-    Fut: IntoFuture<Item = Resp, Error = E>,
+    F: FnMut(Req) -> Out + Clone,
+    Out: IntoFuture,
 {
     fn clone(&self) -> Self {
         FnService {
             f: self.f.clone(),
-            _t: marker::PhantomData,
+            _t: PhantomData,
         }
     }
 }
 
-impl<F, Req, Resp, E, Fut> Service for FnService<F, Req, Resp, E, Fut>
+impl<F, Req, Out> Service for FnService<F, Req, Out>
 where
-    F: FnMut(Req) -> Fut,
-    Fut: IntoFuture<Item = Resp, Error = E>,
+    F: FnMut(Req) -> Out,
+    Out: IntoFuture,
 {
     type Request = Req;
-    type Response = Resp;
-    type Error = E;
-    type Future = Fut::Future;
+    type Response = Out::Item;
+    type Error = Out::Error;
+    type Future = Out::Future;
 
     fn poll_ready(&mut self) -> Poll<(), Self::Error> {
         Ok(Async::Ready(()))
@@ -61,47 +56,44 @@ where
     }
 }
 
-impl<F, Req, Resp, Err, Fut> IntoService<FnService<F, Req, Resp, Err, Fut>> for F
+impl<F, Req, Out> IntoService<FnService<F, Req, Out>> for F
 where
-    F: FnMut(Req) -> Fut + 'static,
-    Fut: IntoFuture<Item = Resp, Error = Err>,
+    F: FnMut(Req) -> Out + 'static,
+    Out: IntoFuture,
 {
-    fn into_service(self) -> FnService<F, Req, Resp, Err, Fut> {
+    fn into_service(self) -> FnService<F, Req, Out> {
         FnService::new(self)
     }
 }
 
-pub struct FnNewService<F, Req, Resp, Err, Fut>
+pub struct FnNewService<F, Req, Out>
 where
-    F: FnMut(Req) -> Fut,
-    Fut: IntoFuture<Item = Resp, Error = Err>,
+    F: FnMut(Req) -> Out,
+    Out: IntoFuture,
 {
     f: F,
-    _t: marker::PhantomData<(Req, Resp, Err)>,
+    _t: PhantomData<(Req,)>,
 }
 
-impl<F, Req, Resp, Err, Fut> FnNewService<F, Req, Resp, Err, Fut>
+impl<F, Req, Out> FnNewService<F, Req, Out>
 where
-    F: FnMut(Req) -> Fut + Clone,
-    Fut: IntoFuture<Item = Resp, Error = Err>,
+    F: FnMut(Req) -> Out + Clone,
+    Out: IntoFuture,
 {
     pub fn new(f: F) -> Self {
-        FnNewService {
-            f,
-            _t: marker::PhantomData,
-        }
+        FnNewService { f, _t: PhantomData }
     }
 }
 
-impl<F, Req, Resp, Err, Fut> NewService for FnNewService<F, Req, Resp, Err, Fut>
+impl<F, Req, Out> NewService for FnNewService<F, Req, Out>
 where
-    F: FnMut(Req) -> Fut + Clone,
-    Fut: IntoFuture<Item = Resp, Error = Err>,
+    F: FnMut(Req) -> Out + Clone,
+    Out: IntoFuture,
 {
     type Request = Req;
-    type Response = Resp;
-    type Error = Err;
-    type Service = FnService<F, Req, Resp, Err, Fut>;
+    type Response = Out::Item;
+    type Error = Out::Error;
+    type Service = FnService<F, Req, Out>;
     type InitError = ();
     type Future = FutureResult<Self::Service, Self::InitError>;
 
@@ -110,20 +102,20 @@ where
     }
 }
 
-impl<F, Req, Resp, Err, Fut> IntoNewService<FnNewService<F, Req, Resp, Err, Fut>> for F
+impl<F, Req, Out> IntoNewService<FnNewService<F, Req, Out>> for F
 where
-    F: FnMut(Req) -> Fut + Clone + 'static,
-    Fut: IntoFuture<Item = Resp, Error = Err>,
+    F: FnMut(Req) -> Out + Clone + 'static,
+    Out: IntoFuture,
 {
-    fn into_new_service(self) -> FnNewService<F, Req, Resp, Err, Fut> {
+    fn into_new_service(self) -> FnNewService<F, Req, Out> {
         FnNewService::new(self)
     }
 }
 
-impl<F, Req, Resp, Err, Fut> Clone for FnNewService<F, Req, Resp, Err, Fut>
+impl<F, Req, Out> Clone for FnNewService<F, Req, Out>
 where
-    F: FnMut(Req) -> Fut + Clone,
-    Fut: IntoFuture<Item = Resp, Error = Err>,
+    F: FnMut(Req) -> Out + Clone,
+    Out: IntoFuture,
 {
     fn clone(&self) -> Self {
         Self::new(self.f.clone())

actix-service/src/fn_transform.rs

@@ -0,0 +1,123 @@
+use std::marker::PhantomData;
+
+use futures::future::{ok, FutureResult};
+use futures::{Async, IntoFuture, Poll};
+
+use super::{IntoNewTransform, IntoTransform, NewTransform, Transform};
+
+pub struct FnTransform<F, S, Req, Res>
+where
+    F: FnMut(Req, &mut S) -> Res,
+    Res: IntoFuture,
+{
+    f: F,
+    _t: PhantomData<(S, Req, Res)>,
+}
+
+impl<F, S, Req, Res> FnTransform<F, S, Req, Res>
+where
+    F: FnMut(Req, &mut S) -> Res,
+    Res: IntoFuture,
+{
+    pub fn new(f: F) -> Self {
+        FnTransform { f, _t: PhantomData }
+    }
+}
+
+impl<F, S, Req, Res> Clone for FnTransform<F, S, Req, Res>
+where
+    F: FnMut(Req, &mut S) -> Res + Clone,
+    Res: IntoFuture,
+{
+    fn clone(&self) -> Self {
+        FnTransform {
+            f: self.f.clone(),
+            _t: PhantomData,
+        }
+    }
+}
+
+impl<F, S, Req, Res> Transform<S> for FnTransform<F, S, Req, Res>
+where
+    F: FnMut(Req, &mut S) -> Res,
+    Res: IntoFuture,
+{
+    type Request = Req;
+    type Response = Res::Item;
+    type Error = Res::Error;
+    type Future = Res::Future;
+
+    fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+        Ok(Async::Ready(()))
+    }
+
+    fn call(&mut self, request: Req, service: &mut S) -> Self::Future {
+        (self.f)(request, service).into_future()
+    }
+}
+
+impl<F, S, Req, Res> IntoTransform<FnTransform<F, S, Req, Res>, S> for F
+where
+    F: FnMut(Req, &mut S) -> Res,
+    Res: IntoFuture,
+{
+    fn into_transform(self) -> FnTransform<F, S, Req, Res> {
+        FnTransform::new(self)
+    }
+}
+
+pub struct FnNewTransform<F, S, Req, Out, Err>
+where
+    F: FnMut(Req, &mut S) -> Out + Clone,
+    Out: IntoFuture,
+{
+    f: F,
+    _t: PhantomData<(S, Req, Out, Err)>,
+}
+
+impl<F, S, Req, Res, Err> FnNewTransform<F, S, Req, Res, Err>
+where
+    F: FnMut(Req, &mut S) -> Res + Clone,
+    Res: IntoFuture,
+{
+    pub fn new(f: F) -> Self {
+        FnNewTransform { f, _t: PhantomData }
+    }
+}
+
+impl<F, S, Req, Res, Err> NewTransform<S> for FnNewTransform<F, S, Req, Res, Err>
+where
+    F: FnMut(Req, &mut S) -> Res + Clone,
+    Res: IntoFuture,
+{
+    type Request = Req;
+    type Response = Res::Item;
+    type Error = Res::Error;
+    type Transform = FnTransform<F, S, Req, Res>;
+    type InitError = Err;
+    type Future = FutureResult<Self::Transform, Self::InitError>;
+
+    fn new_transform(&self) -> Self::Future {
+        ok(FnTransform::new(self.f.clone()))
+    }
+}
+
+impl<F, S, Req, Res, Err> IntoNewTransform<FnNewTransform<F, S, Req, Res, Err>, S> for F
+where
+    F: FnMut(Req, &mut S) -> Res + Clone,
+    Res: IntoFuture,
+{
+    fn into_new_transform(self) -> FnNewTransform<F, S, Req, Res, Err> {
+        FnNewTransform::new(self)
+    }
+}
+
+impl<F, S, Req, Res, Err> Clone for FnNewTransform<F, S, Req, Res, Err>
+where
+    F: FnMut(Req, &mut S) -> Res + Clone,
+    Res: IntoFuture,
+{
+    fn clone(&self) -> Self {
+        Self::new(self.f.clone())
+    }
+}

actix-service/src/lib.rs

@@ -2,24 +2,33 @@ use futures::{Future, IntoFuture, Poll};
 
 mod and_then;
 mod and_then_apply;
+mod and_then_apply_fn;
 mod apply;
+mod blank;
 mod cell;
 mod fn_service;
+mod fn_transform;
 mod from_err;
 mod map;
 mod map_err;
 mod map_init_err;
 mod then;
+mod transform;
+mod transform_map_err;
 
 pub use self::and_then::{AndThen, AndThenNewService};
-pub use self::and_then_apply::{AndThenApply, AndThenApplyNewService};
+use self::and_then_apply::{AndThenTransform, AndThenTransformNewService};
+use self::and_then_apply_fn::{AndThenApply, AndThenApplyNewService};
 pub use self::apply::{Apply, ApplyNewService};
+pub use self::blank::{Blank, BlankNewService};
 pub use self::fn_service::{FnNewService, FnService};
+pub use self::fn_transform::{FnNewTransform, FnTransform};
 pub use self::from_err::{FromErr, FromErrNewService};
 pub use self::map::{Map, MapNewService};
 pub use self::map_err::{MapErr, MapErrNewService};
 pub use self::map_init_err::MapInitErr;
 pub use self::then::{Then, ThenNewService};
+pub use self::transform::{IntoNewTransform, IntoTransform, NewTransform, Transform};
 
 /// An asynchronous function from `Request` to a `Response`.
 pub trait Service {
@@ -61,16 +70,30 @@ pub trait Service {
 /// An extension trait for `Service`s that provides a variety of convenient
 /// adapters
 pub trait ServiceExt: Service {
-    /// Apply function to specified service and use it as a next service in
+    /// Apply tranformation to specified service and use it as a next service in
     /// chain.
-    fn apply<B, I, F, Out, Req>(self, service: I, f: F) -> AndThenApply<Self, B, F, Out>
+    fn apply<T, T1, B, B1>(self, transform: T1, service: B1) -> AndThenTransform<T, Self, B>
+    where
+        Self: Sized,
+        T: Transform<B, Request = Self::Response>,
+        T::Error: From<Self::Error>,
+        T1: IntoTransform<T, B>,
+        B: Service<Error = Self::Error>,
+        B1: IntoService<B>,
+    {
+        AndThenTransform::new(transform.into_transform(), self, service.into_service())
+    }
+
+    /// Apply function to specified service and use it as a next service in
+    /// chain.
+    fn apply_fn<F, B, B1, Out>(self, service: B1, f: F) -> AndThenApply<Self, B, F, Out>
     where
         Self: Sized,
-        B: Service<Request = Req, Error = Self::Error>,
-        I: IntoService<B>,
         F: FnMut(Self::Response, &mut B) -> Out,
         Out: IntoFuture,
         Out::Error: Into<Self::Error>,
+        B: Service<Error = Self::Error>,
+        B1: IntoService<B>,
     {
         AndThenApply::new(self, service, f)
     }
@@ -190,14 +213,32 @@ pub trait NewService {
 
     /// Apply function to specified service and use it as a next service in
     /// chain.
-    fn apply<B, I, F, Out, Req>(
+    fn apply<T, T1, B, B1>(
         self,
-        service: I,
-        f: F,
-    ) -> AndThenApplyNewService<Self, B, F, Out>
+        transform: T1,
+        service: B1,
+    ) -> AndThenTransformNewService<T, Self, B>
     where
         Self: Sized,
-        B: NewService<Request = Req, Error = Self::Error, InitError = Self::InitError>,
+        T: NewTransform<B::Service, Request = Self::Response, InitError = Self::InitError>,
+        T::Error: From<Self::Error>,
+        T1: IntoNewTransform<T, B::Service>,
+        B: NewService<Error = Self::Error, InitError = Self::InitError>,
+        B1: IntoNewService<B>,
+    {
+        AndThenTransformNewService::new(
+            transform.into_new_transform(),
+            self,
+            service.into_new_service(),
+        )
+    }
+
+    /// Apply function to specified service and use it as a next service in
+    /// chain.
+    fn apply_fn<B, I, F, Out>(self, service: I, f: F) -> AndThenApplyNewService<Self, B, F, Out>
+    where
+        Self: Sized,
+        B: NewService<Error = Self::Error, InitError = Self::InitError>,
         I: IntoNewService<B>,
         F: FnMut(Self::Response, &mut B::Service) -> Out,
         Out: IntoFuture,
@@ -345,7 +386,7 @@ where
     fn into_service(self) -> T;
 }
 
-/// Trait for types that can be converted to a Service
+/// Trait for types that can be converted to a `NewService`
 pub trait IntoNewService<T>
 where
     T: NewService,

actix-service/src/transform.rs

@@ -0,0 +1,157 @@
+use futures::{Future, Poll};
+
+use crate::transform_map_err::{TransformMapErr, TransformMapErrNewTransform};
+use crate::Service;
+
+/// An asynchronous function for transforming service call result.
+pub trait Transform<Service> {
+    /// Requests handled by the service.
+    type Request;
+
+    /// Responses given by the service.
+    type Response;
+
+    /// Errors produced by the service.
+    type Error;
+
+    /// The future response value.
+    type Future: Future<Item = Self::Response, Error = Self::Error>;
+
+    /// Returns `Ready` when the service is able to process requests.
+    ///
+    /// This method is similar to `Service::poll_ready` method.
+    fn poll_ready(&mut self) -> Poll<(), Self::Error>;
+
+    /// Process the request and apply it to provided service,
+    /// return the response asynchronously.
+    fn call(&mut self, request: Self::Request, service: &mut Service) -> Self::Future;
+
+    /// Map this transform's error to a different error, returning a new transform.
+    ///
+    /// This function is similar to the `Result::map_err` where it will change
+    /// the error type of the underlying transform. This is useful for example to
+    /// ensure that services and transforms have the same error type.
+    ///
+    /// Note that this function consumes the receiving transform and returns a
+    /// wrapped version of it.
+    fn map_err<F, E>(self, f: F) -> TransformMapErr<Self, Service, F, E>
+    where
+        Self: Sized,
+        F: Fn(Self::Error) -> E,
+    {
+        TransformMapErr::new(self, f)
+    }
+}
+
+/// `Transform` service factory
+pub trait NewTransform<Service> {
+    /// Requests handled by the service.
+    type Request;
+
+    /// Responses given by the service.
+    type Response;
+
+    /// Errors produced by the service.
+    type Error;
+
+    /// The `TransformService` value created by this factory
+    type Transform: Transform<
+        Service,
+        Request = Self::Request,
+        Response = Self::Response,
+        Error = Self::Error,
+    >;
+
+    /// Errors produced while building a service.
+    type InitError;
+
+    /// The future response value.
+    type Future: Future<Item = Self::Transform, Error = Self::InitError>;
+
+    /// Create and return a new service value asynchronously.
+    fn new_transform(&self) -> Self::Future;
+
+    /// Map this transforms's output to a different type, returning a new transform
+    /// of the resulting type.
+    fn map_err<F, E>(self, f: F) -> TransformMapErrNewTransform<Self, Service, F, E>
+    where
+        Self: Sized,
+        F: Fn(Self::Error) -> E,
+    {
+        TransformMapErrNewTransform::new(self, f)
+    }
+}
+
+impl<'a, T, S> Transform<S> for &'a mut T
+where
+    T: Transform<S> + 'a,
+    S: Service<Error = T::Error>,
+{
+    type Request = T::Request;
+    type Response = T::Response;
+    type Error = T::Error;
+    type Future = T::Future;
+
+    fn poll_ready(&mut self) -> Poll<(), T::Error> {
+        (**self).poll_ready()
+    }
+
+    fn call(&mut self, request: Self::Request, service: &mut S) -> T::Future {
+        (**self).call(request, service)
+    }
+}
+
+impl<T, S> Transform<S> for Box<T>
+where
+    T: Transform<S> + ?Sized,
+    S: Service<Error = T::Error>,
+{
+    type Request = T::Request;
+    type Response = T::Response;
+    type Error = T::Error;
+    type Future = T::Future;
+
+    fn poll_ready(&mut self) -> Poll<(), S::Error> {
+        (**self).poll_ready()
+    }
+
+    fn call(&mut self, request: Self::Request, service: &mut S) -> T::Future {
+        (**self).call(request, service)
+    }
+}
+
+/// Trait for types that can be converted to a `TransformService`
+pub trait IntoTransform<T, S>
+where
+    T: Transform<S>,
+{
+    /// Convert to a `TransformService`
+    fn into_transform(self) -> T;
+}
+
+/// Trait for types that can be converted to a TransfromNewService
+pub trait IntoNewTransform<T, S>
+where
+    T: NewTransform<S>,
+{
+    /// Convert to an `TranformNewService`
+    fn into_new_transform(self) -> T;
+}
+
+impl<T, S> IntoTransform<T, S> for T
+where
+    T: Transform<S>,
+{
+    fn into_transform(self) -> T {
+        self
+    }
+}
+
+impl<T, S> IntoNewTransform<T, S> for T
+where
+    T: NewTransform<S>,
+{
+    fn into_new_transform(self) -> T {
+        self
+    }
+}

actix-service/src/transform_map_err.rs

@@ -0,0 +1,188 @@
+use std::marker::PhantomData;
+
+use futures::{Async, Future, Poll};
+
+use super::{NewTransform, Transform};
+
+/// Service for the `map_err` combinator, changing the type of a transform's
+/// error.
+///
+/// This is created by the `Transform::map_err` method.
+pub struct TransformMapErr<T, S, F, E> {
+    transform: T,
+    f: F,
+    _t: PhantomData<(S, E)>,
+}
+
+impl<T, S, F, E> TransformMapErr<T, S, F, E> {
+    /// Create new `MapErr` combinator
+    pub fn new(transform: T, f: F) -> Self
+    where
+        T: Transform<S>,
+        F: Fn(T::Error) -> E,
+    {
+        Self {
+            transform,
+            f,
+            _t: PhantomData,
+        }
+    }
+}
+
+impl<T, S, F, E> Clone for TransformMapErr<T, S, F, E>
+where
+    T: Clone,
+    F: Clone,
+{
+    fn clone(&self) -> Self {
+        TransformMapErr {
+            transform: self.transform.clone(),
+            f: self.f.clone(),
+            _t: PhantomData,
+        }
+    }
+}
+
+impl<T, S, F, E> Transform<S> for TransformMapErr<T, S, F, E>
+where
+    T: Transform<S>,
+    F: Fn(T::Error) -> E + Clone,
+{
+    type Request = T::Request;
+    type Response = T::Response;
+    type Error = E;
+    type Future = TransformMapErrFuture<T, S, F, E>;
+
+    fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+        self.transform.poll_ready().map_err(&self.f)
+    }
+
+    fn call(&mut self, req: T::Request, service: &mut S) -> Self::Future {
+        TransformMapErrFuture::new(self.transform.call(req, service), self.f.clone())
+    }
+}
+
+pub struct TransformMapErrFuture<T, S, F, E>
+where
+    T: Transform<S>,
+    F: Fn(T::Error) -> E,
+{
+    f: F,
+    fut: T::Future,
+}
+
+impl<T, S, F, E> TransformMapErrFuture<T, S, F, E>
+where
+    T: Transform<S>,
+    F: Fn(T::Error) -> E,
+{
+    fn new(fut: T::Future, f: F) -> Self {
+        TransformMapErrFuture { f, fut }
+    }
+}
+
+impl<T, S, F, E> Future for TransformMapErrFuture<T, S, F, E>
+where
+    T: Transform<S>,
+    F: Fn(T::Error) -> E,
+{
+    type Item = T::Response;
+    type Error = E;
+
+    fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
+        self.fut.poll().map_err(&self.f)
+    }
+}
+
+/// NewTransform for the `map_err` combinator, changing the type of a new
+/// transform's error.
+///
+/// This is created by the `NewTransform::map_err` method.
+pub struct TransformMapErrNewTransform<T, S, F, E> {
+    t: T,
+    f: F,
+    e: PhantomData<(S, E)>,
+}
+
+impl<T, S, F, E> TransformMapErrNewTransform<T, S, F, E> {
+    /// Create new `MapErr` new service instance
+    pub fn new(t: T, f: F) -> Self
+    where
+        T: NewTransform<S>,
+        F: Fn(T::Error) -> E,
+    {
+        Self {
+            t,
+            f,
+            e: PhantomData,
+        }
+    }
+}
+
+impl<T, S, F, E> Clone for TransformMapErrNewTransform<T, S, F, E>
+where
+    T: Clone,
+    F: Clone,
+{
+    fn clone(&self) -> Self {
+        Self {
+            t: self.t.clone(),
+            f: self.f.clone(),
+            e: PhantomData,
+        }
+    }
+}
+
+impl<T, S, F, E> NewTransform<S> for TransformMapErrNewTransform<T, S, F, E>
+where
+    T: NewTransform<S>,
+    F: Fn(T::Error) -> E + Clone,
+{
+    type Request = T::Request;
+    type Response = T::Response;
+    type Error = E;
+    type Transform = TransformMapErr<T::Transform, S, F, E>;
+
+    type InitError = T::InitError;
+    type Future = TransformMapErrNewTransformFuture<T, S, F, E>;
+
+    fn new_transform(&self) -> Self::Future {
+        TransformMapErrNewTransformFuture::new(self.t.new_transform(), self.f.clone())
+    }
+}
+
+pub struct TransformMapErrNewTransformFuture<T, S, F, E>
+where
+    T: NewTransform<S>,
+    F: Fn(T::Error) -> E,
+{
+    fut: T::Future,
+    f: F,
+}
+
+impl<T, S, F, E> TransformMapErrNewTransformFuture<T, S, F, E>
+where
+    T: NewTransform<S>,
+    F: Fn(T::Error) -> E,
+{
+    fn new(fut: T::Future, f: F) -> Self {
+        TransformMapErrNewTransformFuture { f, fut }
+    }
+}
+
+impl<T, S, F, E> Future for TransformMapErrNewTransformFuture<T, S, F, E>
+where
+    T: NewTransform<S>,
+    F: Fn(T::Error) -> E + Clone,
+{
+    type Item = TransformMapErr<T::Transform, S, F, E>;
+    type Error = T::InitError;
+
+    fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
+        if let Async::Ready(tr) = self.fut.poll()? {
+            Ok(Async::Ready(TransformMapErr::new(tr, self.f.clone())))
+        } else {
+            Ok(Async::NotReady)
+        }
+    }
+}

actix-test-server/Cargo.toml

@@ -34,8 +34,7 @@ rust-tls = ["rustls", "tokio-rustls", "webpki", "webpki-roots"]
 
 [dependencies]
 actix-rt = "0.1.0"
-#actix-server = "0.1.0"
-actix-server = { path="../actix-server" }
+actix-server = "0.2.0"
 
 log = "0.4"
 

actix-utils/CHANGES.md

@@ -1,5 +1,17 @@
 # Changes
 
+## [0.2.1] - 2019-02-06
+
+### Added
+
+* Add `InOrder` service. the service yields responses as they become available,
+  in the order that their originating requests were submitted to the service.
+
+### Changed
+
+* Convert `Timeout` and `InFlight` services to a transforms
+
+
 ## [0.2.0] - 2019-02-01
 
 * Fix framed transport error handling

actix-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-utils"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix utils - various actix net related services"
 keywords = ["network", "framework", "async", "futures"]
@@ -18,7 +18,7 @@ name = "actix_utils"
 path = "src/lib.rs"
 
 [dependencies]
-actix-service = "0.2.0"
+actix-service = "0.2.1"
 actix-codec = "0.1.0"
 bytes = "0.4"
 futures = "0.1"

actix-utils/src/inflight.rs

@@ -1,5 +1,6 @@
-use actix_service::{IntoNewService, IntoService, NewService, Service};
-use futures::{try_ready, Async, Future, Poll};
+use actix_service::{NewTransform, Service, Transform};
+use futures::future::{ok, FutureResult};
+use futures::{Async, Future, Poll};
 
 use super::counter::{Counter, CounterGuard};
 
@@ -7,98 +8,48 @@ use super::counter::{Counter, CounterGuard};
 /// async requests.
 ///
 /// Default number of in-flight requests is 15
-pub struct InFlight<T> {
-    factory: T,
+pub struct InFlight {
     max_inflight: usize,
 }
 
-impl<T> InFlight<T> {
-    pub fn new<F>(factory: F) -> Self
-    where
-        T: NewService,
-        F: IntoNewService<T>,
-    {
-        Self {
-            factory: factory.into_new_service(),
-            max_inflight: 15,
-        }
-    }
-
-    /// Set max number of in-flight requests.
-    ///
-    /// By default max in-flight requests is 15.
-    pub fn max_inflight(mut self, max: usize) -> Self {
-        self.max_inflight = max;
-        self
+impl InFlight {
+    pub fn new(max: usize) -> Self {
+        Self { max_inflight: max }
     }
 }
 
-impl<T> NewService for InFlight<T>
-where
-    T: NewService,
-{
+impl Default for InFlight {
+    fn default() -> Self {
+        Self::new(15)
+    }
+}
+
+impl<T: Service> NewTransform<T> for InFlight {
     type Request = T::Request;
     type Response = T::Response;
     type Error = T::Error;
-    type InitError = T::InitError;
-    type Service = InFlightService<T::Service>;
-    type Future = InFlightResponseFuture<T>;
+    type InitError = ();
+    type Transform = InFlightService;
+    type Future = FutureResult<Self::Transform, Self::InitError>;
 
-    fn new_service(&self) -> Self::Future {
-        InFlightResponseFuture {
-            fut: self.factory.new_service(),
-            max_inflight: self.max_inflight,
-        }
+    fn new_transform(&self) -> Self::Future {
+        ok(InFlightService::new(self.max_inflight))
     }
 }
 
-pub struct InFlightResponseFuture<T: NewService> {
-    fut: T::Future,
-    max_inflight: usize,
-}
-
-impl<T: NewService> Future for InFlightResponseFuture<T> {
-    type Item = InFlightService<T::Service>;
-    type Error = T::InitError;
-
-    fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
-        Ok(Async::Ready(InFlightService::with_max_inflight(
-            self.max_inflight,
-            try_ready!(self.fut.poll()),
-        )))
-    }
-}
-
-pub struct InFlightService<T> {
-    service: T,
+pub struct InFlightService {
     count: Counter,
 }
 
-impl<T> InFlightService<T> {
-    pub fn new<F>(service: F) -> Self
-    where
-        T: Service,
-        F: IntoService<T>,
-    {
+impl InFlightService {
+    pub fn new(max: usize) -> Self {
         Self {
-            service: service.into_service(),
-            count: Counter::new(15),
-        }
-    }
-
-    pub fn with_max_inflight<F>(max: usize, service: F) -> Self
-    where
-        T: Service,
-        F: IntoService<T>,
-    {
-        Self {
-            service: service.into_service(),
             count: Counter::new(max),
         }
     }
 }
 
-impl<T> Service for InFlightService<T>
+impl<T> Transform<T> for InFlightService
 where
     T: Service,
 {
@@ -108,17 +59,17 @@ where
     type Future = InFlightServiceResponse<T>;
 
     fn poll_ready(&mut self) -> Poll<(), Self::Error> {
-        let res = self.service.poll_ready()?;
-        if res.is_ready() && !self.count.available() {
+        if !self.count.available() {
             log::trace!("InFlight limit exceeded");
-            return Ok(Async::NotReady);
+            Ok(Async::NotReady)
+        } else {
+            Ok(Async::Ready(()))
         }
-        Ok(res)
     }
 
-    fn call(&mut self, req: T::Request) -> Self::Future {
+    fn call(&mut self, req: T::Request, service: &mut T) -> Self::Future {
         InFlightServiceResponse {
-            fut: self.service.call(req),
+            fut: service.call(req),
             _guard: self.count.get(),
         }
     }
@@ -138,3 +89,73 @@ impl<T: Service> Future for InFlightServiceResponse<T> {
         self.fut.poll()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use futures::future::lazy;
+    use futures::{Async, Poll};
+
+    use std::time::Duration;
+
+    use super::*;
+    use actix_service::{Blank, BlankNewService, NewService, Service, ServiceExt};
+
+    struct SleepService(Duration);
+
+    impl Service for SleepService {
+        type Request = ();
+        type Response = ();
+        type Error = ();
+        type Future = Box<Future<Item = (), Error = ()>>;
+
+        fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+            Ok(Async::Ready(()))
+        }
+
+        fn call(&mut self, _: ()) -> Self::Future {
+            Box::new(tokio_timer::sleep(self.0).map_err(|_| ()))
+        }
+    }
+
+    #[test]
+    fn test_transform() {
+        let wait_time = Duration::from_millis(50);
+        let _ = actix_rt::System::new("test").block_on(lazy(|| {
+            let mut srv = Blank::new().apply(InFlightService::new(1), SleepService(wait_time));
+            assert_eq!(srv.poll_ready(), Ok(Async::Ready(())));
+
+            let mut res = srv.call(());
+            let _ = res.poll();
+            assert_eq!(srv.poll_ready(), Ok(Async::NotReady));
+
+            drop(res);
+            assert_eq!(srv.poll_ready(), Ok(Async::Ready(())));
+
+            Ok::<_, ()>(())
+        }));
+    }
+
+    #[test]
+    fn test_newtransform() {
+        let wait_time = Duration::from_millis(50);
+        let _ = actix_rt::System::new("test").block_on(lazy(|| {
+            let srv =
+                BlankNewService::new().apply(InFlight::new(1), || Ok(SleepService(wait_time)));
+
+            if let Async::Ready(mut srv) = srv.new_service().poll().unwrap() {
+                assert_eq!(srv.poll_ready(), Ok(Async::Ready(())));
+
+                let mut res = srv.call(());
+                let _ = res.poll();
+                assert_eq!(srv.poll_ready(), Ok(Async::NotReady));
+
+                drop(res);
+                assert_eq!(srv.poll_ready(), Ok(Async::Ready(())));
+            } else {
+                panic!()
+            }
+
+            Ok::<_, ()>(())
+        }));
+    }
+}

actix-utils/src/keepalive.rs

@@ -112,7 +112,7 @@ where
                 }
             }
             Ok(Async::NotReady) => Ok(Async::Ready(())),
-            Err(_) => panic!(),
+            Err(_e) => panic!(),
         }
     }
 

actix-utils/src/lib.rs

@@ -6,6 +6,7 @@ pub mod either;
 pub mod framed;
 pub mod inflight;
 pub mod keepalive;
+pub mod order;
 pub mod stream;
 pub mod time;
 pub mod timeout;

actix-utils/src/order.rs

@@ -0,0 +1,274 @@
+use std::collections::VecDeque;
+use std::fmt;
+use std::marker::PhantomData;
+use std::rc::Rc;
+
+use actix_service::{NewTransform, Service, Transform};
+use futures::future::{ok, FutureResult};
+use futures::task::AtomicTask;
+use futures::unsync::oneshot;
+use futures::{Async, Future, Poll};
+
+struct Record<I, E> {
+    rx: oneshot::Receiver<Result<I, E>>,
+    tx: oneshot::Sender<Result<I, E>>,
+}
+
+/// Timeout error
+pub enum InOrderError<E> {
+    /// Service error
+    Service(E),
+    /// Service call dropped
+    Disconnected,
+}
+
+impl<E> From<E> for InOrderError<E> {
+    fn from(err: E) -> Self {
+        InOrderError::Service(err)
+    }
+}
+
+impl<E: fmt::Debug> fmt::Debug for InOrderError<E> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            InOrderError::Service(e) => write!(f, "InOrderError::Service({:?})", e),
+            InOrderError::Disconnected => write!(f, "InOrderError::Disconnected"),
+        }
+    }
+}
+
+/// InOrder - The service will yield responses as they become available,
+/// in the order that their originating requests were submitted to the service.
+pub struct InOrder<S> {
+    _t: PhantomData<S>,
+}
+
+impl<S> InOrder<S>
+where
+    S: Service,
+    S::Response: 'static,
+    S::Future: 'static,
+    S::Error: 'static,
+{
+    pub fn new() -> Self {
+        Self { _t: PhantomData }
+    }
+
+    pub fn service() -> impl Transform<
+        S,
+        Request = S::Request,
+        Response = S::Response,
+        Error = InOrderError<S::Error>,
+    > {
+        InOrderService::new()
+    }
+}
+
+impl<S> Default for InOrder<S>
+where
+    S: Service,
+    S::Response: 'static,
+    S::Future: 'static,
+    S::Error: 'static,
+{
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<S> NewTransform<S> for InOrder<S>
+where
+    S: Service,
+    S::Response: 'static,
+    S::Future: 'static,
+    S::Error: 'static,
+{
+    type Request = S::Request;
+    type Response = S::Response;
+    type Error = InOrderError<S::Error>;
+    type InitError = ();
+    type Transform = InOrderService<S>;
+    type Future = FutureResult<Self::Transform, Self::InitError>;
+
+    fn new_transform(&self) -> Self::Future {
+        ok(InOrderService::new())
+    }
+}
+
+pub struct InOrderService<S: Service> {
+    task: Rc<AtomicTask>,
+    acks: VecDeque<Record<S::Response, S::Error>>,
+}
+
+impl<S> InOrderService<S>
+where
+    S: Service,
+    S::Response: 'static,
+    S::Future: 'static,
+    S::Error: 'static,
+{
+    pub fn new() -> Self {
+        Self {
+            acks: VecDeque::new(),
+            task: Rc::new(AtomicTask::new()),
+        }
+    }
+}
+
+impl<S> Default for InOrderService<S>
+where
+    S: Service,
+    S::Response: 'static,
+    S::Future: 'static,
+    S::Error: 'static,
+{
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<S> Transform<S> for InOrderService<S>
+where
+    S: Service,
+    S::Response: 'static,
+    S::Future: 'static,
+    S::Error: 'static,
+{
+    type Request = S::Request;
+    type Response = S::Response;
+    type Error = InOrderError<S::Error>;
+    type Future = InOrderServiceResponse<S>;
+
+    fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+        self.task.register();
+
+        // check acks
+        while !self.acks.is_empty() {
+            let rec = self.acks.front_mut().unwrap();
+            match rec.rx.poll() {
+                Ok(Async::Ready(res)) => {
+                    let rec = self.acks.pop_front().unwrap();
+                    let _ = rec.tx.send(res);
+                }
+                Ok(Async::NotReady) => break,
+                Err(oneshot::Canceled) => return Err(InOrderError::Disconnected),
+            }
+        }
+
+        Ok(Async::Ready(()))
+    }
+
+    fn call(&mut self, request: S::Request, service: &mut S) -> Self::Future {
+        let (tx1, rx1) = oneshot::channel();
+        let (tx2, rx2) = oneshot::channel();
+        self.acks.push_back(Record { rx: rx1, tx: tx2 });
+
+        let task = self.task.clone();
+        tokio_current_thread::spawn(service.call(request).then(move |res| {
+            task.notify();
+            let _ = tx1.send(res);
+            Ok(())
+        }));
+
+        InOrderServiceResponse { rx: rx2 }
+    }
+}
+
+#[doc(hidden)]
+pub struct InOrderServiceResponse<S: Service> {
+    rx: oneshot::Receiver<Result<S::Response, S::Error>>,
+}
+
+impl<S: Service> Future for InOrderServiceResponse<S> {
+    type Item = S::Response;
+    type Error = InOrderError<S::Error>;
+
+    fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
+        match self.rx.poll() {
+            Ok(Async::NotReady) => Ok(Async::NotReady),
+            Ok(Async::Ready(Ok(res))) => Ok(Async::Ready(res)),
+            Ok(Async::Ready(Err(e))) => Err(e.into()),
+            Err(oneshot::Canceled) => Err(InOrderError::Disconnected),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use futures::future::{lazy, Future};
+    use futures::{stream::futures_unordered, sync::oneshot, Async, Poll, Stream};
+
+    use std::time::Duration;
+
+    use super::*;
+    use actix_service::{Blank, Service, ServiceExt};
+
+    struct Srv;
+
+    impl Service for Srv {
+        type Request = oneshot::Receiver<usize>;
+        type Response = usize;
+        type Error = ();
+        type Future = Box<Future<Item = usize, Error = ()>>;
+
+        fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+            Ok(Async::Ready(()))
+        }
+
+        fn call(&mut self, req: oneshot::Receiver<usize>) -> Self::Future {
+            Box::new(req.map_err(|_| ()))
+        }
+    }
+
+    struct SrvPoll<S: Service> {
+        s: S,
+    }
+
+    impl<S: Service> Future for SrvPoll<S> {
+        type Item = ();
+        type Error = ();
+
+        fn poll(&mut self) -> Poll<(), ()> {
+            let _ = self.s.poll_ready();
+            Ok(Async::NotReady)
+        }
+    }
+
+    #[test]
+    fn test_inorder() {
+        let (tx1, rx1) = oneshot::channel();
+        let (tx2, rx2) = oneshot::channel();
+        let (tx3, rx3) = oneshot::channel();
+        let (tx_stop, rx_stop) = oneshot::channel();
+
+        std::thread::spawn(move || {
+            let rx1 = rx1;
+            let rx2 = rx2;
+            let rx3 = rx3;
+            let tx_stop = tx_stop;
+            let _ = actix_rt::System::new("test").block_on(lazy(move || {
+                let mut srv = Blank::new().apply(InOrderService::new(), Srv);
+
+                let res1 = srv.call(rx1);
+                let res2 = srv.call(rx2);
+                let res3 = srv.call(rx3);
+                tokio_current_thread::spawn(SrvPoll { s: srv });
+
+                futures_unordered(vec![res1, res2, res3])
+                    .collect()
+                    .and_then(move |res: Vec<_>| {
+                        assert_eq!(res, vec![1, 2, 3]);
+                        let _ = tx_stop.send(());
+                        Ok(())
+                    })
+            }));
+        });
+
+        let _ = tx3.send(3);
+        std::thread::sleep(Duration::from_millis(50));
+        let _ = tx2.send(2);
+        let _ = tx1.send(1);
+
+        let _ = rx_stop.wait();
+    }
+}

actix-utils/src/time.rs

@@ -133,7 +133,7 @@ impl SystemTimeService {
     /// Get current time. This function has to be called from
     /// future's poll method, otherwise it panics.
     pub fn now(&self) -> time::SystemTime {
-        let cur = self.0.get_ref().current.clone();
+        let cur = self.0.get_ref().current;
         if let Some(cur) = cur {
             cur
         } else {

actix-utils/src/timeout.rs

@@ -3,18 +3,19 @@
 //! If the response does not complete within the specified timeout, the response
 //! will be aborted.
 use std::fmt;
+use std::marker::PhantomData;
 use std::time::Duration;
 
-use actix_service::{NewService, Service};
-use futures::try_ready;
+use actix_service::{NewTransform, Service, Transform};
+use futures::future::{ok, FutureResult};
 use futures::{Async, Future, Poll};
 use tokio_timer::{clock, Delay};
 
 /// Applies a timeout to requests.
 #[derive(Debug)]
-pub struct Timeout<T> {
-    inner: T,
+pub struct Timeout<E = ()> {
     timeout: Duration,
+    _t: PhantomData<E>,
 }
 
 /// Timeout error
@@ -25,6 +26,12 @@ pub enum TimeoutError<E> {
     Timeout,
 }
 
+impl<E> From<E> for TimeoutError<E> {
+    fn from(err: E) -> Self {
+        TimeoutError::Service(err)
+    }
+}
+
 impl<E: fmt::Debug> fmt::Debug for TimeoutError<E> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
@@ -34,107 +41,82 @@ impl<E: fmt::Debug> fmt::Debug for TimeoutError<E> {
     }
 }
 
-impl<T> Timeout<T> {
-    pub fn new(timeout: Duration, inner: T) -> Self
-    where
-        T: NewService + Clone,
-    {
-        Timeout { inner, timeout }
+impl<E: PartialEq> PartialEq for TimeoutError<E> {
+    fn eq(&self, other: &TimeoutError<E>) -> bool {
+        match self {
+            TimeoutError::Service(e1) => match other {
+                TimeoutError::Service(e2) => e1 == e2,
+                TimeoutError::Timeout => false,
+            },
+            TimeoutError::Timeout => match other {
+                TimeoutError::Service(_) => false,
+                TimeoutError::Timeout => true,
+            },
+        }
     }
 }
 
-impl<T> Clone for Timeout<T>
-where
-    T: Clone,
-{
-    fn clone(&self) -> Self {
+impl<E> Timeout<E> {
+    pub fn new(timeout: Duration) -> Self {
         Timeout {
-            inner: self.inner.clone(),
-            timeout: self.timeout,
+            timeout,
+            _t: PhantomData,
         }
     }
 }
 
-impl<T> NewService for Timeout<T>
-where
-    T: NewService + Clone,
-{
-    type Request = T::Request;
-    type Response = T::Response;
-    type Error = TimeoutError<T::Error>;
-    type InitError = T::InitError;
-    type Service = TimeoutService<T::Service>;
-    type Future = TimeoutFut<T>;
-
-    fn new_service(&self) -> Self::Future {
-        TimeoutFut {
-            fut: self.inner.new_service(),
-            timeout: self.timeout,
-        }
+impl<E> Clone for Timeout<E> {
+    fn clone(&self) -> Self {
+        Timeout::new(self.timeout)
     }
 }
 
-/// `Timeout` response future
-#[derive(Debug)]
-pub struct TimeoutFut<T: NewService> {
-    fut: T::Future,
-    timeout: Duration,
-}
-
-impl<T> Future for TimeoutFut<T>
+impl<S, E> NewTransform<S> for Timeout<E>
 where
-    T: NewService,
+    S: Service,
 {
-    type Item = TimeoutService<T::Service>;
-    type Error = T::InitError;
+    type Request = S::Request;
+    type Response = S::Response;
+    type Error = TimeoutError<S::Error>;
+    type InitError = E;
+    type Transform = TimeoutService;
+    type Future = FutureResult<Self::Transform, Self::InitError>;
 
-    fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
-        let service = try_ready!(self.fut.poll());
-        Ok(Async::Ready(TimeoutService::new(self.timeout, service)))
+    fn new_transform(&self) -> Self::Future {
+        ok(TimeoutService {
+            timeout: self.timeout,
+        })
     }
 }
 
 /// Applies a timeout to requests.
-#[derive(Debug)]
-pub struct TimeoutService<T> {
-    inner: T,
+#[derive(Debug, Clone)]
+pub struct TimeoutService {
     timeout: Duration,
 }
 
-impl<T> TimeoutService<T> {
-    pub fn new(timeout: Duration, inner: T) -> Self
-    where
-        T: Service,
-    {
-        TimeoutService { inner, timeout }
+impl TimeoutService {
+    pub fn new(timeout: Duration) -> Self {
+        TimeoutService { timeout }
     }
 }
 
-impl<T: Clone> Clone for TimeoutService<T> {
-    fn clone(&self) -> Self {
-        TimeoutService {
-            inner: self.inner.clone(),
-            timeout: self.timeout,
-        }
-    }
-}
-
-impl<T> Service for TimeoutService<T>
+impl<S> Transform<S> for TimeoutService
 where
-    T: Service,
+    S: Service,
 {
-    type Request = T::Request;
-    type Response = T::Response;
-    type Error = TimeoutError<T::Error>;
-    type Future = TimeoutServiceResponse<T>;
+    type Request = S::Request;
+    type Response = S::Response;
+    type Error = TimeoutError<S::Error>;
+    type Future = TimeoutServiceResponse<S>;
 
     fn poll_ready(&mut self) -> Poll<(), Self::Error> {
-        self.inner.poll_ready().map_err(TimeoutError::Service)
+        Ok(Async::Ready(()))
     }
 
-    fn call(&mut self, request: T::Request) -> Self::Future {
+    fn call(&mut self, request: S::Request, service: &mut S) -> Self::Future {
         TimeoutServiceResponse {
-            fut: self.inner.call(request),
+            fut: service.call(request),
             sleep: Delay::new(clock::now() + self.timeout),
         }
     }
@@ -170,3 +152,74 @@ where
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use futures::future::lazy;
+    use futures::{Async, Poll};
+
+    use std::time::Duration;
+
+    use super::*;
+    use actix_service::{Blank, BlankNewService, NewService, Service, ServiceExt};
+
+    struct SleepService(Duration);
+
+    impl Service for SleepService {
+        type Request = ();
+        type Response = ();
+        type Error = ();
+        type Future = Box<Future<Item = (), Error = ()>>;
+
+        fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+            Ok(Async::Ready(()))
+        }
+
+        fn call(&mut self, _: ()) -> Self::Future {
+            Box::new(tokio_timer::sleep(self.0).map_err(|_| ()))
+        }
+    }
+
+    #[test]
+    fn test_success() {
+        let resolution = Duration::from_millis(100);
+        let wait_time = Duration::from_millis(50);
+
+        let res = actix_rt::System::new("test").block_on(lazy(|| {
+            let mut timeout = Blank::default()
+                .apply(TimeoutService::new(resolution), SleepService(wait_time));
+            timeout.call(())
+        }));
+        assert_eq!(res, Ok(()));
+    }
+
+    #[test]
+    fn test_timeout() {
+        let resolution = Duration::from_millis(100);
+        let wait_time = Duration::from_millis(150);
+
+        let res = actix_rt::System::new("test").block_on(lazy(|| {
+            let mut timeout = Blank::default()
+                .apply(TimeoutService::new(resolution), SleepService(wait_time));
+            timeout.call(())
+        }));
+        assert_eq!(res, Err(TimeoutError::Timeout));
+    }
+
+    #[test]
+    fn test_timeout_newservice() {
+        let resolution = Duration::from_millis(100);
+        let wait_time = Duration::from_millis(150);
+
+        let res = actix_rt::System::new("test").block_on(lazy(|| {
+            let timeout = BlankNewService::<_, _, ()>::default()
+                .apply(Timeout::new(resolution), || Ok(SleepService(wait_time)));
+            if let Async::Ready(mut to) = timeout.new_service().poll().unwrap() {
+                to.call(())
+            } else {
+                panic!()
+            }
+        }));
+        assert_eq!(res, Err(TimeoutError::Timeout));
+    }
+}