@diia-inhouse/diia-queue 8.0.0 → 13.2.1

package/dist/services/task.js

@@ -1,49 +1,163 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Task = void 0;
-class Task {
-    queueProvider;
+const lodash_1 = __importDefault(require("lodash"));
+const constants_1 = __importDefault(require("../constants"));
+const interfaces_1 = require("../interfaces");
+const communicator_1 = __importDefault(require("./communicator"));
+class Task extends communicator_1.default {
+    serviceName;
     taskList;
     eventMessageHandler;
-    logger;
-    constructor(queueProvider, taskList, eventMessageHandler, logger) {
-        this.queueProvider = queueProvider;
+    queueNamePrefix = 'TasksQueue';
+    taskNameExchangesOptionsMap = new Map();
+    constructor(serviceName, systemServiceName, queueProvider, taskList, eventMessageHandler, logger, hostName) {
+        super(logger, queueProvider, hostName, systemServiceName);
+        this.serviceName = serviceName;
         this.taskList = taskList;
         this.eventMessageHandler = eventMessageHandler;
-        this.logger = logger;
     }
-    tasksMap = new Map();
     async onInit() {
-        await this.queueProvider.init?.();
-        if (this.taskList.length === 0) {
-            return;
+        const { queuesOptions, exchangesOptions } = await this.init();
+        const queuesOptionsMap = lodash_1.default.keyBy(queuesOptions, 'name');
+        const exchangesOptionsMap = lodash_1.default.keyBy(exchangesOptions, 'name');
+        for (const task of this.taskList) {
+            const { name: taskName, isDelayed = false, queueNames = [] } = task;
+            if (queueNames.length === 0) {
+                const queueName = this.defineQueueNameByTaskName(taskName, isDelayed, queuesOptionsMap, exchangesOptionsMap);
+                queueNames.push(queueName);
+            }
+            const exchangesOptions = [];
+            for (const queueName of queueNames) {
+                const queueOptions = queuesOptionsMap[queueName];
+                if (!queueOptions) {
+                    this.logger.error(`Not found queue options by name (${queueName}) for task service`);
+                    continue;
+                }
+                const { bindTo } = queueOptions;
+                const options = this.defineExchangesOptions(queueName, isDelayed, bindTo, exchangesOptionsMap);
+                exchangesOptions.push(...options);
+            }
+            this.taskNameExchangesOptionsMap.set(taskName, exchangesOptions);
+        }
+    }
+    async publish(taskName, payload, delay) {
+        const exchangesOptions = this.taskNameExchangesOptionsMap.get(taskName);
+        if (!exchangesOptions || exchangesOptions.length === 0) {
+            throw new Error(`Not found task [${taskName}] exchanges options`);
         }
-        this.logger.info('Start Tasks listener initialization');
+        for await (const exchangeOptions of exchangesOptions) {
+            const { name: exchangeName, delayed } = exchangeOptions;
+            if (delay && !delayed) {
+                const logMessage = 'Delay option could be used only with delayed tasks';
+                this.logger.error(logMessage, { exchangeName, taskName });
+                throw new Error(logMessage);
+            }
+            const message = {
+                payload,
+                event: this.getQueueName(taskName),
+            };
+            await this.publishToExchange(exchangeName, constants_1.default.DEFAULT_ROUTING_KEY, message, { delay });
+        }
+    }
+    getProducerExchangesOptions() {
+        return [];
+    }
+    getMulticastListeners() {
+        return [];
+    }
+    getUnicastListeners() {
+        const listeners = [];
+        const { queuesOptions, exchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
+        const queuesOptionsMap = lodash_1.default.keyBy(queuesOptions, 'name');
+        const exchangesOptionsMap = lodash_1.default.keyBy(exchangesOptions, 'name');
         for (const task of this.taskList) {
-            await this.subscribeTask(task);
-            this.tasksMap.set(task.name, task);
+            const { queueNames = [], name: taskName, isDelayed = false } = task;
+            if (queueNames.length === 0) {
+                const queueName = this.defineQueueNameByTaskName(taskName, isDelayed, queuesOptionsMap, exchangesOptionsMap);
+                queueNames.push(queueName);
+            }
+            for (const queueName of queueNames) {
+                const queueOptions = queuesOptionsMap[queueName];
+                if (!queueOptions) {
+                    this.logger.error(`Not found queue options by name (${queueName}) for ${this.constructor.name} service`);
+                    continue;
+                }
+                const exchangesOptions = this.defineExchangesOptions(queueName, isDelayed, queueOptions.bindTo, exchangesOptionsMap);
+                const handler = this.eventMessageHandler.eventListenerMessageHandler.bind(this.eventMessageHandler, task);
+                const listener = {
+                    handler,
+                    queueOptions,
+                    exchangesOptions,
+                };
+                listeners.push(listener);
+            }
         }
+        return listeners;
     }
-    subscribe(taskName, messageHandler, options) {
-        return this.queueProvider.subscribeTask(this.getTaskQueueName(taskName), messageHandler, options);
+    getExchangeNameWithSuffix(taskName) {
+        return this.getQueueName(taskName);
     }
-    publish(taskName, payload, delay) {
-        if (delay) {
-            const task = this.tasksMap.get(taskName);
-            if (task && !task.isDelayed) {
-                throw new Error('Delay option could be used only with delayed tasks');
+    defineExchangesOptions(queueName, isExchangeDelayed = false, bindTo = [], exchangesMap = {}) {
+        const exchangesOptions = [];
+        for (const bindOptions of bindTo) {
+            const { exchangeName } = bindOptions;
+            const exchangeOptions = exchangesMap[exchangeName];
+            if (!exchangeOptions) {
+                this.logger.error(`Not found exchange options by name (${exchangeName}) for task service`);
+                continue;
             }
+            exchangesOptions.push(exchangeOptions);
+        }
+        if (exchangesOptions.length === 0) {
+            const globalExchangesOptions = this.defineExchangesOptionsBasedOnGlobalConfig(queueName, isExchangeDelayed);
+            exchangesOptions.push(...globalExchangesOptions);
         }
-        const queueName = this.getTaskQueueName(taskName);
-        return this.queueProvider.publishTask(queueName, payload, delay);
+        return exchangesOptions;
     }
-    async subscribeTask(task) {
-        await this.subscribe(task.name, this.eventMessageHandler.eventListenerMessageHandler.bind(this.eventMessageHandler, task), {
-            delayed: task.isDelayed || false,
-        });
+    defineQueueOptionsBasedOnGlobalConfig(queueName) {
+        const { rabbit: { listenerOptions: { queueOptions } = {}, declareOptions: { assertQueues, queuesOptions: overrideQueueOptions = {} } = {}, }, } = this.queueProvider.getConfig();
+        const bindTo = [
+            {
+                bind: assertQueues,
+                exchangeName: queueName,
+                routingKey: constants_1.default.DEFAULT_ROUTING_KEY,
+            },
+        ];
+        return {
+            bindTo,
+            name: queueName,
+            declare: assertQueues,
+            options: queueOptions,
+            type: interfaces_1.QueueTypes.Quorum,
+            consumerOptions: this.defineConsumerOptionsBasedOnGlobalConfig(),
+            ...overrideQueueOptions,
+        };
     }
-    getTaskQueueName(taskName) {
-        return `TasksQueue${this.capitalizeFirstLetter(this.queueProvider.getServiceName())}[${taskName}]`;
+    defineExchangesOptionsBasedOnGlobalConfig(exchangeName, isExchangeDelayed = false) {
+        const { rabbit: { declareOptions: { assertExchanges } = {} }, } = this.queueProvider.getConfig();
+        return [
+            {
+                name: exchangeName,
+                declare: assertExchanges,
+                delayed: isExchangeDelayed,
+            },
+        ];
+    }
+    defineConsumerOptionsBasedOnGlobalConfig() {
+        const { rabbit: { listenerOptions: { prefetchCount } = {} }, } = this.queueProvider.getConfig();
+        return {
+            prefetchCount,
+        };
+    }
+    getQueueName(taskName) {
+        if (taskName.includes(this.queueNamePrefix)) {
+            return taskName;
+        }
+        return `${this.queueNamePrefix}${this.capitalizeFirstLetter(this.serviceName)}[${taskName}]`;
     }
     capitalizeFirstLetter(s) {
         return s
@@ -51,6 +165,13 @@ class Task {
             .map((str) => str.charAt(0).toUpperCase() + str.slice(1))
             .join('');
     }
+    defineQueueNameByTaskName(taskName, isDelayed, queuesOptionsMap, exchangesOptionsMap) {
+        const queueName = this.getQueueName(taskName);
+        queuesOptionsMap[queueName] = this.defineQueueOptionsBasedOnGlobalConfig(queueName);
+        const [exchangeOptions] = this.defineExchangesOptionsBasedOnGlobalConfig(queueName, isDelayed);
+        exchangesOptionsMap[exchangeOptions.name] = exchangeOptions;
+        return queueName;
+    }
 }
 exports.Task = Task;
 //# sourceMappingURL=task.js.map

package/dist/services/task.js.map

@@ -1 +1 @@
-{"version":3,"file":"task.js","sourceRoot":"","sources":["../../src/services/task.ts"],"names":[],"mappings":";;;AAOA,MAAa,IAAI;IAEQ;IACA;IACA;IACA;IAJrB,YACqB,aAA+B,EAC/B,QAAwB,EACxB,mBAAwC,EACxC,MAAc;QAHd,kBAAa,GAAb,aAAa,CAAkB;QAC/B,aAAQ,GAAR,QAAQ,CAAgB;QACxB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,WAAM,GAAN,MAAM,CAAQ;IAChC,CAAC;IAEa,QAAQ,GAA8B,IAAI,GAAG,EAAE,CAAA;IAEhE,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAA;QACjC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAM;QACV,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;QAEvD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;YAE9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACtC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,QAAgB,EAAE,cAA8B,EAAE,OAA0B;QAClF,OAAO,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;IACrG,CAAC;IAED,OAAO,CAAC,QAAgB,EAAE,OAAuB,EAAE,KAAc;QAC7D,IAAI,KAAK,EAAE,CAAC;YACR,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YACxC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;YACzE,CAAC;QACL,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;QAEjD,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;IACpE,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,IAAkB;QAC1C,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,EAAE;YACvH,OAAO,EAAE,IAAI,CAAC,SAAS,IAAI,KAAK;SACnC,CAAC,CAAA;IACN,CAAC;IAEO,gBAAgB,CAAC,QAAgB;QACrC,OAAO,aAAa,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC,IAAI,QAAQ,GAAG,CAAA;IACtG,CAAC;IAEO,qBAAqB,CAAC,CAAS;QACnC,OAAO,CAAC;aACH,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAChE,IAAI,CAAC,EAAE,CAAC,CAAA;IACjB,CAAC;CACJ;AA1DD,oBA0DC"}
+{"version":3,"file":"task.js","sourceRoot":"","sources":["../../src/services/task.ts"],"names":[],"mappings":"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"}

package/dist/types/constants.d.ts

@@ -1,5 +1,8 @@
 declare const _default: {
     DEFAULT_ROUTING_KEY: string;
     APP_ID: string;
+    PROJECT_NAME: string;
+    PORTAL_NAME: string;
+    REPLY_TO_QUEUE_NAME: string;
 };
 export default _default;

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
 export * from './interfaces';
 export * from './interfaces/deps';
-export { EventName, QueueName } from './interfaces/queueConfig';
 export * from './services';
+export * from './providers';

package/dist/types/interfaces/deps.d.ts

@@ -2,7 +2,6 @@ import { EventBus } from '../services/eventBus';
 import { EventMessageHandler } from '../services/eventMessageHandler';
 import { EventMessageValidator } from '../services/eventMessageValidator';
 import { ExternalCommunicator } from '../services/externalCommunicator';
-import { ExternalCommunicatorChannel } from '../services/externalCommunicatorChannel';
 import { ExternalEventBus } from '../services/externalEventBus';
 import { Queue } from '../services/queue';
 import { ScheduledTask } from '../services/scheduledTask';
@@ -11,11 +10,13 @@ export type CommonQueueDeps = {
     queue: Queue;
     eventMessageHandler: EventMessageHandler;
     eventMessageValidator: EventMessageValidator;
-    externalChannel: ExternalCommunicatorChannel;
 };
 export type InternalQueueDeps = {
     eventBus?: EventBus;
     task?: Task;
+    /**
+     * @deprecated use pkg-workflow entities instead
+     */
     scheduledTask?: ScheduledTask;
 };
 export type ExternalQueueDeps = {

package/dist/types/interfaces/externalCommunicator.d.ts

@@ -1,21 +1,14 @@
 import { HttpStatusCode } from '@diia-inhouse/types';
 import { ValidationSchema } from '@diia-inhouse/validators';
-import { EventBusListener } from './eventBus';
-import { EventName, Topic } from './queueConfig';
-export type EventListeners = Partial<Record<EventName, EventBusListener>>;
-export interface ReceiveOps {
-    timeout?: number;
-    async?: boolean;
-    requestUuid?: string;
-    ignoreCache?: boolean;
-    retry?: boolean;
-}
+import { ExchangeName } from './messageBrokerServiceConfig';
 export interface ReceiveDirectOps {
-    topic?: Topic;
-    validationRules?: ValidationSchema;
+    registryApiVersion?: string;
+    exchangeName?: ExchangeName;
+    validationRules: ValidationSchema | null;
     ignoreCache?: boolean;
     retry?: boolean;
     timeout?: number;
+    requestUuid?: string;
 }
 export interface ExternalCommunicatorResponseError {
     http_code: HttpStatusCode;

package/dist/types/interfaces/index.d.ts

@@ -1,40 +1,87 @@
+import { ValidationError } from '@diia-inhouse/errors';
 import { ValidationSchema } from '@diia-inhouse/validators';
+import { ExchangeName, ExchangeOptions, QueueOptions } from './messageBrokerServiceConfig';
 import { MessageHandler } from './messageHandler';
-import { PublishDirectOptions, PublishExternalEventOptions, SubscribeOptions } from './options';
-import { MessagePayload, QueueMessageMetaData, RabbitMQConfig } from './providers/rabbitmq';
-import { EventName, QueueConfigByQueueName, QueueName, ServiceConfigByConfigType, ServiceRulesConfig, Topic, TopicConfigByConfigType } from './queueConfig';
+import { PublishDirectOptions, PublishExternalEventOptions, PublishOptions, SubscribeOptions } from './options';
+import { MessageData, NackOptions, QueueMessageMetaData, RabbitMQConfig } from './providers/rabbitmq';
+import { MessagePayload, PublishingResult } from './providers/rabbitmq/amqpPublisher';
+import { EventName, QueueName, ServiceRulesConfig } from './queueConfig';
 import { QueueConnectionType } from './queueStatus';
 export * from './providers/rabbitmq';
+export * from './providers/rabbitmq/amqpConnection';
+export * from './providers/rabbitmq/amqpPublisher';
 export * from './queueStatus';
-export * from './eventBus';
 export * from './options';
 export * from './messageHandler';
 export * from './options';
 export * from './queueContext';
-export { QueueConfigType } from './queueConfig';
+export * from './messageBrokerServiceConfig';
+export * from './metrics';
+export * from './queueConfig';
+export * from './externalCommunicator';
+export type EventListeners = Partial<Record<EventName, EventBusListener>>;
 export interface TaskQueue {
-    subscribe(taskName: string, messageHandler: MessageHandler, options?: SubscribeOptions): Promise<boolean>;
-    publish(taskName: string, message: MessagePayload, delay?: number): Promise<boolean>;
+    subscribe(queueName: QueueName, messageHandler: MessageHandler, options?: SubscribeOptions): Promise<boolean>;
+    publish(taskName: string, message: MessagePayload, delay?: number): Promise<PublishingResult>;
 }
 export interface ScheduledTasksQueue {
-    subscribe(subscriptionName: QueueName, messageHandler: MessageHandler, options?: SubscribeOptions): Promise<boolean>;
-    publish(scheduledTaskName: EventName, serviceName: string): Promise<boolean>;
+    subscribe(queueName: QueueName, messageHandler: MessageHandler): Promise<boolean>;
+    publishToQueue(queueName: QueueName, payload: MessageData): Promise<PublishingResult>;
+    /** @deprecated
+     * - use the publishToExchange method for pushing a message by a routing key
+     * - use the publishToQueue method for pushing a message to a queue
+     * */
+    publish(eventName: EventName, serviceName: string): Promise<PublishingResult>;
+    publishToExchange(exchangeName: ExchangeName, routingKey: string, payload: MessageData): Promise<PublishingResult>;
+}
+export interface EventBusQueue {
+    subscribe(queueName: QueueName, messageHandler: MessageHandler, options?: SubscribeOptions): Promise<boolean>;
+    /** @deprecated
+     * - use the publishToExchange method for pushing a message by a routing key
+     * - use the publishToQueue method for pushing a message to a queue
+     * */
+    publish(publicationName: EventName, message: MessagePayload, options?: PublishOptions): Promise<PublishingResult>;
+    publishToQueue(queueName: QueueName, payload: MessageData): Promise<PublishingResult>;
+    publishToExchange(exchangeName: ExchangeName, routingKey: string, payload: MessageData): Promise<PublishingResult>;
 }
 export interface ExternalEventBusQueue {
-    subscribe(messageHandler: MessageHandler, options?: SubscribeOptions): Promise<boolean>;
-    publish(eventName: EventName, message: MessagePayload, options?: PublishExternalEventOptions): Promise<boolean>;
-    publishDirect<T>(eventName: string, message: MessagePayload, topic?: Topic, options?: PublishDirectOptions): Promise<T>;
+    subscribe(queueName: QueueName, messageHandler: MessageHandler): Promise<boolean>;
+    /** @deprecated
+     * - use the publishToExchange method for pushing a message by a routing key
+     * - use the publishToQueue method for pushing a message to a queue
+     * */
+    publish(eventName: EventName, message: MessagePayload, options?: PublishExternalEventOptions): Promise<PublishingResult>;
+    publishDirect<T>(eventName: string, message: MessagePayload, options?: PublishDirectOptions): Promise<T>;
+    publishToExchange(exchangeName: ExchangeName, routingKey: string, messageData: MessageData, options?: PublishOptions): Promise<PublishingResult>;
+    publishToQueue(queueName: QueueName, messageData: MessageData): Promise<PublishingResult>;
+}
+export interface Listener {
+    queueNames?: string[];
+    nackOptions?: NackOptions;
+    validationRules?: ValidationSchema;
+    getServiceCode?(payload: unknown): string;
 }
-export interface TaskListener {
+export interface EventBusListener extends Listener {
+    event: EventName;
+    /** @deprecated use receive direct mechanism */
+    isSync?: boolean;
+    validationErrorHandler?(error: ValidationError, uuid: string): Promise<void>;
+    handler?(payload: unknown, meta: QueueMessageMetaData): Promise<unknown | void | NackOptions>;
+}
+export interface TaskListener extends Listener {
     name: string;
+    /**
+     * @deprecated the RabbitMQ plugin that supports delayed messages is deprecated and should be removed in the future
+     */
     isDelayed?: boolean;
-    validationRules: ValidationSchema;
-    getServiceCode?(payload: unknown): string;
-    handler(payload: unknown, meta: QueueMessageMetaData): Promise<void>;
+    handler(payload: unknown, meta: QueueMessageMetaData): Promise<void | NackOptions>;
 }
 export type QueueConfig = RabbitMQConfig;
 export interface InternalQueueConfig extends QueueConfig {
     queueName?: string;
+    /**
+     * @deprecated use pkg-workflow entities instead
+     */
     scheduledTaskQueueName?: string;
 }
 export type QueueConnectionConfig = {
@@ -42,8 +89,11 @@ export type QueueConnectionConfig = {
     [QueueConnectionType.Internal]?: InternalQueueConfig;
     [QueueConnectionType.External]?: QueueConfig;
 };
-export interface AggregatedQueueConfigs {
-    serviceConfig: ServiceConfigByConfigType;
-    queueConfig: QueueConfigByQueueName;
-    topicConfig: TopicConfigByConfigType;
+export interface MessageBrokerServiceListener {
+    handler: MessageHandler;
+    queueOptions: QueueOptions;
+    exchangesOptions: ExchangeOptions[];
+}
+export interface MessageBrokerServiceEventsListener extends MessageBrokerServiceListener {
+    eventNames?: string[];
 }

package/dist/types/interfaces/messageBrokerServiceConfig.d.ts

@@ -0,0 +1,79 @@
+import { Options } from 'amqplib';
+interface BaseBindOptions {
+    exchangeName: string;
+    routingKey?: string;
+}
+export interface BindOptions extends BaseBindOptions {
+    bind?: boolean;
+}
+export interface UnbindOptions extends BaseBindOptions {
+    unbind?: boolean;
+}
+export interface RecreateChannelOptions {
+    timeout?: number;
+    maxTries?: number;
+    backoffCoefficient?: number;
+}
+export interface ConsumerOptions {
+    consumerTag?: string;
+    prefetchCount?: number;
+    recreateChannelOptions?: RecreateChannelOptions;
+}
+export type ExchangeName = string;
+export declare enum ExchangeType {
+    Direct = "direct",
+    Fanout = "fanout",
+    Topic = "topic",
+    Headers = "headers",
+    /**
+     * @deprecated the RabbitMQ plugin that supports delayed messages is deprecated and should be removed in the future
+     */
+    XDelayedMessage = "x-delayed-message"
+}
+export interface ExchangeOptions {
+    name: ExchangeName;
+    type?: ExchangeType;
+    declare?: boolean;
+    /**
+     * @deprecated the RabbitMQ plugin that supports delayed messages is deprecated and should be removed in the future
+     */
+    delayed?: boolean;
+    options?: Options.AssertExchange;
+    bindTo?: BindOptions[];
+}
+export declare const MessageBrokerExternalServiceTypes: readonly ["externalEventBus"];
+export type MessageBrokerExternalServiceType = (typeof MessageBrokerExternalServiceTypes)[number];
+export declare const MessageBrokerInternalServiceTypes: readonly ["task", "eventBus", "scheduledTask"];
+export type MessageBrokerInternalServiceType = (typeof MessageBrokerInternalServiceTypes)[number];
+export declare const MessageBrokerGeneralServiceTypes: readonly ["general"];
+export type MessageBrokerGeneralServiceType = (typeof MessageBrokerGeneralServiceTypes)[number];
+export type MessageBrokerServiceType = MessageBrokerExternalServiceType | MessageBrokerInternalServiceType | MessageBrokerGeneralServiceType;
+export interface MessageBrokerServiceConfig {
+    queuesOptions: QueueOptions[];
+    exchangesOptions: ExchangeOptions[];
+}
+export declare const emptyMessageBrokerServiceConfig: MessageBrokerServiceConfig;
+export type MessageBrokerServicesConfig = {
+    [k in MessageBrokerServiceType]?: MessageBrokerServiceConfig;
+};
+export declare const QueueTypes: {
+    readonly Quorum: "quorum";
+    readonly Classic: "classic";
+};
+type QueueType = (typeof QueueTypes)[keyof typeof QueueTypes];
+export interface BaseQueueOptions {
+    type?: QueueType;
+    options?: Options.AssertQueue;
+}
+export interface RedeclareQueueOptions extends BaseQueueOptions {
+    redeclare?: boolean;
+}
+export interface QueueOptions extends BaseQueueOptions {
+    name: string;
+    declare?: boolean;
+    bindTo: BindOptions[];
+    unbindFrom?: UnbindOptions[];
+    consumerOptions?: ConsumerOptions;
+    redeclareOptions?: RedeclareQueueOptions;
+}
+export {};

package/dist/types/interfaces/messageHandler.d.ts

@@ -1,2 +1,2 @@
 import { QueueMessage } from './providers/rabbitmq';
-export type MessageHandler = (msg: QueueMessage | null) => Promise<void>;
+export type MessageHandler = (msg: QueueMessage) => Promise<void>;

package/dist/types/interfaces/metrics/index.d.ts

@@ -5,3 +5,16 @@ export interface TotalMessageHandlerErrorsLabelsMap {
     event: string;
     serviceName: string;
 }
+export declare const LabelUnknown = "unknown";
+export type CommunicationDirection = ['inbound', 'outbound'][number];
+export declare class CommunicationsTotalLabelsMap {
+    event: string;
+    source: string;
+    queue?: string;
+    destination?: string;
+    direction: CommunicationDirection;
+}
+export declare const communicationsTotalLabelsMap: (keyof CommunicationsTotalLabelsMap)[];
+export declare const Metrics: {
+    readonly CommunicationsTotal: "diia_rabbitmq_communications_total";
+};

package/dist/types/interfaces/options.d.ts

@@ -1,24 +1,49 @@
 import { Options } from 'amqplib';
+import { RecreateChannelOptions } from './messageBrokerServiceConfig';
+export interface PublisherOptions {
+    timeout?: number;
+    replyToQueueName?: string;
+}
 export interface ListenerOptions {
     queueOptions?: Options.AssertQueue;
     prefetchCount?: number;
+    recreateChannelOptions?: RecreateChannelOptions;
 }
 export interface PublishDirectOptions {
+    exchangeName?: string;
     timeout?: number;
     ignoreCache?: boolean;
     retry?: boolean;
+    registryApiVersion?: string;
 }
 export interface PublishOptions {
+    /**
+     * Delay (ms) before message delivery
+     * @default undefined
+     */
+    delay?: number;
+    /**
+     * Routing key for message routing
+     * @default undefined
+     */
+    routingKey?: string;
+    /**
+     * Timeout (ms) for publish operation
+     * @default Infinity
+     */
     publishTimeout?: number;
+    /**
+     * Whether to throw error on timeout (true) or return false (false)
+     * @default true
+     */
     throwOnPublishTimeout?: boolean;
 }
-export interface PublishInternalEventOptions extends PublishOptions {
-    routingKey?: string;
-}
 export interface SubscribeOptions {
     routingKey?: string;
-    queueSuffix?: string;
     listener?: ListenerOptions;
+    /**
+     * @deprecated the RabbitMQ plugin that supports delayed messages is deprecated and should be removed in the future
+     */
     delayed?: boolean;
 }
 export interface PublishExternalEventOptions extends PublishOptions, PublishDirectOptions {

package/dist/types/interfaces/providers/rabbitmq/amqpConnection.d.ts

@@ -24,3 +24,6 @@ export declare enum ConnectionStatus {
     Closed = "closed",
     Down = "down"
 }
+export declare const AmqpConnectionEventNames: {
+    readonly Ready: "ready";
+};

package/dist/types/interfaces/providers/rabbitmq/amqpPublisher.d.ts

@@ -1,24 +1,16 @@
-import { PublishDirectOptions } from '../../options';
-import { EventName } from '../../queueConfig';
-export declare enum ExchangeType {
-    Direct = "direct",
-    Fanout = "fanout",
-    Topic = "topic",
-    Headers = "headers",
-    XDelayedMessage = "x-delayed-message"
-}
+import { MessagePropertyHeaders } from 'amqplib/properties';
+import { Headers } from './index';
 export type MessagePayload = unknown;
 export interface MessageHeaders {
     traceId: string;
     serviceCode?: string;
     'x-delay'?: number;
 }
-export interface PublishToExchangeParams {
-    eventName: EventName | string;
-    message: MessagePayload;
-    exchangeName: string;
-    routingKey?: string;
-    responseRoutingKey?: string;
-    headers: MessageHeaders;
-    options?: PublishDirectOptions;
+export interface DirectResponseHeaders extends MessagePropertyHeaders {
+    [Headers.handledBy]?: string;
+}
+export interface DirectResponse<T = unknown> extends MessagePropertyHeaders {
+    body: T;
+    headers: DirectResponseHeaders;
 }
+export type PublishingResult = void | never;