@candypoets/nipworker 0.94.0 → 0.95.0

package/dist/relayProxyServer.js

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