@autofleet/rabbit 1.3.0 → 1.3.2

package/dist/index.d.ts

@@ -1,19 +1,27 @@
 /// <reference types="node" />
 import { AmqpConnectionManager, ChannelWrapper } from 'amqp-connection-manager';
 import { EventEmitter } from 'events';
+interface ExchangesCache {
+    [key: string]: any;
+}
+interface QueuesCache {
+    [key: string]: any;
+}
 declare class RabbitMq {
     static parseMsg(msg: any): any;
     channel: ChannelWrapper | null;
     connection: AmqpConnectionManager | null;
     em: EventEmitter;
     creatingConnection: Boolean;
+    exchanges: ExchangesCache;
+    queues: QueuesCache;
     constructor();
     ack: (msg: any) => Promise<void>;
     nack: (queue: string) => (msg: any, retries: number) => Promise<void>;
     getConnection(): Promise<AmqpConnectionManager>;
     assertChannel(): Promise<ChannelWrapper>;
-    assertExchange(exchange: string, options?: any): Promise<void>;
-    assertQueue(queue: string, options?: any): Promise<void>;
+    assertExchange(exchangeName: string, options?: any): Promise<any>;
+    assertQueue(queueName: string, options?: any): 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): Promise<void>;

package/dist/index.js

@@ -28,6 +28,8 @@ class RabbitMq {
         this.channel = null;
         this.connection = null;
         this.creatingConnection = false;
+        this.exchanges = {};
+        this.queues = {};
     }
     static parseMsg(msg) {
         let { content } = msg;
@@ -73,13 +75,27 @@ class RabbitMq {
             }
         });
     }
-    async assertExchange(exchange, options) {
+    async assertExchange(exchangeName, options) {
         const channel = await this.assertChannel();
-        return channel.addSetup((c) => c.assertExchange(exchange, 'fanout'));
+        if (this.exchanges[exchangeName]) {
+            return this.exchanges[exchangeName];
+        }
+        return channel.addSetup(async (c) => {
+            const exchange = await c.assertExchange(exchangeName, 'fanout');
+            this.exchanges[exchangeName] = exchange;
+            return exchange;
+        });
     }
-    async assertQueue(queue, options) {
+    async assertQueue(queueName, options) {
         const channel = await this.assertChannel();
-        return channel.addSetup((c) => c.assertQueue(queue));
+        if (this.queues[queueName]) {
+            return this.queues[queueName];
+        }
+        return channel.addSetup(async (c) => {
+            const queue = await c.assertQueue(queueName);
+            this.queues[queueName] = queue;
+            return queue;
+        });
     }
     async consume(queue, callback, options) {
         const { limit } = (options && options.limit) ? options : { limit: 1 };

package/package.json

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

package/src/index.ts

@@ -2,6 +2,14 @@ import { ConfirmChannel } from 'amqplib';
 import { connect, AmqpConnectionManager, ChannelWrapper } from 'amqp-connection-manager';
 import { EventEmitter } from 'events';
 
+interface ExchangesCache {
+  [key: string]: any
+}
+
+interface QueuesCache {
+  [key: string]: any
+}
+
 const connectionCreatedConst = 'connectionCreated';
 class RabbitMq {
   static parseMsg(msg: any) {
@@ -22,12 +30,16 @@ class RabbitMq {
   connection: AmqpConnectionManager | null;
   em: EventEmitter;
   creatingConnection: Boolean;
+  exchanges: ExchangesCache;
+  queues: QueuesCache;
 
   constructor() {
     this.em = new EventEmitter;
     this.channel = null;
     this.connection = null;
     this.creatingConnection = false;
+    this.exchanges = {};
+    this.queues = {};
   }
 
   public ack = async (msg: any) => {
@@ -88,14 +100,28 @@ class RabbitMq {
     })
   }
 
-  async assertExchange(exchange: string, options?: any) {
+  async assertExchange(exchangeName: string, options?: any) {
     const channel: ChannelWrapper = await this.assertChannel();
-    return channel.addSetup((c: ConfirmChannel) => c.assertExchange(exchange, 'fanout'));
+    if(this.exchanges[exchangeName]) {
+      return this.exchanges[exchangeName]
+    }
+    return channel.addSetup(async (c: ConfirmChannel) => {
+      const exchange = await c.assertExchange(exchangeName, 'fanout')
+      this.exchanges[exchangeName] = exchange;
+      return exchange;
+    });
   }
 
-  async assertQueue(queue: string, options?: any) {
+  async assertQueue(queueName: string, options?: any) {
     const channel: ChannelWrapper = await this.assertChannel();
-    return channel.addSetup((c: ConfirmChannel) => c.assertQueue(queue));
+    if(this.queues[queueName]) {
+      return this.queues[queueName]
+    }
+    return channel.addSetup(async (c: ConfirmChannel) => {
+      const queue = await c.assertQueue(queueName)
+      this.queues[queueName] = queue;
+      return queue;
+    });
   }
 
   async consume(queue: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any) {