uniwrtc 1.8.0 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniwrtc",
-  "version": "1.8.0",
+  "version": "2.0.0",
   "description": "A universal WebRTC signaling service",
   "main": "server.js",
   "type": "module",

package/src/main.js

@@ -12,6 +12,7 @@ let myPeerId = null;
 let mySessionNonce = null;
 const peerSessions = new Map();
 const peerProbeState = new Map();
+const peerResyncState = new Map();
 const readyPeers = new Set();
 const deferredHelloPeers = new Set();
 
@@ -42,23 +43,17 @@ function isHex64(s) {
     return typeof s === 'string' && /^[0-9a-fA-F]{64}$/.test(s);
 }
 
-function ensureIdentity() {
-    // Must match the key used in createNostrClient() so the pubkey stays consistent.
-    const storageKey = 'nostr-secret-key-tab';
-    let stored = sessionStorage.getItem(storageKey);
-
-    if (stored && stored.includes(',')) {
-        sessionStorage.removeItem(storageKey);
-        stored = null;
-    }
+// Store the secret key for use with all Nostr clients
+let mySecretKeyHex = null;
 
-    if (!isHex64(stored)) {
+function ensureIdentity() {
+    // Generate a fresh unique peer ID on every page load
+    // This ensures each browser tab/reload gets a new identity
+    if (!mySecretKeyHex) {
         const secretBytes = generateSecretKey();
-        stored = bytesToHex(secretBytes);
-        sessionStorage.setItem(storageKey, stored);
+        mySecretKeyHex = bytesToHex(secretBytes);
     }
-
-    return getPublicKey(stored);
+    return getPublicKey(mySecretKeyHex);
 }
 
 // Initialize app
@@ -102,6 +97,11 @@ document.getElementById('app').innerHTML = `
             </div>
         </div>
 
+        <div class="card">
+            <h2>Role</h2>
+            <div id="roleBadge" data-testid="roleBadge" class="status-badge status-disconnected">Not assigned</div>
+        </div>
+
         <div class="card">
             <h2>Connected Peers</h2>
             <div id="peerList" data-testid="peerList" class="peer-list">
@@ -230,6 +230,27 @@ function updateStatus(connected) {
     }
 }
 
+function updateRole(role) {
+    const badge = document.getElementById('roleBadge');
+    if (!badge) return;
+
+    if (role === 'coordinator') {
+        badge.textContent = 'Coordinator';
+        badge.className = 'status-badge status-connected';
+        // If assigned a role, we must be connected
+        updateStatus(true);
+    } else if (role === 'peer') {
+        badge.textContent = 'Peer';
+        badge.className = 'status-badge status-info';
+        // If assigned a role, we must be connected
+        updateStatus(true);
+    } else {
+        badge.textContent = 'Not assigned';
+        badge.className = 'status-badge status-disconnected';
+        updateStatus(false);
+    }
+}
+
 function updatePeerList() {
     const peerList = document.getElementById('peerList');
     if (!peerList) return;
@@ -328,6 +349,28 @@ async function maybeProbePeer(peerId) {
     }
 }
 
+// Force a probe to resync sessions when we detect mismatched toSession
+async function resyncPeerSession(peerId, reason = 'session mismatch') {
+    if (!nostrClient) return;
+
+    const now = Date.now();
+    const last = peerResyncState.get(peerId) || 0;
+    if (now - last < 3000) return; // throttle resync attempts
+    peerResyncState.set(peerId, now);
+
+    const probeId = Math.random().toString(36).slice(2, 10) + now.toString(36);
+    // Track probe so probe-ack can update readiness/session
+    const prevSession = peerSessions.get(peerId) || null;
+    peerProbeState.set(peerId, { session: prevSession, ts: now, probeId });
+
+    try {
+        await sendSignal(peerId, { type: 'probe', probeId });
+        log(`Resyncing session with ${peerId.substring(0, 6)}... (${reason})`, 'info');
+    } catch (e) {
+        log(`Resync probe failed: ${e?.message || e}`, 'warning');
+    }
+}
+
 function logDrop(peerId, payload, reason) {
     const t = payload?.type || 'unknown';
     if (t !== 'signal-offer' && t !== 'signal-answer' && t !== 'signal-ice' && t !== 'signal-ice-batch' && t !== 'probe' && t !== 'probe-ack') return;
@@ -488,6 +531,7 @@ async function connectNostr() {
         const makeClient = (relayUrl) => createNostrClient({
             relayUrl,
             room: effectiveRoom,
+            secretKeyHex: mySecretKeyHex,
             onState: (state) => {
                 if (state === 'connected') updateStatus(true);
                 if (state === 'disconnected') updateStatus(false);
@@ -561,6 +605,7 @@ async function connectNostr() {
                 // Only accept signaling intended for THIS browser session
                 if (payload.toSession && payload.toSession !== mySessionNonce) {
                     logDrop(peerId, payload, 'toSession mismatch');
+                    await resyncPeerSession(peerId, 'toSession mismatch');
                     return;
                 }
 
@@ -666,6 +711,11 @@ async function connectNostr() {
                             log(`Ignoring non-answer in signal-answer from ${peerId.substring(0, 6)}...`, 'warning');
                             return;
                         }
+                        // Perfect negotiation guard: only accept an answer when we have a local offer
+                        if (pc.signalingState !== 'have-local-offer') {
+                            log(`Ignoring answer; unexpected signaling state: ${pc.signalingState}`, 'warning');
+                            return;
+                        }
                         await pc.setRemoteDescription(new RTCSessionDescription(payload.sdp));
                         await flushPendingIce(peerId);
                     }
@@ -879,6 +929,7 @@ async function connectWebRTC() {
 }
 
 window.disconnect = function() {
+    updateRole(null);
     if (nostrClient) {
         nostrClient.disconnect().catch(() => {});
         nostrClient = null;

package/src/nostr/nostrClient.js

@@ -55,24 +55,10 @@ export function createNostrClient({ relayUrl, room, onPayload, onState, onNotice
       return;
     }
 
-    // IMPORTANT: For this demo we want each browser tab to have a distinct peer ID.
-    // sessionStorage is per-tab, while localStorage is shared across tabs.
-    let stored = effectiveStorage.getItem(storageKey);
-
-    // If stored value looks like an array string from prior buggy storage, clear it
-    if (stored && stored.includes(',')) {
-      effectiveStorage.removeItem(storageKey);
-      stored = null;
-    }
-
-    if (!isHex64(stored)) {
-      const secretBytes = generateSecretKey();
-      state.secretKeyHex = bytesToHex(secretBytes);
-      effectiveStorage.setItem(storageKey, state.secretKeyHex);
-    } else {
-      state.secretKeyHex = stored;
-    }
-
+    // Generate a fresh unique peer ID on every page load
+    // This ensures each browser tab/reload gets a new identity
+    const secretBytes = generateSecretKey();
+    state.secretKeyHex = bytesToHex(secretBytes);
     state.pubkey = getPublicKey(state.secretKeyHex);
   }
 

package/CLOUDFLARE_DEPLOYMENT.md

@@ -1,33 +0,0 @@
-# UniWRTC Cloudflare Deployment Guide
-
-## Deploy (Cloudflare Pages)
-
-This repo’s current demo works client-side (Nostr), so you can deploy just the static site to Cloudflare Pages.
-
-### Prerequisites
-
-1. **Cloudflare Account** - Free tier is sufficient
-2. **Wrangler CLI** - Install: `npm install -g wrangler` (or use `npx`)
-3. **Node.js** - v16 or higher
-
-### Deploy
-
-```bash
-npm install
-npm run deploy:cf:pages
-```
-
-Notes:
-- This deploys the `dist/` folder (static hosting).
-- No server routes are deployed.
-
-## Custom Domain (signal.peer.ooo)
-
-To serve the Pages project at `https://signal.peer.ooo`:
-
-1. Cloudflare Dashboard → Pages → your project → **Custom domains** → add `signal.peer.ooo`
-2. Cloudflare DNS → set `signal` as a CNAME to `<your-pages-project>.pages.dev`
-
----
-
-For more info: [Cloudflare Workers Docs](https://developers.cloudflare.com/workers/)