Skip to content

fix: reclaim empty rooms and cancel their cleanup intervals on disconnect #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xpoes123 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: reclaim empty rooms and cancel their cleanup intervals on disconnect #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions server/multiplayer/ServerMultiplayerRoomMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import ServerPlayer from './ServerPlayer.js';
import Votekick from './VoteKick.js';
import { HEADER, ENDC, OKCYAN, OKBLUE } from '../bcolors.js';
import isAppropriateString from '../moderation/is-appropriate-string.js';
import { MODE_ENUM, QUESTION_TYPE_ENUM, TOSSUP_PROGRESS_ENUM } from '../../quizbowl/constants.js';
import { BONUS_PROGRESS_ENUM, MODE_ENUM, QUESTION_TYPE_ENUM, TOSSUP_PROGRESS_ENUM } from '../../quizbowl/constants.js';
import insertTokensIntoHTML from '../../quizbowl/insert-tokens-into-html.js';
// import TossupRoom from '../../quizbowl/TossupRoom.js';
import RateLimit from '../RateLimit.js';
Expand Down Expand Up @@ -47,7 +47,7 @@ const ServerMultiplayerRoomMixin = (RoomClass) => class extends RoomClass {
};

getSetList().then(setList => { this.packetList = setList; });
setInterval(this.cleanupExpiredBansAndKicks.bind(this), 5 * 60 * 1000); // 5 minutes
this.cleanupInterval = setInterval(this.cleanupExpiredBansAndKicks.bind(this), 5 * 60 * 1000); // 5 minutes
}

async message ({ userId, username }, message) {
Expand Down Expand Up @@ -254,6 +254,18 @@ const ServerMultiplayerRoomMixin = (RoomClass) => class extends RoomClass {
}

this.leave(userId);

// Reclaim non-permanent rooms once they empty out, so the room object and
// its cleanup interval don't leak. Skip while a question is in progress;
// its timers still hold a reference and the room will be reclaimed the next
// time it empties between questions.
const isEmpty = Object.keys(this.sockets).length === 0;
const isIdle = this.tossupProgress === TOSSUP_PROGRESS_ENUM.NOT_STARTED &&
this.bonusProgress === BONUS_PROGRESS_ENUM.NOT_STARTED;
if (isEmpty && isIdle && !this.isPermanent && !this.isVerified) {
clearInterval(this.cleanupInterval);
this.onEmpty?.();
}
}

giveAnswerLiveUpdate ({ userId, username }, { givenAnswer }) {
Expand Down
2 changes: 2 additions & 0 deletions server/multiplayer/handle-wss-connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ function createAndReturnRoom (roomName, userId, isPrivate = false, isControlled
// A room cannot be both public and controlled
room.settings.public = !isPrivate && !isControlled;
room.settings.controlled = isControlled;
// Remove the room once it empties out so it doesn't leak (see closeConnection).
room.onEmpty = () => { delete tossupBonusRooms[roomName]; };
tossupBonusRooms[roomName] = room;
}

Expand Down
Loading