@autofleet/rabbit 1.3.2 → 1.4.0

package/dist/index.d.ts

@@ -4,9 +4,6 @@ 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;
@@ -14,14 +11,13 @@ declare class RabbitMq {
     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(exchangeName: string, options?: any): Promise<any>;
-    assertQueue(queueName: string, options?: any): Promise<any>;
+    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>;
     publish(exchange: string, content: any): Promise<void>;

package/dist/index.js

@@ -29,7 +29,6 @@ class RabbitMq {
         this.connection = null;
         this.creatingConnection = false;
         this.exchanges = {};
-        this.queues = {};
     }
     static parseMsg(msg) {
         let { content } = msg;
@@ -86,16 +85,9 @@ class RabbitMq {
             return exchange;
         });
     }
-    async assertQueue(queueName, options) {
+    async assertQueue(queue, options) {
         const channel = await this.assertChannel();
-        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;
-        });
+        return channel.addSetup((c) => c.assertQueue(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.2",
+  "version": "1.4.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -13,8 +13,8 @@
     "@types/amqp-connection-manager": "^2.0.2",
     "@types/amqplib": "^0.5.9",
     "@types/jest": "^23.3.10",
-    "amqp-connection-manager": "^2.3.0",
-    "amqplib": "^0.5.3",
+    "amqp-connection-manager": "^3.2.1",
+    "amqplib": "^0.5.6",
     "jest": "^23.6.0"
   },
   "devDependencies": {

package/src/index.ts

@@ -6,10 +6,6 @@ interface ExchangesCache {
   [key: string]: any
 }
 
-interface QueuesCache {
-  [key: string]: any
-}
-
 const connectionCreatedConst = 'connectionCreated';
 class RabbitMq {
   static parseMsg(msg: any) {
@@ -31,7 +27,6 @@ class RabbitMq {
   em: EventEmitter;
   creatingConnection: Boolean;
   exchanges: ExchangesCache;
-  queues: QueuesCache;
 
   constructor() {
     this.em = new EventEmitter;
@@ -39,7 +34,6 @@ class RabbitMq {
     this.connection = null;
     this.creatingConnection = false;
     this.exchanges = {};
-    this.queues = {};
   }
 
   public ack = async (msg: any) => {
@@ -112,16 +106,9 @@ class RabbitMq {
     });
   }
 
-  async assertQueue(queueName: string, options?: any) {
+  async assertQueue(queue: string, options?: any) {
     const channel: ChannelWrapper = await this.assertChannel();
-    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;
-    });
+    return channel.addSetup((c: ConfirmChannel) => c.assertQueue(queue));
   }
 
   async consume(queue: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any) {