From 006420e06e696dbd92de695ea43a9e8e3651d614 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 24 Mar 2021 14:18:27 +0800
Subject: [PATCH] feat: rubyfish dns

---
 packages/core/src/config/index.js             |  7 +++++-
 .../mitmproxy/src/lib/speed/SpeedTester.js    |  2 +-
 packages/mitmproxy/test/dnsSpeed.js           | 19 +++++++++------
 packages/mitmproxy/test/dnsTest.mjs           | 24 ++++++++++++++++++-
 4 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/packages/core/src/config/index.js b/packages/core/src/config/index.js
index 3df78eed..36bb2889 100644
--- a/packages/core/src/config/index.js
+++ b/packages/core/src/config/index.js
@@ -166,6 +166,11 @@ module.exports = {
           type: 'https',
           server: 'https://9.9.9.9/dns-query',
           cacheSize: 1000
+        },
+        rubyfish: {
+          type: 'https',
+          server: 'https://rubyfish.cn/dns-query',
+          cacheSize: 1000
         }
         // google: {
         //   type: 'https',
@@ -194,7 +199,7 @@ module.exports = {
       },
       speedTest: {
         hostnameList: ['github.com'],
-        dnsProviders: ['usa', 'quad9']
+        dnsProviders: ['usa', 'quad9', 'rubyfish']
       }
     }
   },
diff --git a/packages/mitmproxy/src/lib/speed/SpeedTester.js b/packages/mitmproxy/src/lib/speed/SpeedTester.js
index 1b31e9e2..b40bc898 100644
--- a/packages/mitmproxy/src/lib/speed/SpeedTester.js
+++ b/packages/mitmproxy/src/lib/speed/SpeedTester.js
@@ -81,7 +81,7 @@ class SpeedTester {
   async test () {
     this.backupList = await this.getIpListFromDns(this.dnsMap)
     log.info('[speed]', this.hostname, ' ips:', this.backupList)
-    this.testBackups()
+    await this.testBackups()
   }
 
   async testBackups () {
diff --git a/packages/mitmproxy/test/dnsSpeed.js b/packages/mitmproxy/test/dnsSpeed.js
index 9e029968..f0030e9c 100644
--- a/packages/mitmproxy/test/dnsSpeed.js
+++ b/packages/mitmproxy/test/dnsSpeed.js
@@ -3,22 +3,27 @@ const SpeedTest = require('../src/lib/speed/index.js')
 const dns = require('../src/lib/dns/index.js')
 
 const dnsMap = dns.initDNS({
-  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',
     cacheSize: 1000
   }
-  // google: {
+  // py233: { //污染
+  //   type: 'https',
+  //   server: ' https://i.233py.com/dns-query',
+  //   cacheSize: 1000
+  // }
+  // google: { //不可用
   //   type: 'https',
   //   server: 'https://8.8.8.8/dns-query',
   //   cacheSize: 1000
   // },
-  // dnsSB: {
+  // dnsSB: { //不可用
   //   type: 'https',
   //   server: 'https://doh.dns.sb/dns-query',
   //   cacheSize: 1000
diff --git a/packages/mitmproxy/test/dnsTest.mjs b/packages/mitmproxy/test/dnsTest.mjs
index 1a453efb..f344b032 100644
--- a/packages/mitmproxy/test/dnsTest.mjs
+++ b/packages/mitmproxy/test/dnsTest.mjs
@@ -20,7 +20,29 @@ const dnsProviders = dns.initDNS({
     type: 'https',
     server: 'https://9.9.9.9/dns-query',
     cacheSize: 1000
+  },
+  rubyfish: {
+    type: 'https',
+    server: 'https://rubyfish.cn/dns-query',
+    cacheSize: 1000
+  },
+  py233: {
+    type: 'https',
+    server: ' https://i.233py.com/dns-query',
+    cacheSize: 1000
   }
+
+  // sb: {
+  //   type: 'https',
+  //   server: 'https://doh.dns.sb/dns-query',
+  //   cacheSize: 1000
+  // },
+  // adguard: {
+  //   type: 'https',
+  //   server: ' https://dns.adguard.com/dns-query',
+  //   cacheSize: 1000
+  // }
+
 })
 
 // const test = '111<tr><th>IP Address</th><td><ul class="comma-separated"><li>140.82.113.4</li></ul></td></tr>2222'
@@ -34,7 +56,7 @@ const hostname0 = 'github.com'
 // console.log('first')
 // dnsProviders.usa.lookup(hostname0)
 console.log('test')
-dnsProviders.quad9.lookup(hostname0)
+dnsProviders.py233.lookup(hostname0)
 // dnsProviders.usa.lookup(hostname0)
 // dnsProviders.ipaddress.lookup(hostname0)
 // dnsProviders.ipaddress.lookup(hostname0)