bullmq 1.78.2 → 1.80.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/README.md +40 -5
- package/dist/bullmq.d.ts +46 -22
- package/dist/cjs/classes/queue-base.d.ts +1 -1
- package/dist/cjs/classes/queue-base.js +4 -3
- package/dist/cjs/classes/queue-base.js.map +1 -1
- package/dist/cjs/classes/queue-events.js +9 -1
- package/dist/cjs/classes/queue-events.js.map +1 -1
- package/dist/cjs/classes/queue-getters.d.ts +9 -0
- package/dist/cjs/classes/queue-getters.js +20 -20
- package/dist/cjs/classes/queue-getters.js.map +1 -1
- package/dist/cjs/classes/queue-scheduler.d.ts +0 -1
- package/dist/cjs/classes/queue-scheduler.js +2 -6
- package/dist/cjs/classes/queue-scheduler.js.map +1 -1
- package/dist/cjs/classes/queue.js +1 -1
- package/dist/cjs/classes/queue.js.map +1 -1
- package/dist/cjs/classes/redis-connection.d.ts +4 -3
- package/dist/cjs/classes/redis-connection.js +22 -22
- package/dist/cjs/classes/redis-connection.js.map +1 -1
- package/dist/cjs/classes/worker.d.ts +9 -9
- package/dist/cjs/classes/worker.js +2 -2
- package/dist/cjs/classes/worker.js.map +1 -1
- package/dist/cjs/interfaces/backoff-options.d.ts +1 -1
- package/dist/cjs/interfaces/queue-options.d.ts +4 -0
- package/dist/cjs/interfaces/redis-options.d.ts +7 -4
- package/dist/cjs/utils.d.ts +6 -1
- package/dist/cjs/utils.js +8 -1
- package/dist/cjs/utils.js.map +1 -1
- package/dist/esm/classes/queue-base.d.ts +1 -1
- package/dist/esm/classes/queue-base.js +4 -3
- package/dist/esm/classes/queue-base.js.map +1 -1
- package/dist/esm/classes/queue-events.js +10 -2
- package/dist/esm/classes/queue-events.js.map +1 -1
- package/dist/esm/classes/queue-getters.d.ts +9 -0
- package/dist/esm/classes/queue-getters.js +21 -21
- package/dist/esm/classes/queue-getters.js.map +1 -1
- package/dist/esm/classes/queue-scheduler.d.ts +0 -1
- package/dist/esm/classes/queue-scheduler.js +3 -7
- package/dist/esm/classes/queue-scheduler.js.map +1 -1
- package/dist/esm/classes/queue.js +1 -1
- package/dist/esm/classes/queue.js.map +1 -1
- package/dist/esm/classes/redis-connection.d.ts +4 -3
- package/dist/esm/classes/redis-connection.js +23 -23
- package/dist/esm/classes/redis-connection.js.map +1 -1
- package/dist/esm/classes/worker.d.ts +9 -9
- package/dist/esm/classes/worker.js +3 -3
- package/dist/esm/classes/worker.js.map +1 -1
- package/dist/esm/interfaces/backoff-options.d.ts +1 -1
- package/dist/esm/interfaces/queue-options.d.ts +4 -0
- package/dist/esm/interfaces/redis-options.d.ts +7 -4
- package/dist/esm/utils.d.ts +6 -1
- package/dist/esm/utils.js +6 -0
- package/dist/esm/utils.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
@@ -53,11 +53,46 @@ Sign up at [Taskforce.sh](https://taskforce.sh)
|
|
53
53
|
|
54
54
|
Some notable organizations using BullMQ:
|
55
55
|
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
56
|
+
<table cellspacing="0" cellpadding="0">
|
57
|
+
<tr>
|
58
|
+
<td valign="center">
|
59
|
+
<a href="https://github.com/microsoft/lage">
|
60
|
+
<img
|
61
|
+
src="https://files.gitbook.com/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-LUuDmt_xXMfG66Rn1GA%2Fuploads%2FUvwInTAmk7hxAViDwJzU%2Fclipart1565701.png?alt=media"
|
62
|
+
width="150"
|
63
|
+
alt="Microsoft"
|
64
|
+
/>
|
65
|
+
</a>
|
66
|
+
</td>
|
67
|
+
<td valign="center">
|
68
|
+
<a href="https://github.com/vendure-ecommerce/vendure">
|
69
|
+
<img
|
70
|
+
src="https://files.gitbook.com/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-LUuDmt_xXMfG66Rn1GA%2Fuploads%2FvT30DUqsi61gL8edn3R2%2Fwordmark-logo.png?alt=media"
|
71
|
+
width="150"
|
72
|
+
alt="Vendure"
|
73
|
+
/>
|
74
|
+
</a>
|
75
|
+
</td>
|
76
|
+
<td valign="center">
|
77
|
+
<a href="https://github.com/datawrapper/datawrapper">
|
78
|
+
<img
|
79
|
+
src="https://files.gitbook.com/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-LUuDmt_xXMfG66Rn1GA%2Fuploads%2FCJ5XmotpBBsuSgD8CilC%2Fdatawrapper-logo.png?alt=media"
|
80
|
+
width="150"
|
81
|
+
alt="Datawrapper"
|
82
|
+
/>
|
83
|
+
</a>
|
84
|
+
</td>
|
85
|
+
<td valign="center">
|
86
|
+
<a href="https://github.com/teamcurri">
|
87
|
+
<img
|
88
|
+
src="https://user-images.githubusercontent.com/659829/161662129-ae645bc4-c1e9-48ff-997e-4cee281a964a.png"
|
89
|
+
width="150"
|
90
|
+
alt="Curri"
|
91
|
+
/>
|
92
|
+
</a>
|
93
|
+
</td>
|
94
|
+
<tr>
|
95
|
+
</table>
|
61
96
|
# The gist
|
62
97
|
|
63
98
|
Install:
|
package/dist/bullmq.d.ts
CHANGED
@@ -2,12 +2,11 @@
|
|
2
2
|
|
3
3
|
import { ChildProcess } from 'child_process';
|
4
4
|
import { Cluster } from 'ioredis';
|
5
|
-
import { ClusterOptions } from 'ioredis';
|
6
5
|
import { EventEmitter } from 'events';
|
6
|
+
import type * as IORedis from 'ioredis';
|
7
7
|
import { ParserOptions } from 'cron-parser';
|
8
8
|
import { Pipeline } from 'ioredis';
|
9
9
|
import { Redis } from 'ioredis';
|
10
|
-
import { RedisOptions as RedisOptions_2 } from 'ioredis';
|
11
10
|
|
12
11
|
export declare type ActiveEventCallback3<T = any> = (job: Job, jobPromise?: JobPromise3) => void;
|
13
12
|
|
@@ -62,7 +61,7 @@ export declare interface BackoffOptions {
|
|
62
61
|
/**
|
63
62
|
* Name of the backoff strategy.
|
64
63
|
*/
|
65
|
-
type: string;
|
64
|
+
type: 'fixed' | 'exponential' | (string & {});
|
66
65
|
/**
|
67
66
|
* Delay in milliseconds.
|
68
67
|
*/
|
@@ -75,6 +74,10 @@ export declare class Backoffs {
|
|
75
74
|
static calculate(backoff: BackoffOptions, attemptsMade: number, customStrategies: Strategies, err: Error, job: Job): number;
|
76
75
|
}
|
77
76
|
|
77
|
+
declare interface BaseOptions {
|
78
|
+
skipVersionCheck?: boolean;
|
79
|
+
}
|
80
|
+
|
78
81
|
declare interface BuiltInStrategies {
|
79
82
|
[index: string]: (delay: number) => BackoffFunction;
|
80
83
|
}
|
@@ -150,6 +153,8 @@ export declare enum ClientType {
|
|
150
153
|
normal = "normal"
|
151
154
|
}
|
152
155
|
|
156
|
+
export declare type ClusterOptions = IORedis.ClusterOptions & BaseOptions;
|
157
|
+
|
153
158
|
export declare interface Command {
|
154
159
|
name: string;
|
155
160
|
options: {
|
@@ -162,7 +167,7 @@ declare type CommonOptions = QueueSchedulerOptions & QueueOptions & WorkerOption
|
|
162
167
|
|
163
168
|
export declare type CompletedEventCallback3<T = any> = (job: Job, result: any) => void;
|
164
169
|
|
165
|
-
export declare type ConnectionOptions = RedisOptions | Redis | Cluster;
|
170
|
+
export declare type ConnectionOptions = RedisOptions | ClusterOptions | IORedis.Redis | IORedis.Cluster;
|
166
171
|
|
167
172
|
export declare function delay(ms: number): Promise<void>;
|
168
173
|
|
@@ -331,7 +336,9 @@ export declare function isEmpty(obj: object): boolean;
|
|
331
336
|
|
332
337
|
export declare function isNotConnectionError(error: Error): boolean;
|
333
338
|
|
334
|
-
export declare function
|
339
|
+
export declare function isRedisCluster(obj: unknown): obj is Cluster;
|
340
|
+
|
341
|
+
export declare function isRedisInstance(obj: any): obj is Redis | Cluster;
|
335
342
|
|
336
343
|
export declare class Job<DataType = any, ReturnType = any, NameType extends string = string> {
|
337
344
|
protected queue: MinimalQueue;
|
@@ -1397,6 +1404,10 @@ export declare class Queue3<T = any> extends EventEmitter {
|
|
1397
1404
|
detachListener(event: string | symbol, listener?: (...args: any[]) => void): this;
|
1398
1405
|
}
|
1399
1406
|
|
1407
|
+
export declare const QUEUE_EVENT_SUFFIX = ":qe";
|
1408
|
+
|
1409
|
+
export declare const QUEUE_SCHEDULER_SUFFIX = ":qs";
|
1410
|
+
|
1400
1411
|
export declare class QueueBase extends EventEmitter {
|
1401
1412
|
readonly name: string;
|
1402
1413
|
opts: QueueBaseOptions;
|
@@ -1410,7 +1421,7 @@ export declare class QueueBase extends EventEmitter {
|
|
1410
1421
|
emit(event: string | symbol, ...args: any[]): boolean;
|
1411
1422
|
waitUntilReady(): Promise<RedisClient>;
|
1412
1423
|
protected base64Name(): string;
|
1413
|
-
protected clientName(): string;
|
1424
|
+
protected clientName(suffix?: string): string;
|
1414
1425
|
close(): Promise<void>;
|
1415
1426
|
disconnect(): Promise<void>;
|
1416
1427
|
}
|
@@ -1427,6 +1438,10 @@ export declare interface QueueBaseOptions {
|
|
1427
1438
|
* Specify if the connection is shared.
|
1428
1439
|
*/
|
1429
1440
|
sharedConnection?: boolean;
|
1441
|
+
/**
|
1442
|
+
* Denotes commands should retry indefinitely.
|
1443
|
+
*/
|
1444
|
+
blockingConnection?: boolean;
|
1430
1445
|
/**
|
1431
1446
|
* Prefix for all queue keys.
|
1432
1447
|
*/
|
@@ -1675,6 +1690,7 @@ export declare class QueueGetters<DataType, ResultType, NameType extends string>
|
|
1675
1690
|
logs: [string];
|
1676
1691
|
count: number;
|
1677
1692
|
}>;
|
1693
|
+
private baseGetClients;
|
1678
1694
|
/**
|
1679
1695
|
* Get worker list related to the queue.
|
1680
1696
|
*
|
@@ -1691,6 +1707,14 @@ export declare class QueueGetters<DataType, ResultType, NameType extends string>
|
|
1691
1707
|
getQueueSchedulers(): Promise<{
|
1692
1708
|
[index: string]: string;
|
1693
1709
|
}[]>;
|
1710
|
+
/**
|
1711
|
+
* Get queue events list related to the queue.
|
1712
|
+
*
|
1713
|
+
* @returns - Returns an array with queue events info.
|
1714
|
+
*/
|
1715
|
+
getQueueEvents(): Promise<{
|
1716
|
+
[index: string]: string;
|
1717
|
+
}[]>;
|
1694
1718
|
/**
|
1695
1719
|
* Get queue metrics related to the queue.
|
1696
1720
|
*
|
@@ -1823,7 +1847,6 @@ export declare class QueueScheduler extends QueueBase {
|
|
1823
1847
|
private readDelayedData;
|
1824
1848
|
private updateDelaySet;
|
1825
1849
|
private moveStalledJobsToWait;
|
1826
|
-
protected clientName(): string;
|
1827
1850
|
close(): Promise<void>;
|
1828
1851
|
}
|
1829
1852
|
|
@@ -1901,16 +1924,17 @@ export declare function raw2jobData(raw: any[]): [JobJsonRaw | number, string?]
|
|
1901
1924
|
export declare type RedisClient = Redis | Cluster;
|
1902
1925
|
|
1903
1926
|
export declare class RedisConnection extends EventEmitter {
|
1904
|
-
private readonly opts?;
|
1905
1927
|
private readonly shared;
|
1928
|
+
private readonly blocking;
|
1906
1929
|
static minimumVersion: string;
|
1907
1930
|
protected _client: RedisClient;
|
1931
|
+
private readonly opts;
|
1908
1932
|
private initializing;
|
1909
1933
|
private closing;
|
1910
1934
|
private version;
|
1911
1935
|
private handleClientError;
|
1912
|
-
constructor(opts?: ConnectionOptions, shared?: boolean);
|
1913
|
-
private
|
1936
|
+
constructor(opts?: ConnectionOptions, shared?: boolean, blocking?: boolean);
|
1937
|
+
private checkBlockingOptions;
|
1914
1938
|
private checkUpstashHost;
|
1915
1939
|
/**
|
1916
1940
|
* Waits for a redis client to be ready.
|
@@ -1927,9 +1951,7 @@ export declare class RedisConnection extends EventEmitter {
|
|
1927
1951
|
get redisVersion(): string;
|
1928
1952
|
}
|
1929
1953
|
|
1930
|
-
export declare type RedisOptions =
|
1931
|
-
skipVersionCheck?: boolean;
|
1932
|
-
};
|
1954
|
+
export declare type RedisOptions = IORedis.RedisOptions & BaseOptions;
|
1933
1955
|
|
1934
1956
|
export declare function removeAllQueueData(client: RedisClient, queueName: string, prefix?: string): Promise<void | boolean>;
|
1935
1957
|
|
@@ -2267,10 +2289,10 @@ export declare class Worker<DataType = any, ResultType = any, NameType extends s
|
|
2267
2289
|
private blockingConnection;
|
2268
2290
|
private processing;
|
2269
2291
|
constructor(name: string, processor?: string | Processor<DataType, ResultType, NameType>, opts?: WorkerOptions, Connection?: typeof RedisConnection);
|
2270
|
-
emit<U extends keyof WorkerListener
|
2271
|
-
off<U extends keyof WorkerListener
|
2272
|
-
on<U extends keyof WorkerListener
|
2273
|
-
once<U extends keyof WorkerListener
|
2292
|
+
emit<U extends keyof WorkerListener<DataType, ResultType, NameType>>(event: U, ...args: Parameters<WorkerListener<DataType, ResultType, NameType>[U]>): boolean;
|
2293
|
+
off<U extends keyof WorkerListener<DataType, ResultType, NameType>>(eventName: U, listener: WorkerListener<DataType, ResultType, NameType>[U]): this;
|
2294
|
+
on<U extends keyof WorkerListener<DataType, ResultType, NameType>>(event: U, listener: WorkerListener<DataType, ResultType, NameType>[U]): this;
|
2295
|
+
once<U extends keyof WorkerListener<DataType, ResultType, NameType>>(event: U, listener: WorkerListener<DataType, ResultType, NameType>[U]): this;
|
2274
2296
|
protected callProcessJob(job: Job<DataType, ResultType, NameType>, token: string): Promise<ResultType>;
|
2275
2297
|
protected createJob(data: JobJsonRaw, jobId: string): Job<DataType, ResultType, NameType>;
|
2276
2298
|
/**
|
@@ -2342,13 +2364,15 @@ export declare class Worker<DataType = any, ResultType = any, NameType extends s
|
|
2342
2364
|
private retryIfFailed;
|
2343
2365
|
}
|
2344
2366
|
|
2345
|
-
export declare
|
2367
|
+
export declare const WORKER_SUFFIX = ":w";
|
2368
|
+
|
2369
|
+
export declare interface WorkerListener<DataType = any, ResultType = any, NameType extends string = string> {
|
2346
2370
|
/**
|
2347
2371
|
* Listen to 'active' event.
|
2348
2372
|
*
|
2349
2373
|
* This event is triggered when a job enters the 'active' state.
|
2350
2374
|
*/
|
2351
|
-
active: (job: Job, prev: string) => void;
|
2375
|
+
active: (job: Job<DataType, ResultType, NameType>, prev: string) => void;
|
2352
2376
|
/**
|
2353
2377
|
* Listen to 'closing' event.
|
2354
2378
|
*
|
@@ -2366,7 +2390,7 @@ export declare interface WorkerListener {
|
|
2366
2390
|
*
|
2367
2391
|
* This event is triggered when a job has successfully completed.
|
2368
2392
|
*/
|
2369
|
-
completed: (job: Job, result:
|
2393
|
+
completed: (job: Job<DataType, ResultType, NameType>, result: ResultType, prev: string) => void;
|
2370
2394
|
/**
|
2371
2395
|
* Listen to 'drained' event.
|
2372
2396
|
*
|
@@ -2386,7 +2410,7 @@ export declare interface WorkerListener {
|
|
2386
2410
|
*
|
2387
2411
|
* This event is triggered when a job has thrown an exception.
|
2388
2412
|
*/
|
2389
|
-
failed: (job: Job, error: Error, prev: string) => void;
|
2413
|
+
failed: (job: Job<DataType, ResultType, NameType>, error: Error, prev: string) => void;
|
2390
2414
|
/**
|
2391
2415
|
* Listen to 'paused' event.
|
2392
2416
|
*
|
@@ -2401,7 +2425,7 @@ export declare interface WorkerListener {
|
|
2401
2425
|
* progress or any other data from within a processor to the rest of the
|
2402
2426
|
* world.
|
2403
2427
|
*/
|
2404
|
-
progress: (job: Job, progress: number | object) => void;
|
2428
|
+
progress: (job: Job<DataType, ResultType, NameType>, progress: number | object) => void;
|
2405
2429
|
/**
|
2406
2430
|
* Listen to 'resumed' event.
|
2407
2431
|
*
|
@@ -16,7 +16,7 @@ export declare class QueueBase extends EventEmitter {
|
|
16
16
|
emit(event: string | symbol, ...args: any[]): boolean;
|
17
17
|
waitUntilReady(): Promise<RedisClient>;
|
18
18
|
protected base64Name(): string;
|
19
|
-
protected clientName(): string;
|
19
|
+
protected clientName(suffix?: string): string;
|
20
20
|
close(): Promise<void>;
|
21
21
|
disconnect(): Promise<void>;
|
22
22
|
}
|
@@ -17,7 +17,7 @@ class QueueBase extends events_1.EventEmitter {
|
|
17
17
|
'be removed in the next major release',
|
18
18
|
].join(' '));
|
19
19
|
}
|
20
|
-
this.connection = new Connection(opts.connection, opts.sharedConnection);
|
20
|
+
this.connection = new Connection(opts.connection, opts.sharedConnection, opts.blockingConnection);
|
21
21
|
this.connection.on('error', this.emit.bind(this, 'error'));
|
22
22
|
const queueKeys = new queue_keys_1.QueueKeys(opts.prefix);
|
23
23
|
this.keys = queueKeys.getKeys(name);
|
@@ -49,8 +49,9 @@ class QueueBase extends events_1.EventEmitter {
|
|
49
49
|
base64Name() {
|
50
50
|
return Buffer.from(this.name).toString('base64');
|
51
51
|
}
|
52
|
-
clientName() {
|
53
|
-
|
52
|
+
clientName(suffix = '') {
|
53
|
+
const queueNameBase64 = this.base64Name();
|
54
|
+
return `${this.opts.prefix}:${queueNameBase64}${suffix}`;
|
54
55
|
}
|
55
56
|
close() {
|
56
57
|
if (!this.closing) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"queue-base.js","sourceRoot":"","sources":["../../../src/classes/queue-base.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,yDAAqD;AACrD,6CAAkD;AAElD,MAAa,SAAU,SAAQ,qBAAY;IAOzC,YACkB,IAAY,EACrB,OAAyB,EAAE,EAClC,aAAqC,kCAAe;QAEpD,KAAK,EAAE,CAAC;QAJQ,SAAI,GAAJ,IAAI,CAAQ;QACrB,SAAI,GAAJ,IAAI,CAAuB;QAKlC,IAAI,CAAC,IAAI,mBACP,MAAM,EAAE,MAAM,IACX,IAAI,CACR,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,IAAI,CACV;gBACE,sGAAsG;gBACtG,oGAAoG;gBACpG,sCAAsC;aACvC,CAAC,IAAI,CAAC,GAAG,CAAC,CACZ,CAAC;SACH;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,
|
1
|
+
{"version":3,"file":"queue-base.js","sourceRoot":"","sources":["../../../src/classes/queue-base.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,yDAAqD;AACrD,6CAAkD;AAElD,MAAa,SAAU,SAAQ,qBAAY;IAOzC,YACkB,IAAY,EACrB,OAAyB,EAAE,EAClC,aAAqC,kCAAe;QAEpD,KAAK,EAAE,CAAC;QAJQ,SAAI,GAAJ,IAAI,CAAQ;QACrB,SAAI,GAAJ,IAAI,CAAuB;QAKlC,IAAI,CAAC,IAAI,mBACP,MAAM,EAAE,MAAM,IACX,IAAI,CACR,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,IAAI,CACV;gBACE,sGAAsG;gBACtG,oGAAoG;gBACpG,sCAAsC;aACvC,CAAC,IAAI,CAAC,GAAG,CAAC,CACZ,CAAC;SACH;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAC9B,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,kBAAkB,CACxB,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QAE3D,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IAChC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;IACtC,CAAC;IAED,IAAI,CAAC,KAAsB,EAAE,GAAG,IAAW;QACzC,IAAI;YACF,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;SACnC;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI;gBACF,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;aACjC;YAAC,OAAO,GAAG,EAAE;gBACZ,0DAA0D;gBAC1D,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACpB;SACF;IACH,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAES,UAAU;QAClB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;IAES,UAAU,CAAC,MAAM,GAAG,EAAE;QAC9B,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC1C,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,eAAe,GAAG,MAAM,EAAE,CAAC;IAC3D,CAAC;IAED,KAAK;QACH,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;SACxC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;CACF;AArFD,8BAqFC"}
|
@@ -16,7 +16,7 @@ class QueueEvents extends queue_base_1.QueueBase {
|
|
16
16
|
var { connection, autorun = true } = _a, opts = tslib_1.__rest(_a, ["connection", "autorun"]);
|
17
17
|
super(name, Object.assign(Object.assign({}, opts), { connection: utils_1.isRedisInstance(connection)
|
18
18
|
? connection.duplicate()
|
19
|
-
: connection }), Connection);
|
19
|
+
: connection, blockingConnection: true }), Connection);
|
20
20
|
this.running = false;
|
21
21
|
this.opts = Object.assign({
|
22
22
|
blockingTimeout: 10000,
|
@@ -45,6 +45,14 @@ class QueueEvents extends queue_base_1.QueueBase {
|
|
45
45
|
try {
|
46
46
|
this.running = true;
|
47
47
|
const client = await this.client;
|
48
|
+
try {
|
49
|
+
await client.client('setname', this.clientName(utils_1.QUEUE_EVENT_SUFFIX));
|
50
|
+
}
|
51
|
+
catch (err) {
|
52
|
+
if (!utils_1.clientCommandMessageReg.test(err.message)) {
|
53
|
+
throw err;
|
54
|
+
}
|
55
|
+
}
|
48
56
|
await this.consumeEvents(client);
|
49
57
|
}
|
50
58
|
catch (error) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"queue-events.js","sourceRoot":"","sources":["../../../src/classes/queue-events.ts"],"names":[],"mappings":";;;;AACA,
|
1
|
+
{"version":3,"file":"queue-events.js","sourceRoot":"","sources":["../../../src/classes/queue-events.ts"],"names":[],"mappings":";;;;AACA,oCAQkB;AAClB,6CAAyC;AA4IzC;;;;;;GAMG;AACH,MAAa,WAAY,SAAQ,sBAAS;IAkCxC,YACE,IAAY,EACZ,KAA8D,EAAE,EAChE,UAAmC;YADnC,EAAE,UAAU,EAAE,OAAO,GAAG,IAAI,OAAoC,EAA/B,IAAI,sBAArC,yBAAuC,CAAF;QAGrC,KAAK,CACH,IAAI,kCAEC,IAAI,KACP,UAAU,EAAE,uBAAe,CAAC,UAAU,CAAC;gBACrC,CAAC,CAAe,UAAW,CAAC,SAAS,EAAE;gBACvC,CAAC,CAAC,UAAU,EACd,kBAAkB,EAAE,IAAI,KAE1B,UAAU,CACX,CAAC;QAhDI,YAAO,GAAG,KAAK,CAAC;QAkDtB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CACvB;YACE,eAAe,EAAE,KAAK;SACvB,EACD,IAAI,CAAC,IAAI,CACV,CAAC;QAEF,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;SACtD;IACH,CAAC;IA1DD,IAAI,CACF,KAAQ,EACR,GAAG,IAAwC;QAE3C,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,GAAG,CACD,SAAY,EACZ,QAAgC;QAEhC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,EAAE,CACA,KAAQ,EACR,QAAgC;QAEhC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CACF,KAAQ,EACR,QAAgC;QAEhC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IA+BD,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI;gBACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;gBAEjC,IAAI;oBACF,MAAM,MAAM,CAAC,MAAM,CACjB,SAAS,EACT,IAAI,CAAC,UAAU,CAAC,0BAAkB,CAAC,CACpC,CAAC;iBACH;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,+BAAuB,CAAC,IAAI,CAAS,GAAI,CAAC,OAAO,CAAC,EAAE;wBACvD,MAAM,GAAG,CAAC;qBACX;iBACF;gBAED,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;aAClC;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;gBACrB,MAAM,KAAK,CAAC;aACb;SACF;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;SACrD;IACH,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,MAAmB;QAC7C,MAAM,IAAI,GAAuB,IAAI,CAAC,IAAI,CAAC;QAE3C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;QAC7B,IAAI,EAAE,GAAG,IAAI,CAAC,WAAW,IAAI,GAAG,CAAC;QAEjC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;YACpB,IAAI;gBACF,mGAAmG;gBACnG,MAAM,IAAI,GAAkB,CAAC,MAAM,MAAM,CAAC,KAAK,CAC7C,OAAO,EACP,IAAI,CAAC,eAAe,EACpB,SAAS,EACT,GAAG,EACH,EAAE,CACH,CAAQ,CAAC;gBAEV,IAAI,IAAI,EAAE;oBACR,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;oBAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBACtC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAClB,MAAM,IAAI,GAAG,iBAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAErC,EAAE;wBACF,gEAAgE;wBAChE,sBAAsB;wBACtB,QAAQ,IAAI,CAAC,KAAK,EAAE;4BAClB,KAAK,UAAU;gCACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gCAClC,MAAM;4BACR,KAAK,WAAW;gCACd,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gCAChD,MAAM;yBACT;wBAED,MAAM,EAAE,KAAK,KAAkB,IAAI,EAAjB,QAAQ,kBAAK,IAAI,EAA7B,SAAsB,CAAO,CAAC;wBAEpC,IAAI,KAAK,KAAK,SAAS,EAAE;4BACvB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;yBACtB;6BAAM;4BACL,IAAI,CAAC,IAAI,CAAC,KAAY,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;4BACtC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,QAAQ,CAAC,KAAK,EAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;yBAC9D;qBACF;iBACF;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,4BAAoB,CAAC,GAAY,CAAC,EAAE;oBACtC,MAAM,GAAG,CAAC;iBACX;gBAED,MAAM,aAAK,CAAC,oBAAY,CAAC,CAAC;aAC3B;SACF;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;SAClC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF;AAzJD,kCAyJC"}
|
@@ -63,6 +63,7 @@ export declare class QueueGetters<DataType, ResultType, NameType extends string>
|
|
63
63
|
logs: [string];
|
64
64
|
count: number;
|
65
65
|
}>;
|
66
|
+
private baseGetClients;
|
66
67
|
/**
|
67
68
|
* Get worker list related to the queue.
|
68
69
|
*
|
@@ -79,6 +80,14 @@ export declare class QueueGetters<DataType, ResultType, NameType extends string>
|
|
79
80
|
getQueueSchedulers(): Promise<{
|
80
81
|
[index: string]: string;
|
81
82
|
}[]>;
|
83
|
+
/**
|
84
|
+
* Get queue events list related to the queue.
|
85
|
+
*
|
86
|
+
* @returns - Returns an array with queue events info.
|
87
|
+
*/
|
88
|
+
getQueueEvents(): Promise<{
|
89
|
+
[index: string]: string;
|
90
|
+
}[]>;
|
82
91
|
/**
|
83
92
|
* Get queue metrics related to the queue.
|
84
93
|
*
|
@@ -202,16 +202,11 @@ class QueueGetters extends queue_base_1.QueueBase {
|
|
202
202
|
};
|
203
203
|
});
|
204
204
|
}
|
205
|
-
|
206
|
-
* Get worker list related to the queue.
|
207
|
-
*
|
208
|
-
* @returns - Returns an array with workers info.
|
209
|
-
*/
|
210
|
-
async getWorkers() {
|
205
|
+
async baseGetClients(suffix) {
|
211
206
|
const client = await this.client;
|
212
207
|
const clients = await client.client('list');
|
213
208
|
try {
|
214
|
-
const list = this.parseClientList(clients);
|
209
|
+
const list = this.parseClientList(clients, suffix);
|
215
210
|
return list;
|
216
211
|
}
|
217
212
|
catch (err) {
|
@@ -220,23 +215,29 @@ class QueueGetters extends queue_base_1.QueueBase {
|
|
220
215
|
}
|
221
216
|
}
|
222
217
|
}
|
218
|
+
/**
|
219
|
+
* Get worker list related to the queue.
|
220
|
+
*
|
221
|
+
* @returns - Returns an array with workers info.
|
222
|
+
*/
|
223
|
+
getWorkers() {
|
224
|
+
return this.baseGetClients(utils_1.WORKER_SUFFIX);
|
225
|
+
}
|
223
226
|
/**
|
224
227
|
* Get queue schedulers list related to the queue.
|
225
228
|
*
|
226
229
|
* @returns - Returns an array with queue schedulers info.
|
227
230
|
*/
|
228
231
|
async getQueueSchedulers() {
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
}
|
239
|
-
}
|
232
|
+
return this.baseGetClients(utils_1.QUEUE_SCHEDULER_SUFFIX);
|
233
|
+
}
|
234
|
+
/**
|
235
|
+
* Get queue events list related to the queue.
|
236
|
+
*
|
237
|
+
* @returns - Returns an array with queue events info.
|
238
|
+
*/
|
239
|
+
async getQueueEvents() {
|
240
|
+
return this.baseGetClients(utils_1.QUEUE_EVENT_SUFFIX);
|
240
241
|
}
|
241
242
|
/**
|
242
243
|
* Get queue metrics related to the queue.
|
@@ -290,8 +291,7 @@ class QueueGetters extends queue_base_1.QueueBase {
|
|
290
291
|
client[key] = value;
|
291
292
|
});
|
292
293
|
const name = client['name'];
|
293
|
-
if (name &&
|
294
|
-
name === `${this.clientName()}${suffix ? `:${suffix}` : ''}`) {
|
294
|
+
if (name && name === `${this.clientName()}${suffix ? `${suffix}` : ''}`) {
|
295
295
|
client['name'] = this.name;
|
296
296
|
clients.push(client);
|
297
297
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"queue-getters.js","sourceRoot":"","sources":["../../../src/classes/queue-getters.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,YAAY,CAAC;;;AAEb,6CAAyC;AACzC,+BAA4B;AAC5B,
|
1
|
+
{"version":3,"file":"queue-getters.js","sourceRoot":"","sources":["../../../src/classes/queue-getters.ts"],"names":[],"mappings":"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"}
|
@@ -26,7 +26,7 @@ class QueueScheduler extends queue_base_1.QueueBase {
|
|
26
26
|
var { connection, autorun = true } = _a, opts = tslib_1.__rest(_a, ["connection", "autorun"]);
|
27
27
|
super(name, Object.assign(Object.assign({ maxStalledCount: 1, stalledInterval: 30000 }, opts), { connection: utils_1.isRedisInstance(connection)
|
28
28
|
? connection.duplicate()
|
29
|
-
: connection, sharedConnection: false }), Connection);
|
29
|
+
: connection, sharedConnection: false, blockingConnection: true }), Connection);
|
30
30
|
this.nextTimestamp = Number.MAX_VALUE;
|
31
31
|
this.isBlocked = false;
|
32
32
|
this.running = false;
|
@@ -62,7 +62,7 @@ class QueueScheduler extends queue_base_1.QueueBase {
|
|
62
62
|
const key = this.keys.delay;
|
63
63
|
const opts = this.opts;
|
64
64
|
try {
|
65
|
-
await client.client('setname', this.clientName());
|
65
|
+
await client.client('setname', this.clientName(utils_1.QUEUE_SCHEDULER_SUFFIX));
|
66
66
|
}
|
67
67
|
catch (err) {
|
68
68
|
if (!utils_1.clientCommandMessageReg.test(err.message)) {
|
@@ -166,10 +166,6 @@ class QueueScheduler extends queue_base_1.QueueBase {
|
|
166
166
|
stalled.forEach((jobId) => this.emit('stalled', jobId, 'active'));
|
167
167
|
}
|
168
168
|
}
|
169
|
-
clientName() {
|
170
|
-
const queueNameBase64 = this.base64Name();
|
171
|
-
return `${this.opts.prefix}:${queueNameBase64}:qs`;
|
172
|
-
}
|
173
169
|
close() {
|
174
170
|
if (this.closing) {
|
175
171
|
return this.closing;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"queue-scheduler.js","sourceRoot":"","sources":["../../../src/classes/queue-scheduler.ts"],"names":[],"mappings":";;;;AAKA,
|
1
|
+
{"version":3,"file":"queue-scheduler.js","sourceRoot":"","sources":["../../../src/classes/queue-scheduler.ts"],"names":[],"mappings":"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"}
|
@@ -17,7 +17,7 @@ const scripts_1 = require("./scripts");
|
|
17
17
|
*/
|
18
18
|
class Queue extends queue_getters_1.QueueGetters {
|
19
19
|
constructor(name, opts, Connection) {
|
20
|
-
super(name, Object.assign({ sharedConnection: utils_1.isRedisInstance(opts === null || opts === void 0 ? void 0 : opts.connection) }, opts), Connection);
|
20
|
+
super(name, Object.assign({ sharedConnection: utils_1.isRedisInstance(opts === null || opts === void 0 ? void 0 : opts.connection), blockingConnection: false }, opts), Connection);
|
21
21
|
this.token = uuid_1.v4();
|
22
22
|
this.limiter = null;
|
23
23
|
this.jobsOpts = lodash_1.get(opts, 'defaultJobOptions');
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/classes/queue.ts"],"names":[],"mappings":";;;AAAA,mCAA6B;AAC7B,+BAA0B;AAE1B,oCAA0D;AAC1D,+BAA4C;AAC5C,mDAA+C;AAC/C,qCAAkC;AAClC,uCAAoC;AAuEpC;;;;;;GAMG;AACH,MAAa,KAIX,SAAQ,4BAA4C;IAQpD,YACE,IAAY,EACZ,IAAmB,EACnB,UAAmC;QAEnC,KAAK,CACH,IAAI,kBAEF,gBAAgB,EAAE,uBAAe,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAC,
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/classes/queue.ts"],"names":[],"mappings":"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"}
|
@@ -2,16 +2,17 @@
|
|
2
2
|
import { EventEmitter } from 'events';
|
3
3
|
import { ConnectionOptions, RedisClient } from '../interfaces';
|
4
4
|
export declare class RedisConnection extends EventEmitter {
|
5
|
-
private readonly opts?;
|
6
5
|
private readonly shared;
|
6
|
+
private readonly blocking;
|
7
7
|
static minimumVersion: string;
|
8
8
|
protected _client: RedisClient;
|
9
|
+
private readonly opts;
|
9
10
|
private initializing;
|
10
11
|
private closing;
|
11
12
|
private version;
|
12
13
|
private handleClientError;
|
13
|
-
constructor(opts?: ConnectionOptions, shared?: boolean);
|
14
|
-
private
|
14
|
+
constructor(opts?: ConnectionOptions, shared?: boolean, blocking?: boolean);
|
15
|
+
private checkBlockingOptions;
|
15
16
|
private checkUpstashHost;
|
16
17
|
/**
|
17
18
|
* Waits for a redis client to be ready.
|