wreq 1.2.3 → 1.2.5

data/src/emulate.rs

@@ -50,6 +50,7 @@ define_ruby_enum!(
     Chrome147,
     Chrome148,
     Chrome149,
+    Chrome150,
 
     Edge101,
     Edge122,
@@ -222,152 +223,12 @@ pub fn include(ruby: &Ruby, gem_module: &RModule) -> Result<(), Error> {
     // Profile enum binding
     let profile = gem_module.define_class("Profile", ruby.class_object())?;
     profile.define_method("to_s", method!(Profile::to_s, 0))?;
-    profile.const_set("Chrome100", Profile::Chrome100)?;
-    profile.const_set("Chrome101", Profile::Chrome101)?;
-    profile.const_set("Chrome104", Profile::Chrome104)?;
-    profile.const_set("Chrome105", Profile::Chrome105)?;
-    profile.const_set("Chrome106", Profile::Chrome106)?;
-    profile.const_set("Chrome107", Profile::Chrome107)?;
-    profile.const_set("Chrome108", Profile::Chrome108)?;
-    profile.const_set("Chrome109", Profile::Chrome109)?;
-    profile.const_set("Chrome110", Profile::Chrome110)?;
-    profile.const_set("Chrome114", Profile::Chrome114)?;
-    profile.const_set("Chrome116", Profile::Chrome116)?;
-    profile.const_set("Chrome117", Profile::Chrome117)?;
-    profile.const_set("Chrome118", Profile::Chrome118)?;
-    profile.const_set("Chrome119", Profile::Chrome119)?;
-    profile.const_set("Chrome120", Profile::Chrome120)?;
-    profile.const_set("Chrome123", Profile::Chrome123)?;
-    profile.const_set("Chrome124", Profile::Chrome124)?;
-    profile.const_set("Chrome126", Profile::Chrome126)?;
-    profile.const_set("Chrome127", Profile::Chrome127)?;
-    profile.const_set("Chrome128", Profile::Chrome128)?;
-    profile.const_set("Chrome129", Profile::Chrome129)?;
-    profile.const_set("Chrome130", Profile::Chrome130)?;
-    profile.const_set("Chrome131", Profile::Chrome131)?;
-    profile.const_set("Chrome132", Profile::Chrome132)?;
-    profile.const_set("Chrome133", Profile::Chrome133)?;
-    profile.const_set("Chrome134", Profile::Chrome134)?;
-    profile.const_set("Chrome135", Profile::Chrome135)?;
-    profile.const_set("Chrome136", Profile::Chrome136)?;
-    profile.const_set("Chrome137", Profile::Chrome137)?;
-    profile.const_set("Chrome138", Profile::Chrome138)?;
-    profile.const_set("Chrome139", Profile::Chrome139)?;
-    profile.const_set("Chrome140", Profile::Chrome140)?;
-    profile.const_set("Chrome141", Profile::Chrome141)?;
-    profile.const_set("Chrome142", Profile::Chrome142)?;
-    profile.const_set("Chrome143", Profile::Chrome143)?;
-    profile.const_set("Chrome144", Profile::Chrome144)?;
-    profile.const_set("Chrome145", Profile::Chrome145)?;
-    profile.const_set("Chrome146", Profile::Chrome146)?;
-    profile.const_set("Chrome147", Profile::Chrome147)?;
-    profile.const_set("Chrome148", Profile::Chrome148)?;
-
-    profile.const_set("Edge101", Profile::Edge101)?;
-    profile.const_set("Edge122", Profile::Edge122)?;
-    profile.const_set("Edge127", Profile::Edge127)?;
-    profile.const_set("Edge131", Profile::Edge131)?;
-    profile.const_set("Edge134", Profile::Edge134)?;
-    profile.const_set("Edge135", Profile::Edge135)?;
-    profile.const_set("Edge136", Profile::Edge136)?;
-    profile.const_set("Edge137", Profile::Edge137)?;
-    profile.const_set("Edge138", Profile::Edge138)?;
-    profile.const_set("Edge139", Profile::Edge139)?;
-    profile.const_set("Edge140", Profile::Edge140)?;
-    profile.const_set("Edge141", Profile::Edge141)?;
-    profile.const_set("Edge142", Profile::Edge142)?;
-    profile.const_set("Edge143", Profile::Edge143)?;
-    profile.const_set("Edge144", Profile::Edge144)?;
-    profile.const_set("Edge145", Profile::Edge145)?;
-    profile.const_set("Edge146", Profile::Edge146)?;
-    profile.const_set("Edge147", Profile::Edge147)?;
-    profile.const_set("Edge148", Profile::Edge148)?;
-
-    profile.const_set("Firefox109", Profile::Firefox109)?;
-    profile.const_set("Firefox117", Profile::Firefox117)?;
-    profile.const_set("Firefox128", Profile::Firefox128)?;
-    profile.const_set("Firefox133", Profile::Firefox133)?;
-    profile.const_set("Firefox135", Profile::Firefox135)?;
-    profile.const_set("FirefoxPrivate135", Profile::FirefoxPrivate135)?;
-    profile.const_set("FirefoxAndroid135", Profile::FirefoxAndroid135)?;
-    profile.const_set("Firefox136", Profile::Firefox136)?;
-    profile.const_set("FirefoxPrivate136", Profile::FirefoxPrivate136)?;
-    profile.const_set("Firefox139", Profile::Firefox139)?;
-    profile.const_set("Firefox142", Profile::Firefox142)?;
-    profile.const_set("Firefox143", Profile::Firefox143)?;
-    profile.const_set("Firefox144", Profile::Firefox144)?;
-    profile.const_set("Firefox145", Profile::Firefox145)?;
-    profile.const_set("Firefox146", Profile::Firefox146)?;
-    profile.const_set("Firefox147", Profile::Firefox147)?;
-    profile.const_set("Firefox148", Profile::Firefox148)?;
-    profile.const_set("Firefox149", Profile::Firefox149)?;
-    profile.const_set("Firefox150", Profile::Firefox150)?;
-    profile.const_set("Firefox151", Profile::Firefox151)?;
-
-    profile.const_set("SafariIos17_2", Profile::SafariIos17_2)?;
-    profile.const_set("SafariIos17_4_1", Profile::SafariIos17_4_1)?;
-    profile.const_set("SafariIos16_5", Profile::SafariIos16_5)?;
-    profile.const_set("Safari15_3", Profile::Safari15_3)?;
-    profile.const_set("Safari15_5", Profile::Safari15_5)?;
-    profile.const_set("Safari15_6_1", Profile::Safari15_6_1)?;
-    profile.const_set("Safari16", Profile::Safari16)?;
-    profile.const_set("Safari16_5", Profile::Safari16_5)?;
-    profile.const_set("Safari17_0", Profile::Safari17_0)?;
-    profile.const_set("Safari17_2_1", Profile::Safari17_2_1)?;
-    profile.const_set("Safari17_4_1", Profile::Safari17_4_1)?;
-    profile.const_set("Safari17_5", Profile::Safari17_5)?;
-    profile.const_set("Safari17_6", Profile::Safari17_6)?;
-    profile.const_set("Safari18", Profile::Safari18)?;
-    profile.const_set("SafariIPad18", Profile::SafariIPad18)?;
-    profile.const_set("Safari18_2", Profile::Safari18_2)?;
-    profile.const_set("Safari18_3", Profile::Safari18_3)?;
-    profile.const_set("Safari18_3_1", Profile::Safari18_3_1)?;
-    profile.const_set("SafariIos18_1_1", Profile::SafariIos18_1_1)?;
-    profile.const_set("Safari18_5", Profile::Safari18_5)?;
-    profile.const_set("Safari26", Profile::Safari26)?;
-    profile.const_set("Safari26_1", Profile::Safari26_1)?;
-    profile.const_set("Safari26_2", Profile::Safari26_2)?;
-    profile.const_set("Safari26_3", Profile::Safari26_3)?;
-    profile.const_set("Safari26_4", Profile::Safari26_4)?;
-    profile.const_set("SafariIos26", Profile::SafariIos26)?;
-    profile.const_set("SafariIos26_2", Profile::SafariIos26_2)?;
-    profile.const_set("SafariIPad26", Profile::SafariIPad26)?;
-    profile.const_set("SafariIpad26_2", Profile::SafariIpad26_2)?;
-
-    profile.const_set("OkHttp3_9", Profile::OkHttp3_9)?;
-    profile.const_set("OkHttp3_11", Profile::OkHttp3_11)?;
-    profile.const_set("OkHttp3_13", Profile::OkHttp3_13)?;
-    profile.const_set("OkHttp3_14", Profile::OkHttp3_14)?;
-    profile.const_set("OkHttp4_9", Profile::OkHttp4_9)?;
-    profile.const_set("OkHttp4_10", Profile::OkHttp4_10)?;
-    profile.const_set("OkHttp4_12", Profile::OkHttp4_12)?;
-    profile.const_set("OkHttp5", Profile::OkHttp5)?;
-
-    profile.const_set("Opera116", Profile::Opera116)?;
-    profile.const_set("Opera117", Profile::Opera117)?;
-    profile.const_set("Opera118", Profile::Opera118)?;
-    profile.const_set("Opera119", Profile::Opera119)?;
-    profile.const_set("Opera120", Profile::Opera120)?;
-    profile.const_set("Opera121", Profile::Opera121)?;
-    profile.const_set("Opera122", Profile::Opera122)?;
-    profile.const_set("Opera123", Profile::Opera123)?;
-    profile.const_set("Opera124", Profile::Opera124)?;
-    profile.const_set("Opera125", Profile::Opera125)?;
-    profile.const_set("Opera126", Profile::Opera126)?;
-    profile.const_set("Opera127", Profile::Opera127)?;
-    profile.const_set("Opera128", Profile::Opera128)?;
-    profile.const_set("Opera129", Profile::Opera129)?;
-    profile.const_set("Opera130", Profile::Opera130)?;
-    profile.const_set("Opera131", Profile::Opera131)?;
+    Profile::define_constants(profile)?;
 
     // Platform enum binding
     let platform = gem_module.define_class("Platform", ruby.class_object())?;
     platform.define_method("to_s", method!(Platform::to_s, 0))?;
-    platform.const_set("Windows", Platform::Windows)?;
-    platform.const_set("MacOS", Platform::MacOS)?;
-    platform.const_set("Linux", Platform::Linux)?;
-    platform.const_set("Android", Platform::Android)?;
-    platform.const_set("IOS", Platform::IOS)?;
+    Platform::define_constants(platform)?;
 
     // Emulation class binding
     let emulation = gem_module.define_class("Emulation", ruby.class_object())?;

data/src/error.rs

@@ -72,17 +72,14 @@ define_exception!(DECODING_ERROR, "DecodingError", exception_runtime_error);
 // Configuration and builder errors
 define_exception!(BUILDER_ERROR, "BuilderError", exception_runtime_error);
 
-// Thread interruption error
-define_exception!(INTERRUPT_ERROR, "InterruptError", exception_interrupt);
-
 /// Memory error constant
 pub fn memory_error() -> MagnusError {
     MagnusError::new(ruby!().get_inner(&MEMORY), RACE_CONDITION_ERROR_MSG)
 }
 
-/// Thread interruption error (raised when Thread.kill cancels a request)
+/// Create a Ruby thread interruption error.
 pub fn interrupt_error() -> MagnusError {
-    MagnusError::new(ruby!().get_inner(&INTERRUPT_ERROR), "request interrupted")
+    MagnusError::new(ruby!().exception_interrupt(), "request interrupted")
 }
 
 /// LocalJumpError for methods that require a Ruby block.
@@ -159,5 +156,4 @@ pub fn include(ruby: &Ruby) {
     Lazy::force(&BODY_ERROR, ruby);
     Lazy::force(&DECODING_ERROR, ruby);
     Lazy::force(&BUILDER_ERROR, ruby);
-    Lazy::force(&INTERRUPT_ERROR, ruby);
 }

data/src/header/helper.rs

@@ -0,0 +1,112 @@
+//! Ruby value conversion helpers for `Wreq::Headers`.
+
+use bytes::Bytes;
+use http::{HeaderName, HeaderValue};
+use magnus::{Error, RArray, RString, Symbol, TryConvert, Value, prelude::*, typed_data::Obj};
+
+use crate::error::{
+    header_name_error_to_magnus, header_value_error_to_magnus, type_value_error_to_magnus,
+};
+
+use super::Headers;
+
+/// Maximum number of field-value occurrences supported by `HeaderMap`.
+const MAX_HEADER_ENTRIES: usize = 1 << 15;
+
+/// Build a header collection from a Ruby source object.
+///
+/// Accepts another `Wreq::Headers`, a Hash, or any object whose `to_a` result
+/// contains two-element name-value pairs. Array values are delegated to
+/// [`Headers::append`] so each value remains a separate occurrence.
+pub(super) fn from_source(source: Value) -> Result<Headers, Error> {
+    if let Ok(headers) = Obj::<Headers>::try_convert(source) {
+        return Ok((*headers).clone());
+    }
+    if !source.respond_to("to_a", false)? {
+        return Err(type_value_error_to_magnus(
+            "Expected Headers, a Hash, or an enumerable of pairs",
+        ));
+    }
+
+    let pairs: RArray = source.funcall_public("to_a", ())?;
+    let headers = Headers::default();
+    for pair in pairs {
+        let pair = RArray::try_convert(pair)
+            .map_err(|_| type_value_error_to_magnus("Expected each header entry to be a pair"))?;
+        if pair.len() != 2 {
+            return Err(type_value_error_to_magnus(
+                "Expected each header entry to contain a name and value",
+            ));
+        }
+
+        headers.append(pair.entry(0)?, pair.entry(1)?)?;
+    }
+    Ok(headers)
+}
+
+/// Convert a Ruby String or Symbol into a normalized HTTP header name.
+///
+/// Symbol underscores are changed to hyphens before [`HeaderName`] validates
+/// and normalizes the name. Other Ruby types produce `Wreq::BuilderError`.
+pub(super) fn parse_header_name(value: Value) -> Result<HeaderName, Error> {
+    let name = match (RString::from_value(value), Symbol::from_value(value)) {
+        (Some(name), _) => name.to_bytes(),
+        (None, Some(name)) => Bytes::from(name.name()?.replace('_', "-")),
+        (None, None) => {
+            return Err(type_value_error_to_magnus(
+                "Expected a String or Symbol header name",
+            ));
+        }
+    };
+    HeaderName::from_bytes(name.as_ref()).map_err(header_name_error_to_magnus)
+}
+
+/// Convert a Ruby String or Array of Strings into validated header values.
+///
+/// Each Array element becomes one [`HeaderValue`]. An empty Array therefore
+/// produces no values, allowing `set` to remove a header and `append` to do
+/// nothing.
+pub(super) fn parse_header_values(value: Value) -> Result<Vec<HeaderValue>, Error> {
+    if let Some(values) = RArray::from_value(value) {
+        values.into_iter().map(parse_header_value).collect()
+    } else {
+        Ok(vec![parse_header_value(value)?])
+    }
+}
+
+/// Convert one Ruby String into a validated HTTP header value.
+///
+/// Invalid Ruby types and bytes rejected by [`HeaderValue`] are mapped to
+/// `Wreq::BuilderError`.
+fn parse_header_value(value: Value) -> Result<HeaderValue, Error> {
+    let value = RString::try_convert(value)
+        .map_err(|_| type_value_error_to_magnus("Expected a String header value"))?;
+    HeaderValue::from_maybe_shared(value.to_bytes()).map_err(header_value_error_to_magnus)
+}
+
+/// Validate the resulting number of header occurrences before a mutation.
+///
+/// `current` is the collection length, `replaced` is the number of existing
+/// occurrences removed by `set`, and `added` is the incoming value count.
+/// Checked arithmetic prevents overflow; an invalid calculation or a result
+/// above the native [`HeaderMap`](http::HeaderMap) limit returns
+/// `Wreq::BuilderError` without mutating the collection.
+pub(super) fn ensure_header_count(
+    current: usize,
+    replaced: usize,
+    added: usize,
+) -> Result<(), Error> {
+    let count = current
+        .checked_sub(replaced)
+        .and_then(|count| count.checked_add(added));
+    if count.is_some_and(|count| count <= MAX_HEADER_ENTRIES) {
+        Ok(())
+    } else {
+        Err(header_count_error())
+    }
+}
+
+/// Build the error returned when the native header map reaches its entry limit.
+pub(super) fn header_count_error() -> Error {
+    type_value_error_to_magnus("Header collection exceeds 32,768 entries")
+}