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

package/dist/express.log-formatter.d.ts

@@ -0,0 +1,8 @@
+import type { ExecutionContext } from '@nestjs/common';
+import type { LogFormatter } from '@rsdk/core';
+export declare class ExpressLogFormatter implements LogFormatter {
+    readonly protocol = "http";
+    getPath(context: ExecutionContext): string;
+    formatRequest(context: ExecutionContext, includeBody: boolean): Record<string, unknown>;
+    formatResponse(context: ExecutionContext, body: unknown | undefined): Record<string, unknown>;
+}

package/dist/express.log-formatter.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExpressLogFormatter = void 0;
+class ExpressLogFormatter {
+    protocol = 'http';
+    getPath(context) {
+        const request = context.switchToHttp().getRequest();
+        // TODO: Может лучше голый путь - без query-параметров
+        return `${request.method} ${request.url}`;
+    }
+    formatRequest(context, includeBody) {
+        const request = context.switchToHttp().getRequest();
+        return {
+            query: request.query,
+            params: request.params,
+            method: request.method,
+            url: request.url,
+            headers: request.headers,
+            ...(includeBody ? { body: request.body } : {}),
+        };
+    }
+    formatResponse(context, body) {
+        const res = context.switchToHttp().getResponse();
+        return {
+            statusCode: res.statusCode,
+            headers: res.getHeaders(),
+            body,
+        };
+    }
+}
+exports.ExpressLogFormatter = ExpressLogFormatter;
+//# sourceMappingURL=express.log-formatter.js.map

package/dist/express.log-formatter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"express.log-formatter.js","sourceRoot":"","sources":["../src/express.log-formatter.ts"],"names":[],"mappings":";;;AAIA,MAAa,mBAAmB;IACrB,QAAQ,GAAG,MAAM,CAAC;IAE3B,OAAO,CAAC,OAAyB;QAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAW,CAAC;QAE7D,sDAAsD;QACtD,OAAO,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAC5C,CAAC;IAED,aAAa,CACX,OAAyB,EACzB,WAAoB;QAEpB,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAW,CAAC;QAE7D,OAAO;YACL,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;YACxB,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/C,CAAC;IACJ,CAAC;IAED,cAAc,CACZ,OAAyB,EACzB,IAAyB;QAEzB,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,WAAW,EAAY,CAAC;QAE3D,OAAO;YACL,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,OAAO,EAAE,GAAG,CAAC,UAAU,EAAE;YACzB,IAAI;SACL,CAAC;IACJ,CAAC;CACF;AAtCD,kDAsCC"}

package/dist/{express.http-transport.d.ts → express.transport.d.ts}

@@ -1,6 +1,8 @@
 import type { AbstractHttpAdapter } from '@nestjs/core';
+import type { LogFormatter } from '@rsdk/core';
 import { AbstractHttpTransport } from '@rsdk/http.server';
 import type { HttpConfig } from '@rsdk/http.server/dist/http.config';
 export declare class ExpressHttpTransport extends AbstractHttpTransport {
     createHttpAdapter(httpConfig: HttpConfig): AbstractHttpAdapter;
+    logFormatter(): LogFormatter;
 }

package/dist/{express.http-transport.js → express.transport.js}

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressHttpTransport = void 0;
 const platform_express_1 = require("@nestjs/platform-express");
 const http_server_1 = require("@rsdk/http.server");
+const express_log_formatter_1 = require("./express.log-formatter");
 class ExpressHttpTransport extends http_server_1.AbstractHttpTransport {
     createHttpAdapter(httpConfig) {
         const { parsers } = this.options ?? {};
@@ -31,6 +32,9 @@ class ExpressHttpTransport extends http_server_1.AbstractHttpTransport {
         }
         return expressAdapter;
     }
+    logFormatter() {
+        return new express_log_formatter_1.ExpressLogFormatter();
+    }
 }
 exports.ExpressHttpTransport = ExpressHttpTransport;
-//# sourceMappingURL=express.http-transport.js.map
+//# sourceMappingURL=express.transport.js.map

package/dist/express.transport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"express.transport.js","sourceRoot":"","sources":["../src/express.transport.ts"],"names":[],"mappings":";;;AACA,+DAA0D;AAG1D,mDAA0D;AAG1D,mEAA8D;AAE9D,MAAa,oBAAqB,SAAQ,mCAAqB;IAC7D,iBAAiB,CAAC,UAAsB;QACtC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;QACvC,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;QACjC,MAAM,cAAc,GAAG,IAAI,iCAAc,EAAE,CAAC;QAC5C,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAkB,MAAM,CAAC,MAAM,CACnD;YACE,IAAI,EAAE;gBACJ,IAAI,EAAE,IAAI;gBACV,UAAU,EAAE,KAAK;aAClB;YACD,MAAM,EAAE,KAAK;SACd,EACD,OAAO,CACR,CAAC;QAEF,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,gGAAgG;YAChG,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;YAExC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,gGAAgG;YAChG,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;YAE9C,cAAc,CAAC,GAAG,CAChB,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC,CACzD,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,gGAAgG;YAChG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,YAAY;QACV,OAAO,IAAI,2CAAmB,EAAE,CAAC;IACnC,CAAC;CACF;AA1CD,oDA0CC"}

package/dist/index.d.ts

@@ -1 +1 @@
-export { ExpressHttpTransport } from './express.http-transport';
+export { ExpressHttpTransport } from './express.transport';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressHttpTransport = void 0;
-var express_http_transport_1 = require("./express.http-transport");
-Object.defineProperty(exports, "ExpressHttpTransport", { enumerable: true, get: function () { return express_http_transport_1.ExpressHttpTransport; } });
+var express_transport_1 = require("./express.transport");
+Object.defineProperty(exports, "ExpressHttpTransport", { enumerable: true, get: function () { return express_transport_1.ExpressHttpTransport; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAAvD,8HAAA,oBAAoB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,yDAA2D;AAAlD,yHAAA,oBAAoB,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/http.server.express",
-  "version": "5.7.0-next.6",
+  "version": "6.0.0-next.1",
   "description": "Adapter for @rsdk/http.server",
   "main": "dist/index.js",
   "repository": {
@@ -19,12 +19,14 @@
   "peerDependencies": {
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
-    "@nestjs/platform-express": "^10.0.0",
     "@rsdk/http.server": "*",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "reflect-metadata": "^0.1.12 || ^0.2.0"
   },
+  "dependencies": {
+    "@nestjs/platform-express": "^10.0.0"
+  },
   "peerDependenciesMeta": {
     "body-parser": {
       "optional": true
@@ -33,5 +35,5 @@
       "optional": true
     }
   },
-  "gitHead": "287622c55e8717861544f0be502bb37a6b19bbfb"
+  "gitHead": "3114a76df17cf98d6f3cbb8a931599a883af6783"
 }

package/src/express.log-formatter.ts

@@ -0,0 +1,43 @@
+import type { ExecutionContext } from '@nestjs/common';
+import type { LogFormatter } from '@rsdk/core';
+import type { Request, Response } from 'express';
+
+export class ExpressLogFormatter implements LogFormatter {
+  readonly protocol = 'http';
+
+  getPath(context: ExecutionContext): string {
+    const request = context.switchToHttp().getRequest<Request>();
+
+    // TODO: Может лучше голый путь - без query-параметров
+    return `${request.method} ${request.url}`;
+  }
+
+  formatRequest(
+    context: ExecutionContext,
+    includeBody: boolean,
+  ): Record<string, unknown> {
+    const request = context.switchToHttp().getRequest<Request>();
+
+    return {
+      query: request.query,
+      params: request.params,
+      method: request.method,
+      url: request.url,
+      headers: request.headers,
+      ...(includeBody ? { body: request.body } : {}),
+    };
+  }
+
+  formatResponse(
+    context: ExecutionContext,
+    body: unknown | undefined,
+  ): Record<string, unknown> {
+    const res = context.switchToHttp().getResponse<Response>();
+
+    return {
+      statusCode: res.statusCode,
+      headers: res.getHeaders(),
+      body,
+    };
+  }
+}

package/src/{express.http-transport.ts → express.transport.ts}

@@ -1,9 +1,12 @@
 import type { AbstractHttpAdapter } from '@nestjs/core';
 import { ExpressAdapter } from '@nestjs/platform-express';
+import type { LogFormatter } from '@rsdk/core';
 import type { ParsersConfig } from '@rsdk/http.server';
 import { AbstractHttpTransport } from '@rsdk/http.server';
 import type { HttpConfig } from '@rsdk/http.server/dist/http.config';
 
+import { ExpressLogFormatter } from './express.log-formatter';
+
 export class ExpressHttpTransport extends AbstractHttpTransport {
   createHttpAdapter(httpConfig: HttpConfig): AbstractHttpAdapter {
     const { parsers } = this.options ?? {};
@@ -42,4 +45,8 @@ export class ExpressHttpTransport extends AbstractHttpTransport {
     }
     return expressAdapter;
   }
+
+  logFormatter(): LogFormatter {
+    return new ExpressLogFormatter();
+  }
 }

package/src/index.ts

@@ -1 +1 @@
-export { ExpressHttpTransport } from './express.http-transport';
+export { ExpressHttpTransport } from './express.transport';

package/dist/express.http-transport.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"express.http-transport.js","sourceRoot":"","sources":["../src/express.http-transport.ts"],"names":[],"mappings":";;;AACA,+DAA0D;AAE1D,mDAA0D;AAG1D,MAAa,oBAAqB,SAAQ,mCAAqB;IAC7D,iBAAiB,CAAC,UAAsB;QACtC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;QACvC,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;QACjC,MAAM,cAAc,GAAG,IAAI,iCAAc,EAAE,CAAC;QAC5C,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAkB,MAAM,CAAC,MAAM,CACnD;YACE,IAAI,EAAE;gBACJ,IAAI,EAAE,IAAI;gBACV,UAAU,EAAE,KAAK;aAClB;YACD,MAAM,EAAE,KAAK;SACd,EACD,OAAO,CACR,CAAC;QAEF,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,gGAAgG;YAChG,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;YAExC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,gGAAgG;YAChG,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;YAE9C,cAAc,CAAC,GAAG,CAChB,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC,CACzD,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,gGAAgG;YAChG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,cAAc,CAAC;IACxB,CAAC;CACF;AAtCD,oDAsCC"}