diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 00000000000..4eb0d0d6d90 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,3 @@ +# The following are aliases you can use with "cargo command_name" +[alias] +"clippy:fix" = "clippy --all --fix --allow-dirty --allow-staged" diff --git a/.changeset/funny-rockets-speak.md b/.changeset/funny-rockets-speak.md new file mode 100644 index 00000000000..c46607702b7 --- /dev/null +++ b/.changeset/funny-rockets-speak.md @@ -0,0 +1,10 @@ +--- +'hive-console-sdk-rs': patch +'hive-apollo-router-plugin': minor +--- + +Extract Hive Console integration implementation into a new package `hive-console-sdk` which can +be used by any Rust library for Hive Console integration + +It also includes a refactor to use less Mutexes like replacing `lru` + `Mutex` with the thread-safe `moka` package. +Only one place that handles queueing uses `Mutex` now. diff --git a/.changeset/six-teeth-attack.md b/.changeset/six-teeth-attack.md new file mode 100644 index 00000000000..3336d13e22f --- /dev/null +++ b/.changeset/six-teeth-attack.md @@ -0,0 +1,5 @@ +--- +'hive-apollo-router-plugin': patch +--- + +Fixes a bug when Persisted Operations are enabled by default which should be explicitly enabled diff --git a/.github/workflows/apollo-router-release.yaml b/.github/workflows/apollo-router-release.yaml index 1144b6c7643..82175b6db47 100644 --- a/.github/workflows/apollo-router-release.yaml +++ b/.github/workflows/apollo-router-release.yaml @@ -6,6 +6,7 @@ on: - main paths: - 'packages/libraries/router/**' + - 'packages/libraries/sdk-rs/**' - 'docker/router.dockerfile' - 'scripts/compress/**' - 'configs/cargo/Cargo.lock' @@ -16,6 +17,7 @@ on: push: paths: - 'packages/libraries/router/**' + - 'packages/libraries/sdk-rs/**' - 'docker/router.dockerfile' - 'scripts/compress/**' - 'configs/cargo/Cargo.lock' @@ -60,7 +62,7 @@ jobs: github_org="graphql-hive" router_version=$(cargo tree -i apollo-router --quiet | head -n 1 | awk -F" v" '{print $2}') plugin_version=$(jq -r '.version' packages/libraries/router/package.json) - has_changes=$(git diff HEAD~ HEAD --name-only -- 'packages/libraries/router/Cargo.toml' 'Cargo.lock' 'configs/cargo/Cargo.lock' 'packages/libraries/router/package.json') + has_changes=$(git diff HEAD~ HEAD --name-only -- 'packages/libraries/router/Cargo.toml' 'packages/libraries/router/package.json' 'packages/libraries/sdk-rs/Cargo.toml' 'packages/libraries/sdk-rs/package.json' 'Cargo.lock' 'configs/cargo/Cargo.lock') if [ "$has_changes" ]; then image_tag_version="router${router_version}-plugin${plugin_version}" diff --git a/.github/workflows/publish-rust.yaml b/.github/workflows/publish-rust.yaml index 9ce7663df8a..9d6f7de2eb0 100644 --- a/.github/workflows/publish-rust.yaml +++ b/.github/workflows/publish-rust.yaml @@ -27,7 +27,7 @@ jobs: - name: Look for changes id: rust_changed run: | - lines=$( git diff HEAD~ HEAD --name-only -- 'packages/libraries/router' 'Cargo.toml' 'configs/cargo/Cargo.lock' | wc -l ) + lines=$( git diff HEAD~ HEAD --name-only -- 'packages/libraries/router' 'packages/libraries/sdk-rs' 'Cargo.toml' 'configs/cargo/Cargo.lock' | wc -l ) if [ $lines -gt 0 ]; then echo 'rust_changed=true' >> $GITHUB_OUTPUT fi diff --git a/.github/workflows/release-stable.yaml b/.github/workflows/release-stable.yaml index 9cdd2696204..bb612b86098 100644 --- a/.github/workflows/release-stable.yaml +++ b/.github/workflows/release-stable.yaml @@ -123,9 +123,8 @@ jobs: echo "crate_version=$VERSION" >> $GITHUB_OUTPUT echo "crate_publish=true" >> $GITHUB_OUTPUT - - name: release hive-apollo-router-plugin to Crates.io + - name: release to Crates.io if: steps.rust-crate.outputs.crate_publish == 'true' run: | - cd packages/libraries/router cargo login ${{ secrets.CARGO_REGISTRY_TOKEN }} cargo publish --allow-dirty --no-verify diff --git a/.vscode/settings.json b/.vscode/settings.json index 7b73ca1eced..f52f521d4e9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -39,5 +39,11 @@ ], "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[yaml]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[rust]": { + "editor.defaultFormatter": "rust-lang.rust-analyzer" } } diff --git a/Cargo.toml b/Cargo.toml index 5e252f84f85..bf912815900 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,3 @@ [workspace] resolver = "2" -members = ["packages/libraries/router", "scripts/compress"] +members = ["packages/libraries/router", "scripts/compress", "packages/libraries/sdk-rs"] diff --git a/configs/cargo/Cargo.lock b/configs/cargo/Cargo.lock index 6648f8032fd..32a652881a3 100644 --- a/configs/cargo/Cargo.lock +++ b/configs/cargo/Cargo.lock @@ -4,11 +4,18 @@ version = 4 [[package]] name = "addr2line" -version = "0.24.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" dependencies = [ + "cpp_demangle", + "fallible-iterator", "gimli", + "memmap2", + "object 0.37.3", + "rustc-demangle", + "smallvec", + "typed-arena", ] [[package]] @@ -25,7 +32,7 @@ checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", "const-random", - "getrandom 0.3.3", + "getrandom 0.3.4", "once_cell", "serde", "version_check", @@ -34,9 +41,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -62,12 +69,6 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[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" @@ -79,15 +80,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "apollo-compiler" @@ -99,11 +100,11 @@ dependencies = [ "apollo-parser", "ariadne", "futures", - "indexmap 2.10.0", + "indexmap 2.12.0", "rowan", "serde", "serde_json_bytes", - "thiserror 2.0.12", + "thiserror 2.0.17", "triomphe", "typed-arena", ] @@ -121,19 +122,18 @@ dependencies = [ [[package]] name = "apollo-federation" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1595bfb0fd31882d0b2dd258205ccac93a43c0ae37038a1a6e1cc2834eaf958f" +checksum = "e5f653ee37d59599d388436138554f12a4362d51507b97ffc2b68bcc032bea9d" dependencies = [ "apollo-compiler", - "countmap", "derive_more", "either", "encoding_rs", "form_urlencoded", "hashbrown 0.16.0", "http 1.3.1", - "indexmap 2.10.0", + "indexmap 2.12.0", "itertools 0.14.0", "levenshtein", "line-col", @@ -142,9 +142,9 @@ dependencies = [ "multimap 0.10.1", "nom", "nom_locate", - "parking_lot 0.12.4", + "parking_lot 0.12.5", "percent-encoding", - "petgraph 0.8.2", + "petgraph 0.8.3", "regex", "serde", "serde_json", @@ -152,7 +152,7 @@ dependencies = [ "shape", "strum", "strum_macros", - "thiserror 2.0.12", + "thiserror 2.0.17", "time", "tracing", "url", @@ -171,15 +171,17 @@ dependencies = [ [[package]] name = "apollo-router" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c42838f9c02d386ea6b69e43450090cfe8bbb00863b2d5b7d01bf43937c09f" +checksum = "0dd095773afd8d690aa1c1edf5e499e9fd7eecc1246c8c5224480eb07863b6a0" dependencies = [ + "addr2line", "ahash", "anyhow", "apollo-compiler", "apollo-environment-detector", "apollo-federation", + "astral-tokio-tar", "async-compression", "async-trait", "aws-config", @@ -189,7 +191,7 @@ dependencies = [ "aws-smithy-http-client", "aws-smithy-runtime-api", "aws-types", - "axum 0.8.4", + "axum 0.8.6", "axum-extra", "base64 0.22.1", "blake3", @@ -224,11 +226,11 @@ dependencies = [ "http-serde", "humantime", "humantime-serde", - "hyper 1.6.0", + "hyper 1.7.0", "hyper-rustls", "hyper-util", "hyperlocal", - "indexmap 2.10.0", + "indexmap 2.12.0", "itertools 0.14.0", "itoa", "jsonpath-rust", @@ -247,7 +249,8 @@ dependencies = [ "multimap 0.9.1", "notify", "nu-ansi-term", - "num-traits 0.2.19", + "num-traits", + "object 0.36.7", "oci-client", "once_cell", "opentelemetry", @@ -259,14 +262,14 @@ dependencies = [ "opentelemetry-semantic-conventions", "opentelemetry-zipkin", "opentelemetry_sdk", - "parking_lot 0.12.4", + "parking_lot 0.12.5", "paste", "pin-project-lite", "prometheus", "prost", "prost-types", "proteus", - "rand 0.9.1", + "rand 0.9.2", "regex", "reqwest", "rhai", @@ -290,14 +293,14 @@ dependencies = [ "sha2", "shellexpand", "similar", - "sqlx", "static_assertions", "strum", "strum_macros", "sys-info", "sysinfo", - "thiserror 2.0.12", + "thiserror 2.0.17", "tikv-jemalloc-ctl", + "tikv-jemalloc-sys", "tikv-jemallocator", "time", "tokio", @@ -374,6 +377,22 @@ dependencies = [ "serde_json", ] +[[package]] +name = "astral-tokio-tar" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec179a06c1769b1e42e1e2cbe74c7dcdb3d6383c838454d063eaac5bbb7ebbe5" +dependencies = [ + "filetime", + "futures-core", + "libc", + "portable-atomic", + "rustc-hash 2.1.1", + "tokio", + "tokio-stream", + "xattr", +] + [[package]] name = "async-attributes" version = "1.1.2" @@ -409,25 +428,23 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.26" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f41778d8baa0b8984a101f48ec5d2e5b0d23a3f9235b2066eef29c3472bb9" +checksum = "5a89bce6054c720275ac2432fbba080a66a2106a44a1b804553930ca6909f4e0" dependencies = [ - "brotli", - "flate2", + "compression-codecs", + "compression-core", "futures-core", - "memchr", + "futures-io", "pin-project-lite", "tokio", - "zstd", - "zstd-safe", ] [[package]] name = "async-executor" -version = "1.13.2" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa" +checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" dependencies = [ "async-task", "concurrent-queue", @@ -454,11 +471,11 @@ dependencies = [ [[package]] name = "async-io" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3" +checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" dependencies = [ - "async-lock", + "autocfg", "cfg-if", "concurrent-queue", "futures-io", @@ -467,17 +484,16 @@ dependencies = [ "polling", "rustix", "slab", - "tracing", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "async-lock" -version = "3.4.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" dependencies = [ - "event-listener 5.4.0", + "event-listener 5.4.1", "event-listener-strategy", "pin-project-lite", ] @@ -493,9 +509,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde3f4e40e6021d7acffc90095cbd6dc54cb593903d1de5832f435eb274b85dc" +checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" dependencies = [ "async-channel 2.5.0", "async-io", @@ -504,17 +520,16 @@ dependencies = [ "async-task", "blocking", "cfg-if", - "event-listener 5.4.0", + "event-listener 5.4.1", "futures-lite", "rustix", - "tracing", ] [[package]] name = "async-signal" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7605a4e50d4b06df3898d5a70bf5fde51ed9059b0434b73105193bc27acce0d" +checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" dependencies = [ "async-io", "async-lock", @@ -525,14 +540,14 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "async-std" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24" +checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b" dependencies = [ "async-attributes", "async-channel 1.9.0", @@ -575,7 +590,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -586,22 +601,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.88" +version = "0.1.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits 0.2.19", + "syn 2.0.108", ] [[package]] @@ -618,9 +624,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-config" -version = "1.8.1" +version = "1.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c18d005c70d2b9c0c1ea8876c039db0ec7fb71164d25c73ccea21bf41fd02171" +checksum = "37cf2b6af2a95a20e266782b4f76f1a5e12bf412a9db2de9c1e9123b9d8c0ad8" dependencies = [ "aws-credential-types", "aws-runtime", @@ -643,9 +649,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.3" +version = "1.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687bc16bc431a8533fe0097c7f0182874767f920989d7260950172ae8e3c4465" +checksum = "faf26925f4a5b59eb76722b63c2892b1d70d06fa053c72e4a100ec308c1d47bc" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -655,9 +661,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.5.8" +version = "1.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6c68419d8ba16d9a7463671593c54f81ba58cab466e9b759418da606dcc2e2" +checksum = "bfa006bb32360ed90ac51203feafb9d02e3d21046e1fd3a450a404b90ea73e5d" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -679,9 +685,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.76.0" +version = "1.88.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb1cd79a3412751a341a28e2cd0d6fa4345241976da427b075a0c0cd5409f886" +checksum = "d30990923f4f675523c51eb1c0dec9b752fb267b36a61e83cbc219c9d86da715" dependencies = [ "aws-credential-types", "aws-runtime", @@ -702,9 +708,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.3.3" +version = "1.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfb9021f581b71870a17eac25b52335b82211cdc092e02b6876b2bcefa61666" +checksum = "bffc03068fbb9c8dd5ce1c6fb240678a5cffb86fb2b7b1985c999c4b83c8df68" dependencies = [ "aws-credential-types", "aws-smithy-http", @@ -724,9 +730,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.2.5" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e190749ea56f8c42bf15dd76c65e14f8f765233e6df9b0506d9d934ebef867c" +checksum = "127fcfad33b7dfc531141fda7e1c402ac65f88aca5511a4d31e2e3d2cd01ce9c" dependencies = [ "futures-util", "pin-project-lite", @@ -735,9 +741,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.62.1" +version = "0.62.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99335bec6cdc50a346fda1437f9fefe33abf8c99060739a546a16457f2862ca9" +checksum = "3feafd437c763db26aa04e0cc7591185d0961e64c61885bece0fb9d50ceac671" dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", @@ -755,16 +761,16 @@ dependencies = [ [[package]] name = "aws-smithy-http-client" -version = "1.0.6" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f108f1ca850f3feef3009bdcc977be201bca9a91058864d9de0684e64514bee0" +checksum = "1053b5e587e6fa40ce5a79ea27957b04ba660baa02b28b7436f64850152234f1" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", "h2", "http 1.3.1", - "hyper 1.6.0", + "hyper 1.7.0", "hyper-rustls", "hyper-util", "pin-project-lite", @@ -772,33 +778,34 @@ dependencies = [ "rustls-native-certs", "rustls-pki-types", "tokio", + "tokio-rustls", "tower 0.5.2", "tracing", ] [[package]] name = "aws-smithy-json" -version = "0.61.4" +version = "0.61.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a16e040799d29c17412943bdbf488fd75db04112d0c0d4b9290bacf5ae0014b9" +checksum = "cff418fc8ec5cadf8173b10125f05c2e7e1d46771406187b2c878557d4503390" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-observability" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9364d5989ac4dd918e5cc4c4bdcc61c9be17dcd2586ea7f69e348fc7c6cab393" +checksum = "2d1881b1ea6d313f9890710d65c158bdab6fb08c91ea825f74c1c8c357baf4cc" dependencies = [ "aws-smithy-runtime-api", ] [[package]] name = "aws-smithy-query" -version = "0.60.7" +version = "0.60.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" +checksum = "d28a63441360c477465f80c7abac3b9c4d075ca638f982e605b7dc2a2c7156c9" dependencies = [ "aws-smithy-types", "urlencoding", @@ -806,9 +813,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.8.4" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3aaec682eb189e43c8a19c3dab2fe54590ad5f2cc2d26ab27608a20f2acf81c" +checksum = "40ab99739082da5347660c556689256438defae3bcefd66c52b095905730e404" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -829,9 +836,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.8.3" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852b9226cb60b78ce9369022c0df678af1cac231c882d5da97a0c4e03be6e67" +checksum = "3683c5b152d2ad753607179ed71988e8cfd52964443b4f74fd8e552d0bbfeb46" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -846,9 +853,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d498595448e43de7f4296b7b7a18a8a02c61ec9349128c80a368f7c3b4ab11a8" +checksum = "9f5b3a7486f6690ba25952cabf1e7d75e34d69eaff5081904a47bc79074d6457" dependencies = [ "base64-simd", "bytes", @@ -869,18 +876,18 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.10" +version = "0.60.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db87b96cb1b16c024980f133968d52882ca0daaee3a086c6decc500f6c99728" +checksum = "e9c34127e8c624bc2999f3b657e749c1393bedc9cd97b92a804db8ced4d2e163" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "1.3.7" +version = "1.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a322fec39e4df22777ed3ad8ea868ac2f94cd15e1a55f6ee8d8d6305057689a" +checksum = "e2fd329bf0e901ff3f60425691410c69094dc2a1f34b331f37bfc4e9ac1565a1" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -919,18 +926,18 @@ dependencies = [ [[package]] name = "axum" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5" +checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871" dependencies = [ - "axum-core 0.5.2", + "axum-core 0.5.5", "bytes", "form_urlencoded", "futures-util", "http 1.3.1", "http-body 1.0.1", "http-body-util", - "hyper 1.6.0", + "hyper 1.7.0", "hyper-util", "itoa", "matchit 0.8.4", @@ -938,8 +945,7 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", - "rustversion", - "serde", + "serde_core", "serde_json", "serde_path_to_error", "serde_urlencoded", @@ -973,9 +979,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.5.2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6" +checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22" dependencies = [ "bytes", "futures-core", @@ -984,7 +990,6 @@ dependencies = [ "http-body-util", "mime", "pin-project-lite", - "rustversion", "sync_wrapper", "tower-layer", "tower-service", @@ -993,12 +998,12 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bf463831f5131b7d3c756525b305d40f1185b688565648a92e1392ca35713d" +checksum = "9963ff19f40c6102c76756ef0a46004c0d58957d87259fc9208ff8441c12ab96" dependencies = [ - "axum 0.8.4", - "axum-core 0.5.2", + "axum 0.8.6", + "axum-core 0.5.5", "bytes", "futures-util", "headers", @@ -1008,25 +1013,10 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "serde", - "tower 0.5.2", + "serde_core", "tower-layer", "tower-service", -] - -[[package]] -name = "backtrace" -version = "0.3.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", + "tracing", ] [[package]] @@ -1057,12 +1047,6 @@ dependencies = [ "vsimd", ] -[[package]] -name = "base64ct" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" - [[package]] name = "basic-cookies" version = "0.1.5" @@ -1112,12 +1096,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" -dependencies = [ - "serde", -] +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "blake3" @@ -1173,9 +1154,9 @@ checksum = "3eeab4423108c5d7c744f4d234de88d18d636100093ae04caf4825134b9c3a32" [[package]] name = "brotli" -version = "8.0.1" +version = "8.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d" +checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1194,9 +1175,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ "memchr", "serde", @@ -1211,7 +1192,7 @@ dependencies = [ "proc-macro2", "quote", "str_inflector", - "syn 2.0.104", + "syn 2.0.108", "try_match", ] @@ -1260,10 +1241,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.29" +version = "1.2.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362" +checksum = "739eb0f94557554b3ca9a86d2d37bebd49c5e6d0c1d2bda35ba5bdac830befc2" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -1271,9 +1253,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" @@ -1283,17 +1265,16 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.19", + "num-traits", "serde", "wasm-bindgen", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -1309,9 +1290,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.41" +version = "4.5.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9" +checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623" dependencies = [ "clap_builder", "clap_derive", @@ -1319,9 +1300,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.41" +version = "4.5.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d" +checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0" dependencies = [ "anstyle", "clap_lex", @@ -1329,21 +1310,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.41" +version = "4.5.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" +checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "clap_lex" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" +checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "combine" @@ -1363,6 +1344,26 @@ dependencies = [ "tar", ] +[[package]] +name = "compression-codecs" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8a506ec4b81c460798f572caead636d57d3d7e940f998160f52bd254bf2d23" +dependencies = [ + "brotli", + "compression-core", + "flate2", + "memchr", + "zstd", + "zstd-safe", +] + +[[package]] +name = "compression-core" +version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb" + [[package]] name = "concolor" version = "0.1.1" @@ -1394,23 +1395,17 @@ dependencies = [ [[package]] name = "console" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e09ced7ebbccb63b4c65413d821f2e00ce54c5ca4514ddc6b3c892fdbcbc69d" +checksum = "b430743a6eb14e9764d4260d4c0d8123087d504eeb9c48f2b2a5e810dd369df4" dependencies = [ "encode_unicode", "libc", "once_cell", - "unicode-width 0.2.1", - "windows-sys 0.60.2", + "unicode-width 0.2.2", + "windows-sys 0.61.2", ] -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - [[package]] name = "const-random" version = "0.1.18" @@ -1433,9 +1428,9 @@ dependencies = [ [[package]] name = "const_format" -version = "0.2.34" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" +checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad" dependencies = [ "const_format_proc_macros", ] @@ -1498,15 +1493,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "countmap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef2a403c4af585607826502480ab6e453f320c230ef67255eee21f0cc72c0a6" -dependencies = [ - "num-traits 0.1.43", -] - [[package]] name = "countme" version = "3.0.1" @@ -1514,29 +1500,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] -name = "cpufeatures" -version = "0.2.17" +name = "cpp_demangle" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +checksum = "f2bb79cb74d735044c972aae58ed0aaa9a837e85b01106a54c39e42e97f62253" dependencies = [ - "libc", + "cfg-if", ] [[package]] -name = "crc" -version = "3.3.0" +name = "cpufeatures" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ - "crc-catalog", + "libc", ] -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - [[package]] name = "crc16" version = "0.4.0" @@ -1576,15 +1556,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.21" @@ -1623,8 +1594,18 @@ version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.20.11", + "darling_macro 0.20.11", +] + +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core 0.21.3", + "darling_macro 0.21.3", ] [[package]] @@ -1638,7 +1619,21 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.104", + "syn 2.0.108", +] + +[[package]] +name = "darling_core" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.108", ] [[package]] @@ -1647,9 +1642,20 @@ version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "darling_core", + "darling_core 0.20.11", "quote", - "syn 2.0.104", + "syn 2.0.108", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +dependencies = [ + "darling_core 0.21.3", + "quote", + "syn 2.0.108", ] [[package]] @@ -1663,7 +1669,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.11", + "parking_lot_core 0.9.12", "serde", ] @@ -1675,12 +1681,12 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" [[package]] name = "deadpool" -version = "0.10.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" +checksum = "0be2b1d1d6ec8d846f05e137292d0b89133caf95ef33695424c09568bdd39b1b" dependencies = [ - "async-trait", "deadpool-runtime", + "lazy_static", "num_cpus", "tokio", ] @@ -1691,25 +1697,14 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" -[[package]] -name = "der" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - [[package]] name = "deranged" -version = "0.4.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", - "serde", + "serde_core", ] [[package]] @@ -1738,10 +1733,10 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ - "darling", + "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -1751,7 +1746,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -1772,7 +1767,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", "unicode-xid", ] @@ -1789,7 +1784,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", - "const-oid", "crypto-common", "subtle", ] @@ -1821,8 +1815,8 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users 0.5.0", - "windows-sys 0.60.2", + "redox_users 0.5.2", + "windows-sys 0.61.2", ] [[package]] @@ -1844,7 +1838,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -1858,12 +1852,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - [[package]] name = "downcast" version = "0.11.0" @@ -1878,18 +1866,15 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" -dependencies = [ - "serde", -] [[package]] name = "email_address" @@ -1933,7 +1918,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -1963,23 +1948,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", -] - -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if", - "home", - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] @@ -1990,9 +1964,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "5.4.0" +version = "5.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" dependencies = [ "concurrent-queue", "parking", @@ -2005,10 +1979,16 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" dependencies = [ - "event-listener 5.4.0", + "event-listener 5.4.1", "pin-project-lite", ] +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fancy-regex" version = "0.14.0" @@ -2039,16 +2019,22 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "filetime" -version = "0.2.25" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed" dependencies = [ "cfg-if", "libc", "libredox", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -2063,9 +2049,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" [[package]] name = "flate2" -version = "1.1.2" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", "miniz_oxide", @@ -2077,7 +2063,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8" dependencies = [ - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -2091,17 +2077,6 @@ dependencies = [ "serde", ] -[[package]] -name = "flume" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - [[package]] name = "fnv" version = "1.0.7" @@ -2122,9 +2097,9 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] @@ -2159,13 +2134,13 @@ dependencies = [ "fred-macros", "futures", "log", - "parking_lot 0.12.4", + "parking_lot 0.12.5", "rand 0.8.5", "redis-protocol", "rustls", "rustls-native-certs", "semver", - "socket2", + "socket2 0.5.10", "tokio", "tokio-rustls", "tokio-stream", @@ -2182,7 +2157,7 @@ checksum = "1458c6e22d36d61507034d5afecc64f105c1d39712b7ac6ec3b352c423f715cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -2237,17 +2212,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot 0.12.4", -] - [[package]] name = "futures-io" version = "0.3.31" @@ -2256,9 +2220,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" +checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" dependencies = [ "fastrand", "futures-core", @@ -2275,7 +2239,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -2308,25 +2272,11 @@ dependencies = [ "slab", ] -[[package]] -name = "generator" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d18470a76cb7f8ff746cf1f7470914f900252ec36bbc40b569d74b1258446827" -dependencies = [ - "cc", - "cfg-if", - "libc", - "log", - "rustversion", - "windows 0.61.3", -] - [[package]] name = "generic-array" -version = "0.14.7" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" dependencies = [ "typenum", "version_check", @@ -2341,21 +2291,21 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "js-sys", "libc", "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "wasip2", "wasm-bindgen", ] @@ -2368,7 +2318,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -2379,26 +2329,30 @@ checksum = "d1323e4e10ffd5d48a21ea37f8d4e3b15dd841121d1301a86122fa0984bedf0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "gimli" -version = "0.31.1" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" +dependencies = [ + "fallible-iterator", + "stable_deref_trait", +] [[package]] name = "glob" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "globset" -version = "0.4.16" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5" +checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3" dependencies = [ "aho-corasick", "bstr", @@ -2502,9 +2456,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785" +checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386" dependencies = [ "atomic-waker", "bytes", @@ -2512,7 +2466,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.3.1", - "indexmap 2.10.0", + "indexmap 2.12.0", "slab", "tokio", "tokio-util", @@ -2533,12 +2487,10 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hashbrown" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ - "allocator-api2", - "equivalent", "foldhash 0.1.5", ] @@ -2553,15 +2505,6 @@ dependencies = [ "foldhash 0.2.0", ] -[[package]] -name = "hashlink" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" -dependencies = [ - "hashbrown 0.15.4", -] - [[package]] name = "hdrhistogram" version = "7.5.4" @@ -2569,7 +2512,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" dependencies = [ "byteorder", - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -2639,9 +2582,9 @@ dependencies = [ "idna", "ipnet", "once_cell", - "rand 0.9.1", + "rand 0.9.2", "ring", - "thiserror 2.0.12", + "thiserror 2.0.17", "tinyvec", "tokio", "tracing", @@ -2660,35 +2603,36 @@ dependencies = [ "ipconfig", "moka", "once_cell", - "parking_lot 0.12.4", - "rand 0.9.1", + "parking_lot 0.12.5", + "rand 0.9.2", "resolv-conf", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.17", "tokio", "tracing", ] [[package]] name = "hive-apollo-router-plugin" -version = "2.1.3" +version = "2.2.0" dependencies = [ "anyhow", "apollo-router", "async-trait", - "axum-core 0.5.2", + "axum-core 0.5.5", "futures", "graphql-parser-hive-fork", "graphql-tools", + "hive-console-sdk", "http 1.3.1", "http-body-util", "httpmock", - "hyper 1.6.0", + "hyper 1.7.0", "jsonschema 0.29.1", "lazy_static", "lru", "md5", - "rand 0.9.1", + "rand 0.9.2", "reqwest", "reqwest-middleware", "reqwest-retry", @@ -2696,37 +2640,42 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror 2.0.12", + "thiserror 2.0.17", "tokio", "tower 0.5.2", "tracing", ] [[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +name = "hive-console-sdk" +version = "0.0.0" dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", + "anyhow", + "async-trait", + "axum-core 0.5.5", + "graphql-parser-hive-fork", + "graphql-tools", + "md5", + "moka", + "reqwest", + "reqwest-middleware", + "reqwest-retry", + "serde", + "serde_json", + "sha2", + "thiserror 2.0.17", + "tokio", + "tokio-util", + "tracing", ] [[package]] -name = "home" -version = "0.5.11" +name = "hmac" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "windows-sys 0.59.0", + "digest", ] [[package]] @@ -2852,9 +2801,9 @@ dependencies = [ [[package]] name = "humantime" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" +checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" [[package]] name = "humantime-serde" @@ -2882,7 +2831,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.5.10", "tokio", "tower-service", "tracing", @@ -2891,13 +2840,14 @@ dependencies = [ [[package]] name = "hyper" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" +checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" dependencies = [ + "atomic-waker", "bytes", "futures-channel", - "futures-util", + "futures-core", "h2", "http 1.3.1", "http-body 1.0.1", @@ -2905,6 +2855,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", + "pin-utils", "smallvec", "tokio", "want", @@ -2917,7 +2868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ "http 1.3.1", - "hyper 1.6.0", + "hyper 1.7.0", "hyper-util", "rustls", "rustls-native-certs", @@ -2925,7 +2876,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 1.0.1", + "webpki-roots", ] [[package]] @@ -2934,7 +2885,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 1.6.0", + "hyper 1.7.0", "hyper-util", "pin-project-lite", "tokio", @@ -2947,16 +2898,19 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" dependencies = [ + "base64 0.22.1", "bytes", "futures-channel", "futures-core", "futures-util", "http 1.3.1", "http-body 1.0.1", - "hyper 1.6.0", + "hyper 1.7.0", + "ipnet", "libc", + "percent-encoding", "pin-project-lite", - "socket2", + "socket2 0.6.1", "tokio", "tower-service", "tracing", @@ -2970,7 +2924,7 @@ checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" dependencies = [ "hex", "http-body-util", - "hyper 1.6.0", + "hyper 1.7.0", "hyper-util", "pin-project-lite", "tokio", @@ -2979,9 +2933,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.63" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2989,7 +2943,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.61.2", + "windows-core 0.62.2", ] [[package]] @@ -3003,9 +2957,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", @@ -3016,9 +2970,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -3029,11 +2983,10 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", @@ -3044,42 +2997,38 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" dependencies = [ - "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", "icu_provider", - "potential_utf", "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" [[package]] name = "icu_provider" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", - "stable_deref_trait", - "tinystr", "writeable", "yoke", "zerofrom", @@ -3095,9 +3044,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -3127,13 +3076,14 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.10.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", - "hashbrown 0.15.4", + "hashbrown 0.16.0", "serde", + "serde_core", ] [[package]] @@ -3142,7 +3092,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "inotify-sys", "libc", ] @@ -3178,24 +3128,13 @@ dependencies = [ "ghost", ] -[[package]] -name = "io-uring" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013" -dependencies = [ - "bitflags 2.9.1", - "cfg-if", - "libc", -] - [[package]] name = "ipconfig" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2", + "socket2 0.5.10", "widestring", "windows-sys 0.48.0", "winreg", @@ -3219,13 +3158,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3254,19 +3193,19 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jobserver" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "libc", ] [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" dependencies = [ "once_cell", "wasm-bindgen", @@ -3335,7 +3274,7 @@ dependencies = [ "idna", "itoa", "num-cmp", - "num-traits 0.2.19", + "num-traits", "once_cell", "percent-encoding", "referencing 0.33.0", @@ -3441,9 +3380,6 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin 0.9.8", -] [[package]] name = "levenshtein" @@ -3453,35 +3389,19 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" [[package]] name = "libc" -version = "0.2.174" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" - -[[package]] -name = "libm" -version = "0.2.15" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libredox" -version = "0.1.4" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "libc", - "redox_syscall 0.5.13", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" -dependencies = [ - "pkg-config", - "vcpkg", + "redox_syscall 0.5.18", ] [[package]] @@ -3498,76 +3418,62 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linkme" -version = "0.3.33" +version = "0.3.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b1703c00b2a6a70738920544aa51652532cacddfec2e162d2e29eae01e665c" +checksum = "5e3283ed2d0e50c06dd8602e0ab319bb048b6325d0bba739db64ed8205179898" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.33" +version = "0.3.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d55ca5d5a14363da83bf3c33874b8feaa34653e760d5216d7ef9829c88001a" +checksum = "e5cec0ec4228b4853bb129c84dbf093a27e6c7a20526da046defc334a1b017f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "litemap" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "lock_api" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", "serde", ] [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" dependencies = [ "value-bag", ] -[[package]] -name = "loom" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "tracing", - "tracing-subscriber", -] - [[package]] name = "lru" -version = "0.16.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed" +checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f" dependencies = [ - "hashbrown 0.15.4", + "hashbrown 0.16.0", ] [[package]] @@ -3597,16 +3503,6 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] - [[package]] name = "md5" version = "0.7.0" @@ -3621,9 +3517,18 @@ checksum = "f490ea2ae935dd8ac89c472d4df28c7f6b87cc20767e1b21fd5ed6a16e7f61e4" [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" + +[[package]] +name = "memmap2" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490" +dependencies = [ + "libc", +] [[package]] name = "mime" @@ -3654,18 +3559,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] name = "mio" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" dependencies = [ "libc", "log", - "wasi 0.11.1+wasi-snapshot-preview1", - "windows-sys 0.59.0", + "wasi", + "windows-sys 0.61.2", ] [[package]] @@ -3691,25 +3597,27 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "moka" -version = "0.12.10" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926" +checksum = "8261cd88c312e0004c1d51baad2980c66528dfdb2bee62003e643a4d8f86b077" dependencies = [ + "async-lock", "crossbeam-channel", "crossbeam-epoch", "crossbeam-utils", - "loom", - "parking_lot 0.12.4", + "equivalent", + "event-listener 5.4.1", + "futures-util", + "parking_lot 0.12.5", "portable-atomic", "rustc_version", "smallvec", "tagptr", - "thiserror 1.0.69", "uuid", ] @@ -3796,7 +3704,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "inotify", "kqueue", "libc", @@ -3824,11 +3732,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.50.1" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3842,7 +3750,7 @@ dependencies = [ "num-integer", "num-iter", "num-rational", - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -3852,24 +3760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", - "num-traits 0.2.19", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits 0.2.19", - "rand 0.8.5", - "smallvec", - "zeroize", + "num-traits", ] [[package]] @@ -3884,7 +3775,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -3899,7 +3790,7 @@ version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -3910,7 +3801,7 @@ checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -3921,16 +3812,7 @@ checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ "num-bigint", "num-integer", - "num-traits 0.2.19", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -3940,7 +3822,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -3964,18 +3845,18 @@ dependencies = [ [[package]] name = "objc2-core-foundation" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166" +checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", ] [[package]] name = "objc2-io-kit" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a" +checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15" dependencies = [ "libc", "objc2-core-foundation", @@ -3987,7 +3868,20 @@ version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ + "flate2", + "memchr", + "ruzstd 0.7.3", +] + +[[package]] +name = "object" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" +dependencies = [ + "flate2", "memchr", + "ruzstd 0.8.1", ] [[package]] @@ -4010,7 +3904,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror 2.0.12", + "thiserror 2.0.17", "tokio", "tracing", "unicase", @@ -4018,9 +3912,9 @@ dependencies = [ [[package]] name = "oci-spec" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e9beda9d92fac7bf4904c34c83340ef1024159faee67179a04e0277523da33" +checksum = "2eb4684653aeaba48dea019caa17b2773e1212e281d50b6fa759f36fe032239d" dependencies = [ "const_format", "derive_builder", @@ -4030,7 +3924,7 @@ dependencies = [ "serde_json", "strum", "strum_macros", - "thiserror 2.0.12", + "thiserror 2.0.17", ] [[package]] @@ -4231,12 +4125,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", - "parking_lot_core 0.9.11", + "parking_lot_core 0.9.12", ] [[package]] @@ -4255,15 +4149,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.13", + "redox_syscall 0.5.18", "smallvec", - "windows-targets 0.52.6", + "windows-link 0.2.1", ] [[package]] @@ -4274,45 +4168,35 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pem" -version = "3.0.5" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3" +checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" dependencies = [ "base64 0.22.1", - "serde", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", + "serde_core", ] [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" +checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4" dependencies = [ "memchr", - "thiserror 2.0.12", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb056d9e8ea77922845ec74a1c4e8fb17e7c218cc4fc11a15c5d25e189aa40bc" +checksum = "187da9a3030dbafabbbfb20cb323b976dc7b7ce91fcd84f2f74d6e31d378e2de" dependencies = [ "pest", "pest_generator", @@ -4320,22 +4204,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e404e638f781eb3202dc82db6760c8ae8a1eeef7fb3fa8264b2ef280504966" +checksum = "49b401d98f5757ebe97a26085998d6c0eecec4995cad6ab7fc30ffdf4b052843" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "pest_meta" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd1101f170f5903fde0914f899bb503d9ff5271d7ba76bbb70bea63690cc0d5" +checksum = "72f27a2cfee9f9039c4d86faa5af122a0ac3851441a34865b8a043b46be0065a" dependencies = [ "pest", "sha2", @@ -4348,18 +4232,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset 0.4.2", - "indexmap 2.10.0", + "indexmap 2.12.0", ] [[package]] name = "petgraph" -version = "0.8.2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" +dependencies = [ + "fixedbitset 0.5.7", + "indexmap 2.12.0", +] + +[[package]] +name = "petgraph" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54acf3a685220b533e437e264e4d932cfbdc4cc7ec0cd232ed73c08d03b8a7ca" +checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455" dependencies = [ "fixedbitset 0.5.7", - "hashbrown 0.15.4", - "indexmap 2.10.0", + "hashbrown 0.15.5", + "indexmap 2.12.0", "serde", "serde_derive", ] @@ -4396,7 +4290,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -4422,27 +4316,6 @@ dependencies = [ "futures-io", ] -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - [[package]] name = "pkg-config" version = "0.3.32" @@ -4451,17 +4324,16 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "polling" -version = "3.8.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50" +checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi", "pin-project-lite", "rustix", - "tracing", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4472,9 +4344,9 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "potential_utf" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -4528,12 +4400,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.35" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061c1221631e079b26479d25bbf2275bfe5917ae8419cd7e34f13bfc2aa7539a" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -4555,14 +4427,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] @@ -4577,7 +4449,7 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.12.4", + "parking_lot 0.12.5", "protobuf", "thiserror 1.0.69", ] @@ -4603,12 +4475,12 @@ dependencies = [ "log", "multimap 0.10.1", "once_cell", - "petgraph 0.6.5", + "petgraph 0.7.1", "prettyplease", "prost", "prost-types", "regex", - "syn 2.0.104", + "syn 2.0.108", "tempfile", ] @@ -4622,7 +4494,7 @@ dependencies = [ "itertools 0.14.0", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -4656,9 +4528,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "quinn" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" dependencies = [ "bytes", "cfg_aliases", @@ -4667,8 +4539,8 @@ dependencies = [ "quinn-udp", "rustc-hash 2.1.1", "rustls", - "socket2", - "thiserror 2.0.12", + "socket2 0.6.1", + "thiserror 2.0.17", "tokio", "tracing", "web-time", @@ -4676,20 +4548,20 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.12" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ "bytes", - "getrandom 0.3.3", + "getrandom 0.3.4", "lru-slab", - "rand 0.9.1", + "rand 0.9.2", "ring", "rustc-hash 2.1.1", "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.12", + "thiserror 2.0.17", "tinyvec", "tracing", "web-time", @@ -4697,23 +4569,23 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2", + "socket2 0.6.1", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] @@ -4737,9 +4609,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", @@ -4780,7 +4652,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", ] [[package]] @@ -4808,11 +4680,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.13" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", ] [[package]] @@ -4828,33 +4700,33 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ "getrandom 0.2.16", "libredox", - "thiserror 2.0.12", + "thiserror 2.0.17", ] [[package]] name = "ref-cast" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -4866,7 +4738,7 @@ dependencies = [ "ahash", "fluent-uri", "once_cell", - "parking_lot 0.12.4", + "parking_lot 0.12.5", "percent-encoding", "serde_json", ] @@ -4880,16 +4752,16 @@ dependencies = [ "ahash", "fluent-uri", "once_cell", - "parking_lot 0.12.4", + "parking_lot 0.12.5", "percent-encoding", "serde_json", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -4899,9 +4771,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -4910,21 +4782,21 @@ dependencies = [ [[package]] name = "regex-lite" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" +checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da" [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" -version = "0.12.15" +version = "0.12.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" dependencies = [ "async-compression", "base64 0.22.1", @@ -4935,20 +4807,16 @@ dependencies = [ "http 1.3.1", "http-body 1.0.1", "http-body-util", - "hyper 1.6.0", + "hyper 1.7.0", "hyper-rustls", "hyper-util", - "ipnet", "js-sys", "log", - "mime", - "once_cell", "percent-encoding", "pin-project-lite", "quinn", "rustls", "rustls-native-certs", - "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -4958,14 +4826,14 @@ dependencies = [ "tokio-rustls", "tokio-util", "tower 0.5.2", + "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.11", - "windows-registry", + "webpki-roots", ] [[package]] @@ -4994,7 +4862,7 @@ dependencies = [ "futures", "getrandom 0.2.16", "http 1.3.1", - "hyper 1.6.0", + "hyper 1.7.0", "parking_lot 0.11.2", "reqwest", "reqwest-middleware", @@ -5007,9 +4875,9 @@ dependencies = [ [[package]] name = "resolv-conf" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3" +checksum = "6b3789b30bd25ba102de4beabd95d21ac45b69b1be7d14522bab988c526d6799" [[package]] name = "retry-policies" @@ -5027,10 +4895,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce4d759a4729a655ddfdbb3ff6e77fb9eadd902dae12319455557796e435d2a6" dependencies = [ "ahash", - "bitflags 2.9.1", + "bitflags 2.10.0", "instant", "no-std-compat", - "num-traits 0.2.19", + "num-traits", "once_cell", "rhai_codegen", "serde", @@ -5047,7 +4915,7 @@ checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -5071,7 +4939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", - "num-traits 0.2.19", + "num-traits", "paste", ] @@ -5087,31 +4955,11 @@ dependencies = [ "text-size", ] -[[package]] -name = "rsa" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits 0.2.19", - "pkcs1", - "pkcs8", - "rand_core 0.6.4", - "signature", - "spki", - "subtle", - "zeroize", -] - [[package]] name = "rust-embed" -version = "8.7.2" +version = "8.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025908b8682a26ba8d12f6f2d66b987584a4a87bc024abc5bbc12553a8cd178a" +checksum = "fb44e1917075637ee8c7bcb865cf8830e3a92b5b1189e44e3a0ab5a0d5be314b" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -5120,22 +4968,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.7.2" +version = "8.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6065f1a4392b71819ec1ea1df1120673418bf386f50de1d6f54204d836d4349c" +checksum = "382499b49db77a7c19abd2a574f85ada7e9dbe125d5d1160fa5cad7c4cf71fc9" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.104", + "syn 2.0.108", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.7.2" +version = "8.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6cc0c81648b20b70c491ff8cce00c1c3b223bb8ed2b5d41f0e54c6c4c0a3594" +checksum = "21fcbee55c2458836bcdbfffb6ec9ba74bbc23ca7aa6816015a3dd2c4d8fc185" dependencies = [ "globset", "sha2", @@ -5144,9 +4992,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" [[package]] name = "rustc-hash" @@ -5171,22 +5019,22 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.7" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.29" +version = "0.23.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1" +checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7" dependencies = [ "log", "once_cell", @@ -5199,9 +5047,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" +checksum = "9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923" dependencies = [ "openssl-probe", "rustls-pki-types", @@ -5220,9 +5068,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" dependencies = [ "web-time", "zeroize", @@ -5230,9 +5078,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.4" +version = "0.103.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" dependencies = [ "ring", "rustls-pki-types", @@ -5241,9 +5089,27 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.21" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "ruzstd" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f" +dependencies = [ + "twox-hash 1.6.3", +] + +[[package]] +name = "ruzstd" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" +checksum = "3640bec8aad418d7d03c72ea2de10d5c646a598f9883c7babc160d91e3c1b26c" +dependencies = [ + "twox-hash 2.1.2", +] [[package]] name = "ryu" @@ -5262,11 +5128,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5304,15 +5170,9 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.104", + "syn 2.0.108", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" @@ -5321,11 +5181,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "3.2.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" +checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "core-foundation", "core-foundation-sys", "libc", @@ -5334,9 +5194,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.14.0" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" +checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" dependencies = [ "core-foundation-sys", "libc", @@ -5344,28 +5204,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -5376,7 +5246,7 @@ checksum = "afb2522c2a87137bf6c2b3493127fed12877ef1b9476f074d6664edc98acd8a7" dependencies = [ "quote", "regex", - "syn 2.0.104", + "syn 2.0.108", "thiserror 1.0.69", ] @@ -5388,20 +5258,21 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ - "indexmap 2.10.0", + "indexmap 2.12.0", "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -5412,7 +5283,7 @@ checksum = "a6a27c10711f94d1042b4c96d483556ec84371864e25d0e1cf3dc1024b0880b1" dependencies = [ "ahash", "bytes", - "indexmap 2.10.0", + "indexmap 2.12.0", "jsonpath-rust", "regex", "serde", @@ -5421,12 +5292,13 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.17" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a" +checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" dependencies = [ "itoa", "serde", + "serde_core", ] [[package]] @@ -5453,19 +5325,18 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.14.0" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5" +checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.10.0", + "indexmap 2.12.0", "schemars 0.9.0", "schemars 1.0.4", - "serde", - "serde_derive", + "serde_core", "serde_json", "serde_with_macros", "time", @@ -5473,14 +5344,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.14.0" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f" +checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955" dependencies = [ - "darling", + "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -5519,12 +5390,12 @@ dependencies = [ [[package]] name = "shape" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "362c1523018b16b65737aa0ea76a731edbcd399e273c0130ba829b148f89dbd2" +checksum = "48f06e8e6e2486e2ca1fc86254acb38bca0cd7da30af443e8d63958c66738f88" dependencies = [ "apollo-compiler", - "indexmap 2.10.0", + "indexmap 2.12.0", "serde_json", "serde_json_bytes", ] @@ -5555,22 +5426,18 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.5" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" dependencies = [ "libc", ] [[package]] -name = "signature" -version = "2.2.0" +name = "simd-adler32" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core 0.6.4", -] +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "similar" @@ -5585,8 +5452,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" dependencies = [ "num-bigint", - "num-traits 0.2.19", - "thiserror 2.0.12", + "num-traits", + "thiserror 2.0.17", "time", ] @@ -5634,229 +5501,32 @@ dependencies = [ ] [[package]] -name = "spin" -version = "0.5.2" +name = "socket2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "sqlx" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6" -dependencies = [ - "base64 0.22.1", - "bytes", - "chrono", - "crc", - "crossbeam-queue", - "either", - "event-listener 5.4.0", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashbrown 0.15.4", - "hashlink", - "indexmap 2.10.0", - "log", - "memchr", - "once_cell", - "percent-encoding", - "rustls", - "rustls-native-certs", - "serde", - "serde_json", - "sha2", - "smallvec", - "thiserror 2.0.12", - "tokio", - "tokio-stream", - "tracing", - "url", -] - -[[package]] -name = "sqlx-macros" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 2.0.104", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b" -dependencies = [ - "dotenvy", - "either", - "heck 0.5.0", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn 2.0.104", - "tokio", - "url", -] - -[[package]] -name = "sqlx-mysql" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ - "atoi", - "base64 0.22.1", - "bitflags 2.9.1", - "byteorder", - "bytes", - "chrono", - "crc", - "digest", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand 0.8.5", - "rsa", - "serde", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror 2.0.12", - "tracing", - "whoami", + "libc", + "windows-sys 0.60.2", ] [[package]] -name = "sqlx-postgres" -version = "0.8.6" +name = "spin" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" -dependencies = [ - "atoi", - "base64 0.22.1", - "bitflags 2.9.1", - "byteorder", - "chrono", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror 2.0.12", - "tracing", - "whoami", -] +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] -name = "sqlx-sqlite" -version = "0.8.6" +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" -dependencies = [ - "atoi", - "chrono", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "serde_urlencoded", - "sqlx-core", - "thiserror 2.0.12", - "tracing", - "url", -] +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "static_assertions" @@ -5881,22 +5551,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" dependencies = [ "new_debug_unreachable", - "parking_lot 0.12.4", + "parking_lot 0.12.5", "phf_shared", "precomputed-hash", ] -[[package]] -name = "stringprep" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", - "unicode-properties", -] - [[package]] name = "strsim" version = "0.11.1" @@ -5905,21 +5564,20 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" [[package]] name = "strum_macros" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "rustversion", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -5941,9 +5599,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.104" +version = "2.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" dependencies = [ "proc-macro2", "quote", @@ -5967,7 +5625,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -6013,15 +5671,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.20.0" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand", - "getrandom 0.3.3", + "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6067,11 +5725,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.12" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.12", + "thiserror-impl 2.0.17", ] [[package]] @@ -6082,18 +5740,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "thiserror-impl" -version = "2.0.12" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -6107,9 +5765,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-ctl" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21f216790c8df74ce3ab25b534e0718da5a1916719771d3fec23315c99e468b" +checksum = "661f1f6a57b3a36dc9174a2c10f19513b4866816e13425d3e418b11cc37bc24c" dependencies = [ "libc", "paste", @@ -6118,9 +5776,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +version = "0.6.1+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" +checksum = "cd8aa5b2ab86a2cefa406d889139c162cbb230092f7d1d7cbc1716405d852a3b" dependencies = [ "cc", "libc", @@ -6128,9 +5786,9 @@ dependencies = [ [[package]] name = "tikv-jemallocator" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" +checksum = "0359b4327f954e0567e69fb191cf1436617748813819c94b8cd4a431422d053a" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -6138,9 +5796,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.41" +version = "0.3.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", "itoa", @@ -6155,15 +5813,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" [[package]] name = "time-macros" -version = "0.2.22" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" dependencies = [ "num-conv", "time-core", @@ -6180,9 +5838,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -6190,9 +5848,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ "tinyvec_macros", ] @@ -6205,40 +5863,37 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.46.1" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", - "io-uring", "libc", "mio", - "parking_lot 0.12.4", + "parking_lot 0.12.5", "pin-project-lite", "signal-hook-registry", - "slab", - "socket2", + "socket2 0.6.1", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "tokio-rustls" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ "rustls", "tokio", @@ -6258,9 +5913,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489a59b6730eda1b0171fcfda8b121f4bee2b35cba8645ca35c5f7ba3eb736c1" +checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" dependencies = [ "futures-util", "log", @@ -6274,12 +5929,13 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ "bytes", "futures-core", + "futures-io", "futures-sink", "pin-project-lite", "slab", @@ -6302,7 +5958,7 @@ dependencies = [ "http 1.3.1", "http-body 1.0.1", "http-body-util", - "hyper 1.6.0", + "hyper 1.7.0", "hyper-timeout", "hyper-util", "percent-encoding", @@ -6310,7 +5966,7 @@ dependencies = [ "prost", "rustls-native-certs", "rustls-pemfile", - "socket2", + "socket2 0.5.10", "tokio", "tokio-rustls", "tokio-stream", @@ -6331,7 +5987,7 @@ dependencies = [ "prost-build", "prost-types", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -6363,7 +6019,7 @@ dependencies = [ "futures-core", "futures-util", "hdrhistogram", - "indexmap 2.10.0", + "indexmap 2.12.0", "pin-project-lite", "slab", "sync_wrapper", @@ -6382,7 +6038,7 @@ checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" dependencies = [ "async-compression", "base64 0.22.1", - "bitflags 2.9.1", + "bitflags 2.10.0", "bytes", "futures-core", "futures-util", @@ -6437,7 +6093,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -6506,9 +6162,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" +checksum = "dd69c5aa8f924c7519d6372789a74eac5b94fb0f8fcf0d4a97eb0bfc3e785f39" dependencies = [ "serde", "stable_deref_trait", @@ -6537,28 +6193,44 @@ checksum = "b9c81686f7ab4065ccac3df7a910c4249f8c0f3fb70421d6ddec19b9311f63f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "tungstenite" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d" +checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442" dependencies = [ "bytes", "data-encoding", "http 1.3.1", "httparse", "log", - "rand 0.9.1", + "rand 0.9.2", "rustls", "rustls-pki-types", "sha1", - "thiserror 2.0.12", + "thiserror 2.0.17", "utf-8", ] +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + +[[package]] +name = "twox-hash" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" + [[package]] name = "typed-arena" version = "2.0.2" @@ -6582,14 +6254,14 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "typenum" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "typetag" @@ -6636,17 +6308,11 @@ version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" -[[package]] -name = "unicode-bidi" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" - [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06" [[package]] name = "unicode-normalization" @@ -6657,12 +6323,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-properties" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" - [[package]] name = "unicode-segmentation" version = "1.12.0" @@ -6677,9 +6337,9 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-width" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" [[package]] name = "unicode-xid" @@ -6695,9 +6355,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.4" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", @@ -6725,11 +6385,11 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.17.0" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" +checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "js-sys", "serde", "wasm-bindgen", @@ -6758,12 +6418,6 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version_check" version = "0.9.5" @@ -6802,51 +6456,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen", ] -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn 2.0.104", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.50" +version = "0.4.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" dependencies = [ "cfg-if", "js-sys", @@ -6857,9 +6492,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6867,22 +6502,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" dependencies = [ + "bumpalo", "proc-macro2", "quote", - "syn 2.0.104", - "wasm-bindgen-backend", + "syn 2.0.108", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" dependencies = [ "unicode-ident", ] @@ -6917,9 +6552,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" dependencies = [ "js-sys", "wasm-bindgen", @@ -6937,37 +6572,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" -dependencies = [ - "webpki-roots 1.0.1", -] - -[[package]] -name = "webpki-roots" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8782dd5a41a24eed3a4f40b606249b3e236ca61adf1f25ea4d45c73de122b502" +checksum = "32b130c0d2d49f8b6889abc456e795e82525204f27c42cf767cf0d7734e089b8" dependencies = [ "rustls-pki-types", ] -[[package]] -name = "whoami" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" -dependencies = [ - "libredox", - "wasite", -] - [[package]] name = "widestring" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d" +checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471" [[package]] name = "winapi" @@ -6987,11 +6603,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -7007,7 +6623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1" dependencies = [ "windows-core 0.59.0", - "windows-targets 0.53.2", + "windows-targets 0.53.5", ] [[package]] @@ -7019,7 +6635,7 @@ dependencies = [ "windows-collections", "windows-core 0.61.2", "windows-future", - "windows-link", + "windows-link 0.1.3", "windows-numerics", ] @@ -7040,9 +6656,9 @@ checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce" dependencies = [ "windows-implement 0.59.0", "windows-interface", - "windows-result", + "windows-result 0.3.4", "windows-strings 0.3.1", - "windows-targets 0.53.2", + "windows-targets 0.53.5", ] [[package]] @@ -7051,13 +6667,26 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement 0.60.0", + "windows-implement 0.60.2", "windows-interface", - "windows-link", - "windows-result", + "windows-link 0.1.3", + "windows-result 0.3.4", "windows-strings 0.4.2", ] +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement 0.60.2", + "windows-interface", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + [[package]] name = "windows-future" version = "0.2.1" @@ -7065,7 +6694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" dependencies = [ "windows-core 0.61.2", - "windows-link", + "windows-link 0.1.3", "windows-threading", ] @@ -7077,29 +6706,29 @@ checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -7108,6 +6737,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + [[package]] name = "windows-numerics" version = "0.2.0" @@ -7115,27 +6750,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" dependencies = [ "windows-core 0.61.2", - "windows-link", + "windows-link 0.1.3", ] [[package]] -name = "windows-registry" -version = "0.4.0" +name = "windows-result" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-result", - "windows-strings 0.3.1", - "windows-targets 0.53.2", + "windows-link 0.1.3", ] [[package]] name = "windows-result" -version = "0.3.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -7144,7 +6777,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -7153,7 +6786,16 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-link", + "windows-link 0.1.3", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link 0.2.1", ] [[package]] @@ -7185,20 +6827,20 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.53.5", ] [[package]] name = "windows-sys" -version = "0.60.2" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-targets 0.53.2", + "windows-link 0.2.1", ] [[package]] @@ -7249,18 +6891,19 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.2" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", + "windows-link 0.2.1", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -7269,7 +6912,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -7292,9 +6935,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" @@ -7316,9 +6959,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_aarch64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" @@ -7340,9 +6983,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" @@ -7352,9 +6995,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" @@ -7376,9 +7019,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_i686_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" @@ -7400,9 +7043,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" @@ -7424,9 +7067,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" @@ -7448,9 +7091,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "windows_x86_64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winreg" @@ -7464,18 +7107,17 @@ dependencies = [ [[package]] name = "wiremock" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2b8b99d4cdbf36b239a9532e31fe4fb8acc38d1897c1761e161550a7dc78e6a" +checksum = "08db1edfb05d9b3c1542e521aea074442088292f00b5f28e435c714a98f85031" dependencies = [ "assert-json-diff", - "async-trait", "base64 0.22.1", "deadpool", "futures", "http 1.3.1", "http-body-util", - "hyper 1.6.0", + "hyper 1.7.0", "hyper-util", "log", "once_cell", @@ -7487,13 +7129,10 @@ dependencies = [ ] [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "wit-bindgen" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags 2.9.1", -] +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "wmi" @@ -7505,16 +7144,16 @@ dependencies = [ "futures", "log", "serde", - "thiserror 2.0.12", + "thiserror 2.0.17", "windows 0.59.0", "windows-core 0.59.0", ] [[package]] name = "writeable" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "wsl" @@ -7524,9 +7163,9 @@ checksum = "f8dab7ac864710bdea6594becbea5b5050333cf34fefb0dc319567eb347950d4" [[package]] name = "xattr" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", "rustix", @@ -7555,11 +7194,10 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yoke" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -7567,34 +7205,34 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -7614,21 +7252,21 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", "synstructure", ] [[package]] name = "zeroize" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" [[package]] name = "zerotrie" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -7637,9 +7275,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -7648,13 +7286,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -7677,9 +7315,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.15+zstd.1.5.7" +version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ "cc", "pkg-config", diff --git a/docker/docker.hcl b/docker/docker.hcl index 4b8ad0ead1e..cf6f2cf36e5 100644 --- a/docker/docker.hcl +++ b/docker/docker.hcl @@ -361,7 +361,8 @@ target "app" { target "apollo-router" { inherits = ["router-base", get_target()] contexts = { - pkg = "${PWD}/packages/libraries/router" + router_pkg = "${PWD}/packages/libraries/router" + sdk_rs_pkg = "${PWD}/packages/libraries/sdk-rs" config = "${PWD}/configs/cargo" } args = { diff --git a/docker/router.dockerfile b/docker/router.dockerfile index 52628f706fc..4891d4dcc16 100644 --- a/docker/router.dockerfile +++ b/docker/router.dockerfile @@ -1,5 +1,6 @@ # syntax=docker/dockerfile:1 -FROM scratch AS pkg +FROM scratch AS router_pkg +FROM scratch AS sdk_rs_pkg FROM scratch AS config FROM rust:1.90-slim-bookworm AS build @@ -12,13 +13,26 @@ RUN update-ca-certificates RUN rustup component add rustfmt WORKDIR /usr/src -# Create blank project +# Create blank projects RUN USER=root cargo new router +RUN USER=root cargo new sdk-rs # Copy Cargo files -COPY --from=pkg Cargo.toml /usr/src/router/ +COPY --from=router_pkg Cargo.toml /usr/src/router/ +COPY --from=sdk_rs_pkg Cargo.toml /usr/src/sdk-rs/ COPY --from=config Cargo.lock /usr/src/router/ +WORKDIR /usr/src/sdk-rs +# Get the dependencies cached, so we can use dummy input files so Cargo wont fail +RUN echo 'fn main() { println!(""); }' > ./src/main.rs +RUN echo 'fn main() { println!(""); }' > ./src/lib.rs +RUN cargo build --release + +# Copy in the actual source code +COPY --from=sdk_rs_pkg src ./src +RUN touch ./src/main.rs +RUN touch ./src/lib.rs + WORKDIR /usr/src/router # Get the dependencies cached, so we can use dummy input files so Cargo wont fail RUN echo 'fn main() { println!(""); }' > ./src/main.rs @@ -26,7 +40,7 @@ RUN echo 'fn main() { println!(""); }' > ./src/lib.rs RUN cargo build --release # Copy in the actual source code -COPY --from=pkg src ./src +COPY --from=router_pkg src ./src RUN touch ./src/main.rs RUN touch ./src/lib.rs @@ -53,7 +67,7 @@ RUN mkdir /dist/schema # Copy in the required files from our build image COPY --from=build --chown=root:root /usr/src/router/target/release/router /dist -COPY --from=pkg router.yaml /dist/config/router.yaml +COPY --from=router_pkg router.yaml /dist/config/router.yaml WORKDIR /dist diff --git a/package.json b/package.json index 40a3ed27058..3e96285a706 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "prerelease": "pnpm build:libraries", "prettier": "prettier --cache --write --list-different --ignore-unknown \"**/*\"", "release": "pnpm build:libraries && changeset publish", - "release:version": "changeset version && pnpm --filter hive-apollo-router-plugin sync-cargo-file && pnpm build:libraries && pnpm --filter @graphql-hive/cli oclif:readme", + "release:version": "changeset version && pnpm --filter hive-apollo-router-plugin --filter hive-console-sdk-rs sync-cargo-file && pnpm build:libraries && pnpm --filter @graphql-hive/cli oclif:readme", "seed:schemas": "tsx scripts/seed-schemas.ts", "seed:usage": "tsx scripts/seed-usage.ts", "start": "pnpm run local:setup", diff --git a/packages/libraries/router/Cargo.toml b/packages/libraries/router/Cargo.toml index 39693e05d8f..7584791701d 100644 --- a/packages/libraries/router/Cargo.toml +++ b/packages/libraries/router/Cargo.toml @@ -19,6 +19,7 @@ path = "src/lib.rs" [dependencies] apollo-router = { version = "^2.0.0" } axum-core = "0.5" +hive-console-sdk = { path = "../sdk-rs" } thiserror = "2.0.11" reqwest = { version = "0.12.0", default-features = false, features = [ "rustls-tls", diff --git a/packages/libraries/router/package.json b/packages/libraries/router/package.json index 38e07edaec0..8f2ac3b6c63 100644 --- a/packages/libraries/router/package.json +++ b/packages/libraries/router/package.json @@ -4,5 +4,8 @@ "private": true, "scripts": { "sync-cargo-file": "./sync-cargo-file.sh" + }, + "dependencies": { + "hive-console-sdk-rs": "workspace:*" } } diff --git a/packages/libraries/router/src/lib.rs b/packages/libraries/router/src/lib.rs index c90d87cf65d..5dc5145daf1 100644 --- a/packages/libraries/router/src/lib.rs +++ b/packages/libraries/router/src/lib.rs @@ -1,6 +1,4 @@ -mod agent; pub mod consts; -mod graphql; pub mod persisted_documents; pub mod registry; pub mod registry_logger; diff --git a/packages/libraries/router/src/main.rs b/packages/libraries/router/src/main.rs index c2f1f1ee70f..491a31ca442 100644 --- a/packages/libraries/router/src/main.rs +++ b/packages/libraries/router/src/main.rs @@ -1,7 +1,5 @@ // Specify the modules our binary should include -- https://twitter.com/YassinEldeeb7/status/1468680104243077128 -mod agent; mod consts; -mod graphql; mod persisted_documents; mod registry; mod registry_logger; diff --git a/packages/libraries/router/src/persisted_documents.rs b/packages/libraries/router/src/persisted_documents.rs index 584847d6d37..ae8d9103176 100644 --- a/packages/libraries/router/src/persisted_documents.rs +++ b/packages/libraries/router/src/persisted_documents.rs @@ -8,68 +8,107 @@ use apollo_router::services::router::Body; use apollo_router::Context; use core::ops::Drop; use futures::FutureExt; +use hive_console_sdk::persisted_documents::PersistedDocumentsError; +use hive_console_sdk::persisted_documents::PersistedDocumentsManager; use http::StatusCode; use http_body_util::combinators::UnsyncBoxBody; use http_body_util::BodyExt; use http_body_util::Full; use hyper::body::Bytes; -use lru::LruCache; -use reqwest_middleware::{ClientBuilder, ClientWithMiddleware}; -use reqwest_retry::{policies::ExponentialBackoff, RetryTransientMiddleware}; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use std::env; -use std::num::NonZeroUsize; use std::ops::ControlFlow; use std::sync::Arc; -use std::time::Duration; -use tokio::sync::Mutex; use tower::{BoxError, ServiceBuilder, ServiceExt}; use tracing::{debug, info, warn}; -pub struct PersistedDocumentsPlugin { - persisted_documents_manager: Arc, - configuration: Config, -} - -pub(crate) static PERSISTED_DOCUMENT_HASH_KEY: &str = "hive::persisted_document_hash"; +pub static PERSISTED_DOCUMENT_HASH_KEY: &str = "hive::persisted_document_hash"; #[derive(Clone, Debug, Deserialize, JsonSchema, Default)] pub struct Config { - enabled: Option, + pub enabled: Option, /// GraphQL Hive persisted documents CDN endpoint URL. - endpoint: Option, + pub endpoint: Option, /// GraphQL Hive persisted documents CDN access token. - key: Option, + pub key: Option, /// Whether arbitrary documents should be allowed along-side persisted documents. /// default: false - allow_arbitrary_documents: Option, + pub allow_arbitrary_documents: Option, /// A timeout for only the connect phase of a request to GraphQL Hive /// Unit: seconds /// Default: 5 - connect_timeout: Option, + pub connect_timeout: Option, /// Retry count for the request to CDN request /// Default: 3 - retry_count: Option, + pub retry_count: Option, /// A timeout for the entire request to GraphQL Hive /// Unit: seconds /// Default: 15 - request_timeout: Option, + pub request_timeout: Option, /// Accept invalid SSL certificates /// default: false - accept_invalid_certs: Option, + pub accept_invalid_certs: Option, /// Configuration for the size of the in-memory caching of persisted documents. /// Default: 1000 - cache_size: Option, + pub cache_size: Option, +} + +pub struct PersistedDocumentsPlugin { + persisted_documents_manager: Option>, + allow_arbitrary_documents: bool, } impl PersistedDocumentsPlugin { - #[cfg(test)] - fn new(config: Config) -> Self { - PersistedDocumentsPlugin { - configuration: config.clone(), - persisted_documents_manager: Arc::new(PersistedDocumentsManager::new(&config)), + fn from_config(config: Config) -> Result { + let enabled = config.enabled.unwrap_or(true); + let allow_arbitrary_documents = config.allow_arbitrary_documents.unwrap_or(false); + if !enabled { + return Ok(PersistedDocumentsPlugin { + persisted_documents_manager: None, + allow_arbitrary_documents, + }); } + let endpoint = match &config.endpoint { + Some(ep) => ep.clone(), + None => { + if let Ok(ep) = env::var("HIVE_CDN_ENDPOINT") { + ep + } else { + return Err( + "Endpoint for persisted documents CDN is not configured. Please set it via the plugin configuration or HIVE_CDN_ENDPOINT environment variable." + .into(), + ); + } + } + }; + + let key = match &config.key { + Some(k) => k.clone(), + None => { + if let Ok(key) = env::var("HIVE_CDN_KEY") { + key + } else { + return Err( + "Access token for persisted documents CDN is not configured. Please set it via the plugin configuration or HIVE_CDN_KEY environment variable." + .into(), + ); + } + } + }; + + Ok(PersistedDocumentsPlugin { + persisted_documents_manager: Some(Arc::new(PersistedDocumentsManager::new( + key, + endpoint, + config.accept_invalid_certs.unwrap_or(false), + config.connect_timeout.unwrap_or(5), + config.request_timeout.unwrap_or(15), + config.retry_count.unwrap_or(3), + config.cache_size.unwrap_or(1000), + ))), + allow_arbitrary_documents, + }) } } @@ -78,51 +117,32 @@ impl Plugin for PersistedDocumentsPlugin { type Config = Config; async fn new(init: PluginInit) -> Result { - let mut config = init.config.clone(); - if init.config.endpoint.is_none() { - if let Ok(endpoint) = env::var("HIVE_CDN_ENDPOINT") { - config.endpoint = Some(str::replace(&endpoint, "/supergraph", "")); - } - } - - if init.config.key.is_none() { - if let Ok(key) = env::var("HIVE_CDN_KEY") { - config.key = Some(key); - } - } - - Ok(PersistedDocumentsPlugin { - configuration: config.clone(), - persisted_documents_manager: Arc::new(PersistedDocumentsManager::new(&config)), - }) + PersistedDocumentsPlugin::from_config(init.config) } fn router_service(&self, service: router::BoxService) -> router::BoxService { - let enabled = self.configuration.enabled.unwrap_or(true); - let allow_arbitrary_documents = self - .configuration - .allow_arbitrary_documents - .unwrap_or(false); - let mgr_ref = self.persisted_documents_manager.clone(); - - if enabled { + if let Some(mgr) = &self.persisted_documents_manager { + let mgr = mgr.clone(); + let allow_arbitrary_documents = self.allow_arbitrary_documents; ServiceBuilder::new() .checkpoint_async(move |req: router::Request| { - let mgr = mgr_ref.clone(); + let mgr = mgr.clone(); async move { let (parts, body) = req.router_request.into_parts(); let bytes: hyper::body::Bytes = body .collect() .await - .map_err(PersistedDocumentsError::FailedToReadBody)? + .map_err(|err| PersistedDocumentsError::FailedToReadBody(err.to_string()))? .to_bytes(); - let payload = PersistedDocumentsManager::extract_document_id(&bytes); + let payload = extract_document_id(&bytes); let mut payload = match payload { Ok(payload) => payload, Err(e) => { - return Ok(ControlFlow::Break(e.to_router_response(req.context))); + return Ok(ControlFlow::Break( + to_router_response(e, req.context), + )); } }; @@ -140,24 +160,21 @@ impl Plugin for PersistedDocumentsPlugin { return Ok(ControlFlow::Continue(roll_req)); } else { return Ok(ControlFlow::Break( - PersistedDocumentsError::PersistedDocumentRequired - .to_router_response(req.context), + to_router_response(PersistedDocumentsError::PersistedDocumentRequired, req.context) )); } } if payload.document_id.is_none() { return Ok(ControlFlow::Break( - PersistedDocumentsError::KeyNotFound - .to_router_response(req.context), + to_router_response(PersistedDocumentsError::KeyNotFound, req.context) )); } match payload.document_id.as_ref() { None => { Ok(ControlFlow::Break( - PersistedDocumentsError::PersistedDocumentRequired - .to_router_response(req.context), + to_router_response(PersistedDocumentsError::PersistedDocumentRequired, req.context) )) } Some(document_id) => match mgr.resolve_document(document_id).await { @@ -187,7 +204,7 @@ impl Plugin for PersistedDocumentsPlugin { } Err(e) => { Ok(ControlFlow::Break( - e.to_router_response(req.context), + to_router_response(e, req.context), )) } }, @@ -216,176 +233,18 @@ impl Drop for PersistedDocumentsPlugin { } } -#[derive(Debug)] -struct PersistedDocumentsManager { - agent: ClientWithMiddleware, - cache: Arc>>, - config: Config, -} - -#[derive(Debug, thiserror::Error)] -pub enum PersistedDocumentsError { - #[error("Failed to read body: {0}")] - FailedToReadBody(axum_core::Error), - #[error("Failed to parse body: {0}")] - FailedToParseBody(serde_json::Error), - #[error("Persisted document not found.")] - DocumentNotFound, - #[error("Failed to locate the persisted document key in request.")] - KeyNotFound, - #[error("Failed to validate persisted document")] - FailedToFetchFromCDN(reqwest_middleware::Error), - #[error("Failed to read CDN response body")] - FailedToReadCDNResponse(reqwest::Error), - #[error("No persisted document provided, or document id cannot be resolved.")] - PersistedDocumentRequired, -} - -impl PersistedDocumentsError { - fn message(&self) -> String { - self.to_string() - } - - fn code(&self) -> String { - match self { - PersistedDocumentsError::FailedToReadBody(_) => "FAILED_TO_READ_BODY".into(), - PersistedDocumentsError::FailedToParseBody(_) => "FAILED_TO_PARSE_BODY".into(), - PersistedDocumentsError::DocumentNotFound => "PERSISTED_DOCUMENT_NOT_FOUND".into(), - PersistedDocumentsError::KeyNotFound => "PERSISTED_DOCUMENT_KEY_NOT_FOUND".into(), - PersistedDocumentsError::FailedToFetchFromCDN(_) => "FAILED_TO_FETCH_FROM_CDN".into(), - PersistedDocumentsError::FailedToReadCDNResponse(_) => { - "FAILED_TO_READ_CDN_RESPONSE".into() - } - PersistedDocumentsError::PersistedDocumentRequired => { - "PERSISTED_DOCUMENT_REQUIRED".into() - } - } - } - - fn to_router_response(&self, ctx: Context) -> router::Response { - let errors = vec![Error::builder() - .message(self.message()) - .extension_code(self.code()) - .build()]; - - router::Response::error_builder() - .errors(errors) - .status_code(StatusCode::OK) - .context(ctx) - .build() - .unwrap() - } -} - -impl PersistedDocumentsManager { - fn new(config: &Config) -> Self { - let retry_policy = - ExponentialBackoff::builder().build_with_max_retries(config.retry_count.unwrap_or(3)); - - let reqwest_agent = reqwest::Client::builder() - .danger_accept_invalid_certs(config.accept_invalid_certs.unwrap_or(false)) - .connect_timeout(Duration::from_secs(config.connect_timeout.unwrap_or(5))) - .timeout(Duration::from_secs(config.request_timeout.unwrap_or(15))) - .build() - .expect("Failed to create reqwest client"); - let agent = ClientBuilder::new(reqwest_agent) - .with(RetryTransientMiddleware::new_with_policy(retry_policy)) - .build(); - - let cache_size = config.cache_size.unwrap_or(1000); - let cache = Arc::new(Mutex::new(LruCache::::new( - NonZeroUsize::new(cache_size).unwrap(), - ))); - - Self { - agent, - cache, - config: config.clone(), - } - } - - /// Extracts the document id from the request body. - /// In case of a parsing error, it returns the error. - /// This will also try to parse other GraphQL-related (see `original_req`) fields in order to - /// pass it to the next layer. - fn extract_document_id( - body: &hyper::body::Bytes, - ) -> Result { - serde_json::from_slice::(body) - .map_err(PersistedDocumentsError::FailedToParseBody) - } - - /// Resolves the document from the cache, or from the CDN - async fn resolve_document(&self, document_id: &str) -> Result { - let cached_record = self.cache.lock().await.get(document_id).cloned(); - - match cached_record { - Some(document) => { - debug!("Document {} found in cache: {}", document_id, document); - - Ok(document) - } - None => { - debug!( - "Document {} not found in cache. Fetching from CDN", - document_id - ); - let cdn_document_id = str::replace(document_id, "~", "/"); - let cdn_artifact_url = format!( - "{}/apps/{}", - self.config.endpoint.as_ref().unwrap(), - cdn_document_id - ); - info!( - "Fetching document {} from CDN: {}", - document_id, cdn_artifact_url - ); - let cdn_response = self - .agent - .get(cdn_artifact_url) - .header("X-Hive-CDN-Key", self.config.key.as_ref().unwrap()) - .send() - .await; - - match cdn_response { - Ok(response) => { - if response.status().is_success() { - let document = response - .text() - .await - .map_err(PersistedDocumentsError::FailedToReadCDNResponse)?; - debug!( - "Document fetched from CDN: {}, storing in local cache", - document - ); - self.cache - .lock() - .await - .put(document_id.into(), document.clone()); - - return Ok(document); - } - - warn!( - "Document fetch from CDN failed: HTTP {}, Body: {:?}", - response.status(), - response - .text() - .await - .unwrap_or_else(|_| "Unavailable".to_string()) - ); - - Err(PersistedDocumentsError::DocumentNotFound) - } - Err(e) => { - warn!("Failed to fetch document from CDN: {:?}", e); - - Err(PersistedDocumentsError::FailedToFetchFromCDN(e)) - } - } - } - } - } +fn to_router_response(err: PersistedDocumentsError, ctx: Context) -> router::Response { + let errors = vec![Error::builder() + .message(err.message()) + .extension_code(err.code()) + .build()]; + + router::Response::error_builder() + .errors(errors) + .status_code(StatusCode::OK) + .context(ctx) + .build() + .unwrap() } /// Expected body structure for the router incoming requests @@ -402,6 +261,13 @@ struct ExpectedBodyStructure { original_req: graphql::Request, } +fn extract_document_id( + body: &hyper::body::Bytes, +) -> Result { + serde_json::from_slice::(body) + .map_err(PersistedDocumentsError::FailedToParseBody) +} + /// To test this plugin, we do the following: /// 1. Create the plugin instance /// 2. Link it to a mocked router service that reflects @@ -541,13 +407,14 @@ mod hive_persisted_documents_tests { #[tokio::test] async fn should_allow_arbitrary_when_regular_req_is_sent() { let service = create_reflecting_mocked_router(); - let service_stack = PersistedDocumentsPlugin::new(Config { + let service_stack = PersistedDocumentsPlugin::from_config(Config { enabled: Some(true), endpoint: Some("https://cdn.example.com".into()), key: Some("123".into()), allow_arbitrary_documents: Some(true), ..Default::default() }) + .expect("Failed to create PersistedDocumentsPlugin") .router_service(service.boxed()); let request = create_regular_request(); @@ -569,13 +436,14 @@ mod hive_persisted_documents_tests { #[tokio::test] async fn should_disallow_arbitrary_when_regular_req_sent() { - let service_stack = PersistedDocumentsPlugin::new(Config { + let service_stack = PersistedDocumentsPlugin::from_config(Config { enabled: Some(true), endpoint: Some("https://cdn.example.com".into()), key: Some("123".into()), allow_arbitrary_documents: Some(false), ..Default::default() }) + .expect("Failed to create PersistedDocumentsPlugin") .router_service(MockRouterService::new().boxed()); let request = create_regular_request(); @@ -603,13 +471,14 @@ mod hive_persisted_documents_tests { #[tokio::test] async fn returns_not_found_error_for_missing_persisted_query() { let cdn_mock = PersistedDocumentsCDNMock::new(); - let service_stack = PersistedDocumentsPlugin::new(Config { + let service_stack = PersistedDocumentsPlugin::from_config(Config { enabled: Some(true), endpoint: Some(cdn_mock.endpoint()), key: Some("123".into()), allow_arbitrary_documents: Some(true), ..Default::default() }) + .expect("Failed to create PersistedDocumentsPlugin") .router_service(MockRouterService::new().boxed()); let request = create_persisted_request("123", None); @@ -636,13 +505,14 @@ mod hive_persisted_documents_tests { #[tokio::test] async fn returns_key_not_found_error_for_missing_input() { - let service_stack = PersistedDocumentsPlugin::new(Config { + let service_stack = PersistedDocumentsPlugin::from_config(Config { enabled: Some(true), endpoint: Some("https://cdn.example.com".into()), key: Some("123".into()), allow_arbitrary_documents: Some(true), ..Default::default() }) + .expect("Failed to create PersistedDocumentsPlugin") .router_service(MockRouterService::new().boxed()); let request = create_invalid_req(); @@ -669,13 +539,14 @@ mod hive_persisted_documents_tests { #[tokio::test] async fn rejects_req_when_cdn_not_available() { - let service_stack = PersistedDocumentsPlugin::new(Config { + let service_stack = PersistedDocumentsPlugin::from_config(Config { enabled: Some(true), endpoint: Some("https://127.0.0.1:9999".into()), // Invalid endpoint key: Some("123".into()), allow_arbitrary_documents: Some(false), ..Default::default() }) + .expect("Failed to create PersistedDocumentsPlugin") .router_service(MockRouterService::new().boxed()); let request = create_persisted_request("123", None); @@ -705,16 +576,20 @@ mod hive_persisted_documents_tests { let cdn_mock = PersistedDocumentsCDNMock::new(); cdn_mock.add_valid("my-app~cacb95c69ba4684aec972777a38cd106740c6453~04bfa72dfb83b297dd8a5b6fed9bafac2b395a0f"); let upstream = create_dummy_mocked_router(); - let service_stack = PersistedDocumentsPlugin::new(Config { + let service_stack = PersistedDocumentsPlugin::from_config(Config { enabled: Some(true), endpoint: Some(cdn_mock.endpoint()), key: Some("123".into()), allow_arbitrary_documents: Some(false), ..Default::default() }) + .expect("Failed to create PersistedDocumentsPlugin") .router_service(upstream.boxed()); - let request = create_persisted_request("my-app~cacb95c69ba4684aec972777a38cd106740c6453~04bfa72dfb83b297dd8a5b6fed9bafac2b395a0f", None); + let request = create_persisted_request( + "my-app~cacb95c69ba4684aec972777a38cd106740c6453~04bfa72dfb83b297dd8a5b6fed9bafac2b395a0f", + None, + ); let mut response = service_stack.oneshot(request).await.unwrap(); let response_inner = response.next_response().await.unwrap().unwrap(); @@ -736,18 +611,19 @@ mod hive_persisted_documents_tests { let cdn_mock = PersistedDocumentsCDNMock::new(); cdn_mock.add_valid("my-app~cacb95c69ba4684aec972777a38cd106740c6453~04bfa72dfb83b297dd8a5b6fed9bafac2b395a0f"); let upstream = create_reflecting_mocked_router(); - let service_stack = PersistedDocumentsPlugin::new(Config { + let service_stack = PersistedDocumentsPlugin::from_config(Config { enabled: Some(true), endpoint: Some(cdn_mock.endpoint()), key: Some("123".into()), allow_arbitrary_documents: Some(false), ..Default::default() }) + .expect("Failed to create PersistedDocumentsPlugin") .router_service(upstream.boxed()); let request = create_persisted_request( "my-app~cacb95c69ba4684aec972777a38cd106740c6453~04bfa72dfb83b297dd8a5b6fed9bafac2b395a0f", - Some(json!({"var": "value"})) + Some(json!({"var": "value"})), ); let mut response = service_stack.oneshot(request).await.unwrap(); let response_inner = response.next_response().await.unwrap().unwrap(); @@ -764,18 +640,22 @@ mod hive_persisted_documents_tests { let cdn_mock = PersistedDocumentsCDNMock::new(); let cdn_req_mock = cdn_mock.add_valid("my-app~cacb95c69ba4684aec972777a38cd106740c6453~04bfa72dfb83b297dd8a5b6fed9bafac2b395a0f"); - let p = PersistedDocumentsPlugin::new(Config { + let p = PersistedDocumentsPlugin::from_config(Config { enabled: Some(true), endpoint: Some(cdn_mock.endpoint()), key: Some("123".into()), allow_arbitrary_documents: Some(false), ..Default::default() - }); + }) + .expect("Failed to create PersistedDocumentsPlugin"); let s1 = p.router_service(create_dummy_mocked_router().boxed()); let s2 = p.router_service(create_dummy_mocked_router().boxed()); // first call - let request = create_persisted_request("my-app~cacb95c69ba4684aec972777a38cd106740c6453~04bfa72dfb83b297dd8a5b6fed9bafac2b395a0f", None); + let request = create_persisted_request( + "my-app~cacb95c69ba4684aec972777a38cd106740c6453~04bfa72dfb83b297dd8a5b6fed9bafac2b395a0f", + None, + ); let mut response = s1.oneshot(request).await.unwrap(); let response_inner = response.next_response().await.unwrap().unwrap(); @@ -792,7 +672,10 @@ mod hive_persisted_documents_tests { ); // second call - let request = create_persisted_request("my-app~cacb95c69ba4684aec972777a38cd106740c6453~04bfa72dfb83b297dd8a5b6fed9bafac2b395a0f", None); + let request = create_persisted_request( + "my-app~cacb95c69ba4684aec972777a38cd106740c6453~04bfa72dfb83b297dd8a5b6fed9bafac2b395a0f", + None, + ); let mut response = s2.oneshot(request).await.unwrap(); let response_inner = response.next_response().await.unwrap().unwrap(); assert_eq!(response.response.status(), StatusCode::OK); diff --git a/packages/libraries/router/src/registry.rs b/packages/libraries/router/src/registry.rs index c0ab13b3001..ff6c5cf3c6b 100644 --- a/packages/libraries/router/src/registry.rs +++ b/packages/libraries/router/src/registry.rs @@ -1,19 +1,17 @@ use crate::consts::PLUGIN_VERSION; use crate::registry_logger::Logger; use anyhow::{anyhow, Result}; +use hive_console_sdk::supergraph_fetcher::SupergraphFetcher; use sha2::Digest; use sha2::Sha256; use std::env; use std::io::Write; use std::thread; -#[derive(Debug, Clone)] +#[derive(Debug)] pub struct HiveRegistry { - endpoint: String, - key: String, file_name: String, - etag: Option, - accept_invalid_certs: bool, + fetcher: SupergraphFetcher, pub logger: Logger, } @@ -86,7 +84,7 @@ impl HiveRegistry { } // Resolve values - let mut endpoint = config.endpoint.unwrap_or_default(); + let endpoint = config.endpoint.unwrap_or_default(); let key = config.key.unwrap_or_default(); let poll_interval: u64 = config.poll_interval.unwrap_or(10); let accept_invalid_certs = config.accept_invalid_certs.unwrap_or(false); @@ -106,14 +104,6 @@ impl HiveRegistry { return Err(anyhow!("environment variable HIVE_CDN_ENDPOINT not found",)); } - if !endpoint.ends_with("/supergraph") { - if endpoint.ends_with("/") { - endpoint.push_str("supergraph") - } else { - endpoint.push_str("/supergraph") - } - } - // Throw if key is empty if key.is_empty() { return Err(anyhow!("environment variable HIVE_CDN_KEY not found")); @@ -132,11 +122,16 @@ impl HiveRegistry { env::set_var("APOLLO_ROUTER_HOT_RELOAD", "true"); let mut registry = HiveRegistry { - endpoint, - key, + fetcher: SupergraphFetcher::try_new( + endpoint, + key, + format!("hive-apollo-router/{}", PLUGIN_VERSION), + 5, + 60, + accept_invalid_certs, + ) + .map_err(|e| anyhow!("Failed to create SupergraphFetcher: {}", e))?, file_name, - etag: None, - accept_invalid_certs, logger, }; @@ -160,52 +155,9 @@ impl HiveRegistry { Ok(()) } - fn fetch_supergraph(&mut self, etag: Option) -> Result, String> { - let client = reqwest::blocking::Client::builder() - .danger_accept_invalid_certs(self.accept_invalid_certs) - .build() - .map_err(|err| err.to_string())?; - let mut headers = reqwest::header::HeaderMap::new(); - - headers.insert( - reqwest::header::USER_AGENT, - reqwest::header::HeaderValue::from_str( - format!("hive-apollo-router/{}", PLUGIN_VERSION).as_str(), - ) - .unwrap(), - ); - headers.insert("X-Hive-CDN-Key", self.key.parse().unwrap()); - - if let Some(checksum) = etag { - headers.insert("If-None-Match", checksum.parse().unwrap()); - } - - let resp = client - .get(self.endpoint.as_str()) - .headers(headers) - .send() - .map_err(|e| e.to_string())?; - - match resp.headers().get("etag") { - Some(checksum) => { - let etag = checksum.to_str().map_err(|e| e.to_string())?; - self.update_latest_etag(Some(etag.to_string())); - } - None => { - self.update_latest_etag(None); - } - } - - if resp.status().as_u16() == 304 { - return Ok(None); - } - - Ok(Some(resp.text().map_err(|e| e.to_string())?)) - } - fn initial_supergraph(&mut self) -> Result<(), String> { let mut file = std::fs::File::create(self.file_name.clone()).map_err(|e| e.to_string())?; - let resp = self.fetch_supergraph(None)?; + let resp = self.fetcher.fetch_supergraph()?; match resp { Some(supergraph) => { @@ -220,12 +172,8 @@ impl HiveRegistry { Ok(()) } - fn update_latest_etag(&mut self, etag: Option) { - self.etag = etag; - } - fn poll(&mut self) { - match self.fetch_supergraph(self.etag.clone()) { + match self.fetcher.fetch_supergraph() { Ok(new_supergraph) => { if let Some(new_supergraph) = new_supergraph { let current_file = std::fs::read_to_string(self.file_name.clone()) diff --git a/packages/libraries/router/src/usage.rs b/packages/libraries/router/src/usage.rs index ad4fe524a34..a884bb182d1 100644 --- a/packages/libraries/router/src/usage.rs +++ b/packages/libraries/router/src/usage.rs @@ -1,5 +1,4 @@ -use crate::agent::{AgentError, ExecutionReport, UsageAgent}; -use crate::persisted_documents::PERSISTED_DOCUMENT_HASH_KEY; +use crate::consts::PLUGIN_VERSION; use apollo_router::layers::ServiceBuilderExt; use apollo_router::plugin::Plugin; use apollo_router::plugin::PluginInit; @@ -7,6 +6,9 @@ use apollo_router::services::*; use apollo_router::Context; use core::ops::Drop; use futures::StreamExt; +use graphql_parser::parse_schema; +use graphql_parser::schema::Document; +use hive_console_sdk::agent::{ExecutionReport, UsageAgent}; use http::HeaderValue; use rand::Rng; use schemars::JsonSchema; @@ -14,13 +16,14 @@ use serde::{Deserialize, Serialize}; use std::collections::HashSet; use std::env; use std::sync::Arc; -use std::sync::Mutex; use std::time::{Duration, Instant}; use std::time::{SystemTime, UNIX_EPOCH}; use tower::BoxError; use tower::ServiceBuilder; use tower::ServiceExt; +use crate::persisted_documents::PERSISTED_DOCUMENT_HASH_KEY; + pub(crate) static OPERATION_CONTEXT: &str = "hive::operation_context"; #[derive(Serialize, Deserialize, Debug)] @@ -43,7 +46,8 @@ struct OperationConfig { pub struct UsagePlugin { config: OperationConfig, - agent: Option>>, + agent: Option>, + schema: Arc>, } #[derive(Clone, Debug, Deserialize, JsonSchema)] @@ -191,7 +195,7 @@ impl Plugin for UsagePlugin { return Err("Hive token is required".into()); } - let mut endpoint = init + let endpoint = init .config .registry_usage_endpoint .clone() @@ -205,11 +209,6 @@ impl Plugin for UsagePlugin { .clone() .or_else(|| env::var("HIVE_TARGET_ID").ok()); - // In case target ID is specified in configuration, append it to the endpoint - if let Some(target_id) = &target_id { - endpoint.push_str(&format!("/{}", target_id)); - } - let default_config = Config::default(); let user_config = init.config; let enabled = user_config @@ -240,8 +239,30 @@ impl Plugin for UsagePlugin { if enabled { tracing::info!("Starting GraphQL Hive Usage plugin"); } - + let schema = parse_schema(&init.supergraph_sdl) + .expect("Failed to parse schema") + .into_static(); + + let agent = if enabled { + let flush_interval = Duration::from_secs(flush_interval); + let agent = Arc::new(UsageAgent::new( + token.expect("token is set"), + endpoint, + target_id, + buffer_size, + connect_timeout, + request_timeout, + accept_invalid_certs, + flush_interval, + format!("hive-apollo-router/{}", PLUGIN_VERSION), + )); + start_flush_interval(agent.clone()); + Some(agent) + } else { + None + }; Ok(UsagePlugin { + schema: Arc::new(schema), config: OperationConfig { sample_rate: user_config .sample_rate @@ -257,24 +278,13 @@ impl Plugin for UsagePlugin { .or(default_config.client_version_header) .expect("client_version_header has no default value"), }, - agent: match enabled { - true => Some(Arc::new(Mutex::new(UsageAgent::new( - init.supergraph_sdl.to_string(), - token.unwrap(), - endpoint, - buffer_size, - connect_timeout, - request_timeout, - accept_invalid_certs, - Duration::from_secs(flush_interval), - )))), - false => None, - }, + agent, }) } fn supergraph_service(&self, service: supergraph::BoxService) -> supergraph::BoxService { let config = self.config.clone(); + let schema = self.schema.clone(); match self.agent.clone() { None => ServiceBuilder::new().service(service).boxed(), Some(agent) => { @@ -285,7 +295,8 @@ impl Plugin for UsagePlugin { req.context.clone() }, move |ctx: Context, fut| { - let agent_clone = agent.clone(); + let agent = agent.clone(); + let schema = schema.clone(); async move { let start: Instant = Instant::now(); @@ -329,9 +340,9 @@ impl Plugin for UsagePlugin { match result { Err(e) => { - try_add_report( - agent_clone.clone(), - ExecutionReport { + agent + .add_report(ExecutionReport { + schema, client_name, client_version, timestamp, @@ -341,8 +352,10 @@ impl Plugin for UsagePlugin { operation_body, operation_name, persisted_document_hash, - }, - ); + }) + .unwrap_or_else(|e| { + tracing::error!("Error adding report: {}", e); + }); Err(e) } Ok(router_response) => { @@ -359,9 +372,9 @@ impl Plugin for UsagePlugin { // make sure we send a single report, not for each chunk let response_has_errors = !response.errors.is_empty(); - try_add_report( - agent_clone.clone(), - ExecutionReport { + agent + .add_report(ExecutionReport { + schema: schema.clone(), client_name: client_name.clone(), client_version: client_version.clone(), timestamp, @@ -372,8 +385,13 @@ impl Plugin for UsagePlugin { operation_name: operation_name.clone(), persisted_document_hash: persisted_document_hash.clone(), - }, - ); + }) + .unwrap_or_else(|e| { + tracing::error!( + "Error adding report: {}", + e + ); + }); response }) @@ -393,16 +411,6 @@ impl Plugin for UsagePlugin { } } -fn try_add_report(agent: Arc>, execution_report: ExecutionReport) { - agent - .lock() - .map_err(|e| AgentError::Lock(e.to_string())) - .and_then(|a| a.add_report(execution_report)) - .unwrap_or_else(|e| { - tracing::error!("Error adding report: {}", e); - }); -} - impl Drop for UsagePlugin { fn drop(&mut self) { tracing::debug!("UsagePlugin has been dropped!"); @@ -410,6 +418,12 @@ impl Drop for UsagePlugin { } } +pub fn start_flush_interval(agent_for_interval: Arc) { + tokio::task::spawn(async move { + agent_for_interval.start_flush_interval(None).await; + }); +} + #[cfg(test)] mod hive_usage_tests { use apollo_router::{ diff --git a/packages/libraries/sdk-rs/.dockerignore b/packages/libraries/sdk-rs/.dockerignore new file mode 100644 index 00000000000..90f04312776 --- /dev/null +++ b/packages/libraries/sdk-rs/.dockerignore @@ -0,0 +1 @@ +target/** diff --git a/packages/libraries/sdk-rs/Cargo.toml b/packages/libraries/sdk-rs/Cargo.toml new file mode 100644 index 00000000000..9d9dbd444e7 --- /dev/null +++ b/packages/libraries/sdk-rs/Cargo.toml @@ -0,0 +1,38 @@ +[package] +name = "hive-console-sdk" +repository = "https://github.com/graphql-hive/console/" +edition = "2021" +license = "MIT" +publish = true +version = "0.0.0" +description = "Rust SDK for Hive Console" + +[lib] +name = "hive_console_sdk" +path = "src/lib.rs" + +[dependencies] +async-trait = "0.1.77" +axum-core = "0.5" +thiserror = "2.0.11" +reqwest = { version = "0.12.0", default-features = false, features = [ + "rustls-tls", + "blocking", + "json", +] } +reqwest-retry = "0.7.0" +reqwest-middleware = "0.4.0" +anyhow = "1" +tracing = "0.1" +serde = "1" +tokio = { version = "1.36.0", features = ["full"] } +graphql-parser = { version = "0.5.0", package = "graphql-parser-hive-fork" } +graphql-tools = { version = "0.4.0", features = [ + "graphql_parser_fork", +], default-features = false } +md5 = "0.7.0" +serde_json = "1" +moka = { version = "0.12.10", features = ["future", "sync"] } +sha2 = { version = "0.10.8", features = ["std"] } +tokio-util = "0.7.16" + diff --git a/packages/libraries/sdk-rs/package.json b/packages/libraries/sdk-rs/package.json new file mode 100644 index 00000000000..82cf1ffe6f4 --- /dev/null +++ b/packages/libraries/sdk-rs/package.json @@ -0,0 +1,8 @@ +{ + "name": "hive-console-sdk-rs", + "version": "0.0.0", + "private": true, + "scripts": { + "sync-cargo-file": "./sync-cargo-file.sh" + } +} diff --git a/packages/libraries/router/src/agent.rs b/packages/libraries/sdk-rs/src/agent.rs similarity index 61% rename from packages/libraries/router/src/agent.rs rename to packages/libraries/sdk-rs/src/agent.rs index e662ff941fb..6b7bc2e0545 100644 --- a/packages/libraries/router/src/agent.rs +++ b/packages/libraries/sdk-rs/src/agent.rs @@ -1,8 +1,7 @@ -use crate::consts::PLUGIN_VERSION; - use super::graphql::OperationProcessor; -use graphql_parser::schema::{parse_schema, Document}; -use reqwest::Client; +use graphql_parser::schema::Document; +use reqwest_middleware::{ClientBuilder, ClientWithMiddleware}; +use reqwest_retry::{policies::ExponentialBackoff, RetryTransientMiddleware}; use serde::Serialize; use std::{ collections::{HashMap, VecDeque}, @@ -10,7 +9,7 @@ use std::{ time::Duration, }; use thiserror::Error; -use tokio::sync::Mutex as AsyncMutex; +use tokio_util::sync::CancellationToken; #[derive(Serialize, Debug)] pub struct Report { @@ -64,6 +63,7 @@ struct ClientInfo { #[derive(Debug, Clone)] pub struct ExecutionReport { + pub schema: Arc>, pub client_name: Option, pub client_version: Option, pub timestamp: u64, @@ -75,27 +75,32 @@ pub struct ExecutionReport { pub persisted_document_hash: Option, } -#[derive(Debug, Clone, Default)] -pub struct State { - buffer: VecDeque, - schema: Document<'static, String>, -} +#[derive(Debug, Default)] +pub struct Buffer(Mutex>); -impl State { - fn new(schema: Document<'static, String>) -> Self { - Self { - buffer: VecDeque::new(), - schema, - } +impl Buffer { + fn new() -> Self { + Self(Mutex::new(VecDeque::new())) + } + + fn lock_buffer( + &self, + ) -> Result>, AgentError> { + let buffer: Result>, AgentError> = + self.0.lock().map_err(|e| AgentError::Lock(e.to_string())); + buffer } - pub fn push(&mut self, report: ExecutionReport) -> usize { - self.buffer.push_back(report); - self.buffer.len() + pub fn push(&self, report: ExecutionReport) -> Result { + let mut buffer = self.lock_buffer()?; + buffer.push_back(report); + Ok(buffer.len()) } - pub fn drain(&mut self) -> Vec { - self.buffer.drain(0..).collect::>() + pub fn drain(&self) -> Result, AgentError> { + let mut buffer = self.lock_buffer()?; + let reports: Vec = buffer.drain(..).collect(); + Ok(reports) } } @@ -104,21 +109,15 @@ pub struct UsageAgent { token: String, buffer_size: usize, endpoint: String, - /// We need the Arc wrapper to be able to clone the agent while preserving multiple mutable reference to processor - /// We also need the Mutex wrapper bc we cannot borrow data in an `Arc` as mutable - pub state: Arc>, - processor: Arc>, - client: Client, + buffer: Arc, + processor: Arc, + client: ClientWithMiddleware, + flush_interval: Duration, + user_agent: String, } fn non_empty_string(value: Option) -> Option { - match value { - Some(value) => match value.is_empty() { - true => None, - false => Some(value), - }, - None => None, - } + value.filter(|str| str.is_empty()) } #[derive(Error, Debug)] @@ -138,52 +137,50 @@ pub enum AgentError { impl UsageAgent { #[allow(clippy::too_many_arguments)] pub fn new( - schema: String, token: String, endpoint: String, + target_id: Option, buffer_size: usize, connect_timeout: u64, request_timeout: u64, accept_invalid_certs: bool, flush_interval: Duration, + user_agent: String, ) -> Self { - let schema = parse_schema::(&schema) - .expect("Failed to parse schema") - .into_static(); - let state = Arc::new(Mutex::new(State::new(schema))); - let processor = Arc::new(Mutex::new(OperationProcessor::new())); + let processor = Arc::new(OperationProcessor::new()); - let client = reqwest::Client::builder() + let retry_policy = ExponentialBackoff::builder().build_with_max_retries(3); + + let reqwest_agent = reqwest::Client::builder() .danger_accept_invalid_certs(accept_invalid_certs) .connect_timeout(Duration::from_secs(connect_timeout)) .timeout(Duration::from_secs(request_timeout)) .build() .map_err(|err| err.to_string()) .expect("Couldn't instantiate the http client for reports sending!"); + let client = ClientBuilder::new(reqwest_agent) + .with(RetryTransientMiddleware::new_with_policy(retry_policy)) + .build(); + let buffer = Arc::new(Buffer::new()); + + let mut endpoint = endpoint; - let agent = Self { - state, + if token.starts_with("hvo1/") { + if let Some(target_id) = target_id { + endpoint.push_str(&format!("/{}", target_id)); + } + } + + UsageAgent { + buffer, processor, endpoint, token, buffer_size, client, - }; - - let agent_for_interval = AsyncMutex::new(Arc::new(agent.clone())); - - tokio::task::spawn(async move { - loop { - tokio::time::sleep(flush_interval).await; - - let agent_ref = agent_for_interval.lock().await.clone(); - tokio::task::spawn(async move { - agent_ref.flush().await; - }); - } - }); - - agent + flush_interval, + user_agent, + } } fn produce_report(&self, reports: Vec) -> Result { @@ -195,18 +192,7 @@ impl UsageAgent { // iterate over reports and check if they are valid for op in reports { - let operation = self - .processor - .lock() - .map_err(|e| AgentError::Lock(e.to_string()))? - .process( - &op.operation_body, - &self - .state - .lock() - .map_err(|e| AgentError::Lock(e.to_string()))? - .schema, - ); + let operation = self.processor.process(&op.operation_body, &op.schema); match operation { Err(e) => { tracing::warn!( @@ -271,11 +257,7 @@ impl UsageAgent { } pub fn add_report(&self, execution_report: ExecutionReport) -> Result<(), AgentError> { - let size = self - .state - .lock() - .map_err(|e| AgentError::Lock(e.to_string()))? - .push(execution_report); + let size = self.buffer.push(execution_report)?; self.flush_if_full(size)?; @@ -283,54 +265,36 @@ impl UsageAgent { } pub async fn send_report(&self, report: Report) -> Result<(), AgentError> { - const DELAY_BETWEEN_TRIES: Duration = Duration::from_millis(500); - const MAX_TRIES: u8 = 3; - let mut error_message = "unexpected error".to_string(); - - for _ in 0..MAX_TRIES { - // Based on https://the-guild.dev/graphql/hive/docs/specs/usage-reports#data-structure - let resp = self - .client - .post(self.endpoint.clone()) - .header("X-Usage-API-Version", "2") - .header( - reqwest::header::AUTHORIZATION, - format!("Bearer {}", self.token.clone()), - ) - .header( - reqwest::header::USER_AGENT, - format!("hive-apollo-router/{}", PLUGIN_VERSION), - ) - .json(&report) - .send() - .await - .map_err(|e| AgentError::Unknown(e.to_string()))?; - - match resp.status() { - reqwest::StatusCode::OK => { - return Ok(()); - } - reqwest::StatusCode::UNAUTHORIZED => { - return Err(AgentError::Unauthorized); - } - reqwest::StatusCode::FORBIDDEN => { - return Err(AgentError::Forbidden); - } - reqwest::StatusCode::TOO_MANY_REQUESTS => { - return Err(AgentError::RateLimited); - } - _ => { - error_message = format!( - "({}) {}", - resp.status().as_str(), - resp.text().await.unwrap_or_default() - ); - } - } - tokio::time::sleep(DELAY_BETWEEN_TRIES).await; + let report_body = + serde_json::to_vec(&report).map_err(|e| AgentError::Unknown(e.to_string()))?; + // Based on https://the-guild.dev/graphql/hive/docs/specs/usage-reports#data-structure + let resp = self + .client + .post(&self.endpoint) + .header("X-Usage-API-Version", "2") + .header( + reqwest::header::AUTHORIZATION, + format!("Bearer {}", self.token), + ) + .header(reqwest::header::USER_AGENT, self.user_agent.to_string()) + .header(reqwest::header::CONTENT_TYPE, "application/json") + .header(reqwest::header::CONTENT_LENGTH, report_body.len()) + .body(report_body) + .send() + .await + .map_err(|e| AgentError::Unknown(e.to_string()))?; + + match resp.status() { + reqwest::StatusCode::OK => Ok(()), + reqwest::StatusCode::UNAUTHORIZED => Err(AgentError::Unauthorized), + reqwest::StatusCode::FORBIDDEN => Err(AgentError::Forbidden), + reqwest::StatusCode::TOO_MANY_REQUESTS => Err(AgentError::RateLimited), + _ => Err(AgentError::Unknown(format!( + "({}) {}", + resp.status(), + resp.text().await.unwrap_or_default() + ))), } - - Err(AgentError::Unknown(error_message)) } pub fn flush_if_full(&self, size: usize) -> Result<(), AgentError> { @@ -345,7 +309,13 @@ impl UsageAgent { } pub async fn flush(&self) { - let execution_reports = drain_reports(&self.state); + let execution_reports = match self.buffer.drain() { + Ok(res) => res, + Err(e) => { + tracing::error!("Unable to acquire lock for State in drain_reports: {}", e); + Vec::new() + } + }; let size = execution_reports.len(); if size > 0 { @@ -358,14 +328,20 @@ impl UsageAgent { } } } -} - -fn drain_reports(state: &Arc>) -> Vec { - match state.lock() { - Ok(mut state) => state.drain(), - Err(e) => { - tracing::error!("Unable to acquire lock for State in drain_reports: {}", e); - Vec::new() + pub async fn start_flush_interval(&self, token: Option) { + let mut tokio_interval = tokio::time::interval(self.flush_interval); + + match token { + Some(token) => loop { + tokio::select! { + _ = tokio_interval.tick() => { self.flush().await; } + _ = token.cancelled() => { println!("Shutting down."); return; } + } + }, + None => loop { + tokio_interval.tick().await; + self.flush().await; + }, } } } diff --git a/packages/libraries/router/src/graphql.rs b/packages/libraries/sdk-rs/src/graphql.rs similarity index 99% rename from packages/libraries/router/src/graphql.rs rename to packages/libraries/sdk-rs/src/graphql.rs index 2a0b4fa06cf..9d9cc03ffae 100644 --- a/packages/libraries/router/src/graphql.rs +++ b/packages/libraries/sdk-rs/src/graphql.rs @@ -5,12 +5,11 @@ use graphql_tools::ast::ext::SchemaDocumentExtension; use graphql_tools::ast::FieldByNameExtension; use graphql_tools::ast::TypeDefinitionExtension; use graphql_tools::ast::TypeExtension; -use lru::LruCache; +use moka::sync::Cache; use std::cmp::Ordering; use std::collections::BTreeMap; use std::collections::HashMap; use std::collections::HashSet; -use std::num::NonZeroUsize; use graphql_parser::minify_query; use graphql_parser::parse_query; @@ -400,7 +399,6 @@ impl<'a> OperationVisitor<'a, SchemaCoordinatesContext> for SchemaCoordinatesVis count_input_value_provided(ctx, &coordinate); } mark_as_used(ctx, &coordinate); - if let Some(field_def) = parent_type.field_by_name(&field_name) { if let Some(arg_def) = field_def.arguments.iter().find(|a| &a.name == arg_name) { let arg_type_name = Self::resolve_type_name(arg_def.value_type.clone()); @@ -661,6 +659,12 @@ pub struct SortSelectionsTransform<'s, T: Text<'s> + Clone> { seen: Seen<'s, T>, } +impl<'s, T: Text<'s> + Clone> Default for SortSelectionsTransform<'s, T> { + fn default() -> Self { + Self::new() + } +} + impl<'s, T: Text<'s> + Clone> SortSelectionsTransform<'s, T> { pub fn new() -> Self { Self { @@ -845,31 +849,36 @@ pub struct ProcessedOperation { } pub struct OperationProcessor { - cache: LruCache>, + cache: Cache>, +} + +impl Default for OperationProcessor { + fn default() -> Self { + Self::new() + } } impl OperationProcessor { pub fn new() -> OperationProcessor { OperationProcessor { - cache: LruCache::new(NonZeroUsize::new(1000).unwrap()), + cache: Cache::new(1000), } } pub fn process( - &mut self, + &self, query: &str, schema: &SchemaDocument<'static, String>, ) -> Result, String> { - let key = query.to_string(); - if self.cache.contains(&key) { - Ok(self + if self.cache.contains_key(query) { + let entry = self .cache - .get(&key) - .expect("Unable to acquire Cache in OperationProcessor.process") - .clone()) + .get(query) + .expect("Unable to acquire Cache in OperationProcessor.process"); + Ok(entry.clone()) } else { let result = self.transform(query, schema)?; - self.cache.put(key, result.clone()); + self.cache.insert(query.to_string(), result.clone()); Ok(result) } } diff --git a/packages/libraries/sdk-rs/src/lib.rs b/packages/libraries/sdk-rs/src/lib.rs new file mode 100644 index 00000000000..ec6f97886e0 --- /dev/null +++ b/packages/libraries/sdk-rs/src/lib.rs @@ -0,0 +1,4 @@ +pub mod agent; +pub mod graphql; +pub mod persisted_documents; +pub mod supergraph_fetcher; diff --git a/packages/libraries/sdk-rs/src/persisted_documents.rs b/packages/libraries/sdk-rs/src/persisted_documents.rs new file mode 100644 index 00000000000..36e41b05e3d --- /dev/null +++ b/packages/libraries/sdk-rs/src/persisted_documents.rs @@ -0,0 +1,159 @@ +use std::time::Duration; + +use moka::future::Cache; +use reqwest_middleware::ClientBuilder; +use reqwest_middleware::ClientWithMiddleware; +use reqwest_retry::{policies::ExponentialBackoff, RetryTransientMiddleware}; +use tracing::{debug, info, warn}; + +#[derive(Debug)] +pub struct PersistedDocumentsManager { + agent: ClientWithMiddleware, + cache: Cache, + endpoint: String, + key: String, +} + +#[derive(Debug, thiserror::Error)] +pub enum PersistedDocumentsError { + #[error("Failed to read body: {0}")] + FailedToReadBody(String), + #[error("Failed to parse body: {0}")] + FailedToParseBody(serde_json::Error), + #[error("Persisted document not found.")] + DocumentNotFound, + #[error("Failed to locate the persisted document key in request.")] + KeyNotFound, + #[error("Failed to validate persisted document")] + FailedToFetchFromCDN(reqwest_middleware::Error), + #[error("Failed to read CDN response body")] + FailedToReadCDNResponse(reqwest::Error), + #[error("No persisted document provided, or document id cannot be resolved.")] + PersistedDocumentRequired, +} + +impl PersistedDocumentsError { + pub fn message(&self) -> String { + self.to_string() + } + + pub fn code(&self) -> String { + match self { + PersistedDocumentsError::FailedToReadBody(_) => "FAILED_TO_READ_BODY".into(), + PersistedDocumentsError::FailedToParseBody(_) => "FAILED_TO_PARSE_BODY".into(), + PersistedDocumentsError::DocumentNotFound => "PERSISTED_DOCUMENT_NOT_FOUND".into(), + PersistedDocumentsError::KeyNotFound => "PERSISTED_DOCUMENT_KEY_NOT_FOUND".into(), + PersistedDocumentsError::FailedToFetchFromCDN(_) => "FAILED_TO_FETCH_FROM_CDN".into(), + PersistedDocumentsError::FailedToReadCDNResponse(_) => { + "FAILED_TO_READ_CDN_RESPONSE".into() + } + PersistedDocumentsError::PersistedDocumentRequired => { + "PERSISTED_DOCUMENT_REQUIRED".into() + } + } + } +} + +impl PersistedDocumentsManager { + #[allow(clippy::too_many_arguments)] + pub fn new( + key: String, + endpoint: String, + accept_invalid_certs: bool, + connect_timeout: u64, + request_timeout: u64, + retry_count: u32, + cache_size: u64, + ) -> Self { + let retry_policy = ExponentialBackoff::builder().build_with_max_retries(retry_count); + + let reqwest_agent = reqwest::Client::builder() + .danger_accept_invalid_certs(accept_invalid_certs) + .connect_timeout(Duration::from_secs(connect_timeout)) + .timeout(Duration::from_secs(request_timeout)) + .build() + .expect("Failed to create reqwest client"); + let agent = ClientBuilder::new(reqwest_agent) + .with(RetryTransientMiddleware::new_with_policy(retry_policy)) + .build(); + + let cache = Cache::::new(cache_size); + + Self { + agent, + cache, + endpoint, + key, + } + } + + /// Resolves the document from the cache, or from the CDN + pub async fn resolve_document( + &self, + document_id: &str, + ) -> Result { + let cached_record = self.cache.get(document_id).await; + + match cached_record { + Some(document) => { + debug!("Document {} found in cache: {}", document_id, document); + + Ok(document) + } + None => { + debug!( + "Document {} not found in cache. Fetching from CDN", + document_id + ); + let cdn_document_id = str::replace(document_id, "~", "/"); + let cdn_artifact_url = format!("{}/apps/{}", &self.endpoint, cdn_document_id); + info!( + "Fetching document {} from CDN: {}", + document_id, cdn_artifact_url + ); + let cdn_response = self + .agent + .get(cdn_artifact_url) + .header("X-Hive-CDN-Key", self.key.to_string()) + .send() + .await; + + match cdn_response { + Ok(response) => { + if response.status().is_success() { + let document = response + .text() + .await + .map_err(PersistedDocumentsError::FailedToReadCDNResponse)?; + debug!( + "Document fetched from CDN: {}, storing in local cache", + document + ); + self.cache + .insert(document_id.into(), document.clone()) + .await; + + return Ok(document); + } + + warn!( + "Document fetch from CDN failed: HTTP {}, Body: {:?}", + response.status(), + response + .text() + .await + .unwrap_or_else(|_| "Unavailable".to_string()) + ); + + Err(PersistedDocumentsError::DocumentNotFound) + } + Err(e) => { + warn!("Failed to fetch document from CDN: {:?}", e); + + Err(PersistedDocumentsError::FailedToFetchFromCDN(e)) + } + } + } + } + } +} diff --git a/packages/libraries/sdk-rs/src/supergraph_fetcher.rs b/packages/libraries/sdk-rs/src/supergraph_fetcher.rs new file mode 100644 index 00000000000..1b2de8199d9 --- /dev/null +++ b/packages/libraries/sdk-rs/src/supergraph_fetcher.rs @@ -0,0 +1,86 @@ +use std::time::Duration; + +#[derive(Debug)] +pub struct SupergraphFetcher { + client: reqwest::blocking::Client, + endpoint: String, + key: String, + user_agent: String, + etag: Option, +} + +impl SupergraphFetcher { + pub fn try_new( + endpoint: String, + key: String, + user_agent: String, + connect_timeout: u64, + request_timeout: u64, + accept_invalid_certs: bool, + ) -> Result { + let mut endpoint = endpoint; + if !endpoint.ends_with("/supergraph") { + if endpoint.ends_with("/") { + endpoint.push_str("supergraph") + } else { + endpoint.push_str("/supergraph") + } + } + + let client = reqwest::blocking::Client::builder() + .danger_accept_invalid_certs(accept_invalid_certs) + .connect_timeout(Duration::from_secs(connect_timeout)) + .timeout(Duration::from_secs(request_timeout)) + .build() + .map_err(|e| e.to_string())?; + + Ok(Self { + client, + endpoint, + key, + user_agent, + etag: None, + }) + } + + pub fn fetch_supergraph(&mut self) -> Result, String> { + let mut headers = reqwest::header::HeaderMap::new(); + + headers.insert( + reqwest::header::USER_AGENT, + reqwest::header::HeaderValue::from_str(&self.user_agent).unwrap(), + ); + headers.insert("X-Hive-CDN-Key", self.key.parse().unwrap()); + + if let Some(checksum) = &self.etag { + headers.insert("If-None-Match", checksum.parse().unwrap()); + } + + let resp = self + .client + .get(self.endpoint.as_str()) + .headers(headers) + .send() + .map_err(|e| e.to_string())?; + + match resp.headers().get("etag") { + Some(checksum) => { + let etag = checksum.to_str().map_err(|e| e.to_string())?; + self.update_latest_etag(Some(etag.to_string())); + } + None => { + self.update_latest_etag(None); + } + } + + if resp.status().as_u16() == 304 { + return Ok(None); + } + + Ok(Some(resp.text().map_err(|e| e.to_string())?)) + } + + fn update_latest_etag(&mut self, etag: Option) { + self.etag = etag; + } +} diff --git a/packages/libraries/sdk-rs/sync-cargo-file.sh b/packages/libraries/sdk-rs/sync-cargo-file.sh new file mode 100755 index 00000000000..af79fb189ea --- /dev/null +++ b/packages/libraries/sdk-rs/sync-cargo-file.sh @@ -0,0 +1,14 @@ +#/bin/bash + +# The following script syncs the "version" field in package.json to the "package.version" field in Cargo.toml +# This main versioning flow is managed by Changeset. +# This file is executed during "changeset version" (when the version is bumped and release PR is created) +# to sync the version in Cargo.toml + +# References: +# .github/workflows/publish-rust.yaml - The GitHub action that runs this script (after "changeset version") +# .github/workflows/main-rust.yaml - The GitHub action that does the actual publishing, if a changeset is declared to this package/crate + +npm_version=$(node -p "require('./package.json').version") +cargo install set-cargo-version +set-cargo-version ./Cargo.toml $npm_version diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b90987eea5b..1cc44ccb208 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -582,7 +582,13 @@ importers: version: 16.9.0 publishDirectory: dist - packages/libraries/router: {} + packages/libraries/router: + dependencies: + hive-console-sdk-rs: + specifier: workspace:* + version: link:../sdk-rs + + packages/libraries/sdk-rs: {} packages/libraries/yoga: dependencies: