@autofleet/rabbit 3.2.24 → 3.2.25-beta.0

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 /// <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 { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, AssertExchangePromisesDictionary } from './lib/types';
+import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, AssertExchangePromisesDictionary, assertChannelOpts, newChannelOpts, PublishOptions } from './lib/types';
 export interface IAfRabbitMq {
     ack: any;
     nack: any;
@@ -33,15 +33,6 @@ export interface AfRabbitOptions {
     dontRetryAssert?: boolean;
     rabbitHost?: string;
 }
-type newChannelOpts = {
-    name?: string;
-    onClose?: null | ((args: any | null) => void);
-    options?: CreateChannelOpts | undefined;
-};
-type assertChannelOpts = {
-    channelName?: string;
-    force?: boolean;
-};
 declare class RabbitMq implements IAfRabbitMq {
     static parseMsg(msg: any): any;
     static validateName(type: string, name: string): void;
@@ -79,8 +70,8 @@ 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(): Promise<AmqpConnectionManager>;
     getNewChannel({ name, onClose, options }?: newChannelOpts): Promise<ChannelWrapper>;
-    assertChannel({ force }?: assertChannelOpts): Promise<ChannelWrapper>;
-    assertExchange(exchangeName: string, options?: any): Promise<any>;
+    assertChannel({ force, newChannelOptions }?: assertChannelOpts): Promise<ChannelWrapper>;
+    assertExchange(exchangeName: string): Promise<any>;
     getQueueLength(queue: string): Promise<Replies.AssertQueue>;
     private deleteQueue;
     bindQueue(queue: string, exchange: string): Promise<void>;
@@ -93,7 +84,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");
@@ -244,14 +245,14 @@ class RabbitMq {
             throw err;
         }
     }
-    async assertChannel({ force = false } = {}) {
+    async assertChannel({ force = false, newChannelOptions = {} } = {}) {
         if (!this.publishChannelSetupPromise) {
             this.publishChannelSetupPromise = new Promise(async (resolve, reject) => {
                 if (this.channel && !force) {
                     return resolve(this.channel);
                 }
                 try {
-                    const channel = await this.getNewChannel({});
+                    const channel = await this.getNewChannel({ options: newChannelOptions });
                     channel.on('error', (err) => {
                         logger_1.default.error('rabbit: channel error', { err });
                     });
@@ -265,7 +266,7 @@ class RabbitMq {
         }
         return this.publishChannelSetupPromise;
     }
-    async assertExchange(exchangeName, options) {
+    async assertExchange(exchangeName) {
         const channel = await this.assertChannel();
         if (this.exchanges[exchangeName]) {
             delete this.assertExchangePromises[exchangeName];
@@ -404,6 +405,9 @@ class RabbitMq {
         return channel.addSetup(async (confirmChannel) => {
             const q = await this.assertQueue(queue, 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;
@@ -468,7 +472,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}`);
             }
@@ -489,24 +493,24 @@ class RabbitMq {
             const assertExchange = await (0, utils_1.assertExchangeFanout)(c, exchange);
             await c.assertQueue(queue);
             this.exchanges[exchange] = assertExchange;
-            await c.prefetch(limit, false);
+            await c.prefetch(limit, true);
             return Promise.all([
                 c.bindQueue(queue, exchange, ''),
                 this.consume(queue, callback, options),
             ]);
         });
     }
-    async publish(exchange, content, customHeaders) {
+    async publish(exchange, content, customHeaders, options) {
         return (0, utils_1.wrapSetImmediate)(async () => {
             RabbitMq.validateName('exchange', exchange);
-            const channel = await this.assertChannel();
+            const channel = await this.assertChannel({ newChannelOptions: options?.newChannelOptions });
             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();
+            await this.assertChannel({ newChannelOptions: options?.newChannelOptions });
         }
         catch (e) {
             logger_1.default.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });

package/dist/lib/types.d.ts

@@ -1,3 +1,4 @@
+import { CreateChannelOpts } from 'amqp-connection-manager';
 import { ConsumeMessage, Options, Replies } from 'amqplib';
 export interface ExchangesCache {
     [key: string]: any;
@@ -25,16 +26,22 @@ export interface ConsumeOptions {
     useConsumeWithLock?: boolean;
     auditContext?: any;
     enableRabbitTrace?: boolean;
+    channelConsumeOptions?: Options.Consume;
 }
 export type CallbackFunction = (msg: ConsumeMessage, ack: any, nack: any) => Promise<any>;
 export type newChannelOpts = {
     name?: string;
     onClose?: null | ((args: any | null) => void);
+    options?: CreateChannelOpts | undefined;
 };
 export type assertChannelOpts = {
     channelName?: string;
     force?: boolean;
+    newChannelOptions?: newChannelOpts;
 };
+export interface PublishOptions {
+    newChannelOptions?: newChannelOpts;
+}
 export type AfConsumer = {
     queue: string;
     callback: CallbackFunction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.24",
+  "version": "3.2.25-beta.0",
   "description": "",
   "main": "dist/index.js",
   "engines": {
@@ -22,6 +22,7 @@
     "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"
@@ -33,6 +34,7 @@
     "@autofleet/logger": "4.0.6",
     "@types/amqplib": "0.8.2",
     "@types/jest": "^29.5.12",
+    "@types/lodash": "^4.17.12",
     "@types/node": "^20.14.11",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "eslint": "^7.13.0",

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 {
   CONSUMER_DEFAULT_OPTIONS,
   QueueSetupPromisesDictionary,
   AssertExchangePromisesDictionary,
+  assertChannelOpts,
+  newChannelOpts,
+  PublishOptions,
 } from './lib/types';
 
 // const debug = nodeDebug('af-rabbitmq')
@@ -82,17 +86,6 @@ export interface AfRabbitOptions {
   rabbitHost?: string;
 }
 
-type newChannelOpts = {
-  name?: string;
-  onClose?: null | ((args: any | null) => void);
-  options?: CreateChannelOpts | undefined;
-};
-
-type assertChannelOpts = {
-  channelName?: string;
-  force?: boolean;
-}
-
 type AfConsumer = {
   queue: string;
   callback: CallbackFunction;
@@ -386,7 +379,7 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async assertChannel({ force = false } : assertChannelOpts = {}): Promise<ChannelWrapper> {
+  async assertChannel({ force = false, newChannelOptions = {} }: assertChannelOpts = {}): Promise<ChannelWrapper> {
     if (!this.publishChannelSetupPromise) {
       this.publishChannelSetupPromise = new Promise<ChannelWrapper>(async (resolve, reject) => {
         if (this.channel && !force) {
@@ -394,7 +387,7 @@ class RabbitMq implements IAfRabbitMq {
         }
 
         try {
-          const channel = await this.getNewChannel({});
+          const channel = await this.getNewChannel({ options: newChannelOptions });
           channel.on('error', (err) => {
             logger.error('rabbit: channel error', { err });
           });
@@ -408,7 +401,7 @@ class RabbitMq implements IAfRabbitMq {
     return this.publishChannelSetupPromise;
   }
 
-  async assertExchange(exchangeName: string, options?: any) {
+  async assertExchange(exchangeName: string) {
     const channel: ChannelWrapper = await this.assertChannel();
 
     if (this.exchanges[exchangeName]) {
@@ -572,6 +565,10 @@ class RabbitMq implements IAfRabbitMq {
     return channel.addSetup(async (confirmChannel: ConfirmChannel) => {
       const q = await this.assertQueue(queue, 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) => {
@@ -647,7 +644,8 @@ class RabbitMq implements IAfRabbitMq {
           } catch (e) {
             await localNack(msg);
           }
-        }, CONSUMER_DEFAULT_OPTIONS,
+        },
+        channelConsumerOptions,
       );
       if (!consumerTag) {
         logger.error(`rabbit: failed to consume from queue ${queue}`);
@@ -670,7 +668,7 @@ class RabbitMq implements IAfRabbitMq {
       const assertExchange = await assertExchangeFanout(c, exchange);
       await c.assertQueue(queue);
       this.exchanges[exchange] = assertExchange;
-      await c.prefetch(limit, false);
+      await c.prefetch(limit, true);
       return Promise.all([
         c.bindQueue(queue, exchange, ''),
         this.consume(
@@ -682,10 +680,10 @@ 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> {
     return wrapSetImmediate(async () => {
       RabbitMq.validateName('exchange', exchange);
-      const channel: ChannelWrapper = await this.assertChannel();
+      const channel: ChannelWrapper = await this.assertChannel({ newChannelOptions: options?.newChannelOptions });
       await this.assertExchange(exchange);
       await channel.publish(exchange, '',
         Buffer.from(JSON.stringify(content)),
@@ -700,7 +698,7 @@ class RabbitMq implements IAfRabbitMq {
     customHeaders?: any,
   ): Promise<boolean | undefined> {
     try {
-      await this.assertChannel();
+      await this.assertChannel({ newChannelOptions: options?.newChannelOptions });
     } catch (e) {
       logger.error(`rabbit sendToQueue: failed to send assert channel when sending to queue ${queue}`, { e });
       throw e;

package/src/lib/types.ts

@@ -1,3 +1,4 @@
+import { CreateChannelOpts } from 'amqp-connection-manager';
 import { ConsumeMessage, Options, Replies } from 'amqplib';
 
 export interface ExchangesCache {
@@ -31,6 +32,7 @@ export interface ConsumeOptions {
   useConsumeWithLock?: boolean;
   auditContext?: any;
   enableRabbitTrace?: boolean;
+  channelConsumeOptions?: Options.Consume;
 }
 
 export type CallbackFunction = (msg: ConsumeMessage, ack: any, nack: any) => Promise<any>
@@ -38,11 +40,18 @@ export type CallbackFunction = (msg: ConsumeMessage, ack: any, nack: any) => Pro
 export type newChannelOpts = {
   name?: string;
   onClose?: null | ((args: any | null) => void);
+  options?: CreateChannelOpts | undefined;
 };
 export type assertChannelOpts = {
   channelName?: string;
   force?: boolean;
+  newChannelOptions?: newChannelOpts;
 }
+
+export interface PublishOptions {
+  newChannelOptions?: newChannelOpts;
+}
+
 export type AfConsumer = {
   queue: string;
   callback: CallbackFunction;