@rsc-kit/core 0.20.2 → 0.20.3

package/dist/host.d.ts

@@ -18,6 +18,8 @@ import type { RouteManifest } from "./manifest.js";
 export interface RscEngine {
     /** The route table this bundle was built from. */
     manifest?(): RouteManifest;
+    /** A short id of this build's client, for the version the host answers with when given none. */
+    buildId?(): Promise<string>;
     installHostFn(fn: (name: string, ...args: unknown[]) => unknown): void;
     handleRscStream(component: string, props?: Record<string, unknown>, layouts?: {
         component: string;
@@ -143,10 +145,11 @@ export interface RscHostOptions {
     /** Serve a built browser asset. Return null for anything not found. */
     assets?: (pathname: string, request: Request) => Promise<Response | null> | Response | null;
     /**
-     * Identifies this build to the client, which compares it on every
-     * navigation and falls back to a full load when it changes. Without one a
-     * client keeps talking to a deployment that no longer exists — worst behind
-     * a CDN, where the shell it holds may already be from an older build.
+     * Identifies this build to the client, which says it back on every
+     * navigation and is sent to load the document when it differs. For an
+     * engine with no `buildId` of its own; the generated one has, and every
+     * document it renders says that id, so a version named here would
+     * disagree with what the client was told and refuse every navigation.
      */
     version?: string;
     /**

package/dist/host.js

@@ -286,7 +286,13 @@ function matchPage(routes, url) {
     return matchRoute(routes, url.pathname, hostOf.get(url) ?? null);
 }
 export function createRscHandler(options) {
-    const { engine, assets, version } = options;
+    const { engine, assets } = options;
+    // The build's own id, which is also what every document says it is - the
+    // two must agree, or a client's honest claim is a 409 on every request.
+    // A version named by the app applies only to an engine with no id of its
+    // own. Resolved on the first request: the engine reads it from a build
+    // product it only has at runtime.
+    let version = engine.buildId ? undefined : options.version;
     const maxActionBody = options.maxActionBody ?? DEFAULT_MAX_ACTION_BODY;
     const compress = options.compress ?? true;
     // Annotated rather than inferred: the narrowing below is lost inside the
@@ -421,6 +427,8 @@ export function createRscHandler(options) {
         return [version ?? "", url.pathname + url.search, ...varies].join("\n");
     }
     return async function handle(request) {
+        if (version === undefined && engine.buildId)
+            version = await engine.buildId();
         return await withRequest(request, () => withCache(() => 
         // Open for the whole request and sealed the moment an answer exists,
         // so middleware — which runs before any rendering — can put headers on
@@ -583,6 +591,20 @@ export function createRscHandler(options) {
         const formPost = await formPostOf(request, url);
         if (!formPost && request.method !== "GET" && request.method !== "HEAD")
             return null;
+        // A client saying which build it runs, and it is not this one: its
+        // manifest cannot load what this build's payload names - a client
+        // component added since is "client reference not found" and the route's
+        // error boundary, on a page that worked a click ago. Under a service
+        // worker that serves the last build's document first, that is every
+        // returning visitor's first navigation after a deploy, not an open tab.
+        // A 409 sends the client to load the document instead, from this build.
+        const claimed = request.headers.get(HEADER.version);
+        if (claimed !== null && claimed !== "" && version && claimed !== version && request.headers.get(HEADER.rsc) !== null) {
+            return new Response(null, {
+                status: 409,
+                headers: withVersion({ "X-RSC-Location": url.pathname + url.search, "Cache-Control": "no-store" }),
+            });
+        }
         // One named region of this page, asked for without mutating anything to
         // earn it. What an action invalidated does not come through here — that
         // travels back inside the action's own answer, which is the whole point of