chore: linting

2026-08-04 18:28:42 +02:00 · 2026-07-31 20:45:45 +04:00
parent 1f1878239d
commit 1e2c41d4a7
12 changed files with 340 additions and 164 deletions
@@ -1,6 +1,7 @@
 # Donut Browser native E2E tests

-These tests exercise the actual Tauri application through a sibling native test driver. They do
+These tests exercise the actual Tauri application through the published
+[`tauri-wd`](https://crates.io/crates/tauri-wd) native test driver. They do
 not replace Rust or React unit tests; they
 cover the process boundaries those tests cannot: WKWebView/WebView2/WebKitGTK UI, Tauri invokes,
 REST and MCP servers, two-device sync, S3 payload encryption, Wayfern, CDP, and child-process
@@ -8,15 +9,9 @@ cleanup.

 ## Local setup

-Place both repositories beside each other:
-
-```text
-Code/
-├── donutbrowser/
-└── <test-driver-checkout>/
-```
-
-Install Donut dependencies with `pnpm install`. The browser suite also needs
+Install Donut dependencies with `pnpm install`. The runner installs the driver itself with
+`cargo install`, so a working Rust toolchain is the only extra requirement. The browser suite also
+needs
 `WAYFERN_TEST_TOKEN`. The runner reads it from the environment or Donut's ignored `.env` without
 printing it. When a local browser fixture is configured, the runner copies it into the test data
 root (using an isolated APFS clone on macOS); otherwise the browser suite downloads the current
@@ -42,10 +37,13 @@ pnpm e2e:sync
 pnpm e2e:browser
 ```

-Run everything with `pnpm e2e`. A normal run builds the Next frontend, `donut-proxy`, the
-private harness in `e2e/app`, and `tauri-wd`. The harness enables Donut's `e2e` feature and injects
-the sibling WebDriver plugin without making the production crate depend on a private filesystem
-path. Add `--no-build` to `node e2e/run.mjs --suite=<name>` only when all four outputs are current.
+Run everything with `pnpm e2e`. A normal run builds the Next frontend, `donut-proxy`, and the
+harness in `e2e/app`, then installs the `tauri-wd` CLI into the ignored `e2e/.driver` root when the
+version pinned by `e2e/app/Cargo.lock` is not already there. The harness enables Donut's `e2e`
+feature and injects the WebDriver plugin so the production crate never depends on it. Both the
+plugin and the CLI come from the same pinned crates.io release, so they cannot drift apart. Bump
+the pin in `e2e/app/Cargo.toml` to move to a newer driver. Add `--no-build` to
+`node e2e/run.mjs --suite=<name>` only when all four outputs are current.
 `DONUT_E2E_KEEP_ARTIFACTS=1` retains successful local runs; failed runs are always retained and
 their location is printed. Raw screenshots, captured HTML, logs, and isolated app state stay local.
 The runner also creates a text-only `diagnostics/` directory whose logs are redacted and checked
@@ -87,7 +85,7 @@ requests. Pushes to `main`, weekly schedules, and manual runs execute the full m
 including MinIO-backed sync and real Wayfern automation, plus a Linux/Docker job for residential
 proxy and local WireGuard browser traffic.

-CI needs a `TAURI_WEBDRIVER_TOKEN` secret with read-only access and a
-`TAURI_WEBDRIVER_REPOSITORY` repository variable identifying the test-driver checkout. The full
-job also requires the `WAYFERN_TEST_TOKEN` secret. The network job requires that secret plus
+Every job restores the compiled driver from an `actions/cache` entry keyed by `e2e/app/Cargo.lock`,
+the same file the runner reads the version from, so only a driver bump pays for a rebuild. The full job requires the
+`WAYFERN_TEST_TOKEN` secret. The network job requires that secret plus
 `RESIDENTIAL_PROXY_URL_ONE_HTTP` and `RESIDENTIAL_PROXY_URL_ONE_SOCKS`.
@@ -1131,9 +1131,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.6.1"
+version = "4.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
+checksum = "d91e0c145792ef73a6ad36d27c75ac09f1832222a3c209689d90f534685ee5b7"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -1141,9 +1141,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.6.0"
+version = "4.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
+checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b"
 dependencies = [
 "anstream",
 "anstyle",
@@ -1153,14 +1153,14 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.6.1"
+version = "4.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
+checksum = "d012d2b9d65aca7f18f4d9878a045bc17899bba951561ba5ec3c2ba1eed9a061"
 dependencies = [
 "heck 0.5.0",
 "proc-macro2",
 "quote",
- "syn 2.0.118",
+ "syn 3.0.3",
 ]

 [[package]]
@@ -2370,9 +2370,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+checksum = "262590f4fe6afeb0bc83be1daa64e52657fe185690a958af7f3ad0e92085c5ae"
 dependencies = [
 "futures-core",
 "futures-sink",
@@ -2380,9 +2380,9 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7"

 [[package]]
 name = "futures-executor"
@@ -2397,9 +2397,9 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+checksum = "4577ecaa3c4f96589d473f679a71b596316f6641bc350038b962a5daf0085d7a"

 [[package]]
 name = "futures-lite"
@@ -2416,9 +2416,9 @@ dependencies = [

 [[package]]
 name = "futures-macro"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2427,21 +2427,21 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307"

 [[package]]
 name = "futures-task"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109"

 [[package]]
 name = "futures-util"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -3819,6 +3819,15 @@ dependencies = [
 "web_atoms",
 ]

+[[package]]
+name = "matchers"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+dependencies = [
+ "regex-automata",
+]
+
 [[package]]
 name = "matchit"
 version = "0.8.4"
@@ -4066,6 +4075,15 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "nu-ansi-term"
+version = "0.50.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.8"
@@ -4950,6 +4968,19 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "process-wrap"
+version = "9.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e842efad9119158434d193c6682e2ebee4b44d6ad801d7b349623b3f57cdf55"
+dependencies = [
+ "futures",
+ "indexmap 2.14.0",
+ "nix",
+ "tokio",
+ "windows 0.62.2",
+]
+
 [[package]]
 name = "profiling"
 version = "1.0.18"
@@ -6019,6 +6050,15 @@ dependencies = [
 "sha1",
 ]

+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "shared_child"
 version = "1.1.1"
@@ -6327,6 +6367,17 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "syn"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -6907,13 +6958,17 @@ dependencies = [

 [[package]]
 name = "tauri-wd"
-version = "0.1.0"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "535cd782aac407a0bbf593013306e89e821017e3862ddd7b36925aa80a29e649"
 dependencies = [
 "async-trait",
 "axum",
 "base64 0.23.0",
 "block2",
 "cairo-rs",
+ "clap",
+ "futures-util",
 "glib 0.21.5",
 "gtk",
 "image",
@@ -6922,13 +6977,17 @@ dependencies = [
 "objc2-app-kit",
 "objc2-foundation",
 "objc2-web-kit",
+ "process-wrap",
+ "reqwest",
 "serde",
 "serde_json",
 "tauri",
 "tauri-plugin",
 "tempfile",
+ "thiserror 2.0.18",
 "tokio",
 "tracing",
+ "tracing-subscriber",
 "uuid",
 "webkit2gtk",
 "webview2-com",
@@ -7009,6 +7068,15 @@ dependencies = [
 "syn 2.0.118",
 ]

+[[package]]
+name = "thread_local"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "tiff"
 version = "0.11.3"
@@ -7418,6 +7486,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 dependencies = [
 "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-serde"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1"
+dependencies = [
+ "serde",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex-automata",
+ "serde",
+ "serde_json",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+ "tracing-serde",
 ]

 [[package]]
@@ -7789,6 +7900,12 @@ dependencies = [
 "wasm-bindgen",
 ]

+[[package]]
+name = "valuable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+
 [[package]]
 name = "value-bag"
 version = "1.12.0"
@@ -6,4 +6,4 @@ publish = false

 [dependencies]
 donutbrowser-lib = { package = "donutbrowser", path = "../../src-tauri", features = ["e2e"] }
-tauri-wd = { path = "../../../tauri-wd/crates/tauri-wd" }
+tauri-wd = "=0.1.11"
@@ -5,6 +5,7 @@ import {
  createReadStream,
  createWriteStream,
  existsSync,
+  readFileSync,
  statSync,
 } from "node:fs";
 import {
@@ -28,21 +29,19 @@ import { createSafeDiagnostics } from "./lib/diagnostics.mjs";

 const dirname = path.dirname(fileURLToPath(import.meta.url));
 const projectRoot = path.resolve(dirname, "..");
-const webdriverRoot = path.resolve(projectRoot, "../tauri-wd");
 const isWindows = process.platform === "win32";
 const executableSuffix = isWindows ? ".exe" : "";
+const appManifestDir = path.join(projectRoot, "e2e", "app");
 const appBinary = path.join(
-  projectRoot,
-  "e2e",
-  "app",
+  appManifestDir,
  "target",
  "debug",
  `donutbrowser-e2e${executableSuffix}`,
 );
+const driverRoot = path.join(projectRoot, "e2e", ".driver");
 const driverBinary = path.join(
-  webdriverRoot,
-  "target",
-  "debug",
+  driverRoot,
+  "bin",
  `tauri-wd${executableSuffix}`,
 );

@@ -238,10 +237,55 @@ async function loadLocalValues(names) {
  return values;
 }

-function buildAll() {
-  if (!existsSync(webdriverRoot)) {
-    throw new Error(`Missing sibling webdriver repository: ${webdriverRoot}`);
+function lockedDriverVersion() {
+  const lockfile = readFileSync(
+    path.join(appManifestDir, "Cargo.lock"),
+    "utf8",
+  );
+  const match = lockfile.match(
+    /\[\[package\]\]\s*\nname = "tauri-wd"\s*\nversion = "([^"]+)"/,
+  );
+  if (!match) {
+    throw new Error("e2e/app/Cargo.lock does not resolve a tauri-wd version");
  }
+  return match[1];
+}
+
+function installedDriverVersion() {
+  if (!existsSync(driverBinary)) {
+    return null;
+  }
+  const result = spawnSync(driverBinary, ["--version"], { encoding: "utf8" });
+  if (result.status !== 0) {
+    return null;
+  }
+  return result.stdout.trim().split(/\s+/).pop() ?? null;
+}
+
+function ensureDriver() {
+  const version = lockedDriverVersion();
+  if (installedDriverVersion() === version) {
+    log(`tauri-wd ${version} already installed at ${driverBinary}`);
+    return;
+  }
+  run(
+    "cargo",
+    [
+      "install",
+      "tauri-wd",
+      "--version",
+      version,
+      "--locked",
+      "--debug",
+      "--force",
+      "--root",
+      driverRoot,
+    ],
+    projectRoot,
+  );
+}
+
+function buildAll() {
  run("pnpm", ["build"], projectRoot);
  run("pnpm", ["copy-proxy-binary"], projectRoot);
  run(process.execPath, ["src-tauri/download-xray.mjs"], projectRoot);
@@ -250,11 +294,7 @@ function buildAll() {
    ["build", "--locked", "--manifest-path", "e2e/app/Cargo.toml"],
    projectRoot,
  );
-  run(
-    "cargo",
-    ["build", "--package", "tauri-cross-platform-webdriver"],
-    webdriverRoot,
-  );
+  ensureDriver();
 }

 function startFixtureServer(geoIpFixture) {
@@ -866,7 +906,7 @@ async function main() {
        options.verbose ? "debug" : "info",
      ],
      {
-        cwd: webdriverRoot,
+        cwd: projectRoot,
        env: process.env,
        runRoot,
        verbose: options.verbose,
@@ -928,7 +968,6 @@ async function main() {
        ...process.env,
        DONUT_E2E_RUN_ROOT: runRoot,
        DONUT_E2E_PROJECT_ROOT: projectRoot,
-        DONUT_E2E_WEBDRIVER_ROOT: webdriverRoot,
        DONUT_E2E_APP: appBinary,
        DONUT_E2E_DRIVER_URL: `http://127.0.0.1:${driverPort}`,
        DONUT_E2E_FIXTURE_URL: `http://127.0.0.1:${fixture.port}`,