stim 1.18.0 → 1.20.0

package/dist/{server-expo-DoBHhuzK.mjs → server-expo-CsYu2aKL.mjs}

@@ -1,19 +1,94 @@
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
+import { t as getExecutor } from "./exec-B81Qodjn.mjs";
+import { K as resolveProjectSettings } from "./settings-Bbztm4oV.mjs";
 import { n as stripAnsi, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { h as resolvePackageJson } from "./project-C3ChRLZy.mjs";
-import { O as projectMetroSharedCache } from "./settings-CQyMElEP.mjs";
-import { a as metroStoreRoot, c as supervisorError, i as metroStoreConfirmedRoot, n as expoMetroConfigPath, o as registerMetroStore, r as expoMetroStoreEnv } from "./metro-store-BAHFcJm6.mjs";
-import { r as createNdjsonWriter } from "./ndjson-LGZAMsqa.mjs";
+import { S as resolvePackageJson } from "./project-B8_duAzW.mjs";
+import { r as createNdjsonWriter } from "./ndjson-GOnbyvso.mjs";
+import { a as expoMetroStoreEnv, c as registerMetroStore, f as resolveMetroSharedCache, i as expoMetroConfigPath, n as supervisorError, o as metroStoreConfirmedRoot, s as metroStoreRoot } from "./errors-DzkMYh8Q.mjs";
 import { accessSync, constants, existsSync, readFileSync } from "node:fs";
-import { dirname, join, parse } from "node:path";
+import { dirname, join } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";
-//#region src/supervisor/server-expo.ts
+//#region src/supervisor/child-server.ts
 function delay(ms) {
 	return new Promise((resolve) => {
 		const timer = setTimeout(resolve, ms);
 		if (typeof timer.unref === "function") timer.unref();
 	});
 }
+function superviseChildServer({ mode, child, log, toRecord, signal, alive = null, killTimeoutMs, onRecord = null }) {
+	let lastMsg = null;
+	let lastAt = 0;
+	const emit = (stream) => (chunk) => {
+		const record = toRecord(chunk, stream);
+		if (!record) return;
+		if (typeof record.requestId === "string") {
+			log.write(record);
+			onRecord?.(record);
+			return;
+		}
+		const now = Date.now();
+		if (record.msg === lastMsg && now - lastAt < 1e3) return;
+		lastMsg = typeof record.msg === "string" ? record.msg : null;
+		lastAt = now;
+		log.write(record);
+		onRecord?.(record);
+	};
+	const outReader = createLineReader(emit("stdout"));
+	const errReader = createLineReader(emit("stderr"));
+	child.stdout?.setEncoding?.("utf-8");
+	child.stderr?.setEncoding?.("utf-8");
+	child.stdout?.on("data", (chunk) => outReader.push(chunk));
+	child.stderr?.on("data", (chunk) => errReader.push(chunk));
+	let exited = false;
+	let exitInfo = null;
+	const listeners = [];
+	child.on("exit", (code, sig) => {
+		exited = true;
+		exitInfo = {
+			code,
+			signal: sig
+		};
+		outReader.flush();
+		errReader.flush();
+		for (const cb of listeners) cb(exitInfo);
+	});
+	child.on("error", (err) => {
+		if (exited) return;
+		exited = true;
+		exitInfo = {
+			code: null,
+			signal: null,
+			error: err
+		};
+		for (const cb of listeners) cb(exitInfo);
+	});
+	return {
+		mode,
+		serverPid: child.pid ?? null,
+		child,
+		onExit(cb) {
+			if (exited) {
+				cb(exitInfo);
+				return;
+			}
+			listeners.push(cb);
+		},
+		async close() {
+			const running = () => alive ? alive() : !exited && Boolean(child.pid);
+			const gone = async () => {
+				const deadline = Date.now() + killTimeoutMs;
+				while (running() && Date.now() < deadline) await delay(25);
+				return !running();
+			};
+			if (!running() || !signal("SIGTERM")) return;
+			if (!await gone()) {
+				signal("SIGKILL");
+				await gone();
+			}
+		}
+	};
+}
+//#endregion
+//#region src/supervisor/server-expo.ts
 function resolveExpoBin(root) {
 	const fromPackage = expoBinFromPackage(resolvePackageJson(root, "expo"));
 	if (fromPackage) return {
@@ -56,15 +131,19 @@ function expoBinFromPackage(packageJsonPath, binName = "expo") {
 	return isExecutableFile(file) ? file : null;
 }
 function findBinUpward(startDir, name, { exists = existsSync } = {}) {
+	const stop = repositoryRoot(startDir, exists) ?? startDir;
 	let dir = startDir;
-	const stop = parse(startDir).root;
 	while (true) {
 		const candidate = join(dir, "node_modules", ".bin", name);
 		if (exists(candidate)) return candidate;
 		if (dir === stop) return null;
-		const parent = dirname(dir);
-		if (parent === dir) return null;
-		dir = parent;
+		dir = dirname(dir);
+	}
+}
+function repositoryRoot(startDir, exists) {
+	for (let dir = startDir;; dir = dirname(dir)) {
+		if (exists(join(dir, ".git"))) return dir;
+		if (dirname(dir) === dir) return null;
 	}
 }
 function isExecutableFile(file) {
@@ -114,7 +193,7 @@ function cleanLine(line) {
 	const parts = stripAnsi(line).split("\r");
 	return (parts[parts.length - 1] ?? "").trimEnd();
 }
-function recordFromLine(line, { stream = "stdout" } = {}) {
+function recordFromLine(line, { stream = "stdout", source = "expo" } = {}) {
 	const msg = cleanLine(line);
 	if (!msg.trim()) return null;
 	if (stream === "stderr" && msg.startsWith("stim-bundle-response: ")) try {
@@ -133,7 +212,7 @@ function recordFromLine(line, { stream = "stdout" } = {}) {
 		level: inferLevel(msg),
 		msg,
 		raw: true,
-		event: stream === "stderr" ? "expo_stderr" : "expo_stdout"
+		event: `${source}_${stream === "stderr" ? "stderr" : "stdout"}`
 	};
 	if (isBundleMarker(msg)) record.marker = true;
 	return record;
@@ -153,8 +232,8 @@ function parseExpoWaitingOnUrl(line) {
 	if (HTTP_SCHEME_RE.test(url)) return url;
 	return URL_SCHEME_RE.test(url) ? url.replace(/^[^:]+:/, "https:") : url;
 }
-function resolveMetroStoreInjection(root, { log, env }) {
-	const sharedCache = projectMetroSharedCache(root);
+function resolveMetroStoreInjection(root, { log, env, settings }) {
+	const sharedCache = resolveMetroSharedCache(settings);
 	if (!sharedCache) log.write({
 		src: "metro",
 		level: "debug",
@@ -198,7 +277,7 @@ function resolveMetroStoreInjection(root, { log, env }) {
 	});
 	return additions;
 }
-async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = null, killTimeoutMs = 5e3, tunnel = false, resetCache = false, onTunnelUrl = null, platform = process.platform }) {
+async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = null, killTimeoutMs = 5e3, tunnel = false, resetCache = false, onTunnelUrl = null, platform = process.platform, settings }) {
 	const resolved = resolveExpoBin(root);
 	if (!resolved) {
 		const refusal = expoBinRefusal(root);
@@ -216,7 +295,8 @@ async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = n
 	];
 	const storeEnv = resolveMetroStoreInjection(root, {
 		log,
-		env: process.env
+		env: process.env,
+		settings: settings ?? resolveProjectSettings(root).settings
 	});
 	const [command, commandArgs] = platform === "win32" && resolved.source === "package" ? [process.execPath, [bin, ...args]] : [bin, args];
 	const child = spawn(command, commandArgs, {
@@ -235,78 +315,23 @@ async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = n
 			...tunnel ? { EXPO_UNSTABLE_TUNNEL_V2: "1" } : {}
 		}
 	});
-	let lastMsg = null;
-	let lastAt = 0;
 	let tunnelUrlSeen = false;
-	const emit = (stream) => (chunk) => {
-		const record = recordFromLine(chunk, { stream });
-		if (!record) return;
-		const now = Date.now();
-		if (record.msg === lastMsg && now - lastAt < 1e3) return;
-		lastMsg = typeof record.msg === "string" ? record.msg : null;
-		lastAt = now;
-		log.write(record);
-		if (tunnel && !tunnelUrlSeen && onTunnelUrl && typeof record.msg === "string") {
+	return superviseChildServer({
+		mode: "expo-child",
+		child,
+		log,
+		toRecord: (chunk, stream) => recordFromLine(chunk, { stream }),
+		signal: (sig) => child.kill(sig),
+		killTimeoutMs,
+		onRecord: (record) => {
+			if (!tunnel || tunnelUrlSeen || !onTunnelUrl || typeof record.msg !== "string") return;
 			const url = parseExpoWaitingOnUrl(record.msg);
 			if (url) {
 				tunnelUrlSeen = true;
 				onTunnelUrl(url);
 			}
 		}
-	};
-	const outReader = createLineReader(emit("stdout"));
-	const errReader = createLineReader(emit("stderr"));
-	child.stdout?.setEncoding?.("utf-8");
-	child.stderr?.setEncoding?.("utf-8");
-	child.stdout?.on("data", (chunk) => outReader.push(chunk));
-	child.stderr?.on("data", (chunk) => errReader.push(chunk));
-	let exited = false;
-	let exitInfo = null;
-	const listeners = [];
-	child.on("exit", (code, signal) => {
-		exited = true;
-		exitInfo = {
-			code,
-			signal
-		};
-		outReader.flush();
-		errReader.flush();
-		for (const cb of listeners) cb(exitInfo);
-	});
-	child.on("error", (err) => {
-		if (exited) return;
-		exited = true;
-		exitInfo = {
-			code: null,
-			signal: null,
-			error: err
-		};
-		for (const cb of listeners) cb(exitInfo);
 	});
-	return {
-		mode: "expo-child",
-		serverPid: child.pid ?? null,
-		child,
-		onExit(cb) {
-			if (exited) {
-				cb(exitInfo);
-				return;
-			}
-			listeners.push(cb);
-		},
-		async close() {
-			if (exited || !child.pid) return;
-			const dead = new Promise((resolve) => {
-				child.once("exit", () => resolve());
-			});
-			if (!child.kill("SIGTERM")) return;
-			await Promise.race([dead, delay(killTimeoutMs)]);
-			if (!exited) {
-				child.kill("SIGKILL");
-				await Promise.race([dead, delay(killTimeoutMs)]);
-			}
-		}
-	};
 }
 //#endregion
-export { expoProxyEnv as a, inferLevel as c, parseExpoWaitingOnUrl as d, recordFromLine as f, expoBinRefusal as i, isBundleMarker as l, expoBinFromPackage as n, expoSdkMajor as o, startExpoServer as p, expoBinPath as r, findBinUpward as s, cleanLine as t, isDevClientNavigationNotice as u };
+export { expoProxyEnv as a, inferLevel as c, parseExpoWaitingOnUrl as d, recordFromLine as f, expoBinRefusal as i, isBundleMarker as l, superviseChildServer as m, expoBinFromPackage as n, expoSdkMajor as o, startExpoServer as p, expoBinPath as r, findBinUpward as s, cleanLine as t, isDevClientNavigationNotice as u };

package/dist/server-expo-DV43vep4.mjs

@@ -0,0 +1,2 @@
+import { p as startExpoServer } from "./server-expo-CsYu2aKL.mjs";
+export { startExpoServer };