diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9f3a4df..2809d5c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,14 +7,21 @@ on: - "v*" jobs: - build: + build_plugin: uses: ministruth/.github/.github/workflows/build.yml@main with: prefix: plugin upload: true + publish_crate: + needs: build_plugin + uses: ministruth/.github/.github/workflows/publish.yml@main + secrets: inherit + with: + dir: agent_api + release: - needs: build + needs: build_plugin uses: ministruth/.github/.github/workflows/release.yml@main with: prefix: plugin diff --git a/CHANGELOG.md b/CHANGELOG.md index fe12462..61c0b4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v0.6.0 +## Changes +1. Dependency upgrade, `skynet_api` version 0.3. + # v0.5.0 ## Changes 1. Dependency upgrade, `skynet_api` version 0.2. diff --git a/Cargo.lock b/Cargo.lock index 415b81b..e418477 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,14 +2,61 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "abi_stable" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d6512d3eb05ffe5004c59c206de7f99c34951504056ce23fc953842f12c445" +dependencies = [ + "abi_stable_derive", + "abi_stable_shared", + "const_panic", + "core_extensions", + "crossbeam-channel", + "generational-arena", + "libloading", + "lock_api", + "parking_lot", + "paste", + "repr_offset", + "rustc_version", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "abi_stable_derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7178468b407a4ee10e881bc7a328a65e739f0863615cca4429d43916b05e898" +dependencies = [ + "abi_stable_shared", + "as_derive_utils", + "core_extensions", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", + "typed-arena", +] + +[[package]] +name = "abi_stable_shared" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b5df7688c123e63f4d4d649cba63f2967ba7f7861b1664fca3f77d3dad2b63" +dependencies = [ + "core_extensions", +] + [[package]] name = "actix-cloud" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e95ed6c4ea163abaf07838a79b48a22532efcecc70c3bd1b5c2ecda9131de12" +checksum = "8f50ebf7ae094813319a9e9683f50f3379f1ab038547d176d04e528fb62b9707" dependencies = [ "actix-cloud-codegen", - "actix-utils", "actix-web", "anyhow", "async-trait", @@ -18,14 +65,10 @@ dependencies = [ "config", "enum-as-inner", "futures", - "glob", "hex", "parking_lot", "qstring", "rand", - "redis", - "rustls", - "rustls-pemfile", "serde", "serde_json", "serde_with", @@ -43,8 +86,7 @@ checksum = "4efe64076898cdfc372ac0dab7d6de5668b3d4693bca0e35424b2f93838ed0c0" dependencies = [ "proc-macro2", "quote", - "rust-i18n-support", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -73,7 +115,6 @@ dependencies = [ "actix-codec", "actix-rt", "actix-service", - "actix-tls", "actix-utils", "ahash 0.8.11", "base64 0.22.1", @@ -111,7 +152,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -167,25 +208,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "actix-tls" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac453898d866cdbecdbc2334fe1738c747b4eba14a677261f2b768ba05329389" -dependencies = [ - "actix-rt", - "actix-service", - "actix-utils", - "futures-core", - "impl-more", - "pin-project-lite", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tokio-util", - "tracing", -] - [[package]] name = "actix-utils" version = "3.0.1" @@ -209,7 +231,6 @@ dependencies = [ "actix-rt", "actix-server", "actix-service", - "actix-tls", "actix-utils", "actix-web-codegen", "ahash 0.8.11", @@ -248,7 +269,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -303,16 +324,17 @@ dependencies = [ [[package]] name = "agent" -version = "0.5.0" +version = "0.6.0" dependencies = [ + "abi_stable", "actix-cloud", "aes-gcm", "base64 0.22.1", "byte-unit", - "bytes", "clap", "crc32fast", "derivative", + "ecies", "hex", "machine-uid", "miniz_oxide", @@ -347,8 +369,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "const-random", "getrandom", "once_cell", + "serde", "version_check", "zerocopy", ] @@ -385,9 +409,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" [[package]] name = "android-tzdata" @@ -455,15 +479,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "arraydeque" @@ -483,6 +501,39 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +[[package]] +name = "as_derive_utils" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff3c96645900a44cf11941c111bd08a6573b0e2f9f69bc9264b179d8fae753c4" +dependencies = [ + "core_extensions", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "async-ffi" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4de21c0feef7e5a556e51af767c953f0501f7f300ba785cc99c47bdc8081a50" +dependencies = [ + "abi_stable", + "async-ffi-macros", +] + +[[package]] +name = "async-ffi-macros" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfca27fc54e6a22790dbc90b1ffe3c0cff0008976035bb4123408f862a452d29" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "async-stream" version = "0.3.6" @@ -502,7 +553,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -513,7 +564,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -531,33 +582,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" -[[package]] -name = "aws-lc-rs" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d" -dependencies = [ - "aws-lc-sys", - "mirai-annotations", - "paste", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972" -dependencies = [ - "bindgen", - "cc", - "cmake", - "dunce", - "fs_extra", - "libc", - "paste", -] - [[package]] name = "backtrace" version = "0.3.74" @@ -573,12 +597,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "base62" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f879ef8fc74665ed7f0e6127cb106315888fc2744f68e14b74f83edbb2a08992" - [[package]] name = "base64" version = "0.13.1" @@ -624,26 +642,12 @@ dependencies = [ ] [[package]] -name = "bindgen" -version = "0.69.5" +name = "bincode" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.87", - "which", + "serde", ] [[package]] @@ -693,9 +697,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03" dependencies = [ "borsh-derive", "cfg_aliases", @@ -703,16 +707,15 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244" dependencies = [ "once_cell", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.87", - "syn_derive", + "syn 2.0.89", ] [[package]] @@ -736,16 +739,6 @@ dependencies = [ "alloc-stdlib", ] -[[package]] -name = "bstr" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "bumpalo" version = "3.16.0" @@ -796,36 +789,31 @@ name = "bytes" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +dependencies = [ + "serde", +] [[package]] name = "bytestring" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" +checksum = "e465647ae23b2823b0753f50decb2d5a86d2bb2cac04788fafd1f80e45378e5f" dependencies = [ "bytes", + "serde", ] [[package]] name = "cc" -version = "1.1.35" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57c4b4da2a9d619dd035f27316d7a426305b75be93d09e92f2b9229c34feaf" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", "shlex", ] -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -863,22 +851,11 @@ dependencies = [ "inout", ] -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -886,9 +863,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -905,23 +882,14 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" - -[[package]] -name = "cmake" -version = "0.1.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" -dependencies = [ - "cc", -] +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "colorchoice" @@ -939,20 +907,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", - "tokio-util", -] - [[package]] name = "concurrent-queue" version = "2.5.0" @@ -977,7 +931,7 @@ dependencies = [ "rust-ini", "serde", "serde_json", - "toml 0.8.19", + "toml", "yaml-rust2", ] @@ -1007,6 +961,12 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "const_panic" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "013b6c2c3a14d678f38cd23994b02da3a1a1b6a5d1eedddfe63a5a5f11b13a81" + [[package]] name = "convert_case" version = "0.4.0" @@ -1041,26 +1001,31 @@ dependencies = [ ] [[package]] -name = "core-foundation" -version = "0.9.4" +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "core_extensions" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +checksum = "92c71dc07c9721607e7a16108336048ee978c3a8b129294534272e8bac96c0ee" dependencies = [ - "core-foundation-sys", - "libc", + "core_extensions_proc_macros", ] [[package]] -name = "core-foundation-sys" -version = "0.8.7" +name = "core_extensions_proc_macros" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +checksum = "69f3b219d28b6e3b4ac87bc1fc522e0803ab22e055da177bff0068c4150c61a6" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1095,6 +1060,15 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -1176,7 +1150,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1187,7 +1161,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1232,7 +1206,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1264,7 +1238,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1288,12 +1262,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - [[package]] name = "ecies" version = "0.2.7" @@ -1339,7 +1307,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1349,6 +1317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" dependencies = [ "enum-map-derive", + "serde", ] [[package]] @@ -1359,7 +1328,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1402,9 +1371,33 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" + +[[package]] +name = "ffi_rpc" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09de38aa746817c47c25da1b6522e60f3ea507339eade2fda706e4e1eb87a9d4" +dependencies = [ + "abi_stable", + "async-ffi", + "async-trait", + "bincode", + "ffi_rpc_macro", +] + +[[package]] +name = "ffi_rpc_macro" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e9403e119fc7d6b3d8d75ba5400085c856db3ac05d05581babea5d7c2ff4da" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] [[package]] name = "filedescriptor" @@ -1425,9 +1418,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -1441,7 +1434,7 @@ checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "futures-core", "futures-sink", - "spin", + "spin 0.9.8", ] [[package]] @@ -1459,12 +1452,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "funty" version = "2.0.0" @@ -1538,7 +1525,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1571,6 +1558,15 @@ dependencies = [ "slab", ] +[[package]] +name = "generational-arena" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7" +dependencies = [ + "cfg-if", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -1610,36 +1606,6 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.8", - "regex-syntax 0.8.5", -] - -[[package]] -name = "globwalk" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" -dependencies = [ - "bitflags 1.3.2", - "ignore", - "walkdir", -] - [[package]] name = "h2" version = "0.3.26" @@ -1680,9 +1646,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "hashlink" @@ -1914,7 +1880,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1954,22 +1920,6 @@ dependencies = [ "icu_properties", ] -[[package]] -name = "ignore" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.8", - "same-file", - "walkdir", - "winapi-util", -] - [[package]] name = "impl-more" version = "0.1.8" @@ -1994,7 +1944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "serde", ] @@ -2006,7 +1956,7 @@ checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2018,6 +1968,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 = "ioctl-rs" version = "0.1.6" @@ -2033,15 +1992,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[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" @@ -2062,9 +2012,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" @@ -2116,29 +2066,23 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin", + "spin 0.9.8", ] -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" -version = "0.2.161" +version = "0.2.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" [[package]] name = "libloading" -version = "0.8.5" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "winapi", ] [[package]] @@ -2204,12 +2148,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "libyml" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64804cc6a5042d4f05379909ba25b503ec04e2c082151d62122d5dcaa274b961" - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -2218,9 +2156,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "local-channel" @@ -2265,15 +2203,6 @@ dependencies = [ "winreg 0.52.0", ] -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - [[package]] name = "md-5" version = "0.10.6" @@ -2333,12 +2262,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "mirai-annotations" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" - [[package]] name = "multimap" version = "0.10.0" @@ -2366,22 +2289,22 @@ dependencies = [ ] [[package]] -name = "nom" -version = "7.1.3" +name = "no-std-compat" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" dependencies = [ - "memchr", - "minimal-lexical", + "spin 0.5.2", ] [[package]] -name = "normpath" -version = "1.3.0" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ - "windows-sys 0.59.0", + "memchr", + "minimal-lexical", ] [[package]] @@ -2491,12 +2414,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - [[package]] name = "ordered-float" version = "3.9.2" @@ -2538,7 +2455,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2590,9 +2507,9 @@ checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" [[package]] name = "pathdiff" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] name = "pem-rfc7468" @@ -2640,7 +2557,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2681,7 +2598,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2737,9 +2654,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "portable-pty" @@ -2784,7 +2701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2793,7 +2710,7 @@ 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]] @@ -2839,14 +2756,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -2859,7 +2776,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "version_check", "yansi", ] @@ -2891,7 +2808,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.87", + "syn 2.0.89", "tempfile", ] @@ -2905,7 +2822,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3011,36 +2928,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redis" -version = "0.27.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cccf17a692ce51b86564334614d72dcae1def0fd5ecebc9f02956da74352b5" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "combine", - "futures", - "futures-util", - "itoa", - "num-bigint", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-native-certs", - "rustls-pemfile", - "rustls-pki-types", - "ryu", - "sha1_smol", - "socket2", - "tokio", - "tokio-retry2", - "tokio-rustls", - "tokio-util", - "url", -] - [[package]] name = "redox_syscall" version = "0.5.7" @@ -3058,28 +2945,19 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax", ] [[package]] @@ -3088,12 +2966,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.5" @@ -3106,7 +2978,45 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ - "bytecheck", + "bytecheck", +] + +[[package]] +name = "repr_offset" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1070755bd29dffc19d0971cab794e607839ba2ef4b69a9e6fbc8733c1b72ea" +dependencies = [ + "tstr", +] + +[[package]] +name = "rhai" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8867cfc57aaf2320b60ec0f4d55603ac950ce852e6ab6b9109aa3d626a4dd7ea" +dependencies = [ + "ahash 0.8.11", + "bitflags 2.6.0", + "instant", + "no-std-compat", + "num-traits", + "once_cell", + "rhai_codegen", + "smallvec", + "smartstring", + "thin-vec", +] + +[[package]] +name = "rhai_codegen" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] @@ -3119,7 +3029,7 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin", + "spin 0.9.8", "untrusted", "windows-sys 0.52.0", ] @@ -3167,9 +3077,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" dependencies = [ "const-oid", "digest 0.10.7", @@ -3185,29 +3095,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rust-i18n-support" -version = "3.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75d2844d36f62b5d6b66f9cf8f8cbdbbbdcdb5fd37a473a9cc2fb45fdcf485d2" -dependencies = [ - "arc-swap", - "base62", - "globwalk", - "itertools 0.11.0", - "lazy_static", - "normpath", - "once_cell", - "proc-macro2", - "regex", - "serde", - "serde_json", - "serde_yml", - "siphasher", - "toml 0.7.8", - "triomphe", -] - [[package]] name = "rust-ini" version = "0.20.0" @@ -3240,12 +3127,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc_version" version = "0.4.1" @@ -3257,9 +3138,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.39" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -3270,12 +3151,10 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.16" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ - "aws-lc-rs", - "log", "once_cell", "ring", "rustls-pki-types", @@ -3284,19 +3163,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-pemfile" version = "2.2.0" @@ -3318,7 +3184,6 @@ version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ - "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -3339,15 +3204,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" -dependencies = [ - "windows-sys 0.59.0", -] - [[package]] name = "scopeguard" version = "1.2.0" @@ -3364,7 +3220,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3395,23 +3251,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "sea-orm-cli" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a157f42d291ccbd6e913b9d9b12dbe2ccbcf0472efc60c8715dd1254083aec" -dependencies = [ - "chrono", - "clap", - "dotenvy", - "glob", - "regex", - "sea-schema", - "tracing", - "tracing-subscriber", - "url", -] - [[package]] name = "sea-orm-macros" version = "1.1.1" @@ -3422,27 +3261,10 @@ dependencies = [ "proc-macro2", "quote", "sea-bae", - "syn 2.0.87", + "syn 2.0.89", "unicode-ident", ] -[[package]] -name = "sea-orm-migration" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ba07e9f2479cc671758fcb1edee42ff2e32c34b3e67ab41d0af1e41f73c74e" -dependencies = [ - "async-trait", - "clap", - "dotenvy", - "futures", - "sea-orm", - "sea-orm-cli", - "sea-schema", - "tracing", - "tracing-subscriber", -] - [[package]] name = "sea-query" version = "0.32.0" @@ -3454,7 +3276,6 @@ dependencies = [ "inherent", "ordered-float", "rust_decimal", - "sea-query-derive", "serde_json", "time", "uuid", @@ -3476,72 +3297,12 @@ dependencies = [ "uuid", ] -[[package]] -name = "sea-query-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9834af2c4bd8c5162f00c89f1701fb6886119a88062cf76fe842ea9e232b9839" -dependencies = [ - "darling", - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.87", - "thiserror", -] - -[[package]] -name = "sea-schema" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab1592d17860a9a8584d9b549aebcd06f7bdc3ff615f71752486ba0b05b1e6e" -dependencies = [ - "futures", - "sea-query", - "sea-schema-derive", -] - -[[package]] -name = "sea-schema-derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debdc8729c37fdbf88472f97fd470393089f997a909e535ff67c544d18cfccf0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.87", -] - [[package]] name = "seahash" version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "self-replace" version = "1.5.0" @@ -3558,12 +3319,15 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] [[package]] name = "serde" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -3576,25 +3340,25 @@ checksum = "b3acbd21cb24261fc36f595b38d3b34d0ff4e31a6b42edd6a43387d27c5787c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -3610,7 +3374,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3661,24 +3425,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.87", -] - -[[package]] -name = "serde_yml" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e76bab63c3fd98d27c17f9cbce177f64a91f5e69ac04cafe04e1bb25d1dc3c" -dependencies = [ - "indexmap 2.6.0", - "itoa", - "libyml", - "log", - "memchr", - "ryu", - "serde", - "serde_json", - "tempfile", + "syn 2.0.89", ] [[package]] @@ -3734,12 +3481,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha1_smol" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" - [[package]] name = "sha2" version = "0.9.9" @@ -3830,63 +3571,62 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - [[package]] name = "skynet_api" -version = "0.2.10" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b667c1914b4e19b6e041a52d79eeff11b68d65a6cfe9134d3ad8405127f9a170" +checksum = "4e1973a6bcbba75dafd1ee53e72c4b70d6ed46655de091b1ce694f8d70f49614" dependencies = [ "actix-cloud", "actix-cloud-codegen", + "ahash 0.8.11", "anyhow", + "async-trait", + "bytes", + "bytestring", "chrono", "derivative", "enum-as-inner", "enum-map", - "paste", - "rustls", + "ffi_rpc", + "parking_lot", + "rhai", "sea-orm", - "sea-orm-migration", - "semver", "serde", "serde-inline-default", + "serde_json", "serde_repr", "serde_with", - "skynet_macro", + "thiserror", "uuid", "validator", ] [[package]] name = "skynet_api_agent" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25234b945ec94a8266ed106c0deaa6e1f57b080a19f72dcdb0f778f041d90d6" +version = "0.5.3" dependencies = [ "enum-as-inner", + "ffi_rpc", + "semver", + "serde", + "serde_repr", "skynet_api", - "version-compare", ] [[package]] name = "skynet_api_monitor" -version = "0.4.7" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2bca9e0dedb50fb78cccf8167faf6992291a3b8b26c768eab49d62a7995f32" +checksum = "b252b6c11ebd14f4d4ed9795a0bb52a5e24810470461d27c4854dcd3d310d568" dependencies = [ "actix-cloud", "derivative", - "ecies", "enum-as-inner", - "parking_lot", + "ffi_rpc", "prost", "prost-build", + "semver", "serde", "serde_repr", "skynet_api", @@ -3896,12 +3636,12 @@ dependencies = [ [[package]] name = "skynet_macro" -version = "0.2.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536209336ee6e3f77f8783549bc080ede38dab1c79018d056b8df99cd1218bf1" +checksum = "c3f816055fed6b68f04f0dfb025745020d9264c624f8506a774c716e14f2e320" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3922,16 +3662,33 @@ dependencies = [ "serde", ] +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "static_assertions", + "version_check", +] + [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spin" version = "0.9.8" @@ -4031,7 +3788,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4054,7 +3811,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 2.0.87", + "syn 2.0.89", "tempfile", "tokio", "url", @@ -4241,27 +3998,15 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.87", -] - [[package]] name = "synstructure" version = "0.13.1" @@ -4270,14 +4015,14 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "sysinfo" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791" +checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af" dependencies = [ "core-foundation-sys", "libc", @@ -4295,9 +4040,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -4315,24 +4060,30 @@ dependencies = [ "libc", ] +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" + [[package]] name = "thiserror" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4412,9 +4163,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -4436,29 +4187,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", -] - -[[package]] -name = "tokio-retry2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903934dba1c4c2f2e9cb460ef10b5695e0b0ecad3bf9ee7c8675e540c5e8b2d1" -dependencies = [ - "pin-project", - "rand", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", + "syn 2.0.89", ] [[package]] @@ -4485,18 +4214,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - [[package]] name = "toml" version = "0.8.19" @@ -4506,7 +4223,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.22", + "toml_edit", ] [[package]] @@ -4518,19 +4235,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", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.22" @@ -4541,14 +4245,14 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.20", + "winnow", ] [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -4558,9 +4262,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b87073920bcce23e9f5cb0d2671e9f01d6803bb5229c159b2f5ce6806d73ffc" +checksum = "54a9f5c1aca50ebebf074ee665b9f99f2e84906dcf6b993a0d0090edb835166d" dependencies = [ "actix-web", "mutually_exclusive_features", @@ -4571,20 +4275,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -4617,33 +4321,39 @@ version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "matchers", "nu-ansi-term", - "once_cell", "parking_lot", - "regex", "serde", "serde_json", "sharded-slab", "smallvec", "thread_local", - "tracing", "tracing-core", "tracing-log", "tracing-serde", ] [[package]] -name = "triomphe" -version = "0.1.14" +name = "tstr" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" +checksum = "7f8e0294f14baae476d0dd0a2d780b2e24d66e349a9de876f5126777a37bdba7" dependencies = [ - "arc-swap", - "serde", - "stable_deref_trait", + "tstr_proc_macros", ] +[[package]] +name = "tstr_proc_macros" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78122066b0cb818b8afd08f7ed22f7fdbc3e90815035726f0840d0d26c0747a" + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + [[package]] name = "typenum" version = "1.17.0" @@ -4664,9 +4374,9 @@ checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -4713,9 +4423,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna 1.0.3", @@ -4766,7 +4476,7 @@ checksum = "6b91f57fe13a38d0ce9e28a03463d8d3c2468ed03d75375110ec71d93b449a08" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4796,7 +4506,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4811,12 +4521,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - [[package]] name = "version_check" version = "0.9.5" @@ -4867,7 +4571,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "wasm-bindgen-shared", ] @@ -4889,7 +4593,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4902,25 +4606,13 @@ checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "webpki-roots" -version = "0.26.6" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "whoami" version = "1.5.2" @@ -5001,7 +4693,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5012,7 +4704,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5172,15 +4864,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" @@ -5249,9 +4932,9 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -5261,13 +4944,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure", ] @@ -5289,27 +4972,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure", ] @@ -5338,7 +5021,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 7fe0f32..91afd60 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,35 +1,4 @@ -[package] -name = "agent" -version = "0.5.0" -edition = "2021" -authors = ["MXWXZ "] - -[dependencies] -parking_lot = "0.12" -clap = { version = "4.5", features = ["derive"] } -derivative = "2.2" -sysinfo = "0.32" -byte-unit = "5.1" -machine-uid = "0.5" -sha3 = "0.10" -hex = "0.4" -base64 = "0.22" -crc32fast = "1.4" -self-replace = "1.5" -miniz_oxide = "0.8" -portable-pty = "0.8" -thiserror = "1.0" -aes-gcm = "0.10" -bytes = "1.8" -subprocess = "0.2" -path-clean = "1.0" - -actix-cloud = { version = "0.4", default-features = false } -skynet_api_monitor = "0.4" -skynet_api_agent = "0.4" -skynet_api = { version = "0.2", features = ["plugin"] } - -[lib] -crate-type = ["cdylib"] - [workspace] + +members = ["agent_api", "agent"] +resolver = "2" diff --git a/agent/Cargo.toml b/agent/Cargo.toml new file mode 100644 index 0000000..ba1d110 --- /dev/null +++ b/agent/Cargo.toml @@ -0,0 +1,37 @@ +[package] +name = "agent" +version = "0.6.0" +edition = "2021" +authors = ["MXWXZ "] + +[dependencies] +parking_lot = "0.12" +clap = { version = "4.5", features = ["derive"] } +derivative = "2.2" +sysinfo = "0.32" +byte-unit = "5.1" +machine-uid = "0.5" +sha3 = "0.10" +hex = "0.4" +base64 = "0.22" +crc32fast = "1.4" +self-replace = "1.5" +miniz_oxide = "0.8" +portable-pty = "0.8" +thiserror = "1.0" +aes-gcm = "0.10" +subprocess = "0.2" +path-clean = "1.0" +ecies = { version = "0.2", default-features = false, features = [ + "std", + "pure", +] } +abi_stable = "0.11" + +actix-cloud = { version = "0.4", default-features = false } +skynet_api_monitor = "0.5" +skynet_api_agent = { version = "0.5", path = "../agent_api" } +skynet_api = { version = "0.3", features = ["plugin-api"] } + +[lib] +crate-type = ["cdylib"] diff --git a/src/client.rs b/agent/src/client.rs similarity index 97% rename from src/client.rs rename to agent/src/client.rs index 47081c0..aafa9b2 100644 --- a/src/client.rs +++ b/agent/src/client.rs @@ -18,14 +18,15 @@ use actix_cloud::{ }, tracing::{debug, error, info, info_span, warn, Instrument}, }; +use ecies::PublicKey; use miniz_oxide::inflate::decompress_to_vec; use path_clean::clean; -use skynet_api::{anyhow, bail, HyUuid, Result}; +use skynet_api::{anyhow::anyhow, bail, HyUuid, Result}; use skynet_api_monitor::{ - ecies::PublicKey, message::Data, CommandKillMessage, CommandReqMessage, FileReqMessage, - FileRspMessage, HandshakeStatus, InfoMessage, Message, ShellConnectMessage, - ShellDisconnectMessage, ShellErrorMessage, ShellInputMessage, ShellResizeMessage, - StatusReqMessage, StatusRspMessage, UpdateMessage, + message::Data, CommandKillMessage, CommandReqMessage, FileReqMessage, FileRspMessage, + HandshakeStatus, InfoMessage, Message, ShellConnectMessage, ShellDisconnectMessage, + ShellErrorMessage, ShellInputMessage, ShellResizeMessage, StatusReqMessage, StatusRspMessage, + UpdateMessage, }; use sysinfo::{CpuRefreshKind, Disks, MemoryRefreshKind, Networks, RefreshKind, System}; diff --git a/src/command.rs b/agent/src/command.rs similarity index 100% rename from src/command.rs rename to agent/src/command.rs diff --git a/agent/src/lib.rs b/agent/src/lib.rs new file mode 100644 index 0000000..1c54a22 --- /dev/null +++ b/agent/src/lib.rs @@ -0,0 +1,55 @@ +use std::{path::PathBuf, sync::OnceLock}; + +use skynet_api::{ + ffi_rpc::{ + self, + abi_stable::prefix_type::PrefixTypeTrait, + async_ffi, async_trait, bincode, + ffi_rpc_macro::{ + plugin_impl_call, plugin_impl_instance, plugin_impl_root, plugin_impl_trait, + }, + registry::Registry, + }, + plugin::{PluginError, PluginStatus, Request, Response}, + request::Router, + service::SResult, + Skynet, +}; + +mod service; + +#[plugin_impl_instance(|| Plugin{ + path: Default::default(), +})] +#[plugin_impl_root] +#[plugin_impl_call(skynet_api::plugin::api::PluginApi, skynet_api_agent::Service)] +struct Plugin { + path: OnceLock, +} + +#[plugin_impl_trait] +impl skynet_api::plugin::api::PluginApi for Plugin { + async fn on_load( + &self, + _: &Registry, + skynet: Skynet, + runtime_path: PathBuf, + ) -> SResult { + let _ = self.path.set(runtime_path); + Ok(skynet) + } + + async fn on_register(&self, _: &Registry, _skynet: Skynet, r: Vec) -> Vec { + r + } + + async fn on_route(&self, _: &Registry, _name: String, _req: Request) -> SResult { + Err(PluginError::NoSuchRoute.into()) + } + + async fn on_translate(&self, _: &Registry, str: String, _lang: String) -> String { + str + } + + async fn on_unload(&self, _: &Registry, _status: PluginStatus) {} +} diff --git a/src/logger.rs b/agent/src/logger.rs similarity index 100% rename from src/logger.rs rename to agent/src/logger.rs diff --git a/src/main.rs b/agent/src/main.rs similarity index 99% rename from src/main.rs rename to agent/src/main.rs index 8348b42..4f4f4d1 100644 --- a/src/main.rs +++ b/agent/src/main.rs @@ -3,9 +3,9 @@ use base64::{engine::general_purpose::STANDARD, Engine}; use byte_unit::{Byte, UnitType}; use clap::{command, Args, Parser, Subcommand}; use client::run; +use ecies::PublicKey; use logger::start_logger; use sha3::{digest::ExtendableOutput, Shake256}; -use skynet_api_monitor::ecies::PublicKey; use std::{ env::consts, fs::{self, create_dir_all}, diff --git a/agent/src/service.rs b/agent/src/service.rs new file mode 100644 index 0000000..9eb7b22 --- /dev/null +++ b/agent/src/service.rs @@ -0,0 +1,48 @@ +use std::{fs, path::PathBuf}; + +use skynet_api::ffi_rpc::{ + self, async_trait, bincode, ffi_rpc_macro::plugin_impl_trait, registry::Registry, +}; +use skynet_api_agent::{semver::Version, Arch, System}; + +use crate::{Plugin, PLUGIN_INSTANCE}; + +#[plugin_impl_trait] +impl skynet_api_agent::Service for Plugin { + async fn api_version(&self, _: &Registry) -> Version { + Version::parse(skynet_api_agent::VERSION).unwrap() + } + + async fn check_version(&self, _: &Registry, v: String) -> bool { + let v = if let Ok(v) = Version::parse(&v) { + v + } else { + return false; + }; + + Version::parse(env!("CARGO_PKG_VERSION")).unwrap() > v + } + + async fn get_binary_name(&self, _: &Registry, sys: System, arch: Arch) -> PathBuf { + let suffix = if sys.is_windows() { ".exe" } else { "" }; + PLUGIN_INSTANCE + .path + .get() + .unwrap() + .join("bin") + .join(format!("agent_{sys}_{arch}{suffix}")) + } + + async fn get_binary(&self, _: &Registry, sys: System, arch: Arch) -> Option> { + let suffix = if sys.is_windows() { ".exe" } else { "" }; + fs::read( + PLUGIN_INSTANCE + .path + .get() + .unwrap() + .join("bin") + .join(format!("agent_{sys}_{arch}{suffix}")), + ) + .ok() + } +} diff --git a/src/shell.rs b/agent/src/shell.rs similarity index 100% rename from src/shell.rs rename to agent/src/shell.rs diff --git a/src/socket.rs b/agent/src/socket.rs similarity index 66% rename from src/socket.rs rename to agent/src/socket.rs index 1ead262..d29eb75 100644 --- a/src/socket.rs +++ b/agent/src/socket.rs @@ -1,4 +1,4 @@ -use std::io; +use std::{io, mem}; use actix_cloud::tokio::{ io::{AsyncRead, AsyncReadExt, AsyncWriteExt}, @@ -8,14 +8,11 @@ use aes_gcm::{ aead::{Aead, OsRng}, AeadCore, Aes256Gcm, KeyInit, Nonce, }; -use bytes::BytesMut; use derivative::Derivative; -use skynet_api::{anyhow, bail, Result}; +use ecies::{encrypt, PublicKey}; +use skynet_api::{anyhow::anyhow, bail, Result}; use skynet_api_monitor::prost::Message as _; -use skynet_api_monitor::{ - ecies::{encrypt, PublicKey}, - Message, -}; +use skynet_api_monitor::Message; const MAX_MESSAGE_SIZE: u32 = 1024 * 1024 * 128; const NONCE_SIZE: usize = 12; @@ -46,27 +43,75 @@ pub enum SocketError { #[derivative(Default(new = "true"))] struct FrameLen { data: [u8; 4], - len: usize, + consumed: usize, } impl FrameLen { - async fn next(&mut self, io: &mut R) -> Result + async fn read(&mut self, io: &mut R) -> Result where R: AsyncRead + Unpin, { - while self.len < 4 { - let cnt = io.read(&mut self.data[self.len..]).await?; + while self.consumed < 4 { + let cnt = match io.read(&mut self.data[self.consumed..]).await { + Ok(x) => x, + Err(e) => { + self.consumed = 0; + return Err(e.into()); + } + }; if cnt == 0 { - self.len = 0; + self.consumed = 0; return Err(io::Error::from(io::ErrorKind::UnexpectedEof).into()); } - self.len += cnt; + self.consumed += cnt; } Ok(u32::from_be_bytes(self.data)) } fn reset(&mut self) { - self.len = 0; + self.consumed = 0; + } +} + +#[derive(Derivative)] +#[derivative(Default(new = "true"))] +struct FrameData { + data: Vec, + len: usize, + consumed: usize, +} + +impl FrameData { + fn resize(&mut self, len: u32) { + let len: usize = len.try_into().unwrap(); + self.data.resize(len, 0); + self.len = len; + } + + async fn read(&mut self, io: &mut R) -> Result<()> + where + R: AsyncRead + Unpin, + { + while self.consumed < self.len { + let cnt = match io.read(&mut self.data[self.consumed..]).await { + Ok(x) => x, + Err(e) => { + self.consumed = 0; + return Err(e.into()); + } + }; + if cnt == 0 { + self.consumed = 0; + return Err(io::Error::from(io::ErrorKind::UnexpectedEof).into()); + } + self.consumed += cnt; + } + Ok(()) + } + + fn reset(&mut self) -> Vec { + self.consumed = 0; + mem::take(&mut self.data) } } @@ -75,6 +120,7 @@ pub struct Frame { key: [u8; AES256_KEY_SIZE], stream: TcpStream, cipher: Aes256Gcm, + data: FrameData, len: FrameLen, } @@ -86,6 +132,7 @@ impl Frame { stream, cipher: Aes256Gcm::new(&key), key: key.into(), + data: FrameData::new(), len: FrameLen::new(), } } @@ -126,17 +173,16 @@ impl Frame { } pub async fn read(&mut self, limit: u32) -> Result> { - let len = self.len.next(&mut self.stream).await?; + let len = self.len.read(&mut self.stream).await?; if len > limit { - return Err(io::Error::from(io::ErrorKind::InvalidData).into()); - } - let mut ret = BytesMut::with_capacity(len.try_into()?); - if self.stream.read_buf(&mut ret).await? == 0 { self.len.reset(); - return Err(io::Error::from(io::ErrorKind::UnexpectedEof).into()); + return Err(io::Error::from(io::ErrorKind::InvalidData).into()); } + self.data.resize(len); + let r = self.data.read(&mut self.stream).await; self.len.reset(); - Ok(ret.into()) + r?; + Ok(self.data.reset()) } /// Read message from frame. diff --git a/agent_api/CHANGELOG.md b/agent_api/CHANGELOG.md new file mode 100644 index 0000000..8d3d587 --- /dev/null +++ b/agent_api/CHANGELOG.md @@ -0,0 +1,43 @@ +# v0.5.0 +## Changes +1. Fit the new architecture. + +# v0.4.7 +## Changes +1. Fit the new architecture. + +# v0.4.6 +## Changes +1. Dependency upgrade. + +# v0.4.5 +## Changes +1. Dependency upgrade. + +# v0.4.4 +## Changes +1. Dependency upgrade. + +# v0.4.3 +## Changes +1. Dependency upgrade. + +# v0.4.2 +## Changes +1. Dependency upgrade. + +# v0.4.1 +## Changes +1. Dependency upgrade. + +# v0.4.0 +## Changes +1. Dependency upgrade, `skynet_api` version 0.2. + +# v0.3.1 +## Changes +1. Align with `agent` 0.3.1. + +# v0.3.0 +## New features +1. Version check will depend on `agent` version instead of `skynet_api_agent` version. \ No newline at end of file diff --git a/agent_api/Cargo.toml b/agent_api/Cargo.toml new file mode 100644 index 0000000..94846ee --- /dev/null +++ b/agent_api/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "skynet_api_agent" +version = "0.5.3" +edition = "2021" +authors = ["MXWXZ "] +description = "API for Skynet agent plugin." +license = "GPL-3.0" +repository = "https://github.com/MXWXZ/skynet" +keywords = ["framework", "api", "ffi", "plugin"] +categories = ["api-bindings", "external-ffi-bindings"] + +[dependencies] +serde = { version = "1.0", features = ["derive"] } +serde_repr = "0.1" +enum-as-inner = "0.6" +ffi_rpc = "0.5" +semver = { version = "1.0", features = ["serde"] } + +skynet_api = "0.3" diff --git a/agent_api/src/lib.rs b/agent_api/src/lib.rs new file mode 100644 index 0000000..6b20f5e --- /dev/null +++ b/agent_api/src/lib.rs @@ -0,0 +1,97 @@ +use enum_as_inner::EnumAsInner; +use ffi_rpc::{ + self, abi_stable, async_trait, bincode, + ffi_rpc_macro::{self, plugin_api}, +}; +use semver::Version; +use serde_repr::{Deserialize_repr, Serialize_repr}; +use skynet_api::{uuid, HyUuid}; +use std::{ + fmt::{self, Display}, + path::PathBuf, +}; + +pub use semver; + +pub const VERSION: &str = env!("CARGO_PKG_VERSION"); +pub const ID: HyUuid = HyUuid(uuid!("ce96ae04-6801-4ca4-b09d-a087e05f3783")); + +#[derive(EnumAsInner, Clone, Copy, Debug, Serialize_repr, Deserialize_repr)] +#[repr(u8)] +pub enum System { + Windows, + Linux, + OSX, +} + +impl System { + #[must_use] + pub fn parse(str: &str) -> Option { + let str = str.to_lowercase(); + if str.contains("windows") { + Some(Self::Windows) + } else if str.contains("linux") { + Some(Self::Linux) + } else if str.contains("macos") { + Some(Self::OSX) + } else { + None + } + } +} + +impl Display for System { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + Self::Windows => write!(f, "windows"), + Self::Linux => write!(f, "linux"), + Self::OSX => write!(f, "osx"), + } + } +} + +#[derive(EnumAsInner, Clone, Copy, Debug, Serialize_repr, Deserialize_repr)] +#[repr(u8)] +pub enum Arch { + X86, + X64, + ARM, + ARM64, +} + +impl Arch { + #[must_use] + pub fn parse(str: &str) -> Option { + let str = str.to_lowercase(); + if str.contains("x86_64") { + Some(Self::X64) + } else if str.contains("x86") { + Some(Self::X86) + } else if str.contains("aarch64") { + Some(Self::ARM64) + } else if str.contains("arm") { + Some(Self::ARM) + } else { + None + } + } +} + +impl Display for Arch { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + Self::X86 => write!(f, "x86"), + Self::X64 => write!(f, "x64"), + Self::ARM => write!(f, "arm"), + Self::ARM64 => write!(f, "arm64"), + } + } +} + +#[plugin_api(AgentService)] +pub trait Service: Send + Sync { + async fn api_version() -> Version; + async fn check_version(v: String) -> bool; + async fn get_binary_name(sys: System, arch: Arch) -> PathBuf; + async fn get_binary(sys: System, arch: Arch) -> Option>; +} diff --git a/config.yml b/config.yml index 13dd3d0..d3fe8d5 100644 --- a/config.yml +++ b/config.yml @@ -1,6 +1,6 @@ id: "ce96ae04-6801-4ca4-b09d-a087e05f3783" name: "agent" description: "Agent auto updater" -version: "0.5.0" -api_version: "~0.2.0" +version: "0.6.0" +api_version: "^0.3.0" priority: 50 diff --git a/src/lib.rs b/src/lib.rs deleted file mode 100644 index 21afcf9..0000000 --- a/src/lib.rs +++ /dev/null @@ -1,33 +0,0 @@ -use actix_cloud::{async_trait, state::GlobalState}; -use skynet_api::{create_plugin, plugin::Plugin, Result, Skynet}; -use skynet_api_agent::{Service, ID, VERSION}; -use std::{ - path::PathBuf, - sync::{Arc, OnceLock}, -}; - -static SERVICE: OnceLock> = OnceLock::new(); - -#[derive(Debug, Default)] -struct Agent; - -#[async_trait] -impl Plugin for Agent { - fn on_load( - &self, - path: PathBuf, - mut skynet: Box, - state: Box, - ) -> (Box, Box, Result<()>) { - let _ = SERVICE.set(Arc::new(Service::new( - path, - env!("CARGO_PKG_VERSION").to_owned(), - ))); - skynet - .shared_api - .set(&ID, VERSION, Box::new(SERVICE.get().unwrap().to_owned())); - (skynet, state, Ok(())) - } -} - -create_plugin!(Agent, Agent::default);