@autofleet/rabbit 2.1.4 → 2.1.6

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

@@ -59,7 +59,7 @@ 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);
-                return !lastMessageTimestamp || !moment_1.default(parseInt(lastMessageTimestamp, 10) * SECONDS_TO_MILLISECONDS).isAfter(moment_1.default(timestamp * SECONDS_TO_MILLISECONDS));
+                return !lastMessageTimestamp || moment_1.default(parseInt(lastMessageTimestamp, 10) * SECONDS_TO_MILLISECONDS).isBefore(moment_1.default(timestamp * SECONDS_TO_MILLISECONDS));
             }
             return true;
         });
@@ -249,8 +249,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 }));
                     })),
@@ -282,5 +281,11 @@ class RabbitMq {
             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/package.json

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

package/src/index.ts

@@ -110,7 +110,7 @@ class RabbitMq implements IAfRabbitMq {
     const { properties: { timestamp, headers } } = msg;
     if (timestamp && headers?.redisTimestampValidationKey && this.redisClient) {
       const lastMessageTimestamp = await this.redisClient.getAsync(headers.redisTimestampValidationKey);
-      return !lastMessageTimestamp || !moment(parseInt(lastMessageTimestamp, 10) * SECONDS_TO_MILLISECONDS).isAfter(moment(timestamp * SECONDS_TO_MILLISECONDS));
+      return !lastMessageTimestamp || moment(parseInt(lastMessageTimestamp, 10) * SECONDS_TO_MILLISECONDS).isBefore(moment(timestamp * SECONDS_TO_MILLISECONDS));
     }
     return true;
   }
@@ -283,8 +283,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 }));
           },
@@ -317,6 +316,11 @@ class RabbitMq implements IAfRabbitMq {
       Buffer.from(JSON.stringify(content)),
       RabbitMq.getPublishOptions(customHeaders));
   }
+
+  async isConnected() : Promise<boolean> {
+    const connection = await this.getConnection();
+    return connection.isConnected();
+  }
 }
 
 export default RabbitMq;