@autofleet/rabbit 3.2.21-beta.1 → 3.2.21

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 /// <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 { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, assertChannelOpts, newChannelOpts, PublishOptions } from './lib/types';
+import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, AssertExchangePromisesDictionary } from './lib/types';
 export interface IAfRabbitMq {
     ack: any;
     nack: any;
@@ -33,6 +33,15 @@ 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;
@@ -57,6 +66,7 @@ declare class RabbitMq implements IAfRabbitMq {
     exchanges: ExchangesCache;
     queues: QueuesCache;
     queueSetupPromises: QueueSetupPromisesDictionary;
+    assertExchangePromises: AssertExchangePromisesDictionary;
     options: AfRabbitOptions | undefined;
     redisClient: any;
     redisLock?: RedisLockType;
@@ -69,12 +79,13 @@ 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, newChannelOptions }?: assertChannelOpts): Promise<ChannelWrapper>;
-    assertExchange(exchangeName: string): Promise<any>;
+    assertChannel({ force }?: assertChannelOpts): Promise<ChannelWrapper>;
+    assertExchange(exchangeName: string, options?: any): Promise<any>;
     getQueueLength(queue: string): Promise<Replies.AssertQueue>;
     private deleteQueue;
     bindQueue(queue: string, exchange: string): Promise<void>;
     setupQueue(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue>;
+    static shouldUseQuorum(queueName: string): boolean;
     assertQueue(queueName: string, options?: Options.AssertQueue): Promise<any>;
     private saveConsumer;
     consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any>;
@@ -82,7 +93,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

@@ -6,7 +6,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -124,6 +123,7 @@ class RabbitMq {
         this.exchanges = {};
         this.queues = {};
         this.queueSetupPromises = {};
+        this.assertExchangePromises = {};
         this.consumers = [];
         this.options = options;
         this.redisClient = redisConfig && (0, redis_1.default)(redisConfig);
@@ -243,14 +243,14 @@ class RabbitMq {
             throw err;
         }
     }
-    async assertChannel({ force = false, newChannelOptions = {} } = {}) {
+    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({ options: newChannelOptions });
+                    const channel = await this.getNewChannel({});
                     channel.on('error', (err) => {
                         logger_1.default.error('rabbit: channel error', { err });
                     });
@@ -264,14 +264,18 @@ class RabbitMq {
         }
         return this.publishChannelSetupPromise;
     }
-    async assertExchange(exchangeName) {
+    async assertExchange(exchangeName, options) {
         const channel = await this.assertChannel();
         if (this.exchanges[exchangeName]) {
+            delete this.assertExchangePromises[exchangeName];
             return this.exchanges[exchangeName];
         }
-        const exchange = await (0, utils_1.assertExchangeFanout)(channel, exchangeName);
-        this.exchanges[exchangeName] = exchange;
-        return exchange;
+        if (this.assertExchangePromises[exchangeName]) {
+            return this.assertExchangePromises[exchangeName];
+        }
+        this.assertExchangePromises[exchangeName] = (0, utils_1.assertExchangeFanout)(channel, exchangeName);
+        this.exchanges[exchangeName] = await this.assertExchangePromises[exchangeName];
+        return this.exchanges[exchangeName];
     }
     async getQueueLength(queue) {
         RabbitMq.validateName('queue', queue);
@@ -297,12 +301,22 @@ class RabbitMq {
     }
     async setupQueue(queueName, options) {
         let queue;
+        const shouldUseQuorum = RabbitMq.shouldUseQuorum(queueName);
+        const localeOptions = {
+            ...options,
+            durable: true,
+            arguments: {
+                ...options?.arguments,
+                'x-consumer-timeout': 1000 * 60 * 60 * 24,
+                'x-queue-type': shouldUseQuorum ? 'quorum' : 'classic',
+            },
+        };
         try {
             const channel = await this.assertChannel();
             debug('assertQueue->channel.addSetup', { queueName });
-            await channel.addSetup((setupChannel) => setupChannel.assertQueue(queueName, options));
+            await channel.addSetup((setupChannel) => setupChannel.assertQueue(queueName, localeOptions));
             debug('assertQueue->channel.assertQueue', { queueName });
-            queue = await channel.assertQueue(queueName, options);
+            queue = await channel.assertQueue(queueName, localeOptions);
         }
         catch (e) {
             logger_1.default.error('rabbit: assertQueue error', { queueName, options, error: e });
@@ -311,17 +325,28 @@ class RabbitMq {
                 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));
+                await channel.addSetup((setupChannel) => setupChannel.assertQueue(queueName, localeOptions));
                 debug('retrying assertQueue->channel.assertQueue', { queueName });
-                queue = await channel.assertQueue(queueName, options);
+                queue = await channel.assertQueue(queueName, localeOptions);
             }
             else {
                 throw e;
             }
         }
-        this.queues[queueName] = queueName;
+        this.queues[queueName] = queue;
         return queue;
     }
+    static shouldUseQuorum(queueName) {
+        const envQuorumQueuesWhitelist = process.env.QUORUM_QUEUES_WHITELIST;
+        if (envQuorumQueuesWhitelist === '*') {
+            return true;
+        }
+        if (envQuorumQueuesWhitelist) {
+            const whitelist = envQuorumQueuesWhitelist.split(',');
+            return whitelist.includes(queueName);
+        }
+        return false;
+    }
     async assertQueue(queueName, options) {
         RabbitMq.validateName('queue', queueName);
         if (this.queues[queueName]) {
@@ -376,9 +401,8 @@ class RabbitMq {
         }
         const channel = await this.getNewChannel({});
         return channel.addSetup(async (confirmChannel) => {
-            await confirmChannel.assertQueue(queue, options ? { messageTtl: options.messageTtl } : undefined);
-            await confirmChannel.prefetch(limit, true);
-            const channelConsumerOptions = optionsWithDefaults.channelConsumeOptions ? (0, lodash_1.merge)(types_1.CONSUMER_DEFAULT_OPTIONS, optionsWithDefaults.channelConsumeOptions) : types_1.CONSUMER_DEFAULT_OPTIONS;
+            const q = await this.assertQueue(queue, optionsWithDefaults);
+            await confirmChannel.prefetch(limit, false);
             const { consumerTag } = await confirmChannel.consume(queue, async (msg) => {
                 if (!msg) {
                     return null;
@@ -439,7 +463,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}`);
             }
@@ -467,17 +491,17 @@ class RabbitMq {
             ]);
         });
     }
-    async publish(exchange, content, customHeaders, options) {
+    async publish(exchange, content, customHeaders) {
         return (0, utils_1.wrapSetImmediate)(async () => {
             RabbitMq.validateName('exchange', exchange);
-            const channel = await this.assertChannel({ newChannelOptions: options?.newChannelOptions });
+            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({ newChannelOptions: options?.newChannelOptions });
+            await this.assertChannel();
         }
         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,4 +1,3 @@
-import { CreateChannelOpts } from 'amqp-connection-manager';
 import { ConsumeMessage, Options, Replies } from 'amqplib';
 export interface ExchangesCache {
     [key: string]: any;
@@ -9,6 +8,9 @@ export interface QueuesCache {
 export interface QueueSetupPromisesDictionary {
     [key: string]: Promise<Replies.AssertQueue> | undefined;
 }
+export interface AssertExchangePromisesDictionary {
+    [key: string]: Promise<Replies.AssertExchange> | undefined;
+}
 export type CustomMessageHeaders = {
     redisTimestampValidationKey?: string;
 };
@@ -23,22 +25,16 @@ 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/dist/lib/utils.d.ts

@@ -1,5 +1,5 @@
 import { ChannelWrapper } from 'amqp-connection-manager';
-import { ConfirmChannel } from 'amqplib';
-export declare const assertExchangeFanout: (c: ChannelWrapper | ConfirmChannel, exchangeName: string) => Promise<import("amqplib").Replies.AssertExchange>;
+import { ConfirmChannel, Replies } from 'amqplib';
+export declare const assertExchangeFanout: (c: ChannelWrapper | ConfirmChannel, exchangeName: string) => Promise<Replies.AssertExchange>;
 export declare const wrapSetImmediate: (callback: () => any) => Promise<any>;
 export declare const rand: () => number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.21-beta.1",
+  "version": "3.2.21",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,7 +19,6 @@
     "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"
@@ -31,7 +30,6 @@
     "@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",
@@ -45,4 +43,4 @@
   },
   "author": "",
   "license": "ISC"
-}
+}

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,
@@ -36,10 +35,10 @@ import {
   CustomMessageHeaders,
   QueuesCache,
   RedisLockType,
-  ExchangesCache, CONSUMER_DEFAULT_OPTIONS, QueueSetupPromisesDictionary,
-  assertChannelOpts,
-  newChannelOpts,
-  PublishOptions,
+  ExchangesCache,
+  CONSUMER_DEFAULT_OPTIONS,
+  QueueSetupPromisesDictionary,
+  AssertExchangePromisesDictionary,
 } from './lib/types';
 
 // const debug = nodeDebug('af-rabbitmq')
@@ -82,6 +81,17 @@ 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;
@@ -150,6 +160,8 @@ class RabbitMq implements IAfRabbitMq {
 
   queueSetupPromises: QueueSetupPromisesDictionary;
 
+  assertExchangePromises: AssertExchangePromisesDictionary;
+
   options: AfRabbitOptions | undefined;
 
   redisClient: any;
@@ -170,6 +182,7 @@ class RabbitMq implements IAfRabbitMq {
     this.exchanges = {};
     this.queues = {};
     this.queueSetupPromises = {};
+    this.assertExchangePromises = {};
     this.consumers = [];
     this.options = options;
     this.redisClient = redisConfig && getRedisInstance(redisConfig);
@@ -372,7 +385,7 @@ class RabbitMq implements IAfRabbitMq {
     }
   }
 
-  async assertChannel({ force = false, newChannelOptions = {} }: assertChannelOpts = {}): Promise<ChannelWrapper> {
+  async assertChannel({ force = false } : assertChannelOpts = {}): Promise<ChannelWrapper> {
     if (!this.publishChannelSetupPromise) {
       this.publishChannelSetupPromise = new Promise<ChannelWrapper>(async (resolve, reject) => {
         if (this.channel && !force) {
@@ -380,7 +393,7 @@ class RabbitMq implements IAfRabbitMq {
         }
 
         try {
-          const channel = await this.getNewChannel({ options: newChannelOptions });
+          const channel = await this.getNewChannel({});
           channel.on('error', (err) => {
             logger.error('rabbit: channel error', { err });
           });
@@ -394,14 +407,21 @@ class RabbitMq implements IAfRabbitMq {
     return this.publishChannelSetupPromise;
   }
 
-  async assertExchange(exchangeName: string) {
+  async assertExchange(exchangeName: string, options?: any) {
     const channel: ChannelWrapper = await this.assertChannel();
+
     if (this.exchanges[exchangeName]) {
+      delete this.assertExchangePromises[exchangeName];
       return this.exchanges[exchangeName];
     }
-    const exchange = await assertExchangeFanout(channel, exchangeName);
-    this.exchanges[exchangeName] = exchange;
-    return exchange;
+
+    if (this.assertExchangePromises[exchangeName]) {
+      return this.assertExchangePromises[exchangeName];
+    }
+
+    this.assertExchangePromises[exchangeName] = assertExchangeFanout(channel, exchangeName);
+    this.exchanges[exchangeName] = await this.assertExchangePromises[exchangeName];
+    return this.exchanges[exchangeName];
   }
 
   async getQueueLength(queue: string) {
@@ -431,12 +451,22 @@ class RabbitMq implements IAfRabbitMq {
 
   async setupQueue(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue> {
     let queue: Replies.AssertQueue;
+    const shouldUseQuorum = RabbitMq.shouldUseQuorum(queueName);
+    const localeOptions = {
+      ...options,
+      durable: true,
+      arguments: {
+        ...options?.arguments,
+        'x-consumer-timeout': 1000 * 60 * 60 * 24,
+        'x-queue-type': shouldUseQuorum ? 'quorum' : 'classic',
+      },
+    };
     try {
       const channel: ChannelWrapper = await this.assertChannel();
       debug('assertQueue->channel.addSetup', { queueName });
-      await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, options));
+      await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, localeOptions));
       debug('assertQueue->channel.assertQueue', { queueName });
-      queue = await channel.assertQueue(queueName, options);
+      queue = await channel.assertQueue(queueName, localeOptions);
     } catch (e) {
       logger.error('rabbit: assertQueue error', { queueName, options, error: e });
       if (!this.options?.dontRetryAssert) {
@@ -445,19 +475,34 @@ class RabbitMq implements IAfRabbitMq {
         await this.deleteQueue(queueName);
 
         debug('retrying assertQueue->channel.addSetup', { queueName });
-        await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, options));
+        await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.assertQueue(queueName, localeOptions));
         debug('retrying assertQueue->channel.assertQueue', { queueName });
-        queue = await channel.assertQueue(queueName, options);
+        queue = await channel.assertQueue(queueName, localeOptions);
       } else {
         throw e;
       }
     }
 
-    this.queues[queueName] = queueName;
+    this.queues[queueName] = queue;
     return queue;
   }
 
-  async assertQueue(queueName: string, options?: Options.AssertQueue) {
+  static shouldUseQuorum(queueName: string): boolean {
+    const envQuorumQueuesWhitelist = process.env.QUORUM_QUEUES_WHITELIST;
+
+    if (envQuorumQueuesWhitelist === '*') {
+      return true;
+    }
+
+    if (envQuorumQueuesWhitelist) {
+      const whitelist = envQuorumQueuesWhitelist.split(',');
+      return whitelist.includes(queueName);
+    }
+
+    return false;
+  }
+
+  async assertQueue(queueName: string, options?: Options.AssertQueue): Promise<any> {
     RabbitMq.validateName('queue', queueName);
     if (this.queues[queueName]) {
       delete this.queueSetupPromises[queueName];
@@ -524,9 +569,8 @@ class RabbitMq implements IAfRabbitMq {
     }
     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);
-      const channelConsumerOptions = optionsWithDefaults.channelConsumeOptions ? merge(CONSUMER_DEFAULT_OPTIONS, optionsWithDefaults.channelConsumeOptions) : CONSUMER_DEFAULT_OPTIONS;
+      const q = await this.assertQueue(queue, optionsWithDefaults);
+      await confirmChannel.prefetch(limit, false);
       const { consumerTag } = await confirmChannel.consume(
         queue,
         async (msg: ConsumeMessageOrNull) => {
@@ -598,8 +642,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}`);
@@ -634,10 +677,10 @@ 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> {
     return wrapSetImmediate(async () => {
       RabbitMq.validateName('exchange', exchange);
-      const channel: ChannelWrapper = await this.assertChannel({ newChannelOptions: options?.newChannelOptions });
+      const channel: ChannelWrapper = await this.assertChannel();
       await this.assertExchange(exchange);
       await channel.publish(exchange, '',
         Buffer.from(JSON.stringify(content)),
@@ -652,7 +695,7 @@ class RabbitMq implements IAfRabbitMq {
     customHeaders?: any,
   ): Promise<boolean | undefined> {
     try {
-      await this.assertChannel({ newChannelOptions: options?.newChannelOptions });
+      await this.assertChannel();
     } 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,4 +1,3 @@
-import { CreateChannelOpts } from 'amqp-connection-manager';
 import { ConsumeMessage, Options, Replies } from 'amqplib';
 
 export interface ExchangesCache {
@@ -13,6 +12,10 @@ export interface QueueSetupPromisesDictionary {
   [key: string]: Promise<Replies.AssertQueue> | undefined
 }
 
+export interface AssertExchangePromisesDictionary {
+  [key: string]: Promise<Replies.AssertExchange> | undefined
+}
+
 export type CustomMessageHeaders = {
   redisTimestampValidationKey?: string;
 }
@@ -28,7 +31,6 @@ export interface ConsumeOptions {
   useConsumeWithLock?: boolean;
   auditContext?: any;
   enableRabbitTrace?: boolean;
-  channelConsumeOptions?: Options.Consume;
 }
 
 export type CallbackFunction = (msg: ConsumeMessage, ack: any, nack: any) => Promise<any>
@@ -36,18 +38,11 @@ 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;

package/src/lib/utils.ts

@@ -1,7 +1,11 @@
 import { ChannelWrapper } from 'amqp-connection-manager';
-import { ConfirmChannel } from 'amqplib';
+import { ConfirmChannel, Replies } from 'amqplib';
+
+export const assertExchangeFanout = async (
+  c: ChannelWrapper | ConfirmChannel,
+  exchangeName: string,
+): Promise<Replies.AssertExchange> => c.assertExchange(exchangeName, 'fanout');
 
-export const assertExchangeFanout = async (c: ChannelWrapper | ConfirmChannel, exchangeName: string) => c.assertExchange(exchangeName, 'fanout');
 export const wrapSetImmediate = (callback: () => any) => new Promise<any>((resolve, reject) => {
   setImmediate(async () => {
     try {