@marko/run 0.4.4 → 0.4.6

package/dist/adapter/index.js

@@ -1,11 +1,15 @@
 // src/adapter/index.ts
-import path from "path";
+import path2 from "path";
 import fs2 from "fs";
 import inspector from "inspector";
 import { fileURLToPath } from "url";
 
 // src/adapter/dev-server.ts
-import { createServer } from "vite";
+import path from "path";
+import {
+  createServer,
+  buildErrorMessage
+} from "vite";
 
 // src/adapter/polyfill.ts
 import * as webStream from "stream/web";
@@ -43,11 +47,9 @@ function getSetCookie_platform(headers) {
 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;
+  if (!value) return void 0;
   let sepIndex = value.indexOf(",") + 1;
-  if (!sepIndex)
-    return value;
+  if (!sepIndex) return value;
   let index = 0;
   let setCookie = void 0;
   let setCookies = void 0;
@@ -62,8 +64,7 @@ function getSetCookie_fallback(headers) {
         setCookie = valuePart;
       }
       index = sepIndex;
-      while (value.charCodeAt(index) === 32)
-        index++;
+      while (value.charCodeAt(index) === 32) index++;
     }
     sepIndex = value.indexOf(",", sepIndex) + 1;
   } while (sepIndex);
@@ -117,6 +118,13 @@ function copyResponseHeaders(response, headers) {
     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);
+  }
+  return error;
+}
 function createMiddleware(fetch2, options) {
   const {
     origin = process.env.ORIGIN,
@@ -144,13 +152,14 @@ function createMiddleware(fetch2, options) {
       }
     }
     function onSignalAborted() {
+      const error = normalizeError(signal.reason);
       if (next) {
-        next(signal.reason);
+        next(error);
       } else {
         if (!res.destroyed && res.socket) {
           res.socket.destroySoon();
         }
-        console.error(signal.reason);
+        console.error(error);
       }
     }
     if (process.env.NODE_ENV !== "production" && globalThis.__marko_run_dev__ && ((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html"))) {
@@ -161,7 +170,7 @@ function createMiddleware(fetch2, options) {
           signal.addEventListener("abort", sendError);
         }
         function sendError() {
-          const { message, stack = "" } = signal.reason;
+          const { message, stack = "" } = normalizeError(signal.reason);
           ws.send(
             JSON.stringify({
               type: "error",
@@ -195,6 +204,7 @@ function createMiddleware(fetch2, options) {
     try {
       response = await fetch2(request, platform);
     } catch (err) {
+      normalizeError(err);
       if (next) {
         next(err);
       } else {
@@ -241,7 +251,7 @@ async function writeResponse(reader, res, controller) {
   }
 }
 var bodyConsumedErrorStream = new ReadableStream({
-  start(controller) {
+  pull(controller) {
     controller.error(
       new Error(
         "The request body stream was already consumed by something before Marko Run."
@@ -250,9 +260,6 @@ var bodyConsumedErrorStream = new ReadableStream({
   }
 });
 
-// src/adapter/dev-server.ts
-import { inspect } from "util";
-
 // src/adapter/logger.ts
 import kleur from "kleur";
 import DraftLog from "draftlog";
@@ -447,130 +454,35 @@ function createAnimationManager(options = {}) {
   };
 }
 
-// src/adapter/dev-server.ts
-async function createViteDevServer(config2) {
-  const devServer = await createServer({
-    ...config2,
-    appType: "custom",
-    server: { ...config2 == null ? void 0 : config2.server, middlewareMode: true }
-  });
-  getDevGlobal().addDevServer(devServer);
-  devServer.middlewares.use(logger_default());
-  return devServer;
-}
-async function createDevServer(config2) {
-  const devServer = await createViteDevServer(config2);
-  const routerMiddleware = createMiddleware(
-    (request, platform) => globalThis.__marko_run__.fetch(request, platform)
+// src/adapter/utils.ts
+import supporsColor from "supports-color";
+import kleur2 from "kleur";
+function stripAnsi(string) {
+  return string.replace(
+    /([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g,
+    ""
   );
-  devServer.middlewares.use(async (req, res, next) => {
-    function handleNext(err) {
-      var _a;
-      if (err) {
-        if (err instanceof Error) {
-          devServer.ssrFixStacktrace(err);
-        }
-        console.error(err);
-        if (res.headersSent) {
-          if (!res.destroyed) {
-            (_a = res.socket) == null ? void 0 : _a.destroySoon();
-          }
-        } else {
-          res.statusCode = 500;
-          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();
-      }
-    }
-    try {
-      await devServer.ssrLoadModule("@marko/run/router");
-    } catch (err) {
-      return handleNext(err);
-    }
-    routerMiddleware(req, res, handleNext);
-  });
-  return devServer;
 }
-var ClientIdCookieName = "marko-run-client-id";
-function getClientId(req) {
-  if (req.headers.cookie) {
-    const cookie = req.headers.cookie.split(/;\s+/).find((c) => c.startsWith(ClientIdCookieName));
-    if (cookie) {
-      return cookie.slice(ClientIdCookieName.length + 1);
-    }
-  }
+function cleanStack(stack) {
+  return stack.split(/\n/).filter((l) => /^\s*at/.test(l)).join("\n");
 }
-var devGlobal;
-function getDevGlobal() {
-  if (!devGlobal) {
-    let handleConnection2 = function(ws, req) {
-      if (callbacks == null ? void 0 : callbacks.length) {
-        const id = getClientId(req);
-        const now = Date.now();
-        const nextCallbacks = [];
-        for (const entry of callbacks) {
-          if (entry.id === id) {
-            entry.callback(ws);
-          } else if (entry.expires > now) {
-            nextCallbacks.push(entry);
-          }
-        }
-        callbacks = nextCallbacks;
-      }
-    };
-    var handleConnection = handleConnection2;
-    const devServers = /* @__PURE__ */ new Set();
-    let callbacks = [];
-    globalThis.__marko_run_dev__ = devGlobal = {
-      devServers,
-      addDevServer(devServer) {
-        const originalClose = devServer.close;
-        devServer.close = () => {
-          devServers.delete(devServer);
-          return originalClose.call(devServer);
-        };
-        devServers.add(devServer);
-        devServer.ws.on("connection", handleConnection2);
-      },
-      clear() {
-        callbacks = [];
-        for (const devServer of devServers) {
-          devServer.ws.off("connection", handleConnection2);
-          devServer.close();
-        }
-      },
-      onClient(res, callback) {
-        const expires = Date.now() + 1e3;
-        const id = Math.floor(Math.random() * expires).toString(36);
-        callbacks.push({
-          id,
-          expires,
-          callback
-        });
-        res.setHeader(
-          "set-cookie",
-          `${ClientIdCookieName}=${id}; Path=/; Max-Age=100; HttpOnly`
-        );
-      }
-    };
-  }
-  return devGlobal;
+function prepareError(err) {
+  var _a;
+  return {
+    message: stripAnsi(err.message),
+    stack: stripAnsi(cleanStack(err.stack || "")),
+    id: err.id,
+    frame: stripAnsi(err.frame || ""),
+    plugin: err.plugin,
+    pluginCode: (_a = err.pluginCode) == null ? void 0 : _a.toString(),
+    loc: err.loc
+  };
 }
-
-// src/adapter/utils.ts
-import supporsColor from "supports-color";
-import kleur2 from "kleur";
 function logInfoBox(address, explorer) {
   const color = !!supporsColor.stdout;
   let message = kleur2.bold("Marko Run");
   if (true) {
-    message += ` v${"0.4.4"}`;
+    message += ` v${"0.4.6"}`;
   }
   message += "\n\n";
   message += kleur2.dim("Server listening at");
@@ -678,8 +590,7 @@ B\u2572   \u2572 GG\u203E\u203E\u203E\u203E O\u2571   \u2571 P\u2571   \u2571
         lineWidth = 0;
       }
     } else if (/[A-Z]/.test(char)) {
-      while (source[i + 1] === char)
-        i++;
+      while (source[i + 1] === char) i++;
       if (color) {
         line += colorEscapeCodes[char];
       }
@@ -710,6 +621,137 @@ B\u2572   \u2572 GG\u203E\u203E\u203E\u203E O\u2571   \u2571 P\u2571   \u2571
   return { lines, width };
 }
 
+// src/adapter/dev-server.ts
+async function createViteDevServer(config2) {
+  const devServer = await createServer({
+    ...config2,
+    appType: "custom",
+    server: { ...config2 == null ? void 0 : config2.server, middlewareMode: true }
+  });
+  getDevGlobal().addDevServer(devServer);
+  devServer.middlewares.use(logger_default());
+  return devServer;
+}
+async function createDevServer(config2) {
+  const devServer = await createViteDevServer(config2);
+  const routerMiddleware = createMiddleware(
+    (request, platform) => globalThis.__marko_run__.fetch(request, platform)
+  );
+  devServer.middlewares.use(async (req, res, next) => {
+    try {
+      await devServer.ssrLoadModule("@marko/run/router");
+    } catch (err) {
+      return next(err);
+    }
+    routerMiddleware(req, res, next);
+  }).use(createErrorMiddleware(devServer));
+  return devServer;
+}
+var ClientIdCookieName = "marko-run-client-id";
+function getClientId(req) {
+  if (req.headers.cookie) {
+    const cookie = req.headers.cookie.split(/;\s+/).find((c) => c.startsWith(ClientIdCookieName));
+    if (cookie) {
+      return cookie.slice(ClientIdCookieName.length + 1);
+    }
+  }
+}
+var devGlobal;
+function getDevGlobal() {
+  if (!devGlobal) {
+    let handleConnection2 = function(ws, req) {
+      if (callbacks == null ? void 0 : callbacks.length) {
+        const id = getClientId(req);
+        const now = Date.now();
+        const nextCallbacks = [];
+        for (const entry of callbacks) {
+          if (entry.id === id) {
+            entry.callback(ws);
+          } else if (entry.expires > now) {
+            nextCallbacks.push(entry);
+          }
+        }
+        callbacks = nextCallbacks;
+      }
+    };
+    var handleConnection = handleConnection2;
+    const devServers = /* @__PURE__ */ new Set();
+    let callbacks = [];
+    globalThis.__marko_run_dev__ = devGlobal = {
+      devServers,
+      addDevServer(devServer) {
+        const originalClose = devServer.close;
+        devServer.close = () => {
+          devServers.delete(devServer);
+          return originalClose.call(devServer);
+        };
+        devServers.add(devServer);
+        devServer.ws.on("connection", handleConnection2);
+      },
+      clear() {
+        callbacks = [];
+        for (const devServer of devServers) {
+          devServer.ws.off("connection", handleConnection2);
+          devServer.close();
+        }
+      },
+      onClient(res, callback) {
+        const expires = Date.now() + 1e3;
+        const id = Math.floor(Math.random() * expires).toString(36);
+        callbacks.push({
+          id,
+          expires,
+          callback
+        });
+        res.setHeader(
+          "set-cookie",
+          `${ClientIdCookieName}=${id}; Path=/; Max-Age=100; HttpOnly`
+        );
+      }
+    };
+  }
+  return devGlobal;
+}
+function createErrorMiddleware(devServer) {
+  return function errorMiddleware(error, _req, res, _next) {
+    if (!error.id) {
+      devServer.config.logger.error(buildErrorMessage(error, [`\x1B[31;1mRequest failed with error: ${error.message}\x1B[0m`]));
+    }
+    res.statusCode = 500;
+    res.end(`
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Error</title>
+    <script type="module">
+      const error = ${JSON.stringify(prepareError(error)).replace(
+      /</g,
+      "\\u003c"
+    )}
+      try {
+        const { ErrorOverlay } = await import(${JSON.stringify(path.posix.join(devServer.config.base, "/@vite/client"))})
+        document.body.appendChild(new ErrorOverlay(error))
+      } catch {
+        const h = (tag, text) => {
+          const el = document.createElement(tag)
+          el.textContent = text
+          return el
+        }
+        document.body.appendChild(h('h1', 'Internal Server Error'))
+        document.body.appendChild(h('h2', error.message))
+        document.body.appendChild(h('pre', error.stack))
+        document.body.appendChild(h('p', '(Error overlay failed to load)'))
+      }
+    </script>
+  </head>
+  <body>
+  </body>
+</html>
+    `);
+  };
+}
+
 // src/vite/utils/server.ts
 import net from "net";
 import cp from "child_process";
@@ -882,9 +924,9 @@ var markoRunFilePrefix = "__marko-run__";
 var virtualFilePrefix = "virtual:marko-run";
 
 // src/adapter/index.ts
-var __dirname = path.dirname(fileURLToPath(import.meta.url));
-var defaultEntry = path.join(__dirname, "default-entry");
-var loadDevWorker = path.join(__dirname, "load-dev-worker.mjs");
+var __dirname = path2.dirname(fileURLToPath(import.meta.url));
+var defaultEntry = path2.join(__dirname, "default-entry");
+var loadDevWorker = path2.join(__dirname, "load-dev-worker.mjs");
 function adapter() {
   return {
     name: "base-adapter",
@@ -935,9 +977,9 @@ function adapter() {
       }
       const devServer = await createDevServer(config2);
       envFile && await loadEnv(envFile);
-      const inspect2 = getInspectOptions(options.args);
-      if (inspect2) {
-        inspector.open(inspect2.port, inspect2.host, inspect2.wait);
+      const inspect = getInspectOptions(options.args);
+      if (inspect) {
+        inspector.open(inspect.port, inspect.host, inspect.wait);
       }
       const listen = new Promise((resolve) => {
         const listener = devServer.middlewares.listen(port, () => {
@@ -982,8 +1024,8 @@ function adapter() {
         return;
       }
       const promises = [];
-      const cacheDir = path.resolve(__dirname, "../../.cache/explorer");
-      const codeDir = path.join(cacheDir, "code");
+      const cacheDir = path2.resolve(__dirname, "../../.cache/explorer");
+      const codeDir = path2.join(cacheDir, "code");
       if (fs2.existsSync(codeDir)) {
         await fs2.promises.rm(codeDir, { recursive: true });
       }
@@ -1005,7 +1047,7 @@ function adapter() {
         }
         if (fileName) {
           promises.push(
-            fs2.promises.writeFile(path.join(codeDir, fileName), code, {})
+            fs2.promises.writeFile(path2.join(codeDir, fileName), code, {})
           );
         }
       }
@@ -1017,7 +1059,7 @@ function adapter() {
       }
       promises.push(
         fs2.promises.writeFile(
-          path.join(cacheDir, "data.json"),
+          path2.join(cacheDir, "data.json"),
           JSON.stringify(data),
           {}
         )
@@ -1034,6 +1076,7 @@ async function startExplorer() {
 }
 export {
   createDevServer,
+  createErrorMiddleware,
   createViteDevServer,
   adapter as default,
   getDevGlobal

package/dist/adapter/middleware.cjs

@@ -76,11 +76,9 @@ function getSetCookie_platform(headers) {
 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;
+  if (!value) return void 0;
   let sepIndex = value.indexOf(",") + 1;
-  if (!sepIndex)
-    return value;
+  if (!sepIndex) return value;
   let index = 0;
   let setCookie = void 0;
   let setCookies = void 0;
@@ -95,8 +93,7 @@ function getSetCookie_fallback(headers) {
         setCookie = valuePart;
       }
       index = sepIndex;
-      while (value.charCodeAt(index) === 32)
-        index++;
+      while (value.charCodeAt(index) === 32) index++;
     }
     sepIndex = value.indexOf(",", sepIndex) + 1;
   } while (sepIndex);
@@ -150,6 +147,13 @@ function copyResponseHeaders(response, headers) {
     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);
+  }
+  return error;
+}
 function createMiddleware(fetch2, options) {
   const {
     origin = process.env.ORIGIN,
@@ -177,13 +181,14 @@ function createMiddleware(fetch2, options) {
       }
     }
     function onSignalAborted() {
+      const error = normalizeError(signal.reason);
       if (next) {
-        next(signal.reason);
+        next(error);
       } else {
         if (!res.destroyed && res.socket) {
           res.socket.destroySoon();
         }
-        console.error(signal.reason);
+        console.error(error);
       }
     }
     if (process.env.NODE_ENV !== "production" && globalThis.__marko_run_dev__ && ((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html"))) {
@@ -194,7 +199,7 @@ function createMiddleware(fetch2, options) {
           signal.addEventListener("abort", sendError);
         }
         function sendError() {
-          const { message, stack = "" } = signal.reason;
+          const { message, stack = "" } = normalizeError(signal.reason);
           ws.send(
             JSON.stringify({
               type: "error",
@@ -228,6 +233,7 @@ function createMiddleware(fetch2, options) {
     try {
       response = await fetch2(request, platform);
     } catch (err) {
+      normalizeError(err);
       if (next) {
         next(err);
       } else {
@@ -274,7 +280,7 @@ async function writeResponse(reader, res, controller) {
   }
 }
 var bodyConsumedErrorStream = new ReadableStream({
-  start(controller) {
+  pull(controller) {
     controller.error(
       new Error(
         "The request body stream was already consumed by something before Marko Run."

package/dist/adapter/middleware.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { Fetch, Platform } from "../runtime";
 import { IncomingMessage, ServerResponse } from "http";
 export interface NodePlatformInfo {

package/dist/adapter/middleware.js

@@ -34,11 +34,9 @@ function getSetCookie_platform(headers) {
 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;
+  if (!value) return void 0;
   let sepIndex = value.indexOf(",") + 1;
-  if (!sepIndex)
-    return value;
+  if (!sepIndex) return value;
   let index = 0;
   let setCookie = void 0;
   let setCookies = void 0;
@@ -53,8 +51,7 @@ function getSetCookie_fallback(headers) {
         setCookie = valuePart;
       }
       index = sepIndex;
-      while (value.charCodeAt(index) === 32)
-        index++;
+      while (value.charCodeAt(index) === 32) index++;
     }
     sepIndex = value.indexOf(",", sepIndex) + 1;
   } while (sepIndex);
@@ -108,6 +105,13 @@ function copyResponseHeaders(response, headers) {
     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);
+  }
+  return error;
+}
 function createMiddleware(fetch2, options) {
   const {
     origin = process.env.ORIGIN,
@@ -135,13 +139,14 @@ function createMiddleware(fetch2, options) {
       }
     }
     function onSignalAborted() {
+      const error = normalizeError(signal.reason);
       if (next) {
-        next(signal.reason);
+        next(error);
       } else {
         if (!res.destroyed && res.socket) {
           res.socket.destroySoon();
         }
-        console.error(signal.reason);
+        console.error(error);
       }
     }
     if (process.env.NODE_ENV !== "production" && globalThis.__marko_run_dev__ && ((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html"))) {
@@ -152,7 +157,7 @@ function createMiddleware(fetch2, options) {
           signal.addEventListener("abort", sendError);
         }
         function sendError() {
-          const { message, stack = "" } = signal.reason;
+          const { message, stack = "" } = normalizeError(signal.reason);
           ws.send(
             JSON.stringify({
               type: "error",
@@ -186,6 +191,7 @@ function createMiddleware(fetch2, options) {
     try {
       response = await fetch2(request, platform);
     } catch (err) {
+      normalizeError(err);
       if (next) {
         next(err);
       } else {
@@ -232,7 +238,7 @@ async function writeResponse(reader, res, controller) {
   }
 }
 var bodyConsumedErrorStream = new ReadableStream({
-  start(controller) {
+  pull(controller) {
     controller.error(
       new Error(
         "The request body stream was already consumed by something before Marko Run."

package/dist/adapter/polyfill.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ServerResponse } from 'http';
 declare global {
     interface Headers {

package/dist/adapter/utils.d.ts

@@ -1,3 +1,18 @@
+import type { Rollup } from "vite";
+type RollupError = Rollup.RollupError;
+export declare function prepareError(err: Error | RollupError): {
+    message: string;
+    stack: string;
+    id: string | undefined;
+    frame: string;
+    plugin: string | undefined;
+    pluginCode: string | undefined;
+    loc: {
+        column: number;
+        file?: string;
+        line: number;
+    } | undefined;
+};
 export declare function logInfoBox(address: string, explorer?: string): void;
 export declare function drawMarkoBox(message: string, options?: LogoOptions): string[];
 export interface LogoOptions {
@@ -8,3 +23,4 @@ export declare function drawMarkoLogo(options?: LogoOptions): {
     lines: string[];
     width: number;
 };
+export {};