feat(server): change Incoming to iterator over Connections

A connection is returned from Incoming.next(), and can be passed to a
separate thread before any parsing happens. Call conn.open() to get a
Result<(Request, Response)>.

BREAKING CHANGE
This commit is contained in:
Sean McArthur
2014-11-10 13:55:11 -08:00
parent 0500b5f17f
commit 3c10a8a191
6 changed files with 45 additions and 34 deletions

View File

@@ -89,29 +89,18 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
}
}
/// An iterator over incoming connections, represented as pairs of
/// hyper Requests and Responses.
/// An iterator over incoming `Connection`s.
pub struct Incoming<S: Send = HttpStream> {
from: Intertwined<IoResult<S>>
}
impl<S: NetworkStream + 'static> Iterator<(Request, Response<Fresh>)> for Incoming<S> {
fn next(&mut self) -> Option<(Request, Response<Fresh>)> {
impl<S: NetworkStream + 'static> Iterator<Connection<S>> for Incoming<S> {
fn next(&mut self) -> Option<Connection<S>> {
for conn in self.from {
match conn {
Ok(stream) => {
debug!("Incoming stream");
let clone = stream.clone();
let req = match Request::new(stream) {
Ok(r) => r,
Err(err) => {
error!("creating Request: {}", err);
continue;
}
};
let mut res = Response::new(clone);
res.version = req.version;
return Some((req, res))
return Some(Connection(stream));
},
Err(ref e) if e.kind == EndOfFile => return None, // server closed
Err(e) => {
@@ -124,6 +113,21 @@ impl<S: NetworkStream + 'static> Iterator<(Request, Response<Fresh>)> for Incomi
}
}
/// An incoming connection. It can be opened to receive a request/response pair.
pub struct Connection<S: Send = HttpStream>(S);
impl<S: NetworkStream + 'static> Connection<S> {
/// Opens the incoming connection, parsing it into a Request/Response pair.
pub fn open(self) -> HttpResult<(Request, Response<Fresh>)> {
let stream = self.0;
let clone = stream.clone();
let req = try!(Request::new(stream));
let mut res = Response::new(clone);
res.version = req.version;
return Ok((req, res))
}
}
/// A listening server, which can later be closed.
pub struct Listening<A = HttpAcceptor> {
acceptors: Vec<A>,