test

.dockerignore

@@ -1,16 +0,0 @@
-.git
-
-*.data
-*.log
-
-node_modules
-**/node_modules
-
-Dockerfile
-.dockerignore
-
-.github
-_docs
-_examples
-bin
-ui

.github/CODEOWNERS

@@ -1 +0,0 @@
-* @monkeyWie

.github/release-drafter.yml

@@ -11,15 +11,12 @@ categories:
       - 'fix'
       - 'bugfix'
       - 'bug'
-  - title: '🔧 Performance Improvements'
-    labels:
-      - 'perf'
   - title: '🧪 Tests'
     label: 'test'
   - title: '🧰 Maintenance'
     label: 'chore'
   - title: '📖 Document'
-    label: 'docs'
+    label: 'doc'
   - title: '🚀 CI/CD'
     label: 'ci'
   - title: '🌎 Internationalization'
@@ -37,7 +34,7 @@ version-resolver:
       - 'patch'
   default: patch
 template: |
-  # Release notes
+  # Changes
 
   $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:
+      channel:
-        description: "Test mode"
+        description: 'Snap channel'
         required: true
-        default: "false"
+        default: 'stable'
 
 env:
-  GO_VERSION: "1.22"
+  GO_VERSION: "1.19"
-  FLUTTER_VERSION: "3.24.3"
+  FLUTTER_VERSION: "3.16.1"
 
 permissions:
   contents: write
@@ -23,11 +23,11 @@ jobs:
   get-release:
     runs-on: ubuntu-latest
     outputs:
-      version: ${{ steps.get-release.outputs.version }}
+      tag_name: ${{ steps.get-release.outputs.tag_name }}
       upload_url: ${{ steps.get-release.outputs.upload_url }}
 
     steps:
-      - uses: monkeyWie/get-latest-release@v2.1
+      - uses: monkeyWie/get-latest-release@v1
         id: get-release
         with:
           myToken: ${{ github.token }}
@@ -35,25 +35,24 @@ jobs:
   build-windows:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'windows' }}
     runs-on: windows-latest
-    needs: [get-release]
+    needs: [ get-release ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: "1.20"
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Build
         env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
         run: |
           Invoke-WebRequest -Uri "https://github.com/jrsoftware/issrc/raw/main/Files/Languages/Unofficial/ChineseSimplified.isl" -OutFile "ChineseSimplified.isl"
           mv ChineseSimplified.isl "C:\Program Files (x86)\Inno Setup 6\Languages\"
 
-          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$env:VERSION" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
           cd ui/flutter
-          $TAG = "v$env:VERSION"
           flutter build windows
           $mingw = "C:\Program Files\Git\mingw64\bin"
           $system = "C:\Windows\System32"
@@ -66,7 +65,7 @@ jobs:
           cp $system\vcruntime140_1.dll $release
 
           New-Item -Path build\windows\Output -ItemType Directory
-          Compress-Archive -Path "$release*" -DestinationPath "build\windows\Output\Gopeed-$TAG-windows-amd64-portable.zip"
+          Compress-Archive -Path "$release*" -DestinationPath "build\windows\Output\Gopeed-$env:VERSION-windows-amd64-portable.zip"
 
           cd build/windows
           echo @"
@@ -74,7 +73,7 @@ jobs:
           ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
           #define MyAppName "Gopeed"
-          #define MyAppVersion "$env:VERSION"
+          #define MyAppVersion "$($env:VERSION.substring(1))"
           #define MyAppPublisher "monkeyWie"
           #define MyAppURL "https://gopeed.com"
           #define MyAppExeName "gopeed.exe"
@@ -125,9 +124,9 @@ jobs:
           Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
           "@ > setup.iss
           iscc.exe setup.iss
-          mv "Output\gopeed.exe" "Output\Gopeed-$TAG-windows-amd64.exe"
+          mv "Output\gopeed.exe" "Output\Gopeed-$env:VERSION-windows-amd64.exe"
-          Compress-Archive -Path "Output\Gopeed-$TAG-windows-amd64.exe" -DestinationPath "Output\Gopeed-$TAG-windows-amd64.zip"
+          Compress-Archive -Path "Output\Gopeed-$env:VERSION-windows-amd64.exe" -DestinationPath "Output\Gopeed-$env:VERSION-windows-amd64.zip"
-          Remove-Item -Path "Output\Gopeed-$TAG-windows-amd64.exe"
+          Remove-Item -Path "Output\Gopeed-$env:VERSION-windows-amd64.exe"
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -136,26 +135,26 @@ jobs:
           overwrite: true
   build-macos-arm64-lib:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
-    needs: [get-release]
+    needs: [ get-release ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Build
-        env:
-          VERSION: ${{ needs.get-release.outputs.version }}
         run: |
-          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
+          go install src.techknowlogick.com/xgo@latest
+          xgo -go go-$GO_VERSION.x --targets=darwin/arm64 -tags="nosqlite" -ldflags="-w -s" -buildmode=c-shared -pkg=bind/desktop -out=libgopeed .
+          mv libgopeed-*.dylib libgopeed.dylib
       - uses: actions/upload-artifact@v3
         with:
           name: macos-arm64-lib
           path: libgopeed.dylib
   build-macos:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
-    runs-on: macos-13
+    runs-on: macos-latest
-    needs: [get-release, build-macos-arm64-lib]
+    needs: [ get-release, build-macos-arm64-lib ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -169,7 +168,7 @@ jobs:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Install appdmg
         run: |
-          python3 -m pip install setuptools --break-system-packages
+          python3 -m pip install setuptools
           npm install -g appdmg
       - uses: actions/download-artifact@v3
         with:
@@ -177,12 +176,12 @@ jobs:
           path: ui/flutter/lib-arm64
       - name: Build
         env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
         run: |
           PROJECT_DIR=$(pwd)
 
           # amd64 lib
-          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/lib-amd64/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/lib-amd64/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
           # universal binary
           mkdir -p ui/flutter/macos/Frameworks
           cp ui/flutter/lib-amd64/libgopeed.dylib ui/flutter/macos/Frameworks/amd64-lib
@@ -204,7 +203,7 @@ jobs:
           }
           EOF
           mkdir dist
-          appdmg appdmg.json dist/Gopeed-v$VERSION-macos.dmg
+          appdmg appdmg.json dist/Gopeed-$VERSION-macos.dmg
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -213,8 +212,8 @@ jobs:
           overwrite: true
   build-linux:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'linux' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
-    needs: [get-release]
+    needs: [ get-release ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -226,7 +225,9 @@ jobs:
       - run: |
           sudo apt update -y
           # flutter build dependencies
-          sudo apt install -y ninja-build libgtk-3-dev libayatana-appindicator3-1 libayatana-appindicator3-dev
+          sudo apt install -y ninja-build libgtk-3-dev libappindicator3-dev
+          # rpm build dependencies
+          sudo apt install -y rpm patchelf
           # appimage build dependencies
           sudo apt install -y libfuse2 locate
           wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
@@ -234,15 +235,15 @@ jobs:
           sudo mv appimagetool /usr/local/bin/
       - name: Build
         env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
         run: |
-          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
           cd ui/flutter
           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
           cd dist/*
-          mv gopeed-*-linux.AppImage Gopeed-v${VERSION}-linux-x86_64.AppImage
+          mv gopeed-*-linux.AppImage Gopeed-${VERSION}-linux-x86_64.AppImage
-          mv gopeed-*-linux.deb Gopeed-v${VERSION}-linux-amd64.deb
+          mv gopeed-*-linux.deb Gopeed-${VERSION}-linux-amd64.deb
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -252,21 +253,24 @@ jobs:
   build-snap:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'snap' }}
     runs-on: ubuntu-latest
-    needs: [get-release]
+    needs: [ get-release ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Setup LXD
         uses: canonical/[email protected]
         with:
           channel: latest/stable
       - name: Build
         env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
         run: |
-          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
           cd ui/flutter
           
           sudo snap install snapcraft --classic
@@ -275,7 +279,7 @@ jobs:
           
           cat>snap/snapcraft.yaml<<EOF
           name: gopeed
-          version: $VERSION
+          version: ${VERSION:1}
           summary: A modern download manager
           description: High speed downloader that supports all platforms.
           
@@ -295,55 +299,20 @@ jobs:
           
           apps:
             gopeed:
-              command: bin/gopeed
+              command: gopeed
               extensions: [gnome]
               plugs:
                 - network
-                - home
               slots:
                 - dbus-gopeed
           parts:
-            flutter-git:
-              source: https://github.com/flutter/flutter.git
-              source-tag: $FLUTTER_VERSION
-              source-depth: 1
-              plugin: nil
-              override-build: |
-                mkdir -p \$CRAFT_PART_INSTALL/usr/bin
-                mkdir -p \$CRAFT_PART_INSTALL/usr/libexec
-                cp -r \$CRAFT_PART_SRC \$CRAFT_PART_INSTALL/usr/libexec/flutter
-                ln -s \$CRAFT_PART_INSTALL/usr/libexec/flutter/bin/flutter \$CRAFT_PART_INSTALL/usr/bin/flutter
-                ln -s \$SNAPCRAFT_PART_INSTALL/usr/libexec/flutter/bin/dart \$SNAPCRAFT_PART_INSTALL/usr/bin/dart
-                \$CRAFT_PART_INSTALL/usr/bin/flutter doctor
-              build-packages:
-                - clang
-                - cmake
-                - curl
-                - libgtk-3-dev
-                - ninja-build
-                - unzip
-                - xz-utils
-                - zip
-              override-prime: ''
-            zenity:
-              plugin: nil
-              stage-packages:
-                - zenity
             gopeed:
-              after: [flutter-git,zenity]
               source: .
-              plugin: nil
+              plugin: flutter
               stage-packages:
                 - libgtk-3-dev
                 - libappindicator3-dev
-              override-build: |
+              flutter-target: lib/main.dart
-                # work around pub get stack overflow # https://github.com/dart-lang/sdk/issues/51068#issuecomment-1396588253
-                set +e
-                dart pub get
-                set -eux
-                flutter build linux --release -v
-                mkdir -p \$CRAFT_PART_INSTALL/bin/
-                cp -r build/linux/*/release/bundle/* \$CRAFT_PART_INSTALL/bin/
           EOF
           
           cp linux/assets/com.gopeed.Gopeed.desktop snap/gui/gopeed.desktop
@@ -353,11 +322,11 @@ jobs:
 
           # Snapcraft login
           export SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.SNAP_STORE_LOGIN }}
-          snapcraft upload --release=${{ github.event.inputs.test == 'true' && 'edge' || 'stable' }} gopeed_${VERSION}_amd64.snap
+          snapcraft upload --release=${{ github.event.inputs.channel }} gopeed_${VERSION:1}_amd64.snap
   build-android:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'android' }}
     runs-on: ubuntu-latest
-    needs: [get-release]
+    needs: [ get-release ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -366,13 +335,13 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: "zulu"
-          java-version: "17"
+          java-version: "11"
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Build
         env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
           APK_KEYSTORE: ${{ secrets.APK_KEYSTORE }}
           APK_KEY_PASSWORD: ${{ secrets.APK_KEY_PASSWORD }}
           APK_STORE_PASSWORD: ${{ secrets.APK_STORE_PASSWORD }}
@@ -380,12 +349,12 @@ jobs:
           go install golang.org/x/mobile/cmd/gomobile@latest
           go get golang.org/x/mobile/bind
           gomobile init
-          gomobile bind -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
+          gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
           cd ui/flutter
           echo $APK_KEYSTORE | base64 -di > android/app/upload-keystore.jks
           flutter build apk
           mkdir dist
-          cp build/app/outputs/flutter-apk/app-release.apk dist/Gopeed-v$VERSION-android.apk
+          cp build/app/outputs/flutter-apk/app-release.apk dist/Gopeed-$VERSION-android.apk
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -395,7 +364,7 @@ jobs:
   build-ios:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'ios' }}
     runs-on: macos-latest
-    needs: [get-release]
+    needs: [ get-release ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -406,19 +375,19 @@ jobs:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Build
         env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
         run: |
           go install golang.org/x/mobile/cmd/gomobile@latest
           go get golang.org/x/mobile/bind
           gomobile init
-          gomobile bind -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -o ui/flutter/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
+          gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
           cd ui/flutter
           flutter build ios --no-codesign
           mkdir Payload
           cp -r build/ios/iphoneos/Runner.app Payload
           zip -r -y Payload.zip Payload/Runner.app
           mkdir dist
-          mv Payload.zip dist/Gopeed-v$VERSION-ios.ipa
+          mv Payload.zip dist/Gopeed-$VERSION-ios.ipa
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -428,7 +397,7 @@ jobs:
   build-web:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'web' }}
     runs-on: ubuntu-latest
-    needs: [get-release]
+    needs: [ get-release ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -439,14 +408,13 @@ jobs:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Build
         env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
         run: |
           cd ui/flutter
           flutter build web --web-renderer html
           cd ../../
           cp -r ui/flutter/build/web cmd/web/dist
           mkdir -p dist/zip
-
           goos_arr=(windows darwin linux)
           goarch_arr=(386 amd64 arm64)
           export CGO_ENABLED=0
@@ -456,9 +424,9 @@ jobs:
               if [ $goos = "darwin" ]; then
                 goos_name="macos"
               fi
-              name=gopeed-web-v$VERSION-$goos_name-$goarch
+              name=gopeed-web-$VERSION-$goos_name-$goarch
               dir="dist/$name/"
-              (GOOS=$goos GOARCH=$goarch go build -tags nosqlite,web -ldflags="-s -w -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -o $dir github.com/GopeedLab/gopeed/cmd/web \
+              (GOOS=$goos GOARCH=$goarch go build -tags nosqlite,web -ldflags="-s -w" -o $dir github.com/GopeedLab/gopeed/cmd/web \
               && cd $dir \
               && file=$(ls -AU | head -1) \
               && mkdir $name \
@@ -477,15 +445,12 @@ jobs:
   build-docker:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'docker' }}
     runs-on: ubuntu-latest
-    needs: [get-release]
+    needs: [ get-release ]
     steps:
       - name: Remove unnecessary files
         run: |
           sudo rm -rf /usr/share/dotnet
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-      - uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
       - uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -496,28 +461,18 @@ jobs:
         with:
           username: liwei2633
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build flutter web
-        run: |
-          cd ui/flutter
-          flutter build web --web-renderer html
-          cd ../../
-          rm -rf cmd/web/dist
-          cp -r ui/flutter/build/web cmd/web/dist
       - name: Build and push
         uses: docker/build-push-action@v2
         env:
-          VERSION: ${{ needs.get-release.outputs.version }}
+          VERSION: ${{ needs.get-release.outputs.tag_name }}
         with:
-          context: .
+          push: true
-          push: ${{ github.event.inputs.test == 'true' && 'false' || 'true' }}
-          build-args: |
-            VERSION=${{ env.VERSION }}
-            IN_DOCKER=true
           platforms: |
             linux/386
             linux/amd64
             linux/arm64
+            linux/arm/v6
             linux/arm/v7
           tags: |
             liwei2633/gopeed:latest
-            liwei2633/gopeed:v${{ env.VERSION }}
+            liwei2633/gopeed:${{ env.VERSION }}

.github/workflows/release.yml

@@ -17,7 +17,7 @@ on:
       - "Dockerfile"
 
 env:
-  GO_VERSION: "1.22"
+  GO_VERSION: "1.19"
 
 permissions:
   contents: write

.github/workflows/test.yml

@@ -27,8 +27,8 @@ on:
       - "go.sum"
 
 env:
-  GO_VERSION: "1.22"
+  GO_VERSION: "1.19"
-  FLUTTER_VERSION: "3.24.3"
+  FLUTTER_VERSION: "3.16.1"
 
 jobs:
   #  lint:
@@ -54,10 +54,9 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
       - name: Run Unit tests.
         run: go test $(go list ./... | grep -v /cmd/ | grep -v /bind/ ) -v -covermode=count -coverprofile=coverage.txt
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v3
         with:
           files: ./coverage.txt
-          token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
   build:
     name: Build check
     runs-on: ubuntu-latest

CONTRIBUTING.md

@@ -21,7 +21,6 @@ The internationalization files of Gopeed are located in the `ui/flutter/lib/i18n
 You only need to add the corresponding language file in this directory.
 
 Please refer to `en_us.dart` for translation.
-words prefixed with `@` are not meant to be translated.
 
 ## flutter development
 

CONTRIBUTING_vi-VN.md

@@ -1,29 +0,0 @@
-# Hướng dẫn đóng góp cho Gopeed
-
-Trước tiên, cảm ơn bạn đã quan tâm đến việc đóng góp cho Gopeed. Hướng dẫn này sẽ giúp bạn tham gia
-phát triển Gopeed một cách tốt hơn.
-
-## Mô tả nhánh
-
-Dự án này chỉ có một nhánh chính duy nhất, đó là nhánh `main`. Nếu bạn muốn tham gia vào
-phát triển Gopeed, hãy fork dự án này trước, sau đó phát triển trong dự án fork của bạn. Sau khi
-hoàn thành phát triển, gửi một PR đến dự án này và merge vào nhánh `main`.
-
-## Phát triển cục bộ
-
-Đề nghị phát triển và gỡ lỗi thông qua web. Đầu tiên, khởi động dịch vụ backend bằng cách chạy
-lệnh `go run cmd/api/main.go` trong dòng lệnh, cổng mặc định của dịch vụ là `9999`, sau đó
-khởi động dự án flutter frontend trong chế độ `debug` để chạy.
-
-## Dịch thuật
-
-Các tệp quốc tế hóa của Gopeed được đặt trong thư mục `ui/flutter/lib/i18n/langs`.
-Bạn chỉ cần thêm tệp ngôn ngữ tương ứng trong thư mục này.
-
-Vui lòng tham khảo `en_us.dart` để biết cách dịch thuật.
-
-## Phát triển flutter
-
-Đừng quên chạy `dart format ./ui/flutter` trước khi commit để giữ mã của bạn theo định dạng dart chuẩn.
-
-Bật build_runner watcher nếu bạn muốn chỉnh sửa api/models:

Dockerfile

@@ -1,24 +1,22 @@
-FROM golang:1.22.6 AS go
+FROM instrumentisto/flutter:3.16.1 AS flutter
+WORKDIR /app
+COPY ./ui/flutter/pubspec.yaml ./ui/flutter/pubspec.lock ./
+RUN flutter pub get
+COPY ./ui/flutter ./
+RUN flutter build web --web-renderer html
+
+FROM golang:1.19.3 AS go
 WORKDIR /app
 COPY ./go.mod ./go.sum ./
 RUN go mod download
 COPY . .
-ARG VERSION=dev
+COPY --from=flutter /app/build/web ./cmd/web/dist
-RUN CGO_ENABLED=0 go build -tags nosqlite,web \
+RUN CGO_ENABLED=0 go build -tags nosqlite,web -ldflags="-s -w" -o dist/gopeed github.com/GopeedLab/gopeed/cmd/web
-      -ldflags="-s -w -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION -X github.com/GopeedLab/gopeed/pkg/base.InDocker=true" \
-      -o dist/gopeed github.com/GopeedLab/gopeed/cmd/web
 
 FROM alpine:3.14.2
 LABEL maintainer="monkeyWie"
 WORKDIR /app
 COPY --from=go /app/dist/gopeed ./
-COPY entrypoint.sh ./entrypoint.sh
-RUN apk update && \
-    apk upgrade --no-cache && \
-    apk add --no-cache bash su-exec; \
-    chmod +x ./entrypoint.sh && \
-    rm -rf /var/cache/apk/*
 VOLUME ["/app/storage"]
-ENV PUID=0 PGID=0 UMASK=022
 EXPOSE 9999
-ENTRYPOINT ["./entrypoint.sh"]
+ENTRYPOINT ["./gopeed"]

README.md

@@ -1,5 +1,3 @@
-# [![](_docs/img/banner.png)](https://gopeed.com)
-
 [![Test Status](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
 [![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
 [![Release](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
@@ -7,84 +5,34 @@
 [![Donate](https://img.shields.io/badge/%24-donate-ff69b4.svg)](https://docs.gopeed.com/donate.html)
 [![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)
 
-<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+![](_docs/img/banner.png)
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
 
-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md)
 
 ## Introduction
 
 Gopeed (full name Go Speed), a high-speed downloader developed by `Golang` + `Flutter`, supports (HTTP, BitTorrent, Magnet) protocol, and supports all platforms. In addition to basic download functions, Gopeed is also a highly customizable downloader that supports implementing more features through integration with [APIs](https://docs.gopeed.com/dev-api.html) or installation and development of [extensions](https://docs.gopeed.com/dev-extension.html).
 
+
 Visit ✈ [Official Website](https://gopeed.com) | 📖 [Official Docs](https://docs.gopeed.com)
 
-## Download
+## Install
 
-<table>
+**Supported platforms**
-    <thead>
-        <tr>
-            <th>Platform</th>
-            <th>Package Type</th>
-            <th>Download Link</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td rowspan=2>Windows</td>
-            <td><code>EXE Installer</code></td>
-            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Link</a></td>
-        </tr>
-        <tr>
-            <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>
-        </tr>
-    </tbody>
-</table>
 
-More about installation, please refer to [Installation](https://docs.gopeed.com/install.html)
+- [x] windows
+- [x] macos
+- [x] linux
+- [x] android
+- [x] ios
+- [x] web
+- [x] docker
+
+[Download](https://github.com/GopeedLab/gopeed/releases/latest)
+
+> Tips: If the macos open failed, please execute the `xattr -d com.apple.quarantine /Applications/Gopeed.app` command in the terminal
 
 ### Command tool
 
@@ -94,9 +42,25 @@ use `go install`:
 go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ```
 
-## Browser Extension
+### Docker
 
-Gopeed also provides a browser extension to take over browser downloads, supporting browsers such as Chrome, Edge, Firefox, etc., please refer to: [https://github.com/GopeedLab/browser-extension](https://github.com/GopeedLab/browser-extension)
+#### Start directly
+
+```bash
+docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads -v /path/to/storage:/app/storage liwei2633/gopeed
+```
+
+[More details for docker](https://docs.gopeed.com/install.html#docker-installation)
+
+#### Using Docker Compose
+
+```bash
+docker-compose up -d
+```
+
+#### Access Gopeed
+
+When the docker container is running, you can access the web page through `http://localhost:9999`.
 
 ## Donate
 
@@ -114,8 +78,8 @@ This project is divided into two parts, the front end uses `flutter`, the back e
 
 ### Environment
 
-1. Golang 1.22+
+1. Golang 1.19+
-2. Flutter 3.24+
+2. Flutter 3.10+
 
 ### Clone
 
@@ -174,7 +138,7 @@ command:
 - android
 
 ```bash
-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
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

README_ja-JP.md

@@ -1,5 +1,3 @@
-# [![](_docs/img/banner.png)](https://gopeed.com)
-
 [![Test Status](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
 [![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
 [![Release](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
@@ -7,11 +5,11 @@
 [![Donate](https://img.shields.io/badge/%24-donate-ff69b4.svg)](https://docs.gopeed.com/donate.html)
 [![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)
 
-<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+![](_docs/img/banner.png)
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
 
-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md)
 
 ## はじめに
 
@@ -21,74 +19,51 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
 
 ## インストール
 
-<table>
+**サポートするプラットフォーム**
-    <thead>
-        <tr>
-            <th>Platform</th>
-            <th>Package Type</th>
-            <th>Download Link</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td rowspan=2>Windows</td>
-            <td><code>EXE Installer</code></td>
-            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Link</a></td>
-        </tr>
-        <tr>
-            <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>
-        </tr>
-    </tbody>
-</table>
 
-インストールについての詳細は、[インストール](https://docs.gopeed.com/install.html)を参照してください。
+- [x] windows
+- [x] macos
+- [x] linux
+- [x] android
+- [x] ios
+- [x] web
+- [x] docker
+
+[ダウンロード](https://github.com/GopeedLab/gopeed/releases/latest)
+
+> ヒント: macos を開くのに失敗した場合は、ターミナルで `xattr -d com.apple.quarantine /Applications/Gopeed.app` コマンドを実行してください
+
+### コマンドツール
+
+`go install` を使用:
+
+```bash
+go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
+```
+
+### Docker
+
+#### 直接始める
+
+```bash
+docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads -v /path/to/storage:/app/storage liwei2633/gopeed
+```
+
+[Dockerの使用については](https://docs.gopeed.com/install.html#docker-installation)
+
+#### Docker Compose の使用
+
+```bash
+docker-compose up -d
+```
+
+#### Gopeed へのアクセス
+
+docker コンテナが起動しているときは、`http://localhost:9999` からウェブページにアクセスできます。
 
 ## 寄付
 
-もしこのプロジェクトがお気に召しましたら、このプロジェクトの発展を支援するために[寄付](https://docs.gopeed.com/donate.html)をご検討ください！
+もしこのプロジェクトがお気に召しましたら、このプロジェクトの発展を支援するために[寄付](/.donate/index.md#donate)をご検討ください！
 
 ## ショーケース
 
@@ -102,8 +77,8 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
 
 ### 環境
 
-1. Go 言語 1.22+
+1. Go 言語 1.19+
-2. Flutter 3.24+
+2. Flutter 3.10+
 
 ### クローン
 
@@ -162,7 +137,7 @@ gomobile init
 - android
 
 ```bash
-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
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

README_vi-VN.md

@@ -1,213 +0,0 @@
-# [![](_docs/img/banner.png)](https://gopeed.com)
-
-[![Trạng thái kiểm tra](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
-[![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
-[![Phiên bản](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
-[![Tải về](https://img.shields.io/github/downloads/GopeedLab/gopeed/total.svg)](https://github.com/GopeedLab/gopeed/releases)
-[![Ủng hộ](https://img.shields.io/badge/%24-ủng%20hộ-ff69b4.svg)](https://docs.gopeed.com/donate.html)
-[![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)
-
-<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-
-[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
-
-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
-
-## Giới thiệu
-
-Gopeed (tên đầy đủ Go Speed), một công cụ tải xuống tốc độ cao được phát triển bởi `Golang` + `Flutter`, hỗ trợ giao thức (HTTP, BitTorrent, Magnet) và hỗ trợ tất cả các nền tảng. Ngoài các chức năng tải xuống cơ bản, Gopeed còn là một công cụ tải xuống có thể tùy chỉnh cao cho phép triển khai thêm tính năng thông qua việc tích hợp với [APIs](https://docs.gopeed.com/dev-api.html) hoặc cài đặt và phát triển các [tiện ích mở rộng](https://docs.gopeed.com/dev-extension.html).
-
-Truy cập ✈ [Trang web chính thức](https://gopeed.com) | 📖 [Tài liệu chính thức](https://docs.gopeed.com)
-
-## Tải về
-
-<table>
-    <thead>
-        <tr>
-            <th>Nền tảng</th>
-            <th>Loại gói</th>
-            <th>Liên kết tải xuống</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td rowspan=2>Windows</td>
-            <td><code>Bộ cài đặt EXE</code></td>
-            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Liên kết</a></td>
-        </tr>
-        <tr>
-            <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>
-        </tr>
-    </tbody>
-</table>
-
-Thêm thông tin về cài đặt, vui lòng tham khảo [Cài đặt](https://docs.gopeed.com/install.html)
-
-### Command tool
-
-Sử dụng `go install`:
-
-```bash
-go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
-```
-
-## Quyên góp
-
-Nếu bạn thích dự án này, xin vui lòng xem xét [quyên góp](https://docs.gopeed.com/donate.html) để hỗ trợ phát triển dự án này, cảm ơn bạn!
-
-## Trưng bày
-
-![](_docs/img/ui-demo.png)
-
-## Development
-
-Dự án này được chia thành hai phần, phần giao diện sử dụng `flutter`, phần backend sử dụng `Golang`, và hai phía giao tiếp thông qua giao thức `http`. Trên hệ thống unix, sử dụng `unix socket`, và trên hệ thống windows, sử dụng giao thức `tcp`.
-
-> Mã giao diện nằm trong thư mục `ui/flutter`.
-
-### Environment
-
-1. Golang 1.22+
-2. Flutter 3.24+
-
-### Clone
-
-```bash
-git clone [email protected]:GopeedLab/gopeed.git
-```
-
-### Đóng góp
-
-Vui lòng tham khảo [CONTRIBUTING_vi-VN.md](/CONTRIBUTING_vi-VN.md)
-
-### Xây dựng
-
-#### Desktop
-
-Trước tiên, bạn cần cấu hình môi trường theo tài liệu chính thức của [Tài liệu trang web máy tính để bàn Flutter](https://docs.flutter.dev/development/platform-integration/desktop), sau đó bạn cần đảm bảo môi trường cgo được thiết lập đúng. Để biết hướng dẫn chi tiết về cách thiết lập môi trường cgo, vui lòng tham khảo các tài liệu tương ứng có sẵn trực tuyến.
-
-command:
-
-- windows
-
-```bash
-go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
-cd ui/flutter
-flutter build windows
-```
-
-- macos
-
-```bash
-go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
-cd ui/flutter
-flutter build macos
-```
-
-- linux
-
-```bash
-go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
-cd ui/flutter
-flutter build linux
-```
-
-#### Mobile
-
-Giống như trước đây, bạn cũng cần chuẩn bị môi trường `cgo` và sau đó cài đặt `gomobile`:
-
-```bash
-go install golang.org/x/mobile/cmd/gomobile@latest
-go get golang.org/x/mobile/bind
-gomobile init
-```
-
-command:
-
-- android
-
-```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
-cd ui/flutter
-flutter build apk
-```
-
-- ios
-
-```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
-cd ui/flutter
-flutter build ios --no-codesign
-```
-
-#### Web
-
-command:
-
-```bash
-cd ui/flutter
-flutter build web
-cd ../../
-rm -rf cmd/web/dist
-cp -r ui/flutter/build/web cmd/web/dist
-go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
-```
-
-## Tín dụng
-
-### Người đóng góp
-
-<a href="https://github.com/GopeedLab/gopeed/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=GopeedLab/gopeed" />
-</a>
-
-### JetBrains
-
-[![goland](_docs/img/goland.svg)](https://www.jetbrains.com/?from=gopeed)
-
-## Giấy phép
-
-[GPLv3](LICENSE)

README_zh-CN.md

@@ -1,5 +1,3 @@
-# [![](_docs/img/banner.png)](https://gopeed.com)
-
 [![Test Status](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
 [![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
 [![Release](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
@@ -7,11 +5,11 @@
 [![Donate](https://img.shields.io/badge/%24-donate-ff69b4.svg)](https://docs.gopeed.com/zh/donate.html)
 [![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)
 
-<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+![](_docs/img/banner.png)
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
 
-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md)
 
 ## 介绍
 
@@ -19,72 +17,21 @@ Gopeed（全称 Go Speed），直译过来中文名叫做`够快下载器`（不
 
 访问 ✈ [官方网站](https://gopeed.com/zh-CN) | 📖 [官方文档](https://docs.gopeed.com/zh/)
 
-## 下载
+## 安装
 
-<table>
+**已支持平台**
-    <thead>
-        <tr>
-            <th>运行平台</th>
-            <th>安装包类型</th>
-            <th>下载链接</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td rowspan=2>Windows</td>
-            <td><code>EXE Installer</code></td>
-            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">前往</a></td>
-        </tr>
-        <tr>
-            <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>
-        </tr>
-    </tbody>
-</table>
 
-更多关于安装的内容请参考[安装文档](https://docs.gopeed.com/zh/install.html)
+- [x] windows
+- [x] macos
+- [x] linux
+- [x] android
+- [x] ios
+- [x] web
+- [x] docker
+
+[前往下载](https://github.com/GopeedLab/gopeed/releases/latest)
+
+> 注：macos 版本运行如果提示损坏，请在终端执行 `xattr -d com.apple.quarantine /Applications/Gopeed.app` 命令
 
 ### 命令行工具
 
@@ -94,9 +41,25 @@ Gopeed（全称 Go Speed），直译过来中文名叫做`够快下载器`（不
 go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ```
 
-## 浏览器扩展
+### Docker
 
-Gopeed 还提供了浏览器扩展用于接管浏览器下载，支持 Chrome、Edge、Firefox 等浏览器，具体请参考：[https://github.com/GopeedLab/browser-extension](https://github.com/GopeedLab/browser-extension)
+#### 直接运行
+
+```bash
+docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads -v /path/to/storage:/app/storage liwei2633/gopeed
+```
+
+[更多关于 Docker 的使用](https://docs.gopeed.com/zh/install.html#docker-%E5%AE%89%E8%A3%85)
+
+#### 使用 Docker Compose
+
+```bash
+docker-compose up -d
+```
+
+#### 访问服务
+
+当 docker 容器运行时，可以通过 `http://localhost:9999` 访问 web 页面。
 
 ## 赞助
 
@@ -114,8 +77,8 @@ Gopeed 还提供了浏览器扩展用于接管浏览器下载，支持 Chrome、
 
 ### 环境要求
 
-1. Golang 1.22+
+1. Golang 1.19+
-2. Flutter 3.24+
+2. Flutter 3.10+
 
 ### 克隆项目
 
@@ -174,7 +137,7 @@ gomobile init
 - android
 
 ```bash
-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
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

README_zh-TW.md

@@ -1,5 +1,3 @@
-# [![](_docs/img/banner.png)](https://gopeed.com)
-
 [![Test Status](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
 [![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
 [![Release](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
@@ -7,11 +5,11 @@
 [![Donate](https://img.shields.io/badge/%24-donate-ff69b4.svg)](https://docs.gopeed.com/donate.html)
 [![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)
 
-<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+![](_docs/img/banner.png)
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
 
-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md)
 
 ## 簡介
 
@@ -19,74 +17,23 @@ Gopeed（全稱 Go Speed），是一款使用`Golang`+`Flutter`編寫的高速
 
 前往 ✈ [主頁](https://gopeed.com/zh-CN) | 📖 [文檔](https://docs.gopeed.com/zh/)
 
-## 下載
+## 安裝
 
-<table>
+**已支援的平台**
-    <thead>
-        <tr>
-            <th>運行平台</th>
-            <th>安裝包類型</th>
-            <th>下載鏈接</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td rowspan=2>Windows</td>
-            <td><code>EXE Installer</code></td>
-            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">前往</a></td>
-        </tr>
-        <tr>
-            <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>
-        </tr>
-    </tbody>
-</table>
 
-更多關於安裝的內容請參考[安裝文檔](https://docs.gopeed.com/zh/install.html)
+- [x] Windows
+- [x] MacOS
+- [x] Linux
+- [x] Android
+- [x] iOS
+- [x] Web
+- [x] Docker
 
-### 使用 CLI 安裝
+[下載](https://github.com/GopeedLab/gopeed/releases/latest)
+
+> 註：MacOS 版運行時若提示損壞，請在終端中執行 `xattr -d com.apple.quarantine /Applications/Gopeed.app`
+
+### 使用CLI安裝
 
 使用`go install`安裝：
 
@@ -94,6 +41,26 @@ Gopeed（全稱 Go Speed），是一款使用`Golang`+`Flutter`編寫的高速
 go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ```
 
+### Docker
+
+#### 直接執行
+
+```bash
+docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads -v /path/to/storage:/app/storage liwei2633/gopeed
+```
+
+[更多關於 Docker 的使用](https://docs.gopeed.com/zh/install.html#docker-%E5%AE%89%E8%A3%85)
+
+#### 使用 Docker Compose
+
+```bash
+docker-compose up -d
+```
+
+#### 訪問服務
+
+當 docker 容器運作時，可以通過 `http://localhost:9999` 訪問 web 頁面。
+
 ## 贊助
 
 如果你認為該項目對你有所幫助，請考慮[贊助](https://docs.gopeed.com/zh/donate)以支持該項目的持續發展，謝謝！
@@ -110,8 +77,8 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 
 ### 開發環境
 
-1. Golang 1.22+
+1. Golang 1.19+
-2. Flutter 3.24+
+2. Flutter 3.10+
 
 ### 克隆項目
 
@@ -170,7 +137,7 @@ gomobile init
 - android
 
 ```bash
-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
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

cmd/gopeed/main.go

@@ -65,9 +65,6 @@ var (
 
 func printProgress(task *download.Task, title string) {
 	var rate float64
-	if task.Meta.Res == nil {
-		task = emptyTask
-	}
 	if task.Meta.Res.Size <= 0 {
 		rate = 0
 	} else {

cmd/server.go

@@ -3,14 +3,11 @@ package cmd
 import (
 	_ "embed"
 	"fmt"
-	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/rest"
 	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"net/http"
 	"os"
-	"os/signal"
 	"path/filepath"
-	"syscall"
 )
 
 //go:embed banner.txt
@@ -27,46 +24,17 @@ func Start(cfg *model.StartConfig) {
 		panic(err)
 	}
 	if downloadCfg.FirstLoad {
-		// Set default download config
+		// Set default download dir to user download dir
-		if cfg.DownloadConfig != nil {
+		userDir, err := os.UserHomeDir()
-			cfg.DownloadConfig.Merge(downloadCfg)
+		if err == nil {
-			// TODO Use PatchConfig
+			downloadDir := filepath.Join(userDir, "Downloads")
-			rest.Downloader.PutConfig(cfg.DownloadConfig)
+			downloadCfg.DownloadDir = downloadDir
-			downloadCfg = cfg.DownloadConfig
+			rest.Downloader.PutConfig(downloadCfg)
 		}
 
-		downloadDir := downloadCfg.DownloadDir
-		// Set default download dir, in docker, it will be ${exe}/Downloads, else it will be ${user}/Downloads
-		if downloadDir == "" {
-			if base.InDocker == "true" {
-				downloadDir = filepath.Join(filepath.Dir(cfg.StorageDir), "Downloads")
-			} else {
-				userDir, err := os.UserHomeDir()
-				if err == nil {
-					downloadDir = filepath.Join(userDir, "Downloads")
-				}
-			}
-			if downloadDir != "" {
-				downloadCfg.DownloadDir = downloadDir
-				rest.Downloader.PutConfig(downloadCfg)
-			}
-		}
 	}
-	watchExit()
-
 	fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
 	if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
 		panic(err)
 	}
 }
-
-func watchExit() {
-	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
-	go func() {
-		sig := <-sigs
-		fmt.Printf("Server is shutting down due to signal: %s\n", sig)
-		rest.Downloader.Close()
-		os.Exit(0)
-	}()
-}

cmd/web/flags.go

@@ -4,20 +4,16 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/GopeedLab/gopeed/pkg/base"
 	"os"
 	"path/filepath"
 )
 
 type args struct {
-	Address    *string `json:"address"`
+	Address  *string `json:"address"`
-	Port       *int    `json:"port"`
+	Port     *int    `json:"port"`
-	Username   *string `json:"username"`
+	Username *string `json:"username"`
-	Password   *string `json:"password"`
+	Password *string `json:"password"`
-	ApiToken   *string `json:"apiToken"`
+	ApiToken *string `json:"apiToken"`
-	StorageDir *string `json:"storageDir"`
-	// DownloadConfig when the first time to start the server, it will be configured as initial value
-	DownloadConfig *base.DownloaderStoreConfig `json:"downloadConfig"`
 
 	configPath *string
 }
@@ -28,8 +24,7 @@ func parse() *args {
 	cliArgs.Port = flag.Int("P", 9999, "Bind Port")
 	cliArgs.Username = flag.String("u", "gopeed", "HTTP Basic Auth Username")
 	cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Pwd")
-	cliArgs.ApiToken = flag.String("T", "", "API token, it must be configured when using HTTP API in the case of enabling basic authentication")
+	cliArgs.ApiToken = flag.String("T", "", "API token, that can only be used when basic authentication is enabled.")
-	cliArgs.StorageDir = flag.String("d", "", "Storage directory")
 	cliArgs.configPath = flag.String("c", "./config.json", "Config file path")
 	flag.Parse()
 
@@ -50,9 +45,6 @@ func parse() *args {
 	if cfgArgs.ApiToken == nil {
 		cfgArgs.ApiToken = cliArgs.ApiToken
 	}
-	if cfgArgs.StorageDir == nil {
-		cfgArgs.StorageDir = cliArgs.StorageDir
-	}
 	return cfgArgs
 }
 
@@ -60,9 +52,8 @@ func loadConfig(path string) *args {
 	var args args
 
 	if !filepath.IsAbs(path) {
-		dir, err := os.Getwd()
+		dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
 		if err != nil {
-			fmt.Println("config dir get failed, reason:" + err.Error())
 			return &args
 		}
 		path = filepath.Join(dir, path)

cmd/web/main.go

@@ -31,16 +31,11 @@ func main() {
 		}
 	}
 
-	var dir string
+	exe, err := os.Executable()
-	if args.StorageDir != nil && *args.StorageDir != "" {
+	if err != nil {
-		dir = *args.StorageDir
+		panic(err)
-	} else {
-		exe, err := os.Executable()
-		if err != nil {
-			panic(err)
-		}
-		dir = filepath.Dir(exe)
 	}
+	dir := filepath.Dir(exe)
 
 	cfg := &model.StartConfig{
 		Network:        "tcp",
@@ -48,7 +43,6 @@ func main() {
 		Storage:        model.StorageBolt,
 		StorageDir:     filepath.Join(dir, "storage"),
 		ApiToken:       *args.ApiToken,
-		DownloadConfig: args.DownloadConfig,
 		ProductionMode: true,
 		WebEnable:      true,
 		WebFS:          sub,

entrypoint.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-chown -R ${PUID}:${PGID} /app
-
-umask ${UMASK}
-
-exec su-exec ${PUID}:${PGID} ./gopeed "$@"

go.mod

@@ -1,128 +1,108 @@
 module github.com/GopeedLab/gopeed
 
-go 1.22
+go 1.19
 
 require (
-	github.com/anacrolix/missinggo/v2 v2.7.3
+	github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9
-	github.com/anacrolix/torrent v1.56.1
+	github.com/anacrolix/torrent v1.52.5
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
-	github.com/dop251/goja v0.0.0-20240919115326-6c7d1df7ff05
+	github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
-	github.com/dop251/goja_nodejs v0.0.0-20240728170619-29b559befffc
+	github.com/dop251/goja_nodejs v0.0.0-20231122114759-e84d9a924c5c
 	github.com/go-git/go-git/v5 v5.8.1
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
 	github.com/matoous/go-nanoid/v2 v2.0.0
-	github.com/mattn/go-ieproxy v0.0.12
-	github.com/pkg/errors v0.9.1
-	github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529
 	github.com/rs/zerolog v1.31.0
 	github.com/virtuald/go-paniclog v0.0.0-20190812204905-43a7fa316459
-	github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad
+	go.etcd.io/bbolt v1.3.8
-	go.etcd.io/bbolt v1.3.10
+	golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
+	golang.org/x/sync v0.3.0
-	golang.org/x/sync v0.8.0
 )
 
 require (
+	crawshaw.io/sqlite v0.3.3-0.20220618202545-d1964889ea3c // indirect
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
-	github.com/RoaringBitmap/roaring v1.9.4 // indirect
+	github.com/RoaringBitmap/roaring v1.2.3 // indirect
 	github.com/acomagu/bufpipe v1.0.4 // indirect
 	github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 // indirect
 	github.com/alecthomas/atomic v0.1.0-alpha2 // indirect
-	github.com/anacrolix/chansync v0.5.1 // indirect
+	github.com/anacrolix/chansync v0.3.0 // indirect
-	github.com/anacrolix/dht/v2 v2.21.1 // indirect
+	github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444 // indirect
-	github.com/anacrolix/envpprof v1.3.0 // indirect
+	github.com/anacrolix/envpprof v1.2.1 // indirect
-	github.com/anacrolix/generics v0.0.2 // indirect
+	github.com/anacrolix/generics v0.0.0-20230428105757-683593396d68 // indirect
 	github.com/anacrolix/go-libutp v1.3.1 // indirect
-	github.com/anacrolix/log v0.15.2 // indirect
+	github.com/anacrolix/log v0.14.0 // indirect
 	github.com/anacrolix/missinggo v1.3.0 // indirect
 	github.com/anacrolix/missinggo/perf v1.0.0 // indirect
 	github.com/anacrolix/mmsg v1.0.0 // indirect
-	github.com/anacrolix/multiless v0.3.1-0.20221221005021-2d12701f83f7 // indirect
+	github.com/anacrolix/multiless v0.3.0 // indirect
-	github.com/anacrolix/stm v0.5.0 // indirect
+	github.com/anacrolix/stm v0.4.0 // indirect
-	github.com/anacrolix/sync v0.5.1 // indirect
+	github.com/anacrolix/sync v0.4.0 // indirect
-	github.com/anacrolix/upnp v0.1.4 // indirect
+	github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 // indirect
-	github.com/anacrolix/utp v0.2.0 // indirect
+	github.com/anacrolix/utp v0.1.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
-	github.com/benbjohnson/immutable v0.4.3 // indirect
+	github.com/benbjohnson/immutable v0.3.0 // indirect
-	github.com/bits-and-blooms/bitset v1.13.0 // indirect
+	github.com/bits-and-blooms/bitset v1.2.2 // indirect
 	github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
-	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cloudflare/circl v1.3.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dlclark/regexp2 v1.11.4 // indirect
+	github.com/dlclark/regexp2 v1.10.0 // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/edsrzf/mmap-go v1.1.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/felixge/httpsnoop v1.0.1 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.4.1 // indirect
-	github.com/go-llsqlite/adapter v0.1.0 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-llsqlite/crawshaw v0.5.3 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
+	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect
+	github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/google/uuid v1.3.0 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/huandu/xstrings v1.5.0 // indirect
+	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/lispad/go-generics-tools v1.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/minio/sha256-simd v1.0.1 // indirect
-	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/mschoch/smat v0.2.0 // indirect
-	github.com/multiformats/go-multihash v0.2.3 // indirect
+	github.com/pion/datachannel v1.5.2 // indirect
-	github.com/multiformats/go-varint v0.0.7 // indirect
+	github.com/pion/dtls/v2 v2.2.4 // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/pion/ice/v2 v2.2.6 // indirect
-	github.com/pion/datachannel v1.5.8 // indirect
+	github.com/pion/interceptor v0.1.11 // indirect
-	github.com/pion/dtls/v2 v2.2.12 // indirect
-	github.com/pion/ice/v2 v2.3.31 // indirect
-	github.com/pion/interceptor v0.1.29 // indirect
 	github.com/pion/logging v0.2.2 // indirect
-	github.com/pion/mdns v0.0.12 // indirect
+	github.com/pion/mdns v0.0.5 // indirect
 	github.com/pion/randutil v0.1.0 // indirect
-	github.com/pion/rtcp v1.2.14 // indirect
+	github.com/pion/rtcp v1.2.9 // indirect
-	github.com/pion/rtp v1.8.7 // indirect
+	github.com/pion/rtp v1.7.13 // indirect
-	github.com/pion/sctp v1.8.19 // indirect
+	github.com/pion/sctp v1.8.2 // indirect
-	github.com/pion/sdp/v3 v3.0.9 // indirect
+	github.com/pion/sdp/v3 v3.0.5 // indirect
-	github.com/pion/srtp/v2 v2.0.20 // indirect
+	github.com/pion/srtp/v2 v2.0.9 // indirect
-	github.com/pion/stun v0.6.1 // indirect
+	github.com/pion/stun v0.3.5 // indirect
-	github.com/pion/transport/v2 v2.2.9 // indirect
+	github.com/pion/transport v0.13.1 // indirect
-	github.com/pion/turn/v2 v2.1.6 // indirect
+	github.com/pion/transport/v2 v2.0.0 // indirect
-	github.com/pion/webrtc/v3 v3.2.50 // indirect
+	github.com/pion/turn/v2 v2.0.8 // indirect
+	github.com/pion/udp v0.1.4 // indirect
+	github.com/pion/webrtc/v3 v3.1.42 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/skeema/knownhosts v1.2.0 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/tidwall/btree v1.6.0 // indirect
-	github.com/stretchr/testify v1.9.0 // indirect
-	github.com/tidwall/btree v1.7.0 // indirect
-	github.com/wlynxg/anet v0.0.3 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
+	go.opentelemetry.io/otel v1.8.0 // indirect
-	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	go.opentelemetry.io/otel/trace v1.8.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/crypto v0.25.0 // indirect
+	golang.org/x/mod v0.8.0 // indirect
-	golang.org/x/mod v0.19.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/net v0.27.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
-	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/tools v0.6.0 // indirect
-	golang.org/x/tools v0.23.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	lukechampine.com/blake3 v1.3.0 // indirect
-	modernc.org/libc v1.55.6 // indirect
-	modernc.org/mathutil v1.6.0 // indirect
-	modernc.org/memory v1.8.0 // indirect
-	modernc.org/sqlite v1.31.1 // indirect
-	zombiezen.com/go/sqlite v1.3.0 // indirect
 )

internal/controller/controller.go

@@ -1,16 +1,14 @@
 package controller
 
 import (
-	"github.com/GopeedLab/gopeed/pkg/base"
-	"net/http"
 	"net/url"
 	"os"
 	"path/filepath"
 )
 
 type Controller struct {
-	GetConfig func(v any)
+	GetConfig func(v any) bool
-	GetProxy  func(requestProxy *base.RequestProxy) func(*http.Request) (*url.URL, error)
+	ProxyUrl  *url.URL
 	FileController
 	//ContextDialer() (proxy.Dialer, error)
 }
@@ -24,9 +22,10 @@ type DefaultFileController struct {
 
 func NewController() *Controller {
 	return &Controller{
-		GetConfig:      func(v any) {},
-		GetProxy:       func(requestProxy *base.RequestProxy) func(*http.Request) (*url.URL, error) { return nil },
 		FileController: &DefaultFileController{},
+		GetConfig: func(v any) bool {
+			return false
+		},
 	}
 }
 

internal/fetcher/fetcher.go

@@ -4,12 +4,14 @@ import (
 	"github.com/GopeedLab/gopeed/internal/controller"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"path"
-	"strings"
 )
 
 // Fetcher defines the interface for a download protocol.
-// Each download task will have a corresponding Fetcher instance for the management of the download task
+// One fetcher for each download task
 type Fetcher interface {
+	// Name return the name of the protocol.
+	Name() string
+
 	Setup(ctl *controller.Controller)
 	// Resolve resource info from request
 	Resolve(req *base.Request) error
@@ -29,12 +31,6 @@ type Fetcher interface {
 	Wait() error
 }
 
-type Uploader interface {
-	Upload() error
-	UploadedBytes() int64
-	WaitUpload() error
-}
-
 // FetcherMeta defines the meta information of a fetcher.
 type FetcherMeta struct {
 	Req  *base.Request  `json:"req"`
@@ -72,57 +68,17 @@ func (m *FetcherMeta) RootDirPath() string {
 	}
 }
 
-type FilterType int
+// FetcherBuilder defines the interface for a fetcher builder.
-
+type FetcherBuilder interface {
-const (
+	// Schemes returns the schemes supported by the fetcher.
-	// FilterTypeUrl url type, pattern is the scheme, e.g. http://github.com -> http
+	Schemes() []string
-	FilterTypeUrl FilterType = iota
-	// FilterTypeFile file type, pattern is the file extension name, e.g. test.torrent -> torrent
-	FilterTypeFile
-	// FilterTypeBase64 base64 data type, pattern is the data mime type, e.g. data:application/x-bittorrent;base64 -> application/x-bittorrent
-	FilterTypeBase64
-)
-
-type SchemeFilter struct {
-	Type    FilterType
-	Pattern string
-}
-
-func (s *SchemeFilter) Match(uri string) bool {
-	uriUpper := strings.ToUpper(uri)
-	patternUpper := strings.ToUpper(s.Pattern)
-	switch s.Type {
-	case FilterTypeUrl:
-		return strings.HasPrefix(uriUpper, patternUpper+":")
-	case FilterTypeFile:
-		return strings.HasSuffix(uriUpper, "."+patternUpper)
-	case FilterTypeBase64:
-		return strings.HasPrefix(uriUpper, "DATA:"+patternUpper+";BASE64,")
-	}
-	return false
-}
-
-// FetcherManager manage and control the fetcher
-type FetcherManager interface {
-	// Name return the name of the protocol.
-	Name() string
-	// Filters registers the supported schemes.
-	Filters() []*SchemeFilter
 	// Build returns a new fetcher.
 	Build() Fetcher
-	// ParseName name displayed when the task is not yet resolved, parsed from the request URL
-	ParseName(u string) string
-	// AutoRename returns whether the fetcher need renaming the download file when has the same name file.
-	AutoRename() bool
 
-	// DefaultConfig returns the default configuration of the protocol.
-	DefaultConfig() any
 	// Store fetcher
 	Store(fetcher Fetcher) (any, error)
 	// Restore fetcher
 	Restore() (v any, f func(meta *FetcherMeta, v any) Fetcher)
-	// Close the fetcher manager, release resources.
-	Close() error
 }
 
 type DefaultFetcher struct {

internal/fetcher/fetcher_test.go

@@ -1,97 +0,0 @@
-package fetcher
-
-import "testing"
-
-func TestSchemeFilter_Match(t *testing.T) {
-	type fields struct {
-		Type    FilterType
-		Pattern string
-	}
-	type args struct {
-		uri string
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		args   args
-		want   bool
-	}{
-		{
-			name: "url match",
-			fields: fields{
-				Type:    FilterTypeUrl,
-				Pattern: "https",
-			},
-			args: args{
-				uri: "https://github.com",
-			},
-			want: true,
-		},
-		{
-			name: "url not match",
-			fields: fields{
-				Type:    FilterTypeUrl,
-				Pattern: "https",
-			},
-			args: args{
-				uri: "ftp://github.com",
-			},
-			want: false,
-		},
-		{
-			name: "file match",
-			fields: fields{
-				Type:    FilterTypeFile,
-				Pattern: "torrent",
-			},
-			args: args{
-				uri: "d:/temp/test.torrent",
-			},
-			want: true,
-		},
-		{
-			name: "file not match",
-			fields: fields{
-				Type:    FilterTypeFile,
-				Pattern: "torrent",
-			},
-			args: args{
-				uri: "d:/temp/test.txt",
-			},
-			want: false,
-		},
-		{
-			name: "base64 match",
-			fields: fields{
-				Type:    FilterTypeBase64,
-				Pattern: "application/x-bittorrent",
-			},
-			args: args{
-				uri: "data:application/x-bittorrent;base64,xxx",
-			},
-			want: true,
-		},
-		{
-			name: "base64 not match",
-			fields: fields{
-				Type:    FilterTypeBase64,
-				Pattern: "application/x-bittorrent",
-			},
-			args: args{
-				uri: "data:application/javascript;base64,xxx",
-			},
-			want: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := &SchemeFilter{
-				Type:    tt.fields.Type,
-				Pattern: tt.fields.Pattern,
-			}
-			if got := s.Match(tt.args.uri); got != tt.want {
-				t.Errorf("Match() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

internal/protocol/bt/config.go

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

internal/protocol/bt/dns_cache_resolver.go

@@ -1,49 +0,0 @@
-package bt
-
-import (
-	"context"
-	"net"
-	"time"
-
-	"github.com/rs/dnscache"
-)
-
-// DnsCacheResolver resolves DNS requests for an HTTP client using an in-memory cache.
-type DnsCacheResolver struct {
-	RefreshTimeout time.Duration
-
-	resolver dnscache.Resolver
-}
-
-func (r *DnsCacheResolver) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
-	host, port, err := net.SplitHostPort(address)
-	if err != nil {
-		return nil, err
-	}
-	ips, err := r.resolver.LookupHost(ctx, host)
-	if err != nil {
-		return nil, err
-	}
-	var conn net.Conn
-	for _, ip := range ips {
-		var dialer net.Dialer
-		conn, err = dialer.DialContext(ctx, network, net.JoinHostPort(ip, port))
-		if err == nil {
-			break
-		}
-	}
-	return conn, err
-}
-
-func (r *DnsCacheResolver) Run(ctx context.Context) {
-	ticker := time.NewTicker(r.RefreshTimeout)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-ticker.C:
-			r.resolver.Refresh(true)
-		}
-	}
-}

internal/protocol/bt/fetcher_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/GopeedLab/gopeed/internal/test"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/bt"
-	gohttp "net/http"
+	"github.com/GopeedLab/gopeed/pkg/util"
 	"net/url"
 	"os"
 	"reflect"
@@ -35,6 +35,7 @@ func TestFetcher_Resolve_DataUri_Torrent(t *testing.T) {
 	}
 
 	want := &base.Resource{
+		Name:  "ubuntu-22.04-live-server-amd64.iso",
 		Size:  1466714112,
 		Range: true,
 		Files: []*base.FileInfo{
@@ -59,162 +60,61 @@ func TestFetcher_ResolveWithProxy(t *testing.T) {
 	proxyListener := test.StartSocks5Server(usr, pwd)
 	defer proxyListener.Close()
 
-	doResolve(t, buildConfigFetcher(&base.DownloaderProxyConfig{
+	doResolve(t, buildConfigFetcher(util.BuildProxyUrl("socks5", proxyListener.Addr().String(), usr, pwd)))
-		Enable: true,
-		System: false,
-		Scheme: "socks5",
-		Host:   proxyListener.Addr().String(),
-		Usr:    usr,
-		Pwd:    pwd,
-	}))
 }
 
 func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
-	t.Run("Resolve Single File", func(t *testing.T) {
+	err := fetcher.Resolve(&base.Request{
-		err := fetcher.Resolve(&base.Request{
+		URL: "./testdata/ubuntu-22.04-live-server-amd64.iso.torrent",
-			URL: "./testdata/ubuntu-22.04-live-server-amd64.iso.torrent",
+		Extra: bt.ReqExtra{
-			Extra: bt.ReqExtra{
+			Trackers: []string{
-				Trackers: []string{
+				"udp://tracker.birkenwald.de:6969/announce",
-					"udp://tracker.birkenwald.de:6969/announce",
+				"udp://tracker.bitsearch.to:1337/announce",
-					"udp://tracker.bitsearch.to:1337/announce",
-				},
 			},
-		})
+		},
-		if err != nil {
-			panic(err)
-		}
-
-		want := &base.Resource{
-			Size:  1466714112,
-			Range: true,
-			Files: []*base.FileInfo{
-				{
-					Name: "ubuntu-22.04-live-server-amd64.iso",
-					Size: 1466714112,
-				},
-			},
-			Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
-		}
-		if !reflect.DeepEqual(want, fetcher.Meta().Res) {
-			t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, want)
-		}
 	})
-
+	if err != nil {
-	t.Run("Resolve Multi Files", func(t *testing.T) {
+		panic(err)
-		err := fetcher.Resolve(&base.Request{
-			URL: "./testdata/test.torrent",
-			Extra: bt.ReqExtra{
-				Trackers: []string{
-					"udp://tracker.birkenwald.de:6969/announce",
-					"udp://tracker.bitsearch.to:1337/announce",
-				},
-			},
-		})
-		if err != nil {
-			panic(err)
-		}
-
-		want := &base.Resource{
-			Name:  "test",
-			Size:  107484864,
-			Range: true,
-			Files: []*base.FileInfo{
-				{
-					Name: "c.txt",
-					Path: "path",
-					Size: 98501754,
-				},
-				{
-					Name: "b.txt",
-					Size: 8904996,
-				},
-				{
-					Name: "a.txt",
-					Size: 78114,
-				},
-			},
-			Hash: "ccbc92b0cd8deec16a2ef4be242a8c9243b1cedb",
-		}
-		if !reflect.DeepEqual(want, fetcher.Meta().Res) {
-			t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, want)
-		}
-	})
-
-}
-
-func TestFetcherManager_ParseName(t *testing.T) {
-	type args struct {
-		u string
 	}
-	tests := []struct {
+
-		name string
+	want := &base.Resource{
-		args args
+		Name:  "ubuntu-22.04-live-server-amd64.iso",
-		want string
+		Size:  1466714112,
-	}{
+		Range: true,
-		{
+		Files: []*base.FileInfo{
-			name: "broken url",
+			{
-			args: args{
+				Name: "ubuntu-22.04-live-server-amd64.iso",
-				u: "magnet://!@#%github.com",
+				Size: 1466714112,
 			},
-			want: "",
-		},
-		{
-			name: "dn",
-			args: args{
-				u: "magnet:?xt=urn:btih:8a55cfbd5ca5d11507364765936c4f9e55b253ed&dn=ubuntu-22.04-live-server-amd64.iso",
-			},
-			want: "ubuntu-22.04-live-server-amd64.iso",
-		},
-		{
-			name: "no dn",
-			args: args{
-				u: "magnet:?xt=urn:btih:8a55cfbd5ca5d11507364765936c4f9e55b253ed",
-			},
-			want: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
-		},
-		{
-			name: "non standard magnet",
-			args: args{
-				u: "magnet:?xxt=abcd",
-			},
-			want: "",
 		},
+		Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
 	}
-	for _, tt := range tests {
+	if !reflect.DeepEqual(want, fetcher.Meta().Res) {
-		t.Run(tt.name, func(t *testing.T) {
+		t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, want)
-			fm := &FetcherManager{}
-			if got := fm.ParseName(tt.args.u); got != tt.want {
-				t.Errorf("ParseName() = %v, want %v", got, tt.want)
-			}
-		})
 	}
 }
 
 func buildFetcher() fetcher.Fetcher {
-	fb := new(FetcherManager)
+	fetcher := new(FetcherBuilder).Build()
-	fetcher := fb.Build()
+	fetcher.Setup(controller.NewController())
-	newController := controller.NewController()
-	newController.GetConfig = func(v any) {
-		json.Unmarshal([]byte(test.ToJson(fb.DefaultConfig())), v)
-	}
-	fetcher.Setup(newController)
 	return fetcher
 }
 
-func buildConfigFetcher(proxyConfig *base.DownloaderProxyConfig) fetcher.Fetcher {
+func buildConfigFetcher(proxyUrl *url.URL) fetcher.Fetcher {
-	fetcher := new(FetcherManager).Build()
+	fetcher := new(FetcherBuilder).Build()
 	newController := controller.NewController()
 	mockCfg := config{
 		Trackers: []string{
 			"udp://tracker.birkenwald.de:6969/announce",
 			"udp://tracker.bitsearch.to:1337/announce",
 		}}
-	newController.GetConfig = func(v any) {
+	newController.GetConfig = func(v any) bool {
-		json.Unmarshal([]byte(test.ToJson(mockCfg)), v)
+		if err := json.Unmarshal([]byte(test.ToJson(mockCfg)), v); err != nil {
-	}
+			return false
-	newController.GetProxy = func(requestProxy *base.RequestProxy) func(*gohttp.Request) (*url.URL, error) {
+		}
-		return proxyConfig.ToHandler()
+		return true
 	}
+	newController.ProxyUrl = proxyUrl
 	fetcher.Setup(newController)
 	return fetcher
 }

internal/protocol/http/config.go

@@ -1,7 +1,6 @@
 package http
 
 type config struct {
-	UserAgent      string `json:"userAgent"`
+	UserAgent   string `json:"userAgent"`
-	Connections    int    `json:"connections"`
+	Connections int    `json:"connections"`
-	UseServerCtime bool   `json:"useServerCtime"`
 }

internal/protocol/http/fetcher.go

@@ -5,6 +5,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/GopeedLab/gopeed/internal/controller"
+	"github.com/GopeedLab/gopeed/internal/fetcher"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	fhttp "github.com/GopeedLab/gopeed/pkg/protocol/http"
+	"golang.org/x/sync/errgroup"
 	"io"
 	"mime"
 	"net/http"
@@ -15,13 +20,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	fhttp "github.com/GopeedLab/gopeed/pkg/protocol/http"
-	"github.com/xiaoqidun/setft"
-	"golang.org/x/sync/errgroup"
 )
 
 type RequestError struct {
@@ -65,13 +63,23 @@ type Fetcher struct {
 	eg     *errgroup.Group
 }
 
+func (f *Fetcher) Name() string {
+	return "http"
+}
+
 func (f *Fetcher) Setup(ctl *controller.Controller) {
 	f.ctl = ctl
 	f.doneCh = make(chan error, 1)
 	if f.meta == nil {
 		f.meta = &fetcher.FetcherMeta{}
 	}
-	f.ctl.GetConfig(&f.config)
+	exist := f.ctl.GetConfig(&f.config)
+	if !exist {
+		f.config = &config{
+			UserAgent:   "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
+			Connections: 1,
+		}
+	}
 	return
 }
 
@@ -79,7 +87,6 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 	if err := base.ParseReqExtra[fhttp.ReqExtra](req); err != nil {
 		return err
 	}
-	f.meta.Req = req
 	httpReq, err := f.buildRequest(nil, req)
 	if err != nil {
 		return err
@@ -98,9 +105,8 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 		Range: false,
 		Files: []*base.FileInfo{},
 	}
-
 	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
+		// 1.返回206响应码表示支持断点下载 2.不返回206但是Accept-Ranges首部并且等于bytes也表示支持断点下载
 		res.Range = true
 		// 解析资源大小: bytes 0-1000/1001 => 1001
 		contentTotal := path.Base(httpResp.Header.Get(base.HttpHeaderContentRange))
@@ -112,8 +118,7 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 			res.Size = parse
 		}
 	} else if base.HttpCodeOK == httpResp.StatusCode {
-		// response 200 status code, not support breakpoint continuation, get file size by Content-Length header
+		// 返回200响应码，不支持断点下载，通过Content-Length头获取文件大小，获取不到的话可能是chunked编码
-		// if not found, maybe chunked encoding
 		contentLength := httpResp.Header.Get(base.HttpHeaderContentLength)
 		if contentLength != "" {
 			parse, err := strconv.ParseInt(contentLength, 10, 64)
@@ -125,17 +130,8 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 	} else {
 		return NewRequestError(httpResp.StatusCode, httpResp.Status)
 	}
-	// Parse last modified time
-	var lastModifiedTime *time.Time
-	lastModified := httpResp.Header.Get(base.HttpHeaderLastModified)
-	if lastModified != "" {
-		// ignore parse error
-		t, _ := time.Parse(time.RFC1123, lastModified)
-		lastModifiedTime = &t
-	}
 	file := &base.FileInfo{
-		Size:  res.Size,
+		Size: res.Size,
-		Ctime: lastModifiedTime,
 	}
 	contentDisposition := httpResp.Header.Get(base.HttpHeaderContentDisposition)
 	if contentDisposition != "" {
@@ -154,6 +150,7 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 		file.Name = httpReq.URL.Hostname()
 	}
 	res.Files = append(res.Files, file)
+	f.meta.Req = req
 	f.meta.Res = res
 	return nil
 }
@@ -171,12 +168,8 @@ func (f *Fetcher) Create(opts *base.Options) error {
 		opts.Extra = &fhttp.OptsExtra{}
 	}
 	extra := opts.Extra.(*fhttp.OptsExtra)
-	if extra.Connections <= 0 {
+	if extra.Connections == 0 {
 		extra.Connections = f.config.Connections
-		// Avoid zero connections configuration
-		if extra.Connections <= 0 {
-			extra.Connections = 1
-		}
 	}
 	return nil
 }
@@ -264,10 +257,6 @@ func (f *Fetcher) fetch() {
 			return
 		}
 		f.file.Close()
-		// Update file last modified time
-		if f.config.UseServerCtime && f.meta.Res.Files[0].Ctime != nil {
-			setft.SetFileTime(f.file.Name(), time.Now(), *f.meta.Res.Files[0].Ctime, *f.meta.Res.Files[0].Ctime)
-		}
 		f.doneCh <- err
 	}()
 }
@@ -276,13 +265,17 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
 	chunk := f.chunks[index]
 	chunk.retryTimes = 0
 
+	httpReq, err := f.buildRequest(ctx, f.meta.Req)
+	if err != nil {
+		return err
+	}
 	var (
 		client     = f.buildClient()
 		buf        = make([]byte, 8192)
 		maxRetries = 3
 	)
 	// retry until all remain chunks failed
-	for {
+	for true {
 		// if chunk is completed, return
 		if f.meta.Res.Range && chunk.Downloaded >= chunk.End-chunk.Begin+1 {
 			return
@@ -306,13 +299,8 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
 		}
 
 		var (
-			httpReq *http.Request
+			resp *http.Response
-			resp    *http.Response
 		)
-		httpReq, err = f.buildRequest(ctx, f.meta.Req)
-		if err != nil {
-			return
-		}
 		if f.meta.Res.Range {
 			httpReq.Header.Set(base.HttpHeaderRange,
 				fmt.Sprintf(base.HttpHeaderRangeFormat, chunk.Begin+chunk.Downloaded, chunk.End))
@@ -382,8 +370,7 @@ func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq
 		method string
 		body   io.Reader
 	)
-
+	headers := make(map[string][]string)
-	headers := http.Header{}
 	if req.Extra == nil {
 		method = http.MethodGet
 	} else {
@@ -395,7 +382,7 @@ func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq
 		}
 		if len(extra.Header) > 0 {
 			for k, v := range extra.Header {
-				headers.Set(k, v)
+				headers[k] = []string{v}
 			}
 		}
 		if extra.Body != "" {
@@ -403,7 +390,8 @@ func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq
 		}
 	}
 	if _, ok := headers[base.HttpHeaderUserAgent]; !ok {
-		headers.Set(base.HttpHeaderUserAgent, f.config.UserAgent)
+		// load user agent from config
+		headers[base.HttpHeaderUserAgent] = []string{f.config.UserAgent}
 	}
 
 	if ctx != nil {
@@ -447,11 +435,12 @@ func (f *Fetcher) splitChunk() (chunks []*chunk) {
 }
 
 func (f *Fetcher) buildClient() *http.Client {
-	transport := &http.Transport{
+	transport := &http.Transport{}
-		Proxy: f.ctl.GetProxy(f.meta.Req.Proxy),
-	}
 	// Cookie handle
 	jar, _ := cookiejar.New(nil)
+	if f.ctl.ProxyUrl != nil {
+		transport.Proxy = http.ProxyURL(f.ctl.ProxyUrl)
+	}
 	return &http.Client{
 		Transport: transport,
 		Jar:       jar,
@@ -462,67 +451,30 @@ type fetcherData struct {
 	Chunks []*chunk
 }
 
-type FetcherManager struct {
+type FetcherBuilder struct {
 }
 
-func (fm *FetcherManager) Name() string {
+var schemes = []string{"HTTP", "HTTPS"}
-	return "http"
+
+func (fb *FetcherBuilder) Schemes() []string {
+	return schemes
 }
 
-func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
+func (fb *FetcherBuilder) Build() fetcher.Fetcher {
-	return []*fetcher.SchemeFilter{
-		{
-			Type:    fetcher.FilterTypeUrl,
-			Pattern: "HTTP",
-		},
-		{
-			Type:    fetcher.FilterTypeUrl,
-			Pattern: "HTTPS",
-		},
-	}
-}
-
-func (fm *FetcherManager) Build() fetcher.Fetcher {
 	return &Fetcher{}
 }
 
-func (fm *FetcherManager) ParseName(u string) string {
+func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
-	var name string
-	url, err := url.Parse(u)
-	if err != nil {
-		return ""
-	}
-	// Get filePath by URL
-	name = path.Base(url.Path)
-	// If file name is empty, use host name
-	if name == "" || name == "/" || name == "." {
-		name = url.Hostname()
-	}
-	return name
-}
-
-func (fm *FetcherManager) AutoRename() bool {
-	return true
-}
-
-func (fm *FetcherManager) DefaultConfig() any {
-	return &config{
-		UserAgent:   "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
-		Connections: 16,
-	}
-}
-
-func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
 	_f := f.(*Fetcher)
 	return &fetcherData{
 		Chunks: _f.chunks,
 	}, nil
 }
 
-func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
+func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
 	return &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
 		fd := v.(*fetcherData)
-		fb := &FetcherManager{}
+		fb := &FetcherBuilder{}
 		fetcher := fb.Build().(*Fetcher)
 		fetcher.meta = meta
 		base.ParseReqExtra[fhttp.ReqExtra](fetcher.meta.Req)
@@ -533,7 +485,3 @@ func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v
 		return fetcher
 	}
 }
-
-func (fm *FetcherManager) Close() error {
-	return nil
-}

internal/protocol/http/fetcher_test.go

@@ -8,9 +8,9 @@ import (
 	"github.com/GopeedLab/gopeed/internal/test"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/http"
+	"github.com/GopeedLab/gopeed/pkg/util"
 	"net"
-	gohttp "net/http"
+	"reflect"
-	"net/url"
 	"testing"
 	"time"
 )
@@ -69,7 +69,7 @@ func testResolve(startTestServer func() net.Listener, path string, want *base.Re
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !test.AssertResourceEqual(want, fetcher.meta.Res) {
+	if !reflect.DeepEqual(want, fetcher.meta.Res) {
 		t.Errorf("Resolve() got = %v, want %v", fetcher.meta.Res, want)
 	}
 }
@@ -151,12 +151,10 @@ func TestFetcher_DownloadWithProxy(t *testing.T) {
 	downloadWithProxy(httpListener, proxyListener, t)
 }
 
-func TestFetcher_ConfigConnections(t *testing.T) {
+func TestFetcher_Config(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()
-	fetcher := doDownloadReady(buildConfigFetcher(config{
+	fetcher := doDownloadReady(buildConfigFetcher(), listener, 0, t)
-		Connections: 16,
-	}), listener, 0, t)
 	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)
@@ -172,76 +170,6 @@ func TestFetcher_ConfigConnections(t *testing.T) {
 	}
 }
 
-func TestFetcher_ConfigUseServerCtime(t *testing.T) {
-	listener := test.StartTestFileServer()
-	defer listener.Close()
-	fetcher := doDownloadReady(buildConfigFetcher(config{
-		Connections:    16,
-		UseServerCtime: true,
-	}), listener, 0, t)
-	err := fetcher.Start()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = fetcher.Wait()
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := test.FileMd5(test.BuildFile)
-	got := test.FileMd5(test.DownloadFile)
-	if want != got {
-		t.Errorf("Download() got = %v, want %v", got, want)
-	}
-}
-
-func TestFetcherManager_ParseName(t *testing.T) {
-	type args struct {
-		u string
-	}
-	tests := []struct {
-		name string
-		args args
-		want string
-	}{
-		{
-			name: "broken url",
-			args: args{
-				u: "https://!@#%github.com",
-			},
-			want: "",
-		},
-		{
-			name: "file path",
-			args: args{
-				u: "https://github.com/index.html",
-			},
-			want: "index.html",
-		},
-		{
-			name: "file path with query and hash",
-			args: args{
-				u: "https://github.com/a/b/index.html/#list?name=1",
-			},
-			want: "index.html",
-		},
-		{
-			name: "no file path",
-			args: args{
-				u: "https://github.com",
-			},
-			want: "github.com",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			fm := &FetcherManager{}
-			if got := fm.ParseName(tt.args.u); got != tt.want {
-				t.Errorf("ParseName() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
 func downloadReady(listener net.Listener, connections int, t *testing.T) fetcher.Fetcher {
 	return doDownloadReady(buildFetcher(), listener, connections, t)
 }
@@ -356,7 +284,7 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
 		t.Fatal(err)
 	}
 
-	fb := new(FetcherManager)
+	fb := new(FetcherBuilder)
 	time.Sleep(time.Millisecond * 50)
 	data, err := fb.Store(fetcher)
 	if err != nil {
@@ -387,13 +315,7 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
 func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t *testing.T) {
 	fetcher := downloadReady(httpListener, 4, t)
 	ctl := controller.NewController()
-	ctl.GetProxy = func(requestProxy *base.RequestProxy) func(*gohttp.Request) (*url.URL, error) {
+	ctl.ProxyUrl = util.BuildProxyUrl("socks5", proxyListener.Addr().String(), "", "")
-		return (&base.DownloaderProxyConfig{
-			Enable: true,
-			Scheme: "socks5",
-			Host:   proxyListener.Addr().String(),
-		}).ToHandler()
-	}
 	fetcher.Setup(ctl)
 	err := fetcher.Start()
 	if err != nil {
@@ -411,21 +333,22 @@ func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t
 }
 
 func buildFetcher() *Fetcher {
-	fm := new(FetcherManager)
+	fetcher := new(FetcherBuilder).Build()
-	fetcher := fm.Build()
+	fetcher.Setup(controller.NewController())
-	newController := controller.NewController()
-	newController.GetConfig = func(v any) {
-		json.Unmarshal([]byte(test.ToJson(fm.DefaultConfig())), v)
-	}
-	fetcher.Setup(newController)
 	return fetcher.(*Fetcher)
 }
 
-func buildConfigFetcher(cfg config) fetcher.Fetcher {
+func buildConfigFetcher() fetcher.Fetcher {
-	fetcher := new(FetcherManager).Build()
+	fetcher := new(FetcherBuilder).Build()
 	newController := controller.NewController()
-	newController.GetConfig = func(v any) {
+	mockCfg := config{
-		json.Unmarshal([]byte(test.ToJson(cfg)), v)
+		Connections: 16,
+	}
+	newController.GetConfig = func(v any) bool {
+		if err := json.Unmarshal([]byte(test.ToJson(mockCfg)), v); err != nil {
+			return false
+		}
+		return true
 	}
 	fetcher.Setup(newController)
 	return fetcher

internal/test/httptest.go

@@ -2,16 +2,14 @@ package test
 
 import (
 	"context"
-	"crypto/rand"
 	"encoding/json"
 	"fmt"
-	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/armon/go-socks5"
 	"io"
+	"math/rand"
 	"net"
 	"net/http"
 	"os"
-	"reflect"
 	"strconv"
 	"strings"
 	"sync/atomic"
@@ -24,11 +22,6 @@ const (
 	Dir       = "./"
 	BuildFile = Dir + BuildName
 
-	ExternalDownloadUrl  = "https://raw.githubusercontent.com/GopeedLab/gopeed/v1.5.6/_docs/img/banner.png"
-	ExternalDownloadName = "banner.png"
-	ExternalDownloadSize = 26416
-	//ExternalDownloadMd5 = "c67c6e3cae79a95342485676571e8a5c"
-
 	DownloadName       = "download.data"
 	DownloadRename     = "download (1).data"
 	DownloadFile       = Dir + DownloadName
@@ -344,11 +337,3 @@ func StartSocks5Server(usr, pwd string) net.Listener {
 	go server.Serve(listener)
 	return listener
 }
-
-func AssertResourceEqual(want, got *base.Resource) bool {
-	// Ignore ctime
-	if got != nil && len(got.Files) > 0 {
-		got.Files[0].Ctime = nil
-	}
-	return reflect.DeepEqual(want, got)
-}

pkg/base/constants.go

@@ -20,8 +20,7 @@ const (
 	HttpHeaderContentLength      = "Content-Length"
 	HttpHeaderContentRange       = "Content-Range"
 	HttpHeaderContentDisposition = "Content-Disposition"
-	HttpHeaderUserAgent          = "User-Agent"
+	HttpHeaderUserAgent          = "Usr-Agent"
-	HttpHeaderLastModified       = "Last-Modified"
 
 	HttpHeaderBytes       = "bytes"
 	HttpHeaderRangeFormat = "bytes=%d-%d"

pkg/base/error.go

@@ -0,0 +1,8 @@
+package base
+
+import "errors"
+
+var (
+	NotFound  = errors.New("not found")
+	BadParams = errors.New("bad params")
+)

pkg/base/info.go

@@ -1,11 +0,0 @@
-package base
-
-// Version is the build version, set at build time, using `go build -ldflags "-X github.com/GopeedLab/gopeed/pkg/base.Version=1.0.0"`.
-var Version string
-var InDocker string
-
-func init() {
-	if Version == "" {
-		Version = "dev"
-	}
-}

pkg/base/model.go

@@ -3,11 +3,7 @@ package base
 import (
 	"fmt"
 	"github.com/GopeedLab/gopeed/pkg/util"
-	"github.com/mattn/go-ieproxy"
 	"golang.org/x/exp/slices"
-	"net/http"
-	"net/url"
-	"time"
 )
 
 // Request download request
@@ -16,8 +12,6 @@ type Request struct {
 	Extra any    `json:"extra"`
 	// Labels is used to mark the download task
 	Labels map[string]string `json:"labels"`
-	// Proxy is special proxy config for request
-	Proxy *RequestProxy `json:"proxy"`
 }
 
 func (r *Request) Validate() error {
@@ -27,37 +21,6 @@ func (r *Request) Validate() error {
 	return nil
 }
 
-type RequestProxyMode string
-
-const (
-	// RequestProxyModeFollow follow setting proxy
-	RequestProxyModeFollow RequestProxyMode = "follow"
-	// RequestProxyModeNone not use proxy
-	RequestProxyModeNone RequestProxyMode = "none"
-	// RequestProxyModeCustom custom proxy
-	RequestProxyModeCustom RequestProxyMode = "custom"
-)
-
-type RequestProxy struct {
-	Mode   RequestProxyMode `json:"mode"`
-	Scheme string           `json:"scheme"`
-	Host   string           `json:"host"`
-	Usr    string           `json:"usr"`
-	Pwd    string           `json:"pwd"`
-}
-
-func (p *RequestProxy) ToHandler() func(r *http.Request) (*url.URL, error) {
-	if p == nil || p.Mode != RequestProxyModeCustom {
-		return nil
-	}
-
-	if p.Scheme == "" || p.Host == "" {
-		return nil
-	}
-
-	return http.ProxyURL(util.BuildProxyUrl(p.Scheme, p.Host, p.Usr, p.Pwd))
-}
-
 // Resource download resource
 type Resource struct {
 	// if name is not empty, the resource is a folder and the name is the folder name
@@ -96,10 +59,9 @@ func (r *Resource) CalcSize(selectFiles []int) {
 }
 
 type FileInfo struct {
-	Name  string     `json:"name"`
+	Name string `json:"name"`
-	Path  string     `json:"path"`
+	Path string `json:"path"`
-	Size  int64      `json:"size"`
+	Size int64  `json:"size"`
-	Ctime *time.Time `json:"ctime"`
 
 	Req *Request `json:"req"`
 }
@@ -127,7 +89,12 @@ func (o *Options) InitSelectFiles(fileSize int) {
 }
 
 func (o *Options) Clone() *Options {
-	return util.DeepClone(o)
+	return &Options{
+		Name:        o.Name,
+		Path:        o.Path,
+		SelectFiles: o.SelectFiles,
+		Extra:       o.Extra,
+	}
 }
 
 func ParseReqExtra[E any](req *Request) error {
@@ -159,113 +126,3 @@ func ParseOptsExtra[E any](opts *Options) error {
 	opts.Extra = &t
 	return nil
 }
-
-// DownloaderStoreConfig is the config that can restore the downloader.
-type DownloaderStoreConfig struct {
-	FirstLoad bool `json:"-"` // FirstLoad is the flag that the config is first time init and not from store
-
-	DownloadDir    string                 `json:"downloadDir"`    // DownloadDir is the default directory to save the downloaded files
-	MaxRunning     int                    `json:"maxRunning"`     // MaxRunning is the max running download count
-	ProtocolConfig map[string]any         `json:"protocolConfig"` // ProtocolConfig is special config for each protocol
-	Extra          map[string]any         `json:"extra"`
-	Proxy          *DownloaderProxyConfig `json:"proxy"`
-}
-
-func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
-	if cfg.MaxRunning == 0 {
-		cfg.MaxRunning = 5
-	}
-	if cfg.ProtocolConfig == nil {
-		cfg.ProtocolConfig = make(map[string]any)
-	}
-	if cfg.Proxy == nil {
-		cfg.Proxy = &DownloaderProxyConfig{}
-	}
-	return cfg
-}
-
-func (cfg *DownloaderStoreConfig) Merge(beforeCfg *DownloaderStoreConfig) *DownloaderStoreConfig {
-	if beforeCfg == nil {
-		return cfg
-	}
-	if cfg.DownloadDir == "" {
-		cfg.DownloadDir = beforeCfg.DownloadDir
-	}
-	if cfg.MaxRunning == 0 {
-		cfg.MaxRunning = beforeCfg.MaxRunning
-	}
-	if cfg.ProtocolConfig == nil {
-		cfg.ProtocolConfig = beforeCfg.ProtocolConfig
-	}
-	if cfg.Extra == nil {
-		cfg.Extra = beforeCfg.Extra
-	}
-	if cfg.Proxy == nil {
-		cfg.Proxy = beforeCfg.Proxy
-	}
-	return cfg
-}
-
-type DownloaderProxyConfig struct {
-	Enable bool `json:"enable"`
-	// System is the flag that use system proxy
-	System bool   `json:"system"`
-	Scheme string `json:"scheme"`
-	Host   string `json:"host"`
-	Usr    string `json:"usr"`
-	Pwd    string `json:"pwd"`
-}
-
-func (cfg *DownloaderProxyConfig) ToHandler() func(r *http.Request) (*url.URL, error) {
-	if cfg == nil || cfg.Enable == false {
-		return nil
-	}
-	if cfg.System {
-		ieproxy.ReloadConf()
-		return ieproxy.GetProxyFunc()
-	}
-	if cfg.Scheme == "" || cfg.Host == "" {
-		return nil
-	}
-	return http.ProxyURL(util.BuildProxyUrl(cfg.Scheme, cfg.Host, cfg.Usr, cfg.Pwd))
-}
-
-// ToUrl returns the proxy url, just for git clone
-func (cfg *DownloaderProxyConfig) ToUrl() *url.URL {
-	if cfg == nil || cfg.Enable == false {
-		return nil
-	}
-	if cfg.System {
-		ieproxy.ReloadConf()
-		static := ieproxy.GetConf().Static
-		if static.Active && len(static.Protocols) > 0 {
-			// If only one protocol, use it
-			if len(static.Protocols) == 1 {
-				for _, v := range static.Protocols {
-					return parseUrlSafe(v)
-				}
-			}
-			// Check https
-			if v, ok := static.Protocols["https"]; ok {
-				return parseUrlSafe(v)
-			}
-			// Check http
-			if v, ok := static.Protocols["http"]; ok {
-				return parseUrlSafe(v)
-			}
-		}
-		return nil
-	}
-	if cfg.Scheme == "" || cfg.Host == "" {
-		return nil
-	}
-	return util.BuildProxyUrl(cfg.Scheme, cfg.Host, cfg.Usr, cfg.Pwd)
-}
-
-func parseUrlSafe(rawUrl string) *url.URL {
-	u, err := url.Parse(rawUrl)
-	if err != nil {
-		return nil
-	}
-	return u
-}

pkg/base/model_test.go

@@ -1,264 +0,0 @@
-package base
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestDownloaderStoreConfig_Init(t *testing.T) {
-	tests := []struct {
-		name   string
-		fields *DownloaderStoreConfig
-		want   *DownloaderStoreConfig
-	}{
-		{
-			"Init",
-			&DownloaderStoreConfig{},
-			&DownloaderStoreConfig{
-				MaxRunning:     5,
-				ProtocolConfig: map[string]any{},
-				Proxy:          &DownloaderProxyConfig{},
-			},
-		},
-		{
-			"Init MaxRunning",
-			&DownloaderStoreConfig{
-				MaxRunning: 10,
-			},
-			&DownloaderStoreConfig{
-				MaxRunning:     10,
-				ProtocolConfig: map[string]any{},
-				Proxy:          &DownloaderProxyConfig{},
-			},
-		},
-		{
-			"Init ProtocolConfig",
-			&DownloaderStoreConfig{
-				ProtocolConfig: map[string]any{
-					"key": "value",
-				},
-			},
-			&DownloaderStoreConfig{
-				MaxRunning: 5,
-				ProtocolConfig: map[string]any{
-					"key": "value",
-				},
-				Proxy: &DownloaderProxyConfig{},
-			},
-		},
-		{
-			"Init Proxy",
-			&DownloaderStoreConfig{
-				Proxy: &DownloaderProxyConfig{
-					Enable: true,
-				},
-			},
-			&DownloaderStoreConfig{
-				MaxRunning:     5,
-				ProtocolConfig: map[string]any{},
-				Proxy: &DownloaderProxyConfig{
-					Enable: true,
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cfg := &DownloaderStoreConfig{
-				FirstLoad:      tt.fields.FirstLoad,
-				DownloadDir:    tt.fields.DownloadDir,
-				MaxRunning:     tt.fields.MaxRunning,
-				ProtocolConfig: tt.fields.ProtocolConfig,
-				Extra:          tt.fields.Extra,
-				Proxy:          tt.fields.Proxy,
-			}
-			if got := cfg.Init(); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("Init() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestDownloaderStoreConfig_Merge(t *testing.T) {
-	type args struct {
-		beforeCfg *DownloaderStoreConfig
-	}
-	tests := []struct {
-		name   string
-		fields *DownloaderStoreConfig
-		args   args
-		want   *DownloaderStoreConfig
-	}{
-		{
-			"Merge Nil",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: nil,
-			},
-			&DownloaderStoreConfig{},
-		},
-		{
-			"Merge DownloadDir No Override",
-			&DownloaderStoreConfig{
-				DownloadDir: "before",
-			},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					DownloadDir: "after",
-				},
-			},
-			&DownloaderStoreConfig{
-				DownloadDir: "before",
-			},
-		},
-		{
-			"Merge DownloadDir Override",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					DownloadDir: "after",
-				},
-			},
-			&DownloaderStoreConfig{
-				DownloadDir: "after",
-			},
-		},
-		{
-			"Merge MaxRunning No Override",
-			&DownloaderStoreConfig{
-				MaxRunning: 1,
-			},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					MaxRunning: 10,
-				},
-			},
-			&DownloaderStoreConfig{
-				MaxRunning: 1,
-			},
-		},
-		{
-			"Merge MaxRunning Override",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					MaxRunning: 10,
-				},
-			},
-			&DownloaderStoreConfig{
-				MaxRunning: 10,
-			},
-		},
-		{
-			"Merge ProtocolConfig No Override",
-			&DownloaderStoreConfig{
-				ProtocolConfig: map[string]any{},
-			},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					ProtocolConfig: map[string]any{
-						"key": "after",
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				ProtocolConfig: map[string]any{},
-			},
-		},
-		{
-			"Merge ProtocolConfig Override",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					ProtocolConfig: map[string]any{
-						"key": "after",
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				ProtocolConfig: map[string]any{
-					"key": "after",
-				},
-			},
-		},
-		{
-			"Merge Extra No Override",
-			&DownloaderStoreConfig{
-				Extra: map[string]any{},
-			},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					Extra: map[string]any{
-						"key": "after",
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				Extra: map[string]any{},
-			},
-		},
-		{
-			"Merge Extra Override",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					Extra: map[string]any{
-						"key": "after",
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				Extra: map[string]any{
-					"key": "after",
-				},
-			},
-		},
-		{
-			"Merge Proxy No Override",
-			&DownloaderStoreConfig{
-				Proxy: &DownloaderProxyConfig{},
-			},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					Proxy: &DownloaderProxyConfig{
-						Scheme: "http",
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				Proxy: &DownloaderProxyConfig{},
-			},
-		},
-		{
-			"Merge Proxy Override",
-			&DownloaderStoreConfig{},
-			args{
-				beforeCfg: &DownloaderStoreConfig{
-					Proxy: &DownloaderProxyConfig{
-						Scheme: "http",
-					},
-				},
-			},
-			&DownloaderStoreConfig{
-				Proxy: &DownloaderProxyConfig{
-					Scheme: "http",
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cfg := &DownloaderStoreConfig{
-				FirstLoad:      tt.fields.FirstLoad,
-				DownloadDir:    tt.fields.DownloadDir,
-				MaxRunning:     tt.fields.MaxRunning,
-				ProtocolConfig: tt.fields.ProtocolConfig,
-				Extra:          tt.fields.Extra,
-				Proxy:          tt.fields.Proxy,
-			}
-			if got := cfg.Merge(tt.args.beforeCfg); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("Merge() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

pkg/download/downloader_test.go

@@ -4,9 +4,7 @@ import (
 	"github.com/GopeedLab/gopeed/internal/test"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/http"
-	"os"
+	"reflect"
-	"strconv"
-	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -39,7 +37,7 @@ func TestDownloader_Resolve(t *testing.T) {
 			},
 		},
 	}
-	if !test.AssertResourceEqual(want, rr.Res) {
+	if !reflect.DeepEqual(want, rr.Res) {
 		t.Errorf("Resolve() got = %v, want %v", rr.Res, want)
 	}
 }
@@ -82,190 +80,43 @@ func TestDownloader_Create(t *testing.T) {
 	want := test.FileMd5(test.BuildFile)
 	got := test.FileMd5(test.DownloadFile)
 	if want != got {
-		t.Errorf("Downloader_Create() got = %v, want %v", got, want)
+		t.Errorf("Download() got = %v, want %v", got, want)
 	}
 }
 
-func TestDownloader_CreateNotInWhite(t *testing.T) {
-	listener := test.StartTestFileServer()
-	defer listener.Close()
-
-	downloader := NewDownloader(&DownloaderConfig{
-		DownloadDirWhiteList: []string{"./downloads"},
-	})
-	if err := downloader.Setup(); err != nil {
-		t.Fatal(err)
-	}
-	defer downloader.Clear()
-	req := &base.Request{
-		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
-	}
-	rr, err := downloader.Resolve(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	downloader.Listener(func(event *Event) {
-		if event.Key == EventKeyDone {
-			wg.Done()
-		}
-	})
-	_, err = downloader.Create(rr.ID, &base.Options{
-		Path: test.Dir,
-		Name: test.DownloadName,
-		Extra: http.OptsExtra{
-			Connections: 4,
-		},
-	})
-	if !strings.Contains(err.Error(), "white") {
-		t.Errorf("TestDownloader_CreateNotInWhite() got = %v, want %v", err.Error(), "not in white list")
-	}
-}
-
-func TestDownloader_CreateDirectBatch(t *testing.T) {
-	listener := test.StartTestFileServer()
-	defer listener.Close()
-
-	downloader := NewDownloader(nil)
-	if err := downloader.Setup(); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		downloader.Delete(nil, true)
-		downloader.Clear()
-	}()
-
-	reqs := make([]*base.Request, 0)
-	fileNames := make([]string, 0)
-	for i := 0; i < 5; i++ {
-		req := &base.Request{
-			URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
-		}
-		reqs = append(reqs, req)
-		if i == 0 {
-			fileNames = append(fileNames, test.DownloadName)
-		} else {
-			arr := strings.Split(test.DownloadName, ".")
-			fileNames = append(fileNames, arr[0]+" ("+strconv.Itoa(i)+")."+arr[1])
-		}
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(len(reqs))
-	downloader.Listener(func(event *Event) {
-		if event.Key == EventKeyDone {
-			wg.Done()
-		}
-	})
-
-	_, err := downloader.CreateDirectBatch(reqs, &base.Options{
-		Path: test.Dir,
-		Name: test.DownloadName,
-		Extra: http.OptsExtra{
-			Connections: 4,
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	wg.Wait()
-
-	tasks := downloader.GetTasks()
-	if len(tasks) != len(reqs) {
-		t.Errorf("CreateDirectBatch() task got = %v, want %v", len(tasks), len(reqs))
-	}
-
-	nameMatchMap := make(map[string]bool)
-	for _, name := range fileNames {
-		if _, err := os.Stat(test.Dir + "/" + name); os.IsNotExist(err) {
-			t.Errorf("CreateDirectBatch() file not exist: %v", name)
-		}
-		for _, task := range tasks {
-			if name == task.Meta.Opts.Name {
-				nameMatchMap[task.Meta.Opts.Name] = true
-			}
-		}
-	}
-	if len(nameMatchMap) != len(reqs) {
-		t.Errorf("CreateDirectBatch() names got = %v, want %v", len(nameMatchMap), len(reqs))
-	}
-
-}
-
 func TestDownloader_CreateWithProxy(t *testing.T) {
 	// No proxy
-	doTestDownloaderCreateWithProxy(t, false, nil, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
 		return nil
-	}, nil)
+	})
 	// Disable proxy
-	doTestDownloaderCreateWithProxy(t, false, nil, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
 		proxyCfg.Enable = false
 		return proxyCfg
-	}, nil)
-	// Enable system proxy but not set proxy environment variable
-	doTestDownloaderCreateWithProxy(t, false, nil, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
-		proxyCfg.System = true
-		return proxyCfg
-	}, nil)
-	// Enable proxy but error proxy environment variable
-	doTestDownloaderCreateWithProxy(t, false, nil, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
-		os.Setenv("HTTP_PROXY", "http://127.0.0.1:1234")
-		os.Setenv("HTTPS_PROXY", "http://127.0.0.1:1234")
-		proxyCfg.System = true
-		return proxyCfg
-	}, func(err error) {
-		if err == nil {
-			t.Fatal("doTestDownloaderCreateWithProxy() got = nil, want error")
-		}
 	})
-	// Enable system proxy and set proxy environment variable
-	doTestDownloaderCreateWithProxy(t, false, nil, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
-		os.Setenv("HTTP_PROXY", proxyCfg.ToUrl().String())
-		os.Setenv("HTTPS_PROXY", proxyCfg.ToUrl().String())
-		proxyCfg.System = true
-		return proxyCfg
-	}, nil)
 	// Invalid proxy scheme
-	doTestDownloaderCreateWithProxy(t, false, nil, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
 		proxyCfg.Scheme = ""
 		return proxyCfg
-	}, nil)
+	})
 	// Invalid proxy host
-	doTestDownloaderCreateWithProxy(t, false, nil, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
 		proxyCfg.Host = ""
 		return proxyCfg
-	}, nil)
+	})
 	// Use proxy without auth
-	doTestDownloaderCreateWithProxy(t, false, nil, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
 		return proxyCfg
-	}, nil)
+	})
 	// Use proxy with auth
-	doTestDownloaderCreateWithProxy(t, true, nil, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+	doTestDownloaderCreateWithProxy(t, true, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
 		return proxyCfg
-	}, nil)
+	})
-
-	// Request proxy mode follow
-	doTestDownloaderCreateWithProxy(t, false, func(reqProxy *base.RequestProxy) *base.RequestProxy {
-		reqProxy.Mode = base.RequestProxyModeFollow
-		return reqProxy
-	}, nil, nil)
-
-	// Request proxy mode none
-	doTestDownloaderCreateWithProxy(t, false, func(reqProxy *base.RequestProxy) *base.RequestProxy {
-		reqProxy.Mode = base.RequestProxyModeNone
-		return reqProxy
-	}, nil, nil)
-
-	// Request proxy mode custom
-	doTestDownloaderCreateWithProxy(t, false, func(reqProxy *base.RequestProxy) *base.RequestProxy {
-		return reqProxy
-	}, nil, nil)
 }
 
-func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildReqProxy func(reqProxy *base.RequestProxy) *base.RequestProxy, buildProxyConfig func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig, errHandler func(err error)) {
+func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildProxyConfig func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig) {
+	httpListener := test.StartTestFileServer()
+	defer httpListener.Close()
 	usr, pwd := "", ""
 	if auth {
 		usr, pwd = "admin", "123"
@@ -278,49 +129,33 @@ func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildReqProxy func
 		t.Fatal(err)
 	}
 	defer downloader.Clear()
-	globalProxyCfg := &base.DownloaderProxyConfig{
+	downloader.cfg.DownloaderStoreConfig.Proxy = buildProxyConfig(&DownloaderProxyConfig{
 		Enable: true,
 		Scheme: "socks5",
 		Host:   proxyListener.Addr().String(),
 		Usr:    usr,
 		Pwd:    pwd,
-	}
+	})
-	if buildProxyConfig != nil {
-		globalProxyCfg = buildProxyConfig(globalProxyCfg)
-	}
-	downloader.cfg.DownloaderStoreConfig.Proxy = globalProxyCfg
 
 	req := &base.Request{
-		URL: test.ExternalDownloadUrl,
+		URL: "http://" + httpListener.Addr().String() + "/" + test.BuildName,
-	}
-	if buildReqProxy != nil {
-		req.Proxy = buildReqProxy(&base.RequestProxy{
-			Scheme: "socks5",
-			Host:   proxyListener.Addr().String(),
-			Usr:    usr,
-			Pwd:    pwd,
-		})
 	}
 	rr, err := downloader.Resolve(req)
 	if err != nil {
-		if errHandler == nil {
+		t.Fatal(err)
-			t.Fatal(err)
-		}
-		errHandler(err)
-		return
 	}
 	want := &base.Resource{
-		Size:  test.ExternalDownloadSize,
+		Size:  test.BuildSize,
 		Range: true,
 		Files: []*base.FileInfo{
 			{
-				Name: test.ExternalDownloadName,
+				Name: test.BuildName,
 				Path: "",
-				Size: test.ExternalDownloadSize,
+				Size: test.BuildSize,
 			},
 		},
 	}
-	if !test.AssertResourceEqual(want, rr.Res) {
+	if !reflect.DeepEqual(want, rr.Res) {
 		t.Errorf("Resolve() got = %v, want %v", rr.Res, want)
 	}
 }
@@ -400,7 +235,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(id)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -424,7 +259,7 @@ func TestDownloader_StoreAndRestore(t *testing.T) {
 			wg.Done()
 		}
 	})
-	err = downloader.Continue(&TaskFilter{IDs: []string{id}})
+	err = downloader.Continue(id)
 	wg.Wait()
 	if err != nil {
 		t.Fatal(err)
@@ -447,11 +282,11 @@ func TestDownloader_Protocol_Config(t *testing.T) {
 
 	var httpCfg map[string]any
 	exits := downloader.getProtocolConfig("http", &httpCfg)
-	if !exits {
+	if exits {
-		t.Errorf("getProtocolConfig() got = %v, want %v", exits, true)
+		t.Errorf("getProtocolConfig() got = %v, want %v", exits, false)
 	}
 
-	storeCfg := &base.DownloaderStoreConfig{
+	storeCfg := &DownloaderStoreConfig{
 		DownloadDir: "./downloads",
 		ProtocolConfig: map[string]any{
 			"http": map[string]any{
@@ -485,151 +320,3 @@ func TestDownloader_Protocol_Config(t *testing.T) {
 		t.Errorf("GetConfig() got = %v, want %v", test.ToJson(storeCfg), test.ToJson(newStoreCfg))
 	}
 }
-
-func TestDownloader_GetTasksByFilter(t *testing.T) {
-	listener := test.StartTestFileServer()
-	defer listener.Close()
-
-	downloader := NewDownloader(nil)
-	if err := downloader.Setup(); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		downloader.Delete(nil, true)
-		downloader.Clear()
-	}()
-
-	reqs := make([]*base.Request, 0)
-	fileNames := make([]string, 0)
-	for i := 0; i < 10; i++ {
-		req := &base.Request{
-			URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
-		}
-		reqs = append(reqs, req)
-		if i == 0 {
-			fileNames = append(fileNames, test.DownloadName)
-		} else {
-			arr := strings.Split(test.DownloadName, ".")
-			fileNames = append(fileNames, arr[0]+" ("+strconv.Itoa(i)+")."+arr[1])
-		}
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(len(reqs))
-	downloader.Listener(func(event *Event) {
-		if event.Key == EventKeyDone {
-			wg.Done()
-		}
-	})
-
-	taskIds, err := downloader.CreateDirectBatch(reqs, &base.Options{
-		Path: test.Dir,
-		Name: test.DownloadName,
-		Extra: http.OptsExtra{
-			Connections: 4,
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	wg.Wait()
-
-	t.Run("GetTasksByFilter nil", func(t *testing.T) {
-		tasks := downloader.GetTasksByFilter(nil)
-		if len(tasks) != len(reqs) {
-			t.Errorf("GetTasksByFilter nil task got = %v, want %v", len(tasks), len(reqs))
-		}
-	})
-
-	t.Run("GetTasksByFilter empty", func(t *testing.T) {
-		tasks := downloader.GetTasksByFilter(&TaskFilter{})
-		if len(tasks) != len(reqs) {
-			t.Errorf("GetTasksByFilter empty task got = %v, want %v", len(tasks), len(reqs))
-		}
-	})
-
-	t.Run("GetTasksByFilter ids", func(t *testing.T) {
-		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			IDs: taskIds,
-		})
-		if len(tasks) != len(reqs) {
-			t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), len(reqs))
-		}
-	})
-
-	t.Run("GetTasksByFilter match ids", func(t *testing.T) {
-		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			IDs: []string{taskIds[0]},
-		})
-		if len(tasks) != 1 {
-			t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), 1)
-		}
-	})
-
-	t.Run("GetTasksByFilter not match ids", func(t *testing.T) {
-		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			IDs: []string{"xxx"},
-		})
-		if len(tasks) != 0 {
-			t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), 0)
-		}
-	})
-
-	t.Run("GetTasksByFilter status", func(t *testing.T) {
-		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			Statuses: []base.Status{base.DownloadStatusDone},
-		})
-		if len(tasks) != len(reqs) {
-			t.Errorf("GetTasksByFilter status task got = %v, want %v", len(tasks), len(reqs))
-		}
-	})
-
-	t.Run("GetTasksByFilter not match status", func(t *testing.T) {
-		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			Statuses: []base.Status{base.DownloadStatusError},
-		})
-		if len(tasks) != 0 {
-			t.Errorf("GetTasksByFilter status task got = %v, want %v", len(tasks), 0)
-		}
-	})
-
-	t.Run("GetTasksByFilter match notStatus", func(t *testing.T) {
-		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			NotStatuses: []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))
-		}
-	})
-
-	t.Run("GetTasksByFilter not match notStatus", func(t *testing.T) {
-		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			NotStatuses: []base.Status{base.DownloadStatusDone},
-		})
-		if len(tasks) != 0 {
-			t.Errorf("GetTasksByFilter not match notStatus task got = %v, want %v", len(tasks), 0)
-		}
-	})
-
-	t.Run("GetTasksByFilter match ids and status", func(t *testing.T) {
-		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			IDs:      []string{taskIds[0]},
-			Statuses: []base.Status{base.DownloadStatusDone},
-		})
-		if len(tasks) != 1 {
-			t.Errorf("GetTasksByFilter match ids and status task got = %v, want %v", len(tasks), 1)
-		}
-	})
-
-	t.Run("GetTasksByFilter not match ids and status", func(t *testing.T) {
-		tasks := downloader.GetTasksByFilter(&TaskFilter{
-			IDs:      []string{taskIds[0]},
-			Statuses: []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/engine/engine.go

@@ -3,7 +3,6 @@ package engine
 import (
 	_ "embed"
 	"errors"
-	"github.com/GopeedLab/gopeed/pkg/base"
 	gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
 	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
 	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/formdata"
@@ -12,6 +11,7 @@ import (
 	"github.com/dop251/goja"
 	"github.com/dop251/goja_nodejs/eventloop"
 	gojaurl "github.com/dop251/goja_nodejs/url"
+	"net/url"
 	"time"
 )
 
@@ -106,11 +106,11 @@ func (e *Engine) await(value any) {
 }
 
 func (e *Engine) Close() {
-	e.loop.StopNoWait()
+	e.loop.Stop()
 }
 
 type Config struct {
-	ProxyConfig *base.DownloaderProxyConfig
+	ProxyURL *url.URL
 }
 
 func NewEngine(cfg *Config) *Engine {
@@ -135,7 +135,7 @@ func NewEngine(cfg *Config) *Engine {
 		if err := formdata.Enable(runtime); err != nil {
 			return
 		}
-		if err := xhr.Enable(runtime, cfg.ProxyConfig.ToHandler()); err != nil {
+		if err := xhr.Enable(runtime, cfg.ProxyURL); err != nil {
 			return
 		}
 		if _, err := runtime.RunString(polyfillScript); err != nil {
@@ -145,10 +145,6 @@ func NewEngine(cfg *Config) *Engine {
 		if err := runtime.Set("global", runtime.GlobalObject()); err != nil {
 			return
 		}
-		// polyfill window
-		if err := runtime.Set("window", runtime.GlobalObject()); err != nil {
-			return
-		}
 		// polyfill window.location
 		if _, err := runtime.RunString("global.location = new URL('http://localhost');"); err != nil {
 			return
@@ -178,15 +174,7 @@ func resolveResult(value goja.Value) (any, error) {
 			if err, ok := p.Result().Export().(error); ok {
 				return nil, err
 			} else {
-				stack := p.Result().String()
+				return nil, errors.New(p.Result().String())
-				result := p.Result()
-				if ro, ok := result.(*goja.Object); ok {
-					stackVal := ro.Get("stack")
-					if stackVal != nil && stackVal.String() != "" {
-						stack = stackVal.String()
-					}
-				}
-				return nil, errors.New(stack)
 			}
 		}
 	}

pkg/download/engine/engine_test.go

@@ -6,6 +6,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/GopeedLab/gopeed/internal/test"
+	gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
+	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
+	gojautil "github.com/GopeedLab/gopeed/pkg/download/engine/util"
+	"github.com/GopeedLab/gopeed/pkg/util"
+	"github.com/dop251/goja"
 	"io"
 	"net"
 	"net/http"
@@ -13,13 +19,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"github.com/GopeedLab/gopeed/internal/test"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
-	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
-	gojautil "github.com/GopeedLab/gopeed/pkg/download/engine/util"
-	"github.com/dop251/goja"
 )
 
 func TestPolyfill(t *testing.T) {
@@ -27,8 +26,6 @@ func TestPolyfill(t *testing.T) {
 	doTestPolyfill(t, "XMLHttpRequest")
 	doTestPolyfill(t, "Blob")
 	doTestPolyfill(t, "FormData")
-	doTestPolyfill(t, "TextDecoder")
-	doTestPolyfill(t, "TextEncoder")
 	doTestPolyfill(t, "fetch")
 	doTestPolyfill(t, "__gopeed_create_vm")
 }
@@ -72,44 +69,6 @@ async function testOctetStream(file){
 	return await resp.text();
 }
 
-async function testRedirect() {
-    const url = host + '/redirect?num=3'
-    return await new Promise((resolve, reject) => {
-        fetch(url, {
-            method: 'HEAD',
-            redirect: 'error',
-        }).then(()=>reject())
-
-        fetch(url, {
-            method: 'HEAD',
-            redirect: 'follow',
-        }).then((res) =>res.headers.has('location') && reject()).catch(() => reject())
-
-        fetch(url, {
-            method: 'HEAD',
-            redirect: 'manual',
-        }).then((res) => {
-			const location = res.headers.get('location');
-			location ? resolve(location) : reject()
-        }).catch(() => reject())
-    })
-}
-
-async function testResponseUrl() {
-    return new Promise((resolve, reject) => {
-		const xhr = new XMLHttpRequest();
-		xhr.open('GET', host+'/redirect?num=3');
-		xhr.onload = function(){
-            if (xhr.responseURL.includes('/redirect?num=0')){
-                resolve();
-            }else{
-                reject();
-            }
-		};
-		xhr.send();
-	});
-}
-
 async function testFormData(file){
 	const formData = new FormData();
 	formData.append('name', 'test');
@@ -121,30 +80,6 @@ async function testFormData(file){
 	return await resp.json();
 }
 
-function testHeader(){
-	return new Promise((resolve, reject) => {
-		const xhr = new XMLHttpRequest();
-		xhr.open('GET', host+'/header');
-		xhr.setRequestHeader('X-Gopeed-Test', 'test1');
-		xhr.setRequestHeader('x-gopeed-test', 'test2');
-		xhr.setRequestHeader('x-Gopeed-test', 'test3');
-		xhr.onload = function(){
-			const testHeader1 = xhr.getResponseHeader("X-Gopeed-Test");
-		    const testHeader2 = xhr.getResponseHeader("x-gopeed-test");
-		    const testHeader3 = xhr.getResponseHeader("x-Gopeed-test");
-			const expect = 'test1, test2, test3';
-			const all = xhr.getAllResponseHeaders();
-			if(testHeader1 === expect && testHeader2 === expect && testHeader3 === expect 
-				&& all.includes('X-Gopeed-Test: '+expect)){
-				resolve();
-			}else{
-				reject();
-			}
-		};
-		xhr.send();
-	});
-}
-
 function testProgress(){
 	return new Promise((resolve, reject) => {
 		const xhr = new XMLHttpRequest();
@@ -237,20 +172,6 @@ function testTimeout(){
 		}
 	}()
 
-	t.Run("testRedirect", func(t *testing.T) {
-		_, err := callTestFun(engine, "testRedirect")
-		if err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	t.Run("testResponseUrl", func(t *testing.T) {
-		_, err = callTestFun(engine, "testResponseUrl")
-		if err != nil {
-			t.Fatal(err)
-		}
-	})
-
 	func() {
 		jsFile, goFile, md5 := buildFile(t, engine.Runtime)
 		result, err = callTestFun(engine, "testFormData", jsFile)
@@ -269,19 +190,14 @@ function testTimeout(){
 		}
 	}()
 
-	_, err = callTestFun(engine, "testHeader")
-	if err != nil {
-		t.Fatal("header test failed", err)
-	}
-
 	_, err = callTestFun(engine, "testProgress")
 	if err != nil {
-		t.Fatal("progress test failed", err)
+		t.Fatal("progress test failed")
 	}
 
 	_, err = callTestFun(engine, "testAbort")
 	if err != nil {
-		t.Fatal("abort test failed", err)
+		t.Fatal("abort test failed")
 	}
 
 	_, err = callTestFun(engine, "testTimeout")
@@ -301,16 +217,8 @@ func doTestFetchWithProxy(t *testing.T, usr, pwd string) {
 
 	proxyListener := test.StartSocks5Server(usr, pwd)
 	defer proxyListener.Close()
-	engine := NewEngine(&Config{
+
-		ProxyConfig: &base.DownloaderProxyConfig{
+	engine := NewEngine(&Config{ProxyURL: util.BuildProxyUrl("socks5", proxyListener.Addr().String(), usr, pwd)})
-			Enable: true,
-			System: false,
-			Scheme: "socks5",
-			Host:   proxyListener.Addr().String(),
-			Usr:    usr,
-			Pwd:    pwd,
-		},
-	})
 
 	if _, err := engine.RunString(fmt.Sprintf("var host = 'http://%s';", httpListener.Addr().String())); err != nil {
 		t.Fatal(err)
@@ -412,15 +320,6 @@ func startServer() net.Listener {
 		w.WriteHeader(http.StatusOK)
 		w.Write([]byte("ok"))
 	})
-	mux.HandleFunc("/header", func(w http.ResponseWriter, r *http.Request) {
-		for k, v := range r.Header {
-			if strings.HasPrefix(k, "X-Gopeed") {
-				w.Header().Set(k, strings.Join(v, ", "))
-			}
-		}
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("ok"))
-	})
 	mux.HandleFunc("/text", func(w http.ResponseWriter, r *http.Request) {
 		buf, _ := io.ReadAll(r.Body)
 		w.WriteHeader(http.StatusOK)
@@ -460,16 +359,6 @@ func startServer() net.Listener {
 		w.WriteHeader(http.StatusOK)
 		w.Write([]byte("ok"))
 	})
-	mux.HandleFunc("/redirect", func(w http.ResponseWriter, r *http.Request) {
-		num := r.URL.Query().Get("num")
-		n, _ := strconv.Atoi(num)
-		if n > 0 {
-			http.Redirect(w, r, fmt.Sprintf("/redirect?num=%d", n-1), http.StatusFound)
-		} else {
-			w.WriteHeader(http.StatusOK)
-			w.Write([]byte("ok"))
-		}
-	})
 	server.Handler = mux
 	go server.Serve(listener)
 	return listener

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

@@ -2,19 +2,16 @@ package xhr
 
 import (
 	"bytes"
-	"errors"
+	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
+	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/formdata"
+	"github.com/GopeedLab/gopeed/pkg/download/engine/util"
+	"github.com/dop251/goja"
 	"io"
 	"mime/multipart"
 	"net"
 	"net/http"
 	"net/url"
-	"strings"
 	"time"
-
-	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
-	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/formdata"
-	"github.com/GopeedLab/gopeed/pkg/download/engine/util"
-	"github.com/dop251/goja"
 )
 
 const (
@@ -26,12 +23,6 @@ const (
 	eventTimeout          = "timeout"
 )
 
-const (
-	redirectError  = "error"
-	redirectFollow = "follow"
-	redirectManual = "manual"
-)
-
 type ProgressEvent struct {
 	Type             string `json:"type"`
 	LengthComputable bool   `json:"lengthComputable"`
@@ -126,26 +117,18 @@ type XMLHttpRequestUpload struct {
 type XMLHttpRequest struct {
 	method          string
 	url             string
-	requestHeaders  http.Header
+	requestHeaders  map[string]string
-	responseHeaders http.Header
+	responseHeaders map[string]string
 	aborted         bool
-	proxyHandler    func(r *http.Request) (*url.URL, error)
+	proxyUrl        *url.URL
 
-	WithCredentials bool                  `json:"withCredentials"`
+	Upload       *XMLHttpRequestUpload `json:"upload"`
-	Upload          *XMLHttpRequestUpload `json:"upload"`
+	Timeout      int                   `json:"timeout"`
-	Timeout         int                   `json:"timeout"`
+	ReadyState   int                   `json:"readyState"`
-	ReadyState      int                   `json:"readyState"`
+	Status       int                   `json:"status"`
-	Status          int                   `json:"status"`
+	StatusText   string                `json:"statusText"`
-	StatusText      string                `json:"statusText"`
+	Response     string                `json:"response"`
-	Response        string                `json:"response"`
+	ResponseText string                `json:"responseText"`
-	ResponseText    string                `json:"responseText"`
-	// https://developer.mozilla.org/zh-CN/docs/Web/API/XMLHttpRequest/responseURL
-	// https://xhr.spec.whatwg.org/#the-responseurl-attribute
-	ResponseUrl string `json:"responseURL"`
-	// extend fetch redirect
-	// https://developer.mozilla.org/en-US/docs/Web/API/RequestInit#redirect
-	// https://fetch.spec.whatwg.org/#concept-request-redirect-mode
-	Redirect string `json:"redirect"`
 	*EventProp
 	Onreadystatechange func(event *ProgressEvent) `json:"onreadystatechange"`
 }
@@ -153,13 +136,13 @@ type XMLHttpRequest struct {
 func (xhr *XMLHttpRequest) Open(method, url string) {
 	xhr.method = method
 	xhr.url = url
-	xhr.requestHeaders = make(http.Header)
+	xhr.requestHeaders = make(map[string]string)
-	xhr.responseHeaders = make(http.Header)
+	xhr.responseHeaders = make(map[string]string)
 	xhr.doReadystatechange(1)
 }
 
 func (xhr *XMLHttpRequest) SetRequestHeader(key, value string) {
-	xhr.requestHeaders.Add(key, value)
+	xhr.requestHeaders[key] = value
 }
 
 func (xhr *XMLHttpRequest) Send(data goja.Value) {
@@ -169,33 +152,31 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
 	var (
 		contentType   string
 		contentLength int64
-		isStringBody  bool
 	)
 	if d == nil || xhr.method == "GET" || xhr.method == "HEAD" {
 		req, err = http.NewRequest(xhr.method, xhr.url, nil)
 	} else {
-		switch v := d.(type) {
+		switch d.(type) {
 		case string:
-			req, err = http.NewRequest(xhr.method, xhr.url, bytes.NewBufferString(v))
+			req, err = http.NewRequest(xhr.method, xhr.url, bytes.NewBufferString(d.(string)))
 			contentType = "text/plain;charset=UTF-8"
-			contentLength = int64(len(v))
+			contentLength = int64(len(d.(string)))
-			isStringBody = true
 		case *file.File:
-			req, err = http.NewRequest(xhr.method, xhr.url, v.Reader)
+			req, err = http.NewRequest(xhr.method, xhr.url, d.(*file.File).Reader)
 			contentType = "application/octet-stream"
-			contentLength = v.Size
+			contentLength = d.(*file.File).Size
 		case *formdata.FormData:
 			pr, pw := io.Pipe()
 			mw := NewMultipart(pw)
-			for _, e := range v.Entries() {
+			for _, e := range d.(*formdata.FormData).Entries() {
 				arr := e.([]any)
 				k := arr[0].(string)
 				v := arr[1]
-				switch v := v.(type) {
+				switch v.(type) {
 				case string:
-					mw.WriteField(k, v)
+					mw.WriteField(k, v.(string))
 				case *file.File:
-					mw.WriteFile(k, v)
+					mw.WriteFile(k, v.(*file.File))
 				}
 			}
 			go func() {
@@ -212,38 +193,27 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
 		xhr.callOnerror()
 		return
 	}
-	req.Header = xhr.requestHeaders
+	if contentType != "" {
-	// Only string body can specify Content-Type header by user
-	if contentType != "" && (!isStringBody || req.Header.Get("Content-Type") == "") {
 		req.Header.Set("Content-Type", contentType)
 	}
 	if contentLength > 0 {
 		req.ContentLength = contentLength
 	}
-	transport := &http.Transport{
+	for k, v := range xhr.requestHeaders {
-		Proxy: xhr.proxyHandler,
+		req.Header.Set(k, v)
+	}
+	transport := &http.Transport{}
+	if xhr.proxyUrl != nil {
+		transport.Proxy = http.ProxyURL(xhr.proxyUrl)
 	}
 	client := &http.Client{
 		Transport: transport,
 		Timeout:   time.Duration(xhr.Timeout) * time.Millisecond,
-		CheckRedirect: func(req *http.Request, via []*http.Request) error {
-			if xhr.Redirect == redirectManual {
-				return http.ErrUseLastResponse
-			}
-			if xhr.Redirect == redirectError {
-				return errors.New("redirect failed")
-			}
-			if len(via) > 20 {
-				return errors.New("too many redirects")
-			}
-			return nil
-		},
 	}
 	resp, err := client.Do(req)
 	if err != nil {
 		// handle timeout error
-		var ne net.Error
+		if err, ok := err.(net.Error); ok && err.Timeout() {
-		if errors.As(err, &ne) && ne.Timeout() {
 			if xhr.Timeout > 0 {
 				xhr.Upload.callOntimeout()
 				xhr.callOntimeout()
@@ -259,12 +229,9 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
 	if !xhr.aborted {
 		xhr.Upload.callOnload()
 	}
-
+	for k, v := range resp.Header {
-	responseUrl := resp.Request.URL
+		xhr.responseHeaders[k] = v[0]
-	responseUrl.Fragment = ""
+	}
-	xhr.ResponseUrl = responseUrl.String()
-
-	xhr.responseHeaders = resp.Header
 	xhr.Status = resp.StatusCode
 	xhr.StatusText = resp.Status
 	xhr.doReadystatechange(2)
@@ -293,7 +260,7 @@ func (xhr *XMLHttpRequest) Abort() {
 }
 
 func (xhr *XMLHttpRequest) GetResponseHeader(key string) string {
-	return strings.Join(xhr.responseHeaders.Values(key), ", ")
+	return xhr.responseHeaders[key]
 }
 
 func (xhr *XMLHttpRequest) GetAllResponseHeaders() string {
@@ -301,7 +268,7 @@ func (xhr *XMLHttpRequest) GetAllResponseHeaders() string {
 	for k, v := range xhr.responseHeaders {
 		buf.WriteString(k)
 		buf.WriteString(": ")
-		buf.WriteString(strings.Join(v, ", "))
+		buf.WriteString(v)
 		buf.WriteString("\r\n")
 	}
 	return buf.String()
@@ -346,7 +313,7 @@ func (xhr *XMLHttpRequest) parseData(data goja.Value) any {
 	return data.String()
 }
 
-func Enable(runtime *goja.Runtime, proxyHandler func(r *http.Request) (*url.URL, error)) error {
+func Enable(runtime *goja.Runtime, proxyUrl *url.URL) error {
 	progressEvent := runtime.ToValue(func(call goja.ConstructorCall) *goja.Object {
 		if len(call.Arguments) < 1 {
 			util.ThrowTypeError(runtime, "Failed to construct 'ProgressEvent': 1 argument required, but only 0 present.")
@@ -360,7 +327,7 @@ func Enable(runtime *goja.Runtime, proxyHandler func(r *http.Request) (*url.URL,
 	})
 	xhr := runtime.ToValue(func(call goja.ConstructorCall) *goja.Object {
 		instance := &XMLHttpRequest{
-			proxyHandler: proxyHandler,
+			proxyUrl: proxyUrl,
 			Upload: &XMLHttpRequestUpload{
 				EventProp: &EventProp{
 					eventListeners: make(map[string]func(event *ProgressEvent)),
@@ -419,9 +386,10 @@ func (w *multipartWrapper) Size() int64 {
 	w.statWriter.Close()
 	size := int64(w.statBuffer.Len())
 	for _, v := range w.fields {
-		switch v := v.(type) {
+		switch v.(type) {
 		case *file.File:
-			size += v.Size
+			f := v.(*file.File)
+			size += f.Size
 		}
 	}
 	return size
@@ -429,17 +397,18 @@ func (w *multipartWrapper) Size() int64 {
 
 func (w *multipartWrapper) Send() error {
 	for k, v := range w.fields {
-		switch v := v.(type) {
+		switch v.(type) {
 		case string:
-			if err := w.writer.WriteField(k, v); err != nil {
+			if err := w.writer.WriteField(k, v.(string)); err != nil {
 				return err
 			}
 		case *file.File:
-			fw, err := w.writer.CreateFormFile(k, v.Name)
+			f := v.(*file.File)
+			fw, err := w.writer.CreateFormFile(k, f.Name)
 			if err != nil {
 				return err
 			}
-			if _, err = io.Copy(fw, v); err != nil {
+			if _, err = io.Copy(fw, f); err != nil {
 				return err
 			}
 		}

pkg/download/engine/polyfill/out/index.js

@@ -1 +1 @@
-(()=>{var e={725:function(e,t,r){var o,n,i;i="undefined"!=typeof self&&self||"undefined"!=typeof window&&window||void 0!==r.g&&r.g||this,o=function(e){"use strict";var t=i.BlobBuilder||i.WebKitBlobBuilder||i.MSBlobBuilder||i.MozBlobBuilder,r=i.URL||i.webkitURL||function(e,t){return(t=document.createElement("a")).href=e,t},o=i.Blob,n=r.createObjectURL,a=r.revokeObjectURL,s=i.Symbol&&i.Symbol.toStringTag,u=!1,f=!1,l=t&&t.prototype.append&&t.prototype.getBlob;try{u=2===new Blob(["ä"]).size,f=2===new Blob([new Uint8Array([1,2])]).size}catch(e){}function c(e){return e.map((function(e){if(e.buffer instanceof ArrayBuffer){var t=e.buffer;if(e.byteLength!==t.byteLength){var r=new Uint8Array(e.byteLength);r.set(new Uint8Array(t,e.byteOffset,e.byteLength)),t=r.buffer}return t}return e}))}function h(e,r){r=r||{};var o=new t;return c(e).forEach((function(e){o.append(e)})),r.type?o.getBlob(r.type):o.getBlob()}function d(e,t){return new o(c(e),t||{})}i.Blob&&(h.prototype=Blob.prototype,d.prototype=Blob.prototype);var p="function"==typeof TextEncoder?TextEncoder.prototype.encode.bind(new TextEncoder):function(e){for(var t=0,r=e.length,o=i.Uint8Array||Array,n=0,a=Math.max(32,r+(r>>1)+7),s=new o(a>>3<<3);t<r;){var u=e.charCodeAt(t++);if(u>=55296&&u<=56319){if(t<r){var f=e.charCodeAt(t);56320==(64512&f)&&(++t,u=((1023&u)<<10)+(1023&f)+65536)}if(u>=55296&&u<=56319)continue}if(n+4>s.length){a+=8,a=(a*=1+t/e.length*2)>>3<<3;var l=new Uint8Array(a);l.set(s),s=l}if(0!=(4294967168&u)){if(0==(4294965248&u))s[n++]=u>>6&31|192;else if(0==(4294901760&u))s[n++]=u>>12&15|224,s[n++]=u>>6&63|128;else{if(0!=(4292870144&u))continue;s[n++]=u>>18&7|240,s[n++]=u>>12&63|128,s[n++]=u>>6&63|128}s[n++]=63&u|128}else s[n++]=u}return s.slice(0,n)},y="function"==typeof TextDecoder?TextDecoder.prototype.decode.bind(new TextDecoder):function(e){for(var t=e.length,r=[],o=0;o<t;){var n,i,a,s,u=e[o],f=null,l=u>239?4:u>223?3:u>191?2:1;if(o+l<=t)switch(l){case 1:u<128&&(f=u);break;case 2:128==(192&(n=e[o+1]))&&(s=(31&u)<<6|63&n)>127&&(f=s);break;case 3:n=e[o+1],i=e[o+2],128==(192&n)&&128==(192&i)&&(s=(15&u)<<12|(63&n)<<6|63&i)>2047&&(s<55296||s>57343)&&(f=s);break;case 4:n=e[o+1],i=e[o+2],a=e[o+3],128==(192&n)&&128==(192&i)&&128==(192&a)&&(s=(15&u)<<18|(63&n)<<12|(63&i)<<6|63&a)>65535&&s<1114112&&(f=s)}null===f?(f=65533,l=1):f>65535&&(f-=65536,r.push(f>>>10&1023|55296),f=56320|1023&f),r.push(f),o+=l}for(var c=r.length,h="",d=0;d<c;)h+=String.fromCharCode.apply(String,r.slice(d,d+=4096));return h};function b(){var t=!!i.ActiveXObject||"-ms-scroll-limit"in document.documentElement.style&&"-ms-ime-align"in document.documentElement.style,r=i.XMLHttpRequest&&i.XMLHttpRequest.prototype.send;t&&r&&(XMLHttpRequest.prototype.send=function(e){e instanceof Blob?(this.setRequestHeader("Content-Type",e.type),r.call(this,e)):r.call(this,e)});try{new File([],""),e.File=i.File,e.FileReader=i.FileReader}catch(t){try{e.File=new Function('class File extends Blob {constructor(chunks, name, opts) {opts = opts || {};super(chunks, opts || {});this.name = name.replace(/\\//g, ":");this.lastModifiedDate = opts.lastModified ? new Date(opts.lastModified) : new Date();this.lastModified = +this.lastModifiedDate;}};return new File([], ""), File')()}catch(t){e.File=function(e,t,r){var o=new Blob(e,r),n=r&&void 0!==r.lastModified?new Date(r.lastModified):new Date;return o.name=t.replace(/\//g,":"),o.lastModifiedDate=n,o.lastModified=+n,o.toString=function(){return"[object File]"},s&&(o[s]="File"),o}}}}u?(b(),e.Blob=f?i.Blob:d):l?(b(),e.Blob=h):function(){function t(e){for(var t=new Array(e.byteLength),r=new Uint8Array(e),o=t.length;o--;)t[o]=r[o];return t}function o(e){for(var t="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",r=[],o=0;o<e.length;o+=3){var n=e[o],i=o+1<e.length,a=i?e[o+1]:0,s=o+2<e.length,u=s?e[o+2]:0,f=n>>2,l=(3&n)<<4|a>>4,c=(15&a)<<2|u>>6,h=63&u;s||(h=64,i||(c=64)),r.push(t[f],t[l],t[c],t[h])}return r.join("")}var s=Object.create||function(e){function t(){}return t.prototype=e,new t};function u(e){return Object.prototype.toString.call(e).slice(8,-1)}function f(e,t){return"object"==typeof e&&Object.prototype.isPrototypeOf.call(e.prototype,t)}var l=["Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Uint16Array","Int32Array","Uint32Array","Float32Array","Float64Array","ArrayBuffer"];function c(e){return t=l,r=u(e),-1!==t.indexOf(r)||f(i.ArrayBuffer,e);var t,r}function h(e,r){r=null==r?{}:r;for(var o=0,n=(e=e?e.slice():[]).length;o<n;o++){var a=e[o];a instanceof h?e[o]=a._buffer:"string"==typeof a?e[o]=p(a):"DataView"===u(s=a)||f(i.DataView,s)?e[o]=t(a.buffer):c(a)?e[o]=t(a):e[o]=p(String(a))}var s;this._buffer=i.Uint8Array?function(e){for(var t=0,r=e.length;r--;)t+=e[r].length;for(var o=new Uint8Array(t),n=0,i=0;i<e.length;i++){var a=e[i];o.set(a,n),n+=a.byteLength||a.length}return o}(e):[].concat.apply([],e),this.size=this._buffer.length,this.type=r.type||"",/[^\u0020-\u007E]/.test(this.type)?this.type="":this.type=this.type.toLowerCase()}funcLine truncated
+(()=>{var t={725:function(t,e,r){var o,n,i;i="undefined"!=typeof self&&self||"undefined"!=typeof window&&window||void 0!==r.g&&r.g||this,o=function(t){"use strict";var e=i.BlobBuilder||i.WebKitBlobBuilder||i.MSBlobBuilder||i.MozBlobBuilder,r=i.URL||i.webkitURL||function(t,e){return(e=document.createElement("a")).href=t,e},o=i.Blob,n=r.createObjectURL,a=r.revokeObjectURL,s=i.Symbol&&i.Symbol.toStringTag,u=!1,f=!1,l=e&&e.prototype.append&&e.prototype.getBlob;try{u=2===new Blob(["ä"]).size,f=2===new Blob([new Uint8Array([1,2])]).size}catch(t){}function c(t){return t.map((function(t){if(t.buffer instanceof ArrayBuffer){var e=t.buffer;if(t.byteLength!==e.byteLength){var r=new Uint8Array(t.byteLength);r.set(new Uint8Array(e,t.byteOffset,t.byteLength)),e=r.buffer}return e}return t}))}function h(t,r){r=r||{};var o=new e;return c(t).forEach((function(t){o.append(t)})),r.type?o.getBlob(r.type):o.getBlob()}function p(t,e){return new o(c(t),e||{})}i.Blob&&(h.prototype=Blob.prototype,p.prototype=Blob.prototype);var y="function"==typeof TextEncoder?TextEncoder.prototype.encode.bind(new TextEncoder):function(t){for(var e=0,r=t.length,o=i.Uint8Array||Array,n=0,a=Math.max(32,r+(r>>1)+7),s=new o(a>>3<<3);e<r;){var u=t.charCodeAt(e++);if(u>=55296&&u<=56319){if(e<r){var f=t.charCodeAt(e);56320==(64512&f)&&(++e,u=((1023&u)<<10)+(1023&f)+65536)}if(u>=55296&&u<=56319)continue}if(n+4>s.length){a+=8,a=(a*=1+e/t.length*2)>>3<<3;var l=new Uint8Array(a);l.set(s),s=l}if(0!=(4294967168&u)){if(0==(4294965248&u))s[n++]=u>>6&31|192;else if(0==(4294901760&u))s[n++]=u>>12&15|224,s[n++]=u>>6&63|128;else{if(0!=(4292870144&u))continue;s[n++]=u>>18&7|240,s[n++]=u>>12&63|128,s[n++]=u>>6&63|128}s[n++]=63&u|128}else s[n++]=u}return s.slice(0,n)},d="function"==typeof TextDecoder?TextDecoder.prototype.decode.bind(new TextDecoder):function(t){for(var e=t.length,r=[],o=0;o<e;){var n,i,a,s,u=t[o],f=null,l=u>239?4:u>223?3:u>191?2:1;if(o+l<=e)switch(l){case 1:u<128&&(f=u);break;case 2:128==(192&(n=t[o+1]))&&(s=(31&u)<<6|63&n)>127&&(f=s);break;case 3:n=t[o+1],i=t[o+2],128==(192&n)&&128==(192&i)&&(s=(15&u)<<12|(63&n)<<6|63&i)>2047&&(s<55296||s>57343)&&(f=s);break;case 4:n=t[o+1],i=t[o+2],a=t[o+3],128==(192&n)&&128==(192&i)&&128==(192&a)&&(s=(15&u)<<18|(63&n)<<12|(63&i)<<6|63&a)>65535&&s<1114112&&(f=s)}null===f?(f=65533,l=1):f>65535&&(f-=65536,r.push(f>>>10&1023|55296),f=56320|1023&f),r.push(f),o+=l}for(var c=r.length,h="",p=0;p<c;)h+=String.fromCharCode.apply(String,r.slice(p,p+=4096));return h};function b(){var e=!!i.ActiveXObject||"-ms-scroll-limit"in document.documentElement.style&&"-ms-ime-align"in document.documentElement.style,r=i.XMLHttpRequest&&i.XMLHttpRequest.prototype.send;e&&r&&(XMLHttpRequest.prototype.send=function(t){t instanceof Blob?(this.setRequestHeader("Content-Type",t.type),r.call(this,t)):r.call(this,t)});try{new File([],""),t.File=i.File,t.FileReader=i.FileReader}catch(e){try{t.File=new Function('class File extends Blob {constructor(chunks, name, opts) {opts = opts || {};super(chunks, opts || {});this.name = name.replace(/\\//g, ":");this.lastModifiedDate = opts.lastModified ? new Date(opts.lastModified) : new Date();this.lastModified = +this.lastModifiedDate;}};return new File([], ""), File')()}catch(e){t.File=function(t,e,r){var o=new Blob(t,r),n=r&&void 0!==r.lastModified?new Date(r.lastModified):new Date;return o.name=e.replace(/\//g,":"),o.lastModifiedDate=n,o.lastModified=+n,o.toString=function(){return"[object File]"},s&&(o[s]="File"),o}}}}u?(b(),t.Blob=f?i.Blob:p):l?(b(),t.Blob=h):function(){function e(t){for(var e=new Array(t.byteLength),r=new Uint8Array(t),o=e.length;o--;)e[o]=r[o];return e}function o(t){for(var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",r=[],o=0;o<t.length;o+=3){var n=t[o],i=o+1<t.length,a=i?t[o+1]:0,s=o+2<t.length,u=s?t[o+2]:0,f=n>>2,l=(3&n)<<4|a>>4,c=(15&a)<<2|u>>6,h=63&u;s||(h=64,i||(c=64)),r.push(e[f],e[l],e[c],e[h])}return r.join("")}var s=Object.create||function(t){function e(){}return e.prototype=t,new e};function u(t){return Object.prototype.toString.call(t).slice(8,-1)}function f(t,e){return"object"==typeof t&&Object.prototype.isPrototypeOf.call(t.prototype,e)}var l=["Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Uint16Array","Int32Array","Uint32Array","Float32Array","Float64Array","ArrayBuffer"];function c(t){return e=l,r=u(t),-1!==e.indexOf(r)||f(i.ArrayBuffer,t);var e,r}function h(t,r){r=null==r?{}:r;for(var o=0,n=(t=t?t.slice():[]).length;o<n;o++){var a=t[o];a instanceof h?t[o]=a._buffer:"string"==typeof a?t[o]=y(a):"DataView"===u(s=a)||f(i.DataView,s)?t[o]=e(a.buffer):c(a)?t[o]=e(a):t[o]=y(String(a))}var s;this._buffer=i.Uint8Array?function(t){for(var e=0,r=t.length;r--;)e+=t[r].length;for(var o=new Uint8Array(e),n=0,i=0;i<t.length;i++){var a=t[i];o.set(a,n),n+=a.byteLength||a.length}return o}(t):[].concat.apply([],t),this.size=this._buffer.length,this.type=r.type||"",/[^\u0020-\u007E]/.test(this.type)?this.type="":this.type=this.type.toLowerCase()}funcLine truncated

pkg/download/engine/polyfill/package.json

@@ -7,19 +7,16 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "webpack --mode production --watch",
-    "build": "webpack --mode production",
+    "build": "webpack --mode production"
-    "postinstall": "patch-package"
   },
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "patch-package": "^8.0.0",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
   },
   "dependencies": {
     "blob-polyfill": "^7.0.20220408",
-    "fastestsmallesttextencoderdecoder": "^1.0.22",
+    "whatwg-fetch": "^3.6.2"
-    "whatwg-fetch": "^3.6.20"
   }
 }

pkg/download/engine/polyfill/patches/whatwg-fetch+3.6.20.patch

@@ -1,46 +0,0 @@
-diff --git a/node_modules/whatwg-fetch/dist/fetch.umd.js b/node_modules/whatwg-fetch/dist/fetch.umd.js
-index 7a0d852..604691e 100644
---- a/node_modules/whatwg-fetch/dist/fetch.umd.js
-+++ b/node_modules/whatwg-fetch/dist/fetch.umd.js
-@@ -394,6 +394,7 @@
-       }
-     }());
-     this.referrer = null;
-+    this.redirect = options.redirect || 'follow'
- 
-     if ((this.method === 'GET' || this.method === 'HEAD') && body) {
-       throw new TypeError('Body not allowed for GET or HEAD requests')
-@@ -606,6 +607,10 @@
-         }
-       }
- 
-+      if ('redirect' in xhr) {
-+        xhr.redirect = request.redirect
-+      }
-+
-       if (init && typeof init.headers === 'object' && !(init.headers instanceof Headers || (g.Headers && init.headers instanceof g.Headers))) {
-         var names = [];
-         Object.getOwnPropertyNames(init.headers).forEach(function(name) {
-diff --git a/node_modules/whatwg-fetch/fetch.js b/node_modules/whatwg-fetch/fetch.js
-index f39a983..d1fc903 100644
---- a/node_modules/whatwg-fetch/fetch.js
-+++ b/node_modules/whatwg-fetch/fetch.js
-@@ -388,6 +388,7 @@ export function Request(input, options) {
-     }
-   }());
-   this.referrer = null
-+  this.redirect = options.redirect || 'follow'
- 
-   if ((this.method === 'GET' || this.method === 'HEAD') && body) {
-     throw new TypeError('Body not allowed for GET or HEAD requests')
-@@ -600,6 +601,10 @@ export function fetch(input, init) {
-       }
-     }
- 
-+    if ('redirect' in xhr) {
-+      xhr.redirect = request.redirect
-+    }
-+
-     if (init && typeof init.headers === 'object' && !(init.headers instanceof Headers || (g.Headers && init.headers instanceof g.Headers))) {
-       var names = [];
-       Object.getOwnPropertyNames(init.headers).forEach(function(name) {

pkg/download/engine/polyfill/src/index.js

@@ -1,5 +1,3 @@
 import "./blob/index.js"
 import "./crypto/index.js"
-// polyfill TextEncoder
-import 'fastestsmallesttextencoderdecoder';
 import "./fetch/index.js"