@devrev/ts-adaas 1.2.0-beta.1 → 1.2.2

package/README.md

@@ -2,6 +2,19 @@
 
 ## Release Notes
 
+### v1.2.2
+
+- Add library version as a part of control protocol.
+- Improve axios client and adapter logging.
+- Fix bugs related to state handling.
+
+### v1.2.1
+
+- Reduced the `delayFactor` to minimize unnecessary delays.
+- Correct the setting of the `lastSyncStarted` timestamp.
+- Improve logging for attachment extraction and loading.
+- Fix several bugs related to the control protocol.
+
 ### v1.2.0
 
 - Add support for loading attachments from DevRev to external system.
@@ -85,6 +98,8 @@
 
 # Overview
 
+[![Coverage Status](https://coveralls.io/repos/github/devrev/adaas-sdk/badge.svg?branch=main&t=s4Otlm)](https://coveralls.io/github/devrev/adaas-sdk?branch=main)
+
 The ADaaS (Airdrop-as-a-Service) Library for TypeScript helps developers build Snap-ins that integrate with DevRev’s ADaaS platform. This library simplifies the workflow for handling data extraction and loading, event-driven actions, state management, and artifact handling.
 
 It provides features such as:
@@ -359,7 +374,7 @@ This phase is defined in `load-attachments.ts` and is responsible for loading th
 Loading is done by providing the create function to create attachments in the external system.
 
 ```typescript
-  processTask({
+processTask({
   task: async ({ adapter }) => {
     const { reports, processed_files } = await adapter.loadAttachments({
       create,
@@ -378,7 +393,6 @@ Loading is done by providing the create function to create attachments in the ex
     });
   },
 });
-
 ```
 
 The loading function `create` provides loading to the external system, to make API calls to the external system to create the attachments and handle errors and external system's rate limiting.

package/dist/common/control-protocol.d.ts

@@ -1,3 +1,4 @@
+import { AxiosResponse } from 'axios';
 import { AirdropEvent, EventData, ExtractorEventType } from '../types/extraction';
 import { LoaderEventType } from '../types/loading';
 export interface EmitInterface {
@@ -5,4 +6,4 @@ export interface EmitInterface {
     eventType: ExtractorEventType | LoaderEventType;
     data?: EventData;
 }
-export declare const emit: ({ event, eventType, data, }: EmitInterface) => Promise<void | Error>;
+export declare const emit: ({ event, eventType, data, }: EmitInterface) => Promise<AxiosResponse>;

package/dist/common/control-protocol.js

@@ -2,35 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.emit = void 0;
 const axios_client_1 = require("../http/axios-client");
-const logger_1 = require("../logger/logger");
+const helpers_1 = require("./helpers");
 const emit = async ({ event, eventType, data, }) => {
     const newEvent = {
         event_type: eventType,
         event_context: event.payload.event_context,
         event_data: Object.assign({}, data),
+        worker_metadata: {
+            adaas_library_version: (0, helpers_1.getLibraryVersion)(),
+        },
     };
-    return new Promise(async (resolve, reject) => {
-        console.info('Emitting event', JSON.stringify(newEvent));
-        try {
-            await axios_client_1.axiosClient.post(event.payload.event_context.callback_url, Object.assign({}, newEvent), {
-                headers: {
-                    Accept: 'application/json, text/plain, */*',
-                    Authorization: event.context.secrets.service_account_token,
-                    'Content-Type': 'application/json',
-                },
-            });
-            resolve();
-        }
-        catch (error) {
-            if (axios_client_1.axios.isAxiosError(error)) {
-                console.error(`Failed to emit event with event type ${eventType}.`, (0, logger_1.serializeAxiosError)(error));
-            }
-            else {
-                // TODO: Stop it through UI or think about retrying this request. Implement exponential retry mechanism.
-                console.error(`Failed to emit event with event type ${eventType}.`, error);
-            }
-            reject();
-        }
+    console.info('Emitting event', JSON.stringify(newEvent));
+    return axios_client_1.axiosClient.post(event.payload.event_context.callback_url, Object.assign({}, newEvent), {
+        headers: {
+            Accept: 'application/json, text/plain, */*',
+            Authorization: event.context.secrets.service_account_token,
+            'Content-Type': 'application/json',
+        },
     });
 };
 exports.emit = emit;

package/dist/common/helpers.d.ts

@@ -15,3 +15,4 @@ export declare function addReportToLoaderReport({ loaderReports, report, }: {
     report: LoaderReport;
 }): LoaderReport[];
 export declare function getCircularReplacer(): (key: any, value: any) => any;
+export declare function getLibraryVersion(): any;

package/dist/common/helpers.js

@@ -1,12 +1,48 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTimeoutErrorEventType = getTimeoutErrorEventType;
 exports.getSyncDirection = getSyncDirection;
 exports.getFilesToLoad = getFilesToLoad;
 exports.addReportToLoaderReport = addReportToLoaderReport;
 exports.getCircularReplacer = getCircularReplacer;
+exports.getLibraryVersion = getLibraryVersion;
 const extraction_1 = require("../types/extraction");
 const loading_1 = require("../types/loading");
+const fs_1 = require("fs");
+const path = __importStar(require("path"));
 function getTimeoutErrorEventType(eventType) {
     switch (eventType) {
         case extraction_1.EventType.ExtractionMetadataStart:
@@ -120,3 +156,14 @@ function getCircularReplacer() {
         return value;
     };
 }
+// read adaas library version from package.json
+function getLibraryVersion() {
+    var _a;
+    try {
+        return (_a = JSON.parse((0, fs_1.readFileSync)(path.resolve(__dirname, '../../package.json'), 'utf8'))) === null || _a === void 0 ? void 0 : _a.version;
+    }
+    catch (error) {
+        console.error('Error reading adaas library version from package.json', error);
+        return '';
+    }
+}

package/dist/{http → deprecated/http}/client.d.ts

@@ -1,5 +1,5 @@
 import { RawAxiosRequestHeaders } from 'axios';
-import { HTTPResponse } from './types';
+import { HTTPResponse } from '../../http/types';
 export declare const defaultResponse: HTTPResponse;
 /**
  * HTTPClient class to make HTTP requests

package/dist/{http → deprecated/http}/client.js

@@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTTPClient = exports.defaultResponse = void 0;
 const axios_1 = __importStar(require("axios"));
-const constants_1 = require("./constants");
+const constants_1 = require("../../http/constants");
 exports.defaultResponse = {
     data: {
         delay: 0,

package/dist/http/axios-client.js

@@ -12,30 +12,22 @@ exports.axiosClient = axiosClient;
 (0, axios_retry_1.default)(axiosClient, {
     retries: 5,
     retryDelay: (retryCount, error) => {
-        var _a;
-        console.warn('Retry attempt: ' + retryCount + 'to url: ' + ((_a = error.config) === null || _a === void 0 ? void 0 : _a.url) + '.');
-        // Exponential backoff algorithm: 1 * 2 ^ retryCount * 5000ms
-        return axios_retry_1.default.exponentialDelay(retryCount, error, 5000);
+        var _a, _b, _c;
+        // exponential backoff algorithm: 1 * 2 ^ retryCount * 1000ms
+        const delay = axios_retry_1.default.exponentialDelay(retryCount, error, 1000);
+        console.warn(`Request to ${(_a = error.config) === null || _a === void 0 ? void 0 : _a.url} failed with response status code ${(_b = error.response) === null || _b === void 0 ? void 0 : _b.status}. Method ${(_c = error.config) === null || _c === void 0 ? void 0 : _c.method}. Retry count: ${retryCount}. Retrying in ${Math.round(delay / 1000)}s.`);
+        return delay;
     },
     retryCondition: (error) => {
-        var _a, _b, _c, _d;
-        if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) &&
-            ((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) >= 500 &&
-            ((_c = error.response) === null || _c === void 0 ? void 0 : _c.status) <= 599) {
-            return true;
-        }
-        else if (((_d = error.response) === null || _d === void 0 ? void 0 : _d.status) === 429) {
-            console.log('Rate limit exceeded. Delay: ' + error.response.headers['retry-after']);
-            return false;
-        }
-        else {
-            return false;
-        }
-    },
-    onMaxRetryTimesExceeded(error, retryCount) {
         var _a;
-        console.log(`Max retries attempted: ${retryCount}`);
-        (_a = error.config) === null || _a === void 0 ? true : delete _a.headers.Authorization;
+        return (axios_retry_1.default.isNetworkOrIdempotentRequestError(error) &&
+            ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) !== 429);
+    },
+    onMaxRetryTimesExceeded(error) {
+        var _a, _b, _c, _d;
+        (_b = (_a = error.config) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? true : delete _b.authorization;
+        (_d = (_c = error.config) === null || _c === void 0 ? void 0 : _c.headers) === null || _d === void 0 ? true : delete _d.Authorization;
         delete error.request._header;
+        console.warn('Max retry times exceeded. Error', error);
     },
 });

package/dist/http/index.d.ts

@@ -1,3 +1,2 @@
-export * from './client';
 export * from './types';
 export * from './axios-client';

package/dist/http/index.js

@@ -14,6 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./client"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./axios-client"), exports);

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export * from './deprecated/adapter';
 export * from './deprecated/demo-extractor';
 export * from './deprecated/uploader';
+export * from './deprecated/http/client';
 export * from './types';
 export * from './http';
 export * from './common/install-initial-domain-mapping';

package/dist/index.js

@@ -18,6 +18,7 @@ exports.serializeAxiosError = exports.formatAxiosError = exports.spawn = exports
 __exportStar(require("./deprecated/adapter"), exports);
 __exportStar(require("./deprecated/demo-extractor"), exports);
 __exportStar(require("./deprecated/uploader"), exports);
+__exportStar(require("./deprecated/http/client"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./http"), exports);
 __exportStar(require("./common/install-initial-domain-mapping"), exports);

package/dist/repo/repo.interfaces.d.ts

@@ -36,7 +36,7 @@ export interface NormalizedAttachment {
     file_name: string;
     author_id: string;
     parent_id: string;
-    inline?: boolean;
+    grand_parent_id?: number;
 }
 /**
  * Item is an interface that defines the structure of an item.

package/dist/repo/repo.js

@@ -36,6 +36,10 @@ class Repo {
     }
     async push(items) {
         let recordsToPush;
+        if (!items || items.length === 0) {
+            console.log(`No items to push for type ${this.itemType}. Skipping push.`);
+            return true;
+        }
         // Normalize items if needed
         if (this.normalize &&
             this.itemType != constants_1.AIRDROP_DEFAULT_ITEM_TYPES.EXTERNAL_DOMAIN_METADATA &&
@@ -47,7 +51,6 @@ class Repo {
         }
         // Add the new records to the items array
         this.items.push(...recordsToPush);
-        console.info(`Extracted ${recordsToPush.length} new items of type ${this.itemType}. Total number of items in repo: ${this.items.length}.`);
         // Upload in batches while the number of items exceeds the batch size
         while (this.items.length >= constants_1.ARTIFACT_BATCH_SIZE) {
             // Slice out a batch of ARTIFACT_BATCH_SIZE items to upload

package/dist/state/state.js

@@ -16,6 +16,11 @@ async function createAdapterState({ event, initialState, options, }) {
     });
     if (!constants_1.STATELESS_EVENT_TYPES.includes(event.payload.event_type)) {
         await as.fetchState(newInitialState);
+        if (event.payload.event_type === extraction_1.EventType.ExtractionDataStart &&
+            !as.state.lastSyncStarted) {
+            as.state.lastSyncStarted = new Date().toISOString();
+            console.log(`Setting lastSyncStarted to ${as.state.lastSyncStarted}.`);
+        }
     }
     return as;
 }
@@ -29,7 +34,7 @@ class State {
                     },
                 }
                 : {
-                    lastSyncStarted: new Date().toISOString(),
+                    lastSyncStarted: '',
                     lastSuccessfulSyncStarted: '',
                     toDevRev: {
                         attachmentsMetadata: {
@@ -68,15 +73,16 @@ class State {
                 },
             });
             this.state = state || this.state;
-            console.log('State updated successfully to:', (0, logger_1.getPrintableState)(this.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));
+                console.error('Failed to update state', (0, logger_1.serializeAxiosError)(error));
             }
             else {
-                console.error('Failed to update state.', error);
+                console.error('Failed to update state', error);
             }
+            process.exit(1);
         }
     }
     /**
@@ -100,20 +106,20 @@ class State {
                 },
             });
             this.state = JSON.parse(response.data.state);
-            console.log('State fetched successfully. Current state:', (0, logger_1.getPrintableState)(this.state));
+            console.log('State fetched successfully. Current state', (0, logger_1.getPrintableState)(this.state));
             return this.state;
         }
         catch (error) {
             if (axios_client_1.axios.isAxiosError(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 404) {
                 const state = Object.assign(Object.assign({}, initialState), this.initialSdkState);
                 this.state = state;
-                console.log('State not found, returning initial state. Current state:', (0, logger_1.getPrintableState)(this.state));
+                console.log('State not found, returning initial state. Current state', (0, logger_1.getPrintableState)(this.state));
                 await this.postState(this.state);
                 return this.state;
             }
             else {
                 console.error('Failed to fetch state.', error);
-                return { message: 'Failed to fetch state.' };
+                process.exit(1);
             }
         }
     }

package/dist/types/extraction.d.ts

@@ -2,8 +2,9 @@ import { InputData } from '@devrev/typescript-sdk/dist/snap-ins';
 import { Artifact } from '../uploader/uploader.interfaces';
 import { ErrorRecord } from './common';
 import { DonV2, LoaderReport, RateLimited } from './loading';
-import { NormalizedAttachment } from 'repo/repo.interfaces';
+import { NormalizedAttachment } from '../repo/repo.interfaces';
 import { AxiosResponse } from 'axios';
+import { WorkerAdapter } from '../workers/worker-adapter';
 /**
  * EventType is an enum that defines the different types of events that can be sent to the external extractor from ADaaS.
  * The external extractor can use these events to know what to do next in the extraction process.
@@ -164,6 +165,12 @@ export interface EventData {
     processed_files?: string[];
     stats_file?: string;
 }
+/**
+ * WorkerMetadata is an interface that defines the structure of the worker metadata that is sent from the external extractor to ADaaS.
+ */
+export interface WorkerMetadata {
+    adaas_library_version: string;
+}
 /**
  * DomainObject is an interface that defines the structure of a domain object that can be extracted.
  * It must contain a name, a next chunk ID, the pages, the last modified date, whether it is done, and the count.
@@ -213,6 +220,7 @@ export interface ExtractorEvent {
     event_type: string;
     event_context: EventContext;
     event_data?: EventData;
+    worker_metadata?: WorkerMetadata;
 }
 /**
  * LoaderEvent
@@ -221,6 +229,7 @@ export interface LoaderEvent {
     event_type: string;
     event_context: EventContext;
     event_data?: EventData;
+    worker_metadata?: WorkerMetadata;
 }
 export type ExternalSystemAttachmentStreamingFunction = ({ item, event, }: ExternalSystemAttachmentStreamingParams) => Promise<ExternalSystemAttachmentStreamingResponse>;
 export interface ExternalSystemAttachmentStreamingParams {
@@ -237,3 +246,30 @@ export interface StreamAttachmentsResponse {
     report?: LoaderReport;
     rateLimit?: RateLimited;
 }
+export type ProcessAttachmentReturnType = {
+    delay?: number;
+    error?: {
+        message: string;
+    };
+} | undefined;
+export type StreamAttachmentsReturnType = {
+    delay?: number;
+    error?: ErrorRecord;
+} | undefined;
+export type ExternalSystemAttachmentReducerFunction<Batch, NewBatch, ConnectorState> = ({ attachments, adapter, }: {
+    attachments: Batch;
+    adapter: WorkerAdapter<ConnectorState>;
+}) => NewBatch;
+export type ExternalProcessAttachmentFunction = ({ attachment, stream, }: {
+    attachment: NormalizedAttachment;
+    stream: ExternalSystemAttachmentStreamingFunction;
+}) => Promise<ProcessAttachmentReturnType>;
+export type ExternalSystemAttachmentIteratorFunction<NewBatch, ConnectorState> = ({ reducedAttachments, adapter, stream, }: {
+    reducedAttachments: NewBatch;
+    adapter: WorkerAdapter<ConnectorState>;
+    stream: ExternalSystemAttachmentStreamingFunction;
+}) => Promise<ProcessAttachmentReturnType>;
+export interface ExternalSystemAttachmentProcessors<ConnectorState, Batch, NewBatch> {
+    reducer: ExternalSystemAttachmentReducerFunction<Batch, NewBatch, ConnectorState>;
+    iterator: ExternalSystemAttachmentIteratorFunction<NewBatch, ConnectorState>;
+}

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
 export { ErrorLevel, ErrorRecord, LogRecord, AdapterUpdateParams, InitialDomainMapping, } from './common';
-export { EventType, ExtractorEventType, ExtractionMode, ExternalSyncUnit, EventContextIn, EventContextOut, ConnectionData, EventData, DomainObjectState, AirdropEvent, AirdropMessage, ExtractorEvent, SyncMode, ExternalSystemAttachmentStreamingParams, ExternalSystemAttachmentStreamingResponse, ExternalSystemAttachmentStreamingFunction, } from './extraction';
+export { EventType, ExtractorEventType, ExtractionMode, ExternalSyncUnit, EventContextIn, EventContextOut, ConnectionData, EventData, DomainObjectState, AirdropEvent, AirdropMessage, ExtractorEvent, SyncMode, ExternalSystemAttachmentStreamingParams, ExternalSystemAttachmentStreamingResponse, ExternalSystemAttachmentStreamingFunction, ExternalProcessAttachmentFunction, ExternalSystemAttachmentReducerFunction, ExternalSystemAttachmentIteratorFunction, } from './extraction';
 export { LoaderEventType, ExternalSystemItem, ExternalSystemItemLoadingResponse, ExternalSystemItemLoadingParams, ExternalSystemAttachment, } from './loading';
 export { NormalizedItem, NormalizedAttachment, RepoInterface, } from '../repo/repo.interfaces';
 export { AdapterState } from '../state/state.interfaces';

package/dist/types/loading.d.ts

@@ -28,6 +28,8 @@ export interface ExternalSystemAttachment {
     created_date: string;
     modified_by_id: string;
     modified_date: string;
+    parent_id?: string;
+    grand_parent_id?: string;
 }
 export interface ExternalSystemItem {
     id: {

package/dist/types/workers.d.ts

@@ -1,5 +1,4 @@
 import { Worker } from 'worker_threads';
-import { MessagePort } from 'node:worker_threads';
 import { State } from '../state/state';
 import { WorkerAdapter } from '../workers/worker-adapter';
 import { ExtractorEventType, AirdropEvent } from './extraction';
@@ -10,13 +9,11 @@ import { LoaderEventType } from './loading';
  * @constructor
  * @param {AirdropEvent} event - The event object received from the platform
  * @param {object=} initialState - The initial state of the adapter
- * @param {MessagePort} parentPort - The parent port of the worker thread
  * @param {WorkerAdapterInterface} options - The options to create a new instance of WorkerAdapter class
  */
 export interface WorkerAdapterInterface<ConnectorState> {
     event: AirdropEvent;
     adapterState: State<ConnectorState>;
-    parentPort: MessagePort;
     options?: WorkerAdapterOptions;
 }
 /**
@@ -30,7 +27,6 @@ export interface WorkerAdapterOptions {
     isLocalDevelopment?: boolean;
     timeout?: number;
 }
-export type SpawnResolve = (value: boolean | PromiseLike<boolean>) => void;
 /**
  * SpawnInterface is an interface for Spawn class.
  * @interface SpawnInterface
@@ -42,7 +38,7 @@ export interface SpawnInterface {
     event: AirdropEvent;
     worker: Worker;
     options?: WorkerAdapterOptions;
-    resolve: SpawnResolve;
+    resolve: (value: void | PromiseLike<void>) => void;
 }
 /**
  * SpawnFactoryInterface is an interface for Spawn class factory.
@@ -140,5 +136,4 @@ export interface WorkerData<ConnectorState> {
 export interface GetWorkerPathInterface {
     event: AirdropEvent;
     connectorWorkerPath?: string | null;
-    options?: WorkerAdapterOptions;
 }

package/dist/uploader/uploader.js

@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Uploader = void 0;
 const fs_1 = __importStar(require("fs"));
-const axios_devrev_client_1 = require("../http/axios-devrev-client");
+const axios_client_1 = require("../http/axios-client");
 const zlib_1 = __importDefault(require("zlib"));
 const js_jsonl_1 = require("js-jsonl");
 const form_data_1 = __importDefault(require("form-data"));
@@ -67,7 +67,7 @@ class Uploader {
         if (this.isLocalDevelopment) {
             await this.downloadToLocal(itemType, fetchedObjects);
         }
-        // 1. Compress the fetched objects to a gzipped jsonl object
+        // compress the fetched objects to a gzipped jsonl object
         const file = this.compressGzip(js_jsonl_1.jsonl.stringify(fetchedObjects));
         if (!file) {
             return {
@@ -76,27 +76,27 @@ class Uploader {
         }
         const filename = itemType + '.jsonl.gz';
         const fileType = 'application/x-gzip';
-        // 2. Prepare the artifact for uploading
+        // prepare the artifact for uploading
         const preparedArtifact = await this.prepareArtifact(filename, fileType);
         if (!preparedArtifact) {
             return {
                 error: { message: 'Error while preparing artifact.' },
             };
         }
-        // 3. Upload the file to the prepared artifact
+        // upload the file to the prepared artifact
         const uploadedArtifact = await this.uploadToArtifact(preparedArtifact, file);
         if (!uploadedArtifact) {
             return {
                 error: { message: 'Error while uploading artifact.' },
             };
         }
-        // 4. Return the artifact information to the platform
+        // return the artifact information to the platform
         const artifact = {
             id: preparedArtifact.id,
             item_type: itemType,
             item_count: Array.isArray(fetchedObjects) ? fetchedObjects.length : 1,
         };
-        console.log('Successful upload of artifact: ', artifact);
+        console.log('Successful upload of artifact', artifact);
         return { artifact };
     }
     async prepareArtifact(filename, fileType) {
@@ -108,7 +108,7 @@ class Uploader {
             return response.data;
         }
         catch (error) {
-            if (axios_devrev_client_1.axios.isAxiosError(error)) {
+            if (axios_client_1.axios.isAxiosError(error)) {
                 console.error('Error while preparing artifact.', (0, logger_1.serializeAxiosError)(error));
             }
             else {
@@ -125,13 +125,13 @@ class Uploader {
         }
         formData.append('file', file);
         try {
-            const response = await axios_devrev_client_1.axiosDevRevClient.post(preparedArtifact.url, formData, {
+            const response = await axios_client_1.axiosClient.post(preparedArtifact.url, formData, {
                 headers: Object.assign({}, formData.getHeaders()),
             });
             return response;
         }
         catch (error) {
-            if (axios_devrev_client_1.axios.isAxiosError(error)) {
+            if (axios_client_1.axios.isAxiosError(error)) {
                 console.error('Error while uploading artifact.', (0, logger_1.serializeAxiosError)(error));
             }
             else {
@@ -151,7 +151,7 @@ class Uploader {
             return;
         }
         try {
-            const response = await axios_devrev_client_1.axiosDevRevClient.post(preparedArtifact.url, formData, {
+            const response = await axios_client_1.axiosClient.post(preparedArtifact.url, formData, {
                 headers: Object.assign(Object.assign({}, formData.getHeaders()), (!fileStreamResponse.headers['content-length'] && {
                     'Content-Length': constants_1.MAX_DEVREV_ARTIFACT_SIZE,
                 })),
@@ -159,7 +159,7 @@ class Uploader {
             return response;
         }
         catch (error) {
-            if (axios_devrev_client_1.axios.isAxiosError(error)) {
+            if (axios_client_1.axios.isAxiosError(error)) {
                 console.error('Error while streaming artifact.', (0, logger_1.serializeAxiosError)(error));
             }
             else {
@@ -212,13 +212,13 @@ class Uploader {
     }
     async downloadArtifact(artifactUrl) {
         try {
-            const response = await axios_devrev_client_1.axiosDevRevClient.get(artifactUrl, {
+            const response = await axios_client_1.axiosClient.get(artifactUrl, {
                 responseType: 'arraybuffer',
             });
             return response.data;
         }
         catch (error) {
-            if (axios_devrev_client_1.axios.isAxiosError(error)) {
+            if (axios_client_1.axios.isAxiosError(error)) {
                 console.error('Error while downloading artifact from URL.', (0, logger_1.serializeAxiosError)(error));
             }
             else {