Fixes

diff --git a/extension/junction.js b/extension/junction.js
index 2dbff7895b0cf1d6722b63098f294cfe09901b83..73befa209a8d34d2bae7657d1b61b8478fc20a1f 100644 (file)
--- a/extension/junction.js
+++ b/extension/junction.js
@@ -35,27 +35,34 @@ const internals = {
     internals.setIcon('hangUp');
     const activeTabs = await internals.getActiveTabs();
 
     internals.setIcon('hangUp');
     const activeTabs = await internals.getActiveTabs();
 

-    const socketUrl = 'http://unlimited.pizza:8000/';
+    const socketUrl = 'http://localhost:8000/';

     const currentUrl = activeTabs[0].url;
 
     this.socket = io(socketUrl);
 
     const currentUrl = activeTabs[0].url;
 
     this.socket = io(socketUrl);
 

+    var that = this;
+

     this.socket.on('connect', function() {
       console.log("Connected to signaling server");
     this.socket.on('connect', function() {
       console.log("Connected to signaling server");

+
+      that.socket.emit('join', {
+        'url': currentUrl,
+      });

     });
 
     this.socket.on('disconnect', function() {
       console.log("disconnected from signaling server");
     });
 
     });
 
     this.socket.on('disconnect', function() {
       console.log("disconnected from signaling server");
     });
 

-    this.socket.on('addPeer', function() {
-      this.peers++;
-      console.log(`There are now ${this.peers} participants`);
+    this.socket.on('addPeer', function(data) {
+      console.log(data);
+      that.peers++;
+      console.log(`There are now ${that.peers} participants`);

     });
 
     this.socket.on('removePeer', function() {
     });
 
     this.socket.on('removePeer', function() {

-      this.peers--;
-      console.log(`There are now ${this.peers} participants`);
+      that.peers--;
+      console.log(`There are now ${that.peers} participants`);

     });
 
     console.log(activeTabs[0].url); // placeholder while we connect backend.
     });
 
     console.log(activeTabs[0].url); // placeholder while we connect backend.

diff --git a/server/index.js b/server/index.js
index ebdede7df2d4960ae39377f6026e99006e186218..de05616dd12d3253200295d0d10c3948882731a8 100644 (file)
--- a/server/index.js
+++ b/server/index.js
@@ -20,9 +20,11 @@ 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) => {

-        Object.keys(io.in(data.url).sockets).forEach(peer => {
-            peer.emit(events.types.ADD_PEER, events.addPeer(me, false));
-            socket.emit(events.types.ADD_PEER, events.addPeer(peer, true));
+        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);
         });
 
         socket.join(data.url);