Compare commits
20
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eda15bc585 | ||
|
|
1a304cb398 | ||
|
|
cd7f7e0468 | ||
|
|
e1ee009063 | ||
|
|
f90351dd8d | ||
|
|
d2625d23ab | ||
|
|
8b6abdb8b2 | ||
|
|
eb80c4845c | ||
|
|
90996d1b0a | ||
|
|
da986d44c8 | ||
|
|
5383008c8e | ||
|
|
11ccbf01a1 | ||
|
|
5012e8b16d | ||
|
|
1744ff3f73 | ||
|
|
d560c15fef | ||
|
|
364c0b57c2 | ||
|
|
9f2e810fa1 | ||
|
|
e9efe38b76 | ||
|
|
dea0618b69 | ||
|
|
0197cd05ce |
No files matched your search
@@ -52,6 +52,9 @@ CS2_PORT_RANGE_END=27115
|
||||
# Gemeinsames Volume für die Spieldateien (~60 GB), damit nicht jedes Match neu herunterlädt
|
||||
CS2_DOCKER_VOLUME=cs2-mapveto-gamefiles
|
||||
CS2_DOCKER_EXTRA_ARGS=
|
||||
# Optional: mehrere Docker-Hosts als JSON-Liste (eine Zeile). Leer = nur CS2_PUBLIC_HOST/DOCKER_HOST.
|
||||
# Einrichtung pro Host: bash deploy/docker-host-einrichten.sh <ssh-ziel>
|
||||
# CS2_DOCKER_HOSTS=[{"name":"host1","dockerHost":"ssh://cs2@192.168.178.111","publicHost":"192.168.178.111","portStart":27100,"portEnd":27139}]
|
||||
CS2_START_TIMEOUT_MINUTES=20
|
||||
DOCKER_BIN=docker
|
||||
|
||||
|
||||
@@ -236,6 +236,24 @@ Voraussetzungen:
|
||||
|
||||
Container heißen `cs2mv-<matchId>` und tragen das Label `cs2-mapveto=1`. Stoppen bedeutet `docker rm -f`.
|
||||
|
||||
### Mehrere Docker-Hosts
|
||||
|
||||
Mit `CS2_DOCKER_HOSTS` verteilt die Anwendung Matches auf mehrere Docker-Hosts. Jedes neue Match läuft auf dem Host mit den meisten freien Ports. Der Host bleibt im Match gespeichert, Status, Konfiguration und Stopp gehen immer an denselben Host.
|
||||
|
||||
1. Jeden Host einrichten (SSH-Schlüssel, Docker, Volume, Image):
|
||||
|
||||
```bash
|
||||
bash deploy/docker-host-einrichten.sh cs2@192.168.178.111
|
||||
```
|
||||
|
||||
2. Die Hosts in der `.env` eintragen, als JSON-Liste in einer Zeile:
|
||||
|
||||
```
|
||||
CS2_DOCKER_HOSTS=[{"name":"host1","dockerHost":"ssh://cs2@192.168.178.111","publicHost":"192.168.178.111","portStart":27100,"portEnd":27139},{"name":"host2","dockerHost":"ssh://cs2@192.168.178.112","publicHost":"192.168.178.112","portStart":27100,"portEnd":27139}]
|
||||
```
|
||||
|
||||
Jeder Host braucht eigene Spieldateien (rund 60 bis 90 GB). Die Ports müssen auf jedem Host frei sein.
|
||||
|
||||
### Option B: Vorhandene Server (`SERVER_ADAPTER=static`)
|
||||
|
||||
Für selbst betriebene, dauerhaft laufende CS2-Server:
|
||||
@@ -311,7 +329,7 @@ Beim Konfigurieren setzt CS2 Mapveto auf dem Server `log on` und `logaddress_add
|
||||
- Stream-Seite
|
||||
- **Nach dem Spielende:** Ist die Serie noch offen, lädt CS2 Mapveto nach `SERIES_AUTO_ADVANCE_SECONDS` (Standard 30) die nächste Map. Ist sie entschieden (z. B. 2:0 im Best of 3), wird das Match abgeschlossen und der Server freigegeben. Mit `-1` geht beides nur manuell.
|
||||
- **Voraussetzung:** Der CS2-Server muss `LOG_RECEIVER_URL` erreichen, im LAN z. B. `http://192.168.178.31:3000`. Ob Daten ankommen, zeigt das Serverpanel des Organisators. Mit `LOG_DEBUG=true` gibt das Backend alle empfangenen Zeilen aus.
|
||||
- **Geprüft:** mit echten Logzeilen eines CS2-Servers (Wingman), siehe `server/test/fixtures/echte-logs-wingman.log`.
|
||||
- **Geprüft:** mit echten Logzeilen eines CS2-Servers (Wingman), anonymisiert in `server/test/fixtures/wingman-anonym.log`.
|
||||
|
||||
Zwei Eigenheiten von CS2 berücksichtigt der Parser:
|
||||
- CS2 sendet `Match_Start` schon beim Laden der Map. Gezählt wird erst, nachdem der Organisator „Aufwärmphase beenden“ geklickt hat.
|
||||
@@ -357,6 +375,45 @@ Jede Meldung enthält einen Link auf die Match-Übersicht (`/stream/match/<id>`)
|
||||
Webhook anlegen: Discord-Kanal → Einstellungen → Integrationen → Webhooks → Neuer Webhook, dann die URL kopieren.
|
||||
|
||||
Welche Ereignisse gemeldet werden, wählt der Admin im Admin-Bereich unter „Discord-Meldungen“. Die Auswahl wird in der Datenbank gespeichert. Die Webhook-URL bleibt in der Konfiguration, weil sie ein Geheimnis ist. Die Schaltfläche „Testmeldung senden“ prüft die Verbindung.
|
||||
### Hinter einem Reverse-Proxy
|
||||
|
||||
Die Webseite lässt sich hinter einen Reverse-Proxy wie nginx, Caddy oder Traefik stellen, etwa um sie per HTTPS unter einer eigenen Adresse anzubieten.
|
||||
|
||||
- **Eigene (Sub-)Domain, kein Unterpfad.** Die Anwendung nutzt absolute Pfade (`/api`, `/socket.io`, `/stream`, `/admin`). Unter einem Unterpfad wie `example.de/veto/` funktioniert sie nicht. Nimm eine eigene Subdomain, z. B. `veto.example.de`.
|
||||
- **WebSockets durchreichen.** Die Live-Updates laufen über Socket.IO. Der Proxy muss den `Upgrade`-Header weitergeben, sonst bleibt die Seite bei „Verbinde mit Lobby“ hängen.
|
||||
- **`.env` anpassen:**
|
||||
- `PUBLIC_URL=https://veto.example.de`, damit Einladungs- und Stream-Links stimmen
|
||||
- `TRUST_PROXY=true`, damit die Begrenzung der Anmeldeversuche die echte Client-IP sieht und nicht die des Proxys
|
||||
- **Nicht über den Proxy:**
|
||||
- Die CS2-Spielverbindungen laufen per UDP direkt zum Docker-Host. Für Spieler aus dem Internet braucht es dort Portfreigaben und einen GSLT (`CS2_GSLT`).
|
||||
- Die Logs der CS2-Server können weiter über das LAN kommen. `LOG_RECEIVER_URL` bleibt dann z. B. `http://192.168.178.31:3000`.
|
||||
- **Vor dem Freigeben absichern:** Öffentlich erreichbar sind dann auch `/admin` und, ohne Schlüssel, die Stream-Übersicht. Setze ein starkes `ADMIN_PASSWORD` und einen `STREAM_KEY`.
|
||||
|
||||
Beispiel für nginx:
|
||||
|
||||
```nginx
|
||||
server {
|
||||
listen 443 ssl http2;
|
||||
server_name veto.example.de;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/veto.example.de/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/veto.example.de/privkey.pem;
|
||||
|
||||
location / {
|
||||
proxy_pass http://192.168.178.31:3000;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_read_timeout 1h;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Ein `502 Bad Gateway` vom Proxy heißt, dass er die Anwendung unter `proxy_pass` nicht erreicht: Sie läuft nicht, oder Adresse bzw. Port stimmen nicht.
|
||||
|
||||
---
|
||||
|
||||
## Umgebungsvariablen
|
||||
@@ -383,6 +440,7 @@ Alle Variablen mit Standardwerten stehen in [`.env.example`](.env.example). Die
|
||||
| `LOG_DEBUG` | `false` | empfangene Logzeilen im Terminal ausgeben |
|
||||
| `STREAM_KEY` | leer | Schlüssel für die Stream-Übersicht aller Matches (`/stream?key=…`); leer = offen |
|
||||
| `DISCORD_WEBHOOK_URL` | leer | Discord-Webhook für Meldungen zu Veto, Match-Start, Map- und Serienende sowie Serverfehlern; leer = aus |
|
||||
| `TRUST_PROXY` | `false` | `true`, wenn die Anwendung hinter einem Reverse-Proxy läuft (echte Client-IP für die Begrenzung der Anmeldeversuche) |
|
||||
| `SERIES_AUTO_ADVANCE_SECONDS` | `30` | Wartezeit nach Map-Ende bis zur nächsten Map bzw. zum Abschluss; `-1` = manuell |
|
||||
|
||||
Benötigte Zugangsdaten für den Echtbetrieb:
|
||||
|
||||
@@ -10,6 +10,7 @@ export default function VetoBoard({ state, viewer, act, busy, compact = false })
|
||||
const { current } = veto;
|
||||
const [selected, setSelected] = useState(null);
|
||||
useEffect(() => setSelected(null), [current?.index]);
|
||||
const left = useCountdown(veto.remainingMs);
|
||||
|
||||
const mapsById = Object.fromEntries(state.maps.map((m) => [m.id, m]));
|
||||
const yourTurn = !!current && viewer.isCaptain && viewer.team === current.team;
|
||||
@@ -38,6 +39,7 @@ export default function VetoBoard({ state, viewer, act, busy, compact = false })
|
||||
? 'Live-Ansicht – nur Captains können wählen.'
|
||||
: 'Das andere Team ist am Zug.'}
|
||||
</span>
|
||||
{left !== null && <TimerBar left={left} totalMs={(veto.stepSeconds || 30) * 1000} />}
|
||||
</div>
|
||||
)}
|
||||
{!current && veto.done && !compact && <div className="turn turn-done">Veto abgeschlossen</div>}
|
||||
@@ -129,3 +131,28 @@ function statusText(m, teams) {
|
||||
default: return 'Verfügbar';
|
||||
}
|
||||
}
|
||||
|
||||
/** Leiste für die verbleibende Zeit des Veto-Schritts. In den letzten 10 Sekunden wird sie rot. */
|
||||
function TimerBar({ left, totalMs }) {
|
||||
const seconds = Math.ceil(left / 1000);
|
||||
const percent = Math.max(0, Math.min(100, (left / totalMs) * 100));
|
||||
return (
|
||||
<div className={`turn-timer ${left <= 10_000 ? 'is-low' : ''}`} role="timer" aria-label={`Noch ${seconds} Sekunden`}>
|
||||
<div className="turn-bar"><span style={{ width: `${percent}%` }} /></div>
|
||||
<span className="turn-seconds">{seconds} s</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** Verbleibende Zeit des Veto-Schritts: der Server setzt sie bei jeder Änderung, danach zählt die Anzeige lokal herunter. */
|
||||
function useCountdown(ms) {
|
||||
const [left, setLeft] = useState(ms ?? null);
|
||||
useEffect(() => {
|
||||
setLeft(ms ?? null);
|
||||
if (ms == null) return undefined;
|
||||
const started = Date.now();
|
||||
const t = setInterval(() => setLeft(Math.max(0, ms - (Date.now() - started))), 250);
|
||||
return () => clearInterval(t);
|
||||
}, [ms]);
|
||||
return left;
|
||||
}
|
||||
@@ -29,6 +29,7 @@ export default function AdminPage() {
|
||||
const [error, setError] = useState(null);
|
||||
const [notice, setNotice] = useState(null);
|
||||
const [busy, setBusy] = useState(null);
|
||||
const [tab, setTab] = useState('matches');
|
||||
|
||||
const logout = useCallback(() => {
|
||||
api('/admin/logout', { method: 'POST', token }).catch(() => {});
|
||||
@@ -92,17 +93,22 @@ export default function AdminPage() {
|
||||
<button className="btn btn-sm" onClick={logout}>Abmelden</button>
|
||||
</header>
|
||||
|
||||
{token && <NotificationSettings token={token} setNotice={setNotice} />}
|
||||
<nav className="admin-tabs" aria-label="Admin-Bereiche">
|
||||
<button className={`admin-tab ${tab === 'matches' ? 'is-active' : ''}`} onClick={() => setTab('matches')}>Matches</button>
|
||||
<button className={`admin-tab ${tab === 'settings' ? 'is-active' : ''}`} onClick={() => setTab('settings')}>Einstellungen</button>
|
||||
</nav>
|
||||
|
||||
{tab === 'settings' && token && <NotificationSettings token={token} setNotice={setNotice} />}
|
||||
{notice && <div className={`toast toast-${notice.tone}`} role="status">{notice.text}</div>}
|
||||
{error && <div className="alert alert-error">{error}</div>}
|
||||
{matches === null && !error && <p className="muted">Lade Matches …</p>}
|
||||
{matches && matches.length === 0 && <p className="muted">Noch keine Matches.</p>}
|
||||
{tab === 'matches' && matches === null && !error && <p className="muted">Lade Matches …</p>}
|
||||
{tab === 'matches' && matches && matches.length === 0 && <p className="muted">Noch keine Matches.</p>}
|
||||
|
||||
<div className="admin-list">
|
||||
{tab === 'matches' && <div className="admin-list">
|
||||
{matches?.map((m) => (
|
||||
<MatchAdminCard key={m.id} m={m} run={run} busy={busy} token={token} reload={load} setNotice={setNotice} />
|
||||
))}
|
||||
</div>
|
||||
</div>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -265,6 +271,9 @@ function MatchAdminCard({ m, run, busy, token, reload, setNotice }) {
|
||||
</button>
|
||||
);
|
||||
const hasNext = m.series.some((s) => s.number === m.currentMapNumber + 1);
|
||||
const current = m.series.find((s) => s.number === m.currentMapNumber);
|
||||
const configured = m.server?.status === 'configured';
|
||||
const paused = !!m.server?.paused;
|
||||
|
||||
return (
|
||||
<section className={`panel admin-card status-${m.status}`}>
|
||||
@@ -277,6 +286,14 @@ function MatchAdminCard({ m, run, busy, token, reload, setNotice }) {
|
||||
{m.modeLabel}, {FORMAT_LABEL[m.format]} · {m.statusLabel} · <span className={`tone-${server.tone}`}>{server.text}</span>
|
||||
{m.format !== 'bo1' && <> · Serie {m.seriesScore.A}:{m.seriesScore.B}</>}
|
||||
</div>
|
||||
{m.status === 'live' && current && (
|
||||
<div className="admin-live">
|
||||
<span>Map {current.number}: {current.name}</span>
|
||||
<strong>{current.score.A} : {current.score.B}</strong>
|
||||
{current.live?.roundsPlayed != null && <span className="muted">Runde {current.live.roundsPlayed + 1}</span>}
|
||||
</div>
|
||||
)}
|
||||
{paused && <span className="admin-badge is-paused">Pausiert</span>}
|
||||
</div>
|
||||
<button className="link-btn" onClick={() => setOpen(!open)}>{open ? 'Weniger' : 'Details'}</button>
|
||||
</div>
|
||||
@@ -285,8 +302,8 @@ function MatchAdminCard({ m, run, busy, token, reload, setNotice }) {
|
||||
<Link className="btn btn-sm" to={`/m/${id}`}>Ansehen</Link>
|
||||
{m.status === 'lobby' && btn('Veto starten', { path: '/veto/start' }, 'btn-primary')}
|
||||
{(m.server?.status === 'configured') && btn('Aufwärmphase beenden', { path: '/server/warmup-end' })}
|
||||
{(m.server?.status === 'configured') && btn('Pausieren', { path: '/server/pause', confirm: 'Match pausieren?' })}
|
||||
{(m.server?.status === 'configured') && btn('Fortsetzen', { path: '/server/resume' })}
|
||||
{configured && !paused && btn('Pausieren', { path: '/server/pause', confirm: 'Match pausieren?' }, 'btn-warn')}
|
||||
{configured && paused && btn('Fortsetzen', { path: '/server/resume' }, 'btn-primary')}
|
||||
{(m.server?.status === 'configured') && hasNext && btn('Nächste Map', { path: '/series/next' })}
|
||||
{m.server && ['start_failed', 'failed', 'stopped', 'config_failed', 'ready'].includes(m.server.status) && !closed &&
|
||||
btn('Server neu starten / wiederholen', { path: '/server/retry' })}
|
||||
|
||||
@@ -127,7 +127,7 @@ export default function MatchPage() {
|
||||
|
||||
{viewer.role === 'public' && <PublicNotice />}
|
||||
|
||||
<div className={`match-grid ${state.status !== 'lobby' && viewer.role !== 'public' ? 'stage-wide' : ''}`}>
|
||||
<div className={`match-grid ${state.status !== 'lobby' ? 'stage-wide' : ''}`}>
|
||||
<TeamCard team={state.teams.A} side="A" {...ctx} />
|
||||
<section className="stage">
|
||||
<Stage {...ctx} />
|
||||
@@ -156,8 +156,8 @@ function describeViewer(viewer, teams) {
|
||||
|
||||
function Stage(ctx) {
|
||||
const { state, isOrg, act, busy } = ctx;
|
||||
if (state.viewer.role === 'public') {
|
||||
return <div className="stage-note"><h2>{state.statusLabel}</h2><p className="muted">Details sehen nur Teilnehmer.</p></div>;
|
||||
if (state.viewer.role === 'public' && state.status === 'lobby') {
|
||||
return <div className="stage-note"><h2>{state.statusLabel}</h2><p className="muted">Das Veto und der Spielstand erscheinen hier, sobald das Match startet.</p></div>;
|
||||
}
|
||||
if (state.status === 'lobby') {
|
||||
const { A, B } = state.teams;
|
||||
@@ -230,8 +230,8 @@ function MapPoolPreview({ maps }) {
|
||||
function PublicNotice() {
|
||||
return (
|
||||
<div className="alert">
|
||||
Du siehst diese Lobby ohne Zugang. Spieler treten über den Einladungslink ihres Teams bei,
|
||||
Zuschauer über den Zuschauerlink. Beides bekommst du vom Organisator.
|
||||
Du siehst dieses Match ohne Zugang. Veto, Serienstand und Ergebnisse sind öffentlich.
|
||||
Teamdetails und Verbindungsdaten gibt es nur für Teilnehmer.
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import { api } from '../lib/api.js';
|
||||
import { FORMAT_LABEL, serverLabel, timeAgo } from '../lib/labels.js';
|
||||
import { getAccess } from '../lib/session.js';
|
||||
import { useOverview } from '../lib/useMatch.js';
|
||||
import MapImage from '../components/MapImage.jsx';
|
||||
|
||||
const GROUPS = [
|
||||
{ key: 'open', title: 'Offen', empty: 'Keine offenen Lobbys. Erstelle ein Match, um zu starten.' },
|
||||
@@ -32,7 +33,11 @@ export default function Overview() {
|
||||
return (
|
||||
<section key={g.key} className={`group group-${g.key}`}>
|
||||
<h2>{g.title} <span className="count">{list.length}</span></h2>
|
||||
{list.length === 0 ? <p className="muted small">{g.empty}</p> : (
|
||||
{list.length === 0 ? <p className="muted small">{g.empty}</p> : g.key === 'running' ? (
|
||||
<div className="run-grid">
|
||||
{list.map((m) => <RunningCard key={m.id} match={m} />)}
|
||||
</div>
|
||||
) : (
|
||||
<ul className="match-list">
|
||||
{list.map((m) => <MatchRow key={m.id} match={m} />)}
|
||||
</ul>
|
||||
@@ -79,6 +84,34 @@ function MatchRow({ match: m }) {
|
||||
);
|
||||
}
|
||||
|
||||
/** Karte für ein laufendes Match: Map als Hintergrund, Stand groß, Serie und Status darunter. */
|
||||
function RunningCard({ match: m }) {
|
||||
const server = serverLabel(m.server);
|
||||
const map = m.currentMap;
|
||||
const live = map && !map.finished;
|
||||
const bo1 = m.format === 'bo1';
|
||||
return (
|
||||
<Link to={`/m/${m.id}`} className={`run-card ${live ? 'is-live' : ''}`} style={{ '--map': map?.color ?? '#3a4150' }}>
|
||||
{map?.image && <MapImage map={{ image: map.image, color: map.color, name: map.name }} className="run-art" />}
|
||||
<div className="run-top">
|
||||
<span className="run-mode">{m.modeLabel}, {FORMAT_LABEL[m.format]}</span>
|
||||
{live ? <span className="live-badge run-live">Live</span> : <span className={`run-status tone-${server.tone}`}>{m.statusLabel}</span>}
|
||||
</div>
|
||||
<div className="run-teams">
|
||||
<span className="run-team a">{m.teamA}</span>
|
||||
<span className="run-score">
|
||||
{map ? <>{map.score.A}<i>:</i>{map.score.B}</> : <i className="run-vs">vs.</i>}
|
||||
</span>
|
||||
<span className="run-team b">{m.teamB}</span>
|
||||
</div>
|
||||
<div className="run-foot">
|
||||
<span>{map ? `Map ${map.number}: ${map.name}` : 'Veto läuft'}</span>
|
||||
{!bo1 && m.seriesScore && <span className="run-series">Serie {m.seriesScore.A}:{m.seriesScore.B}</span>}
|
||||
</div>
|
||||
</Link>
|
||||
);
|
||||
}
|
||||
|
||||
function CodeEntry() {
|
||||
const [code, setCode] = useState('');
|
||||
const [error, setError] = useState(null);
|
||||
|
||||
@@ -517,3 +517,40 @@ input:focus, select:focus { border-color: var(--link); outline: none; }
|
||||
.admin-settings h2 { margin: 0 0 12px; font-size: 1.1rem; }
|
||||
.admin-settings-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)); gap: 8px 16px; margin-bottom: 12px; }
|
||||
.admin-check { display: flex; align-items: center; gap: 8px; cursor: pointer; }
|
||||
|
||||
.admin-tabs { display: flex; gap: 4px; border-bottom: 1px solid var(--line); margin-bottom: 20px; }
|
||||
.admin-tab { background: none; border: 0; border-bottom: 2px solid transparent; color: var(--muted); padding: 10px 14px; font: inherit; cursor: pointer; }
|
||||
.admin-tab:hover { color: var(--text); }
|
||||
.admin-tab.is-active { color: var(--text); border-bottom-color: var(--primary); }
|
||||
|
||||
.turn-timer { grid-column: 1 / -1; display: flex; align-items: center; gap: 10px; margin-top: 8px; }
|
||||
.turn-bar { flex: 1; height: 6px; border-radius: 3px; background: color-mix(in srgb, var(--team) 18%, transparent); overflow: hidden; }
|
||||
.turn-bar span { display: block; height: 100%; background: var(--team); transition: width .25s linear; }
|
||||
.turn-seconds { min-width: 3ch; text-align: right; color: var(--muted); font-size: .875rem; font-variant-numeric: tabular-nums; }
|
||||
.turn-timer.is-low .turn-bar span { background: var(--error); }
|
||||
.turn-timer.is-low .turn-seconds { color: var(--error); font-weight: 600; }
|
||||
.admin-live { display: flex; gap: 10px; align-items: baseline; margin-top: 4px; font-size: .9rem; }
|
||||
.admin-live strong { font-variant-numeric: tabular-nums; }
|
||||
.admin-badge { display: inline-block; margin-top: 6px; padding: 2px 10px; border-radius: 999px; font-size: .8rem; font-weight: 600; }
|
||||
.admin-badge.is-paused { background: color-mix(in srgb, var(--pending) 22%, transparent); color: var(--pending); border: 1px solid var(--pending); }
|
||||
.btn-warn { border-color: var(--pending); color: var(--pending); }
|
||||
/* Laufende Matches in der Übersicht */
|
||||
.run-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(320px, 1fr)); gap: 16px; }
|
||||
.run-card { position: relative; display: flex; flex-direction: column; justify-content: space-between; gap: 10px; min-height: 190px; padding: 16px 18px; border-radius: var(--radius); border: 1px solid var(--line); background: var(--surface); color: var(--text); text-decoration: none; overflow: hidden; isolation: isolate; transition: transform .15s ease, border-color .15s ease; }
|
||||
.run-card:hover { transform: translateY(-2px); border-color: var(--map); }
|
||||
.run-card.is-live { box-shadow: inset 3px 0 0 var(--brand-red); }
|
||||
.run-art { position: absolute; inset: 0; z-index: -1; opacity: .28; }
|
||||
.run-art::after { background: linear-gradient(180deg, rgba(0,0,0,.2), rgba(0,0,0,.92)); }
|
||||
.run-top { display: flex; justify-content: space-between; align-items: center; gap: 8px; font-size: .8rem; color: var(--muted); }
|
||||
.run-live { animation: run-pulse 1.6s ease-in-out infinite; }
|
||||
@keyframes run-pulse { 50% { opacity: .55; } }
|
||||
.run-status { font-weight: 600; }
|
||||
.run-teams { display: grid; grid-template-columns: 1fr auto 1fr; align-items: center; gap: 8px; text-align: center; }
|
||||
.run-team { font: 700 1.25rem var(--display); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.run-team.a { color: var(--team-a); text-align: right; }
|
||||
.run-team.b { color: var(--team-b); text-align: left; }
|
||||
.run-score { font: 700 2.25rem var(--display); font-variant-numeric: tabular-nums; }
|
||||
.run-score i { font-style: normal; color: var(--muted); padding: 0 4px; }
|
||||
.run-vs { font-size: 1rem; color: var(--muted); font-style: normal; }
|
||||
.run-foot { display: flex; justify-content: space-between; gap: 8px; font-size: .875rem; color: var(--muted); }
|
||||
.run-series { font-variant-numeric: tabular-nums; }
|
||||
@@ -0,0 +1,44 @@
|
||||
#!/usr/bin/env bash
|
||||
# Richtet einen Docker-Host für CS2 Mapveto ein. Läuft vom eigenen Rechner aus per SSH.
|
||||
#
|
||||
# Aufruf: bash deploy/docker-host-einrichten.sh <ssh-ziel> [volume]
|
||||
# Beispiel: bash deploy/docker-host-einrichten.sh cs2@192.168.178.111
|
||||
#
|
||||
# Voraussetzungen: SSH-Schlüssel hinterlegt (ohne Passwortabfrage), Docker auf dem Host installiert.
|
||||
set -euo pipefail
|
||||
|
||||
TARGET="${1:?Aufruf: $0 <ssh-ziel> [volume]}"
|
||||
VOLUME="${2:-cs2-mapveto-gamefiles}"
|
||||
IMAGE="joedwards32/cs2:latest"
|
||||
HOST_PART="${TARGET#*@}"
|
||||
|
||||
echo "→ Verbindung zu $TARGET prüfen"
|
||||
ssh -o BatchMode=yes -o ConnectTimeout=10 "$TARGET" true
|
||||
|
||||
echo "→ Docker prüfen"
|
||||
if ! ssh "$TARGET" "command -v docker >/dev/null 2>&1"; then
|
||||
echo "Docker fehlt auf $HOST_PART. Installation: https://docs.docker.com/engine/install/" >&2
|
||||
exit 1
|
||||
fi
|
||||
ssh "$TARGET" "docker info >/dev/null"
|
||||
|
||||
echo "→ Freier Platz für Docker (CS2 braucht rund 90 GB)"
|
||||
ssh "$TARGET" "df -BG /var/lib/docker 2>/dev/null | tail -1 || df -BG / | tail -1"
|
||||
|
||||
echo "→ Volume $VOLUME anlegen (falls nicht vorhanden)"
|
||||
ssh "$TARGET" "docker volume inspect $VOLUME >/dev/null 2>&1 || docker volume create $VOLUME >/dev/null"
|
||||
|
||||
echo "→ Image $IMAGE laden"
|
||||
ssh "$TARGET" "docker pull $IMAGE"
|
||||
|
||||
cat <<EOF
|
||||
|
||||
Fertig. Diesen Eintrag in CS2_DOCKER_HOSTS (JSON-Liste in der .env) aufnehmen:
|
||||
|
||||
{"name":"$HOST_PART","dockerHost":"ssh://$TARGET","publicHost":"$HOST_PART","portStart":27100,"portEnd":27139}
|
||||
|
||||
Hinweise:
|
||||
- name muss pro Host eindeutig sein.
|
||||
- Ports 27100–27139 dürfen auf dem Host frei sein. Pro Host sind bis zu 20 Matches möglich.
|
||||
- Der erste Server-Start lädt die CS2-Spieldateien (rund 60 bis 90 GB). Das dauert lange.
|
||||
EOF
|
||||
Binary file not shown.
@@ -81,7 +81,8 @@ export function createAdminRouter({ service, manager, config }) {
|
||||
router.put('/notifications', requireAdmin, wrap((req) => service.setNotificationEvents(req.body?.events)));
|
||||
router.post('/notifications/test', requireAdmin, wrap(async () => {
|
||||
if (!service.notifier.enabled) throw new HttpError(409, 'Kein Discord-Webhook eingerichtet (DISCORD_WEBHOOK_URL)', 'not_configured');
|
||||
if (!(await service.notifier.send('Testmeldung aus CS2 Mapveto'))) {
|
||||
const test = { embeds: [{ title: '🧪 Testmeldung', description: 'Die Verbindung zu CS2 Mapveto funktioniert.', color: 0x3b82f6 }] };
|
||||
if (!(await service.notifier.send(test))) {
|
||||
throw new HttpError(502, 'Discord hat die Meldung nicht angenommen (siehe Log)', 'send_failed');
|
||||
}
|
||||
return { ok: true };
|
||||
|
||||
+5
-1
@@ -20,9 +20,12 @@ export function createApp(config, { adapter: adapterOverride, logger = console }
|
||||
const service = new MatchService({ db, pools, config, notifier });
|
||||
|
||||
let manager;
|
||||
const adapter = adapterOverride ?? createServerAdapter(config, { getUsedPorts: () => manager.usedPorts() });
|
||||
const adapter = adapterOverride ?? createServerAdapter(config, {
|
||||
getUsedPorts: (host) => (host ? manager.usedPortsOn(host) : manager.usedPorts()),
|
||||
});
|
||||
manager = new ServerManager({ db, service, adapter, config, logger });
|
||||
manager.init();
|
||||
service.startVetoTimer();
|
||||
|
||||
const app = express();
|
||||
if (config.trustProxy) app.set('trust proxy', 1);
|
||||
@@ -54,6 +57,7 @@ export function createApp(config, { adapter: adapterOverride, logger = console }
|
||||
},
|
||||
async close() {
|
||||
manager.stopLoops();
|
||||
service.stopVetoTimer();
|
||||
// Laufende Server-Aktionen (Start, Konfiguration) kurz abwarten, bevor die Datenbank schließt
|
||||
await manager.idle(5000);
|
||||
io.disposeRealtime();
|
||||
|
||||
@@ -22,6 +22,32 @@ function bool(name, fallback) {
|
||||
return ['1', 'true', 'yes', 'ja', 'on'].includes(raw.toLowerCase());
|
||||
}
|
||||
|
||||
function parseDockerHosts(raw) {
|
||||
if (!raw) return null;
|
||||
let list;
|
||||
try {
|
||||
list = JSON.parse(raw);
|
||||
} catch {
|
||||
throw new Error('CS2_DOCKER_HOSTS ist kein gültiges JSON');
|
||||
}
|
||||
if (!Array.isArray(list) || list.length === 0) throw new Error('CS2_DOCKER_HOSTS braucht mindestens einen Eintrag');
|
||||
const names = new Set();
|
||||
return list.map((h) => {
|
||||
if (!h.name || !h.publicHost) throw new Error('Jeder Docker-Host braucht name und publicHost');
|
||||
if (names.has(h.name)) throw new Error(`Docker-Host-Name "${h.name}" kommt doppelt vor`);
|
||||
names.add(h.name);
|
||||
return {
|
||||
name: String(h.name),
|
||||
dockerHost: h.dockerHost ?? null,
|
||||
publicHost: String(h.publicHost),
|
||||
rconHost: h.rconHost ?? h.publicHost,
|
||||
portRangeStart: h.portStart == null ? undefined : Number(h.portStart),
|
||||
portRangeEnd: h.portEnd == null ? undefined : Number(h.portEnd),
|
||||
volume: h.volume ?? undefined,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function str(name, fallback = '') {
|
||||
const raw = process.env[name];
|
||||
return raw === undefined || raw === '' ? fallback : raw;
|
||||
@@ -52,6 +78,8 @@ export function loadConfig(overrides = {}) {
|
||||
maxLifetimeHours: int('SERVER_MAX_LIFETIME_HOURS', 8),
|
||||
statusPollSeconds: int('SERVER_STATUS_POLL_SECONDS', 5),
|
||||
reaperIntervalSeconds: int('SERVER_REAPER_INTERVAL_SECONDS', 60),
|
||||
// Frist pro Veto-Schritt in Sekunden, danach führt das Backend den Schritt automatisch aus. 0 = keine Frist
|
||||
vetoStepSeconds: int('VETO_STEP_SECONDS', 30),
|
||||
|
||||
match: {
|
||||
tvDelaySeconds: int('CS2_TV_DELAY', 90),
|
||||
@@ -83,6 +111,9 @@ export function loadConfig(overrides = {}) {
|
||||
volume: str('CS2_DOCKER_VOLUME', 'cs2-mapveto-gamefiles'),
|
||||
extraArgs: str('CS2_DOCKER_EXTRA_ARGS'),
|
||||
startTimeoutMinutes: int('CS2_START_TIMEOUT_MINUTES', 20),
|
||||
// Optional: mehrere Docker-Hosts als JSON-Liste, z. B.
|
||||
// [{"name":"host1","dockerHost":"ssh://cs2@192.168.178.111","publicHost":"192.168.178.111","portStart":27100,"portEnd":27139}]
|
||||
hosts: parseDockerHosts(str('CS2_DOCKER_HOSTS')),
|
||||
},
|
||||
|
||||
staticPool: {
|
||||
|
||||
@@ -128,4 +128,6 @@ function migrate(db) {
|
||||
for (const [name, type] of add) {
|
||||
if (!seriesColumns.has(name)) db.exec(`ALTER TABLE series_maps ADD COLUMN ${name} ${type}`);
|
||||
}
|
||||
const serverColumns = columns('servers');
|
||||
if (!serverColumns.has('paused')) db.exec('ALTER TABLE servers ADD COLUMN paused INTEGER NOT NULL DEFAULT 0');
|
||||
}
|
||||
@@ -27,12 +27,14 @@ export function createDiscordNotifier(url, { fetchImpl = fetch, logger = console
|
||||
return {
|
||||
enabled: true,
|
||||
/** Liefert true, wenn Discord die Nachricht angenommen hat. */
|
||||
async send(content) {
|
||||
async send(message) {
|
||||
// Text oder vollständige Discord-Payload (z. B. mit embeds)
|
||||
const payload = typeof message === 'string' ? { content: message.slice(0, MAX_LENGTH) } : message;
|
||||
try {
|
||||
const res = await fetchImpl(url, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ content: content.slice(0, MAX_LENGTH) }),
|
||||
body: JSON.stringify(payload),
|
||||
signal: AbortSignal.timeout(TIMEOUT_MS),
|
||||
});
|
||||
if (res.ok) return true;
|
||||
|
||||
+104
-13
@@ -341,11 +341,68 @@ export class MatchService extends EventEmitter {
|
||||
.run(firstTeam, this.now(), this.now(), match.id);
|
||||
const how = match.veto_start === 'coin' ? 'per Münzwurf ausgelost' : 'vom Organisator festgelegt';
|
||||
this.log(match.id, 'veto', `Veto gestartet – ${this.teamName(match, firstTeam)} beginnt (${how})`);
|
||||
this.notify('veto_start', match.id, `Veto gestartet: ${this.matchTitle(match.id)}, ${this.teamName(match, firstTeam)} beginnt`);
|
||||
this.notify('veto_start', match.id, {
|
||||
title: '🎮 Veto gestartet',
|
||||
description: `**${this.matchTitle(match.id)}**`,
|
||||
color: 0x3b82f6,
|
||||
fields: [{ name: 'Beginnt', value: this.teamName(match, firstTeam), inline: true }],
|
||||
});
|
||||
})();
|
||||
this.changed(viewer.matchId);
|
||||
}
|
||||
|
||||
/** Ablaufzeitpunkt des aktuellen Veto-Schritts (ms), null wenn keine Frist gilt. */
|
||||
vetoDeadline(match) {
|
||||
if (!this.config.vetoStepSeconds || match.status !== 'veto') return null;
|
||||
const actions = this.vetoActions(match.id);
|
||||
const since = actions.length ? actions[actions.length - 1].created_at : match.veto_started_at;
|
||||
return since == null ? null : since + this.config.vetoStepSeconds * 1000;
|
||||
}
|
||||
|
||||
vetoRemainingMs(match) {
|
||||
const deadline = this.vetoDeadline(match);
|
||||
return deadline === null ? null : Math.max(0, deadline - this.now());
|
||||
}
|
||||
|
||||
/** Führt den aktuellen Veto-Schritt für das Team am Zug aus: zufällige Map bzw. zufällige Seite. */
|
||||
autoVetoStep(match) {
|
||||
const state = this.vetoState(match);
|
||||
if (state.done || !state.current) return;
|
||||
const { type, team, index } = state.current;
|
||||
const pick = (list) => list[Math.floor(Math.random() * list.length)];
|
||||
const viewer = {
|
||||
matchId: match.id, role: 'captain', isOrganizer: false, isCaptain: true, isSpectator: false, playerId: null, team,
|
||||
};
|
||||
const action = type === 'side'
|
||||
? { stepIndex: index, side: pick(['CT', 'T']) }
|
||||
: { stepIndex: index, map: pick(state.maps.filter((m) => m.status === 'available')).id };
|
||||
this.log(match.id, 'veto', `Zeit abgelaufen – ${this.teamName(match, team)} wird automatisch vertreten`);
|
||||
this.vetoAction(viewer, action);
|
||||
}
|
||||
|
||||
/** Läuft die Frist eines Veto-Schritts ab, führt das Backend den Schritt aus. */
|
||||
autoVetoTimeouts() {
|
||||
for (const match of this.db.prepare("SELECT * FROM matches WHERE status = 'veto'").all()) {
|
||||
const deadline = this.vetoDeadline(match);
|
||||
if (deadline === null || this.now() < deadline) continue;
|
||||
try {
|
||||
this.autoVetoStep(match);
|
||||
} catch (err) {
|
||||
this.log(match.id, 'veto', `Automatischer Schritt fehlgeschlagen: ${err.message}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
startVetoTimer() {
|
||||
if (!this.config.vetoStepSeconds || this.vetoTimer) return;
|
||||
this.vetoTimer = setInterval(() => this.autoVetoTimeouts(), 1000);
|
||||
}
|
||||
|
||||
stopVetoTimer() {
|
||||
clearInterval(this.vetoTimer);
|
||||
this.vetoTimer = null;
|
||||
}
|
||||
|
||||
vetoAction(viewer, { stepIndex, map, side }) {
|
||||
this.require(viewer, 'captain');
|
||||
let finished = false;
|
||||
@@ -519,8 +576,16 @@ export class MatchService extends EventEmitter {
|
||||
const winner = state.winner ? this.teamName(match, state.winner) : 'Unentschieden';
|
||||
this.log(matchId, 'score',
|
||||
`Map ${row.number} (${this.mapName(match, row.map)}) beendet: ${match.team_a_name} ${state.score.A}:${state.score.B} ${match.team_b_name} – Sieger: ${winner}`);
|
||||
this.notify('map_end', matchId, `${this.matchTitle(matchId)}
|
||||
Map ${row.number} (${this.mapName(match, row.map)}) beendet: ${state.score.A}:${state.score.B}, Sieger ${winner}`);
|
||||
this.notify('map_end', matchId, {
|
||||
title: '🗺️ Map beendet',
|
||||
description: `**${this.matchTitle(matchId)}**`,
|
||||
color: 0xf59e0b,
|
||||
fields: [
|
||||
{ name: `Map ${row.number}`, value: this.mapName(match, row.map), inline: true },
|
||||
{ name: 'Stand', value: `${state.score.A} : ${state.score.B}`, inline: true },
|
||||
{ name: 'Sieger', value: winner, inline: true },
|
||||
],
|
||||
});
|
||||
}
|
||||
})();
|
||||
if (ended) {
|
||||
@@ -529,8 +594,18 @@ Map ${row.number} (${this.mapName(match, row.map)}) beendet: ${state.score.A}:${
|
||||
const needed = Math.floor(BEST_OF[ended.match.format] / 2) + 1;
|
||||
const decided = score.A >= needed ? 'A' : score.B >= needed ? 'B' : null;
|
||||
if (decided) this.log(matchId, 'score', `Serie entschieden: ${this.teamName(ended.match, decided)} gewinnt ${score[decided]}:${score[decided === 'A' ? 'B' : 'A']}`);
|
||||
if (decided) this.notify('series_end', matchId, `${this.matchTitle(matchId)}
|
||||
Serie entschieden: ${this.teamName(ended.match, decided)} gewinnt ${score[decided]}:${score[decided === 'A' ? 'B' : 'A']}`);
|
||||
if (decided) {
|
||||
const loser = decided === 'A' ? 'B' : 'A';
|
||||
this.notify('series_end', matchId, {
|
||||
title: '🏆 Serie entschieden',
|
||||
description: `**${this.matchTitle(matchId)}**`,
|
||||
color: 0x22c55e,
|
||||
fields: [
|
||||
{ name: 'Sieger', value: this.teamName(ended.match, decided), inline: true },
|
||||
{ name: 'Serienstand', value: `${score[decided]} : ${score[loser]}`, inline: true },
|
||||
],
|
||||
});
|
||||
}
|
||||
const hasNext = maps.some((m) => m.number === ended.row.number + 1);
|
||||
this.changed(matchId);
|
||||
this.emit('mapEnded', { matchId, number: ended.row.number, decided, hasNext });
|
||||
@@ -562,8 +637,12 @@ Serie entschieden: ${this.teamName(ended.match, decided)} gewinnt ${score[decide
|
||||
this.db.prepare("UPDATE series_maps SET status = 'done' WHERE match_id = ? AND status IN ('live','next')").run(match.id);
|
||||
}
|
||||
this.log(match.id, 'status', message ?? (status === 'finished' ? 'Match abgeschlossen' : 'Match abgebrochen'));
|
||||
this.notify('match_closed', match.id, `${this.matchTitle(match.id)}
|
||||
${message ?? (status === 'finished' ? 'Match abgeschlossen' : 'Match abgebrochen')}`);
|
||||
const finished = status === 'finished';
|
||||
this.notify('match_closed', match.id, {
|
||||
title: finished ? '✅ Match abgeschlossen' : '⛔ Match abgebrochen',
|
||||
description: `**${this.matchTitle(match.id)}**${message ? `\n${message}` : ''}`,
|
||||
color: finished ? 0x6b7280 : 0x9ca3af,
|
||||
});
|
||||
this.setStatus(match.id, status);
|
||||
this.emit('closed', match.id);
|
||||
}
|
||||
@@ -610,11 +689,13 @@ ${message ?? (status === 'finished' ? 'Match abgeschlossen' : 'Match abgebrochen
|
||||
return this.notificationSettings();
|
||||
}
|
||||
|
||||
notify(type, matchId, text) {
|
||||
/** Meldung als Discord-Embed. Ohne Stream-Schlüssel ist der Titel ein Link auf die Match-Übersicht. */
|
||||
notify(type, matchId, embed) {
|
||||
if (!this.notifier.enabled || !this.notificationSettings().events[type]) return;
|
||||
const link = this.config.streamKey ? '' : `
|
||||
${this.config.publicUrl}/stream/match/${matchId}`;
|
||||
this.notifier.send(`${text}${link}`);
|
||||
const url = this.config.streamKey ? undefined : `${this.config.publicUrl}/stream/match/${matchId}`;
|
||||
this.notifier.send({
|
||||
embeds: [{ ...embed, url, timestamp: new Date(this.now()).toISOString(), footer: { text: 'CS2 Mapveto' } }],
|
||||
});
|
||||
}
|
||||
|
||||
log(matchId, type, message) {
|
||||
@@ -710,7 +791,14 @@ ${this.config.publicUrl}/stream/match/${matchId}`;
|
||||
return {
|
||||
seriesScore: maps.length ? seriesScore(maps) : null,
|
||||
currentMap: current && (current.status === 'live' || current.status === 'done')
|
||||
? { number: current.number, name: this.mapName(m, current.map), score: { A: current.score_a, B: current.score_b }, finished: current.status === 'done' }
|
||||
? {
|
||||
number: current.number,
|
||||
name: this.mapName(m, current.map),
|
||||
image: JSON.parse(m.maps).find((x) => x.id === current.map)?.image ?? null,
|
||||
color: JSON.parse(m.maps).find((x) => x.id === current.map)?.color ?? null,
|
||||
score: { A: current.score_a, B: current.score_b },
|
||||
finished: current.status === 'done',
|
||||
}
|
||||
: null,
|
||||
id: m.id,
|
||||
teamA: m.team_a_name,
|
||||
@@ -804,7 +892,7 @@ ${this.config.publicUrl}/stream/match/${matchId}`;
|
||||
requireFullTeams: this.config.requireFullTeams,
|
||||
autoAdvanceSeconds: this.config.autoAdvanceSeconds,
|
||||
maps: pool.maps,
|
||||
veto: publicView
|
||||
veto: publicView && match.status === 'lobby'
|
||||
? null
|
||||
: {
|
||||
started: match.status !== 'lobby',
|
||||
@@ -812,6 +900,8 @@ ${this.config.publicUrl}/stream/match/${matchId}`;
|
||||
steps: veto.steps,
|
||||
maps: veto.maps,
|
||||
current: match.status === 'veto' ? veto.current : null,
|
||||
remainingMs: this.vetoRemainingMs(match),
|
||||
stepSeconds: this.config.vetoStepSeconds,
|
||||
done: veto.done,
|
||||
history: actions.map((a) => ({
|
||||
index: a.idx,
|
||||
@@ -861,6 +951,7 @@ ${this.config.publicUrl}/stream/match/${matchId}`;
|
||||
status: row.status,
|
||||
message: row.message,
|
||||
playerCount: row.player_count,
|
||||
paused: !!row.paused,
|
||||
attempts: row.attempts,
|
||||
updatedAt: row.updated_at,
|
||||
idleTimeoutMinutes: this.config.idleTimeoutMinutes,
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
*/
|
||||
|
||||
import { DemoServerAdapter } from './demoAdapter.js';
|
||||
import { DockerServerAdapter } from './dockerAdapter.js';
|
||||
import { DockerHostPool } from './dockerAdapter.js';
|
||||
import { StaticPoolServerAdapter } from './staticPoolAdapter.js';
|
||||
|
||||
export function createServerAdapter(config, deps) {
|
||||
@@ -37,7 +37,7 @@ export function createServerAdapter(config, deps) {
|
||||
case 'demo':
|
||||
return new DemoServerAdapter(config.demo);
|
||||
case 'docker':
|
||||
return new DockerServerAdapter(config.docker, deps);
|
||||
return new DockerHostPool(config.docker, deps);
|
||||
case 'static':
|
||||
return new StaticPoolServerAdapter(config.staticPool, deps);
|
||||
default:
|
||||
|
||||
@@ -37,7 +37,8 @@ export class DockerServerAdapter {
|
||||
|
||||
async docker(args, timeout = 60_000) {
|
||||
if (this.runDocker) return this.runDocker(args);
|
||||
const { stdout } = await exec(this.options.bin, args, { timeout, maxBuffer: 4 * 1024 * 1024 });
|
||||
const env = this.options.dockerHost ? { ...process.env, DOCKER_HOST: this.options.dockerHost } : process.env;
|
||||
const { stdout } = await exec(this.options.bin, args, { timeout, maxBuffer: 4 * 1024 * 1024, env });
|
||||
return stdout.trim();
|
||||
}
|
||||
|
||||
@@ -137,7 +138,14 @@ export class DockerServerAdapter {
|
||||
await this.docker(args, 15 * 60_000);
|
||||
|
||||
return {
|
||||
handle: { container, rconHost: this.options.rconHost, port, startedAt: Date.now(), rconPassword: secrets.rconPassword },
|
||||
handle: {
|
||||
container,
|
||||
hostName: this.options.name,
|
||||
rconHost: this.options.rconHost,
|
||||
port,
|
||||
startedAt: Date.now(),
|
||||
rconPassword: secrets.rconPassword,
|
||||
},
|
||||
host: this.options.host,
|
||||
port,
|
||||
tvPort,
|
||||
@@ -192,3 +200,99 @@ export class DockerServerAdapter {
|
||||
await this.docker(['rm', '-f', handle.container]).catch(() => {});
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Mehrere Docker-Hosts. Jedes Match läuft auf dem Host mit den meisten freien Port-Paaren,
|
||||
* der Host steht im Handle und damit im Match. Start, Status, Konfiguration und Stopp gehen
|
||||
* immer an denselben Host. Ohne CS2_DOCKER_HOSTS gibt es genau einen Host: den bisherigen.
|
||||
*/
|
||||
export class DockerHostPool {
|
||||
constructor(options, { getUsedPorts, runDocker } = {}) {
|
||||
this.name = 'docker';
|
||||
this.simulated = false;
|
||||
this.depsGetUsedPorts = getUsedPorts;
|
||||
const hosts = options.hosts ?? [{
|
||||
name: 'default',
|
||||
dockerHost: process.env.DOCKER_HOST || null,
|
||||
publicHost: options.host,
|
||||
rconHost: options.rconHost,
|
||||
portRangeStart: options.portRangeStart,
|
||||
portRangeEnd: options.portRangeEnd,
|
||||
volume: options.volume,
|
||||
}];
|
||||
// Fehlende Angaben kommen aus den allgemeinen Docker-Einstellungen
|
||||
this.hosts = hosts.map((h) => {
|
||||
const host = {
|
||||
name: h.name,
|
||||
dockerHost: h.dockerHost ?? null,
|
||||
publicHost: h.publicHost ?? options.host,
|
||||
rconHost: h.rconHost ?? options.rconHost,
|
||||
portRangeStart: h.portRangeStart ?? options.portRangeStart,
|
||||
portRangeEnd: h.portRangeEnd ?? options.portRangeEnd,
|
||||
volume: h.volume ?? options.volume,
|
||||
};
|
||||
return { ...options, ...host, host: host.publicHost };
|
||||
});
|
||||
this.adapters = new Map(this.hosts.map((h) => [h.name, new DockerServerAdapter(h, {
|
||||
getUsedPorts: () => (getUsedPorts ? getUsedPorts(h.publicHost) : new Set()),
|
||||
runDocker,
|
||||
})]));
|
||||
}
|
||||
|
||||
/** Freie Port-Paare auf einem Host. */
|
||||
freeSlots(host) {
|
||||
const used = this.getUsedPorts(host.publicHost);
|
||||
let free = 0;
|
||||
for (let p = host.portRangeStart; p + 1 <= host.portRangeEnd; p += 2) {
|
||||
if (!used.has(p) && !used.has(p + 1)) free += 1;
|
||||
}
|
||||
return free;
|
||||
}
|
||||
|
||||
getUsedPorts(publicHost) {
|
||||
return this.depsGetUsedPorts?.(publicHost) ?? new Set();
|
||||
}
|
||||
|
||||
pickHost() {
|
||||
const best = this.hosts
|
||||
.map((h) => ({ host: h, free: this.freeSlots(h) }))
|
||||
.filter((x) => x.free > 0)
|
||||
.sort((a, b) => b.free - a.free)[0];
|
||||
if (!best) throw new Error('Kein Docker-Host mit freien Ports');
|
||||
return best.host;
|
||||
}
|
||||
|
||||
async start(args) {
|
||||
return this.adapters.get(this.pickHost().name).start(args);
|
||||
}
|
||||
|
||||
adapterFor(handle) {
|
||||
const name = handle?.hostName ?? this.hosts[0].name;
|
||||
const adapter = this.adapters.get(name);
|
||||
if (!adapter) throw new Error(`Docker-Host "${name}" ist nicht (mehr) konfiguriert`);
|
||||
return adapter;
|
||||
}
|
||||
|
||||
async status(handle) {
|
||||
return this.adapterFor(handle).status(handle);
|
||||
}
|
||||
|
||||
async configure(handle, plan) {
|
||||
return this.adapterFor(handle).configure(handle, plan);
|
||||
}
|
||||
|
||||
async listRoundBackups(handle, matchId) {
|
||||
return this.adapterFor(handle).listRoundBackups(handle, matchId);
|
||||
}
|
||||
|
||||
async loadRoundBackup(handle, file) {
|
||||
return this.adapterFor(handle).loadRoundBackup(handle, file);
|
||||
}
|
||||
|
||||
async sendCommands(handle, commands) {
|
||||
return this.adapterFor(handle).sendCommands(handle, commands);
|
||||
}
|
||||
|
||||
async stop(handle) {
|
||||
return this.adapterFor(handle).stop(handle);
|
||||
}
|
||||
}
|
||||
@@ -160,6 +160,16 @@ export class ServerManager {
|
||||
this.service.changed(matchId);
|
||||
}
|
||||
|
||||
/** Ports, die auf einem bestimmten Docker-Host belegt sind. */
|
||||
usedPortsOn(host) {
|
||||
const used = new Set();
|
||||
for (const r of this.db.prepare(`SELECT port, tv_port FROM servers WHERE host = ? AND status != 'stopped' AND port IS NOT NULL`).all(host)) {
|
||||
used.add(r.port);
|
||||
used.add(r.tv_port);
|
||||
}
|
||||
return used;
|
||||
}
|
||||
|
||||
usedPorts() {
|
||||
const used = new Set();
|
||||
for (const r of this.db.prepare(`SELECT host, port, tv_port FROM servers WHERE status != 'stopped' AND port IS NOT NULL`).all()) {
|
||||
@@ -265,7 +275,11 @@ export class ServerManager {
|
||||
} else if (status.state === 'failed') {
|
||||
Object.assign(fields, { status: current.status === 'starting' ? 'start_failed' : 'failed', message: status.message });
|
||||
this.service.log(matchId, 'server', `Server-Fehler: ${status.message}`);
|
||||
this.service.notify('server_error', matchId, `Server-Fehler bei ${this.service.matchTitle(matchId)}: ${status.message}`);
|
||||
this.service.notify('server_error', matchId, {
|
||||
title: '⚠️ Serverfehler',
|
||||
description: `**${this.service.matchTitle(matchId)}**\n${status.message}`,
|
||||
color: 0xdc2626,
|
||||
});
|
||||
} else if (status.state === 'stopped') {
|
||||
Object.assign(fields, { status: 'stopped', stopped_at: Date.now(), message: status.message ?? 'Server wurde extern beendet' });
|
||||
this.service.log(matchId, 'server', 'Server wurde außerhalb der Anwendung beendet');
|
||||
@@ -304,7 +318,8 @@ export class ServerManager {
|
||||
if (!seriesMap) throw new HttpError(409, 'Das Veto ist noch nicht abgeschlossen', 'veto_pending');
|
||||
|
||||
const mapName = pool.maps.find((m) => m.id === seriesMap.map)?.name ?? seriesMap.map;
|
||||
this.update(matchId, { status: 'configuring', message: `Lade Map ${seriesMap.number}: ${mapName}` });
|
||||
// Ein Mapwechsel beendet die Pause, CS2 lädt die Map neu
|
||||
this.update(matchId, { status: 'configuring', paused: 0, message: `Lade Map ${seriesMap.number}: ${mapName}` });
|
||||
this.service.log(matchId, 'server', `Konfiguration für Map ${seriesMap.number} (${mapName}) gestartet`);
|
||||
|
||||
const plan = buildMapCommands({
|
||||
@@ -388,7 +403,17 @@ export class ServerManager {
|
||||
throw new HttpError(502, `Befehl konnte nicht gesendet werden: ${err.message}`, 'server_error');
|
||||
}
|
||||
this.service.log(viewer.matchId, 'server', this.adapter.simulated ? 'Aufwärmphase beendet (simuliert)' : 'Aufwärmphase beendet – Match startet');
|
||||
this.service.notify('match_start', viewer.matchId, `Match gestartet: ${this.service.matchTitle(viewer.matchId)}`);
|
||||
// CSTV-Zugang für Zuschauer, gleiche Form wie im Zuschauerbereich der Webseite
|
||||
const fields = [];
|
||||
if (this.config.match.tvEnabled && row.tv_port) {
|
||||
fields.push({ name: '📺 CSTV', value: `\`password ${row.tv_password}; connect ${row.host}:${row.tv_port}\`` });
|
||||
}
|
||||
this.service.notify('match_start', viewer.matchId, {
|
||||
title: '🔴 Match läuft',
|
||||
description: `**${this.service.matchTitle(viewer.matchId)}**`,
|
||||
color: 0xef4444,
|
||||
fields,
|
||||
});
|
||||
if (this.adapter.simulated) this.startDemoSimulation(viewer.matchId);
|
||||
this.service.changed(viewer.matchId);
|
||||
}
|
||||
@@ -404,8 +429,8 @@ export class ServerManager {
|
||||
} catch (err) {
|
||||
throw new HttpError(502, `Befehl konnte nicht gesendet werden: ${err.message}`, 'server_error');
|
||||
}
|
||||
this.update(viewer.matchId, { paused: paused ? 1 : 0 });
|
||||
this.service.log(viewer.matchId, 'server', paused ? 'Match pausiert (Admin)' : 'Match fortgesetzt (Admin)');
|
||||
this.service.changed(viewer.matchId);
|
||||
}
|
||||
|
||||
/** Demo-Modus: simuliert einen Matchverlauf, indem echte CS2-Logzeilen erzeugt und ausgewertet werden. */
|
||||
@@ -449,7 +474,7 @@ export class ServerManager {
|
||||
const row = this.row(matchId);
|
||||
if (!row || row.status === 'stopped') return;
|
||||
if (row.handle) await this.safeStop(row);
|
||||
this.update(matchId, { status: 'stopped', stopped_at: Date.now(), message: reason, player_count: null });
|
||||
this.update(matchId, { status: 'stopped', stopped_at: Date.now(), message: reason, player_count: null, paused: 0 });
|
||||
this.service.log(matchId, 'server', `Server gestoppt: ${reason}`);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
import { test } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { DockerHostPool } from '../src/servers/dockerAdapter.js';
|
||||
|
||||
const secrets = { rconPassword: 'Rcon123', serverPassword: 'Pw123', tvPassword: 'Tv123' };
|
||||
|
||||
const hostA = { name: 'a', publicHost: '10.0.0.1', portRangeStart: 27100, portRangeEnd: 27103 }; // 2 Paare
|
||||
const hostB = { name: 'b', publicHost: '10.0.0.2', portRangeStart: 27100, portRangeEnd: 27139 }; // 20 Paare
|
||||
|
||||
function options(hosts) {
|
||||
return {
|
||||
bin: 'docker', image: 'joedwards32/cs2:latest', host: '10.0.0.9', rconHost: '10.0.0.9',
|
||||
portRangeStart: 27015, portRangeEnd: 27115, gslt: '', volume: 'cs2-mapveto-gamefiles', extraArgs: '',
|
||||
startTimeoutMinutes: 1, hosts,
|
||||
};
|
||||
}
|
||||
|
||||
/** Docker-Aufrufe merken, Container gelten sofort als fertig. */
|
||||
function fakeDocker() {
|
||||
const calls = [];
|
||||
const run = async (args) => {
|
||||
calls.push(args);
|
||||
if (args[0] === 'inspect') return 'running';
|
||||
if (args[0] === 'logs') return 'Starting CS2 Dedicated Server';
|
||||
return '';
|
||||
};
|
||||
return { run, calls };
|
||||
}
|
||||
|
||||
/** Nur die Konfiguration der Hosts, ohne auf echte Container zu warten. */
|
||||
function pool(hosts, used = {}) {
|
||||
const docker = fakeDocker();
|
||||
const p = new DockerHostPool(options(hosts), {
|
||||
getUsedPorts: (publicHost) => new Set(used[publicHost] ?? []),
|
||||
runDocker: docker.run,
|
||||
});
|
||||
for (const a of p.adapters.values()) a.waitForUpdateCheck = async () => {};
|
||||
return { pool: p, calls: docker.calls };
|
||||
}
|
||||
|
||||
test('Ohne CS2_DOCKER_HOSTS gibt es genau einen Host, wie bisher', () => {
|
||||
const { pool: p } = pool(null);
|
||||
assert.equal(p.hosts.length, 1);
|
||||
assert.equal(p.hosts[0].publicHost, '10.0.0.9');
|
||||
});
|
||||
|
||||
test('Ein Match landet auf dem Host mit den meisten freien Ports', async () => {
|
||||
const { pool: p } = pool([hostA, hostB], { '10.0.0.1': [27100] }); // A hat ein Paar belegt, B ist frei
|
||||
const r = await p.start({ matchId: 'm1', mode: 'competitive', secrets });
|
||||
assert.equal(r.handle.hostName, 'b');
|
||||
assert.equal(r.host, '10.0.0.2');
|
||||
});
|
||||
|
||||
test('Ein voller Host wird übersprungen', async () => {
|
||||
const fullA = Array.from({ length: 4 }, (_, i) => 27100 + i); // alle Ports von A belegt
|
||||
const { pool: p } = pool([hostA, hostB], { '10.0.0.1': fullA });
|
||||
const r = await p.start({ matchId: 'm2', mode: 'wingman', secrets });
|
||||
assert.equal(r.handle.hostName, 'b');
|
||||
});
|
||||
|
||||
test('Sind alle Hosts voll, gibt es einen klaren Fehler', async () => {
|
||||
const fullA = Array.from({ length: 4 }, (_, i) => 27100 + i);
|
||||
const fullB = Array.from({ length: 40 }, (_, i) => 27100 + i);
|
||||
const { pool: p } = pool([hostA, hostB], { '10.0.0.1': fullA, '10.0.0.2': fullB });
|
||||
await assert.rejects(p.start({ matchId: 'm3', mode: 'wingman', secrets }), /Kein Docker-Host mit freien Ports/);
|
||||
});
|
||||
|
||||
test('Status, Stopp und Befehle gehen an den Host des Matches', async () => {
|
||||
const { pool: p, calls } = pool([hostA, hostB], { '10.0.0.1': [27100] });
|
||||
const r = await p.start({ matchId: 'm4', mode: 'competitive', secrets });
|
||||
calls.length = 0;
|
||||
await p.stop(r.handle);
|
||||
assert.deepEqual(calls.at(-1)[0], 'rm');
|
||||
assert.equal(calls.at(-1).at(-1), r.handle.container);
|
||||
// Ein Handle von einem Host, der nicht mehr konfiguriert ist, wird abgelehnt
|
||||
await assert.rejects(p.status({ ...r.handle, hostName: 'gelöscht' }), /nicht \(mehr\) konfiguriert/);
|
||||
});
|
||||
|
||||
test('Alte Handles ohne Host-Namen laufen auf dem ersten Host', () => {
|
||||
const { pool: p } = pool([hostA, hostB]);
|
||||
assert.equal(p.adapterFor({ container: 'x' }), p.adapters.get('a'));
|
||||
});
|
||||
+84
@@ -0,0 +1,84 @@
|
||||
10/25/2026 - 18:06:44.021 - rcon from "192.168.178.31:54420": command "status"
|
||||
10/25/2026 - 18:06:48.883 - "Spieler1<0><[U:1:1000001]><>" entered the game
|
||||
10/25/2026 - 18:07:05.771 - "Spieler1<0><[U:1:1000001]>" switched from team <Unassigned> to <CT>
|
||||
10/25/2026 - 18:07:18.570 - "Spieler1<0><[U:1:1000001]><CT>" [1331 132 138] killed "Sarge<10><BOT><TERRORIST>" [1410 322 128] with "usp_silencer" (headshot)
|
||||
10/25/2026 - 18:07:52.100 - rcon from "192.168.178.31:61554": command "mp_warmup_pausetimer 0"
|
||||
10/25/2026 - 18:07:52.381 - rcon from "192.168.178.31:61554": command "mp_warmup_end"
|
||||
10/25/2026 - 18:07:52.396 - Starting Freeze period
|
||||
10/25/2026 - 18:07:52.396 - JSON_BEGIN{
|
||||
10/25/2026 - 18:07:52.396 - "name": "round_stats",
|
||||
10/25/2026 - 18:07:52.396 - "round_number" : "1",
|
||||
10/25/2026 - 18:07:52.396 - "map" : "de_inferno",
|
||||
10/25/2026 - 18:07:52.396 - }}JSON_END
|
||||
10/25/2026 - 18:07:52.396 - World triggered "Match_Start" on "de_inferno"
|
||||
10/25/2026 - 18:07:52.396 - Team playing "CT": MaxLAN Blau
|
||||
10/25/2026 - 18:07:52.396 - Team playing "TERRORIST": MaxLAN Rot
|
||||
10/25/2026 - 18:07:52.396 - "Darryl<12><BOT><TERRORIST>" triggered "Got_The_Bomb"
|
||||
10/25/2026 - 18:07:52.396 - MatchStatus: Team playing "CT": MaxLAN Blau
|
||||
10/25/2026 - 18:07:52.396 - MatchStatus: Team playing "TERRORIST": MaxLAN Rot
|
||||
10/25/2026 - 18:07:52.396 - MatchStatus: Score: 0:0 on map "de_inferno" RoundsPlayed: 0
|
||||
10/25/2026 - 18:08:01.869 - World triggered "Round_Start"
|
||||
10/25/2026 - 18:08:24.463 - "Darryl<12><BOT><TERRORIST>" triggered "Planted_The_Bomb" at bombsite A
|
||||
10/25/2026 - 18:08:30.541 - "Darryl<12><BOT><TERRORIST>" [2059 398 160] killed "Maximus<11><BOT><CT>" [2356 255 126] with "glock"
|
||||
10/25/2026 - 18:08:30.541 - Team "TERRORIST" triggered "SFUI_Notice_Terrorists_Win" (CT "0") (T "1")
|
||||
10/25/2026 - 18:08:30.541 - Team "CT" scored "0" with "3" players
|
||||
10/25/2026 - 18:08:30.541 - Team "TERRORIST" scored "1" with "2" players
|
||||
10/25/2026 - 18:08:30.541 - MatchStatus: Team playing "CT": MaxLAN Blau
|
||||
10/25/2026 - 18:08:30.541 - MatchStatus: Team playing "TERRORIST": MaxLAN Rot
|
||||
10/25/2026 - 18:08:30.541 - MatchStatus: Score: 0:1 on map "de_inferno" RoundsPlayed: 1
|
||||
10/25/2026 - 18:08:30.541 - World triggered "Round_End"
|
||||
10/25/2026 - 18:08:33.541 - Starting Freeze period
|
||||
10/25/2026 - 18:08:33.541 - MatchStatus: Team playing "CT": MaxLAN Blau
|
||||
10/25/2026 - 18:08:33.541 - MatchStatus: Team playing "TERRORIST": MaxLAN Rot
|
||||
10/25/2026 - 18:08:33.541 - MatchStatus: Score: 0:1 on map "de_inferno" RoundsPlayed: 1
|
||||
10/25/2026 - 18:08:36.543 - World triggered "Round_Start"
|
||||
10/25/2026 - 18:09:08.839 - "Spieler1<0><[U:1:1000001]><CT>" [2254 1009 159] killed "Sarge<10><BOT><TERRORIST>" [2287 352 132] with "famas" (headshot)
|
||||
10/25/2026 - 18:09:08.839 - Team "CT" triggered "SFUI_Notice_CTs_Win" (CT "1") (T "1")
|
||||
10/25/2026 - 18:09:08.839 - Team "CT" scored "1" with "3" players
|
||||
10/25/2026 - 18:09:08.839 - Team "TERRORIST" scored "1" with "3" players
|
||||
10/25/2026 - 18:09:08.839 - MatchStatus: Team playing "CT": MaxLAN Blau
|
||||
10/25/2026 - 18:09:08.839 - MatchStatus: Team playing "TERRORIST": MaxLAN Rot
|
||||
10/25/2026 - 18:09:08.839 - MatchStatus: Score: 1:1 on map "de_inferno" RoundsPlayed: 2
|
||||
10/25/2026 - 18:09:08.839 - World triggered "Round_End"
|
||||
10/25/2026 - 18:09:17.339 - "Spieler1<0><[U:1:1000001]>" switched from team <CT> to <TERRORIST>
|
||||
10/25/2026 - 18:09:17.339 - "Sarge<10><BOT>" switched from team <TERRORIST> to <CT>
|
||||
10/25/2026 - 18:09:17.339 - Starting Freeze period
|
||||
10/25/2026 - 18:09:17.339 - "Spieler1<0><[U:1:1000001]><TERRORIST>" triggered "Got_The_Bomb"
|
||||
10/25/2026 - 18:09:17.339 - MatchStatus: Team playing "CT": MaxLAN Blau
|
||||
10/25/2026 - 18:09:17.339 - MatchStatus: Team playing "TERRORIST": MaxLAN Rot
|
||||
10/25/2026 - 18:09:17.339 - MatchStatus: Score: 1:1 on map "de_inferno" RoundsPlayed: 2
|
||||
10/25/2026 - 18:09:26.841 - World triggered "Round_Start"
|
||||
10/25/2026 - 18:09:35.935 - "Spieler1<0><[U:1:1000001]><TERRORIST>" [1167 474 111] killed "Darryl<12><BOT><CT>" [1326 435 129] with "deagle" (headshot)
|
||||
10/25/2026 - 18:09:35.935 - Team "TERRORIST" triggered "SFUI_Notice_Terrorists_Win" (CT "1") (T "2")
|
||||
10/25/2026 - 18:09:35.935 - Team "CT" scored "1" with "3" players
|
||||
10/25/2026 - 18:09:35.935 - Team "TERRORIST" scored "2" with "4" players
|
||||
10/25/2026 - 18:09:35.935 - MatchStatus: Team playing "CT": MaxLAN Rot
|
||||
10/25/2026 - 18:09:35.935 - MatchStatus: Team playing "TERRORIST": MaxLAN Blau
|
||||
10/25/2026 - 18:09:35.935 - MatchStatus: Score: 1:2 on map "de_inferno" RoundsPlayed: 3
|
||||
10/25/2026 - 18:09:35.935 - World triggered "Round_End"
|
||||
10/25/2026 - 18:09:38.935 - Starting Freeze period
|
||||
10/25/2026 - 18:09:38.935 - MatchStatus: Team playing "CT": MaxLAN Rot
|
||||
10/25/2026 - 18:09:38.935 - MatchStatus: Team playing "TERRORIST": MaxLAN Blau
|
||||
10/25/2026 - 18:09:38.935 - MatchStatus: Score: 1:2 on map "de_inferno" RoundsPlayed: 3
|
||||
10/25/2026 - 18:09:41.936 - World triggered "Round_Start"
|
||||
10/25/2026 - 18:09:59.311 - "Spieler1<0><[U:1:1000001]><TERRORIST>" [1364 124 132] killed "Sarge<10><BOT><CT>" [1746 -51 135] with "ak47"
|
||||
10/25/2026 - 18:09:59.311 - Team "TERRORIST" triggered "SFUI_Notice_Terrorists_Win" (CT "1") (T "3")
|
||||
10/25/2026 - 18:09:59.311 - Team "CT" scored "1" with "5" players
|
||||
10/25/2026 - 18:09:59.311 - Team "TERRORIST" scored "3" with "2" players
|
||||
10/25/2026 - 18:09:59.311 - MatchStatus: Team playing "CT": MaxLAN Rot
|
||||
10/25/2026 - 18:09:59.311 - MatchStatus: Team playing "TERRORIST": MaxLAN Blau
|
||||
10/25/2026 - 18:09:59.311 - MatchStatus: Score: 1:3 on map "de_inferno" RoundsPlayed: 4
|
||||
10/25/2026 - 18:09:59.311 - World triggered "Round_End"
|
||||
10/25/2026 - 18:09:59.311 - ACCOLADE, FINAL: {killreward}, Spieler1<0>, VALUE: 1800.000000, POS: 1, SCORE: 70.000000
|
||||
10/25/2026 - 18:09:59.311 - MatchStatus: Team playing "CT": MaxLAN Rot
|
||||
10/25/2026 - 18:09:59.311 - MatchStatus: Team playing "TERRORIST": MaxLAN Blau
|
||||
10/25/2026 - 18:09:59.311 - MatchStatus: Score: 1:3 on map "de_inferno" RoundsPlayed: 4
|
||||
10/25/2026 - 18:09:59.311 - Game Over: scrimcomp2v2 de_inferno score 1:3 after 3 min
|
||||
10/25/2026 - 18:10:24.326 - World triggered "Match_Start" on "de_inferno"
|
||||
10/25/2026 - 18:10:24.326 - Team playing "CT": MaxLAN Rot
|
||||
10/25/2026 - 18:10:24.326 - Team playing "TERRORIST": MaxLAN Blau
|
||||
10/25/2026 - 18:10:24.326 - MatchStatus: Score: 0:0 on map "de_inferno" RoundsPlayed: -1
|
||||
10/25/2026 - 18:10:26.336 - World triggered "Warmup_Start"
|
||||
10/25/2026 - 18:10:31.304 - World triggered "Game_Commencing"
|
||||
10/25/2026 - 18:10:31.304 - World triggered "Match_Start" on "de_inferno"
|
||||
10/25/2026 - 18:10:33.293 - World triggered "Warmup_Start"
|
||||
@@ -60,8 +60,8 @@ test('Seitenzuordnung nach dem Rundenende hat Vorrang, veraltete Zeilen zu Runde
|
||||
assert.deepEqual(s.rounds.map((r) => r.winner), ['A', 'B']);
|
||||
});
|
||||
|
||||
test('Echte Logzeilen eines CS2-Servers (Wingman, 4 Runden, Halbzeit nach 2)', () => {
|
||||
const lines = fs.readFileSync(path.join(here, 'fixtures', 'echte-logs-wingman.log'), 'utf8').split(/\r?\n/).filter(Boolean);
|
||||
test('Echte, anonymisierte Logzeilen eines CS2-Servers (Wingman, 4 Runden, Halbzeit nach 2)', () => {
|
||||
const lines = fs.readFileSync(path.join(here, 'fixtures', 'wingman-anonym.log'), 'utf8').split(/\r?\n/).filter(Boolean);
|
||||
const warmupEnd = lines.findIndex((l) => l.includes('command "mp_warmup_end"'));
|
||||
const ctx = { teamNames: { A: 'MaxLAN Blau', B: 'MaxLAN Rot' }, maxRounds: 4, overtimeRounds: 6 };
|
||||
|
||||
|
||||
Reference in new issue
Block a user