bullmq 5.81.0 → 5.81.2

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

@@ -34,7 +34,7 @@ class FlowProducer extends events_1.EventEmitter {
             skipVersionCheck: opts.skipVersionCheck,
             skipWaitingForReady: opts.skipWaitingForReady,
         });
-        this.connection.on('error', (error) => this.emit('error', error));
+        (0, utils_1.forwardConnectionError)(this, this.connection);
         this.connection.on('close', () => {
             this.queues.clear();
             if (!this.closing) {

package/dist/cjs/classes/job.js

@@ -593,9 +593,9 @@ class Job {
     /**
      * Records job metrics if a meter is configured in telemetry options.
      *
-     * @param status - The job status
+     * @param state - The job state
      */
-    recordJobMetrics(status) {
+    recordJobMetrics(state) {
         var _a, _b;
         const meter = (_b = (_a = this.queue.opts) === null || _a === void 0 ? void 0 : _a.telemetry) === null || _b === void 0 ? void 0 : _b.meter;
         if (!meter) {
@@ -604,9 +604,10 @@ class Job {
         const attributes = {
             [enums_1.TelemetryAttributes.QueueName]: this.queue.name,
             [enums_1.TelemetryAttributes.JobName]: this.name,
-            [enums_1.TelemetryAttributes.JobStatus]: status,
+            [enums_1.TelemetryAttributes.JobStatus]: state,
+            [enums_1.TelemetryAttributes.JobState]: state,
         };
-        // Record counter metric based on status
+        // Record counter metric based on state
         const statusToCounterName = {
             completed: enums_1.MetricNames.JobsCompleted,
             failed: enums_1.MetricNames.JobsFailed,
@@ -615,9 +616,9 @@ class Job {
             waiting: enums_1.MetricNames.JobsWaiting,
             'waiting-children': enums_1.MetricNames.JobsWaitingChildren,
         };
-        const counterName = statusToCounterName[status];
+        const counterName = statusToCounterName[state];
         const counter = meter.createCounter(counterName, {
-            description: `Number of jobs ${status}`,
+            description: `Number of jobs ${state}`,
             unit: '1',
         });
         counter.add(1, attributes);

package/dist/cjs/classes/queue-base.js

@@ -40,7 +40,7 @@ class QueueBase extends events_1.EventEmitter {
             skipVersionCheck: opts.skipVersionCheck,
             skipWaitingForReady: opts.skipWaitingForReady,
         });
-        this.connection.on('error', (error) => this.emit('error', error));
+        (0, utils_1.forwardConnectionError)(this, this.connection);
         this.connection.on('close', () => {
             if (!this.closing) {
                 this.emit('ioredis:close');

package/dist/cjs/classes/queue-getters.js

@@ -389,8 +389,13 @@ class QueueGetters extends queue_base_1.QueueBase {
      */
     async getJobs(types, start = 0, end = -1, asc = false) {
         const currentTypes = this.sanitizeJobTypes(types);
-        const jobIds = await this.getRanges(currentTypes, start, end, asc);
-        return Promise.all(jobIds.map(jobId => this.Job.fromId(this, jobId)));
+        const jobDataByType = await this.scripts.getJobs(currentTypes, start, end, asc);
+        return jobDataByType.reduce((jobs, jobData) => {
+            for (const [jobId, jobHashFields] of jobData || []) {
+                jobs.push(this.Job.fromJSON(this, (0, utils_1.array2obj)(jobHashFields), jobId));
+            }
+            return jobs;
+        }, []);
     }
     /**
      * Returns the logs for a given Job.

package/dist/cjs/classes/scripts.js

@@ -15,6 +15,13 @@ const enums_1 = require("../enums");
 const utils_1 = require("../utils");
 const version_1 = require("../version");
 const errors_1 = require("./errors");
+/**
+ * Upper bound on the number of forward backfill iterations the `getJobs` Lua
+ * script performs to replace skipped ids (missing job hashes) within a bounded
+ * range. It caps the work done per call so a range full of missing jobs cannot
+ * scan the whole state unboundedly.
+ */
+const GET_JOBS_MAX_BACKFILL_ITERATIONS = 5;
 class Scripts {
     constructor(queue) {
         this.queue = queue;
@@ -612,6 +619,32 @@ class Scripts {
         const args = this.getRangesArgs(types, start, end, asc);
         return await this.execCommand(client, 'getRanges', args);
     }
+    getJobsArgs(types, start, end, asc) {
+        const queueKeys = this.queue.keys;
+        const transformedTypes = [
+            ...new Set(types.map(type => (type === 'waiting' ? 'wait' : type))),
+        ];
+        const keys = [queueKeys['']];
+        const args = [
+            start,
+            end,
+            asc ? '1' : '0',
+            GET_JOBS_MAX_BACKFILL_ITERATIONS,
+            ...transformedTypes,
+        ];
+        return keys.concat(args);
+    }
+    /**
+     * Fetches job ids and their job hashes for the provided states in a single
+     * script, skipping ids whose job hash is missing (for example the deprecated
+     * wait list marker or jobs removed after their id was read). Each returned
+     * entry is a `[jobId, jobHashFields]` tuple grouped per requested type.
+     */
+    async getJobs(types, start = 0, end = -1, asc = false) {
+        const client = await this.queue.client;
+        const args = this.getJobsArgs(types, start, end, asc);
+        return await this.execCommand(client, 'getJobs', args);
+    }
     getCountsArgs(types) {
         const queueKeys = this.queue.keys;
         const transformedTypes = types.map(type => {

package/dist/cjs/classes/worker.js

@@ -126,7 +126,7 @@ class Worker extends queue_base_1.QueueBase {
             blocking: true,
             skipVersionCheck: opts.skipVersionCheck,
         });
-        this.blockingConnection.on('error', error => this.emit('error', error));
+        (0, utils_1.forwardConnectionError)(this, this.blockingConnection);
         this.blockingConnection.on('ready', () => setTimeout(() => this.emit('ready'), 0));
     }
     /**

package/dist/cjs/commands/getJobs-1.lua

@@ -0,0 +1,151 @@
+--[[
+  Get jobs (id + data) for the provided states.
+
+  Job ids and their hashes are read in the same script so that ids whose hash
+  disappears after the id is read (but before the job is loaded) do not appear
+  in the result set. Ids without a job hash (for example the deprecated wait
+  list marker entry stored in the list) are skipped. For bounded ranges the
+  script iterates forward using the range offset as a cursor to backfill
+  skipped ids, preserving the requested page size when possible.
+
+    Input:
+      KEYS[1]    'prefix'
+
+      ARGV[1]    start
+      ARGV[2]    end
+      ARGV[3]    asc ('1' | '0')
+      ARGV[4]    max iterations (backfill bound)
+      ARGV[5...] types
+
+    Output:
+      results grouped per requested type; each entry is a
+      {jobId, {field, value, ...}} tuple
+]]
+local rcall = redis.call
+local prefix = KEYS[1]
+local rangeStart = tonumber(ARGV[1])
+local rangeEnd = tonumber(ARGV[2])
+local asc = ARGV[3] == "1"
+local max_iterations = tonumber(ARGV[4])
+local results = {}
+
+local function isListType(stateType)
+  return stateType == "wait" or stateType == "paused" or stateType == "active"
+end
+
+-- Fetch a slice of ids for the given state respecting the requested order.
+local function fetchIds(stateKey, stateType, sliceStart, sliceEnd, listLength)
+  if isListType(stateType) then
+    if asc then
+      local modifiedRangeStart
+      local modifiedRangeEnd
+      if sliceStart == -1 then
+        modifiedRangeStart = 0
+      else
+        modifiedRangeStart = -(sliceStart + 1)
+      end
+
+      if sliceEnd == -1 then
+        modifiedRangeEnd = 0
+      else
+        modifiedRangeEnd = -(sliceEnd + 1)
+      end
+
+      -- Ascending list slices use negative indexes. When the whole window is
+      -- beyond the list length Redis clamps both indexes to 0 and LRANGE would
+      -- return the head element, so guard against out-of-range slices with LLEN.
+      if listLength ~= nil and sliceStart >= 0 and sliceEnd >= 0 and sliceStart >= listLength then
+        return {}
+      end
+
+      local ids = rcall("LRANGE", stateKey, modifiedRangeEnd, modifiedRangeStart)
+      local reversed = {}
+      for i = #ids, 1, -1 do
+        reversed[#reversed + 1] = ids[i]
+      end
+      return reversed
+    else
+      return rcall("LRANGE", stateKey, sliceStart, sliceEnd)
+    end
+  else
+    if asc then
+      return rcall("ZRANGE", stateKey, sliceStart, sliceEnd)
+    else
+      return rcall("ZREVRANGE", stateKey, sliceStart, sliceEnd)
+    end
+  end
+end
+
+-- Fetch the job hash for an id and append it when present.
+local function appendJob(entries, jobId)
+  local jobData = rcall("HGETALL", prefix .. jobId)
+  if #jobData > 0 then
+    entries[#entries + 1] = {jobId, jobData}
+  end
+end
+
+local function cleanupDeprecatedMarker(stateKey, stateType)
+  if stateType == "wait" or stateType == "paused" then
+    local marker = rcall("LINDEX", stateKey, -1)
+    if marker and string.sub(marker, 1, 2) == "0:" then
+      local count = rcall("LLEN", stateKey)
+      if count > 1 then
+        rcall("RPOP", stateKey)
+        return count - 1
+      end
+      return 0
+    end
+  end
+end
+
+local function collectJobs(stateKey, stateType)
+  local entries = {}
+  local listLength
+  local cleanedListLength = cleanupDeprecatedMarker(stateKey, stateType)
+
+  if asc and isListType(stateType) and rangeStart >= 0 and rangeEnd >= 0 then
+    if cleanedListLength ~= nil then
+      listLength = cleanedListLength
+    else
+      listLength = rcall("LLEN", stateKey)
+    end
+  end
+
+  -- Unbounded or negative ranges: fetch the exact window and skip missing ids.
+  if rangeStart < 0 or rangeEnd < 0 then
+    local ids = fetchIds(stateKey, stateType, rangeStart, rangeEnd, listLength)
+    for i = 1, #ids do
+      appendJob(entries, ids[i])
+    end
+    return entries
+  end
+
+  -- Bounded range: iterate forward to backfill skipped ids.
+  local needed = rangeEnd - rangeStart + 1
+  local cursor = rangeStart
+  local iterations = 0
+  while #entries < needed and iterations < max_iterations do
+    local ids = fetchIds(stateKey, stateType, cursor, cursor + needed - 1, listLength)
+    if #ids == 0 then
+      break
+    end
+    for i = 1, #ids do
+      if #entries >= needed then
+        break
+      end
+      appendJob(entries, ids[i])
+    end
+    cursor = cursor + #ids
+    iterations = iterations + 1
+  end
+
+  return entries
+end
+
+for i = 5, #ARGV do
+  local stateType = ARGV[i]
+  local stateKey = prefix .. stateType
+  results[#results + 1] = collectJobs(stateKey, stateType)
+end
+
+return results

package/dist/cjs/enums/telemetry-attributes.js

@@ -42,7 +42,11 @@ var TelemetryAttributes;
     TelemetryAttributes["JobFailedReason"] = "bullmq.job.failed.reason";
     TelemetryAttributes["FlowName"] = "bullmq.flow.name";
     TelemetryAttributes["JobSchedulerId"] = "bullmq.job.scheduler.id";
+    /**
+     * @deprecated Use JobState instead. Will be removed in a future version.
+     */
     TelemetryAttributes["JobStatus"] = "bullmq.job.status";
+    TelemetryAttributes["JobState"] = "bullmq.job.state";
 })(TelemetryAttributes || (exports.TelemetryAttributes = TelemetryAttributes = {}));
 /**
  * Standard metric names for BullMQ telemetry

package/dist/cjs/scripts/getJobs-1.js

@@ -0,0 +1,142 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getJobs = void 0;
+const content = `--[[
+  Get jobs (id + data) for the provided states.
+  Job ids and their hashes are read in the same script so that ids whose hash
+  disappears after the id is read (but before the job is loaded) do not appear
+  in the result set. Ids without a job hash (for example the deprecated wait
+  list marker entry stored in the list) are skipped. For bounded ranges the
+  script iterates forward using the range offset as a cursor to backfill
+  skipped ids, preserving the requested page size when possible.
+    Input:
+      KEYS[1]    'prefix'
+      ARGV[1]    start
+      ARGV[2]    end
+      ARGV[3]    asc ('1' | '0')
+      ARGV[4]    max iterations (backfill bound)
+      ARGV[5...] types
+    Output:
+      results grouped per requested type; each entry is a
+      {jobId, {field, value, ...}} tuple
+]]
+local rcall = redis.call
+local prefix = KEYS[1]
+local rangeStart = tonumber(ARGV[1])
+local rangeEnd = tonumber(ARGV[2])
+local asc = ARGV[3] == "1"
+local max_iterations = tonumber(ARGV[4])
+local results = {}
+local function isListType(stateType)
+  return stateType == "wait" or stateType == "paused" or stateType == "active"
+end
+-- Fetch a slice of ids for the given state respecting the requested order.
+local function fetchIds(stateKey, stateType, sliceStart, sliceEnd, listLength)
+  if isListType(stateType) then
+    if asc then
+      local modifiedRangeStart
+      local modifiedRangeEnd
+      if sliceStart == -1 then
+        modifiedRangeStart = 0
+      else
+        modifiedRangeStart = -(sliceStart + 1)
+      end
+      if sliceEnd == -1 then
+        modifiedRangeEnd = 0
+      else
+        modifiedRangeEnd = -(sliceEnd + 1)
+      end
+      -- Ascending list slices use negative indexes. When the whole window is
+      -- beyond the list length Redis clamps both indexes to 0 and LRANGE would
+      -- return the head element, so guard against out-of-range slices with LLEN.
+      if listLength ~= nil and sliceStart >= 0 and sliceEnd >= 0 and sliceStart >= listLength then
+        return {}
+      end
+      local ids = rcall("LRANGE", stateKey, modifiedRangeEnd, modifiedRangeStart)
+      local reversed = {}
+      for i = #ids, 1, -1 do
+        reversed[#reversed + 1] = ids[i]
+      end
+      return reversed
+    else
+      return rcall("LRANGE", stateKey, sliceStart, sliceEnd)
+    end
+  else
+    if asc then
+      return rcall("ZRANGE", stateKey, sliceStart, sliceEnd)
+    else
+      return rcall("ZREVRANGE", stateKey, sliceStart, sliceEnd)
+    end
+  end
+end
+-- Fetch the job hash for an id and append it when present.
+local function appendJob(entries, jobId)
+  local jobData = rcall("HGETALL", prefix .. jobId)
+  if #jobData > 0 then
+    entries[#entries + 1] = {jobId, jobData}
+  end
+end
+local function cleanupDeprecatedMarker(stateKey, stateType)
+  if stateType == "wait" or stateType == "paused" then
+    local marker = rcall("LINDEX", stateKey, -1)
+    if marker and string.sub(marker, 1, 2) == "0:" then
+      local count = rcall("LLEN", stateKey)
+      if count > 1 then
+        rcall("RPOP", stateKey)
+        return count - 1
+      end
+      return 0
+    end
+  end
+end
+local function collectJobs(stateKey, stateType)
+  local entries = {}
+  local listLength
+  local cleanedListLength = cleanupDeprecatedMarker(stateKey, stateType)
+  if asc and isListType(stateType) and rangeStart >= 0 and rangeEnd >= 0 then
+    if cleanedListLength ~= nil then
+      listLength = cleanedListLength
+    else
+      listLength = rcall("LLEN", stateKey)
+    end
+  end
+  -- Unbounded or negative ranges: fetch the exact window and skip missing ids.
+  if rangeStart < 0 or rangeEnd < 0 then
+    local ids = fetchIds(stateKey, stateType, rangeStart, rangeEnd, listLength)
+    for i = 1, #ids do
+      appendJob(entries, ids[i])
+    end
+    return entries
+  end
+  -- Bounded range: iterate forward to backfill skipped ids.
+  local needed = rangeEnd - rangeStart + 1
+  local cursor = rangeStart
+  local iterations = 0
+  while #entries < needed and iterations < max_iterations do
+    local ids = fetchIds(stateKey, stateType, cursor, cursor + needed - 1, listLength)
+    if #ids == 0 then
+      break
+    end
+    for i = 1, #ids do
+      if #entries >= needed then
+        break
+      end
+      appendJob(entries, ids[i])
+    end
+    cursor = cursor + #ids
+    iterations = iterations + 1
+  end
+  return entries
+end
+for i = 5, #ARGV do
+  local stateType = ARGV[i]
+  local stateKey = prefix .. stateType
+  results[#results + 1] = collectJobs(stateKey, stateType)
+end
+return results
+`;
+exports.getJobs = {
+    name: 'getJobs',
+    content,
+    keys: 1,
+};

package/dist/cjs/scripts/index.js

@@ -18,6 +18,7 @@ tslib_1.__exportStar(require("./getCounts-1"), exports);
 tslib_1.__exportStar(require("./getCountsPerPriority-4"), exports);
 tslib_1.__exportStar(require("./getDependencyCounts-4"), exports);
 tslib_1.__exportStar(require("./getJobScheduler-1"), exports);
+tslib_1.__exportStar(require("./getJobs-1"), exports);
 tslib_1.__exportStar(require("./getMetrics-2"), exports);
 tslib_1.__exportStar(require("./getRanges-1"), exports);
 tslib_1.__exportStar(require("./getRateLimitTtl-2"), exports);