Compare commits
1 Commits
continue-p
...
3737e8f581
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3737e8f581 |
133
assets/game1.js
133
assets/game1.js
@@ -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 || {});
|
||||||
@@ -104,15 +60,6 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
|
|
||||||
// Look for config injected by Twig in the page
|
// Look for config injected by Twig in the page
|
||||||
const cfgEl = document.getElementById('mercure-config');
|
const cfgEl = document.getElementById('mercure-config');
|
||||||
|
|
||||||
// Prevent/warn on page reload
|
|
||||||
window.addEventListener('beforeunload', (event) => {
|
|
||||||
// Standard way to trigger the browser's confirmation dialog
|
|
||||||
event.preventDefault();
|
|
||||||
// Included for compatibility with older browsers
|
|
||||||
event.returnValue = '';
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!cfgEl) {
|
if (!cfgEl) {
|
||||||
console.warn('[Mercure][game1] #mercure-config element not found on page');
|
console.warn('[Mercure][game1] #mercure-config element not found on page');
|
||||||
return;
|
return;
|
||||||
@@ -122,6 +69,7 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
const topic = cfgEl.dataset.topic;
|
const topic = cfgEl.dataset.topic;
|
||||||
const apiPingUrl = cfgEl.dataset.apiPingUrl;
|
const apiPingUrl = cfgEl.dataset.apiPingUrl;
|
||||||
const apiEchoUrl = cfgEl.dataset.apiEchoUrl;
|
const apiEchoUrl = cfgEl.dataset.apiEchoUrl;
|
||||||
|
const userId = cfgEl.dataset.userId;
|
||||||
|
|
||||||
if (mercurePublicUrl && topic) {
|
if (mercurePublicUrl && topic) {
|
||||||
subscribeToMercure(mercurePublicUrl, topic);
|
subscribeToMercure(mercurePublicUrl, topic);
|
||||||
@@ -141,7 +89,7 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
if (apiEchoUrl) {
|
if (apiEchoUrl) {
|
||||||
const echo = await fetchJson(apiEchoUrl, {
|
const echo = await fetchJson(apiEchoUrl, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: { message: 'from game1.js', ts: new Date().toISOString() },
|
body: { message: 'from game1.js', ts: new Date().toISOString(), user: userId },
|
||||||
});
|
});
|
||||||
console.log('[API][game1] echo →', echo);
|
console.log('[API][game1] echo →', echo);
|
||||||
} else {
|
} else {
|
||||||
@@ -150,81 +98,4 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('[API][game1] Request failed:', e);
|
console.error('[API][game1] Request failed:', e);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add messages to message-container
|
|
||||||
const messageContainer = document.getElementById('message-container');
|
|
||||||
if (messageContainer) {
|
|
||||||
let messages = [
|
|
||||||
['System initializing...', 500],
|
|
||||||
['Connection established.', 200],
|
|
||||||
['Welcome agent to the mainframe.', 1000],
|
|
||||||
['Scanning...', 3000],
|
|
||||||
['Virus detected.', 500],
|
|
||||||
['Starting Mainframe help modus...', 2000],
|
|
||||||
['Help modus activated.', 500],
|
|
||||||
['Blocking virus activated', 0]
|
|
||||||
];
|
|
||||||
|
|
||||||
let currentMessageIndex = 0;
|
|
||||||
|
|
||||||
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.textContent = msg[0];
|
|
||||||
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...');
|
|
||||||
setTimeout(() => {
|
|
||||||
messageContainer.style.height = '400vh';
|
|
||||||
const inputField = document.getElementById('input-message');
|
|
||||||
inputField.disabled = false;
|
|
||||||
|
|
||||||
// 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 = '';
|
|
||||||
try {
|
|
||||||
const response = await fetchJson(apiEchoUrl, {
|
|
||||||
method: 'POST',
|
|
||||||
body: { message, ts: new Date().toISOString() },
|
|
||||||
});
|
|
||||||
console.log('[API][game1] message sent →', response);
|
|
||||||
} catch (err) {
|
|
||||||
console.error('[API][game1] Failed to send message:', err);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log('[Game1] message-container height changed to 400vh and input enabled');
|
|
||||||
sequenceFinished = true;
|
|
||||||
console.log('[Game1] sequenceFinished is now TRUE');
|
|
||||||
}, 2000);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
printNextMessage();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,89 +1,17 @@
|
|||||||
/* Styles specific to Game1 */
|
/* Styles specific to Game1 */
|
||||||
|
|
||||||
/* page-level indicator to confirm CSS is loaded */
|
/* page-level indicator to confirm CSS is loaded */
|
||||||
/* Custom scrollbar for WebKit browsers */
|
body.game1-page {
|
||||||
html::-webkit-scrollbar,
|
/* subtle background tint so you can visually confirm on /game */
|
||||||
body::-webkit-scrollbar {
|
background-color: #f9fbff;
|
||||||
width: 1px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
html::-webkit-scrollbar-track,
|
/* example component style */
|
||||||
body::-webkit-scrollbar-track {
|
.game1-banner {
|
||||||
background: #000;
|
padding: 1rem 1.25rem;
|
||||||
}
|
border: 1px solid #cfe2ff;
|
||||||
|
background: #e9f2ff;
|
||||||
html::-webkit-scrollbar-thumb,
|
color: #0b5ed7;
|
||||||
body::-webkit-scrollbar-thumb {
|
border-radius: 8px;
|
||||||
background: #F00;
|
margin: 1rem 0;
|
||||||
}
|
|
||||||
|
|
||||||
/* Standard properties for Firefox */
|
|
||||||
body {
|
|
||||||
background-color: #000;
|
|
||||||
min-height: 100vh;
|
|
||||||
font-family: monospace;
|
|
||||||
margin: 0;
|
|
||||||
scrollbar-width: thin;
|
|
||||||
scrollbar-color: #F00 #000;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#game-timer {
|
|
||||||
position: fixed;
|
|
||||||
top: 20px;
|
|
||||||
left: 20px;
|
|
||||||
color: #F00;
|
|
||||||
font-size: 28px;
|
|
||||||
z-index: 100;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#message-container {
|
|
||||||
padding: 20px;
|
|
||||||
padding-top: 60px; /* Space for fixed timer */
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: flex-end;
|
|
||||||
min-height: calc(100vh - 100px); /* Fill most of the viewport initially */
|
|
||||||
box-sizing: border-box;
|
|
||||||
font-size: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.message {
|
|
||||||
color: #C0C0C0;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#input {
|
|
||||||
padding: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
input#input-message {
|
|
||||||
width: 100%;
|
|
||||||
padding: 10px;
|
|
||||||
background: #111;
|
|
||||||
border: 1px solid #A00000;
|
|
||||||
color: #C0C0C0;
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
@@ -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.
@@ -11,5 +11,4 @@ enum SessionSettingType: string
|
|||||||
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 INVITE_CODE = 'InviteCode';
|
||||||
case SET_OF_DELETED_FILES = 'SetOfDeletedFiles';
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,43 +1,33 @@
|
|||||||
<!DOCTYPE html>
|
{% extends 'base.html.twig' %}
|
||||||
<html lang="{{ app.request.locale|default(app.request.defaultLocale|default('en')) }}">
|
|
||||||
<head>
|
{% block title %}{{ 'game.title'|trans({'%site%': ('site.name'|trans)}) }}{% endblock %}
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>{{ 'game.title'|trans({'%site%': ('site.name'|trans)}) }}</title>
|
|
||||||
|
|
||||||
{# Include Game1-specific CSS in addition to the base app assets #}
|
{# Include Game1-specific CSS in addition to the base app assets #}
|
||||||
{% block stylesheets %}
|
{% block stylesheets %}
|
||||||
{{ encore_entry_link_tags('app') }}
|
{{ parent() }}
|
||||||
{{ encore_entry_link_tags('game1') }}
|
{{ encore_entry_link_tags('game1') }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<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-api-ping-url="{{ path('game_api_ping')|e('html_attr') }}"
|
|
||||||
data-api-echo-url="{{ path('game_api_message')|e('html_attr') }}"
|
|
||||||
style="display:none">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="game-timer">
|
{% block body %}
|
||||||
00:30:00
|
<h1>{{ 'game.h1'|trans }}</h1>
|
||||||
</div>
|
<p>{{ 'game.description'|trans }}</p>
|
||||||
<div id="message-container">
|
<div class="game1-banner">Game 1 assets are active. Enjoy the challenge!</div>
|
||||||
|
|
||||||
</div>
|
{# Hidden config element read by assets/game1.js #}
|
||||||
<audio id="message-sound" style="display:none">
|
<div id="mercure-config"
|
||||||
<source src="{{ asset('audio/message.mp3') }}" type="audio/mpeg">
|
data-mercure-public-url="{{ mercure_public_url|e('html_attr') }}"
|
||||||
</audio>
|
data-topic="{{ (mercure_topic_base ~ '/game/hub')|e('html_attr') }}"
|
||||||
<div id="input">
|
data-api-ping-url="{{ path('game_api_ping')|e('html_attr') }}"
|
||||||
<input type="text" disabled id="input-message">
|
data-api-echo-url="{{ path('game_api_message')|e('html_attr') }}"
|
||||||
</div>
|
data-session-id="{{ session.id }}"
|
||||||
</div>
|
style="display:none">
|
||||||
</body>
|
</div>
|
||||||
|
|
||||||
|
<p><a href="{{ path('website_home') }}">{{ 'link.back_to_website'|trans }}</a></p>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
{# Include Game1-specific JS in addition to the base app assets #}
|
{# Include Game1-specific JS in addition to the base app assets #}
|
||||||
{% block javascripts %}
|
{% block javascripts %}
|
||||||
{{ encore_entry_script_tags('app') }}
|
{{ parent() }}
|
||||||
{{ encore_entry_script_tags('game1') }}
|
{{ encore_entry_script_tags('game1') }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
Reference in New Issue
Block a user