mirror of
https://github.com/software-mansion/argent.git
synced 2026-09-14 19:27:14 +08:00
7400179b5b
## What Makes Argent run on Windows. iOS Simulator is macOS-only (Apple), so on Windows that means the **Android + Chromium** host control plane. The blocker was twofold: (1) no Windows `simulator-server` binary, and (2) POSIX-only assumptions in the tool-server. Companion radon PR builds the binary and runs the Android emulator E2E on Windows: software-mansion/radon#134. ## Changes **Windows-aware tool-server / resolver / bundling** - New shared `commandOnPath()` helper — `where` on Windows, `command -v` via `/bin/sh` on POSIX. `android-binary`, `check-deps`, and `vega-cli` previously hardcoded `/bin/sh`, which never matches on Windows. - `android-binary`: append `.exe` to `adb`/`emulator` in the `$ANDROID_HOME` fallback; probe `%LOCALAPPDATA%\Android\Sdk` (Android Studio's Windows default). - simulator-server resolver + dispatcher + `bundle-tools` + `download-simulator-server.sh`: ship and resolve `simulator-server.exe` on `win32` (new `simulatorServerBinaryName()`), add `win32` to the bundled host keys, add the `simulator-server-argent-windows.exe` download target with PE arch validation. - `stop-metro`: resolve listening PIDs via `netstat -ano` on Windows (`lsof` is POSIX-only and threw ENOENT). - `adb.ts`: AVD root resolution used `$HOME` + `startsWith("/")` (rejects `C:\…`); now `os.homedir()` + `path.isAbsolute()`. - **`boot-device`**: the emulator was spawned `detached` with `stdio:"ignore"`; on Windows a detached emulator with NUL stdout/stderr never reaches `sys.boot_completed` (verified on `windows-latest`: the identical flag set boots fine with real handles, hangs with NUL). Redirect the detached emulator's output to a temp log file on win32. POSIX keeps `"ignore"`. **Tests** — cross-platform unit coverage for `commandOnPath` (both branches), win32 `.exe` Android resolution, win32 `.exe` simulator-server resolution, and a win32 AVD drive-path case; dep-gate tests now mock at the `commandOnPath` boundary so they're platform-agnostic. **CI** — `windows-e2e.yml` (`windows-chromium` on `windows-latest`): runs the resolver/dep unit tests natively on Windows, confirms `adb.exe` resolution via the SDK root, then drives a **real headless Chrome over CDP** through the tool-server (discover → screenshot → describe → tap → observe the DOM mutation). Flow in `scripts/ci/windows-chromium-e2e.mjs` (also runnable locally / in Docker). The `simulator-server.exe` build + the full **Android-emulator E2E on Windows** live in radon CI (the binary's source is the private radon repo). ## Verification (all green) - **Chromium control plane on real Windows** (`windows-latest`): `✓ discovered chromium-cdp-9222 → ✓ screenshot → ✓ describe → ✓ gesture-tap → ✓ DOM mutation observed`. Resolver/dep unit tests run natively; `adb.exe` resolves via the SDK root (it's *not* on PATH on the runner — the gap the resolver closes). - **Android emulator on real Windows** (radon#134, `windows-latest` / WHPX): the real Argent path — `boot-device` → `{ booted: true }` → screenshot via `simulator-server.exe` → gesture-tap — all green. (The boot-device fix above is what makes the detached emulator reach `boot_completed`.) - **Local clean-room E2E**: the Chromium flow runs green in a headless Linux Docker container (fresh `npm ci`, no host pollution). - **No regressions**: full tool-server suite (1624) + native-devtools-ios (16); ESLint/Prettier/typecheck clean; **Wayland E2E** (Linux AVD boot) and **Vega VVD E2E** still pass (they exercise the changed `adb.ts` / `boot-device.ts` / `vega-cli.ts` paths). ## Notes Android-emulator E2E needs WHPX nested virtualization — confirmed available on the current hosted `windows-latest` image (Server 2025); the emulator boots hardware-accelerated in ~3 min. --------- Co-authored-by: Ignacy Łątka <claude-hubert.gancarczyk@swmansion.com> Co-authored-by: Ignacy Łątka <latekvo@users.noreply.github.com>
59 lines
2.6 KiB
TypeScript
59 lines
2.6 KiB
TypeScript
// resolveAvdPath reads `path=` out of an AVD's `<name>.ini`. It now parses the
|
|
// file with the `ini` package instead of a `^path=…$`-anchored regex. This
|
|
// covers a real failure mode of the old regex: a quoted value (the captured
|
|
// string kept its surrounding quotes, so the `startsWith("/")` guard rejected
|
|
// an otherwise-valid absolute path).
|
|
|
|
import { describe, it, expect, afterEach } from "vitest";
|
|
import * as os from "node:os";
|
|
import * as fs from "node:fs/promises";
|
|
import * as path from "node:path";
|
|
import { resolveAvdPath } from "../src/utils/adb";
|
|
|
|
const prevAvdHome = process.env.ANDROID_AVD_HOME;
|
|
const created: string[] = [];
|
|
|
|
afterEach(async () => {
|
|
if (prevAvdHome === undefined) delete process.env.ANDROID_AVD_HOME;
|
|
else process.env.ANDROID_AVD_HOME = prevAvdHome;
|
|
await Promise.all(created.splice(0).map((d) => fs.rm(d, { recursive: true, force: true })));
|
|
});
|
|
|
|
async function avdHomeWith(iniName: string, iniBody: string): Promise<string> {
|
|
const dir = await fs.mkdtemp(path.join(os.tmpdir(), "argent-avd-"));
|
|
created.push(dir);
|
|
await fs.writeFile(path.join(dir, iniName), iniBody);
|
|
process.env.ANDROID_AVD_HOME = dir;
|
|
return dir;
|
|
}
|
|
|
|
describe("resolveAvdPath", () => {
|
|
it("reads a plain absolute path", async () => {
|
|
await avdHomeWith("Pixel.ini", "target=android-34\npath=/data/avd/Pixel.avd\n");
|
|
expect(await resolveAvdPath("Pixel")).toBe("/data/avd/Pixel.avd");
|
|
});
|
|
|
|
it("reads a quoted path containing spaces (the regex kept the quotes and rejected it)", async () => {
|
|
await avdHomeWith(
|
|
"MyAvd.ini",
|
|
'target=android-34\npath = "/Users/My Name/.android/avd/MyAvd.avd"\n'
|
|
);
|
|
expect(await resolveAvdPath("MyAvd")).toBe("/Users/My Name/.android/avd/MyAvd.avd");
|
|
});
|
|
|
|
it("returns null when no <name>.ini exists in any root", async () => {
|
|
await avdHomeWith("Other.ini", "path=/data/avd/Other.avd\n");
|
|
expect(await resolveAvdPath("Missing")).toBeNull();
|
|
});
|
|
|
|
// Windows-only: a drive-absolute path must be accepted. The previous
|
|
// startsWith("/") guard rejected `C:/…`, so on Windows resolveAvdPath always
|
|
// returned null and the snapshot pre-check silently fell back to cold boot.
|
|
// isAbsolute() (win32) accepts it. Skipped off Windows because `C:/…` is not
|
|
// absolute under POSIX path semantics, which is the correct host behaviour.
|
|
it.skipIf(process.platform !== "win32")("accepts a Windows drive-absolute path", async () => {
|
|
await avdHomeWith("Win.ini", "path=C:/Users/ci/.android/avd/Win.avd\n");
|
|
expect(await resolveAvdPath("Win")).toBe("C:/Users/ci/.android/avd/Win.avd");
|
|
});
|
|
});
|