refactor: ~

packages/gui/src/view/App.vue

@@ -36,7 +36,7 @@
         </a-layout-content>
         <a-layout-footer>
           <div class="footer">
-            ©2020 docmirror.cn
+            ©2020-2021 docmirror.cn by Greper
           </div>
         </a-layout-footer>
       </a-layout>

packages/gui/src/view/pages/index.vue

@@ -31,7 +31,7 @@
             </a-radio-button>
           </a-tooltip>
           <a-tooltip placement="topLeft" title="关闭测速，启用增强，启用拦截（敏感原因，默认关闭，感兴趣的话可以私下交流）">
-            <a-radio-button :disabled="!this.setting.overwall" value="ow">
+            <a-radio-button value="ow">
               增强模式
             </a-radio-button>
           </a-tooltip>
@@ -160,7 +160,7 @@ export default {
     console.log('index mounted')
   },
   methods: {
-    async modeChange () {
+    async modeChange (event) {
       const mode = this.config.app.mode
       if (mode === 'safe') {
         this.config.server.intercept.enabled = false
@@ -171,6 +171,11 @@ export default {
         this.config.server.dns.speedTest.enabled = false
         this.config.plugin.overwall.enabled = false
       } else if (mode === 'ow') {
+        console.log('event', event)
+        if (!this.setting.overwall) {
+          this.wantOW()
+          return
+        }
         this.config.server.intercept.enabled = true
         this.config.server.dns.speedTest.enabled = false
         this.config.plugin.overwall.enabled = true
@@ -182,6 +187,16 @@ export default {
         return this.$api.server.restart()
       }
     },
+    wantOW () {
+      this.$success({
+        title: '来找我吧',
+        content: (
+          <div>
+            敏感原因，我关闭了它，如果你对此功能感兴趣，你可以尝试找一找它，我把打开的方法藏在了源码里（线索提示 // TODO）
+          </div>
+        )
+      })
+    },
     doCheckRootCa () {
       this.$api.setting.load().then(setting => {
         console.log('setting', setting)

packages/mitmproxy/package.json

@@ -32,7 +32,8 @@
     "through2": "^2.0.1",
     "tunnel-agent": "^0.4.3",
     "util": "^0.12.3",
-    "validator": "^13.1.17"
+    "validator": "^13.1.17",
+    "stream-throttle": "^0.1.3"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",

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

@@ -126,33 +126,6 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
                   }
                 })
               }
-              // if (rOptions.agent) {
-              //   const lookup2 = (hostname, options, callback) => {
-              //     const tester = speedTest.getSpeedTester(hostname)
-              //     if (tester) {
-              //       const ip = tester.pickFastAliveIp()
-              //       if (ip) {
-              //         log.info(`-----${hostname} use alive ip from agent:${ip}-----`)
-              //         callback(null, ip, 4)
-              //         return
-              //       }
-              //     }
-              //     dns.lookup(hostname).then(ip => {
-              //       isDnsIntercept = { dns, hostname, ip }
-              //       if (ip !== hostname) {
-              //         log.info(`----request url :${url},use ip from agent :${ip}----`)
-              //         callback(null, ip, 4)
-              //       } else {
-              //         log.info(`request url :${url},use hostname :${hostname}`)
-              //         defaultDns.lookup(hostname, options, callback)
-              //       }
-              //     })
-              //   }
-              //   if (rOptions.agent.options) {
-              //     rOptions.agent.options.lookup = lookup2
-              //   }
-              //   rOptions.agent.lookup = lookup2
-              // }
             }
           }
 

packages/mitmproxy/yarn.lock

@@ -2003,7 +2003,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.20.0, commander@^2.9.0:
+commander@^2.2.0, commander@^2.20.0, commander@^2.9.0:
   version "2.20.3"
   resolved "https://registry.npm.taobao.org/commander/download/commander-2.20.3.tgz?cache=0&sync_timestamp=1603599636161&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha1-/UhehMA+tIgcIHIrpIA16FMa6zM=
@@ -3797,6 +3797,11 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+limiter@^1.0.5:
+  version "1.1.5"
+  resolved "https://registry.npm.taobao.org/limiter/download/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
+  integrity sha1-j5KiWzsWxhMSk6DMg0tKg4oqp8I=
+
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.npm.taobao.org/lines-and-columns/download/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -5286,6 +5291,14 @@ stream-shift@^1.0.0:
   resolved "https://registry.npm.taobao.org/stream-shift/download/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha1-1wiCgVWasneEJCebCHfaPDktWj0=
 
+stream-throttle@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.npm.taobao.org/stream-throttle/download/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3"
+  integrity sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM=
+  dependencies:
+    commander "^2.2.0"
+    limiter "^1.0.5"
+
 streamroller@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-2.2.4.tgz#c198ced42db94086a6193608187ce80a5f2b0e53"