Route every Mercure publish through an event, log pushes per-player
Every $hub->publish() call site (chat, hints, security alerts, virus alerts, game_finished, and the pre-game lobby events) now dispatches a PushMercureMessageEvent instead of publishing directly. Two listeners handle it: PublishMercureMessageListener does the actual Mercure publish exactly as before (same wire format, no client changes needed), and LogMercureMessageListener appends it to the activity log of whichever player(s) it was actually delivered to. A private /chat to one agent only gets logged for that agent, never broadcast into everyone's transcript - the event carries an explicit targetScreen (null = everyone) rather than leaving listeners to guess from the payload shape. The per-player log format moved from flat text to JSON Lines (one timestamped, structured entry per line) via a new shared SessionActivityLogger service, since a flat string can't carry an event's type or exact payload - both needed for a future feature to replay a player's full session history, not just their own commands, on page reload. The admin session log viewer now parses and formats these entries back into readable lines. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -11,42 +11,62 @@ use App\Game\Enum\SessionSettingType;
|
||||
use App\Game\Repository\SessionSettingRepository;
|
||||
use App\Game\Service\GameResponseService;
|
||||
use App\Game\Service\PlayerService;
|
||||
use App\Game\Service\SessionActivityLogger;
|
||||
use App\Tech\Entity\User;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Bundle\SecurityBundle\Security;
|
||||
use Symfony\Component\Mercure\HubInterface;
|
||||
use Symfony\Component\Mercure\Update;
|
||||
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
|
||||
|
||||
class GameResponseServiceChatVerifyCodeTest extends TestCase
|
||||
{
|
||||
private string $tempDir;
|
||||
private $security;
|
||||
private $playerService;
|
||||
private $sessionSettingRepository;
|
||||
private $hub;
|
||||
private $eventDispatcher;
|
||||
private $entityManager;
|
||||
private $service;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
$this->tempDir = sys_get_temp_dir() . '/escapepage_test_' . uniqid();
|
||||
mkdir($this->tempDir, 0777, true);
|
||||
|
||||
$this->security = $this->createMock(Security::class);
|
||||
$this->playerService = $this->createMock(PlayerService::class);
|
||||
$this->sessionSettingRepository = $this->createMock(SessionSettingRepository::class);
|
||||
$this->hub = $this->createMock(HubInterface::class);
|
||||
$this->eventDispatcher = $this->createMock(EventDispatcherInterface::class);
|
||||
$this->entityManager = $this->createMock(EntityManagerInterface::class);
|
||||
|
||||
$this->service = new GameResponseService(
|
||||
$this->security,
|
||||
$this->playerService,
|
||||
$this->sessionSettingRepository,
|
||||
$this->hub,
|
||||
$this->entityManager,
|
||||
'H:\escapepage'
|
||||
$this->eventDispatcher,
|
||||
new SessionActivityLogger($this->tempDir),
|
||||
$this->tempDir
|
||||
);
|
||||
|
||||
$_ENV['MERCURE_TOPIC_BASE'] = 'http://test';
|
||||
}
|
||||
|
||||
protected function tearDown(): void
|
||||
{
|
||||
$this->removeDir($this->tempDir);
|
||||
}
|
||||
|
||||
private function removeDir(string $dir): void
|
||||
{
|
||||
if (!is_dir($dir)) return;
|
||||
$files = array_diff(scandir($dir), ['.', '..']);
|
||||
foreach ($files as $file) {
|
||||
(is_dir("$dir/$file")) ? $this->removeDir("$dir/$file") : unlink("$dir/$file");
|
||||
}
|
||||
rmdir($dir);
|
||||
}
|
||||
|
||||
public function testChatRegeneratesVerifyCodesIfShared(): void
|
||||
{
|
||||
$user = new User();
|
||||
@@ -63,6 +83,7 @@ class GameResponseServiceChatVerifyCodeTest extends TestCase
|
||||
$player->method('getUser')->willReturn($user);
|
||||
$player->method('getScreen')->willReturn(1);
|
||||
$player->method('getSession')->willReturn($session);
|
||||
$player->method('getLogFileBasename')->willReturn('testuser');
|
||||
|
||||
$this->security->method('getUser')->willReturn($user);
|
||||
$this->playerService->method('GetCurrentlyActiveAsPlayer')->willReturn($player);
|
||||
@@ -88,9 +109,11 @@ class GameResponseServiceChatVerifyCodeTest extends TestCase
|
||||
return null;
|
||||
});
|
||||
|
||||
// Expect Mercure updates: 1 for chat, 1 for notification
|
||||
$this->hub->expects($this->exactly(2))
|
||||
->method('publish');
|
||||
// Expect 2 PushMercureMessageEvents dispatched: 1 for chat, 1 for the
|
||||
// regenerated-code notification
|
||||
$this->eventDispatcher->expects($this->exactly(2))
|
||||
->method('dispatch')
|
||||
->willReturnArgument(0);
|
||||
|
||||
$this->entityManager->expects($this->once())
|
||||
->method('flush');
|
||||
|
||||
Reference in New Issue
Block a user