diff --git a/.github/workflows/python-test.yaml b/.github/workflows/python-test.yaml index 94dd27ca..ce715581 100644 --- a/.github/workflows/python-test.yaml +++ b/.github/workflows/python-test.yaml @@ -280,7 +280,7 @@ jobs: strategy: matrix: platform: - - runner: macos-13 + - runner: macos-14-large target: x86_64 - runner: macos-14 target: aarch64 diff --git a/Cargo.lock b/Cargo.lock index b01013e6..dd86f03f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,18 +116,15 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.27" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddb939d66e4ae03cee6091612804ba446b12878410cfa17f785f4dd67d4014e8" +checksum = "0e86f6d3dc9dc4352edeea6b8e499e13e3f5dc3b964d7ca5fd411415a3498473" dependencies = [ - "brotli", - "flate2", + "compression-codecs", + "compression-core", "futures-core", - "memchr", "pin-project-lite", "tokio", - "zstd", - "zstd-safe", ] [[package]] @@ -519,6 +516,26 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +[[package]] +name = "compression-codecs" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302266479cb963552d11bd042013a58ef1adc56768016c8b82b4199488f2d4ad" +dependencies = [ + "brotli", + "compression-core", + "flate2", + "memchr", + "zstd", + "zstd-safe", +] + +[[package]] +name = "compression-core" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" + [[package]] name = "concurrent-queue" version = "2.5.0" @@ -628,9 +645,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb230974aaf0aca4d71665bed0aca156cf43b764fcb9583b69c6c3e686f35e72" +checksum = "424e0138278faeb2b401f174ad17e715c829512d74f3d1e81eb43365c2e0590e" dependencies = [ "ctor-proc-macro", "dtor", @@ -690,9 +707,9 @@ dependencies = [ [[package]] name = "document-features" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" +checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61" dependencies = [ "litrs", ] @@ -887,9 +904,9 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "flate2" -version = "1.1.2" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", "miniz_oxide", @@ -1353,7 +1370,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.0", + "socket2", "system-configuration", "tokio", "tower-service", @@ -1688,9 +1705,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "litrs" -version = "0.4.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" +checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" [[package]] name = "lock_api" @@ -1779,6 +1796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -2303,9 +2321,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" dependencies = [ "bytes", "cfg_aliases", @@ -2315,7 +2333,7 @@ dependencies = [ "quinn-udp", "rustc-hash 2.1.1", "rustls", - "socket2 0.5.10", + "socket2", "thiserror", "tokio", "tracing", @@ -2324,9 +2342,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.12" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ "bytes", "getrandom 0.3.3", @@ -2345,16 +2363,16 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2466,10 +2484,10 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.24" -source = "git+https://github.com/seanmonstar/reqwest?rev=74e6f84152a48f00106fe72e0bd2cfc1a4254c93#74e6f84152a48f00106fe72e0bd2cfc1a4254c93" +version = "0.12.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6eff9328d40131d43bd911d42d79eb6a47312002a4daefc9e37f17e74a7701a" dependencies = [ - "async-compression", "base64", "bytes", "cookie", @@ -2770,6 +2788,12 @@ dependencies = [ "libc", ] +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "siphasher" version = "1.0.1" @@ -2788,16 +2812,6 @@ version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" -[[package]] -name = "socket2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "socket2" version = "0.6.0" @@ -3024,7 +3038,7 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "slab", - "socket2 0.6.0", + "socket2", "tokio-macros", "windows-sys 0.59.0", ] @@ -3101,17 +3115,22 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ + "async-compression", "bitflags", "bytes", + "futures-core", "futures-util", "http", "http-body", + "http-body-util", "iri-string", "pin-project-lite", + "tokio", + "tokio-util", "tower", "tower-layer", "tower-service", @@ -3749,9 +3768,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.15+zstd.1.5.7" +version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ "cc", "pkg-config", diff --git a/impit-node/Cargo.toml b/impit-node/Cargo.toml index a8e9d0f2..a1671b9c 100644 --- a/impit-node/Cargo.toml +++ b/impit-node/Cargo.toml @@ -13,7 +13,7 @@ impit = { path="../impit" } rustls = { version="0.23.16" } tokio = { version="1.41.1", features = ["full"] } h2 = "0.4.7" -reqwest = { rev="74e6f84152a48f00106fe72e0bd2cfc1a4254c93", git="https://github.com/seanmonstar/reqwest" } +reqwest = "0.12.25" tokio-stream = "0.1.17" bytes = "1.9.0" diff --git a/impit-node/package.json b/impit-node/package.json index 69b4667c..2a1689e8 100644 --- a/impit-node/package.json +++ b/impit-node/package.json @@ -54,13 +54,13 @@ "packageManager": "yarn@4.12.0", "description": "Impit for JavaScript", "optionalDependencies": { - "impit-darwin-x64": "0.7.3", "impit-darwin-arm64": "0.7.3", - "impit-win32-x64-msvc": "0.7.3", - "impit-win32-arm64-msvc": "0.7.3", + "impit-darwin-x64": "0.7.3", + "impit-linux-arm64-gnu": "0.7.3", + "impit-linux-arm64-musl": "0.7.3", "impit-linux-x64-gnu": "0.7.3", "impit-linux-x64-musl": "0.7.3", - "impit-linux-arm64-gnu": "0.7.3", - "impit-linux-arm64-musl": "0.7.3" + "impit-win32-arm64-msvc": "0.7.3", + "impit-win32-x64-msvc": "0.7.3" } -} \ No newline at end of file +} diff --git a/impit-node/yarn.lock b/impit-node/yarn.lock index da408d07..8aa32879 100644 --- a/impit-node/yarn.lock +++ b/impit-node/yarn.lock @@ -2500,58 +2500,58 @@ __metadata: languageName: node linkType: hard -"impit-darwin-arm64@npm:0.7.2": - version: 0.7.2 - resolution: "impit-darwin-arm64@npm:0.7.2" +"impit-darwin-arm64@npm:0.7.3": + version: 0.7.3 + resolution: "impit-darwin-arm64@npm:0.7.3" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"impit-darwin-x64@npm:0.7.2": - version: 0.7.2 - resolution: "impit-darwin-x64@npm:0.7.2" +"impit-darwin-x64@npm:0.7.3": + version: 0.7.3 + resolution: "impit-darwin-x64@npm:0.7.3" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"impit-linux-arm64-gnu@npm:0.7.2": - version: 0.7.2 - resolution: "impit-linux-arm64-gnu@npm:0.7.2" +"impit-linux-arm64-gnu@npm:0.7.3": + version: 0.7.3 + resolution: "impit-linux-arm64-gnu@npm:0.7.3" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"impit-linux-arm64-musl@npm:0.7.2": - version: 0.7.2 - resolution: "impit-linux-arm64-musl@npm:0.7.2" +"impit-linux-arm64-musl@npm:0.7.3": + version: 0.7.3 + resolution: "impit-linux-arm64-musl@npm:0.7.3" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"impit-linux-x64-gnu@npm:0.7.2": - version: 0.7.2 - resolution: "impit-linux-x64-gnu@npm:0.7.2" +"impit-linux-x64-gnu@npm:0.7.3": + version: 0.7.3 + resolution: "impit-linux-x64-gnu@npm:0.7.3" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"impit-linux-x64-musl@npm:0.7.2": - version: 0.7.2 - resolution: "impit-linux-x64-musl@npm:0.7.2" +"impit-linux-x64-musl@npm:0.7.3": + version: 0.7.3 + resolution: "impit-linux-x64-musl@npm:0.7.3" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"impit-win32-arm64-msvc@npm:0.7.2": - version: 0.7.2 - resolution: "impit-win32-arm64-msvc@npm:0.7.2" +"impit-win32-arm64-msvc@npm:0.7.3": + version: 0.7.3 + resolution: "impit-win32-arm64-msvc@npm:0.7.3" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"impit-win32-x64-msvc@npm:0.7.2": - version: 0.7.2 - resolution: "impit-win32-x64-msvc@npm:0.7.2" +"impit-win32-x64-msvc@npm:0.7.3": + version: 0.7.3 + resolution: "impit-win32-x64-msvc@npm:0.7.3" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -2564,14 +2564,14 @@ __metadata: "@types/express": "npm:^5.0.0" "@types/node": "npm:^24.0.0" express: "npm:^5.0.0" - impit-darwin-arm64: "npm:0.7.2" - impit-darwin-x64: "npm:0.7.2" - impit-linux-arm64-gnu: "npm:0.7.2" - impit-linux-arm64-musl: "npm:0.7.2" - impit-linux-x64-gnu: "npm:0.7.2" - impit-linux-x64-musl: "npm:0.7.2" - impit-win32-arm64-msvc: "npm:0.7.2" - impit-win32-x64-msvc: "npm:0.7.2" + impit-darwin-arm64: "npm:0.7.3" + impit-darwin-x64: "npm:0.7.3" + impit-linux-arm64-gnu: "npm:0.7.3" + impit-linux-arm64-musl: "npm:0.7.3" + impit-linux-x64-gnu: "npm:0.7.3" + impit-linux-x64-musl: "npm:0.7.3" + impit-win32-arm64-msvc: "npm:0.7.3" + impit-win32-x64-msvc: "npm:0.7.3" proxy-chain: "npm:^2.5.9" socks-server-lib: "npm:^0.0.3" tough-cookie: "npm:^6.0.0" diff --git a/impit-python/Cargo.toml b/impit-python/Cargo.toml index 6ddcde93..248f5043 100644 --- a/impit-python/Cargo.toml +++ b/impit-python/Cargo.toml @@ -12,7 +12,7 @@ impit = { path="../impit" } rustls = { version="0.23.16" } tokio = { version="1.41.1", features = ["full"] } h2 = "0.4.7" -reqwest = { rev="74e6f84152a48f00106fe72e0bd2cfc1a4254c93", git="https://github.com/seanmonstar/reqwest" } +reqwest = "0.12.25" tokio-stream = "0.1.17" bytes = "1.9.0" pyo3 = { version = "0.27", features = ["extension-module", "auto-initialize"] } diff --git a/impit/Cargo.toml b/impit/Cargo.toml index 86055300..878c33cc 100644 --- a/impit/Cargo.toml +++ b/impit/Cargo.toml @@ -12,7 +12,7 @@ hickory-proto = "0.25.1" log = "0.4.22" mime = "0.3.17" num-bigint = "0.4.6" -reqwest = { rev="74e6f84152a48f00106fe72e0bd2cfc1a4254c93", git="https://github.com/seanmonstar/reqwest", features = ["json", "gzip", "brotli", "zstd", "deflate", "rustls-tls", "http3", "cookies", "stream", "socks"] } +reqwest = { version="0.12.25", features = ["json", "gzip", "brotli", "zstd", "deflate", "rustls-tls", "http3", "cookies", "stream", "socks"] } rustls = { version="0.23.16", features=["impit"] } scraper = "0.24.0" thiserror = "2.0.12"