@modern-js/render 3.0.1 → 3.0.2

package/dist/cjs/client/callServer.js

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(callServer_exports);
 var import_class_private_field_get = require("@swc/helpers/_/_class_private_field_get");
 var import_class_private_field_init = require("@swc/helpers/_/_class_private_field_init");
 var import_class_private_field_set = require("@swc/helpers/_/_class_private_field_set");
-var import_client = require("react-server-dom-webpack/client.browser");
+var import_client = require("react-server-dom-rspack/client.browser");
 var _statusCode = /* @__PURE__ */ new WeakMap(), _url = /* @__PURE__ */ new WeakMap(), _details = /* @__PURE__ */ new WeakMap();
 class CallServerError extends Error {
   get statusCode() {
@@ -69,7 +69,7 @@ URL: ${url}`;
 }
 async function requestCallServer(id, args) {
   const entryName = window.__MODERN_JS_ENTRY_NAME;
-  const url = entryName === "main" ? "/" : `/${entryName}`;
+  const url = entryName === "main" || entryName === "index" ? "/" : `/${entryName}`;
   try {
     const response = await fetch(url, {
       method: "POST",
@@ -98,9 +98,7 @@ async function requestCallServer(id, args) {
 }
 async function callServer(id, args) {
   const response = requestCallServer(id, args);
-  const res = (0, import_client.createFromFetch)(response, {
-    callServer
-  });
+  const res = (0, import_client.createFromFetch)(response);
   return res;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/client/index.js

@@ -37,16 +37,17 @@ __export(client_exports, {
   createFromFetch: () => import_client3.createFromFetch,
   createFromReadableStream: () => import_client.createFromReadableStream,
   createServerReference: () => import_client.createServerReference,
-  rscStream: () => import_client2.rscStream
+  rscStream: () => import_client2.rscStream,
+  setServerCallback: () => import_client.setServerCallback
 });
 module.exports = __toCommonJS(client_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = __toESM(require("react"));
 var import_react2 = require("react");
-var import_client = require("react-server-dom-webpack/client.browser");
+var import_client = require("react-server-dom-rspack/client.browser");
 var import_client2 = require("../rsc-html-stream/client");
 var import_callServer = require("./callServer");
-var import_client3 = require("react-server-dom-webpack/client.browser");
+var import_client3 = require("react-server-dom-rspack/client.browser");
 const ResetRootContext = /* @__PURE__ */ (0, import_react2.createContext)(void 0);
 function RscClientRoot({ rscPayload }) {
   const elements = import_react.default.use(rscPayload);
@@ -82,5 +83,6 @@ const RSCServerSlot = () => {
   createFromFetch,
   createFromReadableStream,
   createServerReference,
-  rscStream
+  rscStream,
+  setServerCallback
 });

package/dist/cjs/rsc-html-stream/server.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_exports = {};
 __export(server_exports, {
+  injectCSS: () => injectCSS,
   injectRSCPayload: () => injectRSCPayload
 });
 module.exports = __toCommonJS(server_exports);
@@ -92,7 +93,64 @@ function writeChunk(chunk, controller) {
 function escapeScript(script) {
   return script.replace(/<!--/g, "<\\!--").replace(/<\/(script)/gi, "</\\$1");
 }
+function injectCSS(cssFiles, { injectClosingTags = true } = {}) {
+  if (cssFiles.length === 0) {
+    return new TransformStream({
+      transform(chunk, controller) {
+        controller.enqueue(chunk);
+      },
+      flush(controller) {
+        if (injectClosingTags) {
+          controller.enqueue(encoder.encode("</body></html>"));
+        }
+      }
+    });
+  }
+  const decoder = new TextDecoder();
+  const headTrailer = "</head>";
+  const bodyTrailer = "</body>";
+  const buffered = [];
+  let timeout = null;
+  let cssInjected = false;
+  const cssLinks = cssFiles.map((css) => `<link href="${css}" rel="stylesheet" />`).join("");
+  function flushBufferedChunks(controller) {
+    for (const chunk of buffered) {
+      let buf = decoder.decode(chunk);
+      if (!cssInjected && buf.includes(headTrailer)) {
+        buf = buf.replace(headTrailer, `${cssLinks}${headTrailer}`);
+        cssInjected = true;
+      }
+      controller.enqueue(encoder.encode(buf));
+    }
+    buffered.length = 0;
+    timeout = null;
+  }
+  return new TransformStream({
+    transform(chunk, controller) {
+      buffered.push(chunk);
+      if (timeout) {
+        return;
+      }
+      timeout = setTimeout(() => {
+        flushBufferedChunks(controller);
+      }, 0);
+    },
+    async flush(controller) {
+      if (timeout) {
+        clearTimeout(timeout);
+        flushBufferedChunks(controller);
+      }
+      if (!cssInjected) {
+        controller.enqueue(encoder.encode(cssLinks));
+      }
+      if (injectClosingTags) {
+        controller.enqueue(encoder.encode("</body></html>"));
+      }
+    }
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  injectCSS,
   injectRSCPayload
 });

package/dist/cjs/server/rsc/csr.js

@@ -0,0 +1,54 @@
+"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 csr_exports = {};
+__export(csr_exports, {
+  renderCSRWithRSC: () => renderCSRWithRSC
+});
+module.exports = __toCommonJS(csr_exports);
+var import_server = require("../../rsc-html-stream/server");
+var import_rsc = require("./rsc");
+async function renderCSRWithRSC(options) {
+  const entryCssFiles = __rspack_rsc_manifest__ === null || __rspack_rsc_manifest__ === void 0 ? void 0 : __rspack_rsc_manifest__.entryCssFiles;
+  const cssFiles = entryCssFiles ? Object.values(entryCssFiles).flat() : [];
+  const rscPayloadStream = (0, import_rsc.renderRsc)({
+    element: options.rscRoot
+  });
+  const htmlStream = new ReadableStream({
+    start(controller) {
+      const encoder = new TextEncoder();
+      controller.enqueue(encoder.encode(options.html));
+      controller.close();
+    }
+  });
+  const stream = htmlStream.pipeThrough((0, import_server.injectCSS)(cssFiles, {
+    injectClosingTags: false
+  })).pipeThrough((0, import_server.injectRSCPayload)(rscPayloadStream, {
+    injectClosingTags: false
+  }));
+  return new Response(stream, {
+    status: 200,
+    headers: new Headers({
+      "content-type": "text/html; charset=UTF-8"
+    })
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  renderCSRWithRSC
+});

package/dist/cjs/server/rsc/index.js

@@ -16,9 +16,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var rsc_exports = {};
 module.exports = __toCommonJS(rsc_exports);
 __reExport(rsc_exports, require("./rsc"), module.exports);
-__reExport(rsc_exports, require("./processRSCStream"), module.exports);
+__reExport(rsc_exports, require("./csr"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./rsc"),
-  ...require("./processRSCStream")
+  ...require("./csr")
 });

package/dist/cjs/server/rsc/rsc.js

@@ -26,37 +26,49 @@ __export(rsc_exports, {
   renderToReadableStream: () => import_server.renderToReadableStream
 });
 module.exports = __toCommonJS(rsc_exports);
-var import_server = require("react-server-dom-webpack/server.edge");
-var import_server2 = require("react-server-dom-webpack/server.edge");
-var import_server3 = require("react-server-dom-webpack/server.edge");
-var import_client = require("react-server-dom-webpack/client.edge");
-var import_server4 = require("react-server-dom-webpack/server");
+var import_server = require("react-server-dom-rspack/server.node");
+var import_server2 = require("react-server-dom-rspack/server.node");
+var import_server3 = require("react-server-dom-rspack/server.node");
+var import_client = require("react-server-dom-rspack/client.node");
+var import_server4 = require("react-server-dom-rspack/server.node");
 const renderRsc = (options) => {
-  const readable = (0, import_server2.renderToReadableStream)(options.element, options.clientManifest);
+  const readable = (0, import_server2.renderToReadableStream)(options.element);
   return readable;
 };
-const handleAction = async (req, options) => {
-  const serverReference = req.headers.get("x-rsc-action");
-  if (serverReference) {
-    const [filepath, name] = serverReference.split("#");
-    const action = __webpack_require__(filepath)[name || "default"];
-    if (action.$$typeof !== /* @__PURE__ */ Symbol.for("react.server.reference")) {
-      throw new Error("Invalid action");
+const handleAction = async (req) => {
+  try {
+    const serverReference = req.headers.get("x-rsc-action");
+    if (!serverReference) {
+      return new Response("Cannot find server reference", {
+        status: 404
+      });
+    }
+    const action = (0, import_server2.loadServerAction)(serverReference);
+    if (typeof action !== "function") {
+      console.error("[RSC] Invalid action: server reference is not a function, serverReference:", serverReference);
+      return new Response("Invalid action", {
+        status: 400
+      });
     }
-    const { clientManifest } = options;
     const contentType = req.headers.get("content-type");
     let args;
-    if (contentType === null || contentType === void 0 ? void 0 : contentType.includes("multipart/form-data")) {
-      const formData = await req.formData();
-      args = await (0, import_server3.decodeReply)(formData);
-    } else {
-      const text = await req.text();
-      args = await (0, import_server3.decodeReply)(text);
+    try {
+      if (contentType === null || contentType === void 0 ? void 0 : contentType.includes("multipart/form-data")) {
+        const formData = await req.formData();
+        args = await (0, import_server3.decodeReply)(formData);
+      } else {
+        const text = await req.text();
+        args = await (0, import_server3.decodeReply)(text);
+      }
+    } catch (error) {
+      console.error("[RSC] Failed to decode request arguments, error:", error instanceof Error ? error.message : String(error), "contentType:", contentType || "unknown");
+      return new Response("Failed to decode request arguments", {
+        status: 400
+      });
     }
-    const result = action.apply(null, args);
+    const result = await Promise.resolve(action.apply(null, args));
     const stream = renderRsc({
-      element: result,
-      clientManifest
+      element: result
     });
     const response = new Response(stream, {
       status: 200,
@@ -65,10 +77,15 @@ const handleAction = async (req, options) => {
       }
     });
     return response;
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    const errorStack = error instanceof Error ? error.stack : void 0;
+    console.error("[RSC] Error handling server action, error:", errorMessage, errorStack ? `
+${errorStack}` : "");
+    return new Response("Internal server error", {
+      status: 500
+    });
   }
-  return new Response("Cannot find server reference", {
-    status: 404
-  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/server/ssr/ssr.js

@@ -34,6 +34,17 @@ module.exports = __toCommonJS(ssr_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_server = require("react-dom/server.edge");
 var import_client = require("../../client/index");
+function CSSLinks({ cssFiles }) {
+  if (cssFiles.length === 0) {
+    return null;
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+    children: cssFiles.map((css) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("link", {
+      href: css,
+      rel: "stylesheet"
+    }, css))
+  });
+}
 function wrapStream(stream, originalStream) {
   const wrappedStream = Object.create(stream);
   for (const prop of Object.keys(originalStream)) {
@@ -44,31 +55,43 @@ function wrapStream(stream, originalStream) {
   return wrappedStream;
 }
 const renderSSRStream = async (children, options) => {
-  const { clientManifest, ssrManifest, rscRoot } = options;
-  if (!clientManifest || !ssrManifest) {
+  var __rspack_rsc_manifest__1, __rspack_rsc_manifest__2, __rspack_rsc_manifest__3;
+  const { rscRoot, routes } = options;
+  const clientManifest = (__rspack_rsc_manifest__1 = __rspack_rsc_manifest__) === null || __rspack_rsc_manifest__1 === void 0 ? void 0 : __rspack_rsc_manifest__1.clientManifest;
+  const serverConsumerModuleMap = (__rspack_rsc_manifest__2 = __rspack_rsc_manifest__) === null || __rspack_rsc_manifest__2 === void 0 ? void 0 : __rspack_rsc_manifest__2.serverConsumerModuleMap;
+  const entryCssFiles = (__rspack_rsc_manifest__3 = __rspack_rsc_manifest__) === null || __rspack_rsc_manifest__3 === void 0 ? void 0 : __rspack_rsc_manifest__3.entryCssFiles;
+  const hasRoutes = Boolean(routes && routes.length > 0);
+  if (!clientManifest || !serverConsumerModuleMap) {
     return (0, import_server.renderToReadableStream)(children, options);
   }
   try {
     const [{ renderRsc }, { createFromReadableStream }, { injectRSCPayload }] = await Promise.all([
       Promise.resolve().then(() => __toESM(require("../rsc/index"))),
-      Promise.resolve().then(() => __toESM(require("react-server-dom-webpack/client.edge"))),
+      Promise.resolve().then(() => __toESM(require("react-server-dom-rspack/client.edge"))),
       Promise.resolve().then(() => __toESM(require("../../rsc-html-stream/server")))
     ]);
     const rscStream = await renderRsc({
-      element: rscRoot || children,
-      clientManifest
+      element: rscRoot || children
     });
     const [rscElementStream, rscPayloadStream] = rscStream.tee();
-    const elements = createFromReadableStream(rscElementStream, {
-      serverConsumerManifest: ssrManifest
-    });
-    const htmlStream = await (0, import_server.renderToReadableStream)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_client.ServerElementsProvider, {
+    const elements = createFromReadableStream(rscElementStream);
+    let cssFiles = [];
+    if (!hasRoutes && entryCssFiles) {
+      cssFiles = Object.values(entryCssFiles).flat();
+    }
+    const htmlStream = await (0, import_server.renderToReadableStream)(/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_client.ServerElementsProvider, {
       elements,
-      children
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CSSLinks, {
+          cssFiles
+        }),
+        children
+      ]
     }), options);
-    return wrapStream(htmlStream.pipeThrough(injectRSCPayload(rscPayloadStream, {
-      injectClosingTags: false
-    })), htmlStream);
+    const stream = htmlStream.pipeThrough(injectRSCPayload(rscPayloadStream, {
+      injectClosingTags: true
+    }));
+    return wrapStream(stream, htmlStream);
   } catch (error) {
     console.error(error);
     throw error;

package/dist/esm/client/callServer.js

@@ -1,7 +1,7 @@
 import { _ as _class_private_field_get } from "@swc/helpers/_/_class_private_field_get";
 import { _ as _class_private_field_init } from "@swc/helpers/_/_class_private_field_init";
 import { _ as _class_private_field_set } from "@swc/helpers/_/_class_private_field_set";
-import { createFromFetch, encodeReply } from "react-server-dom-webpack/client.browser";
+import { createFromFetch, encodeReply } from "react-server-dom-rspack/client.browser";
 var _statusCode = /* @__PURE__ */ new WeakMap(), _url = /* @__PURE__ */ new WeakMap(), _details = /* @__PURE__ */ new WeakMap();
 class CallServerError extends Error {
   get statusCode() {
@@ -45,7 +45,7 @@ URL: ${url}`;
 }
 async function requestCallServer(id, args) {
   const entryName = window.__MODERN_JS_ENTRY_NAME;
-  const url = entryName === "main" ? "/" : `/${entryName}`;
+  const url = entryName === "main" || entryName === "index" ? "/" : `/${entryName}`;
   try {
     const response = await fetch(url, {
       method: "POST",
@@ -74,9 +74,7 @@ async function requestCallServer(id, args) {
 }
 async function callServer(id, args) {
   const response = requestCallServer(id, args);
-  const res = createFromFetch(response, {
-    callServer
-  });
+  const res = createFromFetch(response);
   return res;
 }
 export {

package/dist/esm/client/index.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from "react";
 import { createContext, useState } from "react";
-import { createFromReadableStream, createServerReference } from "react-server-dom-webpack/client.browser";
+import { createFromReadableStream, createServerReference, setServerCallback } from "react-server-dom-rspack/client.browser";
 import { rscStream } from "../rsc-html-stream/client";
 import { callServer } from "./callServer";
-import { createFromFetch } from "react-server-dom-webpack/client.browser";
+import { createFromFetch } from "react-server-dom-rspack/client.browser";
 const ResetRootContext = /* @__PURE__ */ createContext(void 0);
 function RscClientRoot({ rscPayload }) {
   const elements = React.use(rscPayload);
@@ -39,5 +39,6 @@ export {
   createFromFetch,
   createFromReadableStream,
   createServerReference,
-  rscStream
+  rscStream,
+  setServerCallback
 };

package/dist/esm/rsc-html-stream/server.js

@@ -69,6 +69,63 @@ function writeChunk(chunk, controller) {
 function escapeScript(script) {
   return script.replace(/<!--/g, "<\\!--").replace(/<\/(script)/gi, "</\\$1");
 }
+function injectCSS(cssFiles, { injectClosingTags = true } = {}) {
+  if (cssFiles.length === 0) {
+    return new TransformStream({
+      transform(chunk, controller) {
+        controller.enqueue(chunk);
+      },
+      flush(controller) {
+        if (injectClosingTags) {
+          controller.enqueue(encoder.encode("</body></html>"));
+        }
+      }
+    });
+  }
+  const decoder = new TextDecoder();
+  const headTrailer = "</head>";
+  const bodyTrailer = "</body>";
+  const buffered = [];
+  let timeout = null;
+  let cssInjected = false;
+  const cssLinks = cssFiles.map((css) => `<link href="${css}" rel="stylesheet" />`).join("");
+  function flushBufferedChunks(controller) {
+    for (const chunk of buffered) {
+      let buf = decoder.decode(chunk);
+      if (!cssInjected && buf.includes(headTrailer)) {
+        buf = buf.replace(headTrailer, `${cssLinks}${headTrailer}`);
+        cssInjected = true;
+      }
+      controller.enqueue(encoder.encode(buf));
+    }
+    buffered.length = 0;
+    timeout = null;
+  }
+  return new TransformStream({
+    transform(chunk, controller) {
+      buffered.push(chunk);
+      if (timeout) {
+        return;
+      }
+      timeout = setTimeout(() => {
+        flushBufferedChunks(controller);
+      }, 0);
+    },
+    async flush(controller) {
+      if (timeout) {
+        clearTimeout(timeout);
+        flushBufferedChunks(controller);
+      }
+      if (!cssInjected) {
+        controller.enqueue(encoder.encode(cssLinks));
+      }
+      if (injectClosingTags) {
+        controller.enqueue(encoder.encode("</body></html>"));
+      }
+    }
+  });
+}
 export {
+  injectCSS,
   injectRSCPayload
 };

package/dist/esm/server/rsc/csr.js

@@ -0,0 +1,30 @@
+import { injectCSS, injectRSCPayload } from "../../rsc-html-stream/server";
+import { renderRsc } from "./rsc";
+async function renderCSRWithRSC(options) {
+  const entryCssFiles = __rspack_rsc_manifest__ === null || __rspack_rsc_manifest__ === void 0 ? void 0 : __rspack_rsc_manifest__.entryCssFiles;
+  const cssFiles = entryCssFiles ? Object.values(entryCssFiles).flat() : [];
+  const rscPayloadStream = renderRsc({
+    element: options.rscRoot
+  });
+  const htmlStream = new ReadableStream({
+    start(controller) {
+      const encoder = new TextEncoder();
+      controller.enqueue(encoder.encode(options.html));
+      controller.close();
+    }
+  });
+  const stream = htmlStream.pipeThrough(injectCSS(cssFiles, {
+    injectClosingTags: false
+  })).pipeThrough(injectRSCPayload(rscPayloadStream, {
+    injectClosingTags: false
+  }));
+  return new Response(stream, {
+    status: 200,
+    headers: new Headers({
+      "content-type": "text/html; charset=UTF-8"
+    })
+  });
+}
+export {
+  renderCSRWithRSC
+};

package/dist/esm/server/rsc/index.js

@@ -1,2 +1,2 @@
 export * from "./rsc";
-export * from "./processRSCStream";
+export * from "./csr";

package/dist/esm/server/rsc/rsc.js

@@ -1,34 +1,46 @@
-import { renderToReadableStream } from "react-server-dom-webpack/server.edge";
-import { renderToReadableStream as renderToReadableStream2 } from "react-server-dom-webpack/server.edge";
-import { decodeReply } from "react-server-dom-webpack/server.edge";
-import { createFromReadableStream } from "react-server-dom-webpack/client.edge";
-import { registerClientReference, registerServerReference } from "react-server-dom-webpack/server";
+import { renderToReadableStream } from "react-server-dom-rspack/server.node";
+import { loadServerAction, renderToReadableStream as renderToReadableStream2 } from "react-server-dom-rspack/server.node";
+import { decodeReply } from "react-server-dom-rspack/server.node";
+import { createFromReadableStream } from "react-server-dom-rspack/client.node";
+import { registerClientReference, registerServerReference } from "react-server-dom-rspack/server.node";
 const renderRsc = (options) => {
-  const readable = renderToReadableStream2(options.element, options.clientManifest);
+  const readable = renderToReadableStream2(options.element);
   return readable;
 };
-const handleAction = async (req, options) => {
-  const serverReference = req.headers.get("x-rsc-action");
-  if (serverReference) {
-    const [filepath, name] = serverReference.split("#");
-    const action = __webpack_require__(filepath)[name || "default"];
-    if (action.$$typeof !== /* @__PURE__ */ Symbol.for("react.server.reference")) {
-      throw new Error("Invalid action");
+const handleAction = async (req) => {
+  try {
+    const serverReference = req.headers.get("x-rsc-action");
+    if (!serverReference) {
+      return new Response("Cannot find server reference", {
+        status: 404
+      });
+    }
+    const action = loadServerAction(serverReference);
+    if (typeof action !== "function") {
+      console.error("[RSC] Invalid action: server reference is not a function, serverReference:", serverReference);
+      return new Response("Invalid action", {
+        status: 400
+      });
     }
-    const { clientManifest } = options;
     const contentType = req.headers.get("content-type");
     let args;
-    if (contentType === null || contentType === void 0 ? void 0 : contentType.includes("multipart/form-data")) {
-      const formData = await req.formData();
-      args = await decodeReply(formData);
-    } else {
-      const text = await req.text();
-      args = await decodeReply(text);
+    try {
+      if (contentType === null || contentType === void 0 ? void 0 : contentType.includes("multipart/form-data")) {
+        const formData = await req.formData();
+        args = await decodeReply(formData);
+      } else {
+        const text = await req.text();
+        args = await decodeReply(text);
+      }
+    } catch (error) {
+      console.error("[RSC] Failed to decode request arguments, error:", error instanceof Error ? error.message : String(error), "contentType:", contentType || "unknown");
+      return new Response("Failed to decode request arguments", {
+        status: 400
+      });
     }
-    const result = action.apply(null, args);
+    const result = await Promise.resolve(action.apply(null, args));
     const stream = renderRsc({
-      element: result,
-      clientManifest
+      element: result
     });
     const response = new Response(stream, {
       status: 200,
@@ -37,10 +49,15 @@ const handleAction = async (req, options) => {
       }
     });
     return response;
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    const errorStack = error instanceof Error ? error.stack : void 0;
+    console.error("[RSC] Error handling server action, error:", errorMessage, errorStack ? `
+${errorStack}` : "");
+    return new Response("Internal server error", {
+      status: 500
+    });
   }
-  return new Response("Cannot find server reference", {
-    status: 404
-  });
 };
 export {
   createFromReadableStream,