David Heinemeier HanssonandClaude Fable 5.1
9d48fc402e
* Install gliff by default Gliff is the Hyprland remote desktop over SSH. Ship it in the base package set for new installs, with a migration for existing ones. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Show a bar indicator while a gliff remote session is active The machine being controlled should make it obvious that someone is on it. A first-party remote-session service watches Hyprland's screencast events, which gliff-server triggers through ext-image-copy-capture, and probes for the server process, picking up the ssh client address from its environment. The RemoteSession indicator in the default tray lights up in the urgent colour while a session runs, and a notification announces each session start and end. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Address review of the remote session indicator Probe only the current user's gliff-server processes, forward refresh through the third-party service proxy so cloned indicator widgets can re-probe, exercise the Hyprland screencast event path in the service test with a grim capture instead of calling refresh by hand, and describe the indicator as status only in the manual. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Drop the remote session notifications The bar indicator is the signal; a toast on every connect and disconnect is noise on top of it. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Tighten remote session detection after review Hyprland reports a screencast stopped as soon as frames pause for half a second and says nothing more when the server later exits, so poll every two seconds while a session is active instead of trusting a stop event. Match only the screencast event, not its screencastv2 twin, and debounce the burst around one transition so it costs one probe. Move the probe into its own script that the service and the test both run, poll for state in the service test instead of fixed delays, and drop the unused session count. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
93 lines
2.6 KiB
Bash
93 lines
2.6 KiB
Bash
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
|
|
|
|
TMPDIR=""
|
|
QS_PID=""
|
|
|
|
cleanup() {
|
|
if [[ -n $QS_PID ]] && kill -0 "$QS_PID" 2>/dev/null; then
|
|
kill "$QS_PID" 2>/dev/null || true
|
|
wait "$QS_PID" 2>/dev/null || true
|
|
fi
|
|
if [[ -n $TMPDIR && -f $TMPDIR/stub.pid ]]; then
|
|
kill "$(<"$TMPDIR/stub.pid")" 2>/dev/null || true
|
|
fi
|
|
if [[ -n $TMPDIR && -d $TMPDIR ]]; then
|
|
rm -rf "$TMPDIR"
|
|
fi
|
|
}
|
|
trap cleanup EXIT
|
|
|
|
require_compositor "remote session service test"
|
|
|
|
if ! command -v quickshell >/dev/null 2>&1; then
|
|
skip "quickshell not installed; skipping remote session service test"
|
|
exit 0
|
|
fi
|
|
|
|
require_command jq
|
|
require_command grim
|
|
|
|
TMPDIR=$(mktemp -d)
|
|
result="$TMPDIR/result.json"
|
|
log="$TMPDIR/quickshell.log"
|
|
config_dir="$TMPDIR/remote-session"
|
|
mkdir -p "$config_dir" "$TMPDIR/home" "$TMPDIR/bin"
|
|
cp "$SHELL_TEST_DIR/fixtures/remote-session/shell.qml" "$config_dir/shell.qml"
|
|
|
|
# A stand-in for the real server: the probe matches it by process name, so it
|
|
# must stay a script called gliff-server rather than exec into sleep, and it
|
|
# takes its sleep down with it when killed. Its ssh peer comes from the
|
|
# environment the fixture launches it with. It cannot capture the screen, so
|
|
# the fixture uses grim for the screencast event.
|
|
cat >"$TMPDIR/bin/gliff-server" <<'SH'
|
|
#!/bin/bash
|
|
sleep 30 &
|
|
trap 'kill $!' TERM EXIT
|
|
wait $!
|
|
SH
|
|
|
|
chmod +x "$TMPDIR/bin/gliff-server"
|
|
|
|
OMARCHY_PATH="$ROOT" \
|
|
OMARCHY_QML_TEST_RESULT="$result" \
|
|
OMARCHY_QML_TEST_STUB_PID="$TMPDIR/stub.pid" \
|
|
OMARCHY_QML_TEST_FRAME="$TMPDIR/frame.png" \
|
|
HOME="$TMPDIR/home" \
|
|
XDG_CONFIG_HOME="$TMPDIR/home/.config" \
|
|
XDG_CACHE_HOME="$TMPDIR/home/.cache" \
|
|
XDG_STATE_HOME="$TMPDIR/home/.local/state" \
|
|
QML2_IMPORT_PATH="$ROOT/shell${QML2_IMPORT_PATH:+:$QML2_IMPORT_PATH}" \
|
|
QML_IMPORT_PATH="$ROOT/shell${QML_IMPORT_PATH:+:$QML_IMPORT_PATH}" \
|
|
PATH="$TMPDIR/bin:$ROOT/bin:$PATH" \
|
|
quickshell -p "$config_dir" --no-color >"$log" 2>&1 &
|
|
QS_PID=$!
|
|
|
|
for _ in {1..150}; do
|
|
[[ -s $result ]] && break
|
|
if ! kill -0 "$QS_PID" 2>/dev/null; then
|
|
sed -n '1,160p' "$log" >&2
|
|
fail "remote session quickshell exited before writing result"
|
|
fi
|
|
sleep 0.1
|
|
done
|
|
|
|
[[ -s $result ]] || {
|
|
sed -n '1,160p' "$log" >&2
|
|
fail "remote session service test timed out"
|
|
}
|
|
|
|
if ! jq -e '.ok == true' "$result" >/dev/null; then
|
|
jq . "$result" >&2
|
|
sed -n '1,160p' "$log" >&2
|
|
fail "remote session service tracks a gliff-server session"
|
|
fi
|
|
pass "remote session service tracks a gliff-server session"
|
|
|
|
[[ -s $TMPDIR/frame.png ]] || fail "the fixture raised screencast events through grim"
|
|
pass "the fixture raised screencast events through grim"
|
|
|