Author SHA1 Message Date
Frank 56590a901f Created a dashboard and created an invite code for game sessions. 2026-01-06 20:23:46 +01:00
Frank 49045bc696 Merge pull request 'Game1-layout' (#4) from Game1-layout into main
Reviewed-on: #4
2026-01-06 19:21:58 +00:00
Frank 28ee969c29 Message on reload to hopefully stop the user. 2026-01-06 20:20:33 +01:00
Frank 7230520551 Layout done, probably need rework later on 2026-01-06 20:20:33 +01:00
Frank 59c1d97d84 Rechten van setup.sh 2026-01-06 20:20:17 +01:00
Frank van den Berg 3de1e907f2 Made it workable on docker containers 2026-01-06 19:48:33 +01:00
Frank 91c0c3e6d1 Merge pull request 'Commando's-given' (#3) from Commando's-given into main
Reviewed-on: #3
2026-01-06 11:05:48 +00:00
Frank 8e3807e079 Toevoeging van meer responses op messages 2026-01-05 23:37:36 +01:00
Frank 10c3dbc066 Updated rechten voor speler. Settings toegevoegd en onderdelen voor game1 toegevoegd. 2026-01-05 17:07:32 +01:00
Frank af13be2196 Messages handling voor spel 1 2026-01-05 15:27:37 +01:00
Frank c0aa2ad44e Message ipv echo voor route 2026-01-05 12:16:30 +01:00
Frank d3cff2ef58 Ignored 2026-01-05 12:16:01 +01:00
Frank 24b76f9700 ignore idea 2026-01-05 12:15:41 +01:00
Frank 03994dd54e Merge pull request 'Registration' (#2) from Registration into main
Reviewed-on: #2
2026-01-05 11:13:03 +00:00
Frank 499e699dbd Forgot password 2026-01-03 22:57:45 +01:00
Frank c8b0a6e966 Maillog 2026-01-03 22:35:56 +01:00
Frank 5b6bfaf5ad Quite some work done here. 2026-01-03 22:12:51 +01:00
Frank af61a3b920 Some settings 2026-01-03 13:16:58 +01:00
Frank 0d6628e7c9 Startup 2026-01-02 20:27:56 +01:00
Frank 534175efb3 Setup 2025-09-06 16:50:16 +02:00
11 changed files with 95 additions and 322 deletions
+63
View File
@@ -0,0 +1,63 @@
# In all environments, the following files are loaded if they exist,
# the latter taking precedence over the former:
#
# * .env contains default values for the environment variables needed by the app
# * .env.local uncommitted file with local overrides
# * .env.$APP_ENV committed environment-specific defaults
# * .env.$APP_ENV.local uncommitted environment-specific overrides
#
# Real environment variables win over .env files.
#
# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
# https://symfony.com/doc/current/configuration/secrets.html
#
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
###> symfony/framework-bundle ###
APP_ENV=dev
APP_SECRET=
###< symfony/framework-bundle ###
###> doctrine/doctrine-bundle ###
# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
#
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data_%kernel.environment%.db"
# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
DATABASE_URL="mysql://escapepage:b.0nqrxJ%%2FD%%2ALuf9N@localhost:3306/escapepage?serverVersion=8.0.32&charset=utf8mb4"
###< doctrine/doctrine-bundle ###
###> symfony/messenger ###
# Choose one of the transports below
# MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
# MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
###< symfony/messenger ###
###> symfony/mailer ###
# Development: use Mailpit (docker compose override provides service `mailer` on port 1025)
MAILER_DSN=smtp://mailer:1025
# Production/Stage (uncomment and set SENDGRID_API_KEY in real env or secrets):
# MAILER_DSN=sendgrid+api://%env(SENDGRID_API_KEY)%
# Alternatively, via SMTP (no extra package needed):
# MAILER_DSN="smtp://apikey:%env(SENDGRID_API_KEY)%@smtp.sendgrid.net:587?encryption=tls"
# Optional default sender (used by test command if --from not passed):
# MAILER_FROM=no-reply@your-domain.tld
# SENDGRID_API_KEY=your_real_key_goes_here # Do NOT commit this; set in .env.local or deployment env
###< symfony/mailer ###
###> symfony/sendgrid-mailer ###
# MAILER_DSN=sendgrid://KEY@default
###< symfony/sendgrid-mailer ###
###> mercure ###
# Internal hub URL used by the PHP app (reachable from the php container)
MERCURE_URL=http://mercure/.well-known/mercure
# Public hub URL used by browsers
MERCURE_PUBLIC_URL=http://localhost:8090/.well-known/mercure
# Shared secret for signing JWTs (dev only). In prod, set via real env/secrets.
MERCURE_JWT_SECRET=!ChangeThisMercureJWT!
# 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 ###
+4
View File
@@ -0,0 +1,4 @@
###> symfony/framework-bundle ###
APP_SECRET=620e9ce5f88a714b636179eb39d5be4f
###< symfony/framework-bundle ###
+9
View File
@@ -0,0 +1,9 @@
### Compiled or real environment variables should be used in production.
### Configure MAILER_DSN to use SendGrid API transport.
### Prefer storing SENDGRID_API_KEY using Symfony Secrets or real env vars.
###> symfony/mailer ###
# Example using SendGrid API key (replace with real secret via vault/secrets):
# SENDGRID_API_KEY=SG.xxxxx
MAILER_DSN=sendgrid+api://%env(resolve:SENDGRID_API_KEY)%@default
###< symfony/mailer ###
+3
View File
@@ -0,0 +1,3 @@
# define your env variables for the test env here
KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
+2 -60
View File
@@ -1,9 +1,6 @@
/* Game1 entry point built with Webpack Encore */
import './styles/game1.css';
let sequenceFinished = false;
let stillPlayingSound = true;
function subscribeToMercure(mercurePublicUrl, topic) {
try {
const url = mercurePublicUrl + '?topic=' + encodeURIComponent(topic);
@@ -13,25 +10,6 @@ function subscribeToMercure(mercurePublicUrl, topic) {
try {
const data = JSON.parse(event.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) {
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 = {}) {
const opts = { ...options };
const headers = new Headers(opts.headers || {});
@@ -169,26 +125,16 @@ document.addEventListener('DOMContentLoaded', async () => {
const printNextMessage = () => {
if (currentMessageIndex < messages.length) {
const msg = messages[currentMessageIndex];
const msgEl = document.createElement('div');
let extraClass = '';
if(msg[2])
extraClass = msg[2];
msgEl.className = 'message ' + extraClass;
msgEl.className = 'message';
msgEl.textContent = msg[0];
msgEl.style.color = '#F00';
msgEl.style.marginBottom = '10px';
messageContainer.appendChild(msgEl);
playSound();
currentMessageIndex++;
setTimeout(printNextMessage, msg[1]);
if (sequenceFinished) {
flashRed();
}
} else {
// 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...');
@@ -200,8 +146,6 @@ document.addEventListener('DOMContentLoaded', async () => {
// Add event listener for Enter key
inputField.addEventListener('keypress', async (e) => {
if (e.key === 'Enter') {
stillPlayingSound = false;
sequenceFinished = false;
const message = inputField.value.trim();
if (message && apiEchoUrl) {
inputField.value = '';
@@ -219,8 +163,6 @@ document.addEventListener('DOMContentLoaded', async () => {
});
console.log('[Game1] message-container height changed to 400vh and input enabled');
sequenceFinished = true;
console.log('[Game1] sequenceFinished is now TRUE');
}, 2000);
}
};
+3 -29
View File
@@ -47,10 +47,6 @@ div#message-container {
font-size: 20px;
}
div.message {
color: #C0C0C0;
}
div#input {
padding: 20px;
}
@@ -58,32 +54,10 @@ div#input {
input#input-message {
width: 100%;
padding: 10px;
background: #111;
border: 1px solid #A00000;
color: #C0C0C0;
background: #000;
border: 1px solid #F00;
color: #F00;
font-size: 18px;
box-sizing: border-box;
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;
}
}
Binary file not shown.
-1
View File
@@ -11,5 +11,4 @@ enum SessionSettingType: string
case RIGHTS_FOR_PLAYER2 = 'RightsForPlayer2';
case RIGHTS_FOR_PLAYER3 = 'RightsForPlayer3';
case INVITE_CODE = 'InviteCode';
case SET_OF_DELETED_FILES = 'SetOfDeletedFiles';
}
+9 -198
View File
@@ -8,8 +8,6 @@ use App\Game\Entity\Player;
use App\Game\Repository\SessionSettingRepository;
use App\Tech\Entity\User;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Mercure\HubInterface;
use Symfony\Component\Mercure\Update;
class GameResponseService
{
@@ -17,11 +15,10 @@ class GameResponseService
private Security $security,
private PlayerService $playerService,
private SessionSettingRepository $sessionSettingRepository,
private HubInterface $hub,
) {
}
public function getGameResponse(string $raw) : array
public function getGameResponse(string $raw)
{
$info = json_decode($raw, true);
@@ -86,10 +83,8 @@ class GameResponseService
if(!in_array('chat', $rechten))
return ['result' => ['Unknown command']];
if($this->handleChatMessage($message, $player))
return ['result' => ['succesfully send']];
else
return ['result' => ['Error sending']];
$this->handleChatMessage($message);
break;
case '/help':
return ['result' => $this->getHelpCommand($rechten)];
case '/decode':
@@ -106,6 +101,7 @@ class GameResponseService
default:
return ['result' => ['Unknown command']];
}
return [];
}
private function checkConsoleCommando(string $message, Player $player, bool $sudo = false) : array
@@ -116,15 +112,8 @@ class GameResponseService
case 'help':
return ['result' => $this->getHelpCommand($rechten)];
case 'ls':
if(!in_array('ls', $rechten))
return ['result' => ['Unknown command']];
$files = $this->getAllCurrentFilesInDirectory($player);
return ['result' => $files];
break;
case 'cd':
if(!in_array('cd', $rechten))
return ['result' => ['Unknown command']];
$pwd = $this->playerService->getCurrentPwdOfPlayer($player);
if(!$pwd)
return ['result' => ['Unknown command']];
@@ -135,43 +124,14 @@ class GameResponseService
$this->playerService->saveCurrentPwdOfPlayer($player, $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':
if(!in_array('rm', $rechten))
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]];
break;
case 'sudo':
if(!in_array('sudo', $rechten))
return ['result' => ['Unknown command']];
$sudo = array_shift($messagePart);
$message = implode(' ', $messagePart);
return $this->checkConsoleCommando($message, $player, true);
break;
default:
return ['result' => ['Unknown command']];
}
return [];
}
private function getHelpCommand(mixed $rechten) : array
@@ -201,13 +161,6 @@ class GameResponseService
$messages[] = ' USAGE: /decode {message}';
$messages[] = '';
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':
$messages[] = 'cat';
$messages[] = ' To read a file, use cat {filename}.';
@@ -257,42 +210,9 @@ class GameResponseService
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)
@@ -409,113 +329,4 @@ class GameResponseService
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;
}
}
-30
View File
@@ -4,7 +4,6 @@ namespace App\Game\Service;
use App\Game\Entity\Game;
use App\Game\Entity\Player;
use App\Game\Entity\SessionSetting;
use App\Game\Enum\SessionSettingType;
use App\Game\Enum\SessionStatus;
use App\Game\Repository\PlayerRepository;
@@ -74,33 +73,4 @@ class PlayerService
$this->entityManager->persist($setting);
$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();
}
}
}
+2 -4
View File
@@ -15,9 +15,10 @@
<div id="game-container">
<div id="mercure-config"
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-echo-url="{{ path('game_api_message')|e('html_attr') }}"
data-user-id="{{ user_id|e('html_attr') }}"
style="display:none">
</div>
@@ -27,9 +28,6 @@
<div id="message-container">
</div>
<audio id="message-sound" style="display:none">
<source src="{{ asset('audio/message.mp3') }}" type="audio/mpeg">
</audio>
<div id="input">
<input type="text" disabled id="input-message">
</div>