bullmq 6.3.4 → 6.3.6

package/dist/cjs/classes/bun-redis-client.js

@@ -218,11 +218,11 @@ class BunRedisAdapter extends events_1.EventEmitter {
     async connect() {
         var _a, _b;
         // A duplicate created with a `rawFactory` builds its raw client lazily on
-        // the first connect (Bun's native `duplicate()` is async).
-        if (!this.raw && this.rawFactory) {
-            this.raw = await this.rawFactory();
-            this.rawFactory = undefined;
-            this._setupCallbacks();
+        // the first connect (Bun's native `duplicate()` is async). Concurrent
+        // connect()/_ensureRaw() share one in-flight materialization so we don't
+        // create two native clients and overwrite an unclosed raw.
+        if (!this.raw && (this.rawFactory || this.materializing)) {
+            await this._materializeRaw();
         }
         const replaceRaw = this.hasConnected && (this.closed || !this.raw.connected);
         if (this.reconnectTimer) {
@@ -394,6 +394,36 @@ class BunRedisAdapter extends events_1.EventEmitter {
         const Ctor = src.constructor;
         return new Ctor(src.url);
     }
+    /**
+     * Materialize a lazily-created raw client (duplicate `rawFactory`).
+     * Concurrent callers share the in-flight promise so the factory runs once.
+     */
+    _materializeRaw() {
+        if (this.raw) {
+            return Promise.resolve(this.raw);
+        }
+        if (this.materializing) {
+            return this.materializing;
+        }
+        const factory = this.rawFactory;
+        if (!factory) {
+            return Promise.resolve(this.raw);
+        }
+        const materializing = factory()
+            .then(raw => {
+            this.raw = raw;
+            this.rawFactory = undefined;
+            this._setupCallbacks();
+            return raw;
+        })
+            .finally(() => {
+            if (this.materializing === materializing) {
+                this.materializing = undefined;
+            }
+        });
+        this.materializing = materializing;
+        return materializing;
+    }
     /**
      * Return the raw client, materializing it first when this adapter is a
      * lazily-initialized duplicate (created via `duplicate()` with a
@@ -413,9 +443,13 @@ class BunRedisAdapter extends events_1.EventEmitter {
         // on first connect. Rebuilding from `this.raw.url` is not possible because
         // Bun never exposes the URL, which previously sent duplicates to the
         // wrong (default) server (#4582).
-        const parentRaw = this.raw;
+        //
+        // Do not close over `this.raw`: a duplicate may not have materialized its
+        // raw client yet, so nested `duplicate().duplicate()` would capture
+        // undefined and throw in `_duplicateRaw` (#4706). Resolve the parent raw
+        // lazily, matching reconnect's fallback to `rawFactory`.
         const adapter = new BunRedisAdapter(undefined, {
-            rawFactory: () => this._duplicateRaw(parentRaw),
+            rawFactory: async () => this._duplicateRaw(await this._ensureRaw()),
         });
         // Copy registered scripts to the duplicate
         for (const [name, script] of this.scripts) {

package/dist/cjs/classes/redis-queue-backend.js

@@ -1057,7 +1057,6 @@ class RedisQueueBackend extends events_1.EventEmitter {
             queueKeys.stalled,
             queueKeys.wait,
             queueKeys.limiter,
-            queueKeys.paused,
             queueKeys.pc,
         ];
         const fetchNext = opts.fetchNext && !this.queue.closing ? 1 : 0;
@@ -1301,7 +1300,6 @@ class RedisQueueBackend extends events_1.EventEmitter {
             this.queue.toKey(state),
             this.queue.keys.wait,
             this.queue.keys.meta,
-            this.queue.keys.paused,
             this.queue.keys.active,
             this.queue.keys.marker,
         ];

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

@@ -10,7 +10,6 @@
     eventStreamKey - event stream key
     rateLimiterKey - rate limiter key
     delayedKey - delayed sorted set key
-    pausedKey - paused list key
     metaKey - meta hash key
     pcKey - priority counter key
     markerKey - marker key
@@ -31,7 +30,7 @@
 --- @include "promoteDelayedJobs"
 
 local function fetchNextJob(waitKey, activeKey, prioritizedKey, eventStreamKey,
-    rateLimiterKey, delayedKey, pausedKey, metaKey, pcKey, markerKey, prefix,
+    rateLimiterKey, delayedKey, metaKey, pcKey, markerKey, prefix,
     timestamp, opts)
 
     local isPausedOrMaxed, rateLimitMax, rateLimitDuration =

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

@@ -1,5 +1,5 @@
 --[[
-  Function to check for the meta.paused key to decide if we are paused or not
+  Function to check for the meta.paused attribute to decide if we are paused or not
   (since an empty list and !EXISTS are not really the same).
 ]]
 local function isQueuePaused(queueMetaKey)

package/dist/cjs/commands/{moveToDelayed-12.lua → moveToDelayed-11.lua}

@@ -12,8 +12,7 @@
     KEYS[8] stalled key
     KEYS[9] wait key
     KEYS[10] rate limiter key
-    KEYS[11] paused key
-    KEYS[12] pc priority counter
+    KEYS[11] pc priority counter
 
     ARGV[1] key prefix
     ARGV[2] timestamp
@@ -81,7 +80,7 @@ if rcall("EXISTS", jobKey) == 1 then
     if (ARGV[8] == "1") then
         local opts = cmsgpack.unpack(ARGV[9])
         local result = fetchNextJob(KEYS[9], KEYS[2], KEYS[3], KEYS[6],
-            KEYS[10], KEYS[4], KEYS[11], metaKey, KEYS[12], markerKey,
+            KEYS[10], KEYS[4], metaKey, KEYS[11], markerKey,
             ARGV[1], ARGV[2], opts)
         if result and type(result[1]) == "table" then
             return result

package/dist/cjs/commands/moveToFinished-14.lua

@@ -213,7 +213,7 @@ if rcall("EXISTS", jobIdKey) == 1 then -- Make sure job exists
     -- and not rate limited.
     if (ARGV[6] == "1") then
         local result = fetchNextJob(KEYS[1], KEYS[2], KEYS[3], eventStreamKey,
-            KEYS[6], KEYS[7], KEYS[8], metaKey, KEYS[10], KEYS[14], prefix,
+            KEYS[6], KEYS[7], metaKey, KEYS[10], KEYS[14], prefix,
             timestamp, opts)
         if result then
             return result

package/dist/{esm/commands/reprocessJob-8.lua → cjs/commands/reprocessJob-7.lua}

@@ -7,9 +7,8 @@
     KEYS[3] job state
     KEYS[4] wait key
     KEYS[5] meta
-    KEYS[6] paused key
-    KEYS[7] active key
-    KEYS[8] marker key
+    KEYS[6] active key
+    KEYS[7] marker key
 
     ARGV[1] job.id
     ARGV[2] (job.opts.lifo ? 'R' : 'L') + 'PUSH'
@@ -46,8 +45,8 @@ if rcall("EXISTS", jobKey) == 1 then
 
     rcall("HDEL", jobKey, "finishedOn", "processedOn", ARGV[3], unpack(attributesToRemove))
 
-    local isPausedOrMaxed = isQueuePausedOrMaxed(KEYS[5], KEYS[7])
-    addJobInTargetList(KEYS[4], KEYS[8], ARGV[2], isPausedOrMaxed, jobId)
+    local isPausedOrMaxed = isQueuePausedOrMaxed(KEYS[5], KEYS[6])
+    addJobInTargetList(KEYS[4], KEYS[7], ARGV[2], isPausedOrMaxed, jobId)
 
     local parentKey = rcall("HGET", jobKey, "parentKey")
 

package/dist/cjs/scripts/addJobScheduler-11.js

@@ -244,7 +244,7 @@ local function getOrSetMaxEvents(metaKey)
   return maxEvents
 end
 --[[
-  Function to check for the meta.paused key to decide if we are paused or not
+  Function to check for the meta.paused attribute to decide if we are paused or not
   (since an empty list and !EXISTS are not really the same).
 ]]
 local function isQueuePaused(queueMetaKey)

package/dist/cjs/scripts/index.js

@@ -30,7 +30,7 @@ tslib_1.__exportStar(require("./moveJobFromActiveToWait-9"), exports);
 tslib_1.__exportStar(require("./moveJobsToWait-8"), exports);
 tslib_1.__exportStar(require("./moveStalledJobsToWait-9"), exports);
 tslib_1.__exportStar(require("./moveToActive-11"), exports);
-tslib_1.__exportStar(require("./moveToDelayed-12"), exports);
+tslib_1.__exportStar(require("./moveToDelayed-11"), exports);
 tslib_1.__exportStar(require("./moveToFinished-14"), exports);
 tslib_1.__exportStar(require("./moveToWaitingChildren-7"), exports);
 tslib_1.__exportStar(require("./obliterate-2"), exports);
@@ -44,7 +44,7 @@ tslib_1.__exportStar(require("./removeJob-2"), exports);
 tslib_1.__exportStar(require("./removeJobScheduler-3"), exports);
 tslib_1.__exportStar(require("./removeOrphanedJobs-1"), exports);
 tslib_1.__exportStar(require("./removeUnprocessedChildren-2"), exports);
-tslib_1.__exportStar(require("./reprocessJob-8"), exports);
+tslib_1.__exportStar(require("./reprocessJob-7"), exports);
 tslib_1.__exportStar(require("./retryJob-11"), exports);
 tslib_1.__exportStar(require("./saveStacktrace-1"), exports);
 tslib_1.__exportStar(require("./updateData-1"), exports);

package/dist/cjs/scripts/{moveToDelayed-12.js → moveToDelayed-11.js}

@@ -14,8 +14,7 @@ const content = `--[[
     KEYS[8] stalled key
     KEYS[9] wait key
     KEYS[10] rate limiter key
-    KEYS[11] paused key
-    KEYS[12] pc priority counter
+    KEYS[11] pc priority counter
     ARGV[1] key prefix
     ARGV[2] timestamp
     ARGV[3] the id of the job
@@ -69,7 +68,6 @@ end
     eventStreamKey - event stream key
     rateLimiterKey - rate limiter key
     delayedKey - delayed sorted set key
-    pausedKey - paused list key
     metaKey - meta hash key
     pcKey - priority counter key
     markerKey - marker key
@@ -234,7 +232,7 @@ local function promoteDelayedJobs(delayedKey, markerKey, targetKey, prioritizedK
     end
 end
 local function fetchNextJob(waitKey, activeKey, prioritizedKey, eventStreamKey,
-    rateLimiterKey, delayedKey, pausedKey, metaKey, pcKey, markerKey, prefix,
+    rateLimiterKey, delayedKey, metaKey, pcKey, markerKey, prefix,
     timestamp, opts)
     local isPausedOrMaxed, rateLimitMax, rateLimitDuration =
         getQueueMetadata(metaKey, activeKey, waitKey)
@@ -380,7 +378,7 @@ if rcall("EXISTS", jobKey) == 1 then
     if (ARGV[8] == "1") then
         local opts = cmsgpack.unpack(ARGV[9])
         local result = fetchNextJob(KEYS[9], KEYS[2], KEYS[3], KEYS[6],
-            KEYS[10], KEYS[4], KEYS[11], metaKey, KEYS[12], markerKey,
+            KEYS[10], KEYS[4], metaKey, KEYS[11], markerKey,
             ARGV[1], ARGV[2], opts)
         if result and type(result[1]) == "table" then
             return result
@@ -396,5 +394,5 @@ end
 exports.moveToDelayed = {
     name: 'moveToDelayed',
     content,
-    keys: 12,
+    keys: 11,
 };

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

@@ -119,7 +119,6 @@ end
     eventStreamKey - event stream key
     rateLimiterKey - rate limiter key
     delayedKey - delayed sorted set key
-    pausedKey - paused list key
     metaKey - meta hash key
     pcKey - priority counter key
     markerKey - marker key
@@ -296,7 +295,7 @@ local function promoteDelayedJobs(delayedKey, markerKey, targetKey, prioritizedK
     end
 end
 local function fetchNextJob(waitKey, activeKey, prioritizedKey, eventStreamKey,
-    rateLimiterKey, delayedKey, pausedKey, metaKey, pcKey, markerKey, prefix,
+    rateLimiterKey, delayedKey, metaKey, pcKey, markerKey, prefix,
     timestamp, opts)
     local isPausedOrMaxed, rateLimitMax, rateLimitDuration =
         getQueueMetadata(metaKey, activeKey, waitKey)
@@ -1017,7 +1016,7 @@ if rcall("EXISTS", jobIdKey) == 1 then -- Make sure job exists
     -- and not rate limited.
     if (ARGV[6] == "1") then
         local result = fetchNextJob(KEYS[1], KEYS[2], KEYS[3], eventStreamKey,
-            KEYS[6], KEYS[7], KEYS[8], metaKey, KEYS[10], KEYS[14], prefix,
+            KEYS[6], KEYS[7], metaKey, KEYS[10], KEYS[14], prefix,
             timestamp, opts)
         if result then
             return result

package/dist/cjs/scripts/{reprocessJob-8.js → reprocessJob-7.js}

@@ -9,9 +9,8 @@ const content = `--[[
     KEYS[3] job state
     KEYS[4] wait key
     KEYS[5] meta
-    KEYS[6] paused key
-    KEYS[7] active key
-    KEYS[8] marker key
+    KEYS[6] active key
+    KEYS[7] marker key
     ARGV[1] job.id
     ARGV[2] (job.opts.lifo ? 'R' : 'L') + 'PUSH'
     ARGV[3] propVal - failedReason/returnvalue
@@ -80,8 +79,8 @@ if rcall("EXISTS", jobKey) == 1 then
       table.insert(attributesToRemove, "ats")
     end
     rcall("HDEL", jobKey, "finishedOn", "processedOn", ARGV[3], unpack(attributesToRemove))
-    local isPausedOrMaxed = isQueuePausedOrMaxed(KEYS[5], KEYS[7])
-    addJobInTargetList(KEYS[4], KEYS[8], ARGV[2], isPausedOrMaxed, jobId)
+    local isPausedOrMaxed = isQueuePausedOrMaxed(KEYS[5], KEYS[6])
+    addJobInTargetList(KEYS[4], KEYS[7], ARGV[2], isPausedOrMaxed, jobId)
     local parentKey = rcall("HGET", jobKey, "parentKey")
     if parentKey and rcall("EXISTS", parentKey) == 1 then
       if ARGV[4] == "failed" then
@@ -110,5 +109,5 @@ end
 exports.reprocessJob = {
     name: 'reprocessJob',
     content,
-    keys: 8,
+    keys: 7,
 };