@marko/run 0.5.17 → 0.6.0

package/dist/adapter/middleware.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/adapter/middleware.ts
@@ -42,76 +32,6 @@ var __importMetaURL = (0, import_url.pathToFileURL)(__filename);
 
 // src/adapter/middleware.ts
 var import_node_stream = require("node:stream");
-
-// src/adapter/polyfill.ts
-var import_crypto = require("crypto");
-var import_http = require("http");
-var webStream = __toESM(require("stream/web"), 1);
-var undici = __toESM(require("undici"), 1);
-globalThis.crypto ?? (globalThis.crypto = import_crypto.webcrypto);
-globalThis.fetch ?? (globalThis.fetch = undici.fetch);
-globalThis.Response ?? (globalThis.Response = undici.Response);
-globalThis.Request ?? (globalThis.Request = undici.Request);
-globalThis.Headers ?? (globalThis.Headers = undici.Headers);
-globalThis.ReadableStream ?? (globalThis.ReadableStream = webStream.ReadableStream);
-globalThis.TransformStream ?? (globalThis.TransformStream = webStream.TransformStream);
-globalThis.WritableStream ?? (globalThis.WritableStream = webStream.WritableStream);
-globalThis.FormData ?? (globalThis.FormData = undici.FormData);
-globalThis.File ?? (globalThis.File = undici.File);
-var appendHeader = import_http.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) return void 0;
-  let sepIndex = value.indexOf(",") + 1;
-  if (!sepIndex) return value;
-  let index = 0;
-  let setCookie = void 0;
-  let setCookies = void 0;
-  do {
-    const valuePart = value.slice(index, sepIndex - 1);
-    if (!inExpiresDateRgs.test(valuePart)) {
-      if (setCookies) {
-        setCookies.push(valuePart);
-      } else if (setCookie) {
-        setCookies = [setCookie, valuePart];
-      } else {
-        setCookie = valuePart;
-      }
-      index = sepIndex;
-      while (value.charCodeAt(index) === 32) index++;
-    }
-    sepIndex = value.indexOf(",", sepIndex) + 1;
-  } while (sepIndex);
-  if (index) {
-    const valuePart = value.slice(index);
-    if (setCookies) {
-      setCookies.push(valuePart);
-      return setCookies;
-    }
-    return [setCookie, valuePart];
-  }
-  return value;
-}
-
-// src/adapter/middleware.ts
 function getForwardedHeader(req, name) {
   const value = req.headers["x-forwarded-" + name];
   if (value) {
@@ -126,7 +46,7 @@ function getOrigin(req, trustProxy) {
   const protocol = trustProxy && getForwardedHeader(req, "proto") || req.socket.encrypted && "https" || req.protocol || "http";
   let host = trustProxy && getForwardedHeader(req, "host") || req.headers.host;
   if (!host) {
-    if (process.env.NODE_ENV !== "production") {
+    if (!process.env.NODE_ENV || process.env.NODE_ENV === "development") {
       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.`
@@ -145,147 +65,95 @@ function copyResponseHeaders(response, headers) {
       response.setHeader(key, value);
     }
   }
-  const setCookies = getSetCookie(headers);
+  const setCookies = headers.getSetCookie();
   if (setCookies == null ? void 0 : setCookies.length) {
-    appendHeader(response, "set-cookie", setCookies);
+    response.appendHeader("set-cookie", setCookies);
   }
 }
-function normalizeError(error) {
-  if (error.cause && !error.message) {
-    error.message = error.cause.message;
-    error.stack || (error.stack = error.cause.stack);
-  }
-  return error;
-}
-function createMiddleware(fetch2, options) {
+function createMiddleware(fetch, options) {
   const {
     origin = process.env.ORIGIN,
     trustProxy = process.env.TRUST_PROXY === "1",
     createPlatform = (platform) => platform
   } = options ?? (options = {});
   return async (req, res, next) => {
-    var _a;
-    const controller = new AbortController();
-    const { signal } = controller;
-    const url = new URL(req.url, origin || getOrigin(req, trustProxy));
-    req.on("error", onErrorOrClose);
-    req.socket.on("error", onErrorOrClose);
-    res.on("error", onErrorOrClose);
-    res.on("close", onErrorOrClose);
-    signal.addEventListener("abort", onSignalAborted);
-    function onErrorOrClose(err) {
-      req.off("error", onErrorOrClose);
-      req.socket.off("error", onErrorOrClose);
-      res.off("error", onErrorOrClose);
-      res.off("close", onErrorOrClose);
-      if (err) {
-        signal.removeEventListener("abort", onSignalAborted);
-        controller.abort(err);
+    var _a, _b, _c, _d;
+    try {
+      if ((!process.env.NODE_ENV || process.env.NODE_ENV === "development") && globalThis.__marko_run_dev__ && ((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html"))) {
+        var devWebSocket;
+        globalThis.__marko_run_dev__.onClient(res, (ws) => {
+          devWebSocket = ws;
+        });
       }
-    }
-    function onSignalAborted() {
-      const error = normalizeError(signal.reason);
-      if (next) {
-        next(error);
-      } else {
-        if (!res.destroyed && res.socket) {
-          res.socket.destroySoon();
-        }
-        console.error(error);
+      let body;
+      switch (req.method) {
+        case "POST":
+        case "PUT":
+        case "PATCH":
+          if (import_node_stream.Readable.isDisturbed(req)) {
+            body = bodyConsumedErrorStream;
+          } else {
+            body = req;
+          }
+          break;
       }
-    }
-    if (process.env.NODE_ENV !== "production" && globalThis.__marko_run_dev__ && ((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html"))) {
-      globalThis.__marko_run_dev__.onClient(res, (ws) => {
-        if (signal.aborted) {
-          sendError();
-        } else {
-          signal.addEventListener("abort", sendError);
-        }
-        function sendError() {
-          const { message, stack = "" } = normalizeError(signal.reason);
-          ws.send(
-            JSON.stringify({
-              type: "error",
-              err: { message, stack }
-            })
-          );
-        }
+      const url = new URL(req.url, origin || getOrigin(req, trustProxy));
+      const request = new Request(url, {
+        method: req.method,
+        headers: req.headers,
+        body,
+        // @ts-expect-error: Node requires this for streams
+        duplex: "half"
       });
-    }
-    let body;
-    switch (req.method) {
-      case "POST":
-      case "PUT":
-      case "PATCH":
-        if (import_node_stream.Readable.isDisturbed(req)) {
-          body = bodyConsumedErrorStream;
-        } else {
-          body = req;
+      const platform = createPlatform({
+        request: req,
+        response: res
+      });
+      const response = await fetch(request, platform);
+      if (res.destroyed || res.headersSent) {
+        return;
+      }
+      if (response) {
+        res.statusCode = response.status;
+        copyResponseHeaders(res, response.headers);
+        if (response.body) {
+          for await (const chunk of response.body) {
+            if (res.destroyed) return;
+            res.write(chunk);
+            (_b = res.flush) == null ? void 0 : _b.call(res);
+          }
+        } else if (!response.headers.has("content-length")) {
+          res.setHeader("content-length", "0");
         }
-        break;
-    }
-    const request = new Request(url, {
-      method: req.method,
-      headers: req.headers,
-      body,
-      // @ts-expect-error: Node requires this for streams
-      duplex: "half",
-      signal
-    });
-    const platform = createPlatform({
-      request: req,
-      response: res
-    });
-    let response;
-    try {
-      response = await fetch2(request, platform);
-    } catch (err) {
-      normalizeError(err);
-      if (next) {
-        next(err);
+        res.end();
+      } else if (next) {
+        next();
       } else {
-        console.error(err);
+        (_c = res.socket) == null ? void 0 : _c.destroySoon();
       }
-      return;
-    }
-    if (!response) {
-      if (next) {
-        next();
+    } catch (err) {
+      const error = err;
+      if (!process.env.NODE_ENV || process.env.NODE_ENV === "development") {
+        if (error.cause && !error.message) {
+          error.message = error.cause.message;
+          error.stack || (error.stack = error.cause.stack);
+        }
+        devWebSocket == null ? void 0 : devWebSocket.send(
+          JSON.stringify({
+            type: "error",
+            error: { message: error.message, stack: error.stack }
+          })
+        );
       }
-      return;
-    }
-    res.statusCode = response.status;
-    copyResponseHeaders(res, response.headers);
-    if (!response.body) {
-      if (!response.headers.has("content-length")) {
-        res.setHeader("content-length", "0");
+      if (next) {
+        next(error);
+      } else {
+        (_d = res.socket) == null ? void 0 : _d.destroySoon();
+        console.error(error);
       }
-      res.end();
-      return;
-    } else if (res.destroyed) {
-      controller.abort(new Error("Response stream destroyed"));
-      return;
     }
-    writeResponse(response.body.getReader(), res, controller);
   };
 }
-async function writeResponse(reader, res, controller) {
-  try {
-    while (!controller.signal.aborted) {
-      const { done, value } = await reader.read();
-      if (done) {
-        res.end();
-        return;
-      }
-      res.write(value);
-      if (res.flush) {
-        res.flush();
-      }
-    }
-  } catch (err) {
-    controller.abort(err);
-  }
-}
 var bodyConsumedErrorStream = new ReadableStream({
   pull(controller) {
     controller.error(

package/dist/adapter/middleware.js

@@ -1,75 +1,5 @@
 // src/adapter/middleware.ts
 import { Readable } from "node:stream";
-
-// src/adapter/polyfill.ts
-import { webcrypto } from "crypto";
-import { ServerResponse } from "http";
-import * as webStream from "stream/web";
-import * as undici from "undici";
-globalThis.crypto ?? (globalThis.crypto = webcrypto);
-globalThis.fetch ?? (globalThis.fetch = undici.fetch);
-globalThis.Response ?? (globalThis.Response = undici.Response);
-globalThis.Request ?? (globalThis.Request = undici.Request);
-globalThis.Headers ?? (globalThis.Headers = undici.Headers);
-globalThis.ReadableStream ?? (globalThis.ReadableStream = webStream.ReadableStream);
-globalThis.TransformStream ?? (globalThis.TransformStream = webStream.TransformStream);
-globalThis.WritableStream ?? (globalThis.WritableStream = webStream.WritableStream);
-globalThis.FormData ?? (globalThis.FormData = undici.FormData);
-globalThis.File ?? (globalThis.File = undici.File);
-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) return void 0;
-  let sepIndex = value.indexOf(",") + 1;
-  if (!sepIndex) return value;
-  let index = 0;
-  let setCookie = void 0;
-  let setCookies = void 0;
-  do {
-    const valuePart = value.slice(index, sepIndex - 1);
-    if (!inExpiresDateRgs.test(valuePart)) {
-      if (setCookies) {
-        setCookies.push(valuePart);
-      } else if (setCookie) {
-        setCookies = [setCookie, valuePart];
-      } else {
-        setCookie = valuePart;
-      }
-      index = sepIndex;
-      while (value.charCodeAt(index) === 32) index++;
-    }
-    sepIndex = value.indexOf(",", sepIndex) + 1;
-  } while (sepIndex);
-  if (index) {
-    const valuePart = value.slice(index);
-    if (setCookies) {
-      setCookies.push(valuePart);
-      return setCookies;
-    }
-    return [setCookie, valuePart];
-  }
-  return value;
-}
-
-// src/adapter/middleware.ts
 function getForwardedHeader(req, name) {
   const value = req.headers["x-forwarded-" + name];
   if (value) {
@@ -84,7 +14,7 @@ function getOrigin(req, trustProxy) {
   const protocol = trustProxy && getForwardedHeader(req, "proto") || req.socket.encrypted && "https" || req.protocol || "http";
   let host = trustProxy && getForwardedHeader(req, "host") || req.headers.host;
   if (!host) {
-    if (process.env.NODE_ENV !== "production") {
+    if (!process.env.NODE_ENV || process.env.NODE_ENV === "development") {
       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.`
@@ -103,147 +33,95 @@ function copyResponseHeaders(response, headers) {
       response.setHeader(key, value);
     }
   }
-  const setCookies = getSetCookie(headers);
+  const setCookies = headers.getSetCookie();
   if (setCookies == null ? void 0 : setCookies.length) {
-    appendHeader(response, "set-cookie", setCookies);
-  }
-}
-function normalizeError(error) {
-  if (error.cause && !error.message) {
-    error.message = error.cause.message;
-    error.stack || (error.stack = error.cause.stack);
+    response.appendHeader("set-cookie", setCookies);
   }
-  return error;
 }
-function createMiddleware(fetch2, options) {
+function createMiddleware(fetch, options) {
   const {
     origin = process.env.ORIGIN,
     trustProxy = process.env.TRUST_PROXY === "1",
     createPlatform = (platform) => platform
   } = options ?? (options = {});
   return async (req, res, next) => {
-    var _a;
-    const controller = new AbortController();
-    const { signal } = controller;
-    const url = new URL(req.url, origin || getOrigin(req, trustProxy));
-    req.on("error", onErrorOrClose);
-    req.socket.on("error", onErrorOrClose);
-    res.on("error", onErrorOrClose);
-    res.on("close", onErrorOrClose);
-    signal.addEventListener("abort", onSignalAborted);
-    function onErrorOrClose(err) {
-      req.off("error", onErrorOrClose);
-      req.socket.off("error", onErrorOrClose);
-      res.off("error", onErrorOrClose);
-      res.off("close", onErrorOrClose);
-      if (err) {
-        signal.removeEventListener("abort", onSignalAborted);
-        controller.abort(err);
+    var _a, _b, _c, _d;
+    try {
+      if ((!process.env.NODE_ENV || process.env.NODE_ENV === "development") && globalThis.__marko_run_dev__ && ((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html"))) {
+        var devWebSocket;
+        globalThis.__marko_run_dev__.onClient(res, (ws) => {
+          devWebSocket = ws;
+        });
       }
-    }
-    function onSignalAborted() {
-      const error = normalizeError(signal.reason);
-      if (next) {
-        next(error);
-      } else {
-        if (!res.destroyed && res.socket) {
-          res.socket.destroySoon();
-        }
-        console.error(error);
+      let body;
+      switch (req.method) {
+        case "POST":
+        case "PUT":
+        case "PATCH":
+          if (Readable.isDisturbed(req)) {
+            body = bodyConsumedErrorStream;
+          } else {
+            body = req;
+          }
+          break;
       }
-    }
-    if (process.env.NODE_ENV !== "production" && globalThis.__marko_run_dev__ && ((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html"))) {
-      globalThis.__marko_run_dev__.onClient(res, (ws) => {
-        if (signal.aborted) {
-          sendError();
-        } else {
-          signal.addEventListener("abort", sendError);
-        }
-        function sendError() {
-          const { message, stack = "" } = normalizeError(signal.reason);
-          ws.send(
-            JSON.stringify({
-              type: "error",
-              err: { message, stack }
-            })
-          );
-        }
+      const url = new URL(req.url, origin || getOrigin(req, trustProxy));
+      const request = new Request(url, {
+        method: req.method,
+        headers: req.headers,
+        body,
+        // @ts-expect-error: Node requires this for streams
+        duplex: "half"
       });
-    }
-    let body;
-    switch (req.method) {
-      case "POST":
-      case "PUT":
-      case "PATCH":
-        if (Readable.isDisturbed(req)) {
-          body = bodyConsumedErrorStream;
-        } else {
-          body = req;
+      const platform = createPlatform({
+        request: req,
+        response: res
+      });
+      const response = await fetch(request, platform);
+      if (res.destroyed || res.headersSent) {
+        return;
+      }
+      if (response) {
+        res.statusCode = response.status;
+        copyResponseHeaders(res, response.headers);
+        if (response.body) {
+          for await (const chunk of response.body) {
+            if (res.destroyed) return;
+            res.write(chunk);
+            (_b = res.flush) == null ? void 0 : _b.call(res);
+          }
+        } else if (!response.headers.has("content-length")) {
+          res.setHeader("content-length", "0");
         }
-        break;
-    }
-    const request = new Request(url, {
-      method: req.method,
-      headers: req.headers,
-      body,
-      // @ts-expect-error: Node requires this for streams
-      duplex: "half",
-      signal
-    });
-    const platform = createPlatform({
-      request: req,
-      response: res
-    });
-    let response;
-    try {
-      response = await fetch2(request, platform);
-    } catch (err) {
-      normalizeError(err);
-      if (next) {
-        next(err);
+        res.end();
+      } else if (next) {
+        next();
       } else {
-        console.error(err);
+        (_c = res.socket) == null ? void 0 : _c.destroySoon();
       }
-      return;
-    }
-    if (!response) {
-      if (next) {
-        next();
+    } catch (err) {
+      const error = err;
+      if (!process.env.NODE_ENV || process.env.NODE_ENV === "development") {
+        if (error.cause && !error.message) {
+          error.message = error.cause.message;
+          error.stack || (error.stack = error.cause.stack);
+        }
+        devWebSocket == null ? void 0 : devWebSocket.send(
+          JSON.stringify({
+            type: "error",
+            error: { message: error.message, stack: error.stack }
+          })
+        );
       }
-      return;
-    }
-    res.statusCode = response.status;
-    copyResponseHeaders(res, response.headers);
-    if (!response.body) {
-      if (!response.headers.has("content-length")) {
-        res.setHeader("content-length", "0");
+      if (next) {
+        next(error);
+      } else {
+        (_d = res.socket) == null ? void 0 : _d.destroySoon();
+        console.error(error);
       }
-      res.end();
-      return;
-    } else if (res.destroyed) {
-      controller.abort(new Error("Response stream destroyed"));
-      return;
     }
-    writeResponse(response.body.getReader(), res, controller);
   };
 }
-async function writeResponse(reader, res, controller) {
-  try {
-    while (!controller.signal.aborted) {
-      const { done, value } = await reader.read();
-      if (done) {
-        res.end();
-        return;
-      }
-      res.write(value);
-      if (res.flush) {
-        res.flush();
-      }
-    }
-  } catch (err) {
-    controller.abort(err);
-  }
-}
 var bodyConsumedErrorStream = new ReadableStream({
   pull(controller) {
     controller.error(