From b837b4ff60b3cb5be15693fec5ee74fe34410a4d Mon Sep 17 00:00:00 2001 From: TimLai666 Date: Thu, 29 Oct 2026 18:52:49 +0800 Subject: [PATCH 1/4] feat: support WSL Containers builds and update Rust dependencies --- .github/workflows/ci.yml | 8 +- .github/workflows/e2e-linux.yml | 6 +- .github/workflows/release.yml | 2 +- .github/workflows/security.yml | 2 +- AGENTS.md | 11 +- Cargo.lock | 1586 +++++------------ README.md | 6 +- crates/appcipe-normalize/Cargo.toml | 2 +- crates/appcipe-spec/Cargo.toml | 4 +- crates/chefer-assembler/Cargo.toml | 10 +- crates/chefer-bundle/Cargo.toml | 8 +- crates/chefer-cli/Cargo.toml | 29 +- crates/chefer-cli/src/commands/doctor.rs | 8 +- crates/chefer-cli/src/commands/init.rs | 2 +- crates/chefer-cli/src/commands/inspect.rs | 2 +- crates/chefer-cli/src/commands/upgrade.rs | 166 +- crates/chefer-cli/src/ui.rs | 6 +- .../tests/dockerfile_builder_e2e.rs | 332 ++++ crates/chefer-pack/Cargo.toml | 22 +- crates/chefer-pack/src/dockerfile.rs | 85 +- crates/chefer-runtime/Cargo.toml | 22 +- crates/guest-agent/Cargo.toml | 10 +- crates/vmm-backend/Cargo.toml | 8 +- crates/vmm-backend/src/wsl_util.rs | 4 +- crates/whp-helper/Cargo.toml | 6 +- crates/whp-helper/test-init/Cargo.toml | 2 +- docs/DESIGN.md | 12 +- rust-toolchain.toml | 4 + scripts/windows-wslc-e2e.ps1 | 144 ++ skills/write-appcipe/SKILL.md | 4 +- 30 files changed, 1199 insertions(+), 1314 deletions(-) create mode 100644 crates/chefer-cli/tests/dockerfile_builder_e2e.rs create mode 100644 rust-toolchain.toml create mode 100644 scripts/windows-wslc-e2e.ps1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 806cf49..1189551 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v7 - name: Install Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.99.1 with: components: rustfmt, clippy targets: x86_64-unknown-linux-musl @@ -49,7 +49,7 @@ jobs: - uses: actions/checkout@v7 - name: Install Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.99.1 with: components: clippy @@ -111,7 +111,7 @@ jobs: - uses: actions/checkout@v7 - name: Install Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.99.1 with: targets: ${{ matrix.target }} @@ -130,7 +130,7 @@ jobs: - uses: actions/checkout@v7 - name: Install Rust (musl target) - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.99.1 with: targets: x86_64-unknown-linux-musl diff --git a/.github/workflows/e2e-linux.yml b/.github/workflows/e2e-linux.yml index fb5b1be..777238a 100644 --- a/.github/workflows/e2e-linux.yml +++ b/.github/workflows/e2e-linux.yml @@ -40,7 +40,7 @@ jobs: # 用 runner 的 host 原生 gnu target 建置(免 musl C 交叉工具鏈)。 - name: Install Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.99.1 - name: Cache cargo uses: Swatinem/rust-cache@v2 @@ -98,7 +98,7 @@ jobs: - uses: actions/checkout@v7 - name: Install Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.99.1 - name: Cache cargo uses: Swatinem/rust-cache@v2 @@ -155,7 +155,7 @@ jobs: - uses: actions/checkout@v7 - name: Install Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.99.1 with: targets: ${{ matrix.guest_target }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ac1e97e..82513b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -91,7 +91,7 @@ jobs: ref: ${{ needs.preflight.outputs.checkout_ref }} - name: Install Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.99.1 with: targets: ${{ matrix.target }} diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index 1aaf039..84e4cd5 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v7 - name: Install Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.99.1 # 以預編二進位安裝 cargo-audit(免現場編譯,數秒完成) - name: Install cargo-audit diff --git a/AGENTS.md b/AGENTS.md index ee97dba..dd57d86 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -21,9 +21,10 @@ CHEFER_LINUX_REF=v6.6.32 bash scripts/build-appliance.sh --arch x86_64 --out dis CHEFER_LINUX_REF=v6.6.32 bash scripts/qemu-e2e.sh # Linux only: validates appliance + guest-agent in QEMU cargo fmt cargo clippy +powershell -File scripts/windows-wslc-e2e.ps1 # physical Windows: Dockerfile -> single exe -> WSL, no Docker ``` -Testing: `cargo test` needs neither Docker nor WSL — integration tests (`crates/chefer-cli/tests/cli_e2e.rs`, `crates/chefer-pack/tests/pack_tests.rs`) synthesize minimal docker-archive/OCI image tars in-test and run init/check/build/inspect against the real CLI binary. A *full* manual E2E (real image → single-file exe → actually running it) additionally requires Docker (`docker save` an image) and, on a Windows host, WSL2. The macOS appliance path is validated on Linux with `scripts/qemu-e2e.sh`; the actual VZ boot path cannot be exercised on GitHub-hosted macOS runners and must be verified on a physical Mac (`scripts/vz-smoke.sh`). The **whp** backend is in the same position for the opposite reason — GitHub's windows runners have no nested virtualization, and the QEMU E2E uses virtio-console (hvc0) so it never exercises WHP's 8250 serial path — so run `scripts/whp-smoke.ps1` on a physical Windows machine with the Windows Hypervisor Platform enabled; it asserts exit-code propagation, **guest userspace stdout actually reaching the host**, TCP forwarding, and helper anti-orphan. +Testing: `cargo test` needs neither Docker nor WSL — integration tests (`crates/chefer-cli/tests/cli_e2e.rs`, `crates/chefer-pack/tests/pack_tests.rs`) synthesize minimal docker-archive/OCI image tars in-test and run init/check/build/inspect against the real CLI binary. A *full* manual E2E (real image → single-file exe → actually running it) additionally requires a real image and, on a Windows host, WSL2. `scripts/windows-wslc-e2e.ps1` builds a Dockerfile with WSL Containers (`wslc`), exports and packages the image, then verifies guest stdout and persisted output without Docker. Other manual tests may prepare their images with Docker (`docker save`). The macOS appliance path is validated on Linux with `scripts/qemu-e2e.sh`; the actual VZ boot path cannot be exercised on GitHub-hosted macOS runners and must be verified on a physical Mac (`scripts/vz-smoke.sh`). The **whp** backend is in the same position for the opposite reason — GitHub's windows runners have no nested virtualization, and the QEMU E2E uses virtio-console (hvc0) so it never exercises WHP's 8250 serial path — so run `scripts/whp-smoke.ps1` on a physical Windows machine with the Windows Hypervisor Platform enabled; it asserts exit-code propagation, **guest userspace stdout actually reaching the host**, TCP forwarding, and helper anti-orphan. CI ([.github/workflows/ci.yml](.github/workflows/ci.yml)) builds and tests on Linux/Windows/macOS and verifies the musl guest-agent links statically. Linux E2E ([.github/workflows/e2e-linux.yml](.github/workflows/e2e-linux.yml)) covers native namespaces, the QEMU appliance path, and a boot smoke of the *cross-built* aarch64 appliance (`scripts/appliance-boot-smoke.sh` on an x86_64 runner — the same cross-build path release.yml uses, which the native-arm64 E2E job can't cover). Releases ([.github/workflows/release.yml](.github/workflows/release.yml)) build chefer-cli + chefer-runtime for 6 targets, guest-agent for both musl arches, and the Linux appliance for both guest arches — boot-smoking each appliance before upload — then attach one complete kit per host platform (CLI + all runtimes + both agents + appliance) to the GitHub Release. @@ -58,13 +59,17 @@ Rule of thumb: the **release version** moves every release; the **spec/manifest/ **Authoring an `appcipe.yml`?** Read [skills/write-appcipe/SKILL.md](skills/write-appcipe/SKILL.md) — the full field reference, validation rules, and real-world gotchas (image `format` is hyphenated, official chown/gosu images (redis/postgres) run as-is on the root backends — WSL2 / macOS VM / native-Linux-as-root run services as real root with no user namespace — and on the native-Linux rootless path too when the host has `/etc/subuid` + `newuidmap` (rootless-Podman-style delegation; falls back to a single-uid map without them), the app-level `network:` field (default `bridge` = per-app netns isolation + outbound NAT; `internal` = no outbound; `shared` = old non-isolated behavior), `app_version` is display-only and not readable by the container). A runnable app+db example lives in [examples/demo/](examples/demo/). See [examples/appcipe.yml](examples/appcipe.yml) for the fully-commented reference. Key semantics: -- `image:` accepts a short form or a full form (`source`/`file`/`format`/`platform`) — both map to `appcipe_spec::ImageSourceOrPath`. **`source: tar`** (local `docker save`/OCI archive) and **`source: image`** (registry pull at build time via `oci-client`, rustls; private registries via `docker login` plain `auths` or `CHEFER_REGISTRY_AUTH=user:pass` — credential helpers not supported, anonymous fallback for public images) are supported; `source: dockerfile` is rejected at validation. The short form auto-detects: a pinned registry ref (`redis:7.2-alpine`, has `:tag`/`@digest`, not a path/`.tar`/existing file — see `appcipe-normalize::looks_like_image_ref`) → `source: image`; otherwise a tar path. Registry refs **must** pin a non-`latest` tag or `@sha256` digest (`appcipe-spec` `check_image_reference`). The registry pull lives in `chefer-pack::registry` and produces the same `ResolvedImage` as a local tar, so the repack/diff_id path is shared. +- `image:` accepts a short form or a full form (`source`/`file`/`format`/`platform`) — both map to `appcipe_spec::ImageSourceOrPath`. **`source: tar`** (local `docker save`/OCI archive) and **`source: image`** (registry pull at build time via `oci-client`, rustls; private registries via `docker login` plain `auths` or `CHEFER_REGISTRY_AUTH=user:pass` — credential helpers not supported, anonymous fallback for public images) are supported; `source: dockerfile` builds with a host builder (docker/podman/nerdctl/Apple container; Windows also supports WSL Containers `wslc`). Set `CHEFER_DOCKERFILE_BUILDER=wslc` on Windows to select it explicitly. The short form auto-detects: a pinned registry ref (`redis:7.2-alpine`, has `:tag`/`@digest`, not a path/`.tar`/existing file — see `appcipe-normalize::looks_like_image_ref`) → `source: image`; otherwise a tar path. Registry refs **must** pin a non-`latest` tag or `@sha256` digest (`appcipe-spec` `check_image_reference`). The registry pull lives in `chefer-pack::registry` and produces the same `ResolvedImage` as a local tar, so the repack/diff_id path is shared. - Persistence is opt-in per service via `persist_path`; data lands in `{data_dir or system default}/data/{service}/`. `old_names` drives automatic data-dir migration. - `crash: fail_fast` (the only policy; legacy field name `crash_policy` accepted via serde alias): any service exiting non-zero terminates the whole app with that exit code. Additionally, an **interface service** (`interface_mode` gui/terminal/both) exiting *even with code 0* tears the whole app down (closing the window/terminal = app done) — otherwise background services like a `db` would linger after the GUI closes; a `none` service exiting 0 is treated as a finished background/one-shot task and the rest keep running. - `interface_mode`: terminal | gui | both | none — at most one terminal/both service per app; host ports must be unique app-wide. Validation rules live in `crates/appcipe-spec/src/validate.rs`; it collects **all** errors in one report (deterministic order). +## Delivery + +After verification and review, commit and push authorized project changes without asking for push confirmation again. + ## Follow-ups -(目前無。) +- 維護風險:`serde_yaml` 依賴的 `unsafe-libyaml 0.2.11` 已停止維護([RUSTSEC-2024-0449](https://rustsec.org/advisories/RUSTSEC-2024-0449))。目前沒有可升級的修補版本;後續評估替換 YAML parser,並驗證 AppCipe 解析與錯誤訊息相容性。 diff --git a/Cargo.lock b/Cargo.lock index 107bdbd..bcdeff8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,18 +10,18 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aho-corasick" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba" dependencies = [ "memchr", ] [[package]] name = "android_system_properties" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "ae221649c9976a6f6c56ae1facf410f3ddb33cc661c4b7b61020a912d4237fbc" dependencies = [ "libc", ] @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" +checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" [[package]] name = "appcipe-normalize" @@ -103,15 +103,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "arbitrary" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" -dependencies = [ - "derive_arbitrary", -] - [[package]] name = "atomic-waker" version = "1.1.2" @@ -126,25 +117,25 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "aws-lc-rs" -version = "1.17.0" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" +checksum = "faac5829c2b74c28f830747e7818ccfb684261b5f48a1118b1e2a13d36dfab13" dependencies = [ "aws-lc-sys", - "untrusted 0.7.1", "zeroize", ] [[package]] name = "aws-lc-sys" -version = "0.41.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" +checksum = "f1622d8446a2d4b2ce0c7eefc73dd43a99779028d5ee5c2dd8073a658ba8a2bc" dependencies = [ "cc", "cmake", "dunce", "fs_extra", + "pkg-config", ] [[package]] @@ -154,10 +145,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] -name = "base64ct" -version = "1.8.3" +name = "base64" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" [[package]] name = "bitflags" @@ -167,18 +158,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" - -[[package]] -name = "block-buffer" -version = "0.10.4" +version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] +checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" [[package]] name = "block-buffer" @@ -212,15 +194,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.11.1" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "cc" -version = "1.2.64" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f" +checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0" dependencies = [ "find-msvc-tools", "jobserver", @@ -230,15 +212,26 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" +checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" [[package]] name = "cfg_aliases" -version = "0.2.1" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" + +[[package]] +name = "chacha20" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" +dependencies = [ + "cfg-if", + "cpufeatures", + "rand_core", +] [[package]] name = "chefer-assembler" @@ -248,7 +241,7 @@ dependencies = [ "chefer-bundle", "clap", "fs-err", - "sha2 0.11.0", + "sha2", "tar", "tempfile", "zstd", @@ -280,16 +273,17 @@ dependencies = [ "crossterm", "flate2", "owo-colors", - "reqwest 0.12.28", + "reqwest", "self-replace", - "self_update", + "semver", + "serde", "serde_json", "serde_yaml", - "sha2 0.11.0", + "sha2", "tar", "tempfile", "vmm-backend", - "zip 8.6.0", + "zip", "zstd", ] @@ -299,7 +293,7 @@ version = "0.5.0" dependencies = [ "anyhow", "appcipe-spec", - "base64", + "base64 0.23.1", "chefer-bundle", "flate2", "fs-err", @@ -307,7 +301,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "sha2 0.11.0", + "sha2", "tar", "tempfile", "time", @@ -325,7 +319,7 @@ dependencies = [ "ctrlc", "fs-err", "hex", - "sha2 0.11.0", + "sha2", "tar", "tempfile", "tracing", @@ -351,9 +345,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.1" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" +checksum = "aa8876b300ab35ba921adea3dfd70157a46249b33f95c9084ae5709785478946" dependencies = [ "clap_builder", "clap_derive", @@ -361,9 +355,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.0" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" +checksum = "ec0797fb7aeb1406c84efac526901f7ec3ead2124f946b494e72879d4b54704d" dependencies = [ "anstream", "anstyle", @@ -373,21 +367,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.1" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" +checksum = "f9c751b79415d4e559e3d1fcf128e09e720eb673a06d26cf6f392d37d75b66e0" dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 3.0.9", ] [[package]] name = "clap_lex" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" +checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486" [[package]] name = "cmake" @@ -406,9 +400,9 @@ checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "combine" -version = "4.6.7" +version = "4.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92" dependencies = [ "bytes", "memchr", @@ -416,34 +410,15 @@ dependencies = [ [[package]] name = "comfy-table" -version = "7.2.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958c5d6ecf1f214b4c2bbbbf6ab9523a864bd136dcf71a7e8904799acfe1ad47" +checksum = "b96a46ad395a5e00676eddaca4a45ed78b29c08be5a878d35e4b071c625637dd" dependencies = [ "crossterm", "unicode-segmentation", "unicode-width", ] -[[package]] -name = "console" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" -dependencies = [ - "encode_unicode", - "libc", - "once_cell", - "unicode-width", - "windows-sys 0.59.0", -] - -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - [[package]] name = "const-oid" version = "0.10.2" @@ -452,9 +427,9 @@ checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" [[package]] name = "const_format" -version = "0.2.36" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e" +checksum = "a3decb4d6965448659923544a634a0571ba44cede4e11ef15a5a317126840454" dependencies = [ "const_format_proc_macros", "konst", @@ -462,9 +437,9 @@ dependencies = [ [[package]] name = "const_format_proc_macros" -version = "0.2.34" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" +checksum = "941b570269a642506f08cb5b688c04bfa6cfd41a26f8bcdc49db8fd00c0ab659" dependencies = [ "proc-macro2", "quote", @@ -498,44 +473,29 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" -dependencies = [ - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.5.0" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055" dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-utils" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" - [[package]] name = "crossterm" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "crossterm_winapi", "derive_more", "document-features", @@ -556,16 +516,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "crypto-common" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" -dependencies = [ - "generic-array", - "typenum", -] - [[package]] name = "crypto-common" version = "0.2.2" @@ -586,33 +536,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.17", - "curve25519-dalek-derive", - "digest 0.10.7", - "fiat-crypto", - "rustc_version", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "darling" version = "0.20.11" @@ -634,7 +557,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 2.0.119", ] [[package]] @@ -645,23 +568,14 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", - "syn", -] - -[[package]] -name = "defmt" -version = "0.3.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0963443817029b2024136fc4dd07a5107eb8f977eaf18fcd1fdeb11306b64ad" -dependencies = [ - "defmt 1.1.0", + "syn 2.0.119", ] [[package]] name = "defmt" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e524506490a1953d237cb87b1cfc1e46f88c18f10a22dfe0f507dc6bfc7f7f" +checksum = "e4a0795ac740cb54d7b3775c9c17345f6aaecf884c01733b39d6017738e0e3e1" dependencies = [ "bitflags 1.3.2", "defmt-macros", @@ -669,52 +583,30 @@ dependencies = [ [[package]] name = "defmt-macros" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a27770e9c8f719a79d8b638281f4d828f77d8fd61e0bd94451b9b85e576a0b" +checksum = "840bb056bd99c495c9188198a258ab787c79f306d864db3e6e8451442d6d8366" dependencies = [ "defmt-parser", - "proc-macro-error2", "proc-macro2", "quote", - "syn", + "syn 3.0.9", ] [[package]] name = "defmt-parser" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" +checksum = "71958f69fb2de856c5dd51ac9377e986ca1aa5919f931bf5395a807277f889a0" dependencies = [ "thiserror", ] -[[package]] -name = "der" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" -dependencies = [ - "const-oid 0.9.6", - "zeroize", -] - [[package]] name = "deranged" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" - -[[package]] -name = "derive_arbitrary" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e" [[package]] name = "derive_builder" @@ -734,7 +626,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -744,7 +636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn", + "syn 2.0.119", ] [[package]] @@ -766,17 +658,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common 0.1.7", + "syn 2.0.119", ] [[package]] @@ -785,9 +667,9 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ - "block-buffer 0.12.1", - "const-oid 0.10.2", - "crypto-common 0.2.2", + "block-buffer", + "const-oid", + "crypto-common", ] [[package]] @@ -796,7 +678,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2", "libc", "objc2", @@ -804,13 +686,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" +checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.9", ] [[package]] @@ -828,48 +710,11 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8", - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" -dependencies = [ - "curve25519-dalek", - "ed25519", - "serde", - "sha2 0.10.9", - "signature", - "subtle", - "zeroize", -] - -[[package]] -name = "either" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" - -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - [[package]] name = "equivalent" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826" [[package]] name = "errno" @@ -883,9 +728,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" +checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" [[package]] name = "fdeflate" @@ -896,12 +741,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - [[package]] name = "filetime" version = "0.2.29" @@ -914,18 +753,19 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.9" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48" [[package]] name = "flate2" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.9.1", + "zlib-rs", ] [[package]] @@ -934,12 +774,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - [[package]] name = "form_urlencoded" version = "1.2.2" @@ -951,9 +785,9 @@ dependencies = [ [[package]] name = "fs-err" -version = "3.3.1" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91aa448ca50d7e79433bdf3ee8d99215430d2ec02ade5aefab2a073a1822e8a" +checksum = "b5c95b673b8f6f7235229ae11c5642d81b04c2e64c1e2fb417bc0cf73ca45f29" dependencies = [ "autocfg", ] @@ -966,9 +800,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures-channel" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" +checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4" dependencies = [ "futures-core", "futures-sink", @@ -976,44 +810,44 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-io" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" +checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" [[package]] name = "futures-macro" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" +checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.9", ] [[package]] name = "futures-sink" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" +checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d" [[package]] name = "futures-task" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-util" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures-core", "futures-io", @@ -1025,16 +859,6 @@ dependencies = [ "slab", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" version = "0.2.17" @@ -1050,31 +874,18 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "js-sys", "libc", - "r-efi 5.3.0", - "wasip2", + "r-efi", + "rand_core", "wasm-bindgen", ] -[[package]] -name = "getrandom" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" -dependencies = [ - "cfg-if", - "libc", - "r-efi 6.0.0", - "wasip2", - "wasip3", -] - [[package]] name = "getset" version = "0.1.7" @@ -1083,7 +894,7 @@ checksum = "6cf442baaabe4213ce7d1239afc26c039180b6456da2cededa316ae2c8a77a77" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -1097,30 +908,11 @@ dependencies = [ "libc", "nix", "ruzstd", - "sha2 0.11.0", + "sha2", "tar", "tempfile", ] -[[package]] -name = "h2" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hash32" version = "0.3.1" @@ -1130,15 +922,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash", -] - [[package]] name = "hashbrown" version = "0.17.1" @@ -1147,9 +930,9 @@ checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" [[package]] name = "heapless" -version = "0.8.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +checksum = "25ba4bd83f9415b58b4ed8dc5714c76e626a105be4646c02630ad730ad3b5aa4" dependencies = [ "hash32", "stable_deref_trait", @@ -1169,9 +952,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "http" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" +checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0" dependencies = [ "bytes", "itoa", @@ -1188,9 +971,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c" dependencies = [ "bytes", "http", @@ -1198,9 +981,9 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c" dependencies = [ "bytes", "futures-core", @@ -1217,24 +1000,22 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hybrid-array" -version = "0.4.12" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da" +checksum = "27f864f10dfb56725ce5ce5472bc52252c8f93a4ab86327122cebf62c5f59a17" dependencies = [ "typenum", ] [[package]] name = "hyper" -version = "1.10.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498" +checksum = "2c3e324da4c95177d6291d4c8730197c0d1822f8a9766814a4a44fa5ab797c9c" dependencies = [ "atomic-waker", "bytes", - "futures-channel", "futures-core", - "h2", "http", "http-body", "httparse", @@ -1247,9 +1028,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.9" +version = "0.27.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" +checksum = "dfa8e654703247911e29c23fbeaa261834bd9bb74efba2f9acddc37bfb127f53" dependencies = [ "http", "hyper", @@ -1258,21 +1039,21 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots", ] [[package]] name = "hyper-util" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" +checksum = "ddc03d96684f9226b8a787cdb71488417b53ab5ea8fdb1dac946cb9431cc8bff" dependencies = [ - "base64", + "base64 0.23.1", "bytes", "futures-channel", "futures-util", "http", "http-body", + "httparse", "hyper", "ipnet", "libc", @@ -1310,9 +1091,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +checksum = "fe090a42a0d3140fed8c63263ed1fecc02422cb2f4bfe55cd8de2de1b8e105dd" dependencies = [ "displaydoc", "potential_utf", @@ -1324,9 +1105,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +checksum = "25d29b57c17c6528d0dc4c2141cfa2d08200465acb537a3909c8b9b8a4a984c0" dependencies = [ "displaydoc", "litemap", @@ -1337,9 +1118,9 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +checksum = "404a3b8c486f205c87fe7f23ab6894d84a4ad76d6e4671ae1981ba7def87c599" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -1351,16 +1132,17 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" +checksum = "20f0088bfb7441f7a37fa0c9e20cb1e9cba1cac6b9ce8cd2a6dc44294f8e8cbc" [[package]] name = "icu_properties" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +checksum = "2ea83d991c56158f7cf898bf86436c1dfe7c07ee82fe88951f2695c9f37a379f" dependencies = [ + "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", @@ -1371,15 +1153,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" +checksum = "b98f29af82d02b163fe50161388350e743bb3107cc8e8c2f7314cb505faddfcf" [[package]] name = "icu_provider" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +checksum = "413099315636c588ee8f011190b329b971a09a8fae9d157e01dcae8379468514" dependencies = [ "displaydoc", "icu_locale_core", @@ -1390,12 +1172,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "ident_case" version = "1.0.1" @@ -1425,34 +1201,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.14.0" +version = "2.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" dependencies = [ "equivalent", - "hashbrown 0.17.1", - "serde", - "serde_core", -] - -[[package]] -name = "indicatif" -version = "0.17.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width", - "web-time", + "hashbrown", ] [[package]] name = "ipnet" -version = "2.12.0" +version = "2.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" +checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" [[package]] name = "is_terminal_polyfill" @@ -1493,7 +1254,7 @@ dependencies = [ "quote", "rustc_version", "simd_cesu8", - "syn", + "syn 2.0.119", ] [[package]] @@ -1512,46 +1273,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" dependencies = [ "quote", - "syn", + "syn 2.0.119", ] [[package]] name = "jobserver" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.4.3", "libc", ] [[package]] name = "js-sys" -version = "0.3.102" +version = "0.3.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31" +checksum = "7883d941dae510fb2d978fc3fe018c71c9e2892fd38854de3e8b92c2e5ad9cc5" dependencies = [ "cfg-if", "futures-util", "wasm-bindgen", ] -[[package]] -name = "jsonwebtoken" -version = "10.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba32bfb4ffdeaca3e34431072faf01745c9b26d25504aa7a6cf5684334fc4fc" -dependencies = [ - "aws-lc-rs", - "base64", - "getrandom 0.2.17", - "js-sys", - "serde", - "serde_json", - "signature", - "zeroize", -] - [[package]] name = "konst" version = "0.2.20" @@ -1569,21 +1314,15 @@ checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" [[package]] name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "leb128fmt" -version = "0.1.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" +checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb" [[package]] name = "libc" -version = "0.2.186" +version = "0.2.191" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a" [[package]] name = "linux-raw-sys" @@ -1593,15 +1332,15 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" [[package]] name = "litrs" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" +checksum = "4744e383959f0db86ede514b809b1c53251889093803c05267acc7d4e7030d70" [[package]] name = "lock_api" @@ -1614,15 +1353,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.32" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" +checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "lru-slab" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" +checksum = "4050469837a6ff301cd14c1f8f24f88549e6d548f24f64e2148eb0f72cebc51f" [[package]] name = "managed" @@ -1632,9 +1371,9 @@ checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" [[package]] name = "memchr" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "memoffset" @@ -1655,11 +1394,21 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c" +dependencies = [ + "adler2", + "simd-adler32", +] + [[package]] name = "mio" -version = "1.2.1" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" +checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee" dependencies = [ "libc", "log", @@ -1673,7 +1422,7 @@ version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "cfg-if", "cfg_aliases", "libc", @@ -1704,17 +1453,11 @@ dependencies = [ "autocfg", ] -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - [[package]] name = "objc2" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f" +checksum = "08849bbd4767dfae9457696856ae1c84fe4e0281bbe4a7abff2d0e06fb7981f8" dependencies = [ "objc2-encode", ] @@ -1727,25 +1470,24 @@ checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" [[package]] name = "oci-client" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5261a7fb43d9c53b8e63e6d5e86860719dad253d015d022066c72d585125aed8" +checksum = "ddc7848d781053285280fcd35aab24c9c0a677e26db4aa4209bd5db57467de0f" dependencies = [ + "base64 0.22.1", "bytes", "chrono", "futures-util", "hex", "http", "http-auth", - "jsonwebtoken", - "lazy_static", "oci-spec", "olpc-cjson", "regex", - "reqwest 0.13.4", + "reqwest", "serde", "serde_json", - "sha2 0.11.0", + "sha2", "thiserror", "tokio", "tracing", @@ -1754,9 +1496,9 @@ dependencies = [ [[package]] name = "oci-spec" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8445a2631507cec628a15fdd6154b54a3ab3f20ed4fe9d73a3b8b7a4e1ba03a" +checksum = "3df6f876ad774d6a676f7e968f5c3edacc32f90e65fe680a8b686235396556fb" dependencies = [ "const_format", "derive_builder", @@ -1794,15 +1536,15 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "openssl-probe" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" +checksum = "7e036b411754132fd6b74e94b74e9a13c5cf606fa93d1885c35860d3060820b1" [[package]] name = "owo-colors" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d" +checksum = "13c45bb4a6ae1280ec0803b1ef9d3455eb50f01efbbe1447ab020f1d54fba9d8" [[package]] name = "parking_lot" @@ -1840,20 +1582,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] -name = "pkcs8" -version = "0.10.2" +name = "pkg-config" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "png" @@ -1861,98 +1593,42 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.8.9", ] -[[package]] -name = "portable-atomic" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" - [[package]] name = "potential_utf" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661" dependencies = [ "zerovec", ] [[package]] name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] - -[[package]] -name = "proc-macro-error-attr2" -version = "2.0.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "proc-macro-error2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" -dependencies = [ - "proc-macro-error-attr2", - "proc-macro2", - "quote", - "syn", -] +checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958" [[package]] name = "proc-macro2" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" dependencies = [ "unicode-ident", ] -[[package]] -name = "quick-xml" -version = "0.37.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" -dependencies = [ - "memchr", -] - [[package]] name = "quinn" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +checksum = "4051e23e9185c255a7e33ef59cdbca87a22d359052eecd22fc6b901fb37d9d11" dependencies = [ "bytes", "cfg_aliases", @@ -1970,15 +1646,16 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.15" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fcb935c5bec503c2f0e306bdd3e58bb9029dcb14fa8d9ac76e3a5256ac0763e" +checksum = "0e750cca55fe4f0439a15d0bb529da9651e79993e8e72c61a899a36d462befbe" dependencies = [ "aws-lc-rs", "bytes", - "getrandom 0.3.4", + "getrandom 0.4.3", "lru-slab", "rand", + "rand_pcg", "ring", "rustc-hash", "rustls", @@ -1992,33 +1669,27 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.14" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +checksum = "af66907df18639dcf4db56ca65490cabc4b27a97dbadd96f2926cca73298f016" dependencies = [ "cfg_aliases", "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "quote" -version = "1.0.45" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" dependencies = [ "proc-macro2", ] -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - [[package]] name = "r-efi" version = "6.0.0" @@ -2027,40 +1698,28 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" -dependencies = [ - "rand_chacha", - "rand_core 0.9.5", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" dependencies = [ - "ppv-lite86", - "rand_core 0.9.5", + "chacha20", + "getrandom 0.4.3", + "rand_core", ] [[package]] name = "rand_core" -version = "0.6.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.17", -] +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] -name = "rand_core" -version = "0.9.5" +name = "rand_pcg" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" +checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" dependencies = [ - "getrandom 0.3.4", + "rand_core", ] [[package]] @@ -2069,14 +1728,14 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", ] [[package]] name = "regex" -version = "1.12.4" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" dependencies = [ "aho-corasick", "memchr", @@ -2086,9 +1745,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" dependencies = [ "aho-corasick", "memchr", @@ -2103,55 +1762,15 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "reqwest" -version = "0.12.28" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029" dependencies = [ - "base64", + "base64 0.23.1", "bytes", "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "js-sys", - "log", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", -] - -[[package]] -name = "reqwest" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" -dependencies = [ - "base64", - "bytes", - "futures-core", - "futures-util", "http", "http-body", "http-body-util", @@ -2193,15 +1812,15 @@ dependencies = [ "cfg-if", "getrandom 0.2.17", "libc", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.52.0", ] [[package]] name = "rustc-hash" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" +checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" [[package]] name = "rustc_version" @@ -2214,11 +1833,11 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.4" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "errno", "libc", "linux-raw-sys", @@ -2227,13 +1846,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.40" +version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ "aws-lc-rs", "once_cell", - "ring", "rustls-pki-types", "rustls-webpki", "subtle", @@ -2242,9 +1860,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" +checksum = "4a073f5dc7469f984c52ad2752b63b0807745133b6de880b7b64c1ac4c48aec4" dependencies = [ "openssl-probe", "rustls-pki-types", @@ -2254,9 +1872,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" +checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" dependencies = [ "web-time", "zeroize", @@ -2264,9 +1882,9 @@ dependencies = [ [[package]] name = "rustls-platform-verifier" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" +checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98" dependencies = [ "core-foundation", "core-foundation-sys", @@ -2285,33 +1903,33 @@ dependencies = [ [[package]] name = "rustls-platform-verifier-android" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" +checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f" [[package]] name = "rustls-webpki" -version = "0.103.13" +version = "0.103.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" +checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" dependencies = [ "aws-lc-rs", "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" [[package]] name = "ruzstd" -version = "0.8.3" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c1c839d570d835527c9a5e4db7cb2198683a988cb9d7293fc8674e6bd58fc8" +checksum = "69e4ce4a039f42bf25920b95667e4d789e98749ab11bbb8d2c2936f788421bb5" dependencies = [ "twox-hash", ] @@ -2333,9 +1951,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" +checksum = "9cb23c424d8ee841bb4d813677ca237e2a610067d594fec130f87d6093495ab5" dependencies = [ "windows-sys 0.61.2", ] @@ -2352,7 +1970,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "core-foundation", "core-foundation-sys", "libc", @@ -2371,37 +1989,13 @@ dependencies = [ [[package]] name = "self-replace" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ec815b5eab420ab893f63393878d89c90fdd94c0bcc44c07abb8ad95552fb7" +checksum = "609c5606d9d357b26e4ee1a7a01beac396628d0fa01ebbade2a09cefb88e65af" dependencies = [ "fastrand", "tempfile", - "windows-sys 0.52.0", -] - -[[package]] -name = "self_update" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d832c086ece0dacc29fb2947bb4219b8f6e12fe9e40b7108f9e57c4224e47b5c" -dependencies = [ - "either", - "flate2", - "hyper", - "indicatif", - "log", - "quick-xml", - "regex", - "reqwest 0.12.28", - "self-replace", - "semver", - "serde_json", - "tar", - "tempfile", - "urlencoding", - "zip 2.4.2", - "zipsign-api", + "windows-sys 0.61.2", ] [[package]] @@ -2412,9 +2006,9 @@ checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" [[package]] name = "serde" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" dependencies = [ "serde_core", "serde_derive", @@ -2422,29 +2016,29 @@ dependencies = [ [[package]] name = "serde_core" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.9", ] [[package]] name = "serde_json" -version = "1.0.150" +version = "1.0.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" +checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6" dependencies = [ "itoa", "memchr", @@ -2480,24 +2074,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.17", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" +checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19" dependencies = [ "cfg-if", - "cpufeatures 0.3.0", - "digest 0.11.3", + "cpufeatures", + "digest", ] [[package]] @@ -2546,27 +2129,17 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest 0.10.7", - "rand_core 0.6.4", -] - [[package]] name = "simd-adler32" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" [[package]] name = "simd_cesu8" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" +checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" dependencies = [ "rustc_version", "simdutf8", @@ -2586,44 +2159,34 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.15.2" +version = "1.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" +checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8" [[package]] name = "smoltcp" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad095989c1533c1c266d9b1e8d70a1329dd3723c3edac6d03bbd67e7bf6f4bb" +checksum = "b6f8b28ad56c6e35524a37dd492af5d1a47e31e1a4d175cd12f89c075f01980f" dependencies = [ "bitflags 1.3.2", "byteorder", "cfg-if", - "defmt 0.3.100", + "defmt", "heapless", "managed", ] [[package]] name = "socket2" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" +checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", "windows-sys 0.61.2", ] -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -2651,7 +2214,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2662,9 +2225,20 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.117" +version = "2.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "3.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" dependencies = [ "proc-macro2", "quote", @@ -2682,13 +2256,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.9", ] [[package]] @@ -2709,7 +2283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom 0.4.3", "once_cell", "rustix", "windows-sys 0.61.2", @@ -2717,38 +2291,38 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.18" +version = "2.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.18" +version = "2.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.9", ] [[package]] name = "thread_local" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070" dependencies = [ "cfg-if", ] [[package]] name = "time" -version = "0.3.53" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50" +checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134" dependencies = [ "deranged", "num-conv", @@ -2766,9 +2340,9 @@ checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "time-macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f" +checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85" dependencies = [ "num-conv", "time-core", @@ -2776,9 +2350,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +checksum = "abc840c238154d58f9e86b2792261edfde565a17696e1cda1a449de27979801a" dependencies = [ "displaydoc", "zerovec", @@ -2786,24 +2360,15 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" [[package]] name = "tokio" -version = "1.52.3" +version = "1.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" +checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3" dependencies = [ "bytes", "libc", @@ -2816,20 +2381,20 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.7.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" +checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.9", ] [[package]] name = "tokio-rustls" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +checksum = "c9cc2678c2cdd569ef8215e2afd7954ada2ae20b4fdd2c5fe6139a3b02d105db" dependencies = [ "rustls", "tokio", @@ -2837,9 +2402,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.18" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +checksum = "e464cf451ba96ebfc6f9b6542f17ee8b8956e33f1e40d9690624e59d7a7f8a4b" dependencies = [ "bytes", "futures-core", @@ -2869,7 +2434,7 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "bytes", "futures-util", "http", @@ -2913,7 +2478,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2959,15 +2524,15 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "twox-hash" -version = "2.1.2" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" +checksum = "86a801b3cea342a06d468c8710662aa29e5e05e4f5c0d62f00bbb7f2ad7941c2" [[package]] name = "typed-path" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e28f89b80c87b8fb0cf04ab448d5dd0dd0ade2f8891bae878de66a75a28600e" +checksum = "9ce898823d8cd0f028662d2f349694b1af0a5cc9be83f1d213a00d3147445e1e" [[package]] name = "typenum" @@ -2977,21 +2542,21 @@ checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "unicase" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" +checksum = "357cc3acc6a036009fd6c973ed009037c732d60d0b4f6c673e9041497482a28f" [[package]] name = "unicode-ident" -version = "1.0.24" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" +checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563" [[package]] name = "unicode-normalization" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" +checksum = "75cd3fb03d5288b3ba9a1ee103ac7e9cbb59f0b03d64f8ddfcc04dd42758a85d" dependencies = [ "tinyvec", ] @@ -3004,9 +2569,9 @@ checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" [[package]] name = "unicode-width" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" +checksum = "ca718471876992059f251e33aafc334346ada08042b7661dd1fe313a9bced557" [[package]] name = "unicode-xid" @@ -3020,12 +2585,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -3044,12 +2603,6 @@ dependencies = [ "serde", ] -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -3068,12 +2621,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - [[package]] name = "vmm-backend" version = "0.5.0" @@ -3082,7 +2629,7 @@ dependencies = [ "chefer-bundle", "guest-agent", "serde_json", - "sha2 0.11.0", + "sha2", "tar", "tempfile", "windows-sys 0.61.2", @@ -3100,9 +2647,9 @@ dependencies = [ [[package]] name = "want" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +checksum = "ec4cdd0dd910afe868b7ef477227d8d538b46b3075031afee8a9f2acb0a2ed0b" dependencies = [ "try-lock", ] @@ -3113,29 +2660,11 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" -[[package]] -name = "wasip2" -version = "1.0.4+wasi-0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" -dependencies = [ - "wit-bindgen 0.57.1", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen 0.51.0", -] - [[package]] name = "wasm-bindgen" -version = "0.2.125" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a" +checksum = "9bb54f33acc68fd454578d9820b0bde1a1a3d17aa17bb7b6595806d02886d409" dependencies = [ "cfg-if", "once_cell", @@ -3146,19 +2675,20 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.75" +version = "0.4.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280" +checksum = "3cbab34de2d982e9b48e18d216d04c4a6f641066ff19ffb699980f591ee3610e" dependencies = [ "js-sys", + "tokio", "wasm-bindgen", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.125" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d" +checksum = "2e29d0c35b16e224a7eeb5cd2d25e3e1968fbd65604117b44d3b789d00ee8535" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3166,48 +2696,26 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.125" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd" +checksum = "6f501a8bc3719dba86ef8ae4728879c08001bea749eb1333ac5b91e040e2a6b7" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn", + "syn 3.0.9", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.125" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f" +checksum = "23f0c9c52aa7cd7d77769a4cfe2a9adb1b331f489a41d912ce14513d5ab995c6" dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder", - "wasmparser", -] - [[package]] name = "wasm-streams" version = "0.5.0" @@ -3221,23 +2729,11 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags 2.13.0", - "hashbrown 0.15.5", - "indexmap", - "semver", -] - [[package]] name = "web-sys" -version = "0.3.102" +version = "0.3.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d" +checksum = "88261b9deccee56594c11a3460c462c41f58d148598fe70ad77070126a68aba4" dependencies = [ "js-sys", "wasm-bindgen", @@ -3255,18 +2751,9 @@ dependencies = [ [[package]] name = "webpki-root-certs" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d46a5a140e6f7afeccd8eae97eff335163939eac8b929834875168b29b3d267" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "webpki-roots" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" +checksum = "e49d0e65abc00c142e8f9428da991da9f1a250c39be97459901eb12b9b49f62a" dependencies = [ "rustls-pki-types", ] @@ -3334,7 +2821,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -3345,7 +2832,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -3378,25 +2865,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", + "windows-targets", ] [[package]] @@ -3414,31 +2883,14 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "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", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] @@ -3447,201 +2899,59 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - -[[package]] -name = "wit-bindgen" -version = "0.57.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" - -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "prettyplease", - "syn", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags 2.13.0", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - [[package]] name = "writeable" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" +checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" [[package]] name = "xattr" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" +checksum = "963d6fab92d5504b971dc8bd90ca743c2575e590bc8071ea5bc571598667ae08" dependencies = [ "libc", "rustix", @@ -3649,9 +2959,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" +checksum = "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -3660,36 +2970,16 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" +checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.9", "synstructure", ] -[[package]] -name = "zerocopy" -version = "0.8.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "zerofrom" version = "0.1.8" @@ -3701,41 +2991,27 @@ dependencies = [ [[package]] name = "zerofrom-derive" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" +checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.9", "synstructure", ] [[package]] name = "zeroize" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" [[package]] name = "zerotrie" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f" dependencies = [ "displaydoc", "yoke", @@ -3744,9 +3020,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.6" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +checksum = "f58a2799cfe9a1670c7ea8edbd52ef8edb93cb37a7f83bf31ba9e35d9dae6a40" dependencies = [ "yoke", "zerofrom", @@ -3755,84 +3031,66 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.3" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.9", ] [[package]] name = "zip" -version = "2.4.2" +version = "9.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50" -dependencies = [ - "arbitrary", - "crc32fast", - "crossbeam-utils", - "displaydoc", - "indexmap", - "memchr", - "thiserror", - "time", -] - -[[package]] -name = "zip" -version = "8.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d04a6b5381502aa6087c94c669499eb1602eb9c5e8198e534de571f7154809b" +checksum = "1156b39d142a34b999c2310a50455e0cb3760bf7efad0122f796d813bee26ccb" dependencies = [ "crc32fast", "flate2", + "getrandom 0.4.3", "indexmap", "memchr", + "nix", "typed-path", + "windows-sys 0.61.2", ] [[package]] -name = "zipsign-api" -version = "0.1.5" +name = "zlib-rs" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba6063ff82cdbd9a765add16d369abe81e520f836054e997c2db217ceca40c0" -dependencies = [ - "base64", - "ed25519-dalek", - "thiserror", -] +checksum = "b268e58e7c693d7c271f93ffc4ba3b380412554231c85bf61ca7af91042a4112" [[package]] name = "zmij" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "zstd" -version = "0.13.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +checksum = "db3ae9bf90af6e40197bef767eeefc46ad6397420fe873830bd85e5fbbfb3c70" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.2.4" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +checksum = "ded520f16b29e1a9b771c722221b2b0a0398c2316d9bb3c42b458a5414d7434b" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.16+zstd.1.5.7" +version = "2.1.2+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" +checksum = "481ada9c543b2323cbb7bbdbb5249177fbf0188ed959ed2c15e4b22421c84ed3" dependencies = [ "cc", "pkg-config", diff --git a/README.md b/README.md index b3b2086..c61a342 100644 --- a/README.md +++ b/README.md @@ -248,7 +248,9 @@ Honest list of what doesn't work (yet): **Per-service card selection:** `gpu: true` (or the Docker-style alias `gpu: all`) gives a service **all** GPUs; `gpu: [0, 2]` binds **only** `/dev/nvidia0` + `/dev/nvidia2` into that service (hard isolation, like `NVIDIA_VISIBLE_DEVICES`). Card-index selection is **native-NVIDIA only**; on WSL2 / AMD / Intel use a per-service `env` (`CUDA_VISIBLE_DEVICES` / `HIP_VISIBLE_DEVICES` / `ZE_AFFINITY_MASK`) for soft selection. (Index filtering is unit-tested; multi-card isolation is not yet hardware-validated — the validation boxes are single-GPU.) **OpenGL/Vulkan *rendering* does not work in a headless container** for any vendor (NVIDIA's GL/Vulkan userspace needs a real X/graphics environment — even nvidia-container-toolkit fails headless; use the GUI path + software rendering for display). GPU **compute** (the table above) is unaffected. No path to Apple NPU / CoreML from a Linux guest. -- **Image source is a registry pull, a local `tar`, or a Dockerfile.** `image: redis:7.2-alpine` (or `source: image`) pulls from any OCI registry at build time — **private registries supported**: Chefer uses `docker login` credentials (plain `auths` entries in `~/.docker/config.json`; external credential helpers/credsStore are not read) or `CHEFER_REGISTRY_AUTH=user:pass`, falling back to anonymous for public images — selecting the right arch by `platform`; a pinned tag or `@sha256` digest is required (`latest`/untagged rejected for reproducibility). `image: ./db.tar` (or `source: tar`) uses a local `docker save` / OCI archive. `source: dockerfile` builds the image at build time using a container builder already on the **build** machine (docker/podman/nerdctl/Apple `container`, auto-detected; OrbStack & Docker Desktop are used via their `docker` CLI) — not reproducible (use `source: image` pinned to a digest if you need that), and the runtime still needs nothing. +- **Image source is a registry pull, a local `tar`, or a Dockerfile.** `image: redis:7.2-alpine` (or `source: image`) pulls from any OCI registry at build time — **private registries supported**: Chefer uses `docker login` credentials (plain `auths` entries in `~/.docker/config.json`; external credential helpers/credsStore are not read) or `CHEFER_REGISTRY_AUTH=user:pass`, falling back to anonymous for public images — selecting the right arch by `platform`; a pinned tag or `@sha256` digest is required (`latest`/untagged rejected for reproducibility). `image: ./db.tar` (or `source: tar`) uses a local `docker save` / OCI archive. `source: dockerfile` builds the image at build time using a container builder already on the **build** machine (docker/podman/nerdctl/Apple `container`, plus `wslc` on Windows, auto-detected; OrbStack & Docker Desktop are used via their `docker` CLI) — not reproducible (use `source: image` pinned to a digest if you need that), and the runtime still needs nothing. + +On Windows, WSL Containers (`wslc`, included in recent WSL releases) can build Dockerfiles without Docker Desktop. Run `wsl --update` to install it. Set `$env:CHEFER_DOCKERFILE_BUILDER="wslc"` in PowerShell before `chefer build` to select it explicitly, including when a Docker CLI is installed but its daemon is stopped. WSLC builds the Windows host's native architecture only; a different `image.platform` is rejected before building with instructions to use another builder. Chefer calls `wslc build` and `wslc image save`, then packages the exported archive through the existing image pipeline. The packaged app uses the existing runtime backends. On a physical Windows machine, `powershell -File scripts/windows-wslc-e2e.ps1` verifies the complete Dockerfile-to-executable flow, guest stdout, and persisted output without Docker. - **Linux containers only** (`linux/amd64`, `linux/arm64`); `windows/*` containers are rejected at validation. - `depends_on` supports **wait-until-ready health checks**: a service with a `healthcheck` (Docker-style command, run inside the container) gates its dependents until it's healthy; a service without one is treated as ready once spawned (start-order only). - At most **one** service per app may use `interface_mode: terminal` or `both`; host ports must be unique across the whole app. @@ -258,7 +260,7 @@ Honest list of what doesn't work (yet): - [x] **Host-isolated networking — `bridge` is now the default.** Omitting `network:` gives an app its own netns where **only declared `ports:` are reachable and undeclared ports are walled off from the host**, with outbound NAT via a bundled `pasta` (like Docker's default). `network: internal` is the same without outbound; `network: shared` opts back into the old "everything shares one netns / undeclared ports reachable" behavior. Validated on native Linux (amd64+arm64, rootless) in CI, **on real WSL2, and on the real-hardware WHP micro-VM — both `internal` isolation and `bridge` outbound**. - [x] **Pull images straight from a registry** (like Docker Compose) — `image: redis:7.2-alpine` and `chefer build` fetches it (anonymous, public images), no `docker save` needed. **`latest`/untagged is rejected — a pinned tag or `@sha256` digest is required**, so a build is reproducible. (Private-registry auth still TODO.) -- [x] **Build from a Dockerfile** (`source: dockerfile`) — `chefer build` builds the image for you using a container builder already on the **build** machine (docker/podman/nerdctl, auto-detected), then ingests it through the normal pipeline. Optional `context:` and `build_args:`. The runtime still needs nothing. Not reproducible (use `source: image` pinned to a digest if you need that); if no builder is found you get an actionable error. +- [x] **Build from a Dockerfile** (`source: dockerfile`) — `chefer build` builds the image for you using a container builder already on the **build** machine (docker/podman/nerdctl/Apple `container`, plus `wslc` on Windows, auto-detected), then ingests it through the normal pipeline. Optional `context:` and `build_args:`. The runtime still needs nothing. Not reproducible (use `source: image` pinned to a digest if you need that); if no builder is found you get an actionable error. - [x] **Windows without WSL2 (WHP)** — boots the bundled Linux micro-VM appliance (the same kernel + initramfs + guest-agent the macOS `vz` backend uses) via the **Windows Hypervisor Platform (WHP)**, as a fallback to the `wsl2` backend. **Implemented and validated on real hardware:** virtio-over-MMIO blk (bundle/data) + net, data persistence across restarts, host↔guest TCP/UDP port forwarding, guest outbound NAT (UDP + TCP) — **in all network modes, including the default `bridge`** (the bundled `pasta` NATs the per-app netns to the VM's eth0, then the helper NATs eth0 to the outside; declared-port forwarding and undeclared-port isolation verified on real hardware too) — **and full GUI**: a bundle-embedded `cage` Wayland compositor (+ Xwayland) renders to a virtio-gpu (2D-over-MMIO) scanout shown in a native window at the app's preferred resolution (via EDID), with keyboard/mouse (virtio-input) and a bidirectional clipboard, all validated on real hardware. The clipboard syncs **text (validated on real hardware) and now images too** — PNG over the wire, interoperating with both the registered `PNG` clipboard format (browsers/modern apps) and `CF_DIB` (Paint/Snipping Tool/Office, via a unit-tested PNG↔DIB conversion); text sync is verified bidirectionally on real WHP, and the host image read/convert path (CF_DIB→PNG) is verified via `chefer-whp-helper --clip-selftest`; the guest-side apply reuses the proven text `wl-copy` mechanism. **Remaining polish:** hardware cursor. A software-emulation fallback (bundled QEMU/TCG) could run on machines with no virtualization at all, at a significant speed cost. **Trade-off:** GUI is software-rendered and this path is **CPU-only** for GPU *acceleration* — WSL2's GPU paravirtualization (`/dev/dxg`) is a Microsoft-integrated stack a raw WHP VMM can't tap, so anyone needing GPU compute must stay on the WSL2 backend. - [~] **Faster app startup** — *partly done.* The single file now **caches its extracted bundle in a content-hashed dir** (keyed on the payload sha256): the first run decompresses+verifies once, and **subsequent runs skip extraction entirely** (no re-open, re-decompress, or re-hash of the payload) — the big win for large images launched repeatedly. (`--no-cache` forces fresh temp extraction.) The guest-agent's per-service rootfs assembly is cached, **decompresses layers in parallel** on first assembly (a worker pool decompresses ahead while layers are still applied strictly in order, preserving overlay/whiteout semantics — the pure-Rust musl `ruzstd` decode is CPU-bound), and **on root backends (WSL2 / macOS VM / native-root) uses overlayfs**: each layer is extracted once into its own content-addressed read-only lowerdir (shared/deduped across services and images, OCI whiteouts converted to overlay whiteouts), then mounted as an overlay with a per-run writable upper — no merge-copy, instant mount, layers shared. Rootless native Linux keeps the merged path (rootless can't create overlay whiteout devices). Windows WSL distros are now best-effort removed when the app exits, so WSL import remains a per-run cost unless `CHEFER_KEEP_WSL_DISTRO=1` is set for local debugging or repeated-launch profiling. **GUI apps on the WHP/VZ micro-VM** now ship their `cage`/Xwayland/Mesa **overlay as a read-only squashfs that is mounted (via overlayfs) instead of decompressed** — the VM is fresh every boot and can't cache across runs, so this removes a ~200 MB per-launch unpack from every GUI start. - [x] **`depends_on` health checks** (wait-until-ready), not just start order — a service with `healthcheck` is polled inside its container namespaces until healthy before later services start; services without one are considered ready once spawned. diff --git a/crates/appcipe-normalize/Cargo.toml b/crates/appcipe-normalize/Cargo.toml index e8c1e3e..47bcad8 100644 --- a/crates/appcipe-normalize/Cargo.toml +++ b/crates/appcipe-normalize/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" # 這個版本號跟隨 appcipe-spec 版本 edition = "2024" [dependencies] -anyhow = "1.0.102" +anyhow = "1.0.104" appcipe-spec = { version = "0.1.0", path = "../appcipe-spec" } serde_yaml = "0.9.34" diff --git a/crates/appcipe-spec/Cargo.toml b/crates/appcipe-spec/Cargo.toml index 74470c6..53719b9 100644 --- a/crates/appcipe-spec/Cargo.toml +++ b/crates/appcipe-spec/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" # 這個版本號前兩位跟隨 appcipe.yml 版本 edition = "2024" [dependencies] -anyhow = "1.0.98" +anyhow = "1.0.104" chefer-bundle = { version = "0.5.0", path = "../chefer-bundle" } -serde = { version = "1.0.219", features = ["derive"] } +serde = { version = "1.0.229", features = ["derive"] } serde_yaml = "0.9.34" [dev-dependencies] diff --git a/crates/chefer-assembler/Cargo.toml b/crates/chefer-assembler/Cargo.toml index a741bb5..7e698a8 100644 --- a/crates/chefer-assembler/Cargo.toml +++ b/crates/chefer-assembler/Cargo.toml @@ -4,13 +4,13 @@ version = "0.5.0" edition = "2024" [dependencies] -anyhow = "1.0.102" +anyhow = "1.0.104" chefer-bundle = { version = "0.5.0", path = "../chefer-bundle" } -clap = { version = "4.6.1", features = ["derive"] } -fs-err = "3.3.0" -sha2 = "0.11.0" +clap = { version = "4.6.7", features = ["derive"] } +fs-err = "3.3.2" +sha2 = "0.11.1" tar = "0.4.46" -zstd = "0.13.3" +zstd = "0.14.3" [dev-dependencies] tempfile = "3.27.0" diff --git a/crates/chefer-bundle/Cargo.toml b/crates/chefer-bundle/Cargo.toml index b447ed6..5117e54 100644 --- a/crates/chefer-bundle/Cargo.toml +++ b/crates/chefer-bundle/Cargo.toml @@ -4,7 +4,7 @@ version = "0.5.0" edition = "2024" [dependencies] -anyhow = "1.0.102" -serde = { version = "1.0.228", features = ["derive"] } -serde_json = "1.0.150" -thiserror = "2.0.18" +anyhow = "1.0.104" +serde = { version = "1.0.229", features = ["derive"] } +serde_json = "1.0.154" +thiserror = "2.0.21" diff --git a/crates/chefer-cli/Cargo.toml b/crates/chefer-cli/Cargo.toml index e8d2085..d615bfd 100644 --- a/crates/chefer-cli/Cargo.toml +++ b/crates/chefer-cli/Cargo.toml @@ -4,32 +4,33 @@ version = "0.5.0" edition = "2024" [dependencies] -anyhow = "1.0.98" +anyhow = "1.0.104" appcipe-normalize = { version = "0.1.0", path = "../appcipe-normalize" } appcipe-spec = { path = "../appcipe-spec" } chefer-assembler = { version = "0.5.0", path = "../chefer-assembler" } chefer-bundle = { version = "0.5.0", path = "../chefer-bundle" } chefer-pack = { path = "../chefer-pack" } -clap = { version = "4.5.43", features = ["derive"] } -comfy-table = "7.1.4" +clap = { version = "4.6.7", features = ["derive"] } +comfy-table = "8.0.1" crossterm = "0.29.0" -flate2 = "1.1.9" -owo-colors = "4.2.2" -reqwest = { version = "0.12.22", default-features = false, features = ["blocking", "rustls-tls"] } -self-replace = "1.5.0" -self_update = { version = "0.42.0", default-features = false, features = ["rustls", "archive-tar", "archive-zip", "compression-flate2"] } -serde_json = "1.0.142" +flate2 = "1.1.10" +owo-colors = "4.4.0" +reqwest = { version = "0.13.5", default-features = false, features = ["blocking", "rustls"] } +self-replace = "1.5.1" +semver = "1.0.28" +serde = { version = "1.0.229", features = ["derive"] } +serde_json = "1.0.154" serde_yaml = "0.9.34" -sha2 = "0.11.0" +sha2 = "0.11.1" tar = "0.4.46" tempfile = "3.27.0" vmm-backend = { version = "0.5.0", path = "../vmm-backend" } -zip = { version = "8.6.0", default-features = false, features = ["deflate-flate2"] } -zstd = "0.13.3" +zip = { version = "9.1.3", default-features = false, features = ["deflate-flate2"] } +zstd = "0.14.3" [build-dependencies] -chrono = { version = "0.4", default-features = false, features = ["clock"] } +chrono = { version = "0.4.45", default-features = false, features = ["clock"] } [dev-dependencies] -sha2 = "0.11.0" +sha2 = "0.11.1" tempfile = "3.27.0" diff --git a/crates/chefer-cli/src/commands/doctor.rs b/crates/chefer-cli/src/commands/doctor.rs index 7577f63..690ea83 100644 --- a/crates/chefer-cli/src/commands/doctor.rs +++ b/crates/chefer-cli/src/commands/doctor.rs @@ -460,9 +460,9 @@ fn check_dockerfile_builder() -> DoctorCheck { ), None => DoctorCheck::warn( "Dockerfile builder", - "No container builder (docker/podman/nerdctl/container) found on PATH.", - "Install one to use `source: dockerfile` in appcipe.yml. \ - `source: tar` and `source: image` work without a builder.", + "No supported container builder found on PATH.", + "Install docker/podman/nerdctl or Apple's container; on Windows, update WSL for wslc. \ + Use CHEFER_DOCKERFILE_BUILDER=wslc to select it explicitly. `source: tar` and `source: image` work without a builder.", ), } } @@ -543,7 +543,7 @@ fn probe_writable_dir(root: &std::path::Path) -> Result<()> { fn render_report(report: &DoctorReport) { let mut table = Table::new(); table - .load_preset(comfy_table::presets::UTF8_BORDERS_ONLY) + .load_style(comfy_table::presets::UTF8_BORDERS_ONLY) .set_content_arrangement(ContentArrangement::Dynamic) .set_width(ui::term_width()) .set_constraints(vec![ diff --git a/crates/chefer-cli/src/commands/init.rs b/crates/chefer-cli/src/commands/init.rs index 17e8699..4e7c2d3 100644 --- a/crates/chefer-cli/src/commands/init.rs +++ b/crates/chefer-cli/src/commands/init.rs @@ -31,7 +31,7 @@ services: # Required: container image source. Three forms: # ./images/app.tar — local tar from `docker save -o images/app.tar ` # redis:7.2-alpine — pull from registry at build time (must pin tag or @sha256) - # image: — build from Dockerfile (needs docker/podman/nerdctl on PATH) + # image: — build from Dockerfile (needs docker/podman/nerdctl/container, or wslc on Windows) # source: dockerfile # file: ./Dockerfile # context: . diff --git a/crates/chefer-cli/src/commands/inspect.rs b/crates/chefer-cli/src/commands/inspect.rs index c2e574c..b453a14 100644 --- a/crates/chefer-cli/src/commands/inspect.rs +++ b/crates/chefer-cli/src/commands/inspect.rs @@ -270,7 +270,7 @@ fn render_manifest_summary( // ── Services ─────────────────────────────────────────────── let mut t = Table::new(); - t.load_preset(UTF8_BORDERS_ONLY) + t.load_style(UTF8_BORDERS_ONLY) .set_content_arrangement(ContentArrangement::Dynamic) .set_width(ui::term_width()) .set_constraints(vec![ diff --git a/crates/chefer-cli/src/commands/upgrade.rs b/crates/chefer-cli/src/commands/upgrade.rs index 064b70e..c897324 100644 --- a/crates/chefer-cli/src/commands/upgrade.rs +++ b/crates/chefer-cli/src/commands/upgrade.rs @@ -1,7 +1,7 @@ //! `chefer upgrade` — 從 GitHub Releases 更新完整 runtime kit(不依賴 cargo)。 //! //! release workflow 上傳的是 `chefer__.zip|tar.gz`,內含 host CLI -//! 與完整 `kit/`;因此不能使用 self_update 的單一 binary 替換流程。 +//! 與完整 `kit/`;下載、驗證與替換由此處一併處理。 use std::ffi::OsStr; use std::fs::{self, File}; @@ -12,19 +12,31 @@ use anyhow::{Context, Result, bail}; use flate2::read::GzDecoder; use owo_colors::OwoColorize; use reqwest::header; -use self_update::cargo_crate_version; -use self_update::update::{Release, ReleaseAsset}; +use serde::Deserialize; use sha2::{Digest, Sha256}; use crate::{BIN_NAME, HOST_TARGET, REPO_NAME, REPO_OWNER}; +#[derive(Clone, Debug, Deserialize)] +struct ReleaseAsset { + name: String, + #[serde(rename = "url")] + download_url: String, +} + +#[derive(Debug, Deserialize)] +struct Release { + #[serde(rename = "tag_name")] + version: String, + assets: Vec, +} + pub fn cmd_upgrade(channel: &str, to: Option<&str>, check_only: bool) -> Result<()> { - let current = cargo_crate_version!(); + let current = env!("CARGO_PKG_VERSION"); let release = fetch_release(channel, to)?; let archive = select_kit_asset(&release, HOST_TARGET)?; let checksum = select_checksum_asset(&release, &archive.name)?; - let newer = self_update::version::bump_is_greater(current, &release.version) - .unwrap_or(release.version != current); + let newer = is_newer_release(current, &release.version); if check_only { if newer { @@ -146,30 +158,52 @@ pub fn cmd_upgrade(channel: &str, to: Option<&str>, check_only: bool) -> Result< } fn fetch_release(channel: &str, to: Option<&str>) -> Result { - use self_update::backends::github::Update; - - let mut builder = Update::configure(); - builder - .repo_owner(REPO_OWNER) - .repo_name(REPO_NAME) - .bin_name(BIN_NAME) - .show_download_progress(true) - .current_version(cargo_crate_version!()); - - let updater = builder.build()?; - if let Some(ver) = to { - return updater - .get_release_version(ver) - .with_context(|| format!("failed to look up GitHub Release tag `{ver}`")); - } - if channel != "stable" { - return updater - .get_release_version(channel) - .with_context(|| format!("failed to look up GitHub Release tag `{channel}`")); - } - updater - .get_latest_release() - .context("failed to look up the latest GitHub Release") + let url = release_url(channel, to)?; + let response = reqwest::blocking::Client::new() + .get(url.clone()) + .header(header::USER_AGENT, BIN_NAME) + .header(header::ACCEPT, "application/vnd.github+json") + .send() + .and_then(reqwest::blocking::Response::error_for_status) + .with_context(|| format!("failed to look up GitHub Release: {url}"))?; + let bytes = response + .bytes() + .context("failed to read GitHub Release response")?; + parse_release(&bytes) +} + +fn release_url(channel: &str, to: Option<&str>) -> Result { + let mut url = reqwest::Url::parse(&format!( + "https://api.github.com/repos/{REPO_OWNER}/{REPO_NAME}/releases" + ))?; + { + let mut path = url + .path_segments_mut() + .map_err(|_| anyhow::anyhow!("GitHub API URL cannot be a base URL"))?; + if let Some(tag) = to.or_else(|| (channel != "stable").then_some(channel)) { + path.push("tags").push(tag); + } else { + path.push("latest"); + } + } + Ok(url) +} + +fn parse_release(bytes: &[u8]) -> Result { + let mut release: Release = + serde_json::from_slice(bytes).context("failed to parse GitHub Release response")?; + release.version = release.version.trim_start_matches('v').to_owned(); + Ok(release) +} + +fn is_newer_release(current: &str, other: &str) -> bool { + match ( + semver::Version::parse(current), + semver::Version::parse(other), + ) { + (Ok(current), Ok(other)) => other > current, + _ => other != current, + } } fn select_kit_asset(release: &Release, target: &str) -> Result { @@ -255,7 +289,7 @@ fn is_safe_asset_filename(name: &str) -> bool { fn download_asset(asset: &ReleaseAsset, dest: &Path) -> Result<()> { let client = reqwest::blocking::ClientBuilder::new() - .use_rustls_tls() + .tls_backend_rustls() .build() .context("failed to build HTTPS client")?; let mut resp = client @@ -387,7 +421,11 @@ fn extract_zip(archive: &Path, dest: &Path) -> Result<()> { let mut zip = zip::ZipArchive::new(f).context("failed to read zip contents")?; for i in 0..zip.len() { let mut entry = zip.by_index(i).context("failed to read zip entry")?; - let rel = sanitize_archive_name(entry.name())?; + let name = entry + .name() + .context("failed to decode zip entry name")? + .into_owned(); + let rel = sanitize_archive_name(&name)?; let out = dest.join(&rel); if entry.is_dir() { fs::create_dir_all(&out) @@ -395,17 +433,14 @@ fn extract_zip(archive: &Path, dest: &Path) -> Result<()> { continue; } if entry.is_symlink() { - bail!( - "release kit zip contains an unsupported symlink: {}", - entry.name() - ); + bail!("release kit zip contains an unsupported symlink: {}", name); } if let Some(mode) = entry.unix_mode() { let kind = mode & 0o170000; if kind != 0 && kind != 0o100000 { bail!( "release kit zip contains an unsupported entry mode {mode:o}: {}", - entry.name() + name ); } } @@ -584,14 +619,65 @@ mod tests { fn release(assets: Vec) -> Release { Release { - name: "v-test".into(), version: "test".into(), - date: "2026-01-01T00:00:00Z".into(), - body: None, assets, } } + #[test] + fn release_urls_preserve_channel_and_explicit_tag_selection() { + let base = format!("https://api.github.com/repos/{REPO_OWNER}/{REPO_NAME}/releases"); + assert_eq!( + release_url("stable", None).unwrap().as_str(), + format!("{base}/latest") + ); + assert_eq!( + release_url("nightly", None).unwrap().as_str(), + format!("{base}/tags/nightly") + ); + assert_eq!( + release_url("nightly", Some("v1.2.3")).unwrap().as_str(), + format!("{base}/tags/v1.2.3") + ); + assert_eq!( + release_url("stable", Some("feature/test?#")) + .unwrap() + .as_str(), + format!("{base}/tags/feature%2Ftest%3F%23") + ); + } + + #[test] + fn parses_numeric_and_named_release_tags_without_losing_asset_urls() { + for (tag, expected) in [("v1.2.3", "1.2.3"), ("nightly", "nightly")] { + let body = serde_json::json!({ + "tag_name": tag, + "assets": [{"name": "kit.zip", "url": "https://api.github.com/assets/42"}] + }); + let release = parse_release(&serde_json::to_vec(&body).unwrap()).unwrap(); + assert_eq!(release.version, expected); + assert_eq!(release.assets[0].name, "kit.zip"); + assert_eq!( + release.assets[0].download_url, + "https://api.github.com/assets/42" + ); + } + for bad in [b"{}".as_slice(), br#"{"tag_name":"v1.2.3"}"#, b"not json"] { + assert!(parse_release(bad).is_err()); + } + } + + #[test] + fn compares_release_versions_with_named_tag_fallback() { + assert!(is_newer_release("1.2.3", "1.2.4")); + assert!(!is_newer_release("1.2.3", "1.2.3")); + assert!(!is_newer_release("1.2.3", "1.2.2")); + assert!(is_newer_release("1.2.3", "1.2.4-beta.1")); + assert!(!is_newer_release("1.2.3", "1.2.3-beta.1")); + assert!(is_newer_release("1.2.3", "nightly")); + assert!(!is_newer_release("nightly", "nightly")); + } + #[test] fn selects_host_kit_asset_and_checksum() { let rel = release(vec![ diff --git a/crates/chefer-cli/src/ui.rs b/crates/chefer-cli/src/ui.rs index fd5909d..9cdb3a9 100644 --- a/crates/chefer-cli/src/ui.rs +++ b/crates/chefer-cli/src/ui.rs @@ -16,7 +16,7 @@ pub fn term_width() -> u16 { /// 建立雙欄 key-value 表格(欄寬以百分比指定),header 為 Key/Value。 pub fn kv_table(key_pct: u16, val_pct: u16) -> Table { let mut t = Table::new(); - t.load_preset(UTF8_BORDERS_ONLY) + t.load_style(UTF8_BORDERS_ONLY) .set_content_arrangement(ContentArrangement::Dynamic) .set_width(term_width()) .set_constraints(vec![ @@ -73,7 +73,7 @@ pub fn render_summary_table(app: &appcipe_spec::AppCipe) { /* ===== App 概覽(兩欄,比例 24/76;允許單格換行;加點顏色) ===== */ let mut header = Table::new(); header - .load_preset(UTF8_BORDERS_ONLY) + .load_style(UTF8_BORDERS_ONLY) .set_content_arrangement(ContentArrangement::Dynamic) .set_width(cols) .set_constraints(vec![ @@ -125,7 +125,7 @@ pub fn render_summary_table(app: &appcipe_spec::AppCipe) { /* ===== Services(百分比分配;單格換行;彩色;含 Depends;Service 間插入空白列) ===== */ let mut t = Table::new(); - t.load_preset(UTF8_BORDERS_ONLY) + t.load_style(UTF8_BORDERS_ONLY) .set_content_arrangement(ContentArrangement::Dynamic) .set_width(cols) .set_constraints(vec![ diff --git a/crates/chefer-cli/tests/dockerfile_builder_e2e.rs b/crates/chefer-cli/tests/dockerfile_builder_e2e.rs new file mode 100644 index 0000000..c9e0b87 --- /dev/null +++ b/crates/chefer-cli/tests/dockerfile_builder_e2e.rs @@ -0,0 +1,332 @@ +//! 真 CLI + 隔離 PATH 的 Windows builder 相容性測試,不需要 Docker 或 WSL。 +#![cfg(windows)] + +use sha2::{Digest, Sha256}; +use std::io::{Cursor, Read}; +use std::path::{Path, PathBuf}; +use std::process::{Command, Output}; +use std::sync::OnceLock; + +const TARGET: &str = if cfg!(target_arch = "aarch64") { + "aarch64-unknown-linux-gnu" +} else { + "x86_64-unknown-linux-gnu" +}; +const IMAGE_ARCH: &str = if cfg!(target_arch = "aarch64") { + "arm64" +} else { + "amd64" +}; +const PLATFORM: &str = if cfg!(target_arch = "aarch64") { + "linux/arm64" +} else { + "linux/amd64" +}; +const OTHER_PLATFORM: &str = if cfg!(target_arch = "aarch64") { + "linux/amd64" +} else { + "linux/arm64" +}; + +fn fake_builder() -> &'static Path { + static COMPILED: OnceLock = OnceLock::new(); + COMPILED.get_or_init(|| { + let dir = tempfile::tempdir().unwrap(); + let src = dir.path().join("builder.rs"); + std::fs::write(&src, r#" +use std::{env, fs::{self, OpenOptions}, io::Write, process}; +fn main() { + let mut args: Vec = env::args().skip(1).collect(); + let tool = env::current_exe().unwrap().file_stem().unwrap().to_string_lossy().into_owned(); + let mut record = vec![tool]; record.extend(args.clone()); + let mut log = OpenOptions::new().create(true).append(true).open(env::var("CHEFER_TEST_LOG").unwrap()).unwrap(); + log.write_all(&(record.len() as u32).to_le_bytes()).unwrap(); + for arg in record { log.write_all(&(arg.len() as u32).to_le_bytes()).unwrap(); log.write_all(arg.as_bytes()).unwrap(); } + if args == ["--version"] { return; } + if args.first().map(String::as_str) == Some("image") { args.remove(0); } + let op = args.first().map(String::as_str).unwrap_or(""); + let mode = env::var("CHEFER_TEST_FAILURE").unwrap_or_default(); + if op == mode || (op == "rm" && mode == "cleanup") { eprintln!("FAKE_{op}_FAILURE"); process::exit(23); } + match op { + "build" | "rm" => (), + "save" => { let n = args.iter().position(|a| a == "-o").unwrap(); fs::copy(env::var("CHEFER_TEST_IMAGE_TAR").unwrap(), &args[n+1]).unwrap(); }, + _ => process::exit(24), + } +} +"#).unwrap(); + let output = Command::new("rustc").arg("--edition=2024").arg(&src) + .arg("-o").arg(dir.path().join("builder.exe")).output().unwrap(); + assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr)); + dir + }).path() +} + +fn append(tar: &mut tar::Builder>, name: &str, bytes: &[u8]) { + let mut h = tar::Header::new_gnu(); + h.set_mode(0o644); + h.set_size(bytes.len() as u64); + tar.append_data(&mut h, name, bytes).unwrap(); +} + +struct Fixture { + dir: tempfile::TempDir, + tools: PathBuf, + log: PathBuf, +} +impl Fixture { + fn new(builders: &[&str]) -> Self { + let dir = tempfile::tempdir().unwrap(); + let tools = dir.path().join("tools"); + std::fs::create_dir(&tools).unwrap(); + for tool in builders { + std::fs::copy( + fake_builder().join("builder.exe"), + tools.join(format!("{tool}.exe")), + ) + .unwrap(); + } + let ctx = dir.path().join("context with spaces"); + std::fs::create_dir(&ctx).unwrap(); + std::fs::write(ctx.join("Dockerfile"), "FROM scratch\n").unwrap(); + std::fs::write(dir.path().join("appcipe.yml"), "version: \"0.1\"\nname: BuilderE2e\nservices:\n app:\n image:\n source: dockerfile\n file: './context with spaces/Dockerfile'\n context: './context with spaces'\n build_args:\n Z: 'last value'\n A: 'first value'\n").unwrap(); + let recipe = dir.path().join("appcipe.yml"); + let text = std::fs::read_to_string(&recipe).unwrap().replace( + "source: dockerfile", + &format!("source: dockerfile\n platform: {PLATFORM}"), + ); + std::fs::write(&recipe, text).unwrap(); + let mut layer = tar::Builder::new(Vec::new()); + append(&mut layer, "hello", b"builder fixture"); + let layer = layer.into_inner().unwrap(); + let digest = Sha256::digest(&layer) + .iter() + .map(|v| format!("{v:02x}")) + .collect::(); + let config = serde_json::to_vec(&serde_json::json!({"os":"linux", "architecture":IMAGE_ARCH, "config":{"Cmd":["true"]}, "rootfs":{"type":"layers", "diff_ids":[format!("sha256:{digest}")]}})).unwrap(); + let mut archive = tar::Builder::new(Vec::new()); + append(&mut archive, "layer.tar", &layer); + append(&mut archive, "config.json", &config); + append( + &mut archive, + "manifest.json", + br#"[{"Config":"config.json","RepoTags":["fixture:1"],"Layers":["layer.tar"]}]"#, + ); + std::fs::write( + dir.path().join("fixture.tar"), + archive.into_inner().unwrap(), + ) + .unwrap(); + std::fs::create_dir(dir.path().join("kit")).unwrap(); + std::fs::write( + dir.path() + .join("kit") + .join(format!("chefer-runtime-{TARGET}")), + b"fake runtime", + ) + .unwrap(); + let log = dir.path().join("calls.bin"); + Self { dir, tools, log } + } + fn command(&self) -> Command { + let mut cmd = Command::new(env!("CARGO_BIN_EXE_chefer-cli")); + cmd.current_dir(self.dir.path()) + .env("PATH", &self.tools) + .env_remove("CHEFER_DOCKERFILE_BUILDER") + .env("CHEFER_TEST_LOG", &self.log) + .env("CHEFER_TEST_IMAGE_TAR", self.dir.path().join("fixture.tar")); + cmd + } + fn build(&self, forced: Option<&str>, failure: &str) -> Output { + let mut cmd = self.command(); + if let Some(tool) = forced { + cmd.env("CHEFER_DOCKERFILE_BUILDER", tool); + } + cmd.env("CHEFER_TEST_FAILURE", failure) + .args([ + "build", + "appcipe.yml", + "--out", + "dist", + "--kit-dir", + "kit", + "--target", + TARGET, + ]) + .output() + .unwrap() + } + fn calls(&self) -> Vec> { + let mut input = Cursor::new(std::fs::read(&self.log).unwrap_or_default()); + let mut calls = Vec::new(); + loop { + let mut count = [0; 4]; + if input.read_exact(&mut count).is_err() { + break; + } + let mut args = Vec::new(); + for _ in 0..u32::from_le_bytes(count) { + let mut len = [0; 4]; + input.read_exact(&mut len).unwrap(); + let mut bytes = vec![0; u32::from_le_bytes(len) as usize]; + input.read_exact(&mut bytes).unwrap(); + args.push(String::from_utf8(bytes).unwrap()); + } + calls.push(args); + } + calls + } +} + +#[test] +fn detects_wslc_and_packs_its_export_with_preserved_arguments() { + let f = Fixture::new(&["wslc"]); + let out = f.build(None, ""); + assert!( + out.status.success(), + "{}", + String::from_utf8_lossy(&out.stderr) + ); + let calls = f.calls(); + assert_eq!(&calls[0], &["wslc", "--version"]); + let build = &calls[1]; + assert_eq!( + &build[..7], + &[ + "wslc", + "build", + "--build-arg", + "A=first value", + "--build-arg", + "Z=last value", + "-f" + ] + ); + assert!( + Path::new(&build[7]).ends_with(Path::new("context with spaces").join("Dockerfile")), + "{build:?}" + ); + assert!(build.last().unwrap().ends_with("context with spaces")); + assert_eq!(&calls[2][..4], &["wslc", "image", "save", "-o"]); + assert_eq!(&calls[3][..4], &["wslc", "image", "rm", "-f"]); + let artifact = f + .dir + .path() + .join("dist/BuilderE2e") + .join(format!("BuilderE2e_{TARGET}")); + assert!( + chefer_bundle::Footer::read_from_file(&artifact) + .unwrap() + .is_zstd() + ); +} + +#[test] +fn explicitly_selected_wslc_bypasses_docker_and_doctor_reports_it() { + let f = Fixture::new(&["docker", "wslc"]); + let out = f.build(Some("wslc"), ""); + assert!( + out.status.success(), + "{}", + String::from_utf8_lossy(&out.stderr) + ); + assert!(f.calls().iter().all(|args| args[0] == "wslc")); + let out = f + .command() + .env("CHEFER_DOCKERFILE_BUILDER", "wslc") + .args(["doctor"]) + .output() + .unwrap(); + let text = String::from_utf8_lossy(&out.stdout); + assert!( + text.contains("Dockerfile builder") && text.contains("Found `wslc`"), + "{text}" + ); +} + +#[test] +fn existing_docker_priority_is_preserved() { + let f = Fixture::new(&["docker", "wslc"]); + let out = f.build(None, ""); + assert!( + out.status.success(), + "{}", + String::from_utf8_lossy(&out.stderr) + ); + assert!(f.calls().iter().all(|args| args[0] == "docker")); + assert_eq!(&f.calls()[2][..3], &["docker", "save", "-o"]); +} + +#[test] +fn unavailable_forced_wslc_does_not_fall_back_to_docker() { + let f = Fixture::new(&["docker"]); + let out = f.build(Some("wslc"), ""); + assert!(!out.status.success()); + assert!(String::from_utf8_lossy(&out.stderr).contains("not runnable on PATH")); + assert!(f.calls().is_empty()); +} + +#[test] +fn failed_build_does_not_export_and_failed_export_is_cleaned_up() { + for failure in ["build", "save"] { + let f = Fixture::new(&["wslc"]); + let out = f.build(Some("wslc"), failure); + assert!(!out.status.success()); + let stderr = String::from_utf8_lossy(&out.stderr); + assert!( + stderr.contains(&format!("FAKE_{failure}_FAILURE")), + "{stderr}" + ); + let calls = f.calls(); + if failure == "build" { + assert_eq!(calls.len(), 2); + } else { + assert_eq!(&calls.last().unwrap()[..4], &["wslc", "image", "rm", "-f"]); + } + } +} + +#[test] +fn cleanup_failure_does_not_discard_successful_export() { + let f = Fixture::new(&["wslc"]); + let out = f.build(Some("wslc"), "cleanup"); + assert!( + out.status.success(), + "{}", + String::from_utf8_lossy(&out.stderr) + ); +} + +#[test] +fn wslc_rejects_cross_arch_before_building() { + let f = Fixture::new(&["wslc"]); + let yml = f.dir.path().join("appcipe.yml"); + let text = std::fs::read_to_string(&yml) + .unwrap() + .replace(PLATFORM, OTHER_PLATFORM); + std::fs::write(&yml, text).unwrap(); + let out = f.build(Some("wslc"), ""); + assert!(!out.status.success()); + let err = String::from_utf8_lossy(&out.stderr); + assert!( + err.contains(OTHER_PLATFORM) && err.contains("native") && err.contains("docker"), + "{err}" + ); + assert_eq!( + f.calls(), + vec![vec!["wslc".to_string(), "--version".to_string()]] + ); +} + +#[test] +fn windows_container_alias_uses_wslc_commands() { + let f = Fixture::new(&["container"]); + let out = f.build(Some("container"), ""); + assert!( + out.status.success(), + "{}", + String::from_utf8_lossy(&out.stderr) + ); + let calls = f.calls(); + assert_eq!(&calls[1][..3], &["container", "build", "--build-arg"]); + assert_eq!(&calls[2][..4], &["container", "image", "save", "-o"]); +} diff --git a/crates/chefer-pack/Cargo.toml b/crates/chefer-pack/Cargo.toml index 08b629d..1b8ddf3 100644 --- a/crates/chefer-pack/Cargo.toml +++ b/crates/chefer-pack/Cargo.toml @@ -4,22 +4,22 @@ version = "0.5.0" edition = "2024" [dependencies] -anyhow = "1.0.102" +anyhow = "1.0.104" appcipe-spec = { version = "0.1.0", path = "../appcipe-spec" } # 解 docker config.json 的 auths.auth(base64 "user:pass");本就在依賴樹(oci-client 傳遞依賴)。 -base64 = "0.22" +base64 = "0.23.1" chefer-bundle = { version = "0.5.0", path = "../chefer-bundle" } -flate2 = "1.1.9" -fs-err = "3.3.0" +flate2 = "1.1.10" +fs-err = "3.3.2" # registry pull(source: image)。rustls 對齊 workspace(chefer-cli 也用 rustls)。 -oci-client = { version = "0.17", default-features = false, features = ["rustls-tls"] } -serde = { version = "1.0.228", features = ["derive"] } -serde_json = "1.0.150" +oci-client = { version = "0.18.0", default-features = false, features = ["rustls-tls"] } +serde = { version = "1.0.229", features = ["derive"] } +serde_json = "1.0.154" serde_yaml = "0.9.34" -sha2 = "0.11.0" +sha2 = "0.11.1" tar = "0.4.46" tempfile = "3.27.0" -time = { version = "0.3.47", features = ["formatting"] } +time = { version = "0.3.55", features = ["formatting"] } # 只為了在同步的 pack 流程裡 block_on oci-client 的 async pull。 -tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] } -zstd = "0.13.3" +tokio = { version = "1.54.1", default-features = false, features = ["rt-multi-thread"] } +zstd = "0.14.3" diff --git a/crates/chefer-pack/src/dockerfile.rs b/crates/chefer-pack/src/dockerfile.rs index 56267c2..c6c632b 100644 --- a/crates/chefer-pack/src/dockerfile.rs +++ b/crates/chefer-pack/src/dockerfile.rs @@ -1,7 +1,7 @@ -//! `source: dockerfile` —— 在**打包機**上以既有的 container builder 建置成 docker-archive -//! tar,之後完全併入 `source: tar` 的解析路徑(見 docs/DESIGN.md「Dockerfile build」)。 +//! `source: dockerfile` —— 在**打包機**上以既有的 container builder 建置成 image +//! archive,之後完全併入 `source: tar` 的解析路徑(見 docs/DESIGN.md「Dockerfile build」)。 //! -//! chefer 本身不建 image:偵測並呼叫 host 上的 docker / podman / nerdctl(CLI 相容)。 +//! chefer 本身不建 image:偵測並呼叫 host 上既有的 container builder(Windows 另支援 WSL Containers)。 //! 執行期一如往常不需 Docker——builder 只在打包時用到。 use std::collections::{BTreeMap, HashMap}; @@ -15,9 +15,13 @@ use anyhow::{Context, Result, bail}; /// macOS 上的 **OrbStack / Docker Desktop** 都提供 drop-in `docker` CLI,故直接走這條。 /// - `container`(Apple 開源 container 工具):`build` 旗標相容,但 save 是 /// `container image save -o`(產出 OCI archive,chefer 解析端兩種格式都吃)。 +// Windows 的 wslc 與 Apple container 同樣以 `image save` 匯出。 +#[cfg(windows)] +const BUILDERS: &[&str] = &["docker", "podman", "nerdctl", "wslc", "container"]; +#[cfg(not(windows))] const BUILDERS: &[&str] = &["docker", "podman", "nerdctl", "container"]; -/// 以 host builder 建置 Dockerfile 成 docker-archive tar,回傳 tar 路徑(位於 `out_dir`)。 +/// 以 host builder 建置 Dockerfile 成 image archive,回傳 tar 路徑(位於 `out_dir`)。 pub(crate) fn build_image_tar( name: &str, dockerfile: &str, @@ -49,6 +53,17 @@ pub(crate) fn build_image_tar( } let builder = detect_builder()?; + let wslc = cfg!(windows) && matches!(builder, "wslc" | "container"); + #[cfg(windows)] + if wslc { + let native = wslc_native_platform()?; + if platform != native { + bail!( + "Chefer currently supports `{builder}` builds only for the native platform {native}, but service `{name}` requests {platform}. \ + Use docker/podman/nerdctl for cross-platform builds, or set image.platform to {native}." + ); + } + } let tag = format!("chefer-build-{name}:{}", std::process::id()); eprintln!( @@ -57,7 +72,11 @@ pub(crate) fn build_image_tar( // build —— stdio 直通,讓使用者看到建置過程。 let mut cmd = Command::new(builder); - cmd.arg("build").arg("--platform").arg(platform); + cmd.arg("build"); + // WSLC 3.0.3 的 build 沒有 --platform,僅建置 Windows 原生架構。 + if !wslc { + cmd.arg("--platform").arg(platform); + } // build_args 依 key 排序,讓相同輸入的命令列固定(雖然 Dockerfile build 本身不保證可重現)。 let sorted: BTreeMap<&String, &String> = build_args.iter().collect(); for (k, v) in sorted { @@ -74,21 +93,15 @@ pub(crate) fn build_image_tar( ); } - // save → image tar(docker/podman/nerdctl: docker-archive;Apple container: OCI archive)。 - // Apple container 的 save 在 `image` 子命令下(`container image save`),其餘為 ` save`。 + // save → image archive。Apple container 與 WSL Containers 用 `image save`。 let tar = out_dir.join("image.tar"); let mut save_cmd = Command::new(builder); - if builder == "container" { + if matches!(builder, "container" | "wslc") { save_cmd.arg("image").arg("save"); } else { save_cmd.arg("save"); } - let save = save_cmd - .arg("-o") - .arg(&tar) - .arg(&tag) - .output() - .with_context(|| format!("failed to run `{builder} save` for service `{name}`"))?; + let save = save_cmd.arg("-o").arg(&tar).arg(&tag).output(); // best-effort 清掉建置用的暫時 image(不影響成敗)。 let _ = Command::new(builder) @@ -98,6 +111,8 @@ pub(crate) fn build_image_tar( .arg(&tag) .output(); + let save = + save.with_context(|| format!("failed to run `{builder} save` for service `{name}`"))?; if !save.status.success() { bail!( "`{builder} save` failed for service `{name}`: {}", @@ -116,7 +131,8 @@ fn detect_builder() -> Result<&'static str> { let Some(&b) = BUILDERS.iter().find(|b| **b == forced) else { bail!( "CHEFER_DOCKERFILE_BUILDER=`{forced}` is not a supported builder \ - (expected one of docker/podman/nerdctl/container)" + (expected one of {})", + BUILDERS.join("/") ); }; if runnable(b) { @@ -132,8 +148,9 @@ fn detect_builder() -> Result<&'static str> { } bail!( "source: dockerfile needs a container builder on this machine, but none of \ - docker/podman/nerdctl/container were found on PATH. Install one (e.g. Docker, OrbStack, \ - or Apple's `container`), or pre-build the image and use source: tar / source: image." + {} were found on PATH. Install a supported builder (on Windows, update WSL for `wslc`), \ + or pre-build the image and use source: tar / source: image.", + BUILDERS.join("/") ) } @@ -153,6 +170,40 @@ pub fn available_builder() -> Option<&'static str> { BUILDERS.iter().copied().find(|b| runnable(b)) } +/// WSLC 使用 Windows 原生架構;模擬執行的 CLI 架構與環境變數不能作為判斷依據。 +#[cfg(windows)] +fn wslc_native_platform() -> Result<&'static str> { + #[link(name = "kernel32")] + unsafe extern "system" { + fn GetCurrentProcess() -> *mut std::ffi::c_void; + fn IsWow64Process2( + process: *mut std::ffi::c_void, + process_machine: *mut u16, + native_machine: *mut u16, + ) -> i32; + } + let (mut process_machine, mut native_machine) = (0u16, 0u16); + // SAFETY: GetCurrentProcess 提供有效的目前程序 handle,兩個輸出指標均指向有效 u16。 + let ok = unsafe { + IsWow64Process2( + GetCurrentProcess(), + &mut process_machine, + &mut native_machine, + ) + }; + if ok == 0 { + return Err(std::io::Error::last_os_error()) + .context("failed to detect the native Windows architecture for WSL Containers"); + } + match native_machine { + 0x8664 => Ok("linux/amd64"), // IMAGE_FILE_MACHINE_AMD64 + 0xaa64 => Ok("linux/arm64"), // IMAGE_FILE_MACHINE_ARM64 + _ => bail!( + "WSL Containers native machine architecture is unsupported: {native_machine:#06x}" + ), + } +} + fn runnable(builder: &str) -> bool { Command::new(builder) .arg("--version") diff --git a/crates/chefer-runtime/Cargo.toml b/crates/chefer-runtime/Cargo.toml index bb63d3e..c1cfceb 100644 --- a/crates/chefer-runtime/Cargo.toml +++ b/crates/chefer-runtime/Cargo.toml @@ -4,22 +4,22 @@ version = "0.5.0" edition = "2024" [dependencies] -anyhow = "1" -hex = "0.4" -tempfile = "3" -zstd = "0.13" -tar = "0.4" -tracing = "0.1" -tracing-subscriber = { version = "0.3", features = ["fmt"] } -clap = { version = "4.0", features = ["derive"] } -fs-err = "3.3.0" -sha2 = "0.11.0" +anyhow = "1.0.104" +hex = "0.4.3" +tempfile = "3.27.0" +zstd = "0.14.3" +tar = "0.4.46" +tracing = "0.1.44" +tracing-subscriber = { version = "0.3.23", features = ["fmt"] } +clap = { version = "4.6.7", features = ["derive"] } +fs-err = "3.3.2" +sha2 = "0.11.1" ctrlc = "3.5.2" chefer-bundle = { version = "0.5.0", path = "../chefer-bundle" } vmm-backend = { version = "0.5.0", path = "../vmm-backend" } [target.'cfg(windows)'.dependencies] -windows-sys = { version = "0.61", features = [ +windows-sys = { version = "0.61.2", features = [ "Win32_Foundation", "Win32_System_Console", "Win32_UI_WindowsAndMessaging", diff --git a/crates/guest-agent/Cargo.toml b/crates/guest-agent/Cargo.toml index 7d0169f..f6ee474 100644 --- a/crates/guest-agent/Cargo.toml +++ b/crates/guest-agent/Cargo.toml @@ -4,16 +4,16 @@ version = "0.5.0" edition = "2024" [dependencies] -anyhow = "1.0.102" +anyhow = "1.0.104" chefer-bundle = { version = "0.5.0", path = "../chefer-bundle" } -clap = { version = "4.6.1", features = ["derive"] } +clap = { version = "4.6.7", features = ["derive"] } hex = "0.4.3" -ruzstd = "0.8.3" -sha2 = "0.11.0" +ruzstd = "0.9.1" +sha2 = "0.11.1" tar = "0.4.46" [target.'cfg(target_os = "linux")'.dependencies] -libc = "0.2.186" +libc = "0.2.191" nix = { version = "0.31.3", features = ["fs", "mount", "sched", "signal", "process", "user", "term", "socket", "net", "uio"] } [dev-dependencies] diff --git a/crates/vmm-backend/Cargo.toml b/crates/vmm-backend/Cargo.toml index 25db4ef..d904e49 100644 --- a/crates/vmm-backend/Cargo.toml +++ b/crates/vmm-backend/Cargo.toml @@ -4,15 +4,15 @@ version = "0.5.0" edition = "2024" [dependencies] -anyhow = "1.0.102" +anyhow = "1.0.104" chefer-bundle = { version = "0.5.0", path = "../chefer-bundle" } guest-agent = { version = "0.5.0", path = "../guest-agent" } -sha2 = "0.11.0" +sha2 = "0.11.1" tar = "0.4.46" [target."cfg(windows)".dependencies] tempfile = "3.27.0" -windows-sys = { version = "0.61", features = [ +windows-sys = { version = "0.61.2", features = [ "Win32_Foundation", "Win32_System_LibraryLoader", "Win32_System_Threading", @@ -25,5 +25,5 @@ windows-sys = { version = "0.61", features = [ ] } [dev-dependencies] -serde_json = "1.0.145" +serde_json = "1.0.154" tempfile = "3.27.0" diff --git a/crates/vmm-backend/src/wsl_util.rs b/crates/vmm-backend/src/wsl_util.rs index a38c0e8..d1da644 100644 --- a/crates/vmm-backend/src/wsl_util.rs +++ b/crates/vmm-backend/src/wsl_util.rs @@ -76,7 +76,9 @@ pub fn agent_distro_name(agent_bytes: &[u8]) -> String { pub fn decode_wsl_output(bytes: &[u8]) -> String { if bytes.contains(&0) { let units: Vec = bytes - .chunks_exact(2) + .as_chunks::<2>() + .0 + .iter() .map(|c| u16::from_le_bytes([c[0], c[1]])) .collect(); String::from_utf16_lossy(&units) diff --git a/crates/whp-helper/Cargo.toml b/crates/whp-helper/Cargo.toml index 99c809c..a7324af 100644 --- a/crates/whp-helper/Cargo.toml +++ b/crates/whp-helper/Cargo.toml @@ -12,7 +12,7 @@ path = "src/main.rs" tar = "0.4.46" # WHP virtio-net 的 host 端 user-mode 網路堆疊(純 Rust,無 C 依賴,符合單檔精神): # 當 guest 的 gateway,處理 ARP/IP/TCP/UDP;host→guest 埠轉發以其 TCP socket 橋接。 -smoltcp = { version = "0.12", default-features = false, features = ["std", "medium-ethernet", "proto-ipv4", "socket-tcp", "socket-udp"] } +smoltcp = { version = "0.14.0", default-features = false, features = ["std", "medium-ethernet", "proto-ipv4", "socket-tcp", "socket-udp"] } [dev-dependencies] tempfile = "3.27.0" @@ -20,8 +20,8 @@ tempfile = "3.27.0" [target."cfg(windows)".dependencies] # 剪貼簿圖片:CF_DIB ↔ PNG 轉換(純 Rust,無 C 依賴,符合單檔精神)。與現代(PNG 格式) # 及傳統(CF_DIB:小畫家/剪取工具/PowerShell)Windows app 互通。 -png = "0.18" -windows-sys = { version = "0.61", features = [ +png = "0.18.1" +windows-sys = { version = "0.61.2", features = [ "Win32_Foundation", "Win32_System_LibraryLoader", "Win32_System_Memory", diff --git a/crates/whp-helper/test-init/Cargo.toml b/crates/whp-helper/test-init/Cargo.toml index 22dfd4b..397725b 100644 --- a/crates/whp-helper/test-init/Cargo.toml +++ b/crates/whp-helper/test-init/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" publish = false [dependencies] -libc = "0.2" +libc = "0.2.191" [[bin]] name = "init" diff --git a/docs/DESIGN.md b/docs/DESIGN.md index 9556b9e..4e3d6fa 100644 --- a/docs/DESIGN.md +++ b/docs/DESIGN.md @@ -180,7 +180,7 @@ bundle/ - `depends_on`:必須指向存在的 service;不得有循環;不得指向自己。 - `healthcheck`(選填,見「健康檢查」節):有則 `test` 非空;`interval`/`timeout` 須能解析且 > 0;`retries` ≥ 1;`start_period` 能解析且 ≥ 0。`test` 接受字串或字串陣列(`CMD`/`CMD-SHELL` 前綴比照 Docker)。 - env key:`[A-Za-z_][A-Za-z0-9_]*`。 - - `image.source` 支援 `tar`(本機 docker save / OCI archive)與 `image`(建置時從 registry 拉取);`dockerfile` 仍回報「尚未支援」。`source: image` 的 `file` 是 registry reference,**必須釘版**:明確且非 `latest` 的 tag,或 `@:` digest(`check_image_reference`);未標記/`latest` 一律拒絕(可重現性)。 + - `image.source` 支援 `tar`(本機 docker save / OCI archive)與 `image`(建置時從 registry 拉取);`dockerfile` 在打包機呼叫既有 builder 建置(見「Dockerfile build」)。`source: image` 的 `file` 是 registry reference,**必須釘版**:明確且非 `latest` 的 tag,或 `@:` digest(`check_image_reference`);未標記/`latest` 一律拒絕(可重現性)。 - **簡寫 `image: <字串>` 的判別(`appcipe-normalize::looks_like_image_ref`)**:非路徑徵兆(不以 `.`/`/`/`\`/`~` 開頭、非 Windows 磁碟代號、非 `.tar`/`.tgz`/`.tar.gz`、且檔案不存在)且帶 `@digest` 或「最後一段含 `:tag`」→ 轉成 `source: image`(compose 風格);否則維持 tar 路徑。tag 合法性仍由 `validate()` 把關。 - `AppCipe` 衍生 `Clone`。 @@ -437,15 +437,15 @@ services: ``` **做法(chefer-pack `dockerfile` 模組)**:chefer 本身不建 image——在**打包機**上偵測並呼叫既有的 container builder: -1. **偵測 builder**:依序試 `docker` → `podman` → `nerdctl` → `container`(首個可執行者;以 `--version` 探測)。前三者的 `build`/`save` CLI 相容(docker-archive);macOS 上的 **OrbStack / Docker Desktop** 都提供 drop-in `docker` CLI,故直接走 `docker` 那條、無需特別處理。**Apple `container`**(開源 container 工具):`build` 旗標相容(`-t`/`-f`/`--platform os/arch`/context),但 save 在 `image` 子命令下(`container image save -o`,產出 **OCI archive**——chefer 的 image 解析端 docker-archive 與 OCI archive 兩種都吃)。找不到任何一個 → 可行動錯誤,列出支援的 builder。 -2. **build**:` build --platform [--build-arg K=V …] -f -t <暫時 tag> `,stdio 直通讓使用者看到建置過程;非零 → 透傳 builder 錯誤。 -3. **save**:` save -o /image.tar <暫時 tag>`(docker-archive)。 +1. **偵測 builder**:Windows 依序試 `docker` → `podman` → `nerdctl` → `wslc` → `container`;其他平台維持 `docker` → `podman` → `nerdctl` → `container`(首個可執行者;以 `--version` 探測)。`wslc` 是新版 WSL 內建的 WSL Containers CLI,免安裝 Docker;使用 `wslc build` 與 `wslc image save -o`。`CHEFER_DOCKERFILE_BUILDER=wslc` 可在 Windows 明確指定它,指定但不可執行時報錯,不退回其他 builder。`--version` 只確認 CLI 可執行,不檢查 Docker daemon 或 WSLC 服務狀態。前三者的 `build`/`save` CLI 相容(docker-archive);macOS 上的 **OrbStack / Docker Desktop** 都提供 drop-in `docker` CLI,故直接走 `docker` 那條、無需特別處理。**Apple `container`**(開源 container 工具):`build` 旗標相容(`-t`/`-f`/`--platform os/arch`/context),但 save 在 `image` 子命令下(`container image save -o`,產出 **OCI archive**——chefer 的 image 解析端 docker-archive 與 OCI archive 兩種都吃)。找不到任何一個 → 可行動錯誤,列出支援的 builder。 +2. **build**:` build --platform [--build-arg K=V …] -f -t <暫時 tag> `。Windows WSLC(`wslc` 與 `container` 別名)沒有 `--platform` 選項,故省略該參數;以 `IsWow64Process2` 的 native machine 檢查 `image.platform`,僅允許 Windows 原生架構(含 CLI 在模擬環境執行的情況)。要求其他架構時,在 build 前提示改用 docker/podman/nerdctl 或調整 platform。stdio 直通讓使用者看到建置過程;非零 → 透傳 builder 錯誤。 +3. **save**:docker/podman/nerdctl 使用 ` save -o /image.tar <暫時 tag>`;Apple `container` 與 Windows `wslc` 使用 ` image save -o /image.tar <暫時 tag>`。以內容自動辨識 docker-archive/OCI archive。 4. **接既有路徑**:把該 tar 當 `source: tar` 解析(`archive::extract_tar_to_dir` + `image::resolve_image`)→ 共用 repack。 -5. best-effort ` image rm <暫時 tag>` 清掉暫時 image。 +5. build 成功後,無論 save 成功、非零或無法啟動,都 best-effort ` image rm -f <暫時 tag>` 清掉暫時 image;清理失敗不覆蓋建置/匯出的結果。 **權衡(明示)**:`source: dockerfile` **不保證可重現**(Dockerfile 內 `apt`/`pip` 等每次拉到的版本可能不同;對齊 Docker 的本質)。要可重現請用 `source: image` 釘 digest。`--platform` 跨架構需 builder 端的 emulation(buildx/qemu binfmt);建原生架構則免。執行期一如往常**不需** Docker——builder 只在打包時用到(與 `source: tar` 需要你先 `docker save` 的前提一致)。 -**驗證**:`appcipe-spec` 接受 `source: dockerfile`(檢查 `file` 非空);不適用 `check_image_reference`(那是 registry ref 專用)。 +**驗證**:`appcipe-spec` 接受 `source: dockerfile`(檢查 `file` 非空);不適用 `check_image_reference`(那是 registry ref 專用)。Windows 的 `crates/chefer-cli/tests/dockerfile_builder_e2e.rs` 隔離 PATH,以真 CLI 驗證 WSLC 偵測、指定、參數、匯出、失敗與清理;`scripts/windows-wslc-e2e.ps1` 在實機以 WSLC 建置真正映像,再打包與執行,檢查 guest stdout 和持久化輸出。 ### 健康檢查(depends_on wait-until-ready)— 設計 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..bd8358a --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.99.1" +profile = "minimal" +components = ["rustfmt", "clippy"] diff --git a/scripts/windows-wslc-e2e.ps1 b/scripts/windows-wslc-e2e.ps1 new file mode 100644 index 0000000..ac9232d --- /dev/null +++ b/scripts/windows-wslc-e2e.ps1 @@ -0,0 +1,144 @@ +#requires -version 5.1 +<# +.SYNOPSIS +Build and run a Chefer app with WSL Containers, without Docker. +.DESCRIPTION +Requires a physical Windows host with wslc, WSL2, Rust and native MSVC tools. +Checks spaced paths/build args, export, packaging, guest stdout and persisted +output. Preserves logs on failure and restores environment variables. +.PARAMETER Keep +Preserve the temporary workspace after a successful run. +.PARAMETER SkipRustupTargetAdd +Use the already installed Linux musl Rust target. +.PARAMETER RepositoryRoot +Repository to build. Defaults to the parent of this script's directory. +.EXAMPLE +powershell -File scripts/windows-wslc-e2e.ps1 +#> +[CmdletBinding()] +param( + [switch]$Keep, + [switch]$SkipRustupTargetAdd, + [string]$RepositoryRoot = (Join-Path $PSScriptRoot "..") +) + +Set-StrictMode -Version Latest +$ErrorActionPreference = "Stop" +if ($env:OS -ne "Windows_NT") { throw "This smoke test requires Windows with WSL Containers." } +$root = (Resolve-Path -LiteralPath $RepositoryRoot).ProviderPath +$originalLocation = Get-Location +$originalPath = $env:PATH +$originalBuilder = $env:CHEFER_DOCKERFILE_BUILDER +$originalBackend = $env:CHEFER_BACKEND +$work = Join-Path $env:TEMP ("chefer-wslc-e2e." + [guid]::NewGuid().ToString("N")) +$utf8 = [System.Text.UTF8Encoding]::new($false) +$passed = $false + +function Invoke-Checked { + param([string]$File, [string[]]$Arguments) + & $File @Arguments + if ($LASTEXITCODE -ne 0) { throw "$File failed with exit code $LASTEXITCODE" } +} + +try { + Set-Location $root + if (-not (Get-Command wslc -ErrorAction SilentlyContinue)) { + $installedWslc = Join-Path $env:ProgramFiles "WSL\wslc.exe" + if (Test-Path -LiteralPath $installedWslc) { + $env:PATH = (Split-Path $installedWslc) + ";" + $env:PATH + } else { throw "wslc is unavailable. Run wsl --update before this test." } + } + Invoke-Checked wslc @("--version") + $hostLine = & rustc -vV | Select-String '^host: ' + if (-not $hostLine) { throw "Cannot determine the Rust host target." } + $hostTarget = ($hostLine.ToString() -replace '^host: ', '').Trim() + switch ($hostTarget) { + "x86_64-pc-windows-msvc" { $arch = "x86_64"; $platform = "linux/amd64" } + "aarch64-pc-windows-msvc" { $arch = "aarch64"; $platform = "linux/arm64" } + default { throw "Unsupported Windows host target: $hostTarget" } + } + $guestTarget = "$arch-unknown-linux-musl" + if (-not $SkipRustupTargetAdd) { Invoke-Checked rustup @("target", "add", $guestTarget) } + Invoke-Checked cargo @("build", "-p", "chefer-cli", "-p", "chefer-runtime") + Invoke-Checked cargo @("build", "-p", "guest-agent", "--target", $guestTarget) + $metadataText = & cargo metadata --no-deps --format-version 1 + if ($LASTEXITCODE -ne 0) { throw "cargo metadata failed." } + $targetDir = ($metadataText | ConvertFrom-Json).target_directory + $cli = Join-Path $targetDir "debug\chefer-cli.exe" + $runtime = Join-Path $targetDir "debug\chefer-runtime.exe" + $agent = Join-Path $targetDir "$guestTarget\debug\guest-agent" + $context = Join-Path $work "context with spaces" + $kit = Join-Path $work "kit" + New-Item -ItemType Directory -Path $context, $kit | Out-Null + Copy-Item -LiteralPath $runtime -Destination (Join-Path $kit "chefer-runtime-$hostTarget.exe") + Copy-Item -LiteralPath $agent -Destination (Join-Path $kit "guest-agent-$arch") + $dockerfile = @' +FROM alpine:3.20 +ARG CHEFER_TEST_MARKER +RUN test "$CHEFER_TEST_MARKER" = "WSLC build args with spaces" +CMD ["sh", "-c", "echo CheferWslcE2E; mkdir -p /data; printf WSLC_OK > /data/result.txt"] +'@ + [System.IO.File]::WriteAllText((Join-Path $context "Dockerfile"), $dockerfile, $utf8) + $dataDir = Join-Path $work "data" + $dataYaml = "'" + ($dataDir -replace "'", "''") + "'" + $recipe = @" +version: "0.1" +name: WindowsWslcE2E +network: internal +data_dir: $dataYaml +services: + app: + image: + source: dockerfile + file: './context with spaces/Dockerfile' + context: './context with spaces' + platform: $platform + build_args: + CHEFER_TEST_MARKER: 'WSLC build args with spaces' + persist_path: /data +"@ + $recipePath = Join-Path $work "appcipe.yml" + [System.IO.File]::WriteAllText($recipePath, $recipe, $utf8) + $env:CHEFER_DOCKERFILE_BUILDER = "wslc" + $env:CHEFER_BACKEND = "wsl2" + Invoke-Checked $cli @("check", $recipePath) + Invoke-Checked $cli @("build", $recipePath, "--out", (Join-Path $work "out"), "--kit-dir", $kit, "--target", $hostTarget) + $app = Join-Path $work "out\WindowsWslcE2E\WindowsWslcE2E_$hostTarget.exe" + Invoke-Checked $cli @("inspect", $app) + $stdout = Join-Path $work "run.stdout.log" + $stderr = Join-Path $work "run.stderr.log" + $run = Start-Process -FilePath $app -ArgumentList @("--no-cache") -WindowStyle Hidden -PassThru -RedirectStandardOutput $stdout -RedirectStandardError $stderr + if (-not $run.WaitForExit(180000)) { + $run.Kill() + throw "Packaged app timed out. Logs: $stdout and $stderr" + } + $run.Refresh() + if ($run.ExitCode -ne 0) { + Get-Content -LiteralPath $stderr | Write-Host + throw "Packaged app exited with code $($run.ExitCode). Logs: $stdout and $stderr" + } + if (-not ((Get-Content -LiteralPath $stdout -Raw) -match 'CheferWslcE2E')) { + throw "Guest stdout did not reach the Windows host. Log: $stdout" + } + $result = Join-Path $dataDir "data\app\result.txt" + if (-not (Test-Path -LiteralPath $result) -or (Get-Content -LiteralPath $result -Raw) -ne "WSLC_OK") { + throw "Persisted guest output was not created correctly: $result" + } + $passed = $true + Write-Host "WSLC E2E passed: Dockerfile -> image archive -> executable -> WSL runtime -> persisted output." +} finally { + $env:PATH = $originalPath + $env:CHEFER_DOCKERFILE_BUILDER = $originalBuilder + $env:CHEFER_BACKEND = $originalBackend + Set-Location $originalLocation + if ($Keep -or -not $passed) { + Write-Host "E2E work dir: $work" + } elseif (Test-Path -LiteralPath $work) { + $resolvedWork = [System.IO.Path]::GetFullPath($work) + $resolvedTemp = [System.IO.Path]::GetFullPath($env:TEMP).TrimEnd('\') + '\' + if (-not $resolvedWork.StartsWith($resolvedTemp, [System.StringComparison]::OrdinalIgnoreCase) -or (Split-Path $resolvedWork -Leaf) -notlike 'chefer-wslc-e2e.*') { + throw "Refusing to clean a path outside this test's temporary workspace: $resolvedWork" + } + Remove-Item -LiteralPath $resolvedWork -Recurse -Force + } +} diff --git a/skills/write-appcipe/SKILL.md b/skills/write-appcipe/SKILL.md index b453385..617b0a3 100644 --- a/skills/write-appcipe/SKILL.md +++ b/skills/write-appcipe/SKILL.md @@ -23,7 +23,7 @@ docker build / docker pull → docker save -o x.tar # 取得 image t 寫 appcipe.yml(image 指向那些 tar) chefer build appcipe.yml --out dist # 產出單檔 ``` -image 來源可為 **tar**(`docker save`/OCI archive)、**registry ref**(釘版 tag 或 `@sha256`;公開 image 匿名拉取,**私有 registry** 用 `docker login` 的明文 `auths` 憑證或 `CHEFER_REGISTRY_AUTH=user:pass`——外部 credential helper 不支援)或 **Dockerfile**(打包機需有 docker/podman/nerdctl)。 +image 來源可為 **tar**(`docker save`/OCI archive)、**registry ref**(釘版 tag 或 `@sha256`;公開 image 匿名拉取,**私有 registry** 用 `docker login` 的明文 `auths` 憑證或 `CHEFER_REGISTRY_AUTH=user:pass`——外部 credential helper 不支援)或 **Dockerfile**(打包機需有 docker/podman/nerdctl/Apple container,Windows 另可用 WSL Containers 的 wslc)。 ## 最小可用範例 @@ -64,7 +64,7 @@ service 名規則:`[a-z][a-z0-9_]*`,≤32。 format: docker-archive # auto | docker-archive | oci-archive(**用連字號**,非底線;僅 source=tar 有意義) platform: linux/amd64 # linux/amd64 | linux/arm64(windows/amd64 不支援執行) ``` - - `source: dockerfile` 另可加 `context:`(build context 目錄,省略 = Dockerfile 所在目錄)與 `build_args: { K: V }`。**需打包機上有 docker/podman/nerdctl**;不保證可重現(要可重現用 `source: image` 釘 `@sha256` digest)。執行期仍不需 Docker。 + - `source: dockerfile` 另可加 `context:`(build context 目錄,省略 = Dockerfile 所在目錄)與 `build_args: { K: V }`。**需打包機上有 docker/podman/nerdctl/Apple container,Windows 另支援 wslc**。Windows 可先 `wsl --update`,再設 `$env:CHEFER_DOCKERFILE_BUILDER="wslc"` 明確指定,免安裝 Docker。WSLC 僅建置 Windows 原生架構,要求其他 `image.platform` 時會在建置前報錯,需改用其他 builder;不保證可重現(要可重現用 `source: image` 釘 `@sha256` digest)。執行期仍不需 Docker。 - **`cmd`**:字串或陣列,覆蓋映像的 **CMD(不覆蓋 ENTRYPOINT)**。有效命令 = entrypoint + (cmd 或 image CMD)。 - **`workdir`**:容器內工作目錄。 - **`env`**:`key: value`;key 須符合 `[A-Za-z_][A-Za-z0-9_]*`。會覆蓋映像自帶的同名 env。 From a3a327baa20a83e1485804701972c1fe4403cd87 Mon Sep 17 00:00:00 2001 From: TimLai666 Date: Thu, 29 Oct 2026 18:53:14 +0800 Subject: [PATCH 2/4] style: normalize Rust toolchain line endings --- rust-toolchain.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index bd8358a..58eef2c 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ -[toolchain] -channel = "1.99.1" -profile = "minimal" -components = ["rustfmt", "clippy"] +[toolchain] +channel = "1.99.1" +profile = "minimal" +components = ["rustfmt", "clippy"] From b6d20603c06ce244f497c61ba42ea4d2120988b5 Mon Sep 17 00:00:00 2001 From: TimLai666 Date: Thu, 29 Oct 2026 19:00:49 +0800 Subject: [PATCH 3/4] test: isolate Windows builder fixtures from system executables --- crates/chefer-cli/tests/dockerfile_builder_e2e.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/crates/chefer-cli/tests/dockerfile_builder_e2e.rs b/crates/chefer-cli/tests/dockerfile_builder_e2e.rs index c9e0b87..04d66d0 100644 --- a/crates/chefer-cli/tests/dockerfile_builder_e2e.rs +++ b/crates/chefer-cli/tests/dockerfile_builder_e2e.rs @@ -36,6 +36,7 @@ fn fake_builder() -> &'static Path { std::fs::write(&src, r#" use std::{env, fs::{self, OpenOptions}, io::Write, process}; fn main() { + if !env::current_exe().unwrap().with_extension("enabled").is_file() { process::exit(127); } let mut args: Vec = env::args().skip(1).collect(); let tool = env::current_exe().unwrap().file_stem().unwrap().to_string_lossy().into_owned(); let mut record = vec![tool]; record.extend(args.clone()); @@ -78,13 +79,19 @@ impl Fixture { let dir = tempfile::tempdir().unwrap(); let tools = dir.path().join("tools"); std::fs::create_dir(&tools).unwrap(); - for tool in builders { + // Windows searches the CLI directory before inherited PATH and System32 can contain Docker. + // Shadow every builder there; disabled stubs fail before logging any calls. + std::fs::copy(env!("CARGO_BIN_EXE_chefer-cli"), tools.join("chefer-cli.exe")).unwrap(); + for tool in ["docker", "podman", "nerdctl", "wslc", "container"] { std::fs::copy( fake_builder().join("builder.exe"), tools.join(format!("{tool}.exe")), ) .unwrap(); } + for tool in builders { + std::fs::write(tools.join(format!("{tool}.enabled")), b"").unwrap(); + } let ctx = dir.path().join("context with spaces"); std::fs::create_dir(&ctx).unwrap(); std::fs::write(ctx.join("Dockerfile"), "FROM scratch\n").unwrap(); @@ -128,7 +135,7 @@ impl Fixture { Self { dir, tools, log } } fn command(&self) -> Command { - let mut cmd = Command::new(env!("CARGO_BIN_EXE_chefer-cli")); + let mut cmd = Command::new(self.tools.join("chefer-cli.exe")); cmd.current_dir(self.dir.path()) .env("PATH", &self.tools) .env_remove("CHEFER_DOCKERFILE_BUILDER") From a633878e776b48cb975b2ed2b18ebc96343a87fa Mon Sep 17 00:00:00 2001 From: TimLai666 Date: Thu, 29 Oct 2026 19:01:11 +0800 Subject: [PATCH 4/4] style: format Windows builder fixture setup --- crates/chefer-cli/tests/dockerfile_builder_e2e.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crates/chefer-cli/tests/dockerfile_builder_e2e.rs b/crates/chefer-cli/tests/dockerfile_builder_e2e.rs index 04d66d0..eb36666 100644 --- a/crates/chefer-cli/tests/dockerfile_builder_e2e.rs +++ b/crates/chefer-cli/tests/dockerfile_builder_e2e.rs @@ -81,7 +81,11 @@ impl Fixture { std::fs::create_dir(&tools).unwrap(); // Windows searches the CLI directory before inherited PATH and System32 can contain Docker. // Shadow every builder there; disabled stubs fail before logging any calls. - std::fs::copy(env!("CARGO_BIN_EXE_chefer-cli"), tools.join("chefer-cli.exe")).unwrap(); + std::fs::copy( + env!("CARGO_BIN_EXE_chefer-cli"), + tools.join("chefer-cli.exe"), + ) + .unwrap(); for tool in ["docker", "podman", "nerdctl", "wslc", "container"] { std::fs::copy( fake_builder().join("builder.exe"),