b26f138699
ci / rust (push) Has been cancelled
Both directions of the audio plane, on CoreAudio's built-in Opus codec
(kAudioFormatOpus — no bundled libopus; OpusCodec.swift, round trip unit-tested):
- Playback: a drain thread pulls nextAudio() packets, decodes, and writes a priming
jitter ring feeding an AVAudioSourceNode (~20 ms prefill, adaptive to the device's
render quantum so large-buffer devices don't oscillate prime/dropout; a high-water
clamp sheds stall backlog so one network hiccup can't permanently lag audio behind
video; underrun re-primes — one dip, not sustained crackle).
- Mic: a second engine taps the input device, resamples to 48 kHz stereo, Opus-encodes
20 ms chunks and sendMic()s them into the host's virtual PipeWire source. Permission
via AVCaptureDevice (NSMicrophoneUsageDescription added to the Xcode target).
- Settings: Speaker + Microphone pickers (CoreAudio HAL enumeration, persisted by
device UID — "System default" leaves the engine unpinned so it follows macOS device
changes) and a "Send microphone" toggle (default on). Applies from the next session.
- Audio starts with streaming, never during the trust prompt (no host sound — and no
mic uplink — before the user trusted the host); teardown stops audio before close().
Adversarial-review fixes baked in: stop() and the dangling mic-permission callback
share one lock+flag protocol (no hot mic with no owner), the connect-success handler
bails when the attempt was abandoned mid-handshake (no session/mic for a dead window),
SessionAudio gets a deinit backstop (a dropped instance can't pin the connection via
its drain thread), and the render scratch buffer is block-owned (was leaked per
session).
Verified live against the box: remote test decodes 100 host Opus packets to PCM and
the host opens its virtual mic on the first uplinked frame ("punktfunk/1 virtual mic
ready"); on-glass session runs with both engines up.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
197 lines
7.8 KiB
Swift
197 lines
7.8 KiB
Swift
// 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
|
|
import SwiftUI
|
|
|
|
/// Pump-thread-side frame counters; a 1 Hz main-actor timer drains them into @Published
|
|
/// values. NSLock instead of an actor — the writer is the (non-async) pump thread.
|
|
final class FrameMeter: @unchecked Sendable {
|
|
private let lock = NSLock()
|
|
private var frames = 0
|
|
private var bytes = 0
|
|
private var totalFrames = 0
|
|
|
|
func note(byteCount: Int) {
|
|
lock.lock()
|
|
frames += 1
|
|
bytes += byteCount
|
|
totalFrames += 1
|
|
lock.unlock()
|
|
}
|
|
|
|
/// Returns and resets the per-interval counters (the running total stays).
|
|
func drain() -> (frames: Int, bytes: Int, total: Int) {
|
|
lock.lock()
|
|
defer {
|
|
frames = 0
|
|
bytes = 0
|
|
lock.unlock()
|
|
}
|
|
return (frames, bytes, totalFrames)
|
|
}
|
|
}
|
|
|
|
@MainActor
|
|
final class SessionModel: ObservableObject {
|
|
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
|
|
@Published var totalFrames = 0
|
|
/// Mirrors StreamView's capture state (it owns the input capture; this drives the
|
|
/// HUD's "click to capture" / "⌘⎋ releases" hint).
|
|
@Published var mouseCaptured = false
|
|
|
|
let meter = FrameMeter()
|
|
private var statsTimer: Timer?
|
|
private var audio: SessionAudio?
|
|
|
|
var isBusy: Bool { phase != .idle }
|
|
|
|
func connect(to host: StoredHost, width: UInt32, height: UInt32, hz: UInt32,
|
|
compositor: PunktfunkConnection.Compositor = .auto,
|
|
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. The persistent identity is presented on every connect so a paired
|
|
// host recognizes this Mac (nil = anonymous, fine for hosts without
|
|
// --require-pairing; Keychain/generation failure must not block connecting).
|
|
let identity = (try? ClientIdentityStore.shared.load())?.identity
|
|
let result = Result { try PunktfunkConnection(
|
|
host: host.address, port: host.port,
|
|
width: width, height: height, refreshHz: hz,
|
|
pinSHA256: pin, identity: identity, compositor: compositor) }
|
|
await MainActor.run { [weak self] in
|
|
guard let self else { return }
|
|
// The user may have abandoned this attempt (window closed, another host
|
|
// clicked) while the handshake was in flight — don't resurrect a session
|
|
// for a dead window, and especially don't start its mic uplink.
|
|
guard self.phase == .connecting, self.activeHost?.id == host.id else {
|
|
if case .success(let conn) = result {
|
|
Task.detached { conn.close() } // joins Rust threads — off-main
|
|
}
|
|
return
|
|
}
|
|
switch result {
|
|
case .success(let conn):
|
|
self.connection = conn
|
|
self.startStatsTimer()
|
|
if pin != nil || autoTrust {
|
|
self.beginStreaming()
|
|
} else {
|
|
self.phase = .awaitingTrust(fingerprint: conn.hostFingerprint)
|
|
}
|
|
case .failure:
|
|
self.phase = .idle
|
|
self.activeHost = nil
|
|
self.errorMessage = pin != nil
|
|
? "Could not connect to \(host.displayName) — host unreachable, "
|
|
+ "not running, its identity no longer matches the pinned "
|
|
+ "fingerprint, or it requires pairing and no longer "
|
|
+ "recognizes this Mac (right-click the host card to pair "
|
|
+ "again)."
|
|
: "Could not connect to \(host.displayName) — is punktfunk-host "
|
|
+ "running on \(host.address):\(host.port)? If it requires "
|
|
+ "pairing, right-click the host card and pair with its PIN "
|
|
+ "first."
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// 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() {
|
|
statsTimer?.invalidate()
|
|
statsTimer = nil
|
|
let audio = self.audio
|
|
self.audio = nil
|
|
if let conn = connection {
|
|
// Audio teardown waits its drain thread out and close() waits out in-flight
|
|
// polls + joins the Rust worker threads — keep both off the main actor, in
|
|
// this order (no audio poll left when the handle is freed).
|
|
Task.detached {
|
|
audio?.stop()
|
|
conn.close()
|
|
}
|
|
} else {
|
|
Task.detached { audio?.stop() }
|
|
}
|
|
connection = nil
|
|
activeHost = nil
|
|
phase = .idle
|
|
fps = 0
|
|
mbps = 0
|
|
mouseCaptured = false
|
|
}
|
|
|
|
/// 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 \(name)."
|
|
}
|
|
|
|
private func beginStreaming() {
|
|
guard let conn = connection else { return }
|
|
// Input capture itself is owned by StreamView (engaged by the captureEnabled
|
|
// flip this phase change causes, released/re-engaged by the user from there).
|
|
phase = .streaming
|
|
// Audio starts with streaming, not during the trust prompt — no host sound (or
|
|
// mic uplink!) before the user trusted the host. Devices come from Settings;
|
|
// "" = system default.
|
|
let defaults = UserDefaults.standard
|
|
let audio = SessionAudio(connection: conn)
|
|
audio.start(
|
|
speakerUID: defaults.string(forKey: "punktfunk.speakerUID") ?? "",
|
|
micUID: defaults.string(forKey: "punktfunk.micUID") ?? "",
|
|
micEnabled: defaults.object(forKey: "punktfunk.micEnabled") as? Bool ?? true)
|
|
self.audio = audio
|
|
}
|
|
|
|
private func startStatsTimer() {
|
|
let timer = Timer(timeInterval: 1.0, repeats: true) { [weak self] _ in
|
|
guard let self else { return }
|
|
Task { @MainActor in
|
|
let (frames, bytes, total) = self.meter.drain()
|
|
self.fps = frames
|
|
self.mbps = Double(bytes) * 8 / 1_000_000
|
|
self.totalFrames = total
|
|
}
|
|
}
|
|
// .common so the HUD keeps updating during window drags / menu tracking.
|
|
RunLoop.main.add(timer, forMode: .common)
|
|
statsTimer = timer
|
|
}
|
|
}
|