@tsed/platform-express 6.75.8 → 6.75.12

package/lib/interfaces/PlatformExpressSettings.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="express-serve-static-core" />
 import { RouterOptions } from "express";
 export interface PlatformExpressSettings {
     /**

package/lib/middlewares/rawBodyMiddleware.d.ts

@@ -1 +1,4 @@
-export declare function rawBodyMiddleware(request: any, response: any, next: any): void;
+import { Request } from "express";
+export declare function rawBodyMiddleware(request: Request & {
+    rawBody: string;
+}, response: any, next: any): void;

package/lib/middlewares/rawBodyMiddleware.js

@@ -1,12 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rawBodyMiddleware = void 0;
+const tslib_1 = require("tslib");
+const bytes_1 = tslib_1.__importDefault(require("bytes"));
+const limit = bytes_1.default.parse("100kb");
+function isLimitReached(length) {
+    return limit !== null && length !== null && length > limit;
+}
+function getContentLength(request) {
+    const contentLength = request.get("content-length");
+    return contentLength != null && !isNaN(contentLength) ? parseInt(contentLength, 10) : null;
+}
 function rawBodyMiddleware(request, response, next) {
-    if (!request.is("multipart/form-data")) {
-        request.rawBody = "";
-        request.on("data", (chunk) => {
-            request.rawBody += chunk;
-        });
+    if (request.method !== "GET") {
+        const length = getContentLength(request);
+        if (!isLimitReached(length) && request.is(["application/x-www-form-urlencoded", "application/json"])) {
+            request.rawBody = "";
+            request.on("data", (chunk) => {
+                request.rawBody += chunk;
+            });
+        }
     }
     next();
 }

package/lib/middlewares/rawBodyMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"rawBodyMiddleware.js","sourceRoot":"","sources":["../../src/middlewares/rawBodyMiddleware.ts"],"names":[],"mappings":";;;AAAA,SAAgB,iBAAiB,CAAC,OAAY,EAAE,QAAa,EAAE,IAAS;IACtE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,qBAAqB,CAAC,EAAE;QACtC,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;QACrB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACnC,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC;QAC3B,CAAC,CAAC,CAAC;KACJ;IAED,IAAI,EAAE,CAAC;AACT,CAAC;AATD,8CASC","sourcesContent":["export function rawBodyMiddleware(request: any, response: any, next: any) {\n  if (!request.is(\"multipart/form-data\")) {\n    request.rawBody = \"\";\n    request.on(\"data\", (chunk: string) => {\n      request.rawBody += chunk;\n    });\n  }\n\n  next();\n}\n"]}
+{"version":3,"file":"rawBodyMiddleware.js","sourceRoot":"","sources":["../../src/middlewares/rawBodyMiddleware.ts"],"names":[],"mappings":";;;;AACA,0DAA0B;AAE1B,MAAM,KAAK,GAAG,eAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAEnC,SAAS,cAAc,CAAC,MAAqB;IAC3C,OAAO,KAAK,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,GAAG,KAAK,CAAC;AAC7D,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAoC;IAC5D,MAAM,aAAa,GAAQ,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACzD,OAAO,aAAa,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7F,CAAC;AAED,SAAgB,iBAAiB,CAAC,OAAoC,EAAE,QAAa,EAAE,IAAS;IAC9F,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE;QAC5B,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAEzC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC,mCAAmC,EAAE,kBAAkB,CAAC,CAAC,EAAE;YACpG,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;YACrB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;gBACnC,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC;YAC3B,CAAC,CAAC,CAAC;SACJ;KACF;IAED,IAAI,EAAE,CAAC;AACT,CAAC;AAbD,8CAaC","sourcesContent":["import {Request} from \"express\";\nimport bytes from \"bytes\";\n\nconst limit = bytes.parse(\"100kb\");\n\nfunction isLimitReached(length: number | null) {\n  return limit !== null && length !== null && length > limit;\n}\n\nfunction getContentLength(request: Request & {rawBody: string}) {\n  const contentLength: any = request.get(\"content-length\");\n  return contentLength != null && !isNaN(contentLength) ? parseInt(contentLength, 10) : null;\n}\n\nexport function rawBodyMiddleware(request: Request & {rawBody: string}, response: any, next: any) {\n  if (request.method !== \"GET\") {\n    const length = getContentLength(request);\n\n    if (!isLimitReached(length) && request.is([\"application/x-www-form-urlencoded\", \"application/json\"])) {\n      request.rawBody = \"\";\n      request.on(\"data\", (chunk: string) => {\n        request.rawBody += chunk;\n      });\n    }\n  }\n\n  next();\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/platform-express",
-  "version": "6.75.8",
+  "version": "6.75.12",
   "description": "A TypeScript Framework on top of Express",
   "source": "./src/index.ts",
   "main": "./lib/index.js",
@@ -45,10 +45,10 @@
     "tslib": "2.2.0"
   },
   "devDependencies": {
-    "@tsed/common": "6.75.8",
-    "@tsed/core": "6.75.8",
-    "@tsed/di": "6.75.8",
-    "@tsed/platform-test-utils": "6.75.8",
+    "@tsed/common": "6.75.12",
+    "@tsed/core": "6.75.12",
+    "@tsed/di": "6.75.12",
+    "@tsed/platform-test-utils": "6.75.12",
     "@types/body-parser": "1.19.0",
     "@types/compression": "1.7.0",
     "@types/cookie-parser": "1.4.2",
@@ -64,13 +64,13 @@
     "method-override": "3.0.0"
   },
   "peerDependencies": {
-    "@tsed/common": "^6.75.8",
-    "@tsed/core": "^6.75.8",
-    "@tsed/di": "^6.75.8",
-    "@tsed/json-mapper": "^6.75.8",
-    "@tsed/logger": "^5.16.0",
-    "@tsed/openspec": "^6.75.8",
-    "@tsed/schema": "^6.75.8",
+    "@tsed/common": "^6.75.12",
+    "@tsed/core": "^6.75.12",
+    "@tsed/di": "^6.75.12",
+    "@tsed/json-mapper": "^6.75.12",
+    "@tsed/logger": ">=6.0.0",
+    "@tsed/openspec": "^6.75.12",
+    "@tsed/schema": "^6.75.12",
     "@types/multer": "^1.4.5",
     "body-parser": "1.19.0"
   }