From dad33bc86da1de50b86a70ae112e6611a44e5094 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 26 Mar 2021 13:43:51 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=BB=98=E8=AE=A4=E5=85=B3?= =?UTF-8?q?=E9=97=ADow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 26 ++++++++++++++-- doc/speed.png | Bin 0 -> 37402 bytes packages/core/src/config/index.js | 19 ++++++------ packages/gui/package.json | 2 +- packages/gui/src/view/components/setup-ca.vue | 2 +- packages/gui/src/view/pages/index.vue | 29 +++++++++--------- packages/gui/src/view/pages/server.vue | 2 +- .../proxy/mitmproxy/createRequestHandler.js | 27 ++++++++++++++++ 8 files changed, 76 insertions(+), 31 deletions(-) create mode 100644 doc/speed.png diff --git a/README.md b/README.md index 9c6fa3b..ac14462 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,12 @@ * 某些npm install的时候,并且使用cnpm也无法安装时,可以尝试开启npm代理再试 ### 6、 增强功能 -* 众所周知的原因,不能在这里展示太多,自己下载来安装看看吧 +* 众所周知的原因,不能说太多,怕被查水表,默认关闭,感兴趣的可以私下交流 * 反正开了这个之后,上面那些dns优选什么的特性好像都不香了 -* 建议遇到打不开的网站,可以将域名添加到增强功能自定义域名配置中(注意:是不是似曾相识? (●゚ω゚●)没有注意~~) ***安全警告***: * 请勿使用来源不明的服务地址,有隐私和账号泄露风险 -* 本应用内置服务端承诺不收集任何信息。介意者请慎用。 +* 本应用及服务端承诺不收集任何信息。介意者请使用安全模式。 * 建议自建服务端(增强功能页面右上角点击查看自建服务端方法) ## 快速开始 @@ -92,9 +91,30 @@ |zip 下载 |![](./doc/download-before.png) |![](./doc/download.png)秒下的,实在截不到速度的图 | +## 模式说明(v1.5.0 准备发布) + +### 安全模式 +* 此模式:关闭拦截、关闭增强、开启dns优选、开启测速 +* 最安全,无需安装证书,可以在浏览器地址栏左侧查看域名证书 +* 功能也最弱,只有特性1,相当于查询github的国外ip,手动改hosts一个意思。 +* github的可访问性不稳定,取决于IP测速,如果有绿色ip存在,那就**有可能**可以直连访问。 +![](./doc/speed.png) + +### 默认模式 +* 此模式:开启拦截、关闭增强、开启dns优选、开启测速 +* 需要安装证书 +* 功能上包含特性1/2/3/4。 + +### 增强模式 +* 此模式:开启拦截、开启增强、开启dns优选、关闭测速 +* 需要安装证书 +* 功能上包含特性1/2/3/4/5 +* 由于敏感原因,默认关闭,感兴趣的可以私下交流 + ## 最佳实践 把dev-sidecar一直开着就行了 + 建议遇到打开比较慢的国外网站,可以优先尝试将该域名添加到dns设置中(注意:被GFW封杀的无效) 也可以将域名添加到增强功能的自定义域名配置中,言尽于此。 diff --git a/doc/speed.png b/doc/speed.png new file mode 100644 index 0000000000000000000000000000000000000000..2dcc008135aa0dfa1969a7f21146e38fc230a00f GIT binary patch literal 37402 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 literal 0 HcmV?d00001 diff --git a/packages/core/src/config/index.js b/packages/core/src/config/index.js index 4e733e8..927030b 100644 --- a/packages/core/src/config/index.js +++ b/packages/core/src/config/index.js @@ -53,14 +53,13 @@ module.exports = { 'github' ], desc: 'clone加速复制链接脚本' + }, + '/.*': { + proxy: 'gh.docmirror.top/_proxy', + backup: [ + 'github.com' + ] } - // '/.*': { - // proxy: 'gh.docmirror.top/_proxy', - // backup: [ - // 'github.com' - // ], - // desc: '如果出现dev-sidecar报错,可能是加速地址dns被污染了,需要将本条配置删除' - // } }, 'api.github.com': { '^/_private/browser/stats$': { @@ -117,9 +116,9 @@ module.exports = { backup: ['fonts-gstatic.proxy.ustclug.org'] } }, - // 'clients*.google.com': { '.*': { abort: true } }, - // 'www.googleapis.com': { '.*': { abort: true } }, - // 'lh*.googleusercontent.com': { '.*': { abort: true } }, + 'clients*.google.com': { '.*': { abort: false, desc: '设置abort:true可以快速失败,节省时间' } }, + 'www.googleapis.com': { '.*': { abort: false, desc: '设置abort:true可以快速失败,节省时间' } }, + 'lh*.googleusercontent.com': { '.*': { abort: false, desc: '设置abort:true可以快速失败,节省时间' } }, // mapbox-node-binary.s3.amazonaws.com/sqlite3/v5.0.0/napi-v3-win32-x64.tar.gz '*.s3.amazonaws.com': { '/sqlite3/.*': { diff --git a/packages/gui/package.json b/packages/gui/package.json index a0acca1..e5ae0f4 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/dev-sidecar-gui", - "version": "1.4.0", + "version": "1.5.0-pre", "private": false, "license": "MPL-2.0", "scripts": { diff --git a/packages/gui/src/view/components/setup-ca.vue b/packages/gui/src/view/components/setup-ca.vue index d30cb7c..282f384 100644 --- a/packages/gui/src/view/components/setup-ca.vue +++ b/packages/gui/src/view/components/setup-ca.vue @@ -15,7 +15,7 @@ 点此去安装
- 本应用正常使用必须安装和信任CA根证书,该证书是应用启动时本地随机生成的
+ 本应用在非“安全模式”下必须安装和信任CA根证书,该证书是应用启动时本地随机生成的