@autofleet/rabbit 2.0.4-alpha → 2.0.4-beta1

package/dist/index.js

@@ -72,6 +72,7 @@ class RabbitMq {
                     && (!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;
+                    // msg.content.nackCount = msg.content.nackCount ? msg.content.nackCount + 1 : 1;
                     yield this.sendToQueue(queue, msg.content);
                 }
                 else {
@@ -213,7 +214,9 @@ class RabbitMq {
                             ];
                             callbackWithTimeout(callback, args, optionsWithDefaults.timeout, optionsWithDefaults.timeoutMessage);
                         }
-                        callback(RabbitMq.parseMsg(msg), this.ack(channel), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
+                        else {
+                            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.4-alpha",
+  "version": "2.0.4-beta1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -37,16 +37,14 @@ 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 callbackWithTimeout = async (callback: any, args: any[], timeout: number, timeoutMessage = 'Timeout while ack message') => Promise.race([
+  new Promise(callback(...args)),
+  new Promise((resolve, reject) => {
+    setTimeout(() => {
+      reject(timeoutMessage);
+    }, timeout);
+  }),
+]);
 
 const connectionCreatedConst = 'connectionCreated';
 class RabbitMq implements IAfRabbitMq {
@@ -121,6 +119,7 @@ class RabbitMq implements IAfRabbitMq {
         || msg.content['x-retry-count'] < options.retries)
       ) {
         msg.content['x-retry-count'] = msg.content['x-retry-count'] ? msg.content['x-retry-count'] + 1 : 1;
+        // msg.content.nackCount = msg.content.nackCount ? msg.content.nackCount + 1 : 1;
         await this.sendToQueue(queue, msg.content);
       } else {
         const deadQueue = `${queue}-dead`;
@@ -225,7 +224,7 @@ class RabbitMq implements IAfRabbitMq {
       return Promise.all([
         c.consume(
           queue,
-          (msg: any) => {
+          async (msg: any) => {
             newTrace(traceTypes.RABBIT);
             if (optionsWithDefaults.timeout) {
               const args = [
@@ -233,9 +232,14 @@ class RabbitMq implements IAfRabbitMq {
                 this.ack(channel),
                 this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }),
               ];
-              callbackWithTimeout(callback, args, optionsWithDefaults.timeout, optionsWithDefaults.timeoutMessage);
+              try {
+                await callbackWithTimeout(callback, args, optionsWithDefaults.timeout, optionsWithDefaults.timeoutMessage);
+              } catch (e) {
+                this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl });
+              }
+            } else {
+              callback(RabbitMq.parseMsg(msg), this.ack(channel), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
             }
-            callback(RabbitMq.parseMsg(msg), this.ack(channel), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
           },
         ),
       ]);