@marko/run 0.2.17 → 0.3.0

package/dist/adapter/index.js

@@ -10,6 +10,7 @@ import { createServer } from "vite";
 import * as webStream from "stream/web";
 import { webcrypto } from "crypto";
 import * as undici from "undici";
+import { ServerResponse } from "http";
 globalThis.crypto ?? (globalThis.crypto = webcrypto);
 globalThis.fetch ?? (globalThis.fetch = undici.fetch);
 globalThis.Response ?? (globalThis.Response = undici.Response);
@@ -20,51 +21,25 @@ globalThis.TransformStream ?? (globalThis.TransformStream = webStream.TransformS
 globalThis.WritableStream ?? (globalThis.WritableStream = webStream.WritableStream);
 globalThis.FormData ?? (globalThis.FormData = undici.FormData);
 globalThis.File ?? (globalThis.File = undici.File);
-
-// src/adapter/middleware.ts
-function getForwardedHeader(req, name) {
-  const value = req.headers["x-forwarded-" + name];
-  if (value) {
-    if (typeof value === "string") {
-      const index = value.indexOf(",");
-      return index < 0 ? value : value.slice(0, index);
-    }
-    return value[0];
-  }
-}
-function getOrigin(req, trustProxy) {
-  const protocol = req.protocol || trustProxy && getForwardedHeader(req, "proto") || (req.socket.encrypted ? "https" : "http");
-  let host = req.headers.host || trustProxy && getForwardedHeader(req, "host");
-  if (!host) {
-    if (process.env.NODE_ENV !== "production") {
-      host = "localhost";
-      console.warn(
-        `Could not automatically determine the origin host, using 'localhost'. Use the 'origin' option or the 'ORIGIN' environment variable to set the origin explicitly.`
-      );
-    } else {
-      throw new Error(
-        `Could not automatically determine the origin host. Use the 'origin' option or the 'ORIGIN' environment variable to set the origin explicitly.`
-      );
-    }
-  }
-  return `${protocol}://${host}`;
-}
-var inExpiresDateRgs = /Expires\s*=\s*(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*$/i;
-function setResponseHeaders(response, res) {
-  for (const [key, value] of response.headers) {
-    if (key !== "set-cookie") {
-      res.setHeader(key, value);
-    }
-  }
-  const setCookies = getSetCookie(response.headers);
-  if (setCookies == null ? void 0 : setCookies.length) {
-    res.setHeader("set-cookie", setCookies);
+var appendHeader = ServerResponse.prototype.appendHeader ? appendHeader_platform : appendHeader_fallback;
+function appendHeader_platform(response, name, value) {
+  response.appendHeader(name, value);
+}
+function appendHeader_fallback(response, name, value) {
+  const existing = response.getHeader(name);
+  if (existing === void 0) {
+    response.setHeader(name, value);
+  } else if (Array.isArray(existing)) {
+    response.setHeader(name, existing.concat(value));
+  } else {
+    response.setHeader(name, [String(existing)].concat(value));
   }
 }
 var getSetCookie = Headers.prototype.getSetCookie ? getSetCookie_platform : getSetCookie_fallback;
 function getSetCookie_platform(headers) {
   return headers.getSetCookie();
 }
+var inExpiresDateRgs = /Expires\s*=\s*(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*$/i;
 function getSetCookie_fallback(headers) {
   const value = headers.get("set-cookie");
   if (!value)
@@ -101,6 +76,46 @@ function getSetCookie_fallback(headers) {
   }
   return value;
 }
+
+// src/adapter/middleware.ts
+function getForwardedHeader(req, name) {
+  const value = req.headers["x-forwarded-" + name];
+  if (value) {
+    if (typeof value === "string") {
+      const index = value.indexOf(",");
+      return index < 0 ? value : value.slice(0, index);
+    }
+    return value[0];
+  }
+}
+function getOrigin(req, trustProxy) {
+  const protocol = req.protocol || trustProxy && getForwardedHeader(req, "proto") || (req.socket.encrypted ? "https" : "http");
+  let host = req.headers.host || trustProxy && getForwardedHeader(req, "host");
+  if (!host) {
+    if (process.env.NODE_ENV !== "production") {
+      host = "localhost";
+      console.warn(
+        `Could not automatically determine the origin host, using 'localhost'. Use the 'origin' option or the 'ORIGIN' environment variable to set the origin explicitly.`
+      );
+    } else {
+      throw new Error(
+        `Could not automatically determine the origin host. Use the 'origin' option or the 'ORIGIN' environment variable to set the origin explicitly.`
+      );
+    }
+  }
+  return `${protocol}://${host}`;
+}
+function copyResponseHeaders(response, headers) {
+  for (const [key, value] of headers) {
+    if (key !== "set-cookie") {
+      response.setHeader(key, value);
+    }
+  }
+  const setCookies = getSetCookie(headers);
+  if (setCookies == null ? void 0 : setCookies.length) {
+    appendHeader(response, "set-cookie", setCookies);
+  }
+}
 function createMiddleware(fetch2, options) {
   const {
     origin = process.env.ORIGIN,
@@ -137,9 +152,8 @@ function createMiddleware(fetch2, options) {
         console.error(signal.reason);
       }
     }
-    let setDevClientId;
     if (process.env.NODE_ENV !== "production" && globalThis.__marko_run_dev__ && ((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html"))) {
-      setDevClientId = globalThis.__marko_run_dev__.onClient((ws) => {
+      globalThis.__marko_run_dev__.onClient(res, (ws) => {
         if (signal.aborted) {
           sendError();
         } else {
@@ -183,11 +197,8 @@ function createMiddleware(fetch2, options) {
       }
       return;
     }
-    if (process.env.NODE_ENV !== "production" && setDevClientId) {
-      setDevClientId(response);
-    }
     res.statusCode = response.status;
-    setResponseHeaders(response, res);
+    copyResponseHeaders(res, response.headers);
     if (!response.body) {
       if (!response.headers.has("content-length")) {
         res.setHeader("content-length", "0");
@@ -313,7 +324,12 @@ function logger_default(_options = {}) {
       if (index < 10) {
         inFlight ^= bitMask;
       }
-      const contentLength = res.getHeader("content-length") || 0;
+      let contentLength = res.getHeader("content-length") || 0;
+      if (Array.isArray(contentLength)) {
+        contentLength = parseInt(contentLength[0], 10) || 0;
+      } else if (typeof contentLength === "string") {
+        contentLength = parseInt(contentLength, 10) || 0;
+      }
       logResponse(
         id,
         req,
@@ -449,7 +465,12 @@ async function createDevServer(config2) {
           }
         } else {
           res.statusCode = 500;
-          res.end(inspect(err).replace(/([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g, ""));
+          res.end(
+            inspect(err).replace(
+              /([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g,
+              ""
+            )
+          );
         }
       } else {
         next == null ? void 0 : next();
@@ -512,7 +533,7 @@ function getDevGlobal() {
           devServer.close();
         }
       },
-      onClient(callback) {
+      onClient(res, callback) {
         const expires = Date.now() + 1e3;
         const id = Math.floor(Math.random() * expires).toString(36);
         callbacks.push({
@@ -520,12 +541,10 @@ function getDevGlobal() {
           expires,
           callback
         });
-        return (response) => {
-          response.headers.append(
-            "set-cookie",
-            `${ClientIdCookieName}=${id}; Path=/; Max-Age=100; HttpOnly`
-          );
-        };
+        res.setHeader(
+          "set-cookie",
+          `${ClientIdCookieName}=${id}; Path=/; Max-Age=100; HttpOnly`
+        );
       }
     };
   }
@@ -539,7 +558,7 @@ function logInfoBox(address, explorer) {
   const color = !!supporsColor.stdout;
   let message = kleur2.bold("Marko Run");
   if (true) {
-    message += ` v${"0.2.17"}`;
+    message += ` v${"0.3.0"}`;
   }
   message += "\n\n";
   message += kleur2.dim("Server listening at");

package/dist/adapter/middleware.cjs

@@ -30,10 +30,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/adapter/middleware.ts
 var middleware_exports = {};
 __export(middleware_exports, {
+  copyResponseHeaders: () => copyResponseHeaders,
   createMiddleware: () => createMiddleware,
-  getOrigin: () => getOrigin,
-  getSetCookie_fallback: () => getSetCookie_fallback,
-  setResponseHeaders: () => setResponseHeaders
+  getOrigin: () => getOrigin
 });
 module.exports = __toCommonJS(middleware_exports);
 
@@ -45,6 +44,7 @@ var __importMetaURL = (0, import_url.pathToFileURL)(__filename);
 var webStream = __toESM(require("stream/web"), 1);
 var import_crypto = require("crypto");
 var undici = __toESM(require("undici"), 1);
+var import_http = require("http");
 globalThis.crypto ?? (globalThis.crypto = import_crypto.webcrypto);
 globalThis.fetch ?? (globalThis.fetch = undici.fetch);
 globalThis.Response ?? (globalThis.Response = undici.Response);
@@ -55,51 +55,25 @@ globalThis.TransformStream ?? (globalThis.TransformStream = webStream.TransformS
 globalThis.WritableStream ?? (globalThis.WritableStream = webStream.WritableStream);
 globalThis.FormData ?? (globalThis.FormData = undici.FormData);
 globalThis.File ?? (globalThis.File = undici.File);
-
-// src/adapter/middleware.ts
-function getForwardedHeader(req, name) {
-  const value = req.headers["x-forwarded-" + name];
-  if (value) {
-    if (typeof value === "string") {
-      const index = value.indexOf(",");
-      return index < 0 ? value : value.slice(0, index);
-    }
-    return value[0];
-  }
+var appendHeader = import_http.ServerResponse.prototype.appendHeader ? appendHeader_platform : appendHeader_fallback;
+function appendHeader_platform(response, name, value) {
+  response.appendHeader(name, value);
 }
-function getOrigin(req, trustProxy) {
-  const protocol = req.protocol || trustProxy && getForwardedHeader(req, "proto") || (req.socket.encrypted ? "https" : "http");
-  let host = req.headers.host || trustProxy && getForwardedHeader(req, "host");
-  if (!host) {
-    if (process.env.NODE_ENV !== "production") {
-      host = "localhost";
-      console.warn(
-        `Could not automatically determine the origin host, using 'localhost'. Use the 'origin' option or the 'ORIGIN' environment variable to set the origin explicitly.`
-      );
-    } else {
-      throw new Error(
-        `Could not automatically determine the origin host. Use the 'origin' option or the 'ORIGIN' environment variable to set the origin explicitly.`
-      );
-    }
-  }
-  return `${protocol}://${host}`;
-}
-var inExpiresDateRgs = /Expires\s*=\s*(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*$/i;
-function setResponseHeaders(response, res) {
-  for (const [key, value] of response.headers) {
-    if (key !== "set-cookie") {
-      res.setHeader(key, value);
-    }
-  }
-  const setCookies = getSetCookie(response.headers);
-  if (setCookies == null ? void 0 : setCookies.length) {
-    res.setHeader("set-cookie", setCookies);
+function appendHeader_fallback(response, name, value) {
+  const existing = response.getHeader(name);
+  if (existing === void 0) {
+    response.setHeader(name, value);
+  } else if (Array.isArray(existing)) {
+    response.setHeader(name, existing.concat(value));
+  } else {
+    response.setHeader(name, [String(existing)].concat(value));
   }
 }
 var getSetCookie = Headers.prototype.getSetCookie ? getSetCookie_platform : getSetCookie_fallback;
 function getSetCookie_platform(headers) {
   return headers.getSetCookie();
 }
+var inExpiresDateRgs = /Expires\s*=\s*(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*$/i;
 function getSetCookie_fallback(headers) {
   const value = headers.get("set-cookie");
   if (!value)
@@ -136,6 +110,46 @@ function getSetCookie_fallback(headers) {
   }
   return value;
 }
+
+// src/adapter/middleware.ts
+function getForwardedHeader(req, name) {
+  const value = req.headers["x-forwarded-" + name];
+  if (value) {
+    if (typeof value === "string") {
+      const index = value.indexOf(",");
+      return index < 0 ? value : value.slice(0, index);
+    }
+    return value[0];
+  }
+}
+function getOrigin(req, trustProxy) {
+  const protocol = req.protocol || trustProxy && getForwardedHeader(req, "proto") || (req.socket.encrypted ? "https" : "http");
+  let host = req.headers.host || trustProxy && getForwardedHeader(req, "host");
+  if (!host) {
+    if (process.env.NODE_ENV !== "production") {
+      host = "localhost";
+      console.warn(
+        `Could not automatically determine the origin host, using 'localhost'. Use the 'origin' option or the 'ORIGIN' environment variable to set the origin explicitly.`
+      );
+    } else {
+      throw new Error(
+        `Could not automatically determine the origin host. Use the 'origin' option or the 'ORIGIN' environment variable to set the origin explicitly.`
+      );
+    }
+  }
+  return `${protocol}://${host}`;
+}
+function copyResponseHeaders(response, headers) {
+  for (const [key, value] of headers) {
+    if (key !== "set-cookie") {
+      response.setHeader(key, value);
+    }
+  }
+  const setCookies = getSetCookie(headers);
+  if (setCookies == null ? void 0 : setCookies.length) {
+    appendHeader(response, "set-cookie", setCookies);
+  }
+}
 function createMiddleware(fetch2, options) {
   const {
     origin = process.env.ORIGIN,
@@ -172,9 +186,8 @@ function createMiddleware(fetch2, options) {
         console.error(signal.reason);
       }
     }
-    let setDevClientId;
     if (process.env.NODE_ENV !== "production" && globalThis.__marko_run_dev__ && ((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html"))) {
-      setDevClientId = globalThis.__marko_run_dev__.onClient((ws) => {
+      globalThis.__marko_run_dev__.onClient(res, (ws) => {
         if (signal.aborted) {
           sendError();
         } else {
@@ -218,11 +231,8 @@ function createMiddleware(fetch2, options) {
       }
       return;
     }
-    if (process.env.NODE_ENV !== "production" && setDevClientId) {
-      setDevClientId(response);
-    }
     res.statusCode = response.status;
-    setResponseHeaders(response, res);
+    copyResponseHeaders(res, response.headers);
     if (!response.body) {
       if (!response.headers.has("content-length")) {
         res.setHeader("content-length", "0");
@@ -265,8 +275,7 @@ var bodyConsumedErrorStream = new ReadableStream({
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  copyResponseHeaders,
   createMiddleware,
-  getOrigin,
-  getSetCookie_fallback,
-  setResponseHeaders
+  getOrigin
 });

package/dist/adapter/middleware.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
-import "./polyfill";
 import type { Fetch, Platform } from "../runtime";
-import type { IncomingMessage, ServerResponse, OutgoingMessage } from "http";
+import { IncomingMessage, ServerResponse } from "http";
 export interface NodePlatformInfo {
     request: IncomingMessage;
     response: ServerResponse;
@@ -33,8 +32,7 @@ export interface NodeMiddlewareOptions {
     createPlatform?(platform: NodePlatformInfo): Platform & NodePlatformInfo;
 }
 export declare function getOrigin(req: IncomingMessage, trustProxy?: boolean): string;
-export declare function setResponseHeaders(response: Response, res: OutgoingMessage): void;
-export declare function getSetCookie_fallback(headers: Headers): string | string[] | undefined;
+export declare function copyResponseHeaders(response: ServerResponse, headers: Headers): void;
 /**
  * Creates a request handler to be passed to http.createServer() or used as a
  * middleware in Connect-style frameworks like Express.

package/dist/adapter/middleware.js

@@ -2,6 +2,7 @@
 import * as webStream from "stream/web";
 import { webcrypto } from "crypto";
 import * as undici from "undici";
+import { ServerResponse } from "http";
 globalThis.crypto ?? (globalThis.crypto = webcrypto);
 globalThis.fetch ?? (globalThis.fetch = undici.fetch);
 globalThis.Response ?? (globalThis.Response = undici.Response);
@@ -12,51 +13,25 @@ globalThis.TransformStream ?? (globalThis.TransformStream = webStream.TransformS
 globalThis.WritableStream ?? (globalThis.WritableStream = webStream.WritableStream);
 globalThis.FormData ?? (globalThis.FormData = undici.FormData);
 globalThis.File ?? (globalThis.File = undici.File);
-
-// src/adapter/middleware.ts
-function getForwardedHeader(req, name) {
-  const value = req.headers["x-forwarded-" + name];
-  if (value) {
-    if (typeof value === "string") {
-      const index = value.indexOf(",");
-      return index < 0 ? value : value.slice(0, index);
-    }
-    return value[0];
-  }
+var appendHeader = ServerResponse.prototype.appendHeader ? appendHeader_platform : appendHeader_fallback;
+function appendHeader_platform(response, name, value) {
+  response.appendHeader(name, value);
 }
-function getOrigin(req, trustProxy) {
-  const protocol = req.protocol || trustProxy && getForwardedHeader(req, "proto") || (req.socket.encrypted ? "https" : "http");
-  let host = req.headers.host || trustProxy && getForwardedHeader(req, "host");
-  if (!host) {
-    if (process.env.NODE_ENV !== "production") {
-      host = "localhost";
-      console.warn(
-        `Could not automatically determine the origin host, using 'localhost'. Use the 'origin' option or the 'ORIGIN' environment variable to set the origin explicitly.`
-      );
-    } else {
-      throw new Error(
-        `Could not automatically determine the origin host. Use the 'origin' option or the 'ORIGIN' environment variable to set the origin explicitly.`
-      );
-    }
-  }
-  return `${protocol}://${host}`;
-}
-var inExpiresDateRgs = /Expires\s*=\s*(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*$/i;
-function setResponseHeaders(response, res) {
-  for (const [key, value] of response.headers) {
-    if (key !== "set-cookie") {
-      res.setHeader(key, value);
-    }
-  }
-  const setCookies = getSetCookie(response.headers);
-  if (setCookies == null ? void 0 : setCookies.length) {
-    res.setHeader("set-cookie", setCookies);
+function appendHeader_fallback(response, name, value) {
+  const existing = response.getHeader(name);
+  if (existing === void 0) {
+    response.setHeader(name, value);
+  } else if (Array.isArray(existing)) {
+    response.setHeader(name, existing.concat(value));
+  } else {
+    response.setHeader(name, [String(existing)].concat(value));
   }
 }
 var getSetCookie = Headers.prototype.getSetCookie ? getSetCookie_platform : getSetCookie_fallback;
 function getSetCookie_platform(headers) {
   return headers.getSetCookie();
 }
+var inExpiresDateRgs = /Expires\s*=\s*(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*$/i;
 function getSetCookie_fallback(headers) {
   const value = headers.get("set-cookie");
   if (!value)
@@ -93,6 +68,46 @@ function getSetCookie_fallback(headers) {
   }
   return value;
 }
+
+// src/adapter/middleware.ts
+function getForwardedHeader(req, name) {
+  const value = req.headers["x-forwarded-" + name];
+  if (value) {
+    if (typeof value === "string") {
+      const index = value.indexOf(",");
+      return index < 0 ? value : value.slice(0, index);
+    }
+    return value[0];
+  }
+}
+function getOrigin(req, trustProxy) {
+  const protocol = req.protocol || trustProxy && getForwardedHeader(req, "proto") || (req.socket.encrypted ? "https" : "http");
+  let host = req.headers.host || trustProxy && getForwardedHeader(req, "host");
+  if (!host) {
+    if (process.env.NODE_ENV !== "production") {
+      host = "localhost";
+      console.warn(
+        `Could not automatically determine the origin host, using 'localhost'. Use the 'origin' option or the 'ORIGIN' environment variable to set the origin explicitly.`
+      );
+    } else {
+      throw new Error(
+        `Could not automatically determine the origin host. Use the 'origin' option or the 'ORIGIN' environment variable to set the origin explicitly.`
+      );
+    }
+  }
+  return `${protocol}://${host}`;
+}
+function copyResponseHeaders(response, headers) {
+  for (const [key, value] of headers) {
+    if (key !== "set-cookie") {
+      response.setHeader(key, value);
+    }
+  }
+  const setCookies = getSetCookie(headers);
+  if (setCookies == null ? void 0 : setCookies.length) {
+    appendHeader(response, "set-cookie", setCookies);
+  }
+}
 function createMiddleware(fetch2, options) {
   const {
     origin = process.env.ORIGIN,
@@ -129,9 +144,8 @@ function createMiddleware(fetch2, options) {
         console.error(signal.reason);
       }
     }
-    let setDevClientId;
     if (process.env.NODE_ENV !== "production" && globalThis.__marko_run_dev__ && ((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html"))) {
-      setDevClientId = globalThis.__marko_run_dev__.onClient((ws) => {
+      globalThis.__marko_run_dev__.onClient(res, (ws) => {
         if (signal.aborted) {
           sendError();
         } else {
@@ -175,11 +189,8 @@ function createMiddleware(fetch2, options) {
       }
       return;
     }
-    if (process.env.NODE_ENV !== "production" && setDevClientId) {
-      setDevClientId(response);
-    }
     res.statusCode = response.status;
-    setResponseHeaders(response, res);
+    copyResponseHeaders(res, response.headers);
     if (!response.body) {
       if (!response.headers.has("content-length")) {
         res.setHeader("content-length", "0");
@@ -221,8 +232,7 @@ var bodyConsumedErrorStream = new ReadableStream({
   }
 });
 export {
+  copyResponseHeaders,
   createMiddleware,
-  getOrigin,
-  getSetCookie_fallback,
-  setResponseHeaders
+  getOrigin
 };

package/dist/adapter/polyfill.d.ts

@@ -1,6 +1,12 @@
+/// <reference types="node" />
+import { ServerResponse } from 'http';
 declare global {
     interface Headers {
         getSetCookie: () => string[];
     }
 }
+export declare const appendHeader: typeof appendHeader_platform;
+declare function appendHeader_platform(response: ServerResponse, name: string, value: string | readonly string[]): void;
+export declare const getSetCookie: typeof getSetCookie_fallback;
+export declare function getSetCookie_fallback(headers: Headers): string | string[] | undefined;
 export {};