fix: test

# Conflicts:
#	pkg/download/extension.go

.github/release-drafter.yml

@@ -1,119 +1,42 @@
-name-template: "v$NEXT_PATCH_VERSION 🌈"
+name-template: 'v$NEXT_PATCH_VERSION 🌈'
-tag-template: "v$NEXT_PATCH_VERSION"
+tag-template: 'v$NEXT_PATCH_VERSION'
 categories:
-  - title: "🆕 Features"
+  - title: '🆕 Features'
     labels:
-      - "feat"
+      - 'feat'
-      - "feature"
+      - 'feature'
-      - "enhancement"
+      - 'enhancement'
-  - title: "🐛 Bug Fixes"
+  - title: '🐛 Bug Fixes'
     labels:
-      - "fix"
+      - 'fix'
-      - "bugfix"
+      - 'bugfix'
-      - "bug"
+      - 'bug'
-  - title: "🔧 Performance Improvements"
+  - title: '🔧 Performance Improvements'
     labels:
-      - "perf"
+      - 'perf'
-  - title: "🧪 Tests"
+  - title: '🧪 Tests'
-    label: "test"
+    label: 'test'
-  - title: "🧰 Maintenance"
+  - title: '🧰 Maintenance'
-    label: "chore"
+    label: 'chore'
-  - title: "📖 Document"
+  - title: '📖 Document'
-    label: "docs"
+    label: 'docs'
-  - title: "🚀 CI/CD"
+  - title: '🚀 CI/CD'
-    label: "ci"
+    label: 'ci'
-  - title: "🌎 Internationalization"
+  - title: '🌎 Internationalization'
-    label: "translation"
+    label: 'translation'
-change-template: "- $TITLE @$AUTHOR (#$NUMBER)"
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 version-resolver:
   major:
     labels:
-      - "major"
+      - 'major'
   minor:
     labels:
-      - "minor"
+      - 'minor'
   patch:
     labels:
-      - "patch"
+      - 'patch'
   default: patch
 template: |
-  <table>
-    <thead>
-      <tr>
-        <th colspan="2">Windows</th>
-        <th>MacOS</th>
-        <th colspan="4">Linux</th>
-        <th>Android</th>
-        <th>iOS</th>
-        <th>Docker</th>
-        <th colspan="2">Qnap</th>
-        <th colspan="8">Web</th>
-      </tr>
-      <tr>
-        <td><code>EXE</code></td>
-        <td><code>Portable</code></td>
-        <td><code>DMG</code></td>
-        <td><code>Flathub</code></td>
-        <td><code>SNAP</code></td>
-        <td><code>DEB</code></td>
-        <td><code>AppImage</code></td>
-        <td><code>APK</code></td>
-        <td><code>IPA</code></td>
-        <td>-</td>
-        <td colspan="2"><code>QPKG</code></td>
-        <td colspan="3"><code>Windows</code></td>
-        <td colspan="2"><code>MacOS</code></td>
-        <td colspan="3"><code>Linux</code></td>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>amd64</td>
-        <td>amd64</td>
-        <td>-</td>
-        <td>amd64</td>
-        <td>amd64</td>
-        <td>amd64</td>
-        <td>amd64</td>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-        <td>amd64</td>
-        <td>arm64</td>
-        <td>amd64</td>
-        <td>amd64</td>
-        <td>386</td>
-        <td>amd64</td>
-        <td>amd64</td>
-        <td>amd64</td>
-        <td>amd64</td>
-        <td>386</td>
-      </tr>
-      <tr>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">Link</a></td>
-        <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">Link</a></td>
-        <td><a href="https://snapcraft.io/gopeed">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
-        <td><a href="https://hub.docker.com/r/liwei2633/gopeed">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-$version-qnap-amd64.qpkg">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-$version-qnap-arm64.qpkg">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-amd64.zip">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-arm64.zip">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-386.zip">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-macos-amd64.zip">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-macos-arm64.zip">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-amd64.zip">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-arm64.zip">Link</a></td>
-        <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-386.zip">Link</a></td>
-      </tr>
-    </tbody>
-  </table>
-
   # Release notes
 
   $CHANGES

.github/workflows/build.yml

@@ -4,17 +4,17 @@ on:
   workflow_dispatch:
     inputs:
       platform:
-        description: "Build platform"
+        description: 'Build platform'
         required: true
-        default: "all"
+        default: 'all'
       test:
-        description: "Test mode"
+        description: 'Test mode'
         required: true
         default: "false"
 
 env:
   GO_VERSION: "1.23"
-  FLUTTER_VERSION: "3.24.5"
+  FLUTTER_VERSION: "3.16.8"
 
 permissions:
   contents: write
@@ -52,7 +52,6 @@ jobs:
           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/host/host.exe github.com/GopeedLab/gopeed/cmd/host
           cd ui/flutter
           $TAG = "v$env:VERSION"
           flutter build windows
@@ -98,13 +97,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"
@@ -114,7 +111,7 @@ jobs:
           Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
           [Files]
-          Source: ".\x64\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]
@@ -151,13 +148,10 @@ jobs:
           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
+      - uses: actions/upload-artifact@v3
-      - uses: actions/upload-artifact@v4
         with:
           name: macos-arm64-lib
-          path: |
+          path: libgopeed.dylib
-            libgopeed.dylib
-            host
   build-macos:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
     runs-on: macos-13
@@ -177,7 +171,7 @@ jobs:
         run: |
           python3 -m pip install setuptools --break-system-packages
           npm install -g appdmg
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: macos-arm64-lib
           path: ui/flutter/lib-arm64
@@ -189,18 +183,12 @@ jobs:
 
           # amd64 lib
           go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/lib-amd64/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
-          go build -ldflags="-w -s" -o ui/flutter/lib-amd64/host github.com/GopeedLab/gopeed/cmd/host
           # universal binary
           mkdir -p ui/flutter/macos/Frameworks
           cp ui/flutter/lib-amd64/libgopeed.dylib ui/flutter/macos/Frameworks/amd64-lib
           cp ui/flutter/lib-arm64/libgopeed.dylib ui/flutter/macos/Frameworks/arm64-lib
-          cp ui/flutter/lib-amd64/host ui/flutter/macos/Frameworks/amd64-host
-          cp ui/flutter/lib-arm64/host ui/flutter/macos/Frameworks/arm64-host
           cd ui/flutter/macos/Frameworks
           lipo -create -output libgopeed.dylib amd64-lib arm64-lib
-          lipo -create -output host amd64-host arm64-host
-          rm -rf amd64-lib arm64-lib amd64-host arm64-host
-          mv host ../../assets/host/host
 
           cd $PROJECT_DIR/ui/flutter
           flutter build macos
@@ -225,7 +213,7 @@ jobs:
           overwrite: true
   build-linux:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'linux' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs: [ get-release ]
     steps:
       - uses: actions/checkout@v3
@@ -249,7 +237,6 @@ jobs:
           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 ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
-          go build -ldflags="-w -s" -o ui/flutter/assets/host/host github.com/GopeedLab/gopeed/cmd/host
           cd ui/flutter
           dart pub global activate -sgit https://github.com/GopeedLab/flutter_distributor.git --git-path packages/flutter_distributor
           flutter_distributor package --platform linux --targets appimage,deb
@@ -280,7 +267,6 @@ jobs:
           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 ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
-          go build -ldflags="-w -s" -o ui/flutter/assets/host/host github.com/GopeedLab/gopeed/cmd/host
           cd ui/flutter
           
           sudo snap install snapcraft --classic
@@ -294,12 +280,11 @@ jobs:
           description: High speed downloader that supports all platforms.
           
           confinement: strict
-          base: core24
+          base: core22
           grade: stable
           
-          platforms:
+          architectures:
-            amd64:
+            - build-on: amd64
-              build-on: amd64
               build-for: amd64
           
           slots:
@@ -310,14 +295,13 @@ jobs:
           
           apps:
             gopeed:
-              command-chain:
-                - bin/gpu-2404-wrapper
               command: bin/gopeed
               extensions: [gnome]
-              common-id: com.gopeed.Gopeed
               plugs:
                 - network
                 - home
+              slots:
+                - dbus-gopeed
           parts:
             flutter-git:
               source: https://github.com/flutter/flutter.git
@@ -360,29 +344,6 @@ jobs:
                 flutter build linux --release -v
                 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
           EOF
           
           cp linux/assets/com.gopeed.Gopeed.desktop snap/gui/gopeed.desktop
@@ -405,7 +366,7 @@ 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 }}
@@ -465,7 +426,7 @@ 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 ]
     steps:
@@ -482,7 +443,7 @@ jobs:
         run: |
           VERSION=${VERSION:-$(date +%y%m%d%H%M)} # Use current time as version if not specified
           cd ui/flutter
-          flutter build web --no-web-resources-cdn
+          flutter build web --web-renderer html
           cd ../../
           cp -r ui/flutter/build/web cmd/web/dist
           mkdir -p dist/zip
@@ -508,70 +469,44 @@ 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
+          sudo apt install -y pv python2 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
-
+          for f in build/*; do echo ">>> build=[${f}]"; done
-          mkdir -p ../dist/qnap
           goos=qnap
+          goarch_arr=(amd64 arm64)
           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
+            dname=gopeed-${goos}-v${VERSION}-${goarch}.qpkg
-            [[ -f build/${sname} ]] && cp -ra build/${sname} ../dist/qnap/${dname}
+            echo "sname=${sname}, dname=${dname}"
+            [[ -f build/${sname} ]] && cp -ra build/${sname} ../dist/zip/${dname}
           done
+          for f in ../dist/zip/*; do echo ">>> dist=[${f}]"; done
+          cd ..
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
           upload_url: ${{ needs.get-release.outputs.upload_url }}
-          asset_path: dist/qnap/*
+          asset_path: dist/zip/*
           overwrite: true
   build-docker:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'docker' }}
@@ -598,7 +533,7 @@ jobs:
       - name: Build flutter web
         run: |
           cd ui/flutter
-          flutter build web --no-web-resources-cdn
+          flutter build web --web-renderer html
           cd ../../
           rm -rf cmd/web/dist
           cp -r ui/flutter/build/web cmd/web/dist

.github/workflows/test.yml

@@ -28,7 +28,7 @@ on:
 
 env:
   GO_VERSION: "1.23"
-  FLUTTER_VERSION: "3.24.5"
+  FLUTTER_VERSION: "3.16.8"
 
 jobs:
   #  lint:
@@ -63,7 +63,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ windows-latest, macos-latest, ubuntu-22.04 ]
+        os: [ windows-latest, macos-latest, ubuntu-latest ]
     needs: [ test ]
     steps:
       - uses: actions/checkout@v3
@@ -73,7 +73,7 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
-      - if: runner.os == 'Windows'
+      - 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
@@ -140,7 +140,7 @@ jobs:
       - name: Build
         run: |
           cd ui/flutter
-          flutter build web --no-web-resources-cdn
+          flutter build web --web-renderer html
           cd ../../
           rm -rf cmd/web/dist
           cp -r ui/flutter/build/web cmd/web/dist
@@ -160,7 +160,7 @@ jobs:
       - name: Build
         run: |
           cd ui/flutter
-          flutter build web --no-web-resources-cdn
+          flutter build web --web-renderer html
           cd ../../
           rm -rf cmd/web/dist
           cp -r ui/flutter/build/web cmd/web/dist

README.md

@@ -24,76 +24,62 @@ Visit ✈ [Official Website](https://gopeed.com) | 📖 [Official Docs](https://
 <table>
     <thead>
         <tr>
-      <th colspan="2">Windows</th>
+            <th>Platform</th>
-      <th>MacOS</th>
+            <th>Package Type</th>
-      <th colspan="4">Linux</th>
+            <th>Download Link</th>
-      <th>Android</th>
-      <th>iOS</th>
-      <th>Docker</th>
-      <th colspan="2">Qnap</th>
-      <th colspan="8">Web</th>
-    </tr>
-    <tr>
-      <td><code>EXE</code></td>
-      <td><code>Portable</code></td>
-      <td><code>DMG</code></td>
-      <td><code>Flathub</code></td>
-      <td><code>SNAP</code></td>
-      <td><code>DEB</code></td>
-      <td><code>AppImage</code></td>
-      <td><code>APK</code></td>
-      <td><code>IPA</code></td>
-      <td>-</td>
-      <td colspan="2"><code>QPKG</code></td>
-      <td colspan="3"><code>Windows</code></td>
-      <td colspan="2"><code>MacOS</code></td>
-      <td colspan="3"><code>Linux</code></td>
         </tr>
     </thead>
     <tbody>
         <tr>
-      <td>amd64</td>
+            <td rowspan=2>Windows</td>
-      <td>amd64</td>
+            <td><code>EXE Installer</code></td>
-      <td>-</td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Link</a></td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>-</td>
-      <td>-</td>
-      <td>-</td>
-      <td>amd64</td>
-      <td>arm64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>386</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>386</td>
         </tr>
         <tr>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Link</a></td>
+            <td><code>Portable ZIP</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">Link</a></td>
+        </tr>
+        <tr>
+            <td>MacOS</td>
+            <td><code>DMG Installer</code></td>          
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">Link</a></td>
+        </tr>
+        <tr>
+            <td rowspan=4>Linux</td>
+            <td><code>Flathub</code></td>
             <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>SNAP</code></td>
             <td><a href="https://snapcraft.io/gopeed">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>DEB</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>AppImage</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">Link</a></td>
+        </tr>
+        <tr>
+            <td>Android</td>
+            <td><code>APK</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">Link</a></td>
+        </tr>
+        <tr>
+            <td>iOS</td>
+            <td><code>IPA</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
+        </tr>
+        <tr>
+            <td>Web</td>
+            <td></td>
+            <td><a href="https://github.com/GopeedLab/gopeed/releases/latest">Link</a></td>
+        </tr>
+        <tr>
+            <td>Docker</td>
+            <td></td>
             <td><a href="https://hub.docker.com/r/liwei2633/gopeed">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$version-qnap-amd64.qpkg">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$version-qnap-arm64.qpkg">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-amd64.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-arm64.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-386.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-macos-amd64.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-macos-arm64.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-amd64.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-arm64.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-386.zip">Link</a></td>
         </tr>
     </tbody>
 </table>
@@ -129,7 +115,7 @@ This project is divided into two parts, the front end uses `flutter`, the back e
 ### Environment
 
 1. Golang 1.23+
-2. Flutter 3.24+
+2. Flutter 3.16+
 
 ### Clone
 
@@ -188,7 +174,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 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

README_ja-JP.md

@@ -24,76 +24,62 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
 <table>
     <thead>
         <tr>
-      <th colspan="2">Windows</th>
+            <th>Platform</th>
-      <th>MacOS</th>
+            <th>Package Type</th>
-      <th colspan="4">Linux</th>
+            <th>Download Link</th>
-      <th>Android</th>
-      <th>iOS</th>
-      <th>Docker</th>
-      <th colspan="2">Qnap</th>
-      <th colspan="8">Web</th>
-    </tr>
-    <tr>
-      <td><code>EXE</code></td>
-      <td><code>Portable</code></td>
-      <td><code>DMG</code></td>
-      <td><code>Flathub</code></td>
-      <td><code>SNAP</code></td>
-      <td><code>DEB</code></td>
-      <td><code>AppImage</code></td>
-      <td><code>APK</code></td>
-      <td><code>IPA</code></td>
-      <td>-</td>
-      <td colspan="2"><code>QPKG</code></td>
-      <td colspan="3"><code>Windows</code></td>
-      <td colspan="2"><code>MacOS</code></td>
-      <td colspan="3"><code>Linux</code></td>
         </tr>
     </thead>
     <tbody>
         <tr>
-      <td>amd64</td>
+            <td rowspan=2>Windows</td>
-      <td>amd64</td>
+            <td><code>EXE Installer</code></td>
-      <td>-</td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Link</a></td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>-</td>
-      <td>-</td>
-      <td>-</td>
-      <td>amd64</td>
-      <td>arm64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>386</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>386</td>
         </tr>
         <tr>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Link</a></td>
+            <td><code>Portable ZIP</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">Link</a></td>
+        </tr>
+        <tr>
+            <td>MacOS</td>
+            <td><code>DMG Installer</code></td>          
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">Link</a></td>
+        </tr>
+        <tr>
+            <td rowspan=4>Linux</td>
+            <td><code>Flathub</code></td>
             <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>SNAP</code></td>
             <td><a href="https://snapcraft.io/gopeed">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>DEB</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>AppImage</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">Link</a></td>
+        </tr>
+        <tr>
+            <td>Android</td>
+            <td><code>APK</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">Link</a></td>
+        </tr>
+        <tr>
+            <td>iOS</td>
+            <td><code>IPA</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
+        </tr>
+        <tr>
+            <td>Web</td>
+            <td></td>
+            <td><a href="https://github.com/GopeedLab/gopeed/releases/latest">Link</a></td>
+        </tr>
+        <tr>
+            <td>Docker</td>
+            <td></td>
             <td><a href="https://hub.docker.com/r/liwei2633/gopeed">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$version-qnap-amd64.qpkg">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$version-qnap-arm64.qpkg">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-amd64.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-arm64.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-386.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-macos-amd64.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-macos-arm64.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-amd64.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-arm64.zip">Link</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-386.zip">Link</a></td>
         </tr>
     </tbody>
 </table>
@@ -117,7 +103,7 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
 ### 環境
 
 1. Go 言語 1.23+
-2. Flutter 3.24+
+2. Flutter 3.16+
 
 ### クローン
 
@@ -176,7 +162,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 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

README_vi-VN.md

@@ -24,76 +24,62 @@ Truy cập ✈ [Trang web chính thức](https://gopeed.com) | 📖 [Tài liệu
 <table>
     <thead>
         <tr>
-      <th colspan="2">Windows</th>
+            <th>Nền tảng</th>
-      <th>MacOS</th>
+            <th>Loại gói</th>
-      <th colspan="4">Linux</th>
+            <th>Liên kết tải xuống</th>
-      <th>Android</th>
-      <th>iOS</th>
-      <th>Docker</th>
-      <th colspan="2">Qnap</th>
-      <th colspan="8">Web</th>
-    </tr>
-    <tr>
-      <td><code>EXE</code></td>
-      <td><code>Portable</code></td>
-      <td><code>DMG</code></td>
-      <td><code>Flathub</code></td>
-      <td><code>SNAP</code></td>
-      <td><code>DEB</code></td>
-      <td><code>AppImage</code></td>
-      <td><code>APK</code></td>
-      <td><code>IPA</code></td>
-      <td>-</td>
-      <td colspan="2"><code>QPKG</code></td>
-      <td colspan="3"><code>Windows</code></td>
-      <td colspan="2"><code>MacOS</code></td>
-      <td colspan="3"><code>Linux</code></td>
         </tr>
     </thead>
     <tbody>
         <tr>
-      <td>amd64</td>
+            <td rowspan=2>Windows</td>
-      <td>amd64</td>
+            <td><code>Bộ cài đặt EXE</code></td>
-      <td>-</td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Liên kết</a></td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>-</td>
-      <td>-</td>
-      <td>-</td>
-      <td>amd64</td>
-      <td>arm64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>386</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>386</td>
         </tr>
         <tr>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Liên kết</a></td>
+            <td><code>ZIP Portable</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td>MacOS</td>
+            <td><code>Bộ cài đặt DMG</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td rowspan=4>Linux</td>
+            <td><code>Flathub</code></td>
             <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td><code>SNAP</code></td>
             <td><a href="https://snapcraft.io/gopeed">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td><code>DEB</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td><code>AppImage</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td>Android</td>
+            <td><code>APK</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td>iOS</td>
+            <td><code>IPA</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td>Web</td>
+            <td></td>
+            <td><a href="https://github.com/GopeedLab/gopeed/releases/latest">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td>Docker</td>
+            <td></td>
             <td><a href="https://hub.docker.com/r/liwei2633/gopeed">Liên kết</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$version-qnap-amd64.qpkg">Liên kết</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$version-qnap-arm64.qpkg">Liên kết</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-amd64.zip">Liên kết</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-arm64.zip">Liên kết</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-386.zip">Liên kết</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-macos-amd64.zip">Liên kết</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-macos-arm64.zip">Liên kết</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-amd64.zip">Liên kết</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-arm64.zip">Liên kết</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-386.zip">Liên kết</a></td>
         </tr>
     </tbody>
 </table>
@@ -125,7 +111,7 @@ Dự án này được chia thành hai phần, phần giao diện sử dụng `f
 ### Environment
 
 1. Golang 1.23+
-2. Flutter 3.24+
+2. Flutter 3.16+
 
 ### Clone
 
@@ -184,7 +170,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 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

README_zh-CN.md

@@ -24,76 +24,62 @@ Gopeed（全称 Go Speed），直译过来中文名叫做`够快下载器`（不
 <table>
     <thead>
         <tr>
-      <th colspan="2">Windows</th>
+            <th>运行平台</th>
-      <th>MacOS</th>
+            <th>安装包类型</th>
-      <th colspan="4">Linux</th>
+            <th>下载链接</th>
-      <th>Android</th>
-      <th>iOS</th>
-      <th>Docker</th>
-      <th colspan="2">Qnap</th>
-      <th colspan="8">Web</th>
-    </tr>
-    <tr>
-      <td><code>EXE</code></td>
-      <td><code>Portable</code></td>
-      <td><code>DMG</code></td>
-      <td><code>Flathub</code></td>
-      <td><code>SNAP</code></td>
-      <td><code>DEB</code></td>
-      <td><code>AppImage</code></td>
-      <td><code>APK</code></td>
-      <td><code>IPA</code></td>
-      <td>-</td>
-      <td colspan="2"><code>QPKG</code></td>
-      <td colspan="3"><code>Windows</code></td>
-      <td colspan="2"><code>MacOS</code></td>
-      <td colspan="3"><code>Linux</code></td>
         </tr>
     </thead>
     <tbody>
         <tr>
-      <td>amd64</td>
+            <td rowspan=2>Windows</td>
-      <td>amd64</td>
+            <td><code>EXE Installer</code></td>
-      <td>-</td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">前往</a></td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>-</td>
-      <td>-</td>
-      <td>-</td>
-      <td>amd64</td>
-      <td>arm64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>386</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>386</td>
         </tr>
         <tr>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">前往</a></td>
+            <td><code>Portable ZIP</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">前往</a></td>
+        </tr>
+        <tr>
+            <td>MacOS</td>
+            <td><code>DMG Installer</code></td>          
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">前往</a></td>
+        </tr>
+        <tr>
+            <td rowspan=4>Linux</td>
+            <td><code>Flathub</code></td>
             <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>SNAP</code></td>
             <td><a href="https://snapcraft.io/gopeed">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>DEB</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>AppImage</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">前往</a></td>
+        </tr>
+        <tr>
+            <td>Android</td>
+            <td><code>APK</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">前往</a></td>
+        </tr>
+        <tr>
+            <td>iOS</td>
+            <td><code>IPA</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">前往</a></td>
+        </tr>
+        <tr>
+            <td>Web</td>
+            <td></td>
+            <td><a href="https://github.com/GopeedLab/gopeed/releases/latest">前往</a></td>
+        </tr>
+        <tr>
+            <td>Docker</td>
+            <td></td>
             <td><a href="https://hub.docker.com/r/liwei2633/gopeed">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$version-qnap-amd64.qpkg">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$version-qnap-arm64.qpkg">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-amd64.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-arm64.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-386.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-macos-amd64.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-macos-arm64.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-amd64.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-arm64.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-386.zip">前往</a></td>
         </tr>
     </tbody>
 </table>
@@ -129,7 +115,7 @@ Gopeed 还提供了浏览器扩展用于接管浏览器下载，支持 Chrome、
 ### 环境要求
 
 1. Golang 1.23+
-2. Flutter 3.24+
+2. Flutter 3.16+
 
 ### 克隆项目
 
@@ -188,7 +174,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 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

README_zh-TW.md

@@ -24,76 +24,62 @@ Gopeed（全稱 Go Speed），是一款使用`Golang`+`Flutter`編寫的高速
 <table>
     <thead>
         <tr>
-      <th colspan="2">Windows</th>
+            <th>運行平台</th>
-      <th>MacOS</th>
+            <th>安裝包類型</th>
-      <th colspan="4">Linux</th>
+            <th>下載鏈接</th>
-      <th>Android</th>
-      <th>iOS</th>
-      <th>Docker</th>
-      <th colspan="2">Qnap</th>
-      <th colspan="8">Web</th>
-    </tr>
-    <tr>
-      <td><code>EXE</code></td>
-      <td><code>Portable</code></td>
-      <td><code>DMG</code></td>
-      <td><code>Flathub</code></td>
-      <td><code>SNAP</code></td>
-      <td><code>DEB</code></td>
-      <td><code>AppImage</code></td>
-      <td><code>APK</code></td>
-      <td><code>IPA</code></td>
-      <td>-</td>
-      <td colspan="2"><code>QPKG</code></td>
-      <td colspan="3"><code>Windows</code></td>
-      <td colspan="2"><code>MacOS</code></td>
-      <td colspan="3"><code>Linux</code></td>
         </tr>
     </thead>
     <tbody>
         <tr>
-      <td>amd64</td>
+            <td rowspan=2>Windows</td>
-      <td>amd64</td>
+            <td><code>EXE Installer</code></td>
-      <td>-</td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">前往</a></td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>-</td>
-      <td>-</td>
-      <td>-</td>
-      <td>amd64</td>
-      <td>arm64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>386</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>amd64</td>
-      <td>386</td>
         </tr>
         <tr>
-      <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">前往</a></td>
+            <td><code>Portable ZIP</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">前往</a></td>
+        </tr>
+        <tr>
+            <td>MacOS</td>
+            <td><code>DMG Installer</code></td>          
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">前往</a></td>
+        </tr>
+        <tr>
+            <td rowspan=4>Linux</td>
+            <td><code>Flathub</code></td>
             <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>SNAP</code></td>
             <td><a href="https://snapcraft.io/gopeed">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>DEB</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>AppImage</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">前往</a></td>
+        </tr>
+        <tr>
+            <td>Android</td>
+            <td><code>APK</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">前往</a></td>
+        </tr>
+        <tr>
+            <td>iOS</td>
+            <td><code>IPA</code></td>
             <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">前往</a></td>
+        </tr>
+        <tr>
+            <td>Web</td>
+            <td></td>
+            <td><a href="https://github.com/GopeedLab/gopeed/releases/latest">前往</a></td>
+        </tr>
+        <tr>
+            <td>Docker</td>
+            <td></td>
             <td><a href="https://hub.docker.com/r/liwei2633/gopeed">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$version-qnap-amd64.qpkg">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-$version-qnap-arm64.qpkg">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-amd64.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-arm64.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-windows-386.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-macos-amd64.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-macos-arm64.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-amd64.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-arm64.zip">前往</a></td>
-      <td><a href="https://gopeed.com/api/download?tpl=gopeed-web-$version-linux-386.zip">前往</a></td>
         </tr>
     </tbody>
 </table>
@@ -125,7 +111,7 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ### 開發環境
 
 1. Golang 1.23+
-2. Flutter 3.24+
+2. Flutter 3.16+
 
 ### 克隆項目
 
@@ -184,7 +170,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 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

bind/common.go

@@ -0,0 +1,41 @@
+package bind
+
+import (
+	"encoding/json"
+	"errors"
+	"github.com/GopeedLab/gopeed/pkg/api"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
+)
+
+// Global singleton instance
+var instance *api.Instance
+
+func Init(config *model.StartConfig) (err error) {
+	if instance != nil {
+		return nil
+	}
+
+	config.ProductionMode = true
+	instance, err = api.Create(config)
+	return
+}
+
+func Invoke(request *api.Request) string {
+	if instance == nil {
+		return BuildResult(errors.New("instance not initialized"))
+	}
+	return jsonEncode(api.Invoke(instance, request))
+}
+
+func BuildResult(data any) string {
+	if err, ok := data.(error); ok {
+		buf, _ := json.Marshal(model.NewErrorResult[any](err.Error()))
+		return string(buf)
+	}
+	return jsonEncode(model.NewOkResult(data))
+}
+
+func jsonEncode(data any) string {
+	buf, _ := json.Marshal(data)
+	return string(buf)
+}

bind/desktop/main.go

@@ -3,27 +3,32 @@ package main
 import "C"
 import (
 	"encoding/json"
-	"github.com/GopeedLab/gopeed/pkg/rest"
+	"github.com/GopeedLab/gopeed/bind"
-	"github.com/GopeedLab/gopeed/pkg/rest/model"
+	"github.com/GopeedLab/gopeed/pkg/api"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
 )
 
 func main() {}
 
-//export Start
+//export Init
-func Start(cfg *C.char) (int, *C.char) {
+func Init(cfg *C.char) *C.char {
 	var config model.StartConfig
 	if err := json.Unmarshal([]byte(C.GoString(cfg)), &config); err != nil {
-		return 0, C.CString(err.Error())
+		return C.CString(err.Error())
 	}
-	config.ProductionMode = true
+	if err := bind.Init(&config); err != nil {
-	realPort, err := rest.Start(&config)
+		return C.CString(err.Error())
-	if err != nil {
-		return 0, C.CString(err.Error())
-	}
-	return realPort, nil
 	}
 
-//export Stop
+	return nil
-func Stop() {
+}
-	rest.Stop()
+
+//export Invoke
+func Invoke(req *C.char) *C.char {
+	var request api.Request
+	if err := json.Unmarshal([]byte(C.GoString(req)), &request); err != nil {
+		return C.CString(bind.BuildResult(err))
+	}
+
+	return C.CString(bind.Invoke(&request))
 }

bind/mobile/main.go

@@ -3,20 +3,15 @@ package libgopeed
 // #cgo LDFLAGS: -static-libstdc++
 import "C"
 import (
-	"encoding/json"
+	"github.com/GopeedLab/gopeed/bind"
-	"github.com/GopeedLab/gopeed/pkg/rest"
+	"github.com/GopeedLab/gopeed/pkg/api"
-	"github.com/GopeedLab/gopeed/pkg/rest/model"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
 )
 
-func Start(cfg string) (int, error) {
+func Init(cfg *model.StartConfig) error {
-	var config model.StartConfig
+	return bind.Init(cfg)
-	if err := json.Unmarshal([]byte(cfg), &config); err != nil {
-		return 0, err
-	}
-	config.ProductionMode = true
-	return rest.Start(&config)
 }
 
-func Stop() {
+func Invoke(request *api.Request) string {
-	rest.Stop()
+	return bind.Invoke(request)
 }

cmd/api/main.go

@@ -2,15 +2,21 @@ package main
 
 import (
 	"github.com/GopeedLab/gopeed/cmd"
-	"github.com/GopeedLab/gopeed/pkg/rest/model"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
+	"github.com/GopeedLab/gopeed/pkg/base"
 )
 
 // only for local development
 func main() {
 	cfg := &model.StartConfig{
-		Network:   "tcp",
-		Address:   "127.0.0.1:9999",
 		Storage: model.StorageBolt,
+		DownloadConfig: &base.DownloaderStoreConfig{
+			Http: &base.DownloaderHttpConfig{
+				Enable: true,
+				Host:   "127.0.0.1",
+				Port:   9999,
+			},
+		},
 		WebEnable: true,
 	}
 	cmd.Start(cfg)

cmd/host/main.go

@@ -1,123 +0,0 @@
-package main
-
-import (
-	"encoding/binary"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-
-	"github.com/pkg/browser"
-	"github.com/shirou/gopsutil/v4/process"
-)
-
-const identifier = "gopeed"
-
-type Message struct {
-	Method string          `json:"method"`
-	Params json.RawMessage `json:"params"`
-}
-
-type Response struct {
-	Code    int    `json:"code"`
-	Data    any    `json:"data,omitempty"`
-	Message string `json:"message,omitempty"`
-}
-
-var apiMap = map[string]func(params json.RawMessage) (data any, err error){
-	"ping": func(params json.RawMessage) (data any, err error) {
-		processes, err := process.Processes()
-		if err != nil {
-			return false, err
-		}
-
-		for _, p := range processes {
-			name, err := p.Name()
-			if err != nil {
-				continue
-			}
-
-			if strings.Contains(strings.ToLower(name), strings.ToLower(identifier)) {
-				return true, nil
-			}
-		}
-		return false, nil
-	},
-	"create": func(params json.RawMessage) (data any, err error) {
-		var strParams string
-		if err = json.Unmarshal(params, &strParams); err != nil {
-			return
-		}
-		err = browser.OpenURL(fmt.Sprintf("%s:///create?params=%s", identifier, strParams))
-		return
-	},
-}
-
-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 {
-				// Connection closed by Chrome
-				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.Params)
-		} 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)
-}

cmd/server.go

@@ -3,10 +3,9 @@ package cmd
 import (
 	_ "embed"
 	"fmt"
+	"github.com/GopeedLab/gopeed/pkg/api"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
 	"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"
@@ -18,20 +17,22 @@ var banner string
 
 func Start(cfg *model.StartConfig) {
 	fmt.Println(banner)
-	srv, listener, err := rest.BuildServer(cfg)
+	instance, err := api.Create(cfg)
 	if err != nil {
 		panic(err)
 	}
-	downloadCfg, err := rest.Downloader.GetConfig()
+
-	if err != nil {
+	downloadCfgResult := instance.GetConfig()
-		panic(err)
+	if downloadCfgResult.HasError() {
+		panic(downloadCfgResult.Msg)
 	}
+	downloadCfg := downloadCfgResult.Data
 	if downloadCfg.FirstLoad {
 		// Set default download config
 		if cfg.DownloadConfig != nil {
 			cfg.DownloadConfig.Merge(downloadCfg)
 			// TODO Use PatchConfig
-			rest.Downloader.PutConfig(cfg.DownloadConfig)
+			instance.PutConfig(cfg.DownloadConfig)
 			downloadCfg = cfg.DownloadConfig
 		}
 
@@ -48,25 +49,28 @@ func Start(cfg *model.StartConfig) {
 			}
 			if downloadDir != "" {
 				downloadCfg.DownloadDir = downloadDir
-				rest.Downloader.PutConfig(downloadCfg)
+				instance.PutConfig(downloadCfg)
 			}
 		}
 	}
-	watchExit()
 
-	fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
+	watchExit(instance)
-	if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
+
+	port, start, err := api.ListenHttp(cfg.DownloadConfig.Http, instance)
+	if err != nil {
 		panic(err)
 	}
+	fmt.Printf("Server start success on http://%s:%d\n", cfg.DownloadConfig.Http.Host, port)
+	start()
 }
 
-func watchExit() {
+func watchExit(instance *api.Instance) {
 	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()
+		instance.Close()
 		os.Exit(0)
 	}()
 }

cmd/web/flags.go

@@ -10,7 +10,7 @@ import (
 )
 
 type args struct {
-	Address    *string `json:"address"`
+	Host       *string `json:"host"`
 	Port       *int    `json:"port"`
 	Username   *string `json:"username"`
 	Password   *string `json:"password"`
@@ -24,7 +24,7 @@ type args struct {
 
 func parse() *args {
 	var cliArgs args
-	cliArgs.Address = flag.String("A", "0.0.0.0", "Bind Address")
+	cliArgs.Host = flag.String("H", "0.0.0.0", "Bind Host")
 	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")
@@ -35,8 +35,8 @@ func parse() *args {
 
 	// args priority: config file > cli args
 	cfgArgs := loadConfig(*cliArgs.configPath)
-	if cfgArgs.Address == nil {
+	if cfgArgs.Host == nil {
-		cfgArgs.Address = cliArgs.Address
+		cfgArgs.Host = cliArgs.Host
 	}
 	if cfgArgs.Port == nil {
 		cfgArgs.Port = cliArgs.Port

cmd/web/main.go

@@ -5,9 +5,9 @@ package main
 
 import (
 	"embed"
-	"fmt"
 	"github.com/GopeedLab/gopeed/cmd"
-	"github.com/GopeedLab/gopeed/pkg/rest/model"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
+	"github.com/GopeedLab/gopeed/pkg/base"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -42,12 +42,19 @@ func main() {
 		dir = filepath.Dir(exe)
 	}
 
+	if args.DownloadConfig == nil {
+		args.DownloadConfig = &base.DownloaderStoreConfig{}
+	}
+	args.DownloadConfig.Http = &base.DownloaderHttpConfig{
+		Enable:   true,
+		Host:     *args.Host,
+		Port:     *args.Port,
+		ApiToken: *args.ApiToken,
+	}
+
 	cfg := &model.StartConfig{
-		Network:        "tcp",
-		Address:        fmt.Sprintf("%s:%d", *args.Address, *args.Port),
 		Storage:        model.StorageBolt,
 		StorageDir:     filepath.Join(dir, "storage"),
-		ApiToken:       *args.ApiToken,
 		DownloadConfig: args.DownloadConfig,
 		ProductionMode: true,
 		WebEnable:      true,

go.mod

@@ -24,16 +24,6 @@ require (
 	golang.org/x/sync v0.9.0
 )
 
-require (
-	github.com/ebitengine/purego v0.8.1 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
-	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
-	github.com/tklauser/go-sysconf v0.3.12 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
-	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-)
-
 require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
@@ -109,11 +99,9 @@ require (
 	github.com/pion/turn/v4 v4.0.0 // indirect
 	github.com/pion/webrtc/v4 v4.0.2 // 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/sergi/go-diff v1.1.0 // indirect
-	github.com/shirou/gopsutil/v4 v4.24.12
 	github.com/skeema/knownhosts v1.2.0 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/tidwall/btree v1.7.0 // indirect
@@ -125,7 +113,7 @@ require (
 	golang.org/x/crypto v0.29.0 // indirect
 	golang.org/x/mod v0.22.0 // indirect
 	golang.org/x/net v0.31.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
 	golang.org/x/text v0.20.0 // indirect
 	golang.org/x/time v0.8.0 // indirect
 	golang.org/x/tools v0.27.0 // indirect

go.sum

@@ -143,8 +143,6 @@ github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+m
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
-github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/edsrzf/mmap-go v1.2.0 h1:hXLYlkbaPzt1SaQk+anYwKSRNhufIDCchSPkUD6dD84=
 github.com/edsrzf/mmap-go v1.2.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
 github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819 h1:RIB4cRk+lBqKK3Oy0r2gRX4ui7tuhiZq2SuTtTCi0/0=
@@ -189,8 +187,6 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
-github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
 github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
 github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q=
@@ -292,8 +288,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c h1:VtwQ41oftZwlMnOEbMWQtSEUgU64U4s+GHk7hZK+jtY=
-github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE=
 github.com/matoous/go-nanoid v1.5.0/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U=
 github.com/matoous/go-nanoid/v2 v2.0.0 h1:d19kur2QuLeHmJBkvYkFdhFBzLoo1XVm2GgTpL+9Tj0=
 github.com/matoous/go-nanoid/v2 v2.0.0/go.mod h1:FtS4aGPVfEkxKxhdWPAspZpZSh1cOjtM7Ej/So3hR0g=
@@ -369,8 +363,6 @@ github.com/pion/webrtc/v4 v4.0.2 h1:fBwm5/hqSUybrCWl0DDBSTDrpbkcgkqpeLmXw9CsBQA=
 github.com/pion/webrtc/v4 v4.0.2/go.mod h1:moylBT2A4dNoEaYBCdV1nThM3TLwRHzWszIG+eSPaqQ=
 github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
 github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -378,8 +370,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
-github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -422,8 +412,6 @@ github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a
 github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-github.com/shirou/gopsutil/v4 v4.24.12 h1:qvePBOk20e0IKA1QXrIIU+jmk+zEiYVVx06WjBRlZo4=
-github.com/shirou/gopsutil/v4 v4.24.12/go.mod h1:DCtMPAad2XceTeIAbGyVfycbYQNBGk2P8cvDi7/VN9o=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
@@ -459,10 +447,6 @@ github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EU
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
-github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
-github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
-github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
-github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
 github.com/willf/bitset v1.1.9/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU=
@@ -474,8 +458,6 @@ github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad/go.mod h1:Jj8p9bgK
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
-github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0=
 go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
@@ -561,7 +543,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -571,7 +552,6 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -582,18 +562,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
 golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=

internal/protocol/bt/fetcher.go

@@ -11,9 +11,7 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/util"
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/metainfo"
-	"io"
 	"net/url"
-	"os"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -334,7 +332,7 @@ func (f *Fetcher) doUpload(fromUpload bool) {
 	}
 }
 
-// Get torrent stats maybe panic, see https://github.com/anacrolix/torrent/issues/972
+// 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 {
@@ -361,34 +359,17 @@ func (f *Fetcher) addTorrent(req *base.Request, fromUpload bool) (err error) {
 	schema := util.ParseSchema(req.URL)
 	if schema == "MAGNET" {
 		f.torrent, err = client.AddMagnet(req.URL)
-	} 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)
+		buf := bytes.NewBuffer(data)
-		} else {
-			reader, err = os.Open(req.URL)
-			if err != nil {
-				return
-			}
-			defer reader.(io.Closer).Close()
-		}
-
 		var metaInfo *metainfo.MetaInfo
-		metaInfo, err = metainfo.Load(reader)
+		metaInfo, err = metainfo.Load(buf)
-		// Hotfix for https://github.com/anacrolix/torrent/issues/992, ignore "expected EOF" error
+		if err != nil {
-		// TODO remove this after the issue is fixed
-		if err != nil && !strings.Contains(err.Error(), "expected EOF") {
 			return err
 		}
 		f.torrent, err = client.AddTorrent(metaInfo)
+	} else {
+		f.torrent, err = client.AddTorrentFromFile(req.URL)
 	}
 	if err != nil {
 		return

internal/protocol/bt/fetcher_test.go

@@ -11,7 +11,6 @@ import (
 	gohttp "net/http"
 	"net/url"
 	"os"
-	"path/filepath"
 	"reflect"
 	"testing"
 )
@@ -97,7 +96,7 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 			Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
 		}
 		if !reflect.DeepEqual(want, fetcher.Meta().Res) {
-			t.Errorf("Resolve Single File Resolve() got = %v, want %v", fetcher.Meta().Res, want)
+			t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, want)
 		}
 	})
 
@@ -137,29 +136,10 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 			Hash: "ccbc92b0cd8deec16a2ef4be242a8c9243b1cedb",
 		}
 		if !reflect.DeepEqual(want, fetcher.Meta().Res) {
-			t.Errorf("Resolve Multi Files Resolve() got = %v, want %v", fetcher.Meta().Res, want)
+			t.Errorf("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",
-		})
-		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,
-		})
-		if err != nil {
-			t.Errorf("Resolve file scheme Torrent Resolve() got = %v, want nil", err)
-		}
-	})
 }
 
 func TestFetcherManager_ParseName(t *testing.T) {

internal/protocol/http/fetcher.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"io"
 	"mime"
-	"net"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
@@ -26,9 +25,6 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
-const connectTimeout = 15 * time.Second
-const readTimeout = 15 * time.Second
-
 type RequestError struct {
 	Code int
 	Msg  string
@@ -107,9 +103,9 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 	if base.HttpCodePartialContent == httpResp.StatusCode || (base.HttpCodeOK == httpResp.StatusCode && httpResp.Header.Get(base.HttpHeaderAcceptRanges) == base.HttpHeaderBytes && strings.HasPrefix(httpResp.Header.Get(base.HttpHeaderContentRange), base.HttpHeaderBytes)) {
 		// response 206 status code, support breakpoint continuation
 		res.Range = true
-		// parse content length from Content-Range header, eg: bytes 0-1000/1001 or bytes 0-0/*
+		// 解析资源大小: bytes 0-1000/1001 => 1001
 		contentTotal := path.Base(httpResp.Header.Get(base.HttpHeaderContentRange))
-		if contentTotal != "" && contentTotal != "*" {
+		if contentTotal != "" {
 			parse, err := strconv.ParseInt(contentTotal, 10, 64)
 			if err != nil {
 				return err
@@ -254,42 +250,23 @@ func (f *Fetcher) Wait() (err error) {
 	return <-f.doneCh
 }
 
-type fetchResult struct {
-	err error
-}
-
 func (f *Fetcher) fetch() {
 	var ctx context.Context
 	ctx, f.cancel = context.WithCancel(context.Background())
 	f.eg, _ = errgroup.WithContext(ctx)
-	chunkErrs := make([]error, len(f.chunks))
 	for i := 0; i < len(f.chunks); i++ {
 		i := i
 		f.eg.Go(func() error {
-			err := f.fetchChunk(i, ctx)
+			return f.fetchChunk(i, ctx)
-			// if canceled, fail fast
-			if errors.Is(err, context.Canceled) {
-				return err
-			}
-			chunkErrs[i] = err
-			return nil
 		})
 	}
 
 	go func() {
 		err := f.eg.Wait()
-		// error returned only if canceled, just return
+		// check if canceled
-		if err != nil {
+		if errors.Is(err, context.Canceled) {
 			return
 		}
-		// check all fetch results, if any error, return
-		for _, chunkErr := range chunkErrs {
-			if chunkErr != nil {
-				err = chunkErr
-				break
-			}
-		}
-
 		f.file.Close()
 		// Update file last modified time
 		if f.config.UseServerCtime && f.meta.Res.Files[0].Ctime != nil {
@@ -312,12 +289,25 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
 	for {
 		// if chunk is completed, return
 		if f.meta.Res.Range && chunk.Downloaded >= chunk.End-chunk.Begin+1 {
-			return nil
+			return
 		}
 
 		if chunk.retryTimes >= maxRetries {
+			if !f.meta.Res.Range {
 				return
 			}
+			// check if all failed
+			allFailed := true
+			for _, c := range f.chunks {
+				if chunk.Downloaded < chunk.End-chunk.Begin+1 && c.retryTimes < maxRetries {
+					allFailed = false
+					break
+				}
+			}
+			if allFailed {
+				return
+			}
+		}
 
 		var (
 			httpReq *http.Request
@@ -343,9 +333,10 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
 				err = NewRequestError(resp.StatusCode, resp.Status)
 				return err
 			}
-			reader := NewTimeoutReader(resp.Body, readTimeout)
+			// Http request success, reset retry times
+			chunk.retryTimes = 0
 			for {
-				n, err := reader.Read(buf)
+				n, err := resp.Body.Read(buf)
 				if n > 0 {
 					_, err := f.file.WriteAt(buf[:n], chunk.Begin+chunk.Downloaded)
 					if err != nil {
@@ -360,6 +351,7 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
 					return err
 				}
 			}
+			return nil
 		}()
 		if err != nil {
 			// If canceled, do not retry
@@ -427,10 +419,6 @@ func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq
 		return
 	}
 	httpReq.Header = headers
-	// Override Host header
-	if host := headers.Get(base.HttpHeaderHost); host != "" {
-		httpReq.Host = host
-	}
 	return httpReq, nil
 }
 
@@ -464,9 +452,6 @@ func (f *Fetcher) splitChunk() (chunks []*chunk) {
 
 func (f *Fetcher) buildClient() *http.Client {
 	transport := &http.Transport{
-		DialContext: (&net.Dialer{
-			Timeout: connectTimeout,
-		}).DialContext,
 		Proxy: f.ctl.GetProxy(f.meta.Req.Proxy),
 		TLSClientConfig: &tls.Config{
 			InsecureSkipVerify: f.meta.Req.SkipVerifyCert,
@@ -514,7 +499,7 @@ func (fm *FetcherManager) ParseName(u string) string {
 	if err != nil {
 		return ""
 	}
-	// Get filePath by URL
+	// get filePath by URL
 	name = path.Base(url.Path)
 	// If file name is empty, use host name
 	if name == "" || name == "/" || name == "." {

internal/protocol/http/fetcher_test.go

@@ -11,7 +11,6 @@ import (
 	"net"
 	gohttp "net/http"
 	"net/url"
-	"strings"
 	"testing"
 	"time"
 )
@@ -60,21 +59,6 @@ func TestFetcher_Resolve(t *testing.T) {
 	}
 }
 
-func TestFetcher_ResolveWithHostHeader(t *testing.T) {
-	fetcher := buildFetcher()
-	err := fetcher.Resolve(&base.Request{
-		URL: "https://bing.com",
-		Extra: &http.ReqExtra{
-			Header: map[string]string{
-				"Host": "test",
-			},
-		},
-	})
-	if err == nil || !strings.Contains(err.Error(), "400") {
-		t.Errorf("Resolve() got = %v, want %v", err, "400")
-	}
-}
-
 func testResolve(startTestServer func() net.Listener, path string, want *base.Resource, t *testing.T) {
 	listener := startTestServer()
 	defer listener.Close()
@@ -148,14 +132,6 @@ func TestFetcher_DownloadLimit(t *testing.T) {
 	downloadNormal(listener, 8, t)
 }
 
-func TestFetcher_DownloadResponseBodyReadTimeout(t *testing.T) {
-	listener := test.StartTestLimitServer(16, readTimeout.Milliseconds()+5000)
-	defer listener.Close()
-
-	downloadError(listener, 1, t)
-	downloadError(listener, 4, t)
-}
-
 func TestFetcher_DownloadResume(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()

internal/protocol/http/timeout_reader.go

@@ -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()
-	}
-}

internal/protocol/http/timeout_reader_test.go

@@ -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
-}

internal/test/httptest.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/armon/go-socks5"
@@ -37,7 +36,7 @@ const (
 )
 
 func StartTestFileServer() net.Listener {
-	return startTestServer(func(sl *shutdownListener) http.Handler {
+	return startTestServer(func() http.Handler {
 		return http.FileServer(http.Dir(Dir))
 	})
 }
@@ -53,7 +52,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)),
@@ -62,7 +61,7 @@ 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("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
 			file, err := os.Open(BuildFile)
@@ -89,7 +88,7 @@ func StartTestCustomServer() net.Listener {
 
 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++
@@ -109,7 +108,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") != "" {
@@ -133,7 +132,7 @@ func StartTestPostServer() net.Listener {
 
 func StartTestErrorServer() 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++
@@ -150,7 +149,7 @@ func StartTestErrorServer() net.Listener {
 func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
 	var connections atomic.Int32
 
-	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() {
@@ -166,14 +165,12 @@ func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
 			if r == "" {
 				writer.Header().Set("Content-Length", fmt.Sprintf("%d", BuildSize))
 				writer.WriteHeader(200)
-				(writer.(http.Flusher)).Flush()
-
 				file, err := os.Open(BuildFile)
 				if err != nil {
 					panic(err)
 				}
 				defer file.Close()
-				slowCopy(sl, writer, file, delay)
+				slowCopy(writer, file, delay)
 			} else {
 				// split range
 				s := strings.Split(r, "=")
@@ -207,8 +204,6 @@ func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
 				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()
-
 				file, err := os.Open(BuildFile)
 				if err != nil {
 					writer.WriteHeader(500)
@@ -216,7 +211,7 @@ func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
 				}
 				defer file.Close()
 				file.Seek(start, 0)
-				slowCopyN(sl, writer, file, end-start+1, delay)
+				slowCopyN(writer, file, end-start+1, delay)
 			}
 		})
 		return mux
@@ -224,12 +219,9 @@ func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
 }
 
 // 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])
@@ -258,8 +250,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) {
+func slowCopyN(dst io.Writer, src io.Reader, n int64, delay int64) (written int64, err error) {
-	written, err = slowCopy(sl, dst, io.LimitReader(src, n), delay)
+	written, err = slowCopy(dst, io.LimitReader(src, n), delay)
 	if written == n {
 		return n, nil
 	}
@@ -270,7 +262,7 @@ func slowCopyN(sl *shutdownListener, dst io.Writer, src io.Reader, n int64, dela
 	return
 }
 
-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)
@@ -280,7 +272,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)
@@ -297,24 +289,21 @@ 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
 	net.Listener
 }
 
 func (c *shutdownListener) Close() error {
-	c.isShutdown = true
 	closeErr := c.server.Shutdown(context.Background())
 	if err := ifExistAndRemove(BuildFile); err != nil {
 		fmt.Println(err)

pkg/api/api.go

@@ -0,0 +1,400 @@
+package api
+
+import (
+	"context"
+	"fmt"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/download"
+	"github.com/GopeedLab/gopeed/pkg/util"
+	"net"
+	"net/http"
+	"reflect"
+	"runtime"
+	"sync"
+)
+
+type Instance struct {
+	startCfg   *model.StartConfig
+	downloader *download.Downloader
+
+	httpLock sync.Mutex
+	srv      *http.Server
+	listener net.Listener
+}
+
+func Create(startCfg *model.StartConfig) (*Instance, error) {
+	if startCfg == nil {
+		startCfg = &model.StartConfig{}
+	}
+	startCfg.Init()
+
+	i := &Instance{
+		startCfg: startCfg,
+	}
+
+	downloadCfg := &download.DownloaderConfig{
+		ProductionMode:  startCfg.ProductionMode,
+		RefreshInterval: startCfg.RefreshInterval,
+	}
+	if startCfg.Storage == model.StorageBolt {
+		downloadCfg.Storage = download.NewBoltStorage(startCfg.StorageDir)
+	} else {
+		downloadCfg.Storage = download.NewMemStorage()
+	}
+	downloadCfg.StorageDir = startCfg.StorageDir
+	downloadCfg.Init()
+	downloader := download.NewDownloader(downloadCfg)
+	if err := downloader.Setup(); err != nil {
+		return nil, err
+	}
+	i.downloader = downloader
+	i.httpLock = sync.Mutex{}
+
+	return i, nil
+}
+
+func (i *Instance) Listener(listener download.Listener) *model.Result[any] {
+	i.downloader.Listener(listener)
+	return model.NewNilResult()
+}
+
+func (i *Instance) StartHttp() *model.Result[int] {
+	i.httpLock.Lock()
+	defer i.httpLock.Unlock()
+
+	return i.startHttp()
+}
+
+func (i *Instance) startHttp() *model.Result[int] {
+	httpCfg := i.getHttpConfig()
+	if httpCfg == nil || !httpCfg.Enable {
+		return model.NewErrorResult[int]("HTTP API server not enabled")
+	}
+	if i.srv != nil {
+		return model.NewErrorResult[int]("HTTP API server already started")
+	}
+
+	port, start, err := ListenHttp(httpCfg, i)
+	if err != nil {
+		return model.NewErrorResult[int](err.Error())
+	}
+	httpCfg.RunningPort = port
+	go start()
+	return model.NewOkResult(port)
+}
+
+func (i *Instance) getHttpConfig() *base.DownloaderHttpConfig {
+	var httpCfg *base.DownloaderHttpConfig
+	if i.startCfg.DownloadConfig != nil && i.startCfg.DownloadConfig.Http != nil {
+		httpCfg = i.startCfg.DownloadConfig.Http
+	} else {
+		cfg, _ := i.downloader.GetConfig()
+		httpCfg = cfg.Http
+	}
+	return httpCfg
+}
+
+func (i *Instance) StopHttp() *model.Result[any] {
+	i.httpLock.Lock()
+	defer i.httpLock.Unlock()
+
+	return i.stopHttp()
+}
+
+func (i *Instance) stopHttp() *model.Result[any] {
+	if i.srv != nil {
+		if err := i.srv.Shutdown(context.Background()); err != nil {
+			i.downloader.Logger.Warn().Err(err).Msg("shutdown http server failed")
+		}
+		i.srv = nil
+		i.listener = nil
+	}
+	httpCfg := i.getHttpConfig()
+	if httpCfg != nil {
+		httpCfg.RunningPort = 0
+	}
+	return model.NewNilResult()
+}
+
+func (i *Instance) RestartHttp() *model.Result[int] {
+	i.httpLock.Lock()
+	defer i.httpLock.Unlock()
+
+	i.stopHttp()
+	return i.startHttp()
+}
+
+func (i *Instance) Info() *model.Result[map[string]any] {
+	return model.NewOkResult(map[string]any{
+		"version":  base.Version,
+		"runtime":  runtime.Version(),
+		"os":       runtime.GOOS,
+		"arch":     runtime.GOARCH,
+		"inDocker": base.InDocker == "true",
+	})
+}
+
+func (i *Instance) Resolve(req *base.Request) *model.Result[*download.ResolveResult] {
+	rr, err := i.downloader.Resolve(req)
+	if err != nil {
+		return model.NewErrorResult[*download.ResolveResult](err.Error())
+	}
+	return model.NewOkResult(rr)
+}
+
+func (i *Instance) CreateTask(req *model.CreateTask) *model.Result[string] {
+	var (
+		taskId string
+		err    error
+	)
+	if req.Rid != "" {
+		taskId, err = i.downloader.Create(req.Rid, req.Opt)
+	} else if req.Req != nil {
+		taskId, err = i.downloader.CreateDirect(req.Req, req.Opt)
+	} else {
+		return model.NewErrorResult[string]("param invalid: rid or req", model.CodeInvalidParam)
+	}
+	if err != nil {
+		return model.NewErrorResult[string](err.Error())
+	}
+	return model.NewOkResult(taskId)
+}
+
+func (i *Instance) CreateTaskBatch(req *model.CreateTaskBatch) *model.Result[[]string] {
+	if len(req.Reqs) == 0 {
+		return model.NewErrorResult[[]string]("param invalid: reqs", model.CodeInvalidParam)
+	}
+	taskIds, err := i.downloader.CreateDirectBatch(req.Reqs, req.Opt)
+	if err != nil {
+		return model.NewErrorResult[[]string](err.Error())
+	}
+	return model.NewOkResult(taskIds)
+}
+
+func (i *Instance) PauseTask(taskId string) *model.Result[any] {
+	err := i.downloader.Pause(&download.TaskFilter{
+		ID: []string{taskId},
+	})
+	if err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewNilResult()
+}
+
+func (i *Instance) PauseTasks(filter *download.TaskFilter) *model.Result[any] {
+	err := i.downloader.Pause(filter)
+	if err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewNilResult()
+}
+
+func (i *Instance) ContinueTask(taskId string) *model.Result[any] {
+	err := i.downloader.Continue(&download.TaskFilter{
+		ID: []string{taskId},
+	})
+	if err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewNilResult()
+}
+
+func (i *Instance) ContinueTasks(filter *download.TaskFilter) *model.Result[any] {
+	err := i.downloader.Continue(filter)
+	if err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewNilResult()
+}
+
+func (i *Instance) DeleteTask(taskId string, force bool) *model.Result[any] {
+	err := i.downloader.Delete(&download.TaskFilter{
+		ID: []string{taskId},
+	}, force)
+	if err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewNilResult()
+}
+
+func (i *Instance) DeleteTasks(filter *download.TaskFilter, force bool) *model.Result[any] {
+	err := i.downloader.Delete(filter, force)
+	if err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewNilResult()
+}
+
+func (i *Instance) GetTask(taskId string) *model.Result[*download.Task] {
+	if taskId == "" {
+		return model.NewErrorResult[*download.Task]("param invalid: id", model.CodeInvalidParam)
+	}
+	task := i.downloader.GetTask(taskId)
+	if task == nil {
+		return model.NewErrorResult[*download.Task]("task not found", model.CodeTaskNotFound)
+	}
+	return model.NewOkResult(task)
+}
+
+func (i *Instance) GetTasks(filter *download.TaskFilter) *model.Result[[]*download.Task] {
+	return model.NewOkResult(i.downloader.GetTasksByFilter(filter))
+}
+
+func (i *Instance) GetTaskStats(taskId string) *model.Result[any] {
+	stats, err := i.downloader.GetTaskStats(taskId)
+	if err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewOkResult(stats)
+}
+
+func (i *Instance) GetConfig() *model.Result[*base.DownloaderStoreConfig] {
+	config, err := i.downloader.GetConfig()
+	if err != nil {
+		return model.NewErrorResult[*base.DownloaderStoreConfig](err.Error())
+	}
+	return model.NewOkResult(config)
+}
+
+func (i *Instance) PutConfig(cfg *base.DownloaderStoreConfig) *model.Result[any] {
+	err := i.downloader.PutConfig(cfg)
+	if err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewNilResult()
+}
+
+func (i *Instance) InstallExtension(req *model.InstallExtension) *model.Result[string] {
+	var (
+		installedExt *download.Extension
+		err          error
+	)
+	if req.DevMode {
+		installedExt, err = i.downloader.InstallExtensionByFolder(req.URL, true)
+	} else {
+		installedExt, err = i.downloader.InstallExtensionByGit(req.URL)
+	}
+	if err != nil {
+		return model.NewErrorResult[string](err.Error())
+	}
+
+	return model.NewOkResult(installedExt.Identity)
+}
+
+func (i *Instance) GetExtension(identity string) *model.Result[*download.Extension] {
+	extension, err := i.downloader.GetExtension(identity)
+	if err != nil {
+		return model.NewErrorResult[*download.Extension](err.Error())
+	}
+	return model.NewOkResult(extension)
+}
+
+func (i *Instance) GetExtensions() *model.Result[[]*download.Extension] {
+	return model.NewOkResult(i.downloader.GetExtensions())
+}
+
+func (i *Instance) UpdateExtensionSettings(identity string, req *model.UpdateExtensionSettings) *model.Result[any] {
+	err := i.downloader.UpdateExtensionSettings(identity, req.Settings)
+	if err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewNilResult()
+}
+
+func (i *Instance) SwitchExtension(identity string, req *model.SwitchExtension) *model.Result[any] {
+	err := i.downloader.SwitchExtension(identity, req.Status)
+	if err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewNilResult()
+}
+
+func (i *Instance) DeleteExtension(identity string) *model.Result[any] {
+	err := i.downloader.DeleteExtension(identity)
+	if err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewNilResult()
+}
+
+func (i *Instance) UpgradeCheckExtension(identity string) *model.Result[*model.UpgradeCheckExtensionResp] {
+	newVersion, err := i.downloader.UpgradeCheckExtension(identity)
+	if err != nil {
+		return model.NewErrorResult[*model.UpgradeCheckExtensionResp](err.Error())
+	}
+
+	return model.NewOkResult(&model.UpgradeCheckExtensionResp{
+		NewVersion: newVersion,
+	})
+}
+
+func (i *Instance) UpgradeExtension(identity string) *model.Result[any] {
+	err := i.downloader.UpgradeExtension(identity)
+	if err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewNilResult()
+}
+
+func (i *Instance) Close() *model.Result[any] {
+	i.StopHttp()
+	if i.downloader != nil {
+		if err := i.downloader.Close(); err != nil {
+			i.downloader.Logger.Warn().Err(err).Msg("close downloader failed")
+		}
+		i.downloader = nil
+	}
+
+	return model.NewNilResult()
+}
+
+func (i *Instance) Clear() *model.Result[any] {
+	if err := i.downloader.Clear(); err != nil {
+		return model.NewErrorResult[any](err.Error())
+	}
+	return model.NewNilResult()
+}
+
+type Request struct {
+	Method string `json:"method"`
+	Params []any  `json:"params"`
+}
+
+// Invoke support dynamic call method
+func Invoke(instance *Instance, request *Request) (ret any) {
+	defer func() {
+		if err := recover(); err != nil {
+			ret = model.NewErrorResult[any](fmt.Sprintf("%v", err))
+		}
+	}()
+
+	method, args := request.Method, request.Params
+	dsType := reflect.ValueOf(instance)
+	fn := dsType.MethodByName(method)
+	numIn := fn.Type().NumIn()
+	in := make([]reflect.Value, numIn)
+	for i := 0; i < numIn; i++ {
+		paramType := fn.Type().In(i)
+		arg := args[i]
+		if arg == nil {
+			in[i] = reflect.Zero(fn.Type().In(i))
+			continue
+		}
+		var param reflect.Value
+		var paramPtr any
+		if paramType.Kind() == reflect.Ptr {
+			param = reflect.New(paramType.Elem())
+			paramPtr = param.Interface()
+		} else {
+			param = reflect.New(paramType).Elem()
+			paramPtr = param.Addr().Interface()
+		}
+		if err := util.MapToStruct(arg, paramPtr); err != nil {
+			panic(err)
+		}
+		in[i] = param
+	}
+	retVals := fn.Call(in)
+	return retVals[0].Interface()
+}

pkg/api/api_test.go

@@ -0,0 +1,42 @@
+package api
+
+import (
+	"encoding/json"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
+	"github.com/GopeedLab/gopeed/pkg/download"
+	"testing"
+)
+
+func TestInvoke(t *testing.T) {
+	doTestInvoke(t, "Info", []any{}, model.CodeOk)
+	doTestInvoke(t, "Info1", []any{}, model.CodeError)
+	doTestInvoke(t, "CreateTask", []any{nil}, model.CodeError)
+	doTestInvoke(t, "GetTasks", nil, model.CodeError)
+	doTestInvoke(t, "GetTasks", []any{}, model.CodeError)
+	doTestInvoke(t, "GetTasks", []any{"{abc:123"}, model.CodeError)
+	doTestInvoke(t, "GetTasks", []any{&download.TaskFilter{}}, model.CodeOk)
+	doTestInvoke(t, "SwitchExtension", []any{"test", &model.SwitchExtension{Status: true}}, model.CodeError)
+}
+
+func doTestInvoke(t *testing.T, method string, params []any, expectCode model.RespCode) {
+	instance, _ := Create(nil)
+	defer instance.Close()
+
+	result := Invoke(instance, &Request{
+		Method: method,
+		Params: params,
+	})
+	buf, err := json.Marshal(result)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var res model.Result[any]
+	if err := json.Unmarshal(buf, &res); err != nil {
+		t.Fatal(err)
+	}
+
+	if res.Code != expectCode {
+		t.Fatalf("Invoke method [%s] failed, expect code [%d], got [%d], msg: %s", method, expectCode, res.Code, res.Msg)
+	}
+}

pkg/api/http.go

@@ -0,0 +1,451 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/download"
+	"github.com/gorilla/handlers"
+	"github.com/gorilla/mux"
+	"github.com/pkg/errors"
+	"io"
+	"net"
+	"net/http"
+	"net/url"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+)
+
+const instanceKey string = "apiInstance"
+
+func ListenHttp(httpCfg *base.DownloaderHttpConfig, ai *Instance) (int, func(), error) {
+	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.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(GetTaskStats)
+	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)
+	r.Methods(http.MethodGet).Path("/api/v1/extensions").HandlerFunc(GetExtensions)
+	r.Methods(http.MethodGet).Path("/api/v1/extensions/{identity}").HandlerFunc(GetExtension)
+	r.Methods(http.MethodPut).Path("/api/v1/extensions/{identity}/settings").HandlerFunc(UpdateExtensionSettings)
+	r.Methods(http.MethodPut).Path("/api/v1/extensions/{identity}/switch").HandlerFunc(SwitchExtension)
+	r.Methods(http.MethodDelete).Path("/api/v1/extensions/{identity}").HandlerFunc(DeleteExtension)
+	r.Methods(http.MethodGet).Path("/api/v1/extensions/{identity}/upgrade").HandlerFunc(UpgradeCheckExtension)
+	r.Methods(http.MethodPost).Path("/api/v1/extensions/{identity}/upgrade").HandlerFunc(UpgradeExtension)
+	if ai.startCfg.WebEnable {
+		r.Path("/api/v1/proxy").HandlerFunc(DoProxy)
+		r.PathPrefix("/fs/tasks").Handler(http.FileServer(&taskFileSystem{
+			downloader: ai.downloader,
+		}))
+		r.PathPrefix("/fs/extensions").Handler(http.FileServer(&extensionFileSystem{
+			downloader: ai.downloader,
+		}))
+		r.PathPrefix("/").Handler(http.FileServer(http.FS(ai.startCfg.WebFS)))
+	}
+
+	r.Use(func(h http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			ctx := context.WithValue(r.Context(), instanceKey, ai)
+			h.ServeHTTP(w, r.WithContext(ctx))
+		})
+	})
+
+	if httpCfg.ApiToken != "" || (ai.startCfg.WebEnable && ai.startCfg.WebBasicAuth != nil) {
+		r.Use(func(h http.Handler) http.Handler {
+			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				if httpCfg.ApiToken != "" && r.Header.Get("X-Api-Token") == httpCfg.ApiToken {
+					h.ServeHTTP(w, r)
+					return
+				}
+				if ai.startCfg.WebEnable && ai.startCfg.WebBasicAuth != nil {
+					if r.Header.Get("Authorization") == ai.startCfg.WebBasicAuth.Authorization() {
+						h.ServeHTTP(w, r)
+						return
+					}
+					w.Header().Set("WWW-Authenticate", "Basic realm=\"gopeed web\"")
+				}
+				WriteStatusJson(w, http.StatusUnauthorized, model.NewErrorResult[any]("unauthorized", model.CodeUnauthorized))
+			})
+		})
+	}
+
+	// recover panic
+	r.Use(func(h http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			defer func() {
+				if v := recover(); v != nil {
+					err := errors.WithStack(fmt.Errorf("%v", v))
+					ai.downloader.Logger.Error().Stack().Err(err).Msgf("http server panic: %s %s", r.Method, r.RequestURI)
+					WriteJson(w, model.NewErrorResult[any](err.Error(), model.CodeError))
+				}
+			}()
+			h.ServeHTTP(w, r)
+		})
+	})
+
+	srv := &http.Server{Handler: handlers.CORS(
+		handlers.AllowedHeaders([]string{"Content-Type", "X-Api-Token", "X-Target-Uri"}),
+		handlers.AllowedMethods([]string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"}),
+		handlers.AllowedOrigins([]string{"*"}),
+	)(r)}
+
+	listener, err := net.Listen("tcp", net.JoinHostPort(httpCfg.Host, fmt.Sprintf("%d", httpCfg.Port)))
+	if err != nil {
+		return 0, nil, err
+	}
+	ai.srv = srv
+	ai.listener = listener
+
+	return listener.Addr().(*net.TCPAddr).Port, func() {
+		if err := srv.Serve(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
+			ai.downloader.Logger.Error().Err(err).Msg("http server listen error")
+		}
+	}, nil
+}
+
+func getInstance(r *http.Request) *Instance {
+	return r.Context().Value(instanceKey).(*Instance)
+}
+
+func Info(w http.ResponseWriter, r *http.Request) {
+	WriteJson(w, getInstance(r).Info())
+}
+
+func Resolve(w http.ResponseWriter, r *http.Request) {
+	var req base.Request
+	if ReadJson(r, w, &req) {
+		WriteJson(w, getInstance(r).Resolve(&req))
+	}
+}
+
+func CreateTask(w http.ResponseWriter, r *http.Request) {
+	var req model.CreateTask
+	if ReadJson(r, w, &req) {
+		WriteJson(w, getInstance(r).CreateTask(&req))
+	}
+}
+
+func CreateTaskBatch(w http.ResponseWriter, r *http.Request) {
+	var req model.CreateTaskBatch
+	if ReadJson(r, w, &req) {
+		WriteJson(w, getInstance(r).CreateTaskBatch(&req))
+	}
+}
+
+func PauseTask(w http.ResponseWriter, r *http.Request) {
+	var taskId string
+	if !parseTaskId(r, w, &taskId) {
+		return
+	}
+	WriteJson(w, getInstance(r).PauseTask(taskId))
+}
+
+func PauseTasks(w http.ResponseWriter, r *http.Request) {
+	var filter download.TaskFilter
+	if !parseFilter(r, w, &filter) {
+		return
+	}
+	WriteJson(w, getInstance(r).PauseTasks(&filter))
+}
+
+func ContinueTask(w http.ResponseWriter, r *http.Request) {
+	var taskId string
+	if !parseTaskId(r, w, &taskId) {
+		return
+	}
+	WriteJson(w, getInstance(r).ContinueTask(taskId))
+}
+
+func ContinueTasks(w http.ResponseWriter, r *http.Request) {
+	var filter download.TaskFilter
+	if !parseFilter(r, w, &filter) {
+		return
+	}
+	WriteJson(w, getInstance(r).ContinueTasks(&filter))
+}
+
+func DeleteTask(w http.ResponseWriter, r *http.Request) {
+	var taskId string
+	if !parseTaskId(r, w, &taskId) {
+		return
+	}
+	force := r.FormValue("force")
+	WriteJson(w, getInstance(r).DeleteTask(taskId, force == "true"))
+}
+
+func DeleteTasks(w http.ResponseWriter, r *http.Request) {
+	var filter download.TaskFilter
+	if !parseFilter(r, w, &filter) {
+		return
+	}
+	force := r.FormValue("force")
+	WriteJson(w, getInstance(r).DeleteTasks(&filter, force == "true"))
+}
+
+func GetTask(w http.ResponseWriter, r *http.Request) {
+	var taskId string
+	if !parseTaskId(r, w, &taskId) {
+		return
+	}
+	WriteJson(w, getInstance(r).GetTask(taskId))
+}
+
+func GetTasks(w http.ResponseWriter, r *http.Request) {
+	var filter download.TaskFilter
+	if !parseFilter(r, w, &filter) {
+		return
+	}
+	WriteJson(w, getInstance(r).GetTasks(&filter))
+}
+
+func GetTaskStats(w http.ResponseWriter, r *http.Request) {
+	var taskId string
+	if !parseTaskId(r, w, &taskId) {
+		return
+	}
+	WriteJson(w, getInstance(r).GetTaskStats(taskId))
+}
+
+func GetConfig(w http.ResponseWriter, r *http.Request) {
+	WriteJson(w, getInstance(r).GetConfig())
+}
+
+func PutConfig(w http.ResponseWriter, r *http.Request) {
+	var cfg base.DownloaderStoreConfig
+	if !ReadJson(r, w, &cfg) {
+		return
+	}
+	WriteJson(w, getInstance(r).PutConfig(&cfg))
+}
+
+func InstallExtension(w http.ResponseWriter, r *http.Request) {
+	var req model.InstallExtension
+	if !ReadJson(r, w, &req) {
+		return
+	}
+	WriteJson(w, getInstance(r).InstallExtension(&req))
+}
+
+func GetExtensions(w http.ResponseWriter, r *http.Request) {
+	WriteJson(w, getInstance(r).GetExtensions())
+}
+
+func GetExtension(w http.ResponseWriter, r *http.Request) {
+	var identity string
+	if !parseIdentity(r, w, &identity) {
+		return
+	}
+	WriteJson(w, getInstance(r).GetExtension(identity))
+}
+
+func UpdateExtensionSettings(w http.ResponseWriter, r *http.Request) {
+	var identity string
+	if !parseIdentity(r, w, &identity) {
+		return
+	}
+	var req model.UpdateExtensionSettings
+	if !ReadJson(r, w, &req) {
+		return
+	}
+	WriteJson(w, getInstance(r).UpdateExtensionSettings(identity, &req))
+}
+
+func SwitchExtension(w http.ResponseWriter, r *http.Request) {
+	var identity string
+	if !parseIdentity(r, w, &identity) {
+		return
+	}
+	var switchExtension model.SwitchExtension
+	if !ReadJson(r, w, &switchExtension) {
+		return
+	}
+	WriteJson(w, getInstance(r).SwitchExtension(identity, &switchExtension))
+}
+
+func DeleteExtension(w http.ResponseWriter, r *http.Request) {
+	var identity string
+	if !parseIdentity(r, w, &identity) {
+		return
+	}
+	WriteJson(w, getInstance(r).DeleteExtension(identity))
+}
+
+func UpgradeCheckExtension(w http.ResponseWriter, r *http.Request) {
+	var identity string
+	if !parseIdentity(r, w, &identity) {
+		return
+	}
+	WriteJson(w, getInstance(r).UpgradeCheckExtension(identity))
+}
+
+func UpgradeExtension(w http.ResponseWriter, r *http.Request) {
+	var identity string
+	if !parseIdentity(r, w, &identity) {
+		return
+	}
+	WriteJson(w, getInstance(r).UpgradeExtension(identity))
+}
+
+func DoProxy(w http.ResponseWriter, r *http.Request) {
+	target := r.Header.Get("X-Target-Uri")
+	if target == "" {
+		writeError(w, "param invalid: X-Target-Uri")
+		return
+	}
+	targetUrl, err := url.Parse(target)
+	if err != nil {
+		writeError(w, err.Error())
+		return
+	}
+	r.RequestURI = ""
+	r.URL = targetUrl
+	r.Host = targetUrl.Host
+	resp, err := http.DefaultClient.Do(r)
+	if err != nil {
+		writeError(w, err.Error())
+		return
+	}
+	defer resp.Body.Close()
+	for k, vv := range resp.Header {
+		for _, v := range vv {
+			w.Header().Set(k, v)
+		}
+	}
+	w.WriteHeader(resp.StatusCode)
+	buf, err := io.ReadAll(resp.Body)
+	if err != nil {
+		writeError(w, err.Error())
+		return
+	}
+	w.Write(buf)
+}
+
+func parsePathParam(r *http.Request, w http.ResponseWriter, name string, value *string) bool {
+	vars := mux.Vars(r)
+	*value = vars[name]
+	if *value == "" {
+		WriteJson(w, model.NewErrorResult[any]("param invalid: id", model.CodeInvalidParam))
+		return false
+	}
+	return true
+}
+
+func parseTaskId(r *http.Request, w http.ResponseWriter, taskId *string) bool {
+	return parsePathParam(r, w, "id", taskId)
+}
+
+func parseIdentity(r *http.Request, w http.ResponseWriter, identity *string) bool {
+	return parsePathParam(r, w, "identity", identity)
+}
+
+func parseFilter(r *http.Request, w http.ResponseWriter, filter *download.TaskFilter) bool {
+	if err := r.ParseForm(); err != nil {
+		WriteJson(w, model.NewErrorResult[any](err.Error()))
+		return false
+	}
+
+	filter.ID = r.Form["id"]
+	filter.Status = convertStatues(r.Form["status"])
+	filter.NotStatus = convertStatues(r.Form["notStatus"])
+	return true
+}
+
+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 ReadJson(r *http.Request, w http.ResponseWriter, v any) bool {
+	if err := json.NewDecoder(r.Body).Decode(v); err != nil {
+		WriteJson(w, model.NewErrorResult[any](err.Error()))
+		return false
+	}
+	return true
+}
+
+func WriteJson(w http.ResponseWriter, v any) {
+	WriteStatusJson(w, http.StatusOK, v)
+}
+
+func WriteStatusJson(w http.ResponseWriter, statusCode int, v any) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	w.WriteHeader(statusCode)
+	json.NewEncoder(w).Encode(v)
+}
+
+func resolvePath(urlPath string, prefix string) (identity string, path string, err error) {
+	// remove prefix
+	clearPath := strings.TrimPrefix(urlPath, prefix)
+	// match extension identity, eg: /fs/extensions/identity/xxx
+	reg := regexp.MustCompile(`^/([^/]+)/(.*)$`)
+	if !reg.MatchString(clearPath) {
+		err = os.ErrNotExist
+		return
+	}
+	matched := reg.FindStringSubmatch(clearPath)
+	if len(matched) != 3 {
+		err = os.ErrNotExist
+		return
+	}
+	return matched[1], matched[2], nil
+}
+
+// handle task file resource
+type taskFileSystem struct {
+	downloader *download.Downloader
+}
+
+func (e *taskFileSystem) Open(name string) (http.File, error) {
+	// get extension identity
+	identity, path, err := resolvePath(name, "/fs/tasks")
+	if err != nil {
+		return nil, err
+	}
+	task := e.downloader.GetTask(identity)
+	if task == nil {
+		return nil, os.ErrNotExist
+	}
+	return os.Open(filepath.Join(task.Meta.RootDirPath(), path))
+}
+
+// handle extension file resource
+type extensionFileSystem struct {
+	downloader *download.Downloader
+}
+
+func (e *extensionFileSystem) Open(name string) (http.File, error) {
+	// get extension identity
+	identity, path, err := resolvePath(name, "/fs/extensions")
+	if err != nil {
+		return nil, err
+	}
+	extension, err := e.downloader.GetExtension(identity)
+	if err != nil {
+		return nil, os.ErrNotExist
+	}
+	extensionPath := e.downloader.ExtensionPath(extension)
+	return os.Open(filepath.Join(extensionPath, path))
+}

pkg/api/http_test.go

@@ -1,4 +1,4 @@
-package rest
+package api
 
 import (
 	"bytes"
@@ -7,9 +7,9 @@ import (
 	"errors"
 	"fmt"
 	"github.com/GopeedLab/gopeed/internal/test"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/download"
-	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"io"
 	"net"
 	"net/http"
@@ -21,6 +21,7 @@ import (
 )
 
 var (
+	httpInstance *Instance
 	restPort     int
 
 	taskReq = &base.Request{
@@ -90,7 +91,7 @@ func TestCreateTask(t *testing.T) {
 
 		var wg sync.WaitGroup
 		wg.Add(1)
-		Downloader.Listener(func(event *download.Event) {
+		httpInstance.Listener(func(event *download.Event) {
 			if event.Key == download.EventKeyFinally {
 				wg.Done()
 			}
@@ -117,7 +118,7 @@ func TestCreateDirectTask(t *testing.T) {
 	doTest(func() {
 		var wg sync.WaitGroup
 		wg.Add(1)
-		Downloader.Listener(func(event *download.Event) {
+		httpInstance.Listener(func(event *download.Event) {
 			if event.Key == download.EventKeyFinally {
 				wg.Done()
 			}
@@ -156,7 +157,7 @@ func TestCreateDirectTaskWithResoled(t *testing.T) {
 	doTest(func() {
 		var wg sync.WaitGroup
 		wg.Add(1)
-		Downloader.Listener(func(event *download.Event) {
+		httpInstance.Listener(func(event *download.Event) {
 			if event.Key == download.EventKeyFinally {
 				wg.Done()
 			}
@@ -180,7 +181,7 @@ func TestPauseAndContinueTask(t *testing.T) {
 	doTest(func() {
 		var wg sync.WaitGroup
 		wg.Add(1)
-		Downloader.Listener(func(event *download.Event) {
+		httpInstance.Listener(func(event *download.Event) {
 			switch event.Key {
 			case download.EventKeyFinally:
 				wg.Done()
@@ -214,10 +215,7 @@ func TestPauseAndContinueTask(t *testing.T) {
 
 func TestPauseAllAndContinueALLTasks(t *testing.T) {
 	doTest(func() {
-		cfg, err := Downloader.GetConfig()
+		cfg := UnwrapResult(httpInstance.GetConfig())
-		if err != nil {
-			t.Fatal(err)
-		}
 
 		createAndPause := func() {
 			taskId := httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", createReq)
@@ -275,7 +273,7 @@ func TestDeleteAllTasks(t *testing.T) {
 
 		var wg sync.WaitGroup
 		wg.Add(taskCount)
-		Downloader.Listener(func(event *download.Event) {
+		httpInstance.Listener(func(event *download.Event) {
 			if event.Key == download.EventKeyFinally {
 				wg.Done()
 			}
@@ -301,7 +299,7 @@ func TestDeleteTasksByStatues(t *testing.T) {
 
 		var wg sync.WaitGroup
 		wg.Add(taskCount)
-		Downloader.Listener(func(event *download.Event) {
+		httpInstance.Listener(func(event *download.Event) {
 			if event.Key == download.EventKeyFinally {
 				wg.Done()
 			}
@@ -325,7 +323,7 @@ func TestGetTasks(t *testing.T) {
 	doTest(func() {
 		var wg sync.WaitGroup
 		wg.Add(1)
-		Downloader.Listener(func(event *download.Event) {
+		httpInstance.Listener(func(event *download.Event) {
 			if event.Key == download.EventKeyFinally {
 				wg.Done()
 			}
@@ -354,7 +352,10 @@ func TestGetAndPutConfig(t *testing.T) {
 		cfg := httpRequestCheckOk[*base.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
 		cfg.DownloadDir = "./download"
 		cfg.Extra = map[string]any{
-			"serverConfig": &Config{
+			"serverConfig": &struct {
+				Host string `json:"host"`
+				Port int    `json:"port"`
+			}{
 				Host: "127.0.0.1",
 				Port: 8080,
 			},
@@ -446,16 +447,16 @@ func TestDeleteExtension(t *testing.T) {
 	})
 }
 
-func TestUpdateCheckExtension(t *testing.T) {
+func TestUpgradeCheckExtension(t *testing.T) {
 	doTest(func() {
 		identity := httpRequestCheckOk[string](http.MethodPost, "/api/v1/extensions", installExtensionReq)
-		resp := httpRequestCheckOk[*model.UpdateCheckExtensionResp](http.MethodGet, "/api/v1/extensions/"+identity+"/update", nil)
+		resp := httpRequestCheckOk[*model.UpgradeCheckExtensionResp](http.MethodGet, "/api/v1/extensions/"+identity+"/upgrade", nil)
 		// no new version
 		if resp.NewVersion != "" {
-			t.Errorf("UpdateCheckExtension() got = %v, want %v", resp.NewVersion, "")
+			t.Errorf("UpgradeCheckExtension() got = %v, want %v", resp.NewVersion, "")
 		}
 		// force update
-		httpRequestCheckOk[any](http.MethodPost, "/api/v1/extensions/"+identity+"/update", nil)
+		httpRequestCheckOk[any](http.MethodPost, "/api/v1/extensions/"+identity+"/upgrade", nil)
 	})
 }
 
@@ -506,13 +507,19 @@ func TestDoProxy(t *testing.T) {
 func TestApiToken(t *testing.T) {
 	var cfg = &model.StartConfig{}
 	cfg.Init()
-	cfg.ApiToken = "123456"
+	cfg.DownloadConfig = &base.DownloaderStoreConfig{
-	fileListener := doStart(cfg)
+		Http: &base.DownloaderHttpConfig{
+			Enable:   true,
+			ApiToken: "123456",
+		},
+	}
+	httpInstance, _ = Create(cfg)
+	fileListener := doStart()
 	defer func() {
 		if err := fileListener.Close(); err != nil {
 			panic(err)
 		}
-		Stop()
+		httpInstance.Close()
 	}()
 
 	status, _ := doHttpRequest0(http.MethodGet, "/api/v1/config", nil, nil)
@@ -521,7 +528,7 @@ func TestApiToken(t *testing.T) {
 	}
 
 	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
-		"X-Api-Token": cfg.ApiToken,
+		"X-Api-Token": cfg.DownloadConfig.Http.ApiToken,
 	}, nil)
 	if status != http.StatusOK {
 		t.Errorf("TestApiToken() got = %v, want %v", status, http.StatusOK)
@@ -532,18 +539,24 @@ func TestApiToken(t *testing.T) {
 func TestAuthorization(t *testing.T) {
 	var cfg = &model.StartConfig{}
 	cfg.Init()
-	cfg.ApiToken = "123456"
+	cfg.DownloadConfig = &base.DownloaderStoreConfig{
+		Http: &base.DownloaderHttpConfig{
+			Enable:   true,
+			ApiToken: "123456",
+		},
+	}
 	cfg.WebEnable = true
 	cfg.WebBasicAuth = &model.WebBasicAuth{
 		Username: "admin",
 		Password: "123456",
 	}
-	fileListener := doStart(cfg)
+	httpInstance, _ = Create(cfg)
+	fileListener := doStart()
 	defer func() {
 		if err := fileListener.Close(); err != nil {
 			panic(err)
 		}
-		Stop()
+		httpInstance.Close()
 	}()
 
 	status, _ := doHttpRequest0(http.MethodGet, "/api/v1/config", nil, nil)
@@ -559,7 +572,7 @@ func TestAuthorization(t *testing.T) {
 	}
 
 	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
-		"X-Api-Token": cfg.ApiToken,
+		"X-Api-Token": cfg.DownloadConfig.Http.ApiToken,
 	}, nil)
 	if status != http.StatusOK {
 		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusOK)
@@ -573,17 +586,23 @@ func doTest(handler func()) {
 		cfg.Storage = storage
 		cfg.StorageDir = ".test_storage"
 		cfg.WebEnable = true
-		fileListener := doStart(cfg)
+		cfg.DownloadConfig = &base.DownloaderStoreConfig{
+			Http: &base.DownloaderHttpConfig{
+				Enable: true,
+			},
+		}
+		httpInstance, _ = Create(cfg)
+		fileListener := doStart()
 		defer func() {
 			if err := fileListener.Close(); err != nil {
 				panic(err)
 			}
-			Stop()
+			httpInstance.StopHttp()
-			Downloader.Clear()
+			httpInstance.Clear()
 		}()
 		defer func() {
-			Downloader.Pause(nil)
+			httpInstance.PauseTasks(nil)
-			Downloader.Delete(nil, true)
+			httpInstance.DeleteTasks(nil, true)
 			os.RemoveAll(cfg.StorageDir)
 		}()
 		taskReq.URL = "http://" + fileListener.Addr().String() + "/" + test.BuildName
@@ -593,15 +612,19 @@ func doTest(handler func()) {
 	testFunc(model.StorageBolt)
 }
 
-func doStart(cfg *model.StartConfig) net.Listener {
+func doStart() net.Listener {
-	port, err := Start(cfg)
+	port := UnwrapResult(httpInstance.StartHttp())
-	if err != nil {
-		panic(err)
-	}
 	restPort = port
 	return test.StartTestFileServer()
 }
 
+func UnwrapResult[T any](result *model.Result[T]) T {
+	if result.HasError() {
+		panic(result.Msg)
+	}
+	return result.Data
+}
+
 func doHttpRequest0(method string, path string, headers map[string]string, body any) (int, []byte) {
 	var reader io.Reader
 	if body != nil {

pkg/api/model/api.go

@@ -14,13 +14,10 @@ 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"`
 
 	ProductionMode bool
@@ -31,12 +28,6 @@ type StartConfig struct {
 }
 
 func (cfg *StartConfig) Init() *StartConfig {
-	if cfg.Network == "" {
-		cfg.Network = "tcp"
-	}
-	if cfg.Address == "" {
-		cfg.Address = "127.0.0.1:0"
-	}
 	if cfg.RefreshInterval == 0 {
 		cfg.RefreshInterval = 350
 	}
@@ -59,3 +50,9 @@ func (cfg *WebBasicAuth) Authorization() string {
 	userId := cfg.Username + ":" + cfg.Password
 	return "Basic " + base64.StdEncoding.EncodeToString([]byte(userId))
 }
+
+type HttpListenResult struct {
+	Host string `json:"host"`
+	// Port is the http server real listen port.
+	Port int `json:"port"`
+}

pkg/api/model/extension.go

@@ -13,6 +13,6 @@ type SwitchExtension struct {
 	Status bool `json:"status"`
 }
 
-type UpdateCheckExtensionResp struct {
+type UpgradeCheckExtensionResp struct {
 	NewVersion string `json:"newVersion"`
 }

pkg/api/model/result.go

@@ -1,5 +1,7 @@
 package model
 
+import "encoding/json"
+
 type RespCode int
 
 const (
@@ -20,6 +22,15 @@ type Result[T any] struct {
 	Data T        `json:"data"`
 }
 
+func (r *Result[T]) Json() string {
+	buf, _ := json.Marshal(r)
+	return string(buf)
+}
+
+func (r *Result[T]) HasError() bool {
+	return r.Code != CodeOk
+}
+
 func NewOkResult[T any](data T) *Result[T] {
 	return &Result[T]{
 		Code: CodeOk,
@@ -33,14 +44,14 @@ func NewNilResult() *Result[any] {
 	}
 }
 
-func NewErrorResult(msg string, code ...RespCode) *Result[any] {
+func NewErrorResult[T any](msg string, code ...RespCode) *Result[T] {
 	// if code is not provided, the default code is CodeError
 	c := CodeError
 	if len(code) > 0 {
 		c = code[0]
 	}
 
-	return &Result[any]{
+	return &Result[T]{
 		Code: c,
 		Msg:  msg,
 	}

pkg/base/constants.go

@@ -15,7 +15,6 @@ const (
 	HttpCodeOK             = 200
 	HttpCodePartialContent = 206
 
-	HttpHeaderHost               = "Host"
 	HttpHeaderRange              = "Range"
 	HttpHeaderAcceptRanges       = "Accept-Ranges"
 	HttpHeaderContentLength      = "Content-Length"

pkg/base/model.go

@@ -171,6 +171,7 @@ type DownloaderStoreConfig struct {
 	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"`
+	Http           *DownloaderHttpConfig  `json:"http"`
 	Proxy          *DownloaderProxyConfig `json:"proxy"`
 }
 
@@ -181,6 +182,12 @@ func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
 	if cfg.ProtocolConfig == nil {
 		cfg.ProtocolConfig = make(map[string]any)
 	}
+	if cfg.Extra == nil {
+		cfg.Extra = make(map[string]any)
+	}
+	if cfg.Http == nil {
+		cfg.Http = &DownloaderHttpConfig{}
+	}
 	if cfg.Proxy == nil {
 		cfg.Proxy = &DownloaderProxyConfig{}
 	}
@@ -203,12 +210,28 @@ func (cfg *DownloaderStoreConfig) Merge(beforeCfg *DownloaderStoreConfig) *Downl
 	if cfg.Extra == nil {
 		cfg.Extra = beforeCfg.Extra
 	}
+	if cfg.Http == nil {
+		cfg.Http = beforeCfg.Http
+	}
 	if cfg.Proxy == nil {
 		cfg.Proxy = beforeCfg.Proxy
 	}
 	return cfg
 }
 
+type DownloaderHttpConfig struct {
+	// Enable is the flag that enable http server
+	Enable bool `json:"Enable"`
+	// Host is the http server listen address.
+	Host string `json:"host"`
+	// Port is the http server listen port.
+	Port int `json:"port"`
+	// ApiToken is the auth token for http API
+	ApiToken string `json:"apiToken"`
+	// RunningPort is the http server real listen port.
+	RunningPort int `json:"runningPort"`
+}
+
 type DownloaderProxyConfig struct {
 	Enable bool `json:"enable"`
 	// System is the flag that use system proxy

pkg/base/model_test.go

@@ -17,6 +17,8 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
 			&DownloaderStoreConfig{
 				MaxRunning:     5,
 				ProtocolConfig: map[string]any{},
+				Extra:          make(map[string]any),
+				Http:           &DownloaderHttpConfig{},
 				Proxy:          &DownloaderProxyConfig{},
 			},
 		},
@@ -28,6 +30,8 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
 			&DownloaderStoreConfig{
 				MaxRunning:     10,
 				ProtocolConfig: map[string]any{},
+				Extra:          make(map[string]any),
+				Http:           &DownloaderHttpConfig{},
 				Proxy:          &DownloaderProxyConfig{},
 			},
 		},
@@ -43,6 +47,8 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
 				ProtocolConfig: map[string]any{
 					"key": "value",
 				},
+				Extra: make(map[string]any),
+				Http:  &DownloaderHttpConfig{},
 				Proxy: &DownloaderProxyConfig{},
 			},
 		},
@@ -56,6 +62,8 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
 			&DownloaderStoreConfig{
 				MaxRunning:     5,
 				ProtocolConfig: map[string]any{},
+				Extra:          make(map[string]any),
+				Http:           &DownloaderHttpConfig{},
 				Proxy: &DownloaderProxyConfig{
 					Enable: true,
 				},

pkg/download/downloader.go

@@ -252,7 +252,7 @@ func (d *Downloader) setupFetcher(fm fetcher.FetcherManager, fetcher fetcher.Fet
 	ctl.GetConfig = func(v any) {
 		d.getProtocolConfig(fm.Name(), v)
 	}
-	// Get proxy config, task request proxy config has higher priority, then use global proxy config
+	// get proxy config, task request proxy config has higher priority, then use global proxy config
 	ctl.GetProxy = func(requestProxy *base.RequestProxy) func(*gohttp.Request) (*url.URL, error) {
 		if requestProxy == nil {
 			return d.cfg.Proxy.ToHandler()
@@ -390,7 +390,7 @@ func (d *Downloader) Pause(filter *TaskFilter) (err error) {
 		return d.pauseAll()
 	}
 
-	filter.NotStatuses = []base.Status{base.DownloadStatusPause, base.DownloadStatusError, base.DownloadStatusDone}
+	filter.NotStatus = []base.Status{base.DownloadStatusPause, base.DownloadStatusError, base.DownloadStatusDone}
 	pauseTasks := d.GetTasksByFilter(filter)
 	if len(pauseTasks) == 0 {
 		return ErrTaskNotFound
@@ -430,7 +430,7 @@ func (d *Downloader) Continue(filter *TaskFilter) (err error) {
 		return d.continueAll()
 	}
 
-	filter.NotStatuses = []base.Status{base.DownloadStatusRunning, base.DownloadStatusDone}
+	filter.NotStatus = []base.Status{base.DownloadStatusRunning, base.DownloadStatusDone}
 	continueTasks := d.GetTasksByFilter(filter)
 	if len(continueTasks) == 0 {
 		return ErrTaskNotFound
@@ -527,7 +527,7 @@ func (d *Downloader) ContinueBatch(filter *TaskFilter) (err error) {
 
 func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
 	if filter == nil || filter.IsEmpty() {
-		return d.deleteAll()
+		return d.deleteAll(force)
 	}
 
 	deleteTasks := d.GetTasksByFilter(filter)
@@ -572,24 +572,27 @@ func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
 	return
 }
 
-func (d *Downloader) deleteAll() (err error) {
+func (d *Downloader) deleteAll(force bool) (err error) {
+	deleteTasksPtr := make([]*Task, 0)
+
 	func() {
 		d.lock.Lock()
 		defer d.lock.Unlock()
 
+		deleteTasksPtr = append(deleteTasksPtr, d.tasks...)
 		d.tasks = make([]*Task, 0)
 		d.waitTasks = make([]*Task, 0)
 	}()
 
-	for _, task := range d.tasks {
+	for _, task := range deleteTasksPtr {
-		if err = d.doDelete(task, true); err != nil {
+		if err = d.doDelete(task, force); err != nil {
 			return
 		}
 	}
 	return
 }
 
-func (d *Downloader) Stats(id string) (sr any, err error) {
+func (d *Downloader) GetTaskStats(id string) (sr any, err error) {
 	task := d.GetTask(id)
 	if task == nil {
 		return sr, ErrTaskNotFound
@@ -719,10 +722,10 @@ func (d *Downloader) GetTasksByFilter(filter *TaskFilter) []*Task {
 	}
 
 	idMatch := func(task *Task) bool {
-		if len(filter.IDs) == 0 {
+		if len(filter.ID) == 0 {
 			return true
 		}
-		for _, id := range filter.IDs {
+		for _, id := range filter.ID {
 			if task.ID == id {
 				return true
 			}
@@ -730,10 +733,10 @@ func (d *Downloader) GetTasksByFilter(filter *TaskFilter) []*Task {
 		return false
 	}
 	statusMatch := func(task *Task) bool {
-		if len(filter.Statuses) == 0 {
+		if len(filter.Status) == 0 {
 			return true
 		}
-		for _, status := range filter.Statuses {
+		for _, status := range filter.Status {
 			if task.Status == status {
 				return true
 			}
@@ -741,10 +744,10 @@ func (d *Downloader) GetTasksByFilter(filter *TaskFilter) []*Task {
 		return false
 	}
 	notStatusMatch := func(task *Task) bool {
-		if len(filter.NotStatuses) == 0 {
+		if len(filter.NotStatus) == 0 {
 			return true
 		}
-		for _, status := range filter.NotStatuses {
+		for _, status := range filter.NotStatus {
 			if task.Status == status {
 				return false
 			}
@@ -826,7 +829,7 @@ func (d *Downloader) watch(task *Task) {
 	}
 
 	// When delete a not resolved task, need check if the task resource is nil
-	if task.Meta.Res == nil || d.GetTask(task.ID) == nil {
+	if task.Meta.Res == nil {
 		return
 	}
 

pkg/download/downloader_test.go

@@ -400,7 +400,7 @@ func TestDownloader_StoreAndRestore(t *testing.T) {
 		t.Fatal(err)
 	}
 	time.Sleep(time.Millisecond * 1001)
-	err = downloader.Pause(&TaskFilter{IDs: []string{id}})
+	err = downloader.Pause(&TaskFilter{ID: []string{id}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -424,7 +424,7 @@ func TestDownloader_StoreAndRestore(t *testing.T) {
 			wg.Done()
 		}
 	})
-	err = downloader.Continue(&TaskFilter{IDs: []string{id}})
+	err = downloader.Continue(&TaskFilter{ID: []string{id}})
 	wg.Wait()
 	if err != nil {
 		t.Fatal(err)
@@ -551,7 +551,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
 
 	t.Run("GetTasksByFilter ids", func(t *testing.T) {
 		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			IDs: taskIds,
+			ID: taskIds,
 		})
 		if len(tasks) != len(reqs) {
 			t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), len(reqs))
@@ -560,7 +560,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
 
 	t.Run("GetTasksByFilter match ids", func(t *testing.T) {
 		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			IDs: []string{taskIds[0]},
+			ID: []string{taskIds[0]},
 		})
 		if len(tasks) != 1 {
 			t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), 1)
@@ -569,7 +569,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
 
 	t.Run("GetTasksByFilter not match ids", func(t *testing.T) {
 		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			IDs: []string{"xxx"},
+			ID: []string{"xxx"},
 		})
 		if len(tasks) != 0 {
 			t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), 0)
@@ -578,7 +578,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
 
 	t.Run("GetTasksByFilter status", func(t *testing.T) {
 		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			Statuses: []base.Status{base.DownloadStatusDone},
+			Status: []base.Status{base.DownloadStatusDone},
 		})
 		if len(tasks) != len(reqs) {
 			t.Errorf("GetTasksByFilter status task got = %v, want %v", len(tasks), len(reqs))
@@ -587,7 +587,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
 
 	t.Run("GetTasksByFilter not match status", func(t *testing.T) {
 		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			Statuses: []base.Status{base.DownloadStatusError},
+			Status: []base.Status{base.DownloadStatusError},
 		})
 		if len(tasks) != 0 {
 			t.Errorf("GetTasksByFilter status task got = %v, want %v", len(tasks), 0)
@@ -596,7 +596,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
 
 	t.Run("GetTasksByFilter match notStatus", func(t *testing.T) {
 		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			NotStatuses: []base.Status{base.DownloadStatusRunning, base.DownloadStatusPause},
+			NotStatus: []base.Status{base.DownloadStatusRunning, base.DownloadStatusPause},
 		})
 		if len(tasks) != len(reqs) {
 			t.Errorf("GetTasksByFilter match notStatus task got = %v, want %v", len(tasks), len(reqs))
@@ -605,7 +605,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
 
 	t.Run("GetTasksByFilter not match notStatus", func(t *testing.T) {
 		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			NotStatuses: []base.Status{base.DownloadStatusDone},
+			NotStatus: []base.Status{base.DownloadStatusDone},
 		})
 		if len(tasks) != 0 {
 			t.Errorf("GetTasksByFilter not match notStatus task got = %v, want %v", len(tasks), 0)
@@ -614,8 +614,8 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
 
 	t.Run("GetTasksByFilter match ids and status", func(t *testing.T) {
 		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			IDs:      []string{taskIds[0]},
+			ID:     []string{taskIds[0]},
-			Statuses: []base.Status{base.DownloadStatusDone},
+			Status: []base.Status{base.DownloadStatusDone},
 		})
 		if len(tasks) != 1 {
 			t.Errorf("GetTasksByFilter match ids and status task got = %v, want %v", len(tasks), 1)
@@ -624,8 +624,8 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
 
 	t.Run("GetTasksByFilter not match ids and status", func(t *testing.T) {
 		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			IDs:      []string{taskIds[0]},
+			ID:     []string{taskIds[0]},
-			Statuses: []base.Status{base.DownloadStatusError},
+			Status: []base.Status{base.DownloadStatusError},
 		})
 		if len(tasks) != 0 {
 			t.Errorf("GetTasksByFilter not match ids and status task got = %v, want %v", len(tasks), 0)

pkg/download/extension.go

@@ -702,34 +702,38 @@ 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     *Task
 
-	*Task
+	Meta *ExtensionTaskMeta `json:"meta"`
+}
+
+// ExtensionTaskMeta restricts extension scripts to only modify request info
+type ExtensionTaskMeta struct {
+	Req *base.Request `json:"req"`
 }
 
 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:     newTask,
 		download: download,
-		Task:     newTask,
+		Meta: &ExtensionTaskMeta{
+			Req: task.Meta.Req,
+		},
 	}
 }
 
 func (t *ExtensionTask) Continue() error {
 	return t.download.Continue(&TaskFilter{
-		IDs: []string{t.ID},
+		ID: []string{t.task.ID},
 	})
 }
 
 func (t *ExtensionTask) Pause() error {
 	return t.download.Pause(&TaskFilter{
-		IDs: []string{t.ID},
+		ID: []string{t.task.ID},
 	})
 }
 

pkg/download/model.go

@@ -75,7 +75,7 @@ func (t *Task) Name() string {
 		return t.Meta.Res.Name
 	}
 
-	// Get the name of the first file
+	// get the name of the first file
 	return t.Meta.Res.Files[0].Name
 }
 
@@ -113,13 +113,13 @@ func (t *Task) calcSpeed(speedArr []int64, downloaded int64, usedTime float64) i
 }
 
 type TaskFilter struct {
-	IDs         []string
+	ID        []string      `json:"id"`
-	Statuses    []base.Status
+	Status    []base.Status `json:"status"`
-	NotStatuses []base.Status
+	NotStatus []base.Status `json:"notStatus"`
 }
 
 func (f *TaskFilter) IsEmpty() bool {
-	return len(f.IDs) == 0 && len(f.Statuses) == 0 && len(f.NotStatuses) == 0
+	return len(f.ID) == 0 && len(f.Status) == 0 && len(f.NotStatus) == 0
 }
 
 type DownloaderConfig struct {

pkg/rest/api.go

@@ -1,389 +0,0 @@
-package rest
-
-import (
-	"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"
-	"runtime"
-)
-
-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 base.Request
-	if ReadJson(r, w, &req) {
-		rr, err := Downloader.Resolve(&req)
-		if err != nil {
-			WriteJson(w, model.NewErrorResult(err.Error()))
-			return
-		}
-		WriteJson(w, model.NewOkResult(rr))
-	}
-}
-
-func CreateTask(w http.ResponseWriter, r *http.Request) {
-	var req model.CreateTask
-	if ReadJson(r, w, &req) {
-		var (
-			taskId string
-			err    error
-		)
-		if req.Rid != "" {
-			taskId, err = Downloader.Create(req.Rid, req.Opt)
-		} else if req.Req != nil {
-			taskId, err = Downloader.CreateDirect(req.Req, req.Opt)
-		} else {
-			WriteJson(w, model.NewErrorResult("param invalid: rid or req", model.CodeInvalidParam))
-			return
-		}
-		if err != nil {
-			WriteJson(w, model.NewErrorResult(err.Error()))
-			return
-		}
-		WriteJson(w, model.NewOkResult(taskId))
-	}
-}
-
-func CreateTaskBatch(w http.ResponseWriter, r *http.Request) {
-	var req model.CreateTaskBatch
-	if ReadJson(r, w, &req) {
-		if len(req.Reqs) == 0 {
-			WriteJson(w, model.NewErrorResult("param invalid: reqs", model.CodeInvalidParam))
-			return
-		}
-		taskIds, err := Downloader.CreateDirectBatch(req.Reqs, req.Opt)
-		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)
-		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 {
-		WriteJson(w, model.NewErrorResult(err.Error()))
-		return
-	}
-	WriteJson(w, model.NewNilResult())
-}
-
-func ContinueTask(w http.ResponseWriter, r *http.Request) {
-	filter, errResult := parseIdFilter(r)
-	if errResult != nil {
-		WriteJson(w, errResult)
-		return
-	}
-
-	if err := Downloader.Continue(filter); 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)
-		return
-	}
-
-	if err := Downloader.Continue(filter); err != nil {
-		WriteJson(w, model.NewErrorResult(err.Error()))
-		return
-	}
-	WriteJson(w, model.NewNilResult())
-}
-
-func DeleteTask(w http.ResponseWriter, r *http.Request) {
-	filter, errResult := parseIdFilter(r)
-	if errResult != nil {
-		WriteJson(w, errResult)
-		return
-	}
-	force := r.FormValue("force")
-
-	if err := Downloader.Delete(filter, force == "true"); err != nil {
-		WriteJson(w, model.NewErrorResult(err.Error()))
-		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 {
-		WriteJson(w, model.NewErrorResult(err.Error()))
-		return
-	}
-	WriteJson(w, model.NewNilResult())
-}
-
-func GetTask(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
-	}
-	task := Downloader.GetTask(taskId)
-	if task == nil {
-		WriteJson(w, model.NewErrorResult("task not found", model.CodeTaskNotFound))
-		return
-	}
-	WriteJson(w, model.NewOkResult(task))
-}
-
-func GetTasks(w http.ResponseWriter, r *http.Request) {
-	filter, errResult := parseFilter(r)
-	if errResult != nil {
-		WriteJson(w, errResult)
-		return
-	}
-
-	tasks := Downloader.GetTasksByFilter(filter)
-	WriteJson(w, model.NewOkResult(tasks))
-}
-
-func GetConfig(w http.ResponseWriter, r *http.Request) {
-	WriteJson(w, model.NewOkResult(getServerConfig()))
-}
-
-func PutConfig(w http.ResponseWriter, r *http.Request) {
-	var cfg base.DownloaderStoreConfig
-	if ReadJson(r, w, &cfg) {
-		if err := Downloader.PutConfig(&cfg); err != nil {
-			WriteJson(w, model.NewErrorResult(err.Error()))
-			return
-		}
-	}
-	WriteJson(w, model.NewNilResult())
-}
-
-func InstallExtension(w http.ResponseWriter, r *http.Request) {
-	var req model.InstallExtension
-	if ReadJson(r, w, &req) {
-		var (
-			installedExt *download.Extension
-			err          error
-		)
-		if req.DevMode {
-			installedExt, err = Downloader.InstallExtensionByFolder(req.URL, true)
-		} else {
-			installedExt, err = Downloader.InstallExtensionByGit(req.URL)
-		}
-		if err != nil {
-			WriteJson(w, model.NewErrorResult(err.Error()))
-			return
-		}
-		WriteJson(w, model.NewOkResult(installedExt.Identity))
-	}
-}
-
-func GetExtensions(w http.ResponseWriter, r *http.Request) {
-	list := Downloader.GetExtensions()
-	WriteJson(w, model.NewOkResult(list))
-}
-
-func GetExtension(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	identity := vars["identity"]
-	ext, err := Downloader.GetExtension(identity)
-	if err != nil {
-		WriteJson(w, model.NewErrorResult(err.Error()))
-		return
-	}
-	WriteJson(w, model.NewOkResult(ext))
-}
-
-func UpdateExtensionSettings(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	identity := vars["identity"]
-	var req model.UpdateExtensionSettings
-	if ReadJson(r, w, &req) {
-		if err := Downloader.UpdateExtensionSettings(identity, req.Settings); err != nil {
-			WriteJson(w, model.NewErrorResult(err.Error()))
-			return
-		}
-	}
-	WriteJson(w, model.NewNilResult())
-}
-
-func SwitchExtension(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	identity := vars["identity"]
-	var switchExtension model.SwitchExtension
-	if ReadJson(r, w, &switchExtension) {
-		if err := Downloader.SwitchExtension(identity, switchExtension.Status); err != nil {
-			WriteJson(w, model.NewErrorResult(err.Error()))
-			return
-		}
-	}
-	WriteJson(w, model.NewNilResult())
-}
-
-func DeleteExtension(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	identity := vars["identity"]
-	if err := Downloader.DeleteExtension(identity); err != nil {
-		WriteJson(w, model.NewErrorResult(err.Error()))
-		return
-	}
-	WriteJson(w, model.NewNilResult())
-}
-
-func UpdateCheckExtension(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	identity := vars["identity"]
-	newVersion, err := Downloader.UpgradeCheckExtension(identity)
-	if err != nil {
-		WriteJson(w, model.NewErrorResult(err.Error()))
-		return
-	}
-	WriteJson(w, model.NewOkResult(&model.UpdateCheckExtensionResp{
-		NewVersion: newVersion,
-	}))
-}
-
-func UpdateExtension(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	identity := vars["identity"]
-	if err := Downloader.UpgradeExtension(identity); err != nil {
-		WriteJson(w, model.NewErrorResult(err.Error()))
-		return
-	}
-	WriteJson(w, model.NewNilResult())
-}
-
-func DoProxy(w http.ResponseWriter, r *http.Request) {
-	target := r.Header.Get("X-Target-Uri")
-	if target == "" {
-		writeError(w, "param invalid: X-Target-Uri")
-		return
-	}
-	targetUrl, err := url.Parse(target)
-	if err != nil {
-		writeError(w, err.Error())
-		return
-	}
-	r.RequestURI = ""
-	r.URL = targetUrl
-	r.Host = targetUrl.Host
-	resp, err := http.DefaultClient.Do(r)
-	if err != nil {
-		writeError(w, err.Error())
-		return
-	}
-	defer resp.Body.Close()
-	for k, vv := range resp.Header {
-		for _, v := range vv {
-			w.Header().Set(k, v)
-		}
-	}
-	w.WriteHeader(resp.StatusCode)
-	buf, err := io.ReadAll(resp.Body)
-	if err != nil {
-		writeError(w, err.Error())
-		return
-	}
-	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 {
-	cfg, _ := Downloader.GetConfig()
-	return cfg
-}

pkg/rest/config.go

@@ -1,6 +0,0 @@
-package rest
-
-type Config struct {
-	Host string `json:"host"`
-	Port int    `json:"port"`
-}

pkg/rest/server.go

@@ -1,241 +0,0 @@
-package rest
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"github.com/GopeedLab/gopeed/pkg/download"
-	"github.com/GopeedLab/gopeed/pkg/rest/model"
-	"github.com/GopeedLab/gopeed/pkg/util"
-	"github.com/gorilla/handlers"
-	"github.com/gorilla/mux"
-	"github.com/pkg/errors"
-	"net"
-	"net/http"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-)
-
-var (
-	srv         *http.Server
-	runningPort int
-
-	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)
-	if err != nil {
-		return
-	}
-
-	go func() {
-		if err := srv.Serve(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
-			panic(err)
-		}
-	}()
-
-	if addr, ok := listener.Addr().(*net.TCPAddr); ok {
-		port = addr.Port
-		runningPort = port
-	}
-	return
-}
-
-func Stop() {
-	defer func() {
-		srv = nil
-	}()
-
-	if srv != nil {
-		if err := srv.Shutdown(context.TODO()); err != nil {
-			Downloader.Logger.Warn().Err(err).Msg("shutdown server failed")
-		}
-	}
-	if Downloader != nil {
-		if err := Downloader.Close(); err != nil {
-			Downloader.Logger.Warn().Err(err).Msg("close downloader failed")
-		}
-	}
-}
-
-func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error) {
-	if startCfg == nil {
-		startCfg = &model.StartConfig{}
-	}
-	startCfg.Init()
-
-	downloadCfg := &download.DownloaderConfig{
-		ProductionMode:  startCfg.ProductionMode,
-		RefreshInterval: startCfg.RefreshInterval,
-	}
-	if startCfg.Storage == model.StorageBolt {
-		downloadCfg.Storage = download.NewBoltStorage(startCfg.StorageDir)
-	} else {
-		downloadCfg.Storage = download.NewMemStorage()
-	}
-	downloadCfg.StorageDir = startCfg.StorageDir
-	downloadCfg.Init()
-	Downloader = download.NewDownloader(downloadCfg)
-	if err := Downloader.Setup(); err != nil {
-		return nil, nil, err
-	}
-
-	if startCfg.Network == "unix" {
-		util.SafeRemove(startCfg.Address)
-	}
-
-	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.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)
-	r.Methods(http.MethodGet).Path("/api/v1/extensions").HandlerFunc(GetExtensions)
-	r.Methods(http.MethodGet).Path("/api/v1/extensions/{identity}").HandlerFunc(GetExtension)
-	r.Methods(http.MethodPut).Path("/api/v1/extensions/{identity}/settings").HandlerFunc(UpdateExtensionSettings)
-	r.Methods(http.MethodPut).Path("/api/v1/extensions/{identity}/switch").HandlerFunc(SwitchExtension)
-	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.Path("/api/v1/proxy").HandlerFunc(DoProxy)
-	if startCfg.WebEnable {
-		r.PathPrefix("/fs/tasks").Handler(http.FileServer(new(taskFileSystem)))
-		r.PathPrefix("/fs/extensions").Handler(http.FileServer(new(extensionFileSystem)))
-		r.PathPrefix("/").Handler(http.FileServer(http.FS(startCfg.WebFS)))
-	}
-
-	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 startCfg.ApiToken != "" && r.Header.Get("X-Api-Token") == startCfg.ApiToken {
-					h.ServeHTTP(w, r)
-					return
-				}
-				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))
-			})
-		})
-	}
-
-	// recover panic
-	r.Use(func(h http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			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)
-					WriteJson(w, model.NewErrorResult(err.Error(), model.CodeError))
-				}
-			}()
-			h.ServeHTTP(w, r)
-		})
-	})
-
-	srv = &http.Server{Handler: handlers.CORS(
-		handlers.AllowedHeaders([]string{"Content-Type", "X-Api-Token", "X-Target-Uri"}),
-		handlers.AllowedMethods([]string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"}),
-		handlers.AllowedOrigins([]string{"*"}),
-	)(r)}
-	return srv, listener, nil
-}
-
-func resolvePath(urlPath string, prefix string) (identity string, path string, err error) {
-	// remove prefix
-	clearPath := strings.TrimPrefix(urlPath, prefix)
-	// match extension identity, eg: /fs/extensions/identity/xxx
-	reg := regexp.MustCompile(`^/([^/]+)/(.*)$`)
-	if !reg.MatchString(clearPath) {
-		err = os.ErrNotExist
-		return
-	}
-	matched := reg.FindStringSubmatch(clearPath)
-	if len(matched) != 3 {
-		err = os.ErrNotExist
-		return
-	}
-	return matched[1], matched[2], nil
-}
-
-// handle task file resource
-type taskFileSystem struct {
-}
-
-func (e *taskFileSystem) Open(name string) (http.File, error) {
-	// get extension identity
-	identity, path, err := resolvePath(name, "/fs/tasks")
-	if err != nil {
-		return nil, err
-	}
-	task := Downloader.GetTask(identity)
-	if task == nil {
-		return nil, os.ErrNotExist
-	}
-	return os.Open(filepath.Join(task.Meta.RootDirPath(), path))
-}
-
-// handle extension file resource
-type extensionFileSystem struct {
-}
-
-func (e *extensionFileSystem) Open(name string) (http.File, error) {
-	// get extension identity
-	identity, path, err := resolvePath(name, "/fs/extensions")
-	if err != nil {
-		return nil, err
-	}
-	extension, err := Downloader.GetExtension(identity)
-	if err != nil {
-		return nil, os.ErrNotExist
-	}
-	extensionPath := Downloader.ExtensionPath(extension)
-	return os.Open(filepath.Join(extensionPath, path))
-}
-
-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()))
-		return false
-	}
-	return true
-}
-
-func WriteJson(w http.ResponseWriter, v any) {
-	WriteStatusJson(w, http.StatusOK, v)
-}
-
-func WriteStatusJson(w http.ResponseWriter, statusCode int, v any) {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(statusCode)
-	json.NewEncoder(w).Encode(v)
-}

pkg/util/url.go

@@ -10,6 +10,7 @@ import (
 
 func ParseSchema(url string) string {
 	index := strings.Index(url, ":")
+	// if no schema or windows path like C:\a.txt, return FILE
 	if index == -1 || index == 1 {
 		return ""
 	}

ui/flutter/.gitignore

@@ -68,6 +68,3 @@ windows/flutter/generated_plugins.cmake
 # Hive database files
 database.hive
 database.lock
-
-assets/host/host
-assets/host/host.exe

ui/flutter/android/app/build.gradle

@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.gopeed.gopeed"
+        applicationId "com.gopeed"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         minSdkVersion 21

ui/flutter/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gopeed.gopeed">
+    package="com.gopeed">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

ui/flutter/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gopeed.gopeed">
+    package="com.gopeed">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />

ui/flutter/android/app/src/main/kotlin/com/gopeed/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.gopeed.gopeed
+package com.gopeed
 
 import androidx.annotation.NonNull
 import com.gopeed.libgopeed.Libgopeed