@autofleet/rabbit 3.2.26-beta.0 → 3.2.26-beta.2

package/dist/index.d.ts

@@ -88,7 +88,7 @@ declare class RabbitMq implements IAfRabbitMq {
     assertExchange(exchangeName: string, options?: any): Promise<any>;
     getQueueLength(queue: string, connectionPurpose?: ConnectionPurpose): Promise<Replies.AssertQueue>;
     private deleteQueue;
-    bindQueue(queue: string, exchange: string, connectionPurpose: ConnectionPurpose): Promise<void>;
+    bindQueue(queue: string, exchange: string): Promise<void>;
     setupQueue(queueName: string, connectionPurpose: ConnectionPurpose, options?: Options.AssertQueue): Promise<Replies.AssertQueue>;
     static shouldUseQuorum(queueName: string): boolean;
     assertQueue(queueName: string, connectionPurpose: ConnectionPurpose, options?: Options.AssertQueue): Promise<any>;

package/dist/index.js

@@ -261,7 +261,7 @@ class RabbitMq {
     }
     async assertChannel({ force = false, connectionPurpose = consts_1.ConnectionPurpose.Consume }) {
         debug('rabbit: start assert channel', { connectionPurpose, publishPromise: this.publishChannelSetupPromise, channel: this.publishChannel });
-        if (!this.publishChannelSetupPromise) {
+        if (!this.publishChannelSetupPromise || (!this.publishChannel && connectionPurpose === consts_1.ConnectionPurpose.Publish)) {
             this.publishChannelSetupPromise = new Promise(async (resolve, reject) => {
                 if (this.publishChannel && !force) {
                     return resolve(this.publishChannel);
@@ -272,7 +272,9 @@ class RabbitMq {
                     channel.on('error', (err) => {
                         logger_1.default.error('rabbit: channel error', { err });
                     });
-                    this.publishChannel = channel;
+                    if (connectionPurpose === consts_1.ConnectionPurpose.Publish) {
+                        this.publishChannel = channel;
+                    }
                     resolve(channel);
                 }
                 catch (e) {
@@ -313,8 +315,8 @@ class RabbitMq {
         debug('queue deleted', deleteQueueRes);
         return deleteQueueRes;
     }
-    async bindQueue(queue, exchange, connectionPurpose) {
-        const channel = await this.assertChannel({ connectionPurpose });
+    async bindQueue(queue, exchange) {
+        const channel = await this.assertChannel({ connectionPurpose: consts_1.ConnectionPurpose.Publish });
         await channel.addSetup((setupChannel) => setupChannel.bindQueue(queue, exchange, ''));
         return channel.bindQueue(queue, exchange, '');
     }
@@ -509,7 +511,7 @@ class RabbitMq {
             const assertExchange = await (0, utils_1.assertExchangeFanout)(c, exchange);
             await c.assertQueue(queue);
             this.exchanges[exchange] = assertExchange;
-            await c.prefetch(limit, true);
+            await c.prefetch(limit, false);
             return Promise.all([
                 c.bindQueue(queue, exchange, ''),
                 this.consume(queue, callback, options),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.26-beta.0",
+  "version": "3.2.26-beta.2",
   "description": "",
   "main": "dist/index.js",
   "engines": {
@@ -18,7 +18,7 @@
     "dev": "nodemon"
   },
   "dependencies": {
-    "@autofleet/zehut": "^3.0.10",
+    "@autofleet/zehut": "^3.1.2",
     "amqp-connection-manager": "4.1.9",
     "amqplib": "0.10.3",
     "bluebird": "^3.7.2",

package/src/index.ts

@@ -412,7 +412,7 @@ class RabbitMq implements IAfRabbitMq {
 
   async assertChannel({ force = false, connectionPurpose = ConnectionPurpose.Consume }: assertChannelOpts): Promise<ChannelWrapper> {
     debug('rabbit: start assert channel', { connectionPurpose, publishPromise: this.publishChannelSetupPromise, channel: this.publishChannel });
-    if (!this.publishChannelSetupPromise) {
+    if (!this.publishChannelSetupPromise || (!this.publishChannel && connectionPurpose === ConnectionPurpose.Publish)) {
       this.publishChannelSetupPromise = new Promise<ChannelWrapper>(async (resolve, reject) => {
         if (this.publishChannel && !force) {
           return resolve(this.publishChannel);
@@ -424,7 +424,9 @@ class RabbitMq implements IAfRabbitMq {
           channel.on('error', (err) => {
             logger.error('rabbit: channel error', { err });
           });
-          this.publishChannel = channel;
+          if (connectionPurpose === ConnectionPurpose.Publish) {
+            this.publishChannel = channel;
+          }
           resolve(channel);
         } catch (e) {
           reject(e);
@@ -470,8 +472,8 @@ class RabbitMq implements IAfRabbitMq {
     return deleteQueueRes;
   }
 
-  async bindQueue(queue: string, exchange: string, connectionPurpose: ConnectionPurpose) {
-    const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose });
+  async bindQueue(queue: string, exchange: string) {
+    const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose: ConnectionPurpose.Publish });
     await channel.addSetup((setupChannel: ConfirmChannel) => setupChannel.bindQueue(queue, exchange, ''));
     return channel.bindQueue(queue, exchange, '');
   }
@@ -698,7 +700,7 @@ class RabbitMq implements IAfRabbitMq {
       const assertExchange = await assertExchangeFanout(c, exchange);
       await c.assertQueue(queue);
       this.exchanges[exchange] = assertExchange;
-      await c.prefetch(limit, true);
+      await c.prefetch(limit, false);
       return Promise.all([
         c.bindQueue(queue, exchange, ''),
         this.consume(