stim 1.8.0 → 1.9.0

package/dist/{android-DWssqHQ8.mjs → android-_y4Ohi5z.mjs}

@@ -1,9 +1,9 @@
-import { t as getExecutor } from "./exec-B29XNuhP.mjs";
-import { i as pidExists, o as signalProcessTree } from "./metro-C7bcJ0uo.mjs";
-import { c as androidDataPartitionSizeBytes } from "./settings-BXXorVM2.mjs";
+import { t as getExecutor } from "./exec-jIAlgilk.mjs";
+import { a as pidExists, l as signalProcessTree } from "./metro-DrLHaMn2.mjs";
+import { s as androidDataPartitionSizeBytes } from "./settings-D030k0t4.mjs";
 import { existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "fs";
-import { homedir, tmpdir } from "os";
 import { dirname, isAbsolute, join, resolve } from "path";
+import { homedir, tmpdir } from "os";
 //#region src/devices/android.ts
 const ANDROID_ABIS = /* @__PURE__ */ new Set([
 	"armeabi-v7a",
@@ -199,9 +199,13 @@ function ownedAvdName(label) {
 	const clean = sanitizeAvdLabel(label);
 	return `stim-${clean.startsWith("stim-") ? clean.slice(5) : clean}`;
 }
+const AVDMANAGER_DELETE_TIMEOUT_MS = 12e4;
 function deleteAvd(avdName) {
 	if (!avdName?.startsWith("stim-")) throw new Error(`Refusing to delete AVD "${avdName}": not a Stim-owned AVD (name must start with "stim-").`);
-	getExecutor().run(`${androidTool("avdmanager")} delete avd -n "${avdName}"`);
+	getExecutor().run(`${androidTool("avdmanager")} delete avd -n "${avdName}"`, {
+		timeoutMs: AVDMANAGER_DELETE_TIMEOUT_MS,
+		killSignal: "SIGKILL"
+	});
 }
 function parseAvdList(text) {
 	return text.split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("INFO") && !l.startsWith("WARNING"));
@@ -662,6 +666,9 @@ function bootAndroidEmulator(avdName, consolePort, { logFile, platform = process
 		avdName,
 		"-port",
 		String(consolePort),
+		"-grpc",
+		String(consolePort + 3e3),
+		"-grpc-use-token",
 		...headlessEmulatorArgs(),
 		...suppressEmulatorCrashConsent({ platform })
 	], {
@@ -852,20 +859,52 @@ function waitForAndroidEmulatorShutdown(avdName, shutdown, { timeoutMs = ANDROID
 	}
 	if (!directoryExists(directory)) throw new Error(`Could not verify the content directory for owned AVD ${avdName} after shutdown.`);
 }
-function getAvdNameForSerial(serial, { timeoutMs } = {}) {
-	const out = getExecutor().runQuiet(`${androidTool("adb")} -s ${serial} emu avd name`, { timeoutMs });
+const EMU_AVD_NAME_TIMEOUT_MS = 1e4;
+function getAvdNameForSerial(serial, { timeoutMs = EMU_AVD_NAME_TIMEOUT_MS } = {}) {
+	const out = getExecutor().runQuiet(`${androidTool("adb")} -s ${serial} emu avd name`, {
+		timeoutMs: Math.min(timeoutMs, EMU_AVD_NAME_TIMEOUT_MS),
+		killSignal: "SIGKILL"
+	});
 	if (!out) return null;
 	return out.split("\n")[0]?.trim() || null;
 }
-function resolveOwnedAvdSerial(avdName, { timeoutMs } = {}) {
+function resolveOwnedAvdSerial(avdName, opts = {}) {
+	return ownedAvdSerialResolver(opts)(avdName);
+}
+function once(read) {
+	let result;
+	return () => {
+		if (!result) try {
+			result = { value: read() };
+		} catch (error) {
+			result = { error };
+		}
+		if ("error" in result) throw result.error;
+		return result.value;
+	};
+}
+/**
+* `resolveOwnedAvdSerial` for several AVDs against one reading of the AVD list, `adb devices`, and
+* each emulator's AVD name. The timeout budget starts when the resolver is created.
+*/
+function ownedAvdSerialResolver({ timeoutMs } = {}) {
 	const started = Date.now();
 	const remaining = () => ({ timeoutMs: timeoutMs === void 0 ? void 0 : Math.max(1, timeoutMs - (Date.now() - started)) });
-	if (!listAvds(remaining()).includes(avdName)) return { missing: true };
-	if (!avdName?.startsWith("stim-")) return { notOwned: true };
-	const adb = listAdbDevices(remaining());
-	const match = [...adb.emulators, ...adb.unhealthy.filter((entry) => entry.kind === "emulator" && entry.consolePort !== void 0)].find((e) => getAvdNameForSerial(e.serial, remaining()) === avdName);
-	if (match) return { serial: match.serial };
-	return { notRunning: true };
+	const avds = once(() => listAvds(remaining()));
+	const adb = once(() => listAdbDevices(remaining()));
+	const names = /* @__PURE__ */ new Map();
+	const avdNameOf = (serial) => {
+		if (!names.has(serial)) names.set(serial, getAvdNameForSerial(serial, remaining()));
+		return names.get(serial);
+	};
+	return (avdName) => {
+		if (!avds().includes(avdName)) return { missing: true };
+		if (!avdName?.startsWith("stim-")) return { notOwned: true };
+		const devices = adb();
+		const match = [...devices.emulators, ...devices.unhealthy.filter((entry) => entry.kind === "emulator" && entry.consolePort !== void 0)].find((e) => avdNameOf(e.serial) === avdName);
+		if (match) return { serial: match.serial };
+		return { notRunning: true };
+	};
 }
 //#endregion
-export { ownedAvdName as A, waitForBoot as B, listAvds as C, nextConsolePort as D, memoizeEmulatorProbe as E, resetAdoptedAvd as F, resolveOwnedAvdSerial as I, resolvePhysicalDevice as L, physicalDeviceModel as M, pickDefaultSystemImage as N, ownedAvdDirectory as O, probeEmulatorSerial as P, shutdownAndroidEmulator as R, listAdbDevices as S, listOrphanedAvdDirectories as T, emulatorFailureRemedy as _, androidPoolNoCandidatesRefusal as a, getAvdNameForSerial as b, assertOwnedAvdStopped as c, avdStorageRoots as d, bootAndroidEmulator as f, emulatorDiskSpaceRemedy as g, deleteAvd as h, androidPoolCandidates as i, ownedAvdSystemImage as j, ownedAvdMatchesConfiguration as k, avdPathExists as l, createOwnedAvd as m, androidDeviceAbi as n, androidSystemImageAbi as o, configureNewOwnedAvd as p, androidHome as r, androidToolCwd as s, androidBuildToolName as t, avdPoolConfiguration as u, extractEmulatorFailure as v, listInstalledSystemImages as w, hostSystemImageArch as x, findBuildTool as y, waitForAndroidEmulatorShutdown as z };
+export { ownedAvdMatchesConfiguration as A, shutdownAndroidEmulator as B, listAdbDevices as C, memoizeEmulatorProbe as D, listOrphanedAvdDirectories as E, pickDefaultSystemImage as F, waitForBoot as H, probeEmulatorSerial as I, resetAdoptedAvd as L, ownedAvdSerialResolver as M, ownedAvdSystemImage as N, nextConsolePort as O, physicalDeviceModel as P, resolveOwnedAvdSerial as R, hostSystemImageArch as S, listInstalledSystemImages as T, waitForAndroidEmulatorShutdown as V, emulatorDiskSpaceRemedy as _, androidPoolNoCandidatesRefusal as a, findBuildTool as b, androidToolPath as c, avdPoolConfiguration as d, avdStorageRoots as f, deleteAvd as g, createOwnedAvd as h, androidPoolCandidates as i, ownedAvdName as j, ownedAvdDirectory as k, assertOwnedAvdStopped as l, configureNewOwnedAvd as m, androidDeviceAbi as n, androidSystemImageAbi as o, bootAndroidEmulator as p, androidHome as r, androidToolCwd as s, androidBuildToolName as t, avdPathExists as u, emulatorFailureRemedy as v, listAvds as w, getAvdNameForSerial as x, extractEmulatorFailure as y, resolvePhysicalDevice as z };

package/dist/android-cas-compiler.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { t as getExecutor } from "./exec-jIAlgilk.mjs";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
-import { createHash, randomUUID } from "node:crypto";
 import { join } from "node:path";
+import { createHash, randomUUID } from "node:crypto";
 import { once } from "node:events";
 //#region bin/android-cas-compiler.ts
 const context = process.env.STIM_ANDROID_CAS_CONTEXT;

package/dist/{android-cas-SWIjzeuL.mjs → android-cas-eiExNLf7.mjs}

@@ -1,14 +1,15 @@
-import { t as getExecutor } from "./exec-B29XNuhP.mjs";
-import { D as withDirLock, u as getConfigDir } from "./config-B7iyKWkL.mjs";
-import { r as register } from "./cache-manifest-CYJi8-Hx.mjs";
-import { _ as workspaceLogsDir, c as ensureWorkspaceStorage, u as sharedCcache } from "./workspace-state-BT5E3SA2.mjs";
-import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Dl5uKE03.mjs";
-import { r as androidHome } from "./android-DWssqHQ8.mjs";
-import { l as phaseLine } from "./command-output-B3ycpsYv.mjs";
-import { d as startBuildHeartbeat, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B6YaWeg0.mjs";
+import { A as withDirLock, M as readJsonFile, j as isJsonObject, u as getConfigDir } from "./config-Cp9lM3wX.mjs";
+import { t as getExecutor } from "./exec-jIAlgilk.mjs";
+import { r as register } from "./cache-manifest-Dg7OnMrp.mjs";
+import { b as workspaceLogsDir, f as sharedCcache, u as ensureWorkspaceStorage } from "./workspace-state-DF2gCFhx.mjs";
+import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
+import { r as androidHome } from "./android-_y4Ohi5z.mjs";
+import { l as phaseLine } from "./command-output-gByVmIjy.mjs";
+import { n as spawnDeclared } from "./spawn-claims-Dn3C_N6w.mjs";
+import { d as startBuildHeartbeat, n as HEARTBEAT_INTERVAL_MS } from "./xcode-BZqyxh3e.mjs";
 import { accessSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, symlinkSync, writeFileSync } from "node:fs";
-import { createHash, randomUUID } from "node:crypto";
 import { dirname, isAbsolute, join, relative, sep } from "node:path";
+import { createHash, randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
 import chalk from "chalk";
 /** The ABI name a build for every ABI has to fit; `stim android` narrows a build to the device's. */
@@ -833,7 +834,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 	if (ccache) resetStatsLog(ccache.statsLog);
 	let child;
 	try {
-		child = spawn(project.gradlew, args, {
+		child = spawnDeclared(() => spawn(project.gradlew, args, {
 			cwd: project.androidDir,
 			stdio: [
 				"ignore",
@@ -848,7 +849,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 				TERM: "dumb",
 				FORCE_COLOR: "0"
 			}
-		});
+		}));
 	} catch (err) {
 		return spawnFailure(err, project, now() - startedAt);
 	}
@@ -994,10 +995,16 @@ function directory(path) {
 		return false;
 	}
 }
+function isAndroidCasToolchain(value) {
+	return CAS_TOOLCHAIN_FIELDS.every((field) => typeof value[field] === "string");
+}
 function readAndroidCasToolchain(manifest) {
-	const toolchain = JSON.parse(readFileSync(manifest, "utf8"));
-	const missing = CAS_TOOLCHAIN_FIELDS.filter((field) => typeof toolchain?.[field] !== "string");
-	if (missing.length > 0) throw new Error(`${manifest} declares no ${missing.join(", ")}.`);
+	const parsed = readJsonFile(manifest);
+	const toolchain = isJsonObject(parsed) ? parsed : {};
+	if (!isAndroidCasToolchain(toolchain)) {
+		const missing = CAS_TOOLCHAIN_FIELDS.filter((field) => typeof toolchain[field] !== "string");
+		throw new Error(`${manifest} declares no ${missing.join(", ")}.`);
+	}
 	const notExecutable = CAS_TOOLCHAIN_BINARIES.filter((field) => !executableFile(toolchain[field]));
 	if (notExecutable.length > 0) throw new Error(`${manifest} names no executable ${notExecutable.join(", ")}.`);
 	if (!directory(toolchain.resourceDir)) throw new Error(`${manifest} names resourceDir ${toolchain.resourceDir}, which is not a directory.`);