wireweave 0.3.26 → 0.3.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wireweave",
-  "version": "0.3.26",
+  "version": "0.3.28",
   "description": "nostr + webrtc voice + data SDK. networking layer for 247420 projects.",
   "type": "module",
   "main": "./src/index.js",

package/src/auth.js

@@ -1,3 +1,5 @@
+import { safeSetItem } from './safe-storage.js';
+
 const b2hex = (bytes) => Array.from(bytes).map(b => b.toString(16).padStart(2, '0')).join('');
 const hex2b = (hex) => {
   const a = new Uint8Array(hex.length / 2);
@@ -39,9 +41,14 @@ export class NostrAuth extends EventTarget {
   }
 
   importKey(input) {
-    const sk = input.startsWith('nsec')
-      ? (() => { const d = this.NT.nip19.decode(input); if (d.type !== 'nsec') throw new Error('not nsec'); return d.data; })()
-      : hex2b(input);
+    const trimmed = (input || '').trim();
+    if (!trimmed) throw new Error('Enter a key');
+    const sk = trimmed.startsWith('nsec')
+      ? (() => { const d = this.NT.nip19.decode(trimmed); if (d.type !== 'nsec') throw new Error('not nsec'); return d.data; })()
+      : (() => {
+          if (!/^[0-9a-fA-F]{64}$/.test(trimmed)) throw new Error('Expected an nsec1… key or a 64-character hex secret key');
+          return hex2b(trimmed);
+        })();
     const pk = this.NT.getPublicKey(sk);
     this._persist(sk, pk);
     this._emit('login', { pubkey: pk });
@@ -87,8 +94,13 @@ export class NostrAuth extends EventTarget {
   _persist(sk, pk) {
     this.privkey = sk;
     this.pubkey = pk;
-    this.storage?.setItem('zn_sk', b2hex(sk));
-    this.storage?.setItem('zn_pk', pk);
+    if (!this.storage) return;
+    const okSk = safeSetItem(this.storage, this, 'zn_sk', b2hex(sk));
+    const okPk = safeSetItem(this.storage, this, 'zn_pk', pk);
+    if (!okSk || !okPk) {
+      try { this.storage.removeItem('zn_sk'); this.storage.removeItem('zn_pk'); } catch {}
+      this._emit('persist-failed', { pubkey: pk });
+    }
   }
 
   _emit(type, detail) { this.dispatchEvent(new CustomEvent(type, { detail })); }

package/src/channels.js

@@ -30,12 +30,14 @@ export class Channels extends EventTarget {
     this.pool.subscribe('channels-' + serverId,
       [{ kinds: [30078], authors: [ownerPubkey], '#d': [dTag] }],
       (event) => {
+        if (event.pubkey !== ownerPubkey) return;
         const hasTag = event.tags?.some(t => t[0] === 'd' && t[1] === dTag);
         if (!hasTag) return;
         try {
           const data = JSON.parse(event.content);
-          this.channels = data.channels || [];
-          this.categories = data.categories || [];
+          if (!data || typeof data !== 'object' || !Array.isArray(data.channels) || !Array.isArray(data.categories)) return;
+          this.channels = data.channels;
+          this.categories = data.categories;
           this._emit('updated', { channels: this.channels, categories: this.categories });
         } catch {}
       },

package/src/chat.js

@@ -71,7 +71,9 @@ export class Chat extends EventTarget {
 
   _addMessage(msg) {
     if (this.messages.find(m => m.id === msg.id)) return;
-    this.messages = [...this.messages, msg];
+    let i = this.messages.length;
+    while (i > 0 && this.messages[i - 1].timestamp > msg.timestamp) i--;
+    this.messages = [...this.messages.slice(0, i), msg, ...this.messages.slice(i)];
     this._emit('message', { message: msg });
     this._emit('messages', { list: this.messages });
   }
@@ -87,9 +89,14 @@ export class Chat extends EventTarget {
     if (this.fetching.has(pubkey)) return;
     this.fetching.add(pubkey);
     this.pool.subscribe('profile-' + pubkey,
-      [{ kinds: [0], authors: [pubkey], limit: 1 }],
-      (event) => { try { this.profiles.set(pubkey, JSON.parse(event.content)); this._emit('profile', { pubkey, profile: this.profiles.get(pubkey) }); } catch {} },
-      () => { this.pool.unsubscribe('profile-' + pubkey); this.fetching.delete(pubkey); });
+      [{ kinds: [0], authors: [pubkey] }],
+      (event) => {
+        const known = this._profileEvents?.get(pubkey);
+        if (known && known >= event.created_at) return;
+        (this._profileEvents ||= new Map()).set(pubkey, event.created_at);
+        try { this.profiles.set(pubkey, JSON.parse(event.content)); this._emit('profile', { pubkey, profile: this.profiles.get(pubkey) }); } catch {}
+      },
+      () => { this.fetching.delete(pubkey); });
   }
 
   updateProfile(pubkey, profile) { this.profiles.set(pubkey, profile); this._emit('profile', { pubkey, profile }); }

package/src/relay-pool.js

@@ -38,8 +38,10 @@ export class RelayPool extends EventTarget {
     this.relays = new Map();
     this.subs = new Map();
     this.pending = [];
+    this._pendingIds = new Set();
     this.seen = new Map();
     this._reconnectTimers = new Map();
+    this._acks = new Map();
     this._closed = false;
     this.verifyEvent = verifyEvent;
     this.WS = WebSocketImpl || (typeof WebSocket !== 'undefined' ? WebSocket : null);
@@ -55,6 +57,8 @@ export class RelayPool extends EventTarget {
     this._closed = true;
     for (const [, t] of this._reconnectTimers) clearTimeout(t);
     this._reconnectTimers.clear();
+    for (const [, rec] of this._acks) { clearTimeout(rec.timer); rec.resolve(false); }
+    this._acks.clear();
     for (const [, r] of this.relays) {
       if (r.ws) {
         r.ws.onclose = null; r.ws.onerror = null; r.ws.onopen = null; r.ws.onmessage = null;
@@ -88,7 +92,7 @@ export class RelayPool extends EventTarget {
         relay.subIds.add(subId);
         if (!relay._reqSentAt) relay._reqSentAt = Date.now();
       }
-      this._drainPending();
+      this._drainPending(url, ws);
     };
     ws.onmessage = (e) => {
       if (relay._reqSentAt && relay.latencyMs === null) {
@@ -132,8 +136,12 @@ export class RelayPool extends EventTarget {
       this._emit('eose', { subId });
     } else if (type === 'NOTICE') {
       this._emit('notice', { url, message: msg[1] });
-    } else if (type === 'OK' && !msg[2]) {
-      this._emit('reject', { id: msg[1], reason: msg[3] || '' });
+    } else if (type === 'OK') {
+      const accepted = msg[2] === true;
+      const id = msg[1], reason = msg[3] || '';
+      if (accepted) this._emit('ok', { url, id });
+      else this._emit('reject', { url, id, reason });
+      this._settleAck(id, accepted, reason);
     }
   }
 
@@ -163,23 +171,89 @@ export class RelayPool extends EventTarget {
 
   publish(event) {
     let sent = false;
-    for (const [, relay] of this.relays) {
+    let anyDisconnected = false;
+    const sentTo = new Set();
+    for (const [url, relay] of this.relays) {
       if (relay.ws?.readyState === 1) {
         relay.ws.send(JSON.stringify(['EVENT', event]));
         sent = true;
+        sentTo.add(url);
+      } else {
+        anyDisconnected = true;
       }
     }
-    if (!sent) {
-      this.pending.push({ event, ts: Date.now() });
-      if (this.pending.length > PENDING_MAX) this.pending.splice(0, this.pending.length - PENDING_MAX);
-    }
+    if (anyDisconnected || !sent) this._queuePending(event, sentTo);
+    else if (event?.id) this._pendingIds.delete(event.id);
     return sent;
   }
 
-  _drainPending() {
+  // Tracks delivery per relay URL, not just "sent to at least one" — a relay
+  // mid-reconnect during a partial outage otherwise never gets the event.
+  _queuePending(event, sentTo) {
+    if (event?.id && this._pendingIds.has(event.id)) {
+      const existing = this.pending.find((p) => p.event?.id === event.id);
+      if (existing) { for (const url of sentTo) existing.sentTo.add(url); }
+      return;
+    }
+    if (event?.id) this._pendingIds.add(event.id);
+    this.pending.push({ event, sentTo, ts: Date.now() });
+    while (this.pending.length > PENDING_MAX) {
+      const dropped = this.pending.shift();
+      if (dropped.event?.id) this._pendingIds.delete(dropped.event.id);
+    }
+  }
+
+  // Resolves true once any relay sends OK accepted, false on relay reject,
+  // or false on timeout. Gives callers delivery confidence beyond fire-and-forget.
+  publishAndWait(event, { timeoutMs = 8000 } = {}) {
+    const sent = this.publish(event);
+    if (!event?.id) return Promise.resolve(sent);
+    return new Promise((resolve) => {
+      const prior = this._acks.get(event.id);
+      if (prior) clearTimeout(prior.timer);
+      const settle = (ok) => {
+        const rec = this._acks.get(event.id);
+        if (rec) { clearTimeout(rec.timer); this._acks.delete(event.id); }
+        resolve(ok);
+      };
+      const timer = setTimeout(() => settle(false), timeoutMs);
+      this._acks.set(event.id, { resolve: settle, timer });
+    });
+  }
+
+  _settleAck(id, accepted) {
+    const rec = this._acks.get(id);
+    if (rec) rec.resolve(accepted);
+  }
+
+  _drainPending(url, ws) {
     const cutoff = Date.now() - PENDING_TTL_MS;
-    const pending = this.pending.splice(0);
-    for (const p of pending) { if (p.ts >= cutoff) this.publish(p.event); }
+    this.pending = this.pending.filter((entry) => {
+      const alive = entry.ts >= cutoff;
+      if (!alive && entry.event?.id) this._pendingIds.delete(entry.event.id);
+      return alive;
+    });
+    if (ws) {
+      for (const entry of this.pending) {
+        if (!entry.sentTo) entry.sentTo = new Set();
+        if (entry.sentTo.has(url)) continue;
+        ws.send(JSON.stringify(['EVENT', entry.event]));
+        entry.sentTo.add(url);
+      }
+    }
+    this.pending = this.pending.filter((entry) => {
+      let anyConnected = false;
+      let allKnownSent = true;
+      for (const [u, r] of this.relays) {
+        if (r.ws?.readyState === 1) {
+          anyConnected = true;
+          if (!entry.sentTo?.has(u)) { allKnownSent = false; break; }
+        }
+      }
+      if (!anyConnected) allKnownSent = false;
+      if (allKnownSent && entry.event?.id) this._pendingIds.delete(entry.event.id);
+      return !allKnownSent;
+    });
   }
 
   isConnected() {

package/src/safe-storage.js

@@ -0,0 +1,17 @@
+const isQuotaError = (err) =>
+  err && (err.name === 'QuotaExceededError' || err.name === 'NS_ERROR_DOM_QUOTA_REACHED' || err.code === 22 || err.code === 1014);
+
+export function safeSetItem(storage, target, key, value) {
+  if (!storage) return false;
+  try {
+    storage.setItem(key, value);
+    return true;
+  } catch (err) {
+    if (isQuotaError(err)) {
+      target?.dispatchEvent?.(new CustomEvent('storage-error', { detail: { key, reason: 'quota', message: 'Storage full — some data may not be saved' } }));
+    } else {
+      target?.dispatchEvent?.(new CustomEvent('storage-error', { detail: { key, reason: 'unknown', message: err?.message || String(err) } }));
+    }
+    return false;
+  }
+}

package/src/servers.js

@@ -1,3 +1,5 @@
+import { safeSetItem } from './safe-storage.js';
+
 export class Servers extends EventTarget {
   constructor({ relayPool, auth, storage, onSwitch = null }) {
     super();
@@ -63,7 +65,7 @@ export class Servers extends EventTarget {
   async join(serverId) {
     try {
       const joined = JSON.parse(this.storage.getItem('zn_joined_servers') || '[]');
-      if (!joined.includes(serverId)) { joined.push(serverId); this.storage.setItem('zn_joined_servers', JSON.stringify(joined)); }
+      if (!joined.includes(serverId)) { joined.push(serverId); safeSetItem(this.storage, this, 'zn_joined_servers', JSON.stringify(joined)); }
     } catch {}
     if (!this.servers.find(s => s.id === serverId)) { this.servers = [...this.servers, { id: serverId, name: serverId.slice(0, 8), iconColor: '#5865F2' }]; this._persist(); }
     await this.switchTo(serverId);
@@ -74,7 +76,7 @@ export class Servers extends EventTarget {
     this._persist();
     try {
       const joined = JSON.parse(this.storage.getItem('zn_joined_servers') || '[]');
-      this.storage.setItem('zn_joined_servers', JSON.stringify(joined.filter(id => id !== serverId)));
+      safeSetItem(this.storage, this, 'zn_joined_servers', JSON.stringify(joined.filter(id => id !== serverId)));
     } catch {}
     if (this.currentServerId === serverId) await this.switchTo(null);
     else this._emit('updated', { servers: this.servers });
@@ -84,7 +86,7 @@ export class Servers extends EventTarget {
 
   async switchTo(serverId) {
     this.currentServerId = serverId;
-    if (serverId) this.storage.setItem('zn_lastServer', serverId); else this.storage.removeItem('zn_lastServer');
+    if (serverId) safeSetItem(this.storage, this, 'zn_lastServer', serverId); else this.storage.removeItem('zn_lastServer');
     this._emit('switched', { serverId });
     await this.onSwitch?.(serverId);
   }
@@ -97,7 +99,7 @@ export class Servers extends EventTarget {
   }
 
   getOrder() { try { return JSON.parse(this.storage.getItem('zn_serverOrder') || '[]'); } catch { return []; } }
-  saveOrder(ids) { this.storage.setItem('zn_serverOrder', JSON.stringify(ids)); this._emit('updated', { servers: this.servers }); }
+  saveOrder(ids) { safeSetItem(this.storage, this, 'zn_serverOrder', JSON.stringify(ids)); this._emit('updated', { servers: this.servers }); }
   sorted() {
     const order = this.getOrder();
     if (!order.length) return this.servers;
@@ -105,7 +107,7 @@ export class Servers extends EventTarget {
     return this.servers.slice().sort((a, b) => (idx[a.id] ?? Infinity) - (idx[b.id] ?? Infinity));
   }
 
-  _persist() { this.storage.setItem('zn_servers', JSON.stringify(this.servers)); }
+  _persist() { safeSetItem(this.storage, this, 'zn_servers', JSON.stringify(this.servers)); }
   _emit(t, d) { this.dispatchEvent(new CustomEvent(t, { detail: d })); }
 }
 

package/src/voice.js

@@ -56,6 +56,7 @@ export class VoiceSession extends EventTarget {
     this.muted = false; this.deafened = false;
     this.sfu = { mode: 'mesh', hub: null, hubLostAt: null, rttMatrix: new Map(), electionTimer: null, statsInterval: null, actor: null };
     this.retrySchedule = {};
+    this._epoch = 0;
   }
 
   _initActor() {
@@ -64,16 +65,31 @@ export class VoiceSession extends EventTarget {
     this.actor.start();
   }
 
+  // Reentrancy guard: connect()/disconnect() are async and mutate shared
+  // instance state (peers, participants, localStream, roomId) across several
+  // await points. Rapid join→leave→rejoin (or a double-click join) used to
+  // interleave two in-flight calls: a stale connect() resuming after a newer
+  // disconnect() had already torn everything down would re-populate roomId/
+  // participants and re-send 'connected' into an actor the fresh call had
+  // already returned to idle, leaking the stale heartbeat/presence
+  // subscriptions and getUserMedia stream. Every call captures the epoch at
+  // entry and re-checks it after each await; a superseded call unwinds
+  // whatever it acquired instead of mutating shared state.
   async connect(channelName, { displayName = 'Guest' } = {}) {
     if (!this.actor) this._initActor();
     if (!this.actor.getSnapshot().can({ type: 'connect' })) await this.disconnect();
+    const epoch = ++this._epoch;
     this.actor.send({ type: 'connect' });
     this.channelName = channelName;
     this.joinTs = Math.floor(Date.now() / 1000);
     this.displayName = displayName;
     try {
-      this.roomId = await deriveRoomId(this.serverId, channelName);
-      this.localStream = await this.md.getUserMedia({ audio: { echoCancellation: true, noiseSuppression: true, autoGainControl: true } });
+      const roomId = await deriveRoomId(this.serverId, channelName);
+      if (epoch !== this._epoch) return;
+      const stream = await this.md.getUserMedia({ audio: { echoCancellation: true, noiseSuppression: true, autoGainControl: true } });
+      if (epoch !== this._epoch) { stream.getTracks().forEach(t => t.stop()); return; }
+      this.roomId = roomId;
+      this.localStream = stream;
       // PTT default: gate closed at join. Apps that want always-on call setMuted(false).
       this.muted = true;
       this.localStream.getAudioTracks().forEach(t => t.enabled = false);
@@ -84,10 +100,12 @@ export class VoiceSession extends EventTarget {
       this._subscribeSignals();
       this._subscribePresence();
       await this._publishPresence('join');
+      if (epoch !== this._epoch) return;
       this._startHeartbeat();
       this._sfuStart();
       this._emit('connected', { roomId: this.roomId, channelName });
     } catch (e) {
+      if (epoch !== this._epoch) return;
       this.actor.send({ type: 'fail' });
       this._emit('error', { message: 'connect failed: ' + e.message });
       throw e;
@@ -97,6 +115,7 @@ export class VoiceSession extends EventTarget {
   async disconnect() {
     if (!this.actor || this.actor.getSnapshot().matches('idle')) return;
     if (!this.actor.getSnapshot().can({ type: 'disconnect' })) return;
+    ++this._epoch;
     this.actor.send({ type: 'disconnect' });
     await this._publishPresence('leave');
     this._stopHeartbeat();
@@ -659,6 +678,7 @@ export class VoiceSession extends EventTarget {
     try { peer.dc?.close(); } catch {}
     try { peer.pc?.close(); } catch {}
     if (peer.audioEl) { peer.audioEl.srcObject = null; peer.audioEl.remove(); }
+    try { peer.fsm?.stop?.(); } catch {}
     this._detachAnalyzer(peerPubkey);
     this.peers.delete(peerPubkey);
     this._emit('peer-closed', { peerPubkey });