Wrapped Proxy Perf Improvements

bifrost-fastify/index.ts

@@ -83,13 +83,17 @@ export const viteProxyPlugin: FastifyPluginAsync<
       return reply.code(404).type("text/html").send("Not Found");
     }
 
-    const { pipe, statusCode, headers } = httpResponse;
-    const stream = new PassThrough();
-    pipe(stream);
-    return reply
-      .status(statusCode)
-      .headers(Object.fromEntries(headers))
-      .send(stream);
+    const { statusCode, headers, getBody } = httpResponse;
+    return (
+      reply
+        .status(statusCode)
+        .headers(Object.fromEntries(headers))
+        // This disables any possibility of real streaming. To re-enable streaming we should adopt vike-photon and rewrite wrapped proxy as a Vike middleware.
+        // Why not pipe? Because Vike gives us `pipe` which sends data into a Writable, but Fastify's reply.send only accepts a ReadableStream. Passthrough can convert but causes race conditions
+        // We would have to pipe into reply.raw, but that skips Fastify's reply handling (like onSend hooks)
+        // Photon/universal-middleware solves this with some hacks around reply.body
+        .send(await getBody())
+    );
   }
   await fastify.register(accepts);
   fastify.decorateRequest("bifrostPageId", null);
@@ -122,6 +126,10 @@ export const viteProxyPlugin: FastifyPluginAsync<
         req.vikePageContext = pageContext;
 
         const proxyMode = pageContext.config?.proxyMode;
+        if (!proxyMode) {
+          req.log.info(`bifrost: rendering page ${pageContext.pageId}`);
+          return replyWithPage(reply, pageContext);
+        }
 
         switch (proxyMode) {
           case "passthru": {
@@ -163,9 +171,6 @@ export const viteProxyPlugin: FastifyPluginAsync<
             }
             break;
           }
-          default:
-            req.log.info(`bifrost: rendering page ${pageContext.pageId}`);
-            return replyWithPage(reply, pageContext);
         }
 
         if (pageContext.urlParsed) {

bifrost-fastify/package.json

@@ -19,7 +19,7 @@
   "peerDependencies": {
     "@alignable/bifrost": "1.0.15",
     "fastify": "^5.0.0",
-    "vike": ">=0.4.248",
+    "vike": ">=0.4.251",
     "vite": ">=6"
   },
   "devDependencies": {

bifrost/package.json

@@ -45,7 +45,7 @@
   "peerDependencies": {
     "react": ">=18",
     "typescript": ">=4.7",
-    "vike": ">=0.4.248",
+    "vike": ">=0.4.251",
     "vike-react": ">=0.6.11"
   },
   "devDependencies": {
@@ -60,7 +60,7 @@
     "typescript": "^5.0.4",
     "vike-react": "0.6.11",
     "vite": "^6.3.5",
-    "vike": "0.4.250",
+    "vike": "0.4.252",
     "cross-env": "^7.0.3"
   }
 }

bifrost/renderer/config.ts

@@ -40,6 +40,8 @@ export default {
           case "wrapped":
             return {
               Page: "import:@alignable/bifrost/__internal/renderer/wrapped/Page:default" as any,
+              onRenderHtml:
+                "import:@alignable/bifrost/__internal/renderer/wrapped/onRenderHtml:default",
               onBeforeRenderHtml:
                 "import:@alignable/bifrost/__internal/renderer/wrapped/onBeforeRenderHtml:default",
               onBeforeRender:

bifrost/renderer/wrapped/onRenderHtml.ts

@@ -0,0 +1,12 @@
+import { dangerouslySkipEscape } from "vike/server";
+// @ts-ignore vike-react import typescript is wrong
+import { onRenderHtml as vikeReactRender } from "vike-react/__internal/integration/onRenderHtml";
+import { PageContextServer } from "vike/types";
+
+const emptydocument = dangerouslySkipEscape("");
+export default async function onRenderHtml(pageContext: PageContextServer) {
+  if (pageContext._wrappedServerOnly) {
+    return await vikeReactRender(pageContext);
+  }
+  return { documentHtml: emptydocument };
+}

tests/vite/package.json

@@ -21,7 +21,7 @@
     "@vitejs/plugin-react": "^4.7.0",
     "fastify": "^5.6.2",
     "uuid": "^9.0.0",
-    "vike": "0.4.250",
+    "vike": "0.4.252",
     "vike-react": "^0.6.10",
     "vite": "^6.3.5"
   },

tests/vite/pages/custom-vite/+Page.tsx

@@ -4,22 +4,24 @@ import { usePageContext } from "vike-react/usePageContext";
 
 export default function Page() {
   const { urlParsed } = usePageContext();
+  const pageData = urlParsed.search["page"];
   return (
     <>
       <h1>vite is here</h1>
-      {(JSON.parse(urlParsed.search["page"]) as PageDataOk)?.links?.map(
-        (link) =>
-          "title" in link && (
-            <a
-              href={`/${link.endpoint || "custom"}?page=${encodeURI(
-                JSON.stringify(link)
-              )}`}
-              key={link.title}
-            >
-              {link.title}
-            </a>
-          )
-      )}
+      {pageData &&
+        (JSON.parse(pageData) as PageDataOk)?.links?.map(
+          (link) =>
+            "title" in link && (
+              <a
+                href={`/${link.endpoint || "custom"}?page=${encodeURI(
+                  JSON.stringify(link)
+                )}`}
+                key={link.title}
+              >
+                {link.title}
+              </a>
+            )
+        )}
     </>
   );
 }