diff --git a/BrewBar/BrewBarApp.swift b/BrewBar/BrewBarApp.swift index b56da5a..6a071df 100644 --- a/BrewBar/BrewBarApp.swift +++ b/BrewBar/BrewBarApp.swift @@ -1,4 +1,5 @@ import Cocoa +import Network import UserNotifications @main @@ -43,6 +44,11 @@ class AppDelegate: NSObject, NSApplicationDelegate { var cachedOutdated: OutdatedPackages = .none var lastNotifiedOutdated: Set = [] + let pathMonitor = NWPathMonitor() + /// false until the monitor's first update, so the launch refresh waits + /// until the network state is actually known. Main-queue only. + var isOnline = false + // MARK: - Menu func applicationDidFinishLaunching(_: Notification) { @@ -91,7 +97,16 @@ class AppDelegate: NSObject, NSApplicationDelegate { statusItem.menu = menu - refreshAll() + // no refreshAll() here: the monitor fires once immediately after + // start(), and the first online update triggers the launch refresh + pathMonitor.pathUpdateHandler = { path in + // updates arrive on the monitor's queue; hop to main for AppKit + DispatchQueue.main.async { + self.networkPathChanged(online: path.status == .satisfied) + } + } + pathMonitor.start(queue: DispatchQueue(label: "fr.socheleau.BrewBar.network")) + refreshBrewVersion() refreshTimer = Timer.scheduledTimer(withTimeInterval: refreshInterval, repeats: true) { _ in @@ -205,7 +220,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { /// askpassMessage customizes the sudo dialog ("...password to ."); /// defaults to naming the brew command. - func runBrew(_ command: String, askpassMessage: String? = nil, completion: @escaping (String) -> Void = { _ in }) { + func runBrew(_ command: String, askpassMessage: String? = nil, completion: @escaping (_ output: String, _ success: Bool) -> Void = { _, _ in }) { Self.brewQueue.async { let brew = self.resolveBrewPath() let cleaned = command.replacingOccurrences(of: "brew ", with: "") @@ -231,7 +246,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { try process.run() } catch { self.log("ERROR: \(error)\n") - DispatchQueue.main.async { completion("") } + DispatchQueue.main.async { completion("", false) } return } @@ -241,8 +256,12 @@ class AppDelegate: NSObject, NSApplicationDelegate { let output = String(data: data, encoding: .utf8) ?? "" self.log(output) + let success = process.terminationStatus == 0 + if !success { + self.log("✗ exited with status \(process.terminationStatus)\n") + } // completion always on main: callers update AppKit UI, which is main-thread only - DispatchQueue.main.async { completion(output) } + DispatchQueue.main.async { completion(output, success) } } } @@ -259,7 +278,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { statusMenuItem.title = "Upgrading..." - runBrew("update") { _ in + runBrew("update") { _, _ in // packages that turn outdated only after this brew update are not // in cachedOutdated yet; the final refetch will surface them let caskNames = self.cachedOutdated.casks.map(\.name) @@ -273,7 +292,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { if self.cachedOutdated.formulae.isEmpty { upgradeCasksThenRefresh() } else { - self.runBrew("upgrade --formula") { _ in + self.runBrew("upgrade --formula") { _, _ in upgradeCasksThenRefresh() } } @@ -290,7 +309,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { statusMenuItem.title = "Upgrading \(next)..." // an explicitly named cask upgrades even when self-updating, no --greedy needed - runBrew("upgrade --cask \(next)", askpassMessage: "upgrade \(next)") { _ in + runBrew("upgrade --cask \(next)", askpassMessage: "upgrade \(next)") { _, _ in self.upgradeCasksSequentially(Array(names.dropFirst()), completion: completion) } } @@ -328,7 +347,15 @@ class AppDelegate: NSObject, NSApplicationDelegate { // --greedy also lists casks that self-update (brew skips them by default) let command = Settings.includeGreedyCasks ? "outdated --greedy --json" : "outdated --json" - runBrew(command) { output in + runBrew(command) { output, success in + // parsing a failure's output would yield .none and masquerade as + // "all up to date"; keep the cached state and its icon instead + guard success else { + self.statusMenuItem.title = "⚠️ Check failed — see Logs" + self.setMenuBarIcon(self.cachedOutdated.isEmpty ? "brewbar-uptodate" : "brewbar-outdated") + return + } + let outdated = BrewParser.parseOutdatedJSON(output) self.cachedOutdated = outdated @@ -387,7 +414,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { } if formulae { - runBrew("upgrade --formula") { _ in + runBrew("upgrade --formula") { _, _ in upgradeCasksThenRefresh() } } else { @@ -426,22 +453,52 @@ class AppDelegate: NSObject, NSApplicationDelegate { @objc func upgradeSingle(_ sender: NSMenuItem) { guard let formula = sender.representedObject as? String else { return } - runBrew("upgrade \(formula)", askpassMessage: "upgrade \(formula)") { _ in + runBrew("upgrade \(formula)", askpassMessage: "upgrade \(formula)") { _, _ in self.refreshAll() } } + /// Refreshing offline would silently succeed on stale data: brew update + /// fails but its exit code was never checked, and brew outdated compares + /// against the local taps without touching the network — so the app + /// claimed "all up to date" no matter what. Every offline→online + /// transition refreshes, which also covers the refreshes skipped below. + func networkPathChanged(online: Bool) { + let wasOnline = isOnline + isOnline = online + + guard online else { + statusMenuItem.title = "📡 Offline" + return + } + if !wasOnline { + refreshAll() + } + } + func refreshAll() { + guard isOnline else { + statusMenuItem.title = "📡 Offline" + return + } + statusMenuItem.title = "Updating..." - runBrew("update") { _ in + // NWPathMonitor can't see a network that is up but broken (captive + // portal, dead DNS, git host down); brew update's exit code can. + // Proceeding anyway would read stale local data and report a false OK. + runBrew("update") { _, success in + guard success else { + self.statusMenuItem.title = "⚠️ Check failed — see Logs" + return + } self.fetchOutdated() // ✅ ONLY place calling outdated } } /// ✅ Brew version (correct) func refreshBrewVersion() { - runBrew("--version") { output in + runBrew("--version") { output, _ in let firstLine = BrewParser.parseVersion(output) self.versionItem.title = "🏷 \(firstLine)" }