@betterinternship/core 2.5.11 → 2.5.12

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

@@ -1,5 +1,8 @@
 import { Task } from '@betterinternship/db';
 import { JsonValue } from '@prisma/client/runtime/client';
+export interface BaseJson {
+    [key: string]: any;
+}
 export declare class TaskRequest<TaskInputs extends JsonValue> implements Pick<Task, 'inputs' | 'internal_id' | 'handler_id' | 'parent_id' | 'process_id' | 'timestamp'> {
     inputs: TaskInputs;
     internal_id: string;
@@ -30,7 +33,8 @@ type TaskRequestHandler<TaskInputs extends JsonValue, TaskResult extends JsonVal
 export declare class BaseTaskRunner<TaskInputs extends JsonValue, TaskResult extends JsonValue> {
     private requestQueueId;
     private responseQueueId;
+    private handler;
     constructor(queueId: string, handler: TaskRequestHandler<TaskInputs, TaskResult>);
-    private init;
+    listen(): Promise<void>;
 }
 export {};

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

@@ -52,16 +52,16 @@ export class BaseTaskInitiator {
 export class BaseTaskRunner {
     requestQueueId;
     responseQueueId;
+    handler;
     constructor(queueId, handler) {
         this.requestQueueId = `request.${queueId}`;
         this.responseQueueId = `response.${queueId}`;
-        void this.init(handler);
+        this.handler = handler;
     }
-    async init(handler) {
-        const brokerAPI = await BrokerAPI.instance();
-        await brokerAPI.addQueueHandler(this.requestQueueId, async (taskId) => {
+    async listen() {
+        const processTask = async (taskId) => {
             const task = await tasks.findFirst({ where: { id: taskId } });
-            const response = await handler(task);
+            const response = await this.handler(task);
             await tasks.update({
                 where: { id: taskId },
                 data: {
@@ -71,7 +71,9 @@ export class BaseTaskRunner {
                 },
             });
             await brokerAPI.addToQueue(this.responseQueueId, taskId);
-        });
+        };
+        const brokerAPI = await BrokerAPI.instance();
+        await brokerAPI.addQueueHandler(this.requestQueueId, processTask);
     }
 }
 //# sourceMappingURL=base.task.js.map

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 | null>;
-    private 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 | null>;
+    private 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,95 +1,95 @@
-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 = null;
-    constructor() { }
-    static async instance() {
-        if (!RABBITMQ_ENABLED)
-            return Promise.resolve(null);
-        if (BrokerAPI.__instance)
-            return Promise.resolve(BrokerAPI.__instance);
-        const instance = new BrokerAPI();
-        instance.connection = await amqp.connect(RABBITMQ_URL);
-        instance.channels = {
-            asserter: await instance.connection.createChannel(),
-            reader: await instance.connection.createChannel(),
-            writer: await instance.connection.createChannel(),
-        };
-        BrokerAPI.__instance = instance;
-        return 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) {
-        await this.assertQueue(queueId);
-        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) {
-        await this.assertQueue(queueId);
-        return this.addToQueueWithHeaders(queueId, taskId, {}, options);
-    }
-    async addQueueHandler(queueId, handler) {
-        await this.assertQueue(queueId);
-        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 = null;
+    constructor() { }
+    static async instance() {
+        if (!RABBITMQ_ENABLED)
+            return Promise.resolve(null);
+        if (BrokerAPI.__instance)
+            return Promise.resolve(BrokerAPI.__instance);
+        const instance = new BrokerAPI();
+        instance.connection = await amqp.connect(RABBITMQ_URL);
+        instance.channels = {
+            asserter: await instance.connection.createChannel(),
+            reader: await instance.connection.createChannel(),
+            writer: await instance.connection.createChannel(),
+        };
+        BrokerAPI.__instance = instance;
+        return 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) {
+        await this.assertQueue(queueId);
+        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) {
+        await this.assertQueue(queueId);
+        return this.addToQueueWithHeaders(queueId, taskId, {}, options);
+    }
+    async addQueueHandler(queueId, handler) {
+        await this.assertQueue(queueId);
+        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