@autofleet/rabbit 2.1.12-beta2 → 2.1.13

package/dist/index.d.ts

@@ -18,6 +18,9 @@ export interface IAfRabbitMq {
 interface ExchangesCache {
     [key: string]: any;
 }
+interface QueuesCache {
+    [key: string]: any;
+}
 declare type CustomMessageHeaders = {
     redisTimestampValidationKey?: string;
 };
@@ -40,6 +43,7 @@ declare class RabbitMq implements IAfRabbitMq {
     em: EventEmitter;
     creatingConnection: boolean;
     exchanges: ExchangesCache;
+    queues: QueuesCache;
     options: AfRabbitOptions | undefined;
     redisClient: any;
     constructor(options?: AfRabbitOptions, redisConfig?: RedisConfig);
@@ -52,7 +56,7 @@ declare class RabbitMq implements IAfRabbitMq {
     assertExchange(exchangeName: string, options?: any): Promise<any>;
     getQueueLength(queue: string): Promise<import("amqplib").Replies.AssertQueue>;
     bindQueue(queue: string, exchange: string): Promise<void>;
-    assertQueue(queue: string, options?: Options.AssertQueue): Promise<import("amqplib").Replies.AssertQueue>;
+    assertQueue(queue: string, options?: Options.AssertQueue): Promise<any>;
     consume(queue: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any): Promise<void>;
     consumeFromExchange(queue: string, exchange: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any): Promise<void>;
     publish(exchange: string, content: any, customHeaders?: any): Promise<void>;

package/dist/index.js

@@ -12,6 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/ban-ts-comment,@typescript-eslint/ban-types,@typescript-eslint/no-unused-vars,consistent-return,no-async-promise-executor,no-param-reassign,no-empty */
+// eslint-disable-next-line max-classes-per-file
 const moment_1 = __importDefault(require("moment"));
 const amqp_connection_manager_1 = require("amqp-connection-manager");
 const events_1 = require("events");
@@ -74,6 +76,7 @@ class RabbitMq {
         this.connection = null;
         this.creatingConnection = false;
         this.exchanges = {};
+        this.queues = {};
         this.options = options;
         this.redisClient = redisConfig && redis_1.default(redisConfig);
     }
@@ -160,11 +163,9 @@ class RabbitMq {
             if (this.exchanges[exchangeName]) {
                 return this.exchanges[exchangeName];
             }
-            return channel.addSetup((c) => __awaiter(this, void 0, void 0, function* () {
-                const exchange = yield assertExchangeFanout(c, exchangeName);
-                this.exchanges[exchangeName] = exchange;
-                return exchange;
-            }));
+            const exchange = yield assertExchangeFanout(channel, exchangeName);
+            this.exchanges[exchangeName] = exchange;
+            return exchange;
         });
     }
     getQueueLength(queue) {
@@ -186,6 +187,9 @@ class RabbitMq {
         return __awaiter(this, void 0, void 0, function* () {
             RabbitMq.validateName('queue', queue);
             const channel = yield this.assertChannel();
+            if (this.queues[queue]) {
+                return this.queues[queue];
+            }
             return channel.assertQueue(queue, options);
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.1.12-beta2",
+  "version": "2.1.13",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment,@typescript-eslint/ban-types,@typescript-eslint/no-unused-vars,consistent-return,no-async-promise-executor,no-param-reassign,no-empty */
 // eslint-disable-next-line max-classes-per-file
-import * as bluebird from 'bluebird';
 import moment from 'moment';
 import { ConfirmChannel, Options } from 'amqplib';
 import { AmqpConnectionManager, ChannelWrapper, connect } from 'amqp-connection-manager';
@@ -26,6 +25,9 @@ export interface IAfRabbitMq {
 interface ExchangesCache {
   [key: string]: any
 }
+interface QueuesCache {
+  [key: string]: any
+}
 
 type CustomMessageHeaders = {
   redisTimestampValidationKey?: string;
@@ -93,6 +95,8 @@ class RabbitMq implements IAfRabbitMq {
 
   exchanges: ExchangesCache;
 
+  queues: QueuesCache;
+
   options: AfRabbitOptions | undefined;
 
   redisClient: any;
@@ -103,6 +107,7 @@ class RabbitMq implements IAfRabbitMq {
     this.connection = null;
     this.creatingConnection = false;
     this.exchanges = {};
+    this.queues = {};
     this.options = options;
     this.redisClient = redisConfig && getRedisInstance(redisConfig);
   }
@@ -214,11 +219,9 @@ class RabbitMq implements IAfRabbitMq {
     if (this.exchanges[exchangeName]) {
       return this.exchanges[exchangeName];
     }
-    return channel.addSetup(async (c: ConfirmChannel) => {
-      const exchange = await assertExchangeFanout(c, exchangeName);
-      this.exchanges[exchangeName] = exchange;
-      return exchange;
-    });
+    const exchange = await assertExchangeFanout(channel, exchangeName);
+    this.exchanges[exchangeName] = exchange;
+    return exchange;
   }
 
   async getQueueLength(queue: string) {
@@ -237,6 +240,9 @@ class RabbitMq implements IAfRabbitMq {
   async assertQueue(queue: string, options?: Options.AssertQueue) {
     RabbitMq.validateName('queue', queue);
     const channel: ChannelWrapper = await this.assertChannel();
+    if (this.queues[queue]) {
+      return this.queues[queue];
+    }
     return channel.assertQueue(queue, options);
   }