@rvoh/psychic 3.4.1 → 3.4.2

package/dist/cjs/src/server/index.js

@@ -138,11 +138,37 @@ export default class PsychicServer {
         await this.stop();
         process.exit();
     }
-    async stop({ bypassClosingDbConnections = false } = {}) {
+    async stop({ bypassClosingDbConnections = false, gracefulShutdownTimeoutMillis = 10_000, } = {}) {
         for (const hook of PsychicApp.getOrFail().specialHooks.serverShutdown) {
             await hook(this);
         }
-        this.httpServer?.close();
+        if (this.httpServer) {
+            const httpServer = this.httpServer;
+            await new Promise(resolve => {
+                // Bounded grace period: if still-active requests haven't finished by
+                // the timeout, force the remaining sockets so shutdown can never hang
+                // forever (the original bug). `closeIdle/AllConnections` are Node
+                // >= 18.2; on older runtimes the optional calls no-op and prior
+                // (potentially hanging) behavior is retained rather than throwing.
+                const forceTimer = setTimeout(() => httpServer.closeAllConnections?.(), gracefulShutdownTimeoutMillis);
+                forceTimer.unref?.();
+                // `close` stops accepting new connections and fires its callback only
+                // once every existing connection has ended.
+                httpServer.close(() => {
+                    clearTimeout(forceTimer);
+                    resolve();
+                });
+                // Immediately drop *idle* keep-alive sockets. These (browsers, fetch
+                // agents, reverse proxies sitting between requests) are what kept
+                // `close()`'s callback from ever firing — and, transitively, a leased
+                // DB pool client from being released — causing shutdown to hang (a
+                // SIGTERM drain that never completes; a feature-spec `afterAll` that
+                // blocks for the full hook timeout). Dropping only *idle* sockets
+                // does NOT abort in-flight requests, so a normal graceful shutdown
+                // still lets active handlers finish within the grace period above.
+                httpServer.closeIdleConnections?.();
+            });
+        }
         if (!bypassClosingDbConnections) {
             await closeAllDbConnections();
         }

package/dist/esm/src/server/index.js

@@ -138,11 +138,37 @@ export default class PsychicServer {
         await this.stop();
         process.exit();
     }
-    async stop({ bypassClosingDbConnections = false } = {}) {
+    async stop({ bypassClosingDbConnections = false, gracefulShutdownTimeoutMillis = 10_000, } = {}) {
         for (const hook of PsychicApp.getOrFail().specialHooks.serverShutdown) {
             await hook(this);
         }
-        this.httpServer?.close();
+        if (this.httpServer) {
+            const httpServer = this.httpServer;
+            await new Promise(resolve => {
+                // Bounded grace period: if still-active requests haven't finished by
+                // the timeout, force the remaining sockets so shutdown can never hang
+                // forever (the original bug). `closeIdle/AllConnections` are Node
+                // >= 18.2; on older runtimes the optional calls no-op and prior
+                // (potentially hanging) behavior is retained rather than throwing.
+                const forceTimer = setTimeout(() => httpServer.closeAllConnections?.(), gracefulShutdownTimeoutMillis);
+                forceTimer.unref?.();
+                // `close` stops accepting new connections and fires its callback only
+                // once every existing connection has ended.
+                httpServer.close(() => {
+                    clearTimeout(forceTimer);
+                    resolve();
+                });
+                // Immediately drop *idle* keep-alive sockets. These (browsers, fetch
+                // agents, reverse proxies sitting between requests) are what kept
+                // `close()`'s callback from ever firing — and, transitively, a leased
+                // DB pool client from being released — causing shutdown to hang (a
+                // SIGTERM drain that never completes; a feature-spec `afterAll` that
+                // blocks for the full hook timeout). Dropping only *idle* sockets
+                // does NOT abort in-flight requests, so a normal graceful shutdown
+                // still lets active handlers finish within the grace period above.
+                httpServer.closeIdleConnections?.();
+            });
+        }
         if (!bypassClosingDbConnections) {
             await closeAllDbConnections();
         }

package/dist/types/src/server/index.d.ts

@@ -17,8 +17,9 @@ export default class PsychicServer {
     attach(id: string, obj: any): void;
     $attached: Record<string, any>;
     private shutdownAndExit;
-    stop({ bypassClosingDbConnections }?: {
+    stop({ bypassClosingDbConnections, gracefulShutdownTimeoutMillis, }?: {
         bypassClosingDbConnections?: boolean;
+        gracefulShutdownTimeoutMillis?: number;
     }): Promise<void>;
     serveForRequestSpecs(block: () => void | Promise<void>): Promise<boolean>;
     buildApp(): void;

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "author": "RVOHealth",
   "repository": {
     "type": "git",