Watch sessions now run an HKLiveWorkoutBuilder: heart rate and active energy are collected live (shown in an in-workout HUD), saved to Health as a real HKWorkout on completion, and carried back to the phone as WorkoutMetrics on the workout document. Phone-only workouts get an estimated Health workout (MET x bodyweight x duration) after a 10s debounce that a late-arriving watch session cancels; a launch sweep backfills workouts completed within the last day. Dedupe is keyed on metrics.healthKitWorkoutUUID plus the metrics source. Splits gain an activity type (strength, functional, HIIT, core, cardio, cycling) that categorizes the Health workout and picks the MET value. A post-workout summary sheet (duration, calories, avg/max HR, HR zones, total volume) fills in live and is also shown on completed workouts. Weights can now display in lb or kg (display-only relabel), synced to the watch over the existing application context. WorkoutDocument schema 1->2 (metrics are irreplaceable, so older apps must quarantine rather than strip them); cache schema 2 rebuilds the SwiftData store with the new metric columns. Deleting a workout in the app intentionally leaves its Health record in place.
235 lines
11 KiB
Swift
235 lines
11 KiB
Swift
import Foundation
|
|
import SwiftData
|
|
import WatchConnectivity
|
|
|
|
/// Phone side of the iPhone↔Watch bridge. The phone owns iCloud Drive; the watch
|
|
/// is a thin remote that round-trips through it:
|
|
/// • Phone → Watch: pushes all splits + recent workouts as the latest
|
|
/// application context whenever the cache changes (local or remote).
|
|
/// • Watch → Phone: receives an updated `WorkoutDocument` and applies it via the
|
|
/// SyncEngine write path (file → observer → cache → push back).
|
|
@MainActor
|
|
final class PhoneConnectivityBridge: NSObject {
|
|
private let container: ModelContainer
|
|
private let syncEngine: SyncEngine
|
|
private let liveRunState: LiveRunState
|
|
private var session: WCSession?
|
|
|
|
/// Exclusive-edit lock published to the watch. While the phone has a workout's
|
|
/// exercise (or a split) open in an editor, the watch parks any matching run and
|
|
/// blocks re-entry — so the two devices never drive the same run at once. Included in
|
|
/// every `pushAll` (the latest-wins context replaces wholesale, so a push that omitted
|
|
/// them would clear the lock prematurely).
|
|
private(set) var editingWorkoutID: String?
|
|
private(set) var editingSplitID: String?
|
|
|
|
/// Monotonic sequence stamped on each live-run frame we send. Bumped to stay ahead of
|
|
/// any frame we *receive*, so the two devices share one increasing sequence per run and
|
|
/// either side can drop a stale / out-of-order delivery (see `LiveProgress.version`).
|
|
private var liveVersion = 0
|
|
|
|
/// The latest live-run message we haven't confirmed reached the watch (depth 1, latest-wins).
|
|
/// Staged regardless of reachability and re-sent by `flushLive()` when reachability/activation
|
|
/// returns, so a brief WatchConnectivity drop doesn't desync the mirror. A newer frame — or the
|
|
/// terminal `.ended` — replaces it, so we never deliver stale state. Frames carry an absolute
|
|
/// wall-clock anchor, so a late re-send self-corrects on arrival rather than reading as stale.
|
|
private var pendingLive: PendingLive?
|
|
|
|
private var context: ModelContext { container.mainContext }
|
|
|
|
init(container: ModelContainer, syncEngine: SyncEngine, liveRunState: LiveRunState) {
|
|
self.container = container
|
|
self.syncEngine = syncEngine
|
|
self.liveRunState = liveRunState
|
|
super.init()
|
|
}
|
|
|
|
func activate() {
|
|
guard WCSession.isSupported() else { return }
|
|
let session = WCSession.default
|
|
session.delegate = self
|
|
session.activate()
|
|
self.session = session
|
|
// Push fresh state to the watch whenever the cache changes.
|
|
syncEngine.onCacheChanged = { [weak self] in self?.pushAll() }
|
|
}
|
|
|
|
/// Sends the current splits + most-recent workouts to the watch.
|
|
func pushAll() {
|
|
guard let session, session.activationState == .activated, session.isPaired,
|
|
session.isWatchAppInstalled else { return }
|
|
|
|
let splits = (try? context.fetch(FetchDescriptor<Split>(sortBy: [SortDescriptor(\.order)]))) ?? []
|
|
|
|
// The watch only needs what it can act on: every active run (in-progress /
|
|
// not-started) plus recently-completed ones, kept ~24h so a run that just
|
|
// finished still renders before the watch prunes it. The watch treats this as an
|
|
// authoritative set and prunes anything absent — that's what ends its session on a
|
|
// Discard/Delete. Active runs are sent in full (no cap): there are only ever a
|
|
// handful, so "absent" unambiguously means "no longer active".
|
|
let inProgressRaw = WorkoutStatus.inProgress.rawValue
|
|
let notStartedRaw = WorkoutStatus.notStarted.rawValue
|
|
let completedRaw = WorkoutStatus.completed.rawValue
|
|
let cutoff = Date(timeIntervalSinceNow: -86_400)
|
|
|
|
let activeDesc = FetchDescriptor<Workout>(
|
|
predicate: #Predicate<Workout> { $0.statusRaw == inProgressRaw || $0.statusRaw == notStartedRaw },
|
|
sortBy: [SortDescriptor(\.start, order: .reverse)]
|
|
)
|
|
var completedDesc = FetchDescriptor<Workout>(
|
|
predicate: #Predicate<Workout> { $0.statusRaw == completedRaw },
|
|
sortBy: [SortDescriptor(\.start, order: .reverse)]
|
|
)
|
|
completedDesc.fetchLimit = 25
|
|
let active = (try? context.fetch(activeDesc)) ?? []
|
|
let recentCompleted = ((try? context.fetch(completedDesc)) ?? []).filter { ($0.end ?? $0.start) > cutoff }
|
|
let workouts = active + recentCompleted
|
|
|
|
let restSeconds = UserDefaults.standard.object(forKey: WCPayload.restSecondsKey) as? Int ?? 45
|
|
let doneCountdownSeconds = UserDefaults.standard.object(forKey: WCPayload.doneCountdownSecondsKey) as? Int ?? 5
|
|
let weightUnit = UserDefaults.standard.string(forKey: WCPayload.weightUnitKey) ?? WeightUnit.lb.rawValue
|
|
let payload = WCPayload.encodeState(
|
|
splits: splits.map(SplitDocument.init(from:)),
|
|
workouts: workouts.map(WorkoutDocument.init(from:)),
|
|
restSeconds: restSeconds,
|
|
doneCountdownSeconds: doneCountdownSeconds,
|
|
weightUnit: weightUnit,
|
|
editingWorkoutID: editingWorkoutID,
|
|
editingSplitID: editingSplitID
|
|
)
|
|
try? session.updateApplicationContext(payload)
|
|
}
|
|
|
|
/// Mark (or clear, with `nil`) the workout currently open in a phone exercise editor.
|
|
/// The watch parks that run and blocks re-entry until it clears. Pushes immediately so
|
|
/// the lock takes effect without waiting on a cache change.
|
|
func setEditingWorkout(_ id: String?) {
|
|
guard editingWorkoutID != id else { return }
|
|
editingWorkoutID = id
|
|
pushAll()
|
|
}
|
|
|
|
/// Mark (or clear, with `nil`) the split currently open in a phone editor. The watch
|
|
/// parks any active run sourced from that split (matched by `splitID`).
|
|
func setEditingSplit(_ id: String?) {
|
|
guard editingSplitID != id else { return }
|
|
editingSplitID = id
|
|
pushAll()
|
|
}
|
|
|
|
// MARK: - Live run mirror (ephemeral; coalesced redelivery)
|
|
|
|
/// Broadcast where the run flow currently is, so the watch (if it has this run open) can follow
|
|
/// it live. Staged as the latest pending frame and sent when reachable; if the watch is
|
|
/// unreachable it's held and re-sent on reconnect (`flushLive`). Because frames are full state
|
|
/// snapshots with a wall-clock anchor, holding only the newest one (depth 1) and self-correcting
|
|
/// its timers on arrival means a re-send is never stale. Mirrors the watch's `sendLiveProgress`;
|
|
/// only *human* transitions are sent.
|
|
func sendLiveProgress(_ frame: LiveProgress) {
|
|
guard let session, session.activationState == .activated else { return }
|
|
liveVersion += 1
|
|
var stamped = frame
|
|
stamped.version = liveVersion
|
|
pendingLive = .progress(stamped)
|
|
flushLive()
|
|
}
|
|
|
|
/// Tell the watch we left the run flow (the cover closed / the run finished). Staged like a
|
|
/// frame so a drop at the moment the run ends doesn't strand the watch's follower cover — the
|
|
/// terminal marker supersedes any pending progress and is re-sent on reconnect.
|
|
func sendLiveEnded(workoutID: String, logID: String) {
|
|
guard let session, session.activationState == .activated else { return }
|
|
pendingLive = .ended(workoutID: workoutID, logID: logID)
|
|
flushLive()
|
|
}
|
|
|
|
/// (Re)send the staged live-run message if the watch is reachable. Called on each new frame and
|
|
/// whenever reachability/activation is restored. Leaves it staged on failure; a newer frame or
|
|
/// `.ended` supersedes it, so we never deliver stale state. The error handler runs on
|
|
/// WatchConnectivity's background queue, so it must be nonisolated (@Sendable) — an
|
|
/// inherited-@MainActor closure would trap (swift_task_checkIsolated) there.
|
|
private func flushLive() {
|
|
guard let session, let pending = pendingLive,
|
|
session.activationState == .activated, session.isReachable else { return }
|
|
let payload: [String: Any]
|
|
switch pending {
|
|
case .progress(let frame):
|
|
payload = WCPayload.encodeLiveProgress(frame)
|
|
case .ended(let workoutID, let logID):
|
|
payload = WCPayload.encodeLiveEnded(workoutID: workoutID, logID: logID)
|
|
}
|
|
session.sendMessage(payload, replyHandler: nil, errorHandler: { @Sendable _ in })
|
|
}
|
|
|
|
/// Apply a frame the watch sent. Catch our send counter up to it first, so the next frame
|
|
/// we send outranks it and the shared per-run sequence keeps increasing across devices.
|
|
private func applyIncomingLive(_ frame: LiveProgress) {
|
|
liveVersion = max(liveVersion, frame.version)
|
|
liveRunState.apply(frame)
|
|
}
|
|
|
|
/// Parse the (non-Sendable) WC dictionary in the nonisolated delegate context,
|
|
/// then hop to the MainActor with only Sendable values.
|
|
nonisolated private func route(_ dict: [String: Any]) {
|
|
switch dict[WCPayload.typeKey] as? String {
|
|
case WCPayload.requestSyncType:
|
|
Task { @MainActor in self.pushAll() }
|
|
case WCPayload.workoutUpdateType:
|
|
if let doc = WCPayload.decodeWorkoutUpdate(dict) {
|
|
Task { @MainActor in await self.syncEngine.ingestFromWatch(doc) }
|
|
}
|
|
case WCPayload.liveProgressType:
|
|
if let frame = WCPayload.decodeLiveProgress(dict) {
|
|
Task { @MainActor in self.applyIncomingLive(frame) }
|
|
}
|
|
case WCPayload.liveEndedType:
|
|
if let logID = dict[WCPayload.lpLogIDKey] as? String {
|
|
Task { @MainActor in self.liveRunState.end(logID: logID) }
|
|
}
|
|
default:
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - WCSessionDelegate
|
|
|
|
extension PhoneConnectivityBridge: WCSessionDelegate {
|
|
nonisolated func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: Error?) {
|
|
Task { @MainActor in
|
|
self.pushAll()
|
|
self.flushLive() // deliver any frame staged before the session was ready
|
|
}
|
|
}
|
|
|
|
nonisolated func sessionDidBecomeInactive(_ session: WCSession) {}
|
|
|
|
nonisolated func sessionDidDeactivate(_ session: WCSession) {
|
|
session.activate() // reactivate for a switched watch
|
|
}
|
|
|
|
nonisolated func sessionReachabilityDidChange(_ session: WCSession) {
|
|
if session.isReachable {
|
|
Task { @MainActor in
|
|
self.pushAll()
|
|
self.flushLive() // catch the watch up on the latest run state after a reconnect
|
|
}
|
|
}
|
|
}
|
|
|
|
nonisolated func session(_ session: WCSession, didReceiveMessage message: [String: Any]) {
|
|
route(message)
|
|
}
|
|
|
|
nonisolated func session(_ session: WCSession, didReceiveUserInfo userInfo: [String: Any] = [:]) {
|
|
route(userInfo)
|
|
}
|
|
}
|
|
|
|
/// The single staged live-run message awaiting (re)delivery to the watch — see `pendingLive`.
|
|
/// One slot, latest-wins: a newer progress frame or the terminal `.ended` replaces whatever's held.
|
|
private enum PendingLive {
|
|
case progress(LiveProgress)
|
|
case ended(workoutID: String, logID: String)
|
|
}
|