chg: usr: re-implement the waiting for opponent dialog - refactor its gfx - & add online user selection dialog #4

src/Util/TopicManager.php

@@ -16,6 +16,7 @@ use App\Entity\PlayedGame;
 use App\Entity\Step;
 use App\Entity\User;
 use App\Interfaces\TopicManagerInterface;
+use DateTimeInterface;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
@@ -83,10 +84,42 @@ class TopicManager implements TopicManagerInterface
         } catch (JsonException $e) {
             throw new RuntimeException($e->getMessage());
         }
+
+        // ── Lobby updates ──────────────────────────────────────────────────
+        if ($count === 1) {
+            // One player waiting — mark as active and announce to the lobby
+            $playedGame->setUpdated(new DateTime());
+            $this->entityManager->persist($playedGame);
+            $this->entityManager->flush();
+
+            $displayName = $users['red'] ?: $users['redAnon'] ?: $users['blue'] ?: $users['blueAnon'] ?: 'Unknown';
+            $this->publishToLobby([
+                'action'    => 'join',
+                'gameAssoc' => $gameAssoc,
+                'name'      => $displayName,
+                'since'     => $playedGame->getCreated()?->format(DateTimeInterface::ATOM) ?? '',
+            ]);
+        } elseif ($count === 2) {
+            // Both players joined — remove from lobby
+            $this->publishToLobby(['action' => 'leave', 'gameAssoc' => $gameAssoc]);
+        }
     }
 
     public function unSubscribe(string $gameAssoc, string $userName): void
     {
+        // If the game was still waiting for a second player, stamp it as abandoned
+        // so it no longer appears in the waiting-games query, and remove from lobby.
+        $playedGame = $this->getPlayedGame($gameAssoc);
+        if (null !== $playedGame) {
+            $users = $this->getUserCollection($playedGame);
+            if ($this->getPlayerCount($users) === 1) {
+                $playedGame->setUpdated(new DateTime('2000-01-01 00:00:00'));
+                $this->entityManager->persist($playedGame);
+                $this->entityManager->flush();
+                $this->publishToLobby(['action' => 'leave', 'gameAssoc' => $gameAssoc]);
+            }
+        }
+
         $topic = 'mineseeker/channel/' . $gameAssoc;
 
         $this->hub->publish(new Update(
@@ -490,4 +523,16 @@ class TopicManager implements TopicManagerInterface
             'blueAnon' => null !== $playedGame->getBlueAnon() ? $playedGame->getBlueAnon()->getUserName() : '',
         ];
     }
+
+    private function publishToLobby(array $data): void
+    {
+        try {
+            $this->hub->publish(new Update(
+                'mineseeker/lobby',
+                json_encode($data, JSON_THROW_ON_ERROR)
+            ));
+        } catch (JsonException $e) {
+            $this->logger->error('Lobby publish error: ' . $e->getMessage());
+        }
+    }
 }