@moreapp/common-nodejs 0.13.4 → 0.14.0

package/dist/MailService.d.ts

@@ -12,14 +12,16 @@ export interface Attachment {
 type MailSendResponse = {
     id: string;
 };
+type LanguageCode = "nl" | "en" | "es" | "de" | "pt" | "fr" | "ca";
 export declare class MailService {
     readonly service: string;
     readonly baseUrl: string;
     readonly username: string;
     readonly password: string;
     constructor(service: string, baseUrl: string, username: string, password: string);
-    sendTemplatedMail(emailAddress: string, template: string, language: string, customerId?: number, variables?: Record<string, unknown>): Promise<MailSendResponse | undefined>;
+    sendTemplatedMail(emailAddress: string, template: string, language: LanguageCode, customerId?: number, variables?: Record<string, unknown>): Promise<MailSendResponse | undefined>;
     sendRawMail(customerId: number, recipients: Recipient[], subject: string, body: string, attachments: Attachment[], fromName?: string, replyTo?: string, meta?: Record<string, unknown>): Promise<MailSendResponse | undefined>;
+    private toNotificationServiceLanguageCode;
     private sendMail;
 }
 export {};

package/dist/MailService.js

@@ -34,7 +34,7 @@ class MailService {
                 type: "template",
                 template,
                 variables: variables ?? {},
-                language,
+                language: this.toNotificationServiceLanguageCode(language),
                 attachments: [],
             },
         });
@@ -54,6 +54,24 @@ class MailService {
             meta,
         });
     }
+    toNotificationServiceLanguageCode(languageCode) {
+        switch (languageCode) {
+            case "nl":
+                return "nl-NL";
+            case "en":
+                return "en-GB";
+            case "es":
+                return "es-ES";
+            case "de":
+                return "de-DE";
+            case "pt":
+                return "pt-PT";
+            case "fr":
+                return "fr-FR";
+            case "ca":
+                return "ca";
+        }
+    }
     async sendMail(mailRequest) {
         if ((0, lodash_1.isEmpty)(mailRequest.recipients)) {
             logger_1.logger.info("No recipients, not sending mail");

package/dist/__tests__/MailService.test.js

@@ -110,7 +110,7 @@ const newService = () => new MailService_1.MailService("some-service-name", base
             content: {
                 type: "template",
                 template: "welcome",
-                language: "en",
+                language: "en-GB",
                 variables: { firstName: "Someone" },
                 attachments: [],
             },
@@ -134,7 +134,7 @@ const newService = () => new MailService_1.MailService("some-service-name", base
             content: {
                 type: "template",
                 template: "welcome",
-                language: "en",
+                language: "en-GB",
                 variables: {},
                 attachments: [],
             },

package/dist/observability/tracer.js

@@ -34,6 +34,9 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shutdown = exports.start = void 0;
+const node_module_1 = require("node:module");
+const node_url_1 = require("node:url");
+const node_worker_threads_1 = require("node:worker_threads");
 const api_1 = require("@opentelemetry/api");
 const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
 const instrumentation_1 = require("@opentelemetry/instrumentation");
@@ -49,12 +52,26 @@ const environmentVariable_1 = require("../utils/environmentVariable");
 const exporter_trace_otlp_grpc_1 = require("@opentelemetry/exporter-trace-otlp-grpc");
 const lodash_1 = require("lodash");
 let provider;
+let esmHookRegistered = false;
+/**
+ * OpenTelemetry instrumentations patch libraries through `require()`, which doesn't cover libraries loaded with
+ * `import` (e.g. `import express from "express"` in an ESM project). This loader hook makes sure those get patched too.
+ */
+const registerEsmHook = () => {
+    // With `--require`, Node also runs the preload in its loader hooks thread, where registering again is not needed
+    if (esmHookRegistered || !node_worker_threads_1.isMainThread) {
+        return;
+    }
+    (0, node_module_1.register)("@opentelemetry/instrumentation/hook.mjs", (0, node_url_1.pathToFileURL)(__filename));
+    esmHookRegistered = true;
+};
 const start = (serviceName, { http = {
     portsToInstrument: [3000],
 }, extraInstrumentations = [], debug = false, }) => {
     if (debug) {
         api_1.diag.setLogger(new api_1.DiagConsoleLogger(), api_1.DiagLogLevel.DEBUG);
     }
+    registerEsmHook();
     provider = new sdk_trace_node_1.NodeTracerProvider({
         resource: (0, resources_1.resourceFromAttributes)({
             [semantic_conventions_1.ATTR_SERVICE_NAME]: serviceName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moreapp/common-nodejs",
-  "version": "0.13.4",
+  "version": "0.14.0",
   "license": "UNLICENSED",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,45 +30,45 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "1.9.1",
-    "@opentelemetry/core": "2.10.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.221.0",
-    "@opentelemetry/instrumentation": "0.221.0",
-    "@opentelemetry/instrumentation-dns": "0.64.0",
-    "@opentelemetry/instrumentation-express": "0.69.0",
-    "@opentelemetry/instrumentation-http": "0.221.0",
-    "@opentelemetry/instrumentation-winston": "0.65.0",
-    "@opentelemetry/resources": "2.10.0",
-    "@opentelemetry/sdk-node": "0.221.0",
-    "@opentelemetry/sdk-trace-base": "2.10.0",
-    "@opentelemetry/sdk-trace-node": "2.10.0",
+    "@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/semantic-conventions": "1.43.0",
-    "axios": "1.19.0",
+    "axios": "1.20.0",
     "content-disposition-parser": "1.0.2",
-    "date-and-time": "4.5.1",
+    "date-and-time": "4.5.2",
     "express": "5.2.1",
     "lodash": "4.18.1",
     "prom-client": "15.1.3",
     "winston": "3.19.0",
-    "zod": "4.4.3"
+    "zod": "4.6.5"
   },
   "devDependencies": {
     "@types/express": "5.0.6",
     "@types/lodash": "4.17.25",
-    "@types/node": "24.13.3",
-    "@typescript-eslint/eslint-plugin": "8.67.0",
-    "@typescript-eslint/parser": "8.67.0",
+    "@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",
     "eslint": "9.39.5",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-prettier": "5.5.6",
     "husky": "9.1.7",
-    "lint-staged": "17.3.0",
+    "lint-staged": "17.5.1",
     "nock": "14.0.17",
     "prettier": "3.9.6",
     "ts-node": "10.9.2",
     "typescript": "6.0.3",
-    "typescript-eslint": "8.67.0",
+    "typescript-eslint": "8.70.0",
     "vitest": "4.1.11",
     "vitest-mock-extended": "5.1.1"
   },