RubyGems - wreq-rb - Versions diffs - 0.5.0 → 0.5.1 - Mend

wreq-rb 0.5.0 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (150) hide show

checksums.yaml +4 -4
data/Cargo.lock +1922 -397
data/LICENSE +203 -0
data/README.md +19 -15
data/ext/wreq_rb/Cargo.toml +4 -6
data/ext/wreq_rb/src/client.rs +41 -48
data/lib/wreq-rb/version.rb +1 -1
data/patches/0001-add-transfer-size-tracking.patch +76 -67
data/vendor/wreq/Cargo.toml +119 -71
data/vendor/wreq/README.md +25 -20
data/vendor/wreq/bench/http1.rs +25 -0
data/vendor/wreq/bench/http1_over_tls.rs +25 -0
data/vendor/wreq/bench/http2.rs +25 -0
data/vendor/wreq/bench/http2_over_tls.rs +25 -0
data/vendor/wreq/bench/support/bench.rs +91 -0
data/vendor/wreq/bench/support/client.rs +217 -0
data/vendor/wreq/bench/support/server.rs +188 -0
data/vendor/wreq/bench/support.rs +56 -0
data/vendor/wreq/examples/cert_store.rs +4 -4
data/vendor/wreq/examples/{emulation.rs → emulate.rs} +2 -2
data/vendor/wreq/examples/http2_websocket.rs +2 -2
data/vendor/wreq/examples/keylog.rs +3 -3
data/vendor/wreq/examples/{request_with_emulation.rs → request_with_emulate.rs} +2 -2
data/vendor/wreq/examples/rt.rs +23 -0
data/vendor/wreq/src/client/body.rs +23 -61
data/vendor/wreq/src/client/emulate.rs +119 -0
data/vendor/wreq/src/client/{http/future.rs → future.rs} +11 -32
data/vendor/wreq/src/client/{http → layer}/client/pool.rs +66 -61
data/vendor/wreq/src/client/{http → layer}/client.rs +416 -270
data/vendor/wreq/src/client/layer/config.rs +27 -6
data/vendor/wreq/src/client/layer/decoder.rs +9 -4
data/vendor/wreq/src/client/layer/redirect/future.rs +6 -3
data/vendor/wreq/src/client/layer/redirect.rs +4 -5
data/vendor/wreq/src/client/layer/retry.rs +8 -5
data/vendor/wreq/src/client/layer/timeout/body.rs +15 -6
data/vendor/wreq/src/client/layer/timeout/future.rs +23 -18
data/vendor/wreq/src/client/layer/timeout.rs +24 -74
data/vendor/wreq/src/client/layer.rs +1 -2
data/vendor/wreq/src/client/multipart.rs +137 -154
data/vendor/wreq/src/client/request.rs +202 -118
data/vendor/wreq/src/client/response.rs +46 -45
data/vendor/wreq/src/client/upgrade.rs +15 -0
data/vendor/wreq/src/client/ws.rs +73 -25
data/vendor/wreq/src/client.rs +1655 -17
data/vendor/wreq/src/config.rs +11 -11
data/vendor/wreq/src/{client/conn → conn}/connector.rs +139 -137
data/vendor/wreq/src/conn/descriptor.rs +143 -0
data/vendor/wreq/src/conn/http.rs +484 -0
data/vendor/wreq/src/conn/net/io.rs +75 -0
data/vendor/wreq/src/conn/net/tcp/compio.rs +71 -0
data/vendor/wreq/src/conn/net/tcp/tokio.rs +57 -0
data/vendor/wreq/src/conn/net/tcp.rs +561 -0
data/vendor/wreq/src/conn/net/uds/compio.rs +60 -0
data/vendor/wreq/src/{client/conn/uds.rs → conn/net/uds/tokio.rs} +18 -12
data/vendor/wreq/src/conn/net/uds.rs +11 -0
data/vendor/wreq/src/conn/net.rs +130 -0
data/vendor/wreq/src/{client/conn → conn}/proxy/socks.rs +2 -9
data/vendor/wreq/src/{client/conn → conn}/proxy/tunnel.rs +21 -56
data/vendor/wreq/src/conn/tls_info.rs +47 -0
data/vendor/wreq/src/{client/conn.rs → conn.rs} +202 -54
data/vendor/wreq/src/cookie.rs +302 -142
data/vendor/wreq/src/dns/gai/compio.rs +77 -0
data/vendor/wreq/src/dns/gai/tokio.rs +90 -0
data/vendor/wreq/src/dns/gai.rs +14 -164
data/vendor/wreq/src/dns/hickory.rs +16 -23
data/vendor/wreq/src/dns/resolve.rs +7 -41
data/vendor/wreq/src/dns.rs +90 -7
data/vendor/wreq/src/error.rs +57 -31
data/vendor/wreq/src/ext.rs +25 -0
data/vendor/wreq/src/group.rs +211 -0
data/vendor/wreq/src/header.rs +100 -112
data/vendor/wreq/src/lib.rs +124 -73
data/vendor/wreq/src/proxy.rs +6 -20
data/vendor/wreq/src/redirect.rs +1 -1
data/vendor/wreq/src/rt.rs +208 -0
data/vendor/wreq/src/sync.rs +97 -98
data/vendor/wreq/src/tls/compress.rs +124 -0
data/vendor/wreq/src/tls/conn/ext.rs +54 -45
data/vendor/wreq/src/tls/conn/service.rs +14 -18
data/vendor/wreq/src/tls/conn.rs +169 -241
data/vendor/wreq/src/tls/keylog.rs +68 -5
data/vendor/wreq/src/tls/session.rs +205 -0
data/vendor/wreq/src/tls/{x509 → trust}/identity.rs +4 -21
data/vendor/wreq/src/tls/{x509/parser.rs → trust/parse.rs} +1 -1
data/vendor/wreq/src/tls/{x509 → trust}/store.rs +42 -81
data/vendor/wreq/src/tls/{x509.rs → trust.rs} +8 -2
data/vendor/wreq/src/tls.rs +489 -25
data/vendor/wreq/src/trace.rs +0 -12
data/vendor/wreq/src/util.rs +1 -1
data/vendor/wreq/tests/badssl.rs +10 -10
data/vendor/wreq/tests/client.rs +3 -9
data/vendor/wreq/tests/cookie.rs +6 -8
data/vendor/wreq/tests/{emulation.rs → emulate.rs} +130 -22
data/vendor/wreq/tests/multipart.rs +43 -1
data/vendor/wreq/tests/proxy.rs +1 -1
data/vendor/wreq/tests/support/layer.rs +1 -0
metadata +49 -71
data/patches/0002-add-cancel-connections.patch +0 -181
data/vendor/wreq/src/client/conn/conn.rs +0 -231
data/vendor/wreq/src/client/conn/http.rs +0 -1023
data/vendor/wreq/src/client/conn/tls_info.rs +0 -98
data/vendor/wreq/src/client/core/body/incoming.rs +0 -485
data/vendor/wreq/src/client/core/body/length.rs +0 -118
data/vendor/wreq/src/client/core/body.rs +0 -34
data/vendor/wreq/src/client/core/common/buf.rs +0 -149
data/vendor/wreq/src/client/core/common/rewind.rs +0 -141
data/vendor/wreq/src/client/core/common/watch.rs +0 -76
data/vendor/wreq/src/client/core/common.rs +0 -3
data/vendor/wreq/src/client/core/conn/http1.rs +0 -342
data/vendor/wreq/src/client/core/conn/http2.rs +0 -307
data/vendor/wreq/src/client/core/conn.rs +0 -11
data/vendor/wreq/src/client/core/dispatch.rs +0 -299
data/vendor/wreq/src/client/core/error.rs +0 -435
data/vendor/wreq/src/client/core/ext.rs +0 -201
data/vendor/wreq/src/client/core/http1.rs +0 -178
data/vendor/wreq/src/client/core/http2.rs +0 -483
data/vendor/wreq/src/client/core/proto/h1/conn.rs +0 -988
data/vendor/wreq/src/client/core/proto/h1/decode.rs +0 -1170
data/vendor/wreq/src/client/core/proto/h1/dispatch.rs +0 -684
data/vendor/wreq/src/client/core/proto/h1/encode.rs +0 -580
data/vendor/wreq/src/client/core/proto/h1/io.rs +0 -879
data/vendor/wreq/src/client/core/proto/h1/role.rs +0 -694
data/vendor/wreq/src/client/core/proto/h1.rs +0 -104
data/vendor/wreq/src/client/core/proto/h2/client.rs +0 -650
data/vendor/wreq/src/client/core/proto/h2/ping.rs +0 -539
data/vendor/wreq/src/client/core/proto/h2.rs +0 -379
data/vendor/wreq/src/client/core/proto/headers.rs +0 -138
data/vendor/wreq/src/client/core/proto.rs +0 -58
data/vendor/wreq/src/client/core/rt/bounds.rs +0 -57
data/vendor/wreq/src/client/core/rt/timer.rs +0 -150
data/vendor/wreq/src/client/core/rt/tokio.rs +0 -99
data/vendor/wreq/src/client/core/rt.rs +0 -25
data/vendor/wreq/src/client/core/upgrade.rs +0 -267
data/vendor/wreq/src/client/core.rs +0 -16
data/vendor/wreq/src/client/emulation.rs +0 -161
data/vendor/wreq/src/client/http/client/error.rs +0 -142
data/vendor/wreq/src/client/http/client/exec.rs +0 -29
data/vendor/wreq/src/client/http/client/extra.rs +0 -77
data/vendor/wreq/src/client/http/client/util.rs +0 -104
data/vendor/wreq/src/client/http.rs +0 -1629
data/vendor/wreq/src/client/layer/config/options.rs +0 -156
data/vendor/wreq/src/client/layer/cookie.rs +0 -161
data/vendor/wreq/src/hash.rs +0 -143
data/vendor/wreq/src/tls/conn/cache.rs +0 -123
data/vendor/wreq/src/tls/conn/cert_compression.rs +0 -125
data/vendor/wreq/src/tls/keylog/handle.rs +0 -64
data/vendor/wreq/src/tls/options.rs +0 -464
/data/vendor/wreq/src/client/{http → layer}/client/lazy.rs +0 -0
/data/vendor/wreq/src/{client/conn → conn}/proxy.rs +0 -0
/data/vendor/wreq/src/{client/conn → conn}/verbose.rs +0 -0

data/vendor/wreq/src/client/request.rs CHANGED Viewed

@@ -6,16 +6,13 @@ use std::{
     time::Duration,
 };
-use http::{Extensions, Request as HttpRequest, Uri, Version};
+#[cfg(any(feature = "form", feature = "json", feature = "multipart"))]
+use http::header::CONTENT_TYPE;
+use http::{Extensions, Uri, Version};
 #[cfg(any(feature = "query", feature = "form", feature = "json"))]
 use serde::Serialize;
 #[cfg(feature = "multipart")]
 use {super::multipart, bytes::Bytes, http::header::CONTENT_LENGTH};
-#[cfg(feature = "cookies")]
-use {
-    crate::cookie::{CookieStore, IntoCookieStore},
-    std::sync::Arc,
-};
 #[cfg(any(
     feature = "gzip",
@@ -25,19 +22,20 @@ use {
 ))]
 use super::layer::decoder::AcceptEncoding;
 use super::{
-    Body, EmulationFactory, Response,
-    http::{Client, future::Pending},
+    Body, Client, IntoEmulation, Response,
+    future::Pending,
     layer::{
         config::{DefaultHeaders, RequestOptions},
         timeout::TimeoutOptions,
     },
 };
-#[cfg(any(feature = "multipart", feature = "form", feature = "json"))]
-use crate::header::CONTENT_TYPE;
+#[cfg(feature = "cookies")]
+use crate::cookie::{CookieStore, IntoCookieStore};
 use crate::{
     Error, Method, Proxy,
     config::{RequestConfig, RequestConfigValue},
     ext::UriExt,
+    group::Group,
     header::{AUTHORIZATION, HeaderMap, HeaderName, HeaderValue, OrigHeaderMap},
     redirect,
 };
@@ -116,15 +114,49 @@ impl Request {
     #[inline]
     pub fn version(&self) -> Option<Version> {
         self.config::<RequestOptions>()
-            .and_then(RequestOptions::enforced_version)
+            .and_then(|opts| opts.version)
     }
     /// Get a mutable reference to the http version.
     #[inline]
     pub fn version_mut(&mut self) -> &mut Option<Version> {
-        self.config_mut::<RequestOptions>()
+        &mut self
+            .config_mut::<RequestOptions>()
             .get_or_insert_default()
-            .enforced_version_mut()
+            .version
+    }
+    /// Returns a reference to the associated extensions.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use wreq;
+    /// let request = wreq::get("http://httpbin.org/get")
+    ///     .build()
+    ///     .expect("failed to build request");
+    /// assert!(request.extensions().get::<i32>().is_none());
+    /// ```
+    #[inline]
+    pub fn extensions(&self) -> &Extensions {
+        self.0.extensions()
+    }
+    /// Returns a mutable reference to the associated extensions.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use wreq;
+    /// let mut request = wreq::get("http://httpbin.org/get")
+    ///     .build()
+    ///     .expect("failed to build request");
+    /// request.extensions_mut().insert("hello");
+    /// assert_eq!(request.extensions().get(), Some(&"hello"));
+    /// ```
+    #[inline]
+    pub fn extensions_mut(&mut self) -> &mut Extensions {
+        self.0.extensions_mut()
     }
     /// Attempt to clone the request.
@@ -143,16 +175,6 @@ impl Request {
         Some(req)
     }
-    #[inline]
-    pub(crate) fn extensions(&self) -> &Extensions {
-        self.0.extensions()
-    }
-    #[inline]
-    pub(crate) fn extensions_mut(&mut self) -> &mut Extensions {
-        self.0.extensions_mut()
-    }
     #[inline]
     pub(crate) fn config<T>(&self) -> Option<&T::Value>
     where
@@ -331,10 +353,7 @@ impl RequestBuilder {
     /// # Ok(())
     /// # }
     /// ```
-    pub fn bearer_auth<T>(self, token: T) -> RequestBuilder
-    where
-        T: fmt::Display,
-    {
+    pub fn bearer_auth<T: fmt::Display>(self, token: T) -> RequestBuilder {
         let header_value = format!("Bearer {token}");
         self.header_sensitive(AUTHORIZATION, header_value, true)
     }
@@ -367,59 +386,6 @@ impl RequestBuilder {
         self
     }
-    /// Set the request body.
-    pub fn body<T: Into<Body>>(mut self, body: T) -> RequestBuilder {
-        if let Ok(ref mut req) = self.request {
-            *req.body_mut() = Some(body.into());
-        }
-        self
-    }
-    /// Sends a multipart/form-data body.
-    ///
-    /// ```
-    /// # use wreq::Error;
-    ///
-    /// # async fn run() -> Result<(), Error> {
-    /// let client = wreq::Client::new();
-    /// let form = wreq::multipart::Form::new()
-    ///     .text("key3", "value3")
-    ///     .text("key4", "value4");
-    ///
-    /// let response = client.post("your uri").multipart(form).send().await?;
-    /// # Ok(())
-    /// # }
-    /// ```
-    #[cfg(feature = "multipart")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "multipart")))]
-    pub fn multipart(mut self, mut multipart: multipart::Form) -> RequestBuilder {
-        if let Ok(ref mut req) = self.request {
-            match HeaderValue::from_maybe_shared(Bytes::from(format!(
-                "multipart/form-data; boundary={}",
-                multipart.boundary()
-            ))) {
-                Ok(content_type) => {
-                    req.headers_mut()
-                        .entry(CONTENT_TYPE)
-                        .or_insert(content_type);
-                    if let Some(length) = multipart.compute_length() {
-                        req.headers_mut()
-                            .entry(CONTENT_LENGTH)
-                            .or_insert_with(|| HeaderValue::from(length));
-                    }
-                    *req.body_mut() = Some(multipart.stream())
-                }
-                Err(err) => {
-                    self.request = Err(Error::builder(err));
-                }
-            };
-        }
-        self
-    }
     /// Modify the query string of the URI.
     ///
     /// Modifies the URI of this request, adding the parameters provided.
@@ -443,7 +409,7 @@ impl RequestBuilder {
     pub fn query<T: Serialize + ?Sized>(mut self, query: &T) -> RequestBuilder {
         let mut error = None;
         if let Ok(ref mut req) = self.request {
-            match serde_urlencoded::to_string(query) {
+            match serde_html_form::to_string(query) {
                 Ok(serializer) => {
                     let uri = req.uri_mut();
                     uri.set_query(serializer);
@@ -489,12 +455,15 @@ impl RequestBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "form")))]
     pub fn form<T: Serialize + ?Sized>(mut self, form: &T) -> RequestBuilder {
         if let Ok(ref mut req) = self.request {
-            match serde_urlencoded::to_string(form) {
+            match serde_html_form::to_string(form) {
                 Ok(body) => {
-                    req.headers_mut().entry(CONTENT_TYPE).or_insert_with(|| {
-                        HeaderValue::from_static("application/x-www-form-urlencoded")
-                    });
-                    *req.body_mut() = Some(body.into());
+                    const HEADER_VALUE: HeaderValue =
+                        HeaderValue::from_static("application/x-www-form-urlencoded");
+                    req.headers_mut()
+                        .entry(CONTENT_TYPE)
+                        .or_insert(HEADER_VALUE);
+                    req.body_mut().replace(body.into());
                 }
                 Err(err) => self.request = Err(Error::builder(err)),
             }
@@ -518,10 +487,12 @@ impl RequestBuilder {
         if let Ok(ref mut req) = self.request {
             match serde_json::to_vec(json) {
                 Ok(body) => {
+                    const HEADER_VALUE: HeaderValue = HeaderValue::from_static("application/json");
                     req.headers_mut()
                         .entry(CONTENT_TYPE)
-                        .or_insert_with(|| HeaderValue::from_static("application/json"));
-                    *req.body_mut() = Some(body.into());
+                        .or_insert(HEADER_VALUE);
+                    req.body_mut().replace(body.into());
                 }
                 Err(err) => self.request = Err(Error::builder(err)),
             }
@@ -530,10 +501,66 @@ impl RequestBuilder {
         self
     }
+    /// Set the request body.
+    pub fn body<T: Into<Body>>(mut self, body: T) -> RequestBuilder {
+        if let Ok(ref mut req) = self.request {
+            *req.body_mut() = Some(body.into());
+        }
+        self
+    }
+    /// Sends a multipart/form-data body.
+    ///
+    /// ```
+    /// # use wreq::Error;
+    ///
+    /// # async fn run() -> Result<(), Error> {
+    /// let client = wreq::Client::new();
+    /// let form = wreq::multipart::Form::new()
+    ///     .text("key3", "value3")
+    ///     .text("key4", "value4");
+    ///
+    /// let response = client.post("your uri").multipart(form).send().await?;
+    /// # Ok(())
+    /// # }
+    /// ```
+    #[cfg(feature = "multipart")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "multipart")))]
+    pub fn multipart(mut self, mut multipart: multipart::Form) -> RequestBuilder {
+        if let Ok(ref mut req) = self.request {
+            match HeaderValue::from_maybe_shared(Bytes::from(format!(
+                "multipart/form-data; boundary={}",
+                multipart.boundary()
+            ))) {
+                Ok(content_type) => {
+                    req.headers_mut()
+                        .entry(CONTENT_TYPE)
+                        .or_insert(content_type);
+                    if let Some(length) = multipart.compute_length() {
+                        req.headers_mut()
+                            .entry(CONTENT_LENGTH)
+                            .or_insert_with(|| HeaderValue::from(length));
+                    }
+                    *req.body_mut() = Some(multipart.stream())
+                }
+                Err(err) => {
+                    self.request = Err(Error::builder(err));
+                }
+            };
+        }
+        self
+    }
     /// Set HTTP version
     pub fn version(mut self, version: Version) -> RequestBuilder {
         if let Ok(ref mut req) = self.request {
             req.version_mut().replace(version);
+            req.config_mut::<RequestOptions>()
+                .get_or_insert_default()
+                .version = Some(version);
         }
         self
     }
@@ -549,13 +576,12 @@ impl RequestBuilder {
     /// Set the persistent cookie store for the request.
     #[cfg(feature = "cookies")]
     #[cfg_attr(docsrs, doc(cfg(feature = "cookies")))]
-    pub fn cookie_provider<C>(mut self, cookie_store: C) -> RequestBuilder
-    where
-        C: IntoCookieStore,
-    {
+    pub fn cookie_provider<C: IntoCookieStore>(mut self, cookie_store: C) -> RequestBuilder {
         if let Ok(ref mut req) = self.request {
+            use std::sync::Arc;
             req.config_mut::<Arc<dyn CookieStore>>()
-                .replace(cookie_store.into_cookie_store());
+                .replace(cookie_store.into_shared());
         }
         self
     }
@@ -613,8 +639,7 @@ impl RequestBuilder {
         if let Ok(ref mut req) = self.request {
             req.config_mut::<RequestOptions>()
                 .get_or_insert_default()
-                .proxy_matcher_mut()
-                .replace(proxy.into_matcher());
+                .proxy = Some(proxy.into_matcher());
         }
         self
     }
@@ -627,14 +652,15 @@ impl RequestBuilder {
         if let Ok(ref mut req) = self.request {
             req.config_mut::<RequestOptions>()
                 .get_or_insert_default()
-                .tcp_connect_opts_mut()
-                .set_local_address(local_address.into());
+                .socket_bind_options
+                .get_or_insert_default()
+                .set_local_address(local_address);
         }
         self
     }
     /// Set the local addresses for this request.
-    pub fn local_addresses<V4, V6>(mut self, ipv4: V4, ipv6: V6) -> RequestBuilder
+    pub fn local_addresses<V4, V6>(mut self, ipv4_address: V4, ipv6_address: V6) -> RequestBuilder
     where
         V4: Into<Option<Ipv4Addr>>,
         V6: Into<Option<Ipv6Addr>>,
@@ -642,13 +668,45 @@ impl RequestBuilder {
         if let Ok(ref mut req) = self.request {
             req.config_mut::<RequestOptions>()
                 .get_or_insert_default()
-                .tcp_connect_opts_mut()
-                .set_local_addresses(ipv4, ipv6);
+                .socket_bind_options
+                .get_or_insert_default()
+                .set_local_addresses(ipv4_address, ipv6_address);
         }
         self
     }
-    /// Set the interface for this request.
+    /// Bind connections only on the specified network interface.
+    ///
+    /// This option is only available on the following operating systems:
+    ///
+    /// - Android
+    /// - Fuchsia
+    /// - Linux,
+    /// - macOS and macOS-like systems (iOS, tvOS, watchOS and visionOS)
+    /// - Solaris and illumos
+    ///
+    /// On Android, Linux, and Fuchsia, this uses the
+    /// [`SO_BINDTODEVICE`][man-7-socket] socket option. On macOS and macOS-like
+    /// systems, Solaris, and illumos, this instead uses the [`IP_BOUND_IF` and
+    /// `IPV6_BOUND_IF`][man-7p-ip] socket options (as appropriate).
+    ///
+    /// Note that connections will fail if the provided interface name is not a
+    /// network interface that currently exists when a connection is established.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # fn doc() -> Result<(), wreq::Error> {
+    /// let interface = "lo";
+    /// let client = wreq::Client::builder()
+    ///     .interface(interface)
+    ///     .build()?;
+    /// # Ok(())
+    /// # }
+    /// ```
+    ///
+    /// [man-7-socket]: https://man7.org/linux/man-pages/man7/socket.7.html
+    /// [man-7p-ip]: https://docs.oracle.com/cd/E86824_01/html/E54777/ip-7p.html
     #[cfg(any(
         target_os = "android",
         target_os = "fuchsia",
@@ -683,32 +741,57 @@ impl RequestBuilder {
         if let Ok(ref mut req) = self.request {
             req.config_mut::<RequestOptions>()
                 .get_or_insert_default()
-                .tcp_connect_opts_mut()
+                .socket_bind_options
+                .get_or_insert_default()
                 .set_interface(interface);
         }
         self
     }
-    /// Set the emulation for this request.
-    pub fn emulation<P>(mut self, factory: P) -> RequestBuilder
-    where
-        P: EmulationFactory,
-    {
+    /// Sets the request builder to emulation the specified HTTP context.
+    ///
+    /// This method sets the necessary headers, HTTP/1 and HTTP/2 options configurations, and  TLS
+    /// options config to use the specified HTTP context. It allows the client to mimic the
+    /// behavior of different versions or setups, which can be useful for testing or ensuring
+    /// compatibility with various environments.
+    ///
+    /// # Note
+    /// This will overwrite the existing configuration.
+    /// You must set emulation before you can perform subsequent HTTP1/HTTP2/TLS fine-tuning.
+    pub fn emulation<T: IntoEmulation>(mut self, emulation: T) -> RequestBuilder {
+        if let Ok(ref mut req) = self.request {
+            let emulation = emulation.into_emulation();
+            let opts = req.config_mut::<RequestOptions>().get_or_insert_default();
+            opts.group.emulate(emulation.group);
+            opts.tls_options = emulation.tls_options;
+            opts.http1_options = emulation.http1_options;
+            opts.http2_options = emulation.http2_options;
+            return self
+                .headers(emulation.headers)
+                .orig_headers(emulation.orig_headers);
+        }
+        self
+    }
+    /// Assigns a logical group to this request.
+    ///
+    /// Groups define the request's identity and execution context.
+    /// Requests in different groups are logically partitioned to ensure
+    /// resource isolation and prevent metadata leakage.
+    pub fn group(mut self, group: Group) -> RequestBuilder {
         if let Ok(ref mut req) = self.request {
-            let emulation = factory.emulation();
-            let (transport_opts, default_headers, orig_headers) = emulation.into_parts();
             req.config_mut::<RequestOptions>()
                 .get_or_insert_default()
-                .transport_opts_mut()
-                .apply_transport_options(transport_opts);
-            self = self.headers(default_headers).orig_headers(orig_headers);
+                .group
+                .request(group);
         }
         self
     }
     /// Build a `Request`, which can be inspected, modified and executed with
     /// [`Client::execute()`].
+    #[inline]
     pub fn build(self) -> crate::Result<Request> {
         self.request
     }
@@ -718,6 +801,7 @@ impl RequestBuilder {
     ///
     /// This is similar to [`RequestBuilder::build()`], but also returns the
     /// embedded [`Client`].
+    #[inline]
     pub fn build_split(self) -> (Client, crate::Result<Request>) {
         (self.client, self.request)
     }
@@ -743,7 +827,7 @@ impl RequestBuilder {
     pub fn send(self) -> impl Future<Output = crate::Result<Response>> {
         match self.request {
             Ok(req) => self.client.execute(req),
-            Err(err) => Pending::error(err),
+            Err(err) => Pending::Error { error: Some(err) },
         }
     }
@@ -803,16 +887,16 @@ fn extract_authority(uri: &mut Uri) -> Option<(String, Option<String>)> {
     None
 }
-impl<T: Into<Body>> From<HttpRequest<T>> for Request {
+impl<T: Into<Body>> From<http::Request<T>> for Request {
     #[inline]
-    fn from(req: HttpRequest<T>) -> Request {
+    fn from(req: http::Request<T>) -> Request {
         Request(req.map(Into::into).map(Some))
     }
 }
-impl From<Request> for HttpRequest<Body> {
+impl From<Request> for http::Request<Body> {
     #[inline]
-    fn from(req: Request) -> HttpRequest<Body> {
+    fn from(req: Request) -> http::Request<Body> {
         req.0.map(|body| body.unwrap_or_else(Body::empty))
     }
 }

data/vendor/wreq/src/client/response.rs CHANGED Viewed

@@ -16,14 +16,16 @@ use http_body_util::{BodyExt, Collected};
 use mime::Mime;
 #[cfg(feature = "json")]
 use serde::de::DeserializeOwned;
+use wreq_proto::ext::ReasonPhrase;
-use super::{
-    conn::HttpInfo,
-    core::{ext::ReasonPhrase, upgrade},
-};
 #[cfg(feature = "cookies")]
 use crate::cookie;
-use crate::{Body, Error, Upgraded, error::BoxError, ext::RequestUri};
+use crate::{
+    Body, Error,
+    conn::{Connected, http::HttpInfo},
+    error::BoxError,
+    ext::RequestUri,
+};
 /// A Response to a submitted [`crate::Request`].
 #[derive(Debug)]
@@ -33,14 +35,18 @@ pub struct Response {
 }
 impl Response {
-    pub(super) fn new<B>(res: http::Response<B>, uri: Uri) -> Response
+    #[inline]
+    pub(super) fn new<B>(mut res: http::Response<B>, uri: Uri) -> Response
     where
         B: HttpBody + Send + Sync + 'static,
         B::Data: Into<Bytes>,
         B::Error: Into<BoxError>,
     {
         Response {
-            uri,
+            uri: res
+                .extensions_mut()
+                .remove::<RequestUri>()
+                .map_or(uri, |request_uri| request_uri.0),
             res: res.map(Body::wrap),
         }
     }
@@ -269,8 +275,15 @@ impl Response {
     #[cfg(feature = "json")]
     #[cfg_attr(docsrs, doc(cfg(feature = "json")))]
     pub async fn json<T: DeserializeOwned>(self) -> crate::Result<T> {
-        let full = self.bytes().await?;
-        serde_json::from_slice(&full).map_err(Error::decode)
+        match http_body_util::BodyExt::collect(self.res.into_body())
+            .await
+            .map(Collected::<Bytes>::to_bytes)
+        {
+            Ok(full) => serde_json::from_slice(&full)
+                .map_err(Error::decode)
+                .map_err(|err| err.with_uri(self.uri)),
+            Err(err) => Err(err.with_uri(self.uri)),
+        }
     }
     /// Get the full response body as [`Bytes`].
@@ -290,38 +303,12 @@ impl Response {
     /// # Ok(())
     /// # }
     /// ```
+    #[inline]
     pub async fn bytes(self) -> crate::Result<Bytes> {
         BodyExt::collect(self.res.into_body())
             .await
             .map(Collected::<Bytes>::to_bytes)
-    }
-    /// Stream a chunk of the response body.
-    ///
-    /// When the response body has been exhausted, this will return `None`.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # async fn run() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut res = wreq::get("https://hyper.rs").send().await?;
-    ///
-    /// while let Some(chunk) = res.chunk().await? {
-    ///     println!("Chunk: {chunk:?}");
-    /// }
-    /// # Ok(())
-    /// # }
-    /// ```
-    pub async fn chunk(&mut self) -> crate::Result<Option<Bytes>> {
-        loop {
-            if let Some(res) = self.res.body_mut().frame().await {
-                if let Ok(buf) = res?.into_data() {
-                    return Ok(Some(buf));
-                }
-            } else {
-                return Ok(None);
-            }
-        }
+            .map_err(|err| err.with_uri(self.uri))
     }
     /// Convert the response into a [`Stream`] of [`Bytes`] from the body.
@@ -348,6 +335,7 @@ impl Response {
     /// # Optional
     ///
     /// This requires the optional `stream` feature to be enabled.
+    #[inline]
     #[cfg(feature = "stream")]
     #[cfg_attr(docsrs, doc(cfg(feature = "stream")))]
     pub fn bytes_stream(self) -> impl Stream<Item = crate::Result<Bytes>> {
@@ -414,6 +402,23 @@ impl Response {
         self.res.extensions_mut()
     }
+    /// Forbids the [`Response`] connection from being recycled back into the pool.
+    ///
+    /// This marks the underlying connection as "poisoned." Once marked, the connection
+    /// will be discarded instead of reused after the current request-response cycle completes.
+    ///
+    /// # Note on Lifecycle
+    /// Marking the connection does not trigger an immediate shutdown. For pooled
+    /// connections, the physical closure is deferred until the `Response` body
+    /// is dropped or the pool's background cleaner reclaims the resource.
+    #[inline]
+    pub fn forbid_recycle(&self) {
+        self.res
+            .extensions()
+            .get::<Connected>()
+            .map(Connected::poison);
+    }
     // util methods
     /// Turn a response into an error if the server returned an error.
@@ -471,11 +476,6 @@ impl Response {
             Ok(self)
         }
     }
-    /// Consumes the [`Response`] and returns a future for a possible HTTP upgrade.
-    pub async fn upgrade(self) -> crate::Result<Upgraded> {
-        upgrade::on(self.res).await.map_err(Error::upgrade)
-    }
 }
 /// I'm not sure this conversion is that useful... People should be encouraged
@@ -503,6 +503,7 @@ impl From<Response> for http::Response<Body> {
 /// A [`Response`] can be piped as the [`Body`] of another request.
 impl From<Response> for Body {
+    #[inline]
     fn from(r: Response) -> Body {
         Body::wrap(r.res.into_body())
     }
@@ -514,7 +515,7 @@ impl HttpBody for Response {
     type Error = Error;
-    #[inline]
+    #[inline(always)]
     fn poll_frame(
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
@@ -522,12 +523,12 @@ impl HttpBody for Response {
         Pin::new(self.res.body_mut()).poll_frame(cx)
     }
-    #[inline]
+    #[inline(always)]
     fn is_end_stream(&self) -> bool {
         self.res.body().is_end_stream()
     }
-    #[inline]
+    #[inline(always)]
     fn size_hint(&self) -> http_body::SizeHint {
         self.res.body().size_hint()
     }

data/vendor/wreq/src/client/upgrade.rs ADDED Viewed

@@ -0,0 +1,15 @@
+pub use upgrade::Upgraded;
+use wreq_proto::upgrade;
+use super::response::Response;
+use crate::Error;
+impl Response {
+    /// Consumes the [`Response`] and returns a future for a possible HTTP upgrade.
+    #[inline]
+    pub async fn upgrade(self) -> crate::Result<Upgraded> {
+        upgrade::on(http::Response::from(self))
+            .await
+            .map_err(Error::upgrade)
+    }
+}