reroute-js 0.38.3 → 0.40.0

package/README.md

@@ -1548,7 +1548,11 @@ export default defineConfig({
       /\.(js|css|png|jpg|svg|ico)$/,
     ],
     sampleRate: 1.0,
-    captureHeaders: ['user-agent'],
+    capture: [
+      ...RerouteHeaders.http(),
+      ...RerouteHeaders.request(),
+      ...CloudflareHeaders.geo(),
+    ],
     
     // Browser telemetry proxy (avoids CORS and ad blockers)
     proxy: {

package/_/blog/src/client/routes/blog/[layout].tsx

@@ -1,10 +1,5 @@
 import { Link, Outlet, useData } from 'reroute-js/react';
-
-// SSR context type
-type SSRContext = {
-	pathname: string;
-	params?: Record<string, string>;
-};
+import type { SSR } from 'reroute-js/core';
 
 // Layout data type
 type LayoutData = {
@@ -16,8 +11,8 @@ type LayoutData = {
 };
 
 // Layout SSR data - runs on every blog page!
-export const ssr = {
-	async data({ pathname }: SSRContext): Promise<LayoutData> {
+export const ssr: SSR<LayoutData> = {
+	async data({ pathname }) {
 		// Get last updated timestamp from package.json mtime
 		let lastUpdated: string | undefined;
 		try {

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.38.3
+ * reroute-js v0.40.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>

package/cli/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v0.38.3
+ * reroute-js v0.40.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>
@@ -48,7 +48,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "0.38.3";
+    return "0.40.0";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -66,7 +66,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "67c8bed";
+    return "f262c0b";
   }
   return "dev";
 }
@@ -506,6 +506,13 @@ var contextStorage;
 var init_context = __esm(() => {
   contextStorage = new AsyncLocalStorage;
 });
+// packages/telemetry/src/server/headers/presets.ts
+var init_presets = () => {};
+
+// packages/telemetry/src/server/headers/index.ts
+var init_headers = __esm(() => {
+  init_presets();
+});
 
 // packages/telemetry/src/server/instrumentation.ts
 import { context, SpanStatusCode, trace } from "@opentelemetry/api";
@@ -674,6 +681,7 @@ var init_plugin = __esm(() => {
 // packages/telemetry/src/server/index.ts
 var init_server = __esm(() => {
   init_context();
+  init_headers();
   init_instrumentation();
   init_plugin();
   init_sourcemap();
@@ -906,12 +914,13 @@ function checkDataCache(cacheKey, maxAgeMs) {
     return;
   return ssrCache.get(cacheKey);
 }
-function createDataTask(dataFn, pathname, parts, searchParams, set) {
+function createDataTask(dataFn, pathname, parts, searchParams, set, headers2) {
   return toPromise(dataFn({
     pathname,
     params: { name: parts[1] },
     set,
-    searchParams
+    searchParams,
+    headers: headers2
   })).catch((err) => {
     const msg = err instanceof Error ? err.message : String(err);
     const error = `SSR data() failed: ${msg}`;
@@ -978,7 +987,7 @@ async function computeContentData(pathname, options, searchParams, sharedSsrData
       return { data: ssrData, statusOverride, pendingTasks };
     }
     const set = { status: 200 };
-    const task = createDataTask(dataFn, pathname, parts, searchParams, set);
+    const task = createDataTask(dataFn, pathname, parts, searchParams, set, options.headers);
     if (streaming) {
       handleStreamingMode(ssrData, pathname, task, set, cacheKey, statusCacheKey, maxAgeMs, pendingTasks);
       if (set.status !== 200) {
@@ -1038,9 +1047,15 @@ function checkLayoutCache(cacheKey, statusCacheKey, maxAgeMs) {
   const cachedData = maxAgeMs > 0 ? ssrCache.get(cacheKey) : undefined;
   return { cachedData, cachedStatus };
 }
-function createLayoutDataTask(dataFn, pathname, searchParams, layoutPattern) {
+function createLayoutDataTask(dataFn, pathname, searchParams, layoutPattern, headers2) {
   const set = { status: 200 };
-  return toPromise(dataFn({ pathname, params: {}, set, searchParams })).catch((err) => {
+  return toPromise(dataFn({
+    pathname,
+    params: {},
+    set,
+    searchParams,
+    headers: headers2
+  })).catch((err) => {
     const msg = err instanceof Error ? err.message : String(err);
     console.error(`[reroute] Layout SSR data() failed for ${layoutPattern}:`, msg);
     throw err;
@@ -1048,6 +1063,9 @@ function createLayoutDataTask(dataFn, pathname, searchParams, layoutPattern) {
 }
 function handleLayoutStreamingMode(ssrData, layoutKey, task, set, cacheKey, statusCacheKey, maxAgeMs, pendingTasks) {
   ssrData[layoutKey] = task;
+  const g = globalThis;
+  g.__REROUTE_DATA__ = g.__REROUTE_DATA__ || {};
+  g.__REROUTE_DATA__[layoutKey] = task;
   const storeTask = task.then((value) => {
     if (maxAgeMs > 0) {
       statusCache.set(statusCacheKey, set.status, maxAgeMs);
@@ -1059,6 +1077,9 @@ function handleLayoutStreamingMode(ssrData, layoutKey, task, set, cacheKey, stat
   });
   pendingTasks.push(storeTask.then((value) => {
     ssrData[layoutKey] = value;
+    if (g.__REROUTE_DATA__) {
+      g.__REROUTE_DATA__[layoutKey] = value;
+    }
   }).catch(() => {}));
 }
 async function handleLayoutNonStreamingMode(ssrData, layoutKey, task, cacheKey, statusCacheKey, maxAgeMs) {
@@ -1072,7 +1093,7 @@ async function handleLayoutNonStreamingMode(ssrData, layoutKey, task, cacheKey,
   }
   return result;
 }
-async function processLayout(layout, pathname, clientDir, isWatchMode, streaming, maxAgeMs, searchParams, ssrData, pendingTasks) {
+async function processLayout(layout, pathname, clientDir, isWatchMode, streaming, maxAgeMs, searchParams, ssrData, pendingTasks, headers2) {
   if (typeof layout?.path !== "string")
     return;
   const ssrExport = await loadLayoutSSRExport(layout, clientDir, isWatchMode);
@@ -1092,7 +1113,7 @@ async function processLayout(layout, pathname, clientDir, isWatchMode, streaming
     return;
   }
   const set = { status: 200 };
-  const task = createLayoutDataTask(dataFn, pathname, searchParams, pattern);
+  const task = createLayoutDataTask(dataFn, pathname, searchParams, pattern, headers2);
   if (streaming) {
     handleLayoutStreamingMode(ssrData, layoutKey, task, set, cacheKey, statusCacheKey, maxAgeMs, pendingTasks);
   } else {
@@ -1112,7 +1133,7 @@ async function computeLayoutData(pathname, clientDir, _cwd, isWatchMode, options
     const matchingLayouts = getMatchingLayouts(pathname, layouts);
     for (const layout of matchingLayouts) {
       try {
-        const layoutStatus = await processLayout(layout, pathname, clientDir, isWatchMode, streaming, maxAgeMs, searchParams, ssrData, pendingTasks);
+        const layoutStatus = await processLayout(layout, pathname, clientDir, isWatchMode, streaming, maxAgeMs, searchParams, ssrData, pendingTasks, options.headers);
         if (layoutStatus && !statusOverride) {
           statusOverride = layoutStatus;
         }
@@ -1212,7 +1233,8 @@ async function computeRouteData(pathname, clientDir, _cwd, isWatchMode, options,
       pathname,
       params,
       set,
-      searchParams
+      searchParams,
+      headers: options.headers
     });
     const isPromise = rawResult instanceof Promise;
     if (streaming) {
@@ -2803,7 +2825,7 @@ async function performSSRSetupInternal(options, streaming) {
   const computeResult = await withSpan("ssr.compute.data", async (span) => {
     span.setAttribute("pathname", pathname);
     span.setAttribute("streaming", streaming);
-    const result = await computeSSRData(pathname, clientDir, cwd, isWatchMode, { streaming, maxAge }, searchParams);
+    const result = await computeSSRData(pathname, clientDir, cwd, isWatchMode, { streaming, maxAge, headers: options.headers }, searchParams);
     span.setAttribute("has_error", !!result.error);
     span.setAttribute("has_data", Object.keys(result.data).length > 0);
     if (debug)
@@ -3011,7 +3033,8 @@ async function renderSSRDocument(options) {
     baseUrl: options.baseUrl,
     autoCanonical: options.autoCanonical,
     cachedCollections: options.cachedCollections,
-    cachedTailwindCSS: options.cachedTailwindCSS
+    cachedTailwindCSS: options.cachedTailwindCSS,
+    headers: options.headers
   }, false);
   const duplicatedData = duplicateQueryParamData(setup2.ssrData);
   setGlobalSSRData(duplicatedData);
@@ -5121,7 +5144,8 @@ async function renderSSRDocumentStream(options) {
     autoCanonical: options.autoCanonical,
     cachedCollections: options.cachedCollections,
     cachedTailwindCSS: options.cachedTailwindCSS,
-    debug
+    debug,
+    headers: options.headers
   }, true);
   if (debug)
     console.log(`[renderStream] ${pathname} - performSSRSetup: ${(performance.now() - t0).toFixed(2)}ms`);
@@ -5184,7 +5208,8 @@ async function renderSSRDocumentStream(options) {
     preloadHydrationScript: setup2.preloadHydrationScript,
     browserTelemetryConfig,
     traceContext,
-    parentSpan: options.parentSpan
+    parentSpan: options.parentSpan,
+    timeout: options.timeout
   });
   if (debug)
     console.log(`[renderStream] ${pathname} - returning stream: ${(performance.now() - t0).toFixed(2)}ms`);
@@ -5193,7 +5218,7 @@ async function renderSSRDocumentStream(options) {
 async function streamSSRContent(writer, encoder, ctx) {
   return withParentSpan(ctx.parentSpan, async () => {
     const t0 = ctx.debug ? performance.now() : 0;
-    const STREAM_TIMEOUT_MS = 60000;
+    const STREAM_TIMEOUT_MS = ctx.timeout ?? 120000;
     let streamTimedOut = false;
     let timeoutId = null;
     const cleanup = () => {
@@ -6065,8 +6090,8 @@ function normalizeRelativePath(path3) {
 }
 var SSR_DATA_INLINE_EXPORT_REGEX, SSR_DATA_DECLARATION_REGEX, SSR_REEXPORT_REGEX;
 var init_analyzer = __esm(() => {
-  SSR_DATA_INLINE_EXPORT_REGEX = /export\s+const\s+ssr\s*=[\s\S]*?data\s*[:(]/i;
-  SSR_DATA_DECLARATION_REGEX = /const\s+ssr\s*=[\s\S]*?data\s*[:(]/i;
+  SSR_DATA_INLINE_EXPORT_REGEX = /export\s+const\s+ssr\s*(?::[\s\S]*?)?=\s*[\s\S]*?data\s*[:(]/i;
+  SSR_DATA_DECLARATION_REGEX = /const\s+ssr\s*(?::[\s\S]*?)?=\s*[\s\S]*?data\s*[:(]/i;
   SSR_REEXPORT_REGEX = /export\s*\{[^}]*\bssr\b/i;
 });
 
@@ -105666,7 +105691,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "0.38.3";
+    return "0.40.0";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -105683,10 +105708,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "67c8bed";
+    return "f262c0b";
   }
   return "dev";
 }
 main();
 
-//# debugId=6E308C44DB306A6364756E2164756E21
+//# debugId=5998D9F96883D01A64756E2164756E21