@codefresh-io/eventbus 3.0.0-alpha.2 → 3.0.0-alpha.4
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/Bus.js +34 -27
- package/package.json +1 -1
package/lib/Bus.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
const domain = require('node:domain');
|
|
3
4
|
const EventEmitter = require('node:events');
|
|
4
5
|
const timers = require('node:timers/promises');
|
|
5
6
|
const amqplib = require('amqplib');
|
|
@@ -96,7 +97,7 @@ class Bus extends EventEmitter {
|
|
|
96
97
|
async waitForConsumersToFinish() {
|
|
97
98
|
while (this._consumersInProgressCount > 0) {
|
|
98
99
|
this._logger.info(`Waiting for ${this._consumersInProgressCount} consumers in progress to finish...`);
|
|
99
|
-
await timers.setTimeout(
|
|
100
|
+
await timers.setTimeout(100);
|
|
100
101
|
}
|
|
101
102
|
}
|
|
102
103
|
|
|
@@ -298,34 +299,40 @@ class Bus extends EventEmitter {
|
|
|
298
299
|
})
|
|
299
300
|
.then(async (ch) => {
|
|
300
301
|
const { consumerTag } = await ch.consume(queueName, async (msg) => {
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
302
|
+
const dom = domain.create();
|
|
303
|
+
dom.on('error', (err) => {
|
|
304
|
+
subscriberEmitter.emit('error', err);
|
|
305
|
+
});
|
|
306
|
+
dom.run(async () => {
|
|
307
|
+
let finished = false;
|
|
308
|
+
try {
|
|
309
|
+
if (waitForAck && timeout) {
|
|
310
|
+
setTimeout(() => {
|
|
311
|
+
if (finished) return;
|
|
312
|
+
finished = true;
|
|
313
|
+
subscriberEmitter.emit('error', new Error('Handler timedout'));
|
|
314
|
+
if (ackOnTimeout) {
|
|
315
|
+
ch.ack(msg);
|
|
316
|
+
} else {
|
|
317
|
+
ch.nack(msg);
|
|
318
|
+
}
|
|
319
|
+
}, timeout);
|
|
320
|
+
} else {
|
|
321
|
+
ch.ack(msg);
|
|
322
|
+
}
|
|
323
|
+
const content = this._deserialize(msg.content.toString());
|
|
324
|
+
this._consumersInProgressCount += 1;
|
|
325
|
+
await handler(content).finally(() => this._consumersInProgressCount -= 1);
|
|
326
|
+
} catch (error) {
|
|
327
|
+
subscriberEmitter.emit('error', error);
|
|
328
|
+
if (!finished && waitForAck) {
|
|
306
329
|
finished = true;
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
ch.nack(msg);
|
|
312
|
-
}
|
|
313
|
-
}, timeout);
|
|
314
|
-
} else {
|
|
315
|
-
ch.ack(msg);
|
|
316
|
-
}
|
|
317
|
-
const content = this._deserialize(msg.content.toString());
|
|
318
|
-
this._consumersInProgressCount += 1;
|
|
319
|
-
await handler(content).finally(() => this._consumersInProgressCount -= 1);
|
|
320
|
-
} catch (error) {
|
|
321
|
-
subscriberEmitter.emit('error', error);
|
|
322
|
-
if (!finished && waitForAck) {
|
|
323
|
-
finished = true;
|
|
324
|
-
ch.nack(msg);
|
|
325
|
-
} else {
|
|
326
|
-
finished = true;
|
|
330
|
+
ch.nack(msg);
|
|
331
|
+
} else {
|
|
332
|
+
finished = true;
|
|
333
|
+
}
|
|
327
334
|
}
|
|
328
|
-
}
|
|
335
|
+
});
|
|
329
336
|
});
|
|
330
337
|
const consumerTags = this.consumerTagsByChannel.get(ch) ?? [];
|
|
331
338
|
consumerTags.push({ queueName, consumerTag });
|