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

@@ -7,14 +7,14 @@ on:
         description: 'Build platform'
         required: true
         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.16.8"
+  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 }}
@@ -40,20 +40,19 @@ jobs:
       - 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=$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,7 +135,7 @@ 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 ]
     steps:
       - uses: actions/checkout@v3
@@ -144,17 +143,17 @@ jobs:
         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 ]
     steps:
       - uses: actions/checkout@v3
@@ -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,7 +212,7 @@ 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 ]
     steps:
       - uses: actions/checkout@v3
@@ -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:
@@ -258,15 +259,18 @@ jobs:
       - 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,7 +322,7 @@ 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
@@ -372,7 +341,7 @@ jobs:
           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:
@@ -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:
@@ -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 \
@@ -483,9 +451,6 @@ jobs:
         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.16.8"
+  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

@@ -5,86 +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.21+
+1. Golang 1.19+
-2. Flutter 3.16+
+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

@@ -5,13 +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.16+
+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 @@
-[![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>
-
-![](_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)
-
-## 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.16+
-
-### 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

@@ -5,13 +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.16+
+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

@@ -5,13 +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,72 +17,21 @@ 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
+
+[下載](https://github.com/GopeedLab/gopeed/releases/latest)
+
+> 註：MacOS 版運行時若提示損壞，請在終端中執行 `xattr -d com.apple.quarantine /Applications/Gopeed.app`
 
 ### 使用CLI安裝
 
@@ -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.16+
+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-20240806095544-3491d4a58fbe
+	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-20240727154555-813a5fbdbec8 // 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.17.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
 )

go.sum

@@ -1,24 +1,24 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+crawshaw.io/iox v0.0.0-20181124134642-c51c3df30797 h1:yDf7ARQc637HoxDho7xjqdvO5ZA2Yb+xzv/fOnnvZzw=
 crawshaw.io/iox v0.0.0-20181124134642-c51c3df30797/go.mod h1:sXBiorCo8c46JlQV3oXPKINnZ8mcqnye1EkVkqsectk=
 crawshaw.io/sqlite v0.3.2/go.mod h1:igAO5JulrQ1DbdZdtVq48mnZUBAPOeFzer7VhDWNtW4=
+crawshaw.io/sqlite v0.3.3-0.20220618202545-d1964889ea3c h1:wvzox0eLO6CKQAMcOqz7oH3UFqMpMmK7kwmwV+22HIs=
+crawshaw.io/sqlite v0.3.3-0.20220618202545-d1964889ea3c/go.mod h1:igAO5JulrQ1DbdZdtVq48mnZUBAPOeFzer7VhDWNtW4=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU=
-filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
-github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 h1:KLq8BE0KwCL+mmXnjLWEAOYO+2l2AE4YMmqG1ZpZHBs=
 github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
 github.com/RoaringBitmap/roaring v0.4.7/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w=
 github.com/RoaringBitmap/roaring v0.4.17/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrXIr8KVNvRsDi1NI=
 github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=
-github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ=
+github.com/RoaringBitmap/roaring v1.2.3 h1:yqreLINqIrX22ErkKI0vY47/ivtJr6n+kMhVOVmhWBY=
-github.com/RoaringBitmap/roaring v1.9.4/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90=
+github.com/RoaringBitmap/roaring v1.2.3/go.mod h1:plvDsJQpxOC5bw8LRteu/MLWHsHez/3y6cubLI4/1yE=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ=
@@ -26,35 +26,32 @@ github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ
 github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 h1:byYvvbfSo3+9efR4IeReh77gVs4PnNDR3AMOE9NJ7a0=
 github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0/go.mod h1:q37NoqncT41qKc048STsifIt69LfUJ8SrWWcz/yam5k=
 github.com/alecthomas/assert/v2 v2.0.0-alpha3 h1:pcHeMvQ3OMstAWgaeaXIAL8uzB9xMm2zlxt+/4ml8lk=
-github.com/alecthomas/assert/v2 v2.0.0-alpha3/go.mod h1:+zD0lmDXTeQj7TgDgCt0ePWxb0hMC1G+PGTsTCv1B9o=
 github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELkLb3MNdlH8=
 github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI=
 github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 h1:8Uy0oSf5co/NZXje7U1z8Mpep++QJOldL2hs/sBQf48=
-github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/anacrolix/chansync v0.5.1 h1:j+R9DtotkXm40VFjZ8rJTSJkg2Gv1ldZt8kl96lyJJ0=
+github.com/anacrolix/chansync v0.3.0 h1:lRu9tbeuw3wl+PhMu/r+JJCRu5ArFXIluOgdF0ao6/U=
-github.com/anacrolix/chansync v0.5.1/go.mod h1:DZsatdsdXxD0WiwcGl0nJVwyjCKMDv+knl1q2iBjA2k=
+github.com/anacrolix/chansync v0.3.0/go.mod h1:DZsatdsdXxD0WiwcGl0nJVwyjCKMDv+knl1q2iBjA2k=
-github.com/anacrolix/dht/v2 v2.21.1 h1:s1rKkfLLcmBHKv4v/mtMkIeHIEptzEFiB6xVu54+5/o=
+github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444 h1:8V0K09lrGoeT2KRJNOtspA7q+OMxGwQqK/Ug0IiaaRE=
-github.com/anacrolix/dht/v2 v2.21.1/go.mod h1:SDGC+sEs1pnO2sJGYuhvIis7T8749dDHNfcjtdH4e3g=
+github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444/go.mod h1:MctKM1HS5YYDb3F30NGJxLE+QPuqWoT5ReW/4jt8xew=
 github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c=
 github.com/anacrolix/envpprof v1.0.0/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c=
 github.com/anacrolix/envpprof v1.1.0/go.mod h1:My7T5oSqVfEn4MD4Meczkw/f5lSIndGAKu/0SM/rkf4=
-github.com/anacrolix/envpprof v1.3.0 h1:WJt9bpuT7A/CDCxPOv/eeZqHWlle/Y0keJUvc6tcJDk=
+github.com/anacrolix/envpprof v1.2.1 h1:25TJe6t/i0AfzzldiGFKCpD+s+dk8lONBcacJZB2rdE=
-github.com/anacrolix/envpprof v1.3.0/go.mod h1:7QIG4CaX1uexQ3tqd5+BRa/9e2D02Wcertl6Yh0jCB0=
+github.com/anacrolix/envpprof v1.2.1/go.mod h1:My7T5oSqVfEn4MD4Meczkw/f5lSIndGAKu/0SM/rkf4=
-github.com/anacrolix/generics v0.0.0-20230113004304-d6428d516633/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8=
+github.com/anacrolix/generics v0.0.0-20230428105757-683593396d68 h1:fyXlBfnlFzZSFckJ8QLb2lfmWfY++4RiUnae7ZMuv0A=
-github.com/anacrolix/generics v0.0.2 h1:UbtD+KntUGxeGYMC4RwhsETieL9ixGdSptJQRhdy7No=
+github.com/anacrolix/generics v0.0.0-20230428105757-683593396d68/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8=
-github.com/anacrolix/generics v0.0.2/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8=
 github.com/anacrolix/go-libutp v1.3.1 h1:idJzreNLl+hNjGC3ZnUOjujEaryeOGgkwHLqSGoige0=
 github.com/anacrolix/go-libutp v1.3.1/go.mod h1:heF41EC8kN0qCLMokLBVkB8NXiLwx3t8R8810MTNI5o=
 github.com/anacrolix/log v0.3.0/go.mod h1:lWvLTqzAnCWPJA08T2HCstZi0L1y2Wyvm3FJgwU9jwU=
 github.com/anacrolix/log v0.6.0/go.mod h1:lWvLTqzAnCWPJA08T2HCstZi0L1y2Wyvm3FJgwU9jwU=
+github.com/anacrolix/log v0.10.1-0.20220123034749-3920702c17f8/go.mod h1:GmnE2c0nvz8pOIPUSC9Rawgefy1sDXqposC2wgtBZE4=
 github.com/anacrolix/log v0.13.1/go.mod h1:D4+CvN8SnruK6zIFS/xPoRJmtvtnxs+CSfDQ+BFxZ68=
-github.com/anacrolix/log v0.14.2/go.mod h1:1OmJESOtxQGNMlUO5rcv96Vpp9mfMqXXbe2RdinFLdY=
+github.com/anacrolix/log v0.14.0 h1:mYhTSemILe/Z8tIxbGdTIWWpPspI8W/fhZHpoFbDaL0=
-github.com/anacrolix/log v0.15.2 h1:LTSf5Wm6Q4GNWPFMBP7NPYV6UBVZzZLKckL+/Lj72Oo=
+github.com/anacrolix/log v0.14.0/go.mod h1:1OmJESOtxQGNMlUO5rcv96Vpp9mfMqXXbe2RdinFLdY=
-github.com/anacrolix/log v0.15.2/go.mod h1:m0poRtlr41mriZlXBQ9SOVZ8yZBkLjOkDhd5Li5pITA=
 github.com/anacrolix/lsan v0.0.0-20211126052245-807000409a62 h1:P04VG6Td13FHMgS5ZBcJX23NPC/fiC4cp9bXwYujdYM=
 github.com/anacrolix/lsan v0.0.0-20211126052245-807000409a62/go.mod h1:66cFKPCO7Sl4vbFnAaSq7e4OXtdMhRSBagJGWgmpJbM=
 github.com/anacrolix/missinggo v0.0.0-20180725070939-60ef2fbf63df/go.mod h1:kwGiTUTZ0+p4vAz3VbAI5a30t2YbvemcmspjKwrAz5s=
@@ -67,53 +64,54 @@ github.com/anacrolix/missinggo/perf v1.0.0 h1:7ZOGYziGEBytW49+KmYGTaNfnwUqP1HBsy
 github.com/anacrolix/missinggo/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5urunoLS0Cbvb4V0uMQ=
 github.com/anacrolix/missinggo/v2 v2.2.0/go.mod h1:o0jgJoYOyaoYQ4E2ZMISVa9c88BbUBVQQW4QeRkNCGY=
 github.com/anacrolix/missinggo/v2 v2.5.1/go.mod h1:WEjqh2rmKECd0t1VhQkLGTdIWXO6f6NLjp5GlMZ+6FA=
-github.com/anacrolix/missinggo/v2 v2.7.3 h1:Ee//CmZBMadeNiYB/hHo9ly2PFOEZ4Fhsbnug3rDAIE=
+github.com/anacrolix/missinggo/v2 v2.5.2/go.mod h1:yNvsLrtZYRYCOI+KRH/JM8TodHjtIE/bjOGhQaLOWIE=
-github.com/anacrolix/missinggo/v2 v2.7.3/go.mod h1:mIEtp9pgaXqt8VQ3NQxFOod/eQ1H0D1XsZzKUQfwtac=
+github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9 h1:W/oGeHhYwxueeiDjQfmK9G+X9M2xJgfTtow62v0TWAs=
+github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9/go.mod h1:mIEtp9pgaXqt8VQ3NQxFOod/eQ1H0D1XsZzKUQfwtac=
 github.com/anacrolix/mmsg v0.0.0-20180515031531-a4a3ba1fc8bb/go.mod h1:x2/ErsYUmT77kezS63+wzZp8E3byYB0gzirM/WMBLfw=
 github.com/anacrolix/mmsg v1.0.0 h1:btC7YLjOn29aTUAExJiVUhQOuf/8rhm+/nWCMAnL3Hg=
 github.com/anacrolix/mmsg v1.0.0/go.mod h1:x8kRaJY/dCrY9Al0PEcj1mb/uFHwP6GCJ9fLl4thEPc=
-github.com/anacrolix/multiless v0.3.1-0.20221221005021-2d12701f83f7 h1:lOtCD+LzoD1g7bowhYJNR++uV+FyY5bTZXKwnPex9S8=
+github.com/anacrolix/multiless v0.3.0 h1:5Bu0DZncjE4e06b9r1Ap2tUY4Au0NToBP5RpuEngSis=
-github.com/anacrolix/multiless v0.3.1-0.20221221005021-2d12701f83f7/go.mod h1:zJv1JF9AqdZiHwxqPgjuOZDGWER6nyE48WBCi/OOrMM=
+github.com/anacrolix/multiless v0.3.0/go.mod h1:TrCLEZfIDbMVfLoQt5tOoiBS/uq4y8+ojuEVVvTNPX4=
 github.com/anacrolix/stm v0.2.0/go.mod h1:zoVQRvSiGjGoTmbM0vSLIiaKjWtNPeTvXUSdJQA4hsg=
-github.com/anacrolix/stm v0.5.0 h1:9df1KBpttF0TzLgDq51Z+TEabZKMythqgx89f1FQJt8=
+github.com/anacrolix/stm v0.4.0 h1:tOGvuFwaBjeu1u9X1eIh9TX8OEedEiEQ1se1FjhFnXY=
-github.com/anacrolix/stm v0.5.0/go.mod h1:MOwrSy+jCm8Y7HYfMAwPj7qWVu7XoVvjOiYwJmpeB/M=
+github.com/anacrolix/stm v0.4.0/go.mod h1:GCkwqWoAsP7RfLW+jw+Z0ovrt2OO7wRzcTtFYMYY5t8=
 github.com/anacrolix/sync v0.0.0-20180808010631-44578de4e778/go.mod h1:s735Etp3joe/voe2sdaXLcqDdJSay1O0OPnM0ystjqk=
 github.com/anacrolix/sync v0.3.0/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DCOj/I0g=
-github.com/anacrolix/sync v0.5.1 h1:FbGju6GqSjzVoTgcXTUKkF041lnZkG5P0C3T5RL3SGc=
+github.com/anacrolix/sync v0.4.0 h1:T+MdO/u87ir/ijWsTFsPYw5jVm0SMm4kVpg8t4KF38o=
-github.com/anacrolix/sync v0.5.1/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DCOj/I0g=
+github.com/anacrolix/sync v0.4.0/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DCOj/I0g=
 github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
 github.com/anacrolix/tagflag v1.0.0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
 github.com/anacrolix/tagflag v1.1.0/go.mod h1:Scxs9CV10NQatSmbyjqmqmeQNwGzlNe0CMUMIxqHIG8=
-github.com/anacrolix/torrent v1.56.1 h1:QeJMOP0NuhpQ5dATsOqEL0vUO85aPMNMGP2FACNt0Eg=
+github.com/anacrolix/torrent v1.52.5 h1:jWowdx+EU6zFVfBwmnL0d3H4J6vTFEGOrHI35YdfIT8=
-github.com/anacrolix/torrent v1.56.1/go.mod h1:5DMHbeIM1TuC5wTQ99XieKKLiYZYz6iB2lyZpKZEr6w=
+github.com/anacrolix/torrent v1.52.5/go.mod h1:CcM8oPMYye5J42cSqJrmUpqwRFgSsJQ1jCEHwygqnqQ=
-github.com/anacrolix/upnp v0.1.4 h1:+2t2KA6QOhm/49zeNyeVwDu1ZYS9dB9wfxyVvh/wk7U=
+github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 h1:QAVZ3pN/J4/UziniAhJR2OZ9Ox5kOY2053tBbbqUPYA=
-github.com/anacrolix/upnp v0.1.4/go.mod h1:Qyhbqo69gwNWvEk1xNTXsS5j7hMHef9hdr984+9fIic=
+github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96/go.mod h1:Wa6n8cYIdaG35x15aH3Zy6d03f7P728QfdcDeD/IEOs=
-github.com/anacrolix/utp v0.2.0 h1:65Cdmr6q9WSw2KsM+rtJFu7rqDzLl2bdysf4KlNPcFI=
+github.com/anacrolix/utp v0.1.0 h1:FOpQOmIwYsnENnz7tAGohA+r6iXpRjrq8ssKSre2Cp4=
-github.com/anacrolix/utp v0.2.0/go.mod h1:HGk4GYQw1O/3T1+yhqT/F6EcBd+AAwlo9dYErNy7mj8=
+github.com/anacrolix/utp v0.1.0/go.mod h1:MDwc+vsGEq7RMw6lr2GKOEqjWny5hO5OZXRVNaBJ2Dk=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
-github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
 github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
 github.com/benbjohnson/immutable v0.2.0/go.mod h1:uc6OHo6PN2++n98KHLxW8ef4W42ylHiQSENghE1ezxI=
-github.com/benbjohnson/immutable v0.4.3 h1:GYHcksoJ9K6HyAUpGxwZURrbTkXA0Dh4otXGqbhdrjA=
+github.com/benbjohnson/immutable v0.3.0 h1:TVRhuZx2wG9SZ0LRdqlbs9S5BZ6Y24hJEHTCgWHZEIw=
-github.com/benbjohnson/immutable v0.4.3/go.mod h1:qJIKKSmdqz1tVzNtst1DZzvaqOU1onk1rc03IeM3Owk=
+github.com/benbjohnson/immutable v0.3.0/go.mod h1:uc6OHo6PN2++n98KHLxW8ef4W42ylHiQSENghE1ezxI=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
-github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE=
+github.com/bits-and-blooms/bitset v1.2.2 h1:J5gbX05GpMdBjCvQ9MteIg2KKDExr7DrgK+Yc15FvIk=
-github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/bits-and-blooms/bitset v1.2.2/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo=
 github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo=
 github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 h1:GKTyiRCL6zVf5wWaqKnf+7Qs6GbEPfd4iMOitWzXJx8=
 github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8/go.mod h1:spo1JLcs67NmW1aVLEgtA8Yy1elc+X8y5SRW1sFW4Og=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY=
+github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic=
+github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
@@ -122,35 +120,36 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
+github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0=
+github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/dop251/goja v0.0.0-20240806095544-3491d4a58fbe h1:jwFJkgsdelB87ohlXaAGSd05Cb5ALDFa9iW9IGRHcRM=
+github.com/dop251/goja v0.0.0-20211022113120-dc8c55024d06/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=
-github.com/dop251/goja v0.0.0-20240806095544-3491d4a58fbe/go.mod h1:DF+w/nLMIkvRpyhd/0K+Okbh3fVZBtXLwRtS/ccAa5w=
+github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d h1:wi6jN5LVt/ljaBG4ue79Ekzb12QfJ52L9Q98tl8SWhw=
-github.com/dop251/goja_nodejs v0.0.0-20240728170619-29b559befffc h1:MKYt39yZJi0Z9xEeRmDX2L4ocE0ETKcHKw6MVL3R+co=
+github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d/go.mod h1:QMWlm50DNe14hD7t24KEqZuUdC9sOTy8W6XbCU1mlw4=
-github.com/dop251/goja_nodejs v0.0.0-20240728170619-29b559befffc/go.mod h1:VULptt4Q/fNzQUJlqY/GP3qHyU7ZH46mFkBZe0ZTokU=
+github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
+github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM=
+github.com/dop251/goja_nodejs v0.0.0-20231122114759-e84d9a924c5c h1:hLoodLRD4KLWIH8eyAQCLcH8EqIrjac7fCkp/fHnvuQ=
+github.com/dop251/goja_nodejs v0.0.0-20231122114759-e84d9a924c5c/go.mod h1:bhGPmCgCCTSRfiMYWjpS46IDo9EUZXlsuUaPXSWGbv0=
 github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ=
 github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
 github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819 h1:RIB4cRk+lBqKK3Oy0r2gRX4ui7tuhiZq2SuTtTCi0/0=
-github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/frankban/quicktest v1.9.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
-github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
-github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
 github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
 github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
 github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
@@ -162,25 +161,21 @@ github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmS
 github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4=
 github.com/go-git/go-billy/v5 v5.4.1/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f h1:Pz0DHeFij3XFhoBRGUDPzSJ+w2UcK5/0JvF8DRI58r8=
-github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo=
 github.com/go-git/go-git/v5 v5.8.1 h1:Zo79E4p7TRk0xoRgMq0RShiTHGKcKI4+DI6BfJc/Q+A=
 github.com/go-git/go-git/v5 v5.8.1/go.mod h1:FHFuoD6yGz5OSKEBK+aWN9Oah0q54Jxl0abmj6GnqAo=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-llsqlite/adapter v0.1.0 h1:wGSQNsu/rtYeu/lqZNZQMjwUdEF3OW66xTLvsFwJQUw=
-github.com/go-llsqlite/adapter v0.1.0/go.mod h1:DADrR88ONKPPeSGjFp5iEN55Arx3fi2qXZeKCYDpbmU=
-github.com/go-llsqlite/crawshaw v0.5.3 h1:PmHXJjjxHodMoFWs3dEcJ1I1m9a+J0TCMNiHjGbXy1o=
-github.com/go-llsqlite/crawshaw v0.5.3/go.mod h1:/YJdV7uBQaYDE0fwe4z3wwJIZBJxdYzd38ICggWqtaE=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q=
+github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
-github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
+github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -198,6 +193,9 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -208,15 +206,14 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k=
+github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg=
-github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
+github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a h1:fEBsGL/sjAuJrgah5XqmmYsTLzJp/TO9Lhy39gkverk=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20190309154008-847fc94819f9/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -227,18 +224,18 @@ github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
-github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
 github.com/huandu/xstrings v1.3.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
+github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
-github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -249,8 +246,6 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
-github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -258,11 +253,12 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/lispad/go-generics-tools v1.1.0 h1:mbSgcxdFVmpoyso1X/MJHXbSbSL3dD+qhRryyxk+/XY=
+github.com/lispad/go-generics-tools v1.1.0/go.mod h1:2csd1EJljo/gy5qG4khXol7ivCPptNjG5Uv2X8MgK84=
 github.com/matoous/go-nanoid v1.5.0/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U=
 github.com/matoous/go-nanoid/v2 v2.0.0 h1:d19kur2QuLeHmJBkvYkFdhFBzLoo1XVm2GgTpL+9Tj0=
 github.com/matoous/go-nanoid/v2 v2.0.0/go.mod h1:FtS4aGPVfEkxKxhdWPAspZpZSh1cOjtM7Ej/So3hR0g=
@@ -270,82 +266,76 @@ github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
 github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-ieproxy v0.0.12 h1:OZkUFJC3ESNZPQ+6LzC3VJIFSnreeFLQyqvBWtvfL2M=
-github.com/mattn/go-ieproxy v0.0.12/go.mod h1:Vn+N61199DAnVeTgaF8eoB9PvLO8P3OBnG95ENh7B7c=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
-github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
-github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
 github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
-github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7BFvVU9RSh+U=
-github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM=
-github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8=
-github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
-github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pion/datachannel v1.5.8 h1:ph1P1NsGkazkjrvyMfhRBUAWMxugJjq2HfQifaOoSNo=
+github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E=
-github.com/pion/datachannel v1.5.8/go.mod h1:PgmdpoaNBLX9HNzNClmdki4DYW5JtI7Yibu8QzbL3tI=
+github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ=
-github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s=
+github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus=
-github.com/pion/dtls/v2 v2.2.12 h1:KP7H5/c1EiVAAKUmXyCzPiQe5+bCJrpOeKg/L05dunk=
+github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY=
-github.com/pion/dtls/v2 v2.2.12/go.mod h1:d9SYc9fch0CqK90mRk1dC7AkzzpwJj6u2GU3u+9pqFE=
+github.com/pion/dtls/v2 v2.2.4 h1:YSfYwDQgrxMYXLBc/m7PFY5BVtWlNm/DN4qoU2CbcWg=
-github.com/pion/ice/v2 v2.3.31 h1:qag/YqiOn5qPi0kgeVdsytxjx8szuriWSIeXKu8dDQc=
+github.com/pion/dtls/v2 v2.2.4/go.mod h1:WGKfxqhrddne4Kg3p11FUMJrynkOY4lb25zHNO49wuw=
-github.com/pion/ice/v2 v2.3.31/go.mod h1:8fac0+qftclGy1tYd/nfwfHC729BLaxtVqMdMVCAVPU=
+github.com/pion/ice/v2 v2.2.6 h1:R/vaLlI1J2gCx141L5PEwtuGAGcyS6e7E0hDeJFq5Ig=
-github.com/pion/interceptor v0.1.29 h1:39fsnlP1U8gw2JzOFWdfCU82vHvhW9o0rZnZF56wF+M=
+github.com/pion/ice/v2 v2.2.6/go.mod h1:SWuHiOGP17lGromHTFadUe1EuPgFh/oCU6FCMZHooVE=
-github.com/pion/interceptor v0.1.29/go.mod h1:ri+LGNjRUc5xUNtDEPzfdkmSqISixVTBF/z/Zms/6T4=
+github.com/pion/interceptor v0.1.11 h1:00U6OlqxA3FFB50HSg25J/8cWi7P6FbSzw4eFn24Bvs=
+github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8=
 github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
 github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
-github.com/pion/mdns v0.0.12 h1:CiMYlY+O0azojWDmxdNr7ADGrnZ+V6Ilfner+6mSVK8=
+github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw=
-github.com/pion/mdns v0.0.12/go.mod h1:VExJjv8to/6Wqm1FXK+Ii/Z9tsVk/F5sD/N70cnYFbk=
+github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g=
 github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
 github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
-github.com/pion/rtcp v1.2.12/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4=
+github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U=
-github.com/pion/rtcp v1.2.14 h1:KCkGV3vJ+4DAJmvP0vaQShsb0xkRfWkO540Gy102KyE=
+github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo=
-github.com/pion/rtcp v1.2.14/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4=
+github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA=
-github.com/pion/rtp v1.8.3/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
+github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
-github.com/pion/rtp v1.8.7 h1:qslKkG8qxvQ7hqaxkmL7Pl0XcUm+/Er7nMnu6Vq+ZxM=
+github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
-github.com/pion/rtp v1.8.7/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
+github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA=
-github.com/pion/sctp v1.8.19 h1:2CYuw+SQ5vkQ9t0HdOPccsCz1GQMDuVy5PglLgKVBW8=
+github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
-github.com/pion/sctp v1.8.19/go.mod h1:P6PbDVA++OJMrVNg2AL3XtYHV4uD6dvfyOovCgMs0PE=
+github.com/pion/sdp/v3 v3.0.5 h1:ouvI7IgGl+V4CrqskVtr3AaTrPvPisEOxwgpdktctkU=
-github.com/pion/sdp/v3 v3.0.9 h1:pX++dCHoHUwq43kuwf3PyJfHlwIj4hXA7Vrifiq0IJY=
+github.com/pion/sdp/v3 v3.0.5/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw=
-github.com/pion/sdp/v3 v3.0.9/go.mod h1:B5xmvENq5IXJimIO4zfp6LAe1fD9N+kFv+V/1lOdz8M=
+github.com/pion/srtp/v2 v2.0.9 h1:JJq3jClmDFBPX/F5roEb0U19jSU7eUhyDqR/NZ34EKQ=
-github.com/pion/srtp/v2 v2.0.20 h1:HNNny4s+OUmG280ETrCdgFndp4ufx3/uy85EawYEhTk=
+github.com/pion/srtp/v2 v2.0.9/go.mod h1:5TtM9yw6lsH0ppNCehB/EjEUli7VkUgKSPJqWVqbhQ4=
-github.com/pion/srtp/v2 v2.0.20/go.mod h1:0KJQjA99A6/a0DOVTu1PhDSw0CXF2jTkqOoMg3ODqdA=
+github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
-github.com/pion/stun v0.6.1 h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4=
+github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA=
-github.com/pion/stun v0.6.1/go.mod h1:/hO7APkX4hZKu/D0f2lHzNyvdkTGtIy3NDmLR7kSz/8=
+github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q=
+github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A=
+github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g=
 github.com/pion/transport v0.13.1 h1:/UH5yLeQtwm2VZIPjxwnNFxjS4DFhyLfS4GlfuKUzfA=
-github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g=
+github.com/pion/transport v0.13.1/go.mod h1:EBxbqzyv+ZrmDb82XswEE0BjfQFtuw1Nu6sjnjWCsGg=
-github.com/pion/transport/v2 v2.2.3/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0=
+github.com/pion/transport/v2 v2.0.0 h1:bsMYyqHCbkvHwj+eNCFBuxtlKndKfyGI2vaQmM3fIE4=
-github.com/pion/transport/v2 v2.2.4/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0=
+github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc=
-github.com/pion/transport/v2 v2.2.8/go.mod h1:sq1kSLWs+cHW9E+2fJP95QudkzbK7wscs8yYgQToO5E=
+github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw=
-github.com/pion/transport/v2 v2.2.9 h1:WEDygVovkJlV2CCunM9KS2kds+kcl7zdIefQA5y/nkE=
+github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw=
-github.com/pion/transport/v2 v2.2.9/go.mod h1:sq1kSLWs+cHW9E+2fJP95QudkzbK7wscs8yYgQToO5E=
+github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
-github.com/pion/transport/v3 v3.0.1/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0=
+github.com/pion/udp v0.1.4 h1:OowsTmu1Od3sD6i3fQUJxJn2fEvJO6L1TidgadtbTI8=
-github.com/pion/transport/v3 v3.0.2 h1:r+40RJR25S9w3jbA6/5uEPTzcdn7ncyU44RWCbHkLg4=
+github.com/pion/udp v0.1.4/go.mod h1:G8LDo56HsFwC24LIcnT4YIDU5qcB6NepqqjP0keL2us=
-github.com/pion/transport/v3 v3.0.2/go.mod h1:nIToODoOlb5If2jF9y2Igfx3PFYWfuXi37m0IlWa/D0=
+github.com/pion/webrtc/v3 v3.1.42 h1:wJEQFIXVanptnQcHOLTuIo4AtGB2+mG2x4OhIhnITOA=
-github.com/pion/turn/v2 v2.1.3/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY=
+github.com/pion/webrtc/v3 v3.1.42/go.mod h1:ffD9DulDrPxyWvDPUIPAOSAWx9GUlOExiJPf7cCcMLA=
-github.com/pion/turn/v2 v2.1.6 h1:Xr2niVsiPTB0FPtt+yAWKFUkU1eotQbGgpTIld4x1Gc=
-github.com/pion/turn/v2 v2.1.6/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY=
-github.com/pion/webrtc/v3 v3.2.50 h1:C/rwL2mBfCxHv6tlLzDAO3krJpQXfVx8A8WHnGJ2j34=
-github.com/pion/webrtc/v3 v3.2.50/go.mod h1:dytYYoSBy7ZUWhJMbndx9UckgYvzNAfL7xgVnrIKxqo=
 github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
 github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -372,19 +362,17 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 h1:Lt9DzQALzHoDwMBGJ6v8ObDPR0dzr2a6sXTB1Fq7IHs=
-github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 h1:18kd+8ZUlt/ARXhljq+14TwAoKa61q6dX8jtwOf6DH8=
+github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA=
-github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
 github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a8tTFrMLUcfWwyC0pnifVo2ClaLq+hP8=
 github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
+github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
@@ -396,29 +384,23 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1
 github.com/smartystreets/assertions v0.0.0-20190215210624-980c5ac6f3ac/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/smartystreets/goconvey v0.0.0-20190306220146-200a235640ff/go.mod h1:KSQcGKpxUMHk3nbYzs/tIBAM2iDooCn0BmttHOJEbLs=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
-github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
-github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
@@ -426,53 +408,44 @@ github.com/virtuald/go-paniclog v0.0.0-20190812204905-43a7fa316459 h1:x9pIfbdIjn
 github.com/virtuald/go-paniclog v0.0.0-20190812204905-43a7fa316459/go.mod h1:nFvuG3SWu3VWqobG3cX8nt57wXU0OOFapeCs/8axIuM=
 github.com/willf/bitset v1.1.9/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
-github.com/wlynxg/anet v0.0.3 h1:PvR53psxFXstc12jelG6f1Lv4MWqE0tI76/hHGjh9rg=
-github.com/wlynxg/anet v0.0.3/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
-github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad h1:QtuWk6dsrNXc/ugwCBEN0jG52q/4tXRzMvZm4fH6T9g=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad/go.mod h1:Jj8p9bgKGTPQ+M8CdUMS9p7Mmdoxa3OAcAjJQBu0CcI=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0=
+go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
-go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ=
+go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
+go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg=
-go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
+go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM=
-go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
+go.opentelemetry.io/otel/trace v1.8.0 h1:cSy0DF9eGI5WIfNwZ1q2iUyGj00tGzP24dE1lOlHrfY=
-go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
+go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4=
-go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
-go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
-go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
-go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
+golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
-golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20220428152302-39d4317da171/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
+golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d h1:vtUKgx8dahOomfFzLREU8nSv25YHnTgLBn4rDnWZdU0=
-golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
+golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
-golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
-golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -484,20 +457,27 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
+golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -506,11 +486,11 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -520,57 +500,58 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
+golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
-golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
-golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
+golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -578,11 +559,10 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
-golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -601,6 +581,9 @@ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -616,6 +599,7 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -623,31 +607,3 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
-lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
-modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ=
-modernc.org/cc/v4 v4.21.4/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
-modernc.org/ccgo/v4 v4.20.5 h1:s04akhT2dysD0DFOlv9fkQ6oUTLPYgMnnDk9oaqjszM=
-modernc.org/ccgo/v4 v4.20.5/go.mod h1:fYXClPUMWxWaz1Xj5sHbzW/ZENEFeuHLToqBxUk41nE=
-modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
-modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
-modernc.org/gc/v2 v2.4.3 h1:Ik4ZcMbC7aY4ZDPUhzXVXi7GMub9QcXLTfXn3mWpNw8=
-modernc.org/gc/v2 v2.4.3/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
-modernc.org/libc v1.55.6 h1:WfOvqnRFSjVT3WZIAVzGkKcYSk/toAXXnPAMWnTKBZc=
-modernc.org/libc v1.55.6/go.mod h1:JXguUpMkbw1gknxspNE9XaG+kk9hDAAnBxpA6KGLiyA=
-modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
-modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
-modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
-modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
-modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
-modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
-modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss=
-modernc.org/sqlite v1.31.1 h1:XVU0VyzxrYHlBhIs1DiEgSl0ZtdnPtbLVy8hSkzxGrs=
-modernc.org/sqlite v1.31.1/go.mod h1:UqoylwmTb9F+IqXERT8bW9zzOWN8qwAIcLdzeBZs4hA=
-modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
-modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
-modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
-modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-zombiezen.com/go/sqlite v1.3.0 h1:98g1gnCm+CNz6AuQHu0gqyw7gR2WU3O3PJufDOStpUs=
-zombiezen.com/go/sqlite v1.3.0/go.mod h1:yRl27//s/9aXU3RWs8uFQwjkTG9gYNGEls6+6SvrclY=

internal/controller/controller.go

@@ -1,14 +1,14 @@
 package controller
 
 import (
-	"github.com/GopeedLab/gopeed/pkg/base"
+	"net/url"
 	"os"
 	"path/filepath"
 )
 
 type Controller struct {
-	GetConfig   func(v any)
+	GetConfig func(v any) bool
-	ProxyConfig *base.DownloaderProxyConfig
+	ProxyUrl  *url.URL
 	FileController
 	//ContextDialer() (proxy.Dialer, error)
 }
@@ -22,8 +22,10 @@ type DefaultFileController struct {
 
 func NewController() *Controller {
 	return &Controller{
-		GetConfig:      func(v any) {},
 		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,53 +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
 
-	// 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.go

@@ -2,8 +2,6 @@ package bt
 
 import (
 	"bytes"
-	"context"
-	"fmt"
 	"github.com/GopeedLab/gopeed/internal/controller"
 	"github.com/GopeedLab/gopeed/internal/fetcher"
 	"github.com/GopeedLab/gopeed/pkg/base"
@@ -11,8 +9,8 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/util"
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/metainfo"
+	"net/http"
 	"path/filepath"
-	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -23,8 +21,6 @@ var (
 	lock          sync.Mutex
 	torrentDirMap = make(map[string]string)
 	ftMap         = make(map[string]*fileTorrentImpl)
-	closeCtx      context.Context
-	closeFunc     func()
 )
 
 type Fetcher struct {
@@ -33,13 +29,14 @@ type Fetcher struct {
 
 	torrent *torrent.Torrent
 	meta    *fetcher.FetcherMeta
-	data    *fetcherData
 
-	torrentReady    atomic.Bool
+	torrentReady atomic.Bool
-	torrentUpload   atomic.Bool
+	create       atomic.Bool
-	torrentDropCtx  context.Context
+	progress     fetcher.Progress
-	torrentDropFunc func()
+}
-	uploadDoneCh    chan any
+
+func (f *Fetcher) Name() string {
+	return "bt"
 }
 
 func (f *Fetcher) Setup(ctl *controller.Controller) {
@@ -47,12 +44,13 @@ func (f *Fetcher) Setup(ctl *controller.Controller) {
 	if f.meta == nil {
 		f.meta = &fetcher.FetcherMeta{}
 	}
-	if f.data == nil {
+	exist := f.ctl.GetConfig(&f.config)
-		f.data = &fetcherData{}
+	if !exist {
+		f.config = &config{
+			ListenPort: 0,
+			Trackers:   []string{},
+		}
 	}
-	f.uploadDoneCh = make(chan any, 1)
-	f.torrentDropCtx, f.torrentDropFunc = context.WithCancel(context.Background())
-	f.ctl.GetConfig(&f.config)
 	return
 }
 
@@ -63,16 +61,12 @@ func (f *Fetcher) initClient() (err error) {
 	if client != nil {
 		return
 	}
-	if closeCtx == nil {
-		closeCtx, closeFunc = context.WithCancel(context.Background())
-	}
 
 	cfg := torrent.NewDefaultClientConfig()
-	cfg.Seed = true
-	cfg.Bep20 = fmt.Sprintf("-GP%s-", parseBep20())
-	cfg.ExtendedHandshakeClientVersion = fmt.Sprintf("Gopeed %s", base.Version)
 	cfg.ListenPort = f.config.ListenPort
-	cfg.HTTPProxy = f.ctl.ProxyConfig.ToHandler()
+	if f.ctl.ProxyUrl != nil {
+		cfg.HTTPProxy = http.ProxyURL(f.ctl.ProxyUrl)
+	}
 	cfg.DefaultStorage = newFileOpts(newFileClientOpts{
 		ClientBaseDir: cfg.DataDir,
 		HandleFileTorrent: func(infoHash metainfo.Hash, ft *fileTorrentImpl) {
@@ -82,22 +76,16 @@ func (f *Fetcher) initClient() (err error) {
 			ftMap[infoHash.String()] = ft
 		},
 	})
-	dnsResolver := &DnsCacheResolver{RefreshTimeout: 5 * time.Minute}
-	cfg.TrackerDialContext = dnsResolver.DialContext
 	client, err = torrent.NewClient(cfg)
-	if err != nil {
-		return
-	}
-
-	closeCtx, closeFunc = context.WithCancel(context.Background())
-	go func() {
-		dnsResolver.Run(closeCtx)
-	}()
 	return
 }
 
 func (f *Fetcher) Resolve(req *base.Request) error {
-	if err := f.addTorrent(req, false); err != nil {
+	if err := base.ParseReqExtra[bt.ReqExtra](req); err != nil {
+		return err
+	}
+
+	if err := f.addTorrent(req); err != nil {
 		return err
 	}
 	f.updateRes()
@@ -106,6 +94,7 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 }
 
 func (f *Fetcher) Create(opts *base.Options) (err error) {
+	f.create.Store(true)
 	f.meta.Opts = opts
 	if f.meta.Res != nil {
 		torrentDirMap[f.meta.Res.Hash] = f.meta.FolderPath()
@@ -115,7 +104,7 @@ func (f *Fetcher) Create(opts *base.Options) (err error) {
 
 func (f *Fetcher) Start() (err error) {
 	if !f.torrentReady.Load() {
-		if err = f.addTorrent(f.meta.Req, false); err != nil {
+		if err = f.addTorrent(f.meta.Req); err != nil {
 			return
 		}
 	}
@@ -124,15 +113,13 @@ func (f *Fetcher) Start() (err error) {
 	}
 	files := f.torrent.Files()
 	// If the user does not specify the file to download, all files will be downloaded by default
-	if f.data.Progress == nil {
+	if len(f.meta.Opts.SelectFiles) == 0 {
-		if len(f.meta.Opts.SelectFiles) == 0 {
+		f.meta.Opts.SelectFiles = make([]int, len(files))
-			f.meta.Opts.SelectFiles = make([]int, len(files))
+		for i := range files {
-			for i := range files {
+			f.meta.Opts.SelectFiles[i] = i
-				f.meta.Opts.SelectFiles[i] = i
-			}
 		}
-		f.data.Progress = make(fetcher.Progress, len(f.meta.Opts.SelectFiles))
 	}
+	f.progress = make(fetcher.Progress, len(f.meta.Opts.SelectFiles))
 	if len(f.meta.Opts.SelectFiles) == len(files) {
 		f.torrent.DownloadAll()
 	} else {
@@ -141,6 +128,7 @@ func (f *Fetcher) Start() (err error) {
 			file.Download()
 		}
 	}
+
 	return
 }
 
@@ -152,11 +140,6 @@ func (f *Fetcher) Pause() (err error) {
 
 func (f *Fetcher) Close() (err error) {
 	f.safeDrop()
-	f.torrentDropFunc()
-	f.uploadDoneCh <- nil
-	if len(client.Torrents()) == 0 {
-		err = closeClient()
-	}
 	return nil
 }
 
@@ -169,78 +152,63 @@ func (f *Fetcher) safeDrop() {
 	f.torrent.Drop()
 }
 
+func (f *Fetcher) Wait() (err error) {
+	for {
+		if f.torrentReady.Load() && len(f.meta.Opts.SelectFiles) > 0 {
+			done := true
+			for _, selectIndex := range f.meta.Opts.SelectFiles {
+				file := f.torrent.Files()[selectIndex]
+				if file.BytesCompleted() < file.Length() {
+					done = false
+					break
+				}
+			}
+			if done {
+				// remove unselected files
+				for i, file := range f.torrent.Files() {
+					selected := false
+					for _, selectIndex := range f.meta.Opts.SelectFiles {
+						if i == selectIndex {
+							selected = true
+							break
+						}
+					}
+					if !selected {
+						util.SafeRemove(filepath.Join(f.meta.Opts.Path, f.meta.Res.Name, file.Path()))
+					}
+				}
+				break
+			}
+		}
+		time.Sleep(time.Millisecond * 500)
+	}
+	return nil
+}
+
 func (f *Fetcher) Meta() *fetcher.FetcherMeta {
 	return f.meta
 }
 
 func (f *Fetcher) Stats() any {
-	var stats torrent.TorrentStats
+	stats := f.torrent.Stats()
-	if f.torrent != nil {
+	baseStats := &bt.Stats{
-		stats = f.torrent.Stats()
-	} else {
-		stats = torrent.TorrentStats{}
-	}
-	return &bt.Stats{
 		TotalPeers:       stats.TotalPeers,
 		ActivePeers:      stats.ActivePeers,
 		ConnectedSeeders: stats.ConnectedSeeders,
-		SeedBytes:        f.data.SeedBytes,
-		SeedRatio:        f.seedRadio(),
-		SeedTime:         f.data.SeedTime,
 	}
+	return baseStats
 }
 
 func (f *Fetcher) Progress() fetcher.Progress {
 	if !f.torrentReady.Load() {
-		return f.data.Progress
+		return f.progress
 	}
-	for i := range f.data.Progress {
+	for i := range f.progress {
 		selectIndex := f.meta.Opts.SelectFiles[i]
 		file := f.torrent.Files()[selectIndex]
-		f.data.Progress[i] = file.BytesCompleted()
+		f.progress[i] = file.BytesCompleted()
 	}
-	return f.data.Progress
+	return f.progress
-}
-
-func (f *Fetcher) Wait() (err error) {
-	for {
-		select {
-		case <-f.torrentDropCtx.Done():
-			return
-		case <-time.After(time.Second):
-			if f.torrentReady.Load() && len(f.meta.Opts.SelectFiles) > 0 {
-				if f.isDone() {
-					// remove unselected files
-					for i, file := range f.torrent.Files() {
-						selected := false
-						for _, selectIndex := range f.meta.Opts.SelectFiles {
-							if i == selectIndex {
-								selected = true
-								break
-							}
-						}
-						if !selected {
-							util.SafeRemove(filepath.Join(f.meta.Opts.Path, f.meta.Res.Name, file.Path()))
-						}
-					}
-					return
-				}
-			}
-		}
-	}
-}
-
-func (f *Fetcher) isDone() bool {
-	if f.meta.Opts == nil {
-		return false
-	}
-	for _, selectIndex := range f.meta.Opts.SelectFiles {
-		file := f.torrent.Files()[selectIndex]
-		if file.BytesCompleted() < file.Length() {
-			return false
-		}
-	}
-	return true
 }
 
 func (f *Fetcher) updateRes() {
@@ -250,7 +218,6 @@ func (f *Fetcher) updateRes() {
 		Files: make([]*base.FileInfo, len(f.torrent.Files())),
 		Hash:  f.torrent.InfoHash().String(),
 	}
-	f.torrent.PeerConns()
 	for i, file := range f.torrent.Files() {
 		res.Files[i] = &base.FileInfo{
 			Name: filepath.Base(file.DisplayPath()),
@@ -265,87 +232,14 @@ func (f *Fetcher) updateRes() {
 	}
 }
 
-func (f *Fetcher) Upload() (err error) {
+func (f *Fetcher) addTorrent(req *base.Request) (err error) {
-	return f.addTorrent(f.meta.Req, true)
-}
-
-func (f *Fetcher) doUpload(fromUpload bool) {
-	if !f.torrentUpload.CompareAndSwap(false, true) {
-		return
-	}
-
-	// Check and update seed data
-	lastData := &fetcherData{
-		SeedBytes: f.data.SeedBytes,
-		SeedTime:  f.data.SeedTime,
-	}
-	var doneTime int64 = 0
-	for {
-		select {
-		case <-f.torrentDropCtx.Done():
-			return
-		case <-time.After(time.Second):
-			if !f.torrentReady.Load() {
-				continue
-			}
-
-			stats := f.torrent.Stats()
-			f.data.SeedBytes = lastData.SeedBytes + stats.BytesWrittenData.Int64()
-
-			// Check is download complete, if not don't check and stop seeding
-			if !fromUpload && !f.isDone() {
-				continue
-			}
-			if doneTime == 0 {
-				doneTime = time.Now().Unix()
-			}
-			f.data.SeedTime = lastData.SeedTime + time.Now().Unix() - doneTime
-
-			// If the seed forever is true, keep seeding
-			if f.config.SeedKeep {
-				continue
-			}
-
-			// If the seed ratio is reached, stop seeding
-			if f.config.SeedRatio > 0 {
-				seedRadio := f.seedRadio()
-				if seedRadio >= f.config.SeedRatio {
-					f.Close()
-					break
-				}
-			}
-
-			// If the seed time is reached, stop seeding
-			if f.config.SeedTime > 0 {
-				if f.data.SeedTime >= f.config.SeedTime {
-					f.Close()
-					break
-				}
-			}
-		}
-	}
-}
-
-func (f *Fetcher) UploadedBytes() int64 {
-	return f.data.SeedBytes
-}
-
-func (f *Fetcher) WaitUpload() (err error) {
-	<-f.uploadDoneCh
-	return nil
-}
-
-func (f *Fetcher) addTorrent(req *base.Request, fromUpload bool) (err error) {
-	if err = base.ParseReqExtra[bt.ReqExtra](req); err != nil {
-		return
-	}
 	if err = f.initClient(); err != nil {
 		return
 	}
 	schema := util.ParseSchema(req.URL)
 	if schema == "MAGNET" {
 		f.torrent, err = client.AddMagnet(req.URL)
-	} else if schema == "DATA" {
+	} else if schema == "APPLICATION/X-BITTORRENT" {
 		_, data := util.ParseDataUri(req.URL)
 		buf := bytes.NewBuffer(data)
 		var metaInfo *metainfo.MetaInfo
@@ -385,112 +279,30 @@ func (f *Fetcher) addTorrent(req *base.Request, fromUpload bool) (err error) {
 	}
 	<-f.torrent.GotInfo()
 	f.torrentReady.Store(true)
-
-	go f.doUpload(fromUpload)
 	return
 }
 
-func (f *Fetcher) seedRadio() float64 {
+type FetcherBuilder struct {
-	var bytesRead int64
-	if f.Meta().Res != nil {
-		bytesRead = f.Meta().Res.Size
-	} else {
-		bytesRead = 0
-	}
-	if bytesRead <= 0 {
-		return 0
-	}
-
-	return float64(f.data.SeedBytes) / float64(bytesRead)
 }
 
-type fetcherData struct {
+var schemes = []string{"FILE", "MAGNET", "APPLICATION/X-BITTORRENT"}
-	Progress  fetcher.Progress
+
-	SeedBytes int64
+func (fb *FetcherBuilder) Schemes() []string {
-	// SeedTime is the time in seconds to seed after downloading is complete.
+	return schemes
-	SeedTime int64
 }
 
-func closeClient() error {
+func (fb *FetcherBuilder) Build() fetcher.Fetcher {
-	lock.Lock()
-	defer lock.Unlock()
-
-	if closeFunc != nil {
-		closeFunc()
-	}
-	if client != nil {
-		errs := client.Close()
-		if len(errs) > 0 {
-			return errs[0]
-		}
-		client = nil
-		closeCtx = nil
-		closeFunc = nil
-	}
-	return nil
-}
-
-type FetcherManager struct {
-}
-
-func (fm *FetcherManager) Name() string {
-	return "bt"
-}
-
-func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
-	return []*fetcher.SchemeFilter{
-		{
-			Type:    fetcher.FilterTypeUrl,
-			Pattern: "MAGNET",
-		},
-		{
-			Type:    fetcher.FilterTypeFile,
-			Pattern: "TORRENT",
-		},
-		{
-			Type:    fetcher.FilterTypeBase64,
-			Pattern: "APPLICATION/X-BITTORRENT",
-		},
-	}
-}
-
-func (fm *FetcherManager) Build() fetcher.Fetcher {
 	return &Fetcher{}
 }
 
-func (fm *FetcherManager) DefaultConfig() any {
+func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
-	return &config{
+	return nil, nil
-		ListenPort: 0,
-		Trackers:   []string{},
-		SeedKeep:   false,
-		SeedRatio:  1.0,
-		SeedTime:   120 * 60,
-	}
 }
 
-func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
+func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
-	_f := f.(*Fetcher)
+	return nil, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
-	return _f.data, nil
-}
-
-func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
-	return &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
 		return &Fetcher{
 			meta: meta,
-			data: v.(*fetcherData),
 		}
 	}
 }
-
-func (fm *FetcherManager) Close() error {
-	return closeClient()
-}
-
-// parse version to bep20 format, fixed length 4, if not enough, fill 0
-func parseBep20() string {
-	s := strings.ReplaceAll(base.Version, ".", "")
-	if len(s) < 4 {
-		s += strings.Repeat("0", 4-len(s))
-	}
-	return s
-}

internal/protocol/bt/fetcher_test.go

@@ -8,6 +8,8 @@ import (
 	"github.com/GopeedLab/gopeed/internal/test"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/bt"
+	"github.com/GopeedLab/gopeed/pkg/util"
+	"net/url"
 	"os"
 	"reflect"
 	"testing"
@@ -58,14 +60,7 @@ 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) {
@@ -100,28 +95,26 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 }
 
 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
+		}
+		return true
 	}
-	newController.ProxyConfig = proxyConfig
+	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
 }
 
@@ -97,7 +105,6 @@ 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)) {
 		// 1.返回206响应码表示支持断点下载 2.不返回206但是Accept-Ranges首部并且等于bytes也表示支持断点下载
 		res.Range = true
@@ -123,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 != "" {
@@ -259,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
 	}()
 }
@@ -271,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
@@ -301,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))
@@ -377,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 {
@@ -390,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 != "" {
@@ -398,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 {
@@ -442,11 +435,12 @@ func (f *Fetcher) splitChunk() (chunks []*chunk) {
 }
 
 func (f *Fetcher) buildClient() *http.Client {
-	transport := &http.Transport{
+	transport := &http.Transport{}
-		Proxy: f.ctl.ProxyConfig.ToHandler(),
-	}
 	// 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,
@@ -457,48 +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) DefaultConfig() any {
+func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
-	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)
@@ -509,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,7 +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"
+	"reflect"
 	"testing"
 	"time"
 )
@@ -67,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)
 	}
 }
@@ -149,34 +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)
-	}
-	err = fetcher.Wait()
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := test.FileMd5(test.BuildFile)
-	got := test.FileMd5(test.DownloadFile)
-	if want != got {
-		t.Errorf("Download() got = %v, want %v", got, want)
-	}
-}
-
-func TestFetcher_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)
@@ -306,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 {
@@ -337,11 +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.ProxyConfig = &base.DownloaderProxyConfig{
+	ctl.ProxyUrl = util.BuildProxyUrl("socks5", proxyListener.Addr().String(), "", "")
-		Enable: true,
-		Scheme: "socks5",
-		Host:   proxyListener.Addr().String(),
-	}
 	fetcher.Setup(ctl)
 	err := fetcher.Start()
 	if err != nil {
@@ -359,21 +333,22 @@ func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t
 }
 
 func buildFetcher() *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.(*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/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
@@ -63,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"`
 }
@@ -94,9 +89,6 @@ func (o *Options) InitSelectFiles(fileSize int) {
 }
 
 func (o *Options) Clone() *Options {
-	if o == nil {
-		return nil
-	}
 	return &Options{
 		Name:        o.Name,
 		Path:        o.Path,
@@ -134,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.go

@@ -35,36 +35,31 @@ const (
 )
 
 var (
-	ErrTaskNotFound        = errors.New("task not found")
+	ErrTaskNotFound = errors.New("task not found")
-	ErrUnSupportedProtocol = errors.New("unsupported protocol")
 )
 
 type Listener func(event *Event)
 
 type Progress struct {
-	// Total download time(ns)
+	// 下载耗时(纳秒)
 	Used int64 `json:"used"`
-	// Download speed(bytes/s)
+	// 每秒下载字节数
 	Speed int64 `json:"speed"`
-	// Downloaded size(bytes)
+	// 已下载的字节数
 	Downloaded int64 `json:"downloaded"`
-	// Uploaded speed(bytes/s)
-	UploadSpeed int64 `json:"uploadSpeed"`
-	// Uploaded size(bytes)
-	Uploaded int64 `json:"uploaded"`
 }
 
 type Downloader struct {
 	Logger          *logger.Logger
 	ExtensionLogger *logger.Logger
 
-	cfg          *DownloaderConfig
+	cfg             *DownloaderConfig
-	fetcherCache map[string]fetcher.Fetcher
+	fetcherBuilders map[string]fetcher.FetcherBuilder
-	storage      Storage
+	fetcherCache    map[string]fetcher.Fetcher
-	tasks        []*Task
+	storage         Storage
-	waitTasks    []*Task
+	tasks           []*Task
-	watchedTasks sync.Map
+	waitTasks       []*Task
-	listener     Listener
+	listener        Listener
 
 	lock               *sync.Mutex
 	fetcherMapLock     *sync.RWMutex
@@ -81,10 +76,11 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
 	cfg.Init()
 
 	d := &Downloader{
-		cfg:          cfg,
+		cfg:             cfg,
-		fetcherCache: make(map[string]fetcher.Fetcher),
+		fetcherBuilders: make(map[string]fetcher.FetcherBuilder),
-		waitTasks:    make([]*Task, 0),
+		fetcherCache:    make(map[string]fetcher.Fetcher),
-		storage:      cfg.Storage,
+		waitTasks:       make([]*Task, 0),
+		storage:         cfg.Storage,
 
 		lock:               &sync.Mutex{},
 		fetcherMapLock:     &sync.RWMutex{},
@@ -92,6 +88,11 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
 
 		extensions: make([]*Extension, 0),
 	}
+	for _, f := range cfg.FetchBuilders {
+		for _, p := range f.Schemes() {
+			d.fetcherBuilders[strings.ToUpper(p)] = f
+		}
+	}
 
 	zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
 	d.Logger = logger.NewLogger(cfg.ProductionMode, filepath.Join(cfg.StorageDir, "logs", "core.log"))
@@ -108,7 +109,7 @@ func (d *Downloader) Setup() error {
 		return err
 	}
 	// load config from storage
-	var cfg base.DownloaderStoreConfig
+	var cfg DownloaderStoreConfig
 	exist, err := d.storage.Get(bucketConfig, "config", &cfg)
 	if err != nil {
 		return err
@@ -116,20 +117,12 @@ func (d *Downloader) Setup() error {
 	if exist {
 		d.cfg.DownloaderStoreConfig = &cfg
 	} else {
-		d.cfg.DownloaderStoreConfig = &base.DownloaderStoreConfig{
+		d.cfg.DownloaderStoreConfig = &DownloaderStoreConfig{
 			FirstLoad: true,
 		}
 	}
 	// init default config
 	d.cfg.DownloaderStoreConfig.Init()
-	// init protocol config, if not exist, use default config
-	for _, fm := range d.cfg.FetchManagers {
-		protocol := fm.Name()
-		if _, ok := d.cfg.DownloaderStoreConfig.ProtocolConfig[protocol]; !ok {
-			d.cfg.DownloaderStoreConfig.ProtocolConfig[protocol] = fm.DefaultConfig()
-		}
-	}
-
 	// load tasks from storage
 	var tasks []*Task
 	if err = d.storage.List(bucketTask, &tasks); err != nil {
@@ -167,55 +160,30 @@ func (d *Downloader) Setup() error {
 	}
 	d.extensions = extensions
 
-	// handle upload
-	go func() {
-		for _, task := range d.tasks {
-			if task.Status == base.DownloadStatusDone && task.Uploading {
-				if err := d.restoreTask(task); err != nil {
-					d.Logger.Error().Stack().Err(err).Msgf("task upload restore fetcher failed, task id: %s", task.ID)
-				}
-				if uploader, ok := task.fetcher.(fetcher.Uploader); ok {
-					if err := uploader.Upload(); err != nil {
-						d.Logger.Error().Stack().Err(err).Msgf("task upload failed, task id: %s", task.ID)
-					}
-				}
-			}
-		}
-	}()
-
 	// calculate download speed every tick
 	go func() {
 		for !d.closed.Load() {
 			if len(d.tasks) > 0 {
 				for _, task := range d.tasks {
 					func() {
-						task.statusLock.Lock()
+						task.lock.Lock()
-						defer task.statusLock.Unlock()
+						defer task.lock.Unlock()
-						if task.Status != base.DownloadStatusRunning && !task.Uploading {
+						if task.Status != base.DownloadStatusRunning {
 							return
 						}
 						// check if task is deleted
-						if d.GetTask(task.ID) == nil || task.fetcher == nil {
+						if d.GetTask(task.ID) == nil {
 							return
 						}
 
 						current := task.fetcher.Progress().TotalDownloaded()
-						tick := float64(d.cfg.RefreshInterval) / 1000
+						task.Progress.Used = task.timer.Used()
-						if task.Status == base.DownloadStatusRunning {
+						task.Progress.Speed = task.calcSpeed(current-task.Progress.Downloaded, float64(d.cfg.RefreshInterval)/1000)
-							task.Progress.Used = task.timer.Used()
+						task.Progress.Downloaded = current
-							task.Progress.Speed = task.calcSpeed(task.speedArr, current-task.Progress.Downloaded, tick)
-							task.Progress.Downloaded = current
-						}
-						if task.Uploading {
-							uploader := task.fetcher.(fetcher.Uploader)
-							currentUploaded := uploader.UploadedBytes()
-							task.Progress.UploadSpeed = task.calcSpeed(task.uploadSpeedArr, currentUploaded-task.Progress.Uploaded, tick)
-							task.Progress.Uploaded = currentUploaded
-						}
 						d.emit(EventKeyProgress, task)
 
 						// store fetcher progress
-						data, err := task.fetcherManager.Store(task.fetcher)
+						data, err := task.fetcherBuilder.Store(task.fetcher)
 						if err != nil {
 							d.Logger.Error().Stack().Err(err).Msgf("serialize fetcher failed: %s", task.ID)
 							return
@@ -237,23 +205,21 @@ func (d *Downloader) Setup() error {
 	return nil
 }
 
-func (d *Downloader) parseFm(url string) (fetcher.FetcherManager, error) {
+func (d *Downloader) parseFb(url string) (fetcher.FetcherBuilder, error) {
-	for _, fm := range d.cfg.FetchManagers {
+	schema := util.ParseSchema(url)
-		for _, filter := range fm.Filters() {
+	fetchBuilder, ok := d.fetcherBuilders[schema]
-			if filter.Match(url) {
+	if ok {
-				return fm, nil
+		return fetchBuilder, nil
-			}
-		}
 	}
-	return nil, ErrUnSupportedProtocol
+	return nil, errors.New("unsupported protocol")
 }
 
-func (d *Downloader) setupFetcher(fm fetcher.FetcherManager, fetcher fetcher.Fetcher) {
+func (d *Downloader) setupFetcher(fetcher fetcher.Fetcher) {
 	ctl := controller.NewController()
-	ctl.GetConfig = func(v any) {
+	ctl.GetConfig = func(v any) bool {
-		d.getProtocolConfig(fm.Name(), v)
+		return d.getProtocolConfig(fetcher.Name(), v)
 	}
-	ctl.ProxyConfig = d.cfg.Proxy
+	ctl.ProxyUrl = d.cfg.ProxyUrl()
 	fetcher.Setup(ctl)
 }
 
@@ -329,19 +295,10 @@ func (d *Downloader) CreateDirect(req *base.Request, opts *base.Options) (taskId
 	return d.doCreate(fetcher, opts)
 }
 
-func (d *Downloader) CreateDirectBatch(reqs []*base.Request, opts *base.Options) (taskId []string, err error) {
-	taskIds := make([]string, 0)
-	for _, req := range reqs {
-		taskId, err := d.CreateDirect(req, opts.Clone())
-		if err != nil {
-			return nil, err
-		}
-		taskIds = append(taskIds, taskId)
-	}
-	return taskIds, nil
-}
-
 func (d *Downloader) Create(rrId string, opts *base.Options) (taskId string, err error) {
+	if opts == nil {
+		opts = &base.Options{}
+	}
 	d.fetcherMapLock.RLock()
 	fetcher, ok := d.fetcherCache[rrId]
 	d.fetcherMapLock.RUnlock()
@@ -369,7 +326,8 @@ func (d *Downloader) Pause(id string) (err error) {
 		if task.Status == base.DownloadStatusPause {
 			return
 		}
-		if err = d.doPause(task); err != nil {
+		err = d.doPause(task)
+		if err != nil {
 			return
 		}
 		d.notifyRunning()
@@ -402,7 +360,19 @@ func (d *Downloader) Continue(id string) (err error) {
 		}
 	}()
 
-	return d.doStart(task)
+	func() {
+		task.lock.Lock()
+		defer task.lock.Unlock()
+
+		if task.Status == base.DownloadStatusRunning {
+			return
+		}
+
+		if err = d.doStart(task); err != nil {
+			return
+		}
+	}()
+	return
 }
 
 func (d *Downloader) PauseAll() (err error) {
@@ -415,7 +385,13 @@ func (d *Downloader) PauseAll() (err error) {
 	}()
 
 	for _, task := range d.tasks {
-		if err = d.doPause(task); err != nil {
+		err = func() error {
+			task.lock.Lock()
+			defer task.lock.Unlock()
+
+			return d.doPause(task)
+		}()
+		if err != nil {
 			return
 		}
 	}
@@ -445,7 +421,13 @@ func (d *Downloader) ContinueAll() (err error) {
 
 	for _, task := range continuedTasks {
 		tt := task
-		if err = d.doStart(tt); err != nil {
+		err = func() error {
+			tt.lock.Lock()
+			defer tt.lock.Unlock()
+
+			return d.doStart(tt)
+		}()
+		if err != nil {
 			return
 		}
 	}
@@ -466,13 +448,6 @@ func (d *Downloader) Delete(id string, force bool) (err error) {
 		for i, t := range d.tasks {
 			if t.ID == id {
 				d.tasks = append(d.tasks[:i], d.tasks[i+1:]...)
-				break
-			}
-		}
-		for i, t := range d.waitTasks {
-			if t.ID == id {
-				d.waitTasks = append(d.waitTasks[:i], d.waitTasks[i+1:]...)
-				break
 			}
 		}
 	}()
@@ -485,86 +460,19 @@ func (d *Downloader) Delete(id string, force bool) (err error) {
 	return
 }
 
-func (d *Downloader) DeleteByStatues(statues []base.Status, force bool) (err error) {
-	deleteTasks := d.GetTasksByStatues(statues)
-	if len(deleteTasks) == 0 {
-		return
-	}
-
-	deleteIds := make([]string, 0)
-	deleteTasksPtr := make([]*Task, 0)
-	for _, task := range deleteTasks {
-		deleteIds = append(deleteIds, task.ID)
-		deleteTasksPtr = append(deleteTasksPtr, task)
-	}
-	func() {
-		d.lock.Lock()
-		defer d.lock.Unlock()
-
-		for _, id := range deleteIds {
-			for i, t := range d.tasks {
-				if t.ID == id {
-					d.tasks = append(d.tasks[:i], d.tasks[i+1:]...)
-					break
-				}
-			}
-			for i, t := range d.waitTasks {
-				if t.ID == id {
-					d.waitTasks = append(d.waitTasks[:i], d.waitTasks[i+1:]...)
-					break
-				}
-			}
-		}
-	}()
-
-	for _, task := range deleteTasksPtr {
-		err = d.doDelete(task, force)
-		if err != nil {
-			return
-		}
-	}
-
-	d.notifyRunning()
-	return
-}
-
-func (d *Downloader) Stats(id string) (sr any, err error) {
-	task := d.GetTask(id)
-	if task == nil {
-		return sr, ErrTaskNotFound
-	}
-	if task.fetcher == nil {
-		err = func() error {
-			task.statusLock.Lock()
-			defer task.statusLock.Unlock()
-
-			return d.restoreFetcher(task)
-		}()
-		if err != nil {
-			return
-		}
-	}
-	sr = task.fetcher.Stats()
-	return
-}
-
 func (d *Downloader) doDelete(task *Task, force bool) (err error) {
 	err = func() error {
-		d.lock.Lock()
+		if task.fetcher != nil {
-		defer d.lock.Unlock()
+			if err := task.fetcher.Close(); err != nil {
-
+				return err
+			}
+		}
 		if err := d.storage.Delete(bucketTask, task.ID); err != nil {
 			return err
 		}
 		if err := d.storage.Delete(bucketSave, task.ID); err != nil {
 			return err
 		}
-
-		if task.fetcher != nil {
-			if err := task.fetcher.Close(); err != nil {
-				return err
-			}
-		}
 		if force && task.Meta.Res != nil {
 			if task.Meta.Res.Name != "" {
 				if err := os.RemoveAll(task.Meta.FolderPath()); err != nil {
@@ -589,23 +497,10 @@ func (d *Downloader) doDelete(task *Task, force bool) (err error) {
 
 func (d *Downloader) Close() error {
 	d.closed.Store(true)
-
+	if err := d.PauseAll(); err != nil {
-	closeArr := []func() error{
+		return err
-		d.PauseAll,
-		d.storage.Close,
 	}
-	for _, fm := range d.cfg.FetchManagers {
+	return d.storage.Close()
-		closeArr = append(closeArr, fm.Close)
-	}
-	// Make sure all resources are released, if had error, return the last error
-	var lastErr error
-	for i, close := range closeArr {
-		if err := close(); err != nil {
-			lastErr = err
-			d.Logger.Error().Stack().Err(err).Msgf("downloader close failed, index: %d", i)
-		}
-	}
-	return lastErr
 }
 
 func (d *Downloader) Clear() error {
@@ -653,27 +548,11 @@ func (d *Downloader) GetTasks() []*Task {
 	return d.tasks
 }
 
-func (d *Downloader) GetTasksByStatues(statues []base.Status) []*Task {
+func (d *Downloader) GetConfig() (*DownloaderStoreConfig, error) {
-	if len(statues) == 0 {
-		return d.tasks
-	}
-	tasks := make([]*Task, 0)
-	for _, task := range d.tasks {
-		for _, status := range statues {
-			if task.Status == status {
-				tasks = append(tasks, task)
-				break
-			}
-		}
-	}
-	return tasks
-}
-
-func (d *Downloader) GetConfig() (*base.DownloaderStoreConfig, error) {
 	return d.cfg.DownloaderStoreConfig, nil
 }
 
-func (d *Downloader) PutConfig(v *base.DownloaderStoreConfig) error {
+func (d *Downloader) PutConfig(v *DownloaderStoreConfig) error {
 	d.cfg.DownloaderStoreConfig = v
 	return d.storage.Put(bucketConfig, "config", v)
 }
@@ -695,38 +574,6 @@ func (d *Downloader) getProtocolConfig(name string, v any) bool {
 
 // wait task done
 func (d *Downloader) watch(task *Task) {
-	if _, loaded := d.watchedTasks.LoadOrStore(task.ID, true); loaded {
-		return
-	}
-
-	defer func() {
-		d.watchedTasks.Delete(task.ID)
-	}()
-
-	// wait task upload done
-	if task.Uploading {
-		if uploader, ok := task.fetcher.(fetcher.Uploader); ok {
-			go func() {
-				err := uploader.WaitUpload()
-				if err != nil {
-					d.Logger.Warn().Err(err).Msgf("task wait upload failed, task id: %s", task.ID)
-				}
-				d.lock.Lock()
-				defer d.lock.Unlock()
-
-				// Check if the task is deleted
-				if d.GetTask(task.ID) != nil {
-					task.Uploading = false
-					d.storage.Put(bucketTask, task.ID, task.clone())
-				}
-			}()
-		}
-	}
-
-	if task.Status == base.DownloadStatusDone {
-		return
-	}
-
 	err := task.fetcher.Wait()
 	if err != nil {
 		d.doOnError(task, err)
@@ -781,59 +628,51 @@ func (d *Downloader) doOnError(task *Task, err error) {
 	}
 }
 
-func (d *Downloader) restoreTask(task *Task) error {
+func (d *Downloader) restoreFetcher(task *Task) error {
 	if task.fetcher == nil {
-		if err := d.restoreFetcher(task); err != nil {
+		fb, err := d.parseFb(task.Meta.Req.URL)
+		if err != nil {
 			return err
 		}
+		task.fetcherBuilder = fb
+		err = func() error {
+			v, f := fb.Restore()
+			if v != nil {
+				err := d.storage.Pop(bucketSave, task.ID, v)
+				if err != nil {
+					return err
+				}
+			}
+			task.fetcher = f(task.Meta, v)
+			return nil
+		}()
+		if err != nil {
+			d.Logger.Error().Stack().Err(err).Msgf("deserialize fetcher failed, task id: %s", task.ID)
+		}
+		if task.fetcher == nil {
+			task.fetcher = fb.Build()
+		}
+		d.setupFetcher(task.fetcher)
+		if task.fetcher.Meta().Req == nil {
+			task.fetcher.Meta().Req = task.Meta.Req
+		}
+		if task.fetcher.Meta().Res == nil {
+			task.fetcher.Meta().Res = task.Meta.Res
+		}
+		go d.watch(task)
+	} else if task.Status == base.DownloadStatusError {
+		go d.watch(task)
 	}
-	go d.watch(task)
 	task.fetcher.Create(task.Meta.Opts)
 	return nil
 }
 
-func (d *Downloader) restoreFetcher(task *Task) error {
+func (d *Downloader) doCreate(fetcher fetcher.Fetcher, opts *base.Options) (taskId string, err error) {
-	var fm fetcher.FetcherManager
-	for _, f := range d.cfg.FetchManagers {
-		if f.Name() == task.Protocol {
-			fm = f
-			break
-		}
-	}
-	if fm == nil {
-		return ErrUnSupportedProtocol
-	}
-	task.fetcherManager = fm
-	v, f := fm.Restore()
-	if v != nil {
-		err := d.storage.Pop(bucketSave, task.ID, v)
-		if err != nil {
-			return err
-		}
-	}
-	task.fetcher = f(task.Meta, v)
-	if task.fetcher == nil {
-		task.fetcher = task.fetcherManager.Build()
-	}
-	d.setupFetcher(task.fetcherManager, task.fetcher)
-	if task.fetcher.Meta().Req == nil {
-		task.fetcher.Meta().Req = task.Meta.Req
-	}
-	if task.fetcher.Meta().Res == nil {
-		task.fetcher.Meta().Res = task.Meta.Res
-	}
-	return nil
-}
-
-func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options) (taskId string, err error) {
 	if opts == nil {
 		opts = &base.Options{}
 	}
-	if opts.SelectFiles == nil {
-		opts.SelectFiles = make([]int, 0)
-	}
 
-	meta := f.Meta()
+	meta := fetcher.Meta()
 	meta.Opts = opts
 	if opts.Path == "" {
 		storeConfig, err := d.GetConfig()
@@ -843,20 +682,18 @@ func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options) (taskId str
 		opts.Path = storeConfig.DownloadDir
 	}
 
-	fm, err := d.parseFm(f.Meta().Req.URL)
+	fb, err := d.parseFb(fetcher.Meta().Req.URL)
 	if err != nil {
 		return
 	}
 
 	task := NewTask()
-	task.fetcherManager = fm
+	task.fetcherBuilder = fb
-	task.fetcher = f
+	task.fetcher = fetcher
-	task.Protocol = fm.Name()
+	task.Meta = fetcher.Meta()
-	task.Meta = f.Meta()
 	task.Progress = &Progress{}
-	_, task.Uploading = f.(fetcher.Uploader)
 	initTask(task)
-	if err = f.Create(opts); err != nil {
+	if err = fetcher.Create(opts); err != nil {
 		return
 	}
 	if err = d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
@@ -877,52 +714,31 @@ func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options) (taskId str
 			return
 		}
 
-		err = d.doStart(task)
+		d.doStart(task)
 	}()
 
 	go d.watch(task)
 	return
 }
 
-func (d *Downloader) statusMut(task *Task, fn func() (bool, error)) (bool, error) {
-	task.statusLock.Lock()
-	defer task.statusLock.Unlock()
-
-	return fn()
-}
-
 func (d *Downloader) doStart(task *Task) (err error) {
-	var isCreate bool
+	if task.Status != base.DownloadStatusRunning && task.Status != base.DownloadStatusDone {
-	isReturn, err := d.statusMut(task, func() (isReturn bool, err error) {
+		err := d.restoreFetcher(task)
-		if task.Status == base.DownloadStatusRunning || task.Status == base.DownloadStatusDone {
-			isReturn = true
-			return
-		}
-
-		err = d.restoreTask(task)
 		if err != nil {
 			d.Logger.Error().Stack().Err(err).Msgf("restore fetcher failed, task id: %s", task.ID)
-			return
+			return err
 		}
-		isCreate = task.Status == base.DownloadStatusReady
+	}
+
+	isCreate := task.Status == base.DownloadStatusReady
+
+	doStart := func() error {
+		task.lock.Lock()
+		defer task.lock.Unlock()
 
 		d.triggerOnStart(task)
 		task.updateStatus(base.DownloadStatusRunning)
 
-		return
-	})
-	if err != nil {
-		d.Logger.Error().Stack().Err(err).Msgf("start task failed, task id: %s", task.ID)
-		return
-	}
-	if isReturn {
-		return
-	}
-
-	handler := func() error {
-		task.lock.Lock()
-		defer task.lock.Unlock()
-
 		if task.Meta.Res == nil {
 			err := task.fetcher.Resolve(task.Meta.Req)
 			if err != nil {
@@ -959,17 +775,18 @@ func (d *Downloader) doStart(task *Task) (err error) {
 
 		task.Progress.Speed = 0
 		task.timer.Start()
-		if err := task.fetcher.Start(); err != nil {
+		if err := d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
 			return err
 		}
-		if err := d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
+		if err := task.fetcher.Start(); err != nil {
 			return err
 		}
 		d.emit(EventKeyStart, task)
 		return nil
 	}
 	go func() {
-		if err := handler(); err != nil {
+		err := doStart()
+		if err != nil {
 			d.doOnError(task, err)
 		}
 	}()
@@ -978,44 +795,27 @@ func (d *Downloader) doStart(task *Task) (err error) {
 }
 
 func (d *Downloader) doPause(task *Task) (err error) {
-	isReturn, err := d.statusMut(task, func() (isReturn bool, err error) {
+	err = func() error {
-		if task.Status == base.DownloadStatusPause || task.Status == base.DownloadStatusDone {
+		if task.Status != base.DownloadStatusDone {
-			isReturn = true
+			task.updateStatus(base.DownloadStatusPause)
-			return
+			task.timer.Pause()
+			if task.fetcher != nil {
+				if err := task.fetcher.Pause(); err != nil {
+					return err
+				}
+			}
+			if err := d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
+				return err
+			}
+			d.emit(EventKeyPause, task)
 		}
-
+		return nil
-		task.updateStatus(base.DownloadStatusPause)
+	}()
-		task.timer.Pause()
-		return
-	})
 	if err != nil {
 		d.Logger.Error().Stack().Err(err).Msgf("pause task failed, task id: %s", task.ID)
 		return
 	}
-	if isReturn {
-		return
-	}
 
-	handler := func() error {
-		task.lock.Lock()
-		defer task.lock.Unlock()
-
-		if task.fetcher != nil {
-			if err := task.fetcher.Pause(); err != nil {
-				return err
-			}
-		}
-		if err := d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
-			return err
-		}
-		d.emit(EventKeyPause, task)
-		return nil
-	}
-	go func() {
-		if err := handler(); err != nil {
-			d.Logger.Error().Stack().Err(err).Msgf("pause task handle failed, task id: %s", task.ID)
-		}
-	}()
 	return
 }
 
@@ -1032,22 +832,19 @@ func logPanic(logDir string) {
 }
 
 func (d *Downloader) buildFetcher(url string) (fetcher.Fetcher, error) {
-	fm, err := d.parseFm(url)
+	fb, err := d.parseFb(url)
 	if err != nil {
 		return nil, err
 	}
-	fetcher := fm.Build()
+	fetcher := fb.Build()
-	d.setupFetcher(fm, fetcher)
+	d.setupFetcher(fetcher)
 	return fetcher, nil
 }
 
 func initTask(task *Task) {
 	task.timer = util.NewTimer(task.Progress.Used)
-
-	task.statusLock = &sync.Mutex{}
 	task.lock = &sync.Mutex{}
 	task.speedArr = make([]int64, 0)
-	task.uploadSpeedArr = make([]int64, 0)
 }
 
 var defaultDownloader = NewDownloader(nil)

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)
 	}
 }
@@ -86,131 +84,39 @@ func TestDownloader_Create(t *testing.T) {
 	}
 }
 
-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.DeleteByStatues(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, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
 		return nil
-	}, nil)
+	})
 	// Disable proxy
-	doTestDownloaderCreateWithProxy(t, false, 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, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
-		proxyCfg.System = true
-		return proxyCfg
-	}, nil)
-	// Enable proxy but error proxy environment variable
-	doTestDownloaderCreateWithProxy(t, false, 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, 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, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
 		proxyCfg.Scheme = ""
 		return proxyCfg
-	}, nil)
+	})
 	// Invalid proxy host
-	doTestDownloaderCreateWithProxy(t, false, 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, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
 		return proxyCfg
-	}, nil)
+	})
 	// Use proxy with auth
-	doTestDownloaderCreateWithProxy(t, true, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+	doTestDownloaderCreateWithProxy(t, true, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
 		return proxyCfg
-	}, nil)
+	})
 }
 
-func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, 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"
@@ -223,7 +129,7 @@ func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildProxyConfig f
 		t.Fatal(err)
 	}
 	defer downloader.Clear()
-	downloader.cfg.DownloaderStoreConfig.Proxy = buildProxyConfig(&base.DownloaderProxyConfig{
+	downloader.cfg.DownloaderStoreConfig.Proxy = buildProxyConfig(&DownloaderProxyConfig{
 		Enable: true,
 		Scheme: "socks5",
 		Host:   proxyListener.Addr().String(),
@@ -232,28 +138,24 @@ func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildProxyConfig f
 	})
 
 	req := &base.Request{
-		URL: test.ExternalDownloadUrl,
+		URL: "http://" + httpListener.Addr().String() + "/" + test.BuildName,
 	}
 	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)
 	}
 }
@@ -380,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{

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"
 )
 
@@ -110,7 +110,7 @@ func (e *Engine) Close() {
 }
 
 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"

pkg/download/extension.go

@@ -155,13 +155,7 @@ func (d *Downloader) DeleteExtension(identity string) error {
 			break
 		}
 	}
-	if err = d.storage.Delete(bucketExtension, identity); err != nil {
+	return d.storage.Delete(bucketExtension, identity)
-		return err
-	}
-	if err = d.storage.Delete(bucketExtensionStorage, identity); err != nil {
-		return err
-	}
-	return nil
 }
 
 func (d *Downloader) GetExtensions() []*Extension {
@@ -205,7 +199,7 @@ func (d *Downloader) fetchExtensionByGit(url string, handler func(tempExtPath st
 		return nil, err
 	}
 	proxyOptions := transport.ProxyOptions{}
-	proxyUrl := d.cfg.DownloaderStoreConfig.Proxy.ToUrl()
+	proxyUrl := d.cfg.ProxyUrl()
 	if proxyUrl != nil {
 		proxyOptions.URL = proxyUrl.Scheme + "://" + proxyUrl.Host
 		proxyOptions.Username = proxyUrl.User.Username()
@@ -347,7 +341,7 @@ func doTrigger[T any](d *Downloader, event ActivationEvent, req *base.Request, c
 						req.Labels = make(map[string]string)
 					}
 					engine := engine.NewEngine(&engine.Config{
-						ProxyConfig: d.cfg.Proxy,
+						ProxyURL: d.cfg.ProxyUrl(),
 					})
 					defer engine.Close()
 					err = engine.Runtime.Set("gopeed", gopeed)

pkg/download/model.go

@@ -8,6 +8,7 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/util"
 	gonanoid "github.com/matoous/go-nanoid/v2"
+	"net/url"
 	"sync"
 	"time"
 )
@@ -19,21 +20,17 @@ type ResolveResult struct {
 
 type Task struct {
 	ID        string               `json:"id"`
-	Protocol  string               `json:"protocol"`
 	Meta      *fetcher.FetcherMeta `json:"meta"`
 	Status    base.Status          `json:"status"`
-	Uploading bool                 `json:"uploading"`
 	Progress  *Progress            `json:"progress"`
 	CreatedAt time.Time            `json:"createdAt"`
 	UpdatedAt time.Time            `json:"updatedAt"`
 
-	fetcherManager fetcher.FetcherManager
+	fetcherBuilder fetcher.FetcherBuilder
 	fetcher        fetcher.Fetcher
 	timer          *util.Timer
-	statusLock     *sync.Mutex
 	lock           *sync.Mutex
 	speedArr       []int64
-	uploadSpeedArr []int64
 }
 
 func NewTask() *Task {
@@ -57,31 +54,29 @@ func (t *Task) updateStatus(status base.Status) {
 func (t *Task) clone() *Task {
 	return &Task{
 		ID:        t.ID,
-		Protocol:  t.Protocol,
 		Meta:      t.Meta,
 		Status:    t.Status,
-		Uploading: t.Uploading,
 		Progress:  t.Progress,
 		CreatedAt: t.CreatedAt,
 		UpdatedAt: t.UpdatedAt,
 	}
 }
 
-func (t *Task) calcSpeed(speedArr []int64, downloaded int64, usedTime float64) int64 {
+func (t *Task) calcSpeed(downloaded int64, usedTime float64) int64 {
-	speedArr = append(speedArr, downloaded)
+	t.speedArr = append(t.speedArr, downloaded)
-	if len(speedArr) > 6 {
+	if len(t.speedArr) > 6 {
-		speedArr = speedArr[1:]
+		t.speedArr = t.speedArr[1:]
 	}
 	var total int64
-	for _, v := range speedArr {
+	for _, v := range t.speedArr {
 		total += v
 	}
-	return int64(float64(total) / float64(len(speedArr)) / usedTime)
+	return int64(float64(total) / float64(len(t.speedArr)) / usedTime)
 }
 
 type DownloaderConfig struct {
 	Controller    *controller.Controller
-	FetchManagers []fetcher.FetcherManager
+	FetchBuilders []fetcher.FetcherBuilder
 
 	RefreshInterval int `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms)
 	Storage         Storage
@@ -89,17 +84,17 @@ type DownloaderConfig struct {
 
 	ProductionMode bool
 
-	*base.DownloaderStoreConfig
+	*DownloaderStoreConfig
 }
 
 func (cfg *DownloaderConfig) Init() *DownloaderConfig {
 	if cfg.Controller == nil {
 		cfg.Controller = controller.NewController()
 	}
-	if len(cfg.FetchManagers) == 0 {
+	if len(cfg.FetchBuilders) == 0 {
-		cfg.FetchManagers = []fetcher.FetcherManager{
+		cfg.FetchBuilders = []fetcher.FetcherBuilder{
-			new(http.FetcherManager),
+			new(http.FetcherBuilder),
-			new(bt.FetcherManager),
+			new(bt.FetcherBuilder),
 		}
 	}
 	if cfg.RefreshInterval == 0 {
@@ -110,3 +105,42 @@ func (cfg *DownloaderConfig) Init() *DownloaderConfig {
 	}
 	return cfg
 }
+
+// DownloaderStoreConfig is the config that can restore the downloader.
+type DownloaderStoreConfig struct {
+	FirstLoad bool `json:"-"` // FirstLoad is the flag that the config is first time init and not from store
+
+	DownloadDir    string                 `json:"downloadDir"`    // DownloadDir is the default directory to save the downloaded files
+	MaxRunning     int                    `json:"maxRunning"`     // MaxRunning is the max running download count
+	ProtocolConfig map[string]any         `json:"protocolConfig"` // ProtocolConfig is special config for each protocol
+	Extra          map[string]any         `json:"extra"`
+	Proxy          *DownloaderProxyConfig `json:"proxy"`
+}
+
+func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
+	if cfg.MaxRunning == 0 {
+		cfg.MaxRunning = 5
+	}
+	if cfg.Proxy == nil {
+		cfg.Proxy = &DownloaderProxyConfig{}
+	}
+	return cfg
+}
+
+func (cfg *DownloaderStoreConfig) ProxyUrl() *url.URL {
+	if cfg.Proxy == nil {
+		return nil
+	}
+	if cfg.Proxy.Enable == false || cfg.Proxy.Scheme == "" || cfg.Proxy.Host == "" {
+		return nil
+	}
+	return util.BuildProxyUrl(cfg.Proxy.Scheme, cfg.Proxy.Host, cfg.Proxy.Usr, cfg.Proxy.Pwd)
+}
+
+type DownloaderProxyConfig struct {
+	Enable bool   `json:"enable"`
+	Scheme string `json:"scheme"`
+	Host   string `json:"host"`
+	Usr    string `json:"usr"`
+	Pwd    string `json:"pwd"`
+}

pkg/download/storage.go

@@ -69,9 +69,7 @@ func (n *MemStorage) Setup(buckets []string) error {
 func (n *MemStorage) Put(bucket string, key string, v any) error {
 	n.lock.Lock()
 	defer n.lock.Unlock()
-	if bucketData, ok := memData[bucket]; ok {
+	memData[bucket][key] = v
-		bucketData[key] = v
-	}
 	return nil
 }
 

pkg/download/testdata/extensions/on_error/index.js

@@ -2,6 +2,7 @@ gopeed.events.onError(async function (ctx) {
     gopeed.logger.info("url", ctx.task.meta.req.url);
     gopeed.logger.info("error", ctx.error);
     ctx.task.meta.req.url = "https://github.com";
+    ctx.task.pause();
     ctx.task.continue();
 });
 

pkg/protocol/bt/model.go

@@ -4,16 +4,11 @@ type ReqExtra struct {
 	Trackers []string `json:"trackers"`
 }
 
-// Stats for torrent
+// Stats for download
 type Stats struct {
+	// bt stats
 	// health indicators of torrents, from large to small, ConnectedSeeders are also the key to the health of seed resources
 	TotalPeers       int `json:"totalPeers"`
 	ActivePeers      int `json:"activePeers"`
 	ConnectedSeeders int `json:"connectedSeeders"`
-	// Total seed bytes
-	SeedBytes int64 `json:"seedBytes"`
-	// Seed ratio
-	SeedRatio float64 `json:"seedRatio"`
-	// Total seed time
-	SeedTime int64 `json:"seedTime"`
 }

pkg/rest/api.go

@@ -8,20 +8,8 @@ import (
 	"io"
 	"net/http"
 	"net/url"
-	"runtime"
 )
 
-func Info(w http.ResponseWriter, r *http.Request) {
-	info := map[string]any{
-		"version":  base.Version,
-		"runtime":  runtime.Version(),
-		"os":       runtime.GOOS,
-		"arch":     runtime.GOARCH,
-		"inDocker": base.InDocker == "true",
-	}
-	WriteJson(w, model.NewOkResult(info))
-}
-
 func Resolve(w http.ResponseWriter, r *http.Request) {
 	var req base.Request
 	if ReadJson(r, w, &req) {
@@ -57,22 +45,6 @@ func CreateTask(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func CreateTaskBatch(w http.ResponseWriter, r *http.Request) {
-	var req model.CreateTaskBatch
-	if ReadJson(r, w, &req) {
-		if len(req.Reqs) == 0 {
-			WriteJson(w, model.NewErrorResult("param invalid: reqs", model.CodeInvalidParam))
-			return
-		}
-		taskIds, err := Downloader.CreateDirectBatch(req.Reqs, req.Opt)
-		if err != nil {
-			WriteJson(w, model.NewErrorResult(err.Error()))
-			return
-		}
-		WriteJson(w, model.NewOkResult(taskIds))
-	}
-}
-
 func PauseTask(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	taskId := vars["id"]
@@ -132,17 +104,6 @@ func DeleteTask(w http.ResponseWriter, r *http.Request) {
 	WriteJson(w, model.NewNilResult())
 }
 
-func DeleteTasks(w http.ResponseWriter, r *http.Request) {
-	r.ParseForm()
-	status := r.Form["status"]
-	force := r.FormValue("force")
-	if err := Downloader.DeleteByStatues(convertStatues(status), force == "true"); err != nil {
-		WriteJson(w, model.NewErrorResult(err.Error()))
-		return
-	}
-	WriteJson(w, model.NewNilResult())
-}
-
 func GetTask(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	taskId := vars["id"]
@@ -161,8 +122,20 @@ func GetTask(w http.ResponseWriter, r *http.Request) {
 func GetTasks(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 	status := r.Form["status"]
-	tasks := Downloader.GetTasksByStatues(convertStatues(status))
+	tasks := Downloader.GetTasks()
-	WriteJson(w, model.NewOkResult(tasks))
+	if len(status) == 0 {
+		WriteJson(w, model.NewOkResult(tasks))
+		return
+	}
+	result := make([]*download.Task, 0)
+	for _, task := range tasks {
+		for _, s := range status {
+			if task.Status == base.Status(s) {
+				result = append(result, task)
+			}
+		}
+	}
+	WriteJson(w, model.NewOkResult(result))
 }
 
 func GetConfig(w http.ResponseWriter, r *http.Request) {
@@ -170,7 +143,7 @@ func GetConfig(w http.ResponseWriter, r *http.Request) {
 }
 
 func PutConfig(w http.ResponseWriter, r *http.Request) {
-	var cfg base.DownloaderStoreConfig
+	var cfg download.DownloaderStoreConfig
 	if ReadJson(r, w, &cfg) {
 		if err := Downloader.PutConfig(&cfg); err != nil {
 			WriteJson(w, model.NewErrorResult(err.Error()))
@@ -309,35 +282,12 @@ func DoProxy(w http.ResponseWriter, r *http.Request) {
 	w.Write(buf)
 }
 
-func GetStats(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	taskId := vars["id"]
-	if taskId == "" {
-		WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
-		return
-	}
-	statsResult, err := Downloader.Stats(taskId)
-	if err != nil {
-		writeError(w, err.Error())
-		return
-	}
-	WriteJson(w, model.NewOkResult(statsResult))
-}
-
-func convertStatues(statues []string) []base.Status {
-	result := make([]base.Status, 0)
-	for _, status := range statues {
-		result = append(result, base.Status(status))
-	}
-	return result
-}
-
 func writeError(w http.ResponseWriter, msg string) {
 	w.WriteHeader(http.StatusInternalServerError)
 	w.Write([]byte(msg))
 }
 
-func getServerConfig() *base.DownloaderStoreConfig {
+func getServerConfig() *download.DownloaderStoreConfig {
 	cfg, _ := Downloader.GetConfig()
 	return cfg
 }

pkg/rest/model/action.go

@@ -0,0 +1,7 @@
+package model
+
+type Command struct {
+	Protocol string `json:"protocol"`
+	Action   string `json:"action"`
+	Params   any    `json:"params"`
+}

pkg/rest/model/server.go

@@ -2,7 +2,6 @@ package model
 
 import (
 	"encoding/base64"
-	"github.com/GopeedLab/gopeed/pkg/base"
 	"io/fs"
 )
 
@@ -14,13 +13,12 @@ const (
 )
 
 type StartConfig struct {
-	Network         string                      `json:"network"`
+	Network         string  `json:"network"`
-	Address         string                      `json:"address"`
+	Address         string  `json:"address"`
-	RefreshInterval int                         `json:"refreshInterval"`
+	RefreshInterval int     `json:"refreshInterval"`
-	Storage         Storage                     `json:"storage"`
+	Storage         Storage `json:"storage"`
-	StorageDir      string                      `json:"storageDir"`
+	StorageDir      string  `json:"storageDir"`
-	ApiToken        string                      `json:"apiToken"`
+	ApiToken        string  `json:"apiToken"`
-	DownloadConfig  *base.DownloaderStoreConfig `json:"downloadConfig"`
 
 	ProductionMode bool
 

pkg/rest/model/task.go

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

pkg/rest/server.go

@@ -19,42 +19,31 @@ import (
 )
 
 var (
-	srv         *http.Server
+	srv *http.Server
-	runningPort int
 
 	Downloader *download.Downloader
 )
 
-func Start(startCfg *model.StartConfig) (port int, err error) {
+func Start(startCfg *model.StartConfig) (int, error) {
-	// avoid repeat start
+	srv, listener, err := BuildServer(startCfg)
-	if srv != nil {
-		return runningPort, nil
-	}
-
-	var listener net.Listener
-	srv, listener, err = BuildServer(startCfg)
 	if err != nil {
-		return
+		return 0, err
 	}
 
 	go func() {
-		if err := srv.Serve(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
+		if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
 			panic(err)
 		}
 	}()
 
+	port := 0
 	if addr, ok := listener.Addr().(*net.TCPAddr); ok {
 		port = addr.Port
-		runningPort = port
 	}
-	return
+	return port, nil
 }
 
 func Stop() {
-	defer func() {
-		srv = nil
-	}()
-
 	if srv != nil {
 		if err := srv.Shutdown(context.TODO()); err != nil {
 			Downloader.Logger.Warn().Err(err).Msg("shutdown server failed")
@@ -99,19 +88,15 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 	}
 
 	var r = mux.NewRouter()
-	r.Methods(http.MethodGet).Path("/api/v1/info").HandlerFunc(Info)
 	r.Methods(http.MethodPost).Path("/api/v1/resolve").HandlerFunc(Resolve)
 	r.Methods(http.MethodPost).Path("/api/v1/tasks").HandlerFunc(CreateTask)
-	r.Methods(http.MethodPost).Path("/api/v1/tasks/batch").HandlerFunc(CreateTaskBatch)
 	r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/pause").HandlerFunc(PauseTask)
 	r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/continue").HandlerFunc(ContinueTask)
 	r.Methods(http.MethodPut).Path("/api/v1/tasks/pause").HandlerFunc(PauseAllTask)
 	r.Methods(http.MethodPut).Path("/api/v1/tasks/continue").HandlerFunc(ContinueAllTask)
 	r.Methods(http.MethodDelete).Path("/api/v1/tasks/{id}").HandlerFunc(DeleteTask)
-	r.Methods(http.MethodDelete).Path("/api/v1/tasks").HandlerFunc(DeleteTasks)
 	r.Methods(http.MethodGet).Path("/api/v1/tasks/{id}").HandlerFunc(GetTask)
 	r.Methods(http.MethodGet).Path("/api/v1/tasks").HandlerFunc(GetTasks)
-	r.Methods(http.MethodGet).Path("/api/v1/tasks/{id}/stats").HandlerFunc(GetStats)
 	r.Methods(http.MethodGet).Path("/api/v1/config").HandlerFunc(GetConfig)
 	r.Methods(http.MethodPut).Path("/api/v1/config").HandlerFunc(PutConfig)
 	r.Methods(http.MethodPost).Path("/api/v1/extensions").HandlerFunc(InstallExtension)
@@ -154,7 +139,7 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 			defer func() {
 				if v := recover(); v != nil {
 					err := errors.WithStack(fmt.Errorf("%v", v))
-					Downloader.Logger.Error().Stack().Err(err).Msgf("http server panic: %s %s", r.Method, r.RequestURI)
+					Downloader.Logger.Error().Stack().Err(err).Msg("http server panic")
 					WriteJson(w, model.NewErrorResult(err.Error(), model.CodeError))
 				}
 			}()

pkg/rest/server_test.go

@@ -63,22 +63,10 @@ var (
 	}
 )
 
-func TestInfo(t *testing.T) {
-	matchKeys := []string{"version", "runtime", "os", "arch", "inDocker"}
-	doTest(func() {
-		resp := httpRequestCheckOk[map[string]any](http.MethodGet, "/api/v1/info", nil)
-		for _, key := range matchKeys {
-			if _, ok := resp[key]; !ok {
-				t.Errorf("Info() missing key = %v", key)
-			}
-		}
-	})
-}
-
 func TestResolve(t *testing.T) {
 	doTest(func() {
 		resp := httpRequestCheckOk[*download.ResolveResult](http.MethodPost, "/api/v1/resolve", taskReq)
-		if !test.AssertResourceEqual(taskRes, resp.Res) {
+		if !test.JsonEqual(taskRes, resp.Res) {
 			t.Errorf("Resolve() got = %v, want %v", test.ToJson(resp.Res), test.ToJson(taskRes))
 		}
 	})
@@ -137,21 +125,6 @@ func TestCreateDirectTask(t *testing.T) {
 	})
 }
 
-func TestCreateDirectTaskBatch(t *testing.T) {
-	doTest(func() {
-		reqs := make([]*base.Request, 0)
-		for i := 0; i < 5; i++ {
-			reqs = append(reqs, createReq.Req)
-		}
-		taskIds := httpRequestCheckOk[[]string](http.MethodPost, "/api/v1/tasks/batch", &model.CreateTaskBatch{
-			Reqs: reqs,
-		})
-		if len(taskIds) != len(reqs) {
-			t.Errorf("CreateDirectTaskBatch() got = %v, want %v", len(taskIds), len(reqs))
-		}
-	})
-}
-
 func TestCreateDirectTaskWithResoled(t *testing.T) {
 	doTest(func() {
 		var wg sync.WaitGroup
@@ -269,58 +242,6 @@ func TestDeleteTaskForce(t *testing.T) {
 	})
 }
 
-func TestDeleteAllTasks(t *testing.T) {
-	doTest(func() {
-		taskCount := 3
-
-		var wg sync.WaitGroup
-		wg.Add(taskCount)
-		Downloader.Listener(func(event *download.Event) {
-			if event.Key == download.EventKeyFinally {
-				wg.Done()
-			}
-		})
-
-		for i := 0; i < taskCount; i++ {
-			httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", createReq)
-		}
-
-		wg.Wait()
-
-		httpRequestCheckOk[any](http.MethodDelete, "/api/v1/tasks?force=true", nil)
-		tasks := httpRequestCheckOk[[]*download.Task](http.MethodGet, "/api/v1/tasks", nil)
-		if len(tasks) != 0 {
-			t.Errorf("DeleteTasks() got = %v, want %v", len(tasks), 0)
-		}
-	})
-}
-
-func TestDeleteTasksByStatues(t *testing.T) {
-	doTest(func() {
-		taskCount := 3
-
-		var wg sync.WaitGroup
-		wg.Add(taskCount)
-		Downloader.Listener(func(event *download.Event) {
-			if event.Key == download.EventKeyFinally {
-				wg.Done()
-			}
-		})
-
-		for i := 0; i < taskCount; i++ {
-			httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", createReq)
-		}
-
-		wg.Wait()
-
-		httpRequestCheckOk[any](http.MethodDelete, fmt.Sprintf("/api/v1/tasks?status=%s&force=true", base.DownloadStatusDone), nil)
-		tasks := httpRequestCheckOk[[]*download.Task](http.MethodGet, "/api/v1/tasks", nil)
-		if len(tasks) != 0 {
-			t.Errorf("DeleteTasks() got = %v, want %v", len(tasks), 0)
-		}
-	})
-}
-
 func TestGetTasks(t *testing.T) {
 	doTest(func() {
 		var wg sync.WaitGroup
@@ -351,7 +272,7 @@ func TestGetTasks(t *testing.T) {
 
 func TestGetAndPutConfig(t *testing.T) {
 	doTest(func() {
-		cfg := httpRequestCheckOk[*base.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
+		cfg := httpRequestCheckOk[*download.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
 		cfg.DownloadDir = "./download"
 		cfg.Extra = map[string]any{
 			"serverConfig": &Config{
@@ -362,7 +283,7 @@ func TestGetAndPutConfig(t *testing.T) {
 		}
 		httpRequestCheckOk[any](http.MethodPut, "/api/v1/config", cfg)
 
-		newCfg := httpRequestCheckOk[*base.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
+		newCfg := httpRequestCheckOk[*download.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
 		if !test.JsonEqual(cfg, newCfg) {
 			t.Errorf("GetAndPutConfig() got = %v, want %v", test.ToJson(newCfg), test.ToJson(cfg))
 		}
@@ -583,7 +504,15 @@ func doTest(handler func()) {
 		}()
 		defer func() {
 			Downloader.PauseAll()
-			Downloader.DeleteByStatues(nil, true)
+
+			tasks := Downloader.GetTasks()
+			taskIds := make([]string, len(tasks))
+			for i, task := range tasks {
+				taskIds[i] = task.ID
+			}
+			for _, id := range taskIds {
+				Downloader.Delete(id, true)
+			}
 			os.RemoveAll(cfg.StorageDir)
 		}()
 		taskReq.URL = "http://" + fileListener.Addr().String() + "/" + test.BuildName

pkg/util/bytefmt.go

@@ -5,7 +5,7 @@ import (
 	"math"
 )
 
-var unitArr = []string{"B", "KB", "MB", "GB", "TB", "PB", "EB"}
+var unitArr = []string{"B", "KB", "MB", "GB", "TB", "EB"}
 
 func ByteFmt(size int64) string {
 	if size == 0 {

pkg/util/url.go

@@ -2,19 +2,23 @@ package util
 
 import (
 	"encoding/base64"
-	"net/http"
 	"net/url"
 	"regexp"
 	"strings"
 )
 
+const FileSchema = "FILE"
+
 func ParseSchema(url string) string {
 	index := strings.Index(url, ":")
 	// if no schema or windows path like C:\a.txt, return FILE
 	if index == -1 || index == 1 {
-		return ""
+		return FileSchema
 	}
 	schema := url[:index]
+	if schema == "data" {
+		schema, _ = ParseDataUri(url)
+	}
 	return strings.ToUpper(schema)
 }
 
@@ -27,6 +31,7 @@ func ParseDataUri(uri string) (string, []byte) {
 	}
 	mime := matches[1]
 	base64Data := matches[2]
+	// 解码Base64数据
 	data, err := base64.StdEncoding.DecodeString(base64Data)
 	if err != nil {
 		return "", nil
@@ -46,14 +51,3 @@ func BuildProxyUrl(scheme, host, usr, pwd string) *url.URL {
 		Host:   host,
 	}
 }
-
-// ProxyUrlToHandler gets the proxy handler from the proxy url.
-func ProxyUrlToHandler(proxyUrl *url.URL) func(*http.Request) (*url.URL, error) {
-	if proxyUrl == nil {
-		return nil
-	}
-	if proxyUrl.Scheme == "system" {
-		return http.ProxyFromEnvironment
-	}
-	return http.ProxyURL(proxyUrl)
-}

pkg/util/url_test.go

@@ -41,21 +41,21 @@ func TestParseSchema(t *testing.T) {
 			args: args{
 				url: "./url.go",
 			},
-			want: "",
+			want: "FILE",
 		},
 		{
 			name: "data-uri",
 			args: args{
 				url: "data:application/x-bittorrent;base64,test",
 			},
-			want: "DATA",
+			want: "APPLICATION/X-BITTORRENT",
 		},
 		{
 			name: "windows-path",
 			args: args{
 				url: "D:\\bt.torrent",
 			},
-			want: "",
+			want: "FILE",
 		},
 	}
 	for _, tt := range tests {

ui/flutter/.gitignore

@@ -63,8 +63,4 @@ windows/flutter/generated_plugin_registrant.cc
 windows/flutter/generated_plugin_registrant.h
 windows/flutter/generated_plugins.cmake
 
-/extensions
+/extensions
-
-# Hive database files
-database.hive
-database.lock

ui/flutter/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 33
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -47,7 +47,7 @@ android {
         applicationId "com.gopeed"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
-        minSdkVersion 32
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

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

@@ -2,13 +2,11 @@
     package="com.gopeed">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:label="Gopeed"
+        android:label="Gopeed">
-        android:extractNativeLibs="true">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -73,13 +71,6 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="*/*" />
-            </intent-filter>
         </activity>
 
         <!-- Add android:stopWithTask option only when necessary. -->

ui/flutter/ios/Runner.xcodeproj/project.pbxproj

@@ -13,7 +13,6 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		B44F54F47E581A39546303C9 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 029EF293EAA92EB3D18BBF19 /* libresolv.tbd */; };
 		D081C25C294826C0006EB10B /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D081C25B294826C0006EB10B /* libc++.tbd */; };
 		D0E623A929482D160001185E /* Libgopeed.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0E623A729482D030001185E /* Libgopeed.xcframework */; };
 		D0E623AA29482D160001185E /* Libgopeed.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D0E623A729482D030001185E /* Libgopeed.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -35,7 +34,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		029EF293EAA92EB3D18BBF19 /* libresolv.tbd */ = {isa = PBXFileReference; includeInIndex = 1; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		25B61E78A388C87913468FD6 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
@@ -65,7 +63,6 @@
 				D0E623A929482D160001185E /* Libgopeed.xcframework in Frameworks */,
 				D081C25C294826C0006EB10B /* libc++.tbd in Frameworks */,
 				DCA5B0FA95A8007ADEDACA1B /* Pods_Runner.framework in Frameworks */,
-				B44F54F47E581A39546303C9 /* libresolv.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -133,7 +130,6 @@
 				D0E623A729482D030001185E /* Libgopeed.xcframework */,
 				D081C25B294826C0006EB10B /* libc++.tbd */,
 				70BC8D37FAC641C7F20125E8 /* Pods_Runner.framework */,
-				029EF293EAA92EB3D18BBF19 /* libresolv.tbd */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";

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

@@ -4,20 +4,16 @@ part 'downloader_config.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class DownloaderConfig {
-  String downloadDir;
+  String downloadDir = '';
-  int maxRunning;
+  int maxRunning = 0;
   ProtocolConfig protocolConfig = ProtocolConfig();
   ExtraConfig extra = ExtraConfig();
   ProxyConfig proxy = ProxyConfig();
 
-  DownloaderConfig({
+  DownloaderConfig();
-    this.downloadDir = '',
-    this.maxRunning = 0,
-  });
 
   factory DownloaderConfig.fromJson(Map<String, dynamic> json) =>
       _$DownloaderConfigFromJson(json);
-
   Map<String, dynamic> toJson() => _$DownloaderConfigToJson(this);
 }
 
@@ -30,87 +26,56 @@ class ProtocolConfig {
 
   factory ProtocolConfig.fromJson(Map<String, dynamic>? json) =>
       json == null ? ProtocolConfig() : _$ProtocolConfigFromJson(json);
-
   Map<String, dynamic> toJson() => _$ProtocolConfigToJson(this);
 }
 
 @JsonSerializable()
 class HttpConfig {
-  String userAgent;
+  String userAgent =
-  int connections;
+      'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36';
-  bool useServerCtime;
+  int connections = 0;
 
-  HttpConfig({
+  HttpConfig();
-    this.userAgent = '',
-    this.connections = 0,
-    this.useServerCtime = false,
-  });
 
   factory HttpConfig.fromJson(Map<String, dynamic> json) =>
       _$HttpConfigFromJson(json);
-
   Map<String, dynamic> toJson() => _$HttpConfigToJson(this);
 }
 
 @JsonSerializable()
 class BtConfig {
-  int listenPort;
+  int listenPort = 0;
-  List<String> trackers;
+  List<String> trackers = [];
-  bool seedKeep;
-  double seedRatio;
-  int seedTime;
 
-  BtConfig({
+  BtConfig();
-    this.listenPort = 0,
-    this.trackers = const [],
-    this.seedKeep = false,
-    this.seedRatio = 0,
-    this.seedTime = 0,
-  });
 
   factory BtConfig.fromJson(Map<String, dynamic> json) =>
       _$BtConfigFromJson(json);
-
   Map<String, dynamic> toJson() => _$BtConfigToJson(this);
 }
 
 @JsonSerializable(explicitToJson: true)
 class ExtraConfig {
-  String themeMode;
+  String themeMode = '';
-  String locale;
+  String locale = '';
-  bool lastDeleteTaskKeep;
-
   ExtraConfigBt bt = ExtraConfigBt();
 
-  ExtraConfig({
+  ExtraConfig();
-    this.themeMode = '',
-    this.locale = '',
-    this.lastDeleteTaskKeep = false,
-  });
 
   factory ExtraConfig.fromJson(Map<String, dynamic>? json) =>
       json == null ? ExtraConfig() : _$ExtraConfigFromJson(json);
-
   Map<String, dynamic> toJson() => _$ExtraConfigToJson(this);
 }
 
 @JsonSerializable()
 class ProxyConfig {
-  bool enable;
+  bool enable = false;
-  bool system;
+  String scheme = '';
-  String scheme;
+  String host = '';
-  String host;
+  String usr = '';
-  String usr;
+  String pwd = '';
-  String pwd;
 
-  ProxyConfig({
+  ProxyConfig();
-    this.enable = false,
-    this.system = false,
-    this.scheme = '',
-    this.host = '',
-    this.usr = '',
-    this.pwd = '',
-  });
 
   factory ProxyConfig.fromJson(Map<String, dynamic> json) =>
       _$ProxyConfigFromJson(json);
@@ -122,7 +87,6 @@ class ProxyConfig {
 class ExtraConfigBt {
   List<String> trackerSubscribeUrls = [];
   List<String> subscribeTrackers = [];
-  bool autoUpdateTrackers = true;
   DateTime? lastTrackerUpdateTime;
 
   List<String> customTrackers = [];
@@ -131,6 +95,5 @@ class ExtraConfigBt {
 
   factory ExtraConfigBt.fromJson(Map<String, dynamic> json) =>
       _$ExtraConfigBtFromJson(json);
-
   Map<String, dynamic> toJson() => _$ExtraConfigBtToJson(this);
 }

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

@@ -7,10 +7,9 @@ part of 'downloader_config.dart';
 // **************************************************************************
 
 DownloaderConfig _$DownloaderConfigFromJson(Map<String, dynamic> json) =>
-    DownloaderConfig(
+    DownloaderConfig()
-      downloadDir: json['downloadDir'] as String? ?? '',
+      ..downloadDir = json['downloadDir'] as String
-      maxRunning: json['maxRunning'] as int? ?? 0,
+      ..maxRunning = json['maxRunning'] as int
-    )
       ..protocolConfig = ProtocolConfig.fromJson(
           json['protocolConfig'] as Map<String, dynamic>?)
       ..extra = ExtraConfig.fromJson(json['extra'] as Map<String, dynamic>?)
@@ -36,65 +35,48 @@ Map<String, dynamic> _$ProtocolConfigToJson(ProtocolConfig instance) =>
       'bt': instance.bt.toJson(),
     };
 
-HttpConfig _$HttpConfigFromJson(Map<String, dynamic> json) => HttpConfig(
+HttpConfig _$HttpConfigFromJson(Map<String, dynamic> json) => HttpConfig()
-      userAgent: json['userAgent'] as String? ?? '',
+  ..userAgent = json['userAgent'] as String
-      connections: json['connections'] as int? ?? 0,
+  ..connections = json['connections'] as int;
-      useServerCtime: json['useServerCtime'] as bool? ?? false,
-    );
 
 Map<String, dynamic> _$HttpConfigToJson(HttpConfig instance) =>
     <String, dynamic>{
       'userAgent': instance.userAgent,
       'connections': instance.connections,
-      'useServerCtime': instance.useServerCtime,
     };
 
-BtConfig _$BtConfigFromJson(Map<String, dynamic> json) => BtConfig(
+BtConfig _$BtConfigFromJson(Map<String, dynamic> json) => BtConfig()
-      listenPort: json['listenPort'] as int? ?? 0,
+  ..listenPort = json['listenPort'] as int
-      trackers: (json['trackers'] as List<dynamic>?)
+  ..trackers =
-              ?.map((e) => e as String)
+      (json['trackers'] as List<dynamic>).map((e) => e as String).toList();
-              .toList() ??
-          const [],
-      seedKeep: json['seedKeep'] as bool? ?? false,
-      seedRatio: (json['seedRatio'] as num?)?.toDouble() ?? 0,
-      seedTime: json['seedTime'] as int? ?? 0,
-    );
 
 Map<String, dynamic> _$BtConfigToJson(BtConfig instance) => <String, dynamic>{
       'listenPort': instance.listenPort,
       'trackers': instance.trackers,
-      'seedKeep': instance.seedKeep,
-      'seedRatio': instance.seedRatio,
-      'seedTime': instance.seedTime,
     };
 
-ExtraConfig _$ExtraConfigFromJson(Map<String, dynamic> json) => ExtraConfig(
+ExtraConfig _$ExtraConfigFromJson(Map<String, dynamic> json) => ExtraConfig()
-      themeMode: json['themeMode'] as String? ?? '',
+  ..themeMode = json['themeMode'] as String
-      locale: json['locale'] as String? ?? '',
+  ..locale = json['locale'] as String
-      lastDeleteTaskKeep: json['lastDeleteTaskKeep'] as bool? ?? false,
+  ..bt = ExtraConfigBt.fromJson(json['bt'] as Map<String, dynamic>);
-    )..bt = ExtraConfigBt.fromJson(json['bt'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) =>
     <String, dynamic>{
       'themeMode': instance.themeMode,
       'locale': instance.locale,
-      'lastDeleteTaskKeep': instance.lastDeleteTaskKeep,
       'bt': instance.bt.toJson(),
     };
 
-ProxyConfig _$ProxyConfigFromJson(Map<String, dynamic> json) => ProxyConfig(
+ProxyConfig _$ProxyConfigFromJson(Map<String, dynamic> json) => ProxyConfig()
-      enable: json['enable'] as bool? ?? false,
+  ..enable = json['enable'] as bool
-      system: json['system'] as bool? ?? false,
+  ..scheme = json['scheme'] as String
-      scheme: json['scheme'] as String? ?? '',
+  ..host = json['host'] as String
-      host: json['host'] as String? ?? '',
+  ..usr = json['usr'] as String
-      usr: json['usr'] as String? ?? '',
+  ..pwd = json['pwd'] as String;
-      pwd: json['pwd'] as String? ?? '',
-    );
 
 Map<String, dynamic> _$ProxyConfigToJson(ProxyConfig instance) =>
     <String, dynamic>{
       'enable': instance.enable,
-      'system': instance.system,
       'scheme': instance.scheme,
       'host': instance.host,
       'usr': instance.usr,
@@ -109,7 +91,6 @@ ExtraConfigBt _$ExtraConfigBtFromJson(Map<String, dynamic> json) =>
       ..subscribeTrackers = (json['subscribeTrackers'] as List<dynamic>)
           .map((e) => e as String)
           .toList()
-      ..autoUpdateTrackers = json['autoUpdateTrackers'] as bool
       ..lastTrackerUpdateTime = json['lastTrackerUpdateTime'] == null
           ? null
           : DateTime.parse(json['lastTrackerUpdateTime'] as String)
@@ -121,7 +102,6 @@ Map<String, dynamic> _$ExtraConfigBtToJson(ExtraConfigBt instance) {
   final val = <String, dynamic>{
     'trackerSubscribeUrls': instance.trackerSubscribeUrls,
     'subscribeTrackers': instance.subscribeTrackers,
-    'autoUpdateTrackers': instance.autoUpdateTrackers,
   };
 
   void writeNotNull(String key, dynamic value) {

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

@@ -12,7 +12,7 @@ class Options {
   Options({
     required this.name,
     required this.path,
-    this.selectFiles = const [],
+    required this.selectFiles,
     this.extra,
   });
 

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

@@ -9,10 +9,8 @@ part of 'options.dart';
 Options _$OptionsFromJson(Map<String, dynamic> json) => Options(
       name: json['name'] as String,
       path: json['path'] as String,
-      selectFiles: (json['selectFiles'] as List<dynamic>?)
+      selectFiles:
-              ?.map((e) => e as int)
+          (json['selectFiles'] as List<dynamic>).map((e) => e as int).toList(),
-              .toList() ??
-          const [],
       extra: json['extra'],
     );
 

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

@@ -6,15 +6,11 @@ part 'task.g.dart';
 
 enum Status { ready, running, pause, wait, error, done }
 
-enum Protocol { http, bt }
-
 @JsonSerializable(explicitToJson: true)
 class Task {
   String id;
-  Protocol? protocol;
   Meta meta;
   Status status;
-  bool uploading;
   Progress progress;
   DateTime createdAt;
   DateTime updatedAt;
@@ -23,7 +19,6 @@ class Task {
     required this.id,
     required this.meta,
     required this.status,
-    required this.uploading,
     required this.progress,
     required this.createdAt,
     required this.updatedAt,
@@ -39,15 +34,11 @@ class Progress {
   int used;
   int speed;
   int downloaded;
-  int uploadSpeed;
-  int uploaded;
 
   Progress({
     required this.used,
     required this.speed,
     required this.downloaded,
-    required this.uploadSpeed,
-    required this.uploaded,
   });
 
   factory Progress.fromJson(Map<String, dynamic> json) =>

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

@@ -10,32 +10,19 @@ Task _$TaskFromJson(Map<String, dynamic> json) => Task(
       id: json['id'] as String,
       meta: Meta.fromJson(json['meta'] as Map<String, dynamic>),
       status: $enumDecode(_$StatusEnumMap, json['status']),
-      uploading: json['uploading'] as bool,
       progress: Progress.fromJson(json['progress'] as Map<String, dynamic>),
       createdAt: DateTime.parse(json['createdAt'] as String),
       updatedAt: DateTime.parse(json['updatedAt'] as String),
-    )..protocol = $enumDecodeNullable(_$ProtocolEnumMap, json['protocol']);
+    );
 
-Map<String, dynamic> _$TaskToJson(Task instance) {
+Map<String, dynamic> _$TaskToJson(Task instance) => <String, dynamic>{
-  final val = <String, dynamic>{
+      'id': instance.id,
-    'id': instance.id,
+      'meta': instance.meta.toJson(),
-  };
+      'status': _$StatusEnumMap[instance.status]!,
-
+      'progress': instance.progress.toJson(),
-  void writeNotNull(String key, dynamic value) {
+      'createdAt': instance.createdAt.toIso8601String(),
-    if (value != null) {
+      'updatedAt': instance.updatedAt.toIso8601String(),
-      val[key] = value;
+    };
-    }
-  }
-
-  writeNotNull('protocol', _$ProtocolEnumMap[instance.protocol]);
-  val['meta'] = instance.meta.toJson();
-  val['status'] = _$StatusEnumMap[instance.status]!;
-  val['uploading'] = instance.uploading;
-  val['progress'] = instance.progress.toJson();
-  val['createdAt'] = instance.createdAt.toIso8601String();
-  val['updatedAt'] = instance.updatedAt.toIso8601String();
-  return val;
-}
 
 const _$StatusEnumMap = {
   Status.ready: 'ready',
@@ -46,23 +33,14 @@ const _$StatusEnumMap = {
   Status.done: 'done',
 };
 
-const _$ProtocolEnumMap = {
-  Protocol.http: 'http',
-  Protocol.bt: 'bt',
-};
-
 Progress _$ProgressFromJson(Map<String, dynamic> json) => Progress(
       used: json['used'] as int,
       speed: json['speed'] as int,
       downloaded: json['downloaded'] as int,
-      uploadSpeed: json['uploadSpeed'] as int,
-      uploaded: json['uploaded'] as int,
     );
 
 Map<String, dynamic> _$ProgressToJson(Progress instance) => <String, dynamic>{
       'used': instance.used,
       'speed': instance.speed,
       'downloaded': instance.downloaded,
-      'uploadSpeed': instance.uploadSpeed,
-      'uploaded': instance.uploaded,
     };

ui/flutter/lib/app/data/api_provider.dart

@@ -0,0 +1,8 @@
+import 'package:get/get.dart';
+
+class ApiProvider extends GetConnect {
+  @override
+  void onInit() {
+    httpClient.baseUrl = 'YOUR-API-URL';
+  }
+}

ui/flutter/lib/app/modules/app/controllers/app_controller.dart

@@ -1,14 +1,14 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 import 'dart:ui';
 
 import 'package:app_links/app_links.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_foreground_task/flutter_foreground_task.dart';
 import 'package:get/get.dart';
-import 'package:launch_at_startup/launch_at_startup.dart';
+import 'package:lecle_downloads_path_provider/lecle_downloads_path_provider.dart';
 import 'package:path_provider/path_provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'package:tray_manager/tray_manager.dart';
 import 'package:uri_to_file/uri_to_file.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -17,17 +17,18 @@ import 'package:window_manager/window_manager.dart';
 import '../../../../api/api.dart';
 import '../../../../api/model/downloader_config.dart';
 import '../../../../core/common/start_config.dart';
-import '../../../../core/libgopeed_boot.dart';
-import '../../../../database/database.dart';
-import '../../../../database/entity.dart';
 import '../../../../i18n/message.dart';
-import '../../../../main.dart';
 import '../../../../util/locale_manager.dart';
 import '../../../../util/log_util.dart';
 import '../../../../util/package_info.dart';
 import '../../../../util/util.dart';
+import '../../../../util/window_util.dart' as windows_util;
 import '../../../routes/app_pages.dart';
 
+const _startConfigNetwork = "start.network";
+const _startConfigAddress = "start.address";
+const _startConfigApiToken = "start.apiToken";
+
 const unixSocketPath = 'gopeed.sock';
 
 const allTrackerSubscribeUrls = [
@@ -76,7 +77,6 @@ final allTrackerSubscribeUrlCdns = Map.fromIterable(allTrackerSubscribeUrls,
 class AppController extends GetxController with WindowListener, TrayListener {
   static StartConfig? _defaultStartConfig;
 
-  final autoStartup = false.obs;
   final startConfig = StartConfig().obs;
   final runningPort = 0.obs;
   final downloaderConfig = DownloaderConfig().obs;
@@ -99,19 +99,12 @@ class AppController extends GetxController with WindowListener, TrayListener {
 
     _initForegroundTask().onError((error, stackTrace) =>
         logger.w("initForegroundTask error", error, stackTrace));
-
-    _initTrackerUpdate().onError((error, stackTrace) =>
-        logger.w("initTrackerUpdate error", error, stackTrace));
-
-    _initLaunchAtStartup().onError((error, stackTrace) =>
-        logger.w("initLaunchAtStartup error", error, stackTrace));
   }
 
   @override
   void onClose() {
     _linkSubscription?.cancel();
     trayManager.removeListener(this);
-    LibgopeedBoot.instance.stop();
   }
 
   @override
@@ -122,12 +115,6 @@ class AppController extends GetxController with WindowListener, TrayListener {
     }
   }
 
-  // According to the system_manager document, make sure to call setState once on the onWindowFocus event.
-  @override
-  void onWindowFocus() {
-    refresh();
-  }
-
   @override
   void onTrayIconMouseDown() {
     windowManager.show();
@@ -140,18 +127,17 @@ class AppController extends GetxController with WindowListener, TrayListener {
 
   @override
   void onWindowMaximize() {
-    Database.instance.saveWindowState(WindowStateEntity(isMaximized: true));
+    windows_util.saveState(isMaximized: true);
   }
 
   @override
   void onWindowUnmaximize() {
-    Database.instance.saveWindowState(WindowStateEntity(isMaximized: false));
+    windows_util.saveState(isMaximized: false);
   }
 
   final _windowsResizeSave = Util.debounce(() async {
     final size = await windowManager.getSize();
-    Database.instance.saveWindowState(
+    windows_util.saveState(width: size.width, height: size.height);
-        WindowStateEntity(width: size.width, height: size.height));
   }, 500);
 
   @override
@@ -195,20 +181,10 @@ class AppController extends GetxController with WindowListener, TrayListener {
     } else if (Util.isMacos()) {
       await trayManager.setIcon('assets/tray_icon/icon_mac.png',
           isTemplate: true);
-    } else if (Platform.environment.containsKey('FLATPAK_ID') ||
-        Platform.environment.containsKey('SNAP')) {
-      await trayManager.setIcon('com.gopeed.Gopeed');
     } else {
       await trayManager.setIcon('assets/tray_icon/icon.png');
     }
     final menu = Menu(items: [
-      MenuItem(
-        label: "show".tr,
-        onClick: (menuItem) async => {
-          await windowManager.show(),
-        },
-      ),
-      MenuItem.separator(),
       MenuItem(
         label: "create".tr,
         onClick: (menuItem) async => {
@@ -216,6 +192,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
           await Get.rootDelegate.offAndToNamed(Routes.CREATE),
         },
       ),
+      MenuItem.separator(),
       MenuItem(
         label: "startAll".tr,
         onClick: (menuItem) async => {continueAllTasks()},
@@ -245,14 +222,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
       MenuItem.separator(),
       MenuItem(
         label: 'exit'.tr,
-        onClick: (menuItem) async {
+        onClick: (menuItem) => {windowManager.destroy()},
-          try {
-            await LibgopeedBoot.instance.stop();
-          } catch (e) {
-            logger.w("libgopeed stop fail", e);
-          }
-          windowManager.destroy();
-        },
       ),
     ]);
     if (!Util.isLinux()) {
@@ -270,12 +240,16 @@ class AppController extends GetxController with WindowListener, TrayListener {
 
     FlutterForegroundTask.init(
       androidNotificationOptions: AndroidNotificationOptions(
-        channelId: 'gopeed_service',
+          channelId: 'gopeed_service',
-        channelName: 'Gopeed Background Service',
+          channelName: 'Gopeed Background Service',
-        channelImportance: NotificationChannelImportance.LOW,
+          channelImportance: NotificationChannelImportance.LOW,
-        showWhen: true,
+          showWhen: true,
-        priority: NotificationPriority.LOW,
+          priority: NotificationPriority.LOW,
-      ),
+          iconData: const NotificationIconData(
+            resType: ResourceType.mipmap,
+            resPrefix: ResourcePrefix.ic,
+            name: 'launcher',
+          )),
       iosNotificationOptions: const IOSNotificationOptions(
         showNotification: true,
         playSound: false,
@@ -295,19 +269,12 @@ class AppController extends GetxController with WindowListener, TrayListener {
       FlutterForegroundTask.startService(
         notificationTitle: "serviceTitle".tr,
         notificationText: "serviceText".tr,
-        notificationIcon: const NotificationIconData(
-          resType: ResourceType.mipmap,
-          resPrefix: ResourcePrefix.ic,
-          name: 'launcher',
-        ),
       );
     }
   }
 
   Future<void> _toCreate(Uri uri) async {
-    final path = (uri.scheme == "magnet" ||
+    final path = uri.scheme == "magnet"
-            uri.scheme == "http" ||
-            uri.scheme == "https")
         ? uri.toString()
         : (await toFile(uri.toString())).path;
     await Get.rootDelegate.offAndToNamed(Routes.CREATE, arguments: path);
@@ -338,24 +305,25 @@ class AppController extends GetxController with WindowListener, TrayListener {
     return _defaultStartConfig!;
   }
 
-  Future<StartConfig> loadStartConfig() async {
+  Future<void> loadStartConfig() async {
     final defaultCfg = await _initDefaultStartConfig();
-    final saveCfg = Database.instance.getStartConfig();
+    final prefs = await SharedPreferences.getInstance();
-    startConfig.value.network = saveCfg?.network ?? defaultCfg.network;
+    startConfig.value.network =
-    startConfig.value.address = saveCfg?.address ?? defaultCfg.address;
+        prefs.getString(_startConfigNetwork) ?? defaultCfg.network;
-    startConfig.value.apiToken = saveCfg?.apiToken ?? defaultCfg.apiToken;
+    startConfig.value.address =
-    return startConfig.value;
+        prefs.getString(_startConfigAddress) ?? defaultCfg.address;
+    startConfig.value.apiToken =
+        prefs.getString(_startConfigApiToken) ?? defaultCfg.apiToken;
   }
 
-  Future<DownloaderConfig> loadDownloaderConfig() async {
+  Future<void> loadDownloaderConfig() async {
     try {
       downloaderConfig.value = await getConfig();
     } catch (e) {
-      logger.w("load downloader config fail", e, StackTrace.current);
+      logger.w("load downloader config fail", e);
       downloaderConfig.value = DownloaderConfig();
     }
     await _initDownloaderConfig();
-    return downloaderConfig.value;
   }
 
   Future<void> trackerUpdate() async {
@@ -395,13 +363,12 @@ class AppController extends GetxController with WindowListener, TrayListener {
     btConfig.trackers.toSet().toList();
   }
 
-  Future<void> _initTrackerUpdate() async {
+  Future<void> trackerUpdateOnStart() async {
     final btExtConfig = downloaderConfig.value.extra.bt;
     final lastUpdateTime = btExtConfig.lastTrackerUpdateTime;
     // if last update time is null or more than 1 day, update trackers
-    if (btExtConfig.autoUpdateTrackers &&
+    if (lastUpdateTime == null ||
-        (lastUpdateTime == null ||
+        lastUpdateTime.difference(DateTime.now()).inDays < 0) {
-            lastUpdateTime.difference(DateTime.now()).inDays < 0)) {
       try {
         await trackerUpdate();
       } catch (e) {
@@ -425,6 +392,9 @@ class AppController extends GetxController with WindowListener, TrayListener {
 
   _initDownloaderConfig() async {
     final config = downloaderConfig.value;
+    if (config.protocolConfig.http.connections == 0) {
+      config.protocolConfig.http.connections = 16;
+    }
     final extra = config.extra;
     if (extra.themeMode.isEmpty) {
       extra.themeMode = ThemeMode.dark.name;
@@ -448,8 +418,12 @@ class AppController extends GetxController with WindowListener, TrayListener {
       if (Util.isDesktop()) {
         config.downloadDir = (await getDownloadsDirectory())?.path ?? "./";
       } else if (Util.isAndroid()) {
-        config.downloadDir = (await getExternalStorageDirectory())?.path ??
+        final downloadDir = (await DownloadsPath.downloadsDirectory())?.path;
-            (await getApplicationDocumentsDirectory()).path;
+        if (downloadDir != null) {
+          config.downloadDir = '$downloadDir/Gopeed';
+        } else {
+          config.downloadDir = (await getApplicationDocumentsDirectory()).path;
+        }
       } else if (Util.isIOS()) {
         config.downloadDir = (await getApplicationDocumentsDirectory()).path;
       } else {
@@ -458,22 +432,11 @@ class AppController extends GetxController with WindowListener, TrayListener {
     }
   }
 
-  Future<void> _initLaunchAtStartup() async {
-    if (!Util.isWindows() && !Util.isLinux()) {
-      return;
-    }
-    launchAtStartup.setup(
-        appName: packageInfo.appName,
-        appPath: Platform.resolvedExecutable,
-        args: ['--${Args.flagHidden}']);
-    autoStartup.value = await launchAtStartup.isEnabled();
-  }
-
   Future<void> saveConfig() async {
-    Database.instance.saveStartConfig(StartConfigEntity(
+    final prefs = await SharedPreferences.getInstance();
-        network: startConfig.value.network,
+    await prefs.setString(_startConfigNetwork, startConfig.value.network);
-        address: startConfig.value.address,
+    await prefs.setString(_startConfigAddress, startConfig.value.address);
-        apiToken: startConfig.value.apiToken));
+    await prefs.setString(_startConfigApiToken, startConfig.value.apiToken);
     await putConfig(downloaderConfig.value);
   }
 }

ui/flutter/lib/app/modules/create/views/create_view.dart

@@ -5,22 +5,21 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:path/path.dart' as path;
-import 'package:rounded_loading_button_plus/rounded_loading_button.dart';
+import 'package:rounded_loading_button/rounded_loading_button.dart';
 
 import '../../../../api/api.dart';
 import '../../../../api/model/create_task.dart';
 import '../../../../api/model/options.dart';
 import '../../../../api/model/request.dart';
 import '../../../../api/model/resolve_result.dart';
-import '../../../../database/database.dart';
 import '../../../../util/input_formatter.dart';
 import '../../../../util/message.dart';
 import '../../../../util/util.dart';
 import '../../../routes/app_pages.dart';
-import '../../../views/compact_checkbox.dart';
 import '../../../views/directory_selector.dart';
 import '../../../views/file_list_view.dart';
 import '../../app/controllers/app_controller.dart';
+import '../../history/controller/history_controller.dart';
 import '../../history/views/history_view.dart';
 import '../controllers/create_controller.dart';
 
@@ -36,6 +35,7 @@ class CreateView extends GetView<CreateController> {
   final _httpCookieController = TextEditingController();
   final _httpRefererController = TextEditingController();
   final _btTrackerController = TextEditingController();
+  final _historyController = HistoryController();
 
   final _availableSchemes = ["http:", "https:", "magnet:"];
 
@@ -117,7 +117,7 @@ class CreateView extends GetView<CreateController> {
                     Row(children: [
                       Expanded(
                         child: TextFormField(
-                          autofocus: !Util.isMobile(),
+                          autofocus: true,
                           controller: _urlController,
                           minLines: 1,
                           maxLines: 5,
@@ -168,7 +168,10 @@ class CreateView extends GetView<CreateController> {
                         icon: const Icon(Icons.history_rounded),
                         onPressed: () async {
                           List<String> resultOfHistories =
-                              Database.instance.getCreateHistory() ?? [];
+                              await _historyController.getAllHistory();
+                          // reversing: display last entered history first
+                          List<String> reverseResultOfHistories =
+                              resultOfHistories.reversed.toList();
                           // show dialog box to list history
                           if (context.mounted) {
                             showGeneralDialog(
@@ -180,14 +183,16 @@ class CreateView extends GetView<CreateController> {
                                     opacity: a1.value,
                                     child: HistoryView(
                                       isHistoryListEmpty:
-                                          resultOfHistories.isEmpty,
+                                          reverseResultOfHistories.isEmpty,
                                       historyList: ListView.builder(
-                                        itemCount: resultOfHistories.length,
+                                        itemCount:
+                                            reverseResultOfHistories.length,
                                         itemBuilder: (context, index) {
                                           return GestureDetector(
                                             onTap: () {
                                               _urlController.text =
-                                                  resultOfHistories[index];
+                                                  reverseResultOfHistories[
+                                                      index];
                                               Navigator.pop(context);
                                             },
                                             child: MouseRegion(
@@ -212,7 +217,9 @@ class CreateView extends GetView<CreateController> {
                                                           10.0),
                                                 ),
                                                 child: Text(
-                                                  resultOfHistories[index],
+                                                  reverseResultOfHistories[
+                                                          index]
+                                                      .toString(),
                                                 ),
                                               ),
                                             ),
@@ -301,7 +308,7 @@ class CreateView extends GetView<CreateController> {
                                             controller: _btTrackerController,
                                             maxLines: 5,
                                             decoration: InputDecoration(
-                                              labelText: 'Trackers',
+                                              labelText: 'Trakers',
                                               hintText: 'addTrackerHit'.tr,
                                             )),
                                       ],
@@ -322,13 +329,23 @@ class CreateView extends GetView<CreateController> {
                             Row(
                               mainAxisSize: MainAxisSize.min,
                               children: [
-                                CompactCheckbox(
+                                TextButton(
-                                    label: 'directDownload'.tr,
+                                  onPressed: () {
-                                    value: controller.directDownload.value,
+                                    controller.directDownload.value =
-                                    onChanged: (bool? value) {
+                                        !controller.directDownload.value;
-                                      controller.directDownload.value =
+                                  },
-                                          value ?? false;
+                                  child: Row(children: [
-                                    }),
+                                    Obx(() => Checkbox(
+                                          value:
+                                              controller.directDownload.value,
+                                          onChanged: (bool? value) {
+                                            controller.directDownload.value =
+                                                value ?? false;
+                                          },
+                                        )),
+                                    Text('directDownload'.tr),
+                                  ]),
+                                ),
                                 TextButton(
                                   onPressed: () {
                                     controller.showAdvanced.value =
@@ -396,17 +413,17 @@ class CreateView extends GetView<CreateController> {
             Util.isWeb() && controller.fileDataUri.isNotEmpty;
         final submitUrl = isWebFileChosen
             ? controller.fileDataUri.value
-            : _urlController.text.trim();
+            : _urlController.text;
 
         final urls = Util.textToLines(submitUrl);
         // Add url to the history
         if (!isWebFileChosen) {
           for (final url in urls) {
-            Database.instance.saveCreateHistory(url);
+            _historyController.addHistory(url);
           }
         }
 
-        /*
+        /* 
         Check if is direct download, there has two ways to direct download
         1. Direct download option is checked
         2. Muli line urls
@@ -443,24 +460,17 @@ class CreateView extends GetView<CreateController> {
   Object? parseReqExtra(String url) {
     Object? reqExtra;
     if (controller.showAdvanced.value) {
-      switch (controller.advancedTabController.index) {
+      final u = Uri.parse(_urlController.text);
-        case 0:
+      if (u.scheme.startsWith("http")) {
-          final header = {
+        reqExtra = ReqExtraHttp()
+          ..header = {
             "User-Agent": _httpUaController.text,
             "Cookie": _httpCookieController.text,
             "Referer": _httpRefererController.text,
           };
-          header.removeWhere((key, value) => value.trim().isEmpty);
+      } else {
-          if (header.isNotEmpty) {
+        reqExtra = ReqExtraBt()
-            reqExtra = ReqExtraHttp()..header = header;
+          ..trackers = Util.textToLines(_btTrackerController.text);
-          }
-          break;
-        case 1:
-          if (_btTrackerController.text.trim().isNotEmpty) {
-            reqExtra = ReqExtraBt()
-              ..trackers = Util.textToLines(_btTrackerController.text);
-          }
-          break;
       }
     }
     return reqExtra;

ui/flutter/lib/app/modules/extension/views/extension_view.dart

@@ -7,21 +7,21 @@ import 'package:flutter/services.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 import 'package:get/get.dart';
+import 'package:gopeed/app/views/text_button_loading.dart';
+import '../../../../api/model/update_extension_settings.dart';
+import '../../../../util/mac_secure_util.dart';
+import '../../../../util/message.dart';
 import 'package:path/path.dart' as path;
-import 'package:rounded_loading_button_plus/rounded_loading_button.dart';
+import 'package:rounded_loading_button/rounded_loading_button.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../../../api/api.dart';
 import '../../../../api/model/extension.dart';
 import '../../../../api/model/install_extension.dart';
 import '../../../../api/model/switch_extension.dart';
-import '../../../../api/model/update_extension_settings.dart';
-import '../../../../util/mac_secure_util.dart';
-import '../../../../util/message.dart';
 import '../../../../util/util.dart';
 import '../../../views/icon_button_loading.dart';
 import '../../../views/responsive_builder.dart';
-import '../../../views/text_button_loading.dart';
 import '../controllers/extension_controller.dart';
 
 class ExtensionView extends GetView<ExtensionController> {

ui/flutter/lib/app/modules/history/controller/history_controller.dart

@@ -0,0 +1,26 @@
+import 'package:shared_preferences/shared_preferences.dart';
+
+class HistoryController {
+  // Get History in List<String>
+  Future<List<String>> getAllHistory() async {
+    SharedPreferences preferences = await SharedPreferences.getInstance();
+    List<String>? historyList = preferences.getStringList('history');
+    if(historyList == null) {
+      return [];
+    }
+    return historyList;
+  }
+
+  // Get Existing History & Add New History
+  void addHistory(String historyText) async {
+    SharedPreferences preferences = await SharedPreferences.getInstance();
+    List<String> existingHistoryData = await getAllHistory();
+    existingHistoryData.add(historyText);
+    preferences.setStringList('history', existingHistoryData);
+  }
+
+  void clearHistory() async {
+    SharedPreferences preferences = await SharedPreferences.getInstance();
+    preferences.remove('history');
+  }
+}

ui/flutter/lib/app/modules/history/views/history_view.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:gopeed/database/database.dart';
+import 'package:gopeed/app/modules/history/controller/history_controller.dart';
 
 class HistoryView extends StatefulWidget {
   const HistoryView({
@@ -62,7 +62,8 @@ class _HistoryViewState extends State<HistoryView> {
                       children: <Widget>[
                         IconButton(
                           onPressed: () {
-                            Database.instance.clearCreateHistory();
+                            HistoryController _controller = HistoryController();
+                            _controller.clearHistory();
                             Navigator.pop(context);
                           },
                           tooltip: "clearHistory".tr,

ui/flutter/lib/app/modules/setting/views/setting_view.dart

@@ -1,27 +1,20 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:badges/badges.dart' as badges;
 import 'package:flutter/material.dart';
-import 'package:path/path.dart' as path;
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
-import 'package:gopeed/app/views/copy_button.dart';
 import 'package:intl/intl.dart';
-import 'package:launch_at_startup/launch_at_startup.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import '../../../../api/model/downloader_config.dart';
 import '../../../../i18n/message.dart';
 import '../../../../util/input_formatter.dart';
 import '../../../../util/locale_manager.dart';
-import '../../../../util/log_util.dart';
 import '../../../../util/message.dart';
 import '../../../../util/package_info.dart';
 import '../../../../util/util.dart';
 import '../../../views/check_list_view.dart';
 import '../../../views/directory_selector.dart';
-import '../../../views/open_in_new.dart';
 import '../../../views/outlined_button_loading.dart';
 import '../../app/controllers/app_controller.dart';
 import '../controllers/setting_controller.dart';
@@ -39,22 +32,13 @@ class SettingView extends GetView<SettingController> {
     final startCfg = appController.startConfig;
 
     Timer? timer;
-    Future<bool> debounceSave(
+    debounceSave({bool needRestart = false}) {
-        {Future<String> Function()? check, bool needRestart = false}) {
+      var completer = Completer<void>();
-      var completer = Completer<bool>();
       timer?.cancel();
-      timer = Timer(const Duration(milliseconds: 1000), () async {
+      timer = Timer(const Duration(milliseconds: 1000), () {
-        if (check != null) {
-          final checkResult = await check();
-          if (checkResult.isNotEmpty) {
-            showErrorMessage(checkResult);
-            completer.complete(false);
-            return;
-          }
-        }
         appController
             .saveConfig()
-            .then((_) => completer.complete(true))
+            .then(completer.complete)
             .onError(completer.completeError);
         if (needRestart) {
           showMessage('tip'.tr, 'effectAfterRestart'.tr);
@@ -81,7 +65,6 @@ class SettingView extends GetView<SettingController> {
       return DirectorySelector(
         controller: downloadDirController,
         showLabel: false,
-        showAndoirdToggle: true,
       );
     });
     final buildMaxRunning = _buildConfigItem(
@@ -110,59 +93,6 @@ class SettingView extends GetView<SettingController> {
         ],
       );
     });
-    buildBrowserExtension() {
-      return ListTile(
-          title: Text('browserExtension'.tr),
-          subtitle: const Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              OpenInNew(
-                text: "Chrome",
-                url:
-                    "https://chromewebstore.google.com/detail/gopeed/mijpgljlfcapndmchhjffkpckknofcnd",
-              ),
-              SizedBox(width: 10),
-              OpenInNew(
-                text: "Edge",
-                url:
-                    "https://microsoftedge.microsoft.com/addons/detail/dkajnckekendchdleoaenoophcobooce",
-              ),
-              SizedBox(width: 10),
-              OpenInNew(
-                text: "Firefox",
-                url:
-                    "https://addons.mozilla.org/zh-CN/firefox/addon/gopeed-extension",
-              ),
-            ],
-          ).paddingOnly(top: 5));
-    }
-
-    // Currently auto startup only support Windows and Linux
-    final buildAutoStartup = !Util.isWindows() && !Util.isLinux()
-        ? () => null
-        : _buildConfigItem('launchAtStartup'.tr, () {
-            return appController.autoStartup.value ? 'on'.tr : 'off'.tr;
-          }, (Key key) {
-            return Container(
-              alignment: Alignment.centerLeft,
-              child: Switch(
-                value: appController.autoStartup.value,
-                onChanged: (bool value) async {
-                  try {
-                    if (value) {
-                      await launchAtStartup.enable();
-                    } else {
-                      await launchAtStartup.disable();
-                    }
-                    appController.autoStartup.value = value;
-                  } catch (e) {
-                    showErrorMessage(e);
-                    logger.e('launchAtStartup fail', e);
-                  }
-                },
-              ),
-            );
-          });
 
     // http config items start
     final httpConfig = downloaderCfg.value.protocolConfig.http;
@@ -208,21 +138,6 @@ class SettingView extends GetView<SettingController> {
         ],
       );
     });
-    final buildHttpUseServerCtime = _buildConfigItem('useServerCtime'.tr,
-        () => httpConfig.useServerCtime ? 'on'.tr : 'off'.tr, (Key key) {
-      return Container(
-        alignment: Alignment.centerLeft,
-        child: Switch(
-          value: httpConfig.useServerCtime,
-          onChanged: (bool value) {
-            downloaderCfg.update((val) {
-              val!.protocolConfig.http.useServerCtime = value;
-            });
-            debounceSave();
-          },
-        ),
-      );
-    });
 
     // bt config items start
     final btConfig = downloaderCfg.value.protocolConfig.bt;
@@ -292,13 +207,8 @@ class SettingView extends GetView<SettingController> {
               Expanded(
                 child: SwitchListTile(
                     controlAffinity: ListTileControlAffinity.leading,
-                    value: btExtConfig.autoUpdateTrackers,
+                    value: true,
-                    onChanged: (bool value) {
+                    onChanged: (bool value) {},
-                      downloaderCfg.update((val) {
-                        val!.extra.bt.autoUpdateTrackers = value;
-                      });
-                      debounceSave();
-                    },
                     title: Text('updateDaily'.tr)),
               ),
             ],
@@ -336,69 +246,6 @@ class SettingView extends GetView<SettingController> {
         },
       );
     });
-    final buildBtSeedConfig = _buildConfigItem('seedConfig',
-        () => '${'seedKeep'.tr}(${btConfig.seedKeep ? 'on'.tr : 'off'.tr})',
-        (Key key) {
-      final seedRatioController =
-          TextEditingController(text: btConfig.seedRatio.toString());
-      seedRatioController.addListener(() {
-        if (seedRatioController.text.isNotEmpty) {
-          btConfig.seedRatio = double.parse(seedRatioController.text);
-          debounceSave();
-        }
-      });
-      final seedTimeController =
-          TextEditingController(text: (btConfig.seedTime ~/ 60).toString());
-      seedTimeController.addListener(() {
-        if (seedTimeController.text.isNotEmpty) {
-          btConfig.seedTime = int.parse(seedTimeController.text) * 60;
-          debounceSave();
-        }
-      });
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          SwitchListTile(
-              controlAffinity: ListTileControlAffinity.leading,
-              contentPadding: EdgeInsets.zero,
-              value: btConfig.seedKeep,
-              onChanged: (bool value) {
-                downloaderCfg.update((val) {
-                  val!.protocolConfig.bt.seedKeep = value;
-                });
-                debounceSave();
-              },
-              title: Text('seedKeep'.tr)),
-          btConfig.seedKeep
-              ? null
-              : TextField(
-                  controller: seedRatioController,
-                  decoration: InputDecoration(
-                    labelText: 'seedRatio'.tr,
-                  ),
-                  keyboardType:
-                      const TextInputType.numberWithOptions(decimal: true),
-                  inputFormatters: [
-                    FilteringTextInputFormatter.allow(
-                        RegExp(r'^\d+\.?\d{0,2}')),
-                  ],
-                ),
-          btConfig.seedKeep
-              ? null
-              : TextField(
-                  controller: seedTimeController,
-                  decoration: InputDecoration(
-                    labelText: 'seedTime'.tr,
-                  ),
-                  keyboardType: TextInputType.number,
-                  inputFormatters: [
-                    FilteringTextInputFormatter.digitsOnly,
-                    NumericalRangeFormatter(min: 0, max: 100000000),
-                  ],
-                ),
-        ].where((e) => e != null).map((e) => e!).toList(),
-      );
-    });
 
     // ui config items start
     final buildTheme = _buildConfigItem(
@@ -531,53 +378,29 @@ class SettingView extends GetView<SettingController> {
     }
 
     // advanced config proxy items start
-    final proxy = downloaderCfg.value.proxy;
     final buildProxy = _buildConfigItem(
       'proxy',
-      () {
+      () => downloaderCfg.value.proxy.enable
-        switch (proxy.proxyMode) {
+          ? '${downloaderCfg.value.proxy.scheme}://${downloaderCfg.value.proxy.host}'
-          case ProxyModeEnum.noProxy:
+          : 'notSet'.tr,
-            return 'noProxy'.tr;
-          case ProxyModeEnum.systemProxy:
-            return 'systemProxy'.tr;
-          case ProxyModeEnum.customProxy:
-            return '${downloaderCfg.value.proxy.scheme}://${downloaderCfg.value.proxy.host}';
-        }
-      },
       (Key key) {
-        final mode = SizedBox(
+        final proxy = downloaderCfg.value.proxy;
-          width: 150,
-          child: DropdownButtonFormField<ProxyModeEnum>(
-            value: proxy.proxyMode,
-            onChanged: (value) async {
-              if (value != null && value != proxy.proxyMode) {
-                proxy.proxyMode = value;
-                downloaderCfg.update((val) {
-                  val!.proxy = proxy;
-                });
 
-                await debounceSave();
+        final switcher = Switch(
-              }
+          value: proxy.enable,
-            },
+          onChanged: (bool value) async {
-            items: [
+            if (value != proxy.enable) {
-              DropdownMenuItem<ProxyModeEnum>(
+              downloaderCfg.update((val) {
-                value: ProxyModeEnum.noProxy,
+                val!.proxy.enable = value;
-                child: Text('noProxy'.tr),
+              });
-              ),
+
-              DropdownMenuItem<ProxyModeEnum>(
+              await debounceSave();
-                value: ProxyModeEnum.systemProxy,
+            }
-                child: Text('systemProxy'.tr),
+          },
-              ),
-              DropdownMenuItem<ProxyModeEnum>(
-                value: ProxyModeEnum.customProxy,
-                child: Text('customProxy'.tr),
-              ),
-            ],
-          ),
         );
 
         final scheme = SizedBox(
-          width: 150,
+          width: 100,
           child: DropdownButtonFormField<String>(
             value: proxy.scheme,
             onChanged: (value) async {
@@ -625,7 +448,7 @@ class SettingView extends GetView<SettingController> {
 
         ipController.addListener(updateAddress);
         portController.addListener(updateAddress);
-        final server = Row(children: [
+        final server = [
           Flexible(
             child: TextFormField(
               controller: ipController,
@@ -650,12 +473,12 @@ class SettingView extends GetView<SettingController> {
               ],
             ),
           ),
-        ]);
+        ];
 
         final usrController = TextEditingController(text: proxy.usr);
         final pwdController = TextEditingController(text: proxy.pwd);
 
-        final auth = Row(children: [
+        final auth = [
           Flexible(
             child: TextFormField(
               controller: usrController,
@@ -675,21 +498,20 @@ class SettingView extends GetView<SettingController> {
               ),
             ),
           ),
-        ]);
+        ];
-
-        List<Widget> customView() {
-          if (proxy.proxyMode != ProxyModeEnum.customProxy) {
-            return [];
-          }
-          return [scheme, server, auth];
-        }
 
         return Form(
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: _addPadding([
-              mode,
+              switcher,
-              ...customView(),
+              scheme,
+              Row(
+                children: server,
+              ),
+              Row(
+                children: auth,
+              ),
             ]),
           ),
         );
@@ -744,41 +566,11 @@ class SettingView extends GetView<SettingController> {
           final ipController = TextEditingController(text: ip);
           final portController = TextEditingController(text: port);
           updateAddress() async {
-            if (ipController.text.isEmpty || portController.text.isEmpty) {
-              return;
-            }
             final newAddress = '${ipController.text}:${portController.text}';
             if (newAddress != startCfg.value.address) {
               startCfg.value.address = newAddress;
 
-              final saved = await debounceSave(
+              await debounceSave(needRestart: true);
-                  check: () async {
-                    // Check if address already in use
-                    final configIp = ipController.text;
-                    final configPort = int.parse(portController.text);
-                    if (configPort == 0) {
-                      return '';
-                    }
-                    try {
-                      final socket = await Socket.connect(configIp, configPort,
-                          timeout: const Duration(seconds: 3));
-                      socket.close();
-                      return 'portInUse'
-                          .trParams({'port': configPort.toString()});
-                    } catch (e) {
-                      return '';
-                    }
-                  },
-                  needRestart: true);
-
-              // If save failed, restore the old address
-              if (!saved) {
-                final oldAddress =
-                    (await appController.loadStartConfig()).address;
-                startCfg.update((val) async {
-                  val!.address = oldAddress;
-                });
-              }
             }
           }
 
@@ -844,32 +636,6 @@ class SettingView extends GetView<SettingController> {
       );
     });
 
-    // advanced config log items start
-    buildLogsDir() {
-      return ListTile(
-          title: Text("日志目录"),
-          subtitle: Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Expanded(
-                child: TextField(
-                  controller: TextEditingController(text: logsDir()),
-                  enabled: false,
-                  readOnly: true,
-                ),
-              ),
-              Util.isDesktop()
-                  ? IconButton(
-                      icon: const Icon(Icons.folder_open),
-                      onPressed: () {
-                        launchUrl(Uri.file(logsDir()));
-                      },
-                    )
-                  : CopyButton(logsDir()),
-            ],
-          ));
-    }
-
     return Obx(() {
       return GestureDetector(
         onTap: () {
@@ -901,12 +667,8 @@ class SettingView extends GetView<SettingController> {
                         Text('general'.tr),
                         Card(
                             child: Column(
-                          children: _addDivider([
+                          children: _addDivider(
-                            buildDownloadDir(),
+                              [buildDownloadDir(), buildMaxRunning()]),
-                            buildMaxRunning(),
-                            buildBrowserExtension(),
-                            buildAutoStartup(),
-                          ]),
                         )),
                         const Text('HTTP'),
                         Card(
@@ -914,7 +676,6 @@ class SettingView extends GetView<SettingController> {
                           children: _addDivider([
                             buildHttpUa(),
                             buildHttpConnections(),
-                            buildHttpUseServerCtime(),
                           ]),
                         )),
                         const Text('BitTorrent'),
@@ -924,7 +685,6 @@ class SettingView extends GetView<SettingController> {
                             buildBtListenPort(),
                             buildBtTrackerSubscribeUrls(),
                             buildBtTrackers(),
-                            buildBtSeedConfig(),
                           ]),
                         )),
                         Text('ui'.tr),
@@ -981,13 +741,6 @@ class SettingView extends GetView<SettingController> {
                               : null,
                         ]),
                       )),
-                      const Text('开发者'),
-                      Card(
-                          child: Column(
-                        children: _addDivider([
-                          buildLogsDir(),
-                        ]),
-                      )),
                     ]),
                   ))
                 ],
@@ -1070,37 +823,3 @@ class SettingView extends GetView<SettingController> {
     }
   }
 }
-
-enum ProxyModeEnum {
-  noProxy,
-  systemProxy,
-  customProxy,
-}
-
-extension ProxyMode on ProxyConfig {
-  ProxyModeEnum get proxyMode {
-    if (!enable) {
-      return ProxyModeEnum.noProxy;
-    }
-    if (system) {
-      return ProxyModeEnum.systemProxy;
-    }
-    return ProxyModeEnum.customProxy;
-  }
-
-  set proxyMode(ProxyModeEnum value) {
-    switch (value) {
-      case ProxyModeEnum.noProxy:
-        enable = false;
-        break;
-      case ProxyModeEnum.systemProxy:
-        enable = true;
-        system = true;
-        break;
-      case ProxyModeEnum.customProxy:
-        enable = true;
-        system = false;
-        break;
-    }
-  }
-}

ui/flutter/lib/app/modules/task/controllers/task_controller.dart

@@ -1,10 +1,5 @@
-import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:gopeed/api/model/task.dart';
 
 class TaskController extends GetxController {
   final tabIndex = 0.obs;
-  final scaffoldKey = GlobalKey<ScaffoldState>();
-  final selectTask = Rx<Task?>(null);
-  final copyUrlDone = false.obs;
 }