bullmq 5.19.1 → 5.20.1
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 +4 -4
- package/dist/cjs/classes/job.js.map +1 -1
- package/dist/cjs/classes/queue.js +12 -0
- package/dist/cjs/classes/queue.js.map +1 -1
- package/dist/cjs/classes/redis-connection.js +6 -4
- package/dist/cjs/classes/redis-connection.js.map +1 -1
- package/dist/cjs/classes/scripts.js +68 -63
- package/dist/cjs/classes/scripts.js.map +1 -1
- package/dist/cjs/tsconfig-cjs.tsbuildinfo +1 -1
- package/dist/cjs/utils.js +23 -1
- package/dist/cjs/utils.js.map +1 -1
- package/dist/esm/classes/job.js +4 -4
- package/dist/esm/classes/job.js.map +1 -1
- package/dist/esm/classes/queue.d.ts +6 -0
- package/dist/esm/classes/queue.js +12 -0
- package/dist/esm/classes/queue.js.map +1 -1
- package/dist/esm/classes/redis-connection.d.ts +1 -1
- package/dist/esm/classes/redis-connection.js +7 -5
- package/dist/esm/classes/redis-connection.js.map +1 -1
- package/dist/esm/classes/scripts.d.ts +9 -7
- package/dist/esm/classes/scripts.js +69 -64
- package/dist/esm/classes/scripts.js.map +1 -1
- package/dist/esm/tsconfig.tsbuildinfo +1 -1
- package/dist/esm/utils.d.ts +4 -0
- package/dist/esm/utils.js +21 -0
- package/dist/esm/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/classes/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAU1B,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/classes/queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ export declare class RedisConnection extends EventEmitter {
|
|
|
34
34
|
*/
|
|
35
35
|
static waitUntilReady(client: RedisClient): Promise<void>;
|
|
36
36
|
get client(): Promise<RedisClient>;
|
|
37
|
-
protected loadCommands(providedScripts?: Record<string, RawCommand>): void;
|
|
37
|
+
protected loadCommands(version: string, providedScripts?: Record<string, RawCommand>): void;
|
|
38
38
|
private init;
|
|
39
39
|
disconnect(wait?: boolean): Promise<void>;
|
|
40
40
|
reconnect(): Promise<void>;
|
|
@@ -4,7 +4,7 @@ import { default as IORedis } from 'ioredis';
|
|
|
4
4
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
5
5
|
// @ts-ignore
|
|
6
6
|
import { CONNECTION_CLOSED_ERROR_MSG } from 'ioredis/built/utils';
|
|
7
|
-
import { decreaseMaxListeners, increaseMaxListeners, isNotConnectionError, isRedisCluster, isRedisInstance, isRedisVersionLowerThan, } from '../utils';
|
|
7
|
+
import { decreaseMaxListeners, increaseMaxListeners, isNotConnectionError, isRedisCluster, isRedisInstance, isRedisVersionLowerThan, readPackageJson, } from '../utils';
|
|
8
8
|
import * as scripts from '../scripts';
|
|
9
9
|
const overrideMessage = [
|
|
10
10
|
'BullMQ: WARNING! Your redis options maxRetriesPerRequest must be null',
|
|
@@ -125,12 +125,13 @@ export class RedisConnection extends EventEmitter {
|
|
|
125
125
|
get client() {
|
|
126
126
|
return this.initializing;
|
|
127
127
|
}
|
|
128
|
-
loadCommands(providedScripts) {
|
|
128
|
+
loadCommands(version, providedScripts) {
|
|
129
129
|
const finalScripts = providedScripts || scripts;
|
|
130
130
|
for (const property in finalScripts) {
|
|
131
131
|
// Only define the command if not already defined
|
|
132
|
-
|
|
133
|
-
|
|
132
|
+
const commandName = `${finalScripts[property].name}:${version}`;
|
|
133
|
+
if (!this._client[commandName]) {
|
|
134
|
+
this._client.defineCommand(commandName, {
|
|
134
135
|
numberOfKeys: finalScripts[property].keys,
|
|
135
136
|
lua: finalScripts[property].content,
|
|
136
137
|
});
|
|
@@ -147,8 +148,9 @@ export class RedisConnection extends EventEmitter {
|
|
|
147
148
|
// ioredis treats connection errors as a different event ('close')
|
|
148
149
|
this._client.on('close', this.handleClientClose);
|
|
149
150
|
this._client.on('ready', this.handleClientReady);
|
|
151
|
+
const { version } = readPackageJson();
|
|
150
152
|
await RedisConnection.waitUntilReady(this._client);
|
|
151
|
-
this.loadCommands();
|
|
153
|
+
this.loadCommands(version);
|
|
152
154
|
if (this._client['status'] !== 'end') {
|
|
153
155
|
this.version = await this.getRedisVersion();
|
|
154
156
|
if (this.skipVersionCheck !== true && !this.closing) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-connection.js","sourceRoot":"","sources":["../../../src/classes/redis-connection.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,SAAS,CAAC;AAC7C,6DAA6D;AAC7D,aAAa;AACb,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAElE,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EACd,eAAe,EACf,uBAAuB,
|
|
1
|
+
{"version":3,"file":"redis-connection.js","sourceRoot":"","sources":["../../../src/classes/redis-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,10 @@ import { ChainableCommander } from 'ioredis';
|
|
|
8
8
|
export type JobData = [JobJsonRaw | number, string?];
|
|
9
9
|
export declare class Scripts {
|
|
10
10
|
protected queue: MinimalQueue;
|
|
11
|
+
protected version: string;
|
|
11
12
|
moveToFinishedKeys: (string | undefined)[];
|
|
12
13
|
constructor(queue: MinimalQueue);
|
|
14
|
+
execCommand(client: RedisClient | ChainableCommander, commandName: string, args: any[]): any;
|
|
13
15
|
isJobInList(listKey: string, jobId: string): Promise<boolean>;
|
|
14
16
|
protected addDelayedJob(client: RedisClient, job: JobJson, encodedOpts: any, args: (string | number | Record<string, any>)[]): Promise<string | number>;
|
|
15
17
|
protected addPrioritizedJob(client: RedisClient, job: JobJson, encodedOpts: any, args: (string | number | Record<string, any>)[]): Promise<string | number>;
|
|
@@ -36,13 +38,6 @@ export declare class Scripts {
|
|
|
36
38
|
protected moveToFinishedArgs<T = any, R = any, N extends string = string>(job: MinimalJob<T, R, N>, val: any, propVal: FinishedPropValAttribute, shouldRemove: undefined | boolean | number | KeepJobs, target: FinishedStatus, token: string, timestamp: number, fetchNext?: boolean): (string | number | boolean | Buffer)[];
|
|
37
39
|
protected getKeepJobs(shouldRemove: undefined | boolean | number | KeepJobs, workerKeepJobs: undefined | KeepJobs): KeepJobs;
|
|
38
40
|
moveToFinished(jobId: string, args: (string | number | boolean | Buffer)[]): Promise<any[]>;
|
|
39
|
-
finishedErrors({ code, jobId, parentKey, command, state, }: {
|
|
40
|
-
code: number;
|
|
41
|
-
jobId?: string;
|
|
42
|
-
parentKey?: string;
|
|
43
|
-
command: string;
|
|
44
|
-
state?: string;
|
|
45
|
-
}): Error;
|
|
46
41
|
private drainArgs;
|
|
47
42
|
drain(delayed: boolean): Promise<void>;
|
|
48
43
|
private removeChildDependencyArgs;
|
|
@@ -151,5 +146,12 @@ export declare class Scripts {
|
|
|
151
146
|
total: number;
|
|
152
147
|
jobs?: JobJsonRaw[];
|
|
153
148
|
}>;
|
|
149
|
+
finishedErrors({ code, jobId, parentKey, command, state, }: {
|
|
150
|
+
code: number;
|
|
151
|
+
jobId?: string;
|
|
152
|
+
parentKey?: string;
|
|
153
|
+
command: string;
|
|
154
|
+
state?: string;
|
|
155
|
+
}): Error;
|
|
154
156
|
}
|
|
155
157
|
export declare function raw2NextJobData(raw: any[]): any[];
|
|
@@ -10,11 +10,12 @@ const packer = new Packr({
|
|
|
10
10
|
});
|
|
11
11
|
const pack = packer.pack;
|
|
12
12
|
import { ErrorCode } from '../enums';
|
|
13
|
-
import { array2obj, getParentKey, isRedisVersionLowerThan } from '../utils';
|
|
13
|
+
import { array2obj, getParentKey, isRedisVersionLowerThan, readPackageJson, } from '../utils';
|
|
14
14
|
export class Scripts {
|
|
15
15
|
constructor(queue) {
|
|
16
16
|
this.queue = queue;
|
|
17
17
|
const queueKeys = this.queue.keys;
|
|
18
|
+
this.version = readPackageJson().version;
|
|
18
19
|
this.moveToFinishedKeys = [
|
|
19
20
|
queueKeys.wait,
|
|
20
21
|
queueKeys.active,
|
|
@@ -32,11 +33,15 @@ export class Scripts {
|
|
|
32
33
|
undefined,
|
|
33
34
|
];
|
|
34
35
|
}
|
|
36
|
+
execCommand(client, commandName, args) {
|
|
37
|
+
const commandNameWithVersion = `${commandName}:${this.version}`;
|
|
38
|
+
return client[commandNameWithVersion](args);
|
|
39
|
+
}
|
|
35
40
|
async isJobInList(listKey, jobId) {
|
|
36
41
|
const client = await this.queue.client;
|
|
37
42
|
let result;
|
|
38
43
|
if (isRedisVersionLowerThan(this.queue.redisVersion, '6.0.6')) {
|
|
39
|
-
result =
|
|
44
|
+
result = this.execCommand(client, 'isJobInList', [listKey, jobId]);
|
|
40
45
|
}
|
|
41
46
|
else {
|
|
42
47
|
result = await client.lpos(listKey, jobId);
|
|
@@ -54,7 +59,7 @@ export class Scripts {
|
|
|
54
59
|
queueKeys.events,
|
|
55
60
|
];
|
|
56
61
|
keys.push(pack(args), job.data, encodedOpts);
|
|
57
|
-
return client
|
|
62
|
+
return this.execCommand(client, 'addDelayedJob', keys);
|
|
58
63
|
}
|
|
59
64
|
addPrioritizedJob(client, job, encodedOpts, args) {
|
|
60
65
|
const queueKeys = this.queue.keys;
|
|
@@ -69,7 +74,7 @@ export class Scripts {
|
|
|
69
74
|
queueKeys.pc,
|
|
70
75
|
];
|
|
71
76
|
keys.push(pack(args), job.data, encodedOpts);
|
|
72
|
-
return client
|
|
77
|
+
return this.execCommand(client, 'addPrioritizedJob', keys);
|
|
73
78
|
}
|
|
74
79
|
addParentJob(client, job, encodedOpts, args) {
|
|
75
80
|
const queueKeys = this.queue.keys;
|
|
@@ -80,7 +85,7 @@ export class Scripts {
|
|
|
80
85
|
queueKeys.events,
|
|
81
86
|
];
|
|
82
87
|
keys.push(pack(args), job.data, encodedOpts);
|
|
83
|
-
return client
|
|
88
|
+
return this.execCommand(client, 'addParentJob', keys);
|
|
84
89
|
}
|
|
85
90
|
addStandardJob(client, job, encodedOpts, args) {
|
|
86
91
|
const queueKeys = this.queue.keys;
|
|
@@ -95,7 +100,7 @@ export class Scripts {
|
|
|
95
100
|
queueKeys.marker,
|
|
96
101
|
];
|
|
97
102
|
keys.push(pack(args), job.data, encodedOpts);
|
|
98
|
-
return client
|
|
103
|
+
return this.execCommand(client, 'addStandardJob', keys);
|
|
99
104
|
}
|
|
100
105
|
async addJob(client, job, opts, jobId, parentOpts = {}) {
|
|
101
106
|
const queueKeys = this.queue.keys;
|
|
@@ -163,7 +168,7 @@ export class Scripts {
|
|
|
163
168
|
async pause(pause) {
|
|
164
169
|
const client = await this.queue.client;
|
|
165
170
|
const args = this.pauseArgs(pause);
|
|
166
|
-
return client
|
|
171
|
+
return this.execCommand(client, 'pause', args);
|
|
167
172
|
}
|
|
168
173
|
addRepeatableJobArgs(customKey, nextMillis, opts, legacyCustomKey) {
|
|
169
174
|
const queueKeys = this.queue.keys;
|
|
@@ -183,7 +188,7 @@ export class Scripts {
|
|
|
183
188
|
async addRepeatableJob(customKey, nextMillis, opts, legacyCustomKey) {
|
|
184
189
|
const client = await this.queue.client;
|
|
185
190
|
const args = this.addRepeatableJobArgs(customKey, nextMillis, opts, legacyCustomKey);
|
|
186
|
-
return client
|
|
191
|
+
return this.execCommand(client, 'addRepeatableJob', args);
|
|
187
192
|
}
|
|
188
193
|
async addJobScheduler(jobSchedulerId, nextMillis, opts) {
|
|
189
194
|
const queueKeys = this.queue.keys;
|
|
@@ -193,7 +198,7 @@ export class Scripts {
|
|
|
193
198
|
queueKeys.delayed,
|
|
194
199
|
];
|
|
195
200
|
const args = [nextMillis, pack(opts), jobSchedulerId, queueKeys['']];
|
|
196
|
-
return client
|
|
201
|
+
return this.execCommand(client, 'addJobScheduler', keys.concat(args));
|
|
197
202
|
}
|
|
198
203
|
async updateRepeatableJobMillis(client, customKey, nextMillis, legacyCustomKey) {
|
|
199
204
|
const args = [
|
|
@@ -202,7 +207,7 @@ export class Scripts {
|
|
|
202
207
|
customKey,
|
|
203
208
|
legacyCustomKey,
|
|
204
209
|
];
|
|
205
|
-
return client
|
|
210
|
+
return this.execCommand(client, 'updateRepeatableJobMillis', args);
|
|
206
211
|
}
|
|
207
212
|
async updateJobSchedulerNextMillis(jobSchedulerId, nextMillis) {
|
|
208
213
|
const client = await this.queue.client;
|
|
@@ -229,14 +234,14 @@ export class Scripts {
|
|
|
229
234
|
async removeRepeatable(legacyRepeatJobId, repeatConcatOptions, repeatJobKey) {
|
|
230
235
|
const client = await this.queue.client;
|
|
231
236
|
const args = this.removeRepeatableArgs(legacyRepeatJobId, repeatConcatOptions, repeatJobKey);
|
|
232
|
-
return client
|
|
237
|
+
return this.execCommand(client, 'removeRepeatable', args);
|
|
233
238
|
}
|
|
234
239
|
async removeJobScheduler(jobSchedulerId) {
|
|
235
240
|
const client = await this.queue.client;
|
|
236
241
|
const queueKeys = this.queue.keys;
|
|
237
242
|
const keys = [queueKeys.repeat, queueKeys.delayed, queueKeys.events];
|
|
238
243
|
const args = [jobSchedulerId, queueKeys['']];
|
|
239
|
-
return client
|
|
244
|
+
return this.execCommand(client, 'removeJobScheduler', keys.concat(args));
|
|
240
245
|
}
|
|
241
246
|
removeArgs(jobId, removeChildren) {
|
|
242
247
|
const keys = ['', 'meta'].map(name => this.queue.toKey(name));
|
|
@@ -246,7 +251,7 @@ export class Scripts {
|
|
|
246
251
|
async remove(jobId, removeChildren) {
|
|
247
252
|
const client = await this.queue.client;
|
|
248
253
|
const args = this.removeArgs(jobId, removeChildren);
|
|
249
|
-
const result = await client
|
|
254
|
+
const result = await this.execCommand(client, 'removeJob', args);
|
|
250
255
|
if (result < 0) {
|
|
251
256
|
throw this.finishedErrors({
|
|
252
257
|
code: result,
|
|
@@ -265,13 +270,13 @@ export class Scripts {
|
|
|
265
270
|
duration,
|
|
266
271
|
jobId,
|
|
267
272
|
];
|
|
268
|
-
return client
|
|
273
|
+
return this.execCommand(client, 'extendLock', args);
|
|
269
274
|
}
|
|
270
275
|
async updateData(job, data) {
|
|
271
276
|
const client = await this.queue.client;
|
|
272
277
|
const keys = [this.queue.toKey(job.id)];
|
|
273
278
|
const dataJson = JSON.stringify(data);
|
|
274
|
-
const result = await client
|
|
279
|
+
const result = await this.execCommand(client, 'updateData', keys.concat([dataJson]));
|
|
275
280
|
if (result < 0) {
|
|
276
281
|
throw this.finishedErrors({
|
|
277
282
|
code: result,
|
|
@@ -288,7 +293,7 @@ export class Scripts {
|
|
|
288
293
|
this.queue.keys.meta,
|
|
289
294
|
];
|
|
290
295
|
const progressJson = JSON.stringify(progress);
|
|
291
|
-
const result = await client
|
|
296
|
+
const result = await this.execCommand(client, 'updateProgress', keys.concat([jobId, progressJson]));
|
|
292
297
|
if (result < 0) {
|
|
293
298
|
throw this.finishedErrors({
|
|
294
299
|
code: result,
|
|
@@ -303,7 +308,7 @@ export class Scripts {
|
|
|
303
308
|
this.queue.toKey(jobId),
|
|
304
309
|
this.queue.toKey(jobId) + ':logs',
|
|
305
310
|
];
|
|
306
|
-
const result = await client
|
|
311
|
+
const result = await this.execCommand(client, 'addLog', keys.concat([jobId, logRow, keepLogs ? keepLogs : '']));
|
|
307
312
|
if (result < 0) {
|
|
308
313
|
throw this.finishedErrors({
|
|
309
314
|
code: result,
|
|
@@ -361,7 +366,7 @@ export class Scripts {
|
|
|
361
366
|
}
|
|
362
367
|
async moveToFinished(jobId, args) {
|
|
363
368
|
const client = await this.queue.client;
|
|
364
|
-
const result = await client
|
|
369
|
+
const result = await this.execCommand(client, 'moveToFinished', args);
|
|
365
370
|
if (result < 0) {
|
|
366
371
|
throw this.finishedErrors({
|
|
367
372
|
code: result,
|
|
@@ -376,28 +381,6 @@ export class Scripts {
|
|
|
376
381
|
}
|
|
377
382
|
}
|
|
378
383
|
}
|
|
379
|
-
finishedErrors({ code, jobId, parentKey, command, state, }) {
|
|
380
|
-
switch (code) {
|
|
381
|
-
case ErrorCode.JobNotExist:
|
|
382
|
-
return new Error(`Missing key for job ${jobId}. ${command}`);
|
|
383
|
-
case ErrorCode.JobLockNotExist:
|
|
384
|
-
return new Error(`Missing lock for job ${jobId}. ${command}`);
|
|
385
|
-
case ErrorCode.JobNotInState:
|
|
386
|
-
return new Error(`Job ${jobId} is not in the ${state} state. ${command}`);
|
|
387
|
-
case ErrorCode.JobPendingDependencies:
|
|
388
|
-
return new Error(`Job ${jobId} has pending dependencies. ${command}`);
|
|
389
|
-
case ErrorCode.ParentJobNotExist:
|
|
390
|
-
return new Error(`Missing key for parent job ${parentKey}. ${command}`);
|
|
391
|
-
case ErrorCode.JobLockMismatch:
|
|
392
|
-
return new Error(`Lock mismatch for job ${jobId}. Cmd ${command} from ${state}`);
|
|
393
|
-
case ErrorCode.ParentJobCannotBeReplaced:
|
|
394
|
-
return new Error(`The parent job ${parentKey} cannot be replaced. ${command}`);
|
|
395
|
-
case ErrorCode.JobBelongsToJobScheduler:
|
|
396
|
-
return new Error(`Job ${jobId} belongs to a job scheduler and cannot be removed directly. ${command}`);
|
|
397
|
-
default:
|
|
398
|
-
return new Error(`Unknown code ${code} error for ${jobId}. ${command}`);
|
|
399
|
-
}
|
|
400
|
-
}
|
|
401
384
|
drainArgs(delayed) {
|
|
402
385
|
const queueKeys = this.queue.keys;
|
|
403
386
|
const keys = [
|
|
@@ -413,7 +396,7 @@ export class Scripts {
|
|
|
413
396
|
async drain(delayed) {
|
|
414
397
|
const client = await this.queue.client;
|
|
415
398
|
const args = this.drainArgs(delayed);
|
|
416
|
-
return client
|
|
399
|
+
return this.execCommand(client, 'drain', args);
|
|
417
400
|
}
|
|
418
401
|
removeChildDependencyArgs(jobId, parentKey) {
|
|
419
402
|
const queueKeys = this.queue.keys;
|
|
@@ -424,7 +407,7 @@ export class Scripts {
|
|
|
424
407
|
async removeChildDependency(jobId, parentKey) {
|
|
425
408
|
const client = await this.queue.client;
|
|
426
409
|
const args = this.removeChildDependencyArgs(jobId, parentKey);
|
|
427
|
-
const result = await client
|
|
410
|
+
const result = await this.execCommand(client, 'removeChildDependency', args);
|
|
428
411
|
switch (result) {
|
|
429
412
|
case 0:
|
|
430
413
|
return true;
|
|
@@ -451,7 +434,7 @@ export class Scripts {
|
|
|
451
434
|
async getRanges(types, start = 0, end = 1, asc = false) {
|
|
452
435
|
const client = await this.queue.client;
|
|
453
436
|
const args = this.getRangesArgs(types, start, end, asc);
|
|
454
|
-
return client
|
|
437
|
+
return await this.execCommand(client, 'getRanges', args);
|
|
455
438
|
}
|
|
456
439
|
getCountsArgs(types) {
|
|
457
440
|
const queueKeys = this.queue.keys;
|
|
@@ -465,7 +448,7 @@ export class Scripts {
|
|
|
465
448
|
async getCounts(types) {
|
|
466
449
|
const client = await this.queue.client;
|
|
467
450
|
const args = this.getCountsArgs(types);
|
|
468
|
-
return client
|
|
451
|
+
return await this.execCommand(client, 'getCounts', args);
|
|
469
452
|
}
|
|
470
453
|
getCountsPerPriorityArgs(priorities) {
|
|
471
454
|
const keys = [
|
|
@@ -480,7 +463,7 @@ export class Scripts {
|
|
|
480
463
|
async getCountsPerPriority(priorities) {
|
|
481
464
|
const client = await this.queue.client;
|
|
482
465
|
const args = this.getCountsPerPriorityArgs(priorities);
|
|
483
|
-
return client
|
|
466
|
+
return await this.execCommand(client, 'getCountsPerPriority', args);
|
|
484
467
|
}
|
|
485
468
|
moveToCompletedArgs(job, returnvalue, removeOnComplete, token, fetchNext = false) {
|
|
486
469
|
const timestamp = Date.now();
|
|
@@ -495,7 +478,7 @@ export class Scripts {
|
|
|
495
478
|
const keys = ['completed', 'failed', jobId].map((key) => {
|
|
496
479
|
return this.queue.toKey(key);
|
|
497
480
|
});
|
|
498
|
-
return client
|
|
481
|
+
return this.execCommand(client, 'isFinished', keys.concat([jobId, returnValue ? '1' : '']));
|
|
499
482
|
}
|
|
500
483
|
async getState(jobId) {
|
|
501
484
|
const client = await this.queue.client;
|
|
@@ -512,14 +495,14 @@ export class Scripts {
|
|
|
512
495
|
return this.queue.toKey(key);
|
|
513
496
|
});
|
|
514
497
|
if (isRedisVersionLowerThan(this.queue.redisVersion, '6.0.6')) {
|
|
515
|
-
return client
|
|
498
|
+
return this.execCommand(client, 'getState', keys.concat([jobId]));
|
|
516
499
|
}
|
|
517
|
-
return client
|
|
500
|
+
return this.execCommand(client, 'getStateV2', keys.concat([jobId]));
|
|
518
501
|
}
|
|
519
502
|
async changeDelay(jobId, delay) {
|
|
520
503
|
const client = await this.queue.client;
|
|
521
504
|
const args = this.changeDelayArgs(jobId, delay);
|
|
522
|
-
const result = await client
|
|
505
|
+
const result = await this.execCommand(client, 'changeDelay', args);
|
|
523
506
|
if (result < 0) {
|
|
524
507
|
throw this.finishedErrors({
|
|
525
508
|
code: result,
|
|
@@ -547,7 +530,7 @@ export class Scripts {
|
|
|
547
530
|
async changePriority(jobId, priority = 0, lifo = false) {
|
|
548
531
|
const client = await this.queue.client;
|
|
549
532
|
const args = this.changePriorityArgs(jobId, priority, lifo);
|
|
550
|
-
const result = await client
|
|
533
|
+
const result = await this.execCommand(client, 'changePriority', args);
|
|
551
534
|
if (result < 0) {
|
|
552
535
|
throw this.finishedErrors({
|
|
553
536
|
code: result,
|
|
@@ -620,12 +603,12 @@ export class Scripts {
|
|
|
620
603
|
async isMaxed() {
|
|
621
604
|
const client = await this.queue.client;
|
|
622
605
|
const args = this.isMaxedArgs();
|
|
623
|
-
return !!(await client
|
|
606
|
+
return !!(await this.execCommand(client, 'isMaxed', args));
|
|
624
607
|
}
|
|
625
608
|
async moveToDelayed(jobId, timestamp, delay, token = '0', opts = {}) {
|
|
626
609
|
const client = await this.queue.client;
|
|
627
610
|
const args = this.moveToDelayedArgs(jobId, timestamp, token, delay, opts);
|
|
628
|
-
const result = await client
|
|
611
|
+
const result = await this.execCommand(client, 'moveToDelayed', args);
|
|
629
612
|
if (result < 0) {
|
|
630
613
|
throw this.finishedErrors({
|
|
631
614
|
code: result,
|
|
@@ -649,7 +632,7 @@ export class Scripts {
|
|
|
649
632
|
async moveToWaitingChildren(jobId, token, opts = {}) {
|
|
650
633
|
const client = await this.queue.client;
|
|
651
634
|
const args = this.moveToWaitingChildrenArgs(jobId, token, opts);
|
|
652
|
-
const result = await client
|
|
635
|
+
const result = await this.execCommand(client, 'moveToWaitingChildren', args);
|
|
653
636
|
switch (result) {
|
|
654
637
|
case 0:
|
|
655
638
|
return true;
|
|
@@ -671,7 +654,7 @@ export class Scripts {
|
|
|
671
654
|
async getRateLimitTtl(maxJobs) {
|
|
672
655
|
const client = await this.queue.client;
|
|
673
656
|
const args = this.getRateLimitTtlArgs(maxJobs);
|
|
674
|
-
return client
|
|
657
|
+
return this.execCommand(client, 'getRateLimitTtl', args);
|
|
675
658
|
}
|
|
676
659
|
/**
|
|
677
660
|
* Remove jobs in a specific state.
|
|
@@ -680,7 +663,7 @@ export class Scripts {
|
|
|
680
663
|
*/
|
|
681
664
|
async cleanJobsInSet(set, timestamp, limit = 0) {
|
|
682
665
|
const client = await this.queue.client;
|
|
683
|
-
return client
|
|
666
|
+
return this.execCommand(client, 'cleanJobsInSet', [
|
|
684
667
|
this.queue.toKey(set),
|
|
685
668
|
this.queue.toKey('events'),
|
|
686
669
|
this.queue.toKey('repeat'),
|
|
@@ -730,12 +713,12 @@ export class Scripts {
|
|
|
730
713
|
async retryJobs(state = 'failed', count = 1000, timestamp = new Date().getTime()) {
|
|
731
714
|
const client = await this.queue.client;
|
|
732
715
|
const args = this.moveJobsToWaitArgs(state, count, timestamp);
|
|
733
|
-
return client
|
|
716
|
+
return this.execCommand(client, 'moveJobsToWait', args);
|
|
734
717
|
}
|
|
735
718
|
async promoteJobs(count = 1000) {
|
|
736
719
|
const client = await this.queue.client;
|
|
737
720
|
const args = this.moveJobsToWaitArgs('delayed', count, Number.MAX_VALUE);
|
|
738
|
-
return client
|
|
721
|
+
return this.execCommand(client, 'moveJobsToWait', args);
|
|
739
722
|
}
|
|
740
723
|
/**
|
|
741
724
|
* Attempts to reprocess a job
|
|
@@ -768,7 +751,7 @@ export class Scripts {
|
|
|
768
751
|
state === 'failed' ? 'failedReason' : 'returnvalue',
|
|
769
752
|
state,
|
|
770
753
|
];
|
|
771
|
-
const result = await client
|
|
754
|
+
const result = await this.execCommand(client, 'reprocessJob', keys.concat(args));
|
|
772
755
|
switch (result) {
|
|
773
756
|
case 1:
|
|
774
757
|
return;
|
|
@@ -807,7 +790,7 @@ export class Scripts {
|
|
|
807
790
|
name,
|
|
808
791
|
}),
|
|
809
792
|
];
|
|
810
|
-
const result = await client
|
|
793
|
+
const result = await this.execCommand(client, 'moveToActive', keys.concat(args));
|
|
811
794
|
return raw2NextJobData(result);
|
|
812
795
|
}
|
|
813
796
|
async promote(jobId) {
|
|
@@ -824,7 +807,7 @@ export class Scripts {
|
|
|
824
807
|
this.queue.keys.marker,
|
|
825
808
|
];
|
|
826
809
|
const args = [this.queue.toKey(''), jobId];
|
|
827
|
-
const code = await client
|
|
810
|
+
const code = await this.execCommand(client, 'promote', keys.concat(args));
|
|
828
811
|
if (code < 0) {
|
|
829
812
|
throw this.finishedErrors({
|
|
830
813
|
code,
|
|
@@ -867,7 +850,7 @@ export class Scripts {
|
|
|
867
850
|
async moveStalledJobsToWait() {
|
|
868
851
|
const client = await this.queue.client;
|
|
869
852
|
const args = this.moveStalledJobsToWaitArgs();
|
|
870
|
-
return client
|
|
853
|
+
return this.execCommand(client, 'moveStalledJobsToWait', args);
|
|
871
854
|
}
|
|
872
855
|
/**
|
|
873
856
|
* Moves a job back from Active to Wait.
|
|
@@ -894,7 +877,7 @@ export class Scripts {
|
|
|
894
877
|
this.queue.keys.events,
|
|
895
878
|
];
|
|
896
879
|
const args = [jobId, token, this.queue.toKey(jobId)];
|
|
897
|
-
const pttl = await client
|
|
880
|
+
const pttl = await this.execCommand(client, 'moveJobFromActiveToWait', keys.concat(args));
|
|
898
881
|
return pttl < 0 ? 0 : pttl;
|
|
899
882
|
}
|
|
900
883
|
async obliterate(opts) {
|
|
@@ -904,7 +887,7 @@ export class Scripts {
|
|
|
904
887
|
this.queue.toKey(''),
|
|
905
888
|
];
|
|
906
889
|
const args = [opts.count, opts.force ? 'force' : null];
|
|
907
|
-
const result = await client
|
|
890
|
+
const result = await this.execCommand(client, 'obliterate', keys.concat(args));
|
|
908
891
|
if (result < 0) {
|
|
909
892
|
switch (result) {
|
|
910
893
|
case -1:
|
|
@@ -937,7 +920,7 @@ export class Scripts {
|
|
|
937
920
|
if (opts.fetchJobs) {
|
|
938
921
|
args.push(1);
|
|
939
922
|
}
|
|
940
|
-
[cursor, offset, items, total, rawJobs] = await client
|
|
923
|
+
[cursor, offset, items, total, rawJobs] = await this.execCommand(client, 'paginate', keys.concat(args));
|
|
941
924
|
page = page.concat(items);
|
|
942
925
|
if (rawJobs && rawJobs.length) {
|
|
943
926
|
jobs = jobs.concat(rawJobs.map(array2obj));
|
|
@@ -972,6 +955,28 @@ export class Scripts {
|
|
|
972
955
|
};
|
|
973
956
|
}
|
|
974
957
|
}
|
|
958
|
+
finishedErrors({ code, jobId, parentKey, command, state, }) {
|
|
959
|
+
switch (code) {
|
|
960
|
+
case ErrorCode.JobNotExist:
|
|
961
|
+
return new Error(`Missing key for job ${jobId}. ${command}`);
|
|
962
|
+
case ErrorCode.JobLockNotExist:
|
|
963
|
+
return new Error(`Missing lock for job ${jobId}. ${command}`);
|
|
964
|
+
case ErrorCode.JobNotInState:
|
|
965
|
+
return new Error(`Job ${jobId} is not in the ${state} state. ${command}`);
|
|
966
|
+
case ErrorCode.JobPendingDependencies:
|
|
967
|
+
return new Error(`Job ${jobId} has pending dependencies. ${command}`);
|
|
968
|
+
case ErrorCode.ParentJobNotExist:
|
|
969
|
+
return new Error(`Missing key for parent job ${parentKey}. ${command}`);
|
|
970
|
+
case ErrorCode.JobLockMismatch:
|
|
971
|
+
return new Error(`Lock mismatch for job ${jobId}. Cmd ${command} from ${state}`);
|
|
972
|
+
case ErrorCode.ParentJobCannotBeReplaced:
|
|
973
|
+
return new Error(`The parent job ${parentKey} cannot be replaced. ${command}`);
|
|
974
|
+
case ErrorCode.JobBelongsToJobScheduler:
|
|
975
|
+
return new Error(`Job ${jobId} belongs to a job scheduler and cannot be removed directly. ${command}`);
|
|
976
|
+
default:
|
|
977
|
+
return new Error(`Unknown code ${code} error for ${jobId}. ${command}`);
|
|
978
|
+
}
|
|
979
|
+
}
|
|
975
980
|
}
|
|
976
981
|
export function raw2NextJobData(raw) {
|
|
977
982
|
if (raw) {
|