语言处理

Author: yanue

V2rayU/AppVersion.swift

@@ -6,9 +6,27 @@
 //
 
 import Foundation
+import SwiftUI
+
+/// 下载状态模型（纯数据结构）
+struct DownloadState {
+    var downloadingVersion: String = ""
+    var downloadingUrl: String = ""
+    var progress: Double = 0.0
+    var speed: String = "0.0 KB/s"
+    var downloadedSize: String = "0.0 MB"
+    var totalSize: String = "0.0 MB"
+    var isFinished: Bool = false
+    var errorMessage: String? = nil
+    var downloadedFilePath: String? = nil
+}
 
 /// 通用下载代理，支持进度、超时、错误、完成回调
-class DownloadDelegate: NSObject, URLSessionDelegate, URLSessionDownloadDelegate, @unchecked Sendable {
+@MainActor
+class DownloadManager: NSObject, ObservableObject, URLSessionDelegate, URLSessionDownloadDelegate {
+    /// 一个整体的下载状态
+    @Published var state = DownloadState()
+
     private let timerLock = NSLock()
     private var _timer: Timer?
     private var timer: Timer? {
@@ -19,7 +37,6 @@ class DownloadDelegate: NSObject, URLSessionDelegate, URLSessionDownloadDelegate
     private let timeoutSeconds: Double
     private var didTimeout = false
     private var downloadTask: URLSessionDownloadTask?
-    private let onProgress: (Double, String, String) -> Void
     private let onSuccess: (String) -> Void
     private let onError: (String) -> Void
     private var lastWritten: Int64 = 0
@@ -28,27 +45,52 @@ class DownloadDelegate: NSObject, URLSessionDelegate, URLSessionDownloadDelegate
     /// 初始化
     /// - Parameters:
     ///   - timeout: 超时时间（秒）
-    ///   - onProgress: 进度回调 0~1
     ///   - onSuccess: 成功回调，参数为下载文件临时路径
     ///   - onError: 错误回调，参数为错误信息
     init(timeout: Double = 10,
-         onProgress: @escaping (Double, String, String) -> Void,
          onSuccess: @escaping (String) -> Void,
          onError: @escaping (String) -> Void) {
         timeoutSeconds = timeout
-        self.onProgress = onProgress
         self.onSuccess = onSuccess
         self.onError = onError
     }
 
+    // MARK: - 对外启动下载接口
+    func startDownload(from urlString: String, version: String, totalSize: Int64, useProxy: Bool = true) {
+        guard let url = URL(string: urlString) else {
+            self.state.isFinished = true
+            self.state.errorMessage = String(localized: .DownloadURLInvalid)
+            self.onError(self.state.errorMessage)
+            return
+        }
+        state.downloadingVersion = version
+        state.downloadingUrl = urlString
+        state.totalSize = formatByte(Double(totalSize))
+        state.isFinished = false
+        state.progress = 0.0
+        state.errorMessage = nil
+        var config = URLSessionConfiguration.default
+        if useProxy {
+            config = getProxyUrlSessionConfigure()
+        }
+        session = URLSession(configuration: config, delegate: self, delegateQueue: nil)
+        let task = session!.downloadTask(with: url)
+        // 启动超时检测计时器
+        startTimeout(downloadTask: task)
+        // 启动下载任务
+        task.resume()
+    }
+
     func startTimeout(downloadTask: URLSessionDownloadTask) {
         self.downloadTask = downloadTask
         timer = Timer.scheduledTimer(withTimeInterval: timeoutSeconds, repeats: false) { [weak self] _ in
             guard let self = self else { return }
             self.didTimeout = true
             downloadTask.cancel()
             DispatchQueue.main.async {
-                self.onError("下载超时，请检查网络或代理设置")
+                self.state.isFinished = true
+                self.state.errorMessage = String(localized: .DownloadErrorOccurred)
+                self.onError(self.state.errorMessage)
             }
         }
     }
@@ -61,7 +103,9 @@ class DownloadDelegate: NSObject, URLSessionDelegate, URLSessionDownloadDelegate
             self.didTimeout = true
             task.cancel()
             DispatchQueue.main.async {
-                self.onError("下载超时，请检查网络或代理设置")
+                self.state.isFinished = true
+                self.state.errorMessage = String(localized: .DownloadTimeoutError)
+                self.onError(self.state.errorMessage)
             }
         }
     }
@@ -83,10 +127,11 @@ class DownloadDelegate: NSObject, URLSessionDelegate, URLSessionDownloadDelegate
         lastWritten = totalBytesWritten
         lastTime = now
         let progress = totalBytesExpectedToWrite > 0 ? Double(totalBytesWritten) / Double(totalBytesExpectedToWrite) : 0
-
-        DispatchQueue.main.async {
-            self.onProgress(progress, speed, formatByte(Double(totalBytesWritten)))
-        }
+        let downloaded = formatByte(Double(totalBytesWritten))
+        // 更新结构体中的状态
+        self.state.progress = progress
+        self.state.speed = speed
+        self.state.downloadedSize = downloaded
         resetTimeout()
     }
 
@@ -96,6 +141,9 @@ class DownloadDelegate: NSObject, URLSessionDelegate, URLSessionDownloadDelegate
         let fileName = downloadTask.response?.suggestedFilename ?? ""
         guard locationPath != "", fileName != "" else {
             logger.info("urlSession: locationPath or fileName missing", )
+            self.state.isFinished = true
+            self.state.errorMessage = String(localized: .DownloadSaveFailed) + ": urlSession: locationPath or fileName missing"
+            self.onError(self.state.errorMessage)
             return
         }
         let documentsPath = NSHomeDirectory() + "/Library/Caches/Download"
@@ -106,18 +154,28 @@ class DownloadDelegate: NSObject, URLSessionDelegate, URLSessionDownloadDelegate
                 try FileManager.default.removeItem(atPath: filePath)
             }
         } catch let catchError {
-            alertDialog(title: "下载失败1", message: "保存出错 = \(catchError.localizedDescription)")
+            self.state.isFinished = true
+            self.state.errorMessage = String(localized: .DownloadSaveFailed) + ": \(catchError.localizedDescription)"
+            self.onError(self.state.errorMessage)
+            return
         }
         do {
             if FileManager.default.fileExists(atPath: documentsPath) == false {
                 try FileManager.default.createDirectory(atPath: documentsPath, withIntermediateDirectories: true)
             }
+            // 记录下载文件路径
+            self.state.downloadedFilePath = filePath
             // 移动文件,不然随时被删除
             try FileManager.default.moveItem(atPath: locationPath, toPath: filePath)
         } catch let catchError {
-            alertDialog(title: "下载失败2", message: "保存出错 = \(catchError.localizedDescription)")
+            self.state.isFinished = true
+            self.state.errorMessage = String(localized: .DownloadSaveFailed) + ": \(catchError.localizedDescription)"
+            self.onError(self.state.errorMessage)
+            return
         }
         DispatchQueue.main.async {
+            // 更新状态为完成
+            self.state.isFinished = true
             self.onSuccess(filePath)
         }
     }
@@ -130,7 +188,9 @@ class DownloadDelegate: NSObject, URLSessionDelegate, URLSessionDownloadDelegate
                 return
             }
             DispatchQueue.main.async {
-                self.onError("下载失败: \(error.localizedDescription)")
+                self.state.isFinished = true
+                self.state.errorMessage = String(localized: .DownloadErrorOccurred) + ": \(error.localizedDescription)"
+                self.onError(self.state.errorMessage)
             }
         }
     }

V2rayU/Base/Download.swift

@@ -133,10 +133,6 @@ func noticeTip(title: String = "", informativeText: String = "") {
 }
 
 
-func vold() {
-    
-}
-
 func getRandomPort() -> UInt16 {
     return UInt16.random(in: 49152...65535)
 }
@@ -165,13 +161,8 @@ func clearLogFile(logFilePath: String) {
         FileManager.default.createFile(atPath: logFilePath, contents: nil, attributes: nil)
     } catch let error {
         logger.info("clear log file fail: \(error)")
-        var title = "Clear log file failed"
-        var toast = "Error: \(error)"
-        if isMainland {
-            title = "清除日志文件失败"
-            toast = "错误: \(error)"
-        }
-        alertDialog(title: title, message: toast)
+        var title = String(localized: .ClearLogFileFailed)
+        alertDialog(title: title, message: error)
     }
 }
 
@@ -184,12 +175,7 @@ func truncateLogFile(_ logFilePath: String) {
         }
     } catch let error {
         logger.info("truncate log file fail: \(error)")
-        var title = "Truncate log file failed"
-        var toast = "Error: \(error)"
-        if isMainland {
-            title = "清除日志文件失败"
-            toast = "错误: \(error)"
-        }
+        var title = String(localized: .ClearLogFileFailed)
         alertDialog(title: title, message: toast)
     }
 }

V2rayU/Base/Util.swift

@@ -69,20 +69,16 @@ actor AppInstaller: NSObject {
     }
 
     func showInstallAlert() {
-        DispatchQueue.main.async {
+        // 将 UI 操作放到主线程, 同步执行, 确保在调用后才能继续
+        DispatchQueue.main.sync {
+
             let alert = NSAlert()
             alert.alertStyle = .warning
-            if isMainland {
-                alert.messageText = "安装V2rayUTool"
-                alert.informativeText = "V2rayU 需要使用管理员权限安装 V2rayUTool 到 ~/.V2rayU/V2rayUTool"
-                alert.addButton(withTitle: "安装")
-                alert.addButton(withTitle: "退出")
-            } else {
-                alert.messageText = " Install V2rayUTool"
-                alert.informativeText = "V2rayU needs to install V2rayUTool into ~/.V2rayU/V2rayUTool with administrator privileges"
-                alert.addButton(withTitle: "Install")
-                alert.addButton(withTitle: "Quit")
-            }
+            alert.messageText = String(localized: .InstallV2rayUTool)
+            alert.informativeText = String(localized: .InstallPermissionTip)
+            alert.addButton(withTitle: String(localized: .Install))
+            alert.addButton(withTitle: String(localized: .Quit))
+
             switch alert.runModal() {
             case .alertFirstButtonReturn:
                 Task {
@@ -131,12 +127,8 @@ actor AppInstaller: NSObject {
             logger.info("executeAppleScript-Output: \(output)")
         } catch {
             logger.info("executeAppleScript-Error: \(error)")
-            var title = "Install V2rayUTool Failed"
-            var toast = "Error: \(error),\nYou need execute scripts manually:\n \(script)"
-            if isMainland {
-                title = "安装 V2rayUTool 失败"
-                toast = "安装失败: \(error)\n, 你需要在命令行手动执行一下: \(script)"
-            }
+            var title = String(localized: .InstallFailed)
+            var toast = "\(String(localized: .InstallFailedManual))\n \(script)"
             alertDialog(title: title, message: toast)
         }
     }

V2rayU/Handler/AppInstaller.swift

@@ -34,12 +34,8 @@ actor LocalHttpServer {
         logger.info("pacPort: \(pacPort)")
 
         if isPortOpen(pacPort) {
-            var toast = "pac port \(pacPort) has been used, please replace from advance setting"
-            var title = "Port is already in use"
-            if isMainland {
-                toast = "pac端口 \(pacPort) 已被使用, 请更换"
-                title = "端口已被占用"
-            }
+            var title = String(localized: .PortInUse)
+            var toast = + "\(pacPort) " + String(localized: .PortInUseTip)
             alertDialog(title: title, message: toast)
             DispatchQueue.main.async {
                 showDock(state: true)