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

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { AmqpConnectionManager, ChannelWrapper, CreateChannelOpts } from 'amqp-connection-manager';
+import { AmqpConnectionManager, ChannelWrapper } 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, ConnectionData, assertChannelOpts, newChannelOpts, PublishOptions } from './lib/types';
 export interface IAfRabbitMq {
     ack: any;
     nack: any;
@@ -34,17 +34,6 @@ 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;
@@ -84,7 +73,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 }: assertChannelOpts): Promise<ChannelWrapper>;
+    assertChannel({ force, connectionPurpose, newChannelOptions }: assertChannelOpts): Promise<ChannelWrapper>;
     assertExchange(exchangeName: string, options?: any): Promise<any>;
     getQueueLength(queue: string, connectionPurpose?: ConnectionPurpose): Promise<Replies.AssertQueue>;
     private deleteQueue;
@@ -98,7 +87,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): Promise<boolean>;
+    publish(exchange: string, content: any, customHeaders?: any, options?: PublishOptions): 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,6 +7,7 @@ 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");
@@ -131,6 +132,7 @@ class RabbitMq {
                 creatingConnection: false,
                 connectionCreatedEventName: 'publishConnectionCreated',
                 connectionFailedEventName: 'publishConnectionFailed',
+                doesChannelInitialize: false,
             },
         };
         this.exchanges = {};
@@ -259,7 +261,7 @@ class RabbitMq {
             throw err;
         }
     }
-    async assertChannel({ force = false, connectionPurpose = consts_1.ConnectionPurpose.Consume }) {
+    async assertChannel({ force = false, connectionPurpose = consts_1.ConnectionPurpose.Consume, newChannelOptions = {} }) {
         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) => {
@@ -267,13 +269,14 @@ class RabbitMq {
                     return resolve(this.publishChannel);
                 }
                 try {
-                    const channel = await this.getNewChannel({ connectionPurpose });
+                    const channel = await this.getNewChannel({ connectionPurpose, options: newChannelOptions });
                     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);
                 }
@@ -426,6 +429,9 @@ 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;
@@ -490,7 +496,7 @@ class RabbitMq {
                 catch (e) {
                     await localNack(msg);
                 }
-            }, types_1.CONSUMER_DEFAULT_OPTIONS);
+            }, channelConsumerOptions);
             if (!consumerTag) {
                 logger_1.default.error(`rabbit: failed to consume from queue ${queue}`);
             }
@@ -518,18 +524,24 @@ class RabbitMq {
             ]);
         });
     }
-    async publish(exchange, content, customHeaders) {
+    async publish(exchange, content, customHeaders, options) {
         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 });
+            const channel = await this.assertChannel({
+                connectionPurpose: consts_1.ConnectionPurpose.Publish,
+                newChannelOptions: options?.newChannelOptions,
+            });
             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 });
+            await this.assertChannel({
+                connectionPurpose: consts_1.ConnectionPurpose.Publish,
+                newChannelOptions: options?.newChannelOptions,
+            });
         }
         catch (e) {
             logger_1.default.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
@@ -556,14 +568,16 @@ class RabbitMq {
     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 });
-            const isConnected = connection?.isConnected();
-            if (!isConnected) {
-                logger_1.default.error('rabbit: isConnected - false', { connectionPurpose });
-                return false;
-            }
-            if (connectionPurpose === consts_1.ConnectionPurpose.Publish) {
+            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;
+                }
                 const channel = await this.assertChannel({ connectionPurpose: connectionPurpose });
                 try {
                     await Promise.all([

package/dist/lib/types.d.ts

@@ -1,5 +1,6 @@
-import { AmqpConnectionManager } from 'amqp-connection-manager';
+import { AmqpConnectionManager, CreateChannelOpts } from 'amqp-connection-manager';
 import { ConsumeMessage, Options, Replies } from 'amqplib';
+import { ConnectionPurpose } from './consts';
 export interface ExchangesCache {
     [key: string]: any;
 }
@@ -26,25 +27,34 @@ 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.2",
+  "version": "3.2.26-beta.201",
   "description": "",
   "main": "dist/index.js",
   "engines": {
@@ -19,9 +19,11 @@
   },
   "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,10 +2,11 @@
 
 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, CreateChannelOpts,
+  AmqpConnectionManager, ChannelWrapper, connect,
 } from 'amqp-connection-manager';
 import {
   ConfirmChannel, ConsumeMessage, Options, Replies,
@@ -40,6 +41,9 @@ import {
   QueueSetupPromisesDictionary,
   AssertExchangePromisesDictionary,
   ConnectionData,
+  assertChannelOpts,
+  newChannelOpts,
+  PublishOptions,
 } from './lib/types';
 
 // const debug = nodeDebug('af-rabbitmq')
@@ -81,19 +85,6 @@ 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;
@@ -192,6 +183,7 @@ class RabbitMq implements IAfRabbitMq {
         creatingConnection: false,
         connectionCreatedEventName: 'publishConnectionCreated',
         connectionFailedEventName: 'publishConnectionFailed',
+        doesChannelInitialize: false,
       },
     };
     this.exchanges = {};
@@ -410,7 +402,7 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async assertChannel({ force = false, connectionPurpose = ConnectionPurpose.Consume }: assertChannelOpts): Promise<ChannelWrapper> {
+  async assertChannel({ force = false, connectionPurpose = ConnectionPurpose.Consume, newChannelOptions = {} }: 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) => {
@@ -419,13 +411,14 @@ class RabbitMq implements IAfRabbitMq {
         }
 
         try {
-          const channel = await this.getNewChannel({ connectionPurpose });
+          const channel = await this.getNewChannel({ connectionPurpose, options: newChannelOptions });
           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) {
@@ -602,6 +595,9 @@ 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) => {
@@ -677,7 +673,7 @@ class RabbitMq implements IAfRabbitMq {
           } catch (e) {
             await localNack(msg);
           }
-        }, CONSUMER_DEFAULT_OPTIONS,
+        }, channelConsumerOptions,
       );
       if (!consumerTag) {
         logger.error(`rabbit: failed to consume from queue ${queue}`);
@@ -712,11 +708,14 @@ class RabbitMq implements IAfRabbitMq {
     });
   }
 
-  async publish(exchange: string, content: any, customHeaders?: any): Promise<boolean> {
+  async publish(exchange: string, content: any, customHeaders?: any, options?: PublishOptions): Promise<boolean> {
     debug('rabbit: start publish msg');
     return wrapSetImmediate(async () => {
       RabbitMq.validateName('exchange', exchange);
-      const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose: ConnectionPurpose.Publish });
+      const channel: ChannelWrapper = await this.assertChannel({
+        connectionPurpose: ConnectionPurpose.Publish,
+        newChannelOptions: options?.newChannelOptions,
+      });
       await this.assertExchange(exchange, { connectionPurpose: ConnectionPurpose.Publish });
       await channel.publish(exchange, '',
         Buffer.from(JSON.stringify(content)),
@@ -731,7 +730,10 @@ class RabbitMq implements IAfRabbitMq {
     customHeaders?: any,
   ): Promise<boolean | undefined> {
     try {
-      await this.assertChannel({ connectionPurpose: ConnectionPurpose.Publish });
+      await this.assertChannel({
+        connectionPurpose: ConnectionPurpose.Publish,
+        newChannelOptions: options?.newChannelOptions,
+      });
     } catch (e) {
       logger.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
       throw e;
@@ -761,14 +763,18 @@ class RabbitMq implements IAfRabbitMq {
     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 });
-        const isConnected = connection?.isConnected();
-        if (!isConnected) {
-          logger.error('rabbit: isConnected - false', { connectionPurpose });
-          return false;
-        }
-        if (connectionPurpose === ConnectionPurpose.Publish) {
+        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;
+          }
           const channel: any = await this.assertChannel({ connectionPurpose: connectionPurpose as ConnectionPurpose });
           try {
             await Promise.all([

package/src/lib/types.ts

@@ -1,5 +1,6 @@
-import { AmqpConnectionManager } from 'amqp-connection-manager';
+import { AmqpConnectionManager, CreateChannelOpts } from 'amqp-connection-manager';
 import { ConsumeMessage, Options, Replies } from 'amqplib';
+import { ConnectionPurpose } from './consts';
 
 export interface ExchangesCache {
   [key: string]: any
@@ -32,6 +33,7 @@ export interface ConsumeOptions {
   useConsumeWithLock?: boolean;
   auditContext?: any;
   enableRabbitTrace?: boolean;
+  channelConsumeOptions?: Options.Consume;
 }
 
 export type CallbackFunction = (msg: ConsumeMessage, ack: any, nack: any) => Promise<any>
@@ -39,10 +41,14 @@ 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;
@@ -50,6 +56,10 @@ 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';
@@ -66,4 +76,5 @@ export type ConnectionData = {
   creatingConnection: boolean;
   connectionCreatedEventName: string;
   connectionFailedEventName: string;
+  doesChannelInitialize?: boolean;
 };