@autofleet/rabbit 3.2.26-beta.3 → 3.3.0-beta.0

package/src/index.ts

@@ -19,8 +19,8 @@ import RabbitError from './lib/rabbitError';
 import getRedisInstance, { RedisConfig } from './lib/redis';
 import { assertExchangeFanout, rand, wrapSetImmediate } from './lib/utils';
 import {
-  AUTOMATION_ID_HEADER,
-  ConnectionPurpose,
+  CONNECTION_CREATED_CONST,
+  CONNECTION_FAILED_CONST,
   DEFAULT_LOCK_TIMEOUT,
   DEFAULT_OPTIONS,
   RETRY_HEADER,
@@ -35,17 +35,14 @@ import {
   CustomMessageHeaders,
   QueuesCache,
   RedisLockType,
-  ExchangesCache,
-  CONSUMER_DEFAULT_OPTIONS,
-  QueueSetupPromisesDictionary,
-  AssertExchangePromisesDictionary,
-  ConnectionData,
+  ExchangesCache, CONSUMER_DEFAULT_OPTIONS, QueueSetupPromisesDictionary,
 } from './lib/types';
 
 // const debug = nodeDebug('af-rabbitmq')
 const debug = logger.debug.bind(logger);
 
 const PUBLISH_TIMEOUT = 1000 * 10;
+
 export interface IAfRabbitMq {
   ack: any;
   nack: any;
@@ -79,19 +76,21 @@ export interface AfRabbitOptions {
   dontRetryAssert?: boolean;
 
   rabbitHost?: string;
+
+  serviceName: string;
+
+  podIp?: string;
 }
 
 type newChannelOpts = {
   name?: string;
   onClose?: null | ((args: any | null) => void);
   options?: CreateChannelOpts | undefined;
-  connectionPurpose?: ConnectionPurpose,
 };
 
 type assertChannelOpts = {
   channelName?: string;
   force?: boolean;
-  connectionPurpose?: ConnectionPurpose;
 }
 
 type AfConsumer = {
@@ -103,7 +102,7 @@ type AfConsumer = {
 const HEARTBEAT = '60';
 
 class RabbitMq implements IAfRabbitMq {
-  static parseMsg(msg: any): any {
+  static parseMsg(msg: any) : any {
     let { content } = msg;
     content = content.toString();
 
@@ -144,27 +143,24 @@ class RabbitMq implements IAfRabbitMq {
 
   RECONNECT_MSG = 'rabbit: connection disconnect - reconnecting';
 
-  publishChannel: ChannelWrapper | null;
-
-  publishChannelSetupPromise: Promise<ChannelWrapper> | null;
+  channel: ChannelWrapper | null;
 
-  blockReconnect: boolean | null | undefined;
+  blockReconnect: boolean | null | undefined
 
-  connectionsMap: {
-    [ConnectionPurpose.Consume]: ConnectionData;
-    [ConnectionPurpose.Publish]: ConnectionData;
-  };
+  connection: AmqpConnectionManager | null | undefined
 
   em: EventEmitter;
 
+  podId: string;
+
+  creatingConnection: boolean;
+
   exchanges: ExchangesCache;
 
   queues: QueuesCache;
 
   queueSetupPromises: QueueSetupPromisesDictionary;
 
-  assertExchangePromises: AssertExchangePromisesDictionary;
-
   options: AfRabbitOptions | undefined;
 
   redisClient: any;
@@ -178,28 +174,15 @@ class RabbitMq implements IAfRabbitMq {
 
   constructor(options?: AfRabbitOptions, redisConfig?: RedisConfig) {
     this.em = new EventEmitter();
-    this.publishChannel = null;
-    this.publishChannelSetupPromise = null;
-    this.connectionsMap = {
-      [ConnectionPurpose.Consume]: {
-        connection: null,
-        creatingConnection: false,
-        connectionCreatedEventName: 'consumeConnectionCreated',
-        connectionFailedEventName: 'consumeConnectionFailed',
-      },
-      [ConnectionPurpose.Publish]: {
-        connection: null,
-        creatingConnection: false,
-        connectionCreatedEventName: 'publishConnectionCreated',
-        connectionFailedEventName: 'publishConnectionFailed',
-      },
-    };
+    this.channel = null;
+    this.connection = null;
+    this.creatingConnection = false;
     this.exchanges = {};
     this.queues = {};
     this.queueSetupPromises = {};
-    this.assertExchangePromises = {};
     this.consumers = [];
     this.options = options;
+    this.podId = `${options?.serviceName}${options?.podIp ? `-${options.podIp}` : ''}`;
     this.redisClient = redisConfig && getRedisInstance(redisConfig);
     if (this.redisClient) {
       this.redisLock = promisify(RedisLock(this.redisClient)) as RedisLockType;
@@ -230,7 +213,7 @@ class RabbitMq implements IAfRabbitMq {
     return false;
   }
 
-  public ack = (channel: ConfirmChannel, msg: ConsumeMessageOrNull, shouldUpdateRedisTimestamp = false, releaseLock = null) => async (userMsg: ConsumeMessage): Promise<any> => {
+  public ack = (channel: ConfirmChannel, msg: ConsumeMessageOrNull, shouldUpdateRedisTimestamp = false, releaseLock = null) => async (userMsg: ConsumeMessage) : Promise<any> => {
     if (msg) {
       debug('rabbit acking message', { deliveryTag: msg.fields.deliveryTag });
       await channel.ack(msg);
@@ -256,8 +239,8 @@ class RabbitMq implements IAfRabbitMq {
     userMsg: ConsumeMessageOrNull,
     {
       skipRetry = false,
-    }: NackOptions = {},
-  ): Promise<any> => {
+    }: NackOptions = { },
+  ) : Promise<any> => {
     await this.unlockRedisIfNeeded(releaseLock);
     if (channel && msg) {
       if (
@@ -291,36 +274,30 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async getConnection(connectionPurpose: ConnectionPurpose) {
-    return new Promise<AmqpConnectionManager | undefined | null>(async (resolve, reject) => {
-      const {
-        connection,
-        creatingConnection,
-        connectionCreatedEventName,
-        connectionFailedEventName,
-      } = this.connectionsMap[connectionPurpose];
+  async getConnection() {
+    return new Promise<AmqpConnectionManager>(async (resolve, reject) => {
       if (this.blockReconnect) {
         debug('rabbit: block reconnect');
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         return resolve();
       }
-      if (connection !== null) {
-        if (this.options?.disableReconnect || connection?.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(connection);
+          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;
       }
-      this.connectionsMap[connectionPurpose].creatingConnection = true;
+      this.creatingConnection = true;
       let isResolved = false;
 
       // It is import to use it as a function and not as a variable
@@ -337,33 +314,31 @@ class RabbitMq implements IAfRabbitMq {
       };
 
       const defaultUrls = findServers();
-      const newConnection: AmqpConnectionManager = await connect(defaultUrls, {
+      const connection: AmqpConnectionManager = await connect(defaultUrls, {
         findServers,
       });
 
-      this.connectionsMap[connectionPurpose].connection = newConnection;
-      logger.info(`rabbit: created new connection ${connectionPurpose}`);
-
-      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 = [];
         logger.error('rabbit: connection connectFailed', { err });
         if (!isResolved) {
           isResolved = true;
           reject(err);
-          this.em.emit(connectionFailedEventName, err);
+          this.em.emit(CONNECTION_FAILED_CONST, err);
         }
       });
 
-      newConnection.on('disconnect', ({ err }) => {
+      this.connection.on('disconnect', ({ err }) => {
         this.consumersTags = [];
         debug('rabbit: connection closed');
         if (this.options?.disableReconnect) {
@@ -373,29 +348,25 @@ class RabbitMq implements IAfRabbitMq {
           logger.error(`${this.RECONNECT_MSG}${err && ` - ${err}`}`);
         }
       });
-      newConnection.once('connect', async () => {
-        this.connectionsMap[connectionPurpose].creatingConnection = false;
-        this.em.emit(connectionCreatedEventName, newConnection);
+      this.connection.once('connect', async () => {
+        debug('rabbit: connection established');
+        this.creatingConnection = false;
+        this.em.emit(CONNECTION_CREATED_CONST, connection);
         isResolved = true;
-        resolve(newConnection);
+        resolve(connection);
       });
     });
   }
 
-  async getNewChannel({
-    name = rand().toString(), onClose = null, options = {}, connectionPurpose = ConnectionPurpose.Consume,
-  }: newChannelOpts): Promise<ChannelWrapper> {
-    let connection!: AmqpConnectionManager | undefined | null;
+  async getNewChannel({ name = rand().toString(), onClose = null, options = {} }: newChannelOpts = {}) {
+    let connection!: AmqpConnectionManager;
     try {
-      connection = await this.getConnection(connectionPurpose);
+      connection = await this.getConnection();
     } catch (e) {
       logger.error(`rabbit: error on get connection for new channel ${name} `, { e });
       throw e;
     }
-    if (!connection) {
-      throw new Error(`rabbit: couldnt get connection for new channel ${name}`);
-    }
-    const channel = connection.createChannel({ ...options });
+    const channel = connection.createChannel({ ...options, name });
     once(channel, 'close').then((args) => {
       logger.error(`rabbit: channel ${name} closed`);
       onClose?.(args);
@@ -410,62 +381,48 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async assertChannel({ force = false, connectionPurpose = ConnectionPurpose.Consume }: assertChannelOpts): Promise<ChannelWrapper> {
-    debug('rabbit: start assert channel', { connectionPurpose, publishPromise: this.publishChannelSetupPromise, channel: this.publishChannel });
-    if (!this.publishChannelSetupPromise || (!this.publishChannel && connectionPurpose === ConnectionPurpose.Publish)) {
-      this.publishChannelSetupPromise = new Promise<ChannelWrapper>(async (resolve, reject) => {
-        if (this.publishChannel && !force) {
-          return resolve(this.publishChannel);
-        }
+  async assertChannel({ force = false } : assertChannelOpts = {}): Promise<ChannelWrapper> {
+    return new Promise<ChannelWrapper>(async (resolve, reject) => {
+      if (this.channel && !force) {
+        return resolve(this.channel);
+      }
 
-        try {
-          const channel = await this.getNewChannel({ connectionPurpose });
-          debug('rabbit: new channel got', { connectionPurpose, channel: this.publishChannel });
-          channel.on('error', (err) => {
-            logger.error('rabbit: channel error', { err });
-          });
-          if (connectionPurpose === ConnectionPurpose.Publish) {
-            this.publishChannel = channel;
-          }
-          resolve(channel);
-        } catch (e) {
-          reject(e);
-        }
-      });
-    }
-    return this.publishChannelSetupPromise;
+      try {
+        const channel = await this.getNewChannel({});
+        channel.on('error', (err) => {
+          logger.error('rabbit: channel error', { err });
+        });
+        this.channel = channel;
+        resolve(channel);
+      } catch (e) {
+        reject(e);
+      }
+    });
   }
 
-  async assertExchange(exchangeName: string, options: any = { connectionPurpose: ConnectionPurpose.Consume }) {
-    const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose: options.connectionPurpose });
+  async assertExchange(exchangeName: string, options?: any) {
+    const channel: ChannelWrapper = await this.assertChannel();
     if (this.exchanges[exchangeName]) {
-      delete this.assertExchangePromises[exchangeName];
       return this.exchanges[exchangeName];
     }
-
-    if (this.assertExchangePromises[exchangeName]) {
-      return this.assertExchangePromises[exchangeName];
-    }
-
-    this.assertExchangePromises[exchangeName] = assertExchangeFanout(channel, exchangeName);
-    this.exchanges[exchangeName] = await this.assertExchangePromises[exchangeName];
-    return this.exchanges[exchangeName];
+    const exchange = await assertExchangeFanout(channel, exchangeName);
+    this.exchanges[exchangeName] = exchange;
+    return exchange;
   }
 
-  async getQueueLength(queue: string, connectionPurpose: ConnectionPurpose = ConnectionPurpose.Consume): Promise<Replies.AssertQueue> {
+  async getQueueLength(queue: string) {
     RabbitMq.validateName('queue', queue);
-    const { connection } = this.connectionsMap[connectionPurpose];
-    const { publishChannel } = this;
-    if (!publishChannel) {
+    const { channel } = this;
+    if (!channel) {
       throw new Error('channel is not defined');
     }
-    debug('rabbit: getting queue length', { queue, connected: connection?.isConnected() });
-    return publishChannel?.checkQueue(queue);
+    debug('rabbit: getting queue length', { queue, connected: this.connection?.isConnected() });
+    return channel?.checkQueue(queue);
   }
 
-  private async deleteQueue(queue: string, connectionPurpose: ConnectionPurpose) {
+  private async deleteQueue(queue: string) {
     RabbitMq.validateName('queue', queue);
-    const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose });
+    const channel: ChannelWrapper = await this.assertChannel();
     logger.info('rabbit: deleting queue', { queue });
     const deleteQueueRes = await channel.deleteQueue(queue);
     debug('queue deleted', deleteQueueRes);
@@ -473,66 +430,40 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   async bindQueue(queue: string, exchange: string) {
-    const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose: ConnectionPurpose.Publish });
+    const channel: ChannelWrapper = await this.assertChannel();
     await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.bindQueue(queue, exchange, ''));
     return channel.bindQueue(queue, exchange, '');
   }
 
-  async setupQueue(queueName: string, connectionPurpose: ConnectionPurpose, options?: Options.AssertQueue): Promise<Replies.AssertQueue> {
+  async setupQueue(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue> {
     let queue: Replies.AssertQueue;
-    const shouldUseQuorum = RabbitMq.shouldUseQuorum(queueName);
-    const localeOptions = {
-      ...options,
-      durable: true,
-      arguments: {
-        ...options?.arguments,
-        'x-consumer-timeout': 1000 * 60 * 60 * 24,
-        'x-queue-type': shouldUseQuorum ? 'quorum' : 'classic',
-      },
-    };
     try {
-      const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose });
+      const channel: ChannelWrapper = await this.assertChannel();
       debug('assertQueue->channel.addSetup', { queueName });
-      await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, localeOptions));
+      await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, options));
       debug('assertQueue->channel.assertQueue', { queueName });
-      queue = await channel.assertQueue(queueName, localeOptions);
+      queue = await channel.assertQueue(queueName, options);
     } catch (e) {
       logger.error('rabbit: assertQueue error', { queueName, options, error: e });
       if (!this.options?.dontRetryAssert) {
         debug('retrying assertQueue', { queueName });
-        const channel = await this.assertChannel({ force: true, connectionPurpose });
-        await this.deleteQueue(queueName, connectionPurpose);
+        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));
+        await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, options));
         debug('retrying assertQueue->channel.assertQueue', { queueName });
-        queue = await channel.assertQueue(queueName, localeOptions);
+        queue = await channel.assertQueue(queueName, options);
       } else {
         throw e;
       }
     }
 
-    this.queues[queueName] = queue;
+    this.queues[queueName] = queueName;
     return queue;
   }
 
-  static shouldUseQuorum(queueName: string): boolean {
-    const envQuorumQueuesWhitelist = process.env.QUORUM_QUEUES_WHITELIST;
-
-    if (envQuorumQueuesWhitelist === '*') {
-      return true;
-    }
-
-    if (envQuorumQueuesWhitelist) {
-      const whitelist = envQuorumQueuesWhitelist.split(',');
-      return whitelist.includes(queueName);
-    }
-
-    return false;
-  }
-
-  async assertQueue(queueName: string, connectionPurpose: ConnectionPurpose, options?: Options.AssertQueue) {
-    debug('rabbit: start assert queue', { connectionPurpose, queueName });
+  async assertQueue(queueName: string, options?: Options.AssertQueue) {
     RabbitMq.validateName('queue', queueName);
     if (this.queues[queueName]) {
       delete this.queueSetupPromises[queueName];
@@ -543,13 +474,12 @@ class RabbitMq implements IAfRabbitMq {
       return this.queueSetupPromises[queueName];
     }
 
-    this.queueSetupPromises[queueName] = this.setupQueue(queueName, connectionPurpose, options);
-    debug('rabbit: done assert queue', { connectionPurpose, queueName });
+    this.queueSetupPromises[queueName] = this.setupQueue(queueName, options);
     return this.queueSetupPromises[queueName];
   }
 
   private saveConsumer(queue: string, callback: CallbackFunction, options: ConsumeOptions | undefined) {
-    const isConsumerExist: boolean = this.consumers.some((consumer) => consumer.queue === queue);
+    const isConsumerExist :boolean = this.consumers.some((consumer) => consumer.queue === queue);
     if (!isConsumerExist) {
       logger.info(`rabbit: consumer: ${queue} saved in consumer array`);
       this.consumers.push({
@@ -598,10 +528,10 @@ class RabbitMq implements IAfRabbitMq {
       }
       logger.info(`rabbit: Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
     }
-    const channel = await this.getNewChannel({ connectionPurpose: ConnectionPurpose.Consume });
+    const channel = await this.getNewChannel({ name: `${this.podId}_queue_${queue}` });
     return channel.addSetup(async (confirmChannel: ConfirmChannel) => {
-      const q = await this.assertQueue(queue, ConnectionPurpose.Consume, optionsWithDefaults);
-      await confirmChannel.prefetch(limit, false);
+      await confirmChannel.assertQueue(queue, options ? { messageTtl: options.messageTtl } : undefined);
+      await confirmChannel.prefetch(limit, true);
       const { consumerTag } = await confirmChannel.consume(
         queue,
         async (msg: ConsumeMessageOrNull) => {
@@ -611,7 +541,6 @@ class RabbitMq implements IAfRabbitMq {
 
           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);
@@ -637,10 +566,7 @@ class RabbitMq implements IAfRabbitMq {
           }
 
           if (auditContext) {
-            await auditContext(queue, {
-              userId,
-              automationId,
-            });
+            await auditContext(queue);
           }
           const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
           if (!shouldConsume) {
@@ -688,19 +614,19 @@ class RabbitMq implements IAfRabbitMq {
     });
   }
 
-  async consumeFromExchange(queue: string, exchange: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
+  async consumeFromExchange(queue: string, exchange: string, callback: CallbackFunction, options?: ConsumeOptions) : Promise<any> {
     const optionsWithDefaults = { ...DEFAULT_OPTIONS, ...options };
     RabbitMq.validateName('exchange', exchange);
     RabbitMq.validateName('queue', queue);
     const { limit, deadMessageTtl } = optionsWithDefaults;
     await this.saveConsumer(queue, callback, options);
-    const channel: ChannelWrapper = await this.getNewChannel({ name: `consume - exchange - ${exchange} -queue - ${queue}` });
+    const channel: ChannelWrapper = await this.getNewChannel({ name: `${this.podId}_exchange_${exchange}_queue_${queue}` });
 
     return channel.addSetup(async (c: ConfirmChannel) => {
       const assertExchange = await assertExchangeFanout(c, exchange);
       await c.assertQueue(queue);
       this.exchanges[exchange] = assertExchange;
-      await c.prefetch(limit, false);
+      await c.prefetch(limit, true);
       return Promise.all([
         c.bindQueue(queue, exchange, ''),
         this.consume(
@@ -712,12 +638,11 @@ class RabbitMq implements IAfRabbitMq {
     });
   }
 
-  async publish(exchange: string, content: any, customHeaders?: any): Promise<boolean> {
-    debug('rabbit: start publish msg');
+  async publish(exchange: string, content: any, customHeaders?: any) : Promise<boolean> {
     return wrapSetImmediate(async () => {
       RabbitMq.validateName('exchange', exchange);
-      const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose: ConnectionPurpose.Publish });
-      await this.assertExchange(exchange, { connectionPurpose: ConnectionPurpose.Publish });
+      const channel: ChannelWrapper = await this.assertChannel();
+      await this.assertExchange(exchange);
       await channel.publish(exchange, '',
         Buffer.from(JSON.stringify(content)),
         RabbitMq.getPublishOptions(customHeaders));
@@ -729,65 +654,51 @@ class RabbitMq implements IAfRabbitMq {
     content: any,
     options?: any,
     customHeaders?: any,
+    isBlocking?: boolean,
   ): Promise<boolean | undefined> {
-    try {
-      await this.assertChannel({ connectionPurpose: ConnectionPurpose.Publish });
-    } catch (e) {
-      logger.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
-      throw e;
+    const callback = async (): Promise<boolean | undefined> => {
+      try {
+        RabbitMq.validateName('queue', queue);
+        await this.assertChannel();
+        await this.assertQueue(queue, options);
+        const res = await this.channel?.sendToQueue(queue,
+          Buffer.from(JSON.stringify(content)),
+          RabbitMq.getPublishOptions(customHeaders));
+        debug(`rabbit: sending to queue ${queue}`, { res });
+        return res;
+      } catch (e) {
+        logger.error(`rabbit: failed to send to queue ${queue}`, { e });
+        throw e;
+      }
+    };
+    if (isBlocking) {
+      return callback();
     }
+    return wrapSetImmediate(callback);
+  }
 
-    try {
-      RabbitMq.validateName('queue', queue);
-      await this.assertQueue(queue, ConnectionPurpose.Publish, options);
-    } catch (e) {
-      logger.error(`rabbit sendToQueue: failed to assert queue ${queue}`, { e });
-      throw e;
+  async isConnected() : Promise<boolean> {
+    const connection = await this.getConnection();
+    const isConnected = connection.isConnected();
+    if (!isConnected) {
+      logger.error('rabbit: isConnected - false');
+      return false;
     }
-
+    const channel: any = await this.assertChannel();
     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;
+      await Promise.all([
+        channel.waitForConnect(),
+        ...this.consumers.map((c: AfConsumer) => channel.checkQueue(c.queue)),
+      ]);
     } catch (e) {
-      logger.error(`rabbit sendToQueue: failed to send to queue ${queue}`, { e });
-      throw e;
+      logger.error('rabbit: isConnected - false');
+      return false;
     }
+    logger.info('rabbit: isConnected - true');
+    return true;
   }
 
-  async isConnected(): Promise<boolean> {
-    debug('rabbit: start is connected');
-    const isEachConnectionConnected = await Promise.all(
-      Object.entries(this.connectionsMap).map(async ([connectionPurpose, connectionData]) => {
-        if (connectionPurpose === ConnectionPurpose.Publish) {
-          const channel: any = await this.assertChannel({ connectionPurpose: connectionPurpose as ConnectionPurpose });
-          try {
-            await Promise.all([
-              channel.waitForConnect(),
-              ...this.consumers.map((c: AfConsumer) => channel.checkQueue(c.queue)),
-            ]);
-          } catch (e) {
-            logger.error('rabbit: isConnected - false');
-            return false;
-          }
-        }
-        const { connection } = connectionData;
-        debug('rabbit: is connected inside map', { connection, connectionPurpose });
-        const isConnected = connection?.isConnected();
-        if (!isConnected) {
-          logger.error('rabbit: isConnected - false', { connectionPurpose });
-          return false;
-        }
-        logger.info('rabbit: isConnected - true');
-        return true;
-      }),
-    );
-    return isEachConnectionConnected.every((isConnected) => isConnected === true);
-  }
-
-  async gracefulShutdown(signal: string): Promise<void> {
+  async gracefulShutdown(signal: string) : Promise<void> {
     const tagsNumber = this.consumersTags.length;
     logger.info(`rabbit: [gracefully-shutdown] received ${signal}! canceling #${tagsNumber} tags...`);
     const cancelTagPromises = this.consumersTags.map(([channel, tag]) => channel.cancel(tag));
@@ -804,7 +715,3 @@ class RabbitMq implements IAfRabbitMq {
 }
 
 export default RabbitMq;
-
-export {
-  sendCeleryTaskViaHttp,
-} from './lib/celery';

package/src/lib/consts.ts

@@ -3,9 +3,10 @@ export const DEFAULT_LOCK_TIMEOUT = 1000 * 5;
 export const RETRY_HEADER = 'x-retry-count';
 export const TRACING_HEADER = 'x-trace-id';
 export const USER_TRACING_HEADER = 'x-af-user-id';
-export const AUTOMATION_ID_HEADER = 'x-af-automation-id';
 export const USER_OBJECT = 'userObject';
 export const DEFAULT_USE_CONSUME_WITH_LOCK = false;
+export const CONNECTION_CREATED_CONST = 'connectionCreated';
+export const CONNECTION_FAILED_CONST = 'connectionFailed';
 export const DEFAULT_OPTIONS = {
   limit: 1,
   retries: 1,
@@ -15,8 +16,3 @@ export const DEFAULT_OPTIONS = {
   auditContext: null,
   enableRabbitTrace: false,
 };
-
-export enum ConnectionPurpose {
-  Consume = 'consume',
-  Publish = 'publish',
-}