@autofleet/rabbit 4.0.0-beta.0 → 4.0.1

package/src/index.ts

@@ -1,5 +1,4 @@
-/* eslint-disable no-empty,consistent-return,no-async-promise-executor,@typescript-eslint/no-unused-vars */
-
+/* eslint-disable no-empty,consistent-return,no-async-promise-executor,@typescript-eslint/no-unused-vars,no-param-reassign */
 import { EventEmitter, once } from 'events';
 import { promisify } from 'util';
 import moment from 'moment';
@@ -14,15 +13,12 @@ import {
   getCurrentPayload, newTrace, traceTypes, createOrSetRabbitTrace, outbreak,
 } from '@autofleet/zehut';
 import { randomUUID } from 'node:crypto';
-import axios from 'axios';
 import logger from './logger';
 import RabbitError from './lib/rabbitError';
 import getRedisInstance, { RedisConfig } from './lib/redis';
 import { assertExchangeFanout, rand, wrapSetImmediate } from './lib/utils';
 import {
   AUTOMATION_ID_HEADER,
-  CONNECTION_CREATED_CONST,
-  CONNECTION_FAILED_CONST,
   DEFAULT_LOCK_TIMEOUT,
   DEFAULT_OPTIONS,
   RETRY_HEADER,
@@ -41,6 +37,7 @@ import {
   CONSUMER_DEFAULT_OPTIONS,
   QueueSetupPromisesDictionary,
   AssertExchangePromisesDictionary,
+  ConnectionData,
 } from './lib/types';
 
 // const debug = nodeDebug('af-rabbitmq')
@@ -48,6 +45,12 @@ const debug = logger.debug.bind(logger);
 
 const PUBLISH_TIMEOUT = 1000 * 10;
 
+// TODO: [QUORUM-PHASE-3] Delete this env var
+const {
+  DISABLE_QUORUM_QUEUES_CONSUME,
+  DISABLE_QUORUM_QUEUES_PUBLISH,
+} = process.env;
+
 export interface IAfRabbitMq {
   ack: any;
   nack: any;
@@ -89,11 +92,13 @@ type newChannelOpts = {
   name?: string;
   onClose?: null | ((args: any | null) => void);
   options?: CreateChannelOpts | undefined;
+  connection: ConnectionData;
 };
 
 type assertChannelOpts = {
   channelName?: string;
   force?: boolean;
+  connection: ConnectionData;
 }
 
 type AfConsumer = {
@@ -146,13 +151,15 @@ class RabbitMq implements IAfRabbitMq {
 
   RECONNECT_MSG = 'rabbit: connection disconnect - reconnecting';
 
-  channel: ChannelWrapper | null;
+  publishChannel: ChannelWrapper | null;
 
   publishChannelSetupPromise: Promise<ChannelWrapper> | null;
 
   blockReconnect: boolean | null | undefined
 
-  connection: AmqpConnectionManager | null | undefined
+  publishConnection: ConnectionData
+
+  consumeConnection: ConnectionData
 
   em: EventEmitter;
 
@@ -166,7 +173,7 @@ class RabbitMq implements IAfRabbitMq {
 
   assertExchangePromises: AssertExchangePromisesDictionary;
 
-  options: AfRabbitOptions | undefined;
+  options: AfRabbitOptions;
 
   redisClient: any;
 
@@ -177,17 +184,20 @@ class RabbitMq implements IAfRabbitMq {
 
   private consumers: Array<AfConsumer> = [];
 
-  private isVHostExist = false;
+  private doesVHostExist = false;
 
-  // TODO: DELETE OLD PROPERTIES
+  private vhost = 'quorum-vhost';
 
-  oldChannel: ChannelWrapper | null;
+  // TODO:[QUORUM-PHASE-3] Delete the old properties that we use for the old consumers and publishers
+  oldPublishChannel: ChannelWrapper | null;
 
   oldPublishChannelSetupPromise: Promise<ChannelWrapper> | null;
 
   oldBlockReconnect: boolean | null | undefined
 
-  oldConnection: AmqpConnectionManager | null | undefined
+  oldPublishConnection: ConnectionData
+
+  oldConsumeConnection: ConnectionData
 
   oldEm: EventEmitter;
 
@@ -207,9 +217,22 @@ class RabbitMq implements IAfRabbitMq {
 
   constructor(options: AfRabbitOptions = {}, redisConfig?: RedisConfig) {
     this.em = new EventEmitter();
-    this.channel = null;
+    this.publishChannel = null;
     this.publishChannelSetupPromise = null;
-    this.connection = null;
+    this.publishConnection = {
+      amqpConnection: null,
+      creatingConnection: false,
+      connectionCreatedEventName: 'publishConnectionCreated',
+      connectionFailedEventName: 'publishConnectionFailed',
+      blockReconnect: false,
+    };
+    this.consumeConnection = {
+      amqpConnection: null,
+      creatingConnection: false,
+      connectionCreatedEventName: 'consumeConnectionCreated',
+      connectionFailedEventName: 'consumeConnectionFailed',
+      blockReconnect: false,
+    };
     this.creatingConnection = false;
     this.exchanges = {};
     this.queues = {};
@@ -218,10 +241,6 @@ class RabbitMq implements IAfRabbitMq {
     this.consumers = [];
     this.options = options;
 
-    if (!options?.vhost) {
-      this.options.vhost = process.env.VHOST_NAME || 'quorum-vhost';
-    }
-
     this.redisClient = redisConfig && getRedisInstance(redisConfig);
     if (this.redisClient) {
       this.redisLock = promisify(RedisLock(this.redisClient)) as RedisLockType;
@@ -237,11 +256,24 @@ class RabbitMq implements IAfRabbitMq {
       });
     }
 
-    // TODO: DELETE OLD PROPERTIES
+    // TODO: [QUORUM-PHASE-3] Delete the old properties that we use for the old consumers and publishers
     this.oldEm = new EventEmitter();
-    this.oldChannel = null;
+    this.oldPublishChannel = null;
     this.oldPublishChannelSetupPromise = null;
-    this.oldConnection = null;
+    this.oldPublishConnection = {
+      amqpConnection: null,
+      creatingConnection: false,
+      connectionCreatedEventName: 'oldPublishConnectionCreated',
+      connectionFailedEventName: 'oldPublishConnectionFailed',
+      blockReconnect: false,
+    };
+    this.oldConsumeConnection = {
+      amqpConnection: null,
+      creatingConnection: false,
+      connectionCreatedEventName: 'oldConsumeConnectionCreated',
+      connectionFailedEventName: 'oldConsumeConnectionFailed',
+      blockReconnect: false,
+    };
     this.oldCreatingConnection = false;
     this.oldExchanges = {};
     this.oldQueues = {};
@@ -252,57 +284,57 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   private assertVHost = async () => {
-    if (this.isVHostExist) {
+    if (this.doesVHostExist) {
       return;
     }
 
-    if (!this.options?.vhost) {
-      throw new Error('vhost is not defined');
-    }
-
-    const { vhost } = this.options;
-    const auth = {
-      auth: {
-        username: process.env.RABBITMQ_USERNAME || 'guest',
-        password: process.env.RABBITMQ_PASSWORD || 'guest',
-      },
+    const username = process.env.RABBITMQ_USERNAME || 'guest';
+    const password = process.env.RABBITMQ_PASSWORD || 'guest';
+    const credentials = Buffer.from(`${username}:${password}`).toString('base64');
+    const headers = {
+      Authorization: `Basic ${credentials}`,
+      'Content-Type': 'application/json',
     };
-    const rabbitHost = `http://${(this.options.rabbitHost || process.env.RABBITMQ_SERVICE_HOST || 'localhost').split(':')[0]}:15672`;
+
+    const rabbitHost = `http://${(this.options?.rabbitHost || process.env.RABBITMQ_SERVICE_HOST || 'localhost').split(':')[0]}:15672`;
+
+    const url = `${rabbitHost}/api/vhosts/${encodeURIComponent(this.vhost)}`;
 
     try {
-      const response = await axios.get(`${rabbitHost}/api/vhosts/${encodeURIComponent(vhost)}`, auth);
+      const response = await fetch(url, {
+        method: 'GET',
+        headers,
+      });
 
-      if (response.status !== 200) {
-        throw new Error('Failed to check vhost');
+      if (response.status === 200) {
+        this.doesVHostExist = true;
+        logger.info('Vhost exists', { vhost: this.vhost });
+        return;
       }
 
-      this.isVHostExist = true;
-      logger.info('Vhost exists', { vhost });
-    } catch (error) {
-      // If the vhost does not exist, create it
-      if (error instanceof axios.AxiosError && error.response?.status === 404) {
-        try {
-          await axios.put(
-            `${rabbitHost}/api/vhosts/${encodeURIComponent(vhost)}`,
-            {
-              default_queue_type: 'quorum',
-            },
-            auth,
-          );
-
-          this.isVHostExist = true;
-          logger.info('Vhost created', { vhost: this.options?.vhost });
-          return;
-        } catch (createError) {
-          logger.error('Failed to create vhost', { error: createError });
-          throw createError;
-        }
+      if (response.status !== 404) {
+        logger.error('Failed to check vhost', { response });
+        throw new RabbitError('Failed to check vhost');
+      }
+
+      const createResponse = await fetch(url, {
+        method: 'PUT',
+        headers,
+        body: JSON.stringify({ default_queue_type: 'quorum' }),
+      });
+
+      if (!createResponse.ok) {
+        logger.error('Failed to create vhost', { response: createResponse });
+        throw new RabbitError('Failed to create vhost');
       }
 
-      logger.error('Failed to check vhost', { error });
+      this.doesVHostExist = true;
+      logger.info('Vhost created', { vhost: this.vhost });
+    } catch (error) {
+      logger.error('Failed to check or create vhost', { error });
       throw error;
     }
-  }
+  };
 
   private shouldConsumeMessageByTimestamp = async (msg: ConsumeMessageOrNull) => {
     if (msg) {
@@ -351,13 +383,13 @@ class RabbitMq implements IAfRabbitMq {
       if (
         !skipRetry
         && (
-          !msg.properties.headers[RETRY_HEADER]
+          !msg.properties.headers?.[RETRY_HEADER]
           || parseInt(msg.properties.headers[RETRY_HEADER], 10) < options.retries
         )
       ) {
         await this.sendToQueue(queue, RabbitMq.parseMsg(msg).content, options, {
           ...msg.properties.headers,
-          [RETRY_HEADER]: msg.properties.headers[RETRY_HEADER]
+          [RETRY_HEADER]: msg.properties.headers?.[RETRY_HEADER]
             ? msg.properties.headers[RETRY_HEADER] + 1
             : 1,
         });
@@ -365,7 +397,7 @@ class RabbitMq implements IAfRabbitMq {
         const deadQueue = `${queue}-dead`;
         await this.sendToQueue(deadQueue, RabbitMq.parseMsg(msg).content, deadQueueOptions, {
           ...msg.properties.headers,
-          [RETRY_HEADER]: msg.properties.headers[RETRY_HEADER]
+          [RETRY_HEADER]: msg.properties.headers?.[RETRY_HEADER]
             ? msg.properties.headers[RETRY_HEADER] + 1
             : 1,
         });
@@ -379,30 +411,38 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async getConnection() {
+  async getConnection(connection: ConnectionData) {
     return new Promise<AmqpConnectionManager>(async (resolve, reject) => {
-      if (this.blockReconnect) {
+      const {
+        amqpConnection: connectionLocal,
+        creatingConnection,
+        connectionCreatedEventName,
+        connectionFailedEventName,
+        blockReconnect,
+      } = connection;
+
+      if (blockReconnect) {
         debug('rabbit: block reconnect');
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         return resolve();
       }
-      if (this.connection !== null) {
-        if (this.options?.disableReconnect || this.connection?.isConnected()) {
+      if (connectionLocal !== null) {
+        if (this.options?.disableReconnect || connectionLocal?.isConnected()) {
           debug('rabbit: connection - is connected');
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-ignore
-          return resolve(this.connection);
+          return resolve(connectionLocal);
         }
         debug('rabbit: connection - reconnecting');
       }
-      if (this.creatingConnection) {
+      if (creatingConnection) {
         debug('rabbit: creating connection emi');
-        this.em.once(CONNECTION_CREATED_CONST, resolve);
-        this.em.once(CONNECTION_FAILED_CONST, reject);
+        this.em.once(connectionCreatedEventName, resolve);
+        this.em.once(connectionFailedEventName, reject);
         return;
       }
-      this.creatingConnection = true;
+      connection.creatingConnection = true;
       let isResolved = false;
 
       // It is import to use it as a function and not as a variable
@@ -414,65 +454,72 @@ class RabbitMq implements IAfRabbitMq {
         const host = this.options?.rabbitHost || process.env.RABBITMQ_SERVICE_HOST || 'localhost';
 
         debug('rabbit: creating connection', { host, userName, HEARTBEAT });
-        return [`amqp://${userName}:${password}@${host}/${this.options?.vhost}?heartbeat=${HEARTBEAT}`];
+        return [`amqp://${userName}:${password}@${host}/${this.vhost}?heartbeat=${HEARTBEAT}`];
       };
 
       const defaultUrls = findServers();
-      const connection: AmqpConnectionManager = await connect(defaultUrls, {
+      const newConnection: AmqpConnectionManager = await connect(defaultUrls, {
         findServers,
       });
 
-      this.connection = connection;
-      this.connection.on('error', (err) => {
+      connection.amqpConnection = newConnection;
+      newConnection.on('error', (err) => {
         logger.error('rabbit: connection error', { err });
         if (!isResolved) {
           isResolved = true;
           reject(err);
-          this.em.emit(CONNECTION_FAILED_CONST, err);
+          this.em.emit(connectionFailedEventName, err);
         }
       });
 
-      this.connection.on('connectFailed', (err) => {
+      newConnection.on('connectFailed', (err) => {
         this.consumersTags = [];
-        logger.error('rabbit: connection connectFailed', { err, advice: 'Check if the vhost exist', vhost: this.options?.vhost });
+        if (typeof err.url === 'string') {
+          err.url = this.maskURL(err.url);
+        }
+        logger.error('rabbit: connection connectFailed', { err, advice: 'Check if the vhost exist', vhost: this.vhost });
         if (!isResolved) {
           isResolved = true;
           reject(err);
-          this.em.emit(CONNECTION_FAILED_CONST, err);
+          this.em.emit(connectionFailedEventName, err);
         }
       });
 
-      this.connection.on('disconnect', ({ err }) => {
-        // this.channel = null;
+      newConnection.on('disconnect', ({ err }) => {
         this.consumersTags = [];
         debug('rabbit: connection closed');
         if (this.options?.disableReconnect) {
           logger.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
-          this.blockReconnect = true;
+          connection.blockReconnect = true;
         } else {
           logger.error(`${this.RECONNECT_MSG}${err && ` - ${err}`}`);
         }
       });
 
-      this.connection.once('connect', async () => {
+      newConnection.once('connect', async () => {
         debug('rabbit: connection established');
-        this.creatingConnection = false;
-        this.em.emit(CONNECTION_CREATED_CONST, connection);
+        connection.creatingConnection = false;
+        this.em.emit(connectionCreatedEventName, newConnection);
         isResolved = true;
-        resolve(connection);
+        resolve(newConnection);
       });
     });
   }
 
-  async getNewChannel({ name = rand().toString(), onClose = null, options = {} }: newChannelOpts = {}) {
-    let connection!: AmqpConnectionManager;
+  async getNewChannel({
+    name = rand().toString(),
+    onClose = null,
+    options = {},
+    connection,
+  }: newChannelOpts) {
+    let localConnection!: AmqpConnectionManager;
     try {
-      connection = await this.getConnection();
+      localConnection = await this.getConnection(connection);
     } catch (e) {
       logger.error(`rabbit: error on get connection for new channel ${name} `, { e });
       throw e;
     }
-    const channel = connection.createChannel({ ...options });
+    const channel = localConnection?.createChannel({ ...options });
     once(channel, 'close').then((args) => {
       logger.error(`rabbit: channel ${name} closed`);
       onClose?.(args);
@@ -487,19 +534,21 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async assertChannel({ force = false } : assertChannelOpts = {}): Promise<ChannelWrapper> {
+  async assertChannel({ force = false, connection }: assertChannelOpts): Promise<ChannelWrapper> {
     if (!this.publishChannelSetupPromise) {
       this.publishChannelSetupPromise = new Promise<ChannelWrapper>(async (resolve, reject) => {
-        if (this.channel && !force) {
-          return resolve(this.channel);
+        if (this.publishChannel && !force) {
+          return resolve(this.publishChannel);
         }
 
         try {
-          const channel = await this.getNewChannel({});
+          const channel = await this.getNewChannel({ connection });
           channel.on('error', (err) => {
             logger.error('rabbit: channel error', { err });
           });
-          this.channel = channel;
+          if (this.publishConnection === connection) {
+            this.publishChannel = channel;
+          }
           resolve(channel);
         } catch (e) {
           reject(e);
@@ -509,8 +558,8 @@ class RabbitMq implements IAfRabbitMq {
     return this.publishChannelSetupPromise;
   }
 
-  async assertExchange(exchangeName: string, options?: any) {
-    const channel: ChannelWrapper = await this.assertChannel();
+  async assertExchange(exchangeName: string, connection: ConnectionData) {
+    const channel: ChannelWrapper = await this.assertChannel({ connection });
 
     if (this.exchanges[exchangeName]) {
       delete this.assertExchangePromises[exchangeName];
@@ -526,35 +575,34 @@ class RabbitMq implements IAfRabbitMq {
     return this.exchanges[exchangeName];
   }
 
-  // TODO: Change the implementation to the new one
   async getQueueLength(queue: string) {
     RabbitMq.validateName('queue', queue);
-    const { oldChannel: channel } = this;
+    const { publishChannel: channel } = this;
     if (!channel) {
-      throw new Error('channel is not defined');
+      throw new RabbitError('channel is not defined');
     }
-    debug('rabbit: getting queue length', { queue, connected: this.connection?.isConnected() });
+    debug('rabbit: getting queue length', { queue, connected: this.publishConnection.amqpConnection?.isConnected() });
     return channel?.checkQueue(queue);
   }
 
-  private async deleteQueue(queue: string) {
+  private async deleteQueue(queue: string, connection: ConnectionData) {
     RabbitMq.validateName('queue', queue);
-    const channel: ChannelWrapper = await this.assertChannel();
+    const channel: ChannelWrapper = await this.assertChannel({ connection });
     logger.info('rabbit: deleting queue', { queue });
     const deleteQueueRes = await channel.deleteQueue(queue);
     debug('queue deleted', deleteQueueRes);
     return deleteQueueRes;
   }
 
-  // TODO: Change the implementation to the new one
   async bindQueue(queue: string, exchange: string) {
-    const channel: ChannelWrapper = await this.assertChannelOld();
+    const channel: ChannelWrapper = await this.assertChannel({ connection: this.publishConnection });
     await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.bindQueue(queue, exchange, ''));
     return channel.bindQueue(queue, exchange, '');
   }
 
   async setupQueue(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue> {
     let queue: Replies.AssertQueue;
+    const connection = this.publishConnection;
     const localeOptions = {
       ...options,
       durable: true,
@@ -565,7 +613,7 @@ class RabbitMq implements IAfRabbitMq {
       },
     };
     try {
-      const channel: ChannelWrapper = await this.assertChannel();
+      const channel: ChannelWrapper = await this.assertChannel({ connection });
       debug('assertQueue->channel.addSetup', { queueName });
       await channel.addSetup(async (setupChannel: ConfirmChannel) => {
         await setupChannel.assertQueue(queueName, localeOptions);
@@ -576,8 +624,8 @@ class RabbitMq implements IAfRabbitMq {
       logger.error('rabbit: assertQueue error', { queueName, options, error: e });
       if (!this.options?.dontRetryAssert) {
         debug('retrying assertQueue', { queueName });
-        const channel = await this.assertChannel({ force: true });
-        await this.deleteQueue(queueName);
+        const channel = await this.assertChannel({ force: true, connection });
+        await this.deleteQueue(queueName, connection);
 
         debug('retrying assertQueue->channel.addSetup', { queueName });
         await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, localeOptions));
@@ -592,7 +640,7 @@ class RabbitMq implements IAfRabbitMq {
     return queue;
   }
 
-  // TODO: Can be deleted after deleting the old consumers
+  // TODO: [QUORUM-PHASE-3] Can be deleted after deleting the old consumers and publishers because all the queues are created us quorum queues
   static shouldUseQuorum(queueName: string): boolean {
     const envQuorumQueuesWhitelist = process.env.QUORUM_QUEUES_WHITELIST;
 
@@ -637,8 +685,8 @@ 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: USE THE IMPLEMENTATION OF THE NEW CONSUME AND DELETE THE NEW AND OLD
-    if (options?.isQuorumQueue !== false) {
+    // TODO: [QUORUM-PHASE-3] Use only the implementation of consumeNew and delete consumeNew and consumeOld
+    if (options?.isQuorumQueue !== false && DISABLE_QUORUM_QUEUES_CONSUME !== 'true') {
       await this.assertVHost();
       await this.consumeNew(queue, callback, options);
     }
@@ -646,12 +694,12 @@ class RabbitMq implements IAfRabbitMq {
     await this.consumeOld(queue, callback, options);
   }
 
-  // TODO: DELETE
+  // TODO: [QUORUM-PHASE-3] Delete consumeNew we do not use it anymore
   async consumeNew(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
     await this.consumeFromRabbit(queue, callback, options);
   }
 
-  // TODO: DELETE
+  // TODO: [QUORUM-PHASE-3] Delete consumeOld we do not use it anymore
   async consumeOld(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
     await this.consumeFromRabbitOld(queue, callback, options);
   }
@@ -686,11 +734,11 @@ class RabbitMq implements IAfRabbitMq {
     } = optionsWithDefaults;
     if (useConsumeWithLock) {
       if (!this.redisLock) {
-        throw new Error('Usage of consumeWithLock requires RedisInstance');
+        throw new RabbitError('Usage of consumeWithLock requires RedisInstance');
       }
       logger.info(`rabbit: Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
     }
-    const channel = await this.getNewChannel({});
+    const channel = await this.getNewChannel({ connection: this.consumeConnection });
     return channel.addSetup(async (confirmChannel: ConfirmChannel) => {
       const q = await this.assertQueue(queue, optionsWithDefaults);
       await confirmChannel.prefetch(limit, false);
@@ -701,9 +749,9 @@ class RabbitMq implements IAfRabbitMq {
             return null;
           }
 
-          const traceId = msg.properties.headers[TRACING_HEADER];
-          const userId = msg.properties.headers[USER_TRACING_HEADER];
-          const automationId = msg.properties.headers[AUTOMATION_ID_HEADER];
+          const traceId = msg.properties.headers![TRACING_HEADER];
+          const userId = msg.properties.headers![USER_TRACING_HEADER];
+          const automationId = msg.properties.headers![AUTOMATION_ID_HEADER];
           const parsedMessage = RabbitMq.parseMsg(msg);
           const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
           const trace = newTrace(traceTypes.RABBIT);
@@ -786,10 +834,14 @@ class RabbitMq implements IAfRabbitMq {
     RabbitMq.validateName('exchange', exchange);
     RabbitMq.validateName('queue', queue);
     const { limit, deadMessageTtl } = optionsWithDefaults;
-    if (options?.isQuorumQueue !== false) {
+    // TODO: [QUORUM-PHASE-3] Delete the if statement after all the queues are created as quorum queues
+    if (options?.isQuorumQueue !== false && DISABLE_QUORUM_QUEUES_CONSUME !== 'true') {
       await this.assertVHost();
       await this.saveConsumer(queue, callback, options);
-      const channel: ChannelWrapper = await this.getNewChannel({ name: `consume-exchange-${exchange}-queue-${queue}` });
+      const channel: ChannelWrapper = await this.getNewChannel({
+        name: `consume-exchange-${exchange}-queue-${queue}`,
+        connection: this.consumeConnection,
+      });
 
       await channel.addSetup(async (c: ConfirmChannel) => {
         const assertExchange = await assertExchangeFanout(c, exchange);
@@ -806,10 +858,12 @@ class RabbitMq implements IAfRabbitMq {
         ]);
       });
     }
-
-    // TODO: DELETE OLD
+    // 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` });
+    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);
@@ -827,12 +881,25 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   // Used by the microservices to publish messages to the exchange
-  // TODO: Change the implementation to the new one
-  async publish(exchange: string, content: any, customHeaders?: any) : Promise<boolean> {
+  // TODO: [QUORUM-PHASE-3] isQuorumQueue flag is not needed anymore because all the queues are created as quorum queues
+  async publish(exchange: string, content: any, customHeaders?: any, isQuorumQueue = true) : Promise<boolean> {
+    if (isQuorumQueue && DISABLE_QUORUM_QUEUES_PUBLISH !== 'true') {
+      return wrapSetImmediate(async () => {
+        await this.assertVHost();
+        RabbitMq.validateName('exchange', exchange);
+        const channel: ChannelWrapper = await this.assertChannel({ connection: this.publishConnection });
+        await this.assertExchange(exchange, this.publishConnection);
+        await channel.publish(exchange, '',
+          Buffer.from(JSON.stringify(content)),
+          RabbitMq.getPublishOptions(customHeaders));
+      });
+    }
+
+    // TODO: [QUORUM-PHASE-3] Delete the old implementation
     return wrapSetImmediate(async () => {
       RabbitMq.validateName('exchange', exchange);
-      const channel: ChannelWrapper = await this.assertChannelOld();
-      await this.assertExchangeOld(exchange);
+      const channel: ChannelWrapper = await this.assertChannelOld({ connection: this.oldPublishConnection });
+      await this.assertExchangeOld(exchange, this.oldPublishConnection);
       await channel.publish(exchange, '',
         Buffer.from(JSON.stringify(content)),
         RabbitMq.getPublishOptions(customHeaders));
@@ -840,65 +907,97 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   // Used by the microservices to send messages to the queue
-  // TODO: Change the implementation to the new one
+  // TODO: [QUORUM-PHASE-3] isQuorumQueue flag is not needed anymore because all the queues are created as quorum queues
   async sendToQueue(
     queue: string,
     content: any,
     options?: any,
     customHeaders?: any,
+    isQuorumQueue = true,
   ): Promise<boolean | undefined> {
-    try {
-      await this.assertChannelOld();
-    } catch (e) {
-      logger.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
-      throw e;
-    }
+    if (isQuorumQueue && DISABLE_QUORUM_QUEUES_PUBLISH !== 'true') {
+      try {
+        await this.assertVHost();
+        await this.assertChannel({ connection: this.publishConnection });
+      } catch (e) {
+        logger.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
+        throw e;
+      }
 
-    try {
-      RabbitMq.validateName('queue', queue);
-      await this.assertQueueOld(queue, options);
-    } catch (e) {
-      logger.error(`rabbit sendToQueue: failed to assert queue ${queue}`, { e });
-      throw e;
-    }
+      try {
+        RabbitMq.validateName('queue', queue);
+        await this.assertQueue(queue, options);
+      } catch (e) {
+        logger.error(`rabbit sendToQueue: failed to assert queue ${queue}`, { e });
+        throw e;
+      }
 
-    try {
-      const res = await this.oldChannel?.sendToQueue(queue,
-        Buffer.from(JSON.stringify(content)),
-        RabbitMq.getPublishOptions(customHeaders));
-      debug(`rabbit: sending to queue ${queue}`, { res });
-      return res;
-    } catch (e) {
-      const isConnected = await this.isConnected();
-      logger.error(`rabbit sendToQueue: failed to send to queue ${queue}, isConnected: ${isConnected}`, { e });
-      throw e;
+      try {
+        const res = await this.publishChannel?.sendToQueue(queue,
+          Buffer.from(JSON.stringify(content)),
+          RabbitMq.getPublishOptions(customHeaders));
+        debug(`rabbit: sending to queue ${queue}`, { res });
+        return res;
+      } catch (e) {
+        const isConnected = await this.isConnected();
+        logger.error(`rabbit sendToQueue: failed to send to queue ${queue}, isConnected: ${isConnected}`, { e });
+        throw e;
+      }
+    } else {
+      try {
+        await this.assertChannelOld({ connection: this.oldPublishConnection });
+      } catch (e) {
+        logger.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
+        throw e;
+      }
+
+      try {
+        RabbitMq.validateName('queue', queue);
+        await this.assertQueueOld(queue, options);
+      } catch (e) {
+        logger.error(`rabbit sendToQueue: failed to assert queue ${queue}`, { e });
+        throw e;
+      }
+
+      try {
+        const res = await this.oldPublishChannel?.sendToQueue(queue,
+          Buffer.from(JSON.stringify(content)),
+          RabbitMq.getPublishOptions(customHeaders));
+        debug(`rabbit: sending to queue ${queue}`, { res });
+        return res;
+      } catch (e) {
+        const isConnected = await this.isConnectedOld();
+        logger.error(`rabbit sendToQueue: failed to send to queue ${queue}, isConnected: ${isConnected}`, { e });
+        throw e;
+      }
     }
   }
 
-  // TODO: After changing the publish to the new implementation change the from the old to the new
-  async isConnected() : Promise<boolean> {
-    const connection = await this.getConnectionOld();
-    const isConnected = connection.isConnected();
+  async isConnected(): Promise<boolean> {
+    debug('rabbit: start old is connected');
+    const consumeConnection = await this.getConnection(this.consumeConnection);
+    const publishConnection = await this.getConnection(this.publishConnection);
+    const isConnected = consumeConnection.isConnected() && publishConnection.isConnected();
     if (!isConnected) {
-      logger.error('rabbit: isConnected - false');
+      logger.error('rabbit: old isConnected - false');
       return false;
     }
-    const channel: any = await this.assertChannelOld();
+    const channel: any = await this.assertChannel({ connection: this.publishConnection });
     try {
       await Promise.all([
         channel.waitForConnect(),
-        ...this.oldConsumers.map((c: AfConsumer) => channel.checkQueue(c.queue)),
+        ...this.consumers.map((c: AfConsumer) => channel.checkQueue(c.queue)),
       ]);
     } catch (e) {
       logger.error('rabbit: isConnected - false');
       return false;
     }
-    logger.info('rabbit: isConnected - true');
+    logger.debug('rabbit: isConnected - true');
     return true;
   }
 
   async gracefulShutdown(signal: string) : Promise<void> {
-    // TODO: DELETE OLD
+    // TODO: [QUORUM-PHASE-3] Delete the old implementation they are not needed anymore
     const tagsNumber = this.consumersTags.length + this.oldConsumersTags.length;
     logger.info(`rabbit: [gracefully-shutdown] received ${signal}! canceling #${tagsNumber} tags...`);
     const cancelTagPromises = this.consumersTags.map(([channel, tag]) => channel.cancel(tag));
@@ -925,11 +1024,11 @@ class RabbitMq implements IAfRabbitMq {
     } = optionsWithDefaults;
     if (useConsumeWithLock) {
       if (!this.redisLock) {
-        throw new Error('Usage of consumeWithLock requires RedisInstance');
+        throw new RabbitError('Usage of consumeWithLock requires RedisInstance');
       }
       logger.info(`rabbit: Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
     }
-    const channel = await this.getNewChannelOld({});
+    const channel = await this.getNewChannelOld({ connection: this.oldConsumeConnection });
     return channel.addSetup(async (confirmChannel: ConfirmChannel) => {
       const q = await this.assertQueueOld(queue, optionsWithDefaults);
       await confirmChannel.prefetch(limit, false);
@@ -940,9 +1039,9 @@ class RabbitMq implements IAfRabbitMq {
             return null;
           }
 
-          const traceId = msg.properties.headers[TRACING_HEADER];
-          const userId = msg.properties.headers[USER_TRACING_HEADER];
-          const automationId = msg.properties.headers[AUTOMATION_ID_HEADER];
+          const traceId = msg.properties.headers![TRACING_HEADER];
+          const userId = msg.properties.headers![USER_TRACING_HEADER];
+          const automationId = msg.properties.headers![AUTOMATION_ID_HEADER];
           const parsedMessage = RabbitMq.parseMsg(msg);
           const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
           const trace = newTrace(traceTypes.RABBIT);
@@ -1019,16 +1118,26 @@ class RabbitMq implements IAfRabbitMq {
     });
   }
 
-  // TODO: DELETE OLD PROPERTIES UNDER THIS LINE
-  async getNewChannelOld({ name = rand().toString(), onClose = null, options = {} }: newChannelOpts = {}) {
-    let connection!: AmqpConnectionManager;
+  // TODO: [QUORUM-PHASE-3] Delete all the function under this line.
+  async getNewChannelOld({
+    name = rand().toString(),
+    onClose = null,
+    options = {},
+    connection,
+  }: newChannelOpts) {
+    let localConnection!: AmqpConnectionManager;
     try {
-      connection = await this.getConnectionOld();
+      localConnection = await this.getConnectionOld(connection);
     } catch (e) {
       logger.error(`rabbit: error on get connection for new channel ${name} `, { e });
       throw e;
     }
-    const channel = connection.createChannel({ ...options });
+
+    if (!localConnection) {
+      throw new Error(`rabbit: couldnt get connection for new channel ${name}`);
+    }
+
+    const channel = localConnection?.createChannel({ ...options });
     once(channel, 'close').then((args) => {
       logger.error(`rabbit: channel ${name} closed`);
       onClose?.(args);
@@ -1043,30 +1152,38 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async getConnectionOld() {
+  async getConnectionOld(connection: ConnectionData) {
     return new Promise<AmqpConnectionManager>(async (resolve, reject) => {
-      if (this.oldBlockReconnect) {
+      const {
+        amqpConnection: connectionLocal,
+        creatingConnection,
+        connectionCreatedEventName,
+        connectionFailedEventName,
+        blockReconnect,
+      } = connection;
+
+      if (blockReconnect) {
         debug('rabbit: block reconnect');
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         return resolve();
       }
-      if (this.oldConnection !== null) {
-        if (this.options?.disableReconnect || this.oldConnection?.isConnected()) {
+      if (connectionLocal !== null) {
+        if (this.options?.disableReconnect || connectionLocal?.isConnected()) {
           debug('rabbit: connection - is connected');
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-ignore
-          return resolve(this.oldConnection);
+          return resolve(connectionLocal);
         }
         debug('rabbit: connection - reconnecting');
       }
-      if (this.oldCreatingConnection) {
+      if (creatingConnection) {
         debug('rabbit: creating connection emi');
-        this.oldEm.once(CONNECTION_CREATED_CONST, resolve);
-        this.oldEm.once(CONNECTION_FAILED_CONST, reject);
+        this.oldEm.once(connectionCreatedEventName, resolve);
+        this.oldEm.once(connectionFailedEventName, reject);
         return;
       }
-      this.oldCreatingConnection = true;
+      connection.creatingConnection = true;
       let isResolved = false;
 
       // It is import to use it as a function and not as a variable
@@ -1083,47 +1200,50 @@ class RabbitMq implements IAfRabbitMq {
       };
 
       const defaultUrls = findServers();
-      const connection: AmqpConnectionManager = await connect(defaultUrls, {
+      const newConnection: AmqpConnectionManager = await connect(defaultUrls, {
         findServers,
       });
 
-      this.oldConnection = connection;
-      this.oldConnection.on('error', (err) => {
+      connection.amqpConnection = newConnection;
+      newConnection.on('error', (err) => {
         logger.error('rabbit: connection error', { err });
         if (!isResolved) {
           isResolved = true;
           reject(err);
-          this.oldEm.emit(CONNECTION_FAILED_CONST, err);
+          this.oldEm.emit(connectionFailedEventName, err);
         }
       });
 
-      this.oldConnection.on('connectFailed', (err) => {
+      newConnection.on('connectFailed', (err) => {
         this.oldConsumersTags = [];
+        if (typeof err.url === 'string') {
+          err.url = this.maskURL(err.url);
+        }
         logger.error('rabbit: connection connectFailed', { err });
         if (!isResolved) {
           isResolved = true;
           reject(err);
-          this.oldEm.emit(CONNECTION_FAILED_CONST, err);
+          this.oldEm.emit(connectionFailedEventName, err);
         }
       });
 
-      this.oldConnection.on('disconnect', ({ err }) => {
+      newConnection.on('disconnect', ({ err }) => {
         this.oldConsumersTags = [];
         debug('rabbit: connection closed');
         if (this.options?.disableReconnect) {
           logger.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
-          this.oldBlockReconnect = true;
+          connection.blockReconnect = true;
         } else {
           logger.error(`${this.RECONNECT_MSG}${err && ` - ${err}`}`);
         }
       });
 
-      this.oldConnection.once('connect', async () => {
+      newConnection.once('connect', async () => {
         debug('rabbit: connection established');
-        this.oldCreatingConnection = false;
-        this.oldEm.emit(CONNECTION_CREATED_CONST, connection);
+        connection.creatingConnection = false;
+        this.oldEm.emit(connectionCreatedEventName, newConnection);
         isResolved = true;
-        resolve(connection);
+        resolve(newConnection);
       });
     });
   }
@@ -1157,6 +1277,7 @@ class RabbitMq implements IAfRabbitMq {
 
   async setupQueueOld(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue> {
     let queue: Replies.AssertQueue;
+    const connection = this.oldPublishConnection;
     const shouldUseQuorum = RabbitMq.shouldUseQuorum(queueName);
     const localeOptions = {
       ...options,
@@ -1168,7 +1289,7 @@ class RabbitMq implements IAfRabbitMq {
       },
     };
     try {
-      const channel: ChannelWrapper = await this.assertChannelOld();
+      const channel: ChannelWrapper = await this.assertChannelOld({ connection });
       debug('assertQueue->channel.addSetup', { queueName });
       await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, localeOptions));
       debug('assertQueue->channel.assertQueue', { queueName });
@@ -1177,8 +1298,8 @@ class RabbitMq implements IAfRabbitMq {
       logger.error('rabbit: assertQueue error', { queueName, options, error: e });
       if (!this.options?.dontRetryAssert) {
         debug('retrying assertQueue', { queueName });
-        const channel = await this.assertChannelOld({ force: true });
-        await this.deleteQueueOld(queueName);
+        const channel = await this.assertChannelOld({ force: true, connection });
+        await this.deleteQueueOld(queueName, connection);
 
         debug('retrying assertQueue->channel.addSetup', { queueName });
         await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, localeOptions));
@@ -1193,19 +1314,21 @@ class RabbitMq implements IAfRabbitMq {
     return queue;
   }
 
-  async assertChannelOld({ force = false } : assertChannelOpts = {}): Promise<ChannelWrapper> {
+  async assertChannelOld({ force = false, connection }: assertChannelOpts): Promise<ChannelWrapper> {
     if (!this.oldPublishChannelSetupPromise) {
       this.oldPublishChannelSetupPromise = new Promise<ChannelWrapper>(async (resolve, reject) => {
-        if (this.oldChannel && !force) {
-          return resolve(this.oldChannel);
+        if (this.oldPublishChannel && !force) {
+          return resolve(this.oldPublishChannel);
         }
 
         try {
-          const channel = await this.getNewChannelOld({});
+          const channel = await this.getNewChannelOld({ connection });
           channel.on('error', (err) => {
             logger.error('rabbit: channel error', { err });
           });
-          this.oldChannel = channel;
+          if (this.oldPublishConnection === connection) {
+            this.oldPublishChannel = channel;
+          }
           resolve(channel);
         } catch (e) {
           reject(e);
@@ -1215,17 +1338,17 @@ class RabbitMq implements IAfRabbitMq {
     return this.oldPublishChannelSetupPromise;
   }
 
-  private async deleteQueueOld(queue: string) {
+  private async deleteQueueOld(queue: string, connection: ConnectionData) {
     RabbitMq.validateName('queue', queue);
-    const channel: ChannelWrapper = await this.assertChannelOld();
+    const channel: ChannelWrapper = await this.assertChannelOld({ connection });
     logger.info('rabbit: deleting queue', { queue });
     const deleteQueueRes = await channel.deleteQueue(queue);
     debug('queue deleted', deleteQueueRes);
     return deleteQueueRes;
   }
 
-  async assertExchangeOld(exchangeName: string, options?: any) {
-    const channel: ChannelWrapper = await this.assertChannelOld();
+  async assertExchangeOld(exchangeName: string, connection: ConnectionData) {
+    const channel: ChannelWrapper = await this.assertChannelOld({ connection });
 
     if (this.oldExchanges[exchangeName]) {
       delete this.oldAssertExchangePromises[exchangeName];
@@ -1240,6 +1363,40 @@ class RabbitMq implements IAfRabbitMq {
     this.oldExchanges[exchangeName] = await this.oldAssertExchangePromises[exchangeName];
     return this.oldExchanges[exchangeName];
   }
+
+  async isConnectedOld() : Promise<boolean> {
+    debug('rabbit: start old is connected');
+    const oldConsumeConnection = await this.getConnectionOld(this.oldConsumeConnection);
+    const oldPublishConnection = await this.getConnectionOld(this.oldPublishConnection);
+    const oldIsConnected = oldConsumeConnection.isConnected() && oldPublishConnection.isConnected();
+    if (!oldIsConnected) {
+      logger.error('rabbit: old isConnected - false');
+      return false;
+    }
+    const oldChannel: any = await this.assertChannelOld({ connection: this.oldPublishConnection });
+    try {
+      await Promise.all([
+        oldChannel.waitForConnect(),
+        ...this.oldConsumers.map((c: AfConsumer) => oldChannel.checkQueue(c.queue)),
+      ]);
+    } catch (e) {
+      logger.error('rabbit: old isConnected - false');
+      return false;
+    }
+    logger.debug('rabbit: old isConnected - true');
+    return true;
+  }
+
+  private maskURL = (url: string): string => {
+    try {
+      const urlObj = new URL(url);
+      urlObj.username = '***';
+      urlObj.password = '***';
+      return urlObj.toString();
+    } catch {
+      return url;
+    }
+  }
 }
 
 export default RabbitMq;