redis effort part 5

index.js

@@ -10,33 +10,43 @@
             const GameManager = require('./server/modules/singletons/GameManager');
             const eventManager = require('./server/modules/singletons/EventManager');
             const globals = require('./server/config/globals');
-
-            app.use(express.json({limit: '10kb'}));
-
             const args = ServerBootstrapper.processCLIArgs();
-
             const logger = require('./server/modules/Logger')(args.logLevel);
-            logger.info('LOG LEVEL IS: ' + args.logLevel);
-
             const port = parseInt(process.env.PORT) || args.port || 8080;
-
             const webServer = ServerBootstrapper.createServerWithCorrectHTTPProtocol(app, args.useHttps, args.port, logger);
-            const singletons = ServerBootstrapper.singletons(logger, (() => {
+            const instanceId = (() => {
                 let id = '';
                 for (let i = 0; i < globals.INSTANCE_ID_LENGTH; i ++) {
                     id += globals.INSTANCE_ID_CHAR_POOL[Math.floor(Math.random() * globals.INSTANCE_ID_CHAR_POOL.length)];
                 }
                 return id;
-            })());
+            })()
+            const singletons = ServerBootstrapper.singletons(logger, instanceId);
+
+            app.use(express.json({limit: '10kb'}));
+
+            logger.info('LOG LEVEL IS: ' + args.logLevel);
+
             singletons.gameManager.timerManager = timerManager.instance;
             singletons.gameManager.eventManager = eventManager.instance;
             singletons.eventManager.timerManager = timerManager.instance;
             singletons.eventManager.gameManager = GameManager.instance;
 
+            //singletons.timerManager.setUpSignalHandler();
+            process.on( "SIGINT", function() {
+                console.log( "\ngracefully shutting down from SIGINT (Crtl-C)" );
+                process.exit();
+            } );
+
+            process.on( "exit", function() {
+                console.log( "never see this log message" );
+            } );
+
+            //process.kill(process.pid, "SIGTERM");
+
             try {
                 await singletons.eventManager.client.connect();
                 logger.info('Root Redis client connected');
-
             } catch(e) {
                 reject(new Error('UNABLE TO CONNECT TO REDIS because: '+ e));
             }

server/modules/Events.js

@@ -38,9 +38,9 @@ const Events = [
         id: EVENT_IDS.FETCH_GAME_STATE,
         stateChange: async (game, socketArgs, vars) => {
             const matchingPerson = vars.gameManager.findPersonByField(game, 'cookie', socketArgs.personId);
-            if (matchingPerson && matchingPerson.socketId !== vars.socketId) {
-                matchingPerson.socketId = vars.socketId;
-                vars.gameManager.namespace.sockets.get(vars.socketId)?.join(game.accessCode);
+            if (matchingPerson && matchingPerson.socketId !== vars.requestingSocketId) {
+                matchingPerson.socketId = vars.requestingSocketId;
+                vars.gameManager.namespace.sockets.get(vars.requestingSocketId)?.join(game.accessCode);
             }
         },
         communicate: async (game, socketArgs, vars) => {
@@ -202,9 +202,10 @@ const Events = [
         stateChange: async (game, socketArgs, vars) => {
             if (vars.instanceId !== vars.senderInstanceId
                 && vars.timerManager.timerThreads[game.accessCode]
-                && !vars.timerManager.timerThreads[game.accessCode].killed
             ) {
-                vars.timerManager.timerThreads[game.accessCode].kill();
+                if (!vars.timerManager.timerThreads[game.accessCode].killed) {
+                    vars.timerManager.timerThreads[game.accessCode].kill();
+                }
                 delete vars.timerManager.timerThreads[game.accessCode];
             }
         },
@@ -220,33 +221,33 @@ const Events = [
         stateChange: async (game, socketArgs, vars) => {},
         communicate: async (game, socketArgs, vars) => {
             const thread = vars.timerManager.timerThreads[game.accessCode];
-            if (thread && (!thread.killed && thread.exitCode === null)) {
-                thread.send({
-                    command: vars.timerEventSubtype,
-                    accessCode: game.accessCode,
-                    socketId: vars.socketId,
-                    logLevel: vars.logger.logLevel
-                });
-            } else if (thread) {
-                if (vars.timerEventSubtype === EVENT_IDS.GET_TIME_REMAINING && game.timerParams && game.timerParams.timeRemaining === 0) {
-                    // vars.gameManager.namespace.to(vars.socketId)
-                    //     .emit(globals.GAME_PROCESS_COMMANDS.GET_TIME_REMAINING, game.timerParams.timeRemaining, game.timerParams.paused);
-                    // await vars.eventManager.publisher.publish(
-                    //     globals.REDIS_CHANNELS.ACTIVE_GAME_STREAM,
-                    //     game.accessCode + ';' + globals.EVENT_IDS.SHARE_TIME_REMAINING + ';' +
-                    //     JSON.stringify({
-                    //         socketId: vars.socketId,
-                    //         timeRemaining: game.timerParams.timeRemaining,
-                    //         paused: game.timerParams.paused
-                    //     }) +
-                    //     ';' + vars.instanceId
-                    // );
+            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(
+                            globals.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(
                     globals.REDIS_CHANNELS.ACTIVE_GAME_STREAM,
-                    game.accessCode + ';' + globals.EVENT_IDS.SOURCE_TIMER_EVENT + ';' +
-                    JSON.stringify({ socketId: vars.socketId, timerEventSubtype: vars.timerEventSubtype }) + ';' + vars.instanceId
+                    vars.eventManager.createMessageToPublish(
+                        game.accessCode,
+                        globals.EVENT_IDS.SOURCE_TIMER_EVENT,
+                        vars.instanceId,
+                        JSON.stringify({ socketId: vars.requestingSocketId, timerEventSubtype: vars.timerEventSubtype })
+                    )
                 );
             }
         }
@@ -258,37 +259,35 @@ const Events = [
         stateChange: async (game, socketArgs, vars) => {},
         communicate: async (game, socketArgs, vars) => {
             const thread = vars.timerManager.timerThreads[game.accessCode];
-            if (thread && (!thread.killed && thread.exitCode === null)) {
-                thread.send({
-                    command: socketArgs.timerEventSubtype,
-                    accessCode: game.accessCode,
-                    socketId: socketArgs.socketId,
-                    logLevel: vars.logger.logLevel
-                });
-            } else if (thread) {
-                if (game.timerParams && game.timerParams.timeRemaining === 0) {
-                    vars.gameManager.namespace.to(vars.socketId)
-                        .emit(globals.GAME_PROCESS_COMMANDS.GET_TIME_REMAINING, game.timerParams.timeRemaining, game.timerParams.paused);
-                }
-                await vars.eventManager.publisher.publish(
-                    globals.REDIS_CHANNELS.ACTIVE_GAME_STREAM,
-                    game.accessCode + ';' + globals.EVENT_IDS.SHARE_TIME_REMAINING + ';' +
-                    JSON.stringify({
+            if (thread) {
+                if (!thread.killed && thread.exitCode === null) {
+                    thread.send({
+                        command: socketArgs.timerEventSubtype,
+                        accessCode: game.accessCode,
                         socketId: socketArgs.socketId,
-                        timeRemaining: game.timerParams.timeRemaining,
-                        paused: game.timerParams.paused
-                    }) +
-                    ';' + vars.instanceId
-                );
+                        logLevel: vars.logger.logLevel
+                    });
+                } else {
+                    await vars.eventManager.publisher.publish(
+                        globals.REDIS_CHANNELS.ACTIVE_GAME_STREAM,
+                        vars.eventManager.createMessageToPublish(
+                            game.accessCode,
+                            socketArgs.timerEventSubtype,
+                            vars.instanceId,
+                            JSON.stringify({
+                                socketId: socketArgs.socketId,
+                                timeRemaining: game.timerParams.timeRemaining,
+                                paused: game.timerParams.paused
+                            })
+                        )
+                    );
+                }
             }
         }
     },
     {
         id: EVENT_IDS.END_TIMER,
         stateChange: async (game, socketArgs, vars) => {
-            if (vars.timerManager.timerThreads[game.accessCode]) {
-                delete vars.timerManager.timerThreads[game.accessCode];
-            }
             game.timerParams.paused = false;
             game.timerParams.timeRemaining = 0;
         },
@@ -318,9 +317,7 @@ const Events = [
     },
     {
         id: EVENT_IDS.GET_TIME_REMAINING,
-        stateChange: async (game, socketArgs, vars) => {
-            game.timerParams.timeRemaining = socketArgs.timeRemaining;
-        },
+        stateChange: async (game, socketArgs, vars) => {},
         communicate: async (game, socketArgs, vars) => {
             const socket = vars.gameManager.namespace.sockets.get(socketArgs.socketId);
             if (socket) {

server/modules/singletons/EventManager.js

@@ -34,33 +34,53 @@ class EventManager {
         this.subscriber = this.client.duplicate();
         await this.subscriber.connect();
         await this.subscriber.subscribe(globals.REDIS_CHANNELS.ACTIVE_GAME_STREAM, async (message) => {
-            this.logger.info('MESSAGE: ' + message);
-            const messageComponents = message.split(';');
-            if (messageComponents[messageComponents.length - 1] === this.instanceId) {
-                this.logger.trace('Disregarding self-authored message');
+            this.logger.debug('MESSAGE: ' + message);
+            let messageComponents, args;
+            try {
+                messageComponents = message.split(';', 3);
+                if (messageComponents[messageComponents.length - 1] === this.instanceId) {
+                    this.logger.trace('Disregarding self-authored message');
+                    return;
+                }
+                args = JSON.parse(
+                    message.slice(
+                        message.indexOf(messageComponents[messageComponents.length - 1]) + (globals.INSTANCE_ID_LENGTH + 1)
+                    )
+                )
+            } catch(e) {
+                this.logger.error('MALFORMED MESSAGE RESULTED IN ERROR: ' + e + '; DISREGARDING');
                 return;
             }
-            const game = await gameManager.getActiveGame(messageComponents[0]);
-            let args;
-            if (messageComponents[2]) {
-                args = JSON.parse(messageComponents[2]);
-            }
-            if (game) {
-                await eventManager.handleEventById(
-                    messageComponents[1],
-                    messageComponents[messageComponents.length - 1],
-                    game,
-                    null,
-                    game?.accessCode || messageComponents[0],
-                    args || null,
-                    null,
-                    true
-                );
+            if (messageComponents) {
+                const game = await gameManager.getActiveGame(messageComponents[0]);
+                if (game) {
+                    await eventManager.handleEventById(
+                        messageComponents[1],
+                        messageComponents[messageComponents.length - 1],
+                        game,
+                        null,
+                        game?.accessCode || messageComponents[0],
+                        args || null,
+                        null,
+                        true
+                    );
+                }
             }
         });
         this.logger.info('EVENT MANAGER - CREATED SUBSCRIBER');
     }
 
+    createMessageToPublish = (...args) => {
+        let message = '';
+        for (let i = 0; i < args.length; i ++) {
+            message += args[i];
+            if (i !== args.length - 1) {
+                message += ';';
+            }
+        }
+        return message;
+    }
+
     createSocketServer = (main, app, port, logger) => {
         let io;
         if (process.env.NODE_ENV.trim() === 'development') {
@@ -115,19 +135,19 @@ class EventManager {
             await this.gameManager.refreshGame(game);
             await this.publisher?.publish(
                 globals.REDIS_CHANNELS.ACTIVE_GAME_STREAM,
-                game.accessCode + ';' + eventId + ';' + JSON.stringify(socketArgs) + ';' + this.instanceId
+                this.createMessageToPublish(game.accessCode, eventId, this.instanceId, JSON.stringify(socketArgs))
             );
         }
     }
 
-    handleEventById = async (eventId, senderInstanceId, game, socketId, accessCode, socketArgs, ackFn, syncOnly, timerEventSubtype = null) => {
+    handleEventById = async (eventId, senderInstanceId, game, requestingSocketId, accessCode, socketArgs, ackFn, syncOnly, timerEventSubtype = null) => {
         this.logger.trace('ARGS TO HANDLER: ' + JSON.stringify(socketArgs));
         const event = Events.find((event) => event.id === eventId);
         const additionalVars = {
             gameManager: this.gameManager,
             timerManager: this.timerManager,
             eventManager: this,
-            socketId: socketId,
+            requestingSocketId: requestingSocketId,
             ackFn: ackFn,
             logger: this.logger,
             instanceId: this.instanceId,

server/modules/singletons/GameManager.js

@@ -22,6 +22,12 @@ class GameManager {
 
     getActiveGame = async (accessCode) => {
         const r = await this.eventManager.client.get(accessCode);
+        if (r === null && this.timerManager.timerThreads[accessCode]) {
+            if (!this.timerManager.timerThreads[accessCode].killed) {
+                this.timerManager.timerThreads[accessCode].kill();
+            }
+            delete this.timerManager.timerThreads[accessCode];
+        }
         return r === null ? r : JSON.parse(r);
     }
 
@@ -31,7 +37,10 @@ class GameManager {
 
     refreshGame = async (game) => {
         this.logger.debug('PUSHING REFRESH OF ' + game.accessCode);
-        await this.eventManager.client.set(game.accessCode, JSON.stringify(game));
+        await this.eventManager.client.set(game.accessCode, JSON.stringify(game), {
+            KEEPTTL: true,
+            XX: true // only set the key if it already exists
+        });
     }
 
     createGame = async (gameParams) => {
@@ -52,7 +61,9 @@ class GameManager {
             console.log(moderator);
             moderator.assigned = true;
             if (req.timerParams !== null) {
-                req.timerParams.paused = false;
+                req.timerParams.paused = true;
+                req.timerParams.timeRemaining = convertFromHoursToMilliseconds(req.timerParams.hours)
+                    + convertFromMinutesToMilliseconds(req.timerParams.minutes);
             }
             const newGame = new Game(
                 newAccessCode,
@@ -161,7 +172,7 @@ class GameManager {
         ) {
             return Promise.reject({ status: 400, reason: 'There are too many people already spectating.' });
         } else if (joinAsSpectator) {
-            return await addSpectator(game, name, this.logger, this.namespace, this.eventManager.publisher, this.instanceId, this.refreshGame);
+            return await addSpectator(game, name, this.logger, this.namespace, this.eventManager, this.instanceId, this.refreshGame);
         }
         const unassignedPerson = this.findPersonByField(game, 'id', game.currentModeratorId).assigned === false
             ? this.findPersonByField(game, 'id', game.currentModeratorId)
@@ -179,14 +190,19 @@ class GameManager {
             );
             await this.eventManager.publisher?.publish(
                 globals.REDIS_CHANNELS.ACTIVE_GAME_STREAM,
-                game.accessCode + ';' + globals.EVENT_IDS.PLAYER_JOINED + ';' + JSON.stringify(unassignedPerson) + ';' + this.instanceId
+                this.eventManager.createMessageToPublish(
+                    game.accessCode,
+                    globals.EVENT_IDS.PLAYER_JOINED,
+                    this.instanceId,
+                    JSON.stringify(unassignedPerson)
+                )
             );
             return Promise.resolve(unassignedPerson.cookie);
         } else {
             if (game.people.filter(person => person.userType === globals.USER_TYPES.SPECTATOR).length === globals.MAX_SPECTATORS) {
                 return Promise.reject({ status: 400, reason: 'This game has reached the maximum number of players and spectators.' });
             }
-            return await addSpectator(game, name, this.logger, this.namespace, this.eventManager.publisher, this.instanceId, this.refreshGame);
+            return await addSpectator(game, name, this.logger, this.namespace, this.eventManager, this.instanceId, this.refreshGame);
         }
     };
 
@@ -235,13 +251,20 @@ class GameManager {
         game.status = globals.STATUS.IN_PROGRESS;
         if (game.hasTimer) {
             game.timerParams.paused = true;
+            game.timerParams.timeRemaining = convertFromHoursToMilliseconds(game.timerParams.hours)
+                + convertFromMinutesToMilliseconds(game.timerParams.minutes);
             await this.timerManager.runTimer(game, namespace, this.eventManager, this);
         }
 
         await this.refreshGame(game);
         await this.eventManager.publisher?.publish(
             globals.REDIS_CHANNELS.ACTIVE_GAME_STREAM,
-            game.accessCode + ';' + globals.EVENT_IDS.RESTART_GAME + ';' + JSON.stringify({}) + ';' + this.instanceId
+            this.eventManager.createMessageToPublish(
+                game.accessCode,
+                globals.EVENT_IDS.RESTART_GAME,
+                this.instanceId,
+                '{}'
+            )
         );
         namespace.in(game.accessCode).emit(globals.EVENT_IDS.RESTART_GAME);
     };
@@ -349,7 +372,7 @@ function getGameSize (cards) {
     return quantity;
 }
 
-async function addSpectator (game, name, logger, namespace, publisher, instanceId, refreshGame) {
+async function addSpectator (game, name, logger, namespace, eventManager, instanceId, refreshGame) {
     const spectator = new Person(
         createRandomId(),
         createRandomId(),
@@ -363,11 +386,24 @@ async function addSpectator (game, name, logger, namespace, publisher, instanceI
         globals.EVENT_IDS.ADD_SPECTATOR,
         GameStateCurator.mapPerson(spectator)
     );
-    await publisher.publish(
+    await eventManager.publisher.publish(
         globals.REDIS_CHANNELS.ACTIVE_GAME_STREAM,
-        game.accessCode + ';' + globals.EVENT_IDS.ADD_SPECTATOR + ';' + JSON.stringify(GameStateCurator.mapPerson(spectator)) + ';' + instanceId
+        eventManager.createMessageToPublish(
+            game.accessCode,
+            globals.EVENT_IDS.ADD_SPECTATOR,
+            instanceId,
+            JSON.stringify(GameStateCurator.mapPerson(spectator))
+        )
     );
     return Promise.resolve(spectator.cookie);
 }
 
+function convertFromMinutesToMilliseconds (minutes) {
+    return minutes * 60 * 1000;
+}
+
+function convertFromHoursToMilliseconds (hours) {
+    return hours * 60 * 60 * 1000;
+}
+
 module.exports = GameManager;

server/modules/singletons/TimerManager.js

@@ -15,6 +15,12 @@ class TimerManager {
         TimerManager.instance = this;
     }
 
+    setUpSignalHandler = () => {
+        process.on('SIGTERM', (code) => {
+            console.log('received sigterm');
+        });
+    }
+
     runTimer = async (game, namespace, eventManager, gameManager) => {
         this.logger.debug('running timer for game ' + game.accessCode);
         const gameProcess = fork(path.join(__dirname, '../GameProcess.js'));
@@ -26,7 +32,7 @@ class TimerManager {
             await gameManager.refreshGame(game);
             await eventManager.publisher.publish(
                 globals.REDIS_CHANNELS.ACTIVE_GAME_STREAM,
-                game.accessCode + ';' + msg.command + ';' + JSON.stringify(msg) + ';' + this.instanceId
+                eventManager.createMessageToPublish(game.accessCode, msg.command, this.instanceId, JSON.stringify(msg))
             );
         });