bullmq 1.91.0 → 2.0.0

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

@@ -23,7 +23,6 @@
       KEYS[6] 'priority'
       KEYS[7] 'completed'
       KEYS[8] events stream key
-      KEYS[9] delay stream key
 
       ARGV[1] msgpacked arguments array
             [1]  key prefix,
@@ -61,6 +60,7 @@ local parentData
 --- @include "includes/addJobWithPriority"
 --- @include "includes/getTargetQueueList"
 --- @include "includes/trimEvents"
+--- @include "includes/getNextDelayedTimestamp"
 
 if parentKey ~= nil then
   if rcall("EXISTS", parentKey) ~= 1 then
@@ -139,7 +139,15 @@ elseif (delayedTimestamp ~= 0) then
     rcall("ZADD", KEYS[5], timestamp, jobId)
     rcall("XADD", KEYS[8], "*", "event", "delayed", "jobId", jobId, "delay",
           delayedTimestamp)
-    rcall("XADD", KEYS[9], "*", "nextTimestamp", delayedTimestamp)
+    -- If wait list is empty, and this delayed job is the next one to be processed,
+    -- then we need to signal the workers by adding a dummy job (jobId 0) to the wait list.
+    local target = getTargetQueueList(KEYS[3], KEYS[1], KEYS[2])
+    if rcall("LLEN", target) == 0 then
+      local nextTimestamp = getNextDelayedTimestamp(KEYS[5])
+      if delayedTimestamp < nextTimestamp then
+        rcall("LPUSH", target, 0)
+      end
+    end
 else
     local target = getTargetQueueList(KEYS[3], KEYS[1], KEYS[2])
 

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

@@ -0,0 +1,136 @@
+--[[
+  Move stalled jobs to wait.
+
+    Input:
+      stalledKey 'stalled' (SET)
+      waitKey 'wait',   (LIST)
+      activeKey 'active', (LIST)
+      failedKey 'failed', (ZSET)
+      stalledCheckKey 'stalled-check', (KEY)
+      metaKey 'meta', (KEY)
+      pausedKey 'paused', (LIST)
+      eventStreamKey 'event stream' (STREAM)
+
+      maxStalledJobCount  Max stalled job count
+      queueKeyPrefix  queue.toKey('')
+      timestamp  timestamp
+      maxCheckTime  max check time
+
+    Events:
+      'stalled' with stalled job id.
+]] local rcall = redis.call
+
+-- Includes
+--- @include "batches"
+--- @include "getTargetQueueList"
+--- @include "removeJob"
+--- @include "removeJobsByMaxAge"
+--- @include "removeJobsByMaxCount"
+--- @include "trimEvents"
+
+-- Check if we need to check for stalled jobs now.
+
+local function checkStalledJobs(stalledKey, waitKey, activeKey, failedKey, stalledCheckKey, metaKey, pausedKey, eventStreamKey, maxStalledJobCount, queueKeyPrefix, timestamp, maxCheckTime)
+    if rcall("EXISTS", stalledCheckKey) == 1 then 
+        return {{}, {}}
+    end
+
+    rcall("SET", stalledCheckKey, timestamp, "PX", maxCheckTime)
+
+    -- Trim events before emiting them to avoid trimming events emitted in this script
+    trimEvents(metaKey, eventStreamKey)
+
+    -- Move all stalled jobs to wait
+    local stalling = rcall('SMEMBERS', stalledKey)
+    local stalled = {}
+    local failed = {}
+    if (#stalling > 0) then
+        rcall('DEL', stalledKey)
+
+        local MAX_STALLED_JOB_COUNT = tonumber(maxStalledJobCount)
+
+        -- Remove from active list
+        for i, jobId in ipairs(stalling) do
+
+            if jobId == '0' then
+                -- If the jobId is a delay marker ID we just remove it.
+                local removed = rcall("LREM", activeKey, 1, jobId)
+            else
+                local jobKey = queueKeyPrefix .. jobId
+
+                -- Check that the lock is also missing, then we can handle this job as really stalled.
+                if (rcall("EXISTS", jobKey .. ":lock") == 0) then
+                    --  Remove from the active queue.
+                    local removed = rcall("LREM", activeKey, 1, jobId)
+
+                    if (removed > 0) then
+                        -- If this job has been stalled too many times, such as if it crashes the worker, then fail it.
+                        local stalledCount =
+                            rcall("HINCRBY", jobKey, "stalledCounter", 1)
+                        if (stalledCount > MAX_STALLED_JOB_COUNT) then
+                            local rawOpts = rcall("HGET", jobKey, "opts")
+                            local opts = cjson.decode(rawOpts)
+                            local removeOnFailType = type(opts["removeOnFail"])
+                            rcall("ZADD", failedKey, timestamp, jobId)
+                            local failedReason =
+                                "job stalled more than allowable limit"
+                            rcall("HMSET", jobKey, "failedReason", failedReason,
+                                "finishedOn", timestamp)
+                            rcall("XADD", eventStreamKey, "*", "event", "failed", "jobId",
+                                jobId, 'prev', 'active', 'failedReason',
+                                failedReason)
+
+                            if removeOnFailType == "number" then
+                                removeJobsByMaxCount(opts["removeOnFail"], failedKey,
+                                                    queueKeyPrefix)
+                            elseif removeOnFailType == "boolean" then
+                                if opts["removeOnFail"] then
+                                    removeJob(jobId, false, queueKeyPrefix)
+                                    rcall("ZREM", failedKey, jobId)
+                                end
+                            elseif removeOnFailType ~= "nil" then
+                                local maxAge = opts["removeOnFail"]["age"]
+                                local maxCount = opts["removeOnFail"]["count"]
+
+                                if maxAge ~= nil then
+                                    removeJobsByMaxAge(timestamp, maxAge, failedKey,
+                                                    queueKeyPrefix)
+                                end
+
+                                if maxCount ~= nil and maxCount > 0 then
+                                    removeJobsByMaxCount(maxCount, failedKey, queueKeyPrefix)
+                                end
+                            end
+
+                            table.insert(failed, jobId)
+                        else
+                            local target = getTargetQueueList(metaKey, waitKey,
+                                                            pausedKey)
+
+                            -- Move the job back to the wait queue, to immediately be picked up by a waiting worker.
+                            rcall("RPUSH", target, jobId)
+                            rcall("XADD", eventStreamKey, "*", "event", "waiting", "jobId",
+                                jobId, 'prev', 'active')
+
+                            -- Emit the stalled event
+                            rcall("XADD", eventStreamKey, "*", "event", "stalled", "jobId",
+                                jobId)
+                            table.insert(stalled, jobId)
+                        end
+                    end
+                end
+            end
+        end
+    end
+
+    -- Mark potentially stalled jobs
+    local active = rcall('LRANGE', activeKey, 0, -1)
+
+    if (#active > 0) then
+        for from, to in batches(#active, 7000) do
+            rcall('SADD', stalledKey, unpack(active, from, to))
+        end
+    end
+
+    return {failed, stalled}
+end

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

@@ -0,0 +1,13 @@
+--[[
+  Function to return the next delayed job timestamp.
+]] 
+local function getNextDelayedTimestamp(delayedKey)
+    local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
+    if #result then
+      local nextTimestamp = tonumber(result[2])
+      if (nextTimestamp ~= nil) then 
+        nextTimestamp = nextTimestamp / 0x1000
+      end
+      return nextTimestamp
+    end
+end

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

@@ -12,9 +12,6 @@
     keys[6] rate limiter key
     keys[7] delayed key
 
-    -- Delay events
-    keys[8] delay stream key
-
     opts - token - lock token
     opts - lockDuration
     opts - limiter
@@ -57,7 +54,7 @@ local function moveJobFromWaitToActive(keys, keyPrefix, jobId, processedOn, opts
       -- put job into delayed queue
       rcall("ZADD", keys[7], timestamp * 0x1000 + bit.band(jobCounter, 0xfff), jobId);
       rcall("XADD", keys[4], "*", "event", "delayed", "jobId", jobId, "delay", timestamp);
-      rcall("XADD", keys[8], "*", "nextTimestamp", timestamp);
+
       -- remove from active queue
       rcall("LREM", keys[2], 1, jobId)
 
@@ -72,20 +69,16 @@ local function moveJobFromWaitToActive(keys, keyPrefix, jobId, processedOn, opts
 
   local jobKey = keyPrefix .. jobId
   local lockKey = jobKey .. ':lock'
-  
+
   -- get a lock
   if opts['token'] ~= "0" then
     rcall("SET", lockKey, opts['token'], "PX", opts['lockDuration'])
   end
-  
+
   rcall("ZREM", keys[3], jobId) -- remove from priority
   rcall("XADD", keys[4], "*", "event", "active", "jobId", jobId, "prev", "waiting")
   rcall("HSET", jobKey, "processedOn", processedOn)
   rcall("HINCRBY", jobKey, "attemptsMade", 1)
-  local len = rcall("LLEN", keys[1])
-  if len == 0 then
-    rcall("XADD", keys[4], "*", "event", "drained");
-  end
 
   return {rcall("HGETALL", jobKey), jobId} -- get job data
 end

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

@@ -0,0 +1,57 @@
+--[[
+  Updates the delay set, by moving delayed jobs that should
+  be processed now to "wait".
+
+     Events:
+      'waiting'
+]]
+local rcall = redis.call
+
+-- Includes
+--- @include "getTargetQueueList"
+
+-- Try to get as much as 1000 jobs at once, and returns the nextTimestamp if
+-- there are more delayed jobs to process.
+local function promoteDelayedJobs(delayedKey, waitKey, priorityKey, pausedKey,
+                                  metaKey, eventStreamKey, prefix, timestamp)
+    local jobs = rcall("ZRANGEBYSCORE", delayedKey, 0, (timestamp + 1) * 0x1000, "LIMIT", 0, 1000)
+
+    if (#jobs > 0) then
+        rcall("ZREM", delayedKey, unpack(jobs))
+
+        -- check if we need to use push in paused instead of waiting
+        local target = getTargetQueueList(metaKey, waitKey, pausedKey)
+
+        for _, jobId in ipairs(jobs) do
+            local priority =
+                tonumber(rcall("HGET", prefix .. jobId, "priority")) or 0
+
+            if priority == 0 then
+                -- LIFO or FIFO
+                rcall("LPUSH", target, jobId)
+            else
+                -- Priority add
+                rcall("ZADD", priorityKey, priority, jobId)
+                local count = rcall("ZCOUNT", priorityKey, 0, priority)
+
+                local len = rcall("LLEN", target)
+                local id = rcall("LINDEX", target, len - (count - 1))
+                if id then
+                    rcall("LINSERT", target, "BEFORE", id, jobId)
+                else
+                    rcall("RPUSH", target, jobId)
+                end
+            end
+
+            -- Emit waiting event
+            rcall("XADD", eventStreamKey, "*", "event", "waiting", "jobId",
+                  jobId, "prev", "delayed")
+        end
+    end
+
+    local nextTimestamp = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")[2]
+    if (nextTimestamp ~= nil) then
+        nextTimestamp = nextTimestamp / 0x1000
+    end
+    return nextTimestamp
+end

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

@@ -18,105 +18,7 @@
 
     Events:
       'stalled' with stalled job id.
-]]
-local rcall = redis.call
-
--- Includes
---- @include "includes/batches"
---- @include "includes/getTargetQueueList"
---- @include "includes/removeJob"
---- @include "includes/removeJobsByMaxAge"
---- @include "includes/removeJobsByMaxCount"
---- @include "includes/trimEvents"
-
--- Check if we need to check for stalled jobs now.
-if rcall("EXISTS", KEYS[5]) == 1 then return {{}, {}} end
-
-rcall("SET", KEYS[5], ARGV[3], "PX", ARGV[4])
-
--- Trim events before emiting them to avoid trimming events emitted in this script
-trimEvents(KEYS[6], KEYS[8])
-
--- Move all stalled jobs to wait
-local stalling = rcall('SMEMBERS', KEYS[1])
-local stalled = {}
-local failed = {}
-if (#stalling > 0) then
-    rcall('DEL', KEYS[1])
-
-    local MAX_STALLED_JOB_COUNT = tonumber(ARGV[1])
-
-    -- Remove from active list
-    for i, jobId in ipairs(stalling) do
-        local jobKey = ARGV[2] .. jobId
-
-        -- Check that the lock is also missing, then we can handle this job as really stalled.
-        if (rcall("EXISTS", jobKey .. ":lock") == 0) then
-            --  Remove from the active queue.
-            local removed = rcall("LREM", KEYS[3], 1, jobId)
-
-            if (removed > 0) then
-                -- If this job has been stalled too many times, such as if it crashes the worker, then fail it.
-                local stalledCount = rcall("HINCRBY", jobKey, "stalledCounter",
-                                           1)
-                if (stalledCount > MAX_STALLED_JOB_COUNT) then
-                  local rawOpts = rcall("HGET",jobKey, "opts")
-                  local opts = cjson.decode(rawOpts)
-                  local removeOnFailType = type(opts["removeOnFail"])
-                  rcall("ZADD", KEYS[4], ARGV[3], jobId)
-                  local failedReason = "job stalled more than allowable limit" 
-                  rcall("HMSET", jobKey, "failedReason",
-                        failedReason, "finishedOn", ARGV[3])
-                  rcall("XADD", KEYS[8], "*", "event", "failed", "jobId",
-                        jobId, 'prev', 'active', 'failedReason',
-                        failedReason)
-
-                  if removeOnFailType == "number" then
-                    removeJobsByMaxCount(opts["removeOnFail"], KEYS[4], ARGV[2])
-                  elseif removeOnFailType == "boolean" then
-                    if opts["removeOnFail"] then
-                      removeJob(jobId, false, ARGV[2])
-                      rcall("ZREM", KEYS[4], jobId)
-                    end
-                  elseif removeOnFailType ~= "nil" then
-                    local maxAge = opts["removeOnFail"]["age"]
-                    local maxCount = opts["removeOnFail"]["count"]
-
-                    if maxAge ~= nil then
-                      removeJobsByMaxAge(ARGV[3], maxAge, KEYS[4], ARGV[2])
-                    end
-
-                    if maxCount ~= nil and maxCount > 0 then
-                      removeJobsByMaxCount(maxCount, KEYS[4], ARGV[2])
-                    end
-                  end
-
-                  table.insert(failed, jobId)                    
-                else
-                  local target = getTargetQueueList(KEYS[6], KEYS[2], KEYS[7])
-
-                  -- Move the job back to the wait queue, to immediately be picked up by a waiting worker.
-                  rcall("RPUSH", target, jobId)
-                  rcall("XADD", KEYS[8], "*", "event", "waiting", "jobId",
-                        jobId, 'prev', 'active')
-
-                  -- Emit the stalled event
-                  rcall("XADD", KEYS[8], "*", "event", "stalled", "jobId",
-                        jobId)
-                  table.insert(stalled, jobId)
-                end
-            end
-        end
-    end
-end
-
--- Mark potentially stalled jobs
-local active = rcall('LRANGE', KEYS[3], 0, -1)
-
-if (#active > 0) then
-  for from, to in batches(#active, 7000) do
-    rcall('SADD', KEYS[1], unpack(active, from, to))
-  end
-end
-
-return {failed, stalled}
+]] -- Includes
+--- @include "includes/checkStalledJobs"
+return checkStalledJobs(KEYS[1], KEYS[2], KEYS[3], KEYS[4], KEYS[5], KEYS[6],
+                        KEYS[7], KEYS[8], ARGV[1], ARGV[2], ARGV[3], ARGV[4])

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

@@ -0,0 +1,67 @@
+--[[
+  Move next job to be processed to active, lock it and fetch its data. The job
+  may be delayed, in that case we need to move it to the delayed set instead.
+
+  This operation guarantees that the worker owns the job during the lock
+  expiration time. The worker is responsible of keeping the lock fresh
+  so that no other worker picks this job again.
+
+  Input:
+      KEYS[1] wait key
+      KEYS[2] active key
+      KEYS[3] priority key
+      KEYS[4] stream events key
+      KEYS[5] stalled key
+
+      -- Rate limiting
+      KEYS[6] rate limiter key
+      KEYS[7] delayed key
+
+      -- Promote delayed jobs
+      KEYS[8] paused key
+      KEYS[9] meta key
+
+      -- Arguments
+      ARGV[1] key prefix
+      ARGV[2] timestamp
+      ARGV[3] optional job ID
+      ARGV[4] opts
+
+      opts - token - lock token
+      opts - lockDuration
+      opts - limiter
+]]
+local jobId
+local rcall = redis.call
+
+-- Includes
+--- @include "includes/moveJobFromWaitToActive"
+--- @include "includes/getNextDelayedTimestamp"
+--- @include "includes/promoteDelayedJobs"
+
+-- Check if there are delayed jobs that we can move to wait.
+promoteDelayedJobs(KEYS[7], KEYS[1], KEYS[3], KEYS[8], KEYS[9], KEYS[4], ARGV[1], ARGV[2])
+
+if (ARGV[3] ~= "") then
+    jobId = ARGV[3]
+    -- clean stalled key
+    rcall("SREM", KEYS[5], jobId)
+else
+    -- no job ID, try non-blocking move from wait to active
+    jobId = rcall("RPOPLPUSH", KEYS[1], KEYS[2])
+end
+
+-- If jobId is special ID 0, then there is no job to process
+if jobId == "0" then
+    rcall("LREM", KEYS[2], 1, 0)
+elseif jobId then
+    local opts = cmsgpack.unpack(ARGV[4])
+    -- this script is not really moving, it is preparing the job for processing
+    return moveJobFromWaitToActive(KEYS, ARGV[1], jobId, ARGV[2], opts)
+end
+
+-- Return the timestamp for the next delayed job if any.
+local nextTimestamp = getNextDelayedTimestamp(KEYS[7])
+if (nextTimestamp ~= nil) then
+    return nextTimestamp - tonumber(ARGV[2])
+end

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

@@ -15,8 +15,7 @@
       KEYS[6] rate limiter key
       KEYS[7] delayed key
 
-      -- Delay events
-      KEYS[8] delay stream key
+      KEYS[8] paused key
 
       KEYS[9] completed/failed key
       KEYS[10] jobId key
@@ -62,6 +61,8 @@ local rcall = redis.call
 --- @include "includes/trimEvents"
 --- @include "includes/updateParentDepsIfNeeded"
 --- @include "includes/collectMetrics"
+--- @include "includes/getNextDelayedTimestamp"
+--- @include "includes/promoteDelayedJobs"
 
 local jobIdKey = KEYS[10]
 if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
@@ -160,13 +161,36 @@ if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
     -- Try to get next job to avoid an extra roundtrip if the queue is not closing,
     -- and not rate limited.
     if (ARGV[7] == "1") then
-        -- move from wait to active
-        local jobId = rcall("RPOPLPUSH", KEYS[1], KEYS[2])
-        if jobId then
+
+        -- Check if there are delayed jobs that can be promoted
+        promoteDelayedJobs(KEYS[7], KEYS[1], KEYS[3], KEYS[8], KEYS[11], KEYS[4], ARGV[8], timestamp)
+
+        jobId = rcall("RPOPLPUSH", KEYS[1], KEYS[2])
+
+        if jobId == "0" then
+            rcall("LREM", KEYS[2], 1, 0)
+        elseif jobId then
             return moveJobFromWaitToActive(KEYS, ARGV[8], jobId, timestamp, opts)
         end
+
+        -- Return the timestamp for the next delayed job if any.
+        local nextTimestamp = getNextDelayedTimestamp(KEYS[7])
+        if (nextTimestamp ~= nil) then
+            -- The result is guaranteed to be positive, since the
+            -- ZRANGEBYSCORE command would have return a job otherwise.
+            return nextTimestamp - timestamp
+        end
     end
 
+    local waitLen = rcall("LLEN", KEYS[1])
+    if waitLen == 0 then
+        local activeLen = rcall("LLEN", KEYS[2])
+
+        if activeLen == 0 then
+            rcall("XADD", KEYS[4], "*", "event", "drained")
+        end
+    end  
+
     return 0
 else
     return -1

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

@@ -25,6 +25,12 @@ if rcall("ZREM", KEYS[1], jobId) == 1 then
   local priority = tonumber(rcall("HGET", ARGV[1] .. jobId, "priority")) or 0
   local target = getTargetQueueList(KEYS[4], KEYS[2], KEYS[3])
 
+  -- Remove delayed "marker" from the wait list if there is any.
+  -- Since we are adding a job we do not need the marker anymore.
+  if rcall("LINDEX", target, 0) == "0" then
+    rcall("LPOP", target)
+  end
+
   if priority == 0 then
     -- LIFO or FIFO
     rcall("LPUSH", target, jobId)

package/dist/cjs/interfaces/index.d.ts

@@ -14,7 +14,6 @@ export * from './parent-command';
 export * from './parent-message';
 export * from './parent';
 export * from './queue-options';
-export * from './queue-scheduler-options';
 export * from './rate-limiter-options';
 export * from './redis-options';
 export * from './redis-streams';

package/dist/cjs/interfaces/index.js

@@ -17,7 +17,6 @@ tslib_1.__exportStar(require("./parent-command"), exports);
 tslib_1.__exportStar(require("./parent-message"), exports);
 tslib_1.__exportStar(require("./parent"), exports);
 tslib_1.__exportStar(require("./queue-options"), exports);
-tslib_1.__exportStar(require("./queue-scheduler-options"), exports);
 tslib_1.__exportStar(require("./rate-limiter-options"), exports);
 tslib_1.__exportStar(require("./redis-options"), exports);
 tslib_1.__exportStar(require("./redis-streams"), exports);

package/dist/cjs/interfaces/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,4DAAkC;AAClC,0DAAgC;AAChC,0DAAgC;AAChC,uDAA6B;AAC7B,qDAA2B;AAC3B,2DAAiC;AACjC,qDAA2B;AAC3B,yDAA+B;AAC/B,sDAA4B;AAC5B,4DAAkC;AAClC,oDAA0B;AAC1B,2DAAiC;AACjC,2DAAiC;AACjC,mDAAyB;AACzB,0DAAgC;AAChC,oEAA0C;AAC1C,iEAAuC;AACvC,0DAAgC;AAChC,0DAAgC;AAChC,2DAAiC;AACjC,oEAA0C;AAC1C,0DAAgC;AAChC,2DAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,4DAAkC;AAClC,0DAAgC;AAChC,0DAAgC;AAChC,uDAA6B;AAC7B,qDAA2B;AAC3B,2DAAiC;AACjC,qDAA2B;AAC3B,yDAA+B;AAC/B,sDAA4B;AAC5B,4DAAkC;AAClC,oDAA0B;AAC1B,2DAAiC;AACjC,2DAAiC;AACjC,mDAAyB;AACzB,0DAAgC;AAChC,iEAAuC;AACvC,0DAAgC;AAChC,0DAAgC;AAChC,2DAAiC;AACjC,oEAA0C;AAC1C,0DAAgC;AAChC,2DAAiC"}

package/dist/cjs/interfaces/sandboxed-job.d.ts

@@ -6,7 +6,6 @@ import { JobsOptions } from './jobs-options';
 export interface SandboxedJob<T = any, R = any> extends Omit<JobJson, 'data' | 'opts' | 'progress' | 'returnValue'> {
     data: T;
     opts: JobsOptions;
-    progress: (() => object | number) | ((value: object | number) => Promise<void>);
     updateProgress: (value: object | number) => Promise<void>;
     log: (row: any) => void;
     update: (data: any) => Promise<void>;

package/dist/cjs/interfaces/worker-options.d.ts

@@ -29,6 +29,16 @@ export interface WorkerOptions extends QueueBaseOptions {
      * @see {@link https://docs.bullmq.io/guide/metrics}
      */
     metrics?: MetricsOptions;
+    /**
+     * Amount of times a job can be recovered from a stalled state
+     * to the `wait` state. If this is exceeded, the job is moved
+     * to `failed`.
+     */
+    maxStalledCount?: number;
+    /**
+     * Number of milliseconds between stallness checks.
+     */
+    stalledInterval?: number;
     skipDelayCheck?: boolean;
     drainDelay?: number;
     lockDuration?: number;

package/dist/esm/classes/child-processor.js

@@ -128,27 +128,7 @@ function wrapJob(job) {
             value: progress,
         });
     };
-    const progress = (progress) => {
-        console.warn([
-            'BullMQ: DEPRECATION WARNING! progress function in sandboxed processor is deprecated. This will',
-            'be removed in the next major release, you should use updateProgress method instead.',
-        ].join(' '));
-        if (progress) {
-            return updateProgress(progress);
-        }
-        else {
-            // Return the last known progress value.
-            return progressValue;
-        }
-    };
     return Object.assign(Object.assign({}, job), { data: JSON.parse(job.data || '{}'), opts: job.opts, returnValue: JSON.parse(job.returnvalue || '{}'), 
-        /**
-         * @deprecated Use updateProgress instead.
-         * Emulate the real job `progress` function.
-         * If no argument is given, it behaves as a sync getter.
-         * If an argument is given, it behaves as an async setter.
-         */
-        progress,
         /*
          * Emulate the real job `updateProgress` function, should works as `progress` function.
          */

package/dist/esm/classes/child-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"child-processor.js","sourceRoot":"","sources":["../../../src/classes/child-processor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"child-processor.js","sourceRoot":"","sources":["../../../src/classes/child-processor.ts"],"names":[],"mappings":"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"}

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

@@ -1,7 +1,6 @@
 export * from './backoffs';
 export * from './child-pool';
 export * from './child-processor';
-export * from './compat';
 export * from './flow-producer';
 export * from './job';
 export * from './process-utils';
@@ -9,7 +8,6 @@ export * from './queue-base';
 export * from './queue-events';
 export * from './queue-getters';
 export * from './queue-keys';
-export * from './queue-scheduler';
 export * from './queue';
 export * from './redis-connection';
 export * from './repeat';

package/dist/esm/classes/index.js

@@ -1,7 +1,6 @@
 export * from './backoffs';
 export * from './child-pool';
 export * from './child-processor';
-export * from './compat';
 export * from './flow-producer';
 export * from './job';
 // export * from './master'; this file must not be exported
@@ -10,7 +9,6 @@ export * from './queue-base';
 export * from './queue-events';
 export * from './queue-getters';
 export * from './queue-keys';
-export * from './queue-scheduler';
 export * from './queue';
 export * from './redis-connection';
 export * from './repeat';