@codefresh-io/eventbus 3.0.0-alpha.3 → 3.0.0

package/lib/Bus.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const domain       = require('node:domain');
 const EventEmitter = require('node:events');
 const timers       = require('node:timers/promises');
 const amqplib      = require('amqplib');
@@ -96,7 +97,7 @@ class Bus extends EventEmitter {
     async waitForConsumersToFinish() {
         while (this._consumersInProgressCount > 0) {
             this._logger.info(`Waiting for ${this._consumersInProgressCount} consumers in progress to finish...`);
-            await timers.setTimeout(100);
+            await timers.setTimeout(1000);
         }
     }
 
@@ -298,34 +299,43 @@ class Bus extends EventEmitter {
             })
             .then(async (ch) => {
                 const { consumerTag } = await ch.consume(queueName, async (msg) => {
-                    let finished = false;
-                    try {
-                        if (waitForAck && timeout) {
-                            setTimeout(() => {
-                                if (finished) return;
+                    //! This domain is used in target service by http-infra lib
+                    //! for correlationId enrichment and/or authEntity extration.
+                    //! Do not remove it until use of domains is removed from target service.
+                    const dom = domain.create();
+                    dom.on('error', (err) => {
+                        subscriberEmitter.emit('error', err);
+                    });
+                    dom.run(async () => {
+                        let finished = false;
+                        try {
+                            if (waitForAck && timeout) {
+                                setTimeout(() => {
+                                    if (finished) return;
+                                    finished = true;
+                                    subscriberEmitter.emit('error', new Error('Handler timedout'));
+                                    if (ackOnTimeout) {
+                                        ch.ack(msg);
+                                    } else {
+                                        ch.nack(msg);
+                                    }
+                                }, timeout);
+                            } else {
+                                ch.ack(msg);
+                            }
+                            const content = this._deserialize(msg.content.toString());
+                            this._consumersInProgressCount += 1;
+                            await handler(content).finally(() => this._consumersInProgressCount -= 1);
+                        } catch (error) {
+                            subscriberEmitter.emit('error', error);
+                            if (!finished && waitForAck) {
                                 finished = true;
-                                subscriberEmitter.emit('error', new Error('Handler timedout'));
-                                if (ackOnTimeout) {
-                                    ch.ack(msg);
-                                } else {
-                                    ch.nack(msg);
-                                }
-                            }, timeout);
-                        } else {
-                            ch.ack(msg);
-                        }
-                        const content = this._deserialize(msg.content.toString());
-                        this._consumersInProgressCount += 1;
-                        await handler(content).finally(() => this._consumersInProgressCount -= 1);
-                    } catch (error) {
-                        subscriberEmitter.emit('error', error);
-                        if (!finished && waitForAck) {
-                            finished = true;
-                            ch.nack(msg);
-                        } else {
-                            finished = true;
+                                ch.nack(msg);
+                            } else {
+                                finished = true;
+                            }
                         }
-                    }
+                    });
                 });
                 const consumerTags = this.consumerTagsByChannel.get(ch) ?? [];
                 consumerTags.push({ queueName, consumerTag });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefresh-io/eventbus",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0",
   "description": "",
   "main": "index.js",
   "files": [