@alanszp/queue 10.0.1 → 10.0.3
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/worker/worker.js +1 -1
- package/dist/worker/worker.js.map +1 -1
- package/dist/wrappers/withContext.d.ts +1 -1
- package/dist/wrappers/withContext.js +6 -8
- package/dist/wrappers/withContext.js.map +1 -1
- package/package.json +5 -4
- package/src/worker/worker.ts +1 -1
- package/src/wrappers/withContext.ts +7 -4
package/dist/worker/worker.js
CHANGED
|
@@ -35,7 +35,7 @@ class Worker {
|
|
|
35
35
|
return this.worker.id;
|
|
36
36
|
}
|
|
37
37
|
processJob() {
|
|
38
|
-
return (0, withContext_1.withContext)(this.getContext(), (job) => __awaiter(this, void 0, void 0, function* () {
|
|
38
|
+
return (0, withContext_1.withContext)(this.queueFullName, this.getContext(), (job) => __awaiter(this, void 0, void 0, function* () {
|
|
39
39
|
this.getLogger().info(`worker.process.job_received`, {
|
|
40
40
|
queue: this.queueFullName,
|
|
41
41
|
job,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/worker/worker.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,4DAAyD;AACzD,oCAMkB;AAGlB,yDAAsD;AA+BtD,MAAM,WAAW,GAAG,GAAG,CAAC;AAExB,MAAe,MAAM;IAOnB;QACE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAExD,MAAM,iBAAiB,GAAG,qCAAiB,CAAC,WAAW,EAAE,CAAC;QAC1D,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC;QAE7C,MAAM,MAAM,GAAG,iBAAiB,CAAC,cAAc,EAAE,CAAC;QAClD,IAAI,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAS,CAAoB,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,kBACrE,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,iBAAiB,CAAC,aAAa,EAAE,EAC7C,MAAM,EAAE,IAAI,MAAM,KAAK,WAAW,EAAE,IACjC,aAAa,EAChB,CAAC;QACH,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QAErE,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IASM,KAAK;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;IAED,IAAW,MAAM;QACf,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC9E,CAAC;IAED,IAAW,EAAE;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;IACxB,CAAC;IAEO,UAAU;QAChB,OAAO,IAAA,yBAAW,EAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAO,GAAG,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/worker/worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Job, JobData } from "bullmq";
|
|
2
2
|
import { WorkerContext } from "../worker/worker";
|
|
3
3
|
import { JobReturnValue } from "../types";
|
|
4
|
-
export declare function withContext<T = JobData, ReturnValue = JobReturnValue>(workerContext: WorkerContext, executor: (job: Job<T>) => Promise<ReturnValue>): (job: Job<T>) => Promise<ReturnValue>;
|
|
4
|
+
export declare function withContext<T = JobData, ReturnValue = JobReturnValue>(queueName: string, workerContext: WorkerContext, executor: (job: Job<T>) => Promise<ReturnValue>): (job: Job<T>) => Promise<ReturnValue>;
|
|
@@ -8,14 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.withContext = void 0;
|
|
16
|
-
const
|
|
13
|
+
const cuid2_1 = require("@paralleldrive/cuid2");
|
|
17
14
|
const appIdentifier_1 = require("../helpers/appIdentifier");
|
|
18
|
-
|
|
15
|
+
const lodash_1 = require("lodash");
|
|
16
|
+
function withContext(queueName, workerContext, executor) {
|
|
19
17
|
return (job) => {
|
|
20
18
|
const { lid, lch } = job.data;
|
|
21
19
|
return workerContext.sharedContext.run(() => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -23,9 +21,9 @@ function withContext(workerContext, executor) {
|
|
|
23
21
|
}), {
|
|
24
22
|
logger: workerContext.baseLogger,
|
|
25
23
|
audit: workerContext.audit.withState(),
|
|
26
|
-
lifecycleId: lid || (0,
|
|
27
|
-
lifecycleChain: lch || (0, appIdentifier_1.appIdentifier)(),
|
|
28
|
-
contextId: (0,
|
|
24
|
+
lifecycleId: lid || (0, cuid2_1.createId)(),
|
|
25
|
+
lifecycleChain: (0, lodash_1.compact)([lch, `wkr:${queueName}`]).join(",") || (0, appIdentifier_1.appIdentifier)(),
|
|
26
|
+
contextId: (0, cuid2_1.createId)(),
|
|
29
27
|
});
|
|
30
28
|
};
|
|
31
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withContext.js","sourceRoot":"","sources":["../../src/wrappers/withContext.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"withContext.js","sourceRoot":"","sources":["../../src/wrappers/withContext.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAgD;AAChD,4DAAyD;AAIzD,mCAAiC;AAEjC,SAAgB,WAAW,CACzB,SAAiB,EACjB,aAA4B,EAC5B,QAA+C;IAE/C,OAAO,CAAC,GAAG,EAAE,EAAE;QACb,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,IAAsC,CAAC;QAChE,OAAO,aAAa,CAAC,aAAa,CAAC,GAAG,CACpC,GAAS,EAAE;YACT,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC,CAAA,EACD;YACE,MAAM,EAAE,aAAa,CAAC,UAAU;YAChC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE;YACtC,WAAW,EAAE,GAAG,IAAI,IAAA,gBAAQ,GAAE;YAC9B,cAAc,EACZ,IAAA,gBAAO,EAAC,CAAC,GAAG,EAAE,OAAO,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAA,6BAAa,GAAE;YACjE,SAAS,EAAE,IAAA,gBAAQ,GAAE;SACtB,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AArBD,kCAqBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alanszp/queue",
|
|
3
|
-
"version": "10.0.
|
|
3
|
+
"version": "10.0.3",
|
|
4
4
|
"description": "Workers and queues",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -26,14 +26,15 @@
|
|
|
26
26
|
"typescript": "^4.3.4"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@alanszp/audit": "^10.0.
|
|
29
|
+
"@alanszp/audit": "^10.0.2",
|
|
30
30
|
"@alanszp/core": "^10.0.1",
|
|
31
31
|
"@alanszp/logger": "^10.0.1",
|
|
32
|
-
"@alanszp/shared-context": "^10.0.
|
|
32
|
+
"@alanszp/shared-context": "^10.0.2",
|
|
33
33
|
"@alanszp/validations": "^10.0.1",
|
|
34
|
+
"@paralleldrive/cuid2": "^2.2.2",
|
|
34
35
|
"bullmq": "^2.1.2",
|
|
35
36
|
"ioredis": "^5.2.3",
|
|
36
37
|
"lodash": "^4.17.21"
|
|
37
38
|
},
|
|
38
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "701d6cc7bd3a51a8b297903e7b2fff9c1b830da6"
|
|
39
40
|
}
|
package/src/worker/worker.ts
CHANGED
|
@@ -88,7 +88,7 @@ abstract class Worker<Data = JobData, ReturnValue = unknown> {
|
|
|
88
88
|
}
|
|
89
89
|
|
|
90
90
|
private processJob(): (job: Job<Data, ReturnValue>) => Promise<ReturnValue> {
|
|
91
|
-
return withContext(this.getContext(), async (job) => {
|
|
91
|
+
return withContext(this.queueFullName, this.getContext(), async (job) => {
|
|
92
92
|
this.getLogger().info(`worker.process.job_received`, {
|
|
93
93
|
queue: this.queueFullName,
|
|
94
94
|
job,
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { createId } from "@paralleldrive/cuid2";
|
|
2
2
|
import { appIdentifier } from "../helpers/appIdentifier";
|
|
3
3
|
import { Job, JobData } from "bullmq";
|
|
4
4
|
import { WorkerContext } from "../worker/worker";
|
|
5
5
|
import { JobReturnValue } from "../types";
|
|
6
|
+
import { compact } from "lodash";
|
|
6
7
|
|
|
7
8
|
export function withContext<T = JobData, ReturnValue = JobReturnValue>(
|
|
9
|
+
queueName: string,
|
|
8
10
|
workerContext: WorkerContext,
|
|
9
11
|
executor: (job: Job<T>) => Promise<ReturnValue>
|
|
10
12
|
): (job: Job<T>) => Promise<ReturnValue> {
|
|
@@ -17,9 +19,10 @@ export function withContext<T = JobData, ReturnValue = JobReturnValue>(
|
|
|
17
19
|
{
|
|
18
20
|
logger: workerContext.baseLogger,
|
|
19
21
|
audit: workerContext.audit.withState(),
|
|
20
|
-
lifecycleId: lid ||
|
|
21
|
-
lifecycleChain:
|
|
22
|
-
|
|
22
|
+
lifecycleId: lid || createId(),
|
|
23
|
+
lifecycleChain:
|
|
24
|
+
compact([lch, `wkr:${queueName}`]).join(",") || appIdentifier(),
|
|
25
|
+
contextId: createId(),
|
|
23
26
|
}
|
|
24
27
|
);
|
|
25
28
|
};
|