@geekmidas/cli 10.0.0-alpha.51 → 10.0.0-alpha.53

package/dist/index.mjs

@@ -5,11 +5,11 @@ 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-bOsks1uk.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-Dp2zK_Nk.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-qcva2dTt.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";
-import { i as storageBackendFor, n as eventsBackendFor, r as providerOf, t as cacheBackendFor } from "./backends-CSuLl0YP.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-C8wG_d0v.mjs";
+import { i as storageBackendFor, n as eventsBackendFor, r as providerOf, t as cacheBackendFor } from "./backends-Dfeu5Dgc.mjs";
 import { n as withCompute, r as withRoutes, t as manifestModule } from "./emit-C1e8qD08.mjs";
 import { createRequire } from "node:module";
 import { Command } from "commander";
@@ -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.51";
+var version = "10.0.0-alpha.53";
 //#endregion
 //#region src/auth/credentials.ts
 /**
@@ -567,7 +567,8 @@ var UnsupportedPlatform = class extends Error {
 * 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
+* server) carries it — or, when its own can't be read, one of its parents does.
+* 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.
 *
@@ -625,13 +626,32 @@ function holderOf(port) {
 	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);
+	const tag = lineageTagOf(pid);
 	return {
 		pid,
 		...command ? { command } : {},
 		...tag ? { tag } : {}
 	};
 }
+/** How far up a holder's parents to look before calling it untagged. */
+const MAX_ANCESTORS = 8;
+/**
+* The tag of `pid`, or of its nearest parent that has one.
+*
+* A process can hide the tag it inherited: `next-server` renames itself, which
+* on macOS overwrites the memory `ps eww` reads its environment from, so `ps`
+* shows only its title. Its parent, the `next dev` gkm started, still carries
+* the tag. A child is only ever started by its parent, so a tagged parent makes
+* the holder this app's.
+*/
+function lineageTagOf(pid) {
+	let current = pid;
+	for (let depth = 0; current && current > 1; depth += 1) {
+		const tag = tagOf(current);
+		if (tag || depth === MAX_ANCESTORS) return tag;
+		current = parentOf(current);
+	}
+}
 function tagOf(pid) {
 	const prefix = `${APP_TAG_ENV}=`;
 	try {
@@ -653,6 +673,26 @@ function tagOf(pid) {
 		return;
 	}
 }
+function parentOf(pid) {
+	try {
+		const ppid = Number(execFileSync("ps", [
+			"-o",
+			"ppid=",
+			"-p",
+			String(pid)
+		], {
+			encoding: "utf8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		}).trim());
+		return ppid > 0 ? ppid : void 0;
+	} catch {
+		return;
+	}
+}
 /** The ports apps were given before, by app name. */
 async function savedAppPorts(root) {
 	try {
@@ -1725,9 +1765,9 @@ async function workspaceDevCommand(configured, options) {
 	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-soUQtku3.mjs");
+		const { prepareDevDatabases } = await import("./migrate-CHQyNzj-.mjs");
 		await prepareDevDatabases(workspace, reconciled.env, { seed: !!options.seed });
-	} else await import("./migrate-soUQtku3.mjs").then(({ reportPendingMigrations }) => reportPendingMigrations(workspace, reconciled.env)).catch((error) => {
+	} else await import("./migrate-CHQyNzj-.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 = {};
@@ -2310,7 +2350,7 @@ var CronGenerator = class extends ConstructGenerator {
  */
 import type { EnvironmentParser } from '@geekmidas/envkit';
 import type { Logger } from '@geekmidas/logger';
-import { toCronExpression } from '@geekmidas/constructs/crons';
+import { runCron, scheduleInProcess, toCronExpression } from '@geekmidas/constructs/crons';
 import { ServiceDiscovery } from '@geekmidas/services';
 ${Array.from(importsByFile.entries()).map(([importPath, exports]) => `import { ${exports.join(", ")} } from '${importPath}';`).join("\n")}
 
@@ -2351,11 +2391,10 @@ export async function setupCrons(
 
   const run = async (entry: (typeof prepared)[number]) => {
     try {
-      await entry.cron.handler({
-        input: undefined,
-        services: entry.services,
-        logger: entry.cron.logger,
-      });
+      // The cron's own function, the way its Lambda would run it — services,
+      // the worker's database as \`db\`, its events. It used to call a
+      // \`handler\` a Cron does not have, so every firing logged a failure.
+      await runCron(entry.cron, serviceDiscovery);
     } catch (error) {
       logger.error({ error, cron: entry.name }, 'Cron failed');
     }
@@ -2366,13 +2405,28 @@ export async function setupCrons(
   // memory fires each job once per replica — so the schedule lives in
   // Postgres. It used to be a second pg-boss on the worker's database, as the
   // runtime role, which can neither create a schema nor use the broker's.
-  const { url } = envParser
+  const { url, devPid } = envParser
     .create((get) => ({
       url: get('EVENT_PUBLISHER_CONNECTION_STRING').string().optional(),
+      // Set by \`gkm dev\` on the server it starts, and by nothing deployed.
+      devPid: get('GKM_DEV_PID').string().optional(),
     }))
     .parse();
 
   if (!url?.startsWith('pgboss://')) {
+    // \`gkm dev\` on a target whose crons are infrastructure once deployed —
+    // EventBridge rules on AWS — has no broker to keep a schedule in. It is one
+    // process, so a timer fires each job once, which is all pg-boss is for
+    // here. Only there: a deployed server firing by timer fires once per
+    // replica, so outside dev this stays the error below.
+    if (devPid) {
+      for (const entry of prepared) {
+        running.push(scheduleInProcess(entry.schedule, () => run(entry)));
+        logger.info({ cron: entry.name, schedule: entry.schedule }, 'Cron scheduled in this process');
+      }
+      return;
+    }
+
     logger.error(
       { crons: prepared.map(({ name }) => name) },
       'These crons have nowhere to keep their schedule. On a server they are ' +
@@ -9314,26 +9368,26 @@ function loadPackageJson() {
 * Run: pnpm --filter @geekmidas/cli sync-versions
 */
 const GEEKMIDAS_VERSIONS = {
-	"@geekmidas/audit": "~10.0.0-alpha.51",
-	"@geekmidas/auth": "~10.0.0-alpha.51",
-	"@geekmidas/cache": "~10.0.0-alpha.51",
-	"@geekmidas/client": "~10.0.0-alpha.51",
-	"@geekmidas/cloud": "~10.0.0-alpha.51",
-	"@geekmidas/constructs": "~10.0.0-alpha.51",
-	"@geekmidas/db": "~10.0.0-alpha.51",
-	"@geekmidas/emailkit": "~10.0.0-alpha.51",
-	"@geekmidas/envkit": "~10.0.0-alpha.51",
-	"@geekmidas/errors": "~10.0.0-alpha.51",
-	"@geekmidas/events": "~10.0.0-alpha.51",
-	"@geekmidas/logger": "~10.0.0-alpha.51",
-	"@geekmidas/manifest": "~10.0.0-alpha.51",
-	"@geekmidas/rate-limit": "~10.0.0-alpha.51",
-	"@geekmidas/schema": "~10.0.0-alpha.51",
-	"@geekmidas/services": "~10.0.0-alpha.51",
-	"@geekmidas/storage": "~10.0.0-alpha.51",
-	"@geekmidas/studio": "~10.0.0-alpha.51",
-	"@geekmidas/telescope": "~10.0.0-alpha.51",
-	"@geekmidas/testkit": "~10.0.0-alpha.51",
+	"@geekmidas/audit": "~10.0.0-alpha.53",
+	"@geekmidas/auth": "~10.0.0-alpha.53",
+	"@geekmidas/cache": "~10.0.0-alpha.53",
+	"@geekmidas/client": "~10.0.0-alpha.53",
+	"@geekmidas/cloud": "~10.0.0-alpha.53",
+	"@geekmidas/constructs": "~10.0.0-alpha.53",
+	"@geekmidas/db": "~10.0.0-alpha.53",
+	"@geekmidas/emailkit": "~10.0.0-alpha.53",
+	"@geekmidas/envkit": "~10.0.0-alpha.53",
+	"@geekmidas/errors": "~10.0.0-alpha.53",
+	"@geekmidas/events": "~10.0.0-alpha.53",
+	"@geekmidas/logger": "~10.0.0-alpha.53",
+	"@geekmidas/manifest": "~10.0.0-alpha.53",
+	"@geekmidas/rate-limit": "~10.0.0-alpha.53",
+	"@geekmidas/schema": "~10.0.0-alpha.53",
+	"@geekmidas/services": "~10.0.0-alpha.53",
+	"@geekmidas/storage": "~10.0.0-alpha.53",
+	"@geekmidas/studio": "~10.0.0-alpha.53",
+	"@geekmidas/telescope": "~10.0.0-alpha.53",
+	"@geekmidas/testkit": "~10.0.0-alpha.53",
 	"@geekmidas/cli": `~${loadPackageJson().version}`
 };
 //#endregion
@@ -16076,7 +16130,7 @@ function testDatabases(reconciled) {
 * starts without the reference data the app needs.
 */
 async function migrateTestStage(workspace, env) {
-	const { migrateAndSeed } = await import("./migrate-soUQtku3.mjs");
+	const { migrateAndSeed } = await import("./migrate-CHQyNzj-.mjs");
 	const { discover } = await import("./discover-Cf2jAcgF.mjs").then((n) => n.n);
 	const sources = {};
 	const manifest = await discover({
@@ -16507,7 +16561,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-soUQtku3.mjs");
+		const { migrateCommand } = await import("./migrate-CHQyNzj-.mjs");
 		await migrateCommand({
 			...options,
 			...construct ? { construct } : {}
@@ -16521,7 +16575,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-soUQtku3.mjs");
+		const { seedCommand } = await import("./migrate-CHQyNzj-.mjs");
 		await seedCommand({
 			...options,
 			...construct ? { construct } : {}
@@ -16535,7 +16589,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-soUQtku3.mjs");
+		const { migrationCommand } = await import("./migrate-CHQyNzj-.mjs");
 		await migrationCommand({
 			construct,
 			...name ? { name } : {}
@@ -16633,7 +16687,7 @@ program.command("encryption:rotate").description("Add a new current key to an En
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { encryptionRotateCommand } = await import("./encryption-DRCXp-U4.mjs");
+		const { encryptionRotateCommand } = await import("./encryption-O-XdeNxe.mjs");
 		await encryptionRotateCommand(construct, options);
 	} catch (error) {
 		console.error(formatError(error));
@@ -16644,7 +16698,7 @@ program.command("encryption:retire").description("Remove an old key from an Encr
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { encryptionRetireCommand } = await import("./encryption-DRCXp-U4.mjs");
+		const { encryptionRetireCommand } = await import("./encryption-O-XdeNxe.mjs");
 		await encryptionRetireCommand(construct, key, options);
 	} catch (error) {
 		console.error(formatError(error));
@@ -16696,7 +16750,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-Dp2zK_Nk.mjs").then((n) => n.o);
+		const { derivedContainers } = await import("./workspace-qcva2dTt.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`);