stim 1.20.2 → 1.22.0

package/dist/{browser-web-CA-F1GQo.mjs → browser-web-Bcv99PBM.mjs}

@@ -1,23 +1,26 @@
-import { p as getProject } from "./config-BYDxlMY3.mjs";
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { t as spawnEntry } from "./spawn-entry-Dcb7sDUz.mjs";
-import { a as SETTING_SHAPE_REMEDY, j as metroPortSetting, rt as webSettings } from "./settings-B717odTD.mjs";
-import { r as readWorkspaceState, w as workspaceLogsDir, x as workspaceDir } from "./workspace-state-DJt_MMvf.mjs";
-import { l as phaseLine } from "./command-output-BTy8hZ0F.mjs";
-import { _ as detectIsExpo, y as isPackageResolvable } from "./project-_phNIJfs.mjs";
-import { u as resolveProjectMetro } from "./metro-DnCEjCxs.mjs";
-import { P as resolveSupervisorTarget, _ as teardownBrowserHeld } from "./workspaces-C36s2jb9.mjs";
-import { a as withWorkspaceProcessLock, i as reserveBrowserPort, n as getNamedPort } from "./named-ports-4WopRPg-.mjs";
-import { t as cancellableSleep } from "./cancellation-C_22VQTH.mjs";
-import { s as readNdjsonGenerations } from "./ndjson-GOnbyvso.mjs";
-import { o as resolveWorkspaceMetroPort } from "./start-BWqzODpb.mjs";
-import { n as windowsLauncherArgs } from "./detached-entry-B9C_zeQC.mjs";
-import { d as webLogFile, o as readWebRecord, p as webSupervisorLogFile, s as updateWebRecord } from "./state-D1Icyjlu.mjs";
-import { c as readMetroRecords } from "./launch-verify-B6Q8hZP-.mjs";
-import { n as sendToOwnedPage, t as liveWebRecord } from "./page-DRHy329N.mjs";
-import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-BnzZMqsR.mjs";
-import { mkdirSync, openSync } from "node:fs";
+import { g as process_identity_exports, i as withWorkspaceProcessLock, r as WorkspaceProcessCleanupError, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { d as workspaceDir, m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
+import { p as getProject } from "./config-DlrsduwG.mjs";
+import { l as phaseLine } from "./command-output-gwpm28fu.mjs";
+import { d as cancelledError, f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
+import { r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
+import { a as SETTING_SHAPE_REMEDY, at as webSettings, j as metroPortSetting } from "./settings-C7O8A6ZI.mjs";
+import { b as isPackageResolvable, v as detectIsExpo } from "./project-wM_XFTvE.mjs";
+import { s as readNdjsonGenerations$1 } from "./ndjson-CgE_o3Dl.mjs";
+import { d as resolveProjectMetro } from "./metro-DiXtA3Ty.mjs";
+import { f as webLogFile, m as webSupervisorLogFile, o as readWebRecord, s as updateWebRecord } from "./state--smjFSTL.mjs";
+import { en as readMetroRecords } from "./budget-Cvwn54qV.mjs";
+import { E as teardownBrowserHeld, h as resolveSupervisorTarget } from "./workspaces-CpANmBlq.mjs";
+import { i as reserveBrowserPort, n as getNamedPort } from "./named-ports-DkEzOfzO.mjs";
+import { n as sendToOwnedPage, t as liveWebRecord } from "./page-DBL2PiUU.mjs";
+import { o as resolveWorkspaceMetroPort } from "./start-EojN4WFz.mjs";
+import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
+import { n as windowsLauncherArgs } from "./detached-entry-BwNEtIrP.mjs";
+import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-Bbw689-6.mjs";
 import { randomUUID } from "node:crypto";
+import { mkdirSync, openSync, statSync, watch } from "node:fs";
+import { ambientEnv } from "@stim-cli/core";
+import { followLogs } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/web/launch.ts
 const PORT_PLACEHOLDER = /\{port:([^}]*)\}/g;
@@ -139,7 +142,7 @@ function webLaunchRemedy(verdict, { url, template, usesMetro, serve }) {
 //#endregion
 //#region src/web/runtime.ts
 const REGISTER_WAIT_MS = 3e4;
-const POLL_MS$1 = 250;
+const POLL_MS = 250;
 function failure$1(code, message, remedy) {
 	return {
 		ok: false,
@@ -170,7 +173,7 @@ function startSupervisor(root, { url, port, config, launchId }) {
 	if (!config.headless) args.push("--headed");
 	if (config.viewport !== "desktop") args.push("--viewport", config.viewport);
 	if (config.ignoreCertificateErrors) args.push("--ignore-certificate-errors");
-	mkdirSync(workspaceLogsDir(root), { recursive: true });
+	mkdirSync(workspaceLogsDir$1(root), { recursive: true });
 	const logFile = webSupervisorLogFile(root);
 	if (process.platform === "win32") {
 		const launcher = windowsLauncherArgs({
@@ -183,7 +186,7 @@ function startSupervisor(root, { url, port, config, launchId }) {
 			cwd: root,
 			stdio: "ignore",
 			env: {
-				...process.env,
+				...ambientEnv(),
 				...launcher.env
 			},
 			windowsHide: true
@@ -196,34 +199,67 @@ function startSupervisor(root, { url, port, config, launchId }) {
 		stdio: [
 			"ignore",
 			fd,
-			fd
+			fd,
+			"ipc"
 		],
-		env: process.env
+		env: ambientEnv()
 	});
 	child.unref?.();
 	return child;
 }
-async function waitForSupervisor(root, child, launchId) {
-	let exited = false;
-	if (process.platform !== "win32") child.once("exit", () => {
-		exited = true;
-	});
+function waitForSupervisor(root, child, launchId, signal) {
 	const deadline = Date.now() + REGISTER_WAIT_MS;
-	while (Date.now() < deadline) {
-		const record = readWebRecord(root);
-		if (record?.launchId === launchId && record.targetId) return record;
-		if (exited) return null;
-		await cancellableSleep(POLL_MS$1);
-	}
-	return null;
+	return new Promise((resolve) => {
+		let settled = false;
+		let repairTimer;
+		const finish = (record) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(repairTimer);
+			clearTimeout(deadlineTimer);
+			child.removeListener("message", onMessage);
+			child.removeListener("exit", onExit);
+			child.removeListener("error", onExit);
+			child.removeListener("disconnect", check);
+			signal?.removeEventListener("abort", check);
+			resolve(record);
+		};
+		const check = () => {
+			if (settled) return;
+			if (Date.now() >= deadline) return finish(null);
+			const record = readWebRecord(root);
+			if (record?.launchId === launchId && (record.targetId || signal?.aborted)) return finish(record);
+			if (process.platform !== "win32" && (child.exitCode !== null || child.signalCode !== null)) finish(null);
+		};
+		const onExit = () => {
+			check();
+			finish(null);
+		};
+		const onMessage = (message) => {
+			if (message === "web-registered") check();
+		};
+		const repair = () => {
+			check();
+			if (!settled) repairTimer = setTimeout(repair, process.platform === "win32" ? POLL_MS : 1e3);
+		};
+		const deadlineTimer = setTimeout(() => finish(null), REGISTER_WAIT_MS);
+		child.on("message", onMessage);
+		if (process.platform !== "win32") child.once("exit", onExit);
+		child.once("error", onExit);
+		child.once("disconnect", check);
+		signal?.addEventListener("abort", check);
+		check();
+		if (!settled) repairTimer = setTimeout(repair, process.platform === "win32" ? POLL_MS : 1e3);
+	});
 }
-async function launchOwnedBrowser({ url, config }, { root, note }) {
-	return withWorkspaceProcessLock(workspaceDir(root), "web", async () => {
+async function launchOwnedBrowser({ url, config }, { root, note, signal }) {
+	return withWorkspaceProcessLock(workspaceDir(root), "web", async (claim) => {
+		throwIfCancelled(signal, "browser launch");
 		const live = liveWebRecord(readWebRecord(root));
 		if (live && sameLaunch(live, config)) {
 			const since = Date.now();
 			try {
-				await sendToOwnedPage(live, "Page.navigate", { url });
+				await sendToOwnedPage(live, "Page.navigate", { url }, signal);
 				updateWebRecord(root, live, { url });
 				note(chalk.dim(phaseLine("device", `reusing the owned Chrome (pid ${live.chromeProcess?.pid})`)));
 				return {
@@ -236,21 +272,53 @@ async function launchOwnedBrowser({ url, config }, { root, note }) {
 					reused: true
 				};
 			} catch (error) {
+				throwIfCancelled(signal, "browser launch");
 				note(chalk.dim(phaseLine("device", `restarting the owned Chrome: ${error.message}`)));
 			}
 		}
+		throwIfCancelled(signal, "browser launch");
 		const stopped = await teardownBrowserHeld(root);
 		if (stopped.status === "failed" || stopped.status === "skipped") return failure$1("STIM_WEB_BROWSER_HELD", `The previous owned Chrome could not be stopped: ${stopped.reason ?? "unknown reason"}.`, "Run `stim status` and `stim guide errors teardown`.");
+		throwIfCancelled(signal, "browser launch");
 		const port = await reserveBrowserPort(root);
 		const since = Date.now();
 		note(chalk.dim(phaseLine("device", `starting ${config.headless ? "headless " : ""}Chrome on DevTools port ${port}`)));
 		const launchId = randomUUID();
-		const record = await waitForSupervisor(root, startSupervisor(root, {
-			url,
-			port,
-			config,
-			launchId
-		}), launchId);
+		throwIfCancelled(signal, "browser launch");
+		(0, ownership_claim_exports.markClaimChildPending)(claim);
+		let child;
+		try {
+			child = startSupervisor(root, {
+				url,
+				port,
+				config,
+				launchId
+			});
+		} catch (error) {
+			(0, ownership_claim_exports.clearClaimChild)(claim);
+			throw error;
+		}
+		let record;
+		try {
+			const captured = child.pid === void 0 ? null : (0, process_identity_exports.captureProcessIdentity)(child.pid);
+			if (captured?.ok) try {
+				(0, ownership_claim_exports.setClaimChild)(claim, {
+					pid: child.pid,
+					processToken: captured.token
+				});
+			} catch {
+				throw new WorkspaceProcessCleanupError([claim], "The browser supervisor could not be recorded.", "Run `stim stop`.");
+			}
+			record = await waitForSupervisor(root, child, launchId, signal);
+		} finally {
+			if (child.connected) child.disconnect();
+		}
+		if (signal?.aborted) {
+			const cleanup = record ? await teardownBrowserHeld(root) : null;
+			if (!cleanup || cleanup.status === "failed" || cleanup.status === "skipped") throw new WorkspaceProcessCleanupError([claim], "The cancelled browser launch could not be stopped.", "Run `stim stop`.");
+			(0, ownership_claim_exports.clearClaimChild)(claim);
+			throwIfCancelled(signal, "browser launch");
+		}
 		if (!record) return failure$1("STIM_WEB_LAUNCH_FAILED", "The owned Chrome did not start.", `Read ${webSupervisorLogFile(root)} and \`stim logs --errors\`, then run \`stim web\` again.`);
 		return {
 			ok: true,
@@ -260,12 +328,86 @@ async function launchOwnedBrowser({ url, config }, { root, note }) {
 		};
 	}, {
 		external: true,
-		ownerPurpose: "stim web"
+		ownerPurpose: "stim web",
+		signal
 	});
 }
 //#endregion
 //#region src/integrations/browser-web.ts
-const POLL_MS = 250;
+async function verifyLaunch(root, since, expectBundle, signal) {
+	signal?.throwIfAborted();
+	const startedAt = Date.now();
+	let stop;
+	let fileWatch;
+	let timer;
+	let queued;
+	let onAbort;
+	try {
+		return await new Promise((resolve, reject) => {
+			const schedule = () => {
+				queued ??= setImmediate(check);
+			};
+			const watchFile = () => {
+				try {
+					const file = webLogFile(root);
+					const stat = statSync(file);
+					if (fileWatch?.dev === stat.dev && fileWatch.ino === stat.ino) return;
+					fileWatch?.watcher.close();
+					fileWatch = void 0;
+					const watcher = watch(file, { persistent: false }, schedule);
+					fileWatch = {
+						watcher,
+						dev: stat.dev,
+						ino: stat.ino
+					};
+					const lost = () => {
+						if (fileWatch?.watcher === watcher) fileWatch = void 0;
+						watcher.close();
+					};
+					watcher.once("error", lost);
+					watcher.once("close", lost);
+				} catch {
+					fileWatch?.watcher.close();
+					fileWatch = void 0;
+				}
+			};
+			const check = () => {
+				clearImmediate(queued);
+				queued = void 0;
+				clearTimeout(timer);
+				try {
+					signal?.throwIfAborted();
+					watchFile();
+					const elapsedMs = Date.now() - startedAt;
+					const measured = webLaunchVerdict({
+						records: readNdjsonGenerations$1(webLogFile(root)),
+						metroRecords: expectBundle ? readMetroRecords(workspaceLogsDir$1(root)) : [],
+						since,
+						expectBundle,
+						elapsedMs
+					});
+					if (measured) resolve(measured);
+					else timer = setTimeout(check, Math.max(0, (elapsedMs < 2e4 ? VERIFY_WAIT_MS : LOADING_WAIT_MS) - elapsedMs));
+				} catch (error) {
+					reject(error);
+				}
+			};
+			stop = followLogs({
+				dir: workspaceLogsDir$1(root),
+				onRecord: schedule
+			});
+			onAbort = () => reject(cancelledError("wait"));
+			signal?.addEventListener("abort", onAbort, { once: true });
+			check();
+		});
+	} finally {
+		stop?.();
+		fileWatch?.watcher.close();
+		clearTimeout(timer);
+		clearImmediate(queued);
+		if (onAbort) signal?.removeEventListener("abort", onAbort);
+	}
+}
 function failure(code, message, remedy) {
 	return {
 		ok: false,
@@ -277,13 +419,13 @@ function failure(code, message, remedy) {
 	};
 }
 function browserWebProject(root) {
-	return { runtime: ({ settings, headed, note }) => ({
+	return { runtime: ({ settings, headed, note, context }) => ({
 		async prepare() {
 			const web = webSettings(settings);
 			const usesMetro = web.url === null || web.url.includes("{port:metro}");
-			const pin = usesMetro ? metroPortSetting(settings) : null;
+			const pin = usesMetro ? metroPortSetting(settings, context?.env) : null;
 			if (pin?.error) return failure("STIM_BAD_ARG", pin.error, SETTING_SHAPE_REMEDY);
-			const chrome = findChrome();
+			const chrome = findChrome({ env: context?.env });
 			if (!chrome) return failure("STIM_WEB_NO_CHROME", "Google Chrome or Chromium is not installed.", CHROME_INSTALL_REMEDY);
 			if (web.url === null && !detectIsExpo(root)) return failure("STIM_WEB_NO_URL", "This is not an Expo app, so Stim does not know which page to open.", "Start your web dev server on a named port, then set the page: `stim settings set web.url 'http://localhost:{port:web}/' --scope workspace`. See `stim guide web`.");
 			if (web.url === null && !isPackageResolvable(root, "react-native-web")) return failure("STIM_WEB_DEPS_MISSING", "This Expo app cannot render on the web: react-native-web is not installed.", `Run \`${EXPO_WEB_DEPENDENCIES}\` and \`stim start\`, then run \`stim web\` again.`);
@@ -295,7 +437,7 @@ function browserWebProject(root) {
 			}
 			const metro = usesMetro && metroPort !== null ? await resolveProjectMetro(metroPort, root) : null;
 			const supervisor = resolveSupervisorTarget({
-				state: readWorkspaceState(root)?.supervisor,
+				state: readWorkspaceState$1(root)?.supervisor,
 				record: getProject(root)?.supervisor,
 				reservedPort: metroPort
 			});
@@ -336,19 +478,7 @@ function browserWebProject(root) {
 		},
 		launch: launchOwnedBrowser,
 		async verify({ url, verification: { template, expectBundle, serve, foreign } }, { since }) {
-			const startedAt = Date.now();
-			let measured;
-			for (;;) {
-				measured = webLaunchVerdict({
-					records: readNdjsonGenerations(webLogFile(root)),
-					metroRecords: expectBundle ? readMetroRecords(workspaceLogsDir(root)) : [],
-					since,
-					expectBundle,
-					elapsedMs: Date.now() - startedAt
-				});
-				if (measured) break;
-				await cancellableSleep(POLL_MS);
-			}
+			const measured = await verifyLaunch(root, since, expectBundle, context?.signal);
 			const verdict = foreign ? {
 				launched: "unverified",
 				kind: "no-response",