@autofleet/rabbit 3.2.19-beta.8 → 3.2.19

package/dist/index.d.ts

@@ -3,7 +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 { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, ConnectionRole } from './lib/types';
+import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary } from './lib/types';
 export interface IAfRabbitMq {
     ack: any;
     nack: any;
@@ -37,12 +37,10 @@ type newChannelOpts = {
     name?: string;
     onClose?: null | ((args: any | null) => void);
     options?: CreateChannelOpts | undefined;
-    connectionRole: ConnectionRole;
 };
 type assertChannelOpts = {
     channelName?: string;
     force?: boolean;
-    connectionRole: ConnectionRole;
 };
 declare class RabbitMq implements IAfRabbitMq {
     static parseMsg(msg: any): any;
@@ -62,11 +60,9 @@ declare class RabbitMq implements IAfRabbitMq {
     channel: ChannelWrapper | null;
     publishChannelSetupPromise: Promise<ChannelWrapper> | null;
     blockReconnect: boolean | null | undefined;
-    consumeConnection: AmqpConnectionManager | null | undefined;
-    publishConnection: AmqpConnectionManager | null | undefined;
+    connection: AmqpConnectionManager | null | undefined;
     em: EventEmitter;
-    creatingConsumeConnection: boolean;
-    creatingPublishConnection: boolean;
+    creatingConnection: boolean;
     exchanges: ExchangesCache;
     queues: QueuesCache;
     queueSetupPromises: QueueSetupPromisesDictionary;
@@ -80,19 +76,15 @@ 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>;
-    geConnectionByRole: (connectionRole: ConnectionRole) => {
-        connectionByRole: AmqpConnectionManager | null | undefined;
-        creatingConnectionByRole: boolean;
-    };
-    getConnection(connectionRole: ConnectionRole): Promise<AmqpConnectionManager | null | undefined>;
-    getNewChannel({ name, onClose, options, connectionRole, }?: newChannelOpts): Promise<ChannelWrapper>;
-    assertChannel({ force, connectionRole }?: 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, connectionRole?: ConnectionRole): Promise<Replies.AssertQueue>;
+    getQueueLength(queue: string): Promise<Replies.AssertQueue>;
     private deleteQueue;
-    bindQueue(queue: string, exchange: string, connectionRole: ConnectionRole): Promise<void>;
-    setupQueue(queueName: string, connectionRole: ConnectionRole, options?: Options.AssertQueue): Promise<Replies.AssertQueue>;
-    assertQueue(queueName: string, connectionRole: ConnectionRole, options?: Options.AssertQueue): Promise<any>;
+    bindQueue(queue: string, exchange: string): Promise<void>;
+    setupQueue(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue>;
+    assertQueue(queueName: string, options?: Options.AssertQueue): Promise<any>;
     private saveConsumer;
     consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any>;
     private lockRedisIfNeeded;
@@ -101,7 +93,7 @@ declare class RabbitMq implements IAfRabbitMq {
     consumeFromExchange(queue: string, exchange: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any>;
     publish(exchange: string, content: any, customHeaders?: any): Promise<boolean>;
     sendToQueue(queue: string, content: any, options?: any, customHeaders?: any): Promise<boolean | undefined>;
-    isConnected(connectionRole: ConnectionRole): Promise<boolean>;
+    isConnected(): Promise<boolean>;
     gracefulShutdown(signal: string): Promise<void>;
 }
 export default RabbitMq;

package/dist/index.js

@@ -115,16 +115,11 @@ class RabbitMq {
                 });
             }
         };
-        this.geConnectionByRole = (connectionRole) => (connectionRole === types_1.ConnectionRole.Consumer
-            ? { connectionByRole: this.consumeConnection, creatingConnectionByRole: this.creatingConsumeConnection }
-            : { connectionByRole: this.publishConnection, creatingConnectionByRole: this.creatingPublishConnection });
         this.em = new events_1.EventEmitter();
         this.channel = null;
         this.publishChannelSetupPromise = null;
-        this.consumeConnection = null;
-        this.publishConnection = null;
-        this.creatingPublishConnection = false;
-        this.creatingConsumeConnection = false;
+        this.connection = null;
+        this.creatingConnection = false;
         this.exchanges = {};
         this.queues = {};
         this.queueSetupPromises = {};
@@ -145,36 +140,30 @@ class RabbitMq {
             });
         }
     }
-    async getConnection(connectionRole) {
+    async getConnection() {
         return new Promise(async (resolve, reject) => {
-            const { connectionByRole, creatingConnectionByRole } = this.geConnectionByRole(connectionRole);
             if (this.blockReconnect) {
                 debug('rabbit: block reconnect');
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
                 return resolve();
             }
-            if (connectionByRole !== null) {
-                if (this.options?.disableReconnect || connectionByRole?.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(connectionByRole);
+                    return resolve(this.connection);
                 }
                 debug('rabbit: connection - reconnecting');
             }
-            if (creatingConnectionByRole) {
+            if (this.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;
             }
-            if (connectionRole === types_1.ConnectionRole.Consumer) {
-                this.creatingConsumeConnection = true;
-            }
-            else {
-                this.creatingPublishConnection = 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
@@ -187,20 +176,11 @@ 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,
             });
-            if (!newConnection) {
-                logger_1.default.error('rabbit: couldnt create a connection');
-                return resolve(connectionByRole);
-            }
-            if (connectionRole === types_1.ConnectionRole.Consumer) {
-                this.consumeConnection = newConnection;
-            }
-            else {
-                this.publishConnection = newConnection;
-            }
-            newConnection.on('error', (err) => {
+            this.connection = connection;
+            this.connection.on('error', (err) => {
                 logger_1.default.error('rabbit: connection error', { err });
                 if (!isResolved) {
                     isResolved = true;
@@ -208,7 +188,7 @@ class RabbitMq {
                     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) {
@@ -217,7 +197,8 @@ class RabbitMq {
                     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) {
@@ -228,32 +209,24 @@ class RabbitMq {
                     logger_1.default.error(`${this.RECONNECT_MSG}${err && ` - ${err}`}`);
                 }
             });
-            newConnection.once('connect', async () => {
+            this.connection.once('connect', async () => {
                 debug('rabbit: connection established');
-                if (connectionRole === types_1.ConnectionRole.Consumer) {
-                    this.creatingConsumeConnection = false;
-                }
-                else {
-                    this.creatingPublishConnection = false;
-                }
-                this.em.emit(consts_1.CONNECTION_CREATED_CONST, newConnection);
+                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 = {}, connectionRole, } = { connectionRole: types_1.ConnectionRole.Consumer }) {
+    async getNewChannel({ name = (0, utils_1.rand)().toString(), onClose = null, options = {} } = {}) {
         let connection;
         try {
-            connection = await this.getConnection(connectionRole);
+            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`);
@@ -269,14 +242,14 @@ class RabbitMq {
             throw err;
         }
     }
-    async assertChannel({ force = false, connectionRole } = { connectionRole: types_1.ConnectionRole.Consumer }) {
+    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({ connectionRole });
+                    const channel = await this.getNewChannel({});
                     channel.on('error', (err) => {
                         logger_1.default.error('rabbit: channel error', { err });
                     });
@@ -291,7 +264,7 @@ class RabbitMq {
         return this.publishChannelSetupPromise;
     }
     async assertExchange(exchangeName, options) {
-        const channel = await this.assertChannel({ connectionRole: options.connectionRole });
+        const channel = await this.assertChannel();
         if (this.exchanges[exchangeName]) {
             return this.exchanges[exchangeName];
         }
@@ -299,33 +272,32 @@ class RabbitMq {
         this.exchanges[exchangeName] = exchange;
         return exchange;
     }
-    async getQueueLength(queue, connectionRole = types_1.ConnectionRole.Consumer) {
+    async getQueueLength(queue) {
         RabbitMq.validateName('queue', queue);
-        const { connectionByRole } = this.geConnectionByRole(connectionRole);
         const { channel } = this;
         if (!channel) {
             throw new Error('channel is not defined');
         }
-        debug('rabbit: getting queue length', { queue, connected: connectionByRole?.isConnected() });
+        debug('rabbit: getting queue length', { queue, connected: this.connection?.isConnected() });
         return channel?.checkQueue(queue);
     }
-    async deleteQueue(queue, connectionRole) {
+    async deleteQueue(queue) {
         RabbitMq.validateName('queue', queue);
-        const channel = await this.assertChannel({ connectionRole });
+        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, connectionRole) {
-        const channel = await this.assertChannel({ connectionRole });
+    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, connectionRole, options) {
+    async setupQueue(queueName, options) {
         let queue;
         try {
-            const channel = await this.assertChannel({ connectionRole });
+            const channel = await this.assertChannel();
             debug('assertQueue->channel.addSetup', { queueName });
             await channel.addSetup((setupChannel) => setupChannel.assertQueue(queueName, options));
             debug('assertQueue->channel.assertQueue', { queueName });
@@ -335,8 +307,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, connectionRole });
-                await this.deleteQueue(queueName, connectionRole);
+                const channel = await this.assertChannel({ force: true });
+                await this.deleteQueue(queueName);
                 debug('retrying assertQueue->channel.addSetup', { queueName });
                 await channel.addSetup((setupChannel) => setupChannel.assertQueue(queueName, options));
                 debug('retrying assertQueue->channel.assertQueue', { queueName });
@@ -349,7 +321,7 @@ class RabbitMq {
         this.queues[queueName] = queueName;
         return queue;
     }
-    async assertQueue(queueName, connectionRole, options) {
+    async assertQueue(queueName, options) {
         RabbitMq.validateName('queue', queueName);
         if (this.queues[queueName]) {
             delete this.queueSetupPromises[queueName];
@@ -358,7 +330,7 @@ class RabbitMq {
         if (this.queueSetupPromises[queueName]) {
             return this.queueSetupPromises[queueName];
         }
-        this.queueSetupPromises[queueName] = this.setupQueue(queueName, connectionRole, options);
+        this.queueSetupPromises[queueName] = this.setupQueue(queueName, options);
         return this.queueSetupPromises[queueName];
     }
     saveConsumer(queue, callback, options) {
@@ -401,7 +373,7 @@ class RabbitMq {
             }
             logger_1.default.info(`rabbit: Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
         }
-        const channel = await this.getNewChannel({ connectionRole: types_1.ConnectionRole.Consumer });
+        const channel = await this.getNewChannel({});
         return channel.addSetup(async (confirmChannel) => {
             await confirmChannel.assertQueue(queue, options ? { messageTtl: options.messageTtl } : undefined);
             await confirmChannel.prefetch(limit, true);
@@ -481,7 +453,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}`, connectionRole: types_1.ConnectionRole.Consumer });
+        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);
@@ -496,14 +468,14 @@ class RabbitMq {
     async publish(exchange, content, customHeaders) {
         return (0, utils_1.wrapSetImmediate)(async () => {
             RabbitMq.validateName('exchange', exchange);
-            const channel = await this.assertChannel({ connectionRole: types_1.ConnectionRole.Publisher });
-            await this.assertExchange(exchange, { connectionRole: types_1.ConnectionRole.Publisher });
+            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({ connectionRole: types_1.ConnectionRole.Publisher });
+            await this.assertChannel();
         }
         catch (e) {
             logger_1.default.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
@@ -511,7 +483,7 @@ class RabbitMq {
         }
         try {
             RabbitMq.validateName('queue', queue);
-            await this.assertQueue(queue, types_1.ConnectionRole.Publisher, options);
+            await this.assertQueue(queue, options);
         }
         catch (e) {
             logger_1.default.error(`rabbit sendToQueue: failed to assert queue ${queue}`, { e });
@@ -523,17 +495,13 @@ class RabbitMq {
             return res;
         }
         catch (e) {
-            const isConnected = await this.isConnected(types_1.ConnectionRole.Publisher);
+            const isConnected = await this.isConnected();
             logger_1.default.error(`rabbit sendToQueue: failed to send to queue ${queue}, isConnected: ${isConnected}`, { e });
             throw e;
         }
     }
-    async isConnected(connectionRole) {
-        const connection = await this.getConnection(connectionRole);
-        if (!connection) {
-            logger_1.default.error('rabbit: isConnected - false');
-            return false;
-        }
+    async isConnected() {
+        const connection = await this.getConnection();
         const isConnected = connection.isConnected();
         if (!isConnected) {
             logger_1.default.error('rabbit: isConnected - false');

package/dist/lib/types.d.ts

@@ -38,7 +38,3 @@ export type AfConsumer = {
     options: ConsumeOptions | undefined;
 };
 export declare const CONSUMER_DEFAULT_OPTIONS: Options.Consume;
-export declare enum ConnectionRole {
-    Consumer = "consumer",
-    Publisher = "publisher"
-}

package/dist/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionRole = exports.CONSUMER_DEFAULT_OPTIONS = void 0;
+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,8 +9,3 @@ exports.CONSUMER_DEFAULT_OPTIONS = {
         [HA_PROMOTE_ON_SHUTDOWN]: 'always',
     },
 };
-var ConnectionRole;
-(function (ConnectionRole) {
-    ConnectionRole["Consumer"] = "consumer";
-    ConnectionRole["Publisher"] = "publisher";
-})(ConnectionRole = exports.ConnectionRole || (exports.ConnectionRole = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.19-beta.8",
+  "version": "3.2.19",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -36,13 +36,13 @@ import {
   QueuesCache,
   RedisLockType,
   ExchangesCache, CONSUMER_DEFAULT_OPTIONS, QueueSetupPromisesDictionary,
-  ConnectionRole,
 } 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,13 +82,11 @@ type newChannelOpts = {
   name?: string;
   onClose?: null | ((args: any | null) => void);
   options?: CreateChannelOpts | undefined;
-  connectionRole: ConnectionRole,
 };
 
 type assertChannelOpts = {
   channelName?: string;
   force?: boolean;
-  connectionRole: ConnectionRole;
 }
 
 type AfConsumer = {
@@ -147,15 +145,11 @@ class RabbitMq implements IAfRabbitMq {
 
   blockReconnect: boolean | null | undefined
 
-  consumeConnection: AmqpConnectionManager | null | undefined;
-
-  publishConnection: AmqpConnectionManager | null | undefined;
+  connection: AmqpConnectionManager | null | undefined
 
   em: EventEmitter;
 
-  creatingConsumeConnection: boolean;
-
-  creatingPublishConnection: boolean;
+  creatingConnection: boolean;
 
   exchanges: ExchangesCache;
 
@@ -178,10 +172,8 @@ class RabbitMq implements IAfRabbitMq {
     this.em = new EventEmitter();
     this.channel = null;
     this.publishChannelSetupPromise = null;
-    this.consumeConnection = null;
-    this.publishConnection = null;
-    this.creatingPublishConnection = false;
-    this.creatingConsumeConnection = false;
+    this.connection = null;
+    this.creatingConnection = false;
     this.exchanges = {};
     this.queues = {};
     this.queueSetupPromises = {};
@@ -278,40 +270,30 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  geConnectionByRole = (connectionRole: ConnectionRole) => (connectionRole === ConnectionRole.Consumer
-    ? { connectionByRole: this.consumeConnection, creatingConnectionByRole: this.creatingConsumeConnection }
-    : { connectionByRole: this.publishConnection, creatingConnectionByRole: this.creatingPublishConnection });
-
-  async getConnection(connectionRole: ConnectionRole) {
-    return new Promise<AmqpConnectionManager | undefined | null>(async (resolve, reject) => {
-      const { connectionByRole, creatingConnectionByRole } = this.geConnectionByRole(connectionRole);
+  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 (connectionByRole !== null) {
-        if (this.options?.disableReconnect || connectionByRole?.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(connectionByRole);
+          return resolve(this.connection);
         }
         debug('rabbit: connection - reconnecting');
       }
-      if (creatingConnectionByRole) {
+      if (this.creatingConnection) {
         debug('rabbit: creating connection emi');
         this.em.once(CONNECTION_CREATED_CONST, resolve);
         this.em.once(CONNECTION_FAILED_CONST, reject);
         return;
       }
-      if (connectionRole === ConnectionRole.Consumer) {
-        this.creatingConsumeConnection = true;
-      } else {
-        this.creatingPublishConnection = true;
-      }
-
+      this.creatingConnection = true;
       let isResolved = false;
 
       // It is import to use it as a function and not as a variable
@@ -328,22 +310,12 @@ class RabbitMq implements IAfRabbitMq {
       };
 
       const defaultUrls = findServers();
-      const newConnection: AmqpConnectionManager = await connect(defaultUrls, {
+      const connection: AmqpConnectionManager = await connect(defaultUrls, {
         findServers,
       });
 
-      if (!newConnection) {
-        logger.error('rabbit: couldnt create a connection');
-        return resolve(connectionByRole);
-      }
-
-      if (connectionRole === ConnectionRole.Consumer) {
-        this.consumeConnection = newConnection;
-      } else {
-        this.publishConnection = newConnection;
-      }
-
-      newConnection.on('error', (err) => {
+      this.connection = connection;
+      this.connection.on('error', (err) => {
         logger.error('rabbit: connection error', { err });
         if (!isResolved) {
           isResolved = true;
@@ -352,7 +324,7 @@ class RabbitMq implements IAfRabbitMq {
         }
       });
 
-      newConnection.on('connectFailed', (err) => {
+      this.connection.on('connectFailed', (err) => {
         this.consumersTags = [];
         logger.error('rabbit: connection connectFailed', { err });
         if (!isResolved) {
@@ -362,7 +334,8 @@ class RabbitMq implements IAfRabbitMq {
         }
       });
 
-      newConnection.on('disconnect', ({ err }) => {
+      this.connection.on('disconnect', ({ err }) => {
+        // this.channel = null;
         this.consumersTags = [];
         debug('rabbit: connection closed');
         if (this.options?.disableReconnect) {
@@ -372,33 +345,25 @@ class RabbitMq implements IAfRabbitMq {
           logger.error(`${this.RECONNECT_MSG}${err && ` - ${err}`}`);
         }
       });
-      newConnection.once('connect', async () => {
+
+      this.connection.once('connect', async () => {
         debug('rabbit: connection established');
-        if (connectionRole === ConnectionRole.Consumer) {
-          this.creatingConsumeConnection = false;
-        } else {
-          this.creatingPublishConnection = false;
-        }
-        this.em.emit(CONNECTION_CREATED_CONST, newConnection);
+        this.creatingConnection = false;
+        this.em.emit(CONNECTION_CREATED_CONST, connection);
         isResolved = true;
-        resolve(newConnection);
+        resolve(connection);
       });
     });
   }
 
-  async getNewChannel({
-    name = rand().toString(), onClose = null, options = {}, connectionRole,
-  }: newChannelOpts = { connectionRole: ConnectionRole.Consumer }): Promise<ChannelWrapper> {
-    let connection!: AmqpConnectionManager | undefined | null;
+  async getNewChannel({ name = rand().toString(), onClose = null, options = {} }: newChannelOpts = {}) {
+    let connection!: AmqpConnectionManager;
     try {
-      connection = await this.getConnection(connectionRole);
+      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`);
@@ -414,7 +379,7 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async assertChannel({ force = false, connectionRole }: assertChannelOpts = { connectionRole: ConnectionRole.Consumer }): Promise<ChannelWrapper> {
+  async assertChannel({ force = false } : assertChannelOpts = {}): Promise<ChannelWrapper> {
     if (!this.publishChannelSetupPromise) {
       this.publishChannelSetupPromise = new Promise<ChannelWrapper>(async (resolve, reject) => {
         if (this.channel && !force) {
@@ -422,7 +387,7 @@ class RabbitMq implements IAfRabbitMq {
         }
 
         try {
-          const channel = await this.getNewChannel({ connectionRole });
+          const channel = await this.getNewChannel({});
           channel.on('error', (err) => {
             logger.error('rabbit: channel error', { err });
           });
@@ -437,7 +402,7 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   async assertExchange(exchangeName: string, options?: any) {
-    const channel: ChannelWrapper = await this.assertChannel({ connectionRole: options.connectionRole });
+    const channel: ChannelWrapper = await this.assertChannel();
     if (this.exchanges[exchangeName]) {
       return this.exchanges[exchangeName];
     }
@@ -446,36 +411,35 @@ class RabbitMq implements IAfRabbitMq {
     return exchange;
   }
 
-  async getQueueLength(queue: string, connectionRole: ConnectionRole = ConnectionRole.Consumer): Promise<Replies.AssertQueue> {
+  async getQueueLength(queue: string) {
     RabbitMq.validateName('queue', queue);
-    const { connectionByRole } = this.geConnectionByRole(connectionRole);
     const { channel } = this;
     if (!channel) {
       throw new Error('channel is not defined');
     }
-    debug('rabbit: getting queue length', { queue, connected: connectionByRole?.isConnected() });
+    debug('rabbit: getting queue length', { queue, connected: this.connection?.isConnected() });
     return channel?.checkQueue(queue);
   }
 
-  private async deleteQueue(queue: string, connectionRole: ConnectionRole) {
+  private async deleteQueue(queue: string) {
     RabbitMq.validateName('queue', queue);
-    const channel: ChannelWrapper = await this.assertChannel({ connectionRole });
+    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, connectionRole: ConnectionRole) {
-    const channel: ChannelWrapper = await this.assertChannel({ connectionRole });
+  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, connectionRole: ConnectionRole, options?: Options.AssertQueue): Promise<Replies.AssertQueue> {
+  async setupQueue(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue> {
     let queue: Replies.AssertQueue;
     try {
-      const channel: ChannelWrapper = await this.assertChannel({ connectionRole });
+      const channel: ChannelWrapper = await this.assertChannel();
       debug('assertQueue->channel.addSetup', { queueName });
       await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, options));
       debug('assertQueue->channel.assertQueue', { queueName });
@@ -484,8 +448,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, connectionRole });
-        await this.deleteQueue(queueName, connectionRole);
+        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, options));
@@ -500,7 +464,7 @@ class RabbitMq implements IAfRabbitMq {
     return queue;
   }
 
-  async assertQueue(queueName: string, connectionRole: ConnectionRole, options?: Options.AssertQueue) {
+  async assertQueue(queueName: string, options?: Options.AssertQueue) {
     RabbitMq.validateName('queue', queueName);
     if (this.queues[queueName]) {
       delete this.queueSetupPromises[queueName];
@@ -511,7 +475,7 @@ class RabbitMq implements IAfRabbitMq {
       return this.queueSetupPromises[queueName];
     }
 
-    this.queueSetupPromises[queueName] = this.setupQueue(queueName, connectionRole, options);
+    this.queueSetupPromises[queueName] = this.setupQueue(queueName, options);
     return this.queueSetupPromises[queueName];
   }
 
@@ -565,7 +529,7 @@ class RabbitMq implements IAfRabbitMq {
       }
       logger.info(`rabbit: Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
     }
-    const channel = await this.getNewChannel({ connectionRole: ConnectionRole.Consumer });
+    const channel = await this.getNewChannel({});
     return channel.addSetup(async (confirmChannel: ConfirmChannel) => {
       await confirmChannel.assertQueue(queue, options ? { messageTtl: options.messageTtl } : undefined);
       await confirmChannel.prefetch(limit, true);
@@ -657,7 +621,7 @@ class RabbitMq implements IAfRabbitMq {
     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}`, connectionRole: ConnectionRole.Consumer });
+    const channel: ChannelWrapper = await this.getNewChannel({ name: `consume-exchange-${exchange}-queue-${queue}` });
 
     return channel.addSetup(async (c: ConfirmChannel) => {
       const assertExchange = await assertExchangeFanout(c, exchange);
@@ -678,8 +642,8 @@ class RabbitMq implements IAfRabbitMq {
   async publish(exchange: string, content: any, customHeaders?: any) : Promise<boolean> {
     return wrapSetImmediate(async () => {
       RabbitMq.validateName('exchange', exchange);
-      const channel: ChannelWrapper = await this.assertChannel({ connectionRole: ConnectionRole.Publisher });
-      await this.assertExchange(exchange, { connectionRole: ConnectionRole.Publisher });
+      const channel: ChannelWrapper = await this.assertChannel();
+      await this.assertExchange(exchange);
       await channel.publish(exchange, '',
         Buffer.from(JSON.stringify(content)),
         RabbitMq.getPublishOptions(customHeaders));
@@ -693,7 +657,7 @@ class RabbitMq implements IAfRabbitMq {
     customHeaders?: any,
   ): Promise<boolean | undefined> {
     try {
-      await this.assertChannel({ connectionRole: ConnectionRole.Publisher });
+      await this.assertChannel();
     } catch (e) {
       logger.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
       throw e;
@@ -701,7 +665,7 @@ class RabbitMq implements IAfRabbitMq {
 
     try {
       RabbitMq.validateName('queue', queue);
-      await this.assertQueue(queue, ConnectionRole.Publisher, options);
+      await this.assertQueue(queue, options);
     } catch (e) {
       logger.error(`rabbit sendToQueue: failed to assert queue ${queue}`, { e });
       throw e;
@@ -714,18 +678,14 @@ class RabbitMq implements IAfRabbitMq {
       debug(`rabbit: sending to queue ${queue}`, { res });
       return res;
     } catch (e) {
-      const isConnected = await this.isConnected(ConnectionRole.Publisher);
+      const isConnected = await this.isConnected();
       logger.error(`rabbit sendToQueue: failed to send to queue ${queue}, isConnected: ${isConnected}`, { e });
       throw e;
     }
   }
 
-  async isConnected(connectionRole: ConnectionRole): Promise<boolean> {
-    const connection = await this.getConnection(connectionRole);
-    if (!connection) {
-      logger.error('rabbit: isConnected - false');
-      return false;
-    }
+  async isConnected() : Promise<boolean> {
+    const connection = await this.getConnection();
     const isConnected = connection.isConnected();
     if (!isConnected) {
       logger.error('rabbit: isConnected - false');

package/src/lib/types.ts

@@ -55,8 +55,3 @@ export const CONSUMER_DEFAULT_OPTIONS: Options.Consume = {
     [HA_PROMOTE_ON_SHUTDOWN]: 'always',
   },
 };
-
-export enum ConnectionRole {
-  Consumer = 'consumer',
-  Publisher = 'publisher',
-}