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,39 +5,14 @@ extern crate pretty_env_logger;
|
||||
extern crate tokio;
|
||||
|
||||
use futures::{Future};
|
||||
use futures::future::{FutureResult, lazy};
|
||||
use futures::future::{lazy};
|
||||
|
||||
use hyper::{Body, Method, Request, Response, StatusCode};
|
||||
use hyper::server::{Server, Service};
|
||||
use hyper::{Body, Response, Server};
|
||||
use hyper::service::service_fn_ok;
|
||||
|
||||
static INDEX1: &'static [u8] = b"The 1st service!";
|
||||
static INDEX2: &'static [u8] = b"The 2nd service!";
|
||||
|
||||
struct Srv(&'static [u8]);
|
||||
|
||||
impl Service for Srv {
|
||||
type Request = Request<Body>;
|
||||
type Response = Response<Body>;
|
||||
type Error = hyper::Error;
|
||||
type Future = FutureResult<Response<Body>, hyper::Error>;
|
||||
|
||||
fn call(&self, req: Request<Body>) -> Self::Future {
|
||||
futures::future::ok(match (req.method(), req.uri().path()) {
|
||||
(&Method::GET, "/") => {
|
||||
Response::new(self.0.into())
|
||||
},
|
||||
_ => {
|
||||
Response::builder()
|
||||
.status(StatusCode::NOT_FOUND)
|
||||
.body(Body::empty())
|
||||
.unwrap()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
fn main() {
|
||||
pretty_env_logger::init();
|
||||
|
||||
@@ -46,11 +21,11 @@ fn main() {
|
||||
|
||||
tokio::run(lazy(move || {
|
||||
let srv1 = Server::bind(&addr1)
|
||||
.serve(|| Ok(Srv(INDEX1)))
|
||||
.serve(|| service_fn_ok(|_| Response::new(Body::from(INDEX1))))
|
||||
.map_err(|e| eprintln!("server 1 error: {}", e));
|
||||
|
||||
let srv2 = Server::bind(&addr2)
|
||||
.serve(|| Ok(Srv(INDEX2)))
|
||||
.serve(|| service_fn_ok(|_| Response::new(Body::from(INDEX2))))
|
||||
.map_err(|e| eprintln!("server 2 error: {}", e));
|
||||
|
||||
println!("Listening on http://{} and http://{}", addr1, addr2);
|
||||
|
||||
Reference in New Issue
Block a user