uniwrtc 1.0.9 → 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/NOSTR_INTEGRATION.md

@@ -0,0 +1,6 @@
+# Nostr notes
+
+The demo page now defaults to Nostr (no UI toggle).
+
+- Nostr client: [src/nostr/nostrClient.js](src/nostr/nostrClient.js)
+- UI integration: [src/main.js](src/main.js)

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.0.9",
+  "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"
   },
@@ -20,7 +22,9 @@
   ],
   "author": "",
   "license": "MIT",
-  "dependencies": {},
+  "dependencies": {
+    "nostr-tools": "^2.9.0"
+  },
   "devDependencies": {
     "@playwright/test": "^1.57.0",
     "vite": "^6.0.6"

package/src/main.js

@@ -1,9 +1,14 @@
 import './style.css';
 import UniWRTCClient from '../client-browser.js';
+import { createNostrClient } from './nostr/nostrClient.js';
 
 // Make UniWRTCClient available globally for backwards compatibility
 window.UniWRTCClient = UniWRTCClient;
 
+// Nostr is the default transport (no toggle)
+let nostrClient = null;
+let myPeerId = null;
+
 let client = null;
 const peerConnections = new Map();
 const dataChannels = new Map();
@@ -20,8 +25,8 @@ document.getElementById('app').innerHTML = `
             <h2>Connection</h2>
             <div class="connection-controls">
                 <div>
-                    <label style="display: block; margin-bottom: 5px; color: #64748b; font-size: 13px;">Server URL</label>
-                    <input type="text" id="serverUrl" data-testid="serverUrl" placeholder="wss://signal.peer.ooo or ws://localhost:8080" value="wss://signal.peer.ooo">
+                    <label style="display: block; margin-bottom: 5px; color: #64748b; font-size: 13px;">Relay URL</label>
+                    <input type="text" id="relayUrl" placeholder="wss://relay.damus.io" value="wss://relay.damus.io" style="width: 100%; padding: 8px; border: 1px solid #e2e8f0; border-radius: 4px; font-family: monospace; font-size: 12px;">
                 </div>
                 <div>
                     <label style="display: block; margin-bottom: 5px; color: #64748b; font-size: 13px;">Room / Session ID</label>
@@ -147,6 +152,135 @@ function updatePeerList() {
 }
 
 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');
+    const roomId = roomIdInput.value.trim();
+    
+    if (!relayUrl) {
+        log('Please enter a relay URL', 'error');
+        return;
+    }
+
+    const effectiveRoom = roomId || `room-${Math.random().toString(36).substring(2, 10)}`;
+    if (!roomId) roomIdInput.value = effectiveRoom;
+
+    try {
+        log(`Connecting to Nostr relay: ${relayUrl}...`, 'info');
+
+        if (nostrClient) {
+            await nostrClient.disconnect();
+            nostrClient = null;
+        }
+
+        nostrClient = createNostrClient({
+            relayUrl,
+            room: effectiveRoom,
+            onState: (state) => {
+                if (state === 'connected') updateStatus(true);
+                if (state === 'disconnected') updateStatus(false);
+            },
+            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');
+        
+        updateStatus(true);
+
+        log('Nostr connection established', 'success');
+    } catch (error) {
+        log(`Nostr connection error: ${error.message}`, 'error');
+        updateStatus(false);
+    }
+}
+
+async function connectWebRTC() {
     const serverUrl = document.getElementById('serverUrl').value.trim();
     const roomId = document.getElementById('roomId').value.trim();
 
@@ -161,35 +295,35 @@ window.connect = async function() {
     }
 
     try {
-            log(`Connecting to ${serverUrl}...`, 'info');
+        log(`Connecting to ${serverUrl}...`, 'info');
         
         // For Cloudflare, use /ws endpoint with room ID query param
         let finalUrl = serverUrl;
         if (serverUrl.includes('signal.peer.ooo')) {
-                finalUrl = `${serverUrl.replace(/\/$/, '')}/ws?room=${roomId}`;
-                log(`Using Cloudflare Durable Objects with session: ${roomId}`, 'info');
+            finalUrl = `${serverUrl.replace(/\/$/, '')}/ws?room=${roomId}`;
+            log(`Using Cloudflare Durable Objects with session: ${roomId}`, 'info');
         }
         
         client = new UniWRTCClient(finalUrl, { autoReconnect: false });
         
         client.on('connected', (data) => {
-                log(`Connected with client ID: ${data.clientId}`, 'success');
+            log(`Connected with client ID: ${data.clientId}`, 'success');
             document.getElementById('clientId').textContent = data.clientId;
             updateStatus(true);
             
             // Auto-join the room
-                log(`Joining session: ${roomId}`, 'info');
+            log(`Joining session: ${roomId}`, 'info');
             client.joinSession(roomId);
         });
 
         client.on('joined', (data) => {
-                log(`Joined session: ${data.sessionId}`, 'success');
+            log(`Joined session: ${data.sessionId}`, 'success');
             document.getElementById('sessionId').textContent = data.sessionId;
             
             if (data.clients && data.clients.length > 0) {
-                    log(`Found ${data.clients.length} existing peers`, 'info');
+                log(`Found ${data.clients.length} existing peers`, 'info');
                 data.clients.forEach(peerId => {
-                        log(`Creating connection to existing peer: ${peerId.substring(0, 6)}...`, 'info');
+                    log(`Creating connection to existing peer: ${peerId.substring(0, 6)}...`, 'info');
                     createPeerConnection(peerId, true);
                 });
             }
@@ -198,11 +332,11 @@ window.connect = async function() {
         client.on('peer-joined', (data) => {
             // Only handle peers in our session
             if (client.sessionId && data.sessionId !== client.sessionId) {
-                    log(`Ignoring peer from different session: ${data.sessionId}`, 'warning');
+                log(`Ignoring peer from different session: ${data.sessionId}`, 'warning');
                 return;
             }
             
-                log(`Peer joined: ${data.peerId.substring(0, 6)}...`, 'success');
+            log(`Peer joined: ${data.peerId.substring(0, 6)}...`, 'success');
             
             // Wait a bit to ensure both peers are ready
             setTimeout(() => {
@@ -211,7 +345,7 @@ window.connect = async function() {
         });
 
         client.on('peer-left', (data) => {
-                log(`Peer left: ${data.peerId.substring(0, 6)}...`, 'warning');
+            log(`Peer left: ${data.peerId.substring(0, 6)}...`, 'warning');
             const pc = peerConnections.get(data.peerId);
             if (pc) {
                 pc.close();
@@ -222,17 +356,17 @@ window.connect = async function() {
         });
 
         client.on('offer', async (data) => {
-                log(`Received offer from ${data.peerId.substring(0, 6)}...`, 'info');
+            log(`Received offer from ${data.peerId.substring(0, 6)}...`, 'info');
             const pc = peerConnections.get(data.peerId) || await createPeerConnection(data.peerId, false);
             await pc.setRemoteDescription(new RTCSessionDescription(data.offer));
             const answer = await pc.createAnswer();
             await pc.setLocalDescription(answer);
             client.sendAnswer(answer, data.peerId);
-                log(`Sent answer to ${data.peerId.substring(0, 6)}...`, 'success');
+            log(`Sent answer to ${data.peerId.substring(0, 6)}...`, 'success');
         });
 
         client.on('answer', async (data) => {
-                log(`Received answer from ${data.peerId.substring(0, 6)}...`, 'info');
+            log(`Received answer from ${data.peerId.substring(0, 6)}...`, 'info');
             const pc = peerConnections.get(data.peerId);
             if (pc) {
                 await pc.setRemoteDescription(new RTCSessionDescription(data.answer));
@@ -240,7 +374,7 @@ window.connect = async function() {
         });
 
         client.on('ice-candidate', async (data) => {
-                log(`Received ICE candidate from ${data.peerId.substring(0, 6)}...`, 'info');
+            log(`Received ICE candidate from ${data.peerId.substring(0, 6)}...`, 'info');
             const pc = peerConnections.get(data.peerId);
             if (pc && data.candidate) {
                 await pc.addIceCandidate(new RTCIceCandidate(data.candidate));
@@ -257,17 +391,28 @@ window.connect = async function() {
         });
 
         client.on('error', (data) => {
-                log(`Error: ${data.message}`, 'error');
+            log(`Error: ${data.message}`, 'error');
         });
 
         await client.connect();
     } catch (error) {
-            log(`Connection error: ${error.message}`, 'error');
+        log(`Connection error: ${error.message}`, 'error');
         updateStatus(false);
     }
-};
+}
 
 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();
         client = null;
@@ -297,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);
+            }
         }
     };
 
@@ -312,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');
@@ -348,7 +501,7 @@ window.sendChatMessage = function() {
     }
 
     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

@@ -0,0 +1,213 @@
+import { generateSecretKey, getPublicKey, finalizeEvent } from 'nostr-tools/pure';
+
+function bytesToHex(bytes) {
+  return Array.from(bytes)
+    .map((b) => b.toString(16).padStart(2, '0'))
+    .join('');
+}
+
+function isHex64(s) {
+  return typeof s === 'string' && /^[0-9a-fA-F]{64}$/.test(s);
+}
+
+/**
+ * Minimal Nostr relay client using raw WebSocket protocol.
+ * - Publishes kind:1 events tagged with ['t', room] and ['room', room]
+ * - Subscribes to kind:1 events filtered by #t
+ */
+export function createNostrClient({ relayUrl, room, onPayload, onState } = {}) {
+  if (!relayUrl) throw new Error('relayUrl is required');
+  if (!room) throw new Error('room is required');
+
+  const state = {
+    relayUrl,
+    room,
+    ws: null,
+    subId: `sub-${room}-${Math.random().toString(36).slice(2, 8)}`,
+    secretKeyHex: null,
+    pubkey: null,
+    seen: new Set(),
+  };
+
+  function ensureKeys() {
+    if (state.pubkey && state.secretKeyHex) return;
+
+    let stored = localStorage.getItem('nostr-secret-key');
+    // If stored value looks like an array string from prior buggy storage, clear it
+    if (stored && stored.includes(',')) {
+      localStorage.removeItem('nostr-secret-key');
+      stored = null;
+    }
+
+    if (!isHex64(stored)) {
+      const secretBytes = generateSecretKey();
+      state.secretKeyHex = bytesToHex(secretBytes);
+      localStorage.setItem('nostr-secret-key', state.secretKeyHex);
+    } else {
+      state.secretKeyHex = stored;
+    }
+
+    state.pubkey = getPublicKey(state.secretKeyHex);
+  }
+
+  function getPublicKeyHex() {
+    ensureKeys();
+    return state.pubkey;
+  }
+
+  function setState(next) {
+    try {
+      onState?.(next);
+    } catch {
+      // ignore
+    }
+  }
+
+  function parseIncoming(event) {
+    let msg;
+    try {
+      msg = JSON.parse(event.data);
+    } catch {
+      return;
+    }
+
+    if (!Array.isArray(msg) || msg.length < 2) return;
+    const [type] = msg;
+
+    if (type === 'EVENT') {
+      const nostrEvent = msg[2];
+      if (!nostrEvent || typeof nostrEvent !== 'object') return;
+      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');
+      if (!roomTag || roomTag[1] !== state.room) return;
+
+      // Content is JSON
+      let payload;
+      try {
+        payload = JSON.parse(nostrEvent.content);
+      } catch {
+        return;
+      }
+
+      try {
+        onPayload?.({
+          from: nostrEvent.pubkey,
+          payload,
+          eventId: nostrEvent.id,
+          createdAt: nostrEvent.created_at,
+        });
+      } catch {
+        // ignore
+      }
+    }
+  }
+
+  function sendRaw(frame) {
+    if (!state.ws || state.ws.readyState !== WebSocket.OPEN) {
+      throw new Error('Relay not connected');
+    }
+    state.ws.send(JSON.stringify(frame));
+  }
+
+  async function connect() {
+    ensureKeys();
+
+    setState('connecting');
+
+    const ws = new WebSocket(state.relayUrl);
+    state.ws = ws;
+
+    await new Promise((resolve, reject) => {
+      const onOpen = () => {
+        cleanup();
+        resolve();
+      };
+      const onError = () => {
+        cleanup();
+        reject(new Error('Failed to connect to relay'));
+      };
+      const cleanup = () => {
+        ws.removeEventListener('open', onOpen);
+        ws.removeEventListener('error', onError);
+      };
+      ws.addEventListener('open', onOpen);
+      ws.addEventListener('error', onError);
+    });
+
+    ws.addEventListener('message', parseIncoming);
+    ws.addEventListener('close', () => setState('disconnected'));
+
+    // Subscribe to this room (topic-tag filtered)
+    const now = Math.floor(Date.now() / 1000);
+    const filter = {
+      kinds: [1],
+      '#t': [state.room],
+      since: now - 3600,
+      limit: 200,
+    };
+
+    sendRaw(['REQ', state.subId, filter]);
+
+    // Announce presence
+    await send({ type: 'hello' });
+
+    setState('connected');
+  }
+
+  async function send(payload) {
+    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({
+        ...payload,
+        from: state.pubkey,
+        room: state.room,
+        timestamp: Date.now(),
+      }),
+      pubkey: state.pubkey,
+    };
+
+    const signed = finalizeEvent(eventTemplate, state.secretKeyHex);
+    sendRaw(['EVENT', signed]);
+  }
+
+  async function disconnect() {
+    const ws = state.ws;
+    state.ws = null;
+
+    try {
+      if (ws && ws.readyState === WebSocket.OPEN) {
+        try {
+          ws.send(JSON.stringify(['CLOSE', state.subId]));
+        } catch {
+          // ignore
+        }
+        ws.close();
+      }
+    } finally {
+      setState('disconnected');
+    }
+  }
+
+  return {
+    connect,
+    disconnect,
+    send,
+    getPublicKey: getPublicKeyHex,
+  };
+}

package/src/nostr/useNostr.js

@@ -0,0 +1,6 @@
+export function useNostr() {
+  throw new Error(
+    'useNostr() (Vue composable) is not wired into this demo. ' +
+      'Use createNostrClient() from src/nostr/nostrClient.js instead.'
+  );
+}

package/src/nostr/useWebRTC.js

@@ -0,0 +1,6 @@
+export function useWebRTC() {
+  throw new Error(
+    'useWebRTC() (Vue composable) is not wired into this demo. ' +
+      'The demo page uses src/main.js and (optionally) src/nostr/nostrClient.js.'
+  );
+}

package/src/services/nostrService.js

@@ -0,0 +1,129 @@
+import { subscribe } from 'nostr-tools/relay';
+import { SimplePool } from 'nostr-tools/pool';
+
+// List of public Nostr relays
+const DEFAULT_RELAYS = [
+  'wss://relay.damus.io',
+  'wss://relay.nostr.band',
+  'wss://nostr.wine',
+  'wss://relay.current.fyi'
+];
+
+let pool = new SimplePool();
+let relayConnections = new Map();
+let subscriptions = new Map();
+
+/**
+ * Add or connect to relays
+ */
+export async function addRelays(relayUrls = DEFAULT_RELAYS) {
+  for (const url of relayUrls) {
+    if (!relayConnections.has(url)) {
+      try {
+        await pool.ensureRelay(url);
+        relayConnections.set(url, true);
+        console.log(`Connected to relay: ${url}`);
+      } catch (error) {
+        console.error(`Failed to connect to relay ${url}:`, error);
+      }
+    }
+  }
+}
+
+/**
+ * Ensure relay connection is established
+ */
+export async function ensureRelayConnection(relayUrl = DEFAULT_RELAYS[0]) {
+  if (!relayConnections.has(relayUrl)) {
+    await addRelays([relayUrl]);
+  }
+  return relayConnections.get(relayUrl);
+}
+
+/**
+ * Crawl available relays
+ */
+export async function crawlRelays() {
+  return DEFAULT_RELAYS;
+}
+
+/**
+ * Ensure connections to multiple relays
+ */
+export async function ensureConnections(relayUrls = DEFAULT_RELAYS) {
+  await addRelays(relayUrls);
+}
+
+/**
+ * Publish an event to all connected relays
+ */
+export async function publishEvent(event) {
+  const relayUrls = Array.from(relayConnections.keys());
+  if (relayUrls.length === 0) {
+    await addRelays();
+  }
+  
+  try {
+    const publishPromises = Array.from(relayConnections.keys()).map(url => 
+      pool.publish(url, event).catch(err => {
+        console.error(`Failed to publish to ${url}:`, err);
+      })
+    );
+    await Promise.all(publishPromises);
+    console.log('Event published to all relays');
+  } catch (error) {
+    console.error('Error publishing event:', error);
+  }
+}
+
+/**
+ * Subscribe to events with a filter
+ */
+export async function subscribeToEvents(filter, onEvent, subscriptionId = 'default') {
+  if (relayConnections.size === 0) {
+    await addRelays();
+  }
+
+  try {
+    const relayUrls = Array.from(relayConnections.keys());
+    
+    const subscription = pool.subscribeMany(relayUrls, [filter], {
+      onevent: (event) => onEvent(event),
+      onclose: () => console.log(`Subscription ${subscriptionId} closed`),
+      oneose: () => console.log(`Subscription ${subscriptionId} received all events`)
+    });
+
+    subscriptions.set(subscriptionId, subscription);
+    console.log(`Subscribed with filter:`, filter);
+    return subscriptionId;
+  } catch (error) {
+    console.error('Error subscribing to events:', error);
+  }
+}
+
+/**
+ * Unsubscribe from events
+ */
+export async function unsubscribeFromEvents(subscriptionId = 'default') {
+  const subscription = subscriptions.get(subscriptionId);
+  if (subscription) {
+    subscription.close();
+    subscriptions.delete(subscriptionId);
+    console.log(`Unsubscribed: ${subscriptionId}`);
+  }
+}
+
+/**
+ * Close all relay connections
+ */
+export async function closeAllConnections() {
+  subscriptions.forEach(sub => sub.close());
+  subscriptions.clear();
+  
+  relayConnections.forEach((_, url) => {
+    pool.close(url);
+  });
+  relayConnections.clear();
+  
+  console.log('Closed all relay connections');
+}

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"