forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(client): change connectors to return an impl Connection

Browse Source 
Instead of returning a tuple `(impl AsyncRead + AsyncWrite, Connected)`,
this adds a new trait, `hyper::client::connect::Connection`, which
allows querying the connection type for a `Connected`.

BREAKING CHANGE: Connectors no longer return a tuple of
  `(T, Connected)`, but a single `T: Connection`.
This commit is contained in:
Sean McArthur
2019-12-04 15:17:49 -08:00
parent 319e8aee15
commit 4d7a2266b8
6 changed files with 68 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/client.rs
View File

@@ -945,7 +945,7 @@ mod dispatch_impl {
use tokio::io::{AsyncRead, AsyncWrite};
use tokio::net::TcpStream;
use hyper::client::connect::{Connected, HttpConnector};
use hyper::client::connect::{Connected, Connection, HttpConnector};
use hyper::Client;
#[test]
@@ -1740,7 +1740,7 @@ mod dispatch_impl {
}
impl hyper::service::Service<Uri> for DebugConnector {
type Response = (DebugStream, Connected);
type Response = DebugStream;
type Error = <HttpConnector as hyper::service::Service<Uri>>::Error;
type Future = Pin<Box<dyn Future<
Output = Result<Self::Response, Self::Error>
@@ -1756,30 +1756,37 @@ mod dispatch_impl {
let closes = self.closes.clone();
let is_proxy = self.is_proxy;
let is_alpn_h2 = self.alpn_h2;
Box::pin(self.http.call(dst).map_ok(move |(s, mut c)| {
if is_alpn_h2 {
c = c.negotiated_h2();
Box::pin(self.http.call(dst).map_ok(move |tcp| {
DebugStream {
tcp,
on_drop: closes,
is_alpn_h2,
is_proxy,
}
(DebugStream(s, closes), c.proxy(is_proxy))
}))
}
}
struct DebugStream(TcpStream, mpsc::Sender<()>);
struct DebugStream {
tcp: TcpStream,
on_drop: mpsc::Sender<()>,
is_alpn_h2: bool,
is_proxy: bool,
}
impl Drop for DebugStream {
fn drop(&mut self) {
let _ = self.1.try_send(());
let _ = self.on_drop.try_send(());
}
}
impl AsyncWrite for DebugStream {
fn poll_shutdown(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
Pin::new(&mut self.0).poll_shutdown(cx)
Pin::new(&mut self.tcp).poll_shutdown(cx)
}
fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
Pin::new(&mut self.0).poll_flush(cx)
Pin::new(&mut self.tcp).poll_flush(cx)
}
fn poll_write(
@@ -1787,7 +1794,7 @@ mod dispatch_impl {
cx: &mut Context<'_>,
buf: &[u8],
) -> Poll<Result<usize, io::Error>> {
Pin::new(&mut self.0).poll_write(cx, buf)
Pin::new(&mut self.tcp).poll_write(cx, buf)
}
}
@@ -1797,7 +1804,19 @@ mod dispatch_impl {
cx: &mut Context<'_>,
buf: &mut [u8],
) -> Poll<Result<usize, io::Error>> {
Pin::new(&mut self.0).poll_read(cx, buf)
Pin::new(&mut self.tcp).poll_read(cx, buf)
}
}
impl Connection for DebugStream {
fn connected(&self) -> Connected {
let connected = self.tcp.connected().proxy(self.is_proxy);
if self.is_alpn_h2 {
connected.negotiated_h2()
} else {
connected
}
}
}
}

2
tests/server.rs
View File

@@ -1779,7 +1779,7 @@ impl tower_service::Service<Request<Body>> for TestService {
let replies = self.reply.clone();
Box::pin(async move {
while let Some(chunk) = req.body_mut().next().await {
while let Some(chunk) = hyper::body::HttpBody::next(req.body_mut()).await {
match chunk {
Ok(chunk) => {
tx.send(Msg::Chunk(chunk.to_vec())).unwrap();