@autofleet/rabbit 3.2.13 → 3.2.14-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.13",
+  "version": "3.2.14-beta.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -44,4 +44,4 @@
   },
   "author": "",
   "license": "ISC"
-}
+}

package/src/index.ts

@@ -1,5 +1,3 @@
-/* eslint-disable no-empty,consistent-return,no-async-promise-executor,@typescript-eslint/no-unused-vars */
-
 import { EventEmitter } from 'events';
 import { promisify } from 'util';
 import moment from 'moment';
@@ -350,38 +348,30 @@ class RabbitMq implements IAfRabbitMq {
 
   async getNewChannel({ name = rand().toString(), onClose = null, options = {} }: newChannelOpts = {}) {
     return new Promise<ChannelWrapper>(async (resolve, reject) => {
-      let connection!: AmqpConnectionManager;
-      try {
-        connection = await this.getConnection();
-      } catch (e) {
-        logger.error(`rabbit: error on get connection for new channel ${name} `, { e });
-        reject(e);
-      }
-      const channel = connection?.createChannel({
+      const connection: AmqpConnectionManager = await this.getConnection();
+      const channel = connection.createChannel({
         ...options,
       });
 
       let isResolved = false;
-      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`);
+      channel.on('error', (err) => {
+        logger.error(`rabbit: channel error ${name} error`, { err });
+        if (!isResolved) {
           isResolved = true;
-          resolve(channel);
-        });
-      }
+          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);
+      });
     });
   }
 
@@ -472,19 +462,16 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   private saveConsumer(queue: string, callback: CallbackFunction, options: ConsumeOptions | undefined) {
-    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,
-        options,
-      });
-    }
+    this.consumers.push({
+      queue,
+      callback,
+      options,
+    });
   }
 
   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) {
@@ -510,7 +497,6 @@ 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,
@@ -613,7 +599,6 @@ class RabbitMq implements IAfRabbitMq {
     RabbitMq.validateName('exchange', exchange);
     RabbitMq.validateName('queue', queue);
     const { limit, deadMessageTtl } = optionsWithDefaults;
-    await this.saveConsumer(queue, callback, options);
     const channel: ChannelWrapper = await this.getNewChannel({ name: `consume-exchange-${exchange}-queue-${queue}` });
 
     return channel.addSetup(async (c: ConfirmChannel) => {