@bgord/bun 0.29.3 → 0.29.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/bun",
-  "version": "0.29.3",
+  "version": "0.29.5",
   "license": "MIT",
   "type": "module",
   "author": "Bartosz Gordon",
@@ -29,7 +29,7 @@
     "@types/nodemailer": "7.0.1",
     "@types/yazl": "3.3.0",
     "cspell": "9.2.1",
-    "knip": "5.64.0",
+    "knip": "5.64.1",
     "lefthook": "1.13.4",
     "only-allow": "1.2.1",
     "shellcheck": "4.1.0",
@@ -45,7 +45,7 @@
     "croner": "9.1.0",
     "csv": "6.4.1",
     "hcaptcha": "0.2.0",
-    "hono": "4.9.8",
+    "hono": "4.9.9",
     "lodash": "4.17.21",
     "mime-types": "3.0.1",
     "node-cache": "5.1.2",

package/src/graceful-shutdown.service.ts

@@ -5,45 +5,54 @@ import { formatError } from "./logger-format-error.service";
 type ServerType = ReturnType<typeof Bun.serve>;
 
 export class GracefulShutdown {
-  constructor(private readonly logger: LoggerPort) {}
-
   private readonly base = { operation: "shutdown", component: "infra" } as const;
+  private isShuttingDown = false;
 
-  private async shutdown(server: ServerType, cleanup: () => any = tools.noop) {
-    server.stop();
+  constructor(
+    private readonly logger: LoggerPort,
+    private readonly exitFn: (code: number) => never = ((code: number) => process.exit(code)) as never,
+  ) {}
 
-    try {
-      await cleanup();
+  private shutdown(server: ServerType, cleanup: () => any, exitCode: number) {
+    if (this.isShuttingDown) return;
+    this.isShuttingDown = true;
 
-      this.logger.info({ message: "HTTP server closed", ...this.base });
+    try {
+      server.stop();
     } catch (error) {
-      this.logger.error({ message: "Cleanup hook failed", error: formatError(error), ...this.base });
+      this.logger.error({ message: "Server stop failed", error: formatError(error), ...this.base });
     }
+
+    Promise.resolve()
+      .then(() => cleanup())
+      .then(() => this.logger.info({ message: "HTTP server closed", ...this.base }))
+      .catch((error) =>
+        this.logger.error({ message: "Cleanup hook failed", error: formatError(error), ...this.base }),
+      )
+      .finally(() => {
+        this.exitFn(exitCode);
+      });
   }
 
   applyTo(server: ServerType, cleanup: () => any = tools.noop) {
-    process.once("SIGTERM", async () => {
+    process.once("SIGTERM", () => {
       this.logger.info({ message: "SIGTERM received", ...this.base });
-      await this.shutdown(server, cleanup);
-      process.exitCode = 0;
+      this.shutdown(server, cleanup, 0);
     });
 
-    process.once("SIGINT", async () => {
+    process.once("SIGINT", () => {
       this.logger.info({ message: "SIGINT received", ...this.base });
-      await this.shutdown(server, cleanup);
-      process.exitCode = 0;
+      this.shutdown(server, cleanup, 0);
     });
 
-    process.once("unhandledRejection", async (event) => {
-      this.logger.error({ message: "UnhandledRejection received", error: formatError(event), ...this.base });
-      await this.shutdown(server, cleanup);
-      process.exitCode = 1;
+    process.once("unhandledRejection", (reason) => {
+      this.logger.error({ message: "UnhandledRejection received", error: formatError(reason), ...this.base });
+      this.shutdown(server, cleanup, 1);
     });
 
-    process.once("uncaughtException", async (error) => {
+    process.once("uncaughtException", (error) => {
       this.logger.error({ message: "UncaughtException received", error: formatError(error), ...this.base });
-      await this.shutdown(server, cleanup);
-      process.exitCode = 1;
+      this.shutdown(server, cleanup, 1);
     });
   }
 }