para/puzzle
1
1
Fork 0
Code Issues 8 Pull requests Releases Wiki Activity

move socket handling to extra file (not GameCommon)

Browse source
This commit is contained in:
Zutatensuppe 2020-12-23 20:35:36 +01:00
parent f1625b75ff
commit 35364c1058
4 changed files with 52 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

31
common/GameCommon.js
View file

@ -2,19 +2,19 @@ import Geometry from './Geometry.js'
import Protocol from './Protocol.js'
import Util from './Util.js'
// Map<gameId, GameObject>
const GAMES = {}
function exists(gameId) {
return (!!GAMES[gameId]) || false
}
function __createGameObject(id, rng, puzzle, players, sockets, evtInfos) {
function __createGameObject(id, rng, puzzle, players, evtInfos) {
return {
id: id,
rng: rng,
puzzle: puzzle,
players: players,
sockets: sockets,
evtInfos: evtInfos,
}
}
@ -33,8 +33,8 @@ function __createPlayerObject(id, ts) {
}
}
function newGame({id, rng, puzzle, players, sockets, evtInfos}) {
const game = __createGameObject(id, rng, puzzle, players, sockets, evtInfos)
function newGame({id, rng, puzzle, players, evtInfos}) {
const game = __createGameObject(id, rng, puzzle, players, evtInfos)
setGame(id, game)
return game
}
@ -116,21 +116,6 @@ function addPlayer(gameId, playerId, ts) {
}
}
function socketExists(gameId, socket) {
return GAMES[gameId].sockets.includes(socket)
}
function addSocket(gameId, socket) {
if (!GAMES[gameId].sockets.includes(socket)) {
console.log('adding socket: ', gameId, socket.protocol)
GAMES[gameId].sockets.push(socket)
}
}
function removeSocket(gameId, socket) {
GAMES[gameId].sockets = GAMES[gameId].sockets.filter(s => s !== socket)
}
function getAllGames() {
return Object.values(GAMES).sort((a, b) => {
// when both have same finished state, sort by started
@ -179,10 +164,6 @@ function getTilesSortedByZIndex(gameId) {
return tiles.sort((t1, t2) => t1.z - t2.z)
}
function getSockets(gameId) {
return GAMES[gameId].sockets
}
function changePlayer(gameId, playerId, change) {
const player = getPlayer(gameId, playerId)
for (let k of Object.keys(change)) {
@ -655,15 +636,11 @@ export default {
getRelevantPlayers,
getActivePlayers,
addPlayer,
socketExists,
addSocket,
removeSocket,
getFinishedTileCount,
getTileCount,
getImageUrl,
get,
getAllGames,
getSockets,
getPlayerBgColor,
getPlayerColor,
getPlayerName,