Merge branch 'feature/codeium-1.2.25' into develop

Author: intitni

Core/Sources/CodeiumService/CodeiumInstallationManager.swift

@@ -3,7 +3,7 @@ import Terminal
 
 public struct CodeiumInstallationManager {
     private static var isInstalling = false
-    static let latestSupportedVersion = "1.2.17"
+    static let latestSupportedVersion = "1.2.25"
 
     public init() {}
 

Core/Sources/CodeiumService/CodeiumRequest.swift

@@ -48,12 +48,25 @@ enum CodeiumRequest {
         }
     }
 
-    struct AcceptCompletion: CodeiumRequestType {
-        struct Response: Codable {
-            var state: State
-            var completionItems: [CodeiumCompletionItem]?
+    struct CancelRequest: CodeiumRequestType {
+        struct Response: Codable {}
+
+        struct RequestBody: Codable {
+            var request_id: UInt64
+            var session_id: String
         }
 
+        var requestBody: RequestBody
+
+        func makeURLRequest(server: String) -> URLRequest {
+            let data = (try? JSONEncoder().encode(requestBody)) ?? Data()
+            return assembleURLRequest(server: server, method: "CancelRequest", body: data)
+        }
+    }
+    
+    struct AcceptCompletion: CodeiumRequestType {
+        struct Response: Codable {}
+
         struct RequestBody: Codable {
             var metadata: Metadata
             var completion_id: String

Core/Sources/CodeiumService/CodeiumService.swift

@@ -257,13 +257,13 @@ extension CodeiumSuggestionService: CodeiumSuggestionServiceType {
                     )
                 }
         ))
-        
+
         if request.requestBody.metadata.request_id <= cancellationCounter {
             throw CancellationError()
         }
 
         let result = try await (try await setupServerIfNeeded()).sendRequest(request)
-        
+
         if request.requestBody.metadata.request_id <= cancellationCounter {
             throw CancellationError()
         }
@@ -292,8 +292,16 @@ extension CodeiumSuggestionService: CodeiumSuggestionServiceType {
             )
         } ?? []
     }
-    
+
     public func cancelRequest() async {
+        Task {
+            try await server?.sendRequest(
+                CodeiumRequest.CancelRequest(requestBody: .init(
+                    request_id: requestCounter,
+                    session_id: CodeiumSuggestionService.sessionId
+                ))
+            )
+        }
         cancellationCounter = requestCounter
     }
 
@@ -326,7 +334,7 @@ extension CodeiumSuggestionService: CodeiumSuggestionServiceType {
     public func notifyCloseTextDocument(fileURL: URL) async throws {
         await openedDocumentPool.closeDocument(url: fileURL)
     }
-    
+
     public func terminate() {
         server?.terminate()
         server = nil

Core/Sources/Service/DependencyUpdater.swift

@@ -0,0 +1,76 @@
+import CodeiumService
+import GitHubCopilotService
+import Logger
+
+public struct DependencyUpdater {
+    public init() {}
+
+    public func update() {
+        Task {
+            await withTaskGroup(of: Void.self) { taskGroup in
+                let gitHubCopilot = GitHubCopilotInstallationManager()
+                switch gitHubCopilot.checkInstallation() {
+                case .notInstalled: break
+                case .installed: break
+                case .unsupported: break
+                case .outdated:
+                    taskGroup.addTask {
+                        do {
+                            for try await step in gitHubCopilot.installLatestVersion() {
+                                let state = {
+                                    switch step {
+                                    case .downloading:
+                                        return "Downloading"
+                                    case .uninstalling:
+                                        return "Uninstalling old version"
+                                    case .decompressing:
+                                        return "Decompressing"
+                                    case .done:
+                                        return "Done"
+                                    }
+                                }()
+                                Logger.service
+                                    .error("Update GitHub Copilot language server: \(state)")
+                            }
+                        } catch {
+                            Logger.service.error(
+                                "Update GitHub Copilot language server: \(error.localizedDescription)"
+                            )
+                        }
+                    }
+                }
+                let codeium = CodeiumInstallationManager()
+                switch codeium.checkInstallation() {
+                case .notInstalled: break
+                case .installed: break
+                case .unsupported: break
+                case .outdated:
+                    taskGroup.addTask {
+                        do {
+                            for try await step in codeium.installLatestVersion() {
+                                let state = {
+                                    switch step {
+                                    case .downloading:
+                                        return "Downloading"
+                                    case .uninstalling:
+                                        return "Uninstalling old version"
+                                    case .decompressing:
+                                        return "Decompressing"
+                                    case .done:
+                                        return "Done"
+                                    }
+                                }()
+                                Logger.service.error("Update Codeium language server: \(state)")
+                            }
+                        } catch {
+                            Logger.service.error(
+                                "Update Codeium language server: \(error.localizedDescription)"
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+

ExtensionService/AppDelegate.swift

@@ -42,6 +42,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         Logger.service.info("XPC Service started.")
         NSApp.setActivationPolicy(.accessory)
         buildStatusBarMenu()
+        DependencyUpdater().update()
         Task {
             do {
                 try await ServiceUpdateMigrator().migrate()