@diia-inhouse/diia-queue 14.2.38 → 14.2.40

package/dist/providers/rabbitmq/amqpListener.js

@@ -144,9 +144,7 @@ var AmqpListener = class {
 			}
 			const response = this.prepareResponse(message, messageData, channel);
 			try {
-				const result = await callback(response);
-				this.rabbitMQMetrics.collectResponseTotalMetric(startTime, eventName, source, this.systemServiceName);
-				return result;
+				return await callback(response);
 			} catch (callbackErr) {
 				const errorType = callbackErr instanceof ApiError ? callbackErr.getType() : ErrorType.Unoperated;
 				this.rabbitMQMetrics.collectResponseTotalMetric(startTime, eventName, source, this.systemServiceName, errorType);

package/dist/providers/rabbitmq/index.d.ts

@@ -9,9 +9,9 @@ import { QueueContext } from "../../interfaces/queueContext.js";
 import { AmqpAsserter } from "./amqpAsserter.js";
 import { AmqpListener } from "./amqpListener.js";
 import { AmqpPublisher } from "./amqpPublisher.js";
+import { MetricsService } from "@diia-inhouse/diia-metrics";
 import { Logger } from "@diia-inhouse/types";
 import { EventEmitter } from "node:events";
-import { MetricsService } from "@diia-inhouse/diia-metrics";
 import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/providers/rabbitmq/index.d.ts

package/dist/providers/rabbitmq/index.js

@@ -8,7 +8,7 @@ import { AmqpAsserter } from "./amqpAsserter.js";
 import { AmqpConnection } from "./amqpConnection.js";
 import { AmqpListener } from "./amqpListener.js";
 import { AmqpPublisher } from "./amqpPublisher.js";
-import _ from "lodash";
+import lodash from "lodash";
 import { randomUUID } from "node:crypto";
 import { EventEmitter } from "node:events";
 //#region src/providers/rabbitmq/index.ts
@@ -112,7 +112,7 @@ var RabbitMQProvider = class extends EventEmitter {
 		};
 	}
 	async makeAMQPConnection(client) {
-		return new AmqpConnection(this.rabbitmqConfig.connection, this.logger, this.rabbitmqConfig.reconnectOptions, _.merge({ clientProperties: { connectionClientType: client } }, this.rabbitmqConfig.socketOptions));
+		return new AmqpConnection(this.rabbitmqConfig.connection, this.logger, this.rabbitmqConfig.reconnectOptions, lodash.merge({ clientProperties: { connectionClientType: client } }, this.rabbitmqConfig.socketOptions));
 	}
 	async makeAMQPListener(queuesOptions) {
 		return new AmqpListener(await this.getConnection("listener"), this.logger, this.rabbitMQMetricsService, queuesOptions, this.systemServiceName);

package/dist/services/eventCommunicator.js

@@ -1,5 +1,5 @@
 import { collectEventBusListeners } from "../utils.js";
-import _ from "lodash";
+import lodash from "lodash";
 //#region src/services/eventCommunicator.ts
 var EventCommunicator = class {
 	logger;
@@ -33,8 +33,8 @@ var EventCommunicator = class {
 	getUnicastListeners() {
 		const listeners = [];
 		const { queuesOptions, exchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
-		const queuesOptionsMap = _.keyBy(queuesOptions, "name");
-		const exchangesOptionsMap = _.keyBy(exchangesOptions, "name");
+		const queuesOptionsMap = lodash.keyBy(queuesOptions, "name");
+		const exchangesOptionsMap = lodash.keyBy(exchangesOptions, "name");
 		for (const eventListener of this.listenerList) {
 			const { queueNames = [] } = eventListener;
 			for (const queueName of queueNames) {

package/dist/services/eventMessageHandler.d.ts

@@ -2,6 +2,7 @@ import { QueueMessage } from "../interfaces/providers/rabbitmq/index.js";
 import { QueueContext } from "../interfaces/queueContext.js";
 import { EventBusListener, EventListeners, TaskListener } from "../interfaces/index.js";
 import { EventMessageValidator } from "./eventMessageValidator.js";
+import { MetricsService } from "@diia-inhouse/diia-metrics";
 import Logger from "@diia-inhouse/diia-logger";
 import { AsyncLocalStorage } from "node:async_hooks";
 
@@ -10,12 +11,15 @@ declare class EventMessageHandler {
   private readonly eventMessageValidator;
   private readonly asyncLocalStorage;
   private readonly logger;
+  private readonly systemServiceName;
   private readonly noRequeueNackOptions;
-  constructor(eventMessageValidator: EventMessageValidator, asyncLocalStorage: AsyncLocalStorage<QueueContext>, logger: Logger);
+  private readonly rabbitMQMetrics;
+  constructor(eventMessageValidator: EventMessageValidator, asyncLocalStorage: AsyncLocalStorage<QueueContext>, logger: Logger, systemServiceName: string, metrics: MetricsService);
   eventListenersMessageHandler(this: this, eventListeners: EventListeners, message: QueueMessage | null): Promise<void>;
   eventListenerMessageHandler(listener: EventBusListener | TaskListener | undefined, message: QueueMessage): Promise<void>;
   private prepareAsyncContext;
   private handleMessage;
+  private getErrorType;
   private validateData;
   private directReplyDone;
   private getServiceCode;

package/dist/services/eventMessageHandler.js

@@ -1,6 +1,8 @@
-import { NackOptions } from "../interfaces/providers/rabbitmq/index.js";
+import { Headers, NackOptions } from "../interfaces/providers/rabbitmq/index.js";
+import "../interfaces/metrics/index.js";
 import "../interfaces/index.js";
-import { ApiError, ValidationError } from "@diia-inhouse/errors";
+import RabbitMQMetricsService from "./metrics.js";
+import { ApiError, ErrorType, ValidationError } from "@diia-inhouse/errors";
 import { randomBytes } from "node:crypto";
 import { context, isValidTraceId, propagation, trace } from "@opentelemetry/api";
 import { utils } from "@diia-inhouse/utils";
@@ -9,11 +11,15 @@ var EventMessageHandler = class {
 	eventMessageValidator;
 	asyncLocalStorage;
 	logger;
+	systemServiceName;
 	noRequeueNackOptions = new NackOptions(false, false);
-	constructor(eventMessageValidator, asyncLocalStorage, logger) {
+	rabbitMQMetrics;
+	constructor(eventMessageValidator, asyncLocalStorage, logger, systemServiceName, metrics) {
 		this.eventMessageValidator = eventMessageValidator;
 		this.asyncLocalStorage = asyncLocalStorage;
 		this.logger = logger;
+		this.systemServiceName = systemServiceName;
+		this.rabbitMQMetrics = new RabbitMQMetricsService(metrics);
 	}
 	async eventListenersMessageHandler(eventListeners, message) {
 		if (!message) return;
@@ -21,17 +27,21 @@ var EventMessageHandler = class {
 		await this.eventListenerMessageHandler(listener, message);
 	}
 	async eventListenerMessageHandler(listener, message) {
+		const startTime = process.hrtime.bigint();
 		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 () => {
+		const errorType = await this.asyncLocalStorage.run(context, async () => {
 			this.logger.info(`Handling event [${event}] with payload`, { payload });
 			if (!listener) {
 				this.logger.info(`Not found listener for the event [${event}]`);
-				return done();
+				done();
+				return;
 			}
 			return await this.handleMessage(listener, message);
 		});
+		const source = properties.headers?.[Headers.sentFrom] || "unknown";
+		this.rabbitMQMetrics.collectResponseTotalMetric(startTime, event || "unknown", source, this.systemServiceName, errorType);
 	}
 	prepareAsyncContext(properties, serviceCode) {
 		return { logData: {
@@ -47,8 +57,9 @@ var EventMessageHandler = class {
 		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);
+			if (useDirectReply && error) this.directReplyDone(message, error, true);
+			else reject(this.noRequeueNackOptions);
+			return this.getErrorType(error);
 		}
 		try {
 			result = await listener.handler?.(payload, meta);
@@ -57,10 +68,14 @@ var EventMessageHandler = class {
 			hasErrorOccurred = true;
 			this.logger.error(`Failed to handle event ${event}`, { err });
 		}
-		if (useDirectReply) return this.directReplyDone(message, result, hasErrorOccurred);
-		if (result instanceof NackOptions) return reject(result);
-		else if (hasErrorOccurred && listener.nackOptions) return reject(listener.nackOptions);
-		return done();
+		if (useDirectReply) this.directReplyDone(message, result, hasErrorOccurred);
+		else if (result instanceof NackOptions) reject(result);
+		else if (hasErrorOccurred && listener.nackOptions) reject(listener.nackOptions);
+		else done();
+		return hasErrorOccurred ? this.getErrorType(result) : void 0;
+	}
+	getErrorType(err) {
+		return err instanceof ApiError ? err.getType() : ErrorType.Unoperated;
 	}
 	async validateData(data, listener) {
 		const { payload } = data;

package/dist/services/index.js

@@ -1,10 +1,10 @@
 import "./eventBus.js";
+import "./metrics.js";
 import "./eventMessageHandler.js";
 import "./eventMessageValidator.js";
 import "./externalCommunicator.js";
 import "./externalEventBus.js";
 import "./scheduledTask.js";
 import "./task.js";
-import "./metrics.js";
 import "./queue.js";
 export {};

package/dist/services/queue.d.ts

@@ -3,8 +3,8 @@ import { QueueStatus } from "../interfaces/queueStatus.js";
 import { QueueContext } from "../interfaces/queueContext.js";
 import { QueueConnectionConfig } from "../interfaces/index.js";
 import { RabbitMQProvider } from "../providers/rabbitmq/index.js";
-import { HealthCheckResult, OnHealthCheck } from "@diia-inhouse/types";
 import { MetricsService } from "@diia-inhouse/diia-metrics";
+import { HealthCheckResult, OnHealthCheck } from "@diia-inhouse/types";
 import Logger$1 from "@diia-inhouse/diia-logger";
 import { AsyncLocalStorage } from "node:async_hooks";
 

package/dist/services/task.js

@@ -2,7 +2,7 @@ import { QueueTypes } from "../interfaces/messageBrokerServiceConfig.js";
 import "../interfaces/index.js";
 import constants_default from "../constants.js";
 import Communicator from "./communicator.js";
-import _ from "lodash";
+import lodash from "lodash";
 //#region src/services/task.ts
 var Task = class extends Communicator {
 	serviceName;
@@ -18,8 +18,8 @@ var Task = class extends Communicator {
 	}
 	async onInit() {
 		const { queuesOptions, exchangesOptions } = await this.init();
-		const queuesOptionsMap = _.keyBy(queuesOptions, "name");
-		const exchangesOptionsMap = _.keyBy(exchangesOptions, "name");
+		const queuesOptionsMap = lodash.keyBy(queuesOptions, "name");
+		const exchangesOptionsMap = lodash.keyBy(exchangesOptions, "name");
 		for (const task of this.taskList) {
 			const { name: taskName, isDelayed = false, queueNames = [] } = task;
 			if (queueNames.length === 0) {
@@ -69,8 +69,8 @@ var Task = class extends Communicator {
 	getUnicastListeners() {
 		const listeners = [];
 		const { queuesOptions, exchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
-		const queuesOptionsMap = _.keyBy(queuesOptions, "name");
-		const exchangesOptionsMap = _.keyBy(exchangesOptions, "name");
+		const queuesOptionsMap = lodash.keyBy(queuesOptions, "name");
+		const exchangesOptionsMap = lodash.keyBy(exchangesOptions, "name");
 		for (const task of this.taskList) {
 			const { queueNames = [], name: taskName, isDelayed = false } = task;
 			if (queueNames.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@diia-inhouse/diia-queue",
-    "version": "14.2.38",
+    "version": "14.2.40",
     "description": "Package provide queue functionality",
     "license": "SEE LICENSE IN LICENSE.md",
     "author": "diia-team",
@@ -38,9 +38,9 @@
     },
     "devDependencies": {
         "@diia-inhouse/configs": "7.2.2",
-        "@diia-inhouse/diia-logger": "4.7.21",
-        "@diia-inhouse/diia-metrics": "7.1.148",
-        "@diia-inhouse/env": "3.3.88",
+        "@diia-inhouse/diia-logger": "4.7.22",
+        "@diia-inhouse/diia-metrics": "7.1.149",
+        "@diia-inhouse/env": "3.3.89",
         "@diia-inhouse/errors": "2.3.25",
         "@diia-inhouse/oxc-config": "5.0.0",
         "@diia-inhouse/test": "8.3.40",