Compare commits
8 Commits
Rechten
...
set-correc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1ae0f651d8 | ||
|
|
8e933631b2 | ||
| f8746207e6 | |||
|
|
e42966e618 | ||
|
|
e4976e51fa | ||
|
|
65070688ec | ||
|
|
e54c870f05 | ||
| f5aabafcc5 |
2
.env
2
.env
@@ -57,7 +57,7 @@ MERCURE_URL=http://mercure/.well-known/mercure
|
|||||||
# Public hub URL used by browsers
|
# Public hub URL used by browsers
|
||||||
MERCURE_PUBLIC_URL=http://localhost:8090/.well-known/mercure
|
MERCURE_PUBLIC_URL=http://localhost:8090/.well-known/mercure
|
||||||
# Shared secret for signing JWTs (dev only). In prod, set via real env/secrets.
|
# Shared secret for signing JWTs (dev only). In prod, set via real env/secrets.
|
||||||
MERCURE_JWT_SECRET=!ChangeThisMercureJWT!
|
MERCURE_JWT_SECRET=!ChangeThisMercureJWTSignedBySymfonySecretKey!
|
||||||
# Base URL for Mercure topics. Use .dev in development; override to .com in prod via .env.prod or real env.
|
# Base URL for Mercure topics. Use .dev in development; override to .com in prod via .env.prod or real env.
|
||||||
MERCURE_TOPIC_BASE=https://escapepage.dev
|
MERCURE_TOPIC_BASE=https://escapepage.dev
|
||||||
###< mercure ###
|
###< mercure ###
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import './styles/game1.css';
|
|||||||
let sequenceFinished = false;
|
let sequenceFinished = false;
|
||||||
let stillPlayingSound = true;
|
let stillPlayingSound = true;
|
||||||
|
|
||||||
function subscribeToMercure(mercurePublicUrl, topic) {
|
function subscribeToMercure(mercurePublicUrl, topic, myScreen) {
|
||||||
try {
|
try {
|
||||||
const url = mercurePublicUrl + '?topic=' + encodeURIComponent(topic);
|
const url = mercurePublicUrl + '?topic=' + encodeURIComponent(topic);
|
||||||
const es = new EventSource(url);
|
const es = new EventSource(url);
|
||||||
@@ -16,6 +16,13 @@ function subscribeToMercure(mercurePublicUrl, topic) {
|
|||||||
|
|
||||||
// data is [sendTo, message]
|
// data is [sendTo, message]
|
||||||
if (Array.isArray(data) && data.length >= 2) {
|
if (Array.isArray(data) && data.length >= 2) {
|
||||||
|
const sendTo = parseInt(data[0]);
|
||||||
|
// Filter: 0 means everyone, otherwise must match myScreen
|
||||||
|
if (sendTo !== 0 && sendTo !== parseInt(myScreen)) {
|
||||||
|
console.log('[Mercure][game1] Message not for this player, skipping.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const messageContainer = document.getElementById('message-container');
|
const messageContainer = document.getElementById('message-container');
|
||||||
if (messageContainer) {
|
if (messageContainer) {
|
||||||
const msgEl = document.createElement('div');
|
const msgEl = document.createElement('div');
|
||||||
@@ -24,6 +31,7 @@ function subscribeToMercure(mercurePublicUrl, topic) {
|
|||||||
msgEl.style.color = '#0F0'; // Green for incoming messages
|
msgEl.style.color = '#0F0'; // Green for incoming messages
|
||||||
msgEl.style.marginBottom = '10px';
|
msgEl.style.marginBottom = '10px';
|
||||||
messageContainer.appendChild(msgEl);
|
messageContainer.appendChild(msgEl);
|
||||||
|
window.scrollTo(0, document.body.scrollHeight);
|
||||||
if(stillPlayingSound)
|
if(stillPlayingSound)
|
||||||
playSound();
|
playSound();
|
||||||
console.log('[Mercure][game1] sequenceFinished status:', sequenceFinished);
|
console.log('[Mercure][game1] sequenceFinished status:', sequenceFinished);
|
||||||
@@ -120,11 +128,12 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
|
|
||||||
const mercurePublicUrl = cfgEl.dataset.mercurePublicUrl;
|
const mercurePublicUrl = cfgEl.dataset.mercurePublicUrl;
|
||||||
const topic = cfgEl.dataset.topic;
|
const topic = cfgEl.dataset.topic;
|
||||||
|
const screen = cfgEl.dataset.screen;
|
||||||
const apiPingUrl = cfgEl.dataset.apiPingUrl;
|
const apiPingUrl = cfgEl.dataset.apiPingUrl;
|
||||||
const apiEchoUrl = cfgEl.dataset.apiEchoUrl;
|
const apiEchoUrl = cfgEl.dataset.apiEchoUrl;
|
||||||
|
|
||||||
if (mercurePublicUrl && topic) {
|
if (mercurePublicUrl && topic) {
|
||||||
subscribeToMercure(mercurePublicUrl, topic);
|
subscribeToMercure(mercurePublicUrl, topic, screen);
|
||||||
} else {
|
} else {
|
||||||
console.warn('[Mercure][game1] Missing data attributes on #mercure-config');
|
console.warn('[Mercure][game1] Missing data attributes on #mercure-config');
|
||||||
}
|
}
|
||||||
@@ -181,6 +190,7 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
msgEl.textContent = msg[0];
|
msgEl.textContent = msg[0];
|
||||||
msgEl.style.marginBottom = '10px';
|
msgEl.style.marginBottom = '10px';
|
||||||
messageContainer.appendChild(msgEl);
|
messageContainer.appendChild(msgEl);
|
||||||
|
window.scrollTo(0, document.body.scrollHeight);
|
||||||
|
|
||||||
playSound();
|
playSound();
|
||||||
|
|
||||||
@@ -203,6 +213,13 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
stillPlayingSound = false;
|
stillPlayingSound = false;
|
||||||
sequenceFinished = false;
|
sequenceFinished = false;
|
||||||
const message = inputField.value.trim();
|
const message = inputField.value.trim();
|
||||||
|
|
||||||
|
const msgEl = document.createElement('div');
|
||||||
|
msgEl.className = 'message';
|
||||||
|
msgEl.textContent = message;
|
||||||
|
msgEl.style.marginBottom = '10px';
|
||||||
|
messageContainer.appendChild(msgEl);
|
||||||
|
|
||||||
if (message && apiEchoUrl) {
|
if (message && apiEchoUrl) {
|
||||||
inputField.value = '';
|
inputField.value = '';
|
||||||
try {
|
try {
|
||||||
@@ -211,6 +228,16 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
body: { message, ts: new Date().toISOString() },
|
body: { message, ts: new Date().toISOString() },
|
||||||
});
|
});
|
||||||
console.log('[API][game1] message sent →', response);
|
console.log('[API][game1] message sent →', response);
|
||||||
|
if (response && response.result && Array.isArray(response.result.result)) {
|
||||||
|
response.result.result.forEach(text => {
|
||||||
|
const msgEl = document.createElement('div');
|
||||||
|
msgEl.className = 'message';
|
||||||
|
msgEl.textContent = text;
|
||||||
|
msgEl.style.marginBottom = '10px';
|
||||||
|
messageContainer.appendChild(msgEl);
|
||||||
|
});
|
||||||
|
window.scrollTo(0, document.body.scrollHeight);
|
||||||
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('[API][game1] Failed to send message:', err);
|
console.error('[API][game1] Failed to send message:', err);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,8 +29,11 @@ body {
|
|||||||
|
|
||||||
div#game-timer {
|
div#game-timer {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 20px;
|
top: 0;
|
||||||
left: 20px;
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
padding: 20px;
|
||||||
|
background-color: #000;
|
||||||
color: #F00;
|
color: #F00;
|
||||||
font-size: 28px;
|
font-size: 28px;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
@@ -38,7 +41,7 @@ div#game-timer {
|
|||||||
|
|
||||||
div#message-container {
|
div#message-container {
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
padding-top: 60px; /* Space for fixed timer */
|
padding-top: 80px; /* Space for fixed timer */
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
@@ -49,6 +52,7 @@ div#message-container {
|
|||||||
|
|
||||||
div.message {
|
div.message {
|
||||||
color: #C0C0C0;
|
color: #C0C0C0;
|
||||||
|
white-space: pre-wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
div#input {
|
div#input {
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
# Uncomment the following line to disable HTTPS,
|
# Uncomment the following line to disable HTTPS,
|
||||||
#SERVER_NAME: ':80'
|
#SERVER_NAME: ':80'
|
||||||
MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
|
MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
|
||||||
MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
|
MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
|
||||||
# Set the URL of your Symfony project (without trailing slash!) as value of the cors_origins directive
|
# Set the URL of your Symfony project (without trailing slash!) as value of the cors_origins directive
|
||||||
MERCURE_EXTRA_DIRECTIVES: |
|
MERCURE_EXTRA_DIRECTIVES: |
|
||||||
cors_origins http://127.0.0.1:8000
|
cors_origins http://localhost:8080
|
||||||
# Comment the following line to disable the development mode
|
# Comment the following line to disable the development mode
|
||||||
command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
|
command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
|
||||||
healthcheck:
|
healthcheck:
|
||||||
|
|||||||
@@ -3,4 +3,6 @@ mercure:
|
|||||||
default:
|
default:
|
||||||
url: '%env(MERCURE_URL)%'
|
url: '%env(MERCURE_URL)%'
|
||||||
public_url: '%env(MERCURE_PUBLIC_URL)%'
|
public_url: '%env(MERCURE_PUBLIC_URL)%'
|
||||||
jwt: '%env(MERCURE_JWT_SECRET)%'
|
jwt:
|
||||||
|
secret: '%env(MERCURE_JWT_SECRET)%'
|
||||||
|
publish: ['*']
|
||||||
|
|||||||
@@ -63,8 +63,8 @@ services:
|
|||||||
container_name: escapepage-mercure
|
container_name: escapepage-mercure
|
||||||
environment:
|
environment:
|
||||||
SERVER_NAME: ":80"
|
SERVER_NAME: ":80"
|
||||||
MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_JWT_SECRET:-!ChangeThisMercureJWT!}
|
MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
|
||||||
MERCURE_SUBSCRIBER_JWT_KEY: ${MERCURE_JWT_SECRET:-!ChangeThisMercureJWT!}
|
MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
|
||||||
MERCURE_CORS_ALLOWED_ORIGINS: http://localhost:8080
|
MERCURE_CORS_ALLOWED_ORIGINS: http://localhost:8080
|
||||||
MERCURE_PUBLISH_ALLOWED_ORIGINS: http://localhost:8080
|
MERCURE_PUBLISH_ALLOWED_ORIGINS: http://localhost:8080
|
||||||
MERCURE_EXTRA_DIRECTIVES: |
|
MERCURE_EXTRA_DIRECTIVES: |
|
||||||
|
|||||||
@@ -70,6 +70,17 @@ final class GameController extends AbstractController
|
|||||||
$this->addFlash('error', 'Could not leave session (game might have started).');
|
$this->addFlash('error', 'Could not leave session (game might have started).');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} elseif ($request->request->has('start_session')) {
|
||||||
|
$sessionId = $request->request->get('session_id');
|
||||||
|
$session = $sessionRepository->find($sessionId);
|
||||||
|
|
||||||
|
if ($session) {
|
||||||
|
if ($dashboardService->startSession($session)) {
|
||||||
|
$this->addFlash('success', 'Session started! Screens have been assigned.');
|
||||||
|
} else {
|
||||||
|
$this->addFlash('error', 'Could not start session. Make sure all players have joined.');
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->redirectToRoute('game_dashboard');
|
return $this->redirectToRoute('game_dashboard');
|
||||||
@@ -85,8 +96,18 @@ final class GameController extends AbstractController
|
|||||||
#[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
|
#[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
|
||||||
#[IsGranted('SESSION_VIEW', subject: 'session')]
|
#[IsGranted('SESSION_VIEW', subject: 'session')]
|
||||||
public function index(
|
public function index(
|
||||||
Session $session): Response
|
Session $session,
|
||||||
|
Security $security,
|
||||||
|
\App\Game\Repository\PlayerRepository $playerRepository
|
||||||
|
): Response
|
||||||
{
|
{
|
||||||
return $this->render('game/index.html.twig', ['session' => $session]);
|
$user = $security->getUser();
|
||||||
|
$player = $playerRepository->findOneBy(['session' => $session, 'user' => $user]);
|
||||||
|
$screen = $player ? $player->getScreen() : 0;
|
||||||
|
|
||||||
|
return $this->render('game/index.html.twig', [
|
||||||
|
'session' => $session,
|
||||||
|
'screen' => $screen,
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ class Player
|
|||||||
#[ORM\JoinColumn(nullable: false)]
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
private ?User $user = null;
|
private ?User $user = null;
|
||||||
|
|
||||||
#[ORM\Column]
|
#[ORM\Column(nullable: true)]
|
||||||
private ?int $screen = null;
|
private ?int $screen = null;
|
||||||
|
|
||||||
public function getId(): ?int
|
public function getId(): ?int
|
||||||
|
|||||||
@@ -7,18 +7,57 @@ enum SessionSettingType: string
|
|||||||
case PWD_FOR_PLAYER1 = 'PwdForPlayer1';
|
case PWD_FOR_PLAYER1 = 'PwdForPlayer1';
|
||||||
case PWD_FOR_PLAYER2 = 'PwdForPlayer2';
|
case PWD_FOR_PLAYER2 = 'PwdForPlayer2';
|
||||||
case PWD_FOR_PLAYER3 = 'PwdForPlayer3';
|
case PWD_FOR_PLAYER3 = 'PwdForPlayer3';
|
||||||
|
case PWD_FOR_PLAYER4 = 'PwdForPlayer4';
|
||||||
|
case PWD_FOR_PLAYER5 = 'PwdForPlayer5';
|
||||||
|
case PWD_FOR_PLAYER6 = 'PwdForPlayer6';
|
||||||
|
case PWD_FOR_PLAYER7 = 'PwdForPlayer7';
|
||||||
|
case PWD_FOR_PLAYER8 = 'PwdForPlayer8';
|
||||||
|
case PWD_FOR_PLAYER9 = 'PwdForPlayer9';
|
||||||
|
case PWD_FOR_PLAYER10 = 'PwdForPlayer10';
|
||||||
case RIGHTS_FOR_PLAYER1 = 'RightsForPlayer1';
|
case RIGHTS_FOR_PLAYER1 = 'RightsForPlayer1';
|
||||||
case RIGHTS_FOR_PLAYER2 = 'RightsForPlayer2';
|
case RIGHTS_FOR_PLAYER2 = 'RightsForPlayer2';
|
||||||
case RIGHTS_FOR_PLAYER3 = 'RightsForPlayer3';
|
case RIGHTS_FOR_PLAYER3 = 'RightsForPlayer3';
|
||||||
|
case RIGHTS_FOR_PLAYER4 = 'RightsForPlayer4';
|
||||||
|
case RIGHTS_FOR_PLAYER5 = 'RightsForPlayer5';
|
||||||
|
case RIGHTS_FOR_PLAYER6 = 'RightsForPlayer6';
|
||||||
|
case RIGHTS_FOR_PLAYER7 = 'RightsForPlayer7';
|
||||||
|
case RIGHTS_FOR_PLAYER8 = 'RightsForPlayer8';
|
||||||
|
case RIGHTS_FOR_PLAYER9 = 'RightsForPlayer9';
|
||||||
|
case RIGHTS_FOR_PLAYER10 = 'RightsForPlayer10';
|
||||||
case INVITE_CODE = 'InviteCode';
|
case INVITE_CODE = 'InviteCode';
|
||||||
case SET_OF_DELETED_FILES = 'SetOfDeletedFiles';
|
case SET_OF_DELETED_FILES = 'SetOfDeletedFiles';
|
||||||
case CHAT_TRACKING_FOR_PLAYER1 = 'ChatTrackingForPlayer1';
|
case CHAT_TRACKING_FOR_PLAYER1 = 'ChatTrackingForPlayer1';
|
||||||
case CHAT_TRACKING_FOR_PLAYER2 = 'ChatTrackingForPlayer2';
|
case CHAT_TRACKING_FOR_PLAYER2 = 'ChatTrackingForPlayer2';
|
||||||
case CHAT_TRACKING_FOR_PLAYER3 = 'ChatTrackingForPlayer3';
|
case CHAT_TRACKING_FOR_PLAYER3 = 'ChatTrackingForPlayer3';
|
||||||
|
case CHAT_TRACKING_FOR_PLAYER4 = 'ChatTrackingForPlayer4';
|
||||||
|
case CHAT_TRACKING_FOR_PLAYER5 = 'ChatTrackingForPlayer5';
|
||||||
|
case CHAT_TRACKING_FOR_PLAYER6 = 'ChatTrackingForPlayer6';
|
||||||
|
case CHAT_TRACKING_FOR_PLAYER7 = 'ChatTrackingForPlayer7';
|
||||||
|
case CHAT_TRACKING_FOR_PLAYER8 = 'ChatTrackingForPlayer8';
|
||||||
|
case CHAT_TRACKING_FOR_PLAYER9 = 'ChatTrackingForPlayer9';
|
||||||
|
case CHAT_TRACKING_FOR_PLAYER10 = 'ChatTrackingForPlayer10';
|
||||||
case VERIFY_CODES_FOR_PLAYER1 = 'VerifyCodesForPlayer1';
|
case VERIFY_CODES_FOR_PLAYER1 = 'VerifyCodesForPlayer1';
|
||||||
case VERIFY_CODES_FOR_PLAYER2 = 'VerifyCodesForPlayer2';
|
case VERIFY_CODES_FOR_PLAYER2 = 'VerifyCodesForPlayer2';
|
||||||
case VERIFY_CODES_FOR_PLAYER3 = 'VerifyCodesForPlayer3';
|
case VERIFY_CODES_FOR_PLAYER3 = 'VerifyCodesForPlayer3';
|
||||||
|
case VERIFY_CODES_FOR_PLAYER4 = 'VerifyCodesForPlayer4';
|
||||||
|
case VERIFY_CODES_FOR_PLAYER5 = 'VerifyCodesForPlayer5';
|
||||||
|
case VERIFY_CODES_FOR_PLAYER6 = 'VerifyCodesForPlayer6';
|
||||||
|
case VERIFY_CODES_FOR_PLAYER7 = 'VerifyCodesForPlayer7';
|
||||||
|
case VERIFY_CODES_FOR_PLAYER8 = 'VerifyCodesForPlayer8';
|
||||||
|
case VERIFY_CODES_FOR_PLAYER9 = 'VerifyCodesForPlayer9';
|
||||||
|
case VERIFY_CODES_FOR_PLAYER10 = 'VerifyCodesForPlayer10';
|
||||||
case VERIFICATION_PROGRESS_FOR_PLAYER1 = 'VerificationProgressForPlayer1';
|
case VERIFICATION_PROGRESS_FOR_PLAYER1 = 'VerificationProgressForPlayer1';
|
||||||
case VERIFICATION_PROGRESS_FOR_PLAYER2 = 'VerificationProgressForPlayer2';
|
case VERIFICATION_PROGRESS_FOR_PLAYER2 = 'VerificationProgressForPlayer2';
|
||||||
case VERIFICATION_PROGRESS_FOR_PLAYER3 = 'VerificationProgressForPlayer3';
|
case VERIFICATION_PROGRESS_FOR_PLAYER3 = 'VerificationProgressForPlayer3';
|
||||||
|
case VERIFICATION_PROGRESS_FOR_PLAYER4 = 'VerificationProgressForPlayer4';
|
||||||
|
case VERIFICATION_PROGRESS_FOR_PLAYER5 = 'VerificationProgressForPlayer5';
|
||||||
|
case VERIFICATION_PROGRESS_FOR_PLAYER6 = 'VerificationProgressForPlayer6';
|
||||||
|
case VERIFICATION_PROGRESS_FOR_PLAYER7 = 'VerificationProgressForPlayer7';
|
||||||
|
case VERIFICATION_PROGRESS_FOR_PLAYER8 = 'VerificationProgressForPlayer8';
|
||||||
|
case VERIFICATION_PROGRESS_FOR_PLAYER9 = 'VerificationProgressForPlayer9';
|
||||||
|
case VERIFICATION_PROGRESS_FOR_PLAYER10 = 'VerificationProgressForPlayer10';
|
||||||
|
case EVERYONE_VERIFIED = 'EveryoneVerified';
|
||||||
|
case SPECIAL_REPORT_CODE_DOYLE = 'SpecialReportCodeDoyle';
|
||||||
|
case SPECIAL_REPORT_CODE_VEGA = 'SpecialReportCodeVega';
|
||||||
|
case SPECIAL_REPORT_CODE_LENNOX = 'SpecialReportCodeLennox';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,13 +67,10 @@ final class GameDashboardService
|
|||||||
$player = new Player();
|
$player = new Player();
|
||||||
$player->setUser($user);
|
$player->setUser($user);
|
||||||
$player->setSession($session);
|
$player->setSession($session);
|
||||||
$player->setScreen(1);
|
|
||||||
|
|
||||||
$this->entityManager->persist($session);
|
$this->entityManager->persist($session);
|
||||||
$this->entityManager->persist($player);
|
$this->entityManager->persist($player);
|
||||||
|
|
||||||
$this->initializePlayerSettings($player);
|
|
||||||
|
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
|
|
||||||
return $session;
|
return $session;
|
||||||
@@ -104,17 +101,15 @@ final class GameDashboardService
|
|||||||
}
|
}
|
||||||
|
|
||||||
$playerCount = count($session->getPlayers());
|
$playerCount = count($session->getPlayers());
|
||||||
if ($playerCount >= 3) {
|
if ($playerCount >= $session->getGame()->getNumberOfPlayers()) {
|
||||||
return false; // Session full
|
return false; // Session full
|
||||||
}
|
}
|
||||||
|
|
||||||
$player = new Player();
|
$player = new Player();
|
||||||
$player->setUser($user);
|
$player->setUser($user);
|
||||||
$player->setSession($session);
|
$player->setSession($session);
|
||||||
$player->setScreen($playerCount + 1);
|
|
||||||
|
|
||||||
$this->entityManager->persist($player);
|
$this->entityManager->persist($player);
|
||||||
$this->initializePlayerSettings($player);
|
|
||||||
|
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
|
|
||||||
@@ -170,12 +165,7 @@ final class GameDashboardService
|
|||||||
private function initializePlayerSettings(Player $player): void
|
private function initializePlayerSettings(Player $player): void
|
||||||
{
|
{
|
||||||
$screen = $player->getScreen();
|
$screen = $player->getScreen();
|
||||||
$rightsSettingName = match ($screen) {
|
$rightsSettingName = SessionSettingType::tryFrom('RightsForPlayer' . $screen);
|
||||||
1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if ($rightsSettingName) {
|
if ($rightsSettingName) {
|
||||||
$setting = new SessionSetting();
|
$setting = new SessionSetting();
|
||||||
@@ -186,28 +176,18 @@ final class GameDashboardService
|
|||||||
$this->entityManager->persist($setting);
|
$this->entityManager->persist($setting);
|
||||||
}
|
}
|
||||||
|
|
||||||
$pwdSettingName = match ($screen) {
|
$pwdSettingName = SessionSettingType::tryFrom('PwdForPlayer' . $screen);
|
||||||
1 => SessionSettingType::PWD_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::PWD_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::PWD_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if ($pwdSettingName) {
|
if ($pwdSettingName) {
|
||||||
$setting = new SessionSetting();
|
$setting = new SessionSetting();
|
||||||
$setting->setSession($player->getSession());
|
$setting->setSession($player->getSession());
|
||||||
$setting->setPlayer($player);
|
$setting->setPlayer($player);
|
||||||
$setting->setName($pwdSettingName);
|
$setting->setName($pwdSettingName);
|
||||||
$setting->setValue('home/' . $player->getUser()->getUserIdentifier());
|
$setting->setValue('var/home/' . $player->getUser()->getUsername());
|
||||||
$this->entityManager->persist($setting);
|
$this->entityManager->persist($setting);
|
||||||
}
|
}
|
||||||
|
|
||||||
$chatTrackingSettingName = match ($screen) {
|
$chatTrackingSettingName = SessionSettingType::tryFrom('ChatTrackingForPlayer' . $screen);
|
||||||
1 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if ($chatTrackingSettingName) {
|
if ($chatTrackingSettingName) {
|
||||||
$setting = new SessionSetting();
|
$setting = new SessionSetting();
|
||||||
@@ -218,16 +198,12 @@ final class GameDashboardService
|
|||||||
$this->entityManager->persist($setting);
|
$this->entityManager->persist($setting);
|
||||||
}
|
}
|
||||||
|
|
||||||
$verifyCodesSettingName = match ($screen) {
|
$verifyCodesSettingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $screen);
|
||||||
1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if ($verifyCodesSettingName) {
|
if ($verifyCodesSettingName) {
|
||||||
$codes = [];
|
$codes = [];
|
||||||
for ($i = 1; $i <= 3; $i++) {
|
$numPlayers = $player->getSession()->getGame()->getNumberOfPlayers();
|
||||||
|
for ($i = 1; $i <= $numPlayers; $i++) {
|
||||||
if ($i !== $screen) {
|
if ($i !== $screen) {
|
||||||
$codes[$i] = bin2hex(random_bytes(3)); // 6 characters code
|
$codes[$i] = bin2hex(random_bytes(3)); // 6 characters code
|
||||||
}
|
}
|
||||||
@@ -241,12 +217,7 @@ final class GameDashboardService
|
|||||||
$this->entityManager->persist($setting);
|
$this->entityManager->persist($setting);
|
||||||
}
|
}
|
||||||
|
|
||||||
$verificationProgressSettingName = match ($screen) {
|
$verificationProgressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $screen);
|
||||||
1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if ($verificationProgressSettingName) {
|
if ($verificationProgressSettingName) {
|
||||||
$setting = new SessionSetting();
|
$setting = new SessionSetting();
|
||||||
@@ -258,6 +229,34 @@ final class GameDashboardService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function startSession(Session $session): bool
|
||||||
|
{
|
||||||
|
if ($session->getStatus() !== SessionStatus::CREATED) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$players = $session->getPlayers()->toArray();
|
||||||
|
if (count($players) < $session->getGame()->getNumberOfPlayers()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Shuffle players to assign random screens
|
||||||
|
shuffle($players);
|
||||||
|
|
||||||
|
foreach ($players as $index => $player) {
|
||||||
|
$screen = $index + 1;
|
||||||
|
$player->setScreen($screen);
|
||||||
|
$this->initializePlayerSettings($player);
|
||||||
|
$this->entityManager->persist($player);
|
||||||
|
}
|
||||||
|
|
||||||
|
$session->setStatus(SessionStatus::READY);
|
||||||
|
$this->entityManager->persist($session);
|
||||||
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
public function generateInviteCode(Session $session, UserInterface $user, bool $isAdmin): ?string
|
public function generateInviteCode(Session $session, UserInterface $user, bool $isAdmin): ?string
|
||||||
{
|
{
|
||||||
// Security check: is user part of this session?
|
// Security check: is user part of this session?
|
||||||
|
|||||||
@@ -59,12 +59,7 @@ class GameResponseService
|
|||||||
|
|
||||||
private function getRechten(Player $player): array
|
private function getRechten(Player $player): array
|
||||||
{
|
{
|
||||||
$settingName = match($player->getScreen()) {
|
$settingName = SessionSettingType::tryFrom('RightsForPlayer' . $player->getScreen());
|
||||||
1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!$settingName) {
|
if (!$settingName) {
|
||||||
return [];
|
return [];
|
||||||
@@ -138,6 +133,15 @@ class GameResponseService
|
|||||||
|
|
||||||
$this->playerService->saveCurrentPwdOfPlayer($player, $newLocation);
|
$this->playerService->saveCurrentPwdOfPlayer($player, $newLocation);
|
||||||
return ['result' => ['Path: ' . $newLocation]];
|
return ['result' => ['Path: ' . $newLocation]];
|
||||||
|
case 'cat':
|
||||||
|
if(!in_array('cat', $rechten))
|
||||||
|
return ['result' => ['Unknown command']];
|
||||||
|
|
||||||
|
$pwd = $this->playerService->getCurrentPwdOfPlayer($player);
|
||||||
|
|
||||||
|
$fileContent = $this->getFileContent($player, $pwd.'/'.$messagePart[1]);
|
||||||
|
|
||||||
|
return ['result' => $fileContent];
|
||||||
case 'pwd':
|
case 'pwd':
|
||||||
if(!in_array('pwd', $rechten))
|
if(!in_array('pwd', $rechten))
|
||||||
return ['result' => ['Unknown command']];
|
return ['result' => ['Unknown command']];
|
||||||
@@ -189,6 +193,7 @@ class GameResponseService
|
|||||||
$messages[] = ' If you want to send a message specifically to one other agent, use the id of the agent after /chat, like /chat 6 {message}';
|
$messages[] = ' If you want to send a message specifically to one other agent, use the id of the agent after /chat, like /chat 6 {message}';
|
||||||
$messages[] = ' This will send the message only to agent with id 6.';
|
$messages[] = ' This will send the message only to agent with id 6.';
|
||||||
$messages[] = ' USAGE: /chat {message}';
|
$messages[] = ' USAGE: /chat {message}';
|
||||||
|
$messages[] = ' USAGE: /chat 6 {message}';
|
||||||
$messages[] = '';
|
$messages[] = '';
|
||||||
break;
|
break;
|
||||||
case 'help':
|
case 'help':
|
||||||
@@ -268,7 +273,7 @@ class GameResponseService
|
|||||||
if (isset($messageParts[1]) &&
|
if (isset($messageParts[1]) &&
|
||||||
is_numeric($messageParts[1]) &&
|
is_numeric($messageParts[1]) &&
|
||||||
$messageParts[1] >= 1 &&
|
$messageParts[1] >= 1 &&
|
||||||
$messageParts[1] <= 3) {
|
$messageParts[1] <= $player->getSession()->getGame()->getNumberOfPlayers()) {
|
||||||
|
|
||||||
$toSingle = true;
|
$toSingle = true;
|
||||||
}
|
}
|
||||||
@@ -308,12 +313,7 @@ class GameResponseService
|
|||||||
$screen = $player->getScreen();
|
$screen = $player->getScreen();
|
||||||
$session = $player->getSession();
|
$session = $player->getSession();
|
||||||
|
|
||||||
$verifyCodesSettingName = match ($screen) {
|
$verifyCodesSettingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $screen);
|
||||||
1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!$verifyCodesSettingName) {
|
if (!$verifyCodesSettingName) {
|
||||||
return;
|
return;
|
||||||
@@ -353,12 +353,7 @@ class GameResponseService
|
|||||||
if(in_array('verify', $rights))
|
if(in_array('verify', $rights))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
$trackingSettingName = match ($player->getScreen()) {
|
$trackingSettingName = SessionSettingType::tryFrom('ChatTrackingForPlayer' . $player->getScreen());
|
||||||
1 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!$trackingSettingName) {
|
if (!$trackingSettingName) {
|
||||||
return;
|
return;
|
||||||
@@ -388,7 +383,8 @@ class GameResponseService
|
|||||||
{
|
{
|
||||||
$screen = $player->getScreen();
|
$screen = $player->getScreen();
|
||||||
$requiredTargets = [0]; // Everyone
|
$requiredTargets = [0]; // Everyone
|
||||||
for ($i = 1; $i <= 3; $i++) {
|
$numPlayers = $player->getSession()->getGame()->getNumberOfPlayers();
|
||||||
|
for ($i = 1; $i <= $numPlayers; $i++) {
|
||||||
if ($i !== $screen) {
|
if ($i !== $screen) {
|
||||||
$requiredTargets[] = $i;
|
$requiredTargets[] = $i;
|
||||||
}
|
}
|
||||||
@@ -402,12 +398,7 @@ class GameResponseService
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Grant verify right
|
// Grant verify right
|
||||||
$rightsSettingName = match ($screen) {
|
$rightsSettingName = SessionSettingType::tryFrom('RightsForPlayer' . $screen);
|
||||||
1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!$rightsSettingName) {
|
if (!$rightsSettingName) {
|
||||||
return;
|
return;
|
||||||
@@ -468,6 +459,30 @@ class GameResponseService
|
|||||||
return $randomString;
|
return $randomString;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function generateSpecialCode(int $firstDigit, int $min, int $max): string
|
||||||
|
{
|
||||||
|
$code = $this->generateRandomString($min, $max);
|
||||||
|
|
||||||
|
// Ensure the first numeric digit is the specified $firstDigit
|
||||||
|
$found = false;
|
||||||
|
$codeArray = str_split($code);
|
||||||
|
for ($i = 0; $i < count($codeArray); $i++) {
|
||||||
|
if (ctype_digit($codeArray[$i])) {
|
||||||
|
$codeArray[$i] = (string)$firstDigit;
|
||||||
|
$found = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$code = implode('', $codeArray);
|
||||||
|
|
||||||
|
// If no digit was found (highly unlikely given the character set), prepend it
|
||||||
|
if (!$found) {
|
||||||
|
$code = (string)$firstDigit . substr($code, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $code;
|
||||||
|
}
|
||||||
|
|
||||||
private function handleVerifyMessage(string $message, Player $player) : string
|
private function handleVerifyMessage(string $message, Player $player) : string
|
||||||
{
|
{
|
||||||
$messageParts = explode(' ', $message);
|
$messageParts = explode(' ', $message);
|
||||||
@@ -479,12 +494,7 @@ class GameResponseService
|
|||||||
$screen = $player->getScreen();
|
$screen = $player->getScreen();
|
||||||
$session = $player->getSession();
|
$session = $player->getSession();
|
||||||
|
|
||||||
$progressSettingName = match ($screen) {
|
$progressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $screen);
|
||||||
1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!$progressSettingName) {
|
if (!$progressSettingName) {
|
||||||
return 'Error: Invalid player screen.';
|
return 'Error: Invalid player screen.';
|
||||||
@@ -504,12 +514,7 @@ class GameResponseService
|
|||||||
}
|
}
|
||||||
|
|
||||||
$otherScreen = $otherPlayer->getScreen();
|
$otherScreen = $otherPlayer->getScreen();
|
||||||
$codesSettingName = match ($otherScreen) {
|
$codesSettingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $otherScreen);
|
||||||
1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!$codesSettingName) {
|
if (!$codesSettingName) {
|
||||||
continue;
|
continue;
|
||||||
@@ -553,12 +558,7 @@ class GameResponseService
|
|||||||
private function grantVerificationRights(Player $player): void
|
private function grantVerificationRights(Player $player): void
|
||||||
{
|
{
|
||||||
$screen = $player->getScreen();
|
$screen = $player->getScreen();
|
||||||
$rightsSettingName = match ($screen) {
|
$rightsSettingName = SessionSettingType::tryFrom('RightsForPlayer' . $screen);
|
||||||
1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!$rightsSettingName) {
|
if (!$rightsSettingName) {
|
||||||
return;
|
return;
|
||||||
@@ -584,6 +584,52 @@ class GameResponseService
|
|||||||
$setting->setValue(json_encode($rights));
|
$setting->setValue(json_encode($rights));
|
||||||
$this->entityManager->persist($setting);
|
$this->entityManager->persist($setting);
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
$this->checkIfAllPlayersVerified($player);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function checkIfAllPlayersVerified(Player $player): void
|
||||||
|
{
|
||||||
|
$session = $player->getSession();
|
||||||
|
$everyoneVerifiedSetting = $this->sessionSettingRepository->getSetting($session, SessionSettingType::EVERYONE_VERIFIED, $player);
|
||||||
|
|
||||||
|
if ($everyoneVerifiedSetting && $everyoneVerifiedSetting->getValue() === 'true') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$allVerified = true;
|
||||||
|
foreach ($session->getPlayers() as $otherPlayer) {
|
||||||
|
$otherScreen = $otherPlayer->getScreen();
|
||||||
|
$progressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $otherScreen);
|
||||||
|
|
||||||
|
if (!$progressSettingName) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$progressSetting = $this->sessionSettingRepository->getSetting($session, $progressSettingName, $otherPlayer);
|
||||||
|
$progress = json_decode($progressSetting?->getValue() ?? '[]', true) ?? [];
|
||||||
|
|
||||||
|
if (count($progress) < $session->getGame()->getNumberOfPlayers() - 1) {
|
||||||
|
$allVerified = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($allVerified) {
|
||||||
|
if (!$everyoneVerifiedSetting) {
|
||||||
|
$everyoneVerifiedSetting = new SessionSetting();
|
||||||
|
$everyoneVerifiedSetting->setSession($session);
|
||||||
|
$everyoneVerifiedSetting->setPlayer($player);
|
||||||
|
$everyoneVerifiedSetting->setName(SessionSettingType::EVERYONE_VERIFIED);
|
||||||
|
}
|
||||||
|
$everyoneVerifiedSetting->setValue('true');
|
||||||
|
$this->entityManager->persist($everyoneVerifiedSetting);
|
||||||
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
$topic = $_ENV['MERCURE_TOPIC_BASE'] . '/game/hub-' . $session->getId();
|
||||||
|
$message = "Mainframe Help Modus: Agents Doyle, Vega and Lennox rapports have been updated with coded messages.";
|
||||||
|
$this->hub->publish(new Update($topic, json_encode([0, $message])));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -646,20 +692,20 @@ class GameResponseService
|
|||||||
$paths[] = '/etc/freak';
|
$paths[] = '/etc/freak';
|
||||||
$paths[] = '/etc/host';
|
$paths[] = '/etc/host';
|
||||||
|
|
||||||
$paths[] = '/home';
|
$paths[] = '/var/home';
|
||||||
|
|
||||||
$playerNames = ['root', 'Luke', 'Charles', 'William', 'Peter'];
|
$playerNames = ['root', 'Luke', 'Charles', 'William', 'Peter'];
|
||||||
|
|
||||||
$players = $player->getSession()->getPlayers();
|
$players = $player->getSession()->getPlayers();
|
||||||
|
|
||||||
foreach($players as $player) {
|
foreach($players as $p) {
|
||||||
$playerNames[] = $player->getUser()->getUsername();
|
$playerNames[] = $p->getUser()->getUsername();
|
||||||
}
|
}
|
||||||
|
|
||||||
$playerNames = array_unique($playerNames);
|
$playerNames = array_unique($playerNames);
|
||||||
|
|
||||||
foreach($playerNames as $name) {
|
foreach($playerNames as $name) {
|
||||||
$paths[] = '/home/' . $name;
|
$paths[] = '/var/home/' . $name;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $paths;
|
return $paths;
|
||||||
@@ -725,12 +771,17 @@ class GameResponseService
|
|||||||
$files[] = '/var/rapports/017_123-88.txt';
|
$files[] = '/var/rapports/017_123-88.txt';
|
||||||
$files[] = '/var/rapports/093_138-24.txt';
|
$files[] = '/var/rapports/093_138-24.txt';
|
||||||
$files[] = '/var/rapports/001_145-93.txt';
|
$files[] = '/var/rapports/001_145-93.txt';
|
||||||
|
$files[] = '/var/rapports/011_130-62.txt';
|
||||||
$files[] = '/var/rapports/index.txt';
|
$files[] = '/var/rapports/index.txt';
|
||||||
|
|
||||||
|
if ($player === null) {
|
||||||
|
return $files;
|
||||||
|
}
|
||||||
|
|
||||||
$players = $player->getSession()->getPlayers();
|
$players = $player->getSession()->getPlayers();
|
||||||
|
|
||||||
foreach($players as $player) {
|
foreach($players as $p) {
|
||||||
$files[] = '/var/home/' . $player->getUser()->getUsername() . '/verifyCodes.txt';
|
$files[] = '/var/home/' . $p->getUser()->getUsername() . '/verifyCodes.txt';
|
||||||
}
|
}
|
||||||
|
|
||||||
return $files;
|
return $files;
|
||||||
@@ -744,7 +795,7 @@ class GameResponseService
|
|||||||
}
|
}
|
||||||
|
|
||||||
$allPaths = $this->getAllPossiblePaths($player);
|
$allPaths = $this->getAllPossiblePaths($player);
|
||||||
$allFiles = $this->getAllPossibleFiles();
|
$allFiles = $this->getAllPossibleFiles($player);
|
||||||
$deletedFiles = $this->playerService->getDeletedFilesOfSession($player);
|
$deletedFiles = $this->playerService->getDeletedFilesOfSession($player);
|
||||||
|
|
||||||
$entries = [];
|
$entries = [];
|
||||||
@@ -779,4 +830,144 @@ class GameResponseService
|
|||||||
sort($entries);
|
sort($entries);
|
||||||
return $entries;
|
return $entries;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getFileContent(Player $player, string $file) : array
|
||||||
|
{
|
||||||
|
$allPossibleFiles = $this->getAllPossibleFiles($player);
|
||||||
|
if (!in_array($file, $allPossibleFiles)) {
|
||||||
|
return ['File does not exist'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (str_ends_with($file, '.sh')) {
|
||||||
|
return ['It is not possible to read this file'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (str_ends_with($file, 'verifyCodes.txt')) {
|
||||||
|
return $this->readVerificationFile($player, $file);
|
||||||
|
}
|
||||||
|
|
||||||
|
$physicalPath = 'assets/game1/filesystem' . $file;
|
||||||
|
if (!file_exists($physicalPath)) {
|
||||||
|
return ['File does not exist'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$content = file($physicalPath);
|
||||||
|
if ($content === false) {
|
||||||
|
return ['Error reading file'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$specialFiles = [
|
||||||
|
'/var/rapports/083_25-39.txt' => [
|
||||||
|
'setting' => SessionSettingType::SPECIAL_REPORT_CODE_DOYLE,
|
||||||
|
'digit' => 1
|
||||||
|
],
|
||||||
|
'/var/rapports/019_31-11.txt' => [
|
||||||
|
'setting' => SessionSettingType::SPECIAL_REPORT_CODE_VEGA,
|
||||||
|
'digit' => 2
|
||||||
|
],
|
||||||
|
'/var/rapports/011_130-62.txt' => [
|
||||||
|
'setting' => SessionSettingType::SPECIAL_REPORT_CODE_LENNOX,
|
||||||
|
'digit' => 3
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
if (isset($specialFiles[$file])) {
|
||||||
|
$everyoneVerifiedSetting = $this->sessionSettingRepository->getSetting($player->getSession(), SessionSettingType::EVERYONE_VERIFIED);
|
||||||
|
if ($everyoneVerifiedSetting && $everyoneVerifiedSetting->getValue() === 'true') {
|
||||||
|
$settingInfo = $specialFiles[$file];
|
||||||
|
$codeSetting = $this->sessionSettingRepository->getSetting($player->getSession(), $settingInfo['setting']);
|
||||||
|
|
||||||
|
if (!$codeSetting) {
|
||||||
|
$codeSetting = new SessionSetting();
|
||||||
|
$codeSetting->setSession($player->getSession());
|
||||||
|
$codeSetting->setName($settingInfo['setting']);
|
||||||
|
$codeSetting->setValue($this->generateSpecialCode($settingInfo['digit'], 75, 100));
|
||||||
|
|
||||||
|
$this->entityManager->persist($codeSetting);
|
||||||
|
$this->entityManager->flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
$specialCode = $codeSetting->getValue();
|
||||||
|
|
||||||
|
$newContent = [];
|
||||||
|
foreach ($content as $line) {
|
||||||
|
$newContent[] = $line;
|
||||||
|
if (str_starts_with(trim($line), 'Date:')) {
|
||||||
|
$newContent[] = $specialCode . "\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$content = $newContent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $content;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function readVerificationFile(Player $player, string $file)
|
||||||
|
{
|
||||||
|
$parts = explode('/', $file);
|
||||||
|
$ownerUsername = $parts[3] ?? null;
|
||||||
|
|
||||||
|
$ownerPlayer = null;
|
||||||
|
foreach ($player->getSession()->getPlayers() as $p) {
|
||||||
|
if ($p->getUser()->getUsername() === $ownerUsername) {
|
||||||
|
$ownerPlayer = $p;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$ownerPlayer) {
|
||||||
|
return 'File does not exist';
|
||||||
|
}
|
||||||
|
|
||||||
|
$screen = $ownerPlayer->getScreen();
|
||||||
|
$settingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $screen);
|
||||||
|
|
||||||
|
if (!$settingName) {
|
||||||
|
return 'Error: Invalid player screen.';
|
||||||
|
}
|
||||||
|
|
||||||
|
$setting = $this->sessionSettingRepository->getSetting($player->getSession(), $settingName, $ownerPlayer);
|
||||||
|
if (!$setting) {
|
||||||
|
$setting = new SessionSetting();
|
||||||
|
$setting->setSession($player->getSession());
|
||||||
|
$setting->setPlayer($ownerPlayer);
|
||||||
|
$setting->setName($settingName);
|
||||||
|
}
|
||||||
|
|
||||||
|
$codes = json_decode($setting->getValue() ?? '[]', true) ?? [];
|
||||||
|
|
||||||
|
$playerNames = ['Luke', 'Charles', 'William', 'Peter'];
|
||||||
|
foreach ($player->getSession()->getPlayers() as $p) {
|
||||||
|
$playerNames[] = $p->getUser()->getUsername();
|
||||||
|
}
|
||||||
|
$playerNames = array_unique($playerNames);
|
||||||
|
sort($playerNames);
|
||||||
|
|
||||||
|
$content = [];
|
||||||
|
|
||||||
|
$content[] = "Verification codes:";
|
||||||
|
$content[] = "";
|
||||||
|
|
||||||
|
foreach ($playerNames as $name) {
|
||||||
|
$key = null;
|
||||||
|
foreach ($player->getSession()->getPlayers() as $p) {
|
||||||
|
if ($p->getUser()->getUsername() === $name) {
|
||||||
|
$key = (string)$p->getScreen();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($key === null) {
|
||||||
|
$key = $name;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isset($codes[$key])) {
|
||||||
|
$codes[$key] = bin2hex(random_bytes(3));
|
||||||
|
}
|
||||||
|
|
||||||
|
$content[] = $name . ": " . $codes[$key] . "\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
return $content;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,12 +40,7 @@ class PlayerService
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getCurrentPwdOfPlayer(Player $player) : ?string {
|
public function getCurrentPwdOfPlayer(Player $player) : ?string {
|
||||||
$settingName = match($player->getScreen()) {
|
$settingName = SessionSettingType::tryFrom('PwdForPlayer' . $player->getScreen());
|
||||||
1 => SessionSettingType::PWD_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::PWD_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::PWD_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!$settingName) {
|
if (!$settingName) {
|
||||||
return null;
|
return null;
|
||||||
@@ -57,12 +52,7 @@ class PlayerService
|
|||||||
|
|
||||||
public function saveCurrentPwdOfPlayer(Player $player, string $newLocation)
|
public function saveCurrentPwdOfPlayer(Player $player, string $newLocation)
|
||||||
{
|
{
|
||||||
$settingName = match($player->getScreen()) {
|
$settingName = SessionSettingType::tryFrom('PwdForPlayer' . $player->getScreen());
|
||||||
1 => SessionSettingType::PWD_FOR_PLAYER1,
|
|
||||||
2 => SessionSettingType::PWD_FOR_PLAYER2,
|
|
||||||
3 => SessionSettingType::PWD_FOR_PLAYER3,
|
|
||||||
default => null,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!$settingName) {
|
if (!$settingName) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -69,12 +69,20 @@
|
|||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a href="{{ path('game', {session: session.id}) }}">Enter Game</a>
|
<a href="{{ path('game', {session: session.id}) }}">Enter Game</a>
|
||||||
{% if session.status.value == 'created' and session.timer == 0 %}
|
{% if session.status.value == 'created' %}
|
||||||
|
{% if session.players|length >= session.game.numberOfPlayers %}
|
||||||
|
<form method="post" style="display:inline;">
|
||||||
|
<input type="hidden" name="session_id" value="{{ session.id }}">
|
||||||
|
<button type="submit" name="start_session">Start Session</button>
|
||||||
|
</form>
|
||||||
|
{% endif %}
|
||||||
|
{% if session.timer == 0 %}
|
||||||
<form method="post" style="display:inline;">
|
<form method="post" style="display:inline;">
|
||||||
<input type="hidden" name="session_id" value="{{ session.id }}">
|
<input type="hidden" name="session_id" value="{{ session.id }}">
|
||||||
<button type="submit" name="leave_session" onclick="return confirm('Are you sure you want to leave this session?')">Leave Session</button>
|
<button type="submit" name="leave_session" onclick="return confirm('Are you sure you want to leave this session?')">Leave Session</button>
|
||||||
</form>
|
</form>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
data-topic="{{ (mercure_topic_base ~ '/game/hub-' ~ session.id)|e('html_attr') }}"
|
data-topic="{{ (mercure_topic_base ~ '/game/hub-' ~ session.id)|e('html_attr') }}"
|
||||||
data-api-ping-url="{{ path('game_api_ping')|e('html_attr') }}"
|
data-api-ping-url="{{ path('game_api_ping')|e('html_attr') }}"
|
||||||
data-api-echo-url="{{ path('game_api_message')|e('html_attr') }}"
|
data-api-echo-url="{{ path('game_api_message')|e('html_attr') }}"
|
||||||
|
data-screen="{{ screen|e('html_attr') }}"
|
||||||
style="display:none">
|
style="display:none">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ class GameDashboardServiceTest extends TestCase
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testCreateSessionInitializesRightsAndPwd(): void
|
public function testCreateSessionDoesNotInitializeSettings(): void
|
||||||
{
|
{
|
||||||
$game = new Game();
|
$game = new Game();
|
||||||
$game->setStatus(GameStatus::OPEN);
|
$game->setStatus(GameStatus::OPEN);
|
||||||
@@ -44,20 +44,23 @@ class GameDashboardServiceTest extends TestCase
|
|||||||
$user = new User();
|
$user = new User();
|
||||||
$user->setUsername('testuser');
|
$user->setUsername('testuser');
|
||||||
|
|
||||||
$this->entityManager->expects($this->exactly(7))
|
$this->entityManager->expects($this->exactly(2))
|
||||||
->method('persist');
|
->method('persist');
|
||||||
// 1. Session, 2. Player, 3. SessionSetting (rights), 4. SessionSetting (pwd), 5. SessionSetting (chat tracking), 6. SessionSetting (verify codes), 7. SessionSetting (verification progress)
|
// 1. Session, 2. Player
|
||||||
|
|
||||||
$session = $this->service->createSession($game, $user, false);
|
$session = $this->service->createSession($game, $user, false);
|
||||||
|
|
||||||
$this->assertInstanceOf(Session::class, $session);
|
$this->assertInstanceOf(Session::class, $session);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testJoinSessionInitializesRightsAndPwd(): void
|
public function testJoinSessionDoesNotInitializeSettings(): void
|
||||||
{
|
{
|
||||||
$user = new User();
|
$user = new User();
|
||||||
$user->setUsername('testuser');
|
$user->setUsername('testuser');
|
||||||
|
$game = new Game();
|
||||||
|
$game->setNumberOfPlayers(3);
|
||||||
$session = new Session();
|
$session = new Session();
|
||||||
|
$session->setGame($game);
|
||||||
|
|
||||||
$setting = new SessionSetting();
|
$setting = new SessionSetting();
|
||||||
$setting->setSession($session);
|
$setting->setSession($session);
|
||||||
@@ -71,15 +74,93 @@ class GameDashboardServiceTest extends TestCase
|
|||||||
$repo->method('findOneBy')
|
$repo->method('findOneBy')
|
||||||
->willReturn($setting);
|
->willReturn($setting);
|
||||||
|
|
||||||
$this->entityManager->expects($this->exactly(6))
|
$this->entityManager->expects($this->exactly(1))
|
||||||
->method('persist');
|
->method('persist');
|
||||||
// 1. Player, 2. SessionSetting (rights), 3. SessionSetting (pwd), 4. SessionSetting (chat tracking), 5. SessionSetting (verify codes), 6. SessionSetting (verification progress)
|
// 1. Player
|
||||||
|
|
||||||
$result = $this->service->joinSession('abc-123', $user);
|
$result = $this->service->joinSession('abc-123', $user);
|
||||||
|
|
||||||
$this->assertTrue($result);
|
$this->assertTrue($result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testStartSessionAssignsScreensAndInitializesSettings(): void
|
||||||
|
{
|
||||||
|
$game = new Game();
|
||||||
|
$game->setNumberOfPlayers(2);
|
||||||
|
$session = new Session();
|
||||||
|
$session->setGame($game);
|
||||||
|
$session->setStatus(\App\Game\Enum\SessionStatus::CREATED);
|
||||||
|
|
||||||
|
$user1 = new User();
|
||||||
|
$user1->setUsername('user1');
|
||||||
|
$player1 = new Player();
|
||||||
|
$player1->setUser($user1);
|
||||||
|
$session->addPlayer($player1);
|
||||||
|
|
||||||
|
$user2 = new User();
|
||||||
|
$user2->setUsername('user2');
|
||||||
|
$player2 = new Player();
|
||||||
|
$player2->setUser($user2);
|
||||||
|
$session->addPlayer($player2);
|
||||||
|
|
||||||
|
// For each player (2):
|
||||||
|
// Player (persist)
|
||||||
|
// SessionSetting (rights)
|
||||||
|
// SessionSetting (pwd)
|
||||||
|
// SessionSetting (chat tracking)
|
||||||
|
// SessionSetting (verify codes)
|
||||||
|
// SessionSetting (verification progress)
|
||||||
|
// Total = 2 * 6 = 12
|
||||||
|
// PLUS Session (persist)
|
||||||
|
// Total = 13
|
||||||
|
|
||||||
|
$this->entityManager->expects($this->exactly(13))
|
||||||
|
->method('persist');
|
||||||
|
|
||||||
|
$result = $this->service->startSession($session);
|
||||||
|
|
||||||
|
$this->assertTrue($result);
|
||||||
|
$this->assertEquals(\App\Game\Enum\SessionStatus::READY, $session->getStatus());
|
||||||
|
$this->assertNotNull($player1->getScreen());
|
||||||
|
$this->assertNotNull($player2->getScreen());
|
||||||
|
$this->assertNotEquals($player1->getScreen(), $player2->getScreen());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testStartSessionWithFourPlayers(): void
|
||||||
|
{
|
||||||
|
$game = new Game();
|
||||||
|
$game->setNumberOfPlayers(4);
|
||||||
|
$session = new Session();
|
||||||
|
$session->setGame($game);
|
||||||
|
$session->setStatus(\App\Game\Enum\SessionStatus::CREATED);
|
||||||
|
|
||||||
|
for ($i = 1; $i <= 4; $i++) {
|
||||||
|
$user = new User();
|
||||||
|
$user->setUsername('user' . $i);
|
||||||
|
$player = new Player();
|
||||||
|
$player->setUser($user);
|
||||||
|
$session->addPlayer($player);
|
||||||
|
}
|
||||||
|
|
||||||
|
// For each player (4):
|
||||||
|
// Player (persist) + 5 Settings = 6 persists
|
||||||
|
// Total = 4 * 6 = 24
|
||||||
|
// PLUS Session (persist)
|
||||||
|
// Total = 25
|
||||||
|
|
||||||
|
$this->entityManager->expects($this->exactly(25))
|
||||||
|
->method('persist');
|
||||||
|
|
||||||
|
$result = $this->service->startSession($session);
|
||||||
|
|
||||||
|
$this->assertTrue($result);
|
||||||
|
foreach ($session->getPlayers() as $player) {
|
||||||
|
$this->assertNotNull($player->getScreen());
|
||||||
|
$this->assertGreaterThanOrEqual(1, $player->getScreen());
|
||||||
|
$this->assertLessThanOrEqual(4, $player->getScreen());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function testLeaveSession(): void
|
public function testLeaveSession(): void
|
||||||
{
|
{
|
||||||
$user = new User();
|
$user = new User();
|
||||||
|
|||||||
Reference in New Issue
Block a user