@devrev/ts-adaas 1.12.2 → 1.12.3-0

package/dist/logger/logger.context.d.ts

@@ -0,0 +1,5 @@
+export declare function ensureSdkLogContext(defaultValue?: boolean): void;
+export declare function runWithUserLogContext<T>(fn: () => T): T;
+export declare function runWithSdkLogContext<T>(fn: () => T): T;
+export declare function getSdkLogContextValue(defaultValue: boolean): boolean;
+//# sourceMappingURL=logger.context.d.ts.map

package/dist/logger/logger.context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.context.d.ts","sourceRoot":"","sources":["../../src/logger/logger.context.ts"],"names":[],"mappings":"AAIA,wBAAgB,mBAAmB,CAAC,YAAY,UAAO,GAAG,IAAI,CAK7D;AAED,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAEvD;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAEtD;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAMpE"}

package/dist/logger/logger.context.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureSdkLogContext = ensureSdkLogContext;
+exports.runWithUserLogContext = runWithUserLogContext;
+exports.runWithSdkLogContext = runWithSdkLogContext;
+exports.getSdkLogContextValue = getSdkLogContextValue;
+const node_async_hooks_1 = require("node:async_hooks");
+const sdkLogContext = new node_async_hooks_1.AsyncLocalStorage();
+function ensureSdkLogContext(defaultValue = true) {
+    const storeValue = sdkLogContext.getStore();
+    if (typeof storeValue !== 'boolean') {
+        sdkLogContext.enterWith(defaultValue);
+    }
+}
+function runWithUserLogContext(fn) {
+    return sdkLogContext.run(false, fn);
+}
+function runWithSdkLogContext(fn) {
+    return sdkLogContext.run(true, fn);
+}
+function getSdkLogContextValue(defaultValue) {
+    const storeValue = sdkLogContext.getStore();
+    if (typeof storeValue === 'boolean') {
+        return storeValue;
+    }
+    return defaultValue;
+}

package/dist/logger/logger.d.ts

@@ -33,8 +33,9 @@ export declare class Logger extends Console {
      *
      * @param message - The pre-formatted message string to log
      * @param level - Log level (info, warn, error)
+     * @param sdkLog - Flag indicating if the log originated from the SDK
      */
-    logFn(message: string, level: LogLevel): void;
+    logFn(message: string, level: LogLevel, sdkLog?: boolean): void;
     /**
      * Stringifies and logs arguments to the appropriate destination.
      * On main thread, converts arguments to strings and calls logFn.
@@ -49,6 +50,10 @@ export declare class Logger extends Console {
     info(...args: unknown[]): void;
     warn(...args: unknown[]): void;
     error(...args: unknown[]): void;
+    sdkInfo(...args: unknown[]): void;
+    sdkWarn(...args: unknown[]): void;
+    sdkError(...args: unknown[]): void;
+    private getSdkLogFlag;
 }
 /**
  * Converts a state object into a printable format where arrays are summarized.

package/dist/logger/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAyC,MAAM,OAAO,CAAC;AAE1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAQvC,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EAEtB,QAAQ,EAER,cAAc,EACf,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,qBAAa,MAAO,SAAQ,OAAO;IACjC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,OAAO,CAAC,CAAuB;IACvC,OAAO,CAAC,IAAI,CAAa;gBAEb,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,sBAAsB;IAUtD;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IASvB;;;;;;;;OAQG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI;IAa7C;;;;;;;;OAQG;IACH,OAAO,CAAC,eAAe;IAcd,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI7B,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI9B,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI9B,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;CAGzC;AAED;;;;;;;GAOG;AAEH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,cAAc,CAqB5E;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAKtD;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,kBAAkB,CAwBzE;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAE1D"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAyC,MAAM,OAAO,CAAC;AAE1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AASvC,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EAEtB,QAAQ,EAER,cAAc,EACf,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,qBAAa,MAAO,SAAQ,OAAO;IACjC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,OAAO,CAAC,CAAuB;IACvC,OAAO,CAAC,IAAI,CAAa;gBAEb,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,sBAAsB;IAYtD;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IASvB;;;;;;;;;OASG;IACH,KAAK,CACH,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,QAAQ,EACf,MAAM,GAAE,OAA8B,GACrC,IAAI;IAcP;;;;;;;;OAQG;IACH,OAAO,CAAC,eAAe;IAqBd,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI7B,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI9B,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI9B,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAIxC,OAAO,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAIjC,OAAO,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAIjC,QAAQ,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAIlC,OAAO,CAAC,aAAa;CAGtB;AACD;;;;;;;GAOG;AAEH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,cAAc,CAqB5E;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAKtD;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,kBAAkB,CAwBzE;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAE1D"}

package/dist/logger/logger.interfaces.d.ts

@@ -1,6 +1,6 @@
-import { RawAxiosResponseHeaders } from 'axios';
-import { AirdropEvent, EventContext } from '../types/extraction';
-import { WorkerAdapterOptions } from '../types/workers';
+import type { RawAxiosResponseHeaders } from 'axios';
+import type { AirdropEvent, EventContext } from '../types/extraction';
+import type { WorkerAdapterOptions } from '../types/workers';
 export interface LoggerFactoryInterface {
     event: AirdropEvent;
     options?: WorkerAdapterOptions;
@@ -38,5 +38,6 @@ export interface AxiosErrorResponse {
 }
 export interface LoggerTags extends EventContext {
     sdk_version: string;
+    sdk_log: boolean;
 }
 //# sourceMappingURL=logger.interfaces.d.ts.map

package/dist/logger/logger.interfaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.interfaces.d.ts","sourceRoot":"","sources":["../../src/logger/logger.interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,OAAO,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,oBAAoB,CAAC;CAChC;AAED,oBAAY,QAAQ;IAClB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,CAAC,EAAE,GAAG,CAAC;IAEhB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAE7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,cAAc,GAAG,cAAc,CAAC;CACtD;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAE3B,MAAM,EAAE,GAAG,CAAC;QACZ,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;KACzB,CAAC;IACF,YAAY,EAAE,OAAO,CAAC;IACtB,sBAAsB,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE,OAAO,CAAC;QACd,OAAO,EAAE,uBAAuB,CAAC;QACjC,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,UAAW,SAAQ,YAAY;IAC9C,WAAW,EAAE,MAAM,CAAC;CACrB"}
+{"version":3,"file":"logger.interfaces.d.ts","sourceRoot":"","sources":["../../src/logger/logger.interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,oBAAoB,CAAC;CAChC;AAED,oBAAY,QAAQ;IAClB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,CAAC,EAAE,GAAG,CAAC;IAEhB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAE7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,cAAc,GAAG,cAAc,CAAC;CACtD;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAE3B,MAAM,EAAE,GAAG,CAAC;QACZ,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;KACzB,CAAC;IACF,YAAY,EAAE,OAAO,CAAC;IACtB,sBAAsB,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE,OAAO,CAAC;QACd,OAAO,EAAE,uBAAuB,CAAC;QACjC,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,UAAW,SAAQ,YAAY;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;CAClB"}

package/dist/logger/logger.js

@@ -12,6 +12,7 @@ const node_worker_threads_1 = require("node:worker_threads");
 const constants_1 = require("../common/constants");
 const workers_1 = require("../types/workers");
 const logger_constants_1 = require("./logger.constants");
+const logger_context_1 = require("./logger.context");
 const logger_interfaces_1 = require("./logger.interfaces");
 /**
  * Custom logger that extends Node.js Console with context-aware logging.
@@ -20,9 +21,10 @@ const logger_interfaces_1 = require("./logger.interfaces");
 class Logger extends node_console_1.Console {
     constructor({ event, options }) {
         super(process.stdout, process.stderr);
+        (0, logger_context_1.ensureSdkLogContext)();
         this.originalConsole = console;
         this.options = options;
-        this.tags = Object.assign(Object.assign({}, event.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION });
+        this.tags = Object.assign(Object.assign({}, event.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION, sdk_log: true });
     }
     /**
      * Converts any value to a string using `util.inspect()` for complex types.
@@ -57,14 +59,15 @@ class Logger extends node_console_1.Console {
      *
      * @param message - The pre-formatted message string to log
      * @param level - Log level (info, warn, error)
+     * @param sdkLog - Flag indicating if the log originated from the SDK
      */
-    logFn(message, level) {
+    logFn(message, level, sdkLog = this.getSdkLogFlag()) {
         var _a;
         if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.isLocalDevelopment) {
             this.originalConsole[level](message);
             return;
         }
-        const logObject = Object.assign({ message }, this.tags);
+        const logObject = Object.assign(Object.assign({ message }, this.tags), { sdk_log: sdkLog });
         this.originalConsole[level](JSON.stringify(logObject));
     }
     /**
@@ -76,16 +79,17 @@ class Logger extends node_console_1.Console {
      * @param args - Values to log (will be stringified and truncated if needed)
      * @param level - Log level (info, warn, error)
      */
-    stringifyAndLog(args, level) {
+    stringifyAndLog(args, level, sdkOverride) {
         let stringifiedArgs = args.map((arg) => this.valueToString(arg)).join(' ');
         stringifiedArgs = this.truncateMessage(stringifiedArgs);
+        const sdkLogFlag = typeof sdkOverride === 'boolean' ? sdkOverride : this.getSdkLogFlag();
         if (node_worker_threads_1.isMainThread) {
-            this.logFn(stringifiedArgs, level);
+            this.logFn(stringifiedArgs, level, sdkLogFlag);
         }
         else {
             node_worker_threads_1.parentPort === null || node_worker_threads_1.parentPort === void 0 ? void 0 : node_worker_threads_1.parentPort.postMessage({
                 subject: workers_1.WorkerMessageSubject.WorkerMessageLog,
-                payload: { stringifiedArgs, level },
+                payload: { stringifiedArgs, level, sdk_log: sdkLogFlag },
             });
         }
     }
@@ -101,6 +105,18 @@ class Logger extends node_console_1.Console {
     error(...args) {
         this.stringifyAndLog(args, logger_interfaces_1.LogLevel.ERROR);
     }
+    sdkInfo(...args) {
+        this.stringifyAndLog(args, logger_interfaces_1.LogLevel.INFO, true);
+    }
+    sdkWarn(...args) {
+        this.stringifyAndLog(args, logger_interfaces_1.LogLevel.WARN, true);
+    }
+    sdkError(...args) {
+        this.stringifyAndLog(args, logger_interfaces_1.LogLevel.ERROR, true);
+    }
+    getSdkLogFlag() {
+        return (0, logger_context_1.getSdkLogContextValue)(this.tags.sdk_log);
+    }
 }
 exports.Logger = Logger;
 /**

package/dist/logger/logger.test.js

@@ -1,20 +1,27 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
+const node_worker_threads_1 = require("node:worker_threads");
 const constants_1 = require("../common/constants");
 const test_helpers_1 = require("../tests/test-helpers");
 const extraction_1 = require("../types/extraction");
+const workers_1 = require("../types/workers");
 const logger_1 = require("./logger");
 const logger_constants_1 = require("./logger.constants");
+const logger_interfaces_1 = require("./logger.interfaces");
 // Mock console methods
 const mockConsoleInfo = jest.spyOn(console, 'info').mockImplementation();
 const mockConsoleWarn = jest.spyOn(console, 'warn').mockImplementation();
 const mockConsoleError = jest.spyOn(console, 'error').mockImplementation();
-// Mock worker_threads
-jest.mock('node:worker_threads', () => ({
-    isMainThread: true,
-    parentPort: null,
-}));
+// Mock worker_threads for main-thread specific behavior but keep actual Worker implementation
+jest.mock('node:worker_threads', () => {
+    const actual = jest.requireActual('node:worker_threads');
+    return Object.assign(Object.assign({}, actual), { isMainThread: true, parentPort: null });
+});
 describe(logger_1.Logger.name, () => {
     let mockEvent;
     let mockOptions;
@@ -52,7 +59,7 @@ describe(logger_1.Logger.name, () => {
         // Assert
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const tags = logger.tags;
-        expect(tags).toEqual(Object.assign(Object.assign({}, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION }));
+        expect(tags).toEqual(Object.assign(Object.assign({}, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION, sdk_log: true }));
     });
     it('should log string message as JSON with event context tags in production mode', () => {
         // Arrange
@@ -61,7 +68,7 @@ describe(logger_1.Logger.name, () => {
         // Act
         logger.info(message);
         // Assert
-        expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION })));
+        expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION, sdk_log: true })));
     });
     it('should log object message using inspect with proper formatting in production mode', () => {
         // Arrange
@@ -71,7 +78,7 @@ describe(logger_1.Logger.name, () => {
         // Act
         logger.info(data);
         // Assert
-        expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: expectedMessage }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION })));
+        expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: expectedMessage }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION, sdk_log: true })));
     });
     it('should join multiple arguments with space when logging in production mode', () => {
         // Arrange
@@ -82,7 +89,7 @@ describe(logger_1.Logger.name, () => {
         // Act
         logger.info(text, data);
         // Assert
-        expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: `${text} ${expectedDataMessage}` }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION })));
+        expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: `${text} ${expectedDataMessage}` }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION, sdk_log: true })));
     });
     it('should log mixed string and object arguments joined with spaces in production mode', () => {
         // Arrange
@@ -94,7 +101,60 @@ describe(logger_1.Logger.name, () => {
         // Act
         logger.info(text1, data, text2);
         // Assert
-        expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: `${text1} ${expectedDataMessage} ${text2}` }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION })));
+        expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: `${text1} ${expectedDataMessage} ${text2}` }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION, sdk_log: true })));
+    });
+    async function runWorkerLog(mode) {
+        const workerScriptPath = node_path_1.default.join(__dirname, 'logger.worker-fixture.js');
+        const worker = new node_worker_threads_1.Worker(workerScriptPath, {
+            workerData: {
+                event: mockEvent,
+                options: mockOptions,
+                message: 'Worker log',
+                mode,
+            },
+        });
+        try {
+            const logMessage = await new Promise((resolve, reject) => {
+                function cleanup() {
+                    worker.off('message', handleMessage);
+                    worker.off('exit', handleExit);
+                    worker.off('error', handleError);
+                }
+                function handleMessage(message) {
+                    const typedMessage = message;
+                    if ((typedMessage === null || typedMessage === void 0 ? void 0 : typedMessage.subject) === workers_1.WorkerMessageSubject.WorkerMessageLog) {
+                        cleanup();
+                        resolve(typedMessage);
+                    }
+                }
+                function handleExit(code) {
+                    cleanup();
+                    reject(new Error(`Worker exited before emitting log. Exit code: ${code.toString()}`));
+                }
+                function handleError(error) {
+                    cleanup();
+                    reject(error);
+                }
+                worker.on('message', handleMessage);
+                worker.once('exit', handleExit);
+                worker.once('error', handleError);
+            });
+            return logMessage;
+        }
+        finally {
+            await worker.terminate();
+        }
+    }
+    it('should set sdk_log to false for worker thread logs', async () => {
+        const logMessage = await runWorkerLog('user');
+        expect(logMessage.payload.sdk_log).toBe(false);
+        expect(logMessage.payload.level).toBe(logger_interfaces_1.LogLevel.INFO);
+        expect(logMessage.payload.stringifiedArgs).toContain('Worker log');
+    });
+    it('should keep sdk_log true for SDK logs inside worker thread', async () => {
+        const logMessage = await runWorkerLog('sdk');
+        expect(logMessage.payload.sdk_log).toBe(true);
+        expect(logMessage.payload.stringifiedArgs).toContain('Worker log');
     });
     it('should log directly without JSON wrapping in local development mode', () => {
         // Arrange
@@ -243,6 +303,7 @@ describe(logger_1.Logger.name, () => {
         const logObject = JSON.parse(callArgs);
         expect(logObject.message).toBe('');
         expect(logObject.sdk_version).toBe(constants_1.LIBRARY_VERSION);
+        expect(logObject.sdk_log).toBe(true);
     });
     it('[edge] should handle null and undefined values in log arguments', () => {
         // Arrange

package/dist/logger/logger.worker-fixture.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=logger.worker-fixture.d.ts.map

package/dist/logger/logger.worker-fixture.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.worker-fixture.d.ts","sourceRoot":"","sources":["../../src/logger/logger.worker-fixture.js"],"names":[],"mappings":""}

package/dist/logger/logger.worker-fixture.js

@@ -0,0 +1,10 @@
+"use strict";
+const { workerData } = require('node:worker_threads');
+require('ts-node/register');
+const { Logger } = require('./logger');
+const { runWithUserLogContext } = require('./logger.context');
+console = new Logger({ event: workerData.event, options: workerData.options });
+const runner = workerData.mode === 'sdk' ? (fn) => fn() : runWithUserLogContext;
+runner(() => {
+    console.log(workerData.message);
+});

package/dist/state/state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/state/state.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,YAAY,EAIZ,cAAc,EACf,MAAM,oBAAoB,CAAC;AAE5B,wBAAsB,kBAAkB,CAAC,cAAc,EAAE,EACvD,KAAK,EACL,YAAY,EACZ,oBAAoB,EACpB,OAAO,GACR,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CA0DjE;AAED,qBAAa,KAAK,CAAC,cAAc;IAC/B,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,eAAe,CAAW;IAClC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAS;gBAEd,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,cAAc,CAAC,cAAc,CAAC;IAenE,IAAI,KAAK,IAAI,YAAY,CAAC,cAAc,CAAC,CAExC;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC,EAE5C;IAED;;;;OAIG;IACG,IAAI,CAAC,YAAY,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCvD;;;OAGG;IACG,SAAS,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC,cAAc,CAAC;IAuCpD;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CAkBpC"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/state/state.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,YAAY,EAIZ,cAAc,EACf,MAAM,oBAAoB,CAAC;AAG5B,wBAAsB,kBAAkB,CAAC,cAAc,EAAE,EACvD,KAAK,EACL,YAAY,EACZ,oBAAoB,EACpB,OAAO,GACR,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CA0DjE;AAED,qBAAa,KAAK,CAAC,cAAc;IAC/B,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,eAAe,CAAW;IAClC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAS;gBAEd,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,cAAc,CAAC,cAAc,CAAC;IAenE,IAAI,KAAK,IAAI,YAAY,CAAC,cAAc,CAAC,CAExC;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC,EAE5C;IAED;;;;OAIG;IACG,IAAI,CAAC,YAAY,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAqCvD;;;OAGG;IACG,SAAS,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC,cAAc,CAAC;IAwCpD;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CAkBpC"}

package/dist/state/state.js

@@ -14,6 +14,7 @@ const logger_1 = require("../logger/logger");
 const common_1 = require("../types/common");
 const extraction_1 = require("../types/extraction");
 const state_interfaces_1 = require("./state.interfaces");
+const logger_context_1 = require("../logger/logger.context");
 async function createAdapterState({ event, initialState, initialDomainMapping, options, }) {
     // Deep clone the initial state to avoid mutating the original state
     const deepCloneInitialState = structuredClone(initialState);
@@ -95,7 +96,7 @@ class State {
                 throw new Error(`Failed to parse state. ${error}`);
             }
             this.state = parsedState;
-            console.log('State fetched successfully. Current state', (0, logger_1.getPrintableState)(this.state));
+            (0, logger_context_1.runWithUserLogContext)(() => console.log('State fetched successfully. Current state', (0, logger_1.getPrintableState)(this.state)));
         }
         catch (error) {
             if (axios_1.default.isAxiosError(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 404) {
@@ -137,7 +138,7 @@ class State {
                     request_id: this.requestId,
                 },
             });
-            console.log('State updated successfully to', (0, logger_1.getPrintableState)(this.state));
+            (0, logger_context_1.runWithUserLogContext)(() => console.log('State updated successfully to', (0, logger_1.getPrintableState)(this.state)));
         }
         catch (error) {
             console.error('Failed to update the state.', (0, logger_1.serializeError)(error));

package/dist/tests/backwards-compatibility/backwards-compatibility.test.js

@@ -367,14 +367,29 @@ describe('Backwards Compatibility', () => {
         });
         // Verify that the type alias is the same as the current type alias
         describe('should verify type aliases are the same as the current type aliases', () => {
+            const normalizeTypeText = (text) => text.replace(/\s/g, '');
+            const getUnionMembers = (text) => normalizeTypeText(text)
+                .split('|')
+                .map((member) => member.trim())
+                .filter(Boolean);
             for (const newType of newTypes) {
                 const currentType = currentTypes.find((t) => t.name === newType.name);
                 if (!currentType) {
                     continue;
                 }
                 it(`Type ${newType.name} should have the same type as the current type`, () => {
-                    // Replace all whitespace with an empty string to ignore whitespace differences
-                    expect(newType.typeExcerpt.text.replace(/\s/g, '')).toEqual(currentType.typeExcerpt.text.replace(/\s/g, ''));
+                    const currentTypeText = normalizeTypeText(currentType.typeExcerpt.text);
+                    const newTypeText = normalizeTypeText(newType.typeExcerpt.text);
+                    if (currentTypeText.includes('|')) {
+                        const currentUnionMembers = getUnionMembers(currentType.typeExcerpt.text);
+                        const newUnionMembers = new Set(getUnionMembers(newType.typeExcerpt.text));
+                        expect(!!currentUnionMembers.length).toBe(true);
+                        for (const member of currentUnionMembers) {
+                            expect(newUnionMembers.has(member)).toBe(true);
+                        }
+                        return;
+                    }
+                    expect(newTypeText).toEqual(currentTypeText);
                 });
             }
         });

package/dist/types/workers.d.ts

@@ -1,4 +1,5 @@
 import { Worker } from 'worker_threads';
+import type { LogLevel } from '../logger/logger.interfaces';
 import { State } from '../state/state';
 import { WorkerAdapter } from '../workers/worker-adapter';
 import { AirdropEvent, ExtractorEventType } from './extraction';
@@ -116,10 +117,21 @@ export interface WorkerMessageEmitted {
 export interface WorkerMessageExit {
     subject: WorkerMessageSubject.WorkerMessageExit;
 }
+/**
+ * WorkerMessageLog interface represents the structure of the worker log message.
+ */
+export interface WorkerMessageLog {
+    subject: WorkerMessageSubject.WorkerMessageLog;
+    payload: {
+        stringifiedArgs: string;
+        level: LogLevel;
+        sdk_log?: boolean;
+    };
+}
 /**
  * WorkerMessage represents the structure of the worker message.
  */
-export type WorkerMessage = WorkerMessageEmitted | WorkerMessageExit;
+export type WorkerMessage = WorkerMessageEmitted | WorkerMessageExit | WorkerMessageLog;
 /**
  * WorkerData represents the structure of the worker data object.
  */

package/dist/types/workers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workers.d.ts","sourceRoot":"","sources":["../../src/types/workers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workers.d.ts","sourceRoot":"","sources":["../../src/types/workers.ts"],"names":[],"mappings":"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"}

package/dist/workers/process-task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process-task.d.ts","sourceRoot":"","sources":["../../src/workers/process-task.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EAGrB,MAAM,kBAAkB,CAAC;AAG1B,wBAAgB,WAAW,CAAC,cAAc,EAAE,EAC1C,IAAI,EACJ,SAAS,GACV,EAAE,oBAAoB,CAAC,cAAc,CAAC,QAuDtC"}
+{"version":3,"file":"process-task.d.ts","sourceRoot":"","sources":["../../src/workers/process-task.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,oBAAoB,EAGrB,MAAM,kBAAkB,CAAC;AAG1B,wBAAgB,WAAW,CAAC,cAAc,EAAE,EAC1C,IAAI,EACJ,SAAS,GACV,EAAE,oBAAoB,CAAC,cAAc,CAAC,QA2DtC"}

package/dist/workers/process-task.js

@@ -3,48 +3,51 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processTask = processTask;
 const node_worker_threads_1 = require("node:worker_threads");
 const logger_1 = require("../logger/logger");
+const logger_context_1 = require("../logger/logger.context");
 const state_1 = require("../state/state");
 const workers_1 = require("../types/workers");
 const worker_adapter_1 = require("./worker-adapter");
 function processTask({ task, onTimeout, }) {
     if (!node_worker_threads_1.isMainThread) {
-        void (async () => {
-            try {
-                const event = node_worker_threads_1.workerData.event;
-                const initialState = node_worker_threads_1.workerData.initialState;
-                const initialDomainMapping = node_worker_threads_1.workerData.initialDomainMapping;
-                const options = node_worker_threads_1.workerData.options;
-                // eslint-disable-next-line no-global-assign
-                console = new logger_1.Logger({ event, options });
-                const adapterState = await (0, state_1.createAdapterState)({
-                    event,
-                    initialState,
-                    initialDomainMapping,
-                    options,
-                });
-                if (node_worker_threads_1.parentPort && node_worker_threads_1.workerData.event) {
-                    const adapter = new worker_adapter_1.WorkerAdapter({
+        (0, logger_context_1.runWithSdkLogContext)(() => {
+            void (async () => {
+                try {
+                    const event = node_worker_threads_1.workerData.event;
+                    const initialState = node_worker_threads_1.workerData.initialState;
+                    const initialDomainMapping = node_worker_threads_1.workerData.initialDomainMapping;
+                    const options = node_worker_threads_1.workerData.options;
+                    // eslint-disable-next-line no-global-assign
+                    console = new logger_1.Logger({ event, options });
+                    const adapterState = await (0, state_1.createAdapterState)({
                         event,
-                        adapterState,
+                        initialState,
+                        initialDomainMapping,
                         options,
                     });
-                    node_worker_threads_1.parentPort.on(workers_1.WorkerEvent.WorkerMessage, (message) => void (async () => {
-                        if (message.subject === workers_1.WorkerMessageSubject.WorkerMessageExit) {
-                            console.log('Worker received message to gracefully exit. Setting isTimeout flag and executing onTimeout function.');
-                            adapter.handleTimeout();
-                            await onTimeout({ adapter });
-                            console.log('Finished executing onTimeout function. Exiting worker.');
-                            process.exit(0);
-                        }
-                    })());
-                    await task({ adapter });
-                    process.exit(0);
+                    if (node_worker_threads_1.parentPort && node_worker_threads_1.workerData.event) {
+                        const adapter = new worker_adapter_1.WorkerAdapter({
+                            event,
+                            adapterState,
+                            options,
+                        });
+                        node_worker_threads_1.parentPort.on(workers_1.WorkerEvent.WorkerMessage, (message) => void (async () => {
+                            if (message.subject === workers_1.WorkerMessageSubject.WorkerMessageExit) {
+                                console.log('Worker received message to gracefully exit. Setting isTimeout flag and executing onTimeout function.');
+                                adapter.handleTimeout();
+                                await (0, logger_context_1.runWithUserLogContext)(async () => onTimeout({ adapter }));
+                                console.log('Finished executing onTimeout function. Exiting worker.');
+                                process.exit(0);
+                            }
+                        })());
+                        await (0, logger_context_1.runWithUserLogContext)(async () => task({ adapter }));
+                        process.exit(0);
+                    }
                 }
-            }
-            catch (error) {
-                console.error('Error while processing task.', (0, logger_1.serializeError)(error));
-                process.exit(1);
-            }
-        })();
+                catch (error) {
+                    console.error('Error while processing task.', (0, logger_1.serializeError)(error));
+                    process.exit(1);
+                }
+            })();
+        });
     }
 }

package/dist/workers/spawn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../src/workers/spawn.ts"],"names":[],"mappings":"AAWA,OAAO,EAEL,qBAAqB,EACrB,cAAc,EAGf,MAAM,kBAAkB,CAAC;AA4D1B;;;;;;;;;;GAUG;AACH,wBAAsB,KAAK,CAAC,cAAc,EAAE,EAC1C,KAAK,EACL,YAAY,EACZ,UAAU,EACV,oBAAoB,EACpB,OAAO,GACR,EAAE,qBAAqB,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAyEvD;AAED,qBAAa,KAAK;IAChB,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,gBAAgB,CAA4C;IACpE,OAAO,CAAC,gBAAgB,CAA4C;IACpE,OAAO,CAAC,wBAAwB,CAA6C;IAC7E,OAAO,CAAC,OAAO,CAA4C;IAC3D,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,MAAM,CAAS;gBACX,EACV,KAAK,EACL,MAAM,EACN,OAAO,EACP,OAAO,EACP,eAAe,GAChB,EAAE,cAAc;IAgGjB,OAAO,CAAC,aAAa;YAYP,kBAAkB;CAiCjC"}
+{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../src/workers/spawn.ts"],"names":[],"mappings":"AAWA,OAAO,EAEL,qBAAqB,EACrB,cAAc,EAGf,MAAM,kBAAkB,CAAC;AA4D1B;;;;;;;;;;GAUG;AACH,wBAAsB,KAAK,CAAC,cAAc,EAAE,EAC1C,KAAK,EACL,YAAY,EACZ,UAAU,EACV,oBAAoB,EACpB,OAAO,GACR,EAAE,qBAAqB,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAyEvD;AAED,qBAAa,KAAK;IAChB,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,gBAAgB,CAA4C;IACpE,OAAO,CAAC,gBAAgB,CAA4C;IACpE,OAAO,CAAC,wBAAwB,CAA6C;IAC7E,OAAO,CAAC,OAAO,CAA4C;IAC3D,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,MAAM,CAAS;gBACX,EACV,KAAK,EACL,MAAM,EACN,OAAO,EACP,OAAO,EACP,eAAe,GAChB,EAAE,cAAc;IAkGjB,OAAO,CAAC,aAAa;YAYP,kBAAkB;CAiCjC"}

package/dist/workers/spawn.js

@@ -181,14 +181,16 @@ class Spawn {
             await this.exitFromMainThread();
         })());
         worker.on(workers_1.WorkerEvent.WorkerMessage, (message) => {
-            var _a, _b;
+            var _a, _b, _c, _d;
             // Since logs from the worker thread are handled differently in snap-in
             // platform,  we need to catch the log messages from worker thread and log
             // them in main thread.
             if ((message === null || message === void 0 ? void 0 : message.subject) === workers_1.WorkerMessageSubject.WorkerMessageLog) {
                 const stringifiedArgs = (_a = message.payload) === null || _a === void 0 ? void 0 : _a.stringifiedArgs;
                 const level = (_b = message.payload) === null || _b === void 0 ? void 0 : _b.level;
-                this.logger.logFn(stringifiedArgs, level);
+                const sdkLog = (_d = (_c = message.payload) === null || _c === void 0 ? void 0 : _c.sdk_log) !== null && _d !== void 0 ? _d : false;
+                // Args are already sanitized in the worker thread, skip double sanitization
+                this.logger.logFn(stringifiedArgs, level, sdkLog);
             }
             // If worker sends a message that it has emitted an event, then set alreadyEmitted to true.
             if ((message === null || message === void 0 ? void 0 : message.subject) === workers_1.WorkerMessageSubject.WorkerMessageEmitted) {

package/dist/workers/worker-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-adapter.d.ts","sourceRoot":"","sources":["../../src/workers/worker-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker-adapter.d.ts","sourceRoot":"","sources":["../../src/workers/worker-adapter.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACL,YAAY,EACZ,SAAS,EAET,kCAAkC,EAClC,yCAAyC,EACzC,kBAAkB,EAClB,2BAA2B,EAC3B,2BAA2B,EAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,wBAAwB,EACxB,kBAAkB,EAClB,6BAA6B,EAC7B,UAAU,EACV,qBAAqB,EACrB,cAAc,EACd,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,qBAAqB,EAEtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EAGrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,QAAQ,EAAkB,MAAM,iCAAiC,CAAC;AAE3E,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,EAClD,KAAK,EACL,YAAY,EACZ,OAAO,GACR,EAAE,sBAAsB,CAAC,cAAc,CAAC,GAAG,aAAa,CAAC,cAAc,CAAC,CAMxE;AAED;;;;;;;;;;;;;;GAcG;AACH,qBAAa,aAAa,CAAC,cAAc;IACvC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAC;IACxC,SAAS,EAAE,OAAO,CAAC;IAEnB,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,gBAAgB,CAAU;IAClC,OAAO,CAAC,KAAK,CAAc;IAG3B,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,CAAC,eAAe,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,QAAQ,CAAW;gBAEf,EACV,KAAK,EACL,YAAY,EACZ,OAAO,GACR,EAAE,sBAAsB,CAAC,cAAc,CAAC;IAqBzC,IAAI,KAAK,IAAI,YAAY,CAAC,cAAc,CAAC,CAExC;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC,EAI5C;IAED,IAAI,OAAO,IAAI,YAAY,EAAE,CAE5B;IAED,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE;IAuBtC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAWrC,SAAS;IAIf,IAAI,SAAS,IAAI,QAAQ,EAAE,CAE1B;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,EAIlC;IAED;;;;;OAKG;IACG,IAAI,CACR,YAAY,EAAE,kBAAkB,GAAG,eAAe,EAClD,IAAI,CAAC,EAAE,SAAS,GACf,OAAO,CAAC,IAAI,CAAC;IAiFV,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAUrC,aAAa;IAIP,aAAa,CAAC,EAClB,eAAe,GAChB,EAAE,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAgHnD,gBAAgB,CAAC,EACrB,kBAAkB,GACnB,EAAE;QACD,kBAAkB,EAAE,MAAM,EAAE,CAAC;KAC9B;IAuBK,eAAe,CAAC,EACpB,MAAM,GACP,EAAE;QACD,MAAM,EAAE,6BAA6B,CAAC,wBAAwB,CAAC,CAAC;KACjE,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAwE5B,QAAQ,CAAC,EACb,IAAI,EACJ,cAAc,GACf,EAAE;QACD,IAAI,EAAE,kBAAkB,CAAC;QACzB,cAAc,EAAE,cAAc,CAAC;KAChC,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA6LvB,iBAAiB,CACrB,UAAU,EAAE,oBAAoB,EAChC,MAAM,EAAE,yCAAyC,GAChD,OAAO,CAAC,2BAA2B,CAAC;IAwFvC;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAcnB,cAAc,CAAC,EACnB,IAAI,EACJ,MAAM,GACP,EAAE;QACD,IAAI,EAAE,wBAAwB,CAAC;QAC/B,MAAM,EAAE,6BAA6B,CAAC,wBAAwB,CAAC,CAAC;KACjE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAmD7B;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,EAChC,MAAM,EACN,UAAU,EACV,SAAa,GACd,EAAE;QACD,MAAM,EAAE,yCAAyC,CAAC;QAClD,UAAU,CAAC,EAAE,kCAAkC,CAC7C,cAAc,EACd,oBAAoB,EAAE,EACtB,QAAQ,CACT,CAAC;QACF,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAsHzC"}

package/dist/workers/worker-adapter.js

@@ -124,7 +124,7 @@ class WorkerAdapter {
         }
         // We want to upload all the repos before emitting the event, except for the external sync units done event
         if (newEventType !== extraction_1.ExtractorEventType.ExtractionExternalSyncUnitsDone) {
-            console.log(`Uploading all repos before emitting event with event type: ${newEventType}.`);
+            console.sdkInfo(`Uploading all repos before emitting event with event type: ${newEventType}.`);
             try {
                 await this.uploadAllRepos();
             }
@@ -143,7 +143,7 @@ class WorkerAdapter {
         }
         // We want to save the state every time we emit an event, except for the start and delete events
         if (!constants_1.STATELESS_EVENT_TYPES.includes(this.event.payload.event_type)) {
-            console.log(`Saving state before emitting event with event type: ${newEventType}.`);
+            console.sdkInfo(`Saving state before emitting event with event type: ${newEventType}.`);
             try {
                 await this.adapterState.postState(this.state);
             }

package/dist/workers/worker-adapter.test.js

@@ -30,6 +30,13 @@ jest.mock('../attachments-streaming/attachments-streaming-pool', () => {
         }),
     };
 });
+const mockSdkInfo = jest.fn();
+beforeAll(() => {
+    console.sdkInfo = mockSdkInfo;
+});
+beforeEach(() => {
+    mockSdkInfo.mockReset();
+});
 describe(worker_adapter_1.WorkerAdapter.name, () => {
     let adapter;
     let mockEvent;

package/dist/workers/worker.js

@@ -2,6 +2,8 @@
 const { workerData } = require('worker_threads');
 require('ts-node').register();
 const { Logger } = require('../logger/logger');
-// eslint-disable-next-line no-global-assign
+const { runWithUserLogContext } = require('../logger/logger.context');
 console = new Logger({ event: workerData.event, options: workerData.options });
-require(workerData.workerPath);
+runWithUserLogContext(() => {
+    require(workerData.workerPath);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrev/ts-adaas",
-  "version": "1.12.2",
+  "version": "1.12.3-0",
   "description": "Typescript library containing the ADaaS(AirDrop as a Service) control protocol.",
   "type": "commonjs",
   "main": "./dist/index.js",