@modern-js/server-core 2.67.2 → 2.67.3

package/dist/cjs/adapters/node/node.js

@@ -35,6 +35,7 @@ __export(node_exports, {
 });
 module.exports = __toCommonJS(node_exports);
 var import_node_http = require("node:http");
+var import_cloneable_readable = __toESM(require("cloneable-readable"));
 var import_helper = require("./helper");
 var import_install = require("./polyfills/install");
 var import_stream = require("./polyfills/stream");
@@ -61,13 +62,36 @@ const createWebRequest = (req, res, body) => {
   };
   res.on("close", () => controller.abort("res closed"));
   const url = `http://${req.headers.host}${req.url}`;
-  const fullUrl = new URL(url);
-  if (body || !(method === "GET" || method === "HEAD") && fullUrl.searchParams.has("__loader") || fullUrl.searchParams.has("__pass_body") || req.headers["x-mf-micro"] || req.headers["x-rsc-action"] || req.headers["x-parse-through-body"]) {
-    init.body = body !== null && body !== void 0 ? body : (0, import_stream.createReadableStreamFromReadable)(req);
+  const needsRequestBody = body || !(method === "GET" || method === "HEAD");
+  const cloneableReq = needsRequestBody ? (0, import_cloneable_readable.default)(req) : null;
+  if (needsRequestBody) {
+    if (body) {
+      init.body = body;
+    } else {
+      const stream = cloneableReq.clone();
+      init.body = (0, import_stream.createReadableStreamFromReadable)(stream);
+    }
     init.duplex = "half";
   }
-  const request = new Request(url, init);
-  return request;
+  const originalRequest = new Request(url, init);
+  if (needsRequestBody) {
+    return new Proxy(originalRequest, {
+      get(target, prop) {
+        if ([
+          "json",
+          "text",
+          "blob",
+          "arrayBuffer",
+          "formData",
+          "body"
+        ].includes(prop)) {
+          cloneableReq.resume();
+        }
+        return target[prop];
+      }
+    });
+  }
+  return originalRequest;
 };
 const sendResponse = async (response, res) => {
   var _response_headers_get;

package/dist/cjs/context.js

@@ -0,0 +1,31 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var context_exports = {};
+__export(context_exports, {
+  run: () => run,
+  useHonoContext: () => useHonoContext
+});
+module.exports = __toCommonJS(context_exports);
+var import_storage = require("./utils/storage");
+const { run, useHonoContext } = (0, import_storage.createStorage)();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  run,
+  useHonoContext
+});

package/dist/cjs/index.js

@@ -21,15 +21,19 @@ var src_exports = {};
 __export(src_exports, {
   AGGRED_DIR: () => import_constants.AGGRED_DIR,
   ErrorDigest: () => import_utils.ErrorDigest,
+  Hono: () => import_hono.Hono,
   createErrorHtml: () => import_utils.createErrorHtml,
   createServerBase: () => import_serverBase.createServerBase,
   getLoaderCtx: () => import_helper.getLoaderCtx,
-  onError: () => import_utils.onError
+  onError: () => import_utils.onError,
+  useHonoContext: () => import_context.useHonoContext
 });
 module.exports = __toCommonJS(src_exports);
 var import_utils = require("./utils");
 var import_constants = require("./constants");
 var import_serverBase = require("./serverBase");
+var import_context = require("./context");
+var import_hono = require("hono");
 var import_helper = require("./helper");
 __reExport(src_exports, require("./plugins"), module.exports);
 __reExport(src_exports, require("./types/plugins"), module.exports);
@@ -41,10 +45,12 @@ __reExport(src_exports, require("./types/requestHandler"), module.exports);
 0 && (module.exports = {
   AGGRED_DIR,
   ErrorDigest,
+  Hono,
   createErrorHtml,
   createServerBase,
   getLoaderCtx,
   onError,
+  useHonoContext,
   ...require("./plugins"),
   ...require("./types/plugins"),
   ...require("./types/render"),

package/dist/cjs/serverBase.js

@@ -26,6 +26,7 @@ var import_class_private_method_get = require("@swc/helpers/_/_class_private_met
 var import_class_private_method_init = require("@swc/helpers/_/_class_private_method_init");
 var import_server = require("@modern-js/plugin-v2/server");
 var import_hono = require("hono");
+var import_context = require("./context");
 var import_hooks = require("./plugins/compat/hooks");
 var import_utils = require("./utils");
 var _applyMiddlewares = /* @__PURE__ */ new WeakSet();
@@ -99,6 +100,7 @@ class ServerBase {
     this.serverContext = null;
     this.options = options;
     this.app = new import_hono.Hono();
+    this.app.use("*", import_context.run);
   }
 }
 function applyMiddlewares() {

package/dist/cjs/utils/storage.js

@@ -0,0 +1,74 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var storage_exports = {};
+__export(storage_exports, {
+  createStorage: () => createStorage
+});
+module.exports = __toCommonJS(storage_exports);
+var ah = __toESM(require("async_hooks"));
+const createStorage = () => {
+  let storage;
+  if (typeof ah.AsyncLocalStorage !== "undefined") {
+    storage = new ah.AsyncLocalStorage();
+  }
+  const run = (context, cb) => {
+    if (!storage) {
+      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
+        `);
+    }
+    return new Promise((resolve, reject) => {
+      storage.run(context, () => {
+        try {
+          return resolve(cb());
+        } catch (error) {
+          return reject(error);
+        }
+      });
+    });
+  };
+  const useHonoContext = () => {
+    if (!storage) {
+      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
+        `);
+    }
+    const context = storage.getStore();
+    if (!context) {
+      throw new Error(`Can't call useContext out of server scope`);
+    }
+    return context;
+  };
+  return {
+    run,
+    useHonoContext
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createStorage
+});

package/dist/esm/adapters/node/node.js

@@ -4,6 +4,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ServerResponse } from "node:http";
+import cloneable from "cloneable-readable";
 import { isResFinalized } from "./helper";
 import { installGlobals } from "./polyfills/install";
 import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "./polyfills/stream";
@@ -32,13 +33,36 @@ var createWebRequest = function(req, res, body) {
     return controller.abort("res closed");
   });
   var url = "http://".concat(req.headers.host).concat(req.url);
-  var fullUrl = new URL(url);
-  if (body || !(method === "GET" || method === "HEAD") && fullUrl.searchParams.has("__loader") || fullUrl.searchParams.has("__pass_body") || req.headers["x-mf-micro"] || req.headers["x-rsc-action"] || req.headers["x-parse-through-body"]) {
-    init.body = body !== null && body !== void 0 ? body : createReadableStreamFromReadable(req);
+  var needsRequestBody = body || !(method === "GET" || method === "HEAD");
+  var cloneableReq = needsRequestBody ? cloneable(req) : null;
+  if (needsRequestBody) {
+    if (body) {
+      init.body = body;
+    } else {
+      var stream = cloneableReq.clone();
+      init.body = createReadableStreamFromReadable(stream);
+    }
     init.duplex = "half";
   }
-  var request = new Request(url, init);
-  return request;
+  var originalRequest = new Request(url, init);
+  if (needsRequestBody) {
+    return new Proxy(originalRequest, {
+      get: function get(target, prop) {
+        if ([
+          "json",
+          "text",
+          "blob",
+          "arrayBuffer",
+          "formData",
+          "body"
+        ].includes(prop)) {
+          cloneableReq.resume();
+        }
+        return target[prop];
+      }
+    });
+  }
+  return originalRequest;
 };
 var sendResponse = function() {
   var _ref = _async_to_generator(function(response, res) {

package/dist/esm/context.js

@@ -0,0 +1,6 @@
+import { createStorage } from "./utils/storage";
+var _createStorage = createStorage(), run = _createStorage.run, useHonoContext = _createStorage.useHonoContext;
+export {
+  run,
+  useHonoContext
+};

package/dist/esm/index.js

@@ -1,6 +1,8 @@
 import { createErrorHtml, onError, ErrorDigest } from "./utils";
 import { AGGRED_DIR } from "./constants";
 import { createServerBase } from "./serverBase";
+import { useHonoContext } from "./context";
+import { Hono } from "hono";
 import { getLoaderCtx } from "./helper";
 export * from "./plugins";
 export * from "./types/plugins";
@@ -11,8 +13,10 @@ export * from "./types/requestHandler";
 export {
   AGGRED_DIR,
   ErrorDigest,
+  Hono,
   createErrorHtml,
   createServerBase,
   getLoaderCtx,
-  onError
+  onError,
+  useHonoContext
 };

package/dist/esm/serverBase.js

@@ -7,6 +7,7 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { server } from "@modern-js/plugin-v2/server";
 import { Hono } from "hono";
+import { run } from "./context";
 import { handleSetupResult } from "./plugins/compat/hooks";
 import { loadConfig } from "./utils";
 var _applyMiddlewares = /* @__PURE__ */ new WeakSet();
@@ -19,6 +20,7 @@ var ServerBase = /* @__PURE__ */ function() {
     this.serverContext = null;
     this.options = options;
     this.app = new Hono();
+    this.app.use("*", run);
   }
   var _proto = ServerBase2.prototype;
   _proto.init = function init() {

package/dist/esm/utils/storage.js

@@ -0,0 +1,38 @@
+import * as ah from "async_hooks";
+var createStorage = function() {
+  var storage;
+  if (typeof ah.AsyncLocalStorage !== "undefined") {
+    storage = new ah.AsyncLocalStorage();
+  }
+  var run = function(context, cb) {
+    if (!storage) {
+      throw new Error("Unable to use async_hook, please confirm the node version >= 12.17\n        ");
+    }
+    return new Promise(function(resolve, reject) {
+      storage.run(context, function() {
+        try {
+          return resolve(cb());
+        } catch (error) {
+          return reject(error);
+        }
+      });
+    });
+  };
+  var useHonoContext = function() {
+    if (!storage) {
+      throw new Error("Unable to use async_hook, please confirm the node version >= 12.17\n        ");
+    }
+    var context = storage.getStore();
+    if (!context) {
+      throw new Error("Can't call useContext out of server scope");
+    }
+    return context;
+  };
+  return {
+    run,
+    useHonoContext
+  };
+};
+export {
+  createStorage
+};

package/dist/esm-node/adapters/node/node.js

@@ -1,4 +1,5 @@
 import { ServerResponse } from "node:http";
+import cloneable from "cloneable-readable";
 import { isResFinalized } from "./helper";
 import { installGlobals } from "./polyfills/install";
 import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "./polyfills/stream";
@@ -25,13 +26,36 @@ const createWebRequest = (req, res, body) => {
   };
   res.on("close", () => controller.abort("res closed"));
   const url = `http://${req.headers.host}${req.url}`;
-  const fullUrl = new URL(url);
-  if (body || !(method === "GET" || method === "HEAD") && fullUrl.searchParams.has("__loader") || fullUrl.searchParams.has("__pass_body") || req.headers["x-mf-micro"] || req.headers["x-rsc-action"] || req.headers["x-parse-through-body"]) {
-    init.body = body !== null && body !== void 0 ? body : createReadableStreamFromReadable(req);
+  const needsRequestBody = body || !(method === "GET" || method === "HEAD");
+  const cloneableReq = needsRequestBody ? cloneable(req) : null;
+  if (needsRequestBody) {
+    if (body) {
+      init.body = body;
+    } else {
+      const stream = cloneableReq.clone();
+      init.body = createReadableStreamFromReadable(stream);
+    }
     init.duplex = "half";
   }
-  const request = new Request(url, init);
-  return request;
+  const originalRequest = new Request(url, init);
+  if (needsRequestBody) {
+    return new Proxy(originalRequest, {
+      get(target, prop) {
+        if ([
+          "json",
+          "text",
+          "blob",
+          "arrayBuffer",
+          "formData",
+          "body"
+        ].includes(prop)) {
+          cloneableReq.resume();
+        }
+        return target[prop];
+      }
+    });
+  }
+  return originalRequest;
 };
 const sendResponse = async (response, res) => {
   var _response_headers_get;

package/dist/esm-node/context.js

@@ -0,0 +1,6 @@
+import { createStorage } from "./utils/storage";
+const { run, useHonoContext } = createStorage();
+export {
+  run,
+  useHonoContext
+};

package/dist/esm-node/index.js

@@ -1,6 +1,8 @@
 import { createErrorHtml, onError, ErrorDigest } from "./utils";
 import { AGGRED_DIR } from "./constants";
 import { createServerBase } from "./serverBase";
+import { useHonoContext } from "./context";
+import { Hono } from "hono";
 import { getLoaderCtx } from "./helper";
 export * from "./plugins";
 export * from "./types/plugins";
@@ -11,8 +13,10 @@ export * from "./types/requestHandler";
 export {
   AGGRED_DIR,
   ErrorDigest,
+  Hono,
   createErrorHtml,
   createServerBase,
   getLoaderCtx,
-  onError
+  onError,
+  useHonoContext
 };

package/dist/esm-node/serverBase.js

@@ -2,6 +2,7 @@ import { _ as _class_private_method_get } from "@swc/helpers/_/_class_private_me
 import { _ as _class_private_method_init } from "@swc/helpers/_/_class_private_method_init";
 import { server } from "@modern-js/plugin-v2/server";
 import { Hono } from "hono";
+import { run } from "./context";
 import { handleSetupResult } from "./plugins/compat/hooks";
 import { loadConfig } from "./utils";
 var _applyMiddlewares = /* @__PURE__ */ new WeakSet();
@@ -75,6 +76,7 @@ class ServerBase {
     this.serverContext = null;
     this.options = options;
     this.app = new Hono();
+    this.app.use("*", run);
   }
 }
 function applyMiddlewares() {

package/dist/esm-node/utils/storage.js

@@ -0,0 +1,40 @@
+import * as ah from "async_hooks";
+const createStorage = () => {
+  let storage;
+  if (typeof ah.AsyncLocalStorage !== "undefined") {
+    storage = new ah.AsyncLocalStorage();
+  }
+  const run = (context, cb) => {
+    if (!storage) {
+      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
+        `);
+    }
+    return new Promise((resolve, reject) => {
+      storage.run(context, () => {
+        try {
+          return resolve(cb());
+        } catch (error) {
+          return reject(error);
+        }
+      });
+    });
+  };
+  const useHonoContext = () => {
+    if (!storage) {
+      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
+        `);
+    }
+    const context = storage.getStore();
+    if (!context) {
+      throw new Error(`Can't call useContext out of server scope`);
+    }
+    return context;
+  };
+  return {
+    run,
+    useHonoContext
+  };
+};
+export {
+  createStorage
+};

package/dist/types/context.d.ts

@@ -0,0 +1,3 @@
+import type { Context } from 'hono';
+declare const run: <O>(context: Context<any, any, {}>, cb: () => O | Promise<O>) => Promise<O>, useHonoContext: () => Context<any, any, {}>;
+export { run, useHonoContext };

package/dist/types/index.d.ts

@@ -2,6 +2,8 @@ export { createErrorHtml, onError, ErrorDigest } from './utils';
 export { AGGRED_DIR } from './constants';
 export type { ServerBase, ServerBaseOptions } from './serverBase';
 export { createServerBase } from './serverBase';
+export { useHonoContext } from './context';
+export { Hono, type MiddlewareHandler } from 'hono';
 export type { Middleware, Context, Next, HonoRequest as InternalRequest, ServerEnv, ServerManifest, ServerLoaderBundle, } from './types';
 export { getLoaderCtx } from './helper';
 export * from './plugins';

package/dist/types/types/plugins/base.d.ts

@@ -44,6 +44,7 @@ export type Middleware = {
     before?: Array<Middleware['name']>;
     order?: MiddlewareOrder;
 };
+export type ServerMiddleware = Middleware;
 export interface GetRenderHandlerOptions {
     pwd: string;
     routes: ServerRoute[];

package/dist/types/types/plugins/index.d.ts

@@ -1,3 +1,3 @@
 export * from './new';
 export * from './old';
-export type { ServerConfig, CacheConfig, OnFallback, FallbackReason, GetRenderHandlerOptions, FileChangeEvent, FallbackInput, WebServerStartInput, APIServerStartInput, } from './base';
+export type { ServerConfig, CacheConfig, OnFallback, FallbackReason, GetRenderHandlerOptions, FileChangeEvent, FallbackInput, WebServerStartInput, APIServerStartInput, ServerMiddleware, } from './base';

package/dist/types/utils/storage.d.ts

@@ -0,0 +1,5 @@
+declare const createStorage: <T>() => {
+    run: <O>(context: T, cb: () => O | Promise<O>) => Promise<O>;
+    useHonoContext: () => T;
+};
+export { createStorage };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.2",
+  "version": "2.67.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -50,25 +50,27 @@
     "@web-std/fetch": "^4.2.1",
     "@web-std/file": "^3.0.3",
     "@web-std/stream": "^1.0.3",
+    "cloneable-readable": "^3.0.0",
     "flatted": "^3.2.9",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.2",
-    "@modern-js/plugin": "2.67.2",
-    "@modern-js/runtime-utils": "2.67.2",
-    "@modern-js/plugin-v2": "2.67.2",
-    "@modern-js/utils": "2.67.2"
+    "@modern-js/plugin": "2.67.3",
+    "@modern-js/plugin-v2": "2.67.3",
+    "@modern-js/runtime-utils": "2.67.3",
+    "@modern-js/utils": "2.67.3"
   },
   "devDependencies": {
+    "@types/cloneable-readable": "^2.0.3",
     "@types/jest": "^29",
     "@types/merge-deep": "^3.0.0",
     "@types/node": "^14",
-    "http-proxy-middleware": "^2.0.4",
+    "http-proxy-middleware": "^2.0.9",
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.67.2",
-    "@scripts/build": "2.66.0",
-    "@scripts/jest-config": "2.66.0"
+    "@modern-js/types": "2.67.3",
+    "@scripts/jest-config": "2.66.0",
+    "@scripts/build": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {