Merge branch 'fix-dependency-links' into debugcamerasview

Author: bgoncal

.githooks/pre-commit

@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# Pre-commit hook: auto-format the code before committing.
+# Runs `bundle exec fastlane autocorrect` and re-stages the files it changed.
+#
+# Install with: bundle exec fastlane install_git_hooks
+#
+
+set -e
+
+cd "$(git rev-parse --show-toplevel)"
+
+staged=$(git diff --cached --name-only --diff-filter=ACMR)
+
+[ -n "$staged" ] || exit 0
+
+partial=$(git diff --name-only --diff-filter=ACMR -- $staged)
+if [ -n "$partial" ]; then
+  echo "pre-commit: these staged files also have unstaged changes:" >&2
+  echo "$partial" | sed 's/^/  /' >&2
+  echo "pre-commit: stage the whole file, or run 'bundle exec fastlane autocorrect' and stage it yourself." >&2
+  exit 1
+fi
+
+echo "pre-commit: running bundle exec fastlane autocorrect"
+bundle exec fastlane autocorrect
+
+IFS='
+'
+for file in $staged; do
+  [ -e "$file" ] && git add -- "$file"
+done

.github/workflows/ci.yml

@@ -146,7 +146,7 @@ jobs:
             ```
 
   test:
-    needs: check-swiftlint-disables
+    needs: lint
     runs-on: macos-26
     timeout-minutes: 45
     steps:
@@ -167,21 +167,23 @@ jobs:
             env.DEVELOPER_DIR,
             hashFiles('.ruby-version', '**/Gemfile.lock')) }}
 
-      - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9  # v6.1.0
-        name: "Cache: DerivedData"
+      # DerivedData is warmed on `main` (the save step below) and only restored
+      # on PRs, so pinned SPM dependencies are compiled once per Package.resolved
+      # and reused instead of recompiled from scratch on every run.
+      - uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9  # v6.1.0
+        name: "Restore: DerivedData"
+        id: derived_data
         with:
           path: ~/Library/Developer/Xcode/DerivedData
           key: >-
-            ${{ format('{0}-deriveddata-{1}-{2}-{3}',
+            ${{ format('{0}-deriveddata-{1}-{2}',
             runner.os,
             env.DEVELOPER_DIR,
-            hashFiles('**/Package.resolved'),
-            github.run_id) }}
+            hashFiles('**/Package.resolved')) }}
           restore-keys: >-
-            ${{ format('{0}-deriveddata-{1}-{2}-',
+            ${{ format('{0}-deriveddata-{1}-',
             runner.os,
-            env.DEVELOPER_DIR,
-            hashFiles('**/Package.resolved')) }}
+            env.DEVELOPER_DIR) }}
 
       - name: Install Brews
         # right now, we don't need anything from brew for tests, so save some time
@@ -194,9 +196,25 @@ jobs:
 
       - name: Run tests
         run: bundle exec fastlane test
+        env:
+          CI_ENABLE_COVERAGE: ${{ github.ref == 'refs/heads/main' && 'true' || 'false' }}
+
+      # Save the warmed DerivedData only from `main`, and only on a fresh key,
+      # so PR runs never evict the shared base cache other PRs restore from.
+      - uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9  # v6.1.0
+        name: "Save: DerivedData"
+        if: github.ref == 'refs/heads/main' && steps.derived_data.outputs.cache-hit != 'true'
+        with:
+          path: ~/Library/Developer/Xcode/DerivedData
+          key: >-
+            ${{ format('{0}-deriveddata-{1}-{2}',
+            runner.os,
+            env.DEVELOPER_DIR,
+            hashFiles('**/Package.resolved')) }}
 
       - uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f  # v7.0.0
         name: "Upload Code Coverage"
+        if: github.ref == 'refs/heads/main'
         with:
           xcode: true
           xcode_archive_path: fastlane/test_output/Tests-Unit.xcresult

README.md

@@ -88,6 +88,12 @@ bundle exec fastlane lint
 bundle exec fastlane autocorrect
 ```
 
+To run `autocorrect` automatically before each commit, install the git pre-commit hook once:
+
+```bash
+bundle exec fastlane install_git_hooks
+```
+
 In the Xcode project, the autocorrectable linters will not modify your source code but will provide warnings. This project uses several linters:
 
 - [SwiftFormat](https://github.com/nicklockwood/SwiftFormat)

Sources/App/LifecycleManager.swift

@@ -1,4 +1,5 @@
 import Foundation
+import GRDB
 import PromiseKit
 import Shared
 import UIKit
@@ -80,6 +81,7 @@ class LifecycleManager {
 
     @objc private func willEnterForeground() {
         isActive = true
+        NotificationCenter.default.post(name: Database.resumeNotification, object: self)
         refreshNetworkInformation()
         syncLiveActivities()
     }
@@ -96,6 +98,7 @@ class LifecycleManager {
 
     @objc private func didEnterBackground() {
         isActive = false
+        NotificationCenter.default.post(name: Database.suspendNotification, object: self)
         Current.backgroundTask(withName: BackgroundTask.lifecycleManagerDidEnterBackground.rawValue) { _ in
             when(fulfilled: Current.apis.map { api in
                 api.CreateEvent(

Sources/Shared/API/ServerManager.swift

@@ -92,38 +92,8 @@ private extension Identifier where ObjectType == Server {
 
 private struct ServerCache {
     var restrictCaching: Bool = false
-    var deletedServers: Set<Identifier<Server>> {
-        get {
-            let identifiers = Current.settingsStore.prefs.array(forKey: "deletedServers") as? [String] ?? []
-            return Set(identifiers.map { Identifier<Server>(rawValue: $0) })
-        }
-        set {
-            Current.settingsStore.prefs.set(newValue.map(\.rawValue), forKey: "deletedServers")
-        }
-    }
-
-    var info: [Identifier<Server>: ServerInfo] = [:] {
-        didSet {
-            if !deletedServers.isDisjoint(with: info.keys) {
-                Current.Log
-                    .error(
-                        "Stale server(s) in info cache overlapping with deleted servers, info keys: \(info.keys), deleted servers: \(deletedServers)"
-                    )
-            }
-        }
-    }
-
-    var server: [Identifier<Server>: Server] = [:] {
-        didSet {
-            if !deletedServers.isDisjoint(with: server.keys) {
-                Current.Log
-                    .error(
-                        "There are server(s) in cache that are deleted also in deleted servers set, servers: \(server.keys), deleted servers: \(deletedServers)"
-                    )
-            }
-        }
-    }
-
+    var info: [Identifier<Server>: ServerInfo] = [:]
+    var server: [Identifier<Server>: Server] = [:]
     var all: [Server]?
 
     mutating func remove(identifier: Identifier<Server>) {
@@ -164,6 +134,16 @@ final class ServerManagerImpl: ServerManager {
 
     private let cache = HAProtected<ServerCache>(value: .init())
 
+    private var deletedServers: Set<Identifier<Server>> {
+        get {
+            let identifiers = Current.settingsStore.prefs.array(forKey: "deletedServers") as? [String] ?? []
+            return Set(identifiers.map { Identifier<Server>(rawValue: $0) })
+        }
+        set {
+            Current.settingsStore.prefs.set(newValue.map(\.rawValue), forKey: "deletedServers")
+        }
+    }
+
     // MARK: Lifecycle
 
     init(
@@ -202,10 +182,10 @@ final class ServerManagerImpl: ServerManager {
     }
 
     public var all: [Server] {
+        let deletedServers = deletedServers
         let snapshot = cache.read { cache in
             (
                 restrictCaching: cache.restrictCaching,
-                deletedServers: cache.deletedServers,
                 cachedServers: cache.all
             )
         }
@@ -216,17 +196,18 @@ final class ServerManagerImpl: ServerManager {
 
         // Read from Keychain and GRDB outside the cache lock so persistence I/O
         // does not block unrelated server-manager operations.
-        let persistedServers = mergedServerInfo(deletedServers: snapshot.deletedServers)
+        let persistedServers = mergedServerInfo(deletedServers: deletedServers)
             .sorted(by: { lhs, rhs -> Bool in
                 lhs.1.sortOrder < rhs.1.sortOrder
             })
 
+        let deletedServersUnchanged = self.deletedServers == deletedServers
         if let cachedOrFreshServers = cache.mutate(using: { cache -> [Server]? in
             if !cache.restrictCaching, let cachedServers = cache.all {
                 return cachedServers
             }
 
-            guard cache.deletedServers == snapshot.deletedServers else {
+            guard deletedServersUnchanged else {
                 return nil
             }
 
@@ -241,7 +222,7 @@ final class ServerManagerImpl: ServerManager {
 
         // Avoid retrying forever when another thread keeps mutating the server set.
         // In that case we return a best-effort fresh view and let a later access cache it.
-        let latestDeletedServers = cache.read(\.deletedServers)
+        let latestDeletedServers = self.deletedServers
         let latestPersistedServers = mergedServerInfo(deletedServers: latestDeletedServers)
             .sorted(by: { lhs, rhs -> Bool in
                 lhs.1.sortOrder < rhs.1.sortOrder
@@ -272,8 +253,12 @@ final class ServerManagerImpl: ServerManager {
             }
         }
 
+        var deletedServers = deletedServers
+        if deletedServers.remove(identifier) != nil {
+            self.deletedServers = deletedServers
+        }
+
         let result = cache.mutate { cache -> Server in
-            cache.deletedServers.remove(identifier)
             keychain.set(serverInfo: setValue, key: identifier.keychainKey, encoder: encoder)
             cache.info[identifier] = setValue
             cache.all = nil
@@ -293,8 +278,11 @@ final class ServerManagerImpl: ServerManager {
     }
 
     public func remove(identifier: Identifier<Server>) {
+        var deletedServers = deletedServers
+        deletedServers.insert(identifier)
+        self.deletedServers = deletedServers
+
         cache.mutate { cache in
-            cache.deletedServers.insert(identifier)
             keychain.deleteServerInfo(key: identifier.keychainKey)
             cache.remove(identifier: identifier)
         }
@@ -310,8 +298,11 @@ final class ServerManagerImpl: ServerManager {
 
     public func removeAll() {
         let allKeys = Set(keychain.allKeys() + mirrorStore.allKeys())
+        var deletedServers = deletedServers
+        deletedServers.formUnion(Set(allKeys.map { Identifier<Server>(keychainKey: $0) }))
+        self.deletedServers = deletedServers
+
         cache.mutate { cache in
-            cache.deletedServers.formUnion(Set(allKeys.map { Identifier<Server>(keychainKey: $0) }))
             cache.reset()
             _ = try? keychain.removeAll()
         }
@@ -344,7 +335,14 @@ final class ServerManagerImpl: ServerManager {
         fallback: ServerInfo
     ) -> () -> ServerInfo {
         {
-            cache.mutate { cache -> ServerInfo in
+            if let cached = cache.read({ cache -> ServerInfo? in
+                cache.restrictCaching ? nil : cache.info[identifier]
+            }) {
+                return cached
+            }
+
+            let deletedServers = self.deletedServers
+            return cache.mutate { cache -> ServerInfo in
                 if !cache.restrictCaching, let info = cache.info[identifier] {
                     return info
                 } else {
@@ -357,7 +355,7 @@ final class ServerManagerImpl: ServerManager {
                     let info = keychainInfo
                         ?? (shouldUseMirrorFallback ? mirroredInfo : nil)
                         ?? fallback
-                    if !cache.deletedServers.contains(identifier) {
+                    if !deletedServers.contains(identifier) {
                         cache.info[identifier] = info
                     }
                     return info
@@ -373,15 +371,16 @@ final class ServerManagerImpl: ServerManager {
         encoder: JSONEncoder,
         notify: @escaping () -> Void
     ) -> (ServerInfo) -> Bool {
-        { baseServerInfo in
+        { [weak self] baseServerInfo in
             var serverInfo = baseServerInfo
 
             // update active URL so we can update just once if it's different than the save is doing
             // intentionally not in the lock
             _ = serverInfo.connection.evaluateActiveURL()
 
+            let deletedServers = self?.deletedServers ?? []
             return cache.mutate { cache in
-                guard !cache.deletedServers.contains(identifier) else {
+                guard !deletedServers.contains(identifier) else {
                     Current.Log.verbose("ignoring update to deleted server \(identifier)")
                     return false
                 }
@@ -491,7 +490,7 @@ final class ServerManagerImpl: ServerManager {
     }
 
     private func pruneDeletedMirroredServers() {
-        let deletedKeys = Set(cache.read(\.deletedServers).map(\.keychainKey))
+        let deletedKeys = Set(deletedServers.map(\.keychainKey))
         guard !deletedKeys.isEmpty else { return }
 
         let mirrorKeys = Set(mirrorStore.allKeys())
@@ -506,7 +505,7 @@ final class ServerManagerImpl: ServerManager {
     }
 
     private func restorableMirroredServers(excludingPreviouslyRestored: Bool = false) -> [(String, ServerInfo)] {
-        let deletedServers = cache.read(\.deletedServers)
+        let deletedServers = deletedServers
         let restoredMirroredServers = excludingPreviouslyRestored ? restoredMirroredServers : []
         return mirrorStore.allServerInfo().filter { key, _ in
             !deletedServers.contains(.init(keychainKey: key)) && !restoredMirroredServers.contains(key)
@@ -578,7 +577,7 @@ final class ServerManagerImpl: ServerManager {
     public func restorableState() -> Data {
         var state = [String: ServerInfo]()
 
-        for (id, info) in mergedServerInfo(deletedServers: cache.read({ $0.deletedServers })) {
+        for (id, info) in mergedServerInfo(deletedServers: deletedServers) {
             state[id] = info
         }
 

Sources/Shared/Database/GRDB+Initialization.swift

@@ -7,6 +7,7 @@ public extension DatabaseQueue {
     static var appDatabase: DatabaseQueue = {
         var configuration = Configuration()
         configuration.busyMode = .timeout(3)
+        configuration.observesSuspensionNotifications = true
 
         let database: DatabaseQueue
         var isInMemoryFallback = false

fastlane/lanes/quality.rb

@@ -10,3 +10,22 @@
   sh('../Tools/build_tool swiftformat ..')
   sh('bundle exec rubocop -a ..')
 end
+
+desc 'Install the git pre-commit hook that runs autocorrect before each commit'
+lane :install_git_hooks do |options|
+  current = sh('cd .. ; git config --default "" core.hooksPath', log: false).strip
+
+  if current == '.githooks'
+    UI.success('Git hooks already installed (core.hooksPath is .githooks).')
+    next
+  end
+
+  unless current.empty? || options[:force]
+    message = "core.hooksPath is already set to '#{current}'. " \
+              'Re-run with `install_git_hooks force:true` to override it.'
+    UI.user_error!(message)
+  end
+
+  sh('cd .. ; git config core.hooksPath .githooks')
+  UI.success('Installed git hooks. `bundle exec fastlane autocorrect` will run before each commit.')
+end

fastlane/lanes/testing.rb

@@ -34,12 +34,15 @@
 
 desc 'Run tests'
 lane :test do
+  code_coverage = ENV.key?('CI_ENABLE_COVERAGE') ? (ENV['CI_ENABLE_COVERAGE'] == 'true') : nil
   run_tests(
     project: 'HomeAssistant.xcodeproj',
     scheme: 'Tests-Unit',
     result_bundle: true,
     skip_package_dependencies_resolution: true,
     skip_detect_devices: true,
+    code_coverage: code_coverage,
+    xcargs: 'COMPILER_INDEX_STORE_ENABLE=NO',
     destination: 'platform=iOS Simulator,name=iPhone 17,OS=latest'
   )
 end