@devrev/ts-adaas 1.7.0-beta.0 → 1.7.0

package/dist/common/install-initial-domain-mapping.js

@@ -42,13 +42,7 @@ async function installInitialDomainMapping(event, initialDomainMappingJson) {
             console.log('Successfully created recipe blueprint with id: ' + recipeBlueprintId);
         }
         catch (error) {
-            const errorMessage = `Error while creating recipe blueprint. Continuing without it.`;
-            if (axios_client_1.axios.isAxiosError(error)) {
-                console.error(errorMessage, (0, logger_1.serializeAxiosError)(error));
-            }
-            else {
-                console.error(errorMessage, error);
-            }
+            console.warn('Error while creating recipe blueprint. Continuing without it.', (0, logger_1.serializeError)(error));
         }
     }
     // Install the initial domain mappings

package/dist/common/install-initial-domain-mapping.test.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
 const install_initial_domain_mapping_1 = require("./install-initial-domain-mapping");
 const axios_client_1 = require("../http/axios-client");
-const logger_1 = require("../logger/logger");
 const test_helpers_1 = require("../tests/test-helpers");
 const extraction_1 = require("../types/extraction");
 // Mock dependencies
@@ -15,7 +14,6 @@ jest.mock('../http/axios-client');
 jest.mock('../logger/logger');
 const mockAxiosClient = axios_client_1.axiosClient;
 const mockIsAxiosError = axios_1.default.isAxiosError;
-const mockSerializeAxiosError = logger_1.serializeAxiosError;
 describe('installInitialDomainMapping', () => {
     // Create mock objects
     const mockEvent = (0, test_helpers_1.createEvent)({ eventType: extraction_1.EventType.ExtractionDataStart });

package/dist/logger/logger.d.ts

@@ -17,7 +17,7 @@ export declare function getPrintableState(state: Record<string, any>): Printable
  * @deprecated
  */
 export declare function formatAxiosError(error: AxiosError): object;
-export declare const serializeError: (error: unknown) => Error;
+export declare const serializeError: (error: unknown) => unknown;
 export declare function serializeAxiosError(error: AxiosError): {
     config: {
         method: string | undefined;

package/dist/logger/logger.js

@@ -9,6 +9,7 @@ const node_util_1 = require("node:util");
 const logger_interfaces_1 = require("./logger.interfaces");
 const node_worker_threads_1 = require("node:worker_threads");
 const workers_1 = require("../types/workers");
+const axios_1 = require("axios");
 class Logger extends node_console_1.Console {
     constructor({ event, options }) {
         super(process.stdout, process.stderr);
@@ -22,7 +23,7 @@ class Logger extends node_console_1.Console {
         // Use Node.js built-in inspect for everything including errors
         return (0, node_util_1.inspect)(value, {
             compact: false,
-            breakLength: Infinity,
+            depth: Infinity,
         });
     }
     logFn(args, level) {
@@ -110,14 +111,10 @@ function formatAxiosError(error) {
     return serializeAxiosError(error);
 }
 const serializeError = (error) => {
-    let serializedError = error;
-    try {
-        serializedError = JSON.parse(JSON.stringify(error, Object.getOwnPropertyNames(error)));
+    if ((0, axios_1.isAxiosError)(error)) {
+        return serializeAxiosError(error);
     }
-    catch (err) {
-        console.error('Failed to serialize error object for logger', err);
-    }
-    return serializedError;
+    return error;
 };
 exports.serializeError = serializeError;
 function serializeAxiosError(error) {

package/dist/logger/logger.test.js

@@ -69,7 +69,7 @@ describe('Logger', () => {
             logger.info(data);
             const expectedMessage = (0, node_util_1.inspect)(data, {
                 compact: false,
-                breakLength: Infinity,
+                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 })));
         });
@@ -79,7 +79,7 @@ describe('Logger', () => {
             logger.info(text, data);
             const expectedDataMessage = (0, node_util_1.inspect)(data, {
                 compact: false,
-                breakLength: Infinity,
+                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 })));
         });
@@ -90,7 +90,7 @@ describe('Logger', () => {
             logger.info(text1, data, text2);
             const expectedDataMessage = (0, node_util_1.inspect)(data, {
                 compact: false,
-                breakLength: Infinity,
+                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 })));
         });
@@ -171,7 +171,7 @@ describe('Logger', () => {
             // The logger uses inspect() with formatting, not JSON.stringify()
             const expectedMessage = require('util').inspect(complexObject, {
                 compact: false,
-                breakLength: Infinity,
+                depth: Infinity,
             });
             expect(logObject.message).toBe(expectedMessage);
             expect(logObject.dev_oid).toBe(mockEvent.payload.event_context.dev_org);

package/dist/state/state.js

@@ -36,12 +36,7 @@ async function createAdapterState({ event, initialState, initialDomainMapping, o
                 }
             }
             catch (error) {
-                if (axios_client_1.axios.isAxiosError(error)) {
-                    console.error('Error while installing initial domain mapping', (0, logger_1.serializeAxiosError)(error));
-                }
-                else {
-                    console.error('Error while installing initial domain mapping', error);
-                }
+                console.error('Error while installing initial domain mapping.', (0, logger_1.serializeError)(error));
             }
         }
         // Set lastSyncStarted if the event type is ExtractionDataStart
@@ -108,12 +103,7 @@ class State {
             console.log('State updated successfully to', (0, logger_1.getPrintableState)(this.state));
         }
         catch (error) {
-            if (axios_client_1.axios.isAxiosError(error)) {
-                console.error('Failed to update state', (0, logger_1.serializeAxiosError)(error));
-            }
-            else {
-                console.error('Failed to update state', error);
-            }
+            console.error('Failed to update the state.', (0, logger_1.serializeError)(error));
             process.exit(1);
         }
     }

package/dist/types/extraction.d.ts

@@ -139,7 +139,11 @@ export interface EventContext {
     initial_sync_scope?: InitialSyncScope;
     mode: string;
     request_id: string;
+    /**
+     * @deprecated reset_extraction is deprecated and should not be used. Use reset_extract_from instead.
+     */
     reset_extraction?: boolean;
+    reset_extract_from?: boolean;
     snap_in_slug: string;
     snap_in_version_id: string;
     sync_run: string;

package/dist/types/extraction.test.js

@@ -11,7 +11,7 @@ describe('EventContext type tests', () => {
     });
     it('should handle context with all optional fields', () => {
         const event = Object.assign({}, baseEvent);
-        event.payload.event_context = Object.assign(Object.assign({}, baseEvent.payload.event_context), { extract_from: '2024-01-01T00:00:00Z', initial_sync_scope: extraction_1.InitialSyncScope.TIME_SCOPED, reset_extraction: true });
+        event.payload.event_context = Object.assign(Object.assign({}, baseEvent.payload.event_context), { extract_from: '2024-01-01T00:00:00Z', initial_sync_scope: extraction_1.InitialSyncScope.TIME_SCOPED, reset_extract_from: true });
         // Test with all optionals present
         expect(event).toBeDefined();
     });

package/dist/uploader/uploader.js

@@ -73,7 +73,7 @@ class Uploader {
         const file = this.compressGzip(js_jsonl_1.jsonl.stringify(fetchedObjects));
         if (!file) {
             return {
-                error: { message: 'Error while compressing jsonl object.' },
+                error: new Error('Error while compressing jsonl object.'),
             };
         }
         const filename = itemType + '.jsonl.gz';
@@ -82,21 +82,21 @@ class Uploader {
         const preparedArtifact = await this.getArtifactUploadUrl(filename, fileType);
         if (!preparedArtifact) {
             return {
-                error: { message: 'Error while getting artifact upload URL.' },
+                error: new Error('Error while getting artifact upload URL.'),
             };
         }
         // Upload prepared artifact to the given url
         const uploadItemResponse = await this.uploadArtifact(preparedArtifact, file);
         if (!uploadItemResponse) {
             return {
-                error: { message: 'Error while uploading artifact.' },
+                error: new Error('Error while uploading artifact.'),
             };
         }
         // Confirm upload
         const confirmArtifactUploadResponse = await this.confirmArtifactUpload(preparedArtifact.artifact_id);
         if (!confirmArtifactUploadResponse) {
             return {
-                error: { message: 'Error while confirming artifact upload.' },
+                error: new Error('Error while confirming artifact upload.'),
             };
         }
         // Return the artifact information to the platform
@@ -121,12 +121,7 @@ class Uploader {
             return response.data;
         }
         catch (error) {
-            if (axios_client_1.axios.isAxiosError(error)) {
-                console.error('Error while getting artifact upload URL.', (0, logger_1.serializeAxiosError)(error));
-            }
-            else {
-                console.error('Error while getting artifact upload URL.', error);
-            }
+            console.error('Error while getting artifact upload URL.', (0, logger_1.serializeError)(error));
         }
     }
     async uploadArtifact(artifact, file) {
@@ -142,12 +137,7 @@ class Uploader {
             return response;
         }
         catch (error) {
-            if (axios_client_1.axios.isAxiosError(error)) {
-                console.error('Error while uploading artifact.', (0, logger_1.serializeAxiosError)(error));
-            }
-            else {
-                console.error('Error while uploading artifact.', error);
-            }
+            console.error('Error while uploading artifact.', (0, logger_1.serializeError)(error));
         }
     }
     async streamArtifact(artifact, fileStream) {
@@ -171,12 +161,7 @@ class Uploader {
             return response;
         }
         catch (error) {
-            if (axios_client_1.axios.isAxiosError(error)) {
-                console.error('Error while streaming artifact.', (0, logger_1.serializeAxiosError)(error));
-            }
-            else {
-                console.error('Error while streaming artifact.', error);
-            }
+            console.error('Error while streaming artifact.', (0, logger_1.serializeError)(error));
             return;
         }
     }
@@ -192,12 +177,7 @@ class Uploader {
             return response;
         }
         catch (error) {
-            if (axios_client_1.axios.isAxiosError(error)) {
-                console.error('Error while confirming artifact upload.', (0, logger_1.serializeAxiosError)(error));
-            }
-            else {
-                console.error('Error while confirming artifact upload.', error);
-            }
+            console.error('Error while confirming artifact upload.', (0, logger_1.serializeError)(error));
         }
     }
     async getAttachmentsFromArtifactId({ artifact, }) {
@@ -205,28 +185,28 @@ class Uploader {
         const artifactUrl = await this.getArtifactDownloadUrl(artifact);
         if (!artifactUrl) {
             return {
-                error: { message: 'Error while getting artifact download URL.' },
+                error: new Error('Error while getting artifact download URL.'),
             };
         }
         // Download artifact from the URL
         const gzippedJsonlObject = await this.downloadArtifact(artifactUrl);
         if (!gzippedJsonlObject) {
             return {
-                error: { message: 'Error while downloading gzipped jsonl object.' },
+                error: new Error('Error while downloading gzipped jsonl object.'),
             };
         }
         // Decompress the gzipped jsonl object
         const jsonlObject = this.decompressGzip(gzippedJsonlObject);
         if (!jsonlObject) {
             return {
-                error: { message: 'Error while decompressing gzipped jsonl object.' },
+                error: new Error('Error while decompressing gzipped jsonl object.'),
             };
         }
         // Parse the jsonl object to get the attachment metadata
         const jsonObject = this.parseJsonl(jsonlObject);
         if (!jsonObject) {
             return {
-                error: { message: 'Error while parsing jsonl object.' },
+                error: new Error('Error while parsing jsonl object.'),
             };
         }
         return { attachments: jsonObject };
@@ -244,12 +224,7 @@ class Uploader {
             return response.data.download_url;
         }
         catch (error) {
-            if (axios_client_1.axios.isAxiosError(error)) {
-                console.error('Error while getting artifact download URL.', (0, logger_1.serializeAxiosError)(error));
-            }
-            else {
-                console.error('Error while getting artifact download URL.', error);
-            }
+            console.error('Error while getting artifact download URL.', (0, logger_1.serializeError)(error));
         }
     }
     async downloadArtifact(artifactUrl) {
@@ -260,12 +235,7 @@ class Uploader {
             return response.data;
         }
         catch (error) {
-            if (axios_client_1.axios.isAxiosError(error)) {
-                console.error('Error while downloading artifact from URL.', (0, logger_1.serializeAxiosError)(error));
-            }
-            else {
-                console.error('Error while downloading artifact from URL.', error);
-            }
+            console.error('Error while downloading artifact from URL.', (0, logger_1.serializeError)(error));
         }
     }
     compressGzip(jsonlObject) {

package/dist/uploader/uploader.test.js

@@ -56,16 +56,17 @@ describe('Uploader Class Tests', () => {
         });
     });
     it('should handle failure in getArtifactUploadUrl', async () => {
+        var _a;
         // Mock unsuccessful response for getArtifactUploadUrl
         axios_client_1.axiosClient.get.mockResolvedValueOnce(undefined);
         const entity = 'entity';
         const fetchedObjects = [{ key: 'value' }];
         const uploadResponse = await uploader.upload(entity, fetchedObjects);
-        expect(uploadResponse).toEqual({
-            error: { message: 'Error while getting artifact upload URL.' },
-        });
+        expect(uploadResponse.error).toBeInstanceOf(Error);
+        expect((_a = uploadResponse.error) === null || _a === void 0 ? void 0 : _a.message).toBe('Error while getting artifact upload URL.');
     });
     it('should handle failure in uploadArtifact', async () => {
+        var _a;
         // Mock successful response for getArtifactUploadUrl
         axios_client_1.axiosClient.get.mockResolvedValueOnce(getArtifactUploadUrlMockResponse);
         // Mock unsuccessful response for uploadArtifact
@@ -73,11 +74,11 @@ describe('Uploader Class Tests', () => {
         const entity = 'entity';
         const fetchedObjects = [{ key: 'value' }];
         const uploadResponse = await uploader.upload(entity, fetchedObjects);
-        expect(uploadResponse).toEqual({
-            error: { message: 'Error while uploading artifact.' },
-        });
+        expect(uploadResponse.error).toBeInstanceOf(Error);
+        expect((_a = uploadResponse.error) === null || _a === void 0 ? void 0 : _a.message).toBe('Error while uploading artifact.');
     });
     it('should handle failure in confirmArtifactUpload', async () => {
+        var _a;
         // Mock successful response for getArtifactUploadUrl
         axios_client_1.axiosClient.get.mockResolvedValueOnce(getArtifactUploadUrlMockResponse);
         // Mock successful response from uploadArtifact
@@ -87,8 +88,7 @@ describe('Uploader Class Tests', () => {
         const entity = 'entity';
         const fetchedObjects = [{ key: 'value' }];
         const uploadResponse = await uploader.upload(entity, fetchedObjects);
-        expect(uploadResponse).toEqual({
-            error: { message: 'Error while confirming artifact upload.' },
-        });
+        expect(uploadResponse.error).toBeInstanceOf(Error);
+        expect((_a = uploadResponse.error) === null || _a === void 0 ? void 0 : _a.message).toBe('Error while confirming artifact upload.');
     });
 });

package/dist/workers/spawn.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Spawn = void 0;
 exports.spawn = spawn;
-const axios_1 = __importDefault(require("axios"));
 const helpers_1 = require("yargs/helpers");
 const yargs_1 = __importDefault(require("yargs"));
 const extraction_1 = require("../types/extraction");
@@ -124,12 +123,7 @@ async function spawn({ event, initialState, workerPath, initialDomainMapping, op
             });
         }
         catch (error) {
-            if (axios_1.default.isAxiosError(error)) {
-                console.error('Error while emitting event', (0, logger_1.serializeAxiosError)(error));
-            }
-            else {
-                console.error('Error while emitting event', error);
-            }
+            console.error('Error while emitting event.', (0, logger_1.serializeError)(error));
         }
     }
 }
@@ -217,12 +211,7 @@ class Spawn {
             this.resolve();
         }
         catch (error) {
-            if (axios_1.default.isAxiosError(error)) {
-                console.error('Error while emitting event', (0, logger_1.serializeAxiosError)(error));
-            }
-            else {
-                console.error('Error while emitting event', error);
-            }
+            console.error('Error while emitting event.', (0, logger_1.serializeError)(error));
         }
     }
 }

package/dist/workers/worker-adapter.js

@@ -92,7 +92,7 @@ class WorkerAdapter {
             }
             // Loop through the batches of attachments
             for (let i = lastProcessedBatchIndex; i < reducedAttachments.length; i++) {
-                // Check if we hit timeout 
+                // Check if we hit timeout
                 if (adapter.isTimeout) {
                     await (0, helpers_2.sleep)(constants_1.DEFAULT_SLEEP_DELAY_MS);
                 }
@@ -263,12 +263,7 @@ class WorkerAdapter {
             node_worker_threads_1.parentPort === null || node_worker_threads_1.parentPort === void 0 ? void 0 : node_worker_threads_1.parentPort.postMessage(message);
         }
         catch (error) {
-            if (axios_client_1.axios.isAxiosError(error)) {
-                console.error(`Error while emitting event with event type: ${newEventType}`, (0, logger_1.serializeAxiosError)(error));
-            }
-            else {
-                console.error(`Unknown error while emitting event with event type: ${newEventType}`, 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);
         }
     }
@@ -487,22 +482,12 @@ class WorkerAdapter {
                         });
                     }
                     catch (error) {
-                        if (axios_client_1.axios.isAxiosError(error)) {
-                            console.warn('Failed to update sync mapper record', (0, logger_1.serializeAxiosError)(error));
-                            return {
-                                error: {
-                                    message: error.message,
-                                },
-                            };
-                        }
-                        else {
-                            console.warn('Failed to update sync mapper record', error);
-                            return {
-                                error: {
-                                    message: 'Failed to update sync mapper record' + error,
-                                },
-                            };
-                        }
+                        console.warn('Failed to update sync mapper record.', (0, logger_1.serializeError)(error));
+                        return {
+                            error: {
+                                message: 'Failed to update sync mapper record' + (0, logger_1.serializeError)(error),
+                            },
+                        };
                     }
                 }
                 return {
@@ -557,18 +542,11 @@ class WorkerAdapter {
                             };
                         }
                         catch (error) {
-                            if (axios_client_1.axios.isAxiosError(error)) {
-                                console.warn('Failed to create sync mapper record', (0, logger_1.serializeAxiosError)(error));
-                                return {
-                                    error: {
-                                        message: error.message,
-                                    },
-                                };
-                            }
-                            console.warn('Failed to create sync mapper record', error);
+                            console.warn('Failed to create sync mapper record.', (0, logger_1.serializeError)(error));
                             return {
                                 error: {
-                                    message: 'Failed to create sync mapper record' + error,
+                                    message: 'Failed to create sync mapper record. ' +
+                                        (0, logger_1.serializeError)(error),
                                 },
                             };
                         }
@@ -581,7 +559,7 @@ class WorkerAdapter {
                         };
                     }
                     else {
-                        console.warn('Failed to create item in external system', error);
+                        console.warn('Failed to create item in external system.', (0, logger_1.serializeError)(error));
                         return {
                             report: {
                                 item_type: itemTypeToLoad.itemType,
@@ -591,7 +569,7 @@ class WorkerAdapter {
                     }
                 }
                 else {
-                    console.warn('Failed to get sync mapper record', (0, logger_1.serializeAxiosError)(error));
+                    console.warn('Failed to get sync mapper record.', (0, logger_1.serializeError)(error));
                     return {
                         error: {
                             message: error.message,
@@ -599,10 +577,10 @@ class WorkerAdapter {
                     };
                 }
             }
-            console.warn('Failed to get sync mapper record', error);
+            console.warn('Failed to get sync mapper record.', (0, logger_1.serializeError)(error));
             return {
                 error: {
-                    message: 'Failed to get sync mapper record' + error,
+                    message: 'Failed to get sync mapper record. ' + (0, logger_1.serializeError)(error),
                 },
             };
         }

package/package.json

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