Skip to content

Commit

Permalink
Revert "#12 Changed Lobby"
Browse files Browse the repository at this point in the history
This reverts commit 63b9df0.
  • Loading branch information
christofplie authored and MarcelEwinger committed May 2, 2022
1 parent 7b9b966 commit 98589ca
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 34 deletions.
5 changes: 0 additions & 5 deletions backend/client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@
lobby = room;
})

socket.on('startGame', () =>{
displayMessage("Game starts");

})

const messageInput = document.getElementById("message");
const roomInput = document.getElementById("room");

Expand Down
25 changes: 25 additions & 0 deletions backend/server/Lobby.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

lobby = new Map();

function createNewLobby(roomName){
if(!lobby.has(roomName))
lobby.set(roomName, 0)

console.log("New Lobby Created")
}
function readyForGameLobby(roomName){
if(lobby.has(roomName)){
let counter = lobby.get(roomName)
lobby.set(roomName, counter++)
}


}








36 changes: 11 additions & 25 deletions backend/server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ const app = express();
const http = require('http');
const server = http.createServer(app);
const {Server} = require("socket.io");
const {createNewLobby} = require("./Lobby");
const io = new Server(server, { cors: { origin: '*'} });
const PORT = process.env.PORT || 3000;
//const { instrument } = require("@socket.io/admin-ui");



let clientNo = 1;
let lobby = new Map();

const lobbies = new Map();
lobbies.set("0", 0);



Expand All @@ -32,28 +33,20 @@ console.log('Listing on*:3000')
});

socket.on('readyForGame', (room) =>{
increaseGameLobbyCounter(room);
checkIfRoomIsReady(room);


console.log(room)
});

socket.on('disconnect', () => {
console.log('A user has disconnected.');

})

});
})

function increaseGameLobbyCounter (room){

lobby.set(room, lobby.get(room) + 1);
}

function checkIfRoomIsReady(room){
io.in(room).allSockets().then(result=>{
if(result.size === lobby.get(room)){
io.emit("startGame");
}
})
}
})

async function validateRoom(room, socket) {
if (room === '') {
Expand All @@ -68,7 +61,7 @@ function checkIfRoomIsReady(room){
socket.emit("join-room", room, ids)
socket.to(room).emit("join-room", room, ids)
console.log(socket.id + " joined " + room)
createLobby(room);
createNewLobby(room)
},
function(ids){
console.log(ids)
Expand All @@ -85,17 +78,10 @@ function checkIfRoomIsReady(room){
}

async function idsInRoom(room){
//return JSON.stringify(Array.from(await io.in(room).allSockets()));
return Array.from(await io.in(room).allSockets());
}

function createLobby(room){
if(lobby.size === 0){
lobby.set(room, 0);
console.log("Lobby with " + room + " created");
}
}





Expand Down
15 changes: 11 additions & 4 deletions backend/server/test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
const test = new Map();
let a = "1"
test.set(a, 10)
console.log(test.get(a))
const lobby = new Map();


lobby.set("1", 4)
lobby.set("2", 4)
lobby.set("3", 4)

console.log(lobby.get("1"))

lobby.set("1", 5)
console.log(lobby.get("1"))

0 comments on commit 98589ca

Please sign in to comment.