test

2026-11-10 02:20:28 +00:00 · 2024-01-19 14:31:03 +08:00 · 2024-01-19 11:54:36 +08:00
283 changed files with 7154 additions and 32530 deletions
@@ -1,16 +0,0 @@
-.git
-
-*.data
-*.log
-
-node_modules
-**/node_modules
-
-Dockerfile
-.dockerignore
-
-.github
-_docs
-_examples
-bin
-ui
@@ -1 +0,0 @@
-* @monkeyWie
@@ -1,189 +1,43 @@
-name-template: "v$NEXT_PATCH_VERSION 🌈"
-tag-template: "v$NEXT_PATCH_VERSION"
+name-template: 'v$NEXT_PATCH_VERSION 🌈'
+tag-template: 'v$NEXT_PATCH_VERSION'
 categories:
-  - title: "🆕 Features"
+  - title: '🆕 Features'
    labels:
-      - "feat"
-      - "feature"
-      - "enhancement"
-  - title: "🐛 Bug Fixes"
+      - 'feat'
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
    labels:
-      - "fix"
-      - "bugfix"
-      - "bug"
-  - title: "🔧 Performance Improvements"
-    labels:
-      - "perf"
-  - title: "🧪 Tests"
-    label: "test"
-  - title: "🧰 Maintenance"
-    label: "chore"
-  - title: "📖 Document"
-    label: "docs"
-  - title: "🚀 CI/CD"
-    label: "ci"
-  - title: "🌎 Internationalization"
-    label: "translation"
-change-template: "- $TITLE @$AUTHOR (#$NUMBER)"
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '🧪 Tests'
+    label: 'test'
+  - title: '🧰 Maintenance'
+    label: 'chore'
+  - title: '📖 Document'
+    label: 'doc'
+  - title: '🚀 CI/CD'
+    label: 'ci'
+  - title: '🌎 Internationalization'
+    label: 'translation'
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 version-resolver:
  major:
    labels:
-      - "major"
+      - 'major'
  minor:
    labels:
-      - "minor"
+      - 'minor'
  patch:
    labels:
-      - "patch"
+      - 'patch'
  default: patch
 template: |
-  <table>
-    <tbody>
-      <tr>
-        <td rowspan="4">🪟 Windows</td>
-        <td rowspan="2"><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>
-      </tr>
-      <tr>
-        <td>arm64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-windows-arm64.zip">📥</a></td>
-      </tr>
-      <tr>
-        <td rowspan="2"><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>
-      </tr>
-      <tr>
-        <td>arm64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-windows-arm64-portable.zip">📥</a></td>
-      </tr>
-      <tr>
-        <td rowspan="3">🍎 MacOS</td>
-        <td rowspan="3"><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>
-      </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>
-        <td><code>Flathub</code></td>
-        <td>amd64</td>
-        <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">📥</a></td>
-      </tr>
-      <tr>
-        <td><code>SNAP</code></td>
-        <td>amd64</td>
-        <td><a href="https://snapcraft.io/gopeed">📥</a></td>
-      </tr>
-      <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>
-      </tr>
-      <tr>
-        <td>arm64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=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>
-      </tr>
-      <tr>
-        <td>arm64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-v$NEXT_PATCH_VERSION-linux-arm64.AppImage">📥</a></td>
-      </tr>
-      <tr>
-        <td rowspan="4">🤖 Android</td>
-        <td rowspan="4"><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>
-      </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>
-      </tr>
-      <tr>
-        <td>🐳 Docker</td>
-        <td>-</td>
-        <td>universal</td>
-        <td><a href="https://hub.docker.com/r/liwei2633/gopeed">📥</a></td>
-      </tr>
-      <tr>
-        <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>
-      </tr>
-      <tr>
-        <td>arm64</td>
-        <td><a href="https://gopeed.com/api/download?tpl=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>
-      </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>
-      </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>
-      </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>
-      </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>
-      </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>
-      </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>
-      </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>
-      </tr>
-    </tbody>
-  </table>
-
-  # Release notes
+  # Changes

  $CHANGES
-
+  
  # 更新日志

-  $CHANGES
+  $CHANGES
@@ -4,19 +4,17 @@ on:
  workflow_dispatch:
    inputs:
      platform:
-        description: "Build platform"
+        description: 'Build platform'
        required: true
-        default: "all"
-      test:
-        description: "Test mode"
+        default: 'all'
+      channel:
+        description: 'Snap channel'
        required: true
-        default: "false"
+        default: 'stable'

 env:
-  GO_VERSION: "1.24"
-  FLUTTER_VERSION: "3.38.7"
-  GA4_MEASUREMENT_ID: ${{ secrets.GA4_MEASUREMENT_ID }}
-  GA4_API_SECRET: ${{ secrets.GA4_API_SECRET }}
+  GO_VERSION: "1.19"
+  FLUTTER_VERSION: "3.16.1"

 permissions:
  contents: write
@@ -25,110 +23,57 @@ jobs:
  get-release:
    runs-on: ubuntu-latest
    outputs:
-      version: ${{ steps.get-release.outputs.version }}
+      tag_name: ${{ steps.get-release.outputs.tag_name }}
      upload_url: ${{ steps.get-release.outputs.upload_url }}

    steps:
-      - uses: monkeyWie/get-latest-release@v2.1
+      - uses: monkeyWie/get-latest-release@v1
        id: get-release
        with:
          myToken: ${{ github.token }}

  build-windows:
    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'windows' }}
-    needs: [get-release]
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - arch: arm64
-            os: windows-11-arm
-            llvm_ver: "20251202" # Only ARM64
-            flutter_channel: "master"
-            flutter_version: "8817d45220d" # Only ARM64
-          - arch: amd64
-            os: windows-2022
-            flutter_channel: "stable"
-    runs-on: ${{ matrix.os }}
-
+    runs-on: windows-latest
+    needs: [ get-release ]
    steps:
      - uses: actions/checkout@v3
-
-      # Install LLVM environment only on ARM64
-      - name: Install llvm-mingw-ucrt-aarch64 (ARM64 only)
-        if: matrix.arch == 'arm64'
-        run: |
-          $ver = "${{ matrix.llvm_ver }}"
-          $url = "https://github.com/mstorsjo/llvm-mingw/releases/download/$ver/llvm-mingw-$ver-ucrt-aarch64.zip"
-          $zip = "$env:RUNNER_TEMP\\llvm.zip"
-          $extract = "$env:RUNNER_TEMP\\extract"
-          $target = "C:\\clangarm64"
-
-          curl -L $url -o $zip
-          rm -r -fo $extract,$target -ea Ignore
-          mkdir $extract | Out-Null
-
-          tar -xf $zip -C $extract
-          mv (Get-ChildItem $extract)[0].FullName $target
-
-          $b = "$target\\bin"
-          "CC=$b\\clang.exe"        >> $env:GITHUB_ENV
-          "CXX=$b\\clang++.exe"     >> $env:GITHUB_ENV
-          "CLANGARM64_BIN=$b"       >> $env:GITHUB_ENV
-          "CGO_ENABLED=1"           >> $env:GITHUB_ENV
-          "CLANGARM64_ROOT=$target" >> $env:GITHUB_ENV
-          $b >> $env:GITHUB_PATH
-
      - uses: actions/setup-go@v4
        with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: "1.20"
      - uses: subosito/flutter-action@v2
        with:
-          channel: ${{ matrix.flutter_channel }}
-          flutter-version: ${{ matrix.flutter_version || env.FLUTTER_VERSION }}
+          flutter-version: ${{ env.FLUTTER_VERSION }}
      - name: Build
        env:
-          VERSION: ${{ needs.get-release.outputs.version }}
-          GOARCH: ${{ matrix.arch }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
        run: |
          Invoke-WebRequest -Uri "https://github.com/jrsoftware/issrc/raw/main/Files/Languages/Unofficial/ChineseSimplified.isl" -OutFile "ChineseSimplified.isl"
          mv ChineseSimplified.isl "C:\Program Files (x86)\Inno Setup 6\Languages\"

-          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$env:VERSION" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
-          go build -ldflags="-w -s" -o ui/flutter/assets/exec/host.exe github.com/GopeedLab/gopeed/cmd/host
-          go build -ldflags="-w -s" -o ui/flutter/assets/exec/updater.exe github.com/GopeedLab/gopeed/cmd/updater
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
          cd ui/flutter
-          $TAG = "v$env:VERSION"
-          flutter build windows --dart-define="UPDATE_CHANNEL=windowsPortable" --dart-define="GA4_MEASUREMENT_ID=${{ env.GA4_MEASUREMENT_ID }}" --dart-define="GA4_API_SECRET=${{ env.GA4_API_SECRET }}"
+          flutter build windows
+          $mingw = "C:\Program Files\Git\mingw64\bin"
          $system = "C:\Windows\System32"
-          if ("${{ matrix.arch }}" -eq "amd64") {
-              # for amd64
-              $release = "build\windows\x64\runner\Release\"
-              $mingw = "C:\Program Files\Git\mingw64\bin"
-              cp $mingw\libstdc++-6.dll $release
-              cp $mingw\libgcc_s_seh-1.dll $release
-          } else {
-              # for ARM64
-              $release = "build\windows\arm64\runner\Release\"
-              $mingw = "$env:CLANGARM64_ROOT\aarch64-w64-mingw32\bin"
-              cp $mingw\libc++.dll $release
-          }
+          $release = "build\windows\x64\runner\Release\"
+          cp $mingw\libstdc++-6.dll $release
+          cp $mingw\libgcc_s_seh-1.dll $release
          cp $mingw\libwinpthread-1.dll $release
          cp $system\msvcp140.dll $release
          cp $system\vcruntime140.dll $release
          cp $system\vcruntime140_1.dll $release

          New-Item -Path build\windows\Output -ItemType Directory
-          Compress-Archive -Path "$release*" -DestinationPath "build\windows\Output\Gopeed-$TAG-windows-${{ matrix.arch }}-portable.zip"
+          Compress-Archive -Path "$release*" -DestinationPath "build\windows\Output\Gopeed-$env:VERSION-windows-amd64-portable.zip"

-          flutter build windows --dart-define="UPDATE_CHANNEL=windowsInstaller" --dart-define="GA4_MEASUREMENT_ID=${{ env.GA4_MEASUREMENT_ID }}" --dart-define="GA4_API_SECRET=${{ env.GA4_API_SECRET }}"
          cd build/windows
          echo @"
          ; Script generated by the Inno Setup Script Wizard.
          ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

          #define MyAppName "Gopeed"
-          #define MyAppVersion "$env:VERSION"
+          #define MyAppVersion "$($env:VERSION.substring(1))"
          #define MyAppPublisher "monkeyWie"
          #define MyAppURL "https://gopeed.com"
          #define MyAppExeName "gopeed.exe"
@@ -151,13 +96,11 @@ jobs:
          PrivilegesRequired=lowest
          OutputBaseFilename=gopeed
          SetupIconFile=..\..\assets\icon\icon.ico
-          UninstallDisplayIcon={app}\{#MyAppExeName}
          Compression=lzma
          SolidCompression=yes
          WizardStyle=modern
          LanguageDetectionMethod=uilanguage
          ShowLanguageDialog=yes
-          CloseApplications=force

          [Languages]
          Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -167,7 +110,7 @@ jobs:
          Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked

          [Files]
-          Source: ".\${{ matrix.arch == 'amd64' && 'x64' || 'arm64' }}\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs;
+          Source: ".\x64\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
          ; NOTE: Don't use "Flags: ignoreversion" on any shared system files

          [UninstallDelete]
@@ -181,44 +124,37 @@ jobs:
          Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
          "@ > setup.iss
          iscc.exe setup.iss
-          mv "Output\gopeed.exe" "Output\Gopeed-$TAG-windows-${{ matrix.arch }}.exe"
-          Compress-Archive -Path "Output\Gopeed-$TAG-windows-${{ matrix.arch }}.exe" -DestinationPath "Output\Gopeed-$TAG-windows-${{ matrix.arch }}.zip"
+          mv "Output\gopeed.exe" "Output\Gopeed-$env:VERSION-windows-amd64.exe"
+          Compress-Archive -Path "Output\Gopeed-$env:VERSION-windows-amd64.exe" -DestinationPath "Output\Gopeed-$env:VERSION-windows-amd64.zip"
+          Remove-Item -Path "Output\Gopeed-$env:VERSION-windows-amd64.exe"
      - name: Upload
        uses: shogo82148/actions-upload-release-asset@v1
        with:
          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-15-intel
-    needs: [get-release]
+    runs-on: ubuntu-latest
+    needs: [ get-release ]
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-go@v4
        with:
          go-version: ${{ env.GO_VERSION }}
      - name: Build
-        env:
-          VERSION: ${{ needs.get-release.outputs.version }}
        run: |
-          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
-          go build -ldflags="-w -s" github.com/GopeedLab/gopeed/cmd/host
-          go build -ldflags="-w -s" github.com/GopeedLab/gopeed/cmd/updater
-      - uses: actions/upload-artifact@v4
+          go install src.techknowlogick.com/xgo@latest
+          xgo -go go-$GO_VERSION.x --targets=darwin/arm64 -tags="nosqlite" -ldflags="-w -s" -buildmode=c-shared -pkg=bind/desktop -out=libgopeed .
+          mv libgopeed-*.dylib libgopeed.dylib
+      - uses: actions/upload-artifact@v3
        with:
-          name: macos-amd64-lib
-          path: |
-            libgopeed.dylib
-            host
-            updater
+          name: macos-arm64-lib
+          path: libgopeed.dylib
  build-macos:
    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
    runs-on: macos-latest
-    strategy:
-      matrix:
-        channel: [arm64, amd64, universal]
-    needs: [get-release, build-macos-amd64-lib]
+    needs: [ get-release, build-macos-arm64-lib ]
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-go@v4
@@ -232,51 +168,29 @@ jobs:
          flutter-version: ${{ env.FLUTTER_VERSION }}
      - name: Install appdmg
        run: |
-          python3 -m pip install setuptools --break-system-packages
+          python3 -m pip install setuptools
          npm install -g appdmg
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
        with:
-          name: macos-amd64-lib
-          path: ui/flutter/lib-amd64
-      - 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: macos-arm64-lib
+          path: ui/flutter/lib-arm64
      - name: Build
        env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
        run: |
-          cd ui/flutter
-          flutter build macos --dart-define="UPDATE_CHANNEL=macosDmg" --dart-define="GA4_MEASUREMENT_ID=${{ env.GA4_MEASUREMENT_ID }}" --dart-define="GA4_API_SECRET=${{ env.GA4_API_SECRET }}"
+          PROJECT_DIR=$(pwd)
+
+          # amd64 lib
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/lib-amd64/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
+          # 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
+          cd ui/flutter/macos/Frameworks
+          lipo -create -output libgopeed.dylib amd64-lib arm64-lib
+
+          cd $PROJECT_DIR/ui/flutter
+          flutter build macos
          cd build/macos/Build/Products/Release
          cat>appdmg.json<<EOF
          {
@@ -289,14 +203,7 @@ 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
+          appdmg appdmg.json dist/Gopeed-$VERSION-macos.dmg
      - name: Upload
        uses: shogo82148/actions-upload-release-asset@v1
        with:
@@ -305,11 +212,8 @@ jobs:
          overwrite: true
  build-linux:
    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'linux' }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-22.04, ubuntu-22.04-arm]
-    needs: [get-release]
+    runs-on: ubuntu-20.04
+    needs: [ get-release ]
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-go@v4
@@ -318,91 +222,28 @@ jobs:
      - uses: subosito/flutter-action@v2
        with:
          flutter-version: ${{ env.FLUTTER_VERSION }}
-          channel: master
      - run: |
          sudo apt update -y
-          sudo apt install -y ninja-build libgtk-3-dev libayatana-appindicator3-1 libayatana-appindicator3-dev rpm patchelf libfuse2 locate imagemagick potrace libkeybinder-3.0-dev
-          arch=$(uname -m)
-          wget -O appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${arch}.AppImage"
+          # flutter build dependencies
+          sudo apt install -y ninja-build libgtk-3-dev libappindicator3-dev
+          # rpm build dependencies
+          sudo apt install -y rpm patchelf
+          # appimage build dependencies
+          sudo apt install -y libfuse2 locate
+          wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
          chmod +x appimagetool
          sudo mv appimagetool /usr/local/bin/
      - name: Build
        env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
        run: |
-          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so 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
-
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
          cd ui/flutter
-
-          ICON_PATH=$(find assets -name "logo.png" -o -name "icon.png" | head -n 1)
-          [ -z "$ICON_PATH" ] && ICON_PATH="assets/icon.png" && touch assets/icon.png
-
-          convert "$ICON_PATH" assets/icon.svg
-          ICON_PATH="assets/icon.svg"
-
-          RPM_ARCH=$(uname -m)
-
-          mkdir -p linux/packaging/rpm
-          cat << EOF > linux/packaging/rpm/make_config.yaml
-          display_name: Gopeed
-          icon: $ICON_PATH
-          summary: High speed downloader.
-          description: A high speed downloader that supports all platforms.
-          group: Applications/Internet
-          license: GPL-3.0
-          url: https://github.com/GopeedLab/gopeed
-          vendor: GopeedLab
-          maintainer: GopeedLab <[email protected]>
-          build_arch: $RPM_ARCH
-          EOF
-
-          cat << EOF > distribute_options.yaml
-          output: dist/
-          releases:
-            - name: linux
-              jobs:
-                - name: appimage
-                  package:
-                    platform: linux
-                    target: appimage
-                    build_args:
-                      dart-define:
-                        UPDATE_CHANNEL: linuxAppImage
-                        GA4_MEASUREMENT_ID: ${{ env.GA4_MEASUREMENT_ID }}
-                        GA4_API_SECRET: ${{ env.GA4_API_SECRET }}
-                - name: deb
-                  package:
-                    platform: linux
-                    target: deb
-                    build_args:
-                      dart-define:
-                        UPDATE_CHANNEL: linuxDeb
-                        GA4_MEASUREMENT_ID: ${{ env.GA4_MEASUREMENT_ID }}
-                        GA4_API_SECRET: ${{ env.GA4_API_SECRET }}
-                - name: rpm
-                  package:
-                    platform: linux
-                    target: rpm
-                    build_args:
-                      dart-define:
-                        UPDATE_CHANNEL: linuxRpm
-                        GA4_MEASUREMENT_ID: ${{ env.GA4_MEASUREMENT_ID }}
-                        GA4_API_SECRET: ${{ env.GA4_API_SECRET }}
-          EOF
          dart pub global activate -sgit https://github.com/GopeedLab/flutter_distributor.git --git-path packages/flutter_distributor
-          flutter_distributor release --name linux
+          flutter_distributor package --platform linux --targets appimage,deb
          cd dist/*
-
-          ARCH="amd64"
-          if [[ "${{ matrix.os }}" == *-arm ]]; then
-            ARCH="arm64"
-          fi
-
-          mv gopeed-*-linux.AppImage Gopeed-v${VERSION}-linux-${ARCH}.AppImage
-          mv gopeed-*-linux.deb Gopeed-v${VERSION}-linux-${ARCH}.deb
-          mv gopeed-*-linux.rpm Gopeed-v${VERSION}-linux-${ARCH}.rpm
+          mv gopeed-*-linux.AppImage Gopeed-${VERSION}-linux-x86_64.AppImage
+          mv gopeed-*-linux.deb Gopeed-${VERSION}-linux-amd64.deb
      - name: Upload
        uses: shogo82148/actions-upload-release-asset@v1
        with:
@@ -412,141 +253,80 @@ jobs:
  build-snap:
    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'snap' }}
    runs-on: ubuntu-latest
-    needs: [get-release]
+    needs: [ get-release ]
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-go@v4
        with:
          go-version: ${{ env.GO_VERSION }}
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
      - name: Setup LXD
        uses: canonical/[email protected]
        with:
          channel: latest/stable
      - name: Build
        env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
        run: |
-          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so 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
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
          cd ui/flutter
-
+          
          sudo snap install snapcraft --classic
          mkdir -p snap/gui
          cp assets/icon/icon.svg snap/gui/gopeed.svg
-
+          
          cat>snap/snapcraft.yaml<<EOF
          name: gopeed
-          version: $VERSION
+          version: ${VERSION:1}
          summary: A modern download manager
          description: High speed downloader that supports all platforms.
-
+          
          confinement: strict
-          base: core24
+          base: core22
          grade: stable
-
-          platforms:
-            amd64:
-              build-on: amd64
+          
+          architectures:
+            - build-on: amd64
              build-for: amd64
-
+          
          slots:
            dbus-gopeed:
              interface: dbus
              bus: session
              name: com.gopeed.gopeed
-
+          
          apps:
            gopeed:
-              command-chain:
-                - bin/gpu-2404-wrapper
-              command: bin/gopeed
+              command: gopeed
              extensions: [gnome]
-              common-id: com.gopeed.Gopeed
              plugs:
                - network
-                - home
+              slots:
+                - dbus-gopeed
          parts:
-            flutter-git:
-              source: https://github.com/flutter/flutter.git
-              source-tag: $FLUTTER_VERSION
-              source-depth: 1
-              plugin: nil
-              override-build: |
-                mkdir -p \$CRAFT_PART_INSTALL/usr/bin
-                mkdir -p \$CRAFT_PART_INSTALL/usr/libexec
-                cp -r \$CRAFT_PART_SRC \$CRAFT_PART_INSTALL/usr/libexec/flutter
-                ln -s \$CRAFT_PART_INSTALL/usr/libexec/flutter/bin/flutter \$CRAFT_PART_INSTALL/usr/bin/flutter
-                ln -s \$SNAPCRAFT_PART_INSTALL/usr/libexec/flutter/bin/dart \$SNAPCRAFT_PART_INSTALL/usr/bin/dart
-                \$CRAFT_PART_INSTALL/usr/bin/flutter doctor
-              build-packages:
-                - clang
-                - cmake
-                - curl
-                - libgtk-3-dev
-                - libkeybinder-3.0-dev
-                - ninja-build
-                - unzip
-                - xz-utils
-                - zip
-              override-prime: ''
-            zenity:
-              plugin: nil
-              stage-packages:
-                - zenity
            gopeed:
-              after: [flutter-git,zenity]
              source: .
-              plugin: nil
+              plugin: flutter
              stage-packages:
                - libgtk-3-dev
-                - libkeybinder-3.0-dev
                - libappindicator3-dev
-              override-build: |
-                # work around pub get stack overflow # https://github.com/dart-lang/sdk/issues/51068#issuecomment-1396588253
-                set +e
-                dart pub get
-                set -eux
-                flutter build linux --dart-define="UPDATE_CHANNEL=linuxSnap" --dart-define="GA4_MEASUREMENT_ID=$GA4_MEASUREMENT_ID" --dart-define="GA4_API_SECRET=$GA4_API_SECRET"
-                mkdir -p \$CRAFT_PART_INSTALL/bin/
-                cp -r build/linux/*/release/bundle/* \$CRAFT_PART_INSTALL/bin/
-            gpu-2404:
-              after: [gopeed]
-              source: https://github.com/canonical/gpu-snap.git
-              plugin: dump
-              override-prime: |
-                craftctl default
-                \${CRAFT_PART_SRC}/bin/gpu-2404-cleanup mesa-2404
-              prime:
-                - bin/gpu-2404-wrapper
-
-          plugs:
-            gpu-2404:
-              interface: content
-              target: \$SNAP/gpu-2404
-              default-provider: mesa-2404
-
-          layout:
-            /usr/share/libdrm:
-              bind: \$SNAP/gpu-2404/libdrm
-            /usr/share/drirc.d:
-              symlink: \$SNAP/gpu-2404/drirc.d
-            /usr/share/X11/XErrorDB:
-              symlink: \$SNAP/gpu-2404/X11/XErrorDB
+              flutter-target: lib/main.dart
          EOF
-
+          
          cp linux/assets/com.gopeed.Gopeed.desktop snap/gui/gopeed.desktop
          sed -i 's/Icon=com.gopeed.Gopeed/Icon=\${SNAP}\/meta\/gui\/gopeed.svg/g' snap/gui/gopeed.desktop
-
+          
          snapcraft --use-lxd

          # Snapcraft login
          export SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.SNAP_STORE_LOGIN }}
-          snapcraft upload --release=${{ github.event.inputs.test == 'true' && 'edge' || 'stable' }} gopeed_${VERSION}_amd64.snap
+          snapcraft upload --release=${{ github.event.inputs.channel }} gopeed_${VERSION:1}_amd64.snap
  build-android:
    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'android' }}
    runs-on: ubuntu-latest
-    needs: [get-release]
+    needs: [ get-release ]
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-go@v4
@@ -555,13 +335,13 @@ jobs:
      - uses: actions/setup-java@v3
        with:
          distribution: "zulu"
-          java-version: "17"
+          java-version: "11"
      - uses: subosito/flutter-action@v2
        with:
          flutter-version: ${{ env.FLUTTER_VERSION }}
      - name: Build
        env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
          APK_KEYSTORE: ${{ secrets.APK_KEYSTORE }}
          APK_KEY_PASSWORD: ${{ secrets.APK_KEY_PASSWORD }}
          APK_STORE_PASSWORD: ${{ secrets.APK_STORE_PASSWORD }}
@@ -569,16 +349,12 @@ jobs:
          go install golang.org/x/mobile/cmd/gomobile@latest
          go get golang.org/x/mobile/bind
          gomobile init
-          gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0 -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
+          gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
          cd ui/flutter
          echo $APK_KEYSTORE | base64 -di > android/app/upload-keystore.jks
-          flutter build apk --dart-define="UPDATE_CHANNEL=androidApk" --dart-define="GA4_MEASUREMENT_ID=${{ env.GA4_MEASUREMENT_ID }}" --dart-define="GA4_API_SECRET=${{ env.GA4_API_SECRET }}"
-          flutter build apk --split-per-abi --dart-define="UPDATE_CHANNEL=androidApk" --dart-define="GA4_MEASUREMENT_ID=${{ env.GA4_MEASUREMENT_ID }}" --dart-define="GA4_API_SECRET=${{ env.GA4_API_SECRET }}"
+          flutter build apk
          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
+          cp build/app/outputs/flutter-apk/app-release.apk dist/Gopeed-$VERSION-android.apk
      - name: Upload
        uses: shogo82148/actions-upload-release-asset@v1
        with:
@@ -587,8 +363,8 @@ jobs:
          overwrite: true
  build-ios:
    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'ios' }}
-    runs-on: macos-14
-    needs: [get-release]
+    runs-on: macos-latest
+    needs: [ get-release ]
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-go@v4
@@ -599,19 +375,19 @@ jobs:
          flutter-version: ${{ env.FLUTTER_VERSION }}
      - name: Build
        env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
        run: |
          go install golang.org/x/mobile/cmd/gomobile@latest
          go get golang.org/x/mobile/bind
          gomobile init
-          gomobile bind -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -o ui/flutter/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
+          gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
          cd ui/flutter
-          flutter build ios --no-codesign --dart-define="UPDATE_CHANNEL=iosIpa" --dart-define="GA4_MEASUREMENT_ID=${{ env.GA4_MEASUREMENT_ID }}" --dart-define="GA4_API_SECRET=${{ env.GA4_API_SECRET }}"
+          flutter build ios --no-codesign
          mkdir Payload
          cp -r build/ios/iphoneos/Runner.app Payload
          zip -r -y Payload.zip Payload/Runner.app
          mkdir dist
-          mv Payload.zip dist/Gopeed-v$VERSION-ios.ipa
+          mv Payload.zip dist/Gopeed-$VERSION-ios.ipa
      - name: Upload
        uses: shogo82148/actions-upload-release-asset@v1
        with:
@@ -619,9 +395,9 @@ jobs:
          asset_path: ui/flutter/dist/*
          overwrite: true
  build-web:
-    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'web' || github.event.inputs.platform == 'qnap' }}
+    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'web' }}
    runs-on: ubuntu-latest
-    needs: [get-release]
+    needs: [ get-release ]
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-go@v4
@@ -632,15 +408,13 @@ jobs:
          flutter-version: ${{ env.FLUTTER_VERSION }}
      - name: Build
        env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
        run: |
          cd ui/flutter
-          flutter build web --no-web-resources-cdn --dart-define="GA4_MEASUREMENT_ID=${{ env.GA4_MEASUREMENT_ID }}" --dart-define="GA4_API_SECRET=${{ env.GA4_API_SECRET }}"
-          dart ../../.github/workflows/scripts/flutter_local_font.dart
+          flutter build web --web-renderer html
          cd ../../
          cp -r ui/flutter/build/web cmd/web/dist
          mkdir -p dist/zip
-
          goos_arr=(windows darwin linux)
          goarch_arr=(386 amd64 arm64)
          export CGO_ENABLED=0
@@ -650,9 +424,9 @@ jobs:
              if [ $goos = "darwin" ]; then
                goos_name="macos"
              fi
-              name=gopeed-web-v$VERSION-$goos_name-$goarch
+              name=gopeed-web-$VERSION-$goos_name-$goarch
              dir="dist/$name/"
-              (GOOS=$goos GOARCH=$goarch go build -tags nosqlite,web -ldflags="-s -w -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -o $dir github.com/GopeedLab/gopeed/cmd/web \
+              (GOOS=$goos GOARCH=$goarch go build -tags nosqlite,web -ldflags="-s -w" -o $dir github.com/GopeedLab/gopeed/cmd/web \
              && cd $dir \
              && file=$(ls -AU | head -1) \
              && mkdir $name \
@@ -662,83 +436,21 @@ jobs:
              || true
            done
          done
-      - uses: actions/upload-artifact@v4
-        with:
-          name: web-dist
-          path: dist/zip/
      - name: Upload
        uses: shogo82148/actions-upload-release-asset@v1
        with:
          upload_url: ${{ needs.get-release.outputs.upload_url }}
          asset_path: dist/zip/*
          overwrite: true
-  build-qnap:
-    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'qnap' }}
-    runs-on: ubuntu-latest
-    needs: [get-release, build-web]
-    steps:
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.8.18"
-      - uses: actions/download-artifact@v4
-        with:
-          name: web-dist
-          path: dist/zip/
-      - name: Build
-        env:
-          VERSION: ${{ needs.get-release.outputs.version }}
-        run: |
-          sudo apt update -y
-          sudo apt install -y pv bsdmainutils
-          wget -O qdk2_0.32.bionic_amd64.deb "https://github.com/qnap-dev/qdk2/releases/download/v0.32/qdk2_0.32.bionic_amd64.deb"
-          dpkg -X qdk2_0.32.bionic_amd64.deb qdk2 # Direct installs will fail due to missing dependencies!
-          [[ -d qdk2 ]] || exit 1
-
-          export PATH=$(pwd)/qdk2/usr/bin:$(pwd)/qdk2/usr/share/qdk2/QDK/bin:${PATH}
-          wget -O Gopeed.template.tar.gz "https://github.com/GopeedLab/QpkgBuild/raw/refs/heads/master/template/Gopeed.template.tar.gz"
-          tar -zxf Gopeed.template.tar.gz
-          [[ -d Gopeed ]] || exit 1
-
-          goos=linux
-          goarch_arr=(amd64 arm64)
-          for goarch in "${goarch_arr[@]}"; do
-            qarch=x86_64
-            [[ "${goarch}" == "arm64" ]] && qarch=arm_64
-            name=gopeed-web-v${VERSION}-${goos}-${goarch}
-            unzip dist/zip/${name}.zip -d dist/${name}
-            cp dist/${name}/${name}/* Gopeed/${qarch}/
-          done
-          cd Gopeed
-          sed -i -e 's/__QPKG_VER__/${VERSION}/g' qpkg.cfg
-          qbuild || exit 1
-
-          mkdir -p ../dist/qnap
-          goos=qnap
-          for goarch in "${goarch_arr[@]}"; do
-            qarch=x86_64
-            [[ "${goarch}" == "arm64" ]] && qarch=arm_64
-            sname=Gopeed_${VERSION}_${qarch}.qpkg
-            dname=gopeed-v${VERSION}-${goos}-${goarch}.qpkg
-            [[ -f build/${sname} ]] && cp -ra build/${sname} ../dist/qnap/${dname}
-          done
-      - name: Upload
-        uses: shogo82148/actions-upload-release-asset@v1
-        with:
-          upload_url: ${{ needs.get-release.outputs.upload_url }}
-          asset_path: dist/qnap/*
-          overwrite: true
  build-docker:
    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'docker' }}
    runs-on: ubuntu-latest
-    needs: [get-release]
+    needs: [ get-release ]
    steps:
      - name: Remove unnecessary files
        run: |
          sudo rm -rf /usr/share/dotnet
          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-      - uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
      - uses: actions/checkout@v3
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v2
@@ -749,29 +461,18 @@ jobs:
        with:
          username: liwei2633
          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build flutter web
-        run: |
-          cd ui/flutter
-          flutter build web --no-web-resources-cdn --dart-define="UPDATE_CHANNEL=docker" --dart-define="GA4_MEASUREMENT_ID=${{ env.GA4_MEASUREMENT_ID }}" --dart-define="GA4_API_SECRET=${{ env.GA4_API_SECRET }}"
-          dart ../../.github/workflows/scripts/flutter_local_font.dart
-          cd ../../
-          rm -rf cmd/web/dist
-          cp -r ui/flutter/build/web cmd/web/dist
      - name: Build and push
        uses: docker/build-push-action@v2
        env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
        with:
-          context: .
-          push: ${{ github.event.inputs.test == 'true' && 'false' || 'true' }}
-          build-args: |
-            VERSION=${{ env.VERSION }}
-            IN_DOCKER=true
+          push: true
          platforms: |
            linux/386
            linux/amd64
            linux/arm64
+            linux/arm/v6
            linux/arm/v7
          tags: |
            liwei2633/gopeed:latest
-            liwei2633/gopeed:v${{ env.VERSION }}
+            liwei2633/gopeed:${{ env.VERSION }}
@@ -17,7 +17,7 @@ on:
      - "Dockerfile"

 env:
-  GO_VERSION: "1.24"
+  GO_VERSION: "1.19"

 permissions:
  contents: write
@@ -1,412 +0,0 @@
-// Localize external Google Fonts (fonts.gstatic.com) references in Flutter Web build output.
-//
-// Usage (post-build):
-//   # Run AFTER: flutter build web --no-web-resources-cdn
-//   dart ../../.github/workflows/scripts/flutter_local_font.dart
-//
-// What it does:
-// In main.dart.js:
-//    - Find any referenced resources under: https://fonts.gstatic.com/s/
-//      (including the common pattern where Flutter concatenates the base URL with a relative path)
-//    - Download them into: build/web/assets/gstatic/<path>
-//    - Rewrite "https://fonts.gstatic.com/s/" -> "assets/gstatic/" so runtime loads locally
-//    - Only download font subsets needed by supported locales (parsed from message.dart)
-//
-// Notes:
-// - This script DOES NOT call `flutter build web`. It only patches the output.
-// - This is a best-effort post-process. Always verify in browser devtools.
-
-import 'dart:async';
-import 'dart:io';
-
-/// Get font families required for a specific locale based on language/script.
-/// Uses language code prefix to automatically detect the script system.
-/// Returns empty set if base fonts (Latin/Cyrillic/Greek) are sufficient.
-Set<String> _getFontFamiliesForLocale(String locale) {
-  final lang = locale.toLowerCase().split('_').first;
-
-  // CJK languages - need specific large font files
-  if (lang == 'zh') {
-    // Simplified vs Traditional Chinese
-    if (locale.contains('cn') || locale.contains('sg')) {
-      return {'notosanssc'}; // Simplified Chinese
-    }
-    return {'notosanstc', 'notosanshk'}; // Traditional Chinese (TW, HK, MO)
-  }
-  if (lang == 'ja') return {'notosansjp'}; // Japanese
-  if (lang == 'ko') return {'notosanskr'}; // Korean
-
-  // Arabic script languages
-  if (lang == 'ar') return {'notosansarabic'}; // Arabic
-  if (lang == 'fa') return {'notosansarabic'}; // Persian/Farsi
-  if (lang == 'ur') return {'notosansarabic'}; // Urdu
-  if (lang == 'ps') return {'notosansarabic'}; // Pashto
-  if (lang == 'ku') return {'notosansarabic'}; // Kurdish (Arabic script)
-
-  // Hebrew script
-  if (lang == 'he' || lang == 'yi') return {'notosanshebrew'};
-
-  // South Asian scripts
-  if (lang == 'hi' || lang == 'mr' || lang == 'ne' || lang == 'sa') {
-    return {'notosansdevanagari'}; // Hindi, Marathi, Nepali, Sanskrit
-  }
-  if (lang == 'bn' || lang == 'as')
-    return {'notosansbengali'}; // Bengali, Assamese
-  if (lang == 'ta')
-    return {'notosanstamil', 'notosanstamilsupplement'}; // Tamil
-  if (lang == 'te') return {'notosanstelugu'}; // Telugu
-  if (lang == 'kn') return {'notosanskannada'}; // Kannada
-  if (lang == 'ml') return {'notosansmalayalam'}; // Malayalam
-  if (lang == 'gu') return {'notosansgujarati'}; // Gujarati
-  if (lang == 'pa') return {'notosansgurmukhi'}; // Punjabi (Gurmukhi)
-  if (lang == 'or') return {'notosansoriya'}; // Odia/Oriya
-  if (lang == 'si') return {'notosanssinhala'}; // Sinhala
-
-  // Southeast Asian scripts
-  if (lang == 'th') return {'notosansthai'}; // Thai
-  if (lang == 'lo') return {'notosanslao'}; // Lao
-  if (lang == 'my') return {'notosansmyanmar'}; // Myanmar/Burmese
-  if (lang == 'km') return {'notosanskhmer'}; // Khmer/Cambodian
-  if (lang == 'jv') return {'notosansjavanese'}; // Javanese
-
-  // Other scripts
-  if (lang == 'ka') return {'notosansgeorgian'}; // Georgian
-  if (lang == 'hy') return {'notosansarmenian'}; // Armenian
-  if (lang == 'am' || lang == 'ti')
-    return {'notosansethiopic'}; // Amharic, Tigrinya
-  if (lang == 'mn') return {'notosansmongolian'}; // Mongolian
-
-  // Latin/Cyrillic/Greek based languages - base notosans is sufficient
-  // Includes: English, German, French, Spanish, Italian, Portuguese,
-  // Russian, Ukrainian, Polish, Turkish, Vietnamese, Greek, etc.
-  return {};
-}
-
-/// Base font families that are always included regardless of locale.
-/// These provide core functionality and are relatively small.
-const _baseFontFamilies = <String>{
-  'notosans', // Base Latin/Cyrillic/Greek/Vietnamese
-  'roboto', // Material Design default font
-  'notosanssymbols', // Common symbols
-  'notosanssymbols2', // Additional symbols
-  'notosansmath', // Math symbols
-  'notomusic', // Music notation symbols
-  // Note: notocoloremoji (~24MB) and notoemoji (~860KB) are excluded
-  // to reduce bundle size. Add them back if emoji support is needed.
-};
-
-/// Parse supported locales from message.dart file.
-/// Reads the import statements and extracts locale codes like 'zh_cn', 'en_us', etc.
-Set<String> _parseSupportedLocales(File messageFile) {
-  final locales = <String>{};
-
-  if (!messageFile.existsSync()) {
-    _fail('Warning: message.dart not found, only base fonts will be used');
-  }
-
-  final content = messageFile.readAsStringSync();
-
-  // Match import statements like: import 'langs/zh_cn.dart';
-  final importRegex = RegExp(r"import\s+'langs/(\w+)\.dart'");
-  for (final match in importRegex.allMatches(content)) {
-    final locale = match.group(1);
-    if (locale != null) {
-      locales.add(locale);
-    }
-  }
-
-  if (locales.isEmpty) {
-    _fail(
-        'Warning: No locales found in message.dart, only base fonts will be used');
-  }
-
-  return locales;
-}
-
-/// Get required font families for the given locales.
-/// Returns a set of font family names that should be included.
-/// Automatically detects required fonts based on language code prefix.
-Set<String> _getRequiredFontFamilies(Set<String> locales) {
-  final families = <String>{..._baseFontFamilies};
-  for (final locale in locales) {
-    final localeFamilies = _getFontFamiliesForLocale(locale);
-    families.addAll(localeFamilies);
-  }
-  return families;
-}
-
-/// Check if a font file path should be included based on required font families.
-/// Font paths have the format: "fontfamily/version/filename.ext"
-/// Example: "notosanssc/v36/xxx.ttf" -> font family is "notosanssc"
-bool _fontMatchesRequiredFamilies(
-    String fontPath, Set<String> requiredFamilies) {
-  // Extract font family from path (first segment before '/')
-  final slashIndex = fontPath.indexOf('/');
-  if (slashIndex == -1) {
-    // No slash found, include by default (unusual path format)
-    return true;
-  }
-
-  final fontFamily = fontPath.substring(0, slashIndex).toLowerCase();
-  return requiredFamilies.contains(fontFamily);
-}
-
-Future<void> main(List<String> args) async {
-  try {
-    // This script is intentionally argument-free for CI convenience.
-    // It assumes it is executed from the Flutter project directory (ui/flutter),
-    // but will also try to locate pubspec.yaml by walking up.
-    final flutterDir = _findFlutterProjectRoot(Directory.current);
-
-    // Parse supported locales from message.dart
-    final messageFile =
-        File(_join(flutterDir.path, 'lib', 'i18n', 'message.dart'));
-    final supportedLocales = _parseSupportedLocales(messageFile);
-    stdout.writeln('Supported locales: ${supportedLocales.join(', ')}');
-
-    // Get required font families based on supported locales
-    final requiredFamilies = _getRequiredFontFamilies(supportedLocales);
-    stdout.writeln('Required font families: ${requiredFamilies.join(', ')}');
-
-    final webDir = Directory(_join(flutterDir.path, 'build', 'web'));
-    if (!webDir.existsSync()) {
-      _fail(
-        'Web build directory not found: ${webDir.path}\n'
-        'Did you run: flutter build web --no-web-resources-cdn ?',
-      );
-    }
-
-    final mainJs = File(_join(webDir.path, 'main.dart.js'));
-    if (!mainJs.existsSync()) {
-      _fail('main.dart.js not found at: ${mainJs.path}');
-    }
-
-    final gstaticRoot = Directory(_join(webDir.path, 'assets', 'gstatic'));
-    if (!gstaticRoot.existsSync()) gstaticRoot.createSync(recursive: true);
-
-    const gstaticSPrefix = 'https://fonts.gstatic.com/s/';
-    final original = mainJs.readAsStringSync();
-
-    // Relative font asset paths which Flutter's loader typically concatenates with:
-    //   https://fonts.gstatic.com/s/
-    // Keep this as a best-effort heuristic to cover the common concatenation pattern.
-    // Some gstatic assets include extra dot segments like: notocoloremoji/v32/Yq6P-KqIXTD0t4D9z1ESnKM3-HpFabsE4tq3luCC7p-aXxcn.0.woff2
-    // Allow dots in the path, while still restricting to font-like extensions.
-    final relAssetRegex = RegExp(
-      r"""["']([a-zA-Z0-9/_\.-]+\.(?:woff2|woff|ttf|otf|eot|svg))["']""",
-      caseSensitive: false,
-    );
-    final relAssetsUnderS = <String>{};
-    for (final m in relAssetRegex.allMatches(original)) {
-      final p = m.group(1);
-      if (p == null || p.isEmpty) continue;
-      if (p.contains('://') || p.startsWith('data:')) continue;
-      if (p.startsWith('/') ||
-          p.startsWith('assets/') ||
-          p.startsWith('packages/')) continue;
-      if (p.contains('..')) continue;
-      relAssetsUnderS.add(p);
-    }
-
-    if (relAssetsUnderS.isEmpty) {
-      _fail('No fonts.gstatic.com assets found in main.dart.js.');
-    }
-
-    // Build a download plan: dest relative path (under assets/gstatic/) -> URL.
-    // Filter fonts based on required font families to reduce package size.
-    final downloads = <String, Uri>{};
-    final skippedFonts = <String, Set<String>>{};
-
-    for (final rel in relAssetsUnderS) {
-      if (_fontMatchesRequiredFamilies(rel, requiredFamilies)) {
-        downloads[rel] = Uri.parse('$gstaticSPrefix$rel');
-      } else {
-        // Track skipped fonts and their paths for fallback generation
-        final slashIndex = rel.indexOf('/');
-        final family = slashIndex > 0 ? rel.substring(0, slashIndex) : rel;
-        skippedFonts.putIfAbsent(family, () => <String>{}).add(rel);
-      }
-    }
-
-    if (skippedFonts.isNotEmpty) {
-      stdout.writeln(
-        'Skipped ${skippedFonts.length} font families not required by supported locales:',
-      );
-      stdout.writeln('  ${skippedFonts.keys.join(', ')}');
-    }
-
-    if (downloads.isNotEmpty) {
-      stdout.writeln(
-        'Found ${downloads.length} fonts.gstatic.com assets to download...',
-      );
-
-      // Reuse a single HttpClient to avoid creating hundreds of short-lived
-      // connections (can be flaky on some environments).
-      final httpClient = HttpClient()
-        ..connectionTimeout = const Duration(seconds: 30)
-        ..idleTimeout = const Duration(seconds: 30)
-        ..maxConnectionsPerHost = 6;
-      try {
-        for (final entry in downloads.entries) {
-          final relPath = entry.key;
-          final url = entry.value;
-          final destPath = relPath.replaceAll('/', Platform.pathSeparator);
-          final dest = File(_join(gstaticRoot.path, destPath));
-          await _downloadIfMissing(httpClient, url, dest);
-        }
-      } finally {
-        httpClient.close(force: true);
-      }
-    }
-
-    // Generate empty fallback font files for skipped fonts to prevent infinite loading
-    // Empty files will cause browsers to fail fast instead of retrying indefinitely
-    if (skippedFonts.isNotEmpty) {
-      var fallbackCount = 0;
-      for (final entry in skippedFonts.entries) {
-        for (final relPath in entry.value) {
-          final destPath = relPath.replaceAll('/', Platform.pathSeparator);
-          final dest = File(_join(gstaticRoot.path, destPath));
-          if (!dest.existsSync()) {
-            dest.parent.createSync(recursive: true);
-            // Create an empty file - browsers will recognize it as invalid and skip
-            dest.writeAsBytesSync([]);
-            fallbackCount++;
-          }
-        }
-      }
-      if (fallbackCount > 0) {
-        stdout.writeln(
-          'Generated $fallbackCount empty fallback font files to prevent infinite loading',
-        );
-      }
-    }
-
-    // Rewrite remote prefix so requests become:
-    //   <origin>/assets/gstatic/<...>.woff2
-    final replacedGstatic = original.replaceAll(
-      gstaticSPrefix,
-      'assets/gstatic/',
-    );
-
-    if (replacedGstatic == original && downloads.isEmpty) {
-      stdout.writeln(
-        'No changes applied (no fonts.gstatic.com references found).',
-      );
-      exitCode = 0;
-      return;
-    }
-
-    mainJs.writeAsStringSync(replacedGstatic);
-
-    stdout.writeln('Patched: ${mainJs.path}');
-    if (downloads.isNotEmpty) {
-      stdout.writeln(
-        ' - downloaded ${downloads.length} files into: ${gstaticRoot.path}',
-      );
-    }
-    stdout.writeln(' - fonts.gstatic.com rewritten -> assets/gstatic/');
-  } catch (e, st) {
-    stderr.writeln('ERROR: $e');
-    stderr.writeln(st);
-    exitCode = 1;
-  }
-}
-
-Future<void> _downloadIfMissing(HttpClient client, Uri url, File dest) async {
-  if (dest.existsSync() && dest.lengthSync() > 0) return;
-
-  dest.parent.createSync(recursive: true);
-
-  // Network can be flaky in CI. Retry a few times on transient errors.
-  const maxAttempts = 4;
-
-  for (var attempt = 1; attempt <= maxAttempts; attempt++) {
-    final tmp = File('${dest.path}.tmp');
-    try {
-      try {
-        final req = await client.getUrl(url);
-
-        final resp = await req.close().timeout(const Duration(seconds: 60));
-        if (resp.statusCode != 200) {
-          // 404 is not transient in practice - fail fast with a clear message.
-          if (resp.statusCode == 404) {
-            _fail('Missing gstatic asset (404): $url');
-          }
-          throw HttpException('HTTP ${resp.statusCode}', uri: url);
-        }
-
-        // Stream to temp file first, then rename to avoid leaving partial files.
-        if (tmp.existsSync()) tmp.deleteSync();
-        final sink = tmp.openWrite();
-        await resp.pipe(sink).timeout(const Duration(seconds: 120));
-
-        if (!tmp.existsSync() || tmp.lengthSync() == 0) {
-          throw const FormatException('Downloaded asset is empty');
-        }
-        if (dest.existsSync()) dest.deleteSync();
-        tmp.renameSync(dest.path);
-        return;
-      } finally {
-        // no-op: HttpClient lifecycle managed by the caller
-      }
-    } on TimeoutException {
-      if (tmp.existsSync()) tmp.deleteSync();
-      if (attempt == maxAttempts) {
-        _fail('Timeout downloading asset: $url');
-      }
-    } on SocketException catch (e) {
-      if (tmp.existsSync()) tmp.deleteSync();
-      if (attempt == maxAttempts) {
-        _fail('Socket error downloading asset: $url ($e)');
-      }
-    } on HttpException catch (e) {
-      if (tmp.existsSync()) tmp.deleteSync();
-      if (attempt == maxAttempts) {
-        _fail('HTTP error downloading asset: $url ($e)');
-      }
-    } on FileSystemException catch (e) {
-      if (tmp.existsSync()) tmp.deleteSync();
-      _fail('File write error downloading asset: $url ($e)');
-    } catch (e) {
-      if (tmp.existsSync()) tmp.deleteSync();
-      if (attempt == maxAttempts) {
-        _fail('Unexpected error downloading asset: $url ($e)');
-      }
-    }
-
-    // Backoff before retrying.
-    final backoffSeconds = 1 << (attempt - 1);
-    stdout.writeln(
-      'Retrying (${attempt + 1}/$maxAttempts) for: $url (wait ${backoffSeconds}s)',
-    );
-    await Future.delayed(Duration(seconds: backoffSeconds));
-  }
-}
-
-Directory _findFlutterProjectRoot(Directory start) {
-  var dir = start;
-  for (var i = 0; i < 10; i++) {
-    final pubspec = File(_join(dir.path, 'pubspec.yaml'));
-    if (pubspec.existsSync()) return dir;
-    final parent = dir.parent;
-    if (parent.path == dir.path) break;
-    dir = parent;
-  }
-  // Fallback: use current directory, error messages will explain what is missing.
-  return start;
-}
-
-Never _fail(String msg) {
-  throw FormatException(msg);
-}
-
-String _join(String a, [String? b, String? c, String? d]) {
-  final parts = <String>[
-    a,
-    if (b != null) b,
-    if (c != null) c,
-    if (d != null) d,
-  ];
-  return parts.join(Platform.pathSeparator);
-}
@@ -25,11 +25,10 @@ on:
      - ".github/workflows/test.yml"
      - "go.mod"
      - "go.sum"
-  workflow_dispatch:

 env:
-  GO_VERSION: "1.24"
-  FLUTTER_VERSION: "3.38.7"
+  GO_VERSION: "1.19"
+  FLUTTER_VERSION: "3.16.1"

 jobs:
  #  lint:
@@ -54,56 +53,14 @@ jobs:
        with:
          go-version: ${{ env.GO_VERSION }}
      - name: Run Unit tests.
-        run: |
-          # 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
+        run: go test $(go list ./... | grep -v /cmd/ | grep -v /bind/ ) -v -covermode=count -coverprofile=coverage.txt
+      - uses: codecov/codecov-action@v3
        with:
          files: ./coverage.txt
-          token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
-  build-desktop:
-    name: Build desktop check
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [windows-2022, macos-latest, ubuntu-22.04, ubuntu-22.04-arm]
-    needs: [test]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.GO_VERSION }}
-      - uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-          channel: master
-      - if: runner.os == 'Windows'
-        run: |
-          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
-          cd ui/flutter
-          flutter build windows
-      - if: runner.os == 'macOS'
-        run: |
-          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
-          cd ui/flutter
-          flutter build macos
-      - if: runner.os == 'Linux'
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev libkeybinder-3.0-dev
-          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
-          cd ui/flutter
-          flutter build linux
-  build-mobile:
-    name: Build mobile check
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-14, ubuntu-latest]
+  build:
+    name: Build check
+    runs-on: ubuntu-latest
+    #    needs: [lint, test]
    needs: [test]
    steps:
      - uses: actions/checkout@v3
@@ -114,63 +71,10 @@ jobs:
        with:
          flutter-version: ${{ env.FLUTTER_VERSION }}
      - run: |
-          go install golang.org/x/mobile/cmd/gomobile@latest
-          go get golang.org/x/mobile/bind
-          gomobile init
-      - if: runner.os == 'macOS'
-        run: |
-          gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
-          cd ui/flutter
-          flutter build ipa --no-codesign
-      - if: runner.os == 'Linux'
-        uses: actions/setup-java@v3
-        with:
-          distribution: "zulu"
-          java-version: "17"
-      - if: runner.os == 'Linux'
-        run: |
-          gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
-          cd ui/flutter
-          flutter build apk
-
-  build-web:
-    name: Build web check
-    runs-on: ubuntu-latest
-    needs: [test]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.GO_VERSION }}
-      - uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
+          sudo apt-get update -y
+          sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev
      - name: Build
        run: |
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
          cd ui/flutter
-          flutter build web --no-web-resources-cdn
-          dart ../../.github/workflows/scripts/flutter_local_font.dart
-          cd ../../
-          rm -rf cmd/web/dist
-          cp -r ui/flutter/build/web cmd/web/dist
-          go build -tags nosqlite,web -ldflags="-s -w" github.com/GopeedLab/gopeed/cmd/web
-  build-docker:
-    name: Build docker check
-    runs-on: ubuntu-latest
-    needs: [test]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.GO_VERSION }}
-      - uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-      - name: Build
-        run: |
-          cd ui/flutter
-          flutter build web --no-web-resources-cdn
-          cd ../../
-          rm -rf cmd/web/dist
-          cp -r ui/flutter/build/web cmd/web/dist
-          docker build -t gopeed .
+          flutter build linux
@@ -21,7 +21,6 @@ The internationalization files of Gopeed are located in the `ui/flutter/lib/i18n
 You only need to add the corresponding language file in this directory.

 Please refer to `en_us.dart` for translation.
-words prefixed with `@` are not meant to be translated.

 ## flutter development

@@ -1,29 +0,0 @@
-# Hướng dẫn đóng góp cho Gopeed
-
-Trước tiên, cảm ơn bạn đã quan tâm đến việc đóng góp cho Gopeed. Hướng dẫn này sẽ giúp bạn tham gia
-phát triển Gopeed một cách tốt hơn.
-
-## Mô tả nhánh
-
-Dự án này chỉ có một nhánh chính duy nhất, đó là nhánh `main`. Nếu bạn muốn tham gia vào
-phát triển Gopeed, hãy fork dự án này trước, sau đó phát triển trong dự án fork của bạn. Sau khi
-hoàn thành phát triển, gửi một PR đến dự án này và merge vào nhánh `main`.
-
-## Phát triển cục bộ
-
-Đề nghị phát triển và gỡ lỗi thông qua web. Đầu tiên, khởi động dịch vụ backend bằng cách chạy
-lệnh `go run cmd/api/main.go` trong dòng lệnh, cổng mặc định của dịch vụ là `9999`, sau đó
-khởi động dự án flutter frontend trong chế độ `debug` để chạy.
-
-## Dịch thuật
-
-Các tệp quốc tế hóa của Gopeed được đặt trong thư mục `ui/flutter/lib/i18n/langs`.
-Bạn chỉ cần thêm tệp ngôn ngữ tương ứng trong thư mục này.
-
-Vui lòng tham khảo `en_us.dart` để biết cách dịch thuật.
-
-## Phát triển flutter
-
-Đừng quên chạy `dart format ./ui/flutter` trước khi commit để giữ mã của bạn theo định dạng dart chuẩn.
-
-Bật build_runner watcher nếu bạn muốn chỉnh sửa api/models:
@@ -1,23 +1,22 @@
-FROM golang:1.24.11 AS go
+FROM instrumentisto/flutter:3.16.1 AS flutter
+WORKDIR /app
+COPY ./ui/flutter/pubspec.yaml ./ui/flutter/pubspec.lock ./
+RUN flutter pub get
+COPY ./ui/flutter ./
+RUN flutter build web --web-renderer html
+
+FROM golang:1.19.3 AS go
 WORKDIR /app
 COPY ./go.mod ./go.sum ./
 RUN go mod download
 COPY . .
-ARG VERSION=dev
-RUN CGO_ENABLED=0 go build -tags nosqlite,web \
-      -ldflags="-s -w -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION -X github.com/GopeedLab/gopeed/pkg/base.InDocker=true" \
-      -o dist/gopeed github.com/GopeedLab/gopeed/cmd/web
+COPY --from=flutter /app/build/web ./cmd/web/dist
+RUN CGO_ENABLED=0 go build -tags nosqlite,web -ldflags="-s -w" -o dist/gopeed github.com/GopeedLab/gopeed/cmd/web

-FROM alpine:3.18
+FROM alpine:3.14.2
 LABEL maintainer="monkeyWie"
 WORKDIR /app
 COPY --from=go /app/dist/gopeed ./
-COPY entrypoint.sh ./entrypoint.sh
-RUN apk update && \
-    apk add --no-cache su-exec ; \
-    chmod +x ./entrypoint.sh && \
-    rm -rf /var/cache/apk/*
 VOLUME ["/app/storage"]
-ENV PUID=0 PGID=0 UMASK=022
 EXPOSE 9999
-ENTRYPOINT ["./entrypoint.sh"]
+ENTRYPOINT ["./gopeed"]
@@ -1,173 +1,40 @@
-# [![](_docs/img/banner.png)](https://gopeed.com)
-
 [![Test Status](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
 [![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
 [![Release](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
 [![Download](https://img.shields.io/github/downloads/GopeedLab/gopeed/total.svg)](https://github.com/GopeedLab/gopeed/releases)
 [![Donate](https://img.shields.io/badge/%24-donate-ff69b4.svg)](https://docs.gopeed.com/donate.html)
-[![WeChat](https://img.shields.io/badge/WeChat%20Official%20Account-07C160?logo=wechat&logoColor=white)](https://raw.githubusercontent.com/GopeedLab/gopeed/main/_docs/img/weixin.png)
 [![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)

-<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+![](_docs/img/banner.png)

 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)

-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md)

-## 🚀 Introduction
+## Introduction

 Gopeed (full name Go Speed), a high-speed downloader developed by `Golang` + `Flutter`, supports (HTTP, BitTorrent, Magnet) protocol, and supports all platforms. In addition to basic download functions, Gopeed is also a highly customizable downloader that supports implementing more features through integration with [APIs](https://docs.gopeed.com/dev-api.html) or installation and development of [extensions](https://docs.gopeed.com/dev-extension.html).

+
 Visit ✈ [Official Website](https://gopeed.com) | 📖 [Official Docs](https://docs.gopeed.com)

-## ⬇️ Download
+## Install

-<table>
-  <tbody>
-    <tr>
-      <td rowspan="4">🪟 Windows</td>
-      <td rowspan="2"><code>EXE</code></td>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-arm64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="2"><code>Portable</code></td>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-arm64-portable.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="3">🍎 MacOS</td>
-      <td rowspan="3"><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>
-      <td>amd64</td>
-      <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <td><code>SNAP</code></td>
-      <td>amd64</td>
-      <td><a href="https://snapcraft.io/gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="2"><code>DEB</code></td>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$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-$version-linux-amd64.AppImage">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-arm64.AppImage">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="4">🤖 Android</td>
-      <td rowspan="4"><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>
-      <td><code>IPA</code></td>
-      <td>universal</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">📥</a></td>
-    </tr>
-    <tr>
-      <td>🐳 Docker</td>
-      <td>-</td>
-      <td>universal</td>
-      <td><a href="https://hub.docker.com/r/liwei2633/gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <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-$version-qnap-amd64.qpkg">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$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-$version-windows-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-arm64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>386</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$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-$version-macos-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$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-$version-linux-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-arm64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>386</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-386.zip">📥</a></td>
-    </tr>
-  </tbody>
-</table>
+**Supported platforms**

-More about installation, please refer to [Installation](https://docs.gopeed.com/install.html)
+- [x] windows
+- [x] macos
+- [x] linux
+- [x] android
+- [x] ios
+- [x] web
+- [x] docker

-### 🛠️ Command tool
+[Download](https://github.com/GopeedLab/gopeed/releases/latest)
+
+> Tips: If the macos open failed, please execute the `xattr -d com.apple.quarantine /Applications/Gopeed.app` command in the terminal
+
+### Command tool

 use `go install`:

@@ -175,46 +42,56 @@ use `go install`:
 go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ```

-## 🔌 Browser Extension
+### Docker

-Gopeed also provides a browser extension to take over browser downloads, supporting browsers such as Chrome, Edge, Firefox, etc., please refer to: [https://github.com/GopeedLab/browser-extension](https://github.com/GopeedLab/browser-extension)
+#### Start directly

-## 📱 WeChat Official Account
+```bash
+docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads -v /path/to/storage:/app/storage liwei2633/gopeed
+```

-Follow our WeChat Official Account to get the latest updates and news.
+[More details for docker](https://docs.gopeed.com/install.html#docker-installation)

-<img src="_docs/img/weixin.png" width="200" />
+#### Using Docker Compose

-## 💝 Donate
+```bash
+docker-compose up -d
+```
+
+#### Access Gopeed
+
+When the docker container is running, you can access the web page through `http://localhost:9999`.
+
+## Donate

 If you like this project, please consider [donating](https://docs.gopeed.com/donate.html) to support the development of this project, thank you!

-## 🖼️ Showcase
+## Showcase

 ![](_docs/img/ui-demo.png)

-## 👨‍💻 Development
+## Development

 This project is divided into two parts, the front end uses `flutter`, the back end uses `Golang`, and the two sides communicate through the `http` protocol. On the unix system, `unix socket` is used, and on the windows system, `tcp` protocol is used.

 > The front code is located in the `ui/flutter` directory.

-### 🌍 Environment
+### Environment

-1. Golang 1.24+
-2. Flutter 3.38+
+1. Golang 1.19+
+2. Flutter 3.10+

-### 📋 Clone
+### Clone

 ```bash
 git clone [email protected]:GopeedLab/gopeed.git
 ```

-### 🤝 Contributing
+### Contributing

 Please refer to [CONTRIBUTING.md](/CONTRIBUTING.md)

-### 🏗️ Build
+### Build

 #### Desktop

@@ -261,7 +138,7 @@ command:
 - android

 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```
@@ -287,18 +164,18 @@ cp -r ui/flutter/build/web cmd/web/dist
 go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
 ```

-## ❤️ Credits
+## Credits

-### 👥 Contributors
+### Contributors

 <a href="https://github.com/GopeedLab/gopeed/graphs/contributors">
  <img src="https://contrib.rocks/image?repo=GopeedLab/gopeed" />
 </a>

-### 🏢 JetBrains
+### JetBrains

 [![goland](_docs/img/goland.svg)](https://www.jetbrains.com/?from=gopeed)

-## 📄 License
+## License

 [GPLv3](LICENSE)
@@ -1,201 +1,96 @@
-# [![](_docs/img/banner.png)](https://gopeed.com)
-
 [![Test Status](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
 [![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
 [![Release](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
 [![Download](https://img.shields.io/github/downloads/GopeedLab/gopeed/total.svg)](https://github.com/GopeedLab/gopeed/releases)
 [![Donate](https://img.shields.io/badge/%24-donate-ff69b4.svg)](https://docs.gopeed.com/donate.html)
-[![WeChat](https://img.shields.io/badge/WeChat%20Official%20Account-07C160?logo=wechat&logoColor=white)](https://raw.githubusercontent.com/GopeedLab/gopeed/main/_docs/img/weixin.png)
 [![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)

-<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+![](_docs/img/banner.png)

 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)

-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md)

-## 🚀 はじめに
+## はじめに

 Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された高速ダウンローダーで、(HTTP、BitTorrent、Magnet) プロトコルをサポートし、すべてのプラットフォームをサポートします。基本的なダウンロード機能に加え、[APIs](https://docs.gopeed.com/dev-api.html)との連動や[拡張機能](https://docs.gopeed.com/dev-extension.html)のインストール・開発による追加機能にも対応した、カスタマイズ性の高いダウンローダーです。

 見て下さい ✈ [公式ウェブサイト](https://gopeed.com) | 📖 [開発ドキュメント](https://docs.gopeed.com)

-## ⬇️ インストール
+## インストール

-<table>
-  <tbody>
-    <tr>
-      <td rowspan="2">🪟 Windows</td>
-      <td><code>EXE</code></td>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$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-$version-windows-amd64-portable.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="3">🍎 MacOS</td>
-      <td rowspan="3"><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>
-      <td>amd64</td>
-      <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <td><code>SNAP</code></td>
-      <td>amd64</td>
-      <td><a href="https://snapcraft.io/gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="2"><code>DEB</code></td>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$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-$version-linux-amd64.AppImage">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-arm64.AppImage">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="4">🤖 Android</td>
-      <td rowspan="4"><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>
-      <td><code>IPA</code></td>
-      <td>universal</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">📥</a></td>
-    </tr>
-    <tr>
-      <td>🐳 Docker</td>
-      <td>-</td>
-      <td>universal</td>
-      <td><a href="https://hub.docker.com/r/liwei2633/gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <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-$version-qnap-amd64.qpkg">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$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-$version-windows-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-arm64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>386</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$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-$version-macos-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$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-$version-linux-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-arm64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>386</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-386.zip">📥</a></td>
-    </tr>
-  </tbody>
-</table>
-インストールについての詳細は、[インストール](https://docs.gopeed.com/install.html)を参照してください。
+**サポートするプラットフォーム**

-### 🛠️ コマンドツール
+- [x] windows
+- [x] macos
+- [x] linux
+- [x] android
+- [x] ios
+- [x] web
+- [x] docker

-## 📱 WeChat 公式アカウント
+[ダウンロード](https://github.com/GopeedLab/gopeed/releases/latest)

-公式アカウントをフォローして、最新のアップデートやニュースを入手してください。
+> ヒント: macos を開くのに失敗した場合は、ターミナルで `xattr -d com.apple.quarantine /Applications/Gopeed.app` コマンドを実行してください

-<img src="_docs/img/weixin.png" width="200" />
+### コマンドツール

-## 💝 寄付
+`go install` を使用:

-もしこのプロジェクトがお気に召しましたら、このプロジェクトの発展を支援するために[寄付](https://docs.gopeed.com/donate.html)をご検討ください！
+```bash
+go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
+```

-## 🖼️ ショーケース
+### Docker
+
+#### 直接始める
+
+```bash
+docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads -v /path/to/storage:/app/storage liwei2633/gopeed
+```
+
+[Dockerの使用については](https://docs.gopeed.com/install.html#docker-installation)
+
+#### Docker Compose の使用
+
+```bash
+docker-compose up -d
+```
+
+#### Gopeed へのアクセス
+
+docker コンテナが起動しているときは、`http://localhost:9999` からウェブページにアクセスできます。
+
+## 寄付
+
+もしこのプロジェクトがお気に召しましたら、このプロジェクトの発展を支援するために[寄付](/.donate/index.md#donate)をご検討ください！
+
+## ショーケース

 ![](_docs/img/ui-demo.png)

-## 👨‍💻 開発
+## 開発

 このプロジェクトは二つの部分に分かれており、フロントエンドでは `flutter` を、バックエンドでは `Golang` を使用し、両者は `http` プロトコルで通信する。ユニックスシステムでは `unix socket` を、ウィンドウズシステムでは `tcp` プロトコルを使用します。

 > フロントコードは `ui/flutter` ディレクトリにあります。

-### 🌍 環境
+### 環境

-1. Go 言語 1.24+
-2. Flutter 3.38+
+1. Go 言語 1.19+
+2. Flutter 3.10+

-### 📋 クローン
+### クローン

 ```bash
 git clone [email protected]:GopeedLab/gopeed.git
 ```

-### 🤝 コントリビュート
+### コントリビュート

 [CONTRIBUTING.md](/CONTRIBUTING_ja-JP.md) をご参照ください

-### 🏗️ ビルド
+### ビルド

 #### デスクトップ

@@ -242,7 +137,7 @@ gomobile init
 - android

 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```
@@ -268,7 +163,7 @@ cp -r ui/flutter/build/web cmd/web/dist
 go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
 ```

-## ❤️ 感謝
+## 感謝

 ### コントリビューター

@@ -1,291 +0,0 @@
-# [![](_docs/img/banner.png)](https://gopeed.com)
-
-[![Trạng thái kiểm tra](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
-[![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
-[![Phiên bản](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
-[![Tải về](https://img.shields.io/github/downloads/GopeedLab/gopeed/total.svg)](https://github.com/GopeedLab/gopeed/releases)
-[![Ủng hộ](https://img.shields.io/badge/%24-ủng%20hộ-ff69b4.svg)](https://docs.gopeed.com/donate.html)
-[![WeChat](https://img.shields.io/badge/WeChat%20Official%20Account-07C160?logo=wechat&logoColor=white)](https://raw.githubusercontent.com/GopeedLab/gopeed/main/_docs/img/weixin.png)
-[![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)
-
-<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-
-[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
-
-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
-
-## 🚀 Giới thiệu
-
-Gopeed (tên đầy đủ Go Speed), một công cụ tải xuống tốc độ cao được phát triển bởi `Golang` + `Flutter`, hỗ trợ giao thức (HTTP, BitTorrent, Magnet) và hỗ trợ tất cả các nền tảng. Ngoài các chức năng tải xuống cơ bản, Gopeed còn là một công cụ tải xuống có thể tùy chỉnh cao cho phép triển khai thêm tính năng thông qua việc tích hợp với [APIs](https://docs.gopeed.com/dev-api.html) hoặc cài đặt và phát triển các [tiện ích mở rộng](https://docs.gopeed.com/dev-extension.html).
-
-Truy cập ✈ [Trang web chính thức](https://gopeed.com) | 📖 [Tài liệu chính thức](https://docs.gopeed.com)
-
-## ⬇️ Tải về
-
-<table>
-  <tbody>
-    <tr>
-      <td rowspan="2">🪟 Windows</td>
-      <td><code>EXE</code></td>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$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-$version-windows-amd64-portable.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="3">🍎 MacOS</td>
-      <td rowspan="3"><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>
-      <td>amd64</td>
-      <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <td><code>SNAP</code></td>
-      <td>amd64</td>
-      <td><a href="https://snapcraft.io/gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="2"><code>DEB</code></td>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$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-$version-linux-amd64.AppImage">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-arm64.AppImage">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="4">🤖 Android</td>
-      <td rowspan="4"><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>
-      <td><code>IPA</code></td>
-      <td>universal</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">📥</a></td>
-    </tr>
-    <tr>
-      <td>🐳 Docker</td>
-      <td>-</td>
-      <td>universal</td>
-      <td><a href="https://hub.docker.com/r/liwei2633/gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <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-$version-qnap-amd64.qpkg">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$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-$version-windows-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-arm64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>386</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$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-$version-macos-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$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-$version-linux-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-arm64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>386</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-386.zip">📥</a></td>
-    </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
-
-Sử dụng `go install`:
-
-```bash
-go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
-```
-
-## 📱 WeChat Official Account
-
-Theo dõi tài khoản chính thức để nhận các cập nhật và tin tức mới nhất.
-
-<img src="_docs/img/weixin.png" width="200" />
-
-## 💝 Quyên góp
-
-Nếu bạn thích dự án này, xin vui lòng xem xét [quyên góp](https://docs.gopeed.com/donate.html) để hỗ trợ phát triển dự án này, cảm ơn bạn!
-
-## 🖼️ Trưng bày
-
-![](_docs/img/ui-demo.png)
-
-## 👨‍💻 Development
-
-Dự án này được chia thành hai phần, phần giao diện sử dụng `flutter`, phần backend sử dụng `Golang`, và hai phía giao tiếp thông qua giao thức `http`. Trên hệ thống unix, sử dụng `unix socket`, và trên hệ thống windows, sử dụng giao thức `tcp`.
-
-> Mã giao diện nằm trong thư mục `ui/flutter`.
-
-### 🌍 Environment
-
-1. Golang 1.24+
-2. Flutter 3.38+
-
-### 📋 Clone
-
-```bash
-git clone [email protected]:GopeedLab/gopeed.git
-```
-
-### 🤝 Đóng góp
-
-Vui lòng tham khảo [CONTRIBUTING_vi-VN.md](/CONTRIBUTING_vi-VN.md)
-
-### 🏗️ Xây dựng
-
-#### Desktop
-
-Trước tiên, bạn cần cấu hình môi trường theo tài liệu chính thức của [Tài liệu trang web máy tính để bàn Flutter](https://docs.flutter.dev/development/platform-integration/desktop), sau đó bạn cần đảm bảo môi trường cgo được thiết lập đúng. Để biết hướng dẫn chi tiết về cách thiết lập môi trường cgo, vui lòng tham khảo các tài liệu tương ứng có sẵn trực tuyến.
-
-command:
-
- windows
-
-```bash
-go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
-cd ui/flutter
-flutter build windows
-```
-
- macos
-
-```bash
-go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
-cd ui/flutter
-flutter build macos
-```
-
- linux
-
-```bash
-go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
-cd ui/flutter
-flutter build linux
-```
-
-#### Mobile
-
-Giống như trước đây, bạn cũng cần chuẩn bị môi trường `cgo` và sau đó cài đặt `gomobile`:
-
-```bash
-go install golang.org/x/mobile/cmd/gomobile@latest
-go get golang.org/x/mobile/bind
-gomobile init
-```
-
-command:
-
- android
-
-```bash
-gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
-cd ui/flutter
-flutter build apk
-```
-
- ios
-
-```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
-cd ui/flutter
-flutter build ios --no-codesign
-```
-
-#### Web
-
-command:
-
-```bash
-cd ui/flutter
-flutter build web
-cd ../../
-rm -rf cmd/web/dist
-cp -r ui/flutter/build/web cmd/web/dist
-go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
-```
-
-## ❤️ Tín dụng
-
-### Người đóng góp
-
-<a href="https://github.com/GopeedLab/gopeed/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=GopeedLab/gopeed" />
-</a>
-
-### JetBrains
-
-[![goland](_docs/img/goland.svg)](https://www.jetbrains.com/?from=gopeed)
-
-## Giấy phép
-
-[GPLv3](LICENSE)
@@ -1,164 +1,39 @@
-# [![](_docs/img/banner.png)](https://gopeed.com)
-
 [![Test Status](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
 [![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
 [![Release](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
 [![Download](https://img.shields.io/github/downloads/GopeedLab/gopeed/total.svg)](https://github.com/GopeedLab/gopeed/releases)
 [![Donate](https://img.shields.io/badge/%24-donate-ff69b4.svg)](https://docs.gopeed.com/zh/donate.html)
-[![WeChat](https://img.shields.io/badge/%E5%BE%AE%E4%BF%A1%E5%85%AC%E4%BC%97%E5%8F%B7-07C160?logo=wechat&logoColor=white)](https://raw.githubusercontent.com/GopeedLab/gopeed/main/_docs/img/weixin.png)
 [![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)

-<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+![](_docs/img/banner.png)

 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)

-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md)

-## 🚀 介绍
+## 介绍

 Gopeed（全称 Go Speed），直译过来中文名叫做`够快下载器`（不是狗屁下载器！），是一款由`Golang`+`Flutter`开发的高速下载器，支持（HTTP、BitTorrent、Magnet）协议下载，并且支持全平台使用。除了基本的下载功能外，Gopeed 还是一款高度可定制化的下载器，支持通过对接[APIs](https://docs.gopeed.com/zh/dev-api.html)或者安装和开发[扩展](https://docs.gopeed.com/zh/dev-extension.html)来实现更多的功能。

 访问 ✈ [官方网站](https://gopeed.com/zh-CN) | 📖 [官方文档](https://docs.gopeed.com/zh/)

-## ⬇️ 下载
+## 安装

-<table>
-  <tbody>
-    <tr>
-      <td rowspan="2">🪟 Windows</td>
-      <td><code>EXE</code></td>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$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-$version-windows-amd64-portable.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="3">🍎 MacOS</td>
-      <td rowspan="3"><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>
-      <td>amd64</td>
-      <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <td><code>SNAP</code></td>
-      <td>amd64</td>
-      <td><a href="https://snapcraft.io/gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="2"><code>DEB</code></td>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$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-$version-linux-amd64.AppImage">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-arm64.AppImage">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="4">🤖 Android</td>
-      <td rowspan="4"><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>
-      <td><code>IPA</code></td>
-      <td>universal</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">📥</a></td>
-    </tr>
-    <tr>
-      <td>🐳 Docker</td>
-      <td>-</td>
-      <td>universal</td>
-      <td><a href="https://hub.docker.com/r/liwei2633/gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <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-$version-qnap-amd64.qpkg">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$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-$version-windows-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-arm64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>386</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$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-$version-macos-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$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-$version-linux-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-arm64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>386</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-386.zip">📥</a></td>
-    </tr>
-  </tbody>
-</table>
-更多关于安装的内容请参考[安装文档](https://docs.gopeed.com/zh/install.html)
+**已支持平台**

-### 🛠️ 命令行工具
+- [x] windows
+- [x] macos
+- [x] linux
+- [x] android
+- [x] ios
+- [x] web
+- [x] docker
+
+[前往下载](https://github.com/GopeedLab/gopeed/releases/latest)
+
+> 注：macos 版本运行如果提示损坏，请在终端执行 `xattr -d com.apple.quarantine /Applications/Gopeed.app` 命令
+
+### 命令行工具

 使用`go install`安装：

@@ -166,46 +41,56 @@ Gopeed（全称 Go Speed），直译过来中文名叫做`够快下载器`（不
 go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ```

-## 🔌 浏览器扩展
+### Docker

-Gopeed 还提供了浏览器扩展用于接管浏览器下载，支持 Chrome、Edge、Firefox 等浏览器，具体请参考：[https://github.com/GopeedLab/browser-extension](https://github.com/GopeedLab/browser-extension)
+#### 直接运行

-## 📱 微信公众号
+```bash
+docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads -v /path/to/storage:/app/storage liwei2633/gopeed
+```

-关注公众号获取项目最新动态和资讯。
+[更多关于 Docker 的使用](https://docs.gopeed.com/zh/install.html#docker-%E5%AE%89%E8%A3%85)

-<img src="_docs/img/weixin.png" width="200" />
+#### 使用 Docker Compose

-## 💝 赞助
+```bash
+docker-compose up -d
+```
+
+#### 访问服务
+
+当 docker 容器运行时，可以通过 `http://localhost:9999` 访问 web 页面。
+
+## 赞助

 如果觉得项目对你有帮助，请考虑[赞助](https://docs.gopeed.com/zh/donate)以支持这个项目的发展，非常感谢！

-## 🖼️ 界面展示
+## 界面展示

 ![](_docs/img/ui-demo.png)

-## 👨‍💻 开发
+## 开发

 本项目分为前端和后端两个部分，前端使用`flutter`，后端使用`Golang`，两边通过`http`协议进行通讯，在 unix 系统下，使用的是`unix socket`，在 windows 系统下，使用的是`tcp`协议。

 > 前端代码位于`ui/flutter`目录下。

-### 🌍 环境要求
+### 环境要求

-1. Golang 1.24+
-2. Flutter 3.38+
+1. Golang 1.19+
+2. Flutter 3.10+

-### 📋 克隆项目
+### 克隆项目

 ```bash
 git clone [email protected]:GopeedLab/gopeed.git
 ```

-### 🤝 贡献代码
+### 贡献代码

 请参考[贡献指南](CONTRIBUTING_zh-CN.md)

-### 🏗️ 编译
+### 编译

 #### 桌面端

@@ -252,7 +137,7 @@ gomobile init
 - android

 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```
@@ -278,7 +163,7 @@ cp -r ui/flutter/build/web cmd/web/dist
 go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
 ```

-## ❤️ 感谢
+## 感谢

 ### 贡献者

@@ -1,165 +1,39 @@
-# [![](_docs/img/banner.png)](https://gopeed.com)
-
 [![Test Status](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
 [![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
 [![Release](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
 [![Download](https://img.shields.io/github/downloads/GopeedLab/gopeed/total.svg)](https://github.com/GopeedLab/gopeed/releases)
 [![Donate](https://img.shields.io/badge/%24-donate-ff69b4.svg)](https://docs.gopeed.com/donate.html)
-[![WeChat](https://img.shields.io/badge/%E5%BE%AE%E4%BF%A1%E5%85%AC%E4%BC%97%E5%8F%B7-07C160?logo=wechat&logoColor=white)](https://raw.githubusercontent.com/GopeedLab/gopeed/main/_docs/img/weixin.png)
 [![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)

-<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+![](_docs/img/banner.png)

 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)

-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md)

-## 🚀 簡介
+## 簡介

 Gopeed（全稱 Go Speed），是一款使用`Golang`+`Flutter`編寫的高速下載軟體，支援（HTTP、BitTorrent、Magnet）協定，同時支援所有的平台。

 前往 ✈ [主頁](https://gopeed.com/zh-CN) | 📖 [文檔](https://docs.gopeed.com/zh/)

-## ⬇️ 下載
+## 安裝

-<table>
-  <tbody>
-    <tr>
-      <td rowspan="2">🪟 Windows</td>
-      <td><code>EXE</code></td>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$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-$version-windows-amd64-portable.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="3">🍎 MacOS</td>
-      <td rowspan="3"><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>
-      <td>amd64</td>
-      <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <td><code>SNAP</code></td>
-      <td>amd64</td>
-      <td><a href="https://snapcraft.io/gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="2"><code>DEB</code></td>
-      <td>amd64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$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-$version-linux-amd64.AppImage">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-arm64.AppImage">📥</a></td>
-    </tr>
-    <tr>
-      <td rowspan="4">🤖 Android</td>
-      <td rowspan="4"><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>
-      <td><code>IPA</code></td>
-      <td>universal</td>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">📥</a></td>
-    </tr>
-    <tr>
-      <td>🐳 Docker</td>
-      <td>-</td>
-      <td>universal</td>
-      <td><a href="https://hub.docker.com/r/liwei2633/gopeed">📥</a></td>
-    </tr>
-    <tr>
-      <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-$version-qnap-amd64.qpkg">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$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-$version-windows-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-arm64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>386</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$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-$version-macos-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$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-$version-linux-amd64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>arm64</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-arm64.zip">📥</a></td>
-    </tr>
-    <tr>
-      <td>386</td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-386.zip">📥</a></td>
-    </tr>
-  </tbody>
-</table>
+**已支援的平台**

-更多關於安裝的內容請參考[安裝文檔](https://docs.gopeed.com/zh/install.html)
+- [x] Windows
+- [x] MacOS
+- [x] Linux
+- [x] Android
+- [x] iOS
+- [x] Web
+- [x] Docker

-### 🛠️ 使用 CLI 安裝
+[下載](https://github.com/GopeedLab/gopeed/releases/latest)
+
+> 註：MacOS 版運行時若提示損壞，請在終端中執行 `xattr -d com.apple.quarantine /Applications/Gopeed.app`
+
+### 使用CLI安裝

 使用`go install`安裝：

@@ -167,42 +41,56 @@ Gopeed（全稱 Go Speed），是一款使用`Golang`+`Flutter`編寫的高速
 go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ```

-## 📱 微信公眾號
+### Docker

-關注公眾號獲取項目最新動態和資訊。
+#### 直接執行

-<img src="_docs/img/weixin.png" width="200" />
+```bash
+docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads -v /path/to/storage:/app/storage liwei2633/gopeed
+```

-## 💝 贊助
+[更多關於 Docker 的使用](https://docs.gopeed.com/zh/install.html#docker-%E5%AE%89%E8%A3%85)
+
+#### 使用 Docker Compose
+
+```bash
+docker-compose up -d
+```
+
+#### 訪問服務
+
+當 docker 容器運作時，可以通過 `http://localhost:9999` 訪問 web 頁面。
+
+## 贊助

 如果你認為該項目對你有所幫助，請考慮[贊助](https://docs.gopeed.com/zh/donate)以支持該項目的持續發展，謝謝！

-## 🖼️ 軟體介面
+## 軟體介面

 ![](_docs/img/ui-demo.png)

-## 👨‍💻 開發
+## 開發

 該項目分為前端與後端，前端使用`flutter`編寫，後端使用`Golang`編寫，兩邊通過`http`協定進行通訊，在 unix 系統下，則使用`unix socket`，在 windows 系統下，則使用`tcp`協定。

 > 前端代碼位於`ui/flutter`目錄內。

-### 🌍 開發環境
+### 開發環境

-1. Golang 1.24+
-2. Flutter 3.38+
+1. Golang 1.19+
+2. Flutter 3.10+

-### 📋 克隆項目
+### 克隆項目

 ```bash
 git clone [email protected]:GopeedLab/gopeed.git
 ```

-### 🤝 協助開發
+### 協助開發

 請參考[協助指南](CONTRIBUTING_zh-TW.md)

-### 🏗️ 編譯
+### 編譯

 #### 桌面端

@@ -249,7 +137,7 @@ gomobile init
 - android

 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```
@@ -275,7 +163,7 @@ cp -r ui/flutter/build/web cmd/web/dist
 go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
 ```

-## ❤️ 感謝
+## 感謝

 ### 貢獻者

@@ -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"
@@ -2,14 +2,13 @@ package main

 import (
 	"fmt"
-	"strings"
-	"sync"
-
 	"github.com/GopeedLab/gopeed/internal/fetcher"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/download"
 	"github.com/GopeedLab/gopeed/pkg/protocol/http"
 	"github.com/GopeedLab/gopeed/pkg/util"
+	"strings"
+	"sync"
 )

 const progressWidth = 20
@@ -66,9 +65,6 @@ var (

 func printProgress(task *download.Task, title string) {
 	var rate float64
-	if task.Meta.Res == nil {
-		task = emptyTask
-	}
 	if task.Meta.Res.Size <= 0 {
 		rate = 0
 	} else {
@@ -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"))
-}
@@ -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)
-}
@@ -1,210 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"context"
-	"encoding/binary"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"os"
-	"time"
-
-	"github.com/pkg/browser"
-)
-
-type Message struct {
-	Method string          `json:"method"`
-	Meta   map[string]any  `json:"meta"`
-	Params json.RawMessage `json:"params"`
-}
-
-type Response struct {
-	Code    int    `json:"code"`
-	Data    any    `json:"data,omitempty"`
-	Message string `json:"message,omitempty"`
-}
-
-func check() (data bool, err error) {
-	conn, err := Dial()
-	if err != nil {
-		return false, err
-	}
-	defer conn.Close()
-	return true, nil
-}
-
-func wakeup(hidden bool) error {
-	running, _ := check()
-	if running {
-		return 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")
-}
-
-// postToFlutter sends a POST request to Flutter RPC server
-func postToFlutter(path string, body []byte, headers map[string]string, timeout time.Duration) (*http.Response, error) {
-	client := &http.Client{
-		Transport: &http.Transport{
-			DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
-				return Dial()
-			},
-		},
-		Timeout: timeout,
-	}
-	req, err := http.NewRequest("POST", "http://127.0.0.1"+path, bytes.NewBuffer(body))
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", "application/json")
-	for k, v := range headers {
-		req.Header.Set(k, v)
-	}
-	return client.Do(req)
-}
-
-var apiMap = map[string]func(message *Message) (data any, err error){
-	"ping": func(message *Message) (data any, err error) {
-		return check()
-	},
-	"wakeup": func(message *Message) (data any, err error) {
-		silent := false
-		if v, ok := message.Meta["silent"]; ok {
-			silent, _ = v.(bool)
-		}
-		err = wakeup(silent)
-		return
-	},
-	"create": func(message *Message) (data any, err error) {
-		buf, err := message.Params.MarshalJSON()
-		if err != nil {
-			return
-		}
-
-		silent := false
-		if v, ok := message.Meta["silent"]; ok {
-			silent, _ = v.(bool)
-		}
-
-		if err := wakeup(silent); err != nil {
-			return nil, err
-		}
-
-		headers := make(map[string]string)
-		if message.Meta != nil {
-			metaJson, _ := json.Marshal(message.Meta)
-			headers["X-Gopeed-Host-Meta"] = string(metaJson)
-		}
-		_, err = postToFlutter("/create", buf, headers, 10*time.Second)
-		return
-	},
-	"forward": func(message *Message) (data any, err error) {
-		buf, err := message.Params.MarshalJSON()
-		if err != nil {
-			return
-		}
-
-		resp, err := postToFlutter("/forward", buf, nil, 60*time.Second)
-		if err != nil {
-			return
-		}
-		defer resp.Body.Close()
-
-		respBody, err := io.ReadAll(resp.Body)
-		if err != nil {
-			return nil, err
-		}
-
-		var respData map[string]json.RawMessage
-		if err := json.Unmarshal(respBody, &respData); err != nil {
-			return nil, err
-		}
-		return respData, nil
-	},
-}
-
-// go build -ldflags="-s -w" -o ui/flutter/assets/exec/ github.com/GopeedLab/gopeed/cmd/host
-
-func main() {
-	for {
-		// Read message length (first 4 bytes)
-		var length uint32
-		if err := binary.Read(os.Stdin, binary.NativeEndian, &length); err != nil {
-			if err == io.EOF {
-				return
-			}
-			sendError("Failed to read message length: " + err.Error())
-			return
-		}
-
-		// Read the message
-		input := make([]byte, length)
-		if _, err := io.ReadFull(os.Stdin, input); err != nil {
-			sendError("Failed to read message: " + err.Error())
-			return
-		}
-
-		// Parse message
-		var message Message
-		if err := json.Unmarshal(input, &message); err != nil {
-			sendError("Failed to parse message: " + err.Error())
-			return
-		}
-
-		// Handle request
-		var data any
-		var err error
-		if handler, ok := apiMap[message.Method]; ok {
-			data, err = handler(&message)
-		} else {
-			err = errors.New("Unknown method: " + message.Method)
-		}
-		if err != nil {
-			sendError(err.Error())
-			continue
-		}
-		sendResponse(0, data, "")
-	}
-}
-
-func sendResponse(code int, data interface{}, message string) {
-	response := Response{
-		Code:    code,
-		Data:    data,
-		Message: message,
-	}
-
-	// Encode response
-	responseBytes, err := json.Marshal(response)
-	if err != nil {
-		sendError("Failed to encode response: " + err.Error())
-		return
-	}
-
-	// Write message length
-	binary.Write(os.Stdout, binary.NativeEndian, uint32(len(responseBytes)))
-	// Write message
-	os.Stdout.Write(responseBytes)
-}
-
-func sendError(msg string) {
-	sendResponse(1, nil, msg)
-}
@@ -3,14 +3,11 @@ package cmd
 import (
 	_ "embed"
 	"fmt"
-	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/rest"
 	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"net/http"
 	"os"
-	"os/signal"
 	"path/filepath"
-	"syscall"
 )

 //go:embed banner.txt
@@ -27,46 +24,17 @@ func Start(cfg *model.StartConfig) {
 		panic(err)
 	}
 	if downloadCfg.FirstLoad {
-		// Set default download config
-		if cfg.DownloadConfig != nil {
-			cfg.DownloadConfig.Merge(downloadCfg)
-			// TODO Use PatchConfig
-			rest.Downloader.PutConfig(cfg.DownloadConfig)
-			downloadCfg = cfg.DownloadConfig
+		// Set default download dir to user download dir
+		userDir, err := os.UserHomeDir()
+		if err == nil {
+			downloadDir := filepath.Join(userDir, "Downloads")
+			downloadCfg.DownloadDir = downloadDir
+			rest.Downloader.PutConfig(downloadCfg)
 		}

-		downloadDir := downloadCfg.DownloadDir
-		// Set default download dir, in docker, it will be ${exe}/Downloads, else it will be ${user}/Downloads
-		if downloadDir == "" {
-			if base.InDocker == "true" {
-				downloadDir = filepath.Join(filepath.Dir(cfg.StorageDir), "Downloads")
-			} else {
-				userDir, err := os.UserHomeDir()
-				if err == nil {
-					downloadDir = filepath.Join(userDir, "Downloads")
-				}
-			}
-			if downloadDir != "" {
-				downloadCfg.DownloadDir = downloadDir
-				rest.Downloader.PutConfig(downloadCfg)
-			}
-		}
 	}
-	watchExit()
-
 	fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
 	if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
 		panic(err)
 	}
 }
-
-func watchExit() {
-	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
-	go func() {
-		sig := <-sigs
-		fmt.Printf("Server is shutting down due to signal: %s\n", sig)
-		rest.Downloader.Close()
-		os.Exit(0)
-	}()
-}
@@ -1,115 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"os"
-	"syscall"
-	"time"
-
-	"github.com/pkg/browser"
-	"github.com/pkg/errors"
-)
-
-// go build -ldflags="-s -w" -o ui/flutter/assets/exec/ github.com/GopeedLab/gopeed/cmd/updater
-
-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()
-
-	if *pid == 0 {
-		log.Println("Invalid PID")
-		os.Exit(1)
-	}
-	if *updateChannel == "" {
-		log.Println("Invalid update channel")
-		os.Exit(1)
-	}
-
-	if *logPath != "" {
-		logFile, err := os.OpenFile(*logPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0666)
-		if err == nil {
-			defer logFile.Close()
-			log.SetOutput(logFile)
-		}
-	}
-
-	var (
-		restart bool
-		err     error
-	)
-	if restart, err = update(*pid, *updateChannel, *packagePath, *exeDir); err != nil {
-		log.Printf("Update failed: %v\n", err)
-		os.Exit(1)
-	}
-
-	// Restart the application
-	if restart {
-		browser.OpenURL("gopeed:///")
-	}
-
-	// Delete package asset
-	if *packagePath != "" {
-		os.Remove(*packagePath)
-	}
-
-	os.Exit(0)
-}
-
-func update(pid int, updateChannel, packagePath, exeDir string) (restart bool, err error) {
-	killSignalChan := make(chan any, 1)
-
-	go func() {
-		<-killSignalChan
-
-		if err = killProcess(pid); err != nil {
-			log.Printf("Failed to kill process: %v\n", err)
-		}
-
-		if err = waitForProcessExit(pid); err != nil {
-			log.Printf("Failed to wait for process exit: %v\n", err)
-		}
-	}()
-
-	log.Printf("Updating process updateChannel=%s packagePath=%s exeDir=%s\n", updateChannel, packagePath, exeDir)
-	if restart, err = install(killSignalChan, updateChannel, packagePath, exeDir); err != nil {
-		return false, errors.Wrap(err, "failed to install package")
-	}
-
-	return
-}
-
-func waitForProcessExit(pid int) error {
-	deadline := time.Now().Add(10 * time.Second)
-	for time.Now().Before(deadline) {
-		process, err := os.FindProcess(pid)
-		if err != nil {
-			// On some systems, error is returned if process doesn't exist
-			return nil
-		}
-
-		// Send null signal to test if process exists
-		err = process.Signal(syscall.Signal(0))
-		if err != nil {
-			// If error occurs, the process no longer exists
-			return nil
-		}
-
-		time.Sleep(100 * time.Millisecond)
-	}
-	return fmt.Errorf("process %d still running after timeout", pid)
-}
-
-func killProcess(pid int) error {
-	process, err := os.FindProcess(pid)
-	if err != nil {
-		return err
-	}
-
-	return process.Kill()
-}
@@ -1,72 +0,0 @@
-//go:build darwin
-
-package main
-
-import (
-	"fmt"
-	"os/exec"
-	"path/filepath"
-	"strings"
-)
-
-func install(killSignalChan chan<- any, updateChannel, packagePath, destDir string) (bool, error) {
-	return true, installByDmg(killSignalChan, packagePath, destDir)
-}
-
-// installByDmg handles macOS dmg package installation
-func installByDmg(killSignalChan chan<- any, packagePath, destDir string) error {
-	// /Applications/Gopeed.app/Contents/MacOS -> /Applications
-	appPath := getParentDir(getParentDir(getParentDir(destDir)))
-	output, err := exec.Command("hdiutil", "attach", packagePath, "-nobrowse").Output()
-	if err != nil {
-		return err
-	}
-
-	mountPoint := ""
-	for _, line := range strings.Split(string(output), "\n") {
-		if strings.Contains(line, "/Volumes/") {
-			// Find the /Volumes/ path in the line
-			// hdiutil output format: /dev/disk4s1  Apple_HFS  /Volumes/Gopeed
-			// or with sequence number: /dev/disk4s1  Apple_HFS  /Volumes/Gopeed 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))
-	}
-
-	// Detach the mounted DMG
-	defer exec.Command("hdiutil", "detach", mountPoint, "-quiet").Run()
-
-	matches, err := filepath.Glob(filepath.Join(mountPoint, "*.app"))
-	if err != nil {
-		return err
-	}
-	if len(matches) == 0 {
-		return fmt.Errorf("no .app found in dmg, mountPoint: %s", mountPoint)
-	}
-
-	killSignalChan <- nil
-
-	// Copy the new app to the destination
-	// cp -Rf /Volumes/GoPeed/GoPeed.app /Applications
-	if err := exec.Command("cp", "-Rf", matches[0], appPath).Run(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Get parent directory safely, handling trailing separators
-func getParentDir(path string) string {
-	// Remove trailing separators if they exist
-	path = strings.TrimRight(path, string(filepath.Separator))
-	// Now get the parent directory
-	return filepath.Dir(path)
-}
@@ -1,72 +0,0 @@
-//go:build linux
-
-package main
-
-import (
-	"fmt"
-	"os/exec"
-)
-
-func install(killSignalChan chan<- any, updateChannel, packagePath, destDir string) (bool, error) {
-	killSignalChan <- nil
-	switch updateChannel {
-	case "linuxDeb":
-		return true, installByDeb(packagePath)
-	case "linuxFlathub":
-		return true, installByFlathub()
-	case "linuxSnap":
-		return true, installBySnap()
-	default:
-		return false, fmt.Errorf("unsupported update channel for Linux: %s", updateChannel)
-	}
-}
-
-// executeInTerminal tries to execute a command in one of several common terminal emulators
-func executeInTerminal(command string) error {
-	terminals := []string{
-		"gnome-terminal", // GNOME
-		"konsole",        // KDE
-		"xfce4-terminal", // XFCE
-		"xterm",          // X11
-	}
-
-	command = fmt.Sprintf(`echo "Starting update..." && echo "[CMD] %s" && %s`, command, command)
-
-	for _, term := range terminals {
-		if _, err := exec.LookPath(term); err == nil {
-			var cmd *exec.Cmd
-			switch term {
-			case "gnome-terminal", "xfce4-terminal":
-				cmd = exec.Command(term, "--", "bash", "-c", command)
-			case "konsole":
-				cmd = exec.Command(term, "-e", "bash", "-c", command)
-			case "xterm":
-				cmd = exec.Command(term, "-e", command)
-			}
-
-			if err := cmd.Start(); err == nil {
-				return nil
-			}
-		}
-	}
-
-	return fmt.Errorf("no suitable terminal emulator found. Please install gnome-terminal, konsole, xfce4-terminal or xterm")
-}
-
-// installByDeb installs the .deb package
-func installByDeb(packagePath string) error {
-	command := fmt.Sprintf(`sudo dpkg -i "%s"`, packagePath)
-	return executeInTerminal(command)
-}
-
-// installByFlathub updates the application via Flathub
-func installByFlathub() error {
-	command := "flatpak update com.gopeed.Gopeed -y"
-	return executeInTerminal(command)
-}
-
-// installBySnap updates the application via Snap
-func installBySnap() error {
-	command := "sudo snap refresh gopeed"
-	return executeInTerminal(command)
-}
@@ -1,134 +0,0 @@
-//go:build windows
-
-package main
-
-import (
-	"archive/zip"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-)
-
-func install(killSignalChan chan<- any, updateChannel, packagePath, destDir string) (bool, error) {
-	switch updateChannel {
-	case "windowsInstaller":
-		return false, installByInstaller(killSignalChan, packagePath, destDir)
-	default:
-		return true, installByPortable(killSignalChan, packagePath, destDir)
-	}
-}
-
-// installByInstaller extracts the installer from the zip file and runs it
-func installByInstaller(killSignalChan chan<- any, packagePath, destDir string) error {
-	// Create a temp directory for extraction
-	tempDir, err := os.MkdirTemp("", "gopeed_update")
-	if err != nil {
-		return err
-	}
-	defer os.RemoveAll(tempDir)
-
-	// Extract the zip file
-	reader, err := zip.OpenReader(packagePath)
-	if err != nil {
-		return err
-	}
-	defer reader.Close()
-
-	// Find the installer file
-	var installerPath string
-	for _, file := range reader.File {
-		if file.FileInfo().IsDir() {
-			continue
-		}
-
-		// Extract file
-		path := filepath.Join(tempDir, file.Name)
-
-		if err := os.MkdirAll(filepath.Dir(path), os.ModePerm); err != nil {
-			return err
-		}
-
-		dstFile, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, file.Mode())
-		if err != nil {
-			return err
-		}
-
-		srcFile, err := file.Open()
-		if err != nil {
-			dstFile.Close()
-			return err
-		}
-
-		_, err = io.Copy(dstFile, srcFile)
-		srcFile.Close()
-		dstFile.Close()
-		if err != nil {
-			return err
-		}
-
-		// If this is likely an installer (.exe, .msi), save its path
-		ext := strings.ToLower(filepath.Ext(file.Name))
-		if ext == ".exe" || ext == ".msi" {
-			installerPath = path
-		}
-	}
-
-	if installerPath == "" {
-		return fmt.Errorf("no installer found in the update package")
-	}
-
-	// Run the installer
-	cmd := exec.Command(installerPath)
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-
-	killSignalChan <- nil
-	return nil
-}
-
-// installByPortable extracts the portable version to the destination directory
-func installByPortable(killSignalChan chan<- any, packagePath, destDir string) error {
-	killSignalChan <- nil
-
-	reader, err := zip.OpenReader(packagePath)
-	if err != nil {
-		return err
-	}
-	defer reader.Close()
-
-	for _, file := range reader.File {
-		path := filepath.Join(destDir, file.Name)
-
-		if file.FileInfo().IsDir() {
-			os.MkdirAll(path, file.Mode())
-			continue
-		}
-
-		if err := os.MkdirAll(filepath.Dir(path), os.ModePerm); err != nil {
-			return err
-		}
-
-		dstFile, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, file.Mode())
-		if err != nil {
-			return err
-		}
-
-		srcFile, err := file.Open()
-		if err != nil {
-			dstFile.Close()
-			return err
-		}
-
-		_, err = io.Copy(dstFile, srcFile)
-		srcFile.Close()
-		dstFile.Close()
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
@@ -3,197 +3,73 @@ package main
 import (
 	"encoding/json"
 	"flag"
+	"fmt"
 	"os"
 	"path/filepath"
-	"reflect"
-	"strconv"
-	"strings"
-
-	"github.com/GopeedLab/gopeed/pkg/base"
 )

 type args struct {
-	Address           *string  `json:"address"`
-	Port              *int     `json:"port"`
-	Username          *string  `json:"username"`
-	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"`
+	Address  *string `json:"address"`
+	Port     *int    `json:"port"`
+	Username *string `json:"username"`
+	Password *string `json:"password"`
+	ApiToken *string `json:"apiToken"`

 	configPath *string
 }

 func parse() *args {
-	cfg := &args{}
-
-	cliConfig := loadCliArgs()
-	loadConfigFile(cfg, *cliConfig.configPath)
-	loadEnvVars(cfg)
-	// override with non-default command line arguments
-	overrideWithCliArgs(cfg, cliConfig)
-	// set default values
-	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")
+	var cliArgs args
+	cliArgs.Address = flag.String("A", "0.0.0.0", "Bind Address")
+	cliArgs.Port = flag.Int("P", 9999, "Bind Port")
+	cliArgs.Username = flag.String("u", "gopeed", "HTTP Basic Auth Username")
+	cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Pwd")
+	cliArgs.ApiToken = flag.String("T", "", "API token, that can only be used when basic authentication is enabled.")
+	cliArgs.configPath = flag.String("c", "./config.json", "Config file path")
 	flag.Parse()

-	// Parse white download directories from comma-separated string
-	if whiteDownloadDirs != nil && *whiteDownloadDirs != "" {
-		dirs := strings.Split(*whiteDownloadDirs, ",")
-		for i := range dirs {
-			dirs[i] = strings.TrimSpace(dirs[i])
-		}
-		cfg.WhiteDownloadDirs = dirs
+	// args priority: config file > cli args
+	cfgArgs := loadConfig(*cliArgs.configPath)
+	if cfgArgs.Address == nil {
+		cfgArgs.Address = cliArgs.Address
 	}
-
-	return cfg
+	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
+	}
+	return cfgArgs
 }

-// overrideWithCliArgs overrides config with non-empty command line arguments
-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
-		}
-	})
-}
+func loadConfig(path string) *args {
+	var args args

-// 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 !filepath.IsAbs(path) {
+		dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
 		if err != nil {
-			return
+			return &args
 		}
-		configPath = filepath.Join(dir, configPath)
+		path = filepath.Join(dir, path)
 	}
-
-	file, err := os.ReadFile(configPath)
+	file, err := os.ReadFile(path)
 	if err != nil {
 		if os.IsNotExist(err) {
-			return
+			return &args
 		}
-		return
+		fmt.Println("config file read failed, reason:" + err.Error())
+		return &args
 	}
-
-	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))
-			}
-		}
+	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
 }
@@ -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,30 @@ 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
-	if args.StorageDir != nil && *args.StorageDir != "" {
-		storageDir = *args.StorageDir
-	} else {
-		exe, err := os.Executable()
-		if err != nil {
-			panic(err)
-		}
-		storageDir = filepath.Join(filepath.Dir(exe), "storage")
+	exe, err := os.Executable()
+	if err != nil {
+		panic(err)
 	}
+	dir := filepath.Dir(exe)

 	cfg := &model.StartConfig{
-		Network:           "tcp",
-		Address:           fmt.Sprintf("%s:%d", *args.Address, *args.Port),
-		Storage:           model.StorageBolt,
-		StorageDir:        storageDir,
-		WhiteDownloadDirs: args.WhiteDownloadDirs,
-		ApiToken:          *args.ApiToken,
-		DownloadConfig:    args.DownloadConfig,
-		ProductionMode:    true,
-		WebEnable:         true,
-		WebFS:             sub,
-		WebAuth:           webAuth,
+		Network:        "tcp",
+		Address:        fmt.Sprintf("%s:%d", *args.Address, *args.Port),
+		Storage:        model.StorageBolt,
+		StorageDir:     filepath.Join(dir, "storage"),
+		ApiToken:       *args.ApiToken,
+		ProductionMode: true,
+		WebEnable:      true,
+		WebFS:          sub,
+		WebBasicAuth:   webBasicAuth,
 	}
 	cmd.Start(cfg)
 }
@@ -1,15 +1,12 @@
+version: '3'
+
 services:
-    gopeed:
-      container_name: gopeed
-      ports:
-        - 9999:9999 # HTTP port (host:container)
-      environment:
-        - PUID=0
-        - PGID=0
-        - UMASK=022
-      volumes:
-        - ~/gopeed/Downloads:/app/Downloads # mount download path
-        #- ~/gopeed/storage:/app/storage # if you need to mount storage path, uncomment this line
-      restart: unless-stopped
-      image: liwei2633/gopeed
-      # command: -u Username -p Password # optional authentication
+  gopeed:
+    container_name: gopeed
+    ports:
+      - "9999:9999" # HTTP port (host:container)
+    image: liwei2633/gopeed
+    volumes:
+      - ~/gopeed/Downloads:/root/Downloads # mount download path
+      #- ~/gopeed/storage:/app/storage # if you need to mount storage path, uncomment this line
+    restart: unless-stopped
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-chown -R ${PUID}:${PGID} /app
-
-umask ${UMASK}
-
-exec su-exec ${PUID}:${PGID} ./gopeed "$@"
@@ -1,164 +1,108 @@
 module github.com/GopeedLab/gopeed

-go 1.24.9
-
-toolchain go1.24.11
+go 1.19

 require (
-	github.com/anacrolix/torrent v1.60.1-0.20251217073903-486bcbe758e0
+	github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9
+	github.com/anacrolix/torrent v1.52.5
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
-	github.com/bodgit/sevenzip v1.6.1
-	github.com/dop251/goja v0.0.0-20260106131823-651366fbe6e3
-	github.com/dop251/goja_nodejs v0.0.0-20240728170619-29b559befffc
+	github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
+	github.com/dop251/goja_nodejs v0.0.0-20231122114759-e84d9a924c5c
 	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/mholt/archives v0.1.5
-	github.com/pkg/errors v0.9.1
-	github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529
 	github.com/rs/zerolog v1.31.0
-	github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad
-	go.etcd.io/bbolt v1.4.3
-	golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93
-)
-
-require (
-	github.com/STARRY-S/zip v0.2.3 // indirect
-	github.com/anacrolix/btree v0.1.1 // indirect
-	github.com/anacrolix/missinggo/v2 v2.10.0 // indirect
-	github.com/andybalholm/brotli v1.2.0 // indirect
-	github.com/bodgit/plumbing v1.3.0 // indirect
-	github.com/bodgit/windows v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
-	github.com/felixge/fgprof v0.9.5 // indirect
-	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
-	github.com/icholy/digest v1.1.0 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
-	github.com/klauspost/pgzip v1.2.6 // indirect
-	github.com/mikelolasagasti/xz v1.0.1 // indirect
-	github.com/minio/minlz v1.0.1 // indirect
-	github.com/nwaples/rardecode/v2 v2.2.0 // indirect
-	github.com/onsi/ginkgo/v2 v2.23.4 // indirect
-	github.com/pierrec/lz4/v4 v4.1.22 // indirect
-	github.com/pion/transport/v4 v4.0.1 // 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/sorairolake/lzip-go v0.3.8 // indirect
-	github.com/spf13/afero v1.15.0 // indirect
-	github.com/ulikunitz/xz v0.5.15 // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.uber.org/automaxprocs v1.6.0 // indirect
-	go.uber.org/mock v0.5.1 // indirect
-	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
-	golang.org/x/sync v0.19.0 // indirect
+	github.com/virtuald/go-paniclog v0.0.0-20190812204905-43a7fa316459
+	go.etcd.io/bbolt v1.3.8
+	golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d
+	golang.org/x/sync v0.3.0
 )

 require (
+	crawshaw.io/sqlite v0.3.3-0.20220618202545-d1964889ea3c // indirect
 	dario.cat/mergo v1.0.0 // indirect
-	github.com/Microsoft/go-winio v0.6.1
+	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
-	github.com/RoaringBitmap/roaring v1.9.4 // indirect
+	github.com/RoaringBitmap/roaring v1.2.3 // indirect
 	github.com/acomagu/bufpipe v1.0.4 // indirect
+	github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 // indirect
 	github.com/alecthomas/atomic v0.1.0-alpha2 // indirect
-	github.com/anacrolix/chansync v0.7.0 // indirect
-	github.com/anacrolix/dht/v2 v2.23.0 // indirect
-	github.com/anacrolix/envpprof v1.5.0 // indirect
-	github.com/anacrolix/generics v0.2.0 // indirect
-	github.com/anacrolix/go-libutp v1.3.2 // indirect
-	github.com/anacrolix/log v0.17.1-0.20251118025802-918f1157b7bb // indirect
+	github.com/anacrolix/chansync v0.3.0 // indirect
+	github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444 // indirect
+	github.com/anacrolix/envpprof v1.2.1 // indirect
+	github.com/anacrolix/generics v0.0.0-20230428105757-683593396d68 // indirect
+	github.com/anacrolix/go-libutp v1.3.1 // indirect
+	github.com/anacrolix/log v0.14.0 // indirect
 	github.com/anacrolix/missinggo v1.3.0 // indirect
 	github.com/anacrolix/missinggo/perf v1.0.0 // indirect
-	github.com/anacrolix/mmsg v1.1.1 // indirect
-	github.com/anacrolix/multiless v0.4.0 // indirect
-	github.com/anacrolix/stm v0.5.0 // indirect
-	github.com/anacrolix/sync v0.6.0 // indirect
-	github.com/anacrolix/upnp v0.1.4 // indirect
-	github.com/anacrolix/utp v0.2.0 // indirect
+	github.com/anacrolix/mmsg v1.0.0 // indirect
+	github.com/anacrolix/multiless v0.3.0 // indirect
+	github.com/anacrolix/stm v0.4.0 // indirect
+	github.com/anacrolix/sync v0.4.0 // indirect
+	github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 // indirect
+	github.com/anacrolix/utp v0.1.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
-	github.com/benbjohnson/immutable v0.4.3 // indirect
-	github.com/bits-and-blooms/bitset v1.24.4 // indirect
+	github.com/benbjohnson/immutable v0.3.0 // indirect
+	github.com/bits-and-blooms/bitset v1.2.2 // 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.5 // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/edsrzf/mmap-go v1.2.0 // indirect
+	github.com/dlclark/regexp2 v1.10.0 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/edsrzf/mmap-go v1.1.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/felixge/httpsnoop v1.0.1 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.4.1 // indirect
-	github.com/go-llsqlite/adapter v0.2.0 // indirect
-	github.com/go-llsqlite/crawshaw v0.6.0 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
+	github.com/go-sourcemap/sourcemap v2.1.3+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-20260115054156-294ebfa9ad83 // 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
+	github.com/google/btree v1.1.2 // indirect
+	github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
+	github.com/lispad/go-generics-tools v1.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/minio/sha256-simd v1.0.1 // indirect
-	github.com/mr-tron/base58 v1.2.0 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mschoch/smat v0.2.0 // indirect
-	github.com/multiformats/go-multihash v0.2.3 // indirect
-	github.com/multiformats/go-varint v0.1.0 // indirect
-	github.com/ncruces/go-strftime v1.0.0 // indirect
-	github.com/pion/datachannel v1.6.0 // indirect
-	github.com/pion/dtls/v3 v3.0.10 // indirect
-	github.com/pion/ice/v4 v4.2.0 // indirect
-	github.com/pion/interceptor v0.1.42 // indirect
-	github.com/pion/logging v0.2.4 // indirect
-	github.com/pion/mdns/v2 v2.1.0 // indirect
+	github.com/pion/datachannel v1.5.2 // indirect
+	github.com/pion/dtls/v2 v2.2.4 // indirect
+	github.com/pion/ice/v2 v2.2.6 // indirect
+	github.com/pion/interceptor v0.1.11 // indirect
+	github.com/pion/logging v0.2.2 // indirect
+	github.com/pion/mdns v0.0.5 // indirect
 	github.com/pion/randutil v0.1.0 // indirect
-	github.com/pion/rtcp v1.2.16 // indirect
-	github.com/pion/rtp v1.10.0 // indirect
-	github.com/pion/sctp v1.9.1 // indirect
-	github.com/pion/sdp/v3 v3.0.17 // indirect
-	github.com/pion/srtp/v3 v3.0.10 // indirect
-	github.com/pion/stun/v3 v3.1.1 // indirect
-	github.com/pion/turn/v4 v4.1.4 // indirect
-	github.com/pion/webrtc/v4 v4.2.2-0.20260109001657-a5962f314db7 // indirect
+	github.com/pion/rtcp v1.2.9 // indirect
+	github.com/pion/rtp v1.7.13 // indirect
+	github.com/pion/sctp v1.8.2 // indirect
+	github.com/pion/sdp/v3 v3.0.5 // indirect
+	github.com/pion/srtp/v2 v2.0.9 // indirect
+	github.com/pion/stun v0.3.5 // indirect
+	github.com/pion/transport v0.13.1 // indirect
+	github.com/pion/transport/v2 v2.0.0 // indirect
+	github.com/pion/turn/v2 v2.0.8 // indirect
+	github.com/pion/udp v0.1.4 // indirect
+	github.com/pion/webrtc/v3 v3.1.42 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
-	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
-	github.com/protolambda/ctxlock v0.1.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/skeema/knownhosts v1.2.0 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/tidwall/btree v1.8.1 // indirect
-	github.com/wlynxg/anet v0.0.5 // indirect
+	github.com/tidwall/btree v1.6.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	go.opentelemetry.io/otel v1.39.0 // indirect
-	go.opentelemetry.io/otel/metric v1.39.0 // indirect
-	go.opentelemetry.io/otel/trace v1.39.0 // indirect
-	golang.org/x/crypto v0.46.0 // indirect
-	golang.org/x/mod v0.31.0 // indirect
-	golang.org/x/net v0.48.0 // indirect
-	golang.org/x/sys v0.40.0 // indirect
-	golang.org/x/text v0.33.0
-	golang.org/x/time v0.14.0 // indirect
-	golang.org/x/tools v0.40.0 // indirect
+	go.opentelemetry.io/otel v1.8.0 // indirect
+	go.opentelemetry.io/otel/trace v1.8.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
+	golang.org/x/tools v0.6.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	lukechampine.com/blake3 v1.4.1 // indirect
-	modernc.org/libc v1.67.4 // indirect
-	modernc.org/mathutil v1.7.1 // indirect
-	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.43.0 // indirect
-	zombiezen.com/go/sqlite v1.4.2 // indirect
 )
@@ -1,16 +1,14 @@
 package controller

 import (
-	"github.com/GopeedLab/gopeed/pkg/base"
-	"net/http"
 	"net/url"
 	"os"
 	"path/filepath"
 )

 type Controller struct {
-	GetConfig func(v any)
-	GetProxy  func(requestProxy *base.RequestProxy) func(*http.Request) (*url.URL, error)
+	GetConfig func(v any) bool
+	ProxyUrl  *url.URL
 	FileController
 	//ContextDialer() (proxy.Dialer, error)
 }
@@ -24,11 +22,10 @@ type DefaultFileController struct {

 func NewController() *Controller {
 	return &Controller{
-		GetConfig: func(v any) {},
-		GetProxy: func(requestProxy *base.RequestProxy) func(*http.Request) (*url.URL, error) {
-			return requestProxy.ToHandler()
-		},
 		FileController: &DefaultFileController{},
+		GetConfig: func(v any) bool {
+			return false
+		},
 	}
 }

@@ -1,18 +1,22 @@
 package fetcher

 import (
-	"path"
-	"strings"
-
 	"github.com/GopeedLab/gopeed/internal/controller"
 	"github.com/GopeedLab/gopeed/pkg/base"
+	"path"
 )

 // Fetcher defines the interface for a download protocol.
-// Each download task will have a corresponding Fetcher instance for the management of the download task
+// One fetcher for each download task
 type Fetcher interface {
+	// Name return the name of the protocol.
+	Name() string
+
 	Setup(ctl *controller.Controller)
-	Resolve(req *base.Request, opts *base.Options) error
+	// Resolve resource info from request
+	Resolve(req *base.Request) error
+	// Create ready to download, but not started
+	Create(opts *base.Options) error
 	Start() error
 	Pause() error
 	Close() error
@@ -27,12 +31,6 @@ type Fetcher interface {
 	Wait() error
 }

-type Uploader interface {
-	Upload() error
-	UploadedBytes() int64
-	WaitUpload() error
-}
-
 // FetcherMeta defines the meta information of a fetcher.
 type FetcherMeta struct {
 	Req  *base.Request  `json:"req"`
@@ -70,57 +68,17 @@ func (m *FetcherMeta) RootDirPath() string {
 	}
 }

-type FilterType int
-
-const (
-	// FilterTypeUrl url type, pattern is the scheme, e.g. http://github.com -> http
-	FilterTypeUrl FilterType = iota
-	// FilterTypeFile file type, pattern is the file extension name, e.g. test.torrent -> torrent
-	FilterTypeFile
-	// FilterTypeBase64 base64 data type, pattern is the data mime type, e.g. data:application/x-bittorrent;base64 -> application/x-bittorrent
-	FilterTypeBase64
-)
-
-type SchemeFilter struct {
-	Type    FilterType
-	Pattern string
-}
-
-func (s *SchemeFilter) Match(uri string) bool {
-	uriUpper := strings.ToUpper(uri)
-	patternUpper := strings.ToUpper(s.Pattern)
-	switch s.Type {
-	case FilterTypeUrl:
-		return strings.HasPrefix(uriUpper, patternUpper+":")
-	case FilterTypeFile:
-		return strings.HasSuffix(uriUpper, "."+patternUpper)
-	case FilterTypeBase64:
-		return strings.HasPrefix(uriUpper, "DATA:"+patternUpper+";BASE64,")
-	}
-	return false
-}
-
-// FetcherManager manage and control the fetcher
-type FetcherManager interface {
-	// Name return the name of the protocol.
-	Name() string
-	// Filters registers the supported schemes.
-	Filters() []*SchemeFilter
+// FetcherBuilder defines the interface for a fetcher builder.
+type FetcherBuilder interface {
+	// Schemes returns the schemes supported by the fetcher.
+	Schemes() []string
 	// Build returns a new fetcher.
 	Build() Fetcher
-	// ParseName name displayed when the task is not yet resolved, parsed from the request URL
-	ParseName(u string) string
-	// AutoRename returns whether the fetcher need renaming the download file when has the same name file.
-	AutoRename() bool

-	// DefaultConfig returns the default configuration of the protocol.
-	DefaultConfig() any
 	// Store fetcher
 	Store(fetcher Fetcher) (any, error)
 	// Restore fetcher
 	Restore() (v any, f func(meta *FetcherMeta, v any) Fetcher)
-	// Close the fetcher manager, release resources.
-	Close() error
 }

 type DefaultFetcher struct {
@@ -1,97 +0,0 @@
-package fetcher
-
-import "testing"
-
-func TestSchemeFilter_Match(t *testing.T) {
-	type fields struct {
-		Type    FilterType
-		Pattern string
-	}
-	type args struct {
-		uri string
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		args   args
-		want   bool
-	}{
-		{
-			name: "url match",
-			fields: fields{
-				Type:    FilterTypeUrl,
-				Pattern: "https",
-			},
-			args: args{
-				uri: "https://github.com",
-			},
-			want: true,
-		},
-		{
-			name: "url not match",
-			fields: fields{
-				Type:    FilterTypeUrl,
-				Pattern: "https",
-			},
-			args: args{
-				uri: "ftp://github.com",
-			},
-			want: false,
-		},
-		{
-			name: "file match",
-			fields: fields{
-				Type:    FilterTypeFile,
-				Pattern: "torrent",
-			},
-			args: args{
-				uri: "d:/temp/test.torrent",
-			},
-			want: true,
-		},
-		{
-			name: "file not match",
-			fields: fields{
-				Type:    FilterTypeFile,
-				Pattern: "torrent",
-			},
-			args: args{
-				uri: "d:/temp/test.txt",
-			},
-			want: false,
-		},
-		{
-			name: "base64 match",
-			fields: fields{
-				Type:    FilterTypeBase64,
-				Pattern: "application/x-bittorrent",
-			},
-			args: args{
-				uri: "data:application/x-bittorrent;base64,xxx",
-			},
-			want: true,
-		},
-		{
-			name: "base64 not match",
-			fields: fields{
-				Type:    FilterTypeBase64,
-				Pattern: "application/x-bittorrent",
-			},
-			args: args{
-				uri: "data:application/javascript;base64,xxx",
-			},
-			want: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := &SchemeFilter{
-				Type:    tt.fields.Type,
-				Pattern: tt.fields.Pattern,
-			}
-			if got := s.Match(tt.args.uri); got != tt.want {
-				t.Errorf("Match() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
@@ -3,10 +3,4 @@ package bt
 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"`
-	// 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.
-	SeedTime int64 `json:"seedTime"`
 }
@@ -1,49 +0,0 @@
-package bt
-
-import (
-	"context"
-	"net"
-	"time"
-
-	"github.com/rs/dnscache"
-)
-
-// DnsCacheResolver resolves DNS requests for an HTTP client using an in-memory cache.
-type DnsCacheResolver struct {
-	RefreshTimeout time.Duration
-
-	resolver dnscache.Resolver
-}
-
-func (r *DnsCacheResolver) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
-	host, port, err := net.SplitHostPort(address)
-	if err != nil {
-		return nil, err
-	}
-	ips, err := r.resolver.LookupHost(ctx, host)
-	if err != nil {
-		return nil, err
-	}
-	var conn net.Conn
-	for _, ip := range ips {
-		var dialer net.Dialer
-		conn, err = dialer.DialContext(ctx, network, net.JoinHostPort(ip, port))
-		if err == nil {
-			break
-		}
-	}
-	return conn, err
-}
-
-func (r *DnsCacheResolver) Run(ctx context.Context) {
-	ticker := time.NewTicker(r.RefreshTimeout)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-ticker.C:
-			r.resolver.Refresh(true)
-		}
-	}
-}
@@ -2,17 +2,6 @@ package bt

 import (
 	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
 	"github.com/GopeedLab/gopeed/internal/controller"
 	"github.com/GopeedLab/gopeed/internal/fetcher"
 	"github.com/GopeedLab/gopeed/pkg/base"
@@ -20,15 +9,18 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/util"
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/metainfo"
-	"github.com/anacrolix/torrent/storage"
+	"net/http"
+	"path/filepath"
+	"sync"
+	"sync/atomic"
+	"time"
 )

 var (
-	cfg       *torrent.ClientConfig
-	client    *torrent.Client
-	lock      sync.Mutex
-	closeCtx  context.Context
-	closeFunc func()
+	client        *torrent.Client
+	lock          sync.Mutex
+	torrentDirMap = make(map[string]string)
+	ftMap         = make(map[string]*fileTorrentImpl)
 )

 type Fetcher struct {
@@ -37,13 +29,14 @@ type Fetcher struct {

 	torrent *torrent.Torrent
 	meta    *fetcher.FetcherMeta
-	data    *fetcherData

-	torrentReady    atomic.Bool
-	torrentUpload   atomic.Bool
-	torrentDropCtx  context.Context
-	torrentDropFunc func()
-	uploadDoneCh    chan any
+	torrentReady atomic.Bool
+	create       atomic.Bool
+	progress     fetcher.Progress
+}
+
+func (f *Fetcher) Name() string {
+	return "bt"
 }

 func (f *Fetcher) Setup(ctl *controller.Controller) {
@@ -51,12 +44,13 @@ func (f *Fetcher) Setup(ctl *controller.Controller) {
 	if f.meta == nil {
 		f.meta = &fetcher.FetcherMeta{}
 	}
-	if f.data == nil {
-		f.data = &fetcherData{}
+	exist := f.ctl.GetConfig(&f.config)
+	if !exist {
+		f.config = &config{
+			ListenPort: 0,
+			Trackers:   []string{},
+		}
 	}
-	f.uploadDoneCh = make(chan any, 1)
-	f.torrentDropCtx, f.torrentDropFunc = context.WithCancel(context.Background())
-	f.ctl.GetConfig(&f.config)
 	return
 }

@@ -67,61 +61,65 @@ func (f *Fetcher) initClient() (err error) {
 	if client != nil {
 		return
 	}
-	if closeCtx == nil {
-		closeCtx, closeFunc = context.WithCancel(context.Background())
-	}

-	cfg = torrent.NewDefaultClientConfig()
-	cfg.Seed = true
-	cfg.Bep20 = fmt.Sprintf("-GP%s-", parseBep20())
-	cfg.ExtendedHandshakeClientVersion = fmt.Sprintf("Gopeed %s", base.Version)
+	cfg := torrent.NewDefaultClientConfig()
 	cfg.ListenPort = f.config.ListenPort
-	cfg.HTTPProxy = f.ctl.GetProxy(f.meta.Req.Proxy)
-	dnsResolver := &DnsCacheResolver{RefreshTimeout: 5 * time.Minute}
-	cfg.TrackerDialContext = dnsResolver.DialContext
-	client, err = torrent.NewClient(cfg)
-	if err != nil {
-		return
+	if f.ctl.ProxyUrl != nil {
+		cfg.HTTPProxy = http.ProxyURL(f.ctl.ProxyUrl)
 	}
-
-	closeCtx, closeFunc = context.WithCancel(context.Background())
-	go func() {
-		dnsResolver.Run(closeCtx)
-	}()
+	cfg.DefaultStorage = newFileOpts(newFileClientOpts{
+		ClientBaseDir: cfg.DataDir,
+		HandleFileTorrent: func(infoHash metainfo.Hash, ft *fileTorrentImpl) {
+			if dir, ok := torrentDirMap[infoHash.String()]; ok {
+				ft.setTorrentDir(dir)
+			}
+			ftMap[infoHash.String()] = ft
+		},
+	})
+	client, err = torrent.NewClient(cfg)
 	return
 }

-func (f *Fetcher) Resolve(req *base.Request, opts *base.Options) error {
-	f.meta.Req = req
-	f.meta.Opts = opts
-	if f.meta.Opts == nil {
-		f.meta.Opts = &base.Options{}
+func (f *Fetcher) Resolve(req *base.Request) error {
+	if err := base.ParseReqExtra[bt.ReqExtra](req); err != nil {
+		return err
 	}
-	if err := f.addTorrent(req, false); err != nil {
+
+	if err := f.addTorrent(req); err != nil {
 		return err
 	}
 	f.updateRes()
+	f.meta.Req = req
+	return nil
+}
+
+func (f *Fetcher) Create(opts *base.Options) (err error) {
+	f.create.Store(true)
+	f.meta.Opts = opts
+	if f.meta.Res != nil {
+		torrentDirMap[f.meta.Res.Hash] = f.meta.FolderPath()
+	}
 	return nil
 }

 func (f *Fetcher) Start() (err error) {
 	if !f.torrentReady.Load() {
-		if err = f.addTorrent(f.meta.Req, false); err != nil {
+		if err = f.addTorrent(f.meta.Req); err != nil {
 			return
 		}
 	}
-
+	if ft, ok := ftMap[f.meta.Res.Hash]; ok {
+		ft.setTorrentDir(f.meta.FolderPath())
+	}
 	files := f.torrent.Files()
 	// If the user does not specify the file to download, all files will be downloaded by default
-	if f.data.Progress == nil {
-		if len(f.meta.Opts.SelectFiles) == 0 {
-			f.meta.Opts.SelectFiles = make([]int, len(files))
-			for i := range files {
-				f.meta.Opts.SelectFiles[i] = i
-			}
+	if len(f.meta.Opts.SelectFiles) == 0 {
+		f.meta.Opts.SelectFiles = make([]int, len(files))
+		for i := range files {
+			f.meta.Opts.SelectFiles[i] = i
 		}
-		f.data.Progress = make(fetcher.Progress, len(f.meta.Opts.SelectFiles))
 	}
+	f.progress = make(fetcher.Progress, len(f.meta.Opts.SelectFiles))
 	if len(f.meta.Opts.SelectFiles) == len(files) {
 		f.torrent.DownloadAll()
 	} else {
@@ -130,22 +128,18 @@ func (f *Fetcher) Start() (err error) {
 			file.Download()
 		}
 	}
-	f.torrent.AllowDataDownload()
+
 	return
 }

 func (f *Fetcher) Pause() (err error) {
-	f.torrent.DisallowDataDownload()
+	f.torrentReady.Store(false)
+	f.safeDrop()
 	return
 }

 func (f *Fetcher) Close() (err error) {
 	f.safeDrop()
-	f.torrentDropFunc()
-	f.uploadDoneCh <- nil
-	if len(client.Torrents()) == 0 {
-		err = closeClient()
-	}
 	return nil
 }

@@ -158,94 +152,76 @@ func (f *Fetcher) safeDrop() {
 	f.torrent.Drop()
 }

+func (f *Fetcher) Wait() (err error) {
+	for {
+		if f.torrentReady.Load() && len(f.meta.Opts.SelectFiles) > 0 {
+			done := true
+			for _, selectIndex := range f.meta.Opts.SelectFiles {
+				file := f.torrent.Files()[selectIndex]
+				if file.BytesCompleted() < file.Length() {
+					done = false
+					break
+				}
+			}
+			if done {
+				// remove unselected files
+				for i, file := range f.torrent.Files() {
+					selected := false
+					for _, selectIndex := range f.meta.Opts.SelectFiles {
+						if i == selectIndex {
+							selected = true
+							break
+						}
+					}
+					if !selected {
+						util.SafeRemove(filepath.Join(f.meta.Opts.Path, f.meta.Res.Name, file.Path()))
+					}
+				}
+				break
+			}
+		}
+		time.Sleep(time.Millisecond * 500)
+	}
+	return nil
+}
+
 func (f *Fetcher) Meta() *fetcher.FetcherMeta {
 	return f.meta
 }

 func (f *Fetcher) Stats() any {
-	var stats torrent.TorrentStats
-	if f.torrent != nil {
-		stats = f.torrent.Stats()
-	} else {
-		stats = torrent.TorrentStats{}
-	}
-	return &bt.Stats{
+	stats := f.torrent.Stats()
+	baseStats := &bt.Stats{
 		TotalPeers:       stats.TotalPeers,
 		ActivePeers:      stats.ActivePeers,
 		ConnectedSeeders: stats.ConnectedSeeders,
-		SeedBytes:        f.data.SeedBytes,
-		SeedRatio:        f.seedRadio(),
-		SeedTime:         f.data.SeedTime,
 	}
+	return baseStats
 }

 func (f *Fetcher) Progress() fetcher.Progress {
 	if !f.torrentReady.Load() {
-		return f.data.Progress
+		return f.progress
 	}
-	for i := range f.data.Progress {
+	for i := range f.progress {
 		selectIndex := f.meta.Opts.SelectFiles[i]
 		file := f.torrent.Files()[selectIndex]
-		f.data.Progress[i] = file.BytesCompleted()
+		f.progress[i] = file.BytesCompleted()
 	}
-	return f.data.Progress
-}
-
-func (f *Fetcher) Wait() (err error) {
-	for {
-		select {
-		case <-f.torrentDropCtx.Done():
-			return
-		case <-time.After(time.Second):
-			if f.torrentReady.Load() && len(f.meta.Opts.SelectFiles) > 0 {
-				if f.isDone() {
-					// remove unselected files
-					for i, file := range f.torrent.Files() {
-						selected := false
-						for _, selectIndex := range f.meta.Opts.SelectFiles {
-							if i == selectIndex {
-								selected = true
-								break
-							}
-						}
-						if !selected {
-							util.SafeRemove(filepath.Join(f.meta.Opts.Path, f.meta.Res.Name, file.Path()))
-						}
-					}
-					return
-				}
-			}
-		}
-	}
-}
-
-func (f *Fetcher) isDone() bool {
-	if f.meta.Opts == nil {
-		return false
-	}
-	for _, selectIndex := range f.meta.Opts.SelectFiles {
-		file := f.torrent.Files()[selectIndex]
-		if file.BytesCompleted() < file.Length() {
-			return false
-		}
-	}
-	return true
+	return f.progress
 }

 func (f *Fetcher) updateRes() {
 	res := &base.Resource{
+		Name:  f.torrent.Name(),
 		Range: true,
 		Files: make([]*base.FileInfo, len(f.torrent.Files())),
 		Hash:  f.torrent.InfoHash().String(),
 	}
-	// Directory torrent
-	if f.torrent.Info().Length == 0 {
-		res.Name = f.torrent.Name()
-	}
 	for i, file := range f.torrent.Files() {
 		res.Files[i] = &base.FileInfo{
 			Name: filepath.Base(file.DisplayPath()),
-			Path: util.Dir(file.DisplayPath()),
+			Path: util.Dir(file.Path()),
 			Size: file.Length(),
 		}
 	}
@@ -256,309 +232,77 @@ func (f *Fetcher) updateRes() {
 	}
 }

-func (f *Fetcher) Upload() (err error) {
-	return f.addTorrent(f.meta.Req, true)
-}
-
-func (f *Fetcher) doUpload(fromUpload bool) {
-	if !f.torrentUpload.CompareAndSwap(false, true) {
-		return
-	}
-
-	// Check and update seed data
-	lastData := &fetcherData{
-		SeedBytes: f.data.SeedBytes,
-		SeedTime:  f.data.SeedTime,
-	}
-	var doneTime int64 = 0
-	for {
-		select {
-		case <-f.torrentDropCtx.Done():
-			return
-		case <-time.After(time.Second):
-			if !f.torrentReady.Load() {
-				continue
-			}
-
-			stats := f.torrentStats()
-			f.data.SeedBytes = lastData.SeedBytes + stats.BytesWrittenData.Int64()
-
-			// Check is download complete, if not don't check and stop seeding
-			if !fromUpload && !f.isDone() {
-				continue
-			}
-			if doneTime == 0 {
-				doneTime = time.Now().Unix()
-			}
-			f.data.SeedTime = lastData.SeedTime + time.Now().Unix() - doneTime
-
-			// If the seed forever is true, keep seeding
-			if f.config.SeedKeep {
-				continue
-			}
-
-			// If the seed ratio is reached, stop seeding
-			if f.config.SeedRatio > 0 {
-				seedRadio := f.seedRadio()
-				if seedRadio >= f.config.SeedRatio {
-					f.Close()
-					break
-				}
-			}
-
-			// If the seed time is reached, stop seeding
-			if f.config.SeedTime > 0 {
-				if f.data.SeedTime >= f.config.SeedTime {
-					f.Close()
-					break
-				}
-			}
-		}
-	}
-}
-
-// Get torrent stats maybe panic, see https://github.com/anacrolix/torrent/issues/972
-func (f *Fetcher) torrentStats() torrent.TorrentStats {
-	defer func() {
-		if r := recover(); r != nil {
-			// ignore panic
-		}
-	}()
-
-	return f.torrent.Stats()
-}
-
-func (f *Fetcher) UploadedBytes() int64 {
-	return f.data.SeedBytes
-}
-
-func (f *Fetcher) WaitUpload() (err error) {
-	<-f.uploadDoneCh
-	return nil
-}
-
-func (f *Fetcher) addTorrent(req *base.Request, fromUpload bool) (err error) {
-	if err = base.ParseReqExtra[bt.ReqExtra](req); err != nil {
-		return
-	}
+func (f *Fetcher) addTorrent(req *base.Request) (err error) {
 	if err = f.initClient(); err != nil {
 		return
 	}
 	schema := util.ParseSchema(req.URL)
-	privateTorrent := false
-	var spec *torrent.TorrentSpec
 	if schema == "MAGNET" {
-		spec, err = torrent.TorrentSpecFromMagnetUri(req.URL)
-		if err != nil {
-			return
-		}
-	} else {
-		var reader io.Reader
-		if schema == "FILE" {
-			fileUrl, _ := url.Parse(req.URL)
-			filePath := fileUrl.Path[1:]
-			reader, err = os.Open(filePath)
-			if err != nil {
-				return
-			}
-		} else if schema == "DATA" {
-			_, data := util.ParseDataUri(req.URL)
-			reader = bytes.NewBuffer(data)
-		} else {
-			reader, err = os.Open(req.URL)
-			if err != nil {
-				return
-			}
-			defer reader.(io.Closer).Close()
-		}
-
+		f.torrent, err = client.AddMagnet(req.URL)
+	} else if schema == "APPLICATION/X-BITTORRENT" {
+		_, data := util.ParseDataUri(req.URL)
+		buf := bytes.NewBuffer(data)
 		var metaInfo *metainfo.MetaInfo
-		metaInfo, err = metainfo.Load(reader)
-		// Hotfix for https://github.com/anacrolix/torrent/issues/992, ignore "expected EOF" error
-		// TODO remove this after the issue is fixed
-		if err != nil && !strings.Contains(err.Error(), "expected EOF") {
+		metaInfo, err = metainfo.Load(buf)
+		if err != nil {
 			return err
 		}
-
-		info, er := metaInfo.UnmarshalInfo()
-		if er != nil {
-			return er
-		}
-
-		if info.Private != nil && *info.Private {
-			privateTorrent = true
-		}
-		spec, err = torrent.TorrentSpecFromMetaInfoErr(metaInfo)
-		if err != nil {
-			return
-		}
+		f.torrent, err = client.AddTorrent(metaInfo)
+	} else {
+		f.torrent, err = client.AddTorrentFromFile(req.URL)
 	}
-	spec.Storage = storage.NewFileOpts(storage.NewFileClientOpts{
-		ClientBaseDir: cfg.DataDir,
-		TorrentDirMaker: func(baseDir string, info *metainfo.Info, infoHash metainfo.Hash) string {
-			return f.meta.Opts.Path
-		},
-	})
-	f.torrent, _, err = client.AddTorrentSpec(spec)
 	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 {
-			extra := req.Extra.(*bt.ReqExtra)
-			if len(extra.Trackers) > 0 {
-				for _, tracker := range extra.Trackers {
-					trackers[tracker] = true
-				}
-			}
-		}
-		if len(f.config.Trackers) > 0 {
-			for _, tracker := range f.config.Trackers {
+	// use map to deduplicate
+	trackers := make(map[string]bool)
+	if req.Extra != nil {
+		extra := req.Extra.(*bt.ReqExtra)
+		if len(extra.Trackers) > 0 {
+			for _, tracker := range extra.Trackers {
 				trackers[tracker] = true
 			}
 		}
-		if len(trackers) > 0 {
-			announceList := make([][]string, 0)
-			for tracker := range trackers {
-				announceList = append(announceList, []string{tracker})
-			}
-			f.torrent.AddTrackers(announceList)
+	}
+	if len(f.config.Trackers) > 0 {
+		for _, tracker := range f.config.Trackers {
+			trackers[tracker] = true
 		}
 	}
+	if len(trackers) > 0 {
+		announceList := make([][]string, 0)
+		for tracker := range trackers {
+			announceList = append(announceList, []string{tracker})
+		}
+		f.torrent.AddTrackers(announceList)
+	}
 	<-f.torrent.GotInfo()
 	f.torrentReady.Store(true)
-
-	go f.doUpload(fromUpload)
 	return
 }

-func (f *Fetcher) seedRadio() float64 {
-	var bytesRead int64
-	if f.Meta().Res != nil {
-		bytesRead = f.Meta().Res.Size
-	} else {
-		bytesRead = 0
-	}
-	if bytesRead <= 0 {
-		return 0
-	}
-
-	return float64(f.data.SeedBytes) / float64(bytesRead)
+type FetcherBuilder struct {
 }

-type fetcherData struct {
-	Progress  fetcher.Progress
-	SeedBytes int64
-	// SeedTime is the time in seconds to seed after downloading is complete.
-	SeedTime int64
+var schemes = []string{"FILE", "MAGNET", "APPLICATION/X-BITTORRENT"}
+
+func (fb *FetcherBuilder) Schemes() []string {
+	return schemes
 }

-func closeClient() error {
-	lock.Lock()
-	defer lock.Unlock()
-
-	if closeFunc != nil {
-		closeFunc()
-	}
-	if client != nil {
-		errs := client.Close()
-		if len(errs) > 0 {
-			return errs[0]
-		}
-		client = nil
-		closeCtx = nil
-		closeFunc = nil
-	}
-	return nil
-}
-
-type FetcherManager struct {
-}
-
-func (fm *FetcherManager) Name() string {
-	return "bt"
-}
-
-func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
-	return []*fetcher.SchemeFilter{
-		{
-			Type:    fetcher.FilterTypeUrl,
-			Pattern: "MAGNET",
-		},
-		{
-			Type:    fetcher.FilterTypeFile,
-			Pattern: "TORRENT",
-		},
-		{
-			Type:    fetcher.FilterTypeBase64,
-			Pattern: "APPLICATION/X-BITTORRENT",
-		},
-	}
-}
-
-func (fm *FetcherManager) Build() fetcher.Fetcher {
+func (fb *FetcherBuilder) Build() fetcher.Fetcher {
 	return &Fetcher{}
 }

-func (fm *FetcherManager) ParseName(u string) string {
-	var name string
-	url, err := url.Parse(u)
-	if err != nil {
-		return ""
-	}
-
-	params := url.Query()
-	if params.Get("dn") != "" {
-		return params.Get("dn")
-	}
-	if params.Get("xt") != "" {
-		xt := strings.Split(params.Get("xt"), ":")
-		return xt[len(xt)-1]
-	}
-	return name
+func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
+	return nil, nil
 }

-func (fm *FetcherManager) AutoRename() bool {
-	return false
-}
-
-func (fm *FetcherManager) DefaultConfig() any {
-	return &config{
-		ListenPort: 0,
-		Trackers:   []string{},
-		SeedKeep:   false,
-		SeedRatio:  1.0,
-		SeedTime:   120 * 60,
-	}
-}
-
-func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
-	_f := f.(*Fetcher)
-	return _f.data, nil
-}
-
-func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
-	return &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
+func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
+	return nil, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
 		return &Fetcher{
 			meta: meta,
-			data: v.(*fetcherData),
 		}
 	}
 }
-
-func (fm *FetcherManager) Close() error {
-	return closeClient()
-}
-
-// parse version to bep20 format, fixed length 4, if not enough, fill 0
-func parseBep20() string {
-	s := strings.ReplaceAll(base.Version, ".", "")
-	if len(s) < 4 {
-		s += strings.Repeat("0", 4-len(s))
-	}
-	return s
-}
@@ -3,18 +3,16 @@ package bt
 import (
 	"encoding/base64"
 	"encoding/json"
-	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"
+	"github.com/GopeedLab/gopeed/pkg/util"
+	"net/url"
+	"os"
+	"reflect"
+	"testing"
 )

 func TestFetcher_Resolve_Torrent(t *testing.T) {
@@ -31,12 +29,13 @@ func TestFetcher_Resolve_DataUri_Torrent(t *testing.T) {
 	dataUri := "data:application/x-bittorrent;base64," + base64.StdEncoding.EncodeToString(buf)
 	err = fetcher.Resolve(&base.Request{
 		URL: dataUri,
-	}, nil)
+	})
 	if err != nil {
 		panic(err)
 	}

 	want := &base.Resource{
+		Name:  "ubuntu-22.04-live-server-amd64.iso",
 		Size:  1466714112,
 		Range: true,
 		Files: []*base.FileInfo{
@@ -61,181 +60,61 @@ func TestFetcher_ResolveWithProxy(t *testing.T) {
 	proxyListener := test.StartSocks5Server(usr, pwd)
 	defer proxyListener.Close()

-	doResolve(t, buildConfigFetcher(&base.DownloaderProxyConfig{
-		Enable: true,
-		System: false,
-		Scheme: "socks5",
-		Host:   proxyListener.Addr().String(),
-		Usr:    usr,
-		Pwd:    pwd,
-	}))
+	doResolve(t, buildConfigFetcher(util.BuildProxyUrl("socks5", proxyListener.Addr().String(), usr, pwd)))
 }

 func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
-	t.Run("Resolve Single File", func(t *testing.T) {
-		err := fetcher.Resolve(&base.Request{
-			URL: "./testdata/ubuntu-22.04-live-server-amd64.iso.torrent",
-			Extra: bt.ReqExtra{
-				Trackers: []string{
-					"udp://tracker.birkenwald.de:6969/announce",
-					"udp://tracker.bitsearch.to:1337/announce",
-				},
+	err := fetcher.Resolve(&base.Request{
+		URL: "./testdata/ubuntu-22.04-live-server-amd64.iso.torrent",
+		Extra: bt.ReqExtra{
+			Trackers: []string{
+				"udp://tracker.birkenwald.de:6969/announce",
+				"udp://tracker.bitsearch.to:1337/announce",
 			},
-		}, nil)
-		if err != nil {
-			panic(err)
-		}
-
-		want := &base.Resource{
-			Size:  1466714112,
-			Range: true,
-			Files: []*base.FileInfo{
-				{
-					Name: "ubuntu-22.04-live-server-amd64.iso",
-					Size: 1466714112,
-				},
-			},
-			Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
-		}
-		if !reflect.DeepEqual(want, fetcher.Meta().Res) {
-			t.Errorf("Resolve Single File Resolve() got = %v, want %v", fetcher.Meta().Res, want)
-		}
+		},
 	})
-
-	t.Run("Resolve Multi Files", func(t *testing.T) {
-		err := fetcher.Resolve(&base.Request{
-			URL: "./testdata/test.torrent",
-			Extra: bt.ReqExtra{
-				Trackers: []string{
-					"udp://tracker.birkenwald.de:6969/announce",
-					"udp://tracker.bitsearch.to:1337/announce",
-				},
-			},
-		}, nil)
-		if err != nil {
-			panic(err)
-		}
-
-		want := &base.Resource{
-			Name:  "test",
-			Size:  107484864,
-			Range: true,
-			Files: []*base.FileInfo{
-				{
-					Name: "c.txt",
-					Path: "path",
-					Size: 98501754,
-				},
-				{
-					Name: "b.txt",
-					Size: 8904996,
-				},
-				{
-					Name: "a.txt",
-					Size: 78114,
-				},
-			},
-			Hash: "ccbc92b0cd8deec16a2ef4be242a8c9243b1cedb",
-		}
-		if !reflect.DeepEqual(want, fetcher.Meta().Res) {
-			t.Errorf("Resolve Multi Files Resolve() got = %v, want %v", fetcher.Meta().Res, want)
-		}
-	})
-
-	t.Run("Resolve Unclean Torrent", func(t *testing.T) {
-		err := fetcher.Resolve(&base.Request{
-			URL: "./testdata/test.unclean.torrent",
-		}, nil)
-		if err != nil {
-			t.Errorf("Resolve Unclean Torrent Resolve() got = %v, want nil", err)
-		}
-	})
-
-	t.Run("Resolve file scheme Torrent", func(t *testing.T) {
-		file, _ := filepath.Abs("./testdata/test.unclean.torrent")
-		uri := "file:///" + file
-		err := fetcher.Resolve(&base.Request{
-			URL: uri,
-		}, nil)
-		if err != nil {
-			t.Errorf("Resolve file scheme Torrent Resolve() got = %v, want nil", err)
-		}
-	})
-}
-
-func TestFetcherManager_ParseName(t *testing.T) {
-	type args struct {
-		u string
+	if err != nil {
+		panic(err)
 	}
-	tests := []struct {
-		name string
-		args args
-		want string
-	}{
-		{
-			name: "broken url",
-			args: args{
-				u: "magnet://!@#%github.com",
+
+	want := &base.Resource{
+		Name:  "ubuntu-22.04-live-server-amd64.iso",
+		Size:  1466714112,
+		Range: true,
+		Files: []*base.FileInfo{
+			{
+				Name: "ubuntu-22.04-live-server-amd64.iso",
+				Size: 1466714112,
 			},
-			want: "",
-		},
-		{
-			name: "dn",
-			args: args{
-				u: "magnet:?xt=urn:btih:8a55cfbd5ca5d11507364765936c4f9e55b253ed&dn=ubuntu-22.04-live-server-amd64.iso",
-			},
-			want: "ubuntu-22.04-live-server-amd64.iso",
-		},
-		{
-			name: "no dn",
-			args: args{
-				u: "magnet:?xt=urn:btih:8a55cfbd5ca5d11507364765936c4f9e55b253ed",
-			},
-			want: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
-		},
-		{
-			name: "non standard magnet",
-			args: args{
-				u: "magnet:?xxt=abcd",
-			},
-			want: "",
 		},
+		Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
 	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			fm := &FetcherManager{}
-			if got := fm.ParseName(tt.args.u); got != tt.want {
-				t.Errorf("ParseName() = %v, want %v", got, tt.want)
-			}
-		})
+	if !reflect.DeepEqual(want, fetcher.Meta().Res) {
+		t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, want)
 	}
 }

 func buildFetcher() fetcher.Fetcher {
-	fb := new(FetcherManager)
-	fetcher := fb.Build()
-	newController := controller.NewController()
-	newController.GetConfig = func(v any) {
-		json.Unmarshal([]byte(test.ToJson(fb.DefaultConfig())), v)
-	}
-	fetcher.Setup(newController)
+	fetcher := new(FetcherBuilder).Build()
+	fetcher.Setup(controller.NewController())
 	return fetcher
 }

-func buildConfigFetcher(proxyConfig *base.DownloaderProxyConfig) fetcher.Fetcher {
-	fetcher := new(FetcherManager).Build()
+func buildConfigFetcher(proxyUrl *url.URL) fetcher.Fetcher {
+	fetcher := new(FetcherBuilder).Build()
 	newController := controller.NewController()
 	mockCfg := config{
 		Trackers: []string{
 			"udp://tracker.birkenwald.de:6969/announce",
 			"udp://tracker.bitsearch.to:1337/announce",
 		}}
-	newController.GetConfig = func(v any) {
-		json.Unmarshal([]byte(test.ToJson(mockCfg)), v)
-	}
-	newController.GetProxy = func(requestProxy *base.RequestProxy) func(*gohttp.Request) (*url.URL, error) {
-		return proxyConfig.ToHandler()
+	newController.GetConfig = func(v any) bool {
+		if err := json.Unmarshal([]byte(test.ToJson(mockCfg)), v); err != nil {
+			return false
+		}
+		return true
 	}
+	newController.ProxyUrl = proxyUrl
 	fetcher.Setup(newController)
 	return fetcher
 }
@@ -0,0 +1,214 @@
+// modify from github.com/anacrolix/torrent/storage/file.go
+
+package bt
+
+import (
+	"fmt"
+	"github.com/anacrolix/torrent/storage"
+	"io"
+	"os"
+	"path/filepath"
+
+	"github.com/anacrolix/missinggo/v2"
+
+	"github.com/anacrolix/torrent/common"
+	"github.com/anacrolix/torrent/metainfo"
+	"github.com/anacrolix/torrent/segments"
+)
+
+// File-based storage for torrents, that isn't yet bound to a particular torrent.
+type fileClientImpl struct {
+	opts newFileClientOpts
+}
+
+type newFileClientOpts struct {
+	// The base directory for all downloads.
+	ClientBaseDir     string
+	HandleFileTorrent func(infoHash metainfo.Hash, ft *fileTorrentImpl)
+	FilePathMaker     storage.FilePathMaker
+	PieceCompletion   storage.PieceCompletion
+}
+
+func newFileOpts(opts newFileClientOpts) storage.ClientImplCloser {
+	if opts.FilePathMaker == nil {
+		opts.FilePathMaker = func(opts storage.FilePathMakerOpts) string {
+			var parts []string
+			if opts.Info.Name != metainfo.NoName {
+				parts = append(parts, opts.Info.Name)
+			}
+			return filepath.Join(append(parts, opts.File.Path...)...)
+		}
+	}
+	if opts.PieceCompletion == nil {
+		ret, err := storage.NewDefaultPieceCompletionForDir(opts.ClientBaseDir)
+		if err != nil {
+			ret = storage.NewMapPieceCompletion()
+		}
+		opts.PieceCompletion = ret
+	}
+	return fileClientImpl{opts}
+}
+
+func (fs fileClientImpl) Close() error {
+	return fs.opts.PieceCompletion.Close()
+}
+
+func (fs fileClientImpl) OpenTorrent(info *metainfo.Info, infoHash metainfo.Hash) (_ storage.TorrentImpl, err error) {
+	upvertedFiles := info.UpvertedFiles()
+	files := make([]file, 0, len(upvertedFiles))
+	for _, fileInfo := range upvertedFiles {
+		filePath := filepath.Join("", fs.opts.FilePathMaker(storage.FilePathMakerOpts{
+			Info: info,
+			File: &fileInfo,
+		}))
+		f := file{
+			rawPath: filePath,
+			path:    filePath,
+			length:  fileInfo.Length,
+		}
+		if f.length == 0 {
+			err = CreateNativeZeroLengthFile(f.path)
+			if err != nil {
+				err = fmt.Errorf("creating zero length file: %w", err)
+				return
+			}
+		}
+		files = append(files, f)
+	}
+	t := &fileTorrentImpl{
+		files,
+		segments.NewIndex(common.LengthIterFromUpvertedFiles(upvertedFiles)),
+		infoHash,
+		fs.opts.PieceCompletion,
+	}
+	fs.opts.HandleFileTorrent(infoHash, t)
+	return storage.TorrentImpl{
+		Piece: t.Piece,
+		Close: t.Close,
+	}, nil
+}
+
+type file struct {
+	// The safe, OS-local file path.
+	rawPath string
+	path    string
+	length  int64
+}
+
+type fileTorrentImpl struct {
+	files          []file
+	segmentLocater segments.Index
+	infoHash       metainfo.Hash
+	completion     storage.PieceCompletion
+}
+
+func (fts *fileTorrentImpl) Piece(p metainfo.Piece) storage.PieceImpl {
+	// Create a view onto the file-based torrent storage.
+	_io := fileTorrentImplIO{fts}
+	// Return the appropriate segments of this.
+	return &filePieceImpl{
+		fts,
+		p,
+		missinggo.NewSectionWriter(_io, p.Offset(), p.Length()),
+		io.NewSectionReader(_io, p.Offset(), p.Length()),
+	}
+}
+
+func (fts *fileTorrentImpl) Close() error {
+	return nil
+}
+
+func (fts *fileTorrentImpl) setTorrentDir(dir string) {
+	for i, f := range fts.files {
+		fts.files[i].path = filepath.Join(dir, f.rawPath)
+	}
+}
+
+// A helper to create zero-length files which won't appear for file-orientated storage since no
+// writes will ever occur to them (no torrent data is associated with a zero-length file). The
+// caller should make sure the file name provided is safe/sanitized.
+func CreateNativeZeroLengthFile(name string) error {
+	os.MkdirAll(filepath.Dir(name), 0o777)
+	var f io.Closer
+	f, err := os.Create(name)
+	if err != nil {
+		return err
+	}
+	return f.Close()
+}
+
+// Exposes file-based storage of a torrent, as one big ReadWriterAt.
+type fileTorrentImplIO struct {
+	fts *fileTorrentImpl
+}
+
+// Returns EOF on short or missing file.
+func (fst *fileTorrentImplIO) readFileAt(file file, b []byte, off int64) (n int, err error) {
+	f, err := os.Open(file.path)
+	if os.IsNotExist(err) {
+		// File missing is treated the same as a short file.
+		err = io.EOF
+		return
+	}
+	if err != nil {
+		return
+	}
+	defer f.Close()
+	// Limit the read to within the expected bounds of this file.
+	if int64(len(b)) > file.length-off {
+		b = b[:file.length-off]
+	}
+	for off < file.length && len(b) != 0 {
+		n1, err1 := f.ReadAt(b, off)
+		b = b[n1:]
+		n += n1
+		off += int64(n1)
+		if n1 == 0 {
+			err = err1
+			break
+		}
+	}
+	return
+}
+
+// Only returns EOF at the end of the torrent. Premature EOF is ErrUnexpectedEOF.
+func (fst fileTorrentImplIO) ReadAt(b []byte, off int64) (n int, err error) {
+	fst.fts.segmentLocater.Locate(segments.Extent{off, int64(len(b))}, func(i int, e segments.Extent) bool {
+		n1, err1 := fst.readFileAt(fst.fts.files[i], b[:e.Length], e.Start)
+		n += n1
+		b = b[n1:]
+		err = err1
+		return err == nil // && int64(n1) == e.Length
+	})
+	if len(b) != 0 && err == nil {
+		err = io.EOF
+	}
+	return
+}
+
+func (fst fileTorrentImplIO) WriteAt(p []byte, off int64) (n int, err error) {
+	// log.Printf("write at %v: %v bytes", off, len(p))
+	fst.fts.segmentLocater.Locate(segments.Extent{off, int64(len(p))}, func(i int, e segments.Extent) bool {
+		name := fst.fts.files[i].path
+		os.MkdirAll(filepath.Dir(name), 0o777)
+		var f *os.File
+		f, err = os.OpenFile(name, os.O_WRONLY|os.O_CREATE, 0o666)
+		if err != nil {
+			return false
+		}
+		var n1 int
+		n1, err = f.WriteAt(p[:e.Length], e.Start)
+		// log.Printf("%v %v wrote %v: %v", i, e, n1, err)
+		closeErr := f.Close()
+		n += n1
+		p = p[n1:]
+		if err == nil {
+			err = closeErr
+		}
+		if err == nil && int64(n1) != e.Length {
+			err = io.ErrShortWrite
+		}
+		return err == nil
+	})
+	return
+}
@@ -0,0 +1,36 @@
+// modify from github.com/anacrolix/torrent/storage/file_misc.go
+
+package bt
+
+import "github.com/anacrolix/torrent/metainfo"
+
+type requiredLength struct {
+	fileIndex int
+	length    int64
+}
+
+func extentCompleteRequiredLengths(info *metainfo.Info, off, n int64) (ret []requiredLength) {
+	if n == 0 {
+		return
+	}
+	for i, fi := range info.UpvertedFiles() {
+		if off >= fi.Length {
+			off -= fi.Length
+			continue
+		}
+		n1 := n
+		if off+n1 > fi.Length {
+			n1 = fi.Length - off
+		}
+		ret = append(ret, requiredLength{
+			fileIndex: i,
+			length:    off + n1,
+		})
+		n -= n1
+		if n == 0 {
+			return
+		}
+		off = 0
+	}
+	return
+}
@@ -0,0 +1,61 @@
+// modify from github.com/anacrolix/torrent/storage/file_piece.go
+
+package bt
+
+import (
+	"github.com/anacrolix/torrent/metainfo"
+	"github.com/anacrolix/torrent/storage"
+	"io"
+	"log"
+	"os"
+)
+
+type filePieceImpl struct {
+	*fileTorrentImpl
+	p metainfo.Piece
+	io.WriterAt
+	io.ReaderAt
+}
+
+var _ storage.PieceImpl = (*filePieceImpl)(nil)
+
+func (fs *filePieceImpl) pieceKey() metainfo.PieceKey {
+	return metainfo.PieceKey{InfoHash: fs.infoHash, Index: fs.p.Index()}
+}
+
+func (fs *filePieceImpl) Completion() storage.Completion {
+	c, err := fs.completion.Get(fs.pieceKey())
+	if err != nil {
+		log.Printf("error getting piece completion: %s", err)
+		c.Ok = false
+		return c
+	}
+
+	verified := true
+	if c.Complete {
+		// If it's allegedly complete, check that its constituent files have the necessary length.
+		for _, fi := range extentCompleteRequiredLengths(fs.p.Info, fs.p.Offset(), fs.p.Length()) {
+			s, err := os.Stat(fs.files[fi.fileIndex].path)
+			if err != nil || s.Size() < fi.length {
+				verified = false
+				break
+			}
+		}
+	}
+
+	if !verified {
+		// The completion was wrong, fix it.
+		c.Complete = false
+		fs.completion.Set(fs.pieceKey(), false)
+	}
+
+	return c
+}
+
+func (fs *filePieceImpl) MarkComplete() error {
+	return fs.completion.Set(fs.pieceKey(), true)
+}
+
+func (fs *filePieceImpl) MarkNotComplete() error {
+	return fs.completion.Set(fs.pieceKey(), false)
+}
@@ -1,7 +1,6 @@
 package http

 type config struct {
-	UserAgent      string `json:"userAgent"`
-	Connections    int    `json:"connections"`
-	UseServerCtime bool   `json:"useServerCtime"`
+	UserAgent   string `json:"userAgent"`
+	Connections int    `json:"connections"`
 }
@@ -1,96 +0,0 @@
-package http
-
-import (
-	"net/url"
-	"path"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	fhttp "github.com/GopeedLab/gopeed/pkg/protocol/http"
-)
-
-// ============================================================================
-// Fetcher Data (for Store/Restore)
-// ============================================================================
-
-type fetcherData struct {
-	Connections []*connection
-}
-
-// ============================================================================
-// Fetcher Manager
-// ============================================================================
-
-type FetcherManager struct {
-}
-
-func (fm *FetcherManager) Name() string {
-	return "http"
-}
-
-func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
-	return []*fetcher.SchemeFilter{
-		{
-			Type:    fetcher.FilterTypeUrl,
-			Pattern: "HTTP",
-		},
-		{
-			Type:    fetcher.FilterTypeUrl,
-			Pattern: "HTTPS",
-		},
-	}
-}
-
-func (fm *FetcherManager) Build() fetcher.Fetcher {
-	return &Fetcher{}
-}
-
-func (fm *FetcherManager) ParseName(u string) string {
-	var name string
-	url, err := url.Parse(u)
-	if err != nil {
-		return ""
-	}
-	name = path.Base(url.Path)
-	if name == "" || name == "/" || name == "." {
-		name = url.Hostname()
-	}
-	return name
-}
-
-func (fm *FetcherManager) AutoRename() bool {
-	return true
-}
-
-func (fm *FetcherManager) DefaultConfig() any {
-	return &config{
-		UserAgent:   "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
-		Connections: 16,
-	}
-}
-
-func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
-	_f := f.(*Fetcher)
-	return &fetcherData{
-		Connections: _f.connections,
-	}, nil
-}
-
-func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
-	return &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
-		fd := v.(*fetcherData)
-		fb := &FetcherManager{}
-		fetcher := fb.Build().(*Fetcher)
-		fetcher.meta = meta
-		base.ParseReqExtra[fhttp.ReqExtra](fetcher.meta.Req)
-		base.ParseOptExtra[fhttp.OptsExtra](fetcher.meta.Opts)
-		if len(fd.Connections) > 0 {
-			fetcher.connections = fd.Connections
-		}
-		return fetcher
-	}
-}
-
-func (fm *FetcherManager) Close() error {
-	return nil
-}
@@ -3,279 +3,74 @@ package http
 import (
 	"encoding/json"
 	"fmt"
-	"net"
-	gohttp "net/http"
-	"net/url"
-	"os"
-	"strings"
-	"testing"
-	"time"
-
 	"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/http"
+	"github.com/GopeedLab/gopeed/pkg/util"
+	"net"
+	"reflect"
+	"testing"
+	"time"
 )

 func TestFetcher_Resolve(t *testing.T) {
-	testResolve(test.StartTestFileServer, test.BuildName, t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  test.BuildSize,
-			Range: true,
-			Files: []*base.FileInfo{
-				{
-					Name: test.BuildName,
-					Size: test.BuildSize,
-				},
-			},
-		}, nil
-	})
-	testResolve(test.StartTestCustomServer, "disposition", t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  test.BuildSize,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: test.BuildName,
-					Size: test.BuildSize,
-				},
-			},
-		}, nil
-	})
-	testResolve(test.StartTestCustomServer, "encoded-word", t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  test.BuildSize,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: test.TestChineseFileName,
-					Size: test.BuildSize,
-				},
-			},
-		}, nil
-	})
-	testResolve(test.StartTestCustomServer, "no-encode", t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  test.BuildSize,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: test.TestChineseFileName,
-					Size: test.BuildSize,
-				},
-			},
-		}, nil
-	})
-	testResolve(test.StartTestCustomServer, "%E6%B5%8B%E8%AF%95.zip", t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  0,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: test.TestChineseFileName,
-					Size: 0,
-				},
-			},
-		}, nil
-	})
-	testResolve(test.StartTestCustomServer, test.BuildName, t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  0,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: test.BuildName,
-					Size: 0,
-				},
-			},
-		}, nil
-	})
-	// Test mixed encoding Content-Disposition where mime.ParseMediaType fails
-	// due to invalid characters, but filename*= contains the correct UTF-8 encoded name
-	testResolve(test.StartTestCustomServer, "mixed-encoding", t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  test.BuildSize,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: test.TestChineseFileName,
-					Size: test.BuildSize,
-				},
-			},
-		}, nil
-	})
-	// Test filename*= only (RFC 5987 format)
-	testResolve(test.StartTestCustomServer, "filename-star", t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  test.BuildSize,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: test.TestChineseFileName,
-					Size: test.BuildSize,
-				},
-			},
-		}, nil
-	})
-	// Test GBK-encoded filename (common on Chinese Windows servers)
-	// Before fix: "测试.zip" sent as GBK bytes -> parsed as "²âÊÔ.zip" (garbled)
-	// After fix: correctly decoded back to "测试.zip"
-	testResolve(test.StartTestCustomServer, "gbk-encoded", t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  test.BuildSize,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: test.TestChineseFileName,
-					Size: test.BuildSize,
-				},
-			},
-		}, nil
-	})
-	// Test filename with plus signs (e.g., C++ Primer)
-	// Before fix: %2B decoded to space -> "C++ Primer" became "C  Primer"
-	// After fix: %2B correctly decoded to + -> "C++  Primer  Plus.mobi"
-	testResolve(test.StartTestCustomServer, "plus-sign-encoded", t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  test.BuildSize,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: "C++  Primer  Plus.mobi",
-					Size: test.BuildSize,
-				},
-			},
-		}, nil
-	})
-	// Test filename with plus sign in URL path
-	// Before fix: %2B decoded to space
-	// After fix: %2B correctly decoded to +
-	testResolve(test.StartTestCustomServer, "C%2B%2B%20Primer.txt", t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  0,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: "C++ Primer.txt",
-					Size: 0,
-				},
-			},
-		}, nil
-	})
-	// Test filename with HTML-encoded ampersand (fixes issue with & being truncated)
-	// Before fix: "查询处理&amp;优化.pptx" -> "查询处理&amp" (truncated at semicolon)
-	// After fix: correctly decoded to "查询处理&优化.pptx"
-	testResolve(test.StartTestCustomServer, "ampersand-encoded", t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  test.BuildSize,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: "查询处理&优化.pptx",
-					Size: test.BuildSize,
-				},
-			},
-		}, nil
-	})
-	// Test unquoted filename with HTML-encoded ampersand
-	testResolve(test.StartTestCustomServer, "ampersand-unquoted", t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  test.BuildSize,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: "test&file.txt",
-					Size: test.BuildSize,
-				},
-			},
-		}, nil
-	})
-	// Test URL without file path - should use domain/host as filename
-	testResolve(test.StartTestCustomServer, "", t, func(err error) (*base.Resource, error) {
-		return &base.Resource{
-			Size:  0,
-			Range: false,
-			Files: []*base.FileInfo{
-				{
-					Name: "127.0.0.1",
-					Size: 0,
-				},
-			},
-		}, nil
-	})
-	// Test 403 Forbidden response handling
-	testResolve(test.StartTestCustomServer, "forbidden", t, func(err error) (*base.Resource, error) {
-		requestError := extractRequestError(err)
-		if requestError != nil && requestError.Code == 403 {
-			return nil, nil
-		}
-		return nil, err
-	})
-}
-
-func TestFetcher_ResolveWithHostHeader(t *testing.T) {
-	listener := test.StartTestHostHeaderServer()
-	defer listener.Close()
-
-	fetcher := buildFetcher()
-	err := fetcher.Resolve(&base.Request{
-		URL: "http://" + listener.Addr().String() + "/",
-		Extra: &http.ReqExtra{
-			Header: map[string]string{
-				"Host": "test",
+	testResolve(test.StartTestFileServer, test.BuildName, &base.Resource{
+		Size:  test.BuildSize,
+		Range: true,
+		Files: []*base.FileInfo{
+			{
+				Name: test.BuildName,
+				Size: test.BuildSize,
 			},
 		},
-	}, &base.Options{
-		Name: test.DownloadName,
-		Path: test.Dir,
-	})
-	// The server should return 400 for invalid Host header
-	if err == nil || !strings.Contains(err.Error(), "400") {
-		t.Errorf("Resolve() got = %v, want error containing 400", err)
-	}
-}
-
-func TestFetcher_ResolveWithInvalidHeader(t *testing.T) {
-	listener := test.StartTestCustomServer()
-	defer listener.Close()
-
-	fetcher := buildFetcher()
-	defer fetcher.Pause() // Close the resolve response to allow server shutdown
-	err := fetcher.Resolve(&base.Request{
-		URL: "http://" + listener.Addr().String() + "/",
-		Extra: &http.ReqExtra{
-			Header: map[string]string{
-				"Referer": "\rtest",
+	}, t)
+	testResolve(test.StartTestCustomServer, "disposition", &base.Resource{
+		Size:  test.BuildSize,
+		Range: false,
+		Files: []*base.FileInfo{
+			{
+				Name: test.BuildName,
+				Size: test.BuildSize,
 			},
 		},
-	}, &base.Options{
-		Name: test.DownloadName,
-		Path: test.Dir,
-	})
-	// Invalid header with \r should be sanitized by Go's http client, allowing the request to succeed
-	if err != nil {
-		t.Errorf("Resolve() got = %v, want nil (invalid headers should be sanitized)", err)
-	}
-}
+	}, t)
+	testResolve(test.StartTestCustomServer, test.BuildName, &base.Resource{
+		Size:  0,
+		Range: false,
+		Files: []*base.FileInfo{
+			{
+				Name: test.BuildName,
+				Size: 0,
+			},
+		},
+	}, t)

-func testResolve(startTestServer func() net.Listener, path string, t *testing.T, wantFn func(error) (*base.Resource, error)) {
-	listener := startTestServer()
-	defer listener.Close()
 	fetcher := buildFetcher()
-	defer fetcher.Pause() // Close the resolve response to allow server shutdown
 	err := fetcher.Resolve(&base.Request{
-		URL: "http://" + listener.Addr().String() + "/" + path,
-	}, &base.Options{
-		Name: test.DownloadName,
-		Path: test.Dir,
+		URL: "http://github.com",
 	})
-	want, err := wantFn(err)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if want != nil && !test.AssertResourceEqual(want, fetcher.meta.Res) {
-		t.Errorf("Resolve() got = %+v, want %+v", fetcher.meta.Res, want)
+	if fetcher.Meta().Res.Files[0].Name != "github.com" {
+		t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, "github.com")
+	}
+}
+
+func testResolve(startTestServer func() net.Listener, path string, want *base.Resource, t *testing.T) {
+	listener := startTestServer()
+	defer listener.Close()
+	fetcher := buildFetcher()
+	err := fetcher.Resolve(&base.Request{
+		URL: "http://" + listener.Addr().String() + "/" + path,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(want, fetcher.meta.Res) {
+		t.Errorf("Resolve() got = %v, want %v", fetcher.meta.Res, want)
 	}
 }

@@ -337,85 +132,6 @@ func TestFetcher_DownloadLimit(t *testing.T) {
 	downloadNormal(listener, 8, t)
 }

-func TestFetcher_DownloadResponseBodyReadTimeout(t *testing.T) {
-	// Server will timeout once (first request delays longer than readTimeout),
-	// then subsequent requests work normally
-	listener := test.StartTestTimeoutOnceServer(readTimeout.Milliseconds() + 5000)
-	defer listener.Close()
-
-	for _, connections := range []int{1, 4} {
-		os.Remove(test.DownloadFile)
-
-		fetcher := downloadReady(listener, connections, t)
-		if err := fetcher.Start(); err != nil {
-			t.Fatal(err)
-		}
-		if err := fetcher.Wait(); err != nil {
-			t.Fatal(err)
-		}
-
-		stats := fetcher.Stats().(*http.Stats)
-		if len(stats.Connections) == 0 {
-			t.Fatalf("expected connections stats for timeout test")
-		}
-
-		// Verify successful download after timeout recovery
-		want := test.FileMd5(test.BuildFile)
-		got := test.FileMd5(test.DownloadFile)
-		if want != got {
-			t.Errorf("Download() got = %v, want %v", got, want)
-		}
-
-		// Verify timeouts don't count as failures (retryTimes should be 0)
-		for _, conn := range stats.Connections {
-			if conn.Failed {
-				t.Fatalf("expected no counted failures after timeout recovery, got retries=%d", conn.RetryTimes)
-			}
-			if conn.RetryTimes != 0 {
-				t.Fatalf("expected retryTimes to stay zero for non-counted timeouts, got %d", conn.RetryTimes)
-			}
-		}
-	}
-}
-
-func TestFetcher_Download500Recovery(t *testing.T) {
-	// Server returns 500 for 15 seconds, then recovers
-	listener := test.StartTestTemporary500Server(15 * time.Second)
-	defer listener.Close()
-
-	os.Remove(test.DownloadFile)
-	fetcher := downloadReady(listener, 4, t)
-	if err := fetcher.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := fetcher.Wait(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify successful download after 500 errors
-	want := test.FileMd5(test.BuildFile)
-	got := test.FileMd5(test.DownloadFile)
-	if want != got {
-		t.Errorf("Download() got = %v, want %v", got, want)
-	}
-
-	// Verify 500 errors don't count as failures (retryTimes should be 0)
-	stats := fetcher.Stats().(*http.Stats)
-	for _, conn := range stats.Connections {
-		if conn.RetryTimes != 0 {
-			t.Errorf("Expected retryTimes to be 0 for 500 errors (exempt), got %d", conn.RetryTimes)
-		}
-	}
-}
-
-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()
@@ -435,12 +151,10 @@ func TestFetcher_DownloadWithProxy(t *testing.T) {
 	downloadWithProxy(httpListener, proxyListener, t)
 }

-func TestFetcher_ConfigConnections(t *testing.T) {
+func TestFetcher_Config(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()
-	fetcher := doDownloadReady(buildConfigFetcher(config{
-		Connections: 16,
-	}), listener, 0, t)
+	fetcher := doDownloadReady(buildConfigFetcher(), listener, 0, t)
 	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)
@@ -456,384 +170,20 @@ func TestFetcher_ConfigConnections(t *testing.T) {
 	}
 }

-func TestFetcher_ConfigUseServerCtime(t *testing.T) {
-	listener := test.StartTestFileServer()
-	defer listener.Close()
-	fetcher := doDownloadReady(buildConfigFetcher(config{
-		Connections:    16,
-		UseServerCtime: true,
-	}), listener, 0, t)
-	err := fetcher.Start()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = fetcher.Wait()
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := test.FileMd5(test.BuildFile)
-	got := test.FileMd5(test.DownloadFile)
-	if want != got {
-		t.Errorf("Download() got = %v, want %v", got, want)
-	}
-}
-
-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)
-	// With slow-start strategy, connection count may be less than max if download is fast
-	// Just verify we have at least 1 connection and no more than max
-	if len(stats.Connections) < 1 || len(stats.Connections) > 16 {
-		t.Errorf("Stats() connection count got = %v, want between 1 and 16", len(stats.Connections))
-	}
-	totalDownloaded := int64(0)
-	for i, conn := range stats.Connections {
-		t.Logf("Connection %d: Downloaded=%d, Completed=%v", i, conn.Downloaded, conn.Completed)
-		totalDownloaded += conn.Downloaded
-	}
-	if totalDownloaded != test.BuildSize {
-		t.Errorf("Stats() got = %v, want %v", totalDownloaded, test.BuildSize)
-	}
-}
-
-// TestFetcher_DownloadOneTimeURL tests downloading from a URL that can only be accessed once
-// This simulates signed URLs or one-time download links that expire after first use
-func TestFetcher_DownloadOneTimeURL(t *testing.T) {
-	listener := test.StartTestOneTimeServer()
-	defer listener.Close()
-
-	fetcher := buildFetcher()
-	err := fetcher.Resolve(&base.Request{
-		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
-	}, &base.Options{
-		Name: test.DownloadName,
-		Path: test.Dir,
-		Extra: &http.OptsExtra{
-			Connections: 4, // Try to use multiple connections, but only first should work
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = fetcher.Start()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = fetcher.Wait()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify file content
-	want := test.FileMd5(test.BuildFile)
-	got := test.FileMd5(test.DownloadFile)
-	if want != got {
-		t.Errorf("Download() got = %v, want %v", got, want)
-	}
-}
-
-// TestFetcher_SlowStartExpansion tests slow-start connection expansion edge cases
-// Tests that slow-start expansion reaches exactly maxConns
-// Expansion pattern: 1 -> 2 -> 4 -> 8 -> 16...
-// For max=5: 1 -> 2 -> 4 -> 5 (capped)
-// For max=9: 1 -> 2 -> 4 -> 8 -> 9 (capped)
-func TestFetcher_SlowStartExpansion(t *testing.T) {
-	testCases := []struct {
-		name     string
-		maxConns int
-	}{
-		{"MaxConns5", 5}, // 1->2->4->5
-		{"MaxConns9", 9}, // 1->2->4->8->9
-		{"MaxConns8", 8}, // 1->2->4->8
-	}
-
-	for _, tc := range testCases {
-		tc := tc // capture range variable
-		t.Run(tc.name, func(t *testing.T) {
-			// Clean up any leftover files from previous tests
-			os.Remove(test.DownloadFile)
-
-			// Use 100ns delay per byte for faster test (~10MB/s theoretical)
-			listener := test.StartTestSlowStartServer(100 * time.Nanosecond)
-
-			// Ensure cleanup happens before next subtest
-			cleanup := func() {
-				listener.Close()
-				os.Remove(test.DownloadFile)
-				// Wait for server to fully stop
-				time.Sleep(50 * time.Millisecond)
-			}
-
-			fetcher := buildConfigFetcher(config{
-				Connections: tc.maxConns,
-			})
-
-			err := fetcher.Resolve(&base.Request{
-				URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
-			}, &base.Options{
-				Name: test.DownloadName,
-				Path: test.Dir,
-				Extra: &http.OptsExtra{
-					Connections: tc.maxConns,
-				},
-			})
-			if err != nil {
-				cleanup()
-				t.Fatal(err)
-			}
-
-			err = fetcher.Start()
-			if err != nil {
-				cleanup()
-				t.Fatal(err)
-			}
-
-			err = fetcher.Wait()
-			if err != nil {
-				t.Logf("Wait() returned error: %v", err)
-				cleanup()
-				t.Fatal(err)
-			}
-
-			// Check final connection count equals maxConns exactly
-			stats := fetcher.Stats().(*http.Stats)
-			finalConns := len(stats.Connections)
-
-			// Debug: show connection details and metadata
-			httpFetcher := fetcher.(*Fetcher)
-			t.Logf("Resource: Size=%d, Range=%v", httpFetcher.Meta().Res.Size, httpFetcher.Meta().Res.Range)
-			for i, conn := range stats.Connections {
-				t.Logf("Connection %d: Downloaded=%d, Completed=%v", i, conn.Downloaded, conn.Completed)
-			}
-
-			if finalConns != tc.maxConns {
-				t.Errorf("Expected exactly %d connections, got %d", tc.maxConns, finalConns)
-			}
-
-			// Verify file content before cleanup
-			want := test.FileMd5(test.BuildFile)
-			got := test.FileMd5(test.DownloadFile)
-			if want != got {
-				t.Errorf("Download() got = %v, want %v", got, want)
-			}
-
-			cleanup()
-		})
-	}
-}
-
-// TestFetcher_AsyncPrefetch tests the async prefetch functionality
-// where data is downloaded in background during resolve phase and reused in start
-func TestFetcher_AsyncPrefetch(t *testing.T) {
-	// Test 1: Prefetch completes entire file before Start is called
-	t.Run("PrefetchComplete", func(t *testing.T) {
-		listener := test.StartTestFileServer()
-		defer listener.Close()
-
-		fetcher := buildFetcher()
-		err := fetcher.Resolve(&base.Request{
-			URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
-		}, &base.Options{
-			Name: test.DownloadName,
-			Path: test.Dir,
-			Extra: &http.OptsExtra{
-				Connections: 4,
-			},
-		})
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Poll until prefetch completes the entire file (with timeout)
-		timeout := time.After(30 * time.Second)
-		ticker := time.NewTicker(100 * time.Millisecond)
-		defer ticker.Stop()
-	pollLoop:
-		for {
-			select {
-			case <-timeout:
-				t.Fatal("Timeout waiting for prefetch to complete")
-			case <-ticker.C:
-				if fetcher.prefetchSize.Load() >= test.BuildSize {
-					break pollLoop
-				}
-			}
-		}
-
-		prefetchedBefore := fetcher.prefetchSize.Load()
-		t.Logf("Prefetched bytes before Start: %d (%.2f MB)", prefetchedBefore, float64(prefetchedBefore)/(1024*1024))
-
-		// Should have prefetched the entire file
-		if prefetchedBefore != test.BuildSize {
-			t.Errorf("Prefetch should complete entire file, got %d, want %d", prefetchedBefore, test.BuildSize)
-		}
-
-		// Now start the download
-		err = fetcher.Start()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Wait for download to complete
-		err = fetcher.Wait()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Check how much was utilized from prefetch
-		prefetchedUsed := fetcher.resolveDataPos.Load()
-		t.Logf("Prefetched bytes used: %d (%.2f MB)", prefetchedUsed, float64(prefetchedUsed)/(1024*1024))
-
-		// Verify file is correct
-		want := test.FileMd5(test.BuildFile)
-		got := test.FileMd5(test.DownloadFile)
-		if want != got {
-			t.Errorf("Download() got = %v, want %v", got, want)
-		}
-
-		os.Remove(test.DownloadFile)
-	})
-
-	// Test 2: Prefetch only downloads partial data before Start is called
-	t.Run("PrefetchPartial", func(t *testing.T) {
-		// Use slow server with 100 nanosecond delay per byte
-		// This means ~10MB/s speed, so 100ms should download ~1MB
-		listener := test.StartTestSlowStartServer(100 * time.Nanosecond)
-		defer listener.Close()
-
-		fetcher := buildFetcher()
-		err := fetcher.Resolve(&base.Request{
-			URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
-		}, &base.Options{
-			Name: test.DownloadName,
-			Path: test.Dir,
-			Extra: &http.OptsExtra{
-				Connections: 4,
-			},
-		})
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Wait only 100ms - should only prefetch a small portion
-		time.Sleep(100 * time.Millisecond)
-
-		prefetchedBefore := fetcher.prefetchSize.Load()
-		t.Logf("Prefetched bytes before Start: %d (%.2f KB)", prefetchedBefore, float64(prefetchedBefore)/1024)
-
-		// Verify we have partial data (not zero, but not complete)
-		if prefetchedBefore == 0 {
-			t.Log("Warning: No data prefetched, may be too slow")
-		}
-		if prefetchedBefore >= test.BuildSize {
-			t.Log("Warning: Prefetch completed entire file, test may not be valid")
-		}
-
-		// Now start the download
-		err = fetcher.Start()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Wait for download to complete
-		err = fetcher.Wait()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Check stats - should have connections that downloaded remaining data
-		stats := fetcher.Stats().(*http.Stats)
-		t.Logf("Final connections: %d", len(stats.Connections))
-
-		prefetchedUsed := fetcher.resolveDataPos.Load()
-		t.Logf("Prefetched bytes used: %d (%.2f KB)", prefetchedUsed, float64(prefetchedUsed)/1024)
-
-		// Verify connections picked up where prefetch left off
-		if len(stats.Connections) > 0 {
-			firstConn := stats.Connections[0]
-			t.Logf("First connection downloaded: %d bytes", firstConn.Downloaded)
-		}
-
-		// Verify file is correct
-		want := test.FileMd5(test.BuildFile)
-		got := test.FileMd5(test.DownloadFile)
-		if want != got {
-			t.Errorf("Download() got = %v, want %v", got, want)
-		}
-
-		os.Remove(test.DownloadFile)
-	})
-}
-
-func TestFetcherManager_ParseName(t *testing.T) {
-	type args struct {
-		u string
-	}
-	tests := []struct {
-		name string
-		args args
-		want string
-	}{
-		{
-			name: "broken url",
-			args: args{
-				u: "https://!@#%github.com",
-			},
-			want: "",
-		},
-		{
-			name: "file path",
-			args: args{
-				u: "https://github.com/index.html",
-			},
-			want: "index.html",
-		},
-		{
-			name: "file path with query and hash",
-			args: args{
-				u: "https://github.com/a/b/index.html/#list?name=1",
-			},
-			want: "index.html",
-		},
-		{
-			name: "no file path",
-			args: args{
-				u: "https://github.com",
-			},
-			want: "github.com",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			fm := &FetcherManager{}
-			if got := fm.ParseName(tt.args.u); got != tt.want {
-				t.Errorf("ParseName() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
 func downloadReady(listener net.Listener, connections int, t *testing.T) fetcher.Fetcher {
 	return doDownloadReady(buildFetcher(), listener, connections, t)
 }

 func doDownloadReady(f fetcher.Fetcher, listener net.Listener, connections int, t *testing.T) fetcher.Fetcher {
+	err := f.Resolve(&base.Request{
+		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
 	var extra any = nil
 	if connections > 0 {
-		extra = &http.OptsExtra{
+		extra = http.OptsExtra{
 			Connections: connections,
 		}
 	}
@@ -842,9 +192,7 @@ func doDownloadReady(f fetcher.Fetcher, listener net.Listener, connections int,
 		Path:  test.Dir,
 		Extra: extra,
 	}
-	err := f.Resolve(&base.Request{
-		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
-	}, opts)
+	err = f.Create(opts)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -869,39 +217,19 @@ func downloadNormal(listener net.Listener, connections int, t *testing.T) {
 }

 func downloadPost(listener net.Listener, connections int, t *testing.T) {
-	// POST parameters must be set before Resolve since the new design
-	// starts downloading during Resolve phase
-	f := buildFetcher()
-	var extra any = nil
-	if connections > 0 {
-		extra = &http.OptsExtra{
-			Connections: connections,
-		}
-	}
-	opts := &base.Options{
-		Name:  test.DownloadName,
-		Path:  test.Dir,
-		Extra: extra,
-	}
-	req := &base.Request{
-		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
-		Extra: &http.ReqExtra{
-			Method: "POST",
-			Header: map[string]string{
-				"Authorization": "Bearer 123456",
-			},
-			Body: fmt.Sprintf(`{"name":"%s"}`, test.BuildName),
+	fetcher := downloadReady(listener, connections, t)
+	fetcher.Meta().Req.Extra = &http.ReqExtra{
+		Method: "POST",
+		Header: map[string]string{
+			"Authorization": "Bearer 123456",
 		},
+		Body: fmt.Sprintf(`{"name":"%s"}`, test.BuildName),
 	}
-	err := f.Resolve(req, opts)
+	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = f.Start()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = f.Wait()
+	err = fetcher.Wait()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -938,30 +266,14 @@ func downloadContinue(listener net.Listener, connections int, t *testing.T) {
 }

 func downloadError(listener net.Listener, connections int, t *testing.T) {
-	fetcher := buildFetcher()
-	err := fetcher.Resolve(&base.Request{
-		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
-	}, &base.Options{
-		Name: test.DownloadName,
-		Path: test.Dir,
-	})
-	// With the new async design, Resolve may succeed (HTTP response received)
-	// but errors occur during async download or Start/Wait
+	fetcher := downloadReady(listener, connections, t)
+	err := fetcher.Start()
 	if err != nil {
-		// Error detected in Resolve - this is fine
-		return
+		t.Fatal(err)
 	}
-
-	// Resolve succeeded, error should occur during Start/Wait
-	err = fetcher.Start()
-	if err != nil {
-		// Error detected in Start - this is fine
-		return
-	}
-
 	err = fetcher.Wait()
 	if err == nil {
-		t.Errorf("Expected error during download, but got none")
+		t.Errorf("Download() got = %v, want %v", err, nil)
 	}
 }

@@ -972,7 +284,7 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
 		t.Fatal(err)
 	}

-	fb := new(FetcherManager)
+	fb := new(FetcherBuilder)
 	time.Sleep(time.Millisecond * 50)
 	data, err := fb.Store(fetcher)
 	if err != nil {
@@ -1003,13 +315,7 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
 func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t *testing.T) {
 	fetcher := downloadReady(httpListener, 4, t)
 	ctl := controller.NewController()
-	ctl.GetProxy = func(requestProxy *base.RequestProxy) func(*gohttp.Request) (*url.URL, error) {
-		return (&base.DownloaderProxyConfig{
-			Enable: true,
-			Scheme: "socks5",
-			Host:   proxyListener.Addr().String(),
-		}).ToHandler()
-	}
+	ctl.ProxyUrl = util.BuildProxyUrl("socks5", proxyListener.Addr().String(), "", "")
 	fetcher.Setup(ctl)
 	err := fetcher.Start()
 	if err != nil {
@@ -1027,21 +333,22 @@ func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t
 }

 func buildFetcher() *Fetcher {
-	fm := new(FetcherManager)
-	fetcher := fm.Build()
-	newController := controller.NewController()
-	newController.GetConfig = func(v any) {
-		json.Unmarshal([]byte(test.ToJson(fm.DefaultConfig())), v)
-	}
-	fetcher.Setup(newController)
+	fetcher := new(FetcherBuilder).Build()
+	fetcher.Setup(controller.NewController())
 	return fetcher.(*Fetcher)
 }

-func buildConfigFetcher(cfg config) fetcher.Fetcher {
-	fetcher := new(FetcherManager).Build()
+func buildConfigFetcher() fetcher.Fetcher {
+	fetcher := new(FetcherBuilder).Build()
 	newController := controller.NewController()
-	newController.GetConfig = func(v any) {
-		json.Unmarshal([]byte(test.ToJson(cfg)), v)
+	mockCfg := config{
+		Connections: 16,
+	}
+	newController.GetConfig = func(v any) bool {
+		if err := json.Unmarshal([]byte(test.ToJson(mockCfg)), v); err != nil {
+			return false
+		}
+		return true
 	}
 	fetcher.Setup(newController)
 	return fetcher
@@ -1,138 +0,0 @@
-package http
-
-import (
-	"testing"
-)
-
-// TestParseFilenameWithAmpersand tests the fix for filenames containing & character
-// Issue: filenames with & are HTML-encoded as &amp; and then truncated at the semicolon
-func TestParseFilenameWithAmpersand(t *testing.T) {
-	tests := []struct {
-		name        string
-		disposition string
-		want        string
-	}{
-		{
-			name:        "quoted filename with &amp;",
-			disposition: `attachment; filename="查询处理&amp;优化.pptx"`,
-			want:        "查询处理&优化.pptx",
-		},
-		{
-			name:        "unquoted filename with &amp;",
-			disposition: `attachment; filename=test&amp;file.txt`,
-			want:        "test&file.txt",
-		},
-		{
-			name:        "quoted filename with &amp; and extra params",
-			disposition: `attachment; filename="test&amp;file.txt"; charset=utf-8`,
-			want:        "test&file.txt",
-		},
-		{
-			name:        "filename with multiple HTML entities",
-			disposition: `attachment; filename="test&amp;&lt;&gt;.txt"`,
-			want:        "test&<>.txt",
-		},
-		{
-			name:        "normal filename without entities",
-			disposition: `attachment; filename="normal.txt"`,
-			want:        "normal.txt",
-		},
-		{
-			name:        "filename with actual ampersand (no encoding)",
-			disposition: `attachment; filename="test&file.txt"`,
-			want:        "test&file.txt",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := parseFilename(tt.disposition)
-			if got != tt.want {
-				t.Errorf("parseFilename() = %q, want %q", got, tt.want)
-			}
-		})
-	}
-}
-
-// TestFindParamValueEnd tests the helper function for finding parameter value boundaries
-func TestFindParamValueEnd(t *testing.T) {
-	tests := []struct {
-		name  string
-		value string
-		want  int
-	}{
-		{
-			name:  "quoted value with semicolon inside",
-			value: `"test&amp;file.txt"; charset=utf-8`,
-			want:  19, // Position of semicolon after closing quote
-		},
-		{
-			name:  "quoted value without semicolon after",
-			value: `"test.txt"`,
-			want:  -1,
-		},
-		{
-			name:  "unquoted value with semicolon",
-			value: `test.txt; charset=utf-8`,
-			want:  8,
-		},
-		{
-			name:  "unquoted value without semicolon",
-			value: `test.txt`,
-			want:  -1,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := findParamValueEnd(tt.value)
-			if got != tt.want {
-				t.Errorf("findParamValueEnd() = %d, want %d", got, tt.want)
-			}
-		})
-	}
-}
-
-// TestUnescapeHTMLEntities tests HTML entity unescaping
-func TestUnescapeHTMLEntities(t *testing.T) {
-	tests := []struct {
-		name string
-		in   string
-		want string
-	}{
-		{
-			name: "ampersand",
-			in:   "test&amp;file.txt",
-			want: "test&file.txt",
-		},
-		{
-			name: "less than and greater than",
-			in:   "&lt;test&gt;.txt",
-			want: "<test>.txt",
-		},
-		{
-			name: "quote",
-			in:   "test&quot;file.txt",
-			want: "test\"file.txt",
-		},
-		{
-			name: "multiple entities",
-			in:   "a&amp;b&lt;c&gt;d&quot;e",
-			want: "a&b<c>d\"e",
-		},
-		{
-			name: "no entities",
-			in:   "normal.txt",
-			want: "normal.txt",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := unescapeHTMLEntities(tt.in)
-			if got != tt.want {
-				t.Errorf("unescapeHTMLEntities() = %q, want %q", got, tt.want)
-			}
-		})
-	}
-}
@@ -1,406 +0,0 @@
-package http
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"io"
-	"mime"
-	"net"
-	"net/http"
-	"net/http/cookiejar"
-	"net/url"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	"github.com/GopeedLab/gopeed/pkg/base"
-	fhttp "github.com/GopeedLab/gopeed/pkg/protocol/http"
-	"github.com/GopeedLab/gopeed/pkg/util"
-	"golang.org/x/text/encoding/simplifiedchinese"
-)
-
-type RequestError struct {
-	Code int
-}
-
-func NewRequestError(code int) *RequestError {
-	return &RequestError{Code: code}
-}
-
-func (re *RequestError) Error() string {
-	return fmt.Sprintf("http request fail, code:%d", re.Code)
-}
-
-func isFailureExemptHTTPCode(code int) bool {
-	if code >= 500 && code <= 599 {
-		return true
-	}
-
-	switch code {
-	case 429, 408, 440, 499:
-		return true
-	default:
-		return false
-	}
-}
-
-func shouldCountHTTPFailure(err error) bool {
-	var re *RequestError
-	if !errors.As(err, &re) {
-		return false
-	}
-
-	return !isFailureExemptHTTPCode(re.Code)
-}
-
-func extractRequestError(err error) *RequestError {
-	var re *RequestError
-	if errors.As(err, &re) {
-		return re
-	}
-
-	return nil
-}
-
-// ============================================================================
-// HTTP Request/Client Building
-// ============================================================================
-
-func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq *http.Request, err error) {
-	var reqUrl string
-	f.redirectLock.Lock()
-	if f.redirectURL != "" {
-		reqUrl = f.redirectURL
-	} else {
-		reqUrl = req.URL
-	}
-	f.redirectLock.Unlock()
-
-	var (
-		method string
-		body   io.Reader
-	)
-	headers := http.Header{}
-	if req.Extra == nil {
-		method = http.MethodGet
-	} else {
-		extra := req.Extra.(*fhttp.ReqExtra)
-		if extra.Method != "" {
-			method = extra.Method
-		} else {
-			method = http.MethodGet
-		}
-		if len(extra.Header) > 0 {
-			for k, v := range extra.Header {
-				headers.Set(k, strings.TrimSpace(v))
-			}
-		}
-		if extra.Body != "" {
-			body = bytes.NewBufferString(extra.Body)
-		}
-	}
-	if _, ok := headers[base.HttpHeaderUserAgent]; !ok {
-		headers.Set(base.HttpHeaderUserAgent, strings.TrimSpace(f.config.UserAgent))
-	}
-
-	if ctx != nil {
-		httpReq, err = http.NewRequestWithContext(ctx, method, reqUrl, body)
-	} else {
-		httpReq, err = http.NewRequest(method, reqUrl, body)
-	}
-	if err != nil {
-		return
-	}
-	httpReq.Header = headers
-	if host := headers.Get(base.HttpHeaderHost); host != "" {
-		httpReq.Host = host
-	}
-	return httpReq, nil
-}
-
-// buildClient creates an HTTP client with the default connection timeout.
-// Used for resolve phase where we don't have connection time data yet.
-func (f *Fetcher) buildClient() *http.Client {
-	return f.buildClientWithTimeout(connectTimeout)
-}
-
-// buildFastFailClient creates an HTTP client with fast-fail timeout.
-// Uses max(minFastFailTimeout, maxConnTime) for fast-fail retry during download phase.
-func (f *Fetcher) buildFastFailClient() *http.Client {
-	maxConn := f.maxConnTime.Load()
-	if maxConn == 0 {
-		// No successful connection yet, use default timeout
-		return f.buildClientWithTimeout(connectTimeout)
-	}
-
-	timeout := maxConn
-	if timeout >= minFastFailTimeout {
-		// If greater than minFastFailTimeout, increase by 50% for safety margin
-		timeout = int64(float64(timeout) * 1.5)
-	} else {
-		timeout = minFastFailTimeout
-	}
-	return f.buildClientWithTimeout(time.Duration(timeout))
-}
-
-// buildClientWithTimeout creates an HTTP client with the specified connection timeout.
-func (f *Fetcher) buildClientWithTimeout(timeout time.Duration) *http.Client {
-	transport := &http.Transport{
-		DialContext: (&net.Dialer{
-			Timeout: timeout,
-		}).DialContext,
-		Proxy: f.ctl.GetProxy(f.meta.Req.Proxy),
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: f.meta.Req.SkipVerifyCert,
-		},
-		TLSHandshakeTimeout: timeout,
-	}
-	jar, _ := cookiejar.New(nil)
-	return &http.Client{
-		Transport: transport,
-		Jar:       jar,
-	}
-}
-
-// ============================================================================
-// Filename Parsing
-// ============================================================================
-
-// parseFilename extracts filename from Content-Disposition header
-func parseFilename(contentDisposition string) string {
-	// Try RFC 5987 extended notation first (filename*=)
-	if filename := parseFilenameExtended(contentDisposition); filename != "" {
-		return filename
-	}
-
-	// Try standard MIME parsing
-	_, params, err := mime.ParseMediaType(contentDisposition)
-	if err == nil {
-		if filename := params["filename"]; filename != "" {
-			return decodeFilenameParam(filename)
-		}
-	}
-
-	// Fallback to manual parsing
-	return parseFilenameFallback(contentDisposition)
-}
-
-// parseFilenameExtended handles RFC 5987 extended notation (filename*=)
-// Format: filename*=charset'language'value (e.g., UTF-8”%E6%B5%8B%E8%AF%95.zip)
-func parseFilenameExtended(cd string) string {
-	lower := strings.ToLower(cd)
-	idx := strings.Index(lower, "filename*=")
-	if idx == -1 {
-		return ""
-	}
-
-	value := cd[idx+len("filename*="):]
-
-	// Find the end of the value using proper quote handling
-	endIdx := findParamValueEnd(value)
-	if endIdx != -1 {
-		value = value[:endIdx]
-	}
-	value = strings.TrimSpace(value)
-
-	// Try charset''encoded format (e.g., UTF-8''%E4%B8%AD%E6%96%87.txt)
-	parts := strings.SplitN(value, "''", 2)
-	if len(parts) == 2 {
-		// Use PathUnescape to handle %2B correctly (should decode to +, not space)
-		decoded, err := url.PathUnescape(parts[1])
-		if err == nil {
-			return decoded
-		}
-	}
-
-	// Try charset'language'encoded format
-	parts = strings.SplitN(value, "'", 3)
-	if len(parts) >= 3 {
-		// Use PathUnescape to handle %2B correctly (should decode to +, not space)
-		decoded, err := url.PathUnescape(parts[2])
-		if err == nil {
-			return decoded
-		}
-	}
-
-	return ""
-}
-
-// decodeFilenameParam decodes filename parameter value
-// Handles HTML entities, MIME encoded-word, URL encoding, and GBK encoding fallback
-func decodeFilenameParam(filename string) string {
-	// First, unescape HTML entities (e.g., &amp; -> &, &lt; -> <, &gt; -> >)
-	// This must be done before other decoding to handle cases where servers
-	// HTML-encode special characters in filenames
-	filename = unescapeHTMLEntities(filename)
-
-	// Handle RFC 2047 encoded word (=?charset?encoding?text?=)
-	if strings.HasPrefix(filename, "=?") {
-		decoder := new(mime.WordDecoder)
-		normalizedFilename := strings.Replace(filename, "UTF8", "UTF-8", 1)
-		if decoded, err := decoder.Decode(normalizedFilename); err == nil {
-			return decoded
-		}
-	}
-
-	// Try URL decoding - use PathUnescape for filenames to handle %2B correctly
-	decoded := util.TryUrlPathUnescape(filename)
-
-	// If not valid UTF-8, try GBK decoding (common for Chinese websites)
-	if !utf8.ValidString(decoded) {
-		if gbkDecoded := tryDecodeGBK(decoded); gbkDecoded != "" {
-			return gbkDecoded
-		}
-	}
-
-	return decoded
-}
-
-// unescapeHTMLEntities unescapes common HTML entities in filenames
-// This handles cases where servers HTML-encode special characters like & to &amp;
-func unescapeHTMLEntities(s string) string {
-	// Common HTML entities that might appear in filenames
-	replacements := map[string]string{
-		"&amp;":  "&",
-		"&lt;":   "<",
-		"&gt;":   ">",
-		"&quot;": "\"",
-		"&#39;":  "'",
-		"&apos;": "'",
-	}
-
-	result := s
-	for entity, char := range replacements {
-		result = strings.ReplaceAll(result, entity, char)
-	}
-	return result
-}
-
-// tryDecodeGBK attempts to decode string as GBK encoding
-func tryDecodeGBK(s string) string {
-	if len(s) == 0 {
-		return ""
-	}
-
-	decoder := simplifiedchinese.GBK.NewDecoder()
-	decoded, err := decoder.Bytes([]byte(s))
-	if err != nil {
-		return ""
-	}
-	result := string(decoded)
-	if utf8.ValidString(result) {
-		return result
-	}
-	return ""
-}
-
-// parseFilenameFallback is a fallback parser for non-standard Content-Disposition
-func parseFilenameFallback(cd string) string {
-	lower := strings.ToLower(cd)
-	idx := strings.Index(lower, "filename=")
-	if idx == -1 {
-		return ""
-	}
-
-	value := cd[idx+len("filename="):]
-
-	// Find the end of the value using proper quote handling
-	endIdx := findParamValueEnd(value)
-	if endIdx != -1 {
-		value = value[:endIdx]
-	}
-	value = strings.TrimSpace(value)
-
-	// Remove surrounding quotes
-	if len(value) >= 2 {
-		if (value[0] == '"' && value[len(value)-1] == '"') ||
-			(value[0] == '\'' && value[len(value)-1] == '\'') {
-			value = value[1 : len(value)-1]
-		}
-	}
-
-	return decodeFilenameParam(value)
-}
-
-// findParamValueEnd finds the end position of a parameter value in a Content-Disposition header.
-// It correctly handles quoted values where semicolons inside quotes should not be treated as delimiters.
-// It also handles HTML entities in unquoted values (e.g., &amp; should not be split at the semicolon).
-// Returns the end index (exclusive) of the value, or -1 if it extends to the end of the string.
-func findParamValueEnd(value string) int {
-	value = strings.TrimSpace(value)
-	if len(value) == 0 {
-		return 0
-	}
-
-	// If the value starts with a quote, find the matching closing quote
-	if value[0] == '"' || value[0] == '\'' {
-		quote := value[0]
-		// Find the closing quote, handling escaped quotes
-		for i := 1; i < len(value); i++ {
-			if value[i] == quote {
-				// Check if it's escaped
-				if i > 0 && value[i-1] == '\\' {
-					continue
-				}
-				// Found closing quote, now look for ; after it
-				remaining := value[i+1:]
-				if semiIdx := strings.Index(remaining, ";"); semiIdx != -1 {
-					return i + 1 + semiIdx
-				}
-				return -1 // No semicolon after closing quote
-			}
-		}
-		// No closing quote found, treat rest of string as value
-		return -1
-	}
-
-	// Unquoted value - find the next semicolon that's not part of an HTML entity
-	// HTML entities have the pattern &...;  (e.g., &amp; &lt; &gt; &quot; &#39;)
-	for i := 0; i < len(value); i++ {
-		if value[i] == ';' {
-			// Check if this semicolon is part of an HTML entity
-			// Look backwards for an & character
-			isEntity := false
-			if i > 0 {
-				// Look for & before this semicolon (within reasonable distance, max 10 chars)
-				for j := i - 1; j >= 0 && j >= i-10; j-- {
-					if value[j] == '&' {
-						// Found &, this semicolon might be part of an HTML entity
-						// Check if there are only alphanumeric or # between & and ;
-						entityChars := value[j+1 : i]
-						if len(entityChars) > 0 && isValidHTMLEntityChars(entityChars) {
-							isEntity = true
-						}
-						break
-					}
-					// If we hit whitespace or another special char, stop looking
-					if value[j] == ' ' || value[j] == '"' || value[j] == '\'' {
-						break
-					}
-				}
-			}
-
-			if !isEntity {
-				return i
-			}
-		}
-	}
-	return -1 // No semicolon, extends to end
-}
-
-// isValidHTMLEntityChars checks if a string contains only valid HTML entity characters
-// (alphanumeric and #, typically for entities like &amp; &lt; &#39; etc.)
-func isValidHTMLEntityChars(s string) bool {
-	if len(s) == 0 {
-		return false
-	}
-	for _, c := range s {
-		if !((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '#') {
-			return false
-		}
-	}
-	return true
-}
@@ -1,40 +0,0 @@
-package http
-
-import (
-	"context"
-	"io"
-	"time"
-)
-
-type TimeoutReader struct {
-	reader  io.Reader
-	timeout time.Duration
-}
-
-func NewTimeoutReader(r io.Reader, timeout time.Duration) *TimeoutReader {
-	return &TimeoutReader{
-		reader:  r,
-		timeout: timeout,
-	}
-}
-
-func (tr *TimeoutReader) Read(p []byte) (n int, err error) {
-	ctx, cancel := context.WithTimeout(context.Background(), tr.timeout)
-	defer cancel()
-
-	done := make(chan struct{})
-	var readErr error
-	var bytesRead int
-
-	go func() {
-		bytesRead, readErr = tr.reader.Read(p)
-		close(done)
-	}()
-
-	select {
-	case <-done:
-		return bytesRead, readErr
-	case <-ctx.Done():
-		return 0, ctx.Err()
-	}
-}
@@ -1,51 +0,0 @@
-package http
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"io"
-	"testing"
-	"time"
-)
-
-func TestTimeoutReader_Read(t *testing.T) {
-	data := []byte("Hello, World!")
-	reader := bytes.NewReader(data)
-	timeoutReader := NewTimeoutReader(reader, 1*time.Second)
-
-	buf := make([]byte, len(data))
-	n, err := timeoutReader.Read(buf)
-	if err != nil {
-		t.Fatalf("expected no error, got %v", err)
-	}
-	if n != len(data) {
-		t.Fatalf("expected to read %d bytes, read %d", len(data), n)
-	}
-	if !bytes.Equal(buf, data) {
-		t.Fatalf("expected %s, got %s", data, buf)
-	}
-}
-
-func TestTimeoutReader_ReadTimeout(t *testing.T) {
-	reader := &slowReader{delay: 2 * time.Second}
-	timeoutReader := NewTimeoutReader(reader, 1*time.Second)
-
-	buf := make([]byte, 8192)
-	_, err := timeoutReader.Read(buf)
-	if err == nil {
-		t.Fatal("expected timeout error, got nil")
-	}
-	if !errors.Is(err, context.DeadlineExceeded) {
-		t.Fatalf("expected %v, got %v", context.DeadlineExceeded, err)
-	}
-}
-
-type slowReader struct {
-	delay time.Duration
-}
-
-func (sr *slowReader) Read(p []byte) (n int, err error) {
-	time.Sleep(sr.delay)
-	return 0, io.EOF
-}
@@ -2,23 +2,18 @@ package test

 import (
 	"context"
-	"crypto/rand"
 	"encoding/json"
-	"errors"
 	"fmt"
+	"github.com/armon/go-socks5"
 	"io"
+	"math/rand"
 	"net"
 	"net/http"
 	"os"
-	"reflect"
 	"strconv"
 	"strings"
 	"sync/atomic"
 	"time"
-
-	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/armon/go-socks5"
-	"golang.org/x/text/encoding/simplifiedchinese"
 )

 const (
@@ -27,23 +22,14 @@ const (
 	Dir       = "./"
 	BuildFile = Dir + BuildName

-	ExternalDownloadUrl  = "https://raw.githubusercontent.com/GopeedLab/gopeed/v1.5.6/_docs/img/banner.png"
-	ExternalDownloadName = "banner.png"
-	ExternalDownloadSize = 26416
-	//ExternalDownloadMd5 = "c67c6e3cae79a95342485676571e8a5c"
-
 	DownloadName       = "download.data"
 	DownloadRename     = "download (1).data"
 	DownloadFile       = Dir + DownloadName
 	DownloadRenameFile = Dir + DownloadRename
-
-	// TestChineseFileName is a common test filename with Chinese characters
-	// Used to test Content-Disposition parsing with various encodings
-	TestChineseFileName = "测试.zip"
 )

 func StartTestFileServer() net.Listener {
-	return startTestServer(func(sl *shutdownListener) http.Handler {
+	return startTestServer(func() http.Handler {
 		return http.FileServer(http.Dir(Dir))
 	})
 }
@@ -59,7 +45,7 @@ func (s *SlowFileServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }

 func StartTestSlowFileServer(delay time.Duration) net.Listener {
-	return startTestServer(func(sl *shutdownListener) http.Handler {
+	return startTestServer(func() http.Handler {
 		return &SlowFileServer{
 			delay:   delay,
 			handler: http.FileServer(http.Dir(Dir)),
@@ -68,11 +54,8 @@ func StartTestSlowFileServer(delay time.Duration) net.Listener {
 }

 func StartTestCustomServer() net.Listener {
-	return startTestServer(func(sl *shutdownListener) http.Handler {
+	return startTestServer(func() http.Handler {
 		mux := http.NewServeMux()
-		mux.HandleFunc("/", func(writer http.ResponseWriter, request *http.Request) {
-			writer.WriteHeader(200)
-		})
 		mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
 			file, err := os.Open(BuildFile)
 			if err != nil {
@@ -92,168 +75,13 @@ func StartTestCustomServer() net.Listener {
 			defer file.Close()
 			io.Copy(writer, file)
 		})
-		mux.HandleFunc("/encoded-word", func(writer http.ResponseWriter, request *http.Request) {
-			writer.Header().Set("Content-Disposition", "attachment; filename=\"=?UTF8?B?5rWL6K+VLnppcA==?=\"")
-			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)
-		})
-		mux.HandleFunc("/%E6%B5%8B%E8%AF%95.zip", func(writer http.ResponseWriter, request *http.Request) {
-			file, err := os.Open(BuildFile)
-			if err != nil {
-				panic(err)
-			}
-			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="+TestChineseFileName)
-			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)
-		})
-		// Test endpoint for mixed encoding: filename= with garbled characters (including special chars)
-		// and filename*= with proper UTF-8. This tests the case where mime.ParseMediaType fails
-		// due to invalid characters like <a> tags in the filename.
-		mux.HandleFunc("/mixed-encoding", func(writer http.ResponseWriter, request *http.Request) {
-			// This simulates a server that sends a garbled filename= with special chars that cause
-			// mime.ParseMediaType to fail, plus a proper filename*=UTF-8''...
-			// The filename*= should be preferred and correctly parsed.
-			writer.Header().Set("Content-Disposition", `attachment;filename="garbled<invalid>chars.zip";filename*=UTF-8''%E6%B5%8B%E8%AF%95.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)
-		})
-		// Test endpoint for filename*= only (RFC 5987 format)
-		mux.HandleFunc("/filename-star", func(writer http.ResponseWriter, request *http.Request) {
-			// URL-encoded TestChineseFileName: 测试.zip -> %E6%B5%8B%E8%AF%95.zip
-			writer.Header().Set("Content-Disposition", `attachment; filename*=UTF-8''%E6%B5%8B%E8%AF%95.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)
-		})
-		// Test endpoint for GBK-encoded filename (common on Chinese Windows servers)
-		// This simulates the case where Chinese characters are sent as GBK bytes
-		// which appear as garbled characters when interpreted as UTF-8.
-		// For example, "测试" in GBK is [B2 E2 CA D4] which is invalid UTF-8.
-		// Our fix detects invalid UTF-8 and attempts GBK decoding.
-		mux.HandleFunc("/gbk-encoded", func(writer http.ResponseWriter, request *http.Request) {
-			// Encode TestChineseFileName as GBK
-			gbkEncoder := simplifiedchinese.GBK.NewEncoder()
-			gbkBytes, _ := gbkEncoder.Bytes([]byte(TestChineseFileName))
-			// Send GBK bytes directly in filename (simulating broken server behavior)
-			writer.Header().Set("Content-Disposition", `attachment; filename="`+string(gbkBytes)+`"`)
-			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)
-		})
-		// Test endpoint for filenames with plus signs (C++ files, etc.)
-		// This tests that %2B decodes to + not space
-		mux.HandleFunc("/plus-sign-encoded", func(writer http.ResponseWriter, request *http.Request) {
-			// Use filename*= format with %2B encoding for plus signs
-			writer.Header().Set("Content-Disposition", `attachment; filename*=UTF-8''C%2B%2B%20%20Primer%20%20Plus.mobi`)
-			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)
-		})
-		// Test endpoint for plus sign in URL path
-		mux.HandleFunc("/C%2B%2B%20Primer.txt", func(writer http.ResponseWriter, request *http.Request) {
-			file, err := os.Open(BuildFile)
-			if err != nil {
-				panic(err)
-			}
-			defer file.Close()
-			io.Copy(writer, file)
-		})
-		// Test endpoint for filename with HTML-encoded ampersand (&amp;)
-		// This tests the case from the bug report where filenames containing & are
-		// HTML-encoded as &amp; by the server, causing truncation at the semicolon.
-		// Example: "查询处理&优化.pptx" -> "查询处理&amp;优化.pptx"
-		mux.HandleFunc("/ampersand-encoded", func(writer http.ResponseWriter, request *http.Request) {
-			// Simulate server sending filename with HTML-encoded ampersand
-			writer.Header().Set("Content-Disposition", `attachment; filename="查询处理&amp;优化.pptx"`)
-			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)
-		})
-		// Test endpoint for unquoted filename with HTML-encoded ampersand
-		// Some servers might send unquoted filenames with HTML entities
-		mux.HandleFunc("/ampersand-unquoted", func(writer http.ResponseWriter, request *http.Request) {
-			writer.Header().Set("Content-Disposition", `attachment; filename=test&amp;file.txt`)
-			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)
-		})
-		// Test 403 Forbidden endpoint
-		mux.HandleFunc("/forbidden", func(writer http.ResponseWriter, request *http.Request) {
-			writer.WriteHeader(403)
-		})
-		return mux
-	})
-}
-
-// StartTestHostHeaderServer starts a server that validates the Host header
-// Returns 400 Bad Request if the Host header value equals "test"
-func StartTestHostHeaderServer() net.Listener {
-	return startTestServer(func(sl *shutdownListener) http.Handler {
-		mux := http.NewServeMux()
-		mux.HandleFunc("/", func(writer http.ResponseWriter, request *http.Request) {
-			// If the Host header is "test", return 400 (simulating server that validates Host)
-			if request.Host == "test" {
-				writer.WriteHeader(400)
-				writer.Write([]byte("Bad Request: Invalid Host header"))
-				return
-			}
-			writer.WriteHeader(200)
-			writer.Write([]byte("OK"))
-		})
 		return mux
 	})
 }

 func StartTestRetryServer() net.Listener {
 	counter := 0
-	return startTestServer(func(sl *shutdownListener) http.Handler {
+	return startTestServer(func() http.Handler {
 		mux := http.NewServeMux()
 		mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
 			counter++
@@ -273,7 +101,7 @@ func StartTestRetryServer() net.Listener {
 }

 func StartTestPostServer() net.Listener {
-	return startTestServer(func(sl *shutdownListener) http.Handler {
+	return startTestServer(func() http.Handler {
 		mux := http.NewServeMux()
 		mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
 			if request.Method == "POST" && request.Header.Get("Authorization") != "" {
@@ -296,102 +124,25 @@ func StartTestPostServer() net.Listener {
 }

 func StartTestErrorServer() net.Listener {
-	return startTestServer(func(sl *shutdownListener) http.Handler {
+	counter := 0
+	return startTestServer(func() http.Handler {
 		mux := http.NewServeMux()
 		mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
-			// Always return 404 error to test error handling
-			writer.WriteHeader(404)
-			return
-		})
-		return mux
-	})
-}
-
-// StartTestOneTimeServer creates a server where the URL can only be downloaded once
-// The first non-probe request succeeds, all subsequent requests return 404
-// This simulates one-time download URLs (e.g., signed URLs that expire after first use)
-func StartTestOneTimeServer() net.Listener {
-	var accessed atomic.Bool
-
-	return startTestServer(func(sl *shutdownListener) http.Handler {
-		mux := http.NewServeMux()
-		mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
-			// First full download request succeeds, subsequent requests fail
-			if accessed.Swap(true) {
-				writer.WriteHeader(404)
+			counter++
+			if counter != 1 {
+				writer.WriteHeader(500)
 				return
 			}
-
-			// First request - return full file without Range support
-			writer.Header().Set("Content-Length", fmt.Sprintf("%d", BuildSize))
-			file, err := os.Open(BuildFile)
-			if err != nil {
-				return
-			}
-			defer file.Close()
-			io.Copy(writer, file)
 		})
 		return mux
 	})
 }

-// StartTestSlowStartServer creates a server with configurable delay per request
-// This allows testing slow-start connection expansion to reach max connections
-func StartTestSlowStartServer(delayPerByte time.Duration) 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,
-				nil,
-				func(file *os.File, n int64) {
-					slowCopyNWithDelay(sl, writer, file, n, delayPerByte)
-				},
-			)
-		})
-		return mux
-	})
-}
-
-// slowCopyNWithDelay copies n bytes from src to dst with a delay per byte
-func slowCopyNWithDelay(sl *shutdownListener, dst io.Writer, src io.Reader, n int64, delayPerByte time.Duration) {
-	buf := make([]byte, 32*1024)
-	remaining := n
-	for remaining > 0 {
-		if sl.isShutdown {
-			return
-		}
-		toRead := int64(len(buf))
-		if toRead > remaining {
-			toRead = remaining
-		}
-		nr, er := src.Read(buf[:toRead])
-		if nr > 0 {
-			nw, ew := dst.Write(buf[0:nr])
-			if nw > 0 {
-				remaining -= int64(nw)
-				// Add delay based on bytes written
-				if delayPerByte > 0 {
-					time.Sleep(delayPerByte * time.Duration(nw))
-				}
-			}
-			if ew != nil {
-				break
-			}
-		}
-		if er != nil {
-			break
-		}
-	}
-}
-
 // StartTestLimitServer connections limit server
 func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
 	var connections atomic.Int32
-	var slowOnce atomic.Bool

-	return startTestServer(func(sl *shutdownListener) http.Handler {
+	return startTestServer(func() http.Handler {
 		mux := http.NewServeMux()
 		mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
 			defer func() {
@@ -403,207 +154,67 @@ func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
 				return
 			}

-			// First request intentionally delays the first write to trigger a single read timeout,
-			// subsequent requests respond at normal speed.
-			useInitialDelay := delay > 0 && !slowOnce.Swap(true)
-			rangeFileHandle(
-				writer,
-				request,
-				nil,
-				func(file *os.File, n int64) {
-					if useInitialDelay {
-						slowCopyAfterDelay(sl, writer, file, n, delay)
-						return
-					}
-					slowCopyN(sl, writer, file, n, 0)
-				},
-			)
-		})
-		return mux
-	})
-}
-
-// StartTestTimeoutOnceServer creates a server that times out on first request, then works normally
-func StartTestTimeoutOnceServer(delay int64) net.Listener {
-	var timeoutOnce atomic.Bool
-
-	return startTestServer(func(sl *shutdownListener) http.Handler {
-		mux := http.NewServeMux()
-		mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
-			// First request delays to trigger timeout, subsequent requests respond normally
-			useInitialDelay := delay > 0 && !timeoutOnce.Swap(true)
-			rangeFileHandle(
-				writer,
-				request,
-				nil,
-				func(file *os.File, n int64) {
-					if useInitialDelay {
-						slowCopyAfterDelay(sl, writer, file, n, delay)
-						return
-					}
-					slowCopyN(sl, writer, file, n, 0)
-				},
-			)
-		})
-		return mux
-	})
-}
-
-// StartTestTemporary500Server creates a server that returns 500 for a duration, then recovers
-// Uses slow transfer to ensure the file isn't fully downloaded during resolve phase
-func StartTestTemporary500Server(errorDuration time.Duration) net.Listener {
-	startTime := time.Now()
-	var requestCount atomic.Int32
-
-	return startTestServer(func(sl *shutdownListener) http.Handler {
-		mux := http.NewServeMux()
-		mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
-			reqNum := requestCount.Add(1)
-
-			// First request (Resolve) succeeds with slow transfer to prevent full download
-			// Subsequent requests return 500 for the specified duration, then recover
-			if reqNum == 1 {
-				// Slow transfer for resolve: 50 microsecond per byte (~20MB/s)
-				// This ensures resolve doesn't complete the full 200MB file
-				rangeFileHandle(
-					writer,
-					request,
-					nil,
-					func(file *os.File, n int64) {
-						slowCopyNWithDelay(sl, writer, file, n, 50*time.Microsecond)
-					},
-				)
-				return
+			r := request.Header.Get("Range")
+			if r == "" {
+				writer.Header().Set("Content-Length", fmt.Sprintf("%d", BuildSize))
+				writer.WriteHeader(200)
+				file, err := os.Open(BuildFile)
+				if err != nil {
+					panic(err)
+				}
+				defer file.Close()
+				slowCopy(writer, file, delay)
+			} else {
+				// split range
+				s := strings.Split(r, "=")
+				if len(s) != 2 {
+					writer.WriteHeader(400)
+					return
+				}
+				s = strings.Split(s[1], "-")
+				if len(s) != 2 {
+					writer.WriteHeader(400)
+					return
+				}
+				start, err := strconv.ParseInt(s[0], 10, 64)
+				if err != nil {
+					writer.WriteHeader(400)
+					return
+				}
+				end, err := strconv.ParseInt(s[1], 10, 64)
+				if err != nil {
+					writer.WriteHeader(400)
+					return
+				}
+				if start < 0 || end < 0 || start > end {
+					writer.WriteHeader(400)
+					return
+				}
+				if end >= BuildSize {
+					end = BuildSize - 1
+				}
+				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")
+				writer.WriteHeader(206)
+				file, err := os.Open(BuildFile)
+				if err != nil {
+					writer.WriteHeader(500)
+					return
+				}
+				defer file.Close()
+				file.Seek(start, 0)
+				slowCopyN(writer, file, end-start+1, delay)
 			}
-
-			// Subsequent requests: return 500 for errorDuration, then normal
-			if time.Since(startTime) < errorDuration {
-				writer.WriteHeader(500)
-				writer.Write([]byte("Internal Server Error"))
-				return
-			}
-
-			rangeFileHandle(
-				writer,
-				request,
-				nil,
-				func(file *os.File, n int64) {
-					slowCopyN(sl, writer, file, n, 0)
-				},
-			)
 		})
 		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 no Range header, return full file with Accept-Ranges header
-	if r == "" {
-		// Open file first to ensure it exists
-		file, err := os.Open(BuildFile)
-		if err != nil {
-			writer.WriteHeader(500)
-			return
-		}
-		defer file.Close()
-
-		writer.Header().Set("Content-Length", fmt.Sprintf("%d", BuildSize))
-		writer.Header().Set("Accept-Ranges", "bytes")
-		writer.WriteHeader(200)
-		(writer.(http.Flusher)).Flush()
-
-		iocpN(file, BuildSize)
-		return
-	}
-
-	// split range
-	s := strings.Split(r, "=")
-	if len(s) != 2 {
-		writer.WriteHeader(400)
-		return
-	}
-	s = strings.Split(s[1], "-")
-	if len(s) != 2 {
-		writer.WriteHeader(400)
-		return
-	}
-	start, err := strconv.ParseInt(s[0], 10, 64)
-	if err != nil {
-		writer.WriteHeader(400)
-		return
-	}
-	end, err := strconv.ParseInt(s[1], 10, 64)
-	if err != nil {
-		writer.WriteHeader(400)
-		return
-	}
-	if start < 0 || end < 0 || start > end {
-		writer.WriteHeader(400)
-		return
-	}
-	if end >= BuildSize {
-		end = BuildSize - 1
-	}
-
-	if modifyEnd != nil {
-		end = modifyEnd(end)
-	}
-
-	// Open file before sending headers to ensure it exists
-	file, err := os.Open(BuildFile)
-	if err != nil {
-		writer.WriteHeader(500)
-		return
-	}
-	defer file.Close()
-	file.Seek(start, 0)
-
-	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")
-	writer.WriteHeader(206)
-	(writer.(http.Flusher)).Flush()
-
-	iocpN(file, end-start+1)
-}
-
 // slowCopyN copies n bytes from src to dst, speed limit is bytes per second
-func slowCopy(sl *shutdownListener, dst io.Writer, src io.Reader, delay int64) (written int64, err error) {
+func slowCopy(dst io.Writer, src io.Reader, delay int64) (written int64, err error) {
 	buf := make([]byte, 32*1024)
 	for {
-		if sl.isShutdown {
-			return 0, errors.New("server shutdown")
-		}
 		nr, er := src.Read(buf)
 		if nr > 0 {
 			nw, ew := dst.Write(buf[0:nr])
@@ -632,8 +243,8 @@ func slowCopy(sl *shutdownListener, dst io.Writer, src io.Reader, delay int64) (
 	return written, err
 }

-func slowCopyN(sl *shutdownListener, dst io.Writer, src io.Reader, n int64, delay int64) (written int64, err error) {
-	written, err = slowCopy(sl, dst, io.LimitReader(src, n), delay)
+func slowCopyN(dst io.Writer, src io.Reader, n int64, delay int64) (written int64, err error) {
+	written, err = slowCopy(dst, io.LimitReader(src, n), delay)
 	if written == n {
 		return n, nil
 	}
@@ -644,15 +255,7 @@ func slowCopyN(sl *shutdownListener, dst io.Writer, src io.Reader, n int64, dela
 	return
 }

-// slowCopyAfterDelay sleeps once before performing a normal copy to simulate a single timeout.
-func slowCopyAfterDelay(sl *shutdownListener, dst io.Writer, src io.Reader, n int64, delay int64) (written int64, err error) {
-	if delay > 0 {
-		time.Sleep(time.Millisecond * time.Duration(delay))
-	}
-	return slowCopyN(sl, dst, src, n, 0)
-}
-
-func startTestServer(serverHandle func(sl *shutdownListener) http.Handler) net.Listener {
+func startTestServer(serverHandle func() http.Handler) net.Listener {
 	listener, err := net.Listen("tcp", "127.0.0.1:0")
 	if err != nil {
 		panic(err)
@@ -662,7 +265,7 @@ func startTestServer(serverHandle func(sl *shutdownListener) http.Handler) net.L
 		panic(err)
 	}
 	defer file.Close()
-	// Write random data
+	// 随机生成一个文件
 	l := int64(8192)
 	buf := make([]byte, l)
 	size := int64(0)
@@ -679,26 +282,22 @@ func startTestServer(serverHandle func(sl *shutdownListener) http.Handler) net.L
 		size += l
 	}
 	server := &http.Server{}
-	sl := &shutdownListener{
+	server.Handler = serverHandle()
+	go server.Serve(listener)
+
+	return &shutdownListener{
 		server:   server,
 		Listener: listener,
 	}
-	server.Handler = serverHandle(sl)
-	go server.Serve(listener)
-
-	return sl
 }

 type shutdownListener struct {
-	server     *http.Server
-	isShutdown bool
+	server *http.Server
 	net.Listener
 }

 func (c *shutdownListener) Close() error {
-	// Shutdown server first (waits for in-flight requests), then set isShutdown
 	closeErr := c.server.Shutdown(context.Background())
-	c.isShutdown = true
 	if err := ifExistAndRemove(BuildFile); err != nil {
 		fmt.Println(err)
 	}
@@ -738,11 +337,3 @@ func StartSocks5Server(usr, pwd string) net.Listener {
 	go server.Serve(listener)
 	return listener
 }
-
-func AssertResourceEqual(want, got *base.Resource) bool {
-	// Ignore ctime
-	if got != nil && len(got.Files) > 0 {
-		got.Files[0].Ctime = nil
-	}
-	return reflect.DeepEqual(want, got)
-}
@@ -15,14 +15,12 @@ const (
 	HttpCodeOK             = 200
 	HttpCodePartialContent = 206

-	HttpHeaderHost               = "Host"
 	HttpHeaderRange              = "Range"
 	HttpHeaderAcceptRanges       = "Accept-Ranges"
 	HttpHeaderContentLength      = "Content-Length"
 	HttpHeaderContentRange       = "Content-Range"
 	HttpHeaderContentDisposition = "Content-Disposition"
-	HttpHeaderUserAgent          = "User-Agent"
-	HttpHeaderLastModified       = "Last-Modified"
+	HttpHeaderUserAgent          = "Usr-Agent"

 	HttpHeaderBytes       = "bytes"
 	HttpHeaderRangeFormat = "bytes=%d-%d"
@@ -0,0 +1,8 @@
+package base
+
+import "errors"
+
+var (
+	NotFound  = errors.New("not found")
+	BadParams = errors.New("bad params")
+)
@@ -1,11 +0,0 @@
-package base
-
-// Version is the build version, set at build time, using `go build -ldflags "-X github.com/GopeedLab/gopeed/pkg/base.Version=1.0.0"`.
-var Version string
-var InDocker string
-
-func init() {
-	if Version == "" {
-		Version = "dev"
-	}
-}
@@ -2,13 +2,7 @@ package base

 import (
 	"fmt"
-	"net/http"
-	"net/url"
-	"sync"
-	"time"
-
 	"github.com/GopeedLab/gopeed/pkg/util"
-	"github.com/mattn/go-ieproxy"
 	"golang.org/x/exp/slices"
 )

@@ -18,10 +12,6 @@ type Request struct {
 	Extra any    `json:"extra"`
 	// Labels is used to mark the download task
 	Labels map[string]string `json:"labels"`
-	// Proxy is special proxy config for request
-	Proxy *RequestProxy `json:"proxy"`
-	// SkipVerifyCert is the flag that skip verify cert
-	SkipVerifyCert bool `json:"skipVerifyCert"`
 }

 func (r *Request) Validate() error {
@@ -31,37 +21,6 @@ func (r *Request) Validate() error {
 	return nil
 }

-type RequestProxyMode string
-
-const (
-	// RequestProxyModeFollow follow setting proxy
-	RequestProxyModeFollow RequestProxyMode = "follow"
-	// RequestProxyModeNone not use proxy
-	RequestProxyModeNone RequestProxyMode = "none"
-	// RequestProxyModeCustom custom proxy
-	RequestProxyModeCustom RequestProxyMode = "custom"
-)
-
-type RequestProxy struct {
-	Mode   RequestProxyMode `json:"mode"`
-	Scheme string           `json:"scheme"`
-	Host   string           `json:"host"`
-	Usr    string           `json:"usr"`
-	Pwd    string           `json:"pwd"`
-}
-
-func (p *RequestProxy) ToHandler() func(r *http.Request) (*url.URL, error) {
-	if p == nil || p.Mode != RequestProxyModeCustom {
-		return nil
-	}
-
-	if p.Scheme == "" || p.Host == "" {
-		return nil
-	}
-
-	return http.ProxyURL(util.BuildProxyUrl(p.Scheme, p.Host, p.Usr, p.Pwd))
-}
-
 // Resource download resource
 type Resource struct {
 	// if name is not empty, the resource is a folder and the name is the folder name
@@ -100,10 +59,9 @@ func (r *Resource) CalcSize(selectFiles []int) {
 }

 type FileInfo struct {
-	Name  string     `json:"name"`
-	Path  string     `json:"path"`
-	Size  int64      `json:"size"`
-	Ctime *time.Time `json:"ctime"`
+	Name string `json:"name"`
+	Path string `json:"path"`
+	Size int64  `json:"size"`

 	Req *Request `json:"req"`
 }
@@ -131,7 +89,12 @@ func (o *Options) InitSelectFiles(fileSize int) {
 }

 func (o *Options) Clone() *Options {
-	return util.DeepClone(o)
+	return &Options{
+		Name:        o.Name,
+		Path:        o.Path,
+		SelectFiles: o.SelectFiles,
+		Extra:       o.Extra,
+	}
 }

 func ParseReqExtra[E any](req *Request) error {
@@ -149,7 +112,7 @@ func ParseReqExtra[E any](req *Request) error {
 	return nil
 }

-func ParseOptExtra[E any](opts *Options) error {
+func ParseOptsExtra[E any](opts *Options) error {
 	if opts.Extra == nil {
 		return nil
 	}
@@ -163,178 +126,3 @@ func ParseOptExtra[E any](opts *Options) error {
 	opts.Extra = &t
 	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
-
-	DownloadDir                string                 `json:"downloadDir"`    // DownloadDir is the default directory to save the downloaded files
-	MaxRunning                 int                    `json:"maxRunning"`     // MaxRunning is the max running download count
-	ProtocolConfig             map[string]any         `json:"protocolConfig"` // ProtocolConfig is special config for each protocol
-	Extra                      map[string]any         `json:"extra"`
-	Proxy                      *DownloaderProxyConfig `json:"proxy"`
-	Webhook                    *WebhookConfig         `json:"webhook"`                    // Webhook is the webhook configuration
-	AutoTorrent                *AutoTorrentConfig     `json:"autoTorrent"`                // AutoTorrent is the auto torrent task creation configuration
-	Archive                    *ArchiveConfig         `json:"archive"`                    // Archive is the archive extraction configuration
-	AutoDeleteMissingFileTasks bool                   `json:"autoDeleteMissingFileTasks"` // AutoDeleteMissingFileTasks enables automatic deletion of tasks with missing files
-}
-
-func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
-	if cfg.MaxRunning == 0 {
-		cfg.MaxRunning = 5
-	}
-	if cfg.ProtocolConfig == nil {
-		cfg.ProtocolConfig = make(map[string]any)
-	}
-	if cfg.Proxy == nil {
-		cfg.Proxy = &DownloaderProxyConfig{}
-	}
-	if cfg.Webhook == nil {
-		cfg.Webhook = &WebhookConfig{}
-	}
-	if cfg.AutoTorrent == nil {
-		cfg.AutoTorrent = &AutoTorrentConfig{
-			Enable:              false,
-			DeleteAfterDownload: false,
-		}
-	}
-	if cfg.Archive == nil {
-		cfg.Archive = &ArchiveConfig{
-			AutoExtract:        false,
-			DeleteAfterExtract: false,
-		}
-	}
-	return cfg
-}
-
-func (cfg *DownloaderStoreConfig) Merge(beforeCfg *DownloaderStoreConfig) *DownloaderStoreConfig {
-	if beforeCfg == nil {
-		return cfg
-	}
-	if cfg.DownloadDir == "" {
-		cfg.DownloadDir = beforeCfg.DownloadDir
-	}
-	if cfg.MaxRunning == 0 {
-		cfg.MaxRunning = beforeCfg.MaxRunning
-	}
-	if cfg.ProtocolConfig == nil {
-		cfg.ProtocolConfig = beforeCfg.ProtocolConfig
-	}
-	if cfg.Extra == nil {
-		cfg.Extra = beforeCfg.Extra
-	}
-	if cfg.Proxy == nil {
-		cfg.Proxy = beforeCfg.Proxy
-	}
-	if cfg.Webhook == nil {
-		cfg.Webhook = beforeCfg.Webhook
-	}
-	if cfg.AutoTorrent == nil {
-		cfg.AutoTorrent = beforeCfg.AutoTorrent
-	}
-	if cfg.Archive == nil {
-		cfg.Archive = beforeCfg.Archive
-	}
-	return cfg
-}
-
-// WebhookConfig is the webhook configuration
-type WebhookConfig struct {
-	Enable bool     `json:"enable"` // Enable is the flag to enable/disable webhooks
-	URLs   []string `json:"urls"`   // URLs is the list of webhook URLs
-}
-
-// AutoTorrentConfig is the auto torrent task creation configuration
-type AutoTorrentConfig struct {
-	Enable              bool `json:"enable"`              // Enable enables automatic BT task creation when downloading .torrent files
-	DeleteAfterDownload bool `json:"deleteAfterDownload"` // DeleteAfterDownload deletes the .torrent file after BT task creation
-}
-
-// ArchiveConfig is the archive extraction configuration
-type ArchiveConfig struct {
-	AutoExtract        bool `json:"autoExtract"`        // AutoExtract enables automatic extraction of archives after download
-	DeleteAfterExtract bool `json:"deleteAfterExtract"` // DeleteAfterExtract deletes the archive after successful extraction
-}
-
-type DownloaderProxyConfig struct {
-	Enable bool `json:"enable"`
-	// System is the flag that use system proxy
-	System bool   `json:"system"`
-	Scheme string `json:"scheme"`
-	Host   string `json:"host"`
-	Usr    string `json:"usr"`
-	Pwd    string `json:"pwd"`
-}
-
-func (cfg *DownloaderProxyConfig) ToHandler() func(r *http.Request) (*url.URL, error) {
-	if cfg == nil || cfg.Enable == false {
-		return nil
-	}
-	if cfg.System {
-		safeProxyReloadConf()
-		return ieproxy.GetProxyFunc()
-	}
-	if cfg.Scheme == "" || cfg.Host == "" {
-		return nil
-	}
-	return http.ProxyURL(util.BuildProxyUrl(cfg.Scheme, cfg.Host, cfg.Usr, cfg.Pwd))
-}
-
-// ToUrl returns the proxy url, just for git clone
-func (cfg *DownloaderProxyConfig) ToUrl() *url.URL {
-	if cfg == nil || cfg.Enable == false {
-		return nil
-	}
-	if cfg.System {
-		safeProxyReloadConf()
-		static := ieproxy.GetConf().Static
-		if static.Active && len(static.Protocols) > 0 {
-			// If only one protocol, use it
-			if len(static.Protocols) == 1 {
-				for _, v := range static.Protocols {
-					return parseUrlSafe(v)
-				}
-			}
-			// Check https
-			if v, ok := static.Protocols["https"]; ok {
-				return parseUrlSafe(v)
-			}
-			// Check http
-			if v, ok := static.Protocols["http"]; ok {
-				return parseUrlSafe(v)
-			}
-		}
-		return nil
-	}
-	if cfg.Scheme == "" || cfg.Host == "" {
-		return nil
-	}
-	return util.BuildProxyUrl(cfg.Scheme, cfg.Host, cfg.Usr, cfg.Pwd)
-}
-
-var prcLock sync.Mutex
-
-func safeProxyReloadConf() {
-	prcLock.Lock()
-	defer prcLock.Unlock()
-
-	ieproxy.ReloadConf()
-}
-
-func parseUrlSafe(rawUrl string) *url.URL {
-	u, err := url.Parse(rawUrl)
-	if err != nil {
-		return nil
-	}
-	return u
-}
@@ -1,430 +0,0 @@
-package base
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestDownloaderStoreConfig_Init(t *testing.T) {
-	tests := []struct {
-		name   string
-		fields *DownloaderStoreConfig
-		want   *DownloaderStoreConfig
-	}{
-		{
-			"Init",
-			&DownloaderStoreConfig{},
-			&DownloaderStoreConfig{
-				MaxRunning:     5,
-				ProtocolConfig: map[string]any{},
-				Proxy:          &DownloaderProxyConfig{},
-				Webhook:        &WebhookConfig{},
-				AutoTorrent: &AutoTorrentConfig{
-					Enable:              false,
-					DeleteAfterDownload: false,
-				},
-				Archive: &ArchiveConfig{
-					AutoExtract:        false,
-					DeleteAfterExtract: false,
-				},
-			},
-		},
-		{
-			"Init MaxRunning",
-			&DownloaderStoreConfig{
-				MaxRunning: 10,
-			},
-			&DownloaderStoreConfig{
-				MaxRunning:     10,
-				ProtocolConfig: map[string]any{},
-				Proxy:          &DownloaderProxyConfig{},
-				Webhook:        &WebhookConfig{},
-				AutoTorrent: &AutoTorrentConfig{
-					Enable:              false,
-					DeleteAfterDownload: false,
-				},
-				Archive: &ArchiveConfig{
-					AutoExtract:        false,
-					DeleteAfterExtract: false,
-				},
-			},
-		},
-		{
-			"Init ProtocolConfig",
-			&DownloaderStoreConfig{
-				ProtocolConfig: map[string]any{
-					"key": "value",
-				},
-			},
-			&DownloaderStoreConfig{
-				MaxRunning: 5,
-				ProtocolConfig: map[string]any{
-					"key": "value",
-				},
-				Proxy:   &DownloaderProxyConfig{},
-				Webhook: &WebhookConfig{},
-				AutoTorrent: &AutoTorrentConfig{
-					Enable:              false,
-					DeleteAfterDownload: false,
-				},
-				Archive: &ArchiveConfig{
-					AutoExtract:        false,
-					DeleteAfterExtract: false,
-				},
-			},
-		},
-		{
-			"Init Proxy",
-			&DownloaderStoreConfig{
-				Proxy: &DownloaderProxyConfig{
-					Enable: true,
-				},
-			},
-			&DownloaderStoreConfig{
-				MaxRunning:     5,
-				ProtocolConfig: map[string]any{},
-				Proxy: &DownloaderProxyConfig{
-					Enable: true,
-				},
-				Webhook: &WebhookConfig{},
-				AutoTorrent: &AutoTorrentConfig{
-					Enable:              false,
-					DeleteAfterDownload: false,
-				},
-				Archive: &ArchiveConfig{
-					AutoExtract:        false,
-					DeleteAfterExtract: false,
-				},
-			},
-		},
-		{
-			"Init AutoTorrent",
-			&DownloaderStoreConfig{
-				AutoTorrent: &AutoTorrentConfig{
-					Enable:              true,
-					DeleteAfterDownload: true,
-				},
-			},
-			&DownloaderStoreConfig{
-				MaxRunning:     5,
-				ProtocolConfig: map[string]any{},
-				Proxy:          &DownloaderProxyConfig{},
-				Webhook:        &WebhookConfig{},
-				AutoTorrent: &AutoTorrentConfig{
-					Enable:              true,
-					DeleteAfterDownload: true,
-				},
-				Archive: &ArchiveConfig{
-					AutoExtract:        false,
-					DeleteAfterExtract: false,
-				},
-			},
-		},
-		{
-			"Init Archive",
-			&DownloaderStoreConfig{
-				Archive: &ArchiveConfig{
-					AutoExtract:        true,
-					DeleteAfterExtract: false,
-				},
-			},
-			&DownloaderStoreConfig{
-				MaxRunning:     5,
-				ProtocolConfig: map[string]any{},
-				Proxy:          &DownloaderProxyConfig{},
-				Webhook:        &WebhookConfig{},
-				AutoTorrent: &AutoTorrentConfig{
-					Enable:              false,
-					DeleteAfterDownload: false,
-				},
-				Archive: &ArchiveConfig{
-					AutoExtract:        true,
-					DeleteAfterExtract: false,
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cfg := &DownloaderStoreConfig{
-				FirstLoad:      tt.fields.FirstLoad,
-				DownloadDir:    tt.fields.DownloadDir,
-				MaxRunning:     tt.fields.MaxRunning,
-				ProtocolConfig: tt.fields.ProtocolConfig,
-				Extra:          tt.fields.Extra,
-				Proxy:          tt.fields.Proxy,
-				Webhook:        tt.fields.Webhook,
-				AutoTorrent:    tt.fields.AutoTorrent,
-				Archive:        tt.fields.Archive,
-			}
-			if got := cfg.Init(); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("Init() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestDownloaderStoreConfig_Merge(t *testing.T) {
-	type args struct {
-		beforeCfg *DownloaderStoreConfig
-	}
-	tests := []struct {
-		name   string
-		fields *DownloaderStoreConfig
-		args   args
-		want   *DownloaderStoreConfig
-	}{
-		{
-			"Merge Nil",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: nil,
-			},
-			&DownloaderStoreConfig{},
-		},
-		{
-			"Merge DownloadDir No Override",
-			&DownloaderStoreConfig{
-				DownloadDir: "before",
-			},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					DownloadDir: "after",
-				},
-			},
-			&DownloaderStoreConfig{
-				DownloadDir: "before",
-			},
-		},
-		{
-			"Merge DownloadDir Override",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					DownloadDir: "after",
-				},
-			},
-			&DownloaderStoreConfig{
-				DownloadDir: "after",
-			},
-		},
-		{
-			"Merge MaxRunning No Override",
-			&DownloaderStoreConfig{
-				MaxRunning: 1,
-			},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					MaxRunning: 10,
-				},
-			},
-			&DownloaderStoreConfig{
-				MaxRunning: 1,
-			},
-		},
-		{
-			"Merge MaxRunning Override",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					MaxRunning: 10,
-				},
-			},
-			&DownloaderStoreConfig{
-				MaxRunning: 10,
-			},
-		},
-		{
-			"Merge ProtocolConfig No Override",
-			&DownloaderStoreConfig{
-				ProtocolConfig: map[string]any{},
-			},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					ProtocolConfig: map[string]any{
-						"key": "after",
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				ProtocolConfig: map[string]any{},
-			},
-		},
-		{
-			"Merge ProtocolConfig Override",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					ProtocolConfig: map[string]any{
-						"key": "after",
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				ProtocolConfig: map[string]any{
-					"key": "after",
-				},
-			},
-		},
-		{
-			"Merge Extra No Override",
-			&DownloaderStoreConfig{
-				Extra: map[string]any{},
-			},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					Extra: map[string]any{
-						"key": "after",
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				Extra: map[string]any{},
-			},
-		},
-		{
-			"Merge Extra Override",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					Extra: map[string]any{
-						"key": "after",
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				Extra: map[string]any{
-					"key": "after",
-				},
-			},
-		},
-		{
-			"Merge Proxy No Override",
-			&DownloaderStoreConfig{
-				Proxy: &DownloaderProxyConfig{},
-			},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					Proxy: &DownloaderProxyConfig{
-						Scheme: "http",
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				Proxy: &DownloaderProxyConfig{},
-			},
-		},
-		{
-			"Merge Proxy Override",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					Proxy: &DownloaderProxyConfig{
-						Scheme: "http",
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				Proxy: &DownloaderProxyConfig{
-					Scheme: "http",
-				},
-			},
-		},
-		{
-			"Merge AutoTorrent No Override",
-			&DownloaderStoreConfig{
-				AutoTorrent: &AutoTorrentConfig{
-					Enable: true,
-				},
-			},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					AutoTorrent: &AutoTorrentConfig{
-						Enable:              false,
-						DeleteAfterDownload: false,
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				AutoTorrent: &AutoTorrentConfig{
-					Enable: true,
-				},
-			},
-		},
-		{
-			"Merge AutoTorrent Override",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					AutoTorrent: &AutoTorrentConfig{
-						Enable:              true,
-						DeleteAfterDownload: true,
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				AutoTorrent: &AutoTorrentConfig{
-					Enable:              true,
-					DeleteAfterDownload: true,
-				},
-			},
-		},
-		{
-			"Merge Archive No Override",
-			&DownloaderStoreConfig{
-				Archive: &ArchiveConfig{
-					AutoExtract: true,
-				},
-			},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					Archive: &ArchiveConfig{
-						AutoExtract:        false,
-						DeleteAfterExtract: false,
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				Archive: &ArchiveConfig{
-					AutoExtract: true,
-				},
-			},
-		},
-		{
-			"Merge Archive Override",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					Archive: &ArchiveConfig{
-						AutoExtract:        false,
-						DeleteAfterExtract: false,
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				Archive: &ArchiveConfig{
-					AutoExtract:        false,
-					DeleteAfterExtract: false,
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cfg := &DownloaderStoreConfig{
-				FirstLoad:      tt.fields.FirstLoad,
-				DownloadDir:    tt.fields.DownloadDir,
-				MaxRunning:     tt.fields.MaxRunning,
-				ProtocolConfig: tt.fields.ProtocolConfig,
-				Extra:          tt.fields.Extra,
-				Proxy:          tt.fields.Proxy,
-				Webhook:        tt.fields.Webhook,
-				AutoTorrent:    tt.fields.AutoTorrent,
-				Archive:        tt.fields.Archive,
-			}
-			if got := cfg.Merge(tt.args.beforeCfg); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("Merge() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
@@ -3,7 +3,6 @@ package engine
 import (
 	_ "embed"
 	"errors"
-	"github.com/GopeedLab/gopeed/pkg/base"
 	gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
 	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
 	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/formdata"
@@ -12,6 +11,7 @@ import (
 	"github.com/dop251/goja"
 	"github.com/dop251/goja_nodejs/eventloop"
 	gojaurl "github.com/dop251/goja_nodejs/url"
+	"net/url"
 	"time"
 )

@@ -106,11 +106,11 @@ func (e *Engine) await(value any) {
 }

 func (e *Engine) Close() {
-	e.loop.StopNoWait()
+	e.loop.Stop()
 }

 type Config struct {
-	ProxyConfig *base.DownloaderProxyConfig
+	ProxyURL *url.URL
 }

 func NewEngine(cfg *Config) *Engine {
@@ -135,7 +135,7 @@ func NewEngine(cfg *Config) *Engine {
 		if err := formdata.Enable(runtime); err != nil {
 			return
 		}
-		if err := xhr.Enable(runtime, cfg.ProxyConfig.ToHandler()); err != nil {
+		if err := xhr.Enable(runtime, cfg.ProxyURL); err != nil {
 			return
 		}
 		if _, err := runtime.RunString(polyfillScript); err != nil {
@@ -145,10 +145,6 @@ func NewEngine(cfg *Config) *Engine {
 		if err := runtime.Set("global", runtime.GlobalObject()); err != nil {
 			return
 		}
-		// polyfill window
-		if err := runtime.Set("window", runtime.GlobalObject()); err != nil {
-			return
-		}
 		// polyfill window.location
 		if _, err := runtime.RunString("global.location = new URL('http://localhost');"); err != nil {
 			return
@@ -178,15 +174,7 @@ func resolveResult(value goja.Value) (any, error) {
 			if err, ok := p.Result().Export().(error); ok {
 				return nil, err
 			} else {
-				stack := p.Result().String()
-				result := p.Result()
-				if ro, ok := result.(*goja.Object); ok {
-					stackVal := ro.Get("stack")
-					if stackVal != nil && stackVal.String() != "" {
-						stack = stackVal.String()
-					}
-				}
-				return nil, errors.New(stack)
+				return nil, errors.New(p.Result().String())
 			}
 		}
 	}
@@ -6,6 +6,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/GopeedLab/gopeed/internal/test"
+	gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
+	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
+	gojautil "github.com/GopeedLab/gopeed/pkg/download/engine/util"
+	"github.com/GopeedLab/gopeed/pkg/util"
+	"github.com/dop251/goja"
 	"io"
 	"net"
 	"net/http"
@@ -13,13 +19,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"github.com/GopeedLab/gopeed/internal/test"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
-	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
-	gojautil "github.com/GopeedLab/gopeed/pkg/download/engine/util"
-	"github.com/dop251/goja"
 )

 func TestPolyfill(t *testing.T) {
@@ -27,8 +26,6 @@ func TestPolyfill(t *testing.T) {
 	doTestPolyfill(t, "XMLHttpRequest")
 	doTestPolyfill(t, "Blob")
 	doTestPolyfill(t, "FormData")
-	doTestPolyfill(t, "TextDecoder")
-	doTestPolyfill(t, "TextEncoder")
 	doTestPolyfill(t, "fetch")
 	doTestPolyfill(t, "__gopeed_create_vm")
 }
@@ -72,44 +69,6 @@ async function testOctetStream(file){
 	return await resp.text();
 }

-async function testRedirect() {
-    const url = host + '/redirect?num=3'
-    return await new Promise((resolve, reject) => {
-        fetch(url, {
-            method: 'HEAD',
-            redirect: 'error',
-        }).then(()=>reject())
-
-        fetch(url, {
-            method: 'HEAD',
-            redirect: 'follow',
-        }).then((res) =>res.headers.has('location') && reject()).catch(() => reject())
-
-        fetch(url, {
-            method: 'HEAD',
-            redirect: 'manual',
-        }).then((res) => {
-			const location = res.headers.get('location');
-			location ? resolve(location) : reject()
-        }).catch(() => reject())
-    })
-}
-
-async function testResponseUrl() {
-    return new Promise((resolve, reject) => {
-		const xhr = new XMLHttpRequest();
-		xhr.open('GET', host+'/redirect?num=3');
-		xhr.onload = function(){
-            if (xhr.responseURL.includes('/redirect?num=0')){
-                resolve();
-            }else{
-                reject();
-            }
-		};
-		xhr.send();
-	});
-}
-
 async function testFormData(file){
 	const formData = new FormData();
 	formData.append('name', 'test');
@@ -121,30 +80,6 @@ async function testFormData(file){
 	return await resp.json();
 }

-function testHeader(){
-	return new Promise((resolve, reject) => {
-		const xhr = new XMLHttpRequest();
-		xhr.open('GET', host+'/header');
-		xhr.setRequestHeader('X-Gopeed-Test', 'test1');
-		xhr.setRequestHeader('x-gopeed-test', 'test2');
-		xhr.setRequestHeader('x-Gopeed-test', 'test3');
-		xhr.onload = function(){
-			const testHeader1 = xhr.getResponseHeader("X-Gopeed-Test");
-		    const testHeader2 = xhr.getResponseHeader("x-gopeed-test");
-		    const testHeader3 = xhr.getResponseHeader("x-Gopeed-test");
-			const expect = 'test1, test2, test3';
-			const all = xhr.getAllResponseHeaders();
-			if(testHeader1 === expect && testHeader2 === expect && testHeader3 === expect 
-				&& all.includes('X-Gopeed-Test: '+expect)){
-				resolve();
-			}else{
-				reject();
-			}
-		};
-		xhr.send();
-	});
-}
-
 function testProgress(){
 	return new Promise((resolve, reject) => {
 		const xhr = new XMLHttpRequest();
@@ -205,31 +140,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)
@@ -262,20 +172,6 @@ async function testFingerprintSafari(){
 		}
 	}()

-	t.Run("testRedirect", func(t *testing.T) {
-		_, err := callTestFun(engine, "testRedirect")
-		if err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	t.Run("testResponseUrl", func(t *testing.T) {
-		_, err = callTestFun(engine, "testResponseUrl")
-		if err != nil {
-			t.Fatal(err)
-		}
-	})
-
 	func() {
 		jsFile, goFile, md5 := buildFile(t, engine.Runtime)
 		result, err = callTestFun(engine, "testFormData", jsFile)
@@ -294,38 +190,20 @@ async function testFingerprintSafari(){
 		}
 	}()

-	_, err = callTestFun(engine, "testHeader")
-	if err != nil {
-		t.Fatal("header test failed", err)
-	}
-
 	_, err = callTestFun(engine, "testProgress")
 	if err != nil {
-		t.Fatal("progress test failed", err)
+		t.Fatal("progress test failed")
 	}

 	_, err = callTestFun(engine, "testAbort")
 	if err != nil {
-		t.Fatal("abort test failed", err)
+		t.Fatal("abort test failed")
 	}

 	_, err = callTestFun(engine, "testTimeout")
 	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) {
@@ -339,16 +217,8 @@ func doTestFetchWithProxy(t *testing.T, usr, pwd string) {

 	proxyListener := test.StartSocks5Server(usr, pwd)
 	defer proxyListener.Close()
-	engine := NewEngine(&Config{
-		ProxyConfig: &base.DownloaderProxyConfig{
-			Enable: true,
-			System: false,
-			Scheme: "socks5",
-			Host:   proxyListener.Addr().String(),
-			Usr:    usr,
-			Pwd:    pwd,
-		},
-	})
+
+	engine := NewEngine(&Config{ProxyURL: util.BuildProxyUrl("socks5", proxyListener.Addr().String(), usr, pwd)})

 	if _, err := engine.RunString(fmt.Sprintf("var host = 'http://%s';", httpListener.Addr().String())); err != nil {
 		t.Fatal(err)
@@ -450,15 +320,6 @@ func startServer() net.Listener {
 		w.WriteHeader(http.StatusOK)
 		w.Write([]byte("ok"))
 	})
-	mux.HandleFunc("/header", func(w http.ResponseWriter, r *http.Request) {
-		for k, v := range r.Header {
-			if strings.HasPrefix(k, "X-Gopeed") {
-				w.Header().Set(k, strings.Join(v, ", "))
-			}
-		}
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("ok"))
-	})
 	mux.HandleFunc("/text", func(w http.ResponseWriter, r *http.Request) {
 		buf, _ := io.ReadAll(r.Body)
 		w.WriteHeader(http.StatusOK)
@@ -498,25 +359,6 @@ func startServer() net.Listener {
 		w.WriteHeader(http.StatusOK)
 		w.Write([]byte("ok"))
 	})
-	mux.HandleFunc("/redirect", func(w http.ResponseWriter, r *http.Request) {
-		num := r.URL.Query().Get("num")
-		n, _ := strconv.Atoi(num)
-		if n > 0 {
-			http.Redirect(w, r, fmt.Sprintf("/redirect?num=%d", n-1), http.StatusFound)
-		} else {
-			w.WriteHeader(http.StatusOK)
-			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
@@ -2,20 +2,16 @@ package xhr

 import (
 	"bytes"
-	"errors"
+	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
+	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/formdata"
+	"github.com/GopeedLab/gopeed/pkg/download/engine/util"
+	"github.com/dop251/goja"
 	"io"
 	"mime/multipart"
 	"net"
 	"net/http"
 	"net/url"
-	"strings"
 	"time"
-
-	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
-	"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 (
@@ -27,12 +23,6 @@ const (
 	eventTimeout          = "timeout"
 )

-const (
-	redirectError  = "error"
-	redirectFollow = "follow"
-	redirectManual = "manual"
-)
-
 type ProgressEvent struct {
 	Type             string `json:"type"`
 	LengthComputable bool   `json:"lengthComputable"`
@@ -127,27 +117,18 @@ type XMLHttpRequestUpload struct {
 type XMLHttpRequest struct {
 	method          string
 	url             string
-	requestHeaders  http.Header
-	responseHeaders http.Header
+	requestHeaders  map[string]string
+	responseHeaders map[string]string
 	aborted         bool
-	client          *req.Client
-	fingerprint     string
+	proxyUrl        *url.URL

-	WithCredentials bool                  `json:"withCredentials"`
-	Upload          *XMLHttpRequestUpload `json:"upload"`
-	Timeout         int                   `json:"timeout"`
-	ReadyState      int                   `json:"readyState"`
-	Status          int                   `json:"status"`
-	StatusText      string                `json:"statusText"`
-	Response        string                `json:"response"`
-	ResponseText    string                `json:"responseText"`
-	// https://developer.mozilla.org/zh-CN/docs/Web/API/XMLHttpRequest/responseURL
-	// https://xhr.spec.whatwg.org/#the-responseurl-attribute
-	ResponseUrl string `json:"responseURL"`
-	// extend fetch redirect
-	// https://developer.mozilla.org/en-US/docs/Web/API/RequestInit#redirect
-	// https://fetch.spec.whatwg.org/#concept-request-redirect-mode
-	Redirect string `json:"redirect"`
+	Upload       *XMLHttpRequestUpload `json:"upload"`
+	Timeout      int                   `json:"timeout"`
+	ReadyState   int                   `json:"readyState"`
+	Status       int                   `json:"status"`
+	StatusText   string                `json:"statusText"`
+	Response     string                `json:"response"`
+	ResponseText string                `json:"responseText"`
 	*EventProp
 	Onreadystatechange func(event *ProgressEvent) `json:"onreadystatechange"`
 }
@@ -155,63 +136,47 @@ type XMLHttpRequest struct {
 func (xhr *XMLHttpRequest) Open(method, url string) {
 	xhr.method = method
 	xhr.url = url
-	xhr.requestHeaders = make(http.Header)
-	xhr.responseHeaders = make(http.Header)
+	xhr.requestHeaders = make(map[string]string)
+	xhr.responseHeaders = make(map[string]string)
 	xhr.doReadystatechange(1)
 }

 func (xhr *XMLHttpRequest) SetRequestHeader(key, value string) {
-	xhr.requestHeaders.Add(key, value)
+	xhr.requestHeaders[key] = value
 }

 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
 	)
-
-	// Create request using req library
-	reqBuilder := xhr.client.R()
-
-	// 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) {
+	if d == nil || xhr.method == "GET" || xhr.method == "HEAD" {
+		req, err = http.NewRequest(xhr.method, xhr.url, nil)
+	} else {
+		switch d.(type) {
 		case string:
-			reqBuilder.SetBody(v)
+			req, err = http.NewRequest(xhr.method, xhr.url, bytes.NewBufferString(d.(string)))
 			contentType = "text/plain;charset=UTF-8"
-			contentLength = int64(len(v))
-			isStringBody = true
+			contentLength = int64(len(d.(string)))
 		case *file.File:
-			reqBuilder.SetBody(v.Reader)
+			req, err = http.NewRequest(xhr.method, xhr.url, d.(*file.File).Reader)
 			contentType = "application/octet-stream"
-			contentLength = v.Size
+			contentLength = d.(*file.File).Size
 		case *formdata.FormData:
 			pr, pw := io.Pipe()
 			mw := NewMultipart(pw)
-			for _, e := range v.Entries() {
+			for _, e := range d.(*formdata.FormData).Entries() {
 				arr := e.([]any)
 				k := arr[0].(string)
 				v := arr[1]
-				switch v := v.(type) {
+				switch v.(type) {
 				case string:
-					mw.WriteField(k, v)
+					mw.WriteField(k, v.(string))
 				case *file.File:
-					mw.WriteFile(k, v)
+					mw.WriteFile(k, v.(*file.File))
 				}
 			}
 			go func() {
@@ -219,42 +184,36 @@ 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()
 		}
 	}
-
-	// Only string body can specify Content-Type header by user
-	if contentType != "" && (!isStringBody || xhr.requestHeaders.Get("Content-Type") == "") {
-		reqBuilder.SetHeader("Content-Type", contentType)
+	if err != nil {
+		xhr.callOnerror()
+		return
 	}
-
-	// Set timeout
-	if xhr.Timeout > 0 {
-		xhr.client.SetTimeout(time.Duration(xhr.Timeout) * time.Millisecond)
+	if contentType != "" {
+		req.Header.Set("Content-Type", contentType)
 	}
-
-	// Configure redirect behavior
-	xhr.client.SetRedirectPolicy(func(req *http.Request, via []*http.Request) error {
-		if xhr.Redirect == redirectManual {
-			return http.ErrUseLastResponse
-		}
-		if xhr.Redirect == redirectError {
-			return errors.New("redirect failed")
-		}
-		if len(via) > 20 {
-			return errors.New("too many redirects")
-		}
-		return nil
-	})
-
-	// Execute request
-	resp, err := reqBuilder.Send(xhr.method, xhr.url)
+	if contentLength > 0 {
+		req.ContentLength = contentLength
+	}
+	for k, v := range xhr.requestHeaders {
+		req.Header.Set(k, v)
+	}
+	transport := &http.Transport{}
+	if xhr.proxyUrl != nil {
+		transport.Proxy = http.ProxyURL(xhr.proxyUrl)
+	}
+	client := &http.Client{
+		Transport: transport,
+		Timeout:   time.Duration(xhr.Timeout) * time.Millisecond,
+	}
+	resp, err := client.Do(req)
 	if err != nil {
 		// handle timeout error
-		var ne net.Error
-		if errors.As(err, &ne) && ne.Timeout() {
+		if err, ok := err.(net.Error); ok && err.Timeout() {
 			if xhr.Timeout > 0 {
 				xhr.Upload.callOntimeout()
 				xhr.callOntimeout()
@@ -265,37 +224,32 @@ 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)
-	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
+	for k, v := range resp.Header {
+		xhr.responseHeaders[k] = v[0]
 	}
-
-	// Set response headers
-	xhr.responseHeaders = resp.Header
 	xhr.Status = resp.StatusCode
 	xhr.StatusText = resp.Status
 	xhr.doReadystatechange(2)
-
-	bodyBytes := resp.Bytes()
+	buf, err := io.ReadAll(resp.Body)
+	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,10 +260,7 @@ func (xhr *XMLHttpRequest) Abort() {
 }

 func (xhr *XMLHttpRequest) GetResponseHeader(key string) string {
-	if xhr.responseHeaders == nil {
-		return ""
-	}
-	return strings.Join(xhr.responseHeaders.Values(key), ", ")
+	return xhr.responseHeaders[key]
 }

 func (xhr *XMLHttpRequest) GetAllResponseHeaders() string {
@@ -317,7 +268,7 @@ func (xhr *XMLHttpRequest) GetAllResponseHeaders() string {
 	for k, v := range xhr.responseHeaders {
 		buf.WriteString(k)
 		buf.WriteString(": ")
-		buf.WriteString(strings.Join(v, ", "))
+		buf.WriteString(v)
 		buf.WriteString("\r\n")
 	}
 	return buf.String()
@@ -362,7 +313,7 @@ func (xhr *XMLHttpRequest) parseData(data goja.Value) any {
 	return data.String()
 }

-func Enable(runtime *goja.Runtime, proxyHandler func(r *http.Request) (*url.URL, error)) error {
+func Enable(runtime *goja.Runtime, proxyUrl *url.URL) error {
 	progressEvent := runtime.ToValue(func(call goja.ConstructorCall) *goja.Object {
 		if len(call.Arguments) < 1 {
 			util.ThrowTypeError(runtime, "Failed to construct 'ProgressEvent': 1 argument required, but only 0 present.")
@@ -375,15 +326,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,
-			fingerprint: util.SafeGet[string](runtime, FingerprintMagicKey),
+			proxyUrl: proxyUrl,
 			Upload: &XMLHttpRequestUpload{
 				EventProp: &EventProp{
 					eventListeners: make(map[string]func(event *ProgressEvent)),
@@ -397,9 +341,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
 	}
@@ -445,9 +386,10 @@ func (w *multipartWrapper) Size() int64 {
 	w.statWriter.Close()
 	size := int64(w.statBuffer.Len())
 	for _, v := range w.fields {
-		switch v := v.(type) {
+		switch v.(type) {
 		case *file.File:
-			size += v.Size
+			f := v.(*file.File)
+			size += f.Size
 		}
 	}
 	return size
@@ -455,17 +397,18 @@ func (w *multipartWrapper) Size() int64 {

 func (w *multipartWrapper) Send() error {
 	for k, v := range w.fields {
-		switch v := v.(type) {
+		switch v.(type) {
 		case string:
-			if err := w.writer.WriteField(k, v); err != nil {
+			if err := w.writer.WriteField(k, v.(string)); err != nil {
 				return err
 			}
 		case *file.File:
-			fw, err := w.writer.CreateFormFile(k, v.Name)
+			f := v.(*file.File)
+			fw, err := w.writer.CreateFormFile(k, f.Name)
 			if err != nil {
 				return err
 			}
-			if _, err = io.Copy(fw, v); err != nil {
+			if _, err = io.Copy(fw, f); err != nil {
 				return err
 			}
 		}
@@ -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()
-	}
-}
@@ -1 +1 @@
-(()=>{var e={725:function(e,t,r){var o,n,i;i="undefined"!=typeof self&&self||"undefined"!=typeof window&&window||void 0!==r.g&&r.g||this,o=function(e){"use strict";var t=i.BlobBuilder||i.WebKitBlobBuilder||i.MSBlobBuilder||i.MozBlobBuilder,r=i.URL||i.webkitURL||function(e,t){return(t=document.createElement("a")).href=e,t},o=i.Blob,n=r.createObjectURL,a=r.revokeObjectURL,s=i.Symbol&&i.Symbol.toStringTag,u=!1,f=!1,l=t&&t.prototype.append&&t.prototype.getBlob;try{u=2===new Blob(["ä"]).size,f=2===new Blob([new Uint8Array([1,2])]).size}catch(e){}function c(e){return e.map((function(e){if(e.buffer instanceof ArrayBuffer){var t=e.buffer;if(e.byteLength!==t.byteLength){var r=new Uint8Array(e.byteLength);r.set(new Uint8Array(t,e.byteOffset,e.byteLength)),t=r.buffer}return t}return e}))}function h(e,r){r=r||{};var o=new t;return c(e).forEach((function(e){o.append(e)})),r.type?o.getBlob(r.type):o.getBlob()}function d(e,t){return new o(c(e),t||{})}i.Blob&&(h.prototype=Blob.prototype,d.prototype=Blob.prototype);var p="function"==typeof TextEncoder?TextEncoder.prototype.encode.bind(new TextEncoder):function(e){for(var t=0,r=e.length,o=i.Uint8Array||Array,n=0,a=Math.max(32,r+(r>>1)+7),s=new o(a>>3<<3);t<r;){var u=e.charCodeAt(t++);if(u>=55296&&u<=56319){if(t<r){var f=e.charCodeAt(t);56320==(64512&f)&&(++t,u=((1023&u)<<10)+(1023&f)+65536)}if(u>=55296&&u<=56319)continue}if(n+4>s.length){a+=8,a=(a*=1+t/e.length*2)>>3<<3;var l=new Uint8Array(a);l.set(s),s=l}if(0!=(4294967168&u)){if(0==(4294965248&u))s[n++]=u>>6&31|192;else if(0==(4294901760&u))s[n++]=u>>12&15|224,s[n++]=u>>6&63|128;else{if(0!=(4292870144&u))continue;s[n++]=u>>18&7|240,s[n++]=u>>12&63|128,s[n++]=u>>6&63|128}s[n++]=63&u|128}else s[n++]=u}return s.slice(0,n)},y="function"==typeof TextDecoder?TextDecoder.prototype.decode.bind(new TextDecoder):function(e){for(var t=e.length,r=[],o=0;o<t;){var n,i,a,s,u=e[o],f=null,l=u>239?4:u>223?3:u>191?2:1;if(o+l<=t)switch(l){case 1:u<128&&(f=u);break;case 2:128==(192&(n=e[o+1]))&&(s=(31&u)<<6|63&n)>127&&(f=s);break;case 3:n=e[o+1],i=e[o+2],128==(192&n)&&128==(192&i)&&(s=(15&u)<<12|(63&n)<<6|63&i)>2047&&(s<55296||s>57343)&&(f=s);break;case 4:n=e[o+1],i=e[o+2],a=e[o+3],128==(192&n)&&128==(192&i)&&128==(192&a)&&(s=(15&u)<<18|(63&n)<<12|(63&i)<<6|63&a)>65535&&s<1114112&&(f=s)}null===f?(f=65533,l=1):f>65535&&(f-=65536,r.push(f>>>10&1023|55296),f=56320|1023&f),r.push(f),o+=l}for(var c=r.length,h="",d=0;d<c;)h+=String.fromCharCode.apply(String,r.slice(d,d+=4096));return h};function b(){var t=!!i.ActiveXObject||"-ms-scroll-limit"in document.documentElement.style&&"-ms-ime-align"in document.documentElement.style,r=i.XMLHttpRequest&&i.XMLHttpRequest.prototype.send;t&&r&&(XMLHttpRequest.prototype.send=function(e){e instanceof Blob?(this.setRequestHeader("Content-Type",e.type),r.call(this,e)):r.call(this,e)});try{new File([],""),e.File=i.File,e.FileReader=i.FileReader}catch(t){try{e.File=new Function('class File extends Blob {constructor(chunks, name, opts) {opts = opts || {};super(chunks, opts || {});this.name = name.replace(/\\//g, ":");this.lastModifiedDate = opts.lastModified ? new Date(opts.lastModified) : new Date();this.lastModified = +this.lastModifiedDate;}};return new File([], ""), File')()}catch(t){e.File=function(e,t,r){var o=new Blob(e,r),n=r&&void 0!==r.lastModified?new Date(r.lastModified):new Date;return o.name=t.replace(/\//g,":"),o.lastModifiedDate=n,o.lastModified=+n,o.toString=function(){return"[object File]"},s&&(o[s]="File"),o}}}}u?(b(),e.Blob=f?i.Blob:d):l?(b(),e.Blob=h):function(){function t(e){for(var t=new Array(e.byteLength),r=new Uint8Array(e),o=t.length;o--;)t[o]=r[o];return t}function o(e){for(var t="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",r=[],o=0;o<e.length;o+=3){var n=e[o],i=o+1<e.length,a=i?e[o+1]:0,s=o+2<e.length,u=s?e[o+2]:0,f=n>>2,l=(3&n)<<4|a>>4,c=(15&a)<<2|u>>6,h=63&u;s||(h=64,i||(c=64)),r.push(t[f],t[l],t[c],t[h])}return r.join("")}var s=Object.create||function(e){function t(){}return t.prototype=e,new t};function u(e){return Object.prototype.toString.call(e).slice(8,-1)}function f(e,t){return"object"==typeof e&&Object.prototype.isPrototypeOf.call(e.prototype,t)}var l=["Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Uint16Array","Int32Array","Uint32Array","Float32Array","Float64Array","ArrayBuffer"];function c(e){return t=l,r=u(e),-1!==t.indexOf(r)||f(i.ArrayBuffer,e);var t,r}function h(e,r){r=null==r?{}:r;for(var o=0,n=(e=e?e.slice():[]).length;o<n;o++){var a=e[o];a instanceof h?e[o]=a._buffer:"string"==typeof a?e[o]=p(a):"DataView"===u(s=a)||f(i.DataView,s)?e[o]=t(a.buffer):c(a)?e[o]=t(a):e[o]=p(String(a))}var s;this._buffer=i.Uint8Array?function(e){for(var t=0,r=e.length;r--;)t+=e[r].length;for(var o=new Uint8Array(t),n=0,i=0;i<e.length;i++){var a=e[i];o.set(a,n),n+=a.byteLength||a.length}return o}(e):[].concat.apply([],e),this.size=this._buffer.length,this.type=r.type||"",/[^\u0020-\u007E]/.test(this.type)?this.type="":this.type=this.type.toLowerCase()}funcLine truncated
+(()=>{var t={725:function(t,e,r){var o,n,i;i="undefined"!=typeof self&&self||"undefined"!=typeof window&&window||void 0!==r.g&&r.g||this,o=function(t){"use strict";var e=i.BlobBuilder||i.WebKitBlobBuilder||i.MSBlobBuilder||i.MozBlobBuilder,r=i.URL||i.webkitURL||function(t,e){return(e=document.createElement("a")).href=t,e},o=i.Blob,n=r.createObjectURL,a=r.revokeObjectURL,s=i.Symbol&&i.Symbol.toStringTag,u=!1,f=!1,l=e&&e.prototype.append&&e.prototype.getBlob;try{u=2===new Blob(["ä"]).size,f=2===new Blob([new Uint8Array([1,2])]).size}catch(t){}function c(t){return t.map((function(t){if(t.buffer instanceof ArrayBuffer){var e=t.buffer;if(t.byteLength!==e.byteLength){var r=new Uint8Array(t.byteLength);r.set(new Uint8Array(e,t.byteOffset,t.byteLength)),e=r.buffer}return e}return t}))}function h(t,r){r=r||{};var o=new e;return c(t).forEach((function(t){o.append(t)})),r.type?o.getBlob(r.type):o.getBlob()}function p(t,e){return new o(c(t),e||{})}i.Blob&&(h.prototype=Blob.prototype,p.prototype=Blob.prototype);var y="function"==typeof TextEncoder?TextEncoder.prototype.encode.bind(new TextEncoder):function(t){for(var e=0,r=t.length,o=i.Uint8Array||Array,n=0,a=Math.max(32,r+(r>>1)+7),s=new o(a>>3<<3);e<r;){var u=t.charCodeAt(e++);if(u>=55296&&u<=56319){if(e<r){var f=t.charCodeAt(e);56320==(64512&f)&&(++e,u=((1023&u)<<10)+(1023&f)+65536)}if(u>=55296&&u<=56319)continue}if(n+4>s.length){a+=8,a=(a*=1+e/t.length*2)>>3<<3;var l=new Uint8Array(a);l.set(s),s=l}if(0!=(4294967168&u)){if(0==(4294965248&u))s[n++]=u>>6&31|192;else if(0==(4294901760&u))s[n++]=u>>12&15|224,s[n++]=u>>6&63|128;else{if(0!=(4292870144&u))continue;s[n++]=u>>18&7|240,s[n++]=u>>12&63|128,s[n++]=u>>6&63|128}s[n++]=63&u|128}else s[n++]=u}return s.slice(0,n)},d="function"==typeof TextDecoder?TextDecoder.prototype.decode.bind(new TextDecoder):function(t){for(var e=t.length,r=[],o=0;o<e;){var n,i,a,s,u=t[o],f=null,l=u>239?4:u>223?3:u>191?2:1;if(o+l<=e)switch(l){case 1:u<128&&(f=u);break;case 2:128==(192&(n=t[o+1]))&&(s=(31&u)<<6|63&n)>127&&(f=s);break;case 3:n=t[o+1],i=t[o+2],128==(192&n)&&128==(192&i)&&(s=(15&u)<<12|(63&n)<<6|63&i)>2047&&(s<55296||s>57343)&&(f=s);break;case 4:n=t[o+1],i=t[o+2],a=t[o+3],128==(192&n)&&128==(192&i)&&128==(192&a)&&(s=(15&u)<<18|(63&n)<<12|(63&i)<<6|63&a)>65535&&s<1114112&&(f=s)}null===f?(f=65533,l=1):f>65535&&(f-=65536,r.push(f>>>10&1023|55296),f=56320|1023&f),r.push(f),o+=l}for(var c=r.length,h="",p=0;p<c;)h+=String.fromCharCode.apply(String,r.slice(p,p+=4096));return h};function b(){var e=!!i.ActiveXObject||"-ms-scroll-limit"in document.documentElement.style&&"-ms-ime-align"in document.documentElement.style,r=i.XMLHttpRequest&&i.XMLHttpRequest.prototype.send;e&&r&&(XMLHttpRequest.prototype.send=function(t){t instanceof Blob?(this.setRequestHeader("Content-Type",t.type),r.call(this,t)):r.call(this,t)});try{new File([],""),t.File=i.File,t.FileReader=i.FileReader}catch(e){try{t.File=new Function('class File extends Blob {constructor(chunks, name, opts) {opts = opts || {};super(chunks, opts || {});this.name = name.replace(/\\//g, ":");this.lastModifiedDate = opts.lastModified ? new Date(opts.lastModified) : new Date();this.lastModified = +this.lastModifiedDate;}};return new File([], ""), File')()}catch(e){t.File=function(t,e,r){var o=new Blob(t,r),n=r&&void 0!==r.lastModified?new Date(r.lastModified):new Date;return o.name=e.replace(/\//g,":"),o.lastModifiedDate=n,o.lastModified=+n,o.toString=function(){return"[object File]"},s&&(o[s]="File"),o}}}}u?(b(),t.Blob=f?i.Blob:p):l?(b(),t.Blob=h):function(){function e(t){for(var e=new Array(t.byteLength),r=new Uint8Array(t),o=e.length;o--;)e[o]=r[o];return e}function o(t){for(var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",r=[],o=0;o<t.length;o+=3){var n=t[o],i=o+1<t.length,a=i?t[o+1]:0,s=o+2<t.length,u=s?t[o+2]:0,f=n>>2,l=(3&n)<<4|a>>4,c=(15&a)<<2|u>>6,h=63&u;s||(h=64,i||(c=64)),r.push(e[f],e[l],e[c],e[h])}return r.join("")}var s=Object.create||function(t){function e(){}return e.prototype=t,new e};function u(t){return Object.prototype.toString.call(t).slice(8,-1)}function f(t,e){return"object"==typeof t&&Object.prototype.isPrototypeOf.call(t.prototype,e)}var l=["Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Uint16Array","Int32Array","Uint32Array","Float32Array","Float64Array","ArrayBuffer"];function c(t){return e=l,r=u(t),-1!==e.indexOf(r)||f(i.ArrayBuffer,t);var e,r}function h(t,r){r=null==r?{}:r;for(var o=0,n=(t=t?t.slice():[]).length;o<n;o++){var a=t[o];a instanceof h?t[o]=a._buffer:"string"==typeof a?t[o]=y(a):"DataView"===u(s=a)||f(i.DataView,s)?t[o]=e(a.buffer):c(a)?t[o]=e(a):t[o]=y(String(a))}var s;this._buffer=i.Uint8Array?function(t){for(var e=0,r=t.length;r--;)e+=t[r].length;for(var o=new Uint8Array(e),n=0,i=0;i<t.length;i++){var a=t[i];o.set(a,n),n+=a.byteLength||a.length}return o}(t):[].concat.apply([],t),this.size=this._buffer.length,this.type=r.type||"",/[^\u0020-\u007E]/.test(this.type)?this.type="":this.type=this.type.toLowerCase()}funcLine truncated
@@ -7,19 +7,16 @@
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
    "dev": "webpack --mode production --watch",
-    "build": "webpack --mode production",
-    "postinstall": "patch-package"
+    "build": "webpack --mode production"
  },
  "author": "",
  "license": "ISC",
  "devDependencies": {
-    "patch-package": "^8.0.0",
    "webpack": "^5.75.0",
    "webpack-cli": "^5.0.1"
  },
  "dependencies": {
    "blob-polyfill": "^7.0.20220408",
-    "fastestsmallesttextencoderdecoder": "^1.0.22",
-    "whatwg-fetch": "^3.6.20"
+    "whatwg-fetch": "^3.6.2"
  }
 }
@@ -1,46 +0,0 @@
-diff --git a/node_modules/whatwg-fetch/dist/fetch.umd.js b/node_modules/whatwg-fetch/dist/fetch.umd.js
-index 7a0d852..604691e 100644
--- a/node_modules/whatwg-fetch/dist/fetch.umd.js
-+++ b/node_modules/whatwg-fetch/dist/fetch.umd.js
-@@ -394,6 +394,7 @@
-       }
-     }());
-     this.referrer = null;
-+    this.redirect = options.redirect || 'follow'
- 
-     if ((this.method === 'GET' || this.method === 'HEAD') && body) {
-       throw new TypeError('Body not allowed for GET or HEAD requests')
-@@ -606,6 +607,10 @@
-         }
-       }
- 
-+      if ('redirect' in xhr) {
-+        xhr.redirect = request.redirect
-+      }
-+
-       if (init && typeof init.headers === 'object' && !(init.headers instanceof Headers || (g.Headers && init.headers instanceof g.Headers))) {
-         var names = [];
-         Object.getOwnPropertyNames(init.headers).forEach(function(name) {
-diff --git a/node_modules/whatwg-fetch/fetch.js b/node_modules/whatwg-fetch/fetch.js
-index f39a983..d1fc903 100644
--- a/node_modules/whatwg-fetch/fetch.js
-+++ b/node_modules/whatwg-fetch/fetch.js
-@@ -388,6 +388,7 @@ export function Request(input, options) {
-     }
-   }());
-   this.referrer = null
-+  this.redirect = options.redirect || 'follow'
- 
-   if ((this.method === 'GET' || this.method === 'HEAD') && body) {
-     throw new TypeError('Body not allowed for GET or HEAD requests')
-@@ -600,6 +601,10 @@ export function fetch(input, init) {
-       }
-     }
- 
-+    if ('redirect' in xhr) {
-+      xhr.redirect = request.redirect
-+    }
-+
-     if (init && typeof init.headers === 'object' && !(init.headers instanceof Headers || (g.Headers && init.headers instanceof g.Headers))) {
-       var names = [];
-       Object.getOwnPropertyNames(init.headers).forEach(function(name) {
@@ -1,5 +1,3 @@
 import "./blob/index.js"
 import "./crypto/index.js"
-// polyfill TextEncoder
-import 'fastestsmallesttextencoderdecoder';
 import "./fetch/index.js"
@@ -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
-}
@@ -3,14 +3,6 @@ package download
 import (
 	"encoding/json"
 	"fmt"
-	"io"
-	"os"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
 	"github.com/GopeedLab/gopeed/internal/logger"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/download/engine"
@@ -20,6 +12,13 @@ import (
 	"github.com/dop251/goja"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/transport"
+	"io"
+	"os"
+	"path"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
 )

 var (
@@ -39,7 +38,7 @@ const (
 	EventOnResolve ActivationEvent = "onResolve"
 	EventOnStart   ActivationEvent = "onStart"
 	EventOnError   ActivationEvent = "onError"
-	EventOnDone    ActivationEvent = "onDone"
+	//EventOnDone    ActivationEvent = "onDone"
 )

 func (d *Downloader) InstallExtensionByGit(url string) (*Extension, error) {
@@ -156,13 +155,7 @@ func (d *Downloader) DeleteExtension(identity string) error {
 			break
 		}
 	}
-	if err = d.storage.Delete(bucketExtension, identity); err != nil {
-		return err
-	}
-	if err = d.storage.Delete(bucketExtensionStorage, identity); err != nil {
-		return err
-	}
-	return nil
+	return d.storage.Delete(bucketExtension, identity)
 }

 func (d *Downloader) GetExtensions() []*Extension {
@@ -201,16 +194,12 @@ func (d *Downloader) fetchExtensionByGit(url string, handler func(tempExtPath st
 		subPath = pathArr[1]
 	}

-	// Use unique suffix to avoid concurrent conflicts when multiple git operations
-	// target the same extension (e.g., install and update check happening simultaneously)
-	tempExtDir := filepath.Join(d.cfg.StorageDir, tempExtensionsDir, fmt.Sprintf("%s_%d", projectPath, time.Now().UnixNano()))
-	if err := os.MkdirAll(tempExtDir, 0755); err != nil {
+	tempExtDir := filepath.Join(d.cfg.StorageDir, tempExtensionsDir, projectPath)
+	if err := util.RmAndMkDirAll(tempExtDir); err != nil {
 		return nil, err
 	}
-	defer os.RemoveAll(tempExtDir)
-
 	proxyOptions := transport.ProxyOptions{}
-	proxyUrl := d.cfg.DownloaderStoreConfig.Proxy.ToUrl()
+	proxyUrl := d.cfg.ProxyUrl()
 	if proxyUrl != nil {
 		proxyOptions.URL = proxyUrl.Scheme + "://" + proxyUrl.Host
 		proxyOptions.Username = proxyUrl.User.Username()
@@ -225,6 +214,7 @@ func (d *Downloader) fetchExtensionByGit(url string, handler func(tempExtPath st
 	}); err != nil {
 		return nil, err
 	}
+	defer os.RemoveAll(tempExtDir)

 	return handler(filepath.Join(tempExtDir, subPath), false)
 }
@@ -264,9 +254,9 @@ func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource, er
 					gopeed.Logger.logger.Warn().Err(err).Msgf("[%s] resource invalid", ext.buildIdentity())
 					return
 				}
-				ctx.Res.Name = util.SafeFilename(ctx.Res.Name)
+				ctx.Res.Name = util.ReplaceInvalidFilename(ctx.Res.Name)
 				for _, file := range ctx.Res.Files {
-					file.Name = util.SafeFilename(file.Name)
+					file.Name = util.ReplaceInvalidFilename(file.Name)
 				}
 				ctx.Res.CalcSize(nil)
 			}
@@ -308,17 +298,6 @@ func (d *Downloader) triggerOnError(task *Task, err error) {
 	)
 }

-func (d *Downloader) triggerOnDone(task *Task) {
-	doTrigger(d,
-		EventOnDone,
-		task.Meta.Req,
-		&OnErrorContext{
-			Task: NewExtensionTask(d, task),
-		},
-		nil,
-	)
-}
-
 func doTrigger[T any](d *Downloader, event ActivationEvent, req *base.Request, ctx T, handler func(ext *Extension, gopeed *Instance, ctx T)) error {
 	// init extension global object
 	gopeed := &Instance{
@@ -362,7 +341,7 @@ func doTrigger[T any](d *Downloader, event ActivationEvent, req *base.Request, c
 						req.Labels = make(map[string]string)
 					}
 					engine := engine.NewEngine(&engine.Config{
-						ProxyConfig: d.cfg.Proxy,
+						ProxyURL: d.cfg.ProxyUrl(),
 					})
 					defer engine.Close()
 					err = engine.Runtime.Set("gopeed", gopeed)
@@ -626,9 +605,9 @@ func (h InstanceEvents) OnError(fn goja.Callable) {
 	h.register(EventOnError, fn)
 }

-func (h InstanceEvents) OnDone(fn goja.Callable) {
-	h.register(EventOnDone, fn)
-}
+//func (h InstanceEvents) OnDone(fn goja.Callable) {
+//	h.register(HookEventOnDone, fn)
+//}

 type ExtensionInfo struct {
 	Identity string `json:"identity"`
@@ -702,39 +681,25 @@ type OnErrorContext struct {
 	Error error          `json:"error"`
 }

-type OnDoneContext struct {
-	Task *Task `json:"task"`
-}
-
-// ExtensionTask is a wrapper of Task, it's used to interact with extension scripts.
-// Avoid extension scripts modifying task directly, use ExtensionTask to encapsulate task,
-// only some fields can be modified, such as request info.
 type ExtensionTask struct {
-	download *Downloader
-
 	*Task
+
+	download *Downloader
 }

 func NewExtensionTask(download *Downloader, task *Task) *ExtensionTask {
-	// restricts extension scripts to only modify request info
-	newTask := task.clone()
-	newTask.Meta.Req = task.Meta.Req
 	return &ExtensionTask{
+		Task:     task.clone(),
 		download: download,
-		Task:     newTask,
 	}
 }

 func (t *ExtensionTask) Continue() error {
-	return t.download.Continue(&TaskFilter{
-		IDs: []string{t.ID},
-	})
+	return t.download.Continue(t.ID)
 }

 func (t *ExtensionTask) Pause() error {
-	return t.download.Pause(&TaskFilter{
-		IDs: []string{t.ID},
-	})
+	return t.download.Pause(t.ID)
 }

 func parseSettings(settings []*Setting) map[string]any {
@@ -2,14 +2,13 @@ package download

 import (
 	"errors"
-	"os"
-	"testing"
-	"time"
-
 	"github.com/GopeedLab/gopeed/internal/logger"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
 	"github.com/dop251/goja"
+	"os"
+	"testing"
+	"time"
 )

 func TestDownloader_InstallExtensionByFolder(t *testing.T) {
@@ -19,7 +18,7 @@ func TestDownloader_InstallExtensionByFolder(t *testing.T) {
 		}
 		rr, err := downloader.Resolve(&base.Request{
 			URL: "https://github.com/test",
-		}, nil)
+		})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -36,7 +35,7 @@ func TestDownloader_InstallExtensionByFolderDevMode(t *testing.T) {
 		}
 		rr, err := downloader.Resolve(&base.Request{
 			URL: "https://github.com/test",
-		}, nil)
+		})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -53,7 +52,7 @@ func TestDownloader_InstallExtensionByGit(t *testing.T) {
 		}
 		rr, err := downloader.Resolve(&base.Request{
 			URL: "https://github.com/GopeedLab/gopeed/releases",
-		}, nil)
+		})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -70,7 +69,7 @@ func TestDownloader_InstallExtensionByGitSimple(t *testing.T) {
 		}
 		rr, err := downloader.Resolve(&base.Request{
 			URL: "https://github.com/GopeedLab/gopeed/releases",
-		}, nil)
+		})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -87,7 +86,7 @@ func TestDownloader_InstallExtensionByGitFull(t *testing.T) {
 		}
 		rr, err := downloader.Resolve(&base.Request{
 			URL: "https://github.com/GopeedLab/gopeed/releases",
-		}, nil)
+		})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -157,7 +156,7 @@ func TestDownloader_UpgradeExtension(t *testing.T) {

 		rr, err := downloader.Resolve(&base.Request{
 			URL: "https://test.com",
-		}, nil)
+		})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -186,7 +185,7 @@ func TestDownloader_Extension_OnStart(t *testing.T) {
 			select {
 			case err = <-errCh:
 				break
-			case <-time.After(time.Second * 30): // Increased timeout for real network requests
+			case <-time.After(time.Second * 10):
 				err = errors.New("timeout")
 			}
 			if err != nil {
@@ -239,7 +238,7 @@ func TestDownloader_Extension_OnError(t *testing.T) {
 		select {
 		case err = <-errCh:
 			break
-		case <-time.After(time.Second * 30): // Increased timeout for real network requests
+		case <-time.After(time.Second * 10):
 			err = errors.New("timeout")
 		}

@@ -248,45 +247,8 @@ func TestDownloader_Extension_OnError(t *testing.T) {
 		}
 		// extension on error modify url and continue download
 		task := downloader.GetTask(id)
-		if task.Status != base.DownloadStatusDone {
-			t.Fatalf("except status is done, actual: %s", task.Status)
-		}
-	})
-}
-
-func TestDownloader_Extension_OnDone(t *testing.T) {
-	setupDownloader(func(downloader *Downloader) {
-		if _, err := downloader.InstallExtensionByFolder("./testdata/extensions/on_done", false); err != nil {
-			t.Fatal(err)
-		}
-		errCh := make(chan error, 1)
-		downloader.Listener(func(event *Event) {
-			if event.Key == EventKeyFinally {
-				errCh <- event.Err
-			}
-		})
-		id, err := downloader.CreateDirect(&base.Request{
-			URL: "https://github.com",
-		}, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		select {
-		case err = <-errCh:
-			break
-		case <-time.After(time.Second * 30): // Increased timeout for real network requests
-			err = errors.New("timeout")
-		}
-		// wait for script execution
-		time.Sleep(time.Millisecond * 3000)
-
-		if err != nil {
-			panic("extension on done download error: " + err.Error())
-		}
-		// extension on error modify url and continue download
-		task := downloader.GetTask(id)
-		if task.Meta.Req.Labels["modified"] != "true" {
-			t.Fatalf("except label: modified=true, actual: %s", task.Meta.Req.Labels["modified"])
+		if task.Meta.Req.URL != "https://github.com" {
+			t.Fatalf("except url: https://github.com, actual: %s", task.Meta.Req.URL)
 		}
 		if task.Status != base.DownloadStatusDone {
 			t.Fatalf("except status is done, actual: %s", task.Status)
@@ -301,7 +263,7 @@ func TestDownloader_Extension_Errors(t *testing.T) {
 		}
 		rr, err := downloader.Resolve(&base.Request{
 			URL: "https://github.com/test",
-		}, nil)
+		})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -316,7 +278,7 @@ func TestDownloader_Extension_Errors(t *testing.T) {
 		}
 		rr, err := downloader.Resolve(&base.Request{
 			URL: "https://github.com/test",
-		}, nil)
+		})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -331,7 +293,7 @@ func TestDownloader_Extension_Errors(t *testing.T) {
 		}
 		_, err := downloader.Resolve(&base.Request{
 			URL: "https://github.com/test",
-		}, nil)
+		})
 		if err == nil {
 			t.Fatalf("except error, but got nil")
 		}
@@ -353,7 +315,7 @@ func TestDownloader_Extension_Settings(t *testing.T) {
 		}
 		rr, err := downloader.Resolve(&base.Request{
 			URL: "https://github.com/test",
-		}, nil)
+		})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -374,7 +336,7 @@ func TestDownloader_Extension_Settings(t *testing.T) {
 		})
 		rr, err := downloader.Resolve(&base.Request{
 			URL: "https://github.com/test",
-		}, nil)
+		})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -391,7 +353,7 @@ func TestDownloader_ExtensionStorage(t *testing.T) {
 		}
 		rr, err := downloader.Resolve(&base.Request{
 			URL: "https://github.com/test",
-		}, nil)
+		})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -1,461 +0,0 @@
-package download
-
-import (
-	"context"
-	"io"
-	"math"
-	"os"
-	"path/filepath"
-	"regexp"
-	"slices"
-	"strings"
-	"sync/atomic"
-
-	"github.com/mholt/archives"
-)
-
-// supportedArchiveExtensions contains file extensions supported by mholt/archives library
-var supportedArchiveExtensions = []string{
-	// Archive formats
-	".zip",
-	".tar",
-	".tar.gz", ".tgz",
-	".tar.bz2", ".tbz2",
-	".tar.xz", ".txz",
-	".tar.lz4", ".tlz4",
-	".tar.sz", ".tsz",
-	".tar.zst", ".tzst",
-	".rar",
-	".7z",
-	// Compression formats
-	".gz",
-	".bz2",
-	".xz",
-	".lz4",
-	".sz",
-	".zst",
-	".br",
-	".lz",
-}
-
-// multiPartArchivePatterns contains regex patterns for multi-part archive detection
-// Each pattern should have a capture group for the base name and part number
-var multiPartArchivePatterns = []*regexp.Regexp{
-	// 7z multi-part: file.7z.001, file.7z.002, etc.
-	regexp.MustCompile(`(?i)^(.+\.7z)\.(\d{3})$`),
-	// RAR multi-part (new style): file.part01.rar, file.part02.rar, etc.
-	regexp.MustCompile(`(?i)^(.+)\.part(\d+)\.rar$`),
-	// RAR multi-part (old style): file.rar, file.r00, file.r01, etc. (first file is .rar)
-	regexp.MustCompile(`(?i)^(.+)\.r(\d{2})$`),
-	// ZIP multi-part: file.zip.001, file.zip.002, etc.
-	regexp.MustCompile(`(?i)^(.+\.zip)\.(\d{3})$`),
-	// ZIP split: file.z01, file.z02, ... file.zip (last file is .zip)
-	regexp.MustCompile(`(?i)^(.+)\.z(\d{2})$`),
-}
-
-// ArchivePartInfo contains information about a multi-part archive
-type ArchivePartInfo struct {
-	// IsMultiPart indicates if this file is part of a multi-part archive
-	IsMultiPart bool
-	// BaseName is the common base name for all parts (without part number extension)
-	BaseName string
-	// PartNumber is the part number (1-indexed)
-	PartNumber int
-	// FirstPartPath is the path to the first part of the archive
-	FirstPartPath string
-	// Pattern indicates which pattern matched (for determining extraction method)
-	Pattern string
-}
-
-// ExtractProgressCallback is called to report extraction progress
-type ExtractProgressCallback func(extractedFiles int, totalFiles int, progress int)
-
-// isArchiveFile checks if a file is a supported archive format
-func isArchiveFile(filename string) bool {
-	lowerName := strings.ToLower(filename)
-	// Check for multi-part archive first
-	if isMultiPartArchive(filename) {
-		return true
-	}
-	return slices.ContainsFunc(supportedArchiveExtensions, func(ext string) bool {
-		return strings.HasSuffix(lowerName, ext)
-	})
-}
-
-// archiveInfo holds information about an opened archive
-type archiveInfo struct {
-	file   *os.File
-	stat   os.FileInfo
-	format archives.Format
-	input  io.Reader
-}
-
-// openArchive opens an archive file and identifies its format
-func openArchive(archivePath string, password string) (*archiveInfo, error) {
-	file, err := os.Open(archivePath)
-	if err != nil {
-		return nil, err
-	}
-
-	stat, err := file.Stat()
-	if err != nil {
-		file.Close()
-		return nil, err
-	}
-
-	format, input, err := archives.Identify(context.Background(), archivePath, file)
-	if err != nil {
-		file.Close()
-		return nil, err
-	}
-
-	// Handle password-protected archives
-	if password != "" {
-		if rar, ok := format.(archives.Rar); ok {
-			rar.Password = password
-			format = rar
-		}
-		if sz, ok := format.(archives.SevenZip); ok {
-			sz.Password = password
-			format = sz
-		}
-	}
-
-	return &archiveInfo{
-		file:   file,
-		stat:   stat,
-		format: format,
-		input:  input,
-	}, nil
-}
-
-// createExtractionHandler creates a handler function for extracting files with progress tracking
-func createExtractionHandler(destDir string, totalFiles int, progressCallback ExtractProgressCallback) func(ctx context.Context, fileInfo archives.FileInfo) error {
-	var extractedFiles atomic.Int32
-	return func(ctx context.Context, fileInfo archives.FileInfo) error {
-		err := extractFile(ctx, fileInfo, destDir)
-		if err == nil && !fileInfo.IsDir() {
-			extracted := int(extractedFiles.Add(1))
-			if progressCallback != nil && totalFiles > 0 {
-				progress := int(math.Min(float64((extracted*100)/totalFiles), 100))
-				progressCallback(extracted, totalFiles, progress)
-			}
-		}
-		return err
-	}
-}
-
-// extractArchive extracts an archive file to a destination directory
-func extractArchive(archivePath string, destDir string, password string, progressCallback ExtractProgressCallback) error {
-	// Open the archive file
-	info, err := openArchive(archivePath, password)
-	if err != nil {
-		return err
-	}
-	defer info.file.Close()
-
-	// Create destination directory if it doesn't exist
-	if err := os.MkdirAll(destDir, 0755); err != nil {
-		return err
-	}
-
-	// Handle extraction based on format type
-	switch f := info.format.(type) {
-	case archives.Extractor:
-		// For archive formats (zip, rar, 7z, tar, etc.)
-		// First, count total files for progress tracking
-		totalFiles, err := countArchiveFiles(archivePath, password)
-		if err != nil {
-			// If counting fails, proceed without progress reporting
-			totalFiles = 0
-		}
-		return f.Extract(context.Background(), info.input, createExtractionHandler(destDir, totalFiles, progressCallback))
-	case archives.Decompressor:
-		// For single-file compression formats (gz, bz2, xz, etc.)
-		// Decompress to a file without the compression extension
-		baseName := filepath.Base(archivePath)
-		lowerBaseName := strings.ToLower(baseName)
-		for _, ext := range supportedArchiveExtensions {
-			if strings.HasSuffix(lowerBaseName, ext) {
-				// Get the actual suffix from the original filename (preserving case)
-				actualSuffix := baseName[len(baseName)-len(ext):]
-				baseName = strings.TrimSuffix(baseName, actualSuffix)
-				break
-			}
-		}
-		destPath := filepath.Join(destDir, baseName)
-
-		reader, err := f.OpenReader(info.input)
-		if err != nil {
-			return err
-		}
-		defer reader.Close()
-
-		destFile, err := os.Create(destPath)
-		if err != nil {
-			return err
-		}
-		defer destFile.Close()
-
-		// Report progress at start and end for decompression
-		if progressCallback != nil {
-			progressCallback(0, 1, 0)
-		}
-		_, err = io.Copy(destFile, reader)
-		if err == nil && progressCallback != nil {
-			progressCallback(1, 1, 100)
-		}
-		return err
-	case archives.Archiver:
-		// This format is an archiver, try to extract using the extractor interface
-		if ext, ok := info.format.(archives.Extractor); ok {
-			// Reset file position
-			if seeker, ok := info.input.(io.Seeker); ok {
-				seeker.Seek(0, io.SeekStart)
-			}
-			// Count total files for progress tracking
-			totalFiles, err := countArchiveFiles(archivePath, password)
-			if err != nil {
-				totalFiles = 0
-			}
-			return ext.Extract(context.Background(), io.NewSectionReader(info.file, 0, info.stat.Size()), createExtractionHandler(destDir, totalFiles, progressCallback))
-		}
-	}
-
-	return nil
-}
-
-// createCountingHandler creates a handler function for counting files in an archive
-func createCountingHandler(count *int) func(ctx context.Context, fileInfo archives.FileInfo) error {
-	return func(ctx context.Context, fileInfo archives.FileInfo) error {
-		if !fileInfo.IsDir() {
-			(*count)++
-		}
-		return nil
-	}
-}
-
-// countArchiveFiles counts the number of files in an archive for progress calculation
-func countArchiveFiles(archivePath string, password string) (int, error) {
-	info, err := openArchive(archivePath, password)
-	if err != nil {
-		return 0, err
-	}
-	defer info.file.Close()
-
-	count := 0
-	switch f := info.format.(type) {
-	case archives.Extractor:
-		err = f.Extract(context.Background(), info.input, createCountingHandler(&count))
-	case archives.Archiver:
-		if ext, ok := info.format.(archives.Extractor); ok {
-			if seeker, ok := info.input.(io.Seeker); ok {
-				seeker.Seek(0, io.SeekStart)
-			}
-			err = ext.Extract(context.Background(), io.NewSectionReader(info.file, 0, info.stat.Size()), createCountingHandler(&count))
-		}
-	case archives.Decompressor:
-		// Single file compression, count as 1
-		return 1, nil
-	}
-
-	return count, err
-}
-
-// extractFile handles extracting a single file from an archive
-func extractFile(ctx context.Context, fileInfo archives.FileInfo, destDir string) error {
-	// Skip directories, they will be created when extracting files
-	if fileInfo.IsDir() {
-		destPath := filepath.Join(destDir, fileInfo.NameInArchive)
-		return os.MkdirAll(destPath, fileInfo.Mode())
-	}
-
-	// Sanitize the path to prevent path traversal attacks
-	cleanPath := filepath.Clean(fileInfo.NameInArchive)
-	if strings.HasPrefix(cleanPath, "..") || filepath.IsAbs(cleanPath) {
-		// Skip files with suspicious paths
-		return nil
-	}
-
-	destPath := filepath.Join(destDir, cleanPath)
-
-	// Create parent directories
-	if err := os.MkdirAll(filepath.Dir(destPath), 0755); err != nil {
-		return err
-	}
-
-	// Open the file from the archive
-	reader, err := fileInfo.Open()
-	if err != nil {
-		return err
-	}
-	defer reader.Close()
-
-	// Create the destination file
-	destFile, err := os.Create(destPath)
-	if err != nil {
-		return err
-	}
-	defer destFile.Close()
-
-	// Copy the contents
-	_, err = io.Copy(destFile, reader)
-	if err != nil {
-		return err
-	}
-
-	// Set file permissions
-	return os.Chmod(destPath, fileInfo.Mode())
-}
-
-// isMultiPartArchive checks if a file is part of a multi-part archive
-func isMultiPartArchive(filename string) bool {
-	info := getArchivePartInfo(filename)
-	return info.IsMultiPart
-}
-
-// getArchivePartInfo returns detailed information about a multi-part archive file
-func getArchivePartInfo(filename string) ArchivePartInfo {
-	baseName := filepath.Base(filename)
-
-	for _, pattern := range multiPartArchivePatterns {
-		matches := pattern.FindStringSubmatch(baseName)
-		if len(matches) >= 3 {
-			partNum := 0
-			_, err := parsePartNumber(matches[2], &partNum)
-			if err != nil {
-				continue
-			}
-
-			info := ArchivePartInfo{
-				IsMultiPart: true,
-				BaseName:    matches[1],
-				PartNumber:  partNum,
-				Pattern:     pattern.String(),
-			}
-
-			// Determine the first part path based on pattern
-			dir := filepath.Dir(filename)
-			info.FirstPartPath = determineFirstPartPath(dir, info.BaseName, pattern.String())
-
-			return info
-		}
-	}
-
-	// Check for .rar files that might be the first part of old-style multi-part RAR
-	if strings.HasSuffix(strings.ToLower(baseName), ".rar") && !strings.Contains(strings.ToLower(baseName), ".part") {
-		// Check if there are .r00, .r01 files in the same directory
-		dir := filepath.Dir(filename)
-		nameWithoutExt := strings.TrimSuffix(baseName, filepath.Ext(baseName))
-		r00Path := filepath.Join(dir, nameWithoutExt+".r00")
-		if _, err := os.Stat(r00Path); err == nil {
-			return ArchivePartInfo{
-				IsMultiPart:   true,
-				BaseName:      nameWithoutExt,
-				PartNumber:    1, // .rar is the first part in old-style
-				FirstPartPath: filename,
-				Pattern:       "rar-old-style",
-			}
-		}
-	}
-
-	return ArchivePartInfo{IsMultiPart: false}
-}
-
-// parsePartNumber parses a part number string and stores it in the provided pointer
-// Returns the parsed number and nil error on success
-func parsePartNumber(s string, partNum *int) (int, error) {
-	n := 0
-	for _, c := range s {
-		if c >= '0' && c <= '9' {
-			n = n*10 + int(c-'0')
-		}
-	}
-	// For .001, .002 style, part number is the value itself
-	// For .part01 style, part number is the value itself
-	// For .r00, .r01 style: r00=2 (since .rar is part 1), r01=3, etc.
-	// However, for consistency, we return the raw number and handle the offset elsewhere
-	*partNum = n
-	// Treat 00 as part 0, let callers handle the semantics
-	if n == 0 {
-		*partNum = 1 // For .001 format, 001 should be 1
-	}
-	return *partNum, nil
-}
-
-// determineFirstPartPath determines the path to the first part of a multi-part archive
-func determineFirstPartPath(dir, baseName, pattern string) string {
-	switch {
-	case strings.Contains(pattern, `.7z)`):
-		// 7z multi-part: first part is .7z.001
-		return filepath.Join(dir, baseName+".001")
-	case strings.Contains(pattern, `.part`):
-		// RAR new style: first part is .part01.rar or .part1.rar
-		// Try both single and double digit formats
-		if _, err := os.Stat(filepath.Join(dir, baseName+".part1.rar")); err == nil {
-			return filepath.Join(dir, baseName+".part1.rar")
-		}
-		return filepath.Join(dir, baseName+".part01.rar")
-	case strings.Contains(pattern, `.r(`):
-		// RAR old style: first part is .rar (not .r00)
-		return filepath.Join(dir, baseName+".rar")
-	case strings.Contains(pattern, `.zip)`):
-		// ZIP multi-part: first part is .zip.001
-		return filepath.Join(dir, baseName+".001")
-	case strings.Contains(pattern, `.z(`):
-		// ZIP split: last part is .zip, but extraction should start from .z01
-		return filepath.Join(dir, baseName+".z01")
-	default:
-		return ""
-	}
-}
-
-// isFirstPart checks if the given file is the first part of a multi-part archive
-func isFirstPart(filename string) bool {
-	info := getArchivePartInfo(filename)
-	if !info.IsMultiPart {
-		return false
-	}
-
-	// For most formats, part 1 is the first part
-	// For old-style RAR, check if this is the .rar file
-	if info.Pattern == "rar-old-style" {
-		return strings.HasSuffix(strings.ToLower(filename), ".rar")
-	}
-
-	return info.PartNumber == 1
-}
-
-// GetMultiPartArchiveBaseName returns the base name for a multi-part archive
-// This is used to group related parts together
-func GetMultiPartArchiveBaseName(filename string) string {
-	info := getArchivePartInfo(filename)
-	if !info.IsMultiPart {
-		return ""
-	}
-	return filepath.Join(filepath.Dir(filename), info.BaseName)
-}
-
-// extractMultiPartArchive extracts a multi-part archive starting from the first part
-func extractMultiPartArchive(firstPartPath string, destDir string, password string, progressCallback ExtractProgressCallback) error {
-	info := getArchivePartInfo(firstPartPath)
-
-	// For 7z multi-part archives, the bodgit/sevenzip library handles multi-volume automatically
-	// when using OpenReader with a .001 file
-	if strings.Contains(info.Pattern, `\.7z\)`) || strings.HasSuffix(strings.ToLower(firstPartPath), ".7z.001") {
-		return extractSevenZipMultiPart(firstPartPath, destDir, password, progressCallback)
-	}
-
-	// For RAR multi-part archives, use the archives library with Name and FS fields
-	if strings.Contains(info.Pattern, "rar") || info.Pattern == "rar-old-style" {
-		return extractRarMultiPart(firstPartPath, destDir, password, progressCallback)
-	}
-
-	// For ZIP multi-part archives (.zip.001, .zip.002, etc.), concatenate parts and extract
-	if strings.Contains(info.Pattern, `\.zip\)`) || strings.HasSuffix(strings.ToLower(firstPartPath), ".zip.001") {
-		return extractZipMultiPart(firstPartPath, destDir, password, progressCallback)
-	}
-
-	// For other formats, try standard extraction (may not work for all multi-part formats)
-	return extractArchive(firstPartPath, destDir, password, progressCallback)
-}
@@ -1,92 +0,0 @@
-package download
-
-import (
-	"io"
-	"os"
-	"path/filepath"
-
-	"github.com/bodgit/sevenzip"
-)
-
-// extractSevenZipMultiPart extracts a multi-part 7z archive using bodgit/sevenzip directly
-// The mholt/archives wrapper doesn't properly handle multi-part 7z files because it uses
-// io.SectionReader which can only see the first part. The bodgit/sevenzip library's
-// OpenReaderWithPassword function handles multi-part files automatically when given the .001 file path.
-func extractSevenZipMultiPart(firstPartPath string, destDir string, password string, progressCallback ExtractProgressCallback) error {
-	// Use bodgit/sevenzip directly - it automatically handles .001, .002, etc. files
-	var reader *sevenzip.ReadCloser
-	var err error
-
-	if password != "" {
-		reader, err = sevenzip.OpenReaderWithPassword(firstPartPath, password)
-	} else {
-		reader, err = sevenzip.OpenReader(firstPartPath)
-	}
-	if err != nil {
-		return err
-	}
-	defer reader.Close()
-
-	// Create destination directory
-	if err := os.MkdirAll(destDir, 0755); err != nil {
-		return err
-	}
-
-	// Count total files for progress
-	totalFiles := 0
-	for _, f := range reader.File {
-		if !f.FileInfo().IsDir() {
-			totalFiles++
-		}
-	}
-
-	// Extract files with progress tracking
-	extractedFiles := 0
-	for _, f := range reader.File {
-		destPath := filepath.Join(destDir, f.Name)
-
-		if f.FileInfo().IsDir() {
-			if err := os.MkdirAll(destPath, f.Mode()); err != nil {
-				return err
-			}
-			continue
-		}
-
-		// Ensure parent directory exists
-		if err := os.MkdirAll(filepath.Dir(destPath), 0755); err != nil {
-			return err
-		}
-
-		// Extract file - open, copy, close immediately (as recommended by bodgit/sevenzip)
-		if err := extractSevenZipFile(f, destPath); err != nil {
-			return err
-		}
-
-		extractedFiles++
-		if progressCallback != nil && totalFiles > 0 {
-			progress := int(float64(extractedFiles) / float64(totalFiles) * 100)
-			progressCallback(extractedFiles, totalFiles, progress)
-		}
-	}
-
-	return nil
-}
-
-// extractSevenZipFile extracts a single file from a 7z archive
-// This follows the bodgit/sevenzip recommended pattern of closing rc before processing the next file
-func extractSevenZipFile(f *sevenzip.File, destPath string) error {
-	rc, err := f.Open()
-	if err != nil {
-		return err
-	}
-	defer rc.Close()
-
-	outFile, err := os.OpenFile(destPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
-	if err != nil {
-		return err
-	}
-	defer outFile.Close()
-
-	_, err = io.Copy(outFile, rc)
-	return err
-}
@@ -1,199 +0,0 @@
-package download
-
-import (
-	"sync"
-)
-
-// ExtractionJob represents a single extraction job in the queue
-type ExtractionJob struct {
-	// ID is a unique identifier for this job (usually task ID or multi-part base name)
-	ID string
-	// Execute is the function that performs the actual extraction
-	Execute func()
-	// done channel is signaled when the job has been executed
-	done chan struct{}
-}
-
-// NewExtractionJob creates a new extraction job
-func NewExtractionJob(id string, execute func()) *ExtractionJob {
-	return &ExtractionJob{
-		ID:      id,
-		Execute: execute,
-		done:    make(chan struct{}),
-	}
-}
-
-// Wait blocks until the job has been executed
-func (j *ExtractionJob) Wait() {
-	<-j.done
-}
-
-// ExtractionQueue manages a queue of extraction jobs to prevent resource exhaustion
-// by ensuring only one extraction (or one multi-part archive extraction) runs at a time
-type ExtractionQueue struct {
-	mu       sync.Mutex
-	cond     *sync.Cond
-	jobs     []*ExtractionJob
-	running  bool
-	shutdown bool
-	wg       sync.WaitGroup
-}
-
-// NewExtractionQueue creates a new extraction queue
-func NewExtractionQueue() *ExtractionQueue {
-	q := &ExtractionQueue{
-		jobs: make([]*ExtractionJob, 0),
-	}
-	q.cond = sync.NewCond(&q.mu)
-	return q
-}
-
-// Start starts the queue worker that processes jobs sequentially
-func (q *ExtractionQueue) Start() {
-	q.mu.Lock()
-	if q.running {
-		q.mu.Unlock()
-		return
-	}
-	q.running = true
-	q.shutdown = false
-	q.mu.Unlock()
-
-	q.wg.Add(1)
-	go q.worker()
-}
-
-// Stop stops the queue worker gracefully
-// It waits for the current job to complete but discards pending jobs
-func (q *ExtractionQueue) Stop() {
-	q.mu.Lock()
-	if !q.running {
-		q.mu.Unlock()
-		return
-	}
-	q.shutdown = true
-	q.cond.Signal()
-	q.mu.Unlock()
-
-	q.wg.Wait()
-}
-
-// Enqueue adds a new extraction job to the queue
-// The job will be executed when its turn comes (FIFO order)
-// Returns the job so the caller can wait for completion if needed
-func (q *ExtractionQueue) Enqueue(job *ExtractionJob) *ExtractionJob {
-	q.mu.Lock()
-	defer q.mu.Unlock()
-
-	if q.shutdown {
-		// Queue is shutting down, signal done immediately without executing
-		close(job.done)
-		return job
-	}
-
-	q.jobs = append(q.jobs, job)
-	q.cond.Signal()
-	return job
-}
-
-// EnqueueAndWait adds a new extraction job to the queue and waits for it to complete
-func (q *ExtractionQueue) EnqueueAndWait(job *ExtractionJob) {
-	q.Enqueue(job)
-	job.Wait()
-}
-
-// QueueLength returns the current number of pending jobs in the queue
-func (q *ExtractionQueue) QueueLength() int {
-	q.mu.Lock()
-	defer q.mu.Unlock()
-	return len(q.jobs)
-}
-
-// IsRunning returns true if the queue worker is running
-func (q *ExtractionQueue) IsRunning() bool {
-	q.mu.Lock()
-	defer q.mu.Unlock()
-	return q.running
-}
-
-// HasPendingJob checks if there's a pending job with the given ID
-func (q *ExtractionQueue) HasPendingJob(id string) bool {
-	q.mu.Lock()
-	defer q.mu.Unlock()
-
-	for _, job := range q.jobs {
-		if job.ID == id {
-			return true
-		}
-	}
-	return false
-}
-
-// RemovePendingJob removes a pending job with the given ID from the queue
-// Returns true if a job was removed, false if not found
-// Note: This cannot remove a job that is currently being executed
-func (q *ExtractionQueue) RemovePendingJob(id string) bool {
-	q.mu.Lock()
-	defer q.mu.Unlock()
-
-	for i, job := range q.jobs {
-		if job.ID == id {
-			// Close the done channel to unblock any waiters
-			close(job.done)
-			// Remove from queue
-			q.jobs = append(q.jobs[:i], q.jobs[i+1:]...)
-			return true
-		}
-	}
-	return false
-}
-
-// worker is the main loop that processes jobs sequentially
-func (q *ExtractionQueue) worker() {
-	defer q.wg.Done()
-
-	for {
-		q.mu.Lock()
-		// Wait for a job or shutdown signal
-		for len(q.jobs) == 0 && !q.shutdown {
-			q.cond.Wait()
-		}
-
-		if q.shutdown {
-			// Close done channels for all remaining jobs
-			for _, job := range q.jobs {
-				close(job.done)
-			}
-			q.jobs = nil
-			q.running = false
-			q.mu.Unlock()
-			return
-		}
-
-		// Dequeue the first job
-		job := q.jobs[0]
-		q.jobs = q.jobs[1:]
-		q.mu.Unlock()
-
-		// Execute the job outside the lock
-		if job.Execute != nil {
-			job.Execute()
-		}
-
-		// Signal that the job is done
-		close(job.done)
-	}
-}
-
-// Global extraction queue instance
-var globalExtractionQueue *ExtractionQueue
-var extractionQueueOnce sync.Once
-
-// GetExtractionQueue returns the global extraction queue instance
-func GetExtractionQueue() *ExtractionQueue {
-	extractionQueueOnce.Do(func() {
-		globalExtractionQueue = NewExtractionQueue()
-		globalExtractionQueue.Start()
-	})
-	return globalExtractionQueue
-}
@@ -1,545 +0,0 @@
-package download
-
-import (
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-func TestNewExtractionQueue(t *testing.T) {
-	q := NewExtractionQueue()
-	if q == nil {
-		t.Fatal("NewExtractionQueue returned nil")
-	}
-	if q.jobs == nil {
-		t.Fatal("jobs slice should be initialized")
-	}
-	if len(q.jobs) != 0 {
-		t.Fatalf("expected empty jobs slice, got %d", len(q.jobs))
-	}
-	if q.running {
-		t.Fatal("queue should not be running initially")
-	}
-	if q.cond == nil {
-		t.Fatal("condition variable should be initialized")
-	}
-}
-
-func TestExtractionQueue_StartStop(t *testing.T) {
-	q := NewExtractionQueue()
-
-	// Test Start
-	q.Start()
-	if !q.IsRunning() {
-		t.Fatal("queue should be running after Start")
-	}
-
-	// Test double Start (should be idempotent)
-	q.Start()
-	if !q.IsRunning() {
-		t.Fatal("queue should still be running after second Start")
-	}
-
-	// Test Stop
-	q.Stop()
-	if q.IsRunning() {
-		t.Fatal("queue should not be running after Stop")
-	}
-
-	// Test double Stop (should be idempotent)
-	q.Stop()
-	if q.IsRunning() {
-		t.Fatal("queue should still not be running after second Stop")
-	}
-}
-
-func TestExtractionQueue_EnqueueSingleJob(t *testing.T) {
-	q := NewExtractionQueue()
-	q.Start()
-	defer q.Stop()
-
-	executed := false
-	job := NewExtractionJob("test-1", func() {
-		executed = true
-	})
-
-	q.Enqueue(job)
-	job.Wait()
-
-	if !executed {
-		t.Fatal("job should have been executed")
-	}
-}
-
-func TestExtractionQueue_EnqueueAndWait(t *testing.T) {
-	q := NewExtractionQueue()
-	q.Start()
-	defer q.Stop()
-
-	executed := false
-	job := NewExtractionJob("test-1", func() {
-		executed = true
-	})
-
-	q.EnqueueAndWait(job)
-
-	if !executed {
-		t.Fatal("job should have been executed after EnqueueAndWait returns")
-	}
-}
-
-func TestExtractionQueue_FIFOOrder(t *testing.T) {
-	q := NewExtractionQueue()
-	// Don't start yet - we want to queue multiple jobs first
-
-	var executionOrder []string
-	var mu sync.Mutex
-
-	addToOrder := func(id string) {
-		mu.Lock()
-		executionOrder = append(executionOrder, id)
-		mu.Unlock()
-	}
-
-	job1 := NewExtractionJob("job-1", func() {
-		addToOrder("job-1")
-	})
-	job2 := NewExtractionJob("job-2", func() {
-		addToOrder("job-2")
-	})
-	job3 := NewExtractionJob("job-3", func() {
-		addToOrder("job-3")
-	})
-
-	// Enqueue jobs before starting (they'll wait in queue)
-	q.mu.Lock()
-	q.jobs = append(q.jobs, job1, job2, job3)
-	q.mu.Unlock()
-
-	// Now start processing
-	q.Start()
-	defer q.Stop()
-
-	// Wait for all jobs
-	job1.Wait()
-	job2.Wait()
-	job3.Wait()
-
-	// Verify FIFO order
-	if len(executionOrder) != 3 {
-		t.Fatalf("expected 3 executions, got %d", len(executionOrder))
-	}
-	if executionOrder[0] != "job-1" || executionOrder[1] != "job-2" || executionOrder[2] != "job-3" {
-		t.Fatalf("expected FIFO order [job-1, job-2, job-3], got %v", executionOrder)
-	}
-}
-
-func TestExtractionQueue_SequentialExecution(t *testing.T) {
-	q := NewExtractionQueue()
-	q.Start()
-	defer q.Stop()
-
-	var activeJobs int32
-	var maxConcurrent int32
-	var mu sync.Mutex
-
-	// Create jobs that take some time to execute
-	createJob := func(id string) *ExtractionJob {
-		return NewExtractionJob(id, func() {
-			current := atomic.AddInt32(&activeJobs, 1)
-			mu.Lock()
-			if current > maxConcurrent {
-				maxConcurrent = current
-			}
-			mu.Unlock()
-			time.Sleep(10 * time.Millisecond)
-			atomic.AddInt32(&activeJobs, -1)
-		})
-	}
-
-	jobs := make([]*ExtractionJob, 5)
-	for i := range jobs {
-		jobs[i] = q.Enqueue(createJob(string(rune('A' + i))))
-	}
-
-	// Wait for all jobs
-	for _, job := range jobs {
-		job.Wait()
-	}
-
-	// Verify only one job ran at a time
-	if maxConcurrent > 1 {
-		t.Fatalf("expected max 1 concurrent job, got %d", maxConcurrent)
-	}
-}
-
-func TestExtractionQueue_QueueLength(t *testing.T) {
-	q := NewExtractionQueue()
-
-	if q.QueueLength() != 0 {
-		t.Fatalf("expected queue length 0, got %d", q.QueueLength())
-	}
-
-	// Add jobs without starting (they'll stay in queue)
-	blockChan := make(chan struct{})
-	blockingJob := NewExtractionJob("blocking", func() {
-		<-blockChan // Block until signaled
-	})
-
-	q.Start()
-	defer q.Stop()
-
-	q.Enqueue(blockingJob)
-
-	// Give worker time to pick up the blocking job
-	time.Sleep(20 * time.Millisecond)
-
-	// Queue more jobs while blocking job is running
-	job2 := q.Enqueue(NewExtractionJob("job-2", func() {}))
-	job3 := q.Enqueue(NewExtractionJob("job-3", func() {}))
-
-	// Should have 2 jobs waiting
-	if q.QueueLength() != 2 {
-		t.Fatalf("expected queue length 2, got %d", q.QueueLength())
-	}
-
-	// Unblock and wait
-	close(blockChan)
-	blockingJob.Wait()
-	job2.Wait()
-	job3.Wait()
-
-	if q.QueueLength() != 0 {
-		t.Fatalf("expected queue length 0 after completion, got %d", q.QueueLength())
-	}
-}
-
-func TestExtractionQueue_HasPendingJob(t *testing.T) {
-	q := NewExtractionQueue()
-
-	blockChan := make(chan struct{})
-	blockingJob := NewExtractionJob("blocking", func() {
-		<-blockChan
-	})
-
-	q.Start()
-	defer q.Stop()
-
-	q.Enqueue(blockingJob)
-	time.Sleep(20 * time.Millisecond) // Let blocking job start
-
-	// Queue more jobs
-	job2 := q.Enqueue(NewExtractionJob("job-2", func() {}))
-
-	if !q.HasPendingJob("job-2") {
-		t.Fatal("expected HasPendingJob to return true for job-2")
-	}
-
-	if q.HasPendingJob("job-99") {
-		t.Fatal("expected HasPendingJob to return false for non-existent job")
-	}
-
-	// Unblock and wait
-	close(blockChan)
-	blockingJob.Wait()
-	job2.Wait()
-
-	if q.HasPendingJob("job-2") {
-		t.Fatal("expected HasPendingJob to return false after job completion")
-	}
-}
-
-func TestExtractionQueue_RemovePendingJob(t *testing.T) {
-	q := NewExtractionQueue()
-
-	blockChan := make(chan struct{})
-	blockingJob := NewExtractionJob("blocking", func() {
-		<-blockChan
-	})
-
-	executed := false
-	job2 := NewExtractionJob("job-2", func() {
-		executed = true
-	})
-
-	q.Start()
-	defer q.Stop()
-
-	q.Enqueue(blockingJob)
-	time.Sleep(20 * time.Millisecond) // Let blocking job start
-	q.Enqueue(job2)
-
-	// Remove job-2 before it executes
-	removed := q.RemovePendingJob("job-2")
-	if !removed {
-		t.Fatal("expected RemovePendingJob to return true")
-	}
-
-	// Try to remove again (should return false)
-	removed = q.RemovePendingJob("job-2")
-	if removed {
-		t.Fatal("expected second RemovePendingJob to return false")
-	}
-
-	// Unblock
-	close(blockChan)
-	blockingJob.Wait()
-
-	// Wait a bit for any potential execution
-	time.Sleep(50 * time.Millisecond)
-
-	if executed {
-		t.Fatal("removed job should not have been executed")
-	}
-
-	// The removed job's done channel should be closed
-	select {
-	case <-job2.done:
-		// Expected
-	default:
-		t.Fatal("removed job's done channel should be closed")
-	}
-}
-
-func TestExtractionQueue_StopDiscardsPendingJobs(t *testing.T) {
-	q := NewExtractionQueue()
-
-	blockChan := make(chan struct{})
-	executed1 := false
-	executed2 := false
-
-	blockingJob := NewExtractionJob("blocking", func() {
-		<-blockChan
-		executed1 = true
-	})
-	pendingJob := NewExtractionJob("pending", func() {
-		executed2 = true
-	})
-
-	q.Start()
-
-	q.Enqueue(blockingJob)
-	time.Sleep(20 * time.Millisecond) // Let blocking job start
-	q.Enqueue(pendingJob)
-
-	// Stop without unblocking
-	go func() {
-		time.Sleep(10 * time.Millisecond)
-		close(blockChan)
-	}()
-	q.Stop()
-
-	// Blocking job should have completed, but pending job was discarded
-	if !executed1 {
-		t.Log("Note: blocking job may not complete if Stop() won races")
-	}
-	if executed2 {
-		t.Fatal("pending job should not have been executed after Stop")
-	}
-
-	// Pending job's done channel should be closed
-	select {
-	case <-pendingJob.done:
-		// Expected
-	default:
-		t.Fatal("pending job's done channel should be closed after Stop")
-	}
-}
-
-func TestExtractionQueue_EnqueueAfterShutdown(t *testing.T) {
-	q := NewExtractionQueue()
-	q.Start()
-	q.Stop()
-
-	executed := false
-	job := NewExtractionJob("after-shutdown", func() {
-		executed = true
-	})
-
-	q.Enqueue(job)
-
-	// Job should be immediately done (without execution)
-	select {
-	case <-job.done:
-		// Expected
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("job should be immediately done after shutdown")
-	}
-
-	if executed {
-		t.Fatal("job should not be executed after shutdown")
-	}
-}
-
-func TestNewExtractionJob(t *testing.T) {
-	job := NewExtractionJob("test-id", func() {})
-
-	if job.ID != "test-id" {
-		t.Fatalf("expected ID 'test-id', got '%s'", job.ID)
-	}
-	if job.Execute == nil {
-		t.Fatal("Execute should not be nil")
-	}
-	if job.done == nil {
-		t.Fatal("done channel should be initialized")
-	}
-}
-
-func TestExtractionJob_Wait(t *testing.T) {
-	job := NewExtractionJob("test", func() {})
-
-	done := make(chan struct{})
-	go func() {
-		job.Wait()
-		close(done)
-	}()
-
-	// Wait should block
-	select {
-	case <-done:
-		t.Fatal("Wait should block until job is done")
-	case <-time.After(50 * time.Millisecond):
-		// Expected
-	}
-
-	// Close done channel
-	close(job.done)
-
-	// Now Wait should return
-	select {
-	case <-done:
-		// Expected
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("Wait should return after job is done")
-	}
-}
-
-func TestExtractionQueue_NilExecuteFunction(t *testing.T) {
-	q := NewExtractionQueue()
-	q.Start()
-	defer q.Stop()
-
-	// Job with nil Execute should not panic
-	job := &ExtractionJob{
-		ID:      "nil-execute",
-		Execute: nil,
-		done:    make(chan struct{}),
-	}
-
-	q.Enqueue(job)
-	job.Wait()
-	// No panic means success
-}
-
-func TestExtractionQueue_ConcurrentEnqueue(t *testing.T) {
-	q := NewExtractionQueue()
-	q.Start()
-	defer q.Stop()
-
-	var counter int32
-	var wg sync.WaitGroup
-	numGoroutines := 10
-	jobsPerGoroutine := 10
-
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func(goroutineID int) {
-			defer wg.Done()
-			for j := 0; j < jobsPerGoroutine; j++ {
-				job := NewExtractionJob("", func() {
-					atomic.AddInt32(&counter, 1)
-				})
-				q.EnqueueAndWait(job)
-			}
-		}(i)
-	}
-
-	wg.Wait()
-
-	expected := int32(numGoroutines * jobsPerGoroutine)
-	if counter != expected {
-		t.Fatalf("expected counter %d, got %d", expected, counter)
-	}
-}
-
-func TestExtractionQueue_Restart(t *testing.T) {
-	q := NewExtractionQueue()
-
-	// First run
-	q.Start()
-	executed1 := false
-	job1 := NewExtractionJob("job-1", func() {
-		executed1 = true
-	})
-	q.EnqueueAndWait(job1)
-	q.Stop()
-
-	if !executed1 {
-		t.Fatal("first job should have been executed")
-	}
-
-	// Restart
-	q.Start()
-	executed2 := false
-	job2 := NewExtractionJob("job-2", func() {
-		executed2 = true
-	})
-	q.EnqueueAndWait(job2)
-	q.Stop()
-
-	if !executed2 {
-		t.Fatal("second job should have been executed after restart")
-	}
-}
-
-func TestGetExtractionQueue(t *testing.T) {
-	// Note: This test modifies global state, so it should ideally be run in isolation
-	// However, the implementation ensures the queue is created only once
-
-	queue := GetExtractionQueue()
-	if queue == nil {
-		t.Fatal("GetExtractionQueue should not return nil")
-	}
-	if !queue.IsRunning() {
-		t.Fatal("global queue should be running")
-	}
-
-	// Calling again should return the same instance
-	queue2 := GetExtractionQueue()
-	if queue != queue2 {
-		t.Fatal("GetExtractionQueue should return the same instance")
-	}
-}
-
-func TestExtractionQueue_LongRunningJob(t *testing.T) {
-	q := NewExtractionQueue()
-	q.Start()
-	defer q.Stop()
-
-	startTime := time.Now()
-	longJobDuration := 100 * time.Millisecond
-
-	longJob := NewExtractionJob("long-job", func() {
-		time.Sleep(longJobDuration)
-	})
-
-	shortJobExecuted := false
-	shortJob := NewExtractionJob("short-job", func() {
-		shortJobExecuted = true
-	})
-
-	q.Enqueue(longJob)
-	q.Enqueue(shortJob)
-
-	shortJob.Wait()
-
-	elapsed := time.Since(startTime)
-	if elapsed < longJobDuration {
-		t.Fatalf("short job should wait for long job, elapsed: %v", elapsed)
-	}
-
-	if !shortJobExecuted {
-		t.Fatal("short job should have been executed")
-	}
-}
@@ -1,46 +0,0 @@
-package download
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-
-	"github.com/mholt/archives"
-)
-
-// extractRarMultiPart extracts a multi-part RAR archive
-func extractRarMultiPart(firstPartPath string, destDir string, password string, progressCallback ExtractProgressCallback) error {
-	// For RAR archives, we need to use the Name field in archives.Rar
-	// to let it automatically find subsequent volumes
-
-	dir := filepath.Dir(firstPartPath)
-	fileName := filepath.Base(firstPartPath)
-
-	rar := archives.Rar{
-		Password: password,
-		Name:     fileName,
-		FS:       os.DirFS(dir),
-	}
-
-	// Create destination directory
-	if err := os.MkdirAll(destDir, 0755); err != nil {
-		return err
-	}
-
-	// Count files first for progress
-	totalFiles := 0
-	err := rar.Extract(context.Background(), nil, func(ctx context.Context, fileInfo archives.FileInfo) error {
-		if !fileInfo.IsDir() {
-			totalFiles++
-		}
-		return nil
-	})
-
-	if err != nil {
-		// If counting fails, proceed without progress
-		totalFiles = 0
-	}
-
-	// Reset and extract with progress tracking
-	return rar.Extract(context.Background(), nil, createExtractionHandler(destDir, totalFiles, progressCallback))
-}
@@ -1,191 +0,0 @@
-package download
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/mholt/archives"
-)
-
-// extractZipMultiPart extracts a multi-part ZIP archive (.zip.001, .zip.002, etc.)
-// These are created by simply splitting a ZIP file into chunks, so we concatenate them
-func extractZipMultiPart(firstPartPath string, destDir string, password string, progressCallback ExtractProgressCallback) error {
-	// Find all parts
-	parts, err := findZipMultiParts(firstPartPath)
-	if err != nil {
-		return err
-	}
-
-	// Create a multi-part reader that reads across all parts
-	multiReader := newMultiPartFileReader(parts)
-	defer multiReader.Close()
-
-	// Get total size
-	totalSize := multiReader.Size()
-
-	// Create destination directory
-	if err := os.MkdirAll(destDir, 0755); err != nil {
-		return err
-	}
-
-	// First pass: count files for progress
-	totalFiles := 0
-	zip := archives.Zip{}
-	err = zip.Extract(context.Background(), io.NewSectionReader(multiReader, 0, totalSize), func(ctx context.Context, fileInfo archives.FileInfo) error {
-		if !fileInfo.IsDir() {
-			totalFiles++
-		}
-		return nil
-	})
-	if err != nil {
-		// If counting fails, proceed without progress
-		totalFiles = 0
-	}
-
-	// Reset reader for actual extraction
-	multiReader.Close()
-	multiReader = newMultiPartFileReader(parts)
-	defer multiReader.Close()
-
-	// Second pass: extract with progress tracking
-	return zip.Extract(context.Background(), io.NewSectionReader(multiReader, 0, totalSize), createExtractionHandler(destDir, totalFiles, progressCallback))
-}
-
-// findZipMultiParts finds all parts of a multi-part ZIP archive in order
-func findZipMultiParts(firstPartPath string) ([]string, error) {
-	// Extract base name (e.g., "Archive.zip" from "Archive.zip.001")
-	dir := filepath.Dir(firstPartPath)
-	baseName := filepath.Base(firstPartPath)
-
-	// Remove the .001 suffix to get the base
-	if idx := strings.LastIndex(baseName, "."); idx > 0 {
-		baseName = baseName[:idx] // "Archive.zip"
-	}
-
-	var parts []string
-	partNum := 1
-
-	for {
-		partPath := filepath.Join(dir, baseName+fmt.Sprintf(".%03d", partNum))
-		if _, err := os.Stat(partPath); os.IsNotExist(err) {
-			break
-		}
-		parts = append(parts, partPath)
-		partNum++
-	}
-
-	if len(parts) == 0 {
-		return nil, fmt.Errorf("no parts found for %s", firstPartPath)
-	}
-
-	return parts, nil
-}
-
-// multiPartFileReader provides io.ReaderAt over multiple files concatenated
-type multiPartFileReader struct {
-	parts     []string
-	files     []*os.File
-	sizes     []int64
-	offsets   []int64 // cumulative offsets for each file
-	totalSize int64
-}
-
-func newMultiPartFileReader(parts []string) *multiPartFileReader {
-	return &multiPartFileReader{parts: parts}
-}
-
-func (m *multiPartFileReader) init() error {
-	if m.files != nil {
-		return nil
-	}
-
-	m.files = make([]*os.File, len(m.parts))
-	m.sizes = make([]int64, len(m.parts))
-	m.offsets = make([]int64, len(m.parts))
-
-	var offset int64
-	for i, part := range m.parts {
-		f, err := os.Open(part)
-		if err != nil {
-			m.Close()
-			return err
-		}
-		stat, err := f.Stat()
-		if err != nil {
-			f.Close()
-			m.Close()
-			return err
-		}
-		m.files[i] = f
-		m.sizes[i] = stat.Size()
-		m.offsets[i] = offset
-		offset += stat.Size()
-	}
-	m.totalSize = offset
-
-	return nil
-}
-
-func (m *multiPartFileReader) Size() int64 {
-	if err := m.init(); err != nil {
-		return 0
-	}
-	return m.totalSize
-}
-
-func (m *multiPartFileReader) ReadAt(p []byte, off int64) (n int, err error) {
-	if err := m.init(); err != nil {
-		return 0, err
-	}
-
-	if off >= m.totalSize {
-		return 0, io.EOF
-	}
-
-	// Find which file(s) to read from
-	for i, fileOffset := range m.offsets {
-		fileEnd := fileOffset + m.sizes[i]
-
-		if off >= fileEnd {
-			continue
-		}
-
-		// Read from this file
-		localOffset := off - fileOffset
-		toRead := len(p) - n
-		if int64(toRead) > fileEnd-off {
-			toRead = int(fileEnd - off)
-		}
-
-		read, err := m.files[i].ReadAt(p[n:n+toRead], localOffset)
-		n += read
-		off += int64(read)
-
-		if err != nil && err != io.EOF {
-			return n, err
-		}
-
-		if n >= len(p) {
-			return n, nil
-		}
-	}
-
-	if n == 0 {
-		return 0, io.EOF
-	}
-	return n, nil
-}
-
-func (m *multiPartFileReader) Close() error {
-	for _, f := range m.files {
-		if f != nil {
-			f.Close()
-		}
-	}
-	m.files = nil
-	return nil
-}
@@ -1,10 +1,6 @@
 package download

 import (
-	"encoding/json"
-	"sync"
-	"time"
-
 	"github.com/GopeedLab/gopeed/internal/controller"
 	"github.com/GopeedLab/gopeed/internal/fetcher"
 	"github.com/GopeedLab/gopeed/internal/protocol/bt"
@@ -12,6 +8,9 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/util"
 	gonanoid "github.com/matoous/go-nanoid/v2"
+	"net/url"
+	"sync"
+	"time"
 )

 type ResolveResult struct {
@@ -21,21 +20,17 @@ type ResolveResult struct {

 type Task struct {
 	ID        string               `json:"id"`
-	Protocol  string               `json:"protocol"`
 	Meta      *fetcher.FetcherMeta `json:"meta"`
 	Status    base.Status          `json:"status"`
-	Uploading bool                 `json:"uploading"`
 	Progress  *Progress            `json:"progress"`
 	CreatedAt time.Time            `json:"createdAt"`
 	UpdatedAt time.Time            `json:"updatedAt"`

-	fetcherManager fetcher.FetcherManager
+	fetcherBuilder fetcher.FetcherBuilder
 	fetcher        fetcher.Fetcher
 	timer          *util.Timer
-	statusLock     *sync.Mutex
 	lock           *sync.Mutex
 	speedArr       []int64
-	uploadSpeedArr []int64
 }

 func NewTask() *Task {
@@ -51,111 +46,55 @@ func NewTask() *Task {
 	}
 }

-// Name returns the display name of the task.
-func (t *Task) Name() string {
-	// Custom name first
-	if t.Meta.Opts.Name != "" {
-		return t.Meta.Opts.Name
-	}
-
-	// Task is not resolved, parse the name from the URL
-	if t.Meta.Res == nil {
-		fallbackName := "unknown"
-		if t.fetcherManager == nil {
-			return fallbackName
-		}
-		parseName := t.fetcherManager.ParseName(t.Meta.Req.URL)
-		if parseName == "" {
-			return fallbackName
-		}
-		return parseName
-	}
-
-	// Task is a folder
-	if t.Meta.Res.Name != "" {
-		return t.Meta.Res.Name
-	}
-
-	// Get the name of the first file
-	return t.Meta.Res.Files[0].Name
-}
-
-func (t *Task) MarshalJSON() ([]byte, error) {
-	type rawTaskType Task
-	jsonTask := struct {
-		rawTaskType
-		Name string `json:"name"`
-	}{
-		rawTaskType(*t),
-		t.Name(),
-	}
-	return json.Marshal(jsonTask)
-}
-
 func (t *Task) updateStatus(status base.Status) {
 	t.UpdatedAt = time.Now()
 	t.Status = status
 }

 func (t *Task) clone() *Task {
-	return util.DeepClone(t)
-}
-
-func (t *Task) updateSpeed(downloaded int64, usedTime float64) int64 {
-	return calcSpeed(&t.speedArr, downloaded, usedTime)
-}
-
-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:]
+	return &Task{
+		ID:        t.ID,
+		Meta:      t.Meta,
+		Status:    t.Status,
+		Progress:  t.Progress,
+		CreatedAt: t.CreatedAt,
+		UpdatedAt: t.UpdatedAt,
 	}
+}

+func (t *Task) calcSpeed(downloaded int64, usedTime float64) int64 {
+	t.speedArr = append(t.speedArr, downloaded)
+	if len(t.speedArr) > 6 {
+		t.speedArr = t.speedArr[1:]
+	}
 	var total int64
-	for _, v := range *speedArr {
+	for _, v := range t.speedArr {
 		total += v
 	}
-
-	return int64(float64(total) / float64(len(*speedArr)) / usedTime)
-}
-
-type TaskFilter struct {
-	IDs         []string
-	Statuses    []base.Status
-	NotStatuses []base.Status
-}
-
-func (f *TaskFilter) IsEmpty() bool {
-	return len(f.IDs) == 0 && len(f.Statuses) == 0 && len(f.NotStatuses) == 0
+	return int64(float64(total) / float64(len(t.speedArr)) / usedTime)
 }

 type DownloaderConfig struct {
 	Controller    *controller.Controller
-	FetchManagers []fetcher.FetcherManager
+	FetchBuilders []fetcher.FetcherBuilder

-	RefreshInterval   int // RefreshInterval time duration to refresh task progress(ms)
-	Storage           Storage
-	StorageDir        string
-	WhiteDownloadDirs []string
+	RefreshInterval int `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms)
+	Storage         Storage
+	StorageDir      string

 	ProductionMode bool

-	*base.DownloaderStoreConfig
+	*DownloaderStoreConfig
 }

 func (cfg *DownloaderConfig) Init() *DownloaderConfig {
 	if cfg.Controller == nil {
 		cfg.Controller = controller.NewController()
 	}
-	if len(cfg.FetchManagers) == 0 {
-		cfg.FetchManagers = []fetcher.FetcherManager{
-			new(http.FetcherManager),
-			new(bt.FetcherManager),
+	if len(cfg.FetchBuilders) == 0 {
+		cfg.FetchBuilders = []fetcher.FetcherBuilder{
+			new(http.FetcherBuilder),
+			new(bt.FetcherBuilder),
 		}
 	}
 	if cfg.RefreshInterval == 0 {
@@ -166,3 +105,42 @@ func (cfg *DownloaderConfig) Init() *DownloaderConfig {
 	}
 	return cfg
 }
+
+// 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
+
+	DownloadDir    string                 `json:"downloadDir"`    // DownloadDir is the default directory to save the downloaded files
+	MaxRunning     int                    `json:"maxRunning"`     // MaxRunning is the max running download count
+	ProtocolConfig map[string]any         `json:"protocolConfig"` // ProtocolConfig is special config for each protocol
+	Extra          map[string]any         `json:"extra"`
+	Proxy          *DownloaderProxyConfig `json:"proxy"`
+}
+
+func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
+	if cfg.MaxRunning == 0 {
+		cfg.MaxRunning = 5
+	}
+	if cfg.Proxy == nil {
+		cfg.Proxy = &DownloaderProxyConfig{}
+	}
+	return cfg
+}
+
+func (cfg *DownloaderStoreConfig) ProxyUrl() *url.URL {
+	if cfg.Proxy == nil {
+		return nil
+	}
+	if cfg.Proxy.Enable == false || cfg.Proxy.Scheme == "" || cfg.Proxy.Host == "" {
+		return nil
+	}
+	return util.BuildProxyUrl(cfg.Proxy.Scheme, cfg.Proxy.Host, cfg.Proxy.Usr, cfg.Proxy.Pwd)
+}
+
+type DownloaderProxyConfig struct {
+	Enable bool   `json:"enable"`
+	Scheme string `json:"scheme"`
+	Host   string `json:"host"`
+	Usr    string `json:"usr"`
+	Pwd    string `json:"pwd"`
+}
@@ -2,12 +2,11 @@ package download

 import (
 	"encoding/json"
+	"go.etcd.io/bbolt"
 	"os"
 	"path/filepath"
 	"reflect"
 	"sync"
-
-	"go.etcd.io/bbolt"
 )

 type Storage interface {
@@ -46,24 +45,22 @@ func changeValue(p any, v any) {
 	}
 }

+var memData = make(map[string]map[string]any)
+
 type MemStorage struct {
 	lock *sync.RWMutex
-	data map[string]map[string]any
 }

 func NewMemStorage() *MemStorage {
 	return &MemStorage{
 		lock: &sync.RWMutex{},
-		data: make(map[string]map[string]any),
 	}
 }

 func (n *MemStorage) Setup(buckets []string) error {
-	n.lock.Lock()
-	defer n.lock.Unlock()
 	for _, bucket := range buckets {
-		if _, ok := n.data[bucket]; !ok {
-			n.data[bucket] = make(map[string]any)
+		if _, ok := memData[bucket]; !ok {
+			memData[bucket] = make(map[string]any)
 		}
 	}
 	return nil
@@ -72,16 +69,14 @@ func (n *MemStorage) Setup(buckets []string) error {
 func (n *MemStorage) Put(bucket string, key string, v any) error {
 	n.lock.Lock()
 	defer n.lock.Unlock()
-	if bucketData, ok := n.data[bucket]; ok {
-		bucketData[key] = v
-	}
+	memData[bucket][key] = v
 	return nil
 }

 func (n *MemStorage) Get(bucket string, key string, v any) (bool, error) {
 	n.lock.RLock()
 	defer n.lock.RUnlock()
-	if dv, ok := n.data[bucket][key]; ok {
+	if dv, ok := memData[bucket][key]; ok {
 		changeValue(v, dv)
 		return true, nil
 	}
@@ -91,7 +86,7 @@ func (n *MemStorage) Get(bucket string, key string, v any) (bool, error) {
 func (n *MemStorage) List(bucket string, v any) error {
 	n.lock.RLock()
 	defer n.lock.RUnlock()
-	data := n.data[bucket]
+	data := memData[bucket]
 	list := make([]any, 0)
 	for _, v := range data {
 		list = append(list, v)
@@ -103,7 +98,7 @@ func (n *MemStorage) List(bucket string, v any) error {
 func (n *MemStorage) Pop(bucket string, key string, v any) error {
 	n.lock.Lock()
 	defer n.lock.Unlock()
-	data := n.data[bucket]
+	data := memData[bucket]
 	changeValue(v, data[key])
 	delete(data, key)
 	return nil
@@ -112,7 +107,7 @@ func (n *MemStorage) Pop(bucket string, key string, v any) error {
 func (n *MemStorage) Delete(bucket string, key string) error {
 	n.lock.Lock()
 	defer n.lock.Unlock()
-	delete(n.data[bucket], key)
+	delete(memData[bucket], key)
 	return nil
 }

@@ -123,7 +118,7 @@ func (n *MemStorage) Close() error {
 func (n *MemStorage) Clear() error {
 	n.lock.Lock()
 	defer n.lock.Unlock()
-	n.data = make(map[string]map[string]any)
+	memData = make(map[string]map[string]any)
 	return nil
 }

@@ -1,5 +0,0 @@
-gopeed.events.onDone(async function (ctx) {
-    gopeed.logger.info("url", ctx.task.meta.req.url);
-    ctx.task.meta.req.labels['modified'] = 'true';
-});
-
@@ -1,16 +0,0 @@
-{
-  "name": "on-done",
-  "title": "gopeed extension on done event test",
-  "version": "0.0.1",
-  "scripts": [
-    {
-      "event": "onDone",
-      "match": {
-        "urls": [
-          "*://github.com/*"
-        ]
-      },
-      "entry": "index.js"
-    }
-  ]
-}
@@ -2,6 +2,7 @@ gopeed.events.onError(async function (ctx) {
    gopeed.logger.info("url", ctx.task.meta.req.url);
    gopeed.logger.info("error", ctx.error);
    ctx.task.meta.req.url = "https://github.com";
+    ctx.task.pause();
    ctx.task.continue();
 });

@@ -1,229 +0,0 @@
-package download
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-const (
-	webhookTimeout = 10 * time.Second
-)
-
-// WebhookEvent represents the type of webhook event
-type WebhookEvent string
-
-const (
-	WebhookEventDownloadDone  WebhookEvent = "DOWNLOAD_DONE"
-	WebhookEventDownloadError WebhookEvent = "DOWNLOAD_ERROR"
-)
-
-// WebhookData is the data sent to webhook URLs
-type WebhookData struct {
-	Event   WebhookEvent    `json:"event"`
-	Time    int64           `json:"time"` // Unix timestamp in milliseconds
-	Payload *WebhookPayload `json:"payload"`
-}
-
-// WebhookPayload contains the task data
-type WebhookPayload struct {
-	Task *Task `json:"task"`
-}
-
-// getWebhookUrls extracts webhook URLs from config
-// Supports both new webhook config format and legacy extra field for backward compatibility
-func (d *Downloader) getWebhookUrls() []string {
-	cfg := d.cfg.DownloaderStoreConfig
-	if cfg == nil {
-		return nil
-	}
-
-	// Try new webhook config first
-	if cfg.Webhook != nil && cfg.Webhook.Enable && len(cfg.Webhook.URLs) > 0 {
-		urls := make([]string, 0, len(cfg.Webhook.URLs))
-		for _, url := range cfg.Webhook.URLs {
-			if url != "" {
-				urls = append(urls, url)
-			}
-		}
-		if len(urls) > 0 {
-			return urls
-		}
-	}
-
-	// Fall back to legacy extra field for backward compatibility
-	if cfg.Extra == nil {
-		return nil
-	}
-
-	webhookUrls, ok := cfg.Extra["webhookUrls"]
-	if !ok {
-		return nil
-	}
-
-	// Try direct string slice first
-	if urlsStr, ok := webhookUrls.([]string); ok {
-		if len(urlsStr) == 0 {
-			return nil
-		}
-		return urlsStr
-	}
-
-	// Convert []interface{} to []string
-	if urlsInterface, ok := webhookUrls.([]any); ok {
-		if len(urlsInterface) == 0 {
-			return nil
-		}
-		urls := make([]string, 0, len(urlsInterface))
-		for _, urlInterface := range urlsInterface {
-			if url, ok := urlInterface.(string); ok && url != "" {
-				urls = append(urls, url)
-			}
-		}
-		if len(urls) == 0 {
-			return nil
-		}
-		return urls
-	}
-
-	return nil
-}
-
-// sendWebhookToUrl sends webhook data to a single URL
-// Returns the HTTP status code and any error that occurred
-func (d *Downloader) sendWebhookToUrl(url string, data *WebhookData) (int, error) {
-	if url == "" {
-		return 0, fmt.Errorf("webhook URL is empty")
-	}
-
-	jsonData, err := json.Marshal(data)
-	if err != nil {
-		return 0, err
-	}
-
-	client := &http.Client{
-		Timeout: webhookTimeout,
-	}
-
-	req, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(jsonData))
-	if err != nil {
-		return 0, err
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("User-Agent", "Gopeed-Webhook/1.0")
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return 0, err
-	}
-	defer resp.Body.Close()
-
-	return resp.StatusCode, nil
-}
-
-// triggerWebhooks sends webhook notifications to all configured URLs
-func (d *Downloader) triggerWebhooks(event WebhookEvent, task *Task, err error) {
-	urls := d.getWebhookUrls()
-	if len(urls) == 0 {
-		return
-	}
-
-	data := &WebhookData{
-		Event: event,
-		Time:  time.Now().UnixMilli(),
-		Payload: &WebhookPayload{
-			Task: task.clone(),
-		},
-	}
-
-	go d.sendWebhooks(urls, data)
-}
-
-func (d *Downloader) sendWebhooks(urls []string, data *WebhookData) {
-	for _, url := range urls {
-		if url == "" {
-			continue
-		}
-		go func(webhookUrl string) {
-			statusCode, err := d.sendWebhookToUrl(webhookUrl, data)
-			if err != nil {
-				d.Logger.Warn().Err(err).Str("url", webhookUrl).Msg("webhook: failed to send request")
-				return
-			}
-			if statusCode >= 200 && statusCode < 300 {
-				d.Logger.Debug().Str("url", webhookUrl).Int("status", statusCode).Msg("webhook: sent successfully")
-			} else {
-				d.Logger.Warn().Str("url", webhookUrl).Int("status", statusCode).Msg("webhook: received non-success status")
-			}
-		}(url)
-	}
-}
-
-// SendTestWebhook sends a test webhook with a simulated payload
-// Returns error if any webhook URL does not respond with HTTP 200
-func (d *Downloader) SendTestWebhook() error {
-	urls := d.getWebhookUrls()
-	if len(urls) == 0 {
-		return nil
-	}
-
-	for _, url := range urls {
-		if url == "" {
-			continue
-		}
-		if err := d.TestWebhookUrl(url); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// TestWebhookUrl tests a single webhook URL with a simulated payload
-// Returns error if the URL does not respond with HTTP 200
-func (d *Downloader) TestWebhookUrl(url string) error {
-	// Create a simulated test task with minimal required fields
-	testTask := NewTask()
-	testTask.Protocol = "http"
-	testTask.Status = base.DownloadStatusDone
-	testTask.Meta = &fetcher.FetcherMeta{
-		Req: &base.Request{
-			URL: "https://example.com/test-file.zip",
-		},
-		Opts: &base.Options{
-			Name: "test-file.zip",
-			Path: "/downloads",
-		},
-		Res: &base.Resource{
-			Size: 1024 * 1024 * 100, // 100MB
-			Files: []*base.FileInfo{
-				{Name: "test-file.zip", Size: 1024 * 1024 * 100},
-			},
-		},
-	}
-
-	// Create test data
-	testData := &WebhookData{
-		Event: WebhookEventDownloadDone,
-		Time:  time.Now().UnixMilli(),
-		Payload: &WebhookPayload{
-			Task: testTask,
-		},
-	}
-
-	statusCode, err := d.sendWebhookToUrl(url, testData)
-	if err != nil {
-		return err
-	}
-
-	if statusCode != http.StatusOK {
-		return fmt.Errorf("webhook test failed: %s returned status %d", url, statusCode)
-	}
-
-	return nil
-}
@@ -1,827 +0,0 @@
-package download
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-var mockFetcherMeta = fetcher.FetcherMeta{
-	Req: &base.Request{
-		URL: "https://example.com/test.zip",
-	},
-	Opts: &base.Options{
-		Path: "/downloads",
-	},
-	Res: &base.Resource{
-		Size: 1024 * 1024,
-		Files: []*base.FileInfo{
-			{Name: "test.zip", Size: 1024 * 1024},
-		},
-	},
-}
-
-func TestWebhook_TriggerOnDone(t *testing.T) {
-	receivedData := make(chan *WebhookData, 1)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != http.MethodPost {
-			t.Errorf("Expected POST request, got %s", r.Method)
-		}
-		if r.Header.Get("Content-Type") != "application/json" {
-			t.Errorf("Expected Content-Type application/json, got %s", r.Header.Get("Content-Type"))
-		}
-		var data WebhookData
-		if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
-			t.Errorf("Failed to decode data: %v", err)
-			return
-		}
-		receivedData <- &data
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		// Configure webhook URLs
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{server.URL},
-		}
-		downloader.PutConfig(cfg)
-
-		// Create a mock task
-		task := NewTask()
-		task.Protocol = "http"
-		task.Meta = &mockFetcherMeta
-
-		// Trigger webhook
-		downloader.triggerWebhooks(WebhookEventDownloadDone, task, nil)
-
-		select {
-		case data := <-receivedData:
-			if data.Event != WebhookEventDownloadDone {
-				t.Errorf("Expected event 'DOWNLOAD_DONE', got '%s'", data.Event)
-			}
-			if data.Payload == nil || data.Payload.Task == nil {
-				t.Error("Expected payload.task to be present")
-			} else if data.Payload.Task.ID != task.ID {
-				t.Errorf("Expected task ID '%s', got '%s'", task.ID, data.Payload.Task.ID)
-			}
-			if data.Time == 0 {
-				t.Error("Expected time to be set")
-			}
-		case <-time.After(2 * time.Second):
-			t.Error("Timeout waiting for webhook")
-		}
-	})
-}
-
-func TestWebhook_TriggerOnError(t *testing.T) {
-	receivedData := make(chan *WebhookData, 1)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var data WebhookData
-		if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
-			t.Errorf("Failed to decode data: %v", err)
-			return
-		}
-		receivedData <- &data
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		// Configure webhook URLs
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{server.URL},
-		}
-		downloader.PutConfig(cfg)
-
-		// Create a mock task
-		task := NewTask()
-		task.Protocol = "http"
-		task.Meta = &mockFetcherMeta
-
-		// Trigger webhook with error
-		testError := http.ErrServerClosed
-		downloader.triggerWebhooks(WebhookEventDownloadError, task, testError)
-
-		select {
-		case data := <-receivedData:
-			if data.Event != WebhookEventDownloadError {
-				t.Errorf("Expected event 'DOWNLOAD_ERROR', got '%s'", data.Event)
-			}
-			if data.Payload == nil || data.Payload.Task == nil {
-				t.Error("Expected payload.task to be present")
-			}
-		case <-time.After(2 * time.Second):
-			t.Error("Timeout waiting for webhook")
-		}
-	})
-}
-
-func TestWebhook_SendTestWebhook(t *testing.T) {
-	receivedData := make(chan *WebhookData, 1)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var data WebhookData
-		if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
-			t.Errorf("Failed to decode data: %v", err)
-			return
-		}
-		receivedData <- &data
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		// Configure webhook URLs
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{server.URL},
-		}
-		downloader.PutConfig(cfg)
-
-		// Send test webhook
-		err := downloader.SendTestWebhook()
-		if err != nil {
-			t.Errorf("SendTestWebhook failed: %v", err)
-		}
-
-		select {
-		case data := <-receivedData:
-			if data.Event != WebhookEventDownloadDone {
-				t.Errorf("Expected event 'DOWNLOAD_DONE', got '%s'", data.Event)
-			}
-			if data.Payload == nil || data.Payload.Task == nil {
-				t.Error("Expected payload.task to be present")
-			}
-			if data.Time == 0 {
-				t.Error("Expected time to be set")
-			}
-		case <-time.After(2 * time.Second):
-			t.Error("Timeout waiting for webhook")
-		}
-	})
-}
-
-func TestWebhook_NoWebhookConfigured(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		// Create a mock task
-		task := NewTask()
-		task.Protocol = "http"
-		task.Meta = &mockFetcherMeta
-
-		// Trigger webhook (should not panic with no webhooks configured)
-		downloader.triggerWebhooks(WebhookEventDownloadDone, task, nil)
-
-		// Send test webhook (should not panic)
-		err := downloader.SendTestWebhook()
-		if err != nil {
-			t.Errorf("SendTestWebhook failed: %v", err)
-		}
-	})
-}
-
-func TestWebhook_MultipleUrls(t *testing.T) {
-	count := 0
-	server1 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		count++
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server1.Close()
-	server2 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		count++
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server2.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		// Configure multiple webhook URLs
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{server1.URL, server2.URL},
-		}
-		downloader.PutConfig(cfg)
-
-		// Create a mock task
-		task := NewTask()
-		task.Protocol = "http"
-		task.Meta = &mockFetcherMeta
-
-		// Trigger webhook
-		downloader.triggerWebhooks(WebhookEventDownloadDone, task, nil)
-
-		// Wait for webhooks
-		time.Sleep(500 * time.Millisecond)
-
-		if count != 2 {
-			t.Errorf("Expected 2 webhook calls, got %d", count)
-		}
-	})
-}
-
-func TestWebhook_TestWebhookFailsOnNon200(t *testing.T) {
-	// Test that SendTestWebhook returns error for non-200 status codes
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusInternalServerError) // 500
-	}))
-	defer server.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		// Configure webhook URLs
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{server.URL},
-		}
-		downloader.PutConfig(cfg)
-
-		// Send test webhook - should fail with non-200 status
-		err := downloader.SendTestWebhook()
-		if err == nil {
-			t.Error("Expected SendTestWebhook to return error for non-200 status")
-		}
-	})
-}
-
-func TestWebhook_TestWebhookFailsOn201(t *testing.T) {
-	// Test that SendTestWebhook returns error for 201 (only 200 is success)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusCreated) // 201
-	}))
-	defer server.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		// Configure webhook URLs
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{server.URL},
-		}
-		downloader.PutConfig(cfg)
-
-		// Send test webhook - should fail with 201 status (only 200 is success)
-		err := downloader.SendTestWebhook()
-		if err == nil {
-			t.Error("Expected SendTestWebhook to return error for 201 status")
-		}
-	})
-}
-
-func TestWebhook_TestWebhookUrl(t *testing.T) {
-	receivedData := make(chan *WebhookData, 1)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var data WebhookData
-		if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
-			t.Errorf("Failed to decode data: %v", err)
-			return
-		}
-		receivedData <- &data
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		// Test single URL
-		err := downloader.TestWebhookUrl(server.URL)
-		if err != nil {
-			t.Errorf("TestWebhookUrl failed: %v", err)
-		}
-
-		select {
-		case data := <-receivedData:
-			if data.Event != WebhookEventDownloadDone {
-				t.Errorf("Expected event 'DOWNLOAD_DONE', got '%s'", data.Event)
-			}
-			if data.Payload == nil || data.Payload.Task == nil {
-				t.Error("Expected payload.task to be present")
-			}
-		case <-time.After(2 * time.Second):
-			t.Error("Timeout waiting for webhook")
-		}
-	})
-}
-
-func TestWebhook_TestWebhookUrlEmpty(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		// Test with empty URL - should return error
-		err := downloader.TestWebhookUrl("")
-		if err == nil {
-			t.Error("Expected TestWebhookUrl to return error for empty URL")
-		}
-	})
-}
-
-func TestWebhook_GetWebhookUrls_EmptyConfig(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		urls := downloader.getWebhookUrls()
-		if urls != nil {
-			t.Errorf("Expected nil, got %v", urls)
-		}
-	})
-}
-
-func TestWebhook_GetWebhookUrls_NoExtraField(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = nil
-		downloader.PutConfig(cfg)
-
-		urls := downloader.getWebhookUrls()
-		if urls != nil {
-			t.Errorf("Expected nil, got %v", urls)
-		}
-	})
-}
-
-func TestWebhook_GetWebhookUrls_NoWebhookUrlsKey(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{Enable: true} // No URLs set
-		downloader.PutConfig(cfg)
-
-		urls := downloader.getWebhookUrls()
-		if urls != nil {
-			t.Errorf("Expected nil, got %v", urls)
-		}
-	})
-}
-
-func TestWebhook_GetWebhookUrls_StringSlice(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{"http://example.com", "http://example2.com"},
-		}
-		downloader.PutConfig(cfg)
-
-		urls := downloader.getWebhookUrls()
-		if len(urls) != 2 {
-			t.Errorf("Expected 2 URLs, got %d", len(urls))
-		}
-		if urls[0] != "http://example.com" || urls[1] != "http://example2.com" {
-			t.Errorf("URLs don't match expected values: %v", urls)
-		}
-	})
-}
-
-func TestWebhook_GetWebhookUrls_InterfaceSlice(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{"http://example.com", "http://example2.com"},
-		}
-		downloader.PutConfig(cfg)
-
-		urls := downloader.getWebhookUrls()
-		if len(urls) != 2 {
-			t.Errorf("Expected 2 URLs, got %d", len(urls))
-		}
-		if urls[0] != "http://example.com" || urls[1] != "http://example2.com" {
-			t.Errorf("URLs don't match expected values: %v", urls)
-		}
-	})
-}
-
-func TestWebhook_GetWebhookUrls_EmptyStringSlice(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Extra = make(map[string]any)
-		cfg.Webhook.URLs = []string{}
-		downloader.PutConfig(cfg)
-
-		urls := downloader.getWebhookUrls()
-		if urls != nil {
-			t.Errorf("Expected nil, got %v", urls)
-		}
-	})
-}
-
-func TestWebhook_GetWebhookUrls_InterfaceSliceWithEmptyStrings(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{"", "", ""},
-		}
-		downloader.PutConfig(cfg)
-
-		urls := downloader.getWebhookUrls()
-		if urls != nil {
-			t.Errorf("Expected nil for all empty strings, got %v", urls)
-		}
-	})
-}
-
-func TestWebhook_GetWebhookUrls_InterfaceSliceMixedTypes(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{"http://example.com", "", "http://example2.com", ""},
-		}
-		downloader.PutConfig(cfg)
-
-		urls := downloader.getWebhookUrls()
-		if len(urls) != 2 {
-			t.Errorf("Expected 2 valid URLs (ignoring empty strings), got %d: %v", len(urls), urls)
-		}
-		if urls[0] != "http://example.com" || urls[1] != "http://example2.com" {
-			t.Errorf("URLs don't match expected values: %v", urls)
-		}
-	})
-}
-
-func TestWebhook_GetWebhookUrls_InvalidType(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{Enable: false} // Disabled webhook
-		downloader.PutConfig(cfg)
-
-		urls := downloader.getWebhookUrls()
-		if urls != nil {
-			t.Errorf("Expected nil for disabled webhook, got %v", urls)
-		}
-	})
-}
-
-func TestWebhook_GetWebhookUrls_DisabledWebhook(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: false,
-			URLs:   []string{"http://example.com"},
-		}
-		downloader.PutConfig(cfg)
-
-		urls := downloader.getWebhookUrls()
-		if urls != nil {
-			t.Errorf("Expected nil for disabled webhook even with URLs, got %v", urls)
-		}
-	})
-}
-
-func TestWebhook_SendWebhookToUrl_Success(t *testing.T) {
-	receivedData := make(chan *WebhookData, 1)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// Verify headers
-		if r.Header.Get("Content-Type") != "application/json" {
-			t.Errorf("Expected Content-Type application/json, got %s", r.Header.Get("Content-Type"))
-		}
-		if r.Header.Get("User-Agent") != "Gopeed-Webhook/1.0" {
-			t.Errorf("Expected User-Agent Gopeed-Webhook/1.0, got %s", r.Header.Get("User-Agent"))
-		}
-
-		var data WebhookData
-		if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
-			t.Errorf("Failed to decode data: %v", err)
-			return
-		}
-		receivedData <- &data
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		task := NewTask()
-		task.Protocol = "http"
-		task.Meta = &mockFetcherMeta
-
-		data := &WebhookData{
-			Event: WebhookEventDownloadDone,
-			Time:  time.Now().UnixMilli(),
-			Payload: &WebhookPayload{
-				Task: task,
-			},
-		}
-
-		statusCode, err := downloader.sendWebhookToUrl(server.URL, data)
-		if err != nil {
-			t.Errorf("sendWebhookToUrl failed: %v", err)
-		}
-		if statusCode != http.StatusOK {
-			t.Errorf("Expected status 200, got %d", statusCode)
-		}
-
-		select {
-		case received := <-receivedData:
-			if received.Event != WebhookEventDownloadDone {
-				t.Errorf("Expected event DOWNLOAD_DONE, got %s", received.Event)
-			}
-		case <-time.After(1 * time.Second):
-			t.Error("Timeout waiting for webhook")
-		}
-	})
-}
-
-func TestWebhook_SendWebhookToUrl_EmptyUrl(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		data := &WebhookData{
-			Event: WebhookEventDownloadDone,
-			Time:  time.Now().UnixMilli(),
-		}
-
-		_, err := downloader.sendWebhookToUrl("", data)
-		if err == nil {
-			t.Error("Expected error for empty URL")
-		}
-		if err.Error() != "webhook URL is empty" {
-			t.Errorf("Expected 'webhook URL is empty' error, got: %v", err)
-		}
-	})
-}
-
-func TestWebhook_SendWebhookToUrl_InvalidUrl(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		data := &WebhookData{
-			Event: WebhookEventDownloadDone,
-			Time:  time.Now().UnixMilli(),
-		}
-
-		_, err := downloader.sendWebhookToUrl("://invalid-url", data)
-		if err == nil {
-			t.Error("Expected error for invalid URL")
-		}
-	})
-}
-
-func TestWebhook_SendWebhookToUrl_NonExistentHost(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		data := &WebhookData{
-			Event: WebhookEventDownloadDone,
-			Time:  time.Now().UnixMilli(),
-		}
-
-		_, err := downloader.sendWebhookToUrl("http://non-existent-host-12345.example", data)
-		if err == nil {
-			t.Error("Expected error for non-existent host")
-		}
-	})
-}
-
-func TestWebhook_SendWebhookToUrl_Timeout(t *testing.T) {
-	// Create a server that delays response beyond webhook timeout
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		time.Sleep(15 * time.Second) // Longer than webhookTimeout (10s)
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		data := &WebhookData{
-			Event: WebhookEventDownloadDone,
-			Time:  time.Now().UnixMilli(),
-		}
-
-		_, err := downloader.sendWebhookToUrl(server.URL, data)
-		if err == nil {
-			t.Error("Expected timeout error")
-		}
-	})
-}
-
-func TestWebhook_SendWebhookToUrl_VariousStatusCodes(t *testing.T) {
-	testCases := []struct {
-		name       string
-		statusCode int
-	}{
-		{"200 OK", http.StatusOK},
-		{"201 Created", http.StatusCreated},
-		{"204 No Content", http.StatusNoContent},
-		{"400 Bad Request", http.StatusBadRequest},
-		{"404 Not Found", http.StatusNotFound},
-		{"500 Internal Server Error", http.StatusInternalServerError},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				w.WriteHeader(tc.statusCode)
-			}))
-			defer server.Close()
-
-			setupWebhookTest(t, func(downloader *Downloader) {
-				data := &WebhookData{
-					Event: WebhookEventDownloadDone,
-					Time:  time.Now().UnixMilli(),
-				}
-
-				statusCode, err := downloader.sendWebhookToUrl(server.URL, data)
-				if err != nil {
-					t.Errorf("sendWebhookToUrl failed: %v", err)
-				}
-				if statusCode != tc.statusCode {
-					t.Errorf("Expected status %d, got %d", tc.statusCode, statusCode)
-				}
-			})
-		})
-	}
-}
-
-func TestWebhook_TriggerWebhooks_EmptyUrlSkipped(t *testing.T) {
-	requestCount := 0
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		requestCount++
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{server.URL, "", server.URL},
-		}
-		downloader.PutConfig(cfg)
-
-		task := NewTask()
-		task.Protocol = "http"
-		task.Meta = &mockFetcherMeta
-
-		downloader.triggerWebhooks(WebhookEventDownloadDone, task, nil)
-
-		time.Sleep(500 * time.Millisecond)
-
-		if requestCount != 2 {
-			t.Errorf("Expected 2 requests (empty URL should be skipped), got %d", requestCount)
-		}
-	})
-}
-
-func TestWebhook_WebhookDataStructure(t *testing.T) {
-	receivedData := make(chan *WebhookData, 1)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var data WebhookData
-		if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
-			t.Errorf("Failed to decode data: %v", err)
-			return
-		}
-		receivedData <- &data
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{server.URL},
-		}
-		downloader.PutConfig(cfg)
-
-		task := NewTask()
-		task.Protocol = "http"
-		task.Status = base.DownloadStatusDone
-		task.Meta = &mockFetcherMeta
-
-		downloader.triggerWebhooks(WebhookEventDownloadDone, task, nil)
-
-		select {
-		case data := <-receivedData:
-			// Verify event
-			if data.Event != WebhookEventDownloadDone {
-				t.Errorf("Expected event DOWNLOAD_DONE, got %s", data.Event)
-			}
-			// Verify time is set
-			if data.Time == 0 {
-				t.Error("Expected time to be set")
-			}
-			// Verify payload
-			if data.Payload == nil {
-				t.Error("Expected payload to be present")
-			}
-			if data.Payload.Task == nil {
-				t.Error("Expected task in payload to be present")
-			}
-			// Verify task is cloned (has same ID but different pointer)
-			if data.Payload.Task.ID != task.ID {
-				t.Errorf("Expected task ID %s, got %s", task.ID, data.Payload.Task.ID)
-			}
-		case <-time.After(2 * time.Second):
-			t.Error("Timeout waiting for webhook")
-		}
-	})
-}
-
-func TestWebhook_SendTestWebhook_EmptyUrls(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Extra = make(map[string]any)
-		cfg.Webhook.URLs = []string{}
-		downloader.PutConfig(cfg)
-
-		err := downloader.SendTestWebhook()
-		if err != nil {
-			t.Errorf("Expected no error for empty URLs, got: %v", err)
-		}
-	})
-}
-
-func TestWebhook_SendTestWebhook_MixedResults(t *testing.T) {
-	// First server returns 200
-	server1 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server1.Close()
-
-	// Second server returns 500
-	server2 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusInternalServerError)
-	}))
-	defer server2.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Webhook = &base.WebhookConfig{
-			Enable: true,
-			URLs:   []string{server1.URL, server2.URL},
-		}
-		downloader.PutConfig(cfg)
-
-		// Should fail because server2 returns 500
-		err := downloader.SendTestWebhook()
-		if err == nil {
-			t.Error("Expected error when one server returns non-200 status")
-		}
-	})
-}
-
-func TestWebhook_TestWebhookUrl_InvalidUrl(t *testing.T) {
-	setupWebhookTest(t, func(downloader *Downloader) {
-		err := downloader.TestWebhookUrl("://invalid")
-		if err == nil {
-			t.Error("Expected error for invalid URL")
-		}
-	})
-}
-
-func TestWebhook_TestWebhookUrl_VerifyTestPayload(t *testing.T) {
-	receivedData := make(chan *WebhookData, 1)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var data WebhookData
-		if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
-			t.Errorf("Failed to decode data: %v", err)
-			return
-		}
-		receivedData <- &data
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server.Close()
-
-	setupWebhookTest(t, func(downloader *Downloader) {
-		err := downloader.TestWebhookUrl(server.URL)
-		if err != nil {
-			t.Errorf("TestWebhookUrl failed: %v", err)
-		}
-
-		select {
-		case data := <-receivedData:
-			// Verify it's a test webhook
-			if data.Event != WebhookEventDownloadDone {
-				t.Errorf("Expected event DOWNLOAD_DONE, got %s", data.Event)
-			}
-			if data.Payload == nil || data.Payload.Task == nil {
-				t.Error("Expected payload with task")
-			}
-			// Verify test task properties
-			task := data.Payload.Task
-			if task.Protocol != "http" {
-				t.Errorf("Expected protocol 'http', got '%s'", task.Protocol)
-			}
-			if task.Status != base.DownloadStatusDone {
-				t.Errorf("Expected status Done, got %s", task.Status)
-			}
-			if task.Meta == nil || task.Meta.Req == nil {
-				t.Error("Expected meta and request in test task")
-			}
-			if task.Meta.Req.URL != "https://example.com/test-file.zip" {
-				t.Errorf("Expected test URL, got %s", task.Meta.Req.URL)
-			}
-		case <-time.After(2 * time.Second):
-			t.Error("Timeout waiting for webhook")
-		}
-	})
-}
-
-func setupWebhookTest(t *testing.T, fn func(downloader *Downloader)) {
-	defaultDownloader.Setup()
-	defaultDownloader.cfg.StorageDir = ".test_storage"
-	defaultDownloader.cfg.DownloadDir = ".test_download"
-	defer func() {
-		defaultDownloader.Clear()
-		os.RemoveAll(defaultDownloader.cfg.StorageDir)
-		os.RemoveAll(defaultDownloader.cfg.DownloadDir)
-	}()
-	fn(defaultDownloader)
-}
@@ -4,16 +4,11 @@ type ReqExtra struct {
 	Trackers []string `json:"trackers"`
 }

-// Stats for torrent
+// Stats for download
 type Stats struct {
+	// bt stats
 	// health indicators of torrents, from large to small, ConnectedSeeders are also the key to the health of seed resources
 	TotalPeers       int `json:"totalPeers"`
 	ActivePeers      int `json:"activePeers"`
 	ConnectedSeeders int `json:"connectedSeeders"`
-	// Total seed bytes
-	SeedBytes int64 `json:"seedBytes"`
-	// Seed ratio
-	SeedRatio float64 `json:"seedRatio"`
-	// Total seed time
-	SeedTime int64 `json:"seedTime"`
 }
@@ -9,28 +9,11 @@ type ReqExtra struct {
 type OptsExtra struct {
 	Connections int `json:"connections"`
 	// AutoTorrent when task download complete, and it is a .torrent file, it will be auto create a new task for the torrent file
-	// nil means use global config, true/false means explicit setting
-	AutoTorrent *bool `json:"autoTorrent"`
-	// DeleteTorrentAfterDownload when true, deletes the .torrent file after creating BT task
-	// nil means use global config, true/false means explicit setting
-	DeleteTorrentAfterDownload *bool `json:"deleteTorrentAfterDownload"`
-	// AutoExtract when task download complete, and it is an archive file, it will be auto extracted
-	// nil means use global config, true/false means explicit setting
-	AutoExtract *bool `json:"autoExtract"`
-	// ArchivePassword is the password for extracting password-protected archives
-	ArchivePassword string `json:"archivePassword"`
-	// DeleteAfterExtract when true, deletes the archive file after successful extraction
-	DeleteAfterExtract bool `json:"deleteAfterExtract"`
+	AutoTorrent bool `json:"autoTorrent"`
 }

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

 import (
-	"io"
-	"net/http"
-	"net/url"
-	"runtime"
-
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/download"
 	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"github.com/gorilla/mux"
+	"io"
+	"net/http"
+	"net/url"
 )

-func Info(w http.ResponseWriter, r *http.Request) {
-	info := map[string]any{
-		"version":  base.Version,
-		"runtime":  runtime.Version(),
-		"os":       runtime.GOOS,
-		"arch":     runtime.GOARCH,
-		"inDocker": base.InDocker == "true",
-	}
-	WriteJson(w, model.NewOkResult(info))
-}
-
 func Resolve(w http.ResponseWriter, r *http.Request) {
-	var req model.ResolveTask
+	var req base.Request
 	if ReadJson(r, w, &req) {
-		rr, err := Downloader.Resolve(req.Req, req.Opts)
+		rr, err := Downloader.Resolve(&req)
 		if err != nil {
 			WriteJson(w, model.NewErrorResult(err.Error()))
 			return
@@ -43,9 +30,9 @@ func CreateTask(w http.ResponseWriter, r *http.Request) {
 			err    error
 		)
 		if req.Rid != "" {
-			taskId, err = Downloader.Create(req.Rid)
+			taskId, err = Downloader.Create(req.Rid, req.Opt)
 		} else if req.Req != nil {
-			taskId, err = Downloader.CreateDirect(req.Req, req.Opts)
+			taskId, err = Downloader.CreateDirect(req.Req, req.Opt)
 		} else {
 			WriteJson(w, model.NewErrorResult("param invalid: rid or req", model.CodeInvalidParam))
 			return
@@ -58,44 +45,14 @@ func CreateTask(w http.ResponseWriter, r *http.Request) {
 	}
 }

-func CreateTaskBatch(w http.ResponseWriter, r *http.Request) {
-	var req base.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)
-		if err != nil {
-			WriteJson(w, model.NewErrorResult(err.Error()))
-			return
-		}
-		WriteJson(w, model.NewOkResult(taskIds))
-	}
-}
-
 func PauseTask(w http.ResponseWriter, r *http.Request) {
-	filter, errResult := parseIdFilter(r)
-	if errResult != nil {
-		WriteJson(w, errResult)
+	vars := mux.Vars(r)
+	taskId := vars["id"]
+	if taskId == "" {
+		WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
 		return
 	}
-
-	if err := Downloader.Pause(filter); err != nil {
-		WriteJson(w, model.NewErrorResult(err.Error()))
-		return
-	}
-	WriteJson(w, model.NewNilResult())
-}
-
-func PauseTasks(w http.ResponseWriter, r *http.Request) {
-	filter, errResult := parseFilter(r)
-	if errResult != nil {
-		WriteJson(w, errResult)
-		return
-	}
-
-	if err := Downloader.Pause(filter); err != nil {
+	if err := Downloader.Pause(taskId); err != nil {
 		WriteJson(w, model.NewErrorResult(err.Error()))
 		return
 	}
@@ -103,27 +60,29 @@ func PauseTasks(w http.ResponseWriter, r *http.Request) {
 }

 func ContinueTask(w http.ResponseWriter, r *http.Request) {
-	filter, errResult := parseIdFilter(r)
-	if errResult != nil {
-		WriteJson(w, errResult)
+	vars := mux.Vars(r)
+	taskId := vars["id"]
+	if taskId == "" {
+		WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
 		return
 	}
-
-	if err := Downloader.Continue(filter); err != nil {
+	if err := Downloader.Continue(taskId); err != nil {
 		WriteJson(w, model.NewErrorResult(err.Error()))
 		return
 	}
 	WriteJson(w, model.NewNilResult())
 }

-func ContinueTasks(w http.ResponseWriter, r *http.Request) {
-	filter, errResult := parseFilter(r)
-	if errResult != nil {
-		WriteJson(w, errResult)
+func PauseAllTask(w http.ResponseWriter, r *http.Request) {
+	if err := Downloader.PauseAll(); err != nil {
+		WriteJson(w, model.NewErrorResult(err.Error()))
 		return
 	}
+	WriteJson(w, model.NewNilResult())
+}

-	if err := Downloader.Continue(filter); err != nil {
+func ContinueAllTask(w http.ResponseWriter, r *http.Request) {
+	if err := Downloader.ContinueAll(); err != nil {
 		WriteJson(w, model.NewErrorResult(err.Error()))
 		return
 	}
@@ -131,29 +90,14 @@ func ContinueTasks(w http.ResponseWriter, r *http.Request) {
 }

 func DeleteTask(w http.ResponseWriter, r *http.Request) {
-	filter, errResult := parseIdFilter(r)
-	if errResult != nil {
-		WriteJson(w, errResult)
-		return
-	}
+	vars := mux.Vars(r)
+	taskId := vars["id"]
 	force := r.FormValue("force")
-
-	if err := Downloader.Delete(filter, force == "true"); err != nil {
-		WriteJson(w, model.NewErrorResult(err.Error()))
+	if taskId == "" {
+		WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
 		return
 	}
-	WriteJson(w, model.NewNilResult())
-}
-
-func DeleteTasks(w http.ResponseWriter, r *http.Request) {
-	filter, errResult := parseFilter(r)
-	if errResult != nil {
-		WriteJson(w, errResult)
-		return
-	}
-	force := r.FormValue("force")
-
-	if err := Downloader.Delete(filter, force == "true"); err != nil {
+	if err := Downloader.Delete(taskId, force == "true"); err != nil {
 		WriteJson(w, model.NewErrorResult(err.Error()))
 		return
 	}
@@ -176,14 +120,22 @@ func GetTask(w http.ResponseWriter, r *http.Request) {
 }

 func GetTasks(w http.ResponseWriter, r *http.Request) {
-	filter, errResult := parseFilter(r)
-	if errResult != nil {
-		WriteJson(w, errResult)
+	r.ParseForm()
+	status := r.Form["status"]
+	tasks := Downloader.GetTasks()
+	if len(status) == 0 {
+		WriteJson(w, model.NewOkResult(tasks))
 		return
 	}
-
-	tasks := Downloader.GetTasksByFilter(filter)
-	WriteJson(w, model.NewOkResult(tasks))
+	result := make([]*download.Task, 0)
+	for _, task := range tasks {
+		for _, s := range status {
+			if task.Status == base.Status(s) {
+				result = append(result, task)
+			}
+		}
+	}
+	WriteJson(w, model.NewOkResult(result))
 }

 func GetConfig(w http.ResponseWriter, r *http.Request) {
@@ -191,7 +143,7 @@ func GetConfig(w http.ResponseWriter, r *http.Request) {
 }

 func PutConfig(w http.ResponseWriter, r *http.Request) {
-	var cfg base.DownloaderStoreConfig
+	var cfg download.DownloaderStoreConfig
 	if ReadJson(r, w, &cfg) {
 		if err := Downloader.PutConfig(&cfg); err != nil {
 			WriteJson(w, model.NewErrorResult(err.Error()))
@@ -310,8 +262,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())
@@ -332,72 +282,12 @@ func DoProxy(w http.ResponseWriter, r *http.Request) {
 	w.Write(buf)
 }

-func GetStats(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	taskId := vars["id"]
-	if taskId == "" {
-		WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
-		return
-	}
-	statsResult, err := Downloader.Stats(taskId)
-	if err != nil {
-		writeError(w, err.Error())
-		return
-	}
-	WriteJson(w, model.NewOkResult(statsResult))
-}
-
-func parseIdFilter(r *http.Request) (*download.TaskFilter, any) {
-	vars := mux.Vars(r)
-	taskId := vars["id"]
-	if taskId == "" {
-		return nil, model.NewErrorResult("param invalid: id", model.CodeInvalidParam)
-	}
-
-	filter := &download.TaskFilter{
-		IDs: []string{taskId},
-	}
-	return filter, nil
-}
-
-func parseFilter(r *http.Request) (*download.TaskFilter, any) {
-	if err := r.ParseForm(); err != nil {
-		return nil, model.NewErrorResult(err.Error())
-	}
-
-	filter := &download.TaskFilter{
-		IDs:         r.Form["id"],
-		Statuses:    convertStatues(r.Form["status"]),
-		NotStatuses: convertStatues(r.Form["notStatus"]),
-	}
-	return filter, nil
-}
-
-func convertStatues(statues []string) []base.Status {
-	result := make([]base.Status, 0)
-	for _, status := range statues {
-		result = append(result, base.Status(status))
-	}
-	return result
-}
-
 func writeError(w http.ResponseWriter, msg string) {
 	w.WriteHeader(http.StatusInternalServerError)
 	w.Write([]byte(msg))
 }

-func getServerConfig() *base.DownloaderStoreConfig {
+func getServerConfig() *download.DownloaderStoreConfig {
 	cfg, _ := Downloader.GetConfig()
 	return cfg
 }
-
-func TestWebhook(w http.ResponseWriter, r *http.Request) {
-	var req model.TestWebhookReq
-	if ReadJson(r, w, &req) {
-		if err := Downloader.TestWebhookUrl(req.URL); err != nil {
-			WriteJson(w, model.NewErrorResult(err.Error()))
-			return
-		}
-		WriteJson(w, model.NewNilResult())
-	}
-}
@@ -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)
-	})
-}
@@ -0,0 +1,7 @@
+package model
+
+type Command struct {
+	Protocol string `json:"protocol"`
+	Action   string `json:"action"`
+	Params   any    `json:"params"`
+}
@@ -1,7 +1,7 @@
 package model

 import (
-	"github.com/GopeedLab/gopeed/pkg/base"
+	"encoding/base64"
 	"io/fs"
 )

@@ -13,20 +13,18 @@ const (
 )

 type StartConfig struct {
-	Network           string                      `json:"network"`
-	Address           string                      `json:"address"`
-	RefreshInterval   int                         `json:"refreshInterval"`
-	Storage           Storage                     `json:"storage"`
-	StorageDir        string                      `json:"storageDir"`
-	WhiteDownloadDirs []string                    `json:"whiteDownloadDirs"`
-	ApiToken          string                      `json:"apiToken"`
-	DownloadConfig    *base.DownloaderStoreConfig `json:"downloadConfig"`
+	Network         string  `json:"network"`
+	Address         string  `json:"address"`
+	RefreshInterval int     `json:"refreshInterval"`
+	Storage         Storage `json:"storage"`
+	StorageDir      string  `json:"storageDir"`
+	ApiToken        string  `json:"apiToken"`

 	ProductionMode bool

-	WebEnable bool
-	WebFS     fs.FS
-	WebAuth   *WebAuth
+	WebEnable    bool
+	WebFS        fs.FS
+	WebBasicAuth *WebBasicAuth
 }

 func (cfg *StartConfig) Init() *StartConfig {
@@ -48,7 +46,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))
+}
@@ -2,13 +2,8 @@ package model

 import "github.com/GopeedLab/gopeed/pkg/base"

-type ResolveTask struct {
-	Req  *base.Request `json:"req"`
-	Opts *base.Options `json:"opts"`
-}
 type CreateTask struct {
-	Rid string `json:"rid"`
-
-	Req  *base.Request `json:"req"`
-	Opts *base.Options `json:"opts"`
+	Rid string        `json:"rid"`
+	Req *base.Request `json:"req"`
+	Opt *base.Options `json:"opt"`
 }
@@ -1,6 +0,0 @@
-package model
-
-// TestWebhookReq is the request body for testing a single webhook URL
-type TestWebhookReq struct {
-	URL string `json:"url"`
-}
@@ -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,60 +10,42 @@ 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
+	srv *http.Server

 	Downloader *download.Downloader
 )

-func Start(startCfg *model.StartConfig) (port int, err error) {
-	// avoid repeat start
-	if srv != nil {
-		return runningPort, nil
-	}
-
-	var listener net.Listener
-	srv, listener, err = BuildServer(startCfg)
+func Start(startCfg *model.StartConfig) (int, error) {
+	srv, listener, err := BuildServer(startCfg)
 	if err != nil {
-		return
+		return 0, err
 	}

 	go func() {
-		if err := srv.Serve(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
+		if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
 			panic(err)
 		}
 	}()

+	port := 0
 	if addr, ok := listener.Addr().(*net.TCPAddr); ok {
 		port = addr.Port
-		runningPort = port
 	}
-	return
+	return port, nil
 }

 func Stop() {
-	defer func() {
-		srv = nil
-	}()
-
 	if srv != nil {
-		shutdownCtx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-		defer cancel()
-		if err := srv.Shutdown(shutdownCtx); err != nil {
+		if err := srv.Shutdown(context.TODO()); err != nil {
 			Downloader.Logger.Warn().Err(err).Msg("shutdown server failed")
 		}
 	}
@@ -85,9 +63,8 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 	startCfg.Init()

 	downloadCfg := &download.DownloaderConfig{
-		ProductionMode:    startCfg.ProductionMode,
-		RefreshInterval:   startCfg.RefreshInterval,
-		WhiteDownloadDirs: startCfg.WhiteDownloadDirs,
+		ProductionMode:  startCfg.ProductionMode,
+		RefreshInterval: startCfg.RefreshInterval,
 	}
 	if startCfg.Storage == model.StorageBolt {
 		downloadCfg.Storage = download.NewBoltStorage(startCfg.StorageDir)
@@ -105,32 +82,21 @@ 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
 	}

 	var r = mux.NewRouter()
-	r.Methods(http.MethodGet).Path("/api/v1/info").HandlerFunc(Info)
 	r.Methods(http.MethodPost).Path("/api/v1/resolve").HandlerFunc(Resolve)
 	r.Methods(http.MethodPost).Path("/api/v1/tasks").HandlerFunc(CreateTask)
-	r.Methods(http.MethodPost).Path("/api/v1/tasks/batch").HandlerFunc(CreateTaskBatch)
 	r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/pause").HandlerFunc(PauseTask)
-	r.Methods(http.MethodPut).Path("/api/v1/tasks/pause").HandlerFunc(PauseTasks)
 	r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/continue").HandlerFunc(ContinueTask)
-	r.Methods(http.MethodPut).Path("/api/v1/tasks/continue").HandlerFunc(ContinueTasks)
+	r.Methods(http.MethodPut).Path("/api/v1/tasks/pause").HandlerFunc(PauseAllTask)
+	r.Methods(http.MethodPut).Path("/api/v1/tasks/continue").HandlerFunc(ContinueAllTask)
 	r.Methods(http.MethodDelete).Path("/api/v1/tasks/{id}").HandlerFunc(DeleteTask)
-	r.Methods(http.MethodDelete).Path("/api/v1/tasks").HandlerFunc(DeleteTasks)
 	r.Methods(http.MethodGet).Path("/api/v1/tasks/{id}").HandlerFunc(GetTask)
 	r.Methods(http.MethodGet).Path("/api/v1/tasks").HandlerFunc(GetTasks)
-	r.Methods(http.MethodGet).Path("/api/v1/tasks/{id}/stats").HandlerFunc(GetStats)
 	r.Methods(http.MethodGet).Path("/api/v1/config").HandlerFunc(GetConfig)
 	r.Methods(http.MethodPut).Path("/api/v1/config").HandlerFunc(PutConfig)
 	r.Methods(http.MethodPost).Path("/api/v1/extensions").HandlerFunc(InstallExtension)
@@ -141,96 +107,28 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 	r.Methods(http.MethodDelete).Path("/api/v1/extensions/{identity}").HandlerFunc(DeleteExtension)
 	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.Methods(http.MethodPost).Path("/api/v1/webhook/test").HandlerFunc(TestWebhook)
 	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 {
-					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
-						}
-
-						writeUnauthorized(w, r)
-						return
-					}
-				}
-
-				if enableBasicAuth {
-					if !strings.HasPrefix(r.URL.Path, "/api/") || r.URL.Path == "/api/web/login" {
-						h.ServeHTTP(w, r)
-						return
-					}
-
-					token := r.Header.Get("Authorization")
-					if token == "" {
-						writeUnauthorized(w, r)
-						return
-					}
-
-					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
-					}
-
+				if startCfg.ApiToken != "" && r.Header.Get("X-Api-Token") == startCfg.ApiToken {
 					h.ServeHTTP(w, r)
 					return
 				}
-				writeUnauthorized(w, r)
+				if startCfg.WebEnable && startCfg.WebBasicAuth != nil {
+					if r.Header.Get("Authorization") == startCfg.WebBasicAuth.Authorization() {
+						h.ServeHTTP(w, r)
+						return
+					}
+					w.Header().Set("WWW-Authenticate", "Basic realm=\"gopeed web\"")
+				}
+				WriteStatusJson(w, http.StatusUnauthorized, model.NewErrorResult("unauthorized", model.CodeUnauthorized))
 			})
 		})
 	}
@@ -241,7 +139,7 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 			defer func() {
 				if v := recover(); v != nil {
 					err := errors.WithStack(fmt.Errorf("%v", v))
-					Downloader.Logger.Error().Stack().Err(err).Msgf("http server panic: %s %s", r.Method, r.RequestURI)
+					Downloader.Logger.Error().Stack().Err(err).Msg("http server panic")
 					WriteJson(w, model.NewErrorResult(err.Error(), model.CodeError))
 				}
 			}()
@@ -250,10 +148,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
 }
@@ -310,68 +207,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()))
@@ -389,47 +224,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)
-}
@@ -6,21 +6,18 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"os"
-	"path/filepath"
-	"reflect"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
 	"github.com/GopeedLab/gopeed/internal/test"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/download"
 	"github.com/GopeedLab/gopeed/pkg/rest/model"
+	"io"
+	"net"
+	"net/http"
+	"os"
+	"reflect"
+	"sync"
+	"testing"
+	"time"
 )

 var (
@@ -53,35 +50,23 @@ var (
 			"connections": 2,
 		},
 	}
-	resolveReq = &model.ResolveTask{
-		Req:  taskReq,
-		Opts: createOpts,
-	}
 	createReq = &model.CreateTask{
-		Req:  taskReq,
-		Opts: createOpts,
+		Req: taskReq,
+		Opt: createOpts,
+	}
+	createResoledReq = &model.CreateTask{
+		Req: taskReq,
+		Opt: createOpts,
 	}
 	installExtensionReq = &model.InstallExtension{
 		URL: "https://github.com/GopeedLab/gopeed-extension-samples#github-contributor-avatars-sample",
 	}
 )

-func TestInfo(t *testing.T) {
-	matchKeys := []string{"version", "runtime", "os", "arch", "inDocker"}
-	doTest(func() {
-		resp := httpRequestCheckOk[map[string]any](http.MethodGet, "/api/v1/info", nil)
-		for _, key := range matchKeys {
-			if _, ok := resp[key]; !ok {
-				t.Errorf("Info() missing key = %v", key)
-			}
-		}
-	})
-}
-
 func TestResolve(t *testing.T) {
 	doTest(func() {
-		resp := httpRequestCheckOk[*download.ResolveResult](http.MethodPost, "/api/v1/resolve", resolveReq)
-		if !test.AssertResourceEqual(taskRes, resp.Res) {
+		resp := httpRequestCheckOk[*download.ResolveResult](http.MethodPost, "/api/v1/resolve", taskReq)
+		if !test.JsonEqual(taskRes, resp.Res) {
 			t.Errorf("Resolve() got = %v, want %v", test.ToJson(resp.Res), test.ToJson(taskRes))
 		}
 	})
@@ -89,7 +74,7 @@ func TestResolve(t *testing.T) {

 func TestCreateTask(t *testing.T) {
 	doTest(func() {
-		resp := httpRequestCheckOk[*download.ResolveResult](http.MethodPost, "/api/v1/resolve", resolveReq)
+		resp := httpRequestCheckOk[*download.ResolveResult](http.MethodPost, "/api/v1/resolve", taskReq)

 		var wg sync.WaitGroup
 		wg.Add(1)
@@ -101,6 +86,7 @@ func TestCreateTask(t *testing.T) {

 		taskId := httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", &model.CreateTask{
 			Rid: resp.ID,
+			Opt: createOpts,
 		})
 		if taskId == "" {
 			t.Fatal("create task failed")
@@ -139,58 +125,26 @@ func TestCreateDirectTask(t *testing.T) {
 	})
 }

-func TestCreateDirectTaskBatch(t *testing.T) {
+func TestCreateDirectTaskWithResoled(t *testing.T) {
 	doTest(func() {
-		reqs := make([]*base.CreateTaskBatchItem, 0)
-		for i := 0; i < 5; i++ {
-			reqs = append(reqs, &base.CreateTaskBatchItem{
-				Req: createReq.Req,
-			})
-		}
-		taskIds := httpRequestCheckOk[[]string](http.MethodPost, "/api/v1/tasks/batch", &base.CreateTaskBatch{
-			Reqs: reqs,
+		var wg sync.WaitGroup
+		wg.Add(1)
+		Downloader.Listener(func(event *download.Event) {
+			if event.Key == download.EventKeyFinally {
+				wg.Done()
+			}
 		})
-		if len(taskIds) != len(reqs) {
-			t.Errorf("CreateDirectTaskBatch() got = %v, want %v", len(taskIds), len(reqs))
-		}
-	})
-}

-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))
+		taskId := httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", createResoledReq)
+		if taskId == "" {
+			t.Fatal("create task failed")
 		}

-		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")
-				}
-			}
+		wg.Wait()
+		want := test.FileMd5(test.BuildFile)
+		got := test.FileMd5(test.DownloadFile)
+		if want != got {
+			t.Errorf("CreateDirectTaskWithResoled() got = %v, want %v", got, want)
 		}
 	})
 }
@@ -216,7 +170,6 @@ func TestPauseAndContinueTask(t *testing.T) {
 		if t2.Status != base.DownloadStatusPause {
 			t.Errorf("PauseTask() got = %v, want %v", t2.Status, base.DownloadStatusPause)
 		}
-		time.Sleep(time.Millisecond * 100)
 		httpRequestCheckOk[any](http.MethodPut, "/api/v1/tasks/"+taskId+"/continue", nil)
 		t3 := httpRequestCheckOk[*download.Task](http.MethodGet, "/api/v1/tasks/"+taskId, nil)
 		if t3.Status != base.DownloadStatusRunning {
@@ -241,7 +194,6 @@ func TestPauseAllAndContinueALLTasks(t *testing.T) {

 		createAndPause := func() {
 			taskId := httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", createReq)
-			time.Sleep(time.Millisecond * 5)
 			httpRequestCheckOk[*download.Task](http.MethodPut, "/api/v1/tasks/"+taskId+"/pause", nil)
 		}

@@ -249,7 +201,6 @@ func TestPauseAllAndContinueALLTasks(t *testing.T) {
 		for i := 0; i < total; i++ {
 			createAndPause()
 		}
-		time.Sleep(time.Millisecond * 50)

 		// continue all
 		httpRequestCheckOk[any](http.MethodPut, "/api/v1/tasks/continue", nil)
@@ -291,58 +242,6 @@ func TestDeleteTaskForce(t *testing.T) {
 	})
 }

-func TestDeleteAllTasks(t *testing.T) {
-	doTest(func() {
-		taskCount := 3
-
-		var wg sync.WaitGroup
-		wg.Add(taskCount)
-		Downloader.Listener(func(event *download.Event) {
-			if event.Key == download.EventKeyFinally {
-				wg.Done()
-			}
-		})
-
-		for i := 0; i < taskCount; i++ {
-			httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", createReq)
-		}
-
-		wg.Wait()
-
-		httpRequestCheckOk[any](http.MethodDelete, "/api/v1/tasks?force=true", nil)
-		tasks := httpRequestCheckOk[[]*download.Task](http.MethodGet, "/api/v1/tasks", nil)
-		if len(tasks) != 0 {
-			t.Errorf("DeleteTasks() got = %v, want %v", len(tasks), 0)
-		}
-	})
-}
-
-func TestDeleteTasksByStatues(t *testing.T) {
-	doTest(func() {
-		taskCount := 3
-
-		var wg sync.WaitGroup
-		wg.Add(taskCount)
-		Downloader.Listener(func(event *download.Event) {
-			if event.Key == download.EventKeyFinally {
-				wg.Done()
-			}
-		})
-
-		for i := 0; i < taskCount; i++ {
-			httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", createReq)
-		}
-
-		wg.Wait()
-
-		httpRequestCheckOk[any](http.MethodDelete, fmt.Sprintf("/api/v1/tasks?status=%s&force=true", base.DownloadStatusDone), nil)
-		tasks := httpRequestCheckOk[[]*download.Task](http.MethodGet, "/api/v1/tasks", nil)
-		if len(tasks) != 0 {
-			t.Errorf("DeleteTasks() got = %v, want %v", len(tasks), 0)
-		}
-	})
-}
-
 func TestGetTasks(t *testing.T) {
 	doTest(func() {
 		var wg sync.WaitGroup
@@ -373,7 +272,7 @@ func TestGetTasks(t *testing.T) {

 func TestGetAndPutConfig(t *testing.T) {
 	doTest(func() {
-		cfg := httpRequestCheckOk[*base.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
+		cfg := httpRequestCheckOk[*download.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
 		cfg.DownloadDir = "./download"
 		cfg.Extra = map[string]any{
 			"serverConfig": &Config{
@@ -384,7 +283,7 @@ func TestGetAndPutConfig(t *testing.T) {
 		}
 		httpRequestCheckOk[any](http.MethodPut, "/api/v1/config", cfg)

-		newCfg := httpRequestCheckOk[*base.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
+		newCfg := httpRequestCheckOk[*download.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
 		if !test.JsonEqual(cfg, newCfg) {
 			t.Errorf("GetAndPutConfig() got = %v, want %v", test.ToJson(newCfg), test.ToJson(cfg))
 		}
@@ -500,66 +399,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{
@@ -585,116 +424,6 @@ func TestDoProxy(t *testing.T) {
 	})
 }

-func TestTestWebhook(t *testing.T) {
-	doTest(func() {
-		// Set up a mock webhook server
-		webhookReceived := false
-		var receivedData map[string]interface{}
-		var wg sync.WaitGroup
-		wg.Add(1)
-
-		webhookServer := http.Server{
-			Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				if r.Method != http.MethodPost {
-					w.WriteHeader(http.StatusMethodNotAllowed)
-					return
-				}
-
-				body, err := io.ReadAll(r.Body)
-				if err != nil {
-					w.WriteHeader(http.StatusBadRequest)
-					return
-				}
-
-				if err := json.Unmarshal(body, &receivedData); err != nil {
-					w.WriteHeader(http.StatusBadRequest)
-					return
-				}
-
-				// Check Content-Type
-				if r.Header.Get("Content-Type") != "application/json" {
-					t.Errorf("TestWebhook() Content-Type got = %v, want %v", r.Header.Get("Content-Type"), "application/json")
-				}
-
-				webhookReceived = true
-				w.WriteHeader(http.StatusOK)
-				wg.Done()
-			}),
-		}
-
-		// Start webhook server
-		listener, err := net.Listen("tcp", "127.0.0.1:0")
-		if err != nil {
-			t.Fatal(err)
-		}
-		webhookPort := listener.Addr().(*net.TCPAddr).Port
-		webhookURL := fmt.Sprintf("http://127.0.0.1:%d/webhook", webhookPort)
-
-		go webhookServer.Serve(listener)
-		defer webhookServer.Close()
-
-		// Test with valid webhook URL
-		httpRequestCheckOk[any](http.MethodPost, "/api/v1/webhook/test", &model.TestWebhookReq{
-			URL: webhookURL,
-		})
-
-		// Wait for webhook to be received
-		wg.Wait()
-
-		if !webhookReceived {
-			t.Error("TestWebhook() webhook was not received")
-		}
-
-		// Verify webhook data structure
-		if receivedData["event"] == nil {
-			t.Error("TestWebhook() missing 'event' field")
-		}
-		if receivedData["time"] == nil {
-			t.Error("TestWebhook() missing 'time' field")
-		}
-		if receivedData["payload"] == nil {
-			t.Error("TestWebhook() missing 'payload' field")
-		}
-
-		// Test with invalid webhook URL
-		code, _ := httpRequest[any](http.MethodPost, "/api/v1/webhook/test", &model.TestWebhookReq{
-			URL: "http://invalid-webhook-url-that-does-not-exist.local:99999/webhook",
-		})
-		checkCode(code, model.CodeError)
-
-		// Test with empty URL
-		code, _ = httpRequest[any](http.MethodPost, "/api/v1/webhook/test", &model.TestWebhookReq{
-			URL: "",
-		})
-		checkCode(code, model.CodeError)
-
-		// Test with webhook server returning non-200 status
-		wg.Add(1)
-		badWebhookServer := http.Server{
-			Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				w.WriteHeader(http.StatusBadRequest)
-				wg.Done()
-			}),
-		}
-		badListener, err := net.Listen("tcp", "127.0.0.1:0")
-		if err != nil {
-			t.Fatal(err)
-		}
-		badWebhookPort := badListener.Addr().(*net.TCPAddr).Port
-		badWebhookURL := fmt.Sprintf("http://127.0.0.1:%d/webhook", badWebhookPort)
-
-		go badWebhookServer.Serve(badListener)
-		defer badWebhookServer.Close()
-
-		code, _ = httpRequest[any](http.MethodPost, "/api/v1/webhook/test", &model.TestWebhookReq{
-			URL: badWebhookURL,
-		})
-		checkCode(code, model.CodeError)
-
-		wg.Wait()
-	})
-}
-
 func TestApiToken(t *testing.T) {
 	var cfg = &model.StartConfig{}
 	cfg.Init()
@@ -726,7 +455,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",
 	}
@@ -738,61 +467,14 @@ func TestAuthorization(t *testing.T) {
 		Stop()
 	}()

-	status, _ := doHttpRequest0(http.MethodPost, "/api/web/login", nil, &model.WebAuth{
-		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)
+	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)
 	}
@@ -803,38 +485,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 {
@@ -844,9 +503,16 @@ 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)
+			Downloader.PauseAll()
+
+			tasks := Downloader.GetTasks()
+			taskIds := make([]string, len(tasks))
+			for i, task := range tasks {
+				taskIds[i] = task.ID
+			}
+			for _, id := range taskIds {
+				Downloader.Delete(id, true)
+			}
 			os.RemoveAll(cfg.StorageDir)
 		}()
 		taskReq.URL = "http://" + fileListener.Addr().String() + "/" + test.BuildName
@@ -866,11 +532,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)
@@ -891,18 +552,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]) {
@@ -5,27 +5,14 @@ import (
 	"math"
 )

-const unknownSize = "unknown"
-
-var unitArr = []string{"B", "KB", "MB", "GB", "TB", "PB", "EB"}
+var unitArr = []string{"B", "KB", "MB", "GB", "TB", "EB"}

 func ByteFmt(size int64) string {
 	if size == 0 {
-		return unknownSize
-	}
-	// Handle negative values
-	if size < 0 {
-		return unknownSize
+		return "unknown"
 	}
 	fs := float64(size)
 	p := int(math.Log(fs) / math.Log(1024))
-	// Ensure index is within bounds
-	if p < 0 {
-		p = 0
-	}
-	if p >= len(unitArr) {
-		p = len(unitArr) - 1
-	}
 	val := fs / math.Pow(1024, float64(p))
 	_, frac := math.Modf(val)
 	if frac > 0 {
Author	SHA1	Message	Date
liwei	195dfac74b	test	2024-01-19 14:31:03 +08:00
liwei	1c1fab2002	test	2024-01-19 11:54:36 +08:00