@rangojs/router 0.0.0-experimental.preview.1774295247 → 0.0.0-experimental.preview.1774295612

package/dist/vite/index.js

@@ -1745,7 +1745,7 @@ import { resolve } from "node:path";
 // package.json
 var package_default = {
   name: "@rangojs/router",
-  version: "0.0.0-experimental.preview.1774295247",
+  version: "0.0.0-experimental.preview.1774295612",
   description: "Django-inspired RSC router with composable URL patterns",
   keywords: [
     "react",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rangojs/router",
-  "version": "0.0.0-experimental.preview.1774295247",
+  "version": "0.0.0-experimental.preview.1774295612",
   "description": "Django-inspired RSC router with composable URL patterns",
   "keywords": [
     "react",

package/src/browser/navigation-client.ts

@@ -119,13 +119,6 @@ export function createNavigationClient(
 
       /** Start a fresh navigation fetch (no cache / inflight hit). */
       const doFreshFetch = (): Promise<Response> => {
-        // Dev-only: generate debugId for React Performance Tracks.
-        // The debug channel is created AFTER response headers arrive,
-        // so the server has time to finish writing debug data before
-        // the client sends "ready".
-        const debugId = (import.meta as any).hot
-          ? crypto.randomUUID()
-          : undefined;
         debugChannel = null;
 
         if (tx) {
@@ -143,16 +136,19 @@ export function createNavigationClient(
               "X-RSC-Router-Intercept-Source": interceptSourceUrl,
             }),
             ...(hmr && { "X-RSC-HMR": "1" }),
-            ...(debugId && { [DEBUG_ID_HEADER]: debugId }),
           },
           signal,
         }).then((response) => {
-          // Create debug channel now — response headers arrived, meaning
-          // the server started streaming. By the time we send "ready",
-          // all debug data should be buffered in the relay.
-          if (debugId) {
-            debugChannel = createClientDebugChannel(debugId);
-            console.log("[perf-tracks] client: debug channel created after response for", debugId.slice(0, 8));
+          // Dev-only: read debugId from response header. The server
+          // generated it and already finished writing debug data to
+          // the relay. Creating the channel now sends "ready" which
+          // triggers an immediate flush of all buffered debug chunks.
+          if ((import.meta as any).hot) {
+            const debugId = response.headers.get(DEBUG_ID_HEADER);
+            if (debugId) {
+              debugChannel = createClientDebugChannel(debugId);
+              console.log("[perf-tracks] client: debug channel from response header for", debugId.slice(0, 8));
+            }
           }
 
           // Check for version mismatch - server wants us to reload

package/src/browser/server-action-bridge.ts

@@ -202,13 +202,7 @@ export function createServerActionBridge(
       const onHandleAbort = () => fetchAbort.abort();
       handle.signal.addEventListener("abort", onHandleAbort, { once: true });
 
-      // Dev-only: create debug channel for React Performance Tracks
-      const debugId = (import.meta as any).hot
-        ? crypto.randomUUID()
-        : undefined;
-      const debugChannel = debugId
-        ? (createClientDebugChannel(debugId) ?? undefined)
-        : undefined;
+      let debugChannel: ClientDebugChannel | undefined;
 
       // Send action request with stream tracking
       const responsePromise = fetch(url, {
@@ -217,11 +211,9 @@ export function createServerActionBridge(
           "rsc-action": id,
           "X-RSC-Router-Client-Path": segmentState.currentUrl,
           ...(tx && { "X-RSC-Router-Request-Id": tx.requestId }),
-          // Send intercept source URL so server can maintain intercept context
           ...(interceptSourceUrl && {
             "X-RSC-Router-Intercept-Source": interceptSourceUrl,
           }),
-          ...(debugId && { [DEBUG_ID_HEADER]: debugId }),
         },
         body: encodedBody,
         signal: fetchAbort.signal,
@@ -230,6 +222,14 @@ export function createServerActionBridge(
         // abortAllActions() doesn't disrupt the in-progress Flight stream.
         handle.signal.removeEventListener("abort", onHandleAbort);
 
+        // Dev-only: read debugId from response header
+        if ((import.meta as any).hot) {
+          const debugId = response.headers.get(DEBUG_ID_HEADER);
+          if (debugId) {
+            debugChannel = createClientDebugChannel(debugId) ?? undefined;
+          }
+        }
+
         // Check for version mismatch - server wants us to reload
         const reload = extractRscHeaderUrl(response, "X-RSC-Reload");
         if (reload === "blocked") {

package/src/rsc/handler.ts

@@ -426,16 +426,17 @@ export function createRSCHandler<
       requestContext._debugPerformance = true;
       requestContext._metricsStore = earlyMetricsStore;
     }
-    // Dev-only: wire debug channel for React Performance Tracks
+    // Dev-only: wire debug channel for React Performance Tracks.
+    // Server generates the debugId and includes it in the response header.
+    // Client reads it after the response arrives and creates the matching channel.
     if (process.env.NODE_ENV !== "production") {
-      // Client navigations send the debugId as a header.
-      // SSR requests have no client — generate one and create the channel directly.
-      const clientDebugId = request.headers.get(DEBUG_ID_HEADER);
-      const debugId = clientDebugId || crypto.randomUUID();
+      const debugId = crypto.randomUUID();
       const channel = createServerDebugChannel(debugId, request.url);
       if (channel) {
         requestContext._debugChannel = channel;
         requestContext._debugId = debugId;
+        // Set response header so client can read it
+        requestContext.header(DEBUG_ID_HEADER, debugId);
         console.log("[perf-tracks] debug channel attached for", debugId);
       }
     }