@timber-js/app 0.2.0-alpha.213 → 0.2.0-alpha.214

package/dist/server/pipeline-helpers.d.ts

@@ -31,6 +31,37 @@ import type { PhaseName } from './pipeline-outcome.ts';
  * See design/08-forms-and-actions.md §"CSRF Protection".
  */
 export declare function csrfGate(req: Request, canonicalPath: string, csrf: CsrfConfig, matchRoute: RouteMatcher): Response | null;
+/**
+ * The redirect for a safe request whose URL is not canonical, or null to
+ * serve it.
+ *
+ * A GET for `/admin/` used to render with a 200 at that URL. The server
+ * rendered with the canonical `/admin` while the browser hydrated with the
+ * raw `/admin/`, so anything branching on `usePathname()` hydrated
+ * mismatched (TIM-1571). Redirecting makes the address bar — the client's
+ * copy of the URL — the canonical one, and leaves one URL per page for
+ * caches and crawlers.
+ *
+ * Only GET and HEAD are redirected. Every other method — an action's POST,
+ * a CORS preflight — is served at the canonical path, as before: a
+ * redirected POST is re-sent by the browser, which an action must not
+ * depend on.
+ *
+ * Runs inside proxy.ts's `next()`, not before it, so proxy.ts still runs
+ * on every request and its headers land on the redirect. A cross-origin
+ * `GET /api/items/` needs proxy.ts's CORS headers on the 308 itself:
+ * browsers apply the CORS check to a redirect response.
+ *
+ * A document request gets a relative 308 (never built from `Host`). A page
+ * navigation gets the router's soft redirect, decided exactly as for a
+ * `redirect()` outcome: an RSC request that does not match a route.ts
+ * handler (`buildRedirectResponse`). The framework's `_rsc` cache key is
+ * dropped from the soft target; the router appends a fresh one when it
+ * fetches the canonical URL.
+ *
+ * See design/07-routing.md §"Non-Canonical URLs Redirect".
+ */
+export declare function canonicalRedirect(req: Request, canonicalPath: string, stripTrailingSlash: boolean, matchRoute: RouteMatcher): Response | null;
 /**
  * Resolver closure produced once at pipeline construction. The lazy variant
  * still calls `loader()` per-request (HMR relies on re-importing), but the

package/dist/server/pipeline-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline-helpers.d.ts","sourceRoot":"","sources":["../../src/server/pipeline-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pipeline-helpers.d.ts","sourceRoot":"","sources":["../../src/server/pipeline-helpers.ts"],"names":[],"mappings":"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"}

package/dist/server/pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/server/pipeline.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/server/pipeline.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.2.0-alpha.213",
+  "version": "0.2.0-alpha.214",
   "description": "Vite-native React framework built for Servers and Serverless Platforms — correct HTTP semantics, real status codes, pages that work without JavaScript",
   "keywords": [
     "cloudflare-workers",

package/src/adapters/nitro-preview.ts

@@ -326,7 +326,16 @@ const server = createServer(async (req, res) => {
   // connection it would be attacker-controlled. The CSRF layer honors it
   // separately for reverse-proxy deployments.
   const scheme = req.socket?.encrypted ? 'https' : 'http';
-  const url = new URL(req.url || '/', \`\${scheme}://\${host}:\${boundPort}\`);
+  // An origin-form target ('/path') is concatenated, not resolved against
+  // the base: resolved as a relative reference, '//evil.com/' names another
+  // host, and the pipeline would see '/' instead of the path it must
+  // redirect to '/evil.com' (TIM-1571). Any other form — 'OPTIONS *', an
+  // absolute-form target — is resolved as before: concatenating '*' makes
+  // an invalid URL, and this callback has no catch around it, so the
+  // rejection would take the preview process down.
+  const origin = \`\${scheme}://\${host}:\${boundPort}\`;
+  const target = req.url || '/';
+  const url = target.startsWith('/') ? new URL(origin + target) : new URL(target, origin);
 
   // The runtime's own request-boundary canonicalizer (_canonicalize.mjs,
   // compiled from server/canonicalize.ts): one decode, and the same 400s for

package/src/client/router-effects.ts

@@ -10,7 +10,7 @@
  */
 
 import { setHardNavigating } from './navigation-root.tsx';
-import type { RenderOwner } from './navigation-transition.ts';
+import type { CommitOutcome, RenderOwner } from './navigation-transition.ts';
 import { RedirectError, ServerErrorResponse, NonRscResponse } from './rsc-fetch.ts';
 import { recordSkew } from './router-skew.ts';
 
@@ -147,14 +147,96 @@ export interface NavigationRecoveryDeps {
   currentOwner: () => RenderOwner | null;
   leaveSpaIfOwned: SpaExits['leaveSpaIfOwned'];
   /**
-   * Replace the current entry with `url` — the router's own `navigate()`,
-   * rendering with `types`: the view transition types of the render the
-   * redirect interrupted, so a redirected Back still animates as Back and a
-   * link's own `transitionTypes` survive the hop (TIM-1471). `onHandOff`
-   * survives it too: a server action redirect waits for the tree that is
-   * finally handed to React, which is the redirected one (TIM-1573).
+   * Follow a redirect to `url` — the router's own `navigate()`, carrying
+   * the interrupted navigation's {@link RedirectHop}.
    */
-  navigate: (url: string, types: readonly string[], onHandOff?: () => void) => Promise<void>;
+  navigate: (url: string, hop: RedirectHop) => Promise<void>;
+}
+
+/**
+ * What a redirect hop inherits from the navigation the redirect interrupted.
+ */
+export interface RedirectHop {
+  /**
+   * The view transition types of the interrupted render, so a redirected Back
+   * still animates as Back and a link's own `transitionTypes` survive the
+   * hop (TIM-1471).
+   */
+  types: readonly string[];
+  /**
+   * The interrupted navigation's history mode. A push stays a push: the
+   * address bar moves only when a destination commits, so the interrupted
+   * navigation wrote no entry, and replacing would overwrite the page being
+   * left — Back would skip it (TIM-1571). A refresh or a traversal replaces:
+   * the browser is already on the entry being redirected.
+   */
+  replace: boolean;
+  /**
+   * The interrupted navigation's scroll mode. `<Link scroll={false}>` to a
+   * URL that redirects — a non-canonical `/x/` among them — still keeps the
+   * scroll position; the hop would otherwise default to scrolling to the top.
+   */
+  scroll: boolean;
+  /**
+   * The interrupted navigation's `onCommit`, as {@link HeldCommit.settle}.
+   * A followed redirect is one logical navigation: the hop's commit is the
+   * one the caller is waiting for. `<Link>` holds `isPending` until it, and
+   * a `'failed'` from the interrupted render would release it on the hop's
+   * decode, ahead of a commit React is still holding (TIM-1571). Recovery
+   * delivers it itself on every path that does not follow the redirect.
+   */
+  onCommit?: (outcome: CommitOutcome) => void;
+  /**
+   * The interrupted navigation's `onHandOff`: a server action redirect
+   * waits for the tree that is finally handed to React, which is the
+   * redirected one (TIM-1573).
+   */
+  onHandOff?: () => void;
+}
+
+/**
+ * A navigation's `onCommit`, split around its failure.
+ *
+ * `navigateTransition` settles `onCommit` `'failed'` as soon as `perform`
+ * throws — before the router has seen the error, so before it knows the
+ * failure is a redirect it will follow. `transition` is what the render
+ * gets: every outcome but `'failed'` reaches the caller at once, and
+ * `'failed'` is left to recovery, which either hands `settle` to the
+ * redirect hop or delivers it. `settle` runs the caller's callback at most
+ * once, so a commit or supersession already delivered wins over a later
+ * `'failed'`.
+ */
+export interface HeldCommit {
+  transition: ((outcome: CommitOutcome) => void) | undefined;
+  settle: ((outcome: CommitOutcome) => void) | undefined;
+}
+
+export function holdCommit(onCommit?: (outcome: CommitOutcome) => void): HeldCommit {
+  if (!onCommit) return { transition: undefined, settle: undefined };
+  let settled = false;
+  const settle = (outcome: CommitOutcome): void => {
+    if (settled) return;
+    settled = true;
+    onCommit(outcome);
+  };
+  return {
+    transition: (outcome) => {
+      if (outcome !== 'failed') settle(outcome);
+    },
+    settle,
+  };
+}
+
+/**
+ * The URL a redirect hop navigates to. A redirect target without a fragment
+ * keeps the one the navigation asked for, as a browser does for a 3xx
+ * (RFC 9110 §10.2.2): the server never sees the fragment, so a soft redirect
+ * — `<Link href="/docs/#install">` answered with `/docs` — cannot carry it.
+ */
+export function redirectHopUrl(redirectUrl: string, requestedUrl: string): string {
+  if (redirectUrl.includes('#')) return redirectUrl;
+  const hashIndex = requestedUrl.indexOf('#');
+  return hashIndex === -1 ? redirectUrl : redirectUrl + requestedUrl.slice(hashIndex);
 }
 
 /**
@@ -189,18 +271,21 @@ export function createNavigationRecovery({
     owner: RenderOwner,
     url: string,
     fromUrl: string,
-    /** The view transition types of the render that failed. */
-    types: readonly string[],
-    /** The failed navigation's `NavigationOptions.onHandOff`, for the hop. */
-    onHandOff?: () => void
+    /** What a redirect hop inherits from the navigation that failed. */
+    hop: RedirectHop
   ): Promise<boolean> {
     if (error instanceof RedirectError) {
       // Same ownership rule as leaving the SPA: a superseded navigation must
       // not steer the document to the destination it was abandoned for.
-      if (currentOwner() !== owner) return true;
-      await navigate(error.redirectUrl, types, onHandOff);
+      if (currentOwner() !== owner) {
+        hop.onCommit?.('superseded');
+        return true;
+      }
+      await navigate(redirectHopUrl(error.redirectUrl, url), hop);
       return true;
     }
+    // Anything else ends this navigation here: its held `'failed'`.
+    hop.onCommit?.('failed');
     // A server error, a non-RSC response and a version skew all end the same
     // way: hand `url` back to the server as a document load, so it can render
     // the outcome as HTML (design/10-error-handling.md §"Error Page Rendering

package/src/client/router.ts

@@ -18,7 +18,12 @@ import { createNavigationCommitter } from './navigation-commit.ts';
 import { fetchRscPayload, NonRscResponse } from './rsc-fetch.ts';
 import { readPayloadTree, readPublishedParams } from '../shared/payload-root.ts';
 import { isClientStale } from './stale-client.ts';
-import { createScrollEffects, createSpaExits, createNavigationRecovery } from './router-effects.ts';
+import {
+  createScrollEffects,
+  createSpaExits,
+  createNavigationRecovery,
+  holdCommit,
+} from './router-effects.ts';
 import { createNavigationLifecycle } from './router-lifecycle.ts';
 import { createNavigationPipeline, prefetchKeyFor } from './router-pipeline.ts';
 import { recordSkew } from './router-skew.ts';
@@ -102,8 +107,8 @@ export function createRouter(deps: RouterDeps): RouterInstance {
     currentOwner,
     leaveSpaIfOwned,
     // Hoisted — `navigate` is a function declaration below.
-    navigate: (url, types, onHandOff) =>
-      navigate(url, { replace: true, _renderTypes: types, onHandOff }),
+    navigate: (url, { types, replace, scroll, onCommit, onHandOff }) =>
+      navigate(url, { replace, scroll, _renderTypes: types, onCommit, onHandOff }),
   });
 
   async function navigate(url: string, options: NavigationOptions = {}): Promise<void> {
@@ -152,6 +157,9 @@ export function createRouter(deps: RouterDeps): RouterInstance {
       await leaveSpaSuperseding(url, departingUrl);
     }
 
+    // A redirect this navigation follows inherits its onCommit (RedirectHop).
+    const heldCommit = holdCommit(options.onCommit);
+
     await runNavigation(url, async (owner) => {
       try {
         await renderViaTransition(
@@ -165,7 +173,7 @@ export function createRouter(deps: RouterDeps): RouterInstance {
               signal: owner.fetchAbort.signal,
               departingUrl,
             }),
-          options.onCommit,
+          heldCommit.transition,
           options.onHandOff
         );
 
@@ -183,14 +191,13 @@ export function createRouter(deps: RouterDeps): RouterInstance {
         // instead would rebuild the page they were *leaving* and discard
         // the click (TIM-1275).
         if (
-          await recoverFromNavigationError(
-            error,
-            owner,
-            url,
-            departingUrl,
+          await recoverFromNavigationError(error, owner, url, departingUrl, {
             types,
-            options.onHandOff
-          )
+            replace,
+            scroll,
+            onCommit: heldCommit.settle,
+            onHandOff: options.onHandOff,
+          })
         ) {
           return;
         }
@@ -222,6 +229,7 @@ export function createRouter(deps: RouterDeps): RouterInstance {
       onCommit?: (outcome: CommitOutcome) => void;
     } = {}
   ): Promise<void> {
+    const heldCommit = holdCommit(opts.onCommit);
     await runNavigation(
       url,
       async (owner) => {
@@ -247,7 +255,7 @@ export function createRouter(deps: RouterDeps): RouterInstance {
               });
               return { ...result, params, navState, commit };
             },
-            opts.onCommit
+            heldCommit.transition
           );
         } catch (error) {
           // Neither path is a navigate(), and neither has a caller that
@@ -261,7 +269,15 @@ export function createRouter(deps: RouterDeps): RouterInstance {
           // browser has already traversed, and `refresh()` is by definition
           // where it already is. So `hardNavigate()` takes its same-document
           // branch and reloads rather than pushing an entry.
-          if (await recoverFromNavigationError(error, owner, url, url, [type])) return;
+          if (
+            await recoverFromNavigationError(error, owner, url, url, {
+              types: [type],
+              replace: true,
+              scroll: true,
+              onCommit: heldCommit.settle,
+            })
+          )
+            return;
           throw error;
         }
 

package/src/server/canonicalize.ts

@@ -91,3 +91,32 @@ export function canonicalize(rawPathname: string, stripTrailingSlash = true): Ca
 
   return { ok: true, pathname };
 }
+
+/**
+ * The path a safe request for `rawPathname` should be redirected to — or
+ * `rawPathname` itself when it is already canonical.
+ *
+ * Applies the structural steps of `canonicalize()` — collapse `//` (step 3)
+ * and strip the trailing slash (step 5) — to the **encoded** path, without
+ * decoding. That is what the browser will send back, so the redirect is
+ * idempotent: `/%61dmin` differs from its canonical form `/admin` only by
+ * percent-encoding, and redirecting it to `/admin` would compare against the
+ * decoded form forever. Decoding cannot introduce a `/` (`%2f` is rejected),
+ * so the structure is the same before and after decoding.
+ *
+ * Dot segments are not handled here: the request URL is parsed by the WHATWG
+ * URL parser, which has already resolved `.`, `..` and their encoded forms.
+ *
+ * Only meaningful for a path `canonicalize()` accepted. The collapse also
+ * means the result can never start with `//`, so it is never a
+ * protocol-relative redirect target.
+ *
+ * See design/07-routing.md §"Non-Canonical URLs Redirect"
+ */
+export function canonicalRequestPath(rawPathname: string, stripTrailingSlash = true): string {
+  let pathname = rawPathname.replace(/\/\/+/g, '/');
+  if (stripTrailingSlash && pathname.length > 1 && pathname.endsWith('/')) {
+    pathname = pathname.slice(0, -1);
+  }
+  return pathname;
+}

package/src/server/pipeline-helpers.ts

@@ -28,6 +28,9 @@ import { isApiRouteChain, isCsrfExemptRoute, type ManifestSegmentNode } from './
 import type { ProxyConfig, RouteMatcher } from './pipeline.ts';
 import { csrfRejectionResponse, validateCsrf, type CsrfConfig } from './csrf.ts';
 import type { PhaseName } from './pipeline-outcome.ts';
+import { canonicalRequestPath } from './canonicalize.ts';
+import { isRscRequest } from '../shared/rsc-media-type.ts';
+import { appVisibleSearch } from '../shared/rsc-cache-key.ts';
 
 // ─── Prototype-Pollution-Safe Sanitizer ────────────────────────────────────
 
@@ -66,6 +69,64 @@ export function csrfGate(
   return exempt ? null : csrfRejectionResponse(req, result);
 }
 
+// ─── Canonical Redirect ────────────────────────────────────────────────────
+
+/**
+ * The redirect for a safe request whose URL is not canonical, or null to
+ * serve it.
+ *
+ * A GET for `/admin/` used to render with a 200 at that URL. The server
+ * rendered with the canonical `/admin` while the browser hydrated with the
+ * raw `/admin/`, so anything branching on `usePathname()` hydrated
+ * mismatched (TIM-1571). Redirecting makes the address bar — the client's
+ * copy of the URL — the canonical one, and leaves one URL per page for
+ * caches and crawlers.
+ *
+ * Only GET and HEAD are redirected. Every other method — an action's POST,
+ * a CORS preflight — is served at the canonical path, as before: a
+ * redirected POST is re-sent by the browser, which an action must not
+ * depend on.
+ *
+ * Runs inside proxy.ts's `next()`, not before it, so proxy.ts still runs
+ * on every request and its headers land on the redirect. A cross-origin
+ * `GET /api/items/` needs proxy.ts's CORS headers on the 308 itself:
+ * browsers apply the CORS check to a redirect response.
+ *
+ * A document request gets a relative 308 (never built from `Host`). A page
+ * navigation gets the router's soft redirect, decided exactly as for a
+ * `redirect()` outcome: an RSC request that does not match a route.ts
+ * handler (`buildRedirectResponse`). The framework's `_rsc` cache key is
+ * dropped from the soft target; the router appends a fresh one when it
+ * fetches the canonical URL.
+ *
+ * See design/07-routing.md §"Non-Canonical URLs Redirect".
+ */
+export function canonicalRedirect(
+  req: Request,
+  canonicalPath: string,
+  stripTrailingSlash: boolean,
+  matchRoute: RouteMatcher
+): Response | null {
+  if (req.method !== 'GET' && req.method !== 'HEAD') return null;
+  const url = new URL(req.url);
+  const target = canonicalRequestPath(url.pathname, stripTrailingSlash);
+  if (target === url.pathname) return null;
+  const navigation = isRscRequest(req) && !isApiRoutePath(canonicalPath, matchRoute);
+  const search = navigation ? appVisibleSearch(url).search : url.search;
+  return buildRedirectResponse(new RedirectSignal(target + search, 308), new Headers(), navigation);
+}
+
+/** Whether `path` matches a route.ts handler. A matcher that throws: no. */
+function isApiRoutePath(path: string, matchRoute: RouteMatcher): boolean {
+  try {
+    const match = matchRoute(path);
+    return match !== null && isApiRouteChain(match.segments);
+  } catch (err) {
+    swallow(err, 'canonical redirect: route match for route.ts lookup threw');
+    return false;
+  }
+}
+
 // ─── Proxy Resolver ────────────────────────────────────────────────────────
 
 /**

package/src/server/pipeline.ts

@@ -32,7 +32,7 @@ import {
 import { logRequestReceived, logRequestCompleted, logSlowRequest } from './logger.ts';
 import { DenySignal } from './primitives.ts';
 import type { ManifestSegmentNode } from './route-matcher.ts';
-import { csrfGate, makeProxyResolver } from './pipeline-helpers.ts';
+import { canonicalRedirect, csrfGate, makeProxyResolver } from './pipeline-helpers.ts';
 import type { CsrfConfig } from './csrf.ts';
 import { handleRequest, runProxyPhase } from './pipeline-phases.ts';
 import { outcomeToResponse } from './pipeline-outcome.ts';
@@ -402,6 +402,18 @@ export function createPipeline(config: PipelineConfig): (req: Request) => Promis
                 // TIM-1213: action dispatch is now INSIDE the pipeline so
                 // proxy.ts runs on every request, including action POSTs.
                 const innerHandler = async (): Promise<Response> => {
+                  // A safe request for a non-canonical URL (`/x/`, `/a//b`) is
+                  // redirected to the canonical one instead of served, so the
+                  // client hydrates with the pathname the server renders with
+                  // (TIM-1571). Inside proxy.ts's next(), so proxy.ts still runs
+                  // on every request and its headers (CORS) reach the redirect.
+                  const redirect = canonicalRedirect(
+                    req,
+                    canonicalPath,
+                    stripTrailingSlash,
+                    config.matchRoute
+                  );
+                  if (redirect) return redirect;
                   if (config.dispatchAction) {
                     const actionResult = await config.dispatchAction(
                       canonicalReq,