@nest-boot/bullmq-mikro-orm 8.0.4-beta.0 → 8.0.4-beta.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.
|
@@ -8,12 +8,15 @@ export declare class BullMQMikroORMService implements OnApplicationBootstrap {
|
|
|
8
8
|
private readonly discoveryService;
|
|
9
9
|
private readonly em;
|
|
10
10
|
private readonly options;
|
|
11
|
+
private readonly logger;
|
|
11
12
|
private readonly jobTTL;
|
|
12
13
|
private readonly includeQueues;
|
|
13
14
|
private readonly excludeQueues;
|
|
14
15
|
constructor(discoveryService: DiscoveryService, em: EntityManager, options: BullMQMikroORMModuleOptions);
|
|
15
16
|
convertJobToEntityData(job: Job, jobState: JobState): Promise<EntityData<JobEntity>>;
|
|
16
17
|
upsertJob(job: Job, jobState: JobState): Promise<void>;
|
|
18
|
+
/** Records history without turning an observer failure into a worker failure. */
|
|
19
|
+
private recordJobEvent;
|
|
17
20
|
cleanHistoryJobs(): Promise<void>;
|
|
18
21
|
onApplicationBootstrap(): void;
|
|
19
22
|
}
|
|
@@ -10,19 +10,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
|
+
var BullMQMikroORMService_1;
|
|
13
14
|
import { EntityManager } from "@mikro-orm/core";
|
|
14
15
|
import { WorkerHost } from "@nest-boot/bullmq";
|
|
15
16
|
import { Cron } from "@nest-boot/schedule";
|
|
16
|
-
import { Inject, Injectable, } from "@nestjs/common";
|
|
17
|
+
import { Inject, Injectable, Logger, } from "@nestjs/common";
|
|
17
18
|
import { DiscoveryService } from "@nestjs/core";
|
|
18
19
|
import { Queue } from "bullmq";
|
|
19
20
|
import { MODULE_OPTIONS_TOKEN } from "./bullmq-mikro-orm.module-definition.js";
|
|
20
21
|
import { convertBullmqJobStateToJobStatus } from "./utils/convert-bullmq-job-state-to-job-status.util.js";
|
|
21
22
|
import { shouldIncludeQueue } from "./utils/should-include-queue.util.js";
|
|
22
|
-
let BullMQMikroORMService = class BullMQMikroORMService {
|
|
23
|
+
let BullMQMikroORMService = BullMQMikroORMService_1 = class BullMQMikroORMService {
|
|
23
24
|
discoveryService;
|
|
24
25
|
em;
|
|
25
26
|
options;
|
|
27
|
+
logger = new Logger(BullMQMikroORMService_1.name);
|
|
26
28
|
jobTTL = 1000 * 60 * 60 * 24 * 30;
|
|
27
29
|
includeQueues = [];
|
|
28
30
|
excludeQueues = [];
|
|
@@ -65,6 +67,13 @@ let BullMQMikroORMService = class BullMQMikroORMService {
|
|
|
65
67
|
onConflictFields: ["id"],
|
|
66
68
|
});
|
|
67
69
|
}
|
|
70
|
+
/** Records history without turning an observer failure into a worker failure. */
|
|
71
|
+
recordJobEvent(job, state) {
|
|
72
|
+
void this.upsertJob(job, state).catch((error) => {
|
|
73
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
74
|
+
this.logger.error(`Failed to persist job ${job.queueName}:${job.id ?? "unknown"} (${state}): ${message}`, error instanceof Error ? error.stack : undefined);
|
|
75
|
+
});
|
|
76
|
+
}
|
|
68
77
|
async cleanHistoryJobs() {
|
|
69
78
|
await this.em.fork().nativeDelete(this.options.jobEntity, {
|
|
70
79
|
updatedAt: {
|
|
@@ -78,16 +87,27 @@ let BullMQMikroORMService = class BullMQMikroORMService {
|
|
|
78
87
|
.filter((provider) => provider.instance instanceof Queue)
|
|
79
88
|
.filter((provider) => shouldIncludeQueue(provider.instance.name, this.includeQueues, this.excludeQueues))
|
|
80
89
|
.forEach((provider) => {
|
|
81
|
-
void provider.instance.on("waiting", (job) =>
|
|
90
|
+
void provider.instance.on("waiting", (job) => {
|
|
91
|
+
this.recordJobEvent(job, "waiting");
|
|
92
|
+
});
|
|
82
93
|
});
|
|
83
94
|
instanceWrappers
|
|
84
95
|
.filter((provider) => provider.instance instanceof WorkerHost)
|
|
85
96
|
.filter((provider) => shouldIncludeQueue(provider.instance.worker.name, this.includeQueues, this.excludeQueues))
|
|
86
97
|
.forEach((provider) => {
|
|
87
|
-
provider.instance.worker.on("active", (job) =>
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
provider.instance.worker.on("
|
|
98
|
+
provider.instance.worker.on("active", (job) => {
|
|
99
|
+
this.recordJobEvent(job, "active");
|
|
100
|
+
});
|
|
101
|
+
provider.instance.worker.on("progress", (job) => {
|
|
102
|
+
this.recordJobEvent(job, "active");
|
|
103
|
+
});
|
|
104
|
+
provider.instance.worker.on("completed", (job) => {
|
|
105
|
+
this.recordJobEvent(job, "completed");
|
|
106
|
+
});
|
|
107
|
+
provider.instance.worker.on("failed", (job) => {
|
|
108
|
+
if (job)
|
|
109
|
+
this.recordJobEvent(job, "failed");
|
|
110
|
+
});
|
|
91
111
|
});
|
|
92
112
|
}
|
|
93
113
|
};
|
|
@@ -97,7 +117,7 @@ __decorate([
|
|
|
97
117
|
__metadata("design:paramtypes", []),
|
|
98
118
|
__metadata("design:returntype", Promise)
|
|
99
119
|
], BullMQMikroORMService.prototype, "cleanHistoryJobs", null);
|
|
100
|
-
BullMQMikroORMService = __decorate([
|
|
120
|
+
BullMQMikroORMService = BullMQMikroORMService_1 = __decorate([
|
|
101
121
|
Injectable(),
|
|
102
122
|
__param(2, Inject(MODULE_OPTIONS_TOKEN)),
|
|
103
123
|
__metadata("design:paramtypes", [DiscoveryService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bullmq-mikro-orm.service.js","sourceRoot":"","sources":["../src/bullmq-mikro-orm.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bullmq-mikro-orm.service.js","sourceRoot":"","sources":["../src/bullmq-mikro-orm.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nest-boot/bullmq-mikro-orm",
|
|
3
|
-
"version": "8.0.4-beta.
|
|
3
|
+
"version": "8.0.4-beta.1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/nest-boot/nest-boot.git",
|
|
@@ -42,8 +42,8 @@
|
|
|
42
42
|
"vitest": "^4.1.11",
|
|
43
43
|
"@nest-boot/bullmq": "^8.0.4-beta.0",
|
|
44
44
|
"@nest-boot/eslint-config": "^8.0.1-beta.0",
|
|
45
|
-
"@nest-boot/request-context": "^8.0.1-beta.0",
|
|
46
45
|
"@nest-boot/eslint-plugin": "^8.0.1-beta.0",
|
|
46
|
+
"@nest-boot/request-context": "^8.0.1-beta.0",
|
|
47
47
|
"@nest-boot/schedule": "^8.0.4-beta.0",
|
|
48
48
|
"@nest-boot/tsconfig": "^8.0.0-beta.4"
|
|
49
49
|
},
|
|
@@ -57,8 +57,8 @@
|
|
|
57
57
|
"reflect-metadata": "^0.2.2",
|
|
58
58
|
"rxjs": "^7.0.0",
|
|
59
59
|
"@nest-boot/bullmq": "^8.0.4-beta.0",
|
|
60
|
-
"@nest-boot/
|
|
61
|
-
"@nest-boot/
|
|
60
|
+
"@nest-boot/schedule": "^8.0.4-beta.0",
|
|
61
|
+
"@nest-boot/request-context": "^8.0.1-beta.0"
|
|
62
62
|
},
|
|
63
63
|
"publishConfig": {
|
|
64
64
|
"access": "public"
|