@digitraffic/common 2025.4.2-1 → 2025.4.10-1

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

@@ -4,6 +4,10 @@ const LOG_LINE = {
     method: "dt-logger.test",
     message: "FOO",
 };
+const EXPECTED_LOG_LINE = {
+    method: "dt-logger.test",
+    message: "dt-logger.test FOO",
+};
 describe("dt-logger", () => {
     function assertLog(config, message, expected) {
         assertWrite(config, (logger) => {
@@ -57,7 +61,7 @@ describe("dt-logger", () => {
             ...LOG_LINE,
             customDate: date,
         }, {
-            ...LOG_LINE,
+            ...EXPECTED_LOG_LINE,
             date: date.toISOString(),
         });
     });
@@ -66,14 +70,21 @@ describe("dt-logger", () => {
             ...LOG_LINE,
             customFooCount: 123,
         }, {
-            ...LOG_LINE,
+            ...EXPECTED_LOG_LINE,
             fooCount: 123,
         });
     });
     test("default values", () => {
         assertLog({}, LOG_LINE, {
-            method: LOG_LINE.method,
-            message: LOG_LINE.message,
+            method: EXPECTED_LOG_LINE.method,
+            message: EXPECTED_LOG_LINE.message,
+            level: "INFO",
+        });
+    });
+    test("method not duplicated", () => {
+        assertLog({}, EXPECTED_LOG_LINE, {
+            method: EXPECTED_LOG_LINE.method,
+            message: EXPECTED_LOG_LINE.message,
             level: "INFO",
         });
     });
@@ -81,16 +92,16 @@ describe("dt-logger", () => {
         const LAMBDA_NAME = "test_lambda_name";
         assertLog({ lambdaName: LAMBDA_NAME }, LOG_LINE, {
             lambdaName: LAMBDA_NAME,
-            method: LOG_LINE.method,
-            message: LOG_LINE.message,
+            method: EXPECTED_LOG_LINE.method,
+            message: EXPECTED_LOG_LINE.message,
             level: "INFO",
         });
     });
     test("set runtime", () => {
         const RUNTIME = "test_runtime";
         assertLog({ runTime: RUNTIME }, LOG_LINE, {
-            message: LOG_LINE.message,
-            method: LOG_LINE.method,
+            message: EXPECTED_LOG_LINE.message,
+            method: EXPECTED_LOG_LINE.method,
             level: "INFO",
             runtime: RUNTIME,
         });
@@ -121,7 +132,7 @@ describe("dt-logger", () => {
             ...LOG_LINE,
             error,
         }, {
-            ...LOG_LINE,
+            ...EXPECTED_LOG_LINE,
             error: "FAIL!",
             level: "ERROR",
         });
@@ -135,7 +146,7 @@ describe("dt-logger", () => {
             ...LOG_LINE,
             error,
         }, {
-            ...LOG_LINE,
+            ...EXPECTED_LOG_LINE,
             error: '{"errorMessage":"FAIL!","errorCode":123}',
             level: "ERROR",
         });
@@ -146,7 +157,7 @@ describe("dt-logger", () => {
             ...LOG_LINE,
             error,
         }, {
-            ...LOG_LINE,
+            ...EXPECTED_LOG_LINE,
             error: "Error: FAIL!",
             level: "ERROR",
         });
@@ -167,7 +178,7 @@ describe("dt-logger", () => {
             ...LOG_LINE,
             error,
         }, {
-            ...LOG_LINE,
+            ...EXPECTED_LOG_LINE,
             error: "TypeError: Cannot read properties of undefined (reading 'length')",
             level: "ERROR",
             stack: "TypeError: Cannot read properties of undefined (reading 'length')",

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

@@ -40,7 +40,7 @@ describe("dt-logger", () => {
         assertLogError(STRING_ERROR, {
             type: "Error",
             method: TEST_METHODNAME,
-            message: STRING_ERROR,
+            message: `${TEST_METHODNAME} ${STRING_ERROR}`,
             level: "ERROR",
         });
     });
@@ -49,7 +49,7 @@ describe("dt-logger", () => {
         assertLogError(ERROR, {
             type: "Error",
             method: TEST_METHODNAME,
-            message: ERROR.message,
+            message: `${TEST_METHODNAME} ${ERROR.message}`,
             level: "ERROR",
         });
     });
@@ -58,7 +58,7 @@ describe("dt-logger", () => {
         assertLogError(ERROR, {
             type: "Error",
             method: TEST_METHODNAME,
-            message: ERROR.message,
+            message: `${TEST_METHODNAME} ${ERROR.message}`,
             level: "ERROR",
             stack: true,
         }, true);
@@ -69,7 +69,7 @@ describe("dt-logger", () => {
         assertAxiosError(ERROR, {
             type: "Error",
             method: TEST_METHODNAME,
-            message: ERROR.message,
+            message: `${TEST_METHODNAME} ${ERROR.message}`,
             level: "ERROR",
             code: ERROR.code,
         });

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

@@ -85,6 +85,11 @@ export class DtLogger {
      * @see {@link LoggableType}
      */
     log(message) {
+        // Append always method to message
+        if (!message.message || !message.message.length ||
+            !message.message.includes(message.method)) {
+            message.message = `${message.method} ${message.message ?? ""}`;
+        }
         const error = message.error
             ? (message.error instanceof Error)
                 ? `${message.error.name}: ${message.error.message}`

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2025.4.2-1",
+  "version": "2025.4.10-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.186.0",
+    "aws-cdk-lib": "^2.188.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.186.0",
+    "aws-cdk-lib": "^2.188.0",
     "aws-sdk": "^2.1692.0",
     "change-case": "^5.4.4",
     "constructs": "~10.4.2",