From 97cc81ef96ac53ced34fcf4fb2d7e0e0b558359f Mon Sep 17 00:00:00 2001
From: ChanningKuo <channingkuo@icloud.com>
Date: Thu, 20 Mar 2025 15:16:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E5=BB=B6=E8=BF=9F?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=AB=8B=E9=A9=AC=E5=8F=8D=E9=A6=88=E5=88=B0?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/ProxyGroupSpeedTestMenuItem.swift   | 54 +++++++++++++------
 ClashX/Views/ProxyMenuItem.swift              |  2 +-
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/ClashX/Views/ProxyGroupSpeedTestMenuItem.swift b/ClashX/Views/ProxyGroupSpeedTestMenuItem.swift
index 969cf6cc8..f067a1853 100644
--- a/ClashX/Views/ProxyGroupSpeedTestMenuItem.swift
+++ b/ClashX/Views/ProxyGroupSpeedTestMenuItem.swift
@@ -94,27 +94,49 @@ private class ProxyGroupSpeedTestMenuItemView: MenuItemBaseView {
         enclosingMenuItem?.isEnabled = false
         setNeedsDisplay()
 
-        ApiRequest.getGroupDelay(groupName: group.name) {
-            [weak self] delays in
-            guard let self = self, let menu = self.enclosingMenuItem else { return }
-
-            group.all?.forEach { proxyName in
+        // Create a dispatch group to track all proxy tests
+        let dispatchGroup = DispatchGroup()
+        
+        // Start testing each proxy individually
+        group.all?.forEach { proxyName in
+            dispatchGroup.enter()
+            
+            ApiRequest.getProxyDelay(proxyName: proxyName) { delay in
+                defer { dispatchGroup.leave() }
+                
+                guard let menu = self.enclosingMenuItem else { return }
                 var delayStr = NSLocalizedString("fail", comment: "")
-                var delay = 0
-                if let d = delays[proxyName], d != 0 {
-                    delayStr = "\(d) ms"
-                    delay = d
+                var delayValue = 0
+                if delay != 0 {
+                    delayStr = "\(delay) ms"
+                    delayValue = delay
                 }
 
-                NotificationCenter.default.post(
-                    name: .speedTestFinishForProxy,
-                    object: nil,
-                    userInfo: ["proxyName": proxyName,
-                               "delay": delayStr,
-                               "rawValue": delay])
-
+                // Update UI on main thread
+                DispatchQueue.main.async {
+                    // Update menu items directly
+                    if let proxyMenu = menu.submenu {
+                        for item in proxyMenu.items {
+                            if let proxyItem = item as? ProxyMenuItem, proxyItem.proxyName == proxyName {
+                                proxyItem.updateDelay(delayStr, rawValue: delayValue)
+                            }
+                        }
+                    }
+                    
+                    // Post notification for other observers
+                    NotificationCenter.default.post(
+                        name: .speedTestFinishForProxy,
+                        object: nil,
+                        userInfo: ["proxyName": proxyName,
+                                  "delay": delayStr,
+                                  "rawValue": delayValue])
+                }
             }
+        }
 
+        // When all tests are complete
+        dispatchGroup.notify(queue: .main) { [weak self] in
+            guard let self = self, let menu = self.enclosingMenuItem else { return }
             self.label.stringValue = menu.title
             menu.isEnabled = true
             self.setNeedsDisplay()
diff --git a/ClashX/Views/ProxyMenuItem.swift b/ClashX/Views/ProxyMenuItem.swift
index 79ed4826e..2c4fddd31 100644
--- a/ClashX/Views/ProxyMenuItem.swift
+++ b/ClashX/Views/ProxyMenuItem.swift
@@ -95,7 +95,7 @@ class ProxyMenuItem: NSMenuItem {
         }
     }
 
-    private func updateDelay(_ delay: String?, rawValue: Int?) {
+    public func updateDelay(_ delay: String?, rawValue: Int?) {
         if enableShowUsingView {
             (view as? ProxyItemView)?.update(str: delay, value: rawValue)
         } else {