stim 1.20.2 → 1.21.0

package/dist/{metro-gateway-CX9Xlkq2.mjs → metro-gateway-BMJNlj3E.mjs}

@@ -1,17 +1,18 @@
-import { k as process_identity_exports } from "./config-BYDxlMY3.mjs";
-import { a as updateWorkspaceState, r as readWorkspaceState$1 } from "./workspace-state-DJt_MMvf.mjs";
-import { l as realIo } from "./tailnet-Dh-qiYzG.mjs";
-import { HOSTED_METRO_REQUESTS_KEY, findPeer, hostedMetroGateways, hostedMetroRequests, isJsonObject, parseMachine } from "@stim-cli/core/state";
+import { p as process_identity_exports } from "./exec-_UbtCQcG.mjs";
+import { st as tailscaleStatusAsync } from "./config-CYcBF478.mjs";
+import { l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState$1, s as updateWorkspaceStateAsync } from "./workspace-state-Cjuigeeu.mjs";
+import { Qt as cancellableSleep, en as throwIfCancelled } from "./settings-CsJDEXgK.mjs";
 import { randomBytes, randomUUID } from "node:crypto";
+import { HOSTED_METRO_REQUESTS_KEY, findPeer, hostedMetroGateways, hostedMetroRequests, isJsonObject, parseMachine } from "@stim-cli/core/state";
 import { isIP } from "node:net";
 //#region src/device-host/metro-gateway.ts
 function gatewayAddresses(credential, status) {
 	const machine = parseMachine(credential.machine);
 	const peer = machine ? findPeer(status, machine.name) : "missing";
-	if (typeof peer === "string" || peer.nodeId !== credential.nodeId) throw new Error(`${credential.machine} no longer resolves to its pinned tailnet node. Run stim doctor.`);
+	if (typeof peer === "string") throw new Error(`${credential.machine} no longer resolves to one tailnet peer. Run stim doctor.`);
 	const self = isJsonObject(status) && isJsonObject(status.Self) ? status.Self : null;
 	const address = (Array.isArray(self?.TailscaleIPs) ? self.TailscaleIPs : []).find((ip) => typeof ip === "string" && isIP(ip) === isIP(peer.address) && isIP(ip) !== 0);
-	if (!address) throw new Error("This Mac has no Tailscale address compatible with the hosting Mac.");
+	if (!address) throw new Error("This machine has no Tailscale address compatible with the hosting Mac.");
 	return {
 		address,
 		peer: peer.address
@@ -25,9 +26,12 @@ function requireHostedMetro(root) {
 		remedy: "Run stim stop; stim start, then retry."
 	});
 }
-async function requestHostedMetro(root, session, credential) {
+async function requestHostedMetro(root, session, credential, signal) {
+	throwIfCancelled(signal, "hosted Metro gateway");
+	requireHostedMetro(root);
+	const addresses = gatewayAddresses(credential, await tailscaleStatusAsync(signal));
+	throwIfCancelled(signal, "hosted Metro gateway");
 	requireHostedMetro(root);
-	const addresses = gatewayAddresses(credential, realIo.status());
 	const previous = hostedMetroRequests(readWorkspaceState$1(root))[session];
 	const request = previous && previous.address === addresses.address && previous.peer === addresses.peer ? previous : {
 		id: randomUUID(),
@@ -35,15 +39,16 @@ async function requestHostedMetro(root, session, credential) {
 		...addresses,
 		secret: randomBytes(32).toString("hex")
 	};
-	updateWorkspaceState(root, (state) => ({
+	await updateWorkspaceStateAsync(root, (state) => ({
 		...state,
 		[HOSTED_METRO_REQUESTS_KEY]: {
 			...hostedMetroRequests(state),
 			[session]: request
 		}
-	}));
+	}), signal);
 	const deadline = Date.now() + 15e3;
 	while (Date.now() < deadline) {
+		throwIfCancelled(signal, "hosted Metro gateway");
 		const state = readWorkspaceState$1(root);
 		const gateway = hostedMetroGateways(state)[session];
 		if (gateway?.id === request.id && gateway.processToken === state?.supervisor?.processToken) {
@@ -53,7 +58,10 @@ async function requestHostedMetro(root, session, credential) {
 				secret: request.secret
 			};
 		}
-		await new Promise((done) => setTimeout(done, 100));
+		await cancellableSleep(100, {
+			signal,
+			what: "hosted Metro gateway"
+		});
 	}
 	throw new Error(`The Metro supervisor did not open a private gateway for ${credential.machine}. Run stim stop; stim start, then retry.`);
 }
@@ -68,7 +76,7 @@ function clearHostedMetro(root, session) {
 	});
 }
 async function closeHostedMetro(root, session) {
-	clearHostedMetro(root, session);
+	await withWorkspaceStateLockAsync(root, () => clearHostedMetro(root, session));
 	const deadline = Date.now() + 5e3;
 	while (true) {
 		const state = readWorkspaceState$1(root);

package/dist/{named-ports-4WopRPg-.mjs → named-ports-BWTzt6mu.mjs}

@@ -1,63 +1,8 @@
-import { C as saveConfig, D as withConfigLock, _ as loadConfig, c as ensureConfig, d as getConfigDir, j as ownership_claim_exports, k as process_identity_exports, p as getProject } from "./config-BYDxlMY3.mjs";
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { d as signalProcessTree, f as createPortProbe, o as parseNetstatPids } from "./metro-DnCEjCxs.mjs";
-import { n as declareSpawnsOn, o as stopDeclaringSpawnsOn } from "./spawn-claims-DVS5RkMS.mjs";
+import { p as process_identity_exports, t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { C as saveConfig, O as withConfigLockAsync, _ as loadConfig, c as ensureConfig, d as getConfigDir, p as getProject } from "./config-CYcBF478.mjs";
+import { c as parseNetstatPids, h as createPortProbe, p as signalProcessTree } from "./metro-DEXpIhHC.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-1_1OoVW5.mjs";
 import { realpathSync } from "node:fs";
-import { join } from "node:path";
-import { setTimeout } from "node:timers/promises";
-//#region src/engine/workspace-process-lock.ts
-const DEFAULT_WAIT_MS = 6e4;
-const POLL_MS = 25;
-function workspaceProcessLockError(err) {
-	const code = err?.code;
-	if (code === "STIM_LOCK_REFUSED") return "refused";
-	if (code === "STIM_LOCK_TIMEOUT") return "timeout";
-	return null;
-}
-function workspaceProcessLockPath(root, name, external) {
-	return external ? join(root, `${name}.lock`) : join(root, ".stim", `${name}.lock`);
-}
-async function withWorkspaceProcessLock(root, name, fn, { now = Date.now, signal, sleep = (ms) => setTimeout(ms, void 0, { signal }), waitMs = DEFAULT_WAIT_MS, ownerPurpose, details = {}, onHeld, rejectOwnerPurposes = [], external = false, declareSpawns = false } = {}) {
-	const path = workspaceProcessLockPath(root, name, external);
-	const deadline = now() + waitMs;
-	for (;;) {
-		signal?.throwIfAborted();
-		const attempt = (0, ownership_claim_exports.tryAcquireClaim)({
-			root: path,
-			mode: "exclusive",
-			label: `${name} lock`,
-			details: ownerPurpose ? {
-				...details,
-				purpose: ownerPurpose
-			} : details
-		});
-		if (attempt.pending) (0, ownership_claim_exports.releaseClaim)(attempt.pending);
-		if (attempt.acquired) {
-			if (declareSpawns) declareSpawnsOn(attempt.acquired);
-			try {
-				return await fn(attempt.acquired);
-			} finally {
-				stopDeclaringSpawnsOn(attempt.acquired);
-				(0, ownership_claim_exports.releaseClaim)(attempt.acquired);
-			}
-		}
-		const holder = attempt.held ?? attempt.waitingFor?.[0];
-		const purpose = holder?.details.purpose;
-		if (typeof purpose === "string" && rejectOwnerPurposes.includes(purpose)) {
-			const error = /* @__PURE__ */ new Error(`The ${name} lock at ${path} is held for ${purpose}.`);
-			error.code = "STIM_LOCK_REFUSED";
-			throw error;
-		}
-		if (holder && onHeld) await onHeld(holder);
-		if (now() >= deadline) {
-			const error = /* @__PURE__ */ new Error(`Timed out waiting for the ${name} lock at ${path}.`);
-			error.code = "STIM_LOCK_TIMEOUT";
-			throw error;
-		}
-		await sleep(POLL_MS);
-	}
-}
-//#endregion
 //#region src/named-ports.ts
 const FIRST_PORT = 8900;
 const LAST_PORT = 8999;
@@ -124,7 +69,7 @@ function reserveBrowserPort(projectPath, options = {}) {
 	return allocateNamedPort(projectPath, BROWSER_LABEL, options);
 }
 function releaseBrowserPort(projectPath, port) {
-	return withPortsLock(async () => withConfigLock(() => {
+	return withPortsLock(async () => withConfigLockAsync(() => {
 		const cfg = loadConfig();
 		const ports = cfg?.projects?.[projectPath]?.ports;
 		if (!cfg || ports?.[BROWSER_LABEL] !== port) return;
@@ -140,7 +85,7 @@ async function allocateNamedPort(projectPath, label, { isFree = createPortProbe(
 		for (let port = FIRST_PORT; port <= LAST_PORT; port++) {
 			if (Object.values(loadConfig()?.projects ?? {}).some((project) => project.metroPort === port || Object.values(project.ports ?? {}).includes(port))) continue;
 			if (!await isFree(port)) continue;
-			if (withConfigLock(() => {
+			if (await withConfigLockAsync(() => {
 				const cfg = ensureConfig();
 				if (Object.values(cfg.projects).some((project) => project.metroPort === port || Object.values(project.ports ?? {}).includes(port))) return false;
 				const project = cfg.projects[root] ??= {
@@ -211,7 +156,7 @@ async function clearNamedPorts(projectPath, { label, stop = false, dryRun = fals
 				log(`would release ${name} (${port})`);
 				continue;
 			}
-			withConfigLock(() => {
+			await withConfigLockAsync(() => {
 				const cfg = loadConfig();
 				const current = cfg?.projects?.[projectPath]?.ports;
 				if (!cfg || current?.[name] !== port) return;
@@ -226,4 +171,4 @@ async function clearNamedPorts(projectPath, { label, stop = false, dryRun = fals
 	});
 }
 //#endregion
-export { withWorkspaceProcessLock as a, reserveBrowserPort as i, getNamedPort as n, workspaceProcessLockError as o, releaseBrowserPort as r, workspaceProcessLockPath as s, clearNamedPorts as t };
+export { reserveBrowserPort as i, getNamedPort as n, releaseBrowserPort as r, clearNamedPorts as t };