@quatrain/queue-amqp 1.2.10 → 1.2.12

package/lib/AmqpQueueAdapter.d.ts

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

package/lib/AmqpQueueAdapter.js

@@ -18,11 +18,11 @@ const amqplib_1 = __importDefault(require("amqplib"));
 class AmqpQueueAdapter extends queue_1.AbstractQueueAdapter {
     _connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._client) {
-                return this._client;
+            if (!this._client) {
+                const { host = 'localhost', user = 'guest', password = 'guest', port = 5672, } = this._params.config || {};
+                this._client = yield amqplib_1.default.connect(`amqp://${user}:${password}@${host}:${port}`);
             }
-            const { host = 'localhost', user = 'guest', password = 'guest', port = 5672, } = this._params.config || {};
-            this._client = yield amqplib_1.default.connect(`amqp://${user}:${password}@${host}:${port}`);
+            return this._client;
         });
     }
     _disconnect() {
@@ -46,7 +46,6 @@ class AmqpQueueAdapter extends queue_1.AbstractQueueAdapter {
         });
     }
     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.`);
@@ -54,49 +53,36 @@ class AmqpQueueAdapter extends queue_1.AbstractQueueAdapter {
             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 = 0;
-            yield this._connect();
-            const channel = yield ((_a = this._client) === null || _a === void 0 ? void 0 : _a.createChannel());
-            yield (channel === null || channel === void 0 ? void 0 : channel.prefetch(1)); // only get one message at a time
-            yield (channel === null || channel === void 0 ? void 0 : channel.assertQueue(topic, { durable: true, autoDelete: false }));
-            return channel === null || channel === void 0 ? void 0 : channel.consume(topic, (msg) => __awaiter(this, void 0, void 0, function* () {
-                if (msg === null) {
+            const client = yield this._connect();
+            const channel = yield client.createChannel();
+            yield channel.assertQueue(topic, { durable: true, autoDelete: false });
+            yield channel.prefetch(concurrency); // only get one message at a time
+            return channel.consume(topic, (msg) => __awaiter(this, void 0, void 0, function* () {
+                if (msg === null || !channel) {
                     return;
                 }
-                channel === null || channel === void 0 ? void 0 : channel.ack(msg);
-                yield queue_1.Queue.sleep(); // sleep for one second
                 concurrents++;
-                queue_1.Queue.info(`Concurrent job #${concurrents} of ${concurrency > 0 ? concurrency : 'unlimited'} triggered`);
-                if (concurrency > 0 && concurrents >= concurrency) {
-                    queue_1.Queue.info(`Reached max concurrency of ${concurrency}, disconnecting from queue`);
-                    channel
-                        .close()
-                        .then(() => __awaiter(this, void 0, void 0, function* () {
-                        queue_1.Queue.info('Channel closed.');
-                        // 4. Then close CONNECTION
-                        return yield this._disconnect();
-                    }))
-                        .then(() => {
-                        queue_1.Queue.info('Connection closed. Exiting.');
-                    })
-                        .catch((err) => {
-                        queue_1.Queue.error('Error during shutdown:', err);
-                    });
-                }
+                queue_1.Queue.info(`Job #${concurrents} of ${concurrency > 0 ? concurrency : 'unlimited'} started`);
                 try {
+                    // 1. Process the message synchronously (wait for it to finish)
                     yield messageHandler(msg.content.toString(), params);
+                    // 2. Acknowledge the message only after successful processing
+                    channel.ack(msg);
+                    // 3. Check if we reached the limit of messages to process
+                    if (concurrency > 0 && concurrents >= concurrency) {
+                        queue_1.Queue.info(`Reached max concurrency of ${concurrency}, disconnecting from queue`);
+                        yield channel.close();
+                        yield client.close();
+                        process.exit(0);
+                    }
                 }
                 catch (err) {
                     queue_1.Queue.error(`messageHandler function failed with message: ${err.message}`);
+                    // Negative acknowledge the message so it can be requeued or handled by DLQ
+                    channel.nack(msg);
+                    process.exit(1);
                 }
-                if (concurrency > 0 && concurrents >= concurrency) {
-                    queue_1.Queue.info(`Reached max concurrency of ${concurrency}, exiting gracefully`);
-                    // Queue.info(
-                    //    'Sleeping 5 seconds to allow asynchronous calls to finish'
-                    // )
-                    // await Queue.sleep(5)
-                    process.exit();
-                }
-            }), { noAck: true } // auto-hack
+            }), { noAck: false } // disable auto-hack
             );
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/queue-amqp",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "description": "Queue adapter for AMQP compatible queue",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",