Merge branch 'main' into expose-inner-reqwest-client

Author: skos-ninja

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --workspace --all-targets --all-features
+          args: --workspace --all-targets
 
   test-features-reqwest-middleware:
     name: Run test suite for `reqwest-middleware` with every feature combination
@@ -39,6 +39,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: wasm32-unknown-unknown
       - uses: actions-rs/cargo@v1
         with:
           command: build
@@ -67,7 +69,9 @@ jobs:
         uses: taiki-e/install-action@cargo-hack
       # Old opentelemetry features group to improve performance
       - name: test
-        run: cargo hack test --feature-powerset -p reqwest-tracing --group-features opentelemetry_0_20,opentelemetry_0_21,opentelemetry_0_22
+        run: cargo hack test --feature-powerset -p reqwest-tracing --exclude-features opentelemetry_0_20 --group-features opentelemetry_0_21,opentelemetry_0_22,opentelemetry_0_23,opentelemetry_0_24,opentelemetry_0_25,opentelemetry_0_26,opentelemetry_0_27
+        env:
+          CARGO_PROFILE_DEV_DEBUG: "line-tables-only"
 
   rustfmt:
     name: Rustfmt

.github/workflows/release-plz.yml

@@ -0,0 +1,51 @@
+name: Release-plz
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release-plz-release:
+    name: Release-plz release
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'TrueLayer' }}
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - &checkout
+        name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          persist-credentials: true
+      - &install-rust
+        name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Run release-plz
+        uses: release-plz/action@v0.5
+        with:
+          command: release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  release-plz-pr:
+    name: Release-plz PR
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'TrueLayer' }}
+    permissions:
+      pull-requests: write
+      contents: write
+    concurrency:
+      group: release-plz-${{ github.ref }}
+      cancel-in-progress: false
+    steps:
+      - *checkout
+      - *install-rust
+      - name: Run release-plz
+        uses: release-plz/action@v0.5
+        with:
+          command: release-pr
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -29,10 +29,10 @@ The `reqwest-middleware` client exposes the same interface as a plain `reqwest`
 # Cargo.toml
 # ...
 [dependencies]
-reqwest = { version = "0.12", features = ["rustls-tls"] }
-reqwest-middleware = "0.4"
-reqwest-retry = "0.7"
-reqwest-tracing = "0.5"
+reqwest = "0.13"
+reqwest-middleware = "0.5"
+reqwest-retry = "0.9"
+reqwest-tracing = "0.6"
 tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
 ```
 

reqwest-middleware/CHANGELOG.md

@@ -4,11 +4,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.5.1](https://github.com/TrueLayer/reqwest-middleware/compare/reqwest-middleware-v0.5.0...reqwest-middleware-v0.5.1) - 2026-02-05
+
+### Other
+
+- Set changelog version for last release ([#268](https://github.com/TrueLayer/reqwest-middleware/pull/268))
+
+## [0.5.0] - 2026-01-07
+
+### Changed
+
+- Updated `thiserror` to `2.0`
+- Updated `reqwest` to `0.13`
+- Renamed `rustls-tls` feature to `rustls` to match reqwest's feature naming
+- Added `form` feature, enables `reqwest/form`
+- Added `query` feature, enables `reqwest/query`
+- Made `serde` an optional dependency, enabled by `json`, `form`, or `query`
+
+### Removed
+- Remove deprecated `fetch_mode_no_cors`
+
+## [0.4.2] - 2025-04-08
+
+### Added
+- Deprecated `fetch_mode_no_cors` as it's been deprecated in reqwest.
+
+## [0.4.1] - 2025-02-24
+
 - Fixed wasm32 by disabling incompatible parts. On that target, `ClientWithMiddleware` is no longer
   a Tower service and has no `ClientWithMiddleware::timeout` function.
 
-- Implemented `AsRef<Client>` for `ClientWithMiddleware`. Allows access to the inner `reqwest::Client` ([#209](https://github.com/TrueLayer/reqwest-middleware/pull/209))
+### Changed
+- Updated `wasm-timer` to `wasmtimer`
 
 ## [0.4.0] - 2024-11-08
 

reqwest-middleware/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reqwest-middleware"
-version = "0.4.0"
+version = "0.5.1"
 authors = ["Rodrigo Gryzinski <rodrigo.gryzinski@truelayer.com>"]
 edition = "2018"
 description = "Wrapper around reqwest to allow for client middleware chains."
@@ -12,22 +12,24 @@ readme = "../README.md"
 
 [features]
 multipart = ["reqwest/multipart"]
-json = ["reqwest/json"]
+json = ["reqwest/json", "dep:serde"]
 charset = ["reqwest/charset"]
 http2 = ["reqwest/http2"]
-rustls-tls = ["reqwest/rustls-tls"]
+rustls = ["reqwest/rustls"]
+query = ["reqwest/query", "dep:serde"]
+form = ["reqwest/form", "dep:serde"]
 
 [dependencies]
 anyhow = "1.0.0"
 async-trait = "0.1.51"
 http = "1.0.0"
-reqwest = { version = "0.12.0", default-features = false }
-serde = "1.0.106"
-thiserror = "1.0.21"
+reqwest = { version = "0.13.1", default-features = false }
+serde = { version = "1.0.106", optional = true }
+thiserror = "2.0"
 tower-service = "0.3.0"
 
 [dev-dependencies]
-reqwest = { version = "0.12.0", features = ["rustls-tls"] }
+reqwest = { version = "0.13.1", features = ["rustls"] }
 reqwest-retry = { path = "../reqwest-retry" }
 reqwest-tracing = { path = "../reqwest-tracing" }
 tokio = { version = "1.0.0", features = ["macros", "rt-multi-thread"] }

reqwest-middleware/src/client.rs

@@ -1,7 +1,6 @@
 use http::Extensions;
 use reqwest::header::{HeaderMap, HeaderName, HeaderValue};
 use reqwest::{Body, Client, IntoUrl, Method, Request, Response};
-use serde::Serialize;
 use std::convert::TryFrom;
 use std::fmt::{self, Display};
 use std::sync::Arc;
@@ -449,6 +448,7 @@ impl RequestBuilder {
         }
     }
 
+    #[cfg(feature = "query")]
     /// Modify the query string of the URL.
     ///
     /// Modifies the URL of this request, adding the parameters provided.
@@ -467,13 +467,14 @@ impl RequestBuilder {
     /// # Errors
     /// This method will fail if the object you provide cannot be serialized
     /// into a query string.
-    pub fn query<T: Serialize + ?Sized>(self, query: &T) -> Self {
+    pub fn query<T: serde::Serialize + ?Sized>(self, query: &T) -> Self {
         RequestBuilder {
             inner: self.inner.query(query),
             ..self
         }
     }
 
+    #[cfg(feature = "form")]
     /// Send a form body.
     ///
     /// Sets the body to the url encoded serialization of the passed value,
@@ -501,7 +502,7 @@ impl RequestBuilder {
     ///
     /// This method fails if the passed value cannot be serialized into
     /// url encoded format
-    pub fn form<T: Serialize + ?Sized>(self, form: &T) -> Self {
+    pub fn form<T: serde::Serialize + ?Sized>(self, form: &T) -> Self {
         RequestBuilder {
             inner: self.inner.form(form),
             ..self
@@ -520,29 +521,13 @@ impl RequestBuilder {
     /// fail, or if `T` contains a map with non-string keys.
     #[cfg(feature = "json")]
     #[cfg_attr(docsrs, doc(cfg(feature = "json")))]
-    pub fn json<T: Serialize + ?Sized>(self, json: &T) -> Self {
+    pub fn json<T: serde::Serialize + ?Sized>(self, json: &T) -> Self {
         RequestBuilder {
             inner: self.inner.json(json),
             ..self
         }
     }
 
-    /// Disable CORS on fetching the request.
-    ///
-    /// # WASM
-    ///
-    /// This option is only effective with WebAssembly target.
-    ///
-    /// The [request mode][mdn] will be set to 'no-cors'.
-    ///
-    /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/Request/mode
-    pub fn fetch_mode_no_cors(self) -> Self {
-        RequestBuilder {
-            inner: self.inner.fetch_mode_no_cors(),
-            ..self
-        }
-    }
-
     /// Build a `Request`, which can be inspected, modified and executed with
     /// `ClientWithMiddleware::execute()`.
     pub fn build(self) -> reqwest::Result<Request> {

reqwest-retry/CHANGELOG.md

@@ -4,7 +4,31 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.9.1](https://github.com/TrueLayer/reqwest-middleware/compare/reqwest-retry-v0.9.0...reqwest-retry-v0.9.1) - 2026-02-05
+
+### Fixed
+
+- *(reqwest-retry)* drop instant by upgrading wasmtimer ([#254](https://github.com/TrueLayer/reqwest-middleware/pull/254))
+
+### Other
+
+- Set changelog version for last release ([#268](https://github.com/TrueLayer/reqwest-middleware/pull/268))
+
+## [0.9.0] - 2026-01-07
+
+### Changed
+
+- Updated `reqwest` to `0.13`
+
+## [0.8.0] - 2025-11-26
+
+### Breaking Changes
+
+- Updated `retry-policies` (re-exported as `reqwest_retry::policies`) to 0.5.
+
+### Changed
+
+- Updated `thiserror` to `2.0`
 
 ## [0.7.0] - 2024-11-08
 

reqwest-retry/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reqwest-retry"
-version = "0.7.0"
+version = "0.9.1"
 authors = ["Rodrigo Gryzinski <rodrigo.gryzinski@truelayer.com>"]
 edition = "2018"
 description = "Retry middleware for reqwest."
@@ -14,24 +14,23 @@ default = ["tracing"]
 tracing = ["dep:tracing"]
 
 [dependencies]
-reqwest-middleware = { version = ">0.3.0, <0.5.0", path = "../reqwest-middleware" }
+reqwest-middleware = { version = "0.5", path = "../reqwest-middleware" }
 
 anyhow = "1.0.0"
 async-trait = "0.1.51"
 futures = "0.3.0"
 http = "1.0"
-reqwest = { version = "0.12.0", default-features = false }
-retry-policies = "0.4"
-thiserror = "1.0.61"
+reqwest = { version = "0.13.1", default-features = false }
+retry-policies = "0.5"
+thiserror = "2.0"
 tracing = { version = "0.1.26", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 hyper = "1.0"
 tokio = { version = "1.6.0", default-features = false, features = ["time"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-parking_lot = { version = "0.11.2", features = ["wasm-bindgen"] } # work around https://github.com/tomaka/wasm-timer/issues/14
-wasm-timer = "0.2.5"
+wasmtimer = "0.4.3"
 getrandom = { version = "0.2.0", features = ["js"] }
 
 [dev-dependencies]

reqwest-retry/src/middleware.rs

@@ -177,9 +177,7 @@ where
                     #[cfg(not(target_arch = "wasm32"))]
                     tokio::time::sleep(duration).await;
                     #[cfg(target_arch = "wasm32")]
-                    wasm_timer::Delay::new(duration)
-                        .await
-                        .expect("failed sleeping");
+                    wasmtimer::tokio::sleep(duration).await;
 
                     n_past_retries += 1;
                     continue;

reqwest-retry/src/retryable_strategy.rs

@@ -7,10 +7,10 @@ use reqwest_middleware::Error;
 /// A [`RetryableStrategy`] has a single `handler` functions.
 /// The result of calling the request could be:
 /// - [`reqwest::Response`] In case the request has been sent and received correctly
-///     This could however still mean that the server responded with a erroneous response.
-///     For example a HTTP statuscode of 500
+///   This could however still mean that the server responded with a erroneous response.
+///   For example a HTTP statuscode of 500
 /// - [`reqwest_middleware::Error`] In this case the request actually failed.
-///     This could, for example, be caused by a timeout on the connection.
+///   This could, for example, be caused by a timeout on the connection.
 ///
 /// Example:
 ///