@autofleet/rabbit 1.5.0-2 → 1.5.1

package/dist/example.js

@@ -10,22 +10,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_1 = require("./index");
-// process.env.RABBITMQ_SERVICE_HOST="34.76.223.229:5672";
+// process.env.RABBITMQ_SERVICE_HOST = '34.76.123.137:5672';
 const init = () => __awaiter(void 0, void 0, void 0, function* () {
     const rabbit = new index_1.default();
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     yield rabbit.consumeFromExchange('test-q2', 'test-e', (msg, ack) => {
-        console.log('msg2', msg.content);
-        // ack(msg);
+        console.log('consumeFromExchange: msg2', msg.content);
+        ack(msg);
     });
     yield rabbit.consumeFromExchange('test-q', 'test-e', (msg, ack) => {
-        console.log('msg', msg.content);
+        console.log('consumeFromExchange: msg', msg.content);
         ack(msg);
     });
     yield rabbit.publish('test-e', 'hey');
     yield rabbit.publish('test-e', 'hey1');
     yield rabbit.consume('test-q-2', (msg, ack) => {
-        console.log('msg-q', msg.content);
+        console.log('consume: msg-q', msg.content);
         ack(msg);
     });
     yield rabbit.sendToQueue('test-q-2', 'hey-q');

package/dist/index.js

@@ -14,6 +14,7 @@ const bluebird = require("bluebird");
 const amqp_connection_manager_1 = require("amqp-connection-manager");
 const events_1 = require("events");
 const rabbitError_1 = require("./rabbitError");
+const assertExchangeFanout = (c, exchangeName) => c.assertExchange(exchangeName, 'fanout');
 const connectionCreatedConst = 'connectionCreated';
 class RabbitMq {
     constructor() {
@@ -111,7 +112,7 @@ class RabbitMq {
                 return this.exchanges[exchangeName];
             }
             return channel.addSetup((c) => __awaiter(this, void 0, void 0, function* () {
-                const exchange = yield c.assertExchange(exchangeName, 'fanout');
+                const exchange = yield assertExchangeFanout(c, exchangeName);
                 this.exchanges[exchangeName] = exchange;
                 return exchange;
             }));
@@ -131,8 +132,8 @@ class RabbitMq {
             RabbitMq.validateName('queue', queue);
             const { limit } = (options && options.limit) ? options : { limit: 1 };
             const channel = yield this.assertChannel();
-            yield this.assertQueue(queue);
             return channel.addSetup((c) => __awaiter(this, void 0, void 0, function* () {
+                yield c.assertQueue(queue);
                 yield c.prefetch(limit, true);
                 return Promise.all([
                     c.consume(queue, (msg) => callback(RabbitMq.parseMsg(msg), this.ack, this.nack(queue))),
@@ -147,11 +148,10 @@ class RabbitMq {
             RabbitMq.validateName('exchange', exchange);
             const { limit } = (options && options.limit) ? options : { limit: 1 };
             const channel = yield this.assertChannel();
-            yield Promise.all([
-                this.assertExchange(exchange),
-                this.assertQueue(queue),
-            ]);
             return channel.addSetup((c) => __awaiter(this, void 0, void 0, function* () {
+                const assertExchange = yield assertExchangeFanout(c, exchange);
+                yield c.assertQueue(queue);
+                this.exchanges[exchange] = assertExchange;
                 yield c.prefetch(limit, true);
                 return Promise.all([
                     c.bindQueue(queue, exchange, ''),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "1.5.0-2",
+  "version": "1.5.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "prepublish": "tsc",
     "linter": "./node_modules/.bin/eslint .",
     "test": "jest --forceExit",
-    "test-local": "RABBITMQ_SERVICE_HOST=34.76.223.229:5672 jest --forceExit",
+    "test-local": "RABBITMQ_SERVICE_HOST=34.76.123.137:5672 jest --forceExit",
     "coverage": "jest --coverage --forceExit --runInBand && rm -rf ./coverage",
     "dev": "nodemon"
   },

package/src/example.ts

@@ -1,24 +1,24 @@
 import RabbitMq from './index';
 
-// process.env.RABBITMQ_SERVICE_HOST="34.76.223.229:5672";
+// process.env.RABBITMQ_SERVICE_HOST = '34.76.123.137:5672';
 
 const init = async () => {
   const rabbit = new RabbitMq();
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   await rabbit.consumeFromExchange('test-q2', 'test-e', (msg, ack) => {
-    console.log('msg2', msg.content);
-    // ack(msg);
+    console.log('consumeFromExchange: msg2', msg.content);
+    ack(msg);
   });
 
   await rabbit.consumeFromExchange('test-q', 'test-e', (msg, ack) => {
-    console.log('msg', msg.content);
+    console.log('consumeFromExchange: msg', msg.content);
     ack(msg);
   });
   await rabbit.publish('test-e', 'hey');
   await rabbit.publish('test-e', 'hey1');
 
   await rabbit.consume('test-q-2', (msg, ack) => {
-    console.log('msg-q', msg.content);
+    console.log('consume: msg-q', msg.content);
     ack(msg);
   });
   await rabbit.sendToQueue('test-q-2', 'hey-q');

package/src/index.ts

@@ -9,6 +9,8 @@ interface ExchangesCache {
   [key: string]: any
 }
 
+const assertExchangeFanout = (c: any, exchangeName: string) => c.assertExchange(exchangeName, 'fanout');
+
 const connectionCreatedConst = 'connectionCreated';
 class RabbitMq {
   static parseMsg(msg: any) {
@@ -126,7 +128,7 @@ class RabbitMq {
       return this.exchanges[exchangeName];
     }
     return channel.addSetup(async (c: ConfirmChannel) => {
-      const exchange = await c.assertExchange(exchangeName, 'fanout');
+      const exchange = await assertExchangeFanout(c, exchangeName);
       this.exchanges[exchangeName] = exchange;
       return exchange;
     });
@@ -144,8 +146,8 @@ class RabbitMq {
     RabbitMq.validateName('queue', queue);
     const { limit } = (options && options.limit) ? options : { limit: 1 };
     const channel: ChannelWrapper = await this.assertChannel();
-    await this.assertQueue(queue);
     return channel.addSetup(async (c: ConfirmChannel) => {
+      await c.assertQueue(queue);
       await c.prefetch(limit, true);
       return Promise.all([
         c.consume(queue, (msg: any) => callback(RabbitMq.parseMsg(msg), this.ack, this.nack(queue))),
@@ -159,12 +161,11 @@ class RabbitMq {
     RabbitMq.validateName('exchange', exchange);
     const { limit } = (options && options.limit) ? options : { limit: 1 };
     const channel: ChannelWrapper = await this.assertChannel();
-    await Promise.all([
-      this.assertExchange(exchange),
-      this.assertQueue(queue),
-    ]);
 
     return channel.addSetup(async (c: ConfirmChannel) => {
+      const assertExchange = await assertExchangeFanout(c, exchange);
+      await c.assertQueue(queue);
+      this.exchanges[exchange] = assertExchange;
       await c.prefetch(limit, true);
       return Promise.all([
         c.bindQueue(queue, exchange, ''),