Improve the behavior of service app launching by host app

Author: intitni

CommunicationBridge/ServiceDelegate.swift

@@ -69,8 +69,8 @@ actor EventHandler {
             reply(endpoint)
         } else {
             endpoint = nil
-            reply(nil)
             await launcher.launch()
+            reply(nil)
         }
         #endif
     }

Core/Sources/HostApp/General.swift

@@ -65,13 +65,20 @@ struct General: ReducerProtocol {
                 return .run { send in
                     let service = try getService()
                     do {
-                        let xpcServiceVersion = try await service.getXPCServiceVersion().version
-                        let isAccessibilityPermissionGranted = try await service
-                            .getXPCServiceAccessibilityPermission()
-                        await send(.finishReloading(
-                            xpcServiceVersion: xpcServiceVersion,
-                            permissionGranted: isAccessibilityPermissionGranted
-                        ))
+                        let isCommunicationReady = try await service.launchIfNeeded()
+                        if isCommunicationReady {
+                            let xpcServiceVersion = try await service.getXPCServiceVersion().version
+                            let isAccessibilityPermissionGranted = try await service
+                                .getXPCServiceAccessibilityPermission()
+                            await send(.finishReloading(
+                                xpcServiceVersion: xpcServiceVersion,
+                                permissionGranted: isAccessibilityPermissionGranted
+                            ))
+                        } else {
+                            toast("Launching service app.", .info)
+                            try await Task.sleep(nanoseconds: 3_000_000_000)
+                            await send(.reloadStatus)
+                        }
                     } catch {
                         toast(error.localizedDescription, .error)
                         await send(.failedReloading)

Tool/Sources/XPCShared/XPCCommunicationBridge.swift

@@ -39,6 +39,7 @@ public class XPCCommunicationBridge {
         service.delegate = delegate
     }
 
+    @discardableResult
     public func launchExtensionServiceIfNeeded() async throws -> NSXPCListenerEndpoint? {
         try await withXPCServiceConnected { service, continuation in
             service.launchExtensionServiceIfNeeded { endpoint in

Tool/Sources/XPCShared/XPCExtensionService.swift

@@ -25,12 +25,18 @@ public class XPCExtensionService {
     let logger: Logger
     let bridge: XPCCommunicationBridge
 
-    nonisolated
-    public init(logger: Logger) {
+    public nonisolated
+    init(logger: Logger) {
         self.logger = logger
         bridge = XPCCommunicationBridge(logger: logger)
     }
 
+    /// Launches the extension service if it's not running, returns true if the service has finished
+    /// launching and the communication becomes available.
+    public func launchIfNeeded() async throws -> Bool {
+        try await bridge.launchExtensionServiceIfNeeded() != nil
+    }
+
     public func getXPCServiceVersion() async throws -> (version: String, build: String) {
         try await withXPCServiceConnected {
             service, continuation in