@autofleet/rabbit 3.2.11 → 3.2.13-beta

package/dist/index.js

@@ -25,7 +25,6 @@ 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;
@@ -88,7 +87,7 @@ class RabbitMq {
         this.creatingConnection = false;
         this.exchanges = {};
         this.queues = {};
-        this.consumers = [];
+        this.consumers = new Set();
         this.options = options;
         this.redisClient = redisConfig && redis_1.default(redisConfig);
         if (this.redisClient) {
@@ -217,7 +216,14 @@ class RabbitMq {
     }
     async getNewChannel({ name = utils_1.rand().toString(), onClose = null, options = {} } = {}) {
         return new Promise(async (resolve, reject) => {
-            const connection = await this.getConnection();
+            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,
             });
@@ -323,7 +329,7 @@ class RabbitMq {
         return queue;
     }
     saveConsumer(queue, callback, options) {
-        this.consumers.push({
+        this.consumers.add({
             queue,
             callback,
             options,
@@ -438,6 +444,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);
@@ -489,7 +496,7 @@ class RabbitMq {
         try {
             await Promise.all([
                 channel.waitForConnect(),
-                ...this.consumers.map((c) => channel.checkQueue(c.queue)),
+                ...Array.from(this.consumers, (c) => channel.checkQueue(c.queue)),
             ]);
         }
         catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.11",
+  "version": "3.2.13-beta",
   "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

@@ -162,7 +162,7 @@ class RabbitMq implements IAfRabbitMq {
   /** Array of consumers tags used for canceling consumption */
   consumersTags: Array<[ConfirmChannel, string]>;
 
-  private consumers: Array<AfConsumer> = [];
+  private consumers: Set<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 = [];
+    this.consumers = new Set();
     this.options = options;
     this.redisClient = redisConfig && getRedisInstance(redisConfig);
     if (this.redisClient) {
@@ -350,7 +350,13 @@ 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();
+      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,7 +470,7 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   private saveConsumer(queue: string, callback: CallbackFunction, options: ConsumeOptions | undefined) {
-    this.consumers.push({
+    this.consumers.add({
       queue,
       callback,
       options,
@@ -601,6 +607,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) => {
@@ -669,7 +676,7 @@ class RabbitMq implements IAfRabbitMq {
     try {
       await Promise.all([
         channel.waitForConnect(),
-        ...this.consumers.map((c: AfConsumer) => channel.checkQueue(c.queue)),
+        ...Array.from(this.consumers, (c) => channel.checkQueue(c.queue)),
       ]);
     } catch (e) {
       logger.error('rabbit: isConnected - false');