@tsed/bullmq 7.82.2 → 8.0.0-alpha.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/lib/cjs/BullMQModule.js +44 -46
- package/lib/cjs/BullMQModule.js.map +1 -1
- package/lib/cjs/dispatchers/JobDispatcher.js +0 -1
- package/lib/cjs/dispatchers/JobDispatcher.js.map +1 -1
- package/lib/esm/BullMQModule.js +44 -46
- package/lib/esm/BullMQModule.js.map +1 -1
- package/lib/esm/dispatchers/JobDispatcher.js +0 -1
- package/lib/esm/dispatchers/JobDispatcher.js.map +1 -1
- package/lib/types/decorators/InjectQueue.d.ts +1 -1
- package/lib/types/decorators/InjectWorker.d.ts +1 -1
- package/lib/types-esm/decorators/InjectQueue.d.ts +1 -1
- package/lib/types-esm/decorators/InjectWorker.d.ts +1 -1
- package/package.json +11 -8
- package/vitest.config.mts +5 -5
package/lib/cjs/BullMQModule.js
CHANGED
|
@@ -15,11 +15,53 @@ const getJobToken_js_1 = require("./utils/getJobToken.js");
|
|
|
15
15
|
const mapQueueOptions_js_1 = require("./utils/mapQueueOptions.js");
|
|
16
16
|
const mapWorkerOptions_js_1 = require("./utils/mapWorkerOptions.js");
|
|
17
17
|
let BullMQModule = class BullMQModule {
|
|
18
|
-
injector;
|
|
19
|
-
dispatcher;
|
|
20
18
|
constructor(injector, dispatcher) {
|
|
21
19
|
this.injector = injector;
|
|
22
20
|
this.dispatcher = dispatcher;
|
|
21
|
+
this.onProcess = async (job) => {
|
|
22
|
+
const jobService = this.getJob(job.name, job.queueName);
|
|
23
|
+
if (!jobService) {
|
|
24
|
+
this.injector.logger.warn({
|
|
25
|
+
event: "BULLMQ_JOB_NOT_FOUND",
|
|
26
|
+
message: `Job ${job.name} ${job.queueName} not found`
|
|
27
|
+
});
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
const $ctx = new common_1.DIContext({
|
|
31
|
+
injector: this.injector,
|
|
32
|
+
logger: this.injector.logger,
|
|
33
|
+
id: job.id || (0, uuid_1.v4)().split("-").join(""),
|
|
34
|
+
additionalProps: {
|
|
35
|
+
logType: "bullmq",
|
|
36
|
+
name: job.name,
|
|
37
|
+
queue: job.queueName,
|
|
38
|
+
attempt: job.attemptsMade
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
$ctx.set("BULLMQ_JOB", job);
|
|
42
|
+
try {
|
|
43
|
+
return await (0, common_1.runInContext)($ctx, () => {
|
|
44
|
+
$ctx.logger.info("Processing job");
|
|
45
|
+
try {
|
|
46
|
+
return jobService.handle(job.data, job);
|
|
47
|
+
}
|
|
48
|
+
finally {
|
|
49
|
+
$ctx.logger.info("Finished processing job");
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
catch (er) {
|
|
54
|
+
$ctx.logger.error({
|
|
55
|
+
event: "BULLMQ_JOB_ERROR",
|
|
56
|
+
message: er.message,
|
|
57
|
+
stack: er.stack
|
|
58
|
+
});
|
|
59
|
+
throw er;
|
|
60
|
+
}
|
|
61
|
+
finally {
|
|
62
|
+
await $ctx.destroy();
|
|
63
|
+
}
|
|
64
|
+
};
|
|
23
65
|
// build providers allow @Inject(queue) usage in JobController instance
|
|
24
66
|
if (this.isEnabled()) {
|
|
25
67
|
const queues = [...this.getUniqQueueNames()];
|
|
@@ -79,50 +121,6 @@ let BullMQModule = class BullMQModule {
|
|
|
79
121
|
this.injector.get((0, getJobToken_js_1.getFallbackJobToken)(queueName)) ||
|
|
80
122
|
this.injector.get((0, getJobToken_js_1.getFallbackJobToken)()));
|
|
81
123
|
}
|
|
82
|
-
onProcess = async (job) => {
|
|
83
|
-
const jobService = this.getJob(job.name, job.queueName);
|
|
84
|
-
if (!jobService) {
|
|
85
|
-
this.injector.logger.warn({
|
|
86
|
-
event: "BULLMQ_JOB_NOT_FOUND",
|
|
87
|
-
message: `Job ${job.name} ${job.queueName} not found`
|
|
88
|
-
});
|
|
89
|
-
return;
|
|
90
|
-
}
|
|
91
|
-
const $ctx = new common_1.DIContext({
|
|
92
|
-
injector: this.injector,
|
|
93
|
-
logger: this.injector.logger,
|
|
94
|
-
id: job.id || (0, uuid_1.v4)().split("-").join(""),
|
|
95
|
-
additionalProps: {
|
|
96
|
-
logType: "bullmq",
|
|
97
|
-
name: job.name,
|
|
98
|
-
queue: job.queueName,
|
|
99
|
-
attempt: job.attemptsMade
|
|
100
|
-
}
|
|
101
|
-
});
|
|
102
|
-
$ctx.set("BULLMQ_JOB", job);
|
|
103
|
-
try {
|
|
104
|
-
return await (0, common_1.runInContext)($ctx, () => {
|
|
105
|
-
$ctx.logger.info("Processing job");
|
|
106
|
-
try {
|
|
107
|
-
return jobService.handle(job.data, job);
|
|
108
|
-
}
|
|
109
|
-
finally {
|
|
110
|
-
$ctx.logger.info("Finished processing job");
|
|
111
|
-
}
|
|
112
|
-
});
|
|
113
|
-
}
|
|
114
|
-
catch (er) {
|
|
115
|
-
$ctx.logger.error({
|
|
116
|
-
event: "BULLMQ_JOB_ERROR",
|
|
117
|
-
message: er.message,
|
|
118
|
-
stack: er.stack
|
|
119
|
-
});
|
|
120
|
-
throw er;
|
|
121
|
-
}
|
|
122
|
-
finally {
|
|
123
|
-
await $ctx.destroy();
|
|
124
|
-
}
|
|
125
|
-
};
|
|
126
124
|
};
|
|
127
125
|
BullMQModule = tslib_1.__decorate([
|
|
128
126
|
(0, di_1.Module)(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BullMQModule.js","sourceRoot":"","sources":["../../src/BullMQModule.ts"],"names":[],"mappings":";;;;AAAA,yCAA4E;AAC5E,iCAAiD;AACjD,yCAA6C;AAE7C,+BAAwB;AAExB,+DAAuD;AACvD,2DAAgD;AAEhD,qDAAqD;AACrD,2EAAmE;AACnE,6EAAqE;AACrE,2DAAwE;AACxE,mEAA2D;AAC3D,qEAA6D;AAGtD,IAAM,YAAY,GAAlB,MAAM,YAAY;
|
|
1
|
+
{"version":3,"file":"BullMQModule.js","sourceRoot":"","sources":["../../src/BullMQModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ const constants_js_1 = require("../constants/constants.js");
|
|
|
9
9
|
const getJobToken_js_1 = require("../utils/getJobToken.js");
|
|
10
10
|
const getQueueToken_js_1 = require("../utils/getQueueToken.js");
|
|
11
11
|
let JobDispatcher = class JobDispatcher {
|
|
12
|
-
injector;
|
|
13
12
|
constructor(injector) {
|
|
14
13
|
this.injector = injector;
|
|
15
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobDispatcher.js","sourceRoot":"","sources":["../../../src/dispatchers/JobDispatcher.ts"],"names":[],"mappings":";;;;AAAA,kCAAkC;AAClC,qCAAuC;AACvC,iCAAqD;AAErD,4DAAiD;AAEjD,4DAAoD;AACpD,gEAAwD;AAIjD,IAAM,aAAa,GAAnB,MAAM,aAAa;
|
|
1
|
+
{"version":3,"file":"JobDispatcher.js","sourceRoot":"","sources":["../../../src/dispatchers/JobDispatcher.ts"],"names":[],"mappings":";;;;AAAA,kCAAkC;AAClC,qCAAuC;AACvC,iCAAqD;AAErD,4DAAiD;AAEjD,4DAAoD;AACpD,gEAAwD;AAIjD,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YAA6B,QAAyB;QAAzB,aAAQ,GAAR,QAAQ,CAAiB;IAAG,CAAC;IASnD,KAAK,CAAC,QAAQ,CAAC,GAAyC,EAAE,OAAgB,EAAE,UAAuB,EAAE;QAC1G,MAAM,EAAC,SAAS,EAAE,OAAO,EAAE,iBAAiB,EAAC,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAE7F,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAQ,IAAA,gCAAa,EAAC,SAAS,CAAC,CAAC,CAAC;QAEjE,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,SAAS,SAAS,eAAe,CAAC,CAAC;SACpD;QAED,OAAO,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE;YACjC,GAAG,iBAAiB;YACpB,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,GAAyC,EAAE,OAAgB;QAC3F,IAAI,SAAiB,CAAC;QACtB,IAAI,OAAe,CAAC;QACpB,IAAI,iBAA0C,CAAC;QAE/C,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;YAC7B,0BAA0B;YAC1B,MAAM,KAAK,GAAG,YAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAW,qBAAM,CAAC,CAAC;YACpD,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC;YACxB,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC;YACrB,iBAAiB,GAAG,MAAM,IAAI,CAAC,mCAAmC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACpF;aAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAClC,wCAAwC;YACxC,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC;YACtB,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;SACpB;aAAM;YACL,4BAA4B;YAC5B,SAAS,GAAG,SAAS,CAAC;YACtB,OAAO,GAAG,GAAG,CAAC;SACf;QAED,OAAO;YACL,SAAS;YACT,OAAO;YACP,iBAAiB;SAClB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,mCAAmC,CAAC,KAAe,EAAE,OAAgB;QACjF,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAa,IAAA,4BAAW,EAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAEhF,IAAI,CAAC,GAAG,EAAE;YACR,OAAO,KAAK,CAAC,IAAI,CAAC;SACnB;QAED,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,OAAO,KAAK,CAAC,IAAI,CAAC;SACnB;QAED,OAAO;YACL,GAAG,KAAK,CAAC,IAAI;YACb,KAAK;SACN,CAAC;IACJ,CAAC;CACF,CAAA;AAtEY,aAAa;IADzB,IAAA,eAAU,GAAE;6CAE4B,oBAAe;GAD3C,aAAa,CAsEzB;AAtEY,sCAAa"}
|
package/lib/esm/BullMQModule.js
CHANGED
|
@@ -12,11 +12,53 @@ import { getFallbackJobToken, getJobToken } from "./utils/getJobToken.js";
|
|
|
12
12
|
import { mapQueueOptions } from "./utils/mapQueueOptions.js";
|
|
13
13
|
import { mapWorkerOptions } from "./utils/mapWorkerOptions.js";
|
|
14
14
|
let BullMQModule = class BullMQModule {
|
|
15
|
-
injector;
|
|
16
|
-
dispatcher;
|
|
17
15
|
constructor(injector, dispatcher) {
|
|
18
16
|
this.injector = injector;
|
|
19
17
|
this.dispatcher = dispatcher;
|
|
18
|
+
this.onProcess = async (job) => {
|
|
19
|
+
const jobService = this.getJob(job.name, job.queueName);
|
|
20
|
+
if (!jobService) {
|
|
21
|
+
this.injector.logger.warn({
|
|
22
|
+
event: "BULLMQ_JOB_NOT_FOUND",
|
|
23
|
+
message: `Job ${job.name} ${job.queueName} not found`
|
|
24
|
+
});
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
const $ctx = new DIContext({
|
|
28
|
+
injector: this.injector,
|
|
29
|
+
logger: this.injector.logger,
|
|
30
|
+
id: job.id || v4().split("-").join(""),
|
|
31
|
+
additionalProps: {
|
|
32
|
+
logType: "bullmq",
|
|
33
|
+
name: job.name,
|
|
34
|
+
queue: job.queueName,
|
|
35
|
+
attempt: job.attemptsMade
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
$ctx.set("BULLMQ_JOB", job);
|
|
39
|
+
try {
|
|
40
|
+
return await runInContext($ctx, () => {
|
|
41
|
+
$ctx.logger.info("Processing job");
|
|
42
|
+
try {
|
|
43
|
+
return jobService.handle(job.data, job);
|
|
44
|
+
}
|
|
45
|
+
finally {
|
|
46
|
+
$ctx.logger.info("Finished processing job");
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
catch (er) {
|
|
51
|
+
$ctx.logger.error({
|
|
52
|
+
event: "BULLMQ_JOB_ERROR",
|
|
53
|
+
message: er.message,
|
|
54
|
+
stack: er.stack
|
|
55
|
+
});
|
|
56
|
+
throw er;
|
|
57
|
+
}
|
|
58
|
+
finally {
|
|
59
|
+
await $ctx.destroy();
|
|
60
|
+
}
|
|
61
|
+
};
|
|
20
62
|
// build providers allow @Inject(queue) usage in JobController instance
|
|
21
63
|
if (this.isEnabled()) {
|
|
22
64
|
const queues = [...this.getUniqQueueNames()];
|
|
@@ -76,50 +118,6 @@ let BullMQModule = class BullMQModule {
|
|
|
76
118
|
this.injector.get(getFallbackJobToken(queueName)) ||
|
|
77
119
|
this.injector.get(getFallbackJobToken()));
|
|
78
120
|
}
|
|
79
|
-
onProcess = async (job) => {
|
|
80
|
-
const jobService = this.getJob(job.name, job.queueName);
|
|
81
|
-
if (!jobService) {
|
|
82
|
-
this.injector.logger.warn({
|
|
83
|
-
event: "BULLMQ_JOB_NOT_FOUND",
|
|
84
|
-
message: `Job ${job.name} ${job.queueName} not found`
|
|
85
|
-
});
|
|
86
|
-
return;
|
|
87
|
-
}
|
|
88
|
-
const $ctx = new DIContext({
|
|
89
|
-
injector: this.injector,
|
|
90
|
-
logger: this.injector.logger,
|
|
91
|
-
id: job.id || v4().split("-").join(""),
|
|
92
|
-
additionalProps: {
|
|
93
|
-
logType: "bullmq",
|
|
94
|
-
name: job.name,
|
|
95
|
-
queue: job.queueName,
|
|
96
|
-
attempt: job.attemptsMade
|
|
97
|
-
}
|
|
98
|
-
});
|
|
99
|
-
$ctx.set("BULLMQ_JOB", job);
|
|
100
|
-
try {
|
|
101
|
-
return await runInContext($ctx, () => {
|
|
102
|
-
$ctx.logger.info("Processing job");
|
|
103
|
-
try {
|
|
104
|
-
return jobService.handle(job.data, job);
|
|
105
|
-
}
|
|
106
|
-
finally {
|
|
107
|
-
$ctx.logger.info("Finished processing job");
|
|
108
|
-
}
|
|
109
|
-
});
|
|
110
|
-
}
|
|
111
|
-
catch (er) {
|
|
112
|
-
$ctx.logger.error({
|
|
113
|
-
event: "BULLMQ_JOB_ERROR",
|
|
114
|
-
message: er.message,
|
|
115
|
-
stack: er.stack
|
|
116
|
-
});
|
|
117
|
-
throw er;
|
|
118
|
-
}
|
|
119
|
-
finally {
|
|
120
|
-
await $ctx.destroy();
|
|
121
|
-
}
|
|
122
|
-
};
|
|
123
121
|
};
|
|
124
122
|
BullMQModule = __decorate([
|
|
125
123
|
Module(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BullMQModule.js","sourceRoot":"","sources":["../../src/BullMQModule.ts"],"names":[],"mappings":";AAAA,OAAO,EAAa,SAAS,EAAa,YAAY,EAAC,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAC,eAAe,EAAE,MAAM,EAAC,MAAM,UAAU,CAAC;AACjD,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAC,EAAE,EAAC,MAAM,MAAM,CAAC;AAExB,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAEhD,OAAO,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAC,mBAAmB,EAAC,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAC,oBAAoB,EAAC,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAC,mBAAmB,EAAE,WAAW,EAAC,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAC;AAGtD,IAAM,YAAY,GAAlB,MAAM,YAAY;
|
|
1
|
+
{"version":3,"file":"BullMQModule.js","sourceRoot":"","sources":["../../src/BullMQModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ import { BULLMQ } from "../constants/constants.js";
|
|
|
6
6
|
import { getJobToken } from "../utils/getJobToken.js";
|
|
7
7
|
import { getQueueToken } from "../utils/getQueueToken.js";
|
|
8
8
|
let JobDispatcher = class JobDispatcher {
|
|
9
|
-
injector;
|
|
10
9
|
constructor(injector) {
|
|
11
10
|
this.injector = injector;
|
|
12
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobDispatcher.js","sourceRoot":"","sources":["../../../src/dispatchers/JobDispatcher.ts"],"names":[],"mappings":";AAAA,kCAAkC;AAClC,OAAO,EAAC,KAAK,EAAO,MAAM,YAAY,CAAC;AACvC,OAAO,EAAC,UAAU,EAAE,eAAe,EAAC,MAAM,UAAU,CAAC;AAErD,OAAO,EAAC,MAAM,EAAC,MAAM,2BAA2B,CAAC;AAEjD,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AAIjD,IAAM,aAAa,GAAnB,MAAM,aAAa;
|
|
1
|
+
{"version":3,"file":"JobDispatcher.js","sourceRoot":"","sources":["../../../src/dispatchers/JobDispatcher.ts"],"names":[],"mappings":";AAAA,kCAAkC;AAClC,OAAO,EAAC,KAAK,EAAO,MAAM,YAAY,CAAC;AACvC,OAAO,EAAC,UAAU,EAAE,eAAe,EAAC,MAAM,UAAU,CAAC;AAErD,OAAO,EAAC,MAAM,EAAC,MAAM,2BAA2B,CAAC;AAEjD,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AAIjD,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YAA6B,QAAyB;QAAzB,aAAQ,GAAR,QAAQ,CAAiB;IAAG,CAAC;IASnD,KAAK,CAAC,QAAQ,CAAC,GAAyC,EAAE,OAAgB,EAAE,UAAuB,EAAE;QAC1G,MAAM,EAAC,SAAS,EAAE,OAAO,EAAE,iBAAiB,EAAC,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAE7F,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAQ,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QAEjE,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,SAAS,SAAS,eAAe,CAAC,CAAC;SACpD;QAED,OAAO,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE;YACjC,GAAG,iBAAiB;YACpB,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,GAAyC,EAAE,OAAgB;QAC3F,IAAI,SAAiB,CAAC;QACtB,IAAI,OAAe,CAAC;QACpB,IAAI,iBAA0C,CAAC;QAE/C,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;YAC7B,0BAA0B;YAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAW,MAAM,CAAC,CAAC;YACpD,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC;YACxB,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC;YACrB,iBAAiB,GAAG,MAAM,IAAI,CAAC,mCAAmC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACpF;aAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAClC,wCAAwC;YACxC,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC;YACtB,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;SACpB;aAAM;YACL,4BAA4B;YAC5B,SAAS,GAAG,SAAS,CAAC;YACtB,OAAO,GAAG,GAAG,CAAC;SACf;QAED,OAAO;YACL,SAAS;YACT,OAAO;YACP,iBAAiB;SAClB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,mCAAmC,CAAC,KAAe,EAAE,OAAgB;QACjF,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAa,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAEhF,IAAI,CAAC,GAAG,EAAE;YACR,OAAO,KAAK,CAAC,IAAI,CAAC;SACnB;QAED,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,OAAO,KAAK,CAAC,IAAI,CAAC;SACnB;QAED,OAAO;YACL,GAAG,KAAK,CAAC,IAAI;YACb,KAAK;SACN,CAAC;IACJ,CAAC;CACF,CAAA;AAtEY,aAAa;IADzB,UAAU,EAAE;qCAE4B,eAAe;GAD3C,aAAa,CAsEzB;SAtEY,aAAa"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function InjectQueue(name: string):
|
|
1
|
+
export declare function InjectQueue(name: string): any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function InjectWorker(name: string):
|
|
1
|
+
export declare function InjectWorker(name: string): any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function InjectQueue(name: string):
|
|
1
|
+
export declare function InjectQueue(name: string): any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function InjectWorker(name: string):
|
|
1
|
+
export declare function InjectWorker(name: string): any;
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@tsed/bullmq",
|
|
3
3
|
"description": "BullMQ integration for Ts.ED",
|
|
4
4
|
"type": "commonjs",
|
|
5
|
-
"version": "
|
|
5
|
+
"version": "8.0.0-alpha.1",
|
|
6
6
|
"keywords": [
|
|
7
7
|
"Ts.ED",
|
|
8
8
|
"BullMQ"
|
|
@@ -30,12 +30,12 @@
|
|
|
30
30
|
"tslib": "2.6.1"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
|
-
"@tsed/barrels": "
|
|
34
|
-
"@tsed/common": "
|
|
35
|
-
"@tsed/core": "
|
|
36
|
-
"@tsed/di": "
|
|
37
|
-
"@tsed/schema": "
|
|
38
|
-
"@tsed/typescript": "
|
|
33
|
+
"@tsed/barrels": "8.0.0-alpha.1",
|
|
34
|
+
"@tsed/common": "8.0.0-alpha.1",
|
|
35
|
+
"@tsed/core": "8.0.0-alpha.1",
|
|
36
|
+
"@tsed/di": "8.0.0-alpha.1",
|
|
37
|
+
"@tsed/schema": "8.0.0-alpha.1",
|
|
38
|
+
"@tsed/typescript": "8.0.0-alpha.1",
|
|
39
39
|
"bullmq": "^4.12.3 || ^5.1.1",
|
|
40
40
|
"eslint": "^8.57.0",
|
|
41
41
|
"ts-mockito": "^2.6.1",
|
|
@@ -51,5 +51,8 @@
|
|
|
51
51
|
},
|
|
52
52
|
"homepage": "https://github.com/tsedio/tsed/tree/production/packages/third-parties/bullmq",
|
|
53
53
|
"author": "Romain Lenzotti",
|
|
54
|
-
"license": "MIT"
|
|
54
|
+
"license": "MIT",
|
|
55
|
+
"publishConfig": {
|
|
56
|
+
"tag": "alpha"
|
|
57
|
+
}
|
|
55
58
|
}
|
package/vitest.config.mts
CHANGED
|
@@ -10,12 +10,12 @@ export default defineConfig(
|
|
|
10
10
|
coverage: {
|
|
11
11
|
...presets.test.coverage,
|
|
12
12
|
thresholds: {
|
|
13
|
-
statements:
|
|
14
|
-
branches:
|
|
15
|
-
functions:
|
|
16
|
-
lines:
|
|
13
|
+
statements: 98.96,
|
|
14
|
+
branches: 94.44,
|
|
15
|
+
functions: 100,
|
|
16
|
+
lines: 98.96
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
);
|
|
21
|
+
);
|