@autofleet/rabbit 3.2.6 → 3.2.8

package/dist/index.js

@@ -88,6 +88,7 @@ class RabbitMq {
         this.creatingConnection = false;
         this.exchanges = {};
         this.queues = {};
+        this.consumers = [];
         this.options = options;
         this.redisClient = redisConfig && redis_1.default(redisConfig);
         if (this.redisClient) {
@@ -329,7 +330,8 @@ class RabbitMq {
         });
     }
     async consume(queue, callback, options) {
-        return this.consumeFromRabbit(queue, callback, options);
+        await this.consumeFromRabbit(queue, callback, options);
+        return this.saveConsumer(queue, callback, options);
     }
     async lockRedisIfNeeded(msg, options) {
         const { properties: { headers } } = msg;
@@ -356,7 +358,7 @@ class RabbitMq {
             }
             logger_1.default.info(`rabbit: Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
         }
-        const channel = await this.getNewChannel({ name: `consume-queue-${queue}` });
+        const channel = await this.assertChannel();
         return channel.addSetup(async (confirmChannel) => {
             await confirmChannel.assertQueue(queue, options ? { messageTtl: options.messageTtl } : undefined);
             await confirmChannel.prefetch(limit, true);
@@ -485,7 +487,10 @@ class RabbitMq {
         }
         const channel = await this.assertChannel();
         try {
-            await channel.waitForConnect();
+            await Promise.all([
+                channel.waitForConnect(),
+                ...this.consumers.map((c) => channel.checkQueue(c.queue)),
+            ]);
         }
         catch (e) {
             logger_1.default.error('rabbit: isConnected - false');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.6",
+  "version": "3.2.8",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@autofleet/logger": "^1.2.8",
-    "@autofleet/zehut": "^3.0.2",
+    "@autofleet/zehut": "^3.0.3",
     "@types/amqplib": "0.8.2",
     "@types/uuid": "^8.3.3",
     "amqp-connection-manager": "4.1.9",

package/src/index.ts

@@ -171,6 +171,7 @@ class RabbitMq implements IAfRabbitMq {
     this.creatingConnection = false;
     this.exchanges = {};
     this.queues = {};
+    this.consumers = [];
     this.options = options;
     this.redisClient = redisConfig && getRedisInstance(redisConfig);
     if (this.redisClient) {
@@ -383,8 +384,7 @@ class RabbitMq implements IAfRabbitMq {
       }
 
       try {
-        const channel = await this.getNewChannel({
-        });
+        const channel = await this.getNewChannel({});
         channel.on('error', (err) => {
           logger.error('rabbit: channel error', { err });
         });
@@ -472,7 +472,8 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   async consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
-    return this.consumeFromRabbit(queue, callback, options);
+    await this.consumeFromRabbit(queue, callback, options);
+    return this.saveConsumer(queue, callback, options);
   }
 
   private async lockRedisIfNeeded(msg: any, options: any) {
@@ -508,7 +509,7 @@ class RabbitMq implements IAfRabbitMq {
       }
       logger.info(`rabbit: Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
     }
-    const channel: ChannelWrapper = await this.getNewChannel({ name: `consume-queue-${queue}` });
+    const channel = await this.assertChannel();
     return channel.addSetup(async (confirmChannel: ConfirmChannel) => {
       await confirmChannel.assertQueue(queue, options ? { messageTtl: options.messageTtl } : undefined);
       await confirmChannel.prefetch(limit, true);
@@ -664,9 +665,12 @@ class RabbitMq implements IAfRabbitMq {
       logger.error('rabbit: isConnected - false');
       return false;
     }
-    const channel = await this.assertChannel();
+    const channel: any = await this.assertChannel();
     try {
-      await channel.waitForConnect();
+      await Promise.all([
+        channel.waitForConnect(),
+        ...this.consumers.map((c: AfConsumer) => channel.checkQueue(c.queue)),
+      ]);
     } catch (e) {
       logger.error('rabbit: isConnected - false');
       return false;