0b4f121a92
Moves the seven HTML scene dirs (landing/, loading/, game/, desktop/,
goodbye/, music-box/, music/) and the superseded bash helpers (setup.sh,
loading.sh, playlist.sh, telemetry.sh) into archived/ rather than deleting.
The Laravel webapp/ replaces all of them; archived/README.md spells out
the rollback procedure.
Also:
- rewrite the relevant sections of CLAUDE.md so it points at webapp/
blade views, the Artisan commands, and the supervisord lifecycle
(`supervisorctl restart obs-webapp` after route / controller / .env
changes; Blade view edits are still safe-while-running via OBS's
Refresh cache).
- extend scripts/deploy-rig.sh to install php + composer + supervisor,
run `composer install`, copy obs-webapp.supervisord.conf into
/etc/supervisor.d/, start the program, and call `php artisan
rig:setup` + `rig:telemetry --collect` instead of the old bash.
- .gitignore catches the generated machine-local files that came along
when the old scene dirs moved (telemetry.js, loading.json, playlist.js,
cmd.js, obs-config.js).
- daemon.blade.php is now passive — listens to mpd:state but does not
play audio or broadcast its own queue, so it stops fighting with
bridges/mpd-state.py (the post-browser-daemon-migration source of
truth for mpd:state).
- nc.blade.php overrides .terminal { overflow: hidden } from hud.css
so the `┤ TERMINAL ├` and `┤ NOW PLAYING ├` pane-tabs stick above
the pane border instead of being clipped.
58 lines
1.9 KiB
Bash
Executable File
58 lines
1.9 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# One-time setup: builds vendor/obs-config.js from your existing OBS WebSocket
|
|
# plugin config so the overlay/daemon pages can connect.
|
|
#
|
|
# bash scripts/setup.sh
|
|
#
|
|
# Re-run if you change the WebSocket port or password in OBS.
|
|
set -euo pipefail
|
|
|
|
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
OBS_DIR="$(cd "$DIR/.." && pwd)"
|
|
SRC="$OBS_DIR/plugin_config/obs-websocket/config.json"
|
|
OUT="$OBS_DIR/vendor/obs-config.js"
|
|
|
|
if [[ ! -f "$SRC" ]]; then
|
|
echo " ✗ $SRC not found." >&2
|
|
echo " Open OBS once with the obs-websocket plugin loaded so it generates the config." >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Pull port + password out of the JSON
|
|
read -r PORT PASS ENABLED <<<"$(python3 -c "
|
|
import json, sys
|
|
d = json.load(open('$SRC'))
|
|
print(d.get('server_port', 4455), d.get('server_password', ''), str(d.get('server_enabled', False)).lower())
|
|
")"
|
|
|
|
mkdir -p "$OBS_DIR/vendor"
|
|
cat > "$OUT" <<JS
|
|
// Auto-generated by scripts/setup.sh — gitignored. Reflects the current contents
|
|
// of plugin_config/obs-websocket/config.json. Re-run scripts/setup.sh if it changes.
|
|
window.__OBSWS = {
|
|
url: 'ws://localhost:$PORT',
|
|
password: '$PASS',
|
|
};
|
|
JS
|
|
|
|
echo " ✓ wrote $OUT"
|
|
echo " url = ws://localhost:$PORT"
|
|
if [[ -z "$PASS" ]]; then
|
|
echo " password = (none)"
|
|
else
|
|
echo " password = (set, ${#PASS} chars)"
|
|
fi
|
|
|
|
# Check the live socket, not the config file — OBS lags writes to plugin_config
|
|
# until shutdown, so server_enabled in JSON often disagrees with reality.
|
|
echo
|
|
if ss -lnt 2>/dev/null | grep -q ":$PORT "; then
|
|
echo " ✓ OBS WebSocket server is listening on :$PORT"
|
|
elif nc -z localhost "$PORT" 2>/dev/null; then
|
|
echo " ✓ OBS WebSocket server is listening on :$PORT"
|
|
else
|
|
echo " ⚠ Nothing listening on :$PORT yet."
|
|
echo " In OBS: Tools → WebSocket Server Settings → ✅ Enable WebSocket server → OK"
|
|
echo " (config.json may already say 'enabled: $ENABLED' — that file lags actual state)"
|
|
fi
|