Skip to content

Refactor timer system from child processes to main thread #216

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

Merged
AlecM33 merged 11 commits into from
Jan 24, 2026
+224 −256
Merged

Refactor timer system from child processes to main thread #216

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1432cd8
Initial plan
Copilot Jan 24, 2026
ae7cf5c
Refactor timer system to run on main thread instead of child processes
Copilot Jan 24, 2026
6cead03
Remove obsolete GameProcess.js and simplify TimerManager to stub
Copilot Jan 24, 2026
cab4ae5
Address code review feedback: add comments and reduce duplication
Copilot Jan 24, 2026
a2f8844
Remove comments, delete TimerManager, and simplify SOURCE_TIMER_EVENT
Copilot Jan 24, 2026
4e0f3d5
Fix cross-instance timer communication and expired timer handling
Copilot Jan 24, 2026
d0eeca8
Simplify GET_TIME_REMAINING flow and add ended flag
Copilot Jan 24, 2026
65e4c58
Refactor GET_TIME_REMAINING into handleTimerCommand switch case
Copilot Jan 24, 2026
c466779
Remove unused getTimeRemaining function from GameManager
Copilot Jan 24, 2026
c91e929
Reset timerParams.ended flag when restarting game
Copilot Jan 24, 2026
7ea71b7
remuse unused constant
AlecM33 Jan 24, 2026
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
164 changes: 110 additions & 54 deletions server/modules/Events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,95 @@ const GameStateCurator = require('./GameStateCurator');
const GameCreationRequest = require('../model/GameCreationRequest');
const { EVENT_IDS, STATUS, USER_TYPES, GAME_PROCESS_COMMANDS, REDIS_CHANNELS, PRIMITIVES } = require('../config/globals');

async function handleTimerCommand (timerEventSubtype, game, socketId, vars) {
switch (timerEventSubtype) {
case GAME_PROCESS_COMMANDS.PAUSE_TIMER:
const pauseTimeRemaining = await vars.gameManager.pauseTimer(game);
if (pauseTimeRemaining !== null) {
await vars.eventManager.handleEventById(
EVENT_IDS.PAUSE_TIMER,
null,
game,
null,
game.accessCode,
{ timeRemaining: pauseTimeRemaining },
null,
false
);
await vars.gameManager.refreshGame(game);
await vars.eventManager.publisher.publish(
REDIS_CHANNELS.ACTIVE_GAME_STREAM,
vars.eventManager.createMessageToPublish(
game.accessCode,
EVENT_IDS.PAUSE_TIMER,
vars.instanceId,
JSON.stringify({ timeRemaining: pauseTimeRemaining })
)
);
}
break;
case GAME_PROCESS_COMMANDS.RESUME_TIMER:
const resumeTimeRemaining = await vars.gameManager.resumeTimer(game);
if (resumeTimeRemaining !== null) {
await vars.eventManager.handleEventById(
EVENT_IDS.RESUME_TIMER,
null,
game,
null,
game.accessCode,
{ timeRemaining: resumeTimeRemaining },
null,
false
);
await vars.gameManager.refreshGame(game);
await vars.eventManager.publisher.publish(
REDIS_CHANNELS.ACTIVE_GAME_STREAM,
vars.eventManager.createMessageToPublish(
game.accessCode,
EVENT_IDS.RESUME_TIMER,
vars.instanceId,
JSON.stringify({ timeRemaining: resumeTimeRemaining })
)
);
}
break;
case GAME_PROCESS_COMMANDS.GET_TIME_REMAINING:
if (game.timerParams && game.timerParams.ended) {
const socket = vars.gameManager.namespace.sockets.get(socketId);
if (socket) {
vars.gameManager.namespace.to(socket.id).emit(
GAME_PROCESS_COMMANDS.GET_TIME_REMAINING,
0,
false
);
}
} else {
const timer = vars.gameManager.timers[game.accessCode];
if (timer) {
const socket = vars.gameManager.namespace.sockets.get(socketId);
if (socket) {
vars.gameManager.namespace.to(socket.id).emit(
GAME_PROCESS_COMMANDS.GET_TIME_REMAINING,
timer.currentTimeInMillis,
game.timerParams ? game.timerParams.paused : false
);
}
} else {
await vars.eventManager.publisher?.publish(
REDIS_CHANNELS.ACTIVE_GAME_STREAM,
vars.eventManager.createMessageToPublish(
game.accessCode,
EVENT_IDS.SOURCE_TIMER_EVENT,
vars.instanceId,
JSON.stringify({ socketId: socketId, timerEventSubtype: timerEventSubtype })
)
);
}
}
break;
}
}

const Events = [
{
id: EVENT_IDS.PLAYER_JOINED,
Expand Down Expand Up @@ -164,7 +253,7 @@ const Events = [
vars.gameManager.deal(game);
if (game.hasTimer) {
game.timerParams.paused = true;
await vars.timerManager.runTimer(game, vars.gameManager.namespace, vars.eventManager, vars.gameManager);
await vars.gameManager.runTimer(game);
}
}
},
Expand Down Expand Up @@ -220,9 +309,10 @@ const Events = [
id: EVENT_IDS.END_GAME,
stateChange: async (game, socketArgs, vars) => {
game.status = STATUS.ENDED;
if (game.hasTimer && vars.timerManager.timerThreads[game.accessCode]) {
vars.logger.trace('KILLING TIMER PROCESS FOR ENDED GAME ' + game.accessCode);
vars.timerManager.timerThreads[game.accessCode].kill();
if (game.hasTimer && vars.gameManager.timers[game.accessCode]) {
vars.logger.trace('STOPPING TIMER FOR ENDED GAME ' + game.accessCode);
vars.gameManager.timers[game.accessCode].stopTimer();
delete vars.gameManager.timers[game.accessCode];
}
for (const person of game.people) {
person.revealed = true;
Expand Down Expand Up @@ -297,12 +387,10 @@ const Events = [
id: EVENT_IDS.RESTART_GAME,
stateChange: async (game, socketArgs, vars) => {
if (vars.instanceId !== vars.senderInstanceId
&& vars.timerManager.timerThreads[game.accessCode]
&& vars.gameManager.timers[game.accessCode]
) {
if (!vars.timerManager.timerThreads[game.accessCode].killed) {
vars.timerManager.timerThreads[game.accessCode].kill();
}
delete vars.timerManager.timerThreads[game.accessCode];
vars.gameManager.timers[game.accessCode].stopTimer();
delete vars.gameManager.timers[game.accessCode];
}
},
communicate: async (game, socketArgs, vars) => {
Expand All @@ -316,68 +404,35 @@ const Events = [
id: EVENT_IDS.TIMER_EVENT,
stateChange: async (game, socketArgs, vars) => {},
communicate: async (game, socketArgs, vars) => {
const thread = vars.timerManager.timerThreads[game.accessCode];
if (thread) {
if (!thread.killed && thread.exitCode === null) {
thread.send({
command: vars.timerEventSubtype,
accessCode: game.accessCode,
socketId: vars.requestingSocketId,
logLevel: vars.logger.logLevel
});
} else {
const socket = vars.gameManager.namespace.sockets.get(vars.requestingSocketId);
if (socket) {
vars.gameManager.namespace.to(socket.id).emit(
GAME_PROCESS_COMMANDS.GET_TIME_REMAINING,
game.timerParams.timeRemaining,
game.timerParams.paused
);
}
}
} else { // we need to consult another container for the timer data
await vars.eventManager.publisher?.publish(
REDIS_CHANNELS.ACTIVE_GAME_STREAM,
vars.eventManager.createMessageToPublish(
game.accessCode,
EVENT_IDS.SOURCE_TIMER_EVENT,
vars.instanceId,
JSON.stringify({ socketId: vars.requestingSocketId, timerEventSubtype: vars.timerEventSubtype })
)
);
}
await handleTimerCommand(vars.timerEventSubtype, game, vars.requestingSocketId, vars);
}
},
{
/* This event is a request from another instance to consult its timer data. In response
* to this event, this instance will check if it is home to a particular timer thread. */
id: EVENT_IDS.SOURCE_TIMER_EVENT,
stateChange: async (game, socketArgs, vars) => {},
communicate: async (game, socketArgs, vars) => {
const thread = vars.timerManager.timerThreads[game.accessCode];
if (thread) {
if (!thread.killed && thread.exitCode === null) {
thread.send({
command: socketArgs.timerEventSubtype,
accessCode: game.accessCode,
socketId: socketArgs.socketId,
logLevel: vars.logger.logLevel
});
} else {
if (socketArgs.timerEventSubtype === GAME_PROCESS_COMMANDS.GET_TIME_REMAINING) {
const timer = vars.gameManager.timers[game.accessCode];
if (timer) {
await vars.eventManager.publisher.publish(
REDIS_CHANNELS.ACTIVE_GAME_STREAM,
vars.eventManager.createMessageToPublish(
game.accessCode,
socketArgs.timerEventSubtype,
GAME_PROCESS_COMMANDS.GET_TIME_REMAINING,
vars.instanceId,
JSON.stringify({
socketId: socketArgs.socketId,
timeRemaining: game.timerParams.timeRemaining,
paused: game.timerParams.paused
timeRemaining: timer.currentTimeInMillis,
paused: game.timerParams ? game.timerParams.paused : false
})
)
);
}
} else {
const timer = vars.gameManager.timers[game.accessCode];
if (timer) {
await handleTimerCommand(socketArgs.timerEventSubtype, game, socketArgs.socketId, vars);
}
}
}
},
Expand Down Expand Up @@ -405,6 +460,7 @@ const Events = [
stateChange: async (game, socketArgs, vars) => {
game.timerParams.paused = false;
game.timerParams.timeRemaining = 0;
game.timerParams.ended = true;
},
communicate: async (game, socketArgs, vars) => {
vars.gameManager.namespace.in(game.accessCode).emit(GAME_PROCESS_COMMANDS.END_TIMER);
Expand Down
53 changes: 0 additions & 53 deletions server/modules/GameProcess.js
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions server/modules/ServerBootstrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ const fs = require('fs');
const crypto = require('crypto');
const EventManager = require('./singletons/EventManager.js');
const GameManager = require('./singletons/GameManager.js');
const TimerManager = require('./singletons/TimerManager.js');
const rateLimit = require('express-rate-limit').default;

const ServerBootstrapper = {

singletons: (logger, instanceId) => {
return {
timerManager: new TimerManager(logger, instanceId),
eventManager: new EventManager(logger, instanceId),
gameManager: process.env.NODE_ENV.trim() === 'development'
? new GameManager(logger, ENVIRONMENTS.LOCAL, instanceId)
Expand All @@ -22,12 +20,9 @@ const ServerBootstrapper = {
},

injectDependencies: (singletons) => {
const timerManager = require('./singletons/TimerManager').instance;
const gameManager = require('./singletons/GameManager').instance;
const eventManager = require('./singletons/EventManager').instance;
singletons.gameManager.timerManager = timerManager;
singletons.gameManager.eventManager = eventManager;
singletons.eventManager.timerManager = timerManager;
singletons.eventManager.gameManager = gameManager;
},

Expand Down
2 changes: 0 additions & 2 deletions server/modules/singletons/EventManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class EventManager {
this.io = null;
this.publisher = null;
this.subscriber = null;
this.timerManager = null;
this.gameManager = null;
this.instanceId = instanceId;
EventManager.instance = this;
Expand Down Expand Up @@ -185,7 +184,6 @@ class EventManager {
const event = Events.find((event) => event.id === eventId);
const additionalVars = {
gameManager: this.gameManager,
timerManager: this.timerManager,
eventManager: this,
requestingSocketId: requestingSocketId,
ackFn: ackFn,
Expand Down
Loading