RSC: Check for rw-rsc header (#9410)

.github/actions/actionsLib.mjs

@@ -161,4 +161,3 @@ export async function setUpRscTestProject(
   await execInProject(`node ${rwBinPath} build -v`)
   console.log()
 }
-

packages/vite/src/client.ts

@@ -17,7 +17,7 @@ const checkStatus = async (
   return response
 }
 
-export function serve<Props>(rscId: string, basePath = '/RSC/') {
+export function serve<Props>(rscId: string, basePath = '/rw-rsc/') {
   type SetRerender = (
     rerender: (next: [ReactElement, string]) => void
   ) => () => void
@@ -54,6 +54,9 @@ export function serve<Props>(rscId: string, basePath = '/RSC/') {
           const response = fetch(basePath + id + '/' + searchParams, {
             method: 'POST',
             body: await encodeReply(args),
+            headers: {
+              'rw-rsc': '1',
+            },
           })
 
           const data = createFromFetch(response, options)
@@ -76,7 +79,12 @@ export function serve<Props>(rscId: string, basePath = '/RSC/') {
       )
 
       const response =
-        prefetched || fetch(basePath + rscId + '/' + searchParams)
+        prefetched ||
+        fetch(basePath + rscId + '/' + searchParams, {
+          headers: {
+            'rw-rsc': '1',
+          },
+        })
       const data = createFromFetch(checkStatus(response), options)
       console.log('fetchRSC after createFromFetch. data:', data)
 

packages/vite/src/rsc/rscRequestHandler.ts

@@ -9,12 +9,19 @@ import { renderRsc } from './rscWorkerCommunication'
 const { decodeReply, decodeReplyFromBusboy } = RSDWServer
 
 export function createRscRequestHandler() {
-  // This is mounted at /RSC, so will have /RSC stripped from req.url
-  return async (req: Request, res: Response) => {
-    const basePath = '/RSC/'
+  // This is mounted at /rw-rsc, so will have /rw-rsc stripped from req.url
+  return async (req: Request, res: Response, next: () => void) => {
+    const basePath = '/rw-rsc/'
     console.log('basePath', basePath)
     console.log('req.originalUrl', req.originalUrl, 'req.url', req.url)
     console.log('req.headers.host', req.headers.host)
+    console.log("req.headers['rw-rsc']", req.headers['rw-rsc'])
+
+    // https://www.rfc-editor.org/rfc/rfc6648
+    // SHOULD NOT prefix their parameter names with "X-" or similar constructs.
+    if (req.headers['rw-rsc'] !== '1') {
+      return next()
+    }
 
     const url = new URL(req.originalUrl || '', 'http://' + req.headers.host)
     let rscId: string | undefined

packages/vite/src/runRscFeServer.ts

@@ -103,8 +103,8 @@ export async function runFeServer() {
     })
   )
 
-  // Mounting middleware at /RSC will strip /RSC from req.url
-  app.use('/RSC', createRscRequestHandler())
+  // Mounting middleware at /rw-rsc will strip /rw-rsc from req.url
+  app.use('/rw-rsc', createRscRequestHandler())
 
   app.use(express.static(rwPaths.web.dist))