fix: restart converter server via xpc

Author: ensan-hcl

Core/Sources/ConverterServer/main.swift

@@ -1,4 +1,5 @@
 import Core
+import Darwin
 import Foundation
 import KanaKanjiConverterModuleWithDefaultDictionary
 
@@ -131,6 +132,9 @@ private final class ConverterServer: NSObject, ConverterServerXPCProtocol, @unch
     // swiftlint:disable:next cyclomatic_complexity
     private func handle(_ command: ConverterServerCommand) async throws -> ConverterServerResponse {
         switch command {
+        case .shutdown:
+            Self.scheduleShutdown()
+            return ConverterServerResponse(snapshot: .empty)
         case .activate(let sessionID):
             let session = try getSession(sessionID)
             session.manager.activate()
@@ -847,6 +851,12 @@ private final class ConverterServer: NSObject, ConverterServerXPCProtocol, @unch
         return boolValue
     }
 
+    private static func scheduleShutdown() {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
+            exit(EXIT_SUCCESS)
+        }
+    }
+
     @MainActor
     private func getSession(_ sessionID: String) throws -> ConverterSession {
         guard let session = sessions[sessionID] else {

Core/Sources/Core/XPC/ConverterServerXPCProtocol.swift

@@ -23,6 +23,7 @@ public enum ConverterServerCodec {
 }
 
 public enum ConverterServerCommand: Codable, Sendable {
+    case shutdown
     case activate(sessionID: String)
     case deactivate(sessionID: String)
     case listSettings(sessionID: String, capabilities: ConverterSettingClientCapabilities)

Core/Tests/CoreTests/XPCTests/ConverterServerContractTests.swift

@@ -107,30 +107,35 @@ import Testing
     let submit = ConverterServerCommand.submitSelectedReplaceSuggestion(sessionID: "session-1")
 
     guard case .requestReplaceSuggestion(let requestSessionID, let leftSideContext) =
-        try ConverterServerCodec.decodeCommand(from: ConverterServerCodec.encode(request)) else {
+            try ConverterServerCodec.decodeCommand(from: ConverterServerCodec.encode(request)) else {
         Issue.record("Expected requestReplaceSuggestion command after round trip")
         return
     }
     #expect(requestSessionID == "session-1")
     #expect(leftSideContext == "左文脈")
 
     guard case .selectReplaceSuggestionCandidate(let selectSessionID, let index) =
-        try ConverterServerCodec.decodeCommand(from: ConverterServerCodec.encode(select)) else {
+            try ConverterServerCodec.decodeCommand(from: ConverterServerCodec.encode(select)) else {
         Issue.record("Expected selectReplaceSuggestionCandidate command after round trip")
         return
     }
     #expect(selectSessionID == "session-1")
     #expect(index == 2)
 
     guard case .submitSelectedReplaceSuggestion(let submitSessionID) =
-        try ConverterServerCodec.decodeCommand(from: ConverterServerCodec.encode(submit)) else {
+            try ConverterServerCodec.decodeCommand(from: ConverterServerCodec.encode(submit)) else {
         Issue.record("Expected submitSelectedReplaceSuggestion command after round trip")
         return
     }
     #expect(submitSessionID == "session-1")
 }
 
 @Test func converterServerSettingsCommandsRoundTrip() throws {
+    guard case .shutdown = try ConverterServerCodec.decodeCommand(from: ConverterServerCodec.encode(.shutdown)) else {
+        Issue.record("Expected shutdown command after round trip")
+        return
+    }
+
     let capabilities = ConverterSettingClientCapabilities(
         supportedKinds: [.toggle, .selector, .button],
         supportedActions: ["resetLearningData"],
@@ -144,15 +149,15 @@ import Testing
     )
 
     guard case .listSettings(let listSessionID, let roundTripCapabilities) =
-        try ConverterServerCodec.decodeCommand(from: ConverterServerCodec.encode(list)) else {
+            try ConverterServerCodec.decodeCommand(from: ConverterServerCodec.encode(list)) else {
         Issue.record("Expected listSettings command after round trip")
         return
     }
     #expect(listSessionID == "session-1")
     #expect(roundTripCapabilities == capabilities)
 
     guard case .updateSetting(let updateSessionID, let key, let value) =
-        try ConverterServerCodec.decodeCommand(from: ConverterServerCodec.encode(update)) else {
+            try ConverterServerCodec.decodeCommand(from: ConverterServerCodec.encode(update)) else {
         Issue.record("Expected updateSetting command after round trip")
         return
     }

azooKeyMac/InputController/ConverterServerClient.swift

@@ -101,6 +101,13 @@ final class ConverterServerClient {
         )
     }
 
+    func restartServer(completion: @escaping (Bool) -> Void) {
+        sendResolved(.shutdown) { [weak self] response in
+            self?.invalidateConnection()
+            completion(response != nil)
+        }
+    }
+
     func send(
         _ commandBuilder: @escaping (String) -> ConverterServerCommand,
         completion: @escaping (ConverterServerResponse?) -> Void

azooKeyMac/Windows/ConfigWindow.swift

@@ -1,6 +1,5 @@
 import Cocoa
 import Core
-import Darwin
 import SwiftUI
 
 struct ConfigWindow: View {
@@ -25,6 +24,7 @@ struct ConfigWindow: View {
     @ConfigState private var keyboardLayout = Config.KeyboardLayout()
     @ConfigState private var aiBackend = Config.AIBackendPreference()
 
+    @State private var converterServerClient = ConverterServerClient()
     @State private var selectedTab: Tab = .basic
     @State private var zenzaiProfileHelpPopover = false
     @State private var zenzaiInferenceLimitHelpPopover = false
@@ -67,17 +67,6 @@ struct ConfigWindow: View {
         case successfulUpdate
     }
 
-    private enum ConverterProcessRestartError: LocalizedError {
-        case launchctlFailed(String)
-
-        var errorDescription: String? {
-            switch self {
-            case .launchctlFailed(let message):
-                "launchctl kickstart failed: \(message)"
-            }
-        }
-    }
-
     private var azooKeyApplicationSupportDirectoryURL: URL {
         AppGroup.applicationSupportDirectoryURL()
     }
@@ -195,53 +184,14 @@ struct ConfigWindow: View {
         }
         self.converterProcessRestartInProgress = true
         self.converterProcessRestartMessage = nil
-        Task {
-            do {
-                try await Task.detached(priority: .utility) {
-                    try Self.restartConverterProcessService()
-                }.value
-                await MainActor.run {
-                    self.converterProcessRestartMessage = "再起動しました"
-                    self.converterProcessRestartInProgress = false
-                }
-            } catch {
-                await MainActor.run {
-                    self.converterProcessRestartMessage = error.localizedDescription
-                    self.converterProcessRestartInProgress = false
-                }
+        self.converterServerClient.restartServer { success in
+            DispatchQueue.main.async {
+                self.converterProcessRestartMessage = success ? "再起動しました" : "Converter Processに再起動を依頼できませんでした"
+                self.converterProcessRestartInProgress = false
             }
         }
     }
 
-    nonisolated private static func restartConverterProcessService() throws {
-        let serviceName = "dev.ensan.inputmethod.azooKeyMac.ConverterServer"
-        let process = Process()
-        process.executableURL = URL(fileURLWithPath: "/bin/launchctl")
-        process.arguments = [
-            "kickstart",
-            "-k",
-            "gui/\(getuid())/\(serviceName)"
-        ]
-
-        let outputPipe = Pipe()
-        let errorPipe = Pipe()
-        process.standardOutput = outputPipe
-        process.standardError = errorPipe
-
-        try process.run()
-        process.waitUntilExit()
-
-        guard process.terminationStatus == 0 else {
-            let standardError = String(data: errorPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? ""
-            let standardOutput = String(data: outputPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? ""
-            let message = [standardError, standardOutput]
-                .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
-                .filter { !$0.isEmpty }
-                .joined(separator: "\n")
-            throw ConverterProcessRestartError.launchctlFailed(message.isEmpty ? "exit status \(process.terminationStatus)" : message)
-        }
-    }
-
     private func openAzooKeyDataDirectoryInFinder() {
         do {
             try FileManager.default.createDirectory(