@autofleet/rabbit 2.0.4-beta1 → 2.0.4-beta2

package/dist/index.js

@@ -46,15 +46,16 @@ const defaultOptions = {
 };
 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 callbackPromise = new bluebird.Promise(callback(...args));
+    Promise.race([
+        callbackPromise,
+        new Promise((resolve, reject) => {
+            setTimeout(() => {
+                callbackPromise.cancel();
+                reject(timeoutMessage);
+            }, timeout);
+        }),
+    ]);
 });
 const connectionCreatedConst = 'connectionCreated';
 class RabbitMq {
@@ -204,7 +205,7 @@ class RabbitMq {
                 yield c.assertQueue(queue);
                 yield c.prefetch(limit, true);
                 return Promise.all([
-                    c.consume(queue, (msg) => {
+                    c.consume(queue, (msg) => __awaiter(this, void 0, void 0, function* () {
                         outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
                         if (optionsWithDefaults.timeout) {
                             const args = [
@@ -212,12 +213,17 @@ class RabbitMq {
                                 this.ack(channel),
                                 this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }),
                             ];
-                            callbackWithTimeout(callback, args, optionsWithDefaults.timeout, optionsWithDefaults.timeoutMessage);
+                            try {
+                                yield 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 }));
                         }
-                    }),
+                    })),
                 ]);
             }));
         });

package/package.json

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

package/src/index.ts

@@ -37,14 +37,18 @@ 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') => Promise.race([
-  new Promise(callback(...args)),
-  new Promise((resolve, reject) => {
-    setTimeout(() => {
-      reject(timeoutMessage);
-    }, timeout);
-  }),
-]);
+const callbackWithTimeout = async (callback: any, args: any[], timeout: number, timeoutMessage = 'Timeout while ack message') => {
+  const callbackPromise = new bluebird.Promise(callback(...args));
+  Promise.race([
+    callbackPromise,
+    new Promise((resolve, reject) => {
+      setTimeout(() => {
+        callbackPromise.cancel();
+        reject(timeoutMessage);
+      }, timeout);
+    }),
+  ]);
+};
 
 const connectionCreatedConst = 'connectionCreated';
 class RabbitMq implements IAfRabbitMq {