@marko/run 0.2.5 → 0.2.7

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,40 +136,11 @@ 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();
@@ -177,50 +152,51 @@ function createMiddleware(fetch2, options = {}) {
     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 }
+            })
+          );
+        }
       });
     }
     const request = new Request(url, {
       method: req.method,
       headers,
       body: req.method === "GET" || req.method === "HEAD" ? void 0 : req,
+      // @ts-expect-error: Node requires this for streams
       duplex: "half",
       signal
     });
@@ -235,11 +211,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);

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,40 +93,11 @@ 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();
@@ -138,50 +109,51 @@ function createMiddleware(fetch2, options = {}) {
     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 }
+            })
+          );
+        }
       });
     }
     const request = new Request(url, {
       method: req.method,
       headers,
       body: req.method === "GET" || req.method === "HEAD" ? void 0 : req,
+      // @ts-expect-error: Node requires this for streams
       duplex: "half",
       signal
     });
@@ -196,11 +168,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);