@modern-js/server-core 2.67.1 → 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/adapters/node/plugins/resource.js

@@ -134,7 +134,12 @@ const injectRscManifestPlugin = () => ({
   setup(api) {
     return {
       async prepare() {
+        var _config_server;
         const { middlewares, distDirectory: pwd } = api.useAppContext();
+        const config = api.useConfigContext();
+        if (!((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.rsc)) {
+          return;
+        }
         middlewares.push({
           name: "inject-rsc-manifest",
           handler: async (c, next) => {

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

@@ -61,7 +61,7 @@ const serverStaticPlugin = () => ({
 });
 function createPublicMiddleware({ pwd, routes }) {
   return async (c, next) => {
-    const route = matchRoute(c.req, routes);
+    const route = matchPublicRoute(c.req, routes);
     if (route) {
       const { entryPath } = route;
       const filename = import_path.default.join(pwd, entryPath);
@@ -80,7 +80,7 @@ function createPublicMiddleware({ pwd, routes }) {
     return await next();
   };
 }
-function matchRoute(req, routes) {
+function matchPublicRoute(req, routes) {
   for (const route of routes.sort(import_utils2.sortRoutes)) {
     if (!route.isSSR && route.entryPath.startsWith("public") && req.path.startsWith(route.urlPath)) {
       return route;
@@ -115,7 +115,11 @@ function createStaticMiddleware(options) {
     ...iconReg
   ].join("|")})`);
   return async (c, next) => {
+    const pageRoute = c.get("route");
     const pathname = c.req.path;
+    if (pageRoute && import_path.default.extname(pathname) === "") {
+      return next();
+    }
     const hit = staticPathRegExp.test(pathname);
     if (hit) {
       const filepath = import_path.default.join(pwd, pathname.replace(prefix, () => ""));

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/plugins/render/index.js

@@ -48,14 +48,17 @@ const renderPlugin = () => ({
           handler: (0, import_monitors.requestLatencyMiddleware)()
         });
         for (const route of pageRoutes) {
+          var _config_server;
           const { urlPath: originUrlPath, entryName = import_constants.MAIN_ENTRY_NAME } = route;
           const urlPath = originUrlPath.endsWith("/") ? `${originUrlPath}*` : `${originUrlPath}/*`;
-          const customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
-          middlewares.push({
-            name: "custom-server-hook",
-            path: urlPath,
-            handler: customServerHookMiddleware
-          });
+          if (((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.disableHook) !== true) {
+            const customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
+            middlewares.push({
+              name: "custom-server-hook",
+              path: urlPath,
+              handler: customServerHookMiddleware
+            });
+          }
           const customServerMiddleware = await customServer.getServerMiddleware(serverMiddleware);
           customServerMiddleware && middlewares.push({
             name: "custom-server-middleware",

package/dist/cjs/plugins/render/render.js

@@ -87,8 +87,8 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
   return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, rscClientManifest, rscSSRManifest, rscServerManifest, locals, matchEntryName, matchPathname, loaderContext }) => {
     const forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : (0, import_utils2.getPathname)(req);
     const [routeInfo, params] = matchRoute(router, forMatchpathname, matchEntryName);
-    const framework = metaName || "modern-js";
-    const fallbackHeader = `x-${(0, import_universal.cutNameByHyphen)(framework)}-ssr-fallback`;
+    const framework = (0, import_universal.cutNameByHyphen)(metaName || "modern-js");
+    const fallbackHeader = `x-${framework}-ssr-fallback`;
     let fallbackReason = null;
     const fallbackWrapper = async (reason, error) => {
       fallbackReason = reason;
@@ -146,10 +146,17 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       onError,
       onTiming
     };
+    if (fallbackReason) {
+      renderOptions.html = injectFallbackReasonToHtml({
+        html: renderOptions.html,
+        reason: fallbackReason,
+        framework
+      });
+    }
     let response;
     switch (renderMode) {
       case "data":
-        response = await (0, import_dataHandler.dataHandler)(req, renderOptions) || await renderHandler(req, renderOptions, "ssr", fallbackWrapper);
+        response = await (0, import_dataHandler.dataHandler)(req, renderOptions) || await renderHandler(req, renderOptions, "ssr", fallbackWrapper, framework);
         break;
       case "rsc-tree":
         response = await (0, import_renderRscHandler.renderRscHandler)(req, renderOptions);
@@ -159,7 +166,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
         break;
       case "ssr":
       case "csr":
-        response = await renderHandler(req, renderOptions, renderMode, fallbackWrapper);
+        response = await renderHandler(req, renderOptions, renderMode, fallbackWrapper, framework);
         break;
       default:
         throw new Error(`Unknown render mode: ${renderMode}`);
@@ -170,7 +177,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
     return response;
   };
 }
-async function renderHandler(request, options, mode, fallbackWrapper) {
+async function renderHandler(request, options, mode, fallbackWrapper, framework) {
   var _options_config_server;
   let response = null;
   const { serverManifest } = options;
@@ -202,7 +209,11 @@ async function renderHandler(request, options, mode, fallbackWrapper) {
     } catch (e) {
       options.onError(e, import_utils2.ErrorDigest.ERENDER);
       await fallbackWrapper("error", e);
-      response = csrRender(options.html);
+      response = csrRender(injectFallbackReasonToHtml({
+        html: options.html,
+        reason: "error",
+        framework
+      }));
     }
   } else {
     response = csrRender(options.html);
@@ -228,11 +239,14 @@ async function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFa
     if (query.__loader) {
       return "data";
     }
-    if (forceCSR && (query.csr || req.headers.get(fallbackHeader) || (nodeReq === null || nodeReq === void 0 ? void 0 : nodeReq.headers[fallbackHeader]))) {
+    const fallbackHeaderValue = req.headers.get(fallbackHeader) || (nodeReq === null || nodeReq === void 0 ? void 0 : nodeReq.headers[fallbackHeader]);
+    if (forceCSR && (query.csr || fallbackHeaderValue)) {
       if (query.csr) {
         await (onFallback === null || onFallback === void 0 ? void 0 : onFallback("query"));
       } else {
-        await (onFallback === null || onFallback === void 0 ? void 0 : onFallback("header"));
+        var _fallbackHeaderValue_split_;
+        const reason = fallbackHeaderValue === null || fallbackHeaderValue === void 0 ? void 0 : (_fallbackHeaderValue_split_ = fallbackHeaderValue.split(";")[1]) === null || _fallbackHeaderValue_split_ === void 0 ? void 0 : _fallbackHeaderValue_split_.split("=")[1];
+        await (onFallback === null || onFallback === void 0 ? void 0 : onFallback(reason ? `header,${reason}` : "header"));
       }
       return "csr";
     }
@@ -241,6 +255,12 @@ async function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFa
     return "csr";
   }
 }
+function injectFallbackReasonToHtml({ html, reason, framework }) {
+  const tag = `<script id="__${framework}_ssr_fallback_reason__" type="application/json">${JSON.stringify({
+    reason
+  })}</script>`;
+  return html.replace(/<\/head>/, `${tag}</head>`);
+}
 function csrRender(html) {
   return new Response(html, {
     status: 200,

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/adapters/node/plugins/resource.js

@@ -409,9 +409,15 @@ var injectRscManifestPlugin = function() {
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var _api_useAppContext, middlewares, pwd;
+            var _config_server, _api_useAppContext, middlewares, pwd, config;
             return _ts_generator(this, function(_state) {
               _api_useAppContext = api.useAppContext(), middlewares = _api_useAppContext.middlewares, pwd = _api_useAppContext.distDirectory;
+              config = api.useConfigContext();
+              if (!((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.rsc)) {
+                return [
+                  2
+                ];
+              }
               middlewares.push({
                 name: "inject-rsc-manifest",
                 handler: function() {

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

@@ -38,7 +38,7 @@ function createPublicMiddleware(param) {
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
-            route = matchRoute(c.req, routes);
+            route = matchPublicRoute(c.req, routes);
             if (!route)
               return [
                 3,
@@ -85,7 +85,7 @@ function createPublicMiddleware(param) {
     };
   }();
 }
-function matchRoute(req, routes) {
+function matchPublicRoute(req, routes) {
   var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
   try {
     for (var _iterator = routes.sort(sortRoutes)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
@@ -135,11 +135,18 @@ function createStaticMiddleware(options) {
   var staticPathRegExp = new RegExp("^".concat(regPrefix, "(").concat(_to_consumable_array(staticReg).concat(_to_consumable_array(iconReg)).join("|"), ")"));
   return function() {
     var _ref2 = _async_to_generator(function(c, next) {
-      var pathname, hit, filepath, mimeType, stat, size, chunk;
+      var pageRoute, pathname, hit, filepath, mimeType, stat, size, chunk;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
+            pageRoute = c.get("route");
             pathname = c.req.path;
+            if (pageRoute && path.extname(pathname) === "") {
+              return [
+                2,
+                next()
+              ];
+            }
             hit = staticPathRegExp.test(pathname);
             if (!hit)
               return [

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/plugins/render/index.js

@@ -13,7 +13,7 @@ var renderPlugin = function() {
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var _config_render, _api_useAppContext, middlewares, routes, render, pwd, serverBase, hooks, config, customServer, serverMiddleware, pageRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, originUrlPath, _route_entryName, entryName, urlPath, customServerHookMiddleware, customServerMiddleware, err;
+            var _config_render, _api_useAppContext, middlewares, routes, render, pwd, serverBase, hooks, config, customServer, serverMiddleware, pageRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, _config_server, originUrlPath, _route_entryName, entryName, urlPath, customServerHookMiddleware, customServerMiddleware, err;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -52,12 +52,14 @@ var renderPlugin = function() {
                   route = _step.value;
                   originUrlPath = route.urlPath, _route_entryName = route.entryName, entryName = _route_entryName === void 0 ? MAIN_ENTRY_NAME : _route_entryName;
                   urlPath = originUrlPath.endsWith("/") ? "".concat(originUrlPath, "*") : "".concat(originUrlPath, "/*");
-                  customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
-                  middlewares.push({
-                    name: "custom-server-hook",
-                    path: urlPath,
-                    handler: customServerHookMiddleware
-                  });
+                  if (((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.disableHook) !== true) {
+                    customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
+                    middlewares.push({
+                      name: "custom-server-hook",
+                      path: urlPath,
+                      handler: customServerHookMiddleware
+                    });
+                  }
                   return [
                     4,
                     customServer.getServerMiddleware(serverMiddleware)

package/dist/esm/plugins/render/render.js

@@ -93,8 +93,8 @@ function _createRender() {
                   logger = param2.logger, reporter = param2.reporter, metrics = param2.metrics, monitors = param2.monitors, nodeReq = param2.nodeReq, templates = param2.templates, serverManifest = param2.serverManifest, rscClientManifest = param2.rscClientManifest, rscSSRManifest = param2.rscSSRManifest, rscServerManifest = param2.rscServerManifest, locals = param2.locals, matchEntryName = param2.matchEntryName, matchPathname = param2.matchPathname, loaderContext = param2.loaderContext;
                   forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : getPathname(req);
                   _matchRoute = _sliced_to_array(matchRoute(router, forMatchpathname, matchEntryName), 2), routeInfo = _matchRoute[0], params = _matchRoute[1];
-                  framework = metaName || "modern-js";
-                  fallbackHeader = "x-".concat(cutNameByHyphen(framework), "-ssr-fallback");
+                  framework = cutNameByHyphen(metaName || "modern-js");
+                  fallbackHeader = "x-".concat(framework, "-ssr-fallback");
                   fallbackReason = null;
                   fallbackWrapper = function() {
                     var _ref2 = _async_to_generator(function(reason, error) {
@@ -173,6 +173,13 @@ function _createRender() {
                     onError,
                     onTiming
                   };
+                  if (fallbackReason) {
+                    renderOptions.html = injectFallbackReasonToHtml({
+                      html: renderOptions.html,
+                      reason: fallbackReason,
+                      framework
+                    });
+                  }
                   switch (renderMode) {
                     case "data":
                       return [
@@ -218,7 +225,7 @@ function _createRender() {
                     ];
                   return [
                     4,
-                    renderHandler(req, renderOptions, "ssr", fallbackWrapper)
+                    renderHandler(req, renderOptions, "ssr", fallbackWrapper, framework)
                   ];
                 case 4:
                   _tmp = _state2.sent();
@@ -254,7 +261,7 @@ function _createRender() {
                 case 10:
                   return [
                     4,
-                    renderHandler(req, renderOptions, renderMode, fallbackWrapper)
+                    renderHandler(req, renderOptions, renderMode, fallbackWrapper, framework)
                   ];
                 case 11:
                   response = _state2.sent();
@@ -284,11 +291,11 @@ function _createRender() {
   });
   return _createRender.apply(this, arguments);
 }
-function renderHandler(request, options, mode, fallbackWrapper) {
+function renderHandler(request, options, mode, fallbackWrapper, framework) {
   return _renderHandler.apply(this, arguments);
 }
 function _renderHandler() {
-  _renderHandler = _async_to_generator(function(request, options, mode, fallbackWrapper) {
+  _renderHandler = _async_to_generator(function(request, options, mode, fallbackWrapper, framework) {
     var _options_config_server, response, serverManifest, ssrByRouteIds, runtimeEnv, nestedRoutesJson, routes, urlPath, pathToFileURL, matchRoutes, url, matchedRoutes, _lastMatch_route, lastMatch, e, routeInfo;
     function applyExtendHeaders(r, route) {
       Object.entries(route.responseHeaders || {}).forEach(function(param) {
@@ -373,7 +380,11 @@ function _renderHandler() {
           ];
         case 7:
           _state.sent();
-          response = csrRender(options.html);
+          response = csrRender(injectFallbackReasonToHtml({
+            html: options.html,
+            reason: "error",
+            framework
+          }));
           return [
             3,
             8
@@ -403,7 +414,7 @@ function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFallback
 }
 function _getRenderMode() {
   _getRenderMode = _async_to_generator(function(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFallback) {
-    var query;
+    var query, fallbackHeaderValue, _fallbackHeaderValue_split_, reason;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -431,7 +442,8 @@ function _getRenderMode() {
               "data"
             ];
           }
-          if (!(forceCSR && (query.csr || req.headers.get(fallbackHeader) || (nodeReq === null || nodeReq === void 0 ? void 0 : nodeReq.headers[fallbackHeader]))))
+          fallbackHeaderValue = req.headers.get(fallbackHeader) || (nodeReq === null || nodeReq === void 0 ? void 0 : nodeReq.headers[fallbackHeader]);
+          if (!(forceCSR && (query.csr || fallbackHeaderValue)))
             return [
               3,
               5
@@ -452,9 +464,10 @@ function _getRenderMode() {
             4
           ];
         case 2:
+          reason = fallbackHeaderValue === null || fallbackHeaderValue === void 0 ? void 0 : (_fallbackHeaderValue_split_ = fallbackHeaderValue.split(";")[1]) === null || _fallbackHeaderValue_split_ === void 0 ? void 0 : _fallbackHeaderValue_split_.split("=")[1];
           return [
             4,
-            onFallback === null || onFallback === void 0 ? void 0 : onFallback("header")
+            onFallback === null || onFallback === void 0 ? void 0 : onFallback(reason ? "header,".concat(reason) : "header")
           ];
         case 3:
           _state.sent();
@@ -483,6 +496,13 @@ function _getRenderMode() {
   });
   return _getRenderMode.apply(this, arguments);
 }
+function injectFallbackReasonToHtml(param) {
+  var html = param.html, reason = param.reason, framework = param.framework;
+  var tag = '<script id="__'.concat(framework, '_ssr_fallback_reason__" type="application/json">').concat(JSON.stringify({
+    reason
+  }), "</script>");
+  return html.replace(/<\/head>/, "".concat(tag, "</head>"));
+}
 function csrRender(html) {
   return new Response(html, {
     status: 200,

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/adapters/node/plugins/resource.js

@@ -93,7 +93,12 @@ const injectRscManifestPlugin = () => ({
   setup(api) {
     return {
       async prepare() {
+        var _config_server;
         const { middlewares, distDirectory: pwd } = api.useAppContext();
+        const config = api.useConfigContext();
+        if (!((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.rsc)) {
+          return;
+        }
         middlewares.push({
           name: "inject-rsc-manifest",
           handler: async (c, next) => {

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

@@ -26,7 +26,7 @@ const serverStaticPlugin = () => ({
 });
 function createPublicMiddleware({ pwd, routes }) {
   return async (c, next) => {
-    const route = matchRoute(c.req, routes);
+    const route = matchPublicRoute(c.req, routes);
     if (route) {
       const { entryPath } = route;
       const filename = path.join(pwd, entryPath);
@@ -45,7 +45,7 @@ function createPublicMiddleware({ pwd, routes }) {
     return await next();
   };
 }
-function matchRoute(req, routes) {
+function matchPublicRoute(req, routes) {
   for (const route of routes.sort(sortRoutes)) {
     if (!route.isSSR && route.entryPath.startsWith("public") && req.path.startsWith(route.urlPath)) {
       return route;
@@ -80,7 +80,11 @@ function createStaticMiddleware(options) {
     ...iconReg
   ].join("|")})`);
   return async (c, next) => {
+    const pageRoute = c.get("route");
     const pathname = c.req.path;
+    if (pageRoute && path.extname(pathname) === "") {
+      return next();
+    }
     const hit = staticPathRegExp.test(pathname);
     if (hit) {
       const filepath = path.join(pwd, pathname.replace(prefix, () => ""));

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/plugins/render/index.js

@@ -24,14 +24,17 @@ const renderPlugin = () => ({
           handler: requestLatencyMiddleware()
         });
         for (const route of pageRoutes) {
+          var _config_server;
           const { urlPath: originUrlPath, entryName = MAIN_ENTRY_NAME } = route;
           const urlPath = originUrlPath.endsWith("/") ? `${originUrlPath}*` : `${originUrlPath}/*`;
-          const customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
-          middlewares.push({
-            name: "custom-server-hook",
-            path: urlPath,
-            handler: customServerHookMiddleware
-          });
+          if (((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.disableHook) !== true) {
+            const customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
+            middlewares.push({
+              name: "custom-server-hook",
+              path: urlPath,
+              handler: customServerHookMiddleware
+            });
+          }
           const customServerMiddleware = await customServer.getServerMiddleware(serverMiddleware);
           customServerMiddleware && middlewares.push({
             name: "custom-server-middleware",

package/dist/esm-node/plugins/render/render.js

@@ -54,8 +54,8 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
   return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, rscClientManifest, rscSSRManifest, rscServerManifest, locals, matchEntryName, matchPathname, loaderContext }) => {
     const forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : getPathname(req);
     const [routeInfo, params] = matchRoute(router, forMatchpathname, matchEntryName);
-    const framework = metaName || "modern-js";
-    const fallbackHeader = `x-${cutNameByHyphen(framework)}-ssr-fallback`;
+    const framework = cutNameByHyphen(metaName || "modern-js");
+    const fallbackHeader = `x-${framework}-ssr-fallback`;
     let fallbackReason = null;
     const fallbackWrapper = async (reason, error) => {
       fallbackReason = reason;
@@ -113,10 +113,17 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       onError,
       onTiming
     };
+    if (fallbackReason) {
+      renderOptions.html = injectFallbackReasonToHtml({
+        html: renderOptions.html,
+        reason: fallbackReason,
+        framework
+      });
+    }
     let response;
     switch (renderMode) {
       case "data":
-        response = await dataHandler(req, renderOptions) || await renderHandler(req, renderOptions, "ssr", fallbackWrapper);
+        response = await dataHandler(req, renderOptions) || await renderHandler(req, renderOptions, "ssr", fallbackWrapper, framework);
         break;
       case "rsc-tree":
         response = await renderRscHandler(req, renderOptions);
@@ -126,7 +133,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
         break;
       case "ssr":
       case "csr":
-        response = await renderHandler(req, renderOptions, renderMode, fallbackWrapper);
+        response = await renderHandler(req, renderOptions, renderMode, fallbackWrapper, framework);
         break;
       default:
         throw new Error(`Unknown render mode: ${renderMode}`);
@@ -137,7 +144,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
     return response;
   };
 }
-async function renderHandler(request, options, mode, fallbackWrapper) {
+async function renderHandler(request, options, mode, fallbackWrapper, framework) {
   var _options_config_server;
   let response = null;
   const { serverManifest } = options;
@@ -169,7 +176,11 @@ async function renderHandler(request, options, mode, fallbackWrapper) {
     } catch (e) {
       options.onError(e, ErrorDigest.ERENDER);
       await fallbackWrapper("error", e);
-      response = csrRender(options.html);
+      response = csrRender(injectFallbackReasonToHtml({
+        html: options.html,
+        reason: "error",
+        framework
+      }));
     }
   } else {
     response = csrRender(options.html);
@@ -195,11 +206,14 @@ async function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFa
     if (query.__loader) {
       return "data";
     }
-    if (forceCSR && (query.csr || req.headers.get(fallbackHeader) || (nodeReq === null || nodeReq === void 0 ? void 0 : nodeReq.headers[fallbackHeader]))) {
+    const fallbackHeaderValue = req.headers.get(fallbackHeader) || (nodeReq === null || nodeReq === void 0 ? void 0 : nodeReq.headers[fallbackHeader]);
+    if (forceCSR && (query.csr || fallbackHeaderValue)) {
       if (query.csr) {
         await (onFallback === null || onFallback === void 0 ? void 0 : onFallback("query"));
       } else {
-        await (onFallback === null || onFallback === void 0 ? void 0 : onFallback("header"));
+        var _fallbackHeaderValue_split_;
+        const reason = fallbackHeaderValue === null || fallbackHeaderValue === void 0 ? void 0 : (_fallbackHeaderValue_split_ = fallbackHeaderValue.split(";")[1]) === null || _fallbackHeaderValue_split_ === void 0 ? void 0 : _fallbackHeaderValue_split_.split("=")[1];
+        await (onFallback === null || onFallback === void 0 ? void 0 : onFallback(reason ? `header,${reason}` : "header"));
       }
       return "csr";
     }
@@ -208,6 +222,12 @@ async function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFa
     return "csr";
   }
 }
+function injectFallbackReasonToHtml({ html, reason, framework }) {
+  const tag = `<script id="__${framework}_ssr_fallback_reason__" type="application/json">${JSON.stringify({
+    reason
+  })}</script>`;
+  return html.replace(/<\/head>/, `${tag}</head>`);
+}
 function csrRender(html) {
   return new Response(html, {
     status: 200,

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/config/server.d.ts

@@ -36,6 +36,11 @@ export interface ServerUserConfig {
      */
     useJsonScript?: boolean;
     logger?: boolean | Record<string, unknown>;
+    /**
+     * @description disable hook middleware for performance
+     * @default false
+     */
+    disableHook?: boolean;
 }
 export type ServerNormalizedConfig = ServerUserConfig;
 export {};

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

@@ -7,7 +7,7 @@ import type { Render } from '../render';
 import type { ServerPlugin } from './new';
 import type { ServerPluginLegacy } from './old';
 export type { FileChangeEvent, ResetEvent } from '@modern-js/plugin-v2';
-export type FallbackReason = 'error' | 'header' | 'query';
+export type FallbackReason = 'error' | 'header' | 'query' | `header,${string}`;
 export type FallbackInput = {
     reason: FallbackReason;
     error: unknown;
@@ -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.1",
+  "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.1",
-    "@modern-js/runtime-utils": "2.67.1",
-    "@modern-js/utils": "2.67.1",
-    "@modern-js/plugin-v2": "2.67.1"
+    "@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",
-    "@scripts/build": "2.66.0",
+    "@modern-js/types": "2.67.3",
     "@scripts/jest-config": "2.66.0",
-    "@modern-js/types": "2.67.1"
+    "@scripts/build": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {