From 827feac5e4e382f32edfc8eca94732b92ae7c5ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Sun, 1 Sep 2024 09:51:19 +0800
Subject: [PATCH] =?UTF-8?q?IP=E6=B5=8B=E9=80=9F=EF=BC=9A=E6=B5=8B=E9=80=9F?=
 =?UTF-8?q?IP=E5=90=8E=E9=9D=A2=E7=9B=B4=E6=8E=A5=E6=98=BE=E7=A4=BADNS?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=9B=E6=B5=8B=E9=80=9F=E6=9C=AA=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84IP=E5=8D=B4=E6=8E=92=E5=9C=A8=E5=89=8D?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/gui/src/view/pages/server.vue          |  4 ++--
 packages/mitmproxy/src/lib/speed/SpeedTester.js | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/gui/src/view/pages/server.vue b/packages/gui/src/view/pages/server.vue
index cc68cae..db49d97 100644
--- a/packages/gui/src/view/pages/server.vue
+++ b/packages/gui/src/view/pages/server.vue
@@ -200,8 +200,8 @@
                     <a-icon v-else type="info-circle"/>
                   </a>
                   <a-tag style="margin:2px;" v-for="(element,index) of item.backupList" :title="element.dns"
-                         :color="element.time?'green':'red'" :key='index'>{{ element.host }}
-                    {{ element.time }}{{ element.time ? 'ms' : '' }}
+                         :color="element.time?'green':'red'" :key='index'>
+                    {{ element.host }} {{ element.time }}{{ element.time ? 'ms' : '' }} {{ element.dns }}
                   </a-tag>
                 </a-card>
               </a-col>
diff --git a/packages/mitmproxy/src/lib/speed/SpeedTester.js b/packages/mitmproxy/src/lib/speed/SpeedTester.js
index a93ca58..8fcc1e7 100644
--- a/packages/mitmproxy/src/lib/speed/SpeedTester.js
+++ b/packages/mitmproxy/src/lib/speed/SpeedTester.js
@@ -111,7 +111,18 @@ class SpeedTester {
       _.merge(item, ret)
       aliveList.push({ ...ret, ...item })
       aliveList.sort((a, b) => a.time - b.time)
-      this.backupList.sort((a, b) => a.time - b.time)
+      this.backupList.sort((a, b) => {
+        if (a.time === b.time) {
+          return 0
+        }
+        if (a.time == null) {
+          return 1
+        }
+        if (b.time == null) {
+          return -1
+        }
+        return a.time - b.time
+      })
     } catch (e) {
       if (e.message !== 'timeout') {
         log.warn('[speed] test error:  ', this.hostname, `➜ ${item.host}:${item.port} from DNS '${item.dns}'`, ', errorMsg:', e.message)