From dc66fe405d413d90d3b213a8de376f69160557fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Wed, 12 Feb 2025 14:16:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=84=E6=A8=A1=E5=9D=97=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=84=9A=E6=9C=AC=E6=96=87=E4=BB=B6=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=EF=BC=8C=E6=9B=B4=E6=98=8E=E7=A1=AE=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/src/mitmproxy.js                                 | 4 ++--
 packages/core/src/config-api.js                               | 2 +-
 packages/core/src/expose.js                                   | 2 +-
 packages/core/src/index.js                                    | 2 +-
 packages/core/src/modules/server/index.js                     | 2 +-
 packages/core/src/shell/scripts/enable-loopback.js            | 2 +-
 packages/core/src/shell/scripts/extra-path/index.js           | 2 +-
 packages/core/src/shell/scripts/set-system-proxy/index.js     | 2 +-
 packages/core/src/shell/shell.js                              | 2 +-
 packages/core/src/status.js                                   | 2 +-
 packages/core/src/utils/{util.log.js => util.log.core.js}     | 0
 packages/gui/src/background.js                                | 4 ++--
 packages/gui/src/bridge/api/backend.js                        | 2 +-
 packages/gui/src/bridge/api/open-enable-loopback.js           | 2 +-
 packages/gui/src/bridge/backend.js                            | 2 +-
 packages/gui/src/bridge/mitmproxy.js                          | 2 +-
 packages/gui/src/bridge/update/backend.js                     | 2 +-
 packages/gui/src/utils/util.apppath.js                        | 2 +-
 packages/gui/src/utils/{util.log.js => util.log.gui.js}       | 0
 packages/mitmproxy/src/index.js                               | 2 +-
 packages/mitmproxy/src/lib/choice/index.js                    | 2 +-
 packages/mitmproxy/src/lib/dns/base.js                        | 2 +-
 packages/mitmproxy/src/lib/dns/https.js                       | 2 +-
 packages/mitmproxy/src/lib/dns/ipaddress.js                   | 2 +-
 packages/mitmproxy/src/lib/dns/tls.js                         | 2 +-
 packages/mitmproxy/src/lib/interceptor/impl/res/script.js     | 2 +-
 packages/mitmproxy/src/lib/monkey/index.js                    | 2 +-
 packages/mitmproxy/src/lib/proxy/common/util.js               | 2 +-
 packages/mitmproxy/src/lib/proxy/compatible/compatible.js     | 2 +-
 .../src/lib/proxy/middleware/InsertScriptMiddleware.js        | 2 +-
 packages/mitmproxy/src/lib/proxy/middleware/overwall.js       | 2 +-
 packages/mitmproxy/src/lib/proxy/middleware/source/pac.js     | 2 +-
 .../mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js | 2 +-
 .../src/lib/proxy/mitmproxy/createFakeServerCenter.js         | 2 +-
 .../mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js | 2 +-
 .../mitmproxy/src/lib/proxy/mitmproxy/createUpgradeHandler.js | 2 +-
 packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js       | 2 +-
 packages/mitmproxy/src/lib/proxy/mitmproxy/index.js           | 2 +-
 packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js   | 2 +-
 packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js     | 2 +-
 packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js              | 2 +-
 packages/mitmproxy/src/lib/speed/SpeedTester.js               | 2 +-
 packages/mitmproxy/src/lib/speed/index.js                     | 2 +-
 packages/mitmproxy/src/options.js                             | 2 +-
 packages/mitmproxy/src/utils/util.js                          | 2 +-
 .../mitmproxy/src/utils/{util.log.js => util.log.server.js}   | 0
 packages/mitmproxy/src/utils/util.match.js                    | 2 +-
 47 files changed, 46 insertions(+), 46 deletions(-)
 rename packages/core/src/utils/{util.log.js => util.log.core.js} (100%)
 rename packages/gui/src/utils/{util.log.js => util.log.gui.js} (100%)
 rename packages/mitmproxy/src/utils/{util.log.js => util.log.server.js} (100%)

diff --git a/packages/cli/src/mitmproxy.js b/packages/cli/src/mitmproxy.js
index 80ed8417..c3b0720b 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('@docmirror/mitmproxy/src/utils/util.log') // 当前脚本是在 server 的进程中执行的，所以使用 mitmproxy 中的logger
+const log = require('@docmirror/mitmproxy/src/utils/util.log.server') // 当前脚本是在 server 的进程中执行的，所以使用 mitmproxy 中的logger
 
 const home = process.env.USER_HOME || process.env.HOME || 'C:/Users/Administrator/'
 
@@ -14,7 +14,7 @@ if (process.argv && process.argv.length > 3) {
 }
 
 const configJson = fs.readFileSync(configPath)
-log.info('读取 running.json by core 成功:', configPath)
+log.info('读取 running.json by cli 成功:', configPath)
 let config
 try {
   config = jsonApi.parse(configJson.toString())
diff --git a/packages/core/src/config-api.js b/packages/core/src/config-api.js
index 739f6b45..0293aa55 100644
--- a/packages/core/src/config-api.js
+++ b/packages/core/src/config-api.js
@@ -5,7 +5,7 @@ const request = require('request')
 const defConfig = require('./config/index.js')
 const mergeApi = require('./merge.js')
 const Shell = require('./shell')
-const log = require('./utils/util.log')
+const log = require('./utils/util.log.core')
 const configLoader = require('./config/local-config-loader')
 
 let configTarget = lodash.cloneDeep(defConfig)
diff --git a/packages/core/src/expose.js b/packages/core/src/expose.js
index 74616ae1..20dfb3f8 100644
--- a/packages/core/src/expose.js
+++ b/packages/core/src/expose.js
@@ -4,7 +4,7 @@ const event = require('./event')
 const modules = require('./modules')
 const shell = require('./shell')
 const status = require('./status')
-const log = require('./utils/util.log')
+const log = require('./utils/util.log.core')
 
 const context = {
   config,
diff --git a/packages/core/src/index.js b/packages/core/src/index.js
index aede7094..a5d00772 100644
--- a/packages/core/src/index.js
+++ b/packages/core/src/index.js
@@ -1,5 +1,5 @@
 const expose = require('./expose.js')
-const log = require('./utils/util.log')
+const log = require('./utils/util.log.core')
 // process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 
 // 避免异常崩溃
diff --git a/packages/core/src/modules/server/index.js b/packages/core/src/modules/server/index.js
index 66a6f2a0..25eb877f 100644
--- a/packages/core/src/modules/server/index.js
+++ b/packages/core/src/modules/server/index.js
@@ -6,7 +6,7 @@ const config = require('../../config-api')
 const event = require('../../event')
 const status = require('../../status')
 const jsonApi = require('@docmirror/mitmproxy/src/json')
-const log = require('../../utils/util.log')
+const log = require('../../utils/util.log.core')
 
 let server = null
 function fireStatus (status) {
diff --git a/packages/core/src/shell/scripts/enable-loopback.js b/packages/core/src/shell/scripts/enable-loopback.js
index 7d385e39..2547824b 100644
--- a/packages/core/src/shell/scripts/enable-loopback.js
+++ b/packages/core/src/shell/scripts/enable-loopback.js
@@ -3,7 +3,7 @@
 const Shell = require('../shell')
 const extraPath = require('./extra-path')
 const sudoPrompt = require('@vscode/sudo-prompt')
-const log = require('../../utils/util.log')
+const log = require('../../utils/util.log.core')
 const execute = Shell.execute
 
 const executor = {
diff --git a/packages/core/src/shell/scripts/extra-path/index.js b/packages/core/src/shell/scripts/extra-path/index.js
index 48ad7ffe..35be7089 100644
--- a/packages/core/src/shell/scripts/extra-path/index.js
+++ b/packages/core/src/shell/scripts/extra-path/index.js
@@ -1,5 +1,5 @@
 const path = require('node:path')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.core')
 
 function getExtraPath () {
   let extraPath = process.env.DS_EXTRA_PATH
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 e63ce389..553f80e5 100644
--- a/packages/core/src/shell/scripts/set-system-proxy/index.js
+++ b/packages/core/src/shell/scripts/set-system-proxy/index.js
@@ -5,7 +5,7 @@ const fs = require('node:fs')
 const path = require('node:path')
 const request = require('request')
 const Registry = require('winreg')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.core')
 const Shell = require('../../shell')
 const extraPath = require('../extra-path')
 const dateUtil = require('../../../utils/util.date')
diff --git a/packages/core/src/shell/shell.js b/packages/core/src/shell/shell.js
index 0e1c615d..a0f6bc78 100644
--- a/packages/core/src/shell/shell.js
+++ b/packages/core/src/shell/shell.js
@@ -2,7 +2,7 @@ const childProcess = require('node:child_process')
 const os = require('node:os')
 const fixPath = require('fix-path')
 const PowerShell = require('node-powershell')
-const log = require('../utils/util.log')
+const log = require('../utils/util.log.core')
 
 fixPath()
 
diff --git a/packages/core/src/status.js b/packages/core/src/status.js
index 65a0804f..99fe8133 100644
--- a/packages/core/src/status.js
+++ b/packages/core/src/status.js
@@ -1,6 +1,6 @@
 const lodash = require('lodash')
 const event = require('./event')
-const log = require('./utils/util.log')
+const log = require('./utils/util.log.core')
 
 const status = {
   server: { enabled: false },
diff --git a/packages/core/src/utils/util.log.js b/packages/core/src/utils/util.log.core.js
similarity index 100%
rename from packages/core/src/utils/util.log.js
rename to packages/core/src/utils/util.log.core.js
diff --git a/packages/gui/src/background.js b/packages/gui/src/background.js
index c08285a1..a4d4bf5a 100644
--- a/packages/gui/src/background.js
+++ b/packages/gui/src/background.js
@@ -7,7 +7,7 @@ import minimist from 'minimist'
 import { createProtocol } from 'vue-cli-plugin-electron-builder/lib'
 import backend from './bridge/backend'
 import jsonApi from '@docmirror/mitmproxy/src/json'
-import log from './utils/util.log'
+import log from './utils/util.log.gui'
 
 log.info(`background.js start, platform is ${process.platform}`)
 
@@ -435,7 +435,7 @@ try {
   // 禁止双开
   const isFirstInstance = app.requestSingleInstanceLock()
   if (!isFirstInstance) {
-    log.info('app quit: is second instance')
+    log.info('app quit: is second instance（禁止双开）')
     setTimeout(() => {
       app.quit()
     }, 1000)
diff --git a/packages/gui/src/bridge/api/backend.js b/packages/gui/src/bridge/api/backend.js
index 84db5c6e..5d64be6a 100644
--- a/packages/gui/src/bridge/api/backend.js
+++ b/packages/gui/src/bridge/api/backend.js
@@ -7,7 +7,7 @@ import lodash from 'lodash'
 const jsonApi = require('@docmirror/mitmproxy/src/json')
 const pk = require('../../../package.json')
 const configFromFiles = require('@docmirror/dev-sidecar/src/config/index.js').configFromFiles
-const log = require('../../utils/util.log')
+const log = require('../../utils/util.log.gui')
 const dateUtil = require('@docmirror/dev-sidecar/src/utils/util.date')
 
 const mitmproxyPath = path.join(__dirname, 'mitmproxy.js')
diff --git a/packages/gui/src/bridge/api/open-enable-loopback.js b/packages/gui/src/bridge/api/open-enable-loopback.js
index 53da1c4f..7e2e9101 100644
--- a/packages/gui/src/bridge/api/open-enable-loopback.js
+++ b/packages/gui/src/bridge/api/open-enable-loopback.js
@@ -2,7 +2,7 @@
 import DevSidecar from '@docmirror/dev-sidecar'
 import sudoPrompt from '@vscode/sudo-prompt'
 import { join } from 'node:path'
-import log from '../../utils/util.log'
+import log from '../../utils/util.log.gui'
 
 export default {
   open () {
diff --git a/packages/gui/src/bridge/backend.js b/packages/gui/src/bridge/backend.js
index b0c7c632..0c1d111f 100644
--- a/packages/gui/src/bridge/backend.js
+++ b/packages/gui/src/bridge/backend.js
@@ -3,7 +3,7 @@ import autoStart from './auto-start/backend'
 import fileSelector from './file-selector/backend'
 import tongji from './tongji/backend'
 import update from './update/backend'
-import log from '../utils/util.log'
+import log from '../utils/util.log.gui'
 
 const modules = {
   api, // 核心接口模块
diff --git a/packages/gui/src/bridge/mitmproxy.js b/packages/gui/src/bridge/mitmproxy.js
index 1a03b3c6..d51fc909 100644
--- a/packages/gui/src/bridge/mitmproxy.js
+++ b/packages/gui/src/bridge/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('@docmirror/mitmproxy/src/utils/util.log') // 当前脚本是在 server 的进程中执行的，所以使用 mitmproxy 中的logger
+const log = require('@docmirror/mitmproxy/src/utils/util.log.server') // 当前脚本是在 server 的进程中执行的，所以使用 mitmproxy 中的logger
 
 const configPath = process.argv[2]
 const configJson = fs.readFileSync(configPath)
diff --git a/packages/gui/src/bridge/update/backend.js b/packages/gui/src/bridge/update/backend.js
index 53657178..163bea73 100644
--- a/packages/gui/src/bridge/update/backend.js
+++ b/packages/gui/src/bridge/update/backend.js
@@ -8,7 +8,7 @@ import request from 'request'
 import progress from 'request-progress'
 import pkg from '../../../package.json'
 import appPathUtil from '../../utils/util.apppath'
-import log from '../../utils/util.log'
+import log from '../../utils/util.log.gui'
 
 const isMac = process.platform === 'darwin'
 const isLinux = process.platform === 'linux'
diff --git a/packages/gui/src/utils/util.apppath.js b/packages/gui/src/utils/util.apppath.js
index 8c397f9c..0ee39d13 100644
--- a/packages/gui/src/utils/util.apppath.js
+++ b/packages/gui/src/utils/util.apppath.js
@@ -1,6 +1,6 @@
 import os from 'node:os'
 import path from 'node:path'
-import log from './util.log'
+import log from './util.log.gui'
 
 function getSystemPlatform (throwIfUnknown = false) {
   switch (os.platform()) {
diff --git a/packages/gui/src/utils/util.log.js b/packages/gui/src/utils/util.log.gui.js
similarity index 100%
rename from packages/gui/src/utils/util.log.js
rename to packages/gui/src/utils/util.log.gui.js
diff --git a/packages/mitmproxy/src/index.js b/packages/mitmproxy/src/index.js
index 4a739e48..95d10591 100644
--- a/packages/mitmproxy/src/index.js
+++ b/packages/mitmproxy/src/index.js
@@ -2,7 +2,7 @@ const mitmproxy = require('./lib/proxy')
 const proxyConfig = require('./lib/proxy/common/config')
 const speedTest = require('./lib/speed/index.js')
 const ProxyOptions = require('./options')
-const log = require('./utils/util.log')
+const log = require('./utils/util.log.server')
 const { fireError, fireStatus } = require('./utils/util.process')
 
 let servers = []
diff --git a/packages/mitmproxy/src/lib/choice/index.js b/packages/mitmproxy/src/lib/choice/index.js
index 734fc946..71622ee3 100644
--- a/packages/mitmproxy/src/lib/choice/index.js
+++ b/packages/mitmproxy/src/lib/choice/index.js
@@ -1,5 +1,5 @@
 const LRUCache = require('lru-cache')
-const log = require('../../utils/util.log')
+const log = require('../../utils/util.log.server')
 
 const cacheSize = 1024
 
diff --git a/packages/mitmproxy/src/lib/dns/base.js b/packages/mitmproxy/src/lib/dns/base.js
index 386f30e5..d44b1a53 100644
--- a/packages/mitmproxy/src/lib/dns/base.js
+++ b/packages/mitmproxy/src/lib/dns/base.js
@@ -1,5 +1,5 @@
 const LRUCache = require('lru-cache')
-const log = require('../../utils/util.log')
+const log = require('../../utils/util.log.server')
 const { DynamicChoice } = require('../choice/index')
 
 const cacheSize = 1024
diff --git a/packages/mitmproxy/src/lib/dns/https.js b/packages/mitmproxy/src/lib/dns/https.js
index c42fab5f..1031af03 100644
--- a/packages/mitmproxy/src/lib/dns/https.js
+++ b/packages/mitmproxy/src/lib/dns/https.js
@@ -1,6 +1,6 @@
 const { promisify } = require('node:util')
 const doh = require('dns-over-http')
-const log = require('../../utils/util.log')
+const log = require('../../utils/util.log.server')
 const matchUtil = require('../../utils/util.match')
 const BaseDNS = require('./base')
 
diff --git a/packages/mitmproxy/src/lib/dns/ipaddress.js b/packages/mitmproxy/src/lib/dns/ipaddress.js
index 3be81eec..ab4d85de 100644
--- a/packages/mitmproxy/src/lib/dns/ipaddress.js
+++ b/packages/mitmproxy/src/lib/dns/ipaddress.js
@@ -1,5 +1,5 @@
 const axios = require('axios')
-const log = require('../../utils/util.log')
+const log = require('../../utils/util.log.server')
 const BaseDNS = require('./base')
 
 module.exports = class DNSOverIpAddress extends BaseDNS {
diff --git a/packages/mitmproxy/src/lib/dns/tls.js b/packages/mitmproxy/src/lib/dns/tls.js
index 61778584..0247c3e5 100644
--- a/packages/mitmproxy/src/lib/dns/tls.js
+++ b/packages/mitmproxy/src/lib/dns/tls.js
@@ -1,5 +1,5 @@
 const dnstls = require('dns-over-tls')
-const log = require('../../utils/util.log')
+const log = require('../../utils/util.log.server')
 const BaseDNS = require('./base')
 
 module.exports = class DNSOverTLS extends BaseDNS {
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/res/script.js b/packages/mitmproxy/src/lib/interceptor/impl/res/script.js
index 58e75817..d0a0bd32 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/res/script.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/res/script.js
@@ -1,7 +1,7 @@
 const monkey = require('../../../monkey')
 // const CryptoJs = require('crypto-js')
 const lodash = require('lodash')
-const log = require('../../../../utils/util.log')
+const log = require('../../../../utils/util.log.server')
 
 const SCRIPT_URL_PRE = '/____ds_script____/' // 内置脚本的请求地址前缀
 const SCRIPT_PROXY_URL_PRE = '/____ds_script_proxy____/' // 绝对地址脚本的伪脚本地址前缀
diff --git a/packages/mitmproxy/src/lib/monkey/index.js b/packages/mitmproxy/src/lib/monkey/index.js
index df00bd70..a87153d2 100644
--- a/packages/mitmproxy/src/lib/monkey/index.js
+++ b/packages/mitmproxy/src/lib/monkey/index.js
@@ -1,6 +1,6 @@
 const fs = require('node:fs')
 const path = require('node:path')
-const log = require('../../utils/util.log')
+const log = require('../../utils/util.log.server')
 
 let scripts
 
diff --git a/packages/mitmproxy/src/lib/proxy/common/util.js b/packages/mitmproxy/src/lib/proxy/common/util.js
index 31e1cd14..5f3bb8e6 100644
--- a/packages/mitmproxy/src/lib/proxy/common/util.js
+++ b/packages/mitmproxy/src/lib/proxy/common/util.js
@@ -1,6 +1,6 @@
 const url = require('node:url')
 const tunnelAgent = require('tunnel-agent')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 const matchUtil = require('../../../utils/util.match')
 const Agent = require('./ProxyHttpAgent')
 const HttpsAgent = require('./ProxyHttpsAgent')
diff --git a/packages/mitmproxy/src/lib/proxy/compatible/compatible.js b/packages/mitmproxy/src/lib/proxy/compatible/compatible.js
index db36757e..fe47e952 100644
--- a/packages/mitmproxy/src/lib/proxy/compatible/compatible.js
+++ b/packages/mitmproxy/src/lib/proxy/compatible/compatible.js
@@ -7,7 +7,7 @@
  */
 const fs = require('node:fs')
 const jsonApi = require('../../../json')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 const matchUtil = require('../../../utils/util.match')
 const configLoader = require('@docmirror/dev-sidecar/src/config/local-config-loader')
 
diff --git a/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js b/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js
index d1791495..d2920e6e 100644
--- a/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js
+++ b/packages/mitmproxy/src/lib/proxy/middleware/InsertScriptMiddleware.js
@@ -1,6 +1,6 @@
 const zlib = require('node:zlib')
 const through = require('through2')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 
 // 编解码器
 const codecMap = {
diff --git a/packages/mitmproxy/src/lib/proxy/middleware/overwall.js b/packages/mitmproxy/src/lib/proxy/middleware/overwall.js
index 41864152..0a5951d2 100644
--- a/packages/mitmproxy/src/lib/proxy/middleware/overwall.js
+++ b/packages/mitmproxy/src/lib/proxy/middleware/overwall.js
@@ -4,7 +4,7 @@ const path = require('node:path')
 const url = require('node:url')
 const lodash = require('lodash')
 const request = require('request')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 const matchUtil = require('../../../utils/util.match')
 const pac = require('./source/pac')
 const dateUtil = require('@docmirror/dev-sidecar/src/utils/util.date')
diff --git a/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js b/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js
index 554de560..22d80fb2 100644
--- a/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js
+++ b/packages/mitmproxy/src/lib/proxy/middleware/source/pac.js
@@ -1,6 +1,6 @@
 const fs = require('node:fs')
 const path = require('node:path')
-const log = require('../../../../utils/util.log')
+const log = require('../../../../utils/util.log.server')
 
 function createPacClient (pacFilePath) {
   const __PROXY__ = 'PROXY 127.0.0.1:1080;'
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
index 42afade5..49fa2fe7 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
@@ -1,7 +1,7 @@
 const net = require('node:net')
 const url = require('node:url')
 const jsonApi = require('../../../json')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 const DnsUtil = require('../../dns')
 const dnsLookup = require('./dnsLookup')
 
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js
index f0b2a140..0e7c70c0 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createFakeServerCenter.js
@@ -1,6 +1,6 @@
 const fs = require('node:fs')
 const forge = require('node-forge')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 const FakeServersCenter = require('../tls/FakeServersCenter')
 
 module.exports = function createFakeServerCenter ({
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
index 39166866..516591ae 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
@@ -1,7 +1,7 @@
 const http = require('node:http')
 const https = require('node:https')
 const jsonApi = require('../../../json')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 const RequestCounter = require('../../choice/RequestCounter')
 const commonUtil = require('../common/util')
 // const upgradeHeader = /(^|,)\s*upgrade\s*($|,)/i
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createUpgradeHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createUpgradeHandler.js
index df385986..5b7d16c3 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createUpgradeHandler.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createUpgradeHandler.js
@@ -1,6 +1,6 @@
 const http = require('node:http')
 const https = require('node:https')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 const util = require('../common/util')
 
 // copy from node-http-proxy.  ^_^
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js
index fe5edaca..466d543c 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/dnsLookup.js
@@ -1,5 +1,5 @@
 const defaultDns = require('node:dns')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 const speedTest = require('../../speed')
 
 module.exports = {
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js
index 3281a0ba..87bd6b76 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js
@@ -1,5 +1,5 @@
 const http = require('node:http')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 const speedTest = require('../../speed/index.js')
 const config = require('../common/config')
 const tlsUtils = require('../tls/tlsUtils')
diff --git a/packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js b/packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js
index 2c9df17f..e13a0157 100644
--- a/packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js
+++ b/packages/mitmproxy/src/lib/proxy/tls/CertAndKeyContainer.js
@@ -1,6 +1,6 @@
 const tlsUtils = require('./tlsUtils')
 // const https = require('https')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 
 module.exports = class CertAndKeyContainer {
   constructor ({
diff --git a/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js b/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js
index b9f4f5af..fadab78c 100644
--- a/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js
+++ b/packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js
@@ -4,7 +4,7 @@ const tls = require('node:tls')
 const forge = require('node-forge')
 const CertAndKeyContainer = require('./CertAndKeyContainer')
 const tlsUtils = require('./tlsUtils')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 const compatible = require('../compatible/compatible')
 
 const pki = forge.pki
diff --git a/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js b/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js
index 5a574fc9..2e44900d 100644
--- a/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js
+++ b/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js
@@ -2,7 +2,7 @@ const fs = require('node:fs')
 const path = require('node:path')
 const _ = require('lodash')
 const forge = require('node-forge')
-const log = require('../../../utils/util.log')
+const log = require('../../../utils/util.log.server')
 const config = require('../common/config')
 // const colors = require('colors')
 
diff --git a/packages/mitmproxy/src/lib/speed/SpeedTester.js b/packages/mitmproxy/src/lib/speed/SpeedTester.js
index 924486c1..fc35825e 100644
--- a/packages/mitmproxy/src/lib/speed/SpeedTester.js
+++ b/packages/mitmproxy/src/lib/speed/SpeedTester.js
@@ -1,7 +1,7 @@
 // 1个小时不访问，取消获取
 const net = require('node:net')
 const _ = require('lodash')
-const log = require('../../utils/util.log')
+const log = require('../../utils/util.log.server')
 const config = require('./config.js')
 
 const DISABLE_TIMEOUT = 60 * 60 * 1000
diff --git a/packages/mitmproxy/src/lib/speed/index.js b/packages/mitmproxy/src/lib/speed/index.js
index 2f0036f4..0d31e552 100644
--- a/packages/mitmproxy/src/lib/speed/index.js
+++ b/packages/mitmproxy/src/lib/speed/index.js
@@ -1,5 +1,5 @@
 const _ = require('lodash')
-const log = require('../../utils/util.log')
+const log = require('../../utils/util.log.server')
 const config = require('./config')
 const SpeedTester = require('./SpeedTester.js')
 
diff --git a/packages/mitmproxy/src/options.js b/packages/mitmproxy/src/options.js
index 82bebc5f..e3b3b89f 100644
--- a/packages/mitmproxy/src/options.js
+++ b/packages/mitmproxy/src/options.js
@@ -6,7 +6,7 @@ const dnsUtil = require('./lib/dns')
 const interceptorImpls = require('./lib/interceptor')
 const scriptInterceptor = require('./lib/interceptor/impl/res/script')
 const { getTmpPacFilePath, downloadPacAsync, createOverwallMiddleware } = require('./lib/proxy/middleware/overwall')
-const log = require('./utils/util.log')
+const log = require('./utils/util.log.server')
 const matchUtil = require('./utils/util.match')
 
 // 处理拦截配置
diff --git a/packages/mitmproxy/src/utils/util.js b/packages/mitmproxy/src/utils/util.js
index 65c6d28e..ea4682c6 100644
--- a/packages/mitmproxy/src/utils/util.js
+++ b/packages/mitmproxy/src/utils/util.js
@@ -1,5 +1,5 @@
 // const os = require('os')
-const log = require('util.log')
+const log = require('packages/mitmproxy/src/utils/util.log.server')
 
 const util = {
   getNodeVersion () {
diff --git a/packages/mitmproxy/src/utils/util.log.js b/packages/mitmproxy/src/utils/util.log.server.js
similarity index 100%
rename from packages/mitmproxy/src/utils/util.log.js
rename to packages/mitmproxy/src/utils/util.log.server.js
diff --git a/packages/mitmproxy/src/utils/util.match.js b/packages/mitmproxy/src/utils/util.match.js
index dbdd5885..46bf246d 100644
--- a/packages/mitmproxy/src/utils/util.match.js
+++ b/packages/mitmproxy/src/utils/util.match.js
@@ -1,5 +1,5 @@
 const lodash = require('lodash')
-const log = require('./util.log')
+const log = require('./util.log.server')
 
 function isMatched (url, regexp) {
   if (regexp === '.*' || regexp === '*' || regexp === 'true' || regexp === true) {