@marko/run 0.2.6 → 0.2.8

package/dist/adapter/middleware.cjs

@@ -18,6 +18,10 @@ 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
 ));
@@ -132,95 +136,74 @@ function getSetCookie_fallback(headers) {
   }
   return value;
 }
-var HRMClientIdCookieName = "hmr-client-id";
-function getHMRClientId(req) {
-  if (req.headers.cookie) {
-    const cookie = req.headers.cookie.split(/;\s+/).find((c) => c.startsWith(HRMClientIdCookieName));
-    if (cookie) {
-      return cookie.slice(HRMClientIdCookieName.length + 1);
-    }
-  }
-}
 function createMiddleware(fetch2, options = {}) {
   const {
     origin = process.env.ORIGIN,
-    trustProxy = process.env.TRUST_PROXY === "1",
-    devServer
+    trustProxy = process.env.TRUST_PROXY === "1"
   } = options;
-  let hmrCallbacks;
-  if (process.env.NODE_ENV !== "production" && devServer) {
-    hmrCallbacks = [];
-    devServer.ws.on("connection", (ws, req) => {
-      if (hmrCallbacks == null ? void 0 : hmrCallbacks.length) {
-        const id = getHMRClientId(req);
-        const now = Date.now();
-        const nextHMRCallbacks = [];
-        for (const entry of hmrCallbacks) {
-          if (entry.id === id) {
-            entry.callback(ws);
-          } else if (entry.expires > now) {
-            nextHMRCallbacks.push(entry);
-          }
-        }
-        hmrCallbacks = nextHMRCallbacks;
-      }
-    });
-  }
   return async (req, res, next) => {
     var _a;
     const controller = new AbortController();
     const { signal } = controller;
     const url = new URL(req.url, origin || getOrigin(req, trustProxy));
     const ip = req.ip || trustProxy && getForwardedHeader(req, "for") || req.socket.remoteAddress || "";
-    const headers = req.headers;
     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);
       }
     }
-    let hmrId;
-    if (process.env.NODE_ENV !== "production" && hmrCallbacks && ((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html"))) {
-      const expires = Date.now() + 1e3;
-      hmrId = Math.floor(Math.random() * expires).toString(36);
-      hmrCallbacks.push({
-        id: hmrId,
-        expires,
-        callback(ws) {
-          if (signal.aborted) {
-            sendError();
-          } else {
-            signal.addEventListener("abort", sendError);
-          }
-          function sendError() {
-            const { message, stack = "" } = signal.reason;
-            ws.send(
-              JSON.stringify({
-                type: "error",
-                err: { message, stack }
-              })
-            );
-          }
-        }
-      });
-    } else {
-      signal.addEventListener("abort", () => {
+    function onSignalAborted() {
+      if (next) {
+        next(signal.reason);
+      } else {
         if (!res.destroyed && res.socket) {
           res.socket.destroySoon();
         }
+        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) => {
+        if (signal.aborted) {
+          sendError();
+        } else {
+          signal.addEventListener("abort", sendError);
+        }
+        function sendError() {
+          const { message, stack = "" } = signal.reason;
+          ws.send(
+            JSON.stringify({
+              type: "error",
+              err: { message, stack }
+            })
+          );
+        }
       });
     }
+    let body;
+    if (req.method !== "GET" && req.method !== "HEAD") {
+      if (req.readableDidRead) {
+        body = bodyConsumedErrorStream;
+      } else {
+        body = req;
+      }
+    }
     const request = new Request(url, {
       method: req.method,
-      headers,
-      body: req.method === "GET" || req.method === "HEAD" ? void 0 : req,
+      headers: req.headers,
+      body,
+      // @ts-expect-error: Node requires this for streams
       duplex: "half",
       signal
     });
@@ -235,11 +218,8 @@ function createMiddleware(fetch2, options = {}) {
       }
       return;
     }
-    if (process.env.NODE_ENV !== "production" && hmrId) {
-      response.headers.append(
-        "set-cookie",
-        `${HRMClientIdCookieName}=${hmrId}; Path=/; Max-Age=100; HttpOnly`
-      );
+    if (process.env.NODE_ENV !== "production" && setDevClientId) {
+      setDevClientId(response);
     }
     res.statusCode = response.status;
     setResponseHeaders(response, res);
@@ -274,6 +254,11 @@ async function writeResponse(reader, res, controller) {
     controller.abort(err);
   }
 }
+var bodyConsumedErrorStream = new ReadableStream({
+  start(controller) {
+    controller.error(new Error("The request body stream was already consumed by something before Marko Run."));
+  }
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createMiddleware,

package/dist/adapter/middleware.d.ts

@@ -2,14 +2,13 @@
 import "./polyfill";
 import type { Fetch } from "../runtime";
 import type { IncomingMessage, ServerResponse, OutgoingMessage } from "http";
-import type { ViteDevServer } from "vite";
 export interface NodePlatformInfo {
     ip: string;
     request: IncomingMessage;
     response: ServerResponse;
 }
 /** Connect/Express style request listener/middleware */
-export type NodeMiddleware = (req: IncomingMessage, res: ServerResponse, next?: () => void) => void;
+export type NodeMiddleware = (req: IncomingMessage, res: ServerResponse, next?: (error?: Error) => void) => void;
 /** Adapter options */
 export interface NodeAdapterOptions {
     /**
@@ -32,7 +31,6 @@ export interface NodeAdapterOptions {
      * is set to `1`, otherwise false.
      */
     trustProxy?: boolean;
-    devServer?: ViteDevServer;
 }
 export declare function getOrigin(req: IncomingMessage, trustProxy?: boolean): string;
 export declare function setResponseHeaders(response: Response, res: OutgoingMessage): void;

package/dist/adapter/middleware.js

@@ -93,95 +93,74 @@ function getSetCookie_fallback(headers) {
   }
   return value;
 }
-var HRMClientIdCookieName = "hmr-client-id";
-function getHMRClientId(req) {
-  if (req.headers.cookie) {
-    const cookie = req.headers.cookie.split(/;\s+/).find((c) => c.startsWith(HRMClientIdCookieName));
-    if (cookie) {
-      return cookie.slice(HRMClientIdCookieName.length + 1);
-    }
-  }
-}
 function createMiddleware(fetch2, options = {}) {
   const {
     origin = process.env.ORIGIN,
-    trustProxy = process.env.TRUST_PROXY === "1",
-    devServer
+    trustProxy = process.env.TRUST_PROXY === "1"
   } = options;
-  let hmrCallbacks;
-  if (process.env.NODE_ENV !== "production" && devServer) {
-    hmrCallbacks = [];
-    devServer.ws.on("connection", (ws, req) => {
-      if (hmrCallbacks == null ? void 0 : hmrCallbacks.length) {
-        const id = getHMRClientId(req);
-        const now = Date.now();
-        const nextHMRCallbacks = [];
-        for (const entry of hmrCallbacks) {
-          if (entry.id === id) {
-            entry.callback(ws);
-          } else if (entry.expires > now) {
-            nextHMRCallbacks.push(entry);
-          }
-        }
-        hmrCallbacks = nextHMRCallbacks;
-      }
-    });
-  }
   return async (req, res, next) => {
     var _a;
     const controller = new AbortController();
     const { signal } = controller;
     const url = new URL(req.url, origin || getOrigin(req, trustProxy));
     const ip = req.ip || trustProxy && getForwardedHeader(req, "for") || req.socket.remoteAddress || "";
-    const headers = req.headers;
     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);
       }
     }
-    let hmrId;
-    if (process.env.NODE_ENV !== "production" && hmrCallbacks && ((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html"))) {
-      const expires = Date.now() + 1e3;
-      hmrId = Math.floor(Math.random() * expires).toString(36);
-      hmrCallbacks.push({
-        id: hmrId,
-        expires,
-        callback(ws) {
-          if (signal.aborted) {
-            sendError();
-          } else {
-            signal.addEventListener("abort", sendError);
-          }
-          function sendError() {
-            const { message, stack = "" } = signal.reason;
-            ws.send(
-              JSON.stringify({
-                type: "error",
-                err: { message, stack }
-              })
-            );
-          }
-        }
-      });
-    } else {
-      signal.addEventListener("abort", () => {
+    function onSignalAborted() {
+      if (next) {
+        next(signal.reason);
+      } else {
         if (!res.destroyed && res.socket) {
           res.socket.destroySoon();
         }
+        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) => {
+        if (signal.aborted) {
+          sendError();
+        } else {
+          signal.addEventListener("abort", sendError);
+        }
+        function sendError() {
+          const { message, stack = "" } = signal.reason;
+          ws.send(
+            JSON.stringify({
+              type: "error",
+              err: { message, stack }
+            })
+          );
+        }
       });
     }
+    let body;
+    if (req.method !== "GET" && req.method !== "HEAD") {
+      if (req.readableDidRead) {
+        body = bodyConsumedErrorStream;
+      } else {
+        body = req;
+      }
+    }
     const request = new Request(url, {
       method: req.method,
-      headers,
-      body: req.method === "GET" || req.method === "HEAD" ? void 0 : req,
+      headers: req.headers,
+      body,
+      // @ts-expect-error: Node requires this for streams
       duplex: "half",
       signal
     });
@@ -196,11 +175,8 @@ function createMiddleware(fetch2, options = {}) {
       }
       return;
     }
-    if (process.env.NODE_ENV !== "production" && hmrId) {
-      response.headers.append(
-        "set-cookie",
-        `${HRMClientIdCookieName}=${hmrId}; Path=/; Max-Age=100; HttpOnly`
-      );
+    if (process.env.NODE_ENV !== "production" && setDevClientId) {
+      setDevClientId(response);
     }
     res.statusCode = response.status;
     setResponseHeaders(response, res);
@@ -235,6 +211,11 @@ async function writeResponse(reader, res, controller) {
     controller.abort(err);
   }
 }
+var bodyConsumedErrorStream = new ReadableStream({
+  start(controller) {
+    controller.error(new Error("The request body stream was already consumed by something before Marko Run."));
+  }
+});
 export {
   createMiddleware,
   getOrigin,

package/dist/adapter/runtime.cjs

@@ -0,0 +1,22 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/adapter/runtime.ts
+var runtime_exports = {};
+module.exports = __toCommonJS(runtime_exports);
+
+// scripts/importMetaURL.js
+var import_url = require("url");
+var __importMetaURL = (0, import_url.pathToFileURL)(__filename);

package/dist/adapter/runtime.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/adapter/utils.d.ts

@@ -0,0 +1,10 @@
+export declare function logInfoBox(address: string): void;
+export declare function drawMarkoBox(message: string, options?: LogoOptions): string[];
+export interface LogoOptions {
+    fill?: boolean;
+    color?: boolean;
+}
+export declare function drawMarkoLogo(options?: LogoOptions): {
+    lines: string[];
+    width: number;
+};