Remove reqwest from base crate

Cargo.lock

@@ -864,7 +864,6 @@ dependencies = [
  "lightning-invoice",
  "once_cell",
  "rand",
- "reqwest",
  "serde",
  "serde_json",
  "serde_with",

crates/cdk-common/Cargo.toml

@@ -33,16 +33,6 @@ uuid = { version = "1", features = ["v4", "serde"], optional = true }
 utoipa = { version = "4", optional = true }
 futures = "0.3.31"
 anyhow = "1.0"
-reqwest = { version = "0.12", default-features = false, features = [
-    "json",
-    "rustls-tls",
-    "rustls-tls-native-roots",
-    "socks",
-    "zstd",
-    "brotli",
-    "gzip",
-    "deflate",
-] }
 serde_json = "1"
 serde_with = "3"
 

crates/cdk-common/src/error.rs

@@ -197,9 +197,9 @@ pub enum Error {
     /// From hex error
     #[error(transparent)]
     HexError(#[from] hex::Error),
-    /// From hex error
-    #[error(transparent)]
-    ReqwestError(#[from] reqwest::Error),
+    /// Http transport error
+    #[error("Http transport error: {0}")]
+    HttpError(String),
 
     // Crate error conversions
     /// Cashu Url Error

crates/cdk-common/src/lib.rs

@@ -17,6 +17,7 @@ pub mod subscription;
 pub mod ws;
 
 // re-exporting external crates
+pub use bitcoin;
 pub use cashu::amount::{self, Amount};
 pub use cashu::lightning_invoice::{self, Bolt11Invoice};
 #[cfg(feature = "mint")]
@@ -25,4 +26,3 @@ pub use cashu::nuts::{self, *};
 #[cfg(feature = "wallet")]
 pub use cashu::wallet;
 pub use cashu::{dhke, mint_url, secret, util, SECP256K1};
-pub use {bitcoin, reqwest};

crates/cdk/src/wallet/client.rs

@@ -3,7 +3,9 @@
 use std::fmt::Debug;
 
 use async_trait::async_trait;
-use reqwest::Client;
+use reqwest::{Client, IntoUrl};
+use serde::de::DeserializeOwned;
+use serde::Serialize;
 use tracing::instrument;
 #[cfg(not(target_arch = "wasm32"))]
 use url::Url;
@@ -46,6 +48,40 @@ impl HttpClient {
         }
     }
 
+    #[inline]
+    async fn http_get<U: IntoUrl, R: DeserializeOwned>(&self, url: U) -> Result<R, Error> {
+        let response = self
+            .inner
+            .get(url)
+            .send()
+            .await
+            .map_err(|e| Error::HttpError(e.to_string()))?
+            .text()
+            .await
+            .map_err(|e| Error::HttpError(e.to_string()))?;
+
+        convert_http_response!(R, response)
+    }
+
+    #[inline]
+    async fn http_post<U: IntoUrl, P: Serialize + ?Sized, R: DeserializeOwned>(
+        &self,
+        url: U,
+        payload: &P,
+    ) -> Result<R, Error> {
+        let response = self
+            .inner
+            .post(url)
+            .json(&payload)
+            .send()
+            .await
+            .map_err(|e| Error::HttpError(e.to_string()))?
+            .text()
+            .await
+            .map_err(|e| Error::HttpError(e.to_string()))?;
+        convert_http_response!(R, response)
+    }
+
     #[cfg(not(target_arch = "wasm32"))]
     /// Create new [`HttpClient`] with a proxy for specific TLDs.
     /// Specifying `None` for `host_matcher` will use the proxy for all
@@ -72,7 +108,8 @@ impl HttpClient {
                 None
             }))
             .danger_accept_invalid_certs(accept_invalid_certs) // Allow self-signed certs
-            .build()?;
+            .build()
+            .map_err(|e| Error::HttpError(e.to_string()))?;
 
         Ok(Self {
             inner: client,
@@ -88,9 +125,7 @@ impl MintConnector for HttpClient {
     #[instrument(skip(self), fields(mint_url = %self.mint_url))]
     async fn get_mint_keys(&self) -> Result<Vec<KeySet>, Error> {
         let url = self.mint_url.join_paths(&["v1", "keys"])?;
-        let keys = self.inner.get(url).send().await?.text().await?;
-
-        Ok(convert_http_response!(KeysResponse, keys)?.keysets)
+        Ok(self.http_get::<_, KeysResponse>(url).await?.keysets)
     }
 
     /// Get Keyset Keys [NUT-01]
@@ -99,9 +134,8 @@ impl MintConnector for HttpClient {
         let url = self
             .mint_url
             .join_paths(&["v1", "keys", &keyset_id.to_string()])?;
-        let keys = self.inner.get(url).send().await?.text().await?;
-
-        convert_http_response!(KeysResponse, keys)?
+        self.http_get::<_, KeysResponse>(url)
+            .await?
             .keysets
             .drain(0..1)
             .next()
@@ -112,9 +146,7 @@ impl MintConnector for HttpClient {
     #[instrument(skip(self), fields(mint_url = %self.mint_url))]
     async fn get_mint_keysets(&self) -> Result<KeysetResponse, Error> {
         let url = self.mint_url.join_paths(&["v1", "keysets"])?;
-        let res = self.inner.get(url).send().await?.text().await?;
-
-        convert_http_response!(KeysetResponse, res)
+        self.http_get(url).await
     }
 
     /// Mint Quote [NUT-04]
@@ -126,17 +158,7 @@ impl MintConnector for HttpClient {
         let url = self
             .mint_url
             .join_paths(&["v1", "mint", "quote", "bolt11"])?;
-
-        let res = self
-            .inner
-            .post(url)
-            .json(&request)
-            .send()
-            .await?
-            .text()
-            .await?;
-
-        convert_http_response!(MintQuoteBolt11Response<String>, res)
+        self.http_post(url, &request).await
     }
 
     /// Mint Quote status
@@ -149,9 +171,7 @@ impl MintConnector for HttpClient {
             .mint_url
             .join_paths(&["v1", "mint", "quote", "bolt11", quote_id])?;
 
-        let res = self.inner.get(url).send().await?.text().await?;
-
-        convert_http_response!(MintQuoteBolt11Response<String>, res)
+        self.http_get(url).await
     }
 
     /// Mint Tokens [NUT-04]
@@ -161,17 +181,7 @@ impl MintConnector for HttpClient {
         request: MintBolt11Request<String>,
     ) -> Result<MintBolt11Response, Error> {
         let url = self.mint_url.join_paths(&["v1", "mint", "bolt11"])?;
-
-        let res = self
-            .inner
-            .post(url)
-            .json(&request)
-            .send()
-            .await?
-            .text()
-            .await?;
-
-        convert_http_response!(MintBolt11Response, res)
+        self.http_post(url, &request).await
     }
 
     /// Melt Quote [NUT-05]
@@ -183,17 +193,7 @@ impl MintConnector for HttpClient {
         let url = self
             .mint_url
             .join_paths(&["v1", "melt", "quote", "bolt11"])?;
-
-        let res = self
-            .inner
-            .post(url)
-            .json(&request)
-            .send()
-            .await?
-            .text()
-            .await?;
-
-        convert_http_response!(MeltQuoteBolt11Response<String>, res)
+        self.http_post(url, &request).await
     }
 
     /// Melt Quote Status
@@ -206,9 +206,7 @@ impl MintConnector for HttpClient {
             .mint_url
             .join_paths(&["v1", "melt", "quote", "bolt11", quote_id])?;
 
-        let res = self.inner.get(url).send().await?.text().await?;
-
-        convert_http_response!(MeltQuoteBolt11Response<String>, res)
+        self.http_get(url).await
     }
 
     /// Melt [NUT-05]
@@ -219,44 +217,21 @@ impl MintConnector for HttpClient {
         request: MeltBolt11Request<String>,
     ) -> Result<MeltQuoteBolt11Response<String>, Error> {
         let url = self.mint_url.join_paths(&["v1", "melt", "bolt11"])?;
-
-        let res = self
-            .inner
-            .post(url)
-            .json(&request)
-            .send()
-            .await?
-            .text()
-            .await?;
-
-        convert_http_response!(MeltQuoteBolt11Response<String>, res)
+        self.http_post(url, &request).await
     }
 
     /// Swap Token [NUT-03]
     #[instrument(skip(self, swap_request), fields(mint_url = %self.mint_url))]
     async fn post_swap(&self, swap_request: SwapRequest) -> Result<SwapResponse, Error> {
         let url = self.mint_url.join_paths(&["v1", "swap"])?;
-
-        let res = self
-            .inner
-            .post(url)
-            .json(&swap_request)
-            .send()
-            .await?
-            .text()
-            .await?;
-
-        convert_http_response!(SwapResponse, res)
+        self.http_post(url, &swap_request).await
     }
 
     /// Get Mint Info [NUT-06]
     #[instrument(skip(self), fields(mint_url = %self.mint_url))]
     async fn get_mint_info(&self) -> Result<MintInfo, Error> {
         let url = self.mint_url.join_paths(&["v1", "info"])?;
-
-        let res = self.inner.get(url).send().await?.text().await?;
-
-        convert_http_response!(MintInfo, res)
+        self.http_get(url).await
     }
 
     /// Spendable check [NUT-07]
@@ -266,34 +241,14 @@ impl MintConnector for HttpClient {
         request: CheckStateRequest,
     ) -> Result<CheckStateResponse, Error> {
         let url = self.mint_url.join_paths(&["v1", "checkstate"])?;
-
-        let res = self
-            .inner
-            .post(url)
-            .json(&request)
-            .send()
-            .await?
-            .text()
-            .await?;
-
-        convert_http_response!(CheckStateResponse, res)
+        self.http_post(url, &request).await
     }
 
     /// Restore request [NUT-13]
     #[instrument(skip(self, request), fields(mint_url = %self.mint_url))]
     async fn post_restore(&self, request: RestoreRequest) -> Result<RestoreResponse, Error> {
         let url = self.mint_url.join_paths(&["v1", "restore"])?;
-
-        let res = self
-            .inner
-            .post(url)
-            .json(&request)
-            .send()
-            .await?
-            .text()
-            .await?;
-
-        convert_http_response!(RestoreResponse, res)
+        self.http_post(url, &request).await
     }
 }