uniwrtc 1.0.2 → 1.0.3

package/README.md

@@ -2,10 +2,12 @@
 
 A universal WebRTC signaling service that provides a simple and flexible WebSocket-based signaling server for WebRTC applications.
 
+Available on npm: https://www.npmjs.com/package/uniwrtc
+
 ## Features
 
 - 🚀 **Simple WebSocket-based signaling** - Easy to integrate with any WebRTC application
-- 🏠 **Room-based architecture** - Support for multiple rooms with isolated peer groups
+- 🏠 **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
@@ -56,9 +58,9 @@ Open `demo.html` in your web browser to try the interactive demo:
 1. Start the server with `npm start` (local signaling at `ws://localhost:8080`), **or** use the deployed Workers endpoint `wss://signal.peer.ooo`.
 2. Open `demo.html` in your browser.
 3. Click "Connect" to connect to the signaling server.
-4. Enter a room ID and click "Join Room".
+4. Enter a session ID and click "Join Session".
 5. Open another browser window/tab with the same demo page.
-6. Join the same room to see peer connections in action and P2P data channels open.
+6. Join the same session to see peer connections in action and P2P data channels open.
 
 ## Usage
 
@@ -68,19 +70,19 @@ The signaling server accepts WebSocket connections and supports the following me
 
 #### Client → Server Messages
 
-**Join a room:**
+**Join a session:**
 ```json
 {
   "type": "join",
-  "roomId": "room-123"
+  "sessionId": "session-123"
 }
 ```
 
-**Leave a room:**
+**Leave a session:**
 ```json
 {
   "type": "leave",
-  "roomId": "room-123"
+  "sessionId": "session-123"
 }
 ```
 
@@ -90,7 +92,7 @@ The signaling server accepts WebSocket connections and supports the following me
   "type": "offer",
   "offer": { /* RTCSessionDescription */ },
   "targetId": "peer-client-id",
-  "roomId": "room-123"
+  "sessionId": "session-123"
 }
 ```
 
@@ -100,7 +102,7 @@ The signaling server accepts WebSocket connections and supports the following me
   "type": "answer",
   "answer": { /* RTCSessionDescription */ },
   "targetId": "peer-client-id",
-  "roomId": "room-123"
+  "sessionId": "session-123"
 }
 ```
 
@@ -110,7 +112,7 @@ The signaling server accepts WebSocket connections and supports the following me
   "type": "ice-candidate",
   "candidate": { /* RTCIceCandidate */ },
   "targetId": "peer-client-id",
-  "roomId": "room-123"
+  "sessionId": "session-123"
 }
 ```
 
@@ -132,11 +134,11 @@ The signaling server accepts WebSocket connections and supports the following me
 }
 ```
 
-**Room joined confirmation:**
+**Session joined confirmation:**
 ```json
 {
   "type": "joined",
-  "roomId": "room-123",
+  "sessionId": "session-123",
   "clientId": "abc123",
   "clients": ["xyz789", "def456"]
 }
@@ -146,8 +148,8 @@ The signaling server accepts WebSocket connections and supports the following me
 ```json
 {
   "type": "peer-joined",
-  "peerId": "new-peer-id",
-  "clientId": "new-peer-id"
+  "sessionId": "session-123",
+  "peerId": "new-peer-id"
 }
 ```
 
@@ -155,8 +157,8 @@ The signaling server accepts WebSocket connections and supports the following me
 ```json
 {
   "type": "peer-left",
-  "peerId": "departed-peer-id",
-  "clientId": "departed-peer-id"
+  "sessionId": "session-123",
+  "peerId": "departed-peer-id"
 }
 ```
 
@@ -166,9 +168,8 @@ Use directly from npm:
 ```javascript
 // ESM
 import { UniWRTCClient } from 'uniwrtc/client-browser.js';
-// or CommonJS
-const { UniWRTCClient } = require('uniwrtc/client-browser.js');
-// For Node.js signaling client use 'uniwrtc/client.js'
+// or CommonJS (Node)
+const { UniWRTCClient } = require('uniwrtc/client.js');
 ```
 
 The `client.js` library provides a convenient wrapper for the signaling protocol:
@@ -183,7 +184,7 @@ client.on('connected', (data) => {
 });
 
 client.on('joined', (data) => {
-  console.log('Joined room:', data.roomId);
+  console.log('Joined session:', data.sessionId);
   console.log('Existing peers:', data.clients);
 });
 
@@ -294,9 +295,9 @@ client.on('ice-candidate', async (data) => {
   }
 });
 
-// Connect and join room
+// Connect and join session
 await client.connect();
-client.joinRoom('my-video-room');
+client.joinSession('my-video-session');
 ```
 
 ## API Reference
@@ -318,8 +319,8 @@ new UniWRTCClient(serverUrl, options)
 
 - `connect()`: Connect to the signaling server (returns Promise)
 - `disconnect()`: Disconnect from the server
-- `joinRoom(roomId)`: Join a specific room
-- `leaveRoom()`: Leave the current room
+- `joinSession(sessionId)`: Join a specific session
+- `leaveSession()`: Leave the current session
 - `sendOffer(offer, targetId)`: Send a WebRTC offer
 - `sendAnswer(answer, targetId)`: Send a WebRTC answer
 - `sendIceCandidate(candidate, targetId)`: Send an ICE candidate
@@ -342,7 +343,7 @@ new UniWRTCClient(serverUrl, options)
 
 ## Health Check
 
-The server provides an HTTP health check endpoint:
+The server provides an HTTP health check endpoint for monitoring:
 
 ```bash
 curl http://localhost:8080/health
@@ -358,12 +359,12 @@ Response:
 
 ## Architecture
 
-### Room Management
+### Session Management
 
-- Each room is identified by a unique room ID (string)
-- Clients can join/leave rooms dynamically
-- Messages can be sent to specific peers or broadcast to all peers in a room
-- Empty rooms are automatically cleaned up
+- Each session is identified by a unique session ID (string)
+- Clients can join/leave sessions dynamically
+- Messages can be sent to specific peers or broadcast to all peers in a session
+- Empty sessions are automatically cleaned up
 
 ### Message Flow
 

package/client-browser.js

@@ -8,7 +8,7 @@ class UniWRTCClient {
     this.serverUrl = serverUrl;
     this.ws = null;
     this.clientId = null;
-    this.roomId = null;
+    this.sessionId = null;
     this.peers = new Map();
     this._connectedOnce = false;
     this.options = {
@@ -93,24 +93,26 @@ class UniWRTCClient {
     }
   }
 
-  joinRoom(roomId) {
-    // Prevent duplicate join calls for the same room
-    if (this.roomId === roomId) return;
-    this.roomId = roomId;
+  joinSession(sessionId) {
+    // Prevent duplicate join calls for the same session
+    if (this.sessionId === sessionId) return;
+    this.sessionId = sessionId;
+    
+    // Send join message
     this.send({
       type: 'join',
-      roomId: roomId,
+      sessionId: sessionId,
       peerId: this.clientId
     });
   }
 
-  leaveRoom() {
-    if (this.roomId) {
+  leaveSession() {
+    if (this.sessionId) {
       this.send({
         type: 'leave',
-        roomId: this.roomId
+        sessionId: this.sessionId
       });
-      this.roomId = null;
+      this.sessionId = null;
     }
   }
 
@@ -127,7 +129,7 @@ class UniWRTCClient {
       type: 'offer',
       offer: offer,
       targetId: targetId,
-      roomId: this.roomId
+      sessionId: this.sessionId
     });
   }
 
@@ -136,7 +138,7 @@ class UniWRTCClient {
       type: 'answer',
       answer: answer,
       targetId: targetId,
-      roomId: this.roomId
+      sessionId: this.sessionId
     });
   }
 
@@ -145,7 +147,7 @@ class UniWRTCClient {
       type: 'ice-candidate',
       candidate: candidate,
       targetId: targetId,
-      roomId: this.roomId
+      sessionId: this.sessionId
     });
   }
 
@@ -187,9 +189,9 @@ class UniWRTCClient {
         console.log('[UniWRTC] If this helps, consider donating ❤️ → https://coff.ee/draederg');
         break;
       case 'joined':
-        this.roomId = message.roomId;
+        this.sessionId = message.sessionId;
         this.emit('joined', {
-          roomId: message.roomId,
+          sessionId: message.sessionId,
           peerId: message.peerId,
           clientId: message.clientId,
           clients: message.clients
@@ -197,11 +199,13 @@ class UniWRTCClient {
         break;
       case 'peer-joined':
         this.emit('peer-joined', {
+          sessionId: message.sessionId,
           peerId: message.peerId
         });
         break;
       case 'peer-left':
         this.emit('peer-left', {
+          sessionId: message.sessionId,
           peerId: message.peerId
         });
         break;
@@ -237,7 +241,7 @@ class UniWRTCClient {
         this.emit('chat', {
           text: message.text,
           peerId: message.peerId,
-          roomId: message.roomId
+          sessionId: message.sessionId
         });
         break;
       default:

package/client.js

@@ -8,7 +8,7 @@ class UniWRTCClient {
     this.serverUrl = serverUrl;
     this.ws = null;
     this.clientId = null;
-    this.roomId = null;
+    this.sessionId = null;
     this.peers = new Map();
     this.options = {
       autoReconnect: true,
@@ -85,21 +85,21 @@ class UniWRTCClient {
     }
   }
 
-  joinRoom(roomId) {
-    this.roomId = roomId;
+  joinSession(sessionId) {
+    this.sessionId = sessionId;
     this.send({
       type: 'join',
-      roomId: roomId
+      sessionId: sessionId
     });
   }
 
-  leaveRoom() {
-    if (this.roomId) {
+  leaveSession() {
+    if (this.sessionId) {
       this.send({
         type: 'leave',
-        roomId: this.roomId
+        sessionId: this.sessionId
       });
-      this.roomId = null;
+      this.sessionId = null;
     }
   }
 
@@ -108,7 +108,7 @@ class UniWRTCClient {
       type: 'offer',
       offer: offer,
       targetId: targetId,
-      roomId: this.roomId
+      sessionId: this.sessionId
     });
   }
 
@@ -117,7 +117,7 @@ class UniWRTCClient {
       type: 'answer',
       answer: answer,
       targetId: targetId,
-      roomId: this.roomId
+      sessionId: this.sessionId
     });
   }
 
@@ -126,7 +126,7 @@ class UniWRTCClient {
       type: 'ice-candidate',
       candidate: candidate,
       targetId: targetId,
-      roomId: this.roomId
+      sessionId: this.sessionId
     });
   }
 
@@ -152,18 +152,20 @@ class UniWRTCClient {
         break;
       case 'joined':
         this.emit('joined', {
-          roomId: message.roomId,
+          sessionId: message.sessionId,
           clientId: message.clientId,
           clients: message.clients
         });
         break;
       case 'peer-joined':
         this.emit('peer-joined', {
+          sessionId: message.sessionId,
           peerId: message.peerId
         });
         break;
       case 'peer-left':
         this.emit('peer-left', {
+          sessionId: message.sessionId,
           peerId: message.peerId
         });
         break;

package/demo.html

@@ -282,11 +282,11 @@
         </div>
 
         <div class="card">
-            <h2>Room Status</h2>
+            <h2>Room / Session</h2>
             
             <div class="connection-controls" style="margin-bottom: 15px;">
-                <input type="text" id="roomId" placeholder="Enter room ID" value="demo-room">
-                <button class="btn-primary" id="joinBtn" onclick="joinRoom()" disabled>Join Room</button>
+                <input type="text" id="roomId" placeholder="Enter room/session ID" value="demo-room">
+                <button class="btn-primary" id="joinBtn" onclick="joinSession()" disabled>Join</button>
             </div>
             
             <div id="roomInfo">
@@ -430,18 +430,26 @@
                 log('Connecting to signaling server...', 'info');
                 
                 const customPeerId = document.getElementById('customPeerId').value.trim();
-                client = new UniWRTCClient(serverUrl, { customPeerId: customPeerId || null });
+                
+                // For Cloudflare (signal.peer.ooo), append room param to URL
+                let finalUrl = serverUrl;
+                const roomId = document.getElementById('roomId').value;
+                if (serverUrl.includes('signal.peer.ooo') && roomId) {
+                    finalUrl = serverUrl + (serverUrl.includes('?') ? '&' : '?') + `room=${roomId}`;
+                }
+                
+                client = new UniWRTCClient(finalUrl, { customPeerId: customPeerId || null });
 
                 client.on('connected', (data) => {
                     log(`Connected with ID: ${data.clientId}`, 'success');
                     updateStatus(true);
                     
-                    // Auto-join room after connecting
+                    // Auto-join session after connecting
                     const roomId = document.getElementById('roomId').value;
                     if (roomId) {
                         setTimeout(() => {
-                            log(`Auto-joining room: ${roomId}...`, 'info');
-                            client.joinRoom(roomId);
+                            log(`Auto-joining session: ${roomId}...`, 'info');
+                            client.joinSession(roomId);
                         }, 500);
                     }
                 });
@@ -455,15 +463,21 @@
                 let knownPeers = [];
 
                 client.on('joined', (data) => {
-                    log(`Joined room: ${data.roomId}`, 'success');
+                    log(`Joined session: ${data.sessionId}`, 'success');
                     knownPeers = data.clients || [];
                     updatePeersList(knownPeers);
                     
-                    // Update room info with dynamic peer count
-                    updateRoomInfo(data.roomId, client.clientId);
+                    // Update session info with dynamic peer count
+                    updateRoomInfo(data.sessionId, client.clientId);
                 });
 
                 client.on('peer-joined', (data) => {
+                    // Only connect to peers in the same session (if we have one set)
+                    if (client.sessionId && data.sessionId !== client.sessionId) {
+                        log(`Ignoring peer from different session: ${data.peerId}`, 'warning');
+                        return;
+                    }
+                    
                     log(`Peer joined: ${data.peerId}`, 'success');
                     // Add to known peers if not already there
                     if (data.peerId && !knownPeers.includes(data.peerId)) {
@@ -471,8 +485,8 @@
                         updatePeersList(knownPeers);
                     }
                     
-                    // Update room info with new peer count
-                    updateRoomInfo(client.roomId, client.clientId);
+                    // Update session info with new peer count
+                    updateRoomInfo(data.sessionId, client.clientId);
                     
                     // Auto-initiate P2P connection
                     setTimeout(() => {
@@ -481,14 +495,19 @@
                 });
 
                 client.on('peer-left', (data) => {
+                    // Only process if from current session (if we have one set)
+                    if (client.sessionId && data.sessionId !== client.sessionId) {
+                        return;
+                    }
+                    
                     const peerId = data.peerId;
                     log(`Peer left: ${peerId}`, 'warning');
                     // Remove from known peers
                     knownPeers = knownPeers.filter(id => id !== peerId);
                     updatePeersList(knownPeers);
                     
-                    // Update room info with new peer count
-                    updateRoomInfo(client.roomId, client.clientId);
+                    // Update session info with new peer count
+                    updateRoomInfo(data.sessionId, client.clientId);
                     
                     // Close peer connection
                     const pc = peerConnections.get(peerId);
@@ -580,8 +599,8 @@
                 return;
             }
 
-            if (!client || !client.roomId) {
-                log('Not connected to a room', 'error');
+            if (!client || !client.sessionId) {
+                log('Not connected to a session', 'error');
                 return;
             }
 
@@ -590,10 +609,10 @@
             document.getElementById('manualPeerId').value = '';
         }
 
-        function joinRoom() {
-            const roomId = document.getElementById('roomId').value;
+        function joinSession() {
+            const sessionId = document.getElementById('roomId').value;
             
-            if (!roomId) {
+            if (!sessionId) {
                 log('Please enter a room ID', 'error');
                 return;
             }
@@ -603,8 +622,8 @@
                 return;
             }
 
-            log(`Joining room: ${roomId}...`, 'info');
-            client.joinRoom(roomId);
+            log(`Joining session: ${sessionId}...`, 'info');
+            client.joinSession(sessionId);
         }
 
         function listRooms() {
@@ -619,12 +638,15 @@
 
         async function createPeerConnection(peerId, initiator = false) {
             if (peerConnections.has(peerId)) {
+                log(`Peer connection already exists for ${peerId.substring(0, 6)}`, 'info');
                 return peerConnections.get(peerId);
             }
 
             // Determine who should initiate based on peer IDs (lexicographic comparison)
             // Only the peer with smaller ID creates the offer
             const shouldInitiate = client.clientId < peerId;
+            
+            log(`Creating peer connection with ${peerId.substring(0, 6)} (shouldInitiate: ${shouldInitiate})`, 'info');
 
             const pc = new RTCPeerConnection({
                 iceServers: [
@@ -640,6 +662,7 @@
             };
 
             pc.ondatachannel = (event) => {
+                log(`Received data channel from ${peerId.substring(0, 6)}`, 'info');
                 setupDataChannel(peerId, event.channel);
             };
 
@@ -651,6 +674,8 @@
                 await pc.setLocalDescription(offer);
                 client.sendOffer(offer, peerId);
                 log(`Sent offer to ${peerId.substring(0, 6)}...`, 'success');
+            } else {
+                log(`Waiting for offer from ${peerId.substring(0, 6)}...`, 'info');
             }
 
             peerConnections.set(peerId, pc);
@@ -660,7 +685,6 @@
         function setupDataChannel(peerId, dataChannel) {
             dataChannel.onopen = () => {
                 log(`Data channel open with ${peerId.substring(0, 6)}...`, 'success');
-                dataChannels.set(peerId, dataChannel);
             };
 
             dataChannel.onmessage = (event) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniwrtc",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A universal WebRTC signaling service",
   "main": "server.js",
   "scripts": {

package/server.js

@@ -54,9 +54,12 @@ function log(message, data = '') {
   console.log(`[${timestamp}] ${message}`, data);
 }
 
-function broadcastToRoom(roomId, message, excludeClient = null) {
-  const room = rooms.get(roomId);
-  if (!room) return;
+function broadcastToRoom(sessionId, message, excludeClient = null) {
+  const room = rooms.get(sessionId);
+  if (!room) {
+    log(`WARNING: Attempted to broadcast to non-existent session: ${sessionId}`);
+    return;
+  }
 
   room.clients.forEach(client => {
     if (client !== excludeClient && client.readyState === WebSocket.OPEN) {
@@ -164,33 +167,33 @@ function handleSetId(ws, message) {
 }
 
 function handleJoin(ws, message) {
-  const { roomId } = message;
+  const { sessionId } = message;
   
-  if (!roomId) {
-    sendToClient(ws, { type: 'error', message: 'Room ID is required' });
+  if (!sessionId) {
+    sendToClient(ws, { type: 'error', message: 'Session ID is required' });
     return;
   }
 
-  // Leave current room if in one
+  // Leave current session if in one
   if (ws.room) {
-    handleLeave(ws, { roomId: ws.room });
+    handleLeave(ws, { sessionId: ws.room });
   }
 
-  // Create room if it doesn't exist
-  if (!rooms.has(roomId)) {
-    rooms.set(roomId, {
-      id: roomId,
+  // Create session if it doesn't exist
+  if (!rooms.has(sessionId)) {
+    rooms.set(sessionId, {
+      id: sessionId,
       clients: new Set(),
       createdAt: Date.now()
     });
-    log('Room created:', roomId);
+    log('Session created:', sessionId);
   }
 
-  const room = rooms.get(roomId);
+  const room = rooms.get(sessionId);
   room.clients.add(ws);
-  ws.room = roomId;
+  ws.room = sessionId;
 
-  log(`Client ${ws.clientId} joined room ${roomId}`);
+  log(`Client ${ws.clientId} joined session ${sessionId}`);
 
   // Get list of existing clients in the room
   const existingClients = Array.from(room.clients)
@@ -200,50 +203,52 @@ function handleJoin(ws, message) {
   // Notify the joining client
   sendToClient(ws, {
     type: 'joined',
-    roomId: roomId,
+    sessionId: sessionId,
     clientId: ws.clientId,
     clients: existingClients
   });
 
-  // Notify other clients in the room
-  broadcastToRoom(roomId, {
+  // Notify other clients in the session
+  broadcastToRoom(sessionId, {
     type: 'peer-joined',
+    sessionId: sessionId,
     peerId: ws.clientId
   }, ws);
 }
 
 function handleLeave(ws, message) {
-  const { roomId } = message;
+  const { sessionId } = message;
   
-  if (!roomId || !rooms.has(roomId)) {
+  if (!sessionId || !rooms.has(sessionId)) {
     return;
   }
 
-  const room = rooms.get(roomId);
+  const room = rooms.get(sessionId);
   room.clients.delete(ws);
 
-  log(`Client ${ws.clientId} left room ${roomId}`);
+  log(`Client ${ws.clientId} left session ${sessionId}`);
 
   // Notify other clients
-  broadcastToRoom(roomId, {
+  broadcastToRoom(sessionId, {
     type: 'peer-left',
+    sessionId: sessionId,
     peerId: ws.clientId
   });
 
-  // Clean up empty rooms
+  // Clean up empty sessions
   if (room.clients.size === 0) {
-    rooms.delete(roomId);
-    log('Room deleted:', roomId);
+    rooms.delete(sessionId);
+    log('Session deleted:', sessionId);
   }
 
   ws.room = null;
 }
 
 function handleSignaling(ws, message) {
-  const { targetId, roomId } = message;
+  const { targetId, sessionId } = message;
 
   if (!ws.room) {
-    sendToClient(ws, { type: 'error', message: 'Not in a room' });
+    sendToClient(ws, { type: 'error', message: 'Not in a session' });
     return;
   }
 
@@ -272,29 +277,29 @@ function handleSignaling(ws, message) {
 }
 
 function handleChat(ws, message) {
-  const { roomId, text } = message;
+  const { sessionId, text } = message;
   
-  if (!roomId || !text) {
-    sendToClient(ws, { type: 'error', message: 'Room ID and text are required' });
+  if (!sessionId || !text) {
+    sendToClient(ws, { type: 'error', message: 'Session ID and text are required' });
     return;
   }
 
-  log(`Chat message in room ${roomId}: ${text.substring(0, 50)}`);
+  log(`Chat message in session ${sessionId}: ${text.substring(0, 50)}`);
 
-  const room = rooms.get(roomId);
+  const room = rooms.get(sessionId);
   if (!room) {
-    sendToClient(ws, { type: 'error', message: 'Room not found' });
+    sendToClient(ws, { type: 'error', message: 'Session not found' });
     return;
   }
 
-  // Broadcast chat to ALL clients in the room (including sender)
+  // Broadcast chat to ALL clients in the session (including sender)
   room.clients.forEach(client => {
     if (client.readyState === WebSocket.OPEN) {
       client.send(JSON.stringify({
         type: 'chat',
         text: text,
         peerId: ws.clientId,
-        roomId: roomId
+        sessionId: sessionId
       }));
     }
   });

package/src/client-cloudflare.js

@@ -109,14 +109,14 @@ class UniWRTCClient {
     }
   }
 
-  joinRoom(roomId) {
-    this.roomId = roomId;
-    // Durable Objects handle room joining automatically via room parameter
+  joinSession(sessionId) {
+    this.sessionId = sessionId;
+    // Durable Objects handle session joining automatically via room parameter
   }
 
-  leaveRoom() {
-    if (this.roomId) {
-      this.roomId = null;
+  leaveSession() {
+    if (this.sessionId) {
+      this.sessionId = null;
     }
   }
 
@@ -188,20 +188,22 @@ class UniWRTCClient {
         console.log('[UniWRTC] If this helps, consider donating ❤️ → https://coff.ee/draederg');
         break;
       case 'joined':
-        this.roomId = message.roomId;
+        this.sessionId = message.sessionId;
         this.emit('joined', {
-          roomId: message.roomId,
+          sessionId: message.sessionId,
           clientId: message.clientId,
           clients: message.clients
         });
         break;
       case 'peer-joined':
         this.emit('peer-joined', {
+          sessionId: message.sessionId,
           peerId: message.peerId
         });
         break;
       case 'peer-left':
         this.emit('peer-left', {
+          sessionId: message.sessionId,
           peerId: message.peerId
         });
         break;
@@ -237,7 +239,7 @@ class UniWRTCClient {
         this.emit('chat', {
           text: message.text,
           peerId: message.peerId,
-          roomId: message.roomId
+          sessionId: message.sessionId
         });
         break;
       default:

package/src/room.js

@@ -17,7 +17,7 @@ export class Room {
       const clientId = crypto.randomUUID().substring(0, 9);
       this.clients.set(clientId, server);
 
-      console.log(`[Room] Client ${clientId} joined (total: ${this.clients.size})`);
+      console.log(`[Room] Client ${clientId} connected (total: ${this.clients.size})`);
 
       // Send welcome message
       server.send(JSON.stringify({
@@ -26,11 +26,7 @@ export class Room {
         message: 'Connected to UniWRTC signaling room'
       }));
 
-      // Notify existing clients
-      this.broadcast({
-        type: 'peer-joined',
-        clientId: clientId
-      }, clientId);
+      // NOTE: peer-joined is sent when client explicitly joins via 'join' message
 
       server.onmessage = async (event) => {
         try {
@@ -45,10 +41,10 @@ export class Room {
       server.onclose = () => {
         console.log(`[Room] Client ${clientId} left`);
         this.clients.delete(clientId);
+        // Note: sessionId should be tracked per client if needed
         this.broadcast({
           type: 'peer-left',
-          peerId: clientId,
-          clientId: clientId
+          peerId: clientId
         });
       };
 
@@ -81,7 +77,7 @@ export class Room {
   }
 
   async handleJoin(clientId, message) {
-    const { roomId, peerId } = message;
+    const { sessionId, peerId } = message;
     
     // Get list of other peers
     const peers = Array.from(this.clients.keys())
@@ -92,7 +88,7 @@ export class Room {
       // Send joined confirmation (align with server schema)
       client.send(JSON.stringify({
         type: 'joined',
-        roomId: roomId,
+        sessionId: sessionId,
         clientId: clientId,
         clients: peers
       }));
@@ -101,6 +97,7 @@ export class Room {
     // Notify other peers
     this.broadcast({
       type: 'peer-joined',
+      sessionId: sessionId,
       peerId: clientId
     }, clientId);
   }