absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 12:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have simple-request Response's borrow the Client to ensure it's not prematurely dropped

Browse Source
This commit is contained in:
Luke Parker
2023-11-29 01:16:18 -05:00
parent 51bb434239
commit 8040fedddf
3 changed files with 84 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/request/src/lib.rs
View File

@@ -79,7 +79,7 @@ impl Client {
})
}
pub async fn request<R: Into<Request>>(&self, request: R) -> Result<Response, Error> {
pub async fn request<R: Into<Request>>(&self, request: R) -> Result<Response<'_>, Error> {
let request: Request = request.into();
let mut request = request.0;
if let Some(header_host) = request.headers().get(hyper::header::HOST) {
@@ -111,7 +111,7 @@ impl Client {
.insert(hyper::header::HOST, HeaderValue::from_str(&host).map_err(|_| Error::InvalidUri)?);
}
Ok(Response(match &self.connection {
let response = match &self.connection {
Connection::ConnectionPool(client) => client.request(request).await.map_err(Error::Hyper)?,
Connection::Connection { connector, host, connection } => {
let mut connection_lock = connection.lock().await;
@@ -125,8 +125,8 @@ impl Client {
let call_res = call_res.map_err(Error::ConnectionError);
let (requester, connection) =
hyper::client::conn::http1::handshake(call_res?).await.map_err(Error::Hyper)?;
// This will die when we drop the requester, so we don't need to track an AbortHandle for
// it
// This will die when we drop the requester, so we don't need to track an AbortHandle
// for it
tokio::spawn(connection);
*connection_lock = Some(requester);
}
@@ -137,7 +137,7 @@ impl Client {
// Send the request
let res = connection.send_request(request).await;
if let Ok(res) = res {
return Ok(Response(res));
return Ok(Response(res, self));
}
err = res.err();
}
@@ -145,6 +145,8 @@ impl Client {
*connection_lock = None;
Err(Error::Hyper(err.unwrap()))?
}
}))
};
Ok(Response(response, self))
}
}

7
common/request/src/response.rs
View File

@@ -4,11 +4,12 @@ use hyper::{
body::{Buf, Body},
};
use crate::Error;
use crate::{Client, Error};
// Borrows the client so its async task lives as long as this response exists.
#[derive(Debug)]
pub struct Response(pub(crate) hyper::Response<Body>);
impl Response {
pub struct Response<'a>(pub(crate) hyper::Response<Body>, pub(crate) &'a Client);
impl<'a> Response<'a> {
pub fn status(&self) -> StatusCode {
self.0.status()
}