enricobuehler
133e25849d
Sources reorganized (client: Home/Session/Settings/Stores/Support/Trust; kit: Audio/Connection/Gamepad/Input/Support/Video/Views) with the big files split along the same seams. The gamepad mode is couch-complete, and now on macOS too (the living-room Mac case), not just iOS/iPadOS: - GamepadSettingsView: a console-style, fully controller-navigable settings screen (X from the launcher) — up/down moves focus, left/right steps values (clamped, boundary thud), A cycles/toggles, B closes; the focused row shows a one-line description. Backed by GamepadMenuList, the vertical sibling of GamepadCarousel, and SettingsOptions — the option lists hoisted out of SettingsView statics and shared by the touch, tvOS and gamepad settings. - GamepadAddHostView + GamepadKeyboard: register a host end to end with a pad — field rows open an on-screen controller keyboard (dpad grid, A types, X backspaces, B done); the launcher carousel ends in an Add Host tile, so the dead-end "add one with touch first" empty state is gone. - Launcher polish: contextual hint bar with the pad's real button glyphs, controller name + battery chip, one shared console chrome. - GamepadScreenBackground: an animated aurora (TimelineView-driven drifting blobs in the brand's violet family, breathing radii, slow hue shift, legibility scrim; freezes under Reduce Motion). Pure SwiftUI on purpose — a .metal library only bundles reliably in one of the two build systems (SPM vs the xcodeproj's synced folders) these sources compile under. - macOS port: settings/add-host/library present as sized sheets (a macOS sheet takes its content's IDEAL size, and the GeometryReader-driven screens collapsed to nothing), NSScreen-based mode lists, scroll indicators .never (the "always show scroll bars" setting overrides .hidden), tray scrims so scrolled rows dim under the pinned title/hints, extra title clearance, and a PUNKTFUNK_FORCE_GAMEPAD_UI=1 dev hook — launcher/settings/add-host/keyboard/ library render-verified live on a real Mac + LAN hosts. - GamepadMenuInput: X button support, and (re)start now snapshots held buttons so a controller handoff press never fires twice (the B that closed the keyboard no longer also cancels the screen underneath). - Cleanups: one "Connection failed" alert in ContentView instead of one per home screen; HostDiscovery.advertises/unsaved shared by both home screens. - host: can_encode_444 stub for the non-Linux/Windows host build (the macOS synthetic-source loopback used by the Swift tests). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
65 lines
3.0 KiB
Bash
Executable File
65 lines
3.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Loopback integration: real punktfunk/1 hosts (synthetic source — pure protocol, runs fine on
|
|
# macOS) on 127.0.0.1, then the Swift integration tests against them through the xcframework.
|
|
# Three hosts: an OPEN one (--allow-tofu; the anonymous stream round trip — bare punktfunk1-host
|
|
# now defaults to require-pairing), one armed with --require-pairing (the PIN ceremony + pairing
|
|
# gate — its random PIN is parsed out of its log), and a GUESS host whose one-shot arming window
|
|
# the wrong-PIN test deliberately burns (a pairing attempt — right or wrong — consumes the armed
|
|
# PIN, the SPAKE2 "one online guess", so the real ceremony needs a window of its own).
|
|
set -euo pipefail
|
|
cd "$(dirname "$0")/../.."
|
|
|
|
PORT="${PUNKTFUNK_LOOPBACK_PORT:-19778}"
|
|
PAIR_PORT="${PUNKTFUNK_PAIRING_PORT:-19779}"
|
|
GUESS_PORT="${PUNKTFUNK_GUESS_PORT:-19780}"
|
|
|
|
cargo build --release -p punktfunk-host
|
|
|
|
# Each host gets a throwaway config home: the pairing hosts persist a trust store
|
|
# (punktfunk1-paired.json, resolved from $HOME) and all mint an identity cert on first
|
|
# run — none of that belongs in the user's real ~/.config/punktfunk, and separate homes
|
|
# also keep the first runs from racing on the same cert.pem.
|
|
CFG="$(mktemp -d "${TMPDIR:-/tmp}/punktfunk-loopback.XXXXXX")"
|
|
PAIR_LOG="$CFG/pairing-host.log"
|
|
GUESS_LOG="$CFG/guess-host.log"
|
|
mkdir -p "$CFG/open" "$CFG/paired" "$CFG/guess"
|
|
trap 'kill "${HOST_PID:-}" "${PAIR_PID:-}" "${GUESS_PID:-}" 2>/dev/null || true' EXIT
|
|
# The open host also scripts a feedback burst (rumble + DualSense hidout) right after the
|
|
# handshake, so the Swift test can assert the host→client feedback planes end to end.
|
|
HOME="$CFG/open" XDG_CONFIG_HOME="$CFG/open/.config" PUNKTFUNK_TEST_FEEDBACK=1 \
|
|
target/release/punktfunk-host punktfunk1-host --port "$PORT" --source synthetic --frames 300 \
|
|
--allow-tofu &
|
|
HOST_PID=$!
|
|
HOME="$CFG/paired" XDG_CONFIG_HOME="$CFG/paired/.config" \
|
|
target/release/punktfunk-host punktfunk1-host --port "$PAIR_PORT" --source synthetic --frames 300 \
|
|
--require-pairing >"$PAIR_LOG" 2>&1 &
|
|
PAIR_PID=$!
|
|
HOME="$CFG/guess" XDG_CONFIG_HOME="$CFG/guess/.config" \
|
|
target/release/punktfunk-host punktfunk1-host --port "$GUESS_PORT" --source synthetic --frames 300 \
|
|
--require-pairing >"$GUESS_LOG" 2>&1 &
|
|
GUESS_PID=$!
|
|
sleep 1
|
|
|
|
# Parse each pairing host's random arming PIN out of its startup log.
|
|
pin_from_log() {
|
|
local log="$1" pin=""
|
|
for _ in $(seq 50); do
|
|
pin="$(grep -oE 'pair: [0-9]+' "$log" | head -1 | cut -d' ' -f2 || true)"
|
|
[ -n "$pin" ] && break
|
|
sleep 0.2
|
|
done
|
|
if [ -z "$pin" ]; then
|
|
echo "no arming PIN in the pairing host's log ($log)" >&2
|
|
exit 1
|
|
fi
|
|
echo "$pin"
|
|
}
|
|
PIN="$(pin_from_log "$PAIR_LOG")"
|
|
GUESS_PIN="$(pin_from_log "$GUESS_LOG")"
|
|
|
|
cd clients/apple
|
|
PUNKTFUNK_LOOPBACK_PORT="$PORT" PUNKTFUNK_PAIRING_PORT="$PAIR_PORT" PUNKTFUNK_PAIRING_PIN="$PIN" \
|
|
PUNKTFUNK_GUESS_PORT="$GUESS_PORT" PUNKTFUNK_GUESS_PIN="$GUESS_PIN" \
|
|
PUNKTFUNK_TEST_FEEDBACK=1 \
|
|
swift test --filter LoopbackIntegrationTests
|