stim 1.18.0 → 1.20.0

package/dist/{app-install-D-PUENug.mjs → app-install-0LgaQRT7.mjs}

@@ -1,6 +1,6 @@
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
-import { N as deviceHoldsApk, O as uninstallIosApp, P as deviceHoldsBundle, h as listUserApps, u as iosSimulatorFailureAdvice } from "./ios-B3SbOWdw.mjs";
-import { t as DEV_MENU_LAUNCH_ARGS } from "./ios-device-Bn7jWDB1.mjs";
+import { n as debugLog, t as getExecutor } from "./exec-B81Qodjn.mjs";
+import { R as deviceHoldsApk, g as listUserApps, k as uninstallIosApp, u as iosSimulatorFailureAdvice, z as deviceHoldsBundle } from "./ios-CXLIUxXJ.mjs";
+import { t as DEV_MENU_LAUNCH_ARGS } from "./ios-device-B1B14xND.mjs";
 import { join } from "node:path";
 //#region src/engine/app-schemes.ts
 function schemesFromInfoPlist(plist) {
@@ -207,25 +207,45 @@ function parseLaunchedPid(text) {
 }
 function iosAppProcess(udid, bundleId, { exec = null } = {}) {
 	const e = exec || getExecutor();
-	let out = "";
+	const started = performance.now();
+	let pid;
+	let failure = {};
 	try {
-		out = e.runFile("xcrun", [
+		const out = e.runFile("xcrun", [
 			"simctl",
 			"spawn",
 			udid,
 			"launchctl",
 			"list"
 		], { timeoutMs: 2e3 });
-	} catch {
+		const label = `UIKitApplication:${bundleId}[`;
+		pid = null;
+		for (const line of out.split("\n")) {
+			if (!line.includes(label)) continue;
+			const candidate = Number(line.trim().split(/\s+/)[0]);
+			if (Number.isInteger(candidate) && candidate > 0) {
+				pid = candidate;
+				break;
+			}
+		}
+		return pid;
+	} catch (error) {
+		const { code, status } = error ?? {};
+		failure = {
+			...typeof code === "string" ? { code } : {},
+			...typeof status === "number" ? { exit: status } : {}
+		};
 		return;
+	} finally {
+		debugLog.log("ios.app-process", {
+			deviceId: udid,
+			bundleId,
+			state: pid === void 0 ? "unknown" : pid === null ? "absent" : "running",
+			...typeof pid === "number" ? { appPid: pid } : {},
+			ms: Math.round(performance.now() - started),
+			...failure
+		});
 	}
-	const label = `UIKitApplication:${bundleId}[`;
-	for (const line of out.split("\n")) {
-		if (!line.includes(label)) continue;
-		const pid = Number(line.trim().split(/\s+/)[0]);
-		if (Number.isInteger(pid) && pid > 0) return pid;
-	}
-	return null;
 }
 function launchedIosAppAfterNoHandle(error, udid, bundleId, exec) {
 	const stderr = String(error?.stderr ?? "");
@@ -234,14 +254,16 @@ function launchedIosAppAfterNoHandle(error, udid, bundleId, exec) {
 }
 function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, devMenuParams = false, consolePaths }, { exec = null } = {}) {
 	const e = exec || getExecutor();
+	const runningPid = iosAppProcess(udid, bundleId, { exec: e });
+	const stateUnknown = runningPid === void 0;
 	const launchArgs = [
 		"simctl",
 		"launch",
 		...consolePaths ? [`--stdout=${consolePaths.stdout}`, `--stderr=${consolePaths.stderr}`] : [],
+		...stateUnknown ? ["--terminate-running-process"] : [],
 		udid,
 		bundleId
 	];
-	let runningPid = iosAppProcess(udid, bundleId, { exec: e });
 	const restart = {};
 	if (runningPid) {
 		try {
@@ -259,7 +281,6 @@ function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, devMe
 			};
 		}
 		restart.restartedPid = runningPid;
-		runningPid = null;
 	}
 	if (metroPort !== null) {
 		try {
@@ -282,7 +303,7 @@ function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, devMe
 		}
 		if (devClientScheme) {
 			const url = devClientUrl(devClientScheme, metroPort, "localhost", { devMenuParams });
-			const viaInitialUrl = Boolean(consolePaths) && runningPid === null;
+			const viaInitialUrl = Boolean(consolePaths) || stateUnknown;
 			if (!viaInitialUrl) try {
 				writeIosDevMenuOffDefaults(udid, bundleId, e);
 			} catch (err) {
@@ -326,7 +347,7 @@ function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, devMe
 					...restart
 				};
 			} catch (err) {
-				const pid = launchedWithInitialUrl ? launchedIosAppAfterNoHandle(err, udid, bundleId, e) : null;
+				const pid = launchedWithInitialUrl && !stateUnknown ? launchedIosAppAfterNoHandle(err, udid, bundleId, e) : null;
 				if (pid && pid !== restart.restartedPid) return {
 					ok: true,
 					mode: "launch",
@@ -353,7 +374,7 @@ function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, devMe
 		if (metroPort !== null) result.jsLocation = jsLocationValue(metroPort);
 		return result;
 	} catch (err) {
-		const pid = runningPid === null ? launchedIosAppAfterNoHandle(err, udid, bundleId, e) : null;
+		const pid = stateUnknown ? null : launchedIosAppAfterNoHandle(err, udid, bundleId, e);
 		if (pid && pid !== restart.restartedPid) {
 			const result = {
 				ok: true,