feat: hosts grid + trust-on-first-use UX + settings pane
ci / rust (push) Has been cancelled

The app grows from a dev connect form into a real client shell:

- Home is a grid of saved hosts (UserDefaults-persisted; context menu: Remove / Forget
  Identity), "+" in the toolbar opens the add-host sheet, the stream mode moved into
  Settings (⌘, / gear) — native resolution stays the only mode, no scaling.
- Trust is now explicit: the protocol always supported certificate pinning, but the app
  passed no pin and discarded the observed fingerprint — silently trusting any host.
  First connect now shows the host's SHA-256 fingerprint (compare with the "clients pin
  this fingerprint" line in the host log) over the live-but-blurred stream; the stream
  must pump immediately (the opening IDR is the only guaranteed one), so StreamView gains
  a capturesCursor switch to keep the cursor free while the prompt needs clicking, and
  input capture starts only after confirmation. Trusting pins the fingerprint per host;
  a changed host identity then refuses to connect.
- PUNKTFUNK_AUTOCONNECT keeps working (auto-trusts, doesn't touch the saved hosts).

Host→client authorization (pairing PIN) remains a punktfunk-core roadmap item — the host
still accepts any client that can reach its port.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-06-10 16:15:37 +02:00
parent dc42d6a375
commit 5e77731da0
8 changed files with 479 additions and 95 deletions
@@ -1,5 +1,5 @@
// Session state for the app shell: owns the connection, the input capture, and the
// pump-thread main-actor stats relay.
// Session state for the app shell: owns the connection, the input capture, the trust
// handshake phase, and the pump-thread main-actor stats relay.
import Foundation
import PunktfunkKit
@@ -35,8 +35,20 @@ final class FrameMeter: @unchecked Sendable {
@MainActor
final class SessionModel: ObservableObject {
@Published var connection: PunktfunkConnection?
@Published var connecting = false
enum Phase: Equatable {
case idle
case connecting
/// Connected to an unpinned host: the stream is live (and pumping the opening
/// IDR must not be missed) but input/cursor capture wait for the user to confirm
/// the observed fingerprint.
case awaitingTrust(fingerprint: Data)
case streaming
}
@Published private(set) var phase: Phase = .idle
@Published private(set) var connection: PunktfunkConnection?
/// The host this session is for (a value copy; identity = id).
@Published private(set) var activeHost: StoredHost?
@Published var errorMessage: String?
@Published var fps = 0
@Published var mbps = 0.0
@@ -46,30 +58,57 @@ final class SessionModel: ObservableObject {
private var inputCapture: InputCapture?
private var statsTimer: Timer?
func connect(host: String, port: UInt16, width: UInt32, height: UInt32, hz: UInt32) {
guard !connecting else { return }
connecting = true
var isBusy: Bool { phase != .idle }
func connect(to host: StoredHost, width: UInt32, height: UInt32, hz: UInt32,
autoTrust: Bool = false) {
guard phase == .idle else { return }
phase = .connecting
activeHost = host
errorMessage = nil
let pin = host.pinnedSHA256
Task.detached(priority: .userInitiated) {
// PunktfunkConnection.init blocks on the QUIC handshake keep it off the main actor.
let result = Result { try PunktfunkConnection(
host: host, port: port, width: width, height: height, refreshHz: hz) }
host: host.address, port: host.port,
width: width, height: height, refreshHz: hz,
pinSHA256: pin) }
await MainActor.run { [weak self] in
guard let self else { return }
self.connecting = false
switch result {
case .success(let conn):
self.connection = conn
self.startInput(conn)
self.startStatsTimer()
if pin != nil || autoTrust {
self.beginStreaming()
} else {
self.phase = .awaitingTrust(fingerprint: conn.hostFingerprint)
}
case .failure:
self.errorMessage = "Connection failed — is the host running? " +
"(punktfunk-host m3-host on \(host):\(port))"
self.phase = .idle
self.activeHost = nil
self.errorMessage = pin != nil
? "Could not connect to \(host.displayName) — host unreachable, "
+ "not running, or its identity no longer matches the pinned "
+ "fingerprint."
: "Could not connect to \(host.displayName) — is punktfunk-host "
+ "running on \(host.address):\(host.port)?"
}
}
}
}
/// The user confirmed the fingerprint: returns it for pinning and enters streaming.
func confirmTrust() -> Data? {
guard case .awaitingTrust(let fingerprint) = phase else { return nil }
beginStreaming()
return fingerprint
}
func rejectTrust() {
disconnect()
}
func disconnect() {
inputCapture?.stop()
inputCapture = nil
@@ -81,6 +120,8 @@ final class SessionModel: ObservableObject {
Task.detached { conn.close() }
}
connection = nil
activeHost = nil
phase = .idle
fps = 0
mbps = 0
}
@@ -88,11 +129,14 @@ final class SessionModel: ObservableObject {
/// Called (via the main actor) when the pump hits end-of-session.
func sessionEnded() {
guard connection != nil else { return }
let name = activeHost?.displayName ?? "host"
disconnect()
errorMessage = "Session ended by host."
errorMessage = "Session ended by \(name)."
}
private func startInput(_ conn: PunktfunkConnection) {
private func beginStreaming() {
guard let conn = connection else { return }
phase = .streaming
let capture = InputCapture(connection: conn)
capture.start()
inputCapture = capture