diff --git a/README.md b/README.md index bec8c441..2a4897bb 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ start %HOMEPATH%/.dev-sidecar/dev-sidecar.ca.crt > clone 出来的 remote "origin" 为fastgit的地址,需要手动改回来 > 你也可以直接使用他们的clone加速工具 [fgit-go](https://github.com/FastGitORG/fgit-go) 2. github.com的镜像网站(注意:不能登录) - >1. [hub.fastgit.org](https://hub.fastgit.org/) (好像已经不行了) + >1. [hub.fastgit.org](https://hub.fastgit.org/) >2. [github.com.cnpmjs.org](https://github.com.cnpmjs.org/) 这个很容易超限 diff --git a/packages/gui/src/bridge/index.js b/packages/gui/src/bridge/index.js index b9d103c3..96f18f54 100644 --- a/packages/gui/src/bridge/index.js +++ b/packages/gui/src/bridge/index.js @@ -6,6 +6,11 @@ import JSON5 from 'json5' import path from 'path' const pk = require('../../package.json') const mitmproxyPath = path.join(__dirname, 'mitmproxy.js') + +const getDefaultConfigBasePath = function () { + const userHome = process.env.HOME || process.env.USERPROFILE + return path.resolve(userHome, './.dev-sidecar') +} const localApi = { /** * 返回所有api列表,供vue来ipc调用 @@ -111,14 +116,14 @@ function _deepFindFunction (list, parent, parentKey) { } function _getSettingsPath () { - const dir = './config/' + const dir = getDefaultConfigBasePath() if (!fs.existsSync(dir)) { fs.mkdirSync(dir) } return dir + 'setting.json5' } function _getConfigPath () { - const dir = './config/' + const dir = getDefaultConfigBasePath() if (!fs.existsSync(dir)) { fs.mkdirSync(dir) } diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js index 637adb37..4c2c293e 100644 --- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js +++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js @@ -100,14 +100,14 @@ module.exports = function createRequestHandler (requestInterceptor, responseInte reject(new Error(`${rOptions.host}:${rOptions.port}, 代理请求超时`)) }) - proxyReq.on('error', (e, req, res) => { + proxyReq.on('error', (e) => { const end = new Date().getTime() if (isDnsIntercept) { const { dns, ip, hostname } = isDnsIntercept dns.count(hostname, ip, true) console.error('记录ip失败次数,用于优选ip:', hostname, ip) } - console.error('代理请求错误', e.errno, rOptions.hostname, rOptions.path, (end - start) + 'ms') + console.error('代理请求错误', e.errno, rOptions.hostname, rOptions.path, (end - start) + 'ms', e) reject(e) })