@rsdk/http.server 5.7.0-next.6 → 6.0.0-next.1

package/dist/controllers/health.http-controller.d.ts

@@ -1,5 +1,4 @@
-import type { CheckSummary } from '@rsdk/core';
-import { HealthChecksService } from '@rsdk/core';
+import { CheckSummary, HealthChecksService } from '@rsdk/core';
 export declare class HealthHttpController {
     private readonly health;
     constructor(health: HealthChecksService);

package/dist/controllers/health.http-controller.js

@@ -14,8 +14,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HealthHttpController = void 0;
 const common_1 = require("@nestjs/common");
+const swagger_1 = require("@nestjs/swagger");
 const core_1 = require("@rsdk/core");
-const service_routes_1 = require("../service-routes");
+const zones_1 = require("@rsdk/zones");
 let HealthHttpController = class HealthHttpController {
     health;
     constructor(health) {
@@ -28,7 +29,6 @@ let HealthHttpController = class HealthHttpController {
 exports.HealthHttpController = HealthHttpController;
 __decorate([
     (0, common_1.Get)('health'),
-    (0, service_routes_1.ServiceRoute)(),
     __param(0, (0, common_1.Query)('filter')),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
@@ -36,6 +36,8 @@ __decorate([
 ], HealthHttpController.prototype, "ready", null);
 exports.HealthHttpController = HealthHttpController = __decorate([
     (0, common_1.Controller)(),
+    (0, swagger_1.ApiTags)('Maintenance'),
+    (0, zones_1.Internal)(),
     __metadata("design:paramtypes", [core_1.HealthChecksService])
 ], HealthHttpController);
 //# sourceMappingURL=health.http-controller.js.map

package/dist/controllers/health.http-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"health.http-controller.js","sourceRoot":"","sources":["../../src/controllers/health.http-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwD;AAExD,qCAAiD;AAEjD,sDAAiD;AAG1C,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IACF;IAA7B,YAA6B,MAA2B;QAA3B,WAAM,GAAN,MAAM,CAAqB;IAAG,CAAC;IAI5D,KAAK,CAAkB,MAAc;QACnC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;CACF,CAAA;AARY,oDAAoB;AAK/B;IAFC,IAAA,YAAG,EAAC,QAAQ,CAAC;IACb,IAAA,6BAAY,GAAE;IACR,WAAA,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;;;;iDAErB;+BAPU,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAE0B,0BAAmB;GAD7C,oBAAoB,CAQhC"}
+{"version":3,"file":"health.http-controller.js","sourceRoot":"","sources":["../../src/controllers/health.http-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwD;AACxD,6CAA0C;AAC1C,qCAA+D;AAC/D,uCAAuC;AAKhC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IACF;IAA7B,YAA6B,MAA2B;QAA3B,WAAM,GAAN,MAAM,CAAqB;IAAG,CAAC;IAG5D,KAAK,CAAkB,MAAc;QACnC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;CACF,CAAA;AAPY,oDAAoB;AAI/B;IADC,IAAA,YAAG,EAAC,QAAQ,CAAC;IACP,WAAA,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;;;;iDAErB;+BANU,oBAAoB;IAHhC,IAAA,mBAAU,GAAE;IACZ,IAAA,iBAAO,EAAC,aAAa,CAAC;IACtB,IAAA,gBAAQ,GAAE;qCAE4B,0BAAmB;GAD7C,oBAAoB,CAOhC"}

package/dist/controllers/metrics.controller.js

@@ -14,9 +14,10 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetricsHttpController = void 0;
 const common_1 = require("@nestjs/common");
+const swagger_1 = require("@nestjs/swagger");
 const common_2 = require("@rsdk/common");
 const core_1 = require("@rsdk/core");
-const service_routes_1 = require("../service-routes");
+const zones_1 = require("@rsdk/zones");
 let MetricsHttpController = class MetricsHttpController {
     async get(response) {
         if (typeof response.header === 'function') {
@@ -37,13 +38,14 @@ let MetricsHttpController = class MetricsHttpController {
 exports.MetricsHttpController = MetricsHttpController;
 __decorate([
     (0, common_1.Get)('/metrics'),
-    (0, service_routes_1.ServiceRoute)(),
     __param(0, (0, common_1.Res)({ passthrough: false })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], MetricsHttpController.prototype, "get", null);
 exports.MetricsHttpController = MetricsHttpController = __decorate([
-    (0, common_1.Controller)()
+    (0, zones_1.Internal)(),
+    (0, common_1.Controller)(),
+    (0, swagger_1.ApiTags)('Maintenance')
 ], MetricsHttpController);
 //# sourceMappingURL=metrics.controller.js.map

package/dist/controllers/metrics.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.controller.js","sourceRoot":"","sources":["../../src/controllers/metrics.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAsD;AACtD,yCAAoC;AACpC,qCAAyD;AAEzD,sDAAiD;AAG1C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAG1B,AAAN,KAAK,CAAC,GAAG,CAA8B,QAAa;QAClD,IAAI,OAAO,QAAQ,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC1C,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,eAAQ,CAAC,WAAW,CAAC,CAAC;QACxD,CAAC;aAAM,IAAI,OAAO,QAAQ,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;YACpD,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,eAAQ,CAAC,WAAW,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,wBAAiB,CAAC,IAAA,aAAI,EAAA;;;OAG/B,CAAC,CAAC;QACL,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,MAAM,eAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1C,CAAC;CACF,CAAA;AAjBY,sDAAqB;AAG1B;IAFL,IAAA,YAAG,EAAC,UAAU,CAAC;IACf,IAAA,6BAAY,GAAE;IACJ,WAAA,IAAA,YAAG,EAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;;;;gDAarC;gCAhBU,qBAAqB;IADjC,IAAA,mBAAU,GAAE;GACA,qBAAqB,CAiBjC"}
+{"version":3,"file":"metrics.controller.js","sourceRoot":"","sources":["../../src/controllers/metrics.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAsD;AACtD,6CAA0C;AAC1C,yCAAoC;AACpC,qCAAyD;AACzD,uCAAuC;AAKhC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAE1B,AAAN,KAAK,CAAC,GAAG,CAA8B,QAAa;QAClD,IAAI,OAAO,QAAQ,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC1C,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,eAAQ,CAAC,WAAW,CAAC,CAAC;QACxD,CAAC;aAAM,IAAI,OAAO,QAAQ,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;YACpD,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,eAAQ,CAAC,WAAW,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,wBAAiB,CAAC,IAAA,aAAI,EAAA;;;OAG/B,CAAC,CAAC;QACL,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,MAAM,eAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1C,CAAC;CACF,CAAA;AAhBY,sDAAqB;AAE1B;IADL,IAAA,YAAG,EAAC,UAAU,CAAC;IACL,WAAA,IAAA,YAAG,EAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;;;;gDAarC;gCAfU,qBAAqB;IAHjC,IAAA,gBAAQ,GAAE;IACV,IAAA,mBAAU,GAAE;IACZ,IAAA,iBAAO,EAAC,aAAa,CAAC;GACV,qBAAqB,CAgBjC"}

package/dist/http.config.d.ts

@@ -5,5 +5,4 @@ export declare class HttpConfig extends Config {
     readonly port: number;
     readonly bodyLimit: Size;
     readonly swaggerUI: boolean;
-    readonly requestLogging: boolean;
 }

package/dist/http.config.js

@@ -17,7 +17,6 @@ let HttpConfig = class HttpConfig extends core_1.Config {
     port;
     bodyLimit;
     swaggerUI;
-    requestLogging;
 };
 exports.HttpConfig = HttpConfig;
 __decorate([
@@ -49,13 +48,6 @@ __decorate([
     }),
     __metadata("design:type", Boolean)
 ], HttpConfig.prototype, "swaggerUI", void 0);
-__decorate([
-    (0, core_1.Property)('HTTP_REQUEST_LOGGING', new core_1.BoolParser(), {
-        defaultValue: false,
-        description: 'Enable trace logging all requests',
-    }),
-    __metadata("design:type", Boolean)
-], HttpConfig.prototype, "requestLogging", void 0);
 exports.HttpConfig = HttpConfig = __decorate([
     (0, core_1.ConfigSection)({
         tags: [core_1.ConfigTag.infrastructure, core_1.ConfigTag.transport, core_1.ConfigTag.http],

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;IAMpB,cAAc,CAAW;CACnC,CAAA;AA/BY,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;AAMpB;IAJR,IAAA,eAAQ,EAAC,sBAAsB,EAAE,IAAI,iBAAU,EAAE,EAAE;QAClD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,mCAAmC;KACjD,CAAC;;kDACgC;qBA9BvB,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,CA+BtB"}
+{"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"}

package/dist/http.transport.d.ts

@@ -1,10 +1,10 @@
 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, GenericHeaders, HttpOptions, IErrorsFormatter, IErrorsSender, IErrorsTransformer, IHttpTransport, NestModuleDefinitions } from '@rsdk/core';
+import type { ConfigContext, GenericHeaders, HttpOptions, IErrorsFormatter, IErrorsSender, IErrorsTransformer, IHttpTransport, LogFormatter } from '@rsdk/core';
 import { HttpConfig } from './http.config';
 export interface ParsersConfig {
     body: {
@@ -47,15 +47,15 @@ export declare abstract class AbstractHttpTransport implements IHttpTransport {
     constructor(options?: HttpTransportOptions | undefined);
     extractHeaders(ctx: ExecutionContext): GenericHeaders;
     matchByContext(ctx: ExecutionContext): boolean;
-    modules(): NestModuleDefinitions;
-    getErrorsFormatter(): IErrorsFormatter;
-    getErrorsSender(): IErrorsSender;
-    getErrorTransformers(): IErrorsTransformer[];
+    errorFormatter(): IErrorsFormatter;
+    errorSender(): IErrorsSender;
+    errorTransformers(): 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;
+    abstract createHttpAdapter(config: HttpConfig): AbstractHttpAdapter;
+    abstract logFormatter(): LogFormatter;
 }

package/dist/http.transport.js

@@ -1,15 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractHttpTransport = void 0;
-const core_1 = require("@nestjs/core");
 const swagger_1 = require("@nestjs/swagger");
-const core_2 = require("@rsdk/core");
+const core_1 = 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 AbstractHttpTransport {
     options;
     constructor(options) {
@@ -21,30 +19,13 @@ class AbstractHttpTransport {
     matchByContext(ctx) {
         return ctx.getType() === 'http';
     }
-    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() {
+    errorFormatter() {
         return new error_handling_1.HttpErrorsFormatter();
     }
-    getErrorsSender() {
+    errorSender() {
         return new error_handling_1.HttpErrorsSender();
     }
-    getErrorTransformers() {
+    errorTransformers() {
         return [new error_handling_1.HttpErrorsTransformer()];
     }
     getProtocol() {
@@ -77,9 +58,9 @@ class AbstractHttpTransport {
         }
         if (swaggerUI || swagger?.file) {
             const builder = new swagger_1.DocumentBuilder()
-                .setTitle(app.get(core_2.APP_NAME))
-                .setVersion(app.get(core_2.APP_VERSION))
-                .setDescription(app.get(core_2.APP_DESCRIPTION));
+                .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();

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":";;;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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/http.server",
-  "version": "5.7.0-next.6",
+  "version": "6.0.0-next.1",
   "description": "HTTP transport for rsdk apps (needs some of HTTP adapters)",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -17,8 +17,11 @@
     "@rsdk/common": "*",
     "@rsdk/core": "*",
     "@rsdk/logging": "*",
+    "@rsdk/zones": "*",
+    "body-parser": "^1.20.1",
+    "cookie-parser": "^1.4.6",
     "reflect-metadata": "^0.1.12 || ^0.2.0",
-    "rxjs": "^7.1.0"
+    "rxjs": "^7.8.1"
   },
-  "gitHead": "287622c55e8717861544f0be502bb37a6b19bbfb"
+  "gitHead": "3114a76df17cf98d6f3cbb8a931599a883af6783"
 }

package/src/controllers/health.http-controller.ts

@@ -1,15 +1,15 @@
 import { Controller, Get, Query } from '@nestjs/common';
-import type { CheckSummary } from '@rsdk/core';
-import { HealthChecksService } from '@rsdk/core';
-
-import { ServiceRoute } from '../service-routes';
+import { ApiTags } from '@nestjs/swagger';
+import { CheckSummary, HealthChecksService } from '@rsdk/core';
+import { Internal } from '@rsdk/zones';
 
 @Controller()
+@ApiTags('Maintenance')
+@Internal()
 export class HealthHttpController {
   constructor(private readonly health: HealthChecksService) {}
 
   @Get('health')
-  @ServiceRoute()
   ready(@Query('filter') filter: string): Promise<CheckSummary> {
     return this.health.check(filter);
   }

package/src/controllers/metrics.controller.ts

@@ -1,13 +1,14 @@
 import { Controller, Get, Res } from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
 import { text } from '@rsdk/common';
 import { InternalException, register } from '@rsdk/core';
+import { Internal } from '@rsdk/zones';
 
-import { ServiceRoute } from '../service-routes';
-
+@Internal()
 @Controller()
+@ApiTags('Maintenance')
 export class MetricsHttpController {
   @Get('/metrics')
-  @ServiceRoute()
   async get(@Res({ passthrough: false }) response: any): Promise<void> {
     if (typeof response.header === 'function') {
       response.header('Content-Type', register.contentType);

package/src/http.config.ts

@@ -38,10 +38,4 @@ export class HttpConfig extends Config {
     description: 'Enable swagger UI on /swagger endpoint',
   })
   readonly swaggerUI!: boolean;
-
-  @Property('HTTP_REQUEST_LOGGING', new BoolParser(), {
-    defaultValue: false,
-    description: 'Enable trace logging all requests',
-  })
-  readonly requestLogging!: boolean;
 }

package/src/http.transport.ts

@@ -1,7 +1,7 @@
 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, APP_INTERCEPTOR } from '@nestjs/core';
+import type { AbstractHttpAdapter } from '@nestjs/core';
 import {
   DocumentBuilder as OriginalDocumentBuilder,
   SwaggerModule,
@@ -15,7 +15,7 @@ import type {
   IErrorsSender,
   IErrorsTransformer,
   IHttpTransport,
-  NestModuleDefinitions,
+  LogFormatter,
 } from '@rsdk/core';
 import { APP_DESCRIPTION, APP_NAME, APP_VERSION } from '@rsdk/core';
 import { writeFileSync } from 'node:fs';
@@ -28,7 +28,6 @@ import {
 } from './error-handling';
 import { HttpConfig } from './http.config';
 import { HttpHeaders } from './http.headers';
-import { HttpLoggerInterceptor } from './http-logger.interceptor';
 
 export interface ParsersConfig {
   body: {
@@ -88,33 +87,15 @@ export abstract class AbstractHttpTransport implements IHttpTransport {
     return ctx.getType() === 'http';
   }
 
-  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 {
+  errorFormatter(): IErrorsFormatter {
     return new HttpErrorsFormatter();
   }
 
-  getErrorsSender(): IErrorsSender {
+  errorSender(): IErrorsSender {
     return new HttpErrorsSender();
   }
 
-  getErrorTransformers(): IErrorsTransformer[] {
+  errorTransformers(): IErrorsTransformer[] {
     return [new HttpErrorsTransformer()];
   }
 
@@ -178,5 +159,7 @@ export abstract class AbstractHttpTransport implements IHttpTransport {
     }
   }
 
-  abstract createHttpAdapter(httpConfig: HttpConfig): AbstractHttpAdapter;
+  abstract createHttpAdapter(config: HttpConfig): AbstractHttpAdapter;
+
+  abstract logFormatter(): LogFormatter;
 }

package/dist/http-logger.interceptor.d.ts

@@ -1,10 +0,0 @@
-import type { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
-import { ILogger } from '@rsdk/logging';
-import type { Observable } from 'rxjs';
-import { HttpConfig } from './http.config';
-export declare class HttpLoggerInterceptor implements NestInterceptor {
-    private logger;
-    private httpConfig;
-    constructor(logger: ILogger, httpConfig: HttpConfig);
-    intercept(context: ExecutionContext, next: CallHandler<any>): Observable<any> | Promise<Observable<any>>;
-}

package/dist/http-logger.interceptor.js

@@ -1,72 +0,0 @@
-"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.HttpLoggerInterceptor = void 0;
-const common_1 = require("@nestjs/common");
-const core_1 = require("@rsdk/core");
-const rxjs_1 = require("rxjs");
-const http_config_1 = require("./http.config");
-let HttpLoggerInterceptor = class HttpLoggerInterceptor {
-    logger;
-    httpConfig;
-    constructor(logger, httpConfig) {
-        this.logger = logger;
-        this.httpConfig = httpConfig;
-    }
-    intercept(context, next) {
-        if (!this.httpConfig.requestLogging) {
-            return next.handle();
-        }
-        const isHttp = context.getType() === 'http';
-        if (!isHttp) {
-            return next.handle();
-        }
-        const http = context.switchToHttp();
-        const request = http.getRequest();
-        const now = Date.now();
-        const requestForLog = {
-            body: request.body,
-            query: request.query,
-            params: request.params,
-            method: request.method,
-            url: request.url,
-            headers: request.headers,
-        };
-        this.logger.trace('received http request', {
-            request: requestForLog,
-            timestamp: now,
-        });
-        return next.handle().pipe((0, rxjs_1.catchError)((err) => {
-            this.logger.trace('handled http request with error', {
-                request: requestForLog,
-                start: now,
-                end: Date.now() - now,
-                err,
-            });
-            return (0, rxjs_1.throwError)(() => err);
-        }), (0, rxjs_1.tap)((response) => this.logger.trace('handled http request', {
-            request: requestForLog,
-            start: now,
-            response,
-            end: Date.now() - now,
-        })));
-    }
-};
-exports.HttpLoggerInterceptor = HttpLoggerInterceptor;
-exports.HttpLoggerInterceptor = HttpLoggerInterceptor = __decorate([
-    (0, common_1.Injectable)(),
-    __param(0, (0, core_1.InjectLogger)(HttpLoggerInterceptor)),
-    __metadata("design:paramtypes", [Object, http_config_1.HttpConfig])
-], HttpLoggerInterceptor);
-//# sourceMappingURL=http-logger.interceptor.js.map

package/dist/http-logger.interceptor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"http-logger.interceptor.js","sourceRoot":"","sources":["../src/http-logger.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAKA,2CAA4C;AAC5C,qCAA0C;AAG1C,+BAAmD;AAEnD,+CAA2C;AAGpC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAEe;IACrC;IAFV,YAC+C,MAAe,EACpD,UAAsB;QADe,WAAM,GAAN,MAAM,CAAS;QACpD,eAAU,GAAV,UAAU,CAAY;IAC7B,CAAC;IAEJ,SAAS,CACP,OAAyB,EACzB,IAAsB;QAEtB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,KAAK,MAAM,CAAC;QAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;QAED,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;QAEpC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,aAAa,GAAG;YACpB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE;YACzC,OAAO,EAAE,aAAa;YACtB,SAAS,EAAE,GAAG;SACf,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CACvB,IAAA,iBAAU,EAAC,CAAC,GAAG,EAAE,EAAE;YACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE;gBACnD,OAAO,EAAE,aAAa;gBACtB,KAAK,EAAE,GAAG;gBACV,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG;gBACrB,GAAG;aACJ,CAAC,CAAC;YACH,OAAO,IAAA,iBAAU,EAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC,CAAC,EACF,IAAA,UAAG,EAAC,CAAC,QAAQ,EAAE,EAAE,CACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE;YACxC,OAAO,EAAE,aAAa;YACtB,KAAK,EAAE,GAAG;YACV,QAAQ;YACR,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG;SACtB,CAAC,CACH,CACF,CAAC;IACJ,CAAC;CACF,CAAA;AAzDY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,mBAAY,EAAC,qBAAqB,CAAC,CAAA;6CAChB,wBAAU;GAHrB,qBAAqB,CAyDjC"}

package/dist/service-routes.d.ts

@@ -1,15 +0,0 @@
-/**
- * Хранение ссылок на обработчики http ручек.
- * Прежде всего предназначен для дополнительного декорирования этих ручек в зависимости от конфигурации
- */
-export declare class ServiceRoutes {
-    static storage: {
-        target: any;
-        propertyKey: string | symbol;
-        descriptor: PropertyDescriptor;
-    }[];
-}
-/**
- * Сохраняет ссылку на http ручку в хранилище сервисных ручек для дополнительного декорирования в зависимости от конфигурации
- */
-export declare function ServiceRoute(): MethodDecorator;

package/dist/service-routes.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceRoutes = void 0;
-exports.ServiceRoute = ServiceRoute;
-const swagger_1 = require("@nestjs/swagger");
-/**
- * Хранение ссылок на обработчики http ручек.
- * Прежде всего предназначен для дополнительного декорирования этих ручек в зависимости от конфигурации
- */
-class ServiceRoutes {
-    static storage = [];
-}
-exports.ServiceRoutes = ServiceRoutes;
-/**
- * Сохраняет ссылку на http ручку в хранилище сервисных ручек для дополнительного декорирования в зависимости от конфигурации
- */
-function ServiceRoute() {
-    return (target, propertyKey, descriptor) => {
-        ServiceRoutes.storage.push({ target, propertyKey, descriptor });
-        return (0, swagger_1.ApiExcludeEndpoint)(true)(target, propertyKey, descriptor);
-    };
-}
-//# sourceMappingURL=service-routes.js.map

package/dist/service-routes.js.map

@@ -1 +0,0 @@
-{"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/src/http-logger.interceptor.ts

@@ -1,72 +0,0 @@
-import type {
-  CallHandler,
-  ExecutionContext,
-  NestInterceptor,
-} from '@nestjs/common';
-import { Injectable } from '@nestjs/common';
-import { InjectLogger } from '@rsdk/core';
-import { ILogger } from '@rsdk/logging';
-import type { Observable } from 'rxjs';
-import { catchError, tap, throwError } from 'rxjs';
-
-import { HttpConfig } from './http.config';
-
-@Injectable()
-export class HttpLoggerInterceptor implements NestInterceptor {
-  constructor(
-    @InjectLogger(HttpLoggerInterceptor) private logger: ILogger,
-    private httpConfig: HttpConfig,
-  ) {}
-
-  intercept(
-    context: ExecutionContext,
-    next: CallHandler<any>,
-  ): Observable<any> | Promise<Observable<any>> {
-    if (!this.httpConfig.requestLogging) {
-      return next.handle();
-    }
-    const isHttp = context.getType() === 'http';
-    if (!isHttp) {
-      return next.handle();
-    }
-
-    const http = context.switchToHttp();
-
-    const request = http.getRequest();
-
-    const now = Date.now();
-    const requestForLog = {
-      body: request.body,
-      query: request.query,
-      params: request.params,
-      method: request.method,
-      url: request.url,
-      headers: request.headers,
-    };
-
-    this.logger.trace('received http request', {
-      request: requestForLog,
-      timestamp: now,
-    });
-
-    return next.handle().pipe(
-      catchError((err) => {
-        this.logger.trace('handled http request with error', {
-          request: requestForLog,
-          start: now,
-          end: Date.now() - now,
-          err,
-        });
-        return throwError(() => err);
-      }),
-      tap((response) =>
-        this.logger.trace('handled http request', {
-          request: requestForLog,
-          start: now,
-          response,
-          end: Date.now() - now,
-        }),
-      ),
-    );
-  }
-}

package/src/service-routes.ts

@@ -1,23 +0,0 @@
-import { ApiExcludeEndpoint } from '@nestjs/swagger';
-
-/**
- * Хранение ссылок на обработчики http ручек.
- * Прежде всего предназначен для дополнительного декорирования этих ручек в зависимости от конфигурации
- */
-export class ServiceRoutes {
-  static storage: {
-    target: any;
-    propertyKey: string | symbol;
-    descriptor: PropertyDescriptor;
-  }[] = [];
-}
-
-/**
- * Сохраняет ссылку на http ручку в хранилище сервисных ручек для дополнительного декорирования в зависимости от конфигурации
- */
-export function ServiceRoute(): MethodDecorator {
-  return (target: any, propertyKey, descriptor) => {
-    ServiceRoutes.storage.push({ target, propertyKey, descriptor });
-    return ApiExcludeEndpoint(true)(target, propertyKey, descriptor);
-  };
-}