@diia-inhouse/diia-queue 7.3.0 → 13.2.0

package/dist/services/eventMessageHandler.js

@@ -1,21 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventMessageHandler = void 0;
+const node_crypto_1 = require("node:crypto");
 const api_1 = require("@opentelemetry/api");
-const uuid_1 = require("uuid");
 const errors_1 = require("@diia-inhouse/errors");
 const utils_1 = require("@diia-inhouse/utils");
-const metrics_1 = require("../metrics");
+const interfaces_1 = require("../interfaces");
 class EventMessageHandler {
     eventMessageValidator;
-    externalChannel;
-    pubsub;
     asyncLocalStorage;
     logger;
-    constructor(eventMessageValidator, externalChannel, pubsub, asyncLocalStorage, logger) {
+    noRequeueNackOptions = new interfaces_1.NackOptions(false, false);
+    constructor(eventMessageValidator, asyncLocalStorage, logger) {
         this.eventMessageValidator = eventMessageValidator;
-        this.externalChannel = externalChannel;
-        this.pubsub = pubsub;
         this.asyncLocalStorage = asyncLocalStorage;
         this.logger = logger;
     }
@@ -27,110 +24,90 @@ class EventMessageHandler {
         await this.eventListenerMessageHandler(listener, message);
     }
     async eventListenerMessageHandler(listener, message) {
-        const payloadValidationSchema = listener?.validationRules || {};
-        const { done, data, properties } = message;
-        const { event, payload, meta } = data;
-        const activeSpanTraceId = api_1.trace.getActiveSpan()?.spanContext().traceId;
-        const traceId = (0, api_1.isValidTraceId)(activeSpanTraceId) ? activeSpanTraceId : properties.headers?.traceId || (0, uuid_1.v4)();
-        const context = {
-            logData: {
-                traceId,
-                serviceCode: this.getServiceCode(listener, payload),
-            },
-        };
+        const { done, properties, data: { event, payload }, } = message;
+        const serviceCode = this.getServiceCode(listener, payload);
+        const context = this.prepareAsyncContext(properties, serviceCode);
         await this.asyncLocalStorage.run(context, async () => {
-            this.logger.io(`Handling event [${event}] with payload`, { payload });
+            this.logger.info(`Handling event [${event}] with payload`, { payload });
             if (!listener) {
-                this.logger.info(`No listener for the event [${event}]`);
+                this.logger.info(`Not found listener for the event [${event}]`);
                 return done();
             }
-            if ('isSync' in listener && listener.isSync) {
-                return await this.syncMessageHandler(listener, message, payloadValidationSchema);
-            }
-            try {
-                this.eventMessageValidator.validateEventMessage(data, payloadValidationSchema);
-                const resp = await listener.handler?.(payload, meta);
-                return this.performDone(message, resp, false);
-            }
-            catch (err) {
-                if (err instanceof errors_1.ValidationError && 'validationErrorHandler' in listener && payload?.uuid) {
-                    await listener.validationErrorHandler?.(err, payload.uuid).catch((err_) => err_);
-                }
-                this.logger.error(`Failed to handle event ${event}`, { err });
-                metrics_1.totalMessageHandlerErrorsMetrics.increment({ event });
-                // TODO(BACK-0): message.reject();
-                return this.performDone(message, err, true);
-            }
+            return await this.handleMessage(listener, message);
         });
     }
-    async syncMessageHandler(listener, message, payloadValidationSchema) {
-        const { done, data } = message;
+    prepareAsyncContext(properties, serviceCode) {
+        const activeSpanTraceId = api_1.trace.getActiveSpan()?.spanContext().traceId ?? '';
+        const traceId = (0, api_1.isValidTraceId)(activeSpanTraceId) ? activeSpanTraceId : properties.headers?.traceId || (0, node_crypto_1.randomUUID)();
+        return {
+            logData: {
+                traceId,
+                serviceCode,
+            },
+        };
+    }
+    async handleMessage(listener, message) {
+        const { data, done, reject, properties: { replyTo, correlationId }, } = message;
         const { event, payload, meta } = data;
-        if (!payload?.uuid) {
-            this.logger.error('Missing uuid in the message payload');
-            return done();
-        }
-        const channel = this.externalChannel.getChannel(event, payload.uuid);
-        const isChannelActive = await this.externalChannel.isChannelActive(channel);
-        if (!isChannelActive && listener.handler) {
-            try {
-                this.eventMessageValidator.validateSyncedEventMessage(data, payloadValidationSchema);
-            }
-            catch (err) {
-                this.logger.error(`Message in a wrong format was received from a synced event: ${event}`, { err });
-                return done();
-            }
-            if (payload.error) {
-                this.logger.error(`Error received for a synced event: ${event}`, payload.error);
-                return done();
-            }
-            try {
-                await listener.handler(payload, meta);
-            }
-            catch (err) {
-                this.logger.error(`Failed to handle the synced event [${event}] with payload`, { err });
+        const useDirectReply = replyTo && correlationId;
+        let hasErrorOccurred = false;
+        let result;
+        const { isValid, error } = await this.validateData(data, listener);
+        if (!isValid) {
+            if (useDirectReply && error) {
+                return this.directReplyDone(message, error, true);
             }
+            return reject(this.noRequeueNackOptions);
         }
-        else {
-            await this.pubsub.publish(channel, data);
+        try {
+            result = await listener.handler?.(payload, meta);
+        }
+        catch (err) {
+            result = err;
+            hasErrorOccurred = true;
+            this.logger.error(`Failed to handle event ${event}`, { err });
+        }
+        if (useDirectReply) {
+            return this.directReplyDone(message, result, hasErrorOccurred);
+        }
+        if (result instanceof interfaces_1.NackOptions) {
+            return reject(result);
+        }
+        else if (hasErrorOccurred && listener.nackOptions) {
+            return reject(listener.nackOptions);
         }
         return done();
     }
-    performDone(receivedMessage, data, error) {
-        const { done, data: { event, payload }, properties: { replyTo, correlationId }, } = receivedMessage;
-        const useDirectReply = replyTo && correlationId;
-        if (!useDirectReply) {
-            done();
-            return;
+    async validateData(data, listener) {
+        const { payload } = data;
+        const { validationRules } = listener;
+        try {
+            this.eventMessageValidator.validateEventMessage(data, validationRules);
+            return { isValid: true };
         }
-        if (error) {
-            return utils_1.utils.handleError(data, (err) => {
-                done({
-                    event,
-                    meta: {
-                        date: new Date(),
-                    },
-                    payload: {
-                        uuid: payload.uuid,
-                        error: {
-                            message: err.message,
-                            http_code: err.getCode(),
-                            data: err.getData(),
-                        },
-                    },
-                });
-            });
+        catch (err) {
+            this.logger.error('Failed to validate event message', { err });
+            if (err instanceof errors_1.ValidationError && 'validationErrorHandler' in listener && payload?.uuid) {
+                const eventBusListener = listener;
+                await eventBusListener.validationErrorHandler?.(err, payload.uuid).catch((err_) => err_);
+            }
+            return err instanceof errors_1.ValidationError ? { isValid: false, error: err } : { isValid: false };
         }
-        done({
+    }
+    directReplyDone(receivedMessage, response, error) {
+        const { done, data: { event, payload: { uuid }, }, } = receivedMessage;
+        const data = error ? utils_1.utils.handleError(response, (err) => err) : response;
+        const messageData = {
             event,
             meta: {
                 date: new Date(),
             },
             payload: {
-                uuid: payload.uuid,
-                response: data,
+                uuid,
+                ...(data instanceof errors_1.ApiError ? { error: this.prepareQueueMessageError(data) } : { response: data }),
             },
-        });
+        };
+        done(messageData);
     }
     getServiceCode(listener, payload) {
         try {
@@ -140,6 +117,13 @@ class EventMessageHandler {
             this.logger.error('Failed to get event listener service code', { err, listener });
         }
     }
+    prepareQueueMessageError(err) {
+        return {
+            data: err.getData(),
+            message: err.message,
+            http_code: err.getCode(),
+        };
+    }
 }
 exports.EventMessageHandler = EventMessageHandler;
 //# sourceMappingURL=eventMessageHandler.js.map

package/dist/services/eventMessageHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"eventMessageHandler.js","sourceRoot":"","sources":["../../src/services/eventMessageHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eventMessageHandler.js","sourceRoot":"","sources":["../../src/services/eventMessageHandler.ts"],"names":[],"mappings":"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"}

package/dist/services/eventMessageValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"eventMessageValidator.js","sourceRoot":"","sources":["../../src/services/eventMessageValidator.ts"],"names":[],"mappings":";;;AAIA,MAAa,qBAAqB;IAMD;IALpB,oBAAoB,GAAqB;QAC9C,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;QACrC,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC9C,CAAA;IAED,YAA6B,SAAuB;QAAvB,cAAS,GAAT,SAAS,CAAc;IAAG,CAAC;IAExD,oBAAoB,CAAC,IAAsB,EAAE,0BAA4C,EAAE;QACvF,MAAM,gBAAgB,GAAqB;YACvC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,uBAAuB,EAAE;YAC3D,IAAI,EAAE;gBACF,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,IAAI,CAAC,oBAAoB;aACnC;SACJ,CAAA;QAED,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAA;IACnD,CAAC;IAED,0BAA0B,CAAC,IAAsB,EAAE,wBAA2C;QAC1F,MAAM,UAAU,GAAqB;YACjC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;YACtB,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE;oBACH,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAC7B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC3C,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;iBAC3C;aACJ;SACJ,CAAA;QACD,IAAI,wBAAwB,EAAE;YAC1B,UAAU,CAAC,QAAQ,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAA;SAC5F;QAED,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;IAC/C,CAAC;CACJ;AAxCD,sDAwCC"}
+{"version":3,"file":"eventMessageValidator.js","sourceRoot":"","sources":["../../src/services/eventMessageValidator.ts"],"names":[],"mappings":";;;AAIA,MAAa,qBAAqB;IAMD;IALpB,oBAAoB,GAAqB;QAC9C,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;QACrC,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC9C,CAAA;IAED,YAA6B,SAAuB;QAAvB,cAAS,GAAT,SAAS,CAAc;IAAG,CAAC;IAExD,oBAAoB,CAAC,IAAsB,EAAE,0BAA4C,EAAE;QACvF,MAAM,gBAAgB,GAAqB;YACvC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,uBAAuB,EAAE;YAC3D,IAAI,EAAE;gBACF,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,IAAI,CAAC,oBAAoB;aACnC;SACJ,CAAA;QAED,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAA;IACnD,CAAC;IAED,0BAA0B,CAAC,IAAsB,EAAE,wBAA2C;QAC1F,MAAM,UAAU,GAAqB;YACjC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;YACtB,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE;oBACH,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAC7B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC3C,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;iBAC3C;aACJ;SACJ,CAAA;QACD,IAAI,wBAAwB,EAAE,CAAC;YAC3B,UAAU,CAAC,QAAQ,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAA;QAC7F,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;IAC/C,CAAC;CACJ;AAxCD,sDAwCC"}

package/dist/services/externalCommunicator.js

@@ -1,134 +1,41 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalCommunicator = void 0;
-const uuid_1 = require("uuid");
+const node_crypto_1 = require("node:crypto");
 const errors_1 = require("@diia-inhouse/errors");
-const Utils = __importStar(require("../utils"));
 class ExternalCommunicator {
-    externalChannel;
     externalEventBus;
-    externalEventListenerList;
     eventMessageValidator;
     logger;
-    pubsub;
-    timeout;
-    eventListeners;
-    constructor(externalChannel, externalEventBus, externalEventListenerList, eventMessageValidator, logger, pubsub, timeout = 10000) {
-        this.externalChannel = externalChannel;
+    constructor(externalEventBus, eventMessageValidator, logger) {
         this.externalEventBus = externalEventBus;
-        this.externalEventListenerList = externalEventListenerList;
         this.eventMessageValidator = eventMessageValidator;
         this.logger = logger;
-        this.pubsub = pubsub;
-        this.timeout = timeout;
-    }
-    onRegistrationsFinished() {
-        this.eventListeners = Utils.collectEventBusListeners(this.externalEventListenerList);
     }
-    async receiveDirect(event, request = {}, ops = {}) {
-        const requestUuid = (0, uuid_1.v4)();
+    async receiveDirect(event, request = {}, ops) {
+        const { exchangeName, validationRules, ignoreCache, retry, timeout, registryApiVersion, requestUuid = (0, node_crypto_1.randomUUID)() } = ops;
         const payload = { uuid: requestUuid, request };
-        const { topic, validationRules, ignoreCache, retry, timeout } = ops;
-        const options = { ignoreCache, retry, timeout };
-        const externalResponse = await this.externalEventBus.publishDirect(event, payload, topic, options);
+        const options = { ignoreCache, retry, timeout, exchangeName, registryApiVersion };
+        const externalResponse = await this.externalEventBus.publishDirect(event, payload, options);
+        this.logger.debug('External direct response', externalResponse);
         if (validationRules) {
             try {
                 this.eventMessageValidator.validateSyncedEventMessage(externalResponse, validationRules);
             }
             catch (err) {
                 const errorMsg = 'Message in a wrong format was received from a direct channel';
-                this.logger.fatal(errorMsg, { err, externalResponse });
+                this.logger.error(errorMsg, { err, externalResponse });
                 throw new Error(errorMsg);
             }
         }
         const { error, response } = externalResponse.payload;
         if (error) {
-            this.logger.fatal(`Error received by an external event ${event}: ${error.http_code} ${error.message}`, request);
-            throw new errors_1.ExternalCommunicatorError(error.message, error.http_code, { event, httpCode: error.http_code, ...error.data });
+            this.logger.error(`Error received by an external event ${event}: ${error.http_code} ${error.message}`, { requestUuid });
+            const errMsg = error.message || 'unknown error';
+            throw new errors_1.ExternalCommunicatorError(errMsg, error.http_code, { event, httpCode: error.http_code, ...error.data });
         }
         return response;
     }
-    /**
-     * @deprecated use receiveDirect in case provider supports direct communcation
-     */
-    async receive(event, request = {}, ops = {}) {
-        const timeout = ops.timeout || this.timeout;
-        const eventListener = this.eventListeners[event];
-        if (!eventListener) {
-            throw new Error(`Listener not found by the provided event: ${event}`);
-        }
-        if (!eventListener.isSync) {
-            throw new Error(`Listener is not synchronous for the provided event: ${event}`);
-        }
-        const requestUuid = ops.requestUuid || (0, uuid_1.v4)();
-        const payload = { uuid: requestUuid, request };
-        const { ignoreCache, retry, async } = ops;
-        const options = { ignoreCache, retry };
-        if (async) {
-            const success = await this.externalEventBus.publish(event, payload, options);
-            if (!success) {
-                throw new Error(`Failed to publish async external event ${event}`);
-            }
-            return;
-        }
-        const channel = this.externalChannel.getChannel(event, requestUuid);
-        const promise = new Promise((resolve, reject) => {
-            const timer = setTimeout(async () => {
-                await this.pubsub.unsubscribe(channel);
-                return reject(new Error(`External communication timeout error for the channel ${channel}`));
-            }, timeout);
-            this.pubsub
-                .onceChannelMessage(channel, async (message) => {
-                clearTimeout(timer);
-                const data = JSON.parse(message);
-                try {
-                    this.eventMessageValidator.validateSyncedEventMessage(data, eventListener.validationRules);
-                }
-                catch (err) {
-                    const errorMsg = 'Message in a wrong format was received from a redis channel';
-                    this.logger.fatal(errorMsg, { err, data });
-                    return reject(new Error(errorMsg));
-                }
-                const { error, response } = data.payload;
-                if (error) {
-                    this.logger.fatal(`Error received by an external event ${event}: ${error.http_code} ${error.message}`, request);
-                    return reject(new errors_1.ExternalCommunicatorError(error.message, error.http_code, { event, ...error.data }));
-                }
-                return resolve(response);
-            })
-                .catch(reject);
-        });
-        await this.externalChannel.saveActiveChannel(channel, timeout);
-        const success = await this.externalEventBus.publish(event, payload);
-        if (!success) {
-            await this.pubsub.unsubscribe(channel);
-            throw new Error(`Failed to publish external event ${event}`);
-        }
-        return await promise;
-    }
 }
 exports.ExternalCommunicator = ExternalCommunicator;
 //# sourceMappingURL=externalCommunicator.js.map

package/dist/services/externalCommunicator.js.map

@@ -1 +1 @@
-{"version":3,"file":"externalCommunicator.js","sourceRoot":"","sources":["../../src/services/externalCommunicator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"externalCommunicator.js","sourceRoot":"","sources":["../../src/services/externalCommunicator.ts"],"names":[],"mappings":";;;AAAA,6CAAwC;AAGxC,iDAAgE;AAMhE,MAAa,oBAAoB;IAER;IACA;IACA;IAHrB,YACqB,gBAAuC,EACvC,qBAA4C,EAC5C,MAAc;QAFd,qBAAgB,GAAhB,gBAAgB,CAAuB;QACvC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,WAAM,GAAN,MAAM,CAAQ;IAChC,CAAC;IAEJ,KAAK,CAAC,aAAa,CAAI,KAAa,EAAE,UAAmB,EAAE,EAAE,GAAqB;QAC9E,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,WAAW,GAAG,IAAA,wBAAU,GAAE,EAAE,GAAG,GAAG,CAAA;QAE1H,MAAM,OAAO,GAAmB,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,CAAA;QAE9D,MAAM,OAAO,GAAyB,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,CAAA;QACvG,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAC9D,KAAK,EACL,OAAO,EACP,OAAO,CACV,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,gBAAgB,CAAC,CAAA;QAC/D,IAAI,eAAe,EAAE,CAAC;YAClB,IAAI,CAAC;gBACD,IAAI,CAAC,qBAAqB,CAAC,0BAA0B,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAA;YAC5F,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,QAAQ,GAAG,8DAA8D,CAAA;gBAE/E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE,CAAC,CAAA;gBACtD,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAA;YAC7B,CAAC;QACL,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,gBAAgB,CAAC,OAAO,CAAA;QAEpD,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,KAAK,KAAK,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,CAAA;YAEvH,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,IAAI,eAAe,CAAA;YAE/C,MAAM,IAAI,kCAAyB,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;QACrH,CAAC;QAED,OAAO,QAAQ,CAAA;IACnB,CAAC;CACJ;AA3CD,oDA2CC"}

package/dist/services/externalEventBus.js

@@ -1,70 +1,162 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalEventBus = void 0;
-const Utils = __importStar(require("../utils"));
-class ExternalEventBus {
-    queueProvider;
-    externalEventListenerList;
-    eventMessageHandler;
+const errors_1 = require("@diia-inhouse/errors");
+const types_1 = require("@diia-inhouse/types");
+const constants_1 = __importDefault(require("../constants"));
+const interfaces_1 = require("../interfaces");
+const communicator_1 = __importDefault(require("./communicator"));
+const eventCommunicator_1 = require("./eventCommunicator");
+class ExternalEventBus extends communicator_1.default {
     envService;
-    logger;
-    constructor(queueProvider, externalEventListenerList, eventMessageHandler, envService, logger) {
-        this.queueProvider = queueProvider;
-        this.externalEventListenerList = externalEventListenerList;
-        this.eventMessageHandler = eventMessageHandler;
+    eventCommunicator;
+    publishEventsSet;
+    subscribeEventsSet;
+    exchangePrefixName = 'TopicExternal';
+    eventQueueMap = new Map();
+    constructor(logger, systemServiceName, envService, queueProvider, externalEventListenerList, eventMessageHandler, hostName) {
+        super(logger, queueProvider, hostName, systemServiceName);
         this.envService = envService;
-        this.logger = logger;
+        const { rabbit: { custom }, service: { publish = [], subscribe = [] }, } = this.queueProvider.getConfig();
+        if (custom?.responseRoutingKeyPrefix && !this.envService.isLocal() && !this.envService.isTest()) {
+            throw new Error('Response routing key could be used only on local env');
+        }
+        this.publishEventsSet = new Set(publish);
+        this.subscribeEventsSet = new Set(subscribe);
+        this.eventQueueMap = this.buildEventQueueMap();
+        this.eventCommunicator = new eventCommunicator_1.EventCommunicator(logger, queueProvider, eventMessageHandler, externalEventListenerList);
     }
-    async onInit() {
-        const externalConfig = this.queueProvider.getConfig();
-        try {
-            if (externalConfig.custom?.responseRoutingKeyPrefix && !this.envService.isLocal() && !this.envService.isTest()) {
-                throw new Error('Response routing key could be used only on local env');
-            }
-            const eventListeners = Utils.collectEventBusListeners(this.externalEventListenerList);
-            await this.subscribe(this.eventMessageHandler.eventListenersMessageHandler.bind(this.eventMessageHandler, eventListeners), {
-                listener: externalConfig.listenerOptions,
-            });
-            for (const listener of this.externalEventListenerList) {
-                this.logger.info(`External event listener [${listener.event}] initialized successfully`);
-            }
+    static BuildRequestRoutingKey(eventName) {
+        return `queue.${constants_1.default.PROJECT_NAME}.${eventName}.req`;
+    }
+    static BuildResponseRoutingKey(eventName, portalEvents = []) {
+        const queuePrefix = ExternalEventBus.prepareQueuePrefix(eventName, portalEvents);
+        return `${queuePrefix}.${eventName}.res`;
+    }
+    static prepareQueuePrefix(event, portalEvents = []) {
+        if (portalEvents.includes(event)) {
+            return `queue.${constants_1.default.PORTAL_NAME}`;
         }
-        catch (err) {
-            this.logger.error('Failed to initialize external event bus', { err });
-            throw err;
+        return `queue.${constants_1.default.PROJECT_NAME}`;
+    }
+    async publish(eventName, payload, options) {
+        const message = this.getPublishMessage(eventName, payload, options);
+        const routingKey = this.getPublishRoutingKey(eventName);
+        return await this.publishEventToExchange(eventName, message, { ...options, routingKey });
+    }
+    async publishDirect(eventName, payload, options = {}) {
+        const { exchangeName: customExchangeName } = options;
+        const exchangeName = customExchangeName ?? this.eventNameToExchangeNameMap.get(eventName);
+        if (!exchangeName) {
+            throw new errors_1.ExternalCommunicatorError(`Exchange name for event ${eventName} is not defined`, types_1.HttpStatusCode.INTERNAL_SERVER_ERROR, { event: eventName, customExchangeName }, errors_1.ErrorType.Unoperated);
         }
+        const routingKey = ExternalEventBus.BuildRequestRoutingKey(eventName);
+        const { data } = this.getPublishMessage(eventName, payload, options);
+        return await this.queueProvider.publishExternalDirect(data, exchangeName, routingKey, options);
+    }
+    getUnicastListeners() {
+        return this.eventCommunicator.getUnicastListeners();
+    }
+    getExchangeNameWithSuffix(topic) {
+        return `${this.exchangePrefixName}${topic}`;
     }
-    async subscribe(messageHandler, options) {
-        return await this.queueProvider.subscribeExternal(messageHandler, options);
+    getProducerExchangesOptions() {
+        const [exchangesOptions] = this.defineQueuesAndExchangesOptionsBasedOnGlobalConfig();
+        return exchangesOptions;
     }
-    async publish(eventName, message, options) {
-        return await this.queueProvider.publishExternal(eventName, message, options);
+    getMulticastListeners() {
+        const [exchangesOptions, queuesOptions] = this.defineQueuesAndExchangesOptionsBasedOnGlobalConfig();
+        return this.eventCommunicator.getMulticastListeners(queuesOptions, exchangesOptions, this.eventQueueMap);
     }
-    async publishDirect(eventName, message, topic, options) {
-        return await this.queueProvider.publishExternalDirect(eventName, message, topic, options);
+    getPublishMessage(eventName, message, options) {
+        const { rabbit: { custom: { responseRoutingKeyPrefix } = {} }, } = this.queueProvider.getConfig();
+        const responseRoutingKey = this.buildResponseQueueName(eventName, responseRoutingKeyPrefix);
+        const partialMeta = {
+            ignoreCache: options?.ignoreCache,
+            registryApiVersion: options?.registryApiVersion,
+            ...(this.publishEventsSet.has(eventName) ? { responseRoutingKey } : {}),
+        };
+        const data = this.getPublishQueueMessageData(eventName, message, partialMeta);
+        return new interfaces_1.Message(data);
+    }
+    getPublishRoutingKey(eventName) {
+        if (this.publishEventsSet.has(eventName)) {
+            return ExternalEventBus.BuildRequestRoutingKey(eventName);
+        }
+        else if (this.subscribeEventsSet.has(eventName)) {
+            const { portalEvents } = this.queueProvider.getConfig();
+            return ExternalEventBus.BuildResponseRoutingKey(eventName, portalEvents);
+        }
+        return '';
+    }
+    defineQueuesAndExchangesOptionsBasedOnGlobalConfig() {
+        const { rabbit: { listenerOptions, declareOptions: { assertQueues, assertExchanges, queuesOptions: overriddenQueuesOptions = {} } = {}, }, } = this.queueProvider.getConfig();
+        const queuesOptions = [];
+        const exchangesMap = new Map();
+        for (const [eventName, queueName] of this.eventQueueMap.entries()) {
+            const exchangeName = this.eventNameToExchangeNameMap.get(eventName);
+            if (!exchangeName) {
+                this.logger.error(`Can't find external topic name for event [${eventName}]`);
+                return [[], []];
+            }
+            const queueOptions = {
+                name: queueName,
+                declare: assertQueues,
+                type: interfaces_1.QueueTypes.Quorum,
+                options: listenerOptions?.queueOptions,
+                bindTo: [
+                    {
+                        bind: assertQueues,
+                        routingKey: queueName,
+                        exchangeName: exchangeName,
+                    },
+                ],
+                consumerOptions: this.optionsBuilder.defineConsumerOptionsBasedOnGlobalConfig(),
+                ...overriddenQueuesOptions,
+            };
+            queuesOptions.push(queueOptions);
+            const exchangeOptions = {
+                name: exchangeName,
+                type: interfaces_1.ExchangeType.Topic,
+                declare: assertExchanges,
+            };
+            exchangesMap.set(exchangeName, exchangeOptions);
+        }
+        const exchangesOptions = [...exchangesMap.values()];
+        return [exchangesOptions, queuesOptions];
+    }
+    buildEventQueueMap() {
+        const eventQueueMap = new Map();
+        const { service: { publish = [], subscribe = [] }, rabbit: { custom: { responseRoutingKeyPrefix } = {} }, } = this.queueProvider.getConfig();
+        if (publish.length === 0 && subscribe.length === 0) {
+            this.logger.info('No one external events to listen');
+            return eventQueueMap;
+        }
+        for (const responseEvent of publish) {
+            eventQueueMap.set(responseEvent, this.buildResponseQueueName(responseEvent, responseRoutingKeyPrefix));
+        }
+        for (const requestEvent of subscribe) {
+            eventQueueMap.set(requestEvent, this.buildRequestQueueName(requestEvent, responseRoutingKeyPrefix));
+        }
+        return eventQueueMap;
+    }
+    buildResponseQueueName(eventName, prefix) {
+        const result = `queue.${constants_1.default.PROJECT_NAME}.${eventName}.res`;
+        if (prefix) {
+            return `${prefix}.${result}`;
+        }
+        return result;
+    }
+    buildRequestQueueName(eventName, prefix) {
+        const { portalEvents } = this.queueProvider.getConfig();
+        const result = `${ExternalEventBus.prepareQueuePrefix(eventName, portalEvents)}.${eventName}.req`;
+        if (prefix) {
+            return `${prefix}.${result}`;
+        }
+        return result;
     }
 }
 exports.ExternalEventBus = ExternalEventBus;