fix: added async-https-native and async-https-rustls.

Author: psg-19

.clippy.toml

@@ -1 +1 @@
-msrv="1.63.0"
+msrv="1.71.0"

Cargo.toml

@@ -10,7 +10,7 @@ documentation = "https://docs.rs/esplora-client/"
 description = "Bitcoin Esplora API client library. Supports plaintext, TLS and Onion servers. Blocking or async"
 keywords = ["bitcoin", "esplora"]
 readme = "README.md"
-rust-version = "1.70.0"
+rust-version = "1.71.0"
 
 [lib]
 name = "esplora_client"
@@ -22,8 +22,7 @@ bitcoin = { version = "0.32", features = ["serde", "std"], default-features = fa
 hex = { version = "0.2", package = "hex-conservative" }
 log = "^0.4"
 minreq = { version = "2.11.0", features = ["json-using-serde"], optional = true }
-async_minreq = { git = "https://github.com/psg-19/async-minreq.git", default-features = false, optional = true }
-serde_json = "1.0.100"
+async_minreq = { git = "https://github.com/psg-19/async-minreq.git", default-features = false, features = [], optional = true }
 
 # default async runtime
 tokio = { version = "1", features = ["time"], optional = true }
@@ -43,8 +42,8 @@ blocking-https-native = ["blocking", "minreq/https-native"]
 blocking-https-bundled = ["blocking", "minreq/https-bundled"]
 
 tokio = ["dep:tokio"]
-async = ["async_minreq","tokio?/time"]
+async = ["async_minreq", "async_minreq/json-using-serde", "tokio?/time"]
 async-https = ["async"]
-async-https-native = ["async"]
-async-https-rustls = ["async"]
-async-https-rustls-manual-roots = ["async"]
+async-https-native = ["async", "async_minreq/https-rustls-probe", "async_minreq/webpki-roots", "async_minreq/json-using-serde", "async_minreq/https-native"]
+async-https-rustls = ["async", "async_minreq/json-using-serde", "async_minreq/https-rustls-probe", "async_minreq/https-rustls"]
+async-https-rustls-manual-roots = ["async"]

src/async.rs

@@ -25,9 +25,9 @@ use std::str::FromStr;
 use crate::api::AddressStats;
 use crate::{
     BlockStatus, BlockSummary, Builder, Error, MerkleProof, OutputStatus, Tx, TxStatus,
-    BASE_BACKOFF_MILLIS, RETRYABLE_ERROR_CODES,
+    BASE_BACKOFF_MILLIS, RETRYABLE_ERROR_CODES, VALID_HTTP_CODE
 };
-use async_minreq::{Method, Request};
+use async_minreq::{Method, Request, Response};
 #[allow(unused_imports)]
 use log::{debug, error, info, trace};
 
@@ -77,7 +77,7 @@ impl<S: Sleeper> AsyncClient<S> {
         let url = format!("{}{}", self.url, path);
         let response = self.get_with_retry(&url).await?;
 
-        if response.status_code > 299 {
+        if response.status_code > VALID_HTTP_CODE {
             return Err(Error::HttpResponse {
                 status: response.status_code as u16,
                 message: match response.as_str() {
@@ -120,7 +120,7 @@ impl<S: Sleeper> AsyncClient<S> {
         let url = format!("{}{}", self.url, path);
         let response = self.get_with_retry(&url).await?;
 
-        if response.status_code > 299 {
+        if response.status_code > VALID_HTTP_CODE {
             return Err(Error::HttpResponse {
                 status: response.status_code as u16,
                 message: match response.as_str() {
@@ -129,11 +129,7 @@ impl<S: Sleeper> AsyncClient<S> {
                 },
             });
         }
-        serde_json::from_str(match response.as_str() {
-            Ok(resp) => resp,
-            Err(_) => return Err(Error::InvalidResponse),
-        })
-        .map_err(Error::Json)
+        response.json().map_err(Error::AsyncMinreq)
     }
 
     /// Make an HTTP GET request to given URL, deserializing to `Option<T>`.
@@ -168,7 +164,7 @@ impl<S: Sleeper> AsyncClient<S> {
         let url = format!("{}{}", self.url, path);
         let response = self.get_with_retry(&url).await?;
 
-        if response.status_code > 299 {
+        if response.status_code > VALID_HTTP_CODE {
             return Err(Error::HttpResponse {
                 status: response.status_code as u16,
                 message: match response.as_str() {
@@ -210,7 +206,7 @@ impl<S: Sleeper> AsyncClient<S> {
         let url = format!("{}{}", self.url, path);
         let response = self.get_with_retry(&url).await?;
 
-        if response.status_code > 299 {
+        if response.status_code > VALID_HTTP_CODE {
             return Err(Error::HttpResponse {
                 status: response.status_code as u16,
                 message: match response.as_str() {
@@ -259,7 +255,7 @@ impl<S: Sleeper> AsyncClient<S> {
         }
 
         let response = request.send().await.map_err(Error::AsyncMinreq)?;
-        if response.status_code > 299 {
+        if response.status_code > VALID_HTTP_CODE {
             return Err(Error::HttpResponse {
                 status: response.status_code as u16,
                 message: match response.as_str() {
@@ -280,7 +276,7 @@ impl<S: Sleeper> AsyncClient<S> {
     pub async fn get_tx_no_opt(&self, txid: &Txid) -> Result<Transaction, Error> {
         match self.get_tx(txid).await {
             Ok(Some(tx)) => Ok(tx),
-            Ok(None) => Err(Error::TransactionNotFound(*txid)), //look into
+            Ok(None) => Err(Error::TransactionNotFound(*txid)),
             Err(e) => Err(e),
         }
     }
@@ -452,7 +448,7 @@ impl<S: Sleeper> AsyncClient<S> {
 
     /// Sends a GET request to the given `url`, retrying failed attempts
     /// for retryable error codes until max retries hit.
-    async fn get_with_retry(&self, url: &str) -> Result<async_minreq::Response, Error> {
+    async fn get_with_retry(&self, url: &str) -> Result<Response, Error> {
         let mut delay = BASE_BACKOFF_MILLIS;
         let mut attempts = 0;
 

src/lib.rs

@@ -102,6 +102,9 @@ const BASE_BACKOFF_MILLIS: Duration = Duration::from_millis(256);
 /// Default max retries.
 const DEFAULT_MAX_RETRIES: usize = 6;
 
+/// Valid HTTP code
+const VALID_HTTP_CODE: i32 = 299;
+
 /// Get a fee value in sats/vbytes from the estimates
 /// that matches the confirmation target set as parameter.
 ///
@@ -206,8 +209,6 @@ pub enum Error {
     /// Error during async_minreq HTTP request
     #[cfg(feature = "async")]
     AsyncMinreq(async_minreq::Error),
-    /// JSON Error
-    Json(serde_json::Error),
     /// HTTP response error
     HttpResponse { status: u16, message: String },
     /// Invalid number returned
@@ -257,7 +258,6 @@ impl std::error::Error for Error {}
 impl_error!(::minreq::Error, Minreq, Error);
 #[cfg(feature = "async")]
 impl_error!(::async_minreq::Error, AsyncMinreq, Error);
-impl_error!(::serde_json::Error, Json, Error);
 impl_error!(std::num::ParseIntError, Parsing, Error);
 impl_error!(bitcoin::consensus::encode::Error, BitcoinEncoding, Error);
 impl_error!(bitcoin::hex::HexToArrayError, HexToArray, Error);