@autofleet/rabbit 2.0.2 → 2.0.4-alpha

package/dist/index.js

@@ -45,6 +45,17 @@ const defaultOptions = {
     deadMessageTtl: DEFAULT_DEAD_TTL_TWO_DAYS,
 };
 const assertExchangeFanout = (c, exchangeName) => c.assertExchange(exchangeName, 'fanout');
+const callbackWithTimeout = (callback, args, timeout, timeoutMessage = 'Timeout while ack message') => __awaiter(void 0, void 0, void 0, function* () {
+    yield new bluebird.Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            yield callback(...args);
+            return resolve();
+        }
+        catch (e) {
+            return reject(e);
+        }
+    })).timeout(timeout, timeoutMessage);
+});
 const connectionCreatedConst = 'connectionCreated';
 class RabbitMq {
     constructor(options) {
@@ -194,6 +205,14 @@ class RabbitMq {
                 return Promise.all([
                     c.consume(queue, (msg) => {
                         outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
+                        if (optionsWithDefaults.timeout) {
+                            const args = [
+                                RabbitMq.parseMsg(msg),
+                                this.ack(channel),
+                                this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }),
+                            ];
+                            callbackWithTimeout(callback, args, optionsWithDefaults.timeout, optionsWithDefaults.timeoutMessage);
+                        }
                         callback(RabbitMq.parseMsg(msg), this.ack(channel), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
                     }),
                 ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.0.2",
+  "version": "2.0.4-alpha",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -15,7 +15,6 @@
     "dev": "nodemon"
   },
   "dependencies": {
-    "@autofleet/outbreak": "0.0.6",
     "@types/amqp-connection-manager": "^2.0.10",
     "@types/amqplib": "^0.5.16",
     "amqp-connection-manager": "^3.2.1",
@@ -23,6 +22,7 @@
     "bluebird": "^3.7.2"
   },
   "devDependencies": {
+    "@autofleet/outbreak": "*",
     "@types/jest": "^26.0.23",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "eslint": "^7.13.0",
@@ -34,5 +34,8 @@
     "typescript": "^3.8.3"
   },
   "author": "",
-  "license": "ISC"
+  "license": "ISC",
+  "peerDependencies": {
+    "@autofleet/outbreak": "^0.1.1"
+  }
 }

package/src/index.ts

@@ -37,6 +37,17 @@ const defaultOptions = {
 
 const assertExchangeFanout = (c: any, exchangeName: string) => c.assertExchange(exchangeName, 'fanout');
 
+const callbackWithTimeout = async (callback: any, args: any[], timeout: number, timeoutMessage = 'Timeout while ack message') => {
+  await new bluebird.Promise(async (resolve: any, reject: any) => {
+    try {
+      await callback(...args);
+      return resolve();
+    } catch (e) {
+      return reject(e);
+    }
+  }).timeout(timeout, timeoutMessage);
+};
+
 const connectionCreatedConst = 'connectionCreated';
 class RabbitMq implements IAfRabbitMq {
   static parseMsg(msg: any) {
@@ -216,6 +227,14 @@ class RabbitMq implements IAfRabbitMq {
           queue,
           (msg: any) => {
             newTrace(traceTypes.RABBIT);
+            if (optionsWithDefaults.timeout) {
+              const args = [
+                RabbitMq.parseMsg(msg),
+                this.ack(channel),
+                this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }),
+              ];
+              callbackWithTimeout(callback, args, optionsWithDefaults.timeout, optionsWithDefaults.timeoutMessage);
+            }
             callback(RabbitMq.parseMsg(msg), this.ack(channel), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
           },
         ),