bullmq 5.80.1 → 5.80.3

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

@@ -115,6 +115,9 @@ class FlowProducer extends events_1.EventEmitter {
                 if (typeof jobId === 'string') {
                     jobsTree.job.id = jobId;
                 }
+                else if (typeof jobId === 'number') {
+                    jobsTree.job.id = jobId.toString();
+                }
             }
             return jobsTree;
         });
@@ -144,9 +147,8 @@ class FlowProducer extends events_1.EventEmitter {
      * Whenever the children of a given parent are completed, the parent
      * will be processed, being able to access the children's result data.
      *
-     * All Jobs can be in different queues, either children or parents,
-     * however this call would be atomic, either it fails and no jobs will
-     * be added to the queues, or it succeeds and all jobs will be added.
+     * All Jobs can be in different queues, either children or parents.
+     * If a flow fails to be added, other flows in the batch may still be added.
      *
      * @param flows - an array of objects with a tree-like structure where children jobs
      * will be processed before their parents.
@@ -158,6 +160,7 @@ class FlowProducer extends events_1.EventEmitter {
         const client = await this.connection.client;
         const multi = client.multi();
         return (0, utils_1.trace)(this.telemetry, enums_1.SpanKind.PRODUCER, '', 'addBulkFlows', '', async (span) => {
+            var _a, _b;
             span === null || span === void 0 ? void 0 : span.setAttributes({
                 [enums_1.TelemetryAttributes.BulkCount]: flows.length,
                 [enums_1.TelemetryAttributes.BulkNames]: flows
@@ -172,9 +175,18 @@ class FlowProducer extends events_1.EventEmitter {
                     continue;
                 }
                 const [err, jobId] = result;
-                if (!err && typeof jobId === 'string') {
+                if (err) {
+                    throw err;
+                }
+                if (typeof jobId === 'number' && jobId < 0) {
+                    throw this.toFlowError(jobId, (0, utils_1.getParentKey)((_b = (_a = flows[index]) === null || _a === void 0 ? void 0 : _a.opts) === null || _b === void 0 ? void 0 : _b.parent));
+                }
+                if (typeof jobId === 'string') {
                     jobsTrees[index].job.id = jobId;
                 }
+                else if (typeof jobId === 'number') {
+                    jobsTrees[index].job.id = jobId.toString();
+                }
             }
             return jobsTrees;
         });

package/dist/cjs/commands/addDelayedJob-6.lua

@@ -76,7 +76,7 @@ local parentDependenciesKey = args[6]
 local timestamp = args[4]
 
 if args[2] == "" then
-    jobId = jobCounter
+    jobId = jobCounter .. "" -- convert to string
     jobIdKey = args[1] .. jobId
 else
     jobId = args[2]
@@ -105,4 +105,4 @@ if parentDependenciesKey ~= nil then
     rcall("SADD", parentDependenciesKey, jobIdKey)
 end
 
-return jobId .. "" -- convert to string
+return jobId

package/dist/cjs/commands/addParentJob-6.lua

@@ -71,7 +71,7 @@ local maxEvents = getOrSetMaxEvents(metaKey)
 local parentDependenciesKey = args[6]
 local timestamp = args[4]
 if args[2] == "" then
-    jobId = jobCounter
+    jobId = jobCounter .. "" -- convert to string
     jobIdKey = args[1] .. jobId
 else
     jobId = args[2]
@@ -107,4 +107,4 @@ if parentDependenciesKey ~= nil then
     rcall("SADD", parentDependenciesKey, jobIdKey)
 end
 
-return jobId .. "" -- convert to string
+return jobId

package/dist/cjs/commands/addPrioritizedJob-9.lua

@@ -78,7 +78,7 @@ local maxEvents = getOrSetMaxEvents(metaKey)
 local parentDependenciesKey = args[6]
 local timestamp = args[4]
 if args[2] == "" then
-    jobId = jobCounter
+    jobId = jobCounter .. "" -- convert to string
     jobIdKey = args[1] .. jobId
 else
     jobId = args[2]
@@ -115,4 +115,4 @@ if parentDependenciesKey ~= nil then
     rcall("SADD", parentDependenciesKey, jobIdKey)
 end
 
-return jobId .. "" -- convert to string
+return jobId

package/dist/cjs/commands/addStandardJob-9.lua

@@ -82,7 +82,7 @@ local maxEvents = getOrSetMaxEvents(metaKey)
 local parentDependenciesKey = args[6]
 local timestamp = args[4]
 if args[2] == "" then
-    jobId = jobCounter
+    jobId = jobCounter .. "" -- convert to string
     jobIdKey = args[1] .. jobId
 else
     jobId = args[2]
@@ -120,4 +120,4 @@ if parentDependenciesKey ~= nil then
     rcall("SADD", parentDependenciesKey, jobIdKey)
 end
 
-return jobId .. "" -- convert to string
+return jobId

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

@@ -9,25 +9,32 @@ local function getJobSchedulerEveryNextMillis(prevMillis, every, now, offset, st
             nextMillis = tonumber(startDate)
             nextMillis = nextMillis > now and nextMillis or now
         else
-            nextMillis = now
-            -- For the first iteration with no startDate and an explicit
-            -- offset, align nextMillis to the next offset slot strictly
-            -- after now. Without this the user-supplied offset is
-            -- recorded but ignored, and the first job fires at now
-            -- instead of the next aligned timestamp (issue #3705).
             if offset and offset > 0 then
-                local aligned = math.floor(nextMillis / every) * every + offset
-                if aligned <= nextMillis then
-                    aligned = aligned + every
+                -- Align to the next slot that respects the offset
+                nextMillis = math.floor(now / every) * every + offset
+                if nextMillis <= now then
+                    nextMillis = nextMillis + every
                 end
-                nextMillis = aligned
+            else
+                nextMillis = now
             end
         end
     else
         nextMillis = prevMillis + every
         -- check if we may have missed some iterations
         if nextMillis < now then
-            nextMillis = math.floor(now / every) * every + every + (offset or 0)
+            -- Use the same offset-aware alignment as the initial branch
+            -- above so a non-zero offset is preserved across catch-ups
+            -- instead of being flattened to (slot + every). When the
+            -- aligned slot is itself still in the past, advance by one
+            -- full interval; otherwise the aligned slot is the next
+            -- iteration.
+            local aligned = math.floor(now / every) * every + (offset or 0)
+            if aligned <= now then
+                nextMillis = aligned + every
+            else
+                nextMillis = aligned
+            end
         end
     end
 

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

@@ -546,7 +546,7 @@ local opts = cmsgpack.unpack(ARGV[3])
 local parentDependenciesKey = args[6]
 local timestamp = args[4]
 if args[2] == "" then
-    jobId = jobCounter
+    jobId = jobCounter .. "" -- convert to string
     jobIdKey = args[1] .. jobId
 else
     jobId = args[2]
@@ -570,7 +570,7 @@ addDelayedJob(jobId, delayedKey, eventsKey, timestamp, maxEvents, KEYS[1], delay
 if parentDependenciesKey ~= nil then
     rcall("SADD", parentDependenciesKey, jobIdKey)
 end
-return jobId .. "" -- convert to string
+return jobId
 `;
 exports.addDelayedJob = {
     name: 'addDelayedJob',

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

@@ -443,25 +443,32 @@ local function getJobSchedulerEveryNextMillis(prevMillis, every, now, offset, st
             nextMillis = tonumber(startDate)
             nextMillis = nextMillis > now and nextMillis or now
         else
-            nextMillis = now
-            -- For the first iteration with no startDate and an explicit
-            -- offset, align nextMillis to the next offset slot strictly
-            -- after now. Without this the user-supplied offset is
-            -- recorded but ignored, and the first job fires at now
-            -- instead of the next aligned timestamp (issue #3705).
             if offset and offset > 0 then
-                local aligned = math.floor(nextMillis / every) * every + offset
-                if aligned <= nextMillis then
-                    aligned = aligned + every
+                -- Align to the next slot that respects the offset
+                nextMillis = math.floor(now / every) * every + offset
+                if nextMillis <= now then
+                    nextMillis = nextMillis + every
                 end
-                nextMillis = aligned
+            else
+                nextMillis = now
             end
         end
     else
         nextMillis = prevMillis + every
         -- check if we may have missed some iterations
         if nextMillis < now then
-            nextMillis = math.floor(now / every) * every + every + (offset or 0)
+            -- Use the same offset-aware alignment as the initial branch
+            -- above so a non-zero offset is preserved across catch-ups
+            -- instead of being flattened to (slot + every). When the
+            -- aligned slot is itself still in the past, advance by one
+            -- full interval; otherwise the aligned slot is the next
+            -- iteration.
+            local aligned = math.floor(now / every) * every + (offset or 0)
+            if aligned <= now then
+                nextMillis = aligned + every
+            else
+                nextMillis = aligned
+            end
         end
     end
     if not offset or offset == 0 then

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

@@ -436,7 +436,7 @@ local maxEvents = getOrSetMaxEvents(metaKey)
 local parentDependenciesKey = args[6]
 local timestamp = args[4]
 if args[2] == "" then
-    jobId = jobCounter
+    jobId = jobCounter .. "" -- convert to string
     jobIdKey = args[1] .. jobId
 else
     jobId = args[2]
@@ -467,7 +467,7 @@ rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event",
 if parentDependenciesKey ~= nil then
     rcall("SADD", parentDependenciesKey, jobIdKey)
 end
-return jobId .. "" -- convert to string
+return jobId
 `;
 exports.addParentJob = {
     name: 'addParentJob',

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

@@ -509,7 +509,7 @@ local maxEvents = getOrSetMaxEvents(metaKey)
 local parentDependenciesKey = args[6]
 local timestamp = args[4]
 if args[2] == "" then
-    jobId = jobCounter
+    jobId = jobCounter .. "" -- convert to string
     jobIdKey = args[1] .. jobId
 else
     jobId = args[2]
@@ -540,7 +540,7 @@ rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "waiting",
 if parentDependenciesKey ~= nil then
     rcall("SADD", parentDependenciesKey, jobIdKey)
 end
-return jobId .. "" -- convert to string
+return jobId
 `;
 exports.addPrioritizedJob = {
     name: 'addPrioritizedJob',

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

@@ -513,7 +513,7 @@ local maxEvents = getOrSetMaxEvents(metaKey)
 local parentDependenciesKey = args[6]
 local timestamp = args[4]
 if args[2] == "" then
-    jobId = jobCounter
+    jobId = jobCounter .. "" -- convert to string
     jobIdKey = args[1] .. jobId
 else
     jobId = args[2]
@@ -544,7 +544,7 @@ rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "waiting",
 if parentDependenciesKey ~= nil then
     rcall("SADD", parentDependenciesKey, jobIdKey)
 end
-return jobId .. "" -- convert to string
+return jobId
 `;
 exports.addStandardJob = {
     name: 'addStandardJob',

package/dist/cjs/scripts/updateJobScheduler-12.js

@@ -249,25 +249,32 @@ local function getJobSchedulerEveryNextMillis(prevMillis, every, now, offset, st
             nextMillis = tonumber(startDate)
             nextMillis = nextMillis > now and nextMillis or now
         else
-            nextMillis = now
-            -- For the first iteration with no startDate and an explicit
-            -- offset, align nextMillis to the next offset slot strictly
-            -- after now. Without this the user-supplied offset is
-            -- recorded but ignored, and the first job fires at now
-            -- instead of the next aligned timestamp (issue #3705).
             if offset and offset > 0 then
-                local aligned = math.floor(nextMillis / every) * every + offset
-                if aligned <= nextMillis then
-                    aligned = aligned + every
+                -- Align to the next slot that respects the offset
+                nextMillis = math.floor(now / every) * every + offset
+                if nextMillis <= now then
+                    nextMillis = nextMillis + every
                 end
-                nextMillis = aligned
+            else
+                nextMillis = now
             end
         end
     else
         nextMillis = prevMillis + every
         -- check if we may have missed some iterations
         if nextMillis < now then
-            nextMillis = math.floor(now / every) * every + every + (offset or 0)
+            -- Use the same offset-aware alignment as the initial branch
+            -- above so a non-zero offset is preserved across catch-ups
+            -- instead of being flattened to (slot + every). When the
+            -- aligned slot is itself still in the past, advance by one
+            -- full interval; otherwise the aligned slot is the next
+            -- iteration.
+            local aligned = math.floor(now / every) * every + (offset or 0)
+            if aligned <= now then
+                nextMillis = aligned + every
+            else
+                nextMillis = aligned
+            end
         end
     end
     if not offset or offset == 0 then