reroute-js 0.40.2 → 0.41.1

package/elysia/index.js

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.40.2
+ * reroute-js v0.41.1
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -168,7 +168,7 @@ async function getContentMeta(absPath, isWatchMode) {
     }
   }
 }
-function buildHeadFromMeta(meta) {
+function buildHeadFromMeta(meta, ogConfig) {
   if (!meta || typeof meta !== "object")
     return "";
   const parts = [];
@@ -178,6 +178,23 @@ function buildHeadFromMeta(meta) {
     parts.push(`<title>${escapeHtml(title)}</title>`);
   if (description)
     parts.push(`<meta name="description" content="${escapeHtml(description)}" />`);
+  const ogType = typeof meta.ogType === "string" ? meta.ogType : ogConfig?.defaultType || "website";
+  parts.push(`<meta property="og:type" content="${escapeHtml(ogType)}" />`);
+  if (title) {
+    parts.push(`<meta property="og:title" content="${escapeHtml(title)}" />`);
+  }
+  const finalDescription = description || ogConfig?.siteDescription;
+  if (finalDescription) {
+    parts.push(`<meta property="og:description" content="${escapeHtml(finalDescription)}" />`);
+  }
+  const twitterCard = ogConfig?.twitterCard || "summary_large_image";
+  parts.push(`<meta name="twitter:card" content="${twitterCard}" />`);
+  if (title) {
+    parts.push(`<meta name="twitter:title" content="${escapeHtml(title)}" />`);
+  }
+  if (finalDescription) {
+    parts.push(`<meta name="twitter:description" content="${escapeHtml(finalDescription)}" />`);
+  }
   return parts.length ? `
 ${parts.join(`
 `)}` : "";
@@ -1640,6 +1657,28 @@ function removeDefaultMetaTags(templateHtml) {
   } catch {}
   return result;
 }
+function removeOverriddenMetaTags(templateHtml, injectedHead) {
+  let result = templateHtml;
+  try {
+    const injectedOgProps = [
+      ...injectedHead.matchAll(/<meta\s+property\s*=\s*['"]([^'"]+)['"][^>]*>/gi)
+    ].map((m) => m[1].toLowerCase());
+    const injectedNameMetas = [
+      ...injectedHead.matchAll(/<meta\s+name\s*=\s*['"]([^'"]+)['"][^>]*>/gi)
+    ].map((m) => m[1].toLowerCase());
+    for (const prop of injectedOgProps) {
+      const escapedProp = prop.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const regex = new RegExp(`<meta\\s+property\\s*=\\s*['"]${escapedProp}['"][^>]*>`, "gi");
+      result = result.replace(regex, "");
+    }
+    for (const name of injectedNameMetas) {
+      const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const regex = new RegExp(`<meta\\s+name\\s*=\\s*['"]${escapedName}['"][^>]*>`, "gi");
+      result = result.replace(regex, "");
+    }
+  } catch {}
+  return result;
+}
 function deduplicateHeadContent(templateHtml, headToInject) {
   let cleanedTemplate = templateHtml;
   let cleanedHead = headToInject;
@@ -1650,6 +1689,7 @@ function deduplicateHeadContent(templateHtml, headToInject) {
     } else if (/<meta\s+name\s*=\s*['"]description['"][^>]*>/i.test(cleanedHead)) {
       cleanedTemplate = cleanedTemplate.replace(/<meta\s+name\s*=\s*['"]description['"][^>]*>/i, "");
     }
+    cleanedTemplate = removeOverriddenMetaTags(cleanedTemplate, cleanedHead);
   } catch {}
   return { cleanedTemplate, cleanedHead };
 }
@@ -1768,7 +1808,6 @@ async function generateOGImageMetaTags(pathname, clientDir, ogConfig) {
   return `<meta property="og:image" content="${ogImagePath}" />
 <meta property="og:image:width" content="${width}" />
 <meta property="og:image:height" content="${height}" />
-<meta name="twitter:card" content="summary_large_image" />
 <meta name="twitter:image" content="${ogImagePath}" />`;
 }
 var init_meta = __esm(() => {
@@ -1806,7 +1845,25 @@ function generateOgUrl(baseUrl, pathname) {
   const ogUrl = `${cleanBaseUrl}${normalizedPath}`;
   return `<meta property="og:url" content="${ogUrl}" />`;
 }
-async function extractPageMetadata(pathname, clientDir, cwd, isWatchMode, currentStatusOverride, ogConfig, baseUrl, autoCanonical, ssrData) {
+function generateGlobalOGTags(ogConfig) {
+  const tags = [];
+  if (ogConfig.siteName) {
+    tags.push(`<meta property="og:site_name" content="${escapeHtml2(ogConfig.siteName)}" />`);
+  }
+  if (ogConfig.locale) {
+    tags.push(`<meta property="og:locale" content="${escapeHtml2(ogConfig.locale)}" />`);
+  }
+  if (ogConfig.twitterSite) {
+    const handle = ogConfig.twitterSite.startsWith("@") ? ogConfig.twitterSite : `@${ogConfig.twitterSite}`;
+    tags.push(`<meta name="twitter:site" content="${escapeHtml2(handle)}" />`);
+  }
+  return tags.length ? tags.join(`
+`) : "";
+}
+function escapeHtml2(input) {
+  return input.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+}
+async function extractPageMetadata(pathname, clientDir, cwd, isWatchMode, currentStatusOverride, ogImageConfig, ogConfig, baseUrl, autoCanonical, ssrData) {
   let perPageHead = "";
   let pageLang;
   let statusOverride = currentStatusOverride;
@@ -1815,7 +1872,7 @@ async function extractPageMetadata(pathname, clientDir, cwd, isWatchMode, curren
   }, (lang) => {
     if (!pageLang)
       pageLang = lang;
-  });
+  }, ogConfig);
   const shouldGenerateCanonical = autoCanonical !== false && baseUrl !== undefined;
   if (shouldGenerateCanonical) {
     const canonicalTag = generateCanonicalUrl(baseUrl, pathname);
@@ -1825,8 +1882,15 @@ ${canonicalTag}`;
     perPageHead += `
 ${ogUrlTag}`;
   }
+  if (ogConfig) {
+    const ogGlobalTags = generateGlobalOGTags(ogConfig);
+    if (ogGlobalTags) {
+      perPageHead += `
+${ogGlobalTags}`;
+    }
+  }
   try {
-    const ogMetaTags = await generateOGImageMetaTags(pathname, clientDir, ogConfig);
+    const ogMetaTags = await generateOGImageMetaTags(pathname, clientDir, ogImageConfig);
     if (ogMetaTags) {
       perPageHead += `
 ${ogMetaTags}`;
@@ -1838,22 +1902,22 @@ ${ogMetaTags}`;
     perPageHead += head;
   }, (lang) => {
     pageLang = lang;
-  });
-  const routeResult = await extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ssrData);
+  }, ogConfig);
+  const routeResult = await extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ssrData, ogConfig);
   perPageHead += routeResult.head;
   if (routeResult.lang)
     pageLang = routeResult.lang;
   statusOverride = routeResult.statusOverride;
   return { perPageHead, pageLang, statusOverride };
 }
-async function processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang) {
+async function processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang, ogConfig) {
   if (typeof layout?.path !== "string")
     return;
   try {
     const abs = join(clientDir, "routes", String(layout.path));
     const { meta, ssr } = await loadModuleMetaAndSSR(layout, abs, isWatchMode);
     if (meta)
-      addHead(buildHeadFromMeta(meta));
+      addHead(buildHeadFromMeta(meta, ogConfig));
     if (ssr) {
       const ssrHead = extractSSRHead(ssr);
       if (ssrHead)
@@ -1865,16 +1929,16 @@ ${ssrHead}`);
     }
   } catch {}
 }
-async function extractLayoutMetadata(pathname, clientDir, cwd, isWatchMode, addHead, setLang) {
+async function extractLayoutMetadata(pathname, clientDir, cwd, isWatchMode, addHead, setLang, ogConfig) {
   try {
     const m = await loadRoutesModule(cwd, isWatchMode);
     const matchingLayouts = getMatchingLayouts(pathname, m?.layouts);
     for (const layout of matchingLayouts) {
-      await processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang);
+      await processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang, ogConfig);
     }
   } catch {}
 }
-function extractContentMetadata(pathname, addHead, setLang) {
+function extractContentMetadata(pathname, addHead, setLang, ogConfig) {
   try {
     const parts = pathname.split("/").filter(Boolean);
     if (parts.length < 2)
@@ -1884,7 +1948,7 @@ function extractContentMetadata(pathname, addHead, setLang) {
     const exp = g.__REROUTE_SSR_EXPORTS__?.[key];
     const meta = exp?.meta;
     const ssr = exp?.ssr;
-    addHead(buildHeadFromMeta(meta));
+    addHead(buildHeadFromMeta(meta, ogConfig));
     const ssrHead = extractSSRHead(ssr);
     if (ssrHead)
       addHead(`
@@ -1894,7 +1958,7 @@ ${ssrHead}`);
       setLang(lang);
   } catch {}
 }
-async function extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode, statusOverride, ssrData) {
+async function extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode, statusOverride, ssrData, ogConfig) {
   const pathnameOnly = pathname.split("?")[0];
   const match = typeof m.matchRoute === "function" ? m.matchRoute(pathnameOnly) : null;
   const r = match?.route;
@@ -1907,7 +1971,7 @@ async function extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode,
       const { meta, ssr } = await loadModuleMetaAndSSR(r, abs, isWatchMode);
       let head = "";
       if (meta)
-        head += buildHeadFromMeta(meta);
+        head += buildHeadFromMeta(meta, ogConfig);
       if (ssr) {
         const routeData = ssrData && typeof ssrData === "object" ? ssrData[pathname] : undefined;
         const ssrHead = extractSSRHead(ssr, routeData);
@@ -1921,7 +1985,7 @@ ${ssrHead}`;
   }
   return { head: "", statusOverride };
 }
-async function extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, currentStatusOverride, ssrData) {
+async function extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, currentStatusOverride, ssrData, ogConfig) {
   let head = "";
   let lang;
   let statusOverride = currentStatusOverride;
@@ -1937,14 +2001,14 @@ async function extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, curre
       statusOverride = statusOverride || 404;
     }
     if (r && typeof r.path === "string") {
-      const result = await extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode, statusOverride, ssrData);
+      const result = await extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode, statusOverride, ssrData, ogConfig);
       head = result.head;
       lang = result.lang;
       statusOverride = result.statusOverride;
     } else {
       head += await extractNotFoundMetadata(pathname, clientDir, m, isWatchMode, (l) => {
         lang = l;
-      });
+      }, ogConfig);
     }
   } catch {}
   return { head, lang, statusOverride };
@@ -1964,7 +2028,7 @@ function findBestNotFoundRoute(list, pathname) {
   }
   return chosen;
 }
-async function extractNotFoundMetadata(pathname, clientDir, routesModule, isWatchMode, setLang) {
+async function extractNotFoundMetadata(pathname, clientDir, routesModule, isWatchMode, setLang, ogConfig) {
   let head = "";
   try {
     const list = routesModule?.notFoundRoutes;
@@ -1975,7 +2039,7 @@ async function extractNotFoundMetadata(pathname, clientDir, routesModule, isWatc
       const abs = join(clientDir, "routes", String(chosen.path));
       const { meta, ssr } = await loadModuleMetaAndSSR(chosen, abs, isWatchMode);
       if (meta)
-        head += buildHeadFromMeta(meta);
+        head += buildHeadFromMeta(meta, ogConfig);
       const ssrHead = extractSSRHead(ssr);
       if (ssrHead)
         head += `
@@ -2562,7 +2626,7 @@ async function performSSRSetupInternal(options, streaming) {
     statusOverride = computeResult.statusContainer.value;
   }
   const metadataResult = await withSpan("ssr.extract.metadata", async (span) => {
-    const result = await extractPageMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ogConfig, options.baseUrl, options.autoCanonical, computeResult.data);
+    const result = await extractPageMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ogConfig, options.ogMetaConfig, options.baseUrl, options.autoCanonical, computeResult.data);
     span.setAttributes({
       "reroute.pathname": pathname,
       "reroute.metadata.exists": !!result.perPageHead
@@ -2732,6 +2796,7 @@ async function renderSSRDocument(options) {
     maxAge,
     searchParams,
     ogConfig,
+    ogMetaConfig: options.ogMetaConfig,
     baseUrl: options.baseUrl,
     autoCanonical: options.autoCanonical,
     cachedCollections: options.cachedCollections,
@@ -3996,13 +4061,13 @@ async function discoverSSRDataRoutes2(cwd, staticRoutes, isWatchMode, baseUrl, s
   const ssrDataRoutes = new Map;
   const bundledRoutes = globalThis.__REROUTE_ROUTES__;
   if (bundledRoutes && Array.isArray(bundledRoutes)) {
-    for (const route of staticRoutes) {
+    const routePromises = staticRoutes.map(async (route) => {
       if (sitemapConfig?.excludeDiscovery?.some((excluded) => route.pattern.startsWith(excluded))) {
-        continue;
+        return null;
       }
       const bundledRoute = bundledRoutes.find((r) => r?.pattern === route.pattern);
       if (!bundledRoute)
-        continue;
+        return null;
       const ssr = bundledRoute?.ssr;
       const dataFn = ssr?.data;
       if (typeof dataFn === "function") {
@@ -4015,15 +4080,22 @@ async function discoverSSRDataRoutes2(cwd, staticRoutes, isWatchMode, baseUrl, s
           });
           const entries = extractEntriesFromData(result, route.pattern, baseUrl, sitemapConfig);
           if (entries.length > 0) {
-            ssrDataRoutes.set(route.pattern, entries);
+            return { pattern: route.pattern, entries };
           }
         } catch {}
       }
+      return null;
+    });
+    const results = await Promise.all(routePromises);
+    for (const result of results) {
+      if (result) {
+        ssrDataRoutes.set(result.pattern, result.entries);
+      }
     }
   } else {
-    for (const route of staticRoutes) {
+    const routePromises = staticRoutes.map(async (route) => {
       if (sitemapConfig?.excludeDiscovery?.some((excluded) => route.pattern.startsWith(excluded))) {
-        continue;
+        return null;
       }
       try {
         const routeModulePath = join(cwd, "src", "client", "routes", route.path);
@@ -4039,10 +4111,17 @@ async function discoverSSRDataRoutes2(cwd, staticRoutes, isWatchMode, baseUrl, s
           });
           const entries = extractEntriesFromData(result, route.pattern, baseUrl, sitemapConfig);
           if (entries.length > 0) {
-            ssrDataRoutes.set(route.pattern, entries);
+            return { pattern: route.pattern, entries };
           }
         }
       } catch {}
+      return null;
+    });
+    const results = await Promise.all(routePromises);
+    for (const result of results) {
+      if (result) {
+        ssrDataRoutes.set(result.pattern, result.entries);
+      }
     }
   }
   return ssrDataRoutes;
@@ -4418,24 +4497,28 @@ function createRSSItemFromData(item, routePattern, baseUrl, rssConfig) {
 }
 async function discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfig) {
   const collectionsMap = new Map;
-  for (const collection of collections2) {
+  const collectionPromises = collections2.map(async (collection) => {
     const items = await discoverCollectionFeedItems(cwd, collection, isWatchMode, baseUrl, rssConfig);
-    if (items.length > 0) {
-      collectionsMap.set(collection, items);
+    return items.length > 0 ? { collection, items } : null;
+  });
+  const collectionResults = await Promise.all(collectionPromises);
+  for (const result of collectionResults) {
+    if (result) {
+      collectionsMap.set(result.collection, result.items);
     }
   }
   const ssrDataFeeds = new Map;
   const bundledRoutes = globalThis.__REROUTE_ROUTES__;
+  const { discoverRoutes: discoverRoutes2 } = await Promise.resolve().then(() => (init_discovery4(), exports_discovery));
+  const { staticRoutes } = await discoverRoutes2(cwd, isWatchMode);
   if (bundledRoutes && Array.isArray(bundledRoutes)) {
-    const { discoverRoutes: discoverRoutes2 } = await Promise.resolve().then(() => (init_discovery4(), exports_discovery));
-    const { staticRoutes } = await discoverRoutes2(cwd, isWatchMode);
-    for (const route of staticRoutes) {
+    const routePromises = staticRoutes.map(async (route) => {
       if (rssConfig?.excludeDiscovery?.some((excluded) => route.pattern.startsWith(excluded))) {
-        continue;
+        return null;
       }
       const bundledRoute = bundledRoutes.find((r) => r?.pattern === route.pattern);
       if (!bundledRoute)
-        continue;
+        return null;
       const ssr = bundledRoute?.ssr;
       const dataFn = ssr?.data;
       if (typeof dataFn === "function") {
@@ -4448,21 +4531,33 @@ async function discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfi
           });
           const items = extractRSSItemsFromData(result, route.pattern, baseUrl, rssConfig);
           if (items.length > 0) {
-            ssrDataFeeds.set(route.pattern, items);
+            return { pattern: route.pattern, items };
           }
         } catch {}
       }
+      return null;
+    });
+    const results = await Promise.all(routePromises);
+    for (const result of results) {
+      if (result) {
+        ssrDataFeeds.set(result.pattern, result.items);
+      }
     }
   } else {
-    const { discoverRoutes: discoverRoutes2 } = await Promise.resolve().then(() => (init_discovery4(), exports_discovery));
-    const { staticRoutes } = await discoverRoutes2(cwd, isWatchMode);
-    for (const route of staticRoutes) {
+    const routePromises = staticRoutes.map(async (route) => {
       if (rssConfig?.excludeDiscovery?.some((excluded) => route.pattern.startsWith(excluded))) {
-        continue;
+        return null;
       }
       const items = await discoverSSRDataFeedItems(cwd, route.pattern, route.path, isWatchMode, baseUrl, rssConfig);
       if (items.length > 0) {
-        ssrDataFeeds.set(route.pattern, items);
+        return { pattern: route.pattern, items };
+      }
+      return null;
+    });
+    const results = await Promise.all(routePromises);
+    for (const result of results) {
+      if (result) {
+        ssrDataFeeds.set(result.pattern, result.items);
       }
     }
   }
@@ -4842,6 +4937,7 @@ async function renderSSRDocumentStream(options) {
     maxAge,
     searchParams,
     ogConfig,
+    ogMetaConfig: options.ogMetaConfig,
     baseUrl: options.baseUrl,
     autoCanonical: options.autoCanonical,
     cachedCollections: options.cachedCollections,
@@ -4876,7 +4972,11 @@ async function renderSSRDocumentStream(options) {
     };
   });
   const pageLang = setup2.metadataResult.pageLang || lang;
-  let headWithLang = htmlHead.replace(/<html([^>]*)>/i, `<html$1 lang="${pageLang}">`);
+  let headWithLang = htmlHead.replace(/<html([^>]*)>/i, (_m, attrs) => {
+    const hasLang = /(^|\s)lang\s*=/.test(attrs);
+    const newAttrs = hasLang ? attrs.replace(/lang\s*=\s*("[^"]*"|'[^']*'|[^\s>]+)/i, `lang="${pageLang}"`) : `${attrs} lang="${pageLang}"`;
+    return `<html${newAttrs}>`;
+  });
   const extraHead = setup2.bundlePreload + setup2.preloadExtraHead + setup2.metadataResult.perPageHead;
   if (/<title[\s\S]*?<\/title>/i.test(extraHead)) {
     headWithLang = headWithLang.replace(/<title[\s\S]*?<\/title>/i, "");
@@ -4884,6 +4984,7 @@ async function renderSSRDocumentStream(options) {
   if (/<meta\s+name\s*=\s*['"]description['"][^>]*>/i.test(extraHead)) {
     headWithLang = headWithLang.replace(/<meta\s+name\s*=\s*['"]description['"][^>]*>/i, "");
   }
+  headWithLang = removeOverriddenMetaTags(headWithLang, extraHead);
   const config = await loadConfig(cwd);
   const browserTelemetryConfigRaw = config.telemetry?.browser;
   const { serializeBrowserTelemetryConfig: serializeBrowserTelemetryConfig2 } = await Promise.resolve().then(() => exports_serialize);
@@ -4932,7 +5033,7 @@ async function streamSSRContent(writer, encoder, ctx) {
     try {
       const combinedHead = deduplicateMetaTags([ctx.inlineStyleTag, ctx.head, ctx.extraHead].filter(Boolean).join(`
 `));
-      const headWithLangAndContent = ctx.headWithLang.replace(/<html([^>]*)>/i, `<html$1 lang="${ctx.pageLang}">`).replace(/<\/head>/i, `${combinedHead ? `${combinedHead}
+      const headWithLangAndContent = ctx.headWithLang.replace(/<\/head>/i, `${combinedHead ? `${combinedHead}
 ` : ""}</head>`);
       const headContent = `${headWithLangAndContent}`;
       await writer.write(encoder.encode(headContent));
@@ -5072,6 +5173,7 @@ __export(exports_core, {
   renderSSRDocumentStream: () => renderSSRDocumentStream,
   renderSSRDocument: () => renderSSRDocument,
   renderOGImageToPNG: () => renderOGImageToPNG,
+  removeOverriddenMetaTags: () => removeOverriddenMetaTags,
   processCollections: () => processCollections,
   preloadContentModule: () => preloadContentModule,
   performSSRSetup: () => performSSRSetup,
@@ -5970,6 +6072,8 @@ let hasConnected = false;
 let wasDisconnected = false;
 let reloadTriggered = false;
 let rebuildNotice = null;
+let reconnectAttempts = 0;
+let isReconnecting = false;
 
 function showRebuildNotice() {
   if (rebuildNotice) return;
@@ -6047,6 +6151,43 @@ function hideRebuildNotice() {
   }
 }
 
+// Check if server is ready before attempting SSE connection
+async function waitForServer() {
+  const maxAttempts = 60; // 30 seconds max
+  for (let i = 0; i < maxAttempts; i++) {
+    try {
+      const res = await fetch('/__reroute_watch.js', { method: 'HEAD' });
+      if (res.ok) return true;
+    } catch {
+      // Server not ready, continue waiting
+    }
+    await new Promise(r => setTimeout(r, 500));
+  }
+  return false;
+}
+
+async function scheduleReconnect() {
+  if (reloadTriggered || isReconnecting) return;
+  isReconnecting = true;
+  
+  // Exponential backoff: 300ms, 600ms, 1200ms, max 2000ms
+  const delay = Math.min(300 * Math.pow(2, reconnectAttempts), 2000);
+  reconnectAttempts++;
+  
+  await new Promise(r => setTimeout(r, delay));
+  
+  // Wait for server to be ready before creating EventSource
+  const ready = await waitForServer();
+  isReconnecting = false;
+  
+  if (ready && !reloadTriggered) {
+    connect();
+  } else if (!reloadTriggered) {
+    // Server still not ready, try again
+    scheduleReconnect();
+  }
+}
+
 function connect() {
   if (reloadTriggered) return;
   
@@ -6054,6 +6195,7 @@ function connect() {
   
   eventSource.addEventListener('message', (e) => {
     if (e.data === 'connected') {
+      reconnectAttempts = 0; // Reset backoff on successful connection
       if (hasConnected && wasDisconnected && !reloadTriggered) {
         console.log('[reroute] ✓ Server restarted, reloading...');
         reloadTriggered = true;
@@ -6077,11 +6219,12 @@ function connect() {
     if (reloadTriggered) return;
     wasDisconnected = true;
     eventSource?.close();
-    if (hasConnected) {
+    if (hasConnected && reconnectAttempts === 0) {
+      // Only log on first disconnect to reduce console spam
       console.log('[reroute] \uD83D\uDD04 Server restarting...');
       showRebuildNotice();
     }
-    setTimeout(connect, 1000);
+    scheduleReconnect();
   });
 }
 
@@ -6704,6 +6847,7 @@ function registerOGRoutes(app, options) {
   const width = ogConfig.width ?? 1200;
   const height = ogConfig.height ?? 630;
   const maxAge = ogConfig.maxAge ?? 3600;
+  const generatingImages = new Set;
   function normalizeOgPathname(urlPathname) {
     let pathname = urlPathname.replace(/^\/__reroute_og/, "").replace(/\.png$/, "");
     if (pathname === "/index" || pathname === "index") {
@@ -6725,7 +6869,7 @@ function registerOGRoutes(app, options) {
     }
     return;
   }
-  async function generateOgImage(pathname, clientDir2, cwd2, isWatchMode2, ogConfig2, width2, height2, set) {
+  async function generateOgImage(pathname, clientDir2, cwd2, isWatchMode2, ogConfig2, width2, height2) {
     const ogPath = await findOGImageForPath(pathname, clientDir2);
     const Component = await loadOgComponent(ogPath, ogConfig2, cwd2, isWatchMode2);
     if (!Component) {
@@ -6795,10 +6939,6 @@ function registerOGRoutes(app, options) {
     if (maxAge > 0) {
       ogCache.set(pathname, { buffer, exp: Date.now() + maxAge * 1000 });
     }
-    set.headers["content-type"] = "image/png";
-    set.headers["cache-control"] = `public, max-age=${maxAge}`;
-    set.headers["Reroute-Cache"] = "MISS";
-    return new Response(buffer);
   }
   app.get("/__reroute_og/*", async ({ request, set }) => {
     try {
@@ -6807,9 +6947,30 @@ function registerOGRoutes(app, options) {
       const cachedResponse = checkOgCache(pathname, set);
       if (cachedResponse)
         return cachedResponse;
-      return await generateOgImage(pathname, clientDir, cwd, isWatchMode, ogConfig, width, height, set);
+      if (generatingImages.has(pathname)) {
+        set.status = 404;
+        set.headers["Retry-After"] = "2";
+        return new Response("Image generation in progress", {
+          status: 404,
+          headers: { "Content-Type": "text/plain" }
+        });
+      }
+      generatingImages.add(pathname);
+      generateOgImage(pathname, clientDir, cwd, isWatchMode, ogConfig, width, height).then(() => {
+        console.log(`[reroute/og] Generated image for: ${pathname}`);
+      }).catch((error) => {
+        console.error(`[reroute/og] Failed to generate image for ${pathname}:`, error);
+      }).finally(() => {
+        generatingImages.delete(pathname);
+      });
+      set.status = 404;
+      set.headers["Retry-After"] = "2";
+      return new Response("Image not yet available, please retry", {
+        status: 404,
+        headers: { "Content-Type": "text/plain" }
+      });
     } catch (error) {
-      console.error("[reroute] Failed to generate OG image:", error);
+      console.error("[reroute] Failed to handle OG image request:", error);
       set.status = 500;
       return new Response("Internal Server Error", {
         status: 500,
@@ -6953,6 +7114,23 @@ function registerRobotsRoute(app, options) {
 // packages/elysia/src/routes/rss.ts
 init_core();
 import { NotFoundError as NotFoundError8 } from "elysia";
+var rssDiscoveryCache = new LRUCache(1);
+async function getOrDiscoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfig) {
+  if (isWatchMode) {
+    return discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfig);
+  }
+  const cacheKey = "rss:discovery";
+  const cached = rssDiscoveryCache.get(cacheKey);
+  if (cached && cached.exp > Date.now()) {
+    return cached.discovery;
+  }
+  const discovery5 = await discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfig);
+  rssDiscoveryCache.set(cacheKey, {
+    discovery: discovery5,
+    exp: Date.now() + 5 * 60 * 1000
+  });
+  return discovery5;
+}
 function createFeedTitle(configTitle, name) {
   return configTitle ?? `${name.charAt(0).toUpperCase() + name.slice(1)} Feed`;
 }
@@ -6983,7 +7161,7 @@ async function registerMainFeedRoute(app, cwd, collections2, baseUrl, isWatchMod
       if (cached) {
         return feedResponse(cached.xml, format, { maxAge, cacheStatus: "HIT" });
       }
-      const discovery5 = await discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfig);
+      const discovery5 = await getOrDiscoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfig);
       const allItems = [
         ...Array.from(discovery5.collections.values()).flat(),
         ...Array.from(discovery5.ssrDataFeeds.values()).flat()
@@ -7022,7 +7200,7 @@ function registerCollectionFeedRoutes(app, collections2, options) {
             cacheStatus: "HIT"
           });
         }
-        const discovery5 = await discoverRSSData(options.cwd, [collection], options.baseUrl, options.isWatchMode, options.rssConfig);
+        const discovery5 = await getOrDiscoverRSSData(options.cwd, [collection], options.baseUrl, options.isWatchMode, options.rssConfig);
         const items = discovery5.collections.get(collection) ?? [];
         if (items.length === 0)
           throw new NotFoundError8;
@@ -7083,7 +7261,7 @@ async function generateSSRDataFeed(route, options) {
   }
   let items = await discoverSSRDataFeedItems(options.cwd, route.pattern, route.path, options.isWatchMode, options.baseUrl, options.rssConfig);
   if (items.length === 0 && route.isLayout) {
-    const discovery5 = await discoverRSSData(options.cwd, [], options.baseUrl, options.isWatchMode, options.rssConfig);
+    const discovery5 = await getOrDiscoverRSSData(options.cwd, [], options.baseUrl, options.isWatchMode, options.rssConfig);
     items = discovery5.ssrDataFeeds.get(route.pattern) ?? [];
   }
   if (items.length === 0)
@@ -7140,7 +7318,6 @@ async function registerRSSRoutes(app, options) {
   const feedDescription = rssConfig?.description ?? "Latest updates";
   const availableFeeds = ["/feed.xml"];
   registerMainFeedRoute(app, cwd, collections2, baseUrl, isWatchMode, rssCache, format, limit, maxAge, ttlMs, feedTitle, feedDescription, rssConfig);
-  const ssrDataRoutes = await discoverSSRRoutes(cwd, isWatchMode);
   registerCollectionFeedRoutes(app, collections2, {
     cwd,
     clientDir,
@@ -7154,6 +7331,11 @@ async function registerRSSRoutes(app, options) {
     rssConfig,
     availableFeeds
   });
+  if (isWatchMode) {
+    globalThis.__REROUTE_AVAILABLE_FEEDS__ = availableFeeds;
+    return app;
+  }
+  const ssrDataRoutes = await discoverSSRRoutes(cwd, isWatchMode);
   const routesWithFeeds = await discoverRoutesWithFeeds(ssrDataRoutes, collections2, {
     cwd,
     clientDir,
@@ -7304,9 +7486,26 @@ function registerSearchRoute(app, cwd, directive, maxAge, searchConfig) {
 // packages/elysia/src/routes/sitemap.ts
 init_core();
 import { NotFoundError as NotFoundError9 } from "elysia";
+var sitemapDiscoveryCache = new LRUCache(1);
+async function getOrDiscoverSitemapData(cwd, collections2, baseUrl, isWatchMode, sitemapConfig) {
+  if (isWatchMode) {
+    return discoverSitemapData(cwd, collections2, baseUrl, isWatchMode, sitemapConfig);
+  }
+  const cacheKey = "sitemap:discovery";
+  const cached = sitemapDiscoveryCache.get(cacheKey);
+  if (cached && cached.exp > Date.now()) {
+    return cached.discovery;
+  }
+  const discovery5 = await discoverSitemapData(cwd, collections2, baseUrl, isWatchMode, sitemapConfig);
+  sitemapDiscoveryCache.set(cacheKey, {
+    discovery: discovery5,
+    exp: Date.now() + 5 * 60 * 1000
+  });
+  return discovery5;
+}
 async function generateAndCacheSitemap(options, _ttlMs) {
   const { cwd, collections: collections2, baseUrl, isWatchMode, sitemapConfig } = options;
-  const discovery5 = await discoverSitemapData(cwd, collections2, baseUrl, isWatchMode, sitemapConfig);
+  const discovery5 = await getOrDiscoverSitemapData(cwd, collections2, baseUrl, isWatchMode, sitemapConfig);
   const result = await generateSitemap(discovery5, baseUrl, {
     changefreq: sitemapConfig?.changefreq,
     priority: sitemapConfig?.priority,
@@ -7552,6 +7751,7 @@ function registerSSRRoutes(app, options) {
             maxAge,
             searchParams,
             ogConfig: options.ogConfig,
+            ogMetaConfig: options.ogMetaConfig,
             baseUrl: options.baseUrl,
             autoCanonical: options.autoCanonical,
             parentSpan: renderSpan,
@@ -7730,6 +7930,7 @@ function registerSSRRoutes(app, options) {
               maxAge,
               searchParams,
               ogConfig: options.ogConfig,
+              ogMetaConfig: options.ogMetaConfig,
               baseUrl: options.baseUrl,
               autoCanonical: options.autoCanonical,
               parentSpan: renderSpan,
@@ -8033,8 +8234,24 @@ var reroute = () => async (app) => {
   const shouldIgnore = !ignorePatterns.length ? () => false : (file) => ignorePatterns.find((pattern) => typeof pattern === "string" ? file.includes(pattern) : pattern.test(file));
   const isWatchMode = Array.isArray(process.execArgv) && process.execArgv.includes("--watch") || Array.isArray(process.argv) && process.argv.includes("--watch");
   const dataCacheControl = `${directive}, max-age=${maxAge}`;
-  if (isWatchMode)
+  if (isWatchMode) {
     console.log(`[reroute] Live reload enabled`);
+    registerLiveReloadRoutes(app, liveReloadState);
+    app.post("/__reroute_rebuilding", () => {
+      console.log("[reroute] Rebuild notification received, notifying browsers...");
+      notifyRebuilding();
+      return new Response(JSON.stringify({ ok: true, clients: liveReloadState.clients.size }), {
+        headers: { "content-type": "application/json" }
+      });
+    });
+    app.post("/__reroute_reload", () => {
+      console.log(`[reroute] Reload notification received, notifying ${liveReloadState.clients.size} browser(s)...`);
+      notifyReload();
+      return new Response(JSON.stringify({ ok: true, clients: liveReloadState.clients.size }), {
+        headers: { "content-type": "application/json" }
+      });
+    });
+  }
   const readBundleUrl = async () => {
     const bundlesDir = `${cwd}/.reroute/bundles`;
     const maxAttempts = isWatchMode ? 500 : 10;
@@ -8081,25 +8298,6 @@ var reroute = () => async (app) => {
     isWatchMode,
     maxAge
   });
-  if (isWatchMode) {
-    registerLiveReloadRoutes(app, liveReloadState);
-  }
-  if (isWatchMode) {
-    app.post("/__reroute_rebuilding", () => {
-      console.log("[reroute] Rebuild notification received, notifying browsers...");
-      notifyRebuilding();
-      return new Response(JSON.stringify({ ok: true, clients: liveReloadState.clients.size }), {
-        headers: { "content-type": "application/json" }
-      });
-    });
-    app.post("/__reroute_reload", () => {
-      console.log(`[reroute] Reload notification received, notifying ${liveReloadState.clients.size} browser(s)...`);
-      notifyReload();
-      return new Response(JSON.stringify({ ok: true, clients: liveReloadState.clients.size }), {
-        headers: { "content-type": "application/json" }
-      });
-    });
-  }
   registerArtifactsRoutes(app, cwd, fileCache, {
     bundleMaxAge,
     directive,
@@ -8148,6 +8346,39 @@ var reroute = () => async (app) => {
           console.error("[reroute] Failed to register robots route:", error);
         }
       }
+      if (sitemapEnabled && sitemapBaseUrl) {
+        try {
+          registerSitemapRoutes(app, {
+            cwd,
+            collections: collections2,
+            baseUrl: sitemapBaseUrl,
+            maxAge,
+            isWatchMode,
+            sitemapCache,
+            sitemapConfig
+          });
+          console.log(`[reroute] Sitemap enabled at ${sitemapBaseUrl}/sitemap.xml`);
+        } catch (error) {
+          console.error("[reroute] Failed to register sitemap routes:", error);
+        }
+      }
+      if (rssEnabled && rssBaseUrl) {
+        try {
+          await registerRSSRoutes(app, {
+            cwd,
+            clientDir,
+            collections: collections2,
+            baseUrl: rssBaseUrl,
+            maxAge,
+            isWatchMode,
+            rssCache,
+            rssConfig
+          });
+          console.log(`[reroute] RSS feeds enabled at ${rssBaseUrl}/feed.xml`);
+        } catch (error) {
+          console.error("[reroute] Failed to register RSS routes:", error);
+        }
+      }
       if (llmsEnabled && llmsConfig) {
         try {
           registerLLMsRoutes(app, {
@@ -8178,6 +8409,20 @@ var reroute = () => async (app) => {
           console.error("[reroute] Failed to register LLMs routes:", error);
         }
       }
+      if (ogEnabled && ogConfig) {
+        try {
+          registerOGRoutes(app, {
+            clientDir,
+            cwd,
+            isWatchMode,
+            ogConfig,
+            ogCache
+          });
+          console.log("[reroute] OG image generation enabled");
+        } catch (error) {
+          console.error("[reroute] Failed to register OG routes:", error);
+        }
+      }
       registerSSRRoutes(app, {
         rootComponent,
         clientDir,
@@ -8197,56 +8442,10 @@ var reroute = () => async (app) => {
         streamingEnabled,
         streamingTimeout: globalConfig.streaming?.timeout,
         ogConfig,
+        ogMetaConfig: globalConfig.og,
         baseUrl,
         autoCanonical
       });
-      if (sitemapEnabled && sitemapBaseUrl) {
-        try {
-          registerSitemapRoutes(app, {
-            cwd,
-            collections: collections2,
-            baseUrl: sitemapBaseUrl,
-            maxAge,
-            isWatchMode,
-            sitemapCache,
-            sitemapConfig
-          });
-          console.log(`[reroute] Sitemap enabled at ${sitemapBaseUrl}/sitemap.xml`);
-        } catch (error) {
-          console.error("[reroute] Failed to register sitemap routes:", error);
-        }
-      }
-      if (rssEnabled && rssBaseUrl) {
-        try {
-          await registerRSSRoutes(app, {
-            cwd,
-            clientDir,
-            collections: collections2,
-            baseUrl: rssBaseUrl,
-            maxAge,
-            isWatchMode,
-            rssCache,
-            rssConfig
-          });
-          console.log(`[reroute] RSS feeds enabled at ${rssBaseUrl}/feed.xml`);
-        } catch (error) {
-          console.error("[reroute] Failed to register RSS routes:", error);
-        }
-      }
-      if (ogEnabled && ogConfig) {
-        try {
-          registerOGRoutes(app, {
-            clientDir,
-            cwd,
-            isWatchMode,
-            ogConfig,
-            ogCache
-          });
-          console.log("[reroute] OG image generation enabled");
-        } catch (error) {
-          console.error("[reroute] Failed to register OG routes:", error);
-        }
-      }
     } catch (error) {
       console.error("[reroute] Failed to register SSR routes:", error);
       throw error;
@@ -8267,4 +8466,4 @@ export {
   reroute
 };
 
-//# debugId=E9B46B80C24001D364756E2164756E21
+//# debugId=B3B56B145A0DCF8164756E2164756E21