Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ wreq = { version = "6.0.0-rc.26", features = [
"zstd",
"ws",
] }
wreq-util = { version = "3.0.0-rc.7", features = ["emulation-rand"] }
wreq-util = { version = "3.0.0-rc.9", features = ["emulation-rand"] }
hickory-resolver = "0.25.2"
cookie = "0.18"
mimalloc = { version = "0.1.43", default-features = false, features = [
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ 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` |
| **Safari** | `SafariIos17_2`, `SafariIos17_4_1`, `SafariIos16_5`, `Safari15_3`, `Safari15_5`, `Safari15_6_1`, `Safari16`, `Safari16_5`, `Safari17_0`, `Safari17_2_1`, `Safari17_4_1`, `Safari17_5`, `Safari18`, `SafariIPad18`, `Safari18_2`, `SafariIos18_1_1`, `Safari18_3`, `Safari18_3_1`, `Safari18_5`, `Safari26`, `SafariIos26`, `SafariIPad26` |
| **Firefox** | `Firefox109`, `Firefox117`, `Firefox128`, `Firefox133`, `Firefox135`, `FirefoxPrivate135`, `FirefoxAndroid135`, `Firefox136`, `FirefoxPrivate136`, `Firefox139`, `Firefox142`, `Firefox143` |
| **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` |
| **Safari** | `SafariIos17_2`, `SafariIos17_4_1`, `SafariIos16_5`, `Safari15_3`, `Safari15_5`, `Safari15_6_1`, `Safari16`, `Safari16_5`, `Safari17_0`, `Safari17_2_1`, `Safari17_4_1`, `Safari17_5`, `Safari18`, `SafariIPad18`, `Safari18_2`, `SafariIos18_1_1`, `Safari18_3`, `Safari18_3_1`, `Safari18_5`, `Safari26`, `Safari26_1`, `Safari26_2`, `SafariIos26`, `SafariIos26_2`, `SafariIPad26`, `SafariIPad26_2` |
| **Firefox** | `Firefox109`, `Firefox117`, `Firefox128`, `Firefox133`, `Firefox135`, `FirefoxPrivate135`, `FirefoxAndroid135`, `Firefox136`, `FirefoxPrivate136`, `Firefox139`, `Firefox142`, `Firefox143`, `Firefox144`, `Firefox145`, `Firefox146` |
| **OkHttp** | `OkHttp3_9`, `OkHttp3_11`, `OkHttp3_13`, `OkHttp3_14`, `OkHttp4_9`, `OkHttp4_10`, `OkHttp4_12`, `OkHttp5` |
| **Edge** | `Edge101`, `Edge122`, `Edge127`, `Edge131`, `Edge134` |
| **Opera** | `Opera116`, `Opera117`, `Opera118`, `Opera119` |
| **Edge** | `Edge101`, `Edge122`, `Edge127`, `Edge131`, `Edge134`, `Edge135`, `Edge136`, `Edge137`, `Edge138`, `Edge139`, `Edge140`, `Edge141`, `Edge142`|
| **Opera** | `Opera116`, `Opera117`, `Opera118`, `Opera119` |

</details>

Expand Down
16 changes: 16 additions & 0 deletions python/rnet/emulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,22 @@ class Emulation(Enum):
Chrome140 = auto()
Chrome141 = auto()
Chrome142 = auto()
Chrome143 = auto()

# Microsoft Edge versions
Edge101 = auto()
Edge122 = auto()
Edge127 = auto()
Edge131 = auto()
Edge134 = auto()
Edge135 = auto()
Edge136 = auto()
Edge137 = auto()
Edge138 = auto()
Edge139 = auto()
Edge140 = auto()
Edge141 = auto()
Edge142 = auto()

# Firefox versions
Firefox109 = auto()
Expand All @@ -76,6 +85,9 @@ class Emulation(Enum):
Firefox139 = auto()
Firefox142 = auto()
Firefox143 = auto()
Firefox144 = auto()
Firefox145 = auto()
Firefox146 = auto()

# Safari versions
SafariIos17_2 = auto()
Expand All @@ -98,8 +110,12 @@ class Emulation(Enum):
SafariIos18_1_1 = auto()
Safari18_5 = auto()
Safari26 = auto()
Safari26_1 = auto()
Safari26_2 = auto()
SafariIos26 = auto()
SafariIos26_2 = auto()
SafariIPad26 = auto()
SafariIpad26_2 = auto()

# OkHttp versions
OkHttp3_9 = auto()
Expand Down
8 changes: 7 additions & 1 deletion src/buffer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use std::os::raw::c_int;

use bytes::Bytes;
use pyo3::{ffi, prelude::*};
use wreq::header::{HeaderName, HeaderValue};
use wreq::header::{HeaderName, HeaderValue, OrigHeaderName};

/// [`PyBuffer`] enables zero-copy conversion of Rust [`Bytes`] to Python bytes.
pub struct PyBuffer(BufferView);
Expand Down Expand Up @@ -72,6 +72,12 @@ impl From<HeaderName> for PyBuffer {
}
}

impl From<OrigHeaderName> for PyBuffer {
fn from(value: OrigHeaderName) -> Self {
Self::from(Bytes::from_owner(value))
}
}

impl From<HeaderValue> for PyBuffer {
#[inline]
fn from(value: HeaderValue) -> Self {
Expand Down
16 changes: 16 additions & 0 deletions src/emulation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,20 @@ define_enum!(
Chrome140,
Chrome141,
Chrome142,
Chrome143,
Edge101,
Edge122,
Edge127,
Edge131,
Edge134,
Edge135,
Edge136,
Edge137,
Edge138,
Edge139,
Edge140,
Edge141,
Edge142,
Firefox109,
Firefox117,
Firefox128,
Expand All @@ -56,6 +65,9 @@ define_enum!(
Firefox139,
Firefox142,
Firefox143,
Firefox144,
Firefox145,
Firefox146,
SafariIos17_2,
SafariIos17_4_1,
SafariIos16_5,
Expand All @@ -76,8 +88,12 @@ define_enum!(
SafariIos18_1_1,
Safari18_5,
Safari26,
Safari26_1,
Safari26_2,
SafariIos26,
SafariIos26_2,
SafariIPad26,
SafariIpad26_2,
OkHttp3_9,
OkHttp3_11,
OkHttp3_13,
Expand Down
5 changes: 1 addition & 4 deletions src/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,7 @@ impl OrigHeaderMap {
.iter()
.map(|(name, orig_name)| {
let name = PyBuffer::from(name.clone());
let orig_name = match orig_name.clone() {
header::OrigHeaderName::Cased(bytes) => PyBuffer::from(bytes),
header::OrigHeaderName::Standard(name) => PyBuffer::from(name),
};
let orig_name = PyBuffer::from(orig_name.clone());
(name, orig_name)
})
.collect()
Expand Down
Loading