@moreapp/common-nodejs 0.12.2 → 0.12.4

package/dist/__tests__/MoreAppClient.test.js

@@ -0,0 +1,85 @@
+"use strict";
+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 nock_1 = __importDefault(require("nock"));
+const MoreAppClient_1 = __importDefault(require("../MoreAppClient"));
+(0, vitest_1.describe)("MoreAppClient", () => {
+    (0, vitest_1.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");
+        (0, vitest_1.expect)(binaryFile.buffer).toStrictEqual(file);
+        (0, vitest_1.expect)(binaryFile.contentType).toBe("image/jpg");
+        (0, vitest_1.expect)(binaryFile.filename).toBe("my photo.jpg");
+        apiMock.done();
+    });
+    (0, vitest_1.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 (0, vitest_1.expect)(client.getBinary("/download")).rejects.toMatchObject({
+            message: "Request failed with status code 404",
+            name: "AxiosError",
+            status: 404,
+        });
+        apiMock.done();
+    });
+    (0, vitest_1.test)("unable to connect", async () => {
+        const client = new MoreAppClient_1.default({
+            serviceName: "Common Test",
+            prefix: "https://non-existing.moreapp.com",
+            seal: "my-seal",
+        });
+        await (0, vitest_1.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",
+    });
+    (0, vitest_1.test)("Handle non existing file", async () => {
+        const apiMock = (0, nock_1.default)("https://api.moreapp.com").get("/download").reply(404);
+        await (0, vitest_1.expect)(client.getBinary("/download")).rejects.toThrow("Request failed with status code 404");
+        apiMock.done();
+    });
+    (0, vitest_1.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");
+        (0, vitest_1.expect)(binaryFile).not.toBeNull();
+        (0, vitest_1.expect)(binaryFile.contentType).toBe("unknown");
+        apiMock.done();
+    });
+    (0, vitest_1.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");
+        (0, vitest_1.expect)(binaryFile).not.toBeNull();
+        (0, vitest_1.expect)(binaryFile.filename).toBeUndefined();
+        apiMock.done();
+    });
+    (0, vitest_1.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");
+        (0, vitest_1.expect)(binaryFile).not.toBeNull();
+        (0, vitest_1.expect)(binaryFile.filename).toBeUndefined();
+        apiMock.done();
+    });
+});

package/dist/__tests__/dateUtil.test.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const dateUtil_1 = require("../dateUtil");
+(0, vitest_1.describe)("isDate", () => {
+    (0, vitest_1.test)("should handle valid dates", () => {
+        (0, vitest_1.expect)((0, dateUtil_1.isDate)("2020-01-01")).toBe(true);
+        (0, vitest_1.expect)((0, dateUtil_1.isDate)("2020-1-1")).toBe(true);
+        (0, vitest_1.expect)((0, dateUtil_1.isDate)("0000-1-1")).toBe(true);
+    });
+    (0, vitest_1.test)("should handle invalid dates", () => {
+        (0, vitest_1.expect)((0, dateUtil_1.isDate)("not-a-date")).toBe(false);
+        (0, vitest_1.expect)((0, dateUtil_1.isDate)("3039-20-01")).toBe(false);
+    });
+});
+(0, vitest_1.describe)("isDateTime", () => {
+    (0, vitest_1.test)("should handle valid date times", () => {
+        (0, vitest_1.expect)((0, dateUtil_1.isDateTime)("2020-01-01 12:00")).toBe(true);
+        (0, vitest_1.expect)((0, dateUtil_1.isDateTime)("2020-01-01 0:00")).toBe(true);
+    });
+    (0, vitest_1.test)("should handle invalid date times", () => {
+        (0, vitest_1.expect)((0, dateUtil_1.isDateTime)("2020-01-01 0:99")).toBe(false);
+        (0, vitest_1.expect)((0, dateUtil_1.isDateTime)("2020-01-01 25:12")).toBe(false);
+    });
+});
+(0, vitest_1.describe)("formatDate", () => {
+    (0, vitest_1.test)("should format to given input", () => {
+        (0, vitest_1.expect)((0, dateUtil_1.formatDate)("2022-02-18", "DDMMYYYY")).toBe("18-02-2022");
+        (0, vitest_1.expect)((0, dateUtil_1.formatDate)("2022-02-18", "MMDDYYYY")).toBe("02-18-2022");
+        (0, vitest_1.expect)((0, dateUtil_1.formatDate)("2022-02-18", "YYYYMMDD")).toBe("2022-02-18");
+        (0, vitest_1.expect)((0, dateUtil_1.formatDate)("2022-02-18", "invalid")).toBe("18-02-2022");
+    });
+});
+(0, vitest_1.describe)("formatDateTime", () => {
+    (0, vitest_1.test)("should format to given input", () => {
+        (0, vitest_1.expect)((0, dateUtil_1.formatDateTime)(1645191420000, "DDMMYYYY")).toBe("18-02-2022 13:37");
+        (0, vitest_1.expect)((0, dateUtil_1.formatDateTime)("2022-02-18 13:37", "DDMMYYYY")).toBe("18-02-2022 13:37");
+        (0, vitest_1.expect)((0, dateUtil_1.formatDateTime)("2022-02-18 13:37", "MMDDYYYY")).toBe("02-18-2022 13:37");
+        (0, vitest_1.expect)((0, dateUtil_1.formatDateTime)("2022-02-18 13:37", "YYYYMMDD")).toBe("2022-02-18 13:37");
+        (0, vitest_1.expect)((0, dateUtil_1.formatDateTime)("2022-02-18 13:37", "invalid")).toBe("18-02-2022 13:37");
+    });
+});

package/dist/{logger.test.js → __tests__/logger.test.js}

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("./logger");
-describe("errorFormat", () => {
-    test("should format standard errors", () => {
+const vitest_1 = require("vitest");
+const logger_1 = require("../logger");
+(0, vitest_1.describe)("errorFormat", () => {
+    (0, vitest_1.test)("should format standard errors", () => {
         const error = new Error("Failed to persist");
         const formatted = logger_1.formatters
             .errorFormat()
             .transform({ level: "error", message: "Something went wrong", exception: error });
-        expect(formatted).toStrictEqual({
+        (0, vitest_1.expect)(formatted).toStrictEqual({
             level: "error",
             message: "Something went wrong",
             exception: {
@@ -16,7 +17,7 @@ describe("errorFormat", () => {
             },
         });
     });
-    test("should format error with (deeply nested) cause", () => {
+    (0, vitest_1.test)("should format error with (deeply nested) cause", () => {
         const error = new Error("Failed to persist", {
             cause: new Error("Caused by me!", { cause: "Well actually..." }),
         });
@@ -25,7 +26,7 @@ describe("errorFormat", () => {
             message: "Something went wrong",
             exception: error,
         });
-        expect(formatted).toStrictEqual({
+        (0, vitest_1.expect)(formatted).toStrictEqual({
             level: "error",
             message: "Something went wrong",
             exception: {
@@ -40,20 +41,32 @@ describe("errorFormat", () => {
         });
     });
 });
-describe("tracingFormat", () => {
-    test("should transform tracing data to Stackdriver format", () => {
+(0, vitest_1.describe)("tracingFormat", () => {
+    (0, vitest_1.test)("should transform tracing data to Stackdriver format", () => {
         const formatted = logger_1.formatters.stackdriverTracingFormat().transform({
             level: "error",
             message: "Something went wrong",
             trace_id: "TRACE_ID",
             span_id: "SPAN_ID",
         });
-        expect(formatted).toStrictEqual({
+        (0, vitest_1.expect)(formatted).toStrictEqual({
             level: "error",
             message: "Something went wrong",
             "logging.googleapis.com/trace": "TRACE_ID",
             "logging.googleapis.com/spanId": "SPAN_ID",
-            "logging.googleapis.com/trace_sampled": true,
+            "logging.googleapis.com/trace_sampled": false,
         });
     });
+    (0, vitest_1.test)("should correctly resolve sampling", () => {
+        const formatted = logger_1.formatters.stackdriverTracingFormat().transform({
+            level: "info",
+            message: "Some good news",
+            trace_id: "TRACE_ID",
+            span_id: "SPAN_ID",
+            trace_flags: "01",
+        });
+        (0, vitest_1.expect)(formatted).toStrictEqual(vitest_1.expect.objectContaining({
+            "logging.googleapis.com/trace_sampled": true,
+        }));
+    });
 });

package/dist/__tests__/utils.test.js

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const utils_1 = require("../utils");
+(0, vitest_1.describe)("environmentVariable", () => {
+    (0, vitest_1.test)("Should throw when environment variable does not exist", () => {
+        (0, vitest_1.expect)(() => (0, utils_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, utils_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, utils_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, utils_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, utils_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, utils_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, utils_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, utils_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, utils_1.environmentVariable)("COMMONS_NODEJS_TEST_EXISTING", false)).toThrow("Wrong type for environment variable 'COMMONS_NODEJS_TEST_EXISTING'");
+    });
+});
+(0, vitest_1.describe)("isValidEmail", () => {
+    (0, vitest_1.describe)("Valid email addresses", () => {
+        (0, vitest_1.test)("Standard email address", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a@moreapp.dev")).toBeTruthy());
+        (0, vitest_1.test)("Non-alphanumeric characters", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a+-._&%'@moreapp.dev")).toBeTruthy());
+        (0, vitest_1.test)("Shortest email address", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a@b.co")).toBeTruthy());
+        (0, vitest_1.test)("Subdomain", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a@sub.domain.dev")).toBeTruthy());
+        (0, vitest_1.test)("Subdomain with a dash", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a@sub.dom-ain.dev")).toBeTruthy());
+        (0, vitest_1.test)("Long TLD", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a@b.business")).toBeTruthy());
+        (0, vitest_1.test)("Diacritics", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("ẞçäöü@möręæppß.dev")).toBeTruthy());
+        (0, vitest_1.test)("Casing", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("TØmÂs@mŒREÄPp.cOm")).toBeTruthy());
+    });
+    (0, vitest_1.describe)("Invalid email addresses", () => {
+        (0, vitest_1.test)("Missing '@' character and domain", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("john")).toBeFalsy());
+        (0, vitest_1.test)("Multiple '@' characters", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a@b@moreapp.dev")).toBeFalsy());
+        (0, vitest_1.test)("Ends with a '@' character", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a@moreapp.dev@")).toBeFalsy());
+        (0, vitest_1.test)("Empty", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("")).toBeFalsy());
+        (0, vitest_1.test)("Whitespace before/after", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)(" a@moreapp.dev ")).toBeFalsy());
+        (0, vitest_1.test)("Newlines, tabs, ..., before/after", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("\n \ta@moreapp.dev\n ")).toBeFalsy());
+        (0, vitest_1.test)("Missing '@' character", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("ab.com")).toBeFalsy());
+        (0, vitest_1.test)("Double dot in domain", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a@moreapp..com")).toBeFalsy());
+        (0, vitest_1.test)("Too short TLD", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a@b.c")).toBeFalsy());
+        (0, vitest_1.test)("Missing local part", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("@moreapp.dev")).toBeFalsy());
+        (0, vitest_1.test)("Too long", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("abcdefghijklmnopqrstuvwxyz-abcdefghijklmnopqrstuvwxyz-abcdefghijklmnopqrstuvwxyz-abcdefghijklmnopqrstuvwxyz-abcdefghijklmnopqrstuvwxyz-abcdefghijklmnopqrstuvwxyz-abcdefghijklmnopqrstuvwxyz-abcdefghijklmnopqrstuvwxyz-abcdefghijklmnopqrstuvwxyz-@moreapp.dev")).toBeFalsy());
+        (0, vitest_1.test)("Starts with '.'", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)(".a@moreapp.dev")).toBeFalsy());
+        (0, vitest_1.test)("Ends with a '.'", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a.@moreapp.dev")).toBeFalsy());
+        (0, vitest_1.test)("Local part contains whitespace", () => (0, vitest_1.expect)((0, utils_1.isValidEmail)("a b@moreapp.dev")).toBeFalsy());
+    });
+});
+(0, vitest_1.describe)("parseDynamicRecipients", () => {
+    (0, vitest_1.test)("should parse all type of data (root, object, array)", () => {
+        const fields = [
+            { uid: "UID-root", properties: { data_name: "customer" } },
+            { uid: "UID-object", properties: { data_name: "vendor" } },
+            { uid: "UID-array", properties: { data_name: "contacts" } },
+        ];
+        (0, vitest_1.expect)((0, utils_1.parseDynamicRecipients)(["UID-root", "UID-object.email", "UID-array"], fields, {
+            customer: "customer@example.com",
+            vendor: { id: 1, email: "vendor@example.com" },
+            contacts: ["contact1@example.com", "contact2@example.com"],
+        })).toEqual([
+            "customer@example.com",
+            "vendor@example.com",
+            "contact1@example.com",
+            "contact2@example.com",
+        ]);
+    });
+    (0, vitest_1.test)("should skip invalid emails", () => {
+        const fields = [
+            { uid: "UID-root", properties: { data_name: "customer" } },
+            { uid: "UID-object", properties: { data_name: "vendor" } },
+            { uid: "UID-array", properties: { data_name: "contacts" } },
+        ];
+        (0, vitest_1.expect)((0, utils_1.parseDynamicRecipients)(["UID-root", "UID-object.email", "UID-array"], fields, {
+            customer: "invalid1",
+            vendor: { id: 1, email: "invalid2" },
+            contacts: ["invalid3", "invalid4"],
+        })).toEqual([]);
+    });
+});
+(0, vitest_1.describe)("getDataForDataName", () => {
+    (0, vitest_1.test)("should return (nested) values in objects based on dataName", () => {
+        const data = {
+            name: "John",
+            age: 10,
+            address: {
+                street: "Main Street",
+                city: "New York",
+                location: {
+                    longitude: 10,
+                    latitude: 10,
+                },
+            },
+            "flat.test": "hi",
+        };
+        (0, vitest_1.expect)((0, utils_1.getDataForDataName)(data, "name")).toBe("John");
+        (0, vitest_1.expect)((0, utils_1.getDataForDataName)(data, "age")).toBe(10);
+        (0, vitest_1.expect)((0, utils_1.getDataForDataName)(data, "address.city")).toBe("New York");
+        (0, vitest_1.expect)((0, utils_1.getDataForDataName)(data, "address.location.longitude")).toBe(10);
+        (0, vitest_1.expect)((0, utils_1.getDataForDataName)(data, "flat.test")).toBe("hi");
+        (0, vitest_1.expect)((0, utils_1.getDataForDataName)(data, "unknown")).toBe(undefined);
+        (0, vitest_1.expect)((0, utils_1.getDataForDataName)(data, "unknown.nested")).toBe(undefined);
+        (0, vitest_1.expect)((0, utils_1.getDataForDataName)(data, "address.unknown")).toBe(undefined);
+        (0, vitest_1.expect)((0, utils_1.getDataForDataName)(data, "flat..")).toBe(undefined);
+        (0, vitest_1.expect)((0, utils_1.getDataForDataName)(data, ".")).toBe(undefined);
+    });
+});

package/dist/dateUtil.js

@@ -1,13 +1,43 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+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.isDate = isDate;
 exports.isDateTime = isDateTime;
 exports.formatDate = formatDate;
 exports.formatDateTime = formatDateTime;
-const date_and_time_1 = __importDefault(require("date-and-time"));
+const dateAndTime = __importStar(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) {
@@ -17,14 +47,14 @@ function isDateTime(string) {
     return DATE_TIME_REGEX.test(string) && !isNaN(Date.parse(string));
 }
 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));
+    const date = dateAndTime.parse(dateString, "YYYY-MM-DD");
+    return dateAndTime.format(date, formatDateFormat(format));
 }
 function formatDateTime(dateTime, format) {
     const date = typeof dateTime === "string"
-        ? date_and_time_1.default.parse(dateTime, "YYYY-MM-DD HH:mm", { timeZone: "UTC" })
+        ? dateAndTime.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" });
+    return dateAndTime.format(date, formatDateFormat(format) + " HH:mm", { timeZone: "UTC" });
 }
 function formatDateFormat(format) {
     switch (format) {

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 import MoreAppClient from "./MoreAppClient";
 export * from "./types";
 export * from "./schema";
-export * from "./tracer";
 export * from "./logger";
 export * from "./dateUtil";
 export * from "./utils";
 export * from "./observability";
+export * from "./observability/tracer";
 export { BinaryFile } from "./MoreAppClient";
 export { MoreAppClient };

package/dist/index.js

@@ -22,8 +22,8 @@ const MoreAppClient_1 = __importDefault(require("./MoreAppClient"));
 exports.MoreAppClient = MoreAppClient_1.default;
 __exportStar(require("./types"), exports);
 __exportStar(require("./schema"), exports);
-__exportStar(require("./tracer"), exports);
 __exportStar(require("./logger"), exports);
 __exportStar(require("./dateUtil"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./observability"), exports);
+__exportStar(require("./observability/tracer"), exports);

package/dist/logger.js

@@ -6,9 +6,10 @@ const stackdriverTracingFormat = (0, winston_1.format)((info) => {
     if (info["trace_id"] && info["span_id"]) {
         info["logging.googleapis.com/trace"] = info["trace_id"];
         info["logging.googleapis.com/spanId"] = info["span_id"];
-        info["logging.googleapis.com/trace_sampled"] = true;
+        info["logging.googleapis.com/trace_sampled"] = info["trace_flags"] === "01";
         delete info["trace_id"];
         delete info["span_id"];
+        delete info["trace_flags"];
     }
     return info;
 });

package/dist/observability/TerminationHandler.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_timers_1 = require("node:timers");
 const logger_1 = require("../logger");
+const tracer_1 = __importDefault(require("./tracer"));
 const TERMINATION_SIGNALS = ["SIGTERM", "SIGHUP", "SIGINT"];
 const SHUTDOWN_TIMEOUT = 30_000;
 class TerminationHandler {
@@ -34,7 +38,7 @@ class TerminationHandler {
                 (0, node_timers_1.clearInterval)(interval);
                 // Destroy any remaining sockets
                 this.sockets.forEach((socket) => socket.destroy());
-                void this.hs.stop().finally(() => {
+                void Promise.all([this.hs.stop(), tracer_1.default.shutdown()]).finally(() => {
                     logger_1.logger.info("Server stopped");
                     process.exit(0);
                 });

package/dist/observability/{ExpressRequestTracker.test.js → __tests__/ExpressRequestTracker.test.js}

@@ -3,8 +3,9 @@ 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 ExpressRequestTracker_1 = __importDefault(require("./ExpressRequestTracker"));
+const ExpressRequestTracker_1 = __importDefault(require("../ExpressRequestTracker"));
 // Create a minimal Response mock that can emit the 'finish' event
 const createMockResponse = () => {
     const emitter = new node_events_1.EventEmitter();
@@ -12,42 +13,42 @@ const createMockResponse = () => {
         emitFinish: () => emitter.emit("finish"),
     });
 };
-describe("ExpressRequestTracker", () => {
-    test("increments active requests on middleware entry and calls next", () => {
+(0, vitest_1.describe)("ExpressRequestTracker", () => {
+    (0, vitest_1.test)("increments active requests on middleware entry and calls next", () => {
         const tracker = new ExpressRequestTracker_1.default();
         const middleware = tracker.track();
         const res = createMockResponse();
-        const next = jest.fn();
-        expect(tracker.nrOfActiveRequests()).toBe(0);
+        const next = vitest_1.vi.fn();
+        (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(0);
         middleware({}, res, next);
-        expect(tracker.nrOfActiveRequests()).toBe(1);
-        expect(next).toHaveBeenCalledTimes(1);
+        (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(1);
+        (0, vitest_1.expect)(next).toHaveBeenCalledTimes(1);
         // Finish should decrement
         res.emitFinish();
-        expect(tracker.nrOfActiveRequests()).toBe(0);
+        (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(0);
     });
-    test("decrements active requests when response finishes", () => {
+    (0, vitest_1.test)("decrements active requests when response finishes", () => {
         const tracker = new ExpressRequestTracker_1.default();
         const middleware = tracker.track();
         const res = createMockResponse();
         middleware({}, res, (() => { }));
-        expect(tracker.nrOfActiveRequests()).toBe(1);
+        (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(1);
         res.emitFinish();
-        expect(tracker.nrOfActiveRequests()).toBe(0);
+        (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(0);
     });
-    test("tracks multiple concurrent requests and decrements in order", () => {
+    (0, vitest_1.test)("tracks multiple concurrent requests and decrements in order", () => {
         const tracker = new ExpressRequestTracker_1.default();
         const middleware = tracker.track();
         const res1 = createMockResponse();
         const res2 = createMockResponse();
         middleware({}, res1, (() => { }));
         middleware({}, res2, (() => { }));
-        expect(tracker.nrOfActiveRequests()).toBe(2);
+        (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(2);
         // Finish the first request
         res1.emitFinish();
-        expect(tracker.nrOfActiveRequests()).toBe(1);
+        (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(1);
         // Finish the second request
         res2.emitFinish();
-        expect(tracker.nrOfActiveRequests()).toBe(0);
+        (0, vitest_1.expect)(tracker.nrOfActiveRequests()).toBe(0);
     });
 });

package/dist/observability/{ObservabilityServer.test.js → __tests__/ObservabilityServer.test.js}

@@ -3,27 +3,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const testUtils_1 = require("../testUtils");
-(0, testUtils_1.silenceLogger)();
+const vitest_1 = require("vitest");
 const node_http_1 = __importDefault(require("node:http"));
 const node_events_1 = require("node:events");
-const ObservabilityServer_1 = __importDefault(require("./ObservabilityServer"));
-describe("ObservabilityServer", () => {
+const ObservabilityServer_1 = __importDefault(require("../ObservabilityServer"));
+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(),
+    },
+}));
+(0, vitest_1.describe)("ObservabilityServer", () => {
     const createFakeServer = () => {
         const emitter = new node_events_1.EventEmitter();
         const server = {
-            listen: jest.fn((...args) => {
+            listen: vitest_1.vi.fn((...args) => {
                 const cb = args.find((a) => typeof a === "function");
                 if (cb)
                     cb();
                 return server;
             }),
-            close: jest.fn((cb) => {
+            close: vitest_1.vi.fn((cb) => {
                 if (cb)
                     cb();
                 return server;
             }),
-            on: jest.fn((event, listener) => {
+            on: vitest_1.vi.fn((event, listener) => {
                 emitter.on(event, listener);
                 return server;
             }),
@@ -32,7 +39,7 @@ describe("ObservabilityServer", () => {
         return server;
     };
     const createRes = () => {
-        const res = {
+        return {
             statusCode: 200,
             headers: {},
             writeHead: function (code, headers) {
@@ -43,13 +50,12 @@ describe("ObservabilityServer", () => {
                 this.body = body;
             },
         };
-        return res;
     };
-    test("handles /live and /ready endpoints and start/stop lifecycle", async () => {
+    (0, vitest_1.test)("handles /live and /ready endpoints and start/stop lifecycle", async () => {
         const fakeServer = createFakeServer();
         // Capture handler passed to createServer
         let capturedHandler;
-        const createServerSpy = jest
+        const createServerSpy = vitest_1.vi
             .spyOn(node_http_1.default, "createServer")
             // @ts-expect-error simplify handler typing for test
             .mockImplementation((handler) => {
@@ -57,40 +63,41 @@ describe("ObservabilityServer", () => {
             return fakeServer;
         });
         const requestTracker = {
-            nrOfActiveRequests: jest.fn(() => 0),
+            nrOfActiveRequests: vitest_1.vi.fn(() => 0),
         };
         const hs = await ObservabilityServer_1.default.create(requestTracker, { port: 0 });
-        expect(fakeServer.listen).toHaveBeenCalled();
+        (0, vitest_1.expect)(fakeServer.listen).toHaveBeenCalled();
         // /live
         const resLive = createRes();
         capturedHandler({ url: "/live" }, resLive);
-        expect(resLive.statusCode).toBe(200);
-        expect(resLive.headers).toEqual({ "Content-Type": "application/json" });
-        expect(JSON.parse(resLive.body)).toEqual({ status: "ok" });
+        (0, vitest_1.expect)(resLive.statusCode).toBe(200);
+        (0, vitest_1.expect)(resLive.headers).toEqual({ "Content-Type": "application/json" });
+        (0, vitest_1.expect)(JSON.parse(resLive.body)).toEqual({ status: "ok" });
         // /ready when not ready
         const resReady1 = createRes();
         capturedHandler({ url: "/ready" }, resReady1);
-        expect(resReady1.statusCode).toBe(503);
-        expect(JSON.parse(resReady1.body)).toEqual({
+        (0, vitest_1.expect)(resReady1.statusCode).toBe(503);
+        (0, vitest_1.expect)(JSON.parse(resReady1.body)).toEqual({
             status: "not ready",
             activeRequests: 0,
         });
         // Now mark ready and simulate active requests
-        requestTracker.nrOfActiveRequests.mockReturnValue(3);
+        // eslint-disable-next-line @typescript-eslint/unbound-method
+        vitest_1.vi.mocked(requestTracker.nrOfActiveRequests).mockReturnValue(3);
         hs.setReady(true);
         const resReady2 = createRes();
         capturedHandler({ url: "/ready" }, resReady2);
-        expect(resReady2.statusCode).toBe(200);
-        expect(JSON.parse(resReady2.body)).toEqual({
+        (0, vitest_1.expect)(resReady2.statusCode).toBe(200);
+        (0, vitest_1.expect)(JSON.parse(resReady2.body)).toEqual({
             status: "ok",
             activeRequests: 3,
         });
         // unknown route
         const res404 = createRes();
         capturedHandler({ url: "/unknown" }, res404);
-        expect(res404.statusCode).toBe(404);
+        (0, vitest_1.expect)(res404.statusCode).toBe(404);
         await hs.stop();
-        expect(fakeServer.close).toHaveBeenCalled();
+        (0, vitest_1.expect)(fakeServer.close).toHaveBeenCalled();
         createServerSpy.mockRestore();
     });
 });