This adds a connection pool to the Client that is used by default. It accepts any other NetworkConnector, and simply acts as a NetworkConnector itself. Other Pools can exist by simply providing a custom NetworkConnector. This Pool is only used by default if you also use the default connector, which is `HttpConnector`. If you wish to use the Pool with a custom connector, you'll need to create the Pool with your custom connector, and then pass that pool to the Client::with_connector. This also adds a method to `NetworkStream`, `close`, which can be used to know when the Stream should be put down, because a server requested that the connection close instead of be kept alive. Closes #363 Closes #41
214 lines
6.7 KiB
Rust
214 lines
6.7 KiB
Rust
//! Client Requests
|
|
use std::marker::PhantomData;
|
|
use std::io::{self, Write, BufWriter};
|
|
use std::net::Shutdown;
|
|
|
|
use url::Url;
|
|
|
|
use method::{self, Method};
|
|
use header::Headers;
|
|
use header::{self, Host};
|
|
use net::{NetworkStream, NetworkConnector, HttpConnector, Fresh, Streaming};
|
|
use http::{self, HttpWriter, LINE_ENDING};
|
|
use http::HttpWriter::{ThroughWriter, ChunkedWriter, SizedWriter, EmptyWriter};
|
|
use version;
|
|
use HttpResult;
|
|
use client::{Response, get_host_and_port};
|
|
|
|
|
|
/// A client request to a remote server.
|
|
pub struct Request<W> {
|
|
/// The target URI for this request.
|
|
pub url: Url,
|
|
|
|
/// The HTTP version of this request.
|
|
pub version: version::HttpVersion,
|
|
|
|
body: HttpWriter<BufWriter<Box<NetworkStream + Send>>>,
|
|
headers: Headers,
|
|
method: method::Method,
|
|
|
|
_marker: PhantomData<W>,
|
|
}
|
|
|
|
impl<W> Request<W> {
|
|
/// Read the Request headers.
|
|
#[inline]
|
|
pub fn headers(&self) -> &Headers { &self.headers }
|
|
|
|
/// Read the Request method.
|
|
#[inline]
|
|
pub fn method(&self) -> method::Method { self.method.clone() }
|
|
}
|
|
|
|
impl Request<Fresh> {
|
|
/// Create a new client request.
|
|
pub fn new(method: method::Method, url: Url) -> HttpResult<Request<Fresh>> {
|
|
let mut conn = HttpConnector(None);
|
|
Request::with_connector(method, url, &mut conn)
|
|
}
|
|
|
|
/// Create a new client request with a specific underlying NetworkStream.
|
|
pub fn with_connector<C, S>(method: method::Method, url: Url, connector: &mut C)
|
|
-> HttpResult<Request<Fresh>> where
|
|
C: NetworkConnector<Stream=S>,
|
|
S: Into<Box<NetworkStream + Send>> {
|
|
let (host, port) = try!(get_host_and_port(&url));
|
|
|
|
let stream = try!(connector.connect(&*host, port, &*url.scheme)).into();
|
|
let stream = ThroughWriter(BufWriter::new(stream));
|
|
|
|
let mut headers = Headers::new();
|
|
headers.set(Host {
|
|
hostname: host,
|
|
port: Some(port),
|
|
});
|
|
|
|
Ok(Request {
|
|
method: method,
|
|
headers: headers,
|
|
url: url,
|
|
version: version::HttpVersion::Http11,
|
|
body: stream,
|
|
_marker: PhantomData,
|
|
})
|
|
}
|
|
|
|
/// Consume a Fresh Request, writing the headers and method,
|
|
/// returning a Streaming Request.
|
|
pub fn start(mut self) -> HttpResult<Request<Streaming>> {
|
|
let mut uri = self.url.serialize_path().unwrap();
|
|
//TODO: this needs a test
|
|
if let Some(ref q) = self.url.query {
|
|
uri.push('?');
|
|
uri.push_str(&q[..]);
|
|
}
|
|
|
|
debug!("request line: {:?} {:?} {:?}", self.method, uri, self.version);
|
|
try!(write!(&mut self.body, "{} {} {}{}",
|
|
self.method, uri, self.version, LINE_ENDING));
|
|
|
|
|
|
let stream = match self.method {
|
|
Method::Get | Method::Head => {
|
|
debug!("headers={:?}", self.headers);
|
|
try!(write!(&mut self.body, "{}{}", self.headers, LINE_ENDING));
|
|
EmptyWriter(self.body.into_inner())
|
|
},
|
|
_ => {
|
|
let mut chunked = true;
|
|
let mut len = 0;
|
|
|
|
match self.headers.get::<header::ContentLength>() {
|
|
Some(cl) => {
|
|
chunked = false;
|
|
len = **cl;
|
|
},
|
|
None => ()
|
|
};
|
|
|
|
// cant do in match above, thanks borrowck
|
|
if chunked {
|
|
let encodings = match self.headers.get_mut::<header::TransferEncoding>() {
|
|
Some(&mut header::TransferEncoding(ref mut encodings)) => {
|
|
//TODO: check if chunked is already in encodings. use HashSet?
|
|
encodings.push(header::Encoding::Chunked);
|
|
false
|
|
},
|
|
None => true
|
|
};
|
|
|
|
if encodings {
|
|
self.headers.set::<header::TransferEncoding>(
|
|
header::TransferEncoding(vec![header::Encoding::Chunked]))
|
|
}
|
|
}
|
|
|
|
debug!("headers={:?}", self.headers);
|
|
try!(write!(&mut self.body, "{}{}", self.headers, LINE_ENDING));
|
|
|
|
if chunked {
|
|
ChunkedWriter(self.body.into_inner())
|
|
} else {
|
|
SizedWriter(self.body.into_inner(), len)
|
|
}
|
|
}
|
|
};
|
|
|
|
Ok(Request {
|
|
method: self.method,
|
|
headers: self.headers,
|
|
url: self.url,
|
|
version: self.version,
|
|
body: stream,
|
|
_marker: PhantomData,
|
|
})
|
|
}
|
|
|
|
/// Get a mutable reference to the Request headers.
|
|
#[inline]
|
|
pub fn headers_mut(&mut self) -> &mut Headers { &mut self.headers }
|
|
}
|
|
|
|
impl Request<Streaming> {
|
|
/// Completes writing the request, and returns a response to read from.
|
|
///
|
|
/// Consumes the Request.
|
|
pub fn send(self) -> HttpResult<Response> {
|
|
let mut raw = try!(self.body.end()).into_inner().unwrap(); // end() already flushes
|
|
if !http::should_keep_alive(self.version, &self.headers) {
|
|
try!(raw.close(Shutdown::Write));
|
|
}
|
|
Response::new(raw)
|
|
}
|
|
}
|
|
|
|
impl Write for Request<Streaming> {
|
|
#[inline]
|
|
fn write(&mut self, msg: &[u8]) -> io::Result<usize> {
|
|
self.body.write(msg)
|
|
}
|
|
|
|
#[inline]
|
|
fn flush(&mut self) -> io::Result<()> {
|
|
self.body.flush()
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use std::str::from_utf8;
|
|
use url::Url;
|
|
use method::Method::{Get, Head};
|
|
use mock::{MockStream, MockConnector};
|
|
use super::Request;
|
|
|
|
#[test]
|
|
fn test_get_empty_body() {
|
|
let req = Request::with_connector(
|
|
Get, Url::parse("http://example.dom").unwrap(), &mut MockConnector
|
|
).unwrap();
|
|
let req = req.start().unwrap();
|
|
let stream = *req.body.end().unwrap()
|
|
.into_inner().unwrap().downcast::<MockStream>().ok().unwrap();
|
|
let bytes = stream.write;
|
|
let s = from_utf8(&bytes[..]).unwrap();
|
|
assert!(!s.contains("Content-Length:"));
|
|
assert!(!s.contains("Transfer-Encoding:"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_head_empty_body() {
|
|
let req = Request::with_connector(
|
|
Head, Url::parse("http://example.dom").unwrap(), &mut MockConnector
|
|
).unwrap();
|
|
let req = req.start().unwrap();
|
|
let stream = *req.body.end().unwrap()
|
|
.into_inner().unwrap().downcast::<MockStream>().ok().unwrap();
|
|
let bytes = stream.write;
|
|
let s = from_utf8(&bytes[..]).unwrap();
|
|
assert!(!s.contains("Content-Length:"));
|
|
assert!(!s.contains("Transfer-Encoding:"));
|
|
}
|
|
}
|