@devrev/ts-adaas 1.0.0 → 1.0.2

package/README.md

@@ -2,6 +2,10 @@
 
 ## Release Notes
 
+#### v1.0.1
+
+- Bug fixes and improvements in logging.
+
 #### v1.0.0
 
 - Allow extractions to use full lambda runtime and gracefully handle execution context timeout.

package/dist/common/control-protocol.js

@@ -15,7 +15,7 @@ const emit = async ({ event, eventType, data, }) => {
         event_data: Object.assign({}, data),
     };
     return new Promise(async (resolve, reject) => {
-        console.info('Emitting event', newEvent);
+        console.info('Emitting event', JSON.stringify(newEvent));
         try {
             await axios_1.default.post(event.payload.event_context.callback_url, Object.assign({}, newEvent), {
                 headers: {
@@ -34,7 +34,7 @@ const emit = async ({ event, eventType, data, }) => {
                 // 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(error);
+            reject();
         }
     });
 };

package/dist/index.d.ts

@@ -8,3 +8,4 @@ export { WorkerAdapter } from './workers/worker-adapter';
 export { processTask } from './workers/process-task';
 export { spawn } from './workers/spawn';
 export * from './types/workers';
+export { formatAxiosError } from './logger/logger';

package/dist/index.js

@@ -14,7 +14,7 @@ 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 });
-exports.spawn = exports.processTask = exports.WorkerAdapter = void 0;
+exports.formatAxiosError = exports.spawn = exports.processTask = exports.WorkerAdapter = void 0;
 __exportStar(require("./deprecated/adapter"), exports);
 __exportStar(require("./deprecated/demo-extractor"), exports);
 __exportStar(require("./deprecated/uploader"), exports);
@@ -28,3 +28,5 @@ Object.defineProperty(exports, "processTask", { enumerable: true, get: function
 var spawn_1 = require("./workers/spawn");
 Object.defineProperty(exports, "spawn", { enumerable: true, get: function () { return spawn_1.spawn; } });
 __exportStar(require("./types/workers"), exports);
+var logger_1 = require("./logger/logger");
+Object.defineProperty(exports, "formatAxiosError", { enumerable: true, get: function () { return logger_1.formatAxiosError; } });

package/dist/logger/logger.d.ts

@@ -1,9 +1,10 @@
 import { Console } from 'node:console';
-import { LogLevel, PrintableState } from './logger.interfaces';
-import { AirdropEvent } from '../types';
+import { LoggerFactoryInterface, LogLevel, PrintableState } from './logger.interfaces';
 import { AxiosError } from 'axios';
 export declare class Logger extends Console {
-    constructor(event: AirdropEvent);
+    private event;
+    private options?;
+    constructor({ event, options }: LoggerFactoryInterface);
     logFn(args: unknown[], level: LogLevel): void;
     log(...args: unknown[]): void;
     info(...args: unknown[]): void;

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

@@ -1,3 +1,9 @@
+import { AirdropEvent } from '../types/extraction';
+import { WorkerAdapterOptions } from '../types/workers';
+export interface LoggerFactoryInterface {
+    event: AirdropEvent;
+    options?: WorkerAdapterOptions;
+}
 export declare enum LogLevel {
     INFO = "info",
     WARN = "warn",

package/dist/logger/logger.js

@@ -6,23 +6,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = void 0;
 exports.getPrintableState = getPrintableState;
 exports.formatAxiosError = formatAxiosError;
-/* eslint-disable @typescript-eslint/no-explicit-any */
 const lambda_log_1 = __importDefault(require("lambda-log"));
 const node_console_1 = require("node:console");
 const logger_interfaces_1 = require("./logger.interfaces");
 const node_worker_threads_1 = require("node:worker_threads");
 const workers_1 = require("../types/workers");
 class Logger extends node_console_1.Console {
-    constructor(event) {
+    constructor({ event, options }) {
         super(process.stdout, process.stderr);
+        this.event = event;
+        this.options = options;
         lambda_log_1.default.options.levelKey = null;
         lambda_log_1.default.options.tagsKey = null;
         lambda_log_1.default.options.messageKey = 'message';
         lambda_log_1.default.options.meta = Object.assign({}, event.payload.event_context);
     }
     logFn(args, level) {
+        var _a;
         if (node_worker_threads_1.isMainThread) {
-            lambda_log_1.default.log(level, JSON.stringify(args));
+            if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.isLocalDevelopment) {
+                console[level](...args);
+            }
+            else {
+                lambda_log_1.default.log(level, JSON.stringify(args));
+            }
         }
         else {
             node_worker_threads_1.parentPort === null || node_worker_threads_1.parentPort === void 0 ? void 0 : node_worker_threads_1.parentPort.postMessage({
@@ -77,7 +84,7 @@ function getPrintableState(state) {
     return processValue(state);
 }
 function formatAxiosError(error) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (error.response) {
         return {
             status: error.response.status,
@@ -85,6 +92,7 @@ function formatAxiosError(error) {
             method: (_a = error.config) === null || _a === void 0 ? void 0 : _a.method,
             baseURL: (_b = error.config) === null || _b === void 0 ? void 0 : _b.baseURL,
             url: (_c = error.config) === null || _c === void 0 ? void 0 : _c.url,
+            payload: (_d = error.config) === null || _d === void 0 ? void 0 : _d.data,
         };
     }
     return error;

package/dist/tests/test-helpers.js

@@ -37,8 +37,6 @@ function createEvent({ eventType, externalSyncUnits = [], progress, error, delay
                 progress,
                 error,
                 delay,
-            }, extractor_state: {
-                test_extractor_state_key: 'test_extractor_state_value',
             } }, payloadOverrides),
         execution_metadata: {
             devrev_endpoint: 'test_devrev_endpoint',

package/dist/types/common.d.ts

@@ -28,7 +28,6 @@ export interface LogRecord {
  */
 export interface AdapterUpdateParams {
     artifact?: Artifact;
-    extractor_state?: object;
 }
 /**
  * InitialDomainMapping is an interface that defines the structure of the initial domain mapping.

package/dist/types/extraction.d.ts

@@ -147,7 +147,6 @@ export interface AirdropMessage {
     event_context: EventContextIn;
     event_type: EventType;
     event_data?: EventData;
-    extractor_state?: any;
 }
 /**
  * ExtractorEvent is an interface that defines the structure of the event that is sent from the external extractor to ADaaS.
@@ -156,6 +155,5 @@ export interface AirdropMessage {
 export interface ExtractorEvent {
     event_type: string;
     event_context: EventContextOut;
-    extractor_state?: string;
     event_data?: EventData;
 }

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, } from './extraction';
-export { NormalizedItem, NormalizedAttachment } from '../repo/repo.interfaces';
+export { NormalizedItem, NormalizedAttachment, RepoInterface, } from '../repo/repo.interfaces';
 export { AdapterState } from '../state/state.interfaces';
 export { Artifact, ArtifactsPrepareResponse, UploadResponse, StreamResponse, StreamAttachmentsResponse, SsorAttachment, } from '../uploader/uploader.interfaces';

package/dist/types/workers.d.ts

@@ -16,7 +16,7 @@ export interface WorkerAdapterInterface<ConnectorState> {
     event: AirdropEvent;
     adapterState: State<ConnectorState>;
     parentPort: MessagePort;
-    options: WorkerAdapterOptions;
+    options?: WorkerAdapterOptions;
 }
 /**
  * WorkerAdapterOptions represents the options for WorkerAdapter class.
@@ -40,7 +40,7 @@ export type SpawnResolve = (value: boolean | PromiseLike<boolean>) => void;
 export interface SpawnInterface {
     event: AirdropEvent;
     worker: Worker;
-    options: WorkerAdapterOptions | null;
+    options?: WorkerAdapterOptions;
     resolve: SpawnResolve;
 }
 /**
@@ -139,4 +139,5 @@ export interface WorkerData<ConnectorState> {
 export interface GetWorkerPathInterface {
     event: AirdropEvent;
     connectorWorkerPath?: string | null;
+    options?: WorkerAdapterOptions;
 }

package/dist/workers/create-worker.js

@@ -7,14 +7,17 @@ const logger_1 = require("../logger/logger");
 async function createWorker(workerData) {
     return new Promise((resolve, reject) => {
         if (node_worker_threads_1.isMainThread) {
-            const logger = new logger_1.Logger(workerData.event);
+            const logger = new logger_1.Logger({
+                event: workerData.event,
+                options: workerData.options,
+            });
             const workerFile = __dirname + '/worker.js';
             const worker = new node_worker_threads_1.Worker(workerFile, {
                 workerData,
             });
-            worker.on(workers_1.WorkerEvent.WorkerError, (error) => {
-                logger.error('Worker error', error);
-                reject(error);
+            worker.on(workers_1.WorkerEvent.WorkerError, () => {
+                logger.error('Worker error');
+                reject();
             });
             worker.on(workers_1.WorkerEvent.WorkerOnline, () => {
                 resolve(worker);

package/dist/workers/process-task.js

@@ -12,7 +12,7 @@ function processTask({ task, onTimeout, }) {
             const event = node_worker_threads_1.workerData.event;
             const initialState = node_worker_threads_1.workerData.initialState;
             const options = node_worker_threads_1.workerData.options;
-            console = new logger_1.Logger(event);
+            console = new logger_1.Logger({ event, options });
             const adapterState = await (0, state_1.createAdapterState)({
                 event,
                 initialState,

package/dist/workers/spawn.js

@@ -9,8 +9,8 @@ const logger_1 = require("../logger/logger");
 const constants_1 = require("../common/constants");
 const workers_1 = require("../types/workers");
 const create_worker_1 = require("./create-worker");
-function getWorkerPath({ event, connectorWorkerPath, }) {
-    const logger = new logger_1.Logger(event);
+function getWorkerPath({ event, connectorWorkerPath, options, }) {
+    const logger = new logger_1.Logger({ event, options });
     if (!constants_1.ALLOWED_EVENT_TYPES.includes(event.payload.event_type)) {
         return null;
     }
@@ -58,10 +58,11 @@ function getWorkerPath({ event, connectorWorkerPath, }) {
  * @returns {Promise<Spawn>} - A new instance of Spawn class
  */
 async function spawn({ event, initialState, workerPath, options, }) {
-    const logger = new logger_1.Logger(event);
+    const logger = new logger_1.Logger({ event, options });
     const script = getWorkerPath({
         event,
         connectorWorkerPath: workerPath,
+        options,
     });
     if (script) {
         try {
@@ -75,7 +76,7 @@ async function spawn({ event, initialState, workerPath, options, }) {
                 new Spawn({
                     event,
                     worker,
-                    options: options || null,
+                    options,
                     resolve,
                 });
             });
@@ -109,14 +110,14 @@ class Spawn {
                 await this.exitFromMainThread();
             }
         }, this.lambdaTimeout);
-        this.logger = new logger_1.Logger(event);
+        this.logger = new logger_1.Logger({ event, options });
         this.worker = worker;
         worker.on(workers_1.WorkerEvent.WorkerExit, async (code) => {
             this.logger.info('Worker exited with exit code: ' + code + '.');
             if (this.timer) {
                 clearTimeout(this.timer);
-                await this.exitFromMainThread();
             }
+            await this.exitFromMainThread();
         });
         worker.on(workers_1.WorkerEvent.WorkerMessage, async (message) => {
             if ((message === null || message === void 0 ? void 0 : message.subject) === workers_1.WorkerMessageSubject.WorkerMessageEmitted) {
@@ -140,6 +141,7 @@ class Spawn {
     }
     async exitFromMainThread() {
         if (this.hasWorkerEmitted) {
+            this.resolve(true);
             return;
         }
         const timeoutEventType = (0, helpers_1.getErrorExtractorEventType)(this.event.payload.event_type);

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

@@ -21,7 +21,7 @@ export declare function createWorkerAdapter<ConnectorState>({ event, adapterStat
  */
 export declare class WorkerAdapter<ConnectorState> {
     readonly event: AirdropEvent;
-    readonly options: WorkerAdapterOptions;
+    readonly options?: WorkerAdapterOptions;
     private adapterState;
     private _artifacts;
     private hasWorkerEmitted;

package/package.json

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