Move GamePrecond to its own file

kcgidw · May 23, 2020 · a37774b · a37774b
1 parent d5e61f0
commit a37774b
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 87 deletions.
diff --git a/src/server/game-precond.js b/src/server/game-precond.js
@@ -0,0 +1,87 @@
+import * as Lobby from './lobby.js';
+import GameError from './game-error.js';
+
+// Room/game state validators
+
+const GamePrecond = {
+	sockHasUser(sock) {
+		if (sock.user === undefined) {
+			throw new GameError('No user');
+		}
+	},
+	sockDoesNotHaveUser(sock) {
+		if (sock.user !== undefined) {
+			throw new GameError('Must not have user');
+		}
+	},
+	userIsInARoom(user) {
+		if (user.gameRoom === undefined) {
+			throw new GameError(`User ${user.name} should be in a room`, 'User must be in a room');
+		}
+	},
+	userIsNotInARoom(user) {
+		if (user.gameRoom !== undefined) {
+			throw new GameError(
+				'User must not be in a room. User is in room ' + user.gameRoom,
+				'User must not be in a room'
+			);
+		}
+	},
+	roomExists(roomCode) {
+		if (Lobby.getRoomByCode(roomCode) === undefined) {
+			throw new GameError(`Rm${roomCode} DNE`, 'This room is unavailable');
+		}
+	},
+	gameInProgress(room) {
+		if (!room.isGameInProgress()) {
+			throw new GameError('Game must be in progress');
+		}
+	},
+	gameNotInProgress(room) {
+		if (room.isGameInProgress()) {
+			throw new GameError(`Rm${room.roomCode} A game is already in progress`);
+		}
+	},
+	roomIsNotFull(room) {
+		if (room.isFull()) {
+			throw new GameError(`Rm${room.roomCode} is full`, 'This room is full', true);
+		}
+	},
+	lobbyIsNotFull() {
+		if (Lobby.isFull()) {
+			throw new GameError('The lobby is at max capacity');
+		}
+	},
+	isUsersTurn(user) {
+		let room = user.gameRoom;
+		if (room.whoseTurn() !== user) {
+			throw new GameError("Not user's turn");
+		}
+	},
+	nameIsNotTakenInRoom(username, room) {
+		if (room.findUser(username)) {
+			throw new GameError(
+				`Username ${username} is taken in Rm${room.roomCode}`,
+				'This username is taken in this room'
+			);
+		}
+	},
+	nameIsTakenInRoom(username, room) {
+		if (room.findUser(username) === undefined) {
+			throw new GameError(
+				`Username ${username} DNE in Rm${room.roomCode}`,
+				"This username doesn't exist in this room"
+			);
+		}
+	},
+	userIsDisconnected(username, room) {
+		if (!room.findUser(username).connected) {
+			throw new GameError(
+				`Username ${username} connected to Rm${room.roomCode}`,
+				'This username is taken in this room'
+			);
+		}
+	},
+};
+
+export default GamePrecond;
diff --git a/src/server/socket-handler.js b/src/server/socket-handler.js
@@ -1,12 +1,12 @@
+import GAME_PHASE from '../common/game-phase.js';
+import MESSAGE from '../common/message.js';
 import User from '../common/user.js';
+import debugLog from './debug-log.js';
+import GameError from './game-error.js';
+import GamePrecond from './game-precond';
 import { ClientAdapter } from './game-room.js';
-import * as Schema from './schema.js';
 import * as Lobby from './lobby.js';
-import GAME_PHASE from '../common/game-phase.js';
-import GameError from './game-error.js';
-import debugLog from './debug-log.js';
-
-import MESSAGE from '../common/message.js';
+import * as Schema from './schema.js';
 
 function handleSockets(io) {
 	io.on('connection', function(sock) {
@@ -191,87 +191,6 @@ function joinRoom(user, room, rejoin, isHost = false) {
 	return room;
 }
 
-const GamePrecond = {
-	sockHasUser(sock) {
-		if (sock.user === undefined) {
-			throw new GameError('No user');
-		}
-	},
-	sockDoesNotHaveUser(sock) {
-		if (sock.user !== undefined) {
-			throw new GameError('Must not have user');
-		}
-	},
-	userIsInARoom(user) {
-		if (user.gameRoom === undefined) {
-			throw new GameError(`User ${user.name} should be in a room`, 'User must be in a room');
-		}
-	},
-	userIsNotInARoom(user) {
-		if (user.gameRoom !== undefined) {
-			throw new GameError(
-				'User must not be in a room. User is in room ' + user.gameRoom,
-				'User must not be in a room'
-			);
-		}
-	},
-	roomExists(roomCode) {
-		if (Lobby.getRoomByCode(roomCode) === undefined) {
-			throw new GameError(`Rm${roomCode} DNE`, 'This room is unavailable');
-		}
-	},
-	gameInProgress(room) {
-		if (!room.isGameInProgress()) {
-			throw new GameError('Game must be in progress');
-		}
-	},
-	gameNotInProgress(room) {
-		if (room.isGameInProgress()) {
-			throw new GameError(`Rm${room.roomCode} A game is already in progress`);
-		}
-	},
-	roomIsNotFull(room) {
-		if (room.isFull()) {
-			throw new GameError(`Rm${room.roomCode} is full`, 'This room is full', true);
-		}
-	},
-	lobbyIsNotFull() {
-		if (Lobby.isFull()) {
-			throw new GameError('The lobby is at max capacity');
-		}
-	},
-	isUsersTurn(user) {
-		let room = user.gameRoom;
-		if (room.whoseTurn() !== user) {
-			throw new GameError("Not user's turn");
-		}
-	},
-	nameIsNotTakenInRoom(username, room) {
-		if (room.findUser(username)) {
-			throw new GameError(
-				`Username ${username} is taken in Rm${room.roomCode}`,
-				'This username is taken in this room'
-			);
-		}
-	},
-	nameIsTakenInRoom(username, room) {
-		if (room.findUser(username) === undefined) {
-			throw new GameError(
-				`Username ${username} DNE in Rm${room.roomCode}`,
-				"This username doesn't exist in this room"
-			);
-		}
-	},
-	userIsDisconnected(username, room) {
-		if (!room.findUser(username).connected) {
-			throw new GameError(
-				`Username ${username} connected to Rm${room.roomCode}`,
-				'This username is taken in this room'
-			);
-		}
-	},
-};
-
 // send roomstate update to all users, accounting for different roles (i.e., faker vs artist)
 function broadcastRoomState(io, room, messageName, addtlProcessFn) {
 	let state = ClientAdapter.generateStateJson(room);