X-Git-Url: https://git.r.bdr.sh/rbdr/junction/blobdiff_plain/ac259c8645783dcb92fc0eafff166769f5216aa9..139f43c6caf963d66704fe1675bcc70735e21926:/server/index.js?ds=inline diff --git a/server/index.js b/server/index.js index 0cfef25..37104e1 100644 --- a/server/index.js +++ b/server/index.js @@ -1,19 +1,13 @@ -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; @@ -21,29 +15,41 @@ io.sockets.on('connection', (socket) => { 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))); - + const sockets = server.of(data.url).sockets.keys(); + sockets.forEach((peerId) => { + if (peerId !== me) { + const peer = server.sockets.sockets.get(peerId) + peer.emit(events.types.ADD_PEER, events.addPeer(me, false)); + socket.emit(events.types.ADD_PEER, events.addPeer(peerId, 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))); + 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))); + const sockets = server.of(data.url).sockets.keys(); + sockets.forEach((peerId) => { + const peer = server.sockets.sockets.get(peerId) + 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))); + const sockets = server.of(data.url).sockets.keys(); + sockets.forEach((peerId) => { + const peer = server.sockets.sockets.get(peerId) + 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 +});