From b526c04c30b60d0e59dc5b89e9f71a99d4aead74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Dec 2024 12:36:36 +0800 Subject: [PATCH] build(deps): bump the rust-dependencies group with 11 updates (#662) * build(deps): bump the rust-dependencies group with 11 updates Bumps the rust-dependencies group with 11 updates: | Package | From | To | | --- | --- | --- | | [hyper](https://github.com/hyperium/hyper) | `1.5.1` | `1.5.2` | | [tokio-tungstenite](https://github.com/snapview/tokio-tungstenite) | `0.24.0` | `0.26.1` | | [hyper-rustls](https://github.com/rustls/hyper-rustls) | `0.27.3` | `0.27.5` | | [thiserror](https://github.com/dtolnay/thiserror) | `2.0.7` | `2.0.9` | | [anyhow](https://github.com/dtolnay/anyhow) | `1.0.94` | `1.0.95` | | [libc](https://github.com/rust-lang/libc) | `0.2.168` | `0.2.169` | | [serde_json](https://github.com/serde-rs/json) | `1.0.133` | `1.0.134` | | [tuic](https://github.com/Itsusinn/tuic) | `v1.3.5` | `v1.4.2` | | [tuic-quinn](https://github.com/Itsusinn/tuic) | `v1.3.5` | `v1.4.2` | | [security-framework](https://github.com/kornelski/rust-security-framework) | `3.0.1` | `3.1.0` | | [env_logger](https://github.com/rust-cli/env_logger) | `0.11.5` | `0.11.6` | Updates `hyper` from 1.5.1 to 1.5.2 - [Release notes](https://github.com/hyperium/hyper/releases) - [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/hyper/compare/v1.5.1...v1.5.2) Updates `tokio-tungstenite` from 0.24.0 to 0.26.1 - [Changelog](https://github.com/snapview/tokio-tungstenite/blob/master/CHANGELOG.md) - [Commits](https://github.com/snapview/tokio-tungstenite/compare/v0.24.0...v0.26.1) Updates `hyper-rustls` from 0.27.3 to 0.27.5 - [Release notes](https://github.com/rustls/hyper-rustls/releases) - [Commits](https://github.com/rustls/hyper-rustls/compare/v/0.27.3...v/0.27.5) Updates `thiserror` from 2.0.7 to 2.0.9 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/2.0.7...2.0.9) Updates `anyhow` from 1.0.94 to 1.0.95 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.94...1.0.95) Updates `libc` from 0.2.168 to 0.2.169 - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/0.2.169/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.168...0.2.169) Updates `serde_json` from 1.0.133 to 1.0.134 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.133...v1.0.134) Updates `tuic` from v1.3.5 to v1.4.2 - [Release notes](https://github.com/Itsusinn/tuic/releases) - [Commits](https://github.com/Itsusinn/tuic/compare/df7279269ddf42b2c4d4dd5d324d7319b093da61...e549a8ddcf487f3557786798e1a2da6d34896e8a) Updates `tuic-quinn` from v1.3.5 to v1.4.2 - [Release notes](https://github.com/Itsusinn/tuic/releases) - [Commits](https://github.com/Itsusinn/tuic/compare/df7279269ddf42b2c4d4dd5d324d7319b093da61...e549a8ddcf487f3557786798e1a2da6d34896e8a) Updates `security-framework` from 3.0.1 to 3.1.0 - [Release notes](https://github.com/kornelski/rust-security-framework/releases) - [Commits](https://github.com/kornelski/rust-security-framework/compare/v3.0.1...v3.1.0) Updates `env_logger` from 0.11.5 to 0.11.6 - [Release notes](https://github.com/rust-cli/env_logger/releases) - [Changelog](https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md) - [Commits](https://github.com/rust-cli/env_logger/compare/v0.11.5...v0.11.6) --- updated-dependencies: - dependency-name: hyper dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: tokio-tungstenite dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: hyper-rustls dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: tuic dependency-type: direct:production dependency-group: rust-dependencies - dependency-name: tuic-quinn dependency-type: direct:production dependency-group: rust-dependencies - dependency-name: security-framework dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: env_logger dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies ... Signed-off-by: dependabot[bot] * fix * fix --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: iHsin --- Cargo.lock | 195 +++++++++++------- clash_lib/Cargo.toml | 9 +- clash_lib/src/proxy/transport/ws/websocket.rs | 4 +- clash_lib/src/proxy/tuic/handle_task.rs | 2 +- clash_lib/src/proxy/tuic/mod.rs | 3 +- 5 files changed, 129 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 157791391..a98590d0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -205,9 +205,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "arc-swap" @@ -251,7 +251,7 @@ dependencies = [ "rand", "safelog", "serde", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-async-utils", "tor-basic-utils", "tor-chanmgr", @@ -462,7 +462,7 @@ dependencies = [ "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.24.0", "tower 0.5.2", "tower-layer", "tower-service", @@ -680,7 +680,7 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror 2.0.7", + "thiserror 2.0.9", "tokio", "tokio-util", "tower-service", @@ -1101,11 +1101,11 @@ dependencies = [ "smoltcp", "socket2 0.5.8", "tempfile", - "thiserror 2.0.7", + "thiserror 2.0.9", "tokio", "tokio-rustls", "tokio-test", - "tokio-tungstenite", + "tokio-tungstenite 0.26.1", "tokio-util", "tor-rtcompat", "tower 0.5.2", @@ -1891,9 +1891,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" dependencies = [ "anstream", "anstyle", @@ -1939,6 +1939,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + [[package]] name = "fallible-iterator" version = "0.3.0" @@ -2059,7 +2069,7 @@ dependencies = [ "once_cell", "pwd-grp", "serde", - "thiserror 2.0.7", + "thiserror 2.0.9", "walkdir", ] @@ -2733,9 +2743,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", @@ -2769,9 +2779,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.3" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", "http", @@ -3030,6 +3040,12 @@ dependencies = [ "icu_properties", ] +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + [[package]] name = "indexmap" version = "1.9.3" @@ -3270,9 +3286,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.168" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libloading" @@ -3281,7 +3297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -4400,7 +4416,7 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "socket2 0.5.8", - "thiserror 2.0.7", + "thiserror 2.0.9", "tokio", "tracing", ] @@ -4419,7 +4435,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.7", + "thiserror 2.0.9", "tinyvec", "tracing", "web-time", @@ -4817,7 +4833,7 @@ dependencies = [ "educe", "either", "fluid-let", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -4875,9 +4891,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" +checksum = "81d3f8c9bfcc3cbb6b0179eb57042d75b1582bdc65c3cb95f3fa999509c03cbc" dependencies = [ "bitflags 2.6.0", "core-foundation", @@ -4888,9 +4904,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" dependencies = [ "core-foundation-sys", "libc", @@ -4953,9 +4969,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "itoa", "memchr", @@ -5244,7 +5260,7 @@ dependencies = [ "paste", "serde", "slotmap", - "thiserror 2.0.7", + "thiserror 2.0.9", "void", ] @@ -5482,11 +5498,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.7" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" dependencies = [ - "thiserror-impl 2.0.7", + "thiserror-impl 2.0.9", ] [[package]] @@ -5502,9 +5518,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.7" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" dependencies = [ "proc-macro2", "quote", @@ -5692,7 +5708,19 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.24.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4bf6fecd69fcdede0ec680aaf474cdab988f9de6bc73d3758f0160e3b7025a" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.26.1", ] [[package]] @@ -5785,7 +5813,7 @@ dependencies = [ "oneshot-fused-workaround", "pin-project", "postage", - "thiserror 2.0.7", + "thiserror 2.0.9", "void", ] @@ -5805,7 +5833,7 @@ dependencies = [ "serde", "slab", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -5820,7 +5848,7 @@ dependencies = [ "educe", "getrandom", "safelog", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-error", "tor-llcrypto", "zeroize", @@ -5842,7 +5870,7 @@ dependencies = [ "paste", "rand", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-basic-utils", "tor-bytes", "tor-cert", @@ -5864,7 +5892,7 @@ dependencies = [ "caret", "derive_more", "digest", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-bytes", "tor-checkable", "tor-llcrypto", @@ -5886,7 +5914,7 @@ dependencies = [ "rand", "safelog", "serde", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-async-utils", "tor-basic-utils", "tor-cell", @@ -5912,7 +5940,7 @@ checksum = "614009c7733b955630686aa15d072024a6e82a6c3101749b7c30cd37af79a8de" dependencies = [ "humantime", "signature", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-llcrypto", ] @@ -5942,7 +5970,7 @@ dependencies = [ "safelog", "serde", "static_assertions", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-async-utils", "tor-basic-utils", "tor-chanmgr", @@ -5988,7 +6016,7 @@ dependencies = [ "serde-value", "serde_ignored", "strum", - "thiserror 2.0.7", + "thiserror 2.0.9", "toml", "tor-basic-utils", "tor-error", @@ -6007,7 +6035,7 @@ dependencies = [ "once_cell", "serde", "shellexpand", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-error", "tor-general-addr", ] @@ -6020,7 +6048,7 @@ checksum = "1e9ce0f35f46f4edcb2495ec71d4607c291bc9b9da0386e0a3cc9ab64bbe41f1" dependencies = [ "digest", "hex", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-llcrypto", ] @@ -6040,7 +6068,7 @@ dependencies = [ "httpdate", "itertools 0.13.0", "memchr", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-circmgr", "tor-error", "tor-hscrypto", @@ -6084,7 +6112,7 @@ dependencies = [ "serde", "signature", "strum", - "thiserror 2.0.7", + "thiserror 2.0.9", "time", "tor-async-utils", "tor-basic-utils", @@ -6117,7 +6145,7 @@ dependencies = [ "retry-error", "static_assertions", "strum", - "thiserror 2.0.7", + "thiserror 2.0.9", "tracing", "void", ] @@ -6129,7 +6157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f60b135845a8c4546cdb4da673123e5ae3daf4597d9857fd7d720350efac173c" dependencies = [ "derive_more", - "thiserror 2.0.7", + "thiserror 2.0.9", "void", ] @@ -6158,7 +6186,7 @@ dependencies = [ "safelog", "serde", "strum", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-async-utils", "tor-basic-utils", "tor-config", @@ -6195,7 +6223,7 @@ dependencies = [ "safelog", "slotmap-careful", "strum", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-async-utils", "tor-basic-utils", "tor-bytes", @@ -6234,7 +6262,7 @@ dependencies = [ "safelog", "signature", "subtle", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-basic-utils", "tor-bytes", "tor-error", @@ -6257,7 +6285,7 @@ dependencies = [ "rand", "signature", "ssh-key", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-error", "tor-hscrypto", "tor-llcrypto", @@ -6286,7 +6314,7 @@ dependencies = [ "serde", "signature", "ssh-key", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-basic-utils", "tor-config", "tor-config-path", @@ -6318,7 +6346,7 @@ dependencies = [ "serde", "serde_with", "strum", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-basic-utils", "tor-bytes", "tor-config", @@ -6354,7 +6382,7 @@ dependencies = [ "sha3", "signature", "subtle", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-memquota", "visibility", "x25519-dalek", @@ -6370,7 +6398,7 @@ dependencies = [ "futures", "humantime", "once_cell", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-error", "tor-rtcompat", "tracing", @@ -6394,7 +6422,7 @@ dependencies = [ "serde", "slotmap-careful", "static_assertions", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-async-utils", "tor-basic-utils", "tor-config", @@ -6424,7 +6452,7 @@ dependencies = [ "serde", "static_assertions", "strum", - "thiserror 2.0.7", + "thiserror 2.0.9", "time", "tor-basic-utils", "tor-error", @@ -6463,7 +6491,7 @@ dependencies = [ "signature", "smallvec", "subtle", - "thiserror 2.0.7", + "thiserror 2.0.9", "time", "tinystr 0.8.0", "tor-basic-utils", @@ -6500,7 +6528,7 @@ dependencies = [ "sanitize-filename", "serde", "serde_json", - "thiserror 2.0.7", + "thiserror 2.0.9", "time", "tor-async-utils", "tor-basic-utils", @@ -6534,7 +6562,7 @@ dependencies = [ "rand_core", "safelog", "subtle", - "thiserror 2.0.7", + "thiserror 2.0.9", "tokio", "tokio-util", "tor-async-utils", @@ -6567,7 +6595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a95780782ff7c5a7c942da6a375d1150acfab445d8f3b840e4244a8267d9a3d" dependencies = [ "caret", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -6601,7 +6629,7 @@ dependencies = [ "paste", "pin-project", "rustls-pki-types", - "thiserror 2.0.7", + "thiserror 2.0.9", "tokio", "tokio-util", "tor-error", @@ -6630,7 +6658,7 @@ dependencies = [ "priority-queue", "slotmap-careful", "strum", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-error", "tor-general-addr", "tor-rtcompat", @@ -6651,7 +6679,7 @@ dependencies = [ "educe", "safelog", "subtle", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-bytes", "tor-error", ] @@ -6664,7 +6692,7 @@ checksum = "6bdeb3e823e4d194227eab21dff65c738c6ce1755a41395538e4e48e04f37c7f" dependencies = [ "derive-deftly", "derive_more", - "thiserror 2.0.7", + "thiserror 2.0.9", "tor-memquota", ] @@ -6917,26 +6945,27 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tuic" -version = "1.3.5" -source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.3.5#df7279269ddf42b2c4d4dd5d324d7319b093da61" +version = "1.4.2" +source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.4.2#e549a8ddcf487f3557786798e1a2da6d34896e8a" dependencies = [ "bytes", "futures-util", "parking_lot", "register-count", - "thiserror 1.0.69", + "thiserror 2.0.9", "uuid", ] [[package]] name = "tuic-quinn" -version = "1.3.5" -source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.3.5#df7279269ddf42b2c4d4dd5d324d7319b093da61" +version = "1.4.2" +source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.4.2#e549a8ddcf487f3557786798e1a2da6d34896e8a" dependencies = [ "bytes", - "futures-util", + "eyre", "quinn", - "thiserror 1.0.69", + "thiserror 2.0.9", + "tokio", "tracing", "tuic", "uuid", @@ -6977,6 +7006,24 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413083a99c579593656008130e29255e54dcaae495be556cc26888f211648c24" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror 2.0.9", + "utf-8", +] + [[package]] name = "typed-index-collections" version = "3.1.0" @@ -7375,7 +7422,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/clash_lib/Cargo.toml b/clash_lib/Cargo.toml index 3b0514676..85169c6d8 100644 --- a/clash_lib/Cargo.toml +++ b/clash_lib/Cargo.toml @@ -22,12 +22,11 @@ async-trait = "0.1" hyper = { version = "1", features = ["http1","http2","client", "server"] } hyper-util = "0.1" - # Network proto http = { version = "1" } http-body-util = "0.1.2" socket2 = { version = "0.5", features = ["all"] } -tokio-tungstenite = "0.24.0" +tokio-tungstenite = "0.26.1" # TLS tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "tls12"] } @@ -120,8 +119,8 @@ arti-client = { version = "0.25", optional = true, default-features = false, fea tor-rtcompat = { version = "0.25", optional = true, default-features = false } # tuic -tuic = { tag = "v1.3.5", optional = true, git = "https://github.com/Itsusinn/tuic.git" } -tuic-quinn = { tag = "v1.3.5", optional = true, git = "https://github.com/Itsusinn/tuic.git" } +tuic = { tag = "v1.4.2", optional = true, git = "https://github.com/Itsusinn/tuic.git" } +tuic-quinn = { tag = "v1.4.2", optional = true, git = "https://github.com/Itsusinn/tuic.git" } register-count = { version = "0.1", optional = true } quinn = { version = "0.11", default-features = false, features = ["futures-io", "runtime-tokio", "rustls"] } @@ -154,7 +153,7 @@ prost-build = "0.13" unix-udp-sock = { git = "https://github.com/Watfaq/unix-udp-sock.git", rev = "cd3e4eca43e6f3be82a2703c3d711b7e18fbfd18"} [target.'cfg(macos)'.dependencies] -security-framework = "3.0.1" +security-framework = "3.1.0" [target.'cfg(target_os="ios")'.dependencies] tracing-oslog = { branch = "main", git = "https://github.com/Absolucy/tracing-oslog.git" } diff --git a/clash_lib/src/proxy/transport/ws/websocket.rs b/clash_lib/src/proxy/transport/ws/websocket.rs index 87b087533..55a0152c8 100644 --- a/clash_lib/src/proxy/transport/ws/websocket.rs +++ b/clash_lib/src/proxy/transport/ws/websocket.rs @@ -1,6 +1,6 @@ use std::{fmt::Debug, pin::Pin, task::Poll}; -use bytes::BytesMut; +use bytes::{Bytes, BytesMut}; use futures::{ready, Sink, Stream}; use tokio::io::{AsyncRead, AsyncWrite}; use tokio_tungstenite::{tungstenite::Message, WebSocketStream}; @@ -81,7 +81,7 @@ impl AsyncWrite for WebsocketConn { buf: &[u8], ) -> std::task::Poll> { ready!(Pin::new(&mut self.inner).poll_ready(cx)).map_err(map_io_error)?; - let message = Message::Binary(buf.into()); + let message = Message::Binary(Bytes::copy_from_slice(buf)); Pin::new(&mut self.inner) .start_send(message) .map_err(map_io_error)?; diff --git a/clash_lib/src/proxy/tuic/handle_task.rs b/clash_lib/src/proxy/tuic/handle_task.rs index 72d323349..15370daab 100644 --- a/clash_lib/src/proxy/tuic/handle_task.rs +++ b/clash_lib/src/proxy/tuic/handle_task.rs @@ -159,7 +159,7 @@ impl TuicConnection { Ok(()) => Ok(()), Err(err) => { tracing::warn!("[udp] [dissociate] [{assoc_id:#06x}] {err}"); - Err(err)? + Err(anyhow::anyhow!(err)) } } } diff --git a/clash_lib/src/proxy/tuic/mod.rs b/clash_lib/src/proxy/tuic/mod.rs index 9bde6f3a5..3902d1c3f 100644 --- a/clash_lib/src/proxy/tuic/mod.rs +++ b/clash_lib/src/proxy/tuic/mod.rs @@ -23,7 +23,6 @@ use std::{ time::Duration, }; -use tokio_util::compat::FuturesAsyncReadCompatExt; use uuid::Uuid; use crate::{ @@ -283,7 +282,7 @@ impl Handler { ) -> Result { let conn = self.get_conn(&resolver, sess).await?; let dest = sess.destination.clone().into_tuic(); - let tuic_tcp = conn.connect_tcp(dest).await?.compat(); + let tuic_tcp = conn.connect_tcp(dest).await?; let s = ChainedStreamWrapper::new(tuic_tcp); s.append_to_chain(self.name()).await; Ok(Box::new(s))