External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: improved fix command to support idle response timeout, enabled idle timeout for games with AI (related to #4590);

Browse source
This commit is contained in:
Oleg Agafonov 2024-09-09 10:40:43 +04:00
parent 2f9ba6dba9
commit 8064b7b372
1 changed files with 46 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

94
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -2,7 +2,6 @@ package mage.server.game;
import mage.MageException; import mage.MageException;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.PassAbility;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.Cards; import mage.cards.Cards;
import mage.choices.Choice; import mage.choices.Choice;
@ -57,9 +56,10 @@ public class GameController implements GameCallback {
private ScheduledExecutorService JOIN_WAITING_EXECUTOR = null; private ScheduledExecutorService JOIN_WAITING_EXECUTOR = null;
private ScheduledFuture<?> futureTimeout; private ScheduledFuture<?> responseIdleTimeoutFuture;
private UUID responseIdleTimeoutPlayerId;
private final ManagerFactory managerFactory; private final ManagerFactory managerFactory;
protected final ScheduledExecutorService timeoutIdleExecutor; protected final ScheduledExecutorService responseIdleTimeoutExecutor;
private final ConcurrentMap<UUID, GameSessionPlayer> gameSessions = new ConcurrentHashMap<>(); private final ConcurrentMap<UUID, GameSessionPlayer> gameSessions = new ConcurrentHashMap<>();
private final ReadWriteLock gameSessionsLock = new ReentrantReadWriteLock(); private final ReadWriteLock gameSessionsLock = new ReentrantReadWriteLock();
@ -76,7 +76,7 @@ public class GameController implements GameCallback {
private final UUID tableId; private final UUID tableId;
private final UUID choosingPlayerId; private final UUID choosingPlayerId;
private Future<?> gameFuture; private Future<?> gameFuture;
private boolean useTimeout = true; private boolean useResponseIdleTimeout = true; // control currently active player (if no response for 600 seconds then concede him)
private final GameOptions gameOptions; private final GameOptions gameOptions;
private UUID userRequestingRollback; private UUID userRequestingRollback;
@ -86,7 +86,7 @@ public class GameController implements GameCallback {
public GameController(ManagerFactory managerFactory, Game game, ConcurrentMap<UUID, UUID> userPlayerMap, UUID tableId, UUID choosingPlayerId, GameOptions gameOptions) { public GameController(ManagerFactory managerFactory, Game game, ConcurrentMap<UUID, UUID> userPlayerMap, UUID tableId, UUID choosingPlayerId, GameOptions gameOptions) {
this.managerFactory = managerFactory; this.managerFactory = managerFactory;
gameExecutor = managerFactory.threadExecutor().getGameExecutor(); gameExecutor = managerFactory.threadExecutor().getGameExecutor();
timeoutIdleExecutor = managerFactory.threadExecutor().getTimeoutIdleExecutor(); responseIdleTimeoutExecutor = managerFactory.threadExecutor().getTimeoutIdleExecutor();
gameSessionId = UUID.randomUUID(); gameSessionId = UUID.randomUUID();
this.userPlayerMap = userPlayerMap; this.userPlayerMap = userPlayerMap;
chatId = managerFactory.chatManager().createChatSession("Game " + game.getId()); chatId = managerFactory.chatManager().createChatSession("Game " + game.getId());
@ -96,13 +96,12 @@ public class GameController implements GameCallback {
this.tableId = tableId; this.tableId = tableId;
this.choosingPlayerId = choosingPlayerId; this.choosingPlayerId = choosingPlayerId;
this.gameOptions = gameOptions; this.gameOptions = gameOptions;
useTimeout = game.getPlayers().values().stream().allMatch(Player::isHuman); this.useResponseIdleTimeout = game.getPlayers().values().stream().anyMatch(Player::isHuman);
init(); init();
} }
public void cleanUp() { public void cleanUp() {
cancelTimeout(); stopResponseIdleTimeout();
for (PriorityTimer priorityTimer : timers.values()) { for (PriorityTimer priorityTimer : timers.values()) {
priorityTimer.cancel(); priorityTimer.cancel();
} }
@ -351,7 +350,7 @@ public class GameController implements GameCallback {
if (game.getState().getChoosingPlayerId() != null) { if (game.getState().getChoosingPlayerId() != null) {
// start timer to force player to choose starting player otherwise loosing by being idle // start timer to force player to choose starting player otherwise loosing by being idle
setupTimeout(game.getState().getChoosingPlayerId()); startResponseIdleTimeout(game.getState().getChoosingPlayerId());
} }
} }
} }
@ -753,12 +752,12 @@ public class GameController implements GameCallback {
} }
} }
public void idleTimeout(UUID playerId) { public void onResponseIdleTimeout(UUID playerId) {
Player player = game.getPlayer(playerId); Player player = game.getPlayer(playerId);
if (player != null) { if (player != null) {
String sb = player.getLogName() String sb = player.getLogName()
+ " has timed out (player had priority and was not active for " + " has timed out (player had priority and was not active for "
+ managerFactory.configSettings().getMaxSecondsIdle() + " seconds ) - Auto concede."; + getResponseIdleTimeoutSecs() + " seconds ) - Auto concede.";
managerFactory.chatManager().broadcast(chatId, "", sb, MessageColor.BLACK, true, game, MessageType.STATUS, null); managerFactory.chatManager().broadcast(chatId, "", sb, MessageColor.BLACK, true, game, MessageType.STATUS, null);
game.idleTimeout(playerId); game.idleTimeout(playerId);
} }
@ -1025,7 +1024,7 @@ public class GameController implements GameCallback {
} }
if (gameSessions.containsKey(realPlayerController.getId())) { if (gameSessions.containsKey(realPlayerController.getId())) {
setupTimeout(realPlayerController.getId()); startResponseIdleTimeout(realPlayerController.getId());
command.execute(realPlayerController.getId()); command.execute(realPlayerController.getId());
} }
// TODO: if watcher disconnects then game freezes with active timer, must be fix for such use case // TODO: if watcher disconnects then game freezes with active timer, must be fix for such use case
@ -1050,14 +1049,14 @@ public class GameController implements GameCallback {
// then execute only your action // then execute only your action
if (game.getPriorityPlayerId() == null || game.getPriorityPlayerId().equals(playerId)) { if (game.getPriorityPlayerId() == null || game.getPriorityPlayerId().equals(playerId)) {
if (gameSessions.containsKey(playerId)) { if (gameSessions.containsKey(playerId)) {
cancelTimeout(); stopResponseIdleTimeout();
command.execute(playerId); command.execute(playerId);
} }
} else { } else {
// otherwise execute the action under other player's control // otherwise execute the action under other player's control
for (UUID controlled : player.getPlayersUnderYourControl()) { for (UUID controlled : player.getPlayersUnderYourControl()) {
if (gameSessions.containsKey(controlled) && game.getPriorityPlayerId().equals(controlled)) { if (gameSessions.containsKey(controlled) && game.getPriorityPlayerId().equals(controlled)) {
cancelTimeout(); stopResponseIdleTimeout();
command.execute(controlled); command.execute(controlled);
} }
} }
@ -1070,23 +1069,29 @@ public class GameController implements GameCallback {
} }
} }
private void setupTimeout(final UUID playerId) { private void startResponseIdleTimeout(final UUID playerId) {
if (!useTimeout) { if (!useResponseIdleTimeout) {
return; return;
} }
cancelTimeout(); stopResponseIdleTimeout();
futureTimeout = timeoutIdleExecutor.schedule( responseIdleTimeoutPlayerId = playerId;
() -> idleTimeout(playerId), responseIdleTimeoutFuture = responseIdleTimeoutExecutor.schedule(
Main.isTestMode() ? 3600 : managerFactory.configSettings().getMaxSecondsIdle(), () -> onResponseIdleTimeout(playerId),
getResponseIdleTimeoutSecs(),
TimeUnit.SECONDS TimeUnit.SECONDS
); );
} }
private void cancelTimeout() { private long getResponseIdleTimeoutSecs() {
return Main.isTestMode() ? 3600 : managerFactory.configSettings().getMaxSecondsIdle();
}
private void stopResponseIdleTimeout() {
logger.debug("cancelTimeout"); logger.debug("cancelTimeout");
if (futureTimeout != null) { if (responseIdleTimeoutFuture != null) {
synchronized (futureTimeout) { synchronized (responseIdleTimeoutFuture) {
futureTimeout.cancel(false); responseIdleTimeoutFuture.cancel(false);
responseIdleTimeoutPlayerId = null;
} }
} }
} }
@ -1141,6 +1146,7 @@ public class GameController implements GameCallback {
// find actual timers before send data // find actual timers before send data
updatePriorityTimers(); updatePriorityTimers();
// TODO: add data consistence check here: is game view is same for all game cycles?
return gameSessions.get(playerId); return gameSessions.get(playerId);
} }
@ -1251,13 +1257,13 @@ public class GameController implements GameCallback {
} }
sb.append("<br>Future Timeout:"); sb.append("<br>Future Timeout:");
if (futureTimeout != null) { if (responseIdleTimeoutFuture != null) {
sb.append("Cancelled?="); sb.append("Cancelled?=");
sb.append(futureTimeout.isCancelled()); sb.append(responseIdleTimeoutFuture.isCancelled());
sb.append(",,,Done?="); sb.append(",,,Done?=");
sb.append(futureTimeout.isDone()); sb.append(responseIdleTimeoutFuture.isDone());
sb.append(",,,GetDelay?="); sb.append(",,,GetDelay?=");
sb.append((int) futureTimeout.getDelay(TimeUnit.SECONDS)); sb.append((int) responseIdleTimeoutFuture.getDelay(TimeUnit.SECONDS));
} else { } else {
sb.append("Not using future Timeout!"); sb.append("Not using future Timeout!");
} }
@ -1339,31 +1345,23 @@ public class GameController implements GameCallback {
List<String> fixActions = new ArrayList<>(); // for logs info List<String> fixActions = new ArrayList<>(); // for logs info
// fix active // fix active
fixedAlready = fixPlayer(game.getPlayer(state.getActivePlayerId()), state, "active", sb, fixActions, fixedAlready); fixedAlready = fixPlayer(game.getPlayer(state.getActivePlayerId()), state, "active", sb, fixActions, fixedAlready, false);
// fix lost choosing dialog // fix lost choosing dialog
fixedAlready = fixPlayer(game.getPlayer(state.getChoosingPlayerId()), state, "choosing", sb, fixActions, fixedAlready); fixedAlready = fixPlayer(game.getPlayer(state.getChoosingPlayerId()), state, "choosing", sb, fixActions, fixedAlready, false);
// fix lost priority // fix lost priority
fixedAlready = fixPlayer(game.getPlayer(state.getPriorityPlayerId()), state, "priority", sb, fixActions, fixedAlready); fixedAlready = fixPlayer(game.getPlayer(state.getPriorityPlayerId()), state, "priority", sb, fixActions, fixedAlready, false);
// fix timeout // fix response idle timeout (if player has good connection, but can't response)
sb.append("<br>Fixing future timeout: "); sb.append("<br>Fixing response idle timeout: ");
if (futureTimeout != null) { if (responseIdleTimeoutFuture != null) {
sb.append("cancelled?=").append(futureTimeout.isCancelled()); int delay = (int) responseIdleTimeoutFuture.getDelay(TimeUnit.SECONDS);
sb.append("...done?=").append(futureTimeout.isDone());
int delay = (int) futureTimeout.getDelay(TimeUnit.SECONDS);
sb.append("...getDelay?=").append(delay);
if (delay < 25) { if (delay < 25) {
fixActions.add("future timeout fix"); fixedAlready = fixPlayer(game.getPlayer(responseIdleTimeoutPlayerId), state, "response idle", sb, fixActions, fixedAlready, true);
sb.append("<br><font color='red'>WARNING, future timeout delay < 25</font>");
sb.append("<br>Try to pass...");
PassAbility pass = new PassAbility();
game.endTurn(pass);
sb.append(" (").append(asWarning("OK")).append(", pass done)");
} else { } else {
sb.append(" (").append(asGood("OK")).append(", delay > 25)"); sb.append(" (").append(asGood("OK")).append(String.format(", allow to idle %d of %d secs",
delay, getResponseIdleTimeoutSecs()));
} }
} else { } else {
sb.append(" (").append(asGood("OK")).append(", timeout is not using)"); sb.append(" (").append(asGood("OK")).append(", timeout is not using)");
@ -1385,9 +1383,9 @@ public class GameController implements GameCallback {
return sb.toString(); return sb.toString();
} }
private boolean fixPlayer(Player player, GameState state, String fixType, StringBuilder sb, List<String> fixActions, boolean fixedAlready) { private boolean fixPlayer(Player player, GameState state, String fixType, StringBuilder sb, List<String> fixActions, boolean fixedAlready, boolean forceToConcede) {
sb.append("<br>Fixing ").append(fixType).append(" player: ").append(getName(player)); sb.append("<br>Fixing ").append(fixType).append(" player: ").append(getName(player));
if (player != null && !player.canRespond()) { if (player != null && (forceToConcede || !player.canRespond())) {
fixActions.add(fixType + " fix"); fixActions.add(fixType + " fix");
sb.append("<br><font color='red'>WARNING, ").append(fixType).append(" player can't respond.</font>"); sb.append("<br><font color='red'>WARNING, ").append(fixType).append(" player can't respond.</font>");