1、此设置用于解决OneNote、MicrosoftStore、Outlook等UWP应用无法访问网络的问题。
diff --git a/packages/gui/src/view/pages/server.vue b/packages/gui/src/view/pages/server.vue
index 1562f84..b353dfd 100644
--- a/packages/gui/src/view/pages/server.vue
+++ b/packages/gui/src/view/pages/server.vue
@@ -407,8 +407,12 @@ export default {
- 立即重新测速
- 刷新
+
+ 立即重新测速
+
+
+ 刷新
+
@@ -434,8 +438,12 @@ export default {
| 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/interceptor/impl/req/proxy.js b/packages/mitmproxy/src/lib/interceptor/impl/req/proxy.js
index 6dcf19c..90efd33 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')
// 替换占位符
diff --git a/packages/mitmproxy/src/lib/monkey/index.js b/packages/mitmproxy/src/lib/monkey/index.js
index fbd1daa..df00bd7 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
@@ -57,10 +57,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) {
diff --git a/packages/mitmproxy/src/lib/proxy/common/config.js b/packages/mitmproxy/src/lib/proxy/common/config.js
index 0453c1b..617fbc9 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 0ab2a04..31e1cd1 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')
diff --git a/packages/mitmproxy/src/lib/proxy/compatible/compatible.js b/packages/mitmproxy/src/lib/proxy/compatible/compatible.js
index dd4eb2b..e9ffba3 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')
diff --git a/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js b/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js
index ce3b107..d179149 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')
diff --git a/packages/mitmproxy/src/lib/proxy/middleware/overwall.js b/packages/mitmproxy/src/lib/proxy/middleware/overwall.js
index d6b2a16..0b0d070 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')
@@ -49,7 +49,7 @@ function loadPacLastModifiedTime (pacTxt) {
if (matched && matched.length > 0) {
try {
return new Date(matched[0])
- } catch (ignore) {
+ } catch {
return null
}
}
@@ -74,7 +74,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
@@ -113,13 +113,11 @@ async function downloadPacAsync (pacConfig) {
// 尝试解析Base64（注：https://gitlab.com/gfwlist/gfwlist/raw/master/gfwlist.txt 下载下来的是Base64格式）
let pacTxt = body
- try {
- if (!pacTxt.includes('!---------------------EOF')) {
+ if (!pacTxt.includes('!---------------------EOF')) {
+ try {
pacTxt = Buffer.from(pacTxt, 'base64').toString('utf8')
// log.debug('解析 base64 后的 pax:', pacTxt)
- }
- } catch (e) {
- if (!pacTxt.includes('!---------------------EOF')) {
+ } catch {
log.error(`远程 pac.txt 文件内容即不是base64格式，也不是要求的格式，url: ${remotePacFileUrl}，body: ${body}`)
return
}
@@ -153,11 +151,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
diff --git a/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js b/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js
index 6a0bd29..c0fae9d 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) {
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
index 401ea23..9453409 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')
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js
index bbd4db5..f0b2a14 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')
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
index 00f68b2..a6e8fa0 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')
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createUpgradeHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createUpgradeHandler.js
index 69de41a..df38598 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 dbea703..fe5edac 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')
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js
index daaf661..9c272fb 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')
diff --git a/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js b/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js
index 598cbb3..df32037 100644
--- a/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js
+++ b/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js
@@ -1,15 +1,14 @@
-const http = require('http')
-const https = require('https')
+const http = require('node:http')
+const https = require('node:https')
const forge = require('node-forge')
+const tls = require('node:tls')
const CertAndKeyContainer = require('./CertAndKeyContainer')
const tlsUtils = require('./tlsUtils')
-
-const pki = forge.pki
-// const colors = require('colors')
-const tls = require('tls')
const log = require('../../../utils/util.log')
const compatible = require('../compatible/compatible')
+const pki = forge.pki
+
function arraysHaveSameElements (arr1, arr2) {
if (arr1.length !== arr2.length) {
return false
diff --git a/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js b/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js
index df9535e..d2df029 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 mkdirp = require('mkdirp')
const forge = require('node-forge')
diff --git a/packages/mitmproxy/src/lib/speed/SpeedTester.js b/packages/mitmproxy/src/lib/speed/SpeedTester.js
index f6b2f34..a5f915e 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')
diff --git a/packages/mitmproxy/src/options.js b/packages/mitmproxy/src/options.js
index 7cf3598..82bebc5 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')
@@ -210,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/test/proxyTest.js b/packages/mitmproxy/test/proxyTest.js
index 84a402a..55d3bab 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: {
|
|---|
|
|---|
