From a97d7f0ccfa1190b979f91c5a87b7cf040e4d4f1 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Thu, 21 Feb 2019 10:41:39 -0800
Subject: [PATCH] add BoxedNewService and BoxedService

---
 actix-utils/CHANGES.md   |   7 +++
 actix-utils/Cargo.toml   |   2 +-
 actix-utils/src/boxed.rs | 102 +++++++++++++++++++++++++++++++++++++++
 actix-utils/src/lib.rs   |   1 +
 4 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 actix-utils/src/boxed.rs

diff --git a/actix-utils/CHANGES.md b/actix-utils/CHANGES.md
index 7bc18b4b..a28ef8b4 100644
--- a/actix-utils/CHANGES.md
+++ b/actix-utils/CHANGES.md
@@ -1,5 +1,12 @@
 # Changes
 
+## [0.2.3] - 2019-02-21
+
+### Added
+
+* Add `BoxedNewService` and `BoxedService`
+
+
 ## [0.2.2] - 2019-02-11
 
 ### Added
diff --git a/actix-utils/Cargo.toml b/actix-utils/Cargo.toml
index aa626e03..a69de3ca 100644
--- a/actix-utils/Cargo.toml
+++ b/actix-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-utils"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix utils - various actix net related services"
 keywords = ["network", "framework", "async", "futures"]
diff --git a/actix-utils/src/boxed.rs b/actix-utils/src/boxed.rs
new file mode 100644
index 00000000..56cfbdde
--- /dev/null
+++ b/actix-utils/src/boxed.rs
@@ -0,0 +1,102 @@
+use actix_service::{NewService, Service};
+use futures::{Future, Poll};
+
+pub type BoxedService<Req, Res, Err> = Box<
+    Service<
+        Request = Req,
+        Response = Res,
+        Error = Err,
+        Future = Box<Future<Item = Res, Error = Err>>,
+    >,
+>;
+
+pub type BoxedNewService<Req, Res, Err, InitErr> = Box<
+    NewService<
+        Request = Req,
+        Response = Res,
+        Error = Err,
+        InitError = InitErr,
+        Service = BoxedService<Req, Res, Err>,
+        Future = Box<Future<Item = BoxedService<Req, Res, Err>, Error = InitErr>>,
+    >,
+>;
+
+/// Create boxed new service
+pub fn new_service<T>(
+    service: T,
+) -> BoxedNewService<T::Request, T::Response, T::Error, T::InitError>
+where
+    T: NewService + 'static,
+    T::Service: 'static,
+{
+    Box::new(NewServiceWrapper(service))
+}
+
+/// Create boxed service
+pub fn service<T>(service: T) -> BoxedService<T::Request, T::Response, T::Error>
+where
+    T: Service + 'static,
+    T::Future: 'static,
+{
+    Box::new(ServiceWrapper(service))
+}
+
+struct NewServiceWrapper<T: NewService>(T);
+
+impl<T, Req, Res, Err, InitErr> NewService for NewServiceWrapper<T>
+where
+    Req: 'static,
+    Res: 'static,
+    Err: 'static,
+    InitErr: 'static,
+    T: NewService<Request = Req, Response = Res, Error = Err, InitError = InitErr>,
+    T::Future: 'static,
+    T::Service: 'static,
+    <T::Service as Service>::Future: 'static,
+{
+    type Request = Req;
+    type Response = Res;
+    type Error = Err;
+    type InitError = InitErr;
+    type Service = BoxedService<Req, Res, Err>;
+    type Future = Box<Future<Item = Self::Service, Error = Self::InitError>>;
+
+    fn new_service(&self) -> Self::Future {
+        Box::new(
+            self.0
+                .new_service()
+                .map(|service| ServiceWrapper::boxed(service)),
+        )
+    }
+}
+
+struct ServiceWrapper<T: Service>(T);
+
+impl<T> ServiceWrapper<T>
+where
+    T: Service + 'static,
+    T::Future: 'static,
+{
+    fn boxed(service: T) -> BoxedService<T::Request, T::Response, T::Error> {
+        Box::new(ServiceWrapper(service))
+    }
+}
+
+impl<T, Req, Res, Err> Service for ServiceWrapper<T>
+where
+    T: Service<Request = Req, Response = Res, Error = Err>,
+    T::Future: 'static,
+{
+    type Request = Req;
+    type Response = Res;
+    type Error = Err;
+    type Future = Box<Future<Item = Self::Response, Error = Self::Error>>;
+
+    fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+        self.0.poll_ready()
+    }
+
+    fn call(&mut self, req: Self::Request) -> Self::Future {
+        Box::new(self.0.call(req))
+    }
+}
diff --git a/actix-utils/src/lib.rs b/actix-utils/src/lib.rs
index 15bff92b..bb5443e3 100644
--- a/actix-utils/src/lib.rs
+++ b/actix-utils/src/lib.rs
@@ -1,4 +1,5 @@
 //! Actix utils - various helper services
+pub mod boxed;
 mod cell;
 pub mod cloneable;
 pub mod counter;