@moreapp/common-nodejs 0.14.0 → 0.15.0

package/dist/observability/ExpressRequestTracker.js

@@ -5,7 +5,7 @@ class ExpressRequestTracker {
     track() {
         return (_req, res, next) => {
             this.activeRequests++;
-            res.on("finish", () => {
+            res.once("close", () => {
                 this.activeRequests--;
             });
             next();

package/dist/observability/TerminationHandler.js

@@ -35,6 +35,10 @@ class TerminationHandler {
             logger_1.logger.error("Server threw an unrecoverable error, shutting down", err);
             this.shutdown();
         });
+        process.on("unhandledRejection", (reason) => {
+            logger_1.logger.error("Unhandled rejection, shutting down", { reason });
+            this.shutdown();
+        });
     }
     shutdown() {
         if (this.isShuttingDown) {

package/dist/observability/__tests__/ExpressRequestTracker.test.js

@@ -5,12 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const vitest_1 = require("vitest");
 const node_events_1 = require("node:events");
+const node_http_1 = __importDefault(require("node:http"));
+const express_1 = __importDefault(require("express"));
 const ExpressRequestTracker_1 = __importDefault(require("../ExpressRequestTracker"));
-// Create a minimal Response mock that can emit the 'finish' event
+// Create a minimal Response mock that can emit the 'close' event
 const createMockResponse = () => {
     const emitter = new node_events_1.EventEmitter();
     return Object.assign(emitter, {
-        emitFinish: () => emitter.emit("finish"),
+        emitClose: () => emitter.emit("close"),
     });
 };
 (0, vitest_1.describe)("ExpressRequestTracker", () => {
@@ -23,8 +25,8 @@ const createMockResponse = () => {
         middleware({}, res, next);
         (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(1);
         (0, vitest_1.expect)(next).toHaveBeenCalledTimes(1);
-        // Finish should decrement
-        res.emitFinish();
+        // Close should decrement
+        res.emitClose();
         (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(0);
     });
     (0, vitest_1.test)("decrements active requests when response finishes", () => {
@@ -33,7 +35,7 @@ const createMockResponse = () => {
         const res = createMockResponse();
         middleware({}, res, (() => { }));
         (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(1);
-        res.emitFinish();
+        res.emitClose();
         (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(0);
     });
     (0, vitest_1.test)("tracks multiple concurrent requests and decrements in order", () => {
@@ -45,10 +47,55 @@ const createMockResponse = () => {
         middleware({}, res2, (() => { }));
         (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(2);
         // Finish the first request
-        res1.emitFinish();
+        res1.emitClose();
         (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(1);
         // Finish the second request
-        res2.emitFinish();
+        res2.emitClose();
         (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(0);
     });
+    (0, vitest_1.describe)("with a real HTTP server", () => {
+        const servers = [];
+        (0, vitest_1.afterEach)(() => {
+            servers.splice(0).forEach((server) => {
+                server.closeAllConnections();
+                server.close();
+            });
+        });
+        const startServer = async (handler) => {
+            const tracker = new ExpressRequestTracker_1.default();
+            const app = (0, express_1.default)();
+            app.use(tracker.track());
+            app.get("/", handler);
+            const server = app.listen(0);
+            servers.push(server);
+            await (0, node_events_1.once)(server, "listening");
+            const { port } = server.address();
+            return { tracker, port };
+        };
+        (0, vitest_1.test)("decrements once when the response completes", async () => {
+            let responseClosed;
+            const { tracker, port } = await startServer((_req, res) => {
+                responseClosed = (0, node_events_1.once)(res, "close");
+                res.send("ok");
+            });
+            const response = await fetch(`http://localhost:${port}/`);
+            await response.text();
+            await responseClosed;
+            (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(0);
+        });
+        (0, vitest_1.test)("decrements when the client aborts before the response finishes", async () => {
+            let responseClosed;
+            const { tracker, port } = await startServer((_req, res) => {
+                responseClosed = (0, node_events_1.once)(res, "close");
+                res.write("partial");
+            });
+            const req = node_http_1.default.get({ port, path: "/" });
+            const [response] = (await (0, node_events_1.once)(req, "response"));
+            await (0, node_events_1.once)(response, "data");
+            (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(1);
+            req.destroy();
+            await responseClosed;
+            (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(0);
+        });
+    });
 });

package/dist/observability/__tests__/TerminationHandler.test.js

@@ -219,6 +219,30 @@ vitest_1.vi.mock("node:timers", () => ({
         await new Promise((resolve) => setImmediate(resolve));
         (0, vitest_1.expect)(exitSpy).toHaveBeenCalledWith(0);
     });
+    (0, vitest_1.test)("shuts down on an unhandled rejection", async () => {
+        const server = createFakeServer();
+        const hs = {
+            setReady: vitest_1.vi.fn(),
+            stop: vitest_1.vi.fn(() => Promise.resolve()),
+        };
+        const requestTracker = { nrOfActiveRequests: vitest_1.vi.fn(() => 0) };
+        const exitSpy = vitest_1.vi.spyOn(process, "exit").mockImplementation(() => undefined);
+        new TerminationHandler_1.default(server, hs, requestTracker);
+        // Call the listener directly; emitting on process would also reach vitest's own handler
+        const listener = process.listeners("unhandledRejection").at(-1);
+        process.off("unhandledRejection", listener);
+        const reason = new Error("boom");
+        listener(reason, Promise.resolve());
+        (0, vitest_1.expect)(vitest_1.vi.mocked(logger_1.logger.error)).toHaveBeenCalledWith("Unhandled rejection, shutting down", {
+            reason,
+        });
+        (0, vitest_1.expect)(hs.setReady).toHaveBeenCalledWith(false);
+        // eslint-disable-next-line @typescript-eslint/unbound-method
+        (0, vitest_1.expect)(server.close).toHaveBeenCalled();
+        intervalCb?.();
+        await new Promise((resolve) => setImmediate(resolve));
+        (0, vitest_1.expect)(exitSpy).toHaveBeenCalledWith(0);
+    });
     (0, vitest_1.test)("ignores a second shutdown call", () => {
         const server = createFakeServer();
         const hs = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moreapp/common-nodejs",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "license": "UNLICENSED",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,46 +30,47 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "1.9.1",
-    "@opentelemetry/core": "2.11.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.222.0",
-    "@opentelemetry/instrumentation": "0.222.0",
-    "@opentelemetry/instrumentation-dns": "0.65.0",
-    "@opentelemetry/instrumentation-express": "0.70.0",
-    "@opentelemetry/instrumentation-http": "0.222.0",
-    "@opentelemetry/instrumentation-winston": "0.66.0",
-    "@opentelemetry/resources": "2.11.0",
-    "@opentelemetry/sdk-node": "0.222.0",
-    "@opentelemetry/sdk-trace-base": "2.11.0",
-    "@opentelemetry/sdk-trace-node": "2.11.0",
+    "@opentelemetry/core": "2.12.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.223.0",
+    "@opentelemetry/instrumentation": "0.223.0",
+    "@opentelemetry/instrumentation-dns": "0.66.0",
+    "@opentelemetry/instrumentation-express": "0.71.1",
+    "@opentelemetry/instrumentation-http": "0.223.0",
+    "@opentelemetry/instrumentation-winston": "0.68.1",
+    "@opentelemetry/resources": "2.12.0",
+    "@opentelemetry/sdk-node": "0.223.0",
+    "@opentelemetry/sdk-trace-base": "2.12.0",
+    "@opentelemetry/sdk-trace-node": "2.12.0",
     "@opentelemetry/semantic-conventions": "1.43.0",
     "axios": "1.20.0",
     "content-disposition-parser": "1.0.2",
-    "date-and-time": "4.5.2",
-    "express": "5.2.1",
+    "date-and-time": "4.6.0",
+    "express": "5.3.0",
     "lodash": "4.18.1",
     "prom-client": "15.1.3",
     "winston": "3.19.0",
-    "zod": "4.6.5"
+    "zod": "4.6.7"
   },
   "devDependencies": {
     "@types/express": "5.0.6",
-    "@types/lodash": "4.17.25",
-    "@types/node": "24.13.4",
-    "@typescript-eslint/eslint-plugin": "8.70.0",
-    "@typescript-eslint/parser": "8.70.0",
-    "@vitest/coverage-v8": "4.1.11",
-    "@vitest/ui": "4.1.11",
+    "@types/lodash": "4.17.26",
+    "@types/node": "26.6.5",
+    "@typescript-eslint/eslint-plugin": "8.72.0",
+    "@typescript-eslint/parser": "8.72.0",
+    "@vitest/coverage-v8": "5.0.5",
+    "@vitest/ui": "5.0.5",
     "eslint": "9.39.5",
     "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-prettier": "5.5.6",
+    "eslint-plugin-prettier": "5.5.7",
     "husky": "9.1.7",
-    "lint-staged": "17.5.1",
-    "nock": "14.0.17",
-    "prettier": "3.9.6",
+    "lint-staged": "17.6.0",
+    "nock": "15.0.4",
+    "prettier": "3.9.10",
     "ts-node": "10.9.2",
     "typescript": "6.0.3",
-    "typescript-eslint": "8.70.0",
-    "vitest": "4.1.11",
+    "typescript-eslint": "8.72.0",
+    "vite": "8.3.4",
+    "vitest": "5.0.5",
     "vitest-mock-extended": "5.1.1"
   },
   "prettier": {