@autofleet/rabbit 2.5.0-beta.3 → 2.5.0-beta.5

package/dist/index.js

@@ -125,6 +125,10 @@ class RabbitMq {
     }
     static getPublishOptions(customHeaders = {}) {
         const trace = zehut_1.getCurrentPayload();
+        logger_1.default.info('ANKRI getPublishOptions', {
+            trace,
+            context: Array.from(trace.context),
+        });
         return {
             timestamp: moment_1.default().unix(),
             headers: {
@@ -293,7 +297,17 @@ class RabbitMq {
         });
     }
     async publish(exchange, content, customHeaders) {
+        const trace = zehut_1.getCurrentPayload();
+        logger_1.default.info('ANKRI publish', {
+            trace,
+            context: Array.from(trace.context),
+        });
         return wrapSetImmediate(async () => {
+            const trace2 = zehut_1.getCurrentPayload();
+            logger_1.default.info('ANKRI publish inside wrapSetImmediate', {
+                trace: trace2,
+                context: Array.from(trace.context),
+            });
             RabbitMq.validateName('exchange', exchange);
             const channel = await this.assertChannel();
             await this.assertExchange(exchange);
@@ -301,7 +315,17 @@ class RabbitMq {
         });
     }
     async sendToQueue(queue, content, options, customHeaders) {
+        const trace = zehut_1.getCurrentPayload();
+        logger_1.default.info('ANKRI sendToQueue', {
+            trace,
+            context: Array.from(trace.context),
+        });
         return wrapSetImmediate(async () => {
+            const trace2 = zehut_1.getCurrentPayload();
+            logger_1.default.info('ANKRI wrapSetImmediate inside wrapSetImmediate', {
+                trace: trace2,
+                context: Array.from(trace.context),
+            });
             RabbitMq.validateName('queue', queue);
             const channel = await this.assertChannel();
             await this.assertQueue(queue, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.5.0-beta.3",
+  "version": "2.5.0-beta.5",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -16,7 +16,6 @@
   },
   "dependencies": {
     "@autofleet/logger": "^1.2.8",
-    "@autofleet/zehut": "^3.0.0",
     "@types/amqplib": "0.8.2",
     "@types/uuid": "^8.3.3",
     "amqp-connection-manager": "4.1.9",
@@ -25,12 +24,13 @@
     "moment": "^2.29.1",
     "redis": "^3.1.2",
     "redis-lock": "^0.1.4",
-    "shortid": "^2.2.16",
     "uuid": "^8.3.2"
   },
+  "peerDependencies": {
+    "@autofleet/zehut": "*"
+  },
   "devDependencies": {
     "@types/jest": "^26.0.23",
-    "@types/shortid": "^0.0.29",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "eslint": "^7.13.0",
     "eslint-config-airbnb-typescript": "^12.0.0",

package/src/index.ts

@@ -2,7 +2,6 @@
 // eslint-disable-next-line max-classes-per-file
 import moment from 'moment';
 import RedisLock from 'redis-lock';
-import shortid from 'shortid';
 import { ConfirmChannel, Options, ConsumeMessage } from 'amqplib';
 import { AmqpConnectionManager, ChannelWrapper, connect } from 'amqp-connection-manager';
 import { EventEmitter } from 'events';
@@ -105,6 +104,10 @@ class RabbitMq implements IAfRabbitMq {
 
   static getPublishOptions(customHeaders: CustomMessageHeaders = {}) {
     const trace = getCurrentPayload();
+    logger.info('ANKRI getPublishOptions', {
+      trace,
+      context: Array.from(trace.context),
+    });
     return {
       timestamp: moment().unix(),
       headers: {
@@ -414,7 +417,17 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   async publish(exchange: string, content: any, customHeaders?: any) : Promise<boolean> {
+    const trace = getCurrentPayload();
+    logger.info('ANKRI publish', {
+      trace,
+      context: Array.from(trace.context),
+    });
     return wrapSetImmediate(async () => {
+      const trace2 = getCurrentPayload();
+      logger.info('ANKRI publish inside wrapSetImmediate', {
+        trace: trace2,
+        context: Array.from(trace.context),
+      });
       RabbitMq.validateName('exchange', exchange);
       const channel: ChannelWrapper = await this.assertChannel();
       await this.assertExchange(exchange);
@@ -425,7 +438,17 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   async sendToQueue(queue: string, content: any, options?: any, customHeaders?: any) : Promise<boolean> {
+    const trace = getCurrentPayload();
+    logger.info('ANKRI sendToQueue', {
+      trace,
+      context: Array.from(trace.context),
+    });
     return wrapSetImmediate(async () => {
+      const trace2 = getCurrentPayload();
+      logger.info('ANKRI wrapSetImmediate inside wrapSetImmediate', {
+        trace: trace2,
+        context: Array.from(trace.context),
+      });
       RabbitMq.validateName('queue', queue);
       const channel: ChannelWrapper = await this.assertChannel();
       await this.assertQueue(queue, options);