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
Files
ea3af281393741b147a4d78ad02bb37593e63e87
serai/common/request/src/lib.rs

153 lines
4.5 KiB
Rust
Raw Normal View History

Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
#![doc = include_str!("../README.md")]
Move monero-serai to simple-request Deduplicates code across the entire repo, letting us make improvements in a single place.
2023-11-06 11:45:31 -05:00
use std::sync::Arc;
use tokio::sync::Mutex;
Make TLS an optional feature of simple-request Removes 14 crates from the tree when compiling the message-queue client. Also performs a non-intrusive cargo update.
2023-11-15 17:18:24 -05:00
#[cfg(feature = "tls")]
Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
use hyper_rustls::{HttpsConnectorBuilder, HttpsConnector};
Move monero-serai to simple-request Deduplicates code across the entire repo, letting us make improvements in a single place.
2023-11-06 11:45:31 -05:00
use hyper::{
Uri,
header::HeaderValue,
body::Body,
service::Service,
client::{HttpConnector, conn::http1::SendRequest},
};
Don't default to basic-auth if it's enabled, yet require it to be specified
2023-11-06 10:31:26 -05:00
pub use hyper;
mod request;
pub use request::*;
mod response;
pub use response::*;
Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
#[derive(Debug)]
Don't default to basic-auth if it's enabled, yet require it to be specified
2023-11-06 10:31:26 -05:00
pub enum Error {
InvalidUri,
Move monero-serai to simple-request Deduplicates code across the entire repo, letting us make improvements in a single place.
2023-11-06 11:45:31 -05:00
MissingHost,
InconsistentHost,
Make TLS an optional feature of simple-request Removes 14 crates from the tree when compiling the message-queue client. Also performs a non-intrusive cargo update.
2023-11-15 17:18:24 -05:00
ConnectionError(Box<dyn Send + Sync + std::error::Error>),
Don't default to basic-auth if it's enabled, yet require it to be specified
2023-11-06 10:31:26 -05:00
Hyper(hyper::Error),
Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
}
Make TLS an optional feature of simple-request Removes 14 crates from the tree when compiling the message-queue client. Also performs a non-intrusive cargo update.
2023-11-15 17:18:24 -05:00
#[cfg(not(feature = "tls"))]
type Connector = HttpConnector;
#[cfg(feature = "tls")]
type Connector = HttpsConnector<HttpConnector>;
Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
#[derive(Clone, Debug)]
enum Connection {
Make TLS an optional feature of simple-request Removes 14 crates from the tree when compiling the message-queue client. Also performs a non-intrusive cargo update.
2023-11-15 17:18:24 -05:00
ConnectionPool(hyper::Client<Connector>),
Connection { connector: Connector, host: Uri, connection: Arc<Mutex<Option<SendRequest<Body>>>> },
Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
}
#[derive(Clone, Debug)]
pub struct Client {
connection: Connection,
}
impl Client {
Make TLS an optional feature of simple-request Removes 14 crates from the tree when compiling the message-queue client. Also performs a non-intrusive cargo update.
2023-11-15 17:18:24 -05:00
fn connector() -> Connector {
#[cfg(feature = "tls")]
let res =
HttpsConnectorBuilder::new().with_native_roots().https_or_http().enable_http1().build();
#[cfg(not(feature = "tls"))]
let res = HttpConnector::new();
res
Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
}
pub fn with_connection_pool() -> Client {
Client {
Make TLS an optional feature of simple-request Removes 14 crates from the tree when compiling the message-queue client. Also performs a non-intrusive cargo update.
2023-11-15 17:18:24 -05:00
connection: Connection::ConnectionPool(hyper::Client::builder().build(Self::connector())),
Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
}
}
Move monero-serai to simple-request Deduplicates code across the entire repo, letting us make improvements in a single place.
2023-11-06 11:45:31 -05:00
pub fn without_connection_pool(host: String) -> Result<Client, Error> {
Ok(Client {
connection: Connection::Connection {
Make TLS an optional feature of simple-request Removes 14 crates from the tree when compiling the message-queue client. Also performs a non-intrusive cargo update.
2023-11-15 17:18:24 -05:00
connector: Self::connector(),
Move monero-serai to simple-request Deduplicates code across the entire repo, letting us make improvements in a single place.
2023-11-06 11:45:31 -05:00
host: {
let uri: Uri = host.parse().map_err(|_| Error::InvalidUri)?;
if uri.host().is_none() {
Err(Error::MissingHost)?;
};
uri
},
connection: Arc::new(Mutex::new(None)),
},
})
}
Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
Have simple-request Response's borrow the Client to ensure it's not prematurely dropped
2023-11-29 01:16:18 -05:00
pub async fn request<R: Into<Request>>(&self, request: R) -> Result<Response<'_>, Error> {
Don't default to basic-auth if it's enabled, yet require it to be specified
2023-11-06 10:31:26 -05:00
let request: Request = request.into();
let mut request = request.0;
Move monero-serai to simple-request Deduplicates code across the entire repo, letting us make improvements in a single place.
2023-11-06 11:45:31 -05:00
if let Some(header_host) = request.headers().get(hyper::header::HOST) {
match &self.connection {
Connection::ConnectionPool(_) => {}
Connection::Connection { host, .. } => {
if header_host.to_str().map_err(|_| Error::InvalidUri)? != host.host().unwrap() {
Err(Error::InconsistentHost)?;
}
}
}
} else {
let host = match &self.connection {
Connection::ConnectionPool(_) => {
request.uri().host().ok_or(Error::MissingHost)?.to_string()
}
Connection::Connection { host, .. } => {
let host_str = host.host().unwrap();
if let Some(uri_host) = request.uri().host() {
if host_str != uri_host {
Err(Error::InconsistentHost)?;
}
}
host_str.to_string()
}
};
Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
request
.headers_mut()
Don't default to basic-auth if it's enabled, yet require it to be specified
2023-11-06 10:31:26 -05:00
.insert(hyper::header::HOST, HeaderValue::from_str(&host).map_err(|_| Error::InvalidUri)?);
Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
}
Have simple-request Response's borrow the Client to ensure it's not prematurely dropped
2023-11-29 01:16:18 -05:00
let response = match &self.connection {
Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
Connection::ConnectionPool(client) => client.request(request).await.map_err(Error::Hyper)?,
Make TLS an optional feature of simple-request Removes 14 crates from the tree when compiling the message-queue client. Also performs a non-intrusive cargo update.
2023-11-15 17:18:24 -05:00
Connection::Connection { connector, host, connection } => {
Move monero-serai to simple-request Deduplicates code across the entire repo, letting us make improvements in a single place.
2023-11-06 11:45:31 -05:00
let mut connection_lock = connection.lock().await;
// If there's not a connection...
if connection_lock.is_none() {
Make TLS an optional feature of simple-request Removes 14 crates from the tree when compiling the message-queue client. Also performs a non-intrusive cargo update.
2023-11-15 17:18:24 -05:00
let call_res = connector.clone().call(host.clone()).await;
#[cfg(not(feature = "tls"))]
let call_res = call_res.map_err(|e| Error::ConnectionError(format!("{e:?}").into()));
#[cfg(feature = "tls")]
let call_res = call_res.map_err(Error::ConnectionError);
let (requester, connection) =
hyper::client::conn::http1::handshake(call_res?).await.map_err(Error::Hyper)?;
Have simple-request Response's borrow the Client to ensure it's not prematurely dropped
2023-11-29 01:16:18 -05:00
// This will die when we drop the requester, so we don't need to track an AbortHandle
// for it
Move monero-serai to simple-request Deduplicates code across the entire repo, letting us make improvements in a single place.
2023-11-06 11:45:31 -05:00
tokio::spawn(connection);
*connection_lock = Some(requester);
}
let connection = connection_lock.as_mut().unwrap();
let mut err = connection.ready().await.err();
if err.is_none() {
// Send the request
let res = connection.send_request(request).await;
if let Ok(res) = res {
Have simple-request Response's borrow the Client to ensure it's not prematurely dropped
2023-11-29 01:16:18 -05:00
return Ok(Response(res, self));
Move monero-serai to simple-request Deduplicates code across the entire repo, letting us make improvements in a single place.
2023-11-06 11:45:31 -05:00
}
err = res.err();
}
// Since this connection has been put into an error state, drop it
*connection_lock = None;
Err(Error::Hyper(err.unwrap()))?
}
Have simple-request Response's borrow the Client to ensure it's not prematurely dropped
2023-11-29 01:16:18 -05:00
};
Ok(Response(response, self))
Replace reqwest with simple-request reqwest was replaced with hyper and hyper-rustls within monero-serai due to reqwest *solely* offering a connection pool API. In the process, it was demonstrated how quickly we can achieve equivalent functionality to reqwest for our use cases with a fraction of the code. This adds our own reqwest alternative to the tree, applying it to both bitcoin-serai and message-queue. By doing so, bitcoin-serai decreases its tree by 21 packages and the processor by 18. Cargo.lock decreases by 8 dependencies, solely adding simple-request. Notably removed is openssl-sys and openssl. One noted decrease functionality is the requirement on the system having installed CA certificates. While we could fallback to the rustls certificates if the system doesn't have any, that's blocked by https://github.com/rustls/hyper-rustls/pulls/228.
2023-11-06 09:14:46 -05:00
}
}
Reference in New Issue Copy Permalink