a16e8ec270
Add an ephemeral live-run presence channel (separate from the durable iCloud progress sync) so a propped-up iPhone can mirror the Watch's Ready → work/rest → Finish flow in real time as the user swipes. Watch drives, phone mirrors (read-only), so there's no echo loop: - Watch's ExerciseProgressView broadcasts a LiveProgress frame on every phase transition (and an ended signal on leave) via sendMessage, reachable-only — throwaway presence, never written to iCloud. - Timers ride as wall-clock anchors (Date kept native in the WC dict to preserve sub-second precision), so both devices count independently off shared start times and stay in lockstep without streaming ticks. - Phone holds a transient LiveRunState; ContentView auto-presents a read-only LiveProgressMirrorView full-screen cover while a run is live. Claude-Session: https://claude.ai/code/session_01SCv7zvGFcKy47KSTnTLxRe
130 lines
6.0 KiB
Swift
130 lines
6.0 KiB
Swift
import Foundation
|
|
|
|
/// Wire format for the iPhone↔Watch bridge. The phone is the only device that
|
|
/// touches iCloud Drive; the watch round-trips domain documents through the phone.
|
|
/// Payloads carry the shared `*Document` types (JSON-encoded `Data` blobs, which
|
|
/// WatchConnectivity allows) keyed by stable ULIDs — no name/date reconciliation.
|
|
enum WCPayload {
|
|
static let typeKey = "type"
|
|
static let splitsKey = "splits"
|
|
static let workoutsKey = "workouts"
|
|
static let workoutKey = "workout"
|
|
static let restSecondsKey = "restSeconds"
|
|
static let doneCountdownSecondsKey = "doneCountdownSeconds"
|
|
static let editingWorkoutIDKey = "editingWorkoutID"
|
|
static let editingSplitIDKey = "editingSplitID"
|
|
|
|
static let workoutUpdateType = "workoutUpdate" // watch → phone (one workout)
|
|
static let requestSyncType = "requestSync" // watch → phone (please push state)
|
|
static let liveProgressType = "liveProgress" // watch → phone (ephemeral mirror frame)
|
|
static let liveEndedType = "liveEnded" // watch → phone (stop mirroring a run)
|
|
|
|
// MARK: - Phone → Watch (application context: latest-state-wins)
|
|
|
|
/// `editingWorkoutID` / `editingSplitID` are an exclusive-edit lock: while the phone
|
|
/// has a workout's exercise (or a split) open in an editor, the watch parks any
|
|
/// matching run and locks re-entry, so only one device owns the run at a time. They're
|
|
/// part of the same latest-wins context — absent keys mean "not editing" (lock clear).
|
|
static func encodeState(splits: [SplitDocument], workouts: [WorkoutDocument], restSeconds: Int, doneCountdownSeconds: Int, editingWorkoutID: String?, editingSplitID: String?) -> [String: Any] {
|
|
var dict: [String: Any] = [:]
|
|
if let s = try? DocumentCoder.encoder.encode(splits) { dict[splitsKey] = s }
|
|
if let w = try? DocumentCoder.encoder.encode(workouts) { dict[workoutsKey] = w }
|
|
dict[restSecondsKey] = restSeconds
|
|
dict[doneCountdownSecondsKey] = doneCountdownSeconds
|
|
if let editingWorkoutID { dict[editingWorkoutIDKey] = editingWorkoutID }
|
|
if let editingSplitID { dict[editingSplitIDKey] = editingSplitID }
|
|
return dict
|
|
}
|
|
|
|
static func decodeSplits(_ dict: [String: Any]) -> [SplitDocument] {
|
|
guard let data = dict[splitsKey] as? Data else { return [] }
|
|
return (try? DocumentCoder.decoder.decode([SplitDocument].self, from: data)) ?? []
|
|
}
|
|
|
|
static func decodeWorkouts(_ dict: [String: Any]) -> [WorkoutDocument] {
|
|
guard let data = dict[workoutsKey] as? Data else { return [] }
|
|
return (try? DocumentCoder.decoder.decode([WorkoutDocument].self, from: data)) ?? []
|
|
}
|
|
|
|
static func decodeRestSeconds(_ dict: [String: Any]) -> Int? { dict[restSecondsKey] as? Int }
|
|
|
|
static func decodeDoneCountdownSeconds(_ dict: [String: Any]) -> Int? { dict[doneCountdownSecondsKey] as? Int }
|
|
|
|
static func decodeEditingWorkoutID(_ dict: [String: Any]) -> String? { dict[editingWorkoutIDKey] as? String }
|
|
|
|
static func decodeEditingSplitID(_ dict: [String: Any]) -> String? { dict[editingSplitIDKey] as? String }
|
|
|
|
// MARK: - Watch → Phone (a single updated workout)
|
|
|
|
static func encodeWorkoutUpdate(_ workout: WorkoutDocument) -> [String: Any] {
|
|
var dict: [String: Any] = [typeKey: workoutUpdateType]
|
|
if let w = try? DocumentCoder.encoder.encode(workout) { dict[workoutKey] = w }
|
|
return dict
|
|
}
|
|
|
|
static func decodeWorkoutUpdate(_ dict: [String: Any]) -> WorkoutDocument? {
|
|
guard let data = dict[workoutKey] as? Data else { return nil }
|
|
return try? DocumentCoder.decoder.decode(WorkoutDocument.self, from: data)
|
|
}
|
|
|
|
static func requestSyncMessage() -> [String: Any] { [typeKey: requestSyncType] }
|
|
|
|
// MARK: - Watch → Phone (ephemeral live-run mirror)
|
|
|
|
/// Anchor `Date`s ride as native plist values (not JSON), so they keep sub-second
|
|
/// precision — `DocumentCoder` is `.iso8601`, which would round the timer off.
|
|
static let lpWorkoutIDKey = "lpWorkoutID"
|
|
static let lpLogIDKey = "lpLogID"
|
|
static let lpNameKey = "lpName"
|
|
static let lpPhaseKey = "lpPhase"
|
|
static let lpSetIndexKey = "lpSetIndex"
|
|
static let lpSetCountKey = "lpSetCount"
|
|
static let lpDetailKey = "lpDetail"
|
|
static let lpStartKey = "lpStart"
|
|
static let lpEndKey = "lpEnd"
|
|
static let lpVersionKey = "lpVersion"
|
|
|
|
static func encodeLiveProgress(_ p: LiveProgress) -> [String: Any] {
|
|
var dict: [String: Any] = [typeKey: liveProgressType]
|
|
dict[lpWorkoutIDKey] = p.workoutID
|
|
dict[lpLogIDKey] = p.logID
|
|
dict[lpNameKey] = p.exerciseName
|
|
dict[lpPhaseKey] = p.phase.rawValue
|
|
dict[lpSetIndexKey] = p.setIndex
|
|
dict[lpSetCountKey] = p.setCount
|
|
dict[lpDetailKey] = p.detail
|
|
dict[lpStartKey] = p.phaseStart
|
|
if let end = p.phaseEnd { dict[lpEndKey] = end }
|
|
dict[lpVersionKey] = p.version
|
|
return dict
|
|
}
|
|
|
|
static func decodeLiveProgress(_ dict: [String: Any]) -> LiveProgress? {
|
|
guard let workoutID = dict[lpWorkoutIDKey] as? String,
|
|
let logID = dict[lpLogIDKey] as? String,
|
|
let phaseRaw = dict[lpPhaseKey] as? String,
|
|
let phase = LiveRunPhase(rawValue: phaseRaw),
|
|
let setIndex = dict[lpSetIndexKey] as? Int,
|
|
let setCount = dict[lpSetCountKey] as? Int,
|
|
let start = dict[lpStartKey] as? Date,
|
|
let version = dict[lpVersionKey] as? Int
|
|
else { return nil }
|
|
return LiveProgress(
|
|
workoutID: workoutID,
|
|
logID: logID,
|
|
exerciseName: dict[lpNameKey] as? String ?? "",
|
|
phase: phase,
|
|
setIndex: setIndex,
|
|
setCount: setCount,
|
|
detail: dict[lpDetailKey] as? String ?? "",
|
|
phaseStart: start,
|
|
phaseEnd: dict[lpEndKey] as? Date,
|
|
version: version
|
|
)
|
|
}
|
|
|
|
static func encodeLiveEnded(workoutID: String, logID: String) -> [String: Any] {
|
|
[typeKey: liveEndedType, lpWorkoutIDKey: workoutID, lpLogIDKey: logID]
|
|
}
|
|
}
|