@autofleet/rabbit 3.2.11 → 3.2.13-beta.1

package/dist/index.js

@@ -217,8 +217,15 @@ class RabbitMq {
     }
     async getNewChannel({ name = utils_1.rand().toString(), onClose = null, options = {} } = {}) {
         return new Promise(async (resolve, reject) => {
-            const connection = await this.getConnection();
-            const channel = connection.createChannel({
+            let connection;
+            try {
+                connection = await this.getConnection();
+            }
+            catch (e) {
+                logger_1.default.error(`rabbit: error on get connection for new channel ${name} `, { e });
+                reject(e);
+            }
+            const channel = connection?.createChannel({
                 ...options,
             });
             let isResolved = false;
@@ -323,11 +330,14 @@ class RabbitMq {
         return queue;
     }
     saveConsumer(queue, callback, options) {
-        this.consumers.push({
-            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);
@@ -438,6 +448,7 @@ class RabbitMq {
         RabbitMq.validateName('exchange', exchange);
         RabbitMq.validateName('queue', queue);
         const { limit, deadMessageTtl } = optionsWithDefaults;
+        await this.saveConsumer(queue, callback, options);
         const channel = await this.getNewChannel({ name: `consume-exchange-${exchange}-queue-${queue}` });
         return channel.addSetup(async (c) => {
             const assertExchange = await utils_1.assertExchangeFanout(c, exchange);

package/package.json

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

package/src/index.ts

@@ -350,8 +350,14 @@ class RabbitMq implements IAfRabbitMq {
 
   async getNewChannel({ name = rand().toString(), onClose = null, options = {} }: newChannelOpts = {}) {
     return new Promise<ChannelWrapper>(async (resolve, reject) => {
-      const connection: AmqpConnectionManager = await this.getConnection();
-      const channel = connection.createChannel({
+      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({
         ...options,
       });
 
@@ -464,11 +470,14 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   private saveConsumer(queue: string, callback: CallbackFunction, options: ConsumeOptions | undefined) {
-    this.consumers.push({
-      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> {
@@ -601,6 +610,7 @@ 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) => {