@rsdk/http.server 5.0.0-next.2 → 5.0.0-next.3

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.0-next.3](https://github.com/R-Vision/rsdk/compare/v5.0.0-next.2...v5.0.0-next.3) (2024-07-11)
+
+### ⚠ BREAKING CHANGES
+
+* generalize tracing headers (#247)
+
+### Features
+
+* generalize tracing headers ([#247](https://github.com/R-Vision/rsdk/issues/247)) ([cee2ea6](https://github.com/R-Vision/rsdk/commit/cee2ea65c964705faf133397e285c051672c7512)), closes [#2](https://github.com/R-Vision/rsdk/issues/2) [#3](https://github.com/R-Vision/rsdk/issues/3) [#4](https://github.com/R-Vision/rsdk/issues/4) [#5](https://github.com/R-Vision/rsdk/issues/5)
+
 ## [5.0.0-next.2](https://github.com/R-Vision/rsdk/compare/v5.0.0-next.1...v5.0.0-next.2) (2024-07-10)
 
 **Note:** Version bump only for package @rsdk/http.server

package/dist/http.headers.d.ts

@@ -1,15 +1,10 @@
-import type { MaybeReadonlyArray } from '@rsdk/common.node';
-import { TracingHeaders } from '@rsdk/core/dist/tracing/types';
+import type { ArgumentsHost } from '@nestjs/common';
+import type { GenericHeaders } from '@rsdk/core';
 /**
- * @description хелпер для нормализованного извлечения заголовков из http запроса
+ * Обёртка над http-заголовками.
  */
-export declare class HttpHeaders {
-    constructor(headers: Record<string, string>);
-    get<K extends string>(key: MaybeReadonlyArray<K>): Record<K, string | undefined>;
-    get(key: string): string | undefined;
-    getTracingHeaders(): TracingHeaders;
-    getHeaders(): {
-        'x-requestid'?: string;
-    };
+export declare class HttpHeaders implements GenericHeaders {
     private normalizedHeaders;
+    constructor(ctx: ArgumentsHost);
+    get(key: string): string | undefined;
 }

package/dist/http.headers.js

@@ -1,27 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpHeaders = void 0;
-const types_1 = require("@rsdk/core/dist/tracing/types");
 /**
- * @description хелпер для нормализованного извлечения заголовков из http запроса
+ * Обёртка над http-заголовками.
  */
 class HttpHeaders {
-    constructor(headers) {
+    normalizedHeaders;
+    constructor(ctx) {
+        const req = ctx.switchToHttp().getRequest();
+        const headers = req.headers;
         this.normalizedHeaders = Object.fromEntries(Object.entries(headers).map(([k, v]) => [k.toLowerCase(), v]));
     }
     get(key) {
-        if (Array.isArray(key)) {
-            return Object.fromEntries(key.map((k) => [k, this.get(k)]));
-        }
         return this.normalizedHeaders[key.toLowerCase()];
     }
-    getTracingHeaders() {
-        return new types_1.TracingHeaders(this.getHeaders());
-    }
-    getHeaders() {
-        return this.get(types_1.tracingHeaders);
-    }
-    normalizedHeaders;
 }
 exports.HttpHeaders = HttpHeaders;
 //# sourceMappingURL=http.headers.js.map

package/dist/http.headers.js.map

@@ -1 +1 @@
-{"version":3,"file":"http.headers.js","sourceRoot":"","sources":["../src/http.headers.ts"],"names":[],"mappings":";;;AACA,yDAIuC;AAEvC;;GAEG;AACH,MAAa,WAAW;IACtB,YAAY,OAA+B;QACzC,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,WAAW,CACzC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAC9D,CAAC;IACJ,CAAC;IAQD,GAAG,CACD,GAAwC;QAExC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAE,GAAc,CAAC,WAAW,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,sBAAc,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,UAAU;QAGR,OAAO,IAAI,CAAC,GAAG,CAAC,sBAAc,CAAqB,CAAC;IACtD,CAAC;IAEO,iBAAiB,CAAyB;CACnD;AAjCD,kCAiCC"}
+{"version":3,"file":"http.headers.js","sourceRoot":"","sources":["../src/http.headers.ts"],"names":[],"mappings":";;;AAGA;;GAEG;AACH,MAAa,WAAW;IACd,iBAAiB,CAAyB;IAElD,YAAY,GAAkB;QAC5B,MAAM,GAAG,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAO,CAAC;QACjD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAiC,CAAC;QAEtD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,WAAW,CACzC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAC9D,CAAC;IACJ,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;IACnD,CAAC;CACF;AAfD,kCAeC"}

package/dist/http.transport.d.ts

@@ -1,10 +1,11 @@
-import type { ExecutionContext } from '@nestjs/common';
+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 { type AbstractHttpAdapter } from '@nestjs/core';
 import { DocumentBuilder as OriginalDocumentBuilder } from '@nestjs/swagger';
 import type { Constructor, DeepPartial } from '@rsdk/common';
-import type { ConfigContext, HttpOptions, IErrorsFormatter, IErrorsSender, IErrorsTransformer, IHttpTransport, ProtocolTracingHeadersExtractor } from '@rsdk/core';
+import type { ConfigContext, GenericHeaders, HttpOptions, IErrorsFormatter, IErrorsSender, IErrorsTransformer, IHttpTransport, NestModuleDefinitions } from '@rsdk/core';
+import { HttpConfig } from './http.config';
 export interface ParsersConfig {
     body: {
         json: boolean;
@@ -19,27 +20,42 @@ export interface SwaggerOptions {
     configure(builder: DocumentBuilder): void;
 }
 export interface HttpTransportOptions {
+    /**
+     * CORS middleware options
+     */
     cors?: CorsOptions;
+    /**
+     * Global prefix (will be used in app.setGlobalPrefix())
+     */
     globalPrefix?: string;
+    /**
+     * Configuration of body and cookie parsers
+    // NOTE: This fields is actually is handled in transport specific way
+     */
     parsers?: DeepPartial<ParsersConfig>;
+    /**
+     * Swagger options. You can configure OpenAPI document
+     * builder or set file to write on application start
+     *
+     * NOTE: SwaggerUI is enabled or disabled by HTTP_SWAGGER_UI_ENABLED
+     * (true by default).
+     */
     swagger?: DeepPartial<SwaggerOptions>;
 }
-/**
- * @deprecated use concrete implementation from @rsdk/http.server.<implementation>, example: @rsdk/http.server.{express,fastify}
- */
-export declare class HttpTransport implements IHttpTransport {
-    private readonly adapter;
-    private readonly options;
-    getHeaderExtractor(): ProtocolTracingHeadersExtractor;
-    constructor(adapter: AbstractHttpAdapter, options?: HttpTransportOptions);
+export declare abstract class AbstractHttpTransport implements IHttpTransport {
+    protected readonly options?: HttpTransportOptions | undefined;
+    constructor(options?: HttpTransportOptions | undefined);
+    extractHeaders(ctx: ExecutionContext): GenericHeaders;
     matchByContext(ctx: ExecutionContext): boolean;
-    getProtocol(): string;
-    createAdapter(): AbstractHttpAdapter;
+    modules(): NestModuleDefinitions;
     getErrorsFormatter(): IErrorsFormatter;
     getErrorsSender(): IErrorsSender;
     getErrorTransformers(): IErrorsTransformer[];
-    configureApp(app: INestApplication, configContext: ConfigContext): void | Promise<void>;
+    getProtocol(): string;
     getHealthController(): Constructor<Controller>;
     getMetricsController(): Constructor<Controller>;
     createHttpOptions(configContext: ConfigContext): HttpOptions;
+    createAdapter(configContext: ConfigContext): AbstractHttpAdapter;
+    configureApp(app: INestApplication, configContext: ConfigContext): Promise<void> | void;
+    abstract createHttpAdapter(httpConfig: HttpConfig): AbstractHttpAdapter;
 }

package/dist/http.transport.js

@@ -1,40 +1,42 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpTransport = void 0;
-const common_1 = require("@nestjs/common");
+exports.AbstractHttpTransport = void 0;
+const core_1 = require("@nestjs/core");
 const swagger_1 = require("@nestjs/swagger");
-const core_1 = require("@rsdk/core");
-const body_parser_1 = require("body-parser");
-const cookie_parser_1 = __importDefault(require("cookie-parser"));
+const core_2 = require("@rsdk/core");
 const node_fs_1 = require("node:fs");
 const controllers_1 = require("./controllers");
 const error_handling_1 = require("./error-handling");
 const http_config_1 = require("./http.config");
-const http_tracing_extractor_1 = require("./http.tracing-extractor");
-/**
- * @deprecated use concrete implementation from @rsdk/http.server.<implementation>, example: @rsdk/http.server.{express,fastify}
- */
-class HttpTransport {
-    adapter;
+const http_headers_1 = require("./http.headers");
+const http_logger_interceptor_1 = require("./http-logger.interceptor");
+class AbstractHttpTransport {
     options;
-    getHeaderExtractor() {
-        return new http_tracing_extractor_1.HttpTracingExtractor();
-    }
-    constructor(adapter, options = {}) {
-        this.adapter = adapter;
+    constructor(options) {
         this.options = options;
     }
+    extractHeaders(ctx) {
+        return new http_headers_1.HttpHeaders(ctx);
+    }
     matchByContext(ctx) {
         return ctx.getType() === 'http';
     }
-    getProtocol() {
-        return 'http';
-    }
-    createAdapter() {
-        return this.adapter;
+    modules() {
+        return [
+            {
+                /**
+                 * Abstract class is transpiled into a simple class just as not abstract classes.
+                 * But typescript doesn't like this (((
+                 */
+                module: AbstractHttpTransport,
+                providers: [
+                    {
+                        provide: core_1.APP_INTERCEPTOR,
+                        useClass: http_logger_interceptor_1.HttpLoggerInterceptor,
+                    },
+                ],
+            },
+        ];
     }
     getErrorsFormatter() {
         return new error_handling_1.HttpErrorsFormatter();
@@ -45,47 +47,39 @@ class HttpTransport {
     getErrorTransformers() {
         return [new error_handling_1.HttpErrorsTransformer()];
     }
+    getProtocol() {
+        return 'http';
+    }
+    getHealthController() {
+        return controllers_1.HealthHttpController;
+    }
+    getMetricsController() {
+        return controllers_1.MetricsHttpController;
+    }
+    createHttpOptions(configContext) {
+        const { host, port } = configContext.resolve(http_config_1.HttpConfig);
+        return {
+            host,
+            port,
+        };
+    }
+    createAdapter(configContext) {
+        return this.createHttpAdapter(configContext.resolve(http_config_1.HttpConfig));
+    }
     configureApp(app, configContext) {
-        const { bodyLimit, swaggerUI } = configContext.resolve(http_config_1.HttpConfig);
-        const { cors, globalPrefix, parsers, swagger } = this.options;
-        if (cors) {
-            app.enableCors(cors);
-        }
+        const { swaggerUI } = configContext.resolve(http_config_1.HttpConfig);
+        const { globalPrefix, swagger, cors } = this.options ?? {};
         if (globalPrefix) {
-            app.setGlobalPrefix(globalPrefix, {
-                exclude: [
-                    { method: common_1.RequestMethod.GET, path: '/metrics' },
-                    { method: common_1.RequestMethod.GET, path: '/health' },
-                ],
-            });
+            app.setGlobalPrefix(globalPrefix);
         }
-        // Temporary walkaround.
-        // To fix this we will need to create separate transports for
-        // express and fastify. Otherwise we will always have to deal
-        // with such leaky abstractions
-        if (this.adapter.constructor.name == 'ExpressAdapter') {
-            const { body, cookie } = Object.assign({
-                body: {
-                    json: true,
-                    urlencoded: false,
-                },
-                cookie: false,
-            }, parsers);
-            if (body.json) {
-                app.use((0, body_parser_1.json)({ limit: bodyLimit.bytes() }));
-            }
-            if (body.urlencoded) {
-                app.use((0, body_parser_1.urlencoded)({ extended: true, limit: bodyLimit.bytes() }));
-            }
-            if (cookie) {
-                app.use((0, cookie_parser_1.default)());
-            }
+        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));
+                .setTitle(app.get(core_2.APP_NAME))
+                .setVersion(app.get(core_2.APP_VERSION))
+                .setDescription(app.get(core_2.APP_DESCRIPTION));
             // Applies additional configuration from user
             swagger?.configure?.(builder);
             const openApiConfig = builder.build();
@@ -98,16 +92,6 @@ class HttpTransport {
             }
         }
     }
-    getHealthController() {
-        return controllers_1.HealthHttpController;
-    }
-    getMetricsController() {
-        return controllers_1.MetricsHttpController;
-    }
-    createHttpOptions(configContext) {
-        const { host, port } = configContext.resolve(http_config_1.HttpConfig);
-        return { host, port };
-    }
 }
-exports.HttpTransport = HttpTransport;
+exports.AbstractHttpTransport = AbstractHttpTransport;
 //# sourceMappingURL=http.transport.js.map

package/dist/http.transport.js.map

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

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export { AbstractRsdkHttpTransport } from './http-adapter/abstract-rsdk-http-adapter';
+export { AbstractHttpTransport } from './http.transport';
 export * from './http.transport';
 export { HttpHeaders } from './http.headers';

package/dist/index.js

@@ -14,9 +14,9 @@ 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 });
-exports.HttpHeaders = exports.AbstractRsdkHttpTransport = void 0;
-var abstract_rsdk_http_adapter_1 = require("./http-adapter/abstract-rsdk-http-adapter");
-Object.defineProperty(exports, "AbstractRsdkHttpTransport", { enumerable: true, get: function () { return abstract_rsdk_http_adapter_1.AbstractRsdkHttpTransport; } });
+exports.HttpHeaders = exports.AbstractHttpTransport = void 0;
+var http_transport_1 = require("./http.transport");
+Object.defineProperty(exports, "AbstractHttpTransport", { enumerable: true, get: function () { return http_transport_1.AbstractHttpTransport; } });
 __exportStar(require("./http.transport"), exports);
 var http_headers_1 = require("./http.headers");
 Object.defineProperty(exports, "HttpHeaders", { enumerable: true, get: function () { return http_headers_1.HttpHeaders; } });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wFAAsF;AAA7E,uIAAA,yBAAyB,OAAA;AAElC,mDAAiC;AACjC,+CAA6C;AAApC,2GAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mDAAyD;AAAhD,uHAAA,qBAAqB,OAAA;AAE9B,mDAAiC;AACjC,+CAA6C;AAApC,2GAAA,WAAW,OAAA"}

package/dist/service-routes.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceRoute = exports.ServiceRoutes = void 0;
+exports.ServiceRoutes = void 0;
+exports.ServiceRoute = ServiceRoute;
 const swagger_1 = require("@nestjs/swagger");
 /**
  * Хранение ссылок на обработчики http ручек.
@@ -19,5 +20,4 @@ function ServiceRoute() {
         return (0, swagger_1.ApiExcludeEndpoint)(true)(target, propertyKey, descriptor);
     };
 }
-exports.ServiceRoute = ServiceRoute;
 //# sourceMappingURL=service-routes.js.map

package/dist/service-routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-routes.js","sourceRoot":"","sources":["../src/service-routes.ts"],"names":[],"mappings":";;;AAAA,6CAAqD;AAErD;;;GAGG;AACH,MAAa,aAAa;IACxB,MAAM,CAAC,OAAO,GAIR,EAAE,CAAC;;AALX,sCAMC;AAED;;GAEG;AACH,SAAgB,YAAY;IAC1B,OAAO,CAAC,MAAW,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE;QAC9C,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;QAChE,OAAO,IAAA,4BAAkB,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IACnE,CAAC,CAAC;AACJ,CAAC;AALD,oCAKC"}
+{"version":3,"file":"service-routes.js","sourceRoot":"","sources":["../src/service-routes.ts"],"names":[],"mappings":";;;AAiBA,oCAKC;AAtBD,6CAAqD;AAErD;;;GAGG;AACH,MAAa,aAAa;IACxB,MAAM,CAAC,OAAO,GAIR,EAAE,CAAC;;AALX,sCAMC;AAED;;GAEG;AACH,SAAgB,YAAY;IAC1B,OAAO,CAAC,MAAW,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE;QAC9C,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;QAChE,OAAO,IAAA,4BAAkB,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IACnE,CAAC,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/http.server",
-  "version": "5.0.0-next.2",
+  "version": "5.0.0-next.3",
   "description": "HTTP transport for rsdk apps (needs some of HTTP adapters)",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -14,7 +14,6 @@
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
     "@nestjs/swagger": "^7.0.0",
-    "@opentelemetry/semantic-conventions": "1.18.1",
     "@rsdk/common": "*",
     "@rsdk/core": "*",
     "@rsdk/logging": "*",
@@ -23,5 +22,5 @@
     "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.8.1"
   },
-  "gitHead": "b1e624d9bd7734c4346cb5747feea7d2199535d0"
+  "gitHead": "c75ce1d8983ba69a6f855ba19536d28be0a9c519"
 }

package/src/http.headers.ts

@@ -1,44 +1,22 @@
-import type { MaybeReadonlyArray } from '@rsdk/common.node';
-import {
-  type Headers,
-  TracingHeaders,
-  tracingHeaders,
-} from '@rsdk/core/dist/tracing/types';
+import type { ArgumentsHost } from '@nestjs/common';
+import type { GenericHeaders } from '@rsdk/core';
 
 /**
- * @description хелпер для нормализованного извлечения заголовков из http запроса
+ * Обёртка над http-заголовками.
  */
-export class HttpHeaders {
-  constructor(headers: Record<string, string>) {
+export class HttpHeaders implements GenericHeaders {
+  private normalizedHeaders: Record<string, string>;
+
+  constructor(ctx: ArgumentsHost) {
+    const req = ctx.switchToHttp().getRequest<any>();
+    const headers = req.headers as Record<string, string>;
+
     this.normalizedHeaders = Object.fromEntries(
       Object.entries(headers).map(([k, v]) => [k.toLowerCase(), v]),
     );
   }
 
-  get<K extends string>(
-    key: MaybeReadonlyArray<K>,
-  ): Record<K, string | undefined>;
-
-  get(key: string): string | undefined;
-
-  get(
-    key: string | MaybeReadonlyArray<string>,
-  ): Record<string, string | undefined> | string | undefined {
-    if (Array.isArray(key)) {
-      return Object.fromEntries(key.map((k) => [k, this.get(k)]));
-    }
-    return this.normalizedHeaders[(key as string).toLowerCase()];
+  get(key: string): string | undefined {
+    return this.normalizedHeaders[key.toLowerCase()];
   }
-
-  getTracingHeaders(): TracingHeaders {
-    return new TracingHeaders(this.getHeaders());
-  }
-
-  getHeaders(): {
-    'x-requestid'?: string;
-  } {
-    return this.get(tracingHeaders) as Partial<Headers>;
-  }
-
-  private normalizedHeaders: Record<string, string>;
 }

package/src/http.transport.ts

@@ -1,8 +1,7 @@
-import type { ExecutionContext } from '@nestjs/common';
-import { RequestMethod } from '@nestjs/common';
+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 { type AbstractHttpAdapter, APP_INTERCEPTOR } from '@nestjs/core';
 import {
   DocumentBuilder as OriginalDocumentBuilder,
   SwaggerModule,
@@ -10,16 +9,15 @@ import {
 import type { Constructor, DeepPartial } from '@rsdk/common';
 import type {
   ConfigContext,
+  GenericHeaders,
   HttpOptions,
   IErrorsFormatter,
   IErrorsSender,
   IErrorsTransformer,
   IHttpTransport,
-  ProtocolTracingHeadersExtractor,
+  NestModuleDefinitions,
 } from '@rsdk/core';
 import { APP_DESCRIPTION, APP_NAME, APP_VERSION } from '@rsdk/core';
-import { json, urlencoded } from 'body-parser';
-import cookieParser from 'cookie-parser';
 import { writeFileSync } from 'node:fs';
 
 import { HealthHttpController, MetricsHttpController } from './controllers';
@@ -29,7 +27,8 @@ import {
   HttpErrorsTransformer,
 } from './error-handling';
 import { HttpConfig } from './http.config';
-import { HttpTracingExtractor } from './http.tracing-extractor';
+import { HttpHeaders } from './http.headers';
+import { HttpLoggerInterceptor } from './http-logger.interceptor';
 
 export interface ParsersConfig {
   body: {
@@ -52,52 +51,59 @@ export interface SwaggerOptions {
 }
 
 export interface HttpTransportOptions {
-  // CORS middleware options
+  /**
+   * CORS middleware options
+   */
   cors?: CorsOptions;
 
-  // Global prefix (will be used in app.setGlobalPrefix())
+  /**
+   * Global prefix (will be used in app.setGlobalPrefix())
+   */
   globalPrefix?: string;
 
-  // Configuration of body and cookie parsers
-  // WARNING: Has no effect on FastifyAdapter. Use FastifyAdapter
-  // constructor options instead
+  /**
+   * Configuration of body and cookie parsers
+  // NOTE: This fields is actually is handled in transport specific way
+   */
   parsers?: DeepPartial<ParsersConfig>;
 
-  // Swagger options. You can configure OpenAPI document
-  // builder or set file to write on application start
-  // NOTE: SwaggerUI is enabled or disabled by HTTP_SWAGGER_UI_ENABLED
-  // (true by default).
-
-  // TODO: It terrible to generate file on application start. Would be
-  // much better if we could get OpenAPI spec on demand without actually
-  // running the app. Unfortunately there is no way to do it in Nest.js 9.
-  // Planned in https://jira.rvision.pro/browse/PFM-134
+  /**
+   * Swagger options. You can configure OpenAPI document
+   * builder or set file to write on application start
+   *
+   * NOTE: SwaggerUI is enabled or disabled by HTTP_SWAGGER_UI_ENABLED
+   * (true by default).
+   */
   swagger?: DeepPartial<SwaggerOptions>;
 }
 
-/**
- * @deprecated use concrete implementation from @rsdk/http.server.<implementation>, example: @rsdk/http.server.{express,fastify}
- */
-export class HttpTransport implements IHttpTransport {
-  getHeaderExtractor(): ProtocolTracingHeadersExtractor {
-    return new HttpTracingExtractor();
-  }
+export abstract class AbstractHttpTransport implements IHttpTransport {
+  constructor(protected readonly options?: HttpTransportOptions) {}
 
-  constructor(
-    private readonly adapter: AbstractHttpAdapter,
-    private readonly options: HttpTransportOptions = {},
-  ) {}
+  extractHeaders(ctx: ExecutionContext): GenericHeaders {
+    return new HttpHeaders(ctx);
+  }
 
   matchByContext(ctx: ExecutionContext): boolean {
     return ctx.getType() === 'http';
   }
 
-  getProtocol(): string {
-    return 'http';
-  }
-
-  createAdapter(): AbstractHttpAdapter {
-    return this.adapter;
+  modules(): NestModuleDefinitions {
+    return [
+      {
+        /**
+         * Abstract class is transpiled into a simple class just as not abstract classes.
+         * But typescript doesn't like this (((
+         */
+        module: AbstractHttpTransport as any,
+        providers: [
+          {
+            provide: APP_INTERCEPTOR,
+            useClass: HttpLoggerInterceptor,
+          },
+        ],
+      },
+    ];
   }
 
   getErrorsFormatter(): IErrorsFormatter {
@@ -112,53 +118,42 @@ export class HttpTransport implements IHttpTransport {
     return [new HttpErrorsTransformer()];
   }
 
-  configureApp(
-    app: INestApplication,
-    configContext: ConfigContext,
-  ): void | Promise<void> {
-    const { bodyLimit, swaggerUI } = configContext.resolve(HttpConfig);
-    const { cors, globalPrefix, parsers, swagger } = this.options;
+  getProtocol(): string {
+    return 'http';
+  }
 
-    if (cors) {
-      app.enableCors(cors);
-    }
+  getHealthController(): Constructor<Controller> {
+    return HealthHttpController;
+  }
 
-    if (globalPrefix) {
-      app.setGlobalPrefix(globalPrefix, {
-        exclude: [
-          { method: RequestMethod.GET, path: '/metrics' },
-          { method: RequestMethod.GET, path: '/health' },
-        ],
-      });
-    }
+  getMetricsController(): Constructor<Controller> {
+    return MetricsHttpController;
+  }
 
-    // Temporary walkaround.
-    // To fix this we will need to create separate transports for
-    // express and fastify. Otherwise we will always have to deal
-    // with such leaky abstractions
-    if (this.adapter.constructor.name == 'ExpressAdapter') {
-      const { body, cookie }: ParsersConfig = Object.assign(
-        {
-          body: {
-            json: true,
-            urlencoded: false,
-          },
-          cookie: false,
-        },
-        parsers,
-      );
+  createHttpOptions(configContext: ConfigContext): HttpOptions {
+    const { host, port } = configContext.resolve(HttpConfig);
 
-      if (body.json) {
-        app.use(json({ limit: bodyLimit.bytes() }));
-      }
+    return {
+      host,
+      port,
+    };
+  }
 
-      if (body.urlencoded) {
-        app.use(urlencoded({ extended: true, limit: bodyLimit.bytes() }));
-      }
+  createAdapter(configContext: ConfigContext): AbstractHttpAdapter {
+    return this.createHttpAdapter(configContext.resolve(HttpConfig));
+  }
 
-      if (cookie) {
-        app.use(cookieParser());
-      }
+  configureApp(
+    app: INestApplication,
+    configContext: ConfigContext,
+  ): Promise<void> | void {
+    const { swaggerUI } = configContext.resolve(HttpConfig);
+    const { globalPrefix, swagger, cors } = this.options ?? {};
+    if (globalPrefix) {
+      app.setGlobalPrefix(globalPrefix);
+    }
+    if (cors) {
+      app.enableCors(cors);
     }
 
     if (swaggerUI || swagger?.file) {
@@ -183,17 +178,5 @@ export class HttpTransport implements IHttpTransport {
     }
   }
 
-  getHealthController(): Constructor<Controller> {
-    return HealthHttpController;
-  }
-
-  getMetricsController(): Constructor<Controller> {
-    return MetricsHttpController;
-  }
-
-  createHttpOptions(configContext: ConfigContext): HttpOptions {
-    const { host, port } = configContext.resolve(HttpConfig);
-
-    return { host, port };
-  }
+  abstract createHttpAdapter(httpConfig: HttpConfig): AbstractHttpAdapter;
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-export { AbstractRsdkHttpTransport } from './http-adapter/abstract-rsdk-http-adapter';
+export { AbstractHttpTransport } from './http.transport';
 
 export * from './http.transport';
 export { HttpHeaders } from './http.headers';

package/dist/http-adapter/abstract-rsdk-http-adapter.d.ts

@@ -1,28 +0,0 @@
-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 type { Constructor, DeepPartial } from '@rsdk/common';
-import type { ConfigContext, HttpOptions, IErrorsFormatter, IErrorsSender, IErrorsTransformer, IHttpTransport, NestModuleDefinitions, ProtocolTracingHeadersExtractor } from '@rsdk/core';
-import { HttpConfig } from '../http.config';
-import type { SwaggerOptions } from '../http.transport';
-export declare abstract class AbstractRsdkHttpTransport implements IHttpTransport {
-    getHeaderExtractor(): ProtocolTracingHeadersExtractor;
-    abstract readonly options?: {
-        cors?: CorsOptions;
-        globalPrefix?: string;
-        swagger?: DeepPartial<SwaggerOptions>;
-    };
-    matchByContext(ctx: ExecutionContext): boolean;
-    modules(): NestModuleDefinitions;
-    getErrorsFormatter(): IErrorsFormatter;
-    getErrorsSender(): IErrorsSender;
-    getErrorTransformers(): IErrorsTransformer[];
-    getProtocol(): string;
-    getHealthController(): Constructor<Controller>;
-    getMetricsController(): Constructor<Controller>;
-    createHttpOptions(configContext: ConfigContext): HttpOptions;
-    createAdapter(configContext: ConfigContext): AbstractHttpAdapter;
-    configureApp(app: INestApplication, configContext: ConfigContext): Promise<void> | void;
-    abstract createHttpAdapter(httpConfig: HttpConfig): AbstractHttpAdapter;
-}

package/dist/http-adapter/abstract-rsdk-http-adapter.js

@@ -1,96 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbstractRsdkHttpTransport = void 0;
-const core_1 = require("@nestjs/core");
-const swagger_1 = require("@nestjs/swagger");
-const document_builder_1 = require("@nestjs/swagger/dist/document-builder");
-const core_2 = require("@rsdk/core");
-const node_fs_1 = require("node:fs");
-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");
-const http_logger_interceptor_1 = require("../http-logger.interceptor");
-class AbstractRsdkHttpTransport {
-    getHeaderExtractor() {
-        return {
-            extract(executionContext) {
-                // TODO:
-                const req = executionContext.switchToHttp().getRequest();
-                return new http_headers_1.HttpHeaders(req.headers).getTracingHeaders();
-            },
-        };
-    }
-    matchByContext(ctx) {
-        return ctx.getType() === 'http';
-    }
-    modules() {
-        return [
-            {
-                module: AbstractRsdkHttpTransport,
-                providers: [
-                    {
-                        provide: core_1.APP_INTERCEPTOR,
-                        useClass: http_logger_interceptor_1.HttpLoggerInterceptor,
-                    },
-                ],
-            },
-        ];
-    }
-    getErrorsFormatter() {
-        return new error_handling_1.HttpErrorsFormatter();
-    }
-    getErrorsSender() {
-        return new error_handling_1.HttpErrorsSender();
-    }
-    getErrorTransformers() {
-        return [new error_handling_1.HttpErrorsTransformer()];
-    }
-    getProtocol() {
-        return 'http';
-    }
-    getHealthController() {
-        return controllers_1.HealthHttpController;
-    }
-    getMetricsController() {
-        return controllers_1.MetricsHttpController;
-    }
-    createHttpOptions(configContext) {
-        const { host, port } = configContext.resolve(http_config_1.HttpConfig);
-        return {
-            host,
-            port,
-        };
-    }
-    createAdapter(configContext) {
-        return this.createHttpAdapter(configContext.resolve(http_config_1.HttpConfig));
-    }
-    configureApp(app, configContext) {
-        const { swaggerUI } = configContext.resolve(http_config_1.HttpConfig);
-        const { globalPrefix, swagger, cors } = this.options ?? {};
-        if (globalPrefix) {
-            app.setGlobalPrefix(globalPrefix);
-        }
-        if (cors) {
-            app.enableCors(cors);
-        }
-        if (swaggerUI || swagger?.file) {
-            const builder = new document_builder_1.DocumentBuilder()
-                .setTitle(app.get(core_2.APP_NAME))
-                .setVersion(app.get(core_2.APP_VERSION))
-                .setDescription(app.get(core_2.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);
-            }
-        }
-    }
-}
-exports.AbstractRsdkHttpTransport = AbstractRsdkHttpTransport;
-//# sourceMappingURL=abstract-rsdk-http-adapter.js.map

package/dist/http-adapter/abstract-rsdk-http-adapter.js.map

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

package/dist/http.tracing-extractor.d.ts

@@ -1,6 +0,0 @@
-import type { ArgumentsHost } from '@nestjs/common';
-import type { ProtocolTracingHeadersExtractor } from '@rsdk/core';
-import type { TracingHeaders } from '@rsdk/core/dist/tracing/types';
-export declare class HttpTracingExtractor implements ProtocolTracingHeadersExtractor {
-    extract(executionContext: ArgumentsHost): TracingHeaders;
-}

package/dist/http.tracing-extractor.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpTracingExtractor = void 0;
-const http_headers_1 = require("./http.headers");
-class HttpTracingExtractor {
-    extract(executionContext) {
-        // TODO:
-        const req = executionContext.switchToHttp().getRequest();
-        return new http_headers_1.HttpHeaders(req.headers).getTracingHeaders();
-    }
-}
-exports.HttpTracingExtractor = HttpTracingExtractor;
-//# sourceMappingURL=http.tracing-extractor.js.map

package/dist/http.tracing-extractor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"http.tracing-extractor.js","sourceRoot":"","sources":["../src/http.tracing-extractor.ts"],"names":[],"mappings":";;;AAIA,iDAA6C;AAE7C,MAAa,oBAAoB;IAC/B,OAAO,CAAC,gBAA+B;QACrC,QAAQ;QACR,MAAM,GAAG,GAAG,gBAAgB,CAAC,YAAY,EAAE,CAAC,UAAU,EAAO,CAAC;QAE9D,OAAO,IAAI,0BAAW,CACpB,GAAG,CAAC,OAAiC,CACtC,CAAC,iBAAiB,EAAE,CAAC;IACxB,CAAC;CACF;AATD,oDASC"}

package/src/http-adapter/abstract-rsdk-http-adapter.ts

@@ -1,158 +0,0 @@
-import type { ArgumentsHost, 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 { APP_INTERCEPTOR } from '@nestjs/core';
-import { SwaggerModule } from '@nestjs/swagger';
-import { DocumentBuilder as OriginalDocumentBuilder } from '@nestjs/swagger/dist/document-builder';
-import type { Constructor, DeepPartial } from '@rsdk/common';
-import type {
-  ConfigContext,
-  HttpOptions,
-  IErrorsFormatter,
-  IErrorsSender,
-  IErrorsTransformer,
-  IHttpTransport,
-  NestModuleDefinitions,
-  ProtocolTracingHeadersExtractor,
-} from '@rsdk/core';
-import { APP_DESCRIPTION, APP_NAME, APP_VERSION } from '@rsdk/core';
-import type { TracingHeaders } from '@rsdk/core/dist/tracing/types';
-import { writeFileSync } from 'node:fs';
-
-import { HealthHttpController, MetricsHttpController } from '../controllers';
-import {
-  HttpErrorsFormatter,
-  HttpErrorsSender,
-  HttpErrorsTransformer,
-} from '../error-handling';
-import { HttpConfig } from '../http.config';
-import { HttpHeaders } from '../http.headers';
-import type { SwaggerOptions } from '../http.transport';
-import { HttpLoggerInterceptor } from '../http-logger.interceptor';
-
-export abstract class AbstractRsdkHttpTransport implements IHttpTransport {
-  getHeaderExtractor(): ProtocolTracingHeadersExtractor {
-    return {
-      extract(executionContext: ArgumentsHost): TracingHeaders {
-        // TODO:
-        const req = executionContext.switchToHttp().getRequest<any>();
-
-        return new HttpHeaders(
-          req.headers as Record<string, string>,
-        ).getTracingHeaders();
-      },
-    };
-  }
-
-  abstract readonly options?: {
-    // CORS middleware options
-    cors?: CorsOptions;
-
-    // Global prefix (will be used in app.setGlobalPrefix())
-    globalPrefix?: string;
-
-    // Swagger options. You can configure OpenAPI document
-    // builder or set file to write on application start
-    // NOTE: SwaggerUI is enabled or disabled by HTTP_SWAGGER_UI_ENABLED
-    // (true by default).
-
-    // TODO: It terrible to generate file on application start. Would be
-    // much better if we could get OpenAPI spec on demand without actually
-    // running the app. Unfortunately there is no way to do it in Nest.js 9.
-    // Planned in https://jira.rvision.pro/browse/PFM-134
-    swagger?: DeepPartial<SwaggerOptions>;
-  };
-
-  matchByContext(ctx: ExecutionContext): boolean {
-    return ctx.getType() === 'http';
-  }
-
-  modules(): NestModuleDefinitions {
-    return [
-      {
-        module: AbstractRsdkHttpTransport as any,
-        providers: [
-          {
-            provide: APP_INTERCEPTOR,
-            useClass: HttpLoggerInterceptor,
-          },
-        ],
-      },
-    ];
-  }
-
-  getErrorsFormatter(): IErrorsFormatter {
-    return new HttpErrorsFormatter();
-  }
-
-  getErrorsSender(): IErrorsSender {
-    return new HttpErrorsSender();
-  }
-
-  getErrorTransformers(): IErrorsTransformer[] {
-    return [new HttpErrorsTransformer()];
-  }
-
-  getProtocol(): string {
-    return 'http';
-  }
-
-  getHealthController(): Constructor<Controller> {
-    return HealthHttpController;
-  }
-
-  getMetricsController(): Constructor<Controller> {
-    return MetricsHttpController;
-  }
-
-  createHttpOptions(configContext: ConfigContext): HttpOptions {
-    const { host, port } = configContext.resolve(HttpConfig);
-
-    return {
-      host,
-      port,
-    };
-  }
-
-  createAdapter(configContext: ConfigContext): AbstractHttpAdapter {
-    return this.createHttpAdapter(configContext.resolve(HttpConfig));
-  }
-
-  configureApp(
-    app: INestApplication,
-    configContext: ConfigContext,
-  ): Promise<void> | void {
-    const { swaggerUI } = configContext.resolve(HttpConfig);
-    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));
-
-      // Applies additional configuration from user
-      swagger?.configure?.(builder);
-
-      const openApiConfig = builder.build();
-      const spec = SwaggerModule.createDocument(app, openApiConfig);
-
-      if (swagger?.file) {
-        writeFileSync(swagger.file, JSON.stringify(spec));
-      }
-
-      if (swaggerUI) {
-        SwaggerModule.setup(swagger?.url ?? '/swagger', app, spec);
-      }
-    }
-  }
-
-  abstract createHttpAdapter(httpConfig: HttpConfig): AbstractHttpAdapter;
-}

package/src/http.tracing-extractor.ts

@@ -1,16 +0,0 @@
-import type { ArgumentsHost } from '@nestjs/common';
-import type { ProtocolTracingHeadersExtractor } from '@rsdk/core';
-import type { TracingHeaders } from '@rsdk/core/dist/tracing/types';
-
-import { HttpHeaders } from './http.headers';
-
-export class HttpTracingExtractor implements ProtocolTracingHeadersExtractor {
-  extract(executionContext: ArgumentsHost): TracingHeaders {
-    // TODO:
-    const req = executionContext.switchToHttp().getRequest<any>();
-
-    return new HttpHeaders(
-      req.headers as Record<string, string>,
-    ).getTracingHeaders();
-  }
-}