@digitraffic/common 2025.4.9-1 → 2025.4.29-1

package/dist/__test__/runtime/dt-logger.test.js

@@ -55,14 +55,20 @@ describe("dt-logger", () => {
         }
         expect(loggedLine).toMatchObject(expected);
     }
-    test("custom values", () => {
+    test("custom date, number, text and '=' values", () => {
         const date = new Date();
         assertLog({}, {
             ...LOG_LINE,
             customDate: date,
+            customNumber: 123,
+            customText: "abc",
+            customEqualsText: "foo=bar",
         }, {
-            ...EXPECTED_LOG_LINE,
+            method: EXPECTED_LOG_LINE.method,
+            message: `${EXPECTED_LOG_LINE.message} date=${date.toISOString()} number=123 text=abc equalsText=\"foo=bar\"`,
             date: date.toISOString(),
+            number: 123,
+            text: "abc",
         });
     });
     test("custom count should be a number", () => {
@@ -70,7 +76,8 @@ describe("dt-logger", () => {
             ...LOG_LINE,
             customFooCount: 123,
         }, {
-            ...EXPECTED_LOG_LINE,
+            method: EXPECTED_LOG_LINE.method,
+            message: `${EXPECTED_LOG_LINE.message} fooCount=123`,
             fooCount: 123,
         });
     });

package/dist/__test__/utils/base64.test.d.ts

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

package/dist/__test__/utils/base64.test.js

@@ -0,0 +1,27 @@
+import { decodeBase64ToAscii, decodeBase64ToUtf8, encodeAsciiToBase64, encodeUtf8ToBase64, } from "../../utils/base64.js";
+describe("Base64UtilTest", () => {
+    const EXPECTED_ASCII = "0a9f4967-faaa-445a-ba11-078f7f9556b4";
+    const EXPECTED_ASCII_BASE64 = "MGE5ZjQ5NjctZmFhYS00NDVhLWJhMTEtMDc4ZjdmOTU1NmI0";
+    const EXPECTED_UTF8 = '욤頶ɠ_񝝉T񶅶𞜫7郣Ҧ㒢,"鏤ځ峡蟅͆뼐񭫟ؐԓ外󦸴ԉȺꥅ_񟵭';
+    const EXPECTED_UTF8_BASE64 = "7Jqk6aC2yaBf8Z2diVTxtoW28J6cqzfug6Ppg6PSpuOSou6Usywi6Y+k2oHls6Hon4XNhuu8kPGtq5/YkNST5aSW86a4tNSJyLrqpYVf8Z+1rQ==";
+    test("encode and decode ascii", () => {
+        const encodedAscii = encodeAsciiToBase64(EXPECTED_ASCII);
+        const decodedAscii = decodeBase64ToAscii(EXPECTED_ASCII_BASE64);
+        // encoding/decoding ascii with utf8 should be the same as ascii
+        const encodedUtf8 = encodeUtf8ToBase64(EXPECTED_ASCII);
+        const decodedUtf8 = decodeBase64ToUtf8(EXPECTED_ASCII_BASE64);
+        expect(encodedAscii).toEqual(EXPECTED_ASCII_BASE64);
+        expect(decodedAscii).toEqual(EXPECTED_ASCII);
+        expect(encodedUtf8).toEqual(EXPECTED_ASCII_BASE64);
+        expect(decodedUtf8).toEqual(EXPECTED_ASCII);
+        expect(encodedUtf8).toEqual(encodedAscii);
+        expect(decodedUtf8).toEqual(decodedAscii);
+    });
+    test("encode and decode utf8", () => {
+        const encodedUtf8 = encodeUtf8ToBase64(EXPECTED_UTF8);
+        const decodedUtf8 = decodeBase64ToUtf8(EXPECTED_UTF8_BASE64);
+        expect(encodedUtf8).toEqual(EXPECTED_UTF8_BASE64);
+        expect(decodedUtf8).toEqual(EXPECTED_UTF8);
+    });
+});
+//# sourceMappingURL=base64.test.js.map

package/dist/__test__/utils/logging.test.js

@@ -2,7 +2,7 @@ import { Writable } from "stream";
 import { DtLogger } from "../../aws/runtime/dt-logger.js";
 import { logException } from "../../utils/logging.js";
 const TEST_METHODNAME = "test.logException";
-describe("dt-logger", () => {
+describe("logging-test", () => {
     function assertLogError(error, expected, includeStack = false) {
         assertWrite((logger) => {
             logException(logger, error, includeStack);
@@ -40,7 +40,7 @@ describe("dt-logger", () => {
         assertLogError(STRING_ERROR, {
             type: "Error",
             method: TEST_METHODNAME,
-            message: `${TEST_METHODNAME} ${STRING_ERROR}`,
+            message: `${TEST_METHODNAME} error=${STRING_ERROR} type=Error`,
             level: "ERROR",
         });
     });
@@ -49,7 +49,7 @@ describe("dt-logger", () => {
         assertLogError(ERROR, {
             type: "Error",
             method: TEST_METHODNAME,
-            message: `${TEST_METHODNAME} ${ERROR.message}`,
+            message: `${TEST_METHODNAME} error=${ERROR.message} type=Error`,
             level: "ERROR",
         });
     });
@@ -58,7 +58,7 @@ describe("dt-logger", () => {
         assertLogError(ERROR, {
             type: "Error",
             method: TEST_METHODNAME,
-            message: `${TEST_METHODNAME} ${ERROR.message}`,
+            message: `${TEST_METHODNAME} error=${ERROR.message} type=Error`,
             level: "ERROR",
             stack: true,
         }, true);
@@ -69,7 +69,7 @@ describe("dt-logger", () => {
         assertAxiosError(ERROR, {
             type: "Error",
             method: TEST_METHODNAME,
-            message: `${TEST_METHODNAME} ${ERROR.message}`,
+            message: `${TEST_METHODNAME} error=${ERROR.message} type=Error code=12`,
             level: "ERROR",
             code: ERROR.code,
         });

package/dist/aws/runtime/dt-logger.d.ts

@@ -113,4 +113,5 @@ export declare class DtLogger {
      * @see {@link LoggableType}
      */
     private log;
+    private appendMessageFieldsToMessage;
 }

package/dist/aws/runtime/dt-logger.js

@@ -102,8 +102,10 @@ export class DtLogger {
             : message.error
                 ? (message.error instanceof Error) ? message.error.stack : undefined
                 : undefined;
+        const messageFields = removePrefix("custom", message);
+        messageFields.message = this.appendMessageFieldsToMessage(messageFields);
         const logMessage = {
-            ...removePrefix("custom", message),
+            ...messageFields,
             error,
             stack,
             lambdaName: this.lambdaName,
@@ -111,6 +113,18 @@ export class DtLogger {
         };
         this.writeStream.write(JSON.stringify(logMessage) + "\n");
     }
+    appendMessageFieldsToMessage(message) {
+        // The order is not guaranteed to be alphabetical etc.
+        const fielValuePairs = Object.entries(message)
+            // Remove fields not logged in message field
+            .filter(([key]) => {
+            return !["message", "level", "method", "stack", "error"].includes(key) && !(message.message ?? "").includes(`${key}=`);
+        })
+            // Map value to string
+            .map(([key, value]) => `${key}=${valueToString(value)}`)
+            .join(" ");
+        return `${message.message ?? ""}${fielValuePairs ? " " + fielValuePairs : ""}`;
+    }
 }
 /**
  * Removes given prefixes from the keys of the object.
@@ -118,4 +132,22 @@ export class DtLogger {
 function removePrefix(prefix, loggable) {
     return mapKeys(loggable, (_index, key) => key.startsWith(prefix) ? lowerFirst(key.replace(prefix, "")) : key);
 }
+function valueToString(value) {
+    if (value === undefined) {
+        return "undefined";
+    }
+    else if (value === null) {
+        return "null";
+    }
+    else if (value instanceof Date) {
+        return value.toISOString();
+    }
+    else if (typeof value !== "string") {
+        return JSON.stringify(value);
+    }
+    else if (value.includes("=")) {
+        return JSON.stringify(value);
+    }
+    return value;
+}
 //# sourceMappingURL=dt-logger.js.map

package/dist/utils/base64.d.ts

@@ -1,11 +1,32 @@
 /**
- * Decode given string from base64 to ascii
- * @param str string
+ * Encode given string to base64
+ * @param str
+ * @param encoding
  */
-export declare function decodeBase64ToAscii(str: string): string;
+export declare function encodeBase64(str: string, encoding: BufferEncoding): string;
 /**
  * Decode given string from base64 to given encoding
  * @param str
  * @param encoding
  */
 export declare function decodeBase64(str: string, encoding: BufferEncoding): string;
+/**
+ * Encode given string from ascii to Base64 string
+ * @param token
+ */
+export declare function encodeAsciiToBase64(token: string): string;
+/**
+ * Decode given string from base64 to ascii
+ * @param str string
+ */
+export declare function decodeBase64ToAscii(str: string): string;
+/**
+ * Encode given string from base64 to utf8 string
+ * @param str
+ */
+export declare function encodeUtf8ToBase64(str: string): string;
+/**
+ * Decode given string from base64 to utf8 string
+ * @param str
+ */
+export declare function decodeBase64ToUtf8(str: string): string;

package/dist/utils/base64.js

@@ -1,9 +1,10 @@
 /**
- * Decode given string from base64 to ascii
- * @param str string
+ * Encode given string to base64
+ * @param str
+ * @param encoding
  */
-export function decodeBase64ToAscii(str) {
-    return decodeBase64(str, "ascii");
+export function encodeBase64(str, encoding) {
+    return Buffer.from(str, encoding).toString("base64");
 }
 /**
  * Decode given string from base64 to given encoding
@@ -13,4 +14,32 @@ export function decodeBase64ToAscii(str) {
 export function decodeBase64(str, encoding) {
     return Buffer.from(str, "base64").toString(encoding);
 }
+/**
+ * Encode given string from ascii to Base64 string
+ * @param token
+ */
+export function encodeAsciiToBase64(token) {
+    return encodeBase64(token, "ascii");
+}
+/**
+ * Decode given string from base64 to ascii
+ * @param str string
+ */
+export function decodeBase64ToAscii(str) {
+    return decodeBase64(str, "ascii");
+}
+/**
+ * Encode given string from base64 to utf8 string
+ * @param str
+ */
+export function encodeUtf8ToBase64(str) {
+    return encodeBase64(str, "utf8");
+}
+/**
+ * Decode given string from base64 to utf8 string
+ * @param str
+ */
+export function decodeBase64ToUtf8(str) {
+    return decodeBase64(str, "utf8");
+}
 //# sourceMappingURL=base64.js.map

package/dist/utils/logging.js

@@ -53,12 +53,22 @@ export function logException(logger, error, includeStack = false) {
     // In case error is AxiosError, log the custom code property.
     // eslint-disable-next-line dot-notation
     const customCode = error["code"];
-    logger.error({
-        type: "Error",
-        method: `${functionName}.logException`,
-        message,
-        customCode,
-        stack,
-    });
+    if (customCode) {
+        logger.error({
+            type: "Error",
+            method: `${functionName}.logException`,
+            message: `error=${message}`,
+            customCode,
+            stack,
+        });
+    }
+    else {
+        logger.error({
+            type: "Error",
+            method: `${functionName}.logException`,
+            message: `error=${message}`,
+            stack,
+        });
+    }
 }
 //# sourceMappingURL=logging.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2025.4.9-1",
+  "version": "2025.4.29-1",
   "description": "",
   "type": "module",
   "repository": {
@@ -111,7 +111,7 @@
     "@aws-sdk/lib-storage": "^3.777.0",
     "@date-fns/tz": "1.2.0",
     "@smithy/fetch-http-handler": "5.0.2",
-    "aws-cdk-lib": "^2.188.0",
+    "aws-cdk-lib": "^2.189.0",
     "change-case": "^5.4.4",
     "constructs": "~10.4.2",
     "date-fns": "~4.1.0",
@@ -151,7 +151,7 @@
     "@types/node": "22.13.14",
     "@typescript-eslint/eslint-plugin": "~7.14.1",
     "@typescript-eslint/parser": "^7.18.0",
-    "aws-cdk-lib": "^2.188.0",
+    "aws-cdk-lib": "^2.189.0",
     "aws-sdk": "^2.1692.0",
     "change-case": "^5.4.4",
     "constructs": "~10.4.2",