gemi 0.49.0-rc.3 → 0.49.0

package/dist/app/index.js

@@ -1,4 +1,4 @@
 // @bun
-import{o as a,p as b}from"../chunk-vjwgfkwn.js";import"../chunk-tjqn206t.js";import"../chunk-x5f4e2fp.js";import"../chunk-p5r0t9jh.js";import"../chunk-xkrthw08.js";import"../chunk-4z53shav.js";import"../chunk-m0earq80.js";import"../chunk-f18weffa.js";export{b as prismaExtension,a as App};
+import{o as a,p as b}from"../chunk-pd3ycrny.js";import"../chunk-twg652g2.js";import"../chunk-x5f4e2fp.js";import"../chunk-p5r0t9jh.js";import"../chunk-xkrthw08.js";import"../chunk-4z53shav.js";import"../chunk-m0earq80.js";import"../chunk-f18weffa.js";export{b as prismaExtension,a as App};
 
 //# debugId=15EBDBCE0B2D702364756E2164756E21

package/dist/bin/gemi.js

@@ -68556,6 +68556,36 @@ function isBotUserAgent(userAgent) {
   return BOT_UA.test(userAgent);
 }
 
+// services/router/routePayloadStream.ts
+var PAYLOAD_STREAM_DEADLINE_MS = 1e4;
+function createRoutePayloadStream(envelope, store, deadlineMs = PAYLOAD_STREAM_DEADLINE_MS) {
+  const encoder = new TextEncoder;
+  return new ReadableStream({
+    start(controller) {
+      let closed = false;
+      const close = () => {
+        if (closed)
+          return;
+        closed = true;
+        clearTimeout(deadline);
+        try {
+          controller.close();
+        } catch {}
+      };
+      controller.enqueue(encoder.encode(`${JSON.stringify(envelope)}
+`));
+      store.onSettle((entry) => {
+        if (closed || entry.status !== "resolved")
+          return;
+        controller.enqueue(encoder.encode(`${JSON.stringify([entry.path, entry.variantKey, entry.data])}
+`));
+      });
+      const deadline = setTimeout(close, deadlineMs);
+      store.allSettled().then(close, close);
+    }
+  });
+}
+
 // services/router/ViewRouterServiceContainer.ts
 var STREAM_DEADLINE_MS = 1e4;
 var themeScript = `
@@ -68636,6 +68666,7 @@ class ViewRouterServiceContainer extends ServiceContainer {
       pathname,
       serverQueries,
       userAgent,
+      noStream,
       url,
       user,
       viewData,
@@ -68726,7 +68757,7 @@ class ViewRouterServiceContainer extends ServiceContainer {
       serverQueries.markRenderStart();
       const deadline = new AbortController;
       const deadlineTimer = setTimeout(() => deadline.abort(), STREAM_DEADLINE_MS);
-      const isBot = isBotUserAgent(userAgent);
+      const settled = isBotUserAgent(userAgent) || noStream;
       try {
         const stream = await renderToReadableStream(import_react.createElement(import_react.Fragment, {
           children: [
@@ -68749,7 +68780,7 @@ class ViewRouterServiceContainer extends ServiceContainer {
           bootstrapScriptContent: `window.__GEMI_DATA__ = ${JSON.stringify(result.data)}; window.loaders=${loaders}`,
           bootstrapModules,
           signal: deadline.signal,
-          ...isBot ? { progressiveChunkSize: Number.MAX_SAFE_INTEGER } : {},
+          ...settled ? { progressiveChunkSize: Number.MAX_SAFE_INTEGER } : {},
           onError(error) {
             if (true) {
               console.error(error);
@@ -68757,7 +68788,7 @@ class ViewRouterServiceContainer extends ServiceContainer {
           }
         });
         stream.allReady.catch(() => {}).finally(() => clearTimeout(deadlineTimer));
-        if (isBot) {
+        if (settled) {
           await stream.allReady.catch(() => {});
         }
         return new Response(injectQueryPayloads(stream, serverQueries), {
@@ -68813,6 +68844,7 @@ class ViewRouterServiceContainer extends ServiceContainer {
     let currentPathName = null;
     let params = {};
     let partial = null;
+    let noStream = false;
     try {
       const match = matchViewRoute(this.flatViewRoutes, urlPathname);
       if (match) {
@@ -68820,6 +68852,7 @@ class ViewRouterServiceContainer extends ServiceContainer {
         params = match.params;
         handlers = match.route.exec;
         middlewares = match.route.middleware;
+        noStream = middlewares.includes("no-stream");
         if (isViewDataRequest && this.service.partialRendering) {
           const from = req.headers.get(PARTIAL_RENDER_HEADER);
           const plan = resolvePartialRender({
@@ -68875,9 +68908,6 @@ class ViewRouterServiceContainer extends ServiceContainer {
           };
         }
         const data = await Promise.all(handlers.map((fn2) => fn2(httpRequest2)));
-        if (isViewDataRequest) {
-          await ctx.serverQueries.allSettled();
-        }
         const cookies = ctx.cookies;
         const headers = ctx.headers;
         pageData = {
@@ -68918,26 +68948,30 @@ class ViewRouterServiceContainer extends ServiceContainer {
           return await createFileResponse(fileOutput, headers);
         }
         if (isViewDataRequest) {
-          headers.set("Content-Type", "application/json; charset=utf-8");
+          headers.set("Content-Type", "application/x-ndjson; charset=utf-8");
           headers.append("Vary", PARTIAL_RENDER_HEADER);
           cookies.forEach((cookie) => headers.append("Set-Cookie", cookie.toString()));
           await this.service.onRequestEnd(httpRequest2);
-          return new Response(JSON.stringify({
+          const envelope = {
             meta: partial && !ctx.metadata.touched ? null : pageData.meta,
             data: {
               [urlPathname]: viewData
             },
             breadcrumbs,
-            prefetchedData: pageData.prefetchedData,
+            prefetchedData: ctx.serverQueries.snapshotResolved(),
             i18n,
             is404: !currentPathName2,
             appId: pageData.appId,
             partial
-          }), {
+          };
+          return new Response(createRoutePayloadStream(envelope, ctx.serverQueries), {
             headers
           });
         }
         headers.set("Content-Type", "text/html; charset=utf-8");
+        if (!noStream) {
+          headers.append("Vary", "User-Agent");
+        }
         for (const cookie of cookies) {
           headers.append("Set-Cookie", cookie.toString());
         }
@@ -68959,6 +68993,7 @@ class ViewRouterServiceContainer extends ServiceContainer {
           pathname: url.pathname,
           serverQueries: ctx.serverQueries,
           userAgent: req.headers.get("user-agent"),
+          noStream,
           url,
           user,
           viewData,
@@ -70006,5 +70041,5 @@ program.command("app:route-manifest").action(async () => {
 });
 program.parse();
 
-//# debugId=44D95B041CD6BDAE64756E2164756E21
+//# debugId=DCB90EA813E43E3464756E2164756E21
 //# sourceMappingURL=gemi.js.map