@autofleet/rabbit 3.2.21-beta.1 → 3.2.22-beta.0

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { AmqpConnectionManager, ChannelWrapper } from 'amqp-connection-manager';
+import { AmqpConnectionManager, ChannelWrapper, CreateChannelOpts } from 'amqp-connection-manager';
 import { ConfirmChannel, ConsumeMessage, Options, Replies } from 'amqplib';
 import { RedisConfig } from './lib/redis';
-import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, assertChannelOpts, newChannelOpts, PublishOptions } from './lib/types';
+import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, ConnectionPurpose, ConnectionData } from './lib/types';
 export interface IAfRabbitMq {
     ack: any;
     nack: any;
@@ -33,6 +33,17 @@ export interface AfRabbitOptions {
     dontRetryAssert?: boolean;
     rabbitHost?: string;
 }
+type newChannelOpts = {
+    name?: string;
+    onClose?: null | ((args: any | null) => void);
+    options?: CreateChannelOpts | undefined;
+    connectionPurpose: ConnectionPurpose;
+};
+type assertChannelOpts = {
+    channelName?: string;
+    force?: boolean;
+    connectionPurpose: ConnectionPurpose;
+};
 declare class RabbitMq implements IAfRabbitMq {
     static parseMsg(msg: any): any;
     static validateName(type: string, name: string): void;
@@ -51,9 +62,11 @@ declare class RabbitMq implements IAfRabbitMq {
     channel: ChannelWrapper | null;
     publishChannelSetupPromise: Promise<ChannelWrapper> | null;
     blockReconnect: boolean | null | undefined;
-    connection: AmqpConnectionManager | null | undefined;
+    connectionsMap: {
+        [ConnectionPurpose.Consume]: ConnectionData;
+        [ConnectionPurpose.Publish]: ConnectionData;
+    };
     em: EventEmitter;
-    creatingConnection: boolean;
     exchanges: ExchangesCache;
     queues: QueuesCache;
     queueSetupPromises: QueueSetupPromisesDictionary;
@@ -67,24 +80,24 @@ declare class RabbitMq implements IAfRabbitMq {
     private shouldConsumeMessageByTimestamp;
     ack: (channel: ConfirmChannel, msg: ConsumeMessageOrNull, shouldUpdateRedisTimestamp?: boolean, releaseLock?: null) => (userMsg: ConsumeMessage) => Promise<any>;
     nack: (channel: ConfirmChannel, queue: string, options: any, deadQueueOptions: Options.AssertQueue, msg: ConsumeMessageOrNull, releaseLock: any) => (userMsg: ConsumeMessageOrNull, { skipRetry, }?: NackOptions) => Promise<any>;
-    getConnection(): Promise<AmqpConnectionManager>;
-    getNewChannel({ name, onClose, options }?: newChannelOpts): Promise<ChannelWrapper>;
-    assertChannel({ force, newChannelOptions }?: assertChannelOpts): Promise<ChannelWrapper>;
-    assertExchange(exchangeName: string): Promise<any>;
-    getQueueLength(queue: string): Promise<Replies.AssertQueue>;
+    getConnection(connectionPurpose: ConnectionPurpose): Promise<AmqpConnectionManager | null | undefined>;
+    getNewChannel({ name, onClose, options, connectionPurpose, }: newChannelOpts): Promise<ChannelWrapper>;
+    assertChannel({ force, connectionPurpose }: assertChannelOpts): Promise<ChannelWrapper>;
+    assertExchange(exchangeName: string, options?: any): Promise<any>;
+    getQueueLength(queue: string, connectionPurpose?: ConnectionPurpose): Promise<Replies.AssertQueue>;
     private deleteQueue;
-    bindQueue(queue: string, exchange: string): Promise<void>;
-    setupQueue(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue>;
-    assertQueue(queueName: string, options?: Options.AssertQueue): Promise<any>;
+    bindQueue(queue: string, exchange: string, connectionPurpose: ConnectionPurpose): Promise<void>;
+    setupQueue(queueName: string, connectionPurpose: ConnectionPurpose, options?: Options.AssertQueue): Promise<Replies.AssertQueue>;
+    assertQueue(queueName: string, connectionPurpose: ConnectionPurpose, options?: Options.AssertQueue): Promise<any>;
     private saveConsumer;
     consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any>;
     private lockRedisIfNeeded;
     private unlockRedisIfNeeded;
     private consumeFromRabbit;
     consumeFromExchange(queue: string, exchange: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any>;
-    publish(exchange: string, content: any, customHeaders?: any, options?: PublishOptions): Promise<boolean>;
+    publish(exchange: string, content: any, customHeaders?: any): Promise<boolean>;
     sendToQueue(queue: string, content: any, options?: any, customHeaders?: any): Promise<boolean | undefined>;
-    isConnected(): Promise<boolean>;
+    isConnected(connectionPurpose: ConnectionPurpose): Promise<boolean>;
     gracefulShutdown(signal: string): Promise<void>;
 }
 export default RabbitMq;

package/dist/index.js

@@ -6,7 +6,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const events_1 = require("events");
 const util_1 = require("util");
-const lodash_1 = require("lodash");
 const moment_1 = __importDefault(require("moment"));
 const redis_lock_1 = __importDefault(require("redis-lock"));
 const amqp_connection_manager_1 = require("amqp-connection-manager");
@@ -119,8 +118,10 @@ class RabbitMq {
         this.em = new events_1.EventEmitter();
         this.channel = null;
         this.publishChannelSetupPromise = null;
-        this.connection = null;
-        this.creatingConnection = false;
+        this.connectionsMap = {
+            [types_1.ConnectionPurpose.Consume]: { connection: null, creatingConnection: false },
+            [types_1.ConnectionPurpose.Publish]: { connection: null, creatingConnection: false },
+        };
         this.exchanges = {};
         this.queues = {};
         this.queueSetupPromises = {};
@@ -141,30 +142,31 @@ class RabbitMq {
             });
         }
     }
-    async getConnection() {
+    async getConnection(connectionPurpose) {
         return new Promise(async (resolve, reject) => {
+            const { connection, creatingConnection } = this.connectionsMap[connectionPurpose];
             if (this.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 (connection !== null) {
+                if (this.options?.disableReconnect || connection?.isConnected()) {
                     debug('rabbit: connection - is connected');
                     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                     // @ts-ignore
-                    return resolve(this.connection);
+                    return resolve(connection);
                 }
                 debug('rabbit: connection - reconnecting');
             }
-            if (this.creatingConnection) {
+            if (creatingConnection) {
                 debug('rabbit: creating connection emi');
                 this.em.once(consts_1.CONNECTION_CREATED_CONST, resolve);
                 this.em.once(consts_1.CONNECTION_FAILED_CONST, reject);
                 return;
             }
-            this.creatingConnection = true;
+            this.connectionsMap[connectionPurpose].creatingConnection = true;
             let isResolved = false;
             // It is import to use it as a function and not as a variable
             // because of k8s changes the env variables
@@ -177,11 +179,15 @@ class RabbitMq {
                 return [`amqp://${userName}:${password}@${host}?heartbeat=${HEARTBEAT}`];
             };
             const defaultUrls = findServers();
-            const connection = await (0, amqp_connection_manager_1.connect)(defaultUrls, {
+            const newConnection = await (0, amqp_connection_manager_1.connect)(defaultUrls, {
                 findServers,
             });
-            this.connection = connection;
-            this.connection.on('error', (err) => {
+            if (!newConnection) {
+                logger_1.default.error('rabbit: couldnt create a connection');
+                return resolve(connection);
+            }
+            this.connectionsMap[connectionPurpose].connection = newConnection;
+            newConnection.on('error', (err) => {
                 logger_1.default.error('rabbit: connection error', { err });
                 if (!isResolved) {
                     isResolved = true;
@@ -189,7 +195,7 @@ class RabbitMq {
                     this.em.emit(consts_1.CONNECTION_FAILED_CONST, err);
                 }
             });
-            this.connection.on('connectFailed', (err) => {
+            newConnection.on('connectFailed', (err) => {
                 this.consumersTags = [];
                 logger_1.default.error('rabbit: connection connectFailed', { err });
                 if (!isResolved) {
@@ -198,8 +204,7 @@ class RabbitMq {
                     this.em.emit(consts_1.CONNECTION_FAILED_CONST, err);
                 }
             });
-            this.connection.on('disconnect', ({ err }) => {
-                // this.channel = null;
+            newConnection.on('disconnect', ({ err }) => {
                 this.consumersTags = [];
                 debug('rabbit: connection closed');
                 if (this.options?.disableReconnect) {
@@ -210,24 +215,27 @@ class RabbitMq {
                     logger_1.default.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(consts_1.CONNECTION_CREATED_CONST, connection);
+                this.connectionsMap[connectionPurpose].creatingConnection = false;
+                this.em.emit(consts_1.CONNECTION_CREATED_CONST, newConnection);
                 isResolved = true;
-                resolve(connection);
+                resolve(newConnection);
             });
         });
     }
-    async getNewChannel({ name = (0, utils_1.rand)().toString(), onClose = null, options = {} } = {}) {
+    async getNewChannel({ name = (0, utils_1.rand)().toString(), onClose = null, options = {}, connectionPurpose = types_1.ConnectionPurpose.Consume, }) {
         let connection;
         try {
-            connection = await this.getConnection();
+            connection = await this.getConnection(connectionPurpose);
         }
         catch (e) {
             logger_1.default.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 });
         (0, events_1.once)(channel, 'close').then((args) => {
             logger_1.default.error(`rabbit: channel ${name} closed`);
@@ -243,14 +251,14 @@ class RabbitMq {
             throw err;
         }
     }
-    async assertChannel({ force = false, newChannelOptions = {} } = {}) {
+    async assertChannel({ force = false, connectionPurpose = types_1.ConnectionPurpose.Consume }) {
         if (!this.publishChannelSetupPromise) {
             this.publishChannelSetupPromise = new Promise(async (resolve, reject) => {
                 if (this.channel && !force) {
                     return resolve(this.channel);
                 }
                 try {
-                    const channel = await this.getNewChannel({ options: newChannelOptions });
+                    const channel = await this.getNewChannel({ connectionPurpose });
                     channel.on('error', (err) => {
                         logger_1.default.error('rabbit: channel error', { err });
                     });
@@ -264,8 +272,8 @@ class RabbitMq {
         }
         return this.publishChannelSetupPromise;
     }
-    async assertExchange(exchangeName) {
-        const channel = await this.assertChannel();
+    async assertExchange(exchangeName, options) {
+        const channel = await this.assertChannel({ connectionPurpose: options.connectionPurpose });
         if (this.exchanges[exchangeName]) {
             return this.exchanges[exchangeName];
         }
@@ -273,32 +281,33 @@ class RabbitMq {
         this.exchanges[exchangeName] = exchange;
         return exchange;
     }
-    async getQueueLength(queue) {
+    async getQueueLength(queue, connectionPurpose = types_1.ConnectionPurpose.Consume) {
         RabbitMq.validateName('queue', queue);
+        const { connection } = this.connectionsMap[connectionPurpose];
         const { channel } = this;
         if (!channel) {
             throw new Error('channel is not defined');
         }
-        debug('rabbit: getting queue length', { queue, connected: this.connection?.isConnected() });
+        debug('rabbit: getting queue length', { queue, connected: connection?.isConnected() });
         return channel?.checkQueue(queue);
     }
-    async deleteQueue(queue) {
+    async deleteQueue(queue, connectionPurpose) {
         RabbitMq.validateName('queue', queue);
-        const channel = await this.assertChannel();
+        const channel = await this.assertChannel({ connectionPurpose });
         logger_1.default.info('rabbit: deleting queue', { queue });
         const deleteQueueRes = await channel.deleteQueue(queue);
         debug('queue deleted', deleteQueueRes);
         return deleteQueueRes;
     }
-    async bindQueue(queue, exchange) {
-        const channel = await this.assertChannel();
+    async bindQueue(queue, exchange, connectionPurpose) {
+        const channel = await this.assertChannel({ connectionPurpose });
         await channel.addSetup((setupChannel) => setupChannel.bindQueue(queue, exchange, ''));
         return channel.bindQueue(queue, exchange, '');
     }
-    async setupQueue(queueName, options) {
+    async setupQueue(queueName, connectionPurpose, options) {
         let queue;
         try {
-            const channel = await this.assertChannel();
+            const channel = await this.assertChannel({ connectionPurpose });
             debug('assertQueue->channel.addSetup', { queueName });
             await channel.addSetup((setupChannel) => setupChannel.assertQueue(queueName, options));
             debug('assertQueue->channel.assertQueue', { queueName });
@@ -308,8 +317,8 @@ class RabbitMq {
             logger_1.default.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, connectionPurpose });
+                await this.deleteQueue(queueName, connectionPurpose);
                 debug('retrying assertQueue->channel.addSetup', { queueName });
                 await channel.addSetup((setupChannel) => setupChannel.assertQueue(queueName, options));
                 debug('retrying assertQueue->channel.assertQueue', { queueName });
@@ -322,7 +331,7 @@ class RabbitMq {
         this.queues[queueName] = queueName;
         return queue;
     }
-    async assertQueue(queueName, options) {
+    async assertQueue(queueName, connectionPurpose, options) {
         RabbitMq.validateName('queue', queueName);
         if (this.queues[queueName]) {
             delete this.queueSetupPromises[queueName];
@@ -331,7 +340,7 @@ class RabbitMq {
         if (this.queueSetupPromises[queueName]) {
             return this.queueSetupPromises[queueName];
         }
-        this.queueSetupPromises[queueName] = this.setupQueue(queueName, options);
+        this.queueSetupPromises[queueName] = this.setupQueue(queueName, connectionPurpose, options);
         return this.queueSetupPromises[queueName];
     }
     saveConsumer(queue, callback, options) {
@@ -374,11 +383,10 @@ class RabbitMq {
             }
             logger_1.default.info(`rabbit: Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
         }
-        const channel = await this.getNewChannel({});
+        const channel = await this.getNewChannel({ connectionPurpose: types_1.ConnectionPurpose.Consume });
         return channel.addSetup(async (confirmChannel) => {
             await confirmChannel.assertQueue(queue, options ? { messageTtl: options.messageTtl } : undefined);
             await confirmChannel.prefetch(limit, true);
-            const channelConsumerOptions = optionsWithDefaults.channelConsumeOptions ? (0, lodash_1.merge)(types_1.CONSUMER_DEFAULT_OPTIONS, optionsWithDefaults.channelConsumeOptions) : types_1.CONSUMER_DEFAULT_OPTIONS;
             const { consumerTag } = await confirmChannel.consume(queue, async (msg) => {
                 if (!msg) {
                     return null;
@@ -439,7 +447,7 @@ class RabbitMq {
                 catch (e) {
                     await localNack(msg);
                 }
-            }, channelConsumerOptions);
+            }, types_1.CONSUMER_DEFAULT_OPTIONS);
             if (!consumerTag) {
                 logger_1.default.error(`rabbit: failed to consume from queue ${queue}`);
             }
@@ -455,7 +463,7 @@ class RabbitMq {
         RabbitMq.validateName('queue', queue);
         const { limit, deadMessageTtl } = optionsWithDefaults;
         await this.saveConsumer(queue, callback, options);
-        const channel = await this.getNewChannel({ name: `consume-exchange-${exchange}-queue-${queue}` });
+        const channel = await this.getNewChannel({ name: `consume - exchange - ${exchange} -queue - ${queue}`, connectionPurpose: types_1.ConnectionPurpose.Consume });
         return channel.addSetup(async (c) => {
             const assertExchange = await (0, utils_1.assertExchangeFanout)(c, exchange);
             await c.assertQueue(queue);
@@ -467,17 +475,17 @@ class RabbitMq {
             ]);
         });
     }
-    async publish(exchange, content, customHeaders, options) {
+    async publish(exchange, content, customHeaders) {
         return (0, utils_1.wrapSetImmediate)(async () => {
             RabbitMq.validateName('exchange', exchange);
-            const channel = await this.assertChannel({ newChannelOptions: options?.newChannelOptions });
-            await this.assertExchange(exchange);
+            const channel = await this.assertChannel({ connectionPurpose: types_1.ConnectionPurpose.Publish });
+            await this.assertExchange(exchange, { connectionPurpose: types_1.ConnectionPurpose.Publish });
             await channel.publish(exchange, '', Buffer.from(JSON.stringify(content)), RabbitMq.getPublishOptions(customHeaders));
         });
     }
     async sendToQueue(queue, content, options, customHeaders) {
         try {
-            await this.assertChannel({ newChannelOptions: options?.newChannelOptions });
+            await this.assertChannel({ connectionPurpose: types_1.ConnectionPurpose.Publish });
         }
         catch (e) {
             logger_1.default.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
@@ -485,7 +493,7 @@ class RabbitMq {
         }
         try {
             RabbitMq.validateName('queue', queue);
-            await this.assertQueue(queue, options);
+            await this.assertQueue(queue, types_1.ConnectionPurpose.Publish, options);
         }
         catch (e) {
             logger_1.default.error(`rabbit sendToQueue: failed to assert queue ${queue}`, { e });
@@ -497,19 +505,23 @@ class RabbitMq {
             return res;
         }
         catch (e) {
-            const isConnected = await this.isConnected();
+            const isConnected = await this.isConnected(types_1.ConnectionPurpose.Publish);
             logger_1.default.error(`rabbit sendToQueue: failed to send to queue ${queue}, isConnected: ${isConnected}`, { e });
             throw e;
         }
     }
-    async isConnected() {
-        const connection = await this.getConnection();
+    async isConnected(connectionPurpose) {
+        const connection = await this.getConnection(connectionPurpose);
+        if (!connection) {
+            logger_1.default.error('rabbit: isConnected - false');
+            return false;
+        }
         const isConnected = connection.isConnected();
         if (!isConnected) {
             logger_1.default.error('rabbit: isConnected - false');
             return false;
         }
-        const channel = await this.assertChannel();
+        const channel = await this.assertChannel({ connectionPurpose });
         try {
             await Promise.all([
                 channel.waitForConnect(),

package/dist/lib/types.d.ts

@@ -1,4 +1,4 @@
-import { CreateChannelOpts } from 'amqp-connection-manager';
+import { AmqpConnectionManager } from 'amqp-connection-manager';
 import { ConsumeMessage, Options, Replies } from 'amqplib';
 export interface ExchangesCache {
     [key: string]: any;
@@ -23,25 +23,27 @@ export interface ConsumeOptions {
     useConsumeWithLock?: boolean;
     auditContext?: any;
     enableRabbitTrace?: boolean;
-    channelConsumeOptions?: Options.Consume;
 }
 export type CallbackFunction = (msg: ConsumeMessage, ack: any, nack: any) => Promise<any>;
 export type newChannelOpts = {
     name?: string;
     onClose?: null | ((args: any | null) => void);
-    options?: CreateChannelOpts | undefined;
 };
 export type assertChannelOpts = {
     channelName?: string;
     force?: boolean;
-    newChannelOptions?: newChannelOpts;
 };
-export interface PublishOptions {
-    newChannelOptions?: newChannelOpts;
-}
 export type AfConsumer = {
     queue: string;
     callback: CallbackFunction;
     options: ConsumeOptions | undefined;
 };
 export declare const CONSUMER_DEFAULT_OPTIONS: Options.Consume;
+export type ConnectionData = {
+    connection: AmqpConnectionManager | null;
+    creatingConnection: boolean;
+};
+export declare enum ConnectionPurpose {
+    Consume = "consume",
+    Publish = "publish"
+}

package/dist/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CONSUMER_DEFAULT_OPTIONS = void 0;
+exports.ConnectionPurpose = exports.CONSUMER_DEFAULT_OPTIONS = void 0;
 const HA_PROMOTE_ON_FAILURE = 'ha-promote-on-failure';
 const HA_PROMOTE_ON_SHUTDOWN = 'ha-promote-on-shutdown';
 exports.CONSUMER_DEFAULT_OPTIONS = {
@@ -9,3 +9,8 @@ exports.CONSUMER_DEFAULT_OPTIONS = {
         [HA_PROMOTE_ON_SHUTDOWN]: 'always',
     },
 };
+var ConnectionPurpose;
+(function (ConnectionPurpose) {
+    ConnectionPurpose["Consume"] = "consume";
+    ConnectionPurpose["Publish"] = "publish";
+})(ConnectionPurpose = exports.ConnectionPurpose || (exports.ConnectionPurpose = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.21-beta.1",
+  "version": "3.2.22-beta.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,7 +19,6 @@
     "amqp-connection-manager": "4.1.9",
     "amqplib": "0.10.3",
     "bluebird": "^3.7.2",
-    "lodash": "^4.17.21",
     "moment": "^2.29.1",
     "redis": "^3.1.2",
     "redis-lock": "^0.1.4"
@@ -31,7 +30,6 @@
     "@autofleet/logger": "4.0.6",
     "@types/amqplib": "0.8.2",
     "@types/jest": "^29.5.12",
-    "@types/lodash": "^4.17.12",
     "@types/node": "^20.14.11",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "eslint": "^7.13.0",
@@ -45,4 +43,4 @@
   },
   "author": "",
   "license": "ISC"
-}
+}

package/src/index.ts

@@ -2,11 +2,10 @@
 
 import { EventEmitter, once } from 'events';
 import { promisify } from 'util';
-import { merge } from 'lodash';
 import moment from 'moment';
 import RedisLock from 'redis-lock';
 import {
-  AmqpConnectionManager, ChannelWrapper, connect,
+  AmqpConnectionManager, ChannelWrapper, connect, CreateChannelOpts,
 } from 'amqp-connection-manager';
 import {
   ConfirmChannel, ConsumeMessage, Options, Replies,
@@ -37,16 +36,14 @@ import {
   QueuesCache,
   RedisLockType,
   ExchangesCache, CONSUMER_DEFAULT_OPTIONS, QueueSetupPromisesDictionary,
-  assertChannelOpts,
-  newChannelOpts,
-  PublishOptions,
+  ConnectionPurpose,
+  ConnectionData,
 } 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;
@@ -82,6 +79,19 @@ export interface AfRabbitOptions {
   rabbitHost?: 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 = {
   queue: string;
   callback: CallbackFunction;
@@ -91,7 +101,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();
 
@@ -136,14 +146,15 @@ class RabbitMq implements IAfRabbitMq {
 
   publishChannelSetupPromise: Promise<ChannelWrapper> | null;
 
-  blockReconnect: boolean | null | undefined
+  blockReconnect: boolean | null | undefined;
 
-  connection: AmqpConnectionManager | null | undefined
+  connectionsMap: {
+    [ConnectionPurpose.Consume]: ConnectionData;
+    [ConnectionPurpose.Publish]: ConnectionData;
+  };
 
   em: EventEmitter;
 
-  creatingConnection: boolean;
-
   exchanges: ExchangesCache;
 
   queues: QueuesCache;
@@ -165,8 +176,10 @@ class RabbitMq implements IAfRabbitMq {
     this.em = new EventEmitter();
     this.channel = null;
     this.publishChannelSetupPromise = null;
-    this.connection = null;
-    this.creatingConnection = false;
+    this.connectionsMap = {
+      [ConnectionPurpose.Consume]: { connection: null, creatingConnection: false },
+      [ConnectionPurpose.Publish]: { connection: null, creatingConnection: false },
+    };
     this.exchanges = {};
     this.queues = {};
     this.queueSetupPromises = {};
@@ -202,7 +215,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);
@@ -228,8 +241,8 @@ class RabbitMq implements IAfRabbitMq {
     userMsg: ConsumeMessageOrNull,
     {
       skipRetry = false,
-    }: NackOptions = { },
-  ) : Promise<any> => {
+    }: NackOptions = {},
+  ): Promise<any> => {
     await this.unlockRedisIfNeeded(releaseLock);
     if (channel && msg) {
       if (
@@ -263,30 +276,31 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async getConnection() {
-    return new Promise<AmqpConnectionManager>(async (resolve, reject) => {
+  async getConnection(connectionPurpose: ConnectionPurpose) {
+    return new Promise<AmqpConnectionManager | undefined | null>(async (resolve, reject) => {
+      const { connection, creatingConnection } = this.connectionsMap[connectionPurpose];
       if (this.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 (connection !== null) {
+        if (this.options?.disableReconnect || connection?.isConnected()) {
           debug('rabbit: connection - is connected');
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-ignore
-          return resolve(this.connection);
+          return resolve(connection);
         }
         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);
         return;
       }
-      this.creatingConnection = true;
+      this.connectionsMap[connectionPurpose].creatingConnection = true;
       let isResolved = false;
 
       // It is import to use it as a function and not as a variable
@@ -303,12 +317,18 @@ class RabbitMq implements IAfRabbitMq {
       };
 
       const defaultUrls = findServers();
-      const connection: AmqpConnectionManager = await connect(defaultUrls, {
+      const newConnection: AmqpConnectionManager = await connect(defaultUrls, {
         findServers,
       });
 
-      this.connection = connection;
-      this.connection.on('error', (err) => {
+      if (!newConnection) {
+        logger.error('rabbit: couldnt create a connection');
+        return resolve(connection);
+      }
+
+      this.connectionsMap[connectionPurpose].connection = newConnection;
+
+      newConnection.on('error', (err) => {
         logger.error('rabbit: connection error', { err });
         if (!isResolved) {
           isResolved = true;
@@ -317,7 +337,7 @@ class RabbitMq implements IAfRabbitMq {
         }
       });
 
-      this.connection.on('connectFailed', (err) => {
+      newConnection.on('connectFailed', (err) => {
         this.consumersTags = [];
         logger.error('rabbit: connection connectFailed', { err });
         if (!isResolved) {
@@ -327,8 +347,7 @@ class RabbitMq implements IAfRabbitMq {
         }
       });
 
-      this.connection.on('disconnect', ({ err }) => {
-        // this.channel = null;
+      newConnection.on('disconnect', ({ err }) => {
         this.consumersTags = [];
         debug('rabbit: connection closed');
         if (this.options?.disableReconnect) {
@@ -338,25 +357,29 @@ class RabbitMq implements IAfRabbitMq {
           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);
+        this.connectionsMap[connectionPurpose].creatingConnection = false;
+        this.em.emit(CONNECTION_CREATED_CONST, 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 = {}, connectionPurpose = ConnectionPurpose.Consume,
+  }: newChannelOpts): Promise<ChannelWrapper> {
+    let connection!: AmqpConnectionManager | undefined | null;
     try {
-      connection = await this.getConnection();
+      connection = await this.getConnection(connectionPurpose);
     } 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 });
     once(channel, 'close').then((args) => {
       logger.error(`rabbit: channel ${name} closed`);
@@ -372,7 +395,7 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async assertChannel({ force = false, newChannelOptions = {} }: assertChannelOpts = {}): Promise<ChannelWrapper> {
+  async assertChannel({ force = false, connectionPurpose = ConnectionPurpose.Consume }: assertChannelOpts): Promise<ChannelWrapper> {
     if (!this.publishChannelSetupPromise) {
       this.publishChannelSetupPromise = new Promise<ChannelWrapper>(async (resolve, reject) => {
         if (this.channel && !force) {
@@ -380,7 +403,7 @@ class RabbitMq implements IAfRabbitMq {
         }
 
         try {
-          const channel = await this.getNewChannel({ options: newChannelOptions });
+          const channel = await this.getNewChannel({ connectionPurpose });
           channel.on('error', (err) => {
             logger.error('rabbit: channel error', { err });
           });
@@ -394,8 +417,8 @@ class RabbitMq implements IAfRabbitMq {
     return this.publishChannelSetupPromise;
   }
 
-  async assertExchange(exchangeName: string) {
-    const channel: ChannelWrapper = await this.assertChannel();
+  async assertExchange(exchangeName: string, options?: any) {
+    const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose: options.connectionPurpose });
     if (this.exchanges[exchangeName]) {
       return this.exchanges[exchangeName];
     }
@@ -404,35 +427,36 @@ class RabbitMq implements IAfRabbitMq {
     return exchange;
   }
 
-  async getQueueLength(queue: string) {
+  async getQueueLength(queue: string, connectionPurpose: ConnectionPurpose = ConnectionPurpose.Consume): Promise<Replies.AssertQueue> {
     RabbitMq.validateName('queue', queue);
+    const { connection } = this.connectionsMap[connectionPurpose];
     const { channel } = this;
     if (!channel) {
       throw new Error('channel is not defined');
     }
-    debug('rabbit: getting queue length', { queue, connected: this.connection?.isConnected() });
+    debug('rabbit: getting queue length', { queue, connected: connection?.isConnected() });
     return channel?.checkQueue(queue);
   }
 
-  private async deleteQueue(queue: string) {
+  private async deleteQueue(queue: string, connectionPurpose: ConnectionPurpose) {
     RabbitMq.validateName('queue', queue);
-    const channel: ChannelWrapper = await this.assertChannel();
+    const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose });
     logger.info('rabbit: deleting queue', { queue });
     const deleteQueueRes = await channel.deleteQueue(queue);
     debug('queue deleted', deleteQueueRes);
     return deleteQueueRes;
   }
 
-  async bindQueue(queue: string, exchange: string) {
-    const channel: ChannelWrapper = await this.assertChannel();
+  async bindQueue(queue: string, exchange: string, connectionPurpose: ConnectionPurpose) {
+    const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose });
     await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.bindQueue(queue, exchange, ''));
     return channel.bindQueue(queue, exchange, '');
   }
 
-  async setupQueue(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue> {
+  async setupQueue(queueName: string, connectionPurpose: ConnectionPurpose, options?: Options.AssertQueue): Promise<Replies.AssertQueue> {
     let queue: Replies.AssertQueue;
     try {
-      const channel: ChannelWrapper = await this.assertChannel();
+      const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose });
       debug('assertQueue->channel.addSetup', { queueName });
       await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, options));
       debug('assertQueue->channel.assertQueue', { queueName });
@@ -441,8 +465,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, connectionPurpose });
+        await this.deleteQueue(queueName, connectionPurpose);
 
         debug('retrying assertQueue->channel.addSetup', { queueName });
         await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, options));
@@ -457,7 +481,7 @@ class RabbitMq implements IAfRabbitMq {
     return queue;
   }
 
-  async assertQueue(queueName: string, options?: Options.AssertQueue) {
+  async assertQueue(queueName: string, connectionPurpose: ConnectionPurpose, options?: Options.AssertQueue) {
     RabbitMq.validateName('queue', queueName);
     if (this.queues[queueName]) {
       delete this.queueSetupPromises[queueName];
@@ -468,12 +492,12 @@ class RabbitMq implements IAfRabbitMq {
       return this.queueSetupPromises[queueName];
     }
 
-    this.queueSetupPromises[queueName] = this.setupQueue(queueName, options);
+    this.queueSetupPromises[queueName] = this.setupQueue(queueName, connectionPurpose, 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({
@@ -522,11 +546,10 @@ class RabbitMq implements IAfRabbitMq {
       }
       logger.info(`rabbit: Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
     }
-    const channel = await this.getNewChannel({});
+    const channel = await this.getNewChannel({ connectionPurpose: ConnectionPurpose.Consume });
     return channel.addSetup(async (confirmChannel: ConfirmChannel) => {
       await confirmChannel.assertQueue(queue, options ? { messageTtl: options.messageTtl } : undefined);
       await confirmChannel.prefetch(limit, true);
-      const channelConsumerOptions = optionsWithDefaults.channelConsumeOptions ? merge(CONSUMER_DEFAULT_OPTIONS, optionsWithDefaults.channelConsumeOptions) : CONSUMER_DEFAULT_OPTIONS;
       const { consumerTag } = await confirmChannel.consume(
         queue,
         async (msg: ConsumeMessageOrNull) => {
@@ -598,8 +621,7 @@ class RabbitMq implements IAfRabbitMq {
           } catch (e) {
             await localNack(msg);
           }
-        },
-        channelConsumerOptions,
+        }, CONSUMER_DEFAULT_OPTIONS,
       );
       if (!consumerTag) {
         logger.error(`rabbit: failed to consume from queue ${queue}`);
@@ -610,13 +632,13 @@ 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: `consume - exchange - ${exchange} -queue - ${queue}`, connectionPurpose: ConnectionPurpose.Consume });
 
     return channel.addSetup(async (c: ConfirmChannel) => {
       const assertExchange = await assertExchangeFanout(c, exchange);
@@ -634,11 +656,11 @@ class RabbitMq implements IAfRabbitMq {
     });
   }
 
-  async publish(exchange: string, content: any, customHeaders?: any, options?: PublishOptions): Promise<boolean> {
+  async publish(exchange: string, content: any, customHeaders?: any): Promise<boolean> {
     return wrapSetImmediate(async () => {
       RabbitMq.validateName('exchange', exchange);
-      const channel: ChannelWrapper = await this.assertChannel({ newChannelOptions: options?.newChannelOptions });
-      await this.assertExchange(exchange);
+      const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose: ConnectionPurpose.Publish });
+      await this.assertExchange(exchange, { connectionPurpose: ConnectionPurpose.Publish });
       await channel.publish(exchange, '',
         Buffer.from(JSON.stringify(content)),
         RabbitMq.getPublishOptions(customHeaders));
@@ -652,7 +674,7 @@ class RabbitMq implements IAfRabbitMq {
     customHeaders?: any,
   ): Promise<boolean | undefined> {
     try {
-      await this.assertChannel({ newChannelOptions: options?.newChannelOptions });
+      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;
@@ -660,7 +682,7 @@ class RabbitMq implements IAfRabbitMq {
 
     try {
       RabbitMq.validateName('queue', queue);
-      await this.assertQueue(queue, options);
+      await this.assertQueue(queue, ConnectionPurpose.Publish, options);
     } catch (e) {
       logger.error(`rabbit sendToQueue: failed to assert queue ${queue}`, { e });
       throw e;
@@ -673,20 +695,24 @@ class RabbitMq implements IAfRabbitMq {
       debug(`rabbit: sending to queue ${queue}`, { res });
       return res;
     } catch (e) {
-      const isConnected = await this.isConnected();
+      const isConnected = await this.isConnected(ConnectionPurpose.Publish);
       logger.error(`rabbit sendToQueue: failed to send to queue ${queue}, isConnected: ${isConnected}`, { e });
       throw e;
     }
   }
 
-  async isConnected() : Promise<boolean> {
-    const connection = await this.getConnection();
+  async isConnected(connectionPurpose: ConnectionPurpose): Promise<boolean> {
+    const connection = await this.getConnection(connectionPurpose);
+    if (!connection) {
+      logger.error('rabbit: isConnected - false');
+      return false;
+    }
     const isConnected = connection.isConnected();
     if (!isConnected) {
       logger.error('rabbit: isConnected - false');
       return false;
     }
-    const channel: any = await this.assertChannel();
+    const channel: any = await this.assertChannel({ connectionPurpose });
     try {
       await Promise.all([
         channel.waitForConnect(),
@@ -700,7 +726,7 @@ class RabbitMq implements IAfRabbitMq {
     return 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));

package/src/lib/types.ts

@@ -1,4 +1,4 @@
-import { CreateChannelOpts } from 'amqp-connection-manager';
+import { AmqpConnectionManager } from 'amqp-connection-manager';
 import { ConsumeMessage, Options, Replies } from 'amqplib';
 
 export interface ExchangesCache {
@@ -28,7 +28,6 @@ export interface ConsumeOptions {
   useConsumeWithLock?: boolean;
   auditContext?: any;
   enableRabbitTrace?: boolean;
-  channelConsumeOptions?: Options.Consume;
 }
 
 export type CallbackFunction = (msg: ConsumeMessage, ack: any, nack: any) => Promise<any>
@@ -36,18 +35,11 @@ export type CallbackFunction = (msg: ConsumeMessage, ack: any, nack: any) => Pro
 export type newChannelOpts = {
   name?: string;
   onClose?: null | ((args: any | null) => void);
-  options?: CreateChannelOpts | undefined;
 };
 export type assertChannelOpts = {
   channelName?: string;
   force?: boolean;
-  newChannelOptions?: newChannelOpts;
 }
-
-export interface PublishOptions {
-  newChannelOptions?: newChannelOpts;
-}
-
 export type AfConsumer = {
   queue: string;
   callback: CallbackFunction;
@@ -64,3 +56,13 @@ export const CONSUMER_DEFAULT_OPTIONS: Options.Consume = {
     [HA_PROMOTE_ON_SHUTDOWN]: 'always',
   },
 };
+
+export type ConnectionData = {
+  connection: AmqpConnectionManager | null;
+  creatingConnection: boolean;
+};
+
+export enum ConnectionPurpose {
+  Consume = 'consume',
+  Publish = 'publish',
+}