@moreapp/common-nodejs 0.9.1 → 0.10.0

package/dist/MoreAppClient.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { AxiosRequestConfig } from "axios";
 interface Options {
     serviceName: string;

package/dist/MoreAppClient.test.js

@@ -42,7 +42,7 @@ test("unable to connect", async () => {
         prefix: "https://non-existing.moreapp.com",
         seal: "my-seal",
     });
-    await expect(client.getBinary("/download")).rejects.toThrowError("getaddrinfo ENOTFOUND non-existing.moreapp.com");
+    await expect(client.getBinary("/download")).rejects.toThrow("getaddrinfo ENOTFOUND non-existing.moreapp.com");
 });
 const client = new MoreAppClient_1.default({
     serviceName: "Common Test",

package/dist/dateUtil.js

@@ -3,30 +3,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatDateTime = exports.formatDate = exports.isDateTime = exports.isDate = void 0;
+exports.isDate = isDate;
+exports.isDateTime = isDateTime;
+exports.formatDate = formatDate;
+exports.formatDateTime = formatDateTime;
 const date_and_time_1 = __importDefault(require("date-and-time"));
 const DATE_REGEX = /^\d{4}-\d{1,2}-\d{1,2}$/;
 const DATE_TIME_REGEX = /^\d{4}-\d{1,2}-\d{1,2} \d{1,2}:\d{2}$/;
 function isDate(string) {
     return DATE_REGEX.test(string) && !isNaN(Date.parse(string));
 }
-exports.isDate = isDate;
 function isDateTime(string) {
     return DATE_TIME_REGEX.test(string) && !isNaN(Date.parse(string));
 }
-exports.isDateTime = isDateTime;
 function formatDate(dateString, format) {
     const date = date_and_time_1.default.parse(dateString, "YYYY-MM-DD");
     return date_and_time_1.default.format(date, formatDateFormat(format));
 }
-exports.formatDate = formatDate;
 function formatDateTime(dateTime, format) {
     const date = typeof dateTime === "string"
         ? date_and_time_1.default.parse(dateTime, "YYYY-MM-DD HH:mm", { timeZone: "UTC" })
         : new Date(dateTime);
     return date_and_time_1.default.format(date, formatDateFormat(format) + " HH:mm", { timeZone: "UTC" });
 }
-exports.formatDateTime = formatDateTime;
 function formatDateFormat(format) {
     switch (format) {
         case "DDMMYYYY":

package/dist/index.d.ts

@@ -5,6 +5,6 @@ export * from "./tracer";
 export * from "./logger";
 export * from "./dateUtil";
 export * from "./utils";
-export * from "./k8s";
+export * from "./observability";
 export { BinaryFile } from "./MoreAppClient";
 export { MoreAppClient };

package/dist/index.js

@@ -26,4 +26,4 @@ __exportStar(require("./tracer"), exports);
 __exportStar(require("./logger"), exports);
 __exportStar(require("./dateUtil"), exports);
 __exportStar(require("./utils"), exports);
-__exportStar(require("./k8s"), exports);
+__exportStar(require("./observability"), exports);

package/dist/{k8s/HealthServer.d.ts → observability/ObservabilityServer.d.ts}

@@ -1,15 +1,15 @@
 import ExpressRequestTracker from "./ExpressRequestTracker";
-type HealthServerOptions = {
+type ObservabilityServerOptions = {
     port: number;
 };
-export default class HealthServer {
+export default class ObservabilityServer {
     private readonly requestTracker;
     private readonly options;
     private readonly server;
     private status;
     private isReady;
     private constructor();
-    static create(requestTracker: ExpressRequestTracker, options: HealthServerOptions): Promise<HealthServer>;
+    static create(requestTracker: ExpressRequestTracker, options: ObservabilityServerOptions): Promise<ObservabilityServer>;
     start(): Promise<void>;
     stop(): Promise<void>;
     setReady(value: boolean): void;

package/dist/{k8s/HealthServer.js → observability/ObservabilityServer.js}

@@ -4,8 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_http_1 = __importDefault(require("node:http"));
+const prom_client_1 = __importDefault(require("prom-client"));
 const logger_1 = require("../logger");
-class HealthServer {
+class ObservabilityServer {
     requestTracker;
     options;
     server;
@@ -14,7 +15,8 @@ class HealthServer {
     constructor(requestTracker, options) {
         this.requestTracker = requestTracker;
         this.options = options;
-        this.server = node_http_1.default.createServer((req, res) => {
+        prom_client_1.default.collectDefaultMetrics();
+        this.server = node_http_1.default.createServer(async (req, res) => {
             if (req.url === "/live") {
                 res.writeHead(200, { "Content-Type": "application/json" });
                 return res.end(JSON.stringify({ status: "ok" }));
@@ -26,6 +28,10 @@ class HealthServer {
                     activeRequests: this.requestTracker.nrOfActiveRequests(),
                 }));
             }
+            else if (req.url === "/metrics") {
+                res.setHeader("Content-Type", prom_client_1.default.register.contentType);
+                return res.end(await prom_client_1.default.register.metrics());
+            }
             else {
                 res.statusCode = 404;
                 return res.end();
@@ -33,28 +39,32 @@ class HealthServer {
         });
     }
     static async create(requestTracker, options) {
-        const hs = new HealthServer(requestTracker, options);
+        const hs = new ObservabilityServer(requestTracker, options);
         await hs.start();
         return hs;
     }
     start() {
         if (this.status !== "stopped") {
-            logger_1.logger.info("Cannot start Health server, due to invalid status", { status: this.status });
+            logger_1.logger.info("Cannot start Observability server, due to invalid status", {
+                status: this.status,
+            });
             return Promise.resolve();
         }
         this.status = "starting";
         return new Promise((resolve) => {
             this.server.listen(this.options.port, () => {
                 this.status = "started";
-                logger_1.logger.info("Started Health server");
+                logger_1.logger.info("Started Observability server");
                 resolve();
             });
         });
     }
     stop() {
         if (this.status !== "started") {
-            logger_1.logger.warn("Cannot stop Health server, due to invalid status", { status: this.status });
-            return Promise.reject(new Error("Health server not started"));
+            logger_1.logger.warn("Cannot stop Observability server, due to invalid status", {
+                status: this.status,
+            });
+            return Promise.reject(new Error("Observability server not started"));
         }
         this.status = "stopping";
         this.isReady = false;
@@ -64,4 +74,4 @@ class HealthServer {
         this.isReady = value;
     }
 }
-exports.default = HealthServer;
+exports.default = ObservabilityServer;

package/dist/{k8s/HealthServer.test.js → observability/ObservabilityServer.test.js}

@@ -7,8 +7,8 @@ const testUtils_1 = require("../testUtils");
 (0, testUtils_1.silenceLogger)();
 const node_http_1 = __importDefault(require("node:http"));
 const node_events_1 = require("node:events");
-const HealthServer_1 = __importDefault(require("./HealthServer"));
-describe("HealthServer", () => {
+const ObservabilityServer_1 = __importDefault(require("./ObservabilityServer"));
+describe("ObservabilityServer", () => {
     const createFakeServer = () => {
         const emitter = new node_events_1.EventEmitter();
         const server = {
@@ -57,7 +57,7 @@ describe("HealthServer", () => {
             return fakeServer;
         });
         const requestTracker = { nrOfActiveRequests: jest.fn(() => 0) };
-        const hs = await HealthServer_1.default.create(requestTracker, { port: 0 });
+        const hs = await ObservabilityServer_1.default.create(requestTracker, { port: 0 });
         expect(fakeServer.listen).toHaveBeenCalled();
         // /live
         const resLive = createRes();

package/dist/{k8s → observability}/TerminationHandler.d.ts

@@ -1,12 +1,11 @@
-/// <reference types="node" />
 import ExpressRequestTracker from "./ExpressRequestTracker";
-import HealthServer from "./HealthServer";
+import ObservabilityServer from "./ObservabilityServer";
 import { Server } from "node:http";
 export default class TerminationHandler {
     private readonly server;
     private readonly hs;
     private readonly requestTracker;
     private readonly sockets;
-    constructor(server: Server, hs: HealthServer, requestTracker: ExpressRequestTracker);
+    constructor(server: Server, hs: ObservabilityServer, requestTracker: ExpressRequestTracker);
     shutdown(): void;
 }

package/dist/{k8s → observability}/TerminationHandler.test.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+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 };
 };

package/dist/observability/index.d.ts

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

package/dist/{k8s → observability}/index.js

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

package/dist/schema.d.ts

@@ -1,61 +1,19 @@
 import { z } from "zod";
-export declare const EmailAddressSchema: z.ZodEffects<z.ZodString, string, string>;
+export declare const EmailAddressSchema: z.ZodString;
 export declare const FormVersionFieldSchema: z.ZodObject<{
     uid: z.ZodString;
     properties: z.ZodObject<{
         data_name: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        data_name?: string | undefined;
-    }, {
-        data_name?: string | undefined;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    uid: string;
-    properties: {
-        data_name?: string | undefined;
-    };
-}, {
-    uid: string;
-    properties: {
-        data_name?: string | undefined;
-    };
-}>;
+    }, z.core.$strip>;
+}, z.core.$strip>;
 export declare const FormVersionSchema: z.ZodObject<{
     fields: z.ZodArray<z.ZodObject<{
         uid: z.ZodString;
         properties: z.ZodObject<{
             data_name: z.ZodOptional<z.ZodString>;
-        }, "strip", z.ZodTypeAny, {
-            data_name?: string | undefined;
-        }, {
-            data_name?: string | undefined;
-        }>;
-    }, "strip", z.ZodTypeAny, {
-        uid: string;
-        properties: {
-            data_name?: string | undefined;
-        };
-    }, {
-        uid: string;
-        properties: {
-            data_name?: string | undefined;
-        };
-    }>, "many">;
-}, "strip", z.ZodTypeAny, {
-    fields: {
-        uid: string;
-        properties: {
-            data_name?: string | undefined;
-        };
-    }[];
-}, {
-    fields: {
-        uid: string;
-        properties: {
-            data_name?: string | undefined;
-        };
-    }[];
-}>;
+        }, z.core.$strip>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
 export declare const SubmissionSchema: z.ZodObject<{
     id: z.ZodString;
     info: z.ZodObject<{
@@ -63,17 +21,7 @@ export declare const SubmissionSchema: z.ZodObject<{
         formName: z.ZodString;
         date: z.ZodNumber;
         userId: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        date: number;
-        customerId: number;
-        formName: string;
-        userId: string;
-    }, {
-        date: number;
-        customerId: number;
-        formName: string;
-        userId: string;
-    }>;
+    }, z.core.$strip>;
     meta: z.ZodObject<{
         registrationDate: z.ZodString;
         instructionId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
@@ -83,131 +31,23 @@ export declare const SubmissionSchema: z.ZodObject<{
         location: z.ZodNullable<z.ZodObject<{
             longitude: z.ZodString;
             latitude: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            longitude: string;
-            latitude: string;
-        }, {
-            longitude: string;
-            latitude: string;
-        }>>;
-    }, "strip", z.ZodTypeAny, {
-        registrationDate: string;
-        taskId: string | null;
-        serialNumber: number;
-        guid: string;
-        location: {
-            longitude: string;
-            latitude: string;
-        } | null;
-        instructionId?: string | null | undefined;
-    }, {
-        registrationDate: string;
-        taskId: string | null;
-        serialNumber: number;
-        guid: string;
-        location: {
-            longitude: string;
-            latitude: string;
-        } | null;
-        instructionId?: string | null | undefined;
-    }>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>;
     data: z.ZodRecord<z.ZodString, z.ZodAny>;
     mailStatuses: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodObject<{
         pdfFileId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-        emailAddresses: z.ZodArray<z.ZodEffects<z.ZodString, string, string>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        emailAddresses: string[];
-        pdfFileId?: string | null | undefined;
-    }, {
-        emailAddresses: string[];
-        pdfFileId?: string | null | undefined;
-    }>, "many">>>;
-}, "strip", z.ZodTypeAny, {
-    data: Record<string, any>;
-    id: string;
-    info: {
-        date: number;
-        customerId: number;
-        formName: string;
-        userId: string;
-    };
-    meta: {
-        registrationDate: string;
-        taskId: string | null;
-        serialNumber: number;
-        guid: string;
-        location: {
-            longitude: string;
-            latitude: string;
-        } | null;
-        instructionId?: string | null | undefined;
-    };
-    mailStatuses?: {
-        emailAddresses: string[];
-        pdfFileId?: string | null | undefined;
-    }[] | null | undefined;
-}, {
-    data: Record<string, any>;
-    id: string;
-    info: {
-        date: number;
-        customerId: number;
-        formName: string;
-        userId: string;
-    };
-    meta: {
-        registrationDate: string;
-        taskId: string | null;
-        serialNumber: number;
-        guid: string;
-        location: {
-            longitude: string;
-            latitude: string;
-        } | null;
-        instructionId?: string | null | undefined;
-    };
-    mailStatuses?: {
-        emailAddresses: string[];
-        pdfFileId?: string | null | undefined;
-    }[] | null | undefined;
-}>;
+        emailAddresses: z.ZodArray<z.ZodString>;
+    }, z.core.$strip>>>>;
+}, z.core.$strip>;
 export declare const BaseIntegrationRequestSchema: z.ZodObject<{
     view: z.ZodObject<{
         fields: z.ZodArray<z.ZodObject<{
             uid: z.ZodString;
             properties: z.ZodObject<{
                 data_name: z.ZodOptional<z.ZodString>;
-            }, "strip", z.ZodTypeAny, {
-                data_name?: string | undefined;
-            }, {
-                data_name?: string | undefined;
-            }>;
-        }, "strip", z.ZodTypeAny, {
-            uid: string;
-            properties: {
-                data_name?: string | undefined;
-            };
-        }, {
-            uid: string;
-            properties: {
-                data_name?: string | undefined;
-            };
-        }>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        fields: {
-            uid: string;
-            properties: {
-                data_name?: string | undefined;
-            };
-        }[];
-    }, {
-        fields: {
-            uid: string;
-            properties: {
-                data_name?: string | undefined;
-            };
-        }[];
-    }>;
+            }, z.core.$strip>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>;
     registration: z.ZodObject<{
         id: z.ZodString;
         info: z.ZodObject<{
@@ -215,17 +55,7 @@ export declare const BaseIntegrationRequestSchema: z.ZodObject<{
             formName: z.ZodString;
             date: z.ZodNumber;
             userId: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            date: number;
-            customerId: number;
-            formName: string;
-            userId: string;
-        }, {
-            date: number;
-            customerId: number;
-            formName: string;
-            userId: string;
-        }>;
+        }, z.core.$strip>;
         meta: z.ZodObject<{
             registrationDate: z.ZodString;
             instructionId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
@@ -235,179 +65,17 @@ export declare const BaseIntegrationRequestSchema: z.ZodObject<{
             location: z.ZodNullable<z.ZodObject<{
                 longitude: z.ZodString;
                 latitude: z.ZodString;
-            }, "strip", z.ZodTypeAny, {
-                longitude: string;
-                latitude: string;
-            }, {
-                longitude: string;
-                latitude: string;
-            }>>;
-        }, "strip", z.ZodTypeAny, {
-            registrationDate: string;
-            taskId: string | null;
-            serialNumber: number;
-            guid: string;
-            location: {
-                longitude: string;
-                latitude: string;
-            } | null;
-            instructionId?: string | null | undefined;
-        }, {
-            registrationDate: string;
-            taskId: string | null;
-            serialNumber: number;
-            guid: string;
-            location: {
-                longitude: string;
-                latitude: string;
-            } | null;
-            instructionId?: string | null | undefined;
-        }>;
+            }, z.core.$strip>>;
+        }, z.core.$strip>;
         data: z.ZodRecord<z.ZodString, z.ZodAny>;
         mailStatuses: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodObject<{
             pdfFileId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-            emailAddresses: z.ZodArray<z.ZodEffects<z.ZodString, string, string>, "many">;
-        }, "strip", z.ZodTypeAny, {
-            emailAddresses: string[];
-            pdfFileId?: string | null | undefined;
-        }, {
-            emailAddresses: string[];
-            pdfFileId?: string | null | undefined;
-        }>, "many">>>;
-    }, "strip", z.ZodTypeAny, {
-        data: Record<string, any>;
-        id: string;
-        info: {
-            date: number;
-            customerId: number;
-            formName: string;
-            userId: string;
-        };
-        meta: {
-            registrationDate: string;
-            taskId: string | null;
-            serialNumber: number;
-            guid: string;
-            location: {
-                longitude: string;
-                latitude: string;
-            } | null;
-            instructionId?: string | null | undefined;
-        };
-        mailStatuses?: {
-            emailAddresses: string[];
-            pdfFileId?: string | null | undefined;
-        }[] | null | undefined;
-    }, {
-        data: Record<string, any>;
-        id: string;
-        info: {
-            date: number;
-            customerId: number;
-            formName: string;
-            userId: string;
-        };
-        meta: {
-            registrationDate: string;
-            taskId: string | null;
-            serialNumber: number;
-            guid: string;
-            location: {
-                longitude: string;
-                latitude: string;
-            } | null;
-            instructionId?: string | null | undefined;
-        };
-        mailStatuses?: {
-            emailAddresses: string[];
-            pdfFileId?: string | null | undefined;
-        }[] | null | undefined;
-    }>;
+            emailAddresses: z.ZodArray<z.ZodString>;
+        }, z.core.$strip>>>>;
+    }, z.core.$strip>;
     seal: z.ZodString;
     origin: z.ZodString;
     settings: z.ZodObject<{
         dateFormat: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        dateFormat: string;
-    }, {
-        dateFormat: string;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    view: {
-        fields: {
-            uid: string;
-            properties: {
-                data_name?: string | undefined;
-            };
-        }[];
-    };
-    registration: {
-        data: Record<string, any>;
-        id: string;
-        info: {
-            date: number;
-            customerId: number;
-            formName: string;
-            userId: string;
-        };
-        meta: {
-            registrationDate: string;
-            taskId: string | null;
-            serialNumber: number;
-            guid: string;
-            location: {
-                longitude: string;
-                latitude: string;
-            } | null;
-            instructionId?: string | null | undefined;
-        };
-        mailStatuses?: {
-            emailAddresses: string[];
-            pdfFileId?: string | null | undefined;
-        }[] | null | undefined;
-    };
-    seal: string;
-    origin: string;
-    settings: {
-        dateFormat: string;
-    };
-}, {
-    view: {
-        fields: {
-            uid: string;
-            properties: {
-                data_name?: string | undefined;
-            };
-        }[];
-    };
-    registration: {
-        data: Record<string, any>;
-        id: string;
-        info: {
-            date: number;
-            customerId: number;
-            formName: string;
-            userId: string;
-        };
-        meta: {
-            registrationDate: string;
-            taskId: string | null;
-            serialNumber: number;
-            guid: string;
-            location: {
-                longitude: string;
-                latitude: string;
-            } | null;
-            instructionId?: string | null | undefined;
-        };
-        mailStatuses?: {
-            emailAddresses: string[];
-            pdfFileId?: string | null | undefined;
-        }[] | null | undefined;
-    };
-    seal: string;
-    origin: string;
-    settings: {
-        dateFormat: string;
-    };
-}>;
+    }, z.core.$strip>;
+}, z.core.$strip>;

package/dist/schema.js

@@ -37,7 +37,7 @@ exports.SubmissionSchema = zod_1.z.object({
         })
             .nullable(),
     }),
-    data: zod_1.z.record(zod_1.z.any()),
+    data: zod_1.z.record(zod_1.z.string(), zod_1.z.any()),
     mailStatuses: zod_1.z
         .array(zod_1.z.object({
         pdfFileId: zod_1.z.string().nullish(),

package/dist/testUtils.d.ts

@@ -1,2 +1 @@
-/// <reference types="jest" />
 export declare const silenceLogger: () => typeof jest;

package/dist/tracer.d.ts

@@ -2,7 +2,7 @@ import * as types from "@opentelemetry/instrumentation/build/src/types";
 export declare const tracer: (serviceName: string, { http, extraInstrumentations, debug, }: {
     http?: {
         portsToInstrument: number[];
-    } | undefined;
-    extraInstrumentations?: types.Instrumentation[] | undefined;
-    debug?: boolean | undefined;
+    };
+    extraInstrumentations?: types.Instrumentation[];
+    debug?: boolean;
 }) => void;

package/dist/tracer.js

@@ -31,25 +31,28 @@ const tracer = (serviceName, { http = {
         ],
     });
     const provider = new sdk_trace_node_1.NodeTracerProvider({
-        resource: new resources_1.Resource({
+        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"),
         }),
+        spanProcessors: [
+            ...((0, utils_1.environmentVariable)("STACKDRIVER_TRACING_ENABLED", false)
+                ? [
+                    new sdk_trace_base_1.BatchSpanProcessor(new opentelemetry_cloud_trace_exporter_1.TraceExporter({
+                        resourceFilter: /^service\./,
+                    })),
+                ]
+                : []),
+            ...(debug ? [new sdk_trace_base_1.BatchSpanProcessor(new sdk_trace_node_1.ConsoleSpanExporter())] : []),
+        ],
     });
     provider.register({
         propagator: new propagator_b3_1.B3Propagator({
             injectEncoding: propagator_b3_1.B3InjectEncoding.MULTI_HEADER,
         }),
     });
-    if ((0, utils_1.environmentVariable)("STACKDRIVER_TRACING_ENABLED", false)) {
-        const exporter = new opentelemetry_cloud_trace_exporter_1.TraceExporter({
-            resourceFilter: /^service\./,
-        });
-        provider.addSpanProcessor(new sdk_trace_base_1.BatchSpanProcessor(exporter));
-    }
     if (debug) {
         api_1.diag.setLogger(new api_1.DiagConsoleLogger(), api_1.DiagLogLevel.DEBUG);
-        provider.addSpanProcessor(new sdk_trace_base_1.BatchSpanProcessor(new sdk_trace_node_1.ConsoleSpanExporter()));
     }
 };
 exports.tracer = tracer;

package/dist/utils.js

@@ -15,15 +15,29 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+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.getDataForDataName = exports.parseDynamicRecipients = exports.isValidEmail = exports.currentTraceId = exports.environmentVariable = void 0;
+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) {
@@ -46,11 +60,9 @@ function environmentVariable(key, fallback) {
     }
     throw new Error(`Wrong type for environment variable '${key}'`);
 }
-exports.environmentVariable = environmentVariable;
 function currentTraceId() {
     return api_1.trace.getSpanContext(api_1.context.active())?.traceId;
 }
-exports.currentTraceId = currentTraceId;
 const emailAddressMaxLength = 254; // https://stackoverflow.com/a/574698
 const emailAddressLocalPattern = /^.+$/;
 const emailAddressDomainPattern = /^(?:[A-z0-9À-ž](?:[A-z0-9À-ž-]{0,61}[A-z0-9À-ž])?\.)+[A-z0-9À-ž][A-z0-9À-ž-]{0,61}[A-z0-9]$/;
@@ -73,7 +85,6 @@ function isValidEmail(email) {
         emailAddressLocalPattern.test(localAddr) &&
         emailAddressDomainPattern.test(domain));
 }
-exports.isValidEmail = isValidEmail;
 function parseDynamicRecipients(dynamicRecipients, fields, data) {
     const recipients = [];
     dynamicRecipients.forEach((fieldUid) => {
@@ -106,7 +117,6 @@ function parseDynamicRecipients(dynamicRecipients, fields, data) {
     });
     return recipients;
 }
-exports.parseDynamicRecipients = parseDynamicRecipients;
 function getDataNameForFieldUid(fields, fieldUid) {
     return fields.find((field) => field.uid === fieldUid)?.properties.data_name;
 }
@@ -125,7 +135,6 @@ function getDataForDataName(data, dataName) {
     }
     return data[dataName];
 }
-exports.getDataForDataName = getDataForDataName;
 function isObject(data) {
     return (0, lodash_1.isPlainObject)(data);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moreapp/common-nodejs",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "license": "UNLICENSED",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,49 +19,50 @@
     "dist/**/*"
   ],
   "dependencies": {
-    "@google-cloud/logging": "11.2.0",
-    "@google-cloud/opentelemetry-cloud-trace-exporter": "2.1.0",
-    "@opentelemetry/api": "1.8.0",
-    "@opentelemetry/core": "1.22.0",
-    "@opentelemetry/instrumentation": "0.49.1",
-    "@opentelemetry/instrumentation-dns": "0.34.0",
-    "@opentelemetry/instrumentation-express": "0.36.1",
-    "@opentelemetry/instrumentation-http": "0.49.1",
-    "@opentelemetry/instrumentation-winston": "0.35.0",
-    "@opentelemetry/resources": "1.22.0",
-    "@opentelemetry/sdk-node": "0.49.1",
-    "@opentelemetry/sdk-trace-base": "1.22.0",
-    "@opentelemetry/sdk-trace-node": "1.22.0",
-    "@opentelemetry/semantic-conventions": "1.22.0",
+    "@google-cloud/logging": "11.2.1",
+    "@google-cloud/opentelemetry-cloud-trace-exporter": "3.0.0",
+    "@opentelemetry/api": "1.9.0",
+    "@opentelemetry/core": "2.2.0",
+    "@opentelemetry/instrumentation": "0.208.0",
+    "@opentelemetry/instrumentation-dns": "0.52.0",
+    "@opentelemetry/instrumentation-express": "0.57.0",
+    "@opentelemetry/instrumentation-http": "0.208.0",
+    "@opentelemetry/instrumentation-winston": "0.53.0",
+    "@opentelemetry/resources": "2.2.0",
+    "@opentelemetry/sdk-node": "0.208.0",
+    "@opentelemetry/sdk-trace-base": "2.2.0",
+    "@opentelemetry/sdk-trace-node": "2.2.0",
+    "@opentelemetry/semantic-conventions": "1.38.0",
     "axios": "1.13.2",
     "content-disposition-parser": "1.0.2",
-    "date-and-time": "4.1.0",
+    "date-and-time": "4.1.2",
     "express": "5.2.1",
     "lodash": "4.17.21",
-    "winston": "3.13.0",
-    "zod": "3.25.76"
+    "prom-client": "15.1.3",
+    "winston": "3.18.3",
+    "zod": "4.1.13"
   },
   "devDependencies": {
     "@types/express": "5.0.6",
-    "@types/jest": "29.5.11",
-    "@types/lodash": "4.17.0",
-    "@types/node": "24.10.1",
-    "@typescript-eslint/eslint-plugin": "6.21.0",
-    "@typescript-eslint/parser": "6.21.0",
-    "eslint": "8.57.0",
+    "@types/jest": "30.0.0",
+    "@types/lodash": "4.17.21",
+    "@types/node": "24.10.4",
+    "@typescript-eslint/eslint-plugin": "8.49.0",
+    "@typescript-eslint/parser": "8.49.0",
+    "eslint": "8.57.1",
     "eslint-config-airbnb-typescript": "18.0.0",
-    "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-prettier": "5.1.3",
-    "husky": "9.0.7",
-    "jest": "29.7.0",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-plugin-import": "2.32.0",
+    "eslint-plugin-prettier": "5.5.4",
+    "husky": "9.1.7",
+    "jest": "30.2.0",
     "jest-mock-extended": "4.0.0",
-    "lint-staged": "16.2.6",
+    "lint-staged": "16.2.7",
     "nock": "14.0.10",
-    "prettier": "3.2.4",
-    "ts-jest": "29.1.2",
+    "prettier": "3.7.4",
+    "ts-jest": "29.4.6",
     "ts-node": "10.9.2",
-    "typescript": "5.4.3"
+    "typescript": "5.9.3"
   },
   "prettier": {
     "printWidth": 100,

package/dist/k8s/index.d.ts

@@ -1,4 +0,0 @@
-import ExpressRequestTracker from "./ExpressRequestTracker";
-import HealthServer from "./HealthServer";
-import TerminationHandler from "./TerminationHandler";
-export { ExpressRequestTracker, HealthServer, TerminationHandler };