reroute-js 0.45.7 → 0.45.9

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.45.7
+ * reroute-js v0.45.9
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>

package/cli/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v0.45.7
+ * reroute-js v0.45.9
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -48,7 +48,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "0.45.7";
+    return "0.45.9";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -66,7 +66,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "389548a";
+    return "4f8d173";
   }
   return "dev";
 }
@@ -982,6 +982,32 @@ var init_cache = __esm(() => {
   statusCache = getGlobalStatusCache();
 });
 
+// packages/core/src/ssr/lib/cleanup.ts
+function removePathVariants(store, pathname) {
+  if (pathname in store) {
+    delete store[pathname];
+  }
+  const pathnameWithoutQuery = pathname.split("?")[0];
+  if (pathnameWithoutQuery && pathnameWithoutQuery !== pathname && pathnameWithoutQuery in store) {
+    delete store[pathnameWithoutQuery];
+  }
+}
+function cleanupPathScopedSSRData(pathname) {
+  if (!pathname)
+    return;
+  try {
+    const g = globalThis;
+    const dataStore = g.__REROUTE_DATA__;
+    if (!dataStore || typeof dataStore !== "object") {
+      return;
+    }
+    removePathVariants(dataStore, pathname);
+    if (Object.keys(dataStore).length === 0) {
+      delete g.__REROUTE_DATA__;
+    }
+  } catch {}
+}
+
 // packages/core/src/ssr/lib/imports.ts
 import { pathToFileURL as pathToFileURL3 } from "node:url";
 async function dynamicImport(absolutePath, isWatchMode) {
@@ -3189,18 +3215,22 @@ var init_styles = () => {};
 // packages/core/src/ssr/lib/setup.ts
 async function performSSRSetup(options, streaming = false) {
   const { pathname } = options;
+  const timeoutState = { timedOut: false };
   const setupTimeout = streaming ? 1e4 : 30000;
+  let timeoutId = null;
   const timeoutPromise = new Promise((_, reject) => {
-    setTimeout(() => {
+    timeoutId = setTimeout(() => {
+      timeoutState.timedOut = true;
       reject(new Error(`[reroute] SSR setup timeout after ${setupTimeout}ms for ${pathname}`));
     }, setupTimeout);
   });
   try {
     return await Promise.race([
-      withParentSpan(options.parentSpan, () => performSSRSetupInternal(options, streaming)),
+      withParentSpan(options.parentSpan, () => performSSRSetupInternal(options, streaming, timeoutState)),
       timeoutPromise
     ]);
   } catch (error) {
+    cleanupPathScopedSSRData(pathname);
     console.error("[reroute] SSR setup error:", error);
     return {
       ssrData: {},
@@ -3213,9 +3243,13 @@ async function performSSRSetup(options, streaming = false) {
       inlineStyleTag: "",
       metadataResult: { perPageHead: "" }
     };
+  } finally {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
   }
 }
-async function performSSRSetupInternal(options, streaming) {
+async function performSSRSetupInternal(options, streaming, timeoutState) {
   const debug = options.debug ?? false;
   const t0 = debug ? performance.now() : 0;
   const {
@@ -3228,6 +3262,11 @@ async function performSSRSetupInternal(options, streaming) {
     searchParams,
     ogConfig
   } = options;
+  const assertNotTimedOut = () => {
+    if (timeoutState.timedOut) {
+      throw new Error(`[reroute] SSR setup cancelled for ${pathname}`);
+    }
+  };
   await withSpan("ssr.seed", async (span) => {
     span.setAttribute("pathname", pathname);
     span.setAttribute("streaming", streaming);
@@ -3235,6 +3274,7 @@ async function performSSRSetupInternal(options, streaming) {
     if (debug)
       console.log(`[Setup] ${pathname} - seedModule: ${(performance.now() - t0).toFixed(2)}ms`);
   });
+  assertNotTimedOut();
   resetSSRAccessTracking();
   const bundlePreload = createBundlePreload(bundleUrl);
   const preloadResult = await withSpan("ssr.preload", async (span) => {
@@ -3245,6 +3285,7 @@ async function performSSRSetupInternal(options, streaming) {
       console.log(`[Setup] ${pathname} - preloadContent: ${(performance.now() - t0).toFixed(2)}ms`);
     return result;
   });
+  assertNotTimedOut();
   const computeResult = await withSpan("ssr.compute.data", async (span) => {
     span.setAttribute("pathname", pathname);
     span.setAttribute("streaming", streaming);
@@ -3255,6 +3296,7 @@ async function performSSRSetupInternal(options, streaming) {
       console.log(`[Setup] ${pathname} - computeSSRData: ${(performance.now() - t0).toFixed(2)}ms`);
     return result;
   });
+  assertNotTimedOut();
   setGlobalSSRData(computeResult.data);
   const usingCachedCollections = !!options.cachedCollections;
   const byCollectionForSSR = await withSpan("ssr.load.collections", async (span) => {
@@ -3266,6 +3308,7 @@ async function performSSRSetupInternal(options, streaming) {
       console.log(`[Setup] ${pathname} - loadCollections (cached: ${usingCachedCollections}): ${(performance.now() - t0).toFixed(2)}ms`);
     return collections;
   });
+  assertNotTimedOut();
   setGlobalCollections(byCollectionForSSR);
   const usingCachedCSS = !!options.cachedTailwindCSS;
   const inlineStyleTag = await withSpan("ssr.inline.css", async (span) => {
@@ -3278,6 +3321,7 @@ async function performSSRSetupInternal(options, streaming) {
       console.log(`[Setup] ${pathname} - inlineTailwindCSS (cached: ${usingCachedCSS}): ${(performance.now() - t0).toFixed(2)}ms`);
     return css;
   });
+  assertNotTimedOut();
   let statusOverride = preloadResult.statusOverride;
   if (computeResult.statusContainer.value !== undefined) {
     statusOverride = computeResult.statusContainer.value;
@@ -3292,6 +3336,7 @@ async function performSSRSetupInternal(options, streaming) {
       console.log(`[Setup] ${pathname} - extractMetadata: ${(performance.now() - t0).toFixed(2)}ms`);
     return result;
   });
+  assertNotTimedOut();
   return {
     ssrData: computeResult.data,
     ssrError: computeResult.error,
@@ -5608,7 +5653,7 @@ async function streamSSRContent(writer, encoder, ctx) {
     const STREAM_TIMEOUT_MS = ctx.timeout ?? 120000;
     let streamTimedOut = false;
     let timeoutId = null;
-    const cleanup = () => {
+    const cleanup2 = () => {
       if (timeoutId) {
         clearTimeout(timeoutId);
         timeoutId = null;
@@ -5658,6 +5703,11 @@ async function streamSSRContent(writer, encoder, ctx) {
             streamTimeoutPromise
           ]);
           if (result.done || streamTimedOut) {
+            if (streamTimedOut) {
+              try {
+                await reader.cancel(`[reroute] stream timeout for ${ctx.pathname}`);
+              } catch {}
+            }
             try {
               reader.releaseLock();
             } catch {}
@@ -5668,12 +5718,15 @@ async function streamSSRContent(writer, encoder, ctx) {
             chunkCount++;
           }
         }
-        cleanup();
+        cleanup2();
         span.setAttributes({
           "reroute.stream.chunks": chunkCount,
           "reroute.stream.timedOut": streamTimedOut
         });
       });
+      if (streamTimedOut) {
+        cleanupPathScopedSSRData(ctx.pathname);
+      }
       await writer.write(encoder.encode(ctx.rootEnd));
       const allScripts = await withSpan("ssr.generate.scripts", async (span) => {
         const scripts2 = buildStreamingScripts(ctx);
@@ -5683,7 +5736,8 @@ async function streamSSRContent(writer, encoder, ctx) {
       await writer.write(encoder.encode(allScripts + ctx.htmlTail));
       await writer.close();
     } catch (error) {
-      cleanup();
+      cleanup2();
+      cleanupPathScopedSSRData(ctx.pathname);
       console.error("[reroute] Stream error:", error);
       try {
         await writer.abort(error);
@@ -5933,6 +5987,7 @@ __export(exports_core, {
   computeLayoutData: () => computeLayoutData,
   computeContentData: () => computeContentData,
   compressStreamIfAccepted: () => compressStreamIfAccepted,
+  cleanupPathScopedSSRData: () => cleanupPathScopedSSRData,
   buildHeadFromMeta: () => buildHeadFromMeta,
   blockSearchCrawlers: () => blockSearchCrawlers,
   blockAITrainingCrawlers: () => blockAITrainingCrawlers,
@@ -84244,7 +84299,7 @@ var require__stream_readable = __commonJS((exports, module) => {
     }
     state.pipesCount += 1;
     var doEnd = (!pipeOpts || pipeOpts.end !== false) && dest !== process.stdout && dest !== process.stderr;
-    var endFn = doEnd ? onend : cleanup;
+    var endFn = doEnd ? onend : cleanup2;
     if (state.endEmitted)
       process.nextTick(endFn);
     else
@@ -84253,21 +84308,21 @@ var require__stream_readable = __commonJS((exports, module) => {
     function onunpipe(readable) {
       if (readable !== src2)
         return;
-      cleanup();
+      cleanup2();
     }
     function onend() {
       dest.end();
     }
     var ondrain = pipeOnDrain(src2);
     dest.on("drain", ondrain);
-    function cleanup() {
+    function cleanup2() {
       dest.removeListener("close", onclose);
       dest.removeListener("finish", onfinish);
       dest.removeListener("drain", ondrain);
       dest.removeListener("error", onerror);
       dest.removeListener("unpipe", onunpipe);
       src2.removeListener("end", onend);
-      src2.removeListener("end", cleanup);
+      src2.removeListener("end", cleanup2);
       if (!dest._writableState || dest._writableState.needDrain)
         ondrain();
     }
@@ -106027,7 +106082,7 @@ Or create [og].tsx files in your routes for custom OG templates.`);
     process.exit(1);
   }
   const { process: serverProcess } = server2;
-  const cleanup = () => {
+  const cleanup2 = () => {
     console.log(`
 
 \uD83D\uDED1 Shutting down dev server...`);
@@ -106042,8 +106097,8 @@ Or create [og].tsx files in your routes for custom OG templates.`);
       process.exit(0);
     });
   };
-  process.on("SIGINT", cleanup);
-  process.on("SIGTERM", cleanup);
+  process.on("SIGINT", cleanup2);
+  process.on("SIGTERM", cleanup2);
   if (args[0]) {
     const route = args[0];
     const ogUrl = `http://localhost:${port}/__reroute_og${route === "/" ? "/index" : route}.png`;
@@ -106110,7 +106165,7 @@ Or create [og].tsx files in your routes for custom OG templates.`);
     screen.render();
     openInBrowser(ogUrl);
   });
-  screen.key(["escape", "q", "C-c"], cleanup);
+  screen.key(["escape", "q", "C-c"], cleanup2);
   list.focus();
   screen.render();
 }
@@ -106223,7 +106278,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "0.45.7";
+    return "0.45.9";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -106240,10 +106295,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "389548a";
+    return "4f8d173";
   }
   return "dev";
 }
 main();
 
-//# debugId=B104C3DC040DDA2D64756E2164756E21
+//# debugId=210B7FF7E6F31BAF64756E2164756E21