Merge remote-tracking branch 'upstream/master' into upgrade/part-2

# Conflicts:
#	README.md
#	packages/cli/src/index.js
#	packages/core/src/modules/server/index.js
#	packages/gui/src/bridge/update/front.js
#	packages/gui/src/view/App.vue
#	packages/gui/vue.config.js
#	packages/mitmproxy/src/lib/proxy/middleware/overwall.js
#	packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js

packages/core/src/modules/server/index.js

@@ -1,10 +1,10 @@
+const fork = require('node:child_process').fork
+const fs = require('node:fs')
+const path = require('node:path')
 const lodash = require('lodash')
 const config = require('../../config')
 const event = require('../../event')
 const status = require('../../status')
-const fork = require('node:child_process').fork
-const fs = require('node:fs')
-const path = require('node:path')
 const jsonApi = require('@docmirror/mitmproxy/src/json')
 const log = require('../../utils/util.log')
 

packages/gui/src/background.js

@@ -6,6 +6,7 @@ import { app, BrowserWindow, dialog, globalShortcut, ipcMain, Menu, nativeImage,
 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'
 
 const isWindows = process.platform === 'win32'
@@ -371,7 +372,7 @@ if (app.getLoginItemSettings().wasOpenedAsHidden) {
     startHideWindow = false
   }
 }
-log.info('start hide window:', startHideWindow, app.getLoginItemSettings())
+log.info('start hide window:', startHideWindow, ', app.getLoginItemSettings() = ', jsonApi.stringify2(app.getLoginItemSettings()))
 
 // 禁止双开
 const isFirstInstance = app.requestSingleInstanceLock()

packages/gui/src/bridge/on-close/front.js

@@ -12,7 +12,7 @@ function install (app, api) {
     }
     app.$confirm({
       title: '关闭策略',
-      content: h => (
+      content: (h) => (
         <div>
           <div style="margin-top:10px">
             <a-radio-group vOn:change={onRadioChange} defaultValue={closeType}>

packages/gui/src/bridge/update/front.js

@@ -75,7 +75,6 @@ function install (app, api) {
   function goManualUpdate (value) {
     updateParams.newVersion = false
     app.$confirm({
-      // title: '暂不支持自动升级',
       title: '暂不提供自动升级',
       cancelText: '取消',
       okText: '打开链接',

packages/mitmproxy/src/lib/proxy/middleware/overwall.js

@@ -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')) {
+        try {
           pacTxt = Buffer.from(pacTxt, 'base64').toString('utf8')
           // log.debug('解析 base64 后的 pax:', pacTxt)
-        }
         } catch {
-        if (!pacTxt.includes('!---------------------EOF')) {
           log.error(`远程 pac.txt 文件内容即不是base64格式，也不是要求的格式，url: ${remotePacFileUrl}，body: ${body}`)
           return
         }

packages/mitmproxy/src/lib/proxy/tls/FakeServersCenter.js

@@ -1,15 +1,14 @@
 const http = require('node:http')
 const https = require('node:https')
+const tls = require('node:tls')
 const forge = require('node-forge')
 const CertAndKeyContainer = require('./CertAndKeyContainer')
 const tlsUtils = require('./tlsUtils')
-
-const pki = forge.pki
-// const colors = require('colors')
-const tls = require('node: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