feat: Migrate daemon to in-process background thread, fix launch at startup

- Remove separate --daemon process; monitoring now runs on a background
  thread within the main app process
- Replace SMAppService with LaunchAgent plist using 'open' command for
  reliable launch-at-login
- Add start/stop lifecycle to Daemon with graceful shutdown
- Clean up old com.user.network-monitor LaunchAgent on first launch
- Update Homebrew Cask formula in release workflow to match new architecture
- Update README and UI labels to reflect single-process design

Author: RandomUserUsingGitHub

.github/workflows/release.yml

@@ -164,44 +164,23 @@ jobs:
                 JSON
               end
           
-              # Install LaunchAgent
-              plist_dir = File.expand_path("~/Library/LaunchAgents")
-              FileUtils.mkdir_p(plist_dir)
-              plist_path = "#{plist_dir}/com.user.network-monitor.plist"
-              File.write(plist_path, <<~PLIST)
-                <?xml version="1.0" encoding="UTF-8"?>
-                <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
-                  "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-                <plist version="1.0">
-                <dict>
-                  <key>Label</key>             <string>com.user.network-monitor</string>
-                  <key>ProgramArguments</key>
-                  <array>
-                    <string>/Applications/NetworkMonitor.app/Contents/MacOS/NetworkMonitor</string>
-                    <string>--daemon</string>
-                  </array>
-                  <key>RunAtLoad</key>         <true/>
-                  <key>KeepAlive</key>         <true/>
-                  <key>StandardOutPath</key>   <string>/tmp/netmon_stdout.log</string>
-                  <key>StandardErrorPath</key> <string>/tmp/netmon_stderr.log</string>
-                </dict>
-                </plist>
-              PLIST
-              system_command "/bin/launchctl", args: ["load", plist_path]
+              # Clean up old daemon-style LaunchAgent if present
+              old_plist = File.expand_path("~/Library/LaunchAgents/com.user.network-monitor.plist")
+              if File.exist?(old_plist)
+                system_command "/bin/launchctl", args: ["unload", old_plist]
+                File.delete(old_plist)
+              end
             end
           
-            uninstall launchctl: "com.user.network-monitor",
-                      delete:    [
+            uninstall delete: [
+                        File.expand_path("~/Library/LaunchAgents/com.armin.network-monitor.login.plist"),
                         File.expand_path("~/Library/LaunchAgents/com.user.network-monitor.plist"),
-                        File.expand_path("~/.local/bin/netmon-toggle.sh")
                       ]
           
             zap trash: [
               "~/.config/network-monitor",
               "~/.network_monitor.log",
               "/tmp/.netmon_*",
-              "/tmp/netmon_stdout.log",
-              "/tmp/netmon_stderr.log",
             ]
           end
           EOF

NetworkMonitor.xcodeproj/project.pbxproj

@@ -131,6 +131,7 @@
 				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = NetworkMonitor/Info.plist;
 				INFOPLIST_KEY_NSPrincipalClass = NSApplication;
 				LD_RUNPATH_SEARCH_PATHS = ("$(inherited)","@executable_path/../Frameworks");
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
@@ -152,6 +153,7 @@
 				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = NetworkMonitor/Info.plist;
 				INFOPLIST_KEY_NSPrincipalClass = NSApplication;
 				LD_RUNPATH_SEARCH_PATHS = ("$(inherited)","@executable_path/../Frameworks");
 				MACOSX_DEPLOYMENT_TARGET = 13.0;

NetworkMonitor/Info.plist

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+        <key>NSExceptionDomains</key>
+        <dict>
+            <key>ip-api.com</key>
+            <dict>
+                <key>NSExceptionAllowsInsecureHTTPLoads</key>
+                <true/>
+                <key>NSIncludesSubdomains</key>
+                <true/>
+            </dict>
+        </dict>
+    </dict>
+</dict>
+</plist>

NetworkMonitor/NetworkMonitorApp.swift

@@ -3,16 +3,6 @@ import AppKit
 import UserNotifications
 
 @main
-struct AppLauncher {
-    static func main() {
-        if CommandLine.arguments.contains("--daemon") {
-            Daemon().run()
-        } else {
-            NetworkMonitorApp.main()
-        }
-    }
-}
-
 struct NetworkMonitorApp: App {
     @NSApplicationDelegateAdaptor(AppDelegate.self) var delegate
     @StateObject private var trayModel = TrayModel()
@@ -52,10 +42,30 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     func applicationDidFinishLaunching(_ notification: Notification) {
         NSApp.setActivationPolicy(.regular)
         Settings.shared.writeDaemonConfig()
+        Settings.shared.applyLaunchAtLogin()
+        
+        // Start the monitoring daemon as a background thread
+        Daemon.shared.start()
+        
+        // Clean up old launchd daemon plist (no longer needed)
+        let oldPlist = FileManager.default.homeDirectoryForCurrentUser
+            .appendingPathComponent("Library/LaunchAgents/com.user.network-monitor.plist")
+        if FileManager.default.fileExists(atPath: oldPlist.path) {
+            let t = Process()
+            t.executableURL = URL(fileURLWithPath: "/bin/launchctl")
+            t.arguments = ["unload", oldPlist.path]
+            t.standardOutput = Pipe(); t.standardError = Pipe()
+            try? t.run(); t.waitUntilExit()
+            try? FileManager.default.removeItem(at: oldPlist)
+        }
     }
 
     func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { false }
 
+    func applicationShouldTerminate(_ sender: NSApplication) -> NSApplication.TerminateReply {
+        return .terminateNow
+    }
+    
     func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
         if !flag {
             NotificationCenter.default.post(name: Notification.Name("ReopenMainWindow"), object: nil)
@@ -69,6 +79,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 struct TrayLabelView: View {
     @ObservedObject var model: TrayModel
     @Environment(\.openWindow) private var openWindow
+    @State private var hasAutoOpened = false
 
     var body: some View {
         let isOnline = model.status == .online
@@ -137,6 +148,13 @@ struct TrayLabelView: View {
                 }
             }
         }
+        .onAppear {
+            if !hasAutoOpened {
+                hasAutoOpened = true
+                openWindow(id: "main")
+                NSApp.activate(ignoringOtherApps: true)
+            }
+        }
         .onReceive(NotificationCenter.default.publisher(for: Notification.Name("ReopenMainWindow"))) { _ in
             openWindow(id: "main")
             NSApp.activate(ignoringOtherApps: true)
@@ -213,19 +231,12 @@ final class TrayModel: ObservableObject {
             let histMtime = (try? FileManager.default.attributesOfItem(atPath: self.histFile.path)[.modificationDate] as? Date) ?? .distantPast
             let statusMtime = (try? FileManager.default.attributesOfItem(atPath: self.statusFile.path)[.modificationDate] as? Date) ?? .distantPast
 
-            // Secure daemon check
-            // Secure daemon check (via PID to avoid launchctl processes and mtime bouncing)
+            // Check daemon status directly
             let now = Date()
             var daemonIsRunning = self.isDaemonRunning
             if now.timeIntervalSince(self.lastDaemonCheck) > 4.0 {
                 self.lastDaemonCheck = now
-                daemonIsRunning = false
-                if let pidStr = try? String(contentsOf: URL(fileURLWithPath: "/tmp/.netmon_pid"), encoding: .utf8),
-                   let pid = pid_t(pidStr.trimmingCharacters(in: .whitespacesAndNewlines)) {
-                    if kill(pid, 0) == 0 {
-                        daemonIsRunning = true
-                    }
-                }
+                daemonIsRunning = Daemon.shared.isRunning
             }
 
             if histMtime == self.lastHistFileModDate && statusMtime == self.lastStatusFileModDate && self.trayFormat == f && daemonIsRunning == self.isDaemonRunning {

NetworkMonitor/NetworkState.swift

@@ -60,8 +60,7 @@ final class NetworkStateModel: NSObject, ObservableObject, UNUserNotificationCen
     private let statusFile  = URL(fileURLWithPath: "/tmp/.netmon_status")
     private let logFile     = FileManager.default.homeDirectoryForCurrentUser
                                   .appendingPathComponent(".network_monitor.log")
-    private let daemonPlist = FileManager.default.homeDirectoryForCurrentUser
-                                  .appendingPathComponent("Library/LaunchAgents/com.user.network-monitor.plist")
+
 
     private var timer:       Timer?
     private var lastIPFetch: Date   = .distantPast
@@ -216,22 +215,7 @@ final class NetworkStateModel: NSObject, ObservableObject, UNUserNotificationCen
         let now = Date()
         if now.timeIntervalSince(lastDaemonCheck) < 5.0 { return }
         lastDaemonCheck = now
-        
-        DispatchQueue.global(qos: .userInitiated).async { [weak self] in
-            guard let self = self else { return }
-            
-            var isRunning = false
-            if let pidStr = try? String(contentsOf: URL(fileURLWithPath: "/tmp/.netmon_pid"), encoding: .utf8),
-               let pid = pid_t(pidStr.trimmingCharacters(in: .whitespacesAndNewlines)) {
-                if kill(pid, 0) == 0 {
-                    isRunning = true
-                }
-            }
-            
-            DispatchQueue.main.async {
-                self.daemonRunning = isRunning
-            }
-        }
+        daemonRunning = Daemon.shared.isRunning
     }
 
     // MARK: - IP enrichment (URLSession, not Data(contentsOf:))
@@ -285,49 +269,30 @@ final class NetworkStateModel: NSObject, ObservableObject, UNUserNotificationCen
     // MARK: - Daemon control
 
     func toggleDaemon() {
-        let action = daemonRunning ? "unload" : "load"
-        
-        // Optimistically update UI
-        self.daemonRunning = (action == "load")
-        if action == "load" { self.status = .starting }
-        
-        DispatchQueue.global(qos: .userInitiated).async { [weak self] in
-            guard let self = self else { return }
-            if action == "unload" {
-                try? FileManager.default.removeItem(atPath: "/tmp/.netmon_pid")
-            }
-            let t = Process()
-            t.executableURL = URL(fileURLWithPath: "/bin/launchctl")
-            t.arguments = [action, self.daemonPlist.path]
-            t.standardOutput = Pipe(); t.standardError = Pipe()
-            try? t.run(); t.waitUntilExit()
-            
-            if action == "unload" { self.settings.writeDaemonConfig() }
-            
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                self.refresh()
-            }
+        if daemonRunning {
+            Daemon.shared.stop()
+            daemonRunning = false
+            status = .offline
+        } else {
+            settings.writeDaemonConfig()
+            Daemon.shared.start()
+            daemonRunning = true
+            status = .starting
+        }
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) { [weak self] in
+            self?.refresh()
         }
     }
 
     func restartDaemon() {
-        DispatchQueue.global(qos: .userInitiated).async { [weak self] in
-            guard let self = self else { return }
-            try? FileManager.default.removeItem(atPath: "/tmp/.netmon_pid")
-            let stop = Process()
-            stop.executableURL = URL(fileURLWithPath: "/bin/launchctl")
-            stop.arguments = ["unload", self.daemonPlist.path]
-            stop.standardOutput = Pipe(); stop.standardError = Pipe()
-            try? stop.run(); stop.waitUntilExit()
-            self.settings.writeDaemonConfig()
-            
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                let start = Process()
-                start.executableURL = URL(fileURLWithPath: "/bin/launchctl")
-                start.arguments = ["load", self.daemonPlist.path]
-                start.standardOutput = Pipe(); start.standardError = Pipe()
-                try? start.run(); start.waitUntilExit()
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { self.refresh() }
+        Daemon.shared.stop()
+        settings.writeDaemonConfig()
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
+            Daemon.shared.start()
+            self?.status = .starting
+            self?.daemonRunning = true
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+                self?.refresh()
             }
         }
     }
@@ -438,6 +403,8 @@ struct SettingsConfig: Codable {
 // MARK: - Daemon
 
 final class Daemon {
+    static let shared = Daemon()
+    
     let histFile = URL(fileURLWithPath: "/tmp/.netmon_ping_history")
     let ipStateFile = URL(fileURLWithPath: "/tmp/.netmon_ip_state")
     let statusFile = URL(fileURLWithPath: "/tmp/.netmon_status")
@@ -461,13 +428,65 @@ final class Daemon {
     var lastIP = ""
     var lastIPCheck = Date.distantPast
 
+    // Thread management
+    private var monitorThread: Thread?
+    private var _shouldStop = false
+    private let stateLock = NSLock()
+    
+    private var shouldStop: Bool {
+        get { stateLock.lock(); defer { stateLock.unlock() }; return _shouldStop }
+        set { stateLock.lock(); _shouldStop = newValue; stateLock.unlock() }
+    }
+    
+    var isRunning: Bool {
+        stateLock.lock()
+        defer { stateLock.unlock() }
+        return monitorThread != nil && !_shouldStop
+    }
+    
     lazy var session: URLSession = {
         let config = URLSessionConfiguration.ephemeral
         config.timeoutIntervalForRequest = 5.0
         return URLSession(configuration: config)
     }()
+    
+    func start() {
+        stateLock.lock()
+        guard monitorThread == nil else { stateLock.unlock(); return }
+        _shouldStop = false
+        stateLock.unlock()
+        
+        let thread = Thread { [weak self] in
+            self?.run()
+            // Clean up when thread exits
+            self?.stateLock.lock()
+            self?.monitorThread = nil
+            self?.stateLock.unlock()
+        }
+        thread.qualityOfService = .utility
+        thread.name = "netmon-daemon"
+        
+        stateLock.lock()
+        monitorThread = thread
+        stateLock.unlock()
+        
+        thread.start()
+    }
+    
+    func stop() {
+        shouldStop = true
+        // Give the thread time to exit its current sleep cycle
+        Thread.sleep(forTimeInterval: 0.6)
+        
+        stateLock.lock()
+        monitorThread = nil
+        stateLock.unlock()
+        
+        try? FileManager.default.removeItem(atPath: pidFile.path)
+        log("=== Network Monitor Daemon Stopped ===")
+    }
 
-    func run() {
+    private func run() {
         createAppDirectories()
         setupInitialFiles()
 
@@ -481,17 +500,21 @@ final class Daemon {
         let category = UNNotificationCategory(identifier: "OUTAGE", actions: [mute1h, mute24], intentIdentifiers: [], options: [.customDismissAction])
         center.setNotificationCategories([category])
 
-        while true {
+        while !shouldStop {
             let start = Date()
 
             checkConfigUpdate()
             performPing()
             performIPCheckIfNeeded()
 
-            // Sleep for the remainder of the interval
+            // Sleep in small chunks so we can respond to stop() quickly
             let elapsed = Date().timeIntervalSince(start)
-            let sleepTime = max(0.1, config.ping.interval_seconds - elapsed)
-            Thread.sleep(forTimeInterval: sleepTime)
+            var remaining = max(0.1, config.ping.interval_seconds - elapsed)
+            while remaining > 0 && !shouldStop {
+                let chunk = min(remaining, 0.5)
+                Thread.sleep(forTimeInterval: chunk)
+                remaining -= chunk
+            }
         }
     }