@rangojs/router 0.20.0 → 0.22.0

package/src/router/match-middleware/cache-lookup.ts

@@ -92,15 +92,25 @@
  *   - Action context (if POST)
  */
 import type { InternalHandlerContext, ResolvedSegment } from "../../types.js";
-import type { OwnedPushDelivery } from "../../cache/handle-snapshot.js";
-import type { EntryData } from "../../server/context.js";
+import { isPprEntry, type EntryData } from "../../server/context.js";
 import type { MatchContext, MatchPipelineState } from "../match-context.js";
 import { getRouterContext, type RouterContext } from "../router-context.js";
 import { observeEvent } from "../instrument.js";
 import { pushRevalidationTraceEntry, isTraceActive } from "../logging.js";
 import { treeHasStreaming } from "./segment-resolution.js";
-import { liveLaneLoaderIds } from "../segment-resolution/loader-cache.js";
+import { loaderPins } from "../segment-resolution/loader-cache.js";
 import type { PrerenderStore, PrerenderEntry } from "../../prerender/store.js";
+import {
+  isStoredEntryStale,
+  readVerifiedStoredEntry,
+  serializePrerenderKey,
+  type PrerenderKey,
+} from "../../prerender/writable-store.js";
+import { IN_FLIGHT_LEADER_MAX_WAIT_MS } from "../../cache/cache-policy.js";
+import type {
+  PrerenderTargetObject,
+  ResolvedPrerender,
+} from "../../prerender/on-demand.js";
 import {
   _getRequestContext,
   type RequestContext,
@@ -112,6 +122,7 @@ import {
 import { ShellRecordUnavailableError } from "../../cache/shell-snapshot.js";
 import { prerenderStoreShortCircuits } from "../navigation-snapshot.js";
 import { paramsEqual } from "../params-util.js";
+import { requestHeaders } from "../../server/request-headers.js";
 
 // Lazily initialized prerender store singleton and dynamically imported deps.
 // Dynamic imports prevent pulling in @vitejs/plugin-rsc/rsc virtual module at
@@ -129,10 +140,27 @@ let _restoreHandles:
 let _decodeHandles:
   | typeof import("../../cache/handle-snapshot.js").decodeHandles
   | undefined;
+let _restoreRecordHandles:
+  | typeof import("../../cache/handle-snapshot.js").restoreRecordHandles
+  | undefined;
 let _hashParams:
   | typeof import("../../prerender/param-hash.js").hashParams
   | undefined;
 
+/**
+ * @internal Replace the prerender store this module serves from, and return
+ * the one it replaced. For serveShellRequest (testing/serve-shell-request.ts),
+ * which installs the production store over the artifacts it bakes for a call
+ * and puts the previous one back after it.
+ */
+export function setPrerenderStoreForTests(
+  store: PrerenderStore | null | undefined,
+): PrerenderStore | null | undefined {
+  const previous = prerenderStoreInstance;
+  prerenderStoreInstance = store;
+  return previous;
+}
+
 async function ensurePrerenderDeps() {
   if (!_deserializeSegments) {
     const [codec, snapshot, paramHash, store] = await Promise.all([
@@ -145,6 +173,7 @@ async function ensurePrerenderDeps() {
     _fragmentSegments = codec.fragmentSegments;
     _restoreHandles = snapshot.restoreHandles;
     _decodeHandles = snapshot.decodeHandles;
+    _restoreRecordHandles = snapshot.restoreRecordHandles;
     _hashParams = paramHash.hashParams;
     if (prerenderStoreInstance === undefined) {
       prerenderStoreInstance = store.createPrerenderStore();
@@ -241,12 +270,21 @@ async function* yieldFromStore<TEnv>(
   reqCtx: RequestContext<TEnv> | undefined,
   resolveLoadersOnly: RouterContext<TEnv>["resolveLoadersOnly"],
   resolveLoadersOnlyWithRevalidation: RouterContext<TEnv>["resolveLoadersOnlyWithRevalidation"],
+  /**
+   * The entry may be newer than the client's copy: an on-demand overlay entry
+   * that a refresh (possibly inside this very action) replaced. On an action
+   * the route's own segments are then re-sent, as a live action re-render
+   * re-sends them (revalidation.ts "action:route-segment"); the immutable
+   * bundled manifest keeps the client's copy.
+   */
+  replaceable?: boolean,
 ): AsyncGenerator<ResolvedSegment> {
   if (
     !_deserializeSegments ||
     !_fragmentSegments ||
     !_restoreHandles ||
     !_decodeHandles ||
+    !_restoreRecordHandles ||
     !_hashParams
   ) {
     throw new Error("yieldFromStore called before ensurePrerenderDeps");
@@ -271,6 +309,16 @@ async function* yieldFromStore<TEnv>(
     }
   }
 
+  // Before the render barrier freezes the document snapshot.
+  const shellHandles = reqCtx?._shellImplicitCache?.prerenderHandles;
+  if (handleStore && shellHandles) {
+    await _restoreRecordHandles!(
+      handleStore,
+      shellHandles,
+      loaderPins(ctx.entries, reqCtx),
+    );
+  }
+
   state.cacheHit = true;
   state.cacheSource = "prerender";
   state.cachedSegments = segments;
@@ -293,11 +341,16 @@ async function* yieldFromStore<TEnv>(
   // different content, so we must NOT nullify.
   const paramsChanged =
     !ctx.isFullMatch && !paramsEqual(ctx.matched.params, ctx.prevParams);
+  const resendRouteSegments = replaceable === true && ctx.isAction;
   for (const segment of segments) {
     if (
       !ctx.isFullMatch &&
       !paramsChanged &&
-      ctx.clientSegmentSet.has(segment.id)
+      ctx.clientSegmentSet.has(segment.id) &&
+      !(
+        resendRouteSegments &&
+        (segment.type === "route" || segment.belongsToRoute === true)
+      )
     ) {
       keepClientSegment(segment);
     }
@@ -346,11 +399,9 @@ export async function prerenderEntryExists(
     ).createPrerenderStore();
   }
   if (!prerenderStoreInstance) return false;
-  // Non-intercept variant only: whether the navigation IS an intercept (and
-  // therefore whether tryPrerenderLookup reads `paramHash + "/i"`) resolves
-  // during the match, so this pre-match fast path can only guess the normal
-  // artifact. A wrong guess is reclassified post-match from the match
-  // pipeline's `_pprReplayPostMatchReason` stamp.
+  // Non-intercept variant only: whether the navigation is an intercept (which
+  // reads `paramHash + "/i"`) resolves during the match. A wrong guess is
+  // reclassified post-match from `_pprReplayPostMatchReason`.
   const entry = await prerenderStoreInstance.get(
     routeKey,
     _hashParams!(params),
@@ -364,6 +415,63 @@ export async function prerenderEntryExists(
   return entry != null;
 }
 
+/**
+ * Serialized overlay key -> start time of its in-flight `onRevalidate`.
+ * Dedupes the obvious Node wiring, `(t, env) => router.prerender(t, { env })`,
+ * and queue sends alike, per isolate. Entries older than
+ * IN_FLIGHT_LEADER_MAX_WAIT_MS count as free: a never-settling onRevalidate
+ * (hung queue send) or a killed execution context never runs `.finally`, and
+ * would otherwise pin the key for the isolate's lifetime.
+ */
+const overlayRevalidationsInFlight = new Map<string, number>();
+
+/** @internal Tests only (testing/serve-shell-request.ts resetShellTestState). */
+export function resetOverlayRevalidationsForTests(): void {
+  overlayRevalidationsInFlight.clear();
+}
+
+/** @internal Exported for the eviction unit test. */
+export function scheduleOverlayRevalidation<TEnv>(
+  serializedKey: string,
+  onRevalidate: NonNullable<ResolvedPrerender["config"]["onRevalidate"]>,
+  target: PrerenderTargetObject,
+  reqCtx: RequestContext<TEnv>,
+  now: number = Date.now(),
+): void {
+  // waitUntil is a no-op under build contexts: nothing would clear the key.
+  if (reqCtx.build) return;
+  const startedAt = overlayRevalidationsInFlight.get(serializedKey);
+  if (
+    startedAt !== undefined &&
+    now - startedAt < IN_FLIGHT_LEADER_MAX_WAIT_MS
+  ) {
+    return;
+  }
+  overlayRevalidationsInFlight.set(serializedKey, now);
+  const env = reqCtx.env;
+  const executionContext = reqCtx.executionContext;
+  const reportError = reqCtx._reportBackgroundError;
+  // The stale entry still serves this request; this only schedules.
+  reqCtx.waitUntil(() =>
+    Promise.resolve()
+      .then(() => onRevalidate(target, env, executionContext))
+      .then(
+        () => {},
+        (err) => {
+          // A failed onRevalidate must not fail the response, but must reach
+          // onError like the runtime cache's stale-revalidation failures.
+          reportError?.(err, "stale-revalidation");
+        },
+      )
+      .finally(() => {
+        // An evicted-and-rescheduled entry belongs to the newer run.
+        if (overlayRevalidationsInFlight.get(serializedKey) === now) {
+          overlayRevalidationsInFlight.delete(serializedKey);
+        }
+      }),
+  );
+}
+
 /**
  * Look up a prerendered (build-time cached) entry for the current route and, on
  * a hit, yield its segments. Returns true when an entry was served (the caller
@@ -379,31 +487,99 @@ async function* tryPrerenderLookup<TEnv>(
   reqCtx: RequestContext<TEnv> | undefined,
   resolveLoadersOnly: RouterContext<TEnv>["resolveLoadersOnly"],
   resolveLoadersOnlyWithRevalidation: RouterContext<TEnv>["resolveLoadersOnlyWithRevalidation"],
+  isPassthroughPrerenderRoute: boolean,
+  overlay?: ResolvedPrerender,
 ): AsyncGenerator<ResolvedSegment, boolean> {
-  const paramHash = _hashParams!(ctx.matched.params);
-  const isPassthroughPrerenderRoute = ctx.entries.some(
-    (entry) => entry.type === "route" && entry.isPassthrough === true,
-  );
-  const lookupHash = ctx.isIntercept ? paramHash + "/i" : paramHash;
-  const entry = await prerenderStoreInstance!.get(
-    ctx.matched.routeKey,
-    lookupHash,
-    {
-      pathname: ctx.pathname,
-      isPassthroughRoute: isPassthroughPrerenderRoute,
-    },
-  );
-  if (!entry) return false;
-  yield* yieldFromStore(
-    entry,
-    ctx,
-    state,
-    pipelineStart,
-    reqCtx,
-    resolveLoadersOnly,
-    resolveLoadersOnlyWithRevalidation,
-  );
-  return true;
+  // 1. Writable durable overlay (per-request, env-scoped), read before the
+  //    bundled manifest: it is always newer. Only on-demand routes are read
+  //    (router.prerender() refuses non-od routes, so a pr-only route always
+  //    misses), and never for intercept navigations (only the main variant is
+  //    written). Actions read it too: a plain on-demand route has no live
+  //    handler, so skipping the overlay would 404 an overlay-only param
+  //    (gateOnDemandProducer). A store error degrades to a miss
+  //    (readVerifiedStoredEntry); a stale hit serves and may schedule onRevalidate.
+  if (overlay && ctx.matched.od && !ctx.isIntercept) {
+    const key: PrerenderKey = {
+      routerId: overlay.routerId,
+      version: overlay.version,
+      routeName: ctx.matched.routeKey,
+      paramHash: _hashParams!(ctx.matched.params),
+    };
+    const stored = await readVerifiedStoredEntry(
+      overlay.config.store,
+      key,
+      ctx.matched.params,
+    );
+    if (stored) {
+      // A stale "removed" marker is rechecked like a stale page: only a
+      // refresh that hit notFound() (or declined) stamps one with a ttl or
+      // tags. A prerender.remove() marker has neither and never gets here.
+      if (
+        overlay.config.onRevalidate &&
+        reqCtx &&
+        isStoredEntryStale(stored, Date.now())
+      ) {
+        scheduleOverlayRevalidation(
+          serializePrerenderKey(key),
+          overlay.config.onRevalidate,
+          {
+            route: ctx.matched.routeKey,
+            params: ctx.matched.params,
+          } as PrerenderTargetObject,
+          reqCtx,
+        );
+      }
+      if (stored.removed === true) {
+        // The page was removed. Not served, and step 2 is skipped: the
+        // build-time entry below must not come back. The route's handler
+        // answers: a Passthrough route's live handler, or a plain route's
+        // gated producer, which `_prerenderRemoved` makes a 404 in dev too
+        // (gateOnDemandProducer).
+        (
+          ctx.handlerContext as InternalHandlerContext<any, TEnv>
+        )._prerenderRemoved = true;
+        return false;
+      }
+      yield* yieldFromStore(
+        stored.entry,
+        ctx,
+        state,
+        pipelineStart,
+        reqCtx,
+        resolveLoadersOnly,
+        resolveLoadersOnlyWithRevalidation,
+        true,
+      );
+      return true;
+    }
+  }
+
+  // 2. Bundled build manifest (immutable). Absent for on-demand-only routes.
+  if (prerenderStoreInstance) {
+    const paramHash = _hashParams!(ctx.matched.params);
+    const entry = await prerenderStoreInstance.get(
+      ctx.matched.routeKey,
+      ctx.isIntercept ? paramHash + "/i" : paramHash,
+      {
+        pathname: ctx.pathname,
+        isPassthroughRoute: isPassthroughPrerenderRoute,
+      },
+    );
+    if (entry) {
+      yield* yieldFromStore(
+        entry,
+        ctx,
+        state,
+        pipelineStart,
+        reqCtx,
+        resolveLoadersOnly,
+        resolveLoadersOnlyWithRevalidation,
+      );
+      return true;
+    }
+  }
+
+  return false;
 }
 
 /**
@@ -464,6 +640,8 @@ export function withCacheLookup<TEnv>(
         ? "intercept"
         : undefined;
     }
+    // Per-request writable prerender overlay (durable), resolved by the handler.
+    const prerenderOverlay = pipelineReqCtx?._prerender;
 
     const {
       evaluateRevalidation,
@@ -474,20 +652,30 @@ export function withCacheLookup<TEnv>(
       resolveAllSegmentsWithRevalidation,
     } = getRouterContext<TEnv>();
 
-    if (prerenderStoreShortCircuits(ctx.matched.pr, ctx.request)) {
+    // An on-demand route may have no build-baked entry yet still needs a
+    // writable-overlay lookup, so od joins pr in the gate. The retained producer
+    // is NEVER run by this pipeline: a miss falls through like pr + miss.
+    const isPassthroughPrerenderRoute = ctx.entries.some(
+      (entry) => entry.type === "route" && entry.isPassthrough === true,
+    );
+    const overlayEligible =
+      ctx.matched.od === true && !requestHeaders(ctx.request).get("X-RSC-HMR");
+    if (
+      prerenderStoreShortCircuits(ctx.matched.pr, ctx.request) ||
+      overlayEligible
+    ) {
       // Actions normally re-render fresh and skip the prerender store. But a pure
       // Prerender route's handler is evicted at build, so there is no fresh
       // handler to run on an action re-render -- without the fallback the
       // re-render falls through to the evicted handler and throws "No prerender
       // data found". Serve the prerendered entry instead (the action ran already;
-      // its result is applied client-side via useActionState). Passthrough routes
-      // keep a liveHandler, so they still re-render fresh on actions.
-      const isPassthroughPrerenderRoute = ctx.entries.some(
-        (entry) => entry.type === "route" && entry.isPassthrough === true,
-      );
+      // its result is applied client-side via useActionState). A plain on-demand
+      // route is the same case, served from the overlay first (an overlay entry
+      // is newer than the build one, and may be the only one). Passthrough
+      // routes keep a liveHandler, so they still re-render fresh on actions.
       if (!ctx.isAction || !isPassthroughPrerenderRoute) {
         await ensurePrerenderDeps();
-        if (prerenderStoreInstance) {
+        if (prerenderStoreInstance || prerenderOverlay) {
           const served = yield* tryPrerenderLookup(
             ctx,
             state,
@@ -495,6 +683,8 @@ export function withCacheLookup<TEnv>(
             pipelineReqCtx,
             resolveLoadersOnly,
             resolveLoadersOnlyWithRevalidation,
+            isPassthroughPrerenderRoute,
+            prerenderOverlay,
           );
           if (served) return;
         }
@@ -519,6 +709,7 @@ export function withCacheLookup<TEnv>(
             pipelineReqCtx,
             resolveLoadersOnly,
             resolveLoadersOnlyWithRevalidation,
+            isPassthroughPrerenderRoute,
           );
           if (served) return;
         }
@@ -546,20 +737,14 @@ export function withCacheLookup<TEnv>(
       return;
     }
 
-    // A record's loader-owned handle values claim their loader, so its own
-    // cache() HIT does not replay them again (restoreHandles). A document
-    // HIT tail restores a bake-lane owner's values as the prelude's, unclaimed:
-    // they stand against any later push of that loader
-    // (HandleStore.pushRestored). An owner the route runs on the live lane is
-    // a hole, so its live run still replaces them, even inside a restored
-    // loader's body.
-    const ownedPushes: OwnedPushDelivery = {
-      claim: (ctx.handlerContext as InternalHandlerContext)._claimLoaderPushes,
-    };
-    if (tailMarker) {
-      ownedPushes.liveLane = liveLaneLoaderIds(ctx.entries);
-      ownedPushes.restore = tailMarker.docTail === true;
-    }
+    // Only a ppr route's records hold loader pushes, and only its shell pins
+    // loaders (CachedEntryData.handleOwners, the loader seed): any other
+    // route's record restores as a plain replay.
+    const leaf = ctx.entries[ctx.entries.length - 1];
+    const ownedPushes =
+      leaf !== undefined && isPprEntry(leaf)
+        ? () => loaderPins(ctx.entries, pipelineReqCtx)
+        : undefined;
     const explicitLookup = await ctx.cacheScope.lookupRouteDetailed(
       ctx.pathname,
       ctx.matched.params,

package/src/router/navigation-snapshot.ts

@@ -38,12 +38,31 @@ export interface ResolveNavigationDeps {
  * never produce a partial match, so the replay path must decide
  * `no-navigation-context` BEFORE spending shell-store reads — the two
  * predicates drifting apart would misattribute the bypass again.
+ *
+ * `requestOrigin` is the origin pathname matching uses (`url.origin`), which
+ * may not be `request.url`'s. `X-RSC-Router-Client-Path` is returned as sent.
+ * A Referer counts only when it resolves against that origin and stays there.
+ * A cross-origin Referer is dropped: resolveNavigation matches only the
+ * pathname, so a foreign URL would be treated as a route on this app. A value
+ * that does not parse is no context either.
  */
-export function getNavigationContextHeader(request: Request): string | null {
-  return (
-    requestHeaders(request).get("X-RSC-Router-Client-Path") ||
-    requestHeaders(request).get("Referer")
-  );
+export function getNavigationContextHeader(
+  request: Request,
+  requestOrigin: string,
+): string | null {
+  const headers = requestHeaders(request);
+  const clientPath = headers.get("X-RSC-Router-Client-Path");
+  if (clientPath) return clientPath;
+
+  const referer = headers.get("Referer");
+  if (!referer) return null;
+
+  try {
+    if (new URL(referer, requestOrigin).origin !== requestOrigin) return null;
+  } catch {
+    return null;
+  }
+  return referer;
 }
 
 /**
@@ -84,7 +103,7 @@ export async function resolveNavigation(
   const clientSegmentIds =
     url.searchParams.get("_rsc_segments")?.split(",").filter(Boolean) || [];
   const stale = url.searchParams.get("_rsc_stale") === "true";
-  const previousUrl = getNavigationContextHeader(request);
+  const previousUrl = getNavigationContextHeader(request, url.origin);
   const interceptSourceUrl = getInterceptSourceHeader(request);
   const isHmr = !!requestHeaders(request).get("X-RSC-HMR");
 

package/src/router/pattern-matching.ts

@@ -330,6 +330,8 @@ export interface RouteMatchResult<TEnv = any> {
   pr?: true;
   /** Passthrough: handler kept for live fallback on unknown params (from trie) */
   pt?: true;
+  /** On-demand prerender eligible (router.prerender() refreshable) */
+  od?: true;
   /** Response type for non-RSC routes (json, text, image, any) */
   responseType?: string;
   /** Negotiate variants: response-type routes sharing this path */
@@ -455,6 +457,9 @@ export function findMatch<TEnv>(
       const ptFlag = entry.passthroughRouteKeys?.has(routeKey)
         ? { pt: true as const }
         : {};
+      const odFlag = entry.onDemandRouteKeys?.has(routeKey)
+        ? { od: true as const }
+        : {};
 
       const match = regex.exec(pathname);
       if (match) {
@@ -484,6 +489,7 @@ export function findMatch<TEnv>(
             redirectTo: pathname + "/",
             ...prFlag,
             ...ptFlag,
+            ...odFlag,
           };
         } else if (trailingSlashMode === "never" && pathnameHasTrailingSlash) {
           return {
@@ -493,6 +499,7 @@ export function findMatch<TEnv>(
             redirectTo: pathname.slice(0, -1),
             ...prFlag,
             ...ptFlag,
+            ...odFlag,
           };
         }
 
@@ -502,6 +509,7 @@ export function findMatch<TEnv>(
           params,
           ...prFlag,
           ...ptFlag,
+          ...odFlag,
         };
       }
 
@@ -520,6 +528,7 @@ export function findMatch<TEnv>(
             params,
             ...prFlag,
             ...ptFlag,
+            ...odFlag,
           };
         } else if (trailingSlashMode === "never") {
           if (pathnameHasTrailingSlash) {
@@ -530,6 +539,7 @@ export function findMatch<TEnv>(
               redirectTo: alternatePathname,
               ...prFlag,
               ...ptFlag,
+              ...odFlag,
             };
           }
           return {
@@ -538,6 +548,7 @@ export function findMatch<TEnv>(
             params,
             ...prFlag,
             ...ptFlag,
+            ...odFlag,
           };
         } else if (trailingSlashMode === "always") {
           if (!pathnameHasTrailingSlash) {
@@ -548,6 +559,7 @@ export function findMatch<TEnv>(
               redirectTo: alternatePathname,
               ...prFlag,
               ...ptFlag,
+              ...odFlag,
             };
           }
           return {
@@ -556,6 +568,7 @@ export function findMatch<TEnv>(
             params,
             ...prFlag,
             ...ptFlag,
+            ...odFlag,
           };
         } else {
           const canonicalPath = hasTrailingSlash
@@ -568,6 +581,7 @@ export function findMatch<TEnv>(
             redirectTo: canonicalPath,
             ...prFlag,
             ...ptFlag,
+            ...odFlag,
           };
         }
       }

package/src/router/prefetch-default.ts

@@ -1,9 +1,9 @@
 /**
  * Resolve the router-wide default Link prefetch strategy once, at router init.
- * The resolved value ships to the client in payload metadata; the browser
- * entry applies it via `setDefaultPrefetchStrategy` (browser/prefetch/
- * default-strategy.ts) and every `<Link>` without an explicit `prefetch` prop
- * falls back to it.
+ * The resolved value ships to the client in payload metadata; the router
+ * store carries it (`NavigationStoreContext.defaultPrefetch`, see
+ * browser/prefetch/default-strategy.ts) and every `<Link>` without an explicit
+ * `prefetch` prop falls back to it.
  *
  * The type lives HERE (not in browser/react/Link.tsx) because both seats need
  * it: this server-side resolver and the client Link/default-strategy modules.