rnet 3.0.0rc4__tar.gz → 3.0.0rc6__tar.gz

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/Cargo.lock

@@ -54,16 +54,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "async-channel"
-version = "2.5.0"
+name = "arc-swap"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
-dependencies = [
- "concurrent-queue",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
 [[package]]
 name = "async-compression"
@@ -151,9 +145,9 @@ dependencies = [
 
 [[package]]
 name = "boring-sys2"
-version = "5.0.0-alpha.8"
+version = "5.0.0-alpha.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae7fb86695d7ea56c18cfce674713f31a6e9df6b22bc6148729b7acfe0023810"
+checksum = "3f93a47b371ec9ec3761fe887ce0d5a2fcb870adf8b4035f9ec593bcfa38db72"
 dependencies = [
  "autocfg",
  "bindgen",
@@ -164,9 +158,9 @@ dependencies = [
 
 [[package]]
 name = "boring2"
-version = "5.0.0-alpha.8"
+version = "5.0.0-alpha.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "952aafd36067f1d0de0c61e07d641fa0748a9338a5798e6ee15635322f80763f"
+checksum = "793883c88b60d6412e3c49369bee9acb970f79b8553e3e5274efcd0ad560f416"
 dependencies = [
  "bitflags",
  "boring-sys2",
@@ -210,9 +204,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
-version = "1.2.36"
+version = "1.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54"
+checksum = "65193589c6404eb80b450d618eaf9a2cafaaafd57ecce47370519ef674a7bd44"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -275,15 +269,6 @@ version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb"
 
-[[package]]
-name = "concurrent-queue"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "cookie"
 version = "0.18.1"
@@ -421,27 +406,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
-[[package]]
-name = "event-listener"
-version = "5.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
-dependencies = [
- "event-listener",
- "pin-project-lite",
-]
-
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.1"
@@ -649,7 +613,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "wasi 0.14.3+wasi-0.2.4",
+ "wasi 0.14.5+wasi-0.2.4",
 ]
 
 [[package]]
@@ -896,9 +860,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
+checksum = "206a8042aec68fa4a62e8d3f7aa4ceb508177d9324faf261e1959e495b7a1921"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.5",
@@ -1210,12 +1174,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "parking"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
-
 [[package]]
 name = "parking_lot"
 version = "0.12.4"
@@ -1321,20 +1279,6 @@ dependencies = [
  "unindent",
 ]
 
-[[package]]
-name = "pyo3-async-runtimes"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ee6d4cb3e8d5b925f5cdb38da183e0ff18122eb2048d4041c9e7034d026e23"
-dependencies = [
- "async-channel",
- "futures",
- "once_cell",
- "pin-project-lite",
- "pyo3",
- "tokio",
-]
-
 [[package]]
 name = "pyo3-build-config"
 version = "0.26.0"
@@ -1493,10 +1437,12 @@ dependencies = [
 
 [[package]]
 name = "rnet"
-version = "3.0.0-rc4"
+version = "3.0.0-rc6"
 dependencies = [
+ "arc-swap",
  "bytes",
  "cookie",
+ "futures",
  "futures-util",
  "hickory-resolver",
  "http",
@@ -1505,7 +1451,6 @@ dependencies = [
  "mimalloc",
  "pin-project-lite",
  "pyo3",
- "pyo3-async-runtimes",
  "serde",
  "tikv-jemallocator",
  "tokio",
@@ -1746,9 +1691,9 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
 
 [[package]]
 name = "target-lexicon"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
 
 [[package]]
 name = "thiserror"
@@ -1894,9 +1839,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-boring2"
-version = "5.0.0-alpha.8"
+version = "5.0.0-alpha.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "056f13b9bc29333eabe4791e41994c776060228e834a73f8e5c191cfceb94188"
+checksum = "c427c90f7fdd35087e7217428683866140036f66cc6875c66f01b388f73d93b0"
 dependencies = [
  "boring-sys2",
  "boring2",
@@ -2104,9 +2049,9 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 
 [[package]]
 name = "unindent"
@@ -2184,9 +2129,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
-version = "0.14.3+wasi-0.2.4"
+version = "0.14.5+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4494f6290a82f5fe584817a676a34b9d6763e8d9d18204009fb31dceca98fd4"
+dependencies = [
+ "wasip2",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.0+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
+checksum = "03fa2761397e5bd52002cd7e73110c71af2109aca4e521a9f40473fe685b0a24"
 dependencies = [
  "wit-bindgen",
 ]
@@ -2623,15 +2577,15 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen"
-version = "0.45.0"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814"
+checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36"
 
 [[package]]
 name = "wreq"
-version = "6.0.0-rc.14"
+version = "6.0.0-rc.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6972cef8f4dd65493b83be71541037b69e895c79b6a14585871dd170adf69804"
+checksum = "b593096128459db7947eb5c2ddbe3b9d12342cf8f795043ae015c82c02e2c47a"
 dependencies = [
  "ahash",
  "boring2",
@@ -2717,18 +2671,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rnet"
-version = "3.0.0-rc4"
+version = "3.0.0-rc6"
 description = "A blazing-fast Python HTTP client with TLS fingerprint"
 license = "Apache-2.0"
 repository = "https://github.com/0x676e67/rnet"
@@ -24,25 +24,23 @@ mimalloc = ["dep:mimalloc"]
 abi3 = ["pyo3/abi3-py311"]
 
 [dependencies]
-tokio = "1.47.1"
+tokio = { version = "1.47.1", features = ["sync", "rt", "rt-multi-thread", "time"]}
 pyo3 = { version = "0.26.0", features = [
     "indexmap",
     "extension-module",
     "multiple-pymethods",
     "generate-import-lib",
 ] }
-pyo3-async-runtimes = { version = "0.26.0", features = [
-    "tokio-runtime",
-    "unstable-streams",
-] }
+futures = "0.3"
+futures-util = { version = "0.3.31", default-features = false }
 pin-project-lite = "0.2.16"
 serde = { version = "1.0.219", features = ["derive"] }
 indexmap = { version = "2.10.0", features = ["serde"] }
 bytes = "1.10.1"
-futures-util = { version = "0.3.31", default-features = false }
+arc-swap = "1.7.0"
 http = "1"
 http-body-util = "0.1.3"
-wreq = { version = "6.0.0-rc.14", features = [
+wreq = { version = "6.0.0-rc.15", features = [
     "json",
     "socks",
     "stream",

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rnet
-Version: 3.0.0rc4
+Version: 3.0.0rc6
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -44,13 +44,12 @@ A blazing-fast Python HTTP client with advanced browser fingerprinting that accu
 - Plain bodies, JSON, urlencoded, multipart
 - Cookie Store
 - Redirect Policy
-- Original Header
+- Original Headers
 - Rotating Proxies
+- WebSocket Upgrade
 - Connection Pooling
 - Streaming Transfers
 - Zero-Copy Transfers
-- WebSocket Upgrade
-- Async DNS Resolver
 - HTTPS via BoringSSL
 - Free-Threaded Safety
 - Automatic Decompression
@@ -60,14 +59,14 @@ A blazing-fast Python HTTP client with advanced browser fingerprinting that accu
 The following example uses the `asyncio` runtime with `rnet` installed via pip:
 
 ```bash
-pip install asyncio rnet==3.0.0rc4
+pip install asyncio rnet==3.0.0rc6
 ```
 
 And then the code:
 
 ```python
 import asyncio
-from rnet import Emulation, Client
+from rnet import Client, Emulation
 
 
 async def main():

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/README.md

@@ -16,13 +16,12 @@ A blazing-fast Python HTTP client with advanced browser fingerprinting that accu
 - Plain bodies, JSON, urlencoded, multipart
 - Cookie Store
 - Redirect Policy
-- Original Header
+- Original Headers
 - Rotating Proxies
+- WebSocket Upgrade
 - Connection Pooling
 - Streaming Transfers
 - Zero-Copy Transfers
-- WebSocket Upgrade
-- Async DNS Resolver
 - HTTPS via BoringSSL
 - Free-Threaded Safety
 - Automatic Decompression
@@ -32,14 +31,14 @@ A blazing-fast Python HTTP client with advanced browser fingerprinting that accu
 The following example uses the `asyncio` runtime with `rnet` installed via pip:
 
 ```bash
-pip install asyncio rnet==3.0.0rc4
+pip install asyncio rnet==3.0.0rc6
 ```
 
 And then the code:
 
 ```python
 import asyncio
-from rnet import Emulation, Client
+from rnet import Client, Emulation
 
 
 async def main():

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/python/benchmark/bench.py

@@ -24,43 +24,43 @@ def parse_arguments():
     """Parse command line arguments"""
     parser = argparse.ArgumentParser(
         description="HTTP Client Benchmark Tool",
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
 
     parser.add_argument(
-        "--requests", "-r",
-        type=int,
-        default=400,
-        help="Number of requests per test"
+        "--requests", "-r", type=int, default=400, help="Number of requests per test"
     )
 
     parser.add_argument(
-        "--threads", "-t",
+        "--threads",
+        "-t",
         type=int,
         nargs="+",
         default=[1, 4, 8, 16],
-        help="Thread counts to test (e.g., --threads 1 2 4 8)"
+        help="Thread counts to test (e.g., --threads 1 2 4 8)",
     )
 
     parser.add_argument(
-        "--output", "-o",
+        "--output",
+        "-o",
         type=str,
         default="benchmark_results.csv",
-        help="Output CSV file name"
+        help="Output CSV file name",
     )
 
     parser.add_argument(
-        "--chart", "-c",
+        "--chart",
+        "-c",
         type=str,
         default="benchmark_multi.jpg",
-        help="Output chart file name"
+        help="Output chart file name",
     )
 
     parser.add_argument(
         "--base-url",
         type=str,
         default="http://127.0.0.1:8000",
-        help="Base URL for the benchmark server"
+        help="Base URL for the benchmark server",
     )
 
     return parser.parse_args()

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/python/examples/keylog.py

@@ -1,13 +1,13 @@
 import asyncio
 from rnet import Client
-from rnet.tls import KeyLogPolicy
+from rnet.tls import KeyLog
 from rnet.emulation import Emulation
 
 
 async def main():
     client = Client(
         emulation=Emulation.Firefox139,
-        keylog=KeyLogPolicy.file("keylog.log"),
+        keylog=KeyLog.file("keylog.log"),
     )
 
     resp = await client.get("https://www.google.com")

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/python/rnet/__init__.py

@@ -1,6 +1,7 @@
 # rnet/__init__.py
 
 from .rnet import *
+from .rnet import __all__
 
 from .cookie import *
 from .exceptions import *

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/python/rnet/__init__.pyi

@@ -10,15 +10,16 @@ from typing import (
     Dict,
     List,
     TypedDict,
+    Unpack,
+    NotRequired,
 )
 from pathlib import Path
 from enum import Enum, auto
-from typing import Unpack, NotRequired
 
 from .cookie import Cookie, Jar
 from .header import HeaderMap, OrigHeaderMap
 from .emulation import Emulation, EmulationOption
-from .tls import TlsVersion, Identity, KeyLogPolicy, CertStore
+from .tls import TlsVersion, Identity, KeyLog, CertStore
 
 class Method(Enum):
     r"""
@@ -464,6 +465,16 @@ class Response:
     Get the DER encoded leaf certificate of the response.
     """
 
+    def raise_for_status(self) -> None:
+        r"""
+        Turn a response into an error if the server returned an error.
+        """
+
+    def stream(self) -> Streamer:
+        r"""
+        Get the response into a `Streamer` of `bytes` from the body.
+        """
+
     async def text(self) -> str:
         r"""
         Get the text content of the response.
@@ -484,11 +495,6 @@ class Response:
         Get the bytes content of the response.
         """
 
-    def stream(self) -> Streamer:
-        r"""
-        Get the response into a `Stream` of `Bytes` from the body.
-        """
-
     async def close(self) -> None:
         r"""
         Close the response connection.
@@ -661,7 +667,7 @@ class ClientParams(TypedDict):
     identity: NotRequired[Identity]
     """Represents a private key and X509 cert as a client certificate."""
 
-    keylog: NotRequired[KeyLogPolicy]
+    keylog: NotRequired[KeyLog]
     """Key logging policy (environment or file)."""
 
     tls_info: NotRequired[bool]

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/python/rnet/blocking.py

@@ -1,5 +1,16 @@
 import datetime
-from rnet import ClientParams, History, Message, Request, Streamer, WebSocketRequest
+from rnet import (
+    ClientParams,
+    History,
+    Message,
+    Request,
+    Streamer,
+    WebSocketRequest,
+    Version,
+    Method,
+    SocketAddr,
+    StatusCode,
+)
 from typing import (
     Optional,
     Any,
@@ -7,7 +18,6 @@ from typing import (
     Unpack,
 )
 
-from rnet import Version, Method, SocketAddr, StatusCode
 from rnet.header import HeaderMap
 from rnet.cookie import Cookie
 
@@ -67,6 +77,17 @@ class Response:
     Get the DER encoded leaf certificate of the response.
     """
 
+    def raise_for_status(self) -> None:
+        r"""
+        Turn a response into an error if the server returned an error.
+        """
+
+    def stream(self) -> Streamer:
+        r"""
+        Get the response into a `Streamer` of `bytes` from the body.
+        """
+        ...
+
     def text(self) -> str:
         r"""
         Get the text content of the response.
@@ -90,12 +111,6 @@ class Response:
         """
         ...
 
-    def stream(self) -> Streamer:
-        r"""
-        Get the response into a `Stream` of `Bytes` from the body.
-        """
-        ...
-
     def close(self) -> None:
         r"""
         Close the response connection.

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/python/rnet/exceptions.py

@@ -28,6 +28,12 @@ __all__ = [
 # ========================================
 
 
+class RustPanic(Exception):
+    r"""
+    A panic occurred in the underlying Rust code.
+    """
+
+
 class DNSResolverError(RuntimeError):
     r"""
     An error occurred while resolving a DNS name.

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/python/rnet/tls.py

@@ -10,7 +10,7 @@ from enum import Enum, auto
 from pathlib import Path
 from typing import List
 
-__all__ = ["TlsVersion", "Identity", "CertStore", "KeyLogPolicy"]
+__all__ = ["TlsVersion", "Identity", "CertStore", "KeyLog"]
 
 
 class TlsVersion(Enum):
@@ -111,7 +111,7 @@ class CertStore:
         ...
 
 
-class KeyLogPolicy:
+class KeyLog:
     """
     Specifies the intent for a (TLS) keylogger to be used in a client or server configuration.
 
@@ -121,9 +121,9 @@ class KeyLogPolicy:
     with the correct session keys.
 
     Static Methods:
-        environment() -> KeyLogPolicy
+        environment() -> KeyLog
             Use the SSLKEYLOGFILE environment variable for key logging.
-        file(path: Path) -> KeyLogPolicy
+        file(path: Path) -> KeyLog
             Log keys to the specified file path.
 
     Methods:
@@ -134,14 +134,14 @@ class KeyLogPolicy:
     """
 
     @staticmethod
-    def environment() -> "KeyLogPolicy":
+    def environment() -> "KeyLog":
         """
         Use the SSLKEYLOGFILE environment variable for key logging.
         """
         ...
 
     @staticmethod
-    def file(path: Path) -> "KeyLogPolicy":
+    def file(path: Path) -> "KeyLog":
         """
         Log keys to the specified file path.
 
@@ -149,15 +149,3 @@ class KeyLogPolicy:
             path: The file path to log TLS keys to.
         """
         ...
-
-    def is_environment(self) -> bool:
-        """
-        Returns True if this policy uses the environment variable.
-        """
-        ...
-
-    def is_file(self) -> bool:
-        """
-        Returns True if this policy logs to a specific file.
-        """
-        ...

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/src/buffer.rs

@@ -34,6 +34,7 @@ impl<'a> IntoPyObject<'a> for PyBuffer {
     type Output = Bound<'a, Self::Target>;
     type Error = PyErr;
 
+    #[inline(always)]
     fn into_pyobject(self, py: Python<'a>) -> Result<Self::Output, Self::Error> {
         let buffer = self.0.into_py_any(py)?;
         unsafe { Bound::from_owned_ptr_or_err(py, ffi::PyBytes_FromObject(buffer.as_ptr())) }

{rnet-3.0.0rc4 → rnet-3.0.0rc6}/src/client/body/mod.rs

@@ -18,6 +18,8 @@ use pyo3::{
 };
 use serde::{Deserialize, Serialize};
 
+use crate::rt::Runtime;
+
 /// Represents the body of an HTTP request.
 /// Supports text, bytes, synchronous and asynchronous streaming bodies.
 pub enum Body {
@@ -51,7 +53,7 @@ impl FromPyObject<'_> for Body {
         }
 
         if ob.hasattr("asend")? {
-            pyo3_async_runtimes::tokio::into_stream_v2(ob.to_owned())
+            Runtime::into_stream(ob.to_owned())
                 .map(AsyncStream::new)
                 .map(Self::AsyncStream)
         } else {