bullmq 5.48.0 → 5.49.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/job.js +14 -7
- 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.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.js +12 -12
- package/dist/cjs/classes/redis-connection.js +1 -1
- package/dist/cjs/classes/redis-connection.js.map +1 -1
- package/dist/cjs/classes/scripts.js +1 -1
- package/dist/cjs/commands/includes/removeJobWithChildren.lua +2 -1
- package/dist/cjs/commands/moveStalledJobsToWait-9.lua +1 -1
- package/dist/cjs/scripts/moveStalledJobsToWait-9.js +1 -1
- package/dist/cjs/scripts/removeJob-3.js +2 -1
- package/dist/cjs/scripts/removeJob-3.js.map +1 -1
- package/dist/cjs/scripts/removeUnprocessedChildren-2.js +2 -1
- package/dist/cjs/scripts/removeUnprocessedChildren-2.js.map +1 -1
- package/dist/cjs/tsconfig-cjs.tsbuildinfo +1 -1
- package/dist/cjs/utils.js +1 -0
- package/dist/cjs/utils.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/classes/job.d.ts +12 -7
- package/dist/esm/classes/job.js +14 -7
- 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.d.ts +32 -31
- 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.d.ts +12 -12
- package/dist/esm/classes/queue.js +12 -12
- package/dist/esm/classes/redis-connection.js +1 -1
- package/dist/esm/classes/redis-connection.js.map +1 -1
- package/dist/esm/classes/scripts.d.ts +1 -1
- package/dist/esm/classes/scripts.js +1 -1
- package/dist/esm/commands/includes/removeJobWithChildren.lua +2 -1
- package/dist/esm/commands/moveStalledJobsToWait-9.lua +1 -1
- package/dist/esm/interfaces/job-json.d.ts +2 -0
- 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/moveStalledJobsToWait-9.js +1 -1
- package/dist/esm/scripts/removeJob-3.js +2 -1
- package/dist/esm/scripts/removeJob-3.js.map +1 -1
- package/dist/esm/scripts/removeUnprocessedChildren-2.js +2 -1
- package/dist/esm/scripts/removeUnprocessedChildren-2.js.map +1 -1
- package/dist/esm/tsconfig.tsbuildinfo +1 -1
- package/dist/esm/types/job-options.d.ts +1 -1
- package/dist/esm/utils.js +1 -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 +7 -7
@@ -11,9 +11,9 @@ import { version } from '../version';
|
|
11
11
|
* This class provides methods to add jobs to a queue and some other high-level
|
12
12
|
* administration such as pausing or deleting queues.
|
13
13
|
*
|
14
|
-
* @
|
15
|
-
* @
|
16
|
-
* @
|
14
|
+
* @typeParam DataType - The type of the data that the job will process.
|
15
|
+
* @typeParam ResultType - The type of the result of the job.
|
16
|
+
* @typeParam NameType - The type of the name of the job.
|
17
17
|
*
|
18
18
|
* @example
|
19
19
|
*
|
@@ -162,9 +162,9 @@ export class Queue extends QueueGetters {
|
|
162
162
|
* addJob is a telemetry free version of the add method, useful in order to wrap it
|
163
163
|
* with custom telemetry on subclasses.
|
164
164
|
*
|
165
|
-
* @param name
|
166
|
-
* @param data
|
167
|
-
* @param opts
|
165
|
+
* @param name - Name of the job to be added to the queue.
|
166
|
+
* @param data - Arbitrary data to append to the job.
|
167
|
+
* @param opts - Job options that affects how the job is going to be processed.
|
168
168
|
*
|
169
169
|
* @returns Job
|
170
170
|
*/
|
@@ -370,8 +370,8 @@ export class Queue extends QueueGetters {
|
|
370
370
|
* @see removeRepeatableByKey
|
371
371
|
*
|
372
372
|
* @param name - Job name
|
373
|
-
* @param repeatOpts -
|
374
|
-
* @param jobId -
|
373
|
+
* @param repeatOpts - Repeat options
|
374
|
+
* @param jobId - Job id to remove. If not provided, all jobs with the same repeatOpts
|
375
375
|
* @returns
|
376
376
|
*/
|
377
377
|
async removeRepeatable(name, repeatOpts, jobId) {
|
@@ -389,7 +389,7 @@ export class Queue extends QueueGetters {
|
|
389
389
|
*
|
390
390
|
* Removes a job scheduler.
|
391
391
|
*
|
392
|
-
* @param jobSchedulerId
|
392
|
+
* @param jobSchedulerId - identifier of the job scheduler.
|
393
393
|
*
|
394
394
|
* @returns
|
395
395
|
*/
|
@@ -402,7 +402,7 @@ export class Queue extends QueueGetters {
|
|
402
402
|
* Removes a debounce key.
|
403
403
|
* @deprecated use removeDeduplicationKey
|
404
404
|
*
|
405
|
-
* @param id - identifier
|
405
|
+
* @param id - debounce identifier
|
406
406
|
*/
|
407
407
|
async removeDebounceKey(id) {
|
408
408
|
return this.trace(SpanKind.INTERNAL, 'removeDebounceKey', `${this.name}`, async (span) => {
|
@@ -576,7 +576,7 @@ export class Queue extends QueueGetters {
|
|
576
576
|
/**
|
577
577
|
* Retry all the failed or completed jobs.
|
578
578
|
*
|
579
|
-
* @param opts
|
579
|
+
* @param opts - An object with the following properties:
|
580
580
|
* - count number to limit how many jobs will be moved to wait status per iteration,
|
581
581
|
* - state failed by default or completed.
|
582
582
|
* - timestamp from which timestamp to start moving jobs to wait status, default Date.now().
|
@@ -597,7 +597,7 @@ export class Queue extends QueueGetters {
|
|
597
597
|
/**
|
598
598
|
* Promote all the delayed jobs.
|
599
599
|
*
|
600
|
-
* @param opts
|
600
|
+
* @param opts - An object with the following properties:
|
601
601
|
* - count number to limit how many jobs will be moved to wait status per iteration
|
602
602
|
*
|
603
603
|
* @returns
|
@@ -246,7 +246,7 @@ export class RedisConnection extends EventEmitter {
|
|
246
246
|
const doc = await this._client.info();
|
247
247
|
const redisPrefix = 'redis_version:';
|
248
248
|
const maxMemoryPolicyPrefix = 'maxmemory_policy:';
|
249
|
-
const lines = doc.split(
|
249
|
+
const lines = doc.split(/\r?\n/);
|
250
250
|
let redisVersion;
|
251
251
|
for (let i = 0; i < lines.length; i++) {
|
252
252
|
if (lines[i].indexOf(maxMemoryPolicyPrefix) === 0) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"redis-connection.js","sourceRoot":"","sources":["../../../src/classes/redis-connection.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"redis-connection.js","sourceRoot":"","sources":["../../../src/classes/redis-connection.ts"],"names":[],"mappings":"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"}
|
@@ -87,7 +87,8 @@ removeJobWithChildren = function(prefix, meta, jobId, parentKey, options)
|
|
87
87
|
removeDeduplicationKey(prefix, jobKey)
|
88
88
|
if removeJobKeys(jobKey) > 0 then
|
89
89
|
local maxEvents = getOrSetMaxEvents(meta)
|
90
|
-
rcall("XADD", prefix .. "events", "MAXLEN", "~", maxEvents, "*", "event", "removed",
|
90
|
+
rcall("XADD", prefix .. "events", "MAXLEN", "~", maxEvents, "*", "event", "removed",
|
91
|
+
"jobId", jobId, "prev", prev)
|
91
92
|
end
|
92
93
|
end
|
93
94
|
end
|
@@ -79,7 +79,7 @@ if (#stalling > 0) then
|
|
79
79
|
|
80
80
|
if (removed > 0) then
|
81
81
|
-- If this job has been stalled too many times, such as if it crashes the worker, then fail it.
|
82
|
-
local stalledCount = rcall("HINCRBY", jobKey, "
|
82
|
+
local stalledCount = rcall("HINCRBY", jobKey, "stc", 1)
|
83
83
|
if (stalledCount > maxStalledJobCount) then
|
84
84
|
local jobAttributes = rcall("HMGET", jobKey, "opts", "parent", "deid")
|
85
85
|
local rawOpts = jobAttributes[1]
|
@@ -21,6 +21,7 @@ export interface JobJson {
|
|
21
21
|
debounceId?: string;
|
22
22
|
deduplicationId?: string;
|
23
23
|
processedBy?: string;
|
24
|
+
stalledCounter: number;
|
24
25
|
}
|
25
26
|
export interface JobJsonRaw {
|
26
27
|
id: string;
|
@@ -43,6 +44,7 @@ export interface JobJsonRaw {
|
|
43
44
|
rjk?: string;
|
44
45
|
nrjid?: string;
|
45
46
|
atm?: string;
|
47
|
+
stc?: string;
|
46
48
|
ats?: string;
|
47
49
|
pb?: string;
|
48
50
|
}
|
@@ -33,8 +33,8 @@ export interface ContextManager<Context = any> {
|
|
33
33
|
/**
|
34
34
|
* Creates a new context and sets it as active for the fn passed as last argument
|
35
35
|
*
|
36
|
-
* @param context -
|
37
|
-
* @param fn -
|
36
|
+
* @param context - the context to set as active
|
37
|
+
* @param fn - the function to execute with the context
|
38
38
|
*/
|
39
39
|
with<A extends (...args: any[]) => any>(context: Context, fn: A): ReturnType<A>;
|
40
40
|
/**
|
@@ -46,15 +46,15 @@ export interface ContextManager<Context = any> {
|
|
46
46
|
* is the mechanism used to propagate the context across a distributed
|
47
47
|
* application.
|
48
48
|
*
|
49
|
-
* @param context -
|
49
|
+
* @param context - the current context
|
50
50
|
*/
|
51
51
|
getMetadata(context: Context): string;
|
52
52
|
/**
|
53
53
|
* Creates a new context from a serialized version effectively
|
54
54
|
* linking the new context to the parent context.
|
55
55
|
*
|
56
|
-
* @param activeContext -
|
57
|
-
* @param metadata -
|
56
|
+
* @param activeContext - the current active context
|
57
|
+
* @param metadata - the serialized version of the context
|
58
58
|
*/
|
59
59
|
fromMetadata(activeContext: Context, metadata: string): Context;
|
60
60
|
}
|
@@ -68,9 +68,10 @@ export interface Tracer<Context = any> {
|
|
68
68
|
* context. If the context is not provided, the current active context should be
|
69
69
|
* used.
|
70
70
|
*
|
71
|
-
* @param name -
|
72
|
-
* @param options -
|
73
|
-
* @param context -
|
71
|
+
* @param name - span name
|
72
|
+
* @param options - span options
|
73
|
+
* @param context - optional context
|
74
|
+
* @returns - the created span
|
74
75
|
*/
|
75
76
|
startSpan(name: string, options?: SpanOptions, context?: Context): Span;
|
76
77
|
}
|
@@ -85,33 +86,35 @@ export interface Span<Context = any> {
|
|
85
86
|
* setSpanOnContext sets the span on the context. This is useful when you want
|
86
87
|
* to propagate the span across the application.
|
87
88
|
*
|
88
|
-
* @param ctx
|
89
|
+
* @param ctx - context to set the span on
|
90
|
+
* @returns - the context with the span set on it
|
89
91
|
*/
|
90
92
|
setSpanOnContext(ctx: Context): Context;
|
91
93
|
/**
|
92
94
|
* setAttribute sets an attribute on the span.
|
93
95
|
*
|
94
|
-
* @param
|
96
|
+
* @param key - attribute key
|
97
|
+
* @param value - attribute value
|
95
98
|
*/
|
96
99
|
setAttribute(key: string, value: AttributeValue): void;
|
97
100
|
/**
|
98
101
|
* setAttributes sets multiple attributes on the span.
|
99
102
|
*
|
100
|
-
* @param attributes
|
103
|
+
* @param attributes - attributes to set
|
101
104
|
*/
|
102
105
|
setAttributes(attributes: Attributes): void;
|
103
106
|
/**
|
104
107
|
* addEvent adds an event to the span.
|
105
108
|
*
|
106
|
-
* @param name
|
107
|
-
* @param attributes
|
109
|
+
* @param name - event name
|
110
|
+
* @param attributes - event attributes
|
108
111
|
*/
|
109
112
|
addEvent(name: string, attributes?: Attributes): void;
|
110
113
|
/**
|
111
114
|
* recordException records an exception on the span.
|
112
115
|
*
|
113
|
-
* @param exception
|
114
|
-
* @param time
|
116
|
+
* @param exception - exception to record
|
117
|
+
* @param time - time to record the exception
|
115
118
|
*/
|
116
119
|
recordException(exception: Exception, time?: Time): void;
|
117
120
|
/**
|
@@ -20,14 +20,14 @@ export interface WorkerOptions extends QueueBaseOptions, SandboxedOptions {
|
|
20
20
|
/**
|
21
21
|
* Condition to start processor at instance creation.
|
22
22
|
*
|
23
|
-
* @
|
23
|
+
* @defaultValue true
|
24
24
|
*/
|
25
25
|
autorun?: boolean;
|
26
26
|
/**
|
27
27
|
* Amount of jobs that a single worker is allowed to work on
|
28
28
|
* in parallel.
|
29
29
|
*
|
30
|
-
* @
|
30
|
+
* @defaultValue 1
|
31
31
|
* @see {@link https://docs.bullmq.io/guide/workers/concurrency}
|
32
32
|
*/
|
33
33
|
concurrency?: number;
|
@@ -46,13 +46,13 @@ export interface WorkerOptions extends QueueBaseOptions, SandboxedOptions {
|
|
46
46
|
* to the `wait` state. If this is exceeded, the job is moved
|
47
47
|
* to `failed`.
|
48
48
|
*
|
49
|
-
* @
|
49
|
+
* @defaultValue 1
|
50
50
|
*/
|
51
51
|
maxStalledCount?: number;
|
52
52
|
/**
|
53
53
|
* Number of milliseconds between stallness checks.
|
54
54
|
*
|
55
|
-
* @
|
55
|
+
* @defaultValue 30000
|
56
56
|
*/
|
57
57
|
stalledInterval?: number;
|
58
58
|
/**
|
@@ -72,7 +72,7 @@ export interface WorkerOptions extends QueueBaseOptions, SandboxedOptions {
|
|
72
72
|
* perform stalled checkd and move jobs back to wait for jobs being processed
|
73
73
|
* by this worker.
|
74
74
|
*
|
75
|
-
* @
|
75
|
+
* @defaultValue false
|
76
76
|
*/
|
77
77
|
skipStalledCheck?: boolean;
|
78
78
|
/**
|
@@ -80,13 +80,13 @@ export interface WorkerOptions extends QueueBaseOptions, SandboxedOptions {
|
|
80
80
|
* after lockDuration and moved back to the wait queue (if the stalled check is
|
81
81
|
* not disabled)
|
82
82
|
*
|
83
|
-
* @
|
83
|
+
* @defaultValue false
|
84
84
|
*/
|
85
85
|
skipLockRenewal?: boolean;
|
86
86
|
/**
|
87
87
|
* Number of seconds to long poll for jobs when the queue is empty.
|
88
88
|
*
|
89
|
-
* @
|
89
|
+
* @defaultValue 5
|
90
90
|
*/
|
91
91
|
drainDelay?: number;
|
92
92
|
/**
|
@@ -95,7 +95,7 @@ export interface WorkerOptions extends QueueBaseOptions, SandboxedOptions {
|
|
95
95
|
* be picked up by the stalled checker and move back to wait so that another worker
|
96
96
|
* can process it again.
|
97
97
|
*
|
98
|
-
* @
|
98
|
+
* @defaultValue 30000
|
99
99
|
*/
|
100
100
|
lockDuration?: number;
|
101
101
|
/**
|
@@ -108,7 +108,7 @@ export interface WorkerOptions extends QueueBaseOptions, SandboxedOptions {
|
|
108
108
|
/**
|
109
109
|
* This is an internal option that should not be modified.
|
110
110
|
*
|
111
|
-
* @
|
111
|
+
* @defaultValue 15000
|
112
112
|
*/
|
113
113
|
runRetryDelay?: number;
|
114
114
|
/**
|
@@ -120,7 +120,7 @@ export interface WorkerOptions extends QueueBaseOptions, SandboxedOptions {
|
|
120
120
|
* Note: This option can only be used when specifying
|
121
121
|
* a file for the processor argument.
|
122
122
|
*
|
123
|
-
* @
|
123
|
+
* @defaultValue false
|
124
124
|
*/
|
125
125
|
useWorkerThreads?: boolean;
|
126
126
|
/**
|
@@ -502,7 +502,7 @@ if (#stalling > 0) then
|
|
502
502
|
local removed = rcall("LREM", activeKey, 1, jobId)
|
503
503
|
if (removed > 0) then
|
504
504
|
-- If this job has been stalled too many times, such as if it crashes the worker, then fail it.
|
505
|
-
local stalledCount = rcall("HINCRBY", jobKey, "
|
505
|
+
local stalledCount = rcall("HINCRBY", jobKey, "stc", 1)
|
506
506
|
if (stalledCount > maxStalledJobCount) then
|
507
507
|
local jobAttributes = rcall("HMGET", jobKey, "opts", "parent", "deid")
|
508
508
|
local rawOpts = jobAttributes[1]
|
@@ -309,7 +309,8 @@ removeJobWithChildren = function(prefix, meta, jobId, parentKey, options)
|
|
309
309
|
removeDeduplicationKey(prefix, jobKey)
|
310
310
|
if removeJobKeys(jobKey) > 0 then
|
311
311
|
local maxEvents = getOrSetMaxEvents(meta)
|
312
|
-
rcall("XADD", prefix .. "events", "MAXLEN", "~", maxEvents, "*", "event", "removed",
|
312
|
+
rcall("XADD", prefix .. "events", "MAXLEN", "~", maxEvents, "*", "event", "removed",
|
313
|
+
"jobId", jobId, "prev", prev)
|
313
314
|
end
|
314
315
|
end
|
315
316
|
end
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"removeJob-3.js","sourceRoot":"","sources":["../../../src/scripts/removeJob-3.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG
|
1
|
+
{"version":3,"file":"removeJob-3.js","sourceRoot":"","sources":["../../../src/scripts/removeJob-3.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+Uf,CAAC;AACF,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,WAAW;IACjB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}
|
@@ -306,7 +306,8 @@ removeJobWithChildren = function(prefix, meta, jobId, parentKey, options)
|
|
306
306
|
removeDeduplicationKey(prefix, jobKey)
|
307
307
|
if removeJobKeys(jobKey) > 0 then
|
308
308
|
local maxEvents = getOrSetMaxEvents(meta)
|
309
|
-
rcall("XADD", prefix .. "events", "MAXLEN", "~", maxEvents, "*", "event", "removed",
|
309
|
+
rcall("XADD", prefix .. "events", "MAXLEN", "~", maxEvents, "*", "event", "removed",
|
310
|
+
"jobId", jobId, "prev", prev)
|
310
311
|
end
|
311
312
|
end
|
312
313
|
end
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"removeUnprocessedChildren-2.js","sourceRoot":"","sources":["../../../src/scripts/removeUnprocessedChildren-2.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG
|
1
|
+
{"version":3,"file":"removeUnprocessedChildren-2.js","sourceRoot":"","sources":["../../../src/scripts/removeUnprocessedChildren-2.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmUf,CAAC;AACF,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,IAAI,EAAE,2BAA2B;IACjC,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}
|