Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(rpc): expose reqwest client #3

Open
wants to merge 1 commit into
base: v0.36.0-bn254
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 35 additions & 13 deletions rpc/src/client/transport/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ pub struct Builder {
compat: CompatMode,
proxy_url: Option<HttpClientUrl>,
timeout: Duration,
client: Option<reqwest::Client>,
}

impl Builder {
Expand Down Expand Up @@ -93,22 +94,35 @@ impl Builder {
self
}

/// Use the provided client instead of building one internally.
pub fn client(mut self, client: reqwest::Client) -> Self {
self.client = Some(client);
self
}

/// Try to create a client with the options specified for this builder.
pub fn build(self) -> Result<HttpClient, Error> {
let builder = reqwest::ClientBuilder::new()
.user_agent(USER_AGENT)
.timeout(self.timeout);
let inner = match self.proxy_url {
None => builder.build().map_err(Error::http)?,
Some(proxy_url) => {
let proxy = if self.url.0.is_secure() {
Proxy::https(reqwest::Url::from(proxy_url.0)).map_err(Error::invalid_proxy)?
} else {
Proxy::http(reqwest::Url::from(proxy_url.0)).map_err(Error::invalid_proxy)?
};
builder.proxy(proxy).build().map_err(Error::http)?
},
let inner = if let Some(inner) = self.client {
inner
} else {
let builder = reqwest::ClientBuilder::new()
.user_agent(USER_AGENT)
.timeout(self.timeout);
match self.proxy_url {
None => builder.build().map_err(Error::http)?,
Some(proxy_url) => {
let proxy = if self.url.0.is_secure() {
Proxy::https(reqwest::Url::from(proxy_url.0))
.map_err(Error::invalid_proxy)?
} else {
Proxy::http(reqwest::Url::from(proxy_url.0))
.map_err(Error::invalid_proxy)?
};
builder.proxy(proxy).build().map_err(Error::http)?
},
}
};

Ok(HttpClient {
inner,
url: self.url.into(),
Expand All @@ -118,6 +132,13 @@ impl Builder {
}

impl HttpClient {
/// Construct a new Tendermint RPC HTTP/S client connecting to the given
/// URL. This avoids using the `Builder` and thus does not perform any
/// validation of the configuration.
pub fn new_from_parts(inner: reqwest::Client, url: reqwest::Url, compat: CompatMode) -> Self {
Self { inner, url, compat }
}

/// Construct a new Tendermint RPC HTTP/S client connecting to the given
/// URL.
pub fn new<U>(url: U) -> Result<Self, Error>
Expand Down Expand Up @@ -153,6 +174,7 @@ impl HttpClient {
compat: Default::default(),
proxy_url: None,
timeout: Duration::from_secs(30),
client: None,
}
}

Expand Down
Loading