new: usr: a new feature came up - the abandoned plays can be restored, if both users are registered users #7

src/Controller/GameController.php

@@ -12,16 +12,15 @@ namespace App\Controller;
 
 use App\Entity\ContactMessage;
 use App\Form\ContactFormType;
+use App\Service\Email\SendContactMailService;
+use App\Service\MercureJwtService;
+use App\Service\ResolveUserNamesService;
 use Doctrine\ORM\EntityManagerInterface;
-use Psr\Log\LoggerInterface;
-use RuntimeException;
-use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\AsController;
-use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
@@ -40,14 +39,12 @@ class GameController extends AbstractController
 {
     public function __construct(
         #[Autowire(env: 'APP_ENV')]
-        private readonly string          $env,
+        private readonly string                  $env,
         #[Autowire(env: 'MERCURE_PUBLIC_URL')]
-        private readonly string          $mercurePublicUrl,
-        #[Autowire(env: 'MERCURE_SUBSCRIBER_JWT')]
-        private readonly string          $mercureSubscriberJwt,
-        #[Autowire(env: 'APP_CONTACT_MAIL_ADDRESS')]
-        private readonly string          $appContactMailAddress,
-        private readonly LoggerInterface $logger,
+        private readonly string                  $mercurePublicUrl,
+        private readonly MercureJwtService       $mercureJwtService,
+        private readonly ResolveUserNamesService $opponentNameService,
+        private readonly SendContactMailService  $contactMailService,
     ) {
     }
 
@@ -59,12 +56,15 @@ class GameController extends AbstractController
 
     #[Route('/play', name: 'MineSeekerBundle_gamePlay')]
     #[Route('/play/{gameAssoc}', name: 'MineSeekerBundle_gamePlayWId')]
-    public function play(): Response
+    public function play(?string $gameAssoc = null): Response
     {
         return $this->render('Game/play.html.twig', [
             'env'                    => $this->env,
             'mercure_hub_url'        => $this->mercurePublicUrl,
-            'mercure_subscriber_jwt' => $this->mercureSubscriberJwt,
+            'mercure_subscriber_jwt' => $this->mercureJwtService->mintSubscriberToken(
+                $gameAssoc ?? '', $this->opponentNameService->resolveUserName(),
+            ),
+            'opponent_name'          => $this->opponentNameService->opponentName($gameAssoc),
         ]);
     }
 
@@ -92,9 +92,11 @@ class GameController extends AbstractController
 
         if ($form->isSubmitted() && $form->isValid()) {
             $contactMessage->setIpAddress($request->getClientIp());
+
             $em->persist($contactMessage);
             $em->flush();
-            $this->sendMail($mailer, $contactMessage);
+
+            $this->contactMailService->send($contactMessage);
             $this->addFlash('contact_success', 'Thank you for your message! We will get back to you soon.');
 
             return $this->redirectToRoute('MineSeekerBundle_contact');
@@ -116,31 +118,4 @@ class GameController extends AbstractController
     {
         return $this->render('Official/rules.html.twig');
     }
-
-    public function sendMail(MailerInterface $mailer, ContactMessage $contactMessage): void
-    {
-        try {
-            $mailer->send(
-                new TemplatedEmail()
-                    ->from('noreply@mineseeker.hu')
-                    ->to($this->appContactMailAddress)
-                    ->replyTo($contactMessage->getEmail())
-                    ->subject('New Contact Message from ' . $contactMessage->getName())
-                    ->htmlTemplate('emails/contact_notification.html.twig')
-                    ->context(['message' => $contactMessage])
-            );
-        } catch (\Exception $e) {
-            $this->logger->error('Failed to send contact notification email: ' . $e->getMessage(), [
-                'exception' => $e,
-                'message'   => $contactMessage,
-            ]);
-            throw new RuntimeException('Failed to send contact notification email: ' . $e->getMessage());
-        } catch (TransportExceptionInterface $e) {
-            $this->logger->error('Failed to send contact notification email: ' . $e->getMessage(), [
-                'exception' => $e,
-                'message'   => $contactMessage,
-            ]);
-            throw new RuntimeException('Failed to send contact notification email: ' . $e->getMessage());
-        }
-    }
 }

src/Controller/MercureController.php

@@ -12,6 +12,7 @@ namespace App\Controller;
 
 use App\Entity\PlayedGame;
 use App\Repository\PlayedGameRepository;
+use App\Service\ResolveUserNamesService;
 use App\Util\RpcManager;
 use App\Util\TopicManager;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -39,8 +40,9 @@ use Symfony\Component\Routing\Attribute\Route;
 class MercureController extends AbstractController
 {
     public function __construct(
-        private readonly TopicManager $topicManager,
-        private readonly RpcManager   $rpcManager,
+        private readonly TopicManager            $topicManager,
+        private readonly RpcManager              $rpcManager,
+        private readonly ResolveUserNamesService $userNamesService,
     ) {
     }
 
@@ -56,15 +58,18 @@ class MercureController extends AbstractController
     #[Route('/api/game/connect/{gameAssoc}', name: 'MineSeekerBundle_api_game_connect', methods: ['GET'])]
     public function connect(string $gameAssoc): Response
     {
-        $payload = $this->rpcManager->getConnectInformation($gameAssoc);
-
-        return new Response($payload, Response::HTTP_OK, ['Content-Type' => 'text/plain']);
+        try {
+            $payload = $this->rpcManager->getConnectInformation($gameAssoc);
+            return new Response($payload, Response::HTTP_OK, ['Content-Type' => 'text/plain']);
+        } catch (\Exception $e) {
+            return new Response('', Response::HTTP_INTERNAL_SERVER_ERROR);
+        }
     }
 
     #[Route('/api/game/join/{gameAssoc}', name: 'MineSeekerBundle_api_game_join', methods: ['POST'])]
-    public function join(string $gameAssoc, Request $request): JsonResponse
+    public function join(string $gameAssoc): JsonResponse
     {
-        $this->topicManager->subscribe($gameAssoc, $this->resolveUserName($request), $this->getUser(), $request);
+        $this->topicManager->subscribe($gameAssoc, $this->userNamesService->resolveUserName());
 
         return $this->json(['success' => true]);
     }
@@ -72,15 +77,15 @@ class MercureController extends AbstractController
     #[Route('/api/game/step/{gameAssoc}', name: 'MineSeekerBundle_api_game_step', methods: ['POST'])]
     public function step(string $gameAssoc, Request $request): JsonResponse
     {
-        $result = $this->topicManager->publish($gameAssoc, $this->resolveUserName($request), $request->toArray());
+        $result = $this->topicManager->publish($gameAssoc, $this->userNamesService->resolveUserName(), $request->toArray());
 
         return $this->json($result);
     }
 
     #[Route('/api/game/leave/{gameAssoc}', name: 'MineSeekerBundle_api_game_leave', methods: ['POST'])]
-    public function leave(string $gameAssoc, Request $request): JsonResponse
+    public function leave(string $gameAssoc): JsonResponse
     {
-        $this->topicManager->unSubscribe($gameAssoc, $this->resolveUserName($request));
+        $this->topicManager->unSubscribe($gameAssoc, $this->userNamesService->resolveUserName());
 
         return $this->json(['success' => true]);
     }
@@ -95,7 +100,11 @@ class MercureController extends AbstractController
         return $this->json(['success' => true]);
     }
 
-    #[Route('/api/game/challenge/respond/{challengerGameAssoc}', name: 'MineSeekerBundle_api_game_challenge_respond', methods: ['POST'])]
+    #[Route(
+        '/api/game/challenge/respond/{challengerGameAssoc}',
+        name: 'MineSeekerBundle_api_game_challenge_respond',
+        methods: ['POST'],
+    )]
     public function challengeRespond(string $challengerGameAssoc, Request $request): JsonResponse
     {
         $data = $request->toArray();
@@ -106,6 +115,19 @@ class MercureController extends AbstractController
         return $this->json(['success' => true]);
     }
 
+    #[Route('/api/game/heartbeat/{gameAssoc}', name: 'MineSeekerBundle_api_game_heartbeat', methods: ['POST'])]
+    public function heartbeat(string $gameAssoc, Request $request): JsonResponse
+    {
+        $data = $request->toArray();
+        $color = $data['color'] ?? '';
+        if ('red' !== $color && 'blue' !== $color) {
+            return $this->json(['success' => false], Response::HTTP_BAD_REQUEST);
+        }
+        $this->topicManager->publishHeartbeat($gameAssoc, $color);
+
+        return $this->json(['success' => true]);
+    }
+
     #[Route('/api/game/waiting', name: 'MineSeekerBundle_api_game_waiting', methods: ['GET'])]
     public function waiting(PlayedGameRepository $repo): JsonResponse
     {
@@ -113,10 +135,10 @@ class MercureController extends AbstractController
 
         $result = array_map(static function (PlayedGame $g): array {
             $name = match (true) {
-                null !== $g->getRed()      => $g->getRed()->getUsername(),
-                null !== $g->getRedAnon()  => $g->getRedAnon()->getUserName(),
-                null !== $g->getBlue()     => $g->getBlue()->getUsername(),
-                default                    => $g->getBlueAnon()?->getUserName() ?? 'Unknown',
+                null !== $g->getRed()     => $g->getRed()->getUsername(),
+                null !== $g->getRedAnon() => $g->getRedAnon()->getUserName(),
+                null !== $g->getBlue()    => $g->getBlue()->getUsername(),
+                default                   => $g->getBlueAnon()?->getUserName() ?? 'Unknown',
             };
 
             return [
@@ -128,20 +150,4 @@ class MercureController extends AbstractController
 
         return $this->json($result);
     }
-
-    private function resolveUserName(Request $request): string
-    {
-        $user = $this->getUser();
-
-        if (null !== $user) {
-            return $user->getUserIdentifier();
-        }
-
-        $sessionId = $request->getSession()->getId();
-        if (empty($sessionId)) {
-            $sessionId = bin2hex(random_bytes(16));
-        }
-
-        return 'anon_' . $sessionId;
-    }
 }