bullmq 5.77.3 → 5.77.5

package/dist/cjs/classes/redis-connection.js

@@ -23,6 +23,13 @@ const clusterOriginalBzpopmin = Symbol('bullmqClusterOriginalBzpopmin');
 const clusterWrappedBzpopmin = Symbol('bullmqClusterWrappedBzpopmin');
 const clusterPatchRefCount = Symbol('bullmqClusterPatchRefCount');
 const clusterClosingRefCount = Symbol('bullmqClusterClosingRefCount');
+// Hard cap on a single cluster reconnect attempt. Without this, a hung
+// `client.connect()` (e.g. ioredis Cluster cannot recover and slot refresh
+// keeps retrying internally) leaves `clusterReconnectPromise` pinned forever
+// and every subsequent bzpopmin call awaits the same dead promise, deadlocking
+// the worker. 30s is comfortably above the default ioredis slotsRefreshTimeout
+// while bounded enough that wedged workers recover within one or two ticks.
+const DEFAULT_CLUSTER_RECONNECT_TIMEOUT_MS = 30000;
 class RedisConnection extends events_1.EventEmitter {
     constructor(opts, extraOptions) {
         super();
@@ -36,7 +43,7 @@ class RedisConnection extends events_1.EventEmitter {
         this.packageVersion = version_1.version;
         this.disabledBlockingClusterReconnect = false;
         // Set extra options defaults
-        this.extraOptions = Object.assign({ shared: false, blocking: true, skipVersionCheck: false, skipWaitingForReady: false }, extraOptions);
+        this.extraOptions = Object.assign({ shared: false, blocking: true, skipVersionCheck: false, skipWaitingForReady: false, clusterReconnectTimeoutMs: DEFAULT_CLUSTER_RECONNECT_TIMEOUT_MS }, extraOptions);
         if (!(0, utils_2.isRedisInstance)(opts)) {
             this.checkBlockingOptions(overrideMessage, opts);
             this.opts = Object.assign({ port: 6379, host: '127.0.0.1', retryStrategy: function (times) {
@@ -210,6 +217,7 @@ class RedisConnection extends events_1.EventEmitter {
         return this._client;
     }
     patchBlockingClusterClient() {
+        var _a;
         const client = this._client;
         const blockingClient = client;
         if (!this.extraOptions.blocking ||
@@ -217,6 +225,7 @@ class RedisConnection extends events_1.EventEmitter {
             typeof blockingClient.bzpopmin !== 'function') {
             return;
         }
+        const reconnectTimeoutMs = (_a = this.extraOptions.clusterReconnectTimeoutMs) !== null && _a !== void 0 ? _a : DEFAULT_CLUSTER_RECONNECT_TIMEOUT_MS;
         blockingClient[clusterPatchRefCount] =
             (blockingClient[clusterPatchRefCount] || 0) + 1;
         this.patchedBlockingClusterClient = blockingClient;
@@ -225,7 +234,7 @@ class RedisConnection extends events_1.EventEmitter {
         }
         const bzpopmin = blockingClient.bzpopmin;
         const wrappedBzpopmin = async (...args) => {
-            await RedisConnection.reconnectClusterIfNeeded(blockingClient);
+            await RedisConnection.reconnectClusterIfNeeded(blockingClient, reconnectTimeoutMs);
             try {
                 return await bzpopmin.apply(blockingClient, args);
             }
@@ -233,7 +242,7 @@ class RedisConnection extends events_1.EventEmitter {
                 const commandError = error;
                 if (RedisConnection.shouldReconnectClusterAfterError(blockingClient, commandError)) {
                     try {
-                        await RedisConnection.reconnectCluster(blockingClient);
+                        await RedisConnection.reconnectCluster(blockingClient, reconnectTimeoutMs);
                     }
                     catch (_a) {
                         // Preserve the original command failure if best-effort recovery fails.
@@ -298,10 +307,10 @@ class RedisConnection extends events_1.EventEmitter {
             client.status === 'end' ||
             client.status === 'closing');
     }
-    static async reconnectClusterIfNeeded(client) {
+    static async reconnectClusterIfNeeded(client, timeoutMs) {
         if (!RedisConnection.isReconnectingDisabled(client) &&
             RedisConnection.isClusterWithEmptyNodes(client)) {
-            await RedisConnection.reconnectCluster(client);
+            await RedisConnection.reconnectCluster(client, timeoutMs);
         }
     }
     static shouldReconnectClusterAfterError(client, error) {
@@ -317,20 +326,46 @@ class RedisConnection extends events_1.EventEmitter {
         return (RedisConnection.isClusterWithEmptyNodes(client) ||
             /Command timed out|Failed to refresh slots cache/i.test(message));
     }
-    static async reconnectCluster(client) {
+    static async reconnectCluster(client, timeoutMs) {
         if (RedisConnection.isReconnectingDisabled(client)) {
             return;
         }
         if (!client[clusterReconnectPromise]) {
-            client[clusterReconnectPromise] = (async () => {
-                client.disconnect(false);
-                await client.connect();
-            })().finally(() => {
-                client[clusterReconnectPromise] = null;
-            });
+            client[clusterReconnectPromise] =
+                RedisConnection.connectClusterWithTimeout(client, timeoutMs).finally(() => {
+                    client[clusterReconnectPromise] = null;
+                });
         }
         await client[clusterReconnectPromise];
     }
+    // Disconnects and reconnects a cluster client, racing connect() against a
+    // hard cap so a hung reconnect cannot pin `clusterReconnectPromise`
+    // indefinitely. On timeout, the underlying connect() is left running
+    // (ioredis Cluster handles its own retry/state); we simply stop awaiting it.
+    // The next bzpopmin call's `reconnectClusterIfNeeded` check will trigger a
+    // fresh reconnect if the pool is still empty.
+    static async connectClusterWithTimeout(client, timeoutMs) {
+        client.disconnect(false);
+        let timeoutHandle;
+        try {
+            await Promise.race([
+                client.connect(),
+                new Promise((_, reject) => {
+                    var _a;
+                    timeoutHandle = setTimeout(() => {
+                        reject(new connection_closed_error_1.ConnectionClosedError(`BullMQ: cluster reconnect timed out after ${timeoutMs}ms`));
+                    }, timeoutMs);
+                    // Don't keep the event loop alive solely for this timer.
+                    (_a = timeoutHandle.unref) === null || _a === void 0 ? void 0 : _a.call(timeoutHandle);
+                }),
+            ]);
+        }
+        finally {
+            if (timeoutHandle) {
+                clearTimeout(timeoutHandle);
+            }
+        }
+    }
     async disconnect(wait = true) {
         const client = await this.client;
         if (client.status !== 'end') {

package/dist/cjs/commands/includes/requeueDeduplicatedJob.lua

@@ -17,9 +17,17 @@ local function requeueDeduplicatedJob(prefix, deduplicationId, eventStreamKey,
   local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
   if rcall("EXISTS", deduplicationNextKey) == 1 then
     local nextData = rcall("HMGET", deduplicationNextKey,
-        "name", "data", "opts", "pk", "pd", "pdk", "rjk")
+        "name", "data", "opts", "pk", "pd", "pdk", "rjk", "jid")
 
-    local newJobId = rcall("INCR", prefix .. "id") .. ""
+    -- Always increment the counter to keep it monotonic
+    local nextId = rcall("INCR", prefix .. "id") .. ""
+    local storedJobId = nextData[8] -- index 8 = "jid" (8th field in the HMGET call above)
+    local newJobId
+    if storedJobId then
+      newJobId = storedJobId
+    else
+      newJobId = nextId
+    end
     local newJobIdKey = prefix .. newJobId
     local newOpts = cjson.decode(nextData[3])
     local deduplicationKey = prefix .. "de:" .. deduplicationId

package/dist/cjs/commands/includes/storeDeduplicatedNextJob.lua

@@ -14,7 +14,8 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
         local activeItems = rcall('LRANGE', activeKey, 0, -1)
         if checkItemInList(activeItems, currentDebounceJobId) then
             local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
-            local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts)}
+            local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts),
+                'jid', jobId}
 
             if parentKey then
                 fields[#fields+1] = 'pk'
@@ -36,6 +37,7 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
                 fields[#fields+1] = repeatJobKey
             end
 
+            rcall('DEL', deduplicationNextKey)
             rcall('HSET', deduplicationNextKey, unpack(fields))
 
             -- Ensure the dedup key does not expire while the job is active,

package/dist/cjs/scripts/addDelayedJob-6.js

@@ -155,7 +155,8 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
         local activeItems = rcall('LRANGE', activeKey, 0, -1)
         if checkItemInList(activeItems, currentDebounceJobId) then
             local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
-            local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts)}
+            local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts),
+                'jid', jobId}
             if parentKey then
                 fields[#fields+1] = 'pk'
                 fields[#fields+1] = parentKey
@@ -172,6 +173,7 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
                 fields[#fields+1] = 'rjk'
                 fields[#fields+1] = repeatJobKey
             end
+            rcall('DEL', deduplicationNextKey)
             rcall('HSET', deduplicationNextKey, unpack(fields))
             -- Ensure the dedup key does not expire while the job is active,
             -- so subsequent adds always hit the dedup path and never bypass

package/dist/cjs/scripts/addParentJob-6.js

@@ -86,7 +86,8 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
         local activeItems = rcall('LRANGE', activeKey, 0, -1)
         if checkItemInList(activeItems, currentDebounceJobId) then
             local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
-            local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts)}
+            local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts),
+                'jid', jobId}
             if parentKey then
                 fields[#fields+1] = 'pk'
                 fields[#fields+1] = parentKey
@@ -103,6 +104,7 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
                 fields[#fields+1] = 'rjk'
                 fields[#fields+1] = repeatJobKey
             end
+            rcall('DEL', deduplicationNextKey)
             rcall('HSET', deduplicationNextKey, unpack(fields))
             -- Ensure the dedup key does not expire while the job is active,
             -- so subsequent adds always hit the dedup path and never bypass

package/dist/cjs/scripts/addPrioritizedJob-9.js

@@ -120,7 +120,8 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
         local activeItems = rcall('LRANGE', activeKey, 0, -1)
         if checkItemInList(activeItems, currentDebounceJobId) then
             local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
-            local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts)}
+            local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts),
+                'jid', jobId}
             if parentKey then
                 fields[#fields+1] = 'pk'
                 fields[#fields+1] = parentKey
@@ -137,6 +138,7 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
                 fields[#fields+1] = 'rjk'
                 fields[#fields+1] = repeatJobKey
             end
+            rcall('DEL', deduplicationNextKey)
             rcall('HSET', deduplicationNextKey, unpack(fields))
             -- Ensure the dedup key does not expire while the job is active,
             -- so subsequent adds always hit the dedup path and never bypass

package/dist/cjs/scripts/addStandardJob-9.js

@@ -114,7 +114,8 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
         local activeItems = rcall('LRANGE', activeKey, 0, -1)
         if checkItemInList(activeItems, currentDebounceJobId) then
             local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
-            local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts)}
+            local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts),
+                'jid', jobId}
             if parentKey then
                 fields[#fields+1] = 'pk'
                 fields[#fields+1] = parentKey
@@ -131,6 +132,7 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
                 fields[#fields+1] = 'rjk'
                 fields[#fields+1] = repeatJobKey
             end
+            rcall('DEL', deduplicationNextKey)
             rcall('HSET', deduplicationNextKey, unpack(fields))
             -- Ensure the dedup key does not expire while the job is active,
             -- so subsequent adds always hit the dedup path and never bypass

package/dist/cjs/scripts/moveToFinished-14.js

@@ -829,8 +829,16 @@ local function requeueDeduplicatedJob(prefix, deduplicationId, eventStreamKey,
   local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
   if rcall("EXISTS", deduplicationNextKey) == 1 then
     local nextData = rcall("HMGET", deduplicationNextKey,
-        "name", "data", "opts", "pk", "pd", "pdk", "rjk")
-    local newJobId = rcall("INCR", prefix .. "id") .. ""
+        "name", "data", "opts", "pk", "pd", "pdk", "rjk", "jid")
+    -- Always increment the counter to keep it monotonic
+    local nextId = rcall("INCR", prefix .. "id") .. ""
+    local storedJobId = nextData[8] -- index 8 = "jid" (8th field in the HMGET call above)
+    local newJobId
+    if storedJobId then
+      newJobId = storedJobId
+    else
+      newJobId = nextId
+    end
     local newJobIdKey = prefix .. newJobId
     local newOpts = cjson.decode(nextData[3])
     local deduplicationKey = prefix .. "de:" .. deduplicationId