From f5c96d083d8d9e9b6d866f2438e1ce28a012a847 Mon Sep 17 00:00:00 2001 From: dev0 Date: Tue, 19 Nov 2024 23:17:38 +1100 Subject: [PATCH] up --- Cargo.lock | 605 +++++++++++++++++++++++------------ clash_lib/Cargo.toml | 4 +- clash_lib/src/app/logging.rs | 6 +- 3 files changed, 400 insertions(+), 215 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index db1c5ee9c..e9407a916 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -229,9 +229,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arti-client" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c6c58e0fe132049f6c79c256c8f181df9556cca7fd7e6a5a24f1665151624dd" +checksum = "57064cebe248bf9c0e1df2cce40926cfd9c8cad9c3103c53c594c6c5f7794d8b" dependencies = [ "async-trait", "cfg-if", @@ -263,6 +263,7 @@ dependencies = [ "tor-keymgr", "tor-linkspec", "tor-llcrypto", + "tor-memquota", "tor-netdir", "tor-netdoc", "tor-persist", @@ -278,6 +279,44 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" +[[package]] +name = "asn1-rs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror 1.0.69", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "async-compression" version = "0.4.16" @@ -707,6 +746,17 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "bstr" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" +dependencies = [ + "memchr", + "regex-automata 0.4.8", + "serde", +] + [[package]] name = "bumpalo" version = "3.16.0" @@ -775,9 +825,9 @@ dependencies = [ [[package]] name = "caret" -version = "0.4.7" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c979a125c4d00f63d49b648530a952c6cc42e3387cc96f41f9a4687ee6b9273" +checksum = "1df55dc0c84d5a555c4b8b84ecf3cff724df77a7b1a8c4a70cd66a981524cff0" [[package]] name = "cast" @@ -1159,9 +1209,21 @@ checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" -version = "0.4.0" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie-factory" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" +dependencies = [ + "futures", +] [[package]] name = "core-foundation" @@ -1476,40 +1538,27 @@ dependencies = [ ] [[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derive-adhoc" -version = "0.7.3" +name = "der-parser" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5283ac2881753c76c0892406705553f0d9ab30649f81e18964d3408f4501edb8" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" dependencies = [ - "derive-adhoc-macros", - "heck 0.4.1", + "asn1-rs", + "cookie-factory", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", ] [[package]] -name = "derive-adhoc-macros" -version = "0.7.3" +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c21b673a9b8c78c34908e6fcb42b922e11c4df2de5237f1c3f58d3285904a84b" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "heck 0.4.1", - "itertools 0.11.0", - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "sha3", - "strum 0.25.0", - "syn 1.0.109", - "void", + "powerfmt", + "serde", ] [[package]] @@ -1531,11 +1580,11 @@ dependencies = [ "heck 0.5.0", "indexmap 2.6.0", "itertools 0.13.0", - "proc-macro-crate 3.2.0", + "proc-macro-crate", "proc-macro2", "quote", "sha3", - "strum 0.26.3", + "strum", "syn 2.0.87", "void", ] @@ -1573,15 +1622,24 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.18" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version", "syn 2.0.87", + "unicode-xid", ] [[package]] @@ -1988,9 +2046,9 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "fs-mistrust" -version = "0.7.13" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43de34e45ddb3fc314aeae5c5b078b8e3549980cd45836f8364d7cca8d85aead" +checksum = "a12a327e6e1ee5595f66105852c644a2d65dfbc62c30c90f53a2783d270002de" dependencies = [ "derive_builder_fork_arti", "dirs", @@ -3002,6 +3060,17 @@ dependencies = [ "libc", ] +[[package]] +name = "inotify" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + [[package]] name = "inotify-sys" version = "0.1.5" @@ -3020,6 +3089,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + [[package]] name = "inventory" version = "0.3.15" @@ -3110,15 +3188,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.1" @@ -3231,9 +3300,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.28.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -3447,6 +3516,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi 0.3.9", "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -3557,7 +3627,7 @@ dependencies = [ "crossbeam-channel", "filetime", "fsevent-sys", - "inotify", + "inotify 0.9.6", "kqueue", "libc", "log", @@ -3566,6 +3636,33 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "notify" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009" +dependencies = [ + "bitflags 2.6.0", + "filetime", + "inotify 0.10.2", + "kqueue", + "libc", + "log", + "mio 1.0.2", + "notify-types", + "walkdir", + "windows-sys 0.52.0", +] + +[[package]] +name = "notify-types" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7393c226621f817964ffb3dc5704f9509e107a8b024b489cc2c1b217378785df" +dependencies = [ + "instant", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -3654,7 +3751,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.87", @@ -3677,9 +3774,9 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oneshot-fused-workaround" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f7728ac6298f91a8a364fc9b33b3cfb8bb58c4ef134193dad6e5240739ffe26" +checksum = "2f49cbc8293c5ba37516d29aba392a94a34638367d17d67617cea34e4f9acd05" dependencies = [ "futures", ] @@ -3792,6 +3889,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +dependencies = [ + "memchr", +] + [[package]] name = "overload" version = "0.1.1" @@ -4144,23 +4250,13 @@ dependencies = [ "indexmap 2.6.0", ] -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - [[package]] name = "proc-macro-crate" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.22", + "toml_edit", ] [[package]] @@ -4257,11 +4353,11 @@ checksum = "68a59553bc595dc1514e7d713e6167cf1c4d68ef6fcc2d10ad834a97a1ca9bc4" [[package]] name = "pwd-grp" -version = "0.1.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6955c41fd7e4283bdf6ff3e7218b7e3f8ef24c4236b31d22be050f4cfd5e2a2c" +checksum = "b94fdf3867b7f2889a736f0022ea9386766280d2cca4bdbe41629ada9e4f3b8f" dependencies = [ - "derive-adhoc", + "derive-deftly", "libc", "paste", "thiserror 1.0.69", @@ -4504,9 +4600,9 @@ dependencies = [ [[package]] name = "retry-error" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb501c6079c6e2a1c9761b76ddb12ecb6818b8773748f5e0394b95f838e4a38" +checksum = "77ef93545b13f6dd83a9f98c8a656ccbd7bc2b95a747844346c70f7e6f5a5932" [[package]] name = "rfc6979" @@ -4590,9 +4686,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" dependencies = [ "bitflags 2.6.0", "fallible-iterator", @@ -4630,6 +4726,15 @@ dependencies = [ "semver", ] +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + [[package]] name = "rustix" version = "0.38.40" @@ -4697,9 +4802,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safelog" -version = "0.3.8" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cabd7492c13678058e680f161cf94ba34d9d9e48419d1fbc6c21a32926c23764" +checksum = "d00c331d3dad51d67db003b70b4e1ab8408c5b89f5830af4d282e612a75a84f3" dependencies = [ "derive_more", "educe", @@ -5013,7 +5118,7 @@ dependencies = [ "libc", "log", "lru_time_cache", - "notify", + "notify 6.1.1", "once_cell", "percent-encoding", "pin-project", @@ -5069,7 +5174,9 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" dependencies = [ + "bstr", "dirs", + "os_str_bytes", ] [[package]] @@ -5097,18 +5204,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "simple_asn1" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror 1.0.69", - "time", -] - [[package]] name = "siphasher" version = "0.3.11" @@ -5130,9 +5225,23 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ + "serde", "version_check", ] +[[package]] +name = "slotmap-careful" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0521c412b8940cf10d63e88faa7b63839ced20547e6d49d86417d90d0c1af8ad" +dependencies = [ + "paste", + "serde", + "slotmap", + "thiserror 1.0.69", + "void", +] + [[package]] name = "smallvec" version = "1.13.2" @@ -5264,35 +5373,13 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros 0.25.3", -] - [[package]] name = "strum" version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "strum_macros 0.26.4", -] - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.87", + "strum_macros", ] [[package]] @@ -5622,7 +5709,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.22", + "toml_edit", ] [[package]] @@ -5634,17 +5721,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.6.0", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.22" @@ -5655,7 +5731,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.20", + "winnow", ] [[package]] @@ -5690,23 +5766,25 @@ dependencies = [ [[package]] name = "tor-async-utils" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c008067156c51d6485b621d92e46ed8db544a6ad59b984b25e3686b73f086ea" +checksum = "3157a36bca68d25da943d9e77804fb1dadca108cd124871668a18763eae735b6" dependencies = [ + "derive-deftly", "educe", "futures", "oneshot-fused-workaround", "pin-project", "postage", + "thiserror 1.0.69", "void", ] [[package]] name = "tor-basic-utils" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79d747dd7d631495c45e074250fad13cd83f9c751bc25fc3be5c9ca9b820a63" +checksum = "3915f18c6574f797c5d59089074f79f81e6d93495d726179eebc9084126d617e" dependencies = [ "derive_more", "hex", @@ -5715,20 +5793,24 @@ dependencies = [ "paste", "rand", "rand_chacha", + "serde", "slab", + "smallvec", "thiserror 1.0.69", ] [[package]] name = "tor-bytes" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9716213e8c95f8db1ae09bf73c8a36770a557eedd7cace5cd02d38af641b06a4" +checksum = "f6cef6d87b08baf1475bc24da39343705ab9b4f7f916d0ee19fa657634733d0d" dependencies = [ "bytes", + "derive-deftly", "digest", "educe", "getrandom", + "safelog", "thiserror 1.0.69", "tor-error", "tor-llcrypto", @@ -5737,13 +5819,15 @@ dependencies = [ [[package]] name = "tor-cell" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31a0ef0674d08e4ec1e7a6a8e0129784379463c72406aca987e82fdea9f4f0fd" +checksum = "35443109312b7ea355d767afc696d00389604a6afa6144a44ba074f7290bbb6b" dependencies = [ + "amplify", "bitflags 2.6.0", "bytes", "caret", + "derive-deftly", "derive_more", "educe", "paste", @@ -5757,14 +5841,16 @@ dependencies = [ "tor-hscrypto", "tor-linkspec", "tor-llcrypto", + "tor-memquota", "tor-units", + "void", ] [[package]] name = "tor-cert" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb3afa49a44e1610c03b6142337ba0c4de1a6d70aea59849878de8876099930" +checksum = "16b8eaa55aa20a3cab77943e176ed48f34c90d9ba0dc98c64adef6c15aef0bc8" dependencies = [ "caret", "derive_more", @@ -5777,9 +5863,9 @@ dependencies = [ [[package]] name = "tor-chanmgr" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fe321a802b53627477ca6f07c4660390d1f62c116a1aeb7ab943666bbbb1e6" +checksum = "c0eabe776706c7062468bb7fdab05136c7a9db6325e9688e02d47a7b6d6dee9d" dependencies = [ "async-trait", "derive_builder_fork_arti", @@ -5799,6 +5885,7 @@ dependencies = [ "tor-error", "tor-linkspec", "tor-llcrypto", + "tor-memquota", "tor-netdir", "tor-proto", "tor-rtcompat", @@ -5810,9 +5897,9 @@ dependencies = [ [[package]] name = "tor-checkable" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d875e93e91977a7c2a1d6ba662d7a3f7d47fcfbad9b93c3a97c2ceb9acf7d29f" +checksum = "48c1d164cf835d4f5e4150293e8322e152e8d8a39839cfea219742556df8fbe2" dependencies = [ "humantime", "signature", @@ -5822,9 +5909,9 @@ dependencies = [ [[package]] name = "tor-circmgr" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae5bc3db0f5ce25b183fc6832b9dcdaf50a2a7cef75651150743a51785f6071" +checksum = "d24638de4d36226023345c0e5f40e0e2244d2f6aec118b9c7cdb464c8f5f6277" dependencies = [ "amplify", "async-trait", @@ -5854,6 +5941,7 @@ dependencies = [ "tor-error", "tor-guardmgr", "tor-linkspec", + "tor-memquota", "tor-netdir", "tor-netdoc", "tor-persist", @@ -5868,11 +5956,12 @@ dependencies = [ [[package]] name = "tor-config" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47196b7671f195fba0145822455957aa6ad5005e8ed5e3599314842972908232" +checksum = "16a89f7cc30d911d5baf61a181b15ea16219d5a63b54ff87bd3e05d3814ad212" dependencies = [ "amplify", + "cfg-if", "derive-deftly", "derive_builder_fork_arti", "directories", @@ -5882,7 +5971,7 @@ dependencies = [ "fs-mistrust", "futures", "itertools 0.13.0", - "notify", + "notify 7.0.0", "once_cell", "paste", "postage", @@ -5891,21 +5980,36 @@ dependencies = [ "serde-value", "serde_ignored", "shellexpand", - "strum 0.26.3", + "strum", "thiserror 1.0.69", "toml", "tor-basic-utils", + "tor-config-path", "tor-error", "tor-rtcompat", "tracing", "void", ] +[[package]] +name = "tor-config-path" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebee676fe2b0c76c262e107a11a996cb381ff484d136c218becea6a4c15be5a" +dependencies = [ + "directories", + "once_cell", + "serde", + "shellexpand", + "thiserror 1.0.69", + "tor-error", +] + [[package]] name = "tor-consdiff" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aac77a0ec434b8ffeb1d67618e4dd0aeb1abd723ed5a34542575482b3dec1fc" +checksum = "01fd67886ae74b82d4cf7a15bc34c7381d10287178b3f9e8d92311cb74b761b1" dependencies = [ "digest", "hex", @@ -5915,9 +6019,9 @@ dependencies = [ [[package]] name = "tor-dirclient" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c13767a064e9f0d17f6aaa307218d04abd5b770f042d167df39d6dd96311960" +checksum = "a65ac0b04c4ff8c303a291ab22aa453c73929895b16a8314d888a7d0269c8343" dependencies = [ "async-compression", "base64ct", @@ -5943,9 +6047,9 @@ dependencies = [ [[package]] name = "tor-dirmgr" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10788702ecc5ef2dc02292e36182732703bd2d3b497168a30bd29a19647f7f3c" +checksum = "b3a3e12af4860040f28cb14b03f9fae18a9aa0f1e66dab77ef0d9f93026ba95b" dependencies = [ "async-trait", "base64ct", @@ -5972,7 +6076,7 @@ dependencies = [ "scopeguard", "serde", "signature", - "strum 0.26.3", + "strum", "thiserror 1.0.69", "time", "tor-async-utils", @@ -5995,9 +6099,9 @@ dependencies = [ [[package]] name = "tor-error" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3edc77493f64b7876a234e6d259ab209ec8d57e57ee9ed789b5e6047e2265e" +checksum = "82249e99eeab846b0264aabb761bceba891b9a5e5875fd2644683feeb96ea417" dependencies = [ "derive_more", "futures", @@ -6005,17 +6109,28 @@ dependencies = [ "paste", "retry-error", "static_assertions", - "strum 0.26.3", + "strum", "thiserror 1.0.69", "tracing", "void", ] +[[package]] +name = "tor-general-addr" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3279be11b11750ea2bb85cc6ac81f22223696650400834d8e64c9449136b593e" +dependencies = [ + "derive_more", + "thiserror 1.0.69", + "void", +] + [[package]] name = "tor-guardmgr" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da216f2d9b279ba65c27f7d5153a01bc002afaa5a7dea3cbd634a4af692736e3" +checksum = "4a732a0331e57b852512dcba2e2cecac1b7e9aee91e231b1d7373f8d6ca4aa1a" dependencies = [ "amplify", "base64ct", @@ -6035,7 +6150,7 @@ dependencies = [ "rand", "safelog", "serde", - "strum 0.26.3", + "strum", "thiserror 1.0.69", "tor-async-utils", "tor-basic-utils", @@ -6055,9 +6170,9 @@ dependencies = [ [[package]] name = "tor-hsclient" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec233600388692f5b0c86304e446c1c5928d5389a4c1e9a458b9b3c9d2b0f1" +checksum = "0ac236cd5ea5e96590e10adaf71cb0f48678d24da59b724b9cc7cfa552a14ba0" dependencies = [ "async-trait", "derive-deftly", @@ -6071,8 +6186,8 @@ dependencies = [ "rand", "retry-error", "safelog", - "slotmap", - "strum 0.26.3", + "slotmap-careful", + "strum", "thiserror 1.0.69", "tor-async-utils", "tor-basic-utils", @@ -6087,6 +6202,7 @@ dependencies = [ "tor-keymgr", "tor-linkspec", "tor-llcrypto", + "tor-memquota", "tor-netdir", "tor-netdoc", "tor-persist", @@ -6097,11 +6213,12 @@ dependencies = [ [[package]] name = "tor-hscrypto" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db824b336c082804882221188097f73bcd8f551da2f56144c7b560c971f44f9" +checksum = "f00099189e52d3376082b58139759249f16a53119d3d4f5f023168881c87d0a0" dependencies = [ "data-encoding", + "derive-deftly", "derive_more", "digest", "itertools 0.13.0", @@ -6115,17 +6232,39 @@ dependencies = [ "tor-bytes", "tor-error", "tor-llcrypto", + "tor-memquota", "tor-units", + "void", +] + +[[package]] +name = "tor-key-forge" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "814a3ceb5b1c0a790f3604f2745775ca4a2cac3499a00c8641fc03030e068e08" +dependencies = [ + "derive-deftly", + "derive_more", + "downcast-rs", + "paste", + "rand", + "signature", + "ssh-key", + "thiserror 1.0.69", + "tor-error", + "tor-hscrypto", + "tor-llcrypto", ] [[package]] name = "tor-keymgr" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96e3442c4b1b9373eca3e95e27cd7ac81f5c63e9a5d6a1d7f756f9af53200640" +checksum = "335a589e149aa728b09c1614a76f9857993c133c2b0fa03319c41218f4bde975" dependencies = [ "amplify", "arrayvec", + "cfg-if", "derive-deftly", "derive_builder_fork_arti", "derive_more", @@ -6138,23 +6277,26 @@ dependencies = [ "itertools 0.13.0", "rand", "serde", + "signature", "ssh-key", "thiserror 1.0.69", "tor-basic-utils", "tor-config", "tor-error", "tor-hscrypto", + "tor-key-forge", "tor-llcrypto", "tor-persist", + "tracing", "walkdir", "zeroize", ] [[package]] name = "tor-linkspec" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79554ce76d519f909a5bba8beea6b2187c4ba131a717944258dce7fcec235a8f" +checksum = "cc92002b84c1cdea158aac4a3a400d61dd02fae5d9d0e8a36a8e08cd64fda6e9" dependencies = [ "base64ct", "by_address", @@ -6167,25 +6309,28 @@ dependencies = [ "safelog", "serde", "serde_with", - "strum 0.26.3", + "strum", "thiserror 1.0.69", "tor-basic-utils", "tor-bytes", "tor-config", "tor-llcrypto", + "tor-memquota", "tor-protover", ] [[package]] name = "tor-llcrypto" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d2fe75fd5713ca4012a4047fcbd3d529c1db9f5ce7c9ab6f4630b503eab55a9" +checksum = "877d2fae2ef8f29ad91bd434e195bdef98662839be9ed4befdf071956b093123" dependencies = [ "aes", "base64ct", "ctr", "curve25519-dalek", + "der-parser", + "derive-deftly", "derive_more", "digest", "ed25519-dalek", @@ -6200,9 +6345,9 @@ dependencies = [ "sha2", "sha3", "signature", - "simple_asn1", "subtle", "thiserror 1.0.69", + "tor-memquota", "visibility", "x25519-dalek", "zeroize", @@ -6210,9 +6355,9 @@ dependencies = [ [[package]] name = "tor-log-ratelim" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8a5d8547bcbdd92d40267b863ff3482846972b1cfdbec4841c668a6539b4c0" +checksum = "7b090937d1bde6910769b2be6b514fc1c07e83f646a14a471f8f2647367afd10" dependencies = [ "futures", "humantime", @@ -6224,11 +6369,39 @@ dependencies = [ "weak-table", ] +[[package]] +name = "tor-memquota" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4560cc9485af7c499f611e2ed565dfcf1445e804faad0dd47ad097f4e9bf7d2" +dependencies = [ + "derive-deftly", + "derive_more", + "dyn-clone", + "educe", + "futures", + "itertools 0.13.0", + "paste", + "pin-project", + "serde", + "slotmap-careful", + "static_assertions", + "thiserror 1.0.69", + "tor-async-utils", + "tor-basic-utils", + "tor-config", + "tor-error", + "tor-log-ratelim", + "tor-rtcompat", + "tracing", + "void", +] + [[package]] name = "tor-netdir" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f493e5c390efa9625d5f44d0f33743fede0ff47bc1e4fada640a44e13004c963" +checksum = "68a99ad35659954aa280e678c3af2ab68934caaf55b94b947e2fb6f850598b5a" dependencies = [ "bitflags 2.6.0", "derive_more", @@ -6241,7 +6414,7 @@ dependencies = [ "rand", "serde", "static_assertions", - "strum 0.26.3", + "strum", "thiserror 1.0.69", "time", "tor-basic-utils", @@ -6258,9 +6431,9 @@ dependencies = [ [[package]] name = "tor-netdoc" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdce7a98b0d30652ca59c1e7c3595b2bc064eb805be56bc9b67a306a60d6592" +checksum = "f74630f9b13b192e84e09a0b39460eec8d1d23f6fa4b45f03d06782322d583fb" dependencies = [ "amplify", "base64ct", @@ -6302,9 +6475,9 @@ dependencies = [ [[package]] name = "tor-persist" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b7942bb43a51129ae4e84124e82e48f96e453a6fb8381c5c2b23899116d411" +checksum = "69b035192b529f6316c77d969f1e3be9f85d61ca1e1f946c91a96f987fdaba5e" dependencies = [ "derive-deftly", "derive_more", @@ -6328,15 +6501,16 @@ dependencies = [ [[package]] name = "tor-proto" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ec37cab7389f53751a02a01a0324aaf09a854b7a8ac56d0ebd44593fadde0b0" +checksum = "3c911edb20425cff696606795d80241d4c412293254bd88b8a7a84ed92c3a098" dependencies = [ "asynchronous-codec", "bitvec", "bytes", "cipher", "coarsetime", + "derive-deftly", "derive_builder_fork_arti", "derive_more", "digest", @@ -6365,6 +6539,7 @@ dependencies = [ "tor-linkspec", "tor-llcrypto", "tor-log-ratelim", + "tor-memquota", "tor-rtcompat", "tor-rtmock", "tor-units", @@ -6377,9 +6552,9 @@ dependencies = [ [[package]] name = "tor-protover" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88cf099c5c91216c7d0a6b2d4c67bb18f0786ad8c8273063d6a45c51b49b40c2" +checksum = "6bc5e3793a53b21b0c98304ea42e1f0fcab3bb37eca96027f9cb4df90685ba31" dependencies = [ "caret", "thiserror 1.0.69", @@ -6387,9 +6562,9 @@ dependencies = [ [[package]] name = "tor-relay-selection" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8aa5505d8e938ac9e75b819d803396fe69fb483c991b4495fe4b28d374a89c" +checksum = "5ba71ca940e15bb86586c3e0cb98b94b9f63a816ef7e1df6aa59cde1114bf86f" dependencies = [ "rand", "serde", @@ -6401,14 +6576,15 @@ dependencies = [ [[package]] name = "tor-rtcompat" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff8a108d6a5e8ae0a97cd1fa41c00360d86bce5e5d7bd0ee1566bcb25b44e44" +checksum = "2d91a0e023078fad1f6c65367efac78dada4c5c9ede7498ce7772f66f3bed15b" dependencies = [ "async-trait", "async_executors", "coarsetime", "derive_more", + "dyn-clone", "educe", "futures", "futures-rustls", @@ -6419,15 +6595,17 @@ dependencies = [ "tokio", "tokio-util", "tor-error", + "tor-general-addr", "tracing", + "void", "x509-signature", ] [[package]] name = "tor-rtmock" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71824b2341740bc2338e554cd4832b692afa44e0eb11519b19ebbcd0179f0799" +checksum = "aacc825722bcad1dca140540a166e582409b4408ce6fbefd8e08d45264ea99f2" dependencies = [ "amplify", "async-trait", @@ -6440,10 +6618,11 @@ dependencies = [ "oneshot-fused-workaround", "pin-project", "priority-queue", - "slotmap", - "strum 0.26.3", + "slotmap-careful", + "strum", "thiserror 1.0.69", "tor-error", + "tor-general-addr", "tor-rtcompat", "tracing", "tracing-test", @@ -6452,11 +6631,15 @@ dependencies = [ [[package]] name = "tor-socksproto" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ea008c29b34604d49f25540e4d72b3bdce0d1021aa82f85e790262280804f0" +checksum = "1eb7a8c792dd59b63fc25add39982d0509c3a58fe6e40eb2294324bf0d30f364" dependencies = [ + "amplify", "caret", + "derive-deftly", + "educe", + "safelog", "subtle", "thiserror 1.0.69", "tor-bytes", @@ -6465,12 +6648,14 @@ dependencies = [ [[package]] name = "tor-units" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c549e18390341623fb8ee988b2622d9b8fa11727d66717c9331156f84e54b09d" +checksum = "01b1660c5ba8d5851d5411be3f9c0ae629e2b4e6e8db655b74f354611e5c18a7" dependencies = [ + "derive-deftly", "derive_more", "thiserror 1.0.69", + "tor-memquota", ] [[package]] @@ -6783,12 +6968,9 @@ dependencies = [ [[package]] name = "typed-index-collections" -version = "3.2.3" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d844b11f547a6fb9dee7ed073d9860174917a072aabe05df6ee60dbe79e7afa" -dependencies = [ - "serde", -] +checksum = "183496e014253d15abbe6235677b1392dba2d40524c88938991226baa38ac7c4" [[package]] name = "typeid" @@ -6841,6 +7023,18 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "universal-hash" version = "0.5.1" @@ -7419,15 +7613,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "0.6.20" diff --git a/clash_lib/Cargo.toml b/clash_lib/Cargo.toml index a82be602b..12043dde4 100644 --- a/clash_lib/Cargo.toml +++ b/clash_lib/Cargo.toml @@ -117,8 +117,8 @@ maxminddb = "0.24" public-suffix = "0.1" murmur3 = "0.5" -arti-client = { version = "0.22", optional = true, default-features = false, features = ["tokio", "rustls", "static-sqlite"] } -tor-rtcompat = { version = "0.22", optional = true, default-features = false } +arti-client = { version = "0.24", optional = true, default-features = false, features = ["tokio", "rustls", "static-sqlite"] } +tor-rtcompat = { version = "0.24", optional = true, default-features = false } # tuic tuic = { tag = "v1.3.4", optional = true, git = "https://github.com/Itsusinn/tuic.git" } diff --git a/clash_lib/src/app/logging.rs b/clash_lib/src/app/logging.rs index 5dd73215a..190fad47f 100644 --- a/clash_lib/src/app/logging.rs +++ b/clash_lib/src/app/logging.rs @@ -6,9 +6,9 @@ use opentelemetry::{ trace::TracerProvider as _, KeyValue, }; -use opentelemetry_otlp::{LogExporter, SpanExporter, WithExportConfig}; +use opentelemetry_otlp::SpanExporter; use opentelemetry_sdk::{ - trace::{self, Config, TracerProvider}, + trace::{Config, TracerProvider}, Resource, }; use opentelemetry_semantic_conventions::{ @@ -18,7 +18,7 @@ use opentelemetry_semantic_conventions::{ use serde::Serialize; use tokio::sync::broadcast::Sender; -use tracing::{debug, error}; +use tracing::debug; use tracing_appender::non_blocking::WorkerGuard; use tracing_oslog::OsLogger; use tracing_subscriber::{