+
+
+
+
+
diff --git a/client/webpack/webpack-dev.config.js b/client/webpack/webpack-dev.config.js
index a68125c..ab0d73a 100644
--- a/client/webpack/webpack-dev.config.js
+++ b/client/webpack/webpack-dev.config.js
@@ -6,7 +6,8 @@ module.exports = {
home: './client/src/scripts/home.js',
create: './client/src/scripts/create.js',
notFound: './client/src/scripts/notFound.js',
- howToUse: './client/src/scripts/howToUse.js'
+ howToUse: './client/src/scripts/howToUse.js',
+ join: './client/src/scripts/join.js'
},
output: {
path: path.resolve(__dirname, '../dist'),
diff --git a/client/webpack/webpack-prod.config.js b/client/webpack/webpack-prod.config.js
index a39d2fd..e0455b2 100644
--- a/client/webpack/webpack-prod.config.js
+++ b/client/webpack/webpack-prod.config.js
@@ -6,7 +6,9 @@ module.exports = {
game: './client/src/scripts/game.js',
home: './client/src/scripts/home.js',
create: './client/src/scripts/create.js',
- notFound: './client/src/scripts/notFound.js'
+ notFound: './client/src/scripts/notFound.js',
+ howToUse: './client/src/scripts/howToUse.js',
+ join: './client/src/scripts/join.js'
},
output: {
path: path.resolve(__dirname, '../dist'),
diff --git a/server/api/GamesAPI.js b/server/api/GamesAPI.js
index 2d89f3d..e81a348 100644
--- a/server/api/GamesAPI.js
+++ b/server/api/GamesAPI.js
@@ -27,7 +27,7 @@ const corsOptions = process.env.NODE_ENV.trim() === 'development'
};
router.use(cors(corsOptions));
-//router.options('/:code/players', cors(corsOptions));
+// router.options('/:code/players', cors(corsOptions));
if (process.env.NODE_ENV.trim() === 'production') { // in prod, limit clients to creating 5 games per 10 minutes.
router.use('/create', apiLimiter);
@@ -50,13 +50,14 @@ router.post('/create', function (req, res) {
});
router.get('/:code/availability', function (req, res) {
+ console.log(req.params.code);
const availabilityPromise = gameManager.checkAvailability(req.params.code);
availabilityPromise.then((result) => {
if (result === 404) {
res.status(404).send();
} else if (result instanceof Error) {
res.status(400).send(result.message);
- } else if (typeof result === 'string') {
+ } else if (typeof result === 'object') {
logger.debug(result);
res.status(200).send(result);
} else {
@@ -65,24 +66,44 @@ router.get('/:code/availability', function (req, res) {
});
});
-// router.patch('/:code/players', function (req, res) {
-// if (
-// req.body === null
-// || req.body.cookie === null
-// || (typeof req.body.cookie !== 'string' && req.body.cookie !== false)
-// || (req.body.cookie.length !== globals.USER_SIGNATURE_LENGTH && req.body.cookie !== false)
-// ) {
-// res.status(400).send();
-// }
-// gameManager.joinGame(req.body.cookie, req.params.code).then((data) => {
-// res.status(200).send(data);
-// }).catch((code) => {
-// res.status(code).send();
-// });
-// });
+router.patch('/:code/players', function (req, res) {
+ console.log(req.body);
+ if (
+ req.body === null
+ || !validateAccessCode(req.body.accessCode)
+ || !validateName(req.body.playerName)
+ ) {
+ res.status(400).send();
+ } else {
+ const game = gameManager.activeGameRunner.activeGames[req.body.accessCode];
+ if (game) {
+ gameManager.joinGame(game, req.body.playerName).then((data) => {
+ res.status(200).send({ cookie: data, environment: gameManager.environment });
+ }).catch((code) => {
+ res.status(code).send();
+ });
+ } else {
+ res.status(404).send();
+ }
+ }
+});
router.get('/environment', function (req, res) {
res.status(200).send(gameManager.environment);
});
+function validateName (name) {
+ return typeof name === 'string' && name.length > 0 && name.length <= 30;
+}
+
+// function validateCookie (cookie) {
+// return cookie === null
+// || (typeof cookie !== 'string' && cookie !== false)
+// || (cookie.length !== globals.USER_SIGNATURE_LENGTH && cookie !== false);
+// }
+
+function validateAccessCode (accessCode) {
+ return /^[a-zA-Z0-9]+$/.test(accessCode) && accessCode.length === globals.ACCESS_CODE_LENGTH;
+}
+
module.exports = router;
diff --git a/server/config/globals.js b/server/config/globals.js
index bfcdf3b..c544f7b 100644
--- a/server/config/globals.js
+++ b/server/config/globals.js
@@ -1,5 +1,5 @@
const globals = {
- ACCESS_CODE_CHAR_POOL: 'abcdefghijklmnopqrstuvwxyz0123456789',
+ ACCESS_CODE_CHAR_POOL: 'BCDFGHJKLMNPQRSTVWXYZ0123456789',
ACCESS_CODE_LENGTH: 6,
CLOCK_TICK_INTERVAL_MILLIS: 10,
STALE_GAME_HOURS: 12,
diff --git a/server/main.js b/server/main.js
index 7b067e8..ddb2faa 100644
--- a/server/main.js
+++ b/server/main.js
@@ -38,7 +38,6 @@ gameManager.namespace = inGameSocketServer;
inGameSocketServer.on('connection', function (socket) {
socket.on('disconnecting', (reason) => {
logger.trace('client socket disconnecting because: ' + reason);
- gameManager.removeClientFromLobbyIfApplicable(socket);
});
gameManager.addGameSocketHandlers(inGameSocketServer, socket);
});
diff --git a/server/modules/GameManager.js b/server/modules/GameManager.js
index b64f0ae..fd04b0e 100644
--- a/server/modules/GameManager.js
+++ b/server/modules/GameManager.js
@@ -157,7 +157,7 @@ class GameManager {
};
createGame = (gameParams) => {
- const expectedKeys = ['deck', 'hasTimer', 'timerParams'];
+ const expectedKeys = ['deck', 'hasTimer', 'timerParams', 'moderatorName'];
if (typeof gameParams !== 'object'
|| expectedKeys.some((key) => !Object.keys(gameParams).includes(key))
) {
@@ -167,7 +167,8 @@ class GameManager {
// to avoid excessive memory build-up, every time a game is created, check for and purge any stale games.
pruneStaleGames(this.activeGameRunner.activeGames, this.activeGameRunner.timerThreads, this.logger);
const newAccessCode = this.generateAccessCode();
- const moderator = initializeModerator(UsernameGenerator.generate(), gameParams.hasDedicatedModerator);
+ const moderator = initializeModerator(gameParams.moderatorName, gameParams.hasDedicatedModerator);
+ moderator.assigned = true;
if (gameParams.timerParams !== null) {
gameParams.timerParams.paused = false;
}
@@ -181,18 +182,18 @@ class GameManager {
gameParams.timerParams
);
this.activeGameRunner.activeGames[newAccessCode].createTime = new Date().toJSON();
- return Promise.resolve(newAccessCode);
+ return Promise.resolve({ accessCode: newAccessCode, cookie: moderator.cookie, environment: this.environment });
}
};
checkAvailability = (code) => {
- const game = this.activeGameRunner.activeGames[code];
+ const game = this.activeGameRunner.activeGames[code.toUpperCase()];
if (game) {
const unassignedPerson = game.people.find((person) => person.assigned === false);
if (!unassignedPerson) {
return Promise.resolve(new Error(globals.ERROR_MESSAGE.GAME_IS_FULL));
} else {
- return Promise.resolve(code);
+ return Promise.resolve({ accessCode: code, playerCount: getGameSize(game.deck), timerParams: game.timerParams });
}
} else {
return Promise.resolve(404);
@@ -253,30 +254,34 @@ class GameManager {
}
};
- joinGame = (game) => {
+ joinGame = (game, name) => {
+ if (isNameTaken(game, name)) {
+ return Promise.reject(400);
+ }
const unassignedPerson = game.moderator.assigned === false
? game.moderator
: game.people.find((person) => person.assigned === false);
if (unassignedPerson) {
this.logger.trace('request from client to join game. Assigning: ' + unassignedPerson.name);
unassignedPerson.assigned = true;
+ unassignedPerson.name = name;
game.isFull = isGameFull(game);
this.namespace.in(game.accessCode).emit(
globals.EVENTS.PLAYER_JOINED,
GameStateCurator.mapPerson(unassignedPerson),
game.isFull
);
- return unassignedPerson;
+ return Promise.resolve(unassignedPerson.cookie);
} else { // if the game is full, make them a spectator.
const spectator = new Person(
createRandomId(),
createRandomId(),
- UsernameGenerator.generate(),
+ name,
globals.USER_TYPES.SPECTATOR
);
this.logger.trace('new spectator: ' + spectator.name);
game.spectators.push(spectator);
- return spectator;
+ return Promise.resolve(spectator.cookie);
}
};
@@ -295,13 +300,7 @@ class GameManager {
ackFn(GameStateCurator.getGameStateFromPerspectiveOfPerson(game, matchingPerson, gameRunner, clientSocket, logger));
}
} else {
- const namespaceSockets = await namespace.in(accessCode).fetchSockets();
- if (!namespaceSockets.find((namespaceSocket) => namespaceSocket.id === clientSocket.id)) {
- let newlyAssignedPerson = this.joinGame(game);
- clientSocket.join(accessCode);
- newlyAssignedPerson.socketId = clientSocket.id;
- ackFn(GameStateCurator.getGameStateFromPerspectiveOfPerson(game, newlyAssignedPerson, gameRunner, clientSocket, logger));
- }
+ rejectClientRequestForGameState(ackFn);
}
} else {
rejectClientRequestForGameState(ackFn);
@@ -456,6 +455,15 @@ function pruneStaleGames (activeGames, timerThreads, logger) {
}
}
+function getGameSize (cards) {
+ let quantity = 0;
+ for (const card of cards) {
+ quantity += card.quantity;
+ }
+
+ return quantity;
+}
+
class Singleton {
constructor (logger, environment) {
if (!Singleton.instance) {
diff --git a/server/modules/ServerBootstrapper.js b/server/modules/ServerBootstrapper.js
index fdaaec6..a14ccb4 100644
--- a/server/modules/ServerBootstrapper.js
+++ b/server/modules/ServerBootstrapper.js
@@ -3,6 +3,7 @@ const http = require('http');
const https = require('https');
const path = require('path');
const fs = require('fs');
+const secure = require('express-force-https');
const ServerBootstrapper = {
processCLIArgs: () => {
@@ -55,6 +56,7 @@ const ServerBootstrapper = {
}
} else {
logger.warn('starting main in PRODUCTION mode. This should not be used for local development.');
+ app.use(secure);
main = http.createServer(app);
}
diff --git a/server/routes/router.js b/server/routes/router.js
index 9ec2a57..7ee7263 100644
--- a/server/routes/router.js
+++ b/server/routes/router.js
@@ -10,6 +10,10 @@ router.get('/create', function (request, response) {
response.sendFile(path.join(__dirname, '../../client/src/views/create.html'));
});
+router.get('/join/:code', function (request, response) {
+ response.sendFile(path.join(__dirname, '../../client/src/views/join.html'));
+});
+
router.get('/how-to-use', function (request, response) {
response.sendFile(path.join(__dirname, '../../client/src/views/how-to-use.html'));
});
+
+
+
+
+ Game
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+