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

package/dist/index.js

@@ -229,24 +229,26 @@ class RabbitMq {
                 ...options,
             });
             let isResolved = false;
-            channel.on('error', (err) => {
-                logger_1.default.error(`rabbit: channel error ${name} error`, { err });
-                if (!isResolved) {
+            if (channel) {
+                channel.on('error', (err) => {
+                    logger_1.default.error(`rabbit: channel error ${name} error`, { err });
+                    if (!isResolved) {
+                        isResolved = true;
+                        reject(err);
+                    }
+                });
+                channel.on('close', (...args) => {
+                    logger_1.default.error(`rabbit: channel ${name} closed`, { args });
+                    if (onClose) {
+                        onClose(args);
+                    }
+                });
+                channel.once('connect', () => {
+                    debug(`rabbit: channel ${name} CONNECTED`);
                     isResolved = true;
-                    reject(err);
-                }
-            });
-            channel.on('close', (...args) => {
-                logger_1.default.error(`rabbit: channel ${name} closed`, { args });
-                if (onClose) {
-                    onClose(args);
-                }
-            });
-            channel.once('connect', () => {
-                debug(`rabbit: channel ${name} CONNECTED`);
-                isResolved = true;
-                resolve(channel);
-            });
+                    resolve(channel);
+                });
+            }
         });
     }
     async assertChannel({ force = false } = {}) {
@@ -332,6 +334,7 @@ class RabbitMq {
     saveConsumer(queue, callback, options) {
         const isConsumerExist = this.consumers.some((consumer) => consumer.queue === queue);
         if (!isConsumerExist) {
+            logger_1.default.info(`rabbit: consumer: ${queue} saved in consumer array`);
             this.consumers.push({
                 queue,
                 callback,
@@ -341,7 +344,6 @@ class RabbitMq {
     }
     async consume(queue, callback, options) {
         await this.consumeFromRabbit(queue, callback, options);
-        return this.saveConsumer(queue, callback, options);
     }
     async lockRedisIfNeeded(msg, options) {
         const { properties: { headers } } = msg;
@@ -360,6 +362,7 @@ class RabbitMq {
     async consumeFromRabbit(queue, callback, options) {
         const optionsWithDefaults = { ...consts_1.DEFAULT_OPTIONS, ...options };
         RabbitMq.validateName('queue', queue);
+        this.saveConsumer(queue, callback, options);
         const uniqueId = uuid_1.v4();
         const { limit, deadMessageTtl, useConsumeWithLock, lockTimeout, auditContext, enableRabbitTrace, } = optionsWithDefaults;
         if (useConsumeWithLock) {

package/package.json

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

package/src/index.ts

@@ -362,24 +362,26 @@ class RabbitMq implements IAfRabbitMq {
       });
 
       let isResolved = false;
-      channel.on('error', (err) => {
-        logger.error(`rabbit: channel error ${name} error`, { err });
-        if (!isResolved) {
+      if (channel) {
+        channel.on('error', (err) => {
+          logger.error(`rabbit: channel error ${name} error`, { err });
+          if (!isResolved) {
+            isResolved = true;
+            reject(err);
+          }
+        });
+        channel.on('close', (...args) => {
+          logger.error(`rabbit: channel ${name} closed`, { args });
+          if (onClose) {
+            onClose(args);
+          }
+        });
+        channel.once('connect', () => {
+          debug(`rabbit: channel ${name} CONNECTED`);
           isResolved = true;
-          reject(err);
-        }
-      });
-      channel.on('close', (...args) => {
-        logger.error(`rabbit: channel ${name} closed`, { args });
-        if (onClose) {
-          onClose(args);
-        }
-      });
-      channel.once('connect', () => {
-        debug(`rabbit: channel ${name} CONNECTED`);
-        isResolved = true;
-        resolve(channel);
-      });
+          resolve(channel);
+        });
+      }
     });
   }
 
@@ -470,8 +472,9 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   private saveConsumer(queue: string, callback: CallbackFunction, options: ConsumeOptions | undefined) {
-    const isConsumerExist = this.consumers.some((consumer) => consumer.queue === queue);
+    const isConsumerExist :boolean = this.consumers.some((consumer) => consumer.queue === queue);
     if (!isConsumerExist) {
+      logger.info(`rabbit: consumer: ${queue} saved in consumer array`);
       this.consumers.push({
         queue,
         callback,
@@ -482,7 +485,6 @@ class RabbitMq implements IAfRabbitMq {
 
   async consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
     await this.consumeFromRabbit(queue, callback, options);
-    return this.saveConsumer(queue, callback, options);
   }
 
   private async lockRedisIfNeeded(msg: any, options: any) {
@@ -508,6 +510,7 @@ class RabbitMq implements IAfRabbitMq {
   private async consumeFromRabbit(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
     const optionsWithDefaults = { ...DEFAULT_OPTIONS, ...options };
     RabbitMq.validateName('queue', queue);
+    this.saveConsumer(queue, callback, options);
     const uniqueId = v4();
     const {
       limit, deadMessageTtl, useConsumeWithLock, lockTimeout, auditContext, enableRabbitTrace,