bullmq 5.40.4 → 5.41.0

package/dist/esm/commands/{removeJob-2.lua → removeJob-3.lua}

@@ -5,6 +5,7 @@
     Input:
       KEYS[1] queue prefix
       KEYS[2] meta key
+      KEYS[3] repeat key
 
       ARGV[1] jobId
       ARGV[2] remove children
@@ -18,6 +19,7 @@ local rcall = redis.call
 -- Includes
 --- @include "includes/destructureJobKey"
 --- @include "includes/getOrSetMaxEvents"
+--- @include "includes/isJobSchedulerJob"
 --- @include "includes/isLocked"
 --- @include "includes/removeDeduplicationKey"
 --- @include "includes/removeJobFromAnyState"
@@ -79,10 +81,10 @@ local prefix = KEYS[1]
 local jobId = ARGV[1]
 local shouldRemoveChildren = ARGV[2]
 local jobKey = prefix .. jobId
+local repeatKey = KEYS[3]
 
--- Check if the job belongs to a job scheduler and it is in delayed state.
-if rcall("ZSCORE", prefix .. "delayed", jobId) and rcall("HGET", jobKey, "rjk") then
-    return -8 -- Return error code as the job is part of a job scheduler and is in delayed state.
+if isJobSchedulerJob(jobId, jobKey, repeatKey) then
+    return -8
 end
 
 if not isLocked(prefix, jobId, shouldRemoveChildren) then

package/dist/esm/scripts/cleanJobsInSet-3.js

@@ -44,6 +44,21 @@ local function getTimestamp(jobKey, attributes)
   end
   return jobTs
 end
+--[[
+  Function to check if the job belongs to a job scheduler and
+  current delayed job matches with jobId
+]]
+local function isJobSchedulerJob(jobId, jobKey, jobSchedulersKey)
+  local repeatJobKey = rcall("HGET", jobKey, "rjk")
+  if repeatJobKey  then
+    local prevMillis = rcall("ZSCORE", jobSchedulersKey, repeatJobKey)
+    if prevMillis ~= false then
+      local currentDelayedJobId = "repeat:" .. repeatJobKey .. ":" .. prevMillis
+      return jobId == currentDelayedJobId
+    end
+  end
+  return false
+end
 --[[
   Function to remove job.
 ]]
@@ -198,7 +213,7 @@ local function removeJob(jobId, hard, baseKey, shouldRemoveDeduplicationKey)
   removeJobKeys(jobKey)
 end
 local function cleanList(listKey, jobKeyPrefix, rangeStart, rangeEnd,
-  timestamp, isWaiting)
+  timestamp, isWaiting, jobSchedulersKey)
   local jobs = rcall("LRANGE", listKey, rangeStart, rangeEnd)
   local deleted = {}
   local deletedCount = 0
@@ -210,7 +225,8 @@ local function cleanList(listKey, jobKeyPrefix, rangeStart, rangeEnd,
       break
     end
     local jobKey = jobKeyPrefix .. job
-    if (isWaiting or rcall("EXISTS", jobKey .. ":lock") == 0) then
+    if (isWaiting or rcall("EXISTS", jobKey .. ":lock") == 0) and
+      not isJobSchedulerJob(job, jobKey, jobSchedulersKey) then
       -- Find the right timestamp of the job to compare to maxTimestamp:
       -- * finishedOn says when the job was completed, but it isn't set unless the job has actually completed
       -- * processedOn represents when the job was last attempted, but it doesn't get populated until
@@ -266,15 +282,6 @@ local function getJobsInZset(zsetKey, rangeEnd, limit)
     return rcall("ZRANGEBYSCORE", zsetKey, 0, rangeEnd)
   end
 end
-local function isJobSchedulerJob(jobId, jobSchedulersKey)
-    if jobSchedulersKey then
-        local jobSchedulerId = jobId:match("repeat:(.*):%d+")
-        if jobSchedulerId then
-            return rcall("ZSCORE", jobSchedulersKey, jobSchedulerId)
-        end
-    end
-    return false
-end
 local function cleanSet(
     setKey,
     jobKeyPrefix,
@@ -292,10 +299,10 @@ local function cleanSet(
         if limit > 0 and deletedCount >= limit then
             break
         end
+        local jobKey = jobKeyPrefix .. job
         -- Extract a Job Scheduler Id from jobId ("repeat:job-scheduler-id:millis") 
         -- and check if it is in the scheduled jobs
-        if not isJobSchedulerJob(job, jobSchedulersKey) then
-            local jobKey = jobKeyPrefix .. job
+        if not isJobSchedulerJob(job, jobKey, jobSchedulersKey) then
             if isFinished then
                 removeJob(job, true, jobKeyPrefix, true --[[remove debounce key]] )
                 deletedCount = deletedCount + 1
@@ -320,7 +327,8 @@ local function cleanSet(
 end
 local result
 if ARGV[4] == "active" then
-  result = cleanList(KEYS[1], ARGV[1], rangeStart, rangeEnd, ARGV[2], false --[[ hasFinished ]])
+  result = cleanList(KEYS[1], ARGV[1], rangeStart, rangeEnd, ARGV[2], false --[[ hasFinished ]],
+                      KEYS[3])
 elseif ARGV[4] == "delayed" then
   rangeEnd = "+inf"
   result = cleanSet(KEYS[1], ARGV[1], rangeEnd, ARGV[2], limit,
@@ -330,7 +338,8 @@ elseif ARGV[4] == "prioritized" then
   result = cleanSet(KEYS[1], ARGV[1], rangeEnd, ARGV[2], limit,
                     {"timestamp"}, false  --[[ hasFinished ]])
 elseif ARGV[4] == "wait" or ARGV[4] == "paused" then
-  result = cleanList(KEYS[1], ARGV[1], rangeStart, rangeEnd, ARGV[2], true --[[ hasFinished ]])
+  result = cleanList(KEYS[1], ARGV[1], rangeStart, rangeEnd, ARGV[2], true --[[ hasFinished ]],
+                      KEYS[3])
 else
   rangeEnd = ARGV[2]
   result = cleanSet(KEYS[1], ARGV[1], rangeEnd, ARGV[2], limit,

package/dist/esm/scripts/cleanJobsInSet-3.js.map

@@ -1 +1 @@
-{"version":3,"file":"cleanJobsInSet-3.js","sourceRoot":"","sources":["../../../src/scripts/cleanJobsInSet-3.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoVf,CAAC;AACF,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI,EAAE,gBAAgB;IACtB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}
+{"version":3,"file":"cleanJobsInSet-3.js","sourceRoot":"","sources":["../../../src/scripts/cleanJobsInSet-3.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6Vf,CAAC;AACF,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI,EAAE,gBAAgB;IACtB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}

package/dist/esm/scripts/drain-5.js

@@ -8,6 +8,7 @@ const content = `--[[
     KEYS[4] 'prioritized'
     KEYS[5] 'jobschedulers' (repeat)
     ARGV[1]  queue key prefix
+    ARGV[2]  should clean delayed jobs
 ]]
 local rcall = redis.call
 local queueBaseKey = ARGV[1]
@@ -15,6 +16,18 @@ local queueBaseKey = ARGV[1]
   Functions to remove jobs.
 ]]
 -- Includes
+--[[
+  Function to filter out jobs to ignore from a table.
+]]
+local function filterOutJobsToIgnore(jobs, jobsToIgnore)
+  local filteredJobs = {}
+  for i = 1, #jobs do
+    if not jobsToIgnore[jobs[i]] then
+      table.insert(filteredJobs, jobs[i])
+    end
+  end
+  return filteredJobs
+end
 --[[
   Functions to remove jobs.
 ]]
@@ -181,8 +194,11 @@ end
 local function getListItems(keyName, max)
   return rcall('LRANGE', keyName, 0, max - 1)
 end
-local function removeListJobs(keyName, hard, baseKey, max)
+local function removeListJobs(keyName, hard, baseKey, max, jobsToIgnore)
   local jobs = getListItems(keyName, max)
+  if jobsToIgnore then
+    jobs = filterOutJobsToIgnore(jobs, jobsToIgnore)
+  end
   local count = removeJobs(jobs, hard, baseKey, max)
   rcall("LTRIM", keyName, #jobs, -1)
   return count
@@ -212,15 +228,8 @@ local function getZSetItems(keyName, max)
 end
 local function removeZSetJobs(keyName, hard, baseKey, max, jobsToIgnore)
   local jobs = getZSetItems(keyName, max)
-  -- filter out jobs to ignore
   if jobsToIgnore then
-    local filteredJobs = {}
-    for i = 1, #jobs do
-      if not jobsToIgnore[jobs[i]] then
-        table.insert(filteredJobs, jobs[i])
-      end
-    end
-    jobs = filteredJobs
+    jobs = filterOutJobsToIgnore(jobs, jobsToIgnore)
   end
   local count = removeJobs(jobs, hard, baseKey, max)
   if(#jobs > 0) then
@@ -230,22 +239,22 @@ local function removeZSetJobs(keyName, hard, baseKey, max, jobsToIgnore)
   end
   return count
 end
-removeListJobs(KEYS[1], true, queueBaseKey, 0) -- wait
-removeListJobs(KEYS[2], true, queueBaseKey, 0) -- paused
-if KEYS[3] ~= "" then
-    -- We must not remove delayed jobs if they are associated to a job scheduler.
-    local scheduledJobs = {}
-    local jobSchedulers = rcall("ZRANGE", KEYS[5], 0, -1, "WITHSCORES")
-    -- For every job scheduler, get the current delayed job id.
-    for i = 1, #jobSchedulers, 2 do
-        local jobSchedulerId = jobSchedulers[i]
-        local jobSchedulerMillis = jobSchedulers[i + 1]
-        local delayedJobId = "repeat:" .. jobSchedulerId .. ":" .. jobSchedulerMillis
-        scheduledJobs[delayedJobId] = true
-    end
-    removeZSetJobs(KEYS[3], true, queueBaseKey, 0, scheduledJobs) -- delayed
+-- We must not remove delayed jobs if they are associated to a job scheduler.
+local scheduledJobs = {}
+local jobSchedulers = rcall("ZRANGE", KEYS[5], 0, -1, "WITHSCORES")
+-- For every job scheduler, get the current delayed job id.
+for i = 1, #jobSchedulers, 2 do
+    local jobSchedulerId = jobSchedulers[i]
+    local jobSchedulerMillis = jobSchedulers[i + 1]
+    local delayedJobId = "repeat:" .. jobSchedulerId .. ":" .. jobSchedulerMillis
+    scheduledJobs[delayedJobId] = true
+end
+removeListJobs(KEYS[1], true, queueBaseKey, 0, scheduledJobs) -- wait
+removeListJobs(KEYS[2], true, queueBaseKey, 0, scheduledJobs) -- paused
+if ARGV[2] == "1" then
+  removeZSetJobs(KEYS[3], true, queueBaseKey, 0, scheduledJobs) -- delayed
 end
-removeZSetJobs(KEYS[4], true, queueBaseKey, 0) -- prioritized
+removeZSetJobs(KEYS[4], true, queueBaseKey, 0, scheduledJobs) -- prioritized
 `;
 export const drain = {
     name: 'drain',

package/dist/esm/scripts/drain-5.js.map

@@ -1 +1 @@
-{"version":3,"file":"drain-5.js","sourceRoot":"","sources":["../../../src/scripts/drain-5.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwPf,CAAC;AACF,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,IAAI,EAAE,OAAO;IACb,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}
+{"version":3,"file":"drain-5.js","sourceRoot":"","sources":["../../../src/scripts/drain-5.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiQf,CAAC;AACF,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,IAAI,EAAE,OAAO;IACb,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}

package/dist/esm/scripts/index.d.ts

@@ -34,7 +34,7 @@ export * from './pause-7';
 export * from './promote-9';
 export * from './releaseLock-1';
 export * from './removeChildDependency-1';
-export * from './removeJob-2';
+export * from './removeJob-3';
 export * from './removeJobScheduler-3';
 export * from './removeRepeatable-3';
 export * from './reprocessJob-8';

package/dist/esm/scripts/index.js

@@ -34,7 +34,7 @@ export * from './pause-7';
 export * from './promote-9';
 export * from './releaseLock-1';
 export * from './removeChildDependency-1';
-export * from './removeJob-2';
+export * from './removeJob-3';
 export * from './removeJobScheduler-3';
 export * from './removeRepeatable-3';
 export * from './reprocessJob-8';

package/dist/esm/scripts/obliterate-2.js

@@ -183,11 +183,26 @@ end
   Functions to remove jobs.
 ]]
 -- Includes
+--[[
+  Function to filter out jobs to ignore from a table.
+]]
+local function filterOutJobsToIgnore(jobs, jobsToIgnore)
+  local filteredJobs = {}
+  for i = 1, #jobs do
+    if not jobsToIgnore[jobs[i]] then
+      table.insert(filteredJobs, jobs[i])
+    end
+  end
+  return filteredJobs
+end
 local function getListItems(keyName, max)
   return rcall('LRANGE', keyName, 0, max - 1)
 end
-local function removeListJobs(keyName, hard, baseKey, max)
+local function removeListJobs(keyName, hard, baseKey, max, jobsToIgnore)
   local jobs = getListItems(keyName, max)
+  if jobsToIgnore then
+    jobs = filterOutJobsToIgnore(jobs, jobsToIgnore)
+  end
   local count = removeJobs(jobs, hard, baseKey, max)
   rcall("LTRIM", keyName, #jobs, -1)
   return count
@@ -217,15 +232,8 @@ local function getZSetItems(keyName, max)
 end
 local function removeZSetJobs(keyName, hard, baseKey, max, jobsToIgnore)
   local jobs = getZSetItems(keyName, max)
-  -- filter out jobs to ignore
   if jobsToIgnore then
-    local filteredJobs = {}
-    for i = 1, #jobs do
-      if not jobsToIgnore[jobs[i]] then
-        table.insert(filteredJobs, jobs[i])
-      end
-    end
-    jobs = filteredJobs
+    jobs = filterOutJobsToIgnore(jobs, jobsToIgnore)
   end
   local count = removeJobs(jobs, hard, baseKey, max)
   if(#jobs > 0) then

package/dist/esm/scripts/obliterate-2.js.map

@@ -1 +1 @@
-{"version":3,"file":"obliterate-2.js","sourceRoot":"","sources":["../../../src/scripts/obliterate-2.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6Tf,CAAC;AACF,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,IAAI,EAAE,YAAY;IAClB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}
+{"version":3,"file":"obliterate-2.js","sourceRoot":"","sources":["../../../src/scripts/obliterate-2.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqUf,CAAC;AACF,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,IAAI,EAAE,YAAY;IAClB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}

package/dist/esm/scripts/{removeJob-2.js → removeJob-3.js}

@@ -4,6 +4,7 @@ const content = `--[[
     Input:
       KEYS[1] queue prefix
       KEYS[2] meta key
+      KEYS[3] repeat key
       ARGV[1] jobId
       ARGV[2] remove children
     Events:
@@ -32,6 +33,21 @@ local function getOrSetMaxEvents(metaKey)
     end
     return maxEvents
 end
+--[[
+  Function to check if the job belongs to a job scheduler and
+  current delayed job matches with jobId
+]]
+local function isJobSchedulerJob(jobId, jobKey, jobSchedulersKey)
+  local repeatJobKey = rcall("HGET", jobKey, "rjk")
+  if repeatJobKey  then
+    local prevMillis = rcall("ZSCORE", jobSchedulersKey, repeatJobKey)
+    if prevMillis ~= false then
+      local currentDelayedJobId = "repeat:" .. repeatJobKey .. ":" .. prevMillis
+      return jobId == currentDelayedJobId
+    end
+  end
+  return false
+end
 --[[
   Function to recursively check if there are no locks
   on the jobs to be removed.
@@ -271,9 +287,9 @@ local prefix = KEYS[1]
 local jobId = ARGV[1]
 local shouldRemoveChildren = ARGV[2]
 local jobKey = prefix .. jobId
--- Check if the job belongs to a job scheduler and it is in delayed state.
-if rcall("ZSCORE", prefix .. "delayed", jobId) and rcall("HGET", jobKey, "rjk") then
-    return -8 -- Return error code as the job is part of a job scheduler and is in delayed state.
+local repeatKey = KEYS[3]
+if isJobSchedulerJob(jobId, jobKey, repeatKey) then
+    return -8
 end
 if not isLocked(prefix, jobId, shouldRemoveChildren) then
     removeJob(prefix, jobId, nil, shouldRemoveChildren)
@@ -284,6 +300,6 @@ return 0
 export const removeJob = {
     name: 'removeJob',
     content,
-    keys: 2,
+    keys: 3,
 };
-//# sourceMappingURL=removeJob-2.js.map
+//# sourceMappingURL=removeJob-3.js.map

package/dist/esm/scripts/removeJob-3.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"removeJob-3.js","sourceRoot":"","sources":["../../../src/scripts/removeJob-3.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0Sf,CAAC;AACF,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,WAAW;IACjB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}