stim 1.9.0 → 1.10.0

package/dist/{android-_y4Ohi5z.mjs → android-787HhP5w.mjs}

@@ -1,9 +1,68 @@
-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 { u as getConfigDir } from "./config-BEq0Qw_a.mjs";
+import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
+import { P as withDirLock, c as signalProcessTree, i as pidExists } from "./metro-BWLOJ_Wr.mjs";
+import { c as androidDataPartitionSizeBytes } from "./settings-DOugPlPz.mjs";
+import { mkdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, openSync as openSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, renameSync as renameSync$1, rmSync as rmSync$1, statSync as statSync$1, writeFileSync as writeFileSync$1 } from "fs";
 import { dirname, isAbsolute, join, resolve } from "path";
+import { createdDevicesFile, createdDevicesLock, readCreatedDevices, readCreatedDevices as readCreatedDevices$1 } from "@stim-cli/core/state";
 import { homedir, tmpdir } from "os";
+//#region src/devices/created-devices.ts
+function update(platform, change) {
+	const dir = getConfigDir();
+	withDirLock(createdDevicesLock(), () => {
+		const current = readCreatedDevices();
+		const entries = new Set(current[platform]);
+		if (!change(entries)) return;
+		const next = {
+			version: 1,
+			ios: [...current.ios],
+			android: [...current.android],
+			[platform]: [...entries]
+		};
+		const file = createdDevicesFile();
+		const tmp = `${file}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;
+		writeFileSync(tmp, `${JSON.stringify(next, null, 2)}\n`);
+		try {
+			renameSync(tmp, file);
+		} catch (error) {
+			rmSync(tmp, { force: true });
+			throw error;
+		}
+	}, { ensureParent: () => mkdirSync(dir, { recursive: true }) });
+}
+function recordCreatedDevice(platform, id) {
+	update(platform, (entries) => entries.size !== entries.add(id).size);
+}
+function forgetCreatedDevice(platform, id) {
+	update(platform, (entries) => entries.delete(id));
+}
+//#endregion
+//#region src/devices/device-ownership.ts
+const OWNED_SIM_NAME = /^stim-[A-Za-z0-9._-]+ \(.* \d+(?:\.\d+)*\)(?: [A-Za-z0-9-]+)?$/;
+const OWNED_AVD_NAME = /^stim-[A-Za-z0-9._-]+$/;
+const GIB = 1024 ** 3;
+function isOwnedSimName(name) {
+	return OWNED_SIM_NAME.test(name);
+}
+function isOwnedAvdName(name) {
+	return OWNED_AVD_NAME.test(name);
+}
+function avdConfigWrittenByStim(configIni) {
+	for (const line of String(configIni ?? "").split(/\r?\n/)) {
+		const match = /^disk\.dataPartition\.size=(\d+)$/.exec(line.trim());
+		if (match) return Number(match[1]) > 0 && Number(match[1]) % GIB === 0;
+	}
+	return false;
+}
+function isStimOwnedSim(sim, created = readCreatedDevices$1()) {
+	const name = sim.name ?? "";
+	return name.startsWith("stim-") && (created.ios.has(sim.udid) || isOwnedSimName(name));
+}
+function isStimOwnedAvd(name, readConfig, created = readCreatedDevices$1()) {
+	return isOwnedAvdName(name) && (created.android.has(name) || avdConfigWrittenByStim(readConfig()));
+}
+//#endregion
 //#region src/devices/android.ts
 const ANDROID_ABIS = /* @__PURE__ */ new Set([
 	"armeabi-v7a",
@@ -38,7 +97,7 @@ function androidToolPath(tool, platform = process.platform) {
 	const bare = location.at(-1);
 	const name = platform === "win32" ? `${bare}${WINDOWS_SDK_TOOL_EXTENSIONS[tool]}` : bare;
 	const abs = join(androidHome(), ...location.slice(0, -1), name);
-	return existsSync(abs) ? abs : bare;
+	return existsSync$1(abs) ? abs : bare;
 }
 const WINDOWS_BUILD_TOOL_EXTENSIONS = { apksigner: ".bat" };
 function androidBuildToolName(tool, platform = process.platform) {
@@ -60,7 +119,7 @@ function buildToolsMajor(version) {
 	const major = Number(String(version ?? "").split(/[.-]/)[0]);
 	return Number.isFinite(major) ? major : 0;
 }
-function findBuildTool(tools, { home = androidHome(), readDir = readdirSync, exists = existsSync, platform = process.platform } = {}) {
+function findBuildTool(tools, { home = androidHome(), readDir = readdirSync$1, exists = existsSync$1, platform = process.platform } = {}) {
 	const root = join(home, "build-tools");
 	let versions = [];
 	try {
@@ -91,7 +150,7 @@ function androidTool(tool) {
 function listInstalledSystemImages() {
 	const root = join(androidHome(), "system-images");
 	const images = [];
-	if (!existsSync(root)) return images;
+	if (!existsSync$1(root)) return images;
 	for (const apiDir of safeList(root)) {
 		const m = apiDir.match(/^android-(\d+)$/);
 		if (!m) continue;
@@ -107,7 +166,7 @@ function listInstalledSystemImages() {
 }
 function safeList(dir) {
 	try {
-		return readdirSync(dir);
+		return readdirSync$1(dir);
 	} catch {
 		return [];
 	}
@@ -132,6 +191,7 @@ async function createOwnedAvd(label, { systemImage, spawn = (...args) => getExec
 		throw new Error(`No ${arch} Android system image is installed. Install one, e.g.: sdkmanager "system-images;android-36;google_apis;${arch}"`);
 	}
 	const avdName = ownedAvdName(label);
+	recordCreatedDevice("android", avdName);
 	const tool = androidToolPath("avdmanager");
 	const args = [
 		"create",
@@ -183,7 +243,7 @@ function parseAvdSystemImage(configIni) {
 	}
 	return null;
 }
-function ownedAvdSystemImage(avdName, { avdDirectory = ownedAvdDirectory, readFile = (path) => readFileSync(path, "utf8") } = {}) {
+function ownedAvdSystemImage(avdName, { avdDirectory = ownedAvdDirectory, readFile = (path) => readFileSync$1(path, "utf8") } = {}) {
 	const directory = avdDirectory(avdName);
 	if (!directory) return null;
 	try {
@@ -195,17 +255,32 @@ function ownedAvdSystemImage(avdName, { avdDirectory = ownedAvdDirectory, readFi
 function sanitizeAvdLabel(label) {
 	return String(label).replace(/[^A-Za-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
 }
+function avdConfigIni(avdName, directory = ownedAvdDirectory(avdName)) {
+	if (!directory) return null;
+	try {
+		return readFileSync$1(join(directory, "config.ini"), "utf8");
+	} catch {
+		return null;
+	}
+}
+function registeredOrOrphanedAvdDirectory(avdName) {
+	return ownedAvdDirectory(avdName) ?? listOrphanedAvdDirectories(avdName)[0]?.directory ?? null;
+}
+function isStimOwnedAvdName(avdName, directory) {
+	return isStimOwnedAvd(avdName, () => avdConfigIni(avdName, directory === void 0 ? registeredOrOrphanedAvdDirectory(avdName) : directory));
+}
 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-").`);
+	if (!isStimOwnedAvdName(avdName)) throw new Error(`Refusing to delete AVD "${avdName}": not a Stim-owned AVD; Stim has no record of creating it.`);
 	getExecutor().run(`${androidTool("avdmanager")} delete avd -n "${avdName}"`, {
 		timeoutMs: AVDMANAGER_DELETE_TIMEOUT_MS,
 		killSignal: "SIGKILL"
 	});
+	forgetCreatedDevice("android", avdName);
 }
 function parseAvdList(text) {
 	return text.split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("INFO") && !l.startsWith("WARNING"));
@@ -420,7 +495,7 @@ function avdStorageRoots() {
 }
 function avdPathExists(path) {
 	try {
-		lstatSync(path);
+		lstatSync$1(path);
 		return true;
 	} catch (error) {
 		if (error.code === "ENOENT") return false;
@@ -431,17 +506,17 @@ function listOrphanedAvdDirectories(avdName) {
 	const roots = avdStorageRoots();
 	const stores = roots.filter(avdPathExists).map((root) => ({
 		root,
-		canonicalRoot: realpathSync(root),
-		names: readdirSync(root)
+		canonicalRoot: realpathSync$1(root),
+		names: readdirSync$1(root)
 	}));
 	const registered = /* @__PURE__ */ new Set();
 	for (const { root, canonicalRoot, names } of stores) for (const name of names.filter((entry) => entry.endsWith(".ini"))) {
 		const path = join(root, name);
-		const ini = readFileSync(path, "utf8");
+		const ini = readFileSync$1(path, "utf8");
 		const targets = /* @__PURE__ */ new Set([...avdIniPaths(root, ini), ...avdIniPaths(canonicalRoot, ini)]);
 		if (!targets.size) throw new Error(`Cannot verify AVD registration at ${path}; its data was kept.`);
 		for (const target of targets) try {
-			registered.add(realpathSync(target));
+			registered.add(realpathSync$1(target));
 		} catch (error) {
 			const code = error.code;
 			if (code !== "ENOENT" && code !== "ENOTDIR") throw error;
@@ -456,8 +531,8 @@ function listOrphanedAvdDirectories(avdName) {
 			if (roots.some((candidate) => avdPathExists(join(candidate, `${name}.ini`)))) continue;
 			const directory = join(canonicalRoot, entry);
 			if (registered.has(directory) || !avdPathExists(directory)) continue;
-			const stat = lstatSync(directory);
-			if (!stat.isDirectory() || stat.isSymbolicLink() || realpathSync(directory) !== directory) throw new Error(`Cannot verify AVD data at ${directory}; it was kept.`);
+			const stat = lstatSync$1(directory);
+			if (!stat.isDirectory() || stat.isSymbolicLink() || realpathSync$1(directory) !== directory) throw new Error(`Cannot verify AVD data at ${directory}; it was kept.`);
 			if (!orphaned.some((candidate) => candidate.directory === directory)) orphaned.push({
 				name,
 				directory,
@@ -468,7 +543,7 @@ function listOrphanedAvdDirectories(avdName) {
 	}
 	return orphaned;
 }
-function ownedAvdDirectory(avdName, { env = process.env, home = homedir(), readFile = (path) => readFileSync(path, "utf8"), realpath = realpathSync, isDirectory = (path) => statSync(path).isDirectory() } = {}) {
+function ownedAvdDirectory(avdName, { env = process.env, home = homedir(), readFile = (path) => readFileSync$1(path, "utf8"), realpath = realpathSync$1, isDirectory = (path) => statSync$1(path).isDirectory() } = {}) {
 	if (!/^stim-[A-Za-z0-9._-]+$/.test(avdName)) return null;
 	const roots = [
 		env.ANDROID_AVD_HOME,
@@ -492,6 +567,21 @@ function ownedAvdDirectory(avdName, { env = process.env, home = homedir(), readF
 	}
 	return null;
 }
+const AVD_USER_DATA = [
+	"userdata-qemu.img",
+	"userdata-qemu.img.qcow2",
+	"encryptionkey.img",
+	"encryptionkey.img.qcow2",
+	"cache.img",
+	"cache.img.qcow2",
+	"snapshots"
+];
+function wipeAvdUserData(directory) {
+	for (const name of AVD_USER_DATA) rmSync$1(join(directory, name), {
+		recursive: true,
+		force: true
+	});
+}
 function withAvdConfigOverrides(contents, overrides) {
 	const newline = contents.includes("\r\n") ? "\r\n" : "\n";
 	const trailingNewline = /\r?\n$/.test(contents);
@@ -513,10 +603,10 @@ function withAvdConfigOverrides(contents, overrides) {
 	return updated.join(newline) + (trailingNewline ? newline : "");
 }
 let avdConfigWriteSequence = 0;
-function configureNewOwnedAvd(avdName, { dataPartitionSizeGb, avdConfig = {} }, { avdDirectory = ownedAvdDirectory, readFile = (path) => readFileSync(path, "utf8"), writeFile = (path, contents) => writeFileSync(path, contents, {
+function configureNewOwnedAvd(avdName, { dataPartitionSizeGb, avdConfig = {} }, { avdDirectory = ownedAvdDirectory, readFile = (path) => readFileSync$1(path, "utf8"), writeFile = (path, contents) => writeFileSync$1(path, contents, {
 	encoding: "utf8",
 	flag: "wx"
-}), rename = renameSync, remove = (path) => rmSync(path, { force: true }) } = {}) {
+}), rename = renameSync$1, remove = (path) => rmSync$1(path, { force: true }) } = {}) {
 	const sizeBytes = androidDataPartitionSizeBytes(dataPartitionSizeGb);
 	const directory = avdDirectory(avdName);
 	if (!directory) throw new Error(`Could not resolve the content directory for newly created AVD ${avdName}.`);
@@ -551,7 +641,7 @@ function avdPoolConfiguration(dataPartitionSizeGb, avdConfig) {
 function ownedAvdMatchesConfiguration(avdName, configuration) {
 	const directory = ownedAvdDirectory(avdName);
 	if (!directory) return false;
-	const contents = readFileSync(join(directory, "config.ini"), "utf8");
+	const contents = readFileSync$1(join(directory, "config.ini"), "utf8");
 	const expected = JSON.parse(configuration);
 	return Array.isArray(expected) && expected.length > 0 && expected.every((entry) => Array.isArray(entry) && entry.length === 2 && entry.every((value) => typeof value === "string") && contents.split(/\r?\n/).some((line) => line.trim() === `${entry[0]}=${entry[1]}`));
 }
@@ -634,7 +724,7 @@ const CRASH_REPORT_MODE_EMULATOR_VERSION = 37;
 function emulatorCrashDatabases(env = process.env) {
 	const root = join(env.TMP || env.TEMP || tmpdir(), "AndroidEmulator");
 	try {
-		return readdirSync(root).filter((name) => /^emu-crash-.*\.db$/.test(name)).map((name) => join(root, name));
+		return readdirSync$1(root).filter((name) => /^emu-crash-.*\.db$/.test(name)).map((name) => join(root, name));
 	} catch {
 		return [];
 	}
@@ -648,7 +738,7 @@ function emulatorCrashDatabases(env = process.env) {
 * removed instead, which has the same effect unless a crash handler is still writing into it.
 * https://github.com/appandflow/stim/issues/918
 */
-function suppressEmulatorCrashConsent({ platform = process.platform, version = emulatorMajorVersion, databases = emulatorCrashDatabases, remove = (path) => rmSync(path, {
+function suppressEmulatorCrashConsent({ platform = process.platform, version = emulatorMajorVersion, databases = emulatorCrashDatabases, remove = (path) => rmSync$1(path, {
 	recursive: true,
 	force: true
 }) } = {}) {
@@ -682,8 +772,8 @@ function bootAndroidEmulator(avdName, consolePort, { logFile, platform = process
 function emulatorStdio(logFile) {
 	if (!logFile) return "ignore";
 	try {
-		mkdirSync(dirname(logFile), { recursive: true });
-		const fd = openSync(logFile, "w");
+		mkdirSync$1(dirname(logFile), { recursive: true });
+		const fd = openSync$1(logFile, "w");
 		return [
 			"ignore",
 			fd,
@@ -788,7 +878,7 @@ function avdProcessLockPaths(avdDirectory, platform) {
 }
 function readAvdProcessId(path) {
 	try {
-		const pid = Number(readFileSync(path, "utf8").split("\0")[0]);
+		const pid = Number(readFileSync$1(path, "utf8").split("\0")[0]);
 		if (!Number.isSafeInteger(pid) || pid <= 0) throw new Error(`Could not read the emulator PID from process lock ${path}.`);
 		return pid;
 	} catch (error) {
@@ -831,7 +921,7 @@ function emulatorCrashHandlerPids(qemuPid) {
 	], { timeoutMs: 1e4 });
 	return String(out ?? "").split(/\r?\n/).map((line) => Number(line.trim())).filter((pid) => Number.isSafeInteger(pid) && pid > 0);
 }
-function waitForAndroidEmulatorShutdown(avdName, shutdown, { timeoutMs = ANDROID_EMULATOR_SHUTDOWN_TIMEOUT_MS, pollMs = ANDROID_EMULATOR_SHUTDOWN_POLL_MS, platform = process.platform, resolveDirectory = ownedAvdDirectory, readProcessId = readAvdProcessId, processAlive = pidExists, directoryExists = (path) => statSync(path).isDirectory(), crashHandlerPids = emulatorCrashHandlerPids, killCrashHandler = (pid) => signalProcessTree(pid, "SIGKILL", { platform }), now = Date.now, sleep = sleepSync } = {}) {
+function waitForAndroidEmulatorShutdown(avdName, shutdown, { timeoutMs = ANDROID_EMULATOR_SHUTDOWN_TIMEOUT_MS, pollMs = ANDROID_EMULATOR_SHUTDOWN_POLL_MS, platform = process.platform, resolveDirectory = ownedAvdDirectory, readProcessId = readAvdProcessId, processAlive = pidExists, directoryExists = (path) => statSync$1(path).isDirectory(), crashHandlerPids = emulatorCrashHandlerPids, killCrashHandler = (pid) => signalProcessTree(pid, "SIGKILL", { platform }), now = Date.now, sleep = sleepSync } = {}) {
 	const { directory, processId } = resolveAvdProcess(avdName, {
 		platform,
 		resolveDirectory,
@@ -899,7 +989,7 @@ function ownedAvdSerialResolver({ timeoutMs } = {}) {
 	};
 	return (avdName) => {
 		if (!avds().includes(avdName)) return { missing: true };
-		if (!avdName?.startsWith("stim-")) return { notOwned: true };
+		if (!isStimOwnedAvdName(avdName)) 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 };
@@ -907,4 +997,4 @@ function ownedAvdSerialResolver({ timeoutMs } = {}) {
 	};
 }
 //#endregion
-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 };
+export { ownedAvdDirectory as A, resolvePhysicalDevice as B, isStimOwnedAvdName as C, listOrphanedAvdDirectories as D, listInstalledSystemImages as E, physicalDeviceModel as F, wipeAvdUserData as G, sleepSync as H, pickDefaultSystemImage as I, recordCreatedDevice as J, isStimOwnedSim as K, probeEmulatorSerial as L, ownedAvdName as M, ownedAvdSerialResolver as N, memoizeEmulatorProbe as O, ownedAvdSystemImage as P, resetAdoptedAvd as R, hostSystemImageArch as S, listAvds as T, waitForAndroidEmulatorShutdown as U, shutdownAndroidEmulator as V, waitForBoot as W, 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, ownedAvdMatchesConfiguration as j, nextConsolePort as k, assertOwnedAvdStopped as l, configureNewOwnedAvd as m, androidDeviceAbi as n, androidSystemImageAbi as o, bootAndroidEmulator as p, forgetCreatedDevice as q, androidHome as r, androidToolCwd as s, androidBuildToolName as t, avdPathExists as u, emulatorFailureRemedy as v, listAdbDevices as w, getAvdNameForSerial as x, extractEmulatorFailure as y, resolveOwnedAvdSerial as z };