jketreno/peddlers-of-ketran
1
0
Fork 0
Code Issues 42 Activity

Building but users still not listing

Browse Source
This commit is contained in:
James Ketr 2025-10-07 18:23:07 -07:00
parent 61ecb175aa
commit abdd6bca83
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/routes/games.ts
View File

@ -674,7 +674,7 @@ const loadGame = async (id: string) => {
// so that a newly attached websocket will receive the consolidated // so that a newly attached websocket will receive the consolidated
// initial snapshot. This is important for long-running dev servers // initial snapshot. This is important for long-running dev servers
// where the in-memory cache may persist between reconnects. // where the in-memory cache may persist between reconnects.
const cached = games[id]; const cached = games[id]!;
for (let sid in cached.sessions) { for (let sid in cached.sessions) {
if (cached.sessions[sid] && cached.sessions[sid]._initialSnapshotSent) { if (cached.sessions[sid] && cached.sessions[sid]._initialSnapshotSent) {
delete cached.sessions[sid]._initialSnapshotSent; delete cached.sessions[sid]._initialSnapshotSent;
@ -1044,7 +1044,7 @@ const adminCommands = (game: Game, action: string, value: string, query: any): a
if (game.state !== "lobby") { if (game.state !== "lobby") {
return `Game already started.`; return `Game already started.`;
} }
if (game.active < 2) { if (!game.active || game.active < 2) {
return `Not enough players in game to start.`; return `Not enough players in game to start.`;
} }
game.state = "game-order"; game.state = "game-order";
@ -1052,7 +1052,8 @@ const adminCommands = (game: Game, action: string, value: string, query: any): a
* code that would otherwise have to filter out players by checking * code that would otherwise have to filter out players by checking
* the 'Not active' state of player.status */ * the 'Not active' state of player.status */
for (let key in game.players) { for (let key in game.players) {
if (game.players[key].status !== "Active") { const p = game.players[key];
if (!p || p.status !== "Active") {
delete game.players[key]; delete game.players[key];
} }
} }
@ -1084,11 +1085,11 @@ const setPlayerName = (game: Game, session: Session, name: string): string | und
let rejoin = false; let rejoin = false;
for (let id in game.sessions) { for (let id in game.sessions) {
const tmp = game.sessions[id]; const tmp = game.sessions[id];
if (tmp === session || !tmp.name) { if (!tmp || tmp === session || !tmp.name) {
continue; continue;
} }
if (tmp.name.toLowerCase() === name.toLowerCase()) { if (tmp.name.toLowerCase() === name.toLowerCase()) {
if (!tmp.player || Date.now() - tmp.player.lastActive > 60000) { if (!tmp.player || Date.now() - (tmp.player.lastActive || 0) > 60000) {
rejoin = true; rejoin = true;
/* Update the session object from tmp, but retain websocket /* Update the session object from tmp, but retain websocket
* from active session */ * from active session */
@ -1150,8 +1151,10 @@ const setPlayerName = (game: Game, session: Session, name: string): string | und
} }
game.unselected = []; game.unselected = [];
for (let id in game.sessions) { for (let id in game.sessions) {
if (!game.sessions[id].color && game.sessions[id].name) { const s = game.sessions[id];
game.unselected.push(game.sessions[id]); if (!s) continue;
if (!s.color && s.name) {
game.unselected.push(s);
} }
} }

4
server/routes/games/types.ts
View File

@ -86,6 +86,10 @@ export interface Session {
lastActive?: number; lastActive?: number;
keepAlive?: any; keepAlive?: any;
connected?: boolean; connected?: boolean;
hasAudio?: boolean;
audio?: any;
video?: any;
ping?: number;
_initialSnapshotSent?: boolean; _initialSnapshotSent?: boolean;
_getBatch?: { fields: Set<string>; timer?: any }; _getBatch?: { fields: Set<string>; timer?: any };
_pendingMessage?: any; _pendingMessage?: any;