Merge pull request #1610 from Anla2z/fix/pac-tun-routing

Fix/pac tun routing

Author: yanue

V2rayU.xcodeproj/project.pbxproj

@@ -79,7 +79,6 @@
 		6632EF3F2EC3720100CED47B /* SubscriptionStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6632EF3E2EC371F000CED47B /* SubscriptionStore.swift */; };
 		6632EF4D2EC4B9E100CED47B /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6632EF462EC4B9E100CED47B /* Localizable.strings */; };
 		6632EF4E2EC4B9E100CED47B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6632EF482EC4B9E100CED47B /* Assets.xcassets */; };
-		6632EF4F2EC4B9E100CED47B /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6632EF4A2EC4B9E100CED47B /* Info.plist */; };
 		6632EF502EC4B9E100CED47B /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6632EF492EC4B9E100CED47B /* GoogleService-Info.plist */; };
 		663814AF2E01938400F5FCF3 /* SubscriptionForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 663814AE2E01937700F5FCF3 /* SubscriptionForm.swift */; };
 		663814B12E0195F700F5FCF3 /* SubscriptionSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 663814B02E0195ED00F5FCF3 /* SubscriptionSync.swift */; };
@@ -935,7 +934,6 @@
 				666A61072F1933A0003654D3 /* install.sh in Resources */,
 				6632EF4D2EC4B9E100CED47B /* Localizable.strings in Resources */,
 				6632EF4E2EC4B9E100CED47B /* Assets.xcassets in Resources */,
-				6632EF4F2EC4B9E100CED47B /* Info.plist in Resources */,
 				6632EF502EC4B9E100CED47B /* GoogleService-Info.plist in Resources */,
 				667028E42F0D467E008F27D8 /* pac in Resources */,
 			);

V2rayU/App/App.swift

@@ -67,7 +67,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             AppState.shared.appDidLaunch()
 
             // 检查并迁移旧版数据（首次启动时）
-            await LegacyMigrationHandler.shared.checkAndPromptForMigration()
+            _ = await LegacyMigrationHandler.shared.checkAndPromptForMigration()
         }
     }
 

V2rayU/App/AppMenu.swift

@@ -10,8 +10,72 @@ import SwiftUI
 import Combine
 import KeyboardShortcuts
 
+final class PingMenuItemView: NSView {
+    private let titleField = NSTextField(labelWithString: "")
+    private let clickHandler: () -> Void
+    private var trackingAreaRef: NSTrackingArea?
+
+    init(title: String, clickHandler: @escaping () -> Void) {
+        self.clickHandler = clickHandler
+        super.init(frame: NSRect(x: 0, y: 0, width: 240, height: 22))
+
+        wantsLayer = true
+        layer?.cornerRadius = 4
+
+        titleField.stringValue = title
+        titleField.font = .menuFont(ofSize: 0)
+        titleField.textColor = .labelColor
+        titleField.backgroundColor = .clear
+        titleField.isBordered = false
+        titleField.isEditable = false
+        titleField.lineBreakMode = .byTruncatingTail
+        titleField.translatesAutoresizingMaskIntoConstraints = false
+
+        addSubview(titleField)
+        NSLayoutConstraint.activate([
+            // 对齐系统菜单项文本起始位置，给左侧预留勾选/图标槽位
+            titleField.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 24),
+            titleField.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -12),
+            titleField.centerYAnchor.constraint(equalTo: centerYAnchor),
+        ])
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func updateTrackingAreas() {
+        super.updateTrackingAreas()
+        if let trackingAreaRef {
+            removeTrackingArea(trackingAreaRef)
+        }
+        let options: NSTrackingArea.Options = [.activeAlways, .mouseEnteredAndExited, .inVisibleRect]
+        let trackingArea = NSTrackingArea(rect: bounds, options: options, owner: self, userInfo: nil)
+        addTrackingArea(trackingArea)
+        trackingAreaRef = trackingArea
+    }
+
+    override func mouseEntered(with event: NSEvent) {
+        layer?.backgroundColor = NSColor.selectedContentBackgroundColor.withAlphaComponent(0.18).cgColor
+    }
+
+    override func mouseExited(with event: NSEvent) {
+        layer?.backgroundColor = NSColor.clear.cgColor
+    }
+
+    override func mouseDown(with event: NSEvent) {
+        clickHandler()
+    }
+
+    func updateTitle(_ title: String) {
+        titleField.stringValue = title
+        needsDisplay = true
+    }
+}
+
 @MainActor
-final class AppMenuManager: NSObject {
+final class AppMenuManager: NSObject, NSMenuDelegate {
     static let shared = AppMenuManager()
 
     let versionController = AppVersionController()
@@ -28,6 +92,8 @@ final class AppMenuManager: NSObject {
     private var viewErrorLogItem: NSMenuItem!
     private var viewLogFilesItem: NSMenuItem!
     private var clearLogsItem: NSMenuItem!
+    private var logsItem: NSMenuItem!
+    private var logsSubMenu: NSMenu!
     private var pacModeItem: NSMenuItem!
     private var tunnelModeItem: NSMenuItem!
     private var globalModeItem: NSMenuItem!
@@ -51,15 +117,17 @@ final class AppMenuManager: NSObject {
     private var helpItem: NSMenuItem!
     private var quitItem: NSMenuItem!
     private var pingTip: String = ""
+    private var pingItemView: PingMenuItemView!
     private let pingTipSubject = PassthroughSubject<String, Never>()
     private var cancellables = Set<AnyCancellable>()
+    private weak var statusMenu: NSMenu?
 
     override private init() {
         super.init()
         pingTipSubject // 500毫秒刷新一下,避免很多时一直刷新UI
             .throttle(for: .milliseconds(500), scheduler: DispatchQueue.main, latest: true)
             .sink { [weak self] tip in
-                self?.pingItem?.title = String(localized: .LatencyTest) + " \(tip)"
+                self?.setPingMenuTitle(tip: tip)
             }
             .store(in: &cancellables)
 
@@ -194,7 +262,7 @@ final class AppMenuManager: NSObject {
             return
         }
         // coreStatusItem 使用 SwiftUI CoreStatusItemView 自动观察 AppState，无需手动更新 title
-        pingItem?.title = String(localized: .LatencyTest) + " \(self.pingTip)"
+        setPingMenuTitle(tip: self.pingTip)
         diagnosticsItem?.title = String(localized: .Diagnostics)
         toggleCoreItem?.title = AppState.shared.v2rayTurnOn ? String(localized: .TurnCoreOff) : String(localized: .TurnCoreOn)
         viewConfigItem?.title = String(localized: .ViewConfigJson)
@@ -203,6 +271,7 @@ final class AppMenuManager: NSObject {
         viewErrorLogItem?.title = String(localized: .ViewErrorLog)
         viewLogFilesItem?.title = String(localized: .ViewLogFiles)
         clearLogsItem?.title = String(localized: .ClearAllLogs)
+        logsItem?.title = String(localized: .Logs)
         pacModeItem?.title = String(localized: .PacMode)
         globalModeItem?.title = String(localized: .GlobalMode)
         manualModeItem?.title = String(localized: .ManualMode)
@@ -238,31 +307,33 @@ final class AppMenuManager: NSObject {
         viewErrorLogItem = NSMenuItem(title: String(localized: .ViewErrorLog), action: #selector(openErrorLogs), keyEquivalent: "")
         viewLogFilesItem = NSMenuItem(title: String(localized: .ViewLogFiles), action: #selector(openLogFiles), keyEquivalent: "")
         clearLogsItem = NSMenuItem(title: String(localized: .ClearAllLogs), action: #selector(clearLogs), keyEquivalent: "")
+        logsItem = getLogsItem()
         // 配置查看
         menu.addItem(toggleCoreItem)
         menu.addItem(NSMenuItem.separator())
         menu.addItem(viewConfigItem)
         menu.addItem(viewPacItem)
-        menu.addItem(viewLogItem)
-        menu.addItem(viewErrorLogItem)
-        menu.addItem(viewLogFilesItem)
-        menu.addItem(clearLogsItem)
         menu.addItem(NSMenuItem.separator())
         // 模式切换
         pacModeItem = getRunModeItem(mode: .pac, title: String(localized: .PacMode), keyEquivalent: "")
         globalModeItem = getRunModeItem(mode: .global, title: String(localized: .GlobalMode), keyEquivalent: "")
         manualModeItem = getRunModeItem(mode: .manual, title: String(localized: .ManualMode), keyEquivalent: "")
         tunnelModeItem = getRunModeItem(mode: .tun, title: String(localized: .TunnelMode), keyEquivalent: "")
+        menu.addItem(pacModeItem)
         menu.addItem(tunnelModeItem)
         menu.addItem(globalModeItem)
         menu.addItem(manualModeItem)
-        menu.addItem(pacModeItem)
         menu.addItem(NSMenuItem.separator())
         // 路由与服务器
         routingItem = getRoutingItem()
         serverItem = getServerItem()
         // 预先初始化一次
-        pingItem = NSMenuItem(title: String(localized: .LatencyTest) + "\(self.pingTip)", action: #selector(pingSpeed), keyEquivalent: "")
+        pingItem = NSMenuItem()
+        pingItemView = PingMenuItemView(title: String(localized: .LatencyTest)) { [weak self] in
+            self?.showPingTestingState()
+            self?.pingSpeedTest()
+        }
+        pingItem.view = pingItemView
         diagnosticsItem = NSMenuItem(title: String(localized: .Diagnostics), action: #selector(openDiagnostics), keyEquivalent: "")
         menu.addItem(NSMenuItem.separator())
         menu.addItem(routingItem)
@@ -295,6 +366,7 @@ final class AppMenuManager: NSObject {
         // 设置与帮助
         checkForUpdatesItem = NSMenuItem(title: String(localized: .CheckForUpdates)+" (V2rayU v\(appVersion))", action: #selector(checkForUpdate), keyEquivalent: "")
         helpItem = NSMenuItem(title: String(localized: .Help)+" (Xray-core \(getCoreShortVersion()))", action: #selector(goHelp), keyEquivalent: "")
+        menu.addItem(logsItem)
         menu.addItem(checkForUpdatesItem)
         menu.addItem(helpItem)
         menu.addItem(NSMenuItem.separator())
@@ -307,9 +379,21 @@ final class AppMenuManager: NSObject {
             item.target = self
         }
 
+        menu.delegate = self
         statusItem.menu = menu
+        statusMenu = menu
         self.inited = true
     }
+
+    private func setPingMenuTitle(tip: String) {
+        pingTip = tip
+        guard let pingItem else { return }
+        let suffix = tip.isEmpty ? "" : " \(tip)"
+        let title = String(localized: .LatencyTest) + suffix
+        pingItem.title = title
+        pingItemView?.updateTitle(title)
+        statusMenu?.itemChanged(pingItem)
+    }
 
     func getCoreStatusItem() -> NSMenuItem {
         // 使用 SwiftUI 视图替换原始的 title-only 菜单项，CoreStatusItemView 会观察 AppState 自动刷新
@@ -323,6 +407,24 @@ final class AppMenuManager: NSObject {
         item.isEnabled = false
         return item
     }
+
+    func getLogsItem() -> NSMenuItem {
+        viewLogItem.target = self
+        viewErrorLogItem.target = self
+        viewLogFilesItem.target = self
+        clearLogsItem.target = self
+
+        logsSubMenu = NSMenu()
+        logsSubMenu.addItem(viewLogItem)
+        logsSubMenu.addItem(viewErrorLogItem)
+        logsSubMenu.addItem(viewLogFilesItem)
+        logsSubMenu.addItem(NSMenuItem.separator())
+        logsSubMenu.addItem(clearLogsItem)
+
+        let item = NSMenuItem(title: String(localized: .Logs), action: nil, keyEquivalent: "")
+        item.submenu = logsSubMenu
+        return item
+    }
 
     func getRoutingItem() -> NSMenuItem {
         // 获取子菜单
@@ -482,6 +584,16 @@ final class AppMenuManager: NSObject {
         }
     }
 
+    func showPingTestingState() {
+        setPingMenuTitle(tip: " - " + String(localized: .Testing) + "...")
+    }
+
+    func menuNeedsUpdate(_ menu: NSMenu) {
+        if menu === statusMenu {
+            setPingMenuTitle(tip: pingTip)
+        }
+    }
+
     func importFromPasteboard() {
         if let uri = NSPasteboard.general.string(forType: .string), uri.count > 0 {
             importUri(url: uri)
@@ -644,11 +756,6 @@ final class AppMenuManager: NSObject {
     @objc private func ImportFromPasteboard(_ sender: NSMenuItem) {
         importFromPasteboard()
     }
-
-    @objc private func pingSpeed(_ sender: NSMenuItem) {
-        pingSpeedTest()
-    }
-
     @objc private func viewConfig(_ sender: Any) {
         openConfigFile()
     }

V2rayU/App/AppState.swift

@@ -197,14 +197,15 @@ final class AppState: ObservableObject {
     }
 
     // MARK: - 切换配置
-    func switchServer(uuid: String) async {
-        runningProfile = uuid
-        v2rayTurnOn = true
-        await setCoreRunning(v2rayTurnOn)
-        runningServer = ProfileStore.shared.getRunning()
-        logger.info("switchServer-end: \(self.runningProfile)")
-        AppMenuManager.shared.refreshServerItems()
-    }
+    func switchServer(uuid: String) async {
+        runningProfile = uuid
+        v2rayTurnOn = true
+        await setCoreRunning(v2rayTurnOn)
+        runningServer = ProfileStore.shared.getRunning()
+        latency = Double(runningServer?.speed ?? 0)
+        logger.info("switchServer-end: \(self.runningProfile)")
+        AppMenuManager.shared.refreshServerItems()
+    }
 
     // MARK: - App 启动时调用
     func appDidLaunch() {
@@ -213,17 +214,19 @@ final class AppState: ObservableObject {
         startHttpServer()
 
         // 同步运行中的服务器配置
-        if let running = ProfileStore.shared.getRunning() {
-            if runningProfile != running.uuid {
-                runningProfile = running.uuid
-                logger.info("appDidLaunch: sync server to \(running.remark)")
-            }
-            runningServer = running
-        } else {
-            runningProfile = ""
-            runningServer = nil
-            logger.info("appDidLaunch: no available server")
-        }
+        if let running = ProfileStore.shared.getRunning() {
+            if runningProfile != running.uuid {
+                runningProfile = running.uuid
+                logger.info("appDidLaunch: sync server to \(running.remark)")
+            }
+            runningServer = running
+            latency = Double(running.speed)
+        } else {
+            runningProfile = ""
+            runningServer = nil
+            latency = 0
+            logger.info("appDidLaunch: no available server")
+        }
 
         // 同步运行中的路由配置
         let routingManager = RoutingManager()

V2rayU/Core/Database/Protocol.swift

@@ -129,7 +129,7 @@ extension StoreProtocol {
     func fetchAll() -> [Entity] {
         do {
             return try dbReader.read { db in
-                try Entity.fetchAll(db)
+                try Entity.order(Column("sort").asc).fetchAll(db)
             }
         } catch {
             logger.error("fetchAll error: \(error)")

V2rayU/Core/Handlers/CoreConfigHandler.swift

@@ -36,10 +36,10 @@ class CoreConfigHandler {
 extension ProfileEntity {
     func AdaptCore() -> CoreType {
         var mode: CoreType = .XrayCore
-        if self.network == .grpc || self.network == .h2 || self.network == .ws {
+        if self.protocol == .vless && (self.network == .grpc || self.network == .h2 || self.network == .ws) {
             mode = .SingBox
         }
-        logger.info("AdaptCore: \(self.network.rawValue) -> \(mode.rawValue)")
+        logger.info("AdaptCore: \(self.protocol.rawValue)/\(self.network.rawValue) -> \(mode.rawValue)")
         return mode
     }
 

V2rayU/Core/Handlers/CoreStatsHandler.swift

@@ -32,7 +32,6 @@ actor CoreTrafficStatsHandler {
             switch coreType {
             case .SingBox:
                 ClashApiStreamHandler.shared.startTask()
-                await ClashApilatencyHandler.shared.startTask()
             case .XrayCore:
                 await XrayApiStatsHandler.shared.startTask()
             }
@@ -42,7 +41,6 @@ actor CoreTrafficStatsHandler {
     func stopTask() {
         Task {
             ClashApiStreamHandler.shared.stopTask()
-            await ClashApilatencyHandler.shared.stopTask()
             await XrayApiStatsHandler.shared.stopTask()
         }
     }
@@ -138,7 +136,6 @@ actor XrayApiStatsHandler: NSObject {
             decoder.dateDecodingStrategy = .iso8601 // 解析日期
             // try decode data
             let vars: V2rayMetricsVars = try decoder.decode(V2rayMetricsVars.self, from: jsonData)
-            var latency = 0.0
             var directUpLink = 0
             var directDownLink = 0
             var proxyUpLink = 0
@@ -147,9 +144,6 @@ actor XrayApiStatsHandler: NSObject {
                 logger.warning("Invalid V2Ray Stats")
                 return
             }
-            if let latencyValue = vars.observatory?["proxy"] {
-                latency = latencyValue.delay
-            }
             if let directUpLinkValue = stats.outbound["direct"] {
                 directUpLink = directUpLinkValue.uplink
                 directDownLink = directUpLinkValue.downlink
@@ -158,6 +152,7 @@ actor XrayApiStatsHandler: NSObject {
                 proxyUpLink = proxyUpLinkValue.uplink
                 proxyDownLink = proxyUpLinkValue.downlink
             }
+            let latency = await AppState.shared.latency
             await CoreTrafficStatsHandler.shared.setSpeed(latency: latency, directUpLink: directUpLink, directDownLink: directDownLink, proxyUpLink: proxyUpLink, proxyDownLink: proxyDownLink)
 //            logger.info("Parsed V2Ray Stats: \(stats)")
         } catch {
@@ -206,7 +201,7 @@ actor ClashApilatencyHandler: NSObject {
 
 }
 
-final class ClashApiStreamHandler: NSObject, URLSessionDataDelegate {
+final class ClashApiStreamHandler: NSObject, URLSessionDataDelegate, @unchecked Sendable {
     static let shared = ClashApiStreamHandler()
 
     private var clashApiSession: URLSession!