@rsdk/nats.transport 5.7.0 → 5.8.0-next.1

package/dist/request/server.js

@@ -0,0 +1,174 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NatsRequestServer = void 0;
+const microservices_1 = require("@nestjs/microservices");
+const core_1 = require("@rsdk/core");
+const events_common_1 = require("@rsdk/events.common");
+const logging_1 = require("@rsdk/logging");
+const nats_common_1 = require("@rsdk/nats.common");
+const nats_1 = require("nats");
+const events_deserializer_1 = require("../events.deserializer");
+/**
+ * Класс, реализующий сервер NATS Request.
+ */
+class NatsRequestServer extends microservices_1.Server {
+    options;
+    config;
+    transportId = microservices_1.Transport.NATS;
+    logger = logging_1.LoggerFactory.create(NatsRequestServer.name);
+    deserializer = new events_deserializer_1.EventsDeserializer();
+    nc;
+    /**
+     * Конструктор класса NatsRequestServer.
+     * @param options - Опции для подключения к NATS.
+     * @param config - Конфигурация приложения.
+     */
+    constructor(options, config) {
+        super();
+        this.options = options;
+        this.config = config;
+    }
+    static isNatsContext(maybeNatsContext) {
+        return maybeNatsContext instanceof microservices_1.NatsContext;
+    }
+    /**
+     * Запускает сервер и устанавливает соединение.
+     * @param callback - Функция обратного вызова для выполнения после подключения.
+     */
+    async listen(callback) {
+        if (!this.nc) {
+            this.nc = await (0, nats_1.connect)(this.options);
+        }
+        this.bindRequestHandlers();
+        callback();
+    }
+    /**
+     * Закрывает соединение с сервером.
+     */
+    async close() {
+        await this.nc?.drain();
+        delete this.nc;
+    }
+    /**
+     * Добавляет обработчик сообщения.
+     * @param pattern Шаблон для сообщения.
+     * @param callback Функция-обработчик сообщения.
+     * @param isEventHandler Указывает, является ли обработчик обработчиком событий.
+     * @param extras Дополнительные параметры.
+     */
+    addHandler(pattern, callback, isEventHandler = false, extras = {}) {
+        if (isEventHandler) {
+            throw new core_1.InternalException('Event handlers are not supported for this transport');
+        }
+        this.addRequestHandler(pattern, callback, extras);
+    }
+    addRequestHandler(pattern, callback, extras = {}) {
+        const requestPattern = this.getRequestPattern(pattern);
+        const type = this.getMessageType(requestPattern);
+        const requestFormattedPattern = this.getFormattedPattern(type);
+        this.deserializer.events.set(requestFormattedPattern, pattern);
+        super.addHandler(requestFormattedPattern, callback, false, extras);
+    }
+    getRequestPattern(pattern) {
+        if (typeof pattern !== 'object' ||
+            !Object.hasOwn(pattern, 'type') ||
+            !Object.hasOwn(pattern, 'options') ||
+            typeof pattern.options !== 'object' ||
+            !Object.hasOwn(pattern.options, 'response')) {
+            throw new core_1.InternalException('Invalid pattern type for request/response', {
+                details: { pattern },
+            });
+        }
+        return pattern;
+    }
+    getFormattedPattern(eventType) {
+        if ((0, nats_common_1.isMessageType)(eventType)) {
+            return eventType.$type;
+        }
+        else if (typeof eventType === 'string') {
+            /**
+             * NOTE: сейчас если указывается строка, то мы исключаем decode формата protobuf.
+             * Наверное стоит разделить subject и декодеры на разные поля.
+             */
+            return eventType;
+        }
+        throw new core_1.InternalException('Invalid pattern type: expected event type or string');
+    }
+    /**
+     * Получает тип сообщения из шаблона.
+     * @param pattern - Шаблон для получения типа сообщения.
+     * @returns Тип сообщения.
+     */
+    getMessageType(pattern) {
+        return typeof pattern === 'object' && 'type' in pattern
+            ? pattern.type
+            : pattern;
+    }
+    /**
+     * Связывает обработчики сообщений.
+     */
+    bindRequestHandlers() {
+        const messageHandlers = [...this.messageHandlers.entries()].filter(([, handler]) => !handler.isEventHandler);
+        for (const [subject, messageHandler] of messageHandlers) {
+            const subscriptionOptions = {
+                callback: async (err, msg) => {
+                    try {
+                        if (err) {
+                            this.logger.error(err.message, err);
+                            return;
+                        }
+                        const { data } = this.deserializer.deserialize(msg);
+                        const context = new microservices_1.NatsContext([msg.subject, msg.headers]);
+                        const response$ = this.transformToObservable(messageHandler(data, context));
+                        const payloadFormat = this.getResponsePayloadFormat(msg);
+                        const responseEncoder = this.getResponseEncoder(subject, payloadFormat);
+                        this.send(response$, (response) => {
+                            if (response.err) {
+                                return msg.respond('', { headers: response.err.metadata });
+                            }
+                            const headers = new nats_1.MsgHdrsImpl();
+                            headers.set(events_common_1.X_FORMAT_HEADER, payloadFormat);
+                            return msg.respond(responseEncoder.encode(response.response ?? {}), { headers });
+                        });
+                    }
+                    catch (error) {
+                        this.logger.error('Error while handling Nats request', { error });
+                    }
+                },
+            };
+            this.nc?.subscribe(subject, subscriptionOptions);
+            this.logger.debug(`Subscribed to ${subject} request messages`);
+        }
+    }
+    getResponseEncoder(subject, format) {
+        const deserializer = this.deserializer.events.get(subject);
+        let responseEncoder;
+        switch (format) {
+            case events_common_1.PayloadFormat.JSON:
+                responseEncoder = new nats_common_1.JSONMessageCodec();
+                break;
+            case events_common_1.PayloadFormat.PROTOBUF:
+                const codec = deserializer.options.response;
+                responseEncoder = codec && new nats_common_1.ProtoMessageCodec(codec);
+                break;
+            default:
+                throw new core_1.InternalException('Unknown format', {
+                    details: {
+                        format,
+                        subject,
+                    },
+                });
+        }
+        return responseEncoder;
+    }
+    getResponsePayloadFormat(msg) {
+        const expectedResponseFormat = msg.headers?.get(nats_common_1.X_RESPONSE_FORMAT_HEADER);
+        const responseFormat = expectedResponseFormat &&
+            Object.values(events_common_1.PayloadFormat).includes(expectedResponseFormat)
+            ? expectedResponseFormat
+            : this.config.responsePayloadType;
+        return responseFormat;
+    }
+}
+exports.NatsRequestServer = NatsRequestServer;
+//# sourceMappingURL=server.js.map

package/dist/request/server.js.map

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

package/dist/request/types/consume-request-options.type.d.ts

@@ -0,0 +1,4 @@
+import type { MessageType } from '@rsdk/nats.common';
+export type ConsumeRequestOptions = {
+    response: MessageType;
+};

package/dist/request/types/consume-request-options.type.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=consume-request-options.type.js.map

package/dist/request/types/consume-request-options.type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"consume-request-options.type.js","sourceRoot":"","sources":["../../../src/request/types/consume-request-options.type.ts"],"names":[],"mappings":""}

package/dist/request/types/formatted-nats-error.type.d.ts

@@ -0,0 +1,8 @@
+import type { ExceptionKind } from '@rsdk/core';
+export type FormattedNatsError = {
+    code: number;
+    message: string;
+    details: any;
+    kind: ExceptionKind;
+    exceptionCode: string;
+};

package/dist/request/types/formatted-nats-error.type.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=formatted-nats-error.type.js.map

package/dist/request/types/formatted-nats-error.type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"formatted-nats-error.type.js","sourceRoot":"","sources":["../../../src/request/types/formatted-nats-error.type.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,3 @@
+export * from './consume-request-options.type';
+export * from './request-type-with-options.type';
+export * from './formatted-nats-error.type';

package/dist/request/types/index.js

@@ -0,0 +1,20 @@
+"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./consume-request-options.type"), exports);
+__exportStar(require("./request-type-with-options.type"), exports);
+__exportStar(require("./formatted-nats-error.type"), exports);
+//# sourceMappingURL=index.js.map

package/dist/request/types/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/request/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iEAA+C;AAC/C,mEAAiD;AACjD,8DAA4C"}

package/dist/request/types/request-type-with-options.type.d.ts

@@ -0,0 +1,6 @@
+import type { MessageType } from '@rsdk/nats.common';
+import type { ConsumeRequestOptions } from './consume-request-options.type';
+export type RequestTypeWithOptions = {
+    type: MessageType;
+    options: ConsumeRequestOptions;
+};

package/dist/request/types/request-type-with-options.type.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=request-type-with-options.type.js.map

package/dist/request/types/request-type-with-options.type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-type-with-options.type.js","sourceRoot":"","sources":["../../../src/request/types/request-type-with-options.type.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/nats.transport",
-  "version": "5.7.0",
+  "version": "5.8.0-next.1",
   "description": "Nats NestJS Transport",
   "main": "dist/index.js",
   "license": "Apache License 2.0",
@@ -13,16 +13,16 @@
   "dependencies": {
     "@nestjs-plugins/nestjs-nats-jetstream-transport": "^2.2.6",
     "lodash": "^4.17.21",
-    "nats": "~2.28.2",
-    "typescript": "5.5.4"
+    "nats": "~2.28.2"
   },
   "peerDependencies": {
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
     "@nestjs/microservices": "^10.0.0",
-    "@opentelemetry/api": "1.9.0",
+    "@opentelemetry/api": "^1.9.0",
     "@rsdk/actx": "*",
     "@rsdk/autodoc.protocol": "*",
+    "@rsdk/builtin-contract": "*",
     "@rsdk/common": "*",
     "@rsdk/common.nestjs": "*",
     "@rsdk/common.node": "*",
@@ -34,8 +34,8 @@
     "@rsdk/nats.common": "*",
     "@rsdk/nest-tools": "*",
     "reflect-metadata": "^0.1.12 || ^0.2.0",
-    "rxjs": "^7.8.1"
+    "rxjs": "^7.1.0"
   },
   "nx": {},
-  "gitHead": "db0b45653ce1e362bae1a482092b932380fb230c"
+  "gitHead": "466ee102dcc2bce0b90df8f561c3e73d889c8468"
 }

package/src/events.deserializer.ts

@@ -13,7 +13,8 @@ import {
 import { LoggerFactory } from '@rsdk/logging';
 import type { JsMsg } from 'nats';
 
-import type { EventTypeWithOptions } from './types/event-type-with-options.type';
+import type { EventTypeWithOptions } from './jetstream';
+import type { RequestTypeWithOptions } from './request';
 
 /**
  * This is a custom deserializer for a Nats request.
@@ -22,10 +23,12 @@ import type { EventTypeWithOptions } from './types/event-type-with-options.type'
  * It is necessary to take into account all the options and parse the incoming data,
  * or return everything to the user as it is without throwing an error
  */
-export class EventsDeserializer extends IncomingRequestDeserializer {
+export class EventsDeserializer<
+  T extends EventTypeWithOptions | RequestTypeWithOptions,
+> extends IncomingRequestDeserializer {
   static logger = LoggerFactory.create(EventsDeserializer);
 
-  events: Map<string, EventTypeWithOptions> = new Map();
+  events: Map<string, T> = new Map();
 
   override deserialize(
     value: any,
@@ -106,14 +109,12 @@ export class EventsDeserializer extends IncomingRequestDeserializer {
 
     const codec = payloadIsJson
       ? new JSONEventCodec<any>()
-      : new ProtoEventCodec(
-          (eventType as EventTypeWithOptions | undefined)?.eventType as any,
-        );
+      : new ProtoEventCodec((eventType as T | undefined)?.type as any);
 
     try {
       return {
         data: codec.decode(value as Buffer),
-        pattern: (eventType as EventTypeWithOptions | undefined)?.eventType,
+        pattern: (eventType as T | undefined)?.type,
       };
     } catch (error) {
       EventsDeserializer.logger.warn(

package/src/index.ts

@@ -1,5 +1,13 @@
-export { Consume } from './metadata.decorator';
-
-export { NatsJetstreamTransport } from './nats-jetstream.transport';
-export { NatsJetstreamTransportOptions } from './types/nats-jetstream-transport-options.type';
-export { Payload } from './payload.decorator';
+export {
+  NatsJetstreamTransport,
+  NatsJetstreamTransportOptions,
+  Payload,
+  NATS_PROTOCOL,
+  NATS_JETSTREAM_PROTOCOL,
+  Consume,
+} from './jetstream';
+export {
+  NatsRequestTransport,
+  NATS_REQUEST_PROTOCOL,
+  ConsumeRequest,
+} from './request';

package/src/jetstream/constants.ts

@@ -0,0 +1,6 @@
+export const NATS_JETSTREAM_PROTOCOL = 'nats-jetstream';
+
+/**
+ * @deprecated use NATS_JETSTREAM_PROTOCOL instead
+ */
+export const NATS_PROTOCOL = NATS_JETSTREAM_PROTOCOL;

package/src/{metadata.decorator.ts → jetstream/consume.decorator.ts}

@@ -7,7 +7,7 @@ import { RsdkMetadata } from '@rsdk/metadata';
 import { NATS_TOPIC_RSDK_METADATA_SCOPE } from '@rsdk/nats.common';
 import omit from 'lodash/omit';
 
-import type { ConsumeOptions } from './types/consume.options';
+import type { ConsumeOptions } from './types';
 
 const ConsumeMetadata =
   <T>(eventType: EventType<T> | string): MethodDecorator =>
@@ -49,6 +49,6 @@ export const Consume = <T>(
   options?: ConsumeOptions,
 ): MethodDecorator =>
   applyDecorators(
-    EventPattern({ eventType, options }, NATS_JETSTREAM_TRANSPORT),
+    EventPattern({ type: eventType, options }, NATS_JETSTREAM_TRANSPORT),
     ConsumeMetadata(eventType),
   );

package/src/jetstream/index.ts

@@ -0,0 +1,7 @@
+export * from './nats-jetstream.headers';
+export * from './payload.decorator';
+export * from './server';
+export * from './types';
+export * from './nats-jetstream.transport';
+export * from './constants';
+export * from './consume.decorator';

package/src/{nats-jetstream-errors.formatter.ts → jetstream/nats-jetstream-errors.formatter.ts}

@@ -1,7 +1,9 @@
-import type { IErrorsFormatter } from '@rsdk/core';
+import { type IErrorsFormatter } from '@rsdk/core';
+
+import { NATS_JETSTREAM_PROTOCOL } from './constants';
 
 export class NatsJetstreamErrorsFormatter implements IErrorsFormatter {
-  protocol = 'nats-jetstream';
+  protocol = NATS_JETSTREAM_PROTOCOL;
 
   match(): boolean {
     return false;

package/src/{nats-jetstream.config.ts → jetstream/nats-jetstream.config.ts}

@@ -10,5 +10,5 @@ export class NatsJetstreamConfig extends Config {
     defaultValue: 'default',
     description: 'NATS connection name',
   })
-  name!: string;
+  readonly name!: string;
 }

package/src/{nats.headers.ts → jetstream/nats-jetstream.headers.ts}

@@ -7,7 +7,7 @@ import { NatsJetStreamServer } from './server';
 /**
  * @description хелпер для нормализованного извлечения заголовков из nats
  */
-export class NatsHeaders implements GenericHeaders {
+export class NatsJetstreamHeaders implements GenericHeaders {
   private readonly normalizedHeaders: Record<string, string>;
 
   constructor(ctx: ExecutionContext) {

package/src/{nats-jetstream.transport.ts → jetstream/nats-jetstream.transport.ts}

@@ -13,12 +13,13 @@ import {
 import { LoggerFactory } from '@rsdk/logging';
 import { DefaultNatsConfig } from '@rsdk/nats.common';
 
-import type { NatsJetstreamTransportOptions } from './types/nats-jetstream-transport-options.type';
-import { NatsHeaders } from './nats.headers';
+import { NATS_JETSTREAM_PROTOCOL } from './constants';
 import { NatsJetstreamConfig } from './nats-jetstream.config';
+import { NatsJetstreamHeaders } from './nats-jetstream.headers';
 import { NatsJetstreamErrorsFormatter } from './nats-jetstream-errors.formatter';
 import { NatsJetstreamTransportModule } from './nats-jetstream-transport.module';
 import { NatsJetStreamServer } from './server';
+import type { NatsJetstreamTransportOptions } from './types';
 
 export class NatsJetstreamTransport implements IMicroserviceTransport {
   private readonly logger = LoggerFactory.create(NatsJetstreamTransport);
@@ -28,11 +29,11 @@ export class NatsJetstreamTransport implements IMicroserviceTransport {
   constructor(private readonly options?: NatsJetstreamTransportOptions) {}
 
   extractHeaders(ctx: ExecutionContext): GenericHeaders {
-    return new NatsHeaders(ctx);
+    return new NatsJetstreamHeaders(ctx);
   }
 
   getProtocol(): string {
-    return 'nats-jetstream';
+    return NATS_JETSTREAM_PROTOCOL;
   }
 
   matchByContext(ctx: ArgumentsHost): boolean {
@@ -86,8 +87,8 @@ export class NatsJetstreamTransport implements IMicroserviceTransport {
     const natsConfig = configContext.resolve(DefaultNatsConfig);
     const natsJetstreamConfig = configContext.resolve(NatsJetstreamConfig);
 
-    this.name = natsJetstreamConfig.name;
     this.config = natsConfig;
+    this.name = natsJetstreamConfig.name;
   }
 
   onStart(): void {