rzen
8ef0e96b31
Publish an exclusive-edit lock (editingWorkoutID / editingSplitID) in the phone→watch application context. While the phone has a workout's exercise (ExerciseView) or a split (SplitDetailView) open in an editor, the watch pops out of that run, blocks re-entry, and shows it as "Editing on iPhone" — so the two devices never drive the same run at once and the watch can't clobber the phone's edit with a stale optimistic write. The lock clears when the editor closes; absent keys in the latest-wins context mean "not editing". Claude-Session: https://claude.ai/code/session_01SCv7zvGFcKy47KSTnTLxRe
70 lines
3.5 KiB
Swift
70 lines
3.5 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)
|
|
|
|
// 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] }
|
|
}
|