@autofleet/rabbit 2.1.2 → 2.1.4

package/dist/index.js

@@ -68,7 +68,7 @@ class RabbitMq {
             const { properties: { timestamp, headers } } = msg;
             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);
+                yield this.redisClient.setAsync(headers.redisTimestampValidationKey, parsedTimestamp, 'EX', 3600);
             }
         });
         this.nack = (channel, queue, options, deadQueueOptions) => (msg, { skipRetry = false, } = {}) => __awaiter(this, void 0, void 0, function* () {
@@ -222,8 +222,7 @@ class RabbitMq {
                         outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
                         const shouldConsume = yield this.shouldConsumeMessageByTimestamp(parsedMessage);
                         if (!shouldConsume) {
-                            this.ack(channel);
-                            return;
+                            return this.ack(channel)(msg);
                         }
                         callback(parsedMessage, this.ack(channel, true), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
                     })),

package/dist/redis.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const redis_1 = __importDefault(require("redis"));
 const bluebird_1 = __importDefault(require("bluebird"));
-bluebird_1.default.promisifyAll(redis_1.default.RedisClient.prototype);
-bluebird_1.default.promisifyAll(redis_1.default.Multi.prototype);
-const getRedisInstance = (config) => redis_1.default.createClient(config);
+const redis = require('redis');
+bluebird_1.default.promisifyAll(redis.RedisClient.prototype);
+bluebird_1.default.promisifyAll(redis.Multi.prototype);
+const getRedisInstance = (config) => redis.createClient(config);
 exports.default = getRedisInstance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -17,7 +17,6 @@
   "dependencies": {
     "@types/amqp-connection-manager": "^2.0.10",
     "@types/amqplib": "^0.5.16",
-    "@types/redis": "^2.8.32",
     "@types/uuid": "^8.3.3",
     "amqp-connection-manager": "^3.2.1",
     "amqplib": "^0.6.0",

package/src/index.ts

@@ -6,7 +6,6 @@ import { ConfirmChannel, Options } from 'amqplib';
 import { AmqpConnectionManager, ChannelWrapper, connect } from 'amqp-connection-manager';
 import { EventEmitter } from 'events';
 import { newTrace, traceTypes } from '@autofleet/outbreak';
-import { RedisClient } from 'redis';
 import RabbitError from './rabbitError';
 import getRedisInstance, { RedisConfig } from './redis';
 
@@ -121,7 +120,7 @@ class RabbitMq implements IAfRabbitMq {
     const { properties: { timestamp, headers } } = msg;
     if (shouldUpdateRedisTimestamp && timestamp && headers?.redisTimestampValidationKey && this.redisClient) {
       const parsedTimestamp = parseInt(timestamp, 10);
-      await this.redisClient.setAsync(headers.redisTimestampValidationKey, parsedTimestamp);
+      await this.redisClient.setAsync(headers.redisTimestampValidationKey, parsedTimestamp, 'EX', 3600);
     }
   }
 
@@ -254,8 +253,7 @@ class RabbitMq implements IAfRabbitMq {
             newTrace(traceTypes.RABBIT);
             const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
             if (!shouldConsume) {
-              this.ack(channel);
-              return;
+              return this.ack(channel)(msg);
             }
             callback(parsedMessage, this.ack(channel, true), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
           },

package/src/redis.ts

@@ -1,6 +1,7 @@
-import redis from 'redis';
 import bluebird from 'bluebird';
 
+const redis = require('redis');
+
 bluebird.promisifyAll(redis.RedisClient.prototype);
 bluebird.promisifyAll(redis.Multi.prototype);