Merge branch 'main' of gitlab.com:rbdr/junction into main

[rbdr/junction] / server / index.js

diff --git a/server/index.js b/server/index.js
index 0cfef25c7346f741e20ac2a6b50c814256469719..de05616dd12d3253200295d0d10c3948882731a8 100644 (file)
--- a/server/index.js
+++ b/server/index.js
@@ -20,9 +20,14 @@ io.sockets.on('connection', (socket) => {
     console.log(`[CONNECT] New client connected with ID ${me}`);
 
     socket.on('join', (data) => {
     console.log(`[CONNECT] New client connected with ID ${me}`);
 
     socket.on('join', (data) => {

-        socket.join(data.url);
-        Object.keys(io.in(data.url).sockets).forEach(peer => peer.emit(events.types.ADD_PEER, events.addPeer(me, peer.id === me)));
+        Object.entries(io.in(data.url).sockets).forEach(([peerId, peer]) => {
+            if (peerId !== me) {
+                peer.emit(events.types.ADD_PEER, events.addPeer(me, false));
+                socket.emit(events.types.ADD_PEER, events.addPeer(peerId, true));
+            }
+        });

 
 

+        socket.join(data.url);

         console.log(`[CONNECT] Client ${me} added to room ${data.url}`);
     });
 
         console.log(`[CONNECT] Client ${me} added to room ${data.url}`);
     });