enricobuehler
017c37b78a
What is left of the plugin is what only a Decky plugin can do: start a stream through Steam so gamescope focuses it, and stand in front of the trust decision that gates it. One Quick Access panel, four sections, no route. HOSTS. One `useHosts()` calls discover and hosts-list together and merges them by fingerprint first, address second — so a host that moved DHCP lease still matches its record, and a different box that inherited the old address does not inherit its pairing. The CLI annotates `saved`/`paired` by that same rule, so the two surfaces cannot disagree. Rows sort online first, then most recently used, then by name: the host you streamed last night is the first thing under your thumb, and a host that is off right now never is. `needsPair` is now ONE rule: no pinned fingerprint. The session binary refuses a pinless connect, so a row without one can offer nothing but a button that fails. The old rule also consulted the advertised policy for unsaved hosts, which made the same box read differently before and after being saved. PINNED CARDS render NESTED under their host as `▸ <Profile name>`, not in a section of their own — a card IS a (host, profile) pair, and a row floating free of its host is exactly the "a pinned tile reads as a duplicate host" problem the desktop shells still have. The host's own BOUND profile is deliberately not drawn as a card: it applies silently on the plain row, and showing it twice would suggest the two do different things. This plugin creates, edits and deletes no profile and no card — pin creation belongs where profiles are edited. TRUST SHEET (new, trust.tsx). Request access (default) / Use a PIN instead… / Cancel, in the GTK dialog's order and wording. Request access is not a second ceremony — it saves the host with the fingerprint it ADVERTISED, then launches; the host parks that connect until its operator approves this Deck, admits it, and the stream starts by itself. No fingerprint, no request access. A host typed in by address advertises none, so the sheet offers the PIN path only and says why, rather than showing a button that could only fail. The sheet never TOFUs past a missing fingerprint: that pin is the only thing standing between a 185 s wait and an impostor answering for the host. The sheet is a `showModal` portal, so it captures its callbacks once and never re-renders from panel state — everything it acts on later is read through a ref. Reading a captured value is precisely what made pinning a second game compute from a stale base and clobber the first. LAUNCH PATH. The wrapper's contract becomes PF_REF / PF_PROFILE / PF_REQUEST_ACCESS / PF_BROWSE; PF_HOST, PF_LAUNCH, PF_MGMT and PF_CONNECT_TIMEOUT are gone. A stream is now `punktfunk launch <ref> [--profile <id>] --exec --fullscreen`, and a reference is all that ever rides Steam's launch options — no resolution, bitrate or codec, the same rule the deep-link grammar enforces. Request-access launches run SUPERVISED, without `--exec`: under --exec the CLI becomes the session, so no process survives to see the stream come up and record the approval. Safe for gamescope because focus follows reaper's descendant tree, not a single process, and flatpak-run/bwrap already sit in that tree on every other path. Wake-on-LAN comes out entirely. The plugin used to fire a magic packet itself and then stretch the connect budget to 75 s to cover the host's resume — a workaround for the CLI-less era. `punktfunk launch` runs the real wake-and-wait loop and only dials once the host answers, which is strictly better and deletes a backend method, a frontend call and a shell branch. The console-home branch of the wrapper is untouched on purpose: the shell binary already execs the session for `--browse`, so there is nothing to repoint and no reason to spend a diff there. Everything else in steam.ts — two shortcuts sharing one name (and so one Steam Input configset key), artwork versioning, appId verification, controller config, stopStream — is unchanged.
101 lines
5.3 KiB
Bash
Executable File
101 lines
5.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# punktfunk stream runner — the target of the non-Steam shortcuts the plugin creates.
|
|
#
|
|
# WHY A WRAPPER SCRIPT (load-bearing, from MoonDeck's hard-won knowledge): the stream client
|
|
# must be a descendant of the process Steam launches via `reaper`, or gamescope never gives
|
|
# its window focus/fullscreen in Gaming Mode (gamescope detects the "current app" by AppID,
|
|
# which only attaches to reaper's descendants — see gamescope#484). So the Decky plugin
|
|
# launches THIS script through SteamClient.Apps.RunGame; the script then runs the client,
|
|
# which inherits the shortcut's AppID and is focused. Launching the client directly from the
|
|
# (root) Decky backend produces an unfocused, invisible window.
|
|
#
|
|
# Per-session parameters arrive as environment variables, set as the shortcut's Steam launch
|
|
# options by the plugin (SteamClient.Apps.SetAppLaunchOptions), so ONE generic shortcut serves
|
|
# every host:
|
|
# PF_REF host reference — a saved host's stable id, or addr[:port] (required to stream)
|
|
# PF_PROFILE settings-profile id for a pinned card (optional)
|
|
# PF_REQUEST_ACCESS non-empty = ask the host's operator to admit this device instead of
|
|
# pairing with a PIN. The connect PARKS until somebody approves it.
|
|
# PF_BROWSE non-empty = open the client's console home instead of streaming
|
|
# PF_APPID flatpak app id (default io.unom.Punktfunk)
|
|
# PF_FLATPAK override the flatpak binary path (default: `flatpak` on PATH)
|
|
# PF_CLIENT_BIN absolute path of a NATIVE client (optional; set by the plugin when it
|
|
# resolved a non-flatpak install — then the client is run directly and
|
|
# PF_APPID/PF_FLATPAK are unused)
|
|
#
|
|
# A REFERENCE, NEVER A VALUE. Host refs and profile ids are the only things that ride this
|
|
# channel; no resolution, bitrate or codec ever does. The client resolves both against its own
|
|
# stores, which is what keeps a Steam launch option from becoming a second settings surface.
|
|
# The plugin validates them to space/quote-free ASCII before they reach Steam's tokenizer.
|
|
#
|
|
# Runs as the `deck` user (Steam launched it), so the --user flatpak install is visible and
|
|
# WAYLAND_DISPLAY / XDG_RUNTIME_DIR are already correct for gamescope.
|
|
#
|
|
# NO EXEC BIT REQUIRED: the Steam shortcut's exe is `/bin/sh` and this script rides behind
|
|
# `%command%` as an argument (see src/steam.ts). Decky extracts plugin zips without preserving
|
|
# permission bits and ~/homebrew/plugins is root-owned (the unprivileged plugin backend can't
|
|
# chmod), so the launch path must never depend on +x. Keep this script POSIX-sh clean.
|
|
set -u
|
|
|
|
APPID="${PF_APPID:-io.unom.Punktfunk}"
|
|
FLATPAK="${PF_FLATPAK:-flatpak}"
|
|
|
|
# The client is not always the flatpak: a sysext, a .deb/.rpm, an AUR build or a nix profile
|
|
# installs a native `punktfunk-client` with the CLI as its sibling, and the plugin passes the
|
|
# client's absolute path here when that is what it resolved.
|
|
#
|
|
# run_cli execs the HEADLESS CLI (`punktfunk`); run_session execs the GTK/console shell
|
|
# (`punktfunk-client`). Both live in the same place in both install kinds — /app/bin inside the
|
|
# flatpak, reachable with `--command=`, and one bindir natively.
|
|
run_cli() {
|
|
if [ -n "${PF_CLIENT_BIN:-}" ]; then
|
|
# `${VAR%/*}` rather than `dirname`: pure parameter expansion, so this works with no
|
|
# PATH at all — which is the environment a Steam launch option can leave us in.
|
|
exec "${PF_CLIENT_BIN%/*}/punktfunk" "$@"
|
|
fi
|
|
exec "$FLATPAK" run --arch=x86_64 --command=punktfunk "$APPID" "$@"
|
|
}
|
|
|
|
run_session() {
|
|
if [ -n "${PF_CLIENT_BIN:-}" ]; then
|
|
exec "$PF_CLIENT_BIN" "$@"
|
|
fi
|
|
exec "$FLATPAK" run --arch=x86_64 "$APPID" "$@"
|
|
}
|
|
|
|
# What we are about to run, for the log line each branch prints.
|
|
CLIENT_LABEL="${PF_CLIENT_BIN:-$APPID}"
|
|
|
|
# The console home: the client's own gamepad UI (host picker, pairing, add-host by address, the
|
|
# library browser and the full settings screen). UNCHANGED from before this rework — the shell
|
|
# binary already execs the session for `--browse`, so there is nothing to repoint here.
|
|
if [ -n "${PF_BROWSE:-}" ]; then
|
|
echo "punktfunkrun: gamepad UI $CLIENT_LABEL --browse (console home)" >&2
|
|
run_session --browse --fullscreen
|
|
fi
|
|
|
|
if [ -z "${PF_REF:-}" ]; then
|
|
echo "punktfunkrun: PF_REF is not set (the plugin sets it as a launch option)" >&2
|
|
exit 2
|
|
fi
|
|
|
|
set -- --fullscreen
|
|
if [ -n "${PF_PROFILE:-}" ]; then
|
|
set -- --profile "$PF_PROFILE" "$@"
|
|
fi
|
|
|
|
# REQUEST ACCESS RUNS SUPERVISED — no `--exec`. Under --exec the CLI BECOMES the session, so no
|
|
# process survives to see the stream come up and record the host as paired; the CLI refuses the
|
|
# combination outright rather than downgrading silently. This is safe for gamescope because
|
|
# focus follows reaper's DESCENDANT TREE, not a single process, and `flatpak run`/`bwrap`
|
|
# already sit between reaper and the client on every other path.
|
|
if [ -n "${PF_REQUEST_ACCESS:-}" ]; then
|
|
echo "punktfunkrun: request access $CLIENT_LABEL launch $PF_REF (waiting for approval)" >&2
|
|
run_cli launch "$PF_REF" --request-access "$@"
|
|
fi
|
|
|
|
# The ordinary stream. `--exec` is the documented gamescope-wrapper mode: the CLI becomes the
|
|
# session, so the process tree stays flat and Steam's "game" ends exactly when the stream does.
|
|
echo "punktfunkrun: streaming $CLIENT_LABEL launch $PF_REF" >&2
|
|
run_cli launch "$PF_REF" --exec "$@"
|