bullmq 5.23.1 → 5.24.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/dist/cjs/classes/flow-producer.js +72 -49
- package/dist/cjs/classes/flow-producer.js.map +1 -1
- package/dist/cjs/classes/queue-base.js +2 -43
- package/dist/cjs/classes/queue-base.js.map +1 -1
- package/dist/cjs/enums/telemetry-attributes.js +1 -0
- package/dist/cjs/enums/telemetry-attributes.js.map +1 -1
- package/dist/cjs/tsconfig-cjs.tsbuildinfo +1 -1
- package/dist/cjs/utils.js +57 -1
- package/dist/cjs/utils.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/classes/flow-producer.d.ts +7 -3
- package/dist/esm/classes/flow-producer.js +73 -50
- package/dist/esm/classes/flow-producer.js.map +1 -1
- package/dist/esm/classes/queue-base.d.ts +1 -7
- package/dist/esm/classes/queue-base.js +3 -44
- package/dist/esm/classes/queue-base.js.map +1 -1
- package/dist/esm/enums/telemetry-attributes.d.ts +2 -1
- package/dist/esm/enums/telemetry-attributes.js +1 -0
- package/dist/esm/enums/telemetry-attributes.js.map +1 -1
- package/dist/esm/tsconfig.tsbuildinfo +1 -1
- package/dist/esm/utils.d.ts +18 -1
- package/dist/esm/utils.js +55 -0
- package/dist/esm/utils.js.map +1 -1
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +1 -1
|
@@ -7,6 +7,7 @@ const utils_1 = require("../utils");
|
|
|
7
7
|
const job_1 = require("./job");
|
|
8
8
|
const queue_keys_1 = require("./queue-keys");
|
|
9
9
|
const redis_connection_1 = require("./redis-connection");
|
|
10
|
+
const enums_1 = require("../enums");
|
|
10
11
|
/**
|
|
11
12
|
* This class allows to add jobs with dependencies between them in such
|
|
12
13
|
* a way that it is possible to build complex flows.
|
|
@@ -28,6 +29,9 @@ class FlowProducer extends events_1.EventEmitter {
|
|
|
28
29
|
}
|
|
29
30
|
});
|
|
30
31
|
this.queueKeys = new queue_keys_1.QueueKeys(opts.prefix);
|
|
32
|
+
if (opts === null || opts === void 0 ? void 0 : opts.telemetry) {
|
|
33
|
+
this.telemetry = opts.telemetry;
|
|
34
|
+
}
|
|
31
35
|
}
|
|
32
36
|
emit(event, ...args) {
|
|
33
37
|
return super.emit(event, ...args);
|
|
@@ -81,17 +85,22 @@ class FlowProducer extends events_1.EventEmitter {
|
|
|
81
85
|
const parentDependenciesKey = parentKey
|
|
82
86
|
? `${parentKey}:dependencies`
|
|
83
87
|
: undefined;
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
88
|
+
return (0, utils_1.trace)(this.telemetry, enums_1.SpanKind.PRODUCER, flow.queueName, 'addFlow', flow.queueName, async (span) => {
|
|
89
|
+
span === null || span === void 0 ? void 0 : span.setAttributes({
|
|
90
|
+
[enums_1.TelemetryAttributes.FlowName]: flow.name,
|
|
91
|
+
});
|
|
92
|
+
const jobsTree = await this.addNode({
|
|
93
|
+
multi,
|
|
94
|
+
node: flow,
|
|
95
|
+
queuesOpts: opts === null || opts === void 0 ? void 0 : opts.queuesOptions,
|
|
96
|
+
parent: {
|
|
97
|
+
parentOpts,
|
|
98
|
+
parentDependenciesKey,
|
|
99
|
+
},
|
|
100
|
+
});
|
|
101
|
+
await multi.exec();
|
|
102
|
+
return jobsTree;
|
|
92
103
|
});
|
|
93
|
-
await multi.exec();
|
|
94
|
-
return jobsTree;
|
|
95
104
|
}
|
|
96
105
|
/**
|
|
97
106
|
* Get a flow.
|
|
@@ -130,9 +139,17 @@ class FlowProducer extends events_1.EventEmitter {
|
|
|
130
139
|
}
|
|
131
140
|
const client = await this.connection.client;
|
|
132
141
|
const multi = client.multi();
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
142
|
+
return (0, utils_1.trace)(this.telemetry, enums_1.SpanKind.PRODUCER, '', 'addBulkFlows', '', async (span) => {
|
|
143
|
+
span === null || span === void 0 ? void 0 : span.setAttributes({
|
|
144
|
+
[enums_1.TelemetryAttributes.BulkCount]: flows.length,
|
|
145
|
+
[enums_1.TelemetryAttributes.BulkNames]: flows
|
|
146
|
+
.map(flow => flow.name)
|
|
147
|
+
.join(','),
|
|
148
|
+
});
|
|
149
|
+
const jobsTrees = await this.addNodes(multi, flows);
|
|
150
|
+
await multi.exec();
|
|
151
|
+
return jobsTrees;
|
|
152
|
+
});
|
|
136
153
|
}
|
|
137
154
|
/**
|
|
138
155
|
* Add a node (job) of a flow to the queue. This method will recursively
|
|
@@ -145,47 +162,53 @@ class FlowProducer extends events_1.EventEmitter {
|
|
|
145
162
|
* @param parent - parent data sent to children to create the "links" to their parent
|
|
146
163
|
* @returns
|
|
147
164
|
*/
|
|
148
|
-
addNode({ multi, node, parent, queuesOpts }) {
|
|
165
|
+
async addNode({ multi, node, parent, queuesOpts, }) {
|
|
149
166
|
var _a, _b;
|
|
150
167
|
const prefix = node.prefix || this.opts.prefix;
|
|
151
168
|
const queue = this.queueFromNode(node, new queue_keys_1.QueueKeys(prefix), prefix);
|
|
152
169
|
const queueOpts = queuesOpts && queuesOpts[node.queueName];
|
|
153
170
|
const jobsOpts = (_a = queueOpts === null || queueOpts === void 0 ? void 0 : queueOpts.defaultJobOptions) !== null && _a !== void 0 ? _a : {};
|
|
154
171
|
const jobId = ((_b = node.opts) === null || _b === void 0 ? void 0 : _b.jobId) || (0, uuid_1.v4)();
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
const parentId = jobId;
|
|
160
|
-
const queueKeysParent = new queue_keys_1.QueueKeys(node.prefix || this.opts.prefix);
|
|
161
|
-
const waitChildrenKey = queueKeysParent.toKey(node.queueName, 'waiting-children');
|
|
162
|
-
job.addJob(multi, {
|
|
163
|
-
parentDependenciesKey: parent === null || parent === void 0 ? void 0 : parent.parentDependenciesKey,
|
|
164
|
-
waitChildrenKey,
|
|
165
|
-
parentKey,
|
|
172
|
+
return (0, utils_1.trace)(this.telemetry, enums_1.SpanKind.PRODUCER, node.name, 'addNode', node.queueName, async (span, dstPropagationMetadata) => {
|
|
173
|
+
span === null || span === void 0 ? void 0 : span.setAttributes({
|
|
174
|
+
[enums_1.TelemetryAttributes.JobName]: node.name,
|
|
175
|
+
[enums_1.TelemetryAttributes.JobId]: jobId,
|
|
166
176
|
});
|
|
167
|
-
const
|
|
168
|
-
const
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
177
|
+
const job = new this.Job(queue, node.name, node.data, Object.assign(Object.assign(Object.assign({}, jobsOpts), node.opts), { parent: parent === null || parent === void 0 ? void 0 : parent.parentOpts, telemetryMetadata: dstPropagationMetadata }), jobId);
|
|
178
|
+
const parentKey = (0, utils_1.getParentKey)(parent === null || parent === void 0 ? void 0 : parent.parentOpts);
|
|
179
|
+
if (node.children && node.children.length > 0) {
|
|
180
|
+
// Create the parent job, it will be a job in status "waiting-children".
|
|
181
|
+
const parentId = jobId;
|
|
182
|
+
const queueKeysParent = new queue_keys_1.QueueKeys(node.prefix || this.opts.prefix);
|
|
183
|
+
const waitChildrenKey = queueKeysParent.toKey(node.queueName, 'waiting-children');
|
|
184
|
+
await job.addJob(multi, {
|
|
185
|
+
parentDependenciesKey: parent === null || parent === void 0 ? void 0 : parent.parentDependenciesKey,
|
|
186
|
+
waitChildrenKey,
|
|
187
|
+
parentKey,
|
|
188
|
+
});
|
|
189
|
+
const parentDependenciesKey = `${queueKeysParent.toKey(node.queueName, parentId)}:dependencies`;
|
|
190
|
+
const children = await this.addChildren({
|
|
191
|
+
multi,
|
|
192
|
+
nodes: node.children,
|
|
193
|
+
parent: {
|
|
194
|
+
parentOpts: {
|
|
195
|
+
id: parentId,
|
|
196
|
+
queue: queueKeysParent.getQueueQualifiedName(node.queueName),
|
|
197
|
+
},
|
|
198
|
+
parentDependenciesKey,
|
|
175
199
|
},
|
|
176
|
-
|
|
177
|
-
}
|
|
178
|
-
|
|
179
|
-
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
}
|
|
200
|
+
queuesOpts,
|
|
201
|
+
});
|
|
202
|
+
return { job, children };
|
|
203
|
+
}
|
|
204
|
+
else {
|
|
205
|
+
await job.addJob(multi, {
|
|
206
|
+
parentDependenciesKey: parent === null || parent === void 0 ? void 0 : parent.parentDependenciesKey,
|
|
207
|
+
parentKey,
|
|
208
|
+
});
|
|
209
|
+
return { job };
|
|
210
|
+
}
|
|
211
|
+
});
|
|
189
212
|
}
|
|
190
213
|
/**
|
|
191
214
|
* Adds nodes (jobs) of multiple flows to the queue. This method will recursively
|
|
@@ -198,7 +221,7 @@ class FlowProducer extends events_1.EventEmitter {
|
|
|
198
221
|
* @returns
|
|
199
222
|
*/
|
|
200
223
|
addNodes(multi, nodes) {
|
|
201
|
-
return nodes.map(node => {
|
|
224
|
+
return Promise.all(nodes.map(node => {
|
|
202
225
|
var _a;
|
|
203
226
|
const parentOpts = (_a = node === null || node === void 0 ? void 0 : node.opts) === null || _a === void 0 ? void 0 : _a.parent;
|
|
204
227
|
const parentKey = (0, utils_1.getParentKey)(parentOpts);
|
|
@@ -213,7 +236,7 @@ class FlowProducer extends events_1.EventEmitter {
|
|
|
213
236
|
parentDependenciesKey,
|
|
214
237
|
},
|
|
215
238
|
});
|
|
216
|
-
});
|
|
239
|
+
}));
|
|
217
240
|
}
|
|
218
241
|
async getNode(client, node) {
|
|
219
242
|
const queue = this.queueFromNode(node, new queue_keys_1.QueueKeys(node.prefix), node.prefix);
|
|
@@ -240,7 +263,7 @@ class FlowProducer extends events_1.EventEmitter {
|
|
|
240
263
|
}
|
|
241
264
|
}
|
|
242
265
|
addChildren({ multi, nodes, parent, queuesOpts }) {
|
|
243
|
-
return nodes.map(node => this.addNode({ multi, node, parent, queuesOpts }));
|
|
266
|
+
return Promise.all(nodes.map(node => this.addNode({ multi, node, parent, queuesOpts })));
|
|
244
267
|
}
|
|
245
268
|
getChildren(client, childrenKeys, depth, maxChildren) {
|
|
246
269
|
const getChild = (key) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow-producer.js","sourceRoot":"","sources":["../../../src/classes/flow-producer.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,+BAA0B;
|
|
1
|
+
{"version":3,"file":"flow-producer.js","sourceRoot":"","sources":["../../../src/classes/flow-producer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ const redis_connection_1 = require("./redis-connection");
|
|
|
7
7
|
const job_1 = require("./job");
|
|
8
8
|
const queue_keys_1 = require("./queue-keys");
|
|
9
9
|
const scripts_1 = require("./scripts");
|
|
10
|
-
const enums_1 = require("../enums");
|
|
11
10
|
/**
|
|
12
11
|
* @class QueueBase
|
|
13
12
|
* @extends EventEmitter
|
|
@@ -48,9 +47,6 @@ class QueueBase extends events_1.EventEmitter {
|
|
|
48
47
|
this.keys = queueKeys.getKeys(name);
|
|
49
48
|
this.toKey = (type) => queueKeys.toKey(name, type);
|
|
50
49
|
this.setScripts();
|
|
51
|
-
if (opts === null || opts === void 0 ? void 0 : opts.telemetry) {
|
|
52
|
-
this.tracer = opts.telemetry.tracer;
|
|
53
|
-
}
|
|
54
50
|
}
|
|
55
51
|
/**
|
|
56
52
|
* Returns a promise that resolves to a redis client. Normally used only by subclasses.
|
|
@@ -149,45 +145,8 @@ class QueueBase extends events_1.EventEmitter {
|
|
|
149
145
|
* @param srcPropagationMedatada -
|
|
150
146
|
* @returns
|
|
151
147
|
*/
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
return callback();
|
|
155
|
-
}
|
|
156
|
-
const currentContext = this.opts.telemetry.contextManager.active();
|
|
157
|
-
let parentContext;
|
|
158
|
-
if (srcPropagationMetadata) {
|
|
159
|
-
parentContext = this.opts.telemetry.contextManager.fromMetadata(currentContext, srcPropagationMetadata);
|
|
160
|
-
}
|
|
161
|
-
const spanName = `${operation} ${destination}`;
|
|
162
|
-
const span = this.tracer.startSpan(spanName, {
|
|
163
|
-
kind: spanKind,
|
|
164
|
-
}, parentContext);
|
|
165
|
-
try {
|
|
166
|
-
span.setAttributes({
|
|
167
|
-
[enums_1.TelemetryAttributes.QueueName]: this.name,
|
|
168
|
-
[enums_1.TelemetryAttributes.QueueOperation]: operation,
|
|
169
|
-
});
|
|
170
|
-
let messageContext;
|
|
171
|
-
let dstPropagationMetadata;
|
|
172
|
-
if (spanKind === enums_1.SpanKind.CONSUMER) {
|
|
173
|
-
messageContext = span.setSpanOnContext(parentContext);
|
|
174
|
-
}
|
|
175
|
-
else {
|
|
176
|
-
messageContext = span.setSpanOnContext(currentContext);
|
|
177
|
-
}
|
|
178
|
-
if (callback.length == 2) {
|
|
179
|
-
dstPropagationMetadata =
|
|
180
|
-
this.opts.telemetry.contextManager.getMetadata(messageContext);
|
|
181
|
-
}
|
|
182
|
-
return await this.opts.telemetry.contextManager.with(messageContext, () => callback(span, dstPropagationMetadata));
|
|
183
|
-
}
|
|
184
|
-
catch (err) {
|
|
185
|
-
span.recordException(err);
|
|
186
|
-
throw err;
|
|
187
|
-
}
|
|
188
|
-
finally {
|
|
189
|
-
span.end();
|
|
190
|
-
}
|
|
148
|
+
trace(spanKind, operation, destination, callback, srcPropagationMetadata) {
|
|
149
|
+
return (0, utils_1.trace)(this.opts.telemetry, spanKind, this.name, operation, destination, callback, srcPropagationMetadata);
|
|
191
150
|
}
|
|
192
151
|
}
|
|
193
152
|
exports.QueueBase = QueueBase;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-base.js","sourceRoot":"","sources":["../../../src/classes/queue-base.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAGtC,
|
|
1
|
+
{"version":3,"file":"queue-base.js","sourceRoot":"","sources":["../../../src/classes/queue-base.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,7 @@ var TelemetryAttributes;
|
|
|
33
33
|
TelemetryAttributes["JobProcessedTimestamp"] = "bullmq.job.processed.timestamp";
|
|
34
34
|
TelemetryAttributes["JobResult"] = "bullmq.job.result";
|
|
35
35
|
TelemetryAttributes["JobFailedReason"] = "bullmq.job.failed.reason";
|
|
36
|
+
TelemetryAttributes["FlowName"] = "bullmq.flow.name";
|
|
36
37
|
})(TelemetryAttributes = exports.TelemetryAttributes || (exports.TelemetryAttributes = {}));
|
|
37
38
|
var SpanKind;
|
|
38
39
|
(function (SpanKind) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry-attributes.js","sourceRoot":"","sources":["../../../src/enums/telemetry-attributes.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"telemetry-attributes.js","sourceRoot":"","sources":["../../../src/enums/telemetry-attributes.ts"],"names":[],"mappings":";;;AAAA,IAAY,mBAgCX;AAhCD,WAAY,mBAAmB;IAC7B,sDAA+B,CAAA;IAC/B,gEAAyC,CAAA;IACzC,0DAAmC,CAAA;IACnC,0DAAmC,CAAA;IACnC,kDAA2B,CAAA;IAC3B,8CAAuB,CAAA;IACvB,gDAAyB,CAAA;IACzB,gDAAyB,CAAA;IACzB,wEAAiD,CAAA;IACjD,wDAAiC,CAAA;IACjC,0DAAmC,CAAA;IACnC,mEAA4C,CAAA;IAC5C,wDAAiC,CAAA;IACjC,mEAA4C,CAAA;IAC5C,kDAA2B,CAAA;IAC3B,4DAAqC,CAAA;IACrC,4EAAqD,CAAA;IACrD,8DAAuC,CAAA;IACvC,wDAAiC,CAAA;IACjC,oDAA6B,CAAA;IAC7B,mEAA4C,CAAA;IAC5C,iFAA0D,CAAA;IAC1D,qEAA8C,CAAA;IAC9C,uEAAgD,CAAA;IAChD,qEAA8C,CAAA;IAC9C,qFAA8D,CAAA;IAC9D,6EAAsD,CAAA;IACtD,+EAAwD,CAAA;IACxD,sDAA+B,CAAA;IAC/B,mEAA4C,CAAA;IAC5C,oDAA6B,CAAA;AAC/B,CAAC,EAhCW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAgC9B;AAED,IAAY,QAMX;AAND,WAAY,QAAQ;IAClB,+CAAY,CAAA;IACZ,2CAAU,CAAA;IACV,2CAAU,CAAA;IACV,+CAAY,CAAA;IACZ,+CAAY,CAAA;AACd,CAAC,EANW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAMnB"}
|