@autofleet/rabbit 1.6.1 → 1.7.0

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/package.json

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

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 {

package/.eslintrc.json

@@ -1,66 +0,0 @@
-{
-  "root": true,
-  "env": {
-    "node": true,
-    "jest": true
-  },
-  "extends": [
-    "airbnb-base",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "rules": {
-    "import/extensions": [
-      "error",
-      "ignorePackages",
-      {
-        "js": "never",
-        "jsx": "never",
-        "ts": "never",
-        "tsx": "never"
-      }
-    ],
-    "@typescript-eslint/no-unused-vars": ["error"],
-    "@typescript-eslint/no-var-requires": ["off"],
-    "@typescript-eslint/camelcase": ["off"],
-    "max-len": ["off"],
-    "@typescript-eslint/explicit-function-return-type": ["off"]
-  },
-  "overrides": [
-    {
-      // enable the rule specifically for TypeScript files
-      "files": ["src/**.js", "src/**.ts"],
-      "rules": {
-        "@typescript-eslint/explicit-function-return-type": ["off"],
-        "@typescript-eslint/no-var-requires": ["off"],
-        "@typescript-eslint/camelcase": ["off"]
-      }
-    }
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "project": "./tsconfig.json",
-    "sourceType": "module"
-  },
-  "ignorePatterns": ["dist/*", "node_modules/", "jest.config.js", "migrations/*", "newrelic.js"],
-  "plugins": ["@typescript-eslint"],
-  "settings": {
-    "import/extensions": [
-      "error",
-      "ignorePackages",
-      {
-        "js": "never",
-        "jsx": "never",
-        "ts": "never",
-        "tsx": "never"
-      }
-    ],
-    "import/parsers": {
-      "@typescript-eslint/parser": [".ts",".tsx"]
-    },
-    "import/resolver": {
-      "node": {
-        "extensions": [".js",".jsx",".ts",".tsx", ".json"]
-      }
-    }
-  }
-}

package/dist/example.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/example.js

@@ -1,37 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = __importDefault(require("./index"));
-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();
-    yield rabbit.consumeFromExchange('test-q2', 'test-e', (msg, ack) => {
-        console.log('consumeFromExchange: msg2', msg.content);
-        ack(msg);
-    });
-    yield rabbit.consumeFromExchange('test-q', 'test-e', (msg, ack) => {
-        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('consume: msg-q', msg.content);
-        ack(msg);
-    });
-    yield rabbit.sendToQueue('test-q-2', 'hey-q');
-    const getQueueLength = yield rabbit.getQueueLength('test-q2');
-    console.log(`getQueueLength:${getQueueLength}`);
-});
-init();

package/dist/index.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/index.test.js

@@ -1,102 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable @typescript-eslint/ban-ts-comment,@typescript-eslint/no-unused-vars */
-const index_1 = __importDefault(require("./index"));
-jest.setTimeout(120000);
-const rabbit = new index_1.default();
-const delay = (ms = 500) => new Promise((resolve) => setTimeout(() => resolve(), ms));
-const callback = (eq = 'hey') => (msg, ack) => {
-    expect(msg.content).toEqual(eq);
-    ack(msg);
-};
-const nackcallback = () => (msg, ack, nack) => {
-    console.log('msg', msg.content);
-    expect(msg.content.ttt).toEqual('hey-q');
-    nack(msg);
-};
-describe('RabbitMQ', () => {
-    it('check exchange', () => __awaiter(void 0, void 0, void 0, function* () {
-        const mockFn = jest.fn(callback());
-        yield rabbit.consumeFromExchange('test-q2', 'test-e', mockFn);
-        yield rabbit.publish('test-e', 'hey');
-        yield delay();
-        expect(mockFn).toBeCalled();
-    }));
-    it('check queue', () => __awaiter(void 0, void 0, void 0, function* () {
-        const mockFn = jest.fn(callback('hey-q'));
-        yield rabbit.consume('test-q-2', mockFn);
-        yield rabbit.sendToQueue('test-q-2', 'hey-q');
-        yield delay();
-        expect(mockFn).toBeCalled();
-    }));
-    it('check retry', () => __awaiter(void 0, void 0, void 0, function* () {
-        const mockFn = jest.fn(nackcallback());
-        yield rabbit.consume('test-q-retry', mockFn, { retries: 3 });
-        yield rabbit.sendToQueue('test-q-retry', { ttt: 'hey-q' });
-        yield delay(1500);
-        expect(mockFn).toHaveBeenCalledTimes(4); // one run then 3 times retry
-    }));
-    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);
-        yield rabbit.sendToQueue('test-q-nack', { ttt: 'hey-q' });
-        yield delay(1000);
-        expect(mockFn).toHaveBeenCalledTimes(2); // one run then 1 time retry
-        yield delay();
-        const length = yield rabbit.getQueueLength('test-q-nack-dead');
-        expect(length.messageCount).toEqual(1);
-    }));
-    it('cant publish to unknown exchange', () => __awaiter(void 0, void 0, void 0, function* () {
-        let err;
-        try {
-            yield rabbit.publish('', 'hey');
-        }
-        catch (e) {
-            err = e;
-        }
-        expect(err).toBeDefined();
-    }));
-    it('cant publish due timeout', () => __awaiter(void 0, void 0, void 0, function* () {
-        // @ts-ignore
-        process.env.RABBITMQ_PUBLISH_TIMEOUT = 1;
-        const rabbit2 = new index_1.default();
-        let err;
-        try {
-            yield rabbit2.publish('test-e', 'hey');
-        }
-        catch (e) {
-            err = e;
-        }
-        expect(err).toBeDefined();
-    }));
-    it('get queue length', () => __awaiter(void 0, void 0, void 0, function* () {
-        const queueName = 'test-queue-length';
-        const exchangeName = 'test-e2';
-        yield rabbit.assertQueue(queueName);
-        yield rabbit.assertExchange(exchangeName);
-        yield rabbit.bindQueue(queueName, exchangeName);
-        yield rabbit.publish(exchangeName, 'hey');
-        let messageCount;
-        ({ messageCount } = yield rabbit.getQueueLength(queueName));
-        expect(messageCount).toEqual(1);
-        yield rabbit.publish(exchangeName, 'hey');
-        ({ messageCount } = yield rabbit.getQueueLength(queueName));
-        expect(messageCount).toEqual(2);
-        yield rabbit.consumeFromExchange(queueName, exchangeName, callback());
-        yield delay();
-        ({ messageCount } = yield rabbit.getQueueLength(queueName));
-        expect(messageCount).toEqual(0);
-    }));
-});

package/jest.config.js

@@ -1,14 +0,0 @@
-module.exports = {
-  testEnvironment: 'node',
-  roots: ['<rootDir>/src'],
-  transform: {
-    '^.+\\.tsx?$': 'ts-jest',
-  },
-  testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(tsx?$|jsx?$)',
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
-  coverageThreshold: {
-    global: {
-      lines: 75,
-    },
-  },
-}

package/nodemon.json

@@ -1,13 +0,0 @@
-{
-  "ignore": [
-    "**/*.test.ts",
-    "**/*.spec.ts",
-    ".git",
-    "node_modules"
-  ],
-  "watch": [
-    "src"
-  ],
-  "exec": "npm start",
-  "ext": "ts"
-}

package/src/example.ts

@@ -1,31 +0,0 @@
-import RabbitMq from './index';
-
-process.env.RABBITMQ_SERVICE_HOST = '34.76.123.137:5672';
-
-const init = async () => {
-  const rabbit = new RabbitMq();
-
-  await rabbit.consumeFromExchange('test-q2', 'test-e', (msg, ack) => {
-    console.log('consumeFromExchange: msg2', msg.content);
-    ack(msg);
-  });
-
-  await rabbit.consumeFromExchange('test-q', 'test-e', (msg, ack) => {
-    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('consume: msg-q', msg.content);
-    ack(msg);
-  });
-
-  await rabbit.sendToQueue('test-q-2', 'hey-q');
-
-  const getQueueLength = await rabbit.getQueueLength('test-q2');
-  console.log(`getQueueLength:${getQueueLength}`);
-};
-
-init();

package/src/index.test.ts

@@ -1,101 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment,@typescript-eslint/no-unused-vars */
-import RabbitMq from './index';
-
-jest.setTimeout(120000);
-
-const rabbit = new RabbitMq();
-
-const delay = (ms = 500) => new Promise((resolve) => setTimeout(() => resolve(), ms));
-
-const callback = (eq = 'hey') => (msg: any, ack: any) => {
-  expect(msg.content).toEqual(eq);
-  ack(msg);
-};
-
-const nackcallback = () => (msg: any, ack: any, nack: any) => {
-  console.log('msg', msg.content);
-  expect(msg.content.ttt).toEqual('hey-q');
-  nack(msg);
-};
-
-describe('RabbitMQ', () => {
-  it('check exchange', async () => {
-    const mockFn = jest.fn(callback());
-    await rabbit.consumeFromExchange('test-q2', 'test-e', mockFn);
-    await rabbit.publish('test-e', 'hey');
-    await delay();
-    expect(mockFn).toBeCalled();
-  });
-
-  it('check queue', async () => {
-    const mockFn = jest.fn(callback('hey-q'));
-    await rabbit.consume('test-q-2', mockFn);
-    await rabbit.sendToQueue('test-q-2', 'hey-q');
-    await delay();
-    expect(mockFn).toBeCalled();
-  });
-
-  it('check retry', async () => {
-    const mockFn = jest.fn(nackcallback());
-    await rabbit.consume('test-q-retry', mockFn, { retries: 3 });
-    await rabbit.sendToQueue('test-q-retry', { ttt: 'hey-q' });
-    await delay(1500);
-    expect(mockFn).toHaveBeenCalledTimes(4); // one run then 3 times retry
-  });
-
-  it('check nack and dead queue', async () => {
-    const mockFn = jest.fn(nackcallback());
-    await rabbit.consume('test-q-nack', mockFn);
-    await rabbit.sendToQueue('test-q-nack', { ttt: 'hey-q' });
-    await delay(1000);
-    expect(mockFn).toHaveBeenCalledTimes(2); // one run then 1 time retry
-    await delay();
-    const length = await rabbit.getQueueLength('test-q-nack-dead');
-    expect(length.messageCount).toEqual(1);
-  });
-
-  it('cant publish to unknown exchange', async () => {
-    let err;
-    try {
-      await rabbit.publish('', 'hey');
-    } catch (e) {
-      err = e;
-    }
-    expect(err).toBeDefined();
-  });
-
-  it('cant publish due timeout', async () => {
-    // @ts-ignore
-    process.env.RABBITMQ_PUBLISH_TIMEOUT = 1;
-    const rabbit2 = new RabbitMq();
-
-    let err;
-    try {
-      await rabbit2.publish('test-e', 'hey');
-    } catch (e) {
-      err = e;
-    }
-    expect(err).toBeDefined();
-  });
-
-  it('get queue length', async () => {
-    const queueName = 'test-queue-length';
-    const exchangeName = 'test-e2';
-
-    await rabbit.assertQueue(queueName);
-    await rabbit.assertExchange(exchangeName);
-    await rabbit.bindQueue(queueName, exchangeName);
-
-    await rabbit.publish(exchangeName, 'hey');
-    let messageCount: any;
-    ({ messageCount } = await rabbit.getQueueLength(queueName));
-    expect(messageCount).toEqual(1);
-    await rabbit.publish(exchangeName, 'hey');
-    ({ messageCount } = await rabbit.getQueueLength(queueName));
-    expect(messageCount).toEqual(2);
-    await rabbit.consumeFromExchange(queueName, exchangeName, callback());
-    await delay();
-    ({ messageCount } = await rabbit.getQueueLength(queueName));
-    expect(messageCount).toEqual(0);
-  });
-});