wreq-rb 0.5.0 → 0.5.1

data/vendor/wreq/tests/cookie.rs

@@ -1,7 +1,6 @@
 mod support;
-use std::sync::Arc;
 
-use http::header::COOKIE;
+use http::{Version, header::COOKIE};
 use support::server;
 use wreq::{Client, cookie::Jar};
 
@@ -231,6 +230,7 @@ async fn cookie_request_level_compression() {
                 .body(Default::default())
                 .unwrap(),
             "/default" | "/compressed" => {
+                assert_eq!(req.version(), Version::HTTP_11);
                 let cookies = req
                     .headers()
                     .get(COOKIE)
@@ -245,6 +245,7 @@ async fn cookie_request_level_compression() {
                 http::Response::default()
             }
             "/uncompressed" => {
+                assert_eq!(req.version(), Version::HTTP_2);
                 let cookies: Vec<_> = req
                     .headers()
                     .get_all(COOKIE)
@@ -265,12 +266,9 @@ async fn cookie_request_level_compression() {
 
     let base_url = format!("http://{}", server.addr());
 
-    // Create a jar with compression enabled (default)
-    let jar = Arc::new(Jar::default());
-
     // Create a client with this jar
     let client = Client::builder()
-        .cookie_provider(jar.clone())
+        .cookie_provider(Jar::default())
         .build()
         .unwrap();
 
@@ -291,7 +289,7 @@ async fn cookie_request_level_compression() {
     // Request with compressed cookies
     client
         .get(format!("{}/compressed", base_url))
-        .cookie_provider(jar.compressed())
+        .version(Version::HTTP_11)
         .send()
         .await
         .unwrap();
@@ -299,7 +297,7 @@ async fn cookie_request_level_compression() {
     // Request with uncompressed cookies
     client
         .get(format!("{}/uncompressed", base_url))
-        .cookie_provider(jar.uncompressed())
+        .version(Version::HTTP_2)
         .send()
         .await
         .unwrap();

data/vendor/wreq/tests/{emulation.rs → emulate.rs}

@@ -1,13 +1,105 @@
-use std::time::Duration;
+use std::{
+    io::{self, Write},
+    time::Duration,
+};
 
+use brotli::{CompressorWriter as BrotliEncoder, Decompressor as BrotliDecoder};
+use flate2::{Compression, read::ZlibDecoder, write::ZlibEncoder};
 use wreq::{
     Client, Emulation,
     http1::Http1Options,
     http2::{
         Http2Options, PseudoId, PseudoOrder, SettingId, SettingsOrder, StreamDependency, StreamId,
     },
-    tls::{AlpnProtocol, CertificateCompressionAlgorithm, ExtensionType, TlsOptions, TlsVersion},
+    tls::{
+        AlpnProtocol, ExtensionType, KeyShare, TlsOptions, TlsVersion,
+        compress::{CertificateCompressionAlgorithm, CertificateCompressor, Codec},
+    },
 };
+use zstd::stream::{Decoder as ZstdDecoder, Encoder as ZstdEncoder};
+
+#[derive(Debug)]
+struct BrotliCompressor {
+    q: u32,
+    lgwin: u32,
+}
+
+#[derive(Debug)]
+struct ZlibCompressor;
+
+#[derive(Debug)]
+struct ZstdCompressor;
+
+impl CertificateCompressor for BrotliCompressor {
+    fn compress(&self) -> Codec {
+        let q = self.q;
+        let lgwin = self.lgwin;
+        Codec::Dynamic(Box::new(move |input, output| {
+            let mut writer = BrotliEncoder::new(output, input.len(), q, lgwin);
+            writer.write_all(input)?;
+            writer.flush()?;
+            Ok(())
+        }))
+    }
+
+    fn decompress(&self) -> Codec {
+        Codec::Pointer(|input, output| {
+            let mut reader = BrotliDecoder::new(input, 4096);
+            io::copy(&mut reader, output)?;
+            Ok(())
+        })
+    }
+
+    fn algorithm(&self) -> CertificateCompressionAlgorithm {
+        CertificateCompressionAlgorithm::BROTLI
+    }
+}
+
+impl CertificateCompressor for ZlibCompressor {
+    fn compress(&self) -> Codec {
+        Codec::Pointer(|input, output| {
+            let mut encoder = ZlibEncoder::new(output, Compression::default());
+            encoder.write_all(input)?;
+            encoder.finish()?;
+            Ok(())
+        })
+    }
+
+    fn decompress(&self) -> Codec {
+        Codec::Pointer(|input, output| {
+            let mut reader = ZlibDecoder::new(input);
+            io::copy(&mut reader, output)?;
+            Ok(())
+        })
+    }
+
+    fn algorithm(&self) -> CertificateCompressionAlgorithm {
+        CertificateCompressionAlgorithm::ZLIB
+    }
+}
+
+impl CertificateCompressor for ZstdCompressor {
+    fn compress(&self) -> Codec {
+        Codec::Pointer(|input, output| {
+            let mut encoder = ZstdEncoder::new(output, 0)?;
+            encoder.write_all(input)?;
+            encoder.finish()?;
+            Ok(())
+        })
+    }
+
+    fn decompress(&self) -> Codec {
+        Codec::Pointer(|input, output| {
+            let mut reader = ZstdDecoder::new(input)?;
+            io::copy(&mut reader, output)?;
+            Ok(())
+        })
+    }
+
+    fn algorithm(&self) -> CertificateCompressionAlgorithm {
+        CertificateCompressionAlgorithm::ZSTD
+    }
+}
 
 macro_rules! join {
     ($sep:expr, $first:expr $(, $rest:expr)*) => {
@@ -69,10 +161,10 @@ fn tls_options_template() -> TlsOptions {
             "ecdsa_secp521r1_sha512",
             "ecdsa_sha1"
         ))
-        .certificate_compression_algorithms(&[
-            CertificateCompressionAlgorithm::ZLIB,
-            CertificateCompressionAlgorithm::BROTLI,
-            CertificateCompressionAlgorithm::ZSTD,
+        .certificate_compressors(vec![
+            &ZlibCompressor as _,
+            &BrotliCompressor { q: 11, lgwin: 32 } as _,
+            &ZstdCompressor as _,
         ])
         .alpn_protocols([AlpnProtocol::HTTP2, AlpnProtocol::HTTP1])
         .record_size_limit(0x4001)
@@ -82,7 +174,11 @@ fn tls_options_template() -> TlsOptions {
         .enable_signed_cert_timestamps(true)
         .min_tls_version(TlsVersion::TLS_1_2)
         .max_tls_version(TlsVersion::TLS_1_3)
-        .key_shares_limit(3)
+        .key_shares(vec![
+            KeyShare::X25519_MLKEM768,
+            KeyShare::X25519,
+            KeyShare::P256,
+        ])
         .preserve_tls13_cipher_list(true)
         .aes_hw_override(true)
         .random_aes_hw_override(true)
@@ -96,6 +192,7 @@ fn tls_options_template() -> TlsOptions {
             ExtensionType::APPLICATION_LAYER_PROTOCOL_NEGOTIATION,
             ExtensionType::STATUS_REQUEST,
             ExtensionType::DELEGATED_CREDENTIAL,
+            ExtensionType::CERTIFICATE_TIMESTAMP,
             ExtensionType::KEY_SHARE,
             ExtensionType::SUPPORTED_VERSIONS,
             ExtensionType::SIGNATURE_ALGORITHMS,
@@ -103,10 +200,19 @@ fn tls_options_template() -> TlsOptions {
             ExtensionType::RECORD_SIZE_LIMIT,
             ExtensionType::CERT_COMPRESSION,
             ExtensionType::ENCRYPTED_CLIENT_HELLO,
+            ExtensionType::PADDING,
         ])
         .build()
 }
 
+fn http1_options_template() -> Http1Options {
+    // HTTP/1 options config
+    Http1Options::builder()
+        .allow_obsolete_multiline_headers_in_responses(true)
+        .max_headers(100)
+        .build()
+}
+
 fn http2_options_template() -> Http2Options {
     // HTTP/2 headers frame pseudo-header order
     let headers_pseudo_order = PseudoOrder::builder()
@@ -145,18 +251,12 @@ fn http2_options_template() -> Http2Options {
 }
 
 fn emulation_template() -> Emulation {
-    //  HTTP/1 options config
-    let http1 = Http1Options::builder()
-        .allow_obsolete_multiline_headers_in_responses(true)
-        .max_headers(100)
-        .build();
-
-    // This provider encapsulates TLS, HTTP/1, HTTP/2, default headers, and original headers
+    // This provider encapsulates TLS, HTTP/1, HTTP/2
     Emulation::builder()
         .tls_options(tls_options_template())
-        .http1_options(http1)
+        .http1_options(http1_options_template())
         .http2_options(http2_options_template())
-        .build()
+        .build(Default::default())
 }
 
 #[tokio::test]
@@ -164,7 +264,7 @@ async fn test_emulation() -> wreq::Result<()> {
     let client = Client::builder()
         .emulation(emulation_template())
         .connect_timeout(Duration::from_secs(10))
-        .cert_verification(false)
+        .tls_cert_verification(false)
         .build()?;
 
     let text = client
@@ -190,7 +290,7 @@ async fn test_emulation() -> wreq::Result<()> {
 async fn test_request_with_emulation() -> wreq::Result<()> {
     let client = Client::builder()
         .connect_timeout(Duration::from_secs(10))
-        .cert_verification(false)
+        .tls_cert_verification(false)
         .build()?;
 
     let text = client
@@ -217,12 +317,16 @@ async fn test_request_with_emulation() -> wreq::Result<()> {
 async fn test_request_with_emulation_tls() -> wreq::Result<()> {
     let client = Client::builder()
         .connect_timeout(Duration::from_secs(10))
-        .cert_verification(false)
+        .tls_cert_verification(false)
         .build()?;
 
+    let emulation = Emulation::builder()
+        .tls_options(tls_options_template())
+        .build(Default::default());
+
     let text = client
         .get("https://tls.browserleaks.com/")
-        .emulation(tls_options_template())
+        .emulation(emulation)
         .send()
         .await?
         .text()
@@ -240,12 +344,16 @@ async fn test_request_with_emulation_tls() -> wreq::Result<()> {
 async fn test_request_with_emulation_http2() -> wreq::Result<()> {
     let client = Client::builder()
         .connect_timeout(Duration::from_secs(10))
-        .cert_verification(false)
+        .tls_cert_verification(false)
         .build()?;
 
+    let emulation = Emulation::builder()
+        .http2_options(http2_options_template())
+        .build(Default::default());
+
     let text = client
         .get("https://tls.browserleaks.com/")
-        .emulation(http2_options_template())
+        .emulation(emulation)
         .send()
         .await?
         .text()

data/vendor/wreq/tests/multipart.rs

@@ -51,6 +51,48 @@ async fn text_part() {
     assert_eq!(res.status(), wreq::StatusCode::OK);
 }
 
+#[tokio::test]
+async fn text_part_with_custom_boundary() {
+    let _ = env_logger::try_init();
+
+    let form =
+        wreq::multipart::Form::with_boundary("----WebKitFormBoundary0123456789").text("foo", "bar");
+
+    let expected_body = "\
+         ------WebKitFormBoundary0123456789\r\n\
+         Content-Disposition: form-data; name=\"foo\"\r\n\r\n\
+         bar\r\n\
+         ------WebKitFormBoundary0123456789--\r\n\
+         ";
+
+    let ct = "multipart/form-data; boundary=----WebKitFormBoundary0123456789";
+
+    let server = server::http(move |mut req| async move {
+        assert_eq!(req.method(), "POST");
+        assert_eq!(req.headers()["content-type"], ct);
+        assert_eq!(
+            req.headers()["content-length"],
+            expected_body.len().to_string()
+        );
+
+        let mut full: Vec<u8> = Vec::new();
+        while let Some(item) = req.body_mut().frame().await {
+            full.extend(&*item.unwrap().into_data().unwrap());
+        }
+
+        assert_eq!(full, expected_body.as_bytes());
+
+        http::Response::default()
+    });
+
+    let url = format!("http://{}/multipart/1", server.addr());
+
+    let res = wreq::post(&url).multipart(form).send().await.unwrap();
+
+    assert_eq!(res.uri(), url.as_str());
+    assert_eq!(res.status(), wreq::StatusCode::OK);
+}
+
 #[cfg(feature = "stream")]
 #[tokio::test]
 async fn stream_part() {
@@ -111,7 +153,7 @@ async fn stream_part() {
     assert_eq!(res.status(), wreq::StatusCode::OK);
 }
 
-#[cfg(feature = "stream")]
+#[cfg(all(feature = "tokio-rt", feature = "stream"))]
 #[tokio::test]
 async fn async_impl_file_part() {
     let _ = env_logger::try_init();

data/vendor/wreq/tests/proxy.rs

@@ -404,7 +404,7 @@ async fn tunnel_includes_user_agent() {
 #[tokio::test]
 async fn proxy_tunnel_connect_error() {
     let client = Client::builder()
-        .cert_verification(false)
+        .tls_cert_verification(false)
         .no_proxy()
         .build()
         .unwrap();

data/vendor/wreq/tests/support/layer.rs

@@ -44,6 +44,7 @@ pub struct Delay<S> {
     inner: S,
     delay: Duration,
 }
+
 impl<S> Delay<S> {
     pub fn new(inner: S, delay: Duration) -> Self {
         Delay { inner, delay }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wreq-rb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Yicheng Zhou
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-17 00:00:00.000000000 Z
+date: 2026-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -37,6 +37,7 @@ extra_rdoc_files: []
 files:
 - Cargo.lock
 - Cargo.toml
+- LICENSE
 - README.md
 - exe/wreq
 - ext/wreq_rb/Cargo.toml
@@ -48,86 +49,44 @@ files:
 - lib/wreq-rb.rb
 - lib/wreq-rb/version.rb
 - patches/0001-add-transfer-size-tracking.patch
-- patches/0002-add-cancel-connections.patch
 - vendor/wreq/Cargo.toml
 - vendor/wreq/LICENSE
 - vendor/wreq/README.md
+- vendor/wreq/bench/http1.rs
+- vendor/wreq/bench/http1_over_tls.rs
+- vendor/wreq/bench/http2.rs
+- vendor/wreq/bench/http2_over_tls.rs
+- vendor/wreq/bench/support.rs
+- vendor/wreq/bench/support/bench.rs
+- vendor/wreq/bench/support/client.rs
+- vendor/wreq/bench/support/server.rs
 - vendor/wreq/examples/cert_store.rs
 - vendor/wreq/examples/connect_via_lower_priority_tokio_runtime.rs
-- vendor/wreq/examples/emulation.rs
+- vendor/wreq/examples/emulate.rs
 - vendor/wreq/examples/form.rs
 - vendor/wreq/examples/http1_websocket.rs
 - vendor/wreq/examples/http2_websocket.rs
 - vendor/wreq/examples/json_dynamic.rs
 - vendor/wreq/examples/json_typed.rs
 - vendor/wreq/examples/keylog.rs
-- vendor/wreq/examples/request_with_emulation.rs
+- vendor/wreq/examples/request_with_emulate.rs
 - vendor/wreq/examples/request_with_interface.rs
 - vendor/wreq/examples/request_with_local_address.rs
 - vendor/wreq/examples/request_with_proxy.rs
 - vendor/wreq/examples/request_with_redirect.rs
 - vendor/wreq/examples/request_with_version.rs
+- vendor/wreq/examples/rt.rs
 - vendor/wreq/examples/tor_socks.rs
 - vendor/wreq/examples/unix_socket.rs
 - vendor/wreq/src/client.rs
 - vendor/wreq/src/client/body.rs
-- vendor/wreq/src/client/conn.rs
-- vendor/wreq/src/client/conn/conn.rs
-- vendor/wreq/src/client/conn/connector.rs
-- vendor/wreq/src/client/conn/http.rs
-- vendor/wreq/src/client/conn/proxy.rs
-- vendor/wreq/src/client/conn/proxy/socks.rs
-- vendor/wreq/src/client/conn/proxy/tunnel.rs
-- vendor/wreq/src/client/conn/tls_info.rs
-- vendor/wreq/src/client/conn/uds.rs
-- vendor/wreq/src/client/conn/verbose.rs
-- vendor/wreq/src/client/core.rs
-- vendor/wreq/src/client/core/body.rs
-- vendor/wreq/src/client/core/body/incoming.rs
-- vendor/wreq/src/client/core/body/length.rs
-- vendor/wreq/src/client/core/common.rs
-- vendor/wreq/src/client/core/common/buf.rs
-- vendor/wreq/src/client/core/common/rewind.rs
-- vendor/wreq/src/client/core/common/watch.rs
-- vendor/wreq/src/client/core/conn.rs
-- vendor/wreq/src/client/core/conn/http1.rs
-- vendor/wreq/src/client/core/conn/http2.rs
-- vendor/wreq/src/client/core/dispatch.rs
-- vendor/wreq/src/client/core/error.rs
-- vendor/wreq/src/client/core/ext.rs
-- vendor/wreq/src/client/core/http1.rs
-- vendor/wreq/src/client/core/http2.rs
-- vendor/wreq/src/client/core/proto.rs
-- vendor/wreq/src/client/core/proto/h1.rs
-- vendor/wreq/src/client/core/proto/h1/conn.rs
-- vendor/wreq/src/client/core/proto/h1/decode.rs
-- vendor/wreq/src/client/core/proto/h1/dispatch.rs
-- vendor/wreq/src/client/core/proto/h1/encode.rs
-- vendor/wreq/src/client/core/proto/h1/io.rs
-- vendor/wreq/src/client/core/proto/h1/role.rs
-- vendor/wreq/src/client/core/proto/h2.rs
-- vendor/wreq/src/client/core/proto/h2/client.rs
-- vendor/wreq/src/client/core/proto/h2/ping.rs
-- vendor/wreq/src/client/core/proto/headers.rs
-- vendor/wreq/src/client/core/rt.rs
-- vendor/wreq/src/client/core/rt/bounds.rs
-- vendor/wreq/src/client/core/rt/timer.rs
-- vendor/wreq/src/client/core/rt/tokio.rs
-- vendor/wreq/src/client/core/upgrade.rs
-- vendor/wreq/src/client/emulation.rs
-- vendor/wreq/src/client/http.rs
-- vendor/wreq/src/client/http/client.rs
-- vendor/wreq/src/client/http/client/error.rs
-- vendor/wreq/src/client/http/client/exec.rs
-- vendor/wreq/src/client/http/client/extra.rs
-- vendor/wreq/src/client/http/client/lazy.rs
-- vendor/wreq/src/client/http/client/pool.rs
-- vendor/wreq/src/client/http/client/util.rs
-- vendor/wreq/src/client/http/future.rs
+- vendor/wreq/src/client/emulate.rs
+- vendor/wreq/src/client/future.rs
 - vendor/wreq/src/client/layer.rs
+- vendor/wreq/src/client/layer/client.rs
+- vendor/wreq/src/client/layer/client/lazy.rs
+- vendor/wreq/src/client/layer/client/pool.rs
 - vendor/wreq/src/client/layer/config.rs
-- vendor/wreq/src/client/layer/config/options.rs
-- vendor/wreq/src/client/layer/cookie.rs
 - vendor/wreq/src/client/layer/decoder.rs
 - vendor/wreq/src/client/layer/redirect.rs
 - vendor/wreq/src/client/layer/redirect/future.rs
@@ -141,18 +100,38 @@ files:
 - vendor/wreq/src/client/multipart.rs
 - vendor/wreq/src/client/request.rs
 - vendor/wreq/src/client/response.rs
+- vendor/wreq/src/client/upgrade.rs
 - vendor/wreq/src/client/ws.rs
 - vendor/wreq/src/client/ws/json.rs
 - vendor/wreq/src/client/ws/message.rs
 - vendor/wreq/src/config.rs
+- vendor/wreq/src/conn.rs
+- vendor/wreq/src/conn/connector.rs
+- vendor/wreq/src/conn/descriptor.rs
+- vendor/wreq/src/conn/http.rs
+- vendor/wreq/src/conn/net.rs
+- vendor/wreq/src/conn/net/io.rs
+- vendor/wreq/src/conn/net/tcp.rs
+- vendor/wreq/src/conn/net/tcp/compio.rs
+- vendor/wreq/src/conn/net/tcp/tokio.rs
+- vendor/wreq/src/conn/net/uds.rs
+- vendor/wreq/src/conn/net/uds/compio.rs
+- vendor/wreq/src/conn/net/uds/tokio.rs
+- vendor/wreq/src/conn/proxy.rs
+- vendor/wreq/src/conn/proxy/socks.rs
+- vendor/wreq/src/conn/proxy/tunnel.rs
+- vendor/wreq/src/conn/tls_info.rs
+- vendor/wreq/src/conn/verbose.rs
 - vendor/wreq/src/cookie.rs
 - vendor/wreq/src/dns.rs
 - vendor/wreq/src/dns/gai.rs
+- vendor/wreq/src/dns/gai/compio.rs
+- vendor/wreq/src/dns/gai/tokio.rs
 - vendor/wreq/src/dns/hickory.rs
 - vendor/wreq/src/dns/resolve.rs
 - vendor/wreq/src/error.rs
 - vendor/wreq/src/ext.rs
-- vendor/wreq/src/hash.rs
+- vendor/wreq/src/group.rs
 - vendor/wreq/src/header.rs
 - vendor/wreq/src/into_uri.rs
 - vendor/wreq/src/lib.rs
@@ -163,21 +142,20 @@ files:
 - vendor/wreq/src/proxy/win.rs
 - vendor/wreq/src/redirect.rs
 - vendor/wreq/src/retry.rs
+- vendor/wreq/src/rt.rs
 - vendor/wreq/src/sync.rs
 - vendor/wreq/src/tls.rs
+- vendor/wreq/src/tls/compress.rs
 - vendor/wreq/src/tls/conn.rs
-- vendor/wreq/src/tls/conn/cache.rs
-- vendor/wreq/src/tls/conn/cert_compression.rs
 - vendor/wreq/src/tls/conn/ext.rs
 - vendor/wreq/src/tls/conn/macros.rs
 - vendor/wreq/src/tls/conn/service.rs
 - vendor/wreq/src/tls/keylog.rs
-- vendor/wreq/src/tls/keylog/handle.rs
-- vendor/wreq/src/tls/options.rs
-- vendor/wreq/src/tls/x509.rs
-- vendor/wreq/src/tls/x509/identity.rs
-- vendor/wreq/src/tls/x509/parser.rs
-- vendor/wreq/src/tls/x509/store.rs
+- vendor/wreq/src/tls/session.rs
+- vendor/wreq/src/tls/trust.rs
+- vendor/wreq/src/tls/trust/identity.rs
+- vendor/wreq/src/tls/trust/parse.rs
+- vendor/wreq/src/tls/trust/store.rs
 - vendor/wreq/src/trace.rs
 - vendor/wreq/src/util.rs
 - vendor/wreq/tests/badssl.rs
@@ -186,7 +164,7 @@ files:
 - vendor/wreq/tests/connector_layers.rs
 - vendor/wreq/tests/cookie.rs
 - vendor/wreq/tests/deflate.rs
-- vendor/wreq/tests/emulation.rs
+- vendor/wreq/tests/emulate.rs
 - vendor/wreq/tests/gzip.rs
 - vendor/wreq/tests/layers.rs
 - vendor/wreq/tests/multipart.rs
@@ -204,7 +182,7 @@ files:
 - vendor/wreq/tests/zstd.rs
 homepage: https://github.com/serpapi/wreq-rb
 licenses:
-- MIT
+- Apache-2.0
 metadata: {}
 post_install_message:
 rdoc_options: []