dns和tester相关日志优化。

packages/mitmproxy/src/lib/dns/index.js

@@ -8,11 +8,17 @@ module.exports = {
     const dnsMap = {}
     for (const provider in dnsProviders) {
       const conf = dnsProviders[provider]
+
       if (conf.type === 'ipaddress') {
         dnsMap[provider] = new DNSOverIpAddress(conf.server)
-        continue
+      } else if (conf.type === 'https') {
+        dnsMap[provider] = new DNSOverHTTPS(conf.server, preSetIpList)
+      } else {
+        dnsMap[provider] = new DNSOverTLS(conf.server)
       }
-      dnsMap[provider] = conf.type === 'https' ? new DNSOverHTTPS(conf.server, preSetIpList) : new DNSOverTLS(conf.server)
+
+      // 设置DNS名称到name属性中
+      dnsMap[provider].name = provider
     }
     return dnsMap
   },

packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js

@@ -34,6 +34,7 @@ module.exports = function createConnectHandler (sslConnectInterceptor, middlewar
     // eslint-disable-next-line node/no-deprecated-api
     const { hostname, port } = url.parse(`https://${req.url}`)
     if (isSslConnect(sslConnectInterceptors, req, cltSocket, head)) {
+      // 需要拦截，代替目标服务器，让客户端连接DS在本地启动的代理服务
       fakeServerCenter.getServerPromise(hostname, port).then((serverObj) => {
         log.info('--- fakeServer connect', hostname)
         connect(req, cltSocket, head, localIP, serverObj.port)
@@ -41,7 +42,7 @@ module.exports = function createConnectHandler (sslConnectInterceptor, middlewar
         log.error('getServerPromise', e)
       })
     } else {
-      log.info('不拦截请求：', hostname)
+      log.info(`未匹配到任何 sslConnectInterceptors，不拦截请求，直接连接目标服务器: ${hostname}:${port}`)
       connect(req, cltSocket, head, hostname, port, dnsConfig/*, sniRegexpMap */)
     }
   }
@@ -66,19 +67,20 @@ function connect (req, cltSocket, head, hostname, port, dnsConfig/* , sniRegexpM
         options.lookup = (hostname, options, callback) => {
           const tester = speedTest.getSpeedTester(hostname)
           if (tester) {
-            const ip = tester.pickFastAliveIp()
+            const aliveIpObj = tester.pickFastAliveIpObj()
-            if (ip) {
+            if (aliveIpObj) {
-              log.info(`-----${hostname} use alive ip:${ip}-----`)
+              log.info(`----- connect: ${hostname}:${port}, use alive ip from dns '${aliveIpObj.dns}': ${aliveIpObj.host} -----`)
-              callback(null, ip, 4)
+              callback(null, aliveIpObj.host, 4)
               return
             }
           }
           dns.lookup(hostname).then(ip => {
             isDnsIntercept = { dns, hostname, ip }
             if (ip !== hostname) {
-              log.info(`-----${hostname} use ip:${ip}-----`)
+              log.info(`---- connect: ${hostname}:${port}, use ip from dns '${dns.name}': ${ip} ----`)
               callback(null, ip, 4)
             } else {
+              log.info(`----- connect: ${hostname}:${port}, use hostname: ${hostname} -----`)
               defaultDns.lookup(hostname, options, callback)
             }
           })

packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js

@@ -118,17 +118,17 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
               rOptions.lookup = (hostname, options, callback) => {
                 const tester = speedTest.getSpeedTester(hostname)
                 if (tester) {
-                  const ip = tester.pickFastAliveIp()
+                  const aliveIpObj = tester.pickFastAliveIpObj()
-                  if (ip) {
+                  if (aliveIpObj) {
-                    log.info(`----- hostname: ${hostname}, use alive ip: ${ip} -----`)
+                    log.info(`----- request url: ${url}, use alive ip from dns '${aliveIpObj.dns}': ${aliveIpObj.host} -----`)
-                    callback(null, ip, 4)
+                    callback(null, aliveIpObj.host, 4)
                     return
                   }
                 }
                 dns.lookup(hostname).then(ip => {
                   isDnsIntercept = { dns, hostname, ip }
                   if (ip !== hostname) {
-                    log.info(`---- request url: ${url}, use ip: ${ip} ----`)
+                    log.info(`---- request url: ${url}, use ip from dns '${dns.name}': ${ip} ----`)
                     callback(null, ip, 4)
                   } else {
                     log.info(`---- request url: ${url}, use hostname: ${hostname} ----`)

packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js

@@ -63,7 +63,7 @@ module.exports = class FakeServersCenter {
           SNICallback: (hostname, done) => {
             (async () => {
               const certObj = await this.certAndKeyContainer.getCertPromise(hostname, port)
-              log.info('sni callback:', hostname)
+              log.info(`sni callback: ${hostname}:${port}`)
               done(null, tls.createSecureContext({
                 key: pki.privateKeyToPem(certObj.key),
                 cert: pki.certificateToPem(certObj.cert)

packages/mitmproxy/src/lib/speed/SpeedTester.js

@@ -21,13 +21,13 @@ class SpeedTester {
     this.test()
   }
 
-  pickFastAliveIp () {
+  pickFastAliveIpObj () {
     this.touch()
     if (this.alive.length === 0) {
-      this.test()
+      this.test() // 异步
       return null
     }
-    return this.alive[0].host
+    return this.alive[0]
   }
 
   touch () {