@candypoets/nipworker 0.91.2 → 0.92.0

package/dist/relayProxyServer.js

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