MrDiderot/Michess
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add timeout for inactive games

Browse Source 
#1
also removed some redundant code
This commit is contained in:
Nathaniel Tampus
2023-01-16 15:10:53 +08:00
parent e823fb15e9
commit a65202357e
2 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
server/src/socket/game.socket.ts
View File

@@ -20,6 +20,11 @@ export async function joinLobby(this: Socket, gameCode: string) {
await leaveLobby.call(this); await leaveLobby.call(this);
} }
if (game.timeout) {
clearTimeout(game.timeout);
game.timeout = undefined;
}
await this.join(gameCode); await this.join(gameCode);
this.emit("receivedLatestGame", game); this.emit("receivedLatestGame", game);
io.to(game.code as string).emit("receivedLatestLobby", game); io.to(game.code as string).emit("receivedLatestLobby", game);
@@ -27,63 +32,47 @@ export async function joinLobby(this: Socket, gameCode: string) {
} }
export async function leaveLobby(this: Socket, code?: string) { export async function leaveLobby(this: Socket, code?: string) {
if (this.rooms.size === 2) { if (this.rooms.size >= 3 && !code) {
const game = activeGames.find((g) => g.code === (code || Array.from(this.rooms)[1]));
if (game) {
const user = game.observers?.find((o) => o.id === this.request.session.id);
let name = "";
if (user) {
name = user.name as string;
game.observers?.splice(game.observers?.indexOf(user), 1);
}
if (game.black?.id === this.request.session.id) {
name = game.black?.name as string;
game.black = undefined;
}
if (game.white?.id === this.request.session.id) {
name = game.white?.name as string;
game.white = undefined;
}
if (!game.white && !game.black && !game.observers) {
// TODO
//activeGames.splice(activeGames.indexOf(game), 1); // remove game if empty
} else {
this.to(game.code as string).emit("userLeft", name);
this.to(game.code as string).emit("receivedLatestLobby", game);
}
}
await this.leave(code || Array.from(this.rooms)[1]);
} else if (this.rooms.size >= 3) {
console.log(`[WARNING] leaveLobby: room size is ${this.rooms.size}, aborting...`); console.log(`[WARNING] leaveLobby: room size is ${this.rooms.size}, aborting...`);
} else { return;
// try to find a game with this user }
const game = activeGames.find( const game = activeGames.find(
(g) => (g) =>
g.code === code || g.code === (code || this.rooms.size === 2 ? Array.from(this.rooms)[1] : 0) ||
g.black?.id === this.request.session.id || g.black?.id === this.request.session.id ||
g.white?.id === this.request.session.id || g.white?.id === this.request.session.id ||
g.observers?.find((o) => this.request.session.id === o.id) g.observers?.find((o) => this.request.session.id === o.id)
); );
if (game) {
const user = game.observers?.find((o) => this.request.session.id === o.id); if (game) {
let name = ""; const user = game.observers?.find((o) => o.id === this.request.session.id);
if (user) { let name = "";
name = user.name as string; if (user) {
game.observers?.splice(game.observers?.indexOf(user), 1); name = user.name as string;
} game.observers?.splice(game.observers?.indexOf(user), 1);
if (game.black?.id === this.request.session.id) { }
name = game.black?.name as string; if (game.black?.id === this.request.session.id) {
game.black = undefined; name = game.black?.name as string;
} game.black = undefined;
if (game.white?.id === this.request.session.id) { }
name = game.white?.name as string; if (game.white?.id === this.request.session.id) {
game.white = undefined; name = game.white?.name as string;
} game.white = undefined;
}
if (!game.white && !game.black && (!game.observers || game.observers.length === 0)) {
if (game.timeout) clearTimeout(game.timeout);
game.timeout = Number(
setTimeout(() => {
activeGames.splice(activeGames.indexOf(game), 1);
}, 1000 * 60 * 30) // 30 minutes
);
} else {
this.to(game.code as string).emit("userLeft", name); this.to(game.code as string).emit("userLeft", name);
this.to(game.code as string).emit("receivedLatestLobby", game); this.to(game.code as string).emit("receivedLatestLobby", game);
} }
} }
await this.leave(code || Array.from(this.rooms)[1]);
} }
export async function getLatestGame(this: Socket) { export async function getLatestGame(this: Socket) {

1
types/index.ts
View File

@@ -7,6 +7,7 @@ export interface Game {
host?: User; host?: User;
code?: string; code?: string;
open?: boolean; open?: boolean;
timeout?: number;
observers?: User[]; observers?: User[];
} }