@geekmidas/cli 10.0.0-alpha.49 → 10.0.0-alpha.50

package/dist/index.mjs

@@ -5,7 +5,7 @@ import { d as parseModuleConfig, f as appKey, l as loadWorkspaceConfig, n as Not
 import { D as assertDeployedStage, E as TEST_STAGE, O as deployedProblems, T as InvalidStages, a as getAppBuildOrder, b as getDeployTargetError, k as stageProblems, m as stripPublicPrefix, o as getAppGkmConfig, p as getPublicEnvPrefix, t as allConstructGlobs, x as isDeployTargetSupported } from "./workspace-DNzWgM1J.mjs";
 import { a as withCustomSecret, i as toEmbeddableSecrets, n as maskPassword, t as initStageSecrets } from "./storage-BzaUxmqe.mjs";
 import { a as getKeyPath, i as FileSecretsStore, n as secretsStoreFor } from "./store-DeGATCS-.mjs";
-import { C as loadEnvFiles, S as isPortAvailable, T as prepareEntryCredentials, _ as fakeKey, a as reconcileWorkspace, b as createEntryWrapper, c as LOCAL_CA_PATH, d as postgresDatabaseNames, f as quoteIdentifier, g as describeServices, h as rootSite, i as derivedContainers, l as forgetState, m as resourceName, n as backendsOf$1, p as pgClient, r as constructGlobs, s as COMPOSE_PATH, t as FAKE_ENV, u as applyPostgres, v as primaryPortKey, w as loadSecretsForApp, x as findAvailablePort, y as createCredentialsPreload } from "./workspace-cb6U29EL.mjs";
+import { C as loadEnvFiles, S as isPortAvailable, T as prepareEntryCredentials, _ as fakeKey, a as reconcileWorkspace, b as createEntryWrapper, c as LOCAL_CA_PATH, d as postgresDatabaseNames, f as quoteIdentifier, g as describeServices, h as rootSite, i as derivedContainers, l as forgetState, m as resourceName, n as backendsOf$1, p as pgClient, r as constructGlobs, s as COMPOSE_PATH, t as FAKE_ENV, u as applyPostgres, v as primaryPortKey, w as loadSecretsForApp, x as findAvailablePort, y as createCredentialsPreload } from "./workspace-BsbxbqV-.mjs";
 import { n as EndpointGenerator, r as runtimeFor } from "./OpenApiTsGenerator-BzIGy8KE.mjs";
 import { generateOpenApi, openapiCommand, resolveOpenApiConfig } from "./openapi.mjs";
 import { a as writeTestHarness, c as driversFor, i as TEST_MANIFEST_ENV, n as TEST_READY_FILE, o as SubscriberGenerator, s as cacheBackendsIn, t as TEST_READY_ENV } from "./ready-WfT-eWlm.mjs";
@@ -19,7 +19,7 @@ import { copyFileSync, existsSync, mkdirSync, readFileSync, unlinkSync, writeFil
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { basename, dirname, isAbsolute, join, parse, relative, resolve } from "node:path";
-import { execFile, execSync, spawn } from "node:child_process";
+import { execFile, execFileSync, execSync, spawn } from "node:child_process";
 import { cacheTable, canonicalId, cloudName, cookieDomain, dependentsOf, externalApiUrl, kebabCase, migrationFolder, mobileOrigins, provideKey, provisionOrder, schemeBase, scopedName, serviceKey } from "@geekmidas/manifest";
 import fg from "fast-glob";
 import chokidar from "chokidar";
@@ -42,7 +42,7 @@ import { Queue } from "@geekmidas/constructs/queue";
 import { Topic } from "@geekmidas/constructs/topic";
 import { lookup } from "node:dns/promises";
 //#region package.json
-var version = "10.0.0-alpha.49";
+var version = "10.0.0-alpha.50";
 //#endregion
 //#region src/auth/credentials.ts
 /**
@@ -551,6 +551,181 @@ var UnsupportedPlatform = class extends Error {
 	}
 };
 //#endregion
+//#region src/dev/appPorts.ts
+/**
+* Which local port each app answers on — and what to do when it is taken.
+*
+* An app's port used to be fixed: 3000, 3001, … and `gkm dev` refused to start
+* if anything held one. That is right when the holder is this same app, left
+* running by a previous `gkm dev` — moving would start a second copy beside it.
+* It is wrong when the holder is another project's dev server, which also
+* defaults to 3000: two projects could not run at once, and nothing about the
+* app needs that port. A browser reaches it through the edge, whose URL carries
+* no app port, and every address a phone or a route uses is derived on each
+* start.
+*
+* So the holder is asked who it is. Every app process gkm starts is tagged with
+* {@link APP_TAG_ENV} — the workspace and the app — and children inherit it, so
+* whatever actually binds the port (`next-server`, a Metro worker, the tsx
+* server) carries it. A held port whose holder carries this app's tag is a
+* leftover, and is refused; anything else — untagged, another workspace's,
+* unreadable — is not ours, and the app moves to the next free port.
+*
+* The choice is kept in `.gkm/app-ports.json`, not recomputed: an app that
+* moved stays where it moved, so a bookmark or a phone's saved address does not
+* break the next time the other project happens to be stopped. Local only —
+* `gkm deploy` and `gkm docker` never read it.
+*/
+var appPorts_exports = /* @__PURE__ */ __exportAll({
+	APP_TAG_ENV: () => APP_TAG_ENV,
+	appTag: () => appTag,
+	assignAppPorts: () => assignAppPorts,
+	describeHolder: () => describeHolder,
+	holderOf: () => holderOf,
+	savedAppPorts: () => savedAppPorts,
+	withAppPorts: () => withAppPorts
+});
+/** Carried by every app process gkm starts: `<workspace root>#<app>`. */
+const APP_TAG_ENV = "GKM_DEV_APP";
+const APP_PORTS_PATH = ".gkm/app-ports.json";
+/** The tag an app's processes carry. The root is encoded, so it has no spaces. */
+function appTag(root, app) {
+	return `${encodeURIComponent(resolve(root))}#${app}`;
+}
+/** Says, as `command (pid N)`, what holds a port. */
+function describeHolder(holder) {
+	if (!holder) return "another process";
+	return `${holder.command ?? "a process"} (pid ${holder.pid})`;
+}
+/**
+* Who is listening on a port, read the way a person would: `lsof` for the
+* pid, then that process's environment for its tag — `/proc/<pid>/environ` on
+* Linux, `ps eww` elsewhere. Both work for the user's own processes, which is
+* every process gkm starts; one that cannot be read has no tag, so is not ours.
+*/
+function holderOf(port) {
+	let out;
+	try {
+		out = execFileSync("lsof", [
+			"-nP",
+			`-iTCP:${port}`,
+			"-sTCP:LISTEN",
+			"-Fpc"
+		], {
+			encoding: "utf8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		});
+	} catch {
+		return;
+	}
+	const pid = Number(out.match(/^p(\d+)/m)?.[1]);
+	if (!pid) return void 0;
+	const command = out.match(/^c(.+)$/m)?.[1];
+	const tag = tagOf(pid);
+	return {
+		pid,
+		...command ? { command } : {},
+		...tag ? { tag } : {}
+	};
+}
+function tagOf(pid) {
+	const prefix = `${APP_TAG_ENV}=`;
+	try {
+		return (process.platform === "linux" ? readFileSync(`/proc/${pid}/environ`, "utf8").split("\0") : execFileSync("ps", [
+			"eww",
+			"-o",
+			"command=",
+			"-p",
+			String(pid)
+		], {
+			encoding: "utf8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		}).split(/\s+/)).find((entry) => entry.startsWith(prefix))?.slice(prefix.length);
+	} catch {
+		return;
+	}
+}
+/** The ports apps were given before, by app name. */
+async function savedAppPorts(root) {
+	try {
+		return JSON.parse(await readFile(join(root, APP_PORTS_PATH), "utf8"));
+	} catch {
+		return {};
+	}
+}
+async function saveAppPorts(root, ports) {
+	await mkdir(join(root, ".gkm"), { recursive: true });
+	await writeFile(join(root, APP_PORTS_PATH), `${JSON.stringify(ports, null, 2)}\n`);
+}
+/** The workspace, with each app on the port it was given locally. */
+function withAppPorts(workspace, ports) {
+	const apps = Object.fromEntries(Object.entries(workspace.apps).map(([name, app]) => [name, ports[name] ? {
+		...app,
+		port: ports[name]
+	} : app]));
+	return {
+		...workspace,
+		apps
+	};
+}
+/**
+* Give each named app a local port: the one it had, or its usual one, unless
+* another project holds it — then the next free one, which is kept.
+*
+* @returns every app's port, the apps that moved, and the apps this workspace
+*   already has running (the caller refuses to start those).
+*/
+async function assignAppPorts(workspace, names, deps) {
+	const saved = await savedAppPorts(workspace.root);
+	const wanted = {};
+	for (const name of names) {
+		const port = saved[name] ?? workspace.apps[name]?.port;
+		if (port) wanted[name] = port;
+	}
+	const taken = /* @__PURE__ */ new Set([...Object.values(saved), ...Object.values(wanted)]);
+	const ports = { ...saved };
+	const moved = [];
+	const running = [];
+	for (const name of Object.keys(wanted).sort()) {
+		const want = wanted[name];
+		ports[name] = want;
+		if (await deps.free(want)) continue;
+		const holder = deps.holder(want);
+		if (holder?.tag === appTag(workspace.root, name)) {
+			running.push({
+				app: name,
+				port: want,
+				holder
+			});
+			continue;
+		}
+		let next = want + 1;
+		while (taken.has(next) || !await deps.free(next)) next += 1;
+		taken.add(next);
+		ports[name] = next;
+		moved.push({
+			app: name,
+			from: want,
+			to: next,
+			holder
+		});
+	}
+	await saveAppPorts(workspace.root, ports);
+	return {
+		ports,
+		moved,
+		running
+	};
+}
+//#endregion
 //#region ../../node_modules/.pnpm/@hono+node-server@1.19.5_hono@4.13.8/node_modules/@hono/node-server/dist/index.mjs
 var RequestError = class extends Error {
 	constructor(message, options) {
@@ -1186,6 +1361,7 @@ async function devCommand(options) {
 		throw error;
 	});
 	if (!appConfig) {
+		logger$9.log("🔎 Reading gkm.config.ts and the constructs");
 		const { workspace: everything } = await loadWorkspaceConfig();
 		return workspaceDevCommand(everything, options);
 	}
@@ -1193,8 +1369,15 @@ async function devCommand(options) {
 	const appRoot = appConfig.appRoot;
 	const secretsRoot = appConfig.workspaceRoot;
 	const workspaceAppName = appConfig.appName;
-	const workspaceAppPort = appConfig.app.port;
-	const workspace = appConfig.workspace;
+	const assigned = await assignAppPorts(appConfig.workspace, [workspaceAppName], {
+		free: isPortAvailable,
+		holder: holderOf
+	});
+	if (assigned.running.length > 0) throw new WorkspacePortsInUse(assigned.running);
+	for (const { app, from, to, holder } of assigned.moved) logger$9.log(`↪️  ${app}: ${from} is held by ${describeHolder(holder)}, which is not this workspace's — using ${to}`);
+	const workspace = withAppPorts(appConfig.workspace, assigned.ports);
+	const workspaceAppPort = assigned.ports[workspaceAppName] ?? appConfig.app.port;
+	process.env[APP_TAG_ENV] = appTag(appConfig.workspaceRoot, workspaceAppName);
 	if (appConfig.app.entry) {
 		logger$9.log(`📄 Using entry point: ${appConfig.app.entry}`);
 		return entryDevCommand({
@@ -1227,6 +1410,7 @@ async function devCommand(options) {
 		bustCache,
 		serveEmpty: true
 	}));
+	logger$9.log(`🔨 Building ${workspaceAppName ?? "the app"}`);
 	const initial = await build();
 	const runtime = config.runtime ?? "node";
 	let secretsJsonPath;
@@ -1235,7 +1419,8 @@ async function devCommand(options) {
 	if (workspace) {
 		const reconciled = await reconcileWorkspace(workspace, {
 			stage: workspace.stages.local,
-			...options.fake ? { fake: true } : {}
+			...options.fake ? { fake: true } : {},
+			progress: (message) => logger$9.log(message)
 		});
 		if (reconciled.services.length > 0) {
 			logger$9.log("🐳 Services");
@@ -1494,7 +1679,14 @@ async function loadDevSecrets(workspace) {
 * 3. Generate dependency URLs ({APP_NAME}_URL)
 * 4. Spawn turbo run dev with injected env vars
 */
-async function workspaceDevCommand(workspace, options) {
+async function workspaceDevCommand(configured, options) {
+	const assigned = await assignAppPorts(configured, options.app ? [options.app] : options.filter ? [] : Object.keys(configured.apps), {
+		free: isPortAvailable,
+		holder: holderOf
+	});
+	if (assigned.running.length > 0) throw new WorkspacePortsInUse(assigned.running);
+	for (const { app, from, to, holder } of assigned.moved) logger$9.log(`↪️  ${app}: ${from} is held by ${describeHolder(holder)}, which is not this workspace's — using ${to}`);
+	const workspace = withAppPorts(configured, assigned.ports);
 	const appCount = Object.keys(workspace.apps).length;
 	const frontendApps = Object.entries(workspace.apps).filter(([_, app]) => app.type === "web");
 	const conflicts = checkPortConflicts(workspace);
@@ -1518,7 +1710,8 @@ async function workspaceDevCommand(workspace, options) {
 	const rawSecrets = await loadDevSecrets(workspace);
 	const reconciled = await reconcileWorkspace(workspace, {
 		stage: workspace.stages.local,
-		...options.fake ? { fake: true } : {}
+		...options.fake ? { fake: true } : {},
+		progress: (message) => logger$9.log(message)
 	});
 	if (reconciled.services.length > 0) {
 		logger$9.log("🐳 Services");
@@ -1530,10 +1723,11 @@ async function workspaceDevCommand(workspace, options) {
 	};
 	const fakes = options.fake ? await serveFakes(reconciled.fakes, reconciled.ports) : [];
 	for (const { id, port } of fakes) logger$9.log(`🎭 ${id} fake: http://localhost:${port}`);
+	logger$9.log(options.migrate || options.seed ? "🗄️  Migrating the databases" : "🗄️  Checking for pending migrations");
 	if (options.migrate || options.seed) {
-		const { prepareDevDatabases } = await import("./migrate-DhxTIA0z.mjs");
+		const { prepareDevDatabases } = await import("./migrate-B00XpVaO.mjs");
 		await prepareDevDatabases(workspace, reconciled.env, { seed: !!options.seed });
-	} else await import("./migrate-DhxTIA0z.mjs").then(({ reportPendingMigrations }) => reportPendingMigrations(workspace, reconciled.env)).catch((error) => {
+	} else await import("./migrate-B00XpVaO.mjs").then(({ reportPendingMigrations }) => reportPendingMigrations(workspace, reconciled.env)).catch((error) => {
 		logger$9.log(`⚠️  Could not check for pending migrations: ${error instanceof Error ? error.message : String(error)}`);
 	});
 	const appUrls = {};
@@ -1595,17 +1789,7 @@ async function workspaceDevCommand(workspace, options) {
 		...configPath ? { GKM_CONFIG_PATH: configPath } : {},
 		...options.fake ? { [FAKE_ENV]: "1" } : {}
 	};
-	const scoped = options.app ? [options.app] : options.filter ? [] : Object.keys(workspace.apps);
-	const held = [];
-	for (const appName of scoped) {
-		const port = workspace.apps[appName]?.port;
-		if (port && !await isPortAvailable(port)) held.push({
-			app: appName,
-			port,
-			holder: listenerOn(port)
-		});
-	}
-	if (held.length > 0) throw new WorkspacePortsInUse(held);
+	logger$9.log(`🚀 Starting ${appCount} app(s) — each builds before it answers, and says so when it is ready`);
 	const turboProcess = spawn("pnpm", [
 		"turbo",
 		"run",
@@ -1900,10 +2084,16 @@ var DevPortInUse = class extends Error {
 	}
 };
 /** Apps whose provisioned ports are held before the workspace starts. */
+/**
+* This workspace's own apps are already running — left by a previous start.
+*
+* Only these are refused: a port another project holds is moved off instead
+* (see `assignAppPorts`), but moving off our own would start a second copy.
+*/
 var WorkspacePortsInUse = class extends Error {
 	held;
 	constructor(held) {
-		super(`Ports this workspace's apps are provisioned on are already in use:\n${held.map(({ app, port, holder }) => `   ${app}: ${port}${holder ? ` — held by ${holder}` : ""}`).join("\n")}\nStop what is holding them (often dev servers a previous run left behind) and start again. Nothing was started.`);
+		super(`This workspace's apps are already running:\n${held.map(({ app, port, holder }) => `   ${app}: ${port} — ${describeHolder(holder)}`).join("\n")}\nA previous \`gkm dev\` left them behind. Stop them (kill the pids above) and start again. Nothing was started.`);
 		this.held = held;
 		this.name = "WorkspacePortsInUse";
 	}
@@ -3999,7 +4189,7 @@ async function createDnsProvider(options) {
 	if (isDnsProvider(config.provider)) return config.provider;
 	const provider = config.provider;
 	if (provider === "hostinger") {
-		const { HostingerProvider } = await import("./HostingerProvider-Bh6K7QYz.mjs");
+		const { HostingerProvider } = await import("./HostingerProvider-GF6NAZAK.mjs");
 		return new HostingerProvider();
 	}
 	if (provider === "route53") {
@@ -9126,26 +9316,26 @@ function loadPackageJson() {
 * Run: pnpm --filter @geekmidas/cli sync-versions
 */
 const GEEKMIDAS_VERSIONS = {
-	"@geekmidas/audit": "~10.0.0-alpha.49",
-	"@geekmidas/auth": "~10.0.0-alpha.49",
-	"@geekmidas/cache": "~10.0.0-alpha.49",
-	"@geekmidas/client": "~10.0.0-alpha.49",
-	"@geekmidas/cloud": "~10.0.0-alpha.49",
-	"@geekmidas/constructs": "~10.0.0-alpha.49",
-	"@geekmidas/db": "~10.0.0-alpha.49",
-	"@geekmidas/emailkit": "~10.0.0-alpha.49",
-	"@geekmidas/envkit": "~10.0.0-alpha.49",
-	"@geekmidas/errors": "~10.0.0-alpha.49",
-	"@geekmidas/events": "~10.0.0-alpha.49",
-	"@geekmidas/logger": "~10.0.0-alpha.49",
-	"@geekmidas/manifest": "~10.0.0-alpha.49",
-	"@geekmidas/rate-limit": "~10.0.0-alpha.49",
-	"@geekmidas/schema": "~10.0.0-alpha.49",
-	"@geekmidas/services": "~10.0.0-alpha.49",
-	"@geekmidas/storage": "~10.0.0-alpha.49",
-	"@geekmidas/studio": "~10.0.0-alpha.49",
-	"@geekmidas/telescope": "~10.0.0-alpha.49",
-	"@geekmidas/testkit": "~10.0.0-alpha.49",
+	"@geekmidas/audit": "~10.0.0-alpha.50",
+	"@geekmidas/auth": "~10.0.0-alpha.50",
+	"@geekmidas/cache": "~10.0.0-alpha.50",
+	"@geekmidas/client": "~10.0.0-alpha.50",
+	"@geekmidas/cloud": "~10.0.0-alpha.50",
+	"@geekmidas/constructs": "~10.0.0-alpha.50",
+	"@geekmidas/db": "~10.0.0-alpha.50",
+	"@geekmidas/emailkit": "~10.0.0-alpha.50",
+	"@geekmidas/envkit": "~10.0.0-alpha.50",
+	"@geekmidas/errors": "~10.0.0-alpha.50",
+	"@geekmidas/events": "~10.0.0-alpha.50",
+	"@geekmidas/logger": "~10.0.0-alpha.50",
+	"@geekmidas/manifest": "~10.0.0-alpha.50",
+	"@geekmidas/rate-limit": "~10.0.0-alpha.50",
+	"@geekmidas/schema": "~10.0.0-alpha.50",
+	"@geekmidas/services": "~10.0.0-alpha.50",
+	"@geekmidas/storage": "~10.0.0-alpha.50",
+	"@geekmidas/studio": "~10.0.0-alpha.50",
+	"@geekmidas/telescope": "~10.0.0-alpha.50",
+	"@geekmidas/testkit": "~10.0.0-alpha.50",
 	"@geekmidas/cli": `~${loadPackageJson().version}`
 };
 //#endregion
@@ -15888,7 +16078,7 @@ function testDatabases(reconciled) {
 * starts without the reference data the app needs.
 */
 async function migrateTestStage(workspace, env) {
-	const { migrateAndSeed } = await import("./migrate-DhxTIA0z.mjs");
+	const { migrateAndSeed } = await import("./migrate-B00XpVaO.mjs");
 	const { discover } = await import("./discover-Cf2jAcgF.mjs").then((n) => n.n);
 	const sources = {};
 	const manifest = await discover({
@@ -16319,7 +16509,7 @@ program.command("migrate").description("Apply each database construct's migratio
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { migrateCommand } = await import("./migrate-DhxTIA0z.mjs");
+		const { migrateCommand } = await import("./migrate-B00XpVaO.mjs");
 		await migrateCommand({
 			...options,
 			...construct ? { construct } : {}
@@ -16333,7 +16523,7 @@ program.command("seed").description("Migrate, then run each database construct's
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { seedCommand } = await import("./migrate-DhxTIA0z.mjs");
+		const { seedCommand } = await import("./migrate-B00XpVaO.mjs");
 		await seedCommand({
 			...options,
 			...construct ? { construct } : {}
@@ -16347,7 +16537,7 @@ program.command("migration").description("Write a construct's next migration: an
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { migrationCommand } = await import("./migrate-DhxTIA0z.mjs");
+		const { migrationCommand } = await import("./migrate-B00XpVaO.mjs");
 		await migrationCommand({
 			construct,
 			...name ? { name } : {}
@@ -16508,7 +16698,7 @@ program.command("secrets:reconcile").description("Backfill missing custom secret
 			console.error(`No secrets found for stage "${stage}". Run "gkm secrets:init --stage ${stage}" first.`);
 			process.exit(1);
 		}
-		const { derivedContainers } = await import("./workspace-cb6U29EL.mjs").then((n) => n.o);
+		const { derivedContainers } = await import("./workspace-BsbxbqV-.mjs").then((n) => n.o);
 		const result = reconcileMissingSecrets(secrets, workspace, await derivedContainers(workspace, stage));
 		if (!result) {
 			console.log(`\n✓ Secrets for stage "${stage}" are up-to-date`);
@@ -16692,6 +16882,6 @@ program.command("upgrade").description("Upgrade @geekmidas/cli (with --all, ever
 });
 program.parse();
 //#endregion
-export { getHostingerToken as a, encryption_exports as i, slug as n, stamp as r, generateFullstackCustomSecrets as t };
+export { appPorts_exports as a, encryption_exports as i, slug as n, getHostingerToken as o, stamp as r, generateFullstackCustomSecrets as t };
 
 //# sourceMappingURL=index.mjs.map