Merge branch 'main' into codex/fix-settings-script-path-picker

.agent/skills/gopeed-file-category-icons/SKILL.md

@@ -7,7 +7,7 @@ description: Design or revise Gopeed file-classification icons as one cohesive S
 
 Maintain Gopeed's file-classification visual language and its deterministic SVG → TTF → Flutter `IconData` pipeline.
 
-The canonical editable materials live in `design/file-category-icons/` as tooling-only sources inside the Flutter project. Read its `README.md` before changing any source. Do not add that directory to Flutter assets.
+The canonical editable materials live in `design/file-category-icons/`, outside the Flutter project. Read its `README.md` before changing any source. Do not add that directory to Flutter assets.
 
 ## Classification grammar
 
@@ -49,7 +49,7 @@ Use [assets/manifest.example.json](assets/manifest.example.json) and [assets/fol
 ## Invariants
 
 - Existing codepoints are API: never renumber or reuse one unless the user explicitly approves a breaking migration.
-- `design/file-category-icons/` is the sole editable source of truth. The packaged Flutter runtime uses only the generated TTF and Dart constants.
+- `design/file-category-icons/` is the sole editable source of truth. Flutter keeps only the generated runtime TTF and Dart constants.
 - Never add the design-material directory to `pubspec.yaml`; it must remain outside the packaged Flutter asset graph.
 - The manifest is the source of truth. Do not hand-edit generated Dart constants or patch the binary font.
 - Keep icon names lowercase `snake_case`; the generator emits lowerCamelCase Dart fields.

.gitattributes

@@ -1,2 +0,0 @@
-# Keep upstream plugin sources recognizable and collapsed in GitHub reviews.
-ui/flutter/third_party/** linguist-vendored whitespace=-blank-at-eol,-blank-at-eof

.github/workflows/build.yml

@@ -106,32 +106,17 @@ jobs:
           if ("${{ matrix.arch }}" -eq "amd64") {
               # for amd64
               $release = "build\windows\x64\runner\Release\"
-              # Use the same toolchain as cgo instead of Git's bundled DLLs.
+              $mingw = "C:\Program Files\Git\mingw64\bin"
-              $cc = (Get-Command -Name (go env CC) -CommandType Application -ErrorAction Stop | Select-Object -First 1).Source
+              cp $mingw\libstdc++-6.dll $release
-              foreach ($dll in @("libstdc++-6.dll", "libgcc_s_seh-1.dll", "libwinpthread-1.dll")) {
+              cp $mingw\libgcc_s_seh-1.dll $release
-                  $runtimePath = [string](& $cc "-print-file-name=$dll")
-                  if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($runtimePath)) {
-                      throw "Failed to locate $dll using $cc"
-                  }
-                  $runtimePath = $runtimePath.Trim()
-                  # Some MinGW distributions keep runtime DLLs beside gcc.exe.
-                  if ($runtimePath -eq $dll) {
-                      $runtimePath = Join-Path (Split-Path -Parent $cc) $dll
-                  }
-                  if (!(Test-Path -LiteralPath $runtimePath -PathType Leaf)) {
-                      throw "MinGW runtime $dll was not found by $cc (reported path: $runtimePath)"
-                  }
-                  Write-Host "Copying MinGW runtime: $runtimePath"
-                  Copy-Item -LiteralPath $runtimePath -Destination $release
-              }
           } else {
               # for ARM64
               $release = "build\windows\arm64\runner\Release\"
               $mingw = "$env:CLANGARM64_ROOT\aarch64-w64-mingw32\bin"
               cp $mingw\libc++.dll $release
               cp $mingw\libunwind.dll $release
-              cp $mingw\libwinpthread-1.dll $release
           }
+          cp $mingw\libwinpthread-1.dll $release
           cp $system\msvcp140.dll $release
           cp $system\vcruntime140.dll $release
           cp $system\vcruntime140_1.dll $release

.github/workflows/test.yml

@@ -69,23 +69,6 @@ jobs:
         with:
           files: ./coverage.txt
           token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
-  test-flutter-category:
-    # The settings editor and the backend have to read an extension list the
-    # same way, so both sides run the shared rule table. The Go side is covered
-    # by the test job above, this runs the ui side of it.
-    name: Test shared category rules
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-      - name: Run the shared category rule table on the ui side
-        working-directory: ui/flutter
-        run: |
-          flutter pub get
-          flutter gen-l10n
-          flutter test test/api/downloader_config_test.dart
   test-webview-integration:
     name: Test webview integration (${{ matrix.name }})
     strategy:
@@ -94,8 +77,6 @@ jobs:
         include:
           - name: Windows
             os: windows-latest
-          - name: Linux
-            os: ubuntu-latest
           - name: macOS
             os: macos-latest
     runs-on: ${{ matrix.os }}
@@ -108,25 +89,9 @@ jobs:
         if: runner.os == 'macOS'
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
-      - name: Install Linux WebView dependencies
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev xvfb
-      - name: Test webview
-        if: runner.os == 'Linux'
-        # Match the full suite's coverage instrumentation and repeat on the same
-        # GTK event loop to catch queued callbacks after engine destruction.
-        run: |
-          PACKAGES=$(go list ./... | awk '!/\/bind\// && (!/\/cmd\// || /\/cmd\/web$/)')
-          go test -c -tags webview -coverpkg=$(echo "$PACKAGES" | paste -sd "," -) -covermode=count -o "$RUNNER_TEMP/goprovider.test" ./internal/webview/goprovider
-          xvfb-run -a "$RUNNER_TEMP/goprovider.test" -test.v -test.count=5 -test.timeout=300s -test.coverprofile="$RUNNER_TEMP/webview-coverage.out"
-        env:
-          CGO_ENABLED: 1
       - name: Test webview
         if: runner.os == 'Windows'
-        # Repeat close/reopen coverage to catch browser shutdown races.
+        run: go test -tags webview -v -count=1 -timeout 300s ./internal/webview/goprovider/
-        run: go test -tags webview -v -count=3 -timeout 300s ./internal/webview/goprovider/
         env:
           CGO_ENABLED: 1
       - name: Test webview

README.md

@@ -63,7 +63,7 @@ Connect Gopeed to an AI agent and manage downloads with natural language. For ex
 
 Gopeed 2.0.0 is currently in public beta, introducing a redesigned interface, a native communication architecture that connects desktop and mobile clients directly to the Go core through FFI, a more consistent cross-platform experience, improved task management, more flexible API support, and MCP-based AI agent integration. Some features may still be incomplete or unstable, so please try it and report any issues you encounter.
 
-- [Download Gopeed 2.0.0 Beta 3](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.3)
+- [Download Gopeed 2.0.0 Beta 1](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.1)
 
 Once the features and stability meet our release standards, we will publish the official Gopeed 2.0.0 release. Beta users will be able to upgrade directly to the final release, while existing stable users will not be automatically moved onto the beta channel.
 

README_ja-JP.md

@@ -63,7 +63,7 @@ Gopeed を AI Agent と連携すると、自然言語でダウンロードを管
 
 Gopeed 2.0.0 は現在パブリックベータ版です。刷新されたインターフェース、デスクトップおよびモバイルから FFI で Go コアへ直接接続するネイティブ通信アーキテクチャ、より統一されたクロスプラットフォーム体験、強化されたタスク管理、より柔軟な API、MCP による AI Agent 連携機能を導入しています。一部の機能はまだ不完全または不安定な場合がありますので、ぜひお試しいただき、問題があればフィードバックをお寄せください。
 
-- [Gopeed 2.0.0 Beta 3 をダウンロード](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.3)
+- [Gopeed 2.0.0 Beta 1 をダウンロード](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.1)
 
 機能と安定性が正式リリースの基準に達した時点で、Gopeed 2.0.0 正式版を公開します。ベータ版のユーザーは正式版へ直接アップデートできます。既存の安定版ユーザーが自動的にベータチャンネルへ移行することはありません。
 

README_vi-VN.md

@@ -63,7 +63,7 @@ Sau khi kết nối Gopeed với AI Agent, bạn có thể quản lý tải xu
 
 Gopeed 2.0.0 hiện đang trong giai đoạn beta công khai, với giao diện được thiết kế lại, kiến trúc giao tiếp native kết nối trực tiếp ứng dụng desktop và di động với lõi Go qua FFI, trải nghiệm đa nền tảng nhất quán hơn, khả năng quản lý tác vụ được cải thiện, API linh hoạt hơn và khả năng tích hợp AI Agent qua MCP. Một số tính năng có thể vẫn chưa hoàn thiện hoặc chưa ổn định, vì vậy hãy dùng thử và gửi phản hồi nếu bạn gặp vấn đề.
 
-- [Tải Gopeed 2.0.0 Beta 3](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.3)
+- [Tải Gopeed 2.0.0 Beta 1](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.1)
 
 Khi các tính năng và độ ổn định đáp ứng tiêu chuẩn phát hành, chúng tôi sẽ phát hành Gopeed 2.0.0 chính thức. Người dùng bản beta có thể nâng cấp trực tiếp lên bản chính thức, trong khi người dùng bản ổn định hiện tại sẽ không tự động được chuyển sang kênh beta.
 

README_zh-CN.md

@@ -63,7 +63,7 @@ Gopeed（全称 **Go Speed**，也叫“够快下载器”）是一款使用 Go
 
 Gopeed 2.0.0 目前处于公开 Beta 测试阶段，引入了全新界面、通过 FFI 直连 Go 核心的原生通信架构、更一致的跨平台体验、更完善的任务管理、更灵活的 API，以及用于 AI Agent 接入的 MCP 能力。部分功能仍可能不够完善或稳定，欢迎提前体验并向我们反馈问题。
 
-- [下载 Gopeed 2.0.0 Beta 3](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.3)
+- [下载 Gopeed 2.0.0 Beta 1](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.1)
 
 当功能完整度和稳定性达到正式发布标准后，我们会发布 Gopeed 2.0.0 正式版。已安装 Beta 版本的用户可以直接升级到最终正式版，现有稳定版用户则不会被自动切换到 Beta 渠道。
 

README_zh-TW.md

@@ -63,7 +63,7 @@ Gopeed（**Go Speed** 的縮寫）是一款以 Go 與 Flutter 開發的高速、
 
 Gopeed 2.0.0 目前處於公開 Beta 測試階段，引入了全新介面、透過 FFI 直連 Go 核心的原生通訊架構、更一致的跨平台體驗、更完善的任務管理、更靈活的 API，以及透過 MCP 串接 AI Agent 的能力。部分功能仍可能不夠完善或穩定，歡迎搶先體驗並向我們回報問題。
 
-- [下載 Gopeed 2.0.0 Beta 3](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.3)
+- [下載 Gopeed 2.0.0 Beta 1](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.1)
 
 當功能完整度與穩定性達到正式發布標準後，我們會發布 Gopeed 2.0.0 正式版。已安裝 Beta 版本的使用者可以直接升級至最終正式版，現有穩定版使用者則不會被自動切換至 Beta 頻道。
 

bind/mobile/main.go

@@ -7,7 +7,6 @@ import (
 
 	nativebridge "github.com/GopeedLab/gopeed/bind/native"
 	"github.com/GopeedLab/gopeed/internal/webview/rpcprovider"
-	goapi "github.com/GopeedLab/gopeed/pkg/api"
 	"github.com/GopeedLab/gopeed/pkg/rest"
 	"github.com/GopeedLab/gopeed/pkg/rest/model"
 )
@@ -91,14 +90,3 @@ func applyWebViewProvider(config *model.StartConfig) {
 	}
 	config.WebViewProvider = rpcprovider.New(*config.WebViewRPCConfig)
 }
-
-func LiveActivityTaskEventMask() int64 {
-	return int64(
-		goapi.TaskEventDone |
-			goapi.TaskEventError |
-			goapi.TaskEventStart |
-			goapi.TaskEventProgress |
-			goapi.TaskEventPause |
-			goapi.TaskEventDelete,
-	)
-}

cmd/extmock/main.go

@@ -166,7 +166,7 @@ func runResolve(args []string) error {
 	result, err := d.Resolve(&base.Request{
 		URL:    url,
 		Labels: map[string]string(labels),
-	})
+	}, nil)
 	if err != nil {
 		return err
 	}
@@ -250,7 +250,7 @@ func runDownload(args []string) error {
 	result, err := d.Resolve(&base.Request{
 		URL:    url,
 		Labels: map[string]string(labels),
-	})
+	}, nil)
 	if err != nil {
 		return err
 	}

cmd/gopeed/flags.go

@@ -7,11 +7,9 @@ import (
 )
 
 type args struct {
-	url          string
+	url         string
-	connections  *int
+	connections *int
-	dir          *string
+	dir         *string
-	checksum     *string
-	checksumAlgo *string
 }
 
 func parse() *args {
@@ -22,8 +20,6 @@ func parse() *args {
 	var args args
 	args.connections = flag.Int("C", 16, "Concurrent connections.")
 	args.dir = flag.String("D", dir, "Store directory.")
-	args.checksum = flag.String("checksum", "", "Expected checksum hash (hex encoded).")
-	args.checksumAlgo = flag.String("checksum-algo", "md5", "Checksum algorithm: md5, sha1, or sha256.")
 	flag.Parse()
 	t := flag.Args()
 	if len(t) > 0 {

cmd/gopeed/main.go

@@ -19,18 +19,6 @@ func main() {
 
 	var wg sync.WaitGroup
 	wg.Add(1)
-	var checksumOpt *http.ChecksumOption
-	if args.checksum != nil && *args.checksum != "" {
-		algo := "md5"
-		if args.checksumAlgo != nil && *args.checksumAlgo != "" {
-			algo = *args.checksumAlgo
-		}
-		checksumOpt = &http.ChecksumOption{
-			Algorithm: algo,
-			Expected:  *args.checksum,
-		}
-	}
-
 	_, err := download.Boot().
 		URL(args.url).
 		Listener(func(event *download.Event) {
@@ -55,11 +43,8 @@ func main() {
 			}
 		}).
 		Create(&base.Options{
-			Path: *args.dir,
+			Path:  *args.dir,
-			Extra: http.OptsExtra{
+			Extra: http.OptsExtra{Connections: *args.connections},
-				Connections: *args.connections,
-				Checksum:    checksumOpt,
-			},
 		})
 	if err != nil {
 		panic(err)

cmd/server.go

@@ -26,7 +26,7 @@ func Start(cfg *model.StartConfig) {
 	if err != nil {
 		panic(err)
 	}
-	if rest.Downloader.IsFirstLoad() {
+	if downloadCfg.FirstLoad {
 		// Set default download config
 		if cfg.DownloadConfig != nil {
 			cfg.DownloadConfig.Merge(downloadCfg)
@@ -51,12 +51,6 @@ func Start(cfg *model.StartConfig) {
 				rest.Downloader.PutConfig(downloadCfg)
 			}
 		}
-
-		// The default download dir is resolved only after the core starts, so
-		// seed the built-in categories now that the dir is known. Init is
-		// idempotent and leaves an existing category list untouched.
-		downloadCfg.Init()
-		rest.Downloader.PutConfig(downloadCfg)
 	}
 	watchExit()
 

cmd/updater/updater_windows.go

@@ -37,17 +37,15 @@ func installByInstaller(killSignalChan chan<- any, packagePath, destDir string)
 	}
 	defer reader.Close()
 
+	// Find the installer file
 	var installerPath string
 	for _, file := range reader.File {
-		cleanName := filepath.Clean(file.Name)
-		if strings.HasPrefix(cleanName, "..") || filepath.IsAbs(cleanName) {
-			continue
-		}
 		if file.FileInfo().IsDir() {
 			continue
 		}
 
-		path := filepath.Join(tempDir, cleanName)
+		// Extract file
+		path := filepath.Join(tempDir, file.Name)
 
 		if err := os.MkdirAll(filepath.Dir(path), os.ModePerm); err != nil {
 			return err
@@ -103,11 +101,7 @@ func installByPortable(killSignalChan chan<- any, packagePath, destDir string) e
 	defer reader.Close()
 
 	for _, file := range reader.File {
-		cleanName := filepath.Clean(file.Name)
+		path := filepath.Join(destDir, file.Name)
-		if strings.HasPrefix(cleanName, "..") || filepath.IsAbs(cleanName) {
-			continue
-		}
-		path := filepath.Join(destDir, cleanName)
 
 		if file.FileInfo().IsDir() {
 			os.MkdirAll(path, file.Mode())

cmd/web/flags.go

@@ -13,7 +13,6 @@ import (
 )
 
 type args struct {
-	TempDir           *string  `json:"tempDir"`
 	Address           *string  `json:"address"`
 	Port              *int     `json:"port"`
 	Username          *string  `json:"username"`
@@ -55,7 +54,6 @@ func loadCliArgs() *args {
 	cfg.ApiToken = flag.String("T", "", "API token, it must be configured when using HTTP API in the case of enabling web authentication")
 	flag.StringVar(cfg.ApiToken, "api-token", "", "API token, it must be configured when using HTTP API in the case of enabling web authentication")
 	flag.BoolVar(&cfg.MCPEnable, "mcp-enable", false, "Enable MCP endpoint")
-	cfg.TempDir = flag.String("temp-dir", "", "Temporary directory (defaults to the OS temporary directory)")
 	cfg.StorageDir = flag.String("d", "", "Storage directory")
 	flag.StringVar(cfg.StorageDir, "storage-dir", "", "Storage directory")
 	whiteDownloadDirs := flag.String("white-download-dirs", "", "White download directories, comma-separated")
@@ -91,8 +89,6 @@ func overrideWithCliArgs(cfg *args, cliConfig *args) {
 			cfg.ApiToken = cliConfig.ApiToken
 		case "mcp-enable":
 			cfg.MCPEnable = cliConfig.MCPEnable
-		case "temp-dir":
-			cfg.TempDir = cliConfig.TempDir
 		case "d", "storage-dir":
 			cfg.StorageDir = cliConfig.StorageDir
 		case "white-download-dirs":
@@ -105,9 +101,6 @@ func overrideWithCliArgs(cfg *args, cliConfig *args) {
 
 // setDefaults sets default values for any unset configuration fields
 func setDefaults(cfg *args, cliConfig *args) {
-	if cfg.TempDir == nil {
-		cfg.TempDir = cliConfig.TempDir
-	}
 	if cfg.Address == nil {
 		cfg.Address = cliConfig.Address
 	}

cmd/web/main.go

@@ -43,16 +43,11 @@ func main() {
 		storageDir = filepath.Join(filepath.Dir(exe), "storage")
 	}
 
-	tempDir := ""
-	if args.TempDir != nil {
-		tempDir = *args.TempDir
-	}
 	cfg := &model.StartConfig{
 		Network:           "tcp",
 		Address:           fmt.Sprintf("%s:%d", *args.Address, *args.Port),
 		Storage:           model.StorageBolt,
 		StorageDir:        storageDir,
-		TempDir:           tempDir,
 		WhiteDownloadDirs: args.WhiteDownloadDirs,
 		ApiToken:          *args.ApiToken,
 		MCPEnable:         args.MCPEnable,

design/file-category-icons/README.md

@@ -1,6 +1,6 @@
 # 文件分类图标源物料
 
-此目录是 Gopeed 文件分类图标的唯一源物料目录。它位于 Flutter 工程内，但只用于设计和生成流程，不得加入 `pubspec.yaml` 的 `assets` 配置。
+此目录是 Gopeed 文件分类图标的唯一源物料目录，位于 Flutter 工程之外，不得加入 `ui/flutter/pubspec.yaml` 的 `assets` 配置。
 
 ## 维护限制
 
@@ -17,8 +17,8 @@
 
 ## 生成产物
 
-- Flutter 字体：`assets/fonts/GopeedIcons.ttf`
+- Flutter 字体：`ui/flutter/assets/fonts/GopeedIcons.ttf`
-- Flutter 常量：`lib/core/icons/gopeed_icons.dart`
+- Flutter 常量：`ui/flutter/lib/core/icons/gopeed_icons.dart`
 
 所有修改都应遵循：
 

design/file-category-icons/manifest.json

@@ -1,7 +1,7 @@
 {
   "fontFamily": "GopeedIcons",
-  "fontOutput": "../../assets/fonts/GopeedIcons.ttf",
+  "fontOutput": "../../ui/flutter/assets/fonts/GopeedIcons.ttf",
-  "dartOutput": "../../lib/core/icons/gopeed_icons.dart",
+  "dartOutput": "../../ui/flutter/lib/core/icons/gopeed_icons.dart",
   "previewOutput": "preview/gopeed_icons_preview.png",
   "dartClass": "GopeedIcons",
   "codepointStart": "0xE900",

go.mod

@@ -3,15 +3,13 @@ module github.com/GopeedLab/gopeed
 go 1.25.4
 
 require (
-	codeberg.org/gruf/go-ffmpreg v0.6.23-0.20260827095416-df1836cb5be0
+	github.com/GopeedLab/webview_go v0.0.0-20260423085439-7a2f88b6e9b5
-	github.com/GopeedLab/webview_go v0.0.0-20260918010912-0d4c27bb7914
 	github.com/anacrolix/torrent v1.60.1-0.20251217073903-486bcbe758e0
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
 	github.com/bodgit/sevenzip v1.6.1
 	github.com/dop251/goja v0.0.0-20260106131823-651366fbe6e3
 	github.com/dop251/goja_nodejs v0.0.0-20240728170619-29b559befffc
 	github.com/go-git/go-git/v5 v5.8.1
-	github.com/google/jsonschema-go v0.4.3
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
 	github.com/imroc/req/v3 v3.52.2
@@ -23,7 +21,6 @@ require (
 	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/tetratelabs/wazero v1.12.0
 	github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad
 	go.etcd.io/bbolt v1.4.3
 	golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93
@@ -41,6 +38,7 @@ require (
 	github.com/felixge/fgprof v0.9.5 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/jsonschema-go v0.4.3 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
@@ -66,7 +64,6 @@ require (
 	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/mock v0.5.1 // indirect
 	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
-	golang.org/x/mod v0.33.0
 	golang.org/x/oauth2 v0.35.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect
 )
@@ -157,8 +154,9 @@ require (
 	go.opentelemetry.io/otel/metric v1.39.0 // indirect
 	go.opentelemetry.io/otel/trace v1.39.0 // indirect
 	golang.org/x/crypto v0.48.0 // indirect
+	golang.org/x/mod v0.33.0 // indirect
 	golang.org/x/net v0.50.0
-	golang.org/x/sys v0.44.0 // indirect
+	golang.org/x/sys v0.41.0 // indirect
 	golang.org/x/text v0.34.0
 	golang.org/x/time v0.15.0 // indirect
 	golang.org/x/tools v0.42.0 // indirect

go.sum

@@ -14,8 +14,6 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2k
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-codeberg.org/gruf/go-ffmpreg v0.6.23-0.20260827095416-df1836cb5be0 h1:AqNFl60o4xhTTOxmzAvSf7pazXHKBGuV5ATw7sETIRA=
-codeberg.org/gruf/go-ffmpreg v0.6.23-0.20260827095416-df1836cb5be0/go.mod h1:XM6eW8CSgAuZRKRynm5nDiSNedm0rav30IychqygOHE=
 crawshaw.io/iox v0.0.0-20181124134642-c51c3df30797/go.mod h1:sXBiorCo8c46JlQV3oXPKINnZ8mcqnye1EkVkqsectk=
 crawshaw.io/sqlite v0.3.2/go.mod h1:igAO5JulrQ1DbdZdtVq48mnZUBAPOeFzer7VhDWNtW4=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
@@ -25,20 +23,8 @@ filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmG
 filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/GopeedLab/webview_go v0.0.0-20260915010614-2567e492369a h1:Vzz+8aMVX9ZPPpkxgxa7mCorrAgdXCZL5EunOpOBvao=
+github.com/GopeedLab/webview_go v0.0.0-20260423085439-7a2f88b6e9b5 h1:86LVTaNDM/j/uTAD2HedkXNO9LIQlt642VAdbU/0D/M=
-github.com/GopeedLab/webview_go v0.0.0-20260915010614-2567e492369a/go.mod h1:FvV19lu9rQ9NcbczN5y8pbWecURRRbWa8tbfFARBDa0=
+github.com/GopeedLab/webview_go v0.0.0-20260423085439-7a2f88b6e9b5/go.mod h1:FvV19lu9rQ9NcbczN5y8pbWecURRRbWa8tbfFARBDa0=
-github.com/GopeedLab/webview_go v0.0.0-20260917153919-dcf00737f32a h1:nz1bC6TGwQ1kv/OVLahNZ0EEtb7v5LHfceAkW4MvS6I=
-github.com/GopeedLab/webview_go v0.0.0-20260917153919-dcf00737f32a/go.mod h1:FvV19lu9rQ9NcbczN5y8pbWecURRRbWa8tbfFARBDa0=
-github.com/GopeedLab/webview_go v0.0.0-20260917155039-1ee7ffb4169a h1:yudcfXpipKLnMaaw1losn6YeOBjvj2rAFicfjqYJexY=
-github.com/GopeedLab/webview_go v0.0.0-20260917155039-1ee7ffb4169a/go.mod h1:FvV19lu9rQ9NcbczN5y8pbWecURRRbWa8tbfFARBDa0=
-github.com/GopeedLab/webview_go v0.0.0-20260917155218-bd16da0d6f53 h1:nMSHKhbrEaWPE/x3mYl/270GPjswbUmS+E7yYjly4xk=
-github.com/GopeedLab/webview_go v0.0.0-20260917155218-bd16da0d6f53/go.mod h1:oNO07SCX8xgoHLds2OBwML8TU4xils88vMQ4gadKUHQ=
-github.com/GopeedLab/webview_go v0.0.0-20260917161756-2a4f989dcb1d h1:4fjlhJpBWa6IcdKVPkEMMIDd6Xo9JM09dJHdKU+1V7k=
-github.com/GopeedLab/webview_go v0.0.0-20260917161756-2a4f989dcb1d/go.mod h1:oNO07SCX8xgoHLds2OBwML8TU4xils88vMQ4gadKUHQ=
-github.com/GopeedLab/webview_go v0.0.0-20260917163929-ca26c3e6bcfa h1:VkdBMcNHYTqCMwOOCimA7b3xZKV/qFIGrhh3+vm9n3s=
-github.com/GopeedLab/webview_go v0.0.0-20260917163929-ca26c3e6bcfa/go.mod h1:oNO07SCX8xgoHLds2OBwML8TU4xils88vMQ4gadKUHQ=
-github.com/GopeedLab/webview_go v0.0.0-20260918010912-0d4c27bb7914 h1:9VJQZIZ1R6T4m+4vlNQYNXSPNUv2gf2PiTfIXiQ3MTw=
-github.com/GopeedLab/webview_go v0.0.0-20260918010912-0d4c27bb7914/go.mod h1:oNO07SCX8xgoHLds2OBwML8TU4xils88vMQ4gadKUHQ=
 github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
@@ -566,8 +552,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/tetratelabs/wazero v1.12.0 h1:DuWcpNu/FzgEXgGBDp8J1Spc+CWOvvtvVyjKlaZopYU=
-github.com/tetratelabs/wazero v1.12.0/go.mod h1:LvKtzl2RqO4gyF27BiXU+nKAjcV8f38U+kP/q2vgxh0=
 github.com/tidwall/btree v1.8.1 h1:27ehoXvm5AG/g+1VxLS1SD3vRhp/H7LuEfwNvddEdmA=
 github.com/tidwall/btree v1.8.1/go.mod h1:jBbTdUWhSZClZWoDg54VnvV7/54modSOzDN7VXftj1A=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
@@ -748,8 +732,6 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
 golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
-golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=

internal/blob/registry.go

@@ -7,7 +7,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/GopeedLab/gopeed/internal/production"
 	"io"
 	"net"
 	"net/http"
@@ -62,7 +61,6 @@ type Metadata struct {
 }
 
 type Source struct {
-	producer    production.Reader
 	ID          string
 	URL         string
 	ContentType string
@@ -361,35 +359,11 @@ func (r *Registry) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 	defer reader.Close()
-	if producer, ok := reader.(production.Reader); ok {
-		src.mu.Lock()
-		src.producer = producer
-		src.mu.Unlock()
-		if err := producer.WaitProduction(req.Context()); err != nil {
-			return
-		}
-		if producer.Production() != nil {
-			meta.Size = 0
-			meta.Range = false
-			start = 0
-			end = -1
-			ranged = false
-			src.mu.Lock()
-			src.size = 0
-			src.rangeEnabled = false
-			src.mu.Unlock()
-		}
-	}
 
 	writeHeaders(w, meta, start, end, ranged)
 	if ranged {
 		w.WriteHeader(http.StatusPartialContent)
 	}
-	if producer, ok := reader.(production.Reader); ok && producer.Production() != nil {
-		if flusher, ok := w.(http.Flusher); ok {
-			flusher.Flush()
-		}
-	}
 	limit := int64(-1)
 	if end >= start {
 		limit = end - start + 1
@@ -701,21 +675,3 @@ func randomID(size int) (string, error) {
 	}
 	return hex.EncodeToString(buf), nil
 }
-
-// Production returns the active opener's input counter, if it generates output.
-func (r *Registry) Production(raw string) production.Source {
-	if r == nil {
-		return nil
-	}
-	src, err := r.get(raw)
-	if err != nil {
-		return nil
-	}
-	src.mu.Lock()
-	reader := src.producer
-	src.mu.Unlock()
-	if reader == nil {
-		return nil
-	}
-	return reader.Production()
-}

internal/controller/controller.go

@@ -1,7 +1,6 @@
 package controller
 
 import (
-	"github.com/GopeedLab/gopeed/internal/tempfiles"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"net/http"
 	"net/url"
@@ -10,11 +9,8 @@ import (
 )
 
 type Controller struct {
-	TempFiles         *tempfiles.Scope
+	GetConfig func(v any)
-	ManagedProduction func(string) bool
+	GetProxy  func(requestProxy *base.RequestProxy) func(*http.Request) (*url.URL, error)
-	TempDir           string
-	GetConfig         func(v any)
-	GetProxy          func(requestProxy *base.RequestProxy) func(*http.Request) (*url.URL, error)
 	FileController
 	//ContextDialer() (proxy.Dialer, error)
 }

internal/fetcher/fetcher.go

@@ -12,7 +12,7 @@ import (
 // Each download task will have a corresponding Fetcher instance for the management of the download task
 type Fetcher interface {
 	Setup(ctl *controller.Controller)
-	Resolve(req *base.Request) error
+	Resolve(req *base.Request, opts *base.Options) error
 	Start() error
 	// Patch modifies task-specific data based on the protocol.
 	// For HTTP: can modify Request info (URL, headers, etc.)
@@ -106,13 +106,7 @@ func (s *SchemeFilter) Match(uri string) bool {
 	case FilterTypeUrl:
 		return strings.HasPrefix(uriUpper, patternUpper+":")
 	case FilterTypeFile:
-		// Strip query and fragment before matching so URLs like
+		return strings.HasSuffix(uriUpper, "."+patternUpper)
-		// https://example.com/video.m3u8?sign=abc still route by extension.
-		clean := uri
-		if idx := strings.IndexAny(clean, "?#"); idx >= 0 {
-			clean = clean[:idx]
-		}
-		return strings.HasSuffix(strings.ToUpper(clean), "."+patternUpper)
 	case FilterTypeBase64:
 		return strings.HasPrefix(uriUpper, "DATA:"+patternUpper+";BASE64,")
 	}

internal/fetcher/jobs.go

@@ -1,72 +0,0 @@
-package fetcher
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"time"
-)
-
-type TriggerSource string
-
-const (
-	TriggerScheduled TriggerSource = "scheduled"
-	TriggerManual    TriggerSource = "manual"
-)
-
-var ErrJobSkipped = errors.New("protocol job skipped")
-var ErrConfigChanged = errors.New("protocol configuration changed during execution")
-
-// ConfigState embeds the common backend-owned state section in a protocol config.
-// Public config PUTs always retain this section from the latest stored config.
-type ConfigState[T any] struct {
-	State T `json:"state"`
-}
-
-// ProtocolHost is scoped to one manager. UpdateState runs against the latest
-// config under Downloader's lock; callbacks must not perform network I/O.
-type ProtocolHost struct {
-	Read        func(any) error
-	UpdateState func(func(config, state json.RawMessage) (any, error)) error
-	Fetch       func(context.Context, string, int64, func([]byte) error) ([]byte, error)
-}
-
-func ReadConfig[T any](host ProtocolHost) (*T, error) {
-	var cfg T
-	if err := host.Read(&cfg); err != nil {
-		return nil, err
-	}
-	return &cfg, nil
-}
-
-// UpdateState gives the callback a detached config snapshot and mutable state.
-// Only the state is committed; edits to the config snapshot are discarded.
-func UpdateState[C, S any](host ProtocolHost, update func(*C, *S) error) error {
-	return host.UpdateState(func(rawConfig, rawState json.RawMessage) (any, error) {
-		var cfg C
-		var state S
-		if err := json.Unmarshal(rawConfig, &cfg); err != nil {
-			return nil, err
-		}
-		if err := json.Unmarshal(rawState, &state); err != nil {
-			return nil, err
-		}
-		if err := update(&cfg, &state); err != nil {
-			return nil, err
-		}
-		return &state, nil
-	})
-}
-
-type CronJob struct {
-	Name    string
-	Every   time.Duration
-	Timeout time.Duration
-	Run     func(context.Context, TriggerSource) error
-}
-type CronProvider interface{ CronJobs(ProtocolHost) []CronJob }
-
-// ConfigNormalizer is optional. It owns protocol validation and derived fields.
-type ConfigNormalizer interface {
-	NormalizeConfig(json.RawMessage) (any, error)
-}

internal/githubmirror/README.md

@@ -1,73 +0,0 @@
-# GitHub mirror execution
-
-This package owns GitHub URL rewriting and execution strategies. It depends only
-on the standard library and does not depend on Downloader, HTTP clients, Git, or
-storage. Downloader persists `Config` at its top-level `githubMirror` field;
-`pkg/base` preserves the existing configuration names through aliases.
-
-## Race: resource reads
-
-```go
-body, err := githubmirror.Race(ctx, cfg.GithubMirror, rawURL,
-    githubmirror.Options[[]byte]{
-        Kind:    githubmirror.Resource,
-        Timeout: 30 * time.Second,
-    },
-    func(ctx context.Context, candidate string) ([]byte, error) {
-        return fetchAndValidate(ctx, client, candidate)
-    },
-)
-```
-
-The callback owns HTTP requests, size limits, and content validation. The first
-completed valid result wins. Other operations are canceled and drained. There is
-no HEAD-probe assumption or client-specific HTTP behavior inside the executor.
-
-## Fallback: repository operations
-
-```go
-repo, err := githubmirror.Fallback(ctx, cfg.GithubMirror, officialURL,
-    githubmirror.Options[*git.Repository]{
-        Kind: githubmirror.Repository,
-    },
-    func(ctx context.Context, candidate string) (*git.Repository, error) {
-        // Use a clean temporary checkout for each attempt.
-        return clone(ctx, candidate)
-    },
-)
-```
-
-The official URL is attempted first; mirrors follow their configured order.
-jsDelivr is excluded for repositories. Stop on the first success. Perform
-persistent installation or other business state changes after success, rather
-than inside a potentially repeated attempt.
-
-## Results with resources
-
-For temporary files, set `Options[*Download].Discard` to remove the file. Return
-the partial `*Download` alongside errors, so cleanup also covers failed reads or
-validation. The executor discards every failure and every race loser exactly
-once. The caller owns and must track/release the winning result.
-
-- `Timeout == 0` uses 30 seconds per resource attempt and no overall deadline
-  for repository attempts; a negative timeout is invalid. Extension Git HTTP
-  transport limits connections/TLS handshakes to 10 seconds and resets a 60-second
-  read deadline as data arrives. Slow continuous transfers can finish, while
-  stalled sources fail and allow ordered fallback. Parent cancellation still applies.
-- Attempts must honor the supplied context; draining waits for them to return.
-- Attempt contexts are canceled after return, so callbacks must finish reading
-  HTTP bodies before returning. Returning a still-streaming response is unsupported.
-- Discard callbacks must accept zero values, must not panic, and run serially.
-- Parent cancellation wins over a result selected while the parent is canceled;
-  the selected result is then discarded as well.
-- Errors preserve their causes through wrapping/joining for `errors.Is`.
-- `github.com` and `raw.githubusercontent.com` expand into eligible mirrors.
-  jsDelivr is only eligible for raw source resources. `api.github.com` is never
-  mirrored and is rejected by the public mirror candidates API.
-- Client application update checks request the official GitHub API directly,
-  falling back to the independent Gopeed website API on request or validation
-  failure. Only package downloads obtain URLs from
-  `POST /api/v1/mirrors/github/candidates`. Candidate generation never performs
-  HTTP requests.
-- Disabled mirrors and other URLs execute only the original URL.
-- Config is a caller-owned immutable snapshot for the duration of a call.

internal/githubmirror/config.go

@@ -1,90 +0,0 @@
-// Package githubmirror rewrites GitHub URLs and executes mirrored operations.
-package githubmirror
-
-import (
-	"fmt"
-	"net/url"
-	"strings"
-)
-
-type Mirror struct {
-	Type      string `json:"type"`
-	URL       string `json:"url"`
-	IsBuiltIn bool   `json:"isBuiltIn"`
-	IsDeleted bool   `json:"isDeleted"`
-}
-type Config struct {
-	Enabled bool     `json:"enabled"`
-	Mirrors []Mirror `json:"mirrors"`
-}
-
-func DefaultConfig() *Config {
-	return &Config{Enabled: true, Mirrors: []Mirror{
-		{Type: "jsdelivr", URL: "https://fastly.jsdelivr.net/gh", IsBuiltIn: true},
-		{Type: "ghProxy", URL: "https://fastgit.cc", IsBuiltIn: true},
-		{Type: "ghProxy", URL: "https://gh-proxy.com", IsBuiltIn: true},
-		{Type: "ghProxy", URL: "https://ghfast.top", IsBuiltIn: true},
-	}}
-}
-func (c *Config) Validate() error {
-	if len(c.Mirrors) > 32 {
-		return fmt.Errorf("too many GitHub mirrors")
-	}
-	for _, mirror := range c.Mirrors {
-		u, err := url.Parse(mirror.URL)
-		if err != nil || u == nil || (u.Scheme != "http" && u.Scheme != "https") || u.Host == "" || u.User != nil || u.RawQuery != "" || u.Fragment != "" {
-			return fmt.Errorf("invalid GitHub mirror URL")
-		}
-		if mirror.Type != "jsdelivr" && mirror.Type != "ghProxy" {
-			return fmt.Errorf("invalid GitHub mirror type: %s", mirror.Type)
-		}
-	}
-	return nil
-}
-
-// Kind describes what a candidate endpoint must support.
-type Kind uint8
-
-const (
-	Resource Kind = iota
-	Repository
-)
-
-// Candidates preserves the official URL first. jsDelivr is only eligible for
-// raw source resources; Git operations use mirrors supporting Git Smart HTTP.
-// GitHub API URLs are never mirrored.
-func Candidates(c *Config, raw string, kind Kind) []string {
-	result := []string{raw}
-	u, err := url.Parse(raw)
-	if err != nil || c == nil || !c.Enabled || u.User != nil || (u.Scheme != "https" && u.Scheme != "http") {
-		return result
-	}
-	if u.Host != "github.com" && u.Host != "raw.githubusercontent.com" {
-		return result
-	}
-	seen := map[string]bool{raw: true}
-	for _, mirror := range c.Mirrors {
-		if mirror.IsDeleted {
-			continue
-		}
-		var candidate string
-		switch mirror.Type {
-		case "ghProxy":
-			candidate = strings.TrimRight(mirror.URL, "/") + "/" + raw
-		case "jsdelivr":
-			if kind == Repository || u.Host != "raw.githubusercontent.com" {
-				continue
-			}
-			parts := strings.SplitN(strings.TrimPrefix(u.EscapedPath(), "/"), "/", 4)
-			if len(parts) != 4 {
-				continue
-			}
-			candidate = strings.TrimRight(mirror.URL, "/") + "/" + parts[0] + "/" + parts[1] + "@" + parts[2] + "/" + parts[3]
-		}
-		if candidate != "" && !seen[candidate] {
-			result = append(result, candidate)
-			seen[candidate] = true
-		}
-	}
-	return result
-}

internal/githubmirror/config_test.go

@@ -1,38 +0,0 @@
-package githubmirror
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestMirrorCandidates(t *testing.T) {
-	cfg := &Config{Enabled: true, Mirrors: []Mirror{
-		{Type: "jsdelivr", URL: "https://cdn.example/gh/"},
-		{Type: "ghProxy", URL: "https://mirror.example/"},
-		{Type: "ghProxy", URL: "https://deleted.example", IsDeleted: true},
-	}}
-	source := "https://raw.githubusercontent.com/owner/repo/main/a.txt"
-	want := []string{source, "https://cdn.example/gh/owner/repo@main/a.txt", "https://mirror.example/" + source}
-	if got := Candidates(cfg, source, Resource); !reflect.DeepEqual(got, want) {
-		t.Fatalf("got %v", got)
-	}
-	repo := "https://github.com/owner/repo.git"
-	if got := Candidates(cfg, repo, Repository); !reflect.DeepEqual(got, []string{repo, "https://mirror.example/" + repo}) {
-		t.Fatalf("git candidates %v", got)
-	}
-	for _, raw := range []string{"https://github.com.evil.example/a", "https://example.com/a", "https://user:[email protected]/a"} {
-		if got := Candidates(cfg, raw, Resource); !reflect.DeepEqual(got, []string{raw}) {
-			t.Fatalf("unexpected mirror: %v", got)
-		}
-	}
-	apiURL := "https://api.github.com/repos/GopeedLab/gopeed/releases?per_page=10"
-	for _, kind := range []Kind{Resource, Repository} {
-		if got := Candidates(cfg, apiURL, kind); !reflect.DeepEqual(got, []string{apiURL}) {
-			t.Fatalf("GitHub API must never use mirrors: %v", got)
-		}
-	}
-	cfg.Enabled = false
-	if got := Candidates(cfg, source, Resource); !reflect.DeepEqual(got, []string{source}) {
-		t.Fatalf("disabled mirror: %v", got)
-	}
-}

internal/githubmirror/execute.go

@@ -1,160 +0,0 @@
-package githubmirror
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-)
-
-// Options configures execution, not URL persistence. Discard releases results
-// from failed attempts and successful race losers, including partial results
-// returned together with an error. The caller owns the winning result.
-type Options[T any] struct {
-	Kind Kind
-	// Timeout limits each attempt. Zero uses 30 seconds for resources and no
-	// overall deadline for repositories, whose transport owns idle timeouts.
-	Timeout time.Duration
-	Discard func(T)
-}
-
-// Attempt must honor ctx and return a completed, validated result. Its context
-// is canceled after it returns, so live response streams must not be returned.
-// Return any partially acquired resources along with errors so Discard can
-// release them. Failed attempts must not mutate persistent business state.
-type Attempt[T any] func(context.Context, string) (T, error)
-
-const defaultTimeout = 30 * time.Second
-
-func prepare[T any](ctx context.Context, config *Config, raw string, options Options[T], attempt Attempt[T]) ([]string, time.Duration, error) {
-	if err := ctx.Err(); err != nil {
-		return nil, 0, err
-	}
-	if raw == "" {
-		return nil, 0, errors.New("empty GitHub source URL")
-	}
-	if options.Kind != Resource && options.Kind != Repository {
-		return nil, 0, errors.New("invalid GitHub resource kind")
-	}
-	if options.Timeout < 0 {
-		return nil, 0, errors.New("invalid GitHub attempt timeout")
-	}
-	if attempt == nil {
-		return nil, 0, errors.New("GitHub mirror attempt is required")
-	}
-	if config != nil {
-		if err := config.Validate(); err != nil {
-			return nil, 0, err
-		}
-	}
-	timeout := options.Timeout
-	if timeout == 0 && options.Kind == Resource {
-		timeout = defaultTimeout
-	}
-	return Candidates(config, raw, options.Kind), timeout, nil
-}
-func invoke[T any](ctx context.Context, timeout time.Duration, candidate string, attempt Attempt[T]) (value T, err error) {
-	var cancel context.CancelFunc
-	if timeout > 0 {
-		ctx, cancel = context.WithTimeout(ctx, timeout)
-	} else {
-		ctx, cancel = context.WithCancel(ctx)
-	}
-	defer cancel()
-	defer func() {
-		if recovered := recover(); recovered != nil {
-			err = fmt.Errorf("GitHub mirror attempt panicked: %v", recovered)
-		}
-	}()
-	value, err = attempt(ctx, candidate)
-	if err == nil {
-		err = ctx.Err()
-	}
-	return
-}
-func discard[T any](options Options[T], value T) {
-	if options.Discard != nil {
-		options.Discard(value)
-	}
-}
-
-// Race executes the official URL and eligible mirrors concurrently. The first
-// completed successful result wins; losing attempts are canceled and drained
-// before return so no temporary files or other resources outlive the call.
-// HTTP status/content validation is the attempt's responsibility.
-func Race[T any](ctx context.Context, config *Config, raw string, options Options[T], attempt Attempt[T]) (T, error) {
-	var zero T
-	candidates, timeout, err := prepare(ctx, config, raw, options, attempt)
-	if err != nil {
-		return zero, err
-	}
-	raceCtx, cancel := context.WithCancel(ctx)
-	defer cancel()
-	type outcome struct {
-		index int
-		value T
-		err   error
-	}
-	outcomes := make(chan outcome, len(candidates))
-	for index, candidate := range candidates {
-		go func(index int, candidate string) {
-			value, err := invoke(raceCtx, timeout, candidate, attempt)
-			outcomes <- outcome{index, value, err}
-		}(index, candidate)
-	}
-	var winner T
-	won := false
-	failures := make([]error, len(candidates))
-	for range candidates {
-		outcome := <-outcomes
-		if !won && outcome.err == nil && ctx.Err() == nil {
-			winner = outcome.value
-			won = true
-			cancel()
-		} else {
-			discard(options, outcome.value)
-			if outcome.err != nil {
-				failures[outcome.index] = fmt.Errorf("GitHub source %d: %w", outcome.index+1, outcome.err)
-			}
-			if ctx.Err() != nil {
-				cancel()
-			}
-		}
-	}
-	if err := ctx.Err(); err != nil {
-		if won {
-			discard(options, winner)
-		}
-		return zero, err
-	}
-	if won {
-		return winner, nil
-	}
-	return zero, fmt.Errorf("all GitHub sources failed: %w", errors.Join(failures...))
-}
-
-// Fallback executes the official URL first, then eligible mirrors in their
-// configured order. It stops immediately on success and cleans every failure.
-func Fallback[T any](ctx context.Context, config *Config, raw string, options Options[T], attempt Attempt[T]) (T, error) {
-	var zero T
-	candidates, timeout, err := prepare(ctx, config, raw, options, attempt)
-	if err != nil {
-		return zero, err
-	}
-	failures := make([]error, 0, len(candidates))
-	for index, candidate := range candidates {
-		if err := ctx.Err(); err != nil {
-			return zero, err
-		}
-		value, err := invoke(ctx, timeout, candidate, attempt)
-		if err == nil && ctx.Err() == nil {
-			return value, nil
-		}
-		discard(options, value)
-		if parentErr := ctx.Err(); parentErr != nil {
-			return zero, parentErr
-		}
-		failures = append(failures, fmt.Errorf("GitHub source %d: %w", index+1, err))
-	}
-	return zero, fmt.Errorf("all GitHub sources failed: %w", errors.Join(failures...))
-}

internal/githubmirror/execute_test.go

@@ -1,214 +0,0 @@
-package githubmirror
-
-import (
-	"context"
-	"errors"
-	"reflect"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-)
-
-const testSource = "https://github.com/owner/repo.git"
-
-func testConfig() *Config {
-	return &Config{Enabled: true, Mirrors: []Mirror{
-		{Type: "ghProxy", URL: "https://first.example"},
-		{Type: "ghProxy", URL: "https://second.example"},
-	}}
-}
-func TestRaceWinsAndDrainsOwnedResults(t *testing.T) {
-	config := testConfig()
-	candidates := Candidates(config, testSource, Resource)
-	var started sync.WaitGroup
-	started.Add(len(candidates))
-	discarded := []string{}
-	winner, err := Race(context.Background(), config, testSource, Options[string]{
-		Discard: func(value string) { discarded = append(discarded, value) },
-	}, func(ctx context.Context, address string) (string, error) {
-		started.Done()
-		started.Wait()
-		switch address {
-		case candidates[0]:
-			return address, errors.New("official offline")
-		case candidates[1]:
-			return address, nil
-		default:
-			<-ctx.Done()
-			return address, ctx.Err()
-		}
-	})
-	if err != nil || winner != candidates[1] {
-		t.Fatalf("winner=%s err=%v", winner, err)
-	}
-	if len(discarded) != 2 || !contains(discarded, candidates[0]) || !contains(discarded, candidates[2]) {
-		t.Fatalf("discarded %v", discarded)
-	}
-}
-func contains(values []string, value string) bool {
-	for _, item := range values {
-		if item == value {
-			return true
-		}
-	}
-	return false
-}
-func TestRaceCleansSimultaneousSuccessfulLosers(t *testing.T) {
-	config := testConfig()
-	var started sync.WaitGroup
-	started.Add(3)
-	cleaned := []string{}
-	winner, err := Race(context.Background(), config, testSource, Options[string]{Discard: func(value string) { cleaned = append(cleaned, value) }}, func(_ context.Context, address string) (string, error) {
-		started.Done()
-		started.Wait()
-		return address, nil
-	})
-	if err != nil || winner == "" || len(cleaned) != 2 || contains(cleaned, winner) {
-		t.Fatalf("winner=%s discarded=%v err=%v", winner, cleaned, err)
-	}
-}
-func TestRaceParentCancellationCleansWinnerToo(t *testing.T) {
-	config := testConfig()
-	config.Mirrors = config.Mirrors[:1]
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	cleaned := []string{}
-	winner, err := Race(ctx, config, testSource, Options[string]{Discard: func(value string) { cleaned = append(cleaned, value) }}, func(ctx context.Context, address string) (string, error) {
-		if address == testSource {
-			return address, nil
-		}
-		<-ctx.Done()
-		cancel()
-		return address, ctx.Err()
-	})
-	if !errors.Is(err, context.Canceled) || winner != "" || len(cleaned) != 2 || !contains(cleaned, testSource) {
-		t.Fatalf("winner=%s cleanup=%v err=%v", winner, cleaned, err)
-	}
-}
-func TestRaceTimeoutAndErrorAggregation(t *testing.T) {
-	expected := errors.New("offline")
-	config := testConfig()
-	config.Mirrors = config.Mirrors[:1]
-	discarded := 0
-	_, err := Race(context.Background(), config, testSource, Options[string]{Timeout: 10 * time.Millisecond, Discard: func(string) { discarded++ }}, func(ctx context.Context, address string) (string, error) {
-		if address == testSource {
-			return address, expected
-		}
-		<-ctx.Done()
-		return address, ctx.Err()
-	})
-	if !errors.Is(err, expected) || !errors.Is(err, context.DeadlineExceeded) || discarded != 2 {
-		t.Fatalf("discarded=%d err=%v", discarded, err)
-	}
-}
-func TestFallbackPreservesOrderAndStopsOnSuccess(t *testing.T) {
-	config := testConfig()
-	candidates := Candidates(config, testSource, Repository)
-	tried := []string{}
-	cleaned := []string{}
-	winner, err := Fallback(context.Background(), config, testSource, Options[string]{Kind: Repository, Discard: func(value string) { cleaned = append(cleaned, value) }}, func(_ context.Context, address string) (string, error) {
-		tried = append(tried, address)
-		if address == candidates[1] {
-			return address, nil
-		}
-		return address, errors.New("offline")
-	})
-	if err != nil || winner != candidates[1] || !reflect.DeepEqual(tried, candidates[:2]) || !reflect.DeepEqual(cleaned, candidates[:1]) {
-		t.Fatalf("winner=%s tried=%v discarded=%v err=%v", winner, tried, cleaned, err)
-	}
-	tried = nil
-	_, err = Fallback(context.Background(), config, testSource, Options[string]{Kind: Repository}, func(_ context.Context, address string) (string, error) {
-		tried = append(tried, address)
-		return address, nil
-	})
-	if err != nil || !reflect.DeepEqual(tried, candidates[:1]) {
-		t.Fatalf("tried=%v err=%v", tried, err)
-	}
-}
-func TestFallbackTimeoutContinuesWithFreshContext(t *testing.T) {
-	discarded := []string{}
-	winner, err := Fallback(context.Background(), testConfig(), testSource, Options[string]{Kind: Repository, Timeout: 10 * time.Millisecond, Discard: func(value string) { discarded = append(discarded, value) }}, func(ctx context.Context, address string) (string, error) {
-		if address == testSource {
-			<-ctx.Done()
-			return address, ctx.Err()
-		}
-		if err := ctx.Err(); err != nil {
-			return address, err
-		}
-		return address, nil
-	})
-	if err != nil || !strings.HasPrefix(winner, "https://first.example/") || !reflect.DeepEqual(discarded, []string{testSource}) {
-		t.Fatalf("winner=%s cleanup=%v err=%v", winner, discarded, err)
-	}
-}
-func TestFallbackCancellationStopsBeforeNextMirror(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	calls := 0
-	cleaned := 0
-	_, err := Fallback(ctx, testConfig(), testSource, Options[string]{Kind: Repository, Discard: func(string) { cleaned++ }}, func(ctx context.Context, address string) (string, error) {
-		calls++
-		cancel()
-		return address, ctx.Err()
-	})
-	if !errors.Is(err, context.Canceled) || calls != 1 || cleaned != 1 {
-		t.Fatalf("calls=%d discarded=%d err=%v", calls, cleaned, err)
-	}
-}
-func TestExecutorsDoNotStartInvalidOrCanceledRequests(t *testing.T) {
-	canceled, cancel := context.WithCancel(context.Background())
-	cancel()
-	for _, test := range []struct {
-		ctx     context.Context
-		config  *Config
-		options Options[string]
-		attempt Attempt[string]
-	}{
-		{ctx: canceled, options: Options[string]{}, attempt: func(context.Context, string) (string, error) { t.Fatal("called after cancellation"); return "", nil }},
-		{ctx: context.Background(), options: Options[string]{Kind: 99}, attempt: func(context.Context, string) (string, error) { t.Fatal("invalid kind"); return "", nil }},
-		{ctx: context.Background(), options: Options[string]{Timeout: -time.Second}, attempt: func(context.Context, string) (string, error) { t.Fatal("invalid timeout"); return "", nil }},
-		{ctx: context.Background(), options: Options[string]{}, attempt: nil},
-		{ctx: context.Background(), config: &Config{Mirrors: []Mirror{{Type: "invalid", URL: "https://mirror.example"}}}, attempt: func(context.Context, string) (string, error) { t.Fatal("invalid config"); return "", nil }},
-	} {
-		if _, err := Race(test.ctx, test.config, testSource, test.options, test.attempt); err == nil {
-			t.Fatal("invalid race accepted")
-		}
-		if _, err := Fallback(test.ctx, test.config, testSource, test.options, test.attempt); err == nil {
-			t.Fatal("invalid fallback accepted")
-		}
-	}
-}
-func TestAttemptPanicBecomesError(t *testing.T) {
-	attempt := func(context.Context, string) (string, error) { panic("broken operation") }
-	if _, err := Race(context.Background(), nil, testSource, Options[string]{}, attempt); err == nil || !strings.Contains(err.Error(), "broken operation") {
-		t.Fatal(err)
-	}
-	if _, err := Fallback(context.Background(), nil, testSource, Options[string]{}, attempt); err == nil || !strings.Contains(err.Error(), "broken operation") {
-		t.Fatal(err)
-	}
-}
-func TestNonGithubResourcesAndDisabledMirrorsUseOnlyOriginal(t *testing.T) {
-	for _, test := range []struct {
-		config *Config
-		raw    string
-	}{{testConfig(), "https://example.com/resource"}, {&Config{Enabled: false, Mirrors: testConfig().Mirrors}, testSource}} {
-		calls := 0
-		got, err := Race(context.Background(), test.config, test.raw, Options[string]{}, func(_ context.Context, address string) (string, error) { calls++; return address, nil })
-		if err != nil || got != test.raw || calls != 1 {
-			t.Fatalf("got=%s calls=%d err=%v", got, calls, err)
-		}
-	}
-}
-
-func TestRepositoryAttemptsHaveNoDefaultDeadline(t *testing.T) {
-	value, err := Fallback(context.Background(), nil, testSource, Options[string]{Kind: Repository}, func(ctx context.Context, raw string) (string, error) {
-		if _, ok := ctx.Deadline(); ok {
-			t.Fatal("repository attempt has a total deadline")
-		}
-		return raw, nil
-	})
-	if err != nil || value != testSource {
-		t.Fatalf("value=%s error=%v", value, err)
-	}
-}

internal/production/progress.go

@@ -1,35 +0,0 @@
-// Package production associates generated resources with their input progress.
-package production
-
-import (
-	"context"
-	"sync"
-)
-
-// Source counts unique input bytes and total received bytes (including refetches).
-// Implementations must support concurrent snapshots.
-type Source interface {
-	Progress() (downloaded, received int64)
-}
-
-// Reader resolves its optional producer before response headers are sent.
-// A nil producer preserves ordinary Blob behavior.
-type Reader interface {
-	Production() Source
-	WaitProduction(context.Context) error
-}
-type Registry struct {
-	mu      sync.Mutex
-	sources map[string]Source
-}
-
-func (r *Registry) Set(id string, source Source) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.sources == nil {
-		r.sources = make(map[string]Source)
-	}
-	r.sources[id] = source
-}
-func (r *Registry) Get(id string) Source { r.mu.Lock(); defer r.mu.Unlock(); return r.sources[id] }
-func (r *Registry) Remove(id string)     { r.mu.Lock(); defer r.mu.Unlock(); delete(r.sources, id) }

internal/protocol/bt/config.go

@@ -1,37 +1,12 @@
 package bt
 
-import (
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-)
-
-type trackerSubscriptionStatus struct {
-	Success       bool      `json:"success"`
-	TrackerCount  int       `json:"trackerCount"`
-	LastFetchTime time.Time `json:"lastFetchTime"`
-}
-
-type state struct {
-	TrackerSubscriptionStatuses map[string]trackerSubscriptionStatus `json:"trackerSubscriptionStatuses"`
-	TrackerSources              map[string][]string                  `json:"trackerSources"`
-	LastTrackerUpdateTime       time.Time                            `json:"lastTrackerUpdateTime"`
-}
-
 type config struct {
-	fetcher.ConfigState[state]
+	ListenPort int      `json:"listenPort"`
-	TrackerSubscribeURLs []string `json:"trackerSubscribeUrls"`
+	Trackers   []string `json:"trackers"`
-	AutoUpdateTrackers   bool     `json:"autoUpdateTrackers"`
-	CustomTrackers       []string `json:"customTrackers"`
-	ListenPort           int      `json:"listenPort"`
 	// 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"`
-	// DisableDHT and DisablePEX turn off DHT and PEX peer discovery. Like ListenPort,
-	// they are read when the shared client is built.
-	DisableDHT bool `json:"disableDht"`
-	DisablePEX bool `json:"disablePex"`
 }

internal/protocol/bt/download_test.go

@@ -1,464 +0,0 @@
-package bt
-
-import (
-	"encoding/json"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	btprotocol "github.com/GopeedLab/gopeed/pkg/protocol/bt"
-	"github.com/anacrolix/torrent"
-	pp "github.com/anacrolix/torrent/peer_protocol"
-	"golang.org/x/time/rate"
-)
-
-type btDownloadHarness struct {
-	*Fetcher
-	pendingRequests atomic.Int64
-}
-
-// These tests exercise the BT fetcher, native storage and real peer protocol.
-// All content is generated locally and served by a loopback seeder.
-func btDownloadFetcher(t *testing.T, f fetcher.Fetcher) *btDownloadHarness {
-	t.Helper()
-	if f == nil {
-		f = new(FetcherManager).Build()
-	}
-	ctl := controller.NewController()
-	ctl.GetConfig = func(v any) {
-		encoded, err := json.Marshal(new(FetcherManager).DefaultConfig())
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := json.Unmarshal(encoded, v); err != nil {
-			t.Fatal(err)
-		}
-	}
-	f.Setup(ctl)
-	t.Cleanup(func() {
-		if err := f.Close(); err != nil {
-			t.Error(err)
-		}
-		if err := closeClient(); err != nil {
-			t.Error(err)
-		}
-	})
-	h := &btDownloadHarness{Fetcher: f.(*Fetcher)}
-	// Keep the test client on loopback and observe real cancellation replies.
-	// Waiting for them avoids the pinned library's immediate cancel/resume
-	// request scheduling bug, without relying on arbitrary sleep durations.
-	cfg = torrent.TestingConfig(t)
-	cfg.DisableTrackers = false
-	cfg.Seed = true
-	cfg.DisableUTP = true
-	cfg.DisableIPv6 = true
-	cfg.DisableWebtorrent = true
-	cfg.KeepAliveTimeout = time.Minute
-	cfg.MaxAllocPeerRequestDataPerConn = 1 << 20
-	cfg.Callbacks.SentRequest = []func(torrent.PeerRequestEvent){func(torrent.PeerRequestEvent) {
-		h.pendingRequests.Add(1)
-	}}
-	cfg.Callbacks.ReadMessage = func(_ *torrent.PeerConn, msg *pp.Message) {
-		if !msg.Keepalive && (msg.Type == pp.Piece || msg.Type == pp.Reject) {
-			h.pendingRequests.Add(-1)
-		}
-	}
-	var err error
-	client, err = torrent.NewClient(cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return h
-}
-
-func btResolve(t *testing.T, f *btDownloadHarness, source string) {
-	t.Helper()
-	if err := f.Resolve(&base.Request{URL: source}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func btStart(t *testing.T, f *btDownloadHarness) {
-	t.Helper()
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func btAwaitDone(t *testing.T, f *btDownloadHarness) {
-	t.Helper()
-	done := make(chan error, 1)
-	go func() { done <- f.Wait() }()
-	timeout := time.NewTimer(20 * time.Second)
-	defer timeout.Stop()
-	select {
-	case err := <-done:
-		if err != nil {
-			t.Fatalf("BT download failed: %v", err)
-		}
-		if !f.isDone() {
-			t.Fatal("Wait returned before selected files were verified")
-		}
-	case <-timeout.C:
-		var status strings.Builder
-		client.WriteStatus(&status)
-		t.Log(status.String())
-		t.Fatalf("BT download did not finish: progress=%v stats=%+v pieces=%+v peers=%+v", f.Progress(), f.torrent.Stats(), f.torrent.PieceStateRuns(), f.Stats().Runtime)
-	}
-}
-
-func btAwaitPartial(t *testing.T, f *btDownloadHarness) {
-	t.Helper()
-	timeout := time.NewTimer(15 * time.Second)
-	defer timeout.Stop()
-	ticker := time.NewTicker(20 * time.Millisecond)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-ticker.C:
-			progress := f.Progress().TotalDownloaded()
-			if progress >= 32*1024 && progress < f.Meta().Res.Size {
-				return
-			}
-		case <-timeout.C:
-			t.Fatal("BT transfer did not reach partial progress")
-		}
-	}
-}
-
-func btPause(t *testing.T, f *btDownloadHarness) {
-	t.Helper()
-	if err := f.Pause(); err != nil {
-		t.Fatal(err)
-	}
-	timeout := time.NewTimer(5 * time.Second)
-	defer timeout.Stop()
-	ticker := time.NewTicker(10 * time.Millisecond)
-	defer ticker.Stop()
-	for {
-		if f.pendingRequests.Load() == 0 {
-			// The message callback runs under the client lock. Acquiring that
-			// lock ensures the final cancellation reply has finished processing.
-			client.Stats()
-			return
-		}
-		select {
-		case <-ticker.C:
-		case <-timeout.C:
-			t.Fatal("peer did not acknowledge cancelled requests")
-		}
-	}
-}
-
-func TestBTDownloadSources(t *testing.T) {
-	for _, kind := range []string{"magnet", "torrent", "file URI", "data URI"} {
-		t.Run(kind, func(t *testing.T) {
-			fixture := newBTFixture(t, map[string][]byte{"": btPayload(96*1024, kind)}, 0)
-			source := fixture.Magnet
-			switch kind {
-			case "torrent":
-				source = fixture.TorrentFile
-			case "file URI":
-				source = fixture.FileURI()
-			case "data URI":
-				source = fixture.DataURI
-			}
-			f := btDownloadFetcher(t, nil)
-			btResolve(t, f, source)
-			if f.Meta().Opts != nil {
-				t.Fatal("Resolve assigned download options")
-			}
-			f.storage.mu.RLock()
-			bound := f.storage.owner != nil
-			f.storage.mu.RUnlock()
-			if bound {
-				t.Fatal("Resolve bound download storage")
-			}
-			resolvedTorrent := f.torrent
-			dir := filepath.Join(t.TempDir(), "chosen-after-resolve")
-			f.Meta().Opts = &base.Options{Path: dir}
-			if _, err := os.Stat(dir); !os.IsNotExist(err) {
-				t.Fatalf("output directory exists before Start: %v", err)
-			}
-			btStart(t, f)
-			if f.torrent != resolvedTorrent {
-				t.Fatal("Start replaced the resolved torrent")
-			}
-			btAwaitDone(t, f)
-			fixture.AssertFiles(t, dir)
-		})
-	}
-}
-
-func TestBTDirectDownloadWithExtraTrackers(t *testing.T) {
-	for _, source := range []string{"request", "config", "subscription"} {
-		t.Run(source, func(t *testing.T) {
-			fixture := makeBTFixture(t, map[string][]byte{
-				"a.bin":        btPayload(20*1024, "direct-a"),
-				"nested/b.bin": btPayload(48*1024, "direct-b"),
-			}, 0, false, false)
-			magnet, err := url.Parse(fixture.Magnet)
-			if err != nil {
-				t.Fatal(err)
-			}
-			query := magnet.Query()
-			query.Del("tr")
-			query.Del("x.pe")
-			magnet.RawQuery = query.Encode()
-			req := &base.Request{URL: magnet.String()}
-			f := btDownloadFetcher(t, nil)
-			if source == "request" {
-				req.Extra = &btprotocol.ReqExtra{Trackers: []string{fixture.TrackerURL}}
-			} else {
-				backendConfig := new(FetcherManager).DefaultConfig().(*config)
-				if source == "config" {
-					backendConfig.CustomTrackers = []string{fixture.TrackerURL}
-				} else {
-					backendConfig.TrackerSubscribeURLs = []string{"https://subscription.example/list"}
-					backendConfig.State.TrackerSources[backendConfig.TrackerSubscribeURLs[0]] = []string{fixture.TrackerURL}
-				}
-				f.ctl.GetConfig = func(dst any) {
-					raw, err := json.Marshal(backendConfig)
-					if err != nil {
-						t.Error(err)
-						return
-					}
-					if err := json.Unmarshal(raw, dst); err != nil {
-						t.Error(err)
-					}
-				}
-			}
-			// CreateDirect supplies options before Downloader resolves the task.
-			dir := filepath.Join(t.TempDir(), "direct-download")
-			opts := &base.Options{Path: dir, SelectFiles: []int{}}
-			f.Meta().Opts = opts
-			resolved := make(chan error, 1)
-			go func() { resolved <- f.Resolve(req) }()
-			select {
-			case err := <-resolved:
-				if err != nil {
-					t.Fatal(err)
-				}
-			case <-time.After(5 * time.Second):
-				f.torrentDropFunc()
-				<-resolved
-				t.Fatal("direct magnet download did not obtain metadata from its extra tracker")
-			}
-			if f.Meta().Opts != opts || len(opts.SelectFiles) != len(fixture.Files) {
-				t.Fatal("resolution lost direct download options or did not select all files")
-			}
-			btStart(t, f)
-			btAwaitDone(t, f)
-			fixture.AssertFiles(t, dir)
-		})
-	}
-}
-
-func TestBTDownloadSelectedFiles(t *testing.T) {
-	fixture := newBTFixture(t, map[string][]byte{
-		"a.bin": btPayload(20*1024, "a"), "nested/b.bin": btPayload(48*1024, "b"),
-	}, 0)
-	f := btDownloadFetcher(t, nil)
-	dir := t.TempDir()
-	btResolve(t, f, fixture.Magnet)
-	selected := -1
-	for i, file := range f.Meta().Res.Files {
-		if file.Name == "b.bin" {
-			selected = i
-		}
-	}
-	if selected < 0 {
-		t.Fatal("selected file absent from metadata")
-	}
-	f.Meta().Opts = &base.Options{Path: dir}
-	if err := f.Patch(nil, &base.Options{SelectFiles: []int{selected}}); err != nil {
-		t.Fatal(err)
-	}
-	btStart(t, f)
-	btAwaitDone(t, f)
-	fixture.AssertFiles(t, dir, filepath.Join("bundle", "nested", "b.bin"))
-	if _, err := os.Stat(filepath.Join(dir, "bundle", "a.bin")); !os.IsNotExist(err) {
-		t.Fatalf("unselected output remains: %v", err)
-	}
-	if f.Meta().Res.Size != 48*1024 {
-		t.Fatal("selected resource size is incorrect")
-	}
-}
-
-func TestBTPauseAndResume(t *testing.T) {
-	fixture := newBTFixture(t, map[string][]byte{"": btPayload(512*1024, "pause")}, 64*1024)
-	f := btDownloadFetcher(t, nil)
-	dir := t.TempDir()
-	btResolve(t, f, fixture.Magnet)
-	f.Meta().Opts = &base.Options{Path: dir}
-	btStart(t, f)
-	btAwaitPartial(t, f)
-	btPause(t, f)
-	resolvedTorrent := f.torrent
-	fixture.Limiter.SetLimit(rate.Inf)
-	// Once cancelled requests have settled, no more data should arrive.
-	stats := f.torrent.Stats()
-	readWhilePaused := stats.BytesReadData.Int64()
-	time.Sleep(200 * time.Millisecond)
-	stats = f.torrent.Stats()
-	if stats.BytesReadData.Int64() != readWhilePaused || f.isDone() {
-		t.Fatal("data download continued while paused")
-	}
-	btStart(t, f)
-	if f.torrent != resolvedTorrent {
-		t.Fatal("resume replaced the resolved torrent")
-	}
-	btAwaitDone(t, f)
-	fixture.AssertFiles(t, dir)
-}
-
-type btFetcherCheckpoint struct {
-	Meta *fetcher.FetcherMeta `json:"meta"`
-	Data json.RawMessage      `json:"data"`
-}
-
-func btStore(t *testing.T, f *btDownloadHarness) []byte {
-	t.Helper()
-	data, err := new(FetcherManager).Store(f.Fetcher)
-	if err != nil {
-		t.Fatal(err)
-	}
-	encodedData, err := json.Marshal(data)
-	if err != nil {
-		t.Fatal(err)
-	}
-	encoded, err := json.Marshal(btFetcherCheckpoint{Meta: f.Meta(), Data: encodedData})
-	if err != nil {
-		t.Fatal(err)
-	}
-	return encoded
-}
-
-func btRestore(t *testing.T, encoded []byte) *btDownloadHarness {
-	t.Helper()
-	var checkpoint btFetcherCheckpoint
-	if err := json.Unmarshal(encoded, &checkpoint); err != nil {
-		t.Fatal(err)
-	}
-	data, restore := new(FetcherManager).Restore()
-	if err := json.Unmarshal(checkpoint.Data, data); err != nil {
-		t.Fatal(err)
-	}
-	return btDownloadFetcher(t, restore(checkpoint.Meta, data))
-}
-
-func btCloseForRestart(t *testing.T, f *btDownloadHarness) {
-	t.Helper()
-	if err := f.Close(); err != nil {
-		t.Fatal(err)
-	}
-	if err := new(FetcherManager).Close(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestBTColdStartResume(t *testing.T) {
-	for _, kind := range []string{"v1", "hybrid"} {
-		t.Run(kind, func(t *testing.T) {
-			var fixture *btFixture
-			if kind == "hybrid" {
-				fixture = newBTHybridFixture(t, btPayload(512*1024, "restart-hybrid"))
-				fixture.Limiter.SetLimit(64 * 1024)
-			} else {
-				fixture = newBTFixture(t, map[string][]byte{"": btPayload(512*1024, "restart")}, 64*1024)
-			}
-			f := btDownloadFetcher(t, nil)
-			dir := t.TempDir()
-			btResolve(t, f, fixture.Magnet)
-			f.Meta().Opts = &base.Options{Path: dir}
-			btStart(t, f)
-			btAwaitPartial(t, f)
-			btPause(t, f)
-			checkpoint := btStore(t, f)
-			hash := f.Meta().Res.Hash
-			btCloseForRestart(t, f)
-			seedStats := fixture.Torrent.Stats()
-			sentBeforeRestart := seedStats.BytesWrittenData.Int64()
-			restored := btRestore(t, checkpoint)
-			if restored.Meta().Opts.Path != dir || restored.Meta().Res.Hash != hash {
-				t.Fatal("download directory or hash was lost")
-			}
-			fixture.Limiter.SetLimit(rate.Inf)
-			btStart(t, restored)
-			btAwaitDone(t, restored)
-			fixture.AssertFiles(t, dir)
-			seedStats = fixture.Torrent.Stats()
-			if sent := seedStats.BytesWrittenData.Int64() - sentBeforeRestart; sent >= 512*1024 {
-				t.Fatalf("restart redownloaded the entire file: %d bytes", sent)
-			}
-		})
-	}
-}
-
-func TestBTDownloadHybrid(t *testing.T) {
-	fixture := newBTHybridFixture(t, btPayload(80*1024, "hybrid-v2"))
-	f := btDownloadFetcher(t, nil)
-	dir := t.TempDir()
-	btResolve(t, f, fixture.Magnet)
-	f.Meta().Opts = &base.Options{Path: dir}
-	btStart(t, f)
-	btAwaitDone(t, f)
-	fixture.AssertFiles(t, dir)
-}
-
-func TestBTRepairCorruptedExistingFile(t *testing.T) {
-	fixture := newBTFixture(t, map[string][]byte{"": btPayload(128*1024, "repair")}, 0)
-	dir := t.TempDir()
-	damaged := append([]byte(nil), fixture.Files["payload.bin"]...)
-	damaged[20000] ^= 0xff
-	if err := os.WriteFile(filepath.Join(dir, "payload.bin"), damaged, 0600); err != nil {
-		t.Fatal(err)
-	}
-	f := btDownloadFetcher(t, nil)
-	btResolve(t, f, fixture.Magnet)
-	f.Meta().Opts = &base.Options{Path: dir}
-	btStart(t, f)
-	btAwaitDone(t, f)
-	fixture.AssertFiles(t, dir)
-}
-
-func TestBTPatchSelectionWhilePaused(t *testing.T) {
-	fixture := newBTFixture(t, map[string][]byte{"a.bin": btPayload(256*1024, "patch-a"), "b.bin": btPayload(256*1024, "patch-b")}, 64*1024)
-	f := btDownloadFetcher(t, nil)
-	dir := t.TempDir()
-	btResolve(t, f, fixture.Magnet)
-	f.Meta().Opts = &base.Options{Path: dir, SelectFiles: []int{0}}
-	btStart(t, f)
-	btAwaitPartial(t, f)
-	btPause(t, f)
-	if err := f.Patch(nil, &base.Options{SelectFiles: []int{1}}); err != nil {
-		t.Fatal(err)
-	}
-	fixture.Limiter.SetLimit(rate.Inf)
-	btStart(t, f)
-	btAwaitDone(t, f)
-	fixture.AssertFiles(t, dir, filepath.Join("bundle", "b.bin"))
-	for _, suffix := range []string{"", ".part"} {
-		if _, err := os.Stat(filepath.Join(dir, "bundle", "a.bin") + suffix); !os.IsNotExist(err) {
-			t.Fatalf("unselected output remains: %v", err)
-		}
-	}
-}
-
-func TestBTDownloadMultiFileWithEmptyFile(t *testing.T) {
-	fixture := newBTFixture(t, map[string][]byte{"empty.txt": {}, "nested/data.bin": btPayload(48*1024, "empty-file")}, 0)
-	f := btDownloadFetcher(t, nil)
-	dir := t.TempDir()
-	btResolve(t, f, fixture.Magnet)
-	f.Meta().Opts = &base.Options{Path: dir}
-	btStart(t, f)
-	btAwaitDone(t, f)
-	fixture.AssertFiles(t, dir)
-}

internal/protocol/bt/fetcher.go

@@ -3,13 +3,11 @@ package bt
 import (
 	"bytes"
 	"context"
-	"errors"
 	"fmt"
 	"io"
 	"net/url"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -35,10 +33,6 @@ var (
 )
 
 type Fetcher struct {
-	mu        sync.Mutex
-	closeOnce sync.Once
-	storage   *deferredFileStorage
-
 	ctl    *controller.Controller
 	config *config
 
@@ -83,8 +77,6 @@ func (f *Fetcher) initClient() (err error) {
 	cfg.Bep20 = fmt.Sprintf("-GP%s-", parseBep20())
 	cfg.ExtendedHandshakeClientVersion = fmt.Sprintf("Gopeed %s", base.Version)
 	cfg.ListenPort = f.config.ListenPort
-	cfg.NoDHT = f.config.DisableDHT
-	cfg.DisablePEX = f.config.DisablePEX
 	cfg.HTTPProxy = f.ctl.GetProxy(f.meta.Req.Proxy)
 	dnsResolver := &DnsCacheResolver{RefreshTimeout: 5 * time.Minute}
 	cfg.TrackerDialContext = dnsResolver.DialContext
@@ -100,17 +92,13 @@ func (f *Fetcher) initClient() (err error) {
 	return
 }
 
-func (f *Fetcher) Resolve(req *base.Request) error {
+func (f *Fetcher) Resolve(req *base.Request, opts *base.Options) error {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if f.torrent != nil {
-		f.safeDrop()
-		f.torrent = nil
-		f.storage = nil
-		f.torrentReady.Store(false)
-	}
 	f.meta.Req = req
-	if err := f.addTorrent(req); err != nil {
+	f.meta.Opts = opts
+	if f.meta.Opts == nil {
+		f.meta.Opts = &base.Options{}
+	}
+	if err := f.addTorrent(req, false); err != nil {
 		return err
 	}
 	f.updateRes()
@@ -118,72 +106,12 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 }
 
 func (f *Fetcher) Start() (err error) {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if f.meta.Opts == nil || f.meta.Opts.Path == "" {
-		return errors.New("download directory is required when starting a torrent")
-	}
-	if err := f.torrentDropCtx.Err(); err != nil {
-		return err
-	}
 	if !f.torrentReady.Load() {
-		if err = f.addTorrent(f.meta.Req); err != nil {
+		if err = f.addTorrent(f.meta.Req, false); err != nil {
 			return
 		}
 	}
 
-	path := f.meta.Opts.Path
-	if err := os.MkdirAll(path, 0755); err != nil {
-		return err
-	}
-	hashes, err := f.storage.bind(storage.NewFileClientOpts{
-		ClientBaseDir: path,
-		FilePathMaker: func(opts storage.FilePathMakerOpts) string {
-			_, name := torrentFileLayout(opts.Info, *opts.File)
-			return name
-		},
-	})
-	if err != nil {
-		return err
-	}
-	if hashes != nil {
-		// File storage infers completion from final file names and sizes. Verify
-		// before publishing that state, or peers can see an unverified file as
-		// complete and disconnect before a damaged piece is discovered.
-		// Late v2 hashes schedule their own initial checks through the library.
-		changes := f.torrent.SubscribePieceStateChanges()
-		defer changes.Close()
-		for i, known := range hashes {
-			if !known {
-				continue
-			}
-			if err := f.torrentDropCtx.Err(); err != nil {
-				return err
-			}
-			if err := f.torrent.Piece(i).VerifyDataContext(f.torrentDropCtx); err != nil {
-				return err
-			}
-			// VerifyDataContext can return while the result is still being
-			// written to storage. Wait for it before refreshing completion.
-			for {
-				state := f.torrent.Piece(i).State()
-				if !state.Hashing && !state.QueuedForHash && !state.Marking {
-					break
-				}
-				select {
-				case <-changes.Values:
-				case <-f.torrentDropCtx.Done():
-					return f.torrentDropCtx.Err()
-				case <-f.torrent.Closed():
-					return errors.New("torrent closed during verification")
-				}
-			}
-		}
-		for i := range hashes {
-			f.torrent.Piece(i).UpdateCompletion()
-		}
-	}
-
 	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 {
@@ -204,29 +132,21 @@ func (f *Fetcher) Start() (err error) {
 		}
 	}
 	f.torrent.AllowDataDownload()
-	go f.doUpload(false)
 	return
 }
 
 func (f *Fetcher) Pause() (err error) {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if f.torrent == nil {
-		return nil
-	}
 	f.torrent.DisallowDataDownload()
 	return
 }
 
 func (f *Fetcher) Close() (err error) {
-	f.closeOnce.Do(func() {
+	f.safeDrop()
-		f.torrentDropFunc()
+	f.torrentDropFunc()
-		f.mu.Lock()
+	f.uploadDoneCh <- nil
-		defer f.mu.Unlock()
+	if len(client.Torrents()) == 0 {
-		f.safeDrop()
+		err = closeClient()
-		f.torrentReady.Store(false)
+	}
-		close(f.uploadDoneCh)
-	})
 	return nil
 }
 
@@ -244,8 +164,6 @@ func (f *Fetcher) Meta() *fetcher.FetcherMeta {
 }
 
 func (f *Fetcher) Stats() *fetcher.Stats {
-	f.mu.Lock()
-	defer f.mu.Unlock()
 	var stats torrent.TorrentStats
 	var pieceMap *base.PieceMap
 	pieceMapReady := false
@@ -452,138 +370,53 @@ func normalizeBTTransport(network string) string {
 }
 
 func (f *Fetcher) Progress() fetcher.Progress {
-	f.mu.Lock()
-	defer f.mu.Unlock()
 	if !f.torrentReady.Load() {
-		return append(fetcher.Progress(nil), f.data.Progress...)
+		return f.data.Progress
 	}
 	for i := range f.data.Progress {
 		selectIndex := f.meta.Opts.SelectFiles[i]
 		file := f.torrent.Files()[selectIndex]
 		f.data.Progress[i] = file.BytesCompleted()
 	}
-	return append(fetcher.Progress(nil), f.data.Progress...)
+	return f.data.Progress
 }
 
-func (f *Fetcher) Wait() error {
+func (f *Fetcher) Wait() (err error) {
-	f.mu.Lock()
-	var closed <-chan struct{}
-	if f.torrent != nil {
-		closed = f.torrent.Closed()
-	}
-	f.mu.Unlock()
-	ticker := time.NewTicker(time.Second)
-	defer ticker.Stop()
 	for {
 		select {
 		case <-f.torrentDropCtx.Done():
-			return nil
+			return
-		case <-closed:
+		case <-time.After(time.Second):
-			return nil
+			if f.torrentReady.Load() && len(f.meta.Opts.SelectFiles) > 0 {
-		case <-ticker.C:
+				if f.isDone() {
-			done, err := f.finishDownload()
+					// remove unselected files
-			if done || err != nil {
+					for i, file := range f.torrent.Files() {
-				return err
+						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) finishDownload() (bool, error) {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if !f.torrentReady.Load() || f.meta.Opts == nil || len(f.meta.Opts.SelectFiles) == 0 || !f.isDoneLocked() {
-		return false, nil
-	}
-	selected := make(map[int]bool, len(f.meta.Opts.SelectFiles))
-	for _, i := range f.meta.Opts.SelectFiles {
-		selected[i] = true
-	}
-	for i, file := range f.torrent.Files() {
-		if selected[i] {
-			continue
-		}
-		root, name := torrentFileLayout(f.torrent.Info(), file.FileInfo())
-		if err := removeUnselectedFile(f.meta.Opts.Path, root, name); err != nil {
-			return false, err
-		}
-	}
-	return true, nil
-}
-
-// Match the file storage layout, including its NoName convention for rootless
-// torrents. File.Path() always prepends BestName, even when storage omits it.
-func torrentFileLayout(info *metainfo.Info, file metainfo.FileInfo) (root, name string) {
-	parts := file.BestPath()
-	if info.BestName() != metainfo.NoName {
-		if len(parts) > 0 {
-			root = info.BestName()
-		}
-		parts = append([]string{info.BestName()}, parts...)
-	}
-	// A v2 file tree can itself have a named root without an extra name wrapper.
-	if root == "" && info.HasV2() && len(info.FileTree.Dir) == 1 {
-		for dir, tree := range info.FileTree.Dir {
-			if tree.IsDir() {
-				root = dir
-			}
-		}
-	}
-	return root, filepath.Join(parts...)
-}
-
-// Preserve the actual torrent root, or the download directory for rootless
-// torrents. Only prune empty directories strictly below that boundary.
-func removeUnselectedFile(downloadDir, torrentRoot, torrentPath string) error {
-	if !filepath.IsLocal(torrentPath) || (torrentRoot != "" && !filepath.IsLocal(torrentRoot)) {
-		return fmt.Errorf("invalid torrent file path %q", torrentPath)
-	}
-	root := filepath.Join(downloadDir, torrentRoot)
-	name := filepath.Join(downloadDir, torrentPath)
-	rel, err := filepath.Rel(root, name)
-	if err != nil || rel == "." || !filepath.IsLocal(rel) {
-		return fmt.Errorf("torrent file %q is outside cleanup root %q", name, root)
-	}
-	for _, candidate := range []string{name, name + ".part"} {
-		if err := util.SafeRemove(candidate); err != nil {
-			return fmt.Errorf("remove unselected torrent file %q: %w", candidate, err)
-		}
-	}
-	for dir := filepath.Dir(name); dir != root && dir != filepath.Dir(dir); dir = filepath.Dir(dir) {
-		entries, err := os.ReadDir(dir)
-		if os.IsNotExist(err) {
-			continue
-		}
-		if err != nil {
-			return fmt.Errorf("read torrent directory %q: %w", dir, err)
-		}
-		if len(entries) != 0 {
-			break
-		}
-		if err := util.SafeRemove(dir); err != nil {
-			return fmt.Errorf("remove empty torrent directory %q: %w", dir, err)
-		}
-	}
-	return nil
-}
-
 func (f *Fetcher) isDone() bool {
-	f.mu.Lock()
+	if f.meta.Opts == nil {
-	defer f.mu.Unlock()
-	return f.isDoneLocked()
-}
-
-func (f *Fetcher) isDoneLocked() bool {
-	if f.meta.Opts == nil || f.torrent == nil {
 		return false
 	}
-	for _, index := range f.meta.Opts.SelectFiles {
+	for _, selectIndex := range f.meta.Opts.SelectFiles {
-		file := f.torrent.Files()[index]
+		file := f.torrent.Files()[selectIndex]
-		for i := file.BeginPieceIndex(); i < file.EndPieceIndex(); i++ {
+		if file.BytesCompleted() < file.Length() {
-			state := f.torrent.Piece(i).State()
+			return false
-			if !state.Ok || !state.Complete || state.Hashing || state.QueuedForHash {
-				return false
-			}
 		}
 	}
 	return true
@@ -592,11 +425,6 @@ func (f *Fetcher) isDoneLocked() bool {
 // Patch modifies the BT task settings.
 // Invalid file indices are silently ignored.
 func (f *Fetcher) Patch(req *base.Request, opts *base.Options) error {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if f.meta.Opts == nil {
-		f.meta.Opts = &base.Options{}
-	}
 	if opts == nil {
 		return nil
 	}
@@ -653,9 +481,9 @@ func (f *Fetcher) updateRes() {
 		Files: make([]*base.FileInfo, len(f.torrent.Files())),
 		Hash:  f.torrent.InfoHash().String(),
 	}
-	// Use the same root classification as storage (v2 single files have Length == 0).
+	// Directory torrent
-	if files := f.torrent.Files(); len(files) > 0 {
+	if f.torrent.Info().Length == 0 {
-		res.Name, _ = torrentFileLayout(f.torrent.Info(), files[0].FileInfo())
+		res.Name = f.torrent.Name()
 	}
 	for i, file := range f.torrent.Files() {
 		res.Files[i] = &base.FileInfo{
@@ -672,50 +500,61 @@ func (f *Fetcher) updateRes() {
 }
 
 func (f *Fetcher) Upload() (err error) {
-	if err = f.Start(); err != nil {
+	return f.addTorrent(f.meta.Req, true)
-		return err
-	}
-	return nil
 }
 
 func (f *Fetcher) doUpload(fromUpload bool) {
 	if !f.torrentUpload.CompareAndSwap(false, true) {
 		return
 	}
-	f.mu.Lock()
+
-	initialBytes, initialTime := f.data.SeedBytes, f.data.SeedTime
+	// Check and update seed data
-	torrentClosed := f.torrent.Closed()
+	lastData := &fetcherData{
-	f.mu.Unlock()
+		SeedBytes: f.data.SeedBytes,
-	var doneTime int64
+		SeedTime:  f.data.SeedTime,
-	ticker := time.NewTicker(time.Second)
+	}
-	defer ticker.Stop()
+	var doneTime int64 = 0
 	for {
 		select {
 		case <-f.torrentDropCtx.Done():
 			return
-		case <-torrentClosed:
+		case <-time.After(time.Second):
-			return
-		case <-ticker.C:
-			f.mu.Lock()
 			if !f.torrentReady.Load() {
-				f.mu.Unlock()
 				continue
 			}
+
 			stats := f.torrentStats()
-			f.data.SeedBytes = initialBytes + stats.BytesWrittenData.Int64()
+			f.data.SeedBytes = lastData.SeedBytes + stats.BytesWrittenData.Int64()
-			if !fromUpload && !f.isDoneLocked() {
+
-				f.mu.Unlock()
+			// 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 = initialTime + time.Now().Unix() - doneTime
+			f.data.SeedTime = lastData.SeedTime + time.Now().Unix() - doneTime
-			stop := !f.config.SeedKeep && ((f.config.SeedRatio > 0 && f.seedRadio() >= f.config.SeedRatio) || (f.config.SeedTime > 0 && f.data.SeedTime >= f.config.SeedTime))
+
-			f.mu.Unlock()
+			// If the seed forever is true, keep seeding
-			if stop {
+			if f.config.SeedKeep {
-				f.Close()
+				continue
-				return
+			}
+
+			// 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
+				}
 			}
 		}
 	}
@@ -733,8 +572,6 @@ func (f *Fetcher) torrentStats() torrent.TorrentStats {
 }
 
 func (f *Fetcher) UploadedBytes() int64 {
-	f.mu.Lock()
-	defer f.mu.Unlock()
 	return f.data.SeedBytes
 }
 
@@ -743,8 +580,7 @@ func (f *Fetcher) WaitUpload() (err error) {
 	return nil
 }
 
-func (f *Fetcher) addTorrent(req *base.Request) (err error) {
+func (f *Fetcher) addTorrent(req *base.Request, fromUpload bool) (err error) {
-	f.ctl.GetConfig(&f.config)
 	if err = base.ParseReqExtra[bt.ReqExtra](req); err != nil {
 		return
 	}
@@ -763,16 +599,11 @@ func (f *Fetcher) addTorrent(req *base.Request) (err error) {
 		var reader io.Reader
 		if schema == "FILE" {
 			fileUrl, _ := url.Parse(req.URL)
-			filePath := fileUrl.Path
+			filePath := fileUrl.Path[1:]
-			if runtime.GOOS == "windows" && len(filePath) > 2 && filePath[0] == '/' && filePath[2] == ':' {
-				filePath = filePath[1:]
-			}
-			filePath = filepath.FromSlash(filePath)
 			reader, err = os.Open(filePath)
 			if err != nil {
 				return
 			}
-			defer reader.(io.Closer).Close()
 		} else if schema == "DATA" {
 			_, data := util.ParseDataUri(req.URL)
 			reader = bytes.NewBuffer(data)
@@ -805,6 +636,17 @@ func (f *Fetcher) addTorrent(req *base.Request) (err error) {
 			return
 		}
 	}
+	spec.Storage = storage.NewFileOpts(storage.NewFileClientOpts{
+		ClientBaseDir: cfg.DataDir,
+		TorrentDirMaker: func(baseDir string, info *metainfo.Info, infoHash metainfo.Hash) string {
+			return f.meta.Opts.Path
+		},
+	})
+	f.torrent, _, err = client.AddTorrentSpec(spec)
+	if err != nil {
+		return
+	}
+
 	// Do not add external tracker to a private torrent.
 	if !privateTorrent {
 		// use map to deduplicate
@@ -817,40 +659,23 @@ func (f *Fetcher) addTorrent(req *base.Request) (err error) {
 				}
 			}
 		}
-		for _, tracker := range f.config.effectiveTrackers() {
+		if len(f.config.Trackers) > 0 {
-			trackers[tracker] = true
+			for _, tracker := range f.config.Trackers {
-		}
+				trackers[tracker] = true
-		if len(trackers) > 0 {
-			for tracker := range trackers {
-				spec.Trackers = append(spec.Trackers, []string{tracker})
 			}
 		}
+		if len(trackers) > 0 {
+			announceList := make([][]string, 0)
+			for tracker := range trackers {
+				announceList = append(announceList, []string{tracker})
+			}
+			f.torrent.AddTrackers(announceList)
+		}
 	}
-	s := &deferredFileStorage{}
+	<-f.torrent.GotInfo()
-	spec.Storage = s
-	var added bool
-	f.torrent, added, err = client.AddTorrentSpec(spec)
-	if err != nil {
-		return err
-	}
-	if !added {
-		f.torrent = nil
-		return errors.New("torrent is already active")
-	}
-	f.storage = s
-	f.torrent.DisallowDataDownload()
-	// Extra trackers must be available while magnet metadata is still missing;
-	// they may be the only way to discover a peer that can provide it.
-	select {
-	case <-f.torrent.GotInfo():
-	case <-f.torrentDropCtx.Done():
-		f.safeDrop()
-		return f.torrentDropCtx.Err()
-	case <-f.torrent.Closed():
-		return errors.New("torrent closed during resolution")
-	}
 	f.torrentReady.Store(true)
 
+	go f.doUpload(fromUpload)
 	return
 }
 
@@ -946,29 +771,17 @@ func (fm *FetcherManager) AutoRename() bool {
 
 func (fm *FetcherManager) DefaultConfig() any {
 	return &config{
-		TrackerSubscribeURLs: append([]string{}, defaultTrackerSubscribeURLs...),
-		AutoUpdateTrackers:   true,
-		CustomTrackers:       []string{},
-		ConfigState: fetcher.ConfigState[state]{State: state{
-			TrackerSources:              map[string][]string{},
-			TrackerSubscriptionStatuses: map[string]trackerSubscriptionStatus{},
-		}},
 		ListenPort: 0,
+		Trackers:   []string{},
 		SeedKeep:   false,
 		SeedRatio:  1.0,
 		SeedTime:   120 * 60,
-		DisableDHT: false,
-		DisablePEX: false,
 	}
 }
 
 func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
 	_f := f.(*Fetcher)
-	_f.mu.Lock()
+	return _f.data, nil
-	defer _f.mu.Unlock()
-	snapshot := *_f.data
-	snapshot.Progress = append(fetcher.Progress(nil), snapshot.Progress...)
-	return &snapshot, nil
 }
 
 func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {

internal/protocol/bt/fetcher_test.go

@@ -18,11 +18,11 @@ import (
 )
 
 func TestFetcher_Resolve_Torrent(t *testing.T) {
-	doResolve(t, buildFetcher(t))
+	doResolve(t, buildFetcher())
 }
 
 func TestFetcher_Resolve_DataUri_Torrent(t *testing.T) {
-	fetcher := buildFetcher(t)
+	fetcher := buildFetcher()
 	buf, err := os.ReadFile("./testdata/ubuntu-22.04-live-server-amd64.iso.torrent")
 	if err != nil {
 		t.Fatal(err)
@@ -31,7 +31,7 @@ func TestFetcher_Resolve_DataUri_Torrent(t *testing.T) {
 	dataUri := "data:application/x-bittorrent;base64," + base64.StdEncoding.EncodeToString(buf)
 	err = fetcher.Resolve(&base.Request{
 		URL: dataUri,
-	})
+	}, nil)
 	if err != nil {
 		panic(err)
 	}
@@ -53,7 +53,7 @@ func TestFetcher_Resolve_DataUri_Torrent(t *testing.T) {
 }
 
 func TestFetcher_Config(t *testing.T) {
-	doResolve(t, buildConfigFetcher(t, nil))
+	doResolve(t, buildConfigFetcher(nil))
 }
 
 func TestFetcher_ResolveWithProxy(t *testing.T) {
@@ -61,7 +61,7 @@ func TestFetcher_ResolveWithProxy(t *testing.T) {
 	proxyListener := test.StartSocks5Server(usr, pwd)
 	defer proxyListener.Close()
 
-	doResolve(t, buildConfigFetcher(t, &base.DownloaderProxyConfig{
+	doResolve(t, buildConfigFetcher(&base.DownloaderProxyConfig{
 		Enable: true,
 		System: false,
 		Scheme: "socks5",
@@ -81,7 +81,7 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 					"udp://tracker.bitsearch.to:1337/announce",
 				},
 			},
-		})
+		}, nil)
 		if err != nil {
 			panic(err)
 		}
@@ -111,7 +111,7 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 					"udp://tracker.bitsearch.to:1337/announce",
 				},
 			},
-		})
+		}, nil)
 		if err != nil {
 			panic(err)
 		}
@@ -145,7 +145,7 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 	t.Run("Resolve Unclean Torrent", func(t *testing.T) {
 		err := fetcher.Resolve(&base.Request{
 			URL: "./testdata/test.unclean.torrent",
-		})
+		}, nil)
 		if err != nil {
 			t.Errorf("Resolve Unclean Torrent Resolve() got = %v, want nil", err)
 		}
@@ -156,7 +156,7 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 		uri := "file:///" + file
 		err := fetcher.Resolve(&base.Request{
 			URL: uri,
-		})
+		}, nil)
 		if err != nil {
 			t.Errorf("Resolve file scheme Torrent Resolve() got = %v, want nil", err)
 		}
@@ -211,7 +211,7 @@ func TestFetcherManager_ParseName(t *testing.T) {
 	}
 }
 
-func buildFetcher(t testing.TB) fetcher.Fetcher {
+func buildFetcher() fetcher.Fetcher {
 	fb := new(FetcherManager)
 	fetcher := fb.Build()
 	newController := controller.NewController()
@@ -219,15 +219,14 @@ func buildFetcher(t testing.TB) fetcher.Fetcher {
 		json.Unmarshal([]byte(test.ToJson(fb.DefaultConfig())), v)
 	}
 	fetcher.Setup(newController)
-	t.Cleanup(func() { fetcher.Close(); closeClient() })
 	return fetcher
 }
 
-func buildConfigFetcher(t testing.TB, proxyConfig *base.DownloaderProxyConfig) fetcher.Fetcher {
+func buildConfigFetcher(proxyConfig *base.DownloaderProxyConfig) fetcher.Fetcher {
 	fetcher := new(FetcherManager).Build()
 	newController := controller.NewController()
 	mockCfg := config{
-		CustomTrackers: []string{
+		Trackers: []string{
 			"udp://tracker.birkenwald.de:6969/announce",
 			"udp://tracker.bitsearch.to:1337/announce",
 		}}
@@ -238,30 +237,29 @@ func buildConfigFetcher(t testing.TB, proxyConfig *base.DownloaderProxyConfig) f
 		return proxyConfig.ToHandler()
 	}
 	fetcher.Setup(newController)
-	t.Cleanup(func() { fetcher.Close(); closeClient() })
 	return fetcher
 }
 
 // TestFetcher_Patch tests the Patch functionality for BT fetcher.
 // It tests modifying selected files after Resolve (without downloading).
 func TestFetcher_Patch(t *testing.T) {
-	f := buildFetcher(t)
+	f := buildFetcher()
 
 	// Resolve a multi-file torrent
 	err := f.Resolve(&base.Request{
 		URL: "./testdata/test.torrent",
-	})
+	}, nil)
 	if err != nil {
 		t.Fatalf("Resolve failed: %v", err)
 	}
 
-	// Resolution describes files without choosing download options.
+	// Verify initial state: 3 files, all selected by default
 	meta := f.Meta()
 	if len(meta.Res.Files) != 3 {
 		t.Fatalf("Expected 3 files, got %d", len(meta.Res.Files))
 	}
-	if meta.Opts != nil {
+	if len(meta.Opts.SelectFiles) != 3 {
-		t.Fatal("Resolve should not assign download options")
+		t.Fatalf("Expected 3 selected files, got %d", len(meta.Opts.SelectFiles))
 	}
 
 	// Total size of all files: 107484864
@@ -368,52 +366,3 @@ func TestFetcher_Patch(t *testing.T) {
 		}
 	})
 }
-
-func TestFetcher_PeerDiscoveryConfig(t *testing.T) {
-	tests := []struct {
-		name           string
-		stored         any
-		wantDisableDHT bool
-		wantDisablePEX bool
-	}{
-		{"default config", new(FetcherManager).DefaultConfig(), false, false},
-		{"stored config without the fields", map[string]any{"listenPort": 0, "seedRatio": 1.0}, false, false},
-		{"both disabled", map[string]any{"disableDht": true, "disablePex": true}, true, true},
-		{"only DHT disabled", map[string]any{"disableDht": true}, true, false},
-		{"only PEX disabled", map[string]any{"disablePex": true}, false, true},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := buildFetcherWithConfig(tt.stored).(*Fetcher)
-			if f.config.DisableDHT != tt.wantDisableDHT || f.config.DisablePEX != tt.wantDisablePEX {
-				t.Errorf("config got DisableDHT = %v, DisablePEX = %v, want %v, %v", f.config.DisableDHT, f.config.DisablePEX, tt.wantDisableDHT, tt.wantDisablePEX)
-			}
-		})
-	}
-}
-
-func TestFetcher_PeerDiscoveryDisabledOnClient(t *testing.T) {
-	if err := closeClient(); err != nil {
-		t.Fatal(err)
-	}
-	f := buildFetcherWithConfig(map[string]any{"disableDht": true, "disablePex": true})
-	if err := f.Resolve(&base.Request{URL: "./testdata/test.torrent"}); err != nil {
-		t.Fatal(err)
-	}
-	if !cfg.NoDHT || !cfg.DisablePEX {
-		t.Errorf("client config got NoDHT = %v, DisablePEX = %v, want true", cfg.NoDHT, cfg.DisablePEX)
-	}
-	if n := len(client.DhtServers()); n != 0 {
-		t.Errorf("client got %d DHT servers, want 0", n)
-	}
-}
-
-func buildFetcherWithConfig(stored any) fetcher.Fetcher {
-	fetcher := new(FetcherManager).Build()
-	newController := controller.NewController()
-	newController.GetConfig = func(v any) {
-		json.Unmarshal([]byte(test.ToJson(stored)), v)
-	}
-	fetcher.Setup(newController)
-	return fetcher
-}

internal/protocol/bt/fixture_test.go

@@ -1,212 +0,0 @@
-package bt
-
-import (
-	"bytes"
-	"context"
-	"encoding/base64"
-	"encoding/binary"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/anacrolix/torrent"
-	"github.com/anacrolix/torrent/bencode"
-	"github.com/anacrolix/torrent/merkle"
-	"github.com/anacrolix/torrent/metainfo"
-	"golang.org/x/time/rate"
-)
-
-// btFixture serves generated, trackerless content over a real loopback TCP peer.
-// Its HTTP tracker exercises .torrent downloads; magnet links also carry the
-// explicit x.pe address.
-type btFixture struct {
-	MetaInfo    *metainfo.MetaInfo
-	Magnet      string
-	TorrentFile string
-	DataURI     string
-	TrackerURL  string
-	Files       map[string][]byte // Paths relative to the selected download directory.
-	Seeder      *torrent.Client
-	Torrent     *torrent.Torrent
-	Limiter     *rate.Limiter
-}
-
-func newBTFixture(t testing.TB, files map[string][]byte, bytesPerSecond int) *btFixture {
-	return makeBTFixture(t, files, bytesPerSecond, false, true)
-}
-
-func newBTHybridFixture(t testing.TB, payload []byte) *btFixture {
-	return makeBTFixture(t, map[string][]byte{"": payload}, 0, true, true)
-}
-
-func makeBTFixture(t testing.TB, files map[string][]byte, bytesPerSecond int, v2, private bool) *btFixture {
-	t.Helper()
-	source := t.TempDir()
-	name := "payload.bin"
-	if _, single := files[""]; !single {
-		name = "bundle"
-	}
-	root := filepath.Join(source, name)
-	expected := make(map[string][]byte, len(files))
-	for path, data := range files {
-		target := filepath.Join(root, filepath.FromSlash(path))
-		if err := os.MkdirAll(filepath.Dir(target), 0700); err != nil {
-			t.Fatal(err)
-		}
-		if err := os.WriteFile(target, data, 0600); err != nil {
-			t.Fatal(err)
-		}
-		expected[filepath.Join(name, filepath.FromSlash(path))] = append([]byte(nil), data...)
-	}
-	info := metainfo.Info{PieceLength: 16 * 1024}
-	if err := info.BuildFromFilePath(root); err != nil {
-		t.Fatal(err)
-	}
-	var layers map[string]string
-	if v2 {
-		data := files[""]
-		h := merkle.NewHash()
-		h.Write(data)
-		root := h.Sum(nil)
-		var pieceHashes []byte
-		for off := 0; off < len(data); off += int(info.PieceLength) {
-			end := min(off+int(info.PieceLength), len(data))
-			ph := merkle.NewHash()
-			ph.Write(data[off:end])
-			pieceHashes = append(pieceHashes, ph.SumMinLength(nil, int(info.PieceLength))...)
-		}
-		info = metainfo.Info{Name: name, PieceLength: info.PieceLength, Length: int64(len(data)), Pieces: info.Pieces, MetaVersion: 2, FileTree: metainfo.FileTree{File: metainfo.FileTreeFile{Length: int64(len(data)), PiecesRoot: string(root)}}}
-		layers = map[string]string{string(root): string(pieceHashes)}
-	}
-	// Private torrents avoid public DHT discovery once metadata is available.
-	info.Private = &private
-	raw, err := bencode.Marshal(&info)
-	if err != nil {
-		t.Fatal(err)
-	}
-	mi := &metainfo.MetaInfo{InfoBytes: raw, PieceLayers: layers}
-	cfg := torrent.TestingConfig(t)
-	cfg.DataDir = source
-	cfg.Seed = true
-	cfg.DisableUTP = true
-	cfg.DisableIPv6 = true
-	cfg.DisableWebtorrent = true
-	cfg.KeepAliveTimeout = time.Minute
-	cfg.MaxAllocPeerRequestDataPerConn = 1 << 20
-	limiter := rate.NewLimiter(rate.Inf, 16*1024)
-	if bytesPerSecond > 0 {
-		limiter.SetLimit(rate.Limit(bytesPerSecond))
-	}
-	cfg.UploadRateLimiter = limiter
-	seed, err := torrent.NewClient(cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { seed.Close() })
-	seeded, _, err := seed.AddTorrentSpec(torrent.TorrentSpecFromMetaInfo(mi))
-	if err != nil {
-		t.Fatal(err)
-	}
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-	if err := seeded.VerifyDataContext(ctx); err != nil {
-		t.Fatal(err)
-	}
-	select {
-	case <-seeded.Complete().On():
-	case <-ctx.Done():
-		t.Fatal("local seeder did not finish verification")
-	}
-	addr := seed.ListenAddrs()[0].String()
-	host, portString, err := net.SplitHostPort(addr)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resolved, err := net.ResolveTCPAddr("tcp4", net.JoinHostPort(host, portString))
-	if err != nil {
-		t.Fatal(err)
-	}
-	compact := make([]byte, 6)
-	copy(compact, resolved.IP.To4())
-	binary.BigEndian.PutUint16(compact[4:], uint16(resolved.Port))
-	tracker := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		response, err := bencode.Marshal(map[string]any{"interval": 3600, "peers": string(compact)})
-		if err != nil {
-			http.Error(w, err.Error(), 500)
-			return
-		}
-		w.Write(response)
-	}))
-	t.Cleanup(tracker.Close)
-	// The pinned library has a hybrid tracker-dispatch assertion bug.
-	// Hybrid fixtures use their explicit loopback peer rather than a tracker.
-	if !v2 {
-		mi.Announce = tracker.URL
-	}
-	var encoded bytes.Buffer
-	if err := mi.Write(&encoded); err != nil {
-		t.Fatal(err)
-	}
-	torrentFile := filepath.Join(t.TempDir(), "fixture.torrent")
-	if err := os.WriteFile(torrentFile, encoded.Bytes(), 0600); err != nil {
-		t.Fatal(err)
-	}
-	m, err := mi.MagnetV2()
-	if err != nil {
-		t.Fatal(err)
-	}
-	magnet := m.String()
-	u, err := url.Parse(magnet)
-	if err != nil {
-		t.Fatal(err)
-	}
-	q := u.Query()
-	q.Add("x.pe", addr)
-	u.RawQuery = q.Encode()
-	return &btFixture{MetaInfo: mi, Magnet: u.String(), TorrentFile: torrentFile, DataURI: "data:application/x-bittorrent;base64," + base64.StdEncoding.EncodeToString(encoded.Bytes()), TrackerURL: tracker.URL, Files: expected, Seeder: seed, Torrent: seeded, Limiter: limiter}
-}
-
-func btPayload(size int, label string) []byte {
-	data := make([]byte, size)
-	for i := range data {
-		data[i] = byte((i*31 + i/251) % 251)
-	}
-	copy(data, label)
-	return data
-}
-
-func (f *btFixture) AssertFiles(t testing.TB, dir string, paths ...string) {
-	t.Helper()
-	if len(paths) == 0 {
-		for path := range f.Files {
-			paths = append(paths, path)
-		}
-	}
-	for _, path := range paths {
-		got, err := os.ReadFile(filepath.Join(dir, path))
-		if err != nil {
-			t.Fatal(err)
-		}
-		want, ok := f.Files[path]
-		if !ok {
-			t.Fatalf("unknown fixture file %q", path)
-		}
-		if !bytes.Equal(got, want) {
-			t.Fatalf("BT file %s differs: received %d bytes, want %d", path, len(got), len(want))
-		}
-	}
-}
-
-func (f *btFixture) FileURI() string {
-	path := filepath.ToSlash(f.TorrentFile)
-	if !strings.HasPrefix(path, "/") {
-		path = "/" + path
-	}
-	return (&url.URL{Scheme: "file", Path: path}).String()
-}

internal/protocol/bt/selection_test.go

@@ -1,367 +0,0 @@
-package bt
-
-import (
-	"context"
-	"crypto/sha1"
-	"fmt"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/anacrolix/torrent"
-	"github.com/anacrolix/torrent/bencode"
-	"github.com/anacrolix/torrent/metainfo"
-	"github.com/anacrolix/torrent/storage"
-)
-
-func TestStartDoesNotPublishUnverifiedCompletion(t *testing.T) {
-	cfg := torrent.TestingConfig(t)
-	cfg.DisableTCP = true
-	cfg.DisableUTP = true
-	c, err := torrent.NewClient(cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-	payload := btPayload(32*1024, "unverified")
-	info := metainfo.Info{Name: "payload.bin", Length: int64(len(payload)), PieceLength: 16 * 1024}
-	for offset := 0; offset < len(payload); offset += int(info.PieceLength) {
-		hash := sha1.Sum(payload[offset : offset+int(info.PieceLength)])
-		info.Pieces = append(info.Pieces, hash[:]...)
-	}
-	raw, err := bencode.Marshal(info)
-	if err != nil {
-		t.Fatal(err)
-	}
-	store := &deferredFileStorage{}
-	spec := torrent.TorrentSpecFromMetaInfo(&metainfo.MetaInfo{InfoBytes: raw})
-	spec.Storage = store
-	tor, _, err := c.AddTorrentSpec(spec)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tor.DisallowDataDownload()
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	f := &Fetcher{torrent: tor, storage: store, meta: &fetcher.FetcherMeta{}, data: &fetcherData{}, torrentDropCtx: ctx, torrentDropFunc: cancel, config: &config{SeedKeep: true}}
-	f.torrentReady.Store(true)
-	f.updateRes()
-	dir := t.TempDir()
-	payload[20000] ^= 0xff
-	if err := os.WriteFile(filepath.Join(dir, info.Name), payload, 0600); err != nil {
-		t.Fatal(err)
-	}
-	f.meta.Opts = &base.Options{Path: dir}
-	// Retain the original event channel to detect even a transient completion.
-	// With no network transports, the damaged piece cannot have been repaired.
-	completed := tor.Complete().On()
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	select {
-	case <-completed:
-		t.Fatal("Start published completion before verifying the existing file")
-	default:
-	}
-}
-
-func TestStartUsesSelectionSubmittedAfterResolve(t *testing.T) {
-	cfg := torrent.TestingConfig(t)
-	cfg.DataDir = t.TempDir()
-	cfg.DisableTCP = true
-	cfg.DisableUTP = true
-	c, err := torrent.NewClient(cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-	store := &deferredFileStorage{}
-	mi, err := metainfo.LoadFromFile("testdata/test.torrent")
-	if err != nil {
-		t.Fatal(err)
-	}
-	spec := torrent.TorrentSpecFromMetaInfo(mi)
-	spec.Storage = store
-	tor, _, err := c.AddTorrentSpec(spec)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tor.DisallowDataDownload()
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	f := &Fetcher{torrent: tor, storage: store, meta: &fetcher.FetcherMeta{}, data: &fetcherData{}, torrentDropCtx: ctx, torrentDropFunc: cancel, config: &config{SeedKeep: true}}
-	f.torrentReady.Store(true)
-	f.updateRes()
-	f.meta.Opts = &base.Options{Path: t.TempDir(), SelectFiles: []int{2}}
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	for i, file := range tor.Files() {
-		want := torrent.PiecePriorityNone
-		if i == 2 {
-			want = torrent.PiecePriorityNormal
-		}
-		if file.Priority() != want {
-			t.Errorf("file %d priority = %v, want %v", i, file.Priority(), want)
-		}
-	}
-	if len(f.data.Progress) != 1 {
-		t.Fatalf("progress tracks %d files, want 1", len(f.data.Progress))
-	}
-	if err := f.Pause(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if tor.Files()[0].Priority() != torrent.PiecePriorityNone {
-		t.Fatal("resume selected an unselected file")
-	}
-}
-
-func TestWaitCleansUnselectedFilesFromSharedPiece(t *testing.T) {
-	for _, mode := range []string{"partial", "part only", "both paths", "all", "already removed", "remove error"} {
-		t.Run(mode, func(t *testing.T) {
-			dir := t.TempDir()
-			keepPath := filepath.Join(dir, "bundle", "keep.txt")
-			skipPath := filepath.Join(dir, "bundle", "nested", "skip.txt")
-			if err := os.MkdirAll(filepath.Dir(skipPath), 0755); err != nil {
-				t.Fatal(err)
-			}
-			if err := os.WriteFile(keepPath, []byte("keep"), 0644); err != nil {
-				t.Fatal(err)
-			}
-			if err := os.WriteFile(skipPath, []byte("skip"), 0644); err != nil {
-				t.Fatal(err)
-			}
-			// Both files occupy the same piece, so downloading keep.txt also writes skip.txt.
-			hash := sha1.Sum([]byte("keepskip"))
-			info := metainfo.Info{Name: "bundle", PieceLength: 16, Pieces: hash[:], Files: []metainfo.FileInfo{
-				{Length: 4, Path: []string{"keep.txt"}},
-				{Length: 4, Path: []string{"nested", "skip.txt"}},
-			}}
-			storageOpts := storage.NewFileClientOpts{
-				ClientBaseDir:   dir,
-				TorrentDirMaker: func(baseDir string, _ *metainfo.Info, _ metainfo.Hash) string { return baseDir },
-			}
-			// VerifyDataContext can return before storage finishes marking the piece
-			// complete. Disable automatic part-file promotion so it cannot rename
-			// the .part fixtures that this test creates to exercise cleanup.
-			storageOpts.UsePartFiles.Set(false)
-			store := storage.NewFileOpts(storageOpts)
-			defer store.Close()
-			config := torrent.TestingConfig(t)
-			config.DisableTCP = true
-			config.DisableUTP = true
-			c, err := torrent.NewClient(config)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer c.Close()
-			spec, err := torrent.TorrentSpecFromMetaInfoErr(&metainfo.MetaInfo{InfoBytes: bencode.MustMarshal(&info)})
-			if err != nil {
-				t.Fatal(err)
-			}
-			spec.Storage = store
-			tor, _, err := c.AddTorrentSpec(spec)
-			if err != nil {
-				t.Fatal(err)
-			}
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-			defer cancel()
-			if err := tor.VerifyDataContext(ctx); err != nil {
-				t.Fatal(err)
-			}
-			f := &Fetcher{torrent: tor, meta: &fetcher.FetcherMeta{Opts: &base.Options{Path: dir, SelectFiles: []int{0}}}, data: &fetcherData{}, torrentDropCtx: ctx}
-			f.torrentReady.Store(true)
-			f.updateRes()
-			if mode == "all" {
-				f.meta.Opts.SelectFiles = []int{0, 1}
-			}
-			if !f.isDone() {
-				t.Fatal("selected file is not complete")
-			}
-			if mode == "part only" || mode == "both paths" || mode == "all" {
-				if err := os.WriteFile(skipPath+".part", []byte("skip"), 0644); err != nil {
-					t.Fatal(err)
-				}
-			}
-			if mode == "part only" || mode == "already removed" || mode == "remove error" {
-				if err := os.Remove(skipPath); err != nil {
-					t.Fatal(err)
-				}
-			}
-			if mode == "remove error" {
-				if err := os.Mkdir(skipPath, 0755); err != nil {
-					t.Fatal(err)
-				}
-				if err := os.WriteFile(filepath.Join(skipPath, "child"), []byte("preserve"), 0644); err != nil {
-					t.Fatal(err)
-				}
-			}
-			err = f.Wait()
-			if ctx.Err() != nil {
-				t.Fatal(ctx.Err())
-			}
-			if mode == "remove error" {
-				if err == nil {
-					t.Fatal("cleanup failure was silently ignored")
-				}
-			} else if err != nil {
-				t.Fatal(err)
-			}
-			data, err := os.ReadFile(keepPath)
-			if err != nil || string(data) != "keep" {
-				t.Fatalf("selected file changed: %q, %v", data, err)
-			}
-			if mode == "all" {
-				if _, err := os.Stat(skipPath + ".part"); err != nil {
-					t.Fatalf("selected part file was removed: %v", err)
-				}
-				data, err := os.ReadFile(skipPath)
-				if err != nil || string(data) != "skip" {
-					t.Fatalf("selected file changed: %q, %v", data, err)
-				}
-			} else if mode != "remove error" {
-				for _, removed := range []string{skipPath, skipPath + ".part", filepath.Dir(skipPath)} {
-					if _, err := os.Stat(removed); !os.IsNotExist(err) {
-						t.Fatalf("unselected file or empty directory remains: %s: %v", removed, err)
-					}
-				}
-			}
-		})
-	}
-}
-
-func TestRemoveUnselectedFilePrunesOnlyEmptyParents(t *testing.T) {
-	for _, preserveSibling := range []bool{false, true} {
-		t.Run(fmt.Sprint(preserveSibling), func(t *testing.T) {
-			root := t.TempDir()
-			relative := filepath.Join("bundle", "nested", "deep", "skip.txt")
-			name := filepath.Join(root, relative)
-			if err := os.MkdirAll(filepath.Dir(name), 0755); err != nil {
-				t.Fatal(err)
-			}
-			if err := os.WriteFile(name+".part", []byte("partial"), 0644); err != nil {
-				t.Fatal(err)
-			}
-			sibling := filepath.Join(root, "bundle", "keep.txt")
-			if preserveSibling {
-				if err := os.WriteFile(sibling, []byte("keep"), 0644); err != nil {
-					t.Fatal(err)
-				}
-			}
-			if err := removeUnselectedFile(root, "bundle", relative); err != nil {
-				t.Fatal(err)
-			}
-			if _, err := os.Stat(filepath.Join(root, "bundle", "nested")); !os.IsNotExist(err) {
-				t.Fatalf("empty ancestors remain: %v", err)
-			}
-			if preserveSibling {
-				data, err := os.ReadFile(sibling)
-				if err != nil || string(data) != "keep" {
-					t.Fatalf("sibling changed: %q, %v", data, err)
-				}
-			}
-			if info, err := os.Stat(filepath.Join(root, "bundle")); err != nil || !info.IsDir() {
-				t.Fatalf("torrent root directory was removed: %v", err)
-			}
-			if _, err := os.Stat(root); err != nil {
-				t.Fatalf("download directory was removed: %v", err)
-			}
-			// A file directly inside the torrent root must not cause that root to be pruned.
-			rootFile := filepath.Join("bundle", "root.txt")
-			if err := os.WriteFile(filepath.Join(root, rootFile)+".part", []byte("partial"), 0644); err != nil {
-				t.Fatal(err)
-			}
-			if err := removeUnselectedFile(root, "bundle", rootFile); err != nil {
-				t.Fatal(err)
-			}
-			if _, err := os.Stat(filepath.Join(root, "bundle")); err != nil {
-				t.Fatalf("torrent root directory was removed after root-level cleanup: %v", err)
-			}
-			// Repeating cleanup after the file and its subdirectories are gone is harmless.
-			if err := removeUnselectedFile(root, "bundle", relative); err != nil {
-				t.Fatal(err)
-			}
-		})
-	}
-}
-
-func TestCleanupMatchesNamedAndRootlessStorage(t *testing.T) {
-	for _, version := range []int64{1, 2} {
-		for _, layout := range []string{"rootless", "wrapped", "file-tree-root"} {
-			if version == 1 && layout == "file-tree-root" {
-				continue
-			}
-			t.Run(fmt.Sprintf("v%d/%s", version, layout), func(t *testing.T) {
-				dir := t.TempDir()
-				info := metainfo.Info{Name: metainfo.NoName, PieceLength: 16384}
-				root := dir
-				if layout == "wrapped" {
-					info.Name = "bundle"
-					root = filepath.Join(dir, "bundle")
-				}
-				if version == 1 {
-					info.Files = []metainfo.FileInfo{{Path: []string{"keep.txt"}}, {Path: []string{"nested", "deep", "skip.txt"}}}
-				} else {
-					info.MetaVersion = 2
-					info.FileTree = metainfo.FileTree{Dir: map[string]metainfo.FileTree{
-						"keep.txt": {},
-						"nested":   {Dir: map[string]metainfo.FileTree{"deep": {Dir: map[string]metainfo.FileTree{"skip.txt": {}}}}},
-					}}
-				}
-				if layout == "file-tree-root" {
-					info.FileTree = metainfo.FileTree{Dir: map[string]metainfo.FileTree{"tree-root": info.FileTree}}
-					root = filepath.Join(dir, "tree-root")
-				}
-				// Keep the library's default FilePathMaker here to independently verify
-				// that cleanup agrees with its real disk layout, including NoName.
-				store := storage.NewFileOpts(storage.NewFileClientOpts{
-					ClientBaseDir:   dir,
-					TorrentDirMaker: func(baseDir string, _ *metainfo.Info, _ metainfo.Hash) string { return baseDir },
-				})
-				defer store.Close()
-				torrentStorage, err := store.OpenTorrent(context.Background(), &info, metainfo.Hash{1})
-				if err != nil {
-					t.Fatal(err)
-				}
-				defer torrentStorage.Close()
-				skip := filepath.Join(root, "nested", "deep", "skip.txt")
-				if _, err := os.Stat(skip); err != nil {
-					t.Fatalf("unexpected storage layout: %v", err)
-				}
-				if err := os.WriteFile(skip+".part", []byte("partial"), 0644); err != nil {
-					t.Fatal(err)
-				}
-				files := info.UpvertedFiles()
-				boundary, name := torrentFileLayout(&info, files[1])
-				if err := removeUnselectedFile(dir, boundary, name); err != nil {
-					t.Fatal(err)
-				}
-				if _, err := os.Stat(filepath.Join(root, "nested")); !os.IsNotExist(err) {
-					t.Fatalf("empty subtree remains: %v", err)
-				}
-				if _, err := os.Stat(filepath.Join(root, "keep.txt")); err != nil {
-					t.Fatalf("selected file removed: %v", err)
-				}
-				// Also verify the boundary when the protected directory becomes empty.
-				if err := os.Remove(filepath.Join(root, "keep.txt")); err != nil {
-					t.Fatal(err)
-				}
-				for _, file := range files {
-					boundary, name := torrentFileLayout(&info, file)
-					if err := removeUnselectedFile(dir, boundary, name); err != nil {
-						t.Fatal(err)
-					}
-				}
-				if stat, err := os.Stat(root); err != nil || !stat.IsDir() {
-					t.Fatalf("cleanup boundary was removed: %v", err)
-				}
-			})
-		}
-	}
-}

internal/protocol/bt/storage.go

@@ -1,116 +0,0 @@
-package bt
-
-import (
-	"context"
-	"errors"
-	"os"
-	"sync"
-
-	g "github.com/anacrolix/generics"
-	"github.com/anacrolix/torrent/metainfo"
-	"github.com/anacrolix/torrent/storage"
-)
-
-// deferredFileStorage lets metadata resolve without opening the user's files.
-// It binds once. After binding, pieces are supplied directly by file storage.
-type deferredFileStorage struct {
-	mu          sync.RWMutex
-	ctx         context.Context
-	info        *metainfo.Info
-	hash        metainfo.Hash
-	knownHashes []bool
-	owner       storage.ClientImplCloser
-	torrent     storage.TorrentImpl
-	closed      bool
-}
-
-func (s *deferredFileStorage) OpenTorrent(ctx context.Context, info *metainfo.Info, hash metainfo.Hash) (storage.TorrentImpl, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.closed || s.info != nil {
-		return storage.TorrentImpl{}, errors.New("torrent storage already opened or closed")
-	}
-	s.ctx, s.info, s.hash = ctx, info, hash
-	s.knownHashes = make([]bool, info.NumPieces())
-	return storage.TorrentImpl{
-		PieceWithHash: func(p metainfo.Piece, hash g.Option[[]byte]) storage.PieceImpl {
-			s.mu.Lock()
-			defer s.mu.Unlock()
-			if s.closed {
-				return metadataPiece{err: os.ErrClosed}
-			}
-			if s.owner == nil {
-				s.knownHashes[p.Index()] = hash.Ok
-				// A missing v2 hash must remain unknown until its arrival changes
-				// completion and updates the library's piece request priorities.
-				return metadataPiece{known: hash.Ok}
-			}
-			if s.torrent.PieceWithHash != nil {
-				return s.torrent.PieceWithHash(p, hash)
-			}
-			return s.torrent.Piece(p)
-		},
-		Close: s.Close,
-	}, nil
-}
-
-func (s *deferredFileStorage) bind(opts storage.NewFileClientOpts) ([]bool, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.closed {
-		return nil, os.ErrClosed
-	}
-	if s.info == nil {
-		return nil, errors.New("torrent metadata is not ready")
-	}
-	if s.owner != nil {
-		return nil, nil
-	}
-	if opts.FilePathMaker == nil {
-		opts.FilePathMaker = func(o storage.FilePathMakerOpts) string { _, name := torrentFileLayout(o.Info, *o.File); return name }
-	}
-	owner := storage.NewFileOpts(opts)
-	t, err := owner.OpenTorrent(s.ctx, s.info, s.hash)
-	if err != nil {
-		owner.Close()
-		return nil, err
-	}
-	s.owner, s.torrent = owner, t
-	return append([]bool(nil), s.knownHashes...), nil
-}
-
-func (s *deferredFileStorage) Close() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.closed {
-		return nil
-	}
-	s.closed = true
-	if s.owner == nil {
-		return nil
-	}
-	var err error
-	if s.torrent.Close != nil {
-		err = s.torrent.Close()
-	}
-	return errors.Join(err, s.owner.Close())
-}
-
-type metadataPiece struct {
-	known bool
-	err   error
-}
-
-func (p metadataPiece) Completion() storage.Completion {
-	return storage.Completion{Ok: p.known, Err: p.err}
-}
-func (p metadataPiece) ReadAt([]byte, int64) (int, error) {
-	return 0, errors.New("download storage is not initialized")
-}
-func (p metadataPiece) WriteAt([]byte, int64) (int, error) {
-	return 0, errors.New("download storage is not initialized")
-}
-func (p metadataPiece) MarkComplete() error { return errors.New("download storage is not initialized") }
-func (p metadataPiece) MarkNotComplete() error {
-	return errors.New("download storage is not initialized")
-}

internal/protocol/bt/trackers.go

@@ -1,234 +0,0 @@
-package bt
-
-import (
-	"bufio"
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/url"
-	"slices"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-)
-
-var defaultTrackerSubscribeURLs = []string{
-	"https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all.txt",
-	"https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_http.txt",
-	"https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_https.txt",
-	"https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_ip.txt",
-	"https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_udp.txt",
-	"https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_ws.txt",
-	"https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt",
-	"https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best_ip.txt",
-	"https://raw.githubusercontent.com/XIU2/TrackersListCollection/master/all.txt",
-	"https://raw.githubusercontent.com/XIU2/TrackersListCollection/master/best.txt",
-	"https://raw.githubusercontent.com/XIU2/TrackersListCollection/master/http.txt",
-}
-
-func validTracker(raw string) bool {
-	u, err := url.Parse(raw)
-	if err != nil || u.Hostname() == "" || u.User != nil {
-		return false
-	}
-	switch u.Scheme {
-	case "udp", "http", "https", "ws", "wss":
-		return true
-	}
-	return false
-}
-func uniqueTrackers(groups ...[]string) []string {
-	result := []string{}
-	seen := map[string]bool{}
-	for _, group := range groups {
-		for _, raw := range group {
-			value := strings.TrimSpace(raw)
-			if value != "" && !seen[value] {
-				seen[value] = true
-				result = append(result, value)
-			}
-		}
-	}
-	return result
-}
-
-// effectiveTrackers derives the client list without persisting duplicate lists.
-func (c *config) effectiveTrackers() []string {
-	groups := [][]string{c.CustomTrackers}
-	for _, source := range c.TrackerSubscribeURLs {
-		groups = append(groups, c.State.TrackerSources[source])
-	}
-	return uniqueTrackers(groups...)
-}
-func (fm *FetcherManager) NormalizeConfig(raw json.RawMessage) (any, error) {
-	c := fm.DefaultConfig().(*config)
-	if err := json.Unmarshal(raw, c); err != nil {
-		return nil, err
-	}
-	if c.ListenPort < 0 || c.ListenPort > 65535 || c.SeedRatio < 0 || c.SeedTime < 0 {
-		return nil, errors.New("invalid BT configuration")
-	}
-	if len(c.TrackerSubscribeURLs) > 64 {
-		return nil, errors.New("too many tracker subscriptions")
-	}
-	c.TrackerSubscribeURLs = uniqueTrackers(c.TrackerSubscribeURLs)
-	for _, source := range c.TrackerSubscribeURLs {
-		u, err := url.Parse(source)
-		if err != nil || u == nil || (u.Scheme != "https" && u.Scheme != "http") || u.Hostname() == "" || u.User != nil {
-			return nil, errors.New("invalid tracker subscription URL")
-		}
-	}
-	c.CustomTrackers = uniqueTrackers(c.CustomTrackers)
-	for _, tracker := range c.CustomTrackers {
-		if !validTracker(tracker) {
-			return nil, fmt.Errorf("invalid tracker URL: %s", tracker)
-		}
-	}
-	if c.State.TrackerSources == nil {
-		c.State.TrackerSources = map[string][]string{}
-	}
-	for source := range c.State.TrackerSources {
-		if !slices.Contains(c.TrackerSubscribeURLs, source) {
-			delete(c.State.TrackerSources, source)
-		}
-	}
-	if c.State.TrackerSubscriptionStatuses == nil {
-		c.State.TrackerSubscriptionStatuses = map[string]trackerSubscriptionStatus{}
-	}
-	for source := range c.State.TrackerSubscriptionStatuses {
-		if !slices.Contains(c.TrackerSubscribeURLs, source) {
-			delete(c.State.TrackerSubscriptionStatuses, source)
-		}
-	}
-	return c, nil
-}
-func (fm *FetcherManager) CronJobs(host fetcher.ProtocolHost) []fetcher.CronJob {
-	return []fetcher.CronJob{{
-		Name:    "update-trackers",
-		Every:   24 * time.Hour,
-		Timeout: 90 * time.Second,
-		Run: func(ctx context.Context, source fetcher.TriggerSource) error {
-			return fm.updateTrackers(ctx, host, source)
-		},
-	}}
-}
-func parseTrackers(data []byte) ([]string, error) {
-	scanner := bufio.NewScanner(bytes.NewReader(data))
-	scanner.Buffer(make([]byte, 4096), 64*1024)
-	result := []string{}
-	for scanner.Scan() {
-		line := strings.TrimSpace(strings.TrimPrefix(scanner.Text(), "\ufeff"))
-		if validTracker(line) {
-			result = append(result, line)
-		}
-		if len(result) > 20000 {
-			return nil, errors.New("too many trackers")
-		}
-	}
-	if err := scanner.Err(); err != nil {
-		return nil, err
-	}
-	if len(result) == 0 {
-		return nil, errors.New("subscription contains no valid trackers")
-	}
-	return uniqueTrackers(result), nil
-}
-func (fm *FetcherManager) updateTrackers(ctx context.Context, host fetcher.ProtocolHost, source fetcher.TriggerSource) error {
-	snapshot, err := fetcher.ReadConfig[config](host)
-	if err != nil {
-		return err
-	}
-	if (source == fetcher.TriggerScheduled && !snapshot.AutoUpdateTrackers) || len(snapshot.TrackerSubscribeURLs) == 0 {
-		return fetcher.ErrJobSkipped
-	}
-	fetched := map[string][]string{}
-	statuses := map[string]trackerSubscriptionStatus{}
-	var failures []error
-	var mu sync.Mutex
-	var wg sync.WaitGroup
-	slots := make(chan struct{}, 4)
-	for _, address := range snapshot.TrackerSubscribeURLs {
-		wg.Add(1)
-		go func(address string) {
-			defer wg.Done()
-			select {
-			case slots <- struct{}{}:
-				defer func() { <-slots }()
-			case <-ctx.Done():
-				return
-			}
-			data, err := host.Fetch(ctx, address, 2<<20, func(body []byte) error { _, err := parseTrackers(body); return err })
-			var trackers []string
-			if err == nil {
-				trackers, err = parseTrackers(data)
-			}
-			mu.Lock()
-			defer mu.Unlock()
-			statuses[address] = trackerSubscriptionStatus{Success: err == nil, TrackerCount: len(trackers), LastFetchTime: time.Now().UTC()}
-			if err != nil {
-				failures = append(failures, fmt.Errorf("subscription %s: %w", address, err))
-			} else {
-				fetched[address] = trackers
-			}
-		}(address)
-	}
-	wg.Wait()
-	if err := ctx.Err(); err != nil {
-		failures = append(failures, err)
-	}
-	if len(statuses) == 0 {
-		return errors.Join(failures...)
-	}
-	err = fetcher.UpdateState[config, state](host, func(current *config, state *state) error {
-		if !slices.Equal(current.TrackerSubscribeURLs, snapshot.TrackerSubscribeURLs) {
-			return fetcher.ErrConfigChanged
-		}
-		if state.TrackerSources == nil {
-			state.TrackerSources = map[string][]string{}
-		}
-		if state.TrackerSubscriptionStatuses == nil {
-			state.TrackerSubscriptionStatuses = map[string]trackerSubscriptionStatus{}
-		}
-		for address, status := range statuses {
-			state.TrackerSubscriptionStatuses[address] = status
-		}
-		for address, trackers := range fetched {
-			state.TrackerSources[address] = trackers
-		}
-		if len(failures) == 0 {
-			state.LastTrackerUpdateTime = time.Now().UTC()
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-	current, err := fetcher.ReadConfig[config](host)
-	if err != nil {
-		return err
-	}
-	fm.applyTrackers(current.effectiveTrackers())
-	return errors.Join(failures...)
-}
-func (fm *FetcherManager) applyTrackers(trackers []string) {
-	lock.Lock()
-	defer lock.Unlock()
-	if client == nil {
-		return
-	}
-	announce := make([][]string, 0, len(trackers))
-	for _, tracker := range trackers {
-		announce = append(announce, []string{tracker})
-	}
-	for _, t := range client.Torrents() {
-		info := t.Info()
-		if info == nil || (info.Private != nil && *info.Private) {
-			continue
-		}
-		t.AddTrackers(announce)
-	}
-}

internal/protocol/bt/trackers_test.go

@@ -1,217 +0,0 @@
-package bt
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"reflect"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-)
-
-func trackerTestHost(t *testing.T, c *config, fetch func(context.Context, string, int64, func([]byte) error) ([]byte, error)) (fetcher.ProtocolHost, *sync.Mutex) {
-	t.Helper()
-	mu := &sync.Mutex{}
-	return fetcher.ProtocolHost{
-		Read: func(dst any) error {
-			mu.Lock()
-			defer mu.Unlock()
-			raw, err := json.Marshal(c)
-			if err != nil {
-				return err
-			}
-			return json.Unmarshal(raw, dst)
-		},
-		UpdateState: func(change func(config, state json.RawMessage) (any, error)) error {
-			mu.Lock()
-			defer mu.Unlock()
-			raw, _ := json.Marshal(c)
-			currentState, _ := json.Marshal(c.State)
-			next, err := change(raw, currentState)
-			if err != nil {
-				return err
-			}
-			raw, err = json.Marshal(next)
-			if err != nil {
-				return err
-			}
-			return json.Unmarshal(raw, &c.State)
-		},
-		Fetch: fetch,
-	}, mu
-}
-func TestTrackerRefreshPartialSuccessUsesLatestConfig(t *testing.T) {
-	fm := &FetcherManager{}
-	cfg := fm.DefaultConfig().(*config)
-	cfg.TrackerSubscribeURLs = []string{"https://a.example/list", "https://b.example/list"}
-	cfg.CustomTrackers = []string{"udp://custom.example:80/announce"}
-	cfg.State.TrackerSources = map[string][]string{cfg.TrackerSubscribeURLs[0]: {"udp://old.example:80/announce"}, cfg.TrackerSubscribeURLs[1]: {"udp://cached.example:80/announce"}}
-	host, mu := trackerTestHost(t, cfg, nil)
-	host.Fetch = func(ctx context.Context, address string, _ int64, validate func([]byte) error) ([]byte, error) {
-		if address == "https://b.example/list" {
-			return nil, errors.New("offline")
-		}
-		// Simulate a frontend update while the network request is in flight.
-		mu.Lock()
-		cfg.CustomTrackers = []string{"udp://new-custom.example:80/announce"}
-		mu.Unlock()
-		data := []byte("udp://fresh.example:80/announce\n# ignored\nudp://fresh.example:80/announce\n")
-		return data, validate(data)
-	}
-	err := fm.updateTrackers(context.Background(), host, fetcher.TriggerManual)
-	if err == nil {
-		t.Fatal("partial failure must be reported")
-	}
-	want := []string{"udp://new-custom.example:80/announce", "udp://fresh.example:80/announce", "udp://cached.example:80/announce"}
-	if !reflect.DeepEqual(cfg.effectiveTrackers(), want) {
-		t.Fatalf("got %v", cfg.effectiveTrackers())
-	}
-	success := cfg.State.TrackerSubscriptionStatuses["https://a.example/list"]
-	failure := cfg.State.TrackerSubscriptionStatuses["https://b.example/list"]
-	if !success.Success || success.TrackerCount != 1 || success.LastFetchTime.IsZero() || failure.Success || failure.TrackerCount != 0 || failure.LastFetchTime.IsZero() {
-		t.Fatalf("unexpected subscription statuses: %+v", cfg.State.TrackerSubscriptionStatuses)
-	}
-	if !cfg.State.LastTrackerUpdateTime.IsZero() {
-		t.Fatal("partial refresh marked fully successful")
-	}
-}
-func TestTrackerRefreshDiscardsChangedSubscriptions(t *testing.T) {
-	fm := &FetcherManager{}
-	cfg := fm.DefaultConfig().(*config)
-	cfg.TrackerSubscribeURLs = []string{"https://a.example/list"}
-	host, mu := trackerTestHost(t, cfg, nil)
-	host.Fetch = func(context.Context, string, int64, func([]byte) error) ([]byte, error) {
-		mu.Lock()
-		cfg.TrackerSubscribeURLs = []string{}
-		mu.Unlock()
-		return []byte("udp://fresh.example:80/announce"), nil
-	}
-	if err := fm.updateTrackers(context.Background(), host, fetcher.TriggerManual); !errors.Is(err, fetcher.ErrConfigChanged) {
-		t.Fatal(err)
-	}
-	if len(cfg.State.TrackerSources) != 0 {
-		t.Fatal("outdated source was committed")
-	}
-}
-func TestTrackerRefreshManualWorksWhenAutomaticDisabled(t *testing.T) {
-	fm := &FetcherManager{}
-	cfg := fm.DefaultConfig().(*config)
-	cfg.AutoUpdateTrackers = false
-	cfg.TrackerSubscribeURLs = []string{"https://a.example/list"}
-	calls := 0
-	host, _ := trackerTestHost(t, cfg, func(context.Context, string, int64, func([]byte) error) ([]byte, error) {
-		calls++
-		return []byte("udp://fresh.example:80/announce"), nil
-	})
-	if err := fm.updateTrackers(context.Background(), host, fetcher.TriggerScheduled); !errors.Is(err, fetcher.ErrJobSkipped) {
-		t.Fatal(err)
-	}
-	if calls != 0 {
-		t.Fatal("scheduled job fetched while disabled")
-	}
-	if err := fm.updateTrackers(context.Background(), host, fetcher.TriggerManual); err != nil {
-		t.Fatal(err)
-	}
-	if calls != 1 || cfg.State.LastTrackerUpdateTime.IsZero() {
-		t.Fatal("manual refresh did not succeed")
-	}
-}
-func TestTrackerConfigPreservesExplicitSettings(t *testing.T) {
-	value, err := (&FetcherManager{}).NormalizeConfig(json.RawMessage(`{
-		"listenPort":6881, "trackerSubscribeUrls":[], "autoUpdateTrackers":false,
-		"customTrackers":["udp://custom.example:80/announce"]
-	}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-	cfg := value.(*config)
-	if cfg.AutoUpdateTrackers || len(cfg.TrackerSubscribeURLs) != 0 || cfg.ListenPort != 6881 {
-		t.Fatalf("%+v", cfg)
-	}
-	if !reflect.DeepEqual(cfg.effectiveTrackers(), cfg.CustomTrackers) {
-		t.Fatalf("derived trackers: %v", cfg.effectiveTrackers())
-	}
-}
-
-func TestParseTrackerList(t *testing.T) {
-	got, err := parseTrackers([]byte("\ufeffudp://tracker.example:80/announce\r\n\n<html>error</html>\nhttps://tracker.example/announce\n"))
-	if err != nil || len(got) != 2 {
-		t.Fatalf("%v %v", got, err)
-	}
-	if _, err := parseTrackers([]byte("<html>mirror error</html>")); err == nil {
-		t.Fatal("invalid mirror body accepted")
-	}
-}
-func TestTrackerDefaultsRegisterDailyJob(t *testing.T) {
-	jobs := (&FetcherManager{}).CronJobs(fetcher.ProtocolHost{})
-	if len(jobs) != 1 || jobs[0].Name != "update-trackers" || jobs[0].Every != 24*time.Hour {
-		t.Fatal(jobs)
-	}
-}
-
-func TestTrackerRefreshAllFailuresPersistStatusesAndKeepCache(t *testing.T) {
-	fm := &FetcherManager{}
-	cfg := fm.DefaultConfig().(*config)
-	address := "https://custom.example/trackers.txt"
-	cfg.TrackerSubscribeURLs = []string{address}
-	cfg.State.TrackerSources[address] = []string{"udp://cached.example:80/announce"}
-	cfg.State.TrackerSubscriptionStatuses[address] = trackerSubscriptionStatus{Success: true, TrackerCount: 1, LastFetchTime: time.Now().Add(-time.Hour)}
-	host, _ := trackerTestHost(t, cfg, func(context.Context, string, int64, func([]byte) error) ([]byte, error) {
-		return nil, errors.New("offline")
-	})
-	before := time.Now()
-	if err := fm.updateTrackers(context.Background(), host, fetcher.TriggerManual); err == nil {
-		t.Fatal("failure was not reported")
-	}
-	status, ok := cfg.State.TrackerSubscriptionStatuses[address]
-	if !ok || status.Success || status.TrackerCount != 0 || status.LastFetchTime.Before(before) {
-		t.Fatalf("failed fetch status not stored: %+v", status)
-	}
-	if !reflect.DeepEqual(cfg.State.TrackerSources[address], []string{"udp://cached.example:80/announce"}) {
-		t.Fatal("last good cache lost")
-	}
-	if !reflect.DeepEqual(cfg.effectiveTrackers(), cfg.State.TrackerSources[address]) {
-		t.Fatal("cached trackers not retained")
-	}
-}
-
-func TestTrackerConfigPrunesRemovedSubscriptions(t *testing.T) {
-	fm := &FetcherManager{}
-	cfg := fm.DefaultConfig().(*config)
-	address := "https://custom.example/trackers.txt"
-	cfg.TrackerSubscribeURLs = []string{}
-	cfg.State.TrackerSources[address] = []string{"udp://cached.example:80/announce"}
-	cfg.State.TrackerSubscriptionStatuses[address] = trackerSubscriptionStatus{Success: true, TrackerCount: 1, LastFetchTime: time.Now()}
-	raw, _ := json.Marshal(cfg)
-	value, err := fm.NormalizeConfig(raw)
-	if err != nil {
-		t.Fatal(err)
-	}
-	next := value.(*config)
-	if len(next.State.TrackerSources) != 0 || len(next.State.TrackerSubscriptionStatuses) != 0 || len(next.effectiveTrackers()) != 0 {
-		t.Fatal("removed subscription still owns cached results")
-	}
-}
-
-func TestTrackerRefreshTimeoutPersistsCompletedAttemptStatus(t *testing.T) {
-	fm := &FetcherManager{}
-	cfg := fm.DefaultConfig().(*config)
-	address := "https://custom.example/trackers.txt"
-	cfg.TrackerSubscribeURLs = []string{address}
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	host, _ := trackerTestHost(t, cfg, func(context.Context, string, int64, func([]byte) error) ([]byte, error) {
-		cancel()
-		return nil, context.DeadlineExceeded
-	})
-	if err := fm.updateTrackers(ctx, host, fetcher.TriggerManual); !errors.Is(err, context.DeadlineExceeded) {
-		t.Fatal(err)
-	}
-	status, ok := cfg.State.TrackerSubscriptionStatuses[address]
-	if !ok || status.Success || status.TrackerCount != 0 || status.LastFetchTime.IsZero() {
-		t.Fatalf("timeout status lost: %+v", status)
-	}
-}

internal/protocol/ed2k/fetcher.go

@@ -67,14 +67,17 @@ func (f *Fetcher) Setup(ctl *controller.Controller) {
 	f.ctl.GetConfig(&f.config)
 }
 
-func (f *Fetcher) Resolve(req *base.Request) error {
+func (f *Fetcher) Resolve(req *base.Request, opts *base.Options) error {
 	link, err := parseLink(req.URL)
 	if err != nil {
 		return err
 	}
 
 	f.meta.Req = req
-
+	f.meta.Opts = opts
+	if f.meta.Opts == nil {
+		f.meta.Opts = &base.Options{}
+	}
 	f.meta.Res = buildResource(link)
 	return nil
 }

internal/protocol/ed2k/fetcher_test.go

@@ -13,8 +13,7 @@ func TestFetcher_Resolve(t *testing.T) {
 	f := (&FetcherManager{}).Build()
 	f.Setup(controller.NewController())
 
-	f.Meta().Opts = &base.Options{Path: t.TempDir()}
+	err := f.Resolve(&base.Request{URL: testLink}, &base.Options{Path: t.TempDir()})
-	err := f.Resolve(&base.Request{URL: testLink})
 	if err != nil {
 		t.Fatalf("Resolve() error = %v", err)
 	}

internal/protocol/hls/config.go

@@ -1,30 +0,0 @@
-package hls
-
-const (
-	defaultSegmentConnections = 8
-	defaultMaxRetries         = 5
-	defaultTimeoutSeconds     = 30
-
-	// maxPrefetchSizeSegments caps the HEAD probing done at resolve time.
-	// Playlists larger than this skip size prefetch entirely.
-	maxPrefetchSizeSegments = 500
-)
-
-type config struct {
-	SegmentConnections    int  `json:"segmentConnections"`
-	MaxRetries            int  `json:"maxRetries"`
-	TimeoutSeconds        int  `json:"timeoutSeconds"`
-	PrefetchContentLength bool `json:"prefetchContentLength"`
-}
-
-func (c *config) normalize() {
-	if c.SegmentConnections <= 0 {
-		c.SegmentConnections = defaultSegmentConnections
-	}
-	if c.MaxRetries < 0 {
-		c.MaxRetries = defaultMaxRetries
-	}
-	if c.TimeoutSeconds <= 0 {
-		c.TimeoutSeconds = defaultTimeoutSeconds
-	}
-}

internal/protocol/hls/crypto.go

@@ -1,59 +0,0 @@
-package hls
-
-import (
-	"crypto/aes"
-	"crypto/cipher"
-	"fmt"
-)
-
-// decryptAES128 decrypts an AES-128-CBC encrypted segment and strips PKCS7
-// padding. data length must be a multiple of the AES block size.
-func decryptAES128(data, key, iv []byte) ([]byte, error) {
-	if len(key) != 16 {
-		return nil, fmt.Errorf("invalid AES-128 key size %d", len(key))
-	}
-	if len(iv) != 16 {
-		return nil, fmt.Errorf("invalid AES-128 IV size %d", len(iv))
-	}
-	if len(data) == 0 || len(data)%aes.BlockSize != 0 {
-		return nil, fmt.Errorf("invalid AES-128 data size %d", len(data))
-	}
-	block, err := aes.NewCipher(key)
-	if err != nil {
-		return nil, err
-	}
-	plain := make([]byte, len(data))
-	cipher.NewCBCDecrypter(block, iv).CryptBlocks(plain, data)
-	return pkcs7Unpad(plain, aes.BlockSize)
-}
-
-func pkcs7Unpad(data []byte, blockSize int) ([]byte, error) {
-	if len(data) == 0 {
-		return nil, fmt.Errorf("empty plaintext")
-	}
-	pad := int(data[len(data)-1])
-	if pad == 0 || pad > blockSize || pad > len(data) {
-		return nil, fmt.Errorf("invalid PKCS7 padding")
-	}
-	for _, b := range data[len(data)-pad:] {
-		if int(b) != pad {
-			return nil, fmt.Errorf("invalid PKCS7 padding")
-		}
-	}
-	return data[:len(data)-pad], nil
-}
-
-// sequenceIV derives the default per-segment IV mandated by RFC 8216: the
-// segment media sequence number as a 16-byte big-endian integer.
-func sequenceIV(sequence int64) []byte {
-	iv := make([]byte, 16)
-	iv[8] = byte(sequence >> 56)
-	iv[9] = byte(sequence >> 48)
-	iv[10] = byte(sequence >> 40)
-	iv[11] = byte(sequence >> 32)
-	iv[12] = byte(sequence >> 24)
-	iv[13] = byte(sequence >> 16)
-	iv[14] = byte(sequence >> 8)
-	iv[15] = byte(sequence)
-	return iv
-}

internal/protocol/hls/crypto_test.go

@@ -1,66 +0,0 @@
-package hls
-
-import (
-	"bytes"
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/rand"
-	"testing"
-)
-
-func pkcs7Pad(data []byte, blockSize int) []byte {
-	pad := blockSize - len(data)%blockSize
-	return append(data, bytes.Repeat([]byte{byte(pad)}, pad)...)
-}
-
-func TestDecryptAES128Roundtrip(t *testing.T) {
-	key := make([]byte, 16)
-	iv := make([]byte, 16)
-	if _, err := rand.Read(key); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := rand.Read(iv); err != nil {
-		t.Fatal(err)
-	}
-	plain := []byte("hello hls segment payload, padded to block size!")
-	padded := pkcs7Pad(plain, aes.BlockSize)
-	block, err := aes.NewCipher(key)
-	if err != nil {
-		t.Fatal(err)
-	}
-	encrypted := make([]byte, len(padded))
-	cipher.NewCBCEncrypter(block, iv).CryptBlocks(encrypted, padded)
-
-	got, err := decryptAES128(encrypted, key, iv)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.Equal(got, plain) {
-		t.Errorf("roundtrip mismatch: %q", got)
-	}
-}
-
-func TestDecryptAES128InvalidInput(t *testing.T) {
-	if _, err := decryptAES128([]byte{1, 2, 3}, make([]byte, 16), make([]byte, 16)); err == nil {
-		t.Error("non-block-aligned data should fail")
-	}
-	if _, err := decryptAES128(make([]byte, 16), make([]byte, 15), make([]byte, 16)); err == nil {
-		t.Error("short key should fail")
-	}
-	if _, err := decryptAES128(make([]byte, 16), make([]byte, 16), make([]byte, 16)); err == nil {
-		t.Error("all-zero block has invalid padding and should fail")
-	}
-}
-
-func TestSequenceIV(t *testing.T) {
-	iv := sequenceIV(1)
-	if len(iv) != 16 || iv[15] != 1 {
-		t.Errorf("sequence 1 IV wrong: %v", iv)
-	}
-	iv = sequenceIV(0x0102030405060708)
-	for i, want := range []byte{1, 2, 3, 4, 5, 6, 7, 8} {
-		if iv[8+i] != want {
-			t.Errorf("sequence IV byte %d: want %d got %d", i, want, iv[8+i])
-		}
-	}
-}

internal/protocol/hls/doc.go

@@ -1,24 +0,0 @@
-// Package hls implements native HTTP Live Streaming downloads for m3u8
-// playlists. A task produces exactly one merged, playable output file:
-// MPEG-2 TS segments are concatenated as-is, fMP4 streams are merged as
-// init section followed by the media fragments, and AES-128 encrypted
-// segments are decrypted before they are stored.
-//
-// Supported subset:
-//   - VOD media playlists (EXT-X-ENDLIST present) and master playlists whose
-//     selected variant carries its own audio
-//   - AES-128 with the identity KEYFORMAT, explicit IV or media-sequence
-//     derived IV, including key rotation mid-playlist
-//   - EXT-X-BYTERANGE (including offset inheritance) and fMP4 init sections
-//     via a single, constant EXT-X-MAP
-//
-// Everything the merge pipeline cannot reproduce faithfully is rejected with
-// an explicit error instead of silently producing a broken output file:
-//   - live streams (no EXT-X-ENDLIST) and SAMPLE-AES / DRM encryption
-//   - EXT-X-GAP (would leave a hole) and EXT-X-DISCONTINUITY (broken timeline)
-//   - changing init sections (a repeated EXT-X-MAP is compared by all its
-//     attributes, not just the URI) and encrypted EXT-X-MAP without an
-//     explicit IV
-//   - separate audio renditions referenced by the selected variant (the
-//     merged output would have no audio) and non-identity KEYFORMATs
-package hls

internal/protocol/hls/fetcher.go

@@ -1,997 +0,0 @@
-package hls
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strconv"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/internal/httpclient"
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-// ReqExtra mirrors the HTTP protocol extra: the create dialog attaches HTTP
-// style options to m3u8 URLs (same JSON keys), so the same shape is decoded.
-type ReqExtra struct {
-	Method string            `json:"method,omitempty"`
-	Header map[string]string `json:"header,omitempty"`
-	Body   string            `json:"body,omitempty"`
-}
-
-func copyReqExtra(extra *ReqExtra) *ReqExtra {
-	copied := &ReqExtra{}
-	if extra == nil {
-		return copied
-	}
-	copied.Method = extra.Method
-	copied.Body = extra.Body
-	if extra.Header != nil {
-		copied.Header = make(map[string]string, len(extra.Header))
-		for key, value := range extra.Header {
-			copied.Header[key] = value
-		}
-	}
-	return copied
-}
-
-// fetcherState is the resolved download plan persisted for resume. StagingID
-// gives the task its own staging folder (two tasks downloading the same URL
-// into the same directory never share segment files) and survives restarts
-// through the persisted state. StagingDir pins the absolute folder so user
-// renames or moves of the task output do not orphan the staged segments.
-type fetcherState struct {
-	MediaURL   string     `json:"mediaURL"`
-	OutputName string     `json:"outputName"`
-	Segments   []*Segment `json:"segments"`
-	StagingID  string     `json:"stagingID,omitempty"`
-	StagingDir string     `json:"stagingDir,omitempty"`
-}
-
-// Stats is the protocol task statistics snapshot.
-type Stats struct {
-	SegmentsTotal  int `json:"segmentsTotal"`
-	SegmentsDone   int `json:"segmentsDone"`
-	SegmentsFailed int `json:"segmentsFailed"`
-}
-
-// tempDirPrefix separates HLS staging folders from regular task files.
-const tempDirPrefix = ".gopeed-hls-"
-
-// hlsRun holds every piece of state that belongs to one Start..Pause/complete
-// cycle. Runs never share mutable state: a Pause that is immediately followed
-// by a Start replaces the whole run, so workers of the previous run cannot
-// race with the next one. The run also snapshots the plan, request headers,
-// client and merge target so concurrent Patch calls cannot change them under
-// a running download.
-type hlsRun struct {
-	ctx    context.Context
-	cancel context.CancelFunc
-	// wg covers the queue producer AND the segment workers: Pause must not
-	// return while the producer can still hand out segment indexes.
-	wg   sync.WaitGroup
-	done chan struct{} // closed when the supervisor has fully exited
-
-	segs       []*Segment // plan snapshot, read-only for the duration of the run
-	extra      *ReqExtra  // header snapshot (deep copy)
-	client     *http.Client
-	outputPath string // merge target snapshot
-	tempDir    string
-
-	keyCache   map[string][]byte
-	keyCacheMu sync.Mutex
-
-	stagingID   string // identity of the staging folder, bound into the journal
-	planHash    string // fingerprint of the download plan, validated on resume
-	journal     map[int64]int64
-	journalPath string
-	journalMu   sync.Mutex
-
-	// downloaded counts bytes of the final output that are safely on disk
-	// (completed segment files), not raw network traffic: discarded retry
-	// bytes must never show up as progress.
-	downloaded atomic.Int64
-	doneCount  atomic.Int64
-	failCount  atomic.Int64
-	baseBytes  int64   // stored bytes restored from the journal at startup
-	baseDone   int     // completed segments restored from the journal at startup
-	pending    []int64 // segment indexes to download, set by prepareRun
-}
-
-func (r *hlsRun) statsSnapshot() Stats {
-	return Stats{
-		SegmentsTotal:  len(r.segs),
-		SegmentsDone:   r.baseDone + int(r.doneCount.Load()),
-		SegmentsFailed: int(r.failCount.Load()),
-	}
-}
-
-type Fetcher struct {
-	fetcher.DefaultFetcher
-	meta   *fetcher.FetcherMeta
-	config *config
-
-	// mu guards the fields below and every lifecycle transition. Progress and
-	// Stats are read from the engine's checkpoint goroutine while a run is
-	// active; they only take mu to snapshot the active run pointer, then read
-	// run-owned atomics lock-free.
-	mu             sync.Mutex
-	extra          *ReqExtra
-	client         *http.Client
-	state          *fetcherState
-	activeRun      *hlsRun
-	closed         bool
-	lastStats      Stats
-	lastDownloaded int64
-
-	impSession *httpclient.ImpersonationSession
-}
-
-func (f *Fetcher) Setup(ctl *controller.Controller) {
-	// Initializes Ctl and DoneCh, which Wait() depends on.
-	f.DefaultFetcher.Setup(ctl)
-	if f.meta == nil {
-		f.meta = &fetcher.FetcherMeta{}
-	}
-	f.impSession = httpclient.NewImpersonationSession()
-	f.config = &config{}
-	f.Ctl.GetConfig(f.config)
-	f.config.normalize()
-	// Restored fetchers receive their request through Setup (the engine calls
-	// it after the Restore builder): parse the extra headers so resumed
-	// segment/key requests keep Referer/Cookie and other anti-hotlink headers.
-	f.mu.Lock()
-	f.reloadExtraLocked()
-	f.mu.Unlock()
-}
-
-// reloadExtraLocked refreshes f.extra from the typed extra of meta.Req.
-func (f *Fetcher) reloadExtraLocked() {
-	if f.meta == nil || f.meta.Req == nil {
-		return
-	}
-	if err := base.ParseReqExtra[ReqExtra](f.meta.Req); err != nil {
-		return
-	}
-	if e, ok := f.meta.Req.Extra.(*ReqExtra); ok {
-		f.extra = e
-	}
-}
-
-func (f *Fetcher) Meta() *fetcher.FetcherMeta {
-	return f.meta
-}
-
-func (f *Fetcher) Resolve(req *base.Request) (err error) {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	f.meta.Req = req
-
-	f.extra = &ReqExtra{}
-	if err = base.ParseReqExtra[ReqExtra](req); err != nil {
-		return
-	}
-	if e, ok := req.Extra.(*ReqExtra); ok {
-		f.extra = e
-	}
-	if f.client == nil {
-		f.client = f.buildClient()
-	}
-
-	state, name, err := f.resolvePlanLocked(context.Background(), "")
-	if err != nil {
-		return err
-	}
-	state.StagingID = randomStagingID()
-	f.state = state
-	size := planTotalSize(state.Segments)
-	f.meta.Res = &base.Resource{
-		Range: false,
-		Files: []*base.FileInfo{
-			{
-				Name: name,
-				Size: size,
-			},
-		},
-		Size: size,
-	}
-	return nil
-}
-
-// resolvePlanLocked fetches and parses the playlist into a fresh state. It
-// must be called with f.mu held while the fetcher is quiescent. When keepName
-// is non-empty the output keeps that file name (used when re-resolving an
-// existing task so a refreshed URL does not rename the file).
-func (f *Fetcher) resolvePlanLocked(ctx context.Context, keepName string) (*fetcherState, string, error) {
-	content, finalURL, err := f.fetchText(ctx, f.playlistMethod(), f.meta.Req.URL)
-	if err != nil {
-		return nil, "", fmt.Errorf("fetch playlist failed: %w", err)
-	}
-	baseURL, err := url.Parse(finalURL)
-	if err != nil {
-		return nil, "", err
-	}
-
-	mediaURL := finalURL
-	if IsMasterPlaylist(content) {
-		master, err := ParseMasterPlaylist(content, baseURL)
-		if err != nil {
-			return nil, "", err
-		}
-		best := PickBestVariant(master.Variants)
-		if err := checkAudioRendition(master, best); err != nil {
-			return nil, "", err
-		}
-		variantContent, variantURL, err := f.fetchText(ctx, http.MethodGet, best.URI)
-		if err != nil {
-			return nil, "", fmt.Errorf("fetch variant playlist failed: %w", err)
-		}
-		variantBase, err := url.Parse(variantURL)
-		if err != nil {
-			return nil, "", err
-		}
-		content = variantContent
-		baseURL = variantBase
-		mediaURL = variantURL
-	}
-	media, err := ParseMedia(content, baseURL)
-	if err != nil {
-		return nil, "", err
-	}
-	if err := validateSupported(media); err != nil {
-		return nil, "", err
-	}
-
-	outputName := keepName
-	if outputName == "" {
-		outputName = DeriveOutputName(mediaURL, media)
-	}
-	state := &fetcherState{
-		MediaURL:   mediaURL,
-		OutputName: outputName,
-		Segments:   media.Segments,
-	}
-	if f.config.PrefetchContentLength {
-		f.prefetchSize(media.Segments)
-	}
-	return state, outputName, nil
-}
-
-func (f *Fetcher) Patch(req *base.Request, opts *base.Options) error {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if f.activeRun != nil {
-		return errors.New("task is running; pause it before changing its settings")
-	}
-	if req != nil {
-		cur := f.meta.Req
-		if cur == nil {
-			f.meta.Req = req
-			cur = req
-		}
-		if req.URL != "" && req.URL != cur.URL {
-			cur.URL = req.URL
-			// The playlist URL changed (e.g. refreshed signed link): drop the
-			// plan so the engine re-resolves on next start (it does when Res
-			// is nil). Only explicitly supplied fields are applied, so a
-			// header-only or rename-only Patch keeps the resolved plan and
-			// the output path.
-			f.dropPlanLocked()
-		}
-		if err := mergeReqExtra(cur, req); err != nil {
-			return err
-		}
-		if req.Proxy != nil && cur.Proxy != req.Proxy {
-			cur.Proxy = req.Proxy
-			// Transport settings changed: rebuild the client before the
-			// next run.
-			f.client = nil
-		}
-		if len(req.Labels) > 0 {
-			if cur.Labels == nil {
-				cur.Labels = make(map[string]string, len(req.Labels))
-			}
-			for key, value := range req.Labels {
-				cur.Labels[key] = value
-			}
-		}
-		// SkipVerifyCert is a plain bool, so a partial update cannot tell an
-		// absent field from an explicit false: it is intentionally not merged
-		// (the HTTP protocol Patch ignores it as well).
-	}
-	if opts != nil {
-		if f.meta.Opts == nil {
-			f.meta.Opts = opts
-		} else {
-			if opts.Name != "" {
-				f.meta.Opts.Name = opts.Name
-			}
-			if opts.Path != "" {
-				f.meta.Opts.Path = opts.Path
-			}
-		}
-	}
-	f.reloadExtraLocked()
-	return nil
-}
-
-// mergeReqExtra merges the typed extra of incoming into cur following the
-// HTTP protocol semantics: Method/Body are overridden when non-empty and
-// headers are merged per key.
-func mergeReqExtra(cur *base.Request, incoming *base.Request) error {
-	if incoming.Extra == nil {
-		return nil
-	}
-	if err := base.ParseReqExtra[ReqExtra](incoming); err != nil {
-		return err
-	}
-	inc, ok := incoming.Extra.(*ReqExtra)
-	if !ok {
-		return nil
-	}
-	if err := base.ParseReqExtra[ReqExtra](cur); err != nil {
-		return err
-	}
-	target, ok := cur.Extra.(*ReqExtra)
-	if !ok {
-		target = &ReqExtra{}
-		cur.Extra = target
-	}
-	if inc.Method != "" {
-		target.Method = inc.Method
-	}
-	if inc.Body != "" {
-		target.Body = inc.Body
-	}
-	if len(inc.Header) > 0 {
-		if target.Header == nil {
-			target.Header = make(map[string]string, len(inc.Header))
-		}
-		for key, value := range inc.Header {
-			target.Header[key] = value
-		}
-	}
-	return nil
-}
-
-// dropPlanLocked discards the resolved plan after a URL change. The staging
-// folder of the dropped plan is removed too: this only runs while the
-// fetcher is quiescent, so no run can still be writing into it.
-func (f *Fetcher) dropPlanLocked() {
-	if f.state != nil && f.state.StagingDir != "" {
-		os.RemoveAll(f.state.StagingDir)
-	}
-	f.state = nil
-	f.meta.Res = nil
-}
-
-// existingOutputNameLocked returns the output file name the task already
-// uses, so a re-resolve does not rename an in-progress download.
-func (f *Fetcher) existingOutputNameLocked() string {
-	if f.meta.Opts != nil && f.meta.Opts.Name != "" {
-		return f.meta.Opts.Name
-	}
-	if res := f.meta.Res; res != nil && len(res.Files) > 0 && res.Files[0] != nil {
-		return res.Files[0].Name
-	}
-	return ""
-}
-
-func (f *Fetcher) Start() error {
-	f.mu.Lock()
-	if f.closed {
-		f.mu.Unlock()
-		return errors.New("hls fetcher is closed")
-	}
-	if f.activeRun != nil {
-		f.mu.Unlock()
-		return errors.New("hls fetcher already running")
-	}
-	if f.state == nil {
-		if f.meta.Req == nil || f.meta.Res == nil {
-			f.mu.Unlock()
-			return errors.New("hls fetcher is not resolved")
-		}
-		// Crash window: the engine persists the task (with its resource)
-		// before the first HLS state checkpoint lands, so a restored task
-		// can have a resource but no plan. Rebuild the plan instead of
-		// failing, keeping the existing output name.
-		if f.client == nil {
-			f.client = f.buildClient()
-		}
-		state, _, err := f.resolvePlanLocked(context.Background(), f.existingOutputNameLocked())
-		if err != nil {
-			f.mu.Unlock()
-			return fmt.Errorf("re-resolve failed: %w", err)
-		}
-		f.state = state
-		size := planTotalSize(state.Segments)
-		if res := f.meta.Res; res != nil {
-			res.Size = size
-			if len(res.Files) > 0 && res.Files[0] != nil {
-				res.Files[0].Size = size
-			}
-		}
-	}
-	// The client is built here, before any worker exists, so segment
-	// goroutines never race on lazy initialization.
-	if f.client == nil {
-		f.client = f.buildClient()
-	}
-	if f.meta.Res == nil {
-		// A restored plan without a resource cannot determine its output
-		// path; the engine re-resolves when Res is nil.
-		f.mu.Unlock()
-		return errors.New("hls fetcher is not resolved")
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-	run := &hlsRun{
-		ctx:        ctx,
-		cancel:     cancel,
-		done:       make(chan struct{}),
-		segs:       f.state.Segments,
-		extra:      copyReqExtra(f.extra),
-		client:     f.client,
-		outputPath: f.meta.SingleFilepath(),
-		stagingID:  f.state.StagingID,
-		planHash:   planFingerprint(f.state),
-		tempDir:    f.resolveStagingDirLocked(),
-		keyCache:   make(map[string][]byte),
-		journal:    make(map[int64]int64),
-	}
-	// Prepare staging and the completed-segment counters BEFORE publishing
-	// the run: Stats/Progress may observe it immediately afterwards and must
-	// never read half-initialized plain fields.
-	if err := f.prepareRun(run); err != nil {
-		f.mu.Unlock()
-		run.cancel()
-		close(run.done)
-		return err
-	}
-	f.activeRun = run
-	f.mu.Unlock()
-
-	f.launchWorkers(run)
-	go f.supervise(run)
-	return nil
-}
-
-// Pause stops all segment downloads synchronously. It waits for the queue
-// producer, every worker AND the supervisor (including a merge in flight)
-// before returning, so a Store right after Pause sees a consistent state.
-func (f *Fetcher) Pause() error {
-	f.mu.Lock()
-	run := f.activeRun
-	f.mu.Unlock()
-	if run == nil {
-		return nil
-	}
-	run.cancel()
-	<-run.done
-	f.clearActiveRun(run)
-	return nil
-}
-
-// Close pauses any active run and only removes the staging folder once every
-// run goroutine has stopped writing to it.
-func (f *Fetcher) Close() error {
-	f.mu.Lock()
-	f.closed = true
-	run := f.activeRun
-	tempDir := ""
-	if f.state != nil {
-		tempDir = f.resolveStagingDirLocked()
-	}
-	f.mu.Unlock()
-
-	if run != nil {
-		run.cancel()
-		<-run.done
-		f.clearActiveRun(run)
-	}
-	if f.impSession != nil {
-		f.impSession.Clear()
-	}
-	if tempDir != "" {
-		os.RemoveAll(tempDir)
-	}
-	return nil
-}
-
-// clearActiveRun detaches a finished run and keeps its counters as the last
-// known values for idle Stats/Progress reporting.
-func (f *Fetcher) clearActiveRun(run *hlsRun) {
-	f.mu.Lock()
-	if f.activeRun == run {
-		f.activeRun = nil
-		f.lastStats = run.statsSnapshot()
-		f.lastDownloaded = run.downloaded.Load()
-	}
-	f.mu.Unlock()
-}
-
-// Progress reports final-output bytes stored on disk for the single file.
-func (f *Fetcher) Progress() fetcher.Progress {
-	f.mu.Lock()
-	run := f.activeRun
-	if run != nil {
-		f.mu.Unlock()
-		return fetcher.Progress{run.downloaded.Load()}
-	}
-	last := f.lastDownloaded
-	f.mu.Unlock()
-	return fetcher.Progress{last}
-}
-
-func (f *Fetcher) Stats() *fetcher.Stats {
-	f.mu.Lock()
-	run := f.activeRun
-	state := f.state
-	if run != nil {
-		f.mu.Unlock()
-		snap := run.statsSnapshot()
-		return &fetcher.Stats{Snapshot: &snap}
-	}
-	snap := f.lastStats
-	f.mu.Unlock()
-	if snap.SegmentsTotal == 0 && state != nil {
-		snap.SegmentsTotal = len(state.Segments)
-	}
-	return &fetcher.Stats{Snapshot: &snap}
-}
-
-// supervise waits for the segment workers, then merges. A canceled context
-// exits silently (the engine is pausing), everything else is reported through
-// DoneCh exactly once per run.
-func (f *Fetcher) supervise(run *hlsRun) {
-	run.wg.Wait()
-	defer close(run.done)
-
-	if run.ctx.Err() != nil {
-		f.clearActiveRun(run)
-		return
-	}
-	var err error
-	if failed := run.failCount.Load(); failed > 0 {
-		err = fmt.Errorf("%d segment(s) failed to download", failed)
-	} else {
-		err = f.merge(run)
-		if err == nil {
-			if run.ctx.Err() != nil {
-				// Paused while the merge was in flight: keep the staged
-				// segments and exit silently; the next run re-merges.
-				f.clearActiveRun(run)
-				return
-			}
-			os.RemoveAll(run.tempDir)
-		}
-	}
-	f.clearActiveRun(run)
-	select {
-	case f.DoneCh <- err:
-	default:
-	}
-}
-
-// prepareRun prepares the staging folder and loads the completed-segment
-// journal into run.baseBytes/baseDone/pending. It performs no goroutine
-// launches and no context-bound work, so it runs safely under f.mu before
-// the run is published.
-func (f *Fetcher) prepareRun(run *hlsRun) error {
-	if err := os.MkdirAll(run.tempDir, 0777); err != nil {
-		return err
-	}
-	run.journalPath = filepath.Join(run.tempDir, "journal.json")
-	if err := loadJournal(run); err != nil {
-		return err
-	}
-	for i := range run.segs {
-		if size, ok := run.journal[int64(i)]; ok {
-			if info, err := os.Stat(segmentPath(run.tempDir, int64(i))); err == nil && info.Size() == size {
-				run.baseBytes += size
-				run.baseDone++
-				continue
-			}
-		}
-		run.pending = append(run.pending, int64(i))
-	}
-	run.downloaded.Store(run.baseBytes)
-	return nil
-}
-
-// launchWorkers starts the queue producer and the segment download workers
-// for a published run. Every goroutine registers itself in run.wg so Pause
-// waits for all of them.
-func (f *Fetcher) launchWorkers(run *hlsRun) {
-	if len(run.pending) == 0 {
-		return
-	}
-	queue := make(chan int64)
-	run.wg.Add(1)
-	go func() {
-		defer run.wg.Done()
-		defer close(queue)
-		for _, idx := range run.pending {
-			select {
-			case <-run.ctx.Done():
-				return
-			case queue <- idx:
-			}
-		}
-	}()
-
-	workers := min(f.config.SegmentConnections, len(run.pending))
-	for i := 0; i < workers; i++ {
-		run.wg.Add(1)
-		go func() {
-			defer run.wg.Done()
-			for {
-				select {
-				case <-run.ctx.Done():
-					return
-				case idx, ok := <-queue:
-					if !ok {
-						return
-					}
-					if err := f.downloadSegment(run, idx); err != nil {
-						if errors.Is(err, context.Canceled) {
-							return
-						}
-						run.failCount.Add(1)
-					}
-				}
-			}
-		}()
-	}
-}
-
-func (f *Fetcher) downloadSegment(run *hlsRun, idx int64) error {
-	seg := run.segs[idx]
-	data, err := f.fetchSegmentData(run, seg)
-	if err != nil {
-		return err
-	}
-	if seg.Key != nil {
-		key, err := f.fetchKey(run, seg.Key)
-		if err != nil {
-			return err
-		}
-		iv := seg.Key.IV
-		if iv == nil {
-			iv = sequenceIV(seg.Sequence)
-		}
-		data, err = decryptAES128(data, key, iv)
-		if err != nil {
-			return err
-		}
-	}
-	if err := storeSegment(run, idx, data); err != nil {
-		return err
-	}
-	run.doneCount.Add(1)
-	run.downloaded.Add(int64(len(data)))
-	return nil
-}
-
-// fetchSegmentData downloads one segment with retries, returning its (still
-// encrypted) content.
-func (f *Fetcher) fetchSegmentData(run *hlsRun, seg *Segment) ([]byte, error) {
-	var lastErr error
-	for attempt := 0; attempt <= f.config.MaxRetries; attempt++ {
-		if err := run.ctx.Err(); err != nil {
-			return nil, err
-		}
-		if attempt > 0 {
-			select {
-			case <-run.ctx.Done():
-				return nil, run.ctx.Err()
-			case <-time.After(time.Duration(attempt) * time.Second):
-			}
-		}
-		data, err := f.tryGetSegment(run, seg)
-		if err == nil {
-			return data, nil
-		}
-		if errors.Is(err, context.Canceled) {
-			return nil, err
-		}
-		lastErr = err
-	}
-	return nil, lastErr
-}
-
-func (f *Fetcher) tryGetSegment(run *hlsRun, seg *Segment) ([]byte, error) {
-	resp, err := f.do(run.ctx, run.client, run.extra, http.MethodGet, seg.URI, seg.Byterange)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return nil, fmt.Errorf("segment %s: unexpected status %d", seg.URI, resp.StatusCode)
-	}
-	reader := &stallReader{rc: resp.Body, timeout: f.timeout()}
-	var buf bytes.Buffer
-	chunk := make([]byte, 64<<10)
-	for {
-		n, err := reader.Read(chunk)
-		if n > 0 {
-			buf.Write(chunk[:n])
-		}
-		if err != nil {
-			if errors.Is(err, io.EOF) {
-				break
-			}
-			return nil, err
-		}
-	}
-	if seg.Byterange != nil && int64(buf.Len()) != seg.Byterange.Length {
-		return nil, fmt.Errorf("segment %s: size mismatch, got %d want %d", seg.URI, buf.Len(), seg.Byterange.Length)
-	}
-	return buf.Bytes(), nil
-}
-
-func (f *Fetcher) fetchKey(run *hlsRun, key *Key) ([]byte, error) {
-	run.keyCacheMu.Lock()
-	if cached, ok := run.keyCache[key.URI]; ok {
-		run.keyCacheMu.Unlock()
-		return cached, nil
-	}
-	run.keyCacheMu.Unlock()
-
-	var data []byte
-	var err error
-	for attempt := 0; attempt <= f.config.MaxRetries; attempt++ {
-		if err = run.ctx.Err(); err != nil {
-			return nil, err
-		}
-		if attempt > 0 {
-			select {
-			case <-run.ctx.Done():
-				return nil, run.ctx.Err()
-			case <-time.After(time.Duration(attempt) * time.Second):
-			}
-		}
-		resp, reqErr := f.do(run.ctx, run.client, run.extra, http.MethodGet, key.URI, nil)
-		if reqErr != nil {
-			err = reqErr
-			continue
-		}
-		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-			resp.Body.Close()
-			err = fmt.Errorf("key %s: unexpected status %d", key.URI, resp.StatusCode)
-			continue
-		}
-		data, err = io.ReadAll(io.LimitReader(resp.Body, 1<<20))
-		resp.Body.Close()
-		if err == nil {
-			break
-		}
-	}
-	if err != nil {
-		return nil, err
-	}
-	if len(data) != 16 {
-		return nil, fmt.Errorf("key %s: invalid key size %d", key.URI, len(data))
-	}
-	run.keyCacheMu.Lock()
-	run.keyCache[key.URI] = data
-	run.keyCacheMu.Unlock()
-	return data, nil
-}
-
-// merge concatenates the downloaded segments in plan order into the final
-// output file. Segments are stored decrypted, so this is pure I/O. The merge
-// writes to a unique temporary file next to the target, checks write and
-// close errors, and only then replaces the target: a failed merge leaves the
-// staged segments intact so it can be retried, and the unique part name keeps
-// concurrent tasks that share an output path from clobbering each other. The
-// final size is published through Progress: the engine backfills Res.Size
-// from Progress().TotalDownloaded() on completion.
-func (f *Fetcher) merge(run *hlsRun) error {
-	target := run.outputPath
-	if err := os.MkdirAll(filepath.Dir(target), 0777); err != nil {
-		return err
-	}
-	partPath := target + tempDirPrefix + run.stagingID + ".part"
-	out, err := os.Create(partPath)
-	if err != nil {
-		return err
-	}
-	var total int64
-	for i := range run.segs {
-		data, err := os.ReadFile(segmentPath(run.tempDir, int64(i)))
-		if err != nil {
-			out.Close()
-			os.Remove(partPath)
-			return fmt.Errorf("read segment %d failed: %w", i, err)
-		}
-		if _, err := out.Write(data); err != nil {
-			out.Close()
-			os.Remove(partPath)
-			return err
-		}
-		total += int64(len(data))
-	}
-	if err := out.Close(); err != nil {
-		os.Remove(partPath)
-		return err
-	}
-	// Remove-then-rename keeps this idempotent: if a previous merge already
-	// renamed its output before a crash lost the bookkeeping, re-merging
-	// must still succeed.
-	if err := os.Remove(target); err != nil && !os.IsNotExist(err) {
-		os.Remove(partPath)
-		return err
-	}
-	if err := os.Rename(partPath, target); err != nil {
-		os.Remove(partPath)
-		return err
-	}
-	run.downloaded.Store(total)
-	return nil
-}
-
-func storeSegment(run *hlsRun, idx int64, data []byte) error {
-	partPath := segmentPath(run.tempDir, idx) + ".part"
-	if err := os.WriteFile(partPath, data, 0666); err != nil {
-		return err
-	}
-	if err := os.Rename(partPath, segmentPath(run.tempDir, idx)); err != nil {
-		return err
-	}
-	run.journalMu.Lock()
-	defer run.journalMu.Unlock()
-	run.journal[idx] = int64(len(data))
-	return saveJournal(run)
-}
-
-func segmentPath(tempDir string, idx int64) string {
-	return filepath.Join(tempDir, "seg-"+strconv.FormatInt(idx, 10))
-}
-
-// resolveStagingDirLocked returns the staging folder of the current plan,
-// deriving and pinning it on first use so later output renames or moves do
-// not orphan the staged segments. It lives next to the task output, which is
-// exactly opts.Path for a single-file task. Must be called with f.mu held.
-func (f *Fetcher) resolveStagingDirLocked() string {
-	if f.state.StagingDir == "" {
-		if f.state.StagingID == "" {
-			// Legacy state (or a hand-crafted plan): migrate to a fresh task
-			// owned identity. The old URL-hash folder is deliberately not
-			// reused: its contents cannot be proven to belong to this plan,
-			// and sharing it with another same-URL task is exactly the bug
-			// being fixed. It is left behind as orphaned temp data.
-			f.state.StagingID = randomStagingID()
-		}
-		dir := ""
-		if f.meta.Opts != nil {
-			dir = f.meta.Opts.Path
-		}
-		f.state.StagingDir = filepath.Join(dir, tempDirPrefix+f.state.StagingID)
-	}
-	return f.state.StagingDir
-}
-
-// prefetchSize probes segment Content-Length via HEAD. Any failure resets all
-// sizes to zero: a partial size estimate would corrupt progress reporting.
-func (f *Fetcher) prefetchSize(segments []*Segment) {
-	var need []*Segment
-	for _, seg := range segments {
-		if seg.Size <= 0 {
-			need = append(need, seg)
-		}
-	}
-	if len(need) == 0 || len(need) > maxPrefetchSizeSegments {
-		return
-	}
-
-	workerCount := min(f.config.SegmentConnections, 8)
-	var failed atomic.Bool
-	queue := make(chan *Segment)
-	var wg sync.WaitGroup
-	for i := 0; i < workerCount; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			for seg := range queue {
-				ctx, cancel := context.WithTimeout(context.Background(), f.timeout())
-				seg.Size = f.headContentLength(ctx, seg.URI)
-				cancel()
-				if seg.Size <= 0 {
-					failed.Store(true)
-				}
-			}
-		}()
-	}
-	for _, seg := range need {
-		queue <- seg
-	}
-	close(queue)
-	wg.Wait()
-	if failed.Load() {
-		for _, seg := range segments {
-			seg.Size = 0
-		}
-	}
-}
-
-func (f *Fetcher) headContentLength(ctx context.Context, u string) int64 {
-	req, err := buildRequest(ctx, f.extra, http.MethodHead, u, nil, nil)
-	if err != nil {
-		return 0
-	}
-	resp, err := f.client.Do(req)
-	if err != nil {
-		return 0
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return 0
-	}
-	return resp.ContentLength
-}
-
-func (f *Fetcher) fetchText(ctx context.Context, method, u string) (string, string, error) {
-	resp, err := f.do(ctx, f.client, f.extra, method, u, nil)
-	if err != nil {
-		return "", "", err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return "", "", fmt.Errorf("unexpected status %d for %s", resp.StatusCode, u)
-	}
-	data, err := io.ReadAll(io.LimitReader(&stallReader{rc: resp.Body, timeout: f.timeout()}, maxPlaylistSize))
-	if err != nil {
-		return "", "", err
-	}
-	return string(data), resp.Request.URL.String(), nil
-}
-
-func (f *Fetcher) do(ctx context.Context, client *http.Client, extra *ReqExtra, method, u string, byterange *ByteRange) (*http.Response, error) {
-	if method == "" {
-		method = http.MethodGet
-	}
-	req, err := buildRequest(ctx, extra, method, u, nil, byterange)
-	if err != nil {
-		return nil, err
-	}
-	return client.Do(req)
-}
-
-func (f *Fetcher) playlistMethod() string {
-	if f.extra != nil && f.extra.Method != "" {
-		return f.extra.Method
-	}
-	return http.MethodGet
-}
-
-// planTotalSize sums the known segment sizes. It returns 0 unless every
-// segment is unencrypted with a known size: ciphertext lengths overstate the
-// final output (CBC padding is removed on decrypt), and partial estimates
-// would make progress stall below 100%. For indeterminate plans the engine
-// backfills Res.Size from Progress().TotalDownloaded() when the task
-// completes (downloader.go watch).
-func planTotalSize(segments []*Segment) int64 {
-	var total int64
-	for _, seg := range segments {
-		if seg.Key != nil {
-			return 0
-		}
-		if seg.Size <= 0 {
-			return 0
-		}
-		total += seg.Size
-	}
-	return total
-}

internal/protocol/hls/fetcher_manager.go

@@ -1,100 +0,0 @@
-package hls
-
-import (
-	"net/url"
-	"path"
-	"strings"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-)
-
-type FetcherManager struct {
-}
-
-func (fm *FetcherManager) Name() string {
-	return "hls"
-}
-
-// Filters registers the .m3u8 extension. The manager must be registered BEFORE
-// the http manager in the downloader config: protocol routing picks the first
-// manager whose filter matches, and the http filter claims every http(s) URL.
-func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
-	return []*fetcher.SchemeFilter{
-		{
-			Type:    fetcher.FilterTypeFile,
-			Pattern: "M3U8",
-		},
-	}
-}
-
-func (fm *FetcherManager) Build() fetcher.Fetcher {
-	return &Fetcher{}
-}
-
-func (fm *FetcherManager) ParseName(u string) string {
-	parsed, err := url.Parse(u)
-	if err != nil {
-		return ""
-	}
-	name := path.Base(parsed.Path)
-	name = strings.TrimSuffix(name, path.Ext(name))
-	if name == "" || name == "/" || name == "." {
-		name = parsed.Hostname()
-	}
-	return name
-}
-
-func (fm *FetcherManager) AutoRename() bool {
-	return true
-}
-
-func (fm *FetcherManager) DefaultConfig() any {
-	return &config{
-		SegmentConnections:    defaultSegmentConnections,
-		MaxRetries:            defaultMaxRetries,
-		TimeoutSeconds:        defaultTimeoutSeconds,
-		PrefetchContentLength: true,
-	}
-}
-
-func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
-	_f := f.(*Fetcher)
-	_f.mu.Lock()
-	defer _f.mu.Unlock()
-	if _f.state == nil {
-		return nil, nil
-	}
-	// The engine's periodic checkpoint calls Store without holding the task
-	// lock and serializes the returned value afterwards, while Resolve/Patch/
-	// Start mutate the live state under the fetcher mutex: return a snapshot
-	// copy taken under that mutex, mirroring the HTTP protocol's Store.
-	return cloneState(_f.state), nil
-}
-
-func cloneState(state *fetcherState) *fetcherState {
-	cloned := *state
-	cloned.Segments = make([]*Segment, len(state.Segments))
-	for i, seg := range state.Segments {
-		s := *seg
-		cloned.Segments[i] = &s
-	}
-	return &cloned
-}
-
-func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
-	return &fetcherState{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
-		fb := &FetcherManager{}
-		restored := fb.Build().(*Fetcher)
-		restored.meta = meta
-		if state, ok := v.(*fetcherState); ok && state.MediaURL != "" {
-			restored.state = state
-		}
-		// Setup is invoked by the engine (restoreFetcher) after this builder
-		// returns; ReqExtra parsing happens there as well.
-		return restored
-	}
-}
-
-func (fm *FetcherManager) Close() error {
-	return nil
-}

internal/protocol/hls/fetcher_test.go

@@ -1,865 +0,0 @@
-package hls
-
-import (
-	"bytes"
-	"crypto/aes"
-	"crypto/cipher"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-func pkcs7PadForTest(data []byte, blockSize int) []byte {
-	pad := blockSize - len(data)%blockSize
-	return append(data, bytes.Repeat([]byte{byte(pad)}, pad)...)
-}
-
-func encryptSegment(plain, key, iv []byte) []byte {
-	padded := pkcs7PadForTest(plain, aes.BlockSize)
-	block, _ := aes.NewCipher(key)
-	encrypted := make([]byte, len(padded))
-	cipher.NewCBCEncrypter(block, iv).CryptBlocks(encrypted, padded)
-	return encrypted
-}
-
-// serveContentWithReferer is a helper handler that enforces an optional
-// Referer requirement and reports request counts.
-type cdnHandler struct {
-	mux            *http.ServeMux
-	requireReferer string
-	requests       atomic.Int64
-}
-
-func (h *cdnHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	h.requests.Add(1)
-	if h.requireReferer != "" && r.Header.Get("Referer") != h.requireReferer {
-		w.WriteHeader(http.StatusForbidden)
-		return
-	}
-	h.mux.ServeHTTP(w, r)
-}
-
-func newTestFetcher(t *testing.T, cfg config) *Fetcher {
-	t.Helper()
-	fm := &FetcherManager{}
-	f := fm.Build().(*Fetcher)
-	ctl := controller.NewController()
-	ctl.GetConfig = func(v any) {
-		if c, ok := v.(*config); ok {
-			*c = cfg
-		}
-	}
-	f.Setup(ctl)
-	return f
-}
-
-func testConfig() config {
-	return config{
-		SegmentConnections:    4,
-		MaxRetries:            2,
-		TimeoutSeconds:        5,
-		PrefetchContentLength: true,
-	}
-}
-
-func mustResolve(t *testing.T, f *Fetcher, playlistURL, referer string) {
-	t.Helper()
-	req := &base.Request{URL: playlistURL}
-	if referer != "" {
-		req.Extra = &ReqExtra{Header: map[string]string{"Referer": referer}}
-	}
-	f.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := f.Resolve(req); err != nil {
-		t.Fatalf("resolve: %v", err)
-	}
-}
-
-func mustRun(t *testing.T, f *Fetcher) {
-	t.Helper()
-	if err := f.Start(); err != nil {
-		t.Fatalf("start: %v", err)
-	}
-	if err := f.Wait(); err != nil {
-		t.Fatalf("wait: %v", err)
-	}
-}
-
-func statsOf(t *testing.T, f *Fetcher) Stats {
-	t.Helper()
-	s, ok := f.Stats().Snapshot.(*Stats)
-	if !ok {
-		t.Fatalf("unexpected stats snapshot type %T", f.Stats().Snapshot)
-	}
-	return *s
-}
-
-func readOutput(t *testing.T, f *Fetcher) []byte {
-	t.Helper()
-	data, err := os.ReadFile(f.meta.SingleFilepath())
-	if err != nil {
-		t.Fatal(err)
-	}
-	return data
-}
-
-func TestFetcherE2E_MasterTS(t *testing.T) {
-	seg := func(i int) []byte {
-		return []byte(fmt.Sprintf("SEGMENT-%02d-PAYLOAD", i))
-	}
-	mux := http.NewServeMux()
-	mux.HandleFunc("/master.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte("#EXTM3U\n" +
-			"#EXT-X-STREAM-INF:BANDWIDTH=800000\nv1/index.m3u8\n" +
-			"#EXT-X-STREAM-INF:BANDWIDTH=2000000\nv2/index.m3u8\n"))
-	})
-	mux.HandleFunc("/v1/index.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte("#EXTM3U\n#EXTINF:4,\nlow-0.ts\n#EXT-X-ENDLIST\n"))
-	})
-	mux.HandleFunc("/v2/index.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		var b strings.Builder
-		b.WriteString("#EXTM3U\n")
-		for i := 0; i < 5; i++ {
-			b.WriteString(fmt.Sprintf("#EXTINF:4,\nseg-%d.ts\n", i))
-		}
-		b.WriteString("#EXT-X-ENDLIST\n")
-		w.Write([]byte(b.String()))
-	})
-	for i := 0; i < 5; i++ {
-		content := seg(i)
-		path := "/v2/seg-" + strconv.Itoa(i) + ".ts"
-		mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
-			w.Header().Set("Content-Length", strconv.Itoa(len(content)))
-			w.Write(content)
-		})
-	}
-	server := httptest.NewServer(&cdnHandler{mux: mux})
-	defer server.Close()
-
-	f := newTestFetcher(t, testConfig())
-	mustResolve(t, f, server.URL+"/master.m3u8", "")
-	// Master resolution picked the 2000000 variant.
-	if f.state.MediaURL != server.URL+"/v2/index.m3u8" {
-		t.Fatalf("wrong variant picked: %s", f.state.MediaURL)
-	}
-	// HEAD prefetch should have computed the exact total size.
-	if f.meta.Res.Size != int64(5*len(seg(0))) {
-		t.Fatalf("prefetched size wrong: %d", f.meta.Res.Size)
-	}
-	mustRun(t, f)
-
-	var want []byte
-	for i := 0; i < 5; i++ {
-		want = append(want, seg(i)...)
-	}
-	got := readOutput(t, f)
-	if !bytes.Equal(got, want) {
-		t.Errorf("merged output mismatch: %q", got)
-	}
-	// The staging folder must be cleaned up after a successful merge; only
-	// the output file remains in the task directory.
-	if entries, _ := os.ReadDir(filepath.Dir(f.meta.SingleFilepath())); len(entries) != 1 {
-		for _, e := range entries {
-			t.Logf("leftover entry: %s", e.Name())
-		}
-		t.Errorf("staging dir should be cleaned up after merge")
-	}
-	if f.meta.Res.Size != int64(len(want)) {
-		t.Errorf("final size wrong: %d", f.meta.Res.Size)
-	}
-}
-
-func TestFetcherE2E_RefererEnforced(t *testing.T) {
-	page := "https://player.example.com/watch/123"
-	var playlist strings.Builder
-	playlist.WriteString("#EXTM3U\n")
-	segments := make(map[string][]byte)
-	for i := 0; i < 3; i++ {
-		name := fmt.Sprintf("seg-%d.ts", i)
-		segments["/"+name] = []byte(fmt.Sprintf("DATA-%d", i))
-		playlist.WriteString(fmt.Sprintf("#EXTINF:4,\n%s\n", name))
-	}
-	playlist.WriteString("#EXT-X-ENDLIST\n")
-
-	mux := http.NewServeMux()
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(playlist.String()))
-	})
-	for path, content := range segments {
-		c := content
-		mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
-			w.Write(c)
-		})
-	}
-	server := httptest.NewServer(&cdnHandler{mux: mux, requireReferer: page})
-	defer server.Close()
-
-	// Without Referer the resolve itself must fail (403 on the playlist).
-	blocked := newTestFetcher(t, testConfig())
-	req := &base.Request{URL: server.URL + "/video.m3u8"}
-	blocked.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := blocked.Resolve(req); err == nil {
-		t.Fatal("resolve without Referer should fail")
-	}
-
-	// With the Referer set through the task extra headers it must succeed.
-	allowed := newTestFetcher(t, testConfig())
-	allowedReq := &base.Request{
-		URL:   server.URL + "/video.m3u8",
-		Extra: &ReqExtra{Header: map[string]string{"Referer": page}},
-	}
-	allowed.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := allowed.Resolve(allowedReq); err != nil {
-		t.Fatal(err)
-	}
-	mustRun(t, allowed)
-	want := []byte("DATA-0DATA-1DATA-2")
-	if !bytes.Equal(readOutput(t, allowed), want) {
-		t.Error("output mismatch with Referer download")
-	}
-}
-
-func TestFetcherE2E_AES128KeyRotation(t *testing.T) {
-	key1 := []byte("0123456789abcdef")
-	key2 := []byte("fedcba9876543210")
-	iv1 := []byte("aaaaaaaaaaaaaaaa")
-	plain1 := []byte("ENCRYPTED-SEGMENT-ONE!!") // padded on encrypt
-	plain2 := []byte("ENCRYPTED-SEGMENT-TWO!!")
-	// seg-2 has no explicit IV: derived from media sequence 1.
-	enc1 := encryptSegment(plain1, key1, iv1)
-	enc2 := encryptSegment(plain2, key2, sequenceIV(1))
-
-	mux := http.NewServeMux()
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte("#EXTM3U\n" +
-			"#EXT-X-MEDIA-SEQUENCE:0\n" +
-			"#EXT-X-KEY:METHOD=AES-128,URI=\"key-1.bin\",IV=0x" + hexEncode(iv1) + "\n" +
-			"#EXTINF:5,\nseg-1.ts\n" +
-			"#EXT-X-KEY:METHOD=AES-128,URI=\"key-2.bin\"\n" +
-			"#EXTINF:5,\nseg-2.ts\n" +
-			"#EXT-X-ENDLIST\n"))
-	})
-	mux.HandleFunc("/key-1.bin", func(w http.ResponseWriter, r *http.Request) {
-		w.Write(key1)
-	})
-	mux.HandleFunc("/key-2.bin", func(w http.ResponseWriter, r *http.Request) {
-		w.Write(key2)
-	})
-	mux.HandleFunc("/seg-1.ts", func(w http.ResponseWriter, r *http.Request) {
-		w.Write(enc1)
-	})
-	mux.HandleFunc("/seg-2.ts", func(w http.ResponseWriter, r *http.Request) {
-		w.Write(enc2)
-	})
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	f := newTestFetcher(t, testConfig())
-	mustResolve(t, f, server.URL+"/video.m3u8", "")
-	// Ciphertext sizes overstate the final output after decryption, so an
-	// encrypted plan must report an indeterminate size.
-	if f.meta.Res.Size != 0 {
-		t.Errorf("encrypted plan should report size 0, got %d", f.meta.Res.Size)
-	}
-	mustRun(t, f)
-
-	want := append(append([]byte{}, plain1...), plain2...)
-	if !bytes.Equal(readOutput(t, f), want) {
-		t.Errorf("decrypted output mismatch: %q", readOutput(t, f))
-	}
-}
-
-func TestFetcherE2E_ByteRange(t *testing.T) {
-	data := []byte("0123456789ABCDEFGHIJ") // 20 bytes
-	mux := http.NewServeMux()
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte("#EXTM3U\n" +
-			"#EXT-X-BYTERANGE:10@0\nblob.bin\n" +
-			"#EXT-X-BYTERANGE:10\nblob.bin\n" +
-			"#EXT-X-ENDLIST\n"))
-	})
-	mux.HandleFunc("/blob.bin", func(w http.ResponseWriter, r *http.Request) {
-		rng := r.Header.Get("Range")
-		if rng == "" {
-			w.Write(data)
-			return
-		}
-		// bytes=start-end
-		var start, end int
-		fmt.Sscanf(rng, "bytes=%d-%d", &start, &end)
-		w.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", start, end, len(data)))
-		w.WriteHeader(http.StatusPartialContent)
-		w.Write(data[start : end+1])
-	})
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	f := newTestFetcher(t, testConfig())
-	mustResolve(t, f, server.URL+"/video.m3u8", "")
-	if f.meta.Res.Size != 20 {
-		t.Fatalf("byterange sizes should be known from the playlist, got %d", f.meta.Res.Size)
-	}
-	mustRun(t, f)
-	if !bytes.Equal(readOutput(t, f), data) {
-		t.Errorf("byterange merge mismatch: %q", readOutput(t, f))
-	}
-}
-
-func TestFetcherE2E_PauseResume(t *testing.T) {
-	const total = 8
-	var served atomic.Int64
-	mux := http.NewServeMux()
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		var b strings.Builder
-		b.WriteString("#EXTM3U\n")
-		for i := 0; i < total; i++ {
-			b.WriteString(fmt.Sprintf("#EXTINF:4,\nseg-%d.ts\n", i))
-		}
-		b.WriteString("#EXT-X-ENDLIST\n")
-		w.Write([]byte(b.String()))
-	})
-	segments := make(map[int][]byte)
-	for i := 0; i < total; i++ {
-		segments[i] = []byte(fmt.Sprintf("SLOW-SEGMENT-%02d", i))
-	}
-	for i := 0; i < total; i++ {
-		idx := i
-		mux.HandleFunc(fmt.Sprintf("/seg-%d.ts", i), func(w http.ResponseWriter, r *http.Request) {
-			time.Sleep(150 * time.Millisecond)
-			served.Add(1)
-			w.Write(segments[idx])
-		})
-	}
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	cfg := testConfig()
-	cfg.SegmentConnections = 2
-	cfg.PrefetchContentLength = false
-	f := newTestFetcher(t, cfg)
-	mustResolve(t, f, server.URL+"/video.m3u8", "")
-
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	// Let a couple of segments finish, then pause.
-	time.Sleep(400 * time.Millisecond)
-	if err := f.Pause(); err != nil {
-		t.Fatal(err)
-	}
-	doneBefore := statsOf(t, f).SegmentsDone
-	if doneBefore == 0 {
-		t.Fatal("expected some segments to complete before pause")
-	}
-	if doneBefore == total {
-		t.Fatal("all segments finished before pause, test is not exercising resume")
-	}
-
-	// Resume must finish the rest and produce the full output.
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Wait(); err != nil {
-		t.Fatal(err)
-	}
-	var want []byte
-	for i := 0; i < total; i++ {
-		want = append(want, segments[i]...)
-	}
-	if !bytes.Equal(readOutput(t, f), want) {
-		t.Errorf("resumed output mismatch: %q", readOutput(t, f))
-	}
-}
-
-func TestFetcherE2E_StoreRestoreResume(t *testing.T) {
-	const total = 6
-	var served atomic.Int64
-	mux := http.NewServeMux()
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		var b strings.Builder
-		b.WriteString("#EXTM3U\n")
-		for i := 0; i < total; i++ {
-			b.WriteString(fmt.Sprintf("#EXTINF:4,\nseg-%d.ts\n", i))
-		}
-		b.WriteString("#EXT-X-ENDLIST\n")
-		w.Write([]byte(b.String()))
-	})
-	segments := make(map[int][]byte)
-	for i := 0; i < total; i++ {
-		segments[i] = []byte(fmt.Sprintf("RESTORE-SEGMENT-%02d", i))
-	}
-	for i := 0; i < total; i++ {
-		idx := i
-		mux.HandleFunc(fmt.Sprintf("/seg-%d.ts", i), func(w http.ResponseWriter, r *http.Request) {
-			time.Sleep(120 * time.Millisecond)
-			served.Add(1)
-			w.Write(segments[idx])
-		})
-	}
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	cfg := testConfig()
-	cfg.SegmentConnections = 2
-	cfg.PrefetchContentLength = false
-
-	f := newTestFetcher(t, cfg)
-	mustResolve(t, f, server.URL+"/video.m3u8", "")
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	time.Sleep(350 * time.Millisecond)
-	if err := f.Pause(); err != nil {
-		t.Fatal(err)
-	}
-	doneBefore := statsOf(t, f).SegmentsDone
-	if doneBefore == 0 {
-		t.Fatal("expected some segments to finish before simulated restart")
-	}
-
-	// Simulate an app restart: persist, then restore into a fresh fetcher.
-	fm := &FetcherManager{}
-	state, err := fm.Store(f)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if state == nil {
-		t.Fatal("state should be persisted")
-	}
-	ctl := controller.NewController()
-	ctl.GetConfig = func(v any) {
-		if c, ok := v.(*config); ok {
-			*c = cfg
-		}
-	}
-	holder := fm.Build().(*Fetcher)
-	holder.Setup(ctl)
-	holder.meta = &fetcher.FetcherMeta{
-		Req:  f.meta.Req,
-		Opts: f.meta.Opts,
-		Res:  f.meta.Res,
-	}
-	_, builder := fm.Restore()
-	rf := builder(holder.meta, state).(*Fetcher)
-	// The engine calls Setup on the builder result (restoreFetcher).
-	rf.Setup(ctl)
-	if rf.state == nil || len(rf.state.Segments) != total {
-		t.Fatal("restored state missing segment plan")
-	}
-
-	if err := rf.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := rf.Wait(); err != nil {
-		t.Fatal(err)
-	}
-	if done := statsOf(t, rf).SegmentsDone; done != total {
-		t.Errorf("want %d done, got %d", total, done)
-	}
-	var want []byte
-	for i := 0; i < total; i++ {
-		want = append(want, segments[i]...)
-	}
-	if !bytes.Equal(readOutput(t, rf), want) {
-		t.Errorf("restored output mismatch: %q", readOutput(t, rf))
-	}
-}
-
-func hexEncode(b []byte) string {
-	const digits = "0123456789abcdef"
-	out := make([]byte, 0, len(b)*2)
-	for _, v := range b {
-		out = append(out, digits[v>>4], digits[v&0x0f])
-	}
-	return string(out)
-}
-
-// restoreLikeEngine round-trips the persisted state and the task meta through
-// JSON the way the engine storage does, then builds a fresh fetcher. This is
-// the path that historically lost the request extra headers.
-func restoreLikeEngine(t *testing.T, f *Fetcher, cfg config) *Fetcher {
-	t.Helper()
-	fm := &FetcherManager{}
-	stateAny, err := fm.Store(f)
-	if err != nil {
-		t.Fatal(err)
-	}
-	rawState, err := json.Marshal(stateAny)
-	if err != nil {
-		t.Fatal(err)
-	}
-	storedState := &fetcherState{}
-	if err := json.Unmarshal(rawState, storedState); err != nil {
-		t.Fatal(err)
-	}
-	rawMeta, err := json.Marshal(f.meta)
-	if err != nil {
-		t.Fatal(err)
-	}
-	restoredMeta := &fetcher.FetcherMeta{}
-	if err := json.Unmarshal(rawMeta, restoredMeta); err != nil {
-		t.Fatal(err)
-	}
-	if _, ok := restoredMeta.Req.Extra.(*ReqExtra); ok {
-		t.Fatal("storage round trip should yield a map-shaped extra, like the engine")
-	}
-	ctl := controller.NewController()
-	ctl.GetConfig = func(v any) {
-		if c, ok := v.(*config); ok {
-			*c = cfg
-		}
-	}
-	_, builder := fm.Restore()
-	rf := builder(restoredMeta, storedState).(*Fetcher)
-	// The engine calls Setup on the builder result (restoreFetcher).
-	rf.Setup(ctl)
-	return rf
-}
-
-func TestFetcherE2E_StoreRestoreAuthenticated(t *testing.T) {
-	const total = 4
-	page := "https://player.example.com/watch/42"
-	var served atomic.Int64
-	mux := http.NewServeMux()
-	var playlist strings.Builder
-	playlist.WriteString("#EXTM3U\n")
-	for i := 0; i < total; i++ {
-		playlist.WriteString(fmt.Sprintf("#EXTINF:4,\nseg-%d.ts\n", i))
-	}
-	playlist.WriteString("#EXT-X-ENDLIST\n")
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(playlist.String()))
-	})
-	segments := make(map[int][]byte)
-	for i := 0; i < total; i++ {
-		segments[i] = []byte(fmt.Sprintf("AUTH-SEGMENT-%02d", i))
-		idx := i
-		mux.HandleFunc(fmt.Sprintf("/seg-%d.ts", idx), func(w http.ResponseWriter, r *http.Request) {
-			time.Sleep(80 * time.Millisecond)
-			served.Add(1)
-			w.Write(segments[idx])
-		})
-	}
-	server := httptest.NewServer(&cdnHandler{mux: mux, requireReferer: page})
-	defer server.Close()
-
-	cfg := testConfig()
-	cfg.SegmentConnections = 2
-	cfg.PrefetchContentLength = false
-
-	f := newTestFetcher(t, cfg)
-	req := &base.Request{
-		URL:   server.URL + "/video.m3u8",
-		Extra: &ReqExtra{Header: map[string]string{"Referer": page}},
-	}
-	f.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := f.Resolve(req); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	time.Sleep(150 * time.Millisecond)
-	if err := f.Pause(); err != nil {
-		t.Fatal(err)
-	}
-
-	rf := restoreLikeEngine(t, f, cfg)
-	if rf.extra == nil || rf.extra.Header["Referer"] != page {
-		t.Fatalf("restored fetcher lost the request extra headers: %+v", rf.extra)
-	}
-	if err := rf.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := rf.Wait(); err != nil {
-		t.Fatalf("resumed download failed (request headers lost?): %v", err)
-	}
-	var want []byte
-	for i := 0; i < total; i++ {
-		want = append(want, segments[i]...)
-	}
-	if !bytes.Equal(readOutput(t, rf), want) {
-		t.Errorf("restored output mismatch: %q", readOutput(t, rf))
-	}
-}
-
-func TestFetcherE2E_PatchPartialUpdate(t *testing.T) {
-	page := "https://player.example.com/watch/7"
-	var requiredReferer atomic.Value // string
-	requiredReferer.Store(page)
-	var playlist strings.Builder
-	playlist.WriteString("#EXTM3U\n")
-	segments := make(map[string][]byte)
-	for i := 0; i < 3; i++ {
-		segments[fmt.Sprintf("/s%d.ts", i)] = []byte(fmt.Sprintf("PATCH-%d", i))
-		playlist.WriteString(fmt.Sprintf("#EXTINF:4,\ns%d.ts\n", i))
-	}
-	playlist.WriteString("#EXT-X-ENDLIST\n")
-	mux := http.NewServeMux()
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(playlist.String()))
-	})
-	for path, content := range segments {
-		c := content
-		mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
-			w.Write(c)
-		})
-	}
-	// The Referer requirement can be flipped mid-test to prove that a patched
-	// header is actually sent by the next run.
-	dyn := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if want, _ := requiredReferer.Load().(string); want != "" && r.Header.Get("Referer") != want {
-			w.WriteHeader(http.StatusForbidden)
-			return
-		}
-		mux.ServeHTTP(w, r)
-	})
-	server := httptest.NewServer(dyn)
-	defer server.Close()
-
-	f := newTestFetcher(t, testConfig())
-	req := &base.Request{
-		URL:   server.URL + "/video.m3u8",
-		Extra: &ReqExtra{Header: map[string]string{"Referer": page}},
-	}
-	opts := &base.Options{Path: t.TempDir()}
-	f.Meta().Opts = opts
-	if err := f.Resolve(req); err != nil {
-		t.Fatal(err)
-	}
-
-	// A nil/nil patch must be a no-op, not a panic.
-	if err := f.Patch(nil, nil); err != nil {
-		t.Fatalf("nil patch should be accepted: %v", err)
-	}
-
-	// Header-only patch: the resolved plan and output options are retained
-	// while the new header takes effect on the next run.
-	newReferer := "https://player.example.com/watch/9"
-	if err := f.Patch(&base.Request{
-		URL:   server.URL + "/video.m3u8",
-		Extra: &ReqExtra{Header: map[string]string{"Referer": newReferer}},
-	}, nil); err != nil {
-		t.Fatal(err)
-	}
-	if f.state == nil || f.meta.Res == nil {
-		t.Fatal("header-only patch must keep the resolved plan")
-	}
-	if f.meta.Opts.Path != opts.Path {
-		t.Fatalf("header-only patch must keep the output path: %s", f.meta.Opts.Path)
-	}
-	if f.extra.Header["Referer"] != newReferer {
-		t.Fatalf("patched header not applied: %+v", f.extra.Header)
-	}
-	requiredReferer.Store(newReferer)
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Wait(); err != nil {
-		t.Fatalf("run with patched header failed: %v", err)
-	}
-	if got := readOutput(t, f); string(got) != "PATCH-0PATCH-1PATCH-2" {
-		t.Errorf("output mismatch after header patch: %q", got)
-	}
-
-	// Options-only patch: renaming the task keeps the resolved plan.
-	if err := f.Patch(nil, &base.Options{Name: "renamed.ts"}); err != nil {
-		t.Fatal(err)
-	}
-	if f.state == nil {
-		t.Fatal("options-only patch must keep the resolved plan")
-	}
-	if f.meta.Opts.Name != "renamed.ts" || f.meta.Opts.Path != opts.Path {
-		t.Fatalf("options patch misapplied: %+v", f.meta.Opts)
-	}
-
-	// URL-only patch: the plan is dropped for a re-resolve but the output
-	// path and renamed file survive.
-	if err := f.Patch(&base.Request{URL: server.URL + "/refreshed.m3u8"}, nil); err != nil {
-		t.Fatal(err)
-	}
-	if f.state != nil || f.meta.Res != nil {
-		t.Fatal("URL patch must drop the resolved plan")
-	}
-	if f.meta.Opts.Path != opts.Path || f.meta.Opts.Name != "renamed.ts" {
-		t.Fatal("URL patch must keep the output options")
-	}
-}
-
-func TestFetcherE2E_PatchWhileRunningRejected(t *testing.T) {
-	mux := http.NewServeMux()
-	var playlist strings.Builder
-	playlist.WriteString("#EXTM3U\n")
-	for i := 0; i < 6; i++ {
-		playlist.WriteString(fmt.Sprintf("#EXTINF:4,\nseg-%d.ts\n", i))
-	}
-	playlist.WriteString("#EXT-X-ENDLIST\n")
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(playlist.String()))
-	})
-	for i := 0; i < 6; i++ {
-		mux.HandleFunc(fmt.Sprintf("/seg-%d.ts", i), func(w http.ResponseWriter, r *http.Request) {
-			time.Sleep(150 * time.Millisecond)
-			w.Write([]byte("X"))
-		})
-	}
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	f := newTestFetcher(t, testConfig())
-	f.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Patch(&base.Request{URL: server.URL + "/other.m3u8"}, nil); err == nil {
-		t.Fatal("patching a running task must be rejected")
-	}
-	if err := f.Pause(); err != nil {
-		t.Fatal(err)
-	}
-	// After the pause the patch goes through and only then drops the plan.
-	if err := f.Patch(&base.Request{URL: server.URL + "/other.m3u8"}, nil); err != nil {
-		t.Fatal(err)
-	}
-	if f.state != nil {
-		t.Fatal("URL patch after pause must drop the plan")
-	}
-}
-
-func TestFetcherE2E_RetryAfterFailure(t *testing.T) {
-	const total = 4
-	var healthy atomic.Bool
-	mux := http.NewServeMux()
-	var playlist strings.Builder
-	playlist.WriteString("#EXTM3U\n")
-	for i := 0; i < total; i++ {
-		playlist.WriteString(fmt.Sprintf("#EXTINF:4,\nseg-%d.ts\n", i))
-	}
-	playlist.WriteString("#EXT-X-ENDLIST\n")
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(playlist.String()))
-	})
-	segments := make(map[int][]byte)
-	for i := 0; i < total; i++ {
-		segments[i] = []byte(fmt.Sprintf("RETRY-SEGMENT-%02d", i))
-		idx := i
-		mux.HandleFunc(fmt.Sprintf("/seg-%d.ts", idx), func(w http.ResponseWriter, r *http.Request) {
-			if idx == 1 && !healthy.Load() {
-				w.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-			time.Sleep(60 * time.Millisecond)
-			w.Write(segments[idx])
-		})
-	}
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	cfg := testConfig()
-	cfg.MaxRetries = 0 // fail the run on the first bad segment
-	cfg.PrefetchContentLength = false
-	f := newTestFetcher(t, cfg)
-	f.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Wait(); err == nil {
-		t.Fatal("first run should fail while the segment endpoint is down")
-	}
-	if got := statsOf(t, f).SegmentsFailed; got == 0 {
-		t.Fatal("failed segments should be reported in stats")
-	}
-
-	// Server recovered: a fresh run must succeed and report zero failures.
-	healthy.Store(true)
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Wait(); err != nil {
-		t.Fatalf("retry run failed: %v", err)
-	}
-	stats := statsOf(t, f)
-	if stats.SegmentsFailed != 0 {
-		t.Errorf("failures must reset per run, got %d", stats.SegmentsFailed)
-	}
-	if stats.SegmentsDone != total {
-		t.Errorf("want %d done, got %d", total, stats.SegmentsDone)
-	}
-	var want []byte
-	for i := 0; i < total; i++ {
-		want = append(want, segments[i]...)
-	}
-	if !bytes.Equal(readOutput(t, f), want) {
-		t.Errorf("retry output mismatch: %q", readOutput(t, f))
-	}
-}
-
-func TestFetcherE2E_StateMissingSelfHeal(t *testing.T) {
-	const total = 3
-	mux := http.NewServeMux()
-	var playlist strings.Builder
-	playlist.WriteString("#EXTM3U\n")
-	for i := 0; i < total; i++ {
-		playlist.WriteString(fmt.Sprintf("#EXTINF:4,\nseg-%d.ts\n", i))
-	}
-	playlist.WriteString("#EXT-X-ENDLIST\n")
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(playlist.String()))
-	})
-	segments := make(map[int][]byte)
-	for i := 0; i < total; i++ {
-		segments[i] = []byte(fmt.Sprintf("SELFHEAL-%02d", i))
-		idx := i
-		mux.HandleFunc(fmt.Sprintf("/seg-%d.ts", idx), func(w http.ResponseWriter, r *http.Request) {
-			w.Write(segments[idx])
-		})
-	}
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	f := newTestFetcher(t, testConfig())
-	f.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}); err != nil {
-		t.Fatal(err)
-	}
-	// Simulate the crash window where the engine persisted the task with its
-	// resource but the HLS plan was never checkpointed.
-	f.state = nil
-	outputName := f.meta.Res.Files[0].Name
-	if err := f.Start(); err != nil {
-		t.Fatalf("start should self-heal a missing plan: %v", err)
-	}
-	if err := f.Wait(); err != nil {
-		t.Fatalf("self-healed run failed: %v", err)
-	}
-	if f.state == nil || len(f.state.Segments) != total {
-		t.Fatal("self-heal should rebuild the segment plan")
-	}
-	if f.meta.Res.Files[0].Name != outputName {
-		t.Fatalf("self-heal renamed the output: %s", f.meta.Res.Files[0].Name)
-	}
-	var want []byte
-	for i := 0; i < total; i++ {
-		want = append(want, segments[i]...)
-	}
-	if !bytes.Equal(readOutput(t, f), want) {
-		t.Errorf("self-healed output mismatch: %q", readOutput(t, f))
-	}
-}

internal/protocol/hls/helper.go

@@ -1,100 +0,0 @@
-package hls
-
-import (
-	"context"
-	"crypto/tls"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/http/cookiejar"
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/httpclient"
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-const defaultUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
-
-const maxPlaylistSize = 10 << 20 // 10MB, playlists are small text files
-
-func (f *Fetcher) timeout() time.Duration {
-	return time.Duration(f.config.TimeoutSeconds) * time.Second
-}
-
-// buildClient builds an HTTP client honoring the task proxy and TLS settings.
-// The client has no total timeout on purpose: large segments over slow links
-// must not be aborted; body stalls are handled by stallReader instead. It is
-// only called while the fetcher is quiescent (Resolve/Start), never from
-// inside running worker goroutines.
-func (f *Fetcher) buildClient() *http.Client {
-	var proxy *base.RequestProxy
-	skipVerify := false
-	if req := f.meta.Req; req != nil {
-		proxy = req.Proxy
-		skipVerify = req.SkipVerifyCert
-	}
-	jar, _ := cookiejar.New(nil)
-	client, err := httpclient.NewClient(httpclient.Options{
-		Client: httpclient.ClientOptions{
-			Jar: jar,
-		},
-		Transport: httpclient.TransportOptions{
-			DialContext: (&net.Dialer{
-				Timeout: f.timeout(),
-			}).DialContext,
-			Proxy: f.Ctl.GetProxy(proxy),
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: skipVerify,
-			},
-			TLSHandshakeTimeout: f.timeout(),
-		},
-		Impersonation: httpclient.ImpersonationOptions{
-			Mode:    httpclient.ImpersonationAuto,
-			Session: f.impSession,
-		},
-	})
-	if err != nil {
-		panic(fmt.Sprintf("build HTTP client: %v", err))
-	}
-	return client
-}
-
-// buildRequest builds a request with task extra headers, the default user
-// agent and an optional byte range. extra may be nil.
-func buildRequest(ctx context.Context, extra *ReqExtra, method, u string, body io.Reader, byterange *ByteRange) (*http.Request, error) {
-	req, err := http.NewRequestWithContext(ctx, method, u, body)
-	if err != nil {
-		return nil, err
-	}
-	if extra != nil {
-		for key, value := range extra.Header {
-			req.Header.Set(key, value)
-		}
-	}
-	if req.Header.Get("User-Agent") == "" {
-		req.Header.Set("User-Agent", defaultUserAgent)
-	}
-	if byterange != nil {
-		req.Header.Set("Range", fmt.Sprintf("bytes=%d-%d", byterange.Offset, byterange.Offset+byterange.Length-1))
-	}
-	return req, nil
-}
-
-// stallReader aborts reads that see no data for the configured timeout.
-type stallReader struct {
-	rc      io.ReadCloser
-	timeout time.Duration
-}
-
-func (r *stallReader) Read(p []byte) (int, error) {
-	timer := time.AfterFunc(r.timeout, func() {
-		r.rc.Close()
-	})
-	defer timer.Stop()
-	return r.rc.Read(p)
-}
-
-func (r *stallReader) Close() error {
-	return r.rc.Close()
-}

internal/protocol/hls/journal.go

@@ -1,112 +0,0 @@
-package hls
-
-import (
-	"crypto/rand"
-	"crypto/sha1"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"strconv"
-)
-
-// journalFile is the persisted completed-segment ledger. It is bound to the
-// exact download plan: a journal whose fingerprint does not match the current
-// plan is discarded instead of being applied to the wrong segments.
-type journalFile struct {
-	StagingID    string           `json:"stagingID"`
-	PlanHash     string           `json:"planHash"`
-	SegmentCount int              `json:"segmentCount"`
-	Sizes        map[string]int64 `json:"sizes"`
-}
-
-// randomStagingID returns a random identifier used to give every task its own
-// staging folder, stable across app restarts through the persisted state.
-func randomStagingID() string {
-	buf := make([]byte, 6)
-	if _, err := rand.Read(buf); err != nil {
-		// crypto/rand failing is catastrophic anyway; fall back to address
-		// entropy rather than crashing the fetch.
-		return fmt.Sprintf("%x", sha1.Sum([]byte(fmt.Sprintf("%p", buf))))[:12]
-	}
-	return hex.EncodeToString(buf)
-}
-
-// planFingerprint hashes everything that defines the download plan: the media
-// URL, the ordered segments with their sequence numbers, byte ranges, keys
-// and init markers. Two tasks resolve to different fingerprints even when
-// they point at the same playlist URL.
-func planFingerprint(state *fetcherState) string {
-	h := sha1.New()
-	io.WriteString(h, state.MediaURL+"\n")
-	io.WriteString(h, strconv.Itoa(len(state.Segments))+"\n")
-	for _, seg := range state.Segments {
-		fmt.Fprintf(h, "%d|%s|", seg.Sequence, seg.URI)
-		if seg.Byterange != nil {
-			fmt.Fprintf(h, "%d@%d|", seg.Byterange.Offset, seg.Byterange.Length)
-		}
-		if seg.Key != nil {
-			// The IV is part of the plan: same URI with a rotated IV would
-			// silently decrypt to garbage if the journal were reused.
-			fmt.Fprintf(h, "key=%s iv=%x|", seg.Key.URI, seg.Key.IV)
-		}
-		if seg.IsInit {
-			io.WriteString(h, "init|")
-		}
-		io.WriteString(h, "\n")
-	}
-	return hex.EncodeToString(h.Sum(nil))[:16]
-}
-
-// loadJournal reads the journal of a run, discarding anything that cannot be
-// proven to belong to the current plan: foreign or legacy journals, corrupted
-// files, and entries whose recorded size no longer matches the plan.
-func loadJournal(run *hlsRun) error {
-	data, err := os.ReadFile(run.journalPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-	var file journalFile
-	if err := json.Unmarshal(data, &file); err != nil {
-		// A broken or legacy journal must not kill a restartable download.
-		return nil
-	}
-	if file.StagingID != run.stagingID || file.PlanHash != run.planHash || file.SegmentCount != len(run.segs) {
-		return nil
-	}
-	for key, size := range file.Sizes {
-		idx, err := strconv.ParseInt(key, 10, 64)
-		if err != nil || idx < 0 || idx >= int64(len(run.segs)) || size <= 0 {
-			continue
-		}
-		run.journal[idx] = size
-	}
-	return nil
-}
-
-// saveJournal atomically rewrites the journal through a temp file + rename so
-// a crash never leaves a half-written ledger behind.
-func saveJournal(run *hlsRun) error {
-	file := journalFile{
-		StagingID:    run.stagingID,
-		PlanHash:     run.planHash,
-		SegmentCount: len(run.segs),
-		Sizes:        make(map[string]int64, len(run.journal)),
-	}
-	for idx, size := range run.journal {
-		file.Sizes[strconv.FormatInt(idx, 10)] = size
-	}
-	data, err := json.Marshal(file)
-	if err != nil {
-		return err
-	}
-	tmp := run.journalPath + ".tmp"
-	if err := os.WriteFile(tmp, data, 0666); err != nil {
-		return err
-	}
-	return os.Rename(tmp, run.journalPath)
-}

internal/protocol/hls/media_validate_test.go

@@ -1,300 +0,0 @@
-package hls
-
-import (
-	"bytes"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"testing"
-
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-// The validators below check real media structure, not just byte
-// concatenation: TS packets are verified on the 188 byte grid with
-// continuity-counter rules, PAT/PMT presence and PES start codes; fMP4
-// output is verified by walking the ISO-BMFF box hierarchy.
-
-func be32(b []byte) int {
-	return int(b[0])<<24 | int(b[1])<<16 | int(b[2])<<8 | int(b[3])
-}
-
-// validateTS asserts structural validity of a merged MPEG-2 TS stream.
-func validateTS(t *testing.T, data []byte) {
-	t.Helper()
-	if len(data) == 0 || len(data)%188 != 0 {
-		t.Fatalf("TS size %d is not a positive multiple of 188", len(data))
-	}
-	type pidState struct{ cc int }
-	ccByPID := map[int]int{}
-	patSeen, pmtSeen, pesSeen := false, false, false
-	for off := 0; off < len(data); off += 188 {
-		pkt := data[off : off+188]
-		if pkt[0] != 0x47 {
-			t.Fatalf("bad TS sync byte at offset %d", off)
-		}
-		pid := (int(pkt[1]&0x1F) << 8) | int(pkt[2])
-		pusi := pkt[1]&0x40 != 0
-		afc := (pkt[3] >> 4) & 0x3
-		if afc == 0 {
-			continue // reserved
-		}
-		idx := 4
-		if afc&0x2 != 0 { // adaptation field present
-			afLen := int(pkt[4])
-			if afLen > 0 && pkt[5]&0x80 != 0 {
-				// discontinuity_indicator: restart the CC expectation
-				delete(ccByPID, pid)
-			}
-			idx += 1 + afLen
-			if afc == 2 {
-				continue // adaptation only, no payload: no CC rule
-			}
-		}
-		if idx > 188 {
-			t.Fatalf("adaptation field overruns packet at offset %d", off)
-		}
-		if pid == 0x1FFF {
-			continue // null packet
-		}
-		payload := pkt[idx:]
-		if pusi && len(payload) >= 3 && pid != 0 && payload[0] == 0 && payload[1] == 0 && payload[2] == 1 {
-			pesSeen = true
-		}
-		if pid == 0 {
-			if ptr := int(payload[0]); 1+ptr < len(payload) && payload[1+ptr] == 0x00 {
-				patSeen = true // program_association_section table_id
-			}
-		} else if pusi && len(payload) >= 2 && payload[0] == 0 && payload[1] == 0x02 {
-			pmtSeen = true // program_map_section table_id
-		}
-		cc := int(pkt[3] & 0x0F)
-		prev, ok := ccByPID[pid]
-		if !ok {
-			ccByPID[pid] = cc
-			continue
-		}
-		// CC increments by one per payload-bearing packet; a repeated value
-		// models the single legal duplicate packet.
-		if cc != (prev+1)%16 && cc != prev {
-			t.Fatalf("continuity error on PID %d: %d after %d at offset %d", pid, cc, prev, off)
-		}
-		ccByPID[pid] = cc
-	}
-	if !patSeen {
-		t.Error("no PAT found in merged TS")
-	}
-	if !pmtSeen {
-		t.Error("no PMT found in merged TS")
-	}
-	if !pesSeen {
-		t.Error("no PES start code found in merged TS")
-	}
-}
-
-// walkBoxes iterates the top-level ISO-BMFF boxes of data[off:end].
-func walkBoxes(t *testing.T, data []byte, off, end int) []string {
-	t.Helper()
-	var types []string
-	for off+8 <= end {
-		size := be32(data[off:])
-		typ := string(data[off+4 : off+8])
-		if size < 8 || off+size > end {
-			t.Fatalf("invalid box %q at offset %d (size %d)", typ, off, size)
-		}
-		types = append(types, typ)
-		off += size
-	}
-	return types
-}
-
-// validateFMP4 asserts the merged fMP4 output is init section followed by
-// well-formed moof+mdat fragments.
-func validateFMP4(t *testing.T, merged []byte, wantFragments int) {
-	t.Helper()
-	types := walkBoxes(t, merged, 0, len(merged))
-	hasFtyp, hasMoov := false, false
-	fragments := 0
-	expectFragment := false
-	for i, typ := range types {
-		switch typ {
-		case "ftyp":
-			if i != 0 {
-				t.Errorf("ftyp not at stream start")
-			}
-			hasFtyp = true
-		case "moov":
-			if i != 1 {
-				t.Errorf("moov must follow ftyp, found at index %d", i)
-			}
-			hasMoov = true
-		case "styp":
-			expectFragment = true
-		case "moof":
-			if !hasMoov {
-				t.Errorf("fragment before moov")
-			}
-			expectFragment = true
-		case "mdat":
-			if !expectFragment {
-				t.Errorf("mdat outside of a fragment at index %d", i)
-			}
-			expectFragment = false
-			fragments++
-		case "mfra":
-			// optional trailer
-		default:
-			t.Errorf("unexpected top-level box %q", typ)
-		}
-	}
-	if !hasFtyp || !hasMoov {
-		t.Error("merged fMP4 missing ftyp/moov init section")
-	}
-	if fragments != wantFragments {
-		t.Errorf("want %d fragments in merged fMP4, got %d", wantFragments, fragments)
-	}
-}
-
-func mediaFixture(t *testing.T, name string) []byte {
-	t.Helper()
-	data, err := os.ReadFile("testdata/media/" + name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return data
-}
-
-func serveFixtureServer(t *testing.T) *httptest.Server {
-	t.Helper()
-	mux := http.NewServeMux()
-	fs := http.FileServer(http.Dir("testdata/media"))
-	mux.Handle("/", fs)
-	return httptest.NewServer(mux)
-}
-
-func TestHLSRealMedia_TS(t *testing.T) {
-	seg0 := mediaFixture(t, "sample-00.ts")
-	seg1 := mediaFixture(t, "sample-01.ts")
-	playlist := "#EXTM3U\n" +
-		"#EXTINF:0.5,\nsample-00.ts\n" +
-		"#EXTINF:0.5,\nsample-01.ts\n" +
-		"#EXT-X-ENDLIST\n"
-	mux := http.NewServeMux()
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(playlist))
-	})
-	mux.Handle("/", http.FileServer(http.Dir("testdata/media")))
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	f := newTestFetcher(t, testConfig())
-	f.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Wait(); err != nil {
-		t.Fatal(err)
-	}
-	got := readOutput(t, f)
-	if !bytes.Equal(got, append(append([]byte{}, seg0...), seg1...)) {
-		t.Fatal("merged TS is not the exact concatenation of the segments")
-	}
-	validateTS(t, got)
-}
-
-func TestHLSRealMedia_FMP4(t *testing.T) {
-	init := mediaFixture(t, "fmp4-init.mp4")
-	frag1 := mediaFixture(t, "fmp4-seg1.m4s")
-	frag2 := mediaFixture(t, "fmp4-seg2.m4s")
-	frag3 := mediaFixture(t, "fmp4-seg3.m4s")
-	playlist := "#EXTM3U\n" +
-		"#EXT-X-MAP:URI=\"fmp4-init.mp4\"\n" +
-		"#EXTINF:0.5,\nfmp4-seg1.m4s\n" +
-		"#EXTINF:0.5,\nfmp4-seg2.m4s\n" +
-		"#EXTINF:0.5,\nfmp4-seg3.m4s\n" +
-		"#EXT-X-ENDLIST\n"
-	mux := http.NewServeMux()
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(playlist))
-	})
-	mux.Handle("/", http.FileServer(http.Dir("testdata/media")))
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	f := newTestFetcher(t, testConfig())
-	f.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Wait(); err != nil {
-		t.Fatal(err)
-	}
-	got := readOutput(t, f)
-	want := append(append(append(append([]byte{}, init...), frag1...), frag2...), frag3...)
-	if !bytes.Equal(got, want) {
-		t.Fatal("merged fMP4 is not the exact concatenation of init + fragments")
-	}
-	validateFMP4(t, got, 3)
-}
-
-func TestHLSRealMedia_AES128(t *testing.T) {
-	keys := [][]byte{[]byte("key-A-0123456789"), []byte("key-B-9876543210")}
-	iv := []byte("iv-1337-01234567")
-	plain := [][]byte{mediaFixture(t, "sample-00.ts"), mediaFixture(t, "sample-01.ts")}
-
-	playlist := "#EXTM3U\n" +
-		"#EXT-X-MEDIA-SEQUENCE:0\n" +
-		"#EXT-X-KEY:METHOD=AES-128,URI=\"key-0.bin\",IV=0x" + hexEncode(iv) + "\n" +
-		"#EXTINF:0.5,\nenc-0.ts\n" +
-		"#EXT-X-KEY:METHOD=AES-128,URI=\"key-1.bin\"\n" +
-		"#EXTINF:0.5,\nenc-1.ts\n" +
-		"#EXT-X-ENDLIST\n"
-	mux := http.NewServeMux()
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(playlist))
-	})
-	for i, key := range keys {
-		k := key
-		mux.HandleFunc(fmt.Sprintf("/key-%d.bin", i), func(w http.ResponseWriter, r *http.Request) {
-			w.Write(k)
-		})
-		// Segment 0 has an explicit IV, segment 1 derives it from its media
-		// sequence number (1).
-		enc := encryptSegment(plain[i], k, map[bool][]byte{true: iv, false: sequenceIV(int64(i))}[i == 0])
-		mux.HandleFunc(fmt.Sprintf("/enc-%d.ts", i), func(w http.ResponseWriter, r *http.Request) {
-			w.Write(enc)
-		})
-	}
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	f := newTestFetcher(t, testConfig())
-	f.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}); err != nil {
-		t.Fatal(err)
-	}
-	if f.meta.Res.Size != 0 {
-		t.Errorf("encrypted plan must report indeterminate size, got %d", f.meta.Res.Size)
-	}
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Wait(); err != nil {
-		t.Fatal(err)
-	}
-	got := readOutput(t, f)
-	if !bytes.Equal(got, append(append([]byte{}, plain[0]...), plain[1]...)) {
-		t.Fatal("decrypted output mismatch")
-	}
-	validateTS(t, got)
-	if p := f.Progress(); p.TotalDownloaded() != int64(len(got)) {
-		t.Errorf("final progress %d != merged size %d", p.TotalDownloaded(), len(got))
-	}
-}

internal/protocol/hls/playlist.go

@@ -1,479 +0,0 @@
-package hls
-
-import (
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"net/url"
-	"path"
-	"strconv"
-	"strings"
-)
-
-// Variant is one rendition entry of a master playlist.
-type Variant struct {
-	URI          string
-	Bandwidth    int64
-	AvgBandwidth int64
-	Resolution   string
-	Codecs       string
-	Name         string
-	AudioGroup   string // AUDIO attribute: group id of the audio renditions
-}
-
-// MediaRendition is one EXT-X-MEDIA entry of a master playlist. Only the
-// fields needed to detect unsupported track layouts are kept.
-type MediaRendition struct {
-	Type    string
-	GroupID string
-	URI     string
-}
-
-// MasterPlaylist is a parsed master playlist with its rendition groups.
-type MasterPlaylist struct {
-	Variants  []*Variant
-	Rendition map[string][]*MediaRendition // group id -> all EXT-X-MEDIA members
-}
-
-// Key is the decryption key applied to the segments that follow its tag, until
-// the next EXT-X-KEY tag or the end of the playlist.
-type Key struct {
-	Method string
-	URI    string // absolute URI
-	IV     []byte // explicit IV; nil means derive from the media sequence number
-}
-
-// ByteRange is an EXT-X-BYTERANGE sub range of the segment resource.
-type ByteRange struct {
-	Length int64
-	Offset int64
-}
-
-// Segment is one downloadable piece of a media playlist. The init section of
-// an fMP4 stream is represented as a segment with IsInit set.
-type Segment struct {
-	URI       string
-	Sequence  int64 // media sequence number, used to derive the default AES IV
-	Byterange *ByteRange
-	Key       *Key // nil means unencrypted
-	IsInit    bool
-	Gap       bool
-	Duration  float64
-	Size      int64 // exact size in bytes when known (byterange / HEAD probe), 0 when unknown
-}
-
-// Media is a parsed media playlist.
-type Media struct {
-	Segments      []*Segment
-	Version       int
-	Live          bool // no EXT-X-ENDLIST tag
-	IsFMP4        bool // playlist declares an init section via EXT-X-MAP
-	Discontinuity bool // playlist contains EXT-X-DISCONTINUITY
-}
-
-const (
-	keyMethodNone      = "NONE"
-	keyMethodAES128    = "AES-128"
-	keyMethodSampleAES = "SAMPLE-AES"
-)
-
-// IsMasterPlaylist reports whether the content looks like a master playlist.
-func IsMasterPlaylist(content string) bool {
-	return strings.Contains(content, "#EXT-X-STREAM-INF")
-}
-
-func validateM3U8Header(content string) error {
-	for _, line := range strings.Split(content, "\n") {
-		line = strings.TrimSpace(line)
-		if line == "" {
-			continue
-		}
-		if line != "#EXTM3U" {
-			return errors.New("content is not a valid m3u8 playlist")
-		}
-		return nil
-	}
-	return errors.New("empty m3u8 playlist")
-}
-
-// ParseMaster parses a master playlist and returns all variants.
-func ParseMaster(content string, baseURL *url.URL) ([]*Variant, error) {
-	master, err := ParseMasterPlaylist(content, baseURL)
-	if err != nil {
-		return nil, err
-	}
-	return master.Variants, nil
-}
-
-// ParseMasterPlaylist parses a master playlist including its EXT-X-MEDIA
-// rendition groups.
-func ParseMasterPlaylist(content string, baseURL *url.URL) (*MasterPlaylist, error) {
-	if err := validateM3U8Header(content); err != nil {
-		return nil, err
-	}
-	master := &MasterPlaylist{Rendition: make(map[string][]*MediaRendition)}
-	var pending *Variant
-	for _, line := range strings.Split(content, "\n") {
-		line = strings.TrimSpace(line)
-		if line == "" {
-			continue
-		}
-		if strings.HasPrefix(line, "#EXT-X-STREAM-INF:") {
-			attrs := parseAttributes(line[len("#EXT-X-STREAM-INF:"):])
-			pending = &Variant{
-				Bandwidth:    parseInt64(attrs["BANDWIDTH"]),
-				AvgBandwidth: parseInt64(attrs["AVERAGE-BANDWIDTH"]),
-				Resolution:   attrs["RESOLUTION"],
-				Codecs:       unquote(attrs["CODECS"]),
-				Name:         unquote(attrs["NAME"]),
-				AudioGroup:   unquote(attrs["AUDIO"]),
-			}
-			continue
-		}
-		if strings.HasPrefix(line, "#EXT-X-MEDIA:") {
-			attrs := parseAttributes(line[len("#EXT-X-MEDIA:"):])
-			rendition := &MediaRendition{
-				Type:    strings.ToUpper(attrs["TYPE"]),
-				GroupID: unquote(attrs["GROUP-ID"]),
-			}
-			// Only an explicit URI means a separate track; resolving an empty
-			// reference would fabricate one out of the playlist URL.
-			if uri := unquote(attrs["URI"]); uri != "" {
-				rendition.URI = resolveURL(baseURL, uri)
-			}
-			if rendition.GroupID != "" {
-				// Keep every member: a group is unsupported as a whole when
-				// ANY of its members carries its own URI.
-				master.Rendition[rendition.GroupID] = append(master.Rendition[rendition.GroupID], rendition)
-			}
-			continue
-		}
-		if pending != nil {
-			if line[0] != '#' {
-				pending.URI = resolveURL(baseURL, line)
-				master.Variants = append(master.Variants, pending)
-			}
-			pending = nil
-		}
-	}
-	if len(master.Variants) == 0 {
-		return nil, errors.New("master playlist has no variants")
-	}
-	return master, nil
-}
-
-// checkAudioRendition rejects the selected variant when its AUDIO group
-// carries a separate audio track: downloading only the video variant would
-// silently produce a silent file. Groups the variant does not reference are
-// ignored (variants without an AUDIO attribute are assumed self-contained).
-func checkAudioRendition(master *MasterPlaylist, best *Variant) error {
-	if best == nil || best.AudioGroup == "" {
-		return nil
-	}
-	for _, rendition := range master.Rendition[best.AudioGroup] {
-		if rendition == nil || rendition.Type != "AUDIO" || rendition.URI == "" {
-			continue
-		}
-		return fmt.Errorf(
-			"selected variant uses a separate audio rendition (group %q), which is not supported: the merged output would have no audio",
-			best.AudioGroup)
-	}
-	return nil
-}
-
-// PickBestVariant selects the highest-bandwidth variant.
-func PickBestVariant(variants []*Variant) *Variant {
-	var best *Variant
-	for _, v := range variants {
-		if best == nil || v.Bandwidth > best.Bandwidth {
-			best = v
-		}
-	}
-	return best
-}
-
-// ParseMedia parses a media playlist into an ordered segment plan.
-func ParseMedia(content string, baseURL *url.URL) (*Media, error) {
-	if err := validateM3U8Header(content); err != nil {
-		return nil, err
-	}
-
-	media := &Media{Live: true}
-	var currentKey *Key
-	var pendingByterange *ByteRange
-	var pendingGap bool
-	var pendingDuration float64
-	var lastRangeEnd int64
-	var sequence int64
-	var mapIdentity string // normalized identity of the current EXT-X-MAP
-
-	for _, line := range strings.Split(content, "\n") {
-		line = strings.TrimSpace(line)
-		if line == "" {
-			continue
-		}
-		if line[0] != '#' {
-			// Every non-comment line in a media playlist is a segment URI.
-			seg := &Segment{
-				URI:       resolveURL(baseURL, line),
-				Sequence:  sequence,
-				Byterange: pendingByterange,
-				Key:       currentKey,
-				Gap:       pendingGap,
-				Duration:  pendingDuration,
-			}
-			if pendingByterange != nil {
-				// Byterange segments have exact sizes straight from the playlist.
-				seg.Size = pendingByterange.Length
-			}
-			sequence++
-			pendingByterange = nil
-			pendingGap = false
-			pendingDuration = 0
-			media.Segments = append(media.Segments, seg)
-			continue
-		}
-
-		switch {
-		case strings.HasPrefix(line, "#EXTINF:"):
-			value := line[len("#EXTINF:"):]
-			if idx := strings.Index(value, ","); idx >= 0 {
-				value = value[:idx]
-			}
-			pendingDuration = parseFloat(value)
-		case strings.HasPrefix(line, "#EXT-X-KEY:"):
-			key, err := parseKey(line[len("#EXT-X-KEY:"):], baseURL)
-			if err != nil {
-				return nil, err
-			}
-			currentKey = key
-		case strings.HasPrefix(line, "#EXT-X-MAP:"):
-			attrs := parseAttributes(line[len("#EXT-X-MAP:"):])
-			uriAttr := unquote(attrs["URI"])
-			if uriAttr == "" {
-				return nil, errors.New("EXT-X-MAP without URI is not supported")
-			}
-			resolved := resolveURL(baseURL, uriAttr)
-			// The init section identity covers every attribute, not just the
-			// URI: a repeated tag with a different BYTERANGE addresses
-			// different bytes and changes the init section. NUL keeps the
-			// two parts unambiguously separated.
-			identity := resolved + "\x00" + attrs["BYTERANGE"]
-			if mapIdentity != "" {
-				if mapIdentity != identity {
-					return nil, errors.New("changing init sections are not supported")
-				}
-				media.IsFMP4 = true
-				continue
-			}
-			mapIdentity = identity
-			init := &Segment{
-				URI:      resolved,
-				Sequence: sequence,
-				IsInit:   true,
-				Key:      currentKey,
-			}
-			if attrs["BYTERANGE"] != "" {
-				init.Byterange = parseByteRange(attrs["BYTERANGE"], 0)
-				if init.Byterange == nil {
-					return nil, fmt.Errorf("invalid EXT-X-MAP BYTERANGE: %s", attrs["BYTERANGE"])
-				}
-			}
-			if init.Key != nil && init.Key.IV == nil {
-				// RFC 8216 only defines sequence-derived IVs for media
-				// segments; guessing one for the init section produces
-				// corrupt output, so require the playlist to be explicit.
-				return nil, errors.New("encrypted EXT-X-MAP without an explicit IV is not supported")
-			}
-			// The init section is prepended to the segment plan, it takes
-			// the media sequence number of the playlist for IV derivation.
-			media.Segments = append(media.Segments, init)
-			media.IsFMP4 = true
-		case strings.HasPrefix(line, "#EXT-X-BYTERANGE:"):
-			pendingByterange = parseByteRange(line[len("#EXT-X-BYTERANGE:"):], lastRangeEnd)
-			if pendingByterange == nil {
-				return nil, fmt.Errorf("invalid EXT-X-BYTERANGE: %s", line)
-			}
-		case line == "#EXT-X-GAP":
-			pendingGap = true
-		case line == "#EXT-X-DISCONTINUITY":
-			media.Discontinuity = true
-		case line == "#EXT-X-ENDLIST":
-			media.Live = false
-		case strings.HasPrefix(line, "#EXT-X-MEDIA-SEQUENCE:"):
-			sequence = parseInt64(line[len("#EXT-X-MEDIA-SEQUENCE:"):])
-		case strings.HasPrefix(line, "#EXT-X-VERSION:"):
-			media.Version = int(parseInt64(line[len("#EXT-X-VERSION:"):]))
-		}
-
-		if pendingByterange != nil {
-			// Non-segment tags between BYTERANGE and its URI must not reset the
-			// running offset, so it is tracked here after each parse.
-			lastRangeEnd = pendingByterange.Offset + pendingByterange.Length
-		}
-	}
-
-	if len(media.Segments) == 0 {
-		return nil, errors.New("media playlist has no segments")
-	}
-	return media, nil
-}
-
-// validateSupported rejects playlist features the byte-concatenation merge
-// cannot reproduce faithfully. Skipping such features silently would report
-// success while producing a broken file.
-func validateSupported(media *Media) error {
-	if media.Live {
-		return errors.New("live streams are not supported yet")
-	}
-	if media.Discontinuity {
-		return errors.New("EXT-X-DISCONTINUITY is not supported: the merged output would have a broken timeline")
-	}
-	for _, seg := range media.Segments {
-		if seg.Gap {
-			return errors.New("EXT-X-GAP is not supported: the missing segment would leave a hole in the merged output")
-		}
-	}
-	return nil
-}
-
-func parseKey(attrs string, baseURL *url.URL) (*Key, error) {
-	parsed := parseAttributes(attrs)
-	switch method := parsed["METHOD"]; method {
-	case keyMethodNone:
-		return nil, nil
-	case keyMethodAES128:
-		uri := unquote(parsed["URI"])
-		if uri == "" {
-			return nil, errors.New("AES-128 EXT-X-KEY without URI")
-		}
-		if format := unquote(parsed["KEYFORMAT"]); format != "" && format != "identity" {
-			return nil, fmt.Errorf("unsupported EXT-X-KEY KEYFORMAT: %s", format)
-		}
-		key := &Key{Method: keyMethodAES128, URI: resolveURL(baseURL, uri)}
-		if iv, ok := parsed["IV"]; ok {
-			value := strings.TrimPrefix(strings.ToLower(iv), "0x")
-			decoded, err := hex.DecodeString(value)
-			if err != nil || len(decoded) != 16 {
-				return nil, fmt.Errorf("invalid EXT-X-KEY IV: %s", iv)
-			}
-			key.IV = decoded
-		}
-		return key, nil
-	case keyMethodSampleAES:
-		return nil, errors.New("SAMPLE-AES encryption is not supported")
-	default:
-		return nil, fmt.Errorf("unsupported encryption method: %s", method)
-	}
-}
-
-func parseByteRange(value string, defaultOffset int64) *ByteRange {
-	lengthPart := value
-	offsetPart := ""
-	if idx := strings.Index(value, "@"); idx >= 0 {
-		lengthPart = value[:idx]
-		offsetPart = value[idx+1:]
-	}
-	length := parseInt64(lengthPart)
-	if length <= 0 {
-		return nil
-	}
-	offset := defaultOffset
-	if offsetPart != "" {
-		offset = parseInt64(offsetPart)
-		if offset < 0 {
-			return nil
-		}
-	}
-	return &ByteRange{Length: length, Offset: offset}
-}
-
-// resolveURL resolves a playlist URI reference against the playlist URL
-// following RFC 3986.
-func resolveURL(baseURL *url.URL, ref string) string {
-	refURL, err := url.Parse(ref)
-	if err != nil {
-		return ref
-	}
-	return baseURL.ResolveReference(refURL).String()
-}
-
-// parseAttributes parses an HLS attribute list like FOO="bar",NUM=42.
-func parseAttributes(s string) map[string]string {
-	attrs := make(map[string]string)
-	var key, val strings.Builder
-	inKey := true
-	inQuote := false
-	flush := func() {
-		name := strings.ToUpper(strings.TrimSpace(key.String()))
-		if name != "" {
-			attrs[name] = strings.TrimSpace(val.String())
-		}
-		key.Reset()
-		val.Reset()
-		inKey = true
-	}
-	for i := 0; i < len(s); i++ {
-		c := s[i]
-		if inKey {
-			if c == '=' {
-				inKey = false
-			} else {
-				key.WriteByte(c)
-			}
-			continue
-		}
-		if c == '"' {
-			inQuote = !inQuote
-			continue
-		}
-		if c == ',' && !inQuote {
-			flush()
-			continue
-		}
-		val.WriteByte(c)
-	}
-	flush()
-	return attrs
-}
-
-func unquote(s string) string {
-	s = strings.TrimSpace(s)
-	if len(s) >= 2 && strings.HasPrefix(s, "\"") && strings.HasSuffix(s, "\"") {
-		return s[1 : len(s)-1]
-	}
-	return s
-}
-
-func parseInt64(s string) int64 {
-	value, _ := strconv.ParseInt(strings.TrimSpace(s), 10, 64)
-	return value
-}
-
-func parseFloat(s string) float64 {
-	value, _ := strconv.ParseFloat(strings.TrimSpace(s), 64)
-	return value
-}
-
-// OutputExtension returns the container file extension for the playlist.
-func (m *Media) OutputExtension() string {
-	if m.IsFMP4 {
-		return ".mp4"
-	}
-	return ".ts"
-}
-
-// DeriveOutputName builds the merged output file name from a playlist URL.
-func DeriveOutputName(playlistURL string, media *Media) string {
-	name := ""
-	if u, err := url.Parse(playlistURL); err == nil {
-		name = path.Base(u.Path)
-		name = strings.TrimSuffix(name, path.Ext(name))
-	}
-	if name == "" || name == "/" || name == "." {
-		if u, err := url.Parse(playlistURL); err == nil {
-			name = u.Hostname()
-		}
-	}
-	return name + media.OutputExtension()
-}

internal/protocol/hls/playlist_realworld_test.go

@@ -1,39 +0,0 @@
-package hls
-
-import (
-	_ "embed"
-	"net/url"
-	"testing"
-)
-
-//go:embed testdata/olemovienews.m3u8
-var realWorldPlaylist string
-
-// TestParseMediaRealWorld guards parsing against a real site playlist
-// (olemovienews.com VOD, 138 TS segments).
-func TestParseMediaRealWorld(t *testing.T) {
-	base, err := url.Parse("https://europe.olemovienews.com/ts2/20230125/afAxfjit/mp4/afAxfjit.mp4/index-v1-a1.m3u8")
-	if err != nil {
-		t.Fatal(err)
-	}
-	media, err := ParseMedia(realWorldPlaylist, base)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if media.Live {
-		t.Error("real VOD playlist should not be live")
-	}
-	if media.IsFMP4 {
-		t.Error("playlist should be detected as TS")
-	}
-	if len(media.Segments) != 138 {
-		t.Errorf("want 138 segments, got %d", len(media.Segments))
-	}
-	first := media.Segments[0]
-	if first.URI != "https://europe.olemovienews.com/ts2/20230125/afAxfjit/mp4/afAxfjit.mp4/seg-1-v1-a1.ts" {
-		t.Errorf("segment URI resolution wrong: %s", first.URI)
-	}
-	if media.Segments[0].Sequence != 1 {
-		t.Errorf("first sequence = %d, want 1", media.Segments[0].Sequence)
-	}
-}

internal/protocol/hls/playlist_test.go

@@ -1,252 +0,0 @@
-package hls
-
-import (
-	"net/url"
-	"testing"
-)
-
-func mustURL(t *testing.T, raw string) *url.URL {
-	t.Helper()
-	u, err := url.Parse(raw)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return u
-}
-
-func TestParseMediaTS(t *testing.T) {
-	content := "#EXTM3U\n" +
-		"#EXT-X-TARGETDURATION:20\n" +
-		"#EXT-X-VERSION:3\n" +
-		"#EXT-X-MEDIA-SEQUENCE:1\n" +
-		"#EXTINF:20.000,\n" +
-		"seg-1.ts\n" +
-		"#EXTINF:20.000,\n" +
-		"seg-2.ts\n" +
-		"#EXT-X-ENDLIST\n"
-	media, err := ParseMedia(content, mustURL(t, "https://cdn.example.com/vod/index.m3u8"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if media.Live {
-		t.Error("VOD playlist should not be live")
-	}
-	if media.IsFMP4 {
-		t.Error("TS playlist should not be fMP4")
-	}
-	if len(media.Segments) != 2 {
-		t.Fatalf("want 2 segments, got %d", len(media.Segments))
-	}
-	want := "https://cdn.example.com/vod/seg-1.ts"
-	if media.Segments[0].URI != want {
-		t.Errorf("want uri %s, got %s", want, media.Segments[0].URI)
-	}
-	if media.Segments[0].Sequence != 1 {
-		t.Errorf("want sequence 1, got %d", media.Segments[0].Sequence)
-	}
-	if media.Segments[0].Key != nil {
-		t.Error("segment should be unencrypted")
-	}
-}
-
-func TestParseMediaWithoutExtinf(t *testing.T) {
-	// Some playlists list segment URIs without EXTINF lines.
-	content := "#EXTM3U\nseg-1.ts\nseg-2.ts\n#EXT-X-ENDLIST\n"
-	media, err := ParseMedia(content, mustURL(t, "https://cdn.example.com/a/index.m3u8"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(media.Segments) != 2 {
-		t.Fatalf("want 2 segments, got %d", len(media.Segments))
-	}
-}
-
-func TestParseMediaLive(t *testing.T) {
-	content := "#EXTM3U\n#EXT-X-TARGETDURATION:6\n#EXTINF:6.0,\nseg-1.ts\n"
-	media, err := ParseMedia(content, mustURL(t, "https://cdn.example.com/live/index.m3u8"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !media.Live {
-		t.Error("playlist without ENDLIST should be live")
-	}
-}
-
-func TestParseMediaFMP4(t *testing.T) {
-	content := "#EXTM3U\n" +
-		"#EXT-X-VERSION:6\n" +
-		"#EXT-X-MAP:URI=\"init.mp4\"\n" +
-		"#EXTINF:5.0,\n" +
-		"seg-1.m4s\n" +
-		"#EXT-X-ENDLIST\n"
-	media, err := ParseMedia(content, mustURL(t, "https://cdn.example.com/vod/index.m3u8"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !media.IsFMP4 {
-		t.Error("playlist with MAP should be fMP4")
-	}
-	if len(media.Segments) != 2 {
-		t.Fatalf("want 2 segments (init + 1), got %d", len(media.Segments))
-	}
-	if !media.Segments[0].IsInit {
-		t.Error("first segment should be the init section")
-	}
-	if media.Segments[0].URI != "https://cdn.example.com/vod/init.mp4" {
-		t.Errorf("init uri wrong: %s", media.Segments[0].URI)
-	}
-	if media.OutputExtension() != ".mp4" {
-		t.Errorf("want .mp4, got %s", media.OutputExtension())
-	}
-}
-
-func TestParseMediaMultiMapError(t *testing.T) {
-	content := "#EXTM3U\n" +
-		"#EXT-X-MAP:URI=\"init1.mp4\"\n" +
-		"#EXTINF:5.0,\nseg-1.m4s\n" +
-		"#EXT-X-DISCONTINUITY\n" +
-		"#EXT-X-MAP:URI=\"init2.mp4\"\n" +
-		"#EXTINF:5.0,\nseg-2.m4s\n" +
-		"#EXT-X-ENDLIST\n"
-	if _, err := ParseMedia(content, mustURL(t, "https://cdn.example.com/vod/index.m3u8")); err == nil {
-		t.Error("multi-period fMP4 should be rejected")
-	}
-}
-
-func TestParseMediaKeyRotation(t *testing.T) {
-	content := "#EXTM3U\n" +
-		"#EXT-X-KEY:METHOD=AES-128,URI=\"key1.bin\",IV=0x00000000000000000000000000000001\n" +
-		"#EXTINF:5.0,\nseg-1.ts\n" +
-		"#EXT-X-KEY:METHOD=AES-128,URI=\"key2.bin\"\n" +
-		"#EXTINF:5.0,\nseg-2.ts\n" +
-		"#EXT-X-KEY:METHOD=NONE\n" +
-		"#EXTINF:5.0,\nseg-3.ts\n" +
-		"#EXT-X-ENDLIST\n"
-	media, err := ParseMedia(content, mustURL(t, "https://cdn.example.com/vod/index.m3u8"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if media.Segments[0].Key == nil || media.Segments[0].Key.URI != "https://cdn.example.com/vod/key1.bin" {
-		t.Fatalf("segment 1 key wrong: %+v", media.Segments[0].Key)
-	}
-	if len(media.Segments[0].Key.IV) != 16 || media.Segments[0].Key.IV[15] != 1 {
-		t.Error("explicit IV not parsed")
-	}
-	if media.Segments[1].Key == nil || media.Segments[1].Key.URI != "https://cdn.example.com/vod/key2.bin" {
-		t.Fatalf("segment 2 key wrong: %+v", media.Segments[1].Key)
-	}
-	if media.Segments[1].Key.IV != nil {
-		t.Error("key without IV should leave IV nil (sequence-derived)")
-	}
-	if media.Segments[2].Key != nil {
-		t.Error("segment 3 should be unencrypted after METHOD=NONE")
-	}
-}
-
-func TestParseMediaSampleAESError(t *testing.T) {
-	content := "#EXTM3U\n#EXT-X-KEY:METHOD=SAMPLE-AES,URI=\"skd://key\"\n#EXTINF:5.0,\nseg-1.ts\n"
-	if _, err := ParseMedia(content, mustURL(t, "https://cdn.example.com/vod/index.m3u8")); err == nil {
-		t.Error("SAMPLE-AES should be rejected")
-	}
-}
-
-func TestParseMediaByterange(t *testing.T) {
-	content := "#EXTM3U\n" +
-		"#EXT-X-BYTERANGE:1000@0\nseg.ts\n" +
-		"#EXT-X-BYTERANGE:2000\nseg.ts\n" +
-		"#EXT-X-BYTERANGE:3000\nseg.ts\n" +
-		"#EXT-X-ENDLIST\n"
-	media, err := ParseMedia(content, mustURL(t, "https://cdn.example.com/vod/index.m3u8"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	ranges := [][2]int64{{0, 1000}, {1000, 2000}, {3000, 3000}}
-	for i, want := range ranges {
-		br := media.Segments[i].Byterange
-		if br == nil {
-			t.Fatalf("segment %d byterange missing", i)
-		}
-		if br.Offset != want[0] || br.Length != want[1] {
-			t.Errorf("segment %d: want offset %d length %d, got %d/%d", i, want[0], want[1], br.Offset, br.Length)
-		}
-	}
-}
-
-func TestParseMediaGap(t *testing.T) {
-	content := "#EXTM3U\n#EXTINF:5.0,\nseg-1.ts\n#EXT-X-GAP\n#EXTINF:5.0,\nseg-2.ts\n#EXT-X-ENDLIST\n"
-	media, err := ParseMedia(content, mustURL(t, "https://cdn.example.com/vod/index.m3u8"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if media.Segments[0].Gap || !media.Segments[1].Gap {
-		t.Error("gap flags wrong")
-	}
-}
-
-func TestParseMediaInvalidHeader(t *testing.T) {
-	if _, err := ParseMedia("not a playlist", mustURL(t, "https://cdn.example.com/a.m3u8")); err == nil {
-		t.Error("invalid content should be rejected")
-	}
-}
-
-func TestParseMasterPickBest(t *testing.T) {
-	content := "#EXTM3U\n" +
-		"#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"aud\",NAME=\"en\",DEFAULT=YES,URI=\"audio/index.m3u8\"\n" +
-		"#EXT-X-STREAM-INF:BANDWIDTH=800000,RESOLUTION=640x360\n" +
-		"360p/index.m3u8\n" +
-		"#EXT-X-STREAM-INF:BANDWIDTH=2500000,RESOLUTION=1920x1080,CODECS=\"avc1.640028,mp4a.40.2\"\n" +
-		"1080p/index.m3u8?sign=abc\n" +
-		"#EXT-X-ENDLIST\n"
-	variants, err := ParseMaster(content, mustURL(t, "https://cdn.example.com/vod/master.m3u8"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(variants) != 2 {
-		t.Fatalf("want 2 variants, got %d", len(variants))
-	}
-	best := PickBestVariant(variants)
-	if best.Bandwidth != 2500000 {
-		t.Errorf("want highest bandwidth variant, got %d", best.Bandwidth)
-	}
-	if best.URI != "https://cdn.example.com/vod/1080p/index.m3u8?sign=abc" {
-		t.Errorf("variant uri wrong: %s", best.URI)
-	}
-}
-
-func TestResolveURLQueryNotInherited(t *testing.T) {
-	base := mustURL(t, "https://cdn.example.com/vod/index.m3u8?sign=abc")
-	got := resolveURL(base, "seg-1.ts")
-	if got != "https://cdn.example.com/vod/seg-1.ts" {
-		t.Errorf("relative resolution should follow RFC3986 (no query inheritance), got %s", got)
-	}
-}
-
-func TestDeriveOutputName(t *testing.T) {
-	media := &Media{}
-	if got := DeriveOutputName("https://cdn.example.com/ts2/a/index-v1-a1.m3u8", media); got != "index-v1-a1.ts" {
-		t.Errorf("want index-v1-a1.ts, got %s", got)
-	}
-	fmp4 := &Media{IsFMP4: true}
-	if got := DeriveOutputName("https://cdn.example.com/ts2/a/index.m3u8", fmp4); got != "index.mp4" {
-		t.Errorf("want index.mp4, got %s", got)
-	}
-	if got := DeriveOutputName("https://cdn.example.com/play?token=x", media); got != "play.ts" {
-		t.Errorf("want play.ts, got %s", got)
-	}
-	if got := DeriveOutputName("https://cdn.example.com/", media); got != "cdn.example.com.ts" {
-		t.Errorf("want host fallback, got %s", got)
-	}
-}
-
-func TestParseAttributesQuotedComma(t *testing.T) {
-	attrs := parseAttributes(`URI="a,b.ts",IV=0xABCDEF00000000000000000000000001,NAME="x"`)
-	if attrs["URI"] != "a,b.ts" {
-		t.Errorf("quoted comma value wrong: %q", attrs["URI"])
-	}
-	if attrs["IV"] != "0xABCDEF00000000000000000000000001" {
-		t.Errorf("hex value wrong: %q", attrs["IV"])
-	}
-	if attrs["NAME"] != "x" {
-		t.Errorf("quoted value wrong: %q", attrs["NAME"])
-	}
-}

internal/protocol/hls/staging_test.go

@@ -1,304 +0,0 @@
-package hls
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-func TestFetcherE2E_SameURLTwoTasks(t *testing.T) {
-	const total = 6
-	mux := http.NewServeMux()
-	var playlist strings.Builder
-	playlist.WriteString("#EXTM3U\n")
-	for i := 0; i < total; i++ {
-		playlist.WriteString(fmt.Sprintf("#EXTINF:4,\nseg-%d.ts\n", i))
-	}
-	playlist.WriteString("#EXT-X-ENDLIST\n")
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(playlist.String()))
-	})
-	segments := make(map[int][]byte)
-	for i := 0; i < total; i++ {
-		segments[i] = []byte(fmt.Sprintf("SHARED-SEGMENT-%02d", i))
-		idx := i
-		mux.HandleFunc(fmt.Sprintf("/seg-%d.ts", idx), func(w http.ResponseWriter, r *http.Request) {
-			time.Sleep(120 * time.Millisecond)
-			w.Write(segments[idx])
-		})
-	}
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	cfg := testConfig()
-	cfg.SegmentConnections = 2
-	cfg.PrefetchContentLength = false
-	dir := t.TempDir()
-
-	// Two tasks for the same playlist URL into the same directory, like a
-	// user duplicating a task. The engine would rename the second output
-	// (AutoRename); mirror that here.
-	f1 := newTestFetcher(t, cfg)
-	f1.Meta().Opts = &base.Options{Path: dir}
-	if err := f1.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}); err != nil {
-		t.Fatal(err)
-	}
-	f2 := newTestFetcher(t, cfg)
-	f2.Meta().Opts = &base.Options{Path: dir, Name: "video-2.ts"}
-	if err := f2.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}); err != nil {
-		t.Fatal(err)
-	}
-	if f1.state.StagingID == "" || f1.state.StagingID == f2.state.StagingID {
-		t.Fatal("staging identities must be distinct per task")
-	}
-	if f1.state.StagingDir != "" || f2.state.StagingDir != "" {
-		t.Fatal("Resolve pinned an output directory")
-	}
-
-	// Start task 1, let it stage some segments, then pause it.
-	if err := f1.Start(); err != nil {
-		t.Fatal(err)
-	}
-	time.Sleep(250 * time.Millisecond)
-	if err := f1.Pause(); err != nil {
-		t.Fatal(err)
-	}
-	staged1, err := os.ReadDir(f1.state.StagingDir)
-	if err != nil || len(staged1) == 0 {
-		t.Fatalf("task 1 should have staged segments, dir: %s", f1.state.StagingDir)
-	}
-
-	// Task 2 must complete without touching task 1's staging data...
-	if err := f2.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f2.Wait(); err != nil {
-		t.Fatal(err)
-	}
-	stillThere, err := os.ReadDir(f1.state.StagingDir)
-	if err != nil || len(stillThere) != len(staged1) {
-		t.Fatalf("task 2 disturbed task 1 staging: had %d entries, now %d", len(staged1), len(stillThere))
-	}
-
-	// ...and task 1 resumes to a complete, correct output of its own.
-	if err := f1.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f1.Wait(); err != nil {
-		t.Fatal(err)
-	}
-	var want []byte
-	for i := 0; i < total; i++ {
-		want = append(want, segments[i]...)
-	}
-	if !bytes.Equal(readOutput(t, f1), want) || !bytes.Equal(readOutput(t, f2), want) {
-		t.Error("same-URL task outputs mismatch")
-	}
-	entries, _ := os.ReadDir(dir)
-	if len(entries) != 2 {
-		names := make([]string, 0, len(entries))
-		for _, e := range entries {
-			names = append(names, e.Name())
-		}
-		t.Errorf("expected only the two outputs to remain, got %v", names)
-	}
-}
-
-func TestFetcherE2E_ForeignJournalDiscarded(t *testing.T) {
-	const total = 3
-	var served atomic.Int64
-	mux := http.NewServeMux()
-	var playlist strings.Builder
-	playlist.WriteString("#EXTM3U\n")
-	for i := 0; i < total; i++ {
-		playlist.WriteString(fmt.Sprintf("#EXTINF:4,\nseg-%d.ts\n", i))
-	}
-	playlist.WriteString("#EXT-X-ENDLIST\n")
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(playlist.String()))
-	})
-	for i := 0; i < total; i++ {
-		mux.HandleFunc(fmt.Sprintf("/seg-%d.ts", i), func(w http.ResponseWriter, r *http.Request) {
-			served.Add(1)
-			w.Write([]byte("DATA"))
-		})
-	}
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	cfg := testConfig()
-	cfg.PrefetchContentLength = false
-	f := newTestFetcher(t, cfg)
-	f.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}); err != nil {
-		t.Fatal(err)
-	}
-	// Plant a journal that does not belong to this plan (wrong fingerprint).
-	tempDir := f.resolveStagingDirLocked()
-	if err := os.MkdirAll(tempDir, 0777); err != nil {
-		t.Fatal(err)
-	}
-	foreign := journalFile{
-		StagingID:    "some-other-task",
-		PlanHash:     "deadbeef",
-		SegmentCount: total,
-		Sizes:        map[string]int64{"0": 4, "1": 4, "2": 4},
-	}
-	data, _ := json.Marshal(foreign)
-	if err := os.WriteFile(filepath.Join(tempDir, "journal.json"), data, 0666); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Wait(); err != nil {
-		t.Fatal(err)
-	}
-	if got := served.Load(); got != total {
-		t.Errorf("foreign journal must be discarded, want %d downloads, got %d", total, got)
-	}
-}
-
-func TestFetcherE2E_MergeFailurePreservesStaging(t *testing.T) {
-	mux := http.NewServeMux()
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte("#EXTM3U\n#EXTINF:4,\na.ts\n#EXTINF:4,\nb.ts\n#EXT-X-ENDLIST\n"))
-	})
-	mux.HandleFunc("/a.ts", func(w http.ResponseWriter, r *http.Request) { w.Write([]byte("AAAA")) })
-	mux.HandleFunc("/b.ts", func(w http.ResponseWriter, r *http.Request) { w.Write([]byte("BBBB")) })
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	f := newTestFetcher(t, testConfig())
-	f.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}); err != nil {
-		t.Fatal(err)
-	}
-	run := &hlsRun{
-		ctx:        context.Background(),
-		cancel:     func() {},
-		done:       make(chan struct{}),
-		segs:       f.state.Segments,
-		outputPath: f.meta.SingleFilepath(),
-		stagingID:  f.state.StagingID,
-		planHash:   planFingerprint(f.state),
-		tempDir:    f.resolveStagingDirLocked(),
-		keyCache:   make(map[string][]byte),
-		journal:    make(map[int64]int64),
-	}
-	run.journalPath = filepath.Join(run.tempDir, "journal.json")
-	if err := os.MkdirAll(run.tempDir, 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(segmentPath(run.tempDir, 0), []byte("AAAA"), 0666); err != nil {
-		t.Fatal(err)
-	}
-	// Segment 1 is missing on disk: the merge must fail without deleting the
-	// staged data or leaving a partial output behind.
-	if err := f.merge(run); err == nil {
-		t.Fatal("merge with a missing segment should fail")
-	}
-	if _, err := os.Stat(segmentPath(run.tempDir, 0)); err != nil {
-		t.Fatal("merge failure must preserve staged segments")
-	}
-	entries, _ := os.ReadDir(filepath.Dir(run.outputPath))
-	for _, e := range entries {
-		if strings.HasSuffix(e.Name(), ".part") {
-			t.Errorf("failed merge left a partial output behind: %s", e.Name())
-		}
-	}
-
-	// Recover the segment: the retried merge succeeds.
-	if err := os.WriteFile(segmentPath(run.tempDir, 1), []byte("BBBB"), 0666); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.merge(run); err != nil {
-		t.Fatalf("retried merge failed: %v", err)
-	}
-	got, err := os.ReadFile(run.outputPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(got) != "AAAABBBB" {
-		t.Errorf("retried merge output mismatch: %q", got)
-	}
-}
-
-func TestFetcherE2E_ReMergeOverExistingOutput(t *testing.T) {
-	const total = 2
-	mux := http.NewServeMux()
-	var playlist strings.Builder
-	playlist.WriteString("#EXTM3U\n")
-	for i := 0; i < total; i++ {
-		playlist.WriteString(fmt.Sprintf("#EXTINF:4,\nseg-%d.ts\n", i))
-	}
-	playlist.WriteString("#EXT-X-ENDLIST\n")
-	mux.HandleFunc("/video.m3u8", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(playlist.String()))
-	})
-	for i := 0; i < total; i++ {
-		mux.HandleFunc(fmt.Sprintf("/seg-%d.ts", i), func(w http.ResponseWriter, r *http.Request) {
-			w.Write([]byte("DATA"))
-		})
-	}
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	f := newTestFetcher(t, testConfig())
-	f.Meta().Opts = &base.Options{Path: t.TempDir()}
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}); err != nil {
-		t.Fatal(err)
-	}
-	tempDir := f.resolveStagingDirLocked()
-	if err := os.MkdirAll(tempDir, 0777); err != nil {
-		t.Fatal(err)
-	}
-	// Simulate the crash window after a completed rename but before the task
-	// was marked done: a stale output file, a complete journal and all
-	// segments staged.
-	stale := filepath.Join(filepath.Dir(f.meta.SingleFilepath()), f.state.OutputName)
-	if err := os.WriteFile(stale, []byte("STALE-OUTPUT"), 0666); err != nil {
-		t.Fatal(err)
-	}
-	jr := &hlsRun{
-		segs:        f.state.Segments,
-		stagingID:   f.state.StagingID,
-		planHash:    planFingerprint(f.state),
-		journalPath: filepath.Join(tempDir, "journal.json"),
-		journal:     map[int64]int64{0: 4, 1: 4},
-	}
-	if err := saveJournal(jr); err != nil {
-		t.Fatal(err)
-	}
-	for i := 0; i < total; i++ {
-		if err := os.WriteFile(segmentPath(tempDir, int64(i)), []byte("DATA"), 0666); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Wait(); err != nil {
-		t.Fatalf("re-merge over an existing output failed: %v", err)
-	}
-	got, err := os.ReadFile(stale)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(got) != "DATADATA" {
-		t.Errorf("stale output was not replaced: %q", got)
-	}
-}

internal/protocol/hls/subset_test.go

@@ -1,146 +0,0 @@
-package hls
-
-import (
-	"net/url"
-	"strings"
-	"testing"
-)
-
-func mustParseURL(t *testing.T, raw string) *url.URL {
-	t.Helper()
-	u, err := url.Parse(raw)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return u
-}
-
-// subsetCase is a media playlist plus the error substring the pipeline must
-// reject it with; wantOK playlists must parse AND validate cleanly.
-type subsetCase struct {
-	name     string
-	playlist string
-	wantErr  string
-}
-
-func TestSubsetRejections(t *testing.T) {
-	cases := []subsetCase{
-		{
-			name:     "gap",
-			playlist: "#EXTM3U\n#EXTINF:4,\na.ts\n#EXT-X-GAP\n#EXTINF:4,\nb.ts\n#EXT-X-ENDLIST\n",
-			wantErr:  "EXT-X-GAP",
-		},
-		{
-			name:     "gap-before-first-segment",
-			playlist: "#EXTM3U\n#EXT-X-GAP\n#EXTINF:4,\na.ts\n#EXT-X-ENDLIST\n",
-			wantErr:  "EXT-X-GAP",
-		},
-		{
-			name:     "discontinuity",
-			playlist: "#EXTM3U\n#EXTINF:4,\na.ts\n#EXT-X-DISCONTINUITY\n#EXTINF:4,\nb.ts\n#EXT-X-ENDLIST\n",
-			wantErr:  "EXT-X-DISCONTINUITY",
-		},
-		{
-			name:     "live",
-			playlist: "#EXTM3U\n#EXTINF:4,\na.ts\n",
-			wantErr:  "live",
-		},
-		{
-			name:     "keyformat",
-			playlist: "#EXTM3U\n#EXT-X-KEY:METHOD=AES-128,URI=\"k\",KEYFORMAT=\"com.apple.streamingkeydelivery\"\n#EXTINF:4,\na.ts\n#EXT-X-ENDLIST\n",
-			wantErr:  "KEYFORMAT",
-		},
-		{
-			name:     "encrypted-map-without-iv",
-			playlist: "#EXTM3U\n#EXT-X-KEY:METHOD=AES-128,URI=\"k\"\n#EXT-X-MAP:URI=\"init.mp4\"\n#EXTINF:4,\na.m4s\n#EXT-X-ENDLIST\n",
-			wantErr:  "explicit IV",
-		},
-		{
-			name:     "map-change-byterange",
-			playlist: "#EXTM3U\n#EXT-X-MAP:URI=\"init.mp4\",BYTERANGE=\"100@0\"\n#EXTINF:4,\na.m4s\n#EXT-X-MAP:URI=\"init.mp4\",BYTERANGE=\"100@100\"\n#EXTINF:4,\nb.m4s\n#EXT-X-ENDLIST\n",
-			wantErr:  "changing init sections",
-		},
-		{
-			name:     "map-change-uri",
-			playlist: "#EXTM3U\n#EXT-X-MAP:URI=\"init1.mp4\"\n#EXTINF:4,\na.m4s\n#EXT-X-MAP:URI=\"init2.mp4\"\n#EXTINF:4,\nb.m4s\n#EXT-X-ENDLIST\n",
-			wantErr:  "changing init sections",
-		},
-	}
-	baseURL := mustParseURL(t, "https://cdn.example.com/vod/index.m3u8")
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			media, parseErr := ParseMedia(tc.playlist, baseURL)
-			if parseErr != nil {
-				if !strings.Contains(parseErr.Error(), tc.wantErr) {
-					t.Fatalf("parse error %q does not mention %q", parseErr, tc.wantErr)
-				}
-				return
-			}
-			err := validateSupported(media)
-			if err == nil {
-				t.Fatalf("playlist should be rejected with %q", tc.wantErr)
-			}
-			if !strings.Contains(err.Error(), tc.wantErr) {
-				t.Fatalf("error %q does not mention %q", err, tc.wantErr)
-			}
-		})
-	}
-}
-
-func TestSubsetRepeatedSameMapAllowed(t *testing.T) {
-	playlist := "#EXTM3U\n" +
-		"#EXT-X-MAP:URI=\"init.mp4\",BYTERANGE=\"100@0\"\n" +
-		"#EXTINF:4,\na.m4s\n" +
-		"#EXT-X-MAP:URI=\"init.mp4\",BYTERANGE=\"100@0\"\n" +
-		"#EXTINF:4,\nb.m4s\n" +
-		"#EXT-X-ENDLIST\n"
-	media, err := ParseMedia(playlist, mustParseURL(t, "https://cdn.example.com/vod/index.m3u8"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := validateSupported(media); err != nil {
-		t.Fatalf("identical repeated MAP must be allowed: %v", err)
-	}
-	if len(media.Segments) != 3 { // init + 2 segments, no duplicate init
-		t.Fatalf("want 3 segments (init + 2), got %d", len(media.Segments))
-	}
-}
-
-func TestMasterAudioRenditionDetection(t *testing.T) {
-	masterURL := mustParseURL(t, "https://cdn.example.com/master.m3u8")
-
-	separateAudio := "#EXTM3U\n" +
-		"#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"aud\",NAME=\"en\",DEFAULT=YES,URI=\"audio/index.m3u8\"\n" +
-		"#EXT-X-STREAM-INF:BANDWIDTH=1000000,AUDIO=\"aud\"\nvideo/index.m3u8\n"
-	master, err := ParseMasterPlaylist(separateAudio, masterURL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := checkAudioRendition(master, PickBestVariant(master.Variants)); err == nil {
-		t.Fatal("selected variant with a separate audio rendition must be rejected")
-	}
-
-	// A group the variant does not reference must not cause a false positive.
-	unrelatedGroup := "#EXTM3U\n" +
-		"#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"aud\",NAME=\"en\",DEFAULT=YES,URI=\"audio/index.m3u8\"\n" +
-		"#EXT-X-STREAM-INF:BANDWIDTH=1000000\nvideo/index.m3u8\n"
-	master, err = ParseMasterPlaylist(unrelatedGroup, masterURL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := checkAudioRendition(master, PickBestVariant(master.Variants)); err != nil {
-		t.Fatalf("unreferenced audio group must not be rejected: %v", err)
-	}
-
-	// A rendition group without URIs (muxed tracks) is fine.
-	groupWithoutURI := "#EXTM3U\n" +
-		"#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"aud\",NAME=\"en\",DEFAULT=YES\n" +
-		"#EXT-X-STREAM-INF:BANDWIDTH=1000000,AUDIO=\"aud\"\nvideo/index.m3u8\n"
-	master, err = ParseMasterPlaylist(groupWithoutURI, masterURL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := checkAudioRendition(master, PickBestVariant(master.Variants)); err != nil {
-		t.Fatalf("audio group without URI must not be rejected: %v", err)
-	}
-}

internal/protocol/hls/testdata/media/README.md

@@ -1,10 +0,0 @@
-Media fixtures generated locally with FFmpeg 7.0.2 (testsrc + sine sources,
-no third-party content):
-
-- sample-00.ts / sample-01.ts: one continuous MPEG-2 TS encode split at a
-  packet boundary, so continuity counters and PCR are consistent across the
-  segment join exactly like segments cut from a single real-time stream.
-- fmp4-init.mp4: ftyp+moov init section of a fragmented MP4.
-- fmp4-seg1.m4s .. fmp4-seg3.m4s: moof+mdat media fragments (styp omitted by
-  the muxer, which is legal) split at moof boundaries from one fragmented MP4
-  (-movflags +frag_keyframe+empty_moov+default_base_moof -frag_duration 500000).

internal/protocol/hls/testdata/olemovienews.m3u8

@@ -1,283 +0,0 @@
-#EXTM3U
-#EXT-X-TARGETDURATION:20
-#EXT-X-ALLOW-CACHE:YES
-#EXT-X-PLAYLIST-TYPE:VOD
-#EXT-X-VERSION:3
-#EXT-X-MEDIA-SEQUENCE:1
-#EXTINF:20.000,
-seg-1-v1-a1.ts
-#EXTINF:20.000,
-seg-2-v1-a1.ts
-#EXTINF:20.000,
-seg-3-v1-a1.ts
-#EXTINF:20.000,
-seg-4-v1-a1.ts
-#EXTINF:20.000,
-seg-5-v1-a1.ts
-#EXTINF:20.000,
-seg-6-v1-a1.ts
-#EXTINF:20.000,
-seg-7-v1-a1.ts
-#EXTINF:20.000,
-seg-8-v1-a1.ts
-#EXTINF:20.000,
-seg-9-v1-a1.ts
-#EXTINF:20.000,
-seg-10-v1-a1.ts
-#EXTINF:20.000,
-seg-11-v1-a1.ts
-#EXTINF:20.000,
-seg-12-v1-a1.ts
-#EXTINF:20.000,
-seg-13-v1-a1.ts
-#EXTINF:20.000,
-seg-14-v1-a1.ts
-#EXTINF:20.000,
-seg-15-v1-a1.ts
-#EXTINF:20.000,
-seg-16-v1-a1.ts
-#EXTINF:20.000,
-seg-17-v1-a1.ts
-#EXTINF:20.000,
-seg-18-v1-a1.ts
-#EXTINF:20.000,
-seg-19-v1-a1.ts
-#EXTINF:20.000,
-seg-20-v1-a1.ts
-#EXTINF:20.000,
-seg-21-v1-a1.ts
-#EXTINF:20.000,
-seg-22-v1-a1.ts
-#EXTINF:20.000,
-seg-23-v1-a1.ts
-#EXTINF:20.000,
-seg-24-v1-a1.ts
-#EXTINF:20.000,
-seg-25-v1-a1.ts
-#EXTINF:20.000,
-seg-26-v1-a1.ts
-#EXTINF:20.000,
-seg-27-v1-a1.ts
-#EXTINF:20.000,
-seg-28-v1-a1.ts
-#EXTINF:20.000,
-seg-29-v1-a1.ts
-#EXTINF:20.000,
-seg-30-v1-a1.ts
-#EXTINF:20.000,
-seg-31-v1-a1.ts
-#EXTINF:20.000,
-seg-32-v1-a1.ts
-#EXTINF:20.000,
-seg-33-v1-a1.ts
-#EXTINF:20.000,
-seg-34-v1-a1.ts
-#EXTINF:20.000,
-seg-35-v1-a1.ts
-#EXTINF:20.000,
-seg-36-v1-a1.ts
-#EXTINF:20.000,
-seg-37-v1-a1.ts
-#EXTINF:20.000,
-seg-38-v1-a1.ts
-#EXTINF:20.000,
-seg-39-v1-a1.ts
-#EXTINF:20.000,
-seg-40-v1-a1.ts
-#EXTINF:20.000,
-seg-41-v1-a1.ts
-#EXTINF:20.000,
-seg-42-v1-a1.ts
-#EXTINF:20.000,
-seg-43-v1-a1.ts
-#EXTINF:20.000,
-seg-44-v1-a1.ts
-#EXTINF:20.000,
-seg-45-v1-a1.ts
-#EXTINF:20.000,
-seg-46-v1-a1.ts
-#EXTINF:20.000,
-seg-47-v1-a1.ts
-#EXTINF:20.000,
-seg-48-v1-a1.ts
-#EXTINF:20.000,
-seg-49-v1-a1.ts
-#EXTINF:20.000,
-seg-50-v1-a1.ts
-#EXTINF:20.000,
-seg-51-v1-a1.ts
-#EXTINF:20.000,
-seg-52-v1-a1.ts
-#EXTINF:20.000,
-seg-53-v1-a1.ts
-#EXTINF:20.000,
-seg-54-v1-a1.ts
-#EXTINF:20.000,
-seg-55-v1-a1.ts
-#EXTINF:20.000,
-seg-56-v1-a1.ts
-#EXTINF:20.000,
-seg-57-v1-a1.ts
-#EXTINF:20.000,
-seg-58-v1-a1.ts
-#EXTINF:20.000,
-seg-59-v1-a1.ts
-#EXTINF:20.000,
-seg-60-v1-a1.ts
-#EXTINF:20.000,
-seg-61-v1-a1.ts
-#EXTINF:20.000,
-seg-62-v1-a1.ts
-#EXTINF:20.000,
-seg-63-v1-a1.ts
-#EXTINF:20.000,
-seg-64-v1-a1.ts
-#EXTINF:20.000,
-seg-65-v1-a1.ts
-#EXTINF:20.000,
-seg-66-v1-a1.ts
-#EXTINF:20.000,
-seg-67-v1-a1.ts
-#EXTINF:20.000,
-seg-68-v1-a1.ts
-#EXTINF:20.000,
-seg-69-v1-a1.ts
-#EXTINF:20.000,
-seg-70-v1-a1.ts
-#EXTINF:20.000,
-seg-71-v1-a1.ts
-#EXTINF:20.000,
-seg-72-v1-a1.ts
-#EXTINF:20.000,
-seg-73-v1-a1.ts
-#EXTINF:20.000,
-seg-74-v1-a1.ts
-#EXTINF:20.000,
-seg-75-v1-a1.ts
-#EXTINF:20.000,
-seg-76-v1-a1.ts
-#EXTINF:20.000,
-seg-77-v1-a1.ts
-#EXTINF:20.000,
-seg-78-v1-a1.ts
-#EXTINF:20.000,
-seg-79-v1-a1.ts
-#EXTINF:20.000,
-seg-80-v1-a1.ts
-#EXTINF:20.000,
-seg-81-v1-a1.ts
-#EXTINF:20.000,
-seg-82-v1-a1.ts
-#EXTINF:20.000,
-seg-83-v1-a1.ts
-#EXTINF:20.000,
-seg-84-v1-a1.ts
-#EXTINF:20.000,
-seg-85-v1-a1.ts
-#EXTINF:20.000,
-seg-86-v1-a1.ts
-#EXTINF:20.000,
-seg-87-v1-a1.ts
-#EXTINF:20.000,
-seg-88-v1-a1.ts
-#EXTINF:20.000,
-seg-89-v1-a1.ts
-#EXTINF:20.000,
-seg-90-v1-a1.ts
-#EXTINF:20.000,
-seg-91-v1-a1.ts
-#EXTINF:20.000,
-seg-92-v1-a1.ts
-#EXTINF:20.000,
-seg-93-v1-a1.ts
-#EXTINF:20.000,
-seg-94-v1-a1.ts
-#EXTINF:20.000,
-seg-95-v1-a1.ts
-#EXTINF:20.000,
-seg-96-v1-a1.ts
-#EXTINF:20.000,
-seg-97-v1-a1.ts
-#EXTINF:20.000,
-seg-98-v1-a1.ts
-#EXTINF:20.000,
-seg-99-v1-a1.ts
-#EXTINF:20.000,
-seg-100-v1-a1.ts
-#EXTINF:20.000,
-seg-101-v1-a1.ts
-#EXTINF:20.000,
-seg-102-v1-a1.ts
-#EXTINF:20.000,
-seg-103-v1-a1.ts
-#EXTINF:20.000,
-seg-104-v1-a1.ts
-#EXTINF:20.000,
-seg-105-v1-a1.ts
-#EXTINF:20.000,
-seg-106-v1-a1.ts
-#EXTINF:20.000,
-seg-107-v1-a1.ts
-#EXTINF:20.000,
-seg-108-v1-a1.ts
-#EXTINF:20.000,
-seg-109-v1-a1.ts
-#EXTINF:20.000,
-seg-110-v1-a1.ts
-#EXTINF:20.000,
-seg-111-v1-a1.ts
-#EXTINF:20.000,
-seg-112-v1-a1.ts
-#EXTINF:20.000,
-seg-113-v1-a1.ts
-#EXTINF:20.000,
-seg-114-v1-a1.ts
-#EXTINF:20.000,
-seg-115-v1-a1.ts
-#EXTINF:20.000,
-seg-116-v1-a1.ts
-#EXTINF:20.000,
-seg-117-v1-a1.ts
-#EXTINF:20.000,
-seg-118-v1-a1.ts
-#EXTINF:20.000,
-seg-119-v1-a1.ts
-#EXTINF:20.000,
-seg-120-v1-a1.ts
-#EXTINF:20.000,
-seg-121-v1-a1.ts
-#EXTINF:20.000,
-seg-122-v1-a1.ts
-#EXTINF:20.000,
-seg-123-v1-a1.ts
-#EXTINF:20.000,
-seg-124-v1-a1.ts
-#EXTINF:20.000,
-seg-125-v1-a1.ts
-#EXTINF:20.000,
-seg-126-v1-a1.ts
-#EXTINF:20.000,
-seg-127-v1-a1.ts
-#EXTINF:20.000,
-seg-128-v1-a1.ts
-#EXTINF:20.000,
-seg-129-v1-a1.ts
-#EXTINF:20.000,
-seg-130-v1-a1.ts
-#EXTINF:20.000,
-seg-131-v1-a1.ts
-#EXTINF:20.000,
-seg-132-v1-a1.ts
-#EXTINF:20.000,
-seg-133-v1-a1.ts
-#EXTINF:20.000,
-seg-134-v1-a1.ts
-#EXTINF:20.000,
-seg-135-v1-a1.ts
-#EXTINF:20.000,
-seg-136-v1-a1.ts
-#EXTINF:20.000,
-seg-137-v1-a1.ts
-#EXTINF:4.111,
-seg-138-v1-a1.ts
-#EXT-X-ENDLIST

internal/protocol/http/config.go

@@ -1,8 +1,5 @@
 package http
 
-// DefaultUserAgent is shared by HTTP downloads and extension HTTP requests.
-const DefaultUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
-
 type config struct {
 	UserAgent      string `json:"userAgent"`
 	Connections    int    `json:"connections"`