@autofleet/rabbit 1.0.8 → 1.0.10

package/dist/index.d.ts

@@ -8,7 +8,7 @@ declare class RabbitMq {
     static parseMsg(msg: any): any;
     constructor();
     ack: (msg: any) => Promise<void>;
-    nack: (msg: any, queue: string, deadQueue: string, retries: number) => Promise<void>;
+    nack: (queue: string) => (msg: any, retries: number) => Promise<void>;
     assertChannel(): Promise<Channel>;
     assertExchange(exchange: string, options?: any): Promise<import("amqplib").Replies.AssertExchange>;
     assertQueue(queue: string, options?: any): Promise<import("amqplib").Replies.AssertQueue>;

package/dist/index.js

@@ -10,7 +10,7 @@ class RabbitMq {
                 await this.channel.ack(msg);
             }
         };
-        this.nack = async (msg, queue, deadQueue, retries) => {
+        this.nack = (queue) => async (msg, retries) => {
             if (this.channel) {
                 await this.channel.ack(msg);
                 if (!msg.content['x-retry-count'] || msg.content['x-retry-count'] <= retries) {
@@ -18,6 +18,8 @@ class RabbitMq {
                     await this.sendToQueue(queue, Buffer.from(JSON.stringify(msg.content)));
                 }
                 else {
+                    const deadQueue = `${queue}-dead`;
+                    await this.assertQueue(deadQueue);
                     await this.sendToQueue(deadQueue, Buffer.from(JSON.stringify(msg.content)));
                 }
             }
@@ -76,7 +78,7 @@ class RabbitMq {
     async consume(queue, callback) {
         const channel = await this.assertChannel();
         await this.assertQueue(queue);
-        return channel.consume(queue, (msg) => callback(RabbitMq.parseMsg(msg), this.ack, this.nack));
+        return channel.consume(queue, (msg) => callback(RabbitMq.parseMsg(msg), this.ack, this.nack(queue)));
     }
     async consumeFromExchange(queue, exchange, callback) {
         const channel = await this.assertChannel();
@@ -85,7 +87,7 @@ class RabbitMq {
             this.assertQueue(queue),
         ]);
         await channel.bindQueue(queue, exchange, '');
-        return channel.consume(queue, (msg) => callback(RabbitMq.parseMsg(msg), this.ack, this.nack));
+        return channel.consume(queue, (msg) => callback(RabbitMq.parseMsg(msg), this.ack, this.nack(queue)));
     }
     async publish(exchange, content) {
         const channel = await this.assertChannel();

package/dist/mock.d.ts

@@ -1,6 +1,7 @@
 import 'jest';
 declare class RabbitMq {
     ack: jest.Mock<{}>;
+    nack: jest.Mock<{}>;
     assertChannel: jest.Mock<{}>;
     assertExchange: jest.Mock<{}>;
     assertQueue: jest.Mock<{}>;

package/dist/mock.js

@@ -4,6 +4,7 @@ require("jest");
 class RabbitMq {
     constructor() {
         this.ack = jest.fn();
+        this.nack = jest.fn();
         this.assertChannel = jest.fn();
         this.assertExchange = jest.fn();
         this.assertQueue = jest.fn();

package/package.json

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

package/src/index.ts

@@ -41,13 +41,15 @@ class RabbitMq {
     }
   }
 
-  public nack = async (msg: any, queue: string, deadQueue: string, retries: number) => {
+  public nack = (queue: string) => async (msg: any, retries: number) => {
     if (this.channel) {
       await this.channel.ack(msg);
       if (!msg.content['x-retry-count'] || msg.content['x-retry-count'] <= retries) {
         msg.content['x-retry-count'] = msg.content['x-retry-count'] ? msg.content['x-retry-count'] + 1 : 1;
         await this.sendToQueue(queue, Buffer.from(JSON.stringify(msg.content)));
       } else {
+        const deadQueue = `${queue}-dead`;
+        await this.assertQueue(deadQueue);
         await this.sendToQueue(deadQueue, Buffer.from(JSON.stringify(msg.content)));
       }
     }
@@ -91,7 +93,7 @@ class RabbitMq {
   async consume(queue: string, callback: (msg: any, ack: Function, nack: Function) => any) {
     const channel: Channel = await this.assertChannel();
     await this.assertQueue(queue);
-    return channel.consume(queue, (msg) => callback(RabbitMq.parseMsg(msg), this.ack, this.nack));
+    return channel.consume(queue, (msg) => callback(RabbitMq.parseMsg(msg), this.ack, this.nack(queue)));
   }
 
   async consumeFromExchange(queue: string, exchange: string, callback: (msg: any, ack: Function, nack: Function) => any) {
@@ -101,7 +103,7 @@ class RabbitMq {
       this.assertQueue(queue),
     ]);
     await channel.bindQueue(queue, exchange, '');
-    return channel.consume(queue, (msg) => callback(RabbitMq.parseMsg(msg), this.ack, this.nack));
+    return channel.consume(queue, (msg) => callback(RabbitMq.parseMsg(msg), this.ack, this.nack(queue)));
   }
 
   async publish(exchange: string, content: any) {

package/src/mock.ts

@@ -2,6 +2,7 @@ import 'jest';
 
 class RabbitMq {
   public ack = jest.fn();
+  public nack = jest.fn();
   public assertChannel = jest.fn();
   public assertExchange = jest.fn();
   public assertQueue = jest.fn();