@candypoets/nipworker 0.91.1 → 0.91.3

package/dist/relayProxyServer.js

@@ -1,503 +1,510 @@
 import * as E from "flatbuffers";
-import { WebSocketServer as h, WebSocket as g } from "ws";
-import { C as v, W as M, M as A, G as I, R as F, N, S as k } from "./worker-message.js";
-function z(n = {}) {
-  const r = n.host ?? "127.0.0.1", t = n.port ?? 7777, e = n.path ?? "/", o = n.logger ?? console;
-  let s;
+import { WebSocketServer as h, WebSocket as S } from "ws";
+import { SocksProxyAgent as v } from "socks-proxy-agent";
+import { C as T, W as k, M, G as A, R as F, N, S as C } from "./worker-message.js";
+function q(t = {}) {
+  const n = t.host ?? "127.0.0.1", r = t.port ?? 7777, e = t.path ?? "/", s = t.logger ?? console, o = t.torSocksProxy;
+  let f;
   try {
-    s = new h({
-      host: r,
-      port: t,
+    f = new h({
+      host: n,
+      port: r,
       path: e
     });
-  } catch (f) {
-    throw o.error(`[relay-proxy] failed to create WebSocketServer: ${String(f)}`), f;
+  } catch (i) {
+    throw s.error(`[relay-proxy] failed to create WebSocketServer: ${String(i)}`), i;
   }
-  let a = t;
-  const i = s.address();
-  return i && typeof i == "object" && (a = i.port), s.on("error", (f) => {
-    o.error(`[relay-proxy] WebSocketServer error: ${String(f)}`);
-  }), s.on("connection", (f) => {
-    const c = {
+  let a = r;
+  const c = f.address();
+  return c && typeof c == "object" && (a = c.port), f.on("error", (i) => {
+    s.error(`[relay-proxy] WebSocketServer error: ${String(i)}`);
+  }), f.on("connection", (i) => {
+    const u = {
       relaySockets: /* @__PURE__ */ new Map(),
       pendingFrames: /* @__PURE__ */ new Map(),
       dedupBySubId: /* @__PURE__ */ new Map(),
-      lastSubIdByRelay: /* @__PURE__ */ new Map()
+      lastSubIdByRelay: /* @__PURE__ */ new Map(),
+      torSocksProxy: o
     };
-    f.on("message", (u, y) => {
-      if (y) {
-        const l = x(u);
-        if (!l) return;
-        $(c, f, l, o);
+    i.on("message", (y, d) => {
+      if (d) {
+        const p = $(y);
+        if (!p) return;
+        x(u, i, p, s);
         return;
       }
-      const d = w(u);
-      d && b(c, d, o);
-    }), f.on("close", () => {
-      p(c, o);
-    }), f.on("error", () => {
-      p(c, o);
+      const l = w(y);
+      l && b(u, l, s);
+    }), i.on("close", () => {
+      g(u, s);
+    }), i.on("error", () => {
+      g(u, s);
     });
-  }), o.info(`[relay-proxy] listening on ws://${r}:${a}${e}`), {
+  }), s.info(`[relay-proxy] listening on ws://${n}:${a}${e}`), {
     port: a,
-    close: () => new Promise((f, c) => {
-      s.close((u) => {
-        if (u) {
-          c(u);
+    close: () => new Promise((i, u) => {
+      f.close((y) => {
+        if (y) {
+          u(y);
           return;
         }
-        f();
+        i();
       });
     })
   };
 }
-function Q(n) {
-  const r = n.path ?? "/", t = n.logger ?? console, e = new h({
+function X(t) {
+  const n = t.path ?? "/", r = t.logger ?? console, e = t.torSocksProxy, s = new h({
     noServer: true
   }), o = /* @__PURE__ */ new Map();
-  return e.on("connection", (a) => {
-    const i = {
+  return s.on("connection", (a) => {
+    const c = {
       relaySockets: /* @__PURE__ */ new Map(),
       pendingFrames: /* @__PURE__ */ new Map(),
       dedupBySubId: /* @__PURE__ */ new Map(),
-      lastSubIdByRelay: /* @__PURE__ */ new Map()
+      lastSubIdByRelay: /* @__PURE__ */ new Map(),
+      torSocksProxy: e
     };
-    o.set(a, i), a.on("message", (f, c) => {
-      const u = o.get(a);
-      if (!u) return;
-      if (c) {
-        const d = x(f);
-        if (!d) return;
-        $(u, a, d, t);
+    o.set(a, c), a.on("message", (i, u) => {
+      const y = o.get(a);
+      if (!y) return;
+      if (u) {
+        const l = $(i);
+        if (!l) return;
+        x(y, a, l, r);
         return;
       }
-      const y = w(f);
-      y && b(u, y, t);
+      const d = w(i);
+      d && b(y, d, r);
     }), a.on("close", () => {
-      const f = o.get(a);
-      f && (p(f, t), o.delete(a));
+      const i = o.get(a);
+      i && (g(i, r), o.delete(a));
     }), a.on("error", () => {
-      const f = o.get(a);
-      f && (p(f, t), o.delete(a));
+      const i = o.get(a);
+      i && (g(i, r), o.delete(a));
     });
   }), {
-    wss: e,
-    close: () => new Promise((a, i) => {
-      o.forEach((f) => p(f, t)), o.clear(), e.close((f) => {
-        if (f) {
-          i(f);
+    wss: s,
+    close: () => new Promise((a, c) => {
+      o.forEach((i) => g(i, r)), o.clear(), s.close((i) => {
+        if (i) {
+          c(i);
           return;
         }
         a();
       });
     }),
-    handleUpgrade: (a, i, f) => {
-      (a.url ?? "").startsWith(r) && e.handleUpgrade(a, i, f, (u) => {
-        e.emit("connection", u, a);
+    handleUpgrade: (a, c, i) => {
+      (a.url ?? "").startsWith(n) && s.handleUpgrade(a, c, i, (y) => {
+        s.emit("connection", y, a);
       });
     }
   };
 }
-function K(n) {
-  const { server: r, path: t = "/", logger: e = console } = n, o = new h({
-    server: r,
-    path: t
+function Y(t) {
+  const { server: n, path: r = "/", logger: e = console, torSocksProxy: s } = t, o = new h({
+    server: n,
+    path: r
   });
-  return o.on("connection", (s) => {
+  return o.on("connection", (f) => {
     const a = {
       relaySockets: /* @__PURE__ */ new Map(),
       pendingFrames: /* @__PURE__ */ new Map(),
       dedupBySubId: /* @__PURE__ */ new Map(),
-      lastSubIdByRelay: /* @__PURE__ */ new Map()
+      lastSubIdByRelay: /* @__PURE__ */ new Map(),
+      torSocksProxy: s
     };
-    s.on("message", (i, f) => {
-      if (f) {
-        const u = x(i);
-        if (!u) return;
-        $(a, s, u, e);
+    f.on("message", (c, i) => {
+      if (i) {
+        const y = $(c);
+        if (!y) return;
+        x(a, f, y, e);
         return;
       }
-      const c = w(i);
-      c && b(a, c, e);
-    }), s.on("close", () => {
-      p(a, e);
-    }), s.on("error", () => {
-      p(a, e);
+      const u = w(c);
+      u && b(a, u, e);
+    }), f.on("close", () => {
+      g(a, e);
+    }), f.on("error", () => {
+      g(a, e);
     });
-  }), e.info(`[relay-proxy] attached to server at path: ${t}`), {
-    close: () => new Promise((s, a) => {
-      o.close((i) => {
-        if (i) {
-          a(i);
+  }), e.info(`[relay-proxy] attached to server at path: ${r}`), {
+    close: () => new Promise((f, a) => {
+      o.close((c) => {
+        if (c) {
+          a(c);
           return;
         }
-        s();
+        f();
       });
     })
   };
 }
-function q(n, r) {
-  const t = r.path ?? "/ws-proxy", e = r.logger ?? console;
+function Z(t, n) {
+  const r = n.path ?? "/ws-proxy", e = n.logger ?? console, s = n.torSocksProxy;
   let o = null;
-  const s = /* @__PURE__ */ new Map(), a = n.listen.bind(n);
-  return n.listen = (...i) => {
-    const f = a(...i);
+  const f = /* @__PURE__ */ new Map(), a = t.listen.bind(t);
+  return t.listen = (...c) => {
+    const i = a(...c);
     return o = new h({
-      server: f,
-      path: t
-    }), o.on("connection", (c) => {
-      const u = {
+      server: i,
+      path: r
+    }), o.on("connection", (u) => {
+      const y = {
         relaySockets: /* @__PURE__ */ new Map(),
         pendingFrames: /* @__PURE__ */ new Map(),
         dedupBySubId: /* @__PURE__ */ new Map(),
-        lastSubIdByRelay: /* @__PURE__ */ new Map()
+        lastSubIdByRelay: /* @__PURE__ */ new Map(),
+        torSocksProxy: s
       };
-      s.set(c, u), c.on("message", (y, d) => {
-        const l = s.get(c);
-        if (!l) return;
-        if (d) {
-          const B = x(y);
+      f.set(u, y), u.on("message", (d, l) => {
+        const p = f.get(u);
+        if (!p) return;
+        if (l) {
+          const B = $(d);
           if (!B) return;
-          $(l, c, B, e);
+          x(p, u, B, e);
           return;
         }
-        const m = w(y);
-        m && b(l, m, e);
-      }), c.on("close", () => {
-        const y = s.get(c);
-        y && (p(y, e), s.delete(c));
-      }), c.on("error", () => {
-        const y = s.get(c);
-        y && (p(y, e), s.delete(c));
+        const I = w(d);
+        I && b(p, I, e);
+      }), u.on("close", () => {
+        const d = f.get(u);
+        d && (g(d, e), f.delete(u));
+      }), u.on("error", () => {
+        const d = f.get(u);
+        d && (g(d, e), f.delete(u));
       });
-    }), e.info(`[relay-proxy] attached to Express server at path: ${t}`), f;
+    }), e.info(`[relay-proxy] attached to Express server at path: ${r}`), i;
   }, {
-    close: () => new Promise((i, f) => {
+    close: () => new Promise((c, i) => {
       if (!o) {
-        i();
+        c();
         return;
       }
-      s.forEach((c) => p(c, e)), s.clear(), o.close((c) => {
-        if (c) {
-          f(c);
+      f.forEach((u) => g(u, e)), f.clear(), o.close((u) => {
+        if (u) {
+          i(u);
           return;
         }
-        i();
+        c();
       });
     })
   };
 }
-function b(n, r, t) {
-  t.info(`[relay-proxy] handleClientCommand: ${r.slice(0, 200)}`);
+function b(t, n, r) {
+  r.info(`[relay-proxy] handleClientCommand: ${n.slice(0, 200)}`);
   let e;
   try {
-    e = JSON.parse(r);
-  } catch (o) {
-    t.warn(`[relay-proxy] failed to parse command JSON: ${o}`);
+    e = JSON.parse(n);
+  } catch (s) {
+    r.warn(`[relay-proxy] failed to parse command JSON: ${s}`);
     return;
   }
-  if (j(e)) {
-    t.info(`[relay-proxy] received auth_response for relay: ${e.relay}`);
-    const o = JSON.stringify(["AUTH", e.event]);
-    t.info(`[relay-proxy] sending AUTH frame to relay: ${e.relay}`), C(n, e.relay, o, t);
+  if (H(e)) {
+    r.info(`[relay-proxy] received auth_response for relay: ${e.relay}`);
+    const s = JSON.stringify(["AUTH", e.event]);
+    r.info(`[relay-proxy] sending AUTH frame to relay: ${e.relay}`), P(t, e.relay, s, r);
     return;
   }
-  if (D(e)) {
-    n.dedupBySubId.delete(e.subscription_id);
-    for (const [o, s] of n.relaySockets.entries())
-      s.readyState === g.OPEN && s.send(JSON.stringify(["CLOSE", e.subscription_id])), n.lastSubIdByRelay.set(o, e.subscription_id);
+  if (G(e)) {
+    t.dedupBySubId.delete(e.subscription_id);
+    for (const [s, o] of t.relaySockets.entries())
+      o.readyState === S.OPEN && o.send(JSON.stringify(["CLOSE", e.subscription_id])), t.lastSubIdByRelay.set(s, e.subscription_id);
   }
 }
-function $(n, r, t, e) {
-  e.info(`[relay-proxy] handleEnvelope: ${t.relays.length} relays, ${t.frames.length} frames`), e.info(`[relay-proxy] relays: ${t.relays.join(", ")}`);
-  const o = t.frames.map((s) => ({
-    frame: s,
-    state: W(s)
+function x(t, n, r, e) {
+  e.info(`[relay-proxy] handleEnvelope: ${r.relays.length} relays, ${r.frames.length} frames`), e.info(`[relay-proxy] relays: ${r.relays.join(", ")}`);
+  const s = r.frames.map((o) => ({
+    frame: o,
+    state: L(o)
   }));
-  e.info(`[relay-proxy] tracked ${o.length} frames`);
-  for (const s of t.relays) {
-    e.info(`[relay-proxy] processing relay: ${s}`), T(n, r, s, e);
-    for (const a of o) {
-      P(n, s, a.state);
-      const i = a.frame;
-      e.info(`[relay-proxy] sending frame to ${s}: ${i.slice(0, 100)}`), C(n, s, i, e);
+  e.info(`[relay-proxy] tracked ${s.length} frames`);
+  for (const o of r.relays) {
+    e.info(`[relay-proxy] processing relay: ${o}`), W(t, n, o, e);
+    for (const f of s) {
+      _(t, o, f.state);
+      const a = f.frame;
+      e.info(`[relay-proxy] sending frame to ${o}: ${a.slice(0, 100)}`), P(t, o, a, e);
     }
   }
 }
-function T(n, r, t, e) {
-  const o = n.relaySockets.get(t);
-  if (o && o.readyState !== g.CLOSED) {
-    e.info(`[relay-proxy] reusing existing connection to ${t}`);
+function W(t, n, r, e) {
+  const s = t.relaySockets.get(r);
+  if (s && s.readyState !== S.CLOSED) {
+    e.info(`[relay-proxy] reusing existing connection to ${r}`);
     return;
   }
-  e.info(`[relay-proxy] creating new WebSocket connection to ${t}`);
-  const s = new URL(t), a = `${s.protocol}//${s.host}`, i = new g(t, {
+  e.info(`[relay-proxy] creating new WebSocket connection to ${r}`);
+  const o = new URL(r), f = `${o.protocol}//${o.host}`, a = o.hostname.endsWith(".onion"), c = {
     headers: {
-      Origin: a,
+      Origin: f,
       "User-Agent": "nipworker/0.91.0"
     }
-  });
-  n.relaySockets.set(t, i), n.pendingFrames.set(t, []);
-  const f = Date.now();
+  };
+  a && t.torSocksProxy && (e.info(`[relay-proxy] using Tor SOCKS proxy ${t.torSocksProxy} for ${r}`), c.agent = new v(t.torSocksProxy));
+  const i = new S(r, c);
+  t.relaySockets.set(r, i), t.pendingFrames.set(r, []);
+  const u = Date.now();
   i.on("open", () => {
-    e.info(`[relay-proxy] connected to ${t}`);
-    const c = n.pendingFrames.get(t);
-    if (c) {
-      e.info(`[relay-proxy] sending ${c.length} pending frames to ${t}`);
-      for (const u of c)
-        i.send(u);
-      n.pendingFrames.set(t, []);
+    e.info(`[relay-proxy] connected to ${r}`);
+    const y = t.pendingFrames.get(r);
+    if (y) {
+      e.info(`[relay-proxy] sending ${y.length} pending frames to ${r}`);
+      for (const d of y)
+        i.send(d);
+      t.pendingFrames.set(r, []);
     }
-  }), i.on("message", (c) => {
-    const u = w(c);
-    if (e.info(`[relay-proxy] received from ${t}: ${u == null ? void 0 : u.slice(0, 100)}`), !u || r.readyState !== g.OPEN) {
-      e.warn(`[relay-proxy] cannot forward message: raw=${!!u}, clientOpen=${r.readyState === g.OPEN}`);
+  }), i.on("message", (y) => {
+    const d = w(y);
+    if (e.info(`[relay-proxy] received from ${r}: ${d == null ? void 0 : d.slice(0, 100)}`), !d || n.readyState !== S.OPEN) {
+      e.warn(`[relay-proxy] cannot forward message: raw=${!!d}, clientOpen=${n.readyState === S.OPEN}`);
       return;
     }
-    const y = n.lastSubIdByRelay.get(t), d = _(n, t, u, y, e);
-    if (!d) {
+    const l = t.lastSubIdByRelay.get(r), p = J(t, r, d, l, e);
+    if (!p) {
       e.warn("[relay-proxy] failed to convert relay frame to worker message");
       return;
     }
-    e.info(`[relay-proxy] forwarding ${d.length} bytes to client`), r.send(d, { binary: true });
-  }), i.on("close", (c, u) => {
+    e.info(`[relay-proxy] forwarding ${p.length} bytes to client`), n.send(p, { binary: true });
+  }), i.on("close", (y, d) => {
     var _a, _b;
-    if (e.info(`[relay-proxy] connection closed to ${t} (code: ${c}, reason: ${u})`), n.pendingFrames.has(t) && ((_a = n.pendingFrames.get(t)) == null ? void 0 : _a.length) > 0) {
-      const y = ((_b = n.pendingFrames.get(t)) == null ? void 0 : _b.length) ?? 0;
-      if (e.warn(`[relay-proxy] connection to ${t} closed with ${y} pending frames - subscription may fail`), r.readyState === g.OPEN) {
-        const d = S(
-          n.lastSubIdByRelay.get(t) ?? "",
-          t,
+    if (e.info(`[relay-proxy] connection closed to ${r} (code: ${y}, reason: ${d})`), t.pendingFrames.has(r) && ((_a = t.pendingFrames.get(r)) == null ? void 0 : _a.length) > 0) {
+      const l = ((_b = t.pendingFrames.get(r)) == null ? void 0 : _b.length) ?? 0;
+      if (e.warn(`[relay-proxy] connection to ${r} closed with ${l} pending frames - subscription may fail`), n.readyState === S.OPEN) {
+        const p = m(
+          t.lastSubIdByRelay.get(r) ?? "",
+          r,
           "failed",
-          `Connection failed: ${c} ${u}`
+          `Connection failed: ${y} ${d}`
         );
-        r.send(d, { binary: true });
+        n.send(p, { binary: true });
       }
     }
-    n.pendingFrames.delete(t);
-  }), i.on("error", (c) => {
-    if (!n.pendingFrames.has(t)) return;
-    const u = String(c), y = Date.now() - f;
-    e.warn(`[relay-proxy] relay socket error for ${t} after ${y}ms: ${u}`), u.includes("403") && e.warn(`[relay-proxy] 403 Forbidden from ${t} - relay may require NIP-42 auth or block this connection`), n.pendingFrames.delete(t);
+    t.pendingFrames.delete(r);
+  }), i.on("error", (y) => {
+    if (!t.pendingFrames.has(r)) return;
+    const d = String(y), l = Date.now() - u;
+    e.warn(`[relay-proxy] relay socket error for ${r} after ${l}ms: ${d}`), d.includes("403") && e.warn(`[relay-proxy] 403 Forbidden from ${r} - relay may require NIP-42 auth or block this connection`), t.pendingFrames.delete(r);
   });
 }
-function P(n, r, t) {
-  if (t) {
-    if (n.lastSubIdByRelay.set(r, t.subId), t.type === "REQ") {
-      const e = t.subId;
-      n.dedupBySubId.has(e) || n.dedupBySubId.set(e, /* @__PURE__ */ new Set());
+function _(t, n, r) {
+  if (r) {
+    if (t.lastSubIdByRelay.set(n, r.subId), r.type === "REQ") {
+      const e = r.subId;
+      t.dedupBySubId.has(e) || t.dedupBySubId.set(e, /* @__PURE__ */ new Set());
       return;
     }
-    n.dedupBySubId.delete(t.subId);
+    t.dedupBySubId.delete(r.subId);
   }
 }
-function W(n) {
-  const r = R(n);
-  if (!r) return null;
-  const t = r[0];
-  if (t !== "REQ" && t !== "CLOSE") return null;
-  const e = typeof r[1] == "string" ? r[1] : null;
-  return e ? { type: t, subId: e } : null;
+function L(t) {
+  const n = R(t);
+  if (!n) return null;
+  const r = n[0];
+  if (r !== "REQ" && r !== "CLOSE") return null;
+  const e = typeof n[1] == "string" ? n[1] : null;
+  return e ? { type: r, subId: e } : null;
 }
-function C(n, r, t, e) {
-  const o = n.relaySockets.get(r);
-  if (!o) {
-    e.warn(`[relay-proxy] no relay socket for ${r}`);
+function P(t, n, r, e) {
+  const s = t.relaySockets.get(n);
+  if (!s) {
+    e.warn(`[relay-proxy] no relay socket for ${n}`);
     return;
   }
-  if (o.readyState === g.OPEN) {
-    e.info(`[relay-proxy] sending frame to ${r} (OPEN): ${t.slice(0, 100)}`), o.send(t);
+  if (s.readyState === S.OPEN) {
+    e.info(`[relay-proxy] sending frame to ${n} (OPEN): ${r.slice(0, 100)}`), s.send(r);
     return;
   }
-  if (o.readyState === g.CONNECTING) {
-    e.info(`[relay-proxy] queueing frame for ${r} (CONNECTING)`);
-    const s = n.pendingFrames.get(r) ?? [];
-    s.push(t), n.pendingFrames.set(r, s);
+  if (s.readyState === S.CONNECTING) {
+    e.info(`[relay-proxy] queueing frame for ${n} (CONNECTING)`);
+    const o = t.pendingFrames.get(n) ?? [];
+    o.push(r), t.pendingFrames.set(n, o);
     return;
   }
-  e.warn(`[relay-proxy] dropping frame for closed relay socket ${r} (state: ${o.readyState})`);
+  e.warn(`[relay-proxy] dropping frame for closed relay socket ${n} (state: ${s.readyState})`);
 }
-function _(n, r, t, e, o) {
-  const s = R(t);
-  if (!s || s.length < 1 || typeof s[0] != "string")
-    return O(e ?? "", r, t);
-  const a = s[0];
-  if (a === "EVENT") {
-    const i = typeof s[1] == "string" ? s[1] : "", f = J(s[2]);
-    if (!i || !f)
-      return O(i, r, t);
-    const c = n.dedupBySubId.get(i);
-    return c && c.has(f.id) ? null : (c && c.add(f.id), L(i, r, f));
+function J(t, n, r, e, s) {
+  const o = R(r);
+  if (!o || o.length < 1 || typeof o[0] != "string")
+    return O(e ?? "", n, r);
+  const f = o[0];
+  if (f === "EVENT") {
+    const a = typeof o[1] == "string" ? o[1] : "", c = j(o[2]);
+    if (!a || !c)
+      return O(a, n, r);
+    const i = t.dedupBySubId.get(a);
+    return i && i.has(c.id) ? null : (i && i.add(c.id), V(a, n, c));
   }
-  if (a === "NOTICE") {
-    const i = s[1] === void 0 ? null : String(s[1]);
-    return S("", r, "NOTICE", i);
+  if (f === "NOTICE") {
+    const a = o[1] === void 0 ? null : String(o[1]);
+    return m("", n, "NOTICE", a);
   }
-  if (a === "AUTH") {
-    const i = s[1] === void 0 ? null : String(s[1]);
-    o == null ? void 0 : o.info(`[relay-proxy] received AUTH challenge from ${r}: ${i}`);
-    const f = S(e ?? "", r, "AUTH", i);
-    return o == null ? void 0 : o.info(`[relay-proxy] built AUTH worker message (${f.length} bytes)`), f;
+  if (f === "AUTH") {
+    const a = o[1] === void 0 ? null : String(o[1]);
+    s == null ? void 0 : s.info(`[relay-proxy] received AUTH challenge from ${n}: ${a}`);
+    const c = m(e ?? "", n, "AUTH", a);
+    return s == null ? void 0 : s.info(`[relay-proxy] built AUTH worker message (${c.length} bytes)`), c;
   }
-  if (a === "CLOSED") {
-    const i = typeof s[1] == "string" ? s[1] : "", f = s[2] === void 0 ? null : String(s[2]);
-    return S(i, r, "CLOSED", f);
+  if (f === "CLOSED") {
+    const a = typeof o[1] == "string" ? o[1] : "", c = o[2] === void 0 ? null : String(o[2]);
+    return m(a, n, "CLOSED", c);
   }
-  if (a === "OK") {
-    const i = typeof s[1] == "string" ? s[1] : "", f = s[2] === void 0 ? "false" : String(s[2]), c = s[3] === void 0 ? null : String(s[3]);
-    return S(i, r, f, c);
+  if (f === "OK") {
+    const a = typeof o[1] == "string" ? o[1] : "", c = o[2] === void 0 ? "false" : String(o[2]), i = o[3] === void 0 ? null : String(o[3]);
+    return m(a, n, c, i);
   }
-  if (a === "EOSE") {
-    const i = typeof s[1] == "string" ? s[1] : "";
-    return S(i, r, "EOSE", null);
+  if (f === "EOSE") {
+    const a = typeof o[1] == "string" ? o[1] : "";
+    return m(a, n, "EOSE", null);
   }
-  return O(e ?? "", r, t);
+  return O(e ?? "", n, r);
 }
-function L(n, r, t) {
-  const e = new E.Builder(1024), o = n ? e.createString(n) : 0, s = e.createString(r), a = e.createString(t.id), i = e.createString(t.pubkey), f = e.createString(t.content), c = e.createString(t.sig), u = new Array(t.tags.length);
-  for (let m = 0; m < t.tags.length; m++)
-    u[m] = V(e, t.tags[m]);
+function V(t, n, r) {
+  const e = new E.Builder(1024), s = t ? e.createString(t) : 0, o = e.createString(n), f = e.createString(r.id), a = e.createString(r.pubkey), c = e.createString(r.content), i = e.createString(r.sig), u = new Array(r.tags.length);
+  for (let p = 0; p < r.tags.length; p++)
+    u[p] = D(e, r.tags[p]);
   const y = N.createTagsVector(e, u), d = N.createNostrEvent(
     e,
-    a,
-    i,
-    t.kind,
     f,
+    a,
+    r.kind,
+    c,
     y,
-    t.created_at,
-    c
-  ), l = M.createWorkerMessage(
+    r.created_at,
+    i
+  ), l = k.createWorkerMessage(
     e,
-    o,
     s,
+    o,
+    M.NostrEvent,
     A.NostrEvent,
-    I.NostrEvent,
     d
   );
   return e.finish(l), e.asUint8Array();
 }
-function S(n, r, t, e) {
-  const o = new E.Builder(256), s = n ? o.createString(n) : 0, a = o.createString(r), i = o.createString(t), f = e === null ? 0 : o.createString(e), c = v.createConnectionStatus(
-    o,
-    a,
-    i,
-    f
-  ), u = M.createWorkerMessage(
-    o,
+function m(t, n, r, e) {
+  const s = new E.Builder(256), o = t ? s.createString(t) : 0, f = s.createString(n), a = s.createString(r), c = e === null ? 0 : s.createString(e), i = T.createConnectionStatus(
     s,
+    f,
     a,
-    A.ConnectionStatus,
-    I.ConnectionStatus,
     c
+  ), u = k.createWorkerMessage(
+    s,
+    o,
+    f,
+    M.ConnectionStatus,
+    A.ConnectionStatus,
+    i
   );
-  return o.finish(u), o.asUint8Array();
+  return s.finish(u), s.asUint8Array();
 }
-function O(n, r, t) {
-  const e = new E.Builder(256), o = n ? e.createString(n) : 0, s = e.createString(r), a = e.createString(t), i = F.createRaw(e, a), f = M.createWorkerMessage(
+function O(t, n, r) {
+  const e = new E.Builder(256), s = t ? e.createString(t) : 0, o = e.createString(n), f = e.createString(r), a = F.createRaw(e, f), c = k.createWorkerMessage(
     e,
-    o,
     s,
+    o,
+    M.Raw,
     A.Raw,
-    I.Raw,
-    i
+    a
   );
-  return e.finish(f), e.asUint8Array();
+  return e.finish(c), e.asUint8Array();
 }
-function J(n) {
-  if (!n || typeof n != "object") return null;
-  const r = n;
-  if (typeof r.id != "string" || typeof r.pubkey != "string" || typeof r.kind != "number" || typeof r.content != "string" || typeof r.created_at != "number" || typeof r.sig != "string" || !Array.isArray(r.tags))
+function j(t) {
+  if (!t || typeof t != "object") return null;
+  const n = t;
+  if (typeof n.id != "string" || typeof n.pubkey != "string" || typeof n.kind != "number" || typeof n.content != "string" || typeof n.created_at != "number" || typeof n.sig != "string" || !Array.isArray(n.tags))
     return null;
-  const t = r.tags;
+  const r = n.tags;
   let e = false;
-  for (const s of t) {
-    if (!Array.isArray(s) || s.length === 0) {
+  for (const o of r) {
+    if (!Array.isArray(o) || o.length === 0) {
       e = true;
       continue;
     }
-    for (const a of s)
-      if (typeof a != "string") {
+    for (const f of o)
+      if (typeof f != "string") {
         e = true;
         break;
       }
   }
-  let o;
+  let s;
   if (!e)
-    o = t;
+    s = r;
   else {
-    o = [];
-    for (const s of t) {
-      if (!Array.isArray(s)) continue;
-      const a = [];
-      for (const i of s)
-        typeof i == "string" && a.push(i);
-      a.length > 0 && o.push(a);
+    s = [];
+    for (const o of r) {
+      if (!Array.isArray(o)) continue;
+      const f = [];
+      for (const a of o)
+        typeof a == "string" && f.push(a);
+      f.length > 0 && s.push(f);
     }
   }
   return {
-    id: r.id,
-    pubkey: r.pubkey,
-    kind: r.kind,
-    content: r.content,
-    created_at: r.created_at,
-    sig: r.sig,
-    tags: o
+    id: n.id,
+    pubkey: n.pubkey,
+    kind: n.kind,
+    content: n.content,
+    created_at: n.created_at,
+    sig: n.sig,
+    tags: s
   };
 }
-function V(n, r) {
-  const t = new Array(r.length);
-  for (let o = 0; o < r.length; o++)
-    t[o] = n.createString(r[o]);
-  const e = k.createItemsVector(n, t);
-  return k.createStringVec(n, e);
+function D(t, n) {
+  const r = new Array(n.length);
+  for (let s = 0; s < n.length; s++)
+    r[s] = t.createString(n[s]);
+  const e = C.createItemsVector(t, r);
+  return C.createStringVec(t, e);
 }
-function R(n) {
+function R(t) {
   try {
-    const r = JSON.parse(n);
-    return Array.isArray(r) ? r : null;
+    const n = JSON.parse(t);
+    return Array.isArray(n) ? n : null;
   } catch {
     return null;
   }
 }
-function x(n, r) {
-  const t = w(n);
-  if (!t)
+function $(t, n) {
+  const r = w(t);
+  if (!r)
     return null;
   try {
-    const e = JSON.parse(t);
+    const e = JSON.parse(r);
     if (!Array.isArray(e.relays) || !Array.isArray(e.frames))
-      return r == null ? void 0 : r.warn(`[relay-proxy] parseEnvelope: invalid structure (relays: ${Array.isArray(e.relays)}, frames: ${Array.isArray(e.frames)})`), null;
-    const o = e.relays.filter((a) => typeof a == "string"), s = e.frames.filter((a) => typeof a == "string");
-    return r == null ? void 0 : r.info(`[relay-proxy] parseEnvelope: ${o.length} relays, ${s.length} frames`), o.length === 0 || s.length === 0 ? (r == null ? void 0 : r.warn("[relay-proxy] parseEnvelope: empty relays or frames after filter"), null) : { relays: o, frames: s };
+      return n == null ? void 0 : n.warn(`[relay-proxy] parseEnvelope: invalid structure (relays: ${Array.isArray(e.relays)}, frames: ${Array.isArray(e.frames)})`), null;
+    const s = e.relays.filter((f) => typeof f == "string"), o = e.frames.filter((f) => typeof f == "string");
+    return n == null ? void 0 : n.info(`[relay-proxy] parseEnvelope: ${s.length} relays, ${o.length} frames`), s.length === 0 || o.length === 0 ? (n == null ? void 0 : n.warn("[relay-proxy] parseEnvelope: empty relays or frames after filter"), null) : { relays: s, frames: o };
   } catch {
     return null;
   }
 }
-function w(n) {
-  return typeof n == "string" ? n : n instanceof ArrayBuffer ? Buffer.from(n).toString("utf8") : Buffer.isBuffer(n) ? n.toString("utf8") : n instanceof Uint8Array ? Buffer.from(n).toString("utf8") : Array.isArray(n) ? Buffer.concat(n.filter((r) => Buffer.isBuffer(r))).toString("utf8") : "";
+function w(t) {
+  return typeof t == "string" ? t : t instanceof ArrayBuffer ? Buffer.from(t).toString("utf8") : Buffer.isBuffer(t) ? t.toString("utf8") : t instanceof Uint8Array ? Buffer.from(t).toString("utf8") : Array.isArray(t) ? Buffer.concat(t.filter((n) => Buffer.isBuffer(n))).toString("utf8") : "";
 }
-function j(n) {
-  if (!n || typeof n != "object") return false;
-  const r = n;
-  return r.type === "auth_response" && typeof r.relay == "string" && r.event !== void 0;
+function H(t) {
+  if (!t || typeof t != "object") return false;
+  const n = t;
+  return n.type === "auth_response" && typeof n.relay == "string" && n.event !== void 0;
 }
-function D(n) {
-  if (!n || typeof n != "object") return false;
-  const r = n;
-  return r.type === "close_sub" && typeof r.subscription_id == "string";
+function G(t) {
+  if (!t || typeof t != "object") return false;
+  const n = t;
+  return n.type === "close_sub" && typeof n.subscription_id == "string";
 }
-function p(n, r) {
-  r == null ? void 0 : r.info("[relay-proxy] closing session"), n.dedupBySubId.clear(), n.lastSubIdByRelay.clear();
-  for (const [t, e] of n.relaySockets.entries())
+function g(t, n) {
+  n == null ? void 0 : n.info("[relay-proxy] closing session"), t.dedupBySubId.clear(), t.lastSubIdByRelay.clear();
+  for (const [r, e] of t.relaySockets.entries())
     try {
-      r == null ? void 0 : r.info(`[relay-proxy] closing socket to ${t}`), e.close();
+      n == null ? void 0 : n.info(`[relay-proxy] closing socket to ${r}`), e.close();
     } catch {
     }
-  n.relaySockets.clear(), n.pendingFrames.clear();
+  t.relaySockets.clear(), t.pendingFrames.clear();
 }
 export {
-  K as attachRelayProxyToServer,
-  q as createExpressRelayProxyMiddleware,
-  z as createRelayProxyServer,
-  Q as createRelayProxyWebSocketServer
+  Y as attachRelayProxyToServer,
+  Z as createExpressRelayProxyMiddleware,
+  q as createRelayProxyServer,
+  X as createRelayProxyWebSocketServer
 };