@modern-js/server-core 2.64.0 → 2.64.2

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

@@ -26,6 +26,7 @@ __export(node_exports, {
   httpCallBack2HonoMid: () => import_hono.httpCallBack2HonoMid,
   injectNodeSeverPlugin: () => import_plugins.injectNodeSeverPlugin,
   injectResourcePlugin: () => import_plugins.injectResourcePlugin,
+  injectRscManifestPlugin: () => import_plugins.injectRscManifestPlugin,
   loadCacheConfig: () => import_helper.loadCacheConfig,
   loadServerCliConfig: () => import_helper.loadServerCliConfig,
   loadServerEnv: () => import_helper.loadServerEnv,
@@ -50,6 +51,7 @@ var import_helper = require("./helper");
   httpCallBack2HonoMid,
   injectNodeSeverPlugin,
   injectResourcePlugin,
+  injectRscManifestPlugin,
   loadCacheConfig,
   loadServerCliConfig,
   loadServerEnv,

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

@@ -58,7 +58,7 @@ const createWebRequest = (req, res, body) => {
     signal: controller.signal
   };
   res.on("close", () => controller.abort("res closed"));
-  if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader")) || req.headers["x-mf-micro"]) {
+  if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader")) || req.headers["x-mf-micro"] || req.headers["x-rsc-action"]) {
     init.body = body !== null && body !== void 0 ? body : (0, import_stream.createReadableStreamFromReadable)(req);
     init.duplex = "half";
   }

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

@@ -28,9 +28,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var resource_exports = {};
 __export(resource_exports, {
+  getClientManifest: () => getClientManifest,
   getHtmlTemplates: () => getHtmlTemplates,
+  getRscSSRManifest: () => getRscSSRManifest,
+  getRscServerManifest: () => getRscServerManifest,
   getServerManifest: () => getServerManifest,
   injectResourcePlugin: () => injectResourcePlugin,
+  injectRscManifestPlugin: () => injectRscManifestPlugin,
   injectServerManifest: () => injectServerManifest,
   injectTemplates: () => injectTemplates
 });
@@ -103,16 +107,56 @@ async function getServerManifest(pwd, routes, logger) {
     nestedRoutesJson
   };
 }
-function injectServerManifest(pwd, routes) {
+function injectServerManifest(pwd, routes, manifestPromise) {
   return async (c, next) => {
     if (routes && !c.get("serverManifest")) {
       const logger = c.get("logger");
-      const serverManifest = await getServerManifest(pwd, routes, logger);
+      const serverManifest = await (manifestPromise || getServerManifest(pwd, routes, logger));
       c.set("serverManifest", serverManifest);
     }
     await next();
   };
 }
+async function getRscServerManifest(pwd) {
+  const rscServerManifest = await (0, import_utils.compatibleRequire)(import_path.default.join(pwd, "bundles", "react-server-manifest.json")).catch((_) => void 0);
+  return rscServerManifest;
+}
+async function getClientManifest(pwd) {
+  const rscClientManifest = await (0, import_utils.compatibleRequire)(import_path.default.join(pwd, "react-client-manifest.json")).catch((_) => void 0);
+  return rscClientManifest;
+}
+async function getRscSSRManifest(pwd) {
+  const rscSSRManifest = await (0, import_utils.compatibleRequire)(import_path.default.join(pwd, "react-ssr-manifest.json")).catch((_) => void 0);
+  return rscSSRManifest;
+}
+const injectRscManifestPlugin = () => ({
+  name: "@modern-js/plugin-inject-rsc-manifest",
+  setup(api) {
+    return {
+      async prepare() {
+        const { middlewares, distDirectory: pwd } = api.useAppContext();
+        middlewares.push({
+          name: "inject-rsc-manifest",
+          handler: async (c, next) => {
+            if (!c.get("rscServerManifest")) {
+              const rscServerManifest = await getRscServerManifest(pwd);
+              c.set("rscServerManifest", rscServerManifest);
+            }
+            if (!c.get("rscClientManifest")) {
+              const rscClientManifest = await getClientManifest(pwd);
+              c.set("rscClientManifest", rscClientManifest);
+            }
+            if (!c.get("rscSSRManifest")) {
+              const rscSSRManifest = await getRscSSRManifest(pwd);
+              c.set("rscSSRManifest", rscSSRManifest);
+            }
+            await next();
+          }
+        });
+      }
+    };
+  }
+});
 const injectResourcePlugin = () => ({
   name: "@modern-js/plugin-inject-resource",
   setup(api) {
@@ -120,13 +164,14 @@ const injectResourcePlugin = () => ({
       async prepare() {
         const { middlewares, routes, distDirectory: pwd } = api.useAppContext();
         let htmlTemplatePromise;
+        let manifestPromise;
         if ((0, import_utils.isProd)()) {
-          getServerManifest(pwd, routes || [], console);
+          manifestPromise = getServerManifest(pwd, routes || [], console);
           htmlTemplatePromise = getHtmlTemplates(pwd, routes || []);
         }
         middlewares.push({
           name: "inject-server-manifest",
-          handler: injectServerManifest(pwd, routes)
+          handler: injectServerManifest(pwd, routes, manifestPromise)
         });
         middlewares.push({
           name: "inject-html",
@@ -138,9 +183,13 @@ const injectResourcePlugin = () => ({
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getClientManifest,
   getHtmlTemplates,
+  getRscSSRManifest,
+  getRscServerManifest,
   getServerManifest,
   injectResourcePlugin,
+  injectRscManifestPlugin,
   injectServerManifest,
   injectTemplates
 });

package/dist/cjs/plugins/default.js

@@ -25,13 +25,21 @@ var import_log = require("./log");
 var import_monitors = require("./monitors");
 var import_processedBy = require("./processedBy");
 var import_render = require("./render");
+function createSilenceLogger() {
+  return new Proxy({}, {
+    get: () => {
+      return () => {
+      };
+    }
+  });
+}
 function createDefaultPlugins(options = {}) {
   const plugins = [
+    (0, import_log.logPlugin)(),
     (0, import_monitors.initMonitorsPlugin)(),
     (0, import_render.injectRenderHandlerPlugin)(options),
-    (0, import_monitors.injectloggerPluigin)(options.logger),
+    (0, import_monitors.injectloggerPluigin)(options.logger ? options.logger : createSilenceLogger()),
     (0, import_monitors.injectServerTiming)(),
-    (0, import_log.logPlugin)(),
     (0, import_processedBy.processedByPlugin)()
   ];
   return plugins;

package/dist/cjs/plugins/log.js

@@ -61,6 +61,7 @@ function log(fn, prefix, method, path, status = 0, elapsed) {
 }
 function logHandler() {
   return async function logger(c, next) {
+    var _c_env_node_res, _c_env_node, _c_env;
     const { method } = c.req;
     const monitors = c.get("monitors");
     if (!monitors) {
@@ -72,7 +73,8 @@ function logHandler() {
     log(logFn, "<--", method, path);
     const start = Date.now();
     await next();
-    log(logFn, "-->", method, path, c.res.status, time(start));
+    var _c_env_node_res_statusCode;
+    log(logFn, "-->", method, path, (_c_env_node_res_statusCode = c === null || c === void 0 ? void 0 : (_c_env = c.env) === null || _c_env === void 0 ? void 0 : (_c_env_node = _c_env.node) === null || _c_env_node === void 0 ? void 0 : (_c_env_node_res = _c_env_node.res) === null || _c_env_node_res === void 0 ? void 0 : _c_env_node_res.statusCode) !== null && _c_env_node_res_statusCode !== void 0 ? _c_env_node_res_statusCode : c.res.status, time(start));
   };
 }
 const logPlugin = () => ({

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

@@ -89,6 +89,9 @@ function createRenderHandler(render) {
     const monitors = c.get("monitors");
     const templates = c.get("templates") || {};
     const serverManifest = c.get("serverManifest") || {};
+    const rscServerManifest = c.get("rscServerManifest");
+    const rscClientManifest = c.get("rscClientManifest");
+    const rscSSRManifest = c.get("rscSSRManifest");
     const locals = c.get("locals");
     const metrics = c.get("metrics");
     const matchPathname = c.get("matchPathname");
@@ -104,6 +107,9 @@ function createRenderHandler(render) {
       templates,
       metrics,
       serverManifest,
+      rscServerManifest,
+      rscClientManifest,
+      rscSSRManifest,
       loaderContext,
       locals,
       matchPathname,

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

@@ -37,6 +37,8 @@ var import_constants = require("../../constants");
 var import_utils = require("../../utils");
 var import_utils2 = require("../../utils");
 var import_dataHandler = require("./dataHandler");
+var import_renderRscHandler = require("./renderRscHandler");
+var import_serverActionHandler = require("./serverActionHandler");
 var import_ssrRender = require("./ssrRender");
 const DYNAMIC_ROUTE_REG = /\/:./;
 function getRouter(routes) {
@@ -80,17 +82,17 @@ function getHeadersWithoutCookie(headers) {
   delete _headers.cookie;
   return _headers;
 }
-async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, config, onFallback: onFallbackFn }) {
+async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, config, onFallback }) {
   const router = getRouter(routes);
-  return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, matchEntryName, matchPathname, loaderContext }) => {
+  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`;
     let fallbackReason = null;
-    const onFallback = async (reason, error) => {
+    const fallbackWrapper = async (reason, error) => {
       fallbackReason = reason;
-      return onFallbackFn === null || onFallbackFn === void 0 ? void 0 : onFallbackFn(reason, {
+      return onFallback === null || onFallback === void 0 ? void 0 : onFallback(reason, {
         logger,
         reporter,
         metrics
@@ -113,18 +115,14 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
         }
       });
     }
-    const renderMode = await getRenderMode(req, fallbackHeader, routeInfo.isSSR, forceCSR, nodeReq, onFallback);
+    const renderMode = await getRenderMode(req, fallbackHeader, routeInfo.isSSR, forceCSR, nodeReq, fallbackWrapper);
     const headerData = (0, import_utils2.parseHeaders)(req);
-    const onError = (e) => {
-      monitors === null || monitors === void 0 ? void 0 : monitors.error(`SSR Error - ${e instanceof Error ? e.name : e}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie(headerData));
+    const onError = (e, key) => {
+      monitors === null || monitors === void 0 ? void 0 : monitors.error(`SSR Error - ${key || (e instanceof Error ? e.name : e)}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie(headerData));
     };
     const onTiming = (name, dur) => {
       monitors === null || monitors === void 0 ? void 0 : monitors.timing(name, dur, "SSR");
     };
-    const onBoundError = async (e) => {
-      (0, import_utils2.onError)(import_utils2.ErrorDigest.ERENDER, e, monitors, req);
-      await (onFallback === null || onFallback === void 0 ? void 0 : onFallback("error", e));
-    };
     const renderOptions = {
       pwd,
       html,
@@ -139,6 +137,9 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       logger,
       metrics,
       locals,
+      rscClientManifest,
+      rscSSRManifest,
+      rscServerManifest,
       serverManifest,
       loaderContext: loaderContext || /* @__PURE__ */ new Map(),
       onError,
@@ -147,11 +148,17 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
     let response;
     switch (renderMode) {
       case "data":
-        response = await (0, import_dataHandler.dataHandler)(req, renderOptions) || await renderHandler(req, renderOptions, "ssr", onBoundError);
+        response = await (0, import_dataHandler.dataHandler)(req, renderOptions) || await renderHandler(req, renderOptions, "ssr", fallbackWrapper);
+        break;
+      case "rsc-tree":
+        response = await (0, import_renderRscHandler.renderRscHandler)(req, renderOptions);
+        break;
+      case "rsc-action":
+        response = await (0, import_serverActionHandler.serverActionHandler)(req, renderOptions);
         break;
       case "ssr":
       case "csr":
-        response = await renderHandler(req, renderOptions, renderMode, onBoundError);
+        response = await renderHandler(req, renderOptions, renderMode, fallbackWrapper);
         break;
       default:
         throw new Error(`Unknown render mode: ${renderMode}`);
@@ -162,7 +169,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
     return response;
   };
 }
-async function renderHandler(request, options, mode, onError) {
+async function renderHandler(request, options, mode, fallbackWrapper) {
   var _options_config_server;
   let response = null;
   const { serverManifest } = options;
@@ -192,7 +199,8 @@ async function renderHandler(request, options, mode, onError) {
     try {
       response = await (0, import_ssrRender.ssrRender)(request, options);
     } catch (e) {
-      await onError(e);
+      options.onError(e, import_utils2.ErrorDigest.ERENDER);
+      await fallbackWrapper("error", e);
       response = csrRender(options.html);
     }
   } else {
@@ -209,6 +217,12 @@ async function renderHandler(request, options, mode, onError) {
 }
 async function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFallback) {
   const query = (0, import_utils2.parseQuery)(req);
+  if (req.headers.get("x-rsc-action")) {
+    return "rsc-action";
+  }
+  if (req.headers.get("x-rsc-tree")) {
+    return "rsc-tree";
+  }
   if (isSSR) {
     if (query.__loader) {
       return "data";

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

@@ -0,0 +1,51 @@
+"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 renderRscHandler_exports = {};
+__export(renderRscHandler_exports, {
+  renderRscHandler: () => renderRscHandler
+});
+module.exports = __toCommonJS(renderRscHandler_exports);
+var import_constants = require("@modern-js/utils/universal/constants");
+const renderRscHandler = async (req, { serverManifest, routeInfo, rscClientManifest }) => {
+  var _serverManifest_renderBundles;
+  const serverBundle = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[routeInfo.entryName || import_constants.MAIN_ENTRY_NAME];
+  if (!serverBundle) {
+    return new Response("Cannot find server bundle for RSC", {
+      status: 500
+    });
+  }
+  const { rscRequestHandler } = serverBundle;
+  if (!rscRequestHandler) {
+    return new Response("Cannot find request handler for RSC", {
+      status: 500
+    });
+  }
+  if (!rscClientManifest) {
+    return new Response("Cannot find rsc client manifest", {
+      status: 500
+    });
+  }
+  return rscRequestHandler({
+    clientManifest: rscClientManifest
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  renderRscHandler
+});

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

@@ -0,0 +1,51 @@
+"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 serverActionHandler_exports = {};
+__export(serverActionHandler_exports, {
+  serverActionHandler: () => serverActionHandler
+});
+module.exports = __toCommonJS(serverActionHandler_exports);
+var import_constants = require("@modern-js/utils/universal/constants");
+const serverActionHandler = async (req, { serverManifest, routeInfo, rscClientManifest }) => {
+  var _serverManifest_renderBundles;
+  const serverBundle = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[routeInfo.entryName || import_constants.MAIN_ENTRY_NAME];
+  if (!serverBundle) {
+    return new Response("Cannot find server bundle for server action", {
+      status: 500
+    });
+  }
+  const { handleAction } = serverBundle;
+  if (!handleAction) {
+    return new Response("Cannot find server action handler", {
+      status: 500
+    });
+  }
+  if (!rscClientManifest) {
+    return new Response("Cannot find rsc client manifest", {
+      status: 500
+    });
+  }
+  return handleAction(req, {
+    clientManifest: rscClientManifest
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  serverActionHandler
+});

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

@@ -26,7 +26,7 @@ var import_constants2 = require("../../constants");
 var import_utils = require("../../utils");
 var import_ssrCache = require("./ssrCache");
 const SERVER_RUNTIME_ENTRY = "requestHandler";
-async function ssrRender(request, { routeInfo, html, config: userConfig, staticGenerate, nodeReq, serverManifest, locals, params, loaderContext, reporter, cacheConfig, logger, metrics, onError, onTiming }) {
+async function ssrRender(request, { routeInfo, html, config: userConfig, staticGenerate, nodeReq, serverManifest, rscSSRManifest, rscClientManifest, rscServerManifest, locals, params, loaderContext, reporter, cacheConfig, logger, metrics, onError, onTiming }) {
   var _serverManifest_renderBundles;
   const { entryName } = routeInfo;
   const loadableStats = serverManifest.loadableStats || {};
@@ -56,6 +56,9 @@ async function ssrRender(request, { routeInfo, html, config: userConfig, staticG
     params,
     loaderContext,
     config,
+    rscSSRManifest,
+    rscClientManifest,
+    rscServerManifest,
     locals,
     reporter,
     staticGenerate,

package/dist/cjs/utils/error.js

@@ -66,7 +66,7 @@ var ErrorDigest;
 (function(ErrorDigest2) {
   ErrorDigest2["ENOTF"] = "Page could not be found";
   ErrorDigest2["EINTER"] = "Internal server error";
-  ErrorDigest2["ERENDER"] = "SSR render failed";
+  ErrorDigest2["ERENDER"] = "SSR render fallback";
 })(ErrorDigest || (ErrorDigest = {}));
 function onError(digest, error, monitors, req) {
   const headerData = req && (0, import_request.parseHeaders)(req);

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

@@ -1,6 +1,6 @@
 import { httpCallBack2HonoMid, connectMid2HonoMid } from "./hono";
 import { createNodeServer, sendResponse, createWebRequest, writeReadableStreamToWritable } from "./node";
-import { serverStaticPlugin, injectResourcePlugin, getHtmlTemplates, getServerManifest, injectNodeSeverPlugin } from "./plugins";
+import { serverStaticPlugin, injectResourcePlugin, getHtmlTemplates, getServerManifest, injectNodeSeverPlugin, injectRscManifestPlugin } from "./plugins";
 import { loadServerPlugins, loadServerEnv, loadServerRuntimeConfig, loadServerCliConfig, loadCacheConfig } from "./helper";
 export {
   connectMid2HonoMid,
@@ -11,6 +11,7 @@ export {
   httpCallBack2HonoMid,
   injectNodeSeverPlugin,
   injectResourcePlugin,
+  injectRscManifestPlugin,
   loadCacheConfig,
   loadServerCliConfig,
   loadServerEnv,

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

@@ -28,7 +28,7 @@ var createWebRequest = function(req, res, body) {
   res.on("close", function() {
     return controller.abort("res closed");
   });
-  if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader")) || req.headers["x-mf-micro"]) {
+  if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader")) || req.headers["x-mf-micro"] || req.headers["x-rsc-action"]) {
     init.body = body !== null && body !== void 0 ? body : createReadableStreamFromReadable(req);
     init.duplex = "half";
   }