Levi Woodard
16e2465cf5
This bundles every fix we made debugging the first real install plus a comprehensive troubleshooting reference. Working tree is now PII-safe for public distribution: hostname-based default mode is driven by a HEADLESS_HOSTS env var instead of a hardcoded literal; docs use placeholders for hostnames and LAN IPs. Self-healing headless management - bin/sunshine-prestart.sh (new): runs as systemd ExecStartPre. Resolves the Hyprland instance signature from XDG_RUNTIME_DIR/hypr when systemd-user env didn't propagate it. Reduces to exactly one headless output by keeping the lowest-numbered HEADLESS-N and removing the rest. Rewrites the managed sunshine.conf's output_name line to match the surviving name — Hyprland's HEADLESS-N counter is monotonic and ignores the optional name argument to 'output create headless', so without active sync output_name drifts off HEADLESS-1 after the first restart cycle. - bin/sunshine-stream-do.sh: dropped the hardcoded MON=HEADLESS-1. Now discovers whatever HEADLESS-* exists via jq. Resize and workspace migration target the actual output. - bin/sunshine-stream-undo.sh: reads the headless name from a state file the do-script wrote, with discovery fallback. Stops removing the output between sessions — the create/destroy race caused fatal startup encoder errors on the next Sunshine restart. - files/headless-prestart.conf, files/sunshine.service: ExecStartPre now points at the new prestart script. - lib/headless.sh: install_headless_hooks now installs all three scripts. New install_headless_prestart_dropin resolves the actual systemd unit name (sunshine.service vs app-dev.lizardbyte.app.Sunshine.service) and lands the drop-in under <unit>.service.d/. Firewall detection - lib/firewall.sh: _ufw_active now uses 'systemctl is-active ufw.service' instead of 'ufw status'. The latter requires root to read /etc/ufw state, so the unprivileged probe returned false and we silently skipped opening Sunshine's ports on hosts where ufw was actively dropping packets. Service unit fallbacks - lib/service.sh: ensure_sunshine_unit_present looks for sunshine.service in every systemd-user path first; falls back to the reverse-DNS AUR-source unit name; last resort drops a repo-provided fallback unit. systemctl reset-failed before each restart so a previous start-limit-hit doesn't immediately reject the new attempt. Preflight - lib/preflight.sh: new preflight_headless step that, only when STREAM_MODE is headless, surfaces missing hyprctl / jq / Hyprland reachability before install proceeds. Public-safe defaults - install.sh: streaming-mode default is now driven by HEADLESS_HOSTS env var (comma-separated, case-insensitive). Unset by default — every host gets mirror mode unless its hostname is listed or --headless is passed explicitly. Past versions hardcoded a specific hostname. - README.md: replaced JARVIS-specific examples with HEADLESS_HOSTS prose. Docs - docs/TROUBLESHOOTING.md (new): comprehensive failure-mode reference. Every issue hit during the first end-to-end install, in order, with symptom → cause → fix → permanent prevention. Plus a "Custom keybinding to escape Moonlight" section and an outstanding-followups punch list (1Password black-rectangle workarounds, hypridle inhibit during stream, busiest- workspace auto-switch, jarvis.lan DNS, 1Password SSH agent timeouts).
76 lines
2.9 KiB
Bash
76 lines
2.9 KiB
Bash
#!/usr/bin/env bash
|
|
# Invoked by Sunshine as a stream-start hook (global_prep_cmd `do`).
|
|
# Creates/resizes a Hyprland headless output to match the connecting
|
|
# Moonlight client's resolution, and moves the active workspace onto it
|
|
# so the user's existing windows are visible on the stream.
|
|
#
|
|
# Sunshine env vars set on connect:
|
|
# SUNSHINE_CLIENT_WIDTH, SUNSHINE_CLIENT_HEIGHT, SUNSHINE_CLIENT_FPS
|
|
|
|
set -euo pipefail
|
|
|
|
log() { printf '[sunshine-do] %s\n' "$*" >&2; }
|
|
|
|
WIDTH="${SUNSHINE_CLIENT_WIDTH:-1920}"
|
|
HEIGHT="${SUNSHINE_CLIENT_HEIGHT:-1080}"
|
|
FPS="${SUNSHINE_CLIENT_FPS:-60}"
|
|
STATE_DIR="${XDG_RUNTIME_DIR:-/tmp}/sunshine-headless"
|
|
mkdir -p "$STATE_DIR"
|
|
|
|
if ! command -v hyprctl >/dev/null 2>&1; then
|
|
log "hyprctl not found; cannot configure headless. Stream will use whatever output Sunshine selects."
|
|
exit 0
|
|
fi
|
|
|
|
# Recover Hyprland signature if it wasn't inherited (defensive — UWSM exports it,
|
|
# but a stray service environment could miss it).
|
|
if [[ -z "${HYPRLAND_INSTANCE_SIGNATURE:-}" ]]; then
|
|
for sig_dir in "${XDG_RUNTIME_DIR:-/tmp}"/hypr/*/; do
|
|
[[ -d "$sig_dir" ]] || continue
|
|
export HYPRLAND_INSTANCE_SIGNATURE="$(basename "$sig_dir")"
|
|
log "Discovered HYPRLAND_INSTANCE_SIGNATURE=$HYPRLAND_INSTANCE_SIGNATURE"
|
|
break
|
|
done
|
|
if [[ -z "${HYPRLAND_INSTANCE_SIGNATURE:-}" ]]; then
|
|
log "Hyprland not running; nothing to configure."
|
|
exit 0
|
|
fi
|
|
fi
|
|
|
|
# Snapshot prior state so undo can restore.
|
|
hyprctl monitors -j > "$STATE_DIR/prev-monitors.json" 2>/dev/null || true
|
|
PREV_WS="$(hyprctl activeworkspace -j 2>/dev/null | jq -r '.id // 1' || echo 1)"
|
|
echo "$PREV_WS" > "$STATE_DIR/prev-workspace-id"
|
|
|
|
# Discover whatever headless output already exists. sunshine-prestart.sh is
|
|
# responsible for ensuring one exists and aligning sunshine.conf's output_name
|
|
# to its actual name (Hyprland's HEADLESS-N counter drifts across restarts).
|
|
MON="$(hyprctl monitors -j 2>/dev/null \
|
|
| jq -r '.[] | select(.name | startswith("HEADLESS")) | .name' | head -1)"
|
|
if [[ -z "$MON" ]]; then
|
|
log "No headless output found; creating one"
|
|
hyprctl output create headless >/dev/null
|
|
for _ in 1 2 3 4 5; do
|
|
MON="$(hyprctl monitors -j 2>/dev/null \
|
|
| jq -r '.[] | select(.name | startswith("HEADLESS")) | .name' | head -1)"
|
|
[[ -n "$MON" ]] && break
|
|
sleep 0.1
|
|
done
|
|
fi
|
|
if [[ -z "$MON" ]]; then
|
|
log "Failed to obtain a headless output; bailing."
|
|
exit 0
|
|
fi
|
|
echo "$MON" > "$STATE_DIR/headless-name"
|
|
|
|
# Resize headless to the client's resolution / framerate.
|
|
log "Sizing $MON → ${WIDTH}x${HEIGHT}@${FPS}"
|
|
hyprctl keyword monitor "$MON,${WIDTH}x${HEIGHT}@${FPS},auto,1" >/dev/null
|
|
|
|
# Move the active workspace onto the headless so existing windows appear in the stream.
|
|
log "Moving workspace $PREV_WS → $MON, focusing it"
|
|
hyprctl dispatch moveworkspacetomonitor "$PREV_WS $MON" >/dev/null || true
|
|
hyprctl dispatch focusmonitor "$MON" >/dev/null || true
|
|
|
|
log "Stream ready: ${WIDTH}x${HEIGHT}@${FPS} on $MON"
|