redis-smq 7.2.1 → 7.2.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 7.2.2 (2023-03-25)
+
+* test(workers): update tests (c22f1bb)
+* perf(workers): use offset/count for schedule and watchdog workers (e78ecdb)
+* build: bump up redis-smq-common to v2.0.0 (c90050d)
+* build: clean up (61851a9)
+
 ## 7.2.1 (2023-02-15)
 
 * build: update deps (e362d7c)

package/dist/src/lib/consumer/consumer-heartbeat.d.ts

@@ -16,11 +16,11 @@ export declare class ConsumerHeartbeat extends EventEmitter {
     protected onTick(): void;
     quit(cb: ICallback<void>): void;
     static validateHeartbeatsOf(redisClient: RedisClient, consumerIds: string[], cb: ICallback<Record<string, boolean>>): void;
-    static getValidHeartbeats(redisClient: RedisClient, cb: ICallback<{
+    static getValidHeartbeats(redisClient: RedisClient, timestamp: number, offset: number, count: number, cb: ICallback<{
         consumerId: string;
         payload: string;
     }[]>): void;
-    static getValidHeartbeatIds(redisClient: RedisClient, cb: ICallback<string[]>): void;
-    static getExpiredHeartbeatIds(redisClient: RedisClient, cb: ICallback<string[]>): void;
+    static getValidHeartbeatIds(redisClient: RedisClient, timestamp: number, offset: number, count: number, cb: ICallback<string[]>): void;
+    static getExpiredHeartbeatIds(redisClient: RedisClient, timestamp: number, offset: number, count: number, cb: ICallback<string[]>): void;
     static handleExpiredHeartbeatId(consumerId: string | string[], multi: IRedisClientMulti): void;
 }

package/dist/src/lib/consumer/consumer-heartbeat.js

@@ -108,8 +108,8 @@ class ConsumerHeartbeat extends events_2.EventEmitter {
             }
         });
     }
-    static getValidHeartbeats(redisClient, cb) {
-        ConsumerHeartbeat.getValidHeartbeatIds(redisClient, (err, consumerIds) => {
+    static getValidHeartbeats(redisClient, timestamp, offset, count, cb) {
+        ConsumerHeartbeat.getValidHeartbeatIds(redisClient, timestamp, offset, count, (err, consumerIds) => {
             if (err)
                 cb(err);
             else if (consumerIds && consumerIds.length) {
@@ -146,20 +146,20 @@ class ConsumerHeartbeat extends events_2.EventEmitter {
                 cb(null, []);
         });
     }
-    static getValidHeartbeatIds(redisClient, cb) {
+    static getValidHeartbeatIds(redisClient, timestamp, offset, count, cb) {
         const { keyHeartbeatConsumerWeight } = redis_keys_1.redisKeys.getMainKeys();
-        const timestamp = Date.now() - ConsumerHeartbeat.heartbeatTTL;
-        redisClient.zrangebyscore(keyHeartbeatConsumerWeight, timestamp, '+inf', (err, consumerIds) => {
+        const ts = timestamp - ConsumerHeartbeat.heartbeatTTL;
+        redisClient.zrangebyscore(keyHeartbeatConsumerWeight, ts, '+inf', offset, count, (err, consumerIds) => {
             if (err)
                 cb(err);
             else
                 cb(null, consumerIds !== null && consumerIds !== void 0 ? consumerIds : []);
         });
     }
-    static getExpiredHeartbeatIds(redisClient, cb) {
+    static getExpiredHeartbeatIds(redisClient, timestamp, offset, count, cb) {
         const { keyHeartbeatConsumerWeight } = redis_keys_1.redisKeys.getMainKeys();
-        const timestamp = Date.now() - ConsumerHeartbeat.heartbeatTTL;
-        redisClient.zrangebyscore(keyHeartbeatConsumerWeight, '-inf', timestamp, (err, consumerIds) => {
+        const ts = timestamp - ConsumerHeartbeat.heartbeatTTL;
+        redisClient.zrangebyscore(keyHeartbeatConsumerWeight, '-inf', ts, offset, count, (err, consumerIds) => {
             if (err)
                 cb(err);
             else

package/dist/src/lib/consumer/consumer.d.ts

@@ -26,7 +26,7 @@ export declare class Consumer extends Base {
     static getOnlineConsumers(redisClient: RedisClient, queue: TQueueParams, transform: boolean | undefined, cb: ICallback<Record<string, TConsumerInfo | string>>): void;
     static getOnlineConsumerIds(redisClient: RedisClient, queue: TQueueParams, cb: ICallback<string[]>): void;
     static countOnlineConsumers(redisClient: RedisClient, queue: TQueueParams, cb: ICallback<number>): void;
-    static getConsumerHeartbeats(redisClient: RedisClient, cb: ICallback<{
+    static getConsumerHeartbeats(redisClient: RedisClient, timestamp: number, offset: number, count: number, cb: ICallback<{
         consumerId: string;
         payload: string;
     }[]>): void;

package/dist/src/lib/consumer/consumer.js

@@ -125,8 +125,8 @@ class Consumer extends base_1.Base {
     static countOnlineConsumers(redisClient, queue, cb) {
         consumer_queues_1.consumerQueues.countQueueConsumers(redisClient, queue, cb);
     }
-    static getConsumerHeartbeats(redisClient, cb) {
-        consumer_heartbeat_1.ConsumerHeartbeat.getValidHeartbeats(redisClient, cb);
+    static getConsumerHeartbeats(redisClient, timestamp, offset, count, cb) {
+        consumer_heartbeat_1.ConsumerHeartbeat.getValidHeartbeats(redisClient, timestamp, offset, count, cb);
     }
 }
 exports.Consumer = Consumer;

package/dist/src/workers/schedule.worker.js

@@ -11,7 +11,7 @@ class ScheduleWorker extends redis_smq_common_1.Worker {
         super(managed);
         this.fetchMessageIds = (cb) => {
             const { keyScheduledMessageWeight } = redis_keys_1.redisKeys.getMainKeys();
-            this.redisClient.zrangebyscore(keyScheduledMessageWeight, 0, Date.now(), cb);
+            this.redisClient.zrangebyscore(keyScheduledMessageWeight, 0, Date.now(), 0, 100, cb);
         };
         this.fetchMessages = (ids, cb) => {
             if (ids.length) {

package/dist/src/workers/watchdog.worker.js

@@ -10,7 +10,7 @@ class WatchdogWorker extends redis_smq_common_1.Worker {
     constructor(redisClient, config, managed, logger) {
         super(managed);
         this.work = (cb) => {
-            consumer_heartbeat_1.ConsumerHeartbeat.getExpiredHeartbeatIds(this.redisClient, (err, reply) => {
+            consumer_heartbeat_1.ConsumerHeartbeat.getExpiredHeartbeatIds(this.redisClient, Date.now(), 0, 100, (err, reply) => {
                 if (err)
                     cb(err);
                 else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis-smq",
-  "version": "7.2.1",
+  "version": "7.2.2",
   "description": "A simple high-performance Redis message queue for Node.js.",
   "author": "Weyoss <weyoss@protonmail.com>",
   "license": "MIT",
@@ -39,7 +39,7 @@
     "uuid": "9.0.0"
   },
   "peerDependencies": {
-    "redis-smq-common": "^1.0.6"
+    "redis-smq-common": "^2.0.0"
   },
   "devDependencies": {
     "@types/bluebird": "3.5.38",
@@ -51,7 +51,6 @@
     "@types/uuid": "9.0.0",
     "@typescript-eslint/eslint-plugin": "4.32.0",
     "@typescript-eslint/parser": "4.32.0",
-    "coveralls": "3.1.1",
     "eslint": "7.32.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-prettier": "4.0.0",
@@ -59,7 +58,7 @@
     "jest": "27.2.4",
     "lint-staged": "11.1.2",
     "prettier": "2.4.1",
-    "redis-smq-common": "^1.0.6",
+    "redis-smq-common": "^2.0.0",
     "supertest": "6.1.6",
     "ts-jest": "27.0.5",
     "ts-node": "10.2.1",