uniwrtc 1.1.0 → 1.2.0

package/CLOUDFLARE_DEPLOYMENT.md

@@ -1,126 +1,32 @@
 # UniWRTC Cloudflare Deployment Guide
 
-## Prerequisites
+## Deploy Without Durable Objects (Cloudflare Pages)
 
-1. **Cloudflare Account** - Free tier is sufficient
-2. **Wrangler CLI** - Install: `npm install -g wrangler`
-3. **Node.js** - v16 or higher
-4. **Your Domain** - Domain must be on Cloudflare (e.g., `peer.ooo`)
-
-## Setup Steps
-
-### 1. Install Wrangler
-
-```bash
-npm install -g wrangler
-```
-
-### 2. Authenticate with Cloudflare
-
-```bash
-wrangler login
-```
-
-This will open your browser to authorize the CLI.
-
-### 3. Update wrangler.toml
-
-Replace the zone configuration with your domain:
-
-```toml
-[env.production]
-routes = [
-  { pattern = "signal.peer.ooo/*", zone_name = "peer.ooo" }
-]
-```
-
-### 4. Deploy to Cloudflare
-
-```bash
-# Deploy to production
-wrangler publish --env production
-
-# Or deploy to staging first
-wrangler publish
-```
-
-### 5. Access Your Signaling Server
-
-Your server will be available at:
-- **Production**: `https://signal.peer.ooo/`
-- **Development**: `https://uniwrtc.<subdomain>.workers.dev/`
+If you only want to host the demo UI (static assets) and do NOT want Durable Objects, deploy the Vite build to Cloudflare Pages.
 
-## Using with UniWRTC Demo
+### Prerequisites
 
-Update the demo to use your Cloudflare endpoint:
-
-```javascript
-// In demo.html or client
-const serverUrl = 'https://signal.peer.ooo/';
-const roomId = 'my-room';
-
-const client = new UniWRTCClient(serverUrl, { 
-  roomId: roomId,
-  customPeerId: 'optional-id' 
-});
-
-await client.connect();
-```
-
-## How It Works
-
-1. **Durable Objects** - One per room, manages peer discovery
-2. **HTTP polling** - Browsers connect for signaling
-3. **Signaling Only** - Offers/answers/ICE via Worker
-4. **P2P Data** - WebRTC data channels bypass Cloudflare
-5. **Free Tier** - Plenty of capacity for small deployments
-
-## Cost
-
-- **Requests**: 100,000 free per day (signaling only)
-- **Compute**: Included in free tier
-- **Durable Objects**: ~$0.15/million operations (minimal for signaling)
-- **Total**: Free to very low cost
-
-## Monitoring
-
-Check deployment status:
-
-```bash
-wrangler tail --env production
-```
-
-View real-time logs from your Worker.
-
-## Local Development
+1. **Cloudflare Account** - Free tier is sufficient
+2. **Wrangler CLI** - Install: `npm install -g wrangler` (or use `npx`)
+3. **Node.js** - v16 or higher
 
-Test locally before deploying:
+### Deploy
 
 ```bash
-wrangler dev
+npm install
+npm run deploy:cf:no-do
 ```
 
-Your local server will run at `http://localhost:8787`
-
-Update demo to test:
-```javascript
-const serverUrl = 'http://localhost:8787/';
-```
-
-## Troubleshooting
-
-**Connection errors**: Ensure your domain is on Cloudflare with SSL enabled
-
-**Connection refused**: Check the Worker route pattern in `wrangler.toml`
+Notes:
+- This deploys the `dist/` folder (static hosting).
+- No server routes are deployed; Durable Objects are not used.
 
-**Durable Objects not found**: Run `wrangler publish` with migrations enabled
+## Custom Domain (signal.peer.ooo)
 
-## Next Steps
+To serve the Pages project at `https://signal.peer.ooo`:
 
-1. Deploy the Worker
-2. Update demo.html to use your Cloudflare endpoint
-3. Test with multiple browsers
-4. Scale up!
+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`
 
 ---
 

package/QUICKSTART_CLOUDFLARE.md

@@ -1,8 +1,24 @@
-# Quick Start - Deploy to Cloudflare in 30 seconds
+# Quick Start - Deploy to Cloudflare
+
+## Option A (No Durable Objects): Cloudflare Pages (static)
+
+This repo’s current demo works client-side (Nostr), so you can deploy just the static site to Cloudflare Pages.
+
+### Prerequisites
+- Cloudflare account (free tier works)
+- Node.js installed
+- Wrangler CLI authenticated (`npx wrangler login`)
+
+### Deploy
+```bash
+npm install
+npm run deploy:cf:no-do
+```
+
+Wrangler will prompt you to pick/create a Pages project the first time.
 
 ## Prerequisites
 - Cloudflare account (free tier works)
-- Your domain on Cloudflare
 - Node.js installed
 
 ## Deploy
@@ -18,38 +34,12 @@ chmod +x deploy-cloudflare.sh
 deploy-cloudflare.bat
 ```
 
-## What the script does:
-1. ✅ Checks Node.js and installs Wrangler
-2. ✅ Authenticates with Cloudflare
-3. ✅ Asks for your domain (e.g., `signal.peer.ooo`)
-4. ✅ Updates `wrangler.toml`
-5. ✅ Deploys to Cloudflare Workers
-6. ✅ Gives you the live URL
+## What this does
+1. ✅ Builds the Vite site into `dist/`
+2. ✅ Deploys `dist/` to Cloudflare Pages
 
 ## After deployment:
 
-Update demo.html:
-```javascript
-const serverUrl = 'https://signal.peer.ooo/'; // Your domain
-```
-
-Then reload the demo and it will connect to your Cloudflare Workers signaling server! 🚀
-
-## Testing
-
-Test the server:
-```bash
-curl https://signal.peer.ooo/health
-```
-
-View logs:
-```bash
-wrangler tail --env production
-```
-
-Local development:
-```bash
-wrangler dev
-```
+Then set your custom domain in Cloudflare Pages (and point `signal` to `<project>.pages.dev`).
 
-That's it! Your WebRTC signaling is now on Cloudflare! 🎉
+That's it! Your demo is now on Cloudflare Pages (no Durable Objects).

package/deploy-cloudflare.bat

@@ -1,9 +1,10 @@
 @echo off
-REM UniWRTC Cloudflare Automated Setup Script (Windows)
+REM UniWRTC Cloudflare Automated Setup Script (Windows, NO Durable Objects)
+REM Deploys the static demo to Cloudflare Pages.
 
 setlocal enabledelayedexpansion
 
-echo 🚀 UniWRTC Cloudflare Setup
+echo 🚀 UniWRTC Cloudflare Setup (Pages / no Durable Objects)
 echo ============================
 echo.
 
@@ -40,74 +41,29 @@ if errorlevel 1 (
 echo ✅ Authenticated with Cloudflare
 echo.
 
-REM Ask for domain
-echo 🌐 Domain Configuration
-echo =====================
-set /p DOMAIN="Enter your Cloudflare domain (e.g., peer.ooo): "
-set /p SUBDOMAIN="Enter subdomain for signaling (e.g., signal): "
+REM Project name
+set PROJECT_NAME=signal-peer-ooo
+if not "%~1"=="" set PROJECT_NAME=%~1
 
-if "!DOMAIN!"=="" (
-  echo ❌ Domain required
-  exit /b 1
-)
-
-if "!SUBDOMAIN!"=="" (
-  echo ❌ Subdomain required
-  exit /b 1
-)
-
-set FULL_DOMAIN=!SUBDOMAIN!.!DOMAIN!
-
-REM Update wrangler.toml
-echo 📝 Updating wrangler.toml...
-(
-  echo name = "uniwrtc"
-  echo main = "src/index.js"
-  echo compatibility_date = "2024-12-20"
-  echo.
-  echo [env.production]
-  echo routes = [
-  echo   { pattern = "!FULL_DOMAIN!/*", zone_name = "!DOMAIN!" }
-  echo ]
-  echo.
-  echo [[durable_objects.bindings]]
-  echo name = "ROOMS"
-  echo class_name = "Room"
-  echo.
-  echo [durable_objects]
-  echo migrations = [
-  echo   { tag = "v1", new_classes = ["Room"] }
-  echo ]
-  echo.
-  echo [build]
-  echo command = "npm install"
-) > wrangler.toml
+echo 📦 Building static site...
+call npm run build
 
-echo ✅ wrangler.toml updated
+echo 🚀 Deploying to Cloudflare Pages project: %PROJECT_NAME%
 echo.
 
+REM Create project if needed (ignore errors)
+call npx wrangler pages project create %PROJECT_NAME% --production-branch main >nul 2>nul
+
 REM Deploy
-echo 🚀 Deploying to Cloudflare...
-echo.
-call wrangler deploy --env production
+call npx wrangler pages deploy dist --project-name %PROJECT_NAME%
 
 echo.
 echo ✅ Deployment Complete!
 echo.
-echo 🎉 Your UniWRTC signaling server is live at:
-echo    https://!FULL_DOMAIN!/
-echo.
-echo 📊 Test it:
-echo    curl https://!FULL_DOMAIN!/health
-echo.
-echo 🧪 Local testing:
-echo    wrangler dev
-echo.
-echo 📊 View logs:
-echo    wrangler tail --env production
-echo.
-echo 🛠️  Next: Update demo.html to use:
-echo    const serverUrl = 'https://!FULL_DOMAIN!/';
+echo 🎉 Your Pages site is deployed.
+echo Next step for custom domain (manual in Cloudflare UI):
+echo   - Pages ^> %PROJECT_NAME% ^> Custom domains ^> add signal.peer.ooo
+echo   - DNS: CNAME signal ^> %PROJECT_NAME%.pages.dev
 echo.
 
 endlocal

package/deploy-cloudflare.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-# UniWRTC Cloudflare Automated Setup Script
-# Run this to setup and deploy to Cloudflare
+# UniWRTC Cloudflare Automated Setup Script (NO Durable Objects)
+# Deploys the static demo to Cloudflare Pages.
 
 set -e
 
-echo "🚀 UniWRTC Cloudflare Setup"
+echo "🚀 UniWRTC Cloudflare Setup (Pages / no Durable Objects)"
 echo "============================"
 echo ""
 
@@ -41,67 +41,24 @@ fi
 echo "✅ Authenticated with Cloudflare"
 echo ""
 
-# Domain configuration
-DOMAIN="peer.ooo"
-SUBDOMAIN="signal"
+PROJECT_NAME=${1:-"signal-peer-ooo"}
 
-FULL_DOMAIN="${SUBDOMAIN}.${DOMAIN}"
+echo "📦 Building static site..."
+npm run build
 
-echo "📝 Updating wrangler.toml..."
-cat > wrangler.toml << EOF
-name = "uniwrtc"
-main = "src/index.js"
-compatibility_date = "2024-12-20"
+echo "🚀 Deploying to Cloudflare Pages project: ${PROJECT_NAME}"
 
-assets = { directory = "./dist", binding = "ASSETS" }
+# Create the project if it doesn't exist (ignore error if it already exists)
+npx wrangler pages project create "${PROJECT_NAME}" --production-branch main 2>/dev/null || true
 
-[[durable_objects.bindings]]
-name = "ROOMS"
-class_name = "Room"
-
-[[migrations]]
-tag = "v1"
-new_classes = ["Room"]
-
-[env.production]
-routes = [
-  { pattern = "${FULL_DOMAIN}/*", zone_name = "${DOMAIN}" }
-]
-
-assets = { directory = "./dist", binding = "ASSETS" }
-
-[[env.production.durable_objects.bindings]]
-name = "ROOMS"
-class_name = "Room"
-
-[build]
-command = "npm install"
-EOF
-
-echo "✅ wrangler.toml updated"
-echo ""
-
-# Deploy
-echo "🚀 Deploying to Cloudflare..."
-echo ""
-echo "Deploying to production..."
-wrangler deploy --env production
+# Deploy the built assets
+npx wrangler pages deploy dist --project-name "${PROJECT_NAME}"
 
 echo ""
 echo "✅ Deployment Complete!"
 echo ""
-echo "🎉 Your UniWRTC signaling server is live at:"
-echo "   https://${FULL_DOMAIN}/"
-echo ""
-echo "📊 Test it:"
-echo "   curl https://${FULL_DOMAIN}/health"
-echo ""
-echo "🧪 Local testing:"
-echo "   wrangler dev"
-echo ""
-echo "📊 View logs:"
-echo "   wrangler tail --env production"
-echo ""
-echo "🛠️  Next: Update demo.html to use:"
-echo "   const serverUrl = 'https://${FULL_DOMAIN}/';"
+echo "🎉 Your Pages site is deployed."
+echo "Next step for custom domain (manual in Cloudflare UI):"
+echo "  - Pages → ${PROJECT_NAME} → Custom domains → add signal.peer.ooo"
+echo "  - DNS: CNAME signal → ${PROJECT_NAME}.pages.dev"
 echo ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniwrtc",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A universal WebRTC signaling service",
   "main": "server.js",
   "type": "module",
@@ -9,6 +9,8 @@
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
+    "deploy:cf:pages": "npm run build && npx wrangler pages deploy dist",
+    "deploy:cf:no-do": "npm run deploy:cf:pages",
     "server": "node server.js",
     "test": "node test.js"
   },

package/src/main.js

@@ -7,6 +7,7 @@ window.UniWRTCClient = UniWRTCClient;
 
 // Nostr is the default transport (no toggle)
 let nostrClient = null;
+let myPeerId = null;
 
 let client = null;
 const peerConnections = new Map();
@@ -154,6 +155,31 @@ window.connect = async function() {
     await connectNostr();
 };
 
+function shouldInitiateWith(peerId) {
+    // Deterministic initiator to avoid offer glare
+    if (!myPeerId) return false;
+    return myPeerId.localeCompare(peerId) < 0;
+}
+
+function sendSignal(to, payload) {
+    if (!nostrClient) throw new Error('Not connected to Nostr');
+    return nostrClient.send({
+        ...payload,
+        to,
+    });
+}
+
+async function ensurePeerConnection(peerId) {
+    if (!peerId || peerId === myPeerId) return null;
+    if (peerConnections.has(peerId) && peerConnections.get(peerId) instanceof RTCPeerConnection) {
+        return peerConnections.get(peerId);
+    }
+
+    const initiator = shouldInitiateWith(peerId);
+    const pc = await createPeerConnection(peerId, initiator);
+    return pc;
+}
+
 async function connectNostr() {
     const relayUrl = document.getElementById('relayUrl').value.trim();
     const roomIdInput = document.getElementById('roomId');
@@ -182,22 +208,65 @@ async function connectNostr() {
                 if (state === 'connected') updateStatus(true);
                 if (state === 'disconnected') updateStatus(false);
             },
-            onMessage: ({ from, text }) => {
-                displayChatMessage(text, from, false);
-            },
-            onPeer: ({ peerId }) => {
+            onPayload: async ({ from, payload }) => {
+                const peerId = from;
+                if (!peerId || peerId === myPeerId) return;
+
                 // Use the existing peer list UI as a simple "seen peers" list
                 if (!peerConnections.has(peerId)) {
                     peerConnections.set(peerId, null);
                     updatePeerList();
                     log(`Peer seen: ${peerId.substring(0, 6)}...`, 'success');
                 }
-            }
+
+                if (!payload || typeof payload !== 'object') return;
+
+                // Presence
+                if (payload.type === 'hello') {
+                    await ensurePeerConnection(peerId);
+                    return;
+                }
+
+                // Signaling messages are always targeted
+                if (payload.to && payload.to !== myPeerId) return;
+
+                if (payload.type === 'signal-offer' && payload.sdp) {
+                    log(`Received offer from ${peerId.substring(0, 6)}...`, 'info');
+                    const pc = await ensurePeerConnection(peerId);
+                    await pc.setRemoteDescription(new RTCSessionDescription(payload.sdp));
+                    const answer = await pc.createAnswer();
+                    await pc.setLocalDescription(answer);
+                    await sendSignal(peerId, { type: 'signal-answer', sdp: pc.localDescription });
+                    log(`Sent answer to ${peerId.substring(0, 6)}...`, 'success');
+                    return;
+                }
+
+                if (payload.type === 'signal-answer' && payload.sdp) {
+                    log(`Received answer from ${peerId.substring(0, 6)}...`, 'info');
+                    const pc = peerConnections.get(peerId);
+                    if (pc instanceof RTCPeerConnection) {
+                        await pc.setRemoteDescription(new RTCSessionDescription(payload.sdp));
+                    }
+                    return;
+                }
+
+                if (payload.type === 'signal-ice' && payload.candidate) {
+                    const pc = peerConnections.get(peerId);
+                    if (pc instanceof RTCPeerConnection) {
+                        try {
+                            await pc.addIceCandidate(new RTCIceCandidate(payload.candidate));
+                        } catch (e) {
+                            log(`Failed to add ICE candidate: ${e?.message || e}`, 'warning');
+                        }
+                    }
+                }
+            },
         });
 
         await nostrClient.connect();
 
         const myPubkey = nostrClient.getPublicKey();
+        myPeerId = myPubkey;
         document.getElementById('clientId').textContent = myPubkey.substring(0, 16) + '...';
         document.getElementById('sessionId').textContent = effectiveRoom;
         log(`Joined Nostr room: ${effectiveRoom}`, 'success');
@@ -336,6 +405,13 @@ window.disconnect = function() {
     if (nostrClient) {
         nostrClient.disconnect().catch(() => {});
         nostrClient = null;
+        myPeerId = null;
+        peerConnections.forEach((pc) => {
+            if (pc instanceof RTCPeerConnection) pc.close();
+        });
+        peerConnections.clear();
+        dataChannels.clear();
+        updatePeerList();
     }
     if (client) {
         client.disconnect();
@@ -366,7 +442,11 @@ async function createPeerConnection(peerId, shouldInitiate) {
     pc.onicecandidate = (event) => {
         if (event.candidate) {
                 log(`Sending ICE candidate to ${peerId.substring(0, 6)}...`, 'info');
-            client.sendIceCandidate(event.candidate, peerId);
+            if (nostrClient) {
+                sendSignal(peerId, { type: 'signal-ice', candidate: event.candidate.toJSON?.() || event.candidate });
+            } else if (client) {
+                client.sendIceCandidate(event.candidate, peerId);
+            }
         }
     };
 
@@ -381,7 +461,11 @@ async function createPeerConnection(peerId, shouldInitiate) {
         
         const offer = await pc.createOffer();
         await pc.setLocalDescription(offer);
-        client.sendOffer(offer, peerId);
+        if (nostrClient) {
+            await sendSignal(peerId, { type: 'signal-offer', sdp: pc.localDescription });
+        } else if (client) {
+            client.sendOffer(offer, peerId);
+        }
             log(`Sent offer to ${peerId.substring(0, 6)}...`, 'success');
     } else {
             log(`Waiting for offer from ${peerId.substring(0, 6)}...`, 'info');
@@ -416,17 +500,8 @@ window.sendChatMessage = function() {
         return;
     }
 
-    if (nostrClient) {
-        nostrClient.sendMessage(message).catch((e) => {
-            log(`Failed to send via Nostr: ${e?.message || e}`, 'error');
-        });
-        displayChatMessage(message, 'You', true);
-        document.getElementById('chatMessage').value = '';
-        return;
-    }
-
     if (dataChannels.size === 0) {
-        log('No peer connections available. Wait for data channels to open.', 'error');
+        log('No data channels yet. Open this room in another tab/browser and wait for WebRTC to connect.', 'error');
         return;
     }
 

package/src/nostr/nostrClient.js

@@ -15,7 +15,7 @@ function isHex64(s) {
  * - Publishes kind:1 events tagged with ['t', room] and ['room', room]
  * - Subscribes to kind:1 events filtered by #t
  */
-export function createNostrClient({ relayUrl, room, onMessage, onPeer, onState } = {}) {
+export function createNostrClient({ relayUrl, room, onPayload, onState } = {}) {
   if (!relayUrl) throw new Error('relayUrl is required');
   if (!room) throw new Error('room is required');
 
@@ -80,6 +80,9 @@ export function createNostrClient({ relayUrl, room, onMessage, onPeer, onState }
       if (nostrEvent.id && state.seen.has(nostrEvent.id)) return;
       if (nostrEvent.id) state.seen.add(nostrEvent.id);
 
+      // Ignore our own events
+      if (nostrEvent.pubkey && nostrEvent.pubkey === state.pubkey) return;
+
       // Ensure it's for our room
       const tags = Array.isArray(nostrEvent.tags) ? nostrEvent.tags : [];
       const roomTag = tags.find((t) => Array.isArray(t) && t[0] === 'room');
@@ -93,22 +96,15 @@ export function createNostrClient({ relayUrl, room, onMessage, onPeer, onState }
         return;
       }
 
-      if (payload?.type === 'peer-join' && payload.peerId) {
-        try {
-          onPeer?.({ peerId: payload.peerId });
-        } catch {
-          // ignore
-        }
-        return;
-      }
-
-      if (payload?.type === 'message' && typeof payload.message === 'string') {
-        const from = (payload.peerId || nostrEvent.pubkey || 'peer').substring(0, 8) + '...';
-        try {
-          onMessage?.({ from, text: payload.message });
-        } catch {
-          // ignore
-        }
+      try {
+        onPayload?.({
+          from: nostrEvent.pubkey,
+          payload,
+          eventId: nostrEvent.id,
+          createdAt: nostrEvent.created_at,
+        });
+      } catch {
+        // ignore
       }
     }
   }
@@ -160,37 +156,12 @@ export function createNostrClient({ relayUrl, room, onMessage, onPeer, onState }
     sendRaw(['REQ', state.subId, filter]);
 
     // Announce presence
-    await sendJoin();
+    await send({ type: 'hello' });
 
     setState('connected');
   }
 
-  async function sendJoin() {
-    ensureKeys();
-    const created_at = Math.floor(Date.now() / 1000);
-    const tags = [
-      ['room', state.room],
-      ['t', state.room],
-    ];
-
-    const eventTemplate = {
-      kind: 1,
-      created_at,
-      tags,
-      content: JSON.stringify({
-        type: 'peer-join',
-        peerId: state.pubkey,
-        room: state.room,
-        timestamp: Date.now(),
-      }),
-      pubkey: state.pubkey,
-    };
-
-    const signed = finalizeEvent(eventTemplate, state.secretKeyHex);
-    sendRaw(['EVENT', signed]);
-  }
-
-  async function sendMessage(text) {
+  async function send(payload) {
     ensureKeys();
     const created_at = Math.floor(Date.now() / 1000);
     const tags = [
@@ -203,9 +174,8 @@ export function createNostrClient({ relayUrl, room, onMessage, onPeer, onState }
       created_at,
       tags,
       content: JSON.stringify({
-        type: 'message',
-        message: text,
-        peerId: state.pubkey,
+        ...payload,
+        from: state.pubkey,
         room: state.room,
         timestamp: Date.now(),
       }),
@@ -237,7 +207,7 @@ export function createNostrClient({ relayUrl, room, onMessage, onPeer, onState }
   return {
     connect,
     disconnect,
-    sendMessage,
+    send,
     getPublicKey: getPublicKeyHex,
   };
 }

package/wrangler.toml

@@ -1,27 +1,2 @@
-name = "uniwrtc"
-main = "src/index.js"
-compatibility_date = "2024-12-20"
-
-assets = { directory = "./dist", binding = "ASSETS" }
-
-[[durable_objects.bindings]]
-name = "ROOMS"
-class_name = "Room"
-
-[[migrations]]
-tag = "v1"
-new_classes = ["Room"]
-
-[env.production]
-routes = [
-  { pattern = "signal.peer.ooo/*", zone_name = "peer.ooo" }
-]
-
-assets = { directory = "./dist", binding = "ASSETS" }
-
-[[env.production.durable_objects.bindings]]
-name = "ROOMS"
-class_name = "Room"
-
-[build]
-command = "npm install"
+name = "signal-peer-ooo"
+pages_build_output_dir = "dist"