fix: 落实 PR #693 review 意见

.github/workflows/build-cli.yml

@@ -27,13 +27,13 @@ jobs:
       ELECTRON_BUILDER_CACHE: ${{ github.workspace }}/.cache/electron-builder
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v5
 
       - name: "Setup pnpm"
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v5
 
       - name: "Setup Node.js 22.x"
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: 22
           registry-url: https://npm.pkg.github.com/
@@ -46,7 +46,7 @@ jobs:
         run: pnpm --filter @docmirror/dev-sidecar-cli test
 
       - name: "Cache Node.js binaries (node-bin)"
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: packages/cli/dist/node-bin
           key: cli-node-bin-${{ runner.os }}-${{ hashFiles('packages/cli/scripts/build.js') }}
@@ -66,7 +66,7 @@ jobs:
           file packages/cli/dist/ds-cli-* 2>/dev/null || true
 
       - name: "Upload artifacts"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         with:
           name: ds-cli-${{ github.sha }}
           path: |
@@ -80,7 +80,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - name: "Download artifacts"
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v7
         with:
           pattern: ds-cli-*
           merge-multiple: true

.github/workflows/codeql.yml

@@ -59,7 +59,7 @@ jobs:
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Add any setup steps before running the `github/codeql-action/init` action.
     # This includes steps like installing compilers or runtimes (`actions/setup-node`

.github/workflows/defender-for-devops.yml

@@ -36,16 +36,16 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-dotnet@v4
+    - uses: actions/checkout@v5
+    - uses: actions/setup-dotnet@v5
       with:
         dotnet-version: |
           5.0.x
           6.0.x
     - name: Run Microsoft Security DevOps
-      uses: microsoft/security-devops-action@v1.6.0
+      uses: microsoft/security-devops-action@v1
       id: msdo
     - name: Upload results to Security tab
-      uses: github/codeql-action/upload-sarif@v3
+      uses: github/codeql-action/upload-sarif@v4
       with:
         sarif_file: ${{ steps.msdo.outputs.sarifFile }}

.github/workflows/npm-run-electron.yml

@@ -35,23 +35,23 @@ jobs:
           - 22
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v5
         with:
           submodules: true
           fetch-depth: 0
 
       - name: "Setup pnpm"
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v5
 
       - name: 'Setup Node.js "${{ matrix.node }}.x" environment'
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node }}
           registry-url: https://npm.pkg.github.com/
           cache: pnpm
 
       - name: "Setup Python environment, because of electron-builder install-app-deps requires Python setup tools"
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.10"
 
@@ -79,15 +79,15 @@ jobs:
           python --version;
 
       - name: "Setup electron cache"
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ github.workspace }}/.cache/electron
           key: ${{ runner.os }}-electron-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-electron-cache-
 
       - name: "Setup electron-builder cache"
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ github.workspace }}/.cache/electron-builder
           key: ${{ runner.os }}-electron-builder-cache-${{ hashFiles('**/pnpm-lock.yaml') }}

.github/workflows/publish-to-aur.yml

@@ -18,7 +18,7 @@ jobs:
       contents: read
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v5
 
       # ── Resolve version ──────────────────────────────────────────────────────
       - name: "Resolve version"

.github/workflows/test-and-upload.yml

@@ -49,29 +49,29 @@ jobs:
           - 22
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v5
         with:
           submodules: true
           fetch-depth: 0
 
       - name: "Setup pnpm"
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v5
 
       - name: 'Setup Node.js "${{ matrix.node }}.x" environment'
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node }}
           registry-url: https://npm.pkg.github.com/
           cache: pnpm
 
       - name: "Setup Python environment, because of electron-builder install-app-deps requires Python setup tools"
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.10"
 
       - name: "Get package info"
         id: package-info
-        uses: luizfelipelaviola/get-package-info@v1
+        uses: luizfelipelaviola/get-package-info@v2
         with:
           path: ./packages/gui
 
@@ -113,15 +113,15 @@ jobs:
           python --version;
 
       - name: "Setup electron cache"
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ github.workspace }}/.cache/electron
           key: ${{ runner.os }}-electron-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-electron-cache-
 
       - name: "Setup electron-builder cache"
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ github.workspace }}/.cache/electron-builder
           key: ${{ runner.os }}-electron-builder-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -162,7 +162,7 @@ jobs:
       - name: "Cache Flatpak runtime (Linux)"
         if: ${{ matrix.os == 'ubuntu' }}
         id: cache-flatpak-runtime
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.local/share/flatpak
           key: flatpak-runtime-freedesktop-21.08
@@ -186,7 +186,7 @@ jobs:
       - name: "Cache Flatpak runtime (Linux ARM64)"
         if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
         id: cache-flatpak-runtime-linux-arm64
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.local/share/flatpak
           key: flatpak-runtime-freedesktop-21.08
@@ -301,21 +301,21 @@ jobs:
 
       # region Upload artifacts - Windows
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-windows-x86_64.exe"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'windows' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-windows-x86_64.exe
           name: "DevSidecar-${{ env.BUILD_VERSION }}-windows-x86_64.exe"
           if-no-files-found: error
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-windows-ia32.exe"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'windows' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-windows-ia32.exe
           name: "DevSidecar-${{ env.BUILD_VERSION }}-windows-ia32.exe"
           if-no-files-found: error
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-windows-arm64.exe"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'windows' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-windows-arm64.exe
@@ -325,93 +325,93 @@ jobs:
 
       # region Upload artifacts - Linux
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.deb"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.deb
           name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.deb"
           if-no-files-found: error
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.AppImage"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.AppImage
           name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.AppImage"
           if-no-files-found: error
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.tar.gz"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.tar.gz
           name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.tar.gz"
           if-no-files-found: error
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.rpm"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.rpm
           name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.rpm"
           if-no-files-found: error
       # - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.flatpak"
-      #   uses: actions/upload-artifact@v4.4.0
+      #   uses: actions/upload-artifact@v6
       #   if: ${{ matrix.os == 'ubuntu' }}
       #   with:
       #     path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.flatpak
       #     name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-x86_64.flatpak"
       #     if-no-files-found: error
       # -------------------------------------------------------------------------------------------------------------------------
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.deb"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.deb
           name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.deb"
           if-no-files-found: error
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.AppImage"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.AppImage
           name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.AppImage"
           if-no-files-found: error
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.tar.gz"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.tar.gz
           name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.tar.gz"
           if-no-files-found: error
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.rpm"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.rpm
           name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.rpm"
           if-no-files-found: error
       # -------------------------------------------------------------------------------------------------------------------------
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.deb"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.deb
           name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.deb"
           if-no-files-found: error
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.AppImage"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.AppImage
           name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.AppImage"
           if-no-files-found: error
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.tar.gz"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.tar.gz
           name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.tar.gz"
           if-no-files-found: error
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.rpm"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.rpm
@@ -421,15 +421,15 @@ jobs:
 
       # region Upload artifacts - Linux ARM64
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.flatpak"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.flatpak
           name: "DevSidecar-${{ env.BUILD_VERSION }}-linux-arm64.flatpak"
           if-no-files-found: error
       # -------------------------------------------------------------------------------------------------------------------------
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.flatpak"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-linux-armv7l.flatpak
@@ -439,14 +439,14 @@ jobs:
 
       # Upload artifacts - macOS
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-macos-x86_64.dmg"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'macos' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-macos-x86_64.dmg
           name: "DevSidecar-${{ env.BUILD_VERSION }}-macos-x86_64.dmg"
           if-no-files-found: error
       - name: "Upload DevSidecar-${{ env.BUILD_VERSION }}-macos-arm64.dmg"
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.os == 'macos' }}
         with:
           path: packages/gui/dist_electron/DevSidecar-${{ env.BUILD_VERSION }}-macos-arm64.dmg

README.md

@@ -261,6 +261,7 @@
 
 ### 6.1、dev-sidecar的前两个开关没有处于打开状态
 
+0. 请先检查你是否开启了其他代理软件。dev-sidecar不能与其他端口代理类软件同时使用，但host/TUN类软件应可正常工作。如您正在同时使用watt toolkit（原steam++）等软件，请将其改为host模式。
 1. 尝试将开关按钮手动打开
 2. 请尝试右键dev-sidecar图标，点退出。再重新打开
 3. 如果还不行，请将日志发送给作者