From e2caf406fd808e5fbbd20b6d78ffff0f9c4e5b3d Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 26 Mar 2021 00:21:48 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20speed=20test=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/config/index.js               | 12 ++++++------
 packages/gui/src/view/pages/index.vue           |  1 +
 packages/mitmproxy/src/lib/speed/SpeedTester.js |  4 +++-
 packages/mitmproxy/src/lib/speed/index.js       |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/config/index.js b/packages/core/src/config/index.js
index d25b1051..005baa92 100644
--- a/packages/core/src/config/index.js
+++ b/packages/core/src/config/index.js
@@ -152,11 +152,11 @@ module.exports = {
           server: 'https://dns.alidns.com/dns-query',
           cacheSize: 1000
         },
-        ipaddress: {
-          type: 'ipaddress',
-          server: 'ipaddress',
-          cacheSize: 1000
-        },
+        // ipaddress: {
+        //   type: 'ipaddress',
+        //   server: 'ipaddress',
+        //   cacheSize: 1000
+        // },
         usa: {
           type: 'https',
           server: 'https://1.1.1.1/dns-query',
@@ -192,7 +192,7 @@ module.exports = {
         '*.githubusercontent.com': 'usa',
         '*.githubassets.com': 'usa',
         // "解决push的时候需要输入密码的问题",
-        'github.com': 'usa',
+        'github.com': 'quad9',
         '*github.com': 'usa',
         '*.vuepress.vuejs.org': 'usa',
         'gh.docmirror.top': 'usa'
diff --git a/packages/gui/src/view/pages/index.vue b/packages/gui/src/view/pages/index.vue
index fcd3c9ff..68843b58 100644
--- a/packages/gui/src/view/pages/index.vue
+++ b/packages/gui/src/view/pages/index.vue
@@ -25,6 +25,7 @@
             <img v-if="!startup.loading && status.server.enabled" width="50" src="/logo/logo-fff.svg">
           </a-button>
           <div style="margin-top: 10px">{{ status.server.enabled ? '已开启' : '已关闭' }}</div>
+
         </div>
       </div>
       <div :span="12">
diff --git a/packages/mitmproxy/src/lib/speed/SpeedTester.js b/packages/mitmproxy/src/lib/speed/SpeedTester.js
index 4adf15ba..293eb225 100644
--- a/packages/mitmproxy/src/lib/speed/SpeedTester.js
+++ b/packages/mitmproxy/src/lib/speed/SpeedTester.js
@@ -80,7 +80,9 @@ class SpeedTester {
   }
 
   async test () {
-    this.backupList = await this.getIpListFromDns(this.dnsMap)
+    const newList = await this.getIpListFromDns(this.dnsMap)
+    const newBackupList = [...newList, ...this.backupList]
+    this.backupList = _.unionBy(newBackupList, 'host')
     log.info('[speed]', this.hostname, ' ips:', this.backupList)
     await this.testBackups()
     if (config.notify) {
diff --git a/packages/mitmproxy/src/lib/speed/index.js b/packages/mitmproxy/src/lib/speed/index.js
index 66c730ef..ee834b97 100644
--- a/packages/mitmproxy/src/lib/speed/index.js
+++ b/packages/mitmproxy/src/lib/speed/index.js
@@ -16,7 +16,7 @@ function initSpeedTest ({ enabled, hostnameList, dnsMap }) {
     SpeedTestPool[hostname] = new SpeedTester({ hostname })
   })
 
-  log.info('[speed] dnsMap', dnsMap)
+  log.info('[speed] enabled')
 }
 
 function getAllSpeedTester () {