@marko/run 0.0.1-beta7 → 0.0.1-beta9

package/dist/adapter/dev-server.d.ts

@@ -1,4 +1,4 @@
 import { ViteDevServer } from "vite";
-import { type NodeMiddleware } from "./middleware";
+import type { NodeMiddleware } from "./middleware";
 export declare function createViteDevMiddleware<T>(devServer: ViteDevServer, load: (prev: T | undefined) => Promise<T>, factory: (value: T) => NodeMiddleware): NodeMiddleware;
 export declare function createDevServer(configFile?: string): Promise<import("vite").Connect.Server>;

package/dist/adapter/index.cjs

@@ -36,176 +36,6 @@ var import_url = require("url");
 
 // src/adapter/dev-server.ts
 var import_vite = require("vite");
-
-// src/adapter/polyfill.ts
-var import_web = require("stream/web");
-var import_crypto = require("crypto");
-var import_undici = require("undici");
-var globals = {
-  crypto: import_crypto.webcrypto,
-  fetch: import_undici.fetch,
-  Response: import_undici.Response,
-  Request: import_undici.Request,
-  Headers: import_undici.Headers,
-  ReadableStream: import_web.ReadableStream,
-  TransformStream: import_web.TransformStream,
-  WritableStream: import_web.WritableStream,
-  FormData: import_undici.FormData,
-  File: import_undici.File
-};
-function installPolyfills() {
-  for (const name in globals) {
-    Object.defineProperty(globalThis, name, {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: globals[name]
-    });
-  }
-}
-
-// src/adapter/middleware.ts
-installPolyfills();
-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, protocol, host, trustProxy) {
-  var _a;
-  protocol ?? (protocol = req.protocol || trustProxy && getForwardedHeader(req, "proto") || ((_a = req.socket) == null ? void 0 : _a.encrypted) && "https" || "http");
-  host ?? (host = trustProxy && getForwardedHeader(req, "host") || req.headers.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 createMiddleware(fetch2, options = {}) {
-  const { trustProxy = process.env.TRUST_PROXY === "1" } = options;
-  let { origin = process.env.ORIGIN } = options;
-  let protocol;
-  let host;
-  if (origin) {
-    ({ protocol, host } = new URL(origin));
-    protocol = protocol.slice(0, -1);
-  }
-  return async (req, res, next) => {
-    origin ?? (origin = getOrigin(req, protocol, host, trustProxy));
-    const url = new URL(req.url, origin);
-    const ip = req.ip || trustProxy && getForwardedHeader(req, "for") || req.socket.remoteAddress || "";
-    const headers = req.headers;
-    const body = req.method === "GET" || req.method === "HEAD" ? void 0 : req.socket ? req : new ReadableStream({
-      start(controller) {
-        req.on("data", (chunk) => controller.enqueue(chunk));
-        req.on("end", () => controller.close());
-        req.on("error", (err) => controller.error(err));
-      }
-    });
-    const request = new Request(url, {
-      method: req.method,
-      headers,
-      body,
-      duplex: "half"
-    });
-    const response = await fetch2(request, {
-      ip,
-      request: req,
-      response: res,
-      setCookie(cookie) {
-        res.appendHeader("set-cookie", cookie);
-      }
-    });
-    if (!response) {
-      if (next) {
-        next();
-      } else {
-        res.statusCode = 404;
-        res.setHeader("content-length", "0");
-        res.end();
-        return;
-      }
-      return;
-    }
-    res.statusCode = response.status;
-    for (const [key, value] of response.headers) {
-      if (key === "set-cookie") {
-        let sepIndex = value.indexOf(",") + 1;
-        if (!sepIndex) {
-          res.setHeader(key, value);
-        } else {
-          let index = 0;
-          do {
-            res.appendHeader(key, value.slice(index, sepIndex - 1));
-            index = sepIndex;
-            sepIndex = value.indexOf(",", sepIndex) + 1;
-          } while (sepIndex);
-          res.appendHeader(key, value.slice(index));
-        }
-      } else {
-        res.setHeader(key, value);
-      }
-    }
-    if (!response.body) {
-      if (!response.headers.has("content-length")) {
-        res.setHeader("content-length", "0");
-      }
-      res.end();
-      return;
-    }
-    const reader = response.body.getReader();
-    if (res.destroyed) {
-      reader.cancel();
-      return;
-    }
-    res.on("close", cancel);
-    res.on("error", cancel);
-    write();
-    function cancel(error) {
-      res.off("close", cancel);
-      res.off("error", cancel);
-      reader.cancel(error).catch(() => {
-      });
-      error && res.destroy(error);
-    }
-    async function write() {
-      try {
-        while (true) {
-          const { done, value } = await reader.read();
-          if (done) {
-            res.end();
-            return;
-          } else if (!res.write(value)) {
-            res.once("drain", write);
-            return;
-          } else if (res.flush) {
-            res.flush();
-          }
-        }
-      } catch (err) {
-        const error = err instanceof Error ? err : new Error("Error while writing to node response", {
-          cause: err
-        });
-        cancel(error);
-      }
-    }
-  };
-}
-
-// src/adapter/dev-server.ts
 function createViteDevMiddleware(devServer, load, factory) {
   let value;
   let middleware;
@@ -218,10 +48,13 @@ function createViteDevMiddleware(devServer, load, factory) {
       }
       await middleware(req, res, next);
     } catch (err) {
+      res.statusCode = 500;
       if (err instanceof Error) {
         devServer.ssrFixStacktrace(err);
+        res.end(err.stack);
+      } else {
+        res.end();
       }
-      return next == null ? void 0 : next();
     }
   };
 }
@@ -229,12 +62,19 @@ async function createDevServer(configFile) {
   const devServer = await (0, import_vite.createServer)({
     configFile,
     appType: "custom",
-    server: { middlewareMode: true }
+    server: { middlewareMode: true },
+    resolve: {
+      dedupe: ["marko"],
+      conditions: ["worker"]
+    }
   });
+  const { createMiddleware } = await devServer.ssrLoadModule(
+    "@marko/run/adapter/middleware"
+  );
   const middleware = createViteDevMiddleware(
     devServer,
     async () => await devServer.ssrLoadModule("@marko/run/router"),
-    (module2) => createMiddleware(module2.fetch)
+    (module2) => createMiddleware(module2.fetch, { devServer })
   );
   return devServer.middlewares.use(middleware);
 }

package/dist/adapter/index.js

@@ -4,176 +4,6 @@ import { fileURLToPath } from "url";
 
 // src/adapter/dev-server.ts
 import { createServer } from "vite";
-
-// src/adapter/polyfill.ts
-import { ReadableStream as ReadableStream2, TransformStream, WritableStream } from "stream/web";
-import { webcrypto as crypto } from "crypto";
-import { fetch, Response, Request as Request2, Headers, FormData, File } from "undici";
-var globals = {
-  crypto,
-  fetch,
-  Response,
-  Request: Request2,
-  Headers,
-  ReadableStream: ReadableStream2,
-  TransformStream,
-  WritableStream,
-  FormData,
-  File
-};
-function installPolyfills() {
-  for (const name in globals) {
-    Object.defineProperty(globalThis, name, {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: globals[name]
-    });
-  }
-}
-
-// src/adapter/middleware.ts
-installPolyfills();
-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, protocol, host, trustProxy) {
-  var _a;
-  protocol ?? (protocol = req.protocol || trustProxy && getForwardedHeader(req, "proto") || ((_a = req.socket) == null ? void 0 : _a.encrypted) && "https" || "http");
-  host ?? (host = trustProxy && getForwardedHeader(req, "host") || req.headers.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 createMiddleware(fetch2, options = {}) {
-  const { trustProxy = process.env.TRUST_PROXY === "1" } = options;
-  let { origin = process.env.ORIGIN } = options;
-  let protocol;
-  let host;
-  if (origin) {
-    ({ protocol, host } = new URL(origin));
-    protocol = protocol.slice(0, -1);
-  }
-  return async (req, res, next) => {
-    origin ?? (origin = getOrigin(req, protocol, host, trustProxy));
-    const url = new URL(req.url, origin);
-    const ip = req.ip || trustProxy && getForwardedHeader(req, "for") || req.socket.remoteAddress || "";
-    const headers = req.headers;
-    const body = req.method === "GET" || req.method === "HEAD" ? void 0 : req.socket ? req : new ReadableStream({
-      start(controller) {
-        req.on("data", (chunk) => controller.enqueue(chunk));
-        req.on("end", () => controller.close());
-        req.on("error", (err) => controller.error(err));
-      }
-    });
-    const request = new Request(url, {
-      method: req.method,
-      headers,
-      body,
-      duplex: "half"
-    });
-    const response = await fetch2(request, {
-      ip,
-      request: req,
-      response: res,
-      setCookie(cookie) {
-        res.appendHeader("set-cookie", cookie);
-      }
-    });
-    if (!response) {
-      if (next) {
-        next();
-      } else {
-        res.statusCode = 404;
-        res.setHeader("content-length", "0");
-        res.end();
-        return;
-      }
-      return;
-    }
-    res.statusCode = response.status;
-    for (const [key, value] of response.headers) {
-      if (key === "set-cookie") {
-        let sepIndex = value.indexOf(",") + 1;
-        if (!sepIndex) {
-          res.setHeader(key, value);
-        } else {
-          let index = 0;
-          do {
-            res.appendHeader(key, value.slice(index, sepIndex - 1));
-            index = sepIndex;
-            sepIndex = value.indexOf(",", sepIndex) + 1;
-          } while (sepIndex);
-          res.appendHeader(key, value.slice(index));
-        }
-      } else {
-        res.setHeader(key, value);
-      }
-    }
-    if (!response.body) {
-      if (!response.headers.has("content-length")) {
-        res.setHeader("content-length", "0");
-      }
-      res.end();
-      return;
-    }
-    const reader = response.body.getReader();
-    if (res.destroyed) {
-      reader.cancel();
-      return;
-    }
-    res.on("close", cancel);
-    res.on("error", cancel);
-    write();
-    function cancel(error) {
-      res.off("close", cancel);
-      res.off("error", cancel);
-      reader.cancel(error).catch(() => {
-      });
-      error && res.destroy(error);
-    }
-    async function write() {
-      try {
-        while (true) {
-          const { done, value } = await reader.read();
-          if (done) {
-            res.end();
-            return;
-          } else if (!res.write(value)) {
-            res.once("drain", write);
-            return;
-          } else if (res.flush) {
-            res.flush();
-          }
-        }
-      } catch (err) {
-        const error = err instanceof Error ? err : new Error("Error while writing to node response", {
-          cause: err
-        });
-        cancel(error);
-      }
-    }
-  };
-}
-
-// src/adapter/dev-server.ts
 function createViteDevMiddleware(devServer, load, factory) {
   let value;
   let middleware;
@@ -186,10 +16,13 @@ function createViteDevMiddleware(devServer, load, factory) {
       }
       await middleware(req, res, next);
     } catch (err) {
+      res.statusCode = 500;
       if (err instanceof Error) {
         devServer.ssrFixStacktrace(err);
+        res.end(err.stack);
+      } else {
+        res.end();
       }
-      return next == null ? void 0 : next();
     }
   };
 }
@@ -197,12 +30,19 @@ async function createDevServer(configFile) {
   const devServer = await createServer({
     configFile,
     appType: "custom",
-    server: { middlewareMode: true }
+    server: { middlewareMode: true },
+    resolve: {
+      dedupe: ["marko"],
+      conditions: ["worker"]
+    }
   });
+  const { createMiddleware } = await devServer.ssrLoadModule(
+    "@marko/run/adapter/middleware"
+  );
   const middleware = createViteDevMiddleware(
     devServer,
     async () => await devServer.ssrLoadModule("@marko/run/router"),
-    (module) => createMiddleware(module.fetch)
+    (module) => createMiddleware(module.fetch, { devServer })
   );
   return devServer.middlewares.use(middleware);
 }

package/dist/adapter/middleware.cjs

@@ -29,6 +29,7 @@ module.exports = __toCommonJS(middleware_exports);
 var import_web = require("stream/web");
 var import_crypto = require("crypto");
 var import_undici = require("undici");
+var import_http = require("http");
 var globals = {
   crypto: import_crypto.webcrypto,
   fetch: import_undici.fetch,
@@ -41,14 +42,41 @@ var globals = {
   FormData: import_undici.FormData,
   File: import_undici.File
 };
+if (typeof import_http.OutgoingMessage.prototype.appendHeader !== "function") {
+  const messageHeaders = /* @__PURE__ */ new WeakMap();
+  import_http.OutgoingMessage.prototype.appendHeader = function(name, value) {
+    let headers = messageHeaders.get(this);
+    if (!headers) {
+      headers = /* @__PURE__ */ new Map();
+      messageHeaders.set(this, headers);
+    }
+    const key = name.toLowerCase();
+    let existing = headers.get(key);
+    if (existing) {
+      if (Array.isArray(existing)) {
+        existing.push(value);
+      } else {
+        existing = [existing, value];
+      }
+      this.setHeader(name, existing);
+      headers.set(key, existing);
+    } else {
+      this.setHeader(name, value);
+      headers.set(key, value);
+    }
+    return this;
+  };
+}
 function installPolyfills() {
   for (const name in globals) {
-    Object.defineProperty(globalThis, name, {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: globals[name]
-    });
+    if (!(name in globalThis)) {
+      Object.defineProperty(globalThis, name, {
+        enumerable: true,
+        configurable: true,
+        writable: true,
+        value: globals[name]
+      });
+    }
   }
 }
 
@@ -83,7 +111,7 @@ function getOrigin(req, protocol, host, trustProxy) {
   return `${protocol}://${host}`;
 }
 function createMiddleware(fetch2, options = {}) {
-  const { trustProxy = process.env.TRUST_PROXY === "1" } = options;
+  const { trustProxy = process.env.TRUST_PROXY === "1", devServer } = options;
   let { origin = process.env.ORIGIN } = options;
   let protocol;
   let host;
@@ -167,7 +195,17 @@ function createMiddleware(fetch2, options = {}) {
       res.off("error", cancel);
       reader.cancel(error).catch(() => {
       });
-      error && res.destroy(error);
+      if (error) {
+        if (process.env.NODE_ENV !== "production" && devServer) {
+          res.end();
+          devServer.ws.send({
+            type: "error",
+            err: { message: error.message, stack: error.stack || "" }
+          });
+        } else {
+          res.destroy(error);
+        }
+      }
     }
     async function write() {
       try {

package/dist/adapter/middleware.d.ts

@@ -1,5 +1,7 @@
+/// <reference types="node" />
 import type { Fetch } from "../runtime";
 import type { IncomingMessage, ServerResponse } from "http";
+import type { ViteDevServer } from "vite";
 declare module "net" {
     interface Socket {
         encrypted?: boolean;
@@ -10,9 +12,6 @@ declare module "http" {
         ip?: string;
         protocol?: string;
     }
-    interface ServerResponse {
-        appendHeader(key: string, value: string | string[]): this;
-    }
 }
 export interface NodePlatformInfo {
     ip: string;
@@ -46,6 +45,7 @@ export interface NodeAdapterOptions {
      * is set to `1`, otherwise false.
      */
     trustProxy?: boolean;
+    devServer?: ViteDevServer;
 }
 export declare function getOrigin(req: IncomingMessage, protocol?: string, host?: string, trustProxy?: boolean): string;
 /**

package/dist/adapter/middleware.js

@@ -2,6 +2,7 @@
 import { ReadableStream as ReadableStream2, TransformStream, WritableStream } from "stream/web";
 import { webcrypto as crypto } from "crypto";
 import { fetch, Response, Request as Request2, Headers, FormData, File } from "undici";
+import { OutgoingMessage } from "http";
 var globals = {
   crypto,
   fetch,
@@ -14,14 +15,41 @@ var globals = {
   FormData,
   File
 };
+if (typeof OutgoingMessage.prototype.appendHeader !== "function") {
+  const messageHeaders = /* @__PURE__ */ new WeakMap();
+  OutgoingMessage.prototype.appendHeader = function(name, value) {
+    let headers = messageHeaders.get(this);
+    if (!headers) {
+      headers = /* @__PURE__ */ new Map();
+      messageHeaders.set(this, headers);
+    }
+    const key = name.toLowerCase();
+    let existing = headers.get(key);
+    if (existing) {
+      if (Array.isArray(existing)) {
+        existing.push(value);
+      } else {
+        existing = [existing, value];
+      }
+      this.setHeader(name, existing);
+      headers.set(key, existing);
+    } else {
+      this.setHeader(name, value);
+      headers.set(key, value);
+    }
+    return this;
+  };
+}
 function installPolyfills() {
   for (const name in globals) {
-    Object.defineProperty(globalThis, name, {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: globals[name]
-    });
+    if (!(name in globalThis)) {
+      Object.defineProperty(globalThis, name, {
+        enumerable: true,
+        configurable: true,
+        writable: true,
+        value: globals[name]
+      });
+    }
   }
 }
 
@@ -56,7 +84,7 @@ function getOrigin(req, protocol, host, trustProxy) {
   return `${protocol}://${host}`;
 }
 function createMiddleware(fetch2, options = {}) {
-  const { trustProxy = process.env.TRUST_PROXY === "1" } = options;
+  const { trustProxy = process.env.TRUST_PROXY === "1", devServer } = options;
   let { origin = process.env.ORIGIN } = options;
   let protocol;
   let host;
@@ -140,7 +168,17 @@ function createMiddleware(fetch2, options = {}) {
       res.off("error", cancel);
       reader.cancel(error).catch(() => {
       });
-      error && res.destroy(error);
+      if (error) {
+        if (process.env.NODE_ENV !== "production" && devServer) {
+          res.end();
+          devServer.ws.send({
+            type: "error",
+            err: { message: error.message, stack: error.stack || "" }
+          });
+        } else {
+          res.destroy(error);
+        }
+      }
     }
     async function write() {
       try {

package/dist/adapter/polyfill.d.ts

@@ -1 +1,6 @@
+declare module 'http' {
+    interface OutgoingMessage {
+        appendHeader(this: OutgoingMessage, name: string, value: string): this;
+    }
+}
 export declare function installPolyfills(): void;

package/dist/cli/default.config.mjs

@@ -1,7 +1,7 @@
 import { defineConfig } from "vite";
 import marko from "@marko/run/vite";
-import staticAdapter from "@marko/run/adapter";
+import nodeAdapter from "@marko/run/adapter";
 
 export default defineConfig({
-  plugins: [marko({ adapter: staticAdapter() })]
+  plugins: [marko({ adapter: nodeAdapter() })]
 });

package/dist/cli/index.mjs

@@ -98,12 +98,12 @@ var defaultPort = +process.env.PORT || 3e3;
 var defaultConfigFileBases = ["serve.config", "vite.config"];
 var defaultConfigFileExts = [".js", ".cjs", ".mjs", ".ts", ".mts"];
 var prog = sade("marko-run").version("0.0.1").option("-c, --config", `Provide path to a Vite config file (by default looks for a file starting with ${defaultConfigFileBases.join(" or ")} with one of these extensions: ${defaultConfigFileExts.join(", ")})`).option("-e, --env", "Provide path to a dotenv file");
-prog.command("serve [entry]", "", { default: true }).describe("Start a production-like server for already-built app files").option("-o, --output", "Directory to serve files from, and write asset files to if `--build` (default: )").option("-p, --port", "Port the server should listen on (defaults: `$PORT` env variable or 3000)").option("-f, --file", "Output file to start").action(async (entry, opts) => {
+prog.command("preview [entry]").describe("Start a production-like server for already-built app files").option("-o, --output", "Directory to serve files from, and write asset files to if `--build` (default: )").option("-p, --port", "Port the server should listen on (defaults: `$PORT` env variable or 3000)").option("-f, --file", "Output file to start").action(async (entry, opts) => {
   const config2 = await getViteConfig(cwd, opts.config);
   await build(entry, config2, opts.output, false, opts.env);
   await preview(opts.entry, config2, opts.port, opts.output, opts.env);
 });
-prog.command("dev [entry]").describe("Start development server in watch mode").option("-p, --port", "Port the dev server should listen on (defaults: 'preview.port' in config, or `$PORT` env variable, or 3000)").example("dev --config vite.config.js").action(async (entry, opts) => {
+prog.command("dev [entry]", "", { default: true }).describe("Start development server in watch mode").option("-p, --port", "Port the dev server should listen on (defaults: 'preview.port' in config, or `$PORT` env variable, or 3000)").example("dev --config vite.config.js").action(async (entry, opts) => {
   const cmd = opts._.length ? `${entry} ${opts._.join(" ")}` : entry ? `node ${entry}` : void 0;
   const config2 = await getViteConfig(cwd, opts.config);
   await dev(cmd, config2, opts.port, opts.env);

package/dist/runtime/index.d.ts

@@ -1,21 +1,21 @@
-import type { HandlerLike, ParamsObject, Route, RouteContext } from "./types";
+import type { HandlerLike, ParamsObject, Route as AnyRoute, Context as AnyContext } from "./types";
 declare global {
     namespace Marko {
-        interface Global extends MarkoRun.CurrentContext {
+        interface Global extends MarkoRun.Context {
         }
         interface Out {
             global: Global;
         }
     }
     namespace MarkoRun {
-        const NotHandled: symbol;
-        const NotMatched: symbol;
-        interface CurrentRoute extends Route {
+        const NotHandled: unique symbol;
+        const NotMatched: unique symbol;
+        interface Route extends AnyRoute {
         }
-        interface CurrentContext extends RouteContext<CurrentRoute> {
+        interface Context extends AnyContext<Route> {
         }
-        type Handler<Params extends ParamsObject = {}, Meta = unknown> = HandlerLike<Route<Params, Meta, string>>;
+        type Handler<Params extends ParamsObject = {}, Meta = unknown> = HandlerLike<AnyRoute<Params, Meta, string>>;
         function route<Params extends ParamsObject = {}, Meta = unknown>(handler: Handler<Params, Meta>): typeof handler;
     }
 }
-export type { Fetch, HandlerLike, InputObject, Invoke, Match, NextFunction, PathTemplate, Route, RouteContext, RouteContextExtensions, RouteHandler, RouteWithHandler, RuntimeModule, ValidateHref, ValidatePath, } from "./types";
+export type { Fetch, HandlerLike, InputObject, Invoke, Match, NextFunction, PathTemplate, Route, Context, ContextExtensions, RouteHandler, RouteWithHandler, RuntimeModule, ValidateHref, ValidatePath, } from "./types";