@sourceregistry/node-webserver 1.1.0 → 1.2.1

package/dist/index.es.js

@@ -1,14 +1,14 @@
-import { createReadStream as k } from "node:fs";
-import { stat as W, realpath as L, lstat as I } from "node:fs/promises";
-import { sep as D, resolve as O, relative as $, isAbsolute as U, extname as F } from "node:path";
-import { Readable as z } from "node:stream";
-import { createServer as B } from "http";
-import { createServer as q } from "https";
-import { TLSSocket as X } from "tls";
-import { Readable as G, Transform as J, Writable as V } from "stream";
-import { WebSocketServer as K, WebSocket as P } from "ws";
-import { parse as E, serialize as Y } from "cookie";
-const Q = {
+import { createReadStream as I } from "node:fs";
+import { stat as L, realpath as O, lstat as D } from "node:fs/promises";
+import { sep as $, resolve as v, relative as U, isAbsolute as F, extname as z } from "node:path";
+import { Readable as B } from "node:stream";
+import { createServer as q } from "http";
+import { createServer as X } from "https";
+import { TLSSocket as G } from "tls";
+import { Readable as J, Transform as V, Writable as K } from "stream";
+import { WebSocketServer as Y, WebSocket as E } from "ws";
+import { parse as T, serialize as Q } from "cookie";
+const Z = {
   ".avif": "image/avif",
   ".css": "text/css; charset=utf-8",
   ".gif": "image/gif",
@@ -26,49 +26,49 @@ const Q = {
   ".wasm": "application/wasm",
   ".webp": "image/webp",
   ".xml": "application/xml; charset=utf-8"
-}, Z = {
+}, ee = {
   index: "index.html",
   cacheControl: "public, max-age=0",
   dotFiles: "ignore"
 };
-async function ee(o, e, t = {}) {
+async function te(a, e, t = {}) {
   const s = ae(e), r = {
-    ...Z,
+    ...ee,
     ...t
-  }, n = await te(o), a = se(s, r.dotFiles);
-  if (a instanceof Response)
-    return a;
-  const i = a.length > 0 ? a.join(D) : "", l = O(n, i);
-  if (!v(n, l))
+  }, n = await se(a), o = re(s, r.dotFiles);
+  if (o instanceof Response)
+    return o;
+  const i = o.length > 0 ? o.join($) : "", u = v(n, i);
+  if (!_(n, u))
     return new Response("Forbidden", { status: 403 });
-  const c = await re(l, n, r.index);
+  const c = await ne(u, n, r.index);
   if (c instanceof Response)
     return c;
-  const u = await W(c), d = new Headers({
-    "content-length": String(u.size),
-    "content-type": ne(c),
+  const l = await L(c), d = new Headers({
+    "content-length": String(l.size),
+    "content-type": oe(c),
     "cache-control": r.cacheControl,
-    "last-modified": u.mtime.toUTCString(),
+    "last-modified": l.mtime.toUTCString(),
     "x-content-type-options": "nosniff"
   });
   if (t.headers) {
-    const h = typeof t.headers == "function" ? t.headers(c, u) : t.headers;
+    const h = typeof t.headers == "function" ? t.headers(c, l) : t.headers;
     new Headers(h).forEach((f, y) => {
       d.set(y, f);
     });
   }
-  return new Response(z.toWeb(k(c)), {
+  return new Response(B.toWeb(I(c)), {
     status: 200,
     headers: d
   });
 }
-async function te(o) {
-  return L(o);
+async function se(a) {
+  return O(a);
 }
-function se(o, e) {
-  if (o.includes("\0"))
+function re(a, e) {
+  if (a.includes("\0"))
     return new Response("Bad Request", { status: 400 });
-  const t = o.replace(/\\/g, "/").split("/").filter(Boolean), s = [];
+  const t = a.replace(/\\/g, "/").split("/").filter(Boolean), s = [];
   for (const r of t) {
     let n;
     try {
@@ -90,42 +90,45 @@ function se(o, e) {
   }
   return s;
 }
-async function re(o, e, t) {
+async function ne(a, e, t) {
   try {
-    if ((await I(o)).isDirectory()) {
-      const r = O(o, t);
-      return T(r, e);
+    if ((await D(a)).isDirectory()) {
+      const r = v(a, t);
+      return C(r, e);
     }
-    return T(o, e);
+    return C(a, e);
   } catch {
     return new Response("Not Found", { status: 404 });
   }
 }
-async function T(o, e) {
+async function C(a, e) {
   try {
-    const t = await L(o);
-    return v(e, t) ? (await W(t)).isFile() ? t : new Response("Not Found", { status: 404 }) : new Response("Forbidden", { status: 403 });
+    const t = await O(a);
+    return _(e, t) ? (await L(t)).isFile() ? t : new Response("Not Found", { status: 404 }) : new Response("Forbidden", { status: 403 });
   } catch {
     return new Response("Not Found", { status: 404 });
   }
 }
-function v(o, e) {
-  const t = $(o, e);
-  return t === "" || !t.startsWith("..") && !U(t);
+function _(a, e) {
+  const t = U(a, e);
+  return t === "" || !t.startsWith("..") && !F(t);
 }
-function ne(o) {
-  return Q[F(o).toLowerCase()] ?? "application/octet-stream";
+function oe(a) {
+  return Z[z(a).toLowerCase()] ?? "application/octet-stream";
 }
-function ae(o) {
-  return typeof o.params.path == "string" ? o.params.path : o.url.pathname.replace(/^\/+/, "");
+function ae(a) {
+  return typeof a.params.path == "string" ? a.params.path : a.url.pathname.replace(/^\/+/, "");
 }
-function _(o) {
-  return o instanceof Response && o.status >= 400 && o.status < 600;
+function N(a) {
+  return x(a) && a.status >= 400 && a.status < 600;
 }
-function N(o) {
-  return o instanceof Response && o.status >= 300 && o.status < 400;
+function j(a) {
+  return x(a) && a.status >= 300 && a.status < 400;
 }
-class oe {
+function x(a) {
+  return a instanceof Response;
+}
+class ie {
   constructor(e) {
     this.data = /* @__PURE__ */ new Map(), this.windowMs = e.windowMs, this.startCleanup();
   }
@@ -148,26 +151,26 @@ class oe {
     this.data.clear();
   }
 }
-function ie(o) {
+function ce(a) {
   const {
     windowMs: e = 6e4,
     max: t,
     key: s = (c) => c.getClientAddress(),
     message: r = "Too many requests, please try again later.",
     statusCode: n = 429,
-    headers: a = "include",
+    headers: o = "include",
     onRateLimit: i,
-    store: l = new oe({ windowMs: e })
-  } = o;
-  return async (c, u) => {
-    const d = `rl:${s(c)}`, { current: h, reset: f } = await l.incr(d), y = Math.ceil((f - Date.now()) / 1e3);
+    store: u = new ie({ windowMs: e })
+  } = a;
+  return async (c, l) => {
+    const d = `rl:${s(c)}`, { current: h, reset: f } = await u.incr(d), y = Math.ceil((f - Date.now()) / 1e3);
     if (h > t) {
       i && i(c, { current: h, max: t, key: d });
       const w = {
         status: n,
         headers: new Headers()
       }, p = w.headers;
-      a === "include" && (p.set("X-RateLimit-Limit", String(t)), p.set("X-RateLimit-Remaining", "0"), p.set("X-RateLimit-Reset", String(Math.floor(f / 1e3))), p.set("Retry-After", String(y)));
+      o === "include" && (p.set("X-RateLimit-Limit", String(t)), p.set("X-RateLimit-Remaining", "0"), p.set("X-RateLimit-Reset", String(Math.floor(f / 1e3))), p.set("Retry-After", String(y)));
       let m;
       return typeof r == "string" ? (m = r, p.set("Content-Type", "text/plain")) : (m = JSON.stringify(r), p.set("Content-Type", "application/json")), new Response(m, w);
     }
@@ -176,7 +179,7 @@ function ie(o) {
       limit: t,
       reset: new Date(f),
       remaining: t - h
-    }, a === "include") {
+    }, o === "include") {
       const w = {
         "X-RateLimit-Limit": String(t),
         "X-RateLimit-Remaining": String(t - h),
@@ -189,13 +192,13 @@ function ie(o) {
         });
       }, p(w);
     }
-    return u();
+    return l();
   };
 }
-const Ee = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Te = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  fixedWindowLimit: ie
-}, Symbol.toStringTag, { value: "Module" })), ce = [
+  fixedWindowLimit: ce
+}, Symbol.toStringTag, { value: "Module" })), ue = [
   "GET",
   "POST",
   "PUT",
@@ -209,7 +212,7 @@ const Ee = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   "Content-Language",
   "Content-Type",
   "Range"
-], ue = [
+], de = [
   "Authorization",
   "X-Auth-Token",
   "X-Requested-With",
@@ -219,55 +222,55 @@ const Ee = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   "X-Real-IP",
   "X-Custom-Header"
 ];
-function j(o, e) {
-  return !o || !e ? !1 : e === "*" ? !0 : e === "null" ? o === "null" : Array.isArray(e) ? e.some((t) => j(o, t)) : typeof e == "function" ? e(o) : e instanceof RegExp ? e.test(o) : o === e;
+function M(a, e) {
+  return !a || !e ? !1 : e === "*" ? !0 : e === "null" ? a === "null" : Array.isArray(e) ? e.some((t) => M(a, t)) : typeof e == "function" ? e(a) : e instanceof RegExp ? e.test(a) : a === e;
 }
-function de(o, e) {
+function he(a, e) {
   const { origin: t = "*" } = e;
-  return o ? t === "*" ? e.credentials ? o : "*" : j(o, t) ? o : null : t === "*" ? "*" : null;
+  return a ? t === "*" ? e.credentials ? a : "*" : M(a, t) ? a : null : t === "*" ? "*" : null;
 }
-function he(o = {}) {
+function fe(a = {}) {
   const {
-    methods: e = ce,
-    allowedHeaders: t = ue,
+    methods: e = ue,
+    allowedHeaders: t = de,
     exposedHeaders: s,
     credentials: r = !1,
     maxAge: n = 86400,
-    onResponse: a
-  } = o, i = "Origin,Access-Control-Request-Method,Access-Control-Request-Headers", l = e.join(","), c = [...le, ...t].join(","), u = [
+    onResponse: o
+  } = a, i = "Origin,Access-Control-Request-Method,Access-Control-Request-Headers", u = e.join(","), c = [...le, ...t].join(","), l = [
     ["Vary", i],
-    ["Access-Control-Allow-Methods", l],
+    ["Access-Control-Allow-Methods", u],
     ["Access-Control-Allow-Headers", c]
   ];
-  return s && u.push(["Access-Control-Expose-Headers", s.join(",")]), r && u.push(["Access-Control-Allow-Credentials", "true"]), n && u.push(["Access-Control-Max-Age", n.toString()]), async (d, h) => {
-    const f = d.request, y = f.headers.get("Origin"), w = f.method === "OPTIONS" && y !== null && f.headers.has("Access-Control-Request-Method"), p = de(y, o);
+  return s && l.push(["Access-Control-Expose-Headers", s.join(",")]), r && l.push(["Access-Control-Allow-Credentials", "true"]), n && l.push(["Access-Control-Max-Age", n.toString()]), async (d, h) => {
+    const f = d.request, y = f.headers.get("Origin"), w = f.method === "OPTIONS" && y !== null && f.headers.has("Access-Control-Request-Method"), p = he(y, a);
     if (w) {
       if (!p)
         return new Response(null, { status: 403 });
       const g = new Response(null, { status: 204 });
-      for (const [H, M] of u)
-        g.headers.set(H, M);
+      for (const [H, k] of l)
+        g.headers.set(H, k);
       return g.headers.set("Access-Control-Allow-Origin", p), g;
     }
     const m = await h();
     if (!m) return;
     if (!p) return m;
     const S = new Response(m.body, m);
-    for (const [g, H] of u)
+    for (const [g, H] of l)
       S.headers.set(g, H);
     S.headers.set("Access-Control-Allow-Origin", p);
     let A = S;
-    if (a) {
-      const g = a(A);
+    if (o) {
+      const g = o(A);
       g && (A = g);
     }
     return A;
   };
 }
-const Te = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Ce = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  policy: he
-}, Symbol.toStringTag, { value: "Module" })), fe = ["GET", "PUT", "POST", "DELETE", "PATCH", "HEAD", "OPTIONS"];
+  policy: fe
+}, Symbol.toStringTag, { value: "Module" })), pe = ["GET", "PUT", "POST", "DELETE", "PATCH", "HEAD", "OPTIONS"];
 class b {
   static {
     this.cache = /* @__PURE__ */ new Map();
@@ -279,7 +282,7 @@ class b {
     this.cache.set(e, t);
   }
 }
-class x {
+class P {
   constructor() {
     this._routes = [], this._wsRoutes = [], this._nestedRouters = [], this._middlewares = [], this._preHandlers = [], this._postHandlers = [], this.routesSorted = !1, this.wsRoutesSorted = !1;
   }
@@ -313,32 +316,32 @@ class x {
   }
   // Universal method
   USE(e, t, ...s) {
-    return fe.forEach((r) => this.addHandler(r, e, t, s)), this;
+    return pe.forEach((r) => this.addHandler(r, e, t, s)), this;
   }
   // Action handler (POST only)
   action(e, t, ...s) {
     const r = async (n) => {
       try {
-        const a = await t(n);
-        return this.formatActionResult(a);
-      } catch (a) {
-        return this.handleActionError(a);
+        const o = await t(n);
+        return this.formatActionResult(o);
+      } catch (o) {
+        return this.handleActionError(o);
       }
     };
     return this.addHandler("POST", e, r, s);
   }
   use(e, t, ...s) {
-    let r, n, a = s;
-    Array.isArray(e) ? ([r, n] = e, a = e.length > 2 ? e.slice(2) : []) : (r = e, n = t);
-    const i = this.normalizePrefix(r), { regex: l, paramNames: c, isCatchAll: u, priority: d } = this.createPrefixRegex(i);
+    let r, n, o = s;
+    Array.isArray(e) ? ([r, n] = e, o = e.length > 2 ? e.slice(2) : []) : (r = e, n = t);
+    const i = this.normalizePrefix(r), { regex: u, paramNames: c, isCatchAll: l, priority: d } = this.createPrefixRegex(i);
     return this._nestedRouters.push({
       prefix: i,
       router: n,
-      regex: l,
+      regex: u,
       paramNames: c,
-      isCatchAll: u,
+      isCatchAll: l,
       priority: d,
-      middlewares: a
+      middlewares: o
     }), this;
   }
   // Global middleware
@@ -359,12 +362,12 @@ class x {
   }
   // WebSocket route
   WS(e, t, ...s) {
-    const { regex: r, paramNames: n, isCatchAll: a, priority: i } = this.createPathRegex(e);
+    const { regex: r, paramNames: n, isCatchAll: o, priority: i } = this.createPathRegex(e);
     return this._wsRoutes.push({
       path: e,
       regex: r,
       paramNames: n,
-      isCatchAll: a,
+      isCatchAll: o,
       priority: i,
       handler: t,
       middlewares: s
@@ -383,11 +386,11 @@ class x {
     for (const s of [...this._nestedRouters].sort((r, n) => n.priority - r.priority)) {
       const r = t.match(s.regex);
       if (!r || r.index !== 0) continue;
-      const n = r[0], a = t.slice(n.length) || "/", i = {
+      const n = r[0], o = t.slice(n.length) || "/", i = {
         ...e,
         params: { ...e.params, ...this.extractPrefixParams(s, n) }
       };
-      if (await s.router.canHandleWebSocketAtPath(i, a))
+      if (await s.router.canHandleWebSocketAtPath(i, o))
         return !0;
     }
     for (const s of this._wsRoutes)
@@ -401,28 +404,28 @@ class x {
   }
   async handleWebSocketAtPath(e, t, s) {
     this.wsRoutesSorted || this.sortWsRoutes();
-    for (const r of [...this._nestedRouters].sort((n, a) => a.priority - n.priority)) {
+    for (const r of [...this._nestedRouters].sort((n, o) => o.priority - n.priority)) {
       const n = s.match(r.regex);
       if (!n || n.index !== 0) continue;
-      const a = n[0], i = s.slice(a.length) || "/", l = this.extractPrefixParams(r, a), c = {
+      const o = n[0], i = s.slice(o.length) || "/", u = this.extractPrefixParams(r, o), c = {
         ...e,
-        params: { ...e.params, ...l }
-      }, u = [...this._middlewares, ...r.middlewares], d = () => r.router.handleWebSocketAtPath(c, t, i);
-      if (await this.applyMiddlewaresWithList(c, u, d)) return !0;
+        params: { ...e.params, ...u }
+      }, l = [...this._middlewares, ...r.middlewares], d = () => r.router.handleWebSocketAtPath(c, t, i);
+      if (await this.applyMiddlewaresWithList(c, l, d)) return !0;
     }
     for (const r of this._wsRoutes) {
       if (!r.regex.test(s)) continue;
       const n = s.match(r.regex);
       if (!n) continue;
-      const a = Object.fromEntries(
-        r.paramNames.map((u, d) => [u, n[d + 1] || ""])
+      const o = Object.fromEntries(
+        r.paramNames.map((l, d) => [l, n[d + 1] || ""])
       ), i = {
         ...e,
-        params: { ...e.params, ...a },
+        params: { ...e.params, ...o },
         route: { ...e.route, id: r.path },
         websocket: t
-      }, l = [...this._middlewares, ...r.middlewares];
-      if (await this.applyMiddlewaresWithList(i, l, () => r.handler(i)) === void 0)
+      }, u = [...this._middlewares, ...r.middlewares];
+      if (await this.applyMiddlewaresWithList(i, u, () => r.handler(i)) === void 0)
         return !0;
     }
     return !1;
@@ -432,21 +435,26 @@ class x {
     return this.handleAtPath(e, e.url.pathname);
   }
   async handleAtPath(e, t) {
-    const s = e.request.method;
-    let r = await this.runPreHandlers(e);
-    if (!r) {
-      const a = async () => {
-        const i = await this.handleNestedRouters(e, t);
-        return i || (this.routesSorted || this.sortRoutes(), this.handleLocalRoutes(e, s, t));
-      };
-      r = await this.applyMiddlewaresWithList(e, this._middlewares, a);
+    try {
+      const s = e.request.method;
+      let r = await this.runPreHandlers(e);
+      if (!r) {
+        const o = async () => {
+          const i = await this.handleNestedRouters(e, t);
+          return i || (this.routesSorted || this.sortRoutes(), this.handleLocalRoutes(e, s, t));
+        };
+        r = await this.applyMiddlewaresWithList(e, this._middlewares, o);
+      }
+      const n = r || new Response("No Content", { status: 204 });
+      return await this.runPostHandlers(e, n);
+    } catch (s) {
+      if (x(s)) return s;
+      throw s;
     }
-    const n = r || new Response("No Content", { status: 204 });
-    return this.runPostHandlers(e, n);
   }
   // Apply middlewares utility
   async applyMiddlewaresWithList(e, t, s) {
-    const r = [...t], n = async (a) => a >= r.length ? s() : r[a](e, () => n(a + 1));
+    const r = [...t], n = async (o) => o >= r.length ? s() : r[o](e, () => n(o + 1));
     return n(0);
   }
   async runPreHandlers(e) {
@@ -466,14 +474,14 @@ class x {
   }
   // Add route handler
   addHandler(e, t, s, r = []) {
-    const { regex: n, paramNames: a, isCatchAll: i, priority: l } = this.createPathRegex(t);
+    const { regex: n, paramNames: o, isCatchAll: i, priority: u } = this.createPathRegex(t);
     return this._routes.push({
       method: e,
       path: t,
       regex: n,
-      paramNames: a,
+      paramNames: o,
       isCatchAll: i,
-      priority: l,
+      priority: u,
       handler: s,
       middlewares: r
     }), this.routesSorted = !1, this;
@@ -484,47 +492,47 @@ class x {
     if (t) return t;
     const s = [];
     let r = !1, n;
-    const a = e.split("/").filter(Boolean);
-    n = a.reduce((c, u) => u.startsWith("[...") ? c - 10 : u.startsWith("[[") ? c - 5 : u.startsWith("[") ? c - 1 : c + 1, 0);
+    const o = e.split("/").filter(Boolean);
+    n = o.reduce((c, l) => l.startsWith("[...") ? c - 10 : l.startsWith("[[") ? c - 5 : l.startsWith("[") ? c - 1 : c + 1, 0);
     let i = "^";
-    for (const c of a)
+    for (const c of o)
       if (c.startsWith("[...") && c.endsWith("]")) {
         r = !0;
-        const u = c.slice(4, -1);
-        s.push(u), i += "/(.+)";
+        const l = c.slice(4, -1);
+        s.push(l), i += "/(.+)";
       } else if (c.startsWith("[[") && c.endsWith("]]")) {
-        const u = c.slice(2, -2);
-        s.push(u), i += "(?:/([^/]+))?";
+        const l = c.slice(2, -2);
+        s.push(l), i += "(?:/([^/]+))?";
       } else if (c.startsWith("[") && c.endsWith("]")) {
-        const u = c.slice(1, -1);
-        s.push(u), i += "/([^/]+)";
+        const l = c.slice(1, -1);
+        s.push(l), i += "/([^/]+)";
       } else
         i += "/" + c.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
     i += "/?$";
-    const l = { regex: new RegExp(i), paramNames: s, isCatchAll: r, priority: n };
-    return b.set(e, l), l;
+    const u = { regex: new RegExp(i), paramNames: s, isCatchAll: r, priority: n };
+    return b.set(e, u), u;
   }
   // Create regex for prefix
   createPrefixRegex(e) {
     const t = [];
     let s = !1, r;
     const n = e.split("/").filter(Boolean);
-    r = n.reduce((i, l) => l.startsWith("[...") ? i - 10 : l.startsWith("[[") ? i - 5 : l.startsWith("[") ? i - 1 : i + 1, 0);
-    let a = "^";
+    r = n.reduce((i, u) => u.startsWith("[...") ? i - 10 : u.startsWith("[[") ? i - 5 : u.startsWith("[") ? i - 1 : i + 1, 0);
+    let o = "^";
     for (const i of n)
       if (i.startsWith("[...") && i.endsWith("]")) {
         s = !0;
-        const l = i.slice(4, -1);
-        t.push(l), a += "/(.+)";
+        const u = i.slice(4, -1);
+        t.push(u), o += "/(.+)";
       } else if (i.startsWith("[[") && i.endsWith("]]")) {
-        const l = i.slice(2, -2);
-        t.push(l), a += "(?:/([^/]+))?";
+        const u = i.slice(2, -2);
+        t.push(u), o += "(?:/([^/]+))?";
       } else if (i.startsWith("[") && i.endsWith("]")) {
-        const l = i.slice(1, -1);
-        t.push(l), a += "/([^/]+)";
+        const u = i.slice(1, -1);
+        t.push(u), o += "/([^/]+)";
       } else
-        a += "/" + i.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
-    return a += "(?=/|$)", { regex: new RegExp(a), paramNames: t, isCatchAll: s, priority: r };
+        o += "/" + i.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+    return o += "(?=/|$)", { regex: new RegExp(o), paramNames: t, isCatchAll: s, priority: r };
   }
   normalizePrefix(e) {
     return e.startsWith("/") ? e.replace(/\/$/, "") : `/${e.replace(/\/$/, "")}`;
@@ -533,8 +541,8 @@ class x {
     const s = t.match(e.regex);
     if (!s) return {};
     const r = {};
-    return e.isCatchAll && e.paramNames.length === 1 ? r[e.paramNames[0]] = s[1]?.replace(/^\//, "") || "" : e.paramNames.forEach((n, a) => {
-      r[n] = s[a + 1] || "";
+    return e.isCatchAll && e.paramNames.length === 1 ? r[e.paramNames[0]] = s[1]?.replace(/^\//, "") || "" : e.paramNames.forEach((n, o) => {
+      r[n] = s[o + 1] || "";
     }), r;
   }
   // FIXED: Nested router handling without duplicate middleware application
@@ -543,10 +551,10 @@ class x {
     for (const r of s) {
       const n = t.match(r.regex);
       if (!n || n.index !== 0) continue;
-      const a = n[0], i = t.slice(a.length) || "/", l = this.extractPrefixParams(r, a), c = {
+      const o = n[0], i = t.slice(o.length) || "/", u = this.extractPrefixParams(r, o), c = {
         ...e,
-        params: { ...e.params, ...l }
-      }, u = async () => await r.router.handleAtPath(c, i), d = await this.applyMiddlewaresWithList(c, r.middlewares, u);
+        params: { ...e.params, ...u }
+      }, l = async () => await r.router.handleAtPath(c, i), d = await this.applyMiddlewaresWithList(c, r.middlewares, l);
       if (d) return d;
     }
     return null;
@@ -555,25 +563,25 @@ class x {
   async handleLocalRoutes(e, t, s) {
     const r = /* @__PURE__ */ new Set();
     let n = !1;
-    for (const a of this._routes) {
-      if (!a.regex.test(s) || (r.add(a.method), a.method === "GET" && (n = !0, r.add("HEAD")), !(a.method === t || t === "HEAD" && a.method === "GET"))) continue;
-      const l = s.match(a.regex);
-      if (!l) continue;
+    for (const o of this._routes) {
+      if (!o.regex.test(s) || (r.add(o.method), o.method === "GET" && (n = !0, r.add("HEAD")), !(o.method === t || t === "HEAD" && o.method === "GET"))) continue;
+      const u = s.match(o.regex);
+      if (!u) continue;
       const c = Object.fromEntries(
-        a.paramNames.map((d, h) => [d, l[h + 1] || ""])
+        o.paramNames.map((d, h) => [d, u[h + 1] || ""])
       );
-      e.params = { ...e.params, ...c }, e.route = { ...e.route, id: a.path };
-      const u = () => a.handler(e);
-      return await this.applyMiddlewaresWithList(e, a.middlewares, u);
+      e.params = { ...e.params, ...c }, e.route = { ...e.route, id: o.path };
+      const l = () => o.handler(e);
+      return await this.applyMiddlewaresWithList(e, o.middlewares, l);
     }
     if (r.size > 0 || t === "HEAD" && n) {
-      const a = [...r].join(", ");
+      const o = [...r].join(", ");
       return t === "OPTIONS" ? new Response(null, {
         status: 200,
-        headers: { Allow: a }
+        headers: { Allow: o }
       }) : new Response("Method Not Allowed", {
         status: 405,
-        headers: { Allow: a }
+        headers: { Allow: o }
       });
     }
     return new Response("Not Found", { status: 404 });
@@ -588,61 +596,61 @@ class x {
     return e instanceof Response ? e : e?.type === "failure" && "status" in e ? R.fail(e.status, e.data) : R.success(200, e ?? void 0);
   }
   handleActionError(e) {
-    if (_(e))
-      return R.error(e.status, e);
-    if (N(e)) {
+    if (N(e))
+      return R.error(e.status, { message: e.statusText || "Error" });
+    if (j(e)) {
       const t = e.headers.get("Location") || "/";
       return R.redirect(e.status, t);
     }
     return console.error(e), R.error(500, { message: "Internal Server Error" });
   }
   static New() {
-    return new x();
+    return new P();
   }
 }
 const R = {
-  success: (o = 200, e) => new Response(JSON.stringify({ data: e, type: "success", status: o }), {
-    status: o,
+  success: (a = 200, e) => new Response(JSON.stringify({ data: e, type: "success", status: a }), {
+    status: a,
     headers: { "Content-Type": "application/json" }
   }),
-  redirect: (o = 302, e) => new Response(JSON.stringify({ location: e, type: "redirect", status: o }), {
-    status: o,
+  redirect: (a = 302, e) => new Response(JSON.stringify({ location: e, type: "redirect", status: a }), {
+    status: a,
     headers: { "Content-Type": "application/json" }
   }),
-  error: (o = 500, e) => new Response(JSON.stringify({ error: e, type: "error", status: o }), {
-    status: o,
+  error: (a = 500, e) => new Response(JSON.stringify({ error: e, type: "error", status: a }), {
+    status: a,
     headers: { "Content-Type": "application/json" }
   }),
-  fail: (o = 400, e) => new Response(JSON.stringify({ data: e, type: "failure", status: o }), {
-    status: o,
+  fail: (a = 400, e) => new Response(JSON.stringify({ data: e, type: "failure", status: a }), {
+    status: a,
     headers: { "Content-Type": "application/json" }
   })
 };
-class pe {
+class me {
   constructor(e, t) {
     this.raw = e.headers.get("cookie") ?? "", this.setCookieHeader = t;
   }
   get(e, t) {
-    return E(this.raw, t)[e];
+    return T(this.raw, t)[e];
   }
   getAll(e) {
-    return Object.entries(E(this.raw, e)).filter(([, t]) => t !== void 0).map(([t, s]) => ({ name: t, value: s }));
+    return Object.entries(T(this.raw, e)).filter(([, t]) => t !== void 0).map(([t, s]) => ({ name: t, value: s }));
   }
   set(e, t, s) {
-    this.setCookieHeader(Y(e, t, s));
+    this.setCookieHeader(Q(e, t, s));
   }
   delete(e, t) {
     this.set(e, "", { ...t, maxAge: 0 });
   }
 }
-class C extends Error {
+class W extends Error {
   constructor(e = "Payload Too Large") {
     super(e), this.status = 413, this.name = "PayloadTooLargeError";
   }
 }
-class be extends x {
+class be extends P {
   constructor(e) {
-    super(), this.upgradeHandlerInstalled = !1, this.config = e ?? { type: "http", options: {} }, this.wss = new K({
+    super(), this.upgradeHandlerInstalled = !1, this.config = e ?? { type: "http", options: {} }, this.wss = new Y({
       noServer: !0,
       maxPayload: this.config.security?.maxWebSocketPayload ?? 1024 * 1024
     });
@@ -654,7 +662,7 @@ class be extends x {
           console.error("Unhandled request error:", r), s.statusCode = 500, s.end("Internal Server Error");
         });
       };
-      this._server = this.config.type === "https" ? q(this.config.options, e) : B(this.config.options, e);
+      this._server = this.config.type === "https" ? X(this.config.options, e) : q(this.config.options, e);
     }
     return this._server;
   }
@@ -674,23 +682,23 @@ class be extends x {
         t.destroy();
         return;
       }
-      const a = this.toRequestEvent(n, r, {
+      const o = this.toRequestEvent(n, r, {
         getClientAddress: () => e.socket.remoteAddress ?? "127.0.0.1",
         setHeader: () => {
         },
         pushSetCookie: () => {
         }
       });
-      this.canHandleWebSocket(a).then((i) => {
+      this.canHandleWebSocket(o).then((i) => {
         if (!i || !this.isAllowedWebSocketOrigin(e)) {
           t.destroy();
           return;
         }
-        this.wss.handleUpgrade(e, t, s, (l) => {
-          this.handleWebSocket(a, l).then((c) => {
-            !c && l.readyState === P.OPEN && l.close(1008, "Route not found");
+        this.wss.handleUpgrade(e, t, s, (u) => {
+          this.handleWebSocket(o, u).then((c) => {
+            !c && u.readyState === E.OPEN && u.close(1008, "Route not found");
           }).catch((c) => {
-            console.error("WebSocket routing error:", c), l.readyState === P.OPEN && l.close(1011, "Internal error");
+            console.error("WebSocket routing error:", c), u.readyState === E.OPEN && u.close(1011, "Internal error");
           });
         });
       }).catch(() => t.destroy());
@@ -712,24 +720,24 @@ class be extends x {
       t.statusCode = 413, t.end("Payload Too Large");
       return;
     }
-    const s = this.toWebRequest(e), r = new URL(s.url), n = {}, a = [], i = this.toRequestEvent(s, r, {
+    const s = this.toWebRequest(e), r = new URL(s.url), n = {}, o = [], i = this.toRequestEvent(s, r, {
       getClientAddress: () => e.socket.remoteAddress ?? "127.0.0.1",
-      setHeader: (c, u) => {
-        n[c.toLowerCase()] = u;
+      setHeader: (c, l) => {
+        n[c.toLowerCase()] = l;
       },
       pushSetCookie: (c) => {
-        a.push(c);
+        o.push(c);
       }
     });
-    let l;
+    let u;
     try {
-      l = await this.handle(i);
+      u = await this.handle(i);
     } catch (c) {
-      l = this.handleError(c);
+      u = this.handleError(c);
     }
-    for (const [c, u] of Object.entries(n))
-      t.setHeader(c, u);
-    a.length > 0 && t.setHeader("Set-Cookie", a), await this.sendWebResponse(t, l);
+    for (const [c, l] of Object.entries(n))
+      t.setHeader(c, l);
+    o.length > 0 && t.setHeader("Set-Cookie", o), await this.sendWebResponse(t, u);
   }
   toWebRequest(e) {
     const t = this.toURL(e, !1);
@@ -742,17 +750,17 @@ class be extends x {
       // @ts-ignore
       duplex: "half"
     };
-    return !s && e.method !== "GET" && e.method !== "HEAD" && (r.body = G.toWeb(this.wrapRequestBody(e))), new Request(t, r);
+    return !s && e.method !== "GET" && e.method !== "HEAD" && (r.body = J.toWeb(this.wrapRequestBody(e))), new Request(t, r);
   }
   wrapRequestBody(e) {
     const t = this.config.security?.maxRequestBodySize;
     if (!t)
       return e;
     let s = 0;
-    const r = new J({
-      transform(n, a, i) {
+    const r = new V({
+      transform(n, o, i) {
         if (s += Buffer.byteLength(n), s > t) {
-          i(new C());
+          i(new W());
           return;
         }
         i(null, n);
@@ -761,7 +769,7 @@ class be extends x {
     return e.on("aborted", () => r.destroy(new Error("Request aborted"))), e.on("error", (n) => r.destroy(n)), e.pipe(r), r;
   }
   toURL(e, t) {
-    const s = e.socket instanceof X ? t ? "wss" : "https" : t ? "ws" : "http", r = this.resolveAuthority(e);
+    const s = e.socket instanceof G ? t ? "wss" : "https" : t ? "ws" : "http", r = this.resolveAuthority(e);
     return new URL(e.url ?? "/", `${s}://${r}`);
   }
   resolveAuthority(e) {
@@ -809,9 +817,9 @@ class be extends x {
     return Number.isFinite(r) && r <= t;
   }
   handleError(e) {
-    if (e instanceof C)
+    if (e instanceof W)
       return new Response(e.message, { status: e.status });
-    if (_(e))
+    if (N(e))
       return new Response(JSON.stringify({
         error: e.statusText || "Error",
         status: e.status
@@ -819,7 +827,7 @@ class be extends x {
         status: e.status,
         headers: { "Content-Type": "application/json" }
       });
-    if (N(e)) {
+    if (j(e)) {
       const t = e.headers.get("Location") || "/";
       return new Response(null, {
         status: e.status,
@@ -829,18 +837,18 @@ class be extends x {
     return console.error("Unhandled error:", e), new Response("Internal Server Error", { status: 500 });
   }
   async sendWebResponse(e, t) {
-    if (e.statusCode = t.status, t.headers.forEach((n, a) => {
-      e.setHeader(a, n);
+    if (e.statusCode = t.status, t.headers.forEach((n, o) => {
+      e.setHeader(o, n);
     }), e.hasHeader("Server") || e.setHeader("Server", "WebHTTPServer"), !t.body || this.shouldOmitResponseBody(t, e.req?.method)) {
       e.end();
       return;
     }
-    const s = t.body.getReader(), r = V.toWeb(e).getWriter();
+    const s = t.body.getReader(), r = K.toWeb(e).getWriter();
     try {
       for (; ; ) {
-        const { done: n, value: a } = await s.read();
+        const { done: n, value: o } = await s.read();
         if (n) break;
-        await r.write(a);
+        await r.write(o);
       }
     } finally {
       await r.close().catch(() => {
@@ -857,35 +865,35 @@ class be extends x {
     return s ? this.matchesValue(t, s) : !0;
   }
   toRequestEvent(e, t, s) {
-    const r = new pe(e, s.pushSetCookie), n = this.config, a = {}, i = { name: "WebHTTPServer" }, l = /* @__PURE__ */ new Set(), c = {
+    const r = new me(e, s.pushSetCookie), n = this.config, o = {}, i = { name: "WebHTTPServer" }, u = /* @__PURE__ */ new Set(), c = {
       request: e,
       url: t,
       cookies: r,
       getClientAddress: s.getClientAddress,
       get locals() {
-        return a;
+        return o;
       },
       get platform() {
         return i;
       },
       params: {},
       route: { id: "" },
-      setHeaders: (u) => {
-        for (const [d, h] of Object.entries(u)) {
+      setHeaders: (l) => {
+        for (const [d, h] of Object.entries(l)) {
           const f = d.toLowerCase();
           if (f === "set-cookie")
             throw new TypeError("Use event.cookies for Set-Cookie headers");
-          if (l.has(f))
+          if (u.has(f))
             throw new TypeError(`Header "${d}" has already been set`);
-          l.add(f), s.setHeader(d, h);
+          u.add(f), s.setHeader(d, h);
         }
       }
     };
-    return n.locals && Object.assign(a, n.locals(c)), n.platform && Object.assign(i, n.platform(c)), c;
+    return n.locals && Object.assign(o, n.locals(c)), n.platform && Object.assign(i, n.platform(c)), c;
   }
 }
-const Ce = async (o, e) => {
-  const t = JSON.stringify(await o);
+const We = async (a, e) => {
+  const t = JSON.stringify(await a);
   return new Response(t, {
     ...e,
     headers: {
@@ -894,8 +902,25 @@ const Ce = async (o, e) => {
       ...e?.headers
     }
   });
-}, We = async (o, e) => {
-  const t = await o;
+};
+function Le(a, e) {
+  throw new Response(null, {
+    status: a,
+    headers: {
+      location: e.toString()
+    }
+  });
+}
+function Oe(a, e) {
+  throw new Response(JSON.stringify(typeof e == "string" ? { message: e } : e), {
+    status: a,
+    headers: {
+      "content-type": "application/json"
+    }
+  });
+}
+const ve = async (a, e) => {
+  const t = await a;
   return new Response(t, {
     ...e,
     headers: {
@@ -904,8 +929,8 @@ const Ce = async (o, e) => {
       ...e?.headers
     }
   });
-}, Le = async (o, e) => {
-  const t = await o;
+}, _e = async (a, e) => {
+  const t = await a;
   return new Response(t, {
     ...e,
     headers: {
@@ -914,20 +939,23 @@ const Ce = async (o, e) => {
       ...e?.headers
     }
   });
-}, Oe = (o, e = {}) => (t) => ee(o, t, e);
+}, Ne = (a, e = {}) => (t) => te(a, t, e);
 export {
   R as Action,
-  Te as CORS,
-  Ee as RateLimiter,
-  fe as RequestMethods,
-  x as Router,
+  Ce as CORS,
+  Te as RateLimiter,
+  pe as RequestMethods,
+  P as Router,
   be as WebServer,
-  Oe as dir,
-  Le as html,
-  _ as isHttpError,
-  N as isRedirect,
-  Ce as json,
-  ee as serveStatic,
-  We as text
+  Ne as dir,
+  Oe as error,
+  _e as html,
+  N as isHttpError,
+  j as isRedirect,
+  x as isResponse,
+  We as json,
+  Le as redirect,
+  te as serveStatic,
+  ve as text
 };
 //# sourceMappingURL=index.es.js.map