@autofleet/rabbit 2.2.9-beta → 2.3.0

package/dist/index.d.ts

@@ -42,7 +42,10 @@ declare class RabbitMq implements IAfRabbitMq {
     static validateName(type: string, name: string): void;
     static getPublishOptions(customHeaders?: CustomMessageHeaders): {
         timestamp: number;
-        headers: CustomMessageHeaders;
+        headers: {
+            redisTimestampValidationKey?: string | undefined;
+            creationTimestamp: number;
+        };
     };
     PUBLISH_TIMEOUT: number;
     PUBLISH_ERROR_MSG: string;

package/dist/index.js

@@ -52,7 +52,8 @@ class RabbitMq {
         this.RESCONNECT_MSG = 'rabbit: reconnecting';
         this.shouldConsumeMessageByTimestamp = (msg) => __awaiter(this, void 0, void 0, function* () {
             if (msg) {
-                const { properties: { timestamp, headers } } = msg;
+                const { properties: { headers } } = msg;
+                const timestamp = headers === null || headers === void 0 ? void 0 : headers.creationTimestamp;
                 if (timestamp && (headers === null || headers === void 0 ? void 0 : headers.redisTimestampValidationKey) && this.redisClient) {
                     const lastMessageTimestamp = yield this.redisClient.getAsync(headers.redisTimestampValidationKey);
                     return !lastMessageTimestamp || (parseInt(lastMessageTimestamp, 10) <= parseInt(timestamp, 10));
@@ -64,7 +65,8 @@ class RabbitMq {
         this.ack = (channel, msg, shouldUpdateRedisTimestamp = false) => (userMsg) => __awaiter(this, void 0, void 0, function* () {
             if (msg) {
                 yield channel.ack(msg);
-                const { properties: { timestamp, headers } } = msg;
+                const { properties: { headers } } = msg;
+                const timestamp = headers === null || headers === void 0 ? void 0 : headers.creationTimestamp;
                 if (shouldUpdateRedisTimestamp && timestamp && (headers === null || headers === void 0 ? void 0 : headers.redisTimestampValidationKey) && this.redisClient) {
                     const parsedTimestamp = parseInt(timestamp, 10);
                     yield this.redisClient.setAsync(headers.redisTimestampValidationKey, parsedTimestamp, 'EX', 3600);
@@ -76,19 +78,15 @@ class RabbitMq {
                 if (!skipRetry
                     && (!msg.properties.headers[RETRY_HEADER]
                         || parseInt(msg.properties.headers[RETRY_HEADER], 10) < options.retries)) {
-                    yield this.sendToQueue(queue, RabbitMq.parseMsg(msg).content, options, {
-                        [RETRY_HEADER]: msg.properties.headers[RETRY_HEADER]
+                    yield this.sendToQueue(queue, RabbitMq.parseMsg(msg).content, options, Object.assign(Object.assign({}, msg.properties.headers), { [RETRY_HEADER]: msg.properties.headers[RETRY_HEADER]
                             ? msg.properties.headers[RETRY_HEADER] + 1
-                            : 1,
-                    });
+                            : 1 }));
                 }
                 else {
                     const deadQueue = `${queue}-dead`;
-                    yield this.sendToQueue(deadQueue, RabbitMq.parseMsg(msg).content, deadQueueOptions, {
-                        [RETRY_HEADER]: msg.properties.headers[RETRY_HEADER]
+                    yield this.sendToQueue(deadQueue, RabbitMq.parseMsg(msg).content, deadQueueOptions, Object.assign(Object.assign({}, msg.properties.headers), { [RETRY_HEADER]: msg.properties.headers[RETRY_HEADER]
                             ? msg.properties.headers[RETRY_HEADER] + 1
-                            : 1,
-                    });
+                            : 1 }));
                 }
                 yield channel.ack(msg);
             }
@@ -122,7 +120,7 @@ class RabbitMq {
     static getPublishOptions(customHeaders = {}) {
         return {
             timestamp: moment_1.default().unix(),
-            headers: customHeaders,
+            headers: Object.assign({ creationTimestamp: moment_1.default().valueOf() }, customHeaders),
         };
     }
     getConnection() {
@@ -239,10 +237,12 @@ class RabbitMq {
             const lockTimeout = (options === null || options === void 0 ? void 0 : options.lockTimeout) || DEFAULT_LOCK_TIMEOUT;
             logger_1.default.info(`Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
             return this.consumeFromRabbit(queue, (msg, ack, nack) => __awaiter(this, void 0, void 0, function* () {
+                logger_1.default.info('Logs ');
                 if (!msg) {
                     return null;
                 }
-                const { properties: { timestamp, headers } } = msg;
+                const { properties: { headers } } = msg;
+                const timestamp = headers === null || headers === void 0 ? void 0 : headers.creationTimestamp;
                 let releaseLock = null;
                 try {
                     if (timestamp && (headers === null || headers === void 0 ? void 0 : headers.redisTimestampValidationKey)) {
@@ -325,6 +325,7 @@ class RabbitMq {
     }
     sendToQueue(queue, content, options, customHeaders) {
         return __awaiter(this, void 0, void 0, function* () {
+            logger_1.default.info('ss', RabbitMq.getPublishOptions(customHeaders));
             return wrapSetImmediate(() => __awaiter(this, void 0, void 0, function* () {
                 RabbitMq.validateName('queue', queue);
                 const channel = yield this.assertChannel();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.2.9-beta",
+  "version": "2.3.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -10,7 +10,7 @@
     "build": "tsc",
     "linter": "./node_modules/.bin/eslint .",
     "test": "jest --forceExit",
-    "test-local": "RABBITMQ_SERVICE_HOST=10.132.0.98:5672 jest --forceExit",
+    "test-local": "RABBITMQ_SERVICE_HOST=localhost:5672 jest --forceExit",
     "coverage": "jest --coverage --forceExit && rm -rf ./coverage",
     "dev": "nodemon"
   },

package/src/index.ts

@@ -101,7 +101,10 @@ class RabbitMq implements IAfRabbitMq {
   static getPublishOptions(customHeaders: CustomMessageHeaders = {}) {
     return {
       timestamp: moment().unix(),
-      headers: customHeaders,
+      headers: {
+        creationTimestamp: moment().valueOf(),
+        ...customHeaders,
+      },
     };
   }
 
@@ -147,7 +150,9 @@ class RabbitMq implements IAfRabbitMq {
 
   private shouldConsumeMessageByTimestamp = async (msg: ConsumeMessageOrNull) => {
     if (msg) {
-      const { properties: { timestamp, headers } } = msg;
+      const { properties: { headers } } = msg;
+      const timestamp = headers?.creationTimestamp;
+
       if (timestamp && headers?.redisTimestampValidationKey && this.redisClient) {
         const lastMessageTimestamp = await this.redisClient.getAsync(headers.redisTimestampValidationKey);
         return !lastMessageTimestamp || (parseInt(lastMessageTimestamp, 10) <= parseInt(timestamp, 10));
@@ -160,7 +165,9 @@ class RabbitMq implements IAfRabbitMq {
   public ack = (channel: ChannelWrapper, msg: ConsumeMessageOrNull, shouldUpdateRedisTimestamp = false) => async (userMsg: ConsumeMessage) : Promise<any> => {
     if (msg) {
       await channel.ack(msg);
-      const { properties: { timestamp, headers } } = msg;
+      const { properties: { headers } } = msg;
+      const timestamp = headers?.creationTimestamp;
+
       if (shouldUpdateRedisTimestamp && timestamp && headers?.redisTimestampValidationKey && this.redisClient) {
         const parsedTimestamp = parseInt(timestamp, 10);
         await this.redisClient.setAsync(headers.redisTimestampValidationKey, parsedTimestamp, 'EX', 3600);
@@ -189,6 +196,7 @@ class RabbitMq implements IAfRabbitMq {
         )
       ) {
         await this.sendToQueue(queue, RabbitMq.parseMsg(msg).content, options, {
+          ...msg.properties.headers,
           [RETRY_HEADER]: msg.properties.headers[RETRY_HEADER]
             ? msg.properties.headers[RETRY_HEADER] + 1
             : 1,
@@ -196,6 +204,7 @@ class RabbitMq implements IAfRabbitMq {
       } else {
         const deadQueue = `${queue}-dead`;
         await this.sendToQueue(deadQueue, RabbitMq.parseMsg(msg).content, deadQueueOptions, {
+          ...msg.properties.headers,
           [RETRY_HEADER]: msg.properties.headers[RETRY_HEADER]
             ? msg.properties.headers[RETRY_HEADER] + 1
             : 1,
@@ -309,11 +318,14 @@ class RabbitMq implements IAfRabbitMq {
     const lockTimeout = options?.lockTimeout || DEFAULT_LOCK_TIMEOUT;
     logger.info(`Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
     return this.consumeFromRabbit(queue, async (msg, ack, nack) => {
+      logger.info('Logs ');
       if (!msg) {
         return null;
       }
-      const { properties: { timestamp, headers } } = msg;
+      const { properties: { headers } } = msg;
+      const timestamp = headers?.creationTimestamp;
       let releaseLock = null;
+
       try {
         if (timestamp && headers?.redisTimestampValidationKey) {
           if (this.redisLock) {
@@ -406,6 +418,7 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   async sendToQueue(queue: string, content: any, options?: any, customHeaders?: any) : Promise<boolean> {
+    logger.info('ss', RabbitMq.getPublishOptions(customHeaders));
     return wrapSetImmediate(async () => {
       RabbitMq.validateName('queue', queue);
       const channel: ChannelWrapper = await this.assertChannel();