X-Git-Url: https://git.r.bdr.sh/rbdr/junction/blobdiff_plain/27a1c981529492981f08bb1c0ece4cb5d615c19b..284fc661dc7f18aa32d0dbcd8e7f98cb16af4bb7:/server/index.js?ds=sidebyside

diff --git a/server/index.js b/server/index.js
index 0cfef25..e6a37c7 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,49 +1,66 @@
-const PORT = 8000;
+import { Server } from 'socket.io';
+import { port } from './config.js';
+import * as events from './events.js';
 
-const express = require('express');
-const http = require('http');
-const main = express();
-const server = http.createServer(main);
-const io  = require('socket.io').listen(server);
-const events = require('./events');
+const server = new Server(port);
+console.log(`Listening on port ${port}`);
 
-server.listen(PORT, null, function() {
-    console.log("Listening on port " + PORT);
-});
-
-const sockets = {};
+const rooms = {};
 
-io.sockets.on('connection', (socket) => {
-    sockets[socket.id] = socket;
+server.on('connection', (socket) => {
     const me = socket.id;
 
     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)));
+    socket.on('join', async (data) => {
+      const room = data.room;
+      socket.join(room);
+
+      if (!rooms[room]) {
+        rooms[room] = {};
+      }
+
+      rooms[room].push(socket.id);
 
-        console.log(`[CONNECT] Client ${me} added to room ${data.url}`);
+      const sockets = await server.in(data.url).fetchSockets()
+      sockets.forEach((peer) => {
+        if (peer.id !== me) {
+          peer.emit(events.types.ADD_PEER, events.addPeer(me, false));
+          socket.emit(events.types.ADD_PEER, events.addPeer(peer.id, true));
+        }
+      });
+      console.log(`[CONNECT] Client ${me} added to room ${data.url}`);
     });
 
     socket.on('disconnecting', () => {
-        const rooms = Object.keys(socket.rooms);
-        rooms.forEach(room => io.to(room).emit(events.types.REMOVE_PEER, events.removePeer(me)));
 
-        console.log(`[DISCONNECT] Client ${me} has disconnected and has been removed from all rooms`);
+      for (const room in rooms) {
+        if (rooms[room].includes(me)) {
+          rooms[room] = rooms[room].filter(id => id !== me);
+          socket.to(room).emit(events.types.REMOVE_PEER, events.removePeer(me));
+          if (rooms[room].length === 0) {
+            delete rooms[room];
+          }
+        }
+      }
+      console.log(`[DISCONNECT] Client ${me} has disconnected and has been removed from all rooms`);
     });
 
-    socket.on('relayICECandidate', (data) => {
-        Object.keys(io.in(data.url).sockets).forEach(peer =>
-            peer.emit(events.types.ICE_CANDIDATE_RECEIVED, events.ICECandidateReceived(me, data.ice_candidate)));
+    socket.on('relayICECandidate', async (data) => {
 
+        socket.to(data.peerId).emit(events.types.ICE_CANDIDATE_RECEIVED, events.ICECandidateReceived(me, data.candidate))
         console.log(`[RELAY_ICE_CANDIDATE] ICE candidate for client ${me} has been relayed to all peers`);
     });
 
-    socket.on('relaySessionDescription', (data) => {
-        Object.keys(io.in(data.url).sockets).forEach(peer =>
-            peer.emit(events.types.SESSION_DESCRIPTION_RECEIVED, events.SessionDescriptionReceived(me, data.session_description)));
+    socket.on('relayOffer', async (data) => {
 
-        console.log(`[RELAY_SESSION_DESCRIPTION] Session description for client ${me} has been relayed to all peers`);
+        socket.to(data.peerId).emit(events.types.OFFER_RECEIVED, events.offerReceived(me, data.offer))
+        console.log(`[RELAY_OFFER] ICE offer for client ${me} has been relayed to all peers`);
     });
-});
\ No newline at end of file
+
+    socket.on('relayAnswer', async (data) => {
+
+        socket.to(data.peerId).emit(events.types.ANSWER_RECEIVED, events.answerReceived(me, data.answer))
+        console.log(`[RELAY_OFFER] ICE offer for client ${me} has been relayed to all peers`);
+    });
+});