@autofleet/rabbit 1.2.1 → 1.3.0

package/dist/index.d.ts

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

package/dist/index.js

@@ -28,7 +28,6 @@ class RabbitMq {
         this.channel = null;
         this.connection = null;
         this.creatingConnection = false;
-        this.exchanges = {};
     }
     static parseMsg(msg) {
         let { content } = msg;
@@ -74,23 +73,16 @@ class RabbitMq {
             }
         });
     }
-    async assertExchange(exchangeName, options) {
+    async assertExchange(exchange, options) {
         const channel = await this.assertChannel();
-        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;
-        });
+        return channel.addSetup((c) => c.assertExchange(exchange, 'fanout'));
     }
     async assertQueue(queue, options) {
         const channel = await this.assertChannel();
         return channel.addSetup((c) => c.assertQueue(queue));
     }
     async consume(queue, callback, options) {
-        const { limit } = options ? options : 1;
+        const { limit } = (options && options.limit) ? options : { limit: 1 };
         const channel = await this.assertChannel();
         await this.assertQueue(queue);
         return channel.addSetup(async (c) => {
@@ -101,7 +93,7 @@ class RabbitMq {
         });
     }
     async consumeFromExchange(queue, exchange, callback, options) {
-        const { limit } = options ? options : 1;
+        const { limit } = (options && options.limit) ? options : { limit: 1 };
         const channel = await this.assertChannel();
         await Promise.all([
             this.assertExchange(exchange),

package/package.json

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

package/src/index.ts

@@ -2,10 +2,6 @@ import { ConfirmChannel } from 'amqplib';
 import { connect, AmqpConnectionManager, ChannelWrapper } from 'amqp-connection-manager';
 import { EventEmitter } from 'events';
 
-interface ExchangesCache {
-  [key: string]: any
-}
-
 const connectionCreatedConst = 'connectionCreated';
 class RabbitMq {
   static parseMsg(msg: any) {
@@ -26,14 +22,12 @@ class RabbitMq {
   connection: AmqpConnectionManager | null;
   em: EventEmitter;
   creatingConnection: Boolean;
-  exchanges: ExchangesCache;
 
   constructor() {
     this.em = new EventEmitter;
     this.channel = null;
     this.connection = null;
     this.creatingConnection = false;
-    this.exchanges = {};
   }
 
   public ack = async (msg: any) => {
@@ -94,16 +88,9 @@ class RabbitMq {
     })
   }
 
-  async assertExchange(exchangeName: string, options?: any) {
+  async assertExchange(exchange: string, options?: any) {
     const channel: ChannelWrapper = await this.assertChannel();
-    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;
-    });
+    return channel.addSetup((c: ConfirmChannel) => c.assertExchange(exchange, 'fanout'));
   }
 
   async assertQueue(queue: string, options?: any) {
@@ -112,7 +99,7 @@ class RabbitMq {
   }
 
   async consume(queue: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any) {
-    const { limit } = options ? options : 1;
+    const { limit } = (options && options.limit) ? options : { limit: 1 };
     const channel: ChannelWrapper = await this.assertChannel();
     await this.assertQueue(queue);
     return channel.addSetup(async (c: ConfirmChannel) => {
@@ -124,7 +111,7 @@ class RabbitMq {
   }
 
   async consumeFromExchange(queue: string, exchange: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any) {
-    const { limit } = options ? options : 1;
+    const { limit } = (options && options.limit) ? options : { limit: 1 };
     const channel: ChannelWrapper = await this.assertChannel();
     await Promise.all([
       this.assertExchange(exchange),