X-Git-Url: https://git.r.bdr.sh/rbdr/junction/blobdiff_plain/c3fafc92b16013c658c6efd2240f27252a00f860..8c7fb565690890d57b6af20ad0771a48cf82b4c7:/server/index.js?ds=sidebyside

diff --git a/server/index.js b/server/index.js
index de05616..b5d5d1b 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,54 +1,55 @@
-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');
-
-server.listen(PORT, null, function() {
-    console.log("Listening on port " + PORT);
-});
+const server = new Server(port);
+console.log(`Listening on port ${port}`);
 
 const sockets = {};
 
-io.sockets.on('connection', (socket) => {
+server.on('connection', (socket) => {
     sockets[socket.id] = socket;
     const me = socket.id;
 
     console.log(`[CONNECT] New client connected with ID ${me}`);
 
-    socket.on('join', (data) => {
-        Object.entries(io.in(data.url).sockets).forEach(([peerId, peer]) => {
-            if (peerId !== me) {
+    socket.on('join', async (data) => {
+        socket.join(data.url);
+        const sockets = await server.in(data.url).fetchSockets()
+        console.log(sockets);
+        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(peerId, true));
+                socket.emit(events.types.ADD_PEER, events.addPeer(peer.id, true));
             }
         });
-
-        socket.join(data.url);
         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)));
+        rooms.forEach(room => server.to(room).emit(events.types.REMOVE_PEER, events.removePeer(me)));
 
         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) => {
+        const sockets = await server.in(data.url).fetchSockets()
+        console.log(sockets);
+        sockets.forEach((peer) => {
+            peer.emit(events.types.ICE_CANDIDATE_RECEIVED, events.ICECandidateReceived(me, data.ice_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('relaySessionDescription', async (data) => {
+        const sockets = await server.in(data.url).fetchSockets()
+        console.log(sockets);
+        sockets.forEach((peer) => {
+            peer.emit(events.types.SESSION_DESCRIPTION_RECEIVED, events.SessionDescriptionReceived(me, data.session_description))
+        });
 
         console.log(`[RELAY_SESSION_DESCRIPTION] Session description for client ${me} has been relayed to all peers`);
     });
-});
\ No newline at end of file
+});