stim 1.6.0 → 1.7.0

package/dist/{android-BW8i_YxU.mjs → android-DeYdjjBP.mjs}

@@ -1,4 +1,5 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { s as androidToolCwd } from "./android-DWssqHQ8.mjs";
 //#region src/collector/android.ts
 const LEVEL_BY_LETTER = {
 	V: "debug",
@@ -100,7 +101,10 @@ function androidClockOffset(serial, { exec = getExecutor(), now = Date.now } = {
 			"shell",
 			"date",
 			"+%s%3N"
-		], { timeoutMs: 1e3 }).trim();
+		], {
+			timeoutMs: 1e3,
+			cwd: androidToolCwd()
+		}).trim();
 		const after = now();
 		if (!/^\d{13}$/.test(output) || after < before || after - before > 1e3) return null;
 		return Math.round((before + after) / 2) - Number(output);

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

@@ -1,16 +1,37 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { D as withDirLock, u as getConfigDir } from "./config-DMP7L7H6.mjs";
-import { r as register } from "./cache-manifest-uoOKhgUD.mjs";
-import { _ as workspaceLogsDir, c as ensureWorkspaceStorage, u as sharedCcache } from "./workspace-state-WVwWw_hB.mjs";
-import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-C7IlIzd7.mjs";
-import { l as phaseLine } from "./command-output-BuIb_ZOI.mjs";
-import { n as androidHome } from "./android-BkYmndPp.mjs";
-import { d as startBuildHeartbeat, n as HEARTBEAT_INTERVAL_MS } from "./xcode-DUF7jrXj.mjs";
+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 { 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 } from "node:path";
+import { dirname, isAbsolute, join, relative, sep } from "node:path";
 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. */
+const LONGEST_ANDROID_ABI = "armeabi-v7a";
+function androidPathRoom(root, { abi = null, variant = null, platform = process.platform } = {}) {
+	if (platform !== "win32") return null;
+	const abiName = abi ?? LONGEST_ANDROID_ABI;
+	const tail = 198 + (/release$/i.test(variant ?? "") ? 14 : 5) - 5 + abiName.length;
+	const longest = root.length + tail;
+	if (longest < 240) return null;
+	return {
+		root,
+		abi: abiName,
+		longest,
+		maxRootLength: 239 - tail
+	};
+}
+function androidPathRoomMessage({ root, abi, longest, maxRootLength }) {
+	return `The project root ${root} is ${root.length} characters, so the longest known Android native object path (react_codegen_safeareacontext for ${abi}) reaches ${longest} characters, past the 239 the NDK's ninja can be given on Windows; the root can be at most ${maxRootLength} characters.`;
+}
+function androidPathRoomRemedy({ root }) {
+	return `Map the project to a drive letter (\`subst X: "${root}"\`) and run Stim from X:\\, or move it under a shorter root.`;
+}
 const MAX_MESSAGE_LENGTH = 300;
 const KOTLIN_URI = /^e:\s+file:\/\/(\/\S+?):(\d+):(\d+)\s+(.*)$/;
 const KOTLIN_PAREN = /^e:\s+(\S+?):\s*\((\d+),\s*(\d+)\):\s*(.*)$/;
@@ -251,7 +272,7 @@ function decodePath(path) {
 	}
 }
 function stripCarriage(line) {
-	const text = String(line ?? "");
+	const text = String(line ?? "").replace(/\r$/, "");
 	const idx = text.lastIndexOf("\r");
 	return idx === -1 ? text : text.slice(idx + 1);
 }
@@ -335,7 +356,7 @@ function ccacheActivityLine(activity) {
 }
 function lookupCcache() {
 	try {
-		return parseCcacheBinary(getExecutor().runQuiet("command -v ccache", { timeoutMs: 5e3 }));
+		return parseCcacheBinary(getExecutor().findExecutable("ccache"));
 	} catch {
 		return null;
 	}
@@ -399,7 +420,7 @@ function androidDir(root) {
 	return join(root, "android");
 }
 function gradlewPath(root) {
-	return join(androidDir(root), "gradlew");
+	return join(androidDir(root), process.platform === "win32" ? "gradlew.bat" : "gradlew");
 }
 function apkOutputsDir(root) {
 	return join(androidDir(root), "app", "build", "outputs", "apk");
@@ -472,7 +493,7 @@ function apkInDir(dir) {
 	if (metadata) {
 		const named = parseOutputMetadata(metadata);
 		if (named) {
-			const abs = named.startsWith("/") ? named : join(dir, named);
+			const abs = isAbsolute(named) ? named : join(dir, named);
 			if (existsSync(abs)) return abs;
 		}
 	}
@@ -518,7 +539,7 @@ function findDebugApksUnder(base) {
 function locateApk(root, transcript = "", variant = null) {
 	const fromTranscript = parseApkFromTranscript(transcript);
 	if (fromTranscript) {
-		const abs = fromTranscript.startsWith("/") ? fromTranscript : join(androidDir(root), fromTranscript);
+		const abs = isAbsolute(fromTranscript) ? fromTranscript : join(androidDir(root), fromTranscript);
 		if (existsSync(abs)) return { apkPath: abs };
 	}
 	if (variant) {
@@ -530,7 +551,7 @@ function locateApk(root, transcript = "", variant = null) {
 	const found = findDebugApksUnder(apkOutputsDir(root));
 	if (found.length === 1) {
 		const apk = found[0];
-		const suggested = variantNameOf(relative(apkOutputsDir(root), apk).split("/").slice(0, -1));
+		const suggested = variantNameOf(relative(apkOutputsDir(root), apk).split(sep).slice(0, -1));
 		return {
 			apkPath: apk,
 			note: `no APK in ${relative(androidDir(root), debugApkDir(root))}; using ${relative(androidDir(root), apk)}${suggested ? ` -- set the android.variant setting to "${suggested}" to build this variant explicitly` : ""}`
@@ -714,7 +735,7 @@ function gradleArgs(task, { buildCache = true, abi = null } = {}) {
 		...abi ? [`-PreactNativeArchitectures=${abi}`] : []
 	];
 }
-async function buildAndroid({ root, logWriter, variant = null, abi = null }, { spawnFn = null, now = Date.now, env = process.env, buildCache = true, ccache = null, cas = null, pch = "auto", compilerCacheDisabled = false, heartbeatMs = HEARTBEAT_INTERVAL_MS, estimateMs = null, onHeartbeat = (line) => console.error(line), onNote = (line) => console.error(line) } = {}) {
+async function buildAndroid({ root, logWriter, variant = null, abi = null }, { spawnFn = null, now = Date.now, env = process.env, buildCache = true, ccache = null, cas = null, pch = "auto", compilerCacheDisabled = false, heartbeatMs = HEARTBEAT_INTERVAL_MS, estimateMs = null, onHeartbeat = (line) => console.error(line), onNote = (line) => console.error(line), platform = process.platform } = {}) {
 	const project = discoverAndroidProject(root);
 	if (project.failed) return {
 		ok: false,
@@ -740,6 +761,21 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 		lastLines: [],
 		durationMs: 0
 	};
+	const room = androidPathRoom(root, {
+		abi,
+		variant,
+		platform
+	});
+	if (room) return {
+		ok: false,
+		code: "STIM_PATH_TOO_LONG",
+		reason: androidPathRoomMessage(room),
+		remedy: androidPathRoomRemedy(room),
+		diagnostics: [],
+		truncated: 0,
+		lastLines: [],
+		durationMs: 0
+	};
 	const spawn = spawnFn || ((cmd, args, opts) => getExecutor().spawn(cmd, args, opts));
 	const task = assembleTaskFor(variant);
 	const args = gradleArgs(task, {
@@ -859,7 +895,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 		ok: false,
 		code: BUILD_ERROR,
 		reason: `\`./gradlew ${task}\` left ${located.candidates.length} debug APKs under ${apkOutputsDir(root)}, and nothing says which flavor to install.`,
-		remedy: `Set the android.variant setting to the variant to install -- e.g. {"android": {"variant": "${variantNameOf(relative(apkOutputsDir(root), located.candidates[0]).split("/").slice(0, -1))}"}} in .stim.json.`,
+		remedy: `Set the android.variant setting to the variant to install -- e.g. {"android": {"variant": "${variantNameOf(relative(apkOutputsDir(root), located.candidates[0]).split(sep).slice(0, -1))}"}} in .stim.json.`,
 		diagnostics: [],
 		truncated: 0,
 		lastLines: located.candidates.map((c) => relative(androidDir(root), c)),
@@ -1078,4 +1114,4 @@ function resolveAndroidCas(root, env = process.env) {
 	};
 }
 //#endregion
-export { buildAndroid as a, CCACHE_NOT_RUN as c, projectCmakeLauncher as d, resolveCcache as f, apkOutputsDir as i, CCACHE_UNAVAILABLE as l, resolveAndroidCas as n, productFlavorRefusal as o, formatDiagnostic as p, resolveAndroidCompilerCache as r, readProductFlavors as s, readAndroidCasToolchain as t, ccacheActivityLine as u };
+export { buildAndroid as a, CCACHE_NOT_RUN as c, projectCmakeLauncher as d, resolveCcache as f, androidPathRoomRemedy as g, androidPathRoomMessage as h, apkOutputsDir as i, CCACHE_UNAVAILABLE as l, androidPathRoom as m, resolveAndroidCas as n, productFlavorRefusal as o, formatDiagnostic as p, resolveAndroidCompilerCache as r, readProductFlavors as s, readAndroidCasToolchain as t, ccacheActivityLine as u };

package/dist/android-cas-compiler.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { join } from "node:path";

package/dist/{app-install--PAocWvq.mjs → app-install-DJg7bVv-.mjs}

@@ -1,11 +1,11 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
 import { o as parseNdjsonText } from "./ndjson-BZwI1NBv.mjs";
-import { t as DEV_MENU_LAUNCH_ARGS } from "./ios-device-D3pzTKQE.mjs";
-import { s as isAppLaunchError } from "./command-output-BuIb_ZOI.mjs";
-import { l as iosSimulatorFailureAdvice, p as listUserApps, w as uninstallIosApp } from "./ios-Deh5js5V.mjs";
+import { t as DEV_MENU_LAUNCH_ARGS } from "./ios-device-CFXA46ez.mjs";
+import { s as isAppLaunchError } from "./command-output-B3ycpsYv.mjs";
+import { l as iosSimulatorFailureAdvice, p as listUserApps, w as uninstallIosApp } from "./ios-lEJ5pKsq.mjs";
 import { closeSync, lstatSync, openSync, readFileSync, readSync, readdirSync } from "node:fs";
 import { createHash } from "node:crypto";
-import { join } from "node:path";
+import { isAbsolute, join } from "node:path";
 //#region src/engine/installed-artifact.ts
 const READ_CHUNK_BYTES = 1048576;
 const DEVICE_PATH_TIMEOUT_MS = 3e4;
@@ -30,7 +30,7 @@ function parseDeviceSha256(text) {
 function parseAppContainerPath(text) {
 	if (typeof text !== "string") return null;
 	const lines = text.split("\n").map((line) => line.trim()).filter(Boolean);
-	return lines.length === 1 && lines[0].startsWith("/") ? lines[0] : null;
+	return lines.length === 1 && isAbsolute(lines[0]) ? lines[0] : null;
 }
 function artifactsMatch(local, installed) {
 	return Boolean(local) && local === installed;
@@ -305,6 +305,11 @@ function iosAppProcess(udid, bundleId, { exec = null } = {}) {
 	}
 	return null;
 }
+function launchedIosAppAfterNoHandle(error, udid, bundleId, exec) {
+	const stderr = String(error?.stderr ?? "");
+	if (!stderr.includes("domain=NSPOSIXErrorDomain, code=3") || !stderr.includes(`Application launch for '${bundleId}' did not return a process handle nor launch error.`)) return null;
+	return iosAppProcess(udid, bundleId, { exec }) ?? null;
+}
 function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, consolePaths }, { exec = null } = {}) {
 	const e = exec || getExecutor();
 	const launchArgs = [
@@ -335,9 +340,11 @@ function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, conso
 		}
 		if (devClientScheme) {
 			const url = devClientUrl(devClientScheme, metroPort);
+			let launchedWithInitialUrl = false;
 			try {
 				if (consolePaths && iosAppProcess(udid, bundleId, { exec: e }) === null) {
 					const initialUrl = new URL(url).searchParams.get("url");
+					launchedWithInitialUrl = true;
 					const pid = parseLaunchedPid(e.runFile("xcrun", [
 						...launchArgs,
 						"--initialUrl",
@@ -364,14 +371,23 @@ function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, conso
 					jsLocation: jsLocationValue(metroPort)
 				};
 			} catch (err) {
+				const pid = launchedWithInitialUrl ? launchedIosAppAfterNoHandle(err, udid, bundleId, e) : null;
+				if (pid) return {
+					ok: true,
+					mode: "launch",
+					url,
+					jsLocation: jsLocationValue(metroPort),
+					pid
+				};
 				return {
 					failed: true,
 					code: LAUNCH_ERROR,
-					reason: `simctl openurl ${url} failed: ${describeIosSimulatorFailure(err, e)}`
+					reason: `simctl ${launchedWithInitialUrl ? `launch ${bundleId}` : `openurl ${url}`} failed: ${describeIosSimulatorFailure(err, e)}`
 				};
 			}
 		}
 	}
+	const preLaunchPid = iosAppProcess(udid, bundleId, { exec: e });
 	try {
 		const result = {
 			ok: true,
@@ -381,6 +397,16 @@ function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, conso
 		if (metroPort !== null) result.jsLocation = jsLocationValue(metroPort);
 		return result;
 	} catch (err) {
+		const pid = preLaunchPid === null ? launchedIosAppAfterNoHandle(err, udid, bundleId, e) : null;
+		if (pid) {
+			const result = {
+				ok: true,
+				mode: "launch",
+				pid
+			};
+			if (metroPort !== null) result.jsLocation = jsLocationValue(metroPort);
+			return result;
+		}
 		return {
 			failed: true,
 			code: LAUNCH_ERROR,
@@ -513,7 +539,7 @@ function reverseMetroPorts({ serial, metroPort, devicePorts = null }, { exec = n
 		reversed: pairs.map(([device, host]) => `tcp:${device}->tcp:${host}`)
 	};
 }
-const EMULATOR_HOST_LOOPBACK = "10.0.2.2";
+const EMULATOR_HOST_LOOPBACK = "127.0.0.1";
 const PHYSICAL_HOST_LOOPBACK = "localhost";
 function androidMetroHost(physical) {
 	return physical ? PHYSICAL_HOST_LOOPBACK : EMULATOR_HOST_LOOPBACK;
@@ -1134,12 +1160,12 @@ function unverifiedLaunchLines({ platform, metroPort, waitedMs = VERIFY_TIMEOUT_
 		return lines;
 	}
 	if (platform === "ios") {
-		push(picker);
+		if (devClient) push(picker);
 		if (url && udid) push(`Retry the deep link: xcrun simctl openurl ${udid} '${url}'`);
 		else if (udid && bundleId) push(`Re-launch: xcrun simctl launch --terminate-running-process ${udid} ${bundleId}`);
 	} else {
 		if (url && serial) push(`Re-send the dev-client deep link -- this is the command that points the app at THIS workspace's Metro: adb -s ${serial} shell am start -a android.intent.action.VIEW -d ${deviceShellArg(deviceShellArg(url))} --ez ${ANDROID_DISABLE_AUTO_LAUNCH_EXTRA} true`);
-		push(picker);
+		if (devClient) push(picker);
 		if (serial && bundleId) push(`If the app is stuck, restart its process: ${component ? `adb -s ${serial} shell am force-stop ${bundleId} && adb -s ${serial} shell am start -n ${component}` : url ? `adb -s ${serial} shell am force-stop ${bundleId} && adb -s ${serial} shell am start -a android.intent.action.VIEW -d ${deviceShellArg(deviceShellArg(url))} --ez ${ANDROID_DISABLE_AUTO_LAUNCH_EXTRA} true` : `adb -s ${serial} shell am force-stop ${bundleId} && adb -s ${serial} shell monkey -p ${bundleId} 1`}`);
 	}
 	lines.push(`Then check \`stim logs --source metro\`${mode ? ` (${mode})` : ""} for a bundle request.`);