@geekmidas/cli 1.10.25 → 1.10.27

package/dist/index.mjs

@@ -3,14 +3,14 @@ import { __require } from "./chunk-Duj1WY3L.mjs";
 import { getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployTargetSupported } from "./workspace-D4z4A4cq.mjs";
 import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceAppInfo, loadWorkspaceConfig, parseModuleConfig } from "./config-jsRYHOHU.mjs";
 import { getCredentialsPath, getDokployCredentials, getDokployRegistryId, getDokployToken, removeDokployCredentials, storeDokployCredentials, storeDokployRegistryId } from "./credentials-s1kLcIzK.mjs";
-import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-CpMNB77O.mjs";
-import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, copyAllClients, copyClientToFrontends, generateOpenApi, getBackendOpenApiPath, isPartitionedRoutes, normalizeRoutes, openapiCommand, resolveOpenApiConfig } from "./openapi-DnIYqDH3.mjs";
-import { DokployApi } from "./dokploy-api-2ldYoN3i.mjs";
-import { encryptSecrets } from "./encryption-BOH5M-f-.mjs";
-import { CachedStateProvider } from "./CachedStateProvider-BDq5WqSy.mjs";
-import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateLocalStackCredentials, generateSecurePassword, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-x2Kffx7-.mjs";
+import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateLocalStackCredentials, generatePgBossUrl, generateSecurePassword, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-BDE7Sk93.mjs";
+import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-dbb9RyBl.mjs";
+import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, copyAllClients, copyClientToFrontends, generateOpenApi, getBackendOpenApiPath, isPartitionedRoutes, normalizeRoutes, openapiCommand, resolveOpenApiConfig } from "./openapi-DeG0ffQ8.mjs";
+import { DokployApi } from "./dokploy-api-BIT0683o.mjs";
+import { encryptSecrets } from "./encryption-DSkIlEZ6.mjs";
+import { CachedStateProvider } from "./CachedStateProvider-C8A-cCm5.mjs";
 import { generateReactQueryCommand } from "./openapi-react-query-C4UdILaI.mjs";
-import { isSSMConfigured, pullSecrets, pushSecrets } from "./sync-lExOTa9t.mjs";
+import { isSSMConfigured, pullSecrets, pushSecrets } from "./sync-D_NowTkZ.mjs";
 import { createRequire } from "node:module";
 import { copyFileSync, existsSync, readFileSync, unlinkSync } from "node:fs";
 import { basename, dirname, join, parse, relative, resolve } from "node:path";
@@ -35,7 +35,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.24";
+var version = "1.10.26";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -138,7 +138,7 @@ const logger$14 = console;
 * Validate Dokploy token by making a test API call
 */
 async function validateDokployToken(endpoint, token) {
-	const { DokployApi: DokployApi$1 } = await import("./dokploy-api-C93pveuy.mjs");
+	const { DokployApi: DokployApi$1 } = await import("./dokploy-api-BZGk-lkD.mjs");
 	const api = new DokployApi$1({
 		baseUrl: endpoint,
 		token
@@ -781,6 +781,17 @@ async function prepareEntryCredentials(options) {
 		const depEnv = getDependencyEnvVars(appInfo.workspace, appInfo.appName);
 		Object.assign(credentials, depEnv);
 	}
+	if (!credentials.EVENT_PUBLISHER_CONNECTION_STRING && !credentials.EVENT_SUBSCRIBER_CONNECTION_STRING && credentials.PGBOSS_DB_USER) {
+		const pgbossUrl = generatePgBossUrl({
+			username: credentials.PGBOSS_DB_USER,
+			password: credentials.PGBOSS_DB_PASSWORD ?? "",
+			host: credentials.POSTGRES_HOST ?? "localhost",
+			port: Number(credentials.POSTGRES_PORT ?? "5432"),
+			database: credentials.POSTGRES_DB ?? "app"
+		});
+		credentials.EVENT_PUBLISHER_CONNECTION_STRING = pgbossUrl;
+		credentials.EVENT_SUBSCRIBER_CONNECTION_STRING = pgbossUrl;
+	}
 	const secretsDir = join(secretsRoot, ".gkm");
 	await mkdir(secretsDir, { recursive: true });
 	const secretsFileName = options.secretsFileName ?? (appName ? `dev-secrets-${appName}.json` : "dev-secrets.json");
@@ -995,17 +1006,16 @@ export async function setupSubscribers(
   envParser: EnvironmentParser<any>,
   logger: Logger,
 ): Promise<void> {
+  if (subscribers.length === 0) {
+    return;
+  }
+
   logger.info('Setting up subscribers in polling mode (local development)');
 
   const config = envParser.create((get) => ({
-    connectionString: get('EVENT_SUBSCRIBER_CONNECTION_STRING').string().optional(),
+    connectionString: get('EVENT_SUBSCRIBER_CONNECTION_STRING').string(),
   })).parse();
 
-  if (!config.connectionString) {
-    logger.warn('EVENT_SUBSCRIBER_CONNECTION_STRING not configured, skipping subscriber setup');
-    return;
-  }
-
   const serviceDiscovery = ServiceDiscovery.getInstance(envParser);
 
   // Create connection once, outside the loop (more efficient)
@@ -2278,7 +2288,7 @@ async function buildForProvider(provider, context, rootOutputDir, endpointGenera
 		let masterKey;
 		if (context.production?.bundle && !skipBundle) {
 			logger$9.log(`\n📦 Bundling production server...`);
-			const { bundleServer } = await import("./bundler-C5xkxnyr.mjs");
+			const { bundleServer } = await import("./bundler-c6QvGUBM.mjs");
 			const allConstructs = [
 				...endpoints.map((e) => e.construct),
 				...functions.map((f) => f.construct),
@@ -5090,7 +5100,7 @@ async function createStateProvider(options) {
 		if (!workspaceName) throw new Error("Workspace name is required for SSM state provider. Set \"name\" in gkm.config.ts.");
 		const { LocalStateProvider } = await import("./LocalStateProvider-Dp0KkRcw.mjs");
 		const { SSMStateProvider } = await import("./SSMStateProvider-CksOTB8M.mjs");
-		const { CachedStateProvider: CachedStateProvider$1 } = await import("./CachedStateProvider-CI61keQ1.mjs");
+		const { CachedStateProvider: CachedStateProvider$1 } = await import("./CachedStateProvider-CC0DyO09.mjs");
 		const ssmConfig = config$1;
 		const local = new LocalStateProvider(workspaceRoot);
 		const ssm = SSMStateProvider.create({
@@ -6557,7 +6567,7 @@ async function deployCommand(options) {
 		dokployConfig = setupResult.config;
 		finalRegistry = dokployConfig.registry ?? dockerConfig.registry;
 		if (setupResult.serviceUrls) {
-			const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1, initStageSecrets } = await import("./storage-mwbL7PhP.mjs");
+			const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1, initStageSecrets } = await import("./storage-Cs4WBsc4.mjs");
 			let secrets = await readStageSecrets$1(stage);
 			if (!secrets) {
 				logger$3.log(`   Creating secrets file for stage "${stage}"...`);
@@ -7494,7 +7504,7 @@ function generateDockerEnv(apps, eventsBackend) {
 		const envVar = `${app.name.toUpperCase()}_DB_PASSWORD`;
 		return `${envVar}=${app.password}`;
 	});
-	if (eventsBackend === "pgboss") envVars.push(`PGBOSS_DB_PASSWORD=pgboss-dev-password`);
+	envVars.push(`PGBOSS_DB_PASSWORD=pgboss-dev-password`);
 	return `# Auto-generated docker environment file
 # Contains database passwords for docker-compose postgres init
 # This file is gitignored - do not commit to version control
@@ -7555,8 +7565,7 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
 EOSQL
 `;
 	});
-	let pgbossBlock = "";
-	if (eventsBackend === "pgboss") pgbossBlock = `
+	const pgbossBlock = `
 # Create pgboss user with dedicated schema - idempotent
 echo "Creating pgboss user and schema..."
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
@@ -7592,7 +7601,8 @@ set -e
 # Auto-generated PostgreSQL init script (idempotent - safe to re-run)
 # Creates per-app users with separate schemas in a single database
 # - api: uses public schema
-# - auth: uses auth schema (search_path=auth)${eventsBackend === "pgboss" ? "\n# - pgboss: uses pgboss schema for event processing" : ""}
+# - auth: uses auth schema (search_path=auth)
+# - pgboss: uses pgboss schema for event processing
 ${extensions}
 ${userCreations.join("\n")}${pgbossBlock}
 echo "Database initialization complete!"
@@ -11827,26 +11837,27 @@ function reconcileSecrets(secrets, workspace) {
 		logger$1.log(`   🔄 Adding missing service credentials: ${name$1}`);
 		changed = true;
 	}
+	if (result.services.postgres && !result.services.pgboss) {
+		result = {
+			...result,
+			services: {
+				...result.services,
+				pgboss: {
+					host: result.services.postgres.host,
+					port: result.services.postgres.port,
+					username: "pgboss",
+					password: generateSecurePassword(),
+					database: result.services.postgres.database ?? "app"
+				}
+			}
+		};
+		result.urls = generateConnectionUrls(result.services, result.eventsBackend);
+		logger$1.log("   🔄 Adding missing service credentials: pgboss");
+		changed = true;
+	}
 	const eventsBackend = workspace.services.events;
 	if (eventsBackend && result.eventsBackend !== eventsBackend) {
 		result.eventsBackend = eventsBackend;
-		if (eventsBackend === "pgboss" && !result.services.pgboss) {
-			result = {
-				...result,
-				services: {
-					...result.services,
-					pgboss: {
-						host: result.services.postgres?.host ?? "localhost",
-						port: result.services.postgres?.port ?? 5432,
-						username: "pgboss",
-						password: generateSecurePassword(),
-						database: result.services.postgres?.database ?? "app"
-					}
-				}
-			};
-			logger$1.log("   🔄 Adding missing service credentials: pgboss");
-			changed = true;
-		}
 		if (eventsBackend === "sns" && !result.services.localstack) {
 			result = {
 				...result,
@@ -12416,9 +12427,9 @@ program.command("secrets:push").description("Push secrets to remote provider (SS
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
-		const { pushSecrets: pushSecrets$1 } = await import("./sync-CYBVB64f.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-BLh6rswz.mjs");
-		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-mwbL7PhP.mjs");
+		const { pushSecrets: pushSecrets$1 } = await import("./sync-COnAugP-.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
+		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Cs4WBsc4.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);
 		if (secrets) {
@@ -12441,9 +12452,9 @@ program.command("secrets:pull").description("Pull secrets from remote provider (
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
-		const { pullSecrets: pullSecrets$1 } = await import("./sync-CYBVB64f.mjs");
-		const { writeStageSecrets: writeStageSecrets$1 } = await import("./storage-mwbL7PhP.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-BLh6rswz.mjs");
+		const { pullSecrets: pullSecrets$1 } = await import("./sync-COnAugP-.mjs");
+		const { writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Cs4WBsc4.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		let secrets = await pullSecrets$1(options.stage, workspace);
 		if (!secrets) {
@@ -12468,8 +12479,8 @@ program.command("secrets:reconcile").description("Backfill missing custom secret
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-BLh6rswz.mjs");
-		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-mwbL7PhP.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
+		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Cs4WBsc4.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);
 		if (!secrets) {