@geekmidas/cli 10.0.0-alpha.41 → 10.0.0-alpha.43

package/dist/index.mjs

@@ -5,10 +5,10 @@ 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-DOmIhiau.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 findAvailablePort, D as prepareEntryCredentials, E as loadSecretsForApp, S as createEntryWrapper, T as loadEnvFiles, _ as cacheBackendFor, a as reconcileWorkspace, b as storageBackendFor, c as LOCAL_CA_PATH, d as quoteIdentifier, f as pgClient, g as primaryPortKey, h as fakeKey, i as derivedContainers, l as forgetState, m as rootSite, n as backendsOf, p as resourceName, r as constructGlobs, s as COMPOSE_PATH, t as FAKE_ENV, u as applyPostgres, v as eventsBackendFor, w as isPortAvailable, x as createCredentialsPreload, y as providerOf } from "./workspace-DwS1JK5u.mjs";
+import { C as createEntryWrapper, D as loadSecretsForApp, E as loadEnvFiles, O as prepareEntryCredentials, S as createCredentialsPreload, T as isPortAvailable, _ as primaryPortKey, a as reconcileWorkspace, b as providerOf, c as LOCAL_CA_PATH, d as postgresDatabaseNames, f as quoteIdentifier, g as fakeKey, h as rootSite, i as derivedContainers, l as forgetState, m as resourceName, n as backendsOf, p as pgClient, r as constructGlobs, s as COMPOSE_PATH, t as FAKE_ENV, u as applyPostgres, v as cacheBackendFor, w as findAvailablePort, x as storageBackendFor, y as eventsBackendFor } from "./workspace-Bt-pXoIi.mjs";
 import { n as EndpointGenerator, r as runtimeFor } from "./OpenApiTsGenerator-CEh3EKN3.mjs";
 import { generateOpenApi, openapiCommand, resolveOpenApiConfig } from "./openapi.mjs";
-import { a as writeTestHarness, i as TEST_MANIFEST_ENV, n as TEST_READY_FILE, o as cacheBackendsIn, s as driversFor, t as TEST_READY_ENV } from "./ready-D8UXsP6q.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-Bdh5SSXn.mjs";
 import { i as withRoutes, r as withCompute } from "./emit-Bzq7JsMP.mjs";
 import { createRequire } from "node:module";
 import { Command } from "commander";
@@ -37,11 +37,10 @@ import crypto from "crypto";
 import { Cron } from "@geekmidas/constructs/crons";
 import { Function } from "@geekmidas/constructs/functions";
 import { Queue } from "@geekmidas/constructs/queue";
-import { Subscriber } from "@geekmidas/constructs/subscribers";
 import { Topic } from "@geekmidas/constructs/topic";
 import { lookup } from "node:dns/promises";
 //#region package.json
-var version = "10.0.0-alpha.41";
+var version = "10.0.0-alpha.43";
 //#endregion
 //#region src/auth/credentials.ts
 /**
@@ -1566,9 +1565,9 @@ async function workspaceDevCommand(workspace, options) {
 	const fakes = options.fake ? await serveFakes(reconciled.fakes, reconciled.ports) : [];
 	for (const { id, port } of fakes) logger$10.log(`🎭 ${id} fake: http://localhost:${port}`);
 	if (options.migrate || options.seed) {
-		const { prepareDevDatabases } = await import("./migrate-BVI3yqcE.mjs");
+		const { prepareDevDatabases } = await import("./migrate-Bsdp7rzP.mjs");
 		await prepareDevDatabases(workspace, reconciled.env, { seed: !!options.seed });
-	} else await import("./migrate-BVI3yqcE.mjs").then(({ reportPendingMigrations }) => reportPendingMigrations(workspace, reconciled.env)).catch((error) => {
+	} else await import("./migrate-Bsdp7rzP.mjs").then(({ reportPendingMigrations }) => reportPendingMigrations(workspace, reconciled.env)).catch((error) => {
 		logger$10.log(`⚠️  Could not check for pending migrations: ${error instanceof Error ? error.message : String(error)}`);
 	});
 	const appUrls = {};
@@ -2458,6 +2457,12 @@ export async function setupQueues(
       const services = queue.services.length > 0
         ? await serviceDiscovery.register(queue.services)
         : {};
+      // The queue's database — the worker's, or its own — handed over as \`db\`.
+      const db = queue.databaseService
+        ? (await serviceDiscovery.register([queue.databaseService]))[
+            queue.databaseService.serviceName
+          ]
+        : undefined;
 
       // A queue's messages carry one type — its own name.
       await eventSubscriber.subscribe([queue.name], async (message) => {
@@ -2472,7 +2477,8 @@ export async function setupQueues(
             messages: [validation.value],
             services: services,
             logger: queue.logger,
-          });
+            db,
+          } as any);
         } catch (error) {
           logger.error({ error, queue: queue.name }, 'Failed to process queue message');
           // Rethrown so the transport keeps the message for a retry.
@@ -2497,266 +2503,6 @@ export async function setupQueues(
 	}
 };
 //#endregion
-//#region src/generators/SubscriberGenerator.ts
-var SubscriberGenerator = class extends ConstructGenerator {
-	isConstruct(value) {
-		return Subscriber.isSubscriber(value);
-	}
-	async build(context, constructs, outputDir, options) {
-		const provider = options?.provider || "aws-lambda";
-		const logger = console;
-		const subscriberInfos = [];
-		if (provider === "server") {
-			await this.generateServerSubscribersFile(outputDir, constructs);
-			logger.log(`Generated server subscribers file with ${constructs.length} subscribers (polling mode)`);
-			return subscriberInfos;
-		}
-		if (constructs.length === 0) return subscriberInfos;
-		if (provider !== "aws-lambda") return subscriberInfos;
-		const subscribersDir = join(outputDir, "subscribers");
-		await mkdir(subscribersDir, { recursive: true });
-		for (const { key, construct, path } of constructs) {
-			const handlerFile = await this.generateSubscriberHandler(subscribersDir, path.relative, key, construct, context, construct.owner);
-			subscriberInfos.push({
-				name: key,
-				handler: relative(process.cwd(), handlerFile).replace(/\.ts$/, ".handler"),
-				subscribedEvents: construct.subscribedEvents || [],
-				...construct.topicName ? {
-					transport: "topic",
-					topic: construct.topicName
-				} : {},
-				timeout: construct.timeout,
-				memorySize: construct.memorySize,
-				environment: await construct.getEnvironment({ markOptional: context.markOptional }),
-				dependencies: construct.constructs
-			});
-			logger.log(`Generated subscriber handler: ${key}`);
-		}
-		return subscriberInfos;
-	}
-	async generateSubscriberHandler(outputDir, sourceFile, exportName, _subscriber, context, owner) {
-		const handlerFileName = `${exportName}.ts`;
-		const handlerPath = join(outputDir, handlerFileName);
-		const importPath = relative(dirname(handlerPath), sourceFile).replace(/\.ts$/, ".js");
-		const runtime = runtimeFor(context, dirname(handlerPath), owner);
-		const content = `import { AWSLambdaSubscriber } from '@geekmidas/constructs/aws';
-import { ${exportName} } from '${importPath}';
-${runtime.imports}
-${runtime.bindings}
-
-const adapter = new AWSLambdaSubscriber(envParser, ${exportName});
-
-export const handler = adapter.handler;
-`;
-		await writeFile(handlerPath, content);
-		return handlerPath;
-	}
-	async generateServerSubscribersFile(outputDir, subscribers) {
-		await mkdir(outputDir, { recursive: true });
-		const subscribersPath = join(outputDir, "subscribers.ts");
-		if (subscribers.length === 0) {
-			await writeFile(subscribersPath, `/**
- * Generated subscribers setup — this app declares none.
- */
-import type { EnvironmentParser } from '@geekmidas/envkit';
-import type { Logger } from '@geekmidas/logger';
-
-export async function setupSubscribers(
-  _app: unknown,
-  _envParser: EnvironmentParser<any>,
-  _logger: Logger,
-): Promise<(port: number) => Promise<void>> {
-  return async () => {};
-}
-`);
-			return subscribersPath;
-		}
-		const importsByFile = /* @__PURE__ */ new Map();
-		for (const { path, key } of subscribers) {
-			const importPath = relative(dirname(subscribersPath), path.relative).replace(/\.ts$/, ".js");
-			importsByFile.set(importPath, [...importsByFile.get(importPath) ?? [], key]);
-		}
-		const content = `/**
- * Generated subscribers setup.
- *
- * Each subscriber is run against the topic it is bound to, through that
- * topic's own connection string:
- *
- * - **sns://** — pushed, not polled. The subscriber gets an HTTP route on this
- *   server, and the route is subscribed to the topic with a filter policy of
- *   the events it named, so SNS fans out to each subscriber. The route runs the
- *   subscriber through the same adaptor a Lambda subscription does.
- * - **anything else** (pgboss://, rabbitmq://, sqs://) — polled. On pg-boss
- *   each subscriber drains a queue of its own, \`<topic>/<subscriber>\`, so
- *   every subscriber sees every event; replicas of one subscriber share it.
- *
- * GKM_SUBSCRIBERS=off (\`gkm dev --no-subscribers\`) runs none of them.
- * GKM_SUBSCRIBER_PUSH_URL is the address SNS pushes to; against the local
- * emulator it defaults to this server through host.docker.internal.
- */
-import { connect } from 'node:net';
-import type { EnvironmentParser } from '@geekmidas/envkit';
-import type { Logger } from '@geekmidas/logger';
-import { EventConnectionFactory, Subscriber } from '@geekmidas/events';
-import type { EventConnection } from '@geekmidas/events';
-import { ServiceDiscovery } from '@geekmidas/services';
-${Array.from(importsByFile.entries()).map(([importPath, exports]) => `import { ${exports.join(", ")} } from '${importPath}';`).join("\n")}
-
-const subscribers = [
-${subscribers.map(({ key, construct }) => {
-			const connectionKey = construct.topicName ? provideKey(canonicalId(construct.topicName), "publisherConnectionString") : void 0;
-			return `  { id: '${key}', subscriber: ${key}, topic: ${construct.topicName ? `'${construct.topicName}'` : "undefined"}, connectionKey: ${connectionKey ? `'${connectionKey}'` : "undefined"} },`;
-		}).join("\n")}
-];
-
-/** The route a subscriber's pushes arrive on. */
-export const SUBSCRIBER_ROUTE = (id: string) => \`/__gkm/subscribers/\${id}\`;
-
-/** Resolves once something is accepting connections on the port. */
-async function listening(port: number): Promise<void> {
-  for (let attempt = 0; attempt < 100; attempt++) {
-    const open = await new Promise<boolean>((resolve) => {
-      const socket = connect(port, '127.0.0.1');
-      socket.once('connect', () => { socket.end(); resolve(true); });
-      socket.once('error', () => resolve(false));
-    });
-    if (open) return;
-    await new Promise((resolve) => setTimeout(resolve, 50));
-  }
-}
-
-/**
- * Mount each pushed subscriber's route and start each polled one. Returns what
- * to run once the server is listening: subscribing a route makes SNS send its
- * confirmation at once, so the route has to be reachable first.
- */
-export async function setupSubscribers(
-  app: { post: (path: string, handler: (c: any) => unknown) => unknown },
-  envParser: EnvironmentParser<any>,
-  logger: Logger,
-): Promise<(port: number) => Promise<void>> {
-  if (process.env.GKM_SUBSCRIBERS === 'off') {
-    logger.info('Subscribers are off (--no-subscribers)');
-    return async () => {};
-  }
-
-  const serviceDiscovery = ServiceDiscovery.getInstance(envParser);
-  const connections = new Map<string, EventConnection>();
-  const afterListening: ((port: number) => Promise<void>)[] = [];
-
-  for (const { id, subscriber, topic, connectionKey } of subscribers) {
-    const events = subscriber.subscribedEvents || [];
-    if (events.length === 0) {
-      logger.warn({ subscriber: id }, 'Subscriber has no subscribed events, skipping');
-      continue;
-    }
-    const connectionString = connectionKey ? process.env[connectionKey] : undefined;
-    if (!connectionString) {
-      logger.error(
-        { subscriber: id, connectionKey },
-        'No connection string for the topic this subscriber is bound to',
-      );
-      continue;
-    }
-
-    try {
-      if (connectionString.startsWith('sns:')) {
-        const { SNSConnection, snsUrl, subscribeHttpEndpoint } = await import('@geekmidas/events/sns');
-        const { SnsPushSubscriberAdaptor } = await import('@geekmidas/constructs/aws');
-        const address = snsUrl.parse(connectionString);
-        const route = SUBSCRIBER_ROUTE(id);
-        const adaptor = new SnsPushSubscriberAdaptor(envParser, subscriber, {
-          topicArn: address.topicArn,
-          // An emulator signs nothing. Decided by the address this server was
-          // configured with, never by anything a request says about itself.
-          verify: !address.endpoint,
-          ...(address.endpoint ? { emulatorEndpoint: address.endpoint } : {}),
-        });
-
-        app.post(route, async (c: any) => {
-          const body = JSON.parse(await c.req.text());
-          const response = await adaptor.handle(body);
-          return c.json(response.body, response.status);
-        });
-
-        afterListening.push(async (port) => {
-          const base =
-            process.env.GKM_SUBSCRIBER_PUSH_URL ??
-            (address.endpoint ? \`http://host.docker.internal:\${port}\` : undefined);
-          if (!base) {
-            logger.error(
-              { subscriber: id },
-              'Set GKM_SUBSCRIBER_PUSH_URL to the public URL of this worker, which SNS pushes to',
-            );
-            return;
-          }
-          const connection = await SNSConnection.fromConnectionString(connectionString);
-          await subscribeHttpEndpoint(connection, {
-            endpoint: new URL(route, base).toString(),
-            events,
-          });
-          logger.info({ subscriber: id, events }, 'Subscriber subscribed for push');
-        });
-        continue;
-      }
-
-      let connection = connections.get(connectionString);
-      if (!connection) {
-        connection = await EventConnectionFactory.fromConnectionString(connectionString);
-        connections.set(connectionString, connection);
-      }
-      // Named, so a broker with one address for everything (pg-boss) gives
-      // this subscriber a queue of its own: fan-out, not competition.
-      const eventSubscriber = await Subscriber.fromConnection(connection, {
-        topic,
-        subscription: id,
-      });
-      const services = subscriber.services.length > 0
-        ? await serviceDiscovery.register(subscriber.services)
-        : {};
-
-      await eventSubscriber.subscribe(events, async (event) => {
-        try {
-          await subscriber.handler({
-            events: [event],
-            services: services as any,
-            logger: subscriber.logger,
-          });
-        } catch (error) {
-          logger.error({ error, event, subscriber: id }, 'Failed to process event');
-          // Rethrown so the transport keeps the event for a retry — as a queue
-          // consumer's failure does, and as a pushed subscriber's 500 does.
-          throw error;
-        }
-      });
-      logger.info({ subscriber: id, events }, 'Subscriber started polling');
-    } catch (error) {
-      logger.error({ error, subscriber: id }, 'Failed to set up subscriber');
-    }
-  }
-
-  const shutdown = () => {
-    for (const connection of connections.values()) void connection.close();
-  };
-  process.once('SIGTERM', shutdown);
-  process.once('SIGINT', shutdown);
-
-  return async (port) => {
-    if (afterListening.length === 0) return;
-    await listening(port);
-    for (const subscribe of afterListening) {
-      await subscribe(port).catch((error) => {
-        logger.error({ error }, 'Failed to subscribe for push');
-      });
-    }
-  };
-}
-`;
-		await writeFile(subscribersPath, content);
-		return subscribersPath;
-	}
-};
-//#endregion
 //#region src/generators/TopicGenerator.ts
 /**
 * Discovers topics (`new Topic(…)`) into `manifest.topics`. A topic is a
@@ -9576,26 +9322,26 @@ function loadPackageJson() {
 * Run: pnpm --filter @geekmidas/cli sync-versions
 */
 const GEEKMIDAS_VERSIONS = {
-	"@geekmidas/audit": "~10.0.0-alpha.41",
-	"@geekmidas/auth": "~10.0.0-alpha.41",
-	"@geekmidas/cache": "~10.0.0-alpha.41",
-	"@geekmidas/client": "~10.0.0-alpha.41",
-	"@geekmidas/cloud": "~10.0.0-alpha.41",
-	"@geekmidas/constructs": "~10.0.0-alpha.41",
-	"@geekmidas/db": "~10.0.0-alpha.41",
-	"@geekmidas/emailkit": "~10.0.0-alpha.41",
-	"@geekmidas/envkit": "~10.0.0-alpha.41",
-	"@geekmidas/errors": "~10.0.0-alpha.41",
-	"@geekmidas/events": "~10.0.0-alpha.41",
-	"@geekmidas/logger": "~10.0.0-alpha.41",
-	"@geekmidas/manifest": "~10.0.0-alpha.41",
-	"@geekmidas/rate-limit": "~10.0.0-alpha.41",
-	"@geekmidas/schema": "~10.0.0-alpha.41",
-	"@geekmidas/services": "~10.0.0-alpha.41",
-	"@geekmidas/storage": "~10.0.0-alpha.41",
-	"@geekmidas/studio": "~10.0.0-alpha.41",
-	"@geekmidas/telescope": "~10.0.0-alpha.41",
-	"@geekmidas/testkit": "~10.0.0-alpha.41",
+	"@geekmidas/audit": "~10.0.0-alpha.43",
+	"@geekmidas/auth": "~10.0.0-alpha.43",
+	"@geekmidas/cache": "~10.0.0-alpha.43",
+	"@geekmidas/client": "~10.0.0-alpha.43",
+	"@geekmidas/cloud": "~10.0.0-alpha.43",
+	"@geekmidas/constructs": "~10.0.0-alpha.43",
+	"@geekmidas/db": "~10.0.0-alpha.43",
+	"@geekmidas/emailkit": "~10.0.0-alpha.43",
+	"@geekmidas/envkit": "~10.0.0-alpha.43",
+	"@geekmidas/errors": "~10.0.0-alpha.43",
+	"@geekmidas/events": "~10.0.0-alpha.43",
+	"@geekmidas/logger": "~10.0.0-alpha.43",
+	"@geekmidas/manifest": "~10.0.0-alpha.43",
+	"@geekmidas/rate-limit": "~10.0.0-alpha.43",
+	"@geekmidas/schema": "~10.0.0-alpha.43",
+	"@geekmidas/services": "~10.0.0-alpha.43",
+	"@geekmidas/storage": "~10.0.0-alpha.43",
+	"@geekmidas/studio": "~10.0.0-alpha.43",
+	"@geekmidas/telescope": "~10.0.0-alpha.43",
+	"@geekmidas/testkit": "~10.0.0-alpha.43",
 	"@geekmidas/cli": `~${loadPackageJson().version}`
 };
 //#endregion
@@ -16333,7 +16079,7 @@ async function teardown(cwd) {
 */
 function testDatabases(reconciled) {
 	const port = reconciled?.ports[primaryPortKey("postgres")];
-	const names = (reconciled?.plan.resources ?? []).filter((resource) => resource.kind === "database" && resource.provisions && resource.container === "postgres").map((resource) => resource.name);
+	const names = reconciled ? postgresDatabaseNames(reconciled.plan) : [];
 	return port !== void 0 && names.length > 0 ? { databases: {
 		port,
 		names
@@ -16344,7 +16090,7 @@ function testDatabases(reconciled) {
 * starts without the reference data the app needs.
 */
 async function migrateTestStage(workspace, env) {
-	const { migrateAndSeed } = await import("./migrate-BVI3yqcE.mjs");
+	const { migrateAndSeed } = await import("./migrate-Bsdp7rzP.mjs");
 	const { discover } = await import("./discover-BLhf7V_J.mjs").then((n) => n.n);
 	const sources = {};
 	const manifest = await discover({
@@ -16791,7 +16537,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-BVI3yqcE.mjs");
+		const { migrateCommand } = await import("./migrate-Bsdp7rzP.mjs");
 		await migrateCommand({
 			...options,
 			...construct ? { construct } : {}
@@ -16805,7 +16551,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-BVI3yqcE.mjs");
+		const { seedCommand } = await import("./migrate-Bsdp7rzP.mjs");
 		await seedCommand({
 			...options,
 			...construct ? { construct } : {}
@@ -16819,7 +16565,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-BVI3yqcE.mjs");
+		const { migrationCommand } = await import("./migrate-Bsdp7rzP.mjs");
 		await migrationCommand({
 			construct,
 			...name ? { name } : {}
@@ -16958,7 +16704,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-DwS1JK5u.mjs").then((n) => n.o);
+		const { derivedContainers } = await import("./workspace-Bt-pXoIi.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`);