reroute-js 1.0.0-alpha.11 → 1.0.0-alpha.13

package/core/src/ssr/lib/styles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/ssr/lib/styles.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAsB,cAAc,CACnC,SAAS,EAAE,MAAM,EACjB,MAAM,UAAQ,EACd,WAAW,UAAQ,GACjB,OAAO,CAAC,MAAM,CAAC,CA4CjB"}
+{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/ssr/lib/styles.ts"],"names":[],"mappings":"AAuCA;;;;;;GAMG;AACH,wBAAsB,cAAc,CACnC,SAAS,EAAE,MAAM,EACjB,WAAW,UAAQ,GACjB,OAAO,CAAC,MAAM,CAAC,CAajB"}

package/core/src/ssr/lib/template.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v1.0.0-alpha.11
+ * reroute-js v1.0.0-alpha.13
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>

package/core/src/ssr/lib/types.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v1.0.0-alpha.11
+ * reroute-js v1.0.0-alpha.13
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>

package/core/src/ssr/render.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v1.0.0-alpha.11
+ * reroute-js v1.0.0-alpha.13
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>

package/core/src/ssr/stream.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v1.0.0-alpha.11
+ * reroute-js v1.0.0-alpha.13
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>

package/elysia/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v1.0.0-alpha.11
+ * reroute-js v1.0.0-alpha.13
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>

package/elysia/index.js

@@ -1,5 +1,5 @@
 /**
- * reroute-js v1.0.0-alpha.11
+ * reroute-js v1.0.0-alpha.13
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -3496,42 +3496,45 @@ var init_scripts = __esm(() => {
 });
 
 // packages/core/src/ssr/lib/styles.ts
-async function inlineThemeCSS(clientDir, minify = false, isWatchMode = false) {
+import { createHash } from "node:crypto";
+function themeLink(query) {
+  return `<link rel="stylesheet" href="${THEME_CSS_HREF}?${query}" data-reroute="theme">`;
+}
+function hashCss(css) {
+  return createHash("sha1").update(css).digest("hex").slice(0, 12);
+}
+async function readThemeCssFromDisk(clientDir) {
+  const candidates = [
+    join(clientDir, "..", ".reroute", "index.css"),
+    join(clientDir, "..", "..", ".reroute", "index.css"),
+    join(clientDir, "..", "..", "..", ".reroute", "index.css"),
+    join(clientDir, "..", "..", "..", "..", ".reroute", "index.css")
+  ];
+  for (const cssPath of candidates) {
+    if (await Bun.file(cssPath).exists()) {
+      const { readFileSync } = await import("node:fs");
+      return readFileSync(cssPath, "utf-8");
+    }
+  }
+  return "";
+}
+function bundledThemeCss() {
+  return globalThis.__REROUTE_THEME_CSS__ || "";
+}
+async function inlineThemeCSS(clientDir, isWatchMode = false) {
   try {
     if (isWatchMode) {
-      const timestamp = Date.now();
-      return `<link rel="stylesheet" href="/.reroute/index.css?t=${timestamp}" data-reroute="theme">`;
-    }
-    const bundledCss = globalThis.__REROUTE_THEME_CSS__;
-    if (bundledCss) {
-      const css2 = minify ? minifyCSS(bundledCss) : bundledCss;
-      return `<style data-reroute="theme">${css2}</style>`;
-    }
-    const candidates = [
-      join(clientDir, "..", ".reroute", "index.css"),
-      join(clientDir, "..", "..", ".reroute", "index.css"),
-      join(clientDir, "..", "..", "..", ".reroute", "index.css"),
-      join(clientDir, "..", "..", "..", "..", ".reroute", "index.css")
-    ];
-    let cssPath = "";
-    for (const p of candidates) {
-      if (await Bun.file(p).exists()) {
-        cssPath = p;
-        break;
-      }
+      return themeLink(`t=${Date.now()}`);
     }
-    if (!cssPath)
+    const css = bundledThemeCss() || await readThemeCssFromDisk(clientDir);
+    if (!css)
       return "";
-    const { readFileSync } = await import("node:fs");
-    const css = readFileSync(cssPath, "utf-8");
-    return `<style data-reroute="theme">${minifyCSS(css)}</style>`;
+    return themeLink(`v=${hashCss(css)}`);
   } catch {
     return "";
   }
 }
-function minifyCSS(css) {
-  return css.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\s+/g, " ").replace(/\s*([{}:;,>+~])\s*/g, "$1").replace(/;}/g, "}").trim();
-}
+var THEME_CSS_HREF = "/.reroute/index.css";
 var init_styles = () => {};
 
 // packages/core/src/ssr/lib/setup.ts
@@ -3638,7 +3641,7 @@ async function performSSRSetupInternal(options, streaming, timeoutState) {
   setGlobalCollections(byCollectionForSSR);
   const usingCachedCSS = !!options.cachedThemeCSS;
   const inlineStyleTag = await withSpan("ssr.inline.css", async (span) => {
-    const css = options.cachedThemeCSS ? options.cachedThemeCSS : await inlineThemeCSS(clientDir, !streaming, isWatchMode);
+    const css = options.cachedThemeCSS ? options.cachedThemeCSS : await inlineThemeCSS(clientDir, isWatchMode);
     span.setAttributes({
       "reroute.cached": usingCachedCSS,
       "reroute.css.size": css.length
@@ -6698,6 +6701,16 @@ import { existsSync as existsSync3 } from "node:fs";
 import { pathToFileURL as pathToFileURL8 } from "node:url";
 import { createElement as createElement2 } from "react";
 
+// packages/elysia/src/libs/cache.ts
+function resolveServerDataMaxAge(cacheEnabled, maxAgeSeconds) {
+  if (!cacheEnabled || maxAgeSeconds <= 0)
+    return 0;
+  return maxAgeSeconds;
+}
+function getEncoding(acceptEncoding) {
+  return /\bbr\b/i.test(acceptEncoding) ? "br" : /gzip/i.test(acceptEncoding) ? "gz" : "raw";
+}
+
 // packages/elysia/src/libs/image.ts
 import { existsSync } from "node:fs";
 import { join as join4 } from "node:path";
@@ -6876,11 +6889,6 @@ import { NotFoundError as NotFoundError2 } from "elysia";
 init_core();
 import { NotFoundError } from "elysia";
 
-// packages/elysia/src/libs/cache.ts
-function getEncoding(acceptEncoding) {
-  return /\bbr\b/i.test(acceptEncoding) ? "br" : /gzip/i.test(acceptEncoding) ? "gz" : "raw";
-}
-
 // packages/elysia/src/libs/response.ts
 var CONTENT_TYPES = {
   xml: "application/xml; charset=utf-8",
@@ -7042,14 +7050,25 @@ function getAssetCacheControl(filePath, contentType, maxAge, directive, isWatchM
 }
 
 // packages/elysia/src/routes/artifacts.ts
+function bundledThemeCssResponse(cacheControl) {
+  const bundled = globalThis.__REROUTE_THEME_CSS__;
+  if (!bundled)
+    throw new NotFoundError2;
+  return new Response(bundled, {
+    headers: {
+      "Content-Type": "text/css; charset=utf-8",
+      "Cache-Control": cacheControl
+    }
+  });
+}
 function registerArtifactsRoutes(app, cwd, fileCache, options) {
   const { bundleMaxAge, directive, isWatchMode = false } = options;
   app.get("/.reroute/index.css", async ({ headers: headers2 }) => {
     const filePath = join(cwd, ".reroute", "index.css");
     const acceptEncoding = headers2["accept-encoding"] ?? "";
-    try {
-      const cacheControl = isWatchMode ? "no-cache, no-store, must-revalidate" : `${directive}, max-age=${bundleMaxAge}`;
-      if (isWatchMode) {
+    const cacheControl = isWatchMode ? "no-cache, no-store, must-revalidate" : `${directive}, max-age=${bundleMaxAge}`;
+    if (isWatchMode) {
+      try {
         const { readFileSync } = await import("node:fs");
         const content2 = readFileSync(filePath);
         return new Response(content2, {
@@ -7058,11 +7077,20 @@ function registerArtifactsRoutes(app, cwd, fileCache, options) {
             "Cache-Control": cacheControl
           }
         });
+      } catch {
+        return bundledThemeCssResponse(cacheControl);
       }
+    }
+    try {
       return await serveFile(filePath, acceptEncoding, fileCache, {
         cacheControl
       });
-    } catch {}
+    } catch (error) {
+      if (error instanceof NotFoundError2) {
+        return bundledThemeCssResponse(cacheControl);
+      }
+      throw error;
+    }
   });
   app.get("/bundles/*", async ({ params, headers: headers2 }) => {
     const fileName = String(params["*"] ?? "").replace(/^\/+/, "");
@@ -7388,6 +7416,18 @@ function jsonError(message, status = 500) {
   });
 }
 
+// packages/elysia/src/routes/liveReloadClient.ts
+function parseConnectedBootId(data) {
+  if (data === "connected")
+    return "";
+  if (data.startsWith("connected:"))
+    return data.slice("connected:".length);
+  return null;
+}
+function shouldReloadOnReconnect(previousBootId, nextBootId) {
+  return Boolean(previousBootId && nextBootId && previousBootId !== nextBootId);
+}
+
 // packages/elysia/src/routes/themeCssRefresh.ts
 function refreshThemeCss() {
   const href = `/.reroute/index.css?t=${Date.now()}`;
@@ -7465,13 +7505,13 @@ function registerInternalRoutes(app, opts) {
   async function handleKeyRequest(pathname, dataKey, headers2) {
     const { computeSSRData: computeSSRData2 } = await Promise.resolve().then(() => (init_core(), exports_core));
     const cacheKey = `${pathname}:promises`;
-    let promiseData = isWatchMode ? undefined : dataCache?.get(cacheKey);
+    let promiseData = isWatchMode || maxAge <= 0 ? undefined : dataCache?.get(cacheKey);
     const promiseDataCached = promiseData !== undefined;
     if (!promiseData) {
       const sp = extractSearchParams(pathname);
       const { data } = await computeSSRData2(pathname, clientDir, cwd, isWatchMode, { streaming: true, maxAge }, sp);
       promiseData = data;
-      if (!isWatchMode) {
+      if (!isWatchMode && maxAge > 0) {
         dataCache?.set(cacheKey, promiseData);
       }
     }
@@ -7480,7 +7520,7 @@ function registerInternalRoutes(app, opts) {
       if (value instanceof Promise) {
         const resolved = await value;
         const resolvedCacheKey = `${pathname}:${dataKey}:resolved`;
-        if (!isWatchMode) {
+        if (!isWatchMode && maxAge > 0) {
           dataCache?.set(resolvedCacheKey, resolved);
         }
         return jsonWithCache({ data: resolved }, dataCacheControl || "no-cache", headers2, promiseDataCached ? "HIT" : "MISS");
@@ -7494,7 +7534,7 @@ function registerInternalRoutes(app, opts) {
   async function handleFullDataRequest(pathname) {
     const { computeSSRData: computeSSRData2 } = await Promise.resolve().then(() => (init_core(), exports_core));
     const cacheKey = `${pathname}:streaming`;
-    let data = isWatchMode ? undefined : dataCache?.get(cacheKey);
+    let data = isWatchMode || maxAge <= 0 ? undefined : dataCache?.get(cacheKey);
     const cacheHit = data !== undefined;
     if (data === undefined) {
       const sp = extractSearchParams(pathname);
@@ -7505,7 +7545,7 @@ function registerInternalRoutes(app, opts) {
         console.error("[__reroute_data] Error computing data:", error);
         data = null;
       }
-      if (!isWatchMode) {
+      if (!isWatchMode && maxAge > 0) {
         dataCache?.set(cacheKey, data);
       }
     }
@@ -7559,6 +7599,7 @@ var LIVE_RELOAD_CLIENT_CODE = `// Reroute live reload client
 let eventSource = null;
 let hasConnected = false;
 let wasDisconnected = false;
+let lastBootId = null;
 let reloadTriggered = false;
 let rebuildNotice = null;
 let reconnectAttempts = 0;
@@ -7611,6 +7652,8 @@ function triggerFullReload(reason) {
   window.location.reload();
 }
 
+FUNCTION_PARSE_CONNECTED_BOOT_ID
+FUNCTION_SHOULD_RELOAD_ON_RECONNECT
 FUNCTION_REFRESH_THEME_CSS
 
 function showRebuildNotice() {
@@ -7732,12 +7775,22 @@ function connect() {
   eventSource = new EventSource('/__reroute_watch');
   
   eventSource.addEventListener('message', (e) => {
-    if (e.data === 'connected') {
-      reconnectAttempts = 0; // Reset backoff on successful connection
+    const bootId = parseConnectedBootId(e.data);
+    if (bootId !== null) {
+      reconnectAttempts = 0;
+      if (bootId) lastBootId = lastBootId ?? bootId;
       if (hasConnected && wasDisconnected && !reloadTriggered) {
-        triggerFullReload('Server restarted, reloading...');
+        if (shouldReloadOnReconnect(lastBootId, bootId)) {
+          triggerFullReload('Server restarted, reloading...');
+          return;
+        }
+        lastBootId = bootId || lastBootId;
+        wasDisconnected = false;
+        hideRebuildNotice();
+        console.log('[reroute] ✓ Live reload reconnected');
         return;
       }
+      if (bootId) lastBootId = bootId;
       hasConnected = true;
       wasDisconnected = false;
       console.log('[reroute] ✓ Live reload connected');
@@ -7758,9 +7811,7 @@ function connect() {
     wasDisconnected = true;
     eventSource?.close();
     if (hasConnected && reconnectAttempts === 0) {
-      // Only log on first disconnect to reduce console spam
-      console.log('[reroute] \uD83D\uDD04 Server restarting...');
-      showRebuildNotice();
+      console.log('[reroute] \uD83D\uDD04 Live reload disconnected, reconnecting...');
     }
     scheduleReconnect();
   });
@@ -7768,8 +7819,9 @@ function connect() {
 
 restoreScrollPosition();
 connect();
-`.replace("FUNCTION_REFRESH_THEME_CSS", refreshThemeCss.toString());
+`.replace("FUNCTION_PARSE_CONNECTED_BOOT_ID", parseConnectedBootId.toString()).replace("FUNCTION_SHOULD_RELOAD_ON_RECONNECT", shouldReloadOnReconnect.toString()).replace("FUNCTION_REFRESH_THEME_CSS", refreshThemeCss.toString());
 function registerLiveReloadRoutes(app, state) {
+  const bootId = crypto.randomUUID();
   console.log("[reroute] Registering SSE endpoint at /__reroute_watch");
   app.get("/__reroute_watch", () => {
     const encoder = new TextEncoder;
@@ -7780,9 +7832,9 @@ function registerLiveReloadRoutes(app, state) {
         currentController = controller;
         state.clients.add(controller);
         console.log("[reroute] Browser connected for live reload");
-        controller.enqueue(encoder.encode(`retry: 1000
+        controller.enqueue(encoder.encode(`retry: 2147483647
 `));
-        controller.enqueue(encoder.encode(`data: connected
+        controller.enqueue(encoder.encode(`data: connected:${bootId}
 
 `));
         if (state.pendingReload) {
@@ -9378,6 +9430,7 @@ function registerSSRRoutes(app, options) {
     applyLlmsDiscoveryHeaders(headers2, pathname, options.llmsConfig, status);
   };
   const SSR_HTML_TTL_MS = serverCacheEnabled && serverMaxAge > 0 ? serverMaxAge * 1000 : 0;
+  const ssrDataMaxAge = isWatchMode ? 0 : resolveServerDataMaxAge(serverCacheEnabled, serverMaxAge);
   const htmlCache = new LRUCache(200);
   const makeKey = (pathname, searchParams, acceptEncoding) => {
     const queryString = searchParams?.toString();
@@ -9512,7 +9565,7 @@ function registerSSRRoutes(app, options) {
             head,
             lang: i18n2.effectiveLang,
             appId,
-            maxAge: isWatchMode ? 0 : serverMaxAge,
+            maxAge: ssrDataMaxAge,
             searchParams,
             ogConfig: options.ogConfig,
             ogMetaConfig: options.ogMetaConfig,
@@ -9691,7 +9744,7 @@ function registerSSRRoutes(app, options) {
               head,
               lang: i18n2.effectiveLang,
               appId,
-              maxAge: isWatchMode ? 0 : serverMaxAge,
+              maxAge: ssrDataMaxAge,
               searchParams,
               ogConfig: options.ogConfig,
               ogMetaConfig: options.ogMetaConfig,
@@ -9948,6 +10001,7 @@ var reroute = () => async (app) => {
   const server2 = globalConfig.server;
   const serverCacheEnabled = server2?.cache ?? true;
   const serverMaxAge = server2?.maxAge ?? 3600;
+  const serverDataMaxAge = resolveServerDataMaxAge(serverCacheEnabled, serverMaxAge);
   const browser = globalConfig.browser;
   const browserCacheEnabled = browser?.cache ?? true;
   const browserMaxAge = browser?.maxAge ?? 300;
@@ -10091,7 +10145,7 @@ var reroute = () => async (app) => {
   const getBundleUrl = isWatchMode ? readBundleUrl : async () => initialBundleUrl;
   const { loadCollections: loadCollections2, inlineThemeCSS: inlineThemeCSS2, loadIndexHtml: loadIndexHtml2 } = await Promise.resolve().then(() => (init_core(), exports_core));
   const startupCollections = await loadCollections2(cwd, isWatchMode);
-  const startupThemeCSS = await inlineThemeCSS2(clientDir, false, isWatchMode);
+  const startupThemeCSS = await inlineThemeCSS2(clientDir, isWatchMode);
   const startupIndexHtml = await loadIndexHtml2(clientDir);
   const collectionsTtlMs = serverMaxAge * 1000;
   let collectionsCache = serverCacheEnabled ? { data: startupCollections, exp: Date.now() + collectionsTtlMs } : null;
@@ -10109,7 +10163,7 @@ var reroute = () => async (app) => {
     };
     return fresh;
   };
-  const getThemeCSS = isWatchMode ? () => inlineThemeCSS2(clientDir, false, isWatchMode) : async () => startupThemeCSS;
+  const getThemeCSS = isWatchMode ? () => inlineThemeCSS2(clientDir, isWatchMode) : async () => startupThemeCSS;
   const getIndexHtml = isWatchMode ? () => loadIndexHtml2(clientDir) : async () => startupIndexHtml;
   if (globalConfig.redirects && globalConfig.redirects.length > 0) {
     registerRedirectRoutes(app, globalConfig.redirects);
@@ -10123,9 +10177,9 @@ var reroute = () => async (app) => {
     clientDir,
     cwd,
     dataCacheControl,
-    dataCache,
+    dataCache: serverDataMaxAge > 0 ? dataCache : undefined,
     isWatchMode,
-    maxAge: serverMaxAge
+    maxAge: serverDataMaxAge
   });
   registerArtifactsRoutes(app, cwd, fileCache, {
     bundleMaxAge,
@@ -10306,4 +10360,4 @@ export {
   reroute
 };
 
-//# debugId=598589846D0462E964756E2164756E21
+//# debugId=78024E3217BF060B64756E2164756E21