@bgord/bun 0.29.4 → 0.29.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/bun",
-  "version": "0.29.4",
+  "version": "0.29.5",
   "license": "MIT",
   "type": "module",
   "author": "Bartosz Gordon",

package/src/graceful-shutdown.service.ts

@@ -4,21 +4,16 @@ import { formatError } from "./logger-format-error.service";
 
 type ServerType = ReturnType<typeof Bun.serve>;
 
-type GracefulShutdownOptions = { exitFn?: (code: number) => never };
-
 export class GracefulShutdown {
   private readonly base = { operation: "shutdown", component: "infra" } as const;
-  private readonly exitFn: (code: number) => never;
   private isShuttingDown = false;
 
   constructor(
     private readonly logger: LoggerPort,
-    options: GracefulShutdownOptions = {},
-  ) {
-    this.exitFn = options.exitFn ?? ((code: number) => process.exit(code));
-  }
+    private readonly exitFn: (code: number) => never = ((code: number) => process.exit(code)) as never,
+  ) {}
 
-  private async shutdown(server: ServerType, cleanup: () => any, exitCode: number) {
+  private shutdown(server: ServerType, cleanup: () => any, exitCode: number) {
     if (this.isShuttingDown) return;
     this.isShuttingDown = true;
 
@@ -28,35 +23,36 @@ export class GracefulShutdown {
       this.logger.error({ message: "Server stop failed", error: formatError(error), ...this.base });
     }
 
-    try {
-      await cleanup();
-      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);
-    }
+    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, 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, 0);
+      this.shutdown(server, cleanup, 0);
     });
 
-    process.once("unhandledRejection", async (reason /*, promise*/) => {
+    process.once("unhandledRejection", (reason) => {
       this.logger.error({ message: "UnhandledRejection received", error: formatError(reason), ...this.base });
-      await this.shutdown(server, cleanup, 1);
+      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, 1);
+      this.shutdown(server, cleanup, 1);
     });
   }
 }