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).
58 lines
2.3 KiB
Bash
58 lines
2.3 KiB
Bash
#!/usr/bin/env bash
|
|
# Invoked by Sunshine as a stream-stop hook (global_prep_cmd `undo`).
|
|
# Moves the previously-active workspace back to a real monitor (if any
|
|
# exist) and tears down the headless output created by sunshine-stream-do.sh.
|
|
|
|
set -euo pipefail
|
|
|
|
log() { printf '[sunshine-undo] %s\n' "$*" >&2; }
|
|
|
|
STATE_DIR="${XDG_RUNTIME_DIR:-/tmp}/sunshine-headless"
|
|
# Headless name was captured by sunshine-stream-do.sh; fall back to discovery.
|
|
MON="$(cat "$STATE_DIR/headless-name" 2>/dev/null || true)"
|
|
|
|
if ! command -v hyprctl >/dev/null 2>&1; then
|
|
log "hyprctl not found; nothing to undo."
|
|
exit 0
|
|
fi
|
|
|
|
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")"
|
|
break
|
|
done
|
|
if [[ -z "${HYPRLAND_INSTANCE_SIGNATURE:-}" ]]; then
|
|
log "Hyprland not running; nothing to undo."
|
|
exit 0
|
|
fi
|
|
fi
|
|
|
|
PREV_WS="$(cat "$STATE_DIR/prev-workspace-id" 2>/dev/null || echo 1)"
|
|
|
|
if [[ -z "$MON" ]]; then
|
|
MON="$(hyprctl monitors -j 2>/dev/null \
|
|
| jq -r '.[] | select(.name | startswith("HEADLESS")) | .name' | head -1)"
|
|
fi
|
|
|
|
# Find a non-headless monitor to move the workspace back to. If there isn't one
|
|
# (truly headless host with KVM detached), the workspace just lives on whatever
|
|
# Hyprland reassigns it to when we remove the output.
|
|
REAL_MON="$(hyprctl monitors -j 2>/dev/null | jq -r '.[] | select(.name | test("^HEADLESS") | not) | .name' | head -n1)"
|
|
if [[ -n "$REAL_MON" ]]; then
|
|
log "Returning workspace $PREV_WS → $REAL_MON"
|
|
hyprctl dispatch moveworkspacetomonitor "$PREV_WS $REAL_MON" >/dev/null || true
|
|
hyprctl dispatch focusmonitor "$REAL_MON" >/dev/null || true
|
|
else
|
|
log "No real monitor connected; leaving workspace assignment to Hyprland defaults."
|
|
fi
|
|
|
|
# Leave HEADLESS-1 in place. It needs to exist persistently for Sunshine's
|
|
# encoder probe to succeed at startup; removing-and-recreating per session
|
|
# raced with the probe and caused fatal startup errors. Resizing on each
|
|
# new client (in sunshine-stream-do.sh) is enough — the output itself stays.
|
|
|
|
# Clean state files but keep the directory for the next run.
|
|
rm -f "$STATE_DIR/prev-monitors.json" "$STATE_DIR/prev-workspace-id"
|
|
log "Stream teardown complete (HEADLESS-1 kept for next connect)"
|