Refactor Electron Forge configuration and update batch script

- Updated `forge.config.js` to change application name to 'HotPE_Client', set platform to 'win32', and modify packaging options.
- Removed unused plugins and configurations related to Fuses.
- Enhanced `package.json` to include a new script for packaging with 7z and added an Electron mirror configuration.
- Updated `update.bat` script to improve error handling, ensure administrator privileges, and streamline the update process.
- Adjusted file paths and cleanup procedures in the update script for better reliability.

Author: VirtualHotBar

bun.lock

@@ -1,28 +1,29 @@
-const { FusesPlugin } = require('@electron-forge/plugin-fuses');
-const { FuseV1Options, FuseVersion } = require('@electron/fuses');
 
 module.exports = {
   packagerConfig: {
     asar: true,
-    name: 'HotPE Client',
+    platform: "win32",
+    name: 'HotPE_Client',
     icon: './logo.ico',
-    extraResource: ['./resources/'],
+    extraResource: ['resources/tools'],
+    ignore: ['src', 'resources'],
+    win32metadata: {
+      "requested-execution-level": "requireAdministrator"
+    }
   },
   rebuildConfig: {},
   makers: [
-    {
+    /* {
       name: '@electron-forge/maker-zip',
       platforms: ['win32'],
-    },
+    }, */
   ],
   plugins: [
     {
       name: '@electron-forge/plugin-vite',
       config: {
-        // `build` can specify multiple entry points
         build: [
           {
-            // `entry` is an alias for `build.lib.entry` in the corresponding file of `config`
             entry: 'src/main/index.ts',
             config: 'vite.main.config.ts',
           },
@@ -36,20 +37,5 @@ module.exports = {
         ],
       },
     },
-    {
-      name: '@electron-forge/plugin-auto-unpack-natives',
-      config: {},
-    },
-    // Fuses are used to enable/disable various Electron functionality
-    // at package time, before code signing the application
-    new FusesPlugin({
-      version: FuseVersion.V1,
-      [FuseV1Options.RunAsNode]: false,
-      [FuseV1Options.EnableCookieEncryption]: true,
-      [FuseV1Options.EnableNodeOptionsEnvironmentVariable]: false,
-      [FuseV1Options.EnableNodeCliInspectArguments]: false,
-      [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true,
-      [FuseV1Options.OnlyLoadAppFromAsar]: true,
-    }),
   ],
 };

forge.config.js

@@ -6,13 +6,16 @@
   "scripts": {
     "start": "electron-forge start",
     "package": "electron-forge package",
-    "make": "electron-forge make",
+    "make": "electron-forge make --arch=ia32 && bun run pack-7z",
+    "pack-7z": "cd out&&del HotPE_Client.7z&&.\\..\\resources\\tools\\7z\\7z.exe a -t7z -mx=9 HotPE_Client.7z -ir!HotPE_Client HotPE_Client-win32-ia32\\*",
     "publish": "electron-forge publish",
     "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0"
   },
+  "config": {
+    "ELECTRON_MIRROR":"https://npmmirror.com/mirrors/electron/"
+  },
   "dependencies": {
     "electron-is-dev": "^2.0.0",
-    "electron-squirrel-startup": "^1.0.1",
     "iconv-lite": "^0.6.3",
     "ini": "^4.1.1",
     "react-markdown": "^8.0.7"
@@ -22,11 +25,8 @@
     "@douyinfe/semi-ui": "^2.51.3",
     "@electron-forge/cli": "^6.0.4",
     "@electron-forge/maker-zip": "^6.0.4",
-    "@electron-forge/plugin-fuses": "^6.0.4",
     "@electron-forge/plugin-vite": "^6.0.4",
-    "@electron/fuses": "^1.8.0",
     "@icon-park/react": "^1.4.2",
-    "@types/copyfiles": "^2.4.1",
     "@types/ini": "^1.3.31",
     "@types/node": "^20.3.2",
     "@types/react": "^17.0.2",
@@ -36,7 +36,6 @@
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.1",
     "@vitejs/plugin-react-swc": "^3.3.2",
-    "copyfiles": "^2.4.1",
     "electron": "^18.0.0",
     "eslint": "^8.43.0",
     "eslint-plugin-react-hooks": "^4.6.0",

package.json

@@ -1,54 +1,85 @@
-%1 mshta vbscript:CreateObject("Shell.Application").ShellExecute("cmd.exe","/c %~s0 ::","","runas",1)(window.close)&&exit
+@echo off
+:: 检查是否具有管理员权限，如果没有则请求提升权限
+net session >nul 2>&1
+if '%errorlevel%' NEQ '0' (
+    powershell -Command "Start-Process '%~f0' -Verb RunAs"
+    exit /b
+)
 
 ::{pack}为新客户端压缩包路径，{clientDir}为客户端路径:末带\
-@echo off
-chcp 65001
+chcp 65001 >nul
 mode con cols=60 lines=20
 color 03
 cd /d "%~dp0"
 title HotPE客户端更新中，请稍等...
-taskkill /IM "HotPE Client.exe" /F  > tmp
-TIMEOUT /T 3
 
+:: 终止可能正在运行的进程
+taskkill /IM "HotPE Client.exe" /F > nul 2>&1
+taskkill /IM "HotPE_Client.exe" /F > nul 2>&1
+TIMEOUT /T 3 /NOBREAK > nul
 
+:: 如果是隐藏模式运行，则跳转到退出部分
 if "%1"=="h" GOTO exit
 
 echo 释放文件
-mkdir "%~dp0updateTemp\" > tmp
-"%~dp07z.exe" x -y "-o%~dp0updateTemp\" "{pack}" > tmp
+mkdir "%~dp0updateTemp\" > nul 2>&1
+if not exist "%~dp0updateTemp\" (
+    echo 创建临时目录失败
+    goto :error
+)
+
+"%~dp07z.exe" x -y "-o%~dp0updateTemp\" "{pack}" > nul 2>&1
+if errorlevel 1 (
+    echo 解压更新包失败
+    goto :error
+)
 
 echo 清理旧文件
-::删除根目录所有文件，不包括文件夹
-del "{clientDir}*" /F /Q > tmp
-
-rd "{clientDir}locales\" /S /Q > tmp
+:: 删除根目录所有文件，不包括文件夹
+del "{clientDir}*" /F /Q > nul 2>&1
 
-del "{pack}" /F /Q > tmp
-del "{clientDir}resources\app.asar" /F /Q > tmp
-del "{clientDir}resources\app-update.yml" /F /Q > tmp
-del "{clientDir}resources\elevate.exe" /F /Q > tmp
-del "{clientDir}resources\config.json" /F /Q > tmp
+:: 删除子目录，使用更安全的方式检查目录是否存在再删除
+if exist "{clientDir}locales\" rd "{clientDir}locales\" /S /Q > nul 2>&1
+if exist "{clientDir}resources\app.asar" del "{clientDir}resources\app.asar" /F /Q > nul 2>&1
+if exist "{clientDir}resources\app-update.yml" del "{clientDir}resources\app-update.yml" /F /Q > nul 2>&1
+if exist "{clientDir}resources\elevate.exe" del "{clientDir}resources\elevate.exe" /F /Q > nul 2>&1
+if exist "{clientDir}resources\config.json" del "{clientDir}resources\config.json" /F /Q > nul 2>&1
+if exist "{clientDir}resources\tools\" rd "{clientDir}resources\tools\" /S /Q > nul 2>&1
 
-rd "{clientDir}resources\tools\" /S /Q > tmp
+:: 删除更新包自身
+if exist "{pack}" del "{pack}" /F /Q > nul 2>&1
 
 echo 替换文件
-xcopy "%~dp0updateTemp\HotPE_Client\*" "{clientDir}*" /E /C /Q  /H /R /Y > tmp
+if not exist "%~dp0updateTemp\HotPE_Client\" (
+    echo 更新包内缺少必要的文件
+    goto :error
+)
 
+xcopy "%~dp0updateTemp\HotPE_Client\*" "{clientDir}" /E /C /Q /H /R /Y > nul 2>&1
+if errorlevel 1 (
+    echo 复制文件失败
+    goto :error
+)
 
 echo 清理退出
-rd "%~dp0updateTemp\" /S /Q > tmp
-::rd ".\7z\" /S /Q
-del "%~dp07z.exe" /F /Q > tmp
-del "%~dp07z.dll" /F /Q > tmp
+if exist "%~dp0updateTemp\" rd "%~dp0updateTemp\" /S /Q > nul 2>&1
+if exist "%~dp07z.exe" del "%~dp07z.exe" /F /Q > nul 2>&1
+if exist "%~dp07z.dll" del "%~dp07z.dll" /F /Q > nul 2>&1
+if exist "%~dp0tmp" del "%~dp0tmp" /F /Q > nul 2>&1
 
-del "%~dp0tmp" /F /Q 
-
-::更新标记
+:: 创建更新标记
 echo. > "{clientDir}update.mark"
 
-start mshta vbscript:createobject("wscript.shell").run("""%~nx0"" h",0)(window.close)&&exit
+:: 以隐藏模式重新启动此脚本以完成最终步骤
+powershell -Command "Start-Process -FilePath '%~f0' -ArgumentList 'h' -Verb RunAs -WindowStyle Hidden"
+exit /b
 
-:exit
-cd /d "{clientDir}" && start /b cmd /c "{clientDir}HotPE Client.exe"
+:error
+echo 更新过程中发生错误
+pause
+exit /b
 
-del %0 && exit
+:exit
+cd /d "{clientDir}" && start /b cmd /c "{clientDir}HotPE_Client.exe"
+del "%~f0" > nul 2>&1
+exit /b