wreq 1.2.15 → 1.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb297a1d40048f6a29833fe7eb1a8248e1460825be97802d82aece4e922b1b6a
-  data.tar.gz: eb8042d063690fa100cc63249f041e17724b5e8113c0611acb8c819d4ecc2afd
+  metadata.gz: e05412727cca397064368fd0c6f79c77efced70c13467850aad2cc4941aeeb9f
+  data.tar.gz: d5c40280a601d1ead2e79f647ce737bb6f442ed750d04eca609803c1d403dce6
 SHA512:
-  metadata.gz: 3e781f223de45ef1ad4b92c17d2af10e2060a2de89e940a69d5a4cab4fd3a8e3ec96c96d1553ab22bc782304596a2bc15403124b324e0dbc4fab41c48256212e
-  data.tar.gz: ca634efa4d997c7f96099929ff3b5163cc2fb236d9ba49f8502a99811dda441636ed05b1d05c89e58e1ee4e8954a97a47420963fe4f568c7cd4682f194c6adf2
+  metadata.gz: fef4a8ba4a3be468852f69a2d54f8ae2a4b33acdba75258836593ce263ff92993070ad1f5c43db07b5f45f5c0b72d7ca801667c2612238f0797d87faa95271b0
+  data.tar.gz: a7681af7b04813bb2826eb04b47b4ebb9af9343897f85b241cc7b61756c180ac2712530180044b1d1558a827b8da1032d9e3a8a64e0a7193f24fc31f96470d41

data/Cargo.lock

@@ -1490,7 +1490,7 @@ dependencies = [
 
 [[package]]
 name = "wreq-ruby"
-version = "1.2.15"
+version = "1.2.16"
 dependencies = [
  "arc-swap",
  "bytes",

data/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["SearchApi <support@searchapi.io>"]
 homepage = "https://github.com/SearchApi/wreq-ruby"
 repository = "https://github.com/SearchApi/wreq-ruby"
 edition = "2024"
-version = "1.2.15"
+version = "1.2.16"
 rust-version = "1.98"
 
 [lib]

data/README.md

@@ -91,7 +91,7 @@ Most browser device models share identical TLS and HTTP/2 configurations, differ
 
   | **Browser** | **Versions** |
   | ----------- | ------------ |
-  | **Chrome**  | `Chrome100`, `Chrome101`, `Chrome104`, `Chrome105`, `Chrome106`, `Chrome107`, `Chrome108`, `Chrome109`, `Chrome110`, `Chrome114`, `Chrome116`, `Chrome117`, `Chrome118`, `Chrome119`, `Chrome120`, `Chrome123`, `Chrome124`, `Chrome126`, `Chrome127`, `Chrome128`, `Chrome129`, `Chrome130`, `Chrome131`, `Chrome132`, `Chrome133`, `Chrome134`, `Chrome135`, `Chrome136`, `Chrome137`, `Chrome138`, `Chrome139`, `Chrome140`, `Chrome141`, `Chrome142`, `Chrome143`, `Chrome144`, `Chrome145`, `Chrome146`, `Chrome147`, `Chrome148`, `Chrome149`, `Chrome150`, `Chrome151`, `Chrome152`, `Chrome153` |
+  | **Chrome**  | `Chrome100`, `Chrome101`, `Chrome104`, `Chrome105`, `Chrome106`, `Chrome107`, `Chrome108`, `Chrome109`, `Chrome110`, `Chrome114`, `Chrome116`, `Chrome117`, `Chrome118`, `Chrome119`, `Chrome120`, `Chrome123`, `Chrome124`, `Chrome126`, `Chrome127`, `Chrome128`, `Chrome129`, `Chrome130`, `Chrome131`, `Chrome132`, `Chrome133`, `Chrome134`, `Chrome135`, `Chrome136`, `Chrome137`, `Chrome138`, `Chrome139`, `Chrome140`, `Chrome141`, `Chrome142`, `Chrome143`, `Chrome144`, `Chrome145`, `Chrome146`, `Chrome147`, `Chrome148`, `Chrome149`, `Chrome150`, `Chrome151`, `Chrome152`, `Chrome153`, `Chrome154` |
   | **Edge**    | `Edge101`, `Edge122`, `Edge127`, `Edge131`, `Edge134`, `Edge135`, `Edge136`, `Edge137`, `Edge138`, `Edge139`, `Edge140`, `Edge141`, `Edge142`, `Edge143`, `Edge144`, `Edge145`, `Edge146`, `Edge147`, `Edge148` |
   | **Firefox** | `Firefox109`, `Firefox117`, `Firefox128`, `Firefox133`, `Firefox135`, `FirefoxPrivate135`, `FirefoxAndroid135`, `Firefox136`, `FirefoxPrivate136`, `Firefox139`, `Firefox142`, `Firefox143`, `Firefox144`, `Firefox145`, `Firefox146`, `Firefox147`, `Firefox148`, `Firefox149`, `Firefox150`, `Firefox151`, `Firefox152` |
   | **Safari**  | `Safari15_3`, `Safari15_5`, `Safari15_6_1`, `Safari16`, `Safari16_5`, `Safari17_0`, `Safari17_2_1`, `Safari17_4_1`, `Safari17_5`, `Safari17_6`, `Safari18`, `Safari18_2`, `Safari18_3`, `Safari18_3_1`, `Safari18_5`, `Safari26`, `Safari26_1`, `Safari26_2`, `SafariIos16_5`, `SafariIos17_2`, `SafariIos17_4_1`, `SafariIos18_1_1`, `SafariIos26`, `SafariIos26_2`, `SafariIPad18`, `SafariIPad26`, `SafariIpad26_2` |

data/crates/wreq-util/CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - *(emulate)* Add Chrome 151 profile.
 - *(emulate)* Add Chrome 152 profile.
 - *(emulate)* Add Chrome 153 profile.
+- *(emulate)* Add Chrome 154 profile.
 - *(emulate)* Add Firefox 152 profile.
 
 ### Fixed

data/crates/wreq-util/src/emulate/macros.rs

@@ -151,32 +151,27 @@ macro_rules! header_firefox_sec_fetch {
 
 macro_rules! header_firefox_accept {
     ($headers:expr) => {
-        $headers.insert(
-            ACCEPT,
-            HeaderValue::from_static(
-                "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-            ),
-        );
-        $headers.insert(ACCEPT_LANGUAGE, HeaderValue::from_static("en-US,en;q=0.5"));
-        #[cfg(feature = "emulation-compression")]
-        $headers.insert(
-            ACCEPT_ENCODING,
-            HeaderValue::from_static("gzip, deflate, br"),
-        );
+        header_firefox_accept!(@build $headers, "en-US,en;q=0.5", "gzip, deflate, br");
     };
     (zstd, $headers:expr) => {
+        header_firefox_accept!(@build $headers, "en-US,en;q=0.5", "gzip, deflate, br, zstd");
+    };
+    // Firefox 147 changed the generated q-value from dividing 1.0 across the list to
+    // decrementing by 0.1 per entry, so a two-entry list became q=0.9 (Bugzilla 2000765,
+    // landed in 0e050ae5116d).
+    (zstd_q09, $headers:expr) => {
+        header_firefox_accept!(@build $headers, "en-US,en;q=0.9", "gzip, deflate, br, zstd");
+    };
+    (@build $headers:expr, $accept_language:expr, $accept_encoding:expr) => {
         $headers.insert(
             ACCEPT,
             HeaderValue::from_static(
                 "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
             ),
         );
-        $headers.insert(ACCEPT_LANGUAGE, HeaderValue::from_static("en-US,en;q=0.5"));
+        $headers.insert(ACCEPT_LANGUAGE, HeaderValue::from_static($accept_language));
         #[cfg(feature = "emulation-compression")]
-        $headers.insert(
-            ACCEPT_ENCODING,
-            HeaderValue::from_static("gzip, deflate, br, zstd"),
-        );
+        $headers.insert(ACCEPT_ENCODING, HeaderValue::from_static($accept_encoding));
     };
 }
 

data/crates/wreq-util/src/emulate/profile/chrome.rs

@@ -1929,6 +1929,39 @@ mod_generator!(
     ]
 );
 
+mod_generator!(
+    v154,
+    v152::build_emulation,
+    header_initializer_with_zstd_priority,
+    [
+        (
+            MacOS,
+            r#""Chromium";v="154", "Google Chrome";v="154", "Not A(Brand";v="99""#,
+            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/154.0.0.0 Safari/537.36"
+        ),
+        (
+            Linux,
+            r#""Chromium";v="154", "Google Chrome";v="154", "Not A(Brand";v="99""#,
+            "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/154.0.0.0 Safari/537.36"
+        ),
+        (
+            Android,
+            r#""Chromium";v="154", "Google Chrome";v="154", "Not A(Brand";v="99""#,
+            "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/154.0.0.0 Mobile Safari/537.36"
+        ),
+        (
+            Windows,
+            r#""Chromium";v="154", "Google Chrome";v="154", "Not A(Brand";v="99""#,
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/154.0.0.0 Safari/537.36"
+        ),
+        (
+            IOS,
+            r#""Chromium";v="154", "Google Chrome";v="154", "Not A(Brand";v="99""#,
+            "Mozilla/5.0 (iPhone; CPU iPhone OS 18_7_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/154.0.8037.41 Mobile/15E148 Safari/604.1"
+        )
+    ]
+);
+
 mod_generator!(
     edge143,
     v132::build_emulation,

data/crates/wreq-util/src/emulate/profile/firefox/header.rs

@@ -35,3 +35,25 @@ pub fn header_initializer_with_zstd(ua: &'static str) -> HeaderMap {
     );
     headers
 }
+
+/// Firefox 147 and later. Identical to [`header_initializer_with_zstd`] apart from the
+/// `Accept-Language` q-value, which Firefox changed in 147 (Bugzilla 2000765).
+pub fn header_initializer_with_zstd_q09(ua: &'static str) -> HeaderMap {
+    let mut headers = HeaderMap::new();
+    header_firefox_ua!(headers, ua);
+    header_firefox_accept!(zstd_q09, headers);
+    headers.insert(
+        HeaderName::from_static("upgrade-insecure-requests"),
+        HeaderValue::from_static("1"),
+    );
+    header_firefox_sec_fetch!(headers);
+    headers.insert(
+        HeaderName::from_static("priority"),
+        HeaderValue::from_static("u=0, i"),
+    );
+    headers.insert(
+        HeaderName::from_static("te"),
+        HeaderValue::from_static("trailers"),
+    );
+    headers
+}

data/crates/wreq-util/src/emulate/profile/firefox.rs

@@ -380,7 +380,7 @@ mod_generator!(
 mod_generator!(
     ff147,
     ff135::build_emulation,
-    header_initializer_with_zstd,
+    header_initializer_with_zstd_q09,
     [
         (
             Windows,
@@ -408,7 +408,7 @@ mod_generator!(
 mod_generator!(
     ff148,
     ff135::build_emulation,
-    header_initializer_with_zstd,
+    header_initializer_with_zstd_q09,
     [
         (
             Windows,
@@ -436,7 +436,7 @@ mod_generator!(
 mod_generator!(
     ff149,
     ff135::build_emulation,
-    header_initializer_with_zstd,
+    header_initializer_with_zstd_q09,
     [
         (
             Windows,
@@ -465,7 +465,7 @@ mod_generator!(
     ff150,
     tls_options!(4, CIPHER_LIST_3, CURVES_2, KEY_SHARES_2),
     http2_options!(1),
-    header_initializer_with_zstd,
+    header_initializer_with_zstd_q09,
     [
         (
             Windows,
@@ -493,7 +493,7 @@ mod_generator!(
 mod_generator!(
     ff151,
     ff150::build_emulation,
-    header_initializer_with_zstd,
+    header_initializer_with_zstd_q09,
     [
         (
             Windows,
@@ -521,7 +521,7 @@ mod_generator!(
 mod_generator!(
     ff152,
     ff150::build_emulation,
-    header_initializer_with_zstd,
+    header_initializer_with_zstd_q09,
     [
         (
             Windows,

data/crates/wreq-util/src/emulate.rs

@@ -64,6 +64,7 @@ define_enum!(
     Chrome151 => ("chrome_151", v151::emulation),
     Chrome152 => ("chrome_152", v152::emulation),
     Chrome153 => ("chrome_153", v153::emulation),
+    Chrome154 => ("chrome_154", v154::emulation),
 
     // Edge versions
     Edge101 => ("edge_101", edge101::emulation),

data/crates/wreq-util/tests/emulate_chrome.rs

@@ -295,3 +295,13 @@ test_emulation!(
     ],
     "52d84b11737d980aef856699f885ca86"
 );
+
+test_emulation!(
+    test_chrome154,
+    Emulation::Chrome154,
+    [
+        "t13d1517h2_8daaf6152771_cb7bf5808d99",
+        "t13d1518h2_8daaf6152771_e2d80978ab2e"
+    ],
+    "52d84b11737d980aef856699f885ca86"
+);

data/crates/wreq-util/tests/emulate_firefox.rs

@@ -111,3 +111,61 @@ test_emulation!(
     ["t13d1617h2_86a278354501_3cbfd9057e0d"],
     "6ea73faa8fc5aac76bded7bd238f6433"
 );
+
+/// Firefox 147 changed the generated `Accept-Language` q-value: the list used to divide 1.0
+/// across its entries, giving `q=0.5` for two, and now decrements by 0.1 per entry, giving
+/// `q=0.9`. See Bugzilla 2000765, landed in mozilla-firefox 0e050ae5116d.
+///
+/// Every profile is listed rather than a range, so adding one is a deliberate choice about
+/// which side of 147 it falls on.
+#[test]
+fn firefox_accept_language_matches_the_profile_version() {
+    use wreq::IntoEmulation;
+    use wreq_util::{Platform, Profile};
+
+    const PRE_147: &[(&str, Profile)] = &[
+        ("Firefox109", Emulation::Firefox109),
+        ("Firefox117", Emulation::Firefox117),
+        ("Firefox128", Emulation::Firefox128),
+        ("Firefox133", Emulation::Firefox133),
+        ("Firefox135", Emulation::Firefox135),
+        ("FirefoxPrivate135", Emulation::FirefoxPrivate135),
+        ("FirefoxAndroid135", Emulation::FirefoxAndroid135),
+        ("Firefox136", Emulation::Firefox136),
+        ("FirefoxPrivate136", Emulation::FirefoxPrivate136),
+        ("Firefox139", Emulation::Firefox139),
+        ("Firefox142", Emulation::Firefox142),
+        ("Firefox143", Emulation::Firefox143),
+        ("Firefox144", Emulation::Firefox144),
+        ("Firefox145", Emulation::Firefox145),
+        ("Firefox146", Emulation::Firefox146),
+    ];
+    const POST_147: &[(&str, Profile)] = &[
+        ("Firefox147", Emulation::Firefox147),
+        ("Firefox148", Emulation::Firefox148),
+        ("Firefox149", Emulation::Firefox149),
+        ("Firefox150", Emulation::Firefox150),
+        ("Firefox151", Emulation::Firefox151),
+        ("Firefox152", Emulation::Firefox152),
+    ];
+
+    fn accept_language(profile: Profile) -> String {
+        Emulation::builder()
+            .profile(profile)
+            .platform(Platform::Linux)
+            .build()
+            .into_emulation()
+            .headers
+            .get("accept-language")
+            .and_then(|value| value.to_str().ok())
+            .unwrap_or_default()
+            .to_owned()
+    }
+
+    for (name, profile) in PRE_147 {
+        assert_eq!("en-US,en;q=0.5", accept_language(*profile), "{name}");
+    }
+    for (name, profile) in POST_147 {
+        assert_eq!("en-US,en;q=0.9", accept_language(*profile), "{name}");
+    }
+}

data/lib/wreq_ruby/emulate.rb

@@ -65,6 +65,7 @@ module Wreq
       Chrome151 = nil
       Chrome152 = nil
       Chrome153 = nil
+      Chrome154 = nil
 
       Edge101 = nil
       Edge122 = nil

data/src/emulate.rs

@@ -90,6 +90,7 @@ define_ruby_enum!(
     Chrome151,
     Chrome152,
     Chrome153,
+    Chrome154,
 
     Edge101,
     Edge122,

data/test/emulation_test.rb

@@ -22,6 +22,7 @@ class EmulationTest < Minitest::Test
     {
       Wreq::Profile::Chrome152 => "Chrome152",
       Wreq::Profile::Chrome153 => "Chrome153",
+      Wreq::Profile::Chrome154 => "Chrome154",
       Wreq::Profile::Firefox152 => "Firefox152"
     }.each do |profile, name|
       assert_equal name, profile.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wreq
 version: !ruby/object:Gem::Version
-  version: 1.2.15
+  version: 1.2.16
 platform: ruby
 authors:
 - SearchApi