Handle requests from XPCService

Author: intitni

Core/Sources/Service/Service.swift

@@ -5,6 +5,7 @@ import Toast
 import Workspace
 import WorkspaceSuggestionService
 import XcodeInspector
+import XPCShared
 
 #if canImport(ProService)
 import ProService
@@ -32,7 +33,7 @@ public final class Service {
     #endif
 
     @Dependency(\.toast) var toast
-    
+
     private init() {
         @Dependency(\.workspacePool) var workspacePool
 
@@ -71,3 +72,25 @@ public final class Service {
     }
 }
 
+public extension Service {
+    func handleXPCServiceRequests(
+        endpoint: String,
+        requestBody: Data,
+        reply: @escaping (Data?, Error?) -> Void
+    ) {
+        do {
+            #if canImport(ProService)
+            try Service.shared.proService.handleXPCServiceRequests(
+                endpoint: endpoint,
+                requestBody: requestBody,
+                reply: reply
+            )
+            #endif
+        } catch is XPCRequestHandlerHitError {
+            return
+        } catch {
+            reply(nil, error)
+        }
+    }
+}
+

Core/Sources/Service/XPCService.swift

@@ -192,33 +192,17 @@ public class XPCService: NSObject, XPCServiceProtocol {
     }
 
     // MARK: - Requests
-    
+
     public func send(
         endpoint: String,
         requestBody: Data,
         reply: @escaping (Data?, Error?) -> Void
     ) {
-        do {
-            try ExtensionServiceRequests.OpenExtensionManager.handle(
-                endpoint: endpoint,
-                requestBody: requestBody,
-                reply: reply
-            ) { _ in
-                .none
-            }
-
-            try ExtensionServiceRequests.GetExtensionSuggestionServices.handle(
-                endpoint: endpoint,
-                requestBody: requestBody,
-                reply: reply
-            ) { _ in
-                []
-            }
-        } catch is XPCRequestHandlerHitError {
-            return
-        } catch {
-            reply(nil, error)
-        }
+        Service.shared.handleXPCServiceRequests(
+            endpoint: endpoint,
+            requestBody: requestBody,
+            reply: reply
+        )
     }
 }
 

Pro

@@ -79,6 +79,11 @@ public enum ExtensionServiceRequests {
         public struct ServiceInfo: Codable {
             public var bundleIdentifier: String
             public var name: String
+            
+            public init(bundleIdentifier: String, name: String) {
+                self.bundleIdentifier = bundleIdentifier
+                self.name = name
+            }
         }
 
         public typealias ResponseBody = [ServiceInfo]