bullmq 5.58.7 → 5.58.9

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

@@ -22,19 +22,19 @@ const content = `--[[
     ARGV[7] producer id
     Output:
       next delayed job id  - OK
-]]
-local rcall = redis.call
+]] local rcall = redis.call
 local repeatKey = KEYS[1]
 local delayedKey = KEYS[2]
 local waitKey = KEYS[3]
 local pausedKey = KEYS[4]
 local metaKey = KEYS[5]
 local prioritizedKey = KEYS[6]
-local nextMillis = ARGV[1]
+local nextMillis = tonumber(ARGV[1])
 local jobSchedulerId = ARGV[2]
-local timestamp = ARGV[5]
+local timestamp = tonumber(ARGV[5])
 local prefixKey = ARGV[6]
 local producerId = ARGV[7]
+local jobOpts = cmsgpack.unpack(ARGV[4])
 -- Includes
 --[[
   Add delay marker if needed.
@@ -194,10 +194,11 @@ local function addJobInTargetList(targetKey, markerKey, pushCmd, isPausedOrMaxed
   rcall(pushCmd, targetKey, jobId)
   addBaseMarkerIfNeeded(markerKey, isPausedOrMaxed)
 end
-local function addJobFromScheduler(jobKey, jobId, rawOpts, waitKey, pausedKey, activeKey, metaKey, 
+local function addJobFromScheduler(jobKey, jobId, opts, waitKey, pausedKey, activeKey, metaKey, 
   prioritizedKey, priorityCounter, delayedKey, markerKey, eventsKey, name, maxEvents, timestamp,
-  data, jobSchedulerId)
-  local opts = cmsgpack.unpack(rawOpts)
+  data, jobSchedulerId, repeatDelay)
+  opts['delay'] = repeatDelay
+  opts['jobId'] = jobId
   local delay, priority = storeJob(eventsKey, jobKey, jobId, name, data,
     opts, timestamp, nil, nil, jobSchedulerId)
   if delay ~= 0 then
@@ -227,18 +228,61 @@ local function getOrSetMaxEvents(metaKey)
   end
   return maxEvents
 end
-local schedulerKey = repeatKey .. ":" .. jobSchedulerId
-local nextDelayedJobId = "repeat:" .. jobSchedulerId .. ":" .. nextMillis
-local nextDelayedJobKey = schedulerKey .. ":" .. nextMillis
--- Validate that scheduler exists.
+local function getJobSchedulerEveryNextMillis(prevMillis, every, now, offset, startDate)
+    local nextMillis
+    if not prevMillis then
+        if startDate then
+            -- Assuming startDate is passed as milliseconds from JavaScript
+            nextMillis = tonumber(startDate)
+            nextMillis = nextMillis > now and nextMillis or now
+        else
+            nextMillis = now
+        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)
+        end
+    end
+    if not offset or offset == 0 then
+        local timeSlot = math.floor(nextMillis / every) * every;
+        offset = nextMillis - timeSlot;
+    end
+    -- Return a tuple nextMillis, offset
+    return math.floor(nextMillis), math.floor(offset)
+end
 local prevMillis = rcall("ZSCORE", repeatKey, jobSchedulerId)
+-- Validate that scheduler exists.
+-- If it does not exist we should not iterate anymore.
 if prevMillis then
+    prevMillis = tonumber(prevMillis)
+    local schedulerKey = repeatKey .. ":" .. jobSchedulerId
+    local schedulerAttributes = rcall("HMGET", schedulerKey, "name", "data", "every", "startDate", "offset")
+    local every = tonumber(schedulerAttributes[3])
+    local now = tonumber(timestamp)
+    -- If every is not found in scheduler attributes, try to get it from job options
+    if not every and jobOpts['repeat'] and jobOpts['repeat']['every'] then
+        every = tonumber(jobOpts['repeat']['every'])
+    end
+    if every then
+        local startDate = schedulerAttributes[4]
+        local jobOptsOffset = jobOpts['repeat'] and jobOpts['repeat']['offset'] or 0
+        local offset = schedulerAttributes[5] or jobOptsOffset or 0
+        local newOffset
+        nextMillis, newOffset = getJobSchedulerEveryNextMillis(prevMillis, every, now, offset, startDate)
+        if not offset then
+            rcall("HSET", schedulerKey, "offset", newOffset)
+            jobOpts['repeat']['offset'] = newOffset
+        end
+    end
+    local nextDelayedJobId = "repeat:" .. jobSchedulerId .. ":" .. nextMillis
+    local nextDelayedJobKey = schedulerKey .. ":" .. nextMillis
     local currentDelayedJobId = "repeat:" .. jobSchedulerId .. ":" .. prevMillis
     if producerId == currentDelayedJobId then
         local eventsKey = KEYS[9]
         local maxEvents = getOrSetMaxEvents(metaKey)
         if rcall("EXISTS", nextDelayedJobKey) ~= 1 then
-            local schedulerAttributes = rcall("HMGET", schedulerKey, "name", "data")
             rcall("ZADD", repeatKey, nextMillis, jobSchedulerId)
             rcall("HINCRBY", schedulerKey, "ic", 1)
             rcall("INCR", KEYS[8])
@@ -248,17 +292,22 @@ if prevMillis then
             if templateData and templateData ~= '{}' then
                 rcall("HSET", schedulerKey, "data", templateData)
             end
-            addJobFromScheduler(nextDelayedJobKey, nextDelayedJobId, ARGV[4], waitKey, pausedKey, 
-                KEYS[12], metaKey, prioritizedKey, KEYS[10], delayedKey, KEYS[7], eventsKey, 
-                schedulerAttributes[1], maxEvents, ARGV[5], templateData or '{}', jobSchedulerId)
+            local delay = nextMillis - now
+            -- Fast Clamp delay to minimum of 0
+            if delay < 0 then
+                delay = 0
+            end
+            jobOpts["delay"] = delay
+            addJobFromScheduler(nextDelayedJobKey, nextDelayedJobId, jobOpts, waitKey, pausedKey, KEYS[12], metaKey,
+                prioritizedKey, KEYS[10], delayedKey, KEYS[7], eventsKey, schedulerAttributes[1], maxEvents, ARGV[5],
+                templateData or '{}', jobSchedulerId, delay)
             -- TODO: remove this workaround in next breaking change
             if KEYS[11] ~= "" then
                 rcall("HSET", KEYS[11], "nrjid", nextDelayedJobId)
             end
             return nextDelayedJobId .. "" -- convert to string
         else
-            rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event",
-                "duplicated", "jobId", nextDelayedJobId)
+            rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "duplicated", "jobId", nextDelayedJobId)
         end
     end
 end

package/dist/esm/scripts/updateJobScheduler-12.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateJobScheduler-12.js","sourceRoot":"","sources":["../../../src/scripts/updateJobScheduler-12.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwQf,CAAC;AACF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,IAAI,EAAE,oBAAoB;IAC1B,OAAO;IACP,IAAI,EAAE,EAAE;CACT,CAAC"}
+{"version":3,"file":"updateJobScheduler-12.js","sourceRoot":"","sources":["../../../src/scripts/updateJobScheduler-12.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyTf,CAAC;AACF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,IAAI,EAAE,oBAAoB;IAC1B,OAAO;IACP,IAAI,EAAE,EAAE;CACT,CAAC"}