2 Commits

Author SHA1 Message Date
Frank
1fddcda12f Message on reload to hopefully stop the user. 2026-01-06 14:32:37 +01:00
Frank
2b51ca0a68 Layout done, probably need rework later on 2026-01-06 13:24:40 +01:00
17 changed files with 38 additions and 683 deletions

View File

@@ -1,9 +1,6 @@
/* Game1 entry point built with Webpack Encore */ /* Game1 entry point built with Webpack Encore */
import './styles/game1.css'; import './styles/game1.css';
let sequenceFinished = false;
let stillPlayingSound = true;
function subscribeToMercure(mercurePublicUrl, topic) { function subscribeToMercure(mercurePublicUrl, topic) {
try { try {
const url = mercurePublicUrl + '?topic=' + encodeURIComponent(topic); const url = mercurePublicUrl + '?topic=' + encodeURIComponent(topic);
@@ -13,25 +10,6 @@ function subscribeToMercure(mercurePublicUrl, topic) {
try { try {
const data = JSON.parse(event.data); const data = JSON.parse(event.data);
console.log('[Mercure][game1] Update:', data); console.log('[Mercure][game1] Update:', data);
// data is [sendTo, message]
if (Array.isArray(data) && data.length >= 2) {
const messageContainer = document.getElementById('message-container');
if (messageContainer) {
const msgEl = document.createElement('div');
msgEl.className = 'message';
msgEl.textContent = data[1];
msgEl.style.color = '#0F0'; // Green for incoming messages
msgEl.style.marginBottom = '10px';
messageContainer.appendChild(msgEl);
if(stillPlayingSound)
playSound();
console.log('[Mercure][game1] sequenceFinished status:', sequenceFinished);
if (sequenceFinished) {
flashRed();
}
}
}
} catch (e) { } catch (e) {
console.log('[Mercure][game1] Raw event:', event.data); console.log('[Mercure][game1] Raw event:', event.data);
} }
@@ -47,28 +25,6 @@ function subscribeToMercure(mercurePublicUrl, topic) {
} }
} }
function playSound() {
const sound = document.getElementById('message-sound');
if (sound) {
sound.currentTime = 0;
sound.play().catch(e => console.warn('[Audio] Playback failed:', e));
}
}
function flashRed() {
console.log('[Game1] Triggering flashRed');
const body = document.body;
body.classList.remove('flash-red');
void body.offsetWidth; // Trigger reflow to restart animation
body.classList.add('flash-red');
// Also remove it after animation finishes so it's clean for inspection
setTimeout(() => {
body.classList.remove('flash-red');
console.log('[Game1] Removed flash-red class');
}, 150);
}
async function fetchJson(url, options = {}) { async function fetchJson(url, options = {}) {
const opts = { ...options }; const opts = { ...options };
const headers = new Headers(opts.headers || {}); const headers = new Headers(opts.headers || {});
@@ -169,26 +125,16 @@ document.addEventListener('DOMContentLoaded', async () => {
const printNextMessage = () => { const printNextMessage = () => {
if (currentMessageIndex < messages.length) { if (currentMessageIndex < messages.length) {
const msg = messages[currentMessageIndex]; const msg = messages[currentMessageIndex];
const msgEl = document.createElement('div'); const msgEl = document.createElement('div');
msgEl.className = 'message';
let extraClass = '';
if(msg[2])
extraClass = msg[2];
msgEl.className = 'message ' + extraClass;
msgEl.textContent = msg[0]; msgEl.textContent = msg[0];
msgEl.style.color = '#F00';
msgEl.style.marginBottom = '10px'; msgEl.style.marginBottom = '10px';
messageContainer.appendChild(msgEl); messageContainer.appendChild(msgEl);
playSound();
currentMessageIndex++; currentMessageIndex++;
setTimeout(printNextMessage, msg[1]); setTimeout(printNextMessage, msg[1]);
if (sequenceFinished) {
flashRed();
}
} else { } else {
// After it has printed a set of messages, it has to start a timer of 2 seconds // After it has printed a set of messages, it has to start a timer of 2 seconds
console.log('[Game1] All messages printed. Starting 2s timer to expand message-container height...'); console.log('[Game1] All messages printed. Starting 2s timer to expand message-container height...');
@@ -200,8 +146,6 @@ document.addEventListener('DOMContentLoaded', async () => {
// Add event listener for Enter key // Add event listener for Enter key
inputField.addEventListener('keypress', async (e) => { inputField.addEventListener('keypress', async (e) => {
if (e.key === 'Enter') { if (e.key === 'Enter') {
stillPlayingSound = false;
sequenceFinished = false;
const message = inputField.value.trim(); const message = inputField.value.trim();
if (message && apiEchoUrl) { if (message && apiEchoUrl) {
inputField.value = ''; inputField.value = '';
@@ -219,8 +163,6 @@ document.addEventListener('DOMContentLoaded', async () => {
}); });
console.log('[Game1] message-container height changed to 400vh and input enabled'); console.log('[Game1] message-container height changed to 400vh and input enabled');
sequenceFinished = true;
console.log('[Game1] sequenceFinished is now TRUE');
}, 2000); }, 2000);
} }
}; };

View File

@@ -47,10 +47,6 @@ div#message-container {
font-size: 20px; font-size: 20px;
} }
div.message {
color: #C0C0C0;
}
div#input { div#input {
padding: 20px; padding: 20px;
} }
@@ -58,32 +54,10 @@ div#input {
input#input-message { input#input-message {
width: 100%; width: 100%;
padding: 10px; padding: 10px;
background: #111; background: #000;
border: 1px solid #A00000; border: 1px solid #F00;
color: #C0C0C0; color: #F00;
font-size: 18px; font-size: 18px;
box-sizing: border-box; box-sizing: border-box;
font-family: monospace; font-family: monospace;
} }
.flash-red::after {
content: '';
position: fixed;
bottom: 0;
left: 0;
right: 0;
height: 100px;
pointer-events: none;
background: linear-gradient(to top, rgba(255, 0, 0, 0.8), transparent);
animation: flash-red-anim 0.1s linear forwards;
z-index: 9999;
}
@keyframes flash-red-anim {
0% {
opacity: 1;
}
100% {
opacity: 0;
}
}

View File

@@ -5,7 +5,7 @@ services:
php: php:
build: build:
context: .. context: ..
dockerfile: docker/php/Dockerfile dockerfile: php/Dockerfile
container_name: escapepage-php container_name: escapepage-php
volumes: volumes:
- ../:/var/www/html:delegated - ../:/var/www/html:delegated
@@ -18,23 +18,6 @@ services:
- backend - backend
restart: unless-stopped restart: unless-stopped
php-worker:
build:
context: ..
dockerfile: docker/php/Dockerfile
container_name: escapepage-php-worker
volumes:
- ../:/var/www/html:delegated
environment:
APP_ENV: dev
depends_on:
- database
- mercure
command: ["php", "bin/console", "messenger:consume", "async", "-vv"]
networks:
- backend
restart: unless-stopped
nginx: nginx:
image: nginx:1.29.4-alpine image: nginx:1.29.4-alpine
container_name: escapepage-nginx container_name: escapepage-nginx

View File

@@ -1,20 +1,11 @@
FROM php:8.3-fpm-alpine FROM php:8.5.1-fpm-alpine3.23
# Install system deps # Install system deps
RUN apk add --no-cache \ RUN apk add --no-cache bash git icu-dev libzip-dev oniguruma-dev
bash \
git \
icu-dev \
libzip-dev \
oniguruma-dev \
g++ \
make \
nodejs \
npm
# Install PHP extensions # Install PHP extensions
RUN docker-php-ext-configure intl \ RUN docker-php-ext-configure intl \
&& docker-php-ext-install -j$(nproc) intl pdo pdo_mysql opcache zip && docker-php-ext-install -j$(nproc) intl pdo pdo_mysql opcache
# Install composer # Install composer
ENV COMPOSER_ALLOW_SUPERUSER=1 \ ENV COMPOSER_ALLOW_SUPERUSER=1 \
@@ -22,7 +13,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 \
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
# Configure PHP # Configure PHP
COPY docker/php/php.ini $PHP_INI_DIR/conf.d/zz-custom.ini COPY php.ini $PHP_INI_DIR/conf.d/zz-custom.ini
WORKDIR /var/www/html WORKDIR /var/www/html

View File

@@ -66,15 +66,12 @@ dc up "${BUILD_ARGS[@]}"
# Helper to run commands in php container # Helper to run commands in php container
pexec() { dc exec -T php "$@"; } pexec() { dc exec -T php "$@"; }
# Wait for database to be healthy (mariadb/mysql) # Wait for database to be healthy (mariadb)
printf "Waiting for database to be healthy..." printf "Waiting for database to be healthy..."
# Use docker inspect health status # Use docker inspect health status
DB_HEALTH="" DB_HEALTH=""
for i in {1..60}; do for i in {1..60}; do
DB_ID=$(dc ps -q database 2>/dev/null || true) DB_HEALTH=$(docker inspect -f '{{.State.Health.Status}}' "$(docker ps --filter name=_database_ --format '{{.ID}}' | head -n1)" 2>/dev/null || true)
if [ -n "$DB_ID" ]; then
DB_HEALTH=$(docker inspect -f '{{.State.Health.Status}}' "$DB_ID" 2>/dev/null || true)
fi
if [ "$DB_HEALTH" = "healthy" ]; then if [ "$DB_HEALTH" = "healthy" ]; then
echo " OK" echo " OK"
break break
@@ -82,7 +79,7 @@ for i in {1..60}; do
printf "." printf "."
sleep 2 sleep 2
if [ "$i" -eq 60 ]; then if [ "$i" -eq 60 ]; then
echo -e "\nWarning: database health check not healthy yet, continuing anyway." echo "\nWarning: database health check not healthy yet, continuing anyway."
fi fi
done done
@@ -103,23 +100,11 @@ if grep -q '^APP_SECRET=$' "$ROOT_DIR/.env" 2>/dev/null; then
fi fi
# Prepare DB # Prepare DB
echo "Creating database if it doesn't exist..." pexec php bin/console doctrine:database:create --if-not-exists || true
pexec php bin/console doctrine:database:create --if-not-exists pexec php bin/console doctrine:migrations:migrate -n || true
echo "Running migrations..."
pexec php bin/console doctrine:migrations:migrate -n
# Import JS deps (Importmap/Asset Mapper) # Import JS deps (Importmap/Asset Mapper)
if [ -f "$ROOT_DIR/importmap.php" ]; then
pexec php bin/console importmap:install || true pexec php bin/console importmap:install || true
fi
# Build assets if using Webpack Encore
if [ -f "$ROOT_DIR/package.json" ]; then
echo "Installing npm dependencies..."
pexec npm install
echo "Building assets..."
pexec npm run build
fi
APP_URL=http://localhost:8080 APP_URL=http://localhost:8080
MAILPIT_URL=http://localhost:8025 MAILPIT_URL=http://localhost:8025
@@ -132,12 +117,10 @@ Open the app: $APP_URL
Mailpit (dev): $MAILPIT_URL Mailpit (dev): $MAILPIT_URL
Common commands: Common commands:
(cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f nginx) (cd docker && $DOCKER_COMPOSE logs -f nginx)
(cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f php) (cd docker && $DOCKER_COMPOSE logs -f php)
(cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f php-worker) (cd docker && $DOCKER_COMPOSE exec php bash)
(cd "$DOCKER_DIR" && $DOCKER_COMPOSE exec php bash) (cd docker && $DOCKER_COMPOSE down)
(cd "$DOCKER_DIR" && $DOCKER_COMPOSE exec php npm run watch)
(cd "$DOCKER_DIR" && $DOCKER_COMPOSE down)
You can re-run this script any time. Use --no-build to skip rebuilding images. You can re-run this script any time. Use --no-build to skip rebuilding images.
EOT EOT

Binary file not shown.

View File

@@ -3,72 +3,17 @@ declare(strict_types=1);
namespace App\Game\Controller; namespace App\Game\Controller;
use App\Game\Entity\Session;
use App\Game\Repository\GameRepository;
use App\Game\Repository\SessionRepository;
use App\Game\Service\GameDashboardService;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Http\Attribute\IsGranted;
use Symfony\Component\ExpressionLanguage\Expression;
final class GameController extends AbstractController final class GameController extends AbstractController
{ {
#[Route(path: '', name: 'game_dashboard', methods: ['GET', 'POST'])] #[Route(path: '', name: 'game')]
#[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))] public function index(): Response
public function dashboard( {
Request $request, return $this->render('game/index.html.twig', [
GameRepository $gameRepository, 'user_id' => $this->getUser()?->getId(),
SessionRepository $sessionRepository,
GameDashboardService $dashboardService,
Security $security
): Response {
$user = $security->getUser();
$isAdmin = $this->isGranted('ROLE_ADMIN');
if ($request->isMethod('POST')) {
if ($request->request->has('create_session')) {
$gameId = $request->request->get('game_id');
$game = $gameRepository->find($gameId);
if ($game) {
if ($dashboardService->createSession($game, $user, $isAdmin)) {
$this->addFlash('success', 'New session created!');
}
}
} elseif ($request->request->has('create_invite')) {
$sessionId = $request->request->get('session_id');
$session = $sessionRepository->find($sessionId);
if (!$session) {
$this->addFlash('error', 'Session not found.');
return $this->redirectToRoute('game_dashboard');
}
$inviteCode = $dashboardService->generateInviteCode($session, $user, $isAdmin);
if ($inviteCode) {
$this->addFlash('success', 'Invite link created: ' . $inviteCode);
}
}
return $this->redirectToRoute('game_dashboard');
}
return $this->render('game/dashboard.html.twig', [
'sessions' => $dashboardService->getSessionsForUser($user),
'availableGames' => $dashboardService->getAvailableGames($isAdmin),
]); ]);
} }
#[Route(path: '/{session}', name: 'game')]
#[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
#[IsGranted('SESSION_VIEW', subject: 'session')]
public function index(
Session $session): Response
{
return $this->render('game/index.html.twig', ['session' => $session]);
}
} }

View File

@@ -10,6 +10,4 @@ enum SessionSettingType: string
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 INVITE_CODE = 'InviteCode';
case SET_OF_DELETED_FILES = 'SetOfDeletedFiles';
} }

View File

@@ -1,48 +0,0 @@
<?php
namespace App\Game\Security\Voter;
use App\Game\Entity\Session;
use App\Tech\Entity\User;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Authorization\Voter\Voter;
class SessionVoter extends Voter
{
public const VIEW = 'SESSION_VIEW';
public function __construct(
private readonly Security $security,
) {
}
protected function supports(string $attribute, mixed $subject): bool
{
return $attribute === self::VIEW && $subject instanceof Session;
}
protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token): bool
{
$user = $token->getUser();
if (!$user instanceof User) {
return false;
}
if ($this->security->isGranted('ROLE_ADMIN')) {
return true;
}
/** @var Session $session */
$session = $subject;
foreach ($session->getPlayers() as $player) {
if ($player->getUser() === $user) {
return true;
}
}
return false;
}
}

View File

@@ -1,116 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Game\Service;
use App\Game\Entity\Game;
use App\Game\Entity\Player;
use App\Game\Entity\Session;
use App\Game\Entity\SessionSetting;
use App\Game\Enum\GameStatus;
use App\Game\Enum\SessionSettingType;
use App\Game\Enum\SessionStatus;
use App\Game\Repository\GameRepository;
use App\Game\Repository\SessionRepository;
use App\Tech\Entity\User;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\Security\Core\User\UserInterface;
final class GameDashboardService
{
public function __construct(
private readonly GameRepository $gameRepository,
private readonly SessionRepository $sessionRepository,
private readonly EntityManagerInterface $entityManager,
) {
}
/**
* @return Session[]
*/
public function getSessionsForUser(UserInterface $user): array
{
return $this->sessionRepository->createQueryBuilder('s')
->innerJoin('s.players', 'p')
->where('p.user = :user')
->setParameter('user', $user)
->getQuery()
->getResult();
}
/**
* @return Game[]
*/
public function getAvailableGames(bool $isAdmin): array
{
if ($isAdmin) {
return $this->gameRepository->findAll();
}
return $this->gameRepository->findBy(['status' => GameStatus::OPEN]);
}
public function createSession(Game $game, UserInterface $user, bool $isAdmin): ?Session
{
if ($game->getStatus() !== GameStatus::OPEN && !$isAdmin) {
return null;
}
if(!$user instanceof User)
return null;
$session = new Session();
$session->setGame($game);
$session->setStatus(SessionStatus::CREATED);
$session->setTimer(0);
$player = new Player();
$player->setUser($user);
$player->setSession($session);
$player->setScreen(1);
$this->entityManager->persist($session);
$this->entityManager->persist($player);
$this->entityManager->flush();
return $session;
}
public function generateInviteCode(Session $session, UserInterface $user, bool $isAdmin): ?string
{
// Security check: is user part of this session?
$isPlayer = false;
foreach ($session->getPlayers() as $player) {
if ($player->getUser() === $user) {
$isPlayer = true;
break;
}
}
if (!$isPlayer && !$isAdmin) {
return null;
}
$inviteCode = bin2hex(random_bytes(4));
$setting = null;
foreach ($session->getSettings() as $s) {
if ($s->getName() === SessionSettingType::INVITE_CODE) {
$setting = $s;
break;
}
}
if (!$setting) {
$setting = new SessionSetting();
$setting->setSession($session);
$setting->setName(SessionSettingType::INVITE_CODE);
}
$setting->setValue($inviteCode);
$this->entityManager->persist($setting);
$this->entityManager->flush();
return $inviteCode;
}
}

View File

@@ -8,8 +8,6 @@ use App\Game\Entity\Player;
use App\Game\Repository\SessionSettingRepository; use App\Game\Repository\SessionSettingRepository;
use App\Tech\Entity\User; use App\Tech\Entity\User;
use Symfony\Bundle\SecurityBundle\Security; use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Mercure\HubInterface;
use Symfony\Component\Mercure\Update;
class GameResponseService class GameResponseService
{ {
@@ -17,11 +15,10 @@ class GameResponseService
private Security $security, private Security $security,
private PlayerService $playerService, private PlayerService $playerService,
private SessionSettingRepository $sessionSettingRepository, private SessionSettingRepository $sessionSettingRepository,
private HubInterface $hub,
) { ) {
} }
public function getGameResponse(string $raw) : array public function getGameResponse(string $raw)
{ {
$info = json_decode($raw, true); $info = json_decode($raw, true);
@@ -86,10 +83,8 @@ class GameResponseService
if(!in_array('chat', $rechten)) if(!in_array('chat', $rechten))
return ['result' => ['Unknown command']]; return ['result' => ['Unknown command']];
if($this->handleChatMessage($message, $player)) $this->handleChatMessage($message);
return ['result' => ['succesfully send']]; break;
else
return ['result' => ['Error sending']];
case '/help': case '/help':
return ['result' => $this->getHelpCommand($rechten)]; return ['result' => $this->getHelpCommand($rechten)];
case '/decode': case '/decode':
@@ -106,6 +101,7 @@ class GameResponseService
default: default:
return ['result' => ['Unknown command']]; return ['result' => ['Unknown command']];
} }
return [];
} }
private function checkConsoleCommando(string $message, Player $player, bool $sudo = false) : array private function checkConsoleCommando(string $message, Player $player, bool $sudo = false) : array
@@ -116,15 +112,8 @@ class GameResponseService
case 'help': case 'help':
return ['result' => $this->getHelpCommand($rechten)]; return ['result' => $this->getHelpCommand($rechten)];
case 'ls': case 'ls':
if(!in_array('ls', $rechten)) break;
return ['result' => ['Unknown command']];
$files = $this->getAllCurrentFilesInDirectory($player);
return ['result' => $files];
case 'cd': case 'cd':
if(!in_array('cd', $rechten))
return ['result' => ['Unknown command']];
$pwd = $this->playerService->getCurrentPwdOfPlayer($player); $pwd = $this->playerService->getCurrentPwdOfPlayer($player);
if(!$pwd) if(!$pwd)
return ['result' => ['Unknown command']]; return ['result' => ['Unknown command']];
@@ -135,43 +124,14 @@ class GameResponseService
$this->playerService->saveCurrentPwdOfPlayer($player, $newLocation); $this->playerService->saveCurrentPwdOfPlayer($player, $newLocation);
return ['result' => ['Path: ' . $newLocation]]; return ['result' => ['Path: ' . $newLocation]];
case 'pwd':
if(!in_array('pwd', $rechten))
return ['result' => ['Unknown command']];
$pwd = $this->playerService->getCurrentPwdOfPlayer($player);
return ['result' => ['Path: ' . $pwd]];
case 'rm': case 'rm':
if(!in_array('rm', $rechten)) break;
return ['result' => ['Unknown command']];
$pwd = $this->playerService->getCurrentPwdOfPlayer($player);
if(!$pwd)
return ['result' => ['Unknown command']];
if (!isset($messagePart[1])) {
return ['result' => ['Usage: rm {filename}']];
}
$filename = $messagePart[1];
$fullPath = ($pwd === '/' ? '' : $pwd) . '/' . $filename;
if(!$this->isAllowedToRemove($fullPath, $player, $sudo))
return ['result' => ['You are not allowed to remove this file.']];
$this->playerService->addDeletedFileToSession($player, $fullPath);
return ['result' => ['File removed: ' . $filename]];
case 'sudo': case 'sudo':
if(!in_array('sudo', $rechten)) break;
return ['result' => ['Unknown command']];
$sudo = array_shift($messagePart);
$message = implode(' ', $messagePart);
return $this->checkConsoleCommando($message, $player, true);
default: default:
return ['result' => ['Unknown command']]; return ['result' => ['Unknown command']];
} }
return [];
} }
private function getHelpCommand(mixed $rechten) : array private function getHelpCommand(mixed $rechten) : array
@@ -201,13 +161,6 @@ class GameResponseService
$messages[] = ' USAGE: /decode {message}'; $messages[] = ' USAGE: /decode {message}';
$messages[] = ''; $messages[] = '';
break; break;
case 'pwd':
$messages[] = 'pwd';
$messages[] = ' This message will let you know what your current location is.';
$messages[] = ' It will show you the folder you are in so you can continue navigating the server.';
$messages[] = ' USAGE: pwd';
$messages[] = '';
break;
case 'cat': case 'cat':
$messages[] = 'cat'; $messages[] = 'cat';
$messages[] = ' To read a file, use cat {filename}.'; $messages[] = ' To read a file, use cat {filename}.';
@@ -257,42 +210,9 @@ class GameResponseService
return $messages; return $messages;
} }
private function handleChatMessage(string $message, Player $player) : bool private function handleChatMessage(string $message)
{ {
$messageParts = explode(' ', $message);
$toSingle = false;
if (isset($messageParts[1]) &&
is_numeric($messageParts[1]) &&
$messageParts[1] >= 1 &&
$messageParts[1] <= 3) {
$toSingle = true;
}
$chatMessage = array_shift($messageParts);
$sendTo = 0;
if ($toSingle) {
$sendTo = array_shift($messageParts);
}
$message = $player->getUser()->getUsername() . ': ' . $chatMessage;
foreach($messageParts as $messagePart) {
$message .= $messagePart . ' ';
}
$message = trim($message);
$activeGame = $player->getSession()?->getId();
if(is_null($activeGame))
return false;
$topic = $_ENV['MERCURE_TOPIC_BASE'] . '/game/hub-' . $activeGame;
$this->hub->publish(new Update($topic, json_encode([$sendTo, $message])));
return true;
} }
private function handleDecodeMessage(string $message, Player $player) private function handleDecodeMessage(string $message, Player $player)
@@ -409,113 +329,4 @@ class GameResponseService
return $paths; return $paths;
} }
private function isAllowedToRemove(string $file, Player $player, bool $sudo) : bool
{
if(!$this->fileExists($file))
return false;
if(str_starts_with($file, '/var/rapports/'))
return false;
$rights = $this->getRechten($player);
if(in_array('sudo', $rights) || $sudo)
return true;
$sudoFiles = [
'/var/arrest/handle.sh',
'/var/arrest/cell.sh',
'/var/marriage/divorce.sh',
];
return !in_array($file, $sudoFiles);
}
private function fileExists(string $file)
{
$files = $this->getAllPossibleFiles();
if(in_array($file, $files))
return true;
return false;
}
private function getAllPossibleFiles()
{
$files = [];
$files[] = '/var/arrest/handle.sh';
$files[] = '/var/arrest/bars.sh';
$files[] = '/var/arrest/cell.sh';
$files[] = '/var/marriage/share.sh';
$files[] = '/var/marriage/divorce.sh';
$files[] = '/var/rapports/095_07-14.txt';
$files[] = '/var/rapports/007_19-52.txt';
$files[] = '/var/rapports/083_25-39.txt';
$files[] = '/var/rapports/019_31-11.txt';
$files[] = '/var/rapports/075_46-77.txt';
$files[] = '/var/rapports/031_53-28.txt';
$files[] = '/var/rapports/072_61-05.txt';
$files[] = '/var/rapports/064_72-90.txt';
$files[] = '/var/rapports/091_81-33.txt';
$files[] = '/var/rapports/079_89-47.txt';
$files[] = '/var/rapports/098_92-14.txt';
$files[] = '/var/rapports/012_94-31.txt';
$files[] = '/var/rapports/016_98-07.txt';
$files[] = '/var/rapports/087_102-45.txt';
$files[] = '/var/rapports/094_110-19.txt';
$files[] = '/var/rapports/063_117-56.txt';
$files[] = '/var/rapports/017_123-88.txt';
$files[] = '/var/rapports/093_138-24.txt';
$files[] = '/var/rapports/001_145-93.txt';
$files[] = '/var/rapports/index.txt';
return $files;
}
private function getAllCurrentFilesInDirectory(Player $player) : array
{
$pwd = $this->playerService->getCurrentPwdOfPlayer($player);
if (!$pwd) {
return [];
}
$allPaths = $this->getAllPossiblePaths($player);
$allFiles = $this->getAllPossibleFiles();
$deletedFiles = $this->playerService->getDeletedFilesOfSession($player);
$entries = [];
// Find directories in current pwd
foreach ($allPaths as $path) {
if ($path === $pwd) {
continue;
}
// Check if $path is a direct child of $pwd
$parent = $this->getPrevPath($path);
if ($parent === $pwd) {
$parts = explode('/', $path);
$entries[] = [end($parts) . '/', 'dir'];
}
}
// Find files in current pwd
foreach ($allFiles as $file) {
if (in_array($file, $deletedFiles)) {
continue;
}
$parent = $this->getPrevPath($file);
if ($parent === $pwd) {
$parts = explode('/', $file);
$entries[] = [end($parts), 'file'];
}
}
sort($entries);
return $entries;
}
} }

View File

@@ -4,7 +4,6 @@ namespace App\Game\Service;
use App\Game\Entity\Game; use App\Game\Entity\Game;
use App\Game\Entity\Player; use App\Game\Entity\Player;
use App\Game\Entity\SessionSetting;
use App\Game\Enum\SessionSettingType; use App\Game\Enum\SessionSettingType;
use App\Game\Enum\SessionStatus; use App\Game\Enum\SessionStatus;
use App\Game\Repository\PlayerRepository; use App\Game\Repository\PlayerRepository;
@@ -74,33 +73,4 @@ class PlayerService
$this->entityManager->persist($setting); $this->entityManager->persist($setting);
$this->entityManager->flush(); $this->entityManager->flush();
} }
public function getDeletedFilesOfSession(Player $player): array
{
$setting = $this->sessionSettingRepository->getSetting($player->getSession(), SessionSettingType::SET_OF_DELETED_FILES);
if (!$setting || !$setting->getValue()) {
return [];
}
return json_decode($setting->getValue(), true) ?? [];
}
public function addDeletedFileToSession(Player $player, string $filename): void
{
$setting = $this->sessionSettingRepository->getSetting($player->getSession(), SessionSettingType::SET_OF_DELETED_FILES);
if (!$setting) {
$setting = new SessionSetting();
$setting->setSession($player->getSession());
$setting->setName(SessionSettingType::SET_OF_DELETED_FILES);
}
$deletedFiles = json_decode($setting->getValue() ?? '[]', true) ?? [];
if (!in_array($filename, $deletedFiles)) {
$deletedFiles[] = $filename;
$setting->setValue(json_encode($deletedFiles));
$this->entityManager->persist($setting);
$this->entityManager->flush();
}
}
} }

View File

@@ -31,8 +31,6 @@ class RegistrationController extends AbstractController
) )
); );
$user->setRoles(['ROLE_USER', 'ROLE_PLAYER']);
$entityManager->persist($user); $entityManager->persist($user);
$entityManager->flush(); $entityManager->flush();

View File

@@ -14,7 +14,7 @@
<nav> <nav>
{% set pathinfo = app.request.pathinfo %} {% set pathinfo = app.request.pathinfo %}
<a href="/">{{ 'nav.home'|trans }}</a> | <a href="/">{{ 'nav.home'|trans }}</a> |
<a href="{{ path('game_dashboard') }}">{{ 'nav.game'|trans }}</a> | <a href="/game">{{ 'nav.game'|trans }}</a> |
{% if app.user %} {% if app.user %}
<a href="{{ path('app_logout') }}">Logout</a> <a href="{{ path('app_logout') }}">Logout</a>
{% else %} {% else %}

View File

@@ -1,74 +0,0 @@
{% extends 'base.html.twig' %}
{% block title %}Game Dashboard{% endblock %}
{% block body %}
<h1>Game Dashboard</h1>
<h2>Create New Session</h2>
{% if availableGames is not empty %}
<form method="post">
<select name="game_id">
{% for game in availableGames %}
<option value="{{ game.id }}">
{{ game.name }} ({{ game.numberOfPlayers }} players)
{% if is_granted('ROLE_ADMIN') %}
[{{ game.status.value }}]
{% endif %}
</option>
{% endfor %}
</select>
<button type="submit" name="create_session">Create Session</button>
</form>
{% else %}
<p>No games available to start.</p>
{% endif %}
<h2>Your Sessions</h2>
{% if sessions is not empty %}
<table>
<thead>
<tr>
<th>ID</th>
<th>Game</th>
<th>Status</th>
<th>Created At</th>
<th>Invite Code</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
{% for session in sessions %}
<tr>
<td>{{ session.id }}</td>
<td>{{ session.game.name }}</td>
<td>{{ session.status.value }}</td>
<td>{{ session.created|date('Y-m-d H:i') }}</td>
<td>
{% set inviteCode = '' %}
{% for setting in session.settings %}
{% if setting.name.value == 'InviteCode' %}
{% set inviteCode = setting.value %}
{% endif %}
{% endfor %}
{% if inviteCode %}
<code>{{ inviteCode }}</code>
{% else %}
<form method="post" style="display:inline;">
<input type="hidden" name="session_id" value="{{ session.id }}">
<button type="submit" name="create_invite">Generate Invite</button>
</form>
{% endif %}
</td>
<td>
<a href="{{ path('game', {session: session.id}) }}">Enter Game</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<p>You are not part of any sessions.</p>
{% endif %}
{% endblock %}

View File

@@ -15,9 +15,10 @@
<div id="game-container"> <div id="game-container">
<div id="mercure-config" <div id="mercure-config"
data-mercure-public-url="{{ mercure_public_url|e('html_attr') }}" data-mercure-public-url="{{ mercure_public_url|e('html_attr') }}"
data-topic="{{ (mercure_topic_base ~ '/game/hub-' ~ session.id)|e('html_attr') }}" data-topic="{{ (mercure_topic_base ~ '/game/hub')|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-user-id="{{ user_id|e('html_attr') }}"
style="display:none"> style="display:none">
</div> </div>
@@ -27,9 +28,6 @@
<div id="message-container"> <div id="message-container">
</div> </div>
<audio id="message-sound" style="display:none">
<source src="{{ asset('audio/message.mp3') }}" type="audio/mpeg">
</audio>
<div id="input"> <div id="input">
<input type="text" disabled id="input-message"> <input type="text" disabled id="input-message">
</div> </div>

View File

@@ -5,5 +5,5 @@
{% block body %} {% block body %}
<h1>{{ 'home.h1'|trans({'%site%': ('site.name'|trans)}) }}</h1> <h1>{{ 'home.h1'|trans({'%site%': ('site.name'|trans)}) }}</h1>
<p>{{ 'home.description'|trans }}</p> <p>{{ 'home.description'|trans }}</p>
<p><a href="{{ path('game_dashboard') }}">{{ 'link.enter_game'|trans }}</a></p> <p><a href="{{ path('game') }}">{{ 'link.enter_game'|trans }}</a></p>
{% endblock %} {% endblock %}