@autofleet/rabbit 3.6.0-beta---beta.0.0 → 4.0.0-beta.0

package/src/index.ts

@@ -1,4 +1,5 @@
-/* eslint-disable no-empty,consistent-return,no-async-promise-executor,@typescript-eslint/no-unused-vars,no-param-reassign */
+/* eslint-disable no-empty,consistent-return,no-async-promise-executor,@typescript-eslint/no-unused-vars */
+
 import { EventEmitter, once } from 'events';
 import { promisify } from 'util';
 import moment from 'moment';
@@ -13,12 +14,15 @@ 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,
@@ -37,7 +41,6 @@ import {
   CONSUMER_DEFAULT_OPTIONS,
   QueueSetupPromisesDictionary,
   AssertExchangePromisesDictionary,
-  ConnectionData,
 } from './lib/types';
 
 // const debug = nodeDebug('af-rabbitmq')
@@ -45,11 +48,6 @@ const debug = logger.debug.bind(logger);
 
 const PUBLISH_TIMEOUT = 1000 * 10;
 
-// TODO: [QUORUM-PHASE-3] Delete this env var
-const {
-  DISABLE_QUORUM_QUEUES,
-} = process.env;
-
 export interface IAfRabbitMq {
   ack: any;
   nack: any;
@@ -83,19 +81,19 @@ export interface AfRabbitOptions {
   dontRetryAssert?: boolean;
 
   rabbitHost?: string;
+
+  vhost?: string;
 }
 
 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 = {
@@ -148,15 +146,13 @@ class RabbitMq implements IAfRabbitMq {
 
   RECONNECT_MSG = 'rabbit: connection disconnect - reconnecting';
 
-  publishChannel: ChannelWrapper | null;
+  channel: ChannelWrapper | null;
 
   publishChannelSetupPromise: Promise<ChannelWrapper> | null;
 
   blockReconnect: boolean | null | undefined
 
-  publishConnection: ConnectionData
-
-  consumeConnection: ConnectionData
+  connection: AmqpConnectionManager | null | undefined
 
   em: EventEmitter;
 
@@ -181,22 +177,17 @@ class RabbitMq implements IAfRabbitMq {
 
   private consumers: Array<AfConsumer> = [];
 
-  private doesVHostExist = false;
+  private isVHostExist = false;
 
-  private vhost = 'quorum-vhost';
+  // TODO: DELETE OLD PROPERTIES
 
-  private needsConsumerReestablishment = false;
-
-  // TODO:[QUORUM-PHASE-3] Delete the old properties that we use for the old consumers and publishers
-  oldPublishChannel: ChannelWrapper | null;
+  oldChannel: ChannelWrapper | null;
 
   oldPublishChannelSetupPromise: Promise<ChannelWrapper> | null;
 
   oldBlockReconnect: boolean | null | undefined
 
-  oldPublishConnection: ConnectionData
-
-  oldConsumeConnection: ConnectionData
+  oldConnection: AmqpConnectionManager | null | undefined
 
   oldEm: EventEmitter;
 
@@ -214,26 +205,11 @@ class RabbitMq implements IAfRabbitMq {
 
   private oldConsumers: Array<AfConsumer> = [];
 
-  private oldNeedsConsumerReestablishment = false;
-
   constructor(options: AfRabbitOptions = {}, redisConfig?: RedisConfig) {
     this.em = new EventEmitter();
-    this.publishChannel = null;
+    this.channel = null;
     this.publishChannelSetupPromise = 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.connection = null;
     this.creatingConnection = false;
     this.exchanges = {};
     this.queues = {};
@@ -242,6 +218,10 @@ 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;
@@ -257,24 +237,11 @@ class RabbitMq implements IAfRabbitMq {
       });
     }
 
-    // TODO: [QUORUM-PHASE-3] Delete the old properties that we use for the old consumers and publishers
+    // TODO: DELETE OLD PROPERTIES
     this.oldEm = new EventEmitter();
-    this.oldPublishChannel = null;
+    this.oldChannel = null;
     this.oldPublishChannelSetupPromise = 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.oldConnection = null;
     this.oldCreatingConnection = false;
     this.oldExchanges = {};
     this.oldQueues = {};
@@ -285,57 +252,57 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   private assertVHost = async () => {
-    if (this.doesVHostExist) {
+    if (this.isVHostExist) {
       return;
     }
 
-    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`;
+    if (!this.options?.vhost) {
+      throw new Error('vhost is not defined');
+    }
 
-    const url = `${rabbitHost}/api/vhosts/${encodeURIComponent(this.vhost)}`;
+    const { vhost } = this.options;
+    const auth = {
+      auth: {
+        username: process.env.RABBITMQ_USERNAME || 'guest',
+        password: process.env.RABBITMQ_PASSWORD || 'guest',
+      },
+    };
+    const rabbitHost = `http://${(this.options.rabbitHost || process.env.RABBITMQ_SERVICE_HOST || 'localhost').split(':')[0]}:15672`;
 
     try {
-      const response = await fetch(url, {
-        method: 'GET',
-        headers,
-      });
+      const response = await axios.get(`${rabbitHost}/api/vhosts/${encodeURIComponent(vhost)}`, auth);
 
-      if (response.status === 200) {
-        this.doesVHostExist = true;
-        logger.info('Vhost exists', { vhost: this.vhost });
-        return;
-      }
-
-      if (response.status !== 404) {
-        logger.error('Failed to check vhost', { response });
-        throw new RabbitError('Failed to check vhost');
+      if (response.status !== 200) {
+        throw new Error('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');
+      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;
+        }
       }
 
-      this.doesVHostExist = true;
-      logger.info('Vhost created', { vhost: this.vhost });
-    } catch (error) {
-      logger.error('Failed to check or create vhost', { error });
+      logger.error('Failed to check vhost', { error });
       throw error;
     }
-  };
+  }
 
   private shouldConsumeMessageByTimestamp = async (msg: ConsumeMessageOrNull) => {
     if (msg) {
@@ -384,13 +351,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,
         });
@@ -398,7 +365,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,
         });
@@ -412,38 +379,30 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async getConnection(connection: ConnectionData) {
+  async getConnection() {
     return new Promise<AmqpConnectionManager>(async (resolve, reject) => {
-      const {
-        amqpConnection: connectionLocal,
-        creatingConnection,
-        connectionCreatedEventName,
-        connectionFailedEventName,
-        blockReconnect,
-      } = connection;
-
-      if (blockReconnect) {
+      if (this.blockReconnect) {
         debug('rabbit: block reconnect');
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         return resolve();
       }
-      if (connectionLocal !== null) {
-        if (this.options?.disableReconnect || connectionLocal?.isConnected()) {
+      if (this.connection !== null) {
+        if (this.options?.disableReconnect || this.connection?.isConnected()) {
           debug('rabbit: connection - is connected');
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-ignore
-          return resolve(connectionLocal);
+          return resolve(this.connection);
         }
         debug('rabbit: connection - reconnecting');
       }
-      if (creatingConnection) {
+      if (this.creatingConnection) {
         debug('rabbit: creating connection emi');
-        this.em.once(connectionCreatedEventName, resolve);
-        this.em.once(connectionFailedEventName, reject);
+        this.em.once(CONNECTION_CREATED_CONST, resolve);
+        this.em.once(CONNECTION_FAILED_CONST, reject);
         return;
       }
-      connection.creatingConnection = true;
+      this.creatingConnection = true;
       let isResolved = false;
 
       // It is import to use it as a function and not as a variable
@@ -455,88 +414,65 @@ 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.vhost}?heartbeat=${HEARTBEAT}`];
+        return [`amqp://${userName}:${password}@${host}/${this.options?.vhost}?heartbeat=${HEARTBEAT}`];
       };
 
       const defaultUrls = findServers();
-      const newConnection: AmqpConnectionManager = await connect(defaultUrls, {
+      const connection: AmqpConnectionManager = await connect(defaultUrls, {
         findServers,
       });
 
-      connection.amqpConnection = newConnection;
-      newConnection.on('error', (err) => {
+      this.connection = connection;
+      this.connection.on('error', (err) => {
         logger.error('rabbit: connection error', { err });
         if (!isResolved) {
           isResolved = true;
           reject(err);
-          this.em.emit(connectionFailedEventName, err);
+          this.em.emit(CONNECTION_FAILED_CONST, err);
         }
       });
 
-      newConnection.on('connectFailed', (err) => {
+      this.connection.on('connectFailed', (err) => {
         this.consumersTags = [];
-        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 });
+        logger.error('rabbit: connection connectFailed', { err, advice: 'Check if the vhost exist', vhost: this.options?.vhost });
         if (!isResolved) {
           isResolved = true;
           reject(err);
-          this.em.emit(connectionFailedEventName, err);
+          this.em.emit(CONNECTION_FAILED_CONST, err);
         }
       });
 
-      newConnection.on('disconnect', ({ err }) => {
-        this.publishChannel = null;
-        this.publishChannelSetupPromise = null;
+      this.connection.on('disconnect', ({ err }) => {
+        // this.channel = null;
         this.consumersTags = [];
-        if (this.consumers.length > 0) {
-          this.needsConsumerReestablishment = true;
-        }
         debug('rabbit: connection closed');
         if (this.options?.disableReconnect) {
           logger.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
-          connection.blockReconnect = true;
+          this.blockReconnect = true;
         } else {
           logger.error(`${this.RECONNECT_MSG}${err && ` - ${err}`}`);
         }
       });
 
-      newConnection.once('connect', async () => {
+      this.connection.once('connect', async () => {
         debug('rabbit: connection established');
-        connection.creatingConnection = false;
-        this.em.emit(connectionCreatedEventName, newConnection);
+        this.creatingConnection = false;
+        this.em.emit(CONNECTION_CREATED_CONST, connection);
         isResolved = true;
-        resolve(newConnection);
-
-        // Re-establish consumers after reconnection
-        if (connection === this.consumeConnection && this.needsConsumerReestablishment) {
-          logger.info(`rabbit: re-establishing ${this.consumers.length} consumers after reconnection`);
-          const reestablishPromises = this.consumers.map(async (consumer) => {
-            try {
-              await this.consumeFromRabbit(consumer.queue, consumer.callback, consumer.options);
-            } catch (e) {
-              logger.error(`rabbit: failed to re-establish consumer for queue ${consumer.queue}`, { e });
-            }
-          });
-          await Promise.all(reestablishPromises);
-          this.needsConsumerReestablishment = false;
-        }
+        resolve(connection);
       });
     });
   }
 
-  async getNewChannel({
-    name = rand().toString(), onClose = null, options = {}, connection,
-  }: newChannelOpts) {
-    let localConnection!: AmqpConnectionManager;
+  async getNewChannel({ name = rand().toString(), onClose = null, options = {} }: newChannelOpts = {}) {
+    let connection!: AmqpConnectionManager;
     try {
-      localConnection = await this.getConnection(connection);
+      connection = await this.getConnection();
     } catch (e) {
       logger.error(`rabbit: error on get connection for new channel ${name} `, { e });
       throw e;
     }
-    const channel = localConnection?.createChannel({ ...options });
+    const channel = connection.createChannel({ ...options });
     once(channel, 'close').then((args) => {
       logger.error(`rabbit: channel ${name} closed`);
       onClose?.(args);
@@ -551,31 +487,21 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async assertChannel({ force = false, connection }: assertChannelOpts): Promise<ChannelWrapper> {
-    if (!this.publishChannelSetupPromise || force) {
+  async assertChannel({ force = false } : assertChannelOpts = {}): Promise<ChannelWrapper> {
+    if (!this.publishChannelSetupPromise) {
       this.publishChannelSetupPromise = new Promise<ChannelWrapper>(async (resolve, reject) => {
-        if (this.publishChannel && !force && connection.amqpConnection?.isConnected()) {
-          return resolve(this.publishChannel);
+        if (this.channel && !force) {
+          return resolve(this.channel);
         }
 
         try {
-          const channel = await this.getNewChannel({ connection });
+          const channel = await this.getNewChannel({});
           channel.on('error', (err) => {
             logger.error('rabbit: channel error', { err });
-            this.publishChannel = null;
-            this.publishChannelSetupPromise = null;
-          });
-          channel.on('close', () => {
-            logger.error('rabbit: channel closed');
-            this.publishChannel = null;
-            this.publishChannelSetupPromise = null;
           });
-          if (this.publishConnection === connection) {
-            this.publishChannel = channel;
-          }
+          this.channel = channel;
           resolve(channel);
         } catch (e) {
-          this.publishChannelSetupPromise = null;
           reject(e);
         }
       });
@@ -583,8 +509,8 @@ class RabbitMq implements IAfRabbitMq {
     return this.publishChannelSetupPromise;
   }
 
-  async assertExchange(exchangeName: string, connection: ConnectionData) {
-    const channel: ChannelWrapper = await this.assertChannel({ connection });
+  async assertExchange(exchangeName: string, options?: any) {
+    const channel: ChannelWrapper = await this.assertChannel();
 
     if (this.exchanges[exchangeName]) {
       delete this.assertExchangePromises[exchangeName];
@@ -600,36 +526,35 @@ class RabbitMq implements IAfRabbitMq {
     return this.exchanges[exchangeName];
   }
 
-  // TODO: [QUORUM-PHASE-2] Change the implementation to the new one
+  // TODO: Change the implementation to the new one
   async getQueueLength(queue: string) {
     RabbitMq.validateName('queue', queue);
-    const { oldPublishChannel: channel } = this;
+    const { oldChannel: channel } = this;
     if (!channel) {
-      throw new RabbitError('channel is not defined');
+      throw new Error('channel is not defined');
     }
-    debug('rabbit: getting queue length', { queue, connected: this.oldPublishConnection.amqpConnection?.isConnected() });
+    debug('rabbit: getting queue length', { queue, connected: this.connection?.isConnected() });
     return channel?.checkQueue(queue);
   }
 
-  private async deleteQueue(queue: string, connection: ConnectionData) {
+  private async deleteQueue(queue: string) {
     RabbitMq.validateName('queue', queue);
-    const channel: ChannelWrapper = await this.assertChannel({ connection });
+    const channel: ChannelWrapper = await this.assertChannel();
     logger.info('rabbit: deleting queue', { queue });
     const deleteQueueRes = await channel.deleteQueue(queue);
     debug('queue deleted', deleteQueueRes);
     return deleteQueueRes;
   }
 
-  // TODO: [QUORUM-PHASE-2] Change the implementation to the new one
+  // TODO: Change the implementation to the new one
   async bindQueue(queue: string, exchange: string) {
-    const channel: ChannelWrapper = await this.assertChannelOld({ connection: this.oldPublishConnection });
+    const channel: ChannelWrapper = await this.assertChannelOld();
     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,
@@ -640,7 +565,7 @@ class RabbitMq implements IAfRabbitMq {
       },
     };
     try {
-      const channel: ChannelWrapper = await this.assertChannel({ connection });
+      const channel: ChannelWrapper = await this.assertChannel();
       debug('assertQueue->channel.addSetup', { queueName });
       await channel.addSetup(async (setupChannel: ConfirmChannel) => {
         await setupChannel.assertQueue(queueName, localeOptions);
@@ -651,8 +576,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, connection });
-        await this.deleteQueue(queueName, connection);
+        const channel = await this.assertChannel({ force: true });
+        await this.deleteQueue(queueName);
 
         debug('retrying assertQueue->channel.addSetup', { queueName });
         await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, localeOptions));
@@ -667,7 +592,7 @@ class RabbitMq implements IAfRabbitMq {
     return queue;
   }
 
-  // TODO: [QUORUM-PHASE-3] Can be deleted after deleting the old consumers and publishers because all the queues are created us quorum queues
+  // TODO: Can be deleted after deleting the old consumers
   static shouldUseQuorum(queueName: string): boolean {
     const envQuorumQueuesWhitelist = process.env.QUORUM_QUEUES_WHITELIST;
 
@@ -712,8 +637,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: [QUORUM-PHASE-3] Use only the implementation of consumeNew and delete consumeNew and consumeOld
-    if (options?.isQuorumQueue !== false && DISABLE_QUORUM_QUEUES !== 'true') {
+    // TODO: USE THE IMPLEMENTATION OF THE NEW CONSUME AND DELETE THE NEW AND OLD
+    if (options?.isQuorumQueue !== false) {
       await this.assertVHost();
       await this.consumeNew(queue, callback, options);
     }
@@ -721,12 +646,12 @@ class RabbitMq implements IAfRabbitMq {
     await this.consumeOld(queue, callback, options);
   }
 
-  // TODO: [QUORUM-PHASE-3] Delete consumeNew we do not use it anymore
+  // TODO: DELETE
   async consumeNew(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
     await this.consumeFromRabbit(queue, callback, options);
   }
 
-  // TODO: [QUORUM-PHASE-3] Delete consumeOld we do not use it anymore
+  // TODO: DELETE
   async consumeOld(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
     await this.consumeFromRabbitOld(queue, callback, options);
   }
@@ -761,11 +686,11 @@ class RabbitMq implements IAfRabbitMq {
     } = optionsWithDefaults;
     if (useConsumeWithLock) {
       if (!this.redisLock) {
-        throw new RabbitError('Usage of consumeWithLock requires RedisInstance');
+        throw new Error('Usage of consumeWithLock requires RedisInstance');
       }
       logger.info(`rabbit: Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
     }
-    const channel = await this.getNewChannel({ connection: this.consumeConnection });
+    const channel = await this.getNewChannel({});
     return channel.addSetup(async (confirmChannel: ConfirmChannel) => {
       const q = await this.assertQueue(queue, optionsWithDefaults);
       await confirmChannel.prefetch(limit, false);
@@ -776,9 +701,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);
@@ -861,14 +786,10 @@ class RabbitMq implements IAfRabbitMq {
     RabbitMq.validateName('exchange', exchange);
     RabbitMq.validateName('queue', queue);
     const { limit, deadMessageTtl } = optionsWithDefaults;
-    // TODO: [QUORUM-PHASE-3] Delete the if statement after all the queues are created as quorum queues
-    if (options?.isQuorumQueue !== false && DISABLE_QUORUM_QUEUES !== 'true') {
+    if (options?.isQuorumQueue !== false) {
       await this.assertVHost();
       await this.saveConsumer(queue, callback, options);
-      const channel: ChannelWrapper = await this.getNewChannel({
-        name: `consume-exchange-${exchange}-queue-${queue}`,
-        connection: this.consumeConnection,
-      });
+      const channel: ChannelWrapper = await this.getNewChannel({ name: `consume-exchange-${exchange}-queue-${queue}` });
 
       await channel.addSetup(async (c: ConfirmChannel) => {
         const assertExchange = await assertExchangeFanout(c, exchange);
@@ -885,12 +806,10 @@ class RabbitMq implements IAfRabbitMq {
         ]);
       });
     }
-    // TODO: [QUORUM-PHASE-3] Delete the old implementation
+
+    // TODO: DELETE OLD
     await this.saveConsumerOld(queue, callback, options);
-    const channelOld: ChannelWrapper = await this.getNewChannelOld({
-      name: `consume-exchange-${exchange}-queue-${queue}-old`,
-      connection: this.oldConsumeConnection,
-    });
+    const channelOld: ChannelWrapper = await this.getNewChannelOld({ name: `consume-exchange-${exchange}-queue-${queue}-old` });
     await channelOld.addSetup(async (c: ConfirmChannel) => {
       const assertExchange = await assertExchangeFanout(c, exchange);
       await c.assertQueue(queue);
@@ -908,12 +827,12 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   // Used by the microservices to publish messages to the exchange
-  // TODO: [QUORUM-PHASE-2] Change the implementation to the new one
+  // TODO: Change the implementation to the new one
   async publish(exchange: string, content: any, customHeaders?: any) : Promise<boolean> {
     return wrapSetImmediate(async () => {
       RabbitMq.validateName('exchange', exchange);
-      const channel: ChannelWrapper = await this.assertChannelOld({ connection: this.oldPublishConnection });
-      await this.assertExchangeOld(exchange, this.oldPublishConnection);
+      const channel: ChannelWrapper = await this.assertChannelOld();
+      await this.assertExchangeOld(exchange);
       await channel.publish(exchange, '',
         Buffer.from(JSON.stringify(content)),
         RabbitMq.getPublishOptions(customHeaders));
@@ -921,7 +840,7 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   // Used by the microservices to send messages to the queue
-  // TODO: [QUORUM-PHASE-2] Change the implementation to the new one
+  // TODO: Change the implementation to the new one
   async sendToQueue(
     queue: string,
     content: any,
@@ -929,7 +848,7 @@ class RabbitMq implements IAfRabbitMq {
     customHeaders?: any,
   ): Promise<boolean | undefined> {
     try {
-      await this.assertChannelOld({ connection: this.oldPublishConnection });
+      await this.assertChannelOld();
     } catch (e) {
       logger.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
       throw e;
@@ -944,7 +863,7 @@ class RabbitMq implements IAfRabbitMq {
     }
 
     try {
-      const res = await this.oldPublishChannel?.sendToQueue(queue,
+      const res = await this.oldChannel?.sendToQueue(queue,
         Buffer.from(JSON.stringify(content)),
         RabbitMq.getPublishOptions(customHeaders));
       debug(`rabbit: sending to queue ${queue}`, { res });
@@ -956,32 +875,30 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  // TODO: [QUORUM-PHASE-2] After changing the publish from old to new change from the old to the new implementation
-  async isConnected(): 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');
+  // 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();
+    if (!isConnected) {
+      logger.error('rabbit: isConnected - false');
       return false;
     }
-    const oldChannel: any = await this.assertChannelOld({ connection: this.oldPublishConnection });
+    const channel: any = await this.assertChannelOld();
     try {
       await Promise.all([
-        oldChannel.waitForConnect(),
-        ...this.oldConsumers.map((c: AfConsumer) => oldChannel.checkQueue(c.queue)),
+        channel.waitForConnect(),
+        ...this.oldConsumers.map((c: AfConsumer) => channel.checkQueue(c.queue)),
       ]);
     } catch (e) {
-      logger.error('rabbit: old isConnected - false');
+      logger.error('rabbit: isConnected - false');
       return false;
     }
-    logger.debug('rabbit: old isConnected - true');
+    logger.info('rabbit: isConnected - true');
     return true;
   }
 
   async gracefulShutdown(signal: string) : Promise<void> {
-    // TODO: [QUORUM-PHASE-2] After changing the publish from old to new change from the old to the new implementation
+    // TODO: DELETE OLD
     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));
@@ -1008,11 +925,11 @@ class RabbitMq implements IAfRabbitMq {
     } = optionsWithDefaults;
     if (useConsumeWithLock) {
       if (!this.redisLock) {
-        throw new RabbitError('Usage of consumeWithLock requires RedisInstance');
+        throw new Error('Usage of consumeWithLock requires RedisInstance');
       }
       logger.info(`rabbit: Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
     }
-    const channel = await this.getNewChannelOld({ connection: this.oldConsumeConnection });
+    const channel = await this.getNewChannelOld({});
     return channel.addSetup(async (confirmChannel: ConfirmChannel) => {
       const q = await this.assertQueueOld(queue, optionsWithDefaults);
       await confirmChannel.prefetch(limit, false);
@@ -1023,9 +940,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);
@@ -1102,23 +1019,16 @@ class RabbitMq implements IAfRabbitMq {
     });
   }
 
-  // TODO: [QUORUM-PHASE-3] Delete all the function under this line (getNewChannelOld, getConnectionOld, assertQueueOld, setupQueueOld, saveConsumerOld)
-  async getNewChannelOld({
-    name = rand().toString(), onClose = null, options = {}, connection,
-  }: newChannelOpts) {
-    let localConnection!: AmqpConnectionManager;
+  // TODO: DELETE OLD PROPERTIES UNDER THIS LINE
+  async getNewChannelOld({ name = rand().toString(), onClose = null, options = {} }: newChannelOpts = {}) {
+    let connection!: AmqpConnectionManager;
     try {
-      localConnection = await this.getConnectionOld(connection);
+      connection = await this.getConnectionOld();
     } catch (e) {
       logger.error(`rabbit: error on get connection for new channel ${name} `, { e });
       throw e;
     }
-
-    if (!localConnection) {
-      throw new Error(`rabbit: couldnt get connection for new channel ${name}`);
-    }
-
-    const channel = localConnection?.createChannel({ ...options });
+    const channel = connection.createChannel({ ...options });
     once(channel, 'close').then((args) => {
       logger.error(`rabbit: channel ${name} closed`);
       onClose?.(args);
@@ -1133,38 +1043,30 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async getConnectionOld(connection: ConnectionData) {
+  async getConnectionOld() {
     return new Promise<AmqpConnectionManager>(async (resolve, reject) => {
-      const {
-        amqpConnection: connectionLocal,
-        creatingConnection,
-        connectionCreatedEventName,
-        connectionFailedEventName,
-        blockReconnect,
-      } = connection;
-
-      if (blockReconnect) {
+      if (this.oldBlockReconnect) {
         debug('rabbit: block reconnect');
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         return resolve();
       }
-      if (connectionLocal !== null) {
-        if (this.options?.disableReconnect || connectionLocal?.isConnected()) {
+      if (this.oldConnection !== null) {
+        if (this.options?.disableReconnect || this.oldConnection?.isConnected()) {
           debug('rabbit: connection - is connected');
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-ignore
-          return resolve(connectionLocal);
+          return resolve(this.oldConnection);
         }
         debug('rabbit: connection - reconnecting');
       }
-      if (creatingConnection) {
+      if (this.oldCreatingConnection) {
         debug('rabbit: creating connection emi');
-        this.oldEm.once(connectionCreatedEventName, resolve);
-        this.oldEm.once(connectionFailedEventName, reject);
+        this.oldEm.once(CONNECTION_CREATED_CONST, resolve);
+        this.oldEm.once(CONNECTION_FAILED_CONST, reject);
         return;
       }
-      connection.creatingConnection = true;
+      this.oldCreatingConnection = true;
       let isResolved = false;
 
       // It is import to use it as a function and not as a variable
@@ -1181,69 +1083,47 @@ class RabbitMq implements IAfRabbitMq {
       };
 
       const defaultUrls = findServers();
-      const newConnection: AmqpConnectionManager = await connect(defaultUrls, {
+      const connection: AmqpConnectionManager = await connect(defaultUrls, {
         findServers,
       });
 
-      connection.amqpConnection = newConnection;
-      newConnection.on('error', (err) => {
+      this.oldConnection = connection;
+      this.oldConnection.on('error', (err) => {
         logger.error('rabbit: connection error', { err });
         if (!isResolved) {
           isResolved = true;
           reject(err);
-          this.oldEm.emit(connectionFailedEventName, err);
+          this.oldEm.emit(CONNECTION_FAILED_CONST, err);
         }
       });
 
-      newConnection.on('connectFailed', (err) => {
+      this.oldConnection.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(connectionFailedEventName, err);
+          this.oldEm.emit(CONNECTION_FAILED_CONST, err);
         }
       });
 
-      newConnection.on('disconnect', ({ err }) => {
-        this.oldPublishChannel = null;
-        this.oldPublishChannelSetupPromise = null;
+      this.oldConnection.on('disconnect', ({ err }) => {
         this.oldConsumersTags = [];
-        if (this.oldConsumers.length > 0) {
-          this.oldNeedsConsumerReestablishment = true;
-        }
         debug('rabbit: connection closed');
         if (this.options?.disableReconnect) {
           logger.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
-          connection.blockReconnect = true;
+          this.oldBlockReconnect = true;
         } else {
           logger.error(`${this.RECONNECT_MSG}${err && ` - ${err}`}`);
         }
       });
 
-      newConnection.once('connect', async () => {
+      this.oldConnection.once('connect', async () => {
         debug('rabbit: connection established');
-        connection.creatingConnection = false;
-        this.oldEm.emit(connectionCreatedEventName, newConnection);
+        this.oldCreatingConnection = false;
+        this.oldEm.emit(CONNECTION_CREATED_CONST, connection);
         isResolved = true;
-        resolve(newConnection);
-
-        // Re-establish old consumers after reconnection
-        if (connection === this.oldConsumeConnection && this.oldNeedsConsumerReestablishment) {
-          logger.info(`rabbit: re-establishing ${this.oldConsumers.length} old consumers after reconnection`);
-          const reestablishPromises = this.oldConsumers.map(async (consumer) => {
-            try {
-              await this.consumeFromRabbitOld(consumer.queue, consumer.callback, consumer.options);
-            } catch (e) {
-              logger.error(`rabbit: failed to re-establish old consumer for queue ${consumer.queue}`, { e });
-            }
-          });
-          await Promise.all(reestablishPromises);
-          this.oldNeedsConsumerReestablishment = false;
-        }
+        resolve(connection);
       });
     });
   }
@@ -1277,7 +1157,6 @@ 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,
@@ -1289,7 +1168,7 @@ class RabbitMq implements IAfRabbitMq {
       },
     };
     try {
-      const channel: ChannelWrapper = await this.assertChannelOld({ connection });
+      const channel: ChannelWrapper = await this.assertChannelOld();
       debug('assertQueue->channel.addSetup', { queueName });
       await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, localeOptions));
       debug('assertQueue->channel.assertQueue', { queueName });
@@ -1298,8 +1177,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, connection });
-        await this.deleteQueueOld(queueName, connection);
+        const channel = await this.assertChannelOld({ force: true });
+        await this.deleteQueueOld(queueName);
 
         debug('retrying assertQueue->channel.addSetup', { queueName });
         await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, localeOptions));
@@ -1314,31 +1193,21 @@ class RabbitMq implements IAfRabbitMq {
     return queue;
   }
 
-  async assertChannelOld({ force = false, connection }: assertChannelOpts): Promise<ChannelWrapper> {
-    if (!this.oldPublishChannelSetupPromise || force) {
+  async assertChannelOld({ force = false } : assertChannelOpts = {}): Promise<ChannelWrapper> {
+    if (!this.oldPublishChannelSetupPromise) {
       this.oldPublishChannelSetupPromise = new Promise<ChannelWrapper>(async (resolve, reject) => {
-        if (this.oldPublishChannel && !force && connection.amqpConnection?.isConnected()) {
-          return resolve(this.oldPublishChannel);
+        if (this.oldChannel && !force) {
+          return resolve(this.oldChannel);
         }
 
         try {
-          const channel = await this.getNewChannelOld({ connection });
+          const channel = await this.getNewChannelOld({});
           channel.on('error', (err) => {
             logger.error('rabbit: channel error', { err });
-            this.oldPublishChannel = null;
-            this.oldPublishChannelSetupPromise = null;
-          });
-          channel.on('close', () => {
-            logger.error('rabbit: channel closed');
-            this.oldPublishChannel = null;
-            this.oldPublishChannelSetupPromise = null;
           });
-          if (this.oldPublishConnection === connection) {
-            this.oldPublishChannel = channel;
-          }
+          this.oldChannel = channel;
           resolve(channel);
         } catch (e) {
-          this.oldPublishChannelSetupPromise = null;
           reject(e);
         }
       });
@@ -1346,17 +1215,17 @@ class RabbitMq implements IAfRabbitMq {
     return this.oldPublishChannelSetupPromise;
   }
 
-  private async deleteQueueOld(queue: string, connection: ConnectionData) {
+  private async deleteQueueOld(queue: string) {
     RabbitMq.validateName('queue', queue);
-    const channel: ChannelWrapper = await this.assertChannelOld({ connection });
+    const channel: ChannelWrapper = await this.assertChannelOld();
     logger.info('rabbit: deleting queue', { queue });
     const deleteQueueRes = await channel.deleteQueue(queue);
     debug('queue deleted', deleteQueueRes);
     return deleteQueueRes;
   }
 
-  async assertExchangeOld(exchangeName: string, connection: ConnectionData) {
-    const channel: ChannelWrapper = await this.assertChannelOld({ connection });
+  async assertExchangeOld(exchangeName: string, options?: any) {
+    const channel: ChannelWrapper = await this.assertChannelOld();
 
     if (this.oldExchanges[exchangeName]) {
       delete this.oldAssertExchangePromises[exchangeName];
@@ -1371,17 +1240,6 @@ class RabbitMq implements IAfRabbitMq {
     this.oldExchanges[exchangeName] = await this.oldAssertExchangePromises[exchangeName];
     return this.oldExchanges[exchangeName];
   }
-
-  private maskURL = (url: string): string => {
-    try {
-      const urlObj = new URL(url);
-      urlObj.username = '***';
-      urlObj.password = '***';
-      return urlObj.toString();
-    } catch {
-      return url;
-    }
-  }
 }
 
 export default RabbitMq;