redis-smq 8.0.0-rc.25 → 8.0.0-rc.27

package/CHANGELOG.md

@@ -1,4 +1,23 @@
+# Changelog
 
+## [8.0.0-rc.27](https://github.com/weyoss/redis-smq/compare/v8.0.0-rc.26...v8.0.0-rc.27) (2025-01-09)
+
+### Continuous Integration
+
+* fix broken CHANGELOG.md for v8.0.0-rc.26 ([a20b40e](https://github.com/weyoss/redis-smq/commit/a20b40ec343ab07a1a0ef80f4bf7625ed27ba9ec))
+
+## [8.0.0-rc.26](https://github.com/weyoss/redis-smq/compare/v8.0.0-rc.25...v8.0.0-rc.26) (2025-01-09)
+
+
+### Documentation
+* update API reference ([b7d0f6f](https://github.com/weyoss/redis-smq/commit/b7d0f6f4e078557021854d33fd301980dab7782b))
+
+### Codebase Refactoring
+* use queue-scoped workers instead of global ones ([ada94e0](https://github.com/weyoss/redis-smq/commit/ada94e09d17f58488b1596c70b4f657110cc8b79))
+
+### Continuous Integration
+* add support for node.js v22 ([a15d62e](https://github.com/weyoss/redis-smq/commit/a15d62e49b609fb63b90082af53a0a23613677e8))
+* upgrade eslint and other deprecated dependencies ([c948298](https://github.com/weyoss/redis-smq/commit/c94829850c5cf04ca3240163669c242ba50ba9e2))
 
 ## [8.0.0-rc.25](https://github.com/weyoss/redis-smq/compare/v8.0.0-rc.24...v8.0.0-rc.25) (2024-07-07)
 

package/dist/cjs/src/common/redis-client/scripts/lua/delete-message.lua

@@ -1,9 +1,3 @@
-local keyScheduledMessages = KEYS[1]
-local keyDelayedMessages = KEYS[2]
-local keyRequeueMessages = KEYS[3]
-
----
-
 local EQueuePropertyQueueType = ARGV[1]
 local EQueuePropertyMessagesCount = ARGV[2]
 local EQueuePropertyQueueTypePriorityQueue = ARGV[3]
@@ -20,12 +14,14 @@ local EMessagePropertyStatusUnackRequeuing = ARGV[13]
 
 ---
 
+local keyQueueScheduled = ''
+local keyQueueDelayed = ''
+local keyQueueRequeued = ''
 local keyMessage = ''
 local keyQueueProperties = ''
 local keyQueuePending = ''
 local keyQueueDL = ''
 local keyQueueAcknowledged = ''
-local keyQueueScheduled = ''
 local keyQueuePriorityPending = ''
 
 ---
@@ -34,7 +30,7 @@ local messageId = ''
 
 ---
 
-local keyIndexOffset = 3
+local keyIndexOffset = 0
 local argvIndexOffset = 13
 
 ---
@@ -57,12 +53,11 @@ local function deleteMessage()
     elseif messageStatus == EMessagePropertyStatusDeadLettered then
         deleted = redis.call("LREM", keyQueueDL, 1, messageId)
     elseif messageStatus == EMessagePropertyStatusScheduled then
-        deleted = redis.call("ZREM", keyScheduledMessages, messageId)
-        redis.call("ZREM", keyQueueScheduled, messageId)
+        deleted = redis.call("ZREM", keyQueueScheduled, messageId)
     elseif messageStatus == EMessagePropertyStatusUnackDelaying then
-        deleted = redis.call("LREM", keyDelayedMessages, 1, messageId)
+        deleted = redis.call("LREM", keyQueueDelayed, 1, messageId)
     elseif messageStatus == EMessagePropertyStatusUnackRequeuing then
-        deleted = redis.call("LREM", keyRequeueMessages, 1, messageId)
+        deleted = redis.call("LREM", keyQueueRequeued, 1, messageId)
     elseif messageStatus == EMessagePropertyStatusPending then
         local queueType = redis.call("HGET", keyQueueProperties, EQueuePropertyQueueType)
         if queueType ~= false then
@@ -87,14 +82,16 @@ if #ARGV > argvIndexOffset then
     for index in pairs(ARGV) do
         if (index > argvIndexOffset) then
             messageId = ARGV[index]
-            keyMessage = KEYS[keyIndexOffset + 1]
-            keyQueueProperties = KEYS[keyIndexOffset + 2]
-            keyQueuePending = KEYS[keyIndexOffset + 3]
-            keyQueueDL = KEYS[keyIndexOffset + 4]
-            keyQueueAcknowledged = KEYS[keyIndexOffset + 5]
-            keyQueueScheduled = KEYS[keyIndexOffset + 6]
-            keyQueuePriorityPending = KEYS[keyIndexOffset + 7]
-            keyIndexOffset = keyIndexOffset + 7
+            keyQueueScheduled = KEYS[keyIndexOffset + 1]
+            keyQueueDelayed = KEYS[keyIndexOffset + 2]
+            keyQueueRequeued = KEYS[keyIndexOffset + 3]
+            keyMessage = KEYS[keyIndexOffset + 4]
+            keyQueueProperties = KEYS[keyIndexOffset + 5]
+            keyQueuePending = KEYS[keyIndexOffset + 6]
+            keyQueueDL = KEYS[keyIndexOffset + 7]
+            keyQueueAcknowledged = KEYS[keyIndexOffset + 8]
+            keyQueuePriorityPending = KEYS[keyIndexOffset + 9]
+            keyIndexOffset = keyIndexOffset + 9
             deleteMessageStatus = deleteMessage()
             if deleteMessageStatus ~= 'OK' then
                 break

package/dist/cjs/src/common/redis-client/scripts/lua/handle-processing-queue.lua

@@ -1,9 +1,3 @@
-local keyProcessingQueues = KEYS[1]
-local keyDelayedMessages = KEYS[2]
-local keyRequeueMessages = KEYS[3]
-
----
-
 local ERetryActionDelay = ARGV[1]
 local ERetryActionRequeue = ARGV[2]
 local ERetryActionDeadLetter = ARGV[3]
@@ -16,12 +10,14 @@ local EMessageUnacknowledgedCauseOfflineHandler = ARGV[9]
 
 ---
 
-local keyIndexOffset = 3
+local keyIndexOffset = 0
 local argvIndexOffset = 9
 
 ---
 
 local keyQueueProcessing = ''
+local keyQueueDelayed = ''
+local keyQueueRequeued = ''
 local keyQueueDL = ''
 local keyQueueProcessingQueues = ''
 local keyQueueConsumers = ''
@@ -47,15 +43,19 @@ local function removeQueueConsumer()
     if queue ~= '' then
         redis.call("HDEL", keyQueueConsumers, consumerId)
         redis.call("SREM", keyConsumerQueues, queue)
+        local size = redis.call("SCARD", keyConsumerQueues)
+        if size == 0 then
+            redis.call("DEL", keyConsumerQueues)
+        end
     end
 end
 
 local function retryMessage()
     if messageId ~= '' then
         if retryAction == ERetryActionRequeue then
-            redis.call("RPOPLPUSH", keyQueueProcessing, keyRequeueMessages)
+            redis.call("RPOPLPUSH", keyQueueProcessing, keyQueueRequeued)
         elseif retryAction == ERetryActionDelay then
-            redis.call("RPOPLPUSH", keyQueueProcessing, keyDelayedMessages)
+            redis.call("RPOPLPUSH", keyQueueProcessing, keyQueueDelayed)
         else
             if storeMessages == '1' then
                 redis.call("LREM", keyQueueProcessing, 1, messageId)
@@ -76,7 +76,6 @@ end
 
 local function deleteProcessingQueue()
     if keyQueueProcessing ~= '' then
-        redis.call("SREM", keyProcessingQueues, keyQueueProcessing)
         redis.call("HDEL", keyQueueProcessingQueues, keyQueueProcessing)
         redis.call("DEL", keyQueueProcessing)
     end
@@ -91,13 +90,15 @@ if #ARGV > argvIndexOffset then
             if relativeIndex == 3 then
                 queue = ARGV[index]
                 keyQueueProcessing = KEYS[keyIndexOffset + 1]
-                keyQueueDL = KEYS[keyIndexOffset + 2]
-                keyQueueProcessingQueues = KEYS[keyIndexOffset + 3]
-                keyQueueConsumers = KEYS[keyIndexOffset + 4]
-                keyConsumerQueues = KEYS[keyIndexOffset + 5]
-                keyQueueProperties = KEYS[keyIndexOffset + 6]
-                keyMessage = KEYS[keyIndexOffset + 7]
-                keyIndexOffset = keyIndexOffset + 7
+                keyQueueDelayed = KEYS[keyIndexOffset + 2];
+                keyQueueRequeued = KEYS[keyIndexOffset + 3];
+                keyQueueDL = KEYS[keyIndexOffset + 4]
+                keyQueueProcessingQueues = KEYS[keyIndexOffset + 5]
+                keyQueueConsumers = KEYS[keyIndexOffset + 6]
+                keyConsumerQueues = KEYS[keyIndexOffset + 7]
+                keyQueueProperties = KEYS[keyIndexOffset + 8]
+                keyMessage = KEYS[keyIndexOffset + 9]
+                keyIndexOffset = keyIndexOffset + 9
             elseif relativeIndex == 4 then
                 consumerId = ARGV[index]
             elseif relativeIndex == 5 then

package/dist/cjs/src/common/redis-client/scripts/lua/init-consumer-queue.lua

@@ -1,8 +1,7 @@
 local keyQueues = KEYS[1]
 local keyQueueConsumers = KEYS[2]
 local keyConsumerQueues = KEYS[3]
-local keyProcessingQueues = KEYS[4]
-local keyQueueProcessingQueues = KEYS[5]
+local keyQueueProcessingQueues = KEYS[4]
 
 ---
 
@@ -15,7 +14,6 @@ if redis.call("SISMEMBER", keyQueues, queue) == 1 then
     redis.call("SADD", keyConsumerQueues, queue)
     redis.call("HSET", keyQueueConsumers, consumerId, consumerInfo)
     redis.call("HSET", keyQueueProcessingQueues, consumerProcessingQueue, consumerId)
-    redis.call("SADD", keyProcessingQueues, consumerProcessingQueue)
     return 1
 end
 return 0

package/dist/cjs/src/common/redis-client/scripts/lua/publish-scheduled-message.lua

@@ -1,7 +1,3 @@
-local keyScheduledMessages = KEYS[1]
-
----
-
 local EMessagePropertyStatus = ARGV[1]
 local EMessagePropertyStatusPending = ARGV[2]
 local EMessagePropertyState = ARGV[3]
@@ -32,7 +28,7 @@ local scheduledMessageState = ''
 
 ---
 
-local keyIndexOffset = 1
+local keyIndexOffset = 0
 local argvIndexOffset = 9
 
 ---
@@ -66,7 +62,6 @@ local function deletedScheduledMessage(updateMessageCount)
 end
 
 local function removeFromScheduled()
-    redis.call("ZREM", keyScheduledMessages, scheduledMessageId)
     redis.call("ZREM", keyQueueScheduled, scheduledMessageId)
 end
 
@@ -83,7 +78,6 @@ local function updateScheduledMessageProperties(status)
 end
 
 local function scheduleMessage()
-    redis.call("ZADD", keyScheduledMessages, scheduledMessageNextScheduleTimestamp, scheduledMessageId)
     redis.call("ZADD", keyQueueScheduled, scheduledMessageNextScheduleTimestamp, scheduledMessageId)
 end
 
@@ -121,8 +115,8 @@ if #ARGV > argvIndexOffset then
                 messageId = ARGV[index]
                 keyMessage = KEYS[keyIndexOffset + 1]
                 keyQueuePending = KEYS[keyIndexOffset + 2]
-                keyQueueProperties = KEYS[keyIndexOffset + 3]
-                keyQueueMessages = KEYS[keyIndexOffset + 4]
+                keyQueueMessages = KEYS[keyIndexOffset + 3]
+                keyQueueProperties = KEYS[keyIndexOffset + 4]
                 keyQueuePriorityPending = KEYS[keyIndexOffset + 5]
                 keyQueueScheduled = KEYS[keyIndexOffset + 6]
                 keyScheduledMessage = KEYS[keyIndexOffset + 7]

package/dist/cjs/src/common/redis-client/scripts/lua/requeue-message.lua

@@ -1,4 +1,5 @@
 local keyFromQueue = KEYS[1]
+local keyQueueProperties = KEYS[2]
 
 ---
 
@@ -12,7 +13,6 @@ local EMessagePropertyState = ARGV[7]
 
 ---
 
-local keyQueueProperties = ''
 local keyQueuePriority = ''
 local keyQueuePending = ''
 local keyMessage = ''
@@ -23,7 +23,7 @@ local messageState = ''
 
 ---
 
-local keyIndexOffset = 1
+local keyIndexOffset = 2
 local argvIndexOffset = 7
 
 ---
@@ -62,11 +62,10 @@ if #ARGV > argvIndexOffset then
             local idx = index % 3
             if idx == 2 then
                 messageId = ARGV[index]
-                keyQueueProperties = KEYS[keyIndexOffset + 1]
-                keyQueuePriority = KEYS[keyIndexOffset + 2]
-                keyQueuePending = KEYS[keyIndexOffset + 3]
-                keyMessage = KEYS[keyIndexOffset + 4]
-                keyIndexOffset = keyIndexOffset + 4
+                keyQueuePriority = KEYS[keyIndexOffset + 1]
+                keyQueuePending = KEYS[keyIndexOffset + 2]
+                keyMessage = KEYS[keyIndexOffset + 3]
+                keyIndexOffset = keyIndexOffset + 3;
             elseif idx == 0 then
                 messagePriority = ARGV[index]
             elseif idx == 1 then

package/dist/cjs/src/common/redis-client/scripts/lua/schedule-message.lua

@@ -1,7 +1,3 @@
-local keyScheduledMessages = KEYS[1]
-local keyDelayedMessages = KEYS[2]
----
-
 local EQueuePropertyQueueType = ARGV[1]
 local EQueuePropertyMessagesCount = ARGV[2]
 local EMessagePropertyMessage = ARGV[3]
@@ -16,6 +12,7 @@ local keyQueueMessages = ''
 local keyQueueProperties = ''
 local keyMessage = ''
 local keyQueueScheduled = ''
+local keyQueueDelayed = ''
 
 ---
 
@@ -26,7 +23,7 @@ local messageState = ''
 
 ---
 
-local keyIndexOffset = 2
+local keyIndexOffset = 0
 local argvIndexOffset = 7
 
 ---
@@ -71,7 +68,8 @@ if #ARGV > argvIndexOffset then
                 keyQueueProperties = KEYS[keyIndexOffset + 2]
                 keyMessage = KEYS[keyIndexOffset + 3]
                 keyQueueScheduled = KEYS[keyIndexOffset + 4]
-                keyIndexOffset = keyIndexOffset + 4
+                keyQueueDelayed = KEYS[keyIndexOffset + 5]
+                keyIndexOffset = keyIndexOffset + 5
             elseif idx == 1 then
                 message = ARGV[index]
             elseif idx == 2 then
@@ -81,12 +79,11 @@ if #ARGV > argvIndexOffset then
                 local found = checkQueue()
                 if found == 'OK' then
                     if scheduleFromDelayed == '1' then
-                        redis.call("LREM", keyDelayedMessages, 1, messageId)
+                        redis.call("LREM", keyQueueDelayed, 1, messageId)
                         updateMessageState()
                     else
                         saveMessage()
                     end
-                    redis.call("ZADD", keyScheduledMessages, scheduleTimestamp, messageId)
                     redis.call("ZADD", keyQueueScheduled, scheduleTimestamp, messageId)
                 else
                     return found

package/dist/cjs/src/common/redis-keys/redis-keys.d.ts

@@ -11,12 +11,15 @@ export declare const redisKeys: {
         keyQueueProcessingQueues: string;
         keyQueueAcknowledged: string;
         keyQueueScheduled: string;
+        keyQueueRequeued: string;
+        keyQueueDelayed: string;
         keyQueueConsumers: string;
         keyQueueRateLimitCounter: string;
         keyQueueProperties: string;
         keyQueueMessages: string;
         keyQueueMessageIds: string;
         keyQueueConsumerGroups: string;
+        keyQueueWorkersLock: string;
     };
     getMessageKeys(messageId: string): {
         keyMessage: string;
@@ -26,11 +29,12 @@ export declare const redisKeys: {
     };
     getConsumerKeys(instanceId: string): {
         keyConsumerQueues: string;
+        keyConsumerHeartbeat: string;
     };
     getQueueConsumerKeys(queueParams: IQueueParams, instanceId: string): {
         keyQueueProcessing: string;
     };
-    getMainKeys(): Record<"keyQueues" | "keyProcessingQueues" | "keyHeartbeats" | "keyHeartbeatTimestamps" | "keyScheduledMessages" | "keyLockConsumerWorkersRunner" | "keyDelayedMessages" | "keyRequeueMessages" | "keyNamespaces" | "keyFanOutExchanges" | "keyDeletedQueues", string>;
+    getMainKeys(): Record<"keyQueues" | "keyNamespaces" | "keyFanOutExchanges", string>;
     validateNamespace(ns: string): string | RedisKeysInvalidKeyError;
     validateRedisKey(key: string | null | undefined): string | RedisKeysInvalidKeyError;
     getKeySegmentSeparator(): string;

package/dist/cjs/src/common/redis-keys/redis-keys.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.redisKeys = void 0;
 const index_js_1 = require("./errors/index.js");
 const keySegmentSeparator = ':';
-const nsPrefix = 'redis-smq-rc815';
+const nsPrefix = 'redis-smq-rc826';
 const globalNamespace = 'global';
 var ERedisKey;
 (function (ERedisKey) {
@@ -13,28 +13,24 @@ var ERedisKey;
     ERedisKey[ERedisKey["KEY_QUEUE_PROCESSING"] = 4] = "KEY_QUEUE_PROCESSING";
     ERedisKey[ERedisKey["KEY_QUEUE_ACKNOWLEDGED"] = 5] = "KEY_QUEUE_ACKNOWLEDGED";
     ERedisKey[ERedisKey["KEY_QUEUE_SCHEDULED"] = 6] = "KEY_QUEUE_SCHEDULED";
-    ERedisKey[ERedisKey["KEY_QUEUE_CONSUMERS"] = 7] = "KEY_QUEUE_CONSUMERS";
-    ERedisKey[ERedisKey["KEY_QUEUE_PROCESSING_QUEUES"] = 8] = "KEY_QUEUE_PROCESSING_QUEUES";
-    ERedisKey[ERedisKey["KEY_LOCK_CONSUMER_WORKERS_RUNNER"] = 9] = "KEY_LOCK_CONSUMER_WORKERS_RUNNER";
-    ERedisKey[ERedisKey["KEY_DELAYED_MESSAGES"] = 10] = "KEY_DELAYED_MESSAGES";
-    ERedisKey[ERedisKey["KEY_REQUEUE_MESSAGES"] = 11] = "KEY_REQUEUE_MESSAGES";
-    ERedisKey[ERedisKey["KEY_SCHEDULED_MESSAGES"] = 12] = "KEY_SCHEDULED_MESSAGES";
-    ERedisKey[ERedisKey["KEY_HEARTBEATS"] = 13] = "KEY_HEARTBEATS";
-    ERedisKey[ERedisKey["KEY_HEARTBEAT_CONSUMER_WEIGHT"] = 14] = "KEY_HEARTBEAT_CONSUMER_WEIGHT";
-    ERedisKey[ERedisKey["KEY_QUEUES"] = 15] = "KEY_QUEUES";
-    ERedisKey[ERedisKey["KEY_PROCESSING_QUEUES"] = 16] = "KEY_PROCESSING_QUEUES";
-    ERedisKey[ERedisKey["KEY_CONSUMER_QUEUES"] = 17] = "KEY_CONSUMER_QUEUES";
-    ERedisKey[ERedisKey["KEY_NS_QUEUES"] = 18] = "KEY_NS_QUEUES";
-    ERedisKey[ERedisKey["KEY_NAMESPACES"] = 19] = "KEY_NAMESPACES";
-    ERedisKey[ERedisKey["KEY_QUEUE_RATE_LIMIT_COUNTER"] = 20] = "KEY_QUEUE_RATE_LIMIT_COUNTER";
-    ERedisKey[ERedisKey["KEY_QUEUE_PROPERTIES"] = 21] = "KEY_QUEUE_PROPERTIES";
+    ERedisKey[ERedisKey["KEY_QUEUE_DELAYED"] = 7] = "KEY_QUEUE_DELAYED";
+    ERedisKey[ERedisKey["KEY_QUEUE_REQUEUED"] = 8] = "KEY_QUEUE_REQUEUED";
+    ERedisKey[ERedisKey["KEY_QUEUE_CONSUMERS"] = 9] = "KEY_QUEUE_CONSUMERS";
+    ERedisKey[ERedisKey["KEY_QUEUE_PROCESSING_QUEUES"] = 10] = "KEY_QUEUE_PROCESSING_QUEUES";
+    ERedisKey[ERedisKey["KEY_QUEUE_WORKERS_LOCK"] = 11] = "KEY_QUEUE_WORKERS_LOCK";
+    ERedisKey[ERedisKey["KEY_QUEUE_RATE_LIMIT_COUNTER"] = 12] = "KEY_QUEUE_RATE_LIMIT_COUNTER";
+    ERedisKey[ERedisKey["KEY_QUEUE_PROPERTIES"] = 13] = "KEY_QUEUE_PROPERTIES";
+    ERedisKey[ERedisKey["KEY_QUEUE_MESSAGES"] = 14] = "KEY_QUEUE_MESSAGES";
+    ERedisKey[ERedisKey["KEY_QUEUE_MESSAGE_IDS"] = 15] = "KEY_QUEUE_MESSAGE_IDS";
+    ERedisKey[ERedisKey["KEY_QUEUE_CONSUMER_GROUPS"] = 16] = "KEY_QUEUE_CONSUMER_GROUPS";
+    ERedisKey[ERedisKey["KEY_QUEUES"] = 17] = "KEY_QUEUES";
+    ERedisKey[ERedisKey["KEY_CONSUMER_QUEUES"] = 18] = "KEY_CONSUMER_QUEUES";
+    ERedisKey[ERedisKey["KEY_CONSUMER_HEARTBEAT"] = 19] = "KEY_CONSUMER_HEARTBEAT";
+    ERedisKey[ERedisKey["KEY_NS_QUEUES"] = 20] = "KEY_NS_QUEUES";
+    ERedisKey[ERedisKey["KEY_NAMESPACES"] = 21] = "KEY_NAMESPACES";
     ERedisKey[ERedisKey["KEY_EXCHANGE_BINDINGS"] = 22] = "KEY_EXCHANGE_BINDINGS";
     ERedisKey[ERedisKey["KEY_FANOUT_EXCHANGES"] = 23] = "KEY_FANOUT_EXCHANGES";
     ERedisKey[ERedisKey["KEY_MESSAGE"] = 24] = "KEY_MESSAGE";
-    ERedisKey[ERedisKey["KEY_QUEUE_MESSAGES"] = 25] = "KEY_QUEUE_MESSAGES";
-    ERedisKey[ERedisKey["KEY_QUEUE_MESSAGE_IDS"] = 26] = "KEY_QUEUE_MESSAGE_IDS";
-    ERedisKey[ERedisKey["KEY_DELETED_QUEUES"] = 27] = "KEY_DELETED_QUEUES";
-    ERedisKey[ERedisKey["KEY_QUEUE_CONSUMER_GROUPS"] = 28] = "KEY_QUEUE_CONSUMER_GROUPS";
 })(ERedisKey || (ERedisKey = {}));
 function makeNamespacedKeys(keys, namespace, ...rest) {
     const result = {};
@@ -56,12 +52,15 @@ exports.redisKeys = {
             keyQueueProcessingQueues: ERedisKey.KEY_QUEUE_PROCESSING_QUEUES,
             keyQueueAcknowledged: ERedisKey.KEY_QUEUE_ACKNOWLEDGED,
             keyQueueScheduled: ERedisKey.KEY_QUEUE_SCHEDULED,
+            keyQueueRequeued: ERedisKey.KEY_QUEUE_REQUEUED,
+            keyQueueDelayed: ERedisKey.KEY_QUEUE_DELAYED,
             keyQueueConsumers: ERedisKey.KEY_QUEUE_CONSUMERS,
             keyQueueRateLimitCounter: ERedisKey.KEY_QUEUE_RATE_LIMIT_COUNTER,
             keyQueueProperties: ERedisKey.KEY_QUEUE_PROPERTIES,
             keyQueueMessages: ERedisKey.KEY_QUEUE_MESSAGES,
             keyQueueMessageIds: ERedisKey.KEY_QUEUE_MESSAGE_IDS,
             keyQueueConsumerGroups: ERedisKey.KEY_QUEUE_CONSUMER_GROUPS,
+            keyQueueWorkersLock: ERedisKey.KEY_QUEUE_WORKERS_LOCK,
         };
         const pendingKeys = {
             keyQueuePending: ERedisKey.KEY_QUEUE_PENDING,
@@ -85,6 +84,7 @@ exports.redisKeys = {
     getConsumerKeys(instanceId) {
         const consumerKeys = {
             keyConsumerQueues: ERedisKey.KEY_CONSUMER_QUEUES,
+            keyConsumerHeartbeat: ERedisKey.KEY_CONSUMER_HEARTBEAT,
         };
         return Object.assign({}, makeNamespacedKeys(consumerKeys, globalNamespace, instanceId));
     },
@@ -97,16 +97,8 @@ exports.redisKeys = {
     getMainKeys() {
         const mainKeys = {
             keyQueues: ERedisKey.KEY_QUEUES,
-            keyProcessingQueues: ERedisKey.KEY_PROCESSING_QUEUES,
-            keyHeartbeats: ERedisKey.KEY_HEARTBEATS,
-            keyHeartbeatTimestamps: ERedisKey.KEY_HEARTBEAT_CONSUMER_WEIGHT,
-            keyScheduledMessages: ERedisKey.KEY_SCHEDULED_MESSAGES,
-            keyLockConsumerWorkersRunner: ERedisKey.KEY_LOCK_CONSUMER_WORKERS_RUNNER,
-            keyDelayedMessages: ERedisKey.KEY_DELAYED_MESSAGES,
-            keyRequeueMessages: ERedisKey.KEY_REQUEUE_MESSAGES,
             keyNamespaces: ERedisKey.KEY_NAMESPACES,
             keyFanOutExchanges: ERedisKey.KEY_FANOUT_EXCHANGES,
-            keyDeletedQueues: ERedisKey.KEY_DELETED_QUEUES,
         };
         return makeNamespacedKeys(mainKeys, globalNamespace);
     },

package/dist/cjs/src/common/types/event.d.ts

@@ -1,12 +1,12 @@
-import { EConsumeMessageDeadLetterCause, EConsumeMessageUnacknowledgedCause, IConsumerHeartbeat, IQueueParams, IQueueParsedParams, IQueueProperties } from '../../lib/index.js';
+import { EMessageUnknowledgmentDeadLetterReason, EMessageUnknowledgmentReason, IConsumerHeartbeat, IQueueParams, IQueueParsedParams, IQueueProperties } from '../../lib/index.js';
 export type TConsumerHeartbeatEvent = {
     'consumerHeartbeat.heartbeat': (consumerId: string, timestamp: number, heartbeatPayload: IConsumerHeartbeat) => void;
     'consumerHeartbeat.error': (err: Error) => void;
 };
 export type TConsumerConsumeMessageEvent = {
     'consumer.consumeMessage.messageAcknowledged': (messageId: string, queue: IQueueParsedParams, messageHandlerId: string, consumerId: string) => void;
-    'consumer.consumeMessage.messageUnacknowledged': (messageId: string, queue: IQueueParsedParams, messageHandlerId: string, consumerId: string, cause: EConsumeMessageUnacknowledgedCause) => void;
-    'consumer.consumeMessage.messageDeadLettered': (messageId: string, queue: IQueueParsedParams, messageHandlerId: string, consumerId: string, cause: EConsumeMessageDeadLetterCause) => void;
+    'consumer.consumeMessage.messageUnacknowledged': (messageId: string, queue: IQueueParsedParams, messageHandlerId: string, consumerId: string, unknowledgmentReason: EMessageUnknowledgmentReason) => void;
+    'consumer.consumeMessage.messageDeadLettered': (messageId: string, queue: IQueueParsedParams, messageHandlerId: string, consumerId: string, deadLetterReason: EMessageUnknowledgmentDeadLetterReason) => void;
     'consumer.consumeMessage.messageRequeued': (messageId: string, queue: IQueueParsedParams, messageHandlerId: string, consumerId: string) => void;
     'consumer.consumeMessage.messageDelayed': (messageId: string, queue: IQueueParsedParams, messageHandlerId: string, consumerId: string) => void;
     'consumer.consumeMessage.error': (err: Error, consumerId: string, queue: IQueueParsedParams) => void;

package/dist/cjs/src/config/messages/store.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const configuration_message_queue_size_error_js_1 = require("../errors/configuration-message-queue-size.error.js");
-const configuration_message_store_expire_error_js_1 = require("../errors/configuration-message-store-expire.error.js");
+const index_js_1 = require("../errors/index.js");
 function getMessageStorageConfig(config, key) {
     var _a;
     const { store } = (_a = config.messages) !== null && _a !== void 0 ? _a : {};
@@ -25,11 +24,11 @@ function getMessageStorageParams(config, key) {
     }
     const queueSize = Number((_a = params.queueSize) !== null && _a !== void 0 ? _a : 0);
     if (isNaN(queueSize) || queueSize < 0) {
-        throw new configuration_message_queue_size_error_js_1.ConfigurationMessageQueueSizeError();
+        throw new index_js_1.ConfigurationMessageQueueSizeError();
     }
     const expire = Number((_b = params.expire) !== null && _b !== void 0 ? _b : 0);
     if (isNaN(expire) || expire < 0) {
-        throw new configuration_message_store_expire_error_js_1.ConfigurationMessageStoreExpireError();
+        throw new index_js_1.ConfigurationMessageStoreExpireError();
     }
     return {
         store: true,

package/dist/cjs/src/config/namespace.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const redis_keys_js_1 = require("../common/redis-keys/redis-keys.js");
-const configuration_namespace_error_js_1 = require("./errors/configuration-namespace.error.js");
+const index_js_1 = require("./errors/index.js");
 const defaultNamespace = 'default';
 function Namespace(userConfig) {
     if (!userConfig.namespace)
         return defaultNamespace;
     const ns = redis_keys_js_1.redisKeys.validateNamespace(userConfig.namespace);
     if (ns instanceof Error)
-        throw new configuration_namespace_error_js_1.ConfigurationNamespaceError();
+        throw new index_js_1.ConfigurationNamespaceError();
     return ns;
 }
 exports.default = Namespace;

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

@@ -1,4 +1,4 @@
-import { ICallback, ILogger, Runnable, TRedisClientEvent, TUnaryFunction, WorkerResourceGroup } from 'redis-smq-common';
+import { ICallback, ILogger, Runnable, TRedisClientEvent, TUnaryFunction } from 'redis-smq-common';
 import { TConsumerEvent } from '../../../common/index.js';
 import { IQueueParsedParams, TQueueExtendedParams } from '../../queue/index.js';
 import { ConsumerHeartbeat } from '../consumer-heartbeat/consumer-heartbeat.js';
@@ -10,13 +10,10 @@ export declare class Consumer extends Runnable<TConsumerEvent> {
     protected redisClient: import("../../../common/redis-client/redis-client-instance.js").RedisClientInstance;
     protected eventBus: import("../../index.js").EventBusRedisInstance | undefined;
     protected heartbeat: ConsumerHeartbeat | null;
-    protected workerResourceGroup: WorkerResourceGroup | null;
     constructor(enableMultiplexing?: boolean);
     protected onRedisError: TRedisClientEvent['error'];
     protected setUpHeartbeat: (cb: ICallback<void>) => void;
     protected shutDownHeartbeat: (cb: ICallback<void>) => void;
-    protected setUpConsumerWorkers: (cb: ICallback<void>) => void;
-    protected shutDownConsumerWorkers: (cb: ICallback<void>) => void;
     protected runMessageHandlers: (cb: ICallback<void>) => void;
     protected shutdownMessageHandlers: (cb: ICallback<void>) => void;
     protected initRedisClient: (cb: ICallback<void>) => void;

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

@@ -1,17 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Consumer = void 0;
-const path_1 = __importDefault(require("path"));
 const redis_smq_common_1 = require("redis-smq-common");
 const redis_client_factory_js_1 = require("../../../common/redis-client/redis-client-factory.js");
-const redis_keys_js_1 = require("../../../common/redis-keys/redis-keys.js");
 const index_js_1 = require("../../../config/index.js");
 const event_bus_redis_factory_js_1 = require("../../event-bus/event-bus-redis-factory.js");
 const _parse_queue_extended_params_js_1 = require("../../queue/_/_parse-queue-extended-params.js");
-const _cleanup_offline_consumer_js_1 = require("../consumer-heartbeat/_/_cleanup-offline-consumer.js");
 const consumer_heartbeat_js_1 = require("../consumer-heartbeat/consumer-heartbeat.js");
 const message_handler_runner_js_1 = require("../message-handler-runner/message-handler-runner.js");
 const multiplexed_message_handler_runner_js_1 = require("../message-handler-runner/multiplexed-message-handler-runner.js");
@@ -20,7 +14,6 @@ class Consumer extends redis_smq_common_1.Runnable {
     constructor(enableMultiplexing) {
         super();
         this.heartbeat = null;
-        this.workerResourceGroup = null;
         this.onRedisError = (error) => {
             this.handleError(error);
         };
@@ -39,42 +32,6 @@ class Consumer extends redis_smq_common_1.Runnable {
             else
                 cb();
         };
-        this.setUpConsumerWorkers = (cb) => {
-            const config = index_js_1.Configuration.getSetConfig();
-            const { keyLockConsumerWorkersRunner } = redis_keys_js_1.redisKeys.getMainKeys();
-            const nsLogger = redis_smq_common_1.logger.getLogger(config.logger, `consumer:${this.id}:worker-runner`);
-            const redisClient = this.redisClient.getInstance();
-            if (redisClient instanceof Error) {
-                cb(redisClient);
-                return void 0;
-            }
-            this.workerResourceGroup = new redis_smq_common_1.WorkerResourceGroup(redisClient, nsLogger, keyLockConsumerWorkersRunner);
-            this.workerResourceGroup.on('workerResourceGroup.error', (err) => this.handleError(err));
-            const workersDir = path_1.default.resolve((0, redis_smq_common_1.getDirname)(), '../workers');
-            this.workerResourceGroup.loadFromDir(workersDir, config, (err) => {
-                var _a;
-                if (err)
-                    cb(err);
-                else {
-                    (_a = this.workerResourceGroup) === null || _a === void 0 ? void 0 : _a.run((err) => {
-                        if (err)
-                            this.handleError(err);
-                    });
-                    cb();
-                }
-            });
-        };
-        this.shutDownConsumerWorkers = (cb) => {
-            if (this.workerResourceGroup) {
-                this.workerResourceGroup.shutdown(() => {
-                    this.workerResourceGroup = null;
-                    cb();
-                });
-            }
-            else {
-                cb();
-            }
-        };
         this.runMessageHandlers = (cb) => {
             this.messageHandlerRunner.run((err) => cb(err));
         };
@@ -123,23 +80,13 @@ class Consumer extends redis_smq_common_1.Runnable {
             this.initRedisClient,
             this.setUpHeartbeat,
             this.runMessageHandlers,
-            this.setUpConsumerWorkers,
         ]);
     }
     goingDown() {
         this.emit('consumer.goingDown', this.id);
         return [
-            this.shutDownConsumerWorkers,
             this.shutdownMessageHandlers,
             this.shutDownHeartbeat,
-            (cb) => {
-                const redisClient = this.redisClient.getInstance();
-                if (redisClient instanceof Error) {
-                    cb();
-                    return void 0;
-                }
-                (0, _cleanup_offline_consumer_js_1._cleanupOfflineConsumer)(redisClient, [this.id], cb);
-            },
             this.shutDownRedisClient,
         ].concat(super.goingDown());
     }

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

@@ -1,25 +1,21 @@
-import { ICallback, ILogger, IRedisClient, IRedisTransaction, Runnable, Timer } from 'redis-smq-common';
+import { ICallback, ILogger, IRedisClient, Runnable, Timer } from 'redis-smq-common';
 import { TConsumerHeartbeatEvent } from '../../../common/index.js';
 import { Consumer } from '../consumer/consumer.js';
 import { IConsumerHeartbeat } from '../types/index.js';
 export declare class ConsumerHeartbeat extends Runnable<TConsumerHeartbeatEvent> {
     protected static readonly heartbeatTTL: number;
     protected timer: Timer;
-    protected keyHeartbeats: string;
-    protected keyHeartbeatTimestamps: string;
+    protected keyConsumerHeartbeat: string;
     protected consumer: Consumer;
     protected logger: ILogger;
     protected redisClient: import("../../../common/redis-client/redis-client-instance.js").RedisClientInstance;
     protected eventBus: import("../../index.js").EventBusRedisInstance | undefined;
     constructor(consumer: Consumer, logger: ILogger);
-    protected static isExpiredHeartbeat(heartbeat: IConsumerHeartbeat): boolean;
     protected getLogger(): ILogger;
     protected getPayload(): IConsumerHeartbeat;
     protected beat(): void;
     protected goingUp(): ((cb: ICallback<void>) => void)[];
     protected goingDown(): ((cb: ICallback<void>) => void)[];
-    static getConsumersHeartbeats(redisClient: IRedisClient, consumerIds: string[], cb: ICallback<Record<string, IConsumerHeartbeat | false>>): void;
-    static getExpiredHeartbeatIds(redisClient: IRedisClient, offset: number, count: number, cb: ICallback<string[]>): void;
-    static handleExpiredHeartbeatId(consumerId: string | string[], multi: IRedisTransaction): void;
+    static isConsumerAlive(redisClient: IRedisClient, consumerId: string, cb: ICallback<boolean>): void;
 }
 //# sourceMappingURL=consumer-heartbeat.d.ts.map