From 8f9cd7547bf130775015b804b3de58aa679f6034 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 15 Dec 2021 12:54:34 +0800 Subject: [PATCH 1/7] refactor: 1 --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 120009f..65227ae 100644 --- a/README.md +++ b/README.md @@ -330,9 +330,7 @@ npm run electron:build 1、 加群
- -
2、 加作者好友 From e031df072d63c550aced47d1e91b4218cf7c2d98 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 15 Dec 2021 12:57:13 +0800 Subject: [PATCH 2/7] refactor: 1 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 65227ae..5d4cbba 100644 --- a/README.md +++ b/README.md @@ -333,6 +333,8 @@ npm run electron:build +微信群二维码如果已过期，请点击 [获取最新群二维码](http://wxgroup.docmirror.cn/weixin/group/dev-sidecar/1qrcode.jpg) + 2、 加作者好友
From 222872de4784fe764b16b4ddda06d5d67ed54570 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 22 Dec 2021 09:28:39 +0800 Subject: [PATCH 3/7] refactor: 1 --- packages/core/src/config/remote_config.json5 | 24 ++++++++++++++++++- .../src/modules/plugin/overwall/config.js | 21 +++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/packages/core/src/config/remote_config.json5 b/packages/core/src/config/remote_config.json5 index 18093cc..c3e96d0 100644 --- a/packages/core/src/config/remote_config.json5 +++ b/packages/core/src/config/remote_config.json5 @@ -21,7 +21,29 @@ plugin: { overwall: { targets: { - '*azureedge.net': true + '*azureedge.net': true, + 'github.com': true, + '*wikimedia.org': true, + 'v2ex.com': true, + '*cloudfront.net': true, + '*bing.com': true, + '*discourse-cdn.com': true, + '*gravatar.com': true, + '*docker.com': true, + '*vueuse.org': true, + '*elastic.co': true, + '*optimizely.com': true, + '*stackpathcdn.com': true, + '*fastly.net': true, + '*cloudflare.com': true, + '*233v2.com': true, + '*v2fly.org': true, + '*telegram.org': true, + '*amazon.com': true, + '*googleapis.com': true, + '*cloudflareinsights.com': true, + '*.intlify.dev': true, + '*segment.io': true } } } diff --git a/packages/core/src/modules/plugin/overwall/config.js b/packages/core/src/modules/plugin/overwall/config.js index 0bcaa4a..2d7ee33 100644 --- a/packages/core/src/modules/plugin/overwall/config.js +++ b/packages/core/src/modules/plugin/overwall/config.js @@ -13,7 +13,26 @@ module.exports = { 'github.com': true, '*wikimedia.org': true, 'v2ex.com': true, - '*azureedge.net': true + '*azureedge.net': true, + '*cloudfront.net': true, + '*bing.com': true, + '*discourse-cdn.com': true, + '*gravatar.com': true, + '*docker.com': true, + '*vueuse.org': true, + '*elastic.co': true, + '*optimizely.com': true, + '*stackpathcdn.com': true, + '*fastly.net': true, + '*cloudflare.com': true, + '*233v2.com': true, + '*v2fly.org': true, + '*telegram.org': true, + '*amazon.com': true, + '*googleapis.com': true, + '*cloudflareinsights.com': true, + '*.intlify.dev': true, + '*segment.io': true }, pac: { enabled: true, From 66f7bf21d164daa6863278b2f040e071c10145c9 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 19 Jan 2022 09:02:26 +0800 Subject: [PATCH 4/7] refactor: 1 --- .../proxy/mitmproxy/createConnectHandler.js | 33 +++---------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js index d1f1e86..a3c7e00 100644 --- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js +++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js @@ -93,40 +93,15 @@ function connect (req, cltSocket, head, hostname, port, dnsConfig, sniRegexpMap) cltSocket.write('HTTP/1.1 200 Connection Established\r\n' + 'Proxy-agent: dev-sidecar\r\n' + '\r\n') - + log.info('proxy connect start', hostname) proxySocket.write(head) proxySocket.pipe(cltSocket) cltSocket.pipe(proxySocket) - // let sniReplaced = false - // cltSocket.on('data', (chunk) => { - // // if (replaceSni && sniReplaced === false) { - // // const sniPackage = sniExtract(chunk) - // // if (sniPackage != null) { - // // sniReplaced = true - // // const bytes = Buffer.from(replaceSni) - // // const start = sniPackage.start - // // const length = sniPackage.length - // // for (let i = 0; i < length; i++) { - // // let char = 97 // a 的ascii - // // if (bytes.length > i) { - // // char = bytes[i] - // // } - // // chunk[start + i] = char - // // } - // // } - // // } - // if (sniReplaced === false) { - // sniReplaced = true - // chunk[chunk.length - 1] = 1 - // } - // proxySocket.write(chunk) - // }) - // cltSocket.on('end', () => { - // proxySocket.end() - // }) }) - + cltSocket.on('timeout', (e) => { + log.error('cltSocket timeout', e.message, hostname) + }) cltSocket.on('error', (e) => { log.error('cltSocket error', e.message, hostname) }) From 5ed179bb17c8fc8761b6b88564a915f0789b0084 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Mon, 14 Feb 2022 18:16:22 +0800 Subject: [PATCH 5/7] refactor: 1 --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 5d4cbba..f61b80b 100644 --- a/README.md +++ b/README.md @@ -291,6 +291,15 @@ Error: www.github.com:443, 代理请求超时 3、如果你是因为开着ds的情况下重启电脑导致无法上网，你可以设置ds为开机自启 +### 8、卸载应用后上不了网，git请求不了 +1、在系统设置里面，关闭系统代理设置，[手动关闭系统代理设置](./doc/recover.md) +2、执行下面的命令关闭git的代理设置 +```shell +git config --global --unset http.proxy +git config --global --unset https.proxy +``` + + ## 七、在其他程序使用 * [java程序使用](./doc/other.md#Java程序使用) From cc3f5bab6eed4b554c50e955f9f6c469f9058336 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Mon, 14 Feb 2022 18:18:51 +0800 Subject: [PATCH 6/7] refactor: 1 --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f61b80b..2a9a849 100644 --- a/README.md +++ b/README.md @@ -292,13 +292,19 @@ Error: www.github.com:443, 代理请求超时 ### 8、卸载应用后上不了网，git请求不了 -1、在系统设置里面，关闭系统代理设置，[手动关闭系统代理设置](./doc/recover.md) -2、执行下面的命令关闭git的代理设置 +如果你在卸载应用前，没有正常退出app，就有可能无法上网。请按如下步骤操作恢复您的网络： + +1、关闭系统代理设置，参见：[手动关闭系统代理设置](./doc/recover.md) +2、执行下面的命令关闭git的代理设置(如果你开启过git.ext的开关) ```shell git config --global --unset http.proxy git config --global --unset https.proxy ``` - +3、执行下面的命令关闭npm的代理设置(如果你开启过npm加速的开关) +```shell +npm config delete proxy +npm config delete https-proxy +``` ## 七、在其他程序使用 * [java程序使用](./doc/other.md#Java程序使用) From 90d7174a963769ef58362aaf4bd3cbf0890061dc Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 4 Mar 2022 09:32:31 +0800 Subject: [PATCH 7/7] 1 --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 2a9a849..bc8693e 100644 --- a/README.md +++ b/README.md @@ -344,11 +344,9 @@ npm run electron:build 1、 加群
-
-微信群二维码如果已过期，请点击 [获取最新群二维码](http://wxgroup.docmirror.cn/weixin/group/dev-sidecar/1qrcode.jpg) 2、 加作者好友