feat(service): introduce hyper-specific Service
				
					
				
			This introduces the `hyper::service` module, which replaces `tokio-service`. Since the trait is specific to hyper, its associated types have been adjusted. It didn't make sense to need to define `Service<Request=http::Request>`, since we already know the context is HTTP. Instead, the request and response bodies are associated types now, and slightly stricter bounds have been placed on `Error`. The helpers `service_fn` and `service_fn_ok` should be sufficient for now to ease creating `Service`s. The `NewService` trait now allows service creation to also be asynchronous. These traits are similar to `tower` in nature, and possibly will be replaced completely by it in the future. For now, hyper defining its own allows the traits to have better context, and prevents breaking changes in `tower` from affecting hyper. Closes #1461 BREAKING CHANGE: The `Service` trait has changed: it has some changed associated types, and `call` is now bound to `&mut self`. The `NewService` trait has changed: it has some changed associated types, and `new_service` now returns a `Future`. `Client` no longer implements `Service` for now. `hyper::server::conn::Serve` now returns `Connecting` instead of `Connection`s, since `new_service` can now return a `Future`. The `Connecting` is a future wrapping the new service future, returning a `Connection` afterwards. In many cases, `Future::flatten` can be used.
This commit is contained in:
		| @@ -5,37 +5,27 @@ extern crate pretty_env_logger; | ||||
| extern crate tokio; | ||||
|  | ||||
| use futures::Future; | ||||
| use futures::future::{FutureResult}; | ||||
|  | ||||
| use hyper::{Body, Method, Request, Response, StatusCode}; | ||||
| use hyper::server::{Server, Service}; | ||||
| use hyper::{Body, Method, Request, Response, Server, StatusCode}; | ||||
| use hyper::service::service_fn_ok; | ||||
|  | ||||
| static INDEX: &'static [u8] = b"Try POST /echo"; | ||||
|  | ||||
| struct Echo; | ||||
|  | ||||
| impl Service for Echo { | ||||
|     type Request = Request<Body>; | ||||
|     type Response = Response<Body>; | ||||
|     type Error = hyper::Error; | ||||
|     type Future = FutureResult<Self::Response, Self::Error>; | ||||
|  | ||||
|     fn call(&self, req: Self::Request) -> Self::Future { | ||||
|         futures::future::ok(match (req.method(), req.uri().path()) { | ||||
|             (&Method::GET, "/") | (&Method::POST, "/") => { | ||||
|                 Response::new(INDEX.into()) | ||||
|             }, | ||||
|             (&Method::POST, "/echo") => { | ||||
|                 Response::new(req.into_body()) | ||||
|             }, | ||||
|             _ => { | ||||
|                 let mut res = Response::new(Body::empty()); | ||||
|                 *res.status_mut() = StatusCode::NOT_FOUND; | ||||
|                 res | ||||
|             } | ||||
|         }) | ||||
| // Using service_fn_ok, we can convert this function into a `Service`. | ||||
| fn echo(req: Request<Body>) -> Response<Body> { | ||||
|    match (req.method(), req.uri().path()) { | ||||
|         (&Method::GET, "/") | (&Method::POST, "/") => { | ||||
|             Response::new(INDEX.into()) | ||||
|         }, | ||||
|         (&Method::POST, "/echo") => { | ||||
|             Response::new(req.into_body()) | ||||
|         }, | ||||
|         _ => { | ||||
|             let mut res = Response::new(Body::empty()); | ||||
|             *res.status_mut() = StatusCode::NOT_FOUND; | ||||
|             res | ||||
|         } | ||||
|     } | ||||
|  | ||||
| } | ||||
|  | ||||
|  | ||||
| @@ -45,7 +35,7 @@ fn main() { | ||||
|     let addr = ([127, 0, 0, 1], 1337).into(); | ||||
|  | ||||
|     let server = Server::bind(&addr) | ||||
|         .serve(|| Ok(Echo)) | ||||
|         .serve(|| service_fn_ok(echo)) | ||||
|         .map_err(|e| eprintln!("server error: {}", e)); | ||||
|  | ||||
|     println!("Listening on http://{}", addr); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user