@autofleet/rabbit 3.2.24-beta.4 → 3.2.24-beta.6

package/dist/index.d.ts

@@ -3,8 +3,7 @@ import { EventEmitter } from 'events';
 import { AmqpConnectionManager, ChannelWrapper, CreateChannelOpts } from 'amqp-connection-manager';
 import { ConfirmChannel, ConsumeMessage, Options, Replies } from 'amqplib';
 import { RedisConfig } from './lib/redis';
-import { ConnectionPurpose } from './lib/consts';
-import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, AssertExchangePromisesDictionary, ConnectionData } from './lib/types';
+import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, AssertExchangePromisesDictionary } from './lib/types';
 export interface IAfRabbitMq {
     ack: any;
     nack: any;
@@ -38,12 +37,10 @@ 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;
@@ -63,11 +60,9 @@ declare class RabbitMq implements IAfRabbitMq {
     channel: ChannelWrapper | null;
     publishChannelSetupPromise: Promise<ChannelWrapper> | null;
     blockReconnect: boolean | null | undefined;
-    connectionsMap: {
-        [ConnectionPurpose.Consume]: ConnectionData;
-        [ConnectionPurpose.Publish]: ConnectionData;
-    };
+    connection: AmqpConnectionManager | null | undefined;
     em: EventEmitter;
+    creatingConnection: boolean;
     exchanges: ExchangesCache;
     queues: QueuesCache;
     queueSetupPromises: QueueSetupPromisesDictionary;
@@ -82,16 +77,16 @@ 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(connectionPurpose: ConnectionPurpose): Promise<AmqpConnectionManager | null | undefined>;
-    getNewChannel({ name, onClose, options, connectionPurpose, }: newChannelOpts): Promise<ChannelWrapper>;
-    assertChannel({ force, connectionPurpose }: assertChannelOpts): Promise<ChannelWrapper>;
+    getConnection(): Promise<AmqpConnectionManager>;
+    getNewChannel({ name, onClose, options }?: newChannelOpts): Promise<ChannelWrapper>;
+    assertChannel({ force }?: assertChannelOpts): Promise<ChannelWrapper>;
     assertExchange(exchangeName: string, options?: any): Promise<any>;
-    getQueueLength(queue: string, connectionPurpose?: ConnectionPurpose): Promise<Replies.AssertQueue>;
+    getQueueLength(queue: string): Promise<Replies.AssertQueue>;
     private deleteQueue;
-    bindQueue(queue: string, exchange: string, connectionPurpose: ConnectionPurpose): Promise<void>;
-    setupQueue(queueName: string, connectionPurpose: ConnectionPurpose, options?: Options.AssertQueue): Promise<Replies.AssertQueue>;
+    bindQueue(queue: string, exchange: string): Promise<void>;
+    setupQueue(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue>;
     static shouldUseQuorum(queueName: string): boolean;
-    assertQueue(queueName: string, connectionPurpose: ConnectionPurpose, options?: Options.AssertQueue): Promise<any>;
+    assertQueue(queueName: string, options?: Options.AssertQueue): Promise<any>;
     private saveConsumer;
     consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any>;
     private lockRedisIfNeeded;

package/dist/index.js

@@ -119,20 +119,8 @@ class RabbitMq {
         this.em = new events_1.EventEmitter();
         this.channel = null;
         this.publishChannelSetupPromise = null;
-        this.connectionsMap = {
-            [consts_1.ConnectionPurpose.Consume]: {
-                connection: null,
-                creatingConnection: false,
-                connectionCreatedEventName: 'consumeConnectionCreated',
-                connectionFailedEventName: 'consumeConnectionFailed',
-            },
-            [consts_1.ConnectionPurpose.Publish]: {
-                connection: null,
-                creatingConnection: false,
-                connectionCreatedEventName: 'publishConnectionCreated',
-                connectionFailedEventName: 'publishConnectionFailed',
-            },
-        };
+        this.connection = null;
+        this.creatingConnection = false;
         this.exchanges = {};
         this.queues = {};
         this.queueSetupPromises = {};
@@ -154,31 +142,30 @@ class RabbitMq {
             });
         }
     }
-    async getConnection(connectionPurpose) {
+    async getConnection() {
         return new Promise(async (resolve, reject) => {
-            const { connection, creatingConnection, connectionCreatedEventName, connectionFailedEventName, } = this.connectionsMap[connectionPurpose];
             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(consts_1.CONNECTION_CREATED_CONST, resolve);
+                this.em.once(consts_1.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
             // because of k8s changes the env variables
@@ -191,29 +178,29 @@ class RabbitMq {
                 return [`amqp://${userName}:${password}@${host}?heartbeat=${HEARTBEAT}`];
             };
             const defaultUrls = findServers();
-            const newConnection = await (0, amqp_connection_manager_1.connect)(defaultUrls, {
+            const connection = await (0, amqp_connection_manager_1.connect)(defaultUrls, {
                 findServers,
             });
-            this.connectionsMap[connectionPurpose].connection = newConnection;
-            logger_1.default.info(`rabbit: created new connection ${connectionPurpose}`);
-            newConnection.on('error', (err) => {
+            this.connection = connection;
+            this.connection.on('error', (err) => {
                 logger_1.default.error('rabbit: connection error', { err });
                 if (!isResolved) {
                     isResolved = true;
                     reject(err);
-                    this.em.emit(connectionFailedEventName, err);
+                    this.em.emit(consts_1.CONNECTION_FAILED_CONST, err);
                 }
             });
-            newConnection.on('connectFailed', (err) => {
+            this.connection.on('connectFailed', (err) => {
                 this.consumersTags = [];
                 logger_1.default.error('rabbit: connection connectFailed', { err });
                 if (!isResolved) {
                     isResolved = true;
                     reject(err);
-                    this.em.emit(connectionFailedEventName, err);
+                    this.em.emit(consts_1.CONNECTION_FAILED_CONST, err);
                 }
             });
-            newConnection.on('disconnect', ({ err }) => {
+            this.connection.on('disconnect', ({ err }) => {
+                // this.channel = null;
                 this.consumersTags = [];
                 debug('rabbit: connection closed');
                 if (this.options?.disableReconnect) {
@@ -224,26 +211,24 @@ class RabbitMq {
                     logger_1.default.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(consts_1.CONNECTION_CREATED_CONST, connection);
                 isResolved = true;
-                resolve(newConnection);
+                resolve(connection);
             });
         });
     }
-    async getNewChannel({ name = (0, utils_1.rand)().toString(), onClose = null, options = {}, connectionPurpose = consts_1.ConnectionPurpose.Consume, }) {
+    async getNewChannel({ name = (0, utils_1.rand)().toString(), onClose = null, options = {} } = {}) {
         let connection;
         try {
-            connection = await this.getConnection(connectionPurpose);
+            connection = await this.getConnection();
         }
         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`);
@@ -259,16 +244,14 @@ class RabbitMq {
             throw err;
         }
     }
-    async assertChannel({ force = false, connectionPurpose = consts_1.ConnectionPurpose.Consume }) {
-        debug('rabbit: start assert channel', { connectionPurpose, publishPromise: this.publishChannelSetupPromise, channel: this.channel });
+    async assertChannel({ force = false } = {}) {
         if (!this.publishChannelSetupPromise) {
             this.publishChannelSetupPromise = new Promise(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.channel });
+                    const channel = await this.getNewChannel({});
                     channel.on('error', (err) => {
                         logger_1.default.error('rabbit: channel error', { err });
                     });
@@ -282,8 +265,8 @@ class RabbitMq {
         }
         return this.publishChannelSetupPromise;
     }
-    async assertExchange(exchangeName, options = { connectionPurpose: consts_1.ConnectionPurpose.Consume }) {
-        const channel = await this.assertChannel({ connectionPurpose: options.connectionPurpose });
+    async assertExchange(exchangeName, options) {
+        const channel = await this.assertChannel();
         if (this.exchanges[exchangeName]) {
             delete this.assertExchangePromises[exchangeName];
             return this.exchanges[exchangeName];
@@ -295,30 +278,29 @@ class RabbitMq {
         this.exchanges[exchangeName] = await this.assertExchangePromises[exchangeName];
         return this.exchanges[exchangeName];
     }
-    async getQueueLength(queue, connectionPurpose = consts_1.ConnectionPurpose.Consume) {
+    async getQueueLength(queue) {
         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: connection?.isConnected() });
+        debug('rabbit: getting queue length', { queue, connected: this.connection?.isConnected() });
         return channel?.checkQueue(queue);
     }
-    async deleteQueue(queue, connectionPurpose) {
+    async deleteQueue(queue) {
         RabbitMq.validateName('queue', queue);
-        const channel = await this.assertChannel({ connectionPurpose });
+        const channel = await this.assertChannel();
         logger_1.default.info('rabbit: deleting queue', { queue });
         const deleteQueueRes = await channel.deleteQueue(queue);
         debug('queue deleted', deleteQueueRes);
         return deleteQueueRes;
     }
-    async bindQueue(queue, exchange, connectionPurpose) {
-        const channel = await this.assertChannel({ connectionPurpose });
+    async bindQueue(queue, exchange) {
+        const channel = await this.assertChannel();
         await channel.addSetup((setupChannel) => setupChannel.bindQueue(queue, exchange, ''));
         return channel.bindQueue(queue, exchange, '');
     }
-    async setupQueue(queueName, connectionPurpose, options) {
+    async setupQueue(queueName, options) {
         let queue;
         const shouldUseQuorum = RabbitMq.shouldUseQuorum(queueName);
         const localeOptions = {
@@ -331,7 +313,7 @@ class RabbitMq {
             },
         };
         try {
-            const channel = await this.assertChannel({ connectionPurpose });
+            const channel = await this.assertChannel();
             debug('assertQueue->channel.addSetup', { queueName });
             await channel.addSetup((setupChannel) => setupChannel.assertQueue(queueName, localeOptions));
             debug('assertQueue->channel.assertQueue', { queueName });
@@ -341,8 +323,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, 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) => setupChannel.assertQueue(queueName, localeOptions));
                 debug('retrying assertQueue->channel.assertQueue', { queueName });
@@ -366,8 +348,7 @@ class RabbitMq {
         }
         return false;
     }
-    async assertQueue(queueName, connectionPurpose, options) {
-        debug('rabbit: start assert queue', { connectionPurpose, queueName });
+    async assertQueue(queueName, options) {
         RabbitMq.validateName('queue', queueName);
         if (this.queues[queueName]) {
             delete this.queueSetupPromises[queueName];
@@ -376,8 +357,7 @@ class RabbitMq {
         if (this.queueSetupPromises[queueName]) {
             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];
     }
     saveConsumer(queue, callback, options) {
@@ -420,9 +400,9 @@ class RabbitMq {
             }
             logger_1.default.info(`rabbit: Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
         }
-        const channel = await this.getNewChannel({ connectionPurpose: consts_1.ConnectionPurpose.Consume });
+        const channel = await this.getNewChannel({});
         return channel.addSetup(async (confirmChannel) => {
-            const q = await this.assertQueue(queue, consts_1.ConnectionPurpose.Consume, optionsWithDefaults);
+            const q = await this.assertQueue(queue, optionsWithDefaults);
             await confirmChannel.prefetch(limit, false);
             const { consumerTag } = await confirmChannel.consume(queue, async (msg) => {
                 if (!msg) {
@@ -504,7 +484,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}` });
         return channel.addSetup(async (c) => {
             const assertExchange = await (0, utils_1.assertExchangeFanout)(c, exchange);
             await c.assertQueue(queue);
@@ -517,17 +497,16 @@ class RabbitMq {
         });
     }
     async publish(exchange, content, customHeaders) {
-        debug('rabbit: start publish msg');
         return (0, utils_1.wrapSetImmediate)(async () => {
             RabbitMq.validateName('exchange', exchange);
-            const channel = await this.assertChannel({ connectionPurpose: consts_1.ConnectionPurpose.Publish });
-            await this.assertExchange(exchange, { connectionPurpose: consts_1.ConnectionPurpose.Publish });
+            const channel = await this.assertChannel();
+            await this.assertExchange(exchange);
             await channel.publish(exchange, '', Buffer.from(JSON.stringify(content)), RabbitMq.getPublishOptions(customHeaders));
         });
     }
     async sendToQueue(queue, content, options, customHeaders) {
         try {
-            await this.assertChannel({ connectionPurpose: consts_1.ConnectionPurpose.Publish });
+            await this.assertChannel();
         }
         catch (e) {
             logger_1.default.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
@@ -535,7 +514,7 @@ class RabbitMq {
         }
         try {
             RabbitMq.validateName('queue', queue);
-            await this.assertQueue(queue, consts_1.ConnectionPurpose.Publish, options);
+            await this.assertQueue(queue, options);
         }
         catch (e) {
             logger_1.default.error(`rabbit sendToQueue: failed to assert queue ${queue}`, { e });
@@ -547,38 +526,31 @@ class RabbitMq {
             return res;
         }
         catch (e) {
-            logger_1.default.error(`rabbit sendToQueue: failed to send to queue ${queue}`, { e });
+            const isConnected = await this.isConnected();
+            logger_1.default.error(`rabbit sendToQueue: failed to send to queue ${queue}, isConnected: ${isConnected}`, { e });
             throw e;
         }
     }
     async isConnected() {
-        debug('rabbit: start is connected');
-        const isEachConnectionConnected = await Promise.all(Object.entries(this.connectionsMap).map(async ([connectionPurpose, connectionData]) => {
-            const { connection } = connectionData;
-            debug('rabbit: is connected inside map', { connection, connectionPurpose });
-            if (connectionPurpose === consts_1.ConnectionPurpose.Publish && !connection) {
-                return true; // The connection hasn't been initialized yet, as no messages have been sent through it
-            }
-            const isConnected = connection?.isConnected();
-            if (!isConnected) {
-                logger_1.default.error('rabbit: isConnected - false');
-                return false;
-            }
-            const channel = await this.assertChannel({ connectionPurpose: connectionPurpose });
-            try {
-                await Promise.all([
-                    channel.waitForConnect(),
-                    ...this.consumers.map((c) => channel.checkQueue(c.queue)),
-                ]);
-            }
-            catch (e) {
-                logger_1.default.error('rabbit: isConnected - false');
-                return false;
-            }
-            logger_1.default.info('rabbit: isConnected - true');
-            return true;
-        }));
-        return isEachConnectionConnected.every((isConnected) => isConnected === true);
+        const connection = await this.getConnection();
+        const isConnected = connection.isConnected();
+        if (!isConnected) {
+            logger_1.default.error('rabbit: isConnected - false');
+            return false;
+        }
+        const channel = await this.assertChannel();
+        try {
+            await Promise.all([
+                channel.waitForConnect(),
+                ...this.consumers.map((c) => channel.checkQueue(c.queue)),
+            ]);
+        }
+        catch (e) {
+            logger_1.default.error('rabbit: isConnected - false');
+            return false;
+        }
+        logger_1.default.info('rabbit: isConnected - true');
+        return true;
     }
     async gracefulShutdown(signal) {
         const tagsNumber = this.consumersTags.length;

package/dist/lib/consts.d.ts

@@ -6,6 +6,8 @@ export declare const USER_TRACING_HEADER = "x-af-user-id";
 export declare const AUTOMATION_ID_HEADER = "x-af-automation-id";
 export declare const USER_OBJECT = "userObject";
 export declare const DEFAULT_USE_CONSUME_WITH_LOCK = false;
+export declare const CONNECTION_CREATED_CONST = "connectionCreated";
+export declare const CONNECTION_FAILED_CONST = "connectionFailed";
 export declare const DEFAULT_OPTIONS: {
     limit: number;
     retries: number;
@@ -15,7 +17,3 @@ export declare const DEFAULT_OPTIONS: {
     auditContext: null;
     enableRabbitTrace: boolean;
 };
-export declare enum ConnectionPurpose {
-    Consume = "consume",
-    Publish = "publish"
-}

package/dist/lib/consts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionPurpose = exports.DEFAULT_OPTIONS = exports.DEFAULT_USE_CONSUME_WITH_LOCK = exports.USER_OBJECT = exports.AUTOMATION_ID_HEADER = exports.USER_TRACING_HEADER = exports.TRACING_HEADER = exports.RETRY_HEADER = exports.DEFAULT_LOCK_TIMEOUT = exports.DEFAULT_DEAD_TTL_TWO_DAYS = void 0;
+exports.DEFAULT_OPTIONS = exports.CONNECTION_FAILED_CONST = exports.CONNECTION_CREATED_CONST = exports.DEFAULT_USE_CONSUME_WITH_LOCK = exports.USER_OBJECT = exports.AUTOMATION_ID_HEADER = exports.USER_TRACING_HEADER = exports.TRACING_HEADER = exports.RETRY_HEADER = exports.DEFAULT_LOCK_TIMEOUT = exports.DEFAULT_DEAD_TTL_TWO_DAYS = void 0;
 exports.DEFAULT_DEAD_TTL_TWO_DAYS = 60000 * 60 * 12;
 exports.DEFAULT_LOCK_TIMEOUT = 1000 * 5;
 exports.RETRY_HEADER = 'x-retry-count';
@@ -9,6 +9,8 @@ exports.USER_TRACING_HEADER = 'x-af-user-id';
 exports.AUTOMATION_ID_HEADER = 'x-af-automation-id';
 exports.USER_OBJECT = 'userObject';
 exports.DEFAULT_USE_CONSUME_WITH_LOCK = false;
+exports.CONNECTION_CREATED_CONST = 'connectionCreated';
+exports.CONNECTION_FAILED_CONST = 'connectionFailed';
 exports.DEFAULT_OPTIONS = {
     limit: 1,
     retries: 1,
@@ -18,8 +20,3 @@ exports.DEFAULT_OPTIONS = {
     auditContext: null,
     enableRabbitTrace: false,
 };
-var ConnectionPurpose;
-(function (ConnectionPurpose) {
-    ConnectionPurpose["Consume"] = "consume";
-    ConnectionPurpose["Publish"] = "publish";
-})(ConnectionPurpose = exports.ConnectionPurpose || (exports.ConnectionPurpose = {}));

package/dist/lib/types.d.ts

@@ -1,4 +1,3 @@
-import { AmqpConnectionManager } from 'amqp-connection-manager';
 import { ConsumeMessage, Options, Replies } from 'amqplib';
 export interface ExchangesCache {
     [key: string]: any;
@@ -42,9 +41,3 @@ export type AfConsumer = {
     options: ConsumeOptions | undefined;
 };
 export declare const CONSUMER_DEFAULT_OPTIONS: Options.Consume;
-export type ConnectionData = {
-    connection: AmqpConnectionManager | null;
-    creatingConnection: boolean;
-    connectionCreatedEventName: string;
-    connectionFailedEventName: string;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.24-beta.4",
+  "version": "3.2.24-beta.6",
   "description": "",
   "main": "dist/index.js",
   "engines": {
@@ -27,7 +27,8 @@
     "redis-lock": "^0.1.4"
   },
   "peerDependencies": {
-    "@autofleet/logger": "*"
+    "@autofleet/logger": "*",
+    "@autofleet/zehut": "*"
   },
   "devDependencies": {
     "@autofleet/logger": "4.0.6",

package/src/index.ts

@@ -20,7 +20,8 @@ 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,
@@ -39,13 +40,13 @@ import {
   CONSUMER_DEFAULT_OPTIONS,
   QueueSetupPromisesDictionary,
   AssertExchangePromisesDictionary,
-  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;
@@ -85,13 +86,11 @@ 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();
 
@@ -148,15 +147,14 @@ class RabbitMq implements IAfRabbitMq {
 
   publishChannelSetupPromise: Promise<ChannelWrapper> | null;
 
-  blockReconnect: boolean | null | undefined;
+  blockReconnect: boolean | null | undefined
 
-  connectionsMap: {
-    [ConnectionPurpose.Consume]: ConnectionData;
-    [ConnectionPurpose.Publish]: ConnectionData;
-  };
+  connection: AmqpConnectionManager | null | undefined
 
   em: EventEmitter;
 
+  creatingConnection: boolean;
+
   exchanges: ExchangesCache;
 
   queues: QueuesCache;
@@ -180,20 +178,8 @@ class RabbitMq implements IAfRabbitMq {
     this.em = new EventEmitter();
     this.channel = 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.connection = null;
+    this.creatingConnection = false;
     this.exchanges = {};
     this.queues = {};
     this.queueSetupPromises = {};
@@ -230,7 +216,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 +242,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 +277,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 +317,32 @@ 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.channel = null;
         this.consumersTags = [];
         debug('rabbit: connection closed');
         if (this.options?.disableReconnect) {
@@ -373,28 +352,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 });
     once(channel, 'close').then((args) => {
       logger.error(`rabbit: channel ${name} closed`);
@@ -410,8 +386,7 @@ 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.channel });
+  async assertChannel({ force = false } : assertChannelOpts = {}): Promise<ChannelWrapper> {
     if (!this.publishChannelSetupPromise) {
       this.publishChannelSetupPromise = new Promise<ChannelWrapper>(async (resolve, reject) => {
         if (this.channel && !force) {
@@ -419,8 +394,7 @@ class RabbitMq implements IAfRabbitMq {
         }
 
         try {
-          const channel = await this.getNewChannel({ connectionPurpose });
-          debug('rabbit: new channel got', { connectionPurpose, channel: this.channel });
+          const channel = await this.getNewChannel({});
           channel.on('error', (err) => {
             logger.error('rabbit: channel error', { err });
           });
@@ -434,8 +408,9 @@ class RabbitMq implements IAfRabbitMq {
     return this.publishChannelSetupPromise;
   }
 
-  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];
@@ -450,33 +425,32 @@ class RabbitMq implements IAfRabbitMq {
     return this.exchanges[exchangeName];
   }
 
-  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 { channel } = this;
     if (!channel) {
       throw new Error('channel is not defined');
     }
-    debug('rabbit: getting queue length', { queue, connected: connection?.isConnected() });
+    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);
     return deleteQueueRes;
   }
 
-  async bindQueue(queue: string, exchange: string, connectionPurpose: ConnectionPurpose) {
-    const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose });
+  async bindQueue(queue: string, exchange: string) {
+    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 = {
@@ -489,7 +463,7 @@ class RabbitMq implements IAfRabbitMq {
       },
     };
     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));
       debug('assertQueue->channel.assertQueue', { queueName });
@@ -498,8 +472,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, 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));
@@ -529,8 +503,7 @@ class RabbitMq implements IAfRabbitMq {
     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): Promise<any> {
     RabbitMq.validateName('queue', queueName);
     if (this.queues[queueName]) {
       delete this.queueSetupPromises[queueName];
@@ -541,13 +514,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({
@@ -596,9 +568,9 @@ 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({});
     return channel.addSetup(async (confirmChannel: ConfirmChannel) => {
-      const q = await this.assertQueue(queue, ConnectionPurpose.Consume, optionsWithDefaults);
+      const q = await this.assertQueue(queue, optionsWithDefaults);
       await confirmChannel.prefetch(limit, false);
       const { consumerTag } = await confirmChannel.consume(
         queue,
@@ -686,13 +658,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}` });
 
     return channel.addSetup(async (c: ConfirmChannel) => {
       const assertExchange = await assertExchangeFanout(c, exchange);
@@ -710,12 +682,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,7 +700,7 @@ class RabbitMq implements IAfRabbitMq {
     customHeaders?: any,
   ): Promise<boolean | undefined> {
     try {
-      await this.assertChannel({ connectionPurpose: ConnectionPurpose.Publish });
+      await this.assertChannel();
     } catch (e) {
       logger.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
       throw e;
@@ -737,7 +708,7 @@ class RabbitMq implements IAfRabbitMq {
 
     try {
       RabbitMq.validateName('queue', queue);
-      await this.assertQueue(queue, ConnectionPurpose.Publish, options);
+      await this.assertQueue(queue, options);
     } catch (e) {
       logger.error(`rabbit sendToQueue: failed to assert queue ${queue}`, { e });
       throw e;
@@ -750,43 +721,34 @@ class RabbitMq implements IAfRabbitMq {
       debug(`rabbit: sending to queue ${queue}`, { res });
       return res;
     } catch (e) {
-      logger.error(`rabbit sendToQueue: failed to send to queue ${queue}`, { e });
+      const isConnected = await this.isConnected();
+      logger.error(`rabbit sendToQueue: failed to send to queue ${queue}, isConnected: ${isConnected}`, { e });
       throw e;
     }
   }
 
-  async isConnected(): Promise<boolean> {
-    debug('rabbit: start is connected');
-    const isEachConnectionConnected = await Promise.all(
-      Object.entries(this.connectionsMap).map(async ([connectionPurpose, connectionData]) => {
-        const { connection } = connectionData;
-        debug('rabbit: is connected inside map', { connection, connectionPurpose });
-        if (connectionPurpose === ConnectionPurpose.Publish && !connection) {
-          return true; // The connection hasn't been initialized yet, as no messages have been sent through it
-        }
-        const isConnected = connection?.isConnected();
-        if (!isConnected) {
-          logger.error('rabbit: isConnected - false');
-          return false;
-        }
-        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;
-        }
-        logger.info('rabbit: isConnected - true');
-        return true;
-      }),
-    );
-    return isEachConnectionConnected.every((isConnected) => isConnected === true);
+  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 {
+      await Promise.all([
+        channel.waitForConnect(),
+        ...this.consumers.map((c: AfConsumer) => channel.checkQueue(c.queue)),
+      ]);
+    } catch (e) {
+      logger.error('rabbit: isConnected - false');
+      return false;
+    }
+    logger.info('rabbit: isConnected - true');
+    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/consts.ts

@@ -6,6 +6,8 @@ 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 +17,3 @@ export const DEFAULT_OPTIONS = {
   auditContext: null,
   enableRabbitTrace: false,
 };
-
-export enum ConnectionPurpose {
-  Consume = 'consume',
-  Publish = 'publish',
-}

package/src/lib/types.ts

@@ -1,4 +1,3 @@
-import { AmqpConnectionManager } from 'amqp-connection-manager';
 import { ConsumeMessage, Options, Replies } from 'amqplib';
 
 export interface ExchangesCache {
@@ -60,10 +59,3 @@ export const CONSUMER_DEFAULT_OPTIONS: Options.Consume = {
     [HA_PROMOTE_ON_SHUTDOWN]: 'always',
   },
 };
-
-export type ConnectionData = {
-  connection: AmqpConnectionManager | null;
-  creatingConnection: boolean;
-  connectionCreatedEventName: string;
-  connectionFailedEventName: string;
-};