@catmint/adapter-node 0.0.0-prealpha.6 → 0.0.0-prealpha.8

package/dist/server-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-template.d.ts","sourceRoot":"","sources":["../src/server-template.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,UAAU,GAAG,MAAM,CAAC;CACnC;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,aAAa,GACrB,MAAM,CA8YR"}
+{"version":3,"file":"server-template.d.ts","sourceRoot":"","sources":["../src/server-template.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,UAAU,GAAG,MAAM,CAAC;CACnC;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,aAAa,GACrB,MAAM,CA+fR"}

package/dist/server-template.js

@@ -19,6 +19,7 @@ import { fileURLToPath } from "node:url";
 const __dirname = fileURLToPath(new URL(".", import.meta.url));
 const CLIENT_DIR = resolve(__dirname, "../client");
 const STATIC_DIR = resolve(__dirname, "../static");
+const PRERENDERED_DIR = resolve(__dirname, "../prerendered");
 
 const PORT = process.env.PORT ? parseInt(process.env.PORT, 10) : ${options.port};
 const HOST = process.env.HOST ?? ${JSON.stringify(options.host)};
@@ -199,6 +200,28 @@ async function pipeWebStreamToResponse(webStream, res) {
   }
 }
 
+function nodeReqToWebRequest(req) {
+  const protocol = "http";
+  const host = req.headers.host || \`\${HOST}:\${PORT}\`;
+  const reqUrl = new URL(req.url || "/", \`\${protocol}://\${host}\`);
+  const headers = new Headers();
+  for (const [key, value] of Object.entries(req.headers)) {
+    if (value) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          headers.append(key, v);
+        }
+      } else {
+        headers.set(key, value);
+      }
+    }
+  }
+  return new Request(reqUrl.href, {
+    method: req.method || "GET",
+    headers,
+  });
+}
+
 const server = createServer(async (req, res) => {
 ${options.headerPreset === "baseline"
         ? `  // Baseline security headers
@@ -212,8 +235,17 @@ ${options.headerPreset === "baseline"
   const method = (req.method || "GET").toUpperCase();
 
   try {
-    // 1. Serve static assets from dist/static/ (no cache)
+    // 1. Serve client assets from dist/client/ (immutable for hashed assets)
+    // These have hashed filenames and never conflict with app routes.
     {
+      const filePath = join(CLIENT_DIR, pathname);
+      const served = await serveStaticFile(res, filePath, pathname.includes("/assets/"));
+      if (served) return;
+    }
+
+    // 2. Pre-rendered static pages WITHOUT middleware: serve directly from
+    // dist/static/ as a fast path — no middleware execution needed.
+    if (method === "GET") {
       let staticPath = pathname;
       if (!extname(staticPath)) {
         staticPath = staticPath.endsWith("/")
@@ -225,14 +257,54 @@ ${options.headerPreset === "baseline"
       if (served) return;
     }
 
-    // 2. Serve client assets from dist/client/ (immutable for hashed assets)
-    {
-      const filePath = join(CLIENT_DIR, pathname);
-      const served = await serveStaticFile(res, filePath, pathname.includes("/assets/"));
-      if (served) return;
+    // 3. Middleware execution — runs for all remaining routes (server functions,
+    // endpoints, prerendered pages with middleware, RSC-rendered pages).
+    // For RSC flight requests, run middleware against the TARGET page path
+    // (from ?path= query param), not the literal /__catmint/rsc pathname.
+    var middlewareHeaders = null;
+    if (ssrEntry.executeMiddleware) {
+      try {
+        var middlewarePath = pathname;
+        if (pathname === "/__catmint/rsc") {
+          var rscTargetPath = url.searchParams.get("path");
+          if (rscTargetPath) middlewarePath = rscTargetPath;
+        }
+        var webRequest = nodeReqToWebRequest(req);
+        var mwResult = await ssrEntry.executeMiddleware(middlewarePath, webRequest);
+
+        if (mwResult.shortCircuit) {
+          // Middleware short-circuited — return its response directly
+          res.writeHead(mwResult.shortCircuit.status,
+            Object.fromEntries(mwResult.shortCircuit.headers));
+          var scBody = await mwResult.shortCircuit.text();
+          res.end(scBody);
+          return;
+        }
+
+        // Middleware passed — capture headers to merge into final response
+        if (mwResult.headers && typeof mwResult.headers.forEach === "function") {
+          middlewareHeaders = mwResult.headers;
+        }
+      } catch (err) {
+        console.error("Middleware error:", err);
+        if (!res.headersSent) {
+          res.writeHead(500);
+          res.end("Internal Server Error");
+        }
+        return;
+      }
     }
 
-    // 3. Handle server function RPC calls (/__catmint/fn/*)
+    // Helper: merge middleware headers into the response before sending.
+    function applyMiddlewareHeaders() {
+      if (middlewareHeaders) {
+        middlewareHeaders.forEach(function(value, key) {
+          res.setHeader(key, value);
+        });
+      }
+    }
+
+    // 4. Handle server function RPC calls (/__catmint/fn/*)
     if (pathname.startsWith("/__catmint/fn/") && ssrEntry.handleServerFn) {
       try {
         // Enforce POST method for server function calls
@@ -268,6 +340,7 @@ ${options.headerPreset === "baseline"
         }
         const result = await ssrEntry.handleServerFn(pathname, parsed);
         if (result) {
+          applyMiddlewareHeaders();
           sendJson(res, 200, result.result);
           return;
         }
@@ -279,7 +352,7 @@ ${options.headerPreset === "baseline"
       return;
     }
 
-    // 4. RSC flight stream for client-side navigation (/__catmint/rsc?path=...)
+    // 5. RSC flight stream for client-side navigation (/__catmint/rsc?path=...)
     if (pathname === "/__catmint/rsc" && method === "GET" && rscEntry.render) {
       const targetPath = url.searchParams.get("path");
       if (!targetPath) {
@@ -291,6 +364,7 @@ ${options.headerPreset === "baseline"
       try {
         const rscResult = await rscEntry.render(targetPath);
         if (rscResult) {
+          applyMiddlewareHeaders();
           res.writeHead(200, {
             "Content-Type": "text/x-component; charset=utf-8",
             "Cache-Control": "no-cache, no-store, must-revalidate",
@@ -312,7 +386,7 @@ ${options.headerPreset === "baseline"
       return;
     }
 
-    // 5. API endpoint handling
+    // 6. API endpoint handling
     if (ssrEntry.hasEndpoint && ssrEntry.hasEndpoint(pathname)) {
       try {
         const protocol = "http";
@@ -335,7 +409,10 @@ ${options.headerPreset === "baseline"
         const result = await ssrEntry.handleEndpoint(pathname, method, webRequest);
 
         if (result) {
-          res.writeHead(result.response.status, Object.fromEntries(result.response.headers));
+          // Copy response headers then merge middleware headers
+          var epHeaders = Object.fromEntries(result.response.headers);
+          res.writeHead(result.response.status, epHeaders);
+          applyMiddlewareHeaders();
           if (result.response.body) {
             await pipeWebStreamToResponse(result.response.body, res);
           } else {
@@ -357,12 +434,41 @@ ${options.headerPreset === "baseline"
       }
     }
 
-    // 6. RSC → SSR page rendering pipeline
+    // 7. Pre-rendered pages WITH middleware: serve from dist/prerendered/
+    // These are static routes that have middleware ancestors — their HTML
+    // was pre-rendered but they must go through the middleware pipeline.
+    if (method === "GET") {
+      let prerenderedPath = pathname;
+      if (!extname(prerenderedPath)) {
+        prerenderedPath = prerenderedPath.endsWith("/")
+          ? prerenderedPath + "index.html"
+          : prerenderedPath + ".html";
+      }
+      try {
+        const prFilePath = join(PRERENDERED_DIR, prerenderedPath);
+        const prStats = await stat(prFilePath);
+        if (prStats.isFile()) {
+          const content = await readFile(prFilePath);
+          applyMiddlewareHeaders();
+          res.setHeader("Content-Type", "text/html; charset=utf-8");
+          res.setHeader("Content-Length", content.byteLength);
+          res.setHeader("Cache-Control", "public, max-age=0, must-revalidate");
+          res.writeHead(200);
+          res.end(content);
+          return;
+        }
+      } catch {
+        // No prerendered file — continue to RSC rendering
+      }
+    }
+
+    // 8. RSC → SSR page rendering pipeline
     if (method === "GET" && rscEntry.render) {
       try {
         const rscResult = await rscEntry.render(pathname);
         if (rscResult) {
           const htmlStream = await ssrEntry.renderToHtml(rscResult.stream, rscResult.headConfig);
+          applyMiddlewareHeaders();
           res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
           await pipeWebStreamToResponse(htmlStream, res);
           return;
@@ -376,7 +482,14 @@ ${options.headerPreset === "baseline"
       }
     }
 
-    // 7. 404
+    // 9. Static assets fallback (dist/static/ for public files like favicon, etc.)
+    {
+      const filePath = join(STATIC_DIR, pathname);
+      const served = await serveStaticFile(res, filePath, false);
+      if (served) return;
+    }
+
+    // 10. 404
     await sendStatusPage(res, 404, pathname);
   } catch (err) {
     console.error("Request error:", err);

package/dist/server-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-template.js","sourceRoot":"","sources":["../src/server-template.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAWhE;;;;;;;;;GASG;AACH,MAAM,UAAU,mBAAmB,CACjC,SAAsB,EACtB,OAAsB;IAEtB,OAAO;;;;;;;;;;mEAU0D,OAAO,CAAC,IAAI;mCAC5C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BA4IrC,OAAO,CAAC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwC3C,OAAO,CAAC,YAAY,KAAK,UAAU;QACjC,CAAC,CAAC;;;;CAIL;QACG,CAAC,CAAC,EACN;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsMC,CAAC;AACF,CAAC"}
+{"version":3,"file":"server-template.js","sourceRoot":"","sources":["../src/server-template.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAWhE;;;;;;;;;GASG;AACH,MAAM,UAAU,mBAAmB,CACjC,SAAsB,EACtB,OAAsB;IAEtB,OAAO;;;;;;;;;;;mEAW0D,OAAO,CAAC,IAAI;mCAC5C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BA4IrC,OAAO,CAAC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8D3C,OAAO,CAAC,YAAY,KAAK,UAAU;QACjC,CAAC,CAAC;;;;CAIL;QACG,CAAC,CAAC,EACN;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgSC,CAAC;AACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catmint/adapter-node",
-  "version": "0.0.0-prealpha.6",
+  "version": "0.0.0-prealpha.8",
   "type": "module",
   "private": false,
   "license": "MIT",
@@ -14,7 +14,7 @@
     }
   },
   "dependencies": {
-    "catmint": "0.0.0-prealpha.6"
+    "catmint": "0.0.0-prealpha.8"
   },
   "devDependencies": {
     "typescript": "^5.7.0"