@torpor/build 0.1.7 → 0.1.8

package/dist/server.cjs

@@ -0,0 +1,387 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+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/server.ts
+var server_exports = {};
+__export(server_exports, {
+  CookieHelper: () => CookieHelper,
+  HeaderHelper: () => HeaderHelper,
+  Server: () => Server,
+  ServerEvent: () => ServerEvent,
+  connectMiddleware: () => connectMiddleware
+});
+module.exports = __toCommonJS(server_exports);
+
+// src/server/CookieHelper.ts
+var import_cookie = require("cookie");
+var CookieHelper = class {
+  request;
+  cookies = /* @__PURE__ */ new Map();
+  constructor(request) {
+    this.request = request;
+  }
+  get(name) {
+    if (this.cookies.has(name)) {
+      return this.cookies.get(name);
+    }
+    const header = this.request.headers.get("cookie");
+    return (0, import_cookie.parse)(header ?? "")[name];
+  }
+  set(name, value, options) {
+    options ??= {};
+    options.httpOnly ??= true;
+    options.secure ??= true;
+    options.sameSite ??= "lax";
+    this.cookies.set(name, (0, import_cookie.serialize)(name, value, options));
+  }
+  delete(name, options) {
+    options ??= {};
+    options.expires = /* @__PURE__ */ new Date(0);
+    this.cookies.set(name, (0, import_cookie.serialize)(name, "", options));
+  }
+};
+
+// src/server/HeaderHelper.ts
+var HeaderHelper = class {
+  request;
+  headers = /* @__PURE__ */ new Map();
+  constructor(request) {
+    this.request = request;
+  }
+  get(name) {
+    if (this.headers.has(name)) {
+      return this.headers.get(name);
+    }
+    return this.request.headers.get(name) ?? void 0;
+  }
+  set(name, value) {
+    this.headers.set(name, value);
+  }
+  delete(name) {
+    this.headers.delete(name);
+  }
+};
+
+// src/site/pathToRegex.ts
+function pathToRegex(path) {
+  const pattern = path.split("/").map((p) => {
+    return p.replace(/\[([^\/]+?)\]/, "(?<$1>[^\\/]+?)");
+  }).join("\\/").replaceAll("*", ".*");
+  return new RegExp(`^${pattern}$`);
+}
+
+// src/server/ServerEvent.ts
+var ServerEvent = class {
+  request;
+  response;
+  // TODO: Should we cast types??
+  params;
+  cookies;
+  headers;
+  constructor(request, params) {
+    this.request = request;
+    this.params = params;
+    this.cookies = new CookieHelper(request);
+    this.headers = new HeaderHelper(request);
+  }
+  addHeaders() {
+    if (!this.response) {
+      throw new Error("Response not created yet");
+    }
+    for (let cookie of this.cookies.cookies.values()) {
+      this.response.headers.append("set-cookie", cookie);
+    }
+    for (let header of this.headers.headers.entries()) {
+      this.response.headers.append(header[0], header[1]);
+    }
+  }
+};
+
+// src/server/Server.ts
+var noop = () => {
+};
+var Server = class {
+  // TODO: We don't use any of the routes, just add("*") in runDev/runBuild...
+  routes = [];
+  // TODO: We only use the Vite middleware here
+  middleware = [];
+  constructor() {
+    this.routes = [];
+    this.middleware = [];
+  }
+  /**
+   * The standard Fetch API method that should work in any runtime (including
+   * Node with polyfills).
+   * @returns
+   */
+  fetch = async (input, init) => {
+    const request = new Request(input, init);
+    const url = new URL(request.url);
+    const match = this.match(url.pathname);
+    let ev = new ServerEvent(request, match?.params);
+    if (this.middleware.length) {
+      let buildNext2 = function(middleware, i) {
+        if (ev.response) {
+          return noop;
+        }
+        if (i < middleware.length - 1) {
+          let next = middleware[i + 1];
+          return async () => next(ev, buildNext2(middleware, i + 1));
+        } else {
+          return match ? async () => {
+            ev.response = await match.fn(ev);
+          } : noop;
+        }
+      };
+      var buildNext = buildNext2;
+      await this.middleware[0](ev, buildNext2(this.middleware, 0));
+    } else if (match) {
+      ev.response = await match.fn(ev);
+    } else {
+      return new Response(null, { status: 404 });
+    }
+    ev.response ??= new Response(null, { status: 200 });
+    ev.addHeaders();
+    return ev.response;
+  };
+  /**
+   * Adds a server function at a route path.
+   * @param path The route path pattern.
+   * @param fn The function to call when the pattern is matched.
+   * @returns
+   */
+  add(path, fn) {
+    this.routes.push(new RouteHandler(path, fn));
+    this.#sortRoutes();
+    return this;
+  }
+  match(path) {
+    for (let handler of this.routes) {
+      let match = path.match(handler.regex);
+      if (match) {
+        return {
+          fn: handler.fn,
+          params: match.groups
+        };
+      }
+    }
+    console.log(`Server path not found: ${path}`);
+  }
+  // TODO:
+  //use(path: string, ...fn: MiddlewareFunction[])
+  use(...fn) {
+    this.middleware = this.middleware.concat(fn);
+    return this;
+  }
+  #sortRoutes() {
+    this.routes = this.routes.sort((a, b) => {
+      for (let i = 0; i < Math.min(a.path.length, b.path.length); i++) {
+        if (a.path[i] === "[" && b.path[i] !== "[") {
+          return 1;
+        } else if (b.path[i] === "[" && a.path[i] !== "[") {
+          return -1;
+        } else if (a.path[i] === b.path[i]) {
+        } else {
+          return a.path[i].localeCompare(b.path[i]);
+        }
+      }
+      return a.path.length - b.path.length;
+    });
+  }
+};
+var RouteHandler = class {
+  path;
+  regex;
+  fn;
+  constructor(path, fn) {
+    this.path = path;
+    this.regex = pathToRegex(path);
+    this.fn = fn;
+  }
+};
+
+// src/server/connect/flattenHeaders.ts
+function flattenHeaders(headers) {
+  const flatHeaders = new Headers();
+  for (const [key, value] of Object.entries(headers)) {
+    if (value === void 0 || value === null) {
+      continue;
+    } else if (Array.isArray(value)) {
+      for (const v of value) {
+        if (v !== void 0 && v !== null) {
+          value.forEach((v2) => flatHeaders.append(key, v2));
+        }
+      }
+    } else {
+      flatHeaders.set(key, String(value));
+    }
+  }
+  return flatHeaders;
+}
+
+// src/server/connect/nodeMessageToNodeResponse.ts
+var import_node_http = require("http");
+var import_node_stream = require("stream");
+function nodeMessageToNodeResponse(incomingMessage) {
+  const res = new import_node_http.ServerResponse(incomingMessage);
+  const passThrough = new import_node_stream.PassThrough();
+  let handled = false;
+  const onReadable = (cb) => {
+    const handleReadable = () => {
+      if (handled) return;
+      handled = true;
+      cb({
+        readable: import_node_stream.Readable.from(passThrough),
+        headers: res.getHeaders(),
+        status: res.statusCode
+      });
+    };
+    passThrough.once("readable", handleReadable);
+    passThrough.once("end", handleReadable);
+  };
+  passThrough.once("finish", () => {
+    res.emit("finish");
+  });
+  passThrough.once("close", () => {
+    res.destroy();
+    res.emit("close");
+  });
+  passThrough.on("drain", () => {
+    res.emit("drain");
+  });
+  res.write = passThrough.write.bind(passThrough);
+  res.end = passThrough.end.bind(passThrough);
+  res.writeHead = function writeHead(statusCode, statusMessage, headers) {
+    res.statusCode = statusCode;
+    if (typeof statusMessage === "object") {
+      headers = statusMessage;
+      statusMessage = void 0;
+    }
+    if (headers) {
+      for (const [key, value] of Object.entries(headers)) {
+        if (value !== void 0) {
+          res.setHeader(key, value);
+        }
+      }
+    }
+    return res;
+  };
+  return {
+    res,
+    onReadable
+  };
+}
+
+// src/server/connect/readableToBuffer.ts
+function readableToBuffer(req) {
+  return new Promise((resolve, reject) => {
+    const chunks = [];
+    req.on("data", (chunk) => {
+      chunks.push(chunk);
+    });
+    req.on("end", () => {
+      resolve(Buffer.concat(chunks));
+    });
+    req.on("error", (err) => {
+      reject(err);
+    });
+  });
+}
+
+// src/server/connect/requestToNodeMessage.ts
+var import_node_stream2 = require("stream");
+var DUMMY_BASE_URL = "http://localhost";
+function requestToNodeMessage(request) {
+  const parsedUrl = new URL(request.url, DUMMY_BASE_URL);
+  const pathAndQuery = (parsedUrl.pathname || "") + (parsedUrl.search || "");
+  const body = (
+    /*request.body ? Readable.fromWeb(request.body as any) :*/
+    import_node_stream2.Readable.from([])
+  );
+  return Object.assign(body, {
+    url: pathAndQuery,
+    method: request.method,
+    headers: Object.fromEntries(request.headers)
+  });
+}
+
+// src/server/connect/connectMiddleware.ts
+function connectMiddleware(handler) {
+  return async (ev, next) => {
+    const req = requestToNodeMessage(ev.request);
+    const { res, onReadable } = nodeMessageToNodeResponse(req);
+    return new Promise(async (resolve, reject) => {
+      onReadable(async ({ readable, headers, status }) => {
+        const responseBody = statusCodesWithoutBody.includes(status) ? null : (
+          //(Readable.toWeb(readable) as ReadableStream);
+          // HACK: Chunked bodies are not being
+          // read correctly somewhere...
+          await readableToBuffer(readable)
+        );
+        ev.response = new Response(responseBody, {
+          status,
+          headers: flattenHeaders(headers)
+        });
+        resolve();
+      });
+      const cnext = async (error) => {
+        if (error) {
+          reject(error instanceof Error ? error : new Error(String(error)));
+        } else {
+          await next();
+          resolve();
+        }
+      };
+      try {
+        const handled = await handler(req, res, cnext);
+        if (handled === false) {
+          res.destroy();
+          resolve();
+        }
+      } catch (e) {
+        cnext(e);
+      }
+    });
+  };
+}
+var statusCodesWithoutBody = [
+  100,
+  // Continue
+  101,
+  // Switching Protocols
+  102,
+  // Processing (WebDAV)
+  103,
+  // Early Hints
+  204,
+  // No Content
+  205,
+  // Reset Content
+  304
+  // Not Modified
+];
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CookieHelper,
+  HeaderHelper,
+  Server,
+  ServerEvent,
+  connectMiddleware
+});
+//# sourceMappingURL=server.cjs.map

package/dist/server.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/server.ts","../src/server/CookieHelper.ts","../src/server/HeaderHelper.ts","../src/site/pathToRegex.ts","../src/server/ServerEvent.ts","../src/server/Server.ts","../src/server/connect/flattenHeaders.ts","../src/server/connect/nodeMessageToNodeResponse.ts","../src/server/connect/readableToBuffer.ts","../src/server/connect/requestToNodeMessage.ts","../src/server/connect/connectMiddleware.ts"],"sourcesContent":["import CookieHelper from \"./server/CookieHelper\";\nimport HeaderHelper from \"./server/HeaderHelper\";\nimport Server from \"./server/Server\";\nimport ServerEvent from \"./server/ServerEvent\";\nimport connectMiddleware from \"./server/connect/connectMiddleware\";\n\nexport { Server, ServerEvent, CookieHelper, HeaderHelper, connectMiddleware };\n","import { SerializeOptions, parse, serialize } from \"cookie\";\n\nexport default class CookieHelper {\n\trequest: Request;\n\tcookies: Map<string, string> = new Map();\n\n\tconstructor(request: Request) {\n\t\tthis.request = request;\n\t}\n\n\tget(name: string): string | undefined {\n\t\t// If it's been set, return the updated value\n\t\tif (this.cookies.has(name)) {\n\t\t\treturn this.cookies.get(name);\n\t\t}\n\t\t// Otherwise, return the cookie value from the `Cookie` header\n\t\tconst header = this.request.headers.get(\"cookie\");\n\t\treturn parse(header ?? \"\")[name];\n\t}\n\n\tset(name: string, value: string, options?: SerializeOptions) {\n\t\t// Set a cookie header with some default values for security\n\t\toptions ??= {};\n\t\toptions.httpOnly ??= true;\n\t\toptions.secure ??= true;\n\t\toptions.sameSite ??= \"lax\";\n\t\tthis.cookies.set(name, serialize(name, value, options));\n\t}\n\n\tdelete(name: string, options?: SerializeOptions) {\n\t\t// Set a cookie header with an immediate expiry date\n\t\toptions ??= {};\n\t\toptions.expires = new Date(0);\n\t\tthis.cookies.set(name, serialize(name, \"\", options));\n\t}\n}\n","export default class HeaderHelper {\n\trequest: Request;\n\theaders: Map<string, string> = new Map();\n\n\tconstructor(request: Request) {\n\t\tthis.request = request;\n\t}\n\n\tget(name: string): string | undefined {\n\t\t// If it's been set, return the updated value\n\t\tif (this.headers.has(name)) {\n\t\t\treturn this.headers.get(name);\n\t\t}\n\t\t// Otherwise, return the value from the header\n\t\treturn this.request.headers.get(name) ?? undefined;\n\t}\n\n\tset(name: string, value: string) {\n\t\tthis.headers.set(name, value);\n\t}\n\n\tdelete(name: string) {\n\t\tthis.headers.delete(name);\n\t}\n}\n","export default function pathToRegex(path: string): RegExp {\n\tconst pattern = path\n\t\t.split(\"/\")\n\t\t.map((p) => {\n\t\t\treturn p.replace(/\\[([^\\/]+?)\\]/, \"(?<$1>[^\\\\/]+?)\");\n\t\t})\n\t\t.join(\"\\\\/\")\n\t\t.replaceAll(\"*\", \".*\");\n\treturn new RegExp(`^${pattern}$`);\n}\n","import CookieHelper from \"./CookieHelper\";\nimport HeaderHelper from \"./HeaderHelper\";\n\nexport default class ServerEvent {\n\trequest: Request;\n\tresponse?: Response;\n\t// TODO: Should we cast types??\n\tparams?: { [key: string]: string };\n\n\tcookies: CookieHelper;\n\theaders: HeaderHelper;\n\n\tconstructor(request: Request, params?: { [key: string]: string }) {\n\t\tthis.request = request;\n\t\tthis.params = params;\n\t\tthis.cookies = new CookieHelper(request);\n\t\tthis.headers = new HeaderHelper(request);\n\t}\n\n\taddHeaders() {\n\t\tif (!this.response) {\n\t\t\tthrow new Error(\"Response not created yet\");\n\t\t}\n\n\t\tfor (let cookie of this.cookies.cookies.values()) {\n\t\t\tthis.response.headers.append(\"set-cookie\", cookie);\n\t\t}\n\n\t\tfor (let header of this.headers.headers.entries()) {\n\t\t\tthis.response.headers.append(header[0], header[1]);\n\t\t}\n\t}\n}\n","import pathToRegex from \"../site/pathToRegex\";\nimport ServerEvent from \"./ServerEvent\";\nimport type MiddlewareFunction from \"./types/MiddlewareFunction\";\nimport type ServerFunction from \"./types/ServerFunction\";\n\nconst noop = () => {};\n\n/**\n * A Fetch API Request/Response server.\n */\nexport default class Server {\n\t// TODO: We don't use any of the routes, just add(\"*\") in runDev/runBuild...\n\troutes: RouteHandler[] = [];\n\t// TODO: We only use the Vite middleware here\n\tmiddleware: MiddlewareFunction[] = [];\n\n\tconstructor() {\n\t\tthis.routes = [];\n\t\tthis.middleware = [];\n\t}\n\n\t/**\n\t * The standard Fetch API method that should work in any runtime (including\n\t * Node with polyfills).\n\t * @returns\n\t */\n\tfetch = async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {\n\t\tconst request = new Request(input, init);\n\t\tconst url = new URL(request.url);\n\t\tconst match = this.match(url.pathname);\n\t\tlet ev = new ServerEvent(request, match?.params);\n\n\t\tif (this.middleware.length) {\n\t\t\t// TODO: Get middleware that applies to this route only?\n\t\t\tawait this.middleware[0](ev, buildNext(this.middleware, 0));\n\t\t\tfunction buildNext(middleware: MiddlewareFunction[], i: number): () => void | Promise<void> {\n\t\t\t\tif (ev.response) {\n\t\t\t\t\treturn noop;\n\t\t\t\t}\n\n\t\t\t\tif (i < middleware.length - 1) {\n\t\t\t\t\tlet next = middleware[i + 1];\n\t\t\t\t\treturn async () => next(ev, buildNext(middleware, i + 1));\n\t\t\t\t} else {\n\t\t\t\t\treturn match\n\t\t\t\t\t\t? async () => {\n\t\t\t\t\t\t\t\tev.response = await match.fn(ev);\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t: noop;\n\t\t\t\t}\n\t\t\t}\n\t\t} else if (match) {\n\t\t\tev.response = await match.fn(ev);\n\t\t} else {\n\t\t\treturn new Response(null, { status: 404 });\n\t\t}\n\n\t\t// TODO: Should I be returning 200 if there's no response? Because it's not an error??\n\t\tev.response ??= new Response(null, { status: 200 });\n\t\tev.addHeaders();\n\n\t\treturn ev.response;\n\t};\n\n\t/**\n\t * Adds a server function at a route path.\n\t * @param path The route path pattern.\n\t * @param fn The function to call when the pattern is matched.\n\t * @returns\n\t */\n\tadd(path: string, fn: ServerFunction): Server {\n\t\tthis.routes.push(new RouteHandler(path, fn));\n\t\tthis.#sortRoutes();\n\t\treturn this;\n\t}\n\n\tmatch(path: string) {\n\t\tfor (let handler of this.routes) {\n\t\t\tlet match = path.match(handler.regex);\n\t\t\tif (match) {\n\t\t\t\treturn {\n\t\t\t\t\tfn: handler.fn,\n\t\t\t\t\tparams: match.groups,\n\t\t\t\t};\n\t\t\t}\n\t\t}\n\t\tconsole.log(`Server path not found: ${path}`);\n\t}\n\n\t// TODO:\n\t//use(path: string, ...fn: MiddlewareFunction[])\n\tuse(...fn: MiddlewareFunction[]): Server {\n\t\tthis.middleware = this.middleware.concat(fn);\n\t\treturn this;\n\t}\n\n\t#sortRoutes() {\n\t\tthis.routes = this.routes.sort((a, b) => {\n\t\t\t// Sort [param]s after paths\n\t\t\t// There might be a quicker/easier way to do this\n\t\t\tfor (let i = 0; i < Math.min(a.path.length, b.path.length); i++) {\n\t\t\t\tif (a.path[i] === \"[\" && b.path[i] !== \"[\") {\n\t\t\t\t\treturn 1;\n\t\t\t\t} else if (b.path[i] === \"[\" && a.path[i] !== \"[\") {\n\t\t\t\t\treturn -1;\n\t\t\t\t} else if (a.path[i] === b.path[i]) {\n\t\t\t\t\t// Keep going...\n\t\t\t\t} else {\n\t\t\t\t\treturn a.path[i].localeCompare(b.path[i]);\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn a.path.length - b.path.length;\n\t\t});\n\t}\n}\n\nclass RouteHandler {\n\tpath: string;\n\tregex: RegExp;\n\tfn: ServerFunction;\n\n\tconstructor(path: string, fn: ServerFunction) {\n\t\tthis.path = path;\n\t\tthis.regex = pathToRegex(path);\n\t\tthis.fn = fn;\n\t}\n}\n\n//class MiddlewareHandler {\n//\tpath: string;\n//\tregex: RegExp;\n//\tfn: MiddlewareFunction;\n//\n//\tconstructor(path: string, fn: MiddlewareFunction) {\n//\t\tthis.path = path;\n//\t\tthis.regex = pathToRegex(path);\n//\t\tthis.fn = fn;\n//\t}\n//}\n","import { IncomingHttpHeaders } from \"node:http\";\nimport { OutgoingHttpHeaders } from \"node:http2\";\n\nexport default function flattenHeaders(\n\theaders: IncomingHttpHeaders | OutgoingHttpHeaders,\n): HeadersInit {\n\tconst flatHeaders = new Headers();\n\tfor (const [key, value] of Object.entries(headers)) {\n\t\tif (value === undefined || value === null) {\n\t\t\tcontinue;\n\t\t} else if (Array.isArray(value)) {\n\t\t\tfor (const v of value) {\n\t\t\t\tif (v !== undefined && v !== null) {\n\t\t\t\t\tvalue.forEach((v) => flatHeaders.append(key, v));\n\t\t\t\t}\n\t\t\t}\n\t\t} else {\n\t\t\tflatHeaders.set(key, String(value));\n\t\t}\n\t}\n\treturn flatHeaders;\n\n\t/*\n            const flatHeaders: [string, string][] = [];\n\n\tfor (const [key, value] of Object.entries(headers)) {\n\t\tif (value === undefined || value === null) {\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (Array.isArray(value)) {\n\t\t\tfor (const v of value) {\n\t\t\t\tif (v != null) {\n\t\t\t\t\tflatHeaders.push([key, String(v)]);\n\t\t\t\t}\n\t\t\t}\n\t\t} else {\n\t\t\tflatHeaders.push([key, String(value)]);\n\t\t}\n\t}\n\n\treturn flatHeaders;\n    */\n}\n","import {\n\ttype IncomingMessage,\n\ttype OutgoingHttpHeader,\n\ttype OutgoingHttpHeaders,\n\tServerResponse,\n} from \"node:http\";\nimport { PassThrough, Readable } from \"node:stream\";\n\n// From https://github.com/vikejs/vike-node/blob/main/packages/vike-node/src/runtime/adapters/createServerResponse.ts\n\n/**\n * Creates a custom ServerResponse object that allows for intercepting and\n * streaming the response.\n *\n * @param incomingMessage The incoming HTTP request message.\n * @returns An object containing the custom ServerResponse and a function that\n * takes a callback to invoke when the response is readable, providing an object\n * with the readable stream, headers and status code.\n */\nexport default function nodeMessageToNodeResponse(\n\tincomingMessage: IncomingMessage,\n): ServerResponseResponse {\n\tconst res = new ServerResponse(incomingMessage);\n\tconst passThrough = new PassThrough();\n\tlet handled = false;\n\n\tconst onReadable = (\n\t\tcb: (result: { readable: Readable; headers: OutgoingHttpHeaders; status: number }) => void,\n\t) => {\n\t\tconst handleReadable = () => {\n\t\t\tif (handled) return;\n\t\t\thandled = true;\n\t\t\tcb({\n\t\t\t\treadable: Readable.from(passThrough),\n\t\t\t\theaders: res.getHeaders(),\n\t\t\t\tstatus: res.statusCode,\n\t\t\t});\n\t\t};\n\n\t\tpassThrough.once(\"readable\", handleReadable);\n\t\tpassThrough.once(\"end\", handleReadable);\n\t};\n\n\tpassThrough.once(\"finish\", () => {\n\t\tres.emit(\"finish\");\n\t});\n\tpassThrough.once(\"close\", () => {\n\t\tres.destroy();\n\t\tres.emit(\"close\");\n\t});\n\tpassThrough.on(\"drain\", () => {\n\t\tres.emit(\"drain\");\n\t});\n\n\tres.write = passThrough.write.bind(passThrough);\n\tres.end = passThrough.end.bind(passThrough) as any;\n\n\tres.writeHead = function writeHead(\n\t\tstatusCode: number,\n\t\tstatusMessage?: string | OutgoingHttpHeaders | OutgoingHttpHeader[],\n\t\theaders?: OutgoingHttpHeaders | OutgoingHttpHeader[],\n\t): ServerResponse {\n\t\tres.statusCode = statusCode;\n\t\tif (typeof statusMessage === \"object\") {\n\t\t\theaders = statusMessage;\n\t\t\tstatusMessage = undefined;\n\t\t}\n\t\tif (headers) {\n\t\t\tfor (const [key, value] of Object.entries(headers)) {\n\t\t\t\tif (value !== undefined) {\n\t\t\t\t\tres.setHeader(key, value);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn res;\n\t};\n\n\treturn {\n\t\tres,\n\t\tonReadable,\n\t};\n}\n\ntype ServerResponseResponse = {\n\tres: ServerResponse;\n\tonReadable: (\n\t\tcb: (result: { readable: Readable; headers: OutgoingHttpHeaders; status: number }) => void,\n\t) => void;\n};\n","import { Readable } from \"node:stream\";\n\nexport default function readableToBuffer(req: Readable): Promise<Buffer> {\n\treturn new Promise<Buffer>((resolve, reject) => {\n\t\tconst chunks: Buffer[] = [];\n\t\treq.on(\"data\", (chunk: Buffer) => {\n\t\t\tchunks.push(chunk);\n\t\t});\n\t\treq.on(\"end\", () => {\n\t\t\tresolve(Buffer.concat(chunks));\n\t\t});\n\t\treq.on(\"error\", (err) => {\n\t\t\treject(err);\n\t\t});\n\t});\n}\n","import { type IncomingMessage } from \"node:http\";\nimport { Readable } from \"node:stream\";\n\n// From https://github.com/vikejs/vike-node/blob/main/packages/vike-node/src/runtime/adapters/connectToWeb.ts\n\nconst DUMMY_BASE_URL = \"http://localhost\";\n\n/**\n * Creates an IncomingMessage object from a web Request.\n *\n * @param {Request} request - The web Request object.\n * @returns {IncomingMessage} An IncomingMessage-like object compatible with Node.js HTTP module.\n */\nexport default function requestToNodeMessage(request: Request): IncomingMessage {\n\tconst parsedUrl = new URL(request.url, DUMMY_BASE_URL);\n\tconst pathAndQuery = (parsedUrl.pathname || \"\") + (parsedUrl.search || \"\");\n\t// HACK: Using Readable.fromWeb locks request.body so that the request cannot be used again\n\t// As we're only using this for Vite middlewares, it's safe to discard the body for now?\n\tconst body = /*request.body ? Readable.fromWeb(request.body as any) :*/ Readable.from([]);\n\n\treturn Object.assign(body, {\n\t\turl: pathAndQuery,\n\t\tmethod: request.method,\n\t\theaders: Object.fromEntries(request.headers),\n\t}) as IncomingMessage;\n}\n","import { IncomingMessage, ServerResponse } from \"node:http\";\nimport type MiddlewareFunction from \"../types/MiddlewareFunction\";\nimport flattenHeaders from \"./flattenHeaders\";\nimport nodeMessageToNodeResponse from \"./nodeMessageToNodeResponse\";\nimport readableToBuffer from \"./readableToBuffer\";\nimport requestToNodeMessage from \"./requestToNodeMessage\";\n\n// From https://github.com/vikejs/vike-node/blob/main/packages/vike-node/src/runtime/adapters/connectToWeb.ts\n\n/**\n * Converts a Connect-style middleware to a web-compatible request handler.\n *\n * @param handler - The Connect-style middleware function to be converted.\n * @returns A function that handles web requests and returns a Response or undefined.\n */\nexport default function connectMiddleware(\n\thandler: ConnectMiddleware | ConnectMiddlewareBoolean,\n): MiddlewareFunction {\n\treturn async (ev, next) => {\n\t\tconst req = requestToNodeMessage(ev.request);\n\t\tconst { res, onReadable } = nodeMessageToNodeResponse(req);\n\n\t\treturn new Promise<void>(async (resolve, reject) => {\n\t\t\tonReadable(async ({ readable, headers, status }) => {\n\t\t\t\tconst responseBody = statusCodesWithoutBody.includes(status)\n\t\t\t\t\t? null\n\t\t\t\t\t: //(Readable.toWeb(readable) as ReadableStream);\n\t\t\t\t\t\t// HACK: Chunked bodies are not being\n\t\t\t\t\t\t// read correctly somewhere...\n\t\t\t\t\t\tawait readableToBuffer(readable);\n\t\t\t\tev.response = new Response(responseBody, {\n\t\t\t\t\tstatus,\n\t\t\t\t\theaders: flattenHeaders(headers),\n\t\t\t\t});\n\t\t\t\tresolve();\n\t\t\t});\n\n\t\t\tconst cnext = async (error?: unknown) => {\n\t\t\t\tif (error) {\n\t\t\t\t\treject(error instanceof Error ? error : new Error(String(error)));\n\t\t\t\t} else {\n\t\t\t\t\t// TODO: Can we nest the next functions less? This is a bit weird\n\t\t\t\t\tawait next();\n\t\t\t\t\tresolve();\n\t\t\t\t}\n\t\t\t};\n\n\t\t\ttry {\n\t\t\t\tconst handled = await handler(req, res, cnext);\n\t\t\t\tif (handled === false) {\n\t\t\t\t\tres.destroy();\n\t\t\t\t\tresolve();\n\t\t\t\t}\n\t\t\t} catch (e) {\n\t\t\t\tcnext(e);\n\t\t\t}\n\t\t});\n\t};\n}\n\nconst statusCodesWithoutBody = [\n\t100, // Continue\n\t101, // Switching Protocols\n\t102, // Processing (WebDAV)\n\t103, // Early Hints\n\t204, // No Content\n\t205, // Reset Content\n\t304, // Not Modified\n];\n\ntype NextFunction = (err?: unknown) => void;\ntype ConnectMiddleware<\n\tPlatformRequest extends IncomingMessage = IncomingMessage,\n\tPlatformResponse extends ServerResponse = ServerResponse,\n> = (req: PlatformRequest, res: PlatformResponse, next: NextFunction) => void | Promise<void>;\ntype ConnectMiddlewareBoolean<\n\tPlatformRequest extends IncomingMessage = IncomingMessage,\n\tPlatformResponse extends ServerResponse = ServerResponse,\n> = (req: PlatformRequest, res: PlatformResponse, next: NextFunction) => boolean | Promise<boolean>;\n"],"mappings":"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","names":["buildNext","v","import_node_stream"]}

package/dist/server.d.cts

@@ -0,0 +1,17 @@
+import { M as MiddlewareFunction } from './Server-B45PD5Ys.cjs';
+export { C as CookieHelper, H as HeaderHelper, S as Server, a as ServerEvent } from './Server-B45PD5Ys.cjs';
+import { IncomingMessage, ServerResponse } from 'node:http';
+import 'cookie';
+
+/**
+ * Converts a Connect-style middleware to a web-compatible request handler.
+ *
+ * @param handler - The Connect-style middleware function to be converted.
+ * @returns A function that handles web requests and returns a Response or undefined.
+ */
+declare function connectMiddleware(handler: ConnectMiddleware | ConnectMiddlewareBoolean): MiddlewareFunction;
+type NextFunction = (err?: unknown) => void;
+type ConnectMiddleware<PlatformRequest extends IncomingMessage = IncomingMessage, PlatformResponse extends ServerResponse = ServerResponse> = (req: PlatformRequest, res: PlatformResponse, next: NextFunction) => void | Promise<void>;
+type ConnectMiddlewareBoolean<PlatformRequest extends IncomingMessage = IncomingMessage, PlatformResponse extends ServerResponse = ServerResponse> = (req: PlatformRequest, res: PlatformResponse, next: NextFunction) => boolean | Promise<boolean>;
+
+export { connectMiddleware };

package/dist/server.d.ts

@@ -0,0 +1,17 @@
+import { M as MiddlewareFunction } from './Server-B45PD5Ys.js';
+export { C as CookieHelper, H as HeaderHelper, S as Server, a as ServerEvent } from './Server-B45PD5Ys.js';
+import { IncomingMessage, ServerResponse } from 'node:http';
+import 'cookie';
+
+/**
+ * Converts a Connect-style middleware to a web-compatible request handler.
+ *
+ * @param handler - The Connect-style middleware function to be converted.
+ * @returns A function that handles web requests and returns a Response or undefined.
+ */
+declare function connectMiddleware(handler: ConnectMiddleware | ConnectMiddlewareBoolean): MiddlewareFunction;
+type NextFunction = (err?: unknown) => void;
+type ConnectMiddleware<PlatformRequest extends IncomingMessage = IncomingMessage, PlatformResponse extends ServerResponse = ServerResponse> = (req: PlatformRequest, res: PlatformResponse, next: NextFunction) => void | Promise<void>;
+type ConnectMiddlewareBoolean<PlatformRequest extends IncomingMessage = IncomingMessage, PlatformResponse extends ServerResponse = ServerResponse> = (req: PlatformRequest, res: PlatformResponse, next: NextFunction) => boolean | Promise<boolean>;
+
+export { connectMiddleware };

package/dist/server.js

@@ -0,0 +1,16 @@
+import {
+  CookieHelper,
+  HeaderHelper,
+  Server,
+  ServerEvent,
+  connectMiddleware
+} from "./chunk-65Z6BF2N.js";
+import "./chunk-T5K52YVJ.js";
+export {
+  CookieHelper,
+  HeaderHelper,
+  Server,
+  ServerEvent,
+  connectMiddleware
+};
+//# sourceMappingURL=server.js.map

package/dist/server.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torpor/build",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "A framework for building sites and apps with Torpor",
   "type": "module",
   "main": "dist/index.cjs",
@@ -27,18 +27,13 @@
       "import": "./dist/run.js",
       "require": "./dist/run.cjs"
     },
+    "./server": {
+      "types": "./dist/server.d.ts",
+      "import": "./dist/server.js",
+      "require": "./dist/server.cjs"
+    },
     "./manifest": {
       "types": "./src/types/manifest.d.ts"
-    },
-    "./adapters/node": {
-      "types": "./dist/adapters/node/index.d.ts",
-      "import": "./dist/adapters/node/index.js",
-      "require": "./dist/adapters/node/index.cjs"
-    },
-    "./adapters/cloudflare": {
-      "types": "./dist/adapters/cloudflare/index.d.ts",
-      "import": "./dist/adapters/cloudflare/index.js",
-      "require": "./dist/adapters/cloudflare/index.cjs"
     }
   },
   "publishConfig": {
@@ -55,8 +50,8 @@
     "dotenv": "^16.4.7",
     "vite": "^6.2.5",
     "vite-tsconfig-paths": "^5.1.4",
-    "@torpor/view": "^0.0.10",
-    "@torpor/unplugin": "^0.1.3"
+    "@torpor/unplugin": "^0.1.4",
+    "@torpor/view": "^0.0.10"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",

package/src/index.ts

@@ -1,4 +1,4 @@
-import Server from "./server/Server";
+import Router from "./site/Router";
 import Site from "./site/Site";
 import type Adapter from "./types/Adapter";
 import type PageEndPoint from "./types/PageEndPoint";
@@ -11,7 +11,7 @@ import type ServerHook from "./types/ServerHook";
 import type ServerLoadEvent from "./types/ServerLoadEvent";
 import type ServerRequest from "./types/ServerRequest";
 
-export { Server, Site };
+export { Site, Router };
 
 export type {
 	Adapter,

package/src/{site → server}/Routerx.ts

@@ -1,7 +1,7 @@
-import ServerFunction from "../server/ServerFunction";
-import type HttpMethod from "../types/HttpMethod";
-import type MiddlewareFunction from "../types/MiddlewareFunction";
-import pathToRegex from "./pathToRegex";
+import pathToRegex from "../site/pathToRegex";
+import type HttpMethod from "./types/HttpMethod";
+import type MiddlewareFunction from "./types/MiddlewareFunction";
+import type ServerFunction from "./types/ServerFunction";
 
 // This is not actually used anywhere, for now at least
 

package/src/server/Server.ts

@@ -1,7 +1,7 @@
 import pathToRegex from "../site/pathToRegex";
-import type MiddlewareFunction from "../types/MiddlewareFunction";
 import ServerEvent from "./ServerEvent";
-import type ServerFunction from "./ServerFunction";
+import type MiddlewareFunction from "./types/MiddlewareFunction";
+import type ServerFunction from "./types/ServerFunction";
 
 const noop = () => {};
 
@@ -70,6 +70,7 @@ export default class Server {
 	 */
 	add(path: string, fn: ServerFunction): Server {
 		this.routes.push(new RouteHandler(path, fn));
+		this.#sortRoutes();
 		return this;
 	}
 
@@ -92,6 +93,25 @@ export default class Server {
 		this.middleware = this.middleware.concat(fn);
 		return this;
 	}
+
+	#sortRoutes() {
+		this.routes = this.routes.sort((a, b) => {
+			// Sort [param]s after paths
+			// There might be a quicker/easier way to do this
+			for (let i = 0; i < Math.min(a.path.length, b.path.length); i++) {
+				if (a.path[i] === "[" && b.path[i] !== "[") {
+					return 1;
+				} else if (b.path[i] === "[" && a.path[i] !== "[") {
+					return -1;
+				} else if (a.path[i] === b.path[i]) {
+					// Keep going...
+				} else {
+					return a.path[i].localeCompare(b.path[i]);
+				}
+			}
+			return a.path.length - b.path.length;
+		});
+	}
 }
 
 class RouteHandler {

package/src/server/connect/{createMiddlewareHandler.ts → connectMiddleware.ts}

@@ -1,5 +1,5 @@
 import { IncomingMessage, ServerResponse } from "node:http";
-import type MiddlewareFunction from "../../types/MiddlewareFunction";
+import type MiddlewareFunction from "../types/MiddlewareFunction";
 import flattenHeaders from "./flattenHeaders";
 import nodeMessageToNodeResponse from "./nodeMessageToNodeResponse";
 import readableToBuffer from "./readableToBuffer";
@@ -13,7 +13,7 @@ import requestToNodeMessage from "./requestToNodeMessage";
  * @param handler - The Connect-style middleware function to be converted.
  * @returns A function that handles web requests and returns a Response or undefined.
  */
-export default function createMiddlewareHandler(
+export default function connectMiddleware(
 	handler: ConnectMiddleware | ConnectMiddlewareBoolean,
 ): MiddlewareFunction {
 	return async (ev, next) => {

package/src/{types → server/types}/MiddlewareFunction.ts

@@ -1,4 +1,4 @@
-import ServerEvent from "../server/ServerEvent";
+import ServerEvent from "../ServerEvent";
 
 type MiddlewareFunction = (
 	ev: ServerEvent,

package/src/server/{ServerFunction.ts → types/ServerFunction.ts}

@@ -1,4 +1,4 @@
-import ServerEvent from "./ServerEvent";
+import ServerEvent from "../ServerEvent";
 
 type ServerFunction = (e: ServerEvent) => Response | Promise<Response | undefined> | undefined;
 

package/src/server.ts

@@ -0,0 +1,7 @@
+import CookieHelper from "./server/CookieHelper";
+import HeaderHelper from "./server/HeaderHelper";
+import Server from "./server/Server";
+import ServerEvent from "./server/ServerEvent";
+import connectMiddleware from "./server/connect/connectMiddleware";
+
+export { Server, ServerEvent, CookieHelper, HeaderHelper, connectMiddleware };