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/test.yml

@@ -77,8 +77,6 @@ jobs:
         include:
           - name: Windows
             os: windows-latest
-          - name: Linux
-            os: ubuntu-latest
           - name: macOS
             os: macos-latest
     runs-on: ${{ matrix.os }}
@@ -91,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 2](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.2)
+- [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 2 をダウンロード](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.2)
+- [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 2](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.2)
+- [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 2](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.2)
+- [下载 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 2](https://github.com/GopeedLab/gopeed/releases/tag/v2.0.0-beta.2)
+- [下載 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/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
@@ -158,7 +156,7 @@ require (
 	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

@@ -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/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/fetcher.go

@@ -399,10 +399,7 @@ func (f *Fetcher) Wait() (err error) {
 							}
 						}
 						if !selected {
-							root, name := torrentFileLayout(f.torrent.Info(), file.FileInfo())
+							util.SafeRemove(filepath.Join(f.meta.Opts.Path, f.meta.Res.Name, file.Path()))
-							if err := removeUnselectedFile(f.meta.Opts.Path, root, name); err != nil {
-								return err
-							}
 						}
 					}
 					return
@@ -412,62 +409,6 @@ func (f *Fetcher) Wait() (err error) {
 	}
 }
 
-// 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 {
 	if f.meta.Opts == nil {
 		return false
@@ -697,10 +638,6 @@ func (f *Fetcher) addTorrent(req *base.Request, fromUpload bool) (err error) {
 	}
 	spec.Storage = storage.NewFileOpts(storage.NewFileClientOpts{
 		ClientBaseDir: cfg.DataDir,
-		FilePathMaker: func(opts storage.FilePathMakerOpts) string {
-			_, name := torrentFileLayout(opts.Info, *opts.File)
-			return name
-		},
 		TorrentDirMaker: func(baseDir string, info *metainfo.Info, infoHash metainfo.Hash) string {
 			return f.meta.Opts.Path
 		},

internal/protocol/bt/selection_test.go

@@ -1,302 +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 TestStartUsesSelectionSubmittedAfterResolve(t *testing.T) {
-	config := torrent.TestingConfig(t)
-	config.DataDir = t.TempDir()
-	config.DisableTCP = true
-	config.DisableUTP = true
-	c, err := torrent.NewClient(config)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-	tor, err := c.AddTorrentFromFile("testdata/test.torrent")
-	if err != nil {
-		t.Fatal(err)
-	}
-	f := &Fetcher{torrent: tor, meta: &fetcher.FetcherMeta{Opts: &base.Options{}}, data: &fetcherData{}}
-	f.torrentReady.Store(true)
-	f.updateRes()
-	// Resolve initializes all files; creation replaces the selection before Start.
-	f.meta.Opts = &base.Options{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"}},
-			}}
-			store := storage.NewFileOpts(storage.NewFileClientOpts{
-				ClientBaseDir:   dir,
-				TorrentDirMaker: func(baseDir string, _ *metainfo.Info, _ metainfo.Hash) string { return baseDir },
-			})
-			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/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_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,857 +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}}
-	}
-	if err := f.Resolve(req, &base.Options{Path: t.TempDir()}); 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"}
-	if err := blocked.Resolve(req, &base.Options{Path: t.TempDir()}); 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}},
-	}
-	if err := allowed.Resolve(allowedReq, &base.Options{Path: t.TempDir()}); 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}},
-	}
-	if err := f.Resolve(req, &base.Options{Path: t.TempDir()}); 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()}
-	if err := f.Resolve(req, opts); 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())
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}, &base.Options{Path: t.TempDir()}); 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)
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}, &base.Options{Path: t.TempDir()}); 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())
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}, &base.Options{Path: t.TempDir()}); 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,297 +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())
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}, &base.Options{Path: t.TempDir()}); 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())
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}, &base.Options{Path: t.TempDir()}); 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())
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}, &base.Options{Path: t.TempDir()}); 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,296 +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)
-	if err := f1.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}, &base.Options{Path: dir}); err != nil {
-		t.Fatal(err)
-	}
-	f2 := newTestFetcher(t, cfg)
-	if err := f2.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}, &base.Options{Path: dir, Name: "video-2.ts"}); err != nil {
-		t.Fatal(err)
-	}
-	if f1.state.StagingDir == "" || f1.state.StagingDir == f2.state.StagingDir {
-		t.Fatalf("staging dirs must be distinct per task: %q vs %q", f1.state.StagingDir, f2.state.StagingDir)
-	}
-
-	// 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)
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}, &base.Options{Path: t.TempDir()}); 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())
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}, &base.Options{Path: t.TempDir()}); 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())
-	if err := f.Resolve(&base.Request{URL: server.URL + "/video.m3u8"}, &base.Options{Path: t.TempDir()}); 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"`

internal/protocol/http/fetcher.go

@@ -150,7 +150,7 @@ type slowStartController struct {
 	totalLaunched  int
 	batchPending   int           // Connections in current batch waiting for HTTP response
 	batchReady     int           // Connections in current batch that succeeded
-	nextBatchSize  int           // Next batch size: 1, 2, 4, 16, 256... (capped)
+	nextBatchSize  int           // Next batch size: 1, 2, 4, 8...
 	expansionCh    chan struct{} // Signal to trigger next expansion
 	paused         bool          // Pause expansion (e.g., on 429)
 }
@@ -229,15 +229,7 @@ func (s *slowStartController) commitBatch(count int) {
 	defer s.mu.Unlock()
 
 	s.totalLaunched += count
-	if s.nextBatchSize == 1 {
+	s.nextBatchSize = s.nextBatchSize * 2 // Exponential growth: 1, 2, 4, 8...
-		// Bootstrap growth: squaring one would never increase the batch size.
-		s.nextBatchSize = min(2, s.maxConnections)
-	} else if s.nextBatchSize > s.maxConnections/s.nextBatchSize {
-		// Cap before multiplying to avoid integer overflow.
-		s.nextBatchSize = s.maxConnections
-	} else {
-		s.nextBatchSize *= s.nextBatchSize
-	}
 	s.batchPending = count
 	s.batchReady = 0
 }
@@ -371,9 +363,20 @@ func (f *Fetcher) Resolve(req *base.Request, opts *base.Options) error {
 		f.meta.Opts = &base.Options{}
 	}
 
-	if err := f.initOptions(); err != nil {
+	// Parse options
+	if err := base.ParseOptExtra[fhttp.OptsExtra](opts); err != nil {
 		return err
 	}
+	if opts.Extra == nil {
+		opts.Extra = &fhttp.OptsExtra{}
+	}
+	extra := opts.Extra.(*fhttp.OptsExtra)
+	if extra.Connections <= 0 {
+		extra.Connections = f.config.Connections
+		if extra.Connections <= 0 {
+			extra.Connections = 1
+		}
+	}
 
 	f.setState(stateResolving)
 
@@ -456,7 +459,6 @@ func (f *Fetcher) Resolve(req *base.Request, opts *base.Options) error {
 	if file.Name == "" || file.Name == "/" || file.Name == "." {
 		file.Name = httpReq.URL.Hostname()
 	}
-	file.Name = appendFilenameExtension(file.Name, resp.Header.Get("Content-Type"))
 
 	res.Files = append(res.Files, file)
 	f.meta.Res = res
@@ -509,9 +511,17 @@ func (f *Fetcher) asyncPrefetch() {
 		return
 	}
 
+	// Create temporary file for prefetch data
+	tmpFile, err := os.CreateTemp("", "gopeed-prefetch-*")
+	if err != nil {
+		f.prefetchErr = err
+		return
+	}
+	f.prefetchFile = tmpFile
+	f.prefetchFilePath = tmpFile.Name()
+
 	defer func() {
-		// Close the response even if temporary-file setup fails or shutdown
+		// Close response body when prefetch stops
-		// rejects a late prefetch. Otherwise the server can remain blocked writing.
 		f.resolveRespLock.Lock()
 		if f.resolveResp != nil {
 			f.resolveResp.Body.Close()
@@ -520,33 +530,8 @@ func (f *Fetcher) asyncPrefetch() {
 		f.resolveRespLock.Unlock()
 	}()
 
-	// Create temporary file for prefetch data
-	tempDir := ""
-	if f.ctl != nil && f.ctl.TempDir != "" {
-		tempDir = f.ctl.TempDir
-		if err := os.MkdirAll(tempDir, 0700); err != nil {
-			f.prefetchErr = err
-			return
-		}
-	}
-	tmpFile, err := os.CreateTemp(tempDir, "gopeed-prefetch-*")
-	if err != nil {
-		f.prefetchErr = err
-		return
-	}
-	if f.ctl != nil {
-		if err := f.ctl.TempFiles.Track(tmpFile.Name()); err != nil {
-			tmpFile.Close()
-			os.Remove(tmpFile.Name())
-			f.prefetchErr = err
-			return
-		}
-	}
-	f.prefetchFile = tmpFile
-	f.prefetchFilePath = tmpFile.Name()
-
 	buf := make([]byte, 32*1024) // 32KB buffer
-	reader := f.responseReader(resp)
+	reader := NewTimeoutReader(resp.Body, readTimeout)
 
 	for {
 		select {
@@ -631,11 +616,7 @@ func (f *Fetcher) cleanupPrefetchFile() {
 		f.prefetchFile = nil
 	}
 	if f.prefetchFilePath != "" {
-		if f.ctl != nil {
+		os.Remove(f.prefetchFilePath)
-			f.ctl.TempFiles.Remove(f.prefetchFilePath)
-		} else {
-			os.Remove(f.prefetchFilePath)
-		}
 		f.prefetchFilePath = ""
 	}
 	// The byte count is only reusable while the backing prefetch file exists.
@@ -645,31 +626,7 @@ func (f *Fetcher) cleanupPrefetchFile() {
 	f.resolveFallback.Store(false)
 }
 
-// Options may be replaced between Resolve and Start when creating a resolved task.
-func (f *Fetcher) initOptions() error {
-	opts := f.meta.Opts
-	// Parse options
-	if err := base.ParseOptExtra[fhttp.OptsExtra](opts); err != nil {
-		return err
-	}
-	if opts.Extra == nil {
-		opts.Extra = &fhttp.OptsExtra{}
-	}
-	extra := opts.Extra.(*fhttp.OptsExtra)
-	if extra.Connections <= 0 {
-		extra.Connections = f.config.Connections
-		if extra.Connections <= 0 {
-			extra.Connections = 1
-		}
-	}
-
-	return nil
-}
-
 func (f *Fetcher) Start() error {
-	if err := f.initOptions(); err != nil {
-		return err
-	}
 	state := f.getState()
 
 	switch state {
@@ -1371,7 +1328,7 @@ func (f *Fetcher) downloadChunkOnce(conn *connection, client *http.Client, buf [
 		f.slowStart.onConnectSuccess()
 	}
 
-	reader := f.responseReader(resp)
+	reader := NewTimeoutReader(resp.Body, readTimeout)
 	var responseBytesRead int64
 	for {
 		if conn.ctx.Err() != nil {
@@ -1753,7 +1710,7 @@ func (f *Fetcher) runConnectionWithResolveResp(conn *connection) {
 	}
 
 	// Download data from resolve response
-	reader := f.responseReader(resp)
+	reader := NewTimeoutReader(resp.Body, readTimeout)
 	for {
 		if conn.ctx.Err() != nil {
 			return
@@ -1870,7 +1827,7 @@ func (f *Fetcher) runConnectionFallback(conn *connection) {
 				f.slowStart.onConnectSuccess()
 			}
 
-			reader := f.responseReader(resp)
+			reader := NewTimeoutReader(resp.Body, readTimeout)
 			for {
 				if conn.ctx.Err() != nil {
 					return conn.ctx.Err()
@@ -2493,12 +2450,3 @@ func (f *Fetcher) Progress() fetcher.Progress {
 func (f *Fetcher) Wait() error {
 	return <-f.doneCh
 }
-
-// Generated output can pause while its producer waits for processing capacity.
-// Its producer owns upstream deadlines; cancellation still closes the response.
-func (f *Fetcher) responseReader(resp *http.Response) io.Reader {
-	if f.ctl != nil && f.ctl.ManagedProduction != nil && resp.Request != nil && f.ctl.ManagedProduction(resp.Request.URL.String()) {
-		return resp.Body
-	}
-	return NewTimeoutReader(resp.Body, readTimeout)
-}

internal/protocol/http/fetcher_manager.go

@@ -72,7 +72,7 @@ func (fm *FetcherManager) AutoRename() bool {
 
 func (fm *FetcherManager) DefaultConfig() any {
 	return &config{
-		UserAgent:   DefaultUserAgent,
+		UserAgent:   "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
 		Connections: 16,
 	}
 }

internal/protocol/http/fetcher_test.go

@@ -221,30 +221,6 @@ func TestFetcher_Resolve(t *testing.T) {
 	})
 }
 
-func TestFetcher_ResolveFilenameFromContentType(t *testing.T) {
-	server := httptest.NewServer(gohttp.HandlerFunc(func(w gohttp.ResponseWriter, r *gohttp.Request) {
-		w.Header().Set("Content-Type", "image/webp")
-		w.WriteHeader(gohttp.StatusOK)
-	}))
-	defer server.Close()
-
-	fetcher := buildFetcher()
-	defer fetcher.Pause()
-
-	const opaqueName = "OIP-C.u5nEXTXND3PJF0gNTgw5YgHaFP"
-	err := fetcher.Resolve(&base.Request{URL: server.URL + "/" + opaqueName}, &base.Options{
-		Name: test.DownloadName,
-		Path: test.Dir,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if got := fetcher.meta.Res.Files[0].Name; got != opaqueName+".webp" {
-		t.Fatalf("resolved filename = %q, want %q", got, opaqueName+".webp")
-	}
-}
-
 func TestFetcher_ResolveWithHostHeader(t *testing.T) {
 	listener := test.StartTestHostHeaderServer()
 	defer listener.Close()

internal/protocol/http/filename_parse_test.go

@@ -136,52 +136,3 @@ func TestUnescapeHTMLEntities(t *testing.T) {
 		})
 	}
 }
-
-func TestAppendFilenameExtension(t *testing.T) {
-	tests := []struct {
-		name        string
-		filename    string
-		contentType string
-		want        string
-	}{
-		{
-			name:        "adds extension from content type",
-			filename:    "download",
-			contentType: "image/png",
-			want:        "download.png",
-		},
-		{
-			name:        "parses MIME parameters",
-			filename:    "download",
-			contentType: "image/png; charset=binary",
-			want:        "download.png",
-		},
-		{
-			name:        "preserves existing extension",
-			filename:    "download.zip",
-			contentType: "application/zip",
-			want:        "download.zip",
-		},
-		{
-			name:        "ignores invalid content type",
-			filename:    "download",
-			contentType: "not a content type",
-			want:        "download",
-		},
-		{
-			name:        "ignores unknown content type",
-			filename:    "download",
-			contentType: "application/x-gopeed-unknown",
-			want:        "download",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := appendFilenameExtension(tt.filename, tt.contentType)
-			if got != tt.want {
-				t.Errorf("appendFilenameExtension() = %q, want %q", got, tt.want)
-			}
-		})
-	}
-}

internal/protocol/http/helper.go

@@ -12,7 +12,6 @@ import (
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
-	"path"
 	"strings"
 	"time"
 	"unicode/utf8"
@@ -315,28 +314,6 @@ func parseFilename(contentDisposition string) string {
 	return parseFilenameFallback(contentDisposition)
 }
 
-// appendFilenameExtension adds a MIME-derived extension when the resolved
-// filename has no usable extension. Some image hosts use opaque path segments
-// that look like extensions, even though the response Content-Type is the
-// only reliable source for the file type.
-func appendFilenameExtension(filename, contentType string) string {
-	mediaType, _, err := mime.ParseMediaType(contentType)
-	if err != nil {
-		return filename
-	}
-
-	extensions, err := mime.ExtensionsByType(mediaType)
-	if err != nil || len(extensions) == 0 {
-		return filename
-	}
-
-	ext := path.Ext(filename)
-	if len(ext) > 1 && len(ext) <= 20 {
-		return filename
-	}
-	return filename + extensions[0]
-}
-
 // parseFilenameExtended handles RFC 5987 extended notation (filename*=)
 // Format: filename*=charset'language'value (e.g., UTF-8”%E6%B5%8B%E8%AF%95.zip)
 func parseFilenameExtended(cd string) string {

internal/protocol/http/prefetch_setup_test.go

@@ -1,74 +0,0 @@
-package http
-
-import (
-	"io"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/GopeedLab/gopeed/internal/tempfiles"
-)
-
-type prefetchSetupBody struct {
-	io.Reader
-	closed bool
-}
-
-func (b *prefetchSetupBody) Close() error {
-	b.closed = true
-	return nil
-}
-
-func TestPrefetchSetupFailureClosesResponse(t *testing.T) {
-	for _, closedScope := range []bool{false, true} {
-		name := "invalid_temp_directory"
-		if closedScope {
-			name = "downloader_already_closed"
-		}
-		t.Run(name, func(t *testing.T) {
-			root := t.TempDir()
-			scope := &tempfiles.Scope{}
-			dir := root
-			if closedScope {
-				if err := scope.Close(); err != nil {
-					t.Fatal(err)
-				}
-			} else {
-				dir = filepath.Join(root, "file")
-				if err := os.WriteFile(dir, nil, 0600); err != nil {
-					t.Fatal(err)
-				}
-			}
-			body := &prefetchSetupBody{Reader: strings.NewReader("unused response")}
-			f := &Fetcher{
-				ctl:         &controller.Controller{TempDir: dir, TempFiles: scope},
-				resolveResp: &http.Response{Body: body},
-			}
-			f.asyncPrefetch()
-			if f.prefetchErr == nil {
-				t.Fatal("expected temporary-file initialization to fail")
-			}
-			if !body.closed {
-				t.Error("prefetch setup failure left the response body open")
-			}
-			if f.resolveResp != nil {
-				t.Error("prefetch retained its failed resolve response")
-			}
-			if !f.prefetchDone.Load() {
-				t.Error("prefetch did not report completion")
-			}
-			if closedScope {
-				entries, err := os.ReadDir(root)
-				if err != nil {
-					t.Fatal(err)
-				}
-				if len(entries) != 0 {
-					t.Errorf("late prefetch left temporary files: %v", entries)
-				}
-			}
-		})
-	}
-}

internal/tempfiles/scope.go

@@ -1,63 +0,0 @@
-// Package tempfiles tracks temporary paths owned by one downloader, without
-// requiring a private parent directory or scanning the shared system temp root.
-package tempfiles
-
-import (
-	"errors"
-	"io"
-	"os"
-	"sync"
-)
-
-type Scope struct {
-	mu     sync.Mutex
-	paths  map[string]struct{}
-	closed bool
-}
-
-// Track adopts a newly created unique path. Late creations are removed when
-// shutdown has already begun. A nil scope leaves cleanup to the resource owner.
-func (s *Scope) Track(path string) error {
-	if s == nil {
-		return nil
-	}
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.closed {
-		return errors.Join(io.ErrClosedPipe, os.RemoveAll(path))
-	}
-	if s.paths == nil {
-		s.paths = make(map[string]struct{})
-	}
-	s.paths[path] = struct{}{}
-	return nil
-}
-func (s *Scope) Remove(path string) error {
-	if s == nil {
-		return os.RemoveAll(path)
-	}
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if err := os.RemoveAll(path); err != nil {
-		return err
-	}
-	delete(s.paths, path)
-	return nil
-}
-func (s *Scope) Close() error {
-	if s == nil {
-		return nil
-	}
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.closed = true
-	var result error
-	for path := range s.paths {
-		if err := os.RemoveAll(path); err != nil {
-			result = errors.Join(result, err)
-		} else {
-			delete(s.paths, path)
-		}
-	}
-	return result
-}

internal/tempfiles/scope_test.go

@@ -1,76 +0,0 @@
-package tempfiles
-
-import (
-	"errors"
-	"io"
-	"os"
-	"sync"
-	"testing"
-)
-
-func TestSharedDirectoryOwnersAndLateCreation(t *testing.T) {
-	root := t.TempDir()
-	a, b := &Scope{}, &Scope{}
-	own := func(scope *Scope) string {
-		t.Helper()
-		dir, err := os.MkdirTemp(root, "gopeed-media-")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := scope.Track(dir); err != nil {
-			t.Fatal(err)
-		}
-		return dir
-	}
-	first, second := own(a), own(b)
-	if err := a.Close(); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := os.Stat(first); !os.IsNotExist(err) {
-		t.Fatal(err)
-	}
-	if _, err := os.Stat(second); err != nil {
-		t.Fatal("removed other owner's path", err)
-	}
-	late, err := os.MkdirTemp(root, "gopeed-media-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := a.Track(late); !errors.Is(err, io.ErrClosedPipe) {
-		t.Fatal(err)
-	}
-	if _, err := os.Stat(late); !os.IsNotExist(err) {
-		t.Fatal("late creation leaked", err)
-	}
-	if err := b.Close(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestConcurrentCreationAndShutdown(t *testing.T) {
-	root := t.TempDir()
-	scope := &Scope{}
-	var wg sync.WaitGroup
-	for i := 0; i < 20; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			dir, err := os.MkdirTemp(root, "gopeed-media-")
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			if err := scope.Track(dir); err != nil && !errors.Is(err, io.ErrClosedPipe) {
-				t.Error(err)
-			}
-		}()
-	}
-	if err := scope.Close(); err != nil {
-		t.Fatal(err)
-	}
-	wg.Wait()
-	entries, err := os.ReadDir(root)
-	if err != nil || len(entries) != 0 {
-		t.Fatal("shutdown leaked paths", entries, err)
-	}
-}

internal/webview/README.md

@@ -1,109 +0,0 @@
-# Extension browser host configuration
-
-The downloader wraps each provider with the extension's stable identity before
-constructing the runtime. `OpenOptions.ProfileID`, `DataPath`, and `ProxyURL` are
-host-only fields. `parseOpenOptions` never reads them from extension JavaScript.
-The extension API is unchanged. The Flutter host uses the fork's public
-`WebViewProfile`, `InAppWebViewSettings.profileId`, and profile-scoped
-`CookieManager` APIs; the library has no Gopeed-specific method-channel bridge.
-Only the Gopeed extension JavaScript boundary keeps these options host-only.
-
-Profiles are persistent and shared across invocations/pages of the same extension.
-Different identities use different native stores. Go providers use a SHA-256-based
-path under `<StorageDir>/webview`; Apple RPC hosts use a stable UUID data store;
-Android uses a named WebView profile. Cookie operations select that same store,
-including `clearCookies`. Closing an execution closes its pages, not its profile.
-Uninstall closes the extension's pages, prevents its old runtimes from opening
-new pages, and removes its native profile before deleting the extension record.
-Cleanup failures abort uninstall and can be retried. Reinstallation starts with
-empty browser data; an ordinary extension update keeps the existing profile.
-Windows/Linux delete the profile directory; Apple removes the named WebKit store.
-Android cannot delete a profile already loaded by the current process: when
-DELETE_BROWSING_DATA is supported it clears all site data immediately, and records
-an empty-profile deletion in SharedPreferences for the next process start. A
-reinstallation may reuse that cleared profile and cancels the pending deletion.
-If the full-data clearing API is unavailable, uninstall fails with a restart
-instruction; the pending profile is deleted at startup before it can be loaded.
-No removal operation is exposed through extension JavaScript.
-
-Existing shared browser data is not copied into every extension's new profile.
-
-The downloader lazily owns one loopback forward proxy with HTTP and SOCKS5
-listeners. Windows/Linux/Android use HTTP; Apple uses SOCKS5 because its HTTP
-CONNECT configuration may bypass plain HTTP. The forwarder reads the current
-Gopeed proxy config for each new request/tunnel and supports direct, system,
-HTTP(S) upstream proxies with Basic authentication, and authenticated SOCKS5.
-Credentials remain in Go and are never sent over the WebView RPC.
-
-Changes affect new requests/connections. Existing CONNECT/SOCKS tunnels keep their
-route until closed; opening another page in the same profile does not reset it.
-SOCKS carries host/port rather than a full URL: system proxy/PAC selection for
-Apple is host-based, with port 80 treated as HTTP and other ports as HTTPS.
-Path-dependent PAC rules cannot be reproduced from a SOCKS connection.
-
-Apple requires macOS 14 / iOS 17. Android checks MULTI_PROFILE and PROXY_OVERRIDE.
-Unsupported hosts fail explicitly instead of silently sharing browser storage or
-ignoring the proxy.
-
-## Validation
-
-- `go test -race ./internal/webview/proxy ./pkg/download/engine/webview`
-- `go test ./pkg/download -run 'TestWebViewProfileBound|TestDownloader_ExtensionRuntimeWebView'`
-- Windows/Linux: `go test -tags webview -v ./internal/webview/goprovider` (Linux: run under `xvfb-run -a`).
-- macOS: start the normal Flutter app, then run `go test -tags webview -v ./internal/webview/rpcprovider` with its socket address. See `rpcprovider/README.md`.
-- In webview_go: `go test -tags webview_integration -v -count=1 .` (Linux: run under `xvfb-run -a`).
-
-The shared provider contract covers HTTP/HTTPS proxy routing, concurrent pages,
-HttpOnly cookies, LocalStorage, IndexedDB, profile-scoped clearing, reopening,
-and removal without affecting another profile. HTTPS routing is checked with a
-rejecting upstream tunnel; no test-only certificate bypass is added to the app.
-Go proxy unit tests separately cover successful TLS forwarding and authentication.
-These cases run in the existing `test.yml` WebView jobs; existing mobile build jobs
-compile the Android/iOS bridge. No separate Flutter test application is required.
-
-## Extension events and host environment
-
-`gopeed.host.env.version` is the host's build version (`dev` for development
-builds). `gopeed.info.version` continues to identify the extension's own version.
-`gopeed.host.env.os` and `gopeed.host.env.arch` match the REST info endpoint's `os` and
-`arch`: the host's Go `runtime.GOOS` and `runtime.GOARCH` values (for example,
-`windows` / `amd64` or `darwin` / `arm64`).
-See [extension-api.d.ts](extension-api.d.ts) for the event payloads.
-
-```js
-const page = await gopeed.runtime.webview.open();
-const unsubscribe = await page.on("url-changed", ({ url, sameDocument }) => {
-  gopeed.logger.info(url, sameDocument);
-});
-await page.on("closed", ({ reason }) => gopeed.logger.info(reason));
-await page.addInitScript("globalThis.extensionReady = true");
-await page.goto("https://example.com");
-unsubscribe();
-await page.close();
-```
-
-Registration resolves only after the listener is installed; it does not replay
-current state. `url-changed` reports actual address changes, including hash,
-pushState, replaceState and history navigation. `load` follows the main document's
-`window.load`, including reloads, and does not wait for business-level async work.
-Iframe loads and subresource failures do not become main-page notifications.
-`closed` distinguishes the user's close action from API closure and is terminal.
-Unsubscribe is idempotent. Notifications cannot block navigation; the engine does
-not await promises returned by handlers. Catch async errors inside the handler.
-
-`addInitScript` applies to future document contexts only. Use `execute` to run
-code on the current page. Executable functions are serialized and cannot capture
-extension-side lexical variables; pass values explicitly as arguments.
-
-The RPC host uses an NDJSON `page.events` response whose first record is
-`{"ready":true}`. Subsequent records are `{event,data}`. Closing a page sends the
-terminal record before ending the stream. The native backend uses document-start
-notifications for main-document URL/load events and native callbacks for
-navigation failures and user closure.
-
-Additional validation:
-
-- `go test -race ./pkg/download/engine/webview ./internal/webview/rpcprovider`
-- `go test ./pkg/download -run 'TestExtension(WebViewEvents|InfoHostVersion)'`
-- macOS native: `go test -tags webview_native ./internal/webview/goprovider -run TestProviderEvents`
-- Running Flutter host: `go test -tags webview ./internal/webview/rpcprovider -run TestProviderEvents`

internal/webview/extension-api.d.ts

@@ -1,60 +0,0 @@
-/** Public extension API additions. info.version remains the extension version. */
-export interface ExtensionInfo {
-  identity: string;
-  name: string;
-  author: string;
-  title: string;
-  version: string;
-}
-
-/** Available as gopeed.host. */
-export interface Host {
-  env: HostEnv;
-}
-
-export interface HostEnv {
-  /** Host build version; "dev" for development builds. */
-  version: string;
-  /** Host OS and architecture, matching the REST info endpoint (Go GOOS/GOARCH). */
-  os: string;
-  arch: string;
-}
-
-/** Functions are serialized; they cannot capture extension-side variables. */
-export type WebviewExecutable<T = unknown> =
-  | string
-  | ((...args: unknown[]) => T | Promise<T>);
-
-export type WebviewUnsubscribe = () => void;
-
-/** Navigation and load notifications are for the main document only. */
-export interface WebviewEventMap {
-  "url-changed": { url: string; sameDocument: boolean };
-  /** window.load, including reloads, excluding hash/History API navigation. */
-  "load": { url: string };
-  "load-error": { url: string; message: string };
-  "closed": { reason: "user" | "api" };
-}
-
-export interface WebviewGotoOptions {
-  timeoutMs?: number;
-  waitUntil?: "load" | "domcontentloaded";
-}
-
-/** These members extend the existing WebviewPage API. */
-export interface WebviewPage {
-  /**
-   * Resolves when listening is ready. Does not replay current state.
-   * Register before goto() to observe navigation. Unsubscribe is idempotent.
-   * Closed is delivered once, then listeners are released automatically.
-   * Callbacks cannot cancel navigation; returned promises are not awaited.
-   * Callers handle errors in asynchronous callbacks.
-   */
-  on<K extends keyof WebviewEventMap>(
-    event: K,
-    handler: (data: WebviewEventMap[K]) => void,
-  ): Promise<WebviewUnsubscribe>;
-  /** Runs at document creation on future navigations, never immediately. */
-  addInitScript(script: string): Promise<void>;
-  goto(url: string, opts?: WebviewGotoOptions): Promise<void>;
-}

internal/webview/goprovider/events_darwin_test.go

@@ -1,12 +0,0 @@
-//go:build cgo && darwin && webview_native
-
-package goprovider
-
-import (
-	"github.com/GopeedLab/gopeed/internal/webview/integrationtest"
-	"os"
-	"testing"
-)
-
-func TestMain(m *testing.M)           { os.Exit(RunMainThreadLoop(m.Run)) }
-func TestProviderEvents(t *testing.T) { integrationtest.RunEventContract(t, New()) }

internal/webview/goprovider/events_script_test.go

@@ -1,49 +0,0 @@
-//go:build cgo
-
-package goprovider
-
-import (
-	enginewebview "github.com/GopeedLab/gopeed/pkg/download/engine/webview"
-	webview "github.com/GopeedLab/webview_go"
-	"github.com/dop251/goja"
-	"testing"
-	"time"
-)
-
-func TestInternalErrorDocumentDoesNotReportPageEvents(t *testing.T) {
-	vm := goja.New()
-	if _, err := vm.RunString(`
-  var window = globalThis;
-  window.top = window;
-  var location = {protocol: "chrome-error:", href: "chrome-error://chromewebdata/"};
-  var notifications = [];
-  var listeners = [];
-  function notify(payload) { notifications.push(payload); }
-  window.addEventListener = (name) => listeners.push(name);
- `); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := vm.RunString(buildLoadNotifyScript("notify")); err != nil {
-		t.Fatal(err)
-	}
-	for _, name := range []string{"notifications", "listeners"} {
-		value, err := vm.RunString(name + ".length")
-		if err != nil || value.ToInteger() != 0 {
-			t.Fatalf("internal error page registered %s: %v (%v)", name, value, err)
-		}
-	}
-	// The provider must wait for the native failure, preserving the failed URL.
-	page := newPageWrapper(enginewebview.OpenOptions{})
-	got := make(chan string, 1)
-	_, err := page.On("load-error", func(e enginewebview.Event) { got <- e.Data["url"].(string) })
-	if err != nil {
-		t.Fatal(err)
-	}
-	page.handleNativeEvent(webview.Event{Name: "load-error", URL: "https://example.test/failure", Message: "TLS handshake failed"})
-	if err := page.waitForNavigation(time.Second, "load"); err == nil {
-		t.Fatal("native failure completed navigation successfully")
-	}
-	if url := <-got; url != "https://example.test/failure" {
-		t.Fatal(url)
-	}
-}

internal/webview/goprovider/mainthread_linux.go

@@ -1,47 +0,0 @@
-//go:build linux && cgo
-
-package goprovider
-
-/*
-#cgo pkg-config: gtk+-3.0
-#include <gtk/gtk.h>
-static void pumpGTK(void) {
-  // Bound each batch so Go creation/removal requests cannot be starved.
-  for (int i = 0; i < 64 && g_main_context_pending(NULL); ++i)
-    g_main_context_iteration(NULL, FALSE);
-}
-*/
-import "C"
-
-import (
-	"runtime"
-	"sync"
-	"time"
-)
-
-var gtkThreadOnce sync.Once
-var gtkThreadTasks = make(chan func())
-
-func RunMainThreadLoop(run func() int) int { return run() }
-
-func postMainThreadTask(task func()) bool {
-	gtkThreadOnce.Do(func() {
-		go func() {
-			runtime.LockOSThread()
-			// WebKit must always use its original UI thread, including after
-			// the last page closes. A page cannot stop this shared event loop.
-			ticker := time.NewTicker(10 * time.Millisecond)
-			defer ticker.Stop()
-			for {
-				select {
-				case task := <-gtkThreadTasks:
-					task()
-				case <-ticker.C:
-				}
-				C.pumpGTK()
-			}
-		}()
-	})
-	gtkThreadTasks <- task
-	return true
-}

internal/webview/goprovider/mainthread_other.go

@@ -1,4 +1,4 @@
-//go:build !darwin && (!linux || !cgo)
+//go:build !darwin
 
 package goprovider
 

internal/webview/goprovider/provider.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/url"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -36,9 +37,7 @@ func (p *Provider) Open(opts enginewebview.OpenOptions) (enginewebview.Page, err
 }
 
 type pageWrapper struct {
-	opts             enginewebview.OpenOptions
+	opts enginewebview.OpenOptions
-	events           enginewebview.EventHub
-	navigationErrors chan error
 
 	callbackName string
 	readyID      string
@@ -50,23 +49,19 @@ type pageWrapper struct {
 	url     string
 	closed  bool
 
-	ready        chan error
+	ready chan error
-	done         chan struct{}
+	done  chan struct{}
-	loads        chan string
+	loads chan string
-	domReady     chan struct{}
-	sameDocument chan struct{}
 }
 
 type evalMessage struct {
-	Event        string `json:"event,omitempty"`
+	ID    string `json:"id"`
-	SameDocument bool   `json:"sameDocument,omitempty"`
+	Ready bool   `json:"ready,omitempty"`
-	ID           string `json:"id"`
+	Load  bool   `json:"load,omitempty"`
-	Ready        bool   `json:"ready,omitempty"`
+	URL   string `json:"url,omitempty"`
-	Load         bool   `json:"load,omitempty"`
+	OK    bool   `json:"ok,omitempty"`
-	URL          string `json:"url,omitempty"`
+	Value any    `json:"value,omitempty"`
-	OK           bool   `json:"ok,omitempty"`
+	Error string `json:"error,omitempty"`
-	Value        any    `json:"value,omitempty"`
-	Error        string `json:"error,omitempty"`
 }
 
 type evalResult struct {
@@ -93,16 +88,13 @@ const startupTimeout = time.Minute
 func newPageWrapper(opts enginewebview.OpenOptions) *pageWrapper {
 	seq := providerSeq.Add(1)
 	return &pageWrapper{
-		opts:             opts,
+		opts:         opts,
-		navigationErrors: make(chan error, 8),
+		callbackName: fmt.Sprintf("__gopeedWebViewCallback_%d", seq),
-		callbackName:     fmt.Sprintf("__gopeedWebViewCallback_%d", seq),
+		readyID:      fmt.Sprintf("__ready__%d", seq),
-		readyID:          fmt.Sprintf("__ready__%d", seq),
+		pending:      make(map[string]chan evalResult),
-		pending:          make(map[string]chan evalResult),
+		ready:        make(chan error, 1),
-		ready:            make(chan error, 1),
+		done:         make(chan struct{}),
-		done:             make(chan struct{}),
+		loads:        make(chan string, 8),
-		loads:            make(chan string, 8),
-		domReady:         make(chan struct{}, 8),
-		sameDocument:     make(chan struct{}, 8),
 	}
 }
 
@@ -113,21 +105,12 @@ func (p *pageWrapper) start() error {
 		defer runtimepkg.UnlockOSThread()
 
 		var w webview.WebView
-		if p.opts.DataPath != "" {
+		if p.opts.Headless {
-			var err error
-			w, err = webview.NewWithOptions(webview.Options{Debug: p.opts.Debug, Headless: p.opts.Headless, DataPath: p.opts.DataPath, ProxyURL: p.opts.ProxyURL})
-			if err != nil {
-				p.ready <- err
-				close(p.done)
-				return
-			}
-		} else if p.opts.Headless {
 			w = webview.NewHeadless(p.opts.Debug)
 		} else {
 			w = webview.New(p.opts.Debug)
 		}
 		p.view = w
-		w.SetEventHandler(p.handleNativeEvent)
 		w.SetTitle(firstNonEmpty(p.opts.Title, "Gopeed WebView"))
 		w.SetSize(defaultWindowDimension(p.opts.Width, 1280), defaultWindowDimension(p.opts.Height, 800), webview.HintNone)
 
@@ -139,25 +122,18 @@ func (p *pageWrapper) start() error {
 				setter.SetUserAgent(p.opts.UserAgent)
 			}
 		}
+		w.Init(buildLoadNotifyScript(p.callbackName))
 
 		if err := w.Bind(p.callbackName, func(payload string) error {
 			return p.handleCallback(payload)
 		}); err != nil {
-			w.Destroy()
 			p.ready <- err
-			close(p.done)
 			return
 		}
 
-		w.Init(buildLoadNotifyScript(p.callbackName))
 		applyWindowOptions(w, p.opts)
 		w.SetHtml(buildBootstrapHTML(p.callbackName, p.readyID))
-		if runtimepkg.GOOS == "linux" {
-			// All GTK pages share the process-wide event loop below.
-			return
-		}
 		w.Run()
-		p.handleNativeEvent(webview.Event{Name: "closed"})
 		w.Destroy()
 		close(p.done)
 	}
@@ -186,15 +162,10 @@ func (p *pageWrapper) AddInitScript(script string) error {
 func (p *pageWrapper) Goto(url string, opts enginewebview.GotoOptions) error {
 	startedAt := time.Now()
 	p.drainLoads()
-	for {
-		select {
-		case <-p.navigationErrors:
-			continue
-		default:
-		}
-		break
-	}
 	if err := p.dispatch(func(w webview.WebView) error {
+		p.mu.Lock()
+		p.url = url
+		p.mu.Unlock()
 		w.Navigate(url)
 		return nil
 	}); err != nil {
@@ -208,7 +179,7 @@ func (p *pageWrapper) Goto(url string, opts enginewebview.GotoOptions) error {
 	if waitUntil == "" {
 		waitUntil = "load"
 	}
-	err := p.waitForNavigation(timeout, waitUntil)
+	err := p.waitForNavigation(url, timeout, waitUntil)
 	if err != nil {
 		p.tracef("goto failed %dms url=%s err=%v", time.Since(startedAt).Milliseconds(), url, err)
 		return err
@@ -248,12 +219,7 @@ func (p *pageWrapper) Execute(expression string, args ...any) (any, error) {
 		return nil, err
 	}
 
-	var result evalResult
+	result := <-ch
-	select {
-	case result = <-ch:
-	case <-p.done:
-		return nil, fmt.Errorf("webview page is closed")
-	}
 	if result.err != nil {
 		p.tracef("execute failed %dms err=%v", time.Since(startedAt).Milliseconds(), result.err)
 		return result.value, result.err
@@ -341,7 +307,6 @@ func (p *pageWrapper) Close() error {
 		return nil
 	}
 	p.closed = true
-	p.failPendingLocked()
 	w := p.view
 	wait := p.done
 	p.mu.Unlock()
@@ -353,18 +318,12 @@ func (p *pageWrapper) Close() error {
 		// the quit message lands on the correct queue.
 		terminateDone := make(chan struct{})
 		w.Dispatch(func() {
-			if runtimepkg.GOOS == "linux" {
+			w.Terminate()
-				w.Destroy()
-				close(p.done)
-			} else {
-				w.Terminate()
-			}
 			close(terminateDone)
 		})
 		<-terminateDone
 	}
 	<-wait
-	p.events.Emit(enginewebview.Event{Name: "closed", Data: map[string]any{"reason": "api"}})
 	return nil
 }
 
@@ -375,29 +334,94 @@ func (p *pageWrapper) tracef(format string, args ...any) {
 	fmt.Printf("goprovider "+format+"\n", args...)
 }
 
-func (p *pageWrapper) waitForNavigation(timeout time.Duration, waitUntil string) error {
+func (p *pageWrapper) waitForNavigation(targetURL string, timeout time.Duration, waitUntil string) error {
-	timer := time.NewTimer(timeout)
+	deadline := time.Now().Add(timeout)
-	defer timer.Stop()
+	ticker := time.NewTicker(100 * time.Millisecond)
+	defer ticker.Stop()
+
 	for {
 		select {
-		case <-p.done:
+		case <-p.loads:
-			return fmt.Errorf("webview page is closed")
+			if waitUntil == "load" {
-		case err := <-p.navigationErrors:
-			return err
-		case <-timer.C:
-			return fmt.Errorf("webview navigation timeout")
-		case <-p.sameDocument:
-			return nil
-		case <-p.domReady:
-			if waitUntil == "domcontentloaded" {
 				return nil
 			}
-		case <-p.loads:
+		case <-ticker.C:
-			return nil
+			state, err := p.navigationState()
+			if err == nil && state.ready(targetURL, waitUntil) {
+				return nil
+			}
+			if time.Now().After(deadline) {
+				return fmt.Errorf("webview navigation timeout")
+			}
 		}
 	}
 }
 
+type navigationState struct {
+	URL        string `json:"url"`
+	ReadyState string `json:"readyState"`
+}
+
+func (s navigationState) ready(targetURL string, waitUntil string) bool {
+	if s.URL == "" || s.URL == "about:blank" {
+		return false
+	}
+	switch waitUntil {
+	case "domcontentloaded":
+		if s.ReadyState == "loading" || s.ReadyState == "" {
+			return false
+		}
+	default:
+		if s.ReadyState != "complete" {
+			return false
+		}
+	}
+	if targetURL == "" {
+		return true
+	}
+	if s.URL == targetURL {
+		return true
+	}
+	target, err := parseURL(targetURL)
+	if err != nil {
+		return true
+	}
+	current, err := parseURL(s.URL)
+	if err != nil {
+		return true
+	}
+	if current.Scheme == target.Scheme && current.Host == target.Host && current.Path == target.Path {
+		return true
+	}
+	return false
+}
+
+func parseURL(raw string) (*url.URL, error) {
+	return url.Parse(raw)
+}
+
+func (p *pageWrapper) navigationState() (navigationState, error) {
+	value, err := p.Execute(`() => ({
+		url: String(location.href || ""),
+		readyState: document.readyState || "",
+	})`)
+	if err != nil {
+		return navigationState{}, err
+	}
+	stateMap, ok := value.(map[string]any)
+	if !ok {
+		return navigationState{}, fmt.Errorf("invalid navigation state")
+	}
+	state := navigationState{}
+	if urlValue, ok := stateMap["url"].(string); ok {
+		state.URL = urlValue
+	}
+	if readyValue, ok := stateMap["readyState"].(string); ok {
+		state.ReadyState = readyValue
+	}
+	return state, nil
+}
+
 func (p *pageWrapper) dispatch(fn func(w webview.WebView) error) error {
 	p.mu.Lock()
 	if p.closed {
@@ -414,12 +438,7 @@ func (p *pageWrapper) dispatch(fn func(w webview.WebView) error) error {
 	w.Dispatch(func() {
 		done <- fn(w)
 	})
-	select {
+	return <-done
-	case err := <-done:
-		return err
-	case <-p.done:
-		return fmt.Errorf("webview page is closed")
-	}
 }
 
 func (p *pageWrapper) nativeCookies() ([]nativeCookieJSON, error) {
@@ -477,31 +496,7 @@ func (p *pageWrapper) handleCallback(payload string) error {
 		}
 		return nil
 	}
-	if msg.Event == "domcontentloaded" {
-		select {
-		case p.domReady <- struct{}{}:
-		default:
-		}
-		return nil
-	}
-	if msg.Event == "url-changed" {
-		if msg.SameDocument {
-			select {
-			case p.sameDocument <- struct{}{}:
-			default:
-			}
-		}
-		p.mu.Lock()
-		changed := p.url != msg.URL
-		p.url = msg.URL
-		p.mu.Unlock()
-		if changed {
-			p.events.Emit(enginewebview.Event{Name: "url-changed", Data: map[string]any{"url": msg.URL, "sameDocument": msg.SameDocument}})
-		}
-		return nil
-	}
 	if msg.Load {
-		p.events.Emit(enginewebview.Event{Name: "load", Data: map[string]any{"url": msg.URL}})
 		select {
 		case p.loads <- msg.URL:
 		default:
@@ -526,22 +521,6 @@ func (p *pageWrapper) handleCallback(payload string) error {
 }
 
 func (p *pageWrapper) drainLoads() {
-	for {
-		select {
-		case <-p.domReady:
-			continue
-		default:
-		}
-		break
-	}
-	for {
-		select {
-		case <-p.sameDocument:
-			continue
-		default:
-		}
-		break
-	}
 	for {
 		select {
 		case <-p.loads:
@@ -603,77 +582,19 @@ func buildExecuteScript(callbackName string, reqID string, expression string, ar
 func buildLoadNotifyScript(callbackName string) string {
 	callbackJSON, _ := json.Marshal(callbackName)
 	return fmt.Sprintf(`(() => {
-  if (window !== window.top) return;
+  window.addEventListener("load", () => {
-  // WebView2 runs init scripts in its internal error document too. Its load
+    const __cb = globalThis[%s];
-  // must not complete goto() before the native NavigationCompleted failure.
+    if (typeof __cb !== "function") {
-  if (location.protocol === "chrome-error:") return;
+      return;
-  const send = (message) => {
+    }
-    const cb = globalThis[%s];
+    __cb(JSON.stringify({
-    if (typeof cb === "function") cb(JSON.stringify(message));
+      load: true,
-  };
+      url: String(location.href || ""),
-  let lastURL = String(location.href);
+    }));
-  const changed = () => {
+  }, { once: true });
-    const url = String(location.href);
-    if (url === lastURL) return;
-    lastURL = url;
-    send({event: "url-changed", url, sameDocument: true});
-  };
-  send({event: "url-changed", url: lastURL, sameDocument: false});
-  for (const name of ["pushState", "replaceState"]) {
-    const original = history[name];
-    history[name] = function(...args) {
-      const result = Reflect.apply(original, this, args);
-      changed();
-      return result;
-    };
-  }
-  window.addEventListener("hashchange", changed);
-  window.addEventListener("popstate", changed);
-  window.addEventListener("pageshow", (event) => {
-    if (event.persisted) send({event: "url-changed", url: String(location.href), sameDocument: false});
-    else changed();
-  });
-  window.addEventListener("DOMContentLoaded", () => send({event: "domcontentloaded"}), {once:true});
-  window.addEventListener("load", () => send({load: true, url: String(location.href)}), {once: true});
 })();`, string(callbackJSON))
 }
 
-func (p *pageWrapper) On(name string, handler func(enginewebview.Event)) (func(), error) {
-	return p.events.On(name, handler)
-}
-
-func (p *pageWrapper) failPendingLocked() {
-	for id, ch := range p.pending {
-		ch <- evalResult{err: fmt.Errorf("webview page is closed")}
-		delete(p.pending, id)
-	}
-}
-
-func (p *pageWrapper) handleNativeEvent(event webview.Event) {
-	switch event.Name {
-	case "load-error":
-		p.events.Emit(enginewebview.Event{Name: "load-error", Data: map[string]any{"url": event.URL, "message": event.Message}})
-		select {
-		case p.navigationErrors <- errors.New(event.Message):
-		default:
-		}
-	case "closed":
-		p.mu.Lock()
-		api := p.closed
-		p.closed = true
-		p.failPendingLocked()
-		p.mu.Unlock()
-		reason := "user"
-		if api {
-			reason = "api"
-		}
-		p.events.Emit(enginewebview.Event{Name: "closed", Data: map[string]any{"reason": reason}})
-		if runtimepkg.GOOS == "linux" && !api {
-			p.view.Dispatch(func() { p.view.Destroy(); close(p.done) })
-		}
-	}
-}
-
 func defaultWindowDimension(value int, fallback int) int {
 	if value > 0 {
 		return value
@@ -689,12 +610,3 @@ func firstNonEmpty(values ...string) string {
 	}
 	return ""
 }
-
-func (p *Provider) RemoveProfile(profileID, dataPath string) error {
-	done := make(chan error, 1)
-	run := func() { done <- webview.RemoveProfile(dataPath) }
-	if !postMainThreadTask(run) {
-		run()
-	}
-	return <-done
-}

internal/webview/goprovider/provider_integration_test.go

@@ -13,7 +13,3 @@ func TestProviderContract(t *testing.T) {
 		CookieDomainMode: integrationtest.CookieDomainModeRequired,
 	})
 }
-
-func TestProviderProfiles(t *testing.T) { integrationtest.RunProfileContract(t, New()) }
-
-func TestProviderEvents(t *testing.T) { integrationtest.RunEventContract(t, New()) }

internal/webview/integrationtest/contract.go

@@ -1,14 +1,10 @@
 package integrationtest
 
 import (
-	"crypto/sha256"
 	"fmt"
-	webviewproxy "github.com/GopeedLab/gopeed/internal/webview/proxy"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	"path/filepath"
-	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -108,10 +104,8 @@ func RunProviderContract(t *testing.T, provider enginewebview.Provider, opts Con
 		t.Fatalf("expected click count to be 1, got %v", clickCount)
 	}
 
-	// Hidden WebViews can throttle timers on shared CI runners. Keep the
-	// positive asynchronous waits within the same budget as navigation.
 	found, err := page.WaitForSelector("#delayed", map[string]any{
-		"timeoutMs":      10000,
+		"timeoutMs":      5000,
 		"pollIntervalMs": 25,
 		"visible":        true,
 	})
@@ -119,18 +113,11 @@ func RunProviderContract(t *testing.T, provider enginewebview.Provider, opts Con
 		t.Fatalf("waitForSelector failed: %v", err)
 	}
 	if !found {
-		diagnostic, diagnosticErr := page.Execute(`() => {
+		t.Fatal("expected delayed selector to appear")
-			const element = document.querySelector('#delayed');
-			const rect = element && element.getBoundingClientRect();
-			return {url: location.href, readyState: document.readyState,
-				visibility: document.visibilityState, exists: !!element,
-				width: rect && rect.width, height: rect && rect.height};
-		}`)
-		t.Fatalf("expected delayed selector to appear: state=%v, diagnostic error=%v", diagnostic, diagnosticErr)
 	}
 
 	value, err := page.WaitForFunction(`() => window.__readyValue`, map[string]any{
-		"timeoutMs":      10000,
+		"timeoutMs":      5000,
 		"pollIntervalMs": 25,
 	})
 	if err != nil {
@@ -232,19 +219,7 @@ func openTestPage(t *testing.T, provider enginewebview.Provider, opts enginewebv
 	}))
 	t.Cleanup(server.Close)
 
-	proxy, err := webviewproxy.New(nil)
+	runtime := enginewebview.NewRuntime(provider, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { proxy.Close() })
-	path := filepath.Join(t.TempDir(), "profile")
-	sum := sha256.Sum256([]byte(path))
-	profileID := fmt.Sprintf("%x-%x-%x-%x-%x", sum[:4], sum[4:6], sum[6:8], sum[8:10], sum[10:16])
-	proxyURL := proxy.URL()
-	if runtime.GOOS == "darwin" {
-		proxyURL = proxy.SOCKSURL()
-	}
-	runtime := enginewebview.NewRuntime(&configuredOpener{provider: provider, profileID: profileID, dataPath: path, proxyURL: proxyURL}, true)
 	page, err := runtime.Open(map[string]any{
 		"headless":  opts.Headless,
 		"debug":     opts.Debug,
@@ -257,14 +232,7 @@ func openTestPage(t *testing.T, provider enginewebview.Provider, opts enginewebv
 		t.Fatalf("failed to open webview: %v", err)
 	}
 	t.Cleanup(func() {
-		if err := runtime.Close(); err != nil {
+		_ = runtime.Close()
-			t.Errorf("close contract page: %v", err)
-		}
-		if remover, ok := provider.(enginewebview.ProfileRemover); ok {
-			if err := remover.RemoveProfile(profileID, path); err != nil {
-				t.Errorf("remove contract profile: %v", err)
-			}
-		}
 	})
 
 	return page, server, server.URL
@@ -412,15 +380,3 @@ func hasCookie(cookies []enginewebview.Cookie, name string, value string) bool {
 	}
 	return false
 }
-
-type configuredOpener struct {
-	provider                      enginewebview.Provider
-	profileID, dataPath, proxyURL string
-}
-
-func (o *configuredOpener) Open(opts enginewebview.OpenOptions) (enginewebview.Page, error) {
-	opts.ProfileID = o.profileID
-	opts.DataPath = o.dataPath
-	opts.ProxyURL = o.proxyURL
-	return o.provider.Open(opts)
-}

internal/webview/integrationtest/events.go

@@ -1,110 +0,0 @@
-package integrationtest
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-	"time"
-
-	wv "github.com/GopeedLab/gopeed/pkg/download/engine/webview"
-)
-
-// RunEventContract exercises the same public semantics on native and RPC hosts.
-func RunEventContract(t *testing.T, provider wv.Provider) {
-	t.Helper()
-	page, _, url := openTestPage(t, provider, wv.OpenOptions{Headless: true, Title: "WebView event contract"})
-	events := make(chan wv.Event, 100)
-	for _, name := range []string{"url-changed", "load", "load-error", "closed"} {
-		if _, err := page.On(name, func(e wv.Event) { events <- e }); err != nil {
-			t.Fatal(err)
-		}
-	}
-	next := func(name string) wv.Event {
-		t.Helper()
-		select {
-		case event := <-events:
-			if event.Name != name {
-				t.Fatalf("got event %s (%v), want %s", event.Name, event.Data, name)
-			}
-			return event
-		case <-time.After(10 * time.Second):
-			t.Fatalf("timed out waiting for %s", name)
-		}
-		return wv.Event{}
-	}
-	quiet := func() {
-		t.Helper()
-		select {
-		case e := <-events:
-			t.Fatalf("unexpected event: %+v", e)
-		case <-time.After(150 * time.Millisecond):
-		}
-	}
-	quiet()
-	if err := page.AddInitScript(`globalThis.__initBeforePage = document.readyState`); err != nil {
-		t.Fatal(err)
-	}
-	if err := page.Goto(url, map[string]any{"timeoutMs": 10000}); err != nil {
-		t.Fatal(err)
-	}
-	e := next("url-changed")
-	if strings.TrimRight(fmt.Sprint(e.Data["url"]), "/") != strings.TrimRight(url, "/") || e.Data["sameDocument"] != false {
-		t.Fatal(e)
-	}
-	next("load")
-	if result, err := page.Execute(`() => globalThis.__initBeforePage`); err != nil || result != "loading" {
-		t.Fatalf("init script: %v %v", result, err)
-	}
-	if err := page.AddInitScript(`globalThis.__onlyNext = true`); err != nil {
-		t.Fatal(err)
-	}
-	if result, err := page.Execute(`() => typeof globalThis.__onlyNext`); err != nil || result != "undefined" {
-		t.Fatalf("init ran in current page: %v %v", result, err)
-	}
-	for _, expression := range []string{
-		`() => { history.pushState({}, '', '#push'); }`,
-		`() => { history.replaceState({}, '', '#replace'); }`,
-		`() => { location.hash = 'hash'; }`,
-	} {
-		if _, err := page.Execute(expression); err != nil {
-			t.Fatal(err)
-		}
-		e := next("url-changed")
-		if e.Data["sameDocument"] != true {
-			t.Fatal(e)
-		}
-		quiet()
-	}
-	if _, err := page.Execute(`() => { location.reload(); }`); err != nil {
-		t.Fatal(err)
-	}
-	next("load") // Same address on refresh is not a URL change.
-	if result, err := page.Execute(`() => globalThis.__onlyNext`); err != nil || result != true {
-		t.Fatalf("next init: %v %v", result, err)
-	}
-	if _, err := page.Execute(`() => { const f=document.createElement('iframe'); f.src='/next'; document.body.append(f); }`); err != nil {
-		t.Fatal(err)
-	}
-	quiet()
-	// The fixture serves plain HTTP. Attempting TLS against it produces a
-	// real navigation failure through both HTTP CONNECT and SOCKS proxies.
-	// An unreachable HTTP origin would instead become a valid 502 document
-	// when the host's HTTP proxy handles the connection error.
-	failedURL := strings.Replace(url, "http://", "https://", 1) + "/failure"
-	if err := page.Goto(failedURL, map[string]any{"timeoutMs": 3000}); err == nil {
-		t.Fatal("failed navigation succeeded")
-	}
-	e = next("load-error")
-	if e.Data["message"] == "" || !strings.Contains(fmt.Sprint(e.Data["url"]), "/failure") {
-		t.Fatal(e)
-	}
-	quiet() // A handled failure must not load a browser-generated fallback page.
-	if err := page.Close(); err != nil {
-		t.Fatal(err)
-	}
-	e = next("closed")
-	if e.Data["reason"] != "api" {
-		t.Fatal(e)
-	}
-	quiet()
-}

internal/webview/integrationtest/profiles.go

@@ -1,247 +0,0 @@
-package integrationtest
-
-import (
-	"crypto/sha256"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	webviewproxy "github.com/GopeedLab/gopeed/internal/webview/proxy"
-	webview "github.com/GopeedLab/gopeed/pkg/download/engine/webview"
-)
-
-// RunProfileContract exercises the same host API through both native and RPC
-// providers. It never bypasses the host bridge with direct Flutter plugin calls.
-func RunProfileContract(t *testing.T, provider webview.Provider) {
-	t.Helper()
-	waitForProviderAvailable(t, provider, defaultAvailabilityTimeout)
-	remover, ok := provider.(webview.ProfileRemover)
-	if !ok {
-		t.Fatal("provider does not implement host profile removal")
-	}
-	proxyURL, secureHits := profileProxy(t)
-	a := newContractProfile(t, provider, remover, proxyURL)
-	b := newContractProfile(t, provider, remover, proxyURL)
-	first := a.open(t)
-	assertProfileValue(t, first, `async () => { localStorage.setItem('owner','a'); return 'a'; }`, "a")
-	assertProfileValue(t, first, profileDatabaseScript(true), "saved")
-	if err := first.SetCookie(webview.Cookie{Name: "session", Value: "a", Domain: "profiles.invalid", Path: "/", HTTPOnly: true, Expires: time.Now().Add(time.Hour)}); err != nil {
-		t.Fatal(err)
-	}
-	second := b.open(t)
-	assertProfileValue(t, second, `() => localStorage.getItem('owner')`, nil)
-	assertProfileValue(t, second, profileDatabaseScript(false), nil)
-	assertProfileCookies(t, second, "", "new profile B")
-	assertProfileValue(t, second, `() => { localStorage.setItem('owner','b'); return 'b'; }`, "b")
-	if err := second.SetCookie(webview.Cookie{Name: "session", Value: "b", Domain: "profiles.invalid", Path: "/", HTTPOnly: true}); err != nil {
-		t.Fatal(err)
-	}
-	shared := a.open(t)
-	assertProfileValue(t, shared, `() => localStorage.getItem('owner')`, "a")
-	assertProfileValue(t, shared, profileDatabaseScript(false), "saved")
-	assertProfileCookies(t, shared, "a", "shared profile A")
-	storedCookies, err := shared.GetCookies()
-	if err != nil || len(storedCookies) != 1 || storedCookies[0].Expires.Before(time.Now()) {
-		t.Fatalf("persistent cookie lost its expiration: %#v, error %v", storedCookies, err)
-	}
-	assertProfileValue(t, shared, `() => document.cookie`, "") // HttpOnly stays hidden.
-	if err := second.ClearCookies(); err != nil {
-		t.Fatal(err)
-	}
-	assertProfileCookies(t, first, "a", "clearing B leaves A intact")
-	if err := second.SetCookie(webview.Cookie{Name: "session", Value: "b", Domain: "profiles.invalid", Path: "/", HTTPOnly: true}); err != nil {
-		t.Fatal(err)
-	}
-	a.close(t)
-	reopened := a.open(t)
-	assertProfileValue(t, reopened, `() => localStorage.getItem('owner')`, "a")
-	assertProfileValue(t, reopened, profileDatabaseScript(false), "saved")
-	assertProfileCookies(t, reopened, "a", "reopened profile A")
-	// Include a session cookie immediately before deletion to catch stale
-	// in-process CookieStore caches when the same profile is recreated.
-	if err := reopened.SetCookie(webview.Cookie{Name: "session", Value: "remove-me", Domain: "profiles.invalid", Path: "/", HTTPOnly: true}); err != nil {
-		t.Fatal(err)
-	}
-	a.close(t)
-	a.remove(t)
-	a.remove(t) // Retrying a successful uninstall is harmless.
-	reinstalled := a.open(t)
-	assertProfileValue(t, reinstalled, `() => localStorage.getItem('owner')`, nil)
-	assertProfileValue(t, reinstalled, profileDatabaseScript(false), nil)
-	assertProfileCookies(t, reinstalled, "", "reinstalled profile A")
-	assertProfileValue(t, second, `() => localStorage.getItem('owner')`, "b")
-	assertProfileCookies(t, second, "b", "B after removing A")
-	// Refuse the HTTPS tunnel deliberately. Seeing it at our proxy proves HTTPS
-	// routing without adding a certificate-validation bypass to the test host.
-	// WebView2 may commit its built-in error page and report navigation as
-	// complete. The invariant here is that the HTTPS tunnel reaches the proxy.
-	_ = reinstalled.Goto("https://profiles.invalid/", webview.GotoOptions{TimeoutMS: 5000})
-	deadline := time.Now().Add(5 * time.Second)
-	for secureHits.Load() == 0 && time.Now().Before(deadline) {
-		time.Sleep(10 * time.Millisecond)
-	}
-	if secureHits.Load() == 0 {
-		t.Fatal("HTTPS bypassed the host proxy")
-	}
-}
-
-type contractProfile struct {
-	provider webview.Provider
-	remover  webview.ProfileRemover
-	options  webview.OpenOptions
-	pages    []webview.Page
-}
-
-func newContractProfile(t *testing.T, provider webview.Provider, remover webview.ProfileRemover, proxyURL string) *contractProfile {
-	t.Helper()
-	path := filepath.Join(t.TempDir(), "profile")
-	hash := sha256.Sum256([]byte(path))
-	id := fmt.Sprintf("%x-%x-%x-%x-%x", hash[:4], hash[4:6], hash[6:8], hash[8:10], hash[10:16])
-	p := &contractProfile{provider: provider, remover: remover, options: webview.OpenOptions{ProfileID: id, DataPath: path, ProxyURL: proxyURL, Headless: true, Title: "Gopeed profile contract"}}
-	t.Cleanup(func() { p.close(t); p.remove(t) })
-	return p
-}
-func (p *contractProfile) open(t *testing.T) webview.Page {
-	t.Helper()
-	page, err := p.provider.Open(p.options)
-	if err != nil {
-		t.Fatal(err)
-	}
-	p.pages = append(p.pages, page)
-	if err := page.Goto("http://profiles.invalid/", webview.GotoOptions{TimeoutMS: 10000}); err != nil {
-		t.Fatal(err)
-	}
-	return page
-}
-func (p *contractProfile) close(t *testing.T) {
-	t.Helper()
-	for _, page := range p.pages {
-		if err := page.Close(); err != nil {
-			t.Errorf("close profile page: %v", err)
-		}
-	}
-	p.pages = nil
-}
-func (p *contractProfile) remove(t *testing.T) {
-	t.Helper()
-	if err := p.remover.RemoveProfile(p.options.ProfileID, p.options.DataPath); err != nil {
-		t.Errorf("remove profile: %v", err)
-	}
-}
-func assertProfileValue(t *testing.T, page webview.Page, script string, want any) {
-	t.Helper()
-	got, err := page.Execute(script)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("script %s: got %#v, want %#v", script, got, want)
-	}
-}
-func assertProfileCookies(t *testing.T, page webview.Page, want, stage string) {
-	t.Helper()
-	// Native cookie managers propagate updates across browser processes
-	// asynchronously. Wait for the expected state rather than assuming the
-	// first IPC read already includes the preceding write.
-	deadline := time.Now().Add(5 * time.Second)
-	for {
-		cookies, err := page.GetCookies()
-		if err != nil {
-			t.Fatalf("%s: %v", stage, err)
-		}
-		matches := len(cookies) == 0 && want == "" || len(cookies) == 1 && want != "" && cookies[0].Name == "session" && cookies[0].Value == want && cookies[0].HTTPOnly
-		if matches {
-			return
-		}
-		if time.Now().After(deadline) {
-			t.Fatalf("%s: cookies %#v, want %q", stage, cookies, want)
-		}
-		time.Sleep(20 * time.Millisecond)
-	}
-}
-func profileDatabaseScript(write bool) string {
-	operation := "store.get('owner')"
-	if write {
-		operation = "store.put('saved','owner')"
-	}
-	return fmt.Sprintf(`async () => await new Promise((resolve,reject)=>{
- const request=indexedDB.open('profile-contract',1);
- request.onupgradeneeded=()=>request.result.createObjectStore('state');
- request.onerror=()=>reject(String(request.error));
- request.onsuccess=()=>{
-  const db=request.result, tx=db.transaction('state','readwrite'), store=tx.objectStore('state');
-  const op=%s; let value;
-  op.onsuccess=()=>value=%s;
-  tx.oncomplete=()=>{db.close();resolve(value===undefined?null:value)};
-  tx.onerror=()=>{db.close();reject(String(tx.error))};
- };
-})`, operation, map[bool]string{true: "'saved'", false: "op.result"}[write])
-}
-
-func profileProxy(t *testing.T) (string, *atomic.Int32) {
-	t.Helper()
-	origin := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "text/html")
-		w.Header().Set("Cache-Control", "no-store")
-		fmt.Fprint(w, "<!doctype html><title>Profile contract</title>")
-	}))
-	t.Cleanup(origin.Close)
-	secureHits := &atomic.Int32{}
-	upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != http.MethodConnect {
-			origin.Config.Handler.ServeHTTP(w, r)
-			return
-		}
-		if r.Host == "profiles.invalid:443" {
-			secureHits.Add(1)
-			http.Error(w, "HTTPS routing fixture rejects tunnels", http.StatusBadGateway)
-			return
-		}
-		if r.Host != "profiles.invalid:80" {
-			http.Error(w, "unexpected target", http.StatusBadGateway)
-			return
-		}
-		remote, err := net.DialTimeout("tcp", origin.Listener.Addr().String(), 5*time.Second)
-		if err != nil {
-			http.Error(w, "origin unavailable", http.StatusBadGateway)
-			return
-		}
-		defer remote.Close()
-		client, buffer, err := w.(http.Hijacker).Hijack()
-		if err != nil {
-			return
-		}
-		defer client.Close()
-		if _, err := buffer.WriteString("HTTP/1.1 200 Connection Established\r\n\r\n"); err != nil {
-			return
-		}
-		if err := buffer.Flush(); err != nil {
-			return
-		}
-		go func() { io.Copy(remote, buffer); remote.Close() }()
-		io.Copy(client, remote)
-	}))
-	t.Cleanup(upstream.Close)
-	upstreamURL, err := url.Parse(upstream.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	proxy, err := webviewproxy.New(func(*http.Request) (*url.URL, error) { return upstreamURL, nil })
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { proxy.Close() })
-	if runtime.GOOS == "darwin" {
-		return proxy.SOCKSURL(), secureHits
-	}
-	return proxy.URL(), secureHits
-}

internal/webview/proxy/server.go

@@ -1,341 +0,0 @@
-// Package proxy provides the host-owned WebView forward proxy. Browser engines
-// always use this endpoint; Gopeed decides the upstream route for each request.
-package proxy
-
-import (
-	"bufio"
-	"context"
-	"crypto/tls"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"net/url"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/armon/go-socks5"
-	xproxy "golang.org/x/net/proxy"
-)
-
-type Selector func(*http.Request) (*url.URL, error)
-
-type Server struct {
-	listener      net.Listener
-	socksListener net.Listener
-	server        *http.Server
-	transport     *http.Transport
-	selectProxy   Selector
-	mu            sync.Mutex
-	connections   map[io.Closer]struct{}
-	closed        bool
-}
-
-func New(selectProxy Selector) (*Server, error) {
-	if selectProxy == nil {
-		selectProxy = func(*http.Request) (*url.URL, error) { return nil, nil }
-	}
-	listener, err := net.Listen("tcp4", "127.0.0.1:0")
-	if err != nil {
-		return nil, err
-	}
-	s := &Server{listener: listener, selectProxy: selectProxy, connections: make(map[io.Closer]struct{})}
-	s.transport = &http.Transport{Proxy: selectProxy, DisableKeepAlives: true, TLSHandshakeTimeout: 15 * time.Second, ResponseHeaderTimeout: 30 * time.Second}
-	s.server = &http.Server{Handler: s, ReadHeaderTimeout: 15 * time.Second}
-	s.socksListener, err = net.Listen("tcp4", "127.0.0.1:0")
-	if err != nil {
-		listener.Close()
-		return nil, err
-	}
-	socks, err := socks5.New(&socks5.Config{Logger: log.New(io.Discard, "", 0), Resolver: unresolvedDNS{}, Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
-		_, port, _ := net.SplitHostPort(address)
-		scheme := "https"
-		if port == "80" {
-			scheme = "http"
-		}
-		request := &http.Request{URL: &url.URL{Scheme: scheme, Host: address}, Header: make(http.Header)}
-		upstream, err := selectProxy(request)
-		if err != nil {
-			return nil, err
-		}
-		timed, cancel := context.WithTimeout(ctx, 30*time.Second)
-		defer cancel()
-		conn, err := dialTunnel(timed, address, upstream)
-		if err != nil {
-			return nil, err
-		}
-		return s.track(conn)
-	}})
-	if err != nil {
-		listener.Close()
-		s.socksListener.Close()
-		return nil, err
-	}
-	go s.server.Serve(listener)
-	go socks.Serve(&trackedListener{Listener: s.socksListener, server: s})
-	return s, nil
-}
-
-func (s *Server) URL() string { return "http://" + s.listener.Addr().String() }
-
-func (s *Server) SOCKSURL() string { return "socks5://" + s.socksListener.Addr().String() }
-
-func (s *Server) Close() error {
-	s.mu.Lock()
-	s.closed = true
-	connections := make([]io.Closer, 0, len(s.connections))
-	for c := range s.connections {
-		connections = append(connections, c)
-	}
-	s.mu.Unlock()
-	for _, c := range connections {
-		c.Close()
-	}
-	s.socksListener.Close()
-	s.transport.CloseIdleConnections()
-	return s.server.Close()
-}
-
-func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.Method == http.MethodConnect {
-		s.connect(w, r)
-		return
-	}
-	if !r.URL.IsAbs() || (r.URL.Scheme != "http" && r.URL.Scheme != "https") {
-		http.Error(w, "absolute HTTP URL required", http.StatusBadRequest)
-		return
-	}
-	out := r.Clone(r.Context())
-	out.RequestURI = ""
-	upgrade := out.Header.Get("Upgrade")
-	stripHopHeaders(out.Header)
-	if upgrade != "" {
-		out.Header.Set("Connection", "Upgrade")
-		out.Header.Set("Upgrade", upgrade)
-	}
-	resp, err := s.transport.RoundTrip(out)
-	if err != nil {
-		http.Error(w, "upstream request failed", http.StatusBadGateway)
-		return
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode == http.StatusSwitchingProtocols {
-		remote, ok := resp.Body.(io.ReadWriteCloser)
-		if !ok {
-			http.Error(w, "invalid upstream upgrade", 502)
-			return
-		}
-		client, buffer, err := w.(http.Hijacker).Hijack()
-		if err != nil {
-			return
-		}
-		defer client.Close()
-		resp.Body = nil
-		if err := resp.Write(buffer); err != nil {
-			return
-		}
-		if err := buffer.Flush(); err != nil {
-			return
-		}
-		s.bridge(client, buffer, remote)
-		return
-	}
-	stripHopHeaders(resp.Header)
-	for k, v := range resp.Header {
-		w.Header()[k] = v
-	}
-	w.WriteHeader(resp.StatusCode)
-	io.Copy(w, resp.Body)
-}
-
-func stripHopHeaders(h http.Header) {
-	for _, key := range strings.Split(h.Get("Connection"), ",") {
-		h.Del(strings.TrimSpace(key))
-	}
-	for _, key := range []string{"Connection", "Proxy-Connection", "Proxy-Authorization", "Proxy-Authenticate", "Keep-Alive", "TE", "Trailer", "Transfer-Encoding", "Upgrade"} {
-		h.Del(key)
-	}
-}
-
-func (s *Server) connect(w http.ResponseWriter, r *http.Request) {
-	if _, _, err := net.SplitHostPort(r.Host); err != nil {
-		http.Error(w, "invalid tunnel destination", 400)
-		return
-	}
-	target := r.Clone(r.Context())
-	target.URL = &url.URL{Scheme: "https", Host: r.Host}
-	upstream, err := s.selectProxy(target)
-	if err != nil {
-		http.Error(w, "proxy selection failed", 502)
-		return
-	}
-	ctx, cancel := context.WithTimeout(r.Context(), 30*time.Second)
-	defer cancel()
-	remote, err := dialTunnel(ctx, r.Host, upstream)
-	if err != nil {
-		http.Error(w, "upstream connection failed", 502)
-		return
-	}
-	defer remote.Close()
-	client, buffer, err := w.(http.Hijacker).Hijack()
-	if err != nil {
-		return
-	}
-	defer client.Close()
-	if _, err := buffer.WriteString("HTTP/1.1 200 Connection Established\r\n\r\n"); err != nil {
-		return
-	}
-	if err := buffer.Flush(); err != nil {
-		return
-	}
-	s.bridge(client, buffer, remote)
-}
-
-func (s *Server) bridge(client net.Conn, buffer *bufio.ReadWriter, remote io.ReadWriteCloser) {
-	s.mu.Lock()
-	if s.closed {
-		s.mu.Unlock()
-		return
-	}
-	s.connections[client] = struct{}{}
-	s.connections[remote] = struct{}{}
-	s.mu.Unlock()
-	defer func() { s.mu.Lock(); delete(s.connections, client); delete(s.connections, remote); s.mu.Unlock() }()
-
-	done := make(chan struct{})
-	go func() { io.Copy(remote, buffer); remote.Close(); close(done) }()
-	io.Copy(client, remote)
-	client.Close()
-	<-done
-}
-
-type bufferedConn struct {
-	net.Conn
-	reader *bufio.Reader
-}
-
-func (c *bufferedConn) Read(p []byte) (int, error) { return c.reader.Read(p) }
-
-func dialTunnel(ctx context.Context, target string, upstream *url.URL) (net.Conn, error) {
-	dialer := &net.Dialer{}
-	if upstream == nil {
-		return dialer.DialContext(ctx, "tcp", target)
-	}
-	if upstream.Scheme == "socks5" || upstream.Scheme == "socks5h" {
-		u := *upstream
-		u.Scheme = "socks5"
-		d, err := xproxy.FromURL(&u, dialer)
-		if err != nil {
-			return nil, err
-		}
-		return d.(xproxy.ContextDialer).DialContext(ctx, "tcp", target)
-	}
-	if upstream.Scheme != "http" && upstream.Scheme != "https" {
-		return nil, errors.New("unsupported proxy scheme")
-	}
-	host := upstream.Host
-	if upstream.Port() == "" {
-		port := "80"
-		if upstream.Scheme == "https" {
-			port = "443"
-		}
-		host = net.JoinHostPort(upstream.Hostname(), port)
-	}
-	conn, err := dialer.DialContext(ctx, "tcp", host)
-	if err != nil {
-		return nil, err
-	}
-	ok := false
-	defer func() {
-		if !ok {
-			conn.Close()
-		}
-	}()
-	if deadline, exists := ctx.Deadline(); exists {
-		conn.SetDeadline(deadline)
-	}
-	if upstream.Scheme == "https" {
-		secure := tls.Client(conn, &tls.Config{ServerName: upstream.Hostname(), MinVersion: tls.VersionTLS12})
-		if err := secure.HandshakeContext(ctx); err != nil {
-			return nil, err
-		}
-		conn = secure
-	}
-	request := &http.Request{Method: http.MethodConnect, URL: &url.URL{Opaque: target}, Host: target, Header: make(http.Header)}
-	if upstream.User != nil {
-		password, _ := upstream.User.Password()
-		request.Header.Set("Proxy-Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(upstream.User.Username()+":"+password)))
-	}
-	if err := request.Write(conn); err != nil {
-		return nil, err
-	}
-	reader := bufio.NewReader(conn)
-	response, err := http.ReadResponse(reader, request)
-	if err != nil {
-		return nil, err
-	}
-	if response.StatusCode != 200 {
-		response.Body.Close()
-		return nil, fmt.Errorf("upstream CONNECT status %d", response.StatusCode)
-	}
-	conn.SetDeadline(time.Time{})
-	ok = true
-	return &bufferedConn{Conn: conn, reader: reader}, nil
-}
-
-// Leave hostname resolution to the selected upstream (SOCKS remote DNS / CONNECT).
-type unresolvedDNS struct{}
-
-func (unresolvedDNS) Resolve(ctx context.Context, name string) (context.Context, net.IP, error) {
-	return ctx, nil, nil
-}
-
-type trackedListener struct {
-	net.Listener
-	server *Server
-}
-
-func (l *trackedListener) Accept() (net.Conn, error) {
-	c, err := l.Listener.Accept()
-	if err != nil {
-		return nil, err
-	}
-	return l.server.track(c)
-}
-
-type trackedConn struct {
-	net.Conn
-	server *Server
-}
-
-func (c *trackedConn) Close() error {
-	err := c.Conn.Close()
-	c.server.mu.Lock()
-	delete(c.server.connections, c)
-	c.server.mu.Unlock()
-	return err
-}
-func (s *Server) track(c net.Conn) (net.Conn, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.closed {
-		c.Close()
-		return nil, net.ErrClosed
-	}
-	tracked := &trackedConn{Conn: c, server: s}
-	s.connections[tracked] = struct{}{}
-	return tracked, nil
-}
-
-func (c *trackedConn) CloseWrite() error  { return closeWrite(c.Conn) }
-func (c *bufferedConn) CloseWrite() error { return closeWrite(c.Conn) }
-func closeWrite(c net.Conn) error {
-	if writer, ok := c.(interface{ CloseWrite() error }); ok {
-		return writer.CloseWrite()
-	}
-	return c.Close()
-}