@rsdk/http.server 6.0.0-next.1 → 6.0.0-next.11

package/dist/error-handling/index.d.ts

@@ -1,3 +1,3 @@
 export * from './http-errors.formatter';
 export * from './http-errors.sender';
-export * from './http-errors.transformer';
+export * from './no-interception.filter';

package/dist/error-handling/index.js

@@ -16,5 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./http-errors.formatter"), exports);
 __exportStar(require("./http-errors.sender"), exports);
-__exportStar(require("./http-errors.transformer"), exports);
+__exportStar(require("./no-interception.filter"), exports);
 //# sourceMappingURL=index.js.map

package/dist/error-handling/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/error-handling/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0DAAwC;AACxC,uDAAqC;AACrC,4DAA0C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/error-handling/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0DAAwC;AACxC,uDAAqC;AACrC,2DAAyC"}

package/dist/error-handling/no-interception.filter.d.ts

@@ -0,0 +1,19 @@
+import { ArgumentsHost, ExceptionFilter, NotFoundException as NestNotFoundException } from '@nestjs/common';
+import { ILogger } from '@rsdk/logging';
+import { Observable } from 'rxjs';
+/**
+ * Специализированный фильтр для обработки ошибок NotFound.
+ * Имеет более высокий приоритет, чем GlobalExceptionsFilter,
+ * т. к. задуман для перехвата только NotFoundException. Её выбрасывает
+ * nest, когда не находит маршрут.
+ *
+ * К сожалению, эти ошибки не попадают в интерцепторы и, соответственно,
+ * приходится обрабатывать их вот так отдельно.
+ */
+export declare class RouteNotFoundFilter implements ExceptionFilter {
+    private readonly logger;
+    private readonly formatter;
+    private readonly sender;
+    constructor(logger: ILogger);
+    catch(exception: NestNotFoundException, host: ArgumentsHost): Observable<any>;
+}

package/dist/error-handling/no-interception.filter.js

@@ -0,0 +1,52 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RouteNotFoundFilter = void 0;
+const common_1 = require("@nestjs/common");
+const core_1 = require("@rsdk/core");
+const http_errors_formatter_1 = require("./http-errors.formatter");
+const http_errors_sender_1 = require("./http-errors.sender");
+/**
+ * Специализированный фильтр для обработки ошибок NotFound.
+ * Имеет более высокий приоритет, чем GlobalExceptionsFilter,
+ * т. к. задуман для перехвата только NotFoundException. Её выбрасывает
+ * nest, когда не находит маршрут.
+ *
+ * К сожалению, эти ошибки не попадают в интерцепторы и, соответственно,
+ * приходится обрабатывать их вот так отдельно.
+ */
+let RouteNotFoundFilter = class RouteNotFoundFilter {
+    logger;
+    formatter = new http_errors_formatter_1.HttpErrorsFormatter();
+    sender = new http_errors_sender_1.HttpErrorsSender();
+    constructor(logger) {
+        this.logger = logger;
+    }
+    catch(exception, host) {
+        const ctx = host.switchToHttp();
+        const { method, path } = ctx.getRequest();
+        const pipelineEx = new core_1.NotFoundException(exception.message);
+        // Логируем ошибку со всеми деталями
+        this.logger.error(`Route not found [HTTP] ${method} ${path}`);
+        const formattedEx = this.formatter.format(pipelineEx);
+        return this.sender.send(host, formattedEx);
+    }
+};
+exports.RouteNotFoundFilter = RouteNotFoundFilter;
+exports.RouteNotFoundFilter = RouteNotFoundFilter = __decorate([
+    (0, common_1.Catch)(common_1.NotFoundException),
+    __param(0, (0, core_1.InjectLogger)(RouteNotFoundFilter)),
+    __metadata("design:paramtypes", [Object])
+], RouteNotFoundFilter);
+//# sourceMappingURL=no-interception.filter.js.map

package/dist/error-handling/no-interception.filter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"no-interception.filter.js","sourceRoot":"","sources":["../../src/error-handling/no-interception.filter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAKwB;AACxB,qCAA6D;AAI7D,mEAA8D;AAC9D,6DAAwD;AAExD;;;;;;;;GAQG;AAEI,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAKwB;IAJrC,SAAS,GAAG,IAAI,2CAAmB,EAAE,CAAC;IACtC,MAAM,GAAG,IAAI,qCAAgB,EAAE,CAAC;IAEjD,YACsD,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAClE,CAAC;IAEJ,KAAK,CACH,SAAgC,EAChC,IAAmB;QAEnB,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAChC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;QAE1C,MAAM,UAAU,GAAG,IAAI,wBAAiB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE5D,oCAAoC;QACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;QAE9D,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAEtD,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC7C,CAAC;CACF,CAAA;AAxBY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,cAAK,EAAC,0BAAqB,CAAC;IAMxB,WAAA,IAAA,mBAAY,EAAC,mBAAmB,CAAC,CAAA;;GALzB,mBAAmB,CAwB/B"}

package/dist/http.config.js

@@ -20,14 +20,14 @@ let HttpConfig = class HttpConfig extends core_1.Config {
 };
 exports.HttpConfig = HttpConfig;
 __decorate([
-    (0, core_1.Property)('HTTP_HOST', new core_1.StringParser(), {
+    (0, core_1.Property)('HTTP_HOST', new common_1.StringParser(), {
         defaultValue: '0.0.0.0',
         description: 'HTTP host',
     }),
     __metadata("design:type", String)
 ], HttpConfig.prototype, "host", void 0);
 __decorate([
-    (0, core_1.Property)('HTTP_PORT', new core_1.IntParser(), {
+    (0, core_1.Property)('HTTP_PORT', new common_1.IntParser(), {
         // eslint-disable-next-line unicorn/numeric-separators-style
         defaultValue: 50050,
         description: 'HTTP port',
@@ -35,16 +35,16 @@ __decorate([
     __metadata("design:type", Number)
 ], HttpConfig.prototype, "port", void 0);
 __decorate([
-    (0, core_1.Property)('HTTP_BODY_LIMIT', new core_1.SizeParser(), {
+    (0, core_1.Property)('HTTP_BODY_LIMIT', new common_1.SizeParser(), {
         defaultValue: new common_1.Size(100, 'kb'),
         description: 'Max HTTP body size',
     }),
     __metadata("design:type", common_1.Size)
 ], HttpConfig.prototype, "bodyLimit", void 0);
 __decorate([
-    (0, core_1.Property)('HTTP_SWAGGER_UI_ENABLED', new core_1.BoolParser(), {
+    (0, core_1.Property)('HTTP_SWAGGER_UI_ENABLED', new common_1.BoolParser(), {
         defaultValue: true,
-        description: 'Enable swagger UI on /swagger endpoint',
+        description: 'Enable swagger UI on /swagger (can be configured) endpoint',
     }),
     __metadata("design:type", Boolean)
 ], HttpConfig.prototype, "swaggerUI", void 0);

package/dist/http.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"http.config.js","sourceRoot":"","sources":["../src/http.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAoC;AACpC,qCASoB;AAKb,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,aAAM;IAK3B,IAAI,CAAU;IAOd,IAAI,CAAU;IAMd,SAAS,CAAQ;IAMjB,SAAS,CAAW;CAC9B,CAAA;AAzBY,gCAAU;AAKZ;IAJR,IAAA,eAAQ,EAAC,WAAW,EAAE,IAAI,mBAAY,EAAE,EAAE;QACzC,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,WAAW;KACzB,CAAC;;wCACqB;AAOd;IALR,IAAA,eAAQ,EAAC,WAAW,EAAE,IAAI,gBAAS,EAAE,EAAE;QACtC,4DAA4D;QAC5D,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,WAAW;KACzB,CAAC;;wCACqB;AAMd;IAJR,IAAA,eAAQ,EAAC,iBAAiB,EAAE,IAAI,iBAAU,EAAE,EAAE;QAC7C,YAAY,EAAE,IAAI,aAAI,CAAC,GAAG,EAAE,IAAI,CAAC;QACjC,WAAW,EAAE,oBAAoB;KAClC,CAAC;8BACmB,aAAI;6CAAC;AAMjB;IAJR,IAAA,eAAQ,EAAC,yBAAyB,EAAE,IAAI,iBAAU,EAAE,EAAE;QACrD,YAAY,EAAE,IAAI;QAClB,WAAW,EAAE,wCAAwC;KACtD,CAAC;;6CAC2B;qBAxBlB,UAAU;IAHtB,IAAA,oBAAa,EAAC;QACb,IAAI,EAAE,CAAC,gBAAS,CAAC,cAAc,EAAE,gBAAS,CAAC,SAAS,EAAE,gBAAS,CAAC,IAAI,CAAC;KACtE,CAAC;GACW,UAAU,CAyBtB"}
+{"version":3,"file":"http.config.js","sourceRoot":"","sources":["../src/http.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAMsB;AACtB,qCAAwE;AAKjE,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,aAAM;IAK3B,IAAI,CAAU;IAOd,IAAI,CAAU;IAMd,SAAS,CAAQ;IAMjB,SAAS,CAAW;CAC9B,CAAA;AAzBY,gCAAU;AAKZ;IAJR,IAAA,eAAQ,EAAC,WAAW,EAAE,IAAI,qBAAY,EAAE,EAAE;QACzC,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,WAAW;KACzB,CAAC;;wCACqB;AAOd;IALR,IAAA,eAAQ,EAAC,WAAW,EAAE,IAAI,kBAAS,EAAE,EAAE;QACtC,4DAA4D;QAC5D,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,WAAW;KACzB,CAAC;;wCACqB;AAMd;IAJR,IAAA,eAAQ,EAAC,iBAAiB,EAAE,IAAI,mBAAU,EAAE,EAAE;QAC7C,YAAY,EAAE,IAAI,aAAI,CAAC,GAAG,EAAE,IAAI,CAAC;QACjC,WAAW,EAAE,oBAAoB;KAClC,CAAC;8BACmB,aAAI;6CAAC;AAMjB;IAJR,IAAA,eAAQ,EAAC,yBAAyB,EAAE,IAAI,mBAAU,EAAE,EAAE;QACrD,YAAY,EAAE,IAAI;QAClB,WAAW,EAAE,4DAA4D;KAC1E,CAAC;;6CAC2B;qBAxBlB,UAAU;IAHtB,IAAA,oBAAa,EAAC;QACb,IAAI,EAAE,CAAC,gBAAS,CAAC,cAAc,EAAE,gBAAS,CAAC,SAAS,EAAE,gBAAS,CAAC,IAAI,CAAC;KACtE,CAAC;GACW,UAAU,CAyBtB"}

package/dist/http.transport.d.ts

@@ -1,10 +1,11 @@
 import { type ExecutionContext } from '@nestjs/common';
 import type { Controller, INestApplication } from '@nestjs/common/interfaces';
 import type { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.interface';
-import type { AbstractHttpAdapter } from '@nestjs/core';
-import { DocumentBuilder as OriginalDocumentBuilder } from '@nestjs/swagger';
+import { type AbstractHttpAdapter } from '@nestjs/core';
 import type { Constructor, DeepPartial } from '@rsdk/common';
-import type { ConfigContext, GenericHeaders, HttpOptions, IErrorsFormatter, IErrorsSender, IErrorsTransformer, IHttpTransport, LogFormatter } from '@rsdk/core';
+import type { ConfigContext, GenericHeaders, HttpOptions, IErrorsFormatter, IErrorsSender, IErrorsTransformer, IHttpTransport, LogFormatter, NestModuleDefinitions, PlatformContext } from '@rsdk/core';
+import type { OpenApiOptions } from '@rsdk/http.openapi';
+import type { ILogger } from '@rsdk/logging';
 import { HttpConfig } from './http.config';
 export interface ParsersConfig {
     body: {
@@ -13,12 +14,12 @@ export interface ParsersConfig {
     };
     cookie: boolean;
 }
-export type DocumentBuilder = Omit<OriginalDocumentBuilder, 'build' | 'setTitle' | 'setDescription' | 'setVersion'>;
-export interface SwaggerOptions {
-    url: string;
-    file: string;
-    configure(builder: DocumentBuilder): void;
-}
+export type SwaggerOptions = Partial<OpenApiOptions> | {
+    fromFile: string;
+};
+export declare function isFromFile(swagger: SwaggerOptions): swagger is {
+    fromFile: string;
+};
 export interface HttpTransportOptions {
     /**
      * CORS middleware options
@@ -30,7 +31,6 @@ export interface HttpTransportOptions {
     globalPrefix?: string;
     /**
      * Configuration of body and cookie parsers
-    // NOTE: This fields is actually is handled in transport specific way
      */
     parsers?: DeepPartial<ParsersConfig>;
     /**
@@ -40,11 +40,11 @@ export interface HttpTransportOptions {
      * NOTE: SwaggerUI is enabled or disabled by HTTP_SWAGGER_UI_ENABLED
      * (true by default).
      */
-    swagger?: DeepPartial<SwaggerOptions>;
+    swagger?: Record<string, SwaggerOptions>;
 }
 export declare abstract class AbstractHttpTransport implements IHttpTransport {
-    protected readonly options?: HttpTransportOptions | undefined;
-    constructor(options?: HttpTransportOptions | undefined);
+    protected readonly options: HttpTransportOptions;
+    constructor(options?: HttpTransportOptions);
     extractHeaders(ctx: ExecutionContext): GenericHeaders;
     matchByContext(ctx: ExecutionContext): boolean;
     errorFormatter(): IErrorsFormatter;
@@ -55,7 +55,8 @@ export declare abstract class AbstractHttpTransport implements IHttpTransport {
     getMetricsController(): Constructor<Controller>;
     createHttpOptions(configContext: ConfigContext): HttpOptions;
     createAdapter(configContext: ConfigContext): AbstractHttpAdapter;
-    configureApp(app: INestApplication, configContext: ConfigContext): Promise<void> | void;
+    modules(): NestModuleDefinitions;
+    configureApp(app: INestApplication, context: PlatformContext, logger: ILogger): Promise<void>;
     abstract createHttpAdapter(config: HttpConfig): AbstractHttpAdapter;
     abstract logFormatter(): LogFormatter;
 }

package/dist/http.transport.js

@@ -1,16 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractHttpTransport = void 0;
+exports.isFromFile = isFromFile;
+const core_1 = require("@nestjs/core");
 const swagger_1 = require("@nestjs/swagger");
-const core_1 = require("@rsdk/core");
-const node_fs_1 = require("node:fs");
+const common_node_1 = require("@rsdk/common.node");
+const core_2 = require("@rsdk/core");
+const http_openapi_1 = require("@rsdk/http.openapi");
+const no_interception_filter_1 = require("./error-handling/no-interception.filter");
 const controllers_1 = require("./controllers");
 const error_handling_1 = require("./error-handling");
 const http_config_1 = require("./http.config");
 const http_headers_1 = require("./http.headers");
+function isFromFile(swagger) {
+    return typeof swagger === 'object' && 'fromFile' in swagger;
+}
 class AbstractHttpTransport {
     options;
-    constructor(options) {
+    constructor(options = {}) {
         this.options = options;
     }
     extractHeaders(ctx) {
@@ -26,7 +33,7 @@ class AbstractHttpTransport {
         return new error_handling_1.HttpErrorsSender();
     }
     errorTransformers() {
-        return [new error_handling_1.HttpErrorsTransformer()];
+        return [];
     }
     getProtocol() {
         return 'http';
@@ -39,38 +46,51 @@ class AbstractHttpTransport {
     }
     createHttpOptions(configContext) {
         const { host, port } = configContext.resolve(http_config_1.HttpConfig);
-        return {
-            host,
-            port,
-        };
+        return { host, port };
     }
     createAdapter(configContext) {
         return this.createHttpAdapter(configContext.resolve(http_config_1.HttpConfig));
     }
-    configureApp(app, configContext) {
+    modules() {
+        return [
+            {
+                module: no_interception_filter_1.RouteNotFoundFilter,
+                imports: [],
+                providers: [{ provide: core_1.APP_FILTER, useClass: no_interception_filter_1.RouteNotFoundFilter }],
+            },
+        ];
+    }
+    async configureApp(app, context, logger) {
+        const configContext = await context.getConfigContext();
         const { swaggerUI } = configContext.resolve(http_config_1.HttpConfig);
-        const { globalPrefix, swagger, cors } = this.options ?? {};
+        const { globalPrefix, swagger, cors } = this.options;
         if (globalPrefix) {
             app.setGlobalPrefix(globalPrefix);
         }
         if (cors) {
             app.enableCors(cors);
         }
-        if (swaggerUI || swagger?.file) {
-            const builder = new swagger_1.DocumentBuilder()
-                .setTitle(app.get(core_1.APP_NAME))
-                .setVersion(app.get(core_1.APP_VERSION))
-                .setDescription(app.get(core_1.APP_DESCRIPTION));
-            // Applies additional configuration from user
-            swagger?.configure?.(builder);
-            const openApiConfig = builder.build();
-            const spec = swagger_1.SwaggerModule.createDocument(app, openApiConfig);
-            if (swagger?.file) {
-                (0, node_fs_1.writeFileSync)(swagger.file, JSON.stringify(spec));
-            }
-            if (swaggerUI) {
-                swagger_1.SwaggerModule.setup(swagger?.url ?? '/swagger', app, spec);
+        if (!swaggerUI || !swagger) {
+            return;
+        }
+        for (const [url, config] of Object.entries(swagger)) {
+            if (isFromFile(config)) {
+                try {
+                    const document = await (0, common_node_1.readObj)(config.fromFile);
+                    swagger_1.SwaggerModule.setup(url, app, document);
+                }
+                catch {
+                    logger.warn(`Failed to load OpenAPI spec from ${config.fromFile}`);
+                }
+                continue;
             }
+            const document = await new http_openapi_1.OpenApiGenerator(context, {
+                title: app.get(core_2.APP_NAME),
+                version: app.get(core_2.APP_VERSION),
+                description: app.get(core_2.APP_DESCRIPTION),
+                ...config,
+            }).generate();
+            swagger_1.SwaggerModule.setup(url, app, document);
         }
     }
 }

package/dist/http.transport.js.map

@@ -1 +1 @@
-{"version":3,"file":"http.transport.js","sourceRoot":"","sources":["../src/http.transport.ts"],"names":[],"mappings":";;;AAIA,6CAGyB;AAYzB,qCAAoE;AACpE,qCAAwC;AAExC,+CAA4E;AAC5E,qDAI0B;AAC1B,+CAA2C;AAC3C,iDAA6C;AAiD7C,MAAsB,qBAAqB;IACV;IAA/B,YAA+B,OAA8B;QAA9B,YAAO,GAAP,OAAO,CAAuB;IAAG,CAAC;IAEjE,cAAc,CAAC,GAAqB;QAClC,OAAO,IAAI,0BAAW,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,cAAc,CAAC,GAAqB;QAClC,OAAO,GAAG,CAAC,OAAO,EAAE,KAAK,MAAM,CAAC;IAClC,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,oCAAmB,EAAE,CAAC;IACnC,CAAC;IAED,WAAW;QACT,OAAO,IAAI,iCAAgB,EAAE,CAAC;IAChC,CAAC;IAED,iBAAiB;QACf,OAAO,CAAC,IAAI,sCAAqB,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,WAAW;QACT,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,mBAAmB;QACjB,OAAO,kCAAoB,CAAC;IAC9B,CAAC;IAED,oBAAoB;QAClB,OAAO,mCAAqB,CAAC;IAC/B,CAAC;IAED,iBAAiB,CAAC,aAA4B;QAC5C,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,wBAAU,CAAC,CAAC;QAEzD,OAAO;YACL,IAAI;YACJ,IAAI;SACL,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,aAA4B;QACxC,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,wBAAU,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,YAAY,CACV,GAAqB,EACrB,aAA4B;QAE5B,MAAM,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,wBAAU,CAAC,CAAC;QACxD,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;QAC3D,IAAI,YAAY,EAAE,CAAC;YACjB,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,IAAI,EAAE,CAAC;YACT,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;QAED,IAAI,SAAS,IAAI,OAAO,EAAE,IAAI,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,IAAI,yBAAuB,EAAE;iBAC1C,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,eAAQ,CAAC,CAAC;iBAC3B,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,kBAAW,CAAC,CAAC;iBAChC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAe,CAAC,CAAC,CAAC;YAE5C,6CAA6C;YAC7C,OAAO,EAAE,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC;YAE9B,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,uBAAa,CAAC,cAAc,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;YAE9D,IAAI,OAAO,EAAE,IAAI,EAAE,CAAC;gBAClB,IAAA,uBAAa,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,uBAAa,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,UAAU,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;IACH,CAAC;CAKF;AAtFD,sDAsFC"}
+{"version":3,"file":"http.transport.js","sourceRoot":"","sources":["../src/http.transport.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/http.server",
-  "version": "6.0.0-next.1",
+  "version": "6.0.0-next.11",
   "description": "HTTP transport for rsdk apps (needs some of HTTP adapters)",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -15,13 +15,16 @@
     "@nestjs/core": "^10.0.0",
     "@nestjs/swagger": "^7.0.0 || ^8.0.0",
     "@rsdk/common": "*",
+    "@rsdk/common.node": "*",
     "@rsdk/core": "*",
+    "@rsdk/http.openapi": "*",
     "@rsdk/logging": "*",
     "@rsdk/zones": "*",
     "body-parser": "^1.20.1",
     "cookie-parser": "^1.4.6",
+    "lodash": "^4.17.21",
     "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.8.1"
   },
-  "gitHead": "3114a76df17cf98d6f3cbb8a931599a883af6783"
+  "gitHead": "e4a3d962f23e2c4ea39ec08e07628290f54812a6"
 }

package/src/error-handling/index.ts

@@ -1,3 +1,3 @@
 export * from './http-errors.formatter';
 export * from './http-errors.sender';
-export * from './http-errors.transformer';
+export * from './no-interception.filter';

package/src/error-handling/no-interception.filter.ts

@@ -0,0 +1,48 @@
+import {
+  ArgumentsHost,
+  Catch,
+  ExceptionFilter,
+  NotFoundException as NestNotFoundException,
+} from '@nestjs/common';
+import { InjectLogger, NotFoundException } from '@rsdk/core';
+import { ILogger } from '@rsdk/logging';
+import { Observable } from 'rxjs';
+
+import { HttpErrorsFormatter } from './http-errors.formatter';
+import { HttpErrorsSender } from './http-errors.sender';
+
+/**
+ * Специализированный фильтр для обработки ошибок NotFound.
+ * Имеет более высокий приоритет, чем GlobalExceptionsFilter,
+ * т. к. задуман для перехвата только NotFoundException. Её выбрасывает
+ * nest, когда не находит маршрут.
+ *
+ * К сожалению, эти ошибки не попадают в интерцепторы и, соответственно,
+ * приходится обрабатывать их вот так отдельно.
+ */
+@Catch(NestNotFoundException)
+export class RouteNotFoundFilter implements ExceptionFilter {
+  private readonly formatter = new HttpErrorsFormatter();
+  private readonly sender = new HttpErrorsSender();
+
+  constructor(
+    @InjectLogger(RouteNotFoundFilter) private readonly logger: ILogger,
+  ) {}
+
+  catch(
+    exception: NestNotFoundException,
+    host: ArgumentsHost,
+  ): Observable<any> {
+    const ctx = host.switchToHttp();
+    const { method, path } = ctx.getRequest();
+
+    const pipelineEx = new NotFoundException(exception.message);
+
+    // Логируем ошибку со всеми деталями
+    this.logger.error(`Route not found [HTTP] ${method} ${path}`);
+
+    const formattedEx = this.formatter.format(pipelineEx);
+
+    return this.sender.send(host, formattedEx);
+  }
+}

package/src/http.config.ts

@@ -1,14 +1,11 @@
-import { Size } from '@rsdk/common';
 import {
   BoolParser,
-  Config,
-  ConfigSection,
-  ConfigTag,
   IntParser,
-  Property,
+  Size,
   SizeParser,
   StringParser,
-} from '@rsdk/core';
+} from '@rsdk/common';
+import { Config, ConfigSection, ConfigTag, Property } from '@rsdk/core';
 
 @ConfigSection({
   tags: [ConfigTag.infrastructure, ConfigTag.transport, ConfigTag.http],
@@ -35,7 +32,7 @@ export class HttpConfig extends Config {
 
   @Property('HTTP_SWAGGER_UI_ENABLED', new BoolParser(), {
     defaultValue: true,
-    description: 'Enable swagger UI on /swagger endpoint',
+    description: 'Enable swagger UI on /swagger (can be configured) endpoint',
   })
   readonly swaggerUI!: boolean;
 }

package/src/http.transport.ts

@@ -1,12 +1,11 @@
 import { type ExecutionContext } from '@nestjs/common';
 import type { Controller, INestApplication } from '@nestjs/common/interfaces';
 import type { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.interface';
-import type { AbstractHttpAdapter } from '@nestjs/core';
-import {
-  DocumentBuilder as OriginalDocumentBuilder,
-  SwaggerModule,
-} from '@nestjs/swagger';
+import { type AbstractHttpAdapter, APP_FILTER } from '@nestjs/core';
+import type { OpenAPIObject } from '@nestjs/swagger';
+import { SwaggerModule } from '@nestjs/swagger';
 import type { Constructor, DeepPartial } from '@rsdk/common';
+import { readObj } from '@rsdk/common.node';
 import type {
   ConfigContext,
   GenericHeaders,
@@ -16,16 +15,18 @@ import type {
   IErrorsTransformer,
   IHttpTransport,
   LogFormatter,
+  NestModuleDefinitions,
+  PlatformContext,
 } from '@rsdk/core';
 import { APP_DESCRIPTION, APP_NAME, APP_VERSION } from '@rsdk/core';
-import { writeFileSync } from 'node:fs';
+import type { OpenApiOptions } from '@rsdk/http.openapi';
+import { OpenApiGenerator } from '@rsdk/http.openapi';
+import type { ILogger } from '@rsdk/logging';
+import _ from 'lodash';
 
+import { RouteNotFoundFilter } from './error-handling/no-interception.filter';
 import { HealthHttpController, MetricsHttpController } from './controllers';
-import {
-  HttpErrorsFormatter,
-  HttpErrorsSender,
-  HttpErrorsTransformer,
-} from './error-handling';
+import { HttpErrorsFormatter, HttpErrorsSender } from './error-handling';
 import { HttpConfig } from './http.config';
 import { HttpHeaders } from './http.headers';
 
@@ -37,16 +38,12 @@ export interface ParsersConfig {
   cookie: boolean;
 }
 
-export type DocumentBuilder = Omit<
-  OriginalDocumentBuilder,
-  'build' | 'setTitle' | 'setDescription' | 'setVersion'
->;
+export type SwaggerOptions = Partial<OpenApiOptions> | { fromFile: string };
 
-export interface SwaggerOptions {
-  url: string;
-  file: string;
-
-  configure(builder: DocumentBuilder): void;
+export function isFromFile(
+  swagger: SwaggerOptions,
+): swagger is { fromFile: string } {
+  return typeof swagger === 'object' && 'fromFile' in swagger;
 }
 
 export interface HttpTransportOptions {
@@ -62,7 +59,6 @@ export interface HttpTransportOptions {
 
   /**
    * Configuration of body and cookie parsers
-  // NOTE: This fields is actually is handled in transport specific way
    */
   parsers?: DeepPartial<ParsersConfig>;
 
@@ -73,11 +69,11 @@ export interface HttpTransportOptions {
    * NOTE: SwaggerUI is enabled or disabled by HTTP_SWAGGER_UI_ENABLED
    * (true by default).
    */
-  swagger?: DeepPartial<SwaggerOptions>;
+  swagger?: Record<string, SwaggerOptions>;
 }
 
 export abstract class AbstractHttpTransport implements IHttpTransport {
-  constructor(protected readonly options?: HttpTransportOptions) {}
+  constructor(protected readonly options: HttpTransportOptions = {}) {}
 
   extractHeaders(ctx: ExecutionContext): GenericHeaders {
     return new HttpHeaders(ctx);
@@ -96,7 +92,7 @@ export abstract class AbstractHttpTransport implements IHttpTransport {
   }
 
   errorTransformers(): IErrorsTransformer[] {
-    return [new HttpErrorsTransformer()];
+    return [];
   }
 
   getProtocol(): string {
@@ -114,48 +110,65 @@ export abstract class AbstractHttpTransport implements IHttpTransport {
   createHttpOptions(configContext: ConfigContext): HttpOptions {
     const { host, port } = configContext.resolve(HttpConfig);
 
-    return {
-      host,
-      port,
-    };
+    return { host, port };
   }
 
   createAdapter(configContext: ConfigContext): AbstractHttpAdapter {
     return this.createHttpAdapter(configContext.resolve(HttpConfig));
   }
 
-  configureApp(
+  modules(): NestModuleDefinitions {
+    return [
+      {
+        module: RouteNotFoundFilter,
+        imports: [],
+        providers: [{ provide: APP_FILTER, useClass: RouteNotFoundFilter }],
+      },
+    ];
+  }
+
+  async configureApp(
     app: INestApplication,
-    configContext: ConfigContext,
-  ): Promise<void> | void {
+    context: PlatformContext,
+    logger: ILogger,
+  ): Promise<void> {
+    const configContext = await context.getConfigContext();
     const { swaggerUI } = configContext.resolve(HttpConfig);
-    const { globalPrefix, swagger, cors } = this.options ?? {};
+    const { globalPrefix, swagger, cors } = this.options;
+
     if (globalPrefix) {
       app.setGlobalPrefix(globalPrefix);
     }
+
     if (cors) {
       app.enableCors(cors);
     }
 
-    if (swaggerUI || swagger?.file) {
-      const builder = new OriginalDocumentBuilder()
-        .setTitle(app.get(APP_NAME))
-        .setVersion(app.get(APP_VERSION))
-        .setDescription(app.get(APP_DESCRIPTION));
+    if (!swaggerUI || !swagger) {
+      return;
+    }
 
-      // Applies additional configuration from user
-      swagger?.configure?.(builder);
+    for (const [url, config] of Object.entries(swagger)) {
+      if (isFromFile(config)) {
+        try {
+          const document = await readObj<OpenAPIObject>(config.fromFile);
 
-      const openApiConfig = builder.build();
-      const spec = SwaggerModule.createDocument(app, openApiConfig);
+          SwaggerModule.setup(url, app, document);
+        } catch {
+          logger.warn(`Failed to load OpenAPI spec from ${config.fromFile}`);
+        }
 
-      if (swagger?.file) {
-        writeFileSync(swagger.file, JSON.stringify(spec));
+        continue;
       }
 
-      if (swaggerUI) {
-        SwaggerModule.setup(swagger?.url ?? '/swagger', app, spec);
-      }
+      const document = await new OpenApiGenerator(context, {
+        title: app.get(APP_NAME),
+        version: app.get(APP_VERSION),
+        description: app.get(APP_DESCRIPTION),
+        ...config,
+      }).generate();
+
+      SwaggerModule.setup(url, app, document);
     }
   }
 

package/dist/error-handling/http-errors.transformer.d.ts

@@ -1,5 +0,0 @@
-import type { IErrorsTransformer, PipelineException } from '@rsdk/core';
-export declare class HttpErrorsTransformer implements IErrorsTransformer {
-    match(ex: any): boolean;
-    transform(ex: any): PipelineException;
-}

package/dist/error-handling/http-errors.transformer.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpErrorsTransformer = void 0;
-const common_1 = require("@nestjs/common");
-const core_1 = require("@rsdk/core");
-class HttpErrorsTransformer {
-    match(ex) {
-        return ex instanceof common_1.NotFoundException;
-    }
-    transform(ex) {
-        const err = new core_1.NotFoundException(ex.message);
-        err.stack = ex.stack;
-        return err;
-    }
-}
-exports.HttpErrorsTransformer = HttpErrorsTransformer;
-//# sourceMappingURL=http-errors.transformer.js.map

package/dist/error-handling/http-errors.transformer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"http-errors.transformer.js","sourceRoot":"","sources":["../../src/error-handling/http-errors.transformer.ts"],"names":[],"mappings":";;;AAAA,2CAA4E;AAE5E,qCAA+C;AAE/C,MAAa,qBAAqB;IAChC,KAAK,CAAC,EAAO;QACX,OAAO,EAAE,YAAY,0BAAqB,CAAC;IAC7C,CAAC;IAED,SAAS,CAAC,EAAO;QACf,MAAM,GAAG,GAAG,IAAI,wBAAiB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QAE9C,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC;QAErB,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAZD,sDAYC"}

package/src/error-handling/http-errors.transformer.ts

@@ -1,17 +0,0 @@
-import { NotFoundException as NestNotFoundException } from '@nestjs/common';
-import type { IErrorsTransformer, PipelineException } from '@rsdk/core';
-import { NotFoundException } from '@rsdk/core';
-
-export class HttpErrorsTransformer implements IErrorsTransformer {
-  match(ex: any): boolean {
-    return ex instanceof NestNotFoundException;
-  }
-
-  transform(ex: any): PipelineException {
-    const err = new NotFoundException(ex.message);
-
-    err.stack = ex.stack;
-
-    return err;
-  }
-}