@autofleet/rabbit 2.0.4-beta4 → 2.0.4-beta5

package/dist/index.d.ts

@@ -32,7 +32,11 @@ declare class RabbitMq implements IAfRabbitMq {
     creatingConnection: boolean;
     exchanges: ExchangesCache;
     options: AfRabbitOptions | undefined;
-    constructor(options?: AfRabbitOptions);
+    logger: any;
+    constructor({ options, logger }?: {
+        options?: AfRabbitOptions;
+        logger?: any;
+    });
     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>;

package/dist/index.js

@@ -46,21 +46,19 @@ 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* () {
-    const callbackPromise = new bluebird.Promise(callback(...args));
-    Promise.race([
-        callbackPromise,
-        new Promise((resolve, reject) => {
-            setTimeout(() => {
-                callbackPromise.cancel();
-                console.log('callbackPromise', callbackPromise.isCancelled());
-                reject(timeoutMessage);
-            }, timeout);
-        }),
-    ]);
+    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) {
+    constructor({ options, logger } = {}) {
         this.PUBLISH_TIMEOUT = Number(process.env.RABBITMQ_PUBLISH_TIMEOUT) || 60000;
         this.PUBLISH_ERROR_MSG = `rabbit: publish timeout(${this.PUBLISH_TIMEOUT}ms) has pass, exchange: `;
         this.DISCONNECT_MSG = 'rabbit: connection disconnect';
@@ -74,7 +72,6 @@ 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 {
@@ -91,6 +88,7 @@ class RabbitMq {
         this.creatingConnection = false;
         this.exchanges = {};
         this.options = options;
+        this.logger = logger;
     }
     static parseMsg(msg) {
         let { content } = msg;
@@ -207,6 +205,7 @@ class RabbitMq {
                 yield c.prefetch(limit, true);
                 return Promise.all([
                     c.consume(queue, (msg) => __awaiter(this, void 0, void 0, function* () {
+                        var _a;
                         outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
                         if (optionsWithDefaults.timeout) {
                             const args = [
@@ -218,6 +217,10 @@ class RabbitMq {
                                 yield callbackWithTimeout(callback, args, optionsWithDefaults.timeout, optionsWithDefaults.timeoutMessage);
                             }
                             catch (e) {
+                                (_a = this.logger) === null || _a === void 0 ? void 0 : _a.error('message nacked because of error in callbackWithTimeout', {
+                                    error: e,
+                                    msg,
+                                });
                                 this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl });
                             }
                         }

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.0.4-beta4",
+  "version": "2.0.4-beta5",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
     "postinstall": "echo '\\033[0;31m\nWARNING: in case of migrating to new version of @autofleet/rabbit \nyou might have to delete existing queues or the deployment will fail.\\033[0m\n'",
     "start": "ts-node  src/index.ts",
     "example": "ts-node  src/example.ts",
-    "build": "tsc",
+    "build": "rm -rf dist && tsc",
+    "prepublish": "npm run build",
     "linter": "./node_modules/.bin/eslint .",
     "test": "jest --forceExit",
     "test-local": "RABBITMQ_SERVICE_HOST=10.132.0.98:5672 jest --forceExit",

package/src/index.ts

@@ -38,17 +38,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') => {
-  const callbackPromise = new bluebird.Promise(callback(...args));
-  Promise.race([
-    callbackPromise,
-    new Promise((resolve, reject) => {
-      setTimeout(() => {
-        callbackPromise.cancel();
-        console.log('callbackPromise', callbackPromise.isCancelled());
-        reject(timeoutMessage);
-      }, timeout);
-    }),
-  ]);
+  await new bluebird.Promise(async (resolve, reject) => {
+    try {
+      await callback(...args);
+      return resolve();
+    } catch (e) {
+      return reject(e);
+    }
+  }).timeout(timeout, timeoutMessage);
 };
 
 const connectionCreatedConst = 'connectionCreated';
@@ -93,13 +90,16 @@ class RabbitMq implements IAfRabbitMq {
 
   options: AfRabbitOptions | undefined;
 
-  constructor(options?: AfRabbitOptions) {
+  logger: any;
+
+  constructor({ options, logger }: { options?: AfRabbitOptions, logger?: any} = {}) {
     this.em = new EventEmitter();
     this.channel = null;
     this.connection = null;
     this.creatingConnection = false;
     this.exchanges = {};
     this.options = options;
+    this.logger = logger;
   }
 
   public ack = (channel: ChannelWrapper) => async (msg: any) => {
@@ -124,7 +124,6 @@ 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`;
@@ -240,6 +239,10 @@ class RabbitMq implements IAfRabbitMq {
               try {
                 await callbackWithTimeout(callback, args, optionsWithDefaults.timeout, optionsWithDefaults.timeoutMessage);
               } catch (e) {
+                this.logger?.error('message nacked because of error in callbackWithTimeout', {
+                  error: e,
+                  msg,
+                });
                 this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl });
               }
             } else {