bullmq 5.44.1 → 5.52.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/classes/async-fifo-queue.js.map +1 -1
- package/dist/cjs/classes/child-processor.js.map +1 -1
- package/dist/cjs/classes/child.js.map +1 -1
- package/dist/cjs/classes/flow-producer.js +15 -4
- package/dist/cjs/classes/flow-producer.js.map +1 -1
- package/dist/cjs/classes/job-scheduler.js +1 -1
- package/dist/cjs/classes/job-scheduler.js.map +1 -1
- package/dist/cjs/classes/job.js +137 -54
- package/dist/cjs/classes/job.js.map +1 -1
- package/dist/cjs/classes/queue-base.js +1 -4
- package/dist/cjs/classes/queue-base.js.map +1 -1
- package/dist/cjs/classes/queue-events-producer.js.map +1 -1
- package/dist/cjs/classes/queue-events.js.map +1 -1
- package/dist/cjs/classes/queue-getters.js +12 -15
- package/dist/cjs/classes/queue-getters.js.map +1 -1
- package/dist/cjs/classes/queue-keys.js.map +1 -1
- package/dist/cjs/classes/queue.js +12 -13
- package/dist/cjs/classes/queue.js.map +1 -1
- package/dist/cjs/classes/redis-connection.js +1 -1
- package/dist/cjs/classes/redis-connection.js.map +1 -1
- package/dist/cjs/classes/repeat.js +1 -1
- package/dist/cjs/classes/repeat.js.map +1 -1
- package/dist/cjs/classes/scripts.js +18 -7
- package/dist/cjs/classes/scripts.js.map +1 -1
- package/dist/cjs/classes/worker.js +4 -0
- package/dist/cjs/classes/worker.js.map +1 -1
- package/dist/cjs/commands/addJobScheduler-11.lua +52 -33
- package/dist/cjs/commands/includes/deduplicateJob.lua +16 -17
- package/dist/cjs/commands/includes/isLocked.lua +1 -0
- package/dist/cjs/commands/includes/moveChildFromDependenciesIfNeeded.lua +79 -0
- package/dist/cjs/commands/includes/moveParentToWait.lua +48 -0
- package/dist/cjs/commands/includes/moveParentToWaitIfNeeded.lua +9 -50
- package/dist/cjs/commands/includes/moveParentToWaitIfNoPendingDependencies.lua +13 -0
- package/dist/cjs/commands/includes/removeDeduplicationKeyIfNeededOnFinalization.lua +23 -0
- package/dist/cjs/commands/includes/removeDeduplicationKeyIfNeededOnRemoval.lua +16 -0
- package/dist/cjs/commands/includes/removeJob.lua +2 -2
- package/dist/cjs/commands/includes/removeJobWithChildren.lua +94 -0
- package/dist/cjs/commands/includes/removeParentDependencyKey.lua +5 -5
- package/dist/cjs/commands/includes/storeJob.lua +1 -1
- package/dist/cjs/commands/includes/updateParentDepsIfNeeded.lua +2 -2
- package/dist/cjs/commands/moveStalledJobsToWait-9.lua +18 -53
- package/dist/cjs/commands/moveToFinished-14.lua +43 -51
- package/dist/cjs/commands/moveToWaitingChildren-8.lua +5 -32
- package/dist/cjs/commands/removeJob-3.lua +14 -72
- package/dist/cjs/commands/removeUnprocessedChildren-2.lua +31 -0
- package/dist/cjs/commands/updateJobScheduler-12.lua +29 -23
- package/dist/cjs/scripts/addDelayedJob-6.js +73 -55
- package/dist/cjs/scripts/addDelayedJob-6.js.map +1 -1
- package/dist/cjs/scripts/addJobScheduler-11.js +59 -40
- package/dist/cjs/scripts/addJobScheduler-11.js.map +1 -1
- package/dist/cjs/scripts/addParentJob-4.js +73 -55
- package/dist/cjs/scripts/addParentJob-4.js.map +1 -1
- package/dist/cjs/scripts/addPrioritizedJob-8.js +73 -55
- package/dist/cjs/scripts/addPrioritizedJob-8.js.map +1 -1
- package/dist/cjs/scripts/addRepeatableJob-2.js +14 -9
- package/dist/cjs/scripts/addRepeatableJob-2.js.map +1 -1
- package/dist/cjs/scripts/addStandardJob-8.js +73 -55
- package/dist/cjs/scripts/addStandardJob-8.js.map +1 -1
- package/dist/cjs/scripts/cleanJobsInSet-3.js +14 -9
- package/dist/cjs/scripts/cleanJobsInSet-3.js.map +1 -1
- package/dist/cjs/scripts/drain-5.js +14 -9
- package/dist/cjs/scripts/drain-5.js.map +1 -1
- package/dist/cjs/scripts/index.js +1 -0
- package/dist/cjs/scripts/index.js.map +1 -1
- package/dist/cjs/scripts/moveStalledJobsToWait-9.js +157 -155
- package/dist/cjs/scripts/moveStalledJobsToWait-9.js.map +1 -1
- package/dist/cjs/scripts/moveToFinished-14.js +183 -157
- package/dist/cjs/scripts/moveToFinished-14.js.map +1 -1
- package/dist/cjs/scripts/moveToWaitingChildren-8.js +145 -137
- package/dist/cjs/scripts/moveToWaitingChildren-8.js.map +1 -1
- package/dist/cjs/scripts/obliterate-2.js +14 -9
- package/dist/cjs/scripts/obliterate-2.js.map +1 -1
- package/dist/cjs/scripts/removeChildDependency-1.js +5 -5
- package/dist/cjs/scripts/removeJob-3.js +97 -63
- package/dist/cjs/scripts/removeJob-3.js.map +1 -1
- package/dist/cjs/scripts/removeUnprocessedChildren-2.js +338 -0
- package/dist/cjs/scripts/removeUnprocessedChildren-2.js.map +1 -0
- package/dist/cjs/scripts/updateJobScheduler-12.js +27 -21
- package/dist/cjs/scripts/updateJobScheduler-12.js.map +1 -1
- package/dist/cjs/tsconfig-cjs.tsbuildinfo +1 -1
- package/dist/cjs/types/index.js +1 -0
- package/dist/cjs/types/index.js.map +1 -1
- package/dist/cjs/types/job-progress.js +3 -0
- package/dist/cjs/types/job-progress.js.map +1 -0
- package/dist/cjs/utils.js +12 -1
- package/dist/cjs/utils.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/classes/async-fifo-queue.js.map +1 -1
- package/dist/esm/classes/child-processor.js.map +1 -1
- package/dist/esm/classes/child.js.map +1 -1
- package/dist/esm/classes/flow-producer.js +15 -4
- package/dist/esm/classes/flow-producer.js.map +1 -1
- package/dist/esm/classes/job-scheduler.js +1 -1
- package/dist/esm/classes/job-scheduler.js.map +1 -1
- package/dist/esm/classes/job.d.ts +49 -14
- package/dist/esm/classes/job.js +138 -55
- package/dist/esm/classes/job.js.map +1 -1
- package/dist/esm/classes/queue-base.d.ts +1 -4
- package/dist/esm/classes/queue-base.js +1 -4
- package/dist/esm/classes/queue-base.js.map +1 -1
- package/dist/esm/classes/queue-events-producer.d.ts +2 -2
- package/dist/esm/classes/queue-events-producer.js.map +1 -1
- package/dist/esm/classes/queue-events.d.ts +118 -29
- package/dist/esm/classes/queue-events.js.map +1 -1
- package/dist/esm/classes/queue-getters.d.ts +11 -14
- package/dist/esm/classes/queue-getters.js +12 -15
- package/dist/esm/classes/queue-getters.js.map +1 -1
- package/dist/esm/classes/queue-keys.js.map +1 -1
- package/dist/esm/classes/queue.d.ts +14 -15
- package/dist/esm/classes/queue.js +12 -13
- package/dist/esm/classes/queue.js.map +1 -1
- package/dist/esm/classes/redis-connection.js +1 -1
- package/dist/esm/classes/redis-connection.js.map +1 -1
- package/dist/esm/classes/repeat.js +1 -1
- package/dist/esm/classes/repeat.js.map +1 -1
- package/dist/esm/classes/scripts.d.ts +4 -3
- package/dist/esm/classes/scripts.js +18 -7
- package/dist/esm/classes/scripts.js.map +1 -1
- package/dist/esm/classes/worker.d.ts +2 -1
- package/dist/esm/classes/worker.js +5 -1
- package/dist/esm/classes/worker.js.map +1 -1
- package/dist/esm/commands/addJobScheduler-11.lua +52 -33
- package/dist/esm/commands/includes/deduplicateJob.lua +16 -17
- package/dist/esm/commands/includes/isLocked.lua +1 -0
- package/dist/esm/commands/includes/moveChildFromDependenciesIfNeeded.lua +79 -0
- package/dist/esm/commands/includes/moveParentToWait.lua +48 -0
- package/dist/esm/commands/includes/moveParentToWaitIfNeeded.lua +9 -50
- package/dist/esm/commands/includes/moveParentToWaitIfNoPendingDependencies.lua +13 -0
- package/dist/esm/commands/includes/removeDeduplicationKeyIfNeededOnFinalization.lua +23 -0
- package/dist/esm/commands/includes/removeDeduplicationKeyIfNeededOnRemoval.lua +16 -0
- package/dist/esm/commands/includes/removeJob.lua +2 -2
- package/dist/esm/commands/includes/removeJobWithChildren.lua +94 -0
- package/dist/esm/commands/includes/removeParentDependencyKey.lua +5 -5
- package/dist/esm/commands/includes/storeJob.lua +1 -1
- package/dist/esm/commands/includes/updateParentDepsIfNeeded.lua +2 -2
- package/dist/esm/commands/moveStalledJobsToWait-9.lua +18 -53
- package/dist/esm/commands/moveToFinished-14.lua +43 -51
- package/dist/esm/commands/moveToWaitingChildren-8.lua +5 -32
- package/dist/esm/commands/removeJob-3.lua +14 -72
- package/dist/esm/commands/removeUnprocessedChildren-2.lua +31 -0
- package/dist/esm/commands/updateJobScheduler-12.lua +29 -23
- package/dist/esm/interfaces/job-json.d.ts +5 -2
- package/dist/esm/interfaces/minimal-job.d.ts +29 -11
- package/dist/esm/interfaces/queue-options.d.ts +6 -2
- package/dist/esm/interfaces/repeat-options.d.ts +1 -1
- package/dist/esm/interfaces/sandboxed-job.d.ts +2 -2
- package/dist/esm/interfaces/sandboxed-options.d.ts +1 -1
- package/dist/esm/interfaces/telemetry.d.ts +18 -15
- package/dist/esm/interfaces/worker-options.d.ts +10 -10
- package/dist/esm/scripts/addDelayedJob-6.js +73 -55
- package/dist/esm/scripts/addDelayedJob-6.js.map +1 -1
- package/dist/esm/scripts/addJobScheduler-11.js +59 -40
- package/dist/esm/scripts/addJobScheduler-11.js.map +1 -1
- package/dist/esm/scripts/addParentJob-4.js +73 -55
- package/dist/esm/scripts/addParentJob-4.js.map +1 -1
- package/dist/esm/scripts/addPrioritizedJob-8.js +73 -55
- package/dist/esm/scripts/addPrioritizedJob-8.js.map +1 -1
- package/dist/esm/scripts/addRepeatableJob-2.js +14 -9
- package/dist/esm/scripts/addRepeatableJob-2.js.map +1 -1
- package/dist/esm/scripts/addStandardJob-8.js +73 -55
- package/dist/esm/scripts/addStandardJob-8.js.map +1 -1
- package/dist/esm/scripts/cleanJobsInSet-3.js +14 -9
- package/dist/esm/scripts/cleanJobsInSet-3.js.map +1 -1
- package/dist/esm/scripts/drain-5.js +14 -9
- package/dist/esm/scripts/drain-5.js.map +1 -1
- package/dist/esm/scripts/index.d.ts +1 -0
- package/dist/esm/scripts/index.js +1 -0
- package/dist/esm/scripts/index.js.map +1 -1
- package/dist/esm/scripts/moveStalledJobsToWait-9.js +157 -155
- package/dist/esm/scripts/moveStalledJobsToWait-9.js.map +1 -1
- package/dist/esm/scripts/moveToFinished-14.js +183 -157
- package/dist/esm/scripts/moveToFinished-14.js.map +1 -1
- package/dist/esm/scripts/moveToWaitingChildren-8.js +145 -137
- package/dist/esm/scripts/moveToWaitingChildren-8.js.map +1 -1
- package/dist/esm/scripts/obliterate-2.js +14 -9
- package/dist/esm/scripts/obliterate-2.js.map +1 -1
- package/dist/esm/scripts/removeChildDependency-1.js +5 -5
- package/dist/esm/scripts/removeJob-3.js +97 -63
- package/dist/esm/scripts/removeJob-3.js.map +1 -1
- package/dist/esm/scripts/removeUnprocessedChildren-2.d.ts +5 -0
- package/dist/esm/scripts/removeUnprocessedChildren-2.js +335 -0
- package/dist/esm/scripts/removeUnprocessedChildren-2.js.map +1 -0
- package/dist/esm/scripts/updateJobScheduler-12.js +27 -21
- package/dist/esm/scripts/updateJobScheduler-12.js.map +1 -1
- package/dist/esm/tsconfig.tsbuildinfo +1 -1
- package/dist/esm/types/index.d.ts +1 -0
- package/dist/esm/types/index.js +1 -0
- package/dist/esm/types/index.js.map +1 -1
- package/dist/esm/types/job-options.d.ts +13 -2
- package/dist/esm/types/job-progress.d.ts +1 -0
- package/dist/esm/types/job-progress.js +2 -0
- package/dist/esm/types/job-progress.js.map +1 -0
- package/dist/esm/utils.d.ts +17 -0
- package/dist/esm/utils.js +11 -0
- package/dist/esm/utils.js.map +1 -1
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +26 -21
- package/dist/cjs/commands/includes/moveParentFromWaitingChildrenToFailed.lua +0 -80
- package/dist/cjs/commands/includes/removeDeduplicationKey.lua +0 -11
- package/dist/cjs/commands/includes/removeDeduplicationKeyIfNeeded.lua +0 -14
- package/dist/esm/commands/includes/moveParentFromWaitingChildrenToFailed.lua +0 -80
- package/dist/esm/commands/includes/removeDeduplicationKey.lua +0 -11
- package/dist/esm/commands/includes/removeDeduplicationKeyIfNeeded.lua +0 -14
@@ -117,6 +117,7 @@ export class FlowProducer extends EventEmitter {
|
|
117
117
|
const updatedOpts = Object.assign({
|
118
118
|
depth: 10,
|
119
119
|
maxChildren: 20,
|
120
|
+
prefix: this.opts.prefix,
|
120
121
|
}, opts);
|
121
122
|
const jobsTree = this.getNode(client, updatedOpts);
|
122
123
|
return jobsTree;
|
@@ -171,7 +172,7 @@ export class FlowProducer extends EventEmitter {
|
|
171
172
|
const queueOpts = queuesOpts && queuesOpts[node.queueName];
|
172
173
|
const jobsOpts = (_a = queueOpts === null || queueOpts === void 0 ? void 0 : queueOpts.defaultJobOptions) !== null && _a !== void 0 ? _a : {};
|
173
174
|
const jobId = ((_b = node.opts) === null || _b === void 0 ? void 0 : _b.jobId) || v4();
|
174
|
-
return trace(this.telemetry, SpanKind.PRODUCER, node.
|
175
|
+
return trace(this.telemetry, SpanKind.PRODUCER, node.queueName, 'addNode', node.queueName, async (span, srcPropagationMedatada) => {
|
175
176
|
var _a, _b;
|
176
177
|
span === null || span === void 0 ? void 0 : span.setAttributes({
|
177
178
|
[TelemetryAttributes.JobName]: node.name,
|
@@ -258,19 +259,29 @@ export class FlowProducer extends EventEmitter {
|
|
258
259
|
const queue = this.queueFromNode(node, new QueueKeys(node.prefix), node.prefix);
|
259
260
|
const job = await this.Job.fromId(queue, node.id);
|
260
261
|
if (job) {
|
261
|
-
const { processed = {}, unprocessed = [] } = await job.getDependencies({
|
262
|
+
const { processed = {}, unprocessed = [], failed = [], ignored = {}, } = await job.getDependencies({
|
263
|
+
failed: {
|
264
|
+
count: node.maxChildren,
|
265
|
+
},
|
262
266
|
processed: {
|
263
267
|
count: node.maxChildren,
|
264
268
|
},
|
265
269
|
unprocessed: {
|
266
270
|
count: node.maxChildren,
|
267
271
|
},
|
272
|
+
ignored: {
|
273
|
+
count: node.maxChildren,
|
274
|
+
},
|
268
275
|
});
|
269
276
|
const processedKeys = Object.keys(processed);
|
270
|
-
const
|
277
|
+
const ignoredKeys = Object.keys(ignored);
|
278
|
+
const childrenCount = processedKeys.length +
|
279
|
+
unprocessed.length +
|
280
|
+
ignoredKeys.length +
|
281
|
+
failed.length;
|
271
282
|
const newDepth = node.depth - 1;
|
272
283
|
if (childrenCount > 0 && newDepth) {
|
273
|
-
const children = await this.getChildren(client, [...processedKeys, ...unprocessed], newDepth, node.maxChildren);
|
284
|
+
const children = await this.getChildren(client, [...processedKeys, ...unprocessed, ...failed, ...ignoredKeys], newDepth, node.maxChildren);
|
274
285
|
return { job, children };
|
275
286
|
}
|
276
287
|
else {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"flow-producer.js","sourceRoot":"","sources":["../../../src/classes/flow-producer.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"flow-producer.js","sourceRoot":"","sources":["../../../src/classes/flow-producer.ts"],"names":[],"mappings":"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"}
|
@@ -33,7 +33,7 @@ export class JobScheduler extends QueueBase {
|
|
33
33
|
// Check if we reached the end date of the repeatable job
|
34
34
|
let now = Date.now();
|
35
35
|
const { endDate } = repeatOpts;
|
36
|
-
if (
|
36
|
+
if (endDate && now > new Date(endDate).getTime()) {
|
37
37
|
return;
|
38
38
|
}
|
39
39
|
const prevMillis = opts.prevMillis || 0;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"job-scheduler.js","sourceRoot":"","sources":["../../../src/classes/job-scheduler.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"job-scheduler.js","sourceRoot":"","sources":["../../../src/classes/job-scheduler.ts"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import { BulkJobOptions, DependenciesOpts, JobJson, JobJsonRaw, MinimalJob, MoveToWaitingChildrenOpts, ParentKeys, ParentOpts, RedisClient } from '../interfaces';
|
2
|
-
import { FinishedStatus, JobsOptions, JobState, JobJsonSandbox, MinimalQueue, RedisJobOptions } from '../types';
|
2
|
+
import { FinishedStatus, JobsOptions, JobState, JobJsonSandbox, MinimalQueue, RedisJobOptions, JobProgress } from '../types';
|
3
3
|
import { Scripts } from './scripts';
|
4
4
|
import type { QueueEvents } from './queue-events';
|
5
5
|
export declare const PRIORITY_LIMIT: number;
|
@@ -11,7 +11,6 @@ export declare const PRIORITY_LIMIT: number;
|
|
11
11
|
*
|
12
12
|
* A Job instance is also passed to the Worker's process function.
|
13
13
|
*
|
14
|
-
* @class Job
|
15
14
|
*/
|
16
15
|
export declare class Job<DataType = any, ReturnType = any, NameType extends string = string> implements MinimalJob<DataType, ReturnType, NameType> {
|
17
16
|
protected queue: MinimalQueue;
|
@@ -37,7 +36,7 @@ export declare class Job<DataType = any, ReturnType = any, NameType extends stri
|
|
37
36
|
* The progress a job has performed so far.
|
38
37
|
* @defaultValue 0
|
39
38
|
*/
|
40
|
-
progress:
|
39
|
+
progress: JobProgress;
|
41
40
|
/**
|
42
41
|
* The value returned by the processor when processing this job.
|
43
42
|
* @defaultValue null
|
@@ -74,10 +73,20 @@ export declare class Job<DataType = any, ReturnType = any, NameType extends stri
|
|
74
73
|
* @defaultValue 0
|
75
74
|
*/
|
76
75
|
attemptsMade: number;
|
76
|
+
/**
|
77
|
+
* Number of times where job has stalled.
|
78
|
+
* @defaultValue 0
|
79
|
+
*/
|
80
|
+
stalledCounter: number;
|
77
81
|
/**
|
78
82
|
* Reason for failing.
|
79
83
|
*/
|
80
84
|
failedReason: string;
|
85
|
+
/**
|
86
|
+
* Deferred failure. Stores a failed message and marks this job to be failed directly
|
87
|
+
* as soon as the job is picked up by a worker, and using this string as the failed reason.
|
88
|
+
*/
|
89
|
+
deferredFailure: string;
|
81
90
|
/**
|
82
91
|
* Timestamp for when the job finished (completed or failed).
|
83
92
|
*/
|
@@ -171,7 +180,7 @@ export declare class Job<DataType = any, ReturnType = any, NameType extends stri
|
|
171
180
|
*/
|
172
181
|
static fromJSON<T = any, R = any, N extends string = string>(queue: MinimalQueue, json: JobJsonRaw, jobId?: string): Job<T, R, N>;
|
173
182
|
protected setScripts(): void;
|
174
|
-
static optsFromJSON(rawOpts?: string): JobsOptions;
|
183
|
+
static optsFromJSON(rawOpts?: string, optsDecode?: Record<string, string>): JobsOptions;
|
175
184
|
/**
|
176
185
|
* Fetches a Job from the queue given the passed job id.
|
177
186
|
*
|
@@ -183,21 +192,21 @@ export declare class Job<DataType = any, ReturnType = any, NameType extends stri
|
|
183
192
|
/**
|
184
193
|
* addJobLog
|
185
194
|
*
|
186
|
-
* @param queue
|
187
|
-
* @param jobId Job id
|
188
|
-
* @param logRow
|
189
|
-
* @param keepLogs optional
|
195
|
+
* @param queue - A minimal queue instance
|
196
|
+
* @param jobId - Job id
|
197
|
+
* @param logRow - String with a row of log data to be logged
|
198
|
+
* @param keepLogs - The optional amount of log entries to preserve
|
190
199
|
*
|
191
200
|
* @returns The total number of log entries for this job so far.
|
192
201
|
*/
|
193
202
|
static addJobLog(queue: MinimalQueue, jobId: string, logRow: string, keepLogs?: number): Promise<number>;
|
194
|
-
toJSON(): Omit<this, "toJSON" | "scripts" | "changeDelay" | "changePriority" | "extendLock" | "getState" | "moveToDelayed" | "moveToWaitingChildren" | "promote" | "removeChildDependency" | "updateData" | "updateProgress" | "discard" | "addJob" | "prefix" | "queue" | "asJSON" | "asJSONSandbox" | "log" | "clearLogs" | "remove" | "moveToCompleted" | "moveToWait" | "moveToFailed" | "isCompleted" | "isFailed" | "isDelayed" | "isWaitingChildren" | "isActive" | "isWaiting" | "queueName" | "getChildrenValues" | "getFailedChildrenValues" | "getDependencies" | "getDependenciesCount" | "waitUntilFinished" | "retry">;
|
203
|
+
toJSON(): Omit<this, "toJSON" | "scripts" | "changeDelay" | "changePriority" | "extendLock" | "getState" | "moveToDelayed" | "moveToWaitingChildren" | "promote" | "removeChildDependency" | "removeUnprocessedChildren" | "updateData" | "updateProgress" | "discard" | "addJob" | "prefix" | "queue" | "asJSON" | "asJSONSandbox" | "log" | "clearLogs" | "remove" | "moveToCompleted" | "moveToWait" | "moveToFailed" | "isCompleted" | "isFailed" | "isDelayed" | "isWaitingChildren" | "isActive" | "isWaiting" | "queueName" | "getChildrenValues" | "getIgnoredChildrenFailures" | "getFailedChildrenValues" | "getDependencies" | "getDependenciesCount" | "waitUntilFinished" | "retry">;
|
195
204
|
/**
|
196
205
|
* Prepares a job to be serialized for storage in Redis.
|
197
206
|
* @returns
|
198
207
|
*/
|
199
208
|
asJSON(): JobJson;
|
200
|
-
static optsAsJSON(opts?: JobsOptions): RedisJobOptions;
|
209
|
+
static optsAsJSON(opts?: JobsOptions, optsEncode?: Record<string, string>): RedisJobOptions;
|
201
210
|
/**
|
202
211
|
* Prepares a job to be passed to Sandbox.
|
203
212
|
* @returns
|
@@ -214,7 +223,7 @@ export declare class Job<DataType = any, ReturnType = any, NameType extends stri
|
|
214
223
|
*
|
215
224
|
* @param progress - number or object to be saved as progress.
|
216
225
|
*/
|
217
|
-
updateProgress(progress:
|
226
|
+
updateProgress(progress: JobProgress): Promise<void>;
|
218
227
|
/**
|
219
228
|
* Logs one row of log data.
|
220
229
|
*
|
@@ -244,6 +253,15 @@ export declare class Job<DataType = any, ReturnType = any, NameType extends stri
|
|
244
253
|
remove({ removeChildren }?: {
|
245
254
|
removeChildren?: boolean;
|
246
255
|
}): Promise<void>;
|
256
|
+
/**
|
257
|
+
* Remove all children from this job that are not yet processed,
|
258
|
+
* in other words that are in any other state than completed, failed or active.
|
259
|
+
*
|
260
|
+
* @remarks
|
261
|
+
* - Jobs with locks (most likely active) are ignored.
|
262
|
+
* - This method can be slow if the number of children is large (\> 1000).
|
263
|
+
*/
|
264
|
+
removeUnprocessedChildren(): Promise<void>;
|
247
265
|
/**
|
248
266
|
* Extend the lock for this job.
|
249
267
|
*
|
@@ -344,7 +362,19 @@ export declare class Job<DataType = any, ReturnType = any, NameType extends stri
|
|
344
362
|
[jobKey: string]: CT;
|
345
363
|
}>;
|
346
364
|
/**
|
347
|
-
*
|
365
|
+
* Retrieves the failures of child jobs that were explicitly ignored while using ignoreDependencyOnFailure option.
|
366
|
+
* This method is useful for inspecting which child jobs were intentionally ignored when an error occured.
|
367
|
+
* @see {@link https://docs.bullmq.io/guide/flows/ignore-dependency}
|
368
|
+
*
|
369
|
+
* @returns Object mapping children job keys with their failure values.
|
370
|
+
*/
|
371
|
+
getIgnoredChildrenFailures(): Promise<{
|
372
|
+
[jobKey: string]: string;
|
373
|
+
}>;
|
374
|
+
/**
|
375
|
+
* Get job's children failure values that were ignored if any.
|
376
|
+
*
|
377
|
+
* @deprecated This method is deprecated and will be removed in v6. Use getIgnoredChildrenFailures instead.
|
348
378
|
*
|
349
379
|
* @returns Object mapping children job keys with their failure values.
|
350
380
|
*/
|
@@ -358,10 +388,15 @@ export declare class Job<DataType = any, ReturnType = any, NameType extends stri
|
|
358
388
|
* on processed/unprocessed dependencies, since v7.2 you must consider that count
|
359
389
|
* won't have any effect until processed/unprocessed dependencies have a length
|
360
390
|
* greater than 127
|
361
|
-
* @see https://redis.io/docs/management/optimization/memory-optimization/#redis--72
|
362
|
-
* @
|
391
|
+
* @see {@link https://redis.io/docs/management/optimization/memory-optimization/#redis--72}
|
392
|
+
* @see {@link https://docs.bullmq.io/guide/flows#getters}
|
393
|
+
* @returns dependencies separated by processed, unprocessed, ignored and failed.
|
363
394
|
*/
|
364
395
|
getDependencies(opts?: DependenciesOpts): Promise<{
|
396
|
+
nextFailedCursor?: number;
|
397
|
+
failed?: string[];
|
398
|
+
nextIgnoredCursor?: number;
|
399
|
+
ignored?: Record<string, any>;
|
365
400
|
nextProcessedCursor?: number;
|
366
401
|
processed?: Record<string, any>;
|
367
402
|
nextUnprocessedCursor?: number;
|
package/dist/esm/classes/job.js
CHANGED
@@ -1,21 +1,11 @@
|
|
1
1
|
import { __rest } from "tslib";
|
2
2
|
import { debuglog } from 'util';
|
3
|
-
import { errorObject, isEmpty, getParentKey, lengthInUtf8Bytes, parseObjectValues, tryCatch, removeUndefinedFields,
|
3
|
+
import { errorObject, isEmpty, getParentKey, lengthInUtf8Bytes, optsDecodeMap, optsEncodeMap, parseObjectValues, tryCatch, removeUndefinedFields, } from '../utils';
|
4
4
|
import { Backoffs } from './backoffs';
|
5
5
|
import { Scripts } from './scripts';
|
6
6
|
import { UnrecoverableError } from './errors/unrecoverable-error';
|
7
7
|
import { SpanKind } from '../enums';
|
8
8
|
const logger = debuglog('bull');
|
9
|
-
// Simple options decode map.
|
10
|
-
const optsDecodeMap = {
|
11
|
-
de: 'deduplication',
|
12
|
-
fpof: 'failParentOnFailure',
|
13
|
-
idof: 'ignoreDependencyOnFailure',
|
14
|
-
kl: 'keepLogs',
|
15
|
-
rdof: 'removeDependencyOnFailure',
|
16
|
-
};
|
17
|
-
const optsEncodeMap = Object.assign(Object.assign({}, invertObject(optsDecodeMap)), {
|
18
|
-
/*/ Legacy for backwards compatibility */ debounce: 'de' });
|
19
9
|
export const PRIORITY_LIMIT = 2 ** 21;
|
20
10
|
/**
|
21
11
|
* Job
|
@@ -25,7 +15,6 @@ export const PRIORITY_LIMIT = 2 ** 21;
|
|
25
15
|
*
|
26
16
|
* A Job instance is also passed to the Worker's process function.
|
27
17
|
*
|
28
|
-
* @class Job
|
29
18
|
*/
|
30
19
|
export class Job {
|
31
20
|
constructor(queue,
|
@@ -83,6 +72,11 @@ export class Job {
|
|
83
72
|
* @defaultValue 0
|
84
73
|
*/
|
85
74
|
this.attemptsMade = 0;
|
75
|
+
/**
|
76
|
+
* Number of times where job has stalled.
|
77
|
+
* @defaultValue 0
|
78
|
+
*/
|
79
|
+
this.stalledCounter = 0;
|
86
80
|
const _a = this.opts, { repeatJobKey } = _a, restOpts = __rest(_a, ["repeatJobKey"]);
|
87
81
|
this.opts = Object.assign({
|
88
82
|
attempts: 0,
|
@@ -182,9 +176,15 @@ export class Job {
|
|
182
176
|
job.debounceId = json.deid;
|
183
177
|
job.deduplicationId = json.deid;
|
184
178
|
}
|
185
|
-
|
179
|
+
if (json.failedReason) {
|
180
|
+
job.failedReason = json.failedReason;
|
181
|
+
}
|
186
182
|
job.attemptsStarted = parseInt(json.ats || '0');
|
187
183
|
job.attemptsMade = parseInt(json.attemptsMade || json.atm || '0');
|
184
|
+
job.stalledCounter = parseInt(json.stc || '0');
|
185
|
+
if (json.defa) {
|
186
|
+
job.deferredFailure = json.defa;
|
187
|
+
}
|
188
188
|
job.stacktrace = getTraces(json.stacktrace);
|
189
189
|
if (typeof json.returnvalue === 'string') {
|
190
190
|
job.returnvalue = getReturnValue(json.returnvalue);
|
@@ -206,14 +206,14 @@ export class Job {
|
|
206
206
|
setScripts() {
|
207
207
|
this.scripts = new Scripts(this.queue);
|
208
208
|
}
|
209
|
-
static optsFromJSON(rawOpts) {
|
209
|
+
static optsFromJSON(rawOpts, optsDecode = optsDecodeMap) {
|
210
210
|
const opts = JSON.parse(rawOpts || '{}');
|
211
211
|
const optionEntries = Object.entries(opts);
|
212
212
|
const options = {};
|
213
213
|
for (const item of optionEntries) {
|
214
214
|
const [attributeName, value] = item;
|
215
|
-
if (
|
216
|
-
options[
|
215
|
+
if (optsDecode[attributeName]) {
|
216
|
+
options[optsDecode[attributeName]] =
|
217
217
|
value;
|
218
218
|
}
|
219
219
|
else {
|
@@ -250,10 +250,10 @@ export class Job {
|
|
250
250
|
/**
|
251
251
|
* addJobLog
|
252
252
|
*
|
253
|
-
* @param queue
|
254
|
-
* @param jobId Job id
|
255
|
-
* @param logRow
|
256
|
-
* @param keepLogs optional
|
253
|
+
* @param queue - A minimal queue instance
|
254
|
+
* @param jobId - Job id
|
255
|
+
* @param logRow - String with a row of log data to be logged
|
256
|
+
* @param keepLogs - The optional amount of log entries to preserve
|
257
257
|
*
|
258
258
|
* @returns The total number of log entries for this job so far.
|
259
259
|
*/
|
@@ -280,6 +280,7 @@ export class Job {
|
|
280
280
|
progress: this.progress,
|
281
281
|
attemptsMade: this.attemptsMade,
|
282
282
|
attemptsStarted: this.attemptsStarted,
|
283
|
+
stalledCounter: this.stalledCounter,
|
283
284
|
finishedOn: this.finishedOn,
|
284
285
|
processedOn: this.processedOn,
|
285
286
|
timestamp: this.timestamp,
|
@@ -292,16 +293,16 @@ export class Job {
|
|
292
293
|
nrjid: this.nextRepeatableJobId,
|
293
294
|
});
|
294
295
|
}
|
295
|
-
static optsAsJSON(opts = {}) {
|
296
|
+
static optsAsJSON(opts = {}, optsEncode = optsEncodeMap) {
|
296
297
|
const optionEntries = Object.entries(opts);
|
297
298
|
const options = {};
|
298
299
|
for (const [attributeName, value] of optionEntries) {
|
299
300
|
if (typeof value === 'undefined') {
|
300
301
|
continue;
|
301
302
|
}
|
302
|
-
if (attributeName in
|
303
|
+
if (attributeName in optsEncode) {
|
303
304
|
const compressableAttribute = attributeName;
|
304
|
-
const key =
|
305
|
+
const key = optsEncode[compressableAttribute];
|
305
306
|
options[key] = value;
|
306
307
|
}
|
307
308
|
else {
|
@@ -400,6 +401,18 @@ export class Job {
|
|
400
401
|
throw new Error(`Job ${this.id} could not be removed because it is locked by another worker`);
|
401
402
|
}
|
402
403
|
}
|
404
|
+
/**
|
405
|
+
* Remove all children from this job that are not yet processed,
|
406
|
+
* in other words that are in any other state than completed, failed or active.
|
407
|
+
*
|
408
|
+
* @remarks
|
409
|
+
* - Jobs with locks (most likely active) are ignored.
|
410
|
+
* - This method can be slow if the number of children is large (\> 1000).
|
411
|
+
*/
|
412
|
+
async removeUnprocessedChildren() {
|
413
|
+
const jobId = this.id;
|
414
|
+
await this.scripts.removeUnprocessedChildren(jobId);
|
415
|
+
}
|
403
416
|
/**
|
404
417
|
* Extend the lock for this job.
|
405
418
|
*
|
@@ -613,7 +626,20 @@ export class Job {
|
|
613
626
|
}
|
614
627
|
}
|
615
628
|
/**
|
616
|
-
*
|
629
|
+
* Retrieves the failures of child jobs that were explicitly ignored while using ignoreDependencyOnFailure option.
|
630
|
+
* This method is useful for inspecting which child jobs were intentionally ignored when an error occured.
|
631
|
+
* @see {@link https://docs.bullmq.io/guide/flows/ignore-dependency}
|
632
|
+
*
|
633
|
+
* @returns Object mapping children job keys with their failure values.
|
634
|
+
*/
|
635
|
+
async getIgnoredChildrenFailures() {
|
636
|
+
const client = await this.queue.client;
|
637
|
+
return client.hgetall(this.toKey(`${this.id}:failed`));
|
638
|
+
}
|
639
|
+
/**
|
640
|
+
* Get job's children failure values that were ignored if any.
|
641
|
+
*
|
642
|
+
* @deprecated This method is deprecated and will be removed in v6. Use getIgnoredChildrenFailures instead.
|
617
643
|
*
|
618
644
|
* @returns Object mapping children job keys with their failure values.
|
619
645
|
*/
|
@@ -628,52 +654,108 @@ export class Job {
|
|
628
654
|
* on processed/unprocessed dependencies, since v7.2 you must consider that count
|
629
655
|
* won't have any effect until processed/unprocessed dependencies have a length
|
630
656
|
* greater than 127
|
631
|
-
* @see https://redis.io/docs/management/optimization/memory-optimization/#redis--72
|
632
|
-
* @
|
657
|
+
* @see {@link https://redis.io/docs/management/optimization/memory-optimization/#redis--72}
|
658
|
+
* @see {@link https://docs.bullmq.io/guide/flows#getters}
|
659
|
+
* @returns dependencies separated by processed, unprocessed, ignored and failed.
|
633
660
|
*/
|
634
661
|
async getDependencies(opts = {}) {
|
635
662
|
const client = await this.queue.client;
|
636
663
|
const multi = client.multi();
|
637
|
-
if (!opts.processed && !opts.unprocessed) {
|
664
|
+
if (!opts.processed && !opts.unprocessed && !opts.ignored && !opts.failed) {
|
638
665
|
multi.hgetall(this.toKey(`${this.id}:processed`));
|
639
666
|
multi.smembers(this.toKey(`${this.id}:dependencies`));
|
640
|
-
|
641
|
-
|
642
|
-
|
667
|
+
multi.hgetall(this.toKey(`${this.id}:failed`));
|
668
|
+
multi.zrange(this.toKey(`${this.id}:unsuccessful`), 0, -1);
|
669
|
+
const [[err1, processed], [err2, unprocessed], [err3, ignored], [err4, failed],] = (await multi.exec());
|
670
|
+
return {
|
671
|
+
processed: parseObjectValues(processed),
|
672
|
+
unprocessed,
|
673
|
+
failed,
|
674
|
+
ignored: parseObjectValues(ignored),
|
675
|
+
};
|
643
676
|
}
|
644
677
|
else {
|
645
678
|
const defaultOpts = {
|
646
679
|
cursor: 0,
|
647
680
|
count: 20,
|
648
681
|
};
|
682
|
+
const childrenResultOrder = [];
|
649
683
|
if (opts.processed) {
|
684
|
+
childrenResultOrder.push('processed');
|
650
685
|
const processedOpts = Object.assign(Object.assign({}, defaultOpts), opts.processed);
|
651
686
|
multi.hscan(this.toKey(`${this.id}:processed`), processedOpts.cursor, 'COUNT', processedOpts.count);
|
652
687
|
}
|
653
688
|
if (opts.unprocessed) {
|
689
|
+
childrenResultOrder.push('unprocessed');
|
654
690
|
const unprocessedOpts = Object.assign(Object.assign({}, defaultOpts), opts.unprocessed);
|
655
691
|
multi.sscan(this.toKey(`${this.id}:dependencies`), unprocessedOpts.cursor, 'COUNT', unprocessedOpts.count);
|
656
692
|
}
|
657
|
-
|
658
|
-
|
659
|
-
|
660
|
-
:
|
661
|
-
const [unprocessedCursor, unprocessed = []] = opts.unprocessed
|
662
|
-
? opts.processed
|
663
|
-
? result2[1]
|
664
|
-
: result1[1]
|
665
|
-
: [];
|
666
|
-
const transformedProcessed = {};
|
667
|
-
for (let index = 0; index < processed.length; ++index) {
|
668
|
-
if (index % 2) {
|
669
|
-
transformedProcessed[processed[index - 1]] = JSON.parse(processed[index]);
|
670
|
-
}
|
693
|
+
if (opts.ignored) {
|
694
|
+
childrenResultOrder.push('ignored');
|
695
|
+
const ignoredOpts = Object.assign(Object.assign({}, defaultOpts), opts.ignored);
|
696
|
+
multi.hscan(this.toKey(`${this.id}:failed`), ignoredOpts.cursor, 'COUNT', ignoredOpts.count);
|
671
697
|
}
|
672
|
-
|
698
|
+
let failedCursor;
|
699
|
+
if (opts.failed) {
|
700
|
+
childrenResultOrder.push('failed');
|
701
|
+
const failedOpts = Object.assign(Object.assign({}, defaultOpts), opts.failed);
|
702
|
+
failedCursor = failedOpts.cursor + failedOpts.count;
|
703
|
+
multi.zrange(this.toKey(`${this.id}:unsuccessful`), failedOpts.cursor, failedOpts.count - 1);
|
704
|
+
}
|
705
|
+
const results = (await multi.exec());
|
706
|
+
let processedCursor, processed, unprocessedCursor, unprocessed, failed, ignoredCursor, ignored;
|
707
|
+
childrenResultOrder.forEach((key, index) => {
|
708
|
+
switch (key) {
|
709
|
+
case 'processed': {
|
710
|
+
processedCursor = results[index][1][0];
|
711
|
+
const rawProcessed = results[index][1][1];
|
712
|
+
const transformedProcessed = {};
|
713
|
+
for (let ind = 0; ind < rawProcessed.length; ++ind) {
|
714
|
+
if (ind % 2) {
|
715
|
+
transformedProcessed[rawProcessed[ind - 1]] = JSON.parse(rawProcessed[ind]);
|
716
|
+
}
|
717
|
+
}
|
718
|
+
processed = transformedProcessed;
|
719
|
+
break;
|
720
|
+
}
|
721
|
+
case 'failed': {
|
722
|
+
failed = results[index][1];
|
723
|
+
break;
|
724
|
+
}
|
725
|
+
case 'ignored': {
|
726
|
+
ignoredCursor = results[index][1][0];
|
727
|
+
const rawIgnored = results[index][1][1];
|
728
|
+
const transformedIgnored = {};
|
729
|
+
for (let ind = 0; ind < rawIgnored.length; ++ind) {
|
730
|
+
if (ind % 2) {
|
731
|
+
transformedIgnored[rawIgnored[ind - 1]] = rawIgnored[ind];
|
732
|
+
}
|
733
|
+
}
|
734
|
+
ignored = transformedIgnored;
|
735
|
+
break;
|
736
|
+
}
|
737
|
+
case 'unprocessed': {
|
738
|
+
unprocessedCursor = results[index][1][0];
|
739
|
+
unprocessed = results[index][1][1];
|
740
|
+
break;
|
741
|
+
}
|
742
|
+
}
|
743
|
+
});
|
744
|
+
return Object.assign(Object.assign(Object.assign(Object.assign({}, (processedCursor
|
673
745
|
? {
|
674
|
-
processed
|
746
|
+
processed,
|
675
747
|
nextProcessedCursor: Number(processedCursor),
|
676
748
|
}
|
749
|
+
: {})), (ignoredCursor
|
750
|
+
? {
|
751
|
+
ignored,
|
752
|
+
nextIgnoredCursor: Number(ignoredCursor),
|
753
|
+
}
|
754
|
+
: {})), (failedCursor
|
755
|
+
? {
|
756
|
+
failed,
|
757
|
+
nextFailedCursor: failedCursor,
|
758
|
+
}
|
677
759
|
: {})), (unprocessedCursor
|
678
760
|
? { unprocessed, nextUnprocessedCursor: Number(unprocessedCursor) }
|
679
761
|
: {}));
|
@@ -832,6 +914,12 @@ export class Job {
|
|
832
914
|
}
|
833
915
|
validateOptions(jobData) {
|
834
916
|
var _a;
|
917
|
+
const exclusiveOptions = [
|
918
|
+
'removeDependencyOnFailure',
|
919
|
+
'failParentOnFailure',
|
920
|
+
'continueParentOnFailure',
|
921
|
+
'ignoreDependencyOnFailure',
|
922
|
+
];
|
835
923
|
const exceedLimit = this.opts.sizeLimit &&
|
836
924
|
lengthInUtf8Bytes(jobData.data) > this.opts.sizeLimit;
|
837
925
|
if (exceedLimit) {
|
@@ -840,15 +928,10 @@ export class Job {
|
|
840
928
|
if (this.opts.delay && this.opts.repeat && !((_a = this.opts.repeat) === null || _a === void 0 ? void 0 : _a.count)) {
|
841
929
|
throw new Error(`Delay and repeat options could not be used together`);
|
842
930
|
}
|
843
|
-
|
844
|
-
|
845
|
-
|
846
|
-
|
847
|
-
this.opts.ignoreDependencyOnFailure) {
|
848
|
-
throw new Error(`RemoveDependencyOnFailure and ignoreDependencyOnFailure options can not be used together`);
|
849
|
-
}
|
850
|
-
if (this.opts.failParentOnFailure && this.opts.ignoreDependencyOnFailure) {
|
851
|
-
throw new Error(`FailParentOnFailure and ignoreDependencyOnFailure options can not be used together`);
|
931
|
+
const enabledExclusiveOptions = exclusiveOptions.filter(opt => this.opts[opt]);
|
932
|
+
if (enabledExclusiveOptions.length > 1) {
|
933
|
+
const optionsList = enabledExclusiveOptions.join(', ');
|
934
|
+
throw new Error(`The following options cannot be used together: ${optionsList}`);
|
852
935
|
}
|
853
936
|
if (`${parseInt(this.id, 10)}` === this.id) {
|
854
937
|
throw new Error('Custom Ids cannot be integers');
|