temp

.github/release-drafter.yml

@@ -43,26 +43,18 @@ template: |
         <td rowspan="2">🪟 Windows</td>
         <td><code>EXE</code></td>
         <td>amd64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-windows-amd64.zip">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/Gopeed-v$NEXT_PATCH_VERSION-windows-amd64.zip">📥</a></td>
       </tr>
       <tr>
         <td><code>Portable</code></td>
         <td>amd64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-windows-amd64-portable.zip">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/Gopeed-v$NEXT_PATCH_VERSION-windows-amd64-portable.zip">📥</a></td>
       </tr>
       <tr>
-        <td rowspan="3">🍎 MacOS</td>
+        <td>🍎 MacOS</td>
-        <td rowspan="3"><code>DMG</code></td>
+        <td><code>DMG</code></td>
         <td>universal</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-macos.dmg">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/Gopeed-v$NEXT_PATCH_VERSION-macos.dmg">📥</a></td>
-      </tr>
-      <tr>
-        <td>amd64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-macos-amd64.dmg">📥</a></td>
-      </tr>
-      <tr>
-        <td>arm64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-macos-arm64.dmg">📥</a></td>
       </tr>
       <tr>
         <td rowspan="6">🐧 Linux</td>
@@ -78,44 +70,32 @@ template: |
       <tr>
         <td rowspan="2"><code>DEB</code></td>
         <td>amd64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-linux-amd64.deb">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/Gopeed-v$NEXT_PATCH_VERSION-linux-amd64.deb">📥</a></td>
       </tr>
       <tr>
         <td>arm64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-linux-arm64.deb">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/Gopeed-v$NEXT_PATCH_VERSION-linux-arm64.deb">📥</a></td>
       </tr>
       <tr>
         <td rowspan="2"><code>AppImage</code></td>
         <td>amd64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-linux-amd64.AppImage">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/Gopeed-v$NEXT_PATCH_VERSION-linux-amd64.AppImage">📥</a></td>
       </tr>
       <tr>
         <td>arm64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-linux-arm64.AppImage">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/Gopeed-v$NEXT_PATCH_VERSION-linux-arm64.AppImage">📥</a></td>
       </tr>
       <tr>
-        <td rowspan="4">🤖 Android</td>
+        <td>🤖 Android</td>
-        <td rowspan="4"><code>APK</code></td>
+        <td><code>APK</code></td>
         <td>universal</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-android.apk">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/Gopeed-v$NEXT_PATCH_VERSION-android.apk">📥</a></td>
-      </tr>
-      <tr>
-        <td>armeabi-v7a</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-android-armeabi-v7a.apk">📥</a></td>
-      </tr>
-      <tr>
-        <td>arm64-v8a</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-android-arm64-v8a.apk">📥</a></td>
-      </tr>
-      <tr>
-        <td>x86_64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-android-x86_64.apk">📥</a></td>
       </tr>
       <tr>
         <td>📱 iOS</td>
         <td><code>IPA</code></td>
         <td>universal</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-ios.ipa">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/Gopeed-v$NEXT_PATCH_VERSION-ios.ipa">📥</a></td>
       </tr>
       <tr>
         <td>🐳 Docker</td>
@@ -127,47 +107,47 @@ template: |
         <td rowspan="2">💾 Qnap</td>
         <td rowspan="2"><code>QPKG</code></td>
         <td>amd64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-v$NEXT_PATCH_VERSION-qnap-amd64.qpkg">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/gopeed-v$NEXT_PATCH_VERSION-qnap-amd64.qpkg">📥</a></td>
       </tr>
       <tr>
         <td>arm64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-v$NEXT_PATCH_VERSION-qnap-arm64.qpkg">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/gopeed-v$NEXT_PATCH_VERSION-qnap-arm64.qpkg">📥</a></td>
       </tr>
       <tr>
         <td rowspan="8">🌐 Web</td>
         <td rowspan="3"><code>Windows</code></td>
         <td>amd64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-v$NEXT_PATCH_VERSION-windows-amd64.zip">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/gopeed-web-v$NEXT_PATCH_VERSION-windows-amd64.zip">📥</a></td>
       </tr>
       <tr>
         <td>arm64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-v$NEXT_PATCH_VERSION-windows-arm64.zip">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/gopeed-web-v$NEXT_PATCH_VERSION-windows-arm64.zip">📥</a></td>
       </tr>
       <tr>
         <td>386</td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-v$NEXT_PATCH_VERSION-windows-386.zip">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/gopeed-web-v$NEXT_PATCH_VERSION-windows-386.zip">📥</a></td>
       </tr>
       <tr>
         <td rowspan="2"><code>MacOS</code></td>
         <td>amd64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-v$NEXT_PATCH_VERSION-macos-amd64.zip">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/gopeed-web-v$NEXT_PATCH_VERSION-macos-amd64.zip">📥</a></td>
       </tr>
       <tr>
         <td>arm64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-v$NEXT_PATCH_VERSION-macos-arm64.zip">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/gopeed-web-v$NEXT_PATCH_VERSION-macos-arm64.zip">📥</a></td>
       </tr>
       <tr>
         <td rowspan="3"><code>Linux</code></td>
         <td>amd64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-v$NEXT_PATCH_VERSION-linux-amd64.zip">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/gopeed-web-v$NEXT_PATCH_VERSION-linux-amd64.zip">📥</a></td>
       </tr>
       <tr>
         <td>arm64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-v$NEXT_PATCH_VERSION-linux-arm64.zip">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/gopeed-web-v$NEXT_PATCH_VERSION-linux-arm64.zip">📥</a></td>
       </tr>
       <tr>
         <td>386</td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-v$NEXT_PATCH_VERSION-linux-386.zip">📥</a></td>
+        <td><a href="https://github.com/GopeedLab/gopeed/releases/download/v$NEXT_PATCH_VERSION/gopeed-web-v$NEXT_PATCH_VERSION-linux-386.zip">📥</a></td>
       </tr>
     </tbody>
   </table>

.github/workflows/build.yml

@@ -13,7 +13,7 @@ on:
         default: "false"
 
 env:
-  GO_VERSION: "1.24"
+  GO_VERSION: "1.23"
   FLUTTER_VERSION: "3.24.5"
 
 permissions:
@@ -34,7 +34,7 @@ jobs:
 
   build-windows:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'windows' }}
-    runs-on: windows-2022
+    runs-on: windows-latest
     needs: [get-release]
     steps:
       - uses: actions/checkout@v3
@@ -139,9 +139,9 @@ jobs:
           upload_url: ${{ needs.get-release.outputs.upload_url }}
           asset_path: ui/flutter/build/windows/Output/*
           overwrite: true
-  build-macos-amd64-lib:
+  build-macos-arm64-lib:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
-    runs-on: macos-13
+    runs-on: macos-latest
     needs: [get-release]
     steps:
       - uses: actions/checkout@v3
@@ -157,18 +157,15 @@ jobs:
           go build -ldflags="-w -s" github.com/GopeedLab/gopeed/cmd/updater
       - uses: actions/upload-artifact@v4
         with:
-          name: macos-amd64-lib
+          name: macos-arm64-lib
           path: |
             libgopeed.dylib
             host
             updater
   build-macos:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
-    runs-on: macos-latest
+    runs-on: macos-13
-    strategy:
+    needs: [get-release, build-macos-arm64-lib]
-      matrix:
-        channel: [ arm64, amd64, universal ]
-    needs: [get-release, build-macos-amd64-lib]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -186,46 +183,34 @@ jobs:
           npm install -g appdmg
       - uses: actions/download-artifact@v4
         with:
-          name: macos-amd64-lib
+          name: macos-arm64-lib
-          path: ui/flutter/lib-amd64
+          path: ui/flutter/lib-arm64
-      - if: ${{ matrix.channel == 'arm64' }}
-        name: Build Arm64 Libraries
-        run: |
-          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
-          go build -ldflags="-w -s" -o ui/flutter/assets/exec/host github.com/GopeedLab/gopeed/cmd/host
-          go build -ldflags="-w -s" -o ui/flutter/assets/exec/updater github.com/GopeedLab/gopeed/cmd/updater
-      - if: ${{ matrix.channel == 'amd64' }}
-        name: Build Amd64 Libraries
-        run: |
-          mkdir -p ui/flutter/macos/Frameworks
-          
-          cp ui/flutter/lib-amd64/libgopeed.dylib ui/flutter/macos/Frameworks/libgopeed.dylib
-          cp ui/flutter/lib-amd64/host ui/flutter/assets/exec/host
-          cp ui/flutter/lib-amd64/updater ui/flutter/assets/exec/updater
-      - if: ${{ matrix.channel == 'universal' }}
-        name: Build Universal Libraries
-        run: |
-          mkdir -p ui/flutter/macos/Frameworks
-          
-          # arm64 lib
-          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/.temp/libgopeed.dylib.arm64 github.com/GopeedLab/gopeed/bind/desktop
-          go build -ldflags="-w -s" -o ui/flutter/.temp/host.arm64 github.com/GopeedLab/gopeed/cmd/host
-          go build -ldflags="-w -s" -o ui/flutter/.temp/updater.arm64 github.com/GopeedLab/gopeed/cmd/updater
-         
-          # amd64 lib
-          cp ui/flutter/lib-amd64/libgopeed.dylib ui/flutter/.temp/libgopeed.dylib.amd64
-          cp ui/flutter/lib-amd64/host ui/flutter/.temp/host.amd64
-          cp ui/flutter/lib-amd64/updater ui/flutter/.temp/updater.amd64
-         
-          # universal lib
-          lipo -create -output ui/flutter/macos/Frameworks/libgopeed.dylib ui/flutter/.temp/libgopeed.dylib.arm64 ui/flutter/.temp/libgopeed.dylib.amd64
-          lipo -create -output ui/flutter/assets/exec/host ui/flutter/.temp/host.arm64 ui/flutter/.temp/host.amd64
-          lipo -create -output ui/flutter/assets/exec/updater ui/flutter/.temp/updater.arm64 ui/flutter/.temp/updater.amd64
       - name: Build
         env:
           VERSION: ${{ needs.get-release.outputs.version }}
         run: |
-          cd ui/flutter
+          PROJECT_DIR=$(pwd)
+
+          # amd64 lib
+          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/lib-amd64/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
+          go build -ldflags="-w -s" -o ui/flutter/lib-amd64/host github.com/GopeedLab/gopeed/cmd/host
+          go build -ldflags="-w -s" -o ui/flutter/lib-amd64/updater github.com/GopeedLab/gopeed/cmd/updater
+          # universal binary
+          mkdir -p ui/flutter/macos/Frameworks
+          cp ui/flutter/lib-amd64/libgopeed.dylib ui/flutter/macos/Frameworks/amd64-lib
+          cp ui/flutter/lib-arm64/libgopeed.dylib ui/flutter/macos/Frameworks/arm64-lib
+          cp ui/flutter/lib-amd64/host ui/flutter/macos/Frameworks/amd64-host
+          cp ui/flutter/lib-arm64/host ui/flutter/macos/Frameworks/arm64-host
+          cp ui/flutter/lib-amd64/updater ui/flutter/macos/Frameworks/amd64-updater
+          cp ui/flutter/lib-arm64/updater ui/flutter/macos/Frameworks/arm64-updater
+          cd ui/flutter/macos/Frameworks
+          lipo -create -output libgopeed.dylib amd64-lib arm64-lib
+          lipo -create -output host amd64-host arm64-host
+          lipo -create -output updater amd64-updater arm64-updater
+          rm -rf amd64-lib arm64-lib amd64-host arm64-host amd64-updater arm64-updater
+          mv host ../../assets/exec/host
+
+          cd $PROJECT_DIR/ui/flutter
           flutter build macos --dart-define="UPDATE_CHANNEL=macosDmg"
           cd build/macos/Build/Products/Release
           cat>appdmg.json<<EOF
@@ -240,13 +225,6 @@ jobs:
           EOF
           mkdir dist
           appdmg appdmg.json dist/Gopeed-v$VERSION-macos.dmg
-          
-          if [[ "${{ matrix.channel }}" == "arm64" ]]; then
-            mv dist/Gopeed-v$VERSION-macos.dmg dist/Gopeed-v$VERSION-macos-arm64.dmg
-          fi
-          if [[ "${{ matrix.channel }}" == "amd64" ]]; then
-            mv dist/Gopeed-v$VERSION-macos.dmg dist/Gopeed-v$VERSION-macos-amd64.dmg
-          fi
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -265,7 +243,12 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
-      - uses: subosito/flutter-action@v2
+      - if: matrix.os == 'ubuntu-22.04'
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+      - if: matrix.os == 'ubuntu-22.04-arm'
+        uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           channel: master
@@ -277,6 +260,7 @@ jobs:
           sudo apt install -y libfuse2 locate
           arch=$(uname -m)
           wget -O appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${arch}.AppImage"
+          wget -O appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${arch}.AppImage"
           chmod +x appimagetool
           sudo mv appimagetool /usr/local/bin/
       - name: Build
@@ -488,12 +472,8 @@ jobs:
           cd ui/flutter
           echo $APK_KEYSTORE | base64 -di > android/app/upload-keystore.jks
           flutter build apk --dart-define="UPDATE_CHANNEL=androidApk"
-          flutter build apk --split-per-abi --dart-define="UPDATE_CHANNEL=androidApk"
           mkdir dist
           cp build/app/outputs/flutter-apk/app-release.apk dist/Gopeed-v$VERSION-android.apk
-          cp build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk dist/Gopeed-v$VERSION-android-armeabi-v7a.apk
-          cp build/app/outputs/flutter-apk/app-arm64-v8a-release.apk dist/Gopeed-v$VERSION-android-arm64-v8a.apk
-          cp build/app/outputs/flutter-apk/app-x86_64-release.apk dist/Gopeed-v$VERSION-android-x86_64.apk
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -502,7 +482,7 @@ jobs:
           overwrite: true
   build-ios:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'ios' }}
-    runs-on: macos-14
+    runs-on: macos-latest
     needs: [get-release]
     steps:
       - uses: actions/checkout@v3
@@ -549,6 +529,7 @@ jobs:
         env:
           VERSION: ${{ needs.get-release.outputs.version }}
         run: |
+          VERSION=${VERSION:-$(date +%y%m%d%H%M)} # Use current time as version if not specified
           cd ui/flutter
           flutter build web --no-web-resources-cdn
           cd ../../

.github/workflows/release.yml

@@ -17,7 +17,7 @@ on:
       - "Dockerfile"
 
 env:
-  GO_VERSION: "1.24"
+  GO_VERSION: "1.23"
 
 permissions:
   contents: write

.github/workflows/test.yml

@@ -27,7 +27,7 @@ on:
       - "go.sum"
 
 env:
-  GO_VERSION: "1.24"
+  GO_VERSION: "1.23"
   FLUTTER_VERSION: "3.24.5"
 
 jobs:
@@ -53,13 +53,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Run Unit tests.
-        run: |
+        run: go test $(go list ./... | grep -v /cmd/ | grep -v /bind/ ) -v -covermode=count -coverprofile=coverage.txt
-          # Get packages for testing and coverage (including cmd/web for flags_test.go)
-          PACKAGES=$(go list ./... | grep -v /bind/ | grep -v -E '/cmd/(?!web)')
-          go test -v -coverpkg=$(echo "$PACKAGES" | paste -sd "," -) -covermode=count -coverprofile=coverage.txt $PACKAGES
-          # Filter out main.go from coverage report to avoid lowering coverage percentage
-          grep -v "main.go" coverage.txt > coverage_filtered.txt || true
-          mv coverage_filtered.txt coverage.txt
       - uses: codecov/codecov-action@v4
         with:
           files: ./coverage.txt
@@ -102,7 +96,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-14, ubuntu-latest]
+        os: [ macos-latest, ubuntu-latest ]
     needs: [ test ]
     steps:
       - uses: actions/checkout@v3

README.md

@@ -35,19 +35,11 @@ Visit ✈ [Official Website](https://gopeed.com) | 📖 [Official Docs](https://
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">📥</a></td>
     </tr>
     <tr>
-      <td rowspan="3">🍎 MacOS</td>
+      <td>🍎 MacOS</td>
-      <td rowspan="3"><code>DMG</code></td>
+      <td><code>DMG</code></td>
       <td>universal</td>
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">📥</a></td>
     </tr>
-    <tr>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos-amd64.dmg">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos-arm64.dmg">📥</a></td>
-    </tr>
     <tr>
       <td rowspan="6">🐧 Linux</td>
       <td><code>Flathub</code></td>
@@ -78,22 +70,10 @@ Visit ✈ [Official Website](https://gopeed.com) | 📖 [Official Docs](https://
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-arm64.AppImage">📥</a></td>
     </tr>
     <tr>
-      <td rowspan="4">🤖 Android</td>
+      <td>🤖 Android</td>
-      <td rowspan="4"><code>APK</code></td>
+      <td><code>APK</code></td>
       <td>universal</td>
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">📥</a></td>
-    </tr>
-     <tr>
-      <td>armeabi-v7a</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-armeabi-v7a.apk">📥</a></td>
-    </tr>
-     <tr>
-      <td>arm64-v8a</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-arm64-v8a.apk">📥</a></td>
-    </tr>
-    <tr>
-      <td>x86_64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-x86_64.apk">📥</a></td>
     </tr>
     <tr>
       <td>📱 iOS</td>

README_ja-JP.md

@@ -35,19 +35,11 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">📥</a></td>
     </tr>
     <tr>
-      <td rowspan="3">🍎 MacOS</td>
+      <td>🍎 MacOS</td>
-      <td rowspan="3"><code>DMG</code></td>
+      <td><code>DMG</code></td>
       <td>universal</td>
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">📥</a></td>
     </tr>
-    <tr>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos-amd64.dmg">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos-arm64.dmg">📥</a></td>
-    </tr>
     <tr>
       <td rowspan="6">🐧 Linux</td>
       <td><code>Flathub</code></td>
@@ -78,22 +70,10 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-arm64.AppImage">📥</a></td>
     </tr>
     <tr>
-      <td rowspan="4">🤖 Android</td>
+      <td>🤖 Android</td>
-      <td rowspan="4"><code>APK</code></td>
+      <td><code>APK</code></td>
       <td>universal</td>
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">📥</a></td>
-    </tr>
-     <tr>
-      <td>armeabi-v7a</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-armeabi-v7a.apk">📥</a></td>
-    </tr>
-     <tr>
-      <td>arm64-v8a</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-arm64-v8a.apk">📥</a></td>
-    </tr>
-    <tr>
-      <td>x86_64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-x86_64.apk">📥</a></td>
     </tr>
     <tr>
       <td>📱 iOS</td>
@@ -155,6 +135,7 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
     </tr>
   </tbody>
 </table>
+
 インストールについての詳細は、[インストール](https://docs.gopeed.com/install.html)を参照してください。
 
 ### 🛠️ コマンドツール

README_vi-VN.md

@@ -35,19 +35,11 @@ Truy cập ✈ [Trang web chính thức](https://gopeed.com) | 📖 [Tài liệu
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">📥</a></td>
     </tr>
     <tr>
-      <td rowspan="3">🍎 MacOS</td>
+      <td>🍎 MacOS</td>
-      <td rowspan="3"><code>DMG</code></td>
+      <td><code>DMG</code></td>
       <td>universal</td>
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">📥</a></td>
     </tr>
-    <tr>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos-amd64.dmg">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos-arm64.dmg">📥</a></td>
-    </tr>
     <tr>
       <td rowspan="6">🐧 Linux</td>
       <td><code>Flathub</code></td>
@@ -78,22 +70,10 @@ Truy cập ✈ [Trang web chính thức](https://gopeed.com) | 📖 [Tài liệu
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-arm64.AppImage">📥</a></td>
     </tr>
     <tr>
-      <td rowspan="4">🤖 Android</td>
+      <td>🤖 Android</td>
-      <td rowspan="4"><code>APK</code></td>
+      <td><code>APK</code></td>
       <td>universal</td>
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">📥</a></td>
-    </tr>
-     <tr>
-      <td>armeabi-v7a</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-armeabi-v7a.apk">📥</a></td>
-    </tr>
-     <tr>
-      <td>arm64-v8a</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-arm64-v8a.apk">📥</a></td>
-    </tr>
-    <tr>
-      <td>x86_64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-x86_64.apk">📥</a></td>
     </tr>
     <tr>
       <td>📱 iOS</td>
@@ -155,6 +135,7 @@ Truy cập ✈ [Trang web chính thức](https://gopeed.com) | 📖 [Tài liệu
     </tr>
   </tbody>
 </table>
+
 Thêm thông tin về cài đặt, vui lòng tham khảo [Cài đặt](https://docs.gopeed.com/install.html)
 
 ### 🛠️ Công cụ lệnh

README_zh-CN.md

@@ -35,19 +35,11 @@ Gopeed（全称 Go Speed），直译过来中文名叫做`够快下载器`（不
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">📥</a></td>
     </tr>
     <tr>
-      <td rowspan="3">🍎 MacOS</td>
+      <td>🍎 MacOS</td>
-      <td rowspan="3"><code>DMG</code></td>
+      <td><code>DMG</code></td>
       <td>universal</td>
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">📥</a></td>
     </tr>
-    <tr>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos-amd64.dmg">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos-arm64.dmg">📥</a></td>
-    </tr>
     <tr>
       <td rowspan="6">🐧 Linux</td>
       <td><code>Flathub</code></td>
@@ -78,22 +70,10 @@ Gopeed（全称 Go Speed），直译过来中文名叫做`够快下载器`（不
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-arm64.AppImage">📥</a></td>
     </tr>
     <tr>
-      <td rowspan="4">🤖 Android</td>
+      <td>🤖 Android</td>
-      <td rowspan="4"><code>APK</code></td>
+      <td><code>APK</code></td>
       <td>universal</td>
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">📥</a></td>
-    </tr>
-     <tr>
-      <td>armeabi-v7a</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-armeabi-v7a.apk">📥</a></td>
-    </tr>
-     <tr>
-      <td>arm64-v8a</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-arm64-v8a.apk">📥</a></td>
-    </tr>
-    <tr>
-      <td>x86_64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-x86_64.apk">📥</a></td>
     </tr>
     <tr>
       <td>📱 iOS</td>
@@ -155,6 +135,7 @@ Gopeed（全称 Go Speed），直译过来中文名叫做`够快下载器`（不
     </tr>
   </tbody>
 </table>
+
 更多关于安装的内容请参考[安装文档](https://docs.gopeed.com/zh/install.html)
 
 ### 🛠️ 命令行工具

README_zh-TW.md

@@ -35,19 +35,11 @@ Gopeed（全稱 Go Speed），是一款使用`Golang`+`Flutter`編寫的高速
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">📥</a></td>
     </tr>
     <tr>
-      <td rowspan="3">🍎 MacOS</td>
+      <td>🍎 MacOS</td>
-      <td rowspan="3"><code>DMG</code></td>
+      <td><code>DMG</code></td>
       <td>universal</td>
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">📥</a></td>
     </tr>
-    <tr>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos-amd64.dmg">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos-arm64.dmg">📥</a></td>
-    </tr>
     <tr>
       <td rowspan="6">🐧 Linux</td>
       <td><code>Flathub</code></td>
@@ -78,22 +70,10 @@ Gopeed（全稱 Go Speed），是一款使用`Golang`+`Flutter`編寫的高速
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-arm64.AppImage">📥</a></td>
     </tr>
     <tr>
-      <td rowspan="4">🤖 Android</td>
+      <td>🤖 Android</td>
-      <td rowspan="4"><code>APK</code></td>
+      <td><code>APK</code></td>
       <td>universal</td>
       <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">📥</a></td>
-    </tr>
-     <tr>
-      <td>armeabi-v7a</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-armeabi-v7a.apk">📥</a></td>
-    </tr>
-     <tr>
-      <td>arm64-v8a</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-arm64-v8a.apk">📥</a></td>
-    </tr>
-    <tr>
-      <td>x86_64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android-x86_64.apk">📥</a></td>
     </tr>
     <tr>
       <td>📱 iOS</td>

_examples/basic/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/download"
 	"github.com/GopeedLab/gopeed/pkg/protocol/http"

cmd/host/dail_other.go

@@ -1,19 +0,0 @@
-//go:build !windows
-// +build !windows
-
-package main
-
-import (
-	"net"
-	"os"
-	"path/filepath"
-)
-
-func Dial() (net.Conn, error) {
-	// Get binary path
-	exe, err := os.Executable()
-	if err != nil {
-		return nil, err
-	}
-	return net.Dial("unix", filepath.Join(filepath.Dir(exe), "gopeed_host.sock"))
-}

cmd/host/dail_windows.go

@@ -1,11 +0,0 @@
-package main
-
-import (
-	"net"
-
-	"github.com/Microsoft/go-winio"
-)
-
-func Dial() (net.Conn, error) {
-	return winio.DialPipe(`\\.\pipe\gopeed_host`, nil)
-}

cmd/host/main.go

@@ -1,24 +1,22 @@
 package main
 
 import (
-	"bytes"
-	"context"
 	"encoding/binary"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
-	"net"
-	"net/http"
 	"os"
-	"time"
+	"strings"
 
 	"github.com/pkg/browser"
+	"github.com/shirou/gopsutil/v4/process"
 )
 
+const identifier = "gopeed"
+
 type Message struct {
 	Method string          `json:"method"`
-	Meta   map[string]any  `json:"meta"`
 	Params json.RawMessage `json:"params"`
 }
 
@@ -28,74 +26,31 @@ type Response struct {
 	Message string `json:"message,omitempty"`
 }
 
-func check() (data bool, err error) {
+var apiMap = map[string]func(params json.RawMessage) (data any, err error){
-	conn, err := Dial()
+	"ping": func(params json.RawMessage) (data any, err error) {
+		processes, err := process.Processes()
 		if err != nil {
 			return false, err
 		}
-	defer conn.Close()
+
+		for _, p := range processes {
+			name, err := p.Name()
+			if err != nil {
+				continue
+			}
+
+			if strings.Contains(strings.ToLower(name), strings.ToLower(identifier)) {
 				return true, nil
 			}
-
-func wakeup(hidden bool) error {
-	running, _ := check()
-	if running {
-		return nil
 		}
-
+		return false, nil
-	uri := "gopeed:"
-	if hidden {
-		uri = uri + "?hidden=true"
-	}
-	if err := browser.OpenURL(uri); err != nil {
-		return err
-	}
-
-	for i := 0; i < 10; i++ {
-		if ok, _ := check(); ok {
-			return nil
-		}
-		time.Sleep(1 * time.Second)
-	}
-	return fmt.Errorf("start gopeed failed")
-}
-
-var apiMap = map[string]func(message *Message) (data any, err error){
-	"ping": func(message *Message) (data any, err error) {
-		return check()
 	},
-	"create": func(message *Message) (data any, err error) {
+	"create": func(params json.RawMessage) (data any, err error) {
-		buf, err := message.Params.MarshalJSON()
+		var strParams string
-		if err != nil {
+		if err = json.Unmarshal(params, &strParams); err != nil {
 			return
 		}
-
+		err = browser.OpenURL(fmt.Sprintf("%s:///create?params=%s", identifier, strParams))
-		silent := false
-		if v, ok := message.Meta["silent"]; ok {
-			silent, _ = v.(bool)
-		}
-
-		if err := wakeup(silent); err != nil {
-			return nil, err
-		}
-
-		client := &http.Client{
-			Transport: &http.Transport{
-				DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
-					return Dial()
-				},
-			},
-			Timeout: 10 * time.Second,
-		}
-		req, err := http.NewRequest("POST", "http://127.0.0.1/create", bytes.NewBuffer(buf))
-		if err != nil {
-			return
-		}
-		if message.Meta != nil {
-			metaJson, _ := json.Marshal(message.Meta)
-			req.Header.Set("X-Gopeed-Host-Meta", string(metaJson))
-		}
-		_, err = client.Do(req)
 		return
 	},
 }
@@ -133,7 +88,7 @@ func main() {
 		var data any
 		var err error
 		if handler, ok := apiMap[message.Method]; ok {
-			data, err = handler(&message)
+			data, err = handler(message.Params)
 		} else {
 			err = errors.New("Unknown method: " + message.Method)
 		}

cmd/updater/main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"path/filepath"
 	"syscall"
 	"time"
 
@@ -18,7 +19,6 @@ func main() {
 	pid := flag.Int("pid", 0, "PID of the process to update")
 	updateChannel := flag.String("channel", "", "Update channel")
 	packagePath := flag.String("asset", "", "Path to the package asset")
-	exeDir := flag.String("exeDir", "", "Directory of the entry executable")
 	logPath := flag.String("log", "", "Log file path")
 	flag.Parse()
 
@@ -43,7 +43,7 @@ func main() {
 		restart bool
 		err     error
 	)
-	if restart, err = update(*pid, *updateChannel, *packagePath, *exeDir); err != nil {
+	if restart, err = update(*pid, *updateChannel, *packagePath); err != nil {
 		log.Printf("Update failed: %v\n", err)
 		os.Exit(1)
 	}
@@ -61,7 +61,7 @@ func main() {
 	os.Exit(0)
 }
 
-func update(pid int, updateChannel, packagePath, exeDir string) (restart bool, err error) {
+func update(pid int, updateChannel, packagePath string) (restart bool, err error) {
 	killSignalChan := make(chan any, 1)
 
 	go func() {
@@ -76,8 +76,9 @@ func update(pid int, updateChannel, packagePath, exeDir string) (restart bool, e
 		}
 	}()
 
-	log.Printf("Updating process updateChannel=%s packagePath=%s exeDir=%s\n", updateChannel, packagePath, exeDir)
+	appDir := filepath.Dir(os.Args[0])
-	if restart, err = install(killSignalChan, updateChannel, packagePath, exeDir); err != nil {
+	log.Printf("Updating process updateChannel=%s packagePath=%s appDir=%s\n", updateChannel, packagePath, appDir)
+	if restart, err = install(killSignalChan, updateChannel, packagePath, appDir); err != nil {
 		return false, errors.Wrap(err, "failed to install package")
 	}
 

cmd/updater/updater_darwin.go

@@ -25,20 +25,16 @@ func installByDmg(killSignalChan chan<- any, packagePath, destDir string) error
 	mountPoint := ""
 	for _, line := range strings.Split(string(output), "\n") {
 		if strings.Contains(line, "/Volumes/") {
-			// Find the /Volumes/ path in the line
+			fields := strings.Fields(line)
-			// hdiutil output format: /dev/disk4s1  Apple_HFS  /Volumes/Gopeed
+			if len(fields) > 2 {
-			// or with sequence number: /dev/disk4s1  Apple_HFS  /Volumes/Gopeed 1
+				mountPoint = fields[len(fields)-1]
-			idx := strings.Index(line, "/Volumes/")
-			if idx != -1 {
-				// Extract everything from /Volumes/ onwards and trim whitespace
-				mountPoint = strings.TrimSpace(line[idx:])
 				break
 			}
 		}
 	}
 
 	if mountPoint == "" {
-		return fmt.Errorf("failed to get mount point from hdiutil output: %s", string(output))
+		return fmt.Errorf("failed to get mount point")
 	}
 
 	// Detach the mounted DMG
@@ -49,7 +45,7 @@ func installByDmg(killSignalChan chan<- any, packagePath, destDir string) error
 		return err
 	}
 	if len(matches) == 0 {
-		return fmt.Errorf("no .app found in dmg, mountPoint: %s", mountPoint)
+		return fmt.Errorf("no .app found in dmg")
 	}
 
 	killSignalChan <- nil

cmd/web/flags.go

@@ -3,13 +3,10 @@ package main
 import (
 	"encoding/json"
 	"flag"
+	"fmt"
+	"github.com/GopeedLab/gopeed/pkg/base"
 	"os"
 	"path/filepath"
-	"reflect"
-	"strconv"
-	"strings"
-
-	"github.com/GopeedLab/gopeed/pkg/base"
 )
 
 type args struct {
@@ -19,7 +16,6 @@ type args struct {
 	Password   *string `json:"password"`
 	ApiToken   *string `json:"apiToken"`
 	StorageDir *string `json:"storageDir"`
-	WhiteDownloadDirs []string `json:"whiteDownloadDirs"`
 	// DownloadConfig when the first time to start the server, it will be configured as initial value
 	DownloadConfig *base.DownloaderStoreConfig `json:"downloadConfig"`
 
@@ -27,173 +23,62 @@ type args struct {
 }
 
 func parse() *args {
-	cfg := &args{}
+	var cliArgs args
-
+	cliArgs.Address = flag.String("A", "0.0.0.0", "Bind Address")
-	cliConfig := loadCliArgs()
+	cliArgs.Port = flag.Int("P", 9999, "Bind Port")
-	loadConfigFile(cfg, *cliConfig.configPath)
+	cliArgs.Username = flag.String("u", "gopeed", "HTTP Basic Auth Username")
-	loadEnvVars(cfg)
+	cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Pwd")
-	// override with non-default command line arguments
+	cliArgs.ApiToken = flag.String("T", "", "API token, it must be configured when using HTTP API in the case of enabling basic authentication")
-	overrideWithCliArgs(cfg, cliConfig)
+	cliArgs.StorageDir = flag.String("d", "", "Storage directory")
-	// set default values
+	cliArgs.configPath = flag.String("c", "./config.json", "Config file path")
-	setDefaults(cfg, cliConfig)
-	return cfg
-}
-
-// loadCliArgs parses command line arguments and returns initial config
-func loadCliArgs() *args {
-	cfg := &args{}
-	cfg.Address = flag.String("A", "0.0.0.0", "Bind Address")
-	cfg.Port = flag.Int("P", 9999, "Bind Port")
-	cfg.Username = flag.String("u", "gopeed", "Web Authentication Username")
-	cfg.Password = flag.String("p", "", "Web Authentication Password, if no password is set, web authentication will not be enabled")
-	cfg.ApiToken = flag.String("T", "", "API token, it must be configured when using HTTP API in the case of enabling web authentication")
-	cfg.StorageDir = flag.String("d", "", "Storage directory")
-	whiteDownloadDirs := flag.String("w", "", "White download directories, comma-separated")
-	cfg.configPath = flag.String("c", "./config.json", "Config file path")
 	flag.Parse()
 
-	// Parse white download directories from comma-separated string
+	// args priority: config file > cli args
-	if whiteDownloadDirs != nil && *whiteDownloadDirs != "" {
+	cfgArgs := loadConfig(*cliArgs.configPath)
-		dirs := strings.Split(*whiteDownloadDirs, ",")
+	if cfgArgs.Address == nil {
-		for i := range dirs {
+		cfgArgs.Address = cliArgs.Address
-			dirs[i] = strings.TrimSpace(dirs[i])
 	}
-		cfg.WhiteDownloadDirs = dirs
+	if cfgArgs.Port == nil {
+		cfgArgs.Port = cliArgs.Port
+	}
+	if cfgArgs.Username == nil {
+		cfgArgs.Username = cliArgs.Username
+	}
+	if cfgArgs.Password == nil {
+		cfgArgs.Password = cliArgs.Password
+	}
+	if cfgArgs.ApiToken == nil {
+		cfgArgs.ApiToken = cliArgs.ApiToken
+	}
+	if cfgArgs.StorageDir == nil {
+		cfgArgs.StorageDir = cliArgs.StorageDir
+	}
+	return cfgArgs
 }
 
-	return cfg
+func loadConfig(path string) *args {
-}
+	var args args
 
-// overrideWithCliArgs overrides config with non-empty command line arguments
+	if !filepath.IsAbs(path) {
-func overrideWithCliArgs(cfg *args, cliConfig *args) {
-	flag.Visit(func(f *flag.Flag) {
-		switch f.Name {
-		case "A":
-			cfg.Address = cliConfig.Address
-		case "P":
-			cfg.Port = cliConfig.Port
-		case "u":
-			cfg.Username = cliConfig.Username
-		case "p":
-			cfg.Password = cliConfig.Password
-		case "T":
-			cfg.ApiToken = cliConfig.ApiToken
-		case "d":
-			cfg.StorageDir = cliConfig.StorageDir
-		case "w":
-			cfg.WhiteDownloadDirs = cliConfig.WhiteDownloadDirs
-		case "c":
-			cfg.configPath = cliConfig.configPath
-		}
-	})
-}
-
-// setDefaults sets default values for any unset configuration fields
-func setDefaults(cfg *args, cliConfig *args) {
-	if cfg.Address == nil {
-		cfg.Address = cliConfig.Address
-	}
-	if cfg.Port == nil {
-		cfg.Port = cliConfig.Port
-	}
-	if cfg.Username == nil {
-		cfg.Username = cliConfig.Username
-	}
-	if cfg.Password == nil {
-		cfg.Password = cliConfig.Password
-	}
-	if cfg.ApiToken == nil {
-		cfg.ApiToken = cliConfig.ApiToken
-	}
-	if cfg.StorageDir == nil {
-		cfg.StorageDir = cliConfig.StorageDir
-	}
-}
-
-// loadConfigFile loads configuration from file
-func loadConfigFile(cfg *args, configPath string) {
-	if !filepath.IsAbs(configPath) {
 		dir, err := os.Getwd()
 		if err != nil {
-			return
+			fmt.Println("config dir get failed, reason:" + err.Error())
+			return &args
 		}
-		configPath = filepath.Join(dir, configPath)
+		path = filepath.Join(dir, path)
 	}
-
+	file, err := os.ReadFile(path)
-	file, err := os.ReadFile(configPath)
 	if err != nil {
 		if os.IsNotExist(err) {
-			return
+			return &args
-		}
-		return
-	}
-
-	if err = json.Unmarshal(file, cfg); err != nil {
-		return
-	}
-}
-
-// loadEnvVars loads configuration from environment variables with prefix GOPEED_
-func loadEnvVars(cfg *args) {
-	v := reflect.ValueOf(cfg).Elem()
-	t := reflect.TypeOf(cfg).Elem()
-
-	for i := 0; i < v.NumField(); i++ {
-		field := v.Field(i)
-		fieldType := t.Field(i)
-
-		// Get json tag as environment variable suffix
-		jsonTag := fieldType.Tag.Get("json")
-		if jsonTag == "" || jsonTag == "-" {
-			continue
-		}
-
-		// Remove options like omitempty
-		if commaIdx := strings.Index(jsonTag, ","); commaIdx != -1 {
-			jsonTag = jsonTag[:commaIdx]
-		}
-
-		// Convert to uppercase and add GOPEED_ prefix
-		envKey := "GOPEED_" + strings.ToUpper(jsonTag)
-		envValue := os.Getenv(envKey)
-
-		if envValue == "" {
-			continue
-		}
-
-		// Set value based on field type
-		if field.Kind() == reflect.Ptr {
-			if field.IsNil() {
-				// Create new pointer instance
-				newVal := reflect.New(field.Type().Elem())
-				field.Set(newVal)
-			}
-
-			switch field.Type().Elem().Kind() {
-			case reflect.String:
-				field.Elem().SetString(envValue)
-			case reflect.Int:
-				if intVal, err := strconv.Atoi(envValue); err == nil {
-					field.Elem().SetInt(int64(intVal))
-				}
-			default:
-				// For complex types like DownloadConfig, try JSON unmarshaling
-				if field.Type().Elem() == reflect.TypeOf(base.DownloaderStoreConfig{}) {
-					var config base.DownloaderStoreConfig
-					if err := json.Unmarshal([]byte(envValue), &config); err == nil {
-						field.Set(reflect.ValueOf(&config))
-					}
-				}
-			}
-		} else if field.Kind() == reflect.Slice {
-			// Handle non-pointer slice types (like []string for WhiteDownloadDirs)
-			if field.Type().Elem().Kind() == reflect.String {
-				dirs := strings.Split(envValue, ",")
-				for i := range dirs {
-					dirs[i] = strings.TrimSpace(dirs[i])
-				}
-				field.Set(reflect.ValueOf(dirs))
 		}
+		fmt.Println("config file read failed, reason:" + err.Error())
+		return &args
 	}
+	if err = json.Unmarshal(file, &args); err != nil {
+		fmt.Println("config file parse failed, reason:" + err.Error())
+		return &args
 	}
+	fmt.Printf("config file loaded: %s\n", path)
+	return &args
 }

cmd/web/main.go

@@ -6,12 +6,11 @@ package main
 import (
 	"embed"
 	"fmt"
+	"github.com/GopeedLab/gopeed/cmd"
+	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"io/fs"
 	"os"
 	"path/filepath"
-
-	"github.com/GopeedLab/gopeed/cmd"
-	"github.com/GopeedLab/gopeed/pkg/rest/model"
 )
 
 //go:embed dist/*
@@ -24,37 +23,36 @@ func main() {
 	}
 
 	args := parse()
-	var webAuth *model.WebAuth
+	var webBasicAuth *model.WebBasicAuth
 	if isNotBlank(args.Username) && isNotBlank(args.Password) {
-		webAuth = &model.WebAuth{
+		webBasicAuth = &model.WebBasicAuth{
 			Username: *args.Username,
 			Password: *args.Password,
 		}
 	}
 
-	var storageDir string
+	var dir string
 	if args.StorageDir != nil && *args.StorageDir != "" {
-		storageDir = *args.StorageDir
+		dir = *args.StorageDir
 	} else {
 		exe, err := os.Executable()
 		if err != nil {
 			panic(err)
 		}
-		storageDir = filepath.Join(filepath.Dir(exe), "storage")
+		dir = filepath.Dir(exe)
 	}
 
 	cfg := &model.StartConfig{
 		Network:        "tcp",
 		Address:        fmt.Sprintf("%s:%d", *args.Address, *args.Port),
 		Storage:        model.StorageBolt,
-		StorageDir:        storageDir,
+		StorageDir:     filepath.Join(dir, "storage"),
-		WhiteDownloadDirs: args.WhiteDownloadDirs,
 		ApiToken:       *args.ApiToken,
 		DownloadConfig: args.DownloadConfig,
 		ProductionMode: true,
 		WebEnable:      true,
 		WebFS:          sub,
-		WebAuth:           webAuth,
+		WebBasicAuth:   webBasicAuth,
 	}
 	cmd.Start(cfg)
 }

go.mod

@@ -13,7 +13,6 @@ require (
 	github.com/go-git/go-git/v5 v5.8.1
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
-	github.com/imroc/req/v3 v3.52.2
 	github.com/matoous/go-nanoid/v2 v2.0.0
 	github.com/mattn/go-ieproxy v0.0.12
 	github.com/pkg/errors v0.9.1
@@ -22,29 +21,17 @@ require (
 	github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad
 	go.etcd.io/bbolt v1.3.11
 	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
-	golang.org/x/sync v0.13.0
+	golang.org/x/sync v0.9.0
 )
 
 require (
-	github.com/andybalholm/brotli v1.1.1 // indirect
 	github.com/ebitengine/purego v0.8.1 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/icholy/digest v1.1.0 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
-	github.com/onsi/ginkgo/v2 v2.23.4 // indirect
 	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
-	github.com/quic-go/qpack v0.5.1 // indirect
-	github.com/quic-go/quic-go v0.51.0 // indirect
-	github.com/refraction-networking/utls v1.6.7 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	go.uber.org/automaxprocs v1.6.0 // indirect
-	go.uber.org/mock v0.5.1 // indirect
 )
 
 require (
@@ -74,7 +61,7 @@ require (
 	github.com/bits-and-blooms/bitset v1.15.0 // indirect
 	github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
-	github.com/cloudflare/circl v1.6.1 // indirect
+	github.com/cloudflare/circl v1.3.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dlclark/regexp2 v1.11.4 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
@@ -90,7 +77,7 @@ require (
 	github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/btree v1.1.3 // indirect
-	github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4 // indirect
+	github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
@@ -135,13 +122,13 @@ require (
 	go.opentelemetry.io/otel v1.32.0 // indirect
 	go.opentelemetry.io/otel/metric v1.32.0 // indirect
 	go.opentelemetry.io/otel/trace v1.32.0 // indirect
-	golang.org/x/crypto v0.37.0 // indirect
+	golang.org/x/crypto v0.29.0 // indirect
-	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/net v0.31.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.24.0 // indirect
+	golang.org/x/text v0.20.0 // indirect
 	golang.org/x/time v0.8.0 // indirect
-	golang.org/x/tools v0.32.0 // indirect
+	golang.org/x/tools v0.27.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
 	modernc.org/libc v1.61.0 // indirect

go.sum

@@ -94,8 +94,6 @@ github.com/anacrolix/upnp v0.1.4 h1:+2t2KA6QOhm/49zeNyeVwDu1ZYS9dB9wfxyVvh/wk7U=
 github.com/anacrolix/upnp v0.1.4/go.mod h1:Qyhbqo69gwNWvEk1xNTXsS5j7hMHef9hdr984+9fIic=
 github.com/anacrolix/utp v0.2.0 h1:65Cdmr6q9WSw2KsM+rtJFu7rqDzLl2bdysf4KlNPcFI=
 github.com/anacrolix/utp v0.2.0/go.mod h1:HGk4GYQw1O/3T1+yhqT/F6EcBd+AAwlo9dYErNy7mj8=
-github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
-github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
@@ -124,9 +122,8 @@ github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4M
 github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic=
 github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
-github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
-github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -199,8 +196,6 @@ github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZs
 github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q=
 github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
-github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -234,12 +229,12 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
-github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4 h1:gD0vax+4I+mAj+jEChEf25Ia07Jq7kYOFO5PPhAxFl4=
+github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 h1:c5FlPPgxOn7kJz3VoPLkQYQXGBS3EklQ4Zfi57uOuqQ=
-github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
+github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -255,11 +250,6 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
@@ -272,10 +262,6 @@ github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq
 github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
 github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
-github.com/icholy/digest v1.1.0 h1:HfGg9Irj7i+IX1o1QAmPfIBNu/Q5A5Tu3n/MED9k9H4=
-github.com/icholy/digest v1.1.0/go.mod h1:QNrsSGQ5v7v9cReDI0+eyjsXGUoRSUZQHeQ5C4XLa0Y=
-github.com/imroc/req/v3 v3.52.2 h1:xJocr1aIv0a2K9knfBQ4JnZHk+kWTITdjf0mgDg229I=
-github.com/imroc/req/v3 v3.52.2/go.mod h1:dBGsDloOSZJcFs6PnTjZXYBJK70OXbZpizHBLNqcH2k=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
@@ -291,8 +277,6 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:C
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
 github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -347,11 +331,7 @@ github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJm
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus=
-github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU=
-github.com/onsi/gomega v1.36.3/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
@@ -400,8 +380,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
 github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -426,13 +404,7 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/protolambda/ctxlock v0.1.0 h1:rCUY3+vRdcdZXqT07iXgyr744J2DU2LCBIXowYAjBCE=
 github.com/protolambda/ctxlock v0.1.0/go.mod h1:vefhX6rIZH8rsg5ZpOJfEDYQOppZi19SfPiGOFrNnwM=
-github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
-github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
-github.com/quic-go/quic-go v0.51.0 h1:K8exxe9zXxeRKxaXxi/GpUqYiTrtdiWP8bo1KFya6Wc=
-github.com/quic-go/quic-go v0.51.0/go.mod h1:MFlGGpcpJqRAfmYi6NC2cptDPSxRWTOGNuP4wqrWmzQ=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM=
-github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
@@ -480,9 +452,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
 github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
@@ -500,8 +471,6 @@ github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad h1:QtuWk6dsrNXc/ugwCBEN0jG52q/4tXRzMvZm4fH6T9g=
 github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad/go.mod h1:Jj8p9bgKGTPQ+M8CdUMS9p7Mmdoxa3OAcAjJQBu0CcI=
-github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
-github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -518,12 +487,8 @@ go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZk
 go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
 go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
 go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
-go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
-go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.5.1 h1:ASgazW/qBmR+A32MYFDB6E2POoTgOwT509VP0CT/fjs=
-go.uber.org/mock v0.5.1/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -532,8 +497,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
+golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
-golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
+golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20220428152302-39d4317da171/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
 golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo=
@@ -547,8 +512,8 @@ golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -570,8 +535,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -585,8 +550,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
+golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -625,15 +590,17 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
+golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=
-golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
+golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -642,8 +609,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
 golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
 golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -657,8 +624,8 @@ golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
+golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o=
-golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
+golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -679,8 +646,6 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -702,8 +667,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
-gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=

internal/controller/controller.go

@@ -25,9 +25,7 @@ type DefaultFileController struct {
 func NewController() *Controller {
 	return &Controller{
 		GetConfig:      func(v any) {},
-		GetProxy: func(requestProxy *base.RequestProxy) func(*http.Request) (*url.URL, error) {
+		GetProxy:       func(requestProxy *base.RequestProxy) func(*http.Request) (*url.URL, error) { return nil },
-			return requestProxy.ToHandler()
-		},
 		FileController: &DefaultFileController{},
 	}
 }

internal/protocol/bt/config.go

@@ -4,7 +4,7 @@ type config struct {
 	ListenPort int      `json:"listenPort"`
 	Trackers   []string `json:"trackers"`
 	// SeedKeep is always keep seeding after downloading is complete, unless manually stopped.
-	SeedKeep bool `json:"seedKeep"`
+	SeedKeep bool `json:"seedKeep`
 	// SeedRatio is the ratio of uploaded data to downloaded data to seed.
 	SeedRatio float64 `json:"seedRatio"`
 	// SeedTime is the time in seconds to seed after downloading is complete.

internal/protocol/bt/fetcher.go

@@ -4,6 +4,13 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/GopeedLab/gopeed/internal/controller"
+	"github.com/GopeedLab/gopeed/internal/fetcher"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/protocol/bt"
+	"github.com/GopeedLab/gopeed/pkg/util"
+	"github.com/anacrolix/torrent"
+	"github.com/anacrolix/torrent/metainfo"
 	"io"
 	"net/url"
 	"os"
@@ -12,14 +19,6 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-
-	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/GopeedLab/gopeed/pkg/protocol/bt"
-	"github.com/GopeedLab/gopeed/pkg/util"
-	"github.com/anacrolix/torrent"
-	"github.com/anacrolix/torrent/metainfo"
 )
 
 var (
@@ -101,6 +100,9 @@ func (f *Fetcher) initClient() (err error) {
 }
 
 func (f *Fetcher) Resolve(req *base.Request) error {
+	if err := base.ParseReqExtra[bt.ReqExtra](req); err != nil {
+		return err
+	}
 	f.meta.Req = req
 	if err := f.addTorrent(req, false); err != nil {
 		return err
@@ -353,14 +355,10 @@ func (f *Fetcher) WaitUpload() (err error) {
 }
 
 func (f *Fetcher) addTorrent(req *base.Request, fromUpload bool) (err error) {
-	if err = base.ParseReqExtra[bt.ReqExtra](req); err != nil {
-		return
-	}
 	if err = f.initClient(); err != nil {
 		return
 	}
 	schema := util.ParseSchema(req.URL)
-	privateTorrent := false
 	if schema == "MAGNET" {
 		f.torrent, err = client.AddMagnet(req.URL)
 	} else {
@@ -390,23 +388,12 @@ func (f *Fetcher) addTorrent(req *base.Request, fromUpload bool) (err error) {
 		if err != nil && !strings.Contains(err.Error(), "expected EOF") {
 			return err
 		}
-
-		info, er := metaInfo.UnmarshalInfo()
-		if er != nil {
-			return er
-		}
-
-		if info.Private != nil && *info.Private {
-			privateTorrent = true
-		}
 		f.torrent, err = client.AddTorrent(metaInfo)
 	}
 	if err != nil {
 		return
 	}
 
-	// Do not add external tracker to a private torrent.
-	if !privateTorrent {
 	// use map to deduplicate
 	trackers := make(map[string]bool)
 	if req.Extra != nil {
@@ -429,7 +416,6 @@ func (f *Fetcher) addTorrent(req *base.Request, fromUpload bool) (err error) {
 		}
 		f.torrent.AddTrackers(announceList)
 	}
-	}
 	<-f.torrent.GotInfo()
 	f.torrentReady.Store(true)
 

internal/protocol/bt/fetcher_test.go

@@ -3,18 +3,17 @@ package bt
 import (
 	"encoding/base64"
 	"encoding/json"
+	"github.com/GopeedLab/gopeed/internal/controller"
+	"github.com/GopeedLab/gopeed/internal/fetcher"
+	"github.com/GopeedLab/gopeed/internal/test"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/protocol/bt"
 	gohttp "net/http"
 	"net/url"
 	"os"
 	"path/filepath"
 	"reflect"
 	"testing"
-
-	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/internal/test"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/GopeedLab/gopeed/pkg/protocol/bt"
 )
 
 func TestFetcher_Resolve_Torrent(t *testing.T) {

internal/protocol/bt/file.go

@@ -5,12 +5,11 @@ package bt
 import (
 	"context"
 	"fmt"
+	"github.com/anacrolix/torrent/storage"
 	"io"
 	"os"
 	"path/filepath"
 
-	"github.com/anacrolix/torrent/storage"
-
 	"github.com/anacrolix/missinggo/v2"
 
 	"github.com/anacrolix/torrent/common"
@@ -35,7 +34,7 @@ func newFileOpts(opts newFileClientOpts) storage.ClientImplCloser {
 	if opts.FilePathMaker == nil {
 		opts.FilePathMaker = func(opts storage.FilePathMakerOpts) string {
 			var parts []string
-			if opts.Info.Length == 0 || opts.File.Path == nil {
+			if opts.Info.Name != metainfo.NoName {
 				parts = append(parts, opts.Info.Name)
 			}
 			return filepath.Join(append(parts, opts.File.Path...)...)

internal/protocol/http/fetcher.go

@@ -16,23 +16,18 @@ import (
 	"path"
 	"strconv"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/GopeedLab/gopeed/internal/controller"
 	"github.com/GopeedLab/gopeed/internal/fetcher"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	fhttp "github.com/GopeedLab/gopeed/pkg/protocol/http"
-	"github.com/GopeedLab/gopeed/pkg/util"
 	"github.com/xiaoqidun/setft"
 	"golang.org/x/sync/errgroup"
 )
 
-const (
+const connectTimeout = 15 * time.Second
-	connectTimeout = 15 * time.Second
+const readTimeout = 15 * time.Second
-	readTimeout    = 15 * time.Second
-	helpMinSize    = 1 * 1024 * 1024
-)
 
 type RequestError struct {
 	Code int
@@ -51,22 +46,11 @@ type chunk struct {
 	Begin      int64
 	End        int64
 	Downloaded int64
-}
-
-type connection struct {
-	Chunk      *chunk
-	Downloaded int64
-	Completed  bool
 
 	failed     bool
 	retryTimes int
 }
 
-// get remain to download bytes
-func (c *chunk) remain() int64 {
-	return c.End - c.Begin + 1 - c.Downloaded
-}
-
 func newChunk(begin int64, end int64) *chunk {
 	return &chunk{
 		Begin: begin,
@@ -80,10 +64,7 @@ type Fetcher struct {
 	doneCh chan error
 
 	meta   *fetcher.FetcherMeta
-	connections  []*connection
+	chunks []*chunk
-	helpLock     sync.Mutex
-	redirectURL  string
-	redirectLock sync.Mutex
 
 	file   *os.File
 	cancel context.CancelFunc
@@ -173,13 +154,7 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 				filename = strings.Replace(filename, "UTF8", "UTF-8", 1)
 				file.Name, _ = decoder.Decode(filename)
 			} else {
-				file.Name = util.TryUrlQueryUnescape(filename)
+				file.Name = filename
-			}
-		} else {
-			substr := "attachment; filename="
-			index := strings.Index(contentDisposition, substr)
-			if index != -1 {
-				file.Name = util.TryUrlQueryUnescape(contentDisposition[index+len(substr):])
 			}
 		}
 	}
@@ -242,10 +217,9 @@ func (f *Fetcher) Start() (err error) {
 		return err
 	}
 
-	if f.connections == nil {
+	if f.chunks == nil {
-		f.connections = f.splitConnection()
+		f.chunks = f.splitChunk()
 	}
-	f.redirectURL = ""
 	f.fetch()
 	return
 }
@@ -272,26 +246,16 @@ func (f *Fetcher) Meta() *fetcher.FetcherMeta {
 }
 
 func (f *Fetcher) Stats() any {
-	statsConnections := make([]*fhttp.StatsConnection, 0)
+	// todo http download health
-	for _, connection := range f.connections {
+	return &fhttp.Stats{}
-		statsConnections = append(statsConnections, &fhttp.StatsConnection{
-			Downloaded: connection.Downloaded,
-			Completed:  connection.Completed,
-			Failed:     connection.failed,
-			RetryTimes: connection.retryTimes,
-		})
-	}
-	return &fhttp.Stats{
-		Connections: statsConnections,
-	}
 }
 
 func (f *Fetcher) Progress() fetcher.Progress {
 	p := make(fetcher.Progress, 0)
-	if len(f.connections) > 0 {
+	if len(f.chunks) > 0 {
 		total := int64(0)
-		for _, connection := range f.connections {
+		for _, chunk := range f.chunks {
-			total += connection.Downloaded
+			total += chunk.Downloaded
 		}
 		p = append(p, total)
 	}
@@ -306,16 +270,16 @@ func (f *Fetcher) fetch() {
 	var ctx context.Context
 	ctx, f.cancel = context.WithCancel(context.Background())
 	f.eg, _ = errgroup.WithContext(ctx)
-	connectionErrs := make([]error, len(f.connections))
+	chunkErrs := make([]error, len(f.chunks))
-	for i := 0; i < len(f.connections); i++ {
+	for i := 0; i < len(f.chunks); i++ {
 		i := i
 		f.eg.Go(func() error {
-			err := f.run(i, ctx)
+			err := f.fetchChunk(i, ctx)
 			// if canceled, fail fast
 			if errors.Is(err, context.Canceled) {
 				return err
 			}
-			connectionErrs[i] = err
+			chunkErrs[i] = err
 			return nil
 		})
 	}
@@ -327,7 +291,7 @@ func (f *Fetcher) fetch() {
 			return
 		}
 		// check all fetch results, if any error, return
-		for _, chunkErr := range connectionErrs {
+		for _, chunkErr := range chunkErrs {
 			if chunkErr != nil {
 				err = chunkErr
 				break
@@ -343,63 +307,43 @@ func (f *Fetcher) fetch() {
 	}()
 }
 
-func (f *Fetcher) run(index int, ctx context.Context) (err error) {
+func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
-	connection := f.connections[index]
+	chunk := f.chunks[index]
-	connection.failed = false
+	chunk.failed = false
-	connection.retryTimes = 0
+	chunk.retryTimes = 0
+
 	var (
 		client = f.buildClient()
 		buf    = make([]byte, 8192)
 	)
-
-	downloadChunk := func(chunk *chunk) (err error) {
 	// retry until all remain chunks failed
 	for {
 		// if chunk is completed, return
-			if f.meta.Res.Range && chunk.remain() <= 0 {
+		if f.meta.Res.Range && chunk.Downloaded >= chunk.End-chunk.Begin+1 {
 			return nil
 		}
 		// if all chunks failed, return
-			if connection.failed {
+		if chunk.failed {
 			allFailed := true
-				for _, c := range f.connections {
+			for _, c := range f.chunks {
-					if c.Completed {
-						continue
-					}
 				if !c.failed {
 					allFailed = false
 					break
 				}
 			}
 			if allFailed {
-					if connection.retryTimes >= 3 {
+				if chunk.retryTimes >= 3 {
 					return
 				} else {
-						connection.retryTimes++
+					chunk.retryTimes++
 				}
 			}
 		}
 
-			err = func() error {
 		var (
 			httpReq *http.Request
 			resp    *http.Response
 		)
-				f.redirectLock.Lock()
-				redirectURL := f.redirectURL
-				if redirectURL != "" {
-					f.redirectLock.Unlock()
-				} else {
-					// Only hold the lock when we need to potentially set redirectURL
-					defer func() {
-						if redirectURL == "" && err == nil {
-							f.redirectURL = resp.Request.URL.String()
-						}
-						f.redirectLock.Unlock()
-					}()
-				}
-
-				err = func() (err error) {
 		httpReq, err = f.buildRequest(ctx, f.meta.Req)
 		if err != nil {
 			return
@@ -410,46 +354,25 @@ func (f *Fetcher) run(index int, ctx context.Context) (err error) {
 		} else {
 			chunk.Downloaded = 0
 		}
+		err = func() error {
 			resp, err = client.Do(httpReq)
-					if err != nil {
-						return
-					}
-					return
-				}()
 			if err != nil {
 				return err
 			}
-
 			defer resp.Body.Close()
 			if resp.StatusCode != base.HttpCodeOK && resp.StatusCode != base.HttpCodePartialContent {
 				err = NewRequestError(resp.StatusCode, resp.Status)
 				return err
 			}
-				connection.failed = false
 			reader := NewTimeoutReader(resp.Body, readTimeout)
 			for {
 				n, err := reader.Read(buf)
 				if n > 0 {
-						finished := false
-						if f.meta.Res.Range {
-							remain := chunk.remain()
-							// If downloaded bytes exceed the remain bytes, only write remain bytes
-							if remain < int64(n) {
-								n = int(remain)
-								finished = true
-							}
-						}
-
 					_, err := f.file.WriteAt(buf[:n], chunk.Begin+chunk.Downloaded)
 					if err != nil {
 						return err
 					}
 					chunk.Downloaded += int64(n)
-						connection.Downloaded += int64(n)
-
-						if finished {
-							return nil
-						}
 				}
 				if err != nil {
 					if err == io.EOF {
@@ -465,7 +388,7 @@ func (f *Fetcher) run(index int, ctx context.Context) (err error) {
 				return
 			}
 			// retry request after 1 second
-				connection.failed = true
+			chunk.failed = true
 			time.Sleep(time.Second)
 			continue
 		}
@@ -474,62 +397,17 @@ func (f *Fetcher) run(index int, ctx context.Context) (err error) {
 	return
 }
 
-	for {
-		if err = downloadChunk(connection.Chunk); err != nil {
-			return
-		}
-
-		// check this connection is completed
-		if !f.meta.Res.Range || !f.helpOtherConnection(connection) {
-			connection.Completed = true
-			return
-		}
-	}
-}
-
-func (f *Fetcher) helpOtherConnection(helper *connection) bool {
-	f.helpLock.Lock()
-	defer f.helpLock.Unlock()
-
-	// find the slowest connection
-	var maxRemainConnection *connection
-	var maxRemain int64
-	for _, r := range f.connections {
-		if r == helper || r.Completed {
-			continue
-		}
-
-		remain := r.Chunk.remain()
-		if remain > maxRemain && remain > helpMinSize {
-			maxRemainConnection = r
-			maxRemain = remain
-		}
-	}
-
-	if maxRemainConnection == nil {
-		return false
-	}
-
-	// re-calculate the chunk range
-	helper.Chunk.Begin = maxRemainConnection.Chunk.End - maxRemainConnection.Chunk.remain()/2
-	helper.Chunk.End = maxRemainConnection.Chunk.End
-	helper.Chunk.Downloaded = 0
-	maxRemainConnection.Chunk.End = helper.Chunk.Begin - 1
-	return true
-}
-
 func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq *http.Request, err error) {
-	var reqUrl string
+	url, err := url.Parse(req.URL)
-	if f.redirectURL != "" {
+	if err != nil {
-		reqUrl = f.redirectURL
+		return
-	} else {
-		reqUrl = req.URL
 	}
 
 	var (
 		method string
 		body   io.Reader
 	)
+
 	headers := http.Header{}
 	if req.Extra == nil {
 		method = http.MethodGet
@@ -542,7 +420,7 @@ func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq
 		}
 		if len(extra.Header) > 0 {
 			for k, v := range extra.Header {
-				headers.Set(k, strings.TrimSpace(v))
+				headers.Set(k, v)
 			}
 		}
 		if extra.Body != "" {
@@ -550,13 +428,13 @@ func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq
 		}
 	}
 	if _, ok := headers[base.HttpHeaderUserAgent]; !ok {
-		headers.Set(base.HttpHeaderUserAgent, strings.TrimSpace(f.config.UserAgent))
+		headers.Set(base.HttpHeaderUserAgent, f.config.UserAgent)
 	}
 
 	if ctx != nil {
-		httpReq, err = http.NewRequestWithContext(ctx, method, reqUrl, body)
+		httpReq, err = http.NewRequestWithContext(ctx, method, url.String(), body)
 	} else {
-		httpReq, err = http.NewRequest(method, reqUrl, body)
+		httpReq, err = http.NewRequest(method, url.String(), body)
 	}
 	if err != nil {
 		return
@@ -569,33 +447,30 @@ func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq
 	return httpReq, nil
 }
 
-func (f *Fetcher) splitConnection() (connections []*connection) {
+func (f *Fetcher) splitChunk() (chunks []*chunk) {
 	if f.meta.Res.Range {
-		optConnections := f.meta.Opts.Extra.(*fhttp.OptsExtra).Connections
+		connections := f.meta.Opts.Extra.(*fhttp.OptsExtra).Connections
 		// 每个连接平均需要下载的分块大小
-		chunkSize := f.meta.Res.Size / int64(optConnections)
+		chunkSize := f.meta.Res.Size / int64(connections)
-		connections = make([]*connection, optConnections)
+		chunks = make([]*chunk, connections)
-		for i := 0; i < optConnections; i++ {
+		for i := 0; i < connections; i++ {
 			var (
 				begin = chunkSize * int64(i)
 				end   int64
 			)
-			if i == optConnections-1 {
+			if i == connections-1 {
 				// 最后一个分块需要保证把文件下载完
 				end = f.meta.Res.Size - 1
 			} else {
 				end = begin + chunkSize - 1
 			}
-			connections[i] = &connection{
+			chunk := newChunk(begin, end)
-				Chunk: newChunk(begin, end),
+			chunks[i] = chunk
-			}
 		}
 	} else {
 		// 只支持单连接下载
-		connections = make([]*connection, 1)
+		chunks = make([]*chunk, 1)
-		connections[0] = &connection{
+		chunks[0] = newChunk(0, 0)
-			Chunk: newChunk(0, 0),
-		}
 	}
 	return
 }
@@ -618,16 +493,8 @@ func (f *Fetcher) buildClient() *http.Client {
 	}
 }
 
-func decodeMangledString(mangled string) string {
-	rawBytes := make([]byte, 0, len(mangled)*3)
-	for _, r := range mangled {
-		rawBytes = append(rawBytes, byte(r))
-	}
-	return string(rawBytes)
-}
-
 type fetcherData struct {
-	Connections []*connection
+	Chunks []*chunk
 }
 
 type FetcherManager struct {
@@ -683,7 +550,7 @@ func (fm *FetcherManager) DefaultConfig() any {
 func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
 	_f := f.(*Fetcher)
 	return &fetcherData{
-		Connections: _f.connections,
+		Chunks: _f.chunks,
 	}, nil
 }
 
@@ -695,8 +562,8 @@ func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v
 		fetcher.meta = meta
 		base.ParseReqExtra[fhttp.ReqExtra](fetcher.meta.Req)
 		base.ParseOptsExtra[fhttp.OptsExtra](fetcher.meta.Opts)
-		if len(fd.Connections) > 0 {
+		if len(fd.Chunks) > 0 {
-			fetcher.connections = fd.Connections
+			fetcher.chunks = fd.Chunks
 		}
 		return fetcher
 	}

internal/protocol/http/fetcher_test.go

@@ -47,16 +47,6 @@ func TestFetcher_Resolve(t *testing.T) {
 			},
 		},
 	}, t)
-	testResolve(test.StartTestCustomServer, "no-encode", &base.Resource{
-		Size:  test.BuildSize,
-		Range: false,
-		Files: []*base.FileInfo{
-			{
-				Name: "测试.zip",
-				Size: test.BuildSize,
-			},
-		},
-	}, t)
 	testResolve(test.StartTestCustomServer, "%E6%B5%8B%E8%AF%95.zip", &base.Resource{
 		Size:  0,
 		Range: false,
@@ -105,21 +95,6 @@ func TestFetcher_ResolveWithHostHeader(t *testing.T) {
 	}
 }
 
-func TestFetcher_ResolveWithInvalidHeader(t *testing.T) {
-	fetcher := buildFetcher()
-	err := fetcher.Resolve(&base.Request{
-		URL: "https://bing.com",
-		Extra: &http.ReqExtra{
-			Header: map[string]string{
-				"Referer": "\rtest",
-			},
-		},
-	})
-	if err != nil {
-		t.Errorf("Resolve() got = %v, want nil", err)
-	}
-}
-
 func testResolve(startTestServer func() net.Listener, path string, want *base.Resource, t *testing.T) {
 	listener := startTestServer()
 	defer listener.Close()
@@ -201,14 +176,6 @@ func TestFetcher_DownloadResponseBodyReadTimeout(t *testing.T) {
 	downloadError(listener, 4, t)
 }
 
-func TestFetcher_DownloadOnBugFileServer(t *testing.T) {
-	listener := test.StartTestRangeBugServer()
-	defer listener.Close()
-
-	downloadNormal(listener, 1, t)
-	downloadNormal(listener, 4, t)
-}
-
 func TestFetcher_DownloadResume(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()
@@ -271,33 +238,6 @@ func TestFetcher_ConfigUseServerCtime(t *testing.T) {
 	}
 }
 
-func TestFetcher_Stats(t *testing.T) {
-	listener := test.StartTestFileServer()
-	defer listener.Close()
-	fetcher := doDownloadReady(buildConfigFetcher(config{
-		Connections: 16,
-	}), listener, 0, t)
-	err := fetcher.Start()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = fetcher.Wait()
-	if err != nil {
-		t.Fatal(err)
-	}
-	stats := fetcher.Stats().(*http.Stats)
-	if len(stats.Connections) != 16 {
-		t.Errorf("Stats() got = %v, want %v", len(stats.Connections), 16)
-	}
-	totalDownloaded := int64(0)
-	for _, conn := range stats.Connections {
-		totalDownloaded += conn.Downloaded
-	}
-	if totalDownloaded != test.BuildSize {
-		t.Errorf("Stats() got = %v, want %v", totalDownloaded, test.BuildSize)
-	}
-}
-
 func TestFetcherManager_ParseName(t *testing.T) {
 	type args struct {
 		u string

internal/test/httptest.go

@@ -102,17 +102,6 @@ func StartTestCustomServer() net.Listener {
 			defer file.Close()
 			io.Copy(writer, file)
 		})
-		mux.HandleFunc("/no-encode", func(writer http.ResponseWriter, request *http.Request) {
-			writer.Header().Set("Content-Disposition", "attachment; filename=测试.zip")
-			writer.Header().Set("Content-Type", "application/octet-stream")
-			writer.Header().Set("Content-Length", fmt.Sprintf("%d", BuildSize))
-			file, err := os.Open(BuildFile)
-			if err != nil {
-				panic(err)
-			}
-			defer file.Close()
-			io.Copy(writer, file)
-		})
 		return mux
 	})
 }
@@ -191,49 +180,20 @@ func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
 				writer.WriteHeader(403)
 				return
 			}
-			rangeFileHandle(
-				writer,
-				request,
-				nil,
-				func(file *os.File, n int64) {
-					slowCopyN(sl, writer, file, n, delay)
-				},
-			)
-		})
-		return mux
-	})
-}
 
-// StartTestRangeBugServer simulate bug server:
-// Don't follow Range request rules, always return more data than range, e.g. Range: bytes=0-100, return 150 bytes
-func StartTestRangeBugServer() net.Listener {
-	return startTestServer(func(sl *shutdownListener) http.Handler {
-		mux := http.NewServeMux()
-		mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
-			rangeFileHandle(
-				writer,
-				request,
-				func(end int64) int64 {
-					var bugEnd = end
-					if end != 0 {
-						bugEnd = end + 50
-						if bugEnd >= BuildSize {
-							bugEnd = end
-						}
-					}
-					return bugEnd
-				},
-				func(file *os.File, n int64) {
-					io.CopyN(writer, file, n)
-				},
-			)
-		})
-		return mux
-	})
-}
-
-func rangeFileHandle(writer http.ResponseWriter, request *http.Request, modifyEnd func(end int64) int64, iocpN func(file *os.File, n int64)) {
 			r := request.Header.Get("Range")
+			if r == "" {
+				writer.Header().Set("Content-Length", fmt.Sprintf("%d", BuildSize))
+				writer.WriteHeader(200)
+				(writer.(http.Flusher)).Flush()
+
+				file, err := os.Open(BuildFile)
+				if err != nil {
+					panic(err)
+				}
+				defer file.Close()
+				slowCopy(sl, writer, file, delay)
+			} else {
 				// split range
 				s := strings.Split(r, "=")
 				if len(s) != 2 {
@@ -262,11 +222,6 @@ func rangeFileHandle(writer http.ResponseWriter, request *http.Request, modifyEn
 				if end >= BuildSize {
 					end = BuildSize - 1
 				}
-
-	if modifyEnd != nil {
-		end = modifyEnd(end)
-	}
-
 				writer.Header().Set("Content-Length", fmt.Sprintf("%d", end-start+1))
 				writer.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", start, end, BuildSize))
 				writer.Header().Set("Accept-Ranges", "bytes")
@@ -280,7 +235,11 @@ func rangeFileHandle(writer http.ResponseWriter, request *http.Request, modifyEn
 				}
 				defer file.Close()
 				file.Seek(start, 0)
-	iocpN(file, end-start+1)
+				slowCopyN(sl, writer, file, end-start+1, delay)
+			}
+		})
+		return mux
+	})
 }
 
 // slowCopyN copies n bytes from src to dst, speed limit is bytes per second

pkg/base/model.go

@@ -163,16 +163,6 @@ func ParseOptsExtra[E any](opts *Options) error {
 	return nil
 }
 
-type CreateTaskBatch struct {
-	Reqs []*CreateTaskBatchItem `json:"reqs"`
-	Opts *Options               `json:"opts"`
-}
-
-type CreateTaskBatchItem struct {
-	Req  *Request `json:"req"`
-	Opts *Options `json:"opts"`
-}
-
 // DownloaderStoreConfig is the config that can restore the downloader.
 type DownloaderStoreConfig struct {
 	FirstLoad bool `json:"-"` // FirstLoad is the flag that the config is first time init and not from store

pkg/download/downloader.go

@@ -2,6 +2,15 @@ package download
 
 import (
 	"errors"
+	"github.com/GopeedLab/gopeed/internal/controller"
+	"github.com/GopeedLab/gopeed/internal/fetcher"
+	"github.com/GopeedLab/gopeed/internal/logger"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/protocol/http"
+	"github.com/GopeedLab/gopeed/pkg/util"
+	gonanoid "github.com/matoous/go-nanoid/v2"
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/pkgerrors"
 	"math"
 	gohttp "net/http"
 	"net/url"
@@ -13,16 +22,6 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-
-	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/internal/logger"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/GopeedLab/gopeed/pkg/protocol/http"
-	"github.com/GopeedLab/gopeed/pkg/util"
-	gonanoid "github.com/matoous/go-nanoid/v2"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/pkgerrors"
 )
 
 const (
@@ -149,7 +148,6 @@ func (d *Downloader) Setup() error {
 				tasks = append(tasks[:i], tasks[i+1:]...)
 				continue
 			}
-			d.assignFetcherManager(task)
 			initTask(task)
 			if task.Status != base.DownloadStatusDone && task.Status != base.DownloadStatusError {
 				task.Status = base.DownloadStatusPause
@@ -210,7 +208,7 @@ func (d *Downloader) Setup() error {
 						if task.Status == base.DownloadStatusRunning {
 							downloadDataChanged = current != task.Progress.Downloaded
 							task.Progress.Used = task.timer.Used()
-							task.Progress.Speed = task.updateSpeed(current-task.Progress.Downloaded, tick)
+							task.Progress.Speed = task.calcSpeed(task.speedArr, current-task.Progress.Downloaded, tick)
 							task.Progress.Downloaded = current
 						}
 
@@ -219,7 +217,7 @@ func (d *Downloader) Setup() error {
 							uploader := task.fetcher.(fetcher.Uploader)
 							currentUploaded := uploader.UploadedBytes()
 							uploadDataChanged = currentUploaded != task.Progress.Uploaded
-							task.Progress.UploadSpeed = task.updateUploadSpeed(currentUploaded-task.Progress.Uploaded, tick)
+							task.Progress.UploadSpeed = task.calcSpeed(task.uploadSpeedArr, currentUploaded-task.Progress.Uploaded, tick)
 							task.Progress.Uploaded = currentUploaded
 						}
 						d.emit(EventKeyProgress, task)
@@ -360,14 +358,10 @@ func (d *Downloader) CreateDirect(req *base.Request, opts *base.Options) (taskId
 	return d.doCreate(fetcher, opts)
 }
 
-func (d *Downloader) CreateDirectBatch(req *base.CreateTaskBatch) (taskId []string, err error) {
+func (d *Downloader) CreateDirectBatch(reqs []*base.Request, opts *base.Options) (taskId []string, err error) {
 	taskIds := make([]string, 0)
-	for _, ir := range req.Reqs {
+	for _, req := range reqs {
-		opts := ir.Opts
+		taskId, err := d.CreateDirect(req, opts.Clone())
-		if opts == nil {
-			opts = req.Opts
-		}
-		taskId, err := d.CreateDirect(ir.Req, opts.Clone())
 		if err != nil {
 			return nil, err
 		}
@@ -533,7 +527,7 @@ func (d *Downloader) ContinueBatch(filter *TaskFilter) (err error) {
 
 func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
 	if filter == nil || filter.IsEmpty() {
-		return d.deleteAll(force)
+		return d.deleteAll()
 	}
 
 	deleteTasks := d.GetTasksByFilter(filter)
@@ -578,21 +572,17 @@ func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
 	return
 }
 
-func (d *Downloader) deleteAll(force bool) (err error) {
+func (d *Downloader) deleteAll() (err error) {
-	var deleteTasksTemp []*Task
 	func() {
 		d.lock.Lock()
 		defer d.lock.Unlock()
 
-		for _, task := range d.tasks {
-			deleteTasksTemp = append(deleteTasksTemp, task)
-		}
 		d.tasks = make([]*Task, 0)
 		d.waitTasks = make([]*Task, 0)
 	}()
 
-	for _, task := range deleteTasksTemp {
+	for _, task := range d.tasks {
-		if err = d.doDelete(task, force); err != nil {
+		if err = d.doDelete(task, true); err != nil {
 			return
 		}
 	}
@@ -902,7 +892,18 @@ func (d *Downloader) restoreTask(task *Task) error {
 }
 
 func (d *Downloader) restoreFetcher(task *Task) error {
-	v, f := task.fetcherManager.Restore()
+	var fm fetcher.FetcherManager
+	for _, f := range d.cfg.FetchManagers {
+		if f.Name() == task.Protocol {
+			fm = f
+			break
+		}
+	}
+	if fm == nil {
+		return ErrUnSupportedProtocol
+	}
+	task.fetcherManager = fm
+	v, f := fm.Restore()
 	if v != nil {
 		err := d.storage.Pop(bucketSave, task.ID, v)
 		if err != nil {
@@ -942,9 +943,9 @@ func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options) (taskId str
 	}
 
 	// if enable white download directory, check if the download directory is in the white list
-	if len(d.cfg.WhiteDownloadDirs) > 0 {
+	if len(d.cfg.DownloadDirWhiteList) > 0 {
 		inWhiteList := false
-		for _, dir := range d.cfg.WhiteDownloadDirs {
+		for _, dir := range d.cfg.DownloadDirWhiteList {
 			if match, err := filepath.Match(dir, opts.Path); match && err == nil {
 				inWhiteList = true
 				break
@@ -1144,15 +1145,6 @@ func logPanic(logDir string) {
 	debug.SetCrashOutput(f, debug.CrashOptions{})
 }
 
-func (d *Downloader) assignFetcherManager(task *Task) error {
-	fm, err := d.parseFm(task.Meta.Req.URL)
-	if err != nil {
-		return err
-	}
-	task.fetcherManager = fm
-	return nil
-}
-
 func (d *Downloader) buildFetcher(url string) (fetcher.Fetcher, error) {
 	fm, err := d.parseFm(url)
 	if err != nil {

pkg/download/downloader_test.go

@@ -91,7 +91,7 @@ func TestDownloader_CreateNotInWhite(t *testing.T) {
 	defer listener.Close()
 
 	downloader := NewDownloader(&DownloaderConfig{
-		WhiteDownloadDirs: []string{"./downloads"},
+		DownloadDirWhiteList: []string{"./downloads"},
 	})
 	if err := downloader.Setup(); err != nil {
 		t.Fatal(err)
@@ -137,15 +137,13 @@ func TestDownloader_CreateDirectBatch(t *testing.T) {
 		downloader.Clear()
 	}()
 
-	reqs := make([]*base.CreateTaskBatchItem, 0)
+	reqs := make([]*base.Request, 0)
 	fileNames := make([]string, 0)
 	for i := 0; i < 5; i++ {
 		req := &base.Request{
 			URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
 		}
-		reqs = append(reqs, &base.CreateTaskBatchItem{
+		reqs = append(reqs, req)
-			Req: req,
-		})
 		if i == 0 {
 			fileNames = append(fileNames, test.DownloadName)
 		} else {
@@ -162,15 +160,12 @@ func TestDownloader_CreateDirectBatch(t *testing.T) {
 		}
 	})
 
-	_, err := downloader.CreateDirectBatch(&base.CreateTaskBatch{
+	_, err := downloader.CreateDirectBatch(reqs, &base.Options{
-		Reqs: reqs,
-		Opts: &base.Options{
 		Path: test.Dir,
 		Name: test.DownloadName,
 		Extra: http.OptsExtra{
 			Connections: 4,
 		},
-		},
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -504,15 +499,13 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
 		downloader.Clear()
 	}()
 
-	reqs := make([]*base.CreateTaskBatchItem, 0)
+	reqs := make([]*base.Request, 0)
 	fileNames := make([]string, 0)
 	for i := 0; i < 10; i++ {
 		req := &base.Request{
 			URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
 		}
-		reqs = append(reqs, &base.CreateTaskBatchItem{
+		reqs = append(reqs, req)
-			Req: req,
-		})
 		if i == 0 {
 			fileNames = append(fileNames, test.DownloadName)
 		} else {
@@ -529,15 +522,12 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
 		}
 	})
 
-	taskIds, err := downloader.CreateDirectBatch(&base.CreateTaskBatch{
+	taskIds, err := downloader.CreateDirectBatch(reqs, &base.Options{
-		Reqs: reqs,
-		Opts: &base.Options{
 		Path: test.Dir,
 		Name: test.DownloadName,
 		Extra: http.OptsExtra{
 			Connections: 4,
 		},
-		},
 	})
 	if err != nil {
 		t.Fatal(err)

pkg/download/engine/engine_test.go

@@ -205,31 +205,6 @@ function testTimeout(){
 		xhr.send();
 	});
 }
-
-async function testFingerprint(fingerprint,ua){
-	__gopeed_setFingerprint(fingerprint);
-	const resp = await fetch(host+'/ua');
-	const data = await resp.json();
-	if(!data.user_agent.includes(ua)){
-		throw new Error('fingerprint test failed, user agent: ' + data.user_agent);
-	}
-}
-
-async function testFingerprintDefault(){
-	await testFingerprint('none', 'Go')
-}
-
-async function testFingerprintChrome(){
-	await testFingerprint('chrome', 'Chrome')
-}
-
-async function testFingerprintFirefox(){
-	await testFingerprint('firefox', 'Firefox')
-}
-
-async function testFingerprintSafari(){
-	await testFingerprint('safari', 'Safari')
-}
 `)
 	if err != nil {
 		t.Fatal(err)
@@ -313,19 +288,6 @@ async function testFingerprintSafari(){
 	if err == nil || err.Error() != "timeout" {
 		t.Fatalf("timeout test failed, want %s, got %s", "timeout", err)
 	}
-
-	_, err = callTestFun(engine, "testFingerprintChrome")
-	if err != nil {
-		t.Fatal("testFingerprintChrome test failed", err)
-	}
-	_, err = callTestFun(engine, "testFingerprintFirefox")
-	if err != nil {
-		t.Fatal("testFingerprintFirefox test failed", err)
-	}
-	_, err = callTestFun(engine, "testFingerprintSafari")
-	if err != nil {
-		t.Fatal("testFingerprintSafari test failed", err)
-	}
 }
 
 func TestFetchWithProxy(t *testing.T) {
@@ -508,15 +470,6 @@ func startServer() net.Listener {
 			w.Write([]byte("ok"))
 		}
 	})
-	mux.HandleFunc("/ua", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json")
-		data := map[string]any{
-			"user_agent": r.UserAgent(),
-		}
-		buf, _ := json.Marshal(data)
-		w.WriteHeader(http.StatusOK)
-		w.Write(buf)
-	})
 	server.Handler = mux
 	go server.Serve(listener)
 	return listener

pkg/download/engine/inject/xhr/module.go

@@ -15,7 +15,6 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/formdata"
 	"github.com/GopeedLab/gopeed/pkg/download/engine/util"
 	"github.com/dop251/goja"
-	"github.com/imroc/req/v3"
 )
 
 const (
@@ -130,8 +129,7 @@ type XMLHttpRequest struct {
 	requestHeaders  http.Header
 	responseHeaders http.Header
 	aborted         bool
-	client          *req.Client
+	proxyHandler    func(r *http.Request) (*url.URL, error)
-	fingerprint     string
 
 	WithCredentials bool                  `json:"withCredentials"`
 	Upload          *XMLHttpRequestUpload `json:"upload"`
@@ -165,39 +163,25 @@ func (xhr *XMLHttpRequest) SetRequestHeader(key, value string) {
 }
 
 func (xhr *XMLHttpRequest) Send(data goja.Value) {
-	setFingerprint(xhr.client, xhr.fingerprint)
+	var req *http.Request
-
+	var err error
 	d := xhr.parseData(data)
 	var (
 		contentType   string
 		contentLength int64
 		isStringBody  bool
 	)
-
+	if d == nil || xhr.method == "GET" || xhr.method == "HEAD" {
-	// Create request using req library
+		req, err = http.NewRequest(xhr.method, xhr.url, nil)
-	reqBuilder := xhr.client.R()
+	} else {
-
-	// Set headers first
-	if xhr.requestHeaders != nil {
-		for key, values := range xhr.requestHeaders {
-			if len(values) > 0 {
-				// Merge multiple values with comma separator (HTTP standard)
-				mergedValue := strings.Join(values, ", ")
-				reqBuilder.SetHeader(key, mergedValue)
-			}
-		}
-	}
-
-	// Handle request body
-	if d != nil && xhr.method != "GET" && xhr.method != "HEAD" {
 		switch v := d.(type) {
 		case string:
-			reqBuilder.SetBody(v)
+			req, err = http.NewRequest(xhr.method, xhr.url, bytes.NewBufferString(v))
 			contentType = "text/plain;charset=UTF-8"
 			contentLength = int64(len(v))
 			isStringBody = true
 		case *file.File:
-			reqBuilder.SetBody(v.Reader)
+			req, err = http.NewRequest(xhr.method, xhr.url, v.Reader)
 			contentType = "application/octet-stream"
 			contentLength = v.Size
 		case *formdata.FormData:
@@ -219,24 +203,30 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
 				defer mw.Close()
 				mw.Send()
 			}()
-			reqBuilder.SetBody(pr)
+			req, err = http.NewRequest(xhr.method, xhr.url, pr)
 			contentType = mw.FormDataContentType()
 			contentLength = mw.Size()
 		}
 	}
-
+	if err != nil {
+		xhr.callOnerror()
+		return
+	}
+	req.Header = xhr.requestHeaders
 	// Only string body can specify Content-Type header by user
-	if contentType != "" && (!isStringBody || xhr.requestHeaders.Get("Content-Type") == "") {
+	if contentType != "" && (!isStringBody || req.Header.Get("Content-Type") == "") {
-		reqBuilder.SetHeader("Content-Type", contentType)
+		req.Header.Set("Content-Type", contentType)
 	}
-
+	if contentLength > 0 {
-	// Set timeout
+		req.ContentLength = contentLength
-	if xhr.Timeout > 0 {
-		xhr.client.SetTimeout(time.Duration(xhr.Timeout) * time.Millisecond)
 	}
-
+	transport := &http.Transport{
-	// Configure redirect behavior
+		Proxy: xhr.proxyHandler,
-	xhr.client.SetRedirectPolicy(func(req *http.Request, via []*http.Request) error {
+	}
+	client := &http.Client{
+		Transport: transport,
+		Timeout:   time.Duration(xhr.Timeout) * time.Millisecond,
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
 			if xhr.Redirect == redirectManual {
 				return http.ErrUseLastResponse
 			}
@@ -247,10 +237,9 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
 				return errors.New("too many redirects")
 			}
 			return nil
-	})
+		},
-
+	}
-	// Execute request
+	resp, err := client.Do(req)
-	resp, err := reqBuilder.Send(xhr.method, xhr.url)
 	if err != nil {
 		// handle timeout error
 		var ne net.Error
@@ -265,37 +254,35 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
 		xhr.callOnerror()
 		return
 	}
-
+	defer resp.Body.Close()
 	xhr.Upload.callOnprogress(contentLength, contentLength)
 	if !xhr.aborted {
 		xhr.Upload.callOnload()
 	}
 
-	// Set response URL (final URL after redirects)
+	responseUrl := resp.Request.URL
-	if resp.Response != nil && resp.Response.Request != nil && resp.Response.Request.URL != nil {
-		responseUrl := resp.Response.Request.URL
 	responseUrl.Fragment = ""
 	xhr.ResponseUrl = responseUrl.String()
-	} else {
-		xhr.ResponseUrl = xhr.url
-	}
 
-	// Set response headers
 	xhr.responseHeaders = resp.Header
 	xhr.Status = resp.StatusCode
 	xhr.StatusText = resp.Status
 	xhr.doReadystatechange(2)
-
+	buf, err := io.ReadAll(resp.Body)
-	bodyBytes := resp.Bytes()
+	if err != nil {
+		xhr.callOnerror()
+		return
+	}
 	xhr.doReadystatechange(3)
-	xhr.Response = string(bodyBytes)
+	xhr.Response = string(buf)
 	xhr.ResponseText = xhr.Response
 	xhr.doReadystatechange(4)
-	respBodyLen := int64(len(bodyBytes))
+	respBodyLen := int64(len(buf))
 	xhr.callOnprogress(respBodyLen, respBodyLen)
 	if !xhr.aborted {
 		xhr.callOnload()
 	}
+	return
 }
 
 func (xhr *XMLHttpRequest) Abort() {
@@ -306,9 +293,6 @@ func (xhr *XMLHttpRequest) Abort() {
 }
 
 func (xhr *XMLHttpRequest) GetResponseHeader(key string) string {
-	if xhr.responseHeaders == nil {
-		return ""
-	}
 	return strings.Join(xhr.responseHeaders.Values(key), ", ")
 }
 
@@ -375,15 +359,8 @@ func Enable(runtime *goja.Runtime, proxyHandler func(r *http.Request) (*url.URL,
 		return instanceValue
 	})
 	xhr := runtime.ToValue(func(call goja.ConstructorCall) *goja.Object {
-		// Create req client with proxy support
-		client := req.C()
-		if proxyHandler != nil {
-			client.SetProxy(proxyHandler)
-		}
-
 		instance := &XMLHttpRequest{
-			client:      client,
+			proxyHandler: proxyHandler,
-			fingerprint: util.SafeGet[string](runtime, FingerprintMagicKey),
 			Upload: &XMLHttpRequestUpload{
 				EventProp: &EventProp{
 					eventListeners: make(map[string]func(event *ProgressEvent)),
@@ -397,9 +374,6 @@ func Enable(runtime *goja.Runtime, proxyHandler func(r *http.Request) (*url.URL,
 		instanceValue.SetPrototype(call.This.Prototype())
 		return instanceValue
 	})
-	runtime.Set("__gopeed_setFingerprint", func(fingerprint string) {
-		runtime.Set(FingerprintMagicKey, fingerprint)
-	})
 	if err := runtime.Set("ProgressEvent", progressEvent); err != nil {
 		return err
 	}

pkg/download/engine/inject/xhr/tls_fingerprint.go

@@ -1,24 +0,0 @@
-package xhr
-
-import "github.com/imroc/req/v3"
-
-type Fingerprint string
-
-const (
-	FingerprintMagicKey = "__gopeed_xhr_fingerprint"
-
-	fingerprintChrome  = "chrome"
-	fingerprintFirefox = "firefox"
-	fingerprintSafari  = "safari"
-)
-
-func setFingerprint(client *req.Client, fingerprint string) {
-	switch fingerprint {
-	case fingerprintChrome:
-		client.ImpersonateChrome()
-	case fingerprintFirefox:
-		client.ImpersonateFirefox()
-	case fingerprintSafari:
-		client.ImpersonateSafari()
-	}
-}

pkg/download/engine/util/util.go

@@ -22,16 +22,3 @@ func AssertError[T error](err error) (t T, r bool) {
 	}
 	return
 }
-
-func SafeGet[T any](vm *goja.Runtime, name string) T {
-	v := vm.Get(name)
-	if v == nil {
-		var init T
-		return init
-	}
-	if e, ok := v.Export().(T); ok {
-		return e
-	}
-	var init T
-	return init
-}

pkg/download/model.go

@@ -100,27 +100,16 @@ func (t *Task) clone() *Task {
 	return util.DeepClone(t)
 }
 
-func (t *Task) updateSpeed(downloaded int64, usedTime float64) int64 {
+func (t *Task) calcSpeed(speedArr []int64, downloaded int64, usedTime float64) int64 {
-	return calcSpeed(&t.speedArr, downloaded, usedTime)
+	speedArr = append(speedArr, downloaded)
+	if len(speedArr) > 6 {
+		speedArr = speedArr[1:]
 	}
-
-func (t *Task) updateUploadSpeed(downloaded int64, usedTime float64) int64 {
-	return calcSpeed(&t.uploadSpeedArr, downloaded, usedTime)
-}
-
-func calcSpeed(speedArr *[]int64, downloaded int64, usedTime float64) int64 {
-	*speedArr = append(*speedArr, downloaded)
-	// Record last 5 seconds of download speed to calculate the average speed
-	if len(*speedArr) > int(5.0/usedTime) {
-		*speedArr = (*speedArr)[1:]
-	}
-
 	var total int64
-	for _, v := range *speedArr {
+	for _, v := range speedArr {
 		total += v
 	}
-
+	return int64(float64(total) / float64(len(speedArr)) / usedTime)
-	return int64(float64(total) / float64(len(*speedArr)) / usedTime)
 }
 
 type TaskFilter struct {
@@ -137,10 +126,10 @@ type DownloaderConfig struct {
 	Controller    *controller.Controller
 	FetchManagers []fetcher.FetcherManager
 
-	RefreshInterval   int // RefreshInterval time duration to refresh task progress(ms)
+	RefreshInterval      int `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms)
 	Storage              Storage
 	StorageDir           string
-	WhiteDownloadDirs []string
+	DownloadDirWhiteList []string `json:"downloadDirWhiteList"`
 
 	ProductionMode bool
 

pkg/protocol/http/model.go

@@ -14,12 +14,6 @@ type OptsExtra struct {
 
 // Stats for download
 type Stats struct {
-	Connections []*StatsConnection `json:"connections"`
+	// http stats
-}
+	// health indicators of http
-
-type StatsConnection struct {
-	Downloaded int64 `json:"downloaded"`
-	Completed  bool  `json:"completed"`
-	Failed     bool  `json:"failed"`
-	RetryTimes int   `json:"retryTimes"`
 }

pkg/rest/api.go

@@ -58,13 +58,13 @@ func CreateTask(w http.ResponseWriter, r *http.Request) {
 }
 
 func CreateTaskBatch(w http.ResponseWriter, r *http.Request) {
-	var req base.CreateTaskBatch
+	var req model.CreateTaskBatch
 	if ReadJson(r, w, &req) {
 		if len(req.Reqs) == 0 {
 			WriteJson(w, model.NewErrorResult("param invalid: reqs", model.CodeInvalidParam))
 			return
 		}
-		taskIds, err := Downloader.CreateDirectBatch(&req)
+		taskIds, err := Downloader.CreateDirectBatch(req.Reqs, req.Opt)
 		if err != nil {
 			WriteJson(w, model.NewErrorResult(err.Error()))
 			return
@@ -309,8 +309,6 @@ func DoProxy(w http.ResponseWriter, r *http.Request) {
 	r.RequestURI = ""
 	r.URL = targetUrl
 	r.Host = targetUrl.Host
-	r.Header.Del("Authorization")
-	r.Header.Del("X-Target-Uri")
 	resp, err := http.DefaultClient.Do(r)
 	if err != nil {
 		writeError(w, err.Error())

pkg/rest/gizp_middleware.go

@@ -1,34 +0,0 @@
-package rest
-
-import (
-	"compress/gzip"
-	"io"
-	"net/http"
-	"strings"
-)
-
-type gzipResponseWriter struct {
-	io.Writer
-	http.ResponseWriter
-}
-
-func (g gzipResponseWriter) Write(b []byte) (int, error) {
-	return g.Writer.Write(b)
-}
-
-func gzipMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if !strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		w.Header().Set("Content-Encoding", "gzip")
-		w.Header().Add("Vary", "Accept-Encoding")
-
-		gz := gzip.NewWriter(w)
-		defer gz.Close()
-
-		next.ServeHTTP(gzipResponseWriter{Writer: gz, ResponseWriter: w}, r)
-	})
-}

pkg/rest/model/server.go

@@ -1,6 +1,7 @@
 package model
 
 import (
+	"encoding/base64"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"io/fs"
 )
@@ -26,7 +27,7 @@ type StartConfig struct {
 
 	WebEnable    bool
 	WebFS        fs.FS
-	WebAuth   *WebAuth
+	WebBasicAuth *WebBasicAuth
 }
 
 func (cfg *StartConfig) Init() *StartConfig {
@@ -48,7 +49,13 @@ func (cfg *StartConfig) Init() *StartConfig {
 	return cfg
 }
 
-type WebAuth struct {
+type WebBasicAuth struct {
 	Username string
 	Password string
 }
+
+// Authorization returns the value of the Authorization header to be used in HTTP requests.
+func (cfg *WebBasicAuth) Authorization() string {
+	userId := cfg.Username + ":" + cfg.Password
+	return "Basic " + base64.StdEncoding.EncodeToString([]byte(userId))
+}

pkg/rest/model/task.go

@@ -7,3 +7,8 @@ type CreateTask struct {
 	Req *base.Request `json:"req"`
 	Opt *base.Options `json:"opt"`
 }
+
+type CreateTaskBatch struct {
+	Reqs []*base.Request `json:"reqs"`
+	Opt  *base.Options   `json:"opt"`
+}

pkg/rest/server.go

@@ -2,10 +2,6 @@ package rest
 
 import (
 	"context"
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/rand"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"github.com/GopeedLab/gopeed/pkg/download"
@@ -14,22 +10,17 @@ import (
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
-	"io"
-	"io/fs"
 	"net"
 	"net/http"
 	"os"
 	"path/filepath"
 	"regexp"
-	"strconv"
 	"strings"
-	"time"
 )
 
 var (
 	srv         *http.Server
 	runningPort int
-	aesKey      []byte
 
 	Downloader *download.Downloader
 )
@@ -65,9 +56,7 @@ func Stop() {
 	}()
 
 	if srv != nil {
-		shutdownCtx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+		if err := srv.Shutdown(context.TODO()); err != nil {
-		defer cancel()
-		if err := srv.Shutdown(shutdownCtx); err != nil {
 			Downloader.Logger.Warn().Err(err).Msg("shutdown server failed")
 		}
 	}
@@ -87,7 +76,6 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 	downloadCfg := &download.DownloaderConfig{
 		ProductionMode:  startCfg.ProductionMode,
 		RefreshInterval: startCfg.RefreshInterval,
-		WhiteDownloadDirs: startCfg.WhiteDownloadDirs,
 	}
 	if startCfg.Storage == model.StorageBolt {
 		downloadCfg.Storage = download.NewBoltStorage(startCfg.StorageDir)
@@ -105,13 +93,6 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 		util.SafeRemove(startCfg.Address)
 	}
 
-	if startCfg.WebEnable {
-		aesKey = make([]byte, 32)
-		if _, err := rand.Read(aesKey); err != nil {
-			return nil, nil, errors.Wrap(err, "generate aes key failed")
-		}
-	}
-
 	listener, err := net.Listen(startCfg.Network, startCfg.Address)
 	if err != nil {
 		return nil, nil, err
@@ -142,94 +123,27 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 	r.Methods(http.MethodGet).Path("/api/v1/extensions/{identity}/update").HandlerFunc(UpdateCheckExtension)
 	r.Methods(http.MethodPost).Path("/api/v1/extensions/{identity}/update").HandlerFunc(UpdateExtension)
 	r.Path("/api/v1/proxy").HandlerFunc(DoProxy)
-
-	enableApiToken := startCfg.ApiToken != ""
-	enableBasicAuth := startCfg.WebEnable && startCfg.WebAuth != nil
 	if startCfg.WebEnable {
-		if enableBasicAuth {
-			r.Methods(http.MethodPost).Path("/api/web/login").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				var loginReq model.WebAuth
-				if ReadJson(r, w, &loginReq) {
-					if loginReq.Username == startCfg.WebAuth.Username && loginReq.Password == startCfg.WebAuth.Password {
-						// Generate a login token, Username:Password:Timestamp
-						timestamp := time.Now().Unix()
-						tokenData := fmt.Sprintf("%s:%s:%d", loginReq.Username, loginReq.Password, timestamp)
-						token, err := aesEncrypt(aesKey, []byte(tokenData))
-						if err != nil {
-							WriteJson(w, model.NewErrorResult(err.Error()))
-							return
-						}
-
-						WriteJson(w, model.NewOkResult(token))
-						return
-					}
-				}
-				WriteStatusJson(w, http.StatusUnauthorized, model.NewErrorResult("unauthorized", model.CodeUnauthorized))
-			})
-		}
 		r.PathPrefix("/fs/tasks").Handler(http.FileServer(new(taskFileSystem)))
 		r.PathPrefix("/fs/extensions").Handler(http.FileServer(new(extensionFileSystem)))
-		r.PathPrefix("/").Handler(gzipMiddleware(http.FileServer(newEmbedCacheFileSystem(http.FS(startCfg.WebFS)))))
+		r.PathPrefix("/").Handler(http.FileServer(http.FS(startCfg.WebFS)))
-	}
-	if enableApiToken || enableBasicAuth {
-		writeUnauthorized := func(w http.ResponseWriter, r *http.Request) {
-			WriteStatusJson(w, http.StatusUnauthorized, model.NewErrorResult("unauthorized", model.CodeUnauthorized))
 	}
 
+	if startCfg.ApiToken != "" || (startCfg.WebEnable && startCfg.WebBasicAuth != nil) {
 		r.Use(func(h http.Handler) http.Handler {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				if enableApiToken {
+				if startCfg.ApiToken != "" && r.Header.Get("X-Api-Token") == startCfg.ApiToken {
-					apiTokenHeader := r.Header["X-Api-Token"]
-					// If api token header is set, only check api token ignore basic auth
-					if len(apiTokenHeader) > 0 {
-						if apiTokenHeader[0] == startCfg.ApiToken {
 					h.ServeHTTP(w, r)
 					return
 				}
-
+				if startCfg.WebEnable && startCfg.WebBasicAuth != nil {
-						writeUnauthorized(w, r)
+					if r.Header.Get("Authorization") == startCfg.WebBasicAuth.Authorization() {
-						return
-					}
-				}
-
-				if enableBasicAuth {
-					if !strings.HasPrefix(r.URL.Path, "/api/") || r.URL.Path == "/api/web/login" {
 						h.ServeHTTP(w, r)
 						return
 					}
-
+					w.Header().Set("WWW-Authenticate", "Basic realm=\"gopeed web\"")
-					token := r.Header.Get("Authorization")
-					if token == "" {
-						writeUnauthorized(w, r)
-						return
 				}
-
+				WriteStatusJson(w, http.StatusUnauthorized, model.NewErrorResult("unauthorized", model.CodeUnauthorized))
-					token = strings.TrimPrefix(token, "Bearer ")
-					tokenData, err := aesDecrypt(aesKey, token)
-					if err != nil {
-						writeUnauthorized(w, r)
-						return
-					}
-					parts := strings.SplitN(string(tokenData), ":", 3)
-					username := parts[0]
-					password := parts[1]
-					timestamp, _ := strconv.Atoi(parts[2])
-
-					if username != startCfg.WebAuth.Username || password != startCfg.WebAuth.Password {
-						writeUnauthorized(w, r)
-						return
-					}
-
-					// Check if the token is expired (7 days)
-					if time.Now().Unix()-int64(timestamp) > 7*24*3600 {
-						writeUnauthorized(w, r)
-						return
-					}
-
-					h.ServeHTTP(w, r)
-					return
-				}
-				writeUnauthorized(w, r)
 			})
 		})
 	}
@@ -249,10 +163,9 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 	})
 
 	srv = &http.Server{Handler: handlers.CORS(
-		handlers.AllowedHeaders([]string{"Content-Type", "Authorization", "X-Api-Token", "X-Target-Uri"}),
+		handlers.AllowedHeaders([]string{"Content-Type", "X-Api-Token", "X-Target-Uri"}),
 		handlers.AllowedMethods([]string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"}),
 		handlers.AllowedOrigins([]string{"*"}),
-		handlers.AllowCredentials(),
 	)(r)}
 	return srv, listener, nil
 }
@@ -309,68 +222,6 @@ func (e *extensionFileSystem) Open(name string) (http.File, error) {
 	return os.Open(filepath.Join(extensionPath, path))
 }
 
-type embedCacheFileSystem struct {
-	fs          http.FileSystem
-	lastModTime time.Time
-}
-
-func newEmbedCacheFileSystem(fs http.FileSystem) *embedCacheFileSystem {
-	efs := &embedCacheFileSystem{
-		fs:          fs,
-		lastModTime: time.Now(),
-	}
-
-	exe, err := os.Executable()
-	if err != nil {
-		return efs
-	}
-
-	fi, err := os.Stat(exe)
-	if err != nil {
-		return efs
-	}
-
-	efs.lastModTime = fi.ModTime()
-	return efs
-}
-
-func (e *embedCacheFileSystem) Open(name string) (http.File, error) {
-	file, err := e.fs.Open(name)
-	if err != nil {
-		return nil, err
-	}
-
-	return &embedFile{
-		File:        file,
-		lastModTime: e.lastModTime,
-	}, nil
-}
-
-type embedFile struct {
-	http.File
-	lastModTime time.Time
-}
-
-type embedFileInfo struct {
-	fs.FileInfo
-	lastModTime time.Time
-}
-
-func (e *embedFileInfo) ModTime() time.Time {
-	return e.lastModTime
-}
-
-func (e *embedFile) Stat() (fs.FileInfo, error) {
-	fi, err := e.File.Stat()
-	if err != nil {
-		return nil, err
-	}
-	return &embedFileInfo{
-		FileInfo:    fi,
-		lastModTime: e.lastModTime,
-	}, nil
-}
-
 func ReadJson(r *http.Request, w http.ResponseWriter, v any) bool {
 	if err := json.NewDecoder(r.Body).Decode(v); err != nil {
 		WriteJson(w, model.NewErrorResult(err.Error()))
@@ -388,47 +239,3 @@ func WriteStatusJson(w http.ResponseWriter, statusCode int, v any) {
 	w.WriteHeader(statusCode)
 	json.NewEncoder(w).Encode(v)
 }
-
-func aesEncrypt(key, data []byte) (string, error) {
-	block, err := aes.NewCipher(key)
-	if err != nil {
-		return "", err
-	}
-
-	gcm, err := cipher.NewGCM(block)
-	if err != nil {
-		return "", err
-	}
-
-	nonce := make([]byte, gcm.NonceSize())
-	if _, err := io.ReadFull(rand.Reader, nonce); err != nil {
-		return "", err
-	}
-
-	cipherText := gcm.Seal(nonce, nonce, data, nil)
-	return base64.StdEncoding.EncodeToString(cipherText), nil
-}
-
-func aesDecrypt(key []byte, encryptedData string) ([]byte, error) {
-	cipherText, err := base64.StdEncoding.DecodeString(encryptedData)
-	if err != nil {
-		return nil, err
-	}
-
-	block, err := aes.NewCipher(key)
-	if err != nil {
-		return nil, err
-	}
-
-	gcm, err := cipher.NewGCM(block)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(cipherText) < gcm.NonceSize() {
-		return nil, errors.New("ciphertext too short")
-	}
-
-	nonce, cipherText := cipherText[:gcm.NonceSize()], cipherText[gcm.NonceSize():]
-	return gcm.Open(nil, nonce, cipherText, nil)
-}

pkg/rest/server_test.go

@@ -14,9 +14,7 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"path/filepath"
 	"reflect"
-	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -141,13 +139,11 @@ func TestCreateDirectTask(t *testing.T) {
 
 func TestCreateDirectTaskBatch(t *testing.T) {
 	doTest(func() {
-		reqs := make([]*base.CreateTaskBatchItem, 0)
+		reqs := make([]*base.Request, 0)
 		for i := 0; i < 5; i++ {
-			reqs = append(reqs, &base.CreateTaskBatchItem{
+			reqs = append(reqs, createReq.Req)
-				Req: createReq.Req,
-			})
 		}
-		taskIds := httpRequestCheckOk[[]string](http.MethodPost, "/api/v1/tasks/batch", &base.CreateTaskBatch{
+		taskIds := httpRequestCheckOk[[]string](http.MethodPost, "/api/v1/tasks/batch", &model.CreateTaskBatch{
 			Reqs: reqs,
 		})
 		if len(taskIds) != len(reqs) {
@@ -156,45 +152,6 @@ func TestCreateDirectTaskBatch(t *testing.T) {
 	})
 }
 
-func TestCreateDirectTaskBatchWithOpt(t *testing.T) {
-	doTest(func() {
-		reqs := make([]*base.CreateTaskBatchItem, 0)
-		for i := 0; i < 5; i++ {
-			item := &base.CreateTaskBatchItem{
-				Req: createReq.Req,
-			}
-			if i == 0 {
-				item.Opts = &base.Options{
-					Name: "spe_opt.data",
-				}
-			}
-			reqs = append(reqs, item)
-		}
-		taskIds := httpRequestCheckOk[[]string](http.MethodPost, "/api/v1/tasks/batch", &base.CreateTaskBatch{
-			Reqs: reqs,
-			Opts: &base.Options{
-				Name: "default_opt.data",
-			},
-		})
-		if len(taskIds) != len(reqs) {
-			t.Errorf("CreateDirectTaskBatch() got = %v, want %v", len(taskIds), len(reqs))
-		}
-
-		for i, taskId := range taskIds {
-			task := httpRequestCheckOk[*download.Task](http.MethodGet, "/api/v1/tasks/"+taskId, nil)
-			if i == 0 {
-				if !strings.Contains(task.Name(), "spe_opt") {
-					t.Errorf("CreateDirectTaskBatch() got = %v, want %v", task.Name(), "spe_opt.data")
-				}
-			} else {
-				if !strings.Contains(task.Name(), "default_opt") {
-					t.Errorf("CreateDirectTaskBatch() got = %v, want %v", task.Name(), "default_opt.data")
-				}
-			}
-		}
-	})
-}
-
 func TestCreateDirectTaskWithResoled(t *testing.T) {
 	doTest(func() {
 		var wg sync.WaitGroup
@@ -521,66 +478,6 @@ func TestFsExtensionFail(t *testing.T) {
 	})
 }
 
-func TestWebFsEnhance(t *testing.T) {
-	indexHtml := `
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="UTF-8">
-	<title>index</title>
-</head>
-<body>
-	<h1>index</h1>
-</body>
-</html>
-`
-	webDistPath := "dist"
-	os.MkdirAll("dist", os.ModePerm)
-	if err := os.WriteFile(filepath.Join(webDistPath, "index.html"), []byte(indexHtml), os.ModePerm); err != nil {
-		panic(err)
-	}
-	defer os.RemoveAll(webDistPath)
-
-	doTest0(func(cfg *model.StartConfig) {
-		cfg.WebFS = os.DirFS(webDistPath)
-	}, func() {
-		// First request no cache
-		code, header, _ := doHttpRequest1(http.MethodGet, "/index.html", map[string]string{
-			"Accept-Encoding": "gzip",
-		}, nil)
-		if code != http.StatusOK {
-			t.Errorf("TestWebFsEnhance() got = %v, want %v", code, http.StatusOK)
-		}
-		// Check header last-modified
-		if _, ok := header["Last-Modified"]; !ok {
-			t.Errorf("TestWebFsEnhance() missing key = %v", "Last-Modified")
-		}
-		// Check gzip compress
-		if _, ok := header["Content-Encoding"]; !ok || header["Content-Encoding"] != "gzip" {
-			t.Errorf("TestWebFsEnhance() no gzip compress")
-		}
-
-		// Request with If-Modified-Since
-		ifModifiedSince := header["Last-Modified"]
-		code, _, _ = doHttpRequest1(http.MethodGet, "/index.html", map[string]string{
-			"If-Modified-Since": ifModifiedSince,
-		}, nil)
-		if code != http.StatusNotModified {
-			t.Errorf("TestWebFsEnhance() got = %v, want %v", code, http.StatusNotModified)
-		}
-
-		// Request with un gzip
-		code, header, _ = doHttpRequest1(http.MethodGet, "/index.html?t=123", nil, nil)
-		if code != http.StatusOK {
-			t.Errorf("TestWebFsEnhance() got = %v, want %v", code, http.StatusOK)
-		}
-		// Check no gzip compress
-		if _, ok := header["Content-Encoding"]; ok && header["Content-Encoding"] == "gzip" {
-			t.Errorf("TestWebFsEnhance() has gzip compress")
-		}
-	})
-}
-
 func TestDoProxy(t *testing.T) {
 	doTest(func() {
 		code, respBody := doHttpRequest0(http.MethodGet, "/api/v1/proxy", map[string]string{
@@ -637,7 +534,7 @@ func TestAuthorization(t *testing.T) {
 	cfg.Init()
 	cfg.ApiToken = "123456"
 	cfg.WebEnable = true
-	cfg.WebAuth = &model.WebAuth{
+	cfg.WebBasicAuth = &model.WebBasicAuth{
 		Username: "admin",
 		Password: "123456",
 	}
@@ -649,61 +546,14 @@ func TestAuthorization(t *testing.T) {
 		Stop()
 	}()
 
-	status, _ := doHttpRequest0(http.MethodPost, "/api/web/login", nil, &model.WebAuth{
+	status, _ := doHttpRequest0(http.MethodGet, "/api/v1/config", nil, nil)
-		Username: "xxx",
-		Password: "xxx",
-	})
-	if status != http.StatusUnauthorized {
-		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusUnauthorized)
-	}
-
-	token := httpRequestCheckOk[string](http.MethodPost, "/api/web/login", cfg.WebAuth)
-	authToken := fmt.Sprintf("Bearer %s", token)
-	authHeaders := map[string]string{
-		"Authorization": authToken,
-	}
-
-	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", nil, nil)
 	if status != http.StatusUnauthorized {
 		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusUnauthorized)
 	}
 
 	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
-		"Authorization": "xxx",
+		"Authorization": cfg.WebBasicAuth.Authorization(),
 	}, nil)
-	if status != http.StatusUnauthorized {
-		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusUnauthorized)
-	}
-
-	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
-		"Authorization": "xxx",
-	}, nil)
-	if status != http.StatusUnauthorized {
-		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusUnauthorized)
-	}
-
-	buildToken := func(username, password string, ts int64) string {
-		token, _ := aesEncrypt(aesKey, []byte(fmt.Sprintf("%s:%s:%d", username, password, ts)))
-		return token
-	}
-
-	fakeToken := buildToken("fake", "fake", time.Now().Unix())
-	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
-		"Authorization": fmt.Sprintf("Bearer %s", fakeToken),
-	}, nil)
-	if status != http.StatusUnauthorized {
-		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusUnauthorized)
-	}
-
-	expireToken := buildToken(cfg.WebAuth.Username, cfg.WebAuth.Password, time.Now().Add(-time.Hour*8*24).Unix())
-	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
-		"Authorization": fmt.Sprintf("Bearer %s", expireToken),
-	}, nil)
-	if status != http.StatusUnauthorized {
-		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusUnauthorized)
-	}
-
-	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", authHeaders, nil)
 	if status != http.StatusOK {
 		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusOK)
 	}
@@ -714,38 +564,15 @@ func TestAuthorization(t *testing.T) {
 	if status != http.StatusOK {
 		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusOK)
 	}
-
-	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
-		"Authorization": authToken,
-		"X-Api-Token":   cfg.ApiToken,
-	}, nil)
-	if status != http.StatusOK {
-		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusOK)
-	}
-
-	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
-		"Authorization": authToken,
-		"X-Api-Token":   "",
-	}, nil)
-	if status != http.StatusUnauthorized {
-		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusUnauthorized)
-	}
 }
 
 func doTest(handler func()) {
-	doTest0(nil, handler)
-}
-
-func doTest0(onStart func(cfg *model.StartConfig), handler func()) {
 	testFunc := func(storage model.Storage) {
 		var cfg = &model.StartConfig{}
 		cfg.Init()
 		cfg.Storage = storage
 		cfg.StorageDir = ".test_storage"
 		cfg.WebEnable = true
-		if onStart != nil {
-			onStart(cfg)
-		}
 		fileListener := doStart(cfg)
 		defer func() {
 			if err := fileListener.Close(); err != nil {
@@ -755,7 +582,6 @@ func doTest0(onStart func(cfg *model.StartConfig), handler func()) {
 			Downloader.Clear()
 		}()
 		defer func() {
-			time.Sleep(500 * time.Millisecond)
 			Downloader.Pause(nil)
 			Downloader.Delete(nil, true)
 			os.RemoveAll(cfg.StorageDir)
@@ -777,11 +603,6 @@ func doStart(cfg *model.StartConfig) net.Listener {
 }
 
 func doHttpRequest0(method string, path string, headers map[string]string, body any) (int, []byte) {
-	r1, _, r3 := doHttpRequest1(method, path, headers, body)
-	return r1, r3
-}
-
-func doHttpRequest1(method string, path string, headers map[string]string, body any) (int, map[string]string, []byte) {
 	var reader io.Reader
 	if body != nil {
 		buf, _ := json.Marshal(body)
@@ -802,18 +623,12 @@ func doHttpRequest1(method string, path string, headers map[string]string, body
 		panic(err)
 	}
 	defer response.Body.Close()
-
-	respHeader := make(map[string]string)
-	for k, vv := range response.Header {
-		respHeader[k] = vv[0]
-	}
-
 	respBody, err := io.ReadAll(response.Body)
 	if err != nil {
 		panic(err)
 	}
 
-	return response.StatusCode, respHeader, respBody
+	return response.StatusCode, respBody
 }
 
 func doHttpRequest[T any](method string, path string, headers map[string]string, body any) (int, *model.Result[T]) {

pkg/util/url.go

@@ -56,13 +56,3 @@ func ProxyUrlToHandler(proxyUrl *url.URL) func(*http.Request) (*url.URL, error)
 	}
 	return http.ProxyURL(proxyUrl)
 }
-
-// TryUrlQueryUnescape tries to unescape a URL-encoded string.
-//
-// If unescaping fails, it returns the original string.
-func TryUrlQueryUnescape(s string) string {
-	if decoded, err := url.QueryUnescape(s); err == nil {
-		return decoded
-	}
-	return s
-}

pkg/util/url_test.go

@@ -128,24 +128,3 @@ func TestParseDataUri(t *testing.T) {
 		})
 	}
 }
-
-func TestTryURLDecode(t *testing.T) {
-	tests := []struct {
-		input    string
-		expected string
-	}{
-		{"normal.txt", "normal.txt"},
-		{"%E7%8F%80%E5%B0%94%E8%AF%BA.zip", "珀尔诺.zip"},
-		{"hello%20world.txt", "hello world.txt"},
-		{"bad%2-text", "bad%2-text"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.input, func(t *testing.T) {
-			got := TryUrlQueryUnescape(tt.input)
-			if got != tt.expected {
-				t.Errorf("TryUrlQueryUnescape(%q) = %q, want %q", tt.input, got, tt.expected)
-			}
-		})
-	}
-}

ui/flutter/lib/api/api.dart

@@ -3,24 +3,19 @@ import 'dart:io';
 import 'package:dio/dio.dart';
 import 'package:dio/io.dart';
 import 'package:flutter/foundation.dart';
-import 'package:get/get.dart' as getx;
+import 'package:gopeed/api/model/extension.dart';
+import 'package:gopeed/api/model/install_extension.dart';
+import 'package:gopeed/api/model/switch_extension.dart';
 
-import '../app/routes/app_pages.dart';
-import '../database/database.dart';
 import '../util/util.dart';
 import 'model/create_task.dart';
-import 'model/create_task_batch.dart';
 import 'model/downloader_config.dart';
-import 'model/extension.dart';
-import 'model/install_extension.dart';
-import 'model/login.dart';
 import 'model/request.dart';
 import 'model/resolve_result.dart';
 import 'model/result.dart';
-import 'model/switch_extension.dart';
 import 'model/task.dart';
-import 'model/update_check_extension_resp.dart';
 import 'model/update_extension_settings.dart';
+import 'model/update_check_extension_resp.dart';
 
 class _Client {
   static _Client? _instance;
@@ -34,12 +29,12 @@ class _Client {
       _instance = _Client._internal();
       var dio = Dio();
       final isUnixSocket = network == 'unix';
-      var baseUrl = 'http://127.0.0.1/';
+      var baseUrl = 'http://127.0.0.1';
       if (!isUnixSocket) {
         if (Util.isWeb()) {
-          baseUrl = kDebugMode ? 'http://127.0.0.1:9999/' : '';
+          baseUrl = kDebugMode ? 'http://127.0.0.1:9999' : '';
         } else {
-          baseUrl = 'http://$address/';
+          baseUrl = 'http://$address';
         }
       }
       dio.options.baseUrl = baseUrl;
@@ -47,27 +42,12 @@ class _Client {
       dio.options.sendTimeout = const Duration(seconds: 5);
       dio.options.connectTimeout = const Duration(seconds: 5);
       dio.options.receiveTimeout = const Duration(seconds: 60);
-      dio.interceptors.add(InterceptorsWrapper(
+      dio.interceptors.add(InterceptorsWrapper(onRequest: (options, handler) {
-        onRequest: (options, handler) {
         if (apiToken.isNotEmpty) {
           options.headers['X-Api-Token'] = apiToken;
         }
-          if (Util.isWeb()) {
-            final token = Database.instance.getWebToken();
-            if (token != null) {
-              options.headers['Authorization'] = 'Bearer $token';
-            }
-          }
         handler.next(options);
-        },
+      }));
-        onError: (error, handler) {
-          // Only web version has a login page
-          if (Util.isWeb() && error.response?.statusCode == 401) {
-            getx.Get.rootDelegate.offAndToNamed(Routes.LOGIN);
-          }
-          handler.next(error);
-        },
-      ));
 
       _instance!.dio = dio;
       if (isUnixSocket) {
@@ -115,8 +95,7 @@ Future<T> _parse<T>(
   } on DioException catch (e) {
     if (e.type == DioExceptionType.sendTimeout ||
         e.type == DioExceptionType.receiveTimeout ||
-        e.type == DioExceptionType.connectionTimeout ||
+        e.type == DioExceptionType.connectionTimeout) {
-        e.type == DioExceptionType.connectionError) {
       throw TimeoutException("request timeout");
     }
     throw Exception(Result(code: 1000, msg: e.message));
@@ -125,22 +104,16 @@ Future<T> _parse<T>(
 
 Future<ResolveResult> resolve(Request request) async {
   return _parse<ResolveResult>(
-      () => _client.dio.post("api/v1/resolve", data: request),
+      () => _client.dio.post("/api/v1/resolve", data: request),
       (data) => ResolveResult.fromJson(data));
 }
 
 Future<String> createTask(CreateTask createTask) async {
   return _parse<String>(
-      () => _client.dio.post("api/v1/tasks", data: createTask),
+      () => _client.dio.post("/api/v1/tasks", data: createTask),
       (data) => data as String);
 }
 
-Future<List<String>> createTaskBatch(CreateTaskBatch createTaskBatch) async {
-  return _parse<List<String>>(
-      () => _client.dio.post("api/v1/tasks/batch", data: createTaskBatch),
-      (data) => (data as List).map((e) => e as String).toList());
-}
-
 Future<List<Task>> getTasks(List<Status> statuses) async {
   return _parse<List<Task>>(
       () => _client.dio.get(
@@ -149,16 +122,16 @@ Future<List<Task>> getTasks(List<Status> statuses) async {
 }
 
 Future<void> pauseTask(String id) async {
-  return _parse(() => _client.dio.put("api/v1/tasks/$id/pause"), null);
+  return _parse(() => _client.dio.put("/api/v1/tasks/$id/pause"), null);
 }
 
 Future<void> continueTask(String id) async {
-  return _parse(() => _client.dio.put("api/v1/tasks/$id/continue"), null);
+  return _parse(() => _client.dio.put("/api/v1/tasks/$id/continue"), null);
 }
 
 Future<void> pauseAllTasks(List<String>? ids) async {
   return _parse(
-      () => _client.dio.put("api/v1/tasks/pause", queryParameters: {
+      () => _client.dio.put("/api/v1/tasks/pause", queryParameters: {
             "id": ids,
           }),
       null);
@@ -166,7 +139,7 @@ Future<void> pauseAllTasks(List<String>? ids) async {
 
 Future<void> continueAllTasks(List<String>? ids) async {
   return _parse(
-      () => _client.dio.put("api/v1/tasks/continue", queryParameters: {
+      () => _client.dio.put("/api/v1/tasks/continue", queryParameters: {
             "id": ids,
           }),
       null);
@@ -174,12 +147,12 @@ Future<void> continueAllTasks(List<String>? ids) async {
 
 Future<void> deleteTask(String id, bool force) async {
   return _parse(
-      () => _client.dio.delete("api/v1/tasks/$id?force=$force"), null);
+      () => _client.dio.delete("/api/v1/tasks/$id?force=$force"), null);
 }
 
 Future<void> deleteTasks(List<String>? ids, bool force) async {
   return _parse(
-      () => _client.dio.delete("api/v1/tasks", queryParameters: {
+      () => _client.dio.delete("/api/v1/tasks", queryParameters: {
             "id": ids,
             "force": force,
           }),
@@ -187,29 +160,29 @@ Future<void> deleteTasks(List<String>? ids, bool force) async {
 }
 
 Future<DownloaderConfig> getConfig() async {
-  return _parse(() => _client.dio.get("api/v1/config"),
+  return _parse(() => _client.dio.get("/api/v1/config"),
       (data) => DownloaderConfig.fromJson(data));
 }
 
 Future<void> putConfig(DownloaderConfig config) async {
-  return _parse(() => _client.dio.put("api/v1/config", data: config), null);
+  return _parse(() => _client.dio.put("/api/v1/config", data: config), null);
 }
 
 Future<void> installExtension(InstallExtension installExtension) async {
   return _parse(
-      () => _client.dio.post("api/v1/extensions", data: installExtension),
+      () => _client.dio.post("/api/v1/extensions", data: installExtension),
       null);
 }
 
 Future<List<Extension>> getExtensions() async {
-  return _parse<List<Extension>>(() => _client.dio.get("api/v1/extensions"),
+  return _parse<List<Extension>>(() => _client.dio.get("/api/v1/extensions"),
       (data) => (data as List).map((e) => Extension.fromJson(e)).toList());
 }
 
 Future<void> updateExtensionSettings(
     String identity, UpdateExtensionSettings updateExtensionSettings) async {
   return _parse(
-      () => _client.dio.put("api/v1/extensions/$identity/settings",
+      () => _client.dio.put("/api/v1/extensions/$identity/settings",
           data: updateExtensionSettings),
       null);
 }
@@ -218,27 +191,22 @@ Future<void> switchExtension(
     String identity, SwitchExtension switchExtension) async {
   return _parse(
       () => _client.dio
-          .put("api/v1/extensions/$identity/switch", data: switchExtension),
+          .put("/api/v1/extensions/$identity/switch", data: switchExtension),
       null);
 }
 
 Future<void> deleteExtension(String identity) async {
-  return _parse(() => _client.dio.delete("api/v1/extensions/$identity"), null);
+  return _parse(() => _client.dio.delete("/api/v1/extensions/$identity"), null);
 }
 
 Future<UpdateCheckExtensionResp> upgradeCheckExtension(String identity) async {
-  return _parse(() => _client.dio.get("api/v1/extensions/$identity/update"),
+  return _parse(() => _client.dio.get("/api/v1/extensions/$identity/update"),
       (data) => UpdateCheckExtensionResp.fromJson(data));
 }
 
 Future<void> updateExtension(String identity) async {
   return _parse(
-      () => _client.dio.post("api/v1/extensions/$identity/update"), null);
+      () => _client.dio.post("/api/v1/extensions/$identity/update"), null);
-}
-
-Future<String> login(LoginReq loginReq) async {
-  return _parse(() => _client.dio.post("api/web/login", data: loginReq),
-      (data) => data as String);
 }
 
 Future<Response<String>> proxyRequest<T>(String uri,
@@ -255,9 +223,5 @@ Future<Response<String>> proxyRequest<T>(String uri,
 }
 
 String join(String path) {
-  final baseUrl = _client.dio.options.baseUrl;
+  return "${_client.dio.options.baseUrl}/${Util.cleanPath(path)}";
-  final cleanBaseUrl = baseUrl.endsWith('/')
-      ? baseUrl.substring(0, baseUrl.length - 1)
-      : baseUrl;
-  return "$cleanBaseUrl/${Util.cleanPath(path)}";
 }

ui/flutter/lib/api/model/create_task_batch.dart

@@ -1,39 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-import 'options.dart';
-import 'request.dart';
-
-part 'create_task_batch.g.dart';
-
-@JsonSerializable(explicitToJson: true)
-class CreateTaskBatch {
-  List<CreateTaskBatchItem>? reqs;
-  Options? opt;
-
-  CreateTaskBatch({
-    this.reqs,
-    this.opt,
-  });
-
-  factory CreateTaskBatch.fromJson(
-    Map<String, dynamic> json,
-  ) =>
-      _$CreateTaskBatchFromJson(json);
-
-  Map<String, dynamic> toJson() => _$CreateTaskBatchToJson(this);
-}
-
-@JsonSerializable()
-class CreateTaskBatchItem {
-  Request? req;
-  Options? opts;
-
-  CreateTaskBatchItem({
-    this.req,
-    this.opts,
-  });
-
-  factory CreateTaskBatchItem.fromJson(Map<String, dynamic> json) =>
-      _$CreateTaskBatchItemFromJson(json);
-  Map<String, dynamic> toJson() => _$CreateTaskBatchItemToJson(this);
-}

ui/flutter/lib/api/model/create_task_batch.g.dart

@@ -1,55 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'create_task_batch.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-CreateTaskBatch _$CreateTaskBatchFromJson(Map<String, dynamic> json) =>
-    CreateTaskBatch(
-      reqs: (json['reqs'] as List<dynamic>?)
-          ?.map((e) => CreateTaskBatchItem.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      opt: json['opt'] == null
-          ? null
-          : Options.fromJson(json['opt'] as Map<String, dynamic>),
-    );
-
-Map<String, dynamic> _$CreateTaskBatchToJson(CreateTaskBatch instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('reqs', instance.reqs?.map((e) => e.toJson()).toList());
-  writeNotNull('opt', instance.opt?.toJson());
-  return val;
-}
-
-CreateTaskBatchItem _$CreateTaskBatchItemFromJson(Map<String, dynamic> json) =>
-    CreateTaskBatchItem(
-      req: json['req'] == null
-          ? null
-          : Request.fromJson(json['req'] as Map<String, dynamic>),
-      opts: json['opts'] == null
-          ? null
-          : Options.fromJson(json['opts'] as Map<String, dynamic>),
-    );
-
-Map<String, dynamic> _$CreateTaskBatchItemToJson(CreateTaskBatchItem instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('req', instance.req);
-  writeNotNull('opts', instance.opts);
-  return val;
-}

ui/flutter/lib/api/model/downloader_config.dart

@@ -81,7 +81,6 @@ class ExtraConfig {
   bool lastDeleteTaskKeep;
   bool defaultDirectDownload;
   bool defaultBtClient;
-  bool notifyWhenNewVersion;
 
   ExtraConfigBt bt = ExtraConfigBt();
 
@@ -91,7 +90,6 @@ class ExtraConfig {
     this.lastDeleteTaskKeep = false,
     this.defaultDirectDownload = false,
     this.defaultBtClient = true,
-    this.notifyWhenNewVersion = true,
   });
 
   factory ExtraConfig.fromJson(Map<String, dynamic>? json) =>

ui/flutter/lib/api/model/downloader_config.g.dart

@@ -74,7 +74,6 @@ ExtraConfig _$ExtraConfigFromJson(Map<String, dynamic> json) => ExtraConfig(
       lastDeleteTaskKeep: json['lastDeleteTaskKeep'] as bool? ?? false,
       defaultDirectDownload: json['defaultDirectDownload'] as bool? ?? false,
       defaultBtClient: json['defaultBtClient'] as bool? ?? true,
-      notifyWhenNewVersion: json['notifyWhenNewVersion'] as bool? ?? true,
     )..bt = ExtraConfigBt.fromJson(json['bt'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) =>
@@ -84,7 +83,6 @@ Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) =>
       'lastDeleteTaskKeep': instance.lastDeleteTaskKeep,
       'defaultDirectDownload': instance.defaultDirectDownload,
       'defaultBtClient': instance.defaultBtClient,
-      'notifyWhenNewVersion': instance.notifyWhenNewVersion,
       'bt': instance.bt.toJson(),
     };