@autofleet/rabbit 3.2.13-beta → 3.2.13-beta.1

package/dist/index.js

@@ -25,6 +25,7 @@ class RabbitMq {
     constructor(options, redisConfig) {
         this.DISCONNECT_MSG = 'rabbit: connection disconnect';
         this.RECONNECT_MSG = 'rabbit: connection disconnect - reconnecting';
+        this.consumers = [];
         this.shouldConsumeMessageByTimestamp = async (msg) => {
             if (msg) {
                 const { properties: { headers } } = msg;
@@ -87,7 +88,7 @@ class RabbitMq {
         this.creatingConnection = false;
         this.exchanges = {};
         this.queues = {};
-        this.consumers = new Set();
+        this.consumers = [];
         this.options = options;
         this.redisClient = redisConfig && redis_1.default(redisConfig);
         if (this.redisClient) {
@@ -224,7 +225,7 @@ class RabbitMq {
                 logger_1.default.error(`rabbit: error on get connection for new channel ${name} `, { e });
                 reject(e);
             }
-            const channel = connection.createChannel({
+            const channel = connection?.createChannel({
                 ...options,
             });
             let isResolved = false;
@@ -329,11 +330,14 @@ class RabbitMq {
         return queue;
     }
     saveConsumer(queue, callback, options) {
-        this.consumers.add({
-            queue,
-            callback,
-            options,
-        });
+        const isConsumerExist = this.consumers.some((consumer) => consumer.queue === queue);
+        if (!isConsumerExist) {
+            this.consumers.push({
+                queue,
+                callback,
+                options,
+            });
+        }
     }
     async consume(queue, callback, options) {
         await this.consumeFromRabbit(queue, callback, options);
@@ -496,7 +500,7 @@ class RabbitMq {
         try {
             await Promise.all([
                 channel.waitForConnect(),
-                ...Array.from(this.consumers, (c) => channel.checkQueue(c.queue)),
+                ...this.consumers.map((c) => channel.checkQueue(c.queue)),
             ]);
         }
         catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.13-beta",
+  "version": "3.2.13-beta.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -162,7 +162,7 @@ class RabbitMq implements IAfRabbitMq {
   /** Array of consumers tags used for canceling consumption */
   consumersTags: Array<[ConfirmChannel, string]>;
 
-  private consumers: Set<AfConsumer>;
+  private consumers: Array<AfConsumer> = [];
 
   constructor(options?: AfRabbitOptions, redisConfig?: RedisConfig) {
     this.em = new EventEmitter();
@@ -171,7 +171,7 @@ class RabbitMq implements IAfRabbitMq {
     this.creatingConnection = false;
     this.exchanges = {};
     this.queues = {};
-    this.consumers = new Set();
+    this.consumers = [];
     this.options = options;
     this.redisClient = redisConfig && getRedisInstance(redisConfig);
     if (this.redisClient) {
@@ -357,7 +357,7 @@ class RabbitMq implements IAfRabbitMq {
         logger.error(`rabbit: error on get connection for new channel ${name} `, { e });
         reject(e);
       }
-      const channel = connection.createChannel({
+      const channel = connection?.createChannel({
         ...options,
       });
 
@@ -470,11 +470,14 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   private saveConsumer(queue: string, callback: CallbackFunction, options: ConsumeOptions | undefined) {
-    this.consumers.add({
-      queue,
-      callback,
-      options,
-    });
+    const isConsumerExist = this.consumers.some((consumer) => consumer.queue === queue);
+    if (!isConsumerExist) {
+      this.consumers.push({
+        queue,
+        callback,
+        options,
+      });
+    }
   }
 
   async consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
@@ -676,7 +679,7 @@ class RabbitMq implements IAfRabbitMq {
     try {
       await Promise.all([
         channel.waitForConnect(),
-        ...Array.from(this.consumers, (c) => channel.checkQueue(c.queue)),
+        ...this.consumers.map((c: AfConsumer) => channel.checkQueue(c.queue)),
       ]);
     } catch (e) {
       logger.error('rabbit: isConnected - false');