bullmq 5.8.7 → 5.10.0

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

@@ -10,8 +10,9 @@
       KEYS[3] 'id'
       KEYS[4] 'prioritized'
       KEYS[5] 'completed'
-      KEYS[6] events stream key
-      KEYS[7] 'pc' priority counter
+      KEYS[6] 'active'
+      KEYS[7] events stream key
+      KEYS[8] 'pc' priority counter
 
       ARGV[1] msgpacked arguments array
             [1]  key prefix,
@@ -36,8 +37,9 @@ local idKey = KEYS[3]
 local priorityKey = KEYS[4]
 
 local completedKey = KEYS[5]
-local eventsKey = KEYS[6]
-local priorityCounterKey = KEYS[7]
+local activeKey = KEYS[6]
+local eventsKey = KEYS[7]
+local priorityCounterKey = KEYS[8]
 
 local jobId
 local jobIdKey
@@ -58,7 +60,7 @@ local parentData
 --- @include "includes/storeJob"
 --- @include "includes/getOrSetMaxEvents"
 --- @include "includes/handleDuplicatedJob"
---- @include "includes/isQueuePaused"
+--- @include "includes/isQueuePausedOrMaxed"
 
 if parentKey ~= nil then
     if rcall("EXISTS", parentKey) ~= 1 then return -5 end
@@ -91,8 +93,8 @@ local delay, priority = storeJob(eventsKey, jobIdKey, jobId, args[3], ARGV[2],
                                  repeatJobKey)
 
 -- Add the job to the prioritized set
-local isPause = isQueuePaused(metaKey)
-addJobWithPriority( KEYS[1], priorityKey, priority, jobId, priorityCounterKey, isPause)
+local isPausedOrMaxed = isQueuePausedOrMaxed(metaKey, activeKey)
+addJobWithPriority( KEYS[1], priorityKey, priority, jobId, priorityCounterKey, isPausedOrMaxed)
 
 -- Emit waiting event
 rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "waiting",

package/dist/cjs/commands/addRepeatableJob-2.lua

@@ -0,0 +1,69 @@
+--[[
+  Adds a repeatable job
+
+    Input:
+      KEYS[1] 'repeat' key
+      KEYS[2] custom key
+
+      ARGV[1] next milliseconds
+      ARGV[2] msgpacked options
+            [1]  name
+            [2]  tz?
+            [3]  patten?
+            [4]  endDate?
+            [5]  every?
+      ARGV[3] legacy custom key TODO: remove this logic in next breaking change
+      ARGV[4] skipCheckExists
+
+      Output:
+        repeatableKey  - OK
+]]
+local rcall = redis.call
+local repeatKey = KEYS[1]
+local customKey = KEYS[2]
+local legacyCustomKey = ARGV[3]
+local nextMilli = ARGV[1]
+
+local function storeRepeatableJob(repeatKey, customKey, nextMilli, rawOpts)
+  rcall("ZADD", repeatKey, nextMilli, customKey)
+  local opts = cmsgpack.unpack(rawOpts)
+
+  local optionalValues = {}
+  if opts['tz'] then
+    table.insert(optionalValues, "tz")
+    table.insert(optionalValues, opts['tz'])
+  end
+
+  if opts['pattern'] then
+    table.insert(optionalValues, "pattern")
+    table.insert(optionalValues, opts['pattern'])
+  end
+
+  if opts['endDate'] then
+    table.insert(optionalValues, "endDate")
+    table.insert(optionalValues, opts['endDate'])
+  end
+  
+  if opts['every'] then
+    table.insert(optionalValues, "every")
+    table.insert(optionalValues, opts['every'])
+  end
+
+  rcall("HMSET", repeatKey .. ":" .. customKey, "name", opts['name'],
+    unpack(optionalValues))
+
+  return customKey
+end
+
+if ARGV[4] == '0' then
+  if rcall("ZSCORE", repeatKey, legacyCustomKey) ~= false then
+    rcall("ZADD", repeatKey, nextMilli, legacyCustomKey)
+    return legacyCustomKey
+  elseif rcall("ZSCORE", repeatKey, customKey) ~= false then
+    return storeRepeatableJob(repeatKey, customKey, nextMilli, ARGV[2])
+  end
+else
+  return storeRepeatableJob(repeatKey, customKey, nextMilli, ARGV[2])
+end
+
+return ''

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

@@ -20,8 +20,9 @@
       KEYS[3] 'meta'
       KEYS[4] 'id'
       KEYS[5] 'completed'
-      KEYS[6] events stream key
-      KEYS[7] marker key
+      KEYS[6] 'active'
+      KEYS[7] events stream key
+      KEYS[8] marker key
 
       ARGV[1] msgpacked arguments array
             [1]  key prefix,
@@ -41,7 +42,7 @@
         jobId  - OK
         -5     - Missing parent key
 ]]
-local eventsKey = KEYS[6]
+local eventsKey = KEYS[7]
 
 local jobId
 local jobIdKey
@@ -94,11 +95,11 @@ end
 storeJob(eventsKey, jobIdKey, jobId, args[3], ARGV[2], opts, timestamp,
          parentKey, parentData, repeatJobKey)
 
-local target, paused = getTargetQueueList(metaKey, KEYS[1], KEYS[2])
+local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[6], KEYS[1], KEYS[2])
 
 -- LIFO or FIFO
 local pushCmd = opts['lifo'] and 'RPUSH' or 'LPUSH'
-addJobInTargetList(target, KEYS[7], pushCmd, paused, jobId)
+addJobInTargetList(target, KEYS[8], pushCmd, isPausedOrMaxed, jobId)
 
 -- Emit waiting event
 rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "waiting",

package/dist/cjs/commands/{changePriority-6.lua → changePriority-7.lua}

@@ -5,8 +5,9 @@
     KEYS[2] 'paused'
     KEYS[3] 'meta'
     KEYS[4] 'prioritized'
-    KEYS[5] 'pc' priority counter
-    KEYS[6] 'marker'
+    KEYS[5] 'active'
+    KEYS[6] 'pc' priority counter
+    KEYS[7] 'marker'
 
     ARGV[1] priority value
     ARGV[2] job key
@@ -29,33 +30,34 @@ local rcall = redis.call
 --- @include "includes/pushBackJobWithPriority"
 
 local function reAddJobWithNewPriority( prioritizedKey, markerKey, targetKey,
-    priorityCounter, lifo, priority, jobId, paused)
+    priorityCounter, lifo, priority, jobId, isPausedOrMaxed)
     if priority == 0 then
         local pushCmd = lifo and 'RPUSH' or 'LPUSH'
-        addJobInTargetList(targetKey, markerKey, pushCmd, paused, jobId)
+        addJobInTargetList(targetKey, markerKey, pushCmd, isPausedOrMaxed, jobId)
     else
         if lifo then
             pushBackJobWithPriority(prioritizedKey, priority, jobId)
         else
             addJobWithPriority(markerKey, prioritizedKey, priority, jobId,
-                priorityCounter, paused)
+                priorityCounter, isPausedOrMaxed)
         end
     end
 end
 
 if rcall("EXISTS", jobKey) == 1 then
     local metaKey = KEYS[3]
-    local target, isPaused = getTargetQueueList(metaKey, KEYS[1], KEYS[2])
-    local markerKey = KEYS[6]
+    local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[5], KEYS[1], KEYS[2])
     local prioritizedKey = KEYS[4]
-
+    local priorityCounterKey = KEYS[6]
+    local markerKey = KEYS[7]
+    
     -- Re-add with the new priority
     if rcall("ZREM", KEYS[4], jobId) > 0 then
         reAddJobWithNewPriority( prioritizedKey, markerKey, target,
-            KEYS[5], ARGV[4] == '1', priority, jobId, isPaused)
+            priorityCounterKey, ARGV[4] == '1', priority, jobId, isPausedOrMaxed)
     elseif rcall("LREM", target, -1, jobId) > 0 then
         reAddJobWithNewPriority( prioritizedKey, markerKey, target,
-            KEYS[5], ARGV[4] == '1', priority, jobId, isPaused)
+            priorityCounterKey, ARGV[4] == '1', priority, jobId, isPausedOrMaxed)
     end
 
     rcall("HSET", jobKey, "priority", priority)

package/dist/cjs/commands/getCountsPerPriority-4.lua

@@ -16,13 +16,16 @@ local pausedKey = KEYS[2]
 local prioritizedKey = KEYS[4]
 
 -- Includes
---- @include "includes/getTargetQueueList"
+--- @include "includes/isQueuePaused"
 
 for i = 1, #ARGV do
   local priority = tonumber(ARGV[i])
   if priority == 0 then
-    local target = getTargetQueueList(KEYS[3], waitKey, pausedKey)
-    results[#results+1] = rcall("LLEN", target)
+    if isQueuePaused(KEYS[3]) then
+      results[#results+1] = rcall("LLEN", pausedKey)
+    else
+      results[#results+1] = rcall("LLEN", waitKey)
+    end
   else
     results[#results+1] = rcall("ZCOUNT", prioritizedKey,
       priority * 0x100000000, (priority + 1)  * 0x100000000 - 1)

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

@@ -2,8 +2,8 @@
   Add marker if needed when a job is available.
 ]]
 
-local function addBaseMarkerIfNeeded(markerKey, isPaused)
-  if not isPaused then
+local function addBaseMarkerIfNeeded(markerKey, isPausedOrMaxed)
+  if not isPausedOrMaxed then
     rcall("ZADD", markerKey, 0, "0")
   end  
 end

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

@@ -5,7 +5,7 @@
 -- Includes
 --- @include "addBaseMarkerIfNeeded"
 
-local function addJobInTargetList(targetKey, markerKey, pushCmd, isPaused, jobId)
+local function addJobInTargetList(targetKey, markerKey, pushCmd, isPausedOrMaxed, jobId)
   rcall(pushCmd, targetKey, jobId)
-  addBaseMarkerIfNeeded(markerKey, isPaused)
+  addBaseMarkerIfNeeded(markerKey, isPausedOrMaxed)
 end

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

@@ -5,9 +5,10 @@
 -- Includes
 --- @include "addBaseMarkerIfNeeded"
 
-local function addJobWithPriority(markerKey, prioritizedKey, priority, jobId, priorityCounterKey, isPaused)
+local function addJobWithPriority(markerKey, prioritizedKey, priority, jobId, priorityCounterKey,
+  isPausedOrMaxed)
   local prioCounter = rcall("INCR", priorityCounterKey)
   local score = priority * 0x100000000 + prioCounter % 0x100000000
   rcall("ZADD", prioritizedKey, score, jobId)
-  addBaseMarkerIfNeeded(markerKey, isPaused)
+  addBaseMarkerIfNeeded(markerKey, isPausedOrMaxed)
 end

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

@@ -3,10 +3,20 @@
   (since an empty list and !EXISTS are not really the same).
 ]]
 
-local function getTargetQueueList(queueMetaKey, waitKey, pausedKey)
-  if rcall("HEXISTS", queueMetaKey, "paused") ~= 1 then
-    return waitKey, false
-  else
+local function getTargetQueueList(queueMetaKey, activeKey, waitKey, pausedKey)
+  local queueAttributes = rcall("HMGET", queueMetaKey, "paused", "concurrency")
+
+  if queueAttributes[1] then
     return pausedKey, true
+  else
+    if queueAttributes[2] then
+      local activeCount = rcall("LLEN", activeKey)
+      if activeCount >= tonumber(queueAttributes[2]) then
+        return waitKey, true
+      else
+        return waitKey, false
+      end
+    end
   end
+  return waitKey, false
 end

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

@@ -0,0 +1,15 @@
+--[[
+  Function to check if queue is maxed or not.
+]]
+local function isQueueMaxed(queueMetaKey, activeKey)
+  local maxConcurrency = rcall("HGET", queueMetaKey, "concurrency")
+
+  if maxConcurrency then
+    local activeCount = rcall("LLEN", activeKey)
+    if activeCount >= tonumber(maxConcurrency) then
+      return true
+    end
+  end
+
+  return false
+end

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

@@ -3,5 +3,5 @@
   (since an empty list and !EXISTS are not really the same).
 ]]
 local function isQueuePaused(queueMetaKey)
-    return rcall("HEXISTS", queueMetaKey, "paused") == 1
+  return rcall("HEXISTS", queueMetaKey, "paused") == 1
 end

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

@@ -0,0 +1,18 @@
+--[[
+  Function to check if queue is paused or maxed
+  (since an empty list and !EXISTS are not really the same).
+]]
+
+local function isQueuePausedOrMaxed(queueMetaKey, activeKey)
+  local queueAttributes = rcall("HMGET", queueMetaKey, "paused", "concurrency")
+
+  if queueAttributes[1] then
+    return true
+  else
+    if queueAttributes[2] then
+      local activeCount = rcall("LLEN", activeKey)
+      return activeCount >= tonumber(queueAttributes[2])
+    end
+  end
+  return false
+end

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

@@ -6,7 +6,7 @@
 --- @include "addDelayMarkerIfNeeded"
 --- @include "addJobInTargetList"
 --- @include "addJobWithPriority"
---- @include "isQueuePaused"
+--- @include "isQueuePausedOrMaxed"
 --- @include "getTargetQueueList"
 
 local function moveParentToWaitIfNeeded(parentQueueKey, parentDependenciesKey,
@@ -17,6 +17,7 @@ local function moveParentToWaitIfNeeded(parentQueueKey, parentDependenciesKey,
         rcall("ZREM", parentQueueKey .. ":waiting-children", parentId)
         local parentWaitKey = parentQueueKey .. ":wait"
         local parentPausedKey = parentQueueKey .. ":paused"
+        local parentActiveKey = parentQueueKey .. ":active"
         local parentMetaKey = parentQueueKey .. ":meta"
 
         local parentMarkerKey = parentQueueKey .. ":marker"
@@ -35,15 +36,16 @@ local function moveParentToWaitIfNeeded(parentQueueKey, parentDependenciesKey,
             addDelayMarkerIfNeeded(parentMarkerKey, parentDelayedKey)
         else
             if priority == 0 then
-                local parentTarget, isParentPaused =
-                    getTargetQueueList(parentMetaKey, parentWaitKey,
+                local parentTarget, isParentPausedOrMaxed =
+                    getTargetQueueList(parentMetaKey, parentActiveKey, parentWaitKey,
                                        parentPausedKey)
-                addJobInTargetList(parentTarget, parentMarkerKey, "RPUSH", isParentPaused, parentId)
+                addJobInTargetList(parentTarget, parentMarkerKey, "RPUSH", isParentPausedOrMaxed,
+                    parentId)
             else
-                local isPaused = isQueuePaused(parentMetaKey)
+                local isPausedOrMaxed = isQueuePausedOrMaxed(parentMetaKey, parentActiveKey)
                 addJobWithPriority(parentMarkerKey,
                                    parentQueueKey .. ":prioritized", priority,
-                                   parentId, parentQueueKey .. ":pc", isPaused)
+                                   parentId, parentQueueKey .. ":pc", isPausedOrMaxed)
             end
 
             rcall("XADD", parentQueueKey .. ":events", "*", "event", "waiting",

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

@@ -11,9 +11,9 @@
 --- @include "removeJobKeys"
 
 local function moveParentToWait(parentPrefix, parentId, emitEvent)
-  local parentTarget, isPaused = getTargetQueueList(parentPrefix .. "meta", parentPrefix .. "wait",
-    parentPrefix .. "paused")
-  addJobInTargetList(parentTarget, parentPrefix .. "marker", "RPUSH", isPaused, parentId)
+  local parentTarget, isPausedOrMaxed = getTargetQueueList(parentPrefix .. "meta", parentPrefix .. "active",
+    parentPrefix .. "wait", parentPrefix .. "paused")
+  addJobInTargetList(parentTarget, parentPrefix .. "marker", "RPUSH", isPausedOrMaxed, parentId)
 
   if emitEvent then
     local parentEventStream = parentPrefix .. "events"

package/dist/cjs/commands/isMaxed-2.lua

@@ -0,0 +1,17 @@
+--[[
+  Checks if queue is maxed.
+
+  Input:
+    KEYS[1] meta key
+    KEYS[2] active key
+
+  Output:
+    1 if element found in the list.
+]]
+
+local rcall = redis.call
+
+-- Includes
+--- @include "includes/isQueueMaxed"
+
+return isQueueMaxed(KEYS[1], KEYS[2])

package/dist/cjs/commands/moveJobFromActiveToWait-10.lua

@@ -35,7 +35,7 @@ if lockToken == token then
   local metaKey = KEYS[6]
   local removed = rcall("LREM", KEYS[1], 1, jobId)
   if removed > 0 then
-    local target, isPaused = getTargetQueueList(metaKey, KEYS[2], KEYS[5])
+    local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[1], KEYS[2], KEYS[5])
 
     rcall("SREM", KEYS[3], jobId)
 
@@ -44,7 +44,7 @@ if lockToken == token then
     if priority > 0 then
       pushBackJobWithPriority(KEYS[8], priority, jobId)
     else
-      addJobInTargetList(target, KEYS[9], "RPUSH", isPaused, jobId)
+      addJobInTargetList(target, KEYS[9], "RPUSH", isPausedOrMaxed, jobId)
     end
 
     rcall("DEL", lockKey)

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

@@ -10,7 +10,8 @@
     KEYS[4] 'wait'
     KEYS[5] 'paused'
     KEYS[6] 'meta'
-    KEYS[7] 'marker'
+    KEYS[7] 'active'
+    KEYS[8] 'marker'
 
     ARGV[1] count
     ARGV[2] timestamp
@@ -32,7 +33,7 @@ local rcall = redis.call;
 --- @include "includes/getTargetQueueList"
 
 local metaKey = KEYS[6]
-local target, paused = getTargetQueueList(metaKey, KEYS[4], KEYS[5])
+local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[7], KEYS[4], KEYS[5])
 
 local jobs = rcall('ZRANGEBYSCORE', KEYS[3], 0, timestamp, 'LIMIT', 0, maxCount)
 if (#jobs > 0) then
@@ -62,7 +63,7 @@ if (#jobs > 0) then
         rcall("LPUSH", target, unpack(jobs, from, to))
     end
 
-    addBaseMarkerIfNeeded(KEYS[7], paused)
+    addBaseMarkerIfNeeded(KEYS[8], isPausedOrMaxed)
 end
 
 maxCount = maxCount - #jobs

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

@@ -142,11 +142,11 @@ if (#stalling > 0) then
 
                         table.insert(failed, jobId)
                     else
-                        local target, isPaused=
-                            getTargetQueueList(metaKey, waitKey, pausedKey)
+                        local target, isPausedOrMaxed=
+                            getTargetQueueList(metaKey, activeKey, waitKey, pausedKey)
 
                         -- Move the job back to the wait queue, to immediately be picked up by a waiting worker.
-                        addJobInTargetList(target, markerKey, "RPUSH", isPaused, jobId)
+                        addJobInTargetList(target, markerKey, "RPUSH", isPausedOrMaxed, jobId)
 
                         rcall("XADD", eventStreamKey, "*", "event",
                               "waiting", "jobId", jobId, 'prev', 'active')

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

@@ -50,12 +50,12 @@ local opts = cmsgpack.unpack(ARGV[3])
 --- @include "includes/prepareJobForProcessing"
 --- @include "includes/promoteDelayedJobs"
 
-local target, paused = getTargetQueueList(KEYS[9], waitKey, KEYS[8])
+local target, isPausedOrMaxed = getTargetQueueList(KEYS[9], activeKey, waitKey, KEYS[8])
 
 -- Check if there are delayed jobs that we can move to wait.
 local markerKey = KEYS[11]
 promoteDelayedJobs(delayedKey, markerKey, target, KEYS[3], eventStreamKey, ARGV[1],
-                   ARGV[2], KEYS[10], paused)
+                   ARGV[2], KEYS[10], isPausedOrMaxed)
 
 local maxJobs = tonumber(opts['limiter'] and opts['limiter']['max'])
 local expireTime = getRateLimitTTL(maxJobs, rateLimiterKey)
@@ -63,8 +63,8 @@ local expireTime = getRateLimitTTL(maxJobs, rateLimiterKey)
 -- Check if we are rate limited first.
 if expireTime > 0 then return {0, 0, expireTime, 0} end
 
--- paused queue
-if paused then return {0, 0, 0, 0} end
+-- paused or maxed queue
+if isPausedOrMaxed then return {0, 0, 0, 0} end
 
 -- no job ID, try non-blocking move from wait to active
 local jobId = rcall("RPOPLPUSH", waitKey, activeKey)

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

@@ -202,11 +202,11 @@ if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
     -- and not rate limited.
     if (ARGV[6] == "1") then
 
-        local target, paused = getTargetQueueList(metaKey, KEYS[1], KEYS[8])
+        local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[2], KEYS[1], KEYS[8])
 
         -- Check if there are delayed jobs that can be promoted
         promoteDelayedJobs(KEYS[7], KEYS[14], target, KEYS[3], eventStreamKey, ARGV[7],
-                           timestamp, KEYS[10], paused)
+                           timestamp, KEYS[10], isPausedOrMaxed)
 
         local maxJobs = tonumber(opts['limiter'] and opts['limiter']['max'])
         -- Check if we are rate limited first.
@@ -214,8 +214,8 @@ if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
 
         if expireTime > 0 then return {0, 0, expireTime, 0} end
 
-        -- paused queue
-        if paused then return {0, 0, 0, 0} end
+        -- paused or maxed queue
+        if isPausedOrMaxed then return {0, 0, 0, 0} end
 
         jobId = rcall("RPOPLPUSH", KEYS[1], KEYS[2])
 

package/dist/cjs/commands/moveToWaitingChildren-5.lua

@@ -21,8 +21,9 @@
    -3 - Job not in active set
 ]]
 local rcall = redis.call
+local stalledKey = KEYS[5]
 
--- Includes
+--- Includes
 --- @include "includes/removeLock"
 
 local function moveToWaitingChildren (activeKey, waitingChildrenKey, jobId,
@@ -43,7 +44,7 @@ end
 if rcall("EXISTS", KEYS[4]) == 1 then
   if ARGV[2] ~= "" then
     if rcall("SISMEMBER", KEYS[4] .. ":dependencies", ARGV[2]) ~= 0 then
-      local errorCode = removeLock(KEYS[4], KEYS[5], ARGV[1], ARGV[4])
+      local errorCode = removeLock(KEYS[4], stalledKey, ARGV[1], ARGV[4])
       if errorCode < 0 then
         return errorCode
       end
@@ -53,7 +54,7 @@ if rcall("EXISTS", KEYS[4]) == 1 then
     return 1
   else
     if rcall("SCARD", KEYS[4] .. ":dependencies") ~= 0 then 
-      local errorCode = removeLock(KEYS[4], KEYS[5], ARGV[1], ARGV[4])
+      local errorCode = removeLock(KEYS[4], stalledKey, ARGV[1], ARGV[4])
       if errorCode < 0 then
         return errorCode
       end

package/dist/cjs/commands/obliterate-2.lua

@@ -1,5 +1,12 @@
 --[[
   Completely obliterates a queue and all of its contents
+  This command completely destroys a queue including all of its jobs, current or past 
+  leaving no trace of its existence. Since this script needs to iterate to find all the job
+  keys, consider that this call may be slow for very large queues.
+
+  The queue needs to be "paused" or it will return an error
+  If the queue has currently active jobs then the script by default will return error,
+  however this behaviour can be overrided using the 'force' option.
   
   Input:
     KEYS[1] meta
@@ -9,13 +16,6 @@
     ARGV[2] force
 ]]
 
--- This command completely destroys a queue including all of its jobs, current or past 
--- leaving no trace of its existence. Since this script needs to iterate to find all the job
--- keys, consider that this call may be slow for very large queues.
-
--- The queue needs to be "paused" or it will return an error
--- If the queue has currently active jobs then the script by default will return error,
--- however this behaviour can be overrided using the 'force' option.
 local maxCount = tonumber(ARGV[1])
 local baseKey = KEYS[2]
 
@@ -59,6 +59,22 @@ if(maxCount <= 0) then
   return 1
 end
 
+local repeatKey = baseKey .. 'repeat'
+local repeatJobsIds = getZSetItems(repeatKey, maxCount)
+for i, key in ipairs(repeatJobsIds) do
+  local jobKey = repeatKey .. ":" .. key
+  rcall("DEL", jobKey)
+end
+if(#repeatJobsIds > 0) then
+  for from, to in batches(#repeatJobsIds, 7000) do
+    rcall("ZREM", repeatKey, unpack(repeatJobsIds, from, to))
+  end
+end
+maxCount = maxCount - #repeatJobsIds
+if(maxCount <= 0) then
+  return 1
+end
+
 local completedKey = baseKey .. 'completed'
 maxCount = removeZSetJobs(completedKey, true, baseKey, maxCount)
 if(maxCount <= 0) then
@@ -92,7 +108,6 @@ if(maxCount > 0) then
     baseKey .. 'id',
     baseKey .. 'pc',
     baseKey .. 'meta',
-    baseKey .. 'repeat',
     baseKey .. 'metrics:completed',
     baseKey .. 'metrics:completed:data',
     baseKey .. 'metrics:failed',

package/dist/{esm/commands/promote-8.lua → cjs/commands/promote-9.lua}

@@ -7,9 +7,10 @@
       KEYS[3] 'paused'
       KEYS[4] 'meta'
       KEYS[5] 'prioritized'
-      KEYS[6] 'pc' priority counter
-      KEYS[7] 'event stream'
-      KEYS[8] 'marker'
+      KEYS[6] 'active'
+      KEYS[7] 'pc' priority counter
+      KEYS[8] 'event stream'
+      KEYS[9] 'marker'
 
       ARGV[1]  queue.toKey('')
       ARGV[2]  jobId
@@ -33,23 +34,24 @@ if rcall("ZREM", KEYS[1], jobId) == 1 then
     local jobKey = ARGV[1] .. jobId
     local priority = tonumber(rcall("HGET", jobKey, "priority")) or 0
     local metaKey = KEYS[4]
+    local markerKey = KEYS[9]
 
     -- Remove delayed "marker" from the wait list if there is any.
     -- Since we are adding a job we do not need the marker anymore.
     -- Markers in waitlist DEPRECATED in v5: Remove in v6.
-    local target, paused = getTargetQueueList(metaKey, KEYS[2], KEYS[3])
+    local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[6], KEYS[2], KEYS[3])
     local marker = rcall("LINDEX", target, 0)
     if marker and string.sub(marker, 1, 2) == "0:" then rcall("LPOP", target) end
 
     if priority == 0 then
         -- LIFO or FIFO
-        addJobInTargetList(target, KEYS[8], "LPUSH", paused, jobId)
+        addJobInTargetList(target, markerKey, "LPUSH", isPausedOrMaxed, jobId)
     else
-        addJobWithPriority(KEYS[8], KEYS[5], priority, jobId, KEYS[6], paused)
+        addJobWithPriority(markerKey, KEYS[5], priority, jobId, KEYS[7], isPausedOrMaxed)
     end
 
     -- Emit waiting event (wait..ing@token)
-    rcall("XADD", KEYS[7], "*", "event", "waiting", "jobId", jobId, "prev",
+    rcall("XADD", KEYS[8], "*", "event", "waiting", "jobId", jobId, "prev",
           "delayed");
 
     rcall("HSET", jobKey, "delay", 0)