@vendure/job-queue-plugin 2.0.0-next.9 → 2.0.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/package/bullmq/bullmq-job-queue-strategy.d.ts +7 -5
- package/package/bullmq/bullmq-job-queue-strategy.js +51 -21
- package/package/bullmq/bullmq-job-queue-strategy.js.map +1 -1
- package/package/bullmq/index.js +7 -3
- package/package/bullmq/index.js.map +1 -1
- package/package/bullmq/plugin.d.ts +5 -3
- package/package/bullmq/plugin.js +6 -3
- package/package/bullmq/plugin.js.map +1 -1
- package/package/bullmq/redis-health-indicator.js +3 -3
- package/package/bullmq/redis-health-indicator.js.map +1 -1
- package/package/bullmq/redis-job-buffer-storage-strategy.js +11 -26
- package/package/bullmq/redis-job-buffer-storage-strategy.js.map +1 -1
- package/package/bullmq/types.d.ts +3 -10
- package/package/pub-sub/index.js +5 -1
- package/package/pub-sub/index.js.map +1 -1
- package/package/pub-sub/plugin.js +1 -0
- package/package/pub-sub/plugin.js.map +1 -1
- package/package/pub-sub/pub-sub-job-queue-strategy.d.ts +3 -3
- package/package/pub-sub/pub-sub-job-queue-strategy.js.map +1 -1
- package/package.json +32 -33
|
@@ -5,25 +5,27 @@ import { ID, Injector, InspectableJobQueueStrategy, Job, JobData, PaginatedList
|
|
|
5
5
|
* This JobQueueStrategy uses [BullMQ](https://docs.bullmq.io/) to implement a push-based job queue
|
|
6
6
|
* on top of Redis. It should not be used alone, but as part of the {@link BullMQJobQueuePlugin}.
|
|
7
7
|
*
|
|
8
|
-
* @docsCategory
|
|
8
|
+
* @docsCategory core plugins/JobQueuePlugin
|
|
9
9
|
*/
|
|
10
10
|
export declare class BullMQJobQueueStrategy implements InspectableJobQueueStrategy {
|
|
11
|
+
private redisConnection;
|
|
12
|
+
private connectionOptions;
|
|
11
13
|
private queue;
|
|
12
14
|
private worker;
|
|
13
|
-
private scheduler;
|
|
14
15
|
private workerProcessor;
|
|
15
16
|
private options;
|
|
16
17
|
private queueNameProcessFnMap;
|
|
17
18
|
init(injector: Injector): Promise<void>;
|
|
18
19
|
destroy(): Promise<void>;
|
|
19
|
-
add<Data extends JobData<Data> =
|
|
20
|
+
add<Data extends JobData<Data> = object>(job: Job<Data>): Promise<Job<Data>>;
|
|
20
21
|
cancelJob(jobId: string): Promise<Job | undefined>;
|
|
21
22
|
findMany(options?: JobListOptions): Promise<PaginatedList<Job>>;
|
|
22
23
|
findManyById(ids: ID[]): Promise<Job[]>;
|
|
23
24
|
findOne(id: ID): Promise<Job | undefined>;
|
|
24
25
|
removeSettledJobs(queueNames?: string[], olderThan?: Date): Promise<number>;
|
|
25
|
-
start<Data extends JobData<Data> =
|
|
26
|
-
|
|
26
|
+
start<Data extends JobData<Data> = object>(queueName: string, process: (job: Job<Data>) => Promise<any>): Promise<void>;
|
|
27
|
+
private stopped;
|
|
28
|
+
stop<Data extends JobData<Data> = object>(queueName: string, process: (job: Job<Data>) => Promise<any>): Promise<void>;
|
|
27
29
|
private createVendureJob;
|
|
28
30
|
private getState;
|
|
29
31
|
}
|
|
@@ -5,6 +5,8 @@ const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
|
5
5
|
const shared_utils_1 = require("@vendure/common/lib/shared-utils");
|
|
6
6
|
const core_1 = require("@vendure/core");
|
|
7
7
|
const bullmq_1 = require("bullmq");
|
|
8
|
+
const events_1 = require("events");
|
|
9
|
+
const ioredis_1 = require("ioredis");
|
|
8
10
|
const constants_1 = require("./constants");
|
|
9
11
|
const redis_health_indicator_1 = require("./redis-health-indicator");
|
|
10
12
|
const QUEUE_NAME = 'vendure-job-queue';
|
|
@@ -14,37 +16,52 @@ const DEFAULT_CONCURRENCY = 3;
|
|
|
14
16
|
* This JobQueueStrategy uses [BullMQ](https://docs.bullmq.io/) to implement a push-based job queue
|
|
15
17
|
* on top of Redis. It should not be used alone, but as part of the {@link BullMQJobQueuePlugin}.
|
|
16
18
|
*
|
|
17
|
-
* @docsCategory
|
|
19
|
+
* @docsCategory core plugins/JobQueuePlugin
|
|
18
20
|
*/
|
|
19
21
|
class BullMQJobQueueStrategy {
|
|
20
22
|
constructor() {
|
|
21
23
|
this.queueNameProcessFnMap = new Map();
|
|
24
|
+
this.stopped = false;
|
|
22
25
|
}
|
|
23
26
|
async init(injector) {
|
|
24
|
-
var _a
|
|
27
|
+
var _a;
|
|
25
28
|
const options = injector.get(constants_1.BULLMQ_PLUGIN_OPTIONS);
|
|
26
29
|
this.options = options;
|
|
30
|
+
this.connectionOptions =
|
|
31
|
+
(_a = options.connection) !== null && _a !== void 0 ? _a : {
|
|
32
|
+
host: 'localhost',
|
|
33
|
+
port: 6379,
|
|
34
|
+
maxRetriesPerRequest: null,
|
|
35
|
+
};
|
|
36
|
+
this.redisConnection =
|
|
37
|
+
this.connectionOptions instanceof events_1.EventEmitter
|
|
38
|
+
? this.connectionOptions
|
|
39
|
+
: new ioredis_1.Redis(this.connectionOptions);
|
|
27
40
|
const redisHealthIndicator = injector.get(redis_health_indicator_1.RedisHealthIndicator);
|
|
28
|
-
core_1.Logger.info(
|
|
41
|
+
core_1.Logger.info('Checking Redis connection...', constants_1.loggerCtx);
|
|
29
42
|
const health = await redisHealthIndicator.isHealthy('redis');
|
|
30
43
|
if (health.redis.status === 'down') {
|
|
31
44
|
core_1.Logger.error('Could not connect to Redis', constants_1.loggerCtx);
|
|
32
45
|
}
|
|
33
46
|
else {
|
|
34
|
-
core_1.Logger.info(
|
|
47
|
+
core_1.Logger.info('Connected to Redis ✔', constants_1.loggerCtx);
|
|
35
48
|
}
|
|
36
|
-
this.queue = new bullmq_1.Queue(QUEUE_NAME, Object.assign(Object.assign({}, options.queueOptions), { connection:
|
|
49
|
+
this.queue = new bullmq_1.Queue(QUEUE_NAME, Object.assign(Object.assign({}, options.queueOptions), { connection: this.redisConnection }))
|
|
50
|
+
.on('error', (e) => core_1.Logger.error(`BullMQ Queue error: ${JSON.stringify(e.message)}`, constants_1.loggerCtx, e.stack))
|
|
51
|
+
.on('resumed', () => core_1.Logger.verbose('BullMQ Queue resumed', constants_1.loggerCtx))
|
|
52
|
+
.on('paused', () => core_1.Logger.verbose('BullMQ Queue paused', constants_1.loggerCtx));
|
|
37
53
|
if (await this.queue.isPaused()) {
|
|
38
54
|
await this.queue.resume();
|
|
39
55
|
}
|
|
40
56
|
this.workerProcessor = async (bullJob) => {
|
|
41
|
-
var _a;
|
|
57
|
+
var _a, _b;
|
|
42
58
|
const queueName = bullJob.name;
|
|
43
|
-
core_1.Logger.debug(`Job ${bullJob.id} [${queueName}] starting (attempt ${bullJob.attemptsMade + 1} of ${(
|
|
59
|
+
core_1.Logger.debug(`Job ${(_a = bullJob.id) !== null && _a !== void 0 ? _a : ''} [${queueName}] starting (attempt ${bullJob.attemptsMade + 1} of ${(_b = bullJob.opts.attempts) !== null && _b !== void 0 ? _b : 1})`);
|
|
44
60
|
const processFn = this.queueNameProcessFnMap.get(queueName);
|
|
45
61
|
if (processFn) {
|
|
46
62
|
const job = await this.createVendureJob(bullJob);
|
|
47
63
|
try {
|
|
64
|
+
// eslint-disable-next-line
|
|
48
65
|
job.on('progress', _job => bullJob.updateProgress(_job.progress));
|
|
49
66
|
const result = await processFn(job);
|
|
50
67
|
await bullJob.updateProgress(100);
|
|
@@ -56,10 +73,10 @@ class BullMQJobQueueStrategy {
|
|
|
56
73
|
}
|
|
57
74
|
throw new core_1.InternalServerError(`No processor defined for the queue "${queueName}"`);
|
|
58
75
|
};
|
|
59
|
-
this.scheduler = new bullmq_1.QueueScheduler(QUEUE_NAME, Object.assign(Object.assign({}, options.schedulerOptions), { connection: (_b = options.connection) !== null && _b !== void 0 ? _b : {} })).on('failed', (e) => core_1.Logger.error(`BullMQ Scheduler error: ${e.message}`, constants_1.loggerCtx, e.stack));
|
|
60
76
|
}
|
|
61
77
|
async destroy() {
|
|
62
|
-
|
|
78
|
+
var _a;
|
|
79
|
+
await Promise.all([this.queue.close(), (_a = this.worker) === null || _a === void 0 ? void 0 : _a.close()]);
|
|
63
80
|
}
|
|
64
81
|
async add(job) {
|
|
65
82
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -80,14 +97,14 @@ class BullMQJobQueueStrategy {
|
|
|
80
97
|
if (await bullJob.isActive()) {
|
|
81
98
|
// Not yet possible in BullMQ, see
|
|
82
99
|
// https://github.com/taskforcesh/bullmq/issues/632
|
|
83
|
-
throw new core_1.InternalServerError(
|
|
100
|
+
throw new core_1.InternalServerError('Cannot cancel a running job');
|
|
84
101
|
}
|
|
85
102
|
try {
|
|
86
103
|
await bullJob.remove();
|
|
87
104
|
return this.createVendureJob(bullJob);
|
|
88
105
|
}
|
|
89
106
|
catch (e) {
|
|
90
|
-
const message = `Error when cancelling job: ${e.message}`;
|
|
107
|
+
const message = `Error when cancelling job: ${JSON.stringify(e.message)}`;
|
|
91
108
|
core_1.Logger.error(message, constants_1.loggerCtx);
|
|
92
109
|
throw new core_1.InternalServerError(message);
|
|
93
110
|
}
|
|
@@ -160,6 +177,7 @@ class BullMQJobQueueStrategy {
|
|
|
160
177
|
return this.createVendureJob(bullJob);
|
|
161
178
|
}
|
|
162
179
|
}
|
|
180
|
+
// TODO V2: actually make it use the olderThan parameter
|
|
163
181
|
async removeSettledJobs(queueNames, olderThan) {
|
|
164
182
|
try {
|
|
165
183
|
const jobCounts = await this.queue.getJobCounts('completed', 'failed');
|
|
@@ -172,26 +190,38 @@ class BullMQJobQueueStrategy {
|
|
|
172
190
|
return 0;
|
|
173
191
|
}
|
|
174
192
|
}
|
|
193
|
+
// eslint-disable-next-line @typescript-eslint/require-await
|
|
175
194
|
async start(queueName, process) {
|
|
176
|
-
var _a;
|
|
177
195
|
this.queueNameProcessFnMap.set(queueName, process);
|
|
178
196
|
if (!this.worker) {
|
|
179
|
-
const options = Object.assign(Object.assign({ concurrency: DEFAULT_CONCURRENCY }, this.options.workerOptions), { connection:
|
|
197
|
+
const options = Object.assign(Object.assign({ concurrency: DEFAULT_CONCURRENCY }, this.options.workerOptions), { connection: this.redisConnection });
|
|
180
198
|
this.worker = new bullmq_1.Worker(QUEUE_NAME, this.workerProcessor, options)
|
|
181
|
-
.on('error',
|
|
199
|
+
.on('error', e => core_1.Logger.error(`BullMQ Worker error: ${e.message}`, constants_1.loggerCtx, e.stack))
|
|
200
|
+
.on('closing', e => core_1.Logger.verbose(`BullMQ Worker closing: ${e}`, constants_1.loggerCtx))
|
|
201
|
+
.on('closed', () => core_1.Logger.verbose('BullMQ Worker closed'))
|
|
182
202
|
.on('failed', (job, error) => {
|
|
183
|
-
var _a;
|
|
184
|
-
core_1.Logger.warn(`Job ${job.id} [${job.name}] failed (attempt ${job.attemptsMade} of ${(
|
|
203
|
+
var _a, _b, _c, _d;
|
|
204
|
+
core_1.Logger.warn(`Job ${(_a = job === null || job === void 0 ? void 0 : job.id) !== null && _a !== void 0 ? _a : '(unknown id)'} [${(_b = job === null || job === void 0 ? void 0 : job.name) !== null && _b !== void 0 ? _b : 'unknown name'}] failed (attempt ${(_c = job === null || job === void 0 ? void 0 : job.attemptsMade) !== null && _c !== void 0 ? _c : 'unknown'} of ${(_d = job === null || job === void 0 ? void 0 : job.opts.attempts) !== null && _d !== void 0 ? _d : 1})`);
|
|
205
|
+
})
|
|
206
|
+
.on('stalled', (jobId) => {
|
|
207
|
+
core_1.Logger.warn(`BullMQ Worker: job ${jobId} stalled`, constants_1.loggerCtx);
|
|
185
208
|
})
|
|
186
|
-
.on('completed', (job
|
|
187
|
-
|
|
209
|
+
.on('completed', (job) => {
|
|
210
|
+
var _a;
|
|
211
|
+
core_1.Logger.debug(`Job ${(_a = job === null || job === void 0 ? void 0 : job.id) !== null && _a !== void 0 ? _a : 'unknown id'} [${job.name}] completed`);
|
|
188
212
|
});
|
|
189
213
|
}
|
|
190
214
|
}
|
|
191
215
|
async stop(queueName, process) {
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
216
|
+
if (!this.stopped) {
|
|
217
|
+
this.stopped = true;
|
|
218
|
+
try {
|
|
219
|
+
await Promise.all([this.queue.disconnect(), this.worker.disconnect()]);
|
|
220
|
+
}
|
|
221
|
+
catch (e) {
|
|
222
|
+
core_1.Logger.error(e, constants_1.loggerCtx, e.stack);
|
|
223
|
+
}
|
|
224
|
+
}
|
|
195
225
|
}
|
|
196
226
|
async createVendureJob(bullJob) {
|
|
197
227
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bullmq-job-queue-strategy.js","sourceRoot":"","sources":["../../src/bullmq/bullmq-job-queue-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAA+E;AAC/E,mEAAsE;AACtE,wCASuB;AACvB,
|
|
1
|
+
{"version":3,"file":"bullmq-job-queue-strategy.js","sourceRoot":"","sources":["../../src/bullmq/bullmq-job-queue-strategy.ts"],"names":[],"mappings":"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"}
|
package/package/bullmq/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -12,11 +16,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
12
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
17
|
// ensure that the bullmq package is installed
|
|
14
18
|
try {
|
|
15
|
-
//
|
|
19
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
16
20
|
require('bullmq');
|
|
17
21
|
}
|
|
18
22
|
catch (e) {
|
|
19
|
-
//
|
|
23
|
+
// eslint-disable-next-line no-console
|
|
20
24
|
console.error('The BullMQJobQueuePlugin depends on the "bullmq" package being installed.');
|
|
21
25
|
process.exit(1);
|
|
22
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bullmq/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bullmq/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,8CAA8C;AAC9C,IAAI;IACA,8DAA8D;IAC9D,OAAO,CAAC,QAAQ,CAAC,CAAC;CACrB;AAAC,OAAO,CAAM,EAAE;IACb,sCAAsC;IACtC,OAAO,CAAC,KAAK,CAAC,2EAA2E,CAAC,CAAC;IAC3F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACnB;AAED,2CAAyB;AACzB,0CAAwB"}
|
|
@@ -20,11 +20,13 @@ import { BullMQPluginOptions } from './types';
|
|
|
20
20
|
*
|
|
21
21
|
* ## Installation
|
|
22
22
|
*
|
|
23
|
-
* `yarn add \@vendure/job-queue-plugin bullmq`
|
|
23
|
+
* `yarn add \@vendure/job-queue-plugin bullmq@1`
|
|
24
24
|
*
|
|
25
25
|
* or
|
|
26
26
|
*
|
|
27
|
-
* `npm install \@vendure/job-queue-plugin bullmq`
|
|
27
|
+
* `npm install \@vendure/job-queue-plugin bullmq@1`
|
|
28
|
+
*
|
|
29
|
+
* **Note:** The v1.x version of this plugin is designed to work with bullmq v1.x.
|
|
28
30
|
*
|
|
29
31
|
* @example
|
|
30
32
|
* ```ts
|
|
@@ -87,7 +89,7 @@ import { BullMQPluginOptions } from './types';
|
|
|
87
89
|
* };
|
|
88
90
|
* ```
|
|
89
91
|
*
|
|
90
|
-
* @docsCategory
|
|
92
|
+
* @docsCategory core plugins/JobQueuePlugin
|
|
91
93
|
*/
|
|
92
94
|
export declare class BullMQJobQueuePlugin {
|
|
93
95
|
static options: BullMQPluginOptions;
|
package/package/bullmq/plugin.js
CHANGED
|
@@ -35,11 +35,13 @@ const redis_job_buffer_storage_strategy_1 = require("./redis-job-buffer-storage-
|
|
|
35
35
|
*
|
|
36
36
|
* ## Installation
|
|
37
37
|
*
|
|
38
|
-
* `yarn add \@vendure/job-queue-plugin bullmq`
|
|
38
|
+
* `yarn add \@vendure/job-queue-plugin bullmq@1`
|
|
39
39
|
*
|
|
40
40
|
* or
|
|
41
41
|
*
|
|
42
|
-
* `npm install \@vendure/job-queue-plugin bullmq`
|
|
42
|
+
* `npm install \@vendure/job-queue-plugin bullmq@1`
|
|
43
|
+
*
|
|
44
|
+
* **Note:** The v1.x version of this plugin is designed to work with bullmq v1.x.
|
|
43
45
|
*
|
|
44
46
|
* @example
|
|
45
47
|
* ```ts
|
|
@@ -102,7 +104,7 @@ const redis_job_buffer_storage_strategy_1 = require("./redis-job-buffer-storage-
|
|
|
102
104
|
* };
|
|
103
105
|
* ```
|
|
104
106
|
*
|
|
105
|
-
* @docsCategory
|
|
107
|
+
* @docsCategory core plugins/JobQueuePlugin
|
|
106
108
|
*/
|
|
107
109
|
let BullMQJobQueuePlugin = BullMQJobQueuePlugin_1 = class BullMQJobQueuePlugin {
|
|
108
110
|
/**
|
|
@@ -127,6 +129,7 @@ BullMQJobQueuePlugin = BullMQJobQueuePlugin_1 = __decorate([
|
|
|
127
129
|
{ provide: constants_1.BULLMQ_PLUGIN_OPTIONS, useFactory: () => BullMQJobQueuePlugin_1.options },
|
|
128
130
|
redis_health_indicator_1.RedisHealthIndicator,
|
|
129
131
|
],
|
|
132
|
+
compatibility: '^2.0.0',
|
|
130
133
|
})
|
|
131
134
|
], BullMQJobQueuePlugin);
|
|
132
135
|
exports.BullMQJobQueuePlugin = BullMQJobQueuePlugin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/bullmq/plugin.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,wCAAkE;AAElE,2EAAqE;AACrE,2CAAoD;AACpD,+EAAyE;AACzE,qEAAgE;AAChE,2FAAoF;AAGpF
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/bullmq/plugin.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,wCAAkE;AAElE,2EAAqE;AACrE,2CAAoD;AACpD,+EAAyE;AACzE,qEAAgE;AAChE,2FAAoF;AAGpF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2FG;AAeI,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAG7B;;;OAGG;IACH,MAAM,CAAC,IAAI,CAAC,OAA4B;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AAXY,oBAAoB;IAdhC,IAAA,oBAAa,EAAC;QACX,OAAO,EAAE,CAAC,yBAAkB,CAAC;QAC7B,aAAa,EAAE,MAAM,CAAC,EAAE;YACpB,MAAM,CAAC,eAAe,CAAC,gBAAgB,GAAG,IAAI,kDAAsB,EAAE,CAAC;YACvE,MAAM,CAAC,eAAe,CAAC,wBAAwB,GAAG,IAAI,iEAA6B,EAAE,CAAC;YACtF,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,sDAAwB,EAAE,CAAC,CAAC;YACvE,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,SAAS,EAAE;YACP,EAAE,OAAO,EAAE,iCAAqB,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,sBAAoB,CAAC,OAAO,EAAE;YAClF,6CAAoB;SACvB;QACD,aAAa,EAAE,QAAQ;KAC1B,CAAC;GACW,oBAAoB,CAWhC;AAXY,oDAAoB"}
|
|
@@ -28,7 +28,7 @@ let RedisHealthIndicator = class RedisHealthIndicator extends terminus_1.HealthI
|
|
|
28
28
|
const pingResult = await new Promise(async (resolve, reject) => {
|
|
29
29
|
try {
|
|
30
30
|
connection.on('error', err => {
|
|
31
|
-
core_1.Logger.error(`Redis health check error: ${err.message}`, constants_1.loggerCtx, err.stack);
|
|
31
|
+
core_1.Logger.error(`Redis health check error: ${JSON.stringify(err.message)}`, constants_1.loggerCtx, err.stack);
|
|
32
32
|
resolve(err);
|
|
33
33
|
});
|
|
34
34
|
if (this.timeoutTimer) {
|
|
@@ -41,7 +41,7 @@ let RedisHealthIndicator = class RedisHealthIndicator extends terminus_1.HealthI
|
|
|
41
41
|
resolve('timeout');
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
|
-
client.ping((err, res) => {
|
|
44
|
+
void client.ping((err, res) => {
|
|
45
45
|
if (err) {
|
|
46
46
|
resolve(err);
|
|
47
47
|
}
|
|
@@ -59,7 +59,7 @@ let RedisHealthIndicator = class RedisHealthIndicator extends terminus_1.HealthI
|
|
|
59
59
|
// await connection.disconnect();
|
|
60
60
|
}
|
|
61
61
|
catch (e) {
|
|
62
|
-
core_1.Logger.error(`Redis health check error closing connection: ${e.message}`, constants_1.loggerCtx, e.stack);
|
|
62
|
+
core_1.Logger.error(`Redis health check error closing connection: ${JSON.stringify(e.message)}`, constants_1.loggerCtx, e.stack);
|
|
63
63
|
}
|
|
64
64
|
const result = this.getStatus(key, pingResult === 'PONG');
|
|
65
65
|
if (pingResult === 'PONG') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-health-indicator.js","sourceRoot":"","sources":["../../src/bullmq/redis-health-indicator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,+CAA4F;AAC5F,wCAAuC;AACvC,mCAAyC;AAGzC,2CAA+D;
|
|
1
|
+
{"version":3,"file":"redis-health-indicator.js","sourceRoot":"","sources":["../../src/bullmq/redis-health-indicator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,+CAA4F;AAC5F,wCAAuC;AACvC,mCAAyC;AAGzC,2CAA+D;AAIxD,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,0BAAe;IAErD,YAAmD,OAA4B;QAC3E,KAAK,EAAE,CAAC;QADuC,YAAO,GAAP,OAAO,CAAqB;IAE/E,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,GAAW,EAAE,SAAS,GAAG,IAAI;QACzC,MAAM,UAAU,GAAG,IAAI,wBAAe,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,MAAM,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3D,IAAI;gBACA,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;oBACzB,aAAM,CAAC,KAAK,CACR,6BAA6B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAC1D,qBAAS,EACT,GAAG,CAAC,KAAK,CACZ,CAAC;oBACF,OAAO,CAAC,GAAG,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC;gBACH,IAAI,IAAI,CAAC,YAAY,EAAE;oBACnB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;iBACnC;gBACD,MAAM,OAAO,GAAG,IAAI,OAAO,CACvB,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CACpE,CAAC;gBACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAChC,IAAI,CAAC,MAAM,EAAE;oBACT,OAAO,CAAC,SAAS,CAAC,CAAC;oBACnB,OAAO;iBACV;gBACD,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE;oBACpC,IAAI,GAAG,EAAE;wBACL,OAAO,CAAC,GAAG,CAAC,CAAC;qBAChB;yBAAM;wBACH,OAAO,CAAC,GAAG,CAAC,CAAC;qBAChB;gBACL,CAAC,CAAC,CAAC;aACN;YAAC,OAAO,CAAM,EAAE;gBACb,OAAO,CAAC,CAAC,CAAC,CAAC;aACd;QACL,CAAC,CAAC,CAAC;QAEH,IAAI;YACA,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;YACzB,iCAAiC;SACpC;QAAC,OAAO,CAAM,EAAE;YACb,aAAM,CAAC,KAAK,CACR,gDAAgD,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAC3E,qBAAS,EACT,CAAC,CAAC,KAAK,CACV,CAAC;SACL;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC;QAE1D,IAAI,UAAU,KAAK,MAAM,EAAE;YACvB,OAAO,MAAM,CAAC;SACjB;QACD,MAAM,IAAI,2BAAgB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;CACJ,CAAA;AA3DY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAGI,WAAA,IAAA,eAAM,EAAC,iCAAqB,CAAC,CAAA;;GAFjC,oBAAoB,CA2DhC;AA3DY,oDAAoB"}
|
|
@@ -1,40 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
-
}) : (function(o, m, k, k2) {
|
|
6
|
-
if (k2 === undefined) k2 = k;
|
|
7
|
-
o[k2] = m[k];
|
|
8
|
-
}));
|
|
9
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
-
}) : function(o, v) {
|
|
12
|
-
o["default"] = v;
|
|
13
|
-
});
|
|
14
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
-
if (mod && mod.__esModule) return mod;
|
|
16
|
-
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
-
__setModuleDefault(result, mod);
|
|
19
|
-
return result;
|
|
20
|
-
};
|
|
21
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
3
|
exports.RedisJobBufferStorageStrategy = void 0;
|
|
23
4
|
const core_1 = require("@vendure/core");
|
|
24
|
-
const ioredis_1 =
|
|
5
|
+
const ioredis_1 = require("ioredis");
|
|
25
6
|
const constants_1 = require("./constants");
|
|
26
7
|
const BUFFER_LIST_PREFIX = 'vendure-job-buffer';
|
|
27
8
|
class RedisJobBufferStorageStrategy {
|
|
28
9
|
init(injector) {
|
|
29
10
|
const options = injector.get(constants_1.BULLMQ_PLUGIN_OPTIONS);
|
|
30
|
-
if (options.connection instanceof ioredis_1.
|
|
11
|
+
if (options.connection instanceof ioredis_1.Redis) {
|
|
31
12
|
this.redis = options.connection;
|
|
32
13
|
}
|
|
33
14
|
else if (options.connection instanceof ioredis_1.Cluster) {
|
|
34
15
|
this.redis = options.connection;
|
|
35
16
|
}
|
|
36
17
|
else {
|
|
37
|
-
this.redis = new ioredis_1.
|
|
18
|
+
this.redis = new ioredis_1.Redis(options.connection);
|
|
38
19
|
}
|
|
39
20
|
}
|
|
40
21
|
async add(bufferId, job) {
|
|
@@ -76,14 +57,18 @@ class RedisJobBufferStorageStrategy {
|
|
|
76
57
|
return new core_1.Job(jobConfig);
|
|
77
58
|
}
|
|
78
59
|
catch (e) {
|
|
79
|
-
core_1.Logger.error(`Could not parse buffered job:\n${e.message}`, constants_1.loggerCtx, e.stack);
|
|
60
|
+
core_1.Logger.error(`Could not parse buffered job:\n${JSON.stringify(e.message)}`, constants_1.loggerCtx, e.stack);
|
|
80
61
|
throw e;
|
|
81
62
|
}
|
|
82
63
|
}
|
|
83
64
|
async getAllBufferIds() {
|
|
84
|
-
const stream = this.redis.
|
|
85
|
-
|
|
86
|
-
|
|
65
|
+
const stream = this.redis instanceof ioredis_1.Redis
|
|
66
|
+
? this.redis.scanStream({
|
|
67
|
+
match: `${BUFFER_LIST_PREFIX}:*`,
|
|
68
|
+
})
|
|
69
|
+
: this.redis.nodes()[0].scanStream({
|
|
70
|
+
match: `${BUFFER_LIST_PREFIX}:*`,
|
|
71
|
+
});
|
|
87
72
|
const keys = await new Promise((resolve, reject) => {
|
|
88
73
|
const allKeys = [];
|
|
89
74
|
stream.on('data', _keys => allKeys.push(..._keys));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-job-buffer-storage-strategy.js","sourceRoot":"","sources":["../../src/bullmq/redis-job-buffer-storage-strategy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"redis-job-buffer-storage-strategy.js","sourceRoot":"","sources":["../../src/bullmq/redis-job-buffer-storage-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { Job } from '@vendure/core';
|
|
2
|
-
import { ConnectionOptions,
|
|
2
|
+
import { ConnectionOptions, WorkerOptions } from 'bullmq';
|
|
3
3
|
import { QueueOptions } from 'bullmq';
|
|
4
4
|
/**
|
|
5
5
|
* @description
|
|
6
6
|
* Configuration options for the {@link BullMQJobQueuePlugin}.
|
|
7
7
|
*
|
|
8
8
|
* @since 1.2.0
|
|
9
|
-
* @docsCategory
|
|
9
|
+
* @docsCategory core plugins/JobQueuePlugin
|
|
10
10
|
* @docsPage BullMQPluginOptions
|
|
11
11
|
* @docsWeight 0
|
|
12
12
|
*/
|
|
@@ -33,13 +33,6 @@ export interface BullMQPluginOptions {
|
|
|
33
33
|
* See the [BullMQ WorkerOptions docs](https://github.com/taskforcesh/bullmq/blob/master/docs/gitbook/api/bullmq.workeroptions.md)
|
|
34
34
|
*/
|
|
35
35
|
workerOptions?: Exclude<WorkerOptions, 'connection'>;
|
|
36
|
-
/**
|
|
37
|
-
* @description
|
|
38
|
-
* Additional options used when instantiating the BullMQ
|
|
39
|
-
* QueueScheduler instance.
|
|
40
|
-
* See the [BullMQ QueueSchedulerOptions docs](https://github.com/taskforcesh/bullmq/blob/master/docs/gitbook/api/bullmq.queuescheduleroptions.md)
|
|
41
|
-
*/
|
|
42
|
-
schedulerOptions?: Exclude<QueueSchedulerOptions, 'connection'>;
|
|
43
36
|
/**
|
|
44
37
|
* @description
|
|
45
38
|
* When a job is added to the JobQueue using `JobQueue.add()`, the calling
|
|
@@ -89,7 +82,7 @@ export interface BullMQPluginOptions {
|
|
|
89
82
|
* Configuration for the backoff function when retrying failed jobs.
|
|
90
83
|
*
|
|
91
84
|
* @since 1.3.0
|
|
92
|
-
* @docsCategory
|
|
85
|
+
* @docsCategory core plugins/JobQueuePlugin
|
|
93
86
|
* @docsPage BullMQPluginOptions
|
|
94
87
|
* @docsWeight 1
|
|
95
88
|
*/
|
package/package/pub-sub/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pub-sub/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pub-sub/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,4CAA0B"}
|
|
@@ -29,6 +29,7 @@ PubSubPlugin = PubSubPlugin_1 = __decorate([
|
|
|
29
29
|
config.jobQueueOptions.jobQueueStrategy = new pub_sub_job_queue_strategy_1.PubSubJobQueueStrategy();
|
|
30
30
|
return config;
|
|
31
31
|
},
|
|
32
|
+
compatibility: '^2.0.0',
|
|
32
33
|
})
|
|
33
34
|
], PubSubPlugin);
|
|
34
35
|
exports.PubSubPlugin = PubSubPlugin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/pub-sub/plugin.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iDAA8C;AAC9C,wCAAwE;AAExE,2CAA8C;AAE9C,6EAAsE;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/pub-sub/plugin.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iDAA8C;AAC9C,wCAAwE;AAExE,2CAA8C;AAE9C,6EAAsE;AAc/D,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAGrB,MAAM,CAAC,IAAI,CAAC,OAAsB;QAC9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,cAAY,CAAC;IACxB,CAAC;CACJ,CAAA;AAPY,YAAY;IAZxB,IAAA,oBAAa,EAAC;QACX,OAAO,EAAE,CAAC,yBAAkB,CAAC;QAC7B,SAAS,EAAE;YACP,EAAE,OAAO,EAAE,2BAAe,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,cAAY,CAAC,OAAO,EAAE;YACpE,EAAE,OAAO,EAAE,eAAM,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,eAAM,EAAE,EAAE;SACtD;QACD,aAAa,EAAE,MAAM,CAAC,EAAE;YACpB,MAAM,CAAC,eAAe,CAAC,gBAAgB,GAAG,IAAI,mDAAsB,EAAE,CAAC;YACvE,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,aAAa,EAAE,QAAQ;KAC1B,CAAC;GACW,YAAY,CAOxB;AAPY,oCAAY"}
|
|
@@ -8,9 +8,9 @@ export declare class PubSubJobQueueStrategy extends InjectableJobQueueStrategy i
|
|
|
8
8
|
private listeners;
|
|
9
9
|
init(injector: Injector): void;
|
|
10
10
|
destroy(): void;
|
|
11
|
-
add<Data extends JobData<Data> =
|
|
12
|
-
start<Data extends JobData<Data> =
|
|
13
|
-
stop<Data extends JobData<Data> =
|
|
11
|
+
add<Data extends JobData<Data> = object>(job: Job<Data>): Promise<Job<Data>>;
|
|
12
|
+
start<Data extends JobData<Data> = object>(queueName: string, process: (job: Job<Data>) => Promise<any>): Promise<void>;
|
|
13
|
+
stop<Data extends JobData<Data> = object>(queueName: string, process: (job: Job<Data>) => Promise<any>): Promise<void>;
|
|
14
14
|
private topic;
|
|
15
15
|
private subscription;
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pub-sub-job-queue-strategy.js","sourceRoot":"","sources":["../../src/pub-sub/pub-sub-job-queue-strategy.ts"],"names":[],"mappings":";;;AAAA,iDAA4E;AAC5E,yEAA+D;AAC/D,wCAQuB;AAEvB,2CAAyD;AAGzD,MAAa,sBAAuB,SAAQ,iCAA0B;IAAtE;;QAIY,WAAM,GAAG,IAAI,GAAG,EAAiB,CAAC;QAClC,kBAAa,GAAG,IAAI,GAAG,EAAwB,CAAC;QAChD,cAAS,GAAG,IAAI,8BAAuB,EAA8B,CAAC;IA+HlF,CAAC;IA7HG,IAAI,CAAC,QAAkB;;QACnB,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAgB,2BAAe,CAAC,CAAC;QAC7D,IAAI,CAAC,WAAW,GAAG,MAAA,OAAO,CAAC,WAAW,mCAAI,EAAE,CAAC;QAC7C,IAAI,CAAC,mBAAmB,GAAG,MAAA,OAAO,CAAC,mBAAmB,mCAAI,IAAI,GAAG,EAAE,CAAC;QAEpE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;IAED,OAAO;QACH,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE;YACpD,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;SAC9C;QACD,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"pub-sub-job-queue-strategy.js","sourceRoot":"","sources":["../../src/pub-sub/pub-sub-job-queue-strategy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,35 +1,34 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
"gitHead": "a47a8bbf4c0933b6a7a9cb3a518f8761d1b6e022"
|
|
2
|
+
"name": "@vendure/job-queue-plugin",
|
|
3
|
+
"version": "2.0.0",
|
|
4
|
+
"license": "MIT",
|
|
5
|
+
"main": "package/index.js",
|
|
6
|
+
"types": "package/index.d.ts",
|
|
7
|
+
"files": [
|
|
8
|
+
"package/**/*"
|
|
9
|
+
],
|
|
10
|
+
"private": false,
|
|
11
|
+
"scripts": {
|
|
12
|
+
"watch": "tsc -p ./tsconfig.build.json --watch",
|
|
13
|
+
"build": "rimraf package && tsc -p ./tsconfig.build.json",
|
|
14
|
+
"lint": "eslint --fix .",
|
|
15
|
+
"test": "vitest --run",
|
|
16
|
+
"e2e-wip": "node e2e/check-connection.js || jest --config ../../e2e-common/jest-config.js --runInBand --package=job-queue-plugin",
|
|
17
|
+
"ci": "yarn build"
|
|
18
|
+
},
|
|
19
|
+
"homepage": "https://www.vendure.io/",
|
|
20
|
+
"funding": "https://github.com/sponsors/michaelbromley",
|
|
21
|
+
"publishConfig": {
|
|
22
|
+
"access": "public"
|
|
23
|
+
},
|
|
24
|
+
"devDependencies": {
|
|
25
|
+
"@google-cloud/pubsub": "^2.8.0",
|
|
26
|
+
"@vendure/common": "^2.0.0",
|
|
27
|
+
"@vendure/core": "^2.0.0",
|
|
28
|
+
"bullmq": "^3.6.1",
|
|
29
|
+
"ioredis": "^5.3.0",
|
|
30
|
+
"rimraf": "^3.0.2",
|
|
31
|
+
"typescript": "4.9.5"
|
|
32
|
+
},
|
|
33
|
+
"gitHead": "302bd68796e0136f70dd199369616d362c920ea4"
|
|
35
34
|
}
|