@catmint/adapter-node 0.0.0-prealpha.13 → 0.0.0-prealpha.15

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,CA8jBR"}
+{"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,CAgnBR"}

package/dist/server-template.js

@@ -269,6 +269,30 @@ ${options.headerPreset === "baseline"
   const pathname = url.pathname;
   const method = (req.method || "GET").toUpperCase();
 
+  // Establish the request-scoped AsyncLocalStorage context.
+  // This makes cookies(), headers(), getPlatform() etc. available
+  // to server functions, middleware, API endpoints, and RSC rendering.
+  const __webRequest = nodeReqToWebRequest(req);
+  const __store = ssrEntry.createRequestStore(__webRequest, { req, res });
+  await ssrEntry.runWithRequestContext(__store, async () => {
+
+  // Helper: flush pending Set-Cookie headers and accumulated response
+  // headers from the request store onto the Node.js response object.
+  function __flushPendingHeaders() {
+    // Apply accumulated response headers
+    __store.responseHeaders.forEach(function(value, key) {
+      res.setHeader(key, value);
+    });
+    // Apply pending Set-Cookie headers
+    var cookies = [];
+    __store.pendingCookies.forEach(function(pending) {
+      cookies.push(pending.serialized);
+    });
+    if (cookies.length > 0) {
+      res.setHeader("Set-Cookie", cookies);
+    }
+  }
+
   try {
     // 1. Serve client assets from dist/client/ (immutable for hashed assets)
     // These have hashed filenames and never conflict with app routes.
@@ -308,13 +332,14 @@ ${options.headerPreset === "baseline"
         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 short-circuited — return its response directly
+            res.writeHead(mwResult.shortCircuit.status,
+              Object.fromEntries(mwResult.shortCircuit.headers));
+            __flushPendingHeaders();
+            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") {
@@ -323,6 +348,7 @@ ${options.headerPreset === "baseline"
       } catch (err) {
         console.error("Middleware error:", err);
         if (!res.headersSent) {
+          __flushPendingHeaders();
           res.writeHead(500);
           res.end("Internal Server Error");
         }
@@ -344,6 +370,7 @@ ${options.headerPreset === "baseline"
       try {
         // Enforce POST method for server function calls
         if (method !== "POST") {
+          __flushPendingHeaders();
           sendJson(res, 405, { error: "Method " + method + " not allowed, expected POST" });
           return;
         }
@@ -351,6 +378,7 @@ ${options.headerPreset === "baseline"
         // Enforce Content-Type: application/json
         const ct = (req.headers["content-type"] || "").toLowerCase();
         if (ct && !ct.startsWith("application/json")) {
+          __flushPendingHeaders();
           sendJson(res, 415, { error: "Unsupported Content-Type, expected application/json" });
           return;
         }
@@ -360,6 +388,7 @@ ${options.headerPreset === "baseline"
         if (origin) {
           const expected = \`http://\${HOST}:\${PORT}\`;
           if (origin !== expected && origin !== \`https://\${HOST}:\${PORT}\`) {
+            __flushPendingHeaders();
             sendJson(res, 403, { error: "Origin not allowed" });
             return;
           }
@@ -370,6 +399,7 @@ ${options.headerPreset === "baseline"
         try {
           parsed = body.length > 0 ? JSON.parse(body.toString("utf-8")) : undefined;
         } catch {
+          __flushPendingHeaders();
           sendJson(res, 400, { error: "Invalid JSON body" });
           return;
         }
@@ -378,6 +408,7 @@ ${options.headerPreset === "baseline"
           // Check if the result IS a ClientSafeError (returned, not thrown)
           if (__isClientSafeErrorLike(result.result)) {
             applyMiddlewareHeaders();
+            __flushPendingHeaders();
             sendJson(res, 200, {
               __clientSafeError: true,
               error: result.result.message,
@@ -387,9 +418,11 @@ ${options.headerPreset === "baseline"
             return;
           }
           applyMiddlewareHeaders();
+          __flushPendingHeaders();
           sendJson(res, 200, result.result);
           return;
         }
+        __flushPendingHeaders();
         sendJson(res, 404, { error: "Server function not found" });
       } catch (err) {
         // Always log full error server-side
@@ -397,12 +430,14 @@ ${options.headerPreset === "baseline"
 
         // RedirectError — send redirect envelope
         if (__isRedirectErrorLike(err)) {
+          __flushPendingHeaders();
           sendJson(res, 200, { __redirect: true, url: err.url, status: err.status });
           return;
         }
 
         // ClientSafeError — developer opted in, expose to client
         if (__isClientSafeErrorLike(err)) {
+          __flushPendingHeaders();
           sendJson(res, err.statusCode, { error: err.message, data: err.data });
           return;
         }
@@ -410,6 +445,7 @@ ${options.headerPreset === "baseline"
         // Default: sanitize — generic message with correlation hash
         const ref = __errorRef(err);
         console.error("[catmint] Error reference [ref: " + ref + "] — see above for full error");
+        __flushPendingHeaders();
         sendJson(res, 500, { error: "Internal Server Error [ref: " + ref + "]" });
       }
       return;
@@ -419,6 +455,7 @@ ${options.headerPreset === "baseline"
     if (pathname === "/__catmint/rsc" && method === "GET" && rscEntry.render) {
       const targetPath = url.searchParams.get("path");
       if (!targetPath) {
+        __flushPendingHeaders();
         res.setHeader("Content-Type", "application/json");
         res.writeHead(400);
         res.end(JSON.stringify({ error: "Missing ?path= parameter" }));
@@ -428,6 +465,7 @@ ${options.headerPreset === "baseline"
         const rscResult = await rscEntry.render(targetPath);
         if (rscResult) {
           applyMiddlewareHeaders();
+          __flushPendingHeaders();
           res.writeHead(200, {
             "Content-Type": "text/x-component; charset=utf-8",
             "Cache-Control": "no-cache, no-store, must-revalidate",
@@ -435,12 +473,14 @@ ${options.headerPreset === "baseline"
           await pipeWebStreamToResponse(rscResult.stream, res);
           return;
         }
+        __flushPendingHeaders();
         res.setHeader("Content-Type", "application/json");
         res.writeHead(404);
         res.end(JSON.stringify({ error: "No matching route" }));
       } catch (err) {
         console.error("RSC navigation error:", err);
         if (!res.headersSent) {
+          __flushPendingHeaders();
           res.setHeader("Content-Type", "application/json");
           res.writeHead(500);
           res.end(JSON.stringify({ error: "RSC navigation error" }));
@@ -476,6 +516,7 @@ ${options.headerPreset === "baseline"
           var epHeaders = Object.fromEntries(result.response.headers);
           res.writeHead(result.response.status, epHeaders);
           applyMiddlewareHeaders();
+          __flushPendingHeaders();
           if (result.response.body) {
             await pipeWebStreamToResponse(result.response.body, res);
           } else {
@@ -485,12 +526,14 @@ ${options.headerPreset === "baseline"
         }
 
         // Endpoint exists but method not handled
+        __flushPendingHeaders();
         res.writeHead(405, { "Content-Type": "text/plain" });
         res.end(\`Method \${method} not allowed\`);
         return;
       } catch (err) {
         console.error("Endpoint error:", err);
         if (!res.headersSent) {
+          __flushPendingHeaders();
           sendText(res, 500, "Internal Server Error");
         }
         return;
@@ -513,6 +556,7 @@ ${options.headerPreset === "baseline"
         if (prStats.isFile()) {
           const content = await readFile(prFilePath);
           applyMiddlewareHeaders();
+          __flushPendingHeaders();
           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");
@@ -532,6 +576,7 @@ ${options.headerPreset === "baseline"
         if (rscResult) {
           const htmlStream = await ssrEntry.renderToHtml(rscResult.stream, rscResult.headConfig);
           applyMiddlewareHeaders();
+          __flushPendingHeaders();
           res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
           await pipeWebStreamToResponse(htmlStream, res);
           return;
@@ -539,6 +584,7 @@ ${options.headerPreset === "baseline"
       } catch (err) {
         console.error("RSC render error:", err);
         if (!res.headersSent) {
+          __flushPendingHeaders();
           await sendStatusPage(res, 500, pathname);
         }
         return;
@@ -553,11 +599,15 @@ ${options.headerPreset === "baseline"
     }
 
     // 10. 404
+    __flushPendingHeaders();
     await sendStatusPage(res, 404, pathname);
   } catch (err) {
     console.error("Request error:", err);
+    __flushPendingHeaders();
     await sendStatusPage(res, 500, pathname);
   }
+
+  }); // end runWithRequestContext
 });
 
 server.listen(PORT, HOST, () => {

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;;;;;;;;;;;;mEAY0D,OAAO,CAAC,IAAI;mCAC5C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BA4IrC,OAAO,CAAC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgG3C,OAAO,CAAC,YAAY,KAAK,UAAU;QACjC,CAAC,CAAC;;;;CAIL;QACG,CAAC,CAAC,EACN;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4TC,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;;;;;;;;;;;;mEAY0D,OAAO,CAAC,IAAI;mCAC5C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BA4IrC,OAAO,CAAC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgG3C,OAAO,CAAC,YAAY,KAAK,UAAU;QACjC,CAAC,CAAC;;;;CAIL;QACG,CAAC,CAAC,EACN;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8WC,CAAC;AACF,CAAC"}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@catmint/adapter-node",
-  "version": "0.0.0-prealpha.13",
+  "version": "0.0.0-prealpha.15",
   "type": "module",
   "private": false,
-  "license": "MIT",
+  "license": "GPL-2.0",
   "files": [
     "dist"
   ],
@@ -14,7 +14,7 @@
     }
   },
   "dependencies": {
-    "catmint": "0.0.0-prealpha.13"
+    "catmint": "0.0.0-prealpha.15"
   },
   "devDependencies": {
     "typescript": "^5.7.0"