From d4411ab3b42870371f850bfd9e00a39c584c3453 Mon Sep 17 00:00:00 2001 From: spacemeowx2 Date: Tue, 8 Aug 2023 17:13:56 +0800 Subject: [PATCH] feat: upgrade dependencies --- Cargo.lock | 605 +++++++++++++++++----------- Cargo.toml | 56 +-- protocol/obfs/Cargo.toml | 4 +- protocol/raw/Cargo.toml | 2 +- protocol/raw/src/device/pcap_dev.rs | 2 +- protocol/ss/Cargo.toml | 12 +- protocol/trojan/Cargo.toml | 14 +- rabbit-digger/Cargo.toml | 26 +- rd-derive/Cargo.toml | 4 +- rd-std/Cargo.toml | 44 +- src/lib.rs | 12 +- src/main.rs | 2 +- 12 files changed, 455 insertions(+), 328 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 121d4b1e..fe3db148 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,6 +90,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -159,9 +165,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "anymap" @@ -171,23 +177,24 @@ checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" [[package]] name = "async-stream" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", + "pin-project-lite", ] [[package]] name = "async-stream-impl" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.28", ] [[package]] @@ -201,6 +208,15 @@ dependencies = [ "syn 2.0.28", ] +[[package]] +name = "atomic-polyfill" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +dependencies = [ + "critical-section", +] + [[package]] name = "atomic-shim" version = "0.2.0" @@ -229,9 +245,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.19" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", @@ -256,7 +272,7 @@ dependencies = [ "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite 0.19.0", + "tokio-tungstenite", "tower", "tower-layer", "tower-service", @@ -289,7 +305,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide 0.7.1", + "miniz_oxide", "object", "rustc-demangle", ] @@ -436,13 +452,13 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.45", @@ -485,9 +501,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.19" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" dependencies = [ "clap_builder", "clap_derive", @@ -496,9 +512,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" dependencies = [ "anstream", "anstyle", @@ -541,9 +557,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "console-api" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57ff02e8ad8e06ab9731d5dc72dc23bef9200778eae1a89d555d8c42e5d4a86" +checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" dependencies = [ "prost", "prost-types", @@ -553,9 +569,9 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a3a81dfaf6b66bce5d159eddae701e3a002f194d378cbf7be5f053c281d9be" +checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" dependencies = [ "console-api", "crossbeam-channel", @@ -637,6 +653,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "critical-section" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" + [[package]] name = "crossbeam-channel" version = "0.5.6" @@ -774,12 +796,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if", - "hashbrown 0.12.3", + "hashbrown 0.14.0", "lock_api", "once_cell", "parking_lot_core", @@ -792,6 +814,38 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +[[package]] +name = "defmt" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2d011b2fee29fb7d659b83c43fce9a2cb4df453e16d441a51448e448f3f98" +dependencies = [ + "bitflags 1.3.2", + "defmt-macros", +] + +[[package]] +name = "defmt-macros" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54f0216f6c5acb5ae1a47050a6645024e6edafc2ee32d421955eccfef12ef92e" +dependencies = [ + "defmt-parser", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] +name = "defmt-parser" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "269924c02afd7f94bc4cecbfa5c379f6ffcf9766b3408fe63d22c728654eccd0" +dependencies = [ + "thiserror", +] + [[package]] name = "der" version = "0.5.1" @@ -821,9 +875,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -991,12 +1045,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.6.2", + "miniz_oxide", ] [[package]] @@ -1022,9 +1076,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -1210,9 +1264,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "h2" -version = "0.3.15" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -1223,10 +1277,19 @@ dependencies = [ "indexmap 1.9.2", "slab", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.8", "tracing", ] +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -1277,6 +1340,19 @@ dependencies = [ "http", ] +[[package]] +name = "heapless" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version", + "spin 0.9.8", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.3.3" @@ -1337,7 +1413,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -1399,9 +1475,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.24" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1489,9 +1565,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1644,9 +1720,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1697,9 +1773,9 @@ dependencies = [ [[package]] name = "libmimalloc-sys" -version = "0.1.30" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8c7cbf8b89019683667e347572e6d55a7df7ea36b0c4ce69961b0cde67b174" +checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" dependencies = [ "cc", "libc", @@ -1728,9 +1804,9 @@ checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1811,15 +1887,15 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "md5-asm", ] [[package]] name = "md5-asm" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b9a6f25ec11ea27e22d7fc8beafda909da44ece95f63e94f1eeb23d19bb5c7" +checksum = "61d33bc4cdfe5c60340e282bbbee0a6e2bc57f0b9279bb3489c5004d12492e5c" dependencies = [ "cc", ] @@ -1850,9 +1926,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.34" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcb174b18635f7561a0c6c9fc2ce57218ac7523cf72c50af80e2d79ab8f3ba1" +checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" dependencies = [ "libmimalloc-sys", ] @@ -1879,15 +1955,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -2040,16 +2107,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.15" @@ -2094,9 +2151,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opaque-debug" @@ -2106,9 +2163,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -2147,11 +2204,10 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", @@ -2161,9 +2217,9 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4b8347cc26099d3aeee044065ecc3ae11469796b4d65d065a23a584ed92a6f" +checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ "opentelemetry_api", "opentelemetry_sdk", @@ -2171,9 +2227,9 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a819b71d6530c4297b49b3cae2939ab3a8cc1b9f382826a1bc29dd0ca3864906" +checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" dependencies = [ "async-trait", "bytes", @@ -2184,44 +2240,42 @@ dependencies = [ [[package]] name = "opentelemetry-jaeger" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08e028dc9f4f304e9320ce38c80e7cf74067415b1ad5a8750a38bae54a4d450d" +checksum = "876958ba9084f390f913fcf04ddf7bbbb822898867bb0a51cc28f2b9e5c1b515" dependencies = [ "async-trait", - "futures", - "futures-executor", + "futures-core", + "futures-util", "headers", "http", - "once_cell", "opentelemetry", "opentelemetry-http", "opentelemetry-semantic-conventions", "reqwest", - "thiserror", "thrift", "tokio", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e33428e6bf08c6f7fcea4ddb8e358fab0fe48ab877a87c70c6ebe20f673ce5" +checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269" dependencies = [ "opentelemetry", ] [[package]] name = "opentelemetry_api" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed41783a5bf567688eb38372f2b7a8530f5a607a4b49d38dd7573236c23ca7e2" +checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" dependencies = [ - "fnv", "futures-channel", "futures-util", "indexmap 1.9.2", + "js-sys", "once_cell", "pin-project-lite", "thiserror", @@ -2230,21 +2284,21 @@ dependencies = [ [[package]] name = "opentelemetry_sdk" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b3a2a91fdbfdd4d212c0dcc2ab540de2c2bcbbd90be17de7a7daf8822d010c1" +checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" dependencies = [ "async-trait", "crossbeam-channel", - "dashmap", - "fnv", "futures-channel", "futures-executor", "futures-util", "once_cell", "opentelemetry_api", + "ordered-float 3.7.0", "percent-encoding", "rand", + "regex", "thiserror", "tokio", "tokio-stream", @@ -2265,6 +2319,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "ordered-float" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" +dependencies = [ + "num-traits", +] + [[package]] name = "overload" version = "0.1.1" @@ -2318,23 +2381,24 @@ dependencies = [ [[package]] name = "pcap" -version = "0.9.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d1868a121e5f1d78134be7148b778d5352f28b7be30e7f993c3439671f0190" +checksum = "cbaa01d616eb84eb35cd085fdeaa8671dc8d951bdc4a75bfc414466e76b039ce" dependencies = [ + "bitflags 1.3.2", "errno 0.2.8", "libc", "libloading 0.6.7", + "pkg-config", "regex", - "widestring 0.2.2", - "winapi", + "windows-sys 0.36.1", ] [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project" @@ -2358,9 +2422,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c" [[package]] name = "pin-utils" @@ -2403,6 +2467,30 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.107", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -2498,7 +2586,7 @@ dependencies = [ "bytes", "cfg-if", "chrono", - "clap 4.3.19", + "clap 4.3.21", "console-subscriber", "dirs", "fs2", @@ -2642,7 +2730,7 @@ dependencies = [ "rd-interface", "serde", "serde_with", - "smoltcp", + "smoltcp 0.10.0", "socket2 0.5.3", "socks5-protocol", "tar", @@ -2650,7 +2738,7 @@ dependencies = [ "tokio-native-tls", "tokio-openssl", "tokio-rustls", - "tokio-util 0.7.4", + "tokio-util 0.7.8", "tracing", "trust-dns-proto", "trust-dns-resolver", @@ -2736,9 +2824,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ "base64 0.21.2", "bytes", @@ -2784,9 +2872,9 @@ dependencies = [ [[package]] name = "rhai" -version = "1.12.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff176e72a35d975ea0759b1bed69e30ad5cf47580b2e5d00449e8623b5a37dc" +checksum = "4c2a11a646ef5d4e4a9d5cf80c7e4ecb20f9b1954292d5c5e6d6cbc8d33728ec" dependencies = [ "ahash", "bitflags 1.3.2", @@ -2818,7 +2906,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", + "spin 0.5.2", "untrusted", "web-sys", "winapi", @@ -2863,6 +2951,15 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + [[package]] name = "rustix" version = "0.38.6" @@ -3021,6 +3118,12 @@ dependencies = [ "libc", ] +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + [[package]] name = "sendfd" version = "0.4.3" @@ -3033,18 +3136,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.180" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.180" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", @@ -3098,14 +3201,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3" +checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49" dependencies = [ "base64 0.21.2", "chrono", "hex", "indexmap 1.9.2", + "indexmap 2.0.0", "serde", "serde_json", "serde_with_macros", @@ -3114,9 +3218,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65" +checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7" dependencies = [ "darling", "proc-macro2", @@ -3145,28 +3249,28 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", "sha1-asm", ] [[package]] name = "sha1-asm" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "563d4f7100bc3fce234e5f37bbf63dc2752558964505ba6ac3f7204bdc59eaac" +checksum = "2ba6947745e7f86be3b8af00b7355857085dbdf8901393c89514510eb61f4e21" dependencies = [ "cc", ] [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3287,6 +3391,20 @@ dependencies = [ "managed", ] +[[package]] +name = "smoltcp" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d2e3a36ac8fea7b94e666dfa3871063d6e0a5c9d5d4fec9a1a6b7b6760f0229" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "cfg-if", + "defmt", + "heapless", + "managed", +] + [[package]] name = "socket2" version = "0.4.9" @@ -3323,6 +3441,15 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + [[package]] name = "ss" version = "0.1.0" @@ -3339,6 +3466,12 @@ dependencies = [ "tracing", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -3393,9 +3526,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "tar" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -3481,7 +3614,7 @@ dependencies = [ "byteorder", "integer-encoding", "log", - "ordered-float", + "ordered-float 2.10.0", "threadpool", ] @@ -3631,7 +3764,7 @@ dependencies = [ "futures", "parking_lot", "pin-project-lite", - "smoltcp", + "smoltcp 0.8.2", "tokio", "tokio-util 0.6.10", ] @@ -3650,14 +3783,14 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.8", ] [[package]] @@ -3677,18 +3810,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "tokio-tungstenite" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.19.0", -] - [[package]] name = "tokio-tungstenite" version = "0.20.0" @@ -3698,7 +3819,7 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite 0.20.0", + "tungstenite", ] [[package]] @@ -3717,9 +3838,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -3740,14 +3861,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ - "async-stream", "async-trait", "axum", - "base64 0.13.1", + "base64 0.21.2", "bytes", "futures-core", "futures-util", @@ -3759,22 +3879,19 @@ dependencies = [ "percent-encoding", "pin-project", "prost", - "prost-derive", "tokio", "tokio-stream", - "tokio-util 0.7.4", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", ] [[package]] name = "topological-sort" -version = "0.1.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa7c7f42dea4b1b99439786f5633aeb9c14c1b53f75e282803c2ec2ad545873c" +checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" [[package]] name = "tower" @@ -3790,7 +3907,7 @@ dependencies = [ "rand", "slab", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.8", "tower-layer", "tower-service", "tracing", @@ -3815,7 +3932,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.8", "tower-layer", "tower-service", "tracing", @@ -3867,16 +3984,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-log" version = "0.1.3" @@ -3890,9 +3997,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00a39dcf9bfc1742fa4d6215253b33a6e474be78275884c216fc2a06267b3600" +checksum = "fc09e402904a5261e42cf27aea09ccb7d5318c6717a9eec3d8e2e65c56b18f19" dependencies = [ "once_cell", "opentelemetry", @@ -3914,9 +4021,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", @@ -3955,8 +4062,8 @@ dependencies = [ "sha2", "socks5-protocol", "tokio", - "tokio-tungstenite 0.20.0", - "tokio-util 0.7.4", + "tokio-tungstenite", + "tokio-util 0.7.8", ] [[package]] @@ -4026,25 +4133,6 @@ dependencies = [ "tokio-util 0.6.10", ] -[[package]] -name = "tungstenite" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - [[package]] name = "tungstenite" version = "0.20.0" @@ -4136,12 +4224,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna 0.4.0", "percent-encoding", "serde", ] @@ -4166,9 +4254,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom", "serde", @@ -4233,9 +4321,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4243,16 +4331,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.28", "wasm-bindgen-shared", ] @@ -4270,9 +4358,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4280,22 +4368,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" @@ -4313,12 +4401,6 @@ version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9c6eda1c830a36f361e7721c87fd79ea84293b54f8c48c959f85ec636f0f196" -[[package]] -name = "widestring" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb" - [[package]] name = "widestring" version = "0.4.3" @@ -4362,19 +4444,32 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + [[package]] name = "windows-sys" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -4403,9 +4498,9 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" @@ -4415,9 +4510,15 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" @@ -4427,9 +4528,15 @@ checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" @@ -4439,9 +4546,15 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" @@ -4451,9 +4564,15 @@ checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" @@ -4463,9 +4582,9 @@ checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" @@ -4475,9 +4594,15 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" @@ -4511,9 +4636,9 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] diff --git a/Cargo.toml b/Cargo.toml index 221637ae..4e0b7526 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,40 +7,40 @@ description = "Just a stub" license = "MIT OR Apache-2.0" [dependencies] -anyhow = "1.0.38" -tokio = { version = "1.15.0", features = ["full"] } -tokio-stream = { version = "0.1.6", features = ["net", "sync", "time"] } -clap = { version = "4.3.19", default-features = false, features = [ +anyhow = "1.0.72" +tokio = { version = "1.29.1", features = ["full"] } +tokio-stream = { version = "0.1.14", features = ["net", "sync", "time"] } +clap = { version = "4.3.21", default-features = false, features = [ "std", "color", "derive", "env", ] } -tracing = "0.1.26" -tracing-subscriber = { version = "0.3.7", features = [ +tracing = "0.1.37" +tracing-subscriber = { version = "0.3.17", features = [ "registry", "env-filter", "json", ] } rabbit-digger = { version = "0.1", path = "./rabbit-digger" } notify-stream = "0.1.1" -futures = "0.3" -pin-project-lite = "0.2.6" +futures = "0.3.28" +pin-project-lite = "0.2.11" serde_yaml = "0.9.25" yaml-merge-keys = { version = "0.6.0", features = ["serde_yaml"] } -serde_json = "1.0" -serde = { version = "1.0.119", features = ["derive"] } +serde_json = "1.0.104" +serde = { version = "1.0.183", features = ["derive"] } rd-interface = { path = "./rd-interface/", version = "0.4" } rd-std = { path = "./rd-std/", version = "0.1" } -cfg-if = "1.0" -reqwest = { version = "0.11.4", features = ["native-tls-vendored", "socks"] } -parking_lot = "0.12.0" -uuid = { version = "1.3.0", features = ["v4"] } +cfg-if = "1.0.0" +reqwest = { version = "0.11.18", features = ["native-tls-vendored", "socks"] } +parking_lot = "0.12.1" +uuid = { version = "1.4.1", features = ["v4"] } fs2 = "0.4.3" -async-stream = "0.3.0" -once_cell = "1.7.2" +async-stream = "0.3.5" +once_cell = "1.18.0" -axum = { version = "0.6.19", features = ["ws"], optional = true } +axum = { version = "0.6.20", features = ["ws"], optional = true } serde_urlencoded = { version = "0.7.1", optional = true } tower-http = { version = "0.4.3", features = [ "fs", @@ -49,10 +49,10 @@ tower-http = { version = "0.4.3", features = [ ], optional = true } dirs = { version = "5.0.1" } json-patch = { version = "1.0.0", optional = true } -url = { version = "2.2.2", optional = true, features = ["serde"] } -hyper = { version = "0.14.12", optional = true, features = ["http1", "client"] } -percent-encoding = { version = "2.1.0", optional = true } -bytes = { version = "1.0", optional = true } +url = { version = "2.4.0", optional = true, features = ["serde"] } +hyper = { version = "0.14.27", optional = true, features = ["http1", "client"] } +percent-encoding = { version = "2.3.0", optional = true } +bytes = { version = "1.4.0", optional = true } ss = { path = "./protocol/ss", optional = true } trojan = { path = "./protocol/trojan", optional = true } @@ -60,18 +60,18 @@ rpc = { path = "./protocol/rpc", optional = true } raw = { path = "./protocol/raw", optional = true } obfs = { path = "./protocol/obfs", optional = true } -console-subscriber = { version = "0.1.3", optional = true } +console-subscriber = { version = "0.1.10", optional = true } -chrono = { version = "0.4.19", optional = true } +chrono = { version = "0.4.26", optional = true } tracing-serde = { version = "0.1.3", optional = true } -tracing-opentelemetry = { version = "0.19.0", optional = true } -opentelemetry = { version = "0.19.0", features = ["rt-tokio"], optional = true } -opentelemetry-jaeger = { version = "0.18.0", features = [ +tracing-opentelemetry = { version = "0.20.0", optional = true } +opentelemetry = { version = "0.20.0", features = ["rt-tokio"], optional = true } +opentelemetry-jaeger = { version = "0.19.0", features = [ "rt-tokio", "reqwest_collector_client", ], optional = true } -rhai = { version = "1.7.0", optional = true, features = [ +rhai = { version = "1.15.1", optional = true, features = [ "no_float", "no_module", "no_optimize", @@ -81,7 +81,7 @@ rhai = { version = "1.7.0", optional = true, features = [ ] } jemallocator = { version = "0.5.4", optional = true } -mimalloc = { version = "0.1", optional = true } +mimalloc = { version = "0.1.37", optional = true } [dev-dependencies] rusty-hook = "0.11.0" diff --git a/protocol/obfs/Cargo.toml b/protocol/obfs/Cargo.toml index 73acbd7c..873f8a1a 100644 --- a/protocol/obfs/Cargo.toml +++ b/protocol/obfs/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" [dependencies] rd-interface = { path = "../../rd-interface/", version = "0.4" } rd-std = { path = "../../rd-std/", version = "0.1" } -serde = "1.0.177" +serde = "1.0.183" tokio = "1.29.1" -pin-project-lite = "0.2.10" +pin-project-lite = "0.2.11" futures = "0.3.28" rand = "0.8.5" base64 = "0.21.2" diff --git a/protocol/raw/Cargo.toml b/protocol/raw/Cargo.toml index 5a8c11da..30cfe150 100644 --- a/protocol/raw/Cargo.toml +++ b/protocol/raw/Cargo.toml @@ -12,7 +12,7 @@ serde = "1.0" tracing = "0.1.26" tokio-smoltcp = "0.2.4" tokio = { version = "1.5.0", features = ["rt", "macros", "net"] } -pcap = { version = "0.9.1", optional = true } +pcap = { version = "1.1.0", optional = true } futures = "0.3" lru_time_cache = "0.11" parking_lot = "0.12.1" diff --git a/protocol/raw/src/device/pcap_dev.rs b/protocol/raw/src/device/pcap_dev.rs index 6b07d6a5..9c70dc37 100644 --- a/protocol/raw/src/device/pcap_dev.rs +++ b/protocol/raw/src/device/pcap_dev.rs @@ -64,7 +64,7 @@ pub(super) fn get_by_device( AsyncCapture::new( cap.setnonblock().context("Failed to set nonblock")?, - |d| d.next().map_err(map_err).map(|p| p.to_vec()), + |d| d.next_packet().map_err(map_err).map(|p| p.to_vec()), |d, pkt| d.sendpacket(pkt).map_err(map_err), caps, ) diff --git a/protocol/ss/Cargo.toml b/protocol/ss/Cargo.toml index b3833074..43d13680 100644 --- a/protocol/ss/Cargo.toml +++ b/protocol/ss/Cargo.toml @@ -12,10 +12,10 @@ shadowsocks = { version = "=1.13.2", default-features = false, features = [ "stream-cipher", "aead-cipher-extra", ] } -serde = "1.0" -bytes = "1.0" -tracing = "0.1.26" -serde_json = "1.0" -tokio = { version = "1.5.0", features = ["rt"] } +serde = "1.0.183" +bytes = "1.4.0" +tracing = "0.1.37" +serde_json = "1.0.104" +tokio = { version = "1.29.1", features = ["rt"] } socks5-protocol = "0.3.5" -futures = "0.3" +futures = "0.3.28" diff --git a/protocol/trojan/Cargo.toml b/protocol/trojan/Cargo.toml index 809f56ec..44d34a43 100644 --- a/protocol/trojan/Cargo.toml +++ b/protocol/trojan/Cargo.toml @@ -7,12 +7,12 @@ edition = "2021" [dependencies] rd-interface = { path = "../../rd-interface/", version = "0.4" } rd-std = { path = "../../rd-std/", version = "0.1" } -serde = "1.0" -sha2 = "0.10.1" +serde = "1.0.183" +sha2 = "0.10.7" hex = "0.4.3" -socks5-protocol = "0.3.4" -futures = "0.3" -tokio = "1.0" +socks5-protocol = "0.3.5" +futures = "0.3.28" +tokio = "1.29.1" tokio-tungstenite = "0.20.0" -tokio-util = { version = "0.7.1", features = ["codec", "net"] } -bytes = "1.1.0" +tokio-util = { version = "0.7.8", features = ["codec", "net"] } +bytes = "1.4.0" diff --git a/rabbit-digger/Cargo.toml b/rabbit-digger/Cargo.toml index b3eea9b8..3bc3ffee 100644 --- a/rabbit-digger/Cargo.toml +++ b/rabbit-digger/Cargo.toml @@ -9,25 +9,25 @@ license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.38" +anyhow = "1.0.72" rd-interface = { path = "../rd-interface", version = "0.4" } rd-std = { path = "../rd-std", version = "0.1", optional = true } -futures = "0.3.5" -serde = { version = "1.0.119", features = ["rc"] } -tokio = { version = "1.12.0", features = ["full"] } -tracing = "0.1.26" -serde_json = "1.0" -uuid = { version = "1.3.0", features = ["v4", "serde"] } -topological-sort = "0.1" -parking_lot = "0.12.0" +futures = "0.3.28" +serde = { version = "1.0.183", features = ["rc"] } +tokio = { version = "1.29.1", features = ["full"] } +tracing = "0.1.37" +serde_json = "1.0.104" +uuid = { version = "1.4.1", features = ["v4", "serde"] } +topological-sort = "0.2.2" +parking_lot = "0.12.1" atomic-shim = "0.2.0" -dashmap = { version = "5.2.0", features = ["serde"] } +dashmap = { version = "5.5.0", features = ["serde"] } indexmap = { version = "2.0.0", features = ["serde"] } -tokio-stream = { version = "0.1.6", features = ["net", "sync", "time"] } +tokio-stream = { version = "0.1.14", features = ["net", "sync", "time"] } [dev-dependencies] -rusty-hook = "0.11.0" -tokio = { version = "1.5.0", features = ["macros"] } +rusty-hook = "0.11.2" +tokio = { version = "1.29.1", features = ["macros"] } [features] default = ["rd-std"] diff --git a/rd-derive/Cargo.toml b/rd-derive/Cargo.toml index 5fd4a5cd..8f3a3286 100644 --- a/rd-derive/Cargo.toml +++ b/rd-derive/Cargo.toml @@ -9,9 +9,9 @@ license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -syn = "2.0.27" +syn = "2.0.28" quote = "1.0.32" -proc-macro2 = "1.0" +proc-macro2 = "1.0.66" darling = "0.20.3" [lib] diff --git a/rd-std/Cargo.toml b/rd-std/Cargo.toml index b6a41c64..0d599074 100644 --- a/rd-std/Cargo.toml +++ b/rd-std/Cargo.toml @@ -10,40 +10,40 @@ license = "MIT OR Apache-2.0" # common rd-interface = { version = "0.4", path = "../rd-interface" } rd-derive = { version = "0.1", path = "../rd-derive" } -futures = "0.3" -serde = "1.0" -tracing = "0.1.26" -anyhow = "1.0" +futures = "0.3.28" +serde = "1.0.183" +tracing = "0.1.37" +anyhow = "1.0.72" tokio = { version = "1.29.1", features = ["net", "rt", "macros"] } -parking_lot = "0.12.0" -tokio-util = { version = "0.7.1", features = ["codec", "net"] } -pin-project-lite = "0.2.8" +parking_lot = "0.12.1" +tokio-util = { version = "0.7.8", features = ["codec", "net"] } +pin-project-lite = "0.2.11" itertools = "0.11.0" # socks5 -socks5-protocol = "0.3.2" +socks5-protocol = "0.3.5" # http -http = { version = "0.2.4", optional = true } -hyper = { version = "0.14.12", features = ["http1", "client", "server"] } +http = { version = "0.2.9", optional = true } +hyper = { version = "0.14.27", features = ["http1", "client", "server"] } # transparent -libc = "0.2.91" +libc = "0.2.147" socket2 = { version = "0.5.3", features = ["all"] } -cfg-if = "1.0" +cfg-if = "1.0.0" # rule -smoltcp = { version = "0.8.0", default-features = false, features = [ +smoltcp = { version = "0.10.0", default-features = false, features = [ "std", "proto-ipv4", "proto-ipv6", ] } -lru_time_cache = "0.11" -serde_with = "3.1.0" +lru_time_cache = "0.11.11" +serde_with = "3.2.0" maxminddb = "0.23.0" -flate2 = "1.0.20" -tar = "0.4.35" -once_cell = "1.7.2" +flate2 = "1.0.26" +tar = "0.4.40" +once_cell = "1.18.0" # dns trust-dns-proto = "0.21.1" @@ -55,13 +55,13 @@ tokio-rustls = { version = "0.24.1", features = [ ], optional = true } webpki-roots = { version = "0.25.1", optional = true } -openssl-crate = { package = "openssl", version = "0.10", features = [ +openssl-crate = { package = "openssl", version = "0.10.56", features = [ "vendored", ], optional = true } -tokio-openssl = { version = "0.6.1", optional = true } +tokio-openssl = { version = "0.6.3", optional = true } -tokio-native-tls = { version = "0.3.0", optional = true } -native-tls-crate = { package = "native-tls", version = "0.2", features = [ +tokio-native-tls = { version = "0.3.1", optional = true } +native-tls-crate = { package = "native-tls", version = "0.2.11", features = [ "vendored", ], optional = true } diff --git a/src/lib.rs b/src/lib.rs index f9747912..291c3d9f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -use anyhow::{Context, Result}; +use anyhow::Result; use config::ConfigManager; pub use rabbit_digger; use rabbit_digger::{RabbitDigger, Registry}; @@ -57,14 +57,16 @@ impl App { Ok(Self { rd, cfg_mgr }) } - pub async fn run_api_server(&self, api_server: ApiServer) -> Result<()> { + pub async fn run_api_server(&self, _api_server: ApiServer) -> Result<()> { #[cfg(feature = "api_server")] - if let Some(bind) = api_server.bind { + if let Some(bind) = _api_server.bind { + use anyhow::Context; + api_server::ApiServer { rabbit_digger: self.rd.clone(), config_manager: self.cfg_mgr.clone(), - access_token: api_server.access_token, - web_ui: api_server.web_ui, + access_token: _api_server.access_token, + web_ui: _api_server.web_ui, } .run(&bind) .await diff --git a/src/main.rs b/src/main.rs index 76405777..7962f6f6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -133,7 +133,7 @@ async fn main() -> Result<()> { cfg_if! { if #[cfg(feature = "telemetry")] { - let tracer = opentelemetry_jaeger::new_pipeline() + let tracer = opentelemetry_jaeger::new_agent_pipeline() .with_service_name("rabbit_digger_pro") .install_batch(opentelemetry::runtime::Tokio)?; // only for debug