uniwrtc 1.0.1 → 1.0.2

package/README.md

@@ -188,22 +188,22 @@ client.on('joined', (data) => {
 });
 
 client.on('peer-joined', (data) => {
-  console.log('New peer joined:', data.peerId || data.clientId);
+  console.log('New peer joined:', data.peerId);
   // Initiate WebRTC connection with new peer
 });
 
 client.on('offer', (data) => {
-  console.log('Received offer from:', data.peerId || data.senderId);
+  console.log('Received offer from:', data.peerId);
   // Handle WebRTC offer
 });
 
 client.on('answer', (data) => {
-  console.log('Received answer from:', data.peerId || data.senderId);
+  console.log('Received answer from:', data.peerId);
   // Handle WebRTC answer
 });
 
 client.on('ice-candidate', (data) => {
-  console.log('Received ICE candidate from:', data.peerId || data.senderId);
+  console.log('Received ICE candidate from:', data.peerId);
   // Add ICE candidate to peer connection
 });
 
@@ -253,7 +253,7 @@ function createPeerConnection(peerId) {
 
 // Handle new peer
 client.on('peer-joined', async (data) => {
-  const pc = createPeerConnection(data.clientId);
+  const pc = createPeerConnection(data.peerId);
   
   // Add local tracks
   const stream = await navigator.mediaDevices.getUserMedia({ 
@@ -265,22 +265,22 @@ client.on('peer-joined', async (data) => {
   // Create and send offer
   const offer = await pc.createOffer();
   await pc.setLocalDescription(offer);
-  client.sendOffer(offer, data.clientId);
+  client.sendOffer(offer, data.peerId);
 });
 
 // Handle incoming offer
 client.on('offer', async (data) => {
-  const pc = createPeerConnection(data.senderId);
+  const pc = createPeerConnection(data.peerId);
   
   await pc.setRemoteDescription(data.offer);
   const answer = await pc.createAnswer();
   await pc.setLocalDescription(answer);
-  client.sendAnswer(answer, data.senderId);
+  client.sendAnswer(answer, data.peerId);
 });
 
 // Handle incoming answer
 client.on('answer', async (data) => {
-  const pc = peerConnections.get(data.senderId);
+  const pc = peerConnections.get(data.peerId);
   if (pc) {
     await pc.setRemoteDescription(data.answer);
   }
@@ -288,7 +288,7 @@ client.on('answer', async (data) => {
 
 // Handle ICE candidates
 client.on('ice-candidate', async (data) => {
-  const pc = peerConnections.get(data.senderId);
+  const pc = peerConnections.get(data.peerId);
   if (pc) {
     await pc.addIceCandidate(data.candidate);
   }

package/client-browser.js

@@ -122,7 +122,7 @@ class UniWRTCClient {
     }
   }
 
-  sendOffer(targetId, offer) {
+  sendOffer(offer, targetId) {
     this.send({
       type: 'offer',
       offer: offer,
@@ -131,7 +131,7 @@ class UniWRTCClient {
     });
   }
 
-  sendAnswer(targetId, answer) {
+  sendAnswer(answer, targetId) {
     this.send({
       type: 'answer',
       answer: answer,
@@ -140,7 +140,7 @@ class UniWRTCClient {
     });
   }
 
-  sendIceCandidate(targetId, candidate) {
+  sendIceCandidate(candidate, targetId) {
     this.send({
       type: 'ice-candidate',
       candidate: candidate,
@@ -197,14 +197,12 @@ class UniWRTCClient {
         break;
       case 'peer-joined':
         this.emit('peer-joined', {
-          peerId: message.peerId || message.clientId,
-          clientId: message.clientId
+          peerId: message.peerId
         });
         break;
       case 'peer-left':
         this.emit('peer-left', {
-          peerId: message.peerId || message.clientId,
-          clientId: message.clientId
+          peerId: message.peerId
         });
         break;
       case 'offer':
@@ -238,7 +236,7 @@ class UniWRTCClient {
       case 'chat':
         this.emit('chat', {
           text: message.text,
-          senderId: message.senderId,
+          peerId: message.peerId,
           roomId: message.roomId
         });
         break;
@@ -247,3 +245,8 @@ class UniWRTCClient {
     }
   }
 }
+
+// Attach to window for non-module script usage
+if (typeof window !== 'undefined') {
+  window.UniWRTCClient = UniWRTCClient;
+}

package/client.js

@@ -159,29 +159,29 @@ class UniWRTCClient {
         break;
       case 'peer-joined':
         this.emit('peer-joined', {
-          clientId: message.clientId
+          peerId: message.peerId
         });
         break;
       case 'peer-left':
         this.emit('peer-left', {
-          clientId: message.clientId
+          peerId: message.peerId
         });
         break;
       case 'offer':
         this.emit('offer', {
-          senderId: message.senderId,
+          peerId: message.peerId,
           offer: message.offer
         });
         break;
       case 'answer':
         this.emit('answer', {
-          senderId: message.senderId,
+          peerId: message.peerId,
           answer: message.answer
         });
         break;
       case 'ice-candidate':
         this.emit('ice-candidate', {
-          senderId: message.senderId,
+          peerId: message.peerId,
           candidate: message.candidate
         });
         break;

package/demo.html

@@ -460,7 +460,7 @@
                     updatePeersList(knownPeers);
                     
                     // Update room info with dynamic peer count
-                    updateRoomInfo(data.roomId, data.peerId || client.clientId);
+                    updateRoomInfo(data.roomId, client.clientId);
                 });
 
                 client.on('peer-joined', (data) => {
@@ -481,7 +481,7 @@
                 });
 
                 client.on('peer-left', (data) => {
-                    const peerId = data.peerId || data.clientId;
+                    const peerId = data.peerId;
                     log(`Peer left: ${peerId}`, 'warning');
                     // Remove from known peers
                     knownPeers = knownPeers.filter(id => id !== peerId);
@@ -511,7 +511,7 @@
                         await pc.setLocalDescription(answer);
                         
                         // Send answer back
-                        client.sendAnswer(data.peerId, answer);
+                        client.sendAnswer(answer, data.peerId);
                     } catch (e) {
                         log(`Offer error: ${e.message}`, 'error');
                     }
@@ -552,8 +552,8 @@
                 });
 
                 client.on('chat', (data) => {
-                    displayChatMessage(data.text, `${data.senderId.substring(0, 6)}...`, false);
-                    log(`Chat from ${data.senderId}: ${data.text}`, 'info');
+                    displayChatMessage(data.text, `${data.peerId.substring(0, 6)}...`, false);
+                    log(`Chat from ${data.peerId}: ${data.text}`, 'info');
                 });
 
                 await client.connect();
@@ -635,7 +635,7 @@
             pc.onicecandidate = (event) => {
                 if (event.candidate) {
                     log(`Sending ICE candidate to ${peerId.substring(0, 6)}...`, 'info');
-                    client.sendIceCandidate(peerId, event.candidate);
+                    client.sendIceCandidate(event.candidate, peerId);
                 }
             };
 
@@ -649,7 +649,7 @@
                 
                 const offer = await pc.createOffer();
                 await pc.setLocalDescription(offer);
-                client.sendOffer(peerId, offer);
+                client.sendOffer(offer, peerId);
                 log(`Sent offer to ${peerId.substring(0, 6)}...`, 'success');
             }
 

package/package.json

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

package/server.js

@@ -208,8 +208,7 @@ function handleJoin(ws, message) {
   // Notify other clients in the room
   broadcastToRoom(roomId, {
     type: 'peer-joined',
-    peerId: ws.clientId,
-    clientId: ws.clientId
+    peerId: ws.clientId
   }, ws);
 }
 
@@ -228,7 +227,7 @@ function handleLeave(ws, message) {
   // Notify other clients
   broadcastToRoom(roomId, {
     type: 'peer-left',
-    clientId: ws.clientId
+    peerId: ws.clientId
   });
 
   // Clean up empty rooms
@@ -294,7 +293,7 @@ function handleChat(ws, message) {
       client.send(JSON.stringify({
         type: 'chat',
         text: text,
-        senderId: ws.clientId,
+        peerId: ws.clientId,
         roomId: roomId
       }));
     }

package/src/client-cloudflare.js

@@ -128,7 +128,7 @@ class UniWRTCClient {
     }
   }
 
-  sendOffer(targetId, offer) {
+  sendOffer(offer, targetId) {
     this.send({
       type: 'offer',
       offer: offer,
@@ -136,7 +136,7 @@ class UniWRTCClient {
     });
   }
 
-  sendAnswer(targetId, answer) {
+  sendAnswer(answer, targetId) {
     this.send({
       type: 'answer',
       answer: answer,
@@ -144,7 +144,7 @@ class UniWRTCClient {
     });
   }
 
-  sendIceCandidate(targetId, candidate) {
+  sendIceCandidate(candidate, targetId) {
     this.send({
       type: 'ice-candidate',
       candidate: candidate,
@@ -197,12 +197,12 @@ class UniWRTCClient {
         break;
       case 'peer-joined':
         this.emit('peer-joined', {
-          clientId: message.clientId
+          peerId: message.peerId
         });
         break;
       case 'peer-left':
         this.emit('peer-left', {
-          clientId: message.clientId
+          peerId: message.peerId
         });
         break;
       case 'offer':
@@ -236,7 +236,7 @@ class UniWRTCClient {
       case 'chat':
         this.emit('chat', {
           text: message.text,
-          senderId: message.senderId,
+          peerId: message.peerId,
           roomId: message.roomId
         });
         break;

package/src/room.js

@@ -89,11 +89,11 @@ export class Room {
     
     const client = this.clients.get(clientId);
     if (client && client.readyState === WebSocket.OPEN) {
-      // Send joined confirmation
+      // Send joined confirmation (align with server schema)
       client.send(JSON.stringify({
         type: 'joined',
         roomId: roomId,
-        peerId: peerId || clientId,
+        clientId: clientId,
         clients: peers
       }));
     }
@@ -101,8 +101,7 @@ export class Room {
     // Notify other peers
     this.broadcast({
       type: 'peer-joined',
-      peerId: peerId || clientId,
-      clientId: clientId
+      peerId: clientId
     }, clientId);
   }