uniwrtc 1.4.0 → 1.5.0

package/CLOUDFLARE_DEPLOYMENT.md

@@ -1,8 +1,8 @@
 # UniWRTC Cloudflare Deployment Guide
 
-## Deploy Without Durable Objects (Cloudflare Pages)
+## Deploy (Cloudflare Pages)
 
-If you only want to host the demo UI (static assets) and do NOT want Durable Objects, deploy the Vite build to Cloudflare Pages.
+This repo’s current demo works client-side (Nostr), so you can deploy just the static site to Cloudflare Pages.
 
 ### Prerequisites
 
@@ -14,12 +14,12 @@ If you only want to host the demo UI (static assets) and do NOT want Durable Obj
 
 ```bash
 npm install
-npm run deploy:cf:no-do
+npm run deploy:cf:pages
 ```
 
 Notes:
 - This deploys the `dist/` folder (static hosting).
-- No server routes are deployed; Durable Objects are not used.
+- No server routes are deployed.
 
 ## Custom Domain (signal.peer.ooo)
 

package/QUICKSTART_CLOUDFLARE.md

@@ -1,6 +1,6 @@
 # Quick Start - Deploy to Cloudflare
 
-## Option A (No Durable Objects): Cloudflare Pages (static)
+## Cloudflare Pages (static)
 
 This repo’s current demo works client-side (Nostr), so you can deploy just the static site to Cloudflare Pages.
 
@@ -12,28 +12,11 @@ This repo’s current demo works client-side (Nostr), so you can deploy just the
 ### Deploy
 ```bash
 npm install
-npm run deploy:cf:no-do
+npm run deploy:cf:pages
 ```
 
 Wrangler will prompt you to pick/create a Pages project the first time.
 
-## Prerequisites
-- Cloudflare account (free tier works)
-- Node.js installed
-
-## Deploy
-
-### macOS / Linux
-```bash
-chmod +x deploy-cloudflare.sh
-./deploy-cloudflare.sh
-```
-
-### Windows
-```bash
-deploy-cloudflare.bat
-```
-
 ## What this does
 1. ✅ Builds the Vite site into `dist/`
 2. ✅ Deploys `dist/` to Cloudflare Pages
@@ -42,4 +25,4 @@ deploy-cloudflare.bat
 
 Then set your custom domain in Cloudflare Pages (and point `signal` to `<project>.pages.dev`).
 
-That's it! Your demo is now on Cloudflare Pages (no Durable Objects).
+That's it! Your demo is now on Cloudflare Pages.

package/README.md

@@ -1,53 +1,88 @@
 # UniWRTC
 
-A universal WebRTC signaling service that provides a simple and flexible **HTTP polling** signaling server for WebRTC applications.
+A WebRTC demo + signaling utilities.
+
+The default demo flow uses **Nostr relays for WebRTC signaling** (offer/answer/ICE + presence) and a **WebRTC data channel for app data**.
+
+This repo also includes an optional **legacy HTTP polling signaling server** (useful for local development), but the live demo is now fully static/serverless.
 
 Available on npm: https://www.npmjs.com/package/uniwrtc
 
 ## Features
 
-- 🚀 **Simple signaling** - HTTP polling (works locally and on Cloudflare Durable Objects)
-- 🏠 **Session-based architecture** - Support for multiple sessions with isolated peer groups
-- 🔌 **Flexible client library** - Ready-to-use JavaScript client for browser and Node.js
-- 📡 **Real-time messaging** - Efficient message routing between peers
-- 🔄 **Auto-reconnection** - Built-in reconnection logic for reliable connections
-- 📊 **Health monitoring** - HTTP health check endpoint for monitoring
-- 🎯 **Minimal dependencies** - Lightweight implementation with minimal runtime deps
+- 🤝 **Nostr signaling (demo default)** - WebRTC offer/answer/ICE + presence over Nostr relays
+- 📦 **WebRTC for data** - App/chat data rides the data channel (not the relay)
+- 🏠 **Session-based rooms** - Multiple sessions with isolated peer groups
+- 🔌 **Optional legacy server** - HTTP polling signaling server (local/dev)
+- 🧊 **STUN-only** - No TURN in the default demo
 
 ## Quick Start
 
-## Using with `simple-peer` (SDP text-only)
+## Using with `simple-peer` (Nostr signaling)
 
-This repo's signaling format sends **SDP as plain text** for offers/answers.
-`simple-peer` uses `{ type, sdp }` objects, so use the adapter in [simple-peer-adapter.js](simple-peer-adapter.js).
+The repo’s default demo uses Nostr relays for signaling. Here’s a minimal `simple-peer` example that uses the built-in Nostr client for signaling messages.
 
-Example (browser):
+Example (browser, two tabs):
 
 ```js
 import Peer from 'simple-peer';
-import UniWRTCClient from './client-browser.js';
-import { sendSimplePeerSignal, attachUniWRTCToSimplePeer, chooseDeterministicInitiator } from './simple-peer-adapter.js';
+import { createNostrClient } from './src/nostr/nostrClient.js';
+
+const relayUrl = 'wss://relay.damus.io';
+const room = 'my-room';
+
+const nostr = createNostrClient({
+  relayUrl,
+  room,
+  onPayload: ({ from, payload }) => {
+    // Only accept signals intended for us
+    if (payload?.type !== 'sp-signal') return;
+    if (payload?.to !== myId) return;
+    if (targetId && from !== targetId) return;
+
+    try {
+      peer.signal(payload.signal);
+    } catch (e) {
+      console.warn('Failed to apply signal:', e);
+    }
+  },
+});
 
-const client = new UniWRTCClient('https://your-signal-server', { roomId: 'my-room' });
-await client.connect();
+await nostr.connect();
+
+const myId = nostr.getPublicKey();
+console.log('My Peer ID:', myId);
 
-// Join a session (peers in the same session can connect)
-await client.joinSession('my-room');
+// Set this in each tab (copy/paste from the other tab)
+const targetId = prompt('Paste the other Peer ID:')?.trim();
+if (!targetId) throw new Error('Missing targetId');
+
+// Deterministic initiator prevents offer collisions
+const initiator = myId.localeCompare(targetId) < 0;
 
-// Ensure exactly ONE side initiates for a given pair
-const initiator = chooseDeterministicInitiator(client.clientId, targetId);
 const peer = new Peer({ initiator, trickle: true });
-const cleanup = attachUniWRTCToSimplePeer(client, peer);
 
-peer.on('signal', (signal) => {
-  // targetId must be the other peer's UniWRTC client id
-  sendSimplePeerSignal(client, signal, targetId);
+peer.on('signal', async (signal) => {
+  // Send signaling via Nostr; WebRTC data stays P2P.
+  await nostr.send({
+    type: 'sp-signal',
+    to: targetId,
+    signal,
+  });
+});
+
+peer.on('connect', () => {
+  console.log('WebRTC connected');
+  peer.send('hello over datachannel');
 });
 
-// When done:
-// cleanup();
+peer.on('data', (data) => {
+  console.log('Got data:', data.toString());
+});
 ```
 
+Note: Nostr relays are generally public. Don’t send secrets in signaling payloads.
+
 ### Installation
 
 #### From npm (recommended)
@@ -85,7 +120,11 @@ PORT=8080
 
 ### Try the Demo
 
-The interactive demo is available live at **https://signal.peer.ooo/** (Cloudflare Workers deployment) or run locally:
+The interactive demo is available live at **https://signal.peer.ooo/** (Cloudflare Pages static site) or run locally.
+
+The demo uses:
+- Nostr relays for signaling
+- WebRTC data channels for data/chat
 
 **Using the deployed demo (recommended):**
 1. Open https://signal.peer.ooo/ in two browser tabs
@@ -95,15 +134,15 @@ The interactive demo is available live at **https://signal.peer.ooo/** (Cloudfla
 5. Open the P2P chat and send messages between tabs
 
 **Or run locally:**
-1. Start the server: `npm start` (signaling at `http://localhost:8080`)
-2. Start the Vite dev server: `npm run dev` (demo at `http://localhost:5173/`)
+1. Install deps: `npm install`
+2. Start Vite: `npm run dev` (demo at `http://localhost:5173/`)
 3. Open the demo in two browser tabs
 4. Enter the same session ID in both, then Connect
 5. Chat P2P once data channels open
 
 ## Usage
 
-### Server API
+### Legacy HTTP Signaling Server API (optional)
 
 The signaling server supports:
 - HTTP polling signaling (no WebSockets)
@@ -342,10 +381,8 @@ client.on('ice-candidate', async (data) => {
 await client.connect();
 client.joinSession('my-video-session');
 
-// Or use Cloudflare Durable Objects deployment (HTTP polling; no WebSockets)
-const cfClient = new UniWRTCClient('https://signal.peer.ooo');
-await cfClient.connect();
-cfClient.joinSession('my-session');
+// Note: https://signal.peer.ooo is the static demo site (Nostr signaling),
+// not an HTTP polling signaling server endpoint.
 ```
 
 ## API Reference
@@ -407,25 +444,33 @@ Response:
 
 ## Architecture
 
+### Nostr Signaling (Demo Default)
+
+- Peers publish signaling messages (offer/answer/ICE/presence) to a Nostr relay.
+- Messages are scoped to a room/session and targeted to a specific peer session.
+- Once the WebRTC data channel opens, application data/chat is sent P2P.
+- This is designed to work without running your own signaling server.
+
 ### Session-based Peer Isolation
 
 - **Sessions**: Each session is identified by a unique string ID (also called "room" in the UI)
 - **Peer routing**: Each peer gets a unique client ID; signaling messages are routed only to intended targets
 - **Session isolation**: Peers in different sessions cannot see or communicate with each other
-- **Cloudflare Durable Objects**: Uses DO state to isolate sessions; routing by `?room=` query param per session
 - Clients join with `joinSession(sessionId)` and receive notifications when other peers join the same session
 
 ### Message Flow
 
-1. Client connects via HTTPS (Cloudflare DO HTTP polling)
-2. Server/Durable Object assigns a unique client ID
+This section applies to the legacy HTTP polling server:
+
+1. Client connects via HTTP(S)
+2. Server assigns a unique client ID
 3. Client sends join message with session ID
 4. Server broadcasts `peer-joined` to other peers in the same session only
 5. Peers exchange WebRTC offers/answers/ICE candidates via the server
 6. Server routes signaling messages to specific peers by target ID (unicast, not broadcast)
 
 Notes:
-- Cloudflare signaling uses JSON over HTTPS requests to `/api` (polling).
+- Server signaling uses JSON over HTTPS requests to `/api` (polling).
 - Offers/answers are transmitted as SDP strings (text-only) in the `offer`/`answer` fields.
 - ICE candidates are transmitted as a compact text string: `candidate|sdpMid|sdpMLineIndex`.
 

package/deploy-cloudflare.bat

@@ -1,10 +1,10 @@
 @echo off
-REM UniWRTC Cloudflare Automated Setup Script (Windows, NO Durable Objects)
+REM UniWRTC Cloudflare Automated Setup Script (Windows)
 REM Deploys the static demo to Cloudflare Pages.
 
 setlocal enabledelayedexpansion
 
-echo 🚀 UniWRTC Cloudflare Setup (Pages / no Durable Objects)
+echo 🚀 UniWRTC Cloudflare Setup (Cloudflare Pages)
 echo ============================
 echo.
 

package/deploy-cloudflare.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-# UniWRTC Cloudflare Automated Setup Script (NO Durable Objects)
+# UniWRTC Cloudflare Automated Setup Script
 # Deploys the static demo to Cloudflare Pages.
 
 set -e
 
-echo "🚀 UniWRTC Cloudflare Setup (Pages / no Durable Objects)"
+echo "🚀 UniWRTC Cloudflare Setup (Cloudflare Pages)"
 echo "============================"
 echo ""
 

package/package-cf.json

@@ -1,7 +1,7 @@
 {
   "name": "uniwrtc-cloudflare",
   "version": "1.0.0",
-  "description": "UniWRTC Cloudflare Workers deployment",
+  "description": "UniWRTC Cloudflare deployment (legacy worker config)",
   "type": "module",
   "scripts": {
     "dev": "wrangler dev",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniwrtc",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "A universal WebRTC signaling service",
   "main": "server.js",
   "type": "module",
@@ -10,9 +10,8 @@
     "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"
+    "test": "playwright test"
   },
   "keywords": [
     "webrtc",

package/playwright.config.js

@@ -3,17 +3,24 @@ import { defineConfig, devices } from '@playwright/test';
 export default defineConfig({
   testDir: './tests',
   // Run tests IN PARALLEL - all browsers at the same time
-  fullyParallel: true,
+  fullyParallel: false,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
-  workers: 4, // Multiple workers - run browsers in parallel
+  workers: process.env.CI ? 2 : 1,
   reporter: 'html',
   use: {
-    baseURL: 'https://signal.peer.ooo',
+    baseURL: 'http://127.0.0.1:5173',
     trace: 'on-first-retry',
     screenshot: 'only-on-failure',
   },
 
+  webServer: {
+    command: 'npm run dev -- --host 127.0.0.1 --port 5173',
+    url: 'http://127.0.0.1:5173',
+    reuseExistingServer: !process.env.CI,
+    timeout: 120_000,
+  },
+
   projects: [
     {
       name: 'chromium',

package/server.js

@@ -10,7 +10,7 @@ const __dirname = path.dirname(__filename);
 
 const CLIENT_TTL_MS = 60_000;
 
-// Top-level rooms are keyed by ?room= (mirrors Cloudflare DO routing)
+// Top-level rooms are keyed by ?room=
 // Each room contains multiple sessions keyed by sessionId.
 const rooms = new Map();
 

package/src/client-cloudflare.js

@@ -111,7 +111,7 @@ class UniWRTCClient {
 
   joinSession(sessionId) {
     this.sessionId = sessionId;
-    // Durable Objects handle session joining automatically via room parameter
+    // Session is provided via the room query param on connection
   }
 
   leaveSession() {
@@ -153,8 +153,7 @@ class UniWRTCClient {
   }
 
   listRooms() {
-    // Durable Objects don't expose room listing
-    console.log('Room listing not available with Durable Objects');
+    console.log('Room listing is not available for this transport');
   }
 
   on(event, handler) {

package/src/index.js

@@ -1,7 +1,6 @@
 /**
  * UniWRTC Cloudflare Worker
- * WebRTC Signaling Service using Durable Objects
- * Serves static assets and HTTP polling signaling
+ * Legacy HTTP polling signaling worker
  */
 
 import { Room } from './room.js';

package/src/main.js

@@ -74,7 +74,7 @@ document.getElementById('app').innerHTML = `
             <div class="connection-controls">
                 <div>
                     <label style="display: block; margin-bottom: 5px; color: #64748b; font-size: 13px;">Relay URL(s)</label>
-                    <input type="text" id="relayUrl" placeholder="wss://relay.damus.io" value="${DEFAULT_RELAYS.join(', ')}" style="width: 100%; padding: 8px; border: 1px solid #e2e8f0; border-radius: 4px; font-family: monospace; font-size: 12px;">
+                    <input type="text" id="relayUrl" data-testid="relayUrl" placeholder="wss://relay.damus.io" value="${DEFAULT_RELAYS.join(', ')}" 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>
@@ -155,12 +155,20 @@ roomInput.addEventListener('input', () => {
     document.getElementById('sessionId').textContent = roomInput.value.trim() || 'Not joined';
 });
 
-// STUN-only ICE servers (no TURN)
-const ICE_SERVERS = [
-    { urls: ['stun:stun.l.google.com:19302', 'stun:stun1.l.google.com:19302'] },
-    { urls: ['stun:stun2.l.google.com:19302', 'stun:stun3.l.google.com:19302'] },
-    { urls: ['stun:stun.cloudflare.com:3478'] },
-];
+// ICE servers: STUN-only by default (no TURN). For deterministic local testing,
+// support host-only ICE via URL flag: ?ice=host (or ?ice=none)
+const iceMode = (params.get('ice') || '').toLowerCase();
+const ICE_SERVERS = iceMode === 'host' || iceMode === 'none'
+    ? []
+    : [
+        { urls: ['stun:stun.l.google.com:19302', 'stun:stun1.l.google.com:19302'] },
+        { urls: ['stun:stun2.l.google.com:19302', 'stun:stun3.l.google.com:19302'] },
+        { urls: ['stun:stun.cloudflare.com:3478'] },
+    ];
+
+if (ICE_SERVERS.length === 0) {
+    log('Using host-only ICE candidates (no STUN)', 'info');
+}
 
 function log(message, type = 'info') {
     const logContainer = document.getElementById('logContainer');
@@ -170,11 +178,11 @@ function log(message, type = 'info') {
         entry.textContent = `[${timestamp}] ${message}`;
     
     // Add testid for specific log messages
-    if (message.includes('Connected with client ID')) {
+    if (message.includes('Connected with client ID') || message.includes('Nostr connection established')) {
         entry.setAttribute('data-testid', 'log-connected');
-    } else if (message.includes('Joined session')) {
+    } else if (message.includes('Joined session') || message.includes('Joined Nostr room')) {
         entry.setAttribute('data-testid', 'log-joined');
-    } else if (message.includes('Peer joined')) {
+    } else if (message.includes('Peer joined') || message.includes('Peer seen')) {
         entry.setAttribute('data-testid', 'log-peer-joined');
     } else if (message.includes('Data channel open')) {
         entry.setAttribute('data-testid', 'log-data-channel');
@@ -199,8 +207,7 @@ function updateStatus(connected) {
         badge.className = 'status-badge status-disconnected';
         connectBtn.disabled = false;
         disconnectBtn.disabled = true;
-        document.getElementById('clientId').textContent = 'Not connected';
-        document.getElementById('sessionId').textContent = 'Not joined';
+        // Keep client/session labels stable; identity and room are local state.
     }
 }
 
@@ -366,6 +373,11 @@ async function connectNostr() {
     const relayUrlRaw = document.getElementById('relayUrl').value.trim();
     const roomIdInput = document.getElementById('roomId');
     const roomId = roomIdInput.value.trim();
+
+    if (!relayUrlRaw) {
+        log('Please enter a relay URL', 'error');
+        return;
+    }
     
     const relayCandidatesRaw = relayUrlRaw.toLowerCase() === 'auto'
         ? DEFAULT_RELAYS
@@ -380,11 +392,6 @@ async function connectNostr() {
 
     const relayCandidates = relayCandidatesRaw.length ? relayCandidatesRaw : DEFAULT_RELAYS;
 
-    if (relayCandidates.length === 0) {
-        log('Please enter a relay URL', 'error');
-        return;
-    }
-
     const effectiveRoom = roomId || `room-${Math.random().toString(36).substring(2, 10)}`;
     if (!roomId) roomIdInput.value = effectiveRoom;
 
@@ -731,7 +738,7 @@ async function connectWebRTC() {
         let finalUrl = serverUrl;
         if (serverUrl.includes('signal.peer.ooo')) {
             finalUrl = `${serverUrl.replace(/\/$/, '')}/ws?room=${roomId}`;
-            log(`Using Cloudflare Durable Objects with session: ${roomId}`, 'info');
+            log(`Using hosted endpoint with session: ${roomId}`, 'info');
         }
         
         client = new UniWRTCClient(finalUrl, { autoReconnect: false });

package/src/room.js

@@ -1,5 +1,5 @@
 /**
- * Durable Object for WebRTC signaling (HTTP polling only)
+ * Legacy room state for HTTP polling signaling (no WebSockets)
  */
 export class Room {
   constructor(state, env) {

package/tests/e2e.spec.js

@@ -1,38 +1,30 @@
 import { test, expect } from '@playwright/test';
 
-function failOnWebSocket(page) {
-  page.on('websocket', (ws) => {
-    throw new Error(`WebSockets are disabled, but a WebSocket was opened: ${ws.url()}`);
-  });
-}
-
 test.describe('UniWRTC Demo - Full Integration Tests', () => {
-  const BASE_URL = 'https://signal.peer.ooo';
   const ROOM_ID = 'test';
   
   test.describe('Connection and Session Management', () => {
     test('should load demo page and display UI', async ({ page }) => {
-      failOnWebSocket(page);
-      await page.goto(BASE_URL);
+      await page.goto('/');
       
       // Check main elements exist
       await expect(page.locator('h1')).toContainText('UniWRTC Demo');
       await expect(page.locator('text=Connection')).toBeVisible();
-      await expect(page.getByTestId('serverUrl')).toHaveValue('https://signal.peer.ooo');
+      await expect(page.getByTestId('relayUrl')).toBeVisible();
       await expect(page.getByTestId('roomId')).toHaveValue('demo-room');
       await expect(page.getByTestId('connectBtn')).toBeVisible();
     });
 
-    test('should connect to signaling server and join session', async ({ page }) => {
-      failOnWebSocket(page);
-      await page.goto(BASE_URL);
+    test('should connect to relay and join room', async ({ page }) => {
+      test.setTimeout(60_000);
+      await page.goto('/');
       
       // Click connect
       await page.getByTestId('connectBtn').click();
       
       // Wait for connection success log
-      await expect(page.getByTestId('log-connected')).toBeVisible({ timeout: 20000 });
-      await expect(page.getByTestId('log-joined')).toBeVisible({ timeout: 20000 });
+      await expect(page.getByTestId('log-connected')).toBeVisible({ timeout: 30000 });
+      await expect(page.getByTestId('log-joined')).toBeVisible({ timeout: 30000 });
       
       // Check status changed to connected
       const badge = page.getByTestId('statusBadge');
@@ -46,12 +38,12 @@ test.describe('UniWRTC Demo - Full Integration Tests', () => {
     });
 
     test('should handle disconnect', async ({ page }) => {
-      failOnWebSocket(page);
-      await page.goto(BASE_URL);
+      test.setTimeout(60_000);
+      await page.goto('/');
       
       // Connect first
       await page.getByTestId('connectBtn').click();
-      await expect(page.getByTestId('log-connected')).toBeVisible({ timeout: 20000 });
+      await expect(page.getByTestId('log-connected')).toBeVisible({ timeout: 30000 });
       
       // Now disconnect
       await page.getByTestId('disconnectBtn').click();
@@ -59,7 +51,6 @@ test.describe('UniWRTC Demo - Full Integration Tests', () => {
       // Check status changed back to disconnected
       const badge = page.getByTestId('statusBadge');
       await expect(badge).toContainText('Disconnected');
-      await expect(page.getByTestId('clientId')).toContainText('Not connected');
     });
   });
 
@@ -68,21 +59,18 @@ test.describe('UniWRTC Demo - Full Integration Tests', () => {
       // Open three browser contexts (simulating three users)
       const context1 = await browser.newContext();
       const page1 = await context1.newPage();
-      failOnWebSocket(page1);
       
       const context2 = await browser.newContext();
       const page2 = await context2.newPage();
-      failOnWebSocket(page2);
       
       const context3 = await browser.newContext();
       const page3 = await context3.newPage();
-      failOnWebSocket(page3);
       
       try {
         // Connect all three peers to same room
-        await page1.goto(BASE_URL);
-        await page2.goto(BASE_URL);
-        await page3.goto(BASE_URL);
+        await page1.goto('/?ice=host');
+        await page2.goto('/?ice=host');
+        await page3.goto('/?ice=host');
         
         // Use shared room ID for all three peers
         await page1.getByTestId('roomId').fill(ROOM_ID);
@@ -127,21 +115,18 @@ test.describe('UniWRTC Demo - Full Integration Tests', () => {
       test.setTimeout(90_000);
       const context1 = await browser.newContext();
       const page1 = await context1.newPage();
-      failOnWebSocket(page1);
       
       const context2 = await browser.newContext();
       const page2 = await context2.newPage();
-      failOnWebSocket(page2);
       
       const context3 = await browser.newContext();
       const page3 = await context3.newPage();
-      failOnWebSocket(page3);
       
       try {
         // Connect all three peers
-        await page1.goto(BASE_URL);
-        await page2.goto(BASE_URL);
-        await page3.goto(BASE_URL);
+        await page1.goto('/?ice=host');
+        await page2.goto('/?ice=host');
+        await page3.goto('/?ice=host');
         
         await page1.getByTestId('roomId').fill(ROOM_ID);
         await page2.getByTestId('roomId').fill(ROOM_ID);
@@ -172,9 +157,9 @@ test.describe('UniWRTC Demo - Full Integration Tests', () => {
         }
         
         // Wait for data channels to open - wait for at least one data channel log on each peer with extended timeout
-        await expect(page1.getByTestId('log-data-channel').first()).toBeVisible({ timeout: 40000 });
-        await expect(page2.getByTestId('log-data-channel').first()).toBeVisible({ timeout: 40000 });
-        await expect(page3.getByTestId('log-data-channel').first()).toBeVisible({ timeout: 40000 });
+        await expect(page1.getByTestId('log-data-channel').first()).toBeVisible({ timeout: 60000 });
+        await expect(page2.getByTestId('log-data-channel').first()).toBeVisible({ timeout: 60000 });
+        await expect(page3.getByTestId('log-data-channel').first()).toBeVisible({ timeout: 60000 });
         
         // Wait longer to ensure all data channels are fully established
         await page1.waitForTimeout(3000);
@@ -199,21 +184,18 @@ test.describe('UniWRTC Demo - Full Integration Tests', () => {
       test.setTimeout(90_000);
       const context1 = await browser.newContext();
       const page1 = await context1.newPage();
-      failOnWebSocket(page1);
       
       const context2 = await browser.newContext();
       const page2 = await context2.newPage();
-      failOnWebSocket(page2);
       
       const context3 = await browser.newContext();
       const page3 = await context3.newPage();
-      failOnWebSocket(page3);
       
       try {
         // Connect all three peers
-        await page1.goto(BASE_URL);
-        await page2.goto(BASE_URL);
-        await page3.goto(BASE_URL);
+        await page1.goto('/?ice=host');
+        await page2.goto('/?ice=host');
+        await page3.goto('/?ice=host');
         
         await page1.getByTestId('roomId').fill(ROOM_ID);
         await page2.getByTestId('roomId').fill(ROOM_ID);
@@ -229,9 +211,9 @@ test.describe('UniWRTC Demo - Full Integration Tests', () => {
         await expect(page3.getByTestId('log-connected')).toBeVisible({ timeout: 10000 });
         
         // Wait for data channels to open on all peers first with extended timeout
-        await expect(page1.getByTestId('log-data-channel').first()).toBeVisible({ timeout: 25000 });
-        await expect(page2.getByTestId('log-data-channel').first()).toBeVisible({ timeout: 25000 });
-        await expect(page3.getByTestId('log-data-channel').first()).toBeVisible({ timeout: 25000 });
+        await expect(page1.getByTestId('log-data-channel').first()).toBeVisible({ timeout: 60000 });
+        await expect(page2.getByTestId('log-data-channel').first()).toBeVisible({ timeout: 60000 });
+        await expect(page3.getByTestId('log-data-channel').first()).toBeVisible({ timeout: 60000 });
 
         // Give the browser a moment to fully wire up data channel handlers.
         await page1.waitForTimeout(3000);
@@ -287,16 +269,14 @@ test.describe('UniWRTC Demo - Full Integration Tests', () => {
     test('should not connect peers from different sessions', async ({ browser }) => {
       const context1 = await browser.newContext();
       const page1 = await context1.newPage();
-      failOnWebSocket(page1);
       
       const context2 = await browser.newContext();
       const page2 = await context2.newPage();
-      failOnWebSocket(page2);
       
       try {
         // Connect to different rooms
-        await page1.goto(BASE_URL);
-        await page2.goto(BASE_URL);
+        await page1.goto('/');
+        await page2.goto('/');
         
         // Use different unique room IDs to ensure isolation
         const roomA = `iso-a-${Date.now()}-${Math.random().toString(36).substring(2, 9)}`;
@@ -328,24 +308,21 @@ test.describe('UniWRTC Demo - Full Integration Tests', () => {
   });
 
   test.describe('Error Handling', () => {
-    test('should show error when server URL is empty', async ({ page }) => {
-      failOnWebSocket(page);
-      await page.goto(BASE_URL);
-      
-      await page.getByTestId('serverUrl').fill('');
+    test('should show error when relay URL is empty', async ({ page }) => {
+      await page.goto('/');
+      await page.getByTestId('relayUrl').fill('');
       await page.getByTestId('connectBtn').click();
-      
-      await expect(page.locator('text=Please enter a server URL')).toBeVisible({ timeout: 5000 });
+      await expect(page.locator('text=Please enter a relay URL')).toBeVisible({ timeout: 5000 });
     });
 
-    test('should show error when room ID is empty', async ({ page }) => {
-      failOnWebSocket(page);
-      await page.goto(BASE_URL);
-      
+    test('should auto-fill a room when room ID is empty', async ({ page }) => {
+      test.setTimeout(60_000);
+      await page.goto('/');
       await page.getByTestId('roomId').fill('');
       await page.getByTestId('connectBtn').click();
-      
-      await expect(page.locator('text=Please enter a room ID')).toBeVisible({ timeout: 5000 });
+      await expect(page.getByTestId('log-connected')).toBeVisible({ timeout: 30000 });
+      await expect(page.getByTestId('roomId')).not.toHaveValue('');
+      await expect(page.getByTestId('sessionId')).not.toContainText('Not joined');
     });
   });
 });