test: serve error (wip)

Author: hi-ogawa

packages/plugin-rsc/examples/basic/src/framework/entry.rsc.tsx

@@ -39,6 +39,7 @@ export async function handleRequest({
   let returnValue: RscPayload['returnValue'] | undefined
   let formState: ReactFormState | undefined
   let temporaryReferences: unknown | undefined
+  let statusCode = 200
   if (isAction) {
     // x-rsc-action header exists when action is called via `ReactClient.setServerCallback`.
     const actionId = request.headers.get('x-rsc-action')
@@ -55,15 +56,20 @@ export async function handleRequest({
         returnValue = { ok: true, data }
       } catch (e) {
         returnValue = { ok: false, data: e }
+        statusCode = 500
       }
     } else {
       // otherwise server function is called via `<form action={...}>`
       // before hydration (e.g. when javascript is disabled).
       // aka progressive enhancement.
       const formData = await request.formData()
       const decodedAction = await decodeAction(formData)
-      const result = await decodedAction()
-      formState = await decodeFormState(result, formData)
+      try {
+        const result = await decodedAction()
+        formState = await decodeFormState(result, formData)
+      } catch (e) {
+        statusCode = 500
+      }
     }
   }
 
@@ -82,7 +88,7 @@ export async function handleRequest({
 
   if (isRscRequest) {
     return new Response(rscStream, {
-      status: returnValue?.ok === false ? 500 : undefined,
+      status: statusCode,
       headers: {
         'content-type': 'text/x-component;charset=utf-8',
         vary: 'accept',
@@ -106,6 +112,7 @@ export async function handleRequest({
 
   // respond html
   return new Response(htmlStream, {
+    status: statusCode,
     headers: {
       'content-type': 'text/html;charset=utf-8',
       vary: 'accept',

packages/plugin-rsc/examples/basic/src/routes/root.tsx

@@ -47,6 +47,7 @@ import { TestHmrClientDep3 } from './hmr-client-dep3/server'
 import { TestChunk2 } from './chunk2/server'
 import { TestUseId } from './use-id/server'
 import { TestClientError } from './client-error/client'
+import { TestServerError } from './server-error/server'
 
 export function Root(props: { url: URL }) {
   return (
@@ -80,6 +81,7 @@ export function Root(props: { url: URL }) {
         <TestTemporaryReference />
         <TestServerActionError />
         <TestClientError />
+        <TestServerError url={props.url} />
         <TestReplayConsoleLogs url={props.url} />
         <TestSuspense url={props.url} />
         <TestActionFromClient />

packages/plugin-rsc/examples/basic/src/routes/server-error/server.tsx

@@ -0,0 +1,11 @@
+export async function TestServerError(props: { url: URL }) {
+  if (props.url.searchParams.has('test-server-error')) {
+    throw new Error('test-server-error!')
+  }
+  return (
+    <div>
+      <span>test-server-error</span>{' '}
+      <a href="?test-server-error">test-server-error</a>{' '}
+    </div>
+  )
+}