fix: 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,9 +11,6 @@ categories:
       - 'fix'
       - 'bugfix'
       - 'bug'
-  - title: '🔧 Performance Improvements'
-    labels:
-      - 'perf'
   - title: '🧪 Tests'
     label: 'test'
   - title: '🧰 Maintenance'

.github/workflows/build.yml

@@ -13,7 +13,7 @@ on:
         default: "false"
 
 env:
-  GO_VERSION: "1.22"
+  GO_VERSION: "1.21"
   FLUTTER_VERSION: "3.16.8"
 
 permissions:
@@ -136,7 +136,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
@@ -147,14 +147,16 @@ jobs:
         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 -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -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 +171,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:
@@ -258,6 +260,9 @@ 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:
@@ -295,55 +300,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: |
-                # 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/
+              flutter-target: lib/main.dart
           EOF
           
           cp linux/assets/com.gopeed.Gopeed.desktop snap/gui/gopeed.desktop
@@ -380,7 +350,7 @@ 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 -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -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
@@ -411,7 +381,7 @@ 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/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
+          gomobile bind -tags nosqlite,netgo -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
           cd ui/flutter
           flutter build ios --no-codesign
           mkdir Payload
@@ -483,9 +453,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,19 +463,11 @@ 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 }}
         with:
-          context: .
           push: ${{ github.event.inputs.test == 'true' && 'false' || 'true' }}
           build-args: |
             VERSION=${{ env.VERSION }}
@@ -518,6 +477,7 @@ jobs:
             linux/amd64
             linux/arm64
             linux/arm/v7
+            linux/arm64/v8
           tags: |
             liwei2633/gopeed:latest
             liwei2633/gopeed:v${{ 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,7 +27,7 @@ on:
       - "go.sum"
 
 env:
-  GO_VERSION: "1.22"
+  GO_VERSION: "1.21"
   FLUTTER_VERSION: "3.16.8"
 
 jobs:
@@ -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
 

Dockerfile

@@ -1,8 +1,16 @@
-FROM golang:1.22.6 AS go
+FROM instrumentisto/flutter:3.16.8 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.21.6 AS go
 WORKDIR /app
 COPY ./go.mod ./go.sum ./
 RUN go mod download
 COPY . .
+COPY --from=flutter /app/build/web ./cmd/web/dist
 ARG VERSION=dev
 RUN CGO_ENABLED=0 go build -tags nosqlite,web \
       -ldflags="-s -w -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION -X github.com/GopeedLab/gopeed/pkg/base.InDocker=true" \

README.md

@@ -5,8 +5,6 @@
 [![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)
@@ -174,7 +172,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,8 +5,6 @@
 [![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)
@@ -102,7 +100,7 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
 
 ### 環境
 
-1. Go 言語 1.22+
+1. Go 言語 1.21+
 2. Flutter 3.16+
 
 ### クローン
@@ -162,7 +160,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

@@ -5,8 +5,6 @@
 [![Ủ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)
@@ -110,7 +108,7 @@ Dự án này được chia thành hai phần, phần giao diện sử dụng `f
 
 ### Environment
 
-1. Golang 1.22+
+1. Golang 1.21+
 2. Flutter 3.16+
 
 ### Clone
@@ -170,7 +168,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_zh-CN.md

@@ -5,8 +5,6 @@
 [![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)
@@ -114,7 +112,7 @@ Gopeed 还提供了浏览器扩展用于接管浏览器下载，支持 Chrome、
 
 ### 环境要求
 
-1. Golang 1.22+
+1. Golang 1.21+
 2. Flutter 3.16+
 
 ### 克隆项目
@@ -174,7 +172,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,8 +5,6 @@
 [![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)
@@ -110,7 +108,7 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 
 ### 開發環境
 
-1. Golang 1.22+
+1. Golang 1.21+
 2. Flutter 3.16+
 
 ### 克隆項目
@@ -170,7 +168,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/server.go

@@ -8,9 +8,7 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"net/http"
 	"os"
-	"os/signal"
 	"path/filepath"
-	"syscall"
 )
 
 //go:embed banner.txt
@@ -27,46 +25,23 @@ func Start(cfg *model.StartConfig) {
 		panic(err)
 	}
 	if downloadCfg.FirstLoad {
-		// Set default download config
-		if cfg.DownloadConfig != nil {
-			cfg.DownloadConfig.Merge(downloadCfg)
-			// TODO Use PatchConfig
-			rest.Downloader.PutConfig(cfg.DownloadConfig)
-			downloadCfg = cfg.DownloadConfig
-		}
-
-		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)
+		var downloadDir string
+		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,7 +4,6 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/GopeedLab/gopeed/pkg/base"
 	"os"
 	"path/filepath"
 )
@@ -16,8 +15,6 @@ type args struct {
 	Password   *string `json:"password"`
 	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,7 +25,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()
@@ -60,9 +57,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

@@ -48,7 +48,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,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 chown -R ${PUID}:${PGID} /app
 

go.mod

@@ -1,58 +1,54 @@
 module github.com/GopeedLab/gopeed
 
-go 1.22
+go 1.21
 
 require (
 	github.com/anacrolix/missinggo/v2 v2.7.3
-	github.com/anacrolix/torrent v1.56.1
+	github.com/anacrolix/torrent v1.53.3
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
-	github.com/dop251/goja v0.0.0-20240806095544-3491d4a58fbe
-	github.com/dop251/goja_nodejs v0.0.0-20240728170619-29b559befffc
+	github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
+	github.com/dop251/goja_nodejs v0.0.0-20231122114759-e84d9a924c5c
 	github.com/go-git/go-git/v5 v5.8.1
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
 	github.com/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.10
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
-	golang.org/x/sync v0.8.0
+	go.etcd.io/bbolt v1.3.8
+	golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
+	golang.org/x/sync v0.6.0
 )
 
 require (
 	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.7.0 // 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/dht/v2 v2.21.1 // indirect
+	github.com/anacrolix/chansync v0.4.0 // indirect
+	github.com/anacrolix/dht/v2 v2.21.0 // indirect
 	github.com/anacrolix/envpprof v1.3.0 // indirect
-	github.com/anacrolix/generics v0.0.2 // indirect
+	github.com/anacrolix/generics v0.0.0-20230911070922-5dd7545c6b13 // indirect
 	github.com/anacrolix/go-libutp v1.3.1 // indirect
-	github.com/anacrolix/log v0.15.2 // indirect
+	github.com/anacrolix/log v0.14.6-0.20231202035202-ed7a02cad0b4 // 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/stm v0.5.0 // indirect
 	github.com/anacrolix/sync v0.5.1 // indirect
-	github.com/anacrolix/upnp v0.1.4 // indirect
+	github.com/anacrolix/upnp v0.1.3 // indirect
 	github.com/anacrolix/utp v0.2.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/benbjohnson/immutable v0.4.3 // indirect
 	github.com/bits-and-blooms/bitset v1.13.0 // indirect
 	github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
-	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cloudflare/circl v1.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/edsrzf/mmap-go v1.1.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
@@ -60,69 +56,63 @@ require (
 	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-llsqlite/crawshaw v0.5.3 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-llsqlite/crawshaw v0.5.0 // indirect
+	github.com/go-logr/logr v1.4.1 // 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/uuid v1.6.0 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
-	github.com/huandu/xstrings v1.5.0 // indirect
+	github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect
+	github.com/google/uuid v1.5.0 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/huandu/xstrings v1.4.0 // 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/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-ieproxy v0.0.11 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/minio/sha256-simd v1.0.1 // indirect
-	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/mschoch/smat v0.2.0 // indirect
-	github.com/multiformats/go-multihash v0.2.3 // indirect
-	github.com/multiformats/go-varint v0.0.7 // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
-	github.com/pion/datachannel v1.5.8 // 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/datachannel v1.5.5 // indirect
+	github.com/pion/dtls/v2 v2.2.9 // indirect
+	github.com/pion/ice/v2 v2.3.12 // indirect
+	github.com/pion/interceptor v0.1.25 // indirect
 	github.com/pion/logging v0.2.2 // indirect
-	github.com/pion/mdns v0.0.12 // indirect
+	github.com/pion/mdns v0.0.9 // indirect
 	github.com/pion/randutil v0.1.0 // indirect
-	github.com/pion/rtcp v1.2.14 // indirect
-	github.com/pion/rtp v1.8.7 // indirect
-	github.com/pion/sctp v1.8.19 // indirect
-	github.com/pion/sdp/v3 v3.0.9 // indirect
-	github.com/pion/srtp/v2 v2.0.20 // indirect
+	github.com/pion/rtcp v1.2.13 // indirect
+	github.com/pion/rtp v1.8.3 // indirect
+	github.com/pion/sctp v1.8.9 // indirect
+	github.com/pion/sdp/v3 v3.0.6 // indirect
+	github.com/pion/srtp/v2 v2.0.18 // indirect
 	github.com/pion/stun v0.6.1 // indirect
-	github.com/pion/transport/v2 v2.2.9 // indirect
-	github.com/pion/turn/v2 v2.1.6 // indirect
-	github.com/pion/webrtc/v3 v3.2.50 // indirect
+	github.com/pion/transport/v2 v2.2.4 // indirect
+	github.com/pion/turn/v2 v2.1.4 // indirect
+	github.com/pion/webrtc/v3 v3.2.24 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 // 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/stretchr/testify v1.9.0 // indirect
+	github.com/stretchr/testify v1.8.4 // 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/metric v1.28.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
-	golang.org/x/crypto v0.25.0 // indirect
-	golang.org/x/mod v0.19.0 // indirect
-	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad // indirect
+	go.opentelemetry.io/otel v1.22.0 // indirect
+	go.opentelemetry.io/otel/metric v1.22.0 // indirect
+	go.opentelemetry.io/otel/trace v1.22.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.23.0 // indirect
+	golang.org/x/tools v0.17.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/libc v1.40.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
+	modernc.org/memory v1.7.2 // indirect
+	modernc.org/sqlite v1.28.0 // indirect
+	zombiezen.com/go/sqlite v1.1.0 // indirect
 )

internal/controller/controller.go

@@ -7,7 +7,7 @@ import (
 )
 
 type Controller struct {
-	GetConfig   func(v any)
+	GetConfig   func(v any) bool
 	ProxyConfig *base.DownloaderProxyConfig
 	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
-
-const (
-	// FilterTypeUrl url type, pattern is the scheme, e.g. http://github.com -> http
-	FilterTypeUrl FilterType = iota
-	// FilterTypeFile file type, pattern is the file extension name, e.g. test.torrent -> torrent
-	FilterTypeFile
-	// FilterTypeBase64 base64 data type, pattern is the data mime type, e.g. data:application/x-bittorrent;base64 -> application/x-bittorrent
-	FilterTypeBase64
-)
-
-type SchemeFilter struct {
-	Type    FilterType
-	Pattern string
-}
-
-func (s *SchemeFilter) Match(uri string) bool {
-	uriUpper := strings.ToUpper(uri)
-	patternUpper := strings.ToUpper(s.Pattern)
-	switch s.Type {
-	case FilterTypeUrl:
-		return strings.HasPrefix(uriUpper, patternUpper+":")
-	case FilterTypeFile:
-		return strings.HasSuffix(uriUpper, "."+patternUpper)
-	case FilterTypeBase64:
-		return strings.HasPrefix(uriUpper, "DATA:"+patternUpper+";BASE64,")
-	}
-	return false
-}
-
-// FetcherManager manage and control the fetcher
-type FetcherManager interface {
-	// Name return the name of the protocol.
-	Name() string
-	// Filters registers the supported schemes.
-	Filters() []*SchemeFilter
+// FetcherBuilder defines the interface for a fetcher builder.
+type FetcherBuilder interface {
+	// Schemes returns the schemes supported by the fetcher.
+	Schemes() []string
 	// Build returns a new fetcher.
 	Build() Fetcher
 
-	// 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,7 +2,6 @@ package bt
 
 import (
 	"bytes"
-	"context"
 	"fmt"
 	"github.com/GopeedLab/gopeed/internal/controller"
 	"github.com/GopeedLab/gopeed/internal/fetcher"
@@ -23,8 +22,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 +30,15 @@ type Fetcher struct {
 
 	torrent *torrent.Torrent
 	meta    *fetcher.FetcherMeta
-	data    *fetcherData
 
-	torrentReady    atomic.Bool
-	torrentUpload   atomic.Bool
-	torrentDropCtx  context.Context
-	torrentDropFunc func()
-	uploadDoneCh    chan any
+	torrentReady atomic.Bool
+	torrentDrop  atomic.Bool
+	create       atomic.Bool
+	progress     fetcher.Progress
+}
+
+func (f *Fetcher) Name() string {
+	return "bt"
 }
 
 func (f *Fetcher) Setup(ctl *controller.Controller) {
@@ -47,12 +46,13 @@ func (f *Fetcher) Setup(ctl *controller.Controller) {
 	if f.meta == nil {
 		f.meta = &fetcher.FetcherMeta{}
 	}
-	if f.data == nil {
-		f.data = &fetcherData{}
+	exist := f.ctl.GetConfig(&f.config)
+	if !exist {
+		f.config = &config{
+			ListenPort: 0,
+			Trackers:   []string{},
+		}
 	}
-	f.uploadDoneCh = make(chan any, 1)
-	f.torrentDropCtx, f.torrentDropFunc = context.WithCancel(context.Background())
-	f.ctl.GetConfig(&f.config)
 	return
 }
 
@@ -63,12 +63,8 @@ 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
@@ -82,22 +78,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 +96,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 +106,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 +115,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 {
-			f.meta.Opts.SelectFiles = make([]int, len(files))
-			for i := range files {
-				f.meta.Opts.SelectFiles[i] = i
-			}
+	if len(f.meta.Opts.SelectFiles) == 0 {
+		f.meta.Opts.SelectFiles = make([]int, len(files))
+		for i := range files {
+			f.meta.Opts.SelectFiles[i] = i
 		}
-		f.data.Progress = make(fetcher.Progress, len(f.meta.Opts.SelectFiles))
 	}
+	f.progress = make(fetcher.Progress, len(f.meta.Opts.SelectFiles))
 	if len(f.meta.Opts.SelectFiles) == len(files) {
 		f.torrent.DownloadAll()
 	} else {
@@ -141,6 +130,7 @@ func (f *Fetcher) Start() (err error) {
 			file.Download()
 		}
 	}
+
 	return
 }
 
@@ -151,12 +141,8 @@ func (f *Fetcher) Pause() (err error) {
 }
 
 func (f *Fetcher) Close() (err error) {
+	f.torrentDrop.Store(false)
 	f.safeDrop()
-	f.torrentDropFunc()
-	f.uploadDoneCh <- nil
-	if len(client.Torrents()) == 0 {
-		err = closeClient()
-	}
 	return nil
 }
 
@@ -169,78 +155,66 @@ func (f *Fetcher) safeDrop() {
 	f.torrent.Drop()
 }
 
+func (f *Fetcher) Wait() (err error) {
+	for {
+		if f.torrentDrop.Load() {
+			break
+		}
+		if f.torrentReady.Load() && len(f.meta.Opts.SelectFiles) > 0 {
+			done := true
+			for _, selectIndex := range f.meta.Opts.SelectFiles {
+				file := f.torrent.Files()[selectIndex]
+				if file.BytesCompleted() < file.Length() {
+					done = false
+					break
+				}
+			}
+			if done {
+				// remove unselected files
+				for i, file := range f.torrent.Files() {
+					selected := false
+					for _, selectIndex := range f.meta.Opts.SelectFiles {
+						if i == selectIndex {
+							selected = true
+							break
+						}
+					}
+					if !selected {
+						util.SafeRemove(filepath.Join(f.meta.Opts.Path, f.meta.Res.Name, file.Path()))
+					}
+				}
+				break
+			}
+		}
+		time.Sleep(time.Millisecond * 500)
+	}
+	return nil
+}
+
 func (f *Fetcher) Meta() *fetcher.FetcherMeta {
 	return f.meta
 }
 
 func (f *Fetcher) Stats() any {
-	var stats torrent.TorrentStats
-	if f.torrent != nil {
-		stats = f.torrent.Stats()
-	} else {
-		stats = torrent.TorrentStats{}
-	}
-	return &bt.Stats{
+	stats := f.torrent.Stats()
+	baseStats := &bt.Stats{
 		TotalPeers:       stats.TotalPeers,
 		ActivePeers:      stats.ActivePeers,
 		ConnectedSeeders: stats.ConnectedSeeders,
-		SeedBytes:        f.data.SeedBytes,
-		SeedRatio:        f.seedRadio(),
-		SeedTime:         f.data.SeedTime,
 	}
+	return baseStats
 }
 
 func (f *Fetcher) Progress() fetcher.Progress {
 	if !f.torrentReady.Load() {
-		return f.data.Progress
+		return f.progress
 	}
-	for i := range f.data.Progress {
+	for i := range f.progress {
 		selectIndex := f.meta.Opts.SelectFiles[i]
 		file := f.torrent.Files()[selectIndex]
-		f.data.Progress[i] = file.BytesCompleted()
+		f.progress[i] = file.BytesCompleted()
 	}
-	return f.data.Progress
-}
-
-func (f *Fetcher) Wait() (err error) {
-	for {
-		select {
-		case <-f.torrentDropCtx.Done():
-			return
-		case <-time.After(time.Second):
-			if f.torrentReady.Load() && len(f.meta.Opts.SelectFiles) > 0 {
-				if f.isDone() {
-					// remove unselected files
-					for i, file := range f.torrent.Files() {
-						selected := false
-						for _, selectIndex := range f.meta.Opts.SelectFiles {
-							if i == selectIndex {
-								selected = true
-								break
-							}
-						}
-						if !selected {
-							util.SafeRemove(filepath.Join(f.meta.Opts.Path, f.meta.Res.Name, file.Path()))
-						}
-					}
-					return
-				}
-			}
-		}
-	}
-}
-
-func (f *Fetcher) isDone() bool {
-	if f.meta.Opts == nil {
-		return false
-	}
-	for _, selectIndex := range f.meta.Opts.SelectFiles {
-		file := f.torrent.Files()[selectIndex]
-		if file.BytesCompleted() < file.Length() {
-			return false
-		}
-	}
-	return true
+	return f.progress
 }
 
 func (f *Fetcher) updateRes() {
@@ -265,87 +239,14 @@ func (f *Fetcher) updateRes() {
 	}
 }
 
-func (f *Fetcher) Upload() (err error) {
-	return f.addTorrent(f.meta.Req, true)
-}
-
-func (f *Fetcher) doUpload(fromUpload bool) {
-	if !f.torrentUpload.CompareAndSwap(false, true) {
-		return
-	}
-
-	// Check and update seed data
-	lastData := &fetcherData{
-		SeedBytes: f.data.SeedBytes,
-		SeedTime:  f.data.SeedTime,
-	}
-	var doneTime int64 = 0
-	for {
-		select {
-		case <-f.torrentDropCtx.Done():
-			return
-		case <-time.After(time.Second):
-			if !f.torrentReady.Load() {
-				continue
-			}
-
-			stats := f.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
-	}
+func (f *Fetcher) addTorrent(req *base.Request) (err error) {
 	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,107 +286,34 @@ 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 {
-	var bytesRead int64
-	if f.Meta().Res != nil {
-		bytesRead = f.Meta().Res.Size
-	} else {
-		bytesRead = 0
-	}
-	if bytesRead <= 0 {
-		return 0
-	}
-
-	return float64(f.data.SeedBytes) / float64(bytesRead)
+type FetcherBuilder struct {
 }
 
-type fetcherData struct {
-	Progress  fetcher.Progress
-	SeedBytes int64
-	// SeedTime is the time in seconds to seed after downloading is complete.
-	SeedTime int64
+var schemes = []string{"FILE", "MAGNET", "APPLICATION/X-BITTORRENT"}
+
+func (fb *FetcherBuilder) Schemes() []string {
+	return schemes
 }
 
-func closeClient() error {
-	lock.Lock()
-	defer lock.Unlock()
-
-	if closeFunc != nil {
-		closeFunc()
-	}
-	if client != nil {
-		errs := client.Close()
-		if len(errs) > 0 {
-			return errs[0]
-		}
-		client = nil
-		closeCtx = nil
-		closeFunc = nil
-	}
-	return nil
-}
-
-type FetcherManager struct {
-}
-
-func (fm *FetcherManager) Name() string {
-	return "bt"
-}
-
-func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
-	return []*fetcher.SchemeFilter{
-		{
-			Type:    fetcher.FilterTypeUrl,
-			Pattern: "MAGNET",
-		},
-		{
-			Type:    fetcher.FilterTypeFile,
-			Pattern: "TORRENT",
-		},
-		{
-			Type:    fetcher.FilterTypeBase64,
-			Pattern: "APPLICATION/X-BITTORRENT",
-		},
-	}
-}
-
-func (fm *FetcherManager) Build() fetcher.Fetcher {
+func (fb *FetcherBuilder) Build() fetcher.Fetcher {
 	return &Fetcher{}
 }
 
-func (fm *FetcherManager) DefaultConfig() any {
-	return &config{
-		ListenPort: 0,
-		Trackers:   []string{},
-		SeedKeep:   false,
-		SeedRatio:  1.0,
-		SeedTime:   120 * 60,
-	}
+func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
+	return nil, nil
 }
 
-func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
-	_f := f.(*Fetcher)
-	return _f.data, nil
-}
-
-func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
-	return &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
+func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
+	return nil, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
 		return &Fetcher{
 			meta: meta,
-			data: v.(*fetcherData),
 		}
 	}
 }
 
-func (fm *FetcherManager) Close() error {
-	return closeClient()
-}
-
 // parse version to bep20 format, fixed length 4, if not enough, fill 0
 func parseBep20() string {
 	s := strings.ReplaceAll(base.Version, ".", "")

internal/protocol/bt/fetcher_test.go

@@ -100,26 +100,24 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 }
 
 func buildFetcher() fetcher.Fetcher {
-	fb := new(FetcherManager)
-	fetcher := fb.Build()
-	newController := controller.NewController()
-	newController.GetConfig = func(v any) {
-		json.Unmarshal([]byte(test.ToJson(fb.DefaultConfig())), v)
-	}
-	fetcher.Setup(newController)
+	fetcher := new(FetcherBuilder).Build()
+	fetcher.Setup(controller.NewController())
 	return fetcher
 }
 
 func buildConfigFetcher(proxyConfig *base.DownloaderProxyConfig) fetcher.Fetcher {
-	fetcher := new(FetcherManager).Build()
+	fetcher := new(FetcherBuilder).Build()
 	newController := controller.NewController()
 	mockCfg := config{
 		Trackers: []string{
 			"udp://tracker.birkenwald.de:6969/announce",
 			"udp://tracker.bitsearch.to:1337/announce",
 		}}
-	newController.GetConfig = func(v any) {
-		json.Unmarshal([]byte(test.ToJson(mockCfg)), v)
+	newController.GetConfig = func(v any) bool {
+		if err := json.Unmarshal([]byte(test.ToJson(mockCfg)), v); err != nil {
+			return false
+		}
+		return true
 	}
 	newController.ProxyConfig = proxyConfig
 	fetcher.Setup(newController)

internal/protocol/http/fetcher.go

@@ -5,6 +5,12 @@ 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"
+	"github.com/xiaoqidun/setft"
+	"golang.org/x/sync/errgroup"
 	"io"
 	"mime"
 	"net/http"
@@ -15,13 +21,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 +64,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
 }
 
@@ -377,8 +386,7 @@ func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq
 		method string
 		body   io.Reader
 	)
-
-	headers := http.Header{}
+	headers := make(map[string][]string)
 	if req.Extra == nil {
 		method = http.MethodGet
 	} else {
@@ -390,7 +398,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 +406,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 {
@@ -457,48 +466,30 @@ type fetcherData struct {
 	Chunks []*chunk
 }
 
-type FetcherManager struct {
+type FetcherBuilder struct {
 }
 
-func (fm *FetcherManager) Name() string {
-	return "http"
+var schemes = []string{"HTTP", "HTTPS"}
+
+func (fb *FetcherBuilder) Schemes() []string {
+	return schemes
 }
 
-func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
-	return []*fetcher.SchemeFilter{
-		{
-			Type:    fetcher.FilterTypeUrl,
-			Pattern: "HTTP",
-		},
-		{
-			Type:    fetcher.FilterTypeUrl,
-			Pattern: "HTTPS",
-		},
-	}
-}
-
-func (fm *FetcherManager) Build() fetcher.Fetcher {
+func (fb *FetcherBuilder) Build() fetcher.Fetcher {
 	return &Fetcher{}
 }
 
-func (fm *FetcherManager) DefaultConfig() any {
-	return &config{
-		UserAgent:   "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
-		Connections: 16,
-	}
-}
-
-func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
+func (fb *FetcherBuilder) 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 +500,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

@@ -306,7 +306,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 {
@@ -359,21 +359,19 @@ func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t
 }
 
 func buildFetcher() *Fetcher {
-	fb := new(FetcherManager)
-	fetcher := fb.Build()
-	newController := controller.NewController()
-	newController.GetConfig = func(v any) {
-		json.Unmarshal([]byte(test.ToJson(fb.DefaultConfig())), v)
-	}
-	fetcher.Setup(newController)
+	fetcher := new(FetcherBuilder).Build()
+	fetcher.Setup(controller.NewController())
 	return fetcher.(*Fetcher)
 }
 
 func buildConfigFetcher(cfg config) fetcher.Fetcher {
-	fetcher := new(FetcherManager).Build()
+	fetcher := new(FetcherBuilder).Build()
 	newController := controller.NewController()
-	newController.GetConfig = func(v any) {
-		json.Unmarshal([]byte(test.ToJson(cfg)), v)
+	newController.GetConfig = func(v any) bool {
+		if err := json.Unmarshal([]byte(test.ToJson(cfg)), v); err != nil {
+			return false
+		}
+		return true
 	}
 	fetcher.Setup(newController)
 	return fetcher

internal/test/httptest.go

@@ -2,12 +2,12 @@ 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"

pkg/base/model.go

@@ -94,9 +94,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,
@@ -150,37 +147,12 @@ 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

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

@@ -42,29 +42,25 @@ var (
 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
-	fetcherCache map[string]fetcher.Fetcher
-	storage      Storage
-	tasks        []*Task
-	waitTasks    []*Task
-	watchedTasks sync.Map
-	listener     Listener
+	cfg             *DownloaderConfig
+	fetcherBuilders map[string]fetcher.FetcherBuilder
+	fetcherCache    map[string]fetcher.Fetcher
+	storage         Storage
+	tasks           []*Task
+	waitTasks       []*Task
+	listener        Listener
 
 	lock               *sync.Mutex
 	fetcherMapLock     *sync.RWMutex
@@ -81,10 +77,11 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
 	cfg.Init()
 
 	d := &Downloader{
-		cfg:          cfg,
-		fetcherCache: make(map[string]fetcher.Fetcher),
-		waitTasks:    make([]*Task, 0),
-		storage:      cfg.Storage,
+		cfg:             cfg,
+		fetcherBuilders: make(map[string]fetcher.FetcherBuilder),
+		fetcherCache:    make(map[string]fetcher.Fetcher),
+		waitTasks:       make([]*Task, 0),
+		storage:         cfg.Storage,
 
 		lock:               &sync.Mutex{},
 		fetcherMapLock:     &sync.RWMutex{},
@@ -92,6 +89,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"))
@@ -122,14 +124,11 @@ func (d *Downloader) Setup() error {
 	}
 	// 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()
-		}
-	}
+	for _, fb := range d.fetcherBuilders {
+		f := fb.Build()
+		d.setupFetcher(f)
 
+	}
 	// load tasks from storage
 	var tasks []*Task
 	if err = d.storage.List(bucketTask, &tasks); err != nil {
@@ -167,22 +166,6 @@ 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() {
@@ -191,31 +174,22 @@ func (d *Downloader) Setup() error {
 					func() {
 						task.statusLock.Lock()
 						defer task.statusLock.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
-						if task.Status == base.DownloadStatusRunning {
-							task.Progress.Used = task.timer.Used()
-							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
-						}
+						task.Progress.Used = task.timer.Used()
+						task.Progress.Speed = task.calcSpeed(current-task.Progress.Downloaded, float64(d.cfg.RefreshInterval)/1000)
+						task.Progress.Downloaded = current
 						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,21 +211,19 @@ func (d *Downloader) Setup() error {
 	return nil
 }
 
-func (d *Downloader) parseFm(url string) (fetcher.FetcherManager, error) {
-	for _, fm := range d.cfg.FetchManagers {
-		for _, filter := range fm.Filters() {
-			if filter.Match(url) {
-				return fm, nil
-			}
-		}
+func (d *Downloader) parseFb(url string) (fetcher.FetcherBuilder, error) {
+	schema := util.ParseSchema(url)
+	fetchBuilder, ok := d.fetcherBuilders[schema]
+	if ok {
+		return fetchBuilder, nil
 	}
 	return nil, ErrUnSupportedProtocol
 }
 
-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) {
-		d.getProtocolConfig(fm.Name(), v)
+	ctl.GetConfig = func(v any) bool {
+		return d.getProtocolConfig(fetcher.Name(), v)
 	}
 	ctl.ProxyConfig = d.cfg.Proxy
 	fetcher.Setup(ctl)
@@ -329,18 +301,6 @@ 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) {
 	d.fetcherMapLock.RLock()
 	fetcher, ok := d.fetcherCache[rrId]
@@ -492,10 +452,8 @@ func (d *Downloader) DeleteByStatues(statues []base.Status, force bool) (err err
 	}
 
 	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()
@@ -517,7 +475,7 @@ func (d *Downloader) DeleteByStatues(statues []base.Status, force bool) (err err
 		}
 	}()
 
-	for _, task := range deleteTasksPtr {
+	for _, task := range deleteTasks {
 		err = d.doDelete(task, force)
 		if err != nil {
 			return
@@ -533,17 +491,6 @@ func (d *Downloader) Stats(id string) (sr any, err error) {
 	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
 }
@@ -589,23 +536,10 @@ func (d *Downloader) doDelete(task *Task, force bool) (err error) {
 
 func (d *Downloader) Close() error {
 	d.closed.Store(true)
-
-	closeArr := []func() error{
-		d.PauseAll,
-		d.storage.Close,
+	if err := d.PauseAll(); err != nil {
+		return err
 	}
-	for _, fm := range d.cfg.FetchManagers {
-		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
+	return d.storage.Close()
 }
 
 func (d *Downloader) Clear() error {
@@ -695,38 +629,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,51 +683,46 @@ 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 {
-	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) {
+func (d *Downloader) doCreate(fetcher fetcher.Fetcher, opts *base.Options) (taskId string, err error) {
 	if opts == nil {
 		opts = &base.Options{}
 	}
@@ -833,7 +730,7 @@ func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options) (taskId str
 		opts.SelectFiles = make([]int, 0)
 	}
 
-	meta := f.Meta()
+	meta := fetcher.Meta()
 	meta.Opts = opts
 	if opts.Path == "" {
 		storeConfig, err := d.GetConfig()
@@ -843,20 +740,19 @@ 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.fetcher = f
-	task.Protocol = fm.Name()
-	task.Meta = f.Meta()
+	task.fetcherBuilder = fb
+	task.fetcher = fetcher
+	task.Protocol = fetcher.Name()
+	task.Meta = fetcher.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 {
@@ -899,7 +795,7 @@ func (d *Downloader) doStart(task *Task) (err error) {
 			return
 		}
 
-		err = d.restoreTask(task)
+		err = d.restoreFetcher(task)
 		if err != nil {
 			d.Logger.Error().Stack().Err(err).Msgf("restore fetcher failed, task id: %s", task.ID)
 			return
@@ -959,10 +855,10 @@ 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)
@@ -1032,12 +928,12 @@ 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()
-	d.setupFetcher(fm, fetcher)
+	fetcher := fb.Build()
+	d.setupFetcher(fetcher)
 	return fetcher, nil
 }
 
@@ -1047,7 +943,6 @@ func initTask(task *Task) {
 	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

@@ -5,8 +5,6 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/http"
 	"os"
-	"strconv"
-	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -86,77 +84,6 @@ 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 {
@@ -380,8 +307,8 @@ func TestDownloader_Protocol_Config(t *testing.T) {
 
 	var httpCfg map[string]any
 	exits := downloader.getProtocolConfig("http", &httpCfg)
-	if !exits {
-		t.Errorf("getProtocolConfig() got = %v, want %v", exits, true)
+	if exits {
+		t.Errorf("getProtocolConfig() got = %v, want %v", exits, false)
 	}
 
 	storeCfg := &base.DownloaderStoreConfig{

pkg/download/engine/engine.go

@@ -145,10 +145,6 @@ func NewEngine(cfg *Config) *Engine {
 		if err := runtime.Set("global", runtime.GlobalObject()); err != nil {
 			return
 		}
-		// polyfill window
-		if err := runtime.Set("window", runtime.GlobalObject()); err != nil {
-			return
-		}
 		// polyfill window.location
 		if _, err := runtime.RunString("global.location = new URL('http://localhost');"); err != nil {
 			return
@@ -178,15 +174,7 @@ func resolveResult(value goja.Value) (any, error) {
 			if err, ok := p.Result().Export().(error); ok {
 				return nil, err
 			} else {
-				stack := p.Result().String()
-				result := p.Result()
-				if ro, ok := result.(*goja.Object); ok {
-					stackVal := ro.Get("stack")
-					if stackVal != nil && stackVal.String() != "" {
-						stack = stackVal.String()
-					}
-				}
-				return nil, errors.New(stack)
+				return nil, errors.New(p.Result().String())
 			}
 		}
 	}

pkg/download/engine/engine_test.go

@@ -6,6 +6,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"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"
 	"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")
@@ -412,15 +328,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 +367,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

@@ -3,18 +3,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 +24,6 @@ const (
 	eventTimeout          = "timeout"
 )
 
-const (
-	redirectError  = "error"
-	redirectFollow = "follow"
-	redirectManual = "manual"
-)
-
 type ProgressEvent struct {
 	Type             string `json:"type"`
 	LengthComputable bool   `json:"lengthComputable"`
@@ -126,26 +118,18 @@ type XMLHttpRequestUpload struct {
 type XMLHttpRequest struct {
 	method          string
 	url             string
-	requestHeaders  http.Header
-	responseHeaders http.Header
+	requestHeaders  map[string]string
+	responseHeaders map[string]string
 	aborted         bool
 	proxyHandler    func(r *http.Request) (*url.URL, error)
 
-	WithCredentials bool                  `json:"withCredentials"`
-	Upload          *XMLHttpRequestUpload `json:"upload"`
-	Timeout         int                   `json:"timeout"`
-	ReadyState      int                   `json:"readyState"`
-	Status          int                   `json:"status"`
-	StatusText      string                `json:"statusText"`
-	Response        string                `json:"response"`
-	ResponseText    string                `json:"responseText"`
-	// https://developer.mozilla.org/zh-CN/docs/Web/API/XMLHttpRequest/responseURL
-	// https://xhr.spec.whatwg.org/#the-responseurl-attribute
-	ResponseUrl string `json:"responseURL"`
-	// extend fetch redirect
-	// https://developer.mozilla.org/en-US/docs/Web/API/RequestInit#redirect
-	// https://fetch.spec.whatwg.org/#concept-request-redirect-mode
-	Redirect string `json:"redirect"`
+	Upload       *XMLHttpRequestUpload `json:"upload"`
+	Timeout      int                   `json:"timeout"`
+	ReadyState   int                   `json:"readyState"`
+	Status       int                   `json:"status"`
+	StatusText   string                `json:"statusText"`
+	Response     string                `json:"response"`
+	ResponseText string                `json:"responseText"`
 	*EventProp
 	Onreadystatechange func(event *ProgressEvent) `json:"onreadystatechange"`
 }
@@ -153,13 +137,13 @@ type XMLHttpRequest struct {
 func (xhr *XMLHttpRequest) Open(method, url string) {
 	xhr.method = method
 	xhr.url = url
-	xhr.requestHeaders = make(http.Header)
-	xhr.responseHeaders = make(http.Header)
+	xhr.requestHeaders = make(map[string]string)
+	xhr.responseHeaders = make(map[string]string)
 	xhr.doReadystatechange(1)
 }
 
 func (xhr *XMLHttpRequest) SetRequestHeader(key, value string) {
-	xhr.requestHeaders.Add(key, value)
+	xhr.requestHeaders[key] = value
 }
 
 func (xhr *XMLHttpRequest) Send(data goja.Value) {
@@ -169,33 +153,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))
-			isStringBody = true
+			contentLength = int64(len(d.(string)))
 		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,32 +194,21 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
 		xhr.callOnerror()
 		return
 	}
-	req.Header = xhr.requestHeaders
-	// Only string body can specify Content-Type header by user
-	if contentType != "" && (!isStringBody || req.Header.Get("Content-Type") == "") {
+	if contentType != "" {
 		req.Header.Set("Content-Type", contentType)
 	}
 	if contentLength > 0 {
 		req.ContentLength = contentLength
 	}
+	for k, v := range xhr.requestHeaders {
+		req.Header.Set(k, v)
+	}
 	transport := &http.Transport{
 		Proxy: xhr.proxyHandler,
 	}
 	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 {
@@ -259,12 +230,9 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
 	if !xhr.aborted {
 		xhr.Upload.callOnload()
 	}
-
-	responseUrl := resp.Request.URL
-	responseUrl.Fragment = ""
-	xhr.ResponseUrl = responseUrl.String()
-
-	xhr.responseHeaders = resp.Header
+	for k, v := range resp.Header {
+		xhr.responseHeaders[k] = v[0]
+	}
 	xhr.Status = resp.StatusCode
 	xhr.StatusText = resp.Status
 	xhr.doReadystatechange(2)
@@ -293,7 +261,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 +269,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()
@@ -419,9 +387,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 +398,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",
-    "postinstall": "patch-package"
+    "build": "webpack --mode production"
   },
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "patch-package": "^8.0.0",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
   },
   "dependencies": {
     "blob-polyfill": "^7.0.20220408",
-    "fastestsmallesttextencoderdecoder": "^1.0.22",
-    "whatwg-fetch": "^3.6.20"
+    "whatwg-fetch": "^3.6.2"
   }
 }

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 err
-	}
-	if err = d.storage.Delete(bucketExtensionStorage, identity); err != nil {
-		return err
-	}
-	return nil
+	return d.storage.Delete(bucketExtension, identity)
 }
 
 func (d *Downloader) GetExtensions() []*Extension {

pkg/download/model.go

@@ -19,21 +19,19 @@ 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"`
+	Protocol  string               `json:"protocol"`
 	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 +55,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 {
-	speedArr = append(speedArr, downloaded)
-	if len(speedArr) > 6 {
-		speedArr = speedArr[1:]
+func (t *Task) calcSpeed(downloaded int64, usedTime float64) int64 {
+	t.speedArr = append(t.speedArr, downloaded)
+	if len(t.speedArr) > 6 {
+		t.speedArr = t.speedArr[1:]
 	}
 	var total int64
-	for _, v := range speedArr {
+	for _, v := range t.speedArr {
 		total += v
 	}
-	return int64(float64(total) / float64(len(speedArr)) / usedTime)
+	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
@@ -96,10 +92,10 @@ func (cfg *DownloaderConfig) Init() *DownloaderConfig {
 	if cfg.Controller == nil {
 		cfg.Controller = controller.NewController()
 	}
-	if len(cfg.FetchManagers) == 0 {
-		cfg.FetchManagers = []fetcher.FetcherManager{
-			new(http.FetcherManager),
-			new(bt.FetcherManager),
+	if len(cfg.FetchBuilders) == 0 {
+		cfg.FetchBuilders = []fetcher.FetcherBuilder{
+			new(http.FetcherBuilder),
+			new(bt.FetcherBuilder),
 		}
 	}
 	if cfg.RefreshInterval == 0 {

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 {
-		bucketData[key] = v
-	}
+	memData[bucket][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"]

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"`
-	Address         string                      `json:"address"`
-	RefreshInterval int                         `json:"refreshInterval"`
-	Storage         Storage                     `json:"storage"`
-	StorageDir      string                      `json:"storageDir"`
-	ApiToken        string                      `json:"apiToken"`
-	DownloadConfig  *base.DownloaderStoreConfig `json:"downloadConfig"`
+	Network         string  `json:"network"`
+	Address         string  `json:"address"`
+	RefreshInterval int     `json:"refreshInterval"`
+	Storage         Storage `json:"storage"`
+	StorageDir      string  `json:"storageDir"`
+	ApiToken        string  `json:"apiToken"`
 
 	ProductionMode bool
 

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"`
-}