@autofleet/rabbit 3.4.0-beta.11 → 3.4.0-beta.13

package/dist/index.js

@@ -486,10 +486,10 @@ class RabbitMq {
     // Used by the microservices to consume messages from the queue
     async consume(queue, callback, options) {
         // TODO: [QUORUM-PHASE-3] Use only the implementation of consumeNew and delete consumeNew and consumeOld
-        // if (options?.isQuorumQueue !== false) {
-        //   await this.assertVHost();
-        //   await this.consumeNew(queue, callback, options);
-        // }
+        if (options?.isQuorumQueue !== false) {
+            await this.assertVHost();
+            await this.consumeNew(queue, callback, options);
+        }
         await this.consumeOld(queue, callback, options);
     }
     // TODO: [QUORUM-PHASE-3] Delete consumeNew we do not use it anymore
@@ -629,24 +629,22 @@ class RabbitMq {
                 ]);
             });
         }
-        else {
-            // TODO: [QUORUM-PHASE-3] Delete the old implementation
-            await this.saveConsumerOld(queue, callback, options);
-            const channelOld = await this.getNewChannelOld({
-                name: `consume-exchange-${exchange}-queue-${queue}-old`,
-                connection: this.oldConsumeConnection,
-            });
-            await channelOld.addSetup(async (c) => {
-                const assertExchange = await (0, utils_1.assertExchangeFanout)(c, exchange);
-                await c.assertQueue(queue);
-                this.oldExchanges[exchange] = assertExchange;
-                await c.prefetch(limit, false);
-                return Promise.all([
-                    c.bindQueue(queue, exchange, ''),
-                    this.consumeOld(queue, callback, options),
-                ]);
-            });
-        }
+        // TODO: [QUORUM-PHASE-3] Delete the old implementation
+        await this.saveConsumerOld(queue, callback, options);
+        const channelOld = await this.getNewChannelOld({
+            name: `consume-exchange-${exchange}-queue-${queue}-old`,
+            connection: this.oldConsumeConnection,
+        });
+        await channelOld.addSetup(async (c) => {
+            const assertExchange = await (0, utils_1.assertExchangeFanout)(c, exchange);
+            await c.assertQueue(queue);
+            this.oldExchanges[exchange] = assertExchange;
+            await c.prefetch(limit, false);
+            return Promise.all([
+                c.bindQueue(queue, exchange, ''),
+                this.consumeOld(queue, callback, options),
+            ]);
+        });
     }
     // Used by the microservices to publish messages to the exchange
     // TODO: [QUORUM-PHASE-2] Change the implementation to the new one
@@ -859,7 +857,12 @@ class RabbitMq {
         if (!localConnection) {
             throw new Error(`rabbit: couldnt get connection for new channel ${name}`);
         }
-        debug('rabbit: getNewChannelOld', { localConnection });
+        if (connection === this.oldPublishConnection) {
+            debug('rabbit: getNewChannelOld publish', { localConnection });
+        }
+        else if (connection === this.oldConsumeConnection) {
+            debug('rabbit: getNewChannelOld consume', { localConnection });
+        }
         const channel = localConnection?.createChannel({ ...options });
         (0, events_1.once)(channel, 'close').then((args) => {
             logger_1.default.error(`rabbit: channel ${name} closed`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.4.0-beta.11",
+  "version": "3.4.0-beta.13",
   "description": "",
   "main": "dist/index.js",
   "engines": {

package/src/index.ts

@@ -415,6 +415,7 @@ class RabbitMq implements IAfRabbitMq {
         connectionFailedEventName,
         blockReconnect,
       } = connection;
+
       if (connection === this.publishConnection) {
         debug('rabbit: getConnection publish', { connectionLocal, creatingConnection, blockReconnect });
       } else if (connection === this.consumeConnection) {
@@ -692,10 +693,10 @@ class RabbitMq implements IAfRabbitMq {
   // Used by the microservices to consume messages from the queue
   async consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
     // TODO: [QUORUM-PHASE-3] Use only the implementation of consumeNew and delete consumeNew and consumeOld
-    // if (options?.isQuorumQueue !== false) {
-    //   await this.assertVHost();
-    //   await this.consumeNew(queue, callback, options);
-    // }
+    if (options?.isQuorumQueue !== false) {
+      await this.assertVHost();
+      await this.consumeNew(queue, callback, options);
+    }
 
     await this.consumeOld(queue, callback, options);
   }
@@ -863,28 +864,27 @@ class RabbitMq implements IAfRabbitMq {
           ),
         ]);
       });
-    } else {
-      // TODO: [QUORUM-PHASE-3] Delete the old implementation
-      await this.saveConsumerOld(queue, callback, options);
-      const channelOld: ChannelWrapper = await this.getNewChannelOld({
-        name: `consume-exchange-${exchange}-queue-${queue}-old`,
-        connection: this.oldConsumeConnection,
-      });
-      await channelOld.addSetup(async (c: ConfirmChannel) => {
-        const assertExchange = await assertExchangeFanout(c, exchange);
-        await c.assertQueue(queue);
-        this.oldExchanges[exchange] = assertExchange;
-        await c.prefetch(limit, false);
-        return Promise.all([
-          c.bindQueue(queue, exchange, ''),
-          this.consumeOld(
-            queue,
-            callback,
-            options,
-          ),
-        ]);
-      });
     }
+    // TODO: [QUORUM-PHASE-3] Delete the old implementation
+    await this.saveConsumerOld(queue, callback, options);
+    const channelOld: ChannelWrapper = await this.getNewChannelOld({
+      name: `consume-exchange-${exchange}-queue-${queue}-old`,
+      connection: this.oldConsumeConnection,
+    });
+    await channelOld.addSetup(async (c: ConfirmChannel) => {
+      const assertExchange = await assertExchangeFanout(c, exchange);
+      await c.assertQueue(queue);
+      this.oldExchanges[exchange] = assertExchange;
+      await c.prefetch(limit, false);
+      return Promise.all([
+        c.bindQueue(queue, exchange, ''),
+        this.consumeOld(
+          queue,
+          callback,
+          options,
+        ),
+      ]);
+    });
   }
 
   // Used by the microservices to publish messages to the exchange
@@ -1125,8 +1125,11 @@ class RabbitMq implements IAfRabbitMq {
     if (!localConnection) {
       throw new Error(`rabbit: couldnt get connection for new channel ${name}`);
     }
-
-    debug('rabbit: getNewChannelOld', { localConnection });
+    if (connection === this.oldPublishConnection) {
+      debug('rabbit: getNewChannelOld publish', { localConnection });
+    } else if (connection === this.oldConsumeConnection) {
+      debug('rabbit: getNewChannelOld consume', { localConnection });
+    }
     const channel = localConnection?.createChannel({ ...options });
     once(channel, 'close').then((args) => {
       logger.error(`rabbit: channel ${name} closed`);