@autofleet/rabbit 3.2.26-beta.201 → 3.2.26-beta.3

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 /// <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 { ConnectionPurpose } from './lib/consts';
-import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, AssertExchangePromisesDictionary, ConnectionData, assertChannelOpts, newChannelOpts, PublishOptions } from './lib/types';
+import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, AssertExchangePromisesDictionary, ConnectionData } from './lib/types';
 export interface IAfRabbitMq {
     ack: any;
     nack: any;
@@ -34,6 +34,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;
@@ -73,7 +84,7 @@ declare class RabbitMq implements IAfRabbitMq {
     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, newChannelOptions }: assertChannelOpts): 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;
@@ -87,7 +98,7 @@ declare class RabbitMq implements IAfRabbitMq {
     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>;
     gracefulShutdown(signal: string): Promise<void>;

package/dist/index.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendCeleryTaskViaHttp = void 0;
 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");
@@ -132,7 +131,6 @@ class RabbitMq {
                 creatingConnection: false,
                 connectionCreatedEventName: 'publishConnectionCreated',
                 connectionFailedEventName: 'publishConnectionFailed',
-                doesChannelInitialize: false,
             },
         };
         this.exchanges = {};
@@ -261,7 +259,7 @@ class RabbitMq {
             throw err;
         }
     }
-    async assertChannel({ force = false, connectionPurpose = consts_1.ConnectionPurpose.Consume, newChannelOptions = {} }) {
+    async assertChannel({ force = false, connectionPurpose = consts_1.ConnectionPurpose.Consume }) {
         debug('rabbit: start assert channel', { connectionPurpose, publishPromise: this.publishChannelSetupPromise, channel: this.publishChannel });
         if (!this.publishChannelSetupPromise || (!this.publishChannel && connectionPurpose === consts_1.ConnectionPurpose.Publish)) {
             this.publishChannelSetupPromise = new Promise(async (resolve, reject) => {
@@ -269,14 +267,13 @@ class RabbitMq {
                     return resolve(this.publishChannel);
                 }
                 try {
-                    const channel = await this.getNewChannel({ connectionPurpose, options: newChannelOptions });
+                    const channel = await this.getNewChannel({ connectionPurpose });
                     debug('rabbit: new channel got', { connectionPurpose, channel: this.publishChannel });
                     channel.on('error', (err) => {
                         logger_1.default.error('rabbit: channel error', { err });
                     });
                     if (connectionPurpose === consts_1.ConnectionPurpose.Publish) {
                         this.publishChannel = channel;
-                        this.connectionsMap[connectionPurpose].doesChannelInitialize = true;
                     }
                     resolve(channel);
                 }
@@ -429,9 +426,6 @@ class RabbitMq {
         return channel.addSetup(async (confirmChannel) => {
             const q = await this.assertQueue(queue, consts_1.ConnectionPurpose.Consume, optionsWithDefaults);
             await confirmChannel.prefetch(limit, false);
-            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;
@@ -496,7 +490,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}`);
             }
@@ -524,24 +518,18 @@ class RabbitMq {
             ]);
         });
     }
-    async publish(exchange, content, customHeaders, options) {
+    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,
-                newChannelOptions: options?.newChannelOptions,
-            });
+            const channel = await this.assertChannel({ connectionPurpose: consts_1.ConnectionPurpose.Publish });
             await this.assertExchange(exchange, { connectionPurpose: consts_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({
-                connectionPurpose: consts_1.ConnectionPurpose.Publish,
-                newChannelOptions: options?.newChannelOptions,
-            });
+            await this.assertChannel({ connectionPurpose: consts_1.ConnectionPurpose.Publish });
         }
         catch (e) {
             logger_1.default.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
@@ -568,16 +556,7 @@ class RabbitMq {
     async isConnected() {
         debug('rabbit: start is connected');
         const isEachConnectionConnected = await Promise.all(Object.entries(this.connectionsMap).map(async ([connectionPurpose, connectionData]) => {
-            const { connection, doesChannelInitialize } = connectionData;
-            if (connectionPurpose === consts_1.ConnectionPurpose.Consume
-                || (connectionPurpose === consts_1.ConnectionPurpose.Publish
-                    && doesChannelInitialize)) {
-                debug('rabbit: is connected inside map', { connection, connectionPurpose });
-                const isConnected = connection?.isConnected();
-                if (!isConnected) {
-                    logger_1.default.error('rabbit: isConnected - false', { connectionPurpose });
-                    return false;
-                }
+            if (connectionPurpose === consts_1.ConnectionPurpose.Publish) {
                 const channel = await this.assertChannel({ connectionPurpose: connectionPurpose });
                 try {
                     await Promise.all([
@@ -590,6 +569,13 @@ class RabbitMq {
                     return false;
                 }
             }
+            const { connection } = connectionData;
+            debug('rabbit: is connected inside map', { connection, connectionPurpose });
+            const isConnected = connection?.isConnected();
+            if (!isConnected) {
+                logger_1.default.error('rabbit: isConnected - false', { connectionPurpose });
+                return false;
+            }
             logger_1.default.info('rabbit: isConnected - true');
             return true;
         }));

package/dist/lib/types.d.ts

@@ -1,6 +1,5 @@
-import { AmqpConnectionManager, CreateChannelOpts } from 'amqp-connection-manager';
+import { AmqpConnectionManager } from 'amqp-connection-manager';
 import { ConsumeMessage, Options, Replies } from 'amqplib';
-import { ConnectionPurpose } from './consts';
 export interface ExchangesCache {
     [key: string]: any;
 }
@@ -27,34 +26,25 @@ 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;
-    connectionPurpose?: ConnectionPurpose;
 };
 export type assertChannelOpts = {
     channelName?: string;
     force?: boolean;
-    newChannelOptions?: newChannelOpts;
-    connectionPurpose?: ConnectionPurpose;
 };
 export type AfConsumer = {
     queue: string;
     callback: CallbackFunction;
     options: ConsumeOptions | undefined;
 };
-export interface PublishOptions {
-    newChannelOptions?: newChannelOpts;
-}
 export declare const CONSUMER_DEFAULT_OPTIONS: Options.Consume;
 export type ConnectionData = {
     connection: AmqpConnectionManager | null;
     creatingConnection: boolean;
     connectionCreatedEventName: string;
     connectionFailedEventName: string;
-    doesChannelInitialize?: boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.26-beta.201",
+  "version": "3.2.26-beta.3",
   "description": "",
   "main": "dist/index.js",
   "engines": {
@@ -19,11 +19,9 @@
   },
   "dependencies": {
     "@autofleet/zehut": "^3.1.2",
-    "@types/lodash": "^4.17.16",
     "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"

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,
@@ -41,9 +40,6 @@ import {
   QueueSetupPromisesDictionary,
   AssertExchangePromisesDictionary,
   ConnectionData,
-  assertChannelOpts,
-  newChannelOpts,
-  PublishOptions,
 } from './lib/types';
 
 // const debug = nodeDebug('af-rabbitmq')
@@ -85,6 +81,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;
@@ -183,7 +192,6 @@ class RabbitMq implements IAfRabbitMq {
         creatingConnection: false,
         connectionCreatedEventName: 'publishConnectionCreated',
         connectionFailedEventName: 'publishConnectionFailed',
-        doesChannelInitialize: false,
       },
     };
     this.exchanges = {};
@@ -402,7 +410,7 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async assertChannel({ force = false, connectionPurpose = ConnectionPurpose.Consume, newChannelOptions = {} }: assertChannelOpts): Promise<ChannelWrapper> {
+  async assertChannel({ force = false, connectionPurpose = ConnectionPurpose.Consume }: assertChannelOpts): Promise<ChannelWrapper> {
     debug('rabbit: start assert channel', { connectionPurpose, publishPromise: this.publishChannelSetupPromise, channel: this.publishChannel });
     if (!this.publishChannelSetupPromise || (!this.publishChannel && connectionPurpose === ConnectionPurpose.Publish)) {
       this.publishChannelSetupPromise = new Promise<ChannelWrapper>(async (resolve, reject) => {
@@ -411,14 +419,13 @@ class RabbitMq implements IAfRabbitMq {
         }
 
         try {
-          const channel = await this.getNewChannel({ connectionPurpose, options: newChannelOptions });
+          const channel = await this.getNewChannel({ connectionPurpose });
           debug('rabbit: new channel got', { connectionPurpose, channel: this.publishChannel });
           channel.on('error', (err) => {
             logger.error('rabbit: channel error', { err });
           });
           if (connectionPurpose === ConnectionPurpose.Publish) {
             this.publishChannel = channel;
-            this.connectionsMap[connectionPurpose].doesChannelInitialize = true;
           }
           resolve(channel);
         } catch (e) {
@@ -595,9 +602,6 @@ class RabbitMq implements IAfRabbitMq {
     return channel.addSetup(async (confirmChannel: ConfirmChannel) => {
       const q = await this.assertQueue(queue, ConnectionPurpose.Consume, optionsWithDefaults);
       await confirmChannel.prefetch(limit, false);
-      const channelConsumerOptions = optionsWithDefaults.channelConsumeOptions
-        ? merge(CONSUMER_DEFAULT_OPTIONS, optionsWithDefaults.channelConsumeOptions)
-        : CONSUMER_DEFAULT_OPTIONS;
       const { consumerTag } = await confirmChannel.consume(
         queue,
         async (msg: ConsumeMessageOrNull) => {
@@ -673,7 +677,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}`);
@@ -708,14 +712,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> {
     debug('rabbit: start publish msg');
     return wrapSetImmediate(async () => {
       RabbitMq.validateName('exchange', exchange);
-      const channel: ChannelWrapper = await this.assertChannel({
-        connectionPurpose: ConnectionPurpose.Publish,
-        newChannelOptions: options?.newChannelOptions,
-      });
+      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)),
@@ -730,10 +731,7 @@ class RabbitMq implements IAfRabbitMq {
     customHeaders?: any,
   ): Promise<boolean | undefined> {
     try {
-      await this.assertChannel({
-        connectionPurpose: ConnectionPurpose.Publish,
-        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;
@@ -763,18 +761,7 @@ class RabbitMq implements IAfRabbitMq {
     debug('rabbit: start is connected');
     const isEachConnectionConnected = await Promise.all(
       Object.entries(this.connectionsMap).map(async ([connectionPurpose, connectionData]) => {
-        const { connection, doesChannelInitialize } = connectionData;
-        if (
-          connectionPurpose === ConnectionPurpose.Consume
-          || (connectionPurpose === ConnectionPurpose.Publish
-            && doesChannelInitialize
-          )) {
-          debug('rabbit: is connected inside map', { connection, connectionPurpose });
-          const isConnected = connection?.isConnected();
-          if (!isConnected) {
-            logger.error('rabbit: isConnected - false', { connectionPurpose });
-            return false;
-          }
+        if (connectionPurpose === ConnectionPurpose.Publish) {
           const channel: any = await this.assertChannel({ connectionPurpose: connectionPurpose as ConnectionPurpose });
           try {
             await Promise.all([
@@ -786,6 +773,13 @@ class RabbitMq implements IAfRabbitMq {
             return false;
           }
         }
+        const { connection } = connectionData;
+        debug('rabbit: is connected inside map', { connection, connectionPurpose });
+        const isConnected = connection?.isConnected();
+        if (!isConnected) {
+          logger.error('rabbit: isConnected - false', { connectionPurpose });
+          return false;
+        }
         logger.info('rabbit: isConnected - true');
         return true;
       }),

package/src/lib/types.ts

@@ -1,6 +1,5 @@
-import { AmqpConnectionManager, CreateChannelOpts } from 'amqp-connection-manager';
+import { AmqpConnectionManager } from 'amqp-connection-manager';
 import { ConsumeMessage, Options, Replies } from 'amqplib';
-import { ConnectionPurpose } from './consts';
 
 export interface ExchangesCache {
   [key: string]: any
@@ -33,7 +32,6 @@ export interface ConsumeOptions {
   useConsumeWithLock?: boolean;
   auditContext?: any;
   enableRabbitTrace?: boolean;
-  channelConsumeOptions?: Options.Consume;
 }
 
 export type CallbackFunction = (msg: ConsumeMessage, ack: any, nack: any) => Promise<any>
@@ -41,14 +39,10 @@ export type CallbackFunction = (msg: ConsumeMessage, ack: any, nack: any) => Pro
 export type newChannelOpts = {
   name?: string;
   onClose?: null | ((args: any | null) => void);
-  options?: CreateChannelOpts | undefined;
-  connectionPurpose?: ConnectionPurpose;
 };
 export type assertChannelOpts = {
   channelName?: string;
   force?: boolean;
-  newChannelOptions?: newChannelOpts;
-  connectionPurpose?: ConnectionPurpose;
 }
 export type AfConsumer = {
   queue: string;
@@ -56,10 +50,6 @@ export type AfConsumer = {
   options: ConsumeOptions | undefined;
 }
 
-export interface PublishOptions {
-  newChannelOptions?: newChannelOpts;
-}
-
 const HA_PROMOTE_ON_FAILURE = 'ha-promote-on-failure';
 
 const HA_PROMOTE_ON_SHUTDOWN = 'ha-promote-on-shutdown';
@@ -76,5 +66,4 @@ export type ConnectionData = {
   creatingConnection: boolean;
   connectionCreatedEventName: string;
   connectionFailedEventName: string;
-  doesChannelInitialize?: boolean;
 };