@autofleet/rabbit 3.2.5 → 3.2.6

package/dist/index.js

@@ -10,6 +10,7 @@ const moment_1 = __importDefault(require("moment"));
 const redis_lock_1 = __importDefault(require("redis-lock"));
 const amqp_connection_manager_1 = require("amqp-connection-manager");
 const zehut_1 = require("@autofleet/zehut");
+const uuid_1 = require("uuid");
 const logger_1 = __importDefault(require("./logger"));
 const rabbitError_1 = __importDefault(require("./lib/rabbitError"));
 const redis_1 = __importDefault(require("./lib/redis"));
@@ -39,6 +40,7 @@ class RabbitMq {
         };
         this.ack = (channel, msg, shouldUpdateRedisTimestamp = false, releaseLock = null) => async (userMsg) => {
             if (msg) {
+                debug('rabbit acking message', { deliveryTag: msg.fields.deliveryTag });
                 await channel.ack(msg);
                 const { properties: { headers } } = msg;
                 const timestamp = headers?.creationTimestamp;
@@ -71,6 +73,7 @@ class RabbitMq {
                             : 1,
                     });
                 }
+                debug('rabbit nacking message', { deliveryTag: msg.fields.deliveryTag });
                 await channel.ack(msg);
             }
             else {
@@ -345,6 +348,7 @@ class RabbitMq {
     async consumeFromRabbit(queue, callback, options) {
         const optionsWithDefaults = { ...consts_1.DEFAULT_OPTIONS, ...options };
         RabbitMq.validateName('queue', queue);
+        const uniqueId = uuid_1.v4();
         const { limit, deadMessageTtl, useConsumeWithLock, lockTimeout, auditContext, enableRabbitTrace, } = optionsWithDefaults;
         if (useConsumeWithLock) {
             if (!this.redisLock) {
@@ -399,6 +403,7 @@ class RabbitMq {
                     if (messageAcked) {
                         return;
                     }
+                    debug('rabbit localAck', { messageAcked, uniqueId, deliveryTag: msg.fields.deliveryTag });
                     messageAcked = true;
                     return this.ack(confirmChannel, msg, true, releaseLock)(msg);
                 };
@@ -406,6 +411,7 @@ class RabbitMq {
                     if (messageAcked) {
                         return;
                     }
+                    debug('rabbit localNack', { messageAcked, uniqueId, deliveryTag: msg.fields.deliveryTag });
                     messageAcked = true;
                     return this.nack(confirmChannel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg, nackOptions);
                 };

package/package.json

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

package/src/index.ts

@@ -13,6 +13,7 @@ import {
 import {
   getCurrentPayload, newTrace, traceTypes, createOrSetRabbitTrace, outbreak,
 } from '@autofleet/zehut';
+import { v4 } from 'uuid';
 import logger from './logger';
 import RabbitError from './lib/rabbitError';
 import getRedisInstance, { RedisConfig } from './lib/redis';
@@ -203,6 +204,7 @@ class RabbitMq implements IAfRabbitMq {
 
   public ack = (channel: ConfirmChannel, msg: ConsumeMessageOrNull, shouldUpdateRedisTimestamp = false, releaseLock = null) => async (userMsg: ConsumeMessage) : Promise<any> => {
     if (msg) {
+      debug('rabbit acking message', { deliveryTag: msg.fields.deliveryTag });
       await channel.ack(msg);
       const { properties: { headers } } = msg;
       const timestamp = headers?.creationTimestamp;
@@ -252,6 +254,7 @@ class RabbitMq implements IAfRabbitMq {
             : 1,
         });
       }
+      debug('rabbit nacking message', { deliveryTag: msg.fields.deliveryTag });
       await channel.ack(msg);
     } else {
       logger.error('no channel or msg', {
@@ -495,6 +498,7 @@ class RabbitMq implements IAfRabbitMq {
   private async consumeFromRabbit(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
     const optionsWithDefaults = { ...DEFAULT_OPTIONS, ...options };
     RabbitMq.validateName('queue', queue);
+    const uniqueId = v4();
     const {
       limit, deadMessageTtl, useConsumeWithLock, lockTimeout, auditContext, enableRabbitTrace,
     } = optionsWithDefaults;
@@ -557,6 +561,7 @@ class RabbitMq implements IAfRabbitMq {
             if (messageAcked) {
               return;
             }
+            debug('rabbit localAck', { messageAcked, uniqueId, deliveryTag: msg.fields.deliveryTag });
             messageAcked = true;
             return this.ack(confirmChannel, msg, true, releaseLock)(msg);
           };
@@ -565,6 +570,7 @@ class RabbitMq implements IAfRabbitMq {
             if (messageAcked) {
               return;
             }
+            debug('rabbit localNack', { messageAcked, uniqueId, deliveryTag: msg.fields.deliveryTag });
             messageAcked = true;
             return this.nack(confirmChannel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg, nackOptions);
           };