@autofleet/rabbit 2.1.5 → 2.1.7

package/dist/index.d.ts

@@ -57,5 +57,6 @@ declare class RabbitMq implements IAfRabbitMq {
     consumeFromExchange(queue: string, exchange: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any): Promise<void>;
     publish(exchange: string, content: any, customHeaders?: any): Promise<unknown>;
     sendToQueue(queue: string, content: any, options?: any, customHeaders?: any): Promise<void>;
+    isConnected(): Promise<boolean>;
 }
 export default RabbitMq;

package/dist/index.js

@@ -38,6 +38,7 @@ const moment_1 = __importDefault(require("moment"));
 const amqp_connection_manager_1 = require("amqp-connection-manager");
 const events_1 = require("events");
 const outbreak_1 = require("@autofleet/outbreak");
+const logger_1 = __importDefault(require("./logger"));
 const rabbitError_1 = __importDefault(require("./rabbitError"));
 const redis_1 = __importDefault(require("./redis"));
 const DEFAULT_DEAD_TTL_TWO_DAYS = 60000 * 60 * 48;
@@ -59,6 +60,9 @@ class RabbitMq {
             const { properties: { timestamp, headers } } = msg;
             if (timestamp && (headers === null || headers === void 0 ? void 0 : headers.redisTimestampValidationKey) && this.redisClient) {
                 const lastMessageTimestamp = yield this.redisClient.getAsync(headers.redisTimestampValidationKey);
+                logger_1.default.info('rabbit: checking if should consume params', {
+                    msg, timestamp, headers, lastMessageTimestamp,
+                });
                 return !lastMessageTimestamp || moment_1.default(parseInt(lastMessageTimestamp, 10) * SECONDS_TO_MILLISECONDS).isBefore(moment_1.default(timestamp * SECONDS_TO_MILLISECONDS));
             }
             return true;
@@ -221,6 +225,7 @@ class RabbitMq {
                         const parsedMessage = RabbitMq.parseMsg(msg);
                         outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
                         const shouldConsume = yield this.shouldConsumeMessageByTimestamp(parsedMessage);
+                        logger_1.default.info('rabbit: trying to consume', { queue, shouldConsume, msg });
                         if (!shouldConsume) {
                             return this.ack(channel)(msg);
                         }
@@ -248,6 +253,7 @@ class RabbitMq {
                         const parsedMessage = RabbitMq.parseMsg(msg);
                         outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
                         const shouldConsume = yield this.shouldConsumeMessageByTimestamp(parsedMessage);
+                        logger_1.default.info('rabbit: trying to consume', { queue, shouldConsume, msg });
                         if (!shouldConsume) {
                             return this.ack(channel)(msg);
                         }
@@ -278,8 +284,15 @@ class RabbitMq {
             RabbitMq.validateName('queue', queue);
             const channel = yield this.assertChannel();
             yield this.assertQueue(queue, options);
+            logger_1.default.info('rabbit: sending to queue', { queue, content, customHeaders });
             return channel.sendToQueue(queue, Buffer.from(JSON.stringify(content)), RabbitMq.getPublishOptions(customHeaders));
         });
     }
+    isConnected() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connection = yield this.getConnection();
+            return connection.isConnected();
+        });
+    }
 }
 exports.default = RabbitMq;

package/dist/logger.d.ts

@@ -0,0 +1,2 @@
+declare const logger: any;
+export default logger;

package/dist/logger.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Logger = require('@autofleet/logger');
+const logger = Logger();
+exports.default = logger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -15,6 +15,7 @@
     "dev": "nodemon"
   },
   "dependencies": {
+    "@autofleet/logger": "^1.2.8",
     "@types/amqp-connection-manager": "^2.0.10",
     "@types/amqplib": "^0.5.16",
     "@types/uuid": "^8.3.3",

package/src/index.ts

@@ -6,6 +6,7 @@ import { ConfirmChannel, Options } from 'amqplib';
 import { AmqpConnectionManager, ChannelWrapper, connect } from 'amqp-connection-manager';
 import { EventEmitter } from 'events';
 import { newTrace, traceTypes } from '@autofleet/outbreak';
+import logger from './logger';
 import RabbitError from './rabbitError';
 import getRedisInstance, { RedisConfig } from './redis';
 
@@ -110,6 +111,9 @@ class RabbitMq implements IAfRabbitMq {
     const { properties: { timestamp, headers } } = msg;
     if (timestamp && headers?.redisTimestampValidationKey && this.redisClient) {
       const lastMessageTimestamp = await this.redisClient.getAsync(headers.redisTimestampValidationKey);
+      logger.info('rabbit: checking if should consume params', {
+        msg, timestamp, headers, lastMessageTimestamp,
+      });
       return !lastMessageTimestamp || moment(parseInt(lastMessageTimestamp, 10) * SECONDS_TO_MILLISECONDS).isBefore(moment(timestamp * SECONDS_TO_MILLISECONDS));
     }
     return true;
@@ -252,6 +256,7 @@ class RabbitMq implements IAfRabbitMq {
             const parsedMessage = RabbitMq.parseMsg(msg);
             newTrace(traceTypes.RABBIT);
             const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
+            logger.info('rabbit: trying to consume', { queue, shouldConsume, msg });
             if (!shouldConsume) {
               return this.ack(channel)(msg);
             }
@@ -282,6 +287,7 @@ class RabbitMq implements IAfRabbitMq {
             const parsedMessage = RabbitMq.parseMsg(msg);
             newTrace(traceTypes.RABBIT);
             const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
+            logger.info('rabbit: trying to consume', { queue, shouldConsume, msg });
             if (!shouldConsume) {
               return this.ack(channel)(msg);
             }
@@ -312,10 +318,16 @@ class RabbitMq implements IAfRabbitMq {
     RabbitMq.validateName('queue', queue);
     const channel: ChannelWrapper = await this.assertChannel();
     await this.assertQueue(queue, options);
+    logger.info('rabbit: sending to queue', { queue, content, customHeaders });
     return channel.sendToQueue(queue,
       Buffer.from(JSON.stringify(content)),
       RabbitMq.getPublishOptions(customHeaders));
   }
+
+  async isConnected() : Promise<boolean> {
+    const connection = await this.getConnection();
+    return connection.isConnected();
+  }
 }
 
 export default RabbitMq;

package/src/logger.ts

@@ -0,0 +1,5 @@
+const Logger = require('@autofleet/logger');
+
+const logger = Logger();
+
+export default logger;