Merge branch 'feature/github-copilot-proxy' into develop

Author: intitni

Core/Sources/GitHubCopilotService/GitHubCopilotRequest.swift

@@ -1,7 +1,7 @@
-import SuggestionModel
 import Foundation
 import JSONRPC
 import LanguageServerProtocol
+import SuggestionModel
 
 struct GitHubCopilotDoc: Codable {
     var source: String
@@ -26,8 +26,49 @@ enum GitHubCopilotRequest {
     struct SetEditorInfo: GitHubCopilotRequestType {
         struct Response: Codable {}
 
+        var networkProxy: JSONValue? {
+            let host = UserDefaults.shared.value(for: \.gitHubCopilotProxyHost)
+            if host.isEmpty { return nil }
+            var port = UserDefaults.shared.value(for: \.gitHubCopilotProxyPort)
+            if port.isEmpty { port = "80" }
+            let username = UserDefaults.shared.value(for: \.gitHubCopilotProxyUsername)
+            if username.isEmpty {
+                return .hash([
+                    "host": .string(host),
+                    "port": .number(Double(Int(port) ?? 80)),
+                    "rejectUnauthorized": .bool(UserDefaults.shared
+                        .value(for: \.gitHubCopilotUseStrictSSL)),
+                ])
+            } else {
+                return .hash([
+                    "host": .string(host),
+                    "port": .number(Double(Int(port) ?? 80)),
+                    "rejectUnauthorized": .bool(UserDefaults.shared
+                        .value(for: \.gitHubCopilotUseStrictSSL)),
+                    "username": .string(username),
+                    "password": .string(UserDefaults.shared
+                        .value(for: \.gitHubCopilotProxyPassword)),
+
+                ])
+            }
+        }
+
         var request: ClientRequest {
-            .custom("setEditorInfo", .hash([
+            if let networkProxy {
+                return .custom("setEditorInfo", .hash([
+                    "editorInfo": .hash([
+                        "name": "Xcode",
+                        "version": "",
+                    ]),
+                    "editorPluginInfo": .hash([
+                        "name": "Copilot for Xcode",
+                        "version": "",
+                    ]),
+                    "networkProxy": networkProxy,
+                ]))
+            }
+
+            return .custom("setEditorInfo", .hash([
                 "editorInfo": .hash([
                     "name": "Xcode",
                     "version": "",
@@ -171,3 +212,4 @@ enum GitHubCopilotRequest {
         }
     }
 }
+

Core/Sources/GitHubCopilotService/GitHubCopilotService.swift

@@ -165,7 +165,13 @@ public class GitHubCopilotBaseService {
 
         self.server = server
         localProcessServer = localServer
+        
+        Task {
+            try await server.sendRequest(GitHubCopilotRequest.SetEditorInfo())
+        }
     }
+    
+    
 
     public static func createFoldersIfNeeded() throws -> (
         applicationSupportURL: URL,
@@ -211,9 +217,6 @@ public final class GitHubCopilotAuthService: GitHubCopilotBaseService,
     public init() throws {
         let home = FileManager.default.homeDirectoryForCurrentUser
         try super.init(projectRootURL: home)
-        Task {
-            try? await server.sendRequest(GitHubCopilotRequest.SetEditorInfo())
-        }
     }
 
     public func checkStatus() async throws -> GitHubCopilotAccountStatus {

Core/Sources/HostApp/AccountSettings/CopilotView.swift

@@ -13,6 +13,11 @@ struct CopilotView: View {
         @AppStorage(\.runNodeWith) var runNodeWith
         @AppStorage("username") var username: String = ""
         @AppStorage(\.gitHubCopilotVerboseLog) var gitHubCopilotVerboseLog
+        @AppStorage(\.gitHubCopilotProxyHost) var gitHubCopilotProxyHost
+        @AppStorage(\.gitHubCopilotProxyPort) var gitHubCopilotProxyPort
+        @AppStorage(\.gitHubCopilotProxyUsername) var gitHubCopilotProxyUsername
+        @AppStorage(\.gitHubCopilotProxyPassword) var gitHubCopilotProxyPassword
+        @AppStorage(\.gitHubCopilotUseStrictSSL) var gitHubCopilotUseStrictSSL
 
         init() {}
     }
@@ -182,9 +187,9 @@ struct CopilotView: View {
                             uninstallButton
                         }
                     }
-                    
+
                     Text("Language Server Version: \(version ?? "Loading..")")
-                    
+
                     Text("Status: \(status?.description ?? "Loading..")")
 
                     HStack(alignment: .center) {
@@ -226,6 +231,24 @@ struct CopilotView: View {
                 Form {
                     Toggle("Verbose Log", isOn: $settings.gitHubCopilotVerboseLog)
                 }
+
+                Divider()
+
+                Form {
+                    TextField(text: $settings.gitHubCopilotProxyHost, prompt: Text("xxx.xxx.xxx.xxx, leave it blank to disable proxy.")) {
+                        Text("Proxy Host")
+                    }
+                    TextField(text: $settings.gitHubCopilotProxyPort, prompt: Text("80")) {
+                        Text("Proxy Port")
+                    }
+                    TextField(text: $settings.gitHubCopilotProxyUsername) {
+                        Text("Proxy Username")
+                    }
+                    SecureField(text: $settings.gitHubCopilotProxyPassword) {
+                        Text("Proxy Password")
+                    }
+                    Toggle("Proxy Strict SSL", isOn: $settings.gitHubCopilotUseStrictSSL)
+                }
             }
             Spacer()
         }.onAppear {

Tool/Sources/Preferences/Keys.swift

@@ -122,6 +122,26 @@ public extension UserDefaultPreferenceKeys {
         .init(defaultValue: false, key: "GitHubCopilotVerboseLog")
     }
 
+    var gitHubCopilotProxyHost: PreferenceKey<String> {
+        .init(defaultValue: "", key: "GitHubCopilotProxyHost")
+    }
+    
+    var gitHubCopilotProxyPort: PreferenceKey<String> {
+        .init(defaultValue: "", key: "GitHubCopilotProxyPort")
+    }
+
+    var gitHubCopilotUseStrictSSL: PreferenceKey<Bool> {
+        .init(defaultValue: true, key: "GitHubCopilotUseStrictSSL")
+    }
+
+    var gitHubCopilotProxyUsername: PreferenceKey<String> {
+        .init(defaultValue: "", key: "GitHubCopilotProxyUsername")
+    }
+
+    var gitHubCopilotProxyPassword: PreferenceKey<String> {
+        .init(defaultValue: "", key: "GitHubCopilotProxyPassword")
+    }
+
     var nodePath: PreferenceKey<String> {
         .init(defaultValue: "", key: "NodePath")
     }
@@ -245,7 +265,7 @@ public extension UserDefaultPreferenceKeys {
             key: "DefaultChatSystemPrompt"
         )
     }
-    
+
     var chatSearchPluginMaxIterations: PreferenceKey<Int> {
         .init(defaultValue: 3, key: "ChatSearchPluginMaxIterations")
     }
@@ -257,9 +277,12 @@ public extension UserDefaultPreferenceKeys {
     var bingSearchSubscriptionKey: PreferenceKey<String> {
         .init(defaultValue: "", key: "BingSearchSubscriptionKey")
     }
-    
+
     var bingSearchEndpoint: PreferenceKey<String> {
-        .init(defaultValue: "https://api.bing.microsoft.com/v7.0/search/", key: "BingSearchEndpoint")
+        .init(
+            defaultValue: "https://api.bing.microsoft.com/v7.0/search/",
+            key: "BingSearchEndpoint"
+        )
     }
 }
 
@@ -326,15 +349,15 @@ public extension UserDefaultPreferenceKeys {
     var triggerActionWithAccessibilityAPI: FeatureFlag {
         .init(defaultValue: true, key: "FeatureFlag-TriggerActionWithAccessibilityAPI")
     }
-    
+
     var animationACrashSuggestion: FeatureFlag {
         .init(defaultValue: true, key: "FeatureFlag-AnimationACrashSuggestion")
     }
-    
+
     var animationBCrashSuggestion: FeatureFlag {
         .init(defaultValue: true, key: "FeatureFlag-AnimationBCrashSuggestion")
     }
-    
+
     var animationCCrashSuggestion: FeatureFlag {
         .init(defaultValue: true, key: "FeatureFlag-AnimationCCrashSuggestion")
     }