Workouts 2.0: re-base persistence on iCloud Drive documents
Replace Core Data + NSPersistentCloudKitContainer + App-Group store + WatchConnectivity dictionary sync with the QuickRabbit iCloud-documents architecture: - iCloud Drive JSON documents are the sole source of truth (one file per aggregate: Splits/<ULID>.json, Workouts/YYYY/MM/<ULID>.json), with a rebuildable SwiftData cache populated only by an NSMetadataQuery observer and a connect-time reconcile. Soft-delete tombstones; hard iCloud gate. - Shared model layer (ULID, Codable *Documents + stateless mappers, @Model cache entities, SwiftData container) compiled into both targets. - New iPhone<->Watch bridge over WatchConnectivity keyed by ULIDs; the phone is the sole writer of iCloud Drive, the watch round-trips documents. - AppServices DI + iCloud-required root gate; Swift 6 strict concurrency. - Starter splits generated on demand from the bundled YAML catalogs. - Migrate to XcodeGen (project.yml), iOS 26 / watchOS 26; CloudDocuments entitlement (drop CloudKit/App Group/aps-environment). - Duration stored as Int seconds (was a Date epoch hack); fix workout end-on-create, undismissable delete dialog, toolbar-hiding nav stacks, and the Settings placeholder. - Add README/CHANGELOG/LICENSE, .gitignore, refreshed REQUIREMENTS, and the Scripts/ TestFlight pipeline (release.sh + ASC API scripts). MARKETING_VERSION 2.0.
This commit is contained in:
@@ -0,0 +1,92 @@
|
||||
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 var session: WCSession?
|
||||
|
||||
private var context: ModelContext { container.mainContext }
|
||||
|
||||
init(container: ModelContainer, syncEngine: SyncEngine) {
|
||||
self.container = container
|
||||
self.syncEngine = syncEngine
|
||||
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)]))) ?? []
|
||||
var wDesc = FetchDescriptor<Workout>(sortBy: [SortDescriptor(\.start, order: .reverse)])
|
||||
wDesc.fetchLimit = 25
|
||||
let workouts = (try? context.fetch(wDesc)) ?? []
|
||||
|
||||
let payload = WCPayload.encodeState(
|
||||
splits: splits.map(SplitDocument.init(from:)),
|
||||
workouts: workouts.map(WorkoutDocument.init(from:))
|
||||
)
|
||||
try? session.updateApplicationContext(payload)
|
||||
}
|
||||
|
||||
/// 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) }
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - WCSessionDelegate
|
||||
|
||||
extension PhoneConnectivityBridge: WCSessionDelegate {
|
||||
nonisolated func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: Error?) {
|
||||
Task { @MainActor in self.pushAll() }
|
||||
}
|
||||
|
||||
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() } }
|
||||
}
|
||||
|
||||
nonisolated func session(_ session: WCSession, didReceiveMessage message: [String: Any]) {
|
||||
route(message)
|
||||
}
|
||||
|
||||
nonisolated func session(_ session: WCSession, didReceiveUserInfo userInfo: [String: Any] = [:]) {
|
||||
route(userInfo)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user