mirror/liberty-bikes
2
0
Fork 0
mirror of https://github.com/OpenLiberty/liberty-bikes.git synced 2024-11-27 01:20:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add some defensive checks to account for pluggable AI

Browse Source
This commit is contained in:
Andrew Guibert 2019-10-08 19:41:23 -05:00
parent d1409d2716
commit 6772ca1c0e
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
game-service/src/main/java/org/libertybikes/game/core/GameRound.java
View File

@ -148,7 +148,8 @@ public class GameRound implements Runnable {
public void updatePlayerDirection(Session playerSession, InboundMessage msg) {
Client c = clients.get(playerSession);
c.player.ifPresent((p) -> p.setDirection(msg.direction));
if (c != null)
c.player.ifPresent((p) -> p.setDirection(msg.direction));
}
public boolean addPlayer(Session s, String playerId, String playerName, Boolean hasGameBoard) {
@ -170,9 +171,13 @@ public class GameRound implements Runnable {
return false;
}
if (getPlayers().size() + 1 >= Player.MAX_PLAYERS) {
int numPlayers = getPlayers().size() + 1;
if (numPlayers == Player.MAX_PLAYERS) {
gameState = State.FULL;
lobbyCountdown.gameFull();
} else if (numPlayers > Player.MAX_PLAYERS) {
log("Cannot add player " + playerId + " to game because the current round is full.");
return false;
}
Player p = board.addPlayer(playerId, playerName);

26
game-service/src/main/java/org/libertybikes/game/round/service/GameRoundWebsocket.java
View File

@ -10,6 +10,8 @@ import javax.enterprise.context.Dependent;
import javax.inject.Inject;
import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;
import javax.websocket.CloseReason;
import javax.websocket.CloseReason.CloseCodes;
import javax.websocket.OnClose;
import javax.websocket.OnMessage;
import javax.websocket.OnOpen;
@ -47,6 +49,9 @@ public class GameRoundWebsocket {
@OnOpen
public void onOpen(@PathParam("roundId") String roundId, Session session) {
log(roundId, "Opened a session");
session.setMaxTextMessageBufferSize(1000);
session.setMaxBinaryMessageBufferSize(1000);
session.setMaxIdleTimeout(90 * 1000);
timerContext = GameMetrics.timerStart(GameMetrics.openWebsocketTimerMetadata);
}
@ -92,18 +97,22 @@ public class GameRoundWebsocket {
round.startGame();
} else if (msg.direction != null) {
round.updatePlayerDirection(session, msg);
} else if (msg.playerJoinedId != null) {
} else if (msg.playerJoinedId != null && !msg.playerJoinedId.isEmpty()) {
// Call playerserver for player in DB
org.libertybikes.restclient.Player playerResponse = getPlayer(msg.playerJoinedId);
if (!round.addPlayer(session, msg.playerJoinedId, playerResponse.name, msg.hasGameBoard == null ? true : msg.hasGameBoard))
sendToClient(session, new OutboundMessage.ErrorEvent("Unable to add player " + playerResponse.name
+ " to game. This is probably because someone else with the same name is already in the game."));
if (playerResponse == null)
closeWithError(session, "Unable to add player " + msg.playerJoinedId +
" to game. This is probably because the player has not been registered with the game service yet.");
else if (!round.addPlayer(session, msg.playerJoinedId, playerResponse.name, msg.hasGameBoard == null ? true : msg.hasGameBoard))
closeWithError(session, "Unable to add player " + playerResponse.name
+ " to game. This is probably because someone else with the same name is already in the game.");
} else if (Boolean.TRUE == msg.isSpectator) {
round.addSpectator(session);
} else {
log(roundId, "ERR: Unrecognized message: " + jsonb.toJson(msg));
String invalidMsg = jsonb.toJson(msg);
log(roundId, "ERR: Unrecognized message: " + invalidMsg);
session.close(new CloseReason(CloseCodes.UNEXPECTED_CONDITION, "Unrecognized message: " + invalidMsg));
}
} catch (Exception e) {
log(roundId, "ERR: " + e.getMessage());
@ -111,6 +120,11 @@ public class GameRoundWebsocket {
}
}
private void closeWithError(Session session, String msg) throws IOException {
sendToClient(session, new OutboundMessage.ErrorEvent(msg));
session.close(new CloseReason(CloseCodes.UNEXPECTED_CONDITION, msg));
}
public static void sendToClient(Session client, Object message) {
if (client != null) {
String msg = message instanceof String ? (String) message : jsonb.toJson(message);