@devrev/ts-adaas 1.8.0-beta.1 → 1.8.0-beta.2

package/dist/logger/logger.js

@@ -14,7 +14,7 @@ class Logger extends node_console_1.Console {
     constructor({ event, options }) {
         super(process.stdout, process.stderr);
         this.options = options;
-        this.tags = Object.assign(Object.assign({}, event.payload.event_context), { dev_oid: event.payload.event_context.dev_org });
+        this.tags = Object.assign(Object.assign({}, event.payload.event_context), { dev_oid: event.payload.event_context.dev_oid });
     }
     valueToString(value) {
         if (typeof value === 'string') {

package/dist/logger/logger.test.js

@@ -50,7 +50,7 @@ describe('Logger', () => {
             const logger = new logger_1.Logger({ event: mockEvent, options: mockOptions });
             // Access private property for testing
             const tags = logger.tags;
-            expect(tags).toEqual(Object.assign(Object.assign({}, mockEvent.payload.event_context), { dev_oid: mockEvent.payload.event_context.dev_org }));
+            expect(tags).toEqual(Object.assign(Object.assign({}, mockEvent.payload.event_context), { dev_oid: mockEvent.payload.event_context.dev_oid }));
         });
     });
     describe('production logging', () => {
@@ -62,7 +62,7 @@ describe('Logger', () => {
         it('should log single string message without backslashes', () => {
             const message = 'Worker is online. Started processing the task.';
             logger.info(message);
-            expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message }, mockEvent.payload.event_context), { dev_oid: mockEvent.payload.event_context.dev_org })));
+            expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message }, mockEvent.payload.event_context), { dev_oid: mockEvent.payload.event_context.dev_oid })));
         });
         it('should log single object message with JSON stringify', () => {
             const data = { id: 123, name: 'test' };
@@ -71,7 +71,7 @@ describe('Logger', () => {
                 compact: false,
                 depth: Infinity,
             });
-            expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: expectedMessage }, mockEvent.payload.event_context), { dev_oid: mockEvent.payload.event_context.dev_org })));
+            expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: expectedMessage }, mockEvent.payload.event_context), { dev_oid: mockEvent.payload.event_context.dev_oid })));
         });
         it('should log multiple arguments joined with space', () => {
             const text = 'Successfully fetched';
@@ -81,7 +81,7 @@ describe('Logger', () => {
                 compact: false,
                 depth: Infinity,
             });
-            expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: `${text} ${expectedDataMessage}` }, mockEvent.payload.event_context), { dev_oid: mockEvent.payload.event_context.dev_org })));
+            expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: `${text} ${expectedDataMessage}` }, mockEvent.payload.event_context), { dev_oid: mockEvent.payload.event_context.dev_oid })));
         });
         it('should handle mixed string and object arguments', () => {
             const text1 = 'Processing';
@@ -92,7 +92,7 @@ describe('Logger', () => {
                 compact: false,
                 depth: Infinity,
             });
-            expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: `${text1} ${expectedDataMessage} ${text2}` }, mockEvent.payload.event_context), { dev_oid: mockEvent.payload.event_context.dev_org })));
+            expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: `${text1} ${expectedDataMessage} ${text2}` }, mockEvent.payload.event_context), { dev_oid: mockEvent.payload.event_context.dev_oid })));
         });
     });
     describe('local development logging', () => {
@@ -143,7 +143,7 @@ describe('Logger', () => {
             const callArgs = mockConsoleInfo.mock.calls[0][0];
             const logObject = JSON.parse(callArgs);
             expect(logObject.message).toBe('');
-            expect(logObject.dev_oid).toBe(mockEvent.payload.event_context.dev_org);
+            expect(logObject.dev_oid).toBe(mockEvent.payload.event_context.dev_oid);
             expect(logObject.request_id).toBe(mockEvent.payload.event_context.request_id);
         });
         it('should handle null and undefined values', () => {
@@ -153,7 +153,7 @@ describe('Logger', () => {
             const logObject = JSON.parse(callArgs);
             // inspect shows 'null' and 'undefined' as strings
             expect(logObject.message).toBe('test null undefined');
-            expect(logObject.dev_oid).toBe(mockEvent.payload.event_context.dev_org);
+            expect(logObject.dev_oid).toBe(mockEvent.payload.event_context.dev_oid);
         });
         it('should handle complex nested objects', () => {
             const complexObject = {
@@ -174,7 +174,7 @@ describe('Logger', () => {
                 depth: Infinity,
             });
             expect(logObject.message).toBe(expectedMessage);
-            expect(logObject.dev_oid).toBe(mockEvent.payload.event_context.dev_org);
+            expect(logObject.dev_oid).toBe(mockEvent.payload.event_context.dev_oid);
             expect(typeof logObject.callback_url).toBe('string');
         });
     });

package/dist/state/state.js

@@ -96,7 +96,7 @@ class State {
                 },
                 params: {
                     sync_unit: this.event.payload.event_context.sync_unit_id,
-                    request_id: this.event.payload.event_context.uuid,
+                    request_id: this.event.payload.event_context.request_id_adaas,
                 },
             });
             this.state = state || this.state;
@@ -124,7 +124,7 @@ class State {
                 },
                 params: {
                     sync_unit: this.event.payload.event_context.sync_unit_id,
-                    request_id: this.event.payload.event_context.uuid,
+                    request_id: this.event.payload.event_context.request_id_adaas,
                 },
             });
             this.state = JSON.parse(response.data.state);

package/dist/tests/test-helpers.js

@@ -10,17 +10,25 @@ function createEvent({ eventType, externalSyncUnits = [], progress, error, delay
     const defaultEventContext = {
         callback_url: 'test_callback_url',
         dev_org: 'test_dev_org',
+        dev_oid: 'test_dev_oid',
         dev_org_id: 'test_dev_org_id',
         dev_user: 'test_dev_user',
         dev_user_id: 'test_dev_user_id',
+        dev_uid: 'test_dev_uid',
+        event_type_adaas: 'test_event_type_adaas',
         external_sync_unit: 'test_external_sync_unit',
         external_sync_unit_id: 'test_external_sync_unit_id',
         external_sync_unit_name: 'test_external_sync_unit_name',
         external_system: 'test_external_system',
+        external_system_id: 'test_external_system_id',
+        external_system_name: 'test_external_system_name',
         external_system_type: 'test_external_system_type',
         import_slug: 'test_import_slug',
         mode: 'test_mode',
         request_id: 'test_request_id',
+        request_id_adaas: 'test_request_id_adaas',
+        run_id: 'test_run_id',
+        sequence_version: 'test_sequence_version',
         snap_in_slug: 'test_snap_in_slug',
         snap_in_version_id: 'test_snap_in_version_id',
         sync_run: 'test_sync_run',

package/dist/types/extraction.d.ts

@@ -125,32 +125,64 @@ export interface EventContextOut {
  */
 export interface EventContext {
     callback_url: string;
+    /**
+     * @deprecated dev_org is deprecated and should not be used. Use dev_oid instead.
+     */
     dev_org: string;
+    dev_oid: string;
     dev_org_id: string;
+    /**
+     * @deprecated dev_user is deprecated and should not be used. Use dev_uid instead.
+     */
     dev_user: string;
+    /**
+     * @deprecated dev_user_id is deprecated and should not be used. Use dev_uid instead.
+     */
     dev_user_id: string;
+    dev_uid: string;
+    event_type_adaas: string;
+    /**
+     * @deprecated external_sync_unit is deprecated and should not be used. Use external_sync_unit_id instead.
+     */
     external_sync_unit: string;
     external_sync_unit_id: string;
     external_sync_unit_name: string;
+    /**
+     * @deprecated external_system is deprecated and should not be used. Use external_system_id instead.
+     */
     external_system: string;
+    external_system_id: string;
+    external_system_name: string;
     external_system_type: string;
     extract_from?: string;
     import_slug: string;
     initial_sync_scope?: InitialSyncScope;
     mode: string;
     request_id: string;
+    request_id_adaas: string;
     /**
      * @deprecated reset_extraction is deprecated and should not be used. Use reset_extract_from instead.
      */
     reset_extraction?: boolean;
     reset_extract_from?: boolean;
+    run_id: string;
+    sequence_version: string;
     snap_in_slug: string;
     snap_in_version_id: string;
+    /**
+     * @deprecated sync_run is deprecated and should not be used. Use run_id instead.
+     */
     sync_run: string;
+    /**
+     * @deprecated sync_run_id is deprecated and should not be used. Use run_id instead.
+     */
     sync_run_id: string;
     sync_tier: string;
     sync_unit: DonV2;
     sync_unit_id: string;
+    /**
+     * @deprecated uuid is deprecated and should not be used. Use request_id_adaas instead.
+     */
     uuid: string;
     worker_data_url: string;
 }

package/dist/workers/worker-adapter.js

@@ -124,6 +124,7 @@ class WorkerAdapter {
             catch (error) {
                 console.error('Error while uploading repos', error);
                 node_worker_threads_1.parentPort === null || node_worker_threads_1.parentPort === void 0 ? void 0 : node_worker_threads_1.parentPort.postMessage(workers_1.WorkerMessageSubject.WorkerMessageExit);
+                this.hasWorkerEmitted = true;
                 return;
             }
         }
@@ -142,6 +143,8 @@ class WorkerAdapter {
             catch (error) {
                 console.error('Error while posting state', error);
                 node_worker_threads_1.parentPort === null || node_worker_threads_1.parentPort === void 0 ? void 0 : node_worker_threads_1.parentPort.postMessage(workers_1.WorkerMessageSubject.WorkerMessageExit);
+                this.hasWorkerEmitted = true;
+                return;
             }
         }
         try {
@@ -157,12 +160,13 @@ class WorkerAdapter {
                 payload: { eventType: newEventType },
             };
             this.artifacts = [];
-            this.hasWorkerEmitted = true;
             node_worker_threads_1.parentPort === null || node_worker_threads_1.parentPort === void 0 ? void 0 : node_worker_threads_1.parentPort.postMessage(message);
+            this.hasWorkerEmitted = true;
         }
         catch (error) {
             console.error(`Error while emitting event with event type: ${newEventType}.`, (0, logger_1.serializeError)(error));
             node_worker_threads_1.parentPort === null || node_worker_threads_1.parentPort === void 0 ? void 0 : node_worker_threads_1.parentPort.postMessage(workers_1.WorkerMessageSubject.WorkerMessageExit);
+            this.hasWorkerEmitted = true;
         }
     }
     async uploadAllRepos() {

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

@@ -382,4 +382,66 @@ describe('WorkerAdapter', () => {
             expect(adapter.state.toDevRev.attachmentsMetadata.lastProcessed).toBe(0);
         });
     });
+    describe('emit', () => {
+        let counter;
+        let mockPostMessage;
+        beforeEach(() => {
+            counter = { counter: 0 };
+            // Import the worker_threads module and spy on parentPort.postMessage
+            const workerThreads = require('node:worker_threads');
+            mockPostMessage = jest.fn().mockImplementation((a) => {
+                console.log('postMessage called with:', a);
+                counter.counter += 1;
+            });
+            // Spy on the parentPort.postMessage method
+            if (workerThreads.parentPort) {
+                jest.spyOn(workerThreads.parentPort, 'postMessage').mockImplementation(mockPostMessage);
+            }
+            else {
+                // If parentPort is null (not in worker context), create a mock
+                workerThreads.parentPort = {
+                    postMessage: mockPostMessage,
+                };
+            }
+        });
+        afterEach(() => {
+            // Restore all mocks
+            jest.restoreAllMocks();
+        });
+        test('should correctly emit event', async () => {
+            adapter['adapterState'].postState = jest.fn().mockResolvedValue(undefined);
+            adapter.uploadAllRepos = jest.fn().mockResolvedValue(undefined);
+            await adapter.emit(types_1.ExtractorEventType.ExtractionMetadataError, {
+                reports: [],
+                processed_files: [],
+            });
+            await adapter.emit(types_1.ExtractorEventType.ExtractionMetadataError, {
+                reports: [],
+                processed_files: [],
+            });
+            await adapter.emit(types_1.ExtractorEventType.ExtractionMetadataDone, {
+                reports: [],
+                processed_files: [],
+            });
+            expect(counter.counter).toBe(1);
+        });
+        test('should correctly emit one event even if postState errors', async () => {
+            adapter['adapterState'].postState = jest.fn().mockRejectedValue(new Error('postState error'));
+            adapter.uploadAllRepos = jest.fn().mockResolvedValue(undefined);
+            await adapter.emit(types_1.ExtractorEventType.ExtractionMetadataError, {
+                reports: [],
+                processed_files: [],
+            });
+            expect(counter.counter).toBe(1);
+        });
+        test('should correctly emit one event even if uploadAllRepos errors', async () => {
+            adapter['adapterState'].postState = jest.fn().mockResolvedValue(undefined);
+            adapter.uploadAllRepos = jest.fn().mockRejectedValue(new Error('uploadAllRepos error'));
+            await adapter.emit(types_1.ExtractorEventType.ExtractionMetadataError, {
+                reports: [],
+                processed_files: [],
+            });
+            expect(counter.counter).toBe(1);
+        });
+    });
 });

package/package.json

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