@geekmidas/cli 10.0.0-alpha.25 → 10.0.0-alpha.26

package/dist/index.mjs

@@ -3,13 +3,13 @@ import { n as __require, t as __exportAll } from "./rolldown-runtime-BhDjJH2R.mj
 import { i as DEFAULT_CACHE, r as ConstructGenerator, s as isPartitionedRoutes, t as discover } from "./discover-0fhCbnk0.mjs";
 import { i as loadConfig, l as derivedApps, n as getAppNameFromCwd, o as loadWorkspaceConfig, r as loadAppConfig, s as parseModuleConfig } from "./config-DBGpRTUy.mjs";
 import { A as stripPublicPrefix, C as InvalidStages, D as stageProblems, E as deployedProblems, T as assertDeployedStage, a as getAppBuildOrder, k as getPublicEnvPrefix, o as getAppGkmConfig, s as getDependencyEnvVars, t as allConstructGlobs, v as getDeployTargetError, w as TEST_STAGE, y as isDeployTargetSupported } from "./workspace-Bu3xNCej.mjs";
-import { C as providerOf, S as eventsBackendFor, _ as COMPOSE_PATH, a as loadEnvFiles, b as resourceName, c as resolveServicePorts, d as backendsOf, f as constructGlobs, h as usesConstructs, i as isPortAvailable, l as rewriteUrlsWithPorts, m as reconcileWorkspace, n as createEntryWrapper, o as loadSecretsForApp, p as derivedContainers, r as findAvailablePort, s as prepareEntryCredentials, t as createCredentialsPreload, u as startWorkspaceServices, v as LOCAL_CA_PATH, w as storageBackendFor, x as cacheBackendFor, y as applyPostgres } from "./credentials-BpoOUa74.mjs";
+import { C as providerOf, S as eventsBackendFor, _ as COMPOSE_PATH, a as loadEnvFiles, b as resourceName, c as resolveServicePorts, d as backendsOf, f as constructGlobs, h as usesConstructs, i as isPortAvailable, l as rewriteUrlsWithPorts, m as reconcileWorkspace, n as createEntryWrapper, o as loadSecretsForApp, p as derivedContainers, r as findAvailablePort, s as prepareEntryCredentials, t as createCredentialsPreload, u as startWorkspaceServices, v as LOCAL_CA_PATH, w as storageBackendFor, x as cacheBackendFor, y as applyPostgres } from "./credentials-DI9kJcaP.mjs";
 import { a as generateServiceCredentials, i as generateSecurePassword, n as generateConnectionUrls, o as rotateServicePassword, t as createStageSecrets } from "./generator-LfZU7NlU.mjs";
 import { c as getKeyPath, i as setCustomSecret, n as readStageSecrets, o as toEmbeddableSecrets, r as secretsExist, s as writeStageSecrets, t as maskPassword } from "./storage-TP0x118M.mjs";
 import { a as openapiCommand, c as EndpointGenerator, l as runtimeFor, n as generateOpenApi, o as resolveOpenApiConfig, s as OpenApiTsGenerator, t as OPENAPI_OUTPUT_PATH$1 } from "./openapi-DHQlstv6.mjs";
 import { i as withRoutes, r as withCompute } from "./emit-Bzq7JsMP.mjs";
 import { i as writeDockerEnvFromSecrets, r as generateFullstackCustomSecrets } from "./reconcile-gb1lz1Dk.mjs";
-import { a as isRemoteStore, n as pullStageSecrets, r as pushStageSecrets, t as NoStoredSecrets } from "./transfer-B88fTvnh.mjs";
+import { a as isRemoteStore, n as pullStageSecrets, r as pushStageSecrets, t as NoStoredSecrets } from "./transfer-CAJs_vhu.mjs";
 import { createRequire } from "node:module";
 import { Command } from "commander";
 import { stdin, stdout } from "node:process";
@@ -39,7 +39,7 @@ import prompts from "prompts";
 import { EnvironmentParser } from "@geekmidas/envkit";
 import { serviceContext } from "@geekmidas/services";
 //#region package.json
-var version = "10.0.0-alpha.25";
+var version = "10.0.0-alpha.26";
 //#endregion
 //#region src/auth/credentials.ts
 /**
@@ -653,7 +653,7 @@ async function devCommand(options) {
 	}
 	if (workspace && workspaceAppName) {
 		const depEnv = getDependencyEnvVars(workspace, workspaceAppName);
-		Object.assign(appSecrets, depEnv);
+		for (const [key, value] of Object.entries(depEnv)) appSecrets[key] ??= value;
 	}
 	if (Object.keys(appSecrets).length > 0) {
 		const secretsDir = join(secretsRoot, ".gkm");
@@ -663,7 +663,7 @@ async function devCommand(options) {
 		await writeFile(secretsJsonPath, JSON.stringify(appSecrets, null, 2));
 		logger$11.log(`🔐 Loaded ${Object.keys(appSecrets).length} secret(s)`);
 	}
-	const devServer = new DevServer(resolved.providers[0], options.port ?? workspaceAppPort ?? 3e3, options.portExplicit ?? false, enableOpenApi, telescope, studio, runtime, appRoot, secretsJsonPath, initial.selfServing !== void 0);
+	const devServer = new DevServer(resolved.providers[0], options.port ?? workspaceAppPort ?? 3e3, options.portExplicit ?? workspaceAppPort !== void 0, enableOpenApi, telescope, studio, runtime, appRoot, secretsJsonPath, initial.selfServing !== void 0);
 	await devServer.start();
 	const hooksFile = (config.hooks?.server?.split("#"))?.[0];
 	const normalizedPatterns = [config.constructs, ...hooksFile ? [hooksFile.endsWith(".ts") ? hooksFile : `${hooksFile}.ts`] : []].flat().filter((p) => typeof p === "string").map((p) => p.startsWith("./") ? p.slice(2) : p);
@@ -960,6 +960,7 @@ async function workspaceDevCommand(workspace, options) {
 	}
 	const rawSecrets = await loadDevSecrets(workspace);
 	let secretsEnv;
+	const appUrls = {};
 	if (usesConstructs(workspace)) {
 		const reconciled = await reconcileWorkspace(workspace, { stage: workspace.stages.local });
 		if (reconciled.changed && reconciled.plan.containers.length > 0) {
@@ -970,13 +971,22 @@ async function workspaceDevCommand(workspace, options) {
 			...rawSecrets,
 			...reconciled.env
 		};
+		for (const resource of reconciled.plan.resources) {
+			if (resource.kind !== "rest-api" && resource.kind !== "site") continue;
+			const address = reconciled.env[resource.envKey];
+			if (address) appUrls[resource.id] = address;
+		}
 	} else {
 		const resolvedPorts = await resolveServicePorts(workspace.root);
 		await startWorkspaceServices(workspace, resolvedPorts.dockerEnv, rawSecrets);
 		secretsEnv = rewriteUrlsWithPorts(rawSecrets, resolvedPorts);
 	}
 	if (Object.keys(secretsEnv).length > 0) logger$11.log(`   Loaded ${Object.keys(secretsEnv).length} secret(s)`);
-	const dependencyEnv = generateAllDependencyEnvVars(workspace);
+	if (Object.keys(appUrls).length > 0) {
+		logger$11.log("🔒 App URLs:");
+		for (const [id, address] of Object.entries(appUrls)) logger$11.log(`   ${id}: ${address}`);
+	}
+	const dependencyEnv = Object.fromEntries(Object.entries(generateAllDependencyEnvVars(workspace)).filter(([key]) => secretsEnv[key] === void 0));
 	if (Object.keys(dependencyEnv).length > 0) {
 		logger$11.log("📡 Dependency URLs:");
 		for (const [key, value] of Object.entries(dependencyEnv)) logger$11.log(`   ${key}=${value}`);
@@ -1027,6 +1037,17 @@ async function workspaceDevCommand(workspace, options) {
 		NODE_ENV: "development",
 		...configPath ? { GKM_CONFIG_PATH: configPath } : {}
 	};
+	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$11.log("\n🏃 Starting turbo run dev...\n");
 	const turboProcess = spawn("pnpm", [
 		"turbo",
@@ -1204,6 +1225,19 @@ var EntryRunner = class {
 */
 function generateServerEntryContent(options) {
 	const { secretsJsonPath, runtime = "node", enableOpenApi = false, appImportPath = "./app.js", selfServing = false } = options;
+	const parentWatch = `// Exit when the gkm dev that started this server is gone.
+const __gkmDevPid = Number(process.env.GKM_DEV_PID);
+if (__gkmDevPid) {
+  setInterval(() => {
+    try {
+      process.kill(__gkmDevPid, 0);
+    } catch {
+      process.exit(0);
+    }
+  }, 1000).unref();
+}
+
+`;
 	const credentialsInjection = secretsJsonPath ? `import { existsSync, readFileSync } from 'node:fs';
 
 // Inject dev secrets via globalThis (must happen before app import)
@@ -1234,8 +1268,7 @@ if (existsSync(secretsPath)) {
  * Development server entry point for a surface that serves itself
  * This file is auto-generated by 'gkm dev'
  */
-${credentialsInjection}
-const port = process.argv.includes('--port')
+${credentialsInjection}${parentWatch}const port = process.argv.includes('--port')
   ? Number.parseInt(process.argv[process.argv.indexOf('--port') + 1])
   : 3000;
 
@@ -1250,8 +1283,7 @@ console.log(\`Server started on port \${port}\`);
  * Development server entry point
  * This file is auto-generated by 'gkm dev'
  */
-${credentialsInjection}
-const port = process.argv.includes('--port')
+${credentialsInjection}${parentWatch}const port = process.argv.includes('--port')
   ? Number.parseInt(process.argv[process.argv.indexOf('--port') + 1])
   : 3000;
 
@@ -1273,6 +1305,44 @@ start({
 });
 `;
 }
+/** A port this app must serve on is held by something else. */
+var DevPortInUse = class extends Error {
+	port;
+	holder;
+	constructor(port, holder) {
+		super(`Port ${port} is already in use${holder ? ` by ${holder}` : ""}. It is the port this app is provisioned on — the one every other app and its CORS origins point at — so dev will not move off it. Stop what is holding it (often a dev server a previous run left behind), or pass -p/--port to run this app somewhere else.`);
+		this.port = port;
+		this.holder = holder;
+		this.name = "DevPortInUse";
+	}
+};
+/** Apps whose provisioned ports are held before the workspace starts. */
+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.`);
+		this.held = held;
+		this.name = "WorkspacePortsInUse";
+	}
+};
+/** What is listening on a port, as `command (pid N)`, if `lsof` can tell. */
+function listenerOn(port) {
+	try {
+		const out = execSync(`lsof -nP -iTCP:${port} -sTCP:LISTEN -Fpc`, {
+			encoding: "utf8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		});
+		const pid = out.match(/^p(\d+)/m)?.[1];
+		const command = out.match(/^c(.+)$/m)?.[1];
+		return pid ? `${command ?? "a process"} (pid ${pid})` : void 0;
+	} catch {
+		return;
+	}
+}
 var DevServer = class {
 	provider;
 	requestedPort;
@@ -1305,7 +1375,7 @@ var DevServer = class {
 		this.startTime = Date.now();
 		if (this.isRunning) await this.stop();
 		if (this.portExplicit) {
-			if (!await isPortAvailable(this.requestedPort)) throw new Error(`Port ${this.requestedPort} is already in use. Either stop the process using that port or omit -p/--port to auto-select an available port.`);
+			if (!await isPortAvailable(this.requestedPort)) throw new DevPortInUse(this.requestedPort, listenerOn(this.requestedPort));
 			this.actualPort = this.requestedPort;
 		} else {
 			this.actualPort = await findAvailablePort(this.requestedPort);
@@ -1323,7 +1393,8 @@ var DevServer = class {
 			stdio: "inherit",
 			env: {
 				...process.env,
-				NODE_ENV: "development"
+				NODE_ENV: "development",
+				GKM_DEV_PID: String(process.pid)
 			},
 			detached: true
 		});
@@ -8515,26 +8586,26 @@ function loadPackageJson() {
 * Run: pnpm --filter @geekmidas/cli sync-versions
 */
 const GEEKMIDAS_VERSIONS = {
-	"@geekmidas/audit": "~10.0.0-alpha.25",
-	"@geekmidas/auth": "~10.0.0-alpha.25",
-	"@geekmidas/cache": "~10.0.0-alpha.25",
-	"@geekmidas/client": "~10.0.0-alpha.25",
-	"@geekmidas/cloud": "~10.0.0-alpha.25",
-	"@geekmidas/constructs": "~10.0.0-alpha.25",
-	"@geekmidas/db": "~10.0.0-alpha.25",
-	"@geekmidas/emailkit": "~10.0.0-alpha.25",
-	"@geekmidas/envkit": "~10.0.0-alpha.25",
-	"@geekmidas/errors": "~10.0.0-alpha.25",
-	"@geekmidas/events": "~10.0.0-alpha.25",
-	"@geekmidas/logger": "~10.0.0-alpha.25",
-	"@geekmidas/manifest": "~10.0.0-alpha.25",
-	"@geekmidas/rate-limit": "~10.0.0-alpha.25",
-	"@geekmidas/schema": "~10.0.0-alpha.25",
-	"@geekmidas/services": "~10.0.0-alpha.25",
-	"@geekmidas/storage": "~10.0.0-alpha.25",
-	"@geekmidas/studio": "~10.0.0-alpha.25",
-	"@geekmidas/telescope": "~10.0.0-alpha.25",
-	"@geekmidas/testkit": "~10.0.0-alpha.25",
+	"@geekmidas/audit": "~10.0.0-alpha.26",
+	"@geekmidas/auth": "~10.0.0-alpha.26",
+	"@geekmidas/cache": "~10.0.0-alpha.26",
+	"@geekmidas/client": "~10.0.0-alpha.26",
+	"@geekmidas/cloud": "~10.0.0-alpha.26",
+	"@geekmidas/constructs": "~10.0.0-alpha.26",
+	"@geekmidas/db": "~10.0.0-alpha.26",
+	"@geekmidas/emailkit": "~10.0.0-alpha.26",
+	"@geekmidas/envkit": "~10.0.0-alpha.26",
+	"@geekmidas/errors": "~10.0.0-alpha.26",
+	"@geekmidas/events": "~10.0.0-alpha.26",
+	"@geekmidas/logger": "~10.0.0-alpha.26",
+	"@geekmidas/manifest": "~10.0.0-alpha.26",
+	"@geekmidas/rate-limit": "~10.0.0-alpha.26",
+	"@geekmidas/schema": "~10.0.0-alpha.26",
+	"@geekmidas/services": "~10.0.0-alpha.26",
+	"@geekmidas/storage": "~10.0.0-alpha.26",
+	"@geekmidas/studio": "~10.0.0-alpha.26",
+	"@geekmidas/telescope": "~10.0.0-alpha.26",
+	"@geekmidas/testkit": "~10.0.0-alpha.26",
 	"@geekmidas/cli": `~${loadPackageJson().version}`
 };
 //#endregion
@@ -16108,7 +16179,7 @@ program.command("secrets:push").description("Send a deployed stage's secrets to
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig } = await import("./config.mjs");
-		const { pushStageSecrets } = await import("./transfer-B88fTvnh.mjs").then((n) => n.i);
+		const { pushStageSecrets } = await import("./transfer-CAJs_vhu.mjs").then((n) => n.i);
 		const { workspace } = await loadWorkspaceConfig();
 		const { addedKeys } = await pushStageSecrets(workspace, options.stage, { profile: options.profile });
 		for (const key of addedKeys) console.log(`  + ${key} (reconciled)`);
@@ -16123,7 +16194,7 @@ program.command("secrets:pull").description("Bring a deployed stage's secrets fr
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig } = await import("./config.mjs");
-		const { pullStageSecrets } = await import("./transfer-B88fTvnh.mjs").then((n) => n.i);
+		const { pullStageSecrets } = await import("./transfer-CAJs_vhu.mjs").then((n) => n.i);
 		const { workspace } = await loadWorkspaceConfig();
 		const { addedKeys } = await pullStageSecrets(workspace, options.stage, { profile: options.profile });
 		for (const key of addedKeys) console.log(`  + ${key} (reconciled)`);
@@ -16147,7 +16218,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("./credentials-BpoOUa74.mjs").then((n) => n.g);
+		const { derivedContainers } = await import("./credentials-DI9kJcaP.mjs").then((n) => n.g);
 		const result = reconcileMissingSecrets(secrets, workspace, await derivedContainers(workspace, stage));
 		if (!result) {
 			console.log(`\n✓ Secrets for stage "${stage}" are up-to-date`);
@@ -16206,7 +16277,7 @@ program.command("deploy:github").description("Let GitHub Actions deploy a stage:
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { deployGithubCommand } = await import("./github-BOaa3kQR.mjs");
+		const { deployGithubCommand } = await import("./github-D5SBlOx5.mjs");
 		await deployGithubCommand(options);
 	} catch (error) {
 		console.error(formatError(error));