@autofleet/rabbit 1.7.0 → 2.0.0

package/dist/index.d.ts

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

package/dist/index.js

@@ -52,13 +52,11 @@ class RabbitMq {
         this.PUBLISH_ERROR_MSG = `rabbit: publish timeout(${this.PUBLISH_TIMEOUT}ms) has pass, exchange: `;
         this.DISCONNECT_MSG = 'rabbit: connection disconnect';
         this.RESCONNECT_MSG = 'rabbit: reconnecting';
-        this.ack = (msg) => __awaiter(this, void 0, void 0, function* () {
-            if (this.channel) {
-                yield this.channel.ack(msg);
-            }
+        this.ack = (channel) => (msg) => __awaiter(this, void 0, void 0, function* () {
+            yield channel.ack(msg);
         });
-        this.nack = (queue, options, deadQueueOptions) => (msg, { skipRetry = false, } = {}) => __awaiter(this, void 0, void 0, function* () {
-            if (this.channel) {
+        this.nack = (channel, queue, options, deadQueueOptions) => (msg, { skipRetry = false, } = {}) => __awaiter(this, void 0, void 0, function* () {
+            if (channel) {
                 if (!skipRetry
                     && (!msg.content['x-retry-count']
                         || msg.content['x-retry-count'] < options.retries)) {
@@ -70,7 +68,7 @@ class RabbitMq {
                     yield this.assertQueue(deadQueue, deadQueueOptions);
                     yield this.sendToQueue(deadQueue, msg.content, deadQueueOptions);
                 }
-                yield this.channel.ack(msg);
+                yield channel.ack(msg);
             }
         });
         this.em = new events_1.EventEmitter();
@@ -102,7 +100,7 @@ class RabbitMq {
                     return;
                 }
                 if (this.connection !== null) {
-                    return this.connection;
+                    return resolve(this.connection);
                 }
                 this.creatingConnection = true;
                 const host = process.env.RABBITMQ_SERVICE_HOST || '';
@@ -124,6 +122,12 @@ class RabbitMq {
             }));
         });
     }
+    getNewChannel() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connection = yield this.getConnection();
+            return connection.createChannel({});
+        });
+    }
     assertChannel() {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
@@ -183,14 +187,14 @@ class RabbitMq {
             const optionsWithDefaults = Object.assign(Object.assign({}, defaultOptions), options);
             RabbitMq.validateName('queue', queue);
             const { limit, deadMessageTtl } = optionsWithDefaults;
-            const channel = yield this.assertChannel();
+            const channel = yield this.getNewChannel();
             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) => {
                         outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
-                        callback(RabbitMq.parseMsg(msg), this.ack, this.nack(queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
+                        callback(RabbitMq.parseMsg(msg), this.ack(channel), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
                     }),
                 ]);
             }));
@@ -202,7 +206,7 @@ class RabbitMq {
             RabbitMq.validateName('exchange', exchange);
             RabbitMq.validateName('queue', queue);
             const { limit, deadMessageTtl } = optionsWithDefaults;
-            const channel = yield this.assertChannel();
+            const channel = yield this.getNewChannel();
             return channel.addSetup((c) => __awaiter(this, void 0, void 0, function* () {
                 const assertExchange = yield assertExchangeFanout(c, exchange);
                 yield c.assertQueue(queue);
@@ -212,7 +216,7 @@ class RabbitMq {
                     c.bindQueue(queue, exchange, ''),
                     c.consume(queue, (msg) => {
                         outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
-                        callback(RabbitMq.parseMsg(msg), this.ack, this.nack(queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
+                        callback(RabbitMq.parseMsg(msg), this.ack(channel), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
                     }),
                 ]);
             }));

package/dist/mock.d.ts

@@ -1,13 +1,13 @@
 import 'jest';
 declare class RabbitMq {
-    ack: jest.Mock<unknown>;
-    nack: jest.Mock<unknown>;
-    assertChannel: jest.Mock<unknown>;
-    assertExchange: jest.Mock<unknown>;
-    assertQueue: jest.Mock<unknown>;
-    consume: jest.Mock<unknown>;
-    consumeFromExchange: jest.Mock<unknown>;
-    publish: jest.Mock<unknown>;
-    sendToQueue: jest.Mock<unknown>;
+    ack: jest.Mock<any, any>;
+    nack: jest.Mock<any, any>;
+    assertChannel: jest.Mock<any, any>;
+    assertExchange: jest.Mock<any, any>;
+    assertQueue: jest.Mock<any, any>;
+    consume: jest.Mock<any, any>;
+    consumeFromExchange: jest.Mock<any, any>;
+    publish: jest.Mock<any, any>;
+    sendToQueue: jest.Mock<any, any>;
 }
 export default RabbitMq;

package/dist/mock.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+// eslint-disable-next-line import/no-extraneous-dependencies
 require("jest");
 class RabbitMq {
     constructor() {

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "1.7.0",
+  "version": "2.0.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
     "start": "ts-node  src/index.ts",
     "example": "ts-node  src/example.ts",
-    "prepublish": "tsc",
+    "build": "tsc",
     "linter": "./node_modules/.bin/eslint .",
     "test": "jest --forceExit",
-    "test-local": "RABBITMQ_SERVICE_HOST=34.76.123.137:5672 jest --forceExit",
+    "test-local": "RABBITMQ_SERVICE_HOST=10.132.0.98:5672 jest --forceExit",
     "coverage": "jest --coverage --forceExit --runInBand && rm -rf ./coverage",
     "dev": "nodemon"
   },
@@ -17,18 +17,18 @@
     "@autofleet/outbreak": "0.0.6",
     "@types/amqp-connection-manager": "^2.0.10",
     "@types/amqplib": "^0.5.16",
-    "@types/jest": "^22.0.0",
     "amqp-connection-manager": "^3.2.1",
     "amqplib": "^0.6.0",
-    "bluebird": "^3.7.2",
-    "jest": "^22.4.4"
+    "bluebird": "^3.7.2"
   },
   "devDependencies": {
+    "@types/jest": "^26.0.23",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "eslint": "^7.13.0",
     "eslint-config-airbnb-typescript": "^12.0.0",
     "eslint-plugin-import": "^2.22.1",
-    "ts-jest": "^25.4.0",
+    "jest": "^27.0.5",
+    "ts-jest": "^27.0.3",
     "ts-node": "^8.6.2",
     "typescript": "^3.8.3"
   },

package/src/index.ts

@@ -76,13 +76,12 @@ class RabbitMq {
     this.options = options;
   }
 
-  public ack = async (msg: any) => {
-    if (this.channel) {
-      await this.channel.ack(msg);
-    }
+  public ack = (channel: ChannelWrapper) => async (msg: any) => {
+    await channel.ack(msg);
   }
 
   public nack = (
+    channel: ChannelWrapper,
     queue: string,
     options: any,
     deadQueueOptions: Options.AssertQueue,
@@ -92,7 +91,7 @@ class RabbitMq {
       skipRetry = false,
     }: any = { },
   ) => {
-    if (this.channel) {
+    if (channel) {
       if (
         !skipRetry
         && (!msg.content['x-retry-count']
@@ -105,7 +104,7 @@ class RabbitMq {
         await this.assertQueue(deadQueue, deadQueueOptions);
         await this.sendToQueue(deadQueue, msg.content, deadQueueOptions);
       }
-      await this.channel.ack(msg);
+      await channel.ack(msg);
     }
   }
 
@@ -116,7 +115,7 @@ class RabbitMq {
         return;
       }
       if (this.connection !== null) {
-        return this.connection;
+        return resolve(this.connection);
       }
       this.creatingConnection = true;
       const host: string = process.env.RABBITMQ_SERVICE_HOST || '';
@@ -137,6 +136,11 @@ class RabbitMq {
     });
   }
 
+  async getNewChannel() {
+    const connection: AmqpConnectionManager = await this.getConnection();
+    return connection.createChannel({});
+  }
+
   async assertChannel() {
     return new Promise<ChannelWrapper>(async (resolve, reject) => {
       if (this.channel) {
@@ -191,7 +195,7 @@ class RabbitMq {
     const optionsWithDefaults = { ...defaultOptions, ...options };
     RabbitMq.validateName('queue', queue);
     const { limit, deadMessageTtl } = optionsWithDefaults;
-    const channel: ChannelWrapper = await this.assertChannel();
+    const channel: ChannelWrapper = await this.getNewChannel();
     return channel.addSetup(async (c: ConfirmChannel) => {
       await c.assertQueue(queue);
       await c.prefetch(limit, true);
@@ -200,7 +204,7 @@ class RabbitMq {
           queue,
           (msg: any) => {
             newTrace(traceTypes.RABBIT);
-            callback(RabbitMq.parseMsg(msg), this.ack, this.nack(queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
+            callback(RabbitMq.parseMsg(msg), this.ack(channel), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
           },
         ),
       ]);
@@ -212,7 +216,7 @@ class RabbitMq {
     RabbitMq.validateName('exchange', exchange);
     RabbitMq.validateName('queue', queue);
     const { limit, deadMessageTtl } = optionsWithDefaults;
-    const channel: ChannelWrapper = await this.assertChannel();
+    const channel: ChannelWrapper = await this.getNewChannel();
 
     return channel.addSetup(async (c: ConfirmChannel) => {
       const assertExchange = await assertExchangeFanout(c, exchange);
@@ -225,7 +229,7 @@ class RabbitMq {
           queue,
           (msg: any) => {
             newTrace(traceTypes.RABBIT);
-            callback(RabbitMq.parseMsg(msg), this.ack, this.nack(queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
+            callback(RabbitMq.parseMsg(msg), this.ack(channel), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
           },
         ),
       ]);

package/src/mock.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 import 'jest';
 
 class RabbitMq {

package/tsconfig.json

@@ -6,5 +6,6 @@
     "outDir": "./dist",
     "strict": true,
     "esModuleInterop": true
-  }
+  },
+  "exclude": ["node_modules", "**/*.test.ts"]
 }