@betterinternship/core 2.5.3 → 2.5.5

package/dist/lib/broker/base.task.d.ts

@@ -13,24 +13,24 @@ export declare class TaskResponse implements Pick<Task, 'result' | 'status' | 'e
     error: JsonValue;
     status: string;
 }
-type BaseTaskResponseHandler = (response: TaskResponse) => Promise<void>;
-export declare class BaseTaskInitiator<TaskRequestInputs> {
+type TaskResponseHandler = (response: TaskResponse) => Promise<void>;
+export declare class BaseTaskInitiator<TaskInputs> {
     private handlerId;
     private requestQueueId;
     private responseQueueId;
-    constructor(queueId: string, handler: BaseTaskResponseHandler);
-    init(handler: BaseTaskResponseHandler): Promise<void>;
-    sendTaskRequest(processId: string, inputs: TaskRequestInputs, options: {
+    constructor(queueId: string, handler: TaskResponseHandler);
+    init(handler: TaskResponseHandler): Promise<void>;
+    sendTaskRequest(processId: string, inputs: TaskInputs, options: {
         internalId?: string;
         parentId?: string;
         maxRetries?: number;
     }): Promise<boolean>;
 }
-type BaseTaskRequestHandler = (taskId: string) => Promise<TaskResponse>;
+type TaskRequestHandler = (task: TaskRequest) => Promise<TaskResponse>;
 export declare class BaseTaskRunner {
     private requestQueueId;
     private responseQueueId;
-    constructor(queueId: string, handler: BaseTaskRequestHandler);
+    constructor(queueId: string, handler: TaskRequestHandler);
     private init;
 }
 export {};

package/dist/lib/broker/base.task.js

@@ -60,7 +60,8 @@ export class BaseTaskRunner {
     async init(handler) {
         const brokerAPI = await BrokerAPI.instance();
         await brokerAPI.addQueueHandler(this.requestQueueId, async (taskId) => {
-            const response = await handler(taskId);
+            const task = await tasks.findFirst({ where: { id: taskId } });
+            const response = await handler(task);
             await tasks.update({
                 where: { id: taskId },
                 data: {

package/dist/lib/broker/base.task.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.task.js","sourceRoot":"","sources":["../../../lib/broker/base.task.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.task.js","sourceRoot":"","sources":["../../../lib/broker/base.task.ts"],"names":[],"mappings":"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"}

package/dist/lib/broker/broker.d.ts

@@ -1,19 +1,19 @@
-import * as amqp from 'amqplib';
-export declare const Q: (...args: string[]) => string;
-export interface RequestBody {
-    taskId: string;
-}
-export declare class BrokerAPI {
-    connection: amqp.ChannelModel;
-    channels: Record<string, amqp.Channel>;
-    private static __instance;
-    private constructor();
-    static instance(): Promise<BrokerAPI>;
-    assertQueue(queueId: string, options?: amqp.Options.AssertQueue): Promise<amqp.Replies.AssertQueue>;
-    private addToQueueWithHeaders;
-    addToQueue(queueId: string, taskId: string, options?: {
-        retries?: number;
-        maxRetries?: number;
-    }): Promise<boolean>;
-    addQueueHandler<T>(queueId: string, handler: (taskId: string, resolve: () => void, reject: () => void) => Promise<T>): Promise<void>;
-}
+import * as amqp from 'amqplib';
+export declare const Q: (...args: string[]) => string;
+export interface RequestBody {
+    taskId: string;
+}
+export declare class BrokerAPI {
+    connection: amqp.ChannelModel;
+    channels: Record<string, amqp.Channel>;
+    private static __instance;
+    private constructor();
+    static instance(): Promise<BrokerAPI>;
+    assertQueue(queueId: string, options?: amqp.Options.AssertQueue): Promise<amqp.Replies.AssertQueue>;
+    private addToQueueWithHeaders;
+    addToQueue(queueId: string, taskId: string, options?: {
+        retries?: number;
+        maxRetries?: number;
+    }): Promise<boolean>;
+    addQueueHandler<T>(queueId: string, handler: (taskId: string, resolve: () => void, reject: () => void) => Promise<T>): Promise<void>;
+}

package/dist/lib/broker/broker.js

@@ -1,89 +1,89 @@
-import * as amqp from 'amqplib';
-import { ENV } from '../env.js';
-const RABBITMQ_ENABLED = ENV.RABBITMQ_ENABLED;
-const RABBITMQ_URL = ENV.RABBITMQ_URL;
-if (!RABBITMQ_URL && RABBITMQ_ENABLED)
-    throw new Error('[ERROR:ENV] Missing RabbitMQ configuration.');
-export const Q = (...args) => {
-    if (ENV.ENVIRONMENT === 'production')
-        return args.join('.');
-    else
-        return ['dev', ...args].join('.');
-};
-export class BrokerAPI {
-    connection;
-    channels;
-    static __instance;
-    constructor() { }
-    static async instance() {
-        if (BrokerAPI.__instance || !RABBITMQ_ENABLED)
-            return BrokerAPI.__instance;
-        BrokerAPI.__instance = new BrokerAPI();
-        BrokerAPI.__instance.connection = await amqp.connect(RABBITMQ_URL);
-        BrokerAPI.__instance.channels = {
-            asserter: await BrokerAPI.__instance.connection.createChannel(),
-            reader: await BrokerAPI.__instance.connection.createChannel(),
-            writer: await BrokerAPI.__instance.connection.createChannel(),
-        };
-        return BrokerAPI.__instance;
-    }
-    async assertQueue(queueId, options) {
-        const result = await this.channels.asserter.assertQueue(queueId, {
-            durable: true,
-            ...options,
-        });
-        console.log(`[BROKER] Queue "${queueId}" has been asserted.`);
-        return result;
-    }
-    async addToQueueWithHeaders(queueId, taskId, headers, options) {
-        const bodyStr = JSON.stringify({ taskId });
-        const result = this.channels.writer.sendToQueue(queueId, Buffer.from(bodyStr), {
-            persistent: true,
-            contentType: 'application/json',
-            headers: {
-                ...headers,
-                'x-retries': options?.retries ?? 0,
-                'x-max-retries': options?.maxRetries ?? 3,
-                'x-first-published': Date.now(),
-            },
-            messageId: taskId,
-        });
-        if (result) {
-            console.log(`[BROKER] Message sent to queue "${queueId}": ${bodyStr}.`);
-        }
-        else {
-            console.log(`[BROKER] Message could not sent to queue "${queueId}": ${bodyStr}.`);
-        }
-        return Promise.resolve(result);
-    }
-    async addToQueue(queueId, taskId, options) {
-        return this.addToQueueWithHeaders(queueId, taskId, {}, options);
-    }
-    async addQueueHandler(queueId, handler) {
-        const resolve = (message) => () => {
-            this.channels.writer.ack(message);
-        };
-        const reject = (message) => () => {
-            const content = message?.content?.toString?.();
-            const request = JSON.parse(content);
-            const headers = message.properties.headers ?? {};
-            const retries = headers['x-retries'] ?? 0;
-            const maxRetries = headers['x-max-retries'] ?? 3;
-            if (retries >= maxRetries) {
-                this.channels.writer.ack(message);
-            }
-            else {
-                void this.addToQueueWithHeaders(queueId, request.taskId, headers, {
-                    retries,
-                    maxRetries,
-                }).then(() => this.channels.writer.ack(message));
-            }
-        };
-        await this.channels.reader.consume(queueId, (message) => {
-            const content = message?.content?.toString?.();
-            const request = JSON.parse(content);
-            void handler(request.taskId, resolve(message), reject(message));
-        });
-    }
-}
+import * as amqp from 'amqplib';
+import { ENV } from '../env.js';
+const RABBITMQ_ENABLED = ENV.RABBITMQ_ENABLED;
+const RABBITMQ_URL = ENV.RABBITMQ_URL;
+if (!RABBITMQ_URL && RABBITMQ_ENABLED)
+    throw new Error('[ERROR:ENV] Missing RabbitMQ configuration.');
+export const Q = (...args) => {
+    if (ENV.ENVIRONMENT === 'production')
+        return args.join('.');
+    else
+        return ['dev', ...args].join('.');
+};
+export class BrokerAPI {
+    connection;
+    channels;
+    static __instance;
+    constructor() { }
+    static async instance() {
+        if (BrokerAPI.__instance || !RABBITMQ_ENABLED)
+            return BrokerAPI.__instance;
+        BrokerAPI.__instance = new BrokerAPI();
+        BrokerAPI.__instance.connection = await amqp.connect(RABBITMQ_URL);
+        BrokerAPI.__instance.channels = {
+            asserter: await BrokerAPI.__instance.connection.createChannel(),
+            reader: await BrokerAPI.__instance.connection.createChannel(),
+            writer: await BrokerAPI.__instance.connection.createChannel(),
+        };
+        return BrokerAPI.__instance;
+    }
+    async assertQueue(queueId, options) {
+        const result = await this.channels.asserter.assertQueue(queueId, {
+            durable: true,
+            ...options,
+        });
+        console.log(`[BROKER] Queue "${queueId}" has been asserted.`);
+        return result;
+    }
+    async addToQueueWithHeaders(queueId, taskId, headers, options) {
+        const bodyStr = JSON.stringify({ taskId });
+        const result = this.channels.writer.sendToQueue(queueId, Buffer.from(bodyStr), {
+            persistent: true,
+            contentType: 'application/json',
+            headers: {
+                ...headers,
+                'x-retries': options?.retries ?? 0,
+                'x-max-retries': options?.maxRetries ?? 3,
+                'x-first-published': Date.now(),
+            },
+            messageId: taskId,
+        });
+        if (result) {
+            console.log(`[BROKER] Message sent to queue "${queueId}": ${bodyStr}.`);
+        }
+        else {
+            console.log(`[BROKER] Message could not sent to queue "${queueId}": ${bodyStr}.`);
+        }
+        return Promise.resolve(result);
+    }
+    async addToQueue(queueId, taskId, options) {
+        return this.addToQueueWithHeaders(queueId, taskId, {}, options);
+    }
+    async addQueueHandler(queueId, handler) {
+        const resolve = (message) => () => {
+            this.channels.writer.ack(message);
+        };
+        const reject = (message) => () => {
+            const content = message?.content?.toString?.();
+            const request = JSON.parse(content);
+            const headers = message.properties.headers ?? {};
+            const retries = headers['x-retries'] ?? 0;
+            const maxRetries = headers['x-max-retries'] ?? 3;
+            if (retries >= maxRetries) {
+                this.channels.writer.ack(message);
+            }
+            else {
+                void this.addToQueueWithHeaders(queueId, request.taskId, headers, {
+                    retries,
+                    maxRetries,
+                }).then(() => this.channels.writer.ack(message));
+            }
+        };
+        await this.channels.reader.consume(queueId, (message) => {
+            const content = message?.content?.toString?.();
+            const request = JSON.parse(content);
+            void handler(request.taskId, resolve(message), reject(message));
+        });
+    }
+}
 //# sourceMappingURL=broker.js.map

package/dist/lib/broker/index.d.ts

@@ -1 +1,3 @@
 export * from './broker.js';
+export * from './base.task.js';
+export * from './base.process.js';

package/dist/lib/broker/index.js

@@ -1,2 +1,4 @@
 export * from './broker.js';
+export * from './base.task.js';
+export * from './base.process.js';
 //# sourceMappingURL=index.js.map

package/dist/lib/broker/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/broker/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/broker/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC"}