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

package/dist/{OpenApiTsGenerator-BN0PIZxd.cjs → OpenApiTsGenerator-WlUHjimW.cjs}

@@ -976,11 +976,15 @@ ${context.storageDrivers?.setup ? `// Which storage drivers exist is the entry p
 // a provider.
 ${context.storageDrivers.setup}
 ` : ""}
-export interface ServerApp {
+${context.surface ? `// Who this server is to Postgres: application_name on every connection.
+process.env.GKM_APP_NAME ??= ${JSON.stringify(context.surface.id)};
+
+` : ""}export interface ServerApp {
   app: HonoType;
   start: (options?: {
     port?: number;
-    serve: (app: HonoType, port: number) => void | Promise<void>;
+    /** Returns the server, so a shutdown can stop it taking requests. */
+    serve: (app: HonoType, port: number) => unknown;
   }) => Promise<void>;
 }
 
@@ -1148,20 +1152,35 @@ export const handler = adapter.handler;
 import { setupQueues } from './queues.js';
 import { setupCrons } from './crons.js';` : "";
 		const gracefulShutdownCode = enableGracefulShutdown ? `
-  // Graceful shutdown handling
+  // Graceful shutdown: stop taking requests, let in-flight ones finish, then
+  // close what constructs opened (database pools) — so a rolling deploy does
+  // not leave the old task holding connections. Bounded by
+  // GKM_SHUTDOWN_TIMEOUT_MS, 8s by default: under Docker's 10s stop timeout,
+  // so the process exits on its own terms rather than being killed mid-drain.
   let isShuttingDown = false;
 
   const shutdown = async () => {
     if (isShuttingDown) return;
     isShuttingDown = true;
-    logger.info('Graceful shutdown initiated');
-    // Allow in-flight requests to complete (30s timeout)
-    setTimeout(() => process.exit(0), 30000);
+    const deadline = Number(process.env.GKM_SHUTDOWN_TIMEOUT_MS) || 8000;
+    logger.info({ deadline }, 'Graceful shutdown initiated');
+    setTimeout(() => {
+      logger.warn({ deadline }, 'Shutdown deadline reached, exiting');
+      process.exit(1);
+    }, deadline).unref();
+    await new Promise<void>((resolve) => {
+      const close = (server as { close?: (done: () => void) => void } | undefined)?.close;
+      if (typeof close === 'function') close.call(server, () => resolve());
+      else resolve();
+    });
+    await runShutdownHooks((error) => logger.error({ error }, 'Shutdown hook failed'));
+    process.exit(0);
   };
 
   process.on('SIGTERM', shutdown);
   process.on('SIGINT', shutdown);
 ` : "";
+		const endpointsImportPath = production.optimizedHandlers ? "./endpoints/index.js" : "./endpoints.js";
 		const content = `/**
  * Generated production server application
  *
@@ -1173,7 +1192,7 @@ import { setupCrons } from './crons.js';` : "";
  */
 import { Hono } from 'hono';
 import type { Hono as HonoType } from 'hono';
-import { setupEndpoints } from '${production.optimizedHandlers ? "./endpoints/index.js" : "./endpoints.js"}';
+${enableGracefulShutdown ? "import { runShutdownHooks } from '@geekmidas/constructs';\n" : ""}import { setupEndpoints } from '${endpointsImportPath}';
 ${subscriberImport}
 ${runtime.imports}
 ${runtime.bindings}
@@ -1184,7 +1203,10 @@ ${context.storageDrivers?.imports ?? ""}
 ${context.storageDrivers?.setup ? `// The entry point registers the drivers its target needs.
 ${context.storageDrivers.setup}
 ` : ""}
-export interface ServerApp {
+${context.surface ? `// Who this server is to Postgres: application_name on every connection.
+process.env.GKM_APP_NAME ??= ${JSON.stringify(context.surface.id)};
+
+` : ""}export interface ServerApp {
   app: HonoType;
   start: (options?: {
     port?: number;
@@ -1217,11 +1239,12 @@ ${afterSetupCall}
       }
 
       const port = options.port ?? Number(process.env.PORT) ?? 3000;
+      let server: unknown;
 ${gracefulShutdownCode}${subscriberSetup}
       logger.info({ port }, 'Starting production server');
 
       // Start HTTP server using provided serve function
-      await options.serve(honoApp, port);
+      server = await options.serve(honoApp, port);
 
       logger.info({ port }, 'Production server started');
 ${includeSubscribers ? "\n      await subscribeForPush(port);" : ""}
@@ -1255,7 +1278,7 @@ const { start } = await createApp();
 
 await start({
   port,
-  serve: (app, port) => { serve({ fetch: app.fetch, port }); },
+  serve: (app, port) => serve({ fetch: app.fetch, port }),
 });
 `);
 	}
@@ -1785,4 +1808,4 @@ Object.defineProperty(exports, "runtimeFor", {
 	}
 });
 
-//# sourceMappingURL=OpenApiTsGenerator-BN0PIZxd.cjs.map
+//# sourceMappingURL=OpenApiTsGenerator-WlUHjimW.cjs.map