@forklaunch/express 1.2.36 → 1.2.38

package/lib/index.js

@@ -1417,13 +1417,23 @@ function serveExpress(app, openTelemetryCollector, opts = {}) {
         writer.abort("client aborted");
       };
       abort.signal.addEventListener("abort", onAbort);
+      const onClientAbort = () => abort.abort();
+      if (request.signal.aborted) {
+        abort.abort();
+      } else {
+        request.signal.addEventListener("abort", onClientAbort, {
+          once: true
+        });
+      }
       res.once("finish", cleanup);
       res.once("close", cleanup);
       res.once("finish", () => {
         abort.signal.removeEventListener("abort", onAbort);
+        request.signal.removeEventListener("abort", onClientAbort);
       });
       res.once("close", () => {
         abort.signal.removeEventListener("abort", onAbort);
+        request.signal.removeEventListener("abort", onClientAbort);
       });
       try {
         req.on("error", (error) => {
@@ -1895,14 +1905,66 @@ var import_common2 = require("@forklaunch/common");
 var import_http = require("@forklaunch/core/http");
 var import_busboy = __toESM(require("busboy"));
 var import_express = __toESM(require("express"));
+var DEFAULT_CONTENT_TYPES = {
+  json: "application/json",
+  text: "text/plain",
+  urlEncoded: "application/x-www-form-urlencoded",
+  file: "application/octet-stream",
+  multipart: "multipart/form-data"
+};
 function contentParse(options2) {
-  const jsonParser = import_express.default.json(options2?.json);
-  const urlencodedParser = import_express.default.urlencoded({
-    extended: true,
-    ...options2?.urlencoded
-  });
-  const textParser = import_express.default.text(options2?.text);
-  const rawParser = import_express.default.raw(options2?.raw);
+  let resolvedOptions;
+  const parserCache = /* @__PURE__ */ new Map();
+  const captureRawBody = (base) => {
+    const userVerify = base?.verify;
+    return (req, res, buf, encoding) => {
+      userVerify?.(req, res, buf, encoding);
+      req._rawBody = buf;
+    };
+  };
+  const buildParser = (parserType, contentTypeOverride) => {
+    const typeOverride = contentTypeOverride ? { type: contentTypeOverride } : {};
+    switch (parserType) {
+      case "json":
+        return import_express.default.json({
+          ...resolvedOptions?.json,
+          verify: captureRawBody(resolvedOptions?.json),
+          ...typeOverride
+        });
+      case "urlEncoded":
+        return import_express.default.urlencoded({
+          extended: true,
+          ...resolvedOptions?.urlencoded,
+          verify: captureRawBody(resolvedOptions?.urlencoded),
+          ...typeOverride
+        });
+      case "text":
+        return import_express.default.text({
+          ...resolvedOptions?.text,
+          verify: captureRawBody(resolvedOptions?.text),
+          ...typeOverride
+        });
+      case "file":
+        return import_express.default.raw({
+          ...resolvedOptions?.raw,
+          verify: captureRawBody(resolvedOptions?.raw),
+          ...typeOverride
+        });
+      default:
+        (0, import_common2.isNever)(parserType);
+        throw new Error("Unsupported parser type: " + parserType);
+    }
+  };
+  const parserFor = (parserType, contentType) => {
+    const contentTypeOverride = contentType !== DEFAULT_CONTENT_TYPES[parserType] ? contentType : void 0;
+    const cacheKey = `${parserType}:${contentTypeOverride ?? ""}`;
+    let parser = parserCache.get(cacheKey);
+    if (!parser) {
+      parser = buildParser(parserType, contentTypeOverride);
+      parserCache.set(cacheKey, parser);
+    }
+    return parser;
+  };
   return async (req, res, next) => {
     try {
       const coercedRequest = req;
@@ -1919,24 +1981,39 @@ function contentParse(options2) {
       if (!discriminatedBody) {
         return next();
       }
+      if (!resolvedOptions) {
+        const globalOptions = coercedRequest._globalOptions?.();
+        resolvedOptions = {
+          busboy: globalOptions?.busboy ?? options2?.busboy,
+          text: globalOptions?.text ?? options2?.text,
+          json: globalOptions?.json ?? options2?.json,
+          urlencoded: globalOptions?.urlencoded ?? options2?.urlencoded,
+          raw: globalOptions?.raw ?? options2?.raw
+        };
+      }
       switch (discriminatedBody.parserType) {
         case "json":
-          return jsonParser(req, res, next);
         case "urlEncoded":
-          return urlencodedParser(req, res, next);
         case "text":
-          return textParser(req, res, next);
+          return parserFor(
+            discriminatedBody.parserType,
+            discriminatedBody.contentType
+          )(req, res, next);
         case "file":
-          return rawParser(req, res, async (err) => {
-            if (err) {
-              return next(err);
+          return parserFor("file", discriminatedBody.contentType)(
+            req,
+            res,
+            async (err) => {
+              if (err) {
+                return next(err);
+              }
+              next();
             }
-            next();
-          });
+          );
         case "multipart": {
           const bb = (0, import_busboy.default)({
             headers: req.headers,
-            ...options2?.busboy
+            ...resolvedOptions?.busboy
           });
           const body = {};
           bb.on("file", (fieldname, file) => {

package/lib/index.mjs

@@ -1391,13 +1391,23 @@ function serveExpress(app, openTelemetryCollector, opts = {}) {
         writer.abort("client aborted");
       };
       abort.signal.addEventListener("abort", onAbort);
+      const onClientAbort = () => abort.abort();
+      if (request.signal.aborted) {
+        abort.abort();
+      } else {
+        request.signal.addEventListener("abort", onClientAbort, {
+          once: true
+        });
+      }
       res.once("finish", cleanup);
       res.once("close", cleanup);
       res.once("finish", () => {
         abort.signal.removeEventListener("abort", onAbort);
+        request.signal.removeEventListener("abort", onClientAbort);
       });
       res.once("close", () => {
         abort.signal.removeEventListener("abort", onAbort);
+        request.signal.removeEventListener("abort", onClientAbort);
       });
       try {
         req.on("error", (error) => {
@@ -1869,14 +1879,66 @@ import { isNever } from "@forklaunch/common";
 import { discriminateBody } from "@forklaunch/core/http";
 import Busboy from "busboy";
 import express from "express";
+var DEFAULT_CONTENT_TYPES = {
+  json: "application/json",
+  text: "text/plain",
+  urlEncoded: "application/x-www-form-urlencoded",
+  file: "application/octet-stream",
+  multipart: "multipart/form-data"
+};
 function contentParse(options2) {
-  const jsonParser = express.json(options2?.json);
-  const urlencodedParser = express.urlencoded({
-    extended: true,
-    ...options2?.urlencoded
-  });
-  const textParser = express.text(options2?.text);
-  const rawParser = express.raw(options2?.raw);
+  let resolvedOptions;
+  const parserCache = /* @__PURE__ */ new Map();
+  const captureRawBody = (base) => {
+    const userVerify = base?.verify;
+    return (req, res, buf, encoding) => {
+      userVerify?.(req, res, buf, encoding);
+      req._rawBody = buf;
+    };
+  };
+  const buildParser = (parserType, contentTypeOverride) => {
+    const typeOverride = contentTypeOverride ? { type: contentTypeOverride } : {};
+    switch (parserType) {
+      case "json":
+        return express.json({
+          ...resolvedOptions?.json,
+          verify: captureRawBody(resolvedOptions?.json),
+          ...typeOverride
+        });
+      case "urlEncoded":
+        return express.urlencoded({
+          extended: true,
+          ...resolvedOptions?.urlencoded,
+          verify: captureRawBody(resolvedOptions?.urlencoded),
+          ...typeOverride
+        });
+      case "text":
+        return express.text({
+          ...resolvedOptions?.text,
+          verify: captureRawBody(resolvedOptions?.text),
+          ...typeOverride
+        });
+      case "file":
+        return express.raw({
+          ...resolvedOptions?.raw,
+          verify: captureRawBody(resolvedOptions?.raw),
+          ...typeOverride
+        });
+      default:
+        isNever(parserType);
+        throw new Error("Unsupported parser type: " + parserType);
+    }
+  };
+  const parserFor = (parserType, contentType) => {
+    const contentTypeOverride = contentType !== DEFAULT_CONTENT_TYPES[parserType] ? contentType : void 0;
+    const cacheKey = `${parserType}:${contentTypeOverride ?? ""}`;
+    let parser = parserCache.get(cacheKey);
+    if (!parser) {
+      parser = buildParser(parserType, contentTypeOverride);
+      parserCache.set(cacheKey, parser);
+    }
+    return parser;
+  };
   return async (req, res, next) => {
     try {
       const coercedRequest = req;
@@ -1893,24 +1955,39 @@ function contentParse(options2) {
       if (!discriminatedBody) {
         return next();
       }
+      if (!resolvedOptions) {
+        const globalOptions = coercedRequest._globalOptions?.();
+        resolvedOptions = {
+          busboy: globalOptions?.busboy ?? options2?.busboy,
+          text: globalOptions?.text ?? options2?.text,
+          json: globalOptions?.json ?? options2?.json,
+          urlencoded: globalOptions?.urlencoded ?? options2?.urlencoded,
+          raw: globalOptions?.raw ?? options2?.raw
+        };
+      }
       switch (discriminatedBody.parserType) {
         case "json":
-          return jsonParser(req, res, next);
         case "urlEncoded":
-          return urlencodedParser(req, res, next);
         case "text":
-          return textParser(req, res, next);
+          return parserFor(
+            discriminatedBody.parserType,
+            discriminatedBody.contentType
+          )(req, res, next);
         case "file":
-          return rawParser(req, res, async (err) => {
-            if (err) {
-              return next(err);
+          return parserFor("file", discriminatedBody.contentType)(
+            req,
+            res,
+            async (err) => {
+              if (err) {
+                return next(err);
+              }
+              next();
             }
-            next();
-          });
+          );
         case "multipart": {
           const bb = Busboy({
             headers: req.headers,
-            ...options2?.busboy
+            ...resolvedOptions?.busboy
           });
           const body = {};
           bb.on("file", (fieldname, file) => {

package/lib/src/cluster/bun.serve.shim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bun.serve.shim.d.ts","sourceRoot":"","sources":["../../../src/cluster/bun.serve.shim.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,EACL,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEL,OAAO,EAIR,MAAM,SAAS,CAAC;AA4KjB,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE;QACJ,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,sBAAsB,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,EACjE,IAAI,GAAE,YAAiB;;;;;;;QAy0CjB,IAAI;QACJ,MAAM;QACN,OAAO;;;;;gBAQC,MAAM,YAAY,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI;kBAO5C,MAAM,YAAY,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI;kBAO9C,MAAM,WAAW,OAAO,EAAE;qBAIjB,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI;6BAUnB,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI;EAgBtE"}
+{"version":3,"file":"bun.serve.shim.d.ts","sourceRoot":"","sources":["../../../src/cluster/bun.serve.shim.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,EACL,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEL,OAAO,EAIR,MAAM,SAAS,CAAC;AA4KjB,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE;QACJ,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,sBAAsB,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,EACjE,IAAI,GAAE,YAAiB;;;;;;;QAs1CjB,IAAI;QACJ,MAAM;QACN,OAAO;;;;;gBAQC,MAAM,YAAY,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI;kBAO5C,MAAM,YAAY,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI;kBAO9C,MAAM,WAAW,OAAO,EAAE;qBAIjB,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI;6BAUnB,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI;EAgBtE"}

package/lib/src/middleware/content.parse.middleware.d.ts

@@ -2,12 +2,13 @@ import { AnySchemaValidator } from '@forklaunch/validator';
 import { Options, OptionsJson, OptionsText, OptionsUrlencoded } from 'body-parser';
 import { BusboyConfig } from 'busboy';
 import { NextFunction, Request, Response } from 'express';
-declare function contentParse<SV extends AnySchemaValidator>(options?: {
+type ContentParseOptions = {
     busboy?: BusboyConfig;
     text?: OptionsText;
     json?: OptionsJson;
     urlencoded?: OptionsUrlencoded;
     raw?: Options;
-}): (req: Request, res: Response, next: NextFunction) => Promise<void>;
+};
+declare function contentParse<SV extends AnySchemaValidator>(options?: ContentParseOptions): (req: Request, res: Response, next: NextFunction) => Promise<unknown>;
 export { contentParse };
 //# sourceMappingURL=content.parse.middleware.d.ts.map

package/lib/src/middleware/content.parse.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content.parse.middleware.d.ts","sourceRoot":"","sources":["../../../src/middleware/content.parse.middleware.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EACL,OAAO,EACP,WAAW,EACX,WAAW,EACX,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAe,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAgB,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAMnE,iBAAS,YAAY,CAAC,EAAE,SAAS,kBAAkB,EAAE,OAAO,CAAC,EAAE;IAC7D,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,SASoB,OAAO,OAAO,QAAQ,QAAQ,YAAY,mBAoF9D;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"content.parse.middleware.d.ts","sourceRoot":"","sources":["../../../src/middleware/content.parse.middleware.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EACL,OAAO,EACP,WAAW,EACX,WAAW,EACX,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAe,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAgB,EAAE,YAAY,EAAE,OAAO,EAAkB,QAAQ,EAAE,MAAM,SAAS,CAAC;AAMnF,KAAK,mBAAmB,GAAG;IACzB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAuBF,iBAAS,YAAY,CAAC,EAAE,SAAS,kBAAkB,EACjD,OAAO,CAAC,EAAE,mBAAmB,SAyEV,OAAO,OAAO,QAAQ,QAAQ,YAAY,sBAqG9D;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/express",
-  "version": "1.2.36",
+  "version": "1.2.38",
   "description": "Forklaunch framework for express.",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
@@ -20,10 +20,7 @@
       "default": "./lib/index.js"
     },
     "./*": {
-      "types": "./lib/*.d.ts",
-      "import": "./lib/*.mjs",
-      "require": "./lib/*.js",
-      "default": "./lib/*.js"
+      "types": "./lib/*.d.ts"
     }
   },
   "types": "lib/index.d.ts",
@@ -43,9 +40,9 @@
     "qs": "^6.15.3",
     "range-parser": "^1.3.0",
     "swagger-ui-express": "^5.0.1",
-    "@forklaunch/common": "^1.2.21",
-    "@forklaunch/core": "^1.5.8",
-    "@forklaunch/validator": "^1.2.22"
+    "@forklaunch/common": "^1.2.22",
+    "@forklaunch/core": "^1.5.11",
+    "@forklaunch/validator": "^1.2.23"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",