@moreapp/common-nodejs 0.12.2 → 0.12.5

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

@@ -0,0 +1,171 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const node_events_1 = require("node:events");
+const timers = __importStar(require("node:timers"));
+const TerminationHandler_1 = __importDefault(require("../TerminationHandler"));
+vitest_1.vi.mock("../../logger", () => ({
+    logger: {
+        info: vitest_1.vi.fn(),
+        warn: vitest_1.vi.fn(),
+        error: vitest_1.vi.fn(),
+        debug: vitest_1.vi.fn(),
+    },
+}));
+// Mock tracer
+vitest_1.vi.mock("../tracer", () => ({
+    default: {
+        shutdown: vitest_1.vi.fn(() => Promise.resolve()),
+    },
+}));
+// Mock node:timers so we can control callbacks (TerminationHandler imports from node:timers)
+vitest_1.vi.mock("node:timers", () => ({
+    setInterval: vitest_1.vi.fn(),
+    clearInterval: vitest_1.vi.fn(),
+    setTimeout: vitest_1.vi.fn(),
+}));
+(0, vitest_1.describe)("TerminationHandler", () => {
+    let intervalCb;
+    let timeoutCallbacks = [];
+    (0, vitest_1.beforeEach)(() => {
+        intervalCb = undefined;
+        timeoutCallbacks = [];
+        vitest_1.vi.mocked(timers.setInterval).mockImplementation((cb) => {
+            intervalCb = cb;
+            return 1;
+        });
+        vitest_1.vi.mocked(timers.clearInterval).mockImplementation(() => { });
+        vitest_1.vi.spyOn(globalThis, "setTimeout").mockImplementation((cb) => {
+            timeoutCallbacks.push(cb);
+            return timeoutCallbacks.length;
+        });
+    });
+    (0, vitest_1.afterEach)(() => {
+        vitest_1.vi.resetAllMocks();
+    });
+    const createFakeServer = () => {
+        const emitter = new node_events_1.EventEmitter();
+        const server = {
+            close: vitest_1.vi.fn((cb) => {
+                if (cb)
+                    cb();
+                return server;
+            }),
+            on: vitest_1.vi.fn((event, listener) => {
+                emitter.on(event, listener);
+                return server;
+            }),
+            emit: emitter.emit.bind(emitter),
+        };
+        return server;
+    };
+    const createSocket = () => {
+        const emitter = new node_events_1.EventEmitter();
+        const socket = emitter;
+        socket.destroy = vitest_1.vi.fn();
+        return socket;
+    };
+    (0, vitest_1.test)("shutdown waits for active requests to reach 0 then stops and exits 0", 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);
+        const th = new TerminationHandler_1.default(server, hs, requestTracker);
+        th.shutdown();
+        (0, vitest_1.expect)(hs.setReady).toHaveBeenCalledWith(false);
+        (0, vitest_1.expect)(server.close).toHaveBeenCalled();
+        // First interval tick should see 0 active and exit
+        intervalCb?.();
+        // ensure hs.stop called
+        (0, vitest_1.expect)(hs.stop).toHaveBeenCalled();
+        // Wait for Promise.all and .finally() to execute
+        await new Promise((resolve) => setImmediate(resolve));
+        // Trigger log flush timeout (index 1, after the 30s timeout at index 0)
+        timeoutCallbacks[1]?.();
+        (0, vitest_1.expect)(exitSpy).toHaveBeenCalledWith(0);
+    });
+    (0, vitest_1.test)("shutdown polls until requests finish then exits 0", 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() };
+        // Return >0 first, then 0
+        requestTracker.nrOfActiveRequests.mockReturnValueOnce(2).mockReturnValueOnce(0);
+        const exitSpy = vitest_1.vi.spyOn(process, "exit").mockImplementation(() => undefined);
+        const th = new TerminationHandler_1.default(server, hs, requestTracker);
+        th.shutdown();
+        // First tick: still waiting
+        intervalCb?.();
+        (0, vitest_1.expect)(exitSpy).not.toHaveBeenCalled();
+        // Second tick: now 0
+        intervalCb?.();
+        (0, vitest_1.expect)(hs.stop).toHaveBeenCalled();
+        // Wait for Promise.all and .finally() to execute
+        await new Promise((resolve) => setImmediate(resolve));
+        // Trigger log flush timeout (index 1, after the 30s timeout at index 0)
+        timeoutCallbacks[1]?.();
+        (0, vitest_1.expect)(exitSpy).toHaveBeenCalledWith(0);
+    });
+    (0, vitest_1.test)("forceful stop after 30s destroys sockets and exits 1", () => {
+        const server = createFakeServer();
+        const hs = {
+            setReady: vitest_1.vi.fn(),
+            stop: vitest_1.vi.fn(() => Promise.resolve()),
+        };
+        const requestTracker = { nrOfActiveRequests: vitest_1.vi.fn(() => 5) }; // never reaches 0
+        const exitSpy = vitest_1.vi.spyOn(process, "exit").mockImplementation(() => undefined);
+        const th = new TerminationHandler_1.default(server, hs, requestTracker);
+        // Register a socket via the server's connection event
+        const socket = createSocket();
+        server.emit("connection", socket);
+        th.shutdown();
+        // Before timeout callback, no exit
+        (0, vitest_1.expect)(exitSpy).not.toHaveBeenCalled();
+        (0, vitest_1.expect)(socket.destroy).not.toHaveBeenCalled();
+        // Trigger shutdown timeout (index 0 is the 30s timeout)
+        timeoutCallbacks[0]?.();
+        (0, vitest_1.expect)(socket.destroy).toHaveBeenCalled();
+        (0, vitest_1.expect)(exitSpy).toHaveBeenCalledWith(1);
+    });
+});

package/dist/observability/index.d.ts

@@ -1,4 +1,5 @@
 import ExpressRequestTracker from "./ExpressRequestTracker";
 import ObservabilityServer from "./ObservabilityServer";
 import TerminationHandler from "./TerminationHandler";
-export { ExpressRequestTracker, ObservabilityServer, TerminationHandler };
+import tracer from "./tracer";
+export { ExpressRequestTracker, ObservabilityServer, TerminationHandler, tracer };

package/dist/observability/index.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TerminationHandler = exports.ObservabilityServer = exports.ExpressRequestTracker = void 0;
+exports.tracer = exports.TerminationHandler = exports.ObservabilityServer = exports.ExpressRequestTracker = void 0;
 const ExpressRequestTracker_1 = __importDefault(require("./ExpressRequestTracker"));
 exports.ExpressRequestTracker = ExpressRequestTracker_1.default;
 const ObservabilityServer_1 = __importDefault(require("./ObservabilityServer"));
 exports.ObservabilityServer = ObservabilityServer_1.default;
 const TerminationHandler_1 = __importDefault(require("./TerminationHandler"));
 exports.TerminationHandler = TerminationHandler_1.default;
+const tracer_1 = __importDefault(require("./tracer"));
+exports.tracer = tracer_1.default;

package/dist/observability/tracer.d.ts

@@ -0,0 +1,12 @@
+import * as types from "@opentelemetry/instrumentation/build/src/types";
+declare const _default: {
+    start: (serviceName: string, { http, extraInstrumentations, debug, }: {
+        http?: {
+            portsToInstrument: number[];
+        };
+        extraInstrumentations?: types.Instrumentation[];
+        debug?: boolean;
+    }) => void;
+    shutdown: () => Promise<void>;
+};
+export default _default;

package/dist/{tracer.js → observability/tracer.js}

@@ -1,6 +1,38 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tracer = void 0;
 const api_1 = require("@opentelemetry/api");
 const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
 const instrumentation_1 = require("@opentelemetry/instrumentation");
@@ -12,21 +44,23 @@ const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
 const resources_1 = require("@opentelemetry/resources");
 const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
 const propagator_b3_1 = require("@opentelemetry/propagator-b3");
-const utils_1 = require("./utils");
+const environmentVariable_1 = require("../utils/environmentVariable");
 const exporter_trace_otlp_grpc_1 = require("@opentelemetry/exporter-trace-otlp-grpc");
-const tracer = (serviceName, { http = {
+const lodash_1 = require("lodash");
+let provider;
+const start = (serviceName, { http = {
     portsToInstrument: [3000],
 }, extraInstrumentations = [], debug = false, }) => {
     if (debug) {
         api_1.diag.setLogger(new api_1.DiagConsoleLogger(), api_1.DiagLogLevel.DEBUG);
     }
-    const provider = new sdk_trace_node_1.NodeTracerProvider({
+    provider = new sdk_trace_node_1.NodeTracerProvider({
         resource: (0, resources_1.resourceFromAttributes)({
-            [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: serviceName,
-            [semantic_conventions_1.SemanticResourceAttributes.SERVICE_INSTANCE_ID]: (0, utils_1.environmentVariable)("HOSTNAME", "local"),
+            [semantic_conventions_1.ATTR_SERVICE_NAME]: serviceName,
+            [semantic_conventions_1.ATTR_SERVICE_INSTANCE_ID]: (0, environmentVariable_1.environmentVariable)("HOSTNAME", "local"),
         }),
         spanProcessors: [
-            ...((0, utils_1.environmentVariable)("STACKDRIVER_TRACING_ENABLED", false)
+            ...((0, environmentVariable_1.environmentVariable)("STACKDRIVER_TRACING_ENABLED", false)
                 ? [new sdk_trace_base_1.BatchSpanProcessor(new exporter_trace_otlp_grpc_1.OTLPTraceExporter())]
                 : []),
             ...(debug ? [new sdk_trace_base_1.BatchSpanProcessor(new sdk_trace_node_1.ConsoleSpanExporter())] : []),
@@ -51,4 +85,11 @@ const tracer = (serviceName, { http = {
         ],
     });
 };
-exports.tracer = tracer;
+const shutdown = async () => {
+    if (!(0, lodash_1.isNil)(provider)) {
+        const { logger } = await Promise.resolve().then(() => __importStar(require("../logger")));
+        logger.info("Shutting down tracer");
+        await provider.shutdown();
+    }
+};
+exports.default = { start, shutdown };

package/dist/utils/__tests__/environmentVariable.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/__tests__/environmentVariable.test.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const environmentVariable_1 = require("../environmentVariable");
+(0, vitest_1.describe)("environmentVariable", () => {
+    (0, vitest_1.test)("Should throw when environment variable does not exist", () => {
+        (0, vitest_1.expect)(() => (0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING")).toThrow("Missing environment variable 'COMMONS_NODEJS_TEST_NON_EXISTING'");
+    });
+    (0, vitest_1.test)("Should return fallback value when environment variable does not exist (string)", () => {
+        (0, vitest_1.expect)((0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING", "my-fallback")).toBe("my-fallback");
+    });
+    (0, vitest_1.test)("Should return fallback value when environment variable does not exist (number)", () => {
+        (0, vitest_1.expect)((0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING", 1)).toBe(1);
+    });
+    (0, vitest_1.test)("Should return fallback value when environment variable does not exist (boolean)", () => {
+        (0, vitest_1.expect)((0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_NON_EXISTING", false)).toBe(false);
+    });
+    (0, vitest_1.test)("Should return actual value when environment variable exists (string)", () => {
+        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "actual-value";
+        (0, vitest_1.expect)((0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", "my-fallback")).toBe("actual-value");
+    });
+    (0, vitest_1.test)("Should return actual value when environment variable exists (number)", () => {
+        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "2";
+        (0, vitest_1.expect)((0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", 1)).toBe(2);
+    });
+    (0, vitest_1.test)("Should return actual value when environment variable exists (boolean)", () => {
+        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "true";
+        (0, vitest_1.expect)((0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", false)).toBe(true);
+    });
+    (0, vitest_1.test)("should throw when environment variable contains an invalid type (number)", () => {
+        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "not-a-number";
+        (0, vitest_1.expect)(() => (0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", 1)).toThrow("Wrong type for environment variable 'COMMONS_NODEJS_TEST_EXISTING'");
+    });
+    (0, vitest_1.test)("should throw when environment variable contains an invalid type (boolean)", () => {
+        process.env["COMMONS_NODEJS_TEST_EXISTING"] = "not-a-boolean";
+        (0, vitest_1.expect)(() => (0, environmentVariable_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", false)).toThrow("Wrong type for environment variable 'COMMONS_NODEJS_TEST_EXISTING'");
+    });
+});

package/dist/utils/environmentVariable.d.ts

@@ -0,0 +1,4 @@
+export declare function environmentVariable(key: string): string;
+export declare function environmentVariable(key: string, fallback: string): string;
+export declare function environmentVariable(key: string, fallback: number): number;
+export declare function environmentVariable(key: string, fallback: boolean): boolean;

package/dist/utils/environmentVariable.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.environmentVariable = environmentVariable;
+const lodash_1 = require("lodash");
+function environmentVariable(key, fallback) {
+    const value = process.env[key] || fallback;
+    if (value === undefined) {
+        throw new Error(`Missing environment variable '${key}'`);
+    }
+    else if (fallback === undefined) {
+        return value;
+    }
+    else if ((0, lodash_1.isString)(fallback) && (0, lodash_1.isString)(value)) {
+        return value;
+    }
+    else if ((0, lodash_1.isFinite)(fallback) && (0, lodash_1.isFinite)(Number(value))) {
+        return Number(value);
+    }
+    else if ((0, lodash_1.isBoolean)(fallback) && ((0, lodash_1.isBoolean)(value) || value === "true" || value === "false")) {
+        return Boolean(value);
+    }
+    throw new Error(`Wrong type for environment variable '${key}'`);
+}

package/dist/utils.d.ts

@@ -1,8 +1,4 @@
 import { FormVersionField } from "./types";
-export declare function environmentVariable(key: string): string;
-export declare function environmentVariable(key: string, fallback: string): string;
-export declare function environmentVariable(key: string, fallback: number): number;
-export declare function environmentVariable(key: string, fallback: boolean): boolean;
 export declare function currentTraceId(): string | undefined;
 export declare function isValidEmail(email: string): boolean;
 export declare function parseDynamicRecipients(dynamicRecipients: string[], fields: FormVersionField[], data: Record<string, unknown>): string[];

package/dist/utils.js

@@ -1,65 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.environmentVariable = environmentVariable;
 exports.currentTraceId = currentTraceId;
 exports.isValidEmail = isValidEmail;
 exports.parseDynamicRecipients = parseDynamicRecipients;
 exports.getDataForDataName = getDataForDataName;
 const api_1 = require("@opentelemetry/api");
-const lodash_1 = __importStar(require("lodash"));
-function environmentVariable(key, fallback) {
-    const value = process.env[key] || fallback;
-    if (value === undefined) {
-        throw new Error(`Missing environment variable '${key}'`);
-    }
-    else if (fallback === undefined) {
-        return value;
-    }
-    else if (lodash_1.default.isString(fallback) && lodash_1.default.isString(value)) {
-        return value;
-    }
-    else if (lodash_1.default.isFinite(fallback) && lodash_1.default.isFinite(Number(value))) {
-        return Number(value);
-    }
-    else if (lodash_1.default.isBoolean(fallback) &&
-        (lodash_1.default.isBoolean(value) || value === "true" || value === "false")) {
-        return Boolean(value);
-    }
-    throw new Error(`Wrong type for environment variable '${key}'`);
-}
+const lodash_1 = require("lodash");
 function currentTraceId() {
     return api_1.trace.getSpanContext(api_1.context.active())?.traceId;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moreapp/common-nodejs",
-  "version": "0.12.2",
+  "version": "0.12.5",
   "license": "UNLICENSED",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,14 +10,14 @@
       "types": "./dist/index.d.ts"
     },
     "./tracer": {
-      "default": "./dist/tracer.js",
-      "types": "./dist/tracer.d.ts"
+      "default": "./dist/observability/tracer.js",
+      "types": "./dist/observability/tracer.d.ts"
     }
   },
   "scripts": {
     "build": "tsc",
-    "test": "jest --detectOpenHandles",
-    "test:workflow": "yarn test --coverage",
+    "test": "vitest run",
+    "test:workflow": "vitest run --coverage",
     "prettier": "prettier './**/*.{ts,json,yaml,md,}'",
     "format:check": "yarn prettier --check",
     "format:fix": "yarn prettier --write",
@@ -30,21 +30,21 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "1.9.1",
-    "@opentelemetry/core": "2.7.1",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.218.0",
-    "@opentelemetry/instrumentation": "0.218.0",
-    "@opentelemetry/instrumentation-dns": "0.61.0",
-    "@opentelemetry/instrumentation-express": "0.66.0",
-    "@opentelemetry/instrumentation-http": "0.218.0",
-    "@opentelemetry/instrumentation-winston": "0.62.0",
-    "@opentelemetry/resources": "2.7.1",
-    "@opentelemetry/sdk-node": "0.218.0",
-    "@opentelemetry/sdk-trace-base": "2.7.1",
-    "@opentelemetry/sdk-trace-node": "2.7.1",
+    "@opentelemetry/core": "2.8.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.219.0",
+    "@opentelemetry/instrumentation": "0.219.0",
+    "@opentelemetry/instrumentation-dns": "0.62.0",
+    "@opentelemetry/instrumentation-express": "0.67.0",
+    "@opentelemetry/instrumentation-http": "0.219.0",
+    "@opentelemetry/instrumentation-winston": "0.63.0",
+    "@opentelemetry/resources": "2.8.0",
+    "@opentelemetry/sdk-node": "0.219.0",
+    "@opentelemetry/sdk-trace-base": "2.8.0",
+    "@opentelemetry/sdk-trace-node": "2.8.0",
     "@opentelemetry/semantic-conventions": "1.41.1",
-    "axios": "1.16.0",
+    "axios": "1.18.1",
     "content-disposition-parser": "1.0.2",
-    "date-and-time": "4.5.0",
+    "date-and-time": "4.5.1",
     "express": "5.2.1",
     "lodash": "4.18.1",
     "prom-client": "15.1.3",
@@ -53,24 +53,24 @@
   },
   "devDependencies": {
     "@types/express": "5.0.6",
-    "@types/jest": "30.0.0",
     "@types/lodash": "4.17.24",
-    "@types/node": "24.12.3",
-    "@typescript-eslint/eslint-plugin": "8.59.2",
-    "@typescript-eslint/parser": "8.59.2",
+    "@types/node": "24.13.2",
+    "@typescript-eslint/eslint-plugin": "8.61.1",
+    "@typescript-eslint/parser": "8.61.1",
+    "@vitest/coverage-v8": "4.1.9",
+    "@vitest/ui": "4.1.9",
     "eslint": "9.39.4",
     "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-prettier": "5.5.5",
+    "eslint-plugin-prettier": "5.5.6",
     "husky": "9.1.7",
-    "jest": "30.4.1",
-    "jest-mock-extended": "4.0.1",
-    "lint-staged": "17.0.2",
-    "nock": "14.0.15",
-    "prettier": "3.8.3",
-    "ts-jest": "29.4.9",
+    "lint-staged": "17.0.8",
+    "nock": "14.0.16",
+    "prettier": "3.8.5",
     "ts-node": "10.9.2",
-    "typescript": "5.9.3",
-    "typescript-eslint": "8.59.2"
+    "typescript": "6.0.3",
+    "typescript-eslint": "8.61.1",
+    "vitest": "4.1.9",
+    "vitest-mock-extended": "4.0.0"
   },
   "prettier": {
     "printWidth": 100,

package/dist/MoreAppClient.test.js

@@ -1,79 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const nock_1 = __importDefault(require("nock"));
-const axios_1 = require("axios");
-const MoreAppClient_1 = __importDefault(require("./MoreAppClient"));
-test("download binary file", async () => {
-    const file = Buffer.from("Some data");
-    const apiMock = (0, nock_1.default)("https://api.moreapp.com")
-        .get("/download")
-        .matchHeader("x-more-seal", "my-seal")
-        .reply(200, file, {
-        "Content-Type": "image/jpg",
-        "content-disposition": 'attachment; filename="my%20photo.jpg"',
-    });
-    const client = new MoreAppClient_1.default({
-        serviceName: "Common Test",
-        prefix: "https://api.moreapp.com",
-        seal: "my-seal",
-    });
-    const binaryFile = await client.getBinary("/download");
-    expect(binaryFile.buffer).toStrictEqual(file);
-    expect(binaryFile.contentType).toBe("image/jpg");
-    expect(binaryFile.filename).toBe("my photo.jpg");
-    apiMock.done();
-});
-test("404", async () => {
-    const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(404);
-    const client = new MoreAppClient_1.default({
-        serviceName: "Common Test",
-        prefix: "https://api.moreapp.com",
-        seal: "my-seal",
-    });
-    await expect(client.getBinary("/download")).rejects.toStrictEqual(new axios_1.AxiosError("Request failed with status code 404"));
-    apiMock.done();
-});
-test("unable to connect", async () => {
-    const client = new MoreAppClient_1.default({
-        serviceName: "Common Test",
-        prefix: "https://non-existing.moreapp.com",
-        seal: "my-seal",
-    });
-    await expect(client.getBinary("/download")).rejects.toThrow("getaddrinfo ENOTFOUND non-existing.moreapp.com");
-});
-const client = new MoreAppClient_1.default({
-    serviceName: "Common Test",
-    prefix: "https://api.moreapp.com",
-    seal: "my-seal",
-});
-test("Handle non existing file", async () => {
-    const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(404);
-    await expect(client.getBinary("/download")).rejects.toThrow("Request failed with status code 404");
-    apiMock.done();
-});
-test("Handle missing 'content-type' header", async () => {
-    const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(200);
-    const binaryFile = await client.getBinary("/download");
-    expect(binaryFile).not.toBeNull();
-    expect(binaryFile.contentType).toBe("unknown");
-    apiMock.done();
-});
-test("Handle missing 'content-disposition' header", async () => {
-    const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(200);
-    const binaryFile = await client.getBinary("/download");
-    expect(binaryFile).not.toBeNull();
-    expect(binaryFile.filename).toBeUndefined();
-    apiMock.done();
-});
-test("Handle invalid 'content-disposition' header", async () => {
-    const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(200, {}, {
-        "content-disposition": "filename=my-photo.png",
-    });
-    const binaryFile = await client.getBinary("/download");
-    expect(binaryFile).not.toBeNull();
-    expect(binaryFile.filename).toBeUndefined();
-    apiMock.done();
-});