From 925bed840e7157dffef23386cee449975a12efc2 Mon Sep 17 00:00:00 2001 From: daishi Date: Tue, 2 Jun 2026 10:06:06 +0900 Subject: [PATCH 1/2] wip: refactor with runWithContext dropping contextMiddleware --- e2e/fixtures/rsc-asset/src/waku.server.tsx | 20 +- e2e/fixtures/rsc-basic/src/waku.server.tsx | 40 +- .../rsc-css-modules/src/waku.server.tsx | 22 +- e2e/fixtures/ssr-basic/src/waku.server.tsx | 60 +-- .../ssr-context-provider/src/waku.server.tsx | 34 +- e2e/fixtures/ssr-nonce/src/waku.server.tsx | 44 +- e2e/fixtures/ssr-swr/src/waku.server.tsx | 38 +- .../ssr-target-bundle/src/waku.server.tsx | 38 +- e2e/ssr-catch-error.spec.ts | 7 +- e2e/ssr-nonce-middleware.spec.ts | 7 +- examples/31_minimal/src/waku.server.tsx | 30 +- examples/33_promise/src/waku.server.tsx | 46 +- examples/34_functions/src/waku.server.tsx | 50 ++- examples/35_nesting/src/waku.server.tsx | 54 +-- examples/36_form/src/waku.server.tsx | 61 +-- examples/37_css/src/waku.server.tsx | 42 +- examples/38_cookies/src/middleware/cookie.ts | 29 -- examples/38_cookies/src/waku.server.tsx | 44 +- examples/39_api/src/waku.server.tsx | 36 +- examples/41_path-alias/src/waku.server.tsx | 30 +- examples/51_spa/src/waku.server.tsx | 16 +- examples/53_islands/src/waku.server.tsx | 54 +-- examples/54_jotai/src/waku.server.tsx | 32 +- packages/waku/src/adapters/aws-lambda.ts | 9 - packages/waku/src/adapters/bun.ts | 9 - packages/waku/src/adapters/cloudflare.ts | 9 - packages/waku/src/adapters/deno.ts | 9 - packages/waku/src/adapters/edge.ts | 13 +- packages/waku/src/adapters/netlify.ts | 9 - packages/waku/src/adapters/node.ts | 9 - packages/waku/src/adapters/vercel.ts | 9 - packages/waku/src/lib/types.ts | 1 - packages/waku/src/lib/vite-rsc/handler.ts | 2 - packages/waku/src/router/define-router.tsx | 414 +++++++++--------- 34 files changed, 644 insertions(+), 683 deletions(-) delete mode 100644 examples/38_cookies/src/middleware/cookie.ts diff --git a/e2e/fixtures/rsc-asset/src/waku.server.tsx b/e2e/fixtures/rsc-asset/src/waku.server.tsx index 85a860f8a1..a4ae30f262 100644 --- a/e2e/fixtures/rsc-asset/src/waku.server.tsx +++ b/e2e/fixtures/rsc-asset/src/waku.server.tsx @@ -1,15 +1,17 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import App from './components/App.js'; export default adapter({ - handleRequest: async (input, { renderRsc }) => { - if (input.type === 'component') { - return renderRsc({ App: }); - } - if (input.type === 'function') { - const value = await input.fn(...input.args); - return renderRsc({}, { value }); - } - }, + handleRequest: (input, { renderRsc }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: }); + } + if (input.type === 'function') { + const value = await input.fn(...input.args); + return renderRsc({}, { value }); + } + }), handleBuild: async () => {}, }); diff --git a/e2e/fixtures/rsc-basic/src/waku.server.tsx b/e2e/fixtures/rsc-basic/src/waku.server.tsx index 4ef2e68b57..59f0165386 100644 --- a/e2e/fixtures/rsc-basic/src/waku.server.tsx +++ b/e2e/fixtures/rsc-basic/src/waku.server.tsx @@ -1,28 +1,32 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import App from './components/App.js'; const BUILD_MATADATA_KEY = 'metadata-key'; const BUILD_MATADATA_VALUE = 'metadata-value'; export default adapter({ - handleRequest: async (input, { renderRsc, loadBuildMetadata }) => { - if (input.type === 'component') { - return renderRsc({ - App: ( - - ), - }); - } - if (input.type === 'function') { - const value = await input.fn(...input.args); - return renderRsc({}, { value }); - } - return 'fallback'; - }, + handleRequest: (input, { renderRsc, loadBuildMetadata }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ + App: ( + + ), + }); + } + if (input.type === 'function') { + const value = await input.fn(...input.args); + return renderRsc({}, { value }); + } + return 'fallback'; + }), handleBuild: async ({ saveBuildMetadata }) => { await saveBuildMetadata(BUILD_MATADATA_KEY, BUILD_MATADATA_VALUE); }, diff --git a/e2e/fixtures/rsc-css-modules/src/waku.server.tsx b/e2e/fixtures/rsc-css-modules/src/waku.server.tsx index 6b43561765..3e4f6596e0 100644 --- a/e2e/fixtures/rsc-css-modules/src/waku.server.tsx +++ b/e2e/fixtures/rsc-css-modules/src/waku.server.tsx @@ -1,16 +1,18 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import App from './components/App.js'; export default adapter({ - handleRequest: async (input, { renderRsc }) => { - if (input.type === 'component') { - return renderRsc({ App: }); - } - if (input.type === 'function') { - const value = await input.fn(...input.args); - return renderRsc({}, { value }); - } - return 'fallback'; - }, + handleRequest: (input, { renderRsc }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: }); + } + if (input.type === 'function') { + const value = await input.fn(...input.args); + return renderRsc({}, { value }); + } + return 'fallback'; + }), handleBuild: async () => {}, }); diff --git a/e2e/fixtures/ssr-basic/src/waku.server.tsx b/e2e/fixtures/ssr-basic/src/waku.server.tsx index 95c8f337cc..a8f02fba20 100644 --- a/e2e/fixtures/ssr-basic/src/waku.server.tsx +++ b/e2e/fixtures/ssr-basic/src/waku.server.tsx @@ -1,40 +1,42 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import App from './components/App.js'; import TestApp from './components/test-app.js'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - if (input.rscPath === 'test') { - return renderRsc({ TestApp: }); + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + if (input.rscPath === 'test') { + return renderRsc({ TestApp: }); + } + return renderRsc({ App: }); } - return renderRsc({ App: }); - } - if (input.type === 'function') { - const value = await input.fn(...input.args); - return renderRsc({}, { value }); - } - if (input.type === 'custom') { - if (input.pathname === '/') { - return renderHtml( - await renderRsc({ App: }), - , - { - rscPath: '', - }, - ); + if (input.type === 'function') { + const value = await input.fn(...input.args); + return renderRsc({}, { value }); } - if (input.pathname === '/test') { - return renderHtml( - await renderRsc({ TestApp: }), - , - { - rscPath: 'test', - }, - ); + if (input.type === 'custom') { + if (input.pathname === '/') { + return renderHtml( + await renderRsc({ App: }), + , + { + rscPath: '', + }, + ); + } + if (input.pathname === '/test') { + return renderHtml( + await renderRsc({ TestApp: }), + , + { + rscPath: 'test', + }, + ); + } } - } - }, + }), handleBuild: async () => {}, }); diff --git a/e2e/fixtures/ssr-context-provider/src/waku.server.tsx b/e2e/fixtures/ssr-context-provider/src/waku.server.tsx index 2a122ecf27..7e32545421 100644 --- a/e2e/fixtures/ssr-context-provider/src/waku.server.tsx +++ b/e2e/fixtures/ssr-context-provider/src/waku.server.tsx @@ -1,21 +1,27 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import App from './components/app.js'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - return renderRsc({ App: }); - } - if (input.type === 'function') { - const value = await input.fn(...input.args); - return renderRsc({}, { value }); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml(await renderRsc({ App: }), , { - rscPath: '', - }); - } - }, + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: }); + } + if (input.type === 'function') { + const value = await input.fn(...input.args); + return renderRsc({}, { value }); + } + if (input.type === 'custom' && input.pathname === '/') { + return renderHtml( + await renderRsc({ App: }), + , + { + rscPath: '', + }, + ); + } + }), handleBuild: async () => {}, }); diff --git a/e2e/fixtures/ssr-nonce/src/waku.server.tsx b/e2e/fixtures/ssr-nonce/src/waku.server.tsx index 1db6340996..713d5c79ff 100644 --- a/e2e/fixtures/ssr-nonce/src/waku.server.tsx +++ b/e2e/fixtures/ssr-nonce/src/waku.server.tsx @@ -1,4 +1,5 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import App from './components/App.js'; @@ -6,28 +7,29 @@ import App from './components/App.js'; const TEST_NONCE = 'test-nonce-12345'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - return renderRsc({ App: }); - } - if (input.type === 'custom' && input.pathname === '/') { - const response = await renderHtml( - await renderRsc({ App: }), - , - { - rscPath: '', - nonce: TEST_NONCE, - }, - ); + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: }); + } + if (input.type === 'custom' && input.pathname === '/') { + const response = await renderHtml( + await renderRsc({ App: }), + , + { + rscPath: '', + nonce: TEST_NONCE, + }, + ); - // Set CSP header with the nonce - response.headers.set( - 'Content-Security-Policy', - `script-src 'self' 'nonce-${TEST_NONCE}';`, - ); + // Set CSP header with the nonce + response.headers.set( + 'Content-Security-Policy', + `script-src 'self' 'nonce-${TEST_NONCE}';`, + ); - return response; - } - }, + return response; + } + }), handleBuild: async () => {}, }); diff --git a/e2e/fixtures/ssr-swr/src/waku.server.tsx b/e2e/fixtures/ssr-swr/src/waku.server.tsx index 89268728f5..0bf1b072a4 100644 --- a/e2e/fixtures/ssr-swr/src/waku.server.tsx +++ b/e2e/fixtures/ssr-swr/src/waku.server.tsx @@ -1,25 +1,27 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import App from './components/App.js'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - return renderRsc({ App: }); - } - if (input.type === 'function') { - const value = await input.fn(...input.args); - return renderRsc({}, { value }); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml( - await renderRsc({ App: }), - , - { - rscPath: '', - }, - ); - } - }, + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: }); + } + if (input.type === 'function') { + const value = await input.fn(...input.args); + return renderRsc({}, { value }); + } + if (input.type === 'custom' && input.pathname === '/') { + return renderHtml( + await renderRsc({ App: }), + , + { + rscPath: '', + }, + ); + } + }), handleBuild: async () => {}, }); diff --git a/e2e/fixtures/ssr-target-bundle/src/waku.server.tsx b/e2e/fixtures/ssr-target-bundle/src/waku.server.tsx index 89268728f5..0bf1b072a4 100644 --- a/e2e/fixtures/ssr-target-bundle/src/waku.server.tsx +++ b/e2e/fixtures/ssr-target-bundle/src/waku.server.tsx @@ -1,25 +1,27 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import App from './components/App.js'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - return renderRsc({ App: }); - } - if (input.type === 'function') { - const value = await input.fn(...input.args); - return renderRsc({}, { value }); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml( - await renderRsc({ App: }), - , - { - rscPath: '', - }, - ); - } - }, + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: }); + } + if (input.type === 'function') { + const value = await input.fn(...input.args); + return renderRsc({}, { value }); + } + if (input.type === 'custom' && input.pathname === '/') { + return renderHtml( + await renderRsc({ App: }), + , + { + rscPath: '', + }, + ); + } + }), handleBuild: async () => {}, }); diff --git a/e2e/ssr-catch-error.spec.ts b/e2e/ssr-catch-error.spec.ts index 0ed7a137c4..45688e65ed 100644 --- a/e2e/ssr-catch-error.spec.ts +++ b/e2e/ssr-catch-error.spec.ts @@ -3,7 +3,12 @@ import { prepareNormalSetup, test, waitForHydration } from './utils.js'; const startApp = prepareNormalSetup('ssr-catch-error'); -test.describe(`ssr-catch-error`, () => { +// TODO: the validator Hono middleware seeds context data via getContextData(), +// but Waku's context is now established inside the handler (runWithContext), so +// a Hono middleware can no longer reach it. Re-enable once the validator is +// reworked to establish context from within the handler in a follow-up PR. +// eslint-disable-next-line playwright/no-skipped-test +test.describe.skip(`ssr-catch-error`, () => { let port: number; let stopApp: () => Promise; diff --git a/e2e/ssr-nonce-middleware.spec.ts b/e2e/ssr-nonce-middleware.spec.ts index 40ad94bd42..195278a1e0 100644 --- a/e2e/ssr-nonce-middleware.spec.ts +++ b/e2e/ssr-nonce-middleware.spec.ts @@ -3,7 +3,12 @@ import { prepareNormalSetup, test, waitForHydration } from './utils.js'; const startApp = prepareNormalSetup('ssr-nonce-middleware'); -test.describe(`ssr-nonce-middleware`, () => { +// TODO: the nonce Hono middleware sets context.nonce via getContext(), but +// Waku's context is now established inside the handler (runWithContext), so a +// Hono middleware can no longer reach it. Re-enable once nonce is reworked to +// establish context from within the handler in a follow-up PR. +// eslint-disable-next-line playwright/no-skipped-test +test.describe.skip(`ssr-nonce-middleware`, () => { let port: number; let stopApp: () => Promise; diff --git a/examples/31_minimal/src/waku.server.tsx b/examples/31_minimal/src/waku.server.tsx index 6cc9d13489..ff38283847 100644 --- a/examples/31_minimal/src/waku.server.tsx +++ b/examples/31_minimal/src/waku.server.tsx @@ -1,22 +1,24 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import App from './components/App'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - return renderRsc({ App: }); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml( - await renderRsc({ App: }), - , - { - rscPath: '', - }, - ); - } - }, + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: }); + } + if (input.type === 'custom' && input.pathname === '/') { + return renderHtml( + await renderRsc({ App: }), + , + { + rscPath: '', + }, + ); + } + }), handleBuild: async ({ rscPath2pathname, renderRsc, diff --git a/examples/33_promise/src/waku.server.tsx b/examples/33_promise/src/waku.server.tsx index 215ce90477..1a5c81df7d 100644 --- a/examples/33_promise/src/waku.server.tsx +++ b/examples/33_promise/src/waku.server.tsx @@ -1,34 +1,36 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Children, Slot } from 'waku/minimal/client'; import App from './components/App'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - return renderRsc({ - App: ( - - - - ), - }); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml( - await renderRsc({ + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: ( - + ), - }), - -

A client element

- , - { rscPath: '' }, - ); - } - }, + }); + } + if (input.type === 'custom' && input.pathname === '/') { + return renderHtml( + await renderRsc({ + App: ( + + + + ), + }), + +

A client element

+ , + { rscPath: '' }, + ); + } + }), handleBuild: async ({ rscPath2pathname, renderRsc, diff --git a/examples/34_functions/src/waku.server.tsx b/examples/34_functions/src/waku.server.tsx index f3066cb62f..96259839d2 100644 --- a/examples/34_functions/src/waku.server.tsx +++ b/examples/34_functions/src/waku.server.tsx @@ -1,32 +1,34 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import { runWithRerender } from './als'; import App from './components2/App'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - return renderRsc({ App: }); - } - if (input.type === 'function') { - const elements: Record = {}; - const rerender = (rscPath: string) => { - elements.App = ; - }; - const value = await runWithRerender(rerender, () => - input.fn(...input.args), - ); - return renderRsc(elements, { value }); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml( - await renderRsc({ App: }), - , - { - rscPath: '', - }, - ); - } - }, + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: }); + } + if (input.type === 'function') { + const elements: Record = {}; + const rerender = (rscPath: string) => { + elements.App = ; + }; + const value = await runWithRerender(rerender, () => + input.fn(...input.args), + ); + return renderRsc(elements, { value }); + } + if (input.type === 'custom' && input.pathname === '/') { + return renderHtml( + await renderRsc({ App: }), + , + { + rscPath: '', + }, + ); + } + }), handleBuild: async () => {}, }); diff --git a/examples/35_nesting/src/waku.server.tsx b/examples/35_nesting/src/waku.server.tsx index 56fede4649..eb96c534a6 100644 --- a/examples/35_nesting/src/waku.server.tsx +++ b/examples/35_nesting/src/waku.server.tsx @@ -1,38 +1,40 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import App from './components/App'; import AppWithoutSsr from './components/AppWithoutSsr'; import InnerApp from './components/InnerApp'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - const params = new URLSearchParams( - input.rscPath || 'App=Waku&InnerApp=0', - ); - const result: Record = {}; - if (params.has('App')) { - result.App = ; - } - if (params.has('InnerApp')) { - result.InnerApp = ; + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + const params = new URLSearchParams( + input.rscPath || 'App=Waku&InnerApp=0', + ); + const result: Record = {}; + if (params.has('App')) { + result.App = ; + } + if (params.has('InnerApp')) { + result.InnerApp = ; + } + if (params.has('AppWithoutSsr')) { + result.AppWithoutSsr = ; + } + return renderRsc(result); } - if (params.has('AppWithoutSsr')) { - result.AppWithoutSsr = ; + if (input.type === 'custom' && input.pathname === '/') { + return renderHtml( + await renderRsc({ + App: , + InnerApp: , + }), + , + { rscPath: '' }, + ); } - return renderRsc(result); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml( - await renderRsc({ - App: , - InnerApp: , - }), - , - { rscPath: '' }, - ); - } - }, + }), handleBuild: async ({ renderRsc, rscPath2pathname, diff --git a/examples/36_form/src/waku.server.tsx b/examples/36_form/src/waku.server.tsx index fc6425a416..b9603ad799 100644 --- a/examples/36_form/src/waku.server.tsx +++ b/examples/36_form/src/waku.server.tsx @@ -1,37 +1,40 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import { runWithRerender } from './als'; import App from './components/App'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - return renderRsc({ App: }); - } - if (input.type === 'function') { - const elements: Record = {}; - const rerender = (rscPath: string) => { - elements.App = ; - }; - const value = await runWithRerender(rerender, () => - input.fn(...input.args), - ); - return renderRsc(elements, { value }); - } - if ( - (input.type === 'action' || input.type === 'custom') && - input.pathname === '/' - ) { - const formState = input.type === 'action' ? await input.fn() : undefined; - return renderHtml( - await renderRsc({ App: }), - , - { - rscPath: '', - formState, - }, - ); - } - }, + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: }); + } + if (input.type === 'function') { + const elements: Record = {}; + const rerender = (rscPath: string) => { + elements.App = ; + }; + const value = await runWithRerender(rerender, () => + input.fn(...input.args), + ); + return renderRsc(elements, { value }); + } + if ( + (input.type === 'action' || input.type === 'custom') && + input.pathname === '/' + ) { + const formState = + input.type === 'action' ? await input.fn() : undefined; + return renderHtml( + await renderRsc({ App: }), + , + { + rscPath: '', + formState, + }, + ); + } + }), handleBuild: async () => {}, }); diff --git a/examples/37_css/src/waku.server.tsx b/examples/37_css/src/waku.server.tsx index e7b9529d63..deb51cbd61 100644 --- a/examples/37_css/src/waku.server.tsx +++ b/examples/37_css/src/waku.server.tsx @@ -1,33 +1,35 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import App from './components/app'; import Layout from './components/layout'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - return renderRsc({ - App: ( - - - - ), - }); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml( - await renderRsc({ + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: ( - + ), - }), - , - { rscPath: '' }, - ); - } - }, + }); + } + if (input.type === 'custom' && input.pathname === '/') { + return renderHtml( + await renderRsc({ + App: ( + + + + ), + }), + , + { rscPath: '' }, + ); + } + }), handleBuild: async ({ rscPath2pathname, renderRsc, diff --git a/examples/38_cookies/src/middleware/cookie.ts b/examples/38_cookies/src/middleware/cookie.ts deleted file mode 100644 index 7dbf125503..0000000000 --- a/examples/38_cookies/src/middleware/cookie.ts +++ /dev/null @@ -1,29 +0,0 @@ -import * as cookie from 'cookie'; -import type { MiddlewareHandler } from 'hono'; -import { unstable_getContextData as getContextData } from 'waku/server'; - -// XXX we would probably like to extend config. -const COOKIE_OPTS = {}; - -const cookieMiddleware = (): MiddlewareHandler => { - return async (c, next) => { - const data = getContextData(); - const cookies = cookie.parse(c.req.header('cookie') || ''); - data.count = Number(cookies.count) || 0; - await next(); - if (c.res) { - const headers = new Headers(c.res.headers); - headers.append( - 'set-cookie', - cookie.serialize('count', String(data.count), COOKIE_OPTS), - ); - c.res = new Response(c.res.body, { - status: c.res.status, - statusText: c.res.statusText, - headers, - }); - } - }; -}; - -export default cookieMiddleware; diff --git a/examples/38_cookies/src/waku.server.tsx b/examples/38_cookies/src/waku.server.tsx index eb26c65ee3..e4f5b29e6f 100644 --- a/examples/38_cookies/src/waku.server.tsx +++ b/examples/38_cookies/src/waku.server.tsx @@ -1,31 +1,39 @@ import fsPromises from 'node:fs/promises'; +import * as cookie from 'cookie'; import { contextStorage, getContext } from 'hono/context-storage'; import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import { unstable_getContextData as getContextData } from 'waku/server'; import App from './components/App'; export default adapter( { - handleRequest: async (input, { renderRsc, renderHtml }) => { - const data = getContextData() as { count?: number }; - data.count = (data.count || 0) + 1; - const items = JSON.parse( - await fsPromises.readFile('./private/items.json', 'utf8'), - ); - if (input.type === 'component') { - return renderRsc({ - App: , - }); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml( - await renderRsc({ App: }), - , - { rscPath: '' }, + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + const cookies = cookie.parse(input.req.headers.get('cookie') || ''); + const data = getContextData() as { count?: number }; + data.count = (Number(cookies.count) || 0) + 1; + const setCookie = cookie.serialize('count', String(data.count)); + const items = JSON.parse( + await fsPromises.readFile('./private/items.json', 'utf8'), ); - } - }, + if (input.type === 'component') { + const stream = await renderRsc({ + App: , + }); + return new Response(stream, { headers: { 'set-cookie': setCookie } }); + } + if (input.type === 'custom' && input.pathname === '/') { + const response = await renderHtml( + await renderRsc({ App: }), + , + { rscPath: '' }, + ); + response.headers.append('set-cookie', setCookie); + return response; + } + }), handleBuild: async () => {}, }, { diff --git a/examples/39_api/src/waku.server.tsx b/examples/39_api/src/waku.server.tsx index 31e2d5f239..fa5f2ea535 100644 --- a/examples/39_api/src/waku.server.tsx +++ b/examples/39_api/src/waku.server.tsx @@ -1,4 +1,5 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import App from './components/App'; @@ -13,22 +14,23 @@ const stringToStream = (str: string): ReadableStream => { }; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - return renderRsc({ App: }); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml( - await renderRsc({ App: }), - , - { - rscPath: '', - }, - ); - } - if (input.type === 'custom' && input.pathname === '/api/hello') { - return stringToStream('world'); - } - }, + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: }); + } + if (input.type === 'custom' && input.pathname === '/') { + return renderHtml( + await renderRsc({ App: }), + , + { + rscPath: '', + }, + ); + } + if (input.type === 'custom' && input.pathname === '/api/hello') { + return stringToStream('world'); + } + }), handleBuild: async () => {}, }); diff --git a/examples/41_path-alias/src/waku.server.tsx b/examples/41_path-alias/src/waku.server.tsx index fd9ea96c62..3272ed8713 100644 --- a/examples/41_path-alias/src/waku.server.tsx +++ b/examples/41_path-alias/src/waku.server.tsx @@ -1,22 +1,24 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import App from '@/components/App'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - return renderRsc({ App: }); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml( - await renderRsc({ App: }), - , - { - rscPath: '', - }, - ); - } - }, + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ App: }); + } + if (input.type === 'custom' && input.pathname === '/') { + return renderHtml( + await renderRsc({ App: }), + , + { + rscPath: '', + }, + ); + } + }), handleBuild: async ({ rscPath2pathname, renderRsc, diff --git a/examples/51_spa/src/waku.server.tsx b/examples/51_spa/src/waku.server.tsx index 5f738899c5..4ace625be5 100644 --- a/examples/51_spa/src/waku.server.tsx +++ b/examples/51_spa/src/waku.server.tsx @@ -1,13 +1,15 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; export default adapter({ - handleRequest: async (input, { renderRsc }) => { - if (input.type === 'function') { - const value = await input.fn(...input.args); - return renderRsc({}, { value }); - } - return 'fallback'; - }, + handleRequest: (input, { renderRsc }) => + runWithContext(input.req, async () => { + if (input.type === 'function') { + const value = await input.fn(...input.args); + return renderRsc({}, { value }); + } + return 'fallback'; + }), handleBuild: async ({ generateDefaultHtml }) => { await generateDefaultHtml('index.html'); }, diff --git a/examples/53_islands/src/waku.server.tsx b/examples/53_islands/src/waku.server.tsx index 44ba091cf1..da7705ceaa 100644 --- a/examples/53_islands/src/waku.server.tsx +++ b/examples/53_islands/src/waku.server.tsx @@ -1,37 +1,39 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Children, Slot } from 'waku/minimal/client'; import App from './components/App'; import Dynamic from './components/Dynamic'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - if (input.rscPath === '') { - return renderRsc({ - App: , - }); + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + if (input.rscPath === '') { + return renderRsc({ + App: , + }); + } + if (input.rscPath === 'dynamic-slices') { + return renderRsc({ + 'slice:dynamic': ( + + + + ), + }); + } + throw new Error('Unexpected rscPath: ' + input.rscPath); } - if (input.rscPath === 'dynamic-slices') { - return renderRsc({ - 'slice:dynamic': ( - - - - ), - }); + if (input.type === 'custom' && input.pathname === '/') { + return renderHtml( + await renderRsc({ App: }), + , + { + rscPath: '', + }, + ); } - throw new Error('Unexpected rscPath: ' + input.rscPath); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml( - await renderRsc({ App: }), - , - { - rscPath: '', - }, - ); - } - }, + }), handleBuild: async ({ renderRsc, renderHtml, diff --git a/examples/54_jotai/src/waku.server.tsx b/examples/54_jotai/src/waku.server.tsx index 54b1db1752..160fa0a1f6 100644 --- a/examples/54_jotai/src/waku.server.tsx +++ b/examples/54_jotai/src/waku.server.tsx @@ -1,22 +1,26 @@ import adapter from 'waku/adapters/default'; +import { unstable_runWithContext as runWithContext } from 'waku/internals'; import { Slot } from 'waku/minimal/client'; import App from './components/app'; export default adapter({ - handleRequest: async (input, { renderRsc, renderHtml }) => { - if (input.type === 'component') { - return renderRsc({ - App: , - }); - } - if (input.type === 'custom' && input.pathname === '/') { - return renderHtml( - await renderRsc({ App: }), - , - { rscPath: '' }, - ); - } - }, + handleRequest: (input, { renderRsc, renderHtml }) => + runWithContext(input.req, async () => { + if (input.type === 'component') { + return renderRsc({ + App: ( + + ), + }); + } + if (input.type === 'custom' && input.pathname === '/') { + return renderHtml( + await renderRsc({ App: }), + , + { rscPath: '' }, + ); + } + }), handleBuild: async ({ rscPath2pathname, renderRsc, diff --git a/packages/waku/src/adapters/aws-lambda.ts b/packages/waku/src/adapters/aws-lambda.ts index dc27084e30..b9a5bad7a5 100644 --- a/packages/waku/src/adapters/aws-lambda.ts +++ b/packages/waku/src/adapters/aws-lambda.ts @@ -8,20 +8,12 @@ import { unstable_createServerEntryAdapter as createServerEntryAdapter } from 'w import { unstable_constants as constants, unstable_honoMiddleware as honoMiddleware, - unstable_runWithContext as runWithContext, } from 'waku/internals'; import type { BuildOptions } from './aws-lambda-build-enhancer.js'; const { DIST_PUBLIC } = constants; const { rscMiddleware, middlewareRunner } = honoMiddleware; -function contextMiddleware(): MiddlewareHandler { - return (c, next) => { - const req = c.req.raw; - return runWithContext(req, next); - }; -} - const DEFAULT_BODY_LIMIT_MAX_SIZE = 100 * 1024 * 1024; export default createServerEntryAdapter( @@ -54,7 +46,6 @@ export default createServerEntryAdapter( bodyLimit(bodyLimitOptions ?? { maxSize: DEFAULT_BODY_LIMIT_MAX_SIZE }), ); } - app.use(contextMiddleware()); for (const middlewareFn of middlewareFns) { app.use(middlewareFn({ app })); } diff --git a/packages/waku/src/adapters/bun.ts b/packages/waku/src/adapters/bun.ts index b17fefbab3..c3da1df081 100644 --- a/packages/waku/src/adapters/bun.ts +++ b/packages/waku/src/adapters/bun.ts @@ -7,20 +7,12 @@ import { unstable_createServerEntryAdapter as createServerEntryAdapter } from 'w import { unstable_constants as constants, unstable_honoMiddleware as honoMiddleware, - unstable_runWithContext as runWithContext, } from 'waku/internals'; import type { BuildOptions } from './bun-build-enhancer.js'; const { DIST_PUBLIC } = constants; const { rscMiddleware, middlewareRunner } = honoMiddleware; -function contextMiddleware(): MiddlewareHandler { - return (c, next) => { - const req = c.req.raw; - return runWithContext(req, next); - }; -} - const DEFAULT_BODY_LIMIT_MAX_SIZE = 100 * 1024 * 1024; export default createServerEntryAdapter( @@ -58,7 +50,6 @@ export default createServerEntryAdapter( bodyLimit(bodyLimitOptions ?? { maxSize: DEFAULT_BODY_LIMIT_MAX_SIZE }), ); } - app.use(contextMiddleware()); for (const middlewareFn of middlewareFns) { app.use(middlewareFn({ app })); } diff --git a/packages/waku/src/adapters/cloudflare.ts b/packages/waku/src/adapters/cloudflare.ts index c79debfbef..2c9048bf91 100644 --- a/packages/waku/src/adapters/cloudflare.ts +++ b/packages/waku/src/adapters/cloudflare.ts @@ -10,20 +10,12 @@ import { unstable_consumeMultiplexedStream as consumeMultiplexedStream, unstable_honoMiddleware as honoMiddleware, unstable_produceMultiplexedStream as produceMultiplexedStream, - unstable_runWithContext as runWithContext, } from 'waku/internals'; import type { BuildOptions } from './cloudflare-build-enhancer.js'; const { DIST_PUBLIC } = constants; const { rscMiddleware, middlewareRunner } = honoMiddleware; -function contextMiddleware(): MiddlewareHandler { - return (c, next) => { - const req = c.req.raw; - return runWithContext(req, next); - }; -} - const DEFAULT_BODY_LIMIT_MAX_SIZE = 100 * 1024 * 1024; const DO_NOT_BUNDLE = ''; @@ -91,7 +83,6 @@ export default createServerEntryAdapter( bodyLimit(bodyLimitOptions ?? { maxSize: DEFAULT_BODY_LIMIT_MAX_SIZE }), ); } - app.use(contextMiddleware()); for (const middlewareFn of middlewareFns) { app.use(middlewareFn({ app })); } diff --git a/packages/waku/src/adapters/deno.ts b/packages/waku/src/adapters/deno.ts index cd1de15777..f3f3892948 100644 --- a/packages/waku/src/adapters/deno.ts +++ b/packages/waku/src/adapters/deno.ts @@ -7,20 +7,12 @@ import { unstable_createServerEntryAdapter as createServerEntryAdapter } from 'w import { unstable_constants as constants, unstable_honoMiddleware as honoMiddleware, - unstable_runWithContext as runWithContext, } from 'waku/internals'; import type { BuildOptions } from './deno-build-enhancer.js'; const { DIST_PUBLIC } = constants; const { rscMiddleware, middlewareRunner } = honoMiddleware; -function contextMiddleware(): MiddlewareHandler { - return (c, next) => { - const req = c.req.raw; - return runWithContext(req, next); - }; -} - const DEFAULT_BODY_LIMIT_MAX_SIZE = 100 * 1024 * 1024; export default createServerEntryAdapter( @@ -58,7 +50,6 @@ export default createServerEntryAdapter( bodyLimit(bodyLimitOptions ?? { maxSize: DEFAULT_BODY_LIMIT_MAX_SIZE }), ); } - app.use(contextMiddleware()); for (const middlewareFn of middlewareFns) { app.use(middlewareFn({ app })); } diff --git a/packages/waku/src/adapters/edge.ts b/packages/waku/src/adapters/edge.ts index a1b0a6447b..acb0435508 100644 --- a/packages/waku/src/adapters/edge.ts +++ b/packages/waku/src/adapters/edge.ts @@ -3,10 +3,7 @@ import { bodyLimit } from 'hono/body-limit'; import { Hono } from 'hono/tiny'; import type { ImportGlobFunction } from 'vite/types/importGlob.d.ts'; import { unstable_createServerEntryAdapter as createServerEntryAdapter } from 'waku/adapter-builders'; -import { - unstable_honoMiddleware as honoMiddleware, - unstable_runWithContext as runWithContext, -} from 'waku/internals'; +import { unstable_honoMiddleware as honoMiddleware } from 'waku/internals'; declare global { interface ImportMeta { @@ -16,13 +13,6 @@ declare global { const { rscMiddleware, middlewareRunner } = honoMiddleware; -function contextMiddleware(): MiddlewareHandler { - return (c, next) => { - const req = c.req.raw; - return runWithContext(req, next); - }; -} - const DEFAULT_BODY_LIMIT_MAX_SIZE = 100 * 1024 * 1024; export default createServerEntryAdapter( @@ -51,7 +41,6 @@ export default createServerEntryAdapter( bodyLimit(bodyLimitOptions ?? { maxSize: DEFAULT_BODY_LIMIT_MAX_SIZE }), ); } - app.use(contextMiddleware()); for (const middlewareFn of middlewareFns) { app.use(middlewareFn({ app })); } diff --git a/packages/waku/src/adapters/netlify.ts b/packages/waku/src/adapters/netlify.ts index 9450d1b7f3..9d8c22b37c 100644 --- a/packages/waku/src/adapters/netlify.ts +++ b/packages/waku/src/adapters/netlify.ts @@ -5,20 +5,12 @@ import { unstable_createServerEntryAdapter as createServerEntryAdapter } from 'w import { unstable_constants as constants, unstable_honoMiddleware as honoMiddleware, - unstable_runWithContext as runWithContext, } from 'waku/internals'; import type { BuildOptions } from './netlify-build-enhancer.js'; const { DIST_PUBLIC } = constants; const { rscMiddleware, middlewareRunner } = honoMiddleware; -function contextMiddleware(): MiddlewareHandler { - return (c, next) => { - const req = c.req.raw; - return runWithContext(req, next); - }; -} - const DEFAULT_BODY_LIMIT_MAX_SIZE = 100 * 1024 * 1024; export default createServerEntryAdapter( @@ -48,7 +40,6 @@ export default createServerEntryAdapter( bodyLimit(bodyLimitOptions ?? { maxSize: DEFAULT_BODY_LIMIT_MAX_SIZE }), ); } - app.use(contextMiddleware()); for (const middlewareFn of middlewareFns) { app.use(middlewareFn({ app })); } diff --git a/packages/waku/src/adapters/node.ts b/packages/waku/src/adapters/node.ts index a855575973..34876e59ee 100644 --- a/packages/waku/src/adapters/node.ts +++ b/packages/waku/src/adapters/node.ts @@ -8,20 +8,12 @@ import { unstable_createServerEntryAdapter as createServerEntryAdapter } from 'w import { unstable_constants as constants, unstable_honoMiddleware as honoMiddleware, - unstable_runWithContext as runWithContext, } from 'waku/internals'; import type { BuildOptions } from './node-build-enhancer.js'; const { DIST_PUBLIC } = constants; const { rscMiddleware, middlewareRunner } = honoMiddleware; -function contextMiddleware(): MiddlewareHandler { - return (c, next) => { - const req = c.req.raw; - return runWithContext(req, next); - }; -} - const DEFAULT_BODY_LIMIT_MAX_SIZE = 100 * 1024 * 1024; export default createServerEntryAdapter( @@ -59,7 +51,6 @@ export default createServerEntryAdapter( bodyLimit(bodyLimitOptions ?? { maxSize: DEFAULT_BODY_LIMIT_MAX_SIZE }), ); } - app.use(contextMiddleware()); for (const middlewareFn of middlewareFns) { app.use(middlewareFn({ app })); } diff --git a/packages/waku/src/adapters/vercel.ts b/packages/waku/src/adapters/vercel.ts index 1c77b8f288..9ae8d74de2 100644 --- a/packages/waku/src/adapters/vercel.ts +++ b/packages/waku/src/adapters/vercel.ts @@ -6,20 +6,12 @@ import { unstable_createServerEntryAdapter as createServerEntryAdapter } from 'w import { unstable_constants as constants, unstable_honoMiddleware as honoMiddleware, - unstable_runWithContext as runWithContext, } from 'waku/internals'; import type { BuildOptions } from './vercel-build-enhancer.js'; const { DIST_PUBLIC } = constants; const { rscMiddleware, middlewareRunner } = honoMiddleware; -function contextMiddleware(): MiddlewareHandler { - return (c, next) => { - const req = c.req.raw; - return runWithContext(req, next); - }; -} - const DEFAULT_BODY_LIMIT_MAX_SIZE = 100 * 1024 * 1024; (global as any).__WAKU_HONO_NODE_SERVER_GET_REQUEST_LISTENER__ = getRequestListener; @@ -52,7 +44,6 @@ export default createServerEntryAdapter( bodyLimit(bodyLimitOptions ?? { maxSize: DEFAULT_BODY_LIMIT_MAX_SIZE }), ); } - app.use(contextMiddleware()); for (const middlewareFn of middlewareFns) { app.use(middlewareFn({ app })); } diff --git a/packages/waku/src/lib/types.ts b/packages/waku/src/lib/types.ts index 2681e82357..b5904e36c4 100644 --- a/packages/waku/src/lib/types.ts +++ b/packages/waku/src/lib/types.ts @@ -63,7 +63,6 @@ export type Unstable_HandleBuild = (utils: { renderHtml: Unstable_RenderHtml; rscPath2pathname: (rscPath: string) => string; saveBuildMetadata: (key: string, value: string) => Promise; - withRequest: (req: Request, fn: () => T) => T; generateFile: ( fileName: string, body: ReadableStream | string, diff --git a/packages/waku/src/lib/vite-rsc/handler.ts b/packages/waku/src/lib/vite-rsc/handler.ts index 8b85f70420..1da221b3b2 100644 --- a/packages/waku/src/lib/vite-rsc/handler.ts +++ b/packages/waku/src/lib/vite-rsc/handler.ts @@ -11,7 +11,6 @@ import { buildMetadata } from 'virtual:vite-rsc-waku/build-metadata'; import { config, isBuild } from 'virtual:vite-rsc-waku/config'; import notFoundHtml from 'virtual:vite-rsc-waku/not-found'; import { BUILD_METADATA_FILE, DIST_PUBLIC, DIST_SERVER } from '../constants.js'; -import { runWithContext } from '../context.js'; import { setAllEnv } from '../env.js'; import type { Unstable_CreateServerEntryAdapter as CreateServerEntryAdapter, @@ -144,7 +143,6 @@ const toProcessBuild = saveBuildMetadata: async (key, value) => { buildMetadata.set(key, value); }, - withRequest: (req, fn) => runWithContext(req, fn), generateFile: async (fileName, body) => { await emitFile( joinPath(DIST_PUBLIC, fileName), diff --git a/packages/waku/src/router/define-router.tsx b/packages/waku/src/router/define-router.tsx index ab2270de69..885b4e66cc 100644 --- a/packages/waku/src/router/define-router.tsx +++ b/packages/waku/src/router/define-router.tsx @@ -1,4 +1,5 @@ import type { ReactNode } from 'react'; +import { runWithContext } from '../lib/context.js'; import { createCustomError, getErrorInfo } from '../lib/utils/custom-errors.js'; import { getPathMapping, @@ -648,247 +649,248 @@ export function unstable_defineRouter(fns: { let cachedElementsForRequestInit: Promise | undefined; let cachedPath2moduleIds: Record | undefined; - const handleRequest: HandleRequest = async ( + const handleRequest: HandleRequest = ( input, { renderRsc, renderHtml, loadBuildMetadata }, - ): Promise => { - await initConfigs(loadBuildMetadata); - const getCachedElement = (cacheId: CacheId) => { - const cachedBytes = cachedElementsForRequest.get(cacheId); - if (!cachedBytes) { - return undefined; - } - return cachedBytes.then((bytes) => - deserializeRsc(bytes), - ) as Promise; - }; - const setCachedElement = (cacheId: CacheId, element: ReactNode) => { - const cachedBytes = cachedElementsForRequest.get(cacheId); - if (cachedBytes) { - return; - } - const bytes = serializeRsc(element); - cachedElementsForRequest.set(cacheId, bytes); - }; - cachedElementsForRequestInit ??= (async () => { - const cachedElementsMetadata = await loadBuildMetadata( - 'defineRouter:cachedElements', - ); - if (cachedElementsMetadata) { - Object.entries(JSON.parse(cachedElementsMetadata)).forEach( - ([cacheId, str]) => { - cachedElementsForRequest.set( - cacheId, - Promise.resolve(base64ToBytes(str as string)), - ); - }, - ); - } - })(); - await cachedElementsForRequestInit; - const getPath2moduleIds = async () => { - if (!cachedPath2moduleIds) { - cachedPath2moduleIds = JSON.parse( - (await loadBuildMetadata('defineRouter:path2moduleIds')) || '{}', + ): Promise => + runWithContext(input.req, async () => { + await initConfigs(loadBuildMetadata); + const getCachedElement = (cacheId: CacheId) => { + const cachedBytes = cachedElementsForRequest.get(cacheId); + if (!cachedBytes) { + return undefined; + } + return cachedBytes.then((bytes) => + deserializeRsc(bytes), + ) as Promise; + }; + const setCachedElement = (cacheId: CacheId, element: ReactNode) => { + const cachedBytes = cachedElementsForRequest.get(cacheId); + if (cachedBytes) { + return; + } + const bytes = serializeRsc(element); + cachedElementsForRequest.set(cacheId, bytes); + }; + cachedElementsForRequestInit ??= (async () => { + const cachedElementsMetadata = await loadBuildMetadata( + 'defineRouter:cachedElements', ); + if (cachedElementsMetadata) { + Object.entries(JSON.parse(cachedElementsMetadata)).forEach( + ([cacheId, str]) => { + cachedElementsForRequest.set( + cacheId, + Promise.resolve(base64ToBytes(str as string)), + ); + }, + ); + } + })(); + await cachedElementsForRequestInit; + const getPath2moduleIds = async () => { + if (!cachedPath2moduleIds) { + cachedPath2moduleIds = JSON.parse( + (await loadBuildMetadata('defineRouter:path2moduleIds')) || '{}', + ); + } + return cachedPath2moduleIds!; + }; + + const pathConfigItem = getPathConfigItem(input.pathname); + if (pathConfigItem?.type === 'api') { + const url = new URL(input.req.url); + url.pathname = input.pathname; + const req = new Request(url, input.req); + const params = + getPathMapping(pathConfigItem.path, input.pathname) ?? {}; + return pathConfigItem.handler(req, { params }); } - return cachedPath2moduleIds!; - }; - const pathConfigItem = getPathConfigItem(input.pathname); - if (pathConfigItem?.type === 'api') { const url = new URL(input.req.url); - url.pathname = input.pathname; - const req = new Request(url, input.req); - const params = getPathMapping(pathConfigItem.path, input.pathname) ?? {}; - return pathConfigItem.handler(req, { params }); - } - - const url = new URL(input.req.url); - const headers = Object.fromEntries(input.req.headers.entries()); - const withRerender = async (fn: () => Promise) => { - let elementsPromise: Promise> = Promise.resolve( - {}, - ); - let rendered = false; - const rerender = (rscPath: string, rscParams?: unknown) => { - if (rendered) { - throw new Error('already rendered'); - } - elementsPromise = Promise.all([ - elementsPromise, - getEntriesForRoute( - rscPath, - rscParams, - headers, - getCachedElement, - setCachedElement, - ), - ]).then(([oldElements, newElements]) => { - if (newElements === null) { - console.warn('getEntries returned null'); + const headers = Object.fromEntries(input.req.headers.entries()); + const withRerender = async (fn: () => Promise) => { + let elementsPromise: Promise> = Promise.resolve( + {}, + ); + let rendered = false; + const rerender = (rscPath: string, rscParams?: unknown) => { + if (rendered) { + throw new Error('already rendered'); } - return { ...oldElements, ...newElements }; - }); + elementsPromise = Promise.all([ + elementsPromise, + getEntriesForRoute( + rscPath, + rscParams, + headers, + getCachedElement, + setCachedElement, + ), + ]).then(([oldElements, newElements]) => { + if (newElements === null) { + console.warn('getEntries returned null'); + } + return { ...oldElements, ...newElements }; + }); + }; + setRerender(rerender); + try { + const value = await fn(); + return { value, elements: await elementsPromise }; + } finally { + rendered = true; + } }; - setRerender(rerender); - try { - const value = await fn(); - return { value, elements: await elementsPromise }; - } finally { - rendered = true; - } - }; - if (input.type === 'component') { - const sliceId = decodeSliceId(input.rscPath); - if (sliceId !== null) { - // LIMITATION: This is a single slice request. - // Ideally, we should be able to respond with multiple slices in one request. - let sliceConfig: SliceConfig | undefined; - let sliceParams: Record | undefined; - for (const item of getCachedConfigs()) { - if (item.type !== 'slice') { - continue; - } - if (item.id === sliceId) { - sliceConfig = item; - break; - } - if (item.pathSpec) { - const mapping = getPathMapping(item.pathSpec, '/' + sliceId); - if (mapping) { + if (input.type === 'component') { + const sliceId = decodeSliceId(input.rscPath); + if (sliceId !== null) { + // LIMITATION: This is a single slice request. + // Ideally, we should be able to respond with multiple slices in one request. + let sliceConfig: SliceConfig | undefined; + let sliceParams: Record | undefined; + for (const item of getCachedConfigs()) { + if (item.type !== 'slice') { + continue; + } + if (item.id === sliceId) { sliceConfig = item; - sliceParams = mapping; break; } + if (item.pathSpec) { + const mapping = getPathMapping(item.pathSpec, '/' + sliceId); + if (mapping) { + sliceConfig = item; + sliceParams = mapping; + break; + } + } } + if (!sliceConfig) { + return null; + } + const sliceElement = await getSliceElement( + sliceConfig, + getCachedElement, + setCachedElement, + sliceId, + sliceParams, + ); + return renderRsc({ + [SLICE_SLOT_ID_PREFIX + sliceId]: sliceElement, + ...(sliceConfig.isStatic + ? { + // FIXME: hard-coded for now + [IS_STATIC_ID + ':' + SLICE_SLOT_ID_PREFIX + sliceId]: true, + } + : {}), + }); } - if (!sliceConfig) { - return null; - } - const sliceElement = await getSliceElement( - sliceConfig, + const entries = await getEntriesForRoute( + input.rscPath, + input.rscParams, + headers, getCachedElement, setCachedElement, - sliceId, - sliceParams, ); - return renderRsc({ - [SLICE_SLOT_ID_PREFIX + sliceId]: sliceElement, - ...(sliceConfig.isStatic - ? { - // FIXME: hard-coded for now - [IS_STATIC_ID + ':' + SLICE_SLOT_ID_PREFIX + sliceId]: true, - } - : {}), - }); + if (!entries) { + return null; + } + return renderRsc(entries); } - const entries = await getEntriesForRoute( - input.rscPath, - input.rscParams, - headers, - getCachedElement, - setCachedElement, - ); - if (!entries) { - return null; + + if (input.type === 'function') { + try { + const { value, elements } = await withRerender(() => + input.fn(...input.args), + ); + return renderRsc(elements, { value }); + } catch (e) { + const info = getErrorInfo(e); + if (info?.location) { + const routePath = pathnameToRoutePath(info.location); + const rscPath = encodeRoutePath(routePath); + const entries = await getEntriesForRoute( + rscPath, + undefined, + headers, + getCachedElement, + setCachedElement, + ); + if (!entries) { + unstable_notFound(); + } + return renderRsc(entries); + } + throw e; + } } - return renderRsc(entries); - } - if (input.type === 'function') { - try { - const { value, elements } = await withRerender(() => - input.fn(...input.args), - ); - return renderRsc(elements, { value }); - } catch (e) { - const info = getErrorInfo(e); - if (info?.location) { - const routePath = pathnameToRoutePath(info.location); + if (input.type === 'action' || input.type === 'custom') { + const renderIt = async ( + pathname: string, + query: string, + status = 200, + ) => { + const routePath = pathnameToRoutePath(pathname); const rscPath = encodeRoutePath(routePath); - const entries = await getEntriesForRoute( + const rscParams = new URLSearchParams({ query }); + let entries = await getEntriesForRoute( rscPath, - undefined, + rscParams, headers, getCachedElement, setCachedElement, ); if (!entries) { - unstable_notFound(); + return null; } - return renderRsc(entries); - } - throw e; - } - } - - if (input.type === 'action' || input.type === 'custom') { - const renderIt = async ( - pathname: string, - query: string, - status = 200, - ) => { - const routePath = pathnameToRoutePath(pathname); - const rscPath = encodeRoutePath(routePath); - const rscParams = new URLSearchParams({ query }); - let entries = await getEntriesForRoute( - rscPath, - rscParams, - headers, - getCachedElement, - setCachedElement, - ); - if (!entries) { - return null; - } - const path2moduleIds = await getPath2moduleIds(); - const route = { path: routePath, query, hash: '' }; - const nonce = getNonce(); - const html = ; - let formState: unknown; - if (input.type === 'action') { - const { value, elements } = await withRerender(() => input.fn()); - formState = value; - entries = { ...entries, ...elements }; + const path2moduleIds = await getPath2moduleIds(); + const route = { path: routePath, query, hash: '' }; + const nonce = getNonce(); + const html = ; + let formState: unknown; + if (input.type === 'action') { + const { value, elements } = await withRerender(() => input.fn()); + formState = value; + entries = { ...entries, ...elements }; + } + return renderHtml(await renderRsc(entries), html, { + rscPath, + formState, + status, + ...(nonce ? { nonce } : {}), + unstable_extraScriptContent: getRouterPrefetchCode(path2moduleIds), + }); + }; + const query = url.searchParams.toString(); + if (pathConfigItem?.type === 'route' && pathConfigItem.noSsr) { + return 'fallback'; } - return renderHtml(await renderRsc(entries), html, { - rscPath, - formState, - status, - ...(nonce ? { nonce } : {}), - unstable_extraScriptContent: getRouterPrefetchCode(path2moduleIds), - }); - }; - const query = url.searchParams.toString(); - if (pathConfigItem?.type === 'route' && pathConfigItem.noSsr) { - return 'fallback'; - } - try { - if (pathConfigItem) { - return await renderIt(input.pathname, query); + try { + if (pathConfigItem) { + return await renderIt(input.pathname, query); + } + } catch (e) { + const info = getErrorInfo(e); + if (info?.status !== 404) { + throw e; + } } - } catch (e) { - const info = getErrorInfo(e); - if (info?.status !== 404) { - throw e; + if (has404()) { + return renderIt('/404', '', 404); + } else { + return null; } } - if (has404()) { - return renderIt('/404', '', 404); - } else { - return null; - } - } - }; + }); const handleBuild: HandleBuild = async ({ renderRsc, renderHtml, rscPath2pathname, saveBuildMetadata, - withRequest, generateFile, generateDefaultHtml, unstable_registerPrunableFile, @@ -968,7 +970,7 @@ export function unstable_defineRouter(fns: { } const req = new Request(new URL(routePath, 'http://localhost:3000')); runTask(async () => { - await withRequest(req, async () => { + await runWithContext(req, async () => { const res = await item.handler(req, { params: {} }); await generateFile(routePath, res.body || '').catch((e) => { if (e instanceof Error && 'code' in e && e.code === 'EEXIST') { @@ -1032,7 +1034,7 @@ export function unstable_defineRouter(fns: { const rscPath = encodeRoutePath(routePath); const req = new Request(new URL(routePath, 'http://localhost:3000')); runTask(async () => { - await withRequest(req, async () => { + await runWithContext(req, async () => { const entries = await getEntriesForRoute( rscPath, undefined, @@ -1114,7 +1116,7 @@ export function unstable_defineRouter(fns: { // dummy req for slice which is not determined at build time const req = new Request(new URL('http://localhost:3000')); runTask(async () => { - await withRequest(req, async () => { + await runWithContext(req, async () => { const sliceElement = await getSliceElement( item, getCachedElement, From 31aa15832dedae17bfc8664e11a229e9c9fe62d3 Mon Sep 17 00:00:00 2001 From: daishi Date: Tue, 2 Jun 2026 10:59:56 +0900 Subject: [PATCH 2/2] remove withRequest --- examples/35_nesting/src/waku.server.tsx | 5 ++--- examples/53_islands/src/waku.server.tsx | 5 ++--- packages/waku/tests/create-pages-prune.test.ts | 1 - packages/waku/tests/define-router-static-build.test.ts | 6 ------ 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/examples/35_nesting/src/waku.server.tsx b/examples/35_nesting/src/waku.server.tsx index eb96c534a6..a260fe6ebd 100644 --- a/examples/35_nesting/src/waku.server.tsx +++ b/examples/35_nesting/src/waku.server.tsx @@ -38,11 +38,10 @@ export default adapter({ handleBuild: async ({ renderRsc, rscPath2pathname, - withRequest, generateFile, generateDefaultHtml, }) => { - await withRequest( + await runWithContext( new Request(new URL('http://localhost:3000/')), async () => { const body = await renderRsc({ @@ -53,7 +52,7 @@ export default adapter({ }, ); for (const count of [1, 2, 3, 4, 5]) { - await withRequest( + await runWithContext( new Request(new URL('http://localhost:3000/')), async () => { const body = await renderRsc({ App: }); diff --git a/examples/53_islands/src/waku.server.tsx b/examples/53_islands/src/waku.server.tsx index da7705ceaa..f55b118773 100644 --- a/examples/53_islands/src/waku.server.tsx +++ b/examples/53_islands/src/waku.server.tsx @@ -38,17 +38,16 @@ export default adapter({ renderRsc, renderHtml, rscPath2pathname, - withRequest, generateFile, }) => { - await withRequest( + await runWithContext( new Request(new URL('http://localhost:3000/')), async () => { const body = await renderRsc({ App: }); await generateFile(rscPath2pathname(''), body); }, ); - await withRequest( + await runWithContext( new Request(new URL('http://localhost:3000/')), async () => { const res = await renderHtml( diff --git a/packages/waku/tests/create-pages-prune.test.ts b/packages/waku/tests/create-pages-prune.test.ts index c4a3715722..974c85742c 100644 --- a/packages/waku/tests/create-pages-prune.test.ts +++ b/packages/waku/tests/create-pages-prune.test.ts @@ -37,7 +37,6 @@ describe('createPages - build-time pruning', () => { renderHtml: vi.fn().mockResolvedValue(new Response('')), rscPath2pathname: (rscPath: string) => `dist/${rscPath}.txt`, saveBuildMetadata: vi.fn().mockResolvedValue(undefined), - withRequest: (_req: Request, fn: () => T) => fn(), generateFile: vi.fn().mockResolvedValue(undefined), generateDefaultHtml: vi.fn().mockResolvedValue(undefined), unstable_registerPrunableFile: register, diff --git a/packages/waku/tests/define-router-static-build.test.ts b/packages/waku/tests/define-router-static-build.test.ts index 6f1dc576d3..5d4790ef8d 100644 --- a/packages/waku/tests/define-router-static-build.test.ts +++ b/packages/waku/tests/define-router-static-build.test.ts @@ -78,7 +78,6 @@ describe('define-router handleBuild', () => { renderHtml, rscPath2pathname: (rscPath: string) => `dist/${rscPath}.txt`, saveBuildMetadata: vi.fn().mockResolvedValue(undefined), - withRequest: (_req: Request, fn: () => T) => fn(), generateFile: vi.fn().mockResolvedValue(undefined), generateDefaultHtml: vi.fn().mockResolvedValue(undefined), unstable_registerPrunableFile: vi.fn(), @@ -136,7 +135,6 @@ describe('define-router handleBuild', () => { renderHtml: vi.fn().mockResolvedValue(new Response('')), rscPath2pathname: (rscPath: string) => `dist/${rscPath}.txt`, saveBuildMetadata, - withRequest: (_req: Request, fn: () => T) => fn(), generateFile: vi.fn().mockResolvedValue(undefined), generateDefaultHtml: vi.fn().mockResolvedValue(undefined), unstable_registerPrunableFile: vi.fn(), @@ -200,7 +198,6 @@ describe('define-router handleBuild', () => { renderHtml: vi.fn().mockResolvedValue(new Response('')), rscPath2pathname: (rscPath: string) => `dist/${rscPath}.txt`, saveBuildMetadata, - withRequest: (_req: Request, fn: () => T) => fn(), generateFile: vi.fn().mockResolvedValue(undefined), generateDefaultHtml: vi.fn().mockResolvedValue(undefined), unstable_registerPrunableFile: vi.fn(), @@ -259,7 +256,6 @@ describe('define-router handleBuild', () => { renderHtml: vi.fn().mockResolvedValue(new Response('')), rscPath2pathname: (rscPath: string) => `dist/${rscPath}.txt`, saveBuildMetadata: vi.fn().mockResolvedValue(undefined), - withRequest: (_req: Request, fn: () => T) => fn(), generateFile, generateDefaultHtml: vi.fn().mockResolvedValue(undefined), unstable_registerPrunableFile: vi.fn(), @@ -297,7 +293,6 @@ describe('define-router handleBuild', () => { renderHtml: vi.fn().mockResolvedValue(new Response('')), rscPath2pathname: (rscPath: string) => `dist/${rscPath}.txt`, saveBuildMetadata: buildSave, - withRequest: (_req: Request, fn: () => T) => fn(), generateFile: vi.fn().mockResolvedValue(undefined), generateDefaultHtml: vi.fn().mockResolvedValue(undefined), unstable_registerPrunableFile: vi.fn(), @@ -388,7 +383,6 @@ describe('define-router handleBuild', () => { renderHtml: vi.fn().mockResolvedValue(new Response('')), rscPath2pathname: (rscPath: string) => `dist/${rscPath}.txt`, saveBuildMetadata: vi.fn().mockResolvedValue(undefined), - withRequest: (_req: Request, fn: () => T) => fn(), generateFile: vi.fn().mockResolvedValue(undefined), generateDefaultHtml: vi.fn().mockResolvedValue(undefined), unstable_registerPrunableFile: register,