WIP: preserve dead-end direction 2026-03-26 · 5c5f43b

WIP: preserve dead-end direction 2026-03-26
Browse files

bogdan committed a week ago

deadend-backup-2026-03-26

1 parent 343a787

commit 5c5f43b

Showing 5 changed files with 244 additions and 2 deletions

+5 -1

USB Meter.xcodeproj/project.pbxproj

@@ -123,6 +123,7 @@
 		43CBF661240BF3EB00255B8B /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
 		43CBF664240BF3EB00255B8B /* USB_Meter.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = USB_Meter.xcdatamodel; sourceTree = "<group>"; };
 		A1B2C3D4E5F6A7B8C9D0E100 /* USB_Meter 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "USB_Meter 2.xcdatamodel"; sourceTree = "<group>"; };
+		B2C3D4E5F6A7B8C9D0E1F201 /* USB_Meter 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "USB_Meter 3.xcdatamodel"; sourceTree = "<group>"; };
 		43CBF666240BF3EB00255B8B /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
 		43CBF668240BF3ED00255B8B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		43CBF66B240BF3ED00255B8B /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
@@ -762,8 +763,11 @@
 			children = (
 				43CBF664240BF3EB00255B8B /* USB_Meter.xcdatamodel */,
 				A1B2C3D4E5F6A7B8C9D0E100 /* USB_Meter 2.xcdatamodel */,
+				B2C3D4E5F6A7B8C9D0E1F201 /* USB_Met
+
+er 3.xcdatamodel */,
 			);
-			currentVersion = A1B2C3D4E5F6A7B8C9D0E100 /* USB_Meter 2.xcdatamodel */;
+			currentVersion = B2C3D4E5F6A7B8C9D0E1F201 /* USB_Meter 3.xcdatamodel */;
 			path = CKModel.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;


+131 -0

USB Meter/Model/AppData.swift

View

+                         private var icloudDefaultsNotification: AnyCancellable?
+                         private var bluetoothManagerNotification: AnyCancellable?
+                         private var coreDataSettingsChangeNotification: AnyCancellable?
+                    +    private var coreDataRemoteChangeNotification: AnyCancellable?
+                         private var cloudSettingsRefreshTimer: AnyCancellable?
+                    +    private var observerKeepaliveTimer: AnyCancellable?
+                    +    private var isRefreshingObservers = false
+                         private var cloudDeviceSettingsStore: CloudDeviceSettingsStore?
+                    +    private var observerStore: ObserverStore?
+                         private var hasMigratedLegacyDeviceSettings = false
+                         private var persistedMeterNames: [String: String] = [:]
+                         private var persistedTC66TemperatureUnits: [String: String] = [:]
+                    +    @Published private(set) var observers: [ObserverRecord] = []
+                         init() {
+                             persistedMeterNames = legacyMeterNames
+                             persistedTC66TemperatureUnits = legacyTC66TemperatureUnits
+                             cloudDeviceSettingsStore = CloudDeviceSettingsStore(context: context)
+                             cloudDeviceSettingsStore?.rebuildCanonicalStoreIfNeeded(version: Self.cloudStoreRebuildVersion)
+                             cloudDeviceSettingsStore?.compactDuplicateEntriesByMAC()
+                    +        // Observer registry setup
+                    +        observerStore = ObserverStore(context: context)
+                    +        sendObserverKeepalive() // Initial keepalive
+                    +        observerKeepaliveTimer = Timer.publish(every: 15, on: .main, in: .common)
+                    +            .autoconnect()
+                    +            .sink { [weak self] _ in
+                    +                self?.sendObserverKeepalive()
+                    +                self?.refreshObservers()
+                    +            }
+                    +        // Observe local Core Data changes
+                             coreDataSettingsChangeNotification = NotificationCenter.default.publisher(for: .NSManagedObjectContextObjectsDidChange, object: context)
+                                 .sink { [weak self] _ in
+                                     self?.reloadSettingsFromCloudStore(applyToMeters: true)
+                    +        // Observe CloudKit remote sync changes (critical for observer registry)
+                    +        coreDataRemoteChangeNotification = NotificationCenter.default.publisher(for: .NSPersistentStoreRemoteChange, object: nil)
+                    +            .sink { [weak self] notification in
+                    +                track("CloudKit remote change detected: \(notification)")
+                    +                DispatchQueue.main.async {
+                    +                    self?.reloadSettingsFromCloudStore(applyToMeters: true)
+                    +                    self?.refreshObservers()
+                    +                }
+                    +            }
+                             cloudSettingsRefreshTimer = Timer.publish(every: 10, on: .main, in: .common)
+                                 .autoconnect()
+                                 .sink { [weak self] _ in
+                             migrateLegacySettingsIntoCloudIfNeeded()
+                             cloudDeviceSettingsStore?.clearAllConnections(byDeviceID: Self.myDeviceID)
+                             reloadSettingsFromCloudStore(applyToMeters: true)
+                    +        refreshObservers()
+                    +    }
+                    +    private func sendObserverKeepalive() {
+                    +        let bluetoothEnabled = bluetoothManager.managerState == .poweredOn
+                    +        observerStore?.upsertSelfAsObserver(
+                    +            deviceID: Self.myDeviceID,
+                    +            deviceName: Self.myDeviceName,
+                    +            bluetoothEnabled: bluetoothEnabled
+                    +        )
+                    +    }
+                    +    private func refreshObservers() {
+                    +        guard !isRefreshingObservers else {
+                    +            return
+                    +        }
+                    +        isRefreshingObservers = true
+                    +        defer { isRefreshingObservers = false }
+                    +        // Keep observer fetch in sync with pending context work without forcing a full object refresh.
+                    +        observerStore?.refreshContext()
+                    +        observers = observerStore?.fetchAllObservers() ?? []
+                         func persistedMeterName(for macAddress: String) -> String? {
+                    +struct ObserverRecord: Identifiable, Hashable {
+                    +    var id: String { deviceID }
+                    +    let deviceID: String
+                    +    let deviceName: String
+                    +    let lastKeepalive: Date
+                    +    let bluetoothEnabled: Bool
+                    +    var isAlive: Bool {
+                    +        Date().timeIntervalSince(lastKeepalive) < 60 // считается alive если keepalive < 60s
+                    +    }
+                    +}
+                    +private final class ObserverStore {
+                    +    private let entityName = "Observer"
+                    +    private let context: NSManagedObjectContext
+                    +    init(context: NSManagedObjectContext) {
+                    +        self.context = context
+                    +    }
+                    +    func refreshContext() {
+                    +        context.performAndWait {
+                    +            // Avoid refreshAllObjects() here; it emits ObjectsDidChange notifications and can recurse.
+                    +            context.processPendingChanges()
+                    +        }
+                    +    }
+                    +    func upsertSelfAsObserver(deviceID: String, deviceName: String, bluetoothEnabled: Bool) {
+                    +        context.performAndWait {
+                    +            do {
+                    +                let request = NSFetchRequest<NSManagedObject>(entityName: entityName)
+                    +                request.predicate = NSPredicate(format: "deviceID == %@", deviceID)
+                    +                let object = (try? context.fetch(request).first) ?? NSManagedObject(entity: NSEntityDescription.entity(forEntityName: entityName, in: context)!, insertInto: context)
+                    +                object.setValue(deviceID, forKey: "deviceID")
+                    +                object.setValue(deviceName, forKey: "deviceName")
+                    +                object.setValue(Date(), forKey: "lastKeepalive")
+                    +                object.setValue(bluetoothEnabled, forKey: "bluetoothEnabled")
+                    +                if context.hasChanges {
+                    +                    try context.save()
+                    +                    track("Observer keepalive: \(deviceName)")
+                    +                }
+                    +            } catch {
+                    +                track("Failed to upsert observer: \(error)")
+                    +            }
+                    +        }
+                    +    }
+                    +    func fetchAllObservers() -> [ObserverRecord] {
+                    +        var records: [ObserverRecord] = []
+                    +        context.performAndWait {
+                    +            let request = NSFetchRequest<NSManagedObject>(entityName: entityName)
+                    +            do {
+                    +                let objects = try context.fetch(request)
+                    +                records = objects.compactMap { object in
+                    +                    guard let deviceID = object.value(forKey: "deviceID") as? String,
+                    +                          let deviceName = object.value(forKey: "deviceName") as? String,
+                    +                          let lastKeepalive = object.value(forKey: "lastKeepalive") as? Date else {
+                    +                        return nil
+                    +                    }
+                    +                    let bluetoothEnabled = (object.value(forKey: "bluetoothEnabled") as? Bool) ?? true
+                    +                    return ObserverRecord(
+                    +                        deviceID: deviceID,
+                    +                        deviceName: deviceName,
+                    +                        lastKeepalive: lastKeepalive,
+                    +                        bluetoothEnabled: bluetoothEnabled
+                    +                    )
+                    +                }
+                    +            } catch {
+                    +                track("Failed to fetch observers: \(error)")
+                    +            }
+                    +        }
+                    +        return records
+                    +    }
+                    +}
+                     struct KnownMeterCatalogItem: Identifiable, Hashable {
+                         var id: String { macAddress }
+                         let macAddress: String

+1 -1

USB Meter/Model/CKModel.xcdatamodeld/.xccurrentversion

View

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>USB_Meter 2.xcdatamodel</string>
+	<string>USB_Meter 3.xcdatamodel</string>
 </dict>
 </plist>


+47 -0

USB Meter/Model/CKModel.xcdatamodeld/USB_Meter 3.xcdatamodel/contents

View

+                    +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                    +<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16119" systemVersion="19E287" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="YES" userDefinedModelVersionIdentifier="">
+                    +    <entity name="Entity" representedClassName="Entity" syncable="YES" codeGenerationType="class"/>
+                    +    <entity name="Observer" representedClassName="Observer" syncable="YES" codeGenerationType="class">
+                    +        <attribute name="deviceID" optional="YES" attributeType="String"/>
+                    +        <attribute name="deviceName" optional="YES" attributeType="String"/>
+                    +        <attribute name="lastKeepalive" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+                    +        <attribute name="bluetoothEnabled" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+                    +    </entity>
+                    +    <entity name="MeterObservation" representedClassName="MeterObservation" syncable="YES" codeGenerationType="class">
+                    +        <attribute name="observerDeviceID" optional="YES" attributeType="String"/>
+                    +        <attribute name="meterMAC" optional="YES" attributeType="String"/>
+                    +        <attribute name="lastSeen" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+                    +        <attribute name="isConnected" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+                    +        <attribute name="modelType" optional="YES" attributeType="String"/>
+                    +        <attribute name="peripheralName" optional="YES" attributeType="String"/>
+                    +        <attribute name="meterName" optional="YES" attributeType="String"/>
+                    +        <attribute name="tc66TemperatureUnit" optional="YES" attributeType="String"/>
+                    +        <attribute name="connectionEstablishedAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+                    +        <attribute name="updatedAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+                    +    </entity>
+                    +    <entity name="DeviceSettings" representedClassName="DeviceSettings" syncable="YES" codeGenerationType="class">
+                    +        <attribute name="macAddress" optional="YES" attributeType="String"/>
+                    +        <attribute name="meterName" optional="YES" attributeType="String"/>
+                    +        <attribute name="tc66TemperatureUnit" optional="YES" attributeType="String"/>
+                    +        <attribute name="updatedAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+                    +        <attribute name="modelType" optional="YES" attributeType="String"/>
+                    +        <attribute name="connectedByDeviceID" optional="YES" attributeType="String"/>
+                    +        <attribute name="connectedByDeviceName" optional="YES" attributeType="String"/>
+                    +        <attribute name="connectedAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+                    +        <attribute name="connectedExpiryAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+                    +        <attribute name="lastSeenAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+                    +        <attribute name="lastSeenByDeviceID" optional="YES" attributeType="String"/>
+                    +        <attribute name="lastSeenByDeviceName" optional="YES" attributeType="String"/>
+                    +        <attribute name="lastSeenPeripheralName" optional="YES" attributeType="String"/>
+                    +    </entity>
+                    +    <elements>
+                    +        <element name="Entity" positionX="-63" positionY="-18" width="128" height="43"/>
+                    +        <element name="Observer" positionX="-200" positionY="100" width="128" height="103"/>
+                    +        <element name="MeterObservation" positionX="0" positionY="100" width="128" height="193"/>
+                    +        <element name="DeviceSettings" positionX="160" positionY="-18" width="128" height="103"/>
+                    +    </elements>
+                    +</model>

+60 -0

USB Meter/Views/ContentView.swift

View

+                                         "Live Meters: \(appData.meters.count)"
+                                     ])
+                    +                VStack(alignment: .leading, spacing: 10) {
+                    +                    Text("Observers (Keepalive: 15s)")
+                    +                        .font(.headline)
+                    +                    if appData.observers.isEmpty {
+                    +                        Text("No observers registered yet")
+                    +                            .font(.caption)
+                    +                            .foregroundColor(.secondary)
+                    +                    } else {
+                    +                        ForEach(appData.observers) { observer in
+                    +                            observerDebugCard(for: observer)
+                    +                        }
+                    +                    }
+                    +                }
+                    +                .frame(maxWidth: .infinity, alignment: .leading)
+                    +                .padding(18)
+                    +                .meterCard(tint: .orange, fillOpacity: 0.14, strokeOpacity: 0.22)
+                                     if !appData.knownMetersByMAC.isEmpty {
+                                         VStack(alignment: .leading, spacing: 10) {
+                                             Text("Known Meters")
+                             .meterCard(tint: .purple, fillOpacity: 0.08, strokeOpacity: 0.16)
+                    +    private func observerDebugCard(for observer: ObserverRecord) -> some View {
+                    +        let statusColor: Color = observer.isAlive ? .green : .red
+                    +        let statusText = observer.isAlive ? "Alive" : "Dead"
+                    +        let timeSinceKeepalive = Date().timeIntervalSince(observer.lastKeepalive)
+                    +        return VStack(alignment: .leading, spacing: 6) {
+                    +            HStack {
+                    +                Circle()
+                    +                    .fill(statusColor)
+                    +                    .frame(width: 8, height: 8)
+                    +                Text(observer.deviceName)
+                    +                    .font(.subheadline.weight(.semibold))
+                    +                Spacer()
+                    +                Text(statusText)
+                    +                    .font(.caption2)
+                    +                    .foregroundColor(statusColor)
+                    +            }
+                    +            Text(observer.deviceID)
+                    +                .font(.system(.caption2, design: .monospaced))
+                    +                .foregroundColor(.secondary)
+                    +            HStack {
+                    +                Text("Last keepalive: \(Int(timeSinceKeepalive))s ago")
+                    +                    .font(.caption2)
+                    +                    .foregroundColor(.secondary)
+                    +                Spacer()
+                    +                if observer.bluetoothEnabled {
+                    +                    Image(systemName: "antenna.radiowaves.left.and.right")
+                    +                        .font(.caption2)
+                    +                        .foregroundColor(.blue)
+                    +                } else {
+                    +                    Image(systemName: "antenna.radiowaves.left.and.right.slash")
+                    +                        .font(.caption2)
+                    +                        .foregroundColor(.secondary)
+                    +                }
+                    +            }
+                    +        }
+                    +        .frame(maxWidth: .infinity, alignment: .leading)
+                    +        .padding(10)
+                    +        .meterCard(tint: statusColor, fillOpacity: 0.08, strokeOpacity: 0.14)
+                    +    }
+                         private func meterDebugCard(for known: KnownMeterCatalogItem) -> some View {
+                             let isLive = appData.meters.values.contains { $0.btSerial.macAddress.description == known.macAddress }
+                             let connectedElsewhere = isConnectedElsewhere(known)

	@@ -123,6 +123,7 @@
123	123	43CBF661240BF3EB00255B8B /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
124	124	43CBF664240BF3EB00255B8B /* USB_Meter.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = USB_Meter.xcdatamodel; sourceTree = "<group>"; };
125	125	A1B2C3D4E5F6A7B8C9D0E100 /* USB_Meter 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "USB_Meter 2.xcdatamodel"; sourceTree = "<group>"; };
	126	+ B2C3D4E5F6A7B8C9D0E1F201 /* USB_Meter 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "USB_Meter 3.xcdatamodel"; sourceTree = "<group>"; };
126	127	43CBF666240BF3EB00255B8B /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
127	128	43CBF668240BF3ED00255B8B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
128	129	43CBF66B240BF3ED00255B8B /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
	@@ -762,8 +763,11 @@
762	763	children = (
763	764	43CBF664240BF3EB00255B8B /* USB_Meter.xcdatamodel */,
764	765	A1B2C3D4E5F6A7B8C9D0E100 /* USB_Meter 2.xcdatamodel */,
	766	+ B2C3D4E5F6A7B8C9D0E1F201 /* USB_Met
	767	+
	768	+er 3.xcdatamodel */,
765	769	);
766		- currentVersion = A1B2C3D4E5F6A7B8C9D0E100 /* USB_Meter 2.xcdatamodel */;
	770	+ currentVersion = B2C3D4E5F6A7B8C9D0E1F201 /* USB_Meter 3.xcdatamodel */;
767	771	path = CKModel.xcdatamodeld;
768	772	sourceTree = "<group>";
769	773	versionGroupType = wrapper.xcdatamodel;

	@@ -3,6 +3,6 @@
3	3	<plist version="1.0">
4	4	<dict>
5	5	<key>_XCCurrentVersionName</key>
6		- <string>USB_Meter 2.xcdatamodel</string>
	6	+ <string>USB_Meter 3.xcdatamodel</string>
7	7	</dict>
8	8	</plist>