From f28265225450d008f39f10e6ffc766351018b097 Mon Sep 17 00:00:00 2001 From: dominic <510002+dmah42@users.noreply.github.com> Date: Wed, 30 Aug 2023 10:13:50 +0100 Subject: [PATCH] Migrate from buf's remote generation alpha (#487) * Migrate from buf's remote generation alpha * bump dependent library versions * enforce buf v1.25.0 * cope with deno migration * fix shell conditional and clippy warning * increase timeout for docker image building due to new deps --- .../workflows/001-tester-ubuntu-make-test.yml | 1 + ...urae-builder-image-docker-build-tester.yml | 2 +- Cargo.lock | 896 ++++++++++-------- Cargo.toml | 22 +- Makefile | 4 +- auraed/Cargo.toml | 6 +- auraescript/Cargo.toml | 6 +- auraescript/macros/src/ops.rs | 2 +- auraescript/src/builtin/auraescript_client.rs | 10 +- auraescript/src/cells.rs | 2 + auraescript/src/cri.rs | 2 + auraescript/src/discovery.rs | 2 + auraescript/src/health.rs | 2 + auraescript/src/lib.rs | 9 +- buf.gen.yaml | 8 +- client/Cargo.toml | 2 +- client/src/config/x509_details.rs | 2 +- images/Dockerfile.build | 4 +- images/Dockerfile.nested | 2 +- images/Dockerfile.test | 4 +- 20 files changed, 544 insertions(+), 444 deletions(-) diff --git a/.github/workflows/001-tester-ubuntu-make-test.yml b/.github/workflows/001-tester-ubuntu-make-test.yml index cfff885e2..0c463af62 100644 --- a/.github/workflows/001-tester-ubuntu-make-test.yml +++ b/.github/workflows/001-tester-ubuntu-make-test.yml @@ -55,6 +55,7 @@ jobs: - uses: bufbuild/buf-setup-action@v1 with: github_token: ${{ github.token }} + version: 1.25.0 - uses: actions/cache@v3 with: path: | diff --git a/.github/workflows/200-aurae-builder-image-docker-build-tester.yml b/.github/workflows/200-aurae-builder-image-docker-build-tester.yml index 2d9a48147..58ef6d182 100644 --- a/.github/workflows/200-aurae-builder-image-docker-build-tester.yml +++ b/.github/workflows/200-aurae-builder-image-docker-build-tester.yml @@ -78,7 +78,7 @@ jobs: id: build-and-push if: steps.check-change.outputs.cache-hit != 'true' && github.event.pull_request.head.repo.full_name == github.repository uses: docker/build-push-action@v2 - timeout-minutes: 15 + timeout-minutes: 30 with: context: . file: images/Dockerfile.test diff --git a/Cargo.lock b/Cargo.lock index ca1aac389..ddb6e39a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,11 +57,11 @@ version = "0.0.0" dependencies = [ "heck", "itertools", - "proc-macro2 1.0.60", + "proc-macro2 1.0.66", "proto-reader", "protobuf", "protobuf-parse", - "quote 1.0.28", + "quote 1.0.32", "syn 1.0.107", ] @@ -134,6 +134,12 @@ dependencies = [ "alloc-no-stdlib", ] +[[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" @@ -143,11 +149,60 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "arrayvec" @@ -177,8 +232,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", "synstructure", ] @@ -189,8 +244,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -200,9 +255,9 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c704e2f6ee1a98223f5a7629a6ef0f3decb3b552ed282889dc957edff98ce1e6" dependencies = [ - "pmutil", - "proc-macro2 1.0.60", - "quote 1.0.28", + "pmutil 0.5.3", + "proc-macro2 1.0.66", + "quote 1.0.32", "swc_macros_common", "syn 1.0.107", ] @@ -251,8 +306,8 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -262,9 +317,9 @@ version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.28", ] [[package]] @@ -358,11 +413,11 @@ name = "auraescript_macros" version = "0.0.0" dependencies = [ "heck", - "proc-macro2 1.0.60", + "proc-macro2 1.0.66", "proto-reader", "protobuf", "protobuf-parse", - "quote 1.0.28", + "quote 1.0.32", "syn 1.0.107", ] @@ -374,9 +429,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.4" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5694b64066a2459918d8074c2ce0d5a88f409431994c2356617c8ae0c4721fc" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", @@ -396,16 +451,15 @@ dependencies = [ "serde", "sync_wrapper", "tower", - "tower-http", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", "bytes", @@ -560,12 +614,6 @@ dependencies = [ "generic-array 0.14.6", ] -[[package]] -name = "block-modes" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2211b0817f061502a8dd9f11a37e879e79763e3c698d2418cf824d8cb2f21e" - [[package]] name = "block-padding" version = "0.3.2" @@ -659,13 +707,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[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", @@ -685,40 +733,44 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.4" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" dependencies = [ - "bitflags 1.3.2", + "clap_builder", "clap_derive", - "clap_lex", - "is-terminal", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", "strsim", - "termcolor", ] [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", - "proc-macro-error", - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 1.0.107", + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.28", ] [[package]] name = "clap_lex" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "client" @@ -730,7 +782,7 @@ dependencies = [ "serde", "thiserror", "tokio", - "toml 0.7.3", + "toml 0.7.6", "tonic", "tower", "x509-certificate", @@ -741,9 +793,9 @@ name = "client-macros" version = "0.0.0" dependencies = [ "heck", - "proc-macro2 1.0.60", + "proc-macro2 1.0.66", "proto-reader", - "quote 1.0.28", + "quote 1.0.32", "syn 1.0.107", ] @@ -767,6 +819,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "console_static_text" version = "0.8.1" @@ -883,7 +941,7 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "quote 1.0.28", + "quote 1.0.32", "syn 1.0.107", ] @@ -943,8 +1001,8 @@ dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "scratch", "syn 1.0.107", ] @@ -961,8 +1019,8 @@ version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357f40d1f06a24b60ae1fe122542c1fb05d28d32acb2aed064e84bc2ad1e252e" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -984,8 +1042,8 @@ checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "strsim", "syn 1.0.107", ] @@ -997,7 +1055,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ "darling_core", - "quote 1.0.28", + "quote 1.0.32", "syn 1.0.107", ] @@ -1008,7 +1066,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ "cfg-if 1.0.0", - "hashbrown", + "hashbrown 0.12.3", "lock_api", "once_cell", "parking_lot_core", @@ -1026,11 +1084,34 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" +[[package]] +name = "deno-proc-macro-rules" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c65c2ffdafc1564565200967edc4851c7b55422d3913466688907efd05ea26f" +dependencies = [ + "deno-proc-macro-rules-macros", + "proc-macro2 1.0.66", + "syn 2.0.28", +] + +[[package]] +name = "deno-proc-macro-rules-macros" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3047b312b7451e3190865713a4dd6e1f821aed614ada219766ebc3024a690435" +dependencies = [ + "once_cell", + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.28", +] + [[package]] name = "deno_ast" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a39dc5554b1c835c62914b545f8b378563a997521e39a8f03450b37b216143ef" +checksum = "6b17e25531279d9795aeb076909c91c9b369fa63fd4d801486950577d0457d22" dependencies = [ "anyhow", "base64 0.13.1", @@ -1064,9 +1145,9 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" -version = "0.103.0" +version = "0.108.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e3d94bd67bca343540507d4109d736bdde3561c4cbc862bf240dddbc6b05c" +checksum = "af3e8ca691a282c918cc5c223dcd5840286954a396e3108ade4c3c3b55017ebf" dependencies = [ "async-trait", "deno_core", @@ -1076,9 +1157,9 @@ dependencies = [ [[package]] name = "deno_cache" -version = "0.41.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b94c893614d28106d0601a5a10d342286ab3f34352af6e6b3906e51f8253ccc" +checksum = "bc385e88d95f925f3384319cde1e813022d4842a9a791c79b47699334e81d516" dependencies = [ "async-trait", "deno_core", @@ -1090,24 +1171,24 @@ dependencies = [ [[package]] name = "deno_console" -version = "0.109.0" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04eb3b6a0337c1f2122d6d859586e6d011925a183ae6f588e08f42f3a4affecf" +checksum = "7a3df41ff26499c3f4f352f8fc1fe6bb50c39121675bf594b3af511c28db84c2" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.191.0" +version = "0.199.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495704f95457631b366e8cbf427f817db8cdaf4b17832c69faa6b5b91e58fa2a" +checksum = "70fbd0cb620ac36fac08d708c5f01362280c5aa8149657a225db4932bd73758e" dependencies = [ "anyhow", "bytes", "deno_ops", "futures", - "indexmap", + "indexmap 1.9.2", "libc", "log", "once_cell", @@ -1125,15 +1206,14 @@ dependencies = [ [[package]] name = "deno_crypto" -version = "0.123.0" +version = "0.128.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2ba1a88114eb017909a2ad2d63fbb4da6e6cf583854400ce3cfbbba7ab4888" +checksum = "5000445c43538cb54a021e761071137ebab615c751e17178e564c56647414f5c" dependencies = [ "aes", "aes-gcm", "aes-kw", "base64 0.13.1", - "block-modes", "cbc", "const-oid", "ctr", @@ -1162,9 +1242,9 @@ dependencies = [ [[package]] name = "deno_fetch" -version = "0.133.0" +version = "0.138.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60389ff20e9eda3f75ab253f3e46b2d4de9c0e462bfd4144d125f4f1433cc12d" +checksum = "af49c674cf373a8946e67dae1d2badc0c1176f9ecb84cda168c5c9421ef15b3a" dependencies = [ "bytes", "data-url", @@ -1175,15 +1255,14 @@ dependencies = [ "reqwest", "serde", "tokio", - "tokio-stream", "tokio-util", ] [[package]] name = "deno_ffi" -version = "0.96.0" +version = "0.101.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b70a036022c87634159a170bf9ed006a883adfff24041450b110e0ddff452015" +checksum = "6cb34b1d3bb618b0bbbc5ebc148301263824a5673290483ff0a52386913a43e2" dependencies = [ "deno_core", "dlopen", @@ -1199,9 +1278,9 @@ dependencies = [ [[package]] name = "deno_fs" -version = "0.19.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "737074e3dcb34a52a7a96c349e02be03ad24b8e5ad756c1a6504c337ef6c47c7" +checksum = "5ddb0692853905a87a96666c77d58e4adf1cf3671d1a7ec7edafe301cfce9441" dependencies = [ "async-trait", "deno_core", @@ -1219,9 +1298,9 @@ dependencies = [ [[package]] name = "deno_http" -version = "0.104.0" +version = "0.109.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb61cbabc1e6d48b43527fc00cd85cb30bb5adc970f37991974c939f77f898a" +checksum = "8d083d63029b9cd366bcee007db8348e7c515c19e5432f0d2f138f03e5908ca1" dependencies = [ "async-compression 0.3.15", "async-trait", @@ -1237,7 +1316,7 @@ dependencies = [ "http", "httparse", "hyper 0.14.27", - "hyper 1.0.0-rc.3", + "hyper 1.0.0-rc.4", "memmem", "mime", "once_cell", @@ -1255,15 +1334,14 @@ dependencies = [ [[package]] name = "deno_io" -version = "0.19.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "638113260923fe124ac08c0f6238ce11ea1c42990e2e3c0606a56b9b778c27a3" +checksum = "b4b0886f3be06a065c9738b4162c30634ea2645eaad7efcf13ec197c63d67d15" dependencies = [ "async-trait", "deno_core", "filetime", "fs3", - "nix 0.24.2", "once_cell", "tokio", "winapi", @@ -1271,9 +1349,9 @@ dependencies = [ [[package]] name = "deno_kv" -version = "0.17.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0e8a9b3bbbe3a5addc90e3c5485b6e23f3be24299b9607013a614a22b02b8c" +checksum = "677532e9ee16ef744205bae030f5047f66f5ff5ad6359b6a0e393197a78cd2b3" dependencies = [ "anyhow", "async-trait", @@ -1302,9 +1380,9 @@ dependencies = [ [[package]] name = "deno_napi" -version = "0.39.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08796bb105c97e4e2c867bc605ea846e9d8eb3b9b88b4dbd1b4c8c46202c2009" +checksum = "aef1534b43dcf5cb8d28ee72035e4d5a426952fa305b75f0100dac3c89c99a4e" dependencies = [ "deno_core", "libloading", @@ -1312,9 +1390,9 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.101.0" +version = "0.106.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e38566fd9d21fce7992a1bbc9de59e43975c3a739498c8a98b3a43797b05e60" +checksum = "a76fa1823075955b96bbc1a58db8584f4b4b6da3411c4be4d77063852ccf067a" dependencies = [ "deno_core", "deno_tls", @@ -1330,11 +1408,12 @@ dependencies = [ [[package]] name = "deno_node" -version = "0.46.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec908fff4c1ab220e3106711967288986d03cc55febac61ec76becf25a1bd98" +checksum = "ede647cd70b9cf8f3d678cf3e07844a74ac1d3f20beba7bc4cd63ffd1349a56e" dependencies = [ "aes", + "brotli", "cbc", "data-encoding", "deno_core", @@ -1347,11 +1426,13 @@ dependencies = [ "dsa", "ecb", "elliptic-curve 0.13.5", + "errno 0.2.8", "hex", "hkdf", "idna 0.3.0", - "indexmap", + "indexmap 1.9.2", "lazy-regex", + "libc", "libz-sys", "md-5", "md4", @@ -1376,19 +1457,20 @@ dependencies = [ "serde", "sha-1", "sha2", - "sha3", "signature 1.6.4", "tokio", "typenum", + "whoami", + "winapi", "x25519-dalek", "x509-parser", ] [[package]] name = "deno_npm" -version = "0.8.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f396676bc09754d7afdbf8887e501bf5cd4ecbec6607a5540ee5c7338cae713d" +checksum = "fa5d1097de53e8ce3316d3e44095e253719ae367cf7478263f83082f44dddabf" dependencies = [ "anyhow", "async-trait", @@ -1396,32 +1478,36 @@ dependencies = [ "futures", "log", "monch", - "once_cell", "serde", "thiserror", ] [[package]] name = "deno_ops" -version = "0.69.0" +version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511999e75fa5712d483a40811e8b600964893ddf3948d20e0aecf7dac6a1969f" +checksum = "8b345c096fd8433337ed8e1727f4732397c134e188e1739c88b0c077869020f3" dependencies = [ + "deno-proc-macro-rules", "lazy-regex", "once_cell", - "pmutil", + "pmutil 0.6.1", "proc-macro-crate", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "regex", + "strum", + "strum_macros", "syn 1.0.107", + "syn 2.0.28", + "thiserror", ] [[package]] name = "deno_runtime" -version = "0.117.0" +version = "0.122.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437ff6d74acfea3858b1f44027ba2212dac354b46dec61ef63fc8f168fa613f9" +checksum = "a15dd7fe2a7c53ffbbd55966eb7bf2298291b77a47e043f768f0aa1732f61e95" dependencies = [ "atty", "console_static_text", @@ -1475,11 +1561,12 @@ dependencies = [ [[package]] name = "deno_semver" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "242c8ad9f4ce614ec0fa2e6b3d834f2662ce024ca78e9ed4c58d812cbfc3e41d" +checksum = "96f99990457915af1f444900003ffd5a9d3ab2e5337b06d681e56ca371b3e11f" dependencies = [ "monch", + "once_cell", "serde", "thiserror", "url", @@ -1487,13 +1574,13 @@ dependencies = [ [[package]] name = "deno_tls" -version = "0.96.0" +version = "0.101.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b35acb8674e9473f44b8b061a584508eee6fda01e195e59395d112da0428ded" +checksum = "02167d4913ff4b1f93f0f3182b6ebee67f41129a94ea9ef8ce15dff51649aff4" dependencies = [ "deno_core", "once_cell", - "rustls 0.21.2", + "rustls", "rustls-native-certs", "rustls-pemfile", "serde", @@ -1503,21 +1590,20 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.109.0" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "429e44733a4e59af6c1db8ea5215b86665a6f7b2022c2d7e968529af920884a4" +checksum = "8fe9282c24607371fd2e6db7fca22da861032317c1396c08506a5a04ec81927a" dependencies = [ "deno_core", "serde", - "serde_repr", "urlpattern", ] [[package]] name = "deno_web" -version = "0.140.0" +version = "0.145.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5db59bdc78f43d2bc31ad448b1bc75369aa48f1c68ae330f9b3e3a48b9d37b6" +checksum = "b757302c2f04de142ee2962078f5f255caef80c792a9989fa860b867143a71e7" dependencies = [ "async-trait", "base64-simd", @@ -1532,18 +1618,18 @@ dependencies = [ [[package]] name = "deno_webidl" -version = "0.109.0" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e30dc4f727a4ca397528c944dbc74087df86b2268171995949031f1fbc663b" +checksum = "1a12d8e0f1ef5af84075819a2568af54f8e073886a2c2941ac6e34c2092508d7" dependencies = [ "deno_core", ] [[package]] name = "deno_websocket" -version = "0.114.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca90920a940864b3668bb18084a6469988d03409b91b373b02f405761a1e59e9" +checksum = "3249bed57e808fdb99f7d39d8711210b2a0380638f0520447cb4794200c81d56" dependencies = [ "bytes", "deno_core", @@ -1555,14 +1641,14 @@ dependencies = [ "once_cell", "serde", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] name = "deno_webstorage" -version = "0.104.0" +version = "0.109.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c368cf979ca56efa8b4e172388575aed8718347370873f37e79e0ce307b845a" +checksum = "03f122fd89054593e11e34fedbc063d00b407ea2b26c910171de4416618140b1" dependencies = [ "deno_core", "deno_web", @@ -1622,8 +1708,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ "darling", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -1644,8 +1730,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "rustc_version 0.4.0", "syn 1.0.107", ] @@ -1692,9 +1778,9 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.28", ] [[package]] @@ -1768,8 +1854,8 @@ dependencies = [ "byteorder", "lazy_static", "proc-macro-error", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -1884,11 +1970,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.2.8" @@ -1900,6 +1992,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -2044,8 +2147,8 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d449976075322384507443937df2f1d5577afbf4282f12a5a66ef29fa3e6307" dependencies = [ - "pmutil", - "proc-macro2 1.0.60", + "pmutil 0.5.3", + "proc-macro2 1.0.66", "swc_macros_common", "syn 1.0.107", ] @@ -2135,9 +2238,9 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.28", ] [[package]] @@ -2229,8 +2332,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -2284,7 +2387,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.2", "slab", "tokio", "tokio-util", @@ -2300,20 +2403,26 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "hashlink" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", ] [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -2333,6 +2442,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + [[package]] name = "hex" version = "0.4.3" @@ -2400,12 +2515,6 @@ dependencies = [ "http", ] -[[package]] -name = "http-range-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" - [[package]] name = "httparse" version = "1.8.0" @@ -2444,13 +2553,12 @@ dependencies = [ [[package]] name = "hyper" -version = "1.0.0-rc.3" +version = "1.0.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75264b2003a3913f118d35c586e535293b3e22e41f074930762929d071e092" +checksum = "d280a71f348bcc670fc55b02b63c53a04ac0bf2daff2980795aeaf53edae10e6" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", "http", @@ -2472,9 +2580,9 @@ checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ "http", "hyper 0.14.27", - "rustls 0.21.2", + "rustls", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -2553,10 +2661,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "inotify" version = "0.9.6" @@ -2640,22 +2758,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c068d4c6b922cd6284c609cfa6dec0e41615c9c5a1a4ba729a970d8daba05fb" dependencies = [ "Inflector", - "pmutil", - "proc-macro2 1.0.60", - "quote 1.0.28", + "pmutil 0.5.3", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "io-lifetimes", - "rustix", - "windows-sys 0.42.0", + "rustix 0.37.7", + "windows-sys 0.48.0", ] [[package]] @@ -2691,15 +2809,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "keccak" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" -dependencies = [ - "cpufeatures", -] - [[package]] name = "kqueue" version = "1.0.7" @@ -2737,8 +2846,8 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8edfc11b8f56ce85e207e62ea21557cfa09bb24a8f6b04ae181b086ff8611c22" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "regex", "syn 1.0.107", ] @@ -2827,9 +2936,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libcgroups" @@ -2884,9 +2993,9 @@ dependencies = [ [[package]] name = "libffi-sys" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc65067b78c0fc069771e8b9a9e02df71e08858bec92c1f101377c67b9dca7c7" +checksum = "f36115160c57e8529781b4183c2bb51fdc1f6d6d1ed345591d84be7703befb3c" dependencies = [ "cc", ] @@ -2909,9 +3018,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libsqlite3-sys" -version = "0.25.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ "cc", "pkg-config", @@ -2951,6 +3060,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + [[package]] name = "lock_api" version = "0.4.9" @@ -2963,12 +3078,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lru-cache" @@ -3372,8 +3484,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -3453,12 +3565,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "output_vt100" version = "0.1.3" @@ -3639,9 +3745,9 @@ dependencies = [ [[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 = "phf" @@ -3673,8 +3779,8 @@ dependencies = [ "phf_generator", "phf_shared", "proc-macro-hack", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -3702,8 +3808,8 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -3763,11 +3869,22 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] +[[package]] +name = "pmutil" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" +dependencies = [ + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.28", +] + [[package]] name = "polyval" version = "0.6.0" @@ -3840,8 +3957,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", "version_check", ] @@ -3852,8 +3969,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "version_check", ] @@ -3874,9 +3991,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -3893,7 +4010,7 @@ dependencies = [ "flate2", "hex", "lazy_static", - "rustix", + "rustix 0.36.7", ] [[package]] @@ -3908,7 +4025,7 @@ dependencies = [ "flate2", "hex", "lazy_static", - "rustix", + "rustix 0.36.7", ] [[package]] @@ -3929,8 +4046,8 @@ checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -3948,10 +4065,10 @@ dependencies = [ name = "proto-reader" version = "0.0.0" dependencies = [ - "proc-macro2 1.0.60", + "proc-macro2 1.0.66", "protobuf", "protobuf-parse", - "quote 1.0.28", + "quote 1.0.32", "syn 1.0.107", ] @@ -3988,7 +4105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d39b14605eaa1f6a340aec7f320b34064feb26c93aec35d6a9a2272a8ddfa49" dependencies = [ "anyhow", - "indexmap", + "indexmap 1.9.2", "log", "protobuf", "protobuf-support", @@ -4032,11 +4149,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ - "proc-macro2 1.0.60", + "proc-macro2 1.0.66", ] [[package]] @@ -4152,13 +4269,13 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.2", + "rustls", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-socks", "tokio-util", "tower-service", @@ -4264,11 +4381,11 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" +checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.2", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4334,23 +4451,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" dependencies = [ "bitflags 1.3.2", - "errno", + "errno 0.2.8", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.1.4", "windows-sys 0.42.0", ] [[package]] -name = "rustls" -version = "0.20.8" +name = "rustix" +version = "0.37.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" dependencies = [ - "log", - "ring", - "sct", - "webpki", + "bitflags 1.3.2", + "errno 0.3.2", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.45.0", ] [[package]] @@ -4586,9 +4705,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] @@ -4614,43 +4733,32 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 1.0.107", + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ - "indexmap", + "indexmap 2.0.0", "itoa", "ryu", "serde", ] -[[package]] -name = "serde_repr" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" -dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 1.0.107", -] - [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -4669,9 +4777,9 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.102.0" +version = "0.110.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b80e857f45543c24c52f62bbccf138d2a9715a17d3bde69e697fc261ae655ac" +checksum = "b3bafaee0eecbef6c47ad3e7e0a764e22eb35a229ff7d06b7801fcbeaa5364b8" dependencies = [ "bytes", "derive_more", @@ -4703,8 +4811,8 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "079a83df15f85d89a68d64ae1238f142f172b1fa915d0d76b26a7cba1b659a69" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -4741,16 +4849,6 @@ dependencies = [ "digest 0.10.6", ] -[[package]] -name = "sha3" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" -dependencies = [ - "digest 0.10.6", - "keccak", -] - [[package]] name = "sharded-slab" version = "0.1.4" @@ -4801,8 +4899,8 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e28ef0b01435ca8679e00e76b31d32aa7cc596614b49e58b3bc5e2fcf685fa5a" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -4947,8 +5045,8 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ "phf_generator", "phf_shared", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", ] [[package]] @@ -4957,9 +5055,9 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0090512bdfee4b56d82480d66c0fd8a6f53f0fe0f97e075e949b252acdd482e0" dependencies = [ - "pmutil", - "proc-macro2 1.0.60", - "quote 1.0.28", + "pmutil 0.5.3", + "proc-macro2 1.0.66", + "quote 1.0.32", "swc_macros_common", "syn 1.0.107", ] @@ -4970,6 +5068,28 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +dependencies = [ + "heck", + "proc-macro2 1.0.66", + "quote 1.0.32", + "rustversion", + "syn 2.0.28", +] + [[package]] name = "subtle" version = "2.4.1" @@ -5024,7 +5144,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89c8fc2c12bb1634c7c32fc3c9b6b963ad8f034cc62c4ecddcf215dc4f6f959d" dependencies = [ - "indexmap", + "indexmap 1.9.2", "serde", "serde_json", "swc_config_macro", @@ -5036,9 +5156,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dadb9998d4f5fc36ef558ed5a092579441579ee8c6fcce84a5228cca9df4004" dependencies = [ - "pmutil", - "proc-macro2 1.0.60", - "quote 1.0.28", + "pmutil 0.5.3", + "proc-macro2 1.0.66", + "quote 1.0.32", "swc_macros_common", "syn 1.0.107", ] @@ -5085,9 +5205,9 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4ee0caee1018808d94ecd09490cb7affd3d504b19aa11c49238f5fc4b54901" dependencies = [ - "pmutil", - "proc-macro2 1.0.60", - "quote 1.0.28", + "pmutil 0.5.3", + "proc-macro2 1.0.66", + "quote 1.0.32", "swc_macros_common", "syn 1.0.107", ] @@ -5134,7 +5254,7 @@ checksum = "f9c33ec5369178f3a0580ab86cfe89ffb9c3fbd122aed379cfb71d469d9d61c1" dependencies = [ "better_scoped_tls", "bitflags 2.3.2", - "indexmap", + "indexmap 1.9.2", "once_cell", "phf", "rustc-hash", @@ -5169,9 +5289,9 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "984d5ac69b681fc5438f9abf82b0fda34fe04e119bc75f8213b7e01128c7c9a2" dependencies = [ - "pmutil", - "proc-macro2 1.0.60", - "quote 1.0.28", + "pmutil 0.5.3", + "proc-macro2 1.0.66", + "quote 1.0.32", "swc_macros_common", "syn 1.0.107", ] @@ -5205,7 +5325,7 @@ dependencies = [ "ahash", "base64 0.13.1", "dashmap", - "indexmap", + "indexmap 1.9.2", "once_cell", "serde", "sha-1", @@ -5243,7 +5363,7 @@ version = "0.117.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad791bbfdafcebd878584021e050964c8ab68aba7eeac9d0ee4afba4c284a629" dependencies = [ - "indexmap", + "indexmap 1.9.2", "num_cpus", "once_cell", "rustc-hash", @@ -5275,9 +5395,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c20468634668c2bbab581947bb8c75c97158d5a6959f4ba33df20983b20b4f6" dependencies = [ - "pmutil", - "proc-macro2 1.0.60", - "quote 1.0.28", + "pmutil 0.5.3", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -5287,9 +5407,9 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e582c3e3c2269238524923781df5be49e011dbe29cf7683a2215d600a562ea6" dependencies = [ - "pmutil", - "proc-macro2 1.0.60", - "quote 1.0.28", + "pmutil 0.5.3", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -5310,9 +5430,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cfc226380ba54a5feed2c12f3ccd33f1ae8e959160290e5d2d9b4e918b6472a" dependencies = [ "Inflector", - "pmutil", - "proc-macro2 1.0.60", - "quote 1.0.28", + "pmutil 0.5.3", + "proc-macro2 1.0.66", + "quote 1.0.32", "swc_macros_common", "syn 1.0.107", ] @@ -5334,19 +5454,19 @@ version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.18" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "unicode-ident", ] @@ -5362,8 +5482,8 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", "unicode-xid 0.2.4", ] @@ -5415,8 +5535,8 @@ name = "test-helpers-macros" version = "0.0.0" dependencies = [ "heck", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -5431,22 +5551,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.28", ] [[package]] @@ -5549,9 +5669,9 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.28", ] [[package]] @@ -5566,24 +5686,13 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.8", - "tokio", - "webpki", -] - [[package]] name = "tokio-rustls" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.2", + "rustls", "tokio", ] @@ -5601,9 +5710,9 @@ 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", @@ -5636,14 +5745,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", - "toml_datetime 0.6.1", - "toml_edit 0.19.7", + "toml_datetime 0.6.3", + "toml_edit 0.19.14", ] [[package]] @@ -5654,9 +5763,9 @@ checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] @@ -5667,34 +5776,34 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" dependencies = [ - "indexmap", + "indexmap 1.9.2", "nom8", "toml_datetime 0.5.1", ] [[package]] name = "toml_edit" -version = "0.19.7" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", - "toml_datetime 0.6.1", + "toml_datetime 0.6.3", "winnow", ] [[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.0", "bytes", "futures-core", "futures-util", @@ -5706,27 +5815,23 @@ dependencies = [ "percent-encoding", "pin-project", "prost", - "prost-derive", "rustls-pemfile", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tokio-stream", - "tokio-util", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", ] [[package]] name = "tonic-health" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88aee666ef3a4d1ee46218bbc8e5f69bcf9cc27bf2e871d6b724d83f56d179f" +checksum = "080964d45894b90273d2b1dd755fdd114560db8636bb41cea615213c45043c4d" dependencies = [ "async-stream", - "bytes", "prost", "tokio", "tokio-stream", @@ -5741,7 +5846,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap", + "indexmap 1.9.2", "pin-project", "pin-project-lite", "rand", @@ -5753,25 +5858,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" -dependencies = [ - "bitflags 1.3.2", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body 0.4.5", - "http-range-header", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-layer" version = "0.3.2" @@ -5803,8 +5889,8 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -5818,16 +5904,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" @@ -5952,8 +6028,8 @@ checksum = "54de46f980cea7b2ae8d8f7f9f1c35cf7062c68343e99345ef73758f8e60975a" dependencies = [ "lazy_static", "libc", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "regex", "syn 1.0.107", ] @@ -6109,9 +6185,9 @@ dependencies = [ [[package]] name = "v8" -version = "0.73.0" +version = "0.74.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bd3f04ba5065795dae6e3db668ff0b628920fbd2e39c1755e9b62d93660c3c" +checksum = "2eedac634b8dd39b889c5b62349cbc55913780226239166435c5cf66771792ea" dependencies = [ "bitflags 1.3.2", "fslock", @@ -6141,8 +6217,8 @@ name = "validation_macros" version = "0.0.0" dependencies = [ "heck", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", ] @@ -6202,8 +6278,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", ] [[package]] @@ -6264,8 +6340,8 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", "wasm-bindgen-shared", ] @@ -6288,7 +6364,7 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ - "quote 1.0.28", + "quote 1.0.32", "wasm-bindgen-macro-support", ] @@ -6298,8 +6374,8 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -6364,6 +6440,16 @@ dependencies = [ "once_cell", ] +[[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + [[package]] name = "widestring" version = "0.5.1" @@ -6550,9 +6636,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.3.6" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" dependencies = [ "memchr", ] @@ -6642,8 +6728,8 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2 1.0.66", + "quote 1.0.32", "syn 1.0.107", "synstructure", ] diff --git a/Cargo.toml b/Cargo.toml index 0147a9781..8b935f132 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,13 +44,13 @@ exclude = [ ] [workspace.dependencies] -anyhow = "1.0.66" -chrono = { version = "0.4.23", default-features = false, features = ["clock", "std", "wasmbind"] } # default features except `oldtime` +anyhow = "1.0.72" +chrono = { version = "0.4.26", default-features = false, features = ["clock", "std", "wasmbind"] } # default features except `oldtime` client = { path = "./client" } -clap = { version = "4.1.1", features = ["derive"] } +clap = { version = "4.3.21", features = ["derive"] } fancy-regex = "0.11.0" -futures-util = "0.3.26" -heck = "0.4.0" +futures-util = "0.3.28" +heck = "0.4.1" lazy_static = "1.4.0" nix = "0.26.2" proc-macro2 = "1.0" @@ -59,15 +59,15 @@ protobuf = "3.2.0" protobuf-parse = "=3.2.0" # This crate makes no promises of stabilty, so we pin to the exact version quote = "1.0" serial_test = "1.0.0" -serde = "1.0.94" -serde_json = "1.0.94" +serde = "1.0.183" +serde_json = "1.0.104" syn = { version = "1.0", features = ["full"] } # used in macros, so full doesn't affect binary size test-helpers = { path = "./crates/test-helpers" } test-helpers-macros = { path = "./crates/test-helpers-macros" } -thiserror = "1.0.37" -tokio = "1.22.0" -tonic = "0.8.2" -tonic-health = "0.8.0" +thiserror = "1.0.44" +tokio = "1.29.1" +tonic = "0.9.2" +tonic-health = "0.9.2" tracing = "0.1" uuid = { version = "1.2.2", features = ["v4"] } url = "2.3.1" diff --git a/Makefile b/Makefile index dde3575fa..0bc723f3c 100644 --- a/Makefile +++ b/Makefile @@ -174,8 +174,10 @@ GEN_RS += $(patsubst api/v0/%,$(GEN_TONIC_RS_PATTERN),$(PROTO_DIRS)) GEN_TS = $(patsubst api/v0/%.proto,$(GEN_TS_PATTERN),$(PROTOS)) +BUF_VERSION = $(shell buf --version) + $(GEN_TS_PATTERN) $(GEN_RS_PATTERN) $(GEN_SERDE_RS_PATTERN) $(GEN_TONIC_RS_PATTERN): $(PROTOS) - @buf --version >/dev/null 2>&1 || (echo "Warning: buf is not installed! Please install the 'buf' command line tool: https://docs.buf.build/installation"; exit 1) + @if [ "${BUF_VERSION}" != "1.25.0" ]; then echo "Warning: buf 1.25.0 is not installed! Please install v1.25.0 of the 'buf' command line tool: https://docs.buf.build/installation"; exit 1; fi; buf lint api buf generate -v api diff --git a/auraed/Cargo.toml b/auraed/Cargo.toml index be9474067..d13a00b63 100644 --- a/auraed/Cargo.toml +++ b/auraed/Cargo.toml @@ -50,10 +50,10 @@ clap = { workspace = true } chrono = { workspace = true } clone3 = "0.2.3" fancy-regex = { workspace = true } -futures = "0.3.23" +futures = "0.3.28" ipnetwork = "0.20.0" iter_tools = "0.1.4" -libc = "0.2.140" # TODO: Nix comes with libc, can we rely on that? +libc = "0.2.147" # TODO: Nix comes with libc, can we rely on that? lazy_static = { workspace = true } libcgroups = { git = "https://github.com/containers/youki", rev = "f4e7e300e6be7a4ea758a436218b9db1b39c69cd", default-features = false, features = ["v2"] } libcontainer = { git = "https://github.com/containers/youki", rev = "f4e7e300e6be7a4ea758a436218b9db1b39c69cd", default-features = false, features = ["v2"] } @@ -70,7 +70,7 @@ serde.workspace = true syslog-tracing = "0.1.0" thiserror = { workspace = true } tokio = { workspace = true, features = ["fs", "macros", "net", "parking_lot", "process", "rt-multi-thread", "signal", "sync"] } -tokio-stream = { version = "0.1", features = ["net", "sync"] } +tokio-stream = { version = "0.1.14", features = ["net", "sync"] } tonic = { workspace = true, features = ["tls"] } tonic-health = { workspace = true } tracing = { workspace = true, features = ["log"] } diff --git a/auraescript/Cargo.toml b/auraescript/Cargo.toml index d0aa8463e..e8a6e5f85 100644 --- a/auraescript/Cargo.toml +++ b/auraescript/Cargo.toml @@ -42,9 +42,9 @@ path = "src/bin/main.rs" [dependencies] anyhow = { workspace = true } client = { workspace = true } -deno_ast = { version = "0.27.2", features = ["transpiling"] } -deno_core = "0.191.0" -deno_runtime = "0.117.0" +deno_ast = { version = "0.27.3", features = ["transpiling"] } +deno_core = "0.199.0" +deno_runtime = "0.122.0" macros = { package = "auraescript_macros", path = "./macros" } proto = { workspace = true } tokio = { workspace = true, features = ["fs", "rt-multi-thread"] } diff --git a/auraescript/macros/src/ops.rs b/auraescript/macros/src/ops.rs index cf498c305..523e27f52 100644 --- a/auraescript/macros/src/ops.rs +++ b/auraescript/macros/src/ops.rs @@ -114,7 +114,7 @@ pub(crate) fn ops_generator(input: TokenStream) -> TokenStream { // generate a OpDecl for each function for conveniently adding to the deno runtime let op_decls: Vec = op_idents.map(|op_ident| { quote! { - #op_ident::decl() + #op_ident::DECL } }).collect(); diff --git a/auraescript/src/builtin/auraescript_client.rs b/auraescript/src/builtin/auraescript_client.rs index 2b6f397cd..71fbd65b6 100644 --- a/auraescript/src/builtin/auraescript_client.rs +++ b/auraescript/src/builtin/auraescript_client.rs @@ -1,6 +1,6 @@ use anyhow::Result; use client::{AuraeConfig, Client}; -use deno_core::{OpState, Resource, ResourceId}; +use deno_core::{Op, OpState, Resource, ResourceId}; use std::{cell::RefCell, rc::Rc}; // `AuraeConfig` `try_default` @@ -63,10 +63,10 @@ pub(crate) async fn as__client_new( pub(crate) fn op_decls() -> Vec<::deno_core::OpDecl> { vec![ - as__aurae_config__try_default::decl(), - as__aurae_config__from_options::decl(), - as__aurae_config__parse_from_file::decl(), - as__client_new::decl(), + as__aurae_config__try_default::DECL, + as__aurae_config__from_options::DECL, + as__aurae_config__parse_from_file::DECL, + as__client_new::DECL, ] } diff --git a/auraescript/src/cells.rs b/auraescript/src/cells.rs index 70831e85b..177151593 100644 --- a/auraescript/src/cells.rs +++ b/auraescript/src/cells.rs @@ -28,4 +28,6 @@ * * \* -------------------------------------------------------------------------- */ +use deno_core::Op; + macros::ops_generator!("../api/v0/cells/cells.proto", cells, CellService,); diff --git a/auraescript/src/cri.rs b/auraescript/src/cri.rs index 1e846b145..aac309fb0 100644 --- a/auraescript/src/cri.rs +++ b/auraescript/src/cri.rs @@ -28,6 +28,8 @@ * * \* -------------------------------------------------------------------------- */ +use deno_core::Op; + // TODO: macro doesn't support streaming. Does deno? macros::ops_generator!( "../api/cri/v1/release-1.26.proto", diff --git a/auraescript/src/discovery.rs b/auraescript/src/discovery.rs index 5b9cacdb9..03f9c1791 100644 --- a/auraescript/src/discovery.rs +++ b/auraescript/src/discovery.rs @@ -28,6 +28,8 @@ * * \* -------------------------------------------------------------------------- */ +use deno_core::Op; + macros::ops_generator!( "../api/v0/discovery/discovery.proto", discovery, diff --git a/auraescript/src/health.rs b/auraescript/src/health.rs index 3c12ef925..549974c08 100644 --- a/auraescript/src/health.rs +++ b/auraescript/src/health.rs @@ -28,6 +28,8 @@ * * \* -------------------------------------------------------------------------- */ +use deno_core::Op; + // TODO: macro doesn't support streaming. Does deno? macros::ops_generator!( "../api/grpc/health/v1/health.proto", diff --git a/auraescript/src/lib.rs b/auraescript/src/lib.rs index adb842821..1c31a3ece 100644 --- a/auraescript/src/lib.rs +++ b/auraescript/src/lib.rs @@ -70,14 +70,16 @@ use deno_core::error::AnyError; use deno_core::futures::FutureExt; use deno_core::url::Url; use deno_core::{ - resolve_import, Extension, ModuleCode, ModuleLoader, ModuleSource, - ModuleSourceFuture, ModuleSpecifier, ModuleType, OpDecl, ResolutionKind, + resolve_import, ModuleCode, ModuleLoader, ModuleSource, + ModuleSourceFuture, ModuleSpecifier, ModuleType, ResolutionKind, }; +use deno_runtime::deno_core::{Extension, OpDecl}; use deno_runtime::permissions::PermissionsContainer; use deno_runtime::worker::{MainWorker, WorkerOptions}; use deno_runtime::{BootstrapOptions, WorkerLogLevel}; +use std::borrow::Cow; use std::pin::Pin; use std::rc::Rc; @@ -94,7 +96,8 @@ fn get_error_class_name(e: &AnyError) -> &'static str { pub fn init(main_module: Url) -> MainWorker { let extension = - Extension::builder("").ops(stdlib()).build(); + //Extension::builder("").ops(stdlib()).build(); + Extension{name: "", ops: Cow::from(stdlib()), ..Default::default()}; MainWorker::bootstrap_from_options( main_module, diff --git a/buf.gen.yaml b/buf.gen.yaml index e735772f0..85f879836 100644 --- a/buf.gen.yaml +++ b/buf.gen.yaml @@ -1,22 +1,22 @@ version: v1 plugins: - - remote: buf.build/prost/plugins/prost:v0.2.1-1 + - plugin: buf.build/community/neoeinstein-prost:v0.2.3 out: proto/gen opt: - bytes=. - file_descriptor_set - compile_well_known_types - extern_path=.google.protobuf=::pbjson_types - - remote: buf.build/prost/plugins/serde:v0.2.1-1 + - plugin: buf.build/community/neoeinstein-prost-serde:v0.2.3 out: proto/gen opt: - extern_path=.google.protobuf=::pbjson_types - - remote: buf.build/prost/plugins/tonic:v0.2.1-1 + - plugin: buf.build/community/neoeinstein-tonic:v0.3.0 out: proto/gen opt: - compile_well_known_types - extern_path=.google.protobuf=::pbjson_types - - remote: buf.build/stephenh/plugins/ts-proto + - plugin: buf.build/community/stephenh-ts-proto out: auraescript/gen opt: - outputEncodeMethods=false diff --git a/client/Cargo.toml b/client/Cargo.toml index a27056af7..31f584c29 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -12,7 +12,7 @@ proto = { workspace = true } serde = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true, features = ["fs", "rt-multi-thread"] } -toml = "0.7.3" +toml = "0.7.6" tonic = { workspace = true, features = ["tls"] } tower = "0.4.13" x509-certificate = "0.18.0" diff --git a/client/src/config/x509_details.rs b/client/src/config/x509_details.rs index bd387130e..1fa6e9650 100644 --- a/client/src/config/x509_details.rs +++ b/client/src/config/x509_details.rs @@ -75,6 +75,6 @@ pub(crate) fn new_x509_details( issuer_common_name, sha256_fingerprint: format!("{sha256_fingerprint:?}"), key_algorithm, - phantom_data: PhantomData::default(), + phantom_data: PhantomData, }) } diff --git a/images/Dockerfile.build b/images/Dockerfile.build index 46fc3fc9b..c5e3c169d 100644 --- a/images/Dockerfile.build +++ b/images/Dockerfile.build @@ -40,7 +40,7 @@ LABEL org.opencontainers.image.source https://github.com/aurae-runtime/aurae ## Define ARGs ARG CACHE_VERSION=v0 -ARG BUF_VERSION=1.11.0 +ARG BUF_VERSION=1.25.0 ARG PROTOC_VERSION=1.5.1 ARG GH_CLI_VERSION=2.21.2 @@ -68,7 +68,7 @@ RUN apt-get update && \ git \ make \ musl-tools \ - protobuf-compiler + protobuf-compiler RUN rm -rf /var/lib/apt/lists/* ## Setup Rust diff --git a/images/Dockerfile.nested b/images/Dockerfile.nested index 6631d0615..2cf94c02c 100644 --- a/images/Dockerfile.nested +++ b/images/Dockerfile.nested @@ -35,7 +35,7 @@ LABEL org.opencontainers.image.source https://github.com/aurae-runtime/aurae ## Define ARGs ARG CACHE_VERSION=v0 -ARG BUF_VERSION=1.11.0 +ARG BUF_VERSION=1.25.0 ARG VALE_VERSION=2.21.3 ARG PROTOC_VERSION=1.5.1 diff --git a/images/Dockerfile.test b/images/Dockerfile.test index ea7848b34..cd423a60f 100644 --- a/images/Dockerfile.test +++ b/images/Dockerfile.test @@ -40,7 +40,7 @@ LABEL org.opencontainers.image.source https://github.com/aurae-runtime/aurae ## Define ARGs ARG CACHE_VERSION=v0 -ARG BUF_VERSION=1.11.0 +ARG BUF_VERSION=1.25.0 ARG VALE_VERSION=2.21.3 ARG PROTOC_VERSION=1.5.1 @@ -88,4 +88,4 @@ RUN curl -sSl -J -L "https://github.com/errata-ai/vale/releases/download/v${VALE RUN cargo install cargo-udeps RUN cargo install cargo-deny -WORKDIR /aurae \ No newline at end of file +WORKDIR /aurae