Rooba
/
synclounge
mirror of https://github.com/synclounge/synclounge.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Server tidying

This commit is contained in:
samcm 2017-04-10 20:31:11 +10:00
parent cb0c8448d8
commit 56dfcfa49c
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/server.js
View File

@ -143,7 +143,7 @@ io.on('connection', function(socket){
socket.on('send_message',function(msg){ socket.on('send_message',function(msg){
//console.log(msg) //console.log(msg)
if (socket.ourRoom == null){ if (socket.ourRoom == null){
console.log('This user should join a room first') //console.log('This user should join a room first')
socket.emit('flowerror','You aren\' connected to a room! Use join') socket.emit('flowerror','You aren\' connected to a room! Use join')
socket.emit('rejoin') socket.emit('rejoin')
return return
@ -159,7 +159,7 @@ io.on('connection', function(socket){
}) })
}) })
socket.on('connect_timeout',function(){ socket.on('connect_timeout',function(){
console.log('timeout') //console.log('timeout')
handleDisconnect(true) handleDisconnect(true)
}) })
socket.on('disconnect', function(){ socket.on('disconnect', function(){
@ -169,12 +169,12 @@ io.on('connection', function(socket){
if (socket.selfUser === undefined || socket.selfUser === null){ if (socket.selfUser === undefined || socket.selfUser === null){
return return
} }
console.log('User left: ' + socket.selfUser.username) //console.log('User left: ' + socket.selfUser.username)
if (socket.selfUser.role == 'host'){ if (socket.selfUser.role == 'host'){
//Our Host has left, lets give the next Guest the Host role //Our Host has left, lets give the next Guest the Host role
var newHost = transferHost(socket.selfUser.room) var newHost = transferHost(socket.selfUser.room)
console.log('The new host is ' + newHost) //console.log('The new host is ' + newHost)
console.log(JSON.stringify(newHost,null,4)) //console.log(JSON.stringify(newHost,null,4))
socket.broadcast.to(socket.selfUser.room).emit('host-swap',newHost) socket.broadcast.to(socket.selfUser.room).emit('host-swap',newHost)
} }
removeUser(socket.selfUser.room,socket.selfUser.username) removeUser(socket.selfUser.room,socket.selfUser.username)
@ -221,15 +221,13 @@ function transferHost(roomName){
return return
} }
var oldHost = removeHost(room) var oldHost = removeHost(room)
console.log('root rooms object ')
console.log(JSON.stringify(io.sockets.adapter.rooms))
if (oldHost === null || oldHost === undefined) { if (oldHost === null || oldHost === undefined) {
return return
} }
for (var i in room.users){ for (var i in room.users){
if (room.users[i].username != oldHost.username){ if (room.users[i].username != oldHost.username){
//This is a valid user //This is a valid user
console.log('Transferred host to ' + room.users[i].username) //console.log('Transferred host to ' + room.users[i].username)
room.users[i].role = 'host' room.users[i].role = 'host'
room.hostUser = room.users[i] room.hostUser = room.users[i]
room.hostUsername = room.users[i].username room.hostUsername = room.users[i].username
@ -238,8 +236,6 @@ function transferHost(roomName){
} }
} }
function removeHost(room){ function removeHost(room){
console.log('Room object below')
console.log(JSON.stringify(room,null,4))
if (room === undefined){ if (room === undefined){
//Room has already been destroyed! //Room has already been destroyed!
return return
@ -254,14 +250,11 @@ function removeHost(room){
function removeUser(roomname,username){ function removeUser(roomname,username){
var room = io.sockets.adapter.rooms[roomname] var room = io.sockets.adapter.rooms[roomname]
if (room === undefined){ if (room === undefined){
console.log('room undefined')
return return
} }
for (var i in room.users){ for (var i in room.users){
console.log('Does ' + room.users[i].username + ' equal ' + username)
if (room.users[i].username == username){ if (room.users[i].username == username){
//This is the user that we need to remove //This is the user that we need to remove
console.log('Removing ' + room.users[i].username)
room.users.splice(i,1) room.users.splice(i,1)
} }
} }