diff --git a/Cargo.lock b/Cargo.lock index e25620f0..618137ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -428,22 +428,49 @@ version = "7.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "587d313f3a8b4a40f866cc84b6059fe83133bf172165ac3b583129dd211d8e1c" dependencies = [ - "amq-protocol-tcp", - "amq-protocol-types", - "amq-protocol-uri", + "amq-protocol-tcp 7.2.3", + "amq-protocol-types 7.2.3", + "amq-protocol-uri 7.2.3", "cookie-factory", "nom 7.1.3", "serde", ] +[[package]] +name = "amq-protocol" +version = "10.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63f30a81ad95c7a278080be6d993d5b3e971d93e1b00bd894067220fc756804" +dependencies = [ + "amq-protocol-tcp 10.6.3", + "amq-protocol-types 10.6.3", + "amq-protocol-uri 10.6.3", + "cookie-factory", + "nom 8.0.0", + "serde", +] + [[package]] name = "amq-protocol-tcp" version = "7.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc707ab9aa964a85d9fc25908a3fdc486d2e619406883b3105b48bf304a8d606" dependencies = [ - "amq-protocol-uri", - "tcp-stream", + "amq-protocol-uri 7.2.3", + "tcp-stream 0.28.0", + "tracing", +] + +[[package]] +name = "amq-protocol-tcp" +version = "10.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b1bcecdd743111f05c26294d26b887ba6b2e4789c27515aa48f0fe32066e96c" +dependencies = [ + "amq-protocol-uri 10.6.3", + "async-rs", + "cfg-if", + "tcp-stream 0.34.14", "tracing", ] @@ -459,13 +486,36 @@ dependencies = [ "serde_json", ] +[[package]] +name = "amq-protocol-types" +version = "10.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a268a50e97bd5d52292a8b96636f6436215def6f3d128fb8218318f5feb4c33" +dependencies = [ + "cookie-factory", + "nom 8.0.0", + "serde", + "serde_json", +] + [[package]] name = "amq-protocol-uri" version = "7.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f89f8273826a676282208e5af38461a07fe939def57396af6ad5997fcf56577d" dependencies = [ - "amq-protocol-types", + "amq-protocol-types 7.2.3", + "percent-encoding", + "url", +] + +[[package]] +name = "amq-protocol-uri" +version = "10.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a34581b010818ef3da6b5a853e94f6438b3903914baba77a15f7fb2c7ad8958" +dependencies = [ + "amq-protocol-types 10.6.3", "percent-encoding", "url", ] @@ -653,6 +703,19 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-compat" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ba85bc55464dcbf728b56d97e119d673f4cf9062be330a9a26f3acf504a590" +dependencies = [ + "futures-core", + "futures-io", + "once_cell", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-compression" version = "0.4.42" @@ -706,6 +769,7 @@ dependencies = [ "async-lock 3.4.2", "blocking", "futures-lite 2.6.1", + "tokio", ] [[package]] @@ -858,6 +922,22 @@ dependencies = [ "reactor-trait", ] +[[package]] +name = "async-rs" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f55b2bcef73a79a2feb5496478693077b60b7337896f0b72431cd5311d988a" +dependencies = [ + "async-compat", + "async-global-executor 3.1.0", + "async-trait", + "futures-core", + "futures-io", + "hickory-resolver", + "tokio", + "tokio-stream", +] + [[package]] name = "async-signal" version = "0.2.14" @@ -1751,6 +1831,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "critical-section" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" + [[package]] name = "crossbeam-channel" version = "0.5.15" @@ -1772,9 +1858,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f" dependencies = [ "crossbeam-utils", ] @@ -2049,7 +2135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e" dependencies = [ "async-trait", - "deadpool-runtime", + "deadpool-runtime 0.1.4", "num_cpus", "retain_mut", "tokio", @@ -2057,25 +2143,24 @@ dependencies = [ [[package]] name = "deadpool" -version = "0.12.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be2b1d1d6ec8d846f05e137292d0b89133caf95ef33695424c09568bdd39b1b" +checksum = "3e98a7e119cd347f4201e1159b19831029e203e2d8b790547708e8157b4acf1e" dependencies = [ - "deadpool-runtime", - "lazy_static", - "num_cpus", + "deadpool-runtime 0.3.1", "tokio", ] [[package]] name = "deadpool-lapin" -version = "0.12.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c7b14064f854a3969735e7c948c677a57ef17ca7f0bc029da8fe2e5e0fc1eb" +checksum = "698da04d7faa2dcf2735aa554da0e3c282c38f88ea66aa1251f5adcf16c8bbde" dependencies = [ - "deadpool 0.12.3", - "lapin", - "tokio-executor-trait", + "async-rs", + "deadpool 0.13.1", + "lapin 4.10.0", + "thiserror 2.0.18", ] [[package]] @@ -2083,6 +2168,12 @@ name = "deadpool-runtime" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" + +[[package]] +name = "deadpool-runtime" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2657f61fb1dd8bf37a8d51093cc7cee4e77125b22f7753f49b289f831bec2bae" dependencies = [ "tokio", ] @@ -2713,6 +2804,17 @@ dependencies = [ "spin 0.9.8", ] +[[package]] +name = "flume" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -3210,6 +3312,76 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1" +[[package]] +name = "hickory-net" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2295ed2f9c31e471e1428a8f88a3f0e1f4b27c15049592138d1eebe9c35b183" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "futures-channel", + "futures-io", + "futures-util", + "hickory-proto", + "idna", + "ipnet", + "jni", + "rand 0.10.1", + "thiserror 2.0.18", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-proto" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bab31817bfb44672a252e97fe81cd0c18d1b2cf892108922f6818820df8c643" +dependencies = [ + "data-encoding", + "idna", + "ipnet", + "jni", + "once_cell", + "prefix-trie", + "rand 0.10.1", + "ring", + "thiserror 2.0.18", + "tinyvec", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d58d28879ceecde6607729660c2667a081ccdc082e082675042793960f178c" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-net", + "hickory-proto", + "ipconfig", + "ipnet", + "jni", + "moka", + "ndk-context", + "once_cell", + "parking_lot", + "rand 0.10.1", + "resolv-conf", + "smallvec", + "system-configuration 0.7.0", + "thiserror 2.0.18", + "tokio", + "tracing", +] + [[package]] name = "hkdf" version = "0.12.4" @@ -3738,11 +3910,27 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "ipconfig" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d40460c0ce33d6ce4b0630ad68ff63d6661961c48b6dba35e5a4d81cfb48222" +dependencies = [ + "socket2 0.6.3", + "widestring", + "windows-registry", + "windows-result", + "windows-sys 0.61.2", +] + [[package]] name = "ipnet" version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" +dependencies = [ + "serde", +] [[package]] name = "ipnetwork" @@ -3803,6 +3991,55 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +[[package]] +name = "jni" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" +dependencies = [ + "cfg-if", + "combine", + "jni-macros", + "jni-sys", + "log", + "simd_cesu8", + "thiserror 2.0.18", + "walkdir", + "windows-link", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "simd_cesu8", + "syn 2.0.117", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn 2.0.117", +] + [[package]] name = "jobserver" version = "0.1.34" @@ -3877,12 +4114,12 @@ version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02d2aa4725b9607915fa1a73e940710a3be6af508ce700e56897cbe8847fbb07" dependencies = [ - "amq-protocol", + "amq-protocol 7.2.3", "async-global-executor-trait", "async-reactor-trait", "async-trait", "executor-trait", - "flume", + "flume 0.11.1", "futures-core", "futures-io", "parking_lot", @@ -3894,6 +4131,24 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "lapin" +version = "4.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fd20e01fd92597ca352ca7ceed3c589851ebad279dfcada48aa4d24fd3a7caa" +dependencies = [ + "amq-protocol 10.6.3", + "async-rs", + "async-trait", + "backon", + "cfg-if", + "event-listener 5.4.1", + "flume 0.12.0", + "futures-core", + "futures-io", + "tracing", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -4202,6 +4457,23 @@ dependencies = [ "num-traits", ] +[[package]] +name = "moka" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4293f18e7567a1caf3c584855554377025c65e0aa445344d04171f5ad63d19b9" +dependencies = [ + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "equivalent", + "parking_lot", + "portable-atomic", + "smallvec", + "tagptr", + "uuid", +] + [[package]] name = "multimap" version = "0.10.1" @@ -4231,6 +4503,12 @@ dependencies = [ "tempfile", ] +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + [[package]] name = "nix" version = "0.31.3" @@ -4390,6 +4668,7 @@ version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" dependencies = [ + "critical-section", "portable-atomic", ] @@ -4861,7 +5140,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1ea6e230dd3a64d61bcb8b79e597d3ab6b4c94ec7a234ce687dd718b4f2e657" dependencies = [ "doc-comment", - "flume", + "flume 0.11.1", "parking_lot", "tracing", ] @@ -5132,6 +5411,17 @@ dependencies = [ "termtree", ] +[[package]] +name = "prefix-trie" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cf6e3177f0684016a5c209b00882e15f8bdd3f3bb48f0491df10cd102d0c6e7" +dependencies = [ + "either", + "ipnet", + "num-traits", +] + [[package]] name = "prettyplease" version = "0.2.37" @@ -5673,7 +5963,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tokio-util", @@ -5686,6 +5976,12 @@ dependencies = [ "winreg", ] +[[package]] +name = "resolv-conf" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" + [[package]] name = "retain_mut" version = "0.1.9" @@ -6505,6 +6801,22 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +[[package]] +name = "simd_cesu8" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" +dependencies = [ + "rustc_version", + "simdutf8", +] + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + [[package]] name = "similar" version = "2.7.0" @@ -6884,7 +7196,7 @@ checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" dependencies = [ "atoi", "chrono", - "flume", + "flume 0.11.1", "futures-channel", "futures-core", "futures-executor", @@ -7048,7 +7360,7 @@ dependencies = [ "hmac 0.12.1", "indexmap 2.14.0", "indicatif", - "lapin", + "lapin 2.5.5", "lazy_static", "mockito", "pipe-adapter-mail", @@ -7221,7 +7533,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation 0.9.4", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" +dependencies = [ + "bitflags 2.11.0", + "core-foundation 0.9.4", + "system-configuration-sys 0.6.0", ] [[package]] @@ -7234,6 +7557,16 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tagptr" version = "0.2.0" @@ -7269,6 +7602,17 @@ dependencies = [ "rustls-pemfile 2.2.0", ] +[[package]] +name = "tcp-stream" +version = "0.34.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "300d0735de48a565461c2ea14cc75b80ee5b6be3b4f5aeabe3553e4c2df8d23d" +dependencies = [ + "async-rs", + "cfg-if", + "futures-io", +] + [[package]] name = "td-audit" version = "0.1.0" @@ -7495,17 +7839,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "tokio-executor-trait" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6278565f9fd60c2d205dfbc827e8bb1236c2b1a57148708e95861eff7a6b3bad" -dependencies = [ - "async-trait", - "executor-trait", - "tokio", -] - [[package]] name = "tokio-io-timeout" version = "1.2.1" @@ -8281,6 +8614,12 @@ dependencies = [ "wasite", ] +[[package]] +name = "widestring" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471" + [[package]] name = "winapi" version = "0.3.9" @@ -8395,6 +8734,17 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +dependencies = [ + "windows-link", + "windows-result", + "windows-strings", +] + [[package]] name = "windows-result" version = "0.4.1" diff --git a/Cargo.toml b/Cargo.toml index 38ff4db2..080f136d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,7 +84,7 @@ indicatif = "0.17" brotli = "3.4.0" serde_path_to_error = "0.1.14" zstd = "0.13" -deadpool-lapin = "0.12.1" +deadpool-lapin = "0.14.0" docker-compose-types = "0.7.0" actix-casbin-auth = { git = "https://github.com/casbin-rs/actix-casbin-auth.git"} casbin = "2.2.0"