Merge branch 'feat/desktop-branch' of https://github.com/JStone2934/LiveGalGame into feat/desktop-branch

Author: Administrator

.github/workflows/desktop-build.yml

@@ -33,15 +33,19 @@ jobs:
             arch: arm64
             python: python3.10
             asr: funasr-onnx
-            artifact_path: |
-              desktop/release/*.dmg
+            python_env_exe: python-env/bin/python3
+            build_script: build:mac
+            debug: ""
+            artifact_glob: desktop/release/*.dmg
           - os: windows-latest
             platform: win
             arch: x64
             python: python
             asr: funasr-onnx
-            artifact_path: |
-              desktop/release/*.exe
+            python_env_exe: python-env/Scripts/python.exe
+            build_script: build:win
+            debug: electron-builder
+            artifact_glob: desktop/release/*.exe
 
     defaults:
       run:
@@ -72,13 +76,64 @@ jobs:
         with:
           python-version: '3.10'
 
+      # Windows: 安装 Visual Studio Build Tools（用于编译 native 模块）
+      - name: Setup MSVC Build Tools (Windows only)
+        if: matrix.platform == 'win'
+        uses: microsoft/setup-msbuild@v2
+
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
+      # Windows: 确保 app-builder.exe 存在且可执行
+      - name: Verify and fix app-builder (Windows only)
+        if: matrix.platform == 'win'
+        shell: pwsh
+        run: |
+          # 查找 app-builder.exe
+          $appBuilder = Get-ChildItem -Path "node_modules" -Recurse -Filter "app-builder.exe" -ErrorAction SilentlyContinue | Select-Object -First 1
+          
+          if ($appBuilder) {
+            Write-Host "Found app-builder.exe at: $($appBuilder.FullName)"
+            Write-Host "File size: $($appBuilder.Length) bytes"
+            
+            # 验证文件是否为有效的 PE 文件
+            $bytes = [System.IO.File]::ReadAllBytes($appBuilder.FullName)
+            if ($bytes[0] -eq 0x4D -and $bytes[1] -eq 0x5A) {
+              Write-Host "✓ Valid PE executable"
+            } else {
+              Write-Warning "File may be corrupted, reinstalling..."
+              Remove-Item -Recurse -Force "node_modules/app-builder-bin" -ErrorAction SilentlyContinue
+              Remove-Item -Recurse -Force "node_modules/.pnpm/app-builder-bin*" -ErrorAction SilentlyContinue
+              pnpm install --frozen-lockfile
+            }
+          } else {
+            Write-Warning "app-builder.exe not found, attempting reinstall..."
+            pnpm install --frozen-lockfile
+          }
+          
+          # 再次验证
+          $appBuilder = Get-ChildItem -Path "node_modules" -Recurse -Filter "app-builder.exe" -ErrorAction SilentlyContinue | Select-Object -First 1
+          if (-not $appBuilder) {
+            Write-Error "app-builder.exe still not found after reinstall!"
+            exit 1
+          }
+
       - name: Prepare Python env for ASR backend
-        working-directory: desktop
         run: pnpm run prepare:python
 
+      # 验证 Python 环境和 PyInstaller
+      - name: Verify Python environment
+        run: |
+          PYTHON_PATH="${{ format('{0}/desktop/{1}', github.workspace, matrix.python_env_exe) }}"
+          echo "Python path: $PYTHON_PATH"
+          "$PYTHON_PATH" --version
+          # 注意：在 bash -o pipefail 下，`pip list | head -30` 会因为 head 提前关闭 stdout 触发 BrokenPipe（exit 120），从而让 CI 失败。
+          # 这里用 sed 打印前 30 行但不提前关闭管道，避免 BrokenPipe。
+          "$PYTHON_PATH" -m pip list | sed -n '1,30p'
+          "$PYTHON_PATH" -c "import PyInstaller; print('PyInstaller OK')" || echo "PyInstaller import check failed"
+          echo "Checking for PyInstaller module..."
+          "$PYTHON_PATH" -m PyInstaller --version || true
+
       - name: Print app version
         id: meta
         run: |
@@ -89,19 +144,32 @@ jobs:
         env:
           PYTHON: ${{ matrix.python }}
           ASR_IMPL: ${{ matrix.asr }}
-          ASR_PYTHON_PATH: ${{ matrix.platform == 'win' && format('{0}/desktop/python-env/Scripts/python.exe', github.workspace) || format('{0}/desktop/python-env/bin/python3', github.workspace) }}
+          ASR_PYTHON_PATH: ${{ format('{0}/desktop/{1}', github.workspace, matrix.python_env_exe) }}
+          DEBUG: ${{ matrix.debug }}
+        run: |
+          echo "=== Build Environment ==="
+          echo "Platform: ${{ matrix.platform }}"
+          echo "Arch: ${{ matrix.arch }}"
+          echo "ASR_PYTHON_PATH: $ASR_PYTHON_PATH"
+          echo "========================="
+          
+          pnpm run ${{ matrix.build_script }} -- --${{ matrix.arch }}
+
+      # Windows: 列出构建产物帮助调试
+      - name: List build artifacts
+        if: always()
         run: |
-          if [ "${{ matrix.platform }}" = "mac" ]; then
-            pnpm run build:mac -- --${{ matrix.arch }}
-          else
-            pnpm run build:win -- --${{ matrix.arch }}
-          fi
+          echo "=== Release directory contents ==="
+          ls -la release/ || echo "release/ not found"
+          echo "=== Backend dist contents ==="
+          ls -la backend/dist/ || echo "backend/dist/ not found"
+          ls -la backend/dist/asr-backend/ 2>/dev/null | sed -n '1,20p' || echo "asr-backend dir not found"
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: livegalgame-desktop-${{ matrix.platform }}-${{ matrix.arch }}-v${{ steps.meta.outputs.app_version }}
-          path: ${{ matrix.artifact_path }}
+          path: ${{ matrix.artifact_glob }}
           if-no-files-found: error
           retention-days: 14
 

desktop/README.md

@@ -78,11 +78,22 @@ pnpm install
 ### 配置语音识别
 
 ```bash
-# 安装 FunASR（推荐，中文识别效果最好，macOS 默认）
-npm run setup-funasr
+# 准备内置 Python 运行环境（会创建 desktop/python-env 并安装依赖）
+pnpm run prepare:python
 ```
+
+- 本项目桌面端的本地 ASR **默认使用 FunASR ONNX（`funasr-onnx + onnxruntime`）**，因此 **不需要安装 `torch`**。
 - Windows 也使用 FunASR ONNX，无需额外安装 faster-whisper。
 
+补充说明（关于 `prepare:python`）：
+
+- **默认（开发模式）**：在 macOS 上会优先使用本机的 `uv` 来创建 `python-env` 并安装依赖（更轻量），无 `uv` 时回退到 venv/pip。
+- **打包/发布（bundle 模式）**：如你需要在本机构建可搬运的内置 Python 环境，可执行：
+
+```bash
+PREPARE_PYTHON_MODE=bundle pnpm run prepare:python
+```
+
 ### 启动
 
 ```bash