| IP Address<\/th> | - ([^<]*)<\/li><\/ul><\/td><\/tr>/gm
+ const regexp = /
| IP Address<\/th> | - ([^<]*)<\/li><\/ul><\/td><\/tr>/g
const matched = regexp.exec(ret)
let ip = null
diff --git a/packages/mitmproxy/src/lib/dns/preset.js b/packages/mitmproxy/src/lib/dns/preset.js
index f5e0e1a21b..3ff7dafd6a 100644
--- a/packages/mitmproxy/src/lib/dns/preset.js
+++ b/packages/mitmproxy/src/lib/dns/preset.js
@@ -26,7 +26,8 @@ module.exports = class DNSOverPreSetIpList extends BaseDNS {
if (hostnamePreSetIpList && (hostnamePreSetIpList.length > 0 || hostnamePreSetIpList.length === undefined)) {
if (hostnamePreSetIpList.length > 0) {
hostnamePreSetIpList = hostnamePreSetIpList.slice()
- } else {
+ }
+ else {
hostnamePreSetIpList = mapToList(hostnamePreSetIpList)
}
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js b/packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js
index 45b6c863e0..b55e11718c 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js
@@ -6,7 +6,8 @@ function readConfig (config, defaultConfig) {
if (Object.isArray(config)) {
config = config.join(',')
}
- } else {
+ }
+ else {
config = defaultConfig
}
return config
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/baiduOcr.js b/packages/mitmproxy/src/lib/interceptor/impl/req/baiduOcr.js
index dcce58773b..926eaf1af8 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/req/baiduOcr.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/req/baiduOcr.js
@@ -60,7 +60,8 @@ function getConfig (interceptOpt, tryCount, log) {
if (count >= 100000) {
count = 0
}
- } else {
+ }
+ else {
config = interceptOpt.baiduOcr
tryCount = null // 将tryCount设置为null代表只有一个配置
}
@@ -83,11 +84,13 @@ function getConfig (interceptOpt, tryCount, log) {
if (config.api == null) {
if (tryCount == null) {
return null // 只配置了一个账号，没有更多账号可以选择了，直接返回null
- } else {
+ }
+ else {
if (tryCount < interceptOpt.baiduOcr.length) {
// 递归找到有效的配置
return getConfig(interceptOpt, tryCount + 1, log)
- } else {
+ }
+ else {
return null
}
}
@@ -164,7 +167,8 @@ module.exports = {
limitConfig(config.id, config.api)
log.error(`当前百度云账号的接口 ${config.api}，已达到当日调用次数上限，暂时禁用它，明天会自动放开:`, config)
}
- } else {
+ }
+ else {
log.info('baiduOcr success:', result)
}
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/cacheReq.js b/packages/mitmproxy/src/lib/interceptor/impl/req/cacheReq.js
index 5028002b15..5246be4886 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/req/cacheReq.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/req/cacheReq.js
@@ -42,7 +42,8 @@ function getLastModifiedTimeFromIfModifiedSince (rOptions, log) {
try {
// 尝试解析 lastModified，并获取time
return new Date(lastModified).getTime()
- } catch (e) {
+ }
+ catch (e) {
// 为数字时，直接返回
if (/\\d+/.test(lastModified)) {
return lastModified - 0
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/proxy.js b/packages/mitmproxy/src/lib/interceptor/impl/req/proxy.js
index 6dcf19cc83..327f4be679 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/req/proxy.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/req/proxy.js
@@ -1,4 +1,4 @@
-const url = require('url')
+const url = require('node:url')
const lodash = require('lodash')
// 替换占位符
@@ -27,9 +27,11 @@ function buildTargetUrl (rOptions, urlConf, interceptOpt, matched) {
if (interceptOpt && interceptOpt.replace) {
const regexp = new RegExp(interceptOpt.replace)
targetUrl = rOptions.path.replace(regexp, urlConf)
- } else if (urlConf.indexOf('http:') === 0 || urlConf.indexOf('https:') === 0) {
+ }
+ else if (urlConf.indexOf('http:') === 0 || urlConf.indexOf('https:') === 0) {
targetUrl = urlConf
- } else {
+ }
+ else {
let uri = rOptions.path
if (uri.indexOf('http:') === 0 || uri.indexOf('https:') === 0) {
// eslint-disable-next-line node/no-deprecated-api
@@ -95,7 +97,8 @@ module.exports = {
}
if (count.value == null) {
log.error('`count.value` is null, the count:', count)
- } else {
+ }
+ else {
count.doCount(count.value)
proxyConf = count.value
context.requestCount = {
@@ -124,7 +127,8 @@ module.exports = {
}
res.setHeader('DS-Interceptor', `proxy: ${proxyTarget}, sni: ${interceptOpt.sni}${unVerifySsl ? ', unVerifySsl' : ''}`)
log.info('proxy intercept: hostname:', originHostname, ', target：', proxyTarget, ', sni replace servername:', rOptions.servername, (unVerifySsl ? ', unVerifySsl' : ''))
- } else {
+ }
+ else {
res.setHeader('DS-Interceptor', `proxy: ${proxyTarget}`)
log.info('proxy intercept: hostname:', originHostname, ', target：', proxyTarget)
}
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/requestReplace.js b/packages/mitmproxy/src/lib/interceptor/impl/req/requestReplace.js
index 219959d526..7ed12c2ef6 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/req/requestReplace.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/req/requestReplace.js
@@ -10,7 +10,8 @@ function replaceRequestHeaders (rOptions, headers, log) {
if (value) {
log.debug(`[DS-RequestReplace-Interceptor] replace '${key}': '${rOptions.headers[key.toLowerCase()]}' -> '${value}'`)
rOptions.headers[key.toLowerCase()] = value
- } else if (rOptions.headers[key.toLowerCase()]) {
+ }
+ else if (rOptions.headers[key.toLowerCase()]) {
log.debug(`[DS-RequestReplace-Interceptor] remove '${key}': '${rOptions.headers[key.toLowerCase()]}'`)
delete rOptions.headers[key.toLowerCase()]
}
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js b/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js
index 62f37feee0..54fe7a2c31 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js
@@ -47,11 +47,14 @@ module.exports = {
// 尝试修改rawHeaders中的cache-control、last-modified、expires
if (proxyRes.rawHeaders[i].toLowerCase() === 'cache-control') {
originalHeaders.cacheControl = { value: proxyRes.rawHeaders[i + 1], valueIndex: i + 1 }
- } else if (proxyRes.rawHeaders[i].toLowerCase() === 'last-modified') {
+ }
+ else if (proxyRes.rawHeaders[i].toLowerCase() === 'last-modified') {
originalHeaders.lastModified = { value: proxyRes.rawHeaders[i + 1], valueIndex: i + 1 }
- } else if (proxyRes.rawHeaders[i].toLowerCase() === 'expires') {
+ }
+ else if (proxyRes.rawHeaders[i].toLowerCase() === 'expires') {
originalHeaders.expires = { value: proxyRes.rawHeaders[i + 1], valueIndex: i + 1 }
- } else if (proxyRes.rawHeaders[i].toLowerCase() === 'etag') {
+ }
+ else if (proxyRes.rawHeaders[i].toLowerCase() === 'etag') {
originalHeaders.etag = { value: proxyRes.rawHeaders[i + 1], valueIndex: i + 1 }
}
@@ -67,7 +70,8 @@ module.exports = {
if (maxAgeMatch && maxAgeMatch[1] > maxAge) {
if (interceptOpt.cacheImmutable !== false && !originalHeaders.cacheControl.value.includes('immutable')) {
maxAge = maxAgeMatch[1]
- } else {
+ }
+ else {
const url = `${rOptions.method} ➜ ${rOptions.protocol}//${rOptions.hostname}:${rOptions.port}${req.url}`
res.setHeader('DS-Cache-Response-Interceptor', `skip: ${maxAgeMatch[1]} > ${maxAge}`)
log.info(`cache response intercept: skip: ${maxAgeMatch[1]} > ${maxAge}, url: ${url}`)
@@ -87,19 +91,22 @@ module.exports = {
// 替换cache-control
if (originalHeaders.cacheControl) {
proxyRes.rawHeaders[originalHeaders.cacheControl.valueIndex] = replaceHeaders.cacheControl
- } else {
+ }
+ else {
res.setHeader('Cache-Control', replaceHeaders.cacheControl)
}
// 替换last-modified
if (originalHeaders.lastModified) {
proxyRes.rawHeaders[originalHeaders.lastModified.valueIndex] = replaceHeaders.lastModified
- } else {
+ }
+ else {
res.setHeader('Last-Modified', replaceHeaders.lastModified)
}
// 替换expires
if (originalHeaders.expires) {
proxyRes.rawHeaders[originalHeaders.expires.valueIndex] = replaceHeaders.expires
- } else {
+ }
+ else {
res.setHeader('Expires', replaceHeaders.expires)
}
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js b/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js
index 7c7719ec24..2086018c52 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js
@@ -31,7 +31,8 @@ function replaceResponseHeaders (newHeaders, res, proxyRes) {
preHeaders[headerKey] = proxyRes.rawHeaders[i + 1] // 先保存原先响应头
if (newHeaderValue === REMOVE) { // 由于拦截配置中不允许配置null，会被删，所以配置一个 "[remove]"，当作删除响应头的意思
proxyRes.rawHeaders[i + 1] = ''
- } else {
+ }
+ else {
proxyRes.rawHeaders[i + 1] = newHeaderValue
}
}
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/res/script.js b/packages/mitmproxy/src/lib/interceptor/impl/res/script.js
index 58e7581765..24c502a511 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/res/script.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/res/script.js
@@ -52,7 +52,8 @@ module.exports = {
if (key.includes('/')) {
scriptTag = getScriptByUrlOrPath(key) // 1.绝对地址或相对地址（注意：当目标站点限制跨域脚本时，可使用相对地址，再结合proxy拦截器进行代理，可规避掉限制跨域脚本问题。）
- } else {
+ }
+ else {
const script = scripts[key]
if (script == null) {
continue
@@ -71,7 +72,8 @@ module.exports = {
// 插入油猴脚本浏览器扩展
if (typeof interceptOpt.tampermonkeyScript === 'string') {
tags = `\r\n\t${getScriptByUrlOrPath(interceptOpt.tampermonkeyScript)}${tags}`
- } else {
+ }
+ else {
tags = `\r\n\t${getScript('tampermonkey', scripts.tampermonkey.script)}${tags}`
}
@@ -80,10 +82,12 @@ module.exports = {
return {
head: `${tags}\r\n`,
}
- } catch (err) {
+ }
+ catch (err) {
try {
res.setHeader('DS-Script-Interceptor', 'error')
- } catch (e) {
+ }
+ catch (e) {
// ignore
}
log.error('load monkey script error', err)
@@ -108,7 +112,8 @@ module.exports = {
if (typeof replaceScriptUrlFun === 'function') {
replaceScriptUrlFun(scriptKey)
}
- } else if (scriptUrl.indexOf('/') === 0) {
+ }
+ else if (scriptUrl.indexOf('/') === 0) {
// 相对地址
scriptProxy[scriptUrl] = scriptUrl
}
@@ -124,7 +129,8 @@ module.exports = {
pathConfig.script[i] = scriptKey
})
}
- } else if (typeof pathConfig.script === 'string') {
+ }
+ else if (typeof pathConfig.script === 'string') {
handleScriptUrl(pathConfig.script, 'script', (scriptKey) => {
pathConfig.script = scriptKey
})
@@ -174,7 +180,8 @@ module.exports = {
const obj = {}
obj[pathPattern] = hostnameConfig[pathPattern]
log.debug(`域名 '${hostnamePattern}' 拦截配置中，新增伪脚本地址的代理配置:`, JSON.stringify(obj, null, '\t'))
- } else {
+ }
+ else {
// 相对地址：新增响应头Content-Type替换配置
if (hostnameConfig[scriptKey]) {
continue // 配置已经存在，按自定义配置优先
diff --git a/packages/mitmproxy/src/lib/interceptor/index.js b/packages/mitmproxy/src/lib/interceptor/index.js
index a37b6f560a..be7cbc9c3c 100644
--- a/packages/mitmproxy/src/lib/interceptor/index.js
+++ b/packages/mitmproxy/src/lib/interceptor/index.js
@@ -1,17 +1,17 @@
+const abort = require('./impl/req/abort')
+
+const baiduOcr = require('./impl/req/baiduOcr')
+const cacheReq = require('./impl/req/cacheReq')
// request interceptor impls
const OPTIONS = require('./impl/req/OPTIONS.js')
+const proxy = require('./impl/req/proxy')
-const success = require('./impl/req/success')
const redirect = require('./impl/req/redirect')
-const abort = require('./impl/req/abort')
-const cacheReq = require('./impl/req/cacheReq')
const requestReplace = require('./impl/req/requestReplace')
-
-const proxy = require('./impl/req/proxy')
const sni = require('./impl/req/sni')
-const baiduOcr = require('./impl/req/baiduOcr')
+const success = require('./impl/req/success')
// response interceptor impls
const OPTIONSHeaders = require('./impl/res/AfterOPTIONSHeaders')
@@ -23,12 +23,18 @@ const script = require('./impl/res/script')
module.exports = [
// request interceptor impls
OPTIONS,
- success, redirect, abort, cacheReq,
+ success,
+ redirect,
+ abort,
+ cacheReq,
requestReplace,
- proxy, sni,
+ proxy,
+ sni,
baiduOcr,
// response interceptor impls
- OPTIONSHeaders, cacheRes, responseReplace,
+ OPTIONSHeaders,
+ cacheRes,
+ responseReplace,
script,
]
diff --git a/packages/mitmproxy/src/lib/monkey/index.js b/packages/mitmproxy/src/lib/monkey/index.js
index fbd1daa356..40715a41d2 100644
--- a/packages/mitmproxy/src/lib/monkey/index.js
+++ b/packages/mitmproxy/src/lib/monkey/index.js
@@ -1,5 +1,5 @@
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
const log = require('../../utils/util.log')
let scripts
@@ -12,7 +12,8 @@ function buildScript (sc, content, scriptName) {
let eventStr
if (runAt === 'document-end') {
eventStr = 'document.addEventListener("DOMContentLoaded"'
- } else {
+ }
+ else {
eventStr = 'window.addEventListener("load"'
}
@@ -47,7 +48,8 @@ if (!((window.__ds_global__ || {}).GM_getValue || (() => true))("ds_enabled", tr
if (item.indexOf('.') > 0) {
grantStr += `${item} = (window.__ds_global__ || {})['${item}'];`
- } else {
+ }
+ else {
grantStr += `const ${item} = (window.__ds_global__ || {})['${item}'] || (() => {});`
}
}
@@ -57,10 +59,10 @@ if (!((window.__ds_global__ || {}).GM_getValue || (() => true))("ds_enabled", tr
initStr}\r\n${
checkEnabledStr}\r\n\r\n${
grantStr ? (`${grantStr}\r\n\r\n`) : ''
- }${content
- }\r\nconsole.log("${scriptKey} completed")`
- + `\r\n})`
- + `\r\nconsole.log("${scriptKey} loaded")`
+ }${content
+ }\r\nconsole.log("${scriptKey} completed")`
+ + `\r\n})`
+ + `\r\nconsole.log("${scriptKey} loaded")`
}
function loadScript (content, scriptName) {
@@ -89,9 +91,11 @@ function loadScript (content, scriptName) {
const value = ret[2].trim()
if (key === 'grant') {
sc.grant.push(value)
- } else if (key === 'match') {
+ }
+ else if (key === 'match') {
sc.match.push(value)
- } else {
+ }
+ else {
sc[key] = value
}
}
diff --git a/packages/mitmproxy/src/lib/proxy/common/config.js b/packages/mitmproxy/src/lib/proxy/common/config.js
index 0453c1b6e4..617fbc9cea 100644
--- a/packages/mitmproxy/src/lib/proxy/common/config.js
+++ b/packages/mitmproxy/src/lib/proxy/common/config.js
@@ -1,4 +1,4 @@
-const path = require('path')
+const path = require('node:path')
const config = exports
diff --git a/packages/mitmproxy/src/lib/proxy/common/util.js b/packages/mitmproxy/src/lib/proxy/common/util.js
index 0ab2a04527..35a396397e 100644
--- a/packages/mitmproxy/src/lib/proxy/common/util.js
+++ b/packages/mitmproxy/src/lib/proxy/common/util.js
@@ -1,4 +1,4 @@
-const url = require('url')
+const url = require('node:url')
const tunnelAgent = require('tunnel-agent')
const log = require('../../../utils/util.log')
const matchUtil = require('../../../utils/util.match')
@@ -83,7 +83,8 @@ util.parseHostnameAndPort = (host, defaultPort) => {
if (arr[1]) {
arr[1] = Number.parseInt(arr[1], 10)
}
- } else {
+ }
+ else {
arr = host.split(':')
if (arr.length > 1) {
arr[1] = Number.parseInt(arr[1], 10)
@@ -92,7 +93,8 @@ util.parseHostnameAndPort = (host, defaultPort) => {
if (defaultPort > 0 && (arr.length === 1 || arr[1] === undefined)) {
arr[1] = defaultPort
- } else if (arr.length === 2 && arr[1] === undefined) {
+ }
+ else if (arr.length === 2 && arr[1] === undefined) {
arr.pop()
}
@@ -110,10 +112,12 @@ util.getOptionsFromRequest = (req, ssl, externalProxy = null, serverSetting, com
if (externalProxy) {
if (typeof externalProxy === 'string') {
externalProxyUrl = externalProxy
- } else if (typeof externalProxy === 'function') {
+ }
+ else if (typeof externalProxy === 'function') {
try {
externalProxyUrl = externalProxy(req, ssl)
- } catch (e) {
+ }
+ catch (e) {
log.error('externalProxy error:', e)
}
}
@@ -133,10 +137,12 @@ util.getOptionsFromRequest = (req, ssl, externalProxy = null, serverSetting, com
// log.info(`get timeoutConfig '${hostname}':`, timeoutConfig)
agent = createAgent(protocol, timeoutConfig, serverSetting.verifySsl)
headers.connection = 'keep-alive'
- } else {
+ }
+ else {
agent = false
}
- } else {
+ }
+ else {
agent = util.getTunnelAgent(protocol === 'https:', externalProxyUrl)
}
@@ -166,7 +172,8 @@ util.getOptionsFromRequest = (req, ssl, externalProxy = null, serverSetting, com
// mark a socketId for Agent to bind socket for NTLM
if (req.socket.customSocketId) {
options.customSocketId = req.socket.customSocketId
- } else if (headers.authorization) {
+ }
+ else if (headers.authorization) {
options.customSocketId = req.socket.customSocketId = socketId++
}
@@ -194,7 +201,8 @@ util.getTunnelAgent = (requestIsSSL, externalProxyUrl) => {
})
}
return httpsOverHttpAgent
- } else {
+ }
+ else {
if (!httpsOverHttpsAgent) {
httpsOverHttpsAgent = tunnelAgent.httpsOverHttps({
proxy: {
@@ -205,7 +213,8 @@ util.getTunnelAgent = (requestIsSSL, externalProxyUrl) => {
}
return httpsOverHttpsAgent
}
- } else {
+ }
+ else {
if (protocol === 'http:') {
// if (!httpOverHttpAgent) {
// httpOverHttpAgent = tunnelAgent.httpOverHttp({
@@ -216,7 +225,8 @@ util.getTunnelAgent = (requestIsSSL, externalProxyUrl) => {
// })
// }
return false
- } else {
+ }
+ else {
if (!httpOverHttpsAgent) {
httpOverHttpsAgent = tunnelAgent.httpOverHttps({
proxy: {
diff --git a/packages/mitmproxy/src/lib/proxy/compatible/compatible.js b/packages/mitmproxy/src/lib/proxy/compatible/compatible.js
index dd4eb2b0d0..a8dc4fa58b 100644
--- a/packages/mitmproxy/src/lib/proxy/compatible/compatible.js
+++ b/packages/mitmproxy/src/lib/proxy/compatible/compatible.js
@@ -5,8 +5,8 @@
*
* @author WangLiang
*/
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
const jsonApi = require('../../../json')
const log = require('../../../utils/util.log')
const matchUtil = require('../../../utils/util.match')
@@ -58,7 +58,8 @@ function _loadFromFile (defaultConfig) {
if (!fs.existsSync(configPath)) {
config = defaultConfig
log.info(`本地未保存过 ${configPath} 文件，使用默认配置`)
- } else {
+ }
+ else {
const file = fs.readFileSync(configPath)
log.info('读取 automaticCompatibleConfig.json 成功:', configPath)
const fileStr = file.toString()
@@ -79,7 +80,8 @@ function _saveConfigToFile () {
try {
fs.writeFileSync(filePath, jsonApi.stringify(config))
log.info('保存 automaticCompatibleConfig.json 成功:', filePath)
- } catch (e) {
+ }
+ catch (e) {
log.error('保存 automaticCompatibleConfig.json 失败:', filePath, e)
}
}
@@ -107,7 +109,8 @@ module.exports = {
const connectCompatibleConfig = this.getConnectCompatibleConfig(hostname, port)
if (connectCompatibleConfig) {
connectCompatibleConfig.ssl = ssl
- } else {
+ }
+ else {
config.connect[`${hostname}:${port}`] = { ssl }
}
@@ -139,7 +142,8 @@ module.exports = {
const requestCompatibleConfig = this.getRequestCompatibleConfig(rOptions.hostname, rOptions.port)
if (requestCompatibleConfig) {
requestCompatibleConfig.rejectUnauthorized = rejectUnauthorized
- } else {
+ }
+ else {
config.request[`${rOptions.hostname}:${rOptions.port}`] = { rejectUnauthorized }
}
diff --git a/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js b/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js
index ce3b107a05..c7c7325d8a 100644
--- a/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js
+++ b/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js
@@ -1,4 +1,4 @@
-const zlib = require('zlib')
+const zlib = require('node:zlib')
const through = require('through2')
const log = require('../../../utils/util.log')
@@ -181,10 +181,12 @@ module.exports = {
}))
.pipe(codec.createCompressor()) // 编码
.pipe(res)
- } else {
+ }
+ else {
log.error(`InsertScriptMiddleware.responseInterceptor(): 暂不支持编码方式 ${encoding}, 目前支持:`, httpUtil.supportedEncodingsStr())
}
- } else {
+ }
+ else {
proxyRes
.pipe(through(function (chunk, enc, callback) {
chunkByteReplace(this, chunk, enc, callback, append)
diff --git a/packages/mitmproxy/src/lib/proxy/middleware/overwall.js b/packages/mitmproxy/src/lib/proxy/middleware/overwall.js
index d6b2a16c92..3b1e236abd 100644
--- a/packages/mitmproxy/src/lib/proxy/middleware/overwall.js
+++ b/packages/mitmproxy/src/lib/proxy/middleware/overwall.js
@@ -1,7 +1,7 @@
-const { Buffer } = require('buffer')
-const fs = require('fs')
-const path = require('path')
-const url = require('url')
+const { Buffer } = require('node:buffer')
+const fs = require('node:fs')
+const path = require('node:path')
+const url = require('node:url')
const lodash = require('lodash')
const request = require('request')
const log = require('../../../utils/util.log')
@@ -15,7 +15,8 @@ function matched (hostname, overWallTargetMap) {
const ret1 = matchUtil.matchHostname(overWallTargetMap, hostname, 'matched overwall')
if (ret1) {
return 'in config'
- } else if (ret1 === false || ret1 === 'false') {
+ }
+ else if (ret1 === false || ret1 === 'false') {
log.debug(`域名 ${hostname} 的overwall配置为 false，跳过增强功能，即使它在 pac.txt 里`)
return null
}
@@ -28,7 +29,8 @@ function matched (hostname, overWallTargetMap) {
if (ret && ret.indexOf('PROXY ') === 0) {
log.info(`matchHostname: matched overwall: '${hostname}' -> '${ret}' in pac.txt`)
return 'in pac.txt'
- } else {
+ }
+ else {
log.debug(`matchHostname: matched overwall: Not-Matched '${hostname}' -> '${ret}' in pac.txt`)
return null
}
@@ -49,7 +51,8 @@ function loadPacLastModifiedTime (pacTxt) {
if (matched && matched.length > 0) {
try {
return new Date(matched[0])
- } catch (ignore) {
+ }
+ catch {
return null
}
}
@@ -74,7 +77,7 @@ function savePacFile (pacTxt) {
// 尝试解析和修改 pac.txt 文件时间
const lastModifiedTime = loadPacLastModifiedTime(pacTxt)
if (lastModifiedTime) {
- fs.stat(pacFilePath, (err, stats) => {
+ fs.stat(pacFilePath, (err, _stats) => {
if (err) {
log.error('修改 pac.txt 文件时间失败:', err)
return
@@ -84,7 +87,8 @@ function savePacFile (pacTxt) {
fs.utimes(pacFilePath, lastModifiedTime, lastModifiedTime, (utimesErr) => {
if (utimesErr) {
log.error('修改 pac.txt 文件时间失败:', utimesErr)
- } else {
+ }
+ else {
log.info(`'${pacFilePath}' 文件的修改时间已更新为其最近更新时间 '${formatDate(lastModifiedTime)}'`)
}
})
@@ -107,7 +111,8 @@ async function downloadPacAsync (pacConfig) {
if (body == null || body.length < 100) {
log.warn('下载远程 pac.txt 文件成功，但内容为空或内容太短，判断为无效的 pax.txt 文件:', remotePacFileUrl, ', body:', body)
return
- } else {
+ }
+ else {
log.info('下载远程 pac.txt 文件成功:', remotePacFileUrl)
}
@@ -118,7 +123,8 @@ async function downloadPacAsync (pacConfig) {
pacTxt = Buffer.from(pacTxt, 'base64').toString('utf8')
// log.debug('解析 base64 后的 pax:', pacTxt)
}
- } catch (e) {
+ }
+ catch {
if (!pacTxt.includes('!---------------------EOF')) {
log.error(`远程 pac.txt 文件内容即不是base64格式，也不是要求的格式，url: ${remotePacFileUrl}，body: ${body}`)
return
@@ -127,7 +133,8 @@ async function downloadPacAsync (pacConfig) {
// 保存到本地
savePacFile(pacTxt)
- } else {
+ }
+ else {
log.error(`下载远程 pac.txt 文件失败: ${remotePacFileUrl}, response:`, response, ', body:', body)
}
})
@@ -153,11 +160,11 @@ function createOverwallMiddleware (overWallConfig) {
}
const overWallTargetMap = matchUtil.domainMapRegexply(overWallConfig.targets)
return {
- sslConnectInterceptor: (req, cltSocket, head) => {
+ sslConnectInterceptor: (req, _cltSocket, _head) => {
const hostname = req.url.split(':')[0]
return matched(hostname, overWallTargetMap)
},
- requestIntercept (context, req, res, ssl, next) {
+ requestIntercept (context, req, res, _ssl, _next) {
const { rOptions, log, RequestCounter } = context
if (rOptions.protocol === 'http:') {
return
@@ -176,7 +183,8 @@ function createOverwallMiddleware (overWallConfig) {
}
if (count.value == null) {
log.error('`count.value` is null, the count:', count)
- } else {
+ }
+ else {
count.doCount(count.value)
proxyServer = count.value
context.requestCount = {
diff --git a/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js b/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js
index 6a0bd29b37..be6c752264 100644
--- a/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js
+++ b/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js
@@ -1,5 +1,5 @@
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
const log = require('../../../../utils/util.log')
function createPacClient (pacFilePath) {
@@ -12,7 +12,8 @@ function createPacClient (pacFilePath) {
const filePath = path.resolve(location)
log.info('read pac path:', filePath)
return fs.readFileSync(location).toString()
- } catch (e) {
+ }
+ catch (e) {
log.error('读取pac失败:', e)
return ''
}
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
index 401ea23024..ac040e5fe3 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
@@ -1,5 +1,5 @@
-const net = require('net')
-const url = require('url')
+const net = require('node:net')
+const url = require('node:url')
const jsonApi = require('../../../json')
const log = require('../../../utils/util.log')
const DnsUtil = require('../../dns/index')
@@ -45,7 +45,8 @@ module.exports = function createConnectHandler (sslConnectInterceptor, middlewar
}).catch((e) => {
log.error(`----- fakeServer getServerPromise error: ${hostname}:${port}, error:`, e)
})
- } else {
+ }
+ else {
log.info(`不拦截请求，直连目标服务器: ${hostname}:${port}, headers:`, jsonApi.stringify2(req.headers))
connect(req, cltSocket, head, hostname, port, dnsConfig, true)
}
@@ -117,7 +118,8 @@ function connect (req, cltSocket, head, hostname, port, dnsConfig = null, isDire
const proxySocket = net.connect(options, () => {
if (!isDirect) {
log.info('Proxy connect start:', hostport)
- } else {
+ }
+ else {
log.debug('Direct connect start:', hostport)
}
@@ -190,7 +192,8 @@ function connect (req, cltSocket, head, hostname, port, dnsConfig = null, isDire
}
return proxySocket
- } catch (e) {
+ }
+ catch (e) {
log.error(`${isDirect ? '直连' : '代理连接'}错误: ${hostport}, error:`, e)
}
}
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js
index bbd4db548e..7bdf41cc53 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js
@@ -1,4 +1,4 @@
-const fs = require('fs')
+const fs = require('node:fs')
const forge = require('node-forge')
const log = require('../../../utils/util.log')
const FakeServersCenter = require('../tls/FakeServersCenter')
@@ -20,7 +20,8 @@ module.exports = function createFakeServerCenter ({
const caKeyPem = fs.readFileSync(caKeyPath)
caCert = forge.pki.certificateFromPem(caCertPem)
caKey = forge.pki.privateKeyFromPem(caKeyPem)
- } catch (e) {
+ }
+ catch (e) {
log.error('Can not find `CA certificate` or `CA key`:', e)
process.exit(1)
}
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
index 00f68b2fb8..511956e2f6 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
@@ -1,5 +1,5 @@
-const http = require('http')
-const https = require('https')
+const http = require('node:http')
+const https = require('node:https')
const jsonApi = require('../../../json')
const log = require('../../../utils/util.log')
const RequestCounter = require('../../choice/RequestCounter')
@@ -23,9 +23,11 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
if (rOptions.headers.connection === 'close') {
req.socket.setKeepAlive(false)
- } else if (rOptions.customSocketId != null) { // for NTLM
+ }
+ else if (rOptions.customSocketId != null) { // for NTLM
req.socket.setKeepAlive(true, 60 * 60 * 1000)
- } else {
+ }
+ else {
req.socket.setKeepAlive(true, 30000)
}
const context = {
@@ -71,10 +73,12 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
}
}
next()
- } else {
+ }
+ else {
next()
}
- } catch (e) {
+ }
+ catch (e) {
reject(e)
}
})
@@ -125,10 +129,12 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
rOptions.lookup = dnsLookup.createLookupFunc(res, dns, 'request url', url, isDnsIntercept)
log.debug(`域名 ${rOptions.hostname} DNS: ${dns.name}`)
res.setHeader('DS-DNS', dns.name)
- } else {
+ }
+ else {
log.info(`域名 ${rOptions.hostname} 在DNS中未配置`)
}
- } else {
+ }
+ else {
log.info(`域名 ${rOptions.hostname} DNS配置不存在`)
}
@@ -157,7 +163,8 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
const cost = new Date() - start
if (rOptions.protocol === 'https:') {
log.info(`代理请求返回: 【${proxyRes.statusCode}】${url}, cost: ${cost} ms`)
- } else {
+ }
+ else {
log.info(`请求返回: 【${proxyRes.statusCode}】${url}, cost: ${cost} ms`)
}
// console.log('request:', proxyReq, proxyReq.socket)
@@ -284,7 +291,8 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
if (append.body) {
body += append.body
}
- } else if (append === false) {
+ }
+ else if (append === false) {
break // 返回false表示终止拦截器，跳出循环
}
}
@@ -292,10 +300,12 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
head,
body,
})
- } else {
+ }
+ else {
next()
}
- } catch (e) {
+ }
+ catch (e) {
reject(e)
}
})
@@ -331,13 +341,15 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
目标网站请求错误：【${e.code}】 ${e.message}
目标地址：${rOptions.protocol}//${rOptions.hostname}:${rOptions.port}${rOptions.path}`,
)
- } catch (e) {
+ }
+ catch (e) {
// do nothing
}
try {
res.end()
- } catch (e) {
+ }
+ catch (e) {
// do nothing
}
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createUpgradeHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createUpgradeHandler.js
index 69de41a184..df3859866e 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createUpgradeHandler.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createUpgradeHandler.js
@@ -1,5 +1,5 @@
-const http = require('http')
-const https = require('https')
+const http = require('node:http')
+const https = require('node:https')
const log = require('../../../utils/util.log')
const util = require('../common/util')
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js
index dbea7035d0..006b18991a 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js
@@ -1,4 +1,4 @@
-const defaultDns = require('dns')
+const defaultDns = require('node:dns')
const log = require('../../../utils/util.log')
const speedTest = require('../../speed')
@@ -17,7 +17,8 @@ module.exports = {
}
callback(null, aliveIpObj.host, 4)
return
- } else {
+ }
+ else {
log.info(`----- ${action}: ${hostname}, no alive ip${target}, tester: { "ready": ${tester.ready}, "backupList": ${JSON.stringify(tester.backupList)} }`)
}
}
@@ -49,11 +50,13 @@ module.exports = {
}
callback(null, ip, 4)
return
- } else {
+ }
+ else {
// 使用默认dns
log.info(`----- ${action}: ${hostname}, use hostname by default DNS: ${hostname}, skip test failed ip from dns '${dns.name}: ${ip}'${target}, options:`, options)
}
- } else {
+ }
+ else {
// 使用默认dns
log.info(`----- ${action}: ${hostname}, use hostname by default DNS: ${hostname}${target}, options:`, options, ', dns:', dns)
}
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js
index daaf6610e7..acf3a7e988 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js
@@ -1,4 +1,4 @@
-const http = require('http')
+const http = require('node:http')
const log = require('../../../utils/util.log')
const speedTest = require('../../speed/index.js')
const config = require('../common/config')
@@ -104,7 +104,8 @@ module.exports = {
server.on('upgrade', (req, cltSocket, head) => {
if (printDebugLog) {
log.debug(`【server upgrade, ssl: ${ssl}】\r\n----- req -----\r\n`, req)
- } else {
+ }
+ else {
log.info(`【server upgrade, ssl: ${ssl}】`, req.url)
}
upgradeHandler(req, cltSocket, head, ssl)
diff --git a/packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js b/packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js
index 0b2542a470..2a1131add7 100644
--- a/packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js
+++ b/packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js
@@ -73,7 +73,8 @@ module.exports = class CertAndKeyContainer {
if (fast) {
certObj = tlsUtils.createFakeCertificateByDomain(this.caKey, this.caCert, hostname)
_resolve(certObj)
- } else {
+ }
+ else {
// 这个太慢了
// const preReq = https.request({
// port: port,
diff --git a/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js b/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js
index 598cbb3333..2b781cc5eb 100644
--- a/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js
+++ b/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js
@@ -1,12 +1,12 @@
-const http = require('http')
-const https = require('https')
+const http = require('node:http')
+const https = require('node:https')
const forge = require('node-forge')
const CertAndKeyContainer = require('./CertAndKeyContainer')
const tlsUtils = require('./tlsUtils')
const pki = forge.pki
// const colors = require('colors')
-const tls = require('tls')
+const tls = require('node:tls')
const log = require('../../../utils/util.log')
const compatible = require('../compatible/compatible')
@@ -38,7 +38,8 @@ module.exports = class FakeServersCenter {
try {
log.info('超过最大服务数量，删除旧服务。delServerObj:', delServerObj)
delServerObj.serverObj.server.close()
- } catch (e) {
+ }
+ catch (e) {
log.error('`delServerObj.serverObj.server.close()` error:', e)
}
}
@@ -49,7 +50,8 @@ module.exports = class FakeServersCenter {
getServerPromise (hostname, port, ssl, manualCompatibleConfig) {
if (port === 443 || port === 80) {
ssl = port === 443
- } else if (ssl) {
+ }
+ else if (ssl) {
// 自动兼容程序：1
const compatibleConfig = compatible.getConnectCompatibleConfig(hostname, port, manualCompatibleConfig)
if (compatibleConfig && compatibleConfig.ssl != null) {
@@ -105,7 +107,8 @@ module.exports = class FakeServersCenter {
})()
},
})
- } else {
+ }
+ else {
fakeServer = new http.Server()
}
const serverObj = {
@@ -146,7 +149,8 @@ module.exports = class FakeServersCenter {
fakeServer.on('upgrade', (req, socket, head) => {
if (printDebugLog) {
log.debug(`【fakeServer upgrade - ${hostname}:${port}】\r\n----- req -----\r\n`, req, '\r\n----- socket -----\r\n', socket, '\r\n----- head -----\r\n', head)
- } else {
+ }
+ else {
log.info(`【fakeServer upgrade - ${hostname}:${port}】`, req.url)
}
this.upgradeHandler(req, socket, head, ssl)
@@ -165,7 +169,8 @@ module.exports = class FakeServersCenter {
if (ssl === true && err.code.indexOf('ERR_SSL_') === 0) {
compatible.setConnectSsl(hostname, port, false)
log.error(`自动兼容程序：SSL异常，现设置为禁用ssl: ${hostname}:${port}, ssl = false`)
- } else if (ssl === false && err.code === 'HPE_INVALID_METHOD') {
+ }
+ else if (ssl === false && err.code === 'HPE_INVALID_METHOD') {
compatible.setConnectSsl(hostname, port, true)
log.error(`自动兼容程序：${err.code}，现设置为启用ssl: ${hostname}:${port}, ssl = true`)
}
diff --git a/packages/mitmproxy/src/lib/proxy/tls/sniUtil.js b/packages/mitmproxy/src/lib/proxy/tls/sniUtil.js
index c44657e83b..9669f5fa0c 100644
--- a/packages/mitmproxy/src/lib/proxy/tls/sniUtil.js
+++ b/packages/mitmproxy/src/lib/proxy/tls/sniUtil.js
@@ -172,11 +172,13 @@ module.exports = function extractSNI (data) {
end: n + nameLength,
length: nameLength,
}
- } else {
+ }
+ else {
n += nameLength
}
}
- } else { // ExtensionType was something we are not interested in
+ }
+ else { // ExtensionType was something we are not interested in
pos += extensionSize
}
}
diff --git a/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js b/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js
index ee4a97fe92..b545cad276 100644
--- a/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js
+++ b/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js
@@ -1,5 +1,5 @@
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
const _ = require('lodash')
const forge = require('node-forge')
const log = require('../../../utils/util.log')
@@ -244,7 +244,8 @@ utils.initCA = function ({ caCertPath, caKeyPath }) {
caKeyPath,
create: false,
}
- } catch (e) {
+ }
+ catch (e) {
const caObj = utils.createCA(config.caName)
const caCert = caObj.cert
diff --git a/packages/mitmproxy/src/lib/speed/SpeedTester.js b/packages/mitmproxy/src/lib/speed/SpeedTester.js
index f6b2f34f06..dba881cf1e 100644
--- a/packages/mitmproxy/src/lib/speed/SpeedTester.js
+++ b/packages/mitmproxy/src/lib/speed/SpeedTester.js
@@ -1,5 +1,5 @@
// 1个小时不访问，取消获取
-const net = require('net')
+const net = require('node:net')
const _ = require('lodash')
const log = require('../../utils/util.log.js')
const config = require('./config.js')
@@ -124,7 +124,8 @@ class SpeedTester {
}
return a.time - b.time
})
- } catch (e) {
+ }
+ catch (e) {
if (e.message !== 'timeout') {
log.warn('[speed] test error: ', this.hostname, `➜ ${item.host}:${item.port} from DNS '${item.dns}'`, ', errorMsg:', e.message)
}
diff --git a/packages/mitmproxy/src/lib/speed/index.js b/packages/mitmproxy/src/lib/speed/index.js
index 86b7ba0cca..55b92db239 100644
--- a/packages/mitmproxy/src/lib/speed/index.js
+++ b/packages/mitmproxy/src/lib/speed/index.js
@@ -60,7 +60,8 @@ function reSpeedTest () {
function action (event) {
if (event.key === 'reTest') {
reSpeedTest()
- } else if (event.key === 'getList') {
+ }
+ else if (event.key === 'getList') {
process.send({ type: 'speed', event: { key: 'getList', value: getAllSpeedTester() } })
}
}
diff --git a/packages/mitmproxy/src/options.js b/packages/mitmproxy/src/options.js
index 7cf3598a3f..a880530d3f 100644
--- a/packages/mitmproxy/src/options.js
+++ b/packages/mitmproxy/src/options.js
@@ -1,5 +1,5 @@
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
const lodash = require('lodash')
const jsonApi = require('./json')
const dnsUtil = require('./lib/dns')
@@ -24,7 +24,8 @@ function getExclusionArray (exclusions) {
if (exclusions.length > 0) {
ret = exclusions
}
- } else if (lodash.isObject(exclusions)) {
+ }
+ else if (lodash.isObject(exclusions)) {
ret = []
for (const exclusion in exclusions) {
ret.push(exclusion)
@@ -157,7 +158,8 @@ module.exports = (serverConfig) => {
}
}
}
- } catch (e) {
+ }
+ catch (e) {
log.error(`判断拦截器是否排除当前path时出现异常, path: ${rOptions.path}, interceptOpt:`, interceptOpt, ', error:', e)
}
if (isExcluded) {
@@ -189,7 +191,8 @@ module.exports = (serverConfig) => {
interceptor.requestIntercept = (context, req, res, ssl, next) => {
return impl.requestIntercept(context, interceptOpt, req, res, ssl, next, matched)
}
- } else if (impl.responseIntercept) {
+ }
+ else if (impl.responseIntercept) {
// res拦截器
interceptor.responseIntercept = (context, req, res, proxyReq, proxyRes, ssl, next) => {
return impl.responseIntercept(context, interceptOpt, req, res, proxyReq, proxyRes, ssl, next, matched)
@@ -199,7 +202,8 @@ module.exports = (serverConfig) => {
// log.info(`${action} interceptor: ${impl.name}, hostname: ${rOptions.hostname}, regexp: ${regexp}`)
if (action === 'add') {
matchIntercepts.push(interceptor)
- } else {
+ }
+ else {
matchIntercepts[matchedInterceptOpt.index] = interceptor
}
matchInterceptsOpts[impl.name] = {
diff --git a/packages/mitmproxy/src/utils/util.match.js b/packages/mitmproxy/src/utils/util.match.js
index 4404ba0b6d..8668e6b1d0 100644
--- a/packages/mitmproxy/src/utils/util.match.js
+++ b/packages/mitmproxy/src/utils/util.match.js
@@ -12,7 +12,8 @@ function isMatched (url, regexp) {
urlRegexp = `.${regexp}`
}
return url.match(urlRegexp)
- } catch (e) {
+ }
+ catch (e) {
log.error('匹配串有问题:', regexp)
return null
}
@@ -39,7 +40,8 @@ function domainMapRegexply (hostMap) {
if (domain.indexOf('*') === 0 && domain.lastIndexOf('*') === 0) {
origin[domain] = value
}
- } else {
+ }
+ else {
origin[domain] = value
}
})
@@ -168,7 +170,8 @@ function matchHostnameAll (hostMap, hostname, action) {
deleteNullItems(values)
log.info(`matchHostname-all: ${action}: '${hostname}':`, JSON.stringify(values))
return values
- } else {
+ }
+ else {
log.debug(`matchHostname-all: ${action}: '${hostname}' Not-Matched`)
}
}
diff --git a/packages/mitmproxy/test/lib/interceptor/impl/res/responseReplaceTest.js b/packages/mitmproxy/test/lib/interceptor/impl/res/responseReplaceTest.js
index 00ff519773..050fc37db9 100644
--- a/packages/mitmproxy/test/lib/interceptor/impl/res/responseReplaceTest.js
+++ b/packages/mitmproxy/test/lib/interceptor/impl/res/responseReplaceTest.js
@@ -9,12 +9,17 @@ const res = {
const proxyRes = {
rawHeaders: [
- 'Content-Type', 'application/json; charset=utf-8',
- 'Content-Length', '2',
- 'ETag', 'W/"2"',
- 'Date', 'Thu, 01 Jan 1970 00:00:00 GMT',
- 'Connection', 'keep-alive'
- ]
+ 'Content-Type',
+ 'application/json; charset=utf-8',
+ 'Content-Length',
+ '2',
+ 'ETag',
+ 'W/"2"',
+ 'Date',
+ 'Thu, 01 Jan 1970 00:00:00 GMT',
+ 'Connection',
+ 'keep-alive',
+ ],
}
const newHeaders = {
diff --git a/packages/mitmproxy/test/proxyTest.js b/packages/mitmproxy/test/proxyTest.js
index 84a402a147..55d3babdd5 100644
--- a/packages/mitmproxy/test/proxyTest.js
+++ b/packages/mitmproxy/test/proxyTest.js
@@ -1,4 +1,4 @@
-const http = require('http')
+const http = require('node:http')
const options = {
headers: {
diff --git a/test/test.js b/test/test.js
index 9b47d719a2..5ea6546bf1 100644
--- a/test/test.js
+++ b/test/test.js
@@ -59,7 +59,8 @@ function testRequest () {
request('https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js', (error, response, body) => {
if (error) {
console.error(error)
- } else {
+ }
+ else {
console.log(body)
}
})
From a8b6da02d908d80601e6d0e80f1568ea724afe97 Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Mon, 18 Nov 2024 12:21:57 +0800
Subject: [PATCH 12/20] upgrade `electron-updater`
---
packages/gui/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/gui/package.json b/packages/gui/package.json
index 9add504dc7..6e963d0f35 100644
--- a/packages/gui/package.json
+++ b/packages/gui/package.json
@@ -28,7 +28,7 @@
"ant-design-vue": "^1.7.8",
"electron-baidu-tongji": "^1.0.5",
"electron-sudo": "^4.0.12",
- "electron-updater": "^4.3.5",
+ "electron-updater": "^6.3.9",
"json5": "^2.2.3",
"lodash": "^4.17.20",
"request-progress": "^3.0.0",
From 293bbc96aa256d8ab27f9acc75b10f44bc881929 Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Mon, 18 Nov 2024 14:40:43 +0800
Subject: [PATCH 13/20] fix: lint style
---
eslint.config.js | 46 ++++++++--------
packages/cli/src/mitmproxy.js | 3 +-
packages/core/src/config.js | 42 +++++----------
packages/core/src/event.js | 4 +-
packages/core/src/expose.js | 24 +++------
packages/core/src/modules/plugin/git/index.js | 9 ++--
.../core/src/modules/plugin/node/index.js | 12 ++---
.../core/src/modules/plugin/overwall/index.js | 3 +-
packages/core/src/modules/plugin/pip/index.js | 3 +-
packages/core/src/modules/proxy/index.js | 3 +-
packages/core/src/modules/server/index.js | 12 ++---
.../shell/scripts/set-system-proxy/index.js | 51 ++++++------------
packages/core/src/shell/shell.js | 15 ++----
packages/gui/pkg/after-pack.js | 6 +--
packages/gui/src/background.js | 54 +++++++------------
packages/gui/src/background/powerMonitor.js | 12 ++---
packages/gui/src/bridge/api/backend.js | 13 ++---
packages/gui/src/bridge/auto-start/backend.js | 12 ++---
packages/gui/src/bridge/auto-start/front.js | 3 +-
packages/gui/src/bridge/error/front.js | 3 +-
.../gui/src/bridge/file-selector/backend.js | 3 +-
.../gui/src/bridge/file-selector/front.js | 3 +-
packages/gui/src/bridge/tongji/front.js | 4 +-
packages/gui/src/bridge/update/backend.js | 45 ++++++----------
packages/gui/src/bridge/update/front.js | 21 +++-----
packages/gui/src/view/components/setup-ca.vue | 6 +--
packages/gui/src/view/mixins/plugin.js | 9 ++--
packages/gui/src/view/pages/index.vue | 18 +++----
packages/gui/src/view/pages/plugin/git.vue | 3 +-
packages/gui/src/view/pages/proxy.vue | 3 +-
packages/gui/src/view/pages/setting.vue | 34 ++++++------
packages/mitmproxy/src/index.js | 12 ++---
packages/mitmproxy/src/json.js | 6 +--
packages/mitmproxy/src/lib/choice/index.js | 6 +--
packages/mitmproxy/src/lib/dns/base.js | 6 +--
packages/mitmproxy/src/lib/dns/https.js | 9 ++--
packages/mitmproxy/src/lib/dns/index.js | 6 +--
packages/mitmproxy/src/lib/dns/preset.js | 3 +-
.../src/lib/interceptor/impl/req/OPTIONS.js | 3 +-
.../src/lib/interceptor/impl/req/baiduOcr.js | 12 ++---
.../src/lib/interceptor/impl/req/cacheReq.js | 3 +-
.../src/lib/interceptor/impl/req/proxy.js | 12 ++---
.../interceptor/impl/req/requestReplace.js | 3 +-
.../src/lib/interceptor/impl/res/cacheRes.js | 21 +++-----
.../interceptor/impl/res/responseReplace.js | 3 +-
.../src/lib/interceptor/impl/res/script.js | 21 +++-----
packages/mitmproxy/src/lib/monkey/index.js | 12 ++---
.../mitmproxy/src/lib/proxy/common/util.js | 30 ++++-------
.../src/lib/proxy/compatible/compatible.js | 12 ++---
.../middleware/InsertScriptMiddleware.js | 6 +--
.../src/lib/proxy/middleware/overwall.js | 24 +++------
.../src/lib/proxy/middleware/source/pac.js | 3 +-
.../proxy/mitmproxy/createConnectHandler.js | 9 ++--
.../proxy/mitmproxy/createFakeServerCenter.js | 3 +-
.../proxy/mitmproxy/createRequestHandler.js | 36 +++++--------
.../src/lib/proxy/mitmproxy/dnsLookup.js | 9 ++--
.../src/lib/proxy/mitmproxy/index.js | 3 +-
.../src/lib/proxy/tls/CertAndKeyContainer.js | 3 +-
.../src/lib/proxy/tls/FakeServersCenter.js | 15 ++----
.../mitmproxy/src/lib/proxy/tls/sniUtil.js | 6 +--
.../mitmproxy/src/lib/proxy/tls/tlsUtils.js | 3 +-
.../mitmproxy/src/lib/speed/SpeedTester.js | 3 +-
packages/mitmproxy/src/lib/speed/index.js | 3 +-
packages/mitmproxy/src/options.js | 16 +++---
packages/mitmproxy/src/utils/util.match.js | 9 ++--
test/test.js | 3 +-
66 files changed, 293 insertions(+), 520 deletions(-)
diff --git a/eslint.config.js b/eslint.config.js
index b3d5942540..46f5abf62b 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,24 +1,28 @@
import antfu from '@antfu/eslint-config'
-export default antfu({
- vue: {
- vueVersion: 2,
+export default antfu(
+ {
+ vue: {
+ vueVersion: 2,
+ },
+ rules: {
+ 'style/brace-style': ['error', '1tbs'],
+ 'style/space-before-function-paren': ['error', 'always'],
+ 'import/newline-after-import': 'off',
+ 'import/first': 'off',
+ 'perfectionist/sort-imports': 'off',
+ 'node/prefer-global/buffer': 'off',
+ 'node/prefer-global/process': 'off',
+ 'no-console': 'off',
+ },
+ ignores: [
+ '**/build/*',
+ '**/dist_electron',
+ ],
+ formatters: {
+ css: true,
+ html: true,
+ markdown: 'prettier',
+ },
},
- rules: {
- 'style/space-before-function-paren': ['error', 'always'],
- 'node/prefer-global/buffer': 'off',
- 'node/prefer-global/process': 'off',
- 'no-console': 'off',
- },
- ignore: [
- '**/node_modules/*',
- '**/build/*',
- '**/test/*',
- '**/dist_electron/*',
- ],
- formatters: {
- css: true,
- html: true,
- markdown: 'prettier',
- },
-})
+)
diff --git a/packages/cli/src/mitmproxy.js b/packages/cli/src/mitmproxy.js
index b17a546606..a86035d063 100644
--- a/packages/cli/src/mitmproxy.js
+++ b/packages/cli/src/mitmproxy.js
@@ -9,8 +9,7 @@ const home = process.env.USER_HOME || process.env.HOME || 'C:/Users/Administrato
let configPath
if (process.argv && process.argv.length > 3) {
configPath = process.argv[2]
-}
-else {
+} else {
configPath = path.join(home, '.dev-sidecar/running.json')
}
diff --git a/packages/core/src/config.js b/packages/core/src/config.js
index e4eac3b3f1..a591d09086 100644
--- a/packages/core/src/config.js
+++ b/packages/core/src/config.js
@@ -30,8 +30,7 @@ function _getConfigPath () {
const dir = getDefaultConfigBasePath()
if (!fs.existsSync(dir)) {
fs.mkdirSync(dir)
- }
- else {
+ } else {
// 兼容1.7.3及以下版本的配置文件处理逻辑
const newFilePath = path.join(dir, '/config.json')
const oldFilePath = path.join(dir, '/config.json5')
@@ -53,8 +52,7 @@ const configApi = {
try {
await configApi.downloadRemoteConfig()
configApi.reload()
- }
- catch (e) {
+ } catch (e) {
log.error('定时下载远程配置并重载配置失败', e)
}
}
@@ -104,8 +102,7 @@ const configApi = {
log.warn('下载远程配置成功，但内容为空:', remoteConfigUrl)
resolve()
return
- }
- else {
+ } else {
log.info('下载远程配置成功:', remoteConfigUrl)
}
@@ -113,8 +110,7 @@ const configApi = {
let remoteConfig
try {
remoteConfig = jsonApi.parse(body)
- }
- catch (e) {
+ } catch (e) {
log.error(`远程配置内容格式不正确, url: ${remoteConfigUrl}, body: ${body}`)
remoteConfig = null
}
@@ -123,21 +119,18 @@ const configApi = {
const remoteSavePath = _getRemoteSavePath(suffix)
fs.writeFileSync(remoteSavePath, body)
log.info('保存远程配置文件成功:', remoteSavePath)
- }
- else {
+ } else {
log.warn('远程配置对象为空:', remoteConfigUrl)
}
resolve()
- }
- else {
+ } else {
log.error(`下载远程配置失败: ${remoteConfigUrl}, response:`, response, ', body:', body)
let message
if (response) {
message = `下载远程配置失败: ${remoteConfigUrl}, message: ${response.message}, code: ${response.statusCode}`
- }
- else {
+ } else {
message = `下载远程配置失败: response: ${response}`
}
reject(new Error(message))
@@ -161,8 +154,7 @@ const configApi = {
if (!get().app.remoteConfig.personalUrl) {
return '{}'
}
- }
- else if (suffix === '') {
+ } else if (suffix === '') {
if (!get().app.remoteConfig.url) {
return '{}'
}
@@ -175,12 +167,10 @@ const configApi = {
const file = fs.readFileSync(path)
log.info('读取远程配置文件内容成功:', path)
return file.toString()
- }
- else {
+ } else {
log.warn('远程配置文件不存在:', path)
}
- }
- catch (e) {
+ } catch (e) {
log.error('读取远程配置文件内容失败:', e)
}
@@ -230,8 +220,7 @@ const configApi = {
if (!fs.existsSync(configPath)) {
userConfig = {}
log.info('config.json 文件不存在:', configPath)
- }
- else {
+ } else {
const file = fs.readFileSync(configPath)
log.info('读取 config.json 成功:', configPath)
const fileStr = file.toString()
@@ -276,8 +265,7 @@ const configApi = {
if (get().app.remoteConfig.personalUrl) {
mergeApi.doMerge(merged, personalRemoteConfig) // 再合并一次个人远程配置，使配置生效
}
- }
- else {
+ } else {
mergeApi.doMerge(merged, defConfig) // 合并默认配置
}
if (newConfig != null) {
@@ -318,8 +306,7 @@ const configApi = {
configApi.load(null)
return true // 删除并重新加载配置成功
- }
- else {
+ } else {
return false // config.json 文件不存在
}
},
@@ -328,8 +315,7 @@ const configApi = {
let value = lodash.get(defConfig, key)
value = lodash.cloneDeep(value)
lodash.set(configTarget, key, value)
- }
- else {
+ } else {
configTarget = lodash.cloneDeep(defConfig)
}
return configTarget
diff --git a/packages/core/src/event.js b/packages/core/src/event.js
index 94df10002f..ea136cfadd 100644
--- a/packages/core/src/event.js
+++ b/packages/core/src/event.js
@@ -6,7 +6,9 @@ function register (channel, handle, order = 10) {
handles = listener[channel] = []
}
handles.push({ id: index, handle, order })
- handles.sort((a, b) => { return a.order - b.order })
+ handles.sort((a, b) => {
+ return a.order - b.order
+ })
return index++
}
function fire (channel, event) {
diff --git a/packages/core/src/expose.js b/packages/core/src/expose.js
index b4c030fe94..ee3593b2cf 100644
--- a/packages/core/src/expose.js
+++ b/packages/core/src/expose.js
@@ -46,16 +46,14 @@ async function startup ({ mitmproxyPath }) {
if (conf.server.enabled) {
try {
await server.start({ mitmproxyPath })
- }
- catch (err) {
+ } catch (err) {
log.error('代理服务启动失败：', err)
}
}
if (conf.proxy.enabled) {
try {
await proxy.start()
- }
- catch (err) {
+ } catch (err) {
log.error('开启系统代理失败：', err)
}
}
@@ -67,8 +65,7 @@ async function startup ({ mitmproxyPath }) {
try {
await plugin[key].start()
log.info(`插件【${key}】已启动`)
- }
- catch (err) {
+ } catch (err) {
log.error(`插件【${key}】启动失败:`, err)
}
}
@@ -78,8 +75,7 @@ async function startup ({ mitmproxyPath }) {
if (plugins && plugins.length > 0) {
await Promise.all(plugins)
}
- }
- catch (err) {
+ } catch (err) {
log.error('开启插件失败：', err)
}
}
@@ -93,8 +89,7 @@ async function shutdown () {
try {
await plugin[key].close()
log.info(`插件【${key}】已关闭`)
- }
- catch (err) {
+ } catch (err) {
log.error(`插件【${key}】关闭失败:`, err)
}
}
@@ -104,8 +99,7 @@ async function shutdown () {
if (plugins.length > 0) {
await Promise.all(plugins)
}
- }
- catch (error) {
+ } catch (error) {
log.error('插件关闭失败:', error)
}
@@ -113,8 +107,7 @@ async function shutdown () {
try {
await proxy.close()
log.info('系统代理已关闭')
- }
- catch (err) {
+ } catch (err) {
log.error('系统代理关闭失败:', err)
}
}
@@ -122,8 +115,7 @@ async function shutdown () {
try {
await server.close()
log.info('代理服务已关闭')
- }
- catch (err) {
+ } catch (err) {
log.error('代理服务关闭失败:', err)
}
}
diff --git a/packages/core/src/modules/plugin/git/index.js b/packages/core/src/modules/plugin/git/index.js
index ba3a7c24be..43fee407ca 100644
--- a/packages/core/src/modules/plugin/git/index.js
+++ b/packages/core/src/modules/plugin/git/index.js
@@ -56,15 +56,13 @@ const Plugin = function (context) {
try {
await shell.exec(['git config --global --unset https.proxy '], { type: 'cmd' })
- }
- catch (ignore) {
+ } catch (ignore) {
}
if (config.get().plugin.git.setting.sslVerify === true) {
try {
await shell.exec(['git config --global --unset http.sslVerify '], { type: 'cmd' })
- }
- catch (ignore) {
+ } catch (ignore) {
}
}
@@ -72,8 +70,7 @@ const Plugin = function (context) {
for (const url in config.get().plugin.git.setting.noProxyUrls) {
try {
await shell.exec([`git config --global --unset http."${url}".proxy `], { type: 'cmd' })
- }
- catch (ignore) {
+ } catch (ignore) {
}
}
}
diff --git a/packages/core/src/modules/plugin/node/index.js b/packages/core/src/modules/plugin/node/index.js
index ac4fe3950f..e19269555c 100644
--- a/packages/core/src/modules/plugin/node/index.js
+++ b/packages/core/src/modules/plugin/node/index.js
@@ -7,8 +7,7 @@ const NodePlugin = function (context) {
async start () {
try {
await nodeApi.setVariables()
- }
- catch (err) {
+ } catch (err) {
log.warn('set variables error:', err)
}
@@ -48,8 +47,7 @@ const NodePlugin = function (context) {
for (const item of list) {
if (item.value != null && item.value.length > 0 && item.value !== 'default' && item.value !== 'null') {
cmds.push(`${command} config set ${item.key} ${item.value}`)
- }
- else {
+ } else {
cmds.push(`${command} config delete ${item.key}`)
}
}
@@ -72,8 +70,7 @@ const NodePlugin = function (context) {
for (const item of list) {
if (item.value != null && item.value.length > 0 && item.value !== 'default' && item.value !== 'null') {
cmds.push(`yarn config set ${item.key} ${item.value}`)
- }
- else {
+ } else {
cmds.push(`yarn config delete ${item.key}`)
}
}
@@ -118,8 +115,7 @@ const NodePlugin = function (context) {
async setRegistry ({ registry, type }) {
if (type === 'npm') {
await nodeApi.setNpmEnv([{ key: 'registry', value: registry }])
- }
- else {
+ } else {
await nodeApi.setYarnEnv([{ key: 'registry', value: registry }])
}
return true
diff --git a/packages/core/src/modules/plugin/overwall/index.js b/packages/core/src/modules/plugin/overwall/index.js
index 656a309419..7842449815 100644
--- a/packages/core/src/modules/plugin/overwall/index.js
+++ b/packages/core/src/modules/plugin/overwall/index.js
@@ -28,8 +28,7 @@ const Plugin = function (context) {
for (const key in server) {
if (i === 0) {
main = key
- }
- else {
+ } else {
backup.push(key)
}
i++
diff --git a/packages/core/src/modules/plugin/pip/index.js b/packages/core/src/modules/plugin/pip/index.js
index 6108b5edb8..63572ceef9 100644
--- a/packages/core/src/modules/plugin/pip/index.js
+++ b/packages/core/src/modules/plugin/pip/index.js
@@ -48,8 +48,7 @@ const PipPlugin = function (context) {
for (const item of list) {
if (item.value != null) {
cmds.push(`${command} config set global.${item.key} ${item.value}`)
- }
- else {
+ } else {
cmds.push(`${command} config unset global.${item.key}`)
}
}
diff --git a/packages/core/src/modules/proxy/index.js b/packages/core/src/modules/proxy/index.js
index b618a99cf3..7a01cef6bc 100644
--- a/packages/core/src/modules/proxy/index.js
+++ b/packages/core/src/modules/proxy/index.js
@@ -33,8 +33,7 @@ const ProxyPlugin = function (context) {
event.fire('status', { key: 'proxy.enabled', value: false })
log.info('关闭系统代理成功')
return true
- }
- catch (err) {
+ } catch (err) {
log.error('关闭系统代理失败:', err)
return false
}
diff --git a/packages/core/src/modules/server/index.js b/packages/core/src/modules/server/index.js
index 2eacd07b28..c0d2f85fa5 100644
--- a/packages/core/src/modules/server/index.js
+++ b/packages/core/src/modules/server/index.js
@@ -102,16 +102,14 @@ const serverApi = {
log.info('收到子进程消息:', JSON.stringify(msg))
if (msg.type === 'status') {
fireStatus(msg.event)
- }
- else if (msg.type === 'error') {
+ } else if (msg.type === 'error') {
let code = ''
if (msg.event.code) {
code = msg.event.code
}
fireStatus(false) // 启动失败
event.fire('error', { key: 'server', value: code, error: msg.event, message: msg.message })
- }
- else if (msg.type === 'speed') {
+ } else if (msg.type === 'speed') {
event.fire('speed', msg.event)
}
})
@@ -141,14 +139,12 @@ const serverApi = {
}
log.warn('代理服务关闭失败:', err)
reject(err)
- }
- else {
+ } else {
log.info('代理服务关闭成功')
resolve()
}
})
- }
- else {
+ } else {
log.info('server is null')
resolve()
}
diff --git a/packages/core/src/shell/scripts/set-system-proxy/index.js b/packages/core/src/shell/scripts/set-system-proxy/index.js
index f525903338..05d6c9cfe0 100644
--- a/packages/core/src/shell/scripts/set-system-proxy/index.js
+++ b/packages/core/src/shell/scripts/set-system-proxy/index.js
@@ -44,8 +44,7 @@ async function _winUnsetProxy (exec, setEnv) {
})
}
})
- }
- catch (e) {
+ } catch (e) {
log.error('删除环境变量 HTTPS_PROXY、HTTP_PROXY 失败:', e)
}
}
@@ -68,8 +67,7 @@ async function downloadDomesticDomainAllowListAsync () {
if (body == null || body.length < 100) {
log.warn('下载远程 domestic-domain-allowlist.txt 文件成功，但内容为空或内容太短，判断为无效的 domestic-domain-allowlist.txt 文件:', remoteFileUrl, ', body:', body)
return
- }
- else {
+ } else {
log.info('下载远程 domestic-domain-allowlist.txt 文件成功:', remoteFileUrl)
}
@@ -79,8 +77,7 @@ async function downloadDomesticDomainAllowListAsync () {
fileTxt = Buffer.from(fileTxt, 'base64').toString('utf8')
// log.debug('解析 base64 后的 domestic-domain-allowlist:', fileTxt)
}
- }
- catch (e) {
+ } catch (e) {
if (!fileTxt.includes('*.')) {
log.error(`远程 domestic-domain-allowlist.txt 文件内容即不是base64格式，也不是要求的格式，url: ${remoteFileUrl}，body: ${body}`)
return
@@ -89,8 +86,7 @@ async function downloadDomesticDomainAllowListAsync () {
// 保存到本地
saveDomesticDomainAllowListFile(fileTxt)
- }
- else {
+ } else {
log.error(`下载远程 domestic-domain-allowlist.txt 文件失败: ${remoteFileUrl}, response:`, response, ', body:', body)
}
})
@@ -101,8 +97,7 @@ function loadLastModifiedTimeFromTxt (fileTxt) {
if (matched && matched.length > 0) {
try {
return new Date(matched[0])
- }
- catch (ignore) {
+ } catch (ignore) {
return null
}
}
@@ -127,8 +122,7 @@ function saveDomesticDomainAllowListFile (fileTxt) {
fs.utimes(filePath, lastModifiedTime, lastModifiedTime, (utimesErr) => {
if (utimesErr) {
log.error('修改 domestic-domain-allowlist.txt 文件时间失败:', utimesErr)
- }
- else {
+ } else {
log.info(`'${filePath}' 文件的修改时间已更新为其最近更新时间 '${formatDate(lastModifiedTime)}'`)
}
})
@@ -169,22 +163,19 @@ function getDomesticDomainAllowList () {
// 如果临时文件已存在，则使用临时文件
fileAbsolutePath = tmpFilePath
log.info('读取已下载的 domestic-domain-allowlist.txt 文件:', fileAbsolutePath)
- }
- else {
+ } else {
// 如果临时文件不存在，则使用内置文件
log.info('__dirname:', __dirname)
fileAbsolutePath = path.join(__dirname, '../', config.get().proxy.domesticDomainAllowListFilePath)
log.info('读取内置的 domestic-domain-allowlist.txt 文件:', fileAbsolutePath)
}
- }
- else {
+ } else {
log.info('读取自定义路径的 domestic-domain-allowlist.txt 文件:', fileAbsolutePath)
}
try {
return fs.readFileSync(fileAbsolutePath).toString()
- }
- catch (e) {
+ } catch (e) {
log.error(`读取 domestic-domain-allowlist.txt 文件失败: ${fileAbsolutePath}, error:`, e)
return null
}
@@ -207,13 +198,11 @@ function getProxyExcludeIpStr (split) {
if (domesticDomainAllowList) {
excludeIpStr += domesticDomainAllowList
log.info('系统代理排除列表拼接国内域名')
- }
- else {
+ } else {
log.info('国内域名为空，不进行系统代理排除列表拼接国内域名')
}
}
- }
- catch (e) {
+ } catch (e) {
log.error('系统代理排除列表拼接国内域名失败:', e)
}
}
@@ -257,8 +246,7 @@ async function _winSetProxy (exec, ip, port, setEnv) {
}
// await addClearScriptIni()
- }
- catch (e) {
+ } catch (e) {
log.error('设置环境变量 HTTPS_PROXY、HTTP_PROXY 失败:', e)
}
}
@@ -272,8 +260,7 @@ const executor = {
if (ip != null) { // 设置代理
log.info('设置windows系统代理:', ip, port, setEnv)
return _winSetProxy(exec, ip, port, setEnv)
- }
- else { // 关闭代理
+ } else { // 关闭代理
log.info('关闭windows系统代理')
return _winUnsetProxy(exec, setEnv)
}
@@ -294,8 +281,7 @@ const executor = {
if (config.get().proxy.proxyHttp) {
setProxyCmd.push(`gsettings set org.gnome.system.proxy.http host ${ip}`)
setProxyCmd.push(`gsettings set org.gnome.system.proxy.http port ${port - 1}`)
- }
- else {
+ } else {
setProxyCmd.push('gsettings set org.gnome.system.proxy.http host \'\'')
setProxyCmd.push('gsettings set org.gnome.system.proxy.http port 0')
}
@@ -305,8 +291,7 @@ const executor = {
setProxyCmd.push(`gsettings set org.gnome.system.proxy ignore-hosts "['${excludeIpStr}']"`)
await exec(setProxyCmd)
- }
- else { // 关闭代理
+ } else { // 关闭代理
const setProxyCmd = [
'gsettings set org.gnome.system.proxy mode none',
]
@@ -328,8 +313,7 @@ const executor = {
// http
if (config.get().proxy.proxyHttp) {
await exec(`networksetup -setwebproxy "${wifiAdaptor}" ${ip} ${port - 1}`)
- }
- else {
+ } else {
await exec(`networksetup -setwebproxystate "${wifiAdaptor}" off`)
}
@@ -344,8 +328,7 @@ const executor = {
// source ~/.zshrc
// `
// await exec(setEnv)
- }
- else { // 关闭代理
+ } else { // 关闭代理
// https
await exec(`networksetup -setsecurewebproxystate "${wifiAdaptor}" off`)
// http
diff --git a/packages/core/src/shell/shell.js b/packages/core/src/shell/shell.js
index 7b16c4eaf5..9ab1facb3b 100644
--- a/packages/core/src/shell/shell.js
+++ b/packages/core/src/shell/shell.js
@@ -60,12 +60,10 @@ class WindowsSystemShell extends SystemShell {
const ret = await ps.invoke()
// log.info('ps complete', cmds)
return ret
- }
- finally {
+ } finally {
ps.dispose()
}
- }
- else {
+ } else {
let compose = 'echo "test" ' // 'chcp 65001 '
for (const cmd of cmds) {
compose += ` && ${cmd}`
@@ -88,8 +86,7 @@ function _childExec (composeCmds, options = {}) {
log.error('cmd 命令执行错误：\n===>\ncommands:', composeCmds, '\n error:', error, '\n<===')
}
reject(new Error(stderr))
- }
- else {
+ } else {
// log.info('cmd 命令完成：', stdout)
resolve(stdout)
}
@@ -114,8 +111,7 @@ function childExec (composeCmds, options = {}) {
log.error('cmd 命令执行错误：\n------------------------------\ncommands:', composeCmds, '\n message:', message, '\n error:', error, '\n------------------------------')
}
reject(new Error(message))
- }
- else {
+ } else {
// log.info('cmd 命令完成：', stdout)
const message = iconv.decode(Buffer.from(stdout, binaryEncoding), encoding)
resolve(message)
@@ -171,8 +167,7 @@ async function execFile (file, args, options) {
log.debug('文件执行成功：', file)
resolve(stdout)
})
- }
- catch (e) {
+ } catch (e) {
log.error('文件执行出错：', file, e)
reject(e)
}
diff --git a/packages/gui/pkg/after-pack.js b/packages/gui/pkg/after-pack.js
index f897f08eac..699593be51 100644
--- a/packages/gui/pkg/after-pack.js
+++ b/packages/gui/pkg/after-pack.js
@@ -24,13 +24,11 @@ exports.default = async function (context) {
if (context.packager.platform.nodeName === 'darwin') {
targetPath = path.join(context.appOutDir, `${context.packager.appInfo.productName}.app/Contents/Resources`)
systemType = 'mac'
- }
- else if (context.packager.platform.nodeName === 'linux') {
+ } else if (context.packager.platform.nodeName === 'linux') {
targetPath = path.join(context.appOutDir, './resources')
systemType = 'linux'
writeAppUpdateYmlForLinux()
- }
- else {
+ } else {
targetPath = path.join(context.appOutDir, './resources')
systemType = 'win'
}
diff --git a/packages/gui/src/background.js b/packages/gui/src/background.js
index aa4a72797c..f755123c07 100644
--- a/packages/gui/src/background.js
+++ b/packages/gui/src/background.js
@@ -34,8 +34,7 @@ function openDevTools () {
log.debug('尝试打开 `开发者工具`')
win.webContents.openDevTools()
log.debug('打开 `开发者工具` 成功')
- }
- catch (e) {
+ } catch (e) {
log.error('打开 `开发者工具` 失败:', e)
}
}
@@ -45,8 +44,7 @@ function closeDevTools () {
log.debug('尝试关闭 `开发者工具`')
win.webContents.closeDevTools()
log.debug('关闭 `开发者工具` 成功')
- }
- catch (e) {
+ } catch (e) {
log.error('关闭 `开发者工具` 失败:', e)
}
}
@@ -57,8 +55,7 @@ function switchDevTools () {
}
if (win.webContents.isDevToolsOpened()) {
closeDevTools()
- }
- else {
+ } else {
openDevTools()
}
}
@@ -105,8 +102,7 @@ function setTray () {
if (nativeTheme.shouldUseDarkColors) {
console.log('i am dark.')
tray.setImage(iconWhitePath)
- }
- else {
+ } else {
console.log('i am light.')
tray.setImage(iconBlackPath)
// tray.setPressedImage(iconWhitePath)
@@ -204,8 +200,7 @@ function createWindow (startHideWindow) {
if (!process.env.IS_TEST) {
setTimeout(openDevTools, 2000)
}
- }
- else {
+ } else {
createProtocol('app')
// Load the index.html when not in development
win.loadURL('app://./index.html')
@@ -224,8 +219,7 @@ function createWindow (startHideWindow) {
ipcMain.on('close', async (event, message) => {
if (message.value === 1) {
quit()
- }
- else {
+ } else {
hideWin()
}
})
@@ -245,12 +239,10 @@ function createWindow (startHideWindow) {
if (closeStrategy === 0) {
// 弹窗提示，选择关闭策略
win.webContents.send('close.showTip', closeStrategy)
- }
- else if (closeStrategy === 1) {
+ } else if (closeStrategy === 1) {
// 直接退出
quit()
- }
- else if (closeStrategy === 2) {
+ } else if (closeStrategy === 2) {
// 隐藏窗口
hideWin()
}
@@ -328,8 +320,7 @@ function registerShowHideShortcut (showHideShortcut) {
if (winIsHidden) {
showWin()
}
- }
- else {
+ } else {
// linux，快捷键不关闭窗口
if (!isLinux()) {
hideWin()
@@ -339,12 +330,10 @@ function registerShowHideShortcut (showHideShortcut) {
if (registerSuccess) {
log.info('注册快捷键成功:', DevSidecar.api.config.get().app.showHideShortcut)
- }
- else {
+ } else {
log.error('注册快捷键失败:', DevSidecar.api.config.get().app.showHideShortcut)
}
- }
- catch (e) {
+ } catch (e) {
log.error('注册快捷键异常:', DevSidecar.api.config.get().app.showHideShortcut, ', error:', e)
}
}
@@ -370,8 +359,7 @@ app.disableHardwareAcceleration() // 禁用gpu
let startHideWindow = !DevSidecar.api.config.get().app.startShowWindow
if (app.getLoginItemSettings().wasOpenedAsHidden) {
startHideWindow = true
-}
-else if (process.argv) {
+} else if (process.argv) {
const args = minimist(process.argv)
log.info('start args:', args)
@@ -379,8 +367,7 @@ else if (process.argv) {
const hideWindowArg = `${args.hideWindow}`
if (hideWindowArg === 'true' || hideWindowArg === '1') {
startHideWindow = true
- }
- else if (hideWindowArg === 'false' || hideWindowArg === '0') {
+ } else if (hideWindowArg === 'false' || hideWindowArg === '0') {
startHideWindow = false
}
}
@@ -393,8 +380,7 @@ if (!isFirstInstance) {
setTimeout(() => {
app.quit()
}, 1000)
-}
-else {
+} else {
app.on('before-quit', async () => {
log.info('before-quit')
if (process.platform === 'darwin') {
@@ -428,8 +414,7 @@ else {
// dock icon is clicked and there are no other windows open.
if (win == null) {
createWindow(false)
- }
- else {
+ } else {
showWin()
}
})
@@ -452,16 +437,14 @@ else {
createWindow(startHideWindow)
const context = { win, app, beforeQuit, quit, ipcMain, dialog, log, api: DevSidecar.api, changeAppConfig }
backend.install(context) // 模块安装
- }
- catch (err) {
+ } catch (err) {
log.info('error:', err)
}
try {
// 最小化到托盘
tray = setTray()
- }
- catch (err) {
+ } catch (err) {
log.info('error:', err)
}
@@ -489,8 +472,7 @@ if (isDevelopment) {
quit()
}
})
- }
- else {
+ } else {
process.on('SIGINT', () => {
quit()
})
diff --git a/packages/gui/src/background/powerMonitor.js b/packages/gui/src/background/powerMonitor.js
index 335f8a67d7..3431fe623d 100644
--- a/packages/gui/src/background/powerMonitor.js
+++ b/packages/gui/src/background/powerMonitor.js
@@ -34,8 +34,7 @@ class PowerMonitor {
releaseShutdownBlock()
this._shutdownCallback = null
}
- }
- else {
+ } else {
return _powerMonitor.removeAllListeners(event)
}
}
@@ -51,8 +50,7 @@ class PowerMonitor {
acquireShutdownBlock('正在停止 DevSidecar 代理')
}
this._listeners.push(listener)
- }
- else {
+ } else {
return _powerMonitor.on(event, listener)
}
}
@@ -60,8 +58,7 @@ class PowerMonitor {
off (event, listener) {
if (event === 'shutdown' && process.platform === 'win32') {
this._listeners = this._listeners.filter(fn => fn !== listener)
- }
- else {
+ } else {
return _powerMonitor.off(event, listener)
}
}
@@ -69,8 +66,7 @@ class PowerMonitor {
once (event, listener) {
if (event === 'shutdown' && process.platform === 'win32') {
return this.on(event, listener)
- }
- else {
+ } else {
return _powerMonitor.once(event, listener)
}
}
diff --git a/packages/gui/src/bridge/api/backend.js b/packages/gui/src/bridge/api/backend.js
index d839a6f3da..7fbd3414c1 100644
--- a/packages/gui/src/bridge/api/backend.js
+++ b/packages/gui/src/bridge/api/backend.js
@@ -1,5 +1,5 @@
-import fs from 'fs'
-import path from 'path'
+import fs from 'node:fs'
+import path from 'node:path'
import DevSidecar from '@docmirror/dev-sidecar'
import { ipcMain } from 'electron'
import lodash from 'lodash'
@@ -66,8 +66,7 @@ const localApi = {
try {
setting = jsonApi.parse(file.toString())
log.info('读取 setting.json 成功:', settingPath)
- }
- catch (e) {
+ } catch (e) {
log.error('读取 setting.json 失败:', settingPath, ', error:', e)
}
if (setting == null) {
@@ -131,8 +130,7 @@ function _deepFindFunction (list, parent, parentKey) {
const item = parent[key]
if (item instanceof Function) {
list.push(parentKey + key)
- }
- else if (item instanceof Object) {
+ } else if (item instanceof Object) {
_deepFindFunction(list, item, `${parentKey + key}.`)
}
}
@@ -142,8 +140,7 @@ function _getSettingsPath () {
const dir = getDefaultConfigBasePath()
if (!fs.existsSync(dir)) {
fs.mkdirSync(dir)
- }
- else {
+ } else {
// 兼容1.7.3及以下版本的配置文件处理逻辑
const newFilePath = path.join(dir, '/setting.json')
const oldFilePath = path.join(dir, '/setting.json5')
diff --git a/packages/gui/src/bridge/auto-start/backend.js b/packages/gui/src/bridge/auto-start/backend.js
index 9748cb21f0..fed4d26513 100644
--- a/packages/gui/src/bridge/auto-start/backend.js
+++ b/packages/gui/src/bridge/auto-start/backend.js
@@ -19,8 +19,7 @@ Comment=
EOF
`
await DevSidecar.api.shell.exec(cmd)
- }
- else {
+ } else {
const removeStart = 'sudo rm ~/.config/autostart/dev-sidecar.desktop -rf'
await DevSidecar.api.shell.exec(removeStart)
}
@@ -40,8 +39,7 @@ export default {
if (message.value) {
if (isLinux) {
await setAutoStartForLinux(app, true)
- }
- else {
+ } else {
app.setLoginItemSettings({
openAtLogin: true,
openAsHidden: true,
@@ -53,12 +51,10 @@ export default {
}
event.sender.send('auto-start', { key: 'enabled', value: true })
- }
- else {
+ } else {
if (isLinux) {
await setAutoStartForLinux(app, false)
- }
- else {
+ } else {
app.setLoginItemSettings({
openAtLogin: false,
openAsHidden: false,
diff --git a/packages/gui/src/bridge/auto-start/front.js b/packages/gui/src/bridge/auto-start/front.js
index bf445a5d65..4d19525b1a 100644
--- a/packages/gui/src/bridge/auto-start/front.js
+++ b/packages/gui/src/bridge/auto-start/front.js
@@ -2,8 +2,7 @@ function install (app, api) {
api.ipc.on('auto-start', (event, message) => {
if (message.value === true) {
app.$message.info('已添加开机自启')
- }
- else {
+ } else {
app.$message.info('已取消开机自启')
}
})
diff --git a/packages/gui/src/bridge/error/front.js b/packages/gui/src/bridge/error/front.js
index 1935c65f6d..abb835f4c7 100644
--- a/packages/gui/src/bridge/error/front.js
+++ b/packages/gui/src/bridge/error/front.js
@@ -29,8 +29,7 @@ function handleServerStartError (message, err, app, api) {
console.log('Cancel')
},
})
- }
- else {
+ } else {
app.$message.error(`加速服务启动失败：${message.message}`)
}
}
diff --git a/packages/gui/src/bridge/file-selector/backend.js b/packages/gui/src/bridge/file-selector/backend.js
index 6bf745c89f..6cdec455ed 100644
--- a/packages/gui/src/bridge/file-selector/backend.js
+++ b/packages/gui/src/bridge/file-selector/backend.js
@@ -9,8 +9,7 @@ export default {
}).then((result) => {
if (result.canceled) {
event.sender.send('file-selector', { key: 'canceled' })
- }
- else {
+ } else {
event.sender.send('file-selector', { key: 'selected', value: result.filePaths })
}
}).catch((err) => {
diff --git a/packages/gui/src/bridge/file-selector/front.js b/packages/gui/src/bridge/file-selector/front.js
index 27b4828bb3..69b0d31b5b 100644
--- a/packages/gui/src/bridge/file-selector/front.js
+++ b/packages/gui/src/bridge/file-selector/front.js
@@ -7,8 +7,7 @@ function install (app, api) {
console.log('selector', message)
if (message.key === 'selected') {
resolve(message.value)
- }
- else {
+ } else {
reject(new Error('没有选择文件'))
}
api.ipc.on('file-selector', () => {})
diff --git a/packages/gui/src/bridge/tongji/front.js b/packages/gui/src/bridge/tongji/front.js
index 53cdf37f55..4d54f3bc8b 100644
--- a/packages/gui/src/bridge/tongji/front.js
+++ b/packages/gui/src/bridge/tongji/front.js
@@ -19,7 +19,9 @@ function ebtRenderer (ipcRenderer, siteId, router) {
ipcRenderer.on('electron-baidu-tongji-reply', (_, { text, isDevelopment }) => {
console.log('electron-baidu-tongji-reply')
/* istanbul ignore else */
- if (isDevelopment) { document.body.classList.add('electron-baidu-tongji_dev') }
+ if (isDevelopment) {
+ document.body.classList.add('electron-baidu-tongji_dev')
+ }
window._hmt = window._hmt || []
diff --git a/packages/gui/src/bridge/update/backend.js b/packages/gui/src/bridge/update/backend.js
index 8d51805b9f..3b8eda1bb0 100644
--- a/packages/gui/src/bridge/update/backend.js
+++ b/packages/gui/src/bridge/update/backend.js
@@ -85,16 +85,14 @@ function isNewVersion (version, curVersion) {
if (versionObj.suffix > curVersionObj.suffix) {
return 41
}
- }
- else if (!versionObj.suffix && curVersionObj.suffix) {
+ } else if (!versionObj.suffix && curVersionObj.suffix) {
// 线上版本号没有后缀版本号，说明为正式版本，为更新版本
return 42
}
}
}
}
- }
- catch (e) {
+ } catch (e) {
log.error(`比对版本失败，当前版本号：${curVersion}，比对版本号：${version}, error:`, e)
return -99
}
@@ -127,11 +125,9 @@ function updateHandle (app, api, win, beforeQuit, quit, log) {
// })
if (isMac) {
autoUpdater.updateConfigPath = path.join(__dirname, 'mac/dev-sidecar.app/Contents/Resources/app-update.yml')
- }
- else if (isLinux) {
+ } else if (isLinux) {
autoUpdater.updateConfigPath = path.join(__dirname, 'linux-unpacked/resources/app-update.yml')
- }
- else {
+ } else {
autoUpdater.updateConfigPath = path.join(__dirname, 'win-unpacked/resources/app-update.yml')
}
}
@@ -163,8 +159,7 @@ function updateHandle (app, api, win, beforeQuit, quit, log) {
let data
try {
data = JSON.parse(body)
- }
- catch (e) {
+ } catch (e) {
log.error('检查更新失败，github API返回数据格式不正确:', body)
win.webContents.send('update', { key: 'error', action: 'checkForUpdate', error: '检查更新失败，github API返回数据格式不正确' })
return
@@ -211,8 +206,7 @@ function updateHandle (app, api, win, beforeQuit, quit, log) {
: '无',
},
})
- }
- else {
+ } else {
log.info(`检查更新：没有新版本，最近发布的版本号为 '${version}'，而当前版本号为 '${curVersion}'`)
win.webContents.send('update', { key: 'notAvailable' })
}
@@ -222,29 +216,25 @@ function updateHandle (app, api, win, beforeQuit, quit, log) {
log.info('检查更新-没有正式版本数据')
win.webContents.send('update', { key: 'notAvailable' })
- }
- else {
+ } else {
log.error('检查更新失败, status:', response.statusCode, ', body:', body)
let bodyObj
try {
bodyObj = JSON.parse(body)
- }
- catch (e) {
+ } catch (e) {
bodyObj = null
}
let message
if (response) {
message = `检查更新失败: ${bodyObj && bodyObj.message ? bodyObj.message : response.message}, code: ${response.statusCode}`
- }
- else {
+ } else {
message = `检查更新失败: ${bodyObj && bodyObj.message ? bodyObj.message : body}`
}
win.webContents.send('update', { key: 'error', action: 'checkForUpdate', error: message })
}
- }
- catch (e) {
+ } catch (e) {
log.error('检查更新失败:', e)
win.webContents.send('update', { key: 'error', action: 'checkForUpdate', error: `检查更新失败:${e.message}` })
}
@@ -258,8 +248,7 @@ function updateHandle (app, api, win, beforeQuit, quit, log) {
log.info('download dir:', fileDir)
try {
fs.accessSync(fileDir, fs.constants.F_OK)
- }
- catch (e) {
+ } catch (e) {
fs.mkdirSync(fileDir)
}
const filePath = path.join(fileDir, `${value.version}.zip`)
@@ -299,8 +288,7 @@ function updateHandle (app, api, win, beforeQuit, quit, log) {
const zip = new AdmZip(partPackagePath)
zip.extractAllTo(target, true)
log.info('安装完成，重启app')
- }
- finally {
+ } finally {
app.exit(0)
}
}
@@ -351,21 +339,18 @@ function updateHandle (app, api, win, beforeQuit, quit, log) {
}, 1000)
}
})
- }
- else if (arg.key === 'checkForUpdate') {
+ } else if (arg.key === 'checkForUpdate') {
// 执行自动更新检查
log.info('autoUpdater checkForUpdates:', arg.fromUser)
// 调用 github API，获取release数据，来检查更新
// autoUpdater.checkForUpdates()
checkForUpdatesFromGitHub()
- }
- else if (arg.key === 'downloadUpdate') {
+ } else if (arg.key === 'downloadUpdate') {
// 下载新版本
log.info('autoUpdater downloadUpdate')
autoUpdater.downloadUpdate()
- }
- else if (arg.key === 'downloadPart') {
+ } else if (arg.key === 'downloadPart') {
// 下载增量更新版本
log.info('autoUpdater downloadPart')
downloadPart(app, arg.value)
diff --git a/packages/gui/src/bridge/update/front.js b/packages/gui/src/bridge/update/front.js
index 06846462ff..254e9f6f08 100644
--- a/packages/gui/src/bridge/update/front.js
+++ b/packages/gui/src/bridge/update/front.js
@@ -31,28 +31,23 @@ function install (app, api) {
updateParams.checking = false
updateParams.newVersionData = message.value
foundNewVersion(message.value)
- }
- else if (type === 'notAvailable') {
+ } else if (type === 'notAvailable') {
updateParams.checking = false
noNewVersion()
- }
- else if (type === 'downloaded') {
+ } else if (type === 'downloaded') {
// 更新包已下载完成，让用户确认是否更新
updateParams.downloading = false
console.log('updateParams', updateParams)
newUpdateIsReady(message.value)
- }
- else if (type === 'progress') {
+ } else if (type === 'progress') {
progressUpdate(message.value)
- }
- else if (type === 'error') {
+ } else if (type === 'error') {
updateParams.checking = false
updateParams.downloading = false
if (message.action === 'checkForUpdate' && updateParams.newVersionData) {
// 如果检查更新报错了，但刚才成功拿到过一次数据，就拿之前的数据
foundNewVersion(updateParams.newVersionData)
- }
- else {
+ } else {
if (updateParams.fromUser === false && message.action === 'checkForUpdate') {
return // 不是手动检查更新，不提示错误信息，避免打扰
}
@@ -174,8 +169,7 @@ function install (app, api) {
)
- }
- else {
+ } else {
for (const note of value.releaseNotes) {
notes.push( - {note}
)
}
@@ -227,8 +221,7 @@ function install (app, api) {
)
- }
- else {
+ } else {
for (const note of value.releaseNotes) {
notes.push(- {note}
)
}
diff --git a/packages/gui/src/view/components/setup-ca.vue b/packages/gui/src/view/components/setup-ca.vue
index 07bb2c941b..8ad8fa9502 100644
--- a/packages/gui/src/view/components/setup-ca.vue
+++ b/packages/gui/src/view/components/setup-ca.vue
@@ -22,11 +22,9 @@ export default {
setupImage () {
if (this.systemPlatform === 'mac') {
return '/setup-mac.png'
- }
- else if (this.systemPlatform === 'linux') {
+ } else if (this.systemPlatform === 'linux') {
return '/setup-linux.png'
- }
- else {
+ } else {
return '/setup.png'
}
},
diff --git a/packages/gui/src/view/mixins/plugin.js b/packages/gui/src/view/mixins/plugin.js
index 284e85d1a1..aa94c8673f 100644
--- a/packages/gui/src/view/mixins/plugin.js
+++ b/packages/gui/src/view/mixins/plugin.js
@@ -48,8 +48,7 @@ export default {
await this.applyBefore()
await this.saveConfig()
await this.applyAfter()
- }
- finally {
+ } finally {
this.applyLoading = false
}
},
@@ -74,8 +73,7 @@ export default {
await this.ready(this.config)
}
await this.apply()
- }
- finally {
+ } finally {
this.resetDefaultLoading = false
}
},
@@ -127,8 +125,7 @@ export default {
await this.$api.plugin.git.start()
}
this.$message.success('代理服务和系统代理重启成功')
- }
- else {
+ } else {
this.$message.info('代理服务和系统代理未启动，无需重启')
}
},
diff --git a/packages/gui/src/view/pages/index.vue b/packages/gui/src/view/pages/index.vue
index 748492258e..5115d8d273 100644
--- a/packages/gui/src/view/pages/index.vue
+++ b/packages/gui/src/view/pages/index.vue
@@ -21,8 +21,7 @@ export default {
doClick: () => {
if (this.status.server.enabled) {
this.apiCall(this.startup, this.$api.shutdown)
- }
- else {
+ } else {
this.apiCall(this.startup, this.$api.startup)
}
},
@@ -76,13 +75,11 @@ export default {
this.config.server.intercept.enabled = false
this.config.server.dns.speedTest.enabled = true
this.config.plugin.overwall.enabled = false
- }
- else if (mode === 'default') {
+ } else if (mode === 'default') {
this.config.server.intercept.enabled = true
this.config.server.dns.speedTest.enabled = true
this.config.plugin.overwall.enabled = false
- }
- else if (mode === 'ow') {
+ } else if (mode === 'ow') {
console.log('event', event)
if (!this.setting.overwall) {
this.wantOW()
@@ -204,12 +201,10 @@ export default {
const ret = await api(param)
console.log('this status', this.status)
return ret
- }
- catch (err) {
+ } catch (err) {
btn.loading = false // 有时候记录日志会卡死，先设置为false
console.log('api invoke error:', err)
- }
- finally {
+ } finally {
btn.loading = false
}
},
@@ -217,8 +212,7 @@ export default {
onSwitchClick (btn, openApi, closeApi, checked) {
if (checked) {
return this.apiCall(btn, openApi)
- }
- else {
+ } else {
return this.apiCall(btn, closeApi)
}
},
diff --git a/packages/gui/src/view/pages/plugin/git.vue b/packages/gui/src/view/pages/plugin/git.vue
index dbbd78d06c..998e413a6e 100644
--- a/packages/gui/src/view/pages/plugin/git.vue
+++ b/packages/gui/src/view/pages/plugin/git.vue
@@ -24,8 +24,7 @@ export default {
if (this.status.plugin.git.enabled) {
await this.$api.plugin.git.close()
this.needRestart = true
- }
- else {
+ } else {
this.needRestart = false
}
this.submitNoProxyUrls()
diff --git a/packages/gui/src/view/pages/proxy.vue b/packages/gui/src/view/pages/proxy.vue
index 28cffbe327..93360bf2ac 100644
--- a/packages/gui/src/view/pages/proxy.vue
+++ b/packages/gui/src/view/pages/proxy.vue
@@ -31,8 +31,7 @@ export default {
async openEnableLoopback () {
try {
await this.$api.proxy.setEnableLoopback()
- }
- catch (e) {
+ } catch (e) {
if (e.message.includes('EACCES')) {
this.$message.error('请将DevSidecar关闭后，以管理员身份重新打开，再尝试此操作')
return
diff --git a/packages/gui/src/view/pages/setting.vue b/packages/gui/src/view/pages/setting.vue
index b0df36e19c..940e539c74 100644
--- a/packages/gui/src/view/pages/setting.vue
+++ b/packages/gui/src/view/pages/setting.vue
@@ -218,12 +218,10 @@ export default {
await this.$api.config.downloadRemoteConfig()
this.$message.info('下载远程配置成功，开始重启代理服务和系统代理')
await this.reloadConfigAndRestart()
- }
- finally {
+ } finally {
this.reloadLoading = false
}
- }
- else {
+ } else {
this.$message.info('远程配置已关闭，开始重启代理服务和系统代理')
await this.reloadConfigAndRestart()
}
@@ -237,22 +235,28 @@ export default {
try {
const remoteConfig = {}
- await this.$api.config.readRemoteConfigStr().then((ret) => { remoteConfig.old1 = ret })
- await this.$api.config.readRemoteConfigStr('_personal').then((ret) => { remoteConfig.old2 = ret })
+ await this.$api.config.readRemoteConfigStr().then((ret) => {
+ remoteConfig.old1 = ret
+ })
+ await this.$api.config.readRemoteConfigStr('_personal').then((ret) => {
+ remoteConfig.old2 = ret
+ })
await this.$api.config.downloadRemoteConfig()
- await this.$api.config.readRemoteConfigStr().then((ret) => { remoteConfig.new1 = ret })
- await this.$api.config.readRemoteConfigStr('_personal').then((ret) => { remoteConfig.new2 = ret })
+ await this.$api.config.readRemoteConfigStr().then((ret) => {
+ remoteConfig.new1 = ret
+ })
+ await this.$api.config.readRemoteConfigStr('_personal').then((ret) => {
+ remoteConfig.new2 = ret
+ })
if (remoteConfig.old1 === remoteConfig.new1 && remoteConfig.old2 === remoteConfig.new2) {
this.$message.info('远程配置没有变化，不做任何处理。')
this.$message.warn('如果您确实修改了远程配置，请稍等片刻再重试！')
- }
- else {
+ } else {
this.$message.success('获取到了最新的远程配置，开始重启代理服务和系统代理')
await this.reloadConfigAndRestart()
}
- }
- finally {
+ } finally {
this.reloadLoading = false
}
},
@@ -297,12 +301,10 @@ export default {
this.config = await this.$api.config.get()
this.$message.success('恢复出厂设置成功，开始重启代理服务和系统代理')
await this.reloadConfigAndRestart()
- }
- else {
+ } else {
this.$message.info('已是出厂设置，无需恢复')
}
- }
- finally {
+ } finally {
this.removeUserConfigLoading = false
}
},
diff --git a/packages/mitmproxy/src/index.js b/packages/mitmproxy/src/index.js
index cf08359470..4e0dba6314 100644
--- a/packages/mitmproxy/src/index.js
+++ b/packages/mitmproxy/src/index.js
@@ -12,8 +12,7 @@ function registerProcessListener () {
log.info('child get msg:', JSON.stringify(msg))
if (msg.type === 'action') {
api[msg.event.key](msg.event.params)
- }
- else if (msg.type === 'speed') {
+ } else if (msg.type === 'speed') {
speedTest.action(msg.event)
}
})
@@ -62,8 +61,7 @@ const api = {
if (proxyOptions.setting && proxyOptions.setting.NODE_TLS_REJECT_UNAUTHORIZED === false) {
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
- }
- else {
+ } else {
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '1'
}
// log.info('启动代理服务时的配置:', JSON.stringify(proxyOptions, null, '\t'))
@@ -100,8 +98,7 @@ const api = {
if (err.code === 'ERR_SERVER_NOT_RUNNING') {
log.info('代理服务未运行，无需关闭')
resolve()
- }
- else {
+ } else {
log.error('代理服务关闭失败:', err)
reject(err)
}
@@ -113,8 +110,7 @@ const api = {
})
}
servers = []
- }
- else {
+ } else {
log.info('server is null, no need to close.')
fireStatus(false)
resolve()
diff --git a/packages/mitmproxy/src/json.js b/packages/mitmproxy/src/json.js
index cf0e09ab02..1e90c94888 100644
--- a/packages/mitmproxy/src/json.js
+++ b/packages/mitmproxy/src/json.js
@@ -17,12 +17,10 @@ module.exports = {
stringify2 (obj) {
try {
return JSON.stringify(obj)
- }
- catch (e) {
+ } catch (e) {
try {
return JSON5.stringify(obj)
- }
- catch (e2) {
+ } catch (e2) {
log.debug('转换为JSON字符串失败, error:', e, ', obj:', obj)
return obj
}
diff --git a/packages/mitmproxy/src/lib/choice/index.js b/packages/mitmproxy/src/lib/choice/index.js
index 867876094c..964c2c6ff5 100644
--- a/packages/mitmproxy/src/lib/choice/index.js
+++ b/packages/mitmproxy/src/lib/choice/index.js
@@ -88,8 +88,7 @@ class DynamicChoice {
if (this.backupList.length > 0) {
this.value = this.backupList.shift()
log.info(`切换backup完成: ${this.key}, ip: ${valueBackup} ➜ ${this.value}, this:`, this)
- }
- else {
+ } else {
this.value = null
log.info(`切换backup完成: ${this.key}, backupList为空了，设置this.value: from '${valueBackup}' to null. this:`, this)
}
@@ -110,8 +109,7 @@ class DynamicChoice {
// 失败次数+1，累计连续失败次数+1
count.error++
count.keepErrorCount++
- }
- else {
+ } else {
// 总次数+1
count.total++
}
diff --git a/packages/mitmproxy/src/lib/dns/base.js b/packages/mitmproxy/src/lib/dns/base.js
index 3b6637f131..14d2ca2041 100644
--- a/packages/mitmproxy/src/lib/dns/base.js
+++ b/packages/mitmproxy/src/lib/dns/base.js
@@ -43,8 +43,7 @@ module.exports = class BaseDNS {
ipCache.doCount(ipCache.value, false)
return ipCache.value
}
- }
- else {
+ } else {
ipCache = new IpCache(hostname)
this.cache.set(hostname, ipCache)
}
@@ -61,8 +60,7 @@ module.exports = class BaseDNS {
log.info(`[DNS]: ${hostname} ➜ ${ipCache.value} (${new Date() - t} ms), ipList: ${JSON.stringify(ipList)}, ipCache:`, JSON.stringify(ipCache))
return ipCache.value
- }
- catch (error) {
+ } catch (error) {
log.error(`[DNS] cannot resolve hostname ${hostname} (${error})`, error)
return hostname
}
diff --git a/packages/mitmproxy/src/lib/dns/https.js b/packages/mitmproxy/src/lib/dns/https.js
index eb76a296b0..3175da0f28 100644
--- a/packages/mitmproxy/src/lib/dns/https.js
+++ b/packages/mitmproxy/src/lib/dns/https.js
@@ -30,8 +30,7 @@ module.exports = class DNSOverHTTPS extends BaseDNS {
if (hostnamePreSetIpList && (hostnamePreSetIpList.length > 0 || hostnamePreSetIpList.length === undefined)) {
if (hostnamePreSetIpList.length > 0) {
hostnamePreSetIpList = hostnamePreSetIpList.slice()
- }
- else {
+ } else {
hostnamePreSetIpList = mapToList(hostnamePreSetIpList)
}
@@ -53,13 +52,11 @@ module.exports = class DNSOverHTTPS extends BaseDNS {
const ret = result.answers.filter(item => item.type === 'A').map(item => item.data)
if (ret.length === 0) {
log.info('该域名没有IPv4地址解析:', hostname, ', cost:', (new Date() - start), 'ms')
- }
- else {
+ } else {
log.info('获取到域名地址：', hostname, JSON.stringify(ret), ', cost:', (new Date() - start), 'ms')
}
return ret
- }
- catch (e) {
+ } catch (e) {
log.warn('DNS query error:', hostname, ', dns:', this.dnsServer, ', cost:', (new Date() - start), 'ms, error:', e)
return []
}
diff --git a/packages/mitmproxy/src/lib/dns/index.js b/packages/mitmproxy/src/lib/dns/index.js
index 297694cc3f..0e23f7a5b5 100644
--- a/packages/mitmproxy/src/lib/dns/index.js
+++ b/packages/mitmproxy/src/lib/dns/index.js
@@ -14,11 +14,9 @@ module.exports = {
if (conf.type === 'ipaddress') {
dnsMap[provider] = new DNSOverIpAddress(conf.server)
- }
- else if (conf.type === 'https') {
+ } else if (conf.type === 'https') {
dnsMap[provider] = new DNSOverHTTPS(conf.server, preSetIpList)
- }
- else {
+ } else {
dnsMap[provider] = new DNSOverTLS(conf.server)
}
diff --git a/packages/mitmproxy/src/lib/dns/preset.js b/packages/mitmproxy/src/lib/dns/preset.js
index 3ff7dafd6a..f5e0e1a21b 100644
--- a/packages/mitmproxy/src/lib/dns/preset.js
+++ b/packages/mitmproxy/src/lib/dns/preset.js
@@ -26,8 +26,7 @@ module.exports = class DNSOverPreSetIpList extends BaseDNS {
if (hostnamePreSetIpList && (hostnamePreSetIpList.length > 0 || hostnamePreSetIpList.length === undefined)) {
if (hostnamePreSetIpList.length > 0) {
hostnamePreSetIpList = hostnamePreSetIpList.slice()
- }
- else {
+ } else {
hostnamePreSetIpList = mapToList(hostnamePreSetIpList)
}
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js b/packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js
index b55e11718c..45b6c863e0 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js
@@ -6,8 +6,7 @@ function readConfig (config, defaultConfig) {
if (Object.isArray(config)) {
config = config.join(',')
}
- }
- else {
+ } else {
config = defaultConfig
}
return config
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/baiduOcr.js b/packages/mitmproxy/src/lib/interceptor/impl/req/baiduOcr.js
index 926eaf1af8..dcce58773b 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/req/baiduOcr.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/req/baiduOcr.js
@@ -60,8 +60,7 @@ function getConfig (interceptOpt, tryCount, log) {
if (count >= 100000) {
count = 0
}
- }
- else {
+ } else {
config = interceptOpt.baiduOcr
tryCount = null // 将tryCount设置为null代表只有一个配置
}
@@ -84,13 +83,11 @@ function getConfig (interceptOpt, tryCount, log) {
if (config.api == null) {
if (tryCount == null) {
return null // 只配置了一个账号，没有更多账号可以选择了，直接返回null
- }
- else {
+ } else {
if (tryCount < interceptOpt.baiduOcr.length) {
// 递归找到有效的配置
return getConfig(interceptOpt, tryCount + 1, log)
- }
- else {
+ } else {
return null
}
}
@@ -167,8 +164,7 @@ module.exports = {
limitConfig(config.id, config.api)
log.error(`当前百度云账号的接口 ${config.api}，已达到当日调用次数上限，暂时禁用它，明天会自动放开:`, config)
}
- }
- else {
+ } else {
log.info('baiduOcr success:', result)
}
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/cacheReq.js b/packages/mitmproxy/src/lib/interceptor/impl/req/cacheReq.js
index 5246be4886..5028002b15 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/req/cacheReq.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/req/cacheReq.js
@@ -42,8 +42,7 @@ function getLastModifiedTimeFromIfModifiedSince (rOptions, log) {
try {
// 尝试解析 lastModified，并获取time
return new Date(lastModified).getTime()
- }
- catch (e) {
+ } catch (e) {
// 为数字时，直接返回
if (/\\d+/.test(lastModified)) {
return lastModified - 0
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/proxy.js b/packages/mitmproxy/src/lib/interceptor/impl/req/proxy.js
index 327f4be679..90efd335b9 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/req/proxy.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/req/proxy.js
@@ -27,11 +27,9 @@ function buildTargetUrl (rOptions, urlConf, interceptOpt, matched) {
if (interceptOpt && interceptOpt.replace) {
const regexp = new RegExp(interceptOpt.replace)
targetUrl = rOptions.path.replace(regexp, urlConf)
- }
- else if (urlConf.indexOf('http:') === 0 || urlConf.indexOf('https:') === 0) {
+ } else if (urlConf.indexOf('http:') === 0 || urlConf.indexOf('https:') === 0) {
targetUrl = urlConf
- }
- else {
+ } else {
let uri = rOptions.path
if (uri.indexOf('http:') === 0 || uri.indexOf('https:') === 0) {
// eslint-disable-next-line node/no-deprecated-api
@@ -97,8 +95,7 @@ module.exports = {
}
if (count.value == null) {
log.error('`count.value` is null, the count:', count)
- }
- else {
+ } else {
count.doCount(count.value)
proxyConf = count.value
context.requestCount = {
@@ -127,8 +124,7 @@ module.exports = {
}
res.setHeader('DS-Interceptor', `proxy: ${proxyTarget}, sni: ${interceptOpt.sni}${unVerifySsl ? ', unVerifySsl' : ''}`)
log.info('proxy intercept: hostname:', originHostname, ', target：', proxyTarget, ', sni replace servername:', rOptions.servername, (unVerifySsl ? ', unVerifySsl' : ''))
- }
- else {
+ } else {
res.setHeader('DS-Interceptor', `proxy: ${proxyTarget}`)
log.info('proxy intercept: hostname:', originHostname, ', target：', proxyTarget)
}
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/requestReplace.js b/packages/mitmproxy/src/lib/interceptor/impl/req/requestReplace.js
index 7ed12c2ef6..219959d526 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/req/requestReplace.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/req/requestReplace.js
@@ -10,8 +10,7 @@ function replaceRequestHeaders (rOptions, headers, log) {
if (value) {
log.debug(`[DS-RequestReplace-Interceptor] replace '${key}': '${rOptions.headers[key.toLowerCase()]}' -> '${value}'`)
rOptions.headers[key.toLowerCase()] = value
- }
- else if (rOptions.headers[key.toLowerCase()]) {
+ } else if (rOptions.headers[key.toLowerCase()]) {
log.debug(`[DS-RequestReplace-Interceptor] remove '${key}': '${rOptions.headers[key.toLowerCase()]}'`)
delete rOptions.headers[key.toLowerCase()]
}
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js b/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js
index 54fe7a2c31..62f37feee0 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js
@@ -47,14 +47,11 @@ module.exports = {
// 尝试修改rawHeaders中的cache-control、last-modified、expires
if (proxyRes.rawHeaders[i].toLowerCase() === 'cache-control') {
originalHeaders.cacheControl = { value: proxyRes.rawHeaders[i + 1], valueIndex: i + 1 }
- }
- else if (proxyRes.rawHeaders[i].toLowerCase() === 'last-modified') {
+ } else if (proxyRes.rawHeaders[i].toLowerCase() === 'last-modified') {
originalHeaders.lastModified = { value: proxyRes.rawHeaders[i + 1], valueIndex: i + 1 }
- }
- else if (proxyRes.rawHeaders[i].toLowerCase() === 'expires') {
+ } else if (proxyRes.rawHeaders[i].toLowerCase() === 'expires') {
originalHeaders.expires = { value: proxyRes.rawHeaders[i + 1], valueIndex: i + 1 }
- }
- else if (proxyRes.rawHeaders[i].toLowerCase() === 'etag') {
+ } else if (proxyRes.rawHeaders[i].toLowerCase() === 'etag') {
originalHeaders.etag = { value: proxyRes.rawHeaders[i + 1], valueIndex: i + 1 }
}
@@ -70,8 +67,7 @@ module.exports = {
if (maxAgeMatch && maxAgeMatch[1] > maxAge) {
if (interceptOpt.cacheImmutable !== false && !originalHeaders.cacheControl.value.includes('immutable')) {
maxAge = maxAgeMatch[1]
- }
- else {
+ } else {
const url = `${rOptions.method} ➜ ${rOptions.protocol}//${rOptions.hostname}:${rOptions.port}${req.url}`
res.setHeader('DS-Cache-Response-Interceptor', `skip: ${maxAgeMatch[1]} > ${maxAge}`)
log.info(`cache response intercept: skip: ${maxAgeMatch[1]} > ${maxAge}, url: ${url}`)
@@ -91,22 +87,19 @@ module.exports = {
// 替换cache-control
if (originalHeaders.cacheControl) {
proxyRes.rawHeaders[originalHeaders.cacheControl.valueIndex] = replaceHeaders.cacheControl
- }
- else {
+ } else {
res.setHeader('Cache-Control', replaceHeaders.cacheControl)
}
// 替换last-modified
if (originalHeaders.lastModified) {
proxyRes.rawHeaders[originalHeaders.lastModified.valueIndex] = replaceHeaders.lastModified
- }
- else {
+ } else {
res.setHeader('Last-Modified', replaceHeaders.lastModified)
}
// 替换expires
if (originalHeaders.expires) {
proxyRes.rawHeaders[originalHeaders.expires.valueIndex] = replaceHeaders.expires
- }
- else {
+ } else {
res.setHeader('Expires', replaceHeaders.expires)
}
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js b/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js
index 2086018c52..7c7719ec24 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js
@@ -31,8 +31,7 @@ function replaceResponseHeaders (newHeaders, res, proxyRes) {
preHeaders[headerKey] = proxyRes.rawHeaders[i + 1] // 先保存原先响应头
if (newHeaderValue === REMOVE) { // 由于拦截配置中不允许配置null，会被删，所以配置一个 "[remove]"，当作删除响应头的意思
proxyRes.rawHeaders[i + 1] = ''
- }
- else {
+ } else {
proxyRes.rawHeaders[i + 1] = newHeaderValue
}
}
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/res/script.js b/packages/mitmproxy/src/lib/interceptor/impl/res/script.js
index 24c502a511..58e7581765 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/res/script.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/res/script.js
@@ -52,8 +52,7 @@ module.exports = {
if (key.includes('/')) {
scriptTag = getScriptByUrlOrPath(key) // 1.绝对地址或相对地址（注意：当目标站点限制跨域脚本时，可使用相对地址，再结合proxy拦截器进行代理，可规避掉限制跨域脚本问题。）
- }
- else {
+ } else {
const script = scripts[key]
if (script == null) {
continue
@@ -72,8 +71,7 @@ module.exports = {
// 插入油猴脚本浏览器扩展
if (typeof interceptOpt.tampermonkeyScript === 'string') {
tags = `\r\n\t${getScriptByUrlOrPath(interceptOpt.tampermonkeyScript)}${tags}`
- }
- else {
+ } else {
tags = `\r\n\t${getScript('tampermonkey', scripts.tampermonkey.script)}${tags}`
}
@@ -82,12 +80,10 @@ module.exports = {
return {
head: `${tags}\r\n`,
}
- }
- catch (err) {
+ } catch (err) {
try {
res.setHeader('DS-Script-Interceptor', 'error')
- }
- catch (e) {
+ } catch (e) {
// ignore
}
log.error('load monkey script error', err)
@@ -112,8 +108,7 @@ module.exports = {
if (typeof replaceScriptUrlFun === 'function') {
replaceScriptUrlFun(scriptKey)
}
- }
- else if (scriptUrl.indexOf('/') === 0) {
+ } else if (scriptUrl.indexOf('/') === 0) {
// 相对地址
scriptProxy[scriptUrl] = scriptUrl
}
@@ -129,8 +124,7 @@ module.exports = {
pathConfig.script[i] = scriptKey
})
}
- }
- else if (typeof pathConfig.script === 'string') {
+ } else if (typeof pathConfig.script === 'string') {
handleScriptUrl(pathConfig.script, 'script', (scriptKey) => {
pathConfig.script = scriptKey
})
@@ -180,8 +174,7 @@ module.exports = {
const obj = {}
obj[pathPattern] = hostnameConfig[pathPattern]
log.debug(`域名 '${hostnamePattern}' 拦截配置中，新增伪脚本地址的代理配置:`, JSON.stringify(obj, null, '\t'))
- }
- else {
+ } else {
// 相对地址：新增响应头Content-Type替换配置
if (hostnameConfig[scriptKey]) {
continue // 配置已经存在，按自定义配置优先
diff --git a/packages/mitmproxy/src/lib/monkey/index.js b/packages/mitmproxy/src/lib/monkey/index.js
index 40715a41d2..df00bd7056 100644
--- a/packages/mitmproxy/src/lib/monkey/index.js
+++ b/packages/mitmproxy/src/lib/monkey/index.js
@@ -12,8 +12,7 @@ function buildScript (sc, content, scriptName) {
let eventStr
if (runAt === 'document-end') {
eventStr = 'document.addEventListener("DOMContentLoaded"'
- }
- else {
+ } else {
eventStr = 'window.addEventListener("load"'
}
@@ -48,8 +47,7 @@ if (!((window.__ds_global__ || {}).GM_getValue || (() => true))("ds_enabled", tr
if (item.indexOf('.') > 0) {
grantStr += `${item} = (window.__ds_global__ || {})['${item}'];`
- }
- else {
+ } else {
grantStr += `const ${item} = (window.__ds_global__ || {})['${item}'] || (() => {});`
}
}
@@ -91,11 +89,9 @@ function loadScript (content, scriptName) {
const value = ret[2].trim()
if (key === 'grant') {
sc.grant.push(value)
- }
- else if (key === 'match') {
+ } else if (key === 'match') {
sc.match.push(value)
- }
- else {
+ } else {
sc[key] = value
}
}
diff --git a/packages/mitmproxy/src/lib/proxy/common/util.js b/packages/mitmproxy/src/lib/proxy/common/util.js
index 35a396397e..31e1cd14a5 100644
--- a/packages/mitmproxy/src/lib/proxy/common/util.js
+++ b/packages/mitmproxy/src/lib/proxy/common/util.js
@@ -83,8 +83,7 @@ util.parseHostnameAndPort = (host, defaultPort) => {
if (arr[1]) {
arr[1] = Number.parseInt(arr[1], 10)
}
- }
- else {
+ } else {
arr = host.split(':')
if (arr.length > 1) {
arr[1] = Number.parseInt(arr[1], 10)
@@ -93,8 +92,7 @@ util.parseHostnameAndPort = (host, defaultPort) => {
if (defaultPort > 0 && (arr.length === 1 || arr[1] === undefined)) {
arr[1] = defaultPort
- }
- else if (arr.length === 2 && arr[1] === undefined) {
+ } else if (arr.length === 2 && arr[1] === undefined) {
arr.pop()
}
@@ -112,12 +110,10 @@ util.getOptionsFromRequest = (req, ssl, externalProxy = null, serverSetting, com
if (externalProxy) {
if (typeof externalProxy === 'string') {
externalProxyUrl = externalProxy
- }
- else if (typeof externalProxy === 'function') {
+ } else if (typeof externalProxy === 'function') {
try {
externalProxyUrl = externalProxy(req, ssl)
- }
- catch (e) {
+ } catch (e) {
log.error('externalProxy error:', e)
}
}
@@ -137,12 +133,10 @@ util.getOptionsFromRequest = (req, ssl, externalProxy = null, serverSetting, com
// log.info(`get timeoutConfig '${hostname}':`, timeoutConfig)
agent = createAgent(protocol, timeoutConfig, serverSetting.verifySsl)
headers.connection = 'keep-alive'
- }
- else {
+ } else {
agent = false
}
- }
- else {
+ } else {
agent = util.getTunnelAgent(protocol === 'https:', externalProxyUrl)
}
@@ -172,8 +166,7 @@ util.getOptionsFromRequest = (req, ssl, externalProxy = null, serverSetting, com
// mark a socketId for Agent to bind socket for NTLM
if (req.socket.customSocketId) {
options.customSocketId = req.socket.customSocketId
- }
- else if (headers.authorization) {
+ } else if (headers.authorization) {
options.customSocketId = req.socket.customSocketId = socketId++
}
@@ -201,8 +194,7 @@ util.getTunnelAgent = (requestIsSSL, externalProxyUrl) => {
})
}
return httpsOverHttpAgent
- }
- else {
+ } else {
if (!httpsOverHttpsAgent) {
httpsOverHttpsAgent = tunnelAgent.httpsOverHttps({
proxy: {
@@ -213,8 +205,7 @@ util.getTunnelAgent = (requestIsSSL, externalProxyUrl) => {
}
return httpsOverHttpsAgent
}
- }
- else {
+ } else {
if (protocol === 'http:') {
// if (!httpOverHttpAgent) {
// httpOverHttpAgent = tunnelAgent.httpOverHttp({
@@ -225,8 +216,7 @@ util.getTunnelAgent = (requestIsSSL, externalProxyUrl) => {
// })
// }
return false
- }
- else {
+ } else {
if (!httpOverHttpsAgent) {
httpOverHttpsAgent = tunnelAgent.httpOverHttps({
proxy: {
diff --git a/packages/mitmproxy/src/lib/proxy/compatible/compatible.js b/packages/mitmproxy/src/lib/proxy/compatible/compatible.js
index a8dc4fa58b..e9ffba3bc8 100644
--- a/packages/mitmproxy/src/lib/proxy/compatible/compatible.js
+++ b/packages/mitmproxy/src/lib/proxy/compatible/compatible.js
@@ -58,8 +58,7 @@ function _loadFromFile (defaultConfig) {
if (!fs.existsSync(configPath)) {
config = defaultConfig
log.info(`本地未保存过 ${configPath} 文件，使用默认配置`)
- }
- else {
+ } else {
const file = fs.readFileSync(configPath)
log.info('读取 automaticCompatibleConfig.json 成功:', configPath)
const fileStr = file.toString()
@@ -80,8 +79,7 @@ function _saveConfigToFile () {
try {
fs.writeFileSync(filePath, jsonApi.stringify(config))
log.info('保存 automaticCompatibleConfig.json 成功:', filePath)
- }
- catch (e) {
+ } catch (e) {
log.error('保存 automaticCompatibleConfig.json 失败:', filePath, e)
}
}
@@ -109,8 +107,7 @@ module.exports = {
const connectCompatibleConfig = this.getConnectCompatibleConfig(hostname, port)
if (connectCompatibleConfig) {
connectCompatibleConfig.ssl = ssl
- }
- else {
+ } else {
config.connect[`${hostname}:${port}`] = { ssl }
}
@@ -142,8 +139,7 @@ module.exports = {
const requestCompatibleConfig = this.getRequestCompatibleConfig(rOptions.hostname, rOptions.port)
if (requestCompatibleConfig) {
requestCompatibleConfig.rejectUnauthorized = rejectUnauthorized
- }
- else {
+ } else {
config.request[`${rOptions.hostname}:${rOptions.port}`] = { rejectUnauthorized }
}
diff --git a/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js b/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js
index c7c7325d8a..d1791495f7 100644
--- a/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js
+++ b/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js
@@ -181,12 +181,10 @@ module.exports = {
}))
.pipe(codec.createCompressor()) // 编码
.pipe(res)
- }
- else {
+ } else {
log.error(`InsertScriptMiddleware.responseInterceptor(): 暂不支持编码方式 ${encoding}, 目前支持:`, httpUtil.supportedEncodingsStr())
}
- }
- else {
+ } else {
proxyRes
.pipe(through(function (chunk, enc, callback) {
chunkByteReplace(this, chunk, enc, callback, append)
diff --git a/packages/mitmproxy/src/lib/proxy/middleware/overwall.js b/packages/mitmproxy/src/lib/proxy/middleware/overwall.js
index 3b1e236abd..5237ca359f 100644
--- a/packages/mitmproxy/src/lib/proxy/middleware/overwall.js
+++ b/packages/mitmproxy/src/lib/proxy/middleware/overwall.js
@@ -15,8 +15,7 @@ function matched (hostname, overWallTargetMap) {
const ret1 = matchUtil.matchHostname(overWallTargetMap, hostname, 'matched overwall')
if (ret1) {
return 'in config'
- }
- else if (ret1 === false || ret1 === 'false') {
+ } else if (ret1 === false || ret1 === 'false') {
log.debug(`域名 ${hostname} 的overwall配置为 false，跳过增强功能，即使它在 pac.txt 里`)
return null
}
@@ -29,8 +28,7 @@ function matched (hostname, overWallTargetMap) {
if (ret && ret.indexOf('PROXY ') === 0) {
log.info(`matchHostname: matched overwall: '${hostname}' -> '${ret}' in pac.txt`)
return 'in pac.txt'
- }
- else {
+ } else {
log.debug(`matchHostname: matched overwall: Not-Matched '${hostname}' -> '${ret}' in pac.txt`)
return null
}
@@ -51,8 +49,7 @@ function loadPacLastModifiedTime (pacTxt) {
if (matched && matched.length > 0) {
try {
return new Date(matched[0])
- }
- catch {
+ } catch {
return null
}
}
@@ -87,8 +84,7 @@ function savePacFile (pacTxt) {
fs.utimes(pacFilePath, lastModifiedTime, lastModifiedTime, (utimesErr) => {
if (utimesErr) {
log.error('修改 pac.txt 文件时间失败:', utimesErr)
- }
- else {
+ } else {
log.info(`'${pacFilePath}' 文件的修改时间已更新为其最近更新时间 '${formatDate(lastModifiedTime)}'`)
}
})
@@ -111,8 +107,7 @@ async function downloadPacAsync (pacConfig) {
if (body == null || body.length < 100) {
log.warn('下载远程 pac.txt 文件成功，但内容为空或内容太短，判断为无效的 pax.txt 文件:', remotePacFileUrl, ', body:', body)
return
- }
- else {
+ } else {
log.info('下载远程 pac.txt 文件成功:', remotePacFileUrl)
}
@@ -123,8 +118,7 @@ async function downloadPacAsync (pacConfig) {
pacTxt = Buffer.from(pacTxt, 'base64').toString('utf8')
// log.debug('解析 base64 后的 pax:', pacTxt)
}
- }
- catch {
+ } catch {
if (!pacTxt.includes('!---------------------EOF')) {
log.error(`远程 pac.txt 文件内容即不是base64格式，也不是要求的格式，url: ${remotePacFileUrl}，body: ${body}`)
return
@@ -133,8 +127,7 @@ async function downloadPacAsync (pacConfig) {
// 保存到本地
savePacFile(pacTxt)
- }
- else {
+ } else {
log.error(`下载远程 pac.txt 文件失败: ${remotePacFileUrl}, response:`, response, ', body:', body)
}
})
@@ -183,8 +176,7 @@ function createOverwallMiddleware (overWallConfig) {
}
if (count.value == null) {
log.error('`count.value` is null, the count:', count)
- }
- else {
+ } else {
count.doCount(count.value)
proxyServer = count.value
context.requestCount = {
diff --git a/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js b/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js
index be6c752264..c0fae9df07 100644
--- a/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js
+++ b/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js
@@ -12,8 +12,7 @@ function createPacClient (pacFilePath) {
const filePath = path.resolve(location)
log.info('read pac path:', filePath)
return fs.readFileSync(location).toString()
- }
- catch (e) {
+ } catch (e) {
log.error('读取pac失败:', e)
return ''
}
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
index ac040e5fe3..94534090b6 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
@@ -45,8 +45,7 @@ module.exports = function createConnectHandler (sslConnectInterceptor, middlewar
}).catch((e) => {
log.error(`----- fakeServer getServerPromise error: ${hostname}:${port}, error:`, e)
})
- }
- else {
+ } else {
log.info(`不拦截请求，直连目标服务器: ${hostname}:${port}, headers:`, jsonApi.stringify2(req.headers))
connect(req, cltSocket, head, hostname, port, dnsConfig, true)
}
@@ -118,8 +117,7 @@ function connect (req, cltSocket, head, hostname, port, dnsConfig = null, isDire
const proxySocket = net.connect(options, () => {
if (!isDirect) {
log.info('Proxy connect start:', hostport)
- }
- else {
+ } else {
log.debug('Direct connect start:', hostport)
}
@@ -192,8 +190,7 @@ function connect (req, cltSocket, head, hostname, port, dnsConfig = null, isDire
}
return proxySocket
- }
- catch (e) {
+ } catch (e) {
log.error(`${isDirect ? '直连' : '代理连接'}错误: ${hostport}, error:`, e)
}
}
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js
index 7bdf41cc53..f0b2a1401d 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js
@@ -20,8 +20,7 @@ module.exports = function createFakeServerCenter ({
const caKeyPem = fs.readFileSync(caKeyPath)
caCert = forge.pki.certificateFromPem(caCertPem)
caKey = forge.pki.privateKeyFromPem(caKeyPem)
- }
- catch (e) {
+ } catch (e) {
log.error('Can not find `CA certificate` or `CA key`:', e)
process.exit(1)
}
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
index 511956e2f6..a6e8fa0900 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
@@ -23,11 +23,9 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
if (rOptions.headers.connection === 'close') {
req.socket.setKeepAlive(false)
- }
- else if (rOptions.customSocketId != null) { // for NTLM
+ } else if (rOptions.customSocketId != null) { // for NTLM
req.socket.setKeepAlive(true, 60 * 60 * 1000)
- }
- else {
+ } else {
req.socket.setKeepAlive(true, 30000)
}
const context = {
@@ -73,12 +71,10 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
}
}
next()
- }
- else {
+ } else {
next()
}
- }
- catch (e) {
+ } catch (e) {
reject(e)
}
})
@@ -129,12 +125,10 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
rOptions.lookup = dnsLookup.createLookupFunc(res, dns, 'request url', url, isDnsIntercept)
log.debug(`域名 ${rOptions.hostname} DNS: ${dns.name}`)
res.setHeader('DS-DNS', dns.name)
- }
- else {
+ } else {
log.info(`域名 ${rOptions.hostname} 在DNS中未配置`)
}
- }
- else {
+ } else {
log.info(`域名 ${rOptions.hostname} DNS配置不存在`)
}
@@ -163,8 +157,7 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
const cost = new Date() - start
if (rOptions.protocol === 'https:') {
log.info(`代理请求返回: 【${proxyRes.statusCode}】${url}, cost: ${cost} ms`)
- }
- else {
+ } else {
log.info(`请求返回: 【${proxyRes.statusCode}】${url}, cost: ${cost} ms`)
}
// console.log('request:', proxyReq, proxyReq.socket)
@@ -291,8 +284,7 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
if (append.body) {
body += append.body
}
- }
- else if (append === false) {
+ } else if (append === false) {
break // 返回false表示终止拦截器，跳出循环
}
}
@@ -300,12 +292,10 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
head,
body,
})
- }
- else {
+ } else {
next()
}
- }
- catch (e) {
+ } catch (e) {
reject(e)
}
})
@@ -341,15 +331,13 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
目标网站请求错误：【${e.code}】 ${e.message}
目标地址：${rOptions.protocol}//${rOptions.hostname}:${rOptions.port}${rOptions.path}`,
)
- }
- catch (e) {
+ } catch (e) {
// do nothing
}
try {
res.end()
- }
- catch (e) {
+ } catch (e) {
// do nothing
}
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js
index 006b18991a..fe5edacadb 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js
@@ -17,8 +17,7 @@ module.exports = {
}
callback(null, aliveIpObj.host, 4)
return
- }
- else {
+ } else {
log.info(`----- ${action}: ${hostname}, no alive ip${target}, tester: { "ready": ${tester.ready}, "backupList": ${JSON.stringify(tester.backupList)} }`)
}
}
@@ -50,13 +49,11 @@ module.exports = {
}
callback(null, ip, 4)
return
- }
- else {
+ } else {
// 使用默认dns
log.info(`----- ${action}: ${hostname}, use hostname by default DNS: ${hostname}, skip test failed ip from dns '${dns.name}: ${ip}'${target}, options:`, options)
}
- }
- else {
+ } else {
// 使用默认dns
log.info(`----- ${action}: ${hostname}, use hostname by default DNS: ${hostname}${target}, options:`, options, ', dns:', dns)
}
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js
index acf3a7e988..9c272fb3da 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js
@@ -104,8 +104,7 @@ module.exports = {
server.on('upgrade', (req, cltSocket, head) => {
if (printDebugLog) {
log.debug(`【server upgrade, ssl: ${ssl}】\r\n----- req -----\r\n`, req)
- }
- else {
+ } else {
log.info(`【server upgrade, ssl: ${ssl}】`, req.url)
}
upgradeHandler(req, cltSocket, head, ssl)
diff --git a/packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js b/packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js
index 2a1131add7..0b2542a470 100644
--- a/packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js
+++ b/packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js
@@ -73,8 +73,7 @@ module.exports = class CertAndKeyContainer {
if (fast) {
certObj = tlsUtils.createFakeCertificateByDomain(this.caKey, this.caCert, hostname)
_resolve(certObj)
- }
- else {
+ } else {
// 这个太慢了
// const preReq = https.request({
// port: port,
diff --git a/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js b/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js
index 2b781cc5eb..acec84c7b6 100644
--- a/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js
+++ b/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js
@@ -38,8 +38,7 @@ module.exports = class FakeServersCenter {
try {
log.info('超过最大服务数量，删除旧服务。delServerObj:', delServerObj)
delServerObj.serverObj.server.close()
- }
- catch (e) {
+ } catch (e) {
log.error('`delServerObj.serverObj.server.close()` error:', e)
}
}
@@ -50,8 +49,7 @@ module.exports = class FakeServersCenter {
getServerPromise (hostname, port, ssl, manualCompatibleConfig) {
if (port === 443 || port === 80) {
ssl = port === 443
- }
- else if (ssl) {
+ } else if (ssl) {
// 自动兼容程序：1
const compatibleConfig = compatible.getConnectCompatibleConfig(hostname, port, manualCompatibleConfig)
if (compatibleConfig && compatibleConfig.ssl != null) {
@@ -107,8 +105,7 @@ module.exports = class FakeServersCenter {
})()
},
})
- }
- else {
+ } else {
fakeServer = new http.Server()
}
const serverObj = {
@@ -149,8 +146,7 @@ module.exports = class FakeServersCenter {
fakeServer.on('upgrade', (req, socket, head) => {
if (printDebugLog) {
log.debug(`【fakeServer upgrade - ${hostname}:${port}】\r\n----- req -----\r\n`, req, '\r\n----- socket -----\r\n', socket, '\r\n----- head -----\r\n', head)
- }
- else {
+ } else {
log.info(`【fakeServer upgrade - ${hostname}:${port}】`, req.url)
}
this.upgradeHandler(req, socket, head, ssl)
@@ -169,8 +165,7 @@ module.exports = class FakeServersCenter {
if (ssl === true && err.code.indexOf('ERR_SSL_') === 0) {
compatible.setConnectSsl(hostname, port, false)
log.error(`自动兼容程序：SSL异常，现设置为禁用ssl: ${hostname}:${port}, ssl = false`)
- }
- else if (ssl === false && err.code === 'HPE_INVALID_METHOD') {
+ } else if (ssl === false && err.code === 'HPE_INVALID_METHOD') {
compatible.setConnectSsl(hostname, port, true)
log.error(`自动兼容程序：${err.code}，现设置为启用ssl: ${hostname}:${port}, ssl = true`)
}
diff --git a/packages/mitmproxy/src/lib/proxy/tls/sniUtil.js b/packages/mitmproxy/src/lib/proxy/tls/sniUtil.js
index 9669f5fa0c..c44657e83b 100644
--- a/packages/mitmproxy/src/lib/proxy/tls/sniUtil.js
+++ b/packages/mitmproxy/src/lib/proxy/tls/sniUtil.js
@@ -172,13 +172,11 @@ module.exports = function extractSNI (data) {
end: n + nameLength,
length: nameLength,
}
- }
- else {
+ } else {
n += nameLength
}
}
- }
- else { // ExtensionType was something we are not interested in
+ } else { // ExtensionType was something we are not interested in
pos += extensionSize
}
}
diff --git a/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js b/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js
index b545cad276..d2efe3ed87 100644
--- a/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js
+++ b/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js
@@ -244,8 +244,7 @@ utils.initCA = function ({ caCertPath, caKeyPath }) {
caKeyPath,
create: false,
}
- }
- catch (e) {
+ } catch (e) {
const caObj = utils.createCA(config.caName)
const caCert = caObj.cert
diff --git a/packages/mitmproxy/src/lib/speed/SpeedTester.js b/packages/mitmproxy/src/lib/speed/SpeedTester.js
index dba881cf1e..a5f915eadd 100644
--- a/packages/mitmproxy/src/lib/speed/SpeedTester.js
+++ b/packages/mitmproxy/src/lib/speed/SpeedTester.js
@@ -124,8 +124,7 @@ class SpeedTester {
}
return a.time - b.time
})
- }
- catch (e) {
+ } catch (e) {
if (e.message !== 'timeout') {
log.warn('[speed] test error: ', this.hostname, `➜ ${item.host}:${item.port} from DNS '${item.dns}'`, ', errorMsg:', e.message)
}
diff --git a/packages/mitmproxy/src/lib/speed/index.js b/packages/mitmproxy/src/lib/speed/index.js
index 55b92db239..86b7ba0cca 100644
--- a/packages/mitmproxy/src/lib/speed/index.js
+++ b/packages/mitmproxy/src/lib/speed/index.js
@@ -60,8 +60,7 @@ function reSpeedTest () {
function action (event) {
if (event.key === 'reTest') {
reSpeedTest()
- }
- else if (event.key === 'getList') {
+ } else if (event.key === 'getList') {
process.send({ type: 'speed', event: { key: 'getList', value: getAllSpeedTester() } })
}
}
diff --git a/packages/mitmproxy/src/options.js b/packages/mitmproxy/src/options.js
index a880530d3f..82bebc5fc8 100644
--- a/packages/mitmproxy/src/options.js
+++ b/packages/mitmproxy/src/options.js
@@ -24,8 +24,7 @@ function getExclusionArray (exclusions) {
if (exclusions.length > 0) {
ret = exclusions
}
- }
- else if (lodash.isObject(exclusions)) {
+ } else if (lodash.isObject(exclusions)) {
ret = []
for (const exclusion in exclusions) {
ret.push(exclusion)
@@ -158,8 +157,7 @@ module.exports = (serverConfig) => {
}
}
}
- }
- catch (e) {
+ } catch (e) {
log.error(`判断拦截器是否排除当前path时出现异常, path: ${rOptions.path}, interceptOpt:`, interceptOpt, ', error:', e)
}
if (isExcluded) {
@@ -191,8 +189,7 @@ module.exports = (serverConfig) => {
interceptor.requestIntercept = (context, req, res, ssl, next) => {
return impl.requestIntercept(context, interceptOpt, req, res, ssl, next, matched)
}
- }
- else if (impl.responseIntercept) {
+ } else if (impl.responseIntercept) {
// res拦截器
interceptor.responseIntercept = (context, req, res, proxyReq, proxyRes, ssl, next) => {
return impl.responseIntercept(context, interceptOpt, req, res, proxyReq, proxyRes, ssl, next, matched)
@@ -202,8 +199,7 @@ module.exports = (serverConfig) => {
// log.info(`${action} interceptor: ${impl.name}, hostname: ${rOptions.hostname}, regexp: ${regexp}`)
if (action === 'add') {
matchIntercepts.push(interceptor)
- }
- else {
+ } else {
matchIntercepts[matchedInterceptOpt.index] = interceptor
}
matchInterceptsOpts[impl.name] = {
@@ -214,7 +210,9 @@ module.exports = (serverConfig) => {
}
}
- matchIntercepts.sort((a, b) => { return a.priority - b.priority })
+ matchIntercepts.sort((a, b) => {
+ return a.priority - b.priority
+ })
// for (const interceptor of matchIntercepts) {
// log.info('interceptor:', interceptor.name, 'priority:', interceptor.priority)
// }
diff --git a/packages/mitmproxy/src/utils/util.match.js b/packages/mitmproxy/src/utils/util.match.js
index 8668e6b1d0..4404ba0b6d 100644
--- a/packages/mitmproxy/src/utils/util.match.js
+++ b/packages/mitmproxy/src/utils/util.match.js
@@ -12,8 +12,7 @@ function isMatched (url, regexp) {
urlRegexp = `.${regexp}`
}
return url.match(urlRegexp)
- }
- catch (e) {
+ } catch (e) {
log.error('匹配串有问题:', regexp)
return null
}
@@ -40,8 +39,7 @@ function domainMapRegexply (hostMap) {
if (domain.indexOf('*') === 0 && domain.lastIndexOf('*') === 0) {
origin[domain] = value
}
- }
- else {
+ } else {
origin[domain] = value
}
})
@@ -170,8 +168,7 @@ function matchHostnameAll (hostMap, hostname, action) {
deleteNullItems(values)
log.info(`matchHostname-all: ${action}: '${hostname}':`, JSON.stringify(values))
return values
- }
- else {
+ } else {
log.debug(`matchHostname-all: ${action}: '${hostname}' Not-Matched`)
}
}
diff --git a/test/test.js b/test/test.js
index 5ea6546bf1..9b47d719a2 100644
--- a/test/test.js
+++ b/test/test.js
@@ -59,8 +59,7 @@ function testRequest () {
request('https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js', (error, response, body) => {
if (error) {
console.error(error)
- }
- else {
+ } else {
console.log(body)
}
})
From ec473ce0f9688da0533643b1c6f57be6048d0073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Mon, 18 Nov 2024 16:33:24 +0800
Subject: [PATCH 14/20] fix Style
---
README.md | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index 4e08a185fb..a07e636b55 100644
--- a/README.md
+++ b/README.md
@@ -151,21 +151,18 @@
#### 1）git clone 加速
--方式1：快捷复制：
+- 方式1：快捷复制：
+ > 开启脚本支持，然后在复制clone链接下方，即可复制到加速链接
-> 开启脚本支持，然后在复制clone链接下方，即可复制到加速链接
-
--方式2：
-
-> 1. 使用方式：用实际的名称替换 `{}`的内容，即可加速clone
-
-> 2.clone 出来的 remote "origin" 为fastgit的地址，需要手动改回来
-> 3. 你也可以直接使用他们的clone加速工具 [fgit-go](https://github.com/FastGitORG/fgit-go)
+- 方式2：
+ > 1. 使用方式：用实际的名称替换 `{}` 的内容，即可加速clone
+ > 2. clone 出来的 remote "origin" 为fastgit的地址，需要手动改回来
+ > 3. 你也可以直接使用他们的clone加速工具 [fgit-go](https://github.com/FastGitORG/fgit-go)
#### 2）`github.com` 的镜像网站（注意：部分镜像网站不能登录）
-> 1. [hub.fastgit.org](https://hub.fastgit.org/) （2024/11/18：这个好像失效了？）
-> 2. [github.com.cnpmjs.org](https://github.com.cnpmjs.org/) 这个很容易超限（2024/11/18：这个好像失效了？）
+> 1. [hub.fastgit.org](https://hub.fastgit.org/) （2024/11/18：这个好像失效了？）
+> 2. [github.com.cnpmjs.org](https://github.com.cnpmjs.org/) 这个很容易超限（2024/11/18：这个好像失效了？）
> 3. [dgithub.xyz](https://dgithub.xyz/)
## 五、api
@@ -318,8 +315,9 @@ DevSidecar Warning: Error: www.github.com:443, 代理请求超时
当应用意外关闭时，可能会因为没有将系统代理恢复，从而导致完全无法上网。
对于此问题有如下几种解决方案可供选择：
-1.重新打开应用即可（右键应用托盘图标可完全退出，将会正常关闭系统代理设置）
-2.如果应用被卸载了，此时需要[手动关闭系统代理设置](./doc/recover.md)
+
+1. 重新打开应用即可（右键应用托盘图标可完全退出，将会正常关闭系统代理设置）
+2. 如果应用被卸载了，此时需要[手动关闭系统代理设置](./doc/recover.md)
3. 如果你是因为开着ds的情况下重启电脑导致无法上网，你可以设置ds为开机自启
### 6.8、卸载应用后上不了网，git请求不了
From c0fcd3389ecf2bb178d5710e04236a7efee37855 Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Mon, 18 Nov 2024 18:07:05 +0800
Subject: [PATCH 15/20] fix: path
---
packages/cli/cli.js | 2 +-
packages/cli/src/index.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/cli/cli.js b/packages/cli/cli.js
index 2b8767cafa..8fa39e70ba 100755
--- a/packages/cli/cli.js
+++ b/packages/cli/cli.js
@@ -1,3 +1,3 @@
#!/usr/bin/env node
-require('../src')
+require('./src')
diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js
index 4dce5c8ada..92f42940d6 100644
--- a/packages/cli/src/index.js
+++ b/packages/cli/src/index.js
@@ -3,7 +3,7 @@ const DevSidecar = require('@docmirror/dev-sidecar')
const jsonApi = require('@docmirror/mitmproxy/src/json')
// 启动服务
-const mitmproxyPath = './src/mitmproxy'
+const mitmproxyPath = './mitmproxy'
async function startup () {
const banner = fs.readFileSync('./src/banner.txt')
console.log(banner.toString())
From 6f6d8f0842b4fd5f8e246754d4e5705032574eb0 Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Mon, 18 Nov 2024 18:34:44 +0800
Subject: [PATCH 16/20] doc: update
---
README.md | 50 ++++++++++++++++++++------------------------------
1 file changed, 20 insertions(+), 30 deletions(-)
diff --git a/README.md b/README.md
index a07e636b55..5a9cdffdc8 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
开发者边车，命名取自service-mesh的service-sidecar，意为为开发者打辅助的边车工具（以下简称ds）
通过本地代理的方式将https请求代理到一些国内的加速通道上
-
+````
> Gitee上的同步项目已被封禁，此项目将不再更新与维护 【狗头保命】
>
@@ -12,7 +12,7 @@
## 打个广告
->
+> [https://github.com/certd/certd](https://github.com/certd/certd)
> 我的开源证书管理工具项目，全自动申请和部署证书，有需求的可以去试试，帮忙点个star
## 重要提醒
@@ -22,7 +22,7 @@
> 注意：由于electron无法监听windows的关机事件，开着ds情况下直接重启电脑，会导致无法上网，你可以手动启动ds即可恢复网络，你也可以将ds设置为开机自启。
>
> 关于此问题的更多讨论请前往：
->
+> [https://github.com/docmirror/dev-sidecar/issues/109](https://github.com/docmirror/dev-sidecar/issues/109)
> ------------------------------重要提醒2---------------------------------
>
@@ -54,12 +54,12 @@
- 解决git push 偶尔失败需要输入账号密码的问题（fatal: TaskCanceledException encountered / fatal: HttpRequestException encountered）
- raw/blame加速
-> 以上部分功能通过`X.I.U`的油猴脚本实现， 以下是仓库和脚本下载链接，大家可以去支持一下。
+> 以上部分功能通过 `X.I.U`的油猴脚本实现， 以下是仓库和脚本下载链接，大家可以去支持一下。
>
-> -
-> -
+> - [https://github.com/XIU2/UserScript](https://github.com/XIU2/UserScript)
+> - [https://greasyfork.org/scripts/412245](https://greasyfork.org/scripts/412245)
>
-> 由于此脚本在ds中是打包在本地的，更新会不及时，你可以直接通过浏览器安装油猴插件使用此脚本，从而获得最新更新（ds本地的可以通过`加速服务->基本设置->启用脚本`进行关闭）。
+> 由于此脚本在ds中是打包在本地的，更新会不及时，你可以直接通过浏览器安装油猴插件使用此脚本，从而获得最新更新（ds本地的可以通过 `加速服务->基本设置->启用脚本`进行关闭）。
### 1.4、 Stack Overflow 加速
@@ -152,12 +152,14 @@
#### 1）git clone 加速
- 方式1：快捷复制：
- > 开启脚本支持，然后在复制clone链接下方，即可复制到加速链接
+
+ > 开启脚本支持，然后在复制clone链接下方，即可复制到加速链接
- 方式2：
- > 1. 使用方式：用实际的名称替换 `{}` 的内容，即可加速clone
- > 2. clone 出来的 remote "origin" 为fastgit的地址，需要手动改回来
- > 3. 你也可以直接使用他们的clone加速工具 [fgit-go](https://github.com/FastGitORG/fgit-go)
+
+ > 1. 使用方式：用实际的名称替换 `{}` 的内容，即可加速clone [https://hub.fastgit.org/{username}/{reponame}.git](https://hub.fastgit.org/%7Busername%7D/%7Breponame%7D.git)
+ > 2. clone 出来的 remote "origin" 为fastgit的地址，需要手动改回来
+ > 3. 你也可以直接使用他们的clone加速工具 [fgit-go](https://github.com/FastGitORG/fgit-go)
#### 2）`github.com` 的镜像网站（注意：部分镜像网站不能登录）
@@ -258,16 +260,11 @@ networksetup -setwebproxy 'WiFi' 127.0.0.1 31181
1. 本应用仅支持https加速
请务必确认你访问的地址是https开头的
- 比如：
-
+ 比如： [https://github.com/](https://github.com/)
2. 检查浏览器是否装了什么插件，与ds有冲突
-
3. 检查是否安装了其他代理软件，与ds有冲突
-
4. 请确认浏览器的代理设置为使用IE代理/或者使用系统代理状态
-
5. 可以尝试换个浏览器试试
-
6. 请确认网络代理设置处于勾选状态
正常情况下ds在“系统代理”开关打开时，会自动设置系统代理。
@@ -284,7 +281,7 @@ networksetup -setwebproxy 'WiFi' 127.0.0.1 31181
- 1. 火狐浏览器->选项->隐私与安全->证书->查看证书
- 2. 证书颁发机构->导入
- - 3. 选择证书文件`C:\Users(用户)\Administrator(你的账号)\.dev-sidecar\dev-sidecar.ca.crt`（Mac或linux为`~/.dev-sidecar`目录）
+ - 3. 选择证书文件`C:\Users(用户)\Administrator(你的账号)\.dev-sidecar\dev-sidecar.ca.crt`（Mac或linux为 `~/.dev-sidecar`目录）
- 4. 勾选信任由此证书颁发机构来标识网站，确定即可
### 6.4、打开github显示连接超时
@@ -350,18 +347,14 @@ npm config delete https-proxy
#### 1）安装 `nodejs`
-推荐安装 nodejs `16.x.x` 的版本，其他版本未做测试
+推荐安装 nodejs `22.x.x` 的版本，其他版本未做测试
-#### 2）安装 `lerna`
+#### 2）安装 `pnpm`
运行如下命令即可安装所需依赖：
-> 注：lerna指定为6.x版本，更高版本会导致打包失败（不兼容导致）
-
```shell
-npm install -g cnpm --registry=https://registry.npmmirror.com
-
-cnpm install -g lerna@6
+npm install -g pnpm --registry=https://registry.npmmirror.com
```
@@ -375,11 +368,8 @@ git clone https://github.com/docmirror/dev-sidecar
cd dev-sidecar
-# 注意不要使用 `npm install` 来安装依赖，因为 `lerna bootstrap` 会自动安装依赖
-lerna bootstrap
-# 如果 `lerna bootstrap` 有报错，可以尝试执行如下两行命令，用yarn替换掉npm：
-#cnpm install -g yarn
-#lerna bootstrap --npm-client=yarn
+# 注意不要使用 `npm install` 来安装依赖，因为 `pnpm` 会自动安装依赖
+pnpm install
# 运行DevSidecar
cd packages/gui
From 9ef07caf233717b2d21ce164c55717437dda860a Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Tue, 19 Nov 2024 00:18:57 +0800
Subject: [PATCH 17/20] fix: cli package path
---
packages/cli/src/mitmproxy.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/cli/src/mitmproxy.js b/packages/cli/src/mitmproxy.js
index a86035d063..f02a1df7db 100644
--- a/packages/cli/src/mitmproxy.js
+++ b/packages/cli/src/mitmproxy.js
@@ -2,7 +2,7 @@ const fs = require('node:fs')
const path = require('node:path')
const server = require('@docmirror/mitmproxy')
const jsonApi = require('@docmirror/mitmproxy/src/json')
-const log = require('../src/utils/util.log')
+const log = require('@docmirror/mitmproxy/src/utils/util.log')
const home = process.env.USER_HOME || process.env.HOME || 'C:/Users/Administrator/'
From 273af787c14f8160543d5efce5b37a22f1cbc894 Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Tue, 19 Nov 2024 00:26:07 +0800
Subject: [PATCH 18/20] fix: lru-cache err
---
packages/mitmproxy/src/lib/choice/index.js | 3 +++
packages/mitmproxy/src/lib/dns/base.js | 3 +++
2 files changed, 6 insertions(+)
diff --git a/packages/mitmproxy/src/lib/choice/index.js b/packages/mitmproxy/src/lib/choice/index.js
index 964c2c6ff5..734fc946c0 100644
--- a/packages/mitmproxy/src/lib/choice/index.js
+++ b/packages/mitmproxy/src/lib/choice/index.js
@@ -7,6 +7,9 @@ class ChoiceCache {
constructor () {
this.cache = new LRUCache({
maxSize: cacheSize,
+ sizeCalculation: () => {
+ return 1
+ },
})
}
diff --git a/packages/mitmproxy/src/lib/dns/base.js b/packages/mitmproxy/src/lib/dns/base.js
index cc40863640..d2dcf48e8b 100644
--- a/packages/mitmproxy/src/lib/dns/base.js
+++ b/packages/mitmproxy/src/lib/dns/base.js
@@ -25,6 +25,9 @@ module.exports = class BaseDNS {
constructor () {
this.cache = new LRUCache({
maxSize: cacheSize,
+ sizeCalculation: () => {
+ return 1
+ },
})
}
From 468eb62137d8852acfa5876b97f3a9c76d31b515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Tue, 19 Nov 2024 01:48:35 +0800
Subject: [PATCH 19/20] fix Style
---
README.md | 8 ++++----
packages/gui/src/background.js | 2 +-
packages/gui/src/bridge/update/front.js | 1 -
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 29733bcb4b..39170af889 100644
--- a/README.md
+++ b/README.md
@@ -279,10 +279,10 @@ networksetup -setwebproxy 'WiFi' 127.0.0.1 31181
#### 3）火狐浏览器：火狐浏览器不走系统的根证书，需要在选项中添加根证书
- - 1. 火狐浏览器->选项->隐私与安全->证书->查看证书
- - 2. 证书颁发机构->导入
- - 3. 选择证书文件 `C:\Users(用户)\Administrator(你的账号)\.dev-sidecar\dev-sidecar.ca.crt`（Mac或linux为 `~/.dev-sidecar` 目录）
- - 4. 勾选信任由此证书颁发机构来标识网站，确定即可
+1. 火狐浏览器->选项->隐私与安全->证书->查看证书
+2. 证书颁发机构->导入
+3. 选择证书文件 `C:\Users(用户)\Administrator(你的账号)\.dev-sidecar\dev-sidecar.ca.crt`（Mac或linux为 `~/.dev-sidecar` 目录）
+4. 勾选信任由此证书颁发机构来标识网站，确定即可
### 6.4、打开github显示连接超时
diff --git a/packages/gui/src/background.js b/packages/gui/src/background.js
index bbd30a336b..00af78b0d5 100644
--- a/packages/gui/src/background.js
+++ b/packages/gui/src/background.js
@@ -372,7 +372,7 @@ if (app.getLoginItemSettings().wasOpenedAsHidden) {
startHideWindow = false
}
}
-log.info('start hide window:', startHideWindow, ', app.getLoginItemSettings() = ', jsonApi.stringify2(app.getLoginItemSettings()))
+log.info('startHideWindow = ', startHideWindow, ', app.getLoginItemSettings() = ', jsonApi.stringify2(app.getLoginItemSettings()))
// 禁止双开
const isFirstInstance = app.requestSingleInstanceLock()
diff --git a/packages/gui/src/bridge/update/front.js b/packages/gui/src/bridge/update/front.js
index 7e486b26de..51a0436f1e 100644
--- a/packages/gui/src/bridge/update/front.js
+++ b/packages/gui/src/bridge/update/front.js
@@ -85,7 +85,6 @@ function install (app, api) {
From 808568167522c1477d60d08bd11781fe19419a44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Tue, 19 Nov 2024 01:52:39 +0800
Subject: [PATCH 20/20] revert
---
packages/cli/src/index.js | 4 ++--
packages/gui/public/index.html | 2 +-
packages/gui/src/view/pages/setting.vue | 2 +-
.../mitmproxy/src/lib/interceptor/index.js | 24 +++++++------------
.../impl/res/responseReplaceTest.js | 17 +++++--------
5 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js
index 92f42940d6..ac7a2699f3 100644
--- a/packages/cli/src/index.js
+++ b/packages/cli/src/index.js
@@ -5,10 +5,10 @@ const jsonApi = require('@docmirror/mitmproxy/src/json')
// 启动服务
const mitmproxyPath = './mitmproxy'
async function startup () {
- const banner = fs.readFileSync('./src/banner.txt')
+ const banner = fs.readFileSync('./banner.txt')
console.log(banner.toString())
- const configPath = './src/user_config.json5'
+ const configPath = './user_config.json5'
if (fs.existsSync(configPath)) {
const file = fs.readFileSync(configPath)
const userConfig = jsonApi.parse(file.toString())
diff --git a/packages/gui/public/index.html b/packages/gui/public/index.html
index dceebc70b4..0e66115d5e 100644
--- a/packages/gui/public/index.html
+++ b/packages/gui/public/index.html
@@ -1,4 +1,4 @@
-
+
diff --git a/packages/gui/src/view/pages/setting.vue b/packages/gui/src/view/pages/setting.vue
index 940e539c74..607c0f90ed 100644
--- a/packages/gui/src/view/pages/setting.vue
+++ b/packages/gui/src/view/pages/setting.vue
@@ -264,7 +264,7 @@ export default {
this.$confirm({
title: '确定要恢复出厂设置吗？',
width: 610,
- content: h => (
+ content: (h) => (
diff --git a/packages/mitmproxy/src/lib/interceptor/index.js b/packages/mitmproxy/src/lib/interceptor/index.js
index be7cbc9c3c..a37b6f560a 100644
--- a/packages/mitmproxy/src/lib/interceptor/index.js
+++ b/packages/mitmproxy/src/lib/interceptor/index.js
@@ -1,17 +1,17 @@
-const abort = require('./impl/req/abort')
-
-const baiduOcr = require('./impl/req/baiduOcr')
-const cacheReq = require('./impl/req/cacheReq')
// request interceptor impls
const OPTIONS = require('./impl/req/OPTIONS.js')
-const proxy = require('./impl/req/proxy')
+const success = require('./impl/req/success')
const redirect = require('./impl/req/redirect')
+const abort = require('./impl/req/abort')
+const cacheReq = require('./impl/req/cacheReq')
const requestReplace = require('./impl/req/requestReplace')
+
+const proxy = require('./impl/req/proxy')
const sni = require('./impl/req/sni')
-const success = require('./impl/req/success')
+const baiduOcr = require('./impl/req/baiduOcr')
// response interceptor impls
const OPTIONSHeaders = require('./impl/res/AfterOPTIONSHeaders')
@@ -23,18 +23,12 @@ const script = require('./impl/res/script')
module.exports = [
// request interceptor impls
OPTIONS,
- success,
- redirect,
- abort,
- cacheReq,
+ success, redirect, abort, cacheReq,
requestReplace,
- proxy,
- sni,
+ proxy, sni,
baiduOcr,
// response interceptor impls
- OPTIONSHeaders,
- cacheRes,
- responseReplace,
+ OPTIONSHeaders, cacheRes, responseReplace,
script,
]
diff --git a/packages/mitmproxy/test/lib/interceptor/impl/res/responseReplaceTest.js b/packages/mitmproxy/test/lib/interceptor/impl/res/responseReplaceTest.js
index 050fc37db9..00ff519773 100644
--- a/packages/mitmproxy/test/lib/interceptor/impl/res/responseReplaceTest.js
+++ b/packages/mitmproxy/test/lib/interceptor/impl/res/responseReplaceTest.js
@@ -9,17 +9,12 @@ const res = {
const proxyRes = {
rawHeaders: [
- 'Content-Type',
- 'application/json; charset=utf-8',
- 'Content-Length',
- '2',
- 'ETag',
- 'W/"2"',
- 'Date',
- 'Thu, 01 Jan 1970 00:00:00 GMT',
- 'Connection',
- 'keep-alive',
- ],
+ 'Content-Type', 'application/json; charset=utf-8',
+ 'Content-Length', '2',
+ 'ETag', 'W/"2"',
+ 'Date', 'Thu, 01 Jan 1970 00:00:00 GMT',
+ 'Connection', 'keep-alive'
+ ]
}
const newHeaders = {
|
|---|
|
|---|
