wireweave 0.3.28 → 0.3.29

package/package.json

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

package/src/chat.js

@@ -12,6 +12,16 @@ export class Chat extends EventTarget {
     this.activeChannelId = null;
     this.messages = [];
     this.profiles = new Map(); this.fetching = new Set();
+    this._sendTimes = [];
+    this.rateLimitMax = 5;
+    this.rateLimitWindowMs = 10000;
+  }
+
+  rateLimitRetryAfterMs() {
+    const now = Date.now();
+    this._sendTimes = (this._sendTimes || []).filter(t => now - t < this.rateLimitWindowMs);
+    if (this._sendTimes.length < this.rateLimitMax) return 0;
+    return this._sendTimes[0] + this.rateLimitWindowMs - now;
   }
 
   async send(content, { announcement = false } = {}) {
@@ -19,6 +29,12 @@ export class Chat extends EventTarget {
     if (!this.auth.isLoggedIn() || !channelId) return;
     if (announcement && !this.isAdmin(serverId)) return;
     const trimmed = content.trim(); if (!trimmed) return;
+    const retryAfter = this.rateLimitRetryAfterMs();
+    if (retryAfter > 0) {
+      this._emit('rate-limited', { retryAfterMs: retryAfter });
+      return;
+    }
+    this._sendTimes.push(Date.now());
     const chanHex = await hexChannelId(channelId, serverId);
     const tags = [['e', chanHex, '', 'root']];
     if (announcement) tags.push(['t', 'announcement']);

package/src/relay-pool.js

@@ -14,6 +14,7 @@ const DEFAULT_RELAYS = [
 const SEEN_MAX = 10000;
 const PENDING_MAX = 500;
 const PENDING_TTL_MS = 120000;
+const CONNECT_TIMEOUT_MS = 10000;
 const jitter = (ms) => Math.round(ms * (0.75 + Math.random() * 0.5));
 
 const lruTouch = (map, key) => {
@@ -60,6 +61,7 @@ export class RelayPool extends EventTarget {
     for (const [, rec] of this._acks) { clearTimeout(rec.timer); rec.resolve(false); }
     this._acks.clear();
     for (const [, r] of this.relays) {
+      if (r._connectTimer) clearTimeout(r._connectTimer);
       if (r.ws) {
         r.ws.onclose = null; r.ws.onerror = null; r.ws.onopen = null; r.ws.onmessage = null;
         if (typeof r.ws.removeAllListeners === 'function') r.ws.removeAllListeners();
@@ -83,7 +85,13 @@ export class RelayPool extends EventTarget {
     try { ws = new this.WS(url); }
     catch (e) { relay.status = 'error'; this._emit('relay-status', { url, status: 'error' }); return; }
     relay.ws = ws;
+    const connectTimer = setTimeout(() => {
+      if (relay.ws !== ws || relay.status !== 'connecting') return;
+      try { ws.close(); } catch {}
+    }, CONNECT_TIMEOUT_MS);
+    relay._connectTimer = connectTimer;
     ws.onopen = () => {
+      clearTimeout(connectTimer);
       relay.status = 'connected';
       relay._openedAt = Date.now();
       this._emit('relay-status', { url, status: 'connected' });
@@ -101,8 +109,9 @@ export class RelayPool extends EventTarget {
       }
       try { this._handle(url, typeof e.data === 'string' ? e.data : e.data.toString()); } catch {}
     };
-    ws.onerror = () => { relay.status = 'error'; this._emit('relay-status', { url, status: 'error' }); };
+    ws.onerror = () => { clearTimeout(connectTimer); relay.status = 'error'; this._emit('relay-status', { url, status: 'error' }); };
     ws.onclose = () => {
+      clearTimeout(connectTimer);
       relay.status = 'closed';
       this._emit('relay-status', { url, status: 'closed' });
       const sustained = relay._openedAt && Date.now() - relay._openedAt > 5000;