Move XPC related content to XPCController

Author: intitni

ExtensionService/AppDelegate.swift

@@ -10,6 +10,7 @@ import UpdateChecker
 import UserDefaultsObserver
 import UserNotifications
 import XcodeInspector
+import XPCShared
 
 let bundleIdentifierBase = Bundle.main
     .object(forInfoDictionaryKey: "BUNDLE_IDENTIFIER_BASE") as! String
@@ -19,7 +20,7 @@ let serviceIdentifier = bundleIdentifierBase + ".ExtensionService"
 class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     let service = Service.shared
     var statusBarItem: NSStatusItem!
-    var xpcListener: (NSXPCListener, ServiceDelegate)?
+    var xpcController: XPCController?
     let updateChecker =
         UpdateChecker(
             hostBundle: locateHostBundleURL(url: Bundle.main.bundleURL)
@@ -35,7 +36,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         ] as CFDictionary)
         setupQuitOnUpdate()
         setupQuitOnUserTerminated()
-        xpcListener = setupXPCListener()
+        xpcController = .init()
         Logger.service.info("XPC Service started.")
         NSApp.setActivationPolicy(.accessory)
         buildStatusBarMenu()
@@ -48,7 +49,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
             }
         }
     }
-    
+
     @objc func quit() {
         Task { @MainActor in
             await service.prepareForExit()
@@ -125,14 +126,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         }
     }
 
-    func setupXPCListener() -> (NSXPCListener, ServiceDelegate) {
-        let listener = NSXPCListener(machServiceName: serviceIdentifier)
-        let delegate = ServiceDelegate()
-        listener.delegate = delegate
-        listener.resume()
-        return (listener, delegate)
-    }
-
     func requestAccessoryAPIPermission() {
         AXIsProcessTrustedWithOptions([
             kAXTrustedCheckOptionPrompt.takeRetainedValue() as NSString: true,

ExtensionService/XPCController.swift

@@ -0,0 +1,58 @@
+import Foundation
+import Logger
+import XPCShared
+
+final class XPCController: XPCServiceDelegate {
+    let bridge: XPCCommunicationBridge
+    let xpcListener: NSXPCListener
+    let xpcServiceDelegate: ServiceDelegate
+
+    var pingTask: Task<Void, Error>?
+
+    init() {
+        let bridge = XPCCommunicationBridge(logger: .client)
+        let listener = NSXPCListener.anonymous()
+        let delegate = ServiceDelegate()
+        listener.delegate = delegate
+        listener.resume()
+        xpcListener = listener
+        xpcServiceDelegate = delegate
+        self.bridge = bridge
+
+        Task {
+            await bridge.setDelegate(self)
+            createPingTask()
+        }
+    }
+
+    deinit {
+        xpcListener.invalidate()
+        pingTask?.cancel()
+    }
+
+    func createPingTask() {
+        pingTask?.cancel()
+        pingTask = Task { [weak self] in
+            while !Task.isCancelled {
+                guard let self else { return }
+                do {
+                    try await self.bridge.updateServiceEndpoint(self.xpcListener.endpoint)
+                    try await Task.sleep(nanoseconds: 60_000_000_000)
+                } catch {
+                    try await Task.sleep(nanoseconds: 1_000_000_000)
+                    Logger.service
+                        .error("Failed to connect to bridge: \(error.localizedDescription)")
+                }
+            }
+        }
+    }
+
+    func connectionDidInvalidate() async {
+        // ignore
+    }
+
+    func connectionDidInterrupt() async {
+        createPingTask() // restart the ping task so that it can bring the bridge back immediately.
+    }
+}
+