@autofleet/rabbit 1.6.1 → 1.6.2

package/dist/index.d.ts

@@ -23,7 +23,7 @@ declare class RabbitMq {
     options: AfRabbitOptions | undefined;
     constructor(options?: AfRabbitOptions);
     ack: (msg: any) => Promise<void>;
-    nack: (queue: string, options: any, deadQueueOptions: Options.AssertQueue) => (msg: any) => Promise<void>;
+    nack: (queue: string, options: any, deadQueueOptions: Options.AssertQueue) => (msg: any, { skipRetry, }?: any) => Promise<void>;
     getConnection(): Promise<AmqpConnectionManager>;
     assertChannel(): Promise<ChannelWrapper>;
     assertExchange(exchangeName: string, options?: any): Promise<any>;

package/dist/index.js

@@ -57,9 +57,11 @@ class RabbitMq {
                 yield this.channel.ack(msg);
             }
         });
-        this.nack = (queue, options, deadQueueOptions) => (msg) => __awaiter(this, void 0, void 0, function* () {
+        this.nack = (queue, options, deadQueueOptions) => (msg, { skipRetry = false, } = {}) => __awaiter(this, void 0, void 0, function* () {
             if (this.channel) {
-                if (!msg.content['x-retry-count'] || msg.content['x-retry-count'] < options.retries) {
+                if (!skipRetry
+                    && (!msg.content['x-retry-count']
+                        || msg.content['x-retry-count'] < options.retries)) {
                     msg.content['x-retry-count'] = msg.content['x-retry-count'] ? msg.content['x-retry-count'] + 1 : 1;
                     yield this.sendToQueue(queue, msg.content);
                 }

package/dist/index.test.js

@@ -21,10 +21,15 @@ const callback = (eq = 'hey') => (msg, ack) => {
     expect(msg.content).toEqual(eq);
     ack(msg);
 };
-const nackcallback = () => (msg, ack, nack) => {
+const nackcallback = ({ skipRetry = false } = {}) => (msg, ack, nack) => {
     console.log('msg', msg.content);
     expect(msg.content.ttt).toEqual('hey-q');
-    nack(msg);
+    if (skipRetry) {
+        nack(msg, { skipRetry });
+    }
+    else {
+        nack(msg);
+    }
 };
 describe('RabbitMQ', () => {
     it('check exchange', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -48,6 +53,13 @@ describe('RabbitMQ', () => {
         yield delay(1500);
         expect(mockFn).toHaveBeenCalledTimes(4); // one run then 3 times retry
     }));
+    it('check skip retry', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockFn = jest.fn(nackcallback({ skipRetry: true }));
+        yield rabbit.consume('test-q-skip-retry', mockFn, { retries: 3 });
+        yield rabbit.sendToQueue('test-q-skip-retry', { ttt: 'hey-q' });
+        yield delay(1500);
+        expect(mockFn).toHaveBeenCalledTimes(1);
+    }));
     it('check nack and dead queue', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockFn = jest.fn(nackcallback());
         yield rabbit.consume('test-q-nack', mockFn);

package/package.json

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

package/src/index.test.ts

@@ -12,10 +12,14 @@ const callback = (eq = 'hey') => (msg: any, ack: any) => {
   ack(msg);
 };
 
-const nackcallback = () => (msg: any, ack: any, nack: any) => {
+const nackcallback = ({ skipRetry = false } = { }) => (msg: any, ack: any, nack: any) => {
   console.log('msg', msg.content);
   expect(msg.content.ttt).toEqual('hey-q');
-  nack(msg);
+  if (skipRetry) {
+    nack(msg, { skipRetry });
+  } else {
+    nack(msg);
+  }
 };
 
 describe('RabbitMQ', () => {
@@ -43,6 +47,14 @@ describe('RabbitMQ', () => {
     expect(mockFn).toHaveBeenCalledTimes(4); // one run then 3 times retry
   });
 
+  it('check skip retry', async () => {
+    const mockFn = jest.fn(nackcallback({ skipRetry: true }));
+    await rabbit.consume('test-q-skip-retry', mockFn, { retries: 3 });
+    await rabbit.sendToQueue('test-q-skip-retry', { ttt: 'hey-q' });
+    await delay(1500);
+    expect(mockFn).toHaveBeenCalledTimes(1);
+  });
+
   it('check nack and dead queue', async () => {
     const mockFn = jest.fn(nackcallback());
     await rabbit.consume('test-q-nack', mockFn);

package/src/index.ts

@@ -82,9 +82,22 @@ class RabbitMq {
     }
   }
 
-  public nack = (queue: string, options: any, deadQueueOptions: Options.AssertQueue) => async (msg: any) => {
+  public nack = (
+    queue: string,
+    options: any,
+    deadQueueOptions: Options.AssertQueue,
+  ) => async (
+    msg: any,
+    {
+      skipRetry = false,
+    }: any = { },
+  ) => {
     if (this.channel) {
-      if (!msg.content['x-retry-count'] || msg.content['x-retry-count'] < options.retries) {
+      if (
+        !skipRetry
+        && (!msg.content['x-retry-count']
+        || msg.content['x-retry-count'] < options.retries)
+      ) {
         msg.content['x-retry-count'] = msg.content['x-retry-count'] ? msg.content['x-retry-count'] + 1 : 1;
         await this.sendToQueue(queue, msg.content);
       } else {