reroute-js 0.43.0 → 0.43.2

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

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

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

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

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

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

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

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

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

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

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

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

package/core/src/ssr/lib/scripts/collections.d.ts

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

package/core/src/ssr/lib/scripts/data.d.ts

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

package/core/src/ssr/lib/scripts/escape.d.ts

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

package/core/src/ssr/lib/scripts/feeds.d.ts

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

package/core/src/ssr/lib/scripts/index.d.ts

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/elysia/index.d.ts

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

package/elysia/index.js

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.43.0
+ * reroute-js v0.43.2
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -5811,7 +5811,7 @@ function registerArtifactsRoutes(app, cwd, fileCache, options) {
     const filePath = join(cwd, ".reroute", "collections", fileName);
     const acceptEncoding = headers2["accept-encoding"] ?? "";
     try {
-      const cacheControl = isWatchMode ? "no-cache, no-store, must-revalidate" : "public, max-age=31536000, immutable";
+      const cacheControl = isWatchMode ? "no-cache, no-store, must-revalidate" : "public, max-age=60, must-revalidate";
       return await serveFile(filePath, acceptEncoding, fileCache, {
         cacheControl
       });
@@ -6047,7 +6047,6 @@ function registerImageRoutes(app, options) {
 }
 
 // packages/elysia/src/routes/internal.ts
-init_core();
 import { NotFoundError as NotFoundError4 } from "elysia";
 
 // packages/elysia/src/libs/http.ts
@@ -6192,26 +6191,51 @@ function registerInternalRoutes(app, opts) {
     return jsonError("key not found", 404);
   }
   async function handleFullDataRequest(pathname) {
-    let data = dataCache?.get(pathname);
+    const { computeSSRData: computeSSRData2 } = await Promise.resolve().then(() => (init_core(), exports_core));
+    const cacheKey = `${pathname}:streaming`;
+    let data = dataCache?.get(cacheKey);
     const cacheHit = data !== undefined;
     if (data === undefined) {
       const sp = extractSearchParams(pathname);
       try {
-        data = await computeSSRDataForPath({
-          pathname,
-          clientDir,
-          cwd,
-          isWatchMode,
-          searchParams: sp
-        });
+        const result = await computeSSRData2(pathname, clientDir, cwd, isWatchMode, { streaming: true, maxAge }, sp);
+        data = convertPromisesToLazyMarkers(result.data, pathname);
       } catch (error) {
         console.error("[__reroute_data] Error computing data:", error);
         data = null;
       }
-      dataCache?.set(pathname, data);
+      dataCache?.set(cacheKey, data);
     }
     return { data, cacheHit };
   }
+  function convertPromisesToLazyMarkers(data, pathname) {
+    if (data instanceof Promise) {
+      return {
+        __lazy__: true,
+        __fetch__: `/__reroute_data?path=${encodeURIComponent(pathname)}`
+      };
+    }
+    if (typeof data === "object" && data !== null && !Array.isArray(data)) {
+      const result = {};
+      let hasPromises = false;
+      for (const [key, value] of Object.entries(data)) {
+        if (value instanceof Promise) {
+          hasPromises = true;
+          result[key] = {
+            __lazy__: true,
+            __fetch__: `/__reroute_data?path=${encodeURIComponent(pathname)}&key=${encodeURIComponent(key)}`
+          };
+        } else {
+          result[key] = value;
+        }
+      }
+      if (hasPromises) {
+        result.__flatten__ = true;
+      }
+      return result;
+    }
+    return data;
+  }
   app.get("/__reroute_data", async ({ query, headers: headers2 }) => {
     const p = String(query.path || query.p || "/");
     const dataKey = String(query.key || "");
@@ -7009,7 +7033,7 @@ function registerOGRoutes(app, options) {
   const width = ogConfig.width ?? 1200;
   const height = ogConfig.height ?? 630;
   const maxAge = ogConfig.maxAge ?? 3600;
-  const generatingImages = new Set;
+  const generatingImages = new Map;
   function normalizeOgPathname(urlPathname) {
     let pathname = urlPathname.replace(/^\/__reroute_og/, "").replace(/\.png$/, "");
     if (pathname === "/index" || pathname === "index") {
@@ -7109,26 +7133,34 @@ function registerOGRoutes(app, options) {
       const cachedResponse = checkOgCache(pathname, set);
       if (cachedResponse)
         return cachedResponse;
-      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(() => {
+      const existingGeneration = generatingImages.get(pathname);
+      if (existingGeneration) {
+        await existingGeneration;
+        const cachedAfterWait = checkOgCache(pathname, set);
+        if (cachedAfterWait)
+          return cachedAfterWait;
+      }
+      const generationPromise = generateOgImage(pathname, clientDir, cwd, isWatchMode, ogConfig, width, height);
+      generatingImages.set(pathname, generationPromise);
+      try {
+        await generationPromise;
         console.log(`[reroute/og] Generated image for: ${pathname}`);
-      }).catch((error) => {
+      } catch (error) {
         console.error(`[reroute/og] Failed to generate image for ${pathname}:`, error);
-      }).finally(() => {
+        set.status = 500;
+        return new Response("Failed to generate image", {
+          status: 500,
+          headers: { "Content-Type": "text/plain" }
+        });
+      } finally {
         generatingImages.delete(pathname);
-      });
-      set.status = 404;
-      set.headers["Retry-After"] = "2";
-      return new Response("Image not yet available, please retry", {
-        status: 404,
+      }
+      const generatedResponse = checkOgCache(pathname, set);
+      if (generatedResponse)
+        return generatedResponse;
+      set.status = 500;
+      return new Response("Image generation completed but not cached", {
+        status: 500,
         headers: { "Content-Type": "text/plain" }
       });
     } catch (error) {
@@ -8647,4 +8679,4 @@ export {
   reroute
 };
 
-//# debugId=C6F09D6C67BEE32064756E2164756E21
+//# debugId=44C139D1754C251F64756E2164756E21