@quatrain/queue-amqp 1.2.2 → 1.2.4

package/lib/AmqpQueueAdapter.d.ts

@@ -1,6 +1,9 @@
 import { AbstractQueueAdapter } from '@quatrain/queue';
+import amqplib, { ChannelModel } from 'amqplib';
 export declare class AmqpQueueAdapter extends AbstractQueueAdapter {
-    protected _connect(): Promise<any>;
+    protected _client: ChannelModel | undefined;
+    protected _connect(): Promise<amqplib.ChannelModel | undefined>;
+    protected _disconnect(): Promise<void>;
     send(data: any, topic: string): Promise<string>;
-    listen(topic: string | undefined, messageHandler: Function): Promise<any>;
+    listen(topic: string | undefined, messageHandler: Function, params?: any): Promise<amqplib.Replies.Consume | undefined>;
 }

package/lib/AmqpQueueAdapter.js

@@ -16,18 +16,6 @@ exports.AmqpQueueAdapter = void 0;
 const queue_1 = require("@quatrain/queue");
 const amqplib_1 = __importDefault(require("amqplib"));
 class AmqpQueueAdapter extends queue_1.AbstractQueueAdapter {
-    // constructor(params: QueueParameters) {
-    //    super(params)
-    //    const {
-    //       host = 'localhost',
-    //       user = 'guest',
-    //       password = 'guest',
-    //       port = 5672,
-    //    } = params.config || {}
-    //    this._client = new AMQPClient(
-    //       `amqp://${user}:${password}@${host}:${port}?frameMax=0x80000000`
-    //    )
-    // }
     _connect() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this._client) {
@@ -37,38 +25,53 @@ class AmqpQueueAdapter extends queue_1.AbstractQueueAdapter {
             this._client = yield amqplib_1.default.connect(`amqp://${user}:${password}@${host}:${port}`);
         });
     }
+    _disconnect() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            yield ((_a = this._client) === null || _a === void 0 ? void 0 : _a.close());
+        });
+    }
     send(data, topic) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._connect(); // this._client.connect()
-            const ch = yield this._client.createChannel();
-            // const channel: AMQPChannel = await connection.channel()
-            // const queue: AMQPQueue = await channel.queue(topic)
+            yield this._connect();
+            const channel = yield ((_a = this._client) === null || _a === void 0 ? void 0 : _a.createChannel());
             const dataBuffer = Buffer.from(JSON.stringify(data));
             queue_1.Queue.info(`[AMQP] Sending message to ${topic}`);
-            ch.sendToQueue(topic, dataBuffer);
+            channel === null || channel === void 0 ? void 0 : channel.sendToQueue(topic, dataBuffer);
+            channel === null || channel === void 0 ? void 0 : channel.close();
             // const res = await queue.publish(dataBuffer, { deliveryMode: 1 })
             const id = Date.now(); // fake
             queue_1.Queue.info(`[AMQP] Message send with id ${id}`);
             return String(id);
         });
     }
-    listen(topic = this._params.topic, messageHandler) {
+    listen(topic = this._params.topic, messageHandler, params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!topic) {
                 throw new Error(`No topic provided for listening.`);
             }
+            const concurrency = (params === null || params === void 0 ? void 0 : params.concurrency) || 0;
+            queue_1.Queue.info(`Starting to listen to topic ${topic} with max concurrency set to ${concurrency}`);
+            let concurrents = 1;
             yield this._connect();
-            const ch = yield this._client.createChannel();
-            yield ch.assertQueue(topic);
-            return ch.consume(topic, (message) => __awaiter(this, void 0, void 0, function* () { return yield messageHandler(message.content.toString()); }));
-            // const connection = await this._client.connect()
-            // const channel = await connection.channel()
-            // const queue = await channel.queue(topic)
-            // return queue.subscribe(
-            //    { noAck: true },
-            //    async (message: AMQPMessage) =>
-            //       await messageHandler(message.bodyToString())
-            // )
+            const channel = yield ((_a = this._client) === null || _a === void 0 ? void 0 : _a.createChannel());
+            yield (channel === null || channel === void 0 ? void 0 : channel.assertQueue(topic));
+            return channel === null || channel === void 0 ? void 0 : channel.consume(topic, (message) => __awaiter(this, void 0, void 0, function* () {
+                // execute workflow
+                if (concurrency > 0) {
+                    queue_1.Queue.info(`Concurrent job #${concurrents + 1} of ${concurrency} triggered`);
+                }
+                yield messageHandler(message.content.toString(), params);
+                channel === null || channel === void 0 ? void 0 : channel.ack(message);
+                concurrents++;
+                if (concurrency > 0 && concurrents > concurrency) {
+                    queue_1.Queue.info(`Reached max concurrencu of ${concurrency}, exiting gracefully`);
+                    yield this._disconnect();
+                    process.exit();
+                }
+            }));
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/queue-amqp",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Queue adapter for AMQP compatible queue",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -12,7 +12,7 @@
   "license": "MIT",
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.1",
-    "@types/amqplib": "^0",
+    "@types/amqplib": "^0.10.8",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^27.0.3",
     "@types/node": "^22.10.1",
@@ -27,7 +27,7 @@
   "dependencies": {
     "@cloudamqp/amqp-client": "^3.4.1",
     "@quatrain/core": "^1.1.22",
-    "@quatrain/queue": "^1.1.16",
+    "@quatrain/queue": "^1.1.18",
     "amqplib": "^0.10.9"
   },
   "scripts": {