stim 1.8.0 → 1.10.0

package/dist/{ios-device-CFXA46ez.mjs → ios-device-BiOsSVzd.mjs}

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 //#region src/collector/ios-device.ts
 const CONSOLE_ENV = { OS_ACTIVITY_DT_MODE: "enable" };
 const DEV_MENU_LAUNCH_ARGS = [
@@ -13,6 +13,7 @@ const FATAL_MARKERS = [
 	/^\*\*\* Assertion failure in/,
 	/^(?:\S+:\d+: )?Fatal error: /
 ];
+const TOOL_ERROR_PREFIX = "ERROR: ";
 const MIRROR_LINE = /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+[+-]\d{4}) (.+?)\[(\d+):(\d+)\] ?(?:\[([^\]\s]+)\] )?([\s\S]*)$/;
 function deviceConsoleLevel(message) {
 	const text = typeof message === "string" ? message : "";
@@ -78,4 +79,4 @@ function startIosDeviceConsole({ udid, bundleId, payloadUrl = null, spawnFn = nu
 	});
 }
 //#endregion
-export { startIosDeviceConsole as i, deviceConsoleLevel as n, parseDeviceConsoleLine as r, DEV_MENU_LAUNCH_ARGS as t };
+export { startIosDeviceConsole as a, parseDeviceConsoleLine as i, TOOL_ERROR_PREFIX as n, deviceConsoleLevel as r, DEV_MENU_LAUNCH_ARGS as t };

package/dist/{ios-device-CauFJiYx.mjs → ios-device-CtRdEVjx.mjs}

@@ -1,5 +1,6 @@
-import { t as getExecutor } from "./exec-B29XNuhP.mjs";
-import { r as INSTALL_ERROR } from "./app-install-BDbsSgCl.mjs";
+import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
+import { n as TOOL_ERROR_PREFIX } from "./ios-device-BiOsSVzd.mjs";
+import { i as INSTALL_ERROR } from "./app-install-CrJ6t_bv.mjs";
 import { mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
@@ -34,7 +35,10 @@ function parseDevicectlDevices(payload) {
 			bootState: text(properties.bootState),
 			developerModeStatus: text(properties.developerModeStatus),
 			pairingState: text(connection.pairingState),
-			transportType: text(connection.transportType)
+			transportType: text(connection.transportType),
+			platform: text(hardware.platform),
+			reality: text(hardware.reality),
+			tunnelState: text(connection.tunnelState)
 		});
 	}
 	return out;
@@ -63,18 +67,47 @@ function listIosDevices({ exec = null } = {}) {
 }
 const DEVELOPER_MODE_REMEDY = "Turn on Settings > Privacy & Security > Developer Mode on the phone, restart it, then reconnect.";
 const PAIRING_REMEDY = "Unlock the phone, tap Trust on the pairing prompt, then reconnect the cable.";
-const CABLE_REMEDY = "Connect the phone with a cable and check `xcrun devicectl list devices`, then retry.";
+const NOT_A_PHONE_REMEDY = "Name a physical iPhone or iPad from `xcrun devicectl list devices`, or run `stim ios` without --device to use this workspace's simulator.";
+const UNREACHABLE_REMEDY = "Connect the phone with a cable, or unlock it on the same Wi-Fi network as this Mac, then check `xcrun devicectl list devices`.";
 const WIRED_TRANSPORTS = /* @__PURE__ */ new Set(["wired", "usb"]);
+const WIRELESS_TRANSPORT = "localnetwork";
+function isIosHardware(device) {
+	return (device.platform == null || device.platform.toLowerCase() === "ios") && (device.reality == null || device.reality.toLowerCase() === "physical");
+}
+function isReachable(device) {
+	return device.tunnelState?.toLowerCase() !== "unavailable";
+}
 function isWired(device) {
 	return device.transportType === null || WIRED_TRANSPORTS.has(device.transportType.toLowerCase());
 }
+function isWirelessIosDevice(device) {
+	return device.transportType?.toLowerCase() === WIRELESS_TRANSPORT;
+}
+function isPhysical(device) {
+	return isIosHardware(device) && isReachable(device) && (isWired(device) || isWirelessIosDevice(device));
+}
+function notUsableRefusal(device) {
+	if (!isIosHardware(device)) return {
+		error: `${describe(device)} is a ${[device.reality, device.platform].filter(Boolean).join(" ")} device, and \`ios --device\` installs only on a physical iPhone or iPad.`,
+		remedy: NOT_A_PHONE_REMEDY
+	};
+	if (!isReachable(device)) return {
+		error: `${describe(device)} is paired, but devicectl reports it unavailable: it cannot reach the phone right now.`,
+		remedy: UNREACHABLE_REMEDY
+	};
+	return {
+		error: `${describe(device)} is reached over ${device.transportType}, and Stim installs on a phone only over a cable or Wi-Fi.`,
+		remedy: NOT_A_PHONE_REMEDY
+	};
+}
 function describe(device) {
 	return `${device.udid} (${device.name})`;
 }
-function wirelessRefusal(device) {
+function selected(device) {
 	return {
-		error: `${describe(device)} is paired over ${device.transportType}, not a cable, and Stim installs over the cable only.`,
-		remedy: CABLE_REMEDY
+		udid: device.udid,
+		name: device.name,
+		...isWirelessIosDevice(device) ? { wireless: true } : {}
 	};
 }
 function unhealthy(device) {
@@ -89,13 +122,13 @@ function unhealthy(device) {
 	return null;
 }
 function iosPoolCandidates(devices) {
-	return (Array.isArray(devices) ? devices : []).filter((device) => isWired(device) && unhealthy(device) === null);
+	return (Array.isArray(devices) ? devices : []).filter((device) => isPhysical(device) && unhealthy(device) === null);
 }
 function iosPoolNoCandidatesRefusal(devices) {
 	const listed = Array.isArray(devices) ? devices : [];
-	const cabled = listed.filter(isWired);
-	const problems = cabled.map((device) => unhealthy(device));
-	if (cabled.length > 0 && problems.every((problem) => problem !== null)) {
+	const physical = listed.filter(isPhysical);
+	const problems = physical.map((device) => unhealthy(device));
+	if (physical.length > 0 && problems.every((problem) => problem !== null)) {
 		const reasons = problems;
 		return {
 			error: reasons.map((reason) => reason.error).join(" "),
@@ -104,42 +137,52 @@ function iosPoolNoCandidatesRefusal(devices) {
 	}
 	return resolveIosPhysicalDevice(null, listed);
 }
+function pickOne(devices) {
+	if (devices.length === 1) return unhealthy(devices[0]) ?? selected(devices[0]);
+	if (devices.length > 1) return {
+		error: `Several devices are connected: ${devices.map(describe).join(", ")}.`,
+		remedy: "Name the one to build for with `stim ios --device <udid>`."
+	};
+	return null;
+}
 function resolveIosPhysicalDevice(requested, devices) {
 	const listed = Array.isArray(devices) ? devices : [];
-	const cabled = listed.filter(isWired);
-	const wireless = listed.filter((d) => !isWired(d));
+	const physical = listed.filter(isPhysical);
 	if (requested) {
-		const match = cabled.find((d) => d.udid.toLowerCase() === requested.toLowerCase());
-		if (match) return unhealthy(match) ?? {
-			udid: match.udid,
-			name: match.name
-		};
-		const overNetwork = wireless.find((d) => d.udid.toLowerCase() === requested.toLowerCase());
-		if (overNetwork) return wirelessRefusal(overNetwork);
+		const same = (d) => d.udid.toLowerCase() === requested.toLowerCase();
+		const match = physical.find(same);
+		if (match) return unhealthy(match) ?? selected(match);
+		const other = listed.find(same);
+		if (other) return notUsableRefusal(other);
 		return {
-			error: cabled.length ? `${requested} is not connected. devicectl reports these cabled devices: ${cabled.map(describe).join(", ")}.` : `${requested} is not connected by cable, and devicectl reports no cabled device at all.`,
+			error: physical.length ? `${requested} is not connected. devicectl reports these devices: ${physical.map(describe).join(", ")}.` : `${requested} is not connected, and devicectl reports no device over a cable or Wi-Fi at all.`,
 			remedy: "Check the cable and `xcrun devicectl list devices`, then retry with a UDID it lists."
 		};
 	}
-	if (cabled.length === 1) {
-		const only = cabled[0];
-		return unhealthy(only) ?? {
-			udid: only.udid,
-			name: only.name
-		};
-	}
-	if (cabled.length > 1) return {
-		error: `Several devices are connected: ${cabled.map(describe).join(", ")}.`,
-		remedy: "Name the one to build for with `stim ios --device <udid>`."
-	};
-	const onlyWireless = wireless[0];
-	if (onlyWireless) return wirelessRefusal(onlyWireless);
+	const chosen = pickOne(physical);
+	if (chosen) return chosen;
 	return {
 		error: "No physical iOS device is connected.",
 		remedy: "Plug the phone in, unlock it, tap Trust, turn on Settings > Privacy & Security > Developer Mode, then check `xcrun devicectl list devices`."
 	};
 }
 const DEVICECTL_INSTALL_TIMEOUT_MS = 3e5;
+const WIRELESS_INSTALL_TIMEOUT_MS = 9e5;
+const LAUNCH_PROBE_TIMEOUT_MS = 45e3;
+const WIRELESS_LAUNCH_PROBE_TIMEOUT_MS = 12e4;
+const WIRELESS_ERROR = "STIM_DEVICE_WIRELESS_FAILED";
+function iosDeviceBounds(wireless) {
+	return wireless ? {
+		installMs: WIRELESS_INSTALL_TIMEOUT_MS,
+		launchMs: WIRELESS_LAUNCH_PROBE_TIMEOUT_MS
+	} : {
+		installMs: DEVICECTL_INSTALL_TIMEOUT_MS,
+		launchMs: LAUNCH_PROBE_TIMEOUT_MS
+	};
+}
+const WIRELESS_REMEDY = "Connect the phone with a cable so devicectl uses it instead of Wi-Fi, keep the phone unlocked, then run the command again.";
+const WIRELESS_DROP = /disconnected|not connected|connection (?:was )?(?:lost|interrupted|reset)|network connection was lost|timed out/i;
+const WIRELESS_CONSOLE_DROP = /disconnected|connection (?:was )?(?:lost|interrupted|reset)|not connected|timed out/i;
 const LOCKED_REMEDY = "Unlock the phone and keep it awake, then run the command again.";
 function errorText(error) {
 	const withOutput = error;
@@ -170,8 +213,33 @@ function iosInstallRemedy(kind, { udid, bundleId }) {
 		default: return `Check that ${udid} is still connected and unlocked (\`xcrun devicectl list devices\`), and that the app was built for the iphoneos SDK.`;
 	}
 }
-function installIosDeviceApp({ udid, appPath, bundleId = null }, { exec = null } = {}) {
+function wirelessInstallFailure(error, { udid, appPath, wireless }) {
+	if (!wireless) return null;
+	const failure = errorText(error);
+	if (iosInstallFailureKind(failure) !== null) return null;
+	const timedOut = error?.code === "ETIMEDOUT";
+	if (!timedOut && !WIRELESS_DROP.test(failure)) return null;
+	const what = timedOut ? `did not finish within ${Math.round(WIRELESS_INSTALL_TIMEOUT_MS / 1e3)}s` : "lost the connection to the phone";
+	return {
+		failed: true,
+		code: WIRELESS_ERROR,
+		reason: `devicectl ${what} while installing ${appPath} on ${udid} over Wi-Fi (localNetwork): ${failure}`,
+		remedy: WIRELESS_REMEDY
+	};
+}
+/**
+* Installs with one bounded devicectl call. A signer conflict adds an uninstall and a
+* second install, each with the same bound; `beforeStep` runs before each of those two
+* so the caller can extend its device lease.
+*/
+function installIosDeviceApp({ udid, appPath, bundleId = null, wireless = false }, { exec = null, beforeStep = () => {} } = {}) {
 	const e = exec || getExecutor();
+	const timeoutMs = iosDeviceBounds(wireless).installMs;
+	const target = {
+		udid,
+		appPath,
+		wireless
+	};
 	const install = () => {
 		e.runFile("xcrun", [
 			"devicectl",
@@ -181,7 +249,7 @@ function installIosDeviceApp({ udid, appPath, bundleId = null }, { exec = null }
 			"--device",
 			udid,
 			appPath
-		], { timeoutMs: DEVICECTL_INSTALL_TIMEOUT_MS });
+		], { timeoutMs });
 	};
 	try {
 		install();
@@ -190,6 +258,8 @@ function installIosDeviceApp({ udid, appPath, bundleId = null }, { exec = null }
 			appPath
 		};
 	} catch (err) {
+		const dropped = wirelessInstallFailure(err, target);
+		if (dropped) return dropped;
 		const failure = errorText(err);
 		const kind = iosInstallFailureKind(failure);
 		if (kind !== "signer" || !bundleId) return {
@@ -202,6 +272,7 @@ function installIosDeviceApp({ udid, appPath, bundleId = null }, { exec = null }
 			})
 		};
 		try {
+			beforeStep();
 			e.runFile("xcrun", [
 				"devicectl",
 				"device",
@@ -210,26 +281,28 @@ function installIosDeviceApp({ udid, appPath, bundleId = null }, { exec = null }
 				"--device",
 				udid,
 				bundleId
-			], { timeoutMs: DEVICECTL_INSTALL_TIMEOUT_MS });
+			], { timeoutMs });
 		} catch (uninstallErr) {
-			return {
+			const uninstallKind = iosInstallFailureKind(errorText(uninstallErr));
+			return wirelessInstallFailure(uninstallErr, target) ?? {
 				failed: true,
-				code: INSTALL_ERROR,
+				code: "STIM_INSTALL_FAILED",
 				reason: `devicectl refused to install ${appPath} over the copy of ${bundleId} already on ${udid}, which a different team signed, and the uninstall failed too: ${errorText(uninstallErr)}`,
-				remedy: iosInstallRemedy("signer", {
+				remedy: iosInstallRemedy(uninstallKind ?? "signer", {
 					udid,
 					bundleId
 				})
 			};
 		}
 		try {
+			beforeStep();
 			install();
 		} catch (retryErr) {
-			return {
+			return wirelessInstallFailure(retryErr, target) ?? {
 				failed: true,
-				code: INSTALL_ERROR,
+				code: "STIM_INSTALL_FAILED",
 				reason: `devicectl could not install ${appPath} on ${udid} even after uninstalling ${bundleId}: ${errorText(retryErr)}`,
-				remedy: iosInstallRemedy(null, {
+				remedy: iosInstallRemedy(iosInstallFailureKind(errorText(retryErr)), {
 					udid,
 					bundleId
 				})
@@ -301,6 +374,8 @@ const LAUNCH_REFUSALS = [
 	["untrusted-developer", /FBSOpenApplicationErrorDomain error 3\b/],
 	["untrusted-developer", /denied by service delegate[^\n]*for reason: Security/],
 	["locked", /device is locked|is locked\b|passcode/i],
+	["locked", /BSErrorCodeDescription = Locked\b/],
+	["locked", /\bunlocked\b[^\n]*FBSOpenApplicationErrorDomain error 7\b/],
 	["not-installed", /(?:application|app)[^\n]*\b(?:is )?(?:unknown to FrontBoard|not installed)/i]
 ];
 function iosLaunchRefusalKind(output) {
@@ -315,7 +390,6 @@ function iosLaunchRemedy(kind, { udid, bundleId }) {
 		default: return `Run \`xcrun devicectl device process launch --console --device ${udid} ${bundleId}\` to see what the phone reports.`;
 	}
 }
-const LAUNCH_PROBE_TIMEOUT_MS = 45e3;
 const LAUNCH_PROBE_POLL_MS = 1e3;
 const COLLECTOR_ENDED_EVENTS = /* @__PURE__ */ new Set(["collector_failed", "collector_stopped"]);
 function launchEvidence(records) {
@@ -326,7 +400,12 @@ function launchEvidence(records) {
 		if (entry.event === "collector_started" || entry.event === "collector_empty") continue;
 		lines.push(msg);
 	}
-	return lines.slice(-6);
+	return lines;
+}
+function devicectlErrorText(records) {
+	const own = records.filter((entry) => entry.proc === void 0 && typeof entry.msg === "string");
+	const start = own.findIndex((entry) => entry.msg.startsWith(TOOL_ERROR_PREFIX));
+	return start < 0 ? "" : own.slice(start).map((entry) => entry.msg).join("\n");
 }
 function collectorRecordsFor(records, collectorPid) {
 	if (!collectorPid) return [];
@@ -334,7 +413,7 @@ function collectorRecordsFor(records, collectorPid) {
 	const start = records.findIndex((entry) => entry.event === "collector_started" && typeof entry.msg === "string" && marker.test(entry.msg));
 	return start < 0 ? [] : records.slice(start);
 }
-async function awaitIosDeviceLaunch({ udid, bundleId, appName, collectorPid = null, readRecords, probe, timeoutMs = LAUNCH_PROBE_TIMEOUT_MS, pollMs = LAUNCH_PROBE_POLL_MS, now = Date.now, sleep = (ms) => new Promise((r) => setTimeout(r, ms)) }) {
+async function awaitIosDeviceLaunch({ udid, bundleId, appName, collectorPid = null, readRecords, probe, wireless = false, timeoutMs = iosDeviceBounds(wireless).launchMs, pollMs = LAUNCH_PROBE_POLL_MS, now = Date.now, sleep = (ms) => new Promise((r) => setTimeout(r, ms)) }) {
 	const probeProcess = probe ?? (() => iosDeviceProcess({
 		udid,
 		appName
@@ -346,8 +425,16 @@ async function awaitIosDeviceLaunch({ udid, bundleId, appName, collectorPid = nu
 		const pid = probeProcess();
 		if (typeof pid === "number") return { pid };
 		if (ended) {
-			const lines = launchEvidence(records);
-			const kind = iosLaunchRefusalKind(lines.join("\n"));
+			const evidence = launchEvidence(records);
+			const lines = evidence.slice(-6);
+			const kind = iosLaunchRefusalKind(evidence.join("\n"));
+			if (wireless && kind === null && WIRELESS_CONSOLE_DROP.test(devicectlErrorText(records))) return {
+				failed: true,
+				code: WIRELESS_ERROR,
+				reason: `devicectl lost the Wi-Fi (localNetwork) connection to ${udid} while launching ${bundleId}.`,
+				remedy: WIRELESS_REMEDY,
+				lines
+			};
 			return {
 				failed: true,
 				reason: `devicectl could not keep ${bundleId} running on ${udid}: the console ended before the app appeared in the device's process list.`,
@@ -359,11 +446,21 @@ async function awaitIosDeviceLaunch({ udid, bundleId, appName, collectorPid = nu
 			};
 		}
 		if (now() >= deadline) {
-			const lines = launchEvidence(records);
+			const evidence = launchEvidence(records);
+			const lines = evidence.slice(-6);
+			const kind = iosLaunchRefusalKind(evidence.join("\n"));
+			const reason = `${bundleId} did not appear in ${udid}'s process list within ${Math.round(timeoutMs / 1e3)}s of the launch`;
+			if (wireless && kind === null) return {
+				failed: true,
+				code: WIRELESS_ERROR,
+				reason: `${reason} over Wi-Fi (localNetwork).`,
+				remedy: WIRELESS_REMEDY,
+				lines
+			};
 			return {
 				failed: true,
-				reason: `${bundleId} did not appear in ${udid}'s process list within ${Math.round(timeoutMs / 1e3)}s of the launch.`,
-				remedy: iosLaunchRemedy(iosLaunchRefusalKind(lines.join("\n")), {
+				reason: `${reason}.`,
+				remedy: iosLaunchRemedy(kind, {
 					udid,
 					bundleId
 				}),
@@ -410,4 +507,4 @@ function localNetworkPending(records, { since = 0, pid = null, lanOrigin }) {
 	return false;
 }
 //#endregion
-export { iosDeviceProcess as a, listIosDevices as c, verifyIosDeviceReleaseLaunch as d, installIosDeviceApp as i, localNetworkPending as l, LAUNCH_PROBE_TIMEOUT_MS as n, iosPoolCandidates as o, awaitIosDeviceLaunch as r, iosPoolNoCandidatesRefusal as s, DEVICECTL_INSTALL_TIMEOUT_MS as t, resolveIosPhysicalDevice as u };
+export { iosPoolCandidates as a, listIosDevices as c, verifyIosDeviceReleaseLaunch as d, iosDeviceProcess as i, localNetworkPending as l, installIosDeviceApp as n, iosPoolNoCandidatesRefusal as o, iosDeviceBounds as r, isWirelessIosDevice as s, awaitIosDeviceLaunch as t, resolveIosPhysicalDevice as u };