bullmq 5.80.7 → 5.80.9

package/dist/cjs/classes/flow-producer.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlowProducer = void 0;
 const events_1 = require("events");
 const utils_1 = require("../utils");
+const create_scripts_1 = require("../utils/create-scripts");
 const job_1 = require("./job");
 const queue_keys_1 = require("./queue-keys");
 const redis_connection_1 = require("./redis-connection");
@@ -19,6 +20,13 @@ class FlowProducer extends events_1.EventEmitter {
     constructor(opts = { connection: {} }, Connection = redis_connection_1.RedisConnection) {
         super();
         this.opts = opts;
+        /**
+         * Cache of lightweight queue-like objects keyed by `${prefix}:${queueName}`.
+         * Each entry carries a single shared Scripts instance that is reused by all
+         * jobs added to that queue during the FlowProducer's lifetime, avoiding a
+         * redundant Scripts allocation per node/job.
+         */
+        this.queues = new Map();
         this.opts = Object.assign({ prefix: 'bull' }, opts);
         this.connection = new Connection(opts.connection, {
             shared: (0, utils_1.isRedisInstance)(opts.connection),
@@ -28,6 +36,7 @@ class FlowProducer extends events_1.EventEmitter {
         });
         this.connection.on('error', (error) => this.emit('error', error));
         this.connection.on('close', () => {
+            this.queues.clear();
             if (!this.closing) {
                 this.emit('ioredis:close');
             }
@@ -351,22 +360,40 @@ class FlowProducer extends events_1.EventEmitter {
      * @returns A queue-like object with the client, keys, and options needed to create jobs.
      */
     queueFromNode(node, queueKeys, prefix) {
-        return {
+        const cacheKey = `${prefix}:${node.queueName}`;
+        const cached = this.queues.get(cacheKey);
+        if (cached) {
+            return cached;
+        }
+        const flowProducer = this;
+        const queue = {
             client: this.connection.client,
             name: node.queueName,
             keys: queueKeys.getKeys(node.queueName),
             toKey: (type) => queueKeys.toKey(node.queueName, type),
             opts: { prefix, connection: {} },
             qualifiedName: queueKeys.getQueueQualifiedName(node.queueName),
-            closing: this.closing,
+            get closing() {
+                return flowProducer.closing;
+            },
             waitUntilReady: async () => this.connection.client,
             removeListener: this.removeListener.bind(this),
             emit: this.emit.bind(this),
             on: this.on.bind(this),
-            redisVersion: this.connection.redisVersion,
-            databaseType: this.connection.databaseType,
+            get redisVersion() {
+                return flowProducer.connection.redisVersion;
+            },
+            get databaseType() {
+                return flowProducer.connection.databaseType;
+            },
             trace: async () => { },
         };
+        // Build the shared Scripts instance once per queue so that every job
+        // created from this queue-like object reuses it instead of allocating
+        // its own.
+        queue.scripts = (0, create_scripts_1.createScripts)(queue);
+        this.queues.set(cacheKey, queue);
+        return queue;
     }
     /**
      * Translates numeric addJob Lua error codes returned by root flow exec.
@@ -395,6 +422,7 @@ class FlowProducer extends events_1.EventEmitter {
      */
     async close() {
         if (!this.closing) {
+            this.queues.clear();
             this.closing = this.connection.close();
         }
         await this.closing;

package/dist/cjs/classes/job.js

@@ -243,7 +243,13 @@ class Job {
         return job;
     }
     createScripts() {
-        this.scripts = (0, create_scripts_1.createScripts)(this.queue);
+        var _a;
+        // Reuse the queue's long-lived Scripts instance. It is bound to the same
+        // queue keys and connection, so a per-Job instance is pure duplication.
+        // The built-in Queue, Worker and FlowProducer always provide one; the
+        // fallback only covers custom queue-like objects that don't carry a
+        // Scripts instance.
+        this.scripts = (_a = this.queue.scripts) !== null && _a !== void 0 ? _a : (0, create_scripts_1.createScripts)(this.queue);
     }
     static optsFromJSON(rawOpts, optsDecode = utils_1.optsDecodeMap) {
         const opts = JSON.parse(rawOpts || '{}');
@@ -297,7 +303,8 @@ class Job {
      * @returns The total number of log entries for this job so far.
      */
     static addJobLog(queue, jobId, logRow, keepLogs) {
-        const scripts = queue.scripts;
+        var _a;
+        const scripts = (_a = queue.scripts) !== null && _a !== void 0 ? _a : (0, create_scripts_1.createScripts)(queue);
         return scripts.addLog(jobId, logRow, keepLogs);
     }
     toJSON() {

package/dist/cjs/commands/addJobScheduler-11.lua

@@ -144,23 +144,31 @@ end
 local jobId = "repeat:" .. jobSchedulerId .. ":" .. nextMillis
 local jobKey = prefixKey .. jobId
 
--- If there's already a job with this ID, in a state 
--- that is not updatable (active, completed, failed) we must 
+-- If there's already a job with this ID, in a state
+-- that is not updatable (active, completed, failed) we must
 -- handle the collision
 local hasCollision = false
 if rcall("EXISTS", jobKey) == 1 then
     if every then
-        -- For 'every' case: try next time slot to avoid collision
-        local nextSlotMillis = nextMillis + every
-        local nextSlotJobId = "repeat:" .. jobSchedulerId .. ":" .. nextSlotMillis
-        local nextSlotJobKey = prefixKey .. nextSlotJobId
-
-        if rcall("EXISTS", nextSlotJobKey) == 0 then
-            -- Next slot is free, use it
-            nextMillis = nextSlotMillis
-            jobId = nextSlotJobId
-        else
-            -- Next slot also has a job, return error code
+        -- For 'every' case: walk forward through subsequent slots
+        -- until we find a free one. Stale completed/failed jobs from
+        -- a previous scheduler under the same id can occupy several
+        -- consecutive slots (issue #3063), so a single retry is not
+        -- enough. The scan is bounded so we don't spin if the
+        -- scheduler is genuinely contested.
+        local maxSlotScans = 32
+        local slotsScanned = 0
+        local jobExists
+        repeat
+            nextMillis = nextMillis + every
+            jobId = "repeat:" .. jobSchedulerId .. ":" .. nextMillis
+            jobKey = prefixKey .. jobId
+            slotsScanned = slotsScanned + 1
+            jobExists = rcall("EXISTS", jobKey)
+        until jobExists == 0 or slotsScanned >= maxSlotScans
+
+        if jobExists == 1 then
+            -- Every scanned slot still has a job, return error code
             return -11 -- SchedulerJobSlotsBusy
         end
     else

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

@@ -553,22 +553,30 @@ end
 -- Check for job ID collision with existing jobs (in any state)
 local jobId = "repeat:" .. jobSchedulerId .. ":" .. nextMillis
 local jobKey = prefixKey .. jobId
--- If there's already a job with this ID, in a state 
--- that is not updatable (active, completed, failed) we must 
+-- If there's already a job with this ID, in a state
+-- that is not updatable (active, completed, failed) we must
 -- handle the collision
 local hasCollision = false
 if rcall("EXISTS", jobKey) == 1 then
     if every then
-        -- For 'every' case: try next time slot to avoid collision
-        local nextSlotMillis = nextMillis + every
-        local nextSlotJobId = "repeat:" .. jobSchedulerId .. ":" .. nextSlotMillis
-        local nextSlotJobKey = prefixKey .. nextSlotJobId
-        if rcall("EXISTS", nextSlotJobKey) == 0 then
-            -- Next slot is free, use it
-            nextMillis = nextSlotMillis
-            jobId = nextSlotJobId
-        else
-            -- Next slot also has a job, return error code
+        -- For 'every' case: walk forward through subsequent slots
+        -- until we find a free one. Stale completed/failed jobs from
+        -- a previous scheduler under the same id can occupy several
+        -- consecutive slots (issue #3063), so a single retry is not
+        -- enough. The scan is bounded so we don't spin if the
+        -- scheduler is genuinely contested.
+        local maxSlotScans = 32
+        local slotsScanned = 0
+        local jobExists
+        repeat
+            nextMillis = nextMillis + every
+            jobId = "repeat:" .. jobSchedulerId .. ":" .. nextMillis
+            jobKey = prefixKey .. jobId
+            slotsScanned = slotsScanned + 1
+            jobExists = rcall("EXISTS", jobKey)
+        until jobExists == 0 or slotsScanned >= maxSlotScans
+        if jobExists == 1 then
+            -- Every scanned slot still has a job, return error code
             return -11 -- SchedulerJobSlotsBusy
         end
     else