Remove 60-second ready-status expiry so the group can always start
Ready status previously expired 60 seconds after a player checked the box, evaluated per-player against their own timestamp. Unless every player happened to click ready within the same 60-second window, the earliest player's readiness would silently expire before the last one joined, so the session could get stuck on "Waiting for all players to be ready" indefinitely, especially after a reload re-triggered the timeout check. Ready state is now durable: once checked, it stays until the player unchecks it or the whole group is simultaneously ready, at which point the session always transitions to PLAYING regardless of how long that took. session.timer is still only ever set once during that one-way READY -> PLAYING transition, so a reload never restarts or desyncs the countdown between players.
This commit is contained in:
@@ -131,27 +131,22 @@ final class GameController extends AbstractController
|
||||
return $this->redirectToRoute('game', ['session' => $session->getId()]);
|
||||
}
|
||||
|
||||
// Periodically check readiness timeout
|
||||
// Lazily pick up readiness changes from other players since our last request
|
||||
$dashboardService->checkAllPlayersReady($session);
|
||||
|
||||
if ($session->getStatus() === SessionStatus::READY) {
|
||||
$isReady = false;
|
||||
$readyAt = null;
|
||||
if ($player) {
|
||||
$settingName = SessionSettingType::tryFrom('ReadyAtForPlayer' . $player->getScreen());
|
||||
if ($settingName) {
|
||||
$setting = $session->getSettings()->filter(fn(SessionSetting $s) => $s->getName() === $settingName && $s->getPlayer() === $player)->first();
|
||||
if ($setting) {
|
||||
$isReady = true;
|
||||
$readyAt = (int)$setting->getValue();
|
||||
}
|
||||
$isReady = $setting !== null;
|
||||
}
|
||||
}
|
||||
|
||||
return $this->render('game/waiting.html.twig', [
|
||||
'session' => $session,
|
||||
'isReady' => $isReady,
|
||||
'readyAt' => $readyAt,
|
||||
'mercure_public_url' => $this->mercurePublicUrl,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -355,8 +355,6 @@ final class GameDashboardService
|
||||
}
|
||||
|
||||
$readyPlayersCount = 0;
|
||||
$now = new \DateTime();
|
||||
$anyReset = false;
|
||||
|
||||
/** @var \App\Game\Repository\SessionSettingRepository $settingRepo */
|
||||
$settingRepo = $this->entityManager->getRepository(SessionSetting::class);
|
||||
@@ -367,27 +365,8 @@ final class GameDashboardService
|
||||
continue;
|
||||
}
|
||||
|
||||
$setting = $settingRepo->getSetting($session, $settingName, $player);
|
||||
if ($setting) {
|
||||
$readyAtTimestamp = (int)$setting->getValue();
|
||||
// Check timeout: 1 minute = 60 seconds
|
||||
if (($now->getTimestamp() - $readyAtTimestamp) > 60) {
|
||||
$session->removeSetting($setting);
|
||||
$this->entityManager->remove($setting);
|
||||
$anyReset = true;
|
||||
} else {
|
||||
$readyPlayersCount++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($anyReset) {
|
||||
$this->entityManager->flush();
|
||||
try {
|
||||
$topic = '/game/hub/' . $session->getId();
|
||||
$this->hub->publish(new Update($topic, json_encode(['type' => 'player_ready'])));
|
||||
} catch (\Exception $e) {
|
||||
// Mercure might be down
|
||||
if ($settingRepo->getSetting($session, $settingName, $player)) {
|
||||
$readyPlayersCount++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user