fix(ci): restore Windows release asset uploads

.github/workflows/build.yml

@@ -798,5 +798,5 @@ jobs:
             linux/arm64
             linux/arm/v7
           tags: |
-            ${{ !contains(env.VERSION, 'beta') && 'liwei2633/gopeed:latest' || '' }}
+            liwei2633/gopeed:latest
             liwei2633/gopeed:v${{ env.VERSION }}

.github/workflows/test.yml

@@ -86,32 +86,6 @@ jobs:
           flutter pub get
           flutter gen-l10n
           flutter test test/api/downloader_config_test.dart
-  test-flutter-task-context-menu:
-    name: Test task context menus and text inputs
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    env:
-      CHROME_EXECUTABLE: /usr/bin/google-chrome
-    steps:
-      - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-      - name: Prepare Flutter tests
-        working-directory: ui/flutter
-        run: |
-          flutter pub get
-          flutter gen-l10n
-      - name: Test task menu actions and native input policy
-        working-directory: ui/flutter
-        run: |
-          flutter test --no-pub test/features/tasks/presentation/widgets/task_context_menu_test.dart test/shared/widgets/app_text_field_test.dart
-          flutter test --no-pub test/widget_test.dart --plain-name 'task context menu exposes'
-      - name: Test browser menu cancellation and input policy
-        working-directory: ui/flutter
-        run: |
-          "$CHROME_EXECUTABLE" --version
-          flutter test --no-pub --platform chrome test/features/tasks/presentation/widgets/task_context_menu_test.dart test/shared/widgets/app_text_field_test.dart
   test-webview-integration:
     name: Test webview integration (${{ matrix.name }})
     strategy:

README.md

@@ -20,7 +20,7 @@ Beyond core download management, Gopeed offers browser integration, JavaScript e
 
 Visit ✈ [Official Website](https://gopeed.com)
 
-![Application screenshot](_docs/img/ui-concept-en.webp)
+![Application screenshot](_docs/img/ui-concept-en.png)
 
 ## ✨ Features
 

README_ja-JP.md

@@ -20,7 +20,7 @@ Gopeed（**Go Speed** の略）は、Go と Flutter で開発された高速で
 
 ✈ [公式サイト](https://gopeed.com)
 
-![アプリのスクリーンショット](_docs/img/ui-concept-en.webp)
+![アプリのスクリーンショット](_docs/img/ui-concept-en.png)
 
 ## ✨ 主な機能
 

README_vi-VN.md

@@ -20,7 +20,7 @@ Ngoài việc quản lý tải xuống hằng ngày, Gopeed còn hỗ trợ tíc
 
 Truy cập ✈ [Trang web chính thức](https://gopeed.com)
 
-![Ảnh chụp màn hình ứng dụng](_docs/img/ui-concept-en.webp)
+![Ảnh chụp màn hình ứng dụng](_docs/img/ui-concept-en.png)
 
 ## ✨ Tính năng chính
 

README_zh-CN.md

@@ -20,7 +20,7 @@ Gopeed（全称 **Go Speed**，也叫“够快下载器”）是一款使用 Go
 
 访问 ✈ [官方网站](https://gopeed.com)
 
-![应用截图](_docs/img/ui-concept-zh-CN.webp)
+![应用截图](_docs/img/ui-concept-zh-CN.png)
 
 ## ✨ 主要特性
 

README_zh-TW.md

@@ -20,7 +20,7 @@ Gopeed（**Go Speed** 的縮寫）是一款以 Go 與 Flutter 開發的高速、
 
 瀏覽 ✈ [官方網站](https://gopeed.com)
 
-![應用程式截圖](_docs/img/ui-concept-en.webp)
+![應用程式截圖](_docs/img/ui-concept-en.png)
 
 ## ✨ 主要功能
 

_docs/task-batch-api.md

@@ -1,52 +0,0 @@
-# Batch task creation
-
-`POST /api/v1/tasks/batch` accepts ordinary and grouped batches:
-
-```json
-{
-  "group": true,
-  "groupName": "album",
-  "opts": {"path": "/downloads"},
-  "reqs": [
-    {"rid": "resolved-resource-id", "opts": {"selectFiles": [1]}},
-    {"req": {"url": "https://example.com/cover.jpg"}}
-  ]
-}
-```
-
-Each member accepts `rid` or `req`. A nonempty `rid` takes priority and creates a
-task from the cached resolve result. A member's `opts`, when present, replaces
-batch `opts` as a whole; omitted fields do not inherit individual batch values.
-Members without `opts` use batch `opts`. BT file selections use the indexes from
-the resolve result. Requests without `rid` continue to work.
-
-For groups, batch `opts.path` selects the parent directory. Members inheriting
-batch options, or with an empty path, use the reserved group directory. Explicit
-relative member paths are resolved under that directory; do not prefix them with
-the batch parent path. For example, parent `downloads` and member path `nested`
-place the member in `downloads/<group name>/nested`. Absolute paths under the
-parent directory preserve their relative structure within the group. In ordinary
-batches, an empty member path uses the configured default download directory.
-
-All members are attempted. If at least one task is persisted, the response is
-successful and contains the created task IDs. A task that fails to start after
-being persisted is included; use the existing task controls to retry it.
-Successful tasks are kept when other members fail. If every member fails, the
-API returns an error and removes any newly reserved empty group and directory.
-
-Both ordinary and grouped batches now return an object in `data`:
-
-```json
-{"code": 0, "msg": "", "data": {"taskIds": ["task-1", "task-2"], "parentId": "group-id"}}
-```
-
-Ordinary batches omit `parentId`. **This replaces the former array response for
-ordinary batches.** The outer `code`/`msg`/`data` envelope is unchanged. Clients
-must read `data.taskIds`; there are no per-member results. A successful response
-completes the batch, including partial success, so clients must not automatically
-resubmit missing members.
-
-With `group: true`, the server generates the group ID and reserves its directory.
-Creation does not accept a client group ID or append to an existing group. Group
-metadata remains available through the existing task list and detail responses;
-`parentId` identifies membership for group operations.

cmd/api/main.go

@@ -1,9 +1,6 @@
 package main
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/GopeedLab/gopeed/cmd"
 	"github.com/GopeedLab/gopeed/pkg/rest/model"
 )
@@ -16,8 +13,5 @@ func main() {
 		Storage:   model.StorageBolt,
 		WebEnable: true,
 	}
-	if err := cmd.Start(cfg); err != nil {
+	cmd.Start(cfg)
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
 }

cmd/server.go

@@ -16,16 +16,15 @@ import (
 //go:embed banner.txt
 var banner string
 
-func Start(cfg *model.StartConfig) error {
+func Start(cfg *model.StartConfig) {
+	fmt.Println(banner)
 	srv, listener, err := rest.BuildServer(cfg)
 	if err != nil {
-		return err
+		panic(err)
 	}
-	fmt.Println(banner)
 	downloadCfg, err := rest.Downloader.GetConfig()
 	if err != nil {
-		listener.Close()
+		panic(err)
-		return err
 	}
 	if rest.Downloader.IsFirstLoad() {
 		// Set default download config
@@ -63,9 +62,8 @@ func Start(cfg *model.StartConfig) error {
 
 	fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
 	if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
-		return err
+		panic(err)
 	}
-	return nil
 }
 
 func watchExit() {

cmd/server_test.go

@@ -1,35 +0,0 @@
-package cmd
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/GopeedLab/gopeed/pkg/rest/model"
-)
-
-func TestStartInvalidWebAPITokenReturnsError(t *testing.T) {
-	tests := []struct {
-		name    string
-		webAuth *model.WebAuth
-	}{
-		{name: "no credentials"},
-		{name: "missing username", webAuth: &model.WebAuth{Password: "secret"}},
-		{name: "missing password", webAuth: &model.WebAuth{Username: "gopeed"}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := Start(&model.StartConfig{
-				WebEnable: true,
-				ApiToken:  "test-token",
-				WebAuth:   tt.webAuth,
-			})
-			if err == nil {
-				t.Fatal("Start() error = nil, want web authentication validation error")
-			}
-			if !strings.Contains(err.Error(), "web authentication username and password are required") {
-				t.Fatalf("Start() error = %q, want missing web authentication credentials", err)
-			}
-		})
-	}
-}

cmd/web/flags.go

@@ -52,8 +52,8 @@ func loadCliArgs() *args {
 	flag.StringVar(cfg.Username, "username", "gopeed", "Web Authentication Username")
 	cfg.Password = flag.String("p", "", "Web Authentication Password, if no password is set, web authentication will not be enabled")
 	flag.StringVar(cfg.Password, "password", "", "Web Authentication Password, if no password is set, web authentication will not be enabled")
-	cfg.ApiToken = flag.String("T", "", "API token (requires web authentication with username and password)")
+	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 (requires web authentication with username and password)")
+	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")

cmd/web/main.go

@@ -62,10 +62,7 @@ func main() {
 		WebFS:             sub,
 		WebAuth:           webAuth,
 	}
-	if err := cmd.Start(cfg); err != nil {
+	cmd.Start(cfg)
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
 }
 
 func isNotBlank(str *string) bool {

go.mod

@@ -10,13 +10,11 @@ require (
 	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/fclairamb/ftpserverlib v0.31.0
+	github.com/go-git/go-git/v5 v5.8.1
-	github.com/go-git/go-git/v5 v5.19.2
 	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.58.0
+	github.com/imroc/req/v3 v3.52.2
-	github.com/jlaffaye/ftp v0.2.4
 	github.com/matoous/go-nanoid/v2 v2.0.0
 	github.com/mattn/go-ieproxy v0.0.12
 	github.com/mholt/archives v0.1.5
@@ -25,17 +23,10 @@ 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/spf13/afero v1.15.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-20260410095643-746e56fc9e2f
+	golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93
-)
-
-require (
-	github.com/cyphar/filepath-securejoin v0.6.1 // indirect
-	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/onsi/gomega v1.36.3 // indirect
 )
 
 require (
@@ -48,40 +39,49 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	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/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
 	github.com/icholy/digest v1.1.0 // indirect
-	github.com/klauspost/compress v1.18.2 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/mikelolasagasti/xz v1.0.1 // indirect
 	github.com/minio/minlz v1.0.1 // indirect
 	github.com/nwaples/rardecode/v2 v2.2.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.23.4 // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
-	github.com/pion/transport/v4 v4.0.2 // indirect
+	github.com/pion/transport/v4 v4.0.1 // indirect
-	github.com/quic-go/qpack v0.6.0 // indirect
+	github.com/quic-go/qpack v0.5.1 // indirect
-	github.com/quic-go/quic-go v0.59.0 // indirect
+	github.com/quic-go/quic-go v0.51.0 // indirect
-	github.com/refraction-networking/utls v1.8.2 // indirect
+	github.com/refraction-networking/utls v1.6.7 // indirect
 	github.com/segmentio/asm v1.1.3 // indirect
 	github.com/segmentio/encoding v0.5.4 // indirect
 	github.com/sorairolake/lzip-go v0.3.8 // indirect
+	github.com/spf13/afero v1.15.0 // indirect
 	github.com/ulikunitz/xz v0.5.15 // indirect
 	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.uber.org/automaxprocs v1.6.0 // indirect
+	go.uber.org/mock v0.5.1 // indirect
 	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
+	golang.org/x/mod v0.33.0
 	golang.org/x/oauth2 v0.35.0 // indirect
-	golang.org/x/sync v0.22.0 // indirect
+	golang.org/x/sync v0.20.0 // indirect
 )
 
 require (
 	dario.cat/mergo v1.0.0 // indirect
-	github.com/Microsoft/go-winio v0.6.2
+	github.com/Microsoft/go-winio v0.6.1
-	github.com/ProtonMail/go-crypto v1.1.6 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
 	github.com/RoaringBitmap/roaring v1.9.4
+	github.com/acomagu/bufpipe v1.0.4 // indirect
 	github.com/alecthomas/atomic v0.1.0-alpha2 // indirect
 	github.com/anacrolix/chansync v0.7.0 // indirect
 	github.com/anacrolix/dht/v2 v2.23.0 // indirect
 	github.com/anacrolix/envpprof v1.5.0 // indirect
-	github.com/anacrolix/generics v0.2.0
+	github.com/anacrolix/generics v0.2.0 // indirect
 	github.com/anacrolix/go-libutp v1.3.2 // indirect
 	github.com/anacrolix/log v0.17.1-0.20251118025802-918f1157b7bb // indirect
 	github.com/anacrolix/missinggo v1.3.0 // indirect
@@ -97,7 +97,7 @@ require (
 	github.com/bits-and-blooms/bitset v1.24.4 // indirect
 	github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
-	github.com/cloudflare/circl v1.6.3 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
@@ -105,13 +105,13 @@ require (
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/felixge/httpsnoop v1.0.1 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.9.2 // indirect
+	github.com/go-git/go-billy/v5 v5.4.1 // indirect
 	github.com/go-llsqlite/adapter v0.2.0 // indirect
 	github.com/go-llsqlite/crawshaw v0.6.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
-	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
 	github.com/google/uuid v1.6.0 // indirect
@@ -129,7 +129,7 @@ require (
 	github.com/multiformats/go-varint v0.1.0 // indirect
 	github.com/ncruces/go-strftime v1.0.0 // indirect
 	github.com/pion/datachannel v1.6.0 // indirect
-	github.com/pion/dtls/v3 v3.1.4 // indirect
+	github.com/pion/dtls/v3 v3.0.10 // indirect
 	github.com/pion/ice/v4 v4.2.0 // indirect
 	github.com/pion/interceptor v0.1.42 // indirect
 	github.com/pion/logging v0.2.4 // indirect
@@ -140,15 +140,15 @@ require (
 	github.com/pion/sctp v1.9.1 // indirect
 	github.com/pion/sdp/v3 v3.0.17 // indirect
 	github.com/pion/srtp/v3 v3.0.10 // indirect
-	github.com/pion/stun/v3 v3.1.5 // indirect
+	github.com/pion/stun/v3 v3.1.1 // indirect
 	github.com/pion/turn/v4 v4.1.4 // indirect
 	github.com/pion/webrtc/v4 v4.2.2-0.20260109001657-a5962f314db7 // indirect
-	github.com/pjbgf/sha1cd v0.6.0 // indirect
+	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/protolambda/ctxlock v0.1.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
+	github.com/sergi/go-diff v1.1.0 // indirect
-	github.com/skeema/knownhosts v1.3.1 // indirect
+	github.com/skeema/knownhosts v1.2.0 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/tidwall/btree v1.8.1 // indirect
 	github.com/wlynxg/anet v0.0.5 // indirect
@@ -156,11 +156,12 @@ require (
 	go.opentelemetry.io/otel v1.39.0 // indirect
 	go.opentelemetry.io/otel/metric v1.39.0 // indirect
 	go.opentelemetry.io/otel/trace v1.39.0 // indirect
-	golang.org/x/crypto v0.55.0 // indirect
+	golang.org/x/crypto v0.48.0 // indirect
-	golang.org/x/net v0.58.0
+	golang.org/x/net v0.50.0
-	golang.org/x/sys v0.47.0 // indirect
+	golang.org/x/sys v0.44.0 // indirect
-	golang.org/x/text v0.41.0
+	golang.org/x/text v0.34.0
-	golang.org/x/time v0.15.0
+	golang.org/x/time v0.15.0 // indirect
+	golang.org/x/tools v0.42.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	lukechampine.com/blake3 v1.4.1 // indirect
 	modernc.org/libc v1.67.4 // indirect

go.sum

@@ -25,17 +25,29 @@ 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-20260915010614-2567e492369a/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=
-github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
-github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
+github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 h1:KLq8BE0KwCL+mmXnjLWEAOYO+2l2AE4YMmqG1ZpZHBs=
-github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
 github.com/RoaringBitmap/roaring v0.4.7/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w=
 github.com/RoaringBitmap/roaring v0.4.17/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrXIr8KVNvRsDi1NI=
 github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=
@@ -45,6 +57,8 @@ github.com/STARRY-S/zip v0.2.3 h1:luE4dMvRPDOWQdeDdUxUoZkzUIpTccdKdhHHsQJ1fm4=
 github.com/STARRY-S/zip v0.2.3/go.mod h1:lqJ9JdeRipyOQJrYSOtpNAiaesFO6zVDsE8GIGFaoSk=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
+github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ=
+github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
 github.com/alecthomas/assert/v2 v2.0.0-alpha3 h1:pcHeMvQ3OMstAWgaeaXIAL8uzB9xMm2zlxt+/4ml8lk=
 github.com/alecthomas/assert/v2 v2.0.0-alpha3/go.mod h1:+zD0lmDXTeQj7TgDgCt0ePWxb0hMC1G+PGTsTCv1B9o=
 github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELkLb3MNdlH8=
@@ -141,6 +155,7 @@ github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2w
 github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo=
 github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 h1:GKTyiRCL6zVf5wWaqKnf+7Qs6GbEPfd4iMOitWzXJx8=
 github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8/go.mod h1:spo1JLcs67NmW1aVLEgtA8Yy1elc+X8y5SRW1sFW4Og=
+github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -157,12 +172,11 @@ github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObk
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
+github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
-github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE=
-github.com/cyphar/filepath-securejoin v0.6.1/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -185,14 +199,12 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/edsrzf/mmap-go v1.2.0 h1:hXLYlkbaPzt1SaQk+anYwKSRNhufIDCchSPkUD6dD84=
 github.com/edsrzf/mmap-go v1.2.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
-github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
+github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819 h1:RIB4cRk+lBqKK3Oy0r2gRX4ui7tuhiZq2SuTtTCi0/0=
-github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
+github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fclairamb/ftpserverlib v0.31.0 h1:ws4fLJvuU/mgg1uIgRjCJfc6CrFSgIBAOxVsnawXegE=
-github.com/fclairamb/ftpserverlib v0.31.0/go.mod h1:C5hUT0sd9P5XsHMxsmpcrT6wdZexu3qtUu1z0Ih6aG0=
 github.com/felixge/fgprof v0.9.5 h1:8+vR6yu2vvSKn08urWyEuxx75NWPEvybbkBirEpsbVY=
 github.com/felixge/fgprof v0.9.5/go.mod h1:yKl+ERSa++RYOs32d8K6WEXCB4uXdLls4ZaZPpayhMM=
 github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=
@@ -202,8 +214,8 @@ github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
+github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
-github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
+github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
 github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
 github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
 github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
@@ -212,12 +224,12 @@ github.com/glycerine/goconvey v0.0.0-20190315024820-982ee783a72e/go.mod h1:Ogl1T
 github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
-github.com/go-git/go-billy/v5 v5.9.2 h1:OXFSRyz4g20upsGDJgQG9Bak1l/ZEv8GHVYB52O71sE=
+github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4=
-github.com/go-git/go-billy/v5 v5.9.2/go.mod h1:ExsU+jcGwXTBOnyilvAnEM1wug1IxHr4yP2ZXsNRtV0=
+github.com/go-git/go-billy/v5 v5.4.1/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg=
-github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f h1:Pz0DHeFij3XFhoBRGUDPzSJ+w2UcK5/0JvF8DRI58r8=
-github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo=
-github.com/go-git/go-git/v5 v5.19.2 h1:wkfn7vOlUBu8ivAWKBWisTiwJK4jYHzTF8Ndv1LyGqY=
+github.com/go-git/go-git/v5 v5.8.1 h1:Zo79E4p7TRk0xoRgMq0RShiTHGKcKI4+DI6BfJc/Q+A=
-github.com/go-git/go-git/v5 v5.19.2/go.mod h1:QqCBE1EFN5ddFmrliLQ3/ntRCUjZU3EJuwuB/jWEHjk=
+github.com/go-git/go-git/v5 v5.8.1/go.mod h1:FHFuoD6yGz5OSKEBK+aWN9Oah0q54Jxl0abmj6GnqAo=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -238,6 +250,8 @@ github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZs
 github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q=
 github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
@@ -250,8 +264,8 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -276,13 +290,10 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
-github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/jsonschema-go v0.4.3 h1:/DBOLZTfDow7pe2GmaJNhltueGTtDKICi8V8p+DQPd0=
 github.com/google/jsonschema-go v0.4.3/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE=
@@ -310,6 +321,11 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
@@ -327,12 +343,10 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
 github.com/icholy/digest v1.1.0 h1:HfGg9Irj7i+IX1o1QAmPfIBNu/Q5A5Tu3n/MED9k9H4=
 github.com/icholy/digest v1.1.0/go.mod h1:QNrsSGQ5v7v9cReDI0+eyjsXGUoRSUZQHeQ5C4XLa0Y=
-github.com/imroc/req/v3 v3.58.0 h1:rBqJhv2gZjMymGot4vKmNSUs/mAITMpGASqElhuMvS4=
+github.com/imroc/req/v3 v3.52.2 h1:xJocr1aIv0a2K9knfBQ4JnZHk+kWTITdjf0mgDg229I=
-github.com/imroc/req/v3 v3.58.0/go.mod h1:rC7NTGgfMSkVWR4GO46rMeJsUfaeOpa6pLsgpq9q3zI=
+github.com/imroc/req/v3 v3.52.2/go.mod h1:dBGsDloOSZJcFs6PnTjZXYBJK70OXbZpizHBLNqcH2k=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jlaffaye/ftp v0.2.4 h1:JqI85DdkfZj8ntaHk8W9U2SC3jNfiPUU70+wtIWmlfE=
-github.com/jlaffaye/ftp v0.2.4/go.mod h1:Y1ZnkzxownGIuX7xQ1mQzzkZ21+DbjVIyeKL/V+IIz4=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -345,8 +359,8 @@ github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
@@ -356,6 +370,7 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -368,6 +383,8 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
 github.com/matoous/go-nanoid v1.5.0/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U=
 github.com/matoous/go-nanoid/v2 v2.0.0 h1:d19kur2QuLeHmJBkvYkFdhFBzLoo1XVm2GgTpL+9Tj0=
 github.com/matoous/go-nanoid/v2 v2.0.0/go.mod h1:FtS4aGPVfEkxKxhdWPAspZpZSh1cOjtM7Ej/So3hR0g=
+github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
+github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-ieproxy v0.0.12 h1:OZkUFJC3ESNZPQ+6LzC3VJIFSnreeFLQyqvBWtvfL2M=
@@ -405,10 +422,13 @@ github.com/multiformats/go-varint v0.1.0/go.mod h1:5KVAVXegtfmNQQm/lCY+ATvDzvJJh
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
 github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nwaples/rardecode/v2 v2.2.0 h1:4ufPGHiNe1rYJxYfehALLjup4Ls3ck42CWwjKiOqu0A=
 github.com/nwaples/rardecode/v2 v2.2.0/go.mod h1:7uz379lSxPe6j9nvzxUZ+n7mnJNgjsRNb6IbvGVHRmw=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus=
+github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU=
 github.com/onsi/gomega v1.36.3/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
@@ -420,8 +440,8 @@ github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU
 github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pion/datachannel v1.6.0 h1:XecBlj+cvsxhAMZWFfFcPyUaDZtd7IJvrXqlXD/53i0=
 github.com/pion/datachannel v1.6.0/go.mod h1:ur+wzYF8mWdC+Mkis5Thosk+u/VOL287apDNEbFpsIk=
-github.com/pion/dtls/v3 v3.1.4 h1:QhvtMflMfu9Kf0RcDC5BJBle4caPskByrKQR6uuYqpY=
+github.com/pion/dtls/v3 v3.0.10 h1:k9ekkq1kaZoxnNEbyLKI8DI37j/Nbk1HWmMuywpQJgg=
-github.com/pion/dtls/v3 v3.1.4/go.mod h1:cr/qotLISUw/9C1m83ZPNZtj9WnXkYLpfCptPqbkInc=
+github.com/pion/dtls/v3 v3.0.10/go.mod h1:YEmmBYIoBsY3jmG56dsziTv/Lca9y4Om83370CXfqJ8=
 github.com/pion/ice/v4 v4.2.0 h1:jJC8S+CvXCCvIQUgx+oNZnoUpt6zwc34FhjWwCU4nlw=
 github.com/pion/ice/v4 v4.2.0/go.mod h1:EgjBGxDgmd8xB0OkYEVFlzQuEI7kWSCFu+mULqaisy4=
 github.com/pion/interceptor v0.1.42 h1:0/4tvNtruXflBxLfApMVoMubUMik57VZ+94U0J7cmkQ=
@@ -442,18 +462,18 @@ github.com/pion/sdp/v3 v3.0.17 h1:9SfLAW/fF1XC8yRqQ3iWGzxkySxup4k4V7yN8Fs8nuo=
 github.com/pion/sdp/v3 v3.0.17/go.mod h1:9tyKzznud3qiweZcD86kS0ff1pGYB3VX+Bcsmkx6IXo=
 github.com/pion/srtp/v3 v3.0.10 h1:tFirkpBb3XccP5VEXLi50GqXhv5SKPxqrdlhDCJlZrQ=
 github.com/pion/srtp/v3 v3.0.10/go.mod h1:3mOTIB0cq9qlbn59V4ozvv9ClW/BSEbRp4cY0VtaR7M=
-github.com/pion/stun/v3 v3.1.5 h1:Y1FHlhaI6+4UoC5i/zQf4F7JvdZtB24/05oyy/GF1x8=
+github.com/pion/stun/v3 v3.1.1 h1:CkQxveJ4xGQjulGSROXbXq94TAWu8gIX2dT+ePhUkqw=
-github.com/pion/stun/v3 v3.1.5/go.mod h1:zRUghXSQU32Lx5orJsz3uYMkIihweXb3mu5gIns02fs=
+github.com/pion/stun/v3 v3.1.1/go.mod h1:qC1DfmcCTQjl9PBaMa5wSn3x9IPmKxSdcCsxBcDBndM=
 github.com/pion/transport/v3 v3.1.1 h1:Tr684+fnnKlhPceU+ICdrw6KKkTms+5qHMgw6bIkYOM=
 github.com/pion/transport/v3 v3.1.1/go.mod h1:+c2eewC5WJQHiAA46fkMMzoYZSuGzA/7E2FPrOYHctQ=
-github.com/pion/transport/v4 v4.0.2 h1:ifYlPqNwsy6aKQ9y8yzxXlHae5431ZrH2avkD/Rn6Tk=
+github.com/pion/transport/v4 v4.0.1 h1:sdROELU6BZ63Ab7FrOLn13M6YdJLY20wldXW2Cu2k8o=
-github.com/pion/transport/v4 v4.0.2/go.mod h1:06hFI+jCFcok2X2MekVufNZ/uzNZXivGBPfviSVcjgM=
+github.com/pion/transport/v4 v4.0.1/go.mod h1:nEuEA4AD5lPdcIegQDpVLgNoDGreqM/YqmEx3ovP4jM=
 github.com/pion/turn/v4 v4.1.4 h1:EU11yMXKIsK43FhcUnjLlrhE4nboHZq+TXBIi3QpcxQ=
 github.com/pion/turn/v4 v4.1.4/go.mod h1:ES1DXVFKnOhuDkqn9hn5VJlSWmZPaRJLyBXoOeO/BmQ=
 github.com/pion/webrtc/v4 v4.2.2-0.20260109001657-a5962f314db7 h1:gnkvpxCSzeTKovDsxeFFl+W/i6WydzSHhu5lH/RpFfM=
 github.com/pion/webrtc/v4 v4.2.2-0.20260109001657-a5962f314db7/go.mod h1:/td+qaV3q20qTbRjYV9ABWjmCkvt+Pog/S+NqLMoUKk=
-github.com/pjbgf/sha1cd v0.6.0 h1:3WJ8Wz8gvDz29quX1OcEmkAlUg9diU4GxJHqs0/XiwU=
+github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
-github.com/pjbgf/sha1cd v0.6.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
+github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -461,7 +481,10 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
+github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -481,13 +504,13 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
 github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/protolambda/ctxlock v0.1.0 h1:rCUY3+vRdcdZXqT07iXgyr744J2DU2LCBIXowYAjBCE=
 github.com/protolambda/ctxlock v0.1.0/go.mod h1:vefhX6rIZH8rsg5ZpOJfEDYQOppZi19SfPiGOFrNnwM=
-github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
+github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
-github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
+github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
-github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw=
+github.com/quic-go/quic-go v0.51.0 h1:K8exxe9zXxeRKxaXxi/GpUqYiTrtdiWP8bo1KFya6Wc=
-github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
+github.com/quic-go/quic-go v0.51.0/go.mod h1:MFlGGpcpJqRAfmYi6NC2cptDPSxRWTOGNuP4wqrWmzQ=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/refraction-networking/utls v1.8.2 h1:j4Q1gJj0xngdeH+Ox/qND11aEfhpgoEvV+S9iJ2IdQo=
+github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM=
-github.com/refraction-networking/utls v1.8.2/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V4EVnelwbMQl4vCWXAM=
+github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -504,19 +527,17 @@ github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWR
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
 github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a8tTFrMLUcfWwyC0pnifVo2ClaLq+hP8=
 github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
-github.com/secsy/goftp v0.0.0-20200609142545-aa2de14babf4 h1:PT+ElG/UUFMfqy5HrxJxNzj3QBOf7dZwupeVC+mG1Lo=
-github.com/secsy/goftp v0.0.0-20200609142545-aa2de14babf4/go.mod h1:MnkX001NG75g3p8bhFycnyIjeQoOjGL6CEIsdE/nKSY=
 github.com/segmentio/asm v1.1.3 h1:WM03sfUOENvvKexOLp+pCqgb/WDjsi7EK8gIsICtzhc=
 github.com/segmentio/asm v1.1.3/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
 github.com/segmentio/encoding v0.5.4 h1:OW1VRern8Nw6ITAtwSZ7Idrl3MXCFwXHPgqESYfvNt0=
 github.com/segmentio/encoding v0.5.4/go.mod h1:HS1ZKa3kSN32ZHVZ7ZLPLXWvOVIiZtyJnO1gPH1sKt0=
-github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
+github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
-github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
+github.com/skeema/knownhosts v1.2.0 h1:h9r9cf0+u7wSE+M183ZtMGgOJKiL96brpaz5ekfJCpM=
-github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
+github.com/skeema/knownhosts v1.2.0/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v0.0.0-20190215210624-980c5ac6f3ac/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
@@ -543,8 +564,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
+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=
@@ -585,12 +606,12 @@ go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF
 go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
 go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
 go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
+go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
+go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
+go.uber.org/mock v0.5.1 h1:ASgazW/qBmR+A32MYFDB6E2POoTgOwT509VP0CT/fjs=
-go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
+go.uber.org/mock v0.5.1/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
-go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
-go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
 go4.org v0.0.0-20230225012048-214862532bf5 h1:nifaUDeh+rPaBCMPMQHZmvJf+QdpLFnuQPwx+LxVmtc=
 go4.org v0.0.0-20230225012048-214862532bf5/go.mod h1:F57wTi5Lrj6WLyswp5EYV1ncrEbFGHD4hhz6S1ZYeaU=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -600,9 +621,11 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M=
+golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
-golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis=
+golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -612,8 +635,8 @@ golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20220428152302-39d4317da171/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
-golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
+golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 h1:fQsdNF2N+/YewlRZiricy4P1iimyPKZ/xwniHj8Q2a0=
-golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
+golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -635,8 +658,8 @@ golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk=
+golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40=
+golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -658,12 +681,14 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To=
+golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
-golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU=
+golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -680,8 +705,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
+golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -714,20 +739,26 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
-golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+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=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
-golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=
+golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
-golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
+golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -735,11 +766,13 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8=
+golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
-golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M=
+golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
@@ -772,8 +805,8 @@ golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE=
+golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk=
+golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -818,6 +851,8 @@ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

internal/controller/controller.go

@@ -3,7 +3,6 @@ package controller
 import (
 	"github.com/GopeedLab/gopeed/internal/tempfiles"
 	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/rs/zerolog"
 	"net/http"
 	"net/url"
 	"os"
@@ -16,9 +15,6 @@ type Controller struct {
 	TempDir           string
 	GetConfig         func(v any)
 	GetProxy          func(requestProxy *base.RequestProxy) func(*http.Request) (*url.URL, error)
-	// Logger is the downloader's core logger. It may be nil, in which case
-	// fetchers log nothing.
-	Logger *zerolog.Logger
 	FileController
 	//ContextDialer() (proxy.Dialer, error)
 }

internal/protocol/bt/fetcher.go

@@ -67,11 +67,16 @@ func (f *Fetcher) Setup(ctl *controller.Controller) {
 	return
 }
 
-// initClient must be called with lock held.
 func (f *Fetcher) initClient() (err error) {
+	lock.Lock()
+	defer lock.Unlock()
+
 	if client != nil {
 		return
 	}
+	if closeCtx == nil {
+		closeCtx, closeFunc = context.WithCancel(context.Background())
+	}
 
 	cfg = torrent.NewDefaultClientConfig()
 	cfg.Seed = true
@@ -89,23 +94,12 @@ func (f *Fetcher) initClient() (err error) {
 	}
 
 	closeCtx, closeFunc = context.WithCancel(context.Background())
-	// closeClient may reset closeCtx before the goroutine runs, so pass it as an argument.
+	go func() {
-	go dnsResolver.Run(closeCtx)
+		dnsResolver.Run(closeCtx)
+	}()
 	return
 }
 
-// addTorrentSpec holds lock from client initialization until the torrent is added,
-// so closeClient cannot close or reset the client in between.
-func (f *Fetcher) addTorrentSpec(spec *torrent.TorrentSpec) (*torrent.Torrent, bool, error) {
-	lock.Lock()
-	defer lock.Unlock()
-
-	if err := f.initClient(); err != nil {
-		return nil, false, err
-	}
-	return client.AddTorrentSpec(spec)
-}
-
 func (f *Fetcher) Resolve(req *base.Request) error {
 	f.mu.Lock()
 	defer f.mu.Unlock()
@@ -754,6 +748,9 @@ func (f *Fetcher) addTorrent(req *base.Request) (err error) {
 	if err = base.ParseReqExtra[bt.ReqExtra](req); err != nil {
 		return
 	}
+	if err = f.initClient(); err != nil {
+		return
+	}
 	schema := util.ParseSchema(req.URL)
 	privateTorrent := false
 	var spec *torrent.TorrentSpec
@@ -832,7 +829,7 @@ func (f *Fetcher) addTorrent(req *base.Request) (err error) {
 	s := &deferredFileStorage{}
 	spec.Storage = s
 	var added bool
-	f.torrent, added, err = f.addTorrentSpec(spec)
+	f.torrent, added, err = client.AddTorrentSpec(spec)
 	if err != nil {
 		return err
 	}

internal/protocol/bt/fetcher_test.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
-	"sync"
 	"testing"
 
 	"github.com/GopeedLab/gopeed/internal/controller"
@@ -72,82 +71,6 @@ func TestFetcher_ResolveWithProxy(t *testing.T) {
 	}))
 }
 
-func TestFetcher_CloseAfterInit(t *testing.T) {
-	if err := closeClient(); err != nil {
-		t.Fatal(err)
-	}
-	for i := 0; i < 100; i++ {
-		f := buildFetcher(t).(*Fetcher)
-		f.meta.Req = &base.Request{}
-		lock.Lock()
-		err := f.initClient()
-		lock.Unlock()
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := closeClient(); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestFetcher_CloseWithoutClient(t *testing.T) {
-	if err := closeClient(); err != nil {
-		t.Fatal(err)
-	}
-
-	t.Run("restored task", func(t *testing.T) {
-		_, build := new(FetcherManager).Restore()
-		f := build(&fetcher.FetcherMeta{
-			Req:  &base.Request{URL: "./testdata/test.torrent"},
-			Opts: &base.Options{},
-		}, &fetcherData{})
-		f.Setup(controller.NewController())
-		if err := f.Close(); err != nil {
-			t.Errorf("Close() got = %v, want nil", err)
-		}
-	})
-
-	t.Run("failed resolve", func(t *testing.T) {
-		f := buildFetcher(t)
-		if err := f.Resolve(&base.Request{URL: "./testdata/not-exist.torrent"}); err == nil {
-			t.Fatal("Resolve() got = nil, want error")
-		}
-		if err := f.Close(); err != nil {
-			t.Errorf("Close() got = %v, want nil", err)
-		}
-	})
-}
-
-func TestFetcher_ResolveWhileClientCloses(t *testing.T) {
-	if err := closeClient(); err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { closeClient() })
-
-	var wg sync.WaitGroup
-	for _, u := range []string{"./testdata/test.torrent", "./testdata/ubuntu-22.04-live-server-amd64.iso.torrent"} {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			for i := 0; i < 10; i++ {
-				f := buildFetcher(t)
-				// The other goroutine may close the client after the torrent was added.
-				if err := f.Resolve(&base.Request{URL: u}); err != nil && err.Error() != "torrent closed during resolution" {
-					t.Errorf("Resolve(%s) got = %v", u, err)
-					return
-				}
-				f.Close()
-				if err := closeClient(); err != nil {
-					t.Errorf("closeClient() got = %v", err)
-					return
-				}
-			}
-		}()
-	}
-	wg.Wait()
-}
-
 func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 	t.Run("Resolve Single File", func(t *testing.T) {
 		err := fetcher.Resolve(&base.Request{

internal/protocol/ftp/conn.go

@@ -1,404 +0,0 @@
-package ftp
-
-import (
-	"context"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/textproto"
-	"net/url"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/jlaffaye/ftp"
-	"golang.org/x/net/proxy"
-
-	pftp "github.com/GopeedLab/gopeed/pkg/protocol/ftp"
-)
-
-const (
-	connectTimeout = 15 * time.Second
-	readTimeout    = 15 * time.Second
-	quitTimeout    = 2 * time.Second
-)
-
-// target is a parsed FTP URL. It holds the password, so it must never be
-// formatted into an error or a log line.
-type target struct {
-	host    string // host name or IP, the TLS server name
-	addr    string // host:port
-	user    string
-	pass    string
-	path    string // path relative to the login directory, "" for the directory itself
-	tlsMode string
-}
-
-// parseTarget reads an ftp, ftps or ftpes URL. The path follows RFC 1738: it
-// is relative to the login directory, and an encoded leading slash
-// (ftp://host/%2Fpub) makes it absolute.
-func parseTarget(rawURL, optTLS string) (*target, error) {
-	u, err := url.Parse(rawURL)
-	if err != nil {
-		// url.Error repeats the whole URL, password included.
-		return nil, errors.New("ftp: invalid URL")
-	}
-	t := &target{}
-	switch strings.ToLower(u.Scheme) {
-	case "ftps":
-		t.tlsMode = pftp.TLSImplicit
-	case "ftpes":
-		t.tlsMode = pftp.TLSExplicit
-	case "ftp":
-		switch strings.ToLower(optTLS) {
-		case "", pftp.TLSNone:
-			t.tlsMode = pftp.TLSNone
-		case pftp.TLSExplicit:
-			t.tlsMode = pftp.TLSExplicit
-		case pftp.TLSImplicit:
-			t.tlsMode = pftp.TLSImplicit
-		default:
-			return nil, fmt.Errorf("ftp: unknown tls mode %q", optTLS)
-		}
-	default:
-		return nil, fmt.Errorf("ftp: unsupported scheme %q", u.Scheme)
-	}
-	t.host = u.Hostname()
-	if t.host == "" {
-		return nil, errors.New("ftp: URL has no host")
-	}
-	port := u.Port()
-	if port == "" {
-		port = "21"
-		if t.tlsMode == pftp.TLSImplicit {
-			port = "990"
-		}
-	}
-	t.addr = net.JoinHostPort(t.host, port)
-	if u.User != nil {
-		// Username and Password are already percent-decoded.
-		t.user = u.User.Username()
-		t.pass, _ = u.User.Password()
-	}
-	if t.user == "" {
-		t.user, t.pass = "anonymous", "anonymous@"
-	}
-	t.path = strings.TrimPrefix(u.Path, "/")
-	return t, nil
-}
-
-type dialContextFunc func(ctx context.Context, network, addr string) (net.Conn, error)
-
-// session is one logged-in control connection. It owns the network
-// connections it opens, so abort can unblock any read or write in progress.
-type session struct {
-	*ftp.ServerConn
-
-	ctrl     net.Conn // control connection as dialed, under any TLS layer
-	dataHost string   // where data connections go
-
-	mu     sync.Mutex
-	data   net.Conn // current data connection as dialed
-	closed bool
-	stop   func() bool
-}
-
-// deadline bounds the next control-connection exchange. The control
-// connection is idle during a transfer, so every exchange sets a new one.
-func (s *session) deadline() {
-	_ = s.ctrl.SetDeadline(time.Now().Add(readTimeout))
-}
-
-// clearDeadline lets the control connection stay idle through a transfer.
-func (s *session) clearDeadline() {
-	_ = s.ctrl.SetDeadline(time.Time{})
-}
-
-// abort closes every connection at once. Pending calls fail immediately.
-func (s *session) abort() {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.closed = true
-	_ = s.ctrl.Close()
-	if s.data != nil {
-		_ = s.data.Close()
-	}
-}
-
-// quit logs out and waits, briefly, for the server to hang up. Servers that
-// cap logins count a session until they have seen it end, so the next login
-// would otherwise be refused.
-func (s *session) quit() {
-	if s.stop != nil {
-		s.stop()
-	}
-	_ = s.ctrl.SetDeadline(time.Now().Add(quitTimeout))
-	if s.ServerConn != nil {
-		_ = s.ServerConn.Quit()
-	}
-	s.abort()
-}
-
-func (s *session) setData(c net.Conn) error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.closed {
-		_ = c.Close()
-		return net.ErrClosed
-	}
-	s.data = c
-	return nil
-}
-
-// ctrlConn is the control connection handed to the ftp library.
-type ctrlConn struct {
-	net.Conn
-}
-
-// RemoteAddr must be a *net.TCPAddr: the library asserts it. A connection
-// through a proxy may report something else, and its address is not used
-// for data connections anyway (see dialData).
-func (c ctrlConn) RemoteAddr() net.Addr {
-	if a, ok := c.Conn.RemoteAddr().(*net.TCPAddr); ok {
-		return a
-	}
-	return &net.TCPAddr{}
-}
-
-// Close is called by the library's Quit right after it sends QUIT. Reading
-// until the server hangs up (bounded by the deadline quit set) tells us the
-// server has ended the session.
-func (c ctrlConn) Close() error {
-	_, _ = io.Copy(io.Discard, c.Conn)
-	return c.Conn.Close()
-}
-
-// dial opens a control connection, upgrades it to TLS when asked, and logs in.
-//
-// The library is given a dial function for every connection. That is how
-// data connections go through the same proxy as the control connection, but
-// it also means the library does no TLS on them: with a dial function it
-// neither wraps an implicit-TLS control connection nor any data connection.
-// We do both here. Explicit TLS (AUTH TLS) is still done by the library, and
-// so are PBSZ and PROT P after login. For the same reason the library's
-// DialWithTimeout and DialWithContext would have no effect: connectTimeout
-// and ctx are applied to our own dials instead.
-func (f *Fetcher) dial(ctx context.Context, t *target) (*session, error) {
-	netDial, proxied, err := f.netDialer(t)
-	if err != nil {
-		return nil, err
-	}
-	var tlsConf *tls.Config
-	if t.tlsMode != pftp.TLSNone {
-		tlsConf = f.tlsConfig(t.host)
-	}
-
-	dialCtx, cancel := context.WithTimeout(ctx, connectTimeout)
-	defer cancel()
-	raw, err := netDial(dialCtx, "tcp", t.addr)
-	if err != nil {
-		return nil, err
-	}
-	ctrl := raw
-	if t.tlsMode == pftp.TLSImplicit {
-		tc := tls.Client(raw, tlsConf)
-		if err := tc.HandshakeContext(dialCtx); err != nil {
-			_ = raw.Close()
-			return nil, err
-		}
-		ctrl = tc
-	}
-
-	s := &session{ctrl: raw, dataHost: t.host}
-	if a, ok := raw.RemoteAddr().(*net.TCPAddr); ok && !proxied {
-		// Same IP as the control connection, as the library itself does,
-		// so a name with several addresses cannot send us elsewhere.
-		s.dataHost = a.IP.String()
-	}
-	s.stop = context.AfterFunc(ctx, s.abort)
-	s.deadline()
-
-	handedOut := false
-	opts := []ftp.DialOption{
-		ftp.DialWithShutTimeout(readTimeout),
-		ftp.DialWithDialFunc(func(network, addr string) (net.Conn, error) {
-			if !handedOut {
-				// Dial asks for the control connection first, once.
-				handedOut = true
-				return ctrlConn{ctrl}, nil
-			}
-			return s.dialData(ctx, netDial, tlsConf, addr)
-		}),
-	}
-	switch t.tlsMode {
-	case pftp.TLSImplicit:
-		opts = append(opts, ftp.DialWithTLS(tlsConf))
-	case pftp.TLSExplicit:
-		opts = append(opts, ftp.DialWithExplicitTLS(tlsConf))
-	}
-	c, err := ftp.Dial(t.addr, opts...)
-	if err != nil {
-		s.stop()
-		s.abort()
-		return nil, err
-	}
-	s.ServerConn = c
-	s.deadline()
-	if err := c.Login(t.user, t.pass); err != nil {
-		s.stop()
-		s.abort()
-		return nil, err
-	}
-	return s, nil
-}
-
-// dialData opens a passive data connection. The library takes the host from
-// the control connection's peer, which through a proxy is the proxy, so only
-// the port is used here.
-func (s *session) dialData(ctx context.Context, netDial dialContextFunc, tlsConf *tls.Config, addr string) (net.Conn, error) {
-	_, port, err := net.SplitHostPort(addr)
-	if err != nil {
-		return nil, err
-	}
-	dialCtx, cancel := context.WithTimeout(ctx, connectTimeout)
-	defer cancel()
-	raw, err := netDial(dialCtx, "tcp", net.JoinHostPort(s.dataHost, port))
-	if err != nil {
-		return nil, err
-	}
-	if err := s.setData(raw); err != nil {
-		return nil, err
-	}
-	if tlsConf != nil {
-		// The handshake runs on the first read, as in the library, because
-		// some servers only start it once the transfer command is answered.
-		return tls.Client(raw, tlsConf), nil
-	}
-	return raw, nil
-}
-
-// tlsConfig returns the TLS settings for one control connection and its data
-// connections. Certificates are verified unless the request sets
-// skipVerifyCert, as for HTTP.
-//
-// Each call gets its own one-entry session cache, so a data connection
-// resumes the TLS session of its own control connection. vsftpd
-// (require_ssl_reuse) only checks that some session was resumed, but ProFTPD's
-// mod_tls also checks that it is the control connection's; a cache shared by
-// several workers would hand a data connection another worker's session.
-// A cache in the manager's base config is kept as given.
-func (f *Fetcher) tlsConfig(host string) *tls.Config {
-	cfg := &tls.Config{}
-	if f.manager != nil && f.manager.baseTLS != nil {
-		cfg = f.manager.baseTLS.Clone()
-	}
-	cfg.ServerName = host
-	if f.meta.Req != nil && f.meta.Req.SkipVerifyCert {
-		cfg.InsecureSkipVerify = true
-	}
-	if cfg.ClientSessionCache == nil {
-		cfg.ClientSessionCache = tls.NewLRUClientSessionCache(1)
-	}
-	return cfg
-}
-
-// netDialer picks how to reach the server, from the same proxy settings the
-// HTTP protocol reads (the task's proxy, otherwise the global one).
-func (f *Fetcher) netDialer(t *target) (dialContextFunc, bool, error) {
-	direct := (&net.Dialer{Timeout: connectTimeout}).DialContext
-	pu, err := f.proxyURL(t)
-	if err != nil {
-		return nil, false, err
-	}
-	if pu == nil {
-		return direct, false, nil
-	}
-	switch strings.ToLower(pu.Scheme) {
-	case "socks5", "socks5h":
-		d, err := proxy.FromURL(pu, &net.Dialer{Timeout: connectTimeout})
-		if err != nil {
-			return nil, false, fmt.Errorf("ftp: socks5 proxy: %w", err)
-		}
-		if cd, ok := d.(proxy.ContextDialer); ok {
-			return cd.DialContext, true, nil
-		}
-		return func(_ context.Context, network, addr string) (net.Conn, error) {
-			return d.Dial(network, addr)
-		}, true, nil
-	default:
-		// An HTTP proxy is not used. Every passive data connection goes to
-		// a port the server picks, and HTTP proxies usually allow CONNECT to
-		// port 443 only, so the transfer would fail after the login worked.
-		f.warnOnce.Do(func() {
-			if l := f.logger(); l != nil {
-				l.Warn().Msgf("ftp: the %s proxy at %s cannot carry FTP data connections (HTTP proxy), connecting directly; use a SOCKS5 proxy for FTP", strings.ToLower(pu.Scheme), pu.Host)
-			}
-		})
-		return direct, false, nil
-	}
-}
-
-func (f *Fetcher) proxyURL(t *target) (*url.URL, error) {
-	if f.ctl == nil || f.ctl.GetProxy == nil {
-		return nil, nil
-	}
-	handler := f.ctl.GetProxy(f.meta.Req.Proxy)
-	if handler == nil {
-		return nil, nil
-	}
-	// The proxy chooser reads only the URL; the credentials stay out.
-	req := &http.Request{URL: &url.URL{Scheme: "ftp", Host: t.addr, Path: "/" + t.path}, Header: http.Header{}}
-	pu, err := handler(req)
-	if err != nil {
-		return nil, errors.New("ftp: cannot read the proxy settings")
-	}
-	return pu, nil
-}
-
-// isLoginRefusal tells a server that is full apart from bad credentials.
-// 421 always means "not now". 530 means a refused login; it is only a
-// capacity limit when these credentials have worked before. The library
-// drops the code when USER itself is refused, so a "too many" message counts
-// as well.
-func isLoginRefusal(err error, credentialsWorked bool) bool {
-	var te *textproto.Error
-	if errors.As(err, &te) {
-		switch te.Code {
-		case ftp.StatusNotAvailable:
-			return true
-		case ftp.StatusNotLoggedIn:
-			return credentialsWorked || strings.Contains(strings.ToLower(te.Msg), "too many")
-		}
-		return false
-	}
-	return strings.Contains(strings.ToLower(err.Error()), "too many")
-}
-
-// isPermanent reports errors a retry cannot fix: a 5xx reply and a
-// certificate that does not verify.
-func isPermanent(err error) bool {
-	var te *textproto.Error
-	if errors.As(err, &te) {
-		return te.Code >= 500
-	}
-	var verifyErr *tls.CertificateVerificationError
-	if errors.As(err, &verifyErr) {
-		return true
-	}
-	var recordErr tls.RecordHeaderError
-	if errors.As(err, &recordErr) {
-		return true
-	}
-	return errors.Is(err, errSizeChanged)
-}
-
-func replyCode(err error) int {
-	var te *textproto.Error
-	if errors.As(err, &te) {
-		return te.Code
-	}
-	return 0
-}

internal/protocol/ftp/download_test.go

@@ -1,146 +0,0 @@
-package ftp_test
-
-import (
-	"bytes"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/rs/zerolog"
-
-	"github.com/GopeedLab/gopeed/internal/logger"
-	iftp "github.com/GopeedLab/gopeed/internal/protocol/ftp"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/GopeedLab/gopeed/pkg/download"
-	pftp "github.com/GopeedLab/gopeed/pkg/protocol/ftp"
-)
-
-// syncBuffer is a log sink that the downloader's goroutines can share.
-type syncBuffer struct {
-	mu  sync.Mutex
-	buf bytes.Buffer
-}
-
-func (b *syncBuffer) Write(p []byte) (int, error) {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	return b.buf.Write(p)
-}
-
-func (b *syncBuffer) String() string {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	return b.buf.String()
-}
-
-// taskEvents records the first done or error event of every task, so the
-// test never reads a task's status while the downloader writes it.
-type taskEvents struct {
-	mu    sync.Mutex
-	final map[string]download.EventKey
-}
-
-func (e *taskEvents) listen(ev *download.Event) {
-	if ev.Key != download.EventKeyDone && ev.Key != download.EventKeyError {
-		return
-	}
-	e.mu.Lock()
-	defer e.mu.Unlock()
-	if _, seen := e.final[ev.Task.ID]; !seen {
-		e.final[ev.Task.ID] = ev.Key
-	}
-}
-
-func (e *taskEvents) wait(t *testing.T, id string) download.EventKey {
-	t.Helper()
-	deadline := time.Now().Add(60 * time.Second)
-	for time.Now().Before(deadline) {
-		e.mu.Lock()
-		key, ok := e.final[id]
-		e.mu.Unlock()
-		if ok {
-			return key
-		}
-		time.Sleep(20 * time.Millisecond)
-	}
-	t.Fatalf("task %s did not finish", id)
-	return ""
-}
-
-// TestPasswordNeverLogged runs FTP tasks through the downloader with its core
-// logger captured: a success, a missing file and a wrong password, all behind
-// an HTTP proxy that FTP must skip with a warning.
-func TestPasswordNeverLogged(t *testing.T) {
-	srv := iftp.StartFTPServer(t, iftp.ServerOptions{User: "u", Pass: "p@ss"})
-	want := srv.WriteFile(t, "secret.bin", iftp.RandomBytes(300000, 21))
-
-	d := download.NewDownloader(&download.DownloaderConfig{Storage: download.NewMemStorage(), StorageDir: t.TempDir()})
-	logs := &syncBuffer{}
-	d.Logger = &logger.Logger{Logger: zerolog.New(logs)}
-	events := &taskEvents{final: map[string]download.EventKey{}}
-	d.Listener(events.listen)
-	if err := d.Setup(); err != nil {
-		t.Fatal(err)
-	}
-	// Close, not Clear: Clear resets the extension list without a lock while
-	// the last task's done hooks may still read it.
-	defer d.Close()
-	cfg, err := d.GetConfig()
-	if err != nil {
-		t.Fatal(err)
-	}
-	cfg.Proxy = &base.DownloaderProxyConfig{Enable: true, Scheme: "http", Host: "127.0.0.1:1", Usr: "proxyuser", Pwd: "proxysecret"}
-	if err := d.PutConfig(cfg); err != nil {
-		t.Fatal(err)
-	}
-
-	dir := t.TempDir()
-	create := func(rawURL string) string {
-		id, err := d.CreateDirect(&base.Request{URL: rawURL}, &base.Options{Path: dir, Extra: &pftp.OptsExtra{Connections: 2}})
-		if err != nil {
-			if strings.Contains(err.Error(), "p@ss") || strings.Contains(err.Error(), "p%40ss") {
-				t.Fatalf("the password leaked into an error: %v", err)
-			}
-			t.Fatal(err)
-		}
-		return id
-	}
-	root := "ftp://u:p%40ss@" + srv.Addr + "/"
-
-	okID := create(root + "secret.bin")
-	if key := events.wait(t, okID); key != download.EventKeyDone {
-		t.Fatalf("download ended with %q, logs:\n%s", key, logs.String())
-	}
-	ok := d.GetTask(okID)
-	if ok.Protocol != "ftp" {
-		t.Fatalf("protocol %q, want ftp", ok.Protocol)
-	}
-	if got := iftp.FileSHA256(t, ok.Meta.SingleFilepath()); got != want {
-		t.Fatalf("sha256 %s, want %s", got, want)
-	}
-	missingID := create(root + "missing.bin")
-	if key := events.wait(t, missingID); key != download.EventKeyError {
-		t.Fatalf("a missing file must fail, got %q", key)
-	}
-	wrongID := create("ftp://u:wr0ng%40pw@" + srv.Addr + "/secret.bin")
-	if key := events.wait(t, wrongID); key != download.EventKeyError {
-		t.Fatalf("a wrong password must fail, got %q", key)
-	}
-	missing, wrong := d.GetTask(missingID), d.GetTask(wrongID)
-	for _, task := range []*download.Task{ok, missing, wrong} {
-		if name := task.Name(); strings.Contains(name, "p@ss") || strings.Contains(name, "p%40ss") || strings.Contains(name, "wr0ng") {
-			t.Fatalf("task name %q shows the password", name)
-		}
-	}
-
-	out := logs.String()
-	if !strings.Contains(out, "task id") || !strings.Contains(out, "HTTP proxy") {
-		t.Fatalf("the captured log misses the expected lines, so it proves nothing:\n%s", out)
-	}
-	for _, secret := range []string{"p@ss", "p%40ss", "wr0ng", "proxysecret"} {
-		if strings.Contains(out, secret) {
-			t.Fatalf("%q appears in the log:\n%s", secret, out)
-		}
-	}
-}

internal/protocol/ftp/fetcher.go

@@ -1,810 +0,0 @@
-// Package ftp downloads files and directory trees over FTP, FTPS (implicit
-// TLS) and FTPES (explicit TLS, AUTH TLS).
-//
-// A file is split into segments of at least 1 MiB. Each segment is fetched on
-// its own login with REST and RETR, and its data connection is closed once
-// the segment's last byte has arrived. A server that refuses a login lowers
-// the task's connection ceiling to the logins that worked, and a server that
-// refuses REST gets one sequential stream per file.
-package ftp
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/jlaffaye/ftp"
-	"github.com/rs/zerolog"
-
-	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	pftp "github.com/GopeedLab/gopeed/pkg/protocol/ftp"
-)
-
-const (
-	// Many servers cap logins per user, so FTP starts lower than HTTP.
-	defaultConnections = 4
-	maxConnections     = 256
-	minSegmentSize     = 1 << 20
-	maxRetries         = 5
-	copyBufferSize     = 256 << 10
-)
-
-// retryDelay is the first wait before a retry. Later retries wait longer.
-var retryDelay = 500 * time.Millisecond
-
-var (
-	errSizeChanged     = errors.New("ftp: the remote file changed size since the task was resolved")
-	errShortTransfer   = errors.New("ftp: the transfer ended before the segment was complete")
-	errRestUnsupported = errors.New("ftp: the server does not support REST")
-	errDiskWrite       = errors.New("ftp: cannot write the downloaded data")
-)
-
-type config struct {
-	Connections int `json:"connections"`
-}
-
-// segment is a byte range of one file. End is inclusive, so an empty file
-// has End == Begin-1 and nothing to fetch.
-type segment struct {
-	File       int `json:",omitempty"` // index in Res.Files
-	Begin      int64
-	End        int64
-	Downloaded int64
-}
-
-func (s *segment) remain() int64 {
-	return s.End - s.Begin + 1 - s.Downloaded
-}
-
-// lane is one worker that logged in, shown as one connection in the stats.
-type lane struct {
-	downloaded int64
-	retryTimes int
-	failed     bool
-	completed  bool
-}
-
-// loginError marks a failure to connect or log in, as opposed to a failure
-// during a transfer.
-type loginError struct{ err error }
-
-func (e *loginError) Error() string { return e.err.Error() }
-func (e *loginError) Unwrap() error { return e.err }
-
-type Fetcher struct {
-	manager *FetcherManager
-	ctl     *controller.Controller
-	config  *config
-	meta    *fetcher.FetcherMeta
-	doneCh  chan error
-
-	warnOnce sync.Once
-	// loginOK is set once these credentials have logged in, after which a
-	// 530 on another login means the server is full.
-	loginOK atomic.Bool
-
-	// mu guards the download state below.
-	mu       sync.Mutex
-	segments []*segment
-	maxConns int
-	noRest   bool
-	lanes    []*lane
-	done     bool
-
-	// runMu serializes Start and Pause.
-	runMu   sync.Mutex
-	cancel  context.CancelFunc
-	runDone chan struct{}
-}
-
-func (f *Fetcher) Setup(ctl *controller.Controller) {
-	f.ctl = ctl
-	f.doneCh = make(chan error, 1)
-	if f.meta == nil {
-		f.meta = &fetcher.FetcherMeta{}
-	}
-	if ctl != nil && ctl.GetConfig != nil {
-		ctl.GetConfig(&f.config)
-	}
-	if f.config == nil {
-		f.config = &config{Connections: defaultConnections}
-	}
-}
-
-func (f *Fetcher) logger() *zerolog.Logger {
-	if f.ctl == nil {
-		return nil
-	}
-	return f.ctl.Logger
-}
-
-func (f *Fetcher) warn(format string, args ...any) {
-	if l := f.logger(); l != nil {
-		l.Warn().Msgf(format, args...)
-	}
-}
-
-func (f *Fetcher) initOptions() error {
-	if f.meta.Opts == nil {
-		f.meta.Opts = &base.Options{}
-	}
-	opts := f.meta.Opts
-	if err := base.ParseOptExtra[pftp.OptsExtra](opts); err != nil {
-		return err
-	}
-	if opts.Extra == nil {
-		opts.Extra = &pftp.OptsExtra{}
-	}
-	return nil
-}
-
-func (f *Fetcher) extra() *pftp.OptsExtra {
-	if f.meta.Opts != nil {
-		if e, ok := f.meta.Opts.Extra.(*pftp.OptsExtra); ok && e != nil {
-			return e
-		}
-	}
-	return &pftp.OptsExtra{}
-}
-
-// tlsMode is the request's "tls" field, empty when the request has none.
-func (f *Fetcher) tlsMode() string {
-	if f.meta.Req != nil {
-		if e, ok := f.meta.Req.Extra.(*pftp.ReqExtra); ok && e != nil {
-			return e.TLS
-		}
-	}
-	return ""
-}
-
-// connections is the number of parallel logins to use. The caller holds mu.
-func (f *Fetcher) connections() int {
-	if f.noRest {
-		return 1
-	}
-	n := f.extra().Connections
-	if n <= 0 && f.config != nil {
-		n = f.config.Connections
-	}
-	if n <= 0 {
-		n = defaultConnections
-	}
-	n = min(n, maxConnections)
-	if f.maxConns > 0 {
-		n = min(n, f.maxConns)
-	}
-	return n
-}
-
-func (f *Fetcher) Resolve(req *base.Request) error {
-	if err := base.ParseReqExtra[pftp.ReqExtra](req); err != nil {
-		return err
-	}
-	f.meta.Req = req
-	t, err := parseTarget(req.URL, f.tlsMode())
-	if err != nil {
-		return err
-	}
-	s, err := f.dial(context.Background(), t)
-	if err != nil {
-		return err
-	}
-	// quit, not abort: a server that caps logins must see this session end
-	// before the download's own logins arrive.
-	defer s.quit()
-	f.loginOK.Store(true)
-	res, err := f.resolveTarget(s, t)
-	if err != nil {
-		return err
-	}
-	f.meta.Res = res
-	f.mu.Lock()
-	f.segments = nil
-	f.done = false
-	f.mu.Unlock()
-	return nil
-}
-
-// selected returns the indexes of the files to download, in SelectFiles
-// order. The caller holds mu or owns the fetcher.
-func (f *Fetcher) selected() []int {
-	if f.meta == nil || f.meta.Res == nil {
-		return nil
-	}
-	if f.meta.Opts != nil && len(f.meta.Opts.SelectFiles) > 0 {
-		return f.meta.Opts.SelectFiles
-	}
-	all := make([]int, len(f.meta.Res.Files))
-	for i := range all {
-		all[i] = i
-	}
-	return all
-}
-
-// localPath is where a file lands: under the task path, with the file's
-// directories below the URL kept.
-func (f *Fetcher) localPath(index int) string {
-	if f.meta.Res.Name == "" {
-		return f.meta.SingleFilepath()
-	}
-	file := f.meta.Res.Files[index]
-	return path.Join(f.meta.FolderPath(), file.Path, file.Name)
-}
-
-// remotePath is the server path of a file. A single file uses the URL's own
-// path, which a local rename never touches.
-func (f *Fetcher) remotePath(t *target, index int) string {
-	if f.meta.Res.Name == "" {
-		return t.path
-	}
-	file := f.meta.Res.Files[index]
-	return path.Join(t.path, file.Path, file.Name)
-}
-
-// plan splits every selected file into segments of at least minSegmentSize,
-// one per connection at most. The caller holds mu.
-func (f *Fetcher) plan() {
-	conns := f.connections()
-	f.segments = nil
-	for _, index := range f.selected() {
-		size := f.meta.Res.Files[index].Size
-		n := int64(1)
-		if !f.noRest {
-			n = max(1, min(int64(conns), size/minSegmentSize))
-		}
-		for i := int64(0); i < n; i++ {
-			f.segments = append(f.segments, &segment{
-				File:  index,
-				Begin: i * size / n,
-				End:   (i+1)*size/n - 1,
-			})
-		}
-	}
-}
-
-// planSequential gives every unfinished file one segment from byte 0,
-// because without REST a transfer cannot start in the middle. The caller
-// holds mu.
-func (f *Fetcher) planSequential() {
-	complete := map[int]bool{}
-	for _, s := range f.segments {
-		if _, seen := complete[s.File]; !seen {
-			complete[s.File] = true
-		}
-		if s.remain() > 0 {
-			complete[s.File] = false
-		}
-	}
-	var out []*segment
-	for _, index := range f.selected() {
-		size := f.meta.Res.Files[index].Size
-		if complete[index] {
-			out = append(out, &segment{File: index, Begin: 0, End: size - 1, Downloaded: size})
-			continue
-		}
-		out = append(out, &segment{File: index, Begin: 0, End: size - 1})
-	}
-	f.segments = out
-	// Bytes counted by the old segments are fetched again.
-	f.lanes = nil
-}
-
-// openFiles opens every selected file for writing. A fresh plan creates and
-// sizes them; a resumed one keeps their content, and a file that has gone
-// missing starts over.
-func (f *Fetcher) openFiles(fresh bool) (map[int]*os.File, error) {
-	files := map[int]*os.File{}
-	closeAll := func() {
-		for _, file := range files {
-			_ = file.Close()
-		}
-	}
-	for _, index := range f.selected() {
-		name := f.localPath(index)
-		var (
-			file *os.File
-			err  error
-		)
-		_, statErr := os.Stat(name)
-		switch {
-		case fresh || os.IsNotExist(statErr):
-			file, err = f.ctl.Touch(name, f.meta.Res.Files[index].Size)
-			if err == nil && !fresh {
-				f.mu.Lock()
-				for _, s := range f.segments {
-					if s.File == index {
-						s.Downloaded = 0
-					}
-				}
-				f.mu.Unlock()
-			}
-		case statErr != nil:
-			err = statErr
-		default:
-			file, err = os.OpenFile(name, os.O_RDWR, 0)
-		}
-		if err != nil {
-			closeAll()
-			return nil, err
-		}
-		files[index] = file
-	}
-	return files, nil
-}
-
-func (f *Fetcher) Start() error {
-	f.runMu.Lock()
-	defer f.runMu.Unlock()
-	if f.runDone != nil {
-		select {
-		case <-f.runDone:
-		default:
-			return nil // already running
-		}
-	}
-	if err := f.initOptions(); err != nil {
-		return err
-	}
-	if err := base.ParseReqExtra[pftp.ReqExtra](f.meta.Req); err != nil {
-		return err
-	}
-	t, err := parseTarget(f.meta.Req.URL, f.tlsMode())
-	if err != nil {
-		return err
-	}
-
-	// A paused or failed run may have left a result nobody read.
-	select {
-	case <-f.doneCh:
-	default:
-	}
-
-	f.mu.Lock()
-	if f.done {
-		f.mu.Unlock()
-		f.doneCh <- nil
-		return nil
-	}
-	fresh := len(f.segments) == 0
-	if fresh {
-		f.plan()
-	} else if f.noRest {
-		f.planSequential()
-	}
-	f.mu.Unlock()
-
-	files, err := f.openFiles(fresh)
-	if err != nil {
-		return err
-	}
-	ctx, cancel := context.WithCancel(context.Background())
-	f.cancel = cancel
-	f.runDone = make(chan struct{})
-	go f.run(ctx, t, files, f.runDone)
-	return nil
-}
-
-func (f *Fetcher) run(ctx context.Context, t *target, files map[int]*os.File, done chan struct{}) {
-	defer close(done)
-	err := f.download(ctx, t, files)
-	for _, file := range files {
-		if cerr := file.Close(); cerr != nil && err == nil {
-			err = cerr
-		}
-	}
-	f.mu.Lock()
-	if err == nil {
-		f.done = true
-		for _, l := range f.lanes {
-			l.completed = true
-		}
-	}
-	f.mu.Unlock()
-	if err != nil && ctx.Err() != nil {
-		return // paused
-	}
-	select {
-	case f.doneCh <- err:
-	default:
-	}
-}
-
-func (f *Fetcher) download(ctx context.Context, t *target, files map[int]*os.File) error {
-	for {
-		err := f.runWorkers(ctx, t, files)
-		if !errors.Is(err, errRestUnsupported) {
-			return err
-		}
-		f.mu.Lock()
-		f.noRest = true
-		f.planSequential()
-		f.mu.Unlock()
-		f.warn("ftp: the server refused REST, so each file is downloaded in one stream")
-	}
-}
-
-// pool hands out the segments of one run to its workers. Every decision to
-// leave the run is taken under mu together with the queue it depends on, so
-// a segment put back can never be left without a worker.
-type pool struct {
-	mu      sync.Mutex
-	queue   []*segment
-	running int // workers still in the run
-}
-
-// take returns the next segment. A worker that finds the queue empty leaves
-// the run.
-func (p *pool) take() *segment {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if len(p.queue) == 0 {
-		p.running--
-		return nil
-	}
-	s := p.queue[0]
-	p.queue = p.queue[1:]
-	return s
-}
-
-func (p *pool) putBack(s *segment) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	p.queue = append([]*segment{s}, p.queue...)
-}
-
-// refused puts back the segment of a worker whose login the server turned
-// away. The worker leaves when another worker is still in the run to take
-// the segment, and left is the number of workers that remain; the last
-// worker stays and retries.
-func (p *pool) refused(s *segment) (leave bool, left int) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	p.queue = append([]*segment{s}, p.queue...)
-	if p.running > 1 {
-		p.running--
-		return true, p.running
-	}
-	return false, p.running
-}
-
-// leave takes a worker out of the run when it stops for any other reason.
-func (p *pool) leave() {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	p.running--
-}
-
-func (f *Fetcher) runWorkers(ctx context.Context, t *target, files map[int]*os.File) error {
-	runCtx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	f.mu.Lock()
-	p := &pool{}
-	for _, s := range f.segments {
-		if s.remain() > 0 {
-			p.queue = append(p.queue, s)
-		}
-	}
-	workers := min(f.connections(), len(p.queue))
-	f.mu.Unlock()
-	if workers == 0 {
-		return nil
-	}
-	p.running = workers
-
-	var (
-		wg       sync.WaitGroup
-		errMu    sync.Mutex
-		firstErr error
-	)
-	for id := 0; id < workers; id++ {
-		wg.Add(1)
-		go func(id int) {
-			defer wg.Done()
-			if err := f.worker(runCtx, t, files, p, id); err != nil {
-				errMu.Lock()
-				if firstErr == nil {
-					firstErr = err
-				}
-				errMu.Unlock()
-				cancel()
-			}
-		}(id)
-	}
-	wg.Wait()
-
-	if err := ctx.Err(); err != nil {
-		return err
-	}
-	if firstErr != nil {
-		return firstErr
-	}
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	for _, s := range f.segments {
-		if s.remain() > 0 {
-			return errors.New("ftp: the download stopped with data missing")
-		}
-	}
-	return nil
-}
-
-// worker fetches segments from the pool until it is empty. A worker whose
-// login the server refuses (421, or 530 once these credentials have worked)
-// hands its segment back and leaves while other workers remain, lowering the
-// task's ceiling to the workers left. This holds whether or not the worker
-// had logged in before: a slot can also go to another client mid-download.
-func (f *Fetcher) worker(ctx context.Context, t *target, files map[int]*os.File, p *pool, id int) error {
-	var ln *lane
-	f.mu.Lock()
-	if id < len(f.lanes) {
-		ln = f.lanes[id]
-	}
-	f.mu.Unlock()
-	onLogin := func() {
-		f.mu.Lock()
-		if ln == nil {
-			ln = &lane{}
-			f.lanes = append(f.lanes, ln)
-		}
-		f.mu.Unlock()
-	}
-
-	failures := 0
-	pendingRetries := 0
-	for {
-		seg := p.take()
-		if seg == nil {
-			return nil
-		}
-		err := f.fetchSegment(ctx, t, files, seg, &ln, onLogin)
-		if err == nil {
-			failures = 0
-			continue
-		}
-		if ctx.Err() != nil {
-			p.putBack(seg)
-			p.leave()
-			return nil
-		}
-
-		var le *loginError
-		if errors.As(err, &le) && isLoginRefusal(le.err, f.loginOK.Load()) {
-			if leave, left := p.refused(seg); leave {
-				f.lowerCeiling(left)
-				return nil
-			}
-			// The last worker: wait for a slot.
-		} else {
-			p.putBack(seg)
-			if errors.Is(err, errRestUnsupported) {
-				p.leave()
-				return err
-			}
-			if isPermanent(err) || errors.Is(err, errDiskWrite) {
-				f.markFailed(ln)
-				p.leave()
-				return err
-			}
-		}
-
-		failures++
-		f.mu.Lock()
-		if ln != nil {
-			ln.retryTimes += pendingRetries + 1
-			pendingRetries = 0
-		} else {
-			pendingRetries++
-		}
-		f.mu.Unlock()
-		if failures > maxRetries {
-			f.markFailed(ln)
-			p.leave()
-			return fmt.Errorf("ftp: giving up after %d retries: %w", maxRetries, err)
-		}
-		select {
-		case <-ctx.Done():
-			p.leave()
-			return nil
-		case <-time.After(retryDelay * time.Duration(failures)):
-		}
-	}
-}
-
-func (f *Fetcher) lowerCeiling(n int) {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if f.maxConns == 0 || n < f.maxConns {
-		f.maxConns = n
-	}
-}
-
-func (f *Fetcher) markFailed(ln *lane) {
-	if ln == nil {
-		return
-	}
-	f.mu.Lock()
-	ln.failed = true
-	f.mu.Unlock()
-}
-
-// isRestRefused tells a REST the server does not implement. RETR itself
-// fails with 550 and the like, never with these codes.
-func isRestRefused(err error) bool {
-	switch replyCode(err) {
-	case ftp.StatusBadCommand, ftp.StatusBadArguments, ftp.StatusNotImplemented, ftp.StatusNotImplementedParameter:
-		return true
-	}
-	return false
-}
-
-// fetchSegment logs in, retrieves the segment from its first missing byte
-// and writes it in place. It stops reading at the segment's end and closes
-// the data connection; the server then reports the transfer aborted, which
-// is expected.
-func (f *Fetcher) fetchSegment(ctx context.Context, t *target, files map[int]*os.File, seg *segment, ln **lane, onLogin func()) error {
-	s, err := f.dial(ctx, t)
-	if err != nil {
-		return &loginError{err}
-	}
-	defer s.quit()
-	f.loginOK.Store(true)
-	onLogin()
-
-	remote := f.remotePath(t, seg.File)
-	f.mu.Lock()
-	noRest := f.noRest
-	wantSize := f.meta.Res.Files[seg.File].Size
-	if noRest {
-		seg.Downloaded = 0
-	}
-	pos := seg.Begin + seg.Downloaded
-	end := seg.End
-	f.mu.Unlock()
-
-	// A file that changed on the server would mix old and new bytes.
-	s.deadline()
-	if size, err := s.FileSize(remote); err == nil && size != wantSize {
-		return errSizeChanged
-	} else if err != nil && replyCode(err) == 0 {
-		return err
-	}
-
-	s.deadline()
-	var resp *ftp.Response
-	if noRest {
-		resp, err = s.Retr(remote)
-	} else {
-		resp, err = s.RetrFrom(remote, uint64(pos))
-	}
-	if err != nil {
-		if !noRest && pos > 0 && isRestRefused(err) {
-			return errRestUnsupported
-		}
-		return err
-	}
-	defer resp.Close()
-	s.clearDeadline()
-
-	file := files[seg.File]
-	buf := make([]byte, copyBufferSize)
-	for pos <= end {
-		n := int(min(int64(len(buf)), end-pos+1))
-		_ = resp.SetDeadline(time.Now().Add(readTimeout))
-		nr, rerr := resp.Read(buf[:n])
-		if nr > 0 {
-			if _, werr := file.WriteAt(buf[:nr], pos); werr != nil {
-				return fmt.Errorf("%w: %w", errDiskWrite, werr)
-			}
-			pos += int64(nr)
-			f.mu.Lock()
-			seg.Downloaded += int64(nr)
-			if *ln != nil {
-				(*ln).downloaded += int64(nr)
-			}
-			f.mu.Unlock()
-		}
-		if rerr != nil {
-			if pos > end {
-				break
-			}
-			if errors.Is(rerr, io.EOF) {
-				return errShortTransfer
-			}
-			return rerr
-		}
-	}
-	return nil
-}
-
-func (f *Fetcher) Patch(req *base.Request, opts *base.Options) error {
-	if req == nil {
-		return nil
-	}
-	if req.URL != "" {
-		f.meta.Req.URL = req.URL
-	}
-	if req.Labels != nil {
-		if f.meta.Req.Labels == nil {
-			f.meta.Req.Labels = make(map[string]string)
-		}
-		for k, v := range req.Labels {
-			f.meta.Req.Labels[k] = v
-		}
-	}
-	if req.Proxy != nil {
-		f.meta.Req.Proxy = req.Proxy
-	}
-	return nil
-}
-
-func (f *Fetcher) Pause() error {
-	f.runMu.Lock()
-	defer f.runMu.Unlock()
-	if f.cancel != nil {
-		f.cancel()
-	}
-	if f.runDone != nil {
-		<-f.runDone
-	}
-	return nil
-}
-
-func (f *Fetcher) Close() error {
-	return f.Pause()
-}
-
-func (f *Fetcher) Meta() *fetcher.FetcherMeta {
-	return f.meta
-}
-
-// Stats reports one connection per worker that logged in, in the HTTP
-// protocol's shape.
-func (f *Fetcher) Stats() *fetcher.Stats {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	var total int64
-	if n := int64(len(f.lanes)); n > 0 && f.meta != nil && f.meta.Res != nil && f.meta.Res.Size > 0 {
-		total = (f.meta.Res.Size + n - 1) / n
-	}
-	conns := make([]*pftp.StatsConnection, 0, len(f.lanes))
-	for _, l := range f.lanes {
-		conns = append(conns, &pftp.StatsConnection{
-			Downloaded: l.downloaded,
-			Total:      total,
-			Completed:  l.completed || (f.done && !l.failed),
-			Failed:     l.failed,
-			RetryTimes: l.retryTimes,
-		})
-	}
-	return &fetcher.Stats{Snapshot: &pftp.Stats{Connections: conns}}
-}
-
-// Progress returns the bytes downloaded of each selected file, in
-// SelectFiles order.
-func (f *Fetcher) Progress() fetcher.Progress {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	perFile := map[int]int64{}
-	for _, s := range f.segments {
-		perFile[s.File] += s.Downloaded
-	}
-	sel := f.selected()
-	p := make(fetcher.Progress, len(sel))
-	for i, index := range sel {
-		p[i] = perFile[index]
-	}
-	return p
-}
-
-func (f *Fetcher) Wait() error {
-	return <-f.doneCh
-}

internal/protocol/ftp/fetcher_manager.go

@@ -1,109 +0,0 @@
-package ftp
-
-import (
-	"crypto/tls"
-	"net/url"
-	"path"
-	"strings"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	pftp "github.com/GopeedLab/gopeed/pkg/protocol/ftp"
-)
-
-// fetcherData is what a task saves to resume later. Segments has the same
-// Begin, End and Downloaded fields every version writes; the other fields are
-// optional, so a save without them still restores.
-type fetcherData struct {
-	Segments []*segment
-	// MaxConns is the login ceiling the server enforced, 0 when none was hit.
-	MaxConns int `json:",omitempty"`
-	// NoRest records that the server refused REST, so the task downloads each
-	// file in one sequential stream.
-	NoRest bool `json:",omitempty"`
-}
-
-// FetcherManager handles ftp://, ftps:// (implicit TLS) and ftpes:// (explicit
-// TLS) URLs.
-type FetcherManager struct {
-	// baseTLS is the base for every TLS connection. Nil means the system
-	// roots; the package's tests set it to trust their own certificate. The
-	// task's skipVerifyCert still turns verification off.
-	baseTLS *tls.Config
-}
-
-func (fm *FetcherManager) Name() string {
-	return "ftp"
-}
-
-func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
-	return []*fetcher.SchemeFilter{
-		{Type: fetcher.FilterTypeUrl, Pattern: "FTP"},
-		{Type: fetcher.FilterTypeUrl, Pattern: "FTPS"},
-		{Type: fetcher.FilterTypeUrl, Pattern: "FTPES"},
-	}
-}
-
-func (fm *FetcherManager) Build() fetcher.Fetcher {
-	return &Fetcher{manager: fm}
-}
-
-// ParseName names a task before it is resolved. It never includes the
-// userinfo of the URL.
-func (fm *FetcherManager) ParseName(u string) string {
-	parsed, err := url.Parse(u)
-	if err != nil {
-		return ""
-	}
-	name := path.Base(strings.TrimSuffix(parsed.Path, "/"))
-	if name == "" || name == "/" || name == "." {
-		name = parsed.Hostname()
-	}
-	return name
-}
-
-func (fm *FetcherManager) AutoRename() bool {
-	return true
-}
-
-func (fm *FetcherManager) DefaultConfig() any {
-	return &config{Connections: defaultConnections}
-}
-
-func (fm *FetcherManager) Store(f fetcher.Fetcher) (any, error) {
-	ff := f.(*Fetcher)
-	ff.mu.Lock()
-	defer ff.mu.Unlock()
-	segments := make([]*segment, len(ff.segments))
-	for i, s := range ff.segments {
-		c := *s
-		segments[i] = &c
-	}
-	return &fetcherData{
-		Segments: segments,
-		MaxConns: ff.maxConns,
-		NoRest:   ff.noRest,
-	}, nil
-}
-
-func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
-	return &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
-		fd := v.(*fetcherData)
-		ff := fm.Build().(*Fetcher)
-		ff.meta = meta
-		if meta != nil && meta.Req != nil {
-			_ = base.ParseReqExtra[pftp.ReqExtra](meta.Req)
-		}
-		if meta != nil && meta.Opts != nil {
-			_ = base.ParseOptExtra[pftp.OptsExtra](meta.Opts)
-		}
-		ff.segments = fd.Segments
-		ff.maxConns = fd.MaxConns
-		ff.noRest = fd.NoRest
-		return ff
-	}
-}
-
-func (fm *FetcherManager) Close() error {
-	return nil
-}

internal/protocol/ftp/fetcher_test.go

@@ -1,818 +0,0 @@
-package ftp
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net"
-	"os"
-	"path/filepath"
-	"slices"
-	"strings"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/armon/go-socks5"
-	"github.com/rs/zerolog"
-
-	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	pftp "github.com/GopeedLab/gopeed/pkg/protocol/ftp"
-)
-
-const mib = 1 << 20
-
-// testManager trusts the test server's certificate, the way an embedding
-// application could add private roots.
-func testManager(srv *FTPServer) *FetcherManager {
-	fm := &FetcherManager{}
-	if srv != nil {
-		fm.baseTLS = &tls.Config{RootCAs: srv.CA}
-	}
-	return fm
-}
-
-func testController(fm *FetcherManager) *controller.Controller {
-	ctl := controller.NewController()
-	ctl.GetConfig = func(v any) {
-		data, _ := json.Marshal(fm.DefaultConfig())
-		_ = json.Unmarshal(data, v)
-	}
-	return ctl
-}
-
-func buildFetcher(fm *FetcherManager) *Fetcher {
-	f := fm.Build().(*Fetcher)
-	f.Setup(testController(fm))
-	return f
-}
-
-func ftpURL(srv *FTPServer, scheme, userinfo, p string) string {
-	if userinfo != "" {
-		userinfo += "@"
-	}
-	return scheme + "://" + userinfo + srv.Addr + "/" + strings.TrimPrefix(p, "/")
-}
-
-// resolveOpts resolves req and then gives the fetcher its options, in the
-// order the downloader uses.
-func resolveOpts(f *Fetcher, req *base.Request, opts *base.Options) error {
-	if err := f.Resolve(req); err != nil {
-		return err
-	}
-	f.Meta().Opts = opts
-	return nil
-}
-
-func resolveTask(t *testing.T, f *Fetcher, rawURL string, extra *pftp.OptsExtra) {
-	t.Helper()
-	resolveRequest(t, f, &base.Request{URL: rawURL}, extra)
-}
-
-func resolveRequest(t *testing.T, f *Fetcher, req *base.Request, extra *pftp.OptsExtra) {
-	t.Helper()
-	opts := &base.Options{Path: t.TempDir()}
-	if extra != nil {
-		opts.Extra = extra
-	}
-	if err := resolveOpts(f, req, opts); err != nil {
-		t.Fatalf("resolve %s: %v", req.URL, err)
-	}
-}
-
-func waitFetcher(t *testing.T, f fetcher.Fetcher) error {
-	t.Helper()
-	done := make(chan error, 1)
-	go func() { done <- f.Wait() }()
-	select {
-	case err := <-done:
-		return err
-	case <-time.After(60 * time.Second):
-		t.Fatal("download did not finish in 60s")
-		return nil
-	}
-}
-
-func startAndWait(t *testing.T, f *Fetcher) {
-	t.Helper()
-	if err := f.Start(); err != nil {
-		t.Fatalf("start: %v", err)
-	}
-	if err := waitFetcher(t, f); err != nil {
-		t.Fatalf("download: %v", err)
-	}
-}
-
-func checkFile(t *testing.T, name, want string) {
-	t.Helper()
-	if got := FileSHA256(t, name); got != want {
-		t.Fatalf("%s: sha256 %s, want %s", name, got, want)
-	}
-}
-
-func ftpStats(t *testing.T, f *Fetcher) *pftp.Stats {
-	t.Helper()
-	stats, ok := f.Stats().Snapshot.(*pftp.Stats)
-	if !ok {
-		t.Fatalf("stats snapshot is %T, want *ftp.Stats", f.Stats().Snapshot)
-	}
-	return stats
-}
-
-func storeData(t *testing.T, fm *FetcherManager, f *Fetcher) []byte {
-	t.Helper()
-	data, err := fm.Store(f)
-	if err != nil {
-		t.Fatal(err)
-	}
-	blob, err := json.Marshal(data)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return blob
-}
-
-// restoreFetcher rebuilds a fetcher the way the downloader does after a
-// restart: the meta and the save blob both come back from JSON.
-func restoreFetcher(t *testing.T, fm *FetcherManager, meta *fetcher.FetcherMeta, blob []byte) *Fetcher {
-	t.Helper()
-	metaJSON, err := json.Marshal(meta)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var restoredMeta fetcher.FetcherMeta
-	if err := json.Unmarshal(metaJSON, &restoredMeta); err != nil {
-		t.Fatal(err)
-	}
-	v, build := fm.Restore()
-	if err := json.Unmarshal(blob, v); err != nil {
-		t.Fatal(err)
-	}
-	f := build(&restoredMeta, v).(*Fetcher)
-	f.Setup(testController(fm))
-	return f
-}
-
-func TestResolveFile(t *testing.T) {
-	for _, noMLST := range []bool{false, true} {
-		t.Run(fmt.Sprintf("noMLST=%v", noMLST), func(t *testing.T) {
-			srv := StartFTPServer(t, ServerOptions{NoMLST: noMLST})
-			data := RandomBytes(100*1024, 1)
-			srv.WriteFile(t, "pub/file name.bin", data)
-
-			f := buildFetcher(testManager(srv))
-			resolveTask(t, f, ftpURL(srv, "ftp", "", "pub/file%20name.bin"), nil)
-			res := f.Meta().Res
-			if res.Name != "" {
-				t.Fatalf("a file must not be a folder resource, got name %q", res.Name)
-			}
-			if len(res.Files) != 1 {
-				t.Fatalf("got %d files, want 1", len(res.Files))
-			}
-			file := res.Files[0]
-			if file.Name != "file name.bin" || file.Path != "" || file.Size != int64(len(data)) {
-				t.Fatalf("got file %+v, want name %q, empty path, size %d", file, "file name.bin", len(data))
-			}
-			if res.Size != int64(len(data)) {
-				t.Fatalf("resource size %d, want %d", res.Size, len(data))
-			}
-			if file.Ctime == nil || time.Since(*file.Ctime) > time.Hour {
-				t.Fatalf("modification time %v is missing or wrong", file.Ctime)
-			}
-		})
-	}
-}
-
-func writeTree(t *testing.T, srv *FTPServer) map[string]string {
-	t.Helper()
-	return map[string]string{
-		"a.txt":            srv.WriteFile(t, "pub/tree/a.txt", []byte("hello")),
-		"sub/b.bin":        srv.WriteFile(t, "pub/tree/sub/b.bin", RandomBytes(3*mib+17, 2)),
-		"sub/deeper/c.dat": srv.WriteFile(t, "pub/tree/sub/deeper/c.dat", RandomBytes(2000, 3)),
-		"sub/empty.txt":    srv.WriteFile(t, "pub/tree/sub/empty.txt", nil),
-	}
-}
-
-func TestResolveDir(t *testing.T) {
-	for _, noMLST := range []bool{false, true} {
-		for _, p := range []string{"pub/tree", "pub/tree/"} {
-			t.Run(fmt.Sprintf("noMLST=%v/%s", noMLST, p), func(t *testing.T) {
-				srv := StartFTPServer(t, ServerOptions{NoMLST: noMLST})
-				writeTree(t, srv)
-				if err := os.MkdirAll(filepath.Join(srv.Root, "pub/tree/void"), 0o755); err != nil {
-					t.Fatal(err)
-				}
-
-				f := buildFetcher(testManager(srv))
-				resolveTask(t, f, ftpURL(srv, "ftp", "", p), nil)
-				res := f.Meta().Res
-				if res.Name != "tree" {
-					t.Fatalf("folder name %q, want tree", res.Name)
-				}
-				var got []string
-				for _, file := range res.Files {
-					got = append(got, fmt.Sprintf("%s|%s|%d", file.Path, file.Name, file.Size))
-				}
-				want := []string{
-					"|a.txt|5",
-					"sub|b.bin|3145745",
-					"sub|empty.txt|0",
-					"sub/deeper|c.dat|2000",
-				}
-				if !slices.Equal(got, want) {
-					t.Fatalf("files\n got %q\nwant %q", got, want)
-				}
-				if res.Size != 5+3145745+2000 {
-					t.Fatalf("resource size %d", res.Size)
-				}
-			})
-		}
-	}
-}
-
-func TestResolveDirLimits(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{})
-	srv.WriteFile(t, "deep/1/2/3/4/5/6/7/8/f.txt", []byte("ok"))
-	srv.WriteFile(t, "deep9/1/2/3/4/5/6/7/8/9/f.txt", []byte("too deep"))
-	for i := 0; i < 4; i++ {
-		srv.WriteFile(t, fmt.Sprintf("many/f%d", i), []byte("x"))
-	}
-
-	f := buildFetcher(testManager(srv))
-	resolveTask(t, f, ftpURL(srv, "ftp", "", "deep"), nil)
-	if got := f.Meta().Res.Files[0].Path; got != "1/2/3/4/5/6/7/8" {
-		t.Fatalf("depth 8 path %q", got)
-	}
-
-	f = buildFetcher(testManager(srv))
-	err := resolveOpts(f, &base.Request{URL: ftpURL(srv, "ftp", "", "deep9")}, &base.Options{Path: t.TempDir()})
-	if err == nil || !strings.Contains(err.Error(), "8 levels") {
-		t.Fatalf("a tree deeper than 8 levels must fail and name the limit, got %v", err)
-	}
-
-	saved := maxWalkFiles
-	maxWalkFiles = 3
-	defer func() { maxWalkFiles = saved }()
-	f = buildFetcher(testManager(srv))
-	err = resolveOpts(f, &base.Request{URL: ftpURL(srv, "ftp", "", "many")}, &base.Options{Path: t.TempDir()})
-	if err == nil || !strings.Contains(err.Error(), "3 files") {
-		t.Fatalf("a tree over the file cap must fail and name the limit, got %v", err)
-	}
-}
-
-func TestDownloadPlain(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{})
-	data := RandomBytes(3*mib+12345, 4)
-	want := srv.WriteFile(t, "pub/plain.bin", data)
-
-	f := buildFetcher(testManager(srv))
-	resolveTask(t, f, ftpURL(srv, "ftp", "", "pub/plain.bin"), &pftp.OptsExtra{Connections: 4})
-	startAndWait(t, f)
-	checkFile(t, f.Meta().SingleFilepath(), want)
-	if got := f.Progress().TotalDownloaded(); got != int64(len(data)) {
-		t.Fatalf("progress %d, want %d", got, len(data))
-	}
-	stats := ftpStats(t, f)
-	if len(stats.Connections) == 0 || len(stats.Connections) > 4 {
-		t.Fatalf("got %d connections in stats", len(stats.Connections))
-	}
-	var sum int64
-	for _, c := range stats.Connections {
-		sum += c.Downloaded
-		if !c.Completed || c.Failed {
-			t.Fatalf("connection stats %+v after success", c)
-		}
-	}
-	if sum != int64(len(data)) {
-		t.Fatalf("connections downloaded %d bytes, want %d", sum, len(data))
-	}
-}
-
-func TestDownloadDir(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{})
-	want := writeTree(t, srv)
-
-	f := buildFetcher(testManager(srv))
-	resolveTask(t, f, ftpURL(srv, "ftp", "", "pub/tree"), &pftp.OptsExtra{Connections: 2})
-	startAndWait(t, f)
-	root := f.Meta().FolderPath()
-	if root != filepath.Join(f.Meta().Opts.Path, "tree") {
-		t.Fatalf("folder path %q", root)
-	}
-	for rel, sum := range want {
-		checkFile(t, filepath.Join(root, filepath.FromSlash(rel)), sum)
-	}
-}
-
-func testDownloadTLS(t *testing.T, mode string, schemes map[string]string) {
-	srv := StartFTPServer(t, ServerOptions{TLS: mode})
-	data := RandomBytes(2*mib+999, 5)
-	want := srv.WriteFile(t, "secure.bin", data)
-	for scheme, reqTLS := range schemes {
-		t.Run(scheme+"+"+reqTLS, func(t *testing.T) {
-			f := buildFetcher(testManager(srv))
-			req := &base.Request{URL: ftpURL(srv, scheme, "", "secure.bin"), Extra: &pftp.ReqExtra{TLS: reqTLS}}
-			resolveRequest(t, f, req, &pftp.OptsExtra{Connections: 2})
-			startAndWait(t, f)
-			checkFile(t, f.Meta().SingleFilepath(), want)
-		})
-	}
-}
-
-func TestDownloadExplicitTLS(t *testing.T) {
-	testDownloadTLS(t, pftp.TLSExplicit, map[string]string{
-		"ftpes": "",
-		"ftp":   pftp.TLSExplicit,
-	})
-}
-
-func TestDownloadImplicitTLS(t *testing.T) {
-	testDownloadTLS(t, pftp.TLSImplicit, map[string]string{
-		"ftps": "",
-		"ftp":  pftp.TLSImplicit,
-	})
-}
-
-// The TLS mode of a plain ftp:// link lives on the request, so a task that is
-// saved and restored from JSON still logs in over TLS.
-func TestRestoredRequestKeepsTLSMode(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{TLS: pftp.TLSExplicit})
-	want := srv.WriteFile(t, "keep.bin", RandomBytes(2*mib+5, 12))
-	fm := testManager(srv)
-	f := buildFetcher(fm)
-	req := &base.Request{URL: ftpURL(srv, "ftp", "", "keep.bin"), Extra: &pftp.ReqExtra{TLS: pftp.TLSExplicit}}
-	resolveRequest(t, f, req, &pftp.OptsExtra{Connections: 2})
-
-	restored := restoreFetcher(t, fm, f.Meta(), storeData(t, fm, f))
-	if _, ok := restored.Meta().Req.Extra.(*pftp.ReqExtra); !ok {
-		t.Fatalf("restored request extra is %T, want *ftp.ReqExtra", restored.Meta().Req.Extra)
-	}
-	// Explicit mode refuses plain logins, so the download only finishes over TLS.
-	startAndWait(t, restored)
-	checkFile(t, restored.Meta().SingleFilepath(), want)
-}
-
-func TestBadCertRejectedByDefault(t *testing.T) {
-	for mode, scheme := range map[string]string{pftp.TLSExplicit: "ftpes", pftp.TLSImplicit: "ftps"} {
-		t.Run(mode, func(t *testing.T) {
-			srv := StartFTPServer(t, ServerOptions{TLS: mode})
-			want := srv.WriteFile(t, "f.bin", RandomBytes(4096, 6))
-			rawURL := ftpURL(srv, scheme, "", "f.bin")
-
-			// No injected roots: the self-signed certificate is unknown.
-			f := buildFetcher(testManager(nil))
-			err := resolveOpts(f, &base.Request{URL: rawURL}, &base.Options{Path: t.TempDir()})
-			var verifyErr *tls.CertificateVerificationError
-			if !errors.As(err, &verifyErr) {
-				t.Fatalf("want a certificate verification error, got %v", err)
-			}
-
-			// The request's existing skipVerifyCert switch accepts it.
-			f = buildFetcher(testManager(nil))
-			if err := resolveOpts(f, &base.Request{URL: rawURL, SkipVerifyCert: true}, &base.Options{Path: t.TempDir()}); err != nil {
-				t.Fatalf("skipVerifyCert resolve: %v", err)
-			}
-			startAndWait(t, f)
-			checkFile(t, f.Meta().SingleFilepath(), want)
-		})
-	}
-}
-
-func TestSegmentsUseRest(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{})
-	srv.ReadDelay.Store(int64(time.Millisecond))
-	size := 8 * mib
-	want := srv.WriteFile(t, "big.bin", RandomBytes(size, 7))
-
-	f := buildFetcher(testManager(srv))
-	resolveTask(t, f, ftpURL(srv, "ftp", "", "big.bin"), &pftp.OptsExtra{Connections: 4})
-	startAndWait(t, f)
-	checkFile(t, f.Meta().SingleFilepath(), want)
-
-	rests := srv.RestOffsets()
-	for _, off := range []int64{2 * mib, 4 * mib, 6 * mib} {
-		if !slices.Contains(rests, off) {
-			t.Fatalf("REST offsets %v miss the segment start %d", rests, off)
-		}
-	}
-	for _, off := range rests {
-		if off <= 0 || off >= int64(size) {
-			t.Fatalf("REST offset %d out of range", off)
-		}
-	}
-	if got := len(ftpStats(t, f).Connections); got != 4 {
-		t.Fatalf("stats report %d connections, want 4", got)
-	}
-}
-
-func TestLoginCapFallsBack(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{MaxLogins: 1})
-	want := srv.WriteFile(t, "capped.bin", RandomBytes(4*mib+5, 8))
-
-	fm := testManager(srv)
-	f := buildFetcher(fm)
-	resolveTask(t, f, ftpURL(srv, "ftp", "", "capped.bin"), &pftp.OptsExtra{Connections: 4})
-	startAndWait(t, f)
-	checkFile(t, f.Meta().SingleFilepath(), want)
-
-	if srv.Refused() == 0 {
-		t.Fatal("the server never refused a login, so the cap was not exercised")
-	}
-	if got := len(ftpStats(t, f).Connections); got != 1 {
-		t.Fatalf("stats report %d connections, want 1", got)
-	}
-	var saved fetcherData
-	if err := json.Unmarshal(storeData(t, fm, f), &saved); err != nil {
-		t.Fatal(err)
-	}
-	if saved.MaxConns != 1 {
-		t.Fatalf("saved login ceiling %d, want 1", saved.MaxConns)
-	}
-}
-
-func TestNoRestSequential(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{NoRest: true})
-	srv.ReadDelay.Store(int64(time.Millisecond))
-	want := srv.WriteFile(t, "norest.bin", RandomBytes(4*mib+3, 9))
-
-	fm := testManager(srv)
-	f := buildFetcher(fm)
-	resolveTask(t, f, ftpURL(srv, "ftp", "", "norest.bin"), &pftp.OptsExtra{Connections: 4})
-	startAndWait(t, f)
-	checkFile(t, f.Meta().SingleFilepath(), want)
-
-	if rests := srv.RestOffsets(); len(rests) != 0 {
-		t.Fatalf("the server cannot have seen a REST, got %v", rests)
-	}
-	var saved fetcherData
-	if err := json.Unmarshal(storeData(t, fm, f), &saved); err != nil {
-		t.Fatal(err)
-	}
-	if !saved.NoRest {
-		t.Fatal("the missing REST support was not recorded")
-	}
-}
-
-// TestResumeAfterKill stops the server's transfers at a fixed byte count,
-// waits until the client has written exactly those bytes, then pauses, saves,
-// restores and finishes. No timing decides where the pause lands.
-func TestResumeAfterKill(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{})
-	size := int64(4*mib + 777)
-	want := srv.WriteFile(t, "resume.bin", RandomBytes(int(size), 10))
-	stallAt := size / 2
-	srv.StallAfter(stallAt)
-
-	fm := testManager(srv)
-	f := buildFetcher(fm)
-	resolveTask(t, f, ftpURL(srv, "ftp", "", "resume.bin"), &pftp.OptsExtra{Connections: 2})
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	select {
-	case <-srv.Stalled():
-	case <-time.After(30 * time.Second):
-		t.Fatal("the server never reached the stall point")
-	}
-	deadline := time.Now().Add(30 * time.Second)
-	for f.Progress().TotalDownloaded() != stallAt {
-		if time.Now().After(deadline) {
-			t.Fatalf("progress %d, want the %d bytes the server sent", f.Progress().TotalDownloaded(), stallAt)
-		}
-		time.Sleep(5 * time.Millisecond)
-	}
-	if err := f.Pause(); err != nil {
-		t.Fatal(err)
-	}
-	srv.Release()
-	blob := storeData(t, fm, f)
-
-	var saved fetcherData
-	if err := json.Unmarshal(blob, &saved); err != nil {
-		t.Fatal(err)
-	}
-	var savedTotal int64
-	resumeAt := map[int64]bool{}
-	for _, seg := range saved.Segments {
-		savedTotal += seg.Downloaded
-		if seg.Begin+seg.Downloaded <= seg.End {
-			resumeAt[seg.Begin+seg.Downloaded] = true
-		}
-	}
-	if savedTotal != stallAt {
-		t.Fatalf("saved progress %d, want %d", savedTotal, stallAt)
-	}
-
-	before := len(srv.RetrOffsets())
-	restored := restoreFetcher(t, fm, f.Meta(), blob)
-	if got := restored.Progress().TotalDownloaded(); got != savedTotal {
-		t.Fatalf("restored progress %d, want %d", got, savedTotal)
-	}
-	startAndWait(t, restored)
-	checkFile(t, restored.Meta().SingleFilepath(), want)
-
-	resumed := srv.RetrOffsets()[before:]
-	if len(resumed) == 0 {
-		t.Fatal("no transfer after resume")
-	}
-	for _, off := range resumed {
-		if !resumeAt[off] {
-			t.Fatalf("resumed RETR at %d, want one of the saved offsets %v", off, resumeAt)
-		}
-	}
-}
-
-// TestLateRefusalAfterQueueDrained: worker B holds the second file's segment
-// while the server takes its time to refuse B's login. Worker A finishes the
-// first file meanwhile and finds the queue empty. B must not leave too, or
-// nobody fetches the second file.
-func TestLateRefusalAfterQueueDrained(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{MaxLogins: 1, RefuseDelay: 500 * time.Millisecond})
-	want := map[string]string{
-		"a.bin": srv.WriteFile(t, "dir/a.bin", RandomBytes(1000, 16)),
-		"b.bin": srv.WriteFile(t, "dir/b.bin", RandomBytes(1000, 17)),
-	}
-
-	f := buildFetcher(testManager(srv))
-	resolveTask(t, f, ftpURL(srv, "ftp", "", "dir"), &pftp.OptsExtra{Connections: 2})
-	startAndWait(t, f)
-	for name, sum := range want {
-		checkFile(t, filepath.Join(f.Meta().FolderPath(), name), sum)
-	}
-	if srv.Refused() == 0 {
-		t.Fatal("the server never refused a login, so the late refusal was not exercised")
-	}
-}
-
-// TestLoginCapLoweredMidway: both workers have logged in when the server's
-// cap drops to one, as when another client takes a slot. The refused worker
-// leaves, the ceiling drops to one, and the task finishes.
-func TestLoginCapLoweredMidway(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{})
-	srv.ReadDelay.Store(int64(time.Millisecond))
-	want := map[string]string{}
-	for i := 0; i < 8; i++ {
-		name := fmt.Sprintf("f%d.bin", i)
-		want[name] = srv.WriteFile(t, "dir/"+name, RandomBytes(512<<10, byte(30+i)))
-	}
-
-	fm := testManager(srv)
-	f := buildFetcher(fm)
-	resolveTask(t, f, ftpURL(srv, "ftp", "", "dir"), &pftp.OptsExtra{Connections: 2})
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	deadline := time.Now().Add(30 * time.Second)
-	for len(ftpStats(t, f).Connections) < 2 || f.Progress().TotalDownloaded() < 512<<10 {
-		if time.Now().After(deadline) {
-			t.Fatal("the two workers never got going")
-		}
-		time.Sleep(2 * time.Millisecond)
-	}
-	srv.SetMaxLogins(1)
-	if err := waitFetcher(t, f); err != nil {
-		t.Fatalf("download: %v", err)
-	}
-	for name, sum := range want {
-		checkFile(t, filepath.Join(f.Meta().FolderPath(), name), sum)
-	}
-	if srv.Refused() == 0 {
-		t.Fatal("the server never refused a login, so the lowered cap was not exercised")
-	}
-	for _, c := range ftpStats(t, f).Connections {
-		if c.Failed {
-			t.Fatalf("a refused worker failed: %+v", c)
-		}
-	}
-	var saved fetcherData
-	if err := json.Unmarshal(storeData(t, fm, f), &saved); err != nil {
-		t.Fatal(err)
-	}
-	if saved.MaxConns != 1 {
-		t.Fatalf("saved login ceiling %d, want 1", saved.MaxConns)
-	}
-}
-
-// TestDataConnectionsResumeOwnSession runs four FTPS workers against a server
-// that, like ProFTPD, accepts a data connection only when it resumes the TLS
-// session of its own control connection.
-func TestDataConnectionsResumeOwnSession(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{TLS: pftp.TLSImplicit, RequireSessionReuse: true})
-	srv.ReadDelay.Store(int64(200 * time.Microsecond))
-	want := srv.WriteFile(t, "reuse.bin", RandomBytes(8*mib, 18))
-
-	f := buildFetcher(testManager(srv))
-	resolveTask(t, f, ftpURL(srv, "ftps", "", "reuse.bin"), &pftp.OptsExtra{Connections: 4})
-	startAndWait(t, f)
-	checkFile(t, f.Meta().SingleFilepath(), want)
-	ok, bad := srv.SessionReuse()
-	if ok < 4 || bad != 0 {
-		t.Fatalf("data connections: %d resumed their own session, %d did not", ok, bad)
-	}
-	for _, c := range ftpStats(t, f).Connections {
-		if c.RetryTimes != 0 {
-			t.Fatalf("a worker needed retries: %+v", c)
-		}
-	}
-}
-
-func TestRetryAfterDroppedConnection(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{})
-	want := srv.WriteFile(t, "drop.bin", RandomBytes(3*mib, 11))
-	srv.DropAfter.Store(mib + 100)
-
-	f := buildFetcher(testManager(srv))
-	resolveTask(t, f, ftpURL(srv, "ftp", "", "drop.bin"), &pftp.OptsExtra{Connections: 1})
-	startAndWait(t, f)
-	checkFile(t, f.Meta().SingleFilepath(), want)
-
-	offsets := srv.RetrOffsets()
-	if len(offsets) != 2 || offsets[0] != 0 || offsets[1] <= 0 || offsets[1] > mib+100 {
-		t.Fatalf("RETR offsets %v, want a restart at the dropped offset", offsets)
-	}
-	if got := ftpStats(t, f).Connections[0].RetryTimes; got != 1 {
-		t.Fatalf("retry count %d, want 1", got)
-	}
-}
-
-func TestPercentEncodedPassword(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{User: "u", Pass: "p@ss"})
-	want := srv.WriteFile(t, "secret.bin", RandomBytes(5000, 12))
-
-	f := buildFetcher(testManager(srv))
-	resolveTask(t, f, ftpURL(srv, "ftp", "u:p%40ss", "secret.bin"), nil)
-	startAndWait(t, f)
-	checkFile(t, f.Meta().SingleFilepath(), want)
-
-	f = buildFetcher(testManager(srv))
-	err := resolveOpts(f, &base.Request{URL: ftpURL(srv, "ftp", "u:wrong", "secret.bin")}, &base.Options{Path: t.TempDir()})
-	if err == nil || !strings.Contains(err.Error(), "530") {
-		t.Fatalf("a wrong password must fail with 530, got %v", err)
-	}
-}
-
-func TestOldSaveFormatResumes(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{})
-	data := RandomBytes(2*mib+1, 13)
-	want := srv.WriteFile(t, "old.bin", data)
-
-	fm := testManager(srv)
-	f := buildFetcher(fm)
-	resolveTask(t, f, ftpURL(srv, "ftp", "", "old.bin"), &pftp.OptsExtra{Connections: 1})
-
-	// A save blob that has only the segment fields every version writes.
-	const done = 700000
-	blob := []byte(fmt.Sprintf(`{"Segments":[{"Begin":0,"End":%d,"Downloaded":%d}]}`, len(data)-1, done))
-	name := f.Meta().SingleFilepath()
-	if err := os.WriteFile(name, append(data[:done:done], make([]byte, len(data)-done)...), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	restored := restoreFetcher(t, fm, f.Meta(), blob)
-	if got := restored.Progress().TotalDownloaded(); got != done {
-		t.Fatalf("restored progress %d, want %d", got, done)
-	}
-	startAndWait(t, restored)
-	checkFile(t, name, want)
-	if got := srv.RetrOffsets(); !slices.Equal(got, []int64{done}) {
-		t.Fatalf("RETR offsets %v, want [%d]", got, done)
-	}
-}
-
-func TestDownloadThroughSOCKS5(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{TLS: pftp.TLSExplicit})
-	want := srv.WriteFile(t, "proxied.bin", RandomBytes(2*mib+1, 14))
-
-	var dials atomic.Int32
-	proxySrv, err := socks5.New(&socks5.Config{
-		Dial: func(ctx context.Context, network, addr string) (net.Conn, error) {
-			dials.Add(1)
-			var d net.Dialer
-			return d.DialContext(ctx, network, addr)
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ln.Close()
-	go proxySrv.Serve(ln)
-
-	f := buildFetcher(testManager(srv))
-	req := &base.Request{
-		URL: ftpURL(srv, "ftpes", "", "proxied.bin"),
-		Proxy: &base.RequestProxy{
-			Mode:   base.RequestProxyModeCustom,
-			Scheme: "socks5",
-			Host:   ln.Addr().String(),
-		},
-	}
-	if err := resolveOpts(f, req, &base.Options{Path: t.TempDir(), Extra: &pftp.OptsExtra{Connections: 2}}); err != nil {
-		t.Fatal(err)
-	}
-	startAndWait(t, f)
-	checkFile(t, f.Meta().SingleFilepath(), want)
-	// Resolve's control and listing, then per worker one control and one
-	// data connection at least: every one of them went through the proxy.
-	if got := dials.Load(); got < 4 {
-		t.Fatalf("the proxy saw %d connections, want every control and data connection", got)
-	}
-}
-
-func TestHTTPProxyFallsBackToDirect(t *testing.T) {
-	srv := StartFTPServer(t, ServerOptions{})
-	want := srv.WriteFile(t, "direct.bin", RandomBytes(100000, 15))
-
-	var logs bytes.Buffer
-	logger := zerolog.New(&logs)
-	fm := testManager(srv)
-	f := fm.Build().(*Fetcher)
-	ctl := testController(fm)
-	ctl.Logger = &logger
-	f.Setup(ctl)
-	req := &base.Request{
-		URL: ftpURL(srv, "ftp", "", "direct.bin"),
-		Proxy: &base.RequestProxy{
-			Mode:   base.RequestProxyModeCustom,
-			Scheme: "http",
-			Host:   "127.0.0.1:1",
-			Usr:    "proxyuser",
-			Pwd:    "proxysecret",
-		},
-	}
-	if err := resolveOpts(f, req, &base.Options{Path: t.TempDir(), Extra: &pftp.OptsExtra{Connections: 2}}); err != nil {
-		t.Fatal(err)
-	}
-	startAndWait(t, f)
-	checkFile(t, f.Meta().SingleFilepath(), want)
-
-	out := logs.String()
-	if n := strings.Count(out, "HTTP proxy"); n != 1 {
-		t.Fatalf("want exactly one HTTP proxy warning, got %d in %q", n, out)
-	}
-	if strings.Contains(out, "proxysecret") {
-		t.Fatalf("the proxy password leaked into the log: %q", out)
-	}
-}
-
-func TestTorrentNameIsFile(t *testing.T) {
-	fm := testManager(nil)
-	for _, u := range []string{"ftp://h/x.torrent", "ftps://h/x.torrent", "ftpes://h/x.torrent", "FTP://h/v.m3u8"} {
-		matched := false
-		for _, filter := range fm.Filters() {
-			if filter.Match(u) {
-				matched = true
-			}
-		}
-		if !matched {
-			t.Fatalf("%s is not matched by the FTP filters", u)
-		}
-	}
-	if fm.Name() != "ftp" {
-		t.Fatalf("manager name %q", fm.Name())
-	}
-
-	srv := StartFTPServer(t, ServerOptions{})
-	want := srv.WriteFile(t, "x.torrent", []byte("d8:announce0:e"))
-	f := buildFetcher(testManager(srv))
-	resolveTask(t, f, ftpURL(srv, "ftp", "", "x.torrent"), nil)
-	res := f.Meta().Res
-	if res.Name != "" || len(res.Files) != 1 || res.Files[0].Name != "x.torrent" {
-		t.Fatalf("x.torrent must resolve to one FTP file, got name %q and %d files", res.Name, len(res.Files))
-	}
-	startAndWait(t, f)
-	checkFile(t, f.Meta().SingleFilepath(), want)
-}
-
-func TestParseNameHidesCredentials(t *testing.T) {
-	fm := testManager(nil)
-	for u, want := range map[string]string{
-		"ftp://u:p%[email protected]/pub/a.iso": "a.iso",
-		"ftp://u:p%[email protected]/":          "example.com",
-		"ftps://u:p%[email protected]":          "example.com",
-		"ftp://u:p%[email protected]/pub/dir/":  "dir",
-	} {
-		if got := fm.ParseName(u); got != want {
-			t.Fatalf("ParseName(%q) = %q, want %q", u, got, want)
-		}
-	}
-}
-
-func TestUnsafeEntryNames(t *testing.T) {
-	for name, ok := range map[string]bool{
-		"a.txt": true, "..a": true, "a b": true,
-		"": false, ".": false, "..": false, "a/b": false, `a\b`: false, "../x": false, "x\x00y": false,
-	} {
-		if got := safeEntryName(name); got != ok {
-			t.Fatalf("safeEntryName(%q) = %v, want %v", name, got, ok)
-		}
-	}
-}

internal/protocol/ftp/testserver_test.go

@@ -1,587 +0,0 @@
-package ftp
-
-import (
-	"bufio"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/sha256"
-	"crypto/tls"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/hex"
-	"errors"
-	"io"
-	"math/big"
-	"net"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	ftpserver "github.com/fclairamb/ftpserverlib"
-	"github.com/spf13/afero"
-
-	pftp "github.com/GopeedLab/gopeed/pkg/protocol/ftp"
-)
-
-// ServerOptions are the knobs of the in-process FTP test server.
-type ServerOptions struct {
-	// TLS is pftp.TLSNone (or empty), pftp.TLSExplicit or pftp.TLSImplicit.
-	// Explicit mode refuses plain logins, so a passing test proves TLS was used.
-	TLS string
-	// MaxLogins caps concurrent control connections. Beyond it the server
-	// greets with "421 Too many connections" and hangs up. Zero means no cap.
-	MaxLogins int
-	// NoRest answers "502" to REST. It filters the plain control stream, so it
-	// works with TLSNone and TLSImplicit only.
-	NoRest bool
-	// NoMLST disables MLST and MLSD, so clients fall back to SIZE and LIST.
-	NoMLST bool
-	// User and Pass are the only accepted credentials. An empty User accepts
-	// any login, anonymous included.
-	User string
-	Pass string
-	// RefuseDelay holds every 421 refusal back this long, like a server
-	// that answers slowly when it is full.
-	RefuseDelay time.Duration
-	// RequireSessionReuse makes every data connection resume the TLS
-	// session of the control connection that opened it, as ProFTPD's
-	// mod_tls does by default. A data connection that does not is refused.
-	// It needs TLSImplicit, where this test's wrapper sees the plain
-	// control stream and so learns which passive port belongs to whom.
-	RequireSessionReuse bool
-}
-
-// FTPServer is an ftpserverlib server over a temp directory.
-type FTPServer struct {
-	Addr string // host:port
-	Root string // directory served as "/"
-	// CA trusts the server's self-signed certificate.
-	CA *x509.CertPool
-
-	opts    ServerOptions
-	tlsConf *tls.Config
-	server  *ftpserver.FtpServer
-
-	// ReadDelay is slept before every read of a transferred file, in
-	// nanoseconds, to slow downloads down. Tests may change it at any time.
-	ReadDelay atomic.Int64
-
-	// DropAfter, when positive, makes the next transfer fail once after it
-	// has sent that many bytes, as if the data connection were killed.
-	DropAfter atomic.Int64
-
-	mu      sync.Mutex
-	active  int
-	retrs   []int64 // offset of every RETR, 0 when no REST came first
-	refused int
-	logins  int
-
-	// Passive port to the control connection that announced it, and the
-	// outcome of every data connection's session check.
-	pasvOwner map[int]string
-	reuseOK   int
-	reuseBad  int
-
-	// Stall state, see StallAfter. stallMu is held across file reads.
-	stallMu     sync.Mutex
-	stallAt     int64
-	sent        int64
-	stallCh     chan struct{}
-	stalled     chan struct{}
-	stalledOnce *sync.Once
-}
-
-// StartFTPServer starts a server and stops it when the test ends.
-func StartFTPServer(t *testing.T, opts ServerOptions) *FTPServer {
-	t.Helper()
-	s := &FTPServer{Root: t.TempDir(), opts: opts}
-	s.tlsConf, s.CA = selfSignedTLS(t)
-
-	base, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	var ln net.Listener = base
-	if opts.RequireSessionReuse {
-		if opts.TLS != pftp.TLSImplicit {
-			t.Fatal("RequireSessionReuse needs TLSImplicit")
-		}
-		s.requireSessionReuse(t, base.Addr().(*net.TCPAddr).Port)
-	}
-	if opts.TLS == pftp.TLSImplicit {
-		ln = tls.NewListener(ln, s.tlsConf)
-	}
-	ln = &limitListener{Listener: ln, srv: s}
-
-	s.Addr = base.Addr().String()
-	s.server = ftpserver.NewFtpServer(&mainDriver{srv: s, listener: ln})
-	if err := s.server.Listen(); err != nil {
-		t.Fatal(err)
-	}
-	go s.server.Serve()
-	t.Cleanup(func() { _ = s.server.Stop() })
-	return s
-}
-
-// WriteFile creates a file under the served root and returns its SHA-256.
-func (s *FTPServer) WriteFile(t *testing.T, rel string, data []byte) string {
-	t.Helper()
-	name := filepath.Join(s.Root, filepath.FromSlash(rel))
-	if err := os.MkdirAll(filepath.Dir(name), 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(name, data, 0o644); err != nil {
-		t.Fatal(err)
-	}
-	return SHA256Hex(data)
-}
-
-// RetrOffsets returns the start offset of every RETR the server received.
-func (s *FTPServer) RetrOffsets() []int64 {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return append([]int64(nil), s.retrs...)
-}
-
-// RestOffsets returns the non-zero RETR offsets, which only a REST sets.
-func (s *FTPServer) RestOffsets() []int64 {
-	var out []int64
-	for _, off := range s.RetrOffsets() {
-		if off != 0 {
-			out = append(out, off)
-		}
-	}
-	return out
-}
-
-// Refused returns how many connections were turned away with 421.
-func (s *FTPServer) Refused() int {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return s.refused
-}
-
-// Logins returns the number of successful logins.
-func (s *FTPServer) Logins() int {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return s.logins
-}
-
-// SetMaxLogins changes the login cap while the server runs, as when other
-// clients take slots.
-func (s *FTPServer) SetMaxLogins(n int) {
-	s.mu.Lock()
-	s.opts.MaxLogins = n
-	s.mu.Unlock()
-}
-
-// SessionReuse returns how many data connections resumed their own control
-// connection's TLS session, and how many did not.
-func (s *FTPServer) SessionReuse() (ok, bad int) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return s.reuseOK, s.reuseBad
-}
-
-// StallAfter makes every transfer stop sending once the server has sent n
-// bytes in total, until Release. Stalled is closed when that happens.
-func (s *FTPServer) StallAfter(n int64) {
-	s.stallMu.Lock()
-	defer s.stallMu.Unlock()
-	s.stallAt, s.sent = n, 0
-	s.stallCh = make(chan struct{})
-	s.stalled = make(chan struct{})
-	s.stalledOnce = &sync.Once{}
-}
-
-// Stalled is closed once a transfer has stopped at the StallAfter limit.
-func (s *FTPServer) Stalled() <-chan struct{} {
-	s.stallMu.Lock()
-	defer s.stallMu.Unlock()
-	return s.stalled
-}
-
-// Sent returns the bytes sent since StallAfter.
-func (s *FTPServer) Sent() int64 {
-	s.stallMu.Lock()
-	defer s.stallMu.Unlock()
-	return s.sent
-}
-
-// Release ends the stall. The stalled transfers fail.
-func (s *FTPServer) Release() {
-	s.stallMu.Lock()
-	defer s.stallMu.Unlock()
-	if s.stallAt > 0 {
-		s.stallAt = 0
-		close(s.stallCh)
-	}
-}
-
-var errStalled = errors.New("test server released a stalled transfer")
-
-// stall limits a read to the StallAfter budget, and blocks once the budget
-// is spent.
-func (s *FTPServer) stall(read func([]byte) (int, error), p []byte) (int, error) {
-	s.stallMu.Lock()
-	if s.stallAt <= 0 {
-		s.stallMu.Unlock()
-		return read(p)
-	}
-	allowed := s.stallAt - s.sent
-	if allowed <= 0 {
-		ch := s.stallCh
-		s.stalledOnce.Do(func() { close(s.stalled) })
-		s.stallMu.Unlock()
-		<-ch
-		return 0, errStalled
-	}
-	if int64(len(p)) > allowed {
-		p = p[:allowed]
-	}
-	n, err := read(p)
-	s.sent += int64(n)
-	s.stallMu.Unlock()
-	return n, err
-}
-
-var pasvReply = regexp.MustCompile(`^(?:229 [^(]*\(\|\|\|(\d+)\|\)|227 [^(]*\(\d+,\d+,\d+,\d+,(\d+),(\d+)\))`)
-
-// notePassive records the passive port a control connection announced.
-func (s *FTPServer) notePassive(owner string, reply []byte) {
-	m := pasvReply.FindSubmatch(reply)
-	if m == nil {
-		return
-	}
-	var port int
-	if len(m[1]) > 0 {
-		port, _ = strconv.Atoi(string(m[1]))
-	} else {
-		hi, _ := strconv.Atoi(string(m[2]))
-		lo, _ := strconv.Atoi(string(m[3]))
-		port = hi<<8 | lo
-	}
-	s.mu.Lock()
-	s.pasvOwner[port] = owner
-	s.mu.Unlock()
-}
-
-// requireSessionReuse stamps each control connection's session tickets with
-// its address, and checks that each data connection resumed a ticket of the
-// control connection that announced its passive port.
-func (s *FTPServer) requireSessionReuse(t *testing.T, controlPort int) {
-	base := s.tlsConf
-	var key [32]byte
-	if _, err := rand.Read(key[:]); err != nil {
-		t.Fatal(err)
-	}
-	base.SetSessionTicketKeys([][32]byte{key})
-	s.pasvOwner = map[int]string{}
-	stamp := func(owner string) func(tls.ConnectionState, *tls.SessionState) ([]byte, error) {
-		return func(cs tls.ConnectionState, ss *tls.SessionState) ([]byte, error) {
-			ss.Extra = [][]byte{[]byte(owner)}
-			return base.EncryptTicket(cs, ss)
-		}
-	}
-	base.GetConfigForClient = func(hello *tls.ClientHelloInfo) (*tls.Config, error) {
-		cfg := base.Clone()
-		cfg.GetConfigForClient = nil
-		local, _ := hello.Conn.LocalAddr().(*net.TCPAddr)
-		if local == nil || local.Port == controlPort {
-			cfg.WrapSession = stamp(hello.Conn.RemoteAddr().String())
-			return cfg, nil
-		}
-		s.mu.Lock()
-		owner := s.pasvOwner[local.Port]
-		s.mu.Unlock()
-		var resumedFrom string
-		cfg.UnwrapSession = func(identity []byte, cs tls.ConnectionState) (*tls.SessionState, error) {
-			ss, err := base.DecryptTicket(identity, cs)
-			if err != nil || ss == nil {
-				return nil, nil
-			}
-			if len(ss.Extra) > 0 {
-				resumedFrom = string(ss.Extra[0])
-			}
-			return ss, nil
-		}
-		cfg.WrapSession = stamp(owner)
-		cfg.VerifyConnection = func(cs tls.ConnectionState) error {
-			ok := owner != "" && cs.DidResume && resumedFrom == owner
-			s.mu.Lock()
-			if ok {
-				s.reuseOK++
-			} else {
-				s.reuseBad++
-			}
-			s.mu.Unlock()
-			if !ok {
-				return errors.New("data connection did not resume its control connection's TLS session")
-			}
-			return nil
-		}
-		return cfg, nil
-	}
-}
-
-func (s *FTPServer) acquire() bool {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.opts.MaxLogins > 0 && s.active >= s.opts.MaxLogins {
-		s.refused++
-		return false
-	}
-	s.active++
-	return true
-}
-
-func (s *FTPServer) release() {
-	s.mu.Lock()
-	s.active--
-	s.mu.Unlock()
-}
-
-// limitListener counts control connections and refuses those beyond
-// MaxLogins with a 421 greeting, like vsftpd's max_clients and max_per_ip.
-type limitListener struct {
-	net.Listener
-	srv *FTPServer
-}
-
-func (l *limitListener) Accept() (net.Conn, error) {
-	for {
-		c, err := l.Listener.Accept()
-		if err != nil {
-			return nil, err
-		}
-		if !l.srv.acquire() {
-			go func() {
-				time.Sleep(l.srv.opts.RefuseDelay)
-				_ = c.SetDeadline(time.Now().Add(5 * time.Second))
-				_, _ = io.WriteString(c, "421 Too many connections\r\n")
-				_ = c.Close()
-			}()
-			continue
-		}
-		cc := &countedConn{Conn: c, release: l.srv.release}
-		if l.srv.opts.RequireSessionReuse {
-			owner := c.RemoteAddr().String()
-			cc.sniff = func(b []byte) { l.srv.notePassive(owner, b) }
-		}
-		var conn net.Conn = cc
-		if l.srv.opts.NoRest {
-			conn = &noRestConn{countedConn: conn.(*countedConn), in: bufio.NewReader(c)}
-		}
-		return conn, nil
-	}
-}
-
-type countedConn struct {
-	net.Conn
-	once    sync.Once
-	release func()
-	sniff   func([]byte) // sees every reply the server writes
-}
-
-func (c *countedConn) Write(b []byte) (int, error) {
-	if c.sniff != nil {
-		c.sniff(b)
-	}
-	return c.Conn.Write(b)
-}
-
-func (c *countedConn) Close() error {
-	c.once.Do(c.release)
-	return c.Conn.Close()
-}
-
-// noRestConn answers REST itself with 502 and hides it from the server.
-type noRestConn struct {
-	*countedConn
-	in      *bufio.Reader
-	pending []byte
-}
-
-func (c *noRestConn) Read(p []byte) (int, error) {
-	for len(c.pending) == 0 {
-		line, err := c.in.ReadBytes('\n')
-		if len(line) > 0 {
-			if strings.HasPrefix(strings.ToUpper(string(line)), "REST ") {
-				if _, werr := io.WriteString(c.Conn, "502 REST not implemented\r\n"); werr != nil {
-					return 0, werr
-				}
-			} else {
-				c.pending = line
-			}
-		}
-		if err != nil {
-			if len(c.pending) > 0 {
-				break
-			}
-			return 0, err
-		}
-	}
-	n := copy(p, c.pending)
-	c.pending = c.pending[n:]
-	return n, nil
-}
-
-type mainDriver struct {
-	srv      *FTPServer
-	listener net.Listener
-}
-
-func (d *mainDriver) GetSettings() (*ftpserver.Settings, error) {
-	settings := &ftpserver.Settings{
-		Listener:    d.listener,
-		DisableMLSD: d.srv.opts.NoMLST,
-		DisableMLST: d.srv.opts.NoMLST,
-	}
-	switch d.srv.opts.TLS {
-	case pftp.TLSExplicit:
-		settings.TLSRequired = ftpserver.MandatoryEncryption
-	case pftp.TLSImplicit:
-		settings.TLSRequired = ftpserver.ImplicitEncryption
-	}
-	return settings, nil
-}
-
-func (d *mainDriver) ClientConnected(ftpserver.ClientContext) (string, error) {
-	return "gopeed test server", nil
-}
-
-func (d *mainDriver) ClientDisconnected(ftpserver.ClientContext) {}
-
-func (d *mainDriver) AuthUser(_ ftpserver.ClientContext, user, pass string) (ftpserver.ClientDriver, error) {
-	if d.srv.opts.User != "" && (user != d.srv.opts.User || pass != d.srv.opts.Pass) {
-		return nil, errors.New("bad credentials")
-	}
-	d.srv.mu.Lock()
-	d.srv.logins++
-	d.srv.mu.Unlock()
-	return &clientDriver{Fs: afero.NewBasePathFs(afero.NewOsFs(), d.srv.Root), srv: d.srv}, nil
-}
-
-func (d *mainDriver) GetTLSConfig() (*tls.Config, error) {
-	return d.srv.tlsConf, nil
-}
-
-type clientDriver struct {
-	afero.Fs
-	srv *FTPServer
-}
-
-// GetHandle sees the REST offset of every transfer. The server seeks the
-// returned file to that offset itself.
-func (d *clientDriver) GetHandle(name string, flags int, offset int64) (ftpserver.FileTransfer, error) {
-	f, err := d.Fs.OpenFile(name, flags, 0o644)
-	if err != nil {
-		return nil, err
-	}
-	if flags == os.O_RDONLY {
-		d.srv.mu.Lock()
-		d.srv.retrs = append(d.srv.retrs, offset)
-		d.srv.mu.Unlock()
-	}
-	return &slowFile{File: f, srv: d.srv, dropAfter: d.srv.DropAfter.Swap(0)}, nil
-}
-
-var errDropped = errors.New("test server dropped the transfer")
-
-type slowFile struct {
-	afero.File
-	srv       *FTPServer
-	sent      int64
-	dropAfter int64
-}
-
-func (f *slowFile) Read(p []byte) (int, error) {
-	if delay := time.Duration(f.srv.ReadDelay.Load()); delay > 0 {
-		time.Sleep(delay)
-		if len(p) > 16<<10 {
-			p = p[:16<<10]
-		}
-	}
-	if f.dropAfter > 0 {
-		if f.sent >= f.dropAfter {
-			return 0, errDropped
-		}
-		if rest := f.dropAfter - f.sent; int64(len(p)) > rest {
-			p = p[:rest]
-		}
-	}
-	n, err := f.srv.stall(f.File.Read, p)
-	f.sent += int64(n)
-	return n, err
-}
-
-// selfSignedTLS returns a server config with a fresh certificate for
-// 127.0.0.1 and localhost, and a pool that trusts it.
-func selfSignedTLS(t *testing.T) (*tls.Config, *x509.CertPool) {
-	t.Helper()
-	key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tmpl := &x509.Certificate{
-		SerialNumber:          big.NewInt(time.Now().UnixNano()),
-		Subject:               pkix.Name{CommonName: "gopeed ftp test"},
-		NotBefore:             time.Now().Add(-time.Hour),
-		NotAfter:              time.Now().Add(time.Hour),
-		IPAddresses:           []net.IP{net.ParseIP("127.0.0.1")},
-		DNSNames:              []string{"localhost"},
-		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-		IsCA:                  true,
-		BasicConstraintsValid: true,
-	}
-	der, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, &key.PublicKey, key)
-	if err != nil {
-		t.Fatal(err)
-	}
-	cert, err := x509.ParseCertificate(der)
-	if err != nil {
-		t.Fatal(err)
-	}
-	pool := x509.NewCertPool()
-	pool.AddCert(cert)
-	return &tls.Config{
-		Certificates: []tls.Certificate{{Certificate: [][]byte{der}, PrivateKey: key, Leaf: cert}},
-		MinVersion:   tls.VersionTLS12,
-	}, pool
-}
-
-func SHA256Hex(data []byte) string {
-	sum := sha256.Sum256(data)
-	return hex.EncodeToString(sum[:])
-}
-
-func FileSHA256(t *testing.T, name string) string {
-	t.Helper()
-	data, err := os.ReadFile(name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return SHA256Hex(data)
-}
-
-// RandomBytes returns n reproducible pseudo-random bytes.
-func RandomBytes(n int, seed byte) []byte {
-	out := make([]byte, n)
-	x := uint32(seed) + 1
-	for i := range out {
-		x ^= x << 13
-		x ^= x >> 17
-		x ^= x << 5
-		out[i] = byte(x)
-	}
-	return out
-}

internal/protocol/ftp/walk.go

@@ -1,187 +0,0 @@
-package ftp
-
-import (
-	"cmp"
-	"fmt"
-	"path"
-	"slices"
-	"strings"
-	"time"
-
-	"github.com/jlaffaye/ftp"
-
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-// Limits of a directory download. A tree past either one is refused with an
-// error that names the limit; it is never cut short.
-const maxWalkDepth = 8
-
-// maxWalkFiles is a variable so tests can lower it.
-var maxWalkFiles = 10000
-
-// resolveTarget describes the URL's path: one file, or a directory walked
-// into a multi-file resource whose paths are relative to it.
-func (f *Fetcher) resolveTarget(s *session, t *target) (*base.Resource, error) {
-	isDir, size, mtime, err := f.stat(s, t.path)
-	if err != nil {
-		return nil, err
-	}
-	if !isDir {
-		return &base.Resource{
-			Size:  size,
-			Range: true,
-			Files: []*base.FileInfo{{
-				Name:  path.Base(t.path),
-				Size:  size,
-				Ctime: mtime,
-			}},
-		}, nil
-	}
-
-	files, err := f.walk(s, t.path)
-	if err != nil {
-		return nil, err
-	}
-	name := path.Base(strings.TrimSuffix(t.path, "/"))
-	if name == "" || name == "." || name == "/" {
-		name = t.host
-	}
-	res := &base.Resource{Name: name, Range: true, Files: files}
-	res.CalcSize(nil)
-	return res, nil
-}
-
-// stat tells a file from a directory. MLST answers both at once. Without
-// it, SIZE answers for a file, and a directory is one we can change into.
-func (f *Fetcher) stat(s *session, p string) (isDir bool, size int64, mtime *time.Time, err error) {
-	if p == "" || strings.HasSuffix(p, "/") {
-		return true, 0, nil, nil
-	}
-	s.deadline()
-	if entry, mlstErr := s.GetEntry(p); mlstErr == nil {
-		switch entry.Type {
-		case ftp.EntryTypeFolder:
-			return true, 0, nil, nil
-		case ftp.EntryTypeFile:
-			if !entry.Time.IsZero() {
-				t := entry.Time
-				mtime = &t
-			}
-			return false, int64(entry.Size), mtime, nil
-		}
-		// A link: SIZE below follows it on the server.
-	}
-	// MLST is missing or refused the path: the older commands decide. A
-	// broken connection fails them too, with its own error.
-
-	s.deadline()
-	size, sizeErr := s.FileSize(p)
-	if sizeErr == nil {
-		if s.IsGetTimeSupported() {
-			s.deadline()
-			if t, err := s.GetTime(p); err == nil {
-				mtime = &t
-			}
-		}
-		return false, size, mtime, nil
-	}
-	if replyCode(sizeErr) == 0 {
-		return false, 0, nil, sizeErr
-	}
-
-	// SIZE failed: a directory, or a missing path.
-	s.deadline()
-	cwd, err := s.CurrentDir()
-	if err != nil {
-		return false, 0, nil, err
-	}
-	s.deadline()
-	if err := s.ChangeDir(p); err != nil {
-		return false, 0, nil, sizeErr
-	}
-	s.deadline()
-	if err := s.ChangeDir(cwd); err != nil {
-		return false, 0, nil, err
-	}
-	return true, 0, nil, nil
-}
-
-// safeEntryName reports whether a name from a listing can become a local
-// path element. A hostile server could otherwise list "../x" and write
-// outside the task directory.
-func safeEntryName(name string) bool {
-	if name == "" || name == "." || name == ".." {
-		return false
-	}
-	return !strings.ContainsAny(name, "/\\\x00")
-}
-
-// walk lists a directory tree, at most maxWalkDepth levels below root and
-// maxWalkFiles files. Files come back sorted by path, then name.
-func (f *Fetcher) walk(s *session, root string) ([]*base.FileInfo, error) {
-	type dir struct {
-		remote string // path on the server
-		rel    string // path below root, "" for root itself
-		depth  int
-	}
-	var files []*base.FileInfo
-	stack := []dir{{remote: strings.TrimSuffix(root, "/"), rel: "", depth: 0}}
-	for len(stack) > 0 {
-		d := stack[len(stack)-1]
-		stack = stack[:len(stack)-1]
-
-		s.deadline()
-		entries, err := s.List(d.remote)
-		if err != nil {
-			return nil, err
-		}
-		for _, e := range entries {
-			if e.Name == "." || e.Name == ".." {
-				continue
-			}
-			if !safeEntryName(e.Name) {
-				f.warn("ftp: skipping a listed name that is not a safe file name: %q", e.Name)
-				continue
-			}
-			remote := path.Join(d.remote, e.Name)
-			rel := path.Join(d.rel, e.Name)
-			if d.remote == "" {
-				remote = e.Name
-			}
-			entryType, size := e.Type, int64(e.Size)
-			if entryType == ftp.EntryTypeLink {
-				// A link to a file has a size; a link to a directory is
-				// not followed, so a loop cannot make the walk endless.
-				s.deadline()
-				linkSize, err := s.FileSize(remote)
-				if err != nil {
-					f.warn("ftp: skipping link %q: %v", rel, err)
-					continue
-				}
-				entryType, size = ftp.EntryTypeFile, linkSize
-			}
-			switch entryType {
-			case ftp.EntryTypeFolder:
-				if d.depth+1 > maxWalkDepth {
-					return nil, fmt.Errorf("ftp: the folder is deeper than %d levels, the limit for a folder download", maxWalkDepth)
-				}
-				stack = append(stack, dir{remote: remote, rel: rel, depth: d.depth + 1})
-			case ftp.EntryTypeFile:
-				if len(files) >= maxWalkFiles {
-					return nil, fmt.Errorf("ftp: the folder has more than %d files, the limit for a folder download", maxWalkFiles)
-				}
-				fi := &base.FileInfo{Name: e.Name, Path: d.rel, Size: size}
-				if !e.Time.IsZero() {
-					t := e.Time
-					fi.Ctime = &t
-				}
-				files = append(files, fi)
-			}
-		}
-	}
-	slices.SortFunc(files, func(a, b *base.FileInfo) int {
-		return cmp.Or(strings.Compare(a.Path, b.Path), strings.Compare(a.Name, b.Name))
-	})
-	return files, nil
-}

internal/protocol/http/fetcher.go

@@ -303,9 +303,8 @@ type Fetcher struct {
 	resolveDataPos atomic.Int64 // How many bytes downloaded during resolve
 
 	// Resolve response - kept open for one-time URLs
-	resolveResp       *http.Response
+	resolveResp     *http.Response
-	resolveRespCancel context.CancelFunc // Cancels the Resolve request
+	resolveRespLock sync.Mutex
-	resolveRespLock   sync.Mutex
 
 	// Async prefetch during resolve phase
 	prefetchFile     *os.File      // Temporary file for prefetch data
@@ -314,7 +313,6 @@ type Fetcher struct {
 	prefetchDone     atomic.Bool   // Prefetch completed or stopped
 	prefetchErr      error         // Error during prefetch (if any)
 	prefetchStopCh   chan struct{} // Signal to stop prefetch
-	prefetchExitCh   chan struct{} // Closed when the prefetch goroutine exits
 	resolveFallback  atomic.Bool   // Resolve prefetch is still available until the first Range request takes over
 
 	// Target file
@@ -427,11 +425,8 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 
 	// Build HTTP request WITHOUT Range header (normal request)
 	// This allows the response to be reused for downloading (important for one-time URLs)
-	// The body outlives Resolve, so the read timeout gets its own cancel func.
+	httpReq, err := f.buildRequest(context.TODO(), req)
-	reqCtx, reqCancel := context.WithCancel(context.Background())
-	httpReq, err := f.buildRequest(reqCtx, req)
 	if err != nil {
-		reqCancel()
 		f.setState(stateError)
 		return err
 	}
@@ -443,7 +438,6 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 	connStartTime := time.Now()
 	resp, err := client.Do(httpReq)
 	if err != nil {
-		reqCancel()
 		f.setState(stateError)
 		return err
 	}
@@ -458,7 +452,6 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 
 	if resp.StatusCode != base.HttpCodeOK && resp.StatusCode != base.HttpCodePartialContent {
 		resp.Body.Close()
-		reqCancel()
 		f.setState(stateError)
 		return NewRequestError(resp.StatusCode)
 	}
@@ -476,7 +469,6 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 		start, _, total, err := parseRangeResponse(resp)
 		if err != nil {
 			resp.Body.Close()
-			reqCancel()
 			f.setState(stateError)
 			return err
 		}
@@ -544,10 +536,8 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 	f.resolveRespLock.Lock()
 	if reuseResolveBody {
 		f.resolveResp = resp
-		f.resolveRespCancel = reqCancel
 	} else {
 		resp.Body.Close()
-		reqCancel()
 		f.prefetchDone.Store(true)
 	}
 	f.resolveRespLock.Unlock()
@@ -563,7 +553,6 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 	// For non-range resources, the response will be used directly in Start
 	if res.Range && reuseResolveBody {
 		f.prefetchStopCh = make(chan struct{})
-		f.prefetchExitCh = make(chan struct{})
 		f.resolveFallback.Store(true)
 		go f.asyncPrefetch()
 	}
@@ -581,14 +570,11 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 func (f *Fetcher) asyncPrefetch() {
 	defer func() {
 		f.prefetchDone.Store(true)
-		if f.prefetchExitCh != nil {
-			close(f.prefetchExitCh)
-		}
 	}()
 
 	// Get the resolve response
 	f.resolveRespLock.Lock()
-	resp, cancel := f.resolveResp, f.resolveRespCancel
+	resp := f.resolveResp
 	f.resolveRespLock.Unlock()
 
 	if resp == nil {
@@ -599,7 +585,10 @@ func (f *Fetcher) asyncPrefetch() {
 		// Close the response even if temporary-file setup fails or shutdown
 		// rejects a late prefetch. Otherwise the server can remain blocked writing.
 		f.resolveRespLock.Lock()
-		f.closeResolveRespLocked()
+		if f.resolveResp != nil {
+			f.resolveResp.Body.Close()
+			f.resolveResp = nil
+		}
 		f.resolveRespLock.Unlock()
 	}()
 
@@ -629,7 +618,7 @@ func (f *Fetcher) asyncPrefetch() {
 	f.prefetchFilePath = tmpFile.Name()
 
 	buf := make([]byte, 32*1024) // 32KB buffer
-	reader := f.responseReader(resp, cancel)
+	reader := f.responseReader(resp)
 
 	for {
 		select {
@@ -659,38 +648,23 @@ func (f *Fetcher) asyncPrefetch() {
 	}
 }
 
-// stopPrefetch signals the async prefetch to stop and waits until it exits.
-// Closing the resolve body unblocks a pending Read, so a stalled server cannot
-// keep the prefetch goroutine writing to the temporary file after we reuse it.
-func (f *Fetcher) stopPrefetch() {
-	if f.prefetchStopCh == nil {
-		return
-	}
-
-	// Pause and the first connection's takeover can stop concurrently, so the
-	// check-and-close must be under the lock to avoid closing the channel twice.
-	f.resolveRespLock.Lock()
-	select {
-	case <-f.prefetchStopCh:
-		// Already closed
-	default:
-		close(f.prefetchStopCh)
-	}
-	if f.resolveResp != nil {
-		f.resolveResp.Body.Close()
-		f.resolveResp = nil
-	}
-	f.resolveRespLock.Unlock()
-
-	if f.prefetchExitCh != nil {
-		<-f.prefetchExitCh
-	}
-}
-
 // stopPrefetchAndGetData stops the async prefetch and returns prefetched bytes
 // It also copies prefetched data to the target file
 func (f *Fetcher) stopPrefetchAndCopyData() int64 {
-	f.stopPrefetch()
+	// Signal prefetch to stop (safely)
+	if f.prefetchStopCh != nil {
+		select {
+		case <-f.prefetchStopCh:
+			// Already closed
+		default:
+			close(f.prefetchStopCh)
+		}
+	}
+
+	// Wait for prefetch to finish (with timeout)
+	for i := 0; f.prefetchStopCh != nil && i < 1000 && !f.prefetchDone.Load(); i++ {
+		time.Sleep(10 * time.Millisecond)
+	}
 
 	prefetched := f.prefetchSize.Load()
 	if prefetched == 0 {
@@ -892,16 +866,12 @@ func (f *Fetcher) doStart() error {
 	// For non-range resources, the response will be used directly
 	var prefetchedBytes int64
 	if f.meta.Res.Range {
-		// Read the size once and judge completeness by it alone: Resolve may have
+		resolveComplete := f.knownSize() > 0 && f.prefetchDone.Load() && f.prefetchErr == nil && f.prefetchSize.Load() >= f.knownSize()
-		// written every byte before it sets prefetchDone, and a snapshot that
-		// covers the whole file would otherwise finish without copying it.
-		prefetched := f.prefetchSize.Load()
-		resolveComplete := f.knownSize() > 0 && prefetched >= f.knownSize()
 		if f.resolveFallback.Load() && !resolveComplete {
 			// Keep Resolve downloading until the first Range response has been
 			// validated. The Range request starts at a stable snapshot; a valid
 			// takeover discards any overlap downloaded by Resolve in the meantime.
-			prefetchedBytes = prefetched
+			prefetchedBytes = f.prefetchSize.Load()
 		} else {
 			// Resolve already completed, or no live Resolve fallback remains.
 			prefetchedBytes = f.stopPrefetchAndCopyData()
@@ -911,7 +881,10 @@ func (f *Fetcher) doStart() error {
 		if !f.resolveFallback.Load() {
 			// Also close resolve response if still open.
 			f.resolveRespLock.Lock()
-			f.closeResolveRespLocked()
+			if f.resolveResp != nil {
+				f.resolveResp.Body.Close()
+				f.resolveResp = nil
+			}
 			f.resolveRespLock.Unlock()
 		}
 	}
@@ -1364,11 +1337,7 @@ func (f *Fetcher) downloadChunkOnce(conn *connection, client *http.Client, buf [
 	}
 	f.connMu.Unlock()
 
-	// The read timeout cancels this request through its own context.
+	httpReq, err := f.buildRequest(conn.ctx, f.meta.Req)
-	reqCtx, reqCancel := context.WithCancel(conn.ctx)
-	defer reqCancel()
-
-	httpReq, err := f.buildRequest(reqCtx, f.meta.Req)
 	if err != nil {
 		return err
 	}
@@ -1396,7 +1365,7 @@ func (f *Fetcher) downloadChunkOnce(conn *connection, client *http.Client, buf [
 		// Check if this might be a redirect URL expiration error
 		// If so, try falling back to the original URL
 		if f.hasRedirectURL() && isRedirectExpiredError(originalErr) {
-			fallbackResp, fallbackErr := f.tryFallbackToOriginalURL(reqCtx, client, rangeStart, rangeEnd, rangeRequested, ifRange)
+			fallbackResp, fallbackErr := f.tryFallbackToOriginalURL(conn.ctx, client, rangeStart, rangeEnd, rangeRequested, ifRange)
 			if fallbackErr == nil && fallbackResp != nil {
 				// Fallback succeeded, use this response instead
 				resp = fallbackResp
@@ -1517,7 +1486,7 @@ func (f *Fetcher) downloadChunkOnce(conn *connection, client *http.Client, buf [
 		f.slowStart.onConnectSuccess()
 	}
 
-	reader := f.responseReader(resp, reqCancel)
+	reader := f.responseReader(resp)
 	var responseBytesRead int64
 	for {
 		if conn.ctx.Err() != nil {
@@ -1651,10 +1620,11 @@ func (f *Fetcher) completeFromResolveFallback(conn *connection) bool {
 		return false
 	}
 
-	select {
+	for !f.prefetchDone.Load() {
-	case <-f.prefetchExitCh:
+		if conn.ctx.Err() != nil {
-	case <-conn.ctx.Done():
+			return false
-		return false
+		}
+		time.Sleep(10 * time.Millisecond)
 	}
 	knownSize := f.hasKnownSize()
 	if f.prefetchErr != nil || (knownSize && f.prefetchSize.Load() != f.meta.Res.Size) {
@@ -1870,8 +1840,8 @@ func (f *Fetcher) runConnectionWithResolveResp(conn *connection) {
 
 	// Get the resolve response
 	f.resolveRespLock.Lock()
-	resp, cancel := f.resolveResp, f.resolveRespCancel
+	resp := f.resolveResp
-	f.resolveResp, f.resolveRespCancel = nil, nil // Take ownership
+	f.resolveResp = nil // Take ownership
 	f.resolveRespLock.Unlock()
 
 	if resp == nil {
@@ -1880,9 +1850,6 @@ func (f *Fetcher) runConnectionWithResolveResp(conn *connection) {
 		return
 	}
 
-	if cancel != nil {
-		defer cancel()
-	}
 	defer resp.Body.Close()
 
 	f.connMu.Lock()
@@ -1899,7 +1866,7 @@ func (f *Fetcher) runConnectionWithResolveResp(conn *connection) {
 	}
 
 	// Download data from resolve response
-	reader := f.responseReader(resp, cancel)
+	reader := f.responseReader(resp)
 	for {
 		if conn.ctx.Err() != nil {
 			return
@@ -2461,7 +2428,14 @@ func (f *Fetcher) Pause() error {
 	}
 
 	// Stop prefetch if running
-	f.stopPrefetch()
+	if f.prefetchStopCh != nil {
+		select {
+		case <-f.prefetchStopCh:
+			// Already closed
+		default:
+			close(f.prefetchStopCh)
+		}
+	}
 
 	// Wait for downloadLoop to exit first (it will call wg.Wait internally)
 	if f.downloadLoopDone != nil {
@@ -2471,6 +2445,11 @@ func (f *Fetcher) Pause() error {
 	// Wait for all connection goroutines to stop
 	f.wg.Wait()
 
+	// Wait for prefetch to finish
+	for f.prefetchStopCh != nil && !f.prefetchDone.Load() {
+		time.Sleep(10 * time.Millisecond)
+	}
+
 	// If Pause wins before the first Range response is validated, materialize
 	// the Resolve prefix before discarding its temporary file. The first
 	// connection was allocated after the earlier prefetch snapshot, so advance
@@ -2502,7 +2481,10 @@ func (f *Fetcher) Pause() error {
 
 	// Clean up resolve response if still held
 	f.resolveRespLock.Lock()
-	f.closeResolveRespLocked()
+	if f.resolveResp != nil {
+		f.resolveResp.Body.Close()
+		f.resolveResp = nil
+	}
 	f.resolveRespLock.Unlock()
 
 	f.fileMu.Lock()
@@ -2620,25 +2602,9 @@ func (f *Fetcher) Wait() error {
 
 // Generated output can pause while its producer waits for processing capacity.
 // Its producer owns upstream deadlines; cancellation still closes the response.
-// Otherwise a stalled read cancels the request via cancel, which must belong
+func (f *Fetcher) responseReader(resp *http.Response) io.Reader {
-// to the request that produced resp.
-func (f *Fetcher) responseReader(resp *http.Response, cancel context.CancelFunc) 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, cancel)
+	return NewTimeoutReader(resp.Body, readTimeout)
-}
-
-// closeResolveRespLocked closes the kept Resolve response, if any, and
-// releases its request context. The caller must hold resolveRespLock.
-func (f *Fetcher) closeResolveRespLocked() {
-	if f.resolveResp == nil {
-		return
-	}
-	f.resolveResp.Body.Close()
-	f.resolveResp = nil
-	if f.resolveRespCancel != nil {
-		f.resolveRespCancel()
-		f.resolveRespCancel = nil
-	}
 }

internal/protocol/http/fetcher_test.go

@@ -3261,17 +3261,16 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
 }
 
 func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t *testing.T) {
-	// Setup must run before Resolve, as in the downloader, so the Resolve
+	fetcher := downloadReady(httpListener, 4, t)
-	// request also goes through the proxy.
+	ctl := controller.NewController()
-	f := buildFetcher()
+	ctl.GetProxy = func(requestProxy *base.RequestProxy) func(*gohttp.Request) (*url.URL, error) {
-	f.ctl.GetProxy = func(requestProxy *base.RequestProxy) func(*gohttp.Request) (*url.URL, error) {
 		return (&base.DownloaderProxyConfig{
 			Enable: true,
 			Scheme: "socks5",
 			Host:   proxyListener.Addr().String(),
 		}).ToHandler()
 	}
-	fetcher := doDownloadReady(f, httpListener, 4, t)
+	fetcher.Setup(ctl)
 	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)

internal/protocol/http/prefetch_start_test.go

@@ -1,52 +0,0 @@
-package http
-
-import (
-	"bytes"
-	gohttp "net/http"
-	"net/http/httptest"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/GopeedLab/gopeed/pkg/protocol/http"
-)
-
-// Start can run after the Resolve prefetch wrote every byte but before it set
-// prefetchDone. The prefetched body must still be copied to the target.
-func TestFetcher_StartBeforePrefetchDoneCopiesFullBody(t *testing.T) {
-	payload := []byte("prefetched before Start")
-	server := httptest.NewServer(gohttp.HandlerFunc(func(w gohttp.ResponseWriter, r *gohttp.Request) {
-		gohttp.ServeContent(w, r, "f.txt", time.Time{}, bytes.NewReader(payload))
-	}))
-	defer server.Close()
-
-	f := buildFetcher()
-	f.Meta().Opts = &base.Options{Path: t.TempDir(), Name: "f.txt", Extra: &http.OptsExtra{Connections: 1}}
-	if err := f.Resolve(&base.Request{URL: server.URL + "/f.txt"}); err != nil {
-		t.Fatal(err)
-	}
-	for !f.prefetchDone.Load() {
-		time.Sleep(time.Millisecond)
-	}
-	// Reopen the window between the last write and prefetchDone.
-	f.prefetchDone.Store(false)
-	go func() {
-		time.Sleep(50 * time.Millisecond)
-		f.prefetchDone.Store(true)
-	}()
-
-	if err := f.Start(); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Wait(); err != nil {
-		t.Fatal(err)
-	}
-	got, err := os.ReadFile(f.meta.SingleFilepath())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.Equal(got, payload) {
-		t.Fatalf("content = %q, want %q", got, payload)
-	}
-}

internal/protocol/http/stop_prefetch_test.go

@@ -1,56 +0,0 @@
-package http
-
-import (
-	"bytes"
-	"fmt"
-	gohttp "net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/GopeedLab/gopeed/pkg/protocol/http"
-)
-
-// A stalled Resolve body must not keep the prefetch goroutine alive after
-// stopPrefetchAndCopyData returns, or it writes to a file we already removed.
-func TestFetcher_StopPrefetchUnblocksStalledRead(t *testing.T) {
-	prefix := bytes.Repeat([]byte("p"), 64*1024)
-	stall := make(chan struct{})
-	defer close(stall)
-
-	server := httptest.NewServer(gohttp.HandlerFunc(func(w gohttp.ResponseWriter, r *gohttp.Request) {
-		w.Header().Set(base.HttpHeaderAcceptRanges, base.HttpHeaderBytes)
-		w.Header().Set(base.HttpHeaderContentLength, fmt.Sprintf("%d", len(prefix)*4))
-		w.WriteHeader(gohttp.StatusOK)
-		_, _ = w.Write(prefix)
-		w.(gohttp.Flusher).Flush()
-		select {
-		case <-stall:
-		case <-r.Context().Done():
-		}
-	}))
-	defer server.Close()
-
-	f := buildFetcher()
-	f.Meta().Opts = &base.Options{
-		Path:  t.TempDir(),
-		Name:  "stalled.data",
-		Extra: &http.OptsExtra{Connections: 1},
-	}
-	if err := f.Resolve(&base.Request{URL: server.URL + "/stalled.data"}); err != nil {
-		t.Fatal(err)
-	}
-	for f.prefetchSize.Load() < int64(len(prefix)) {
-		time.Sleep(time.Millisecond)
-	}
-
-	start := time.Now()
-	f.stopPrefetch()
-	if elapsed := time.Since(start); elapsed > 2*time.Second {
-		t.Fatalf("stopPrefetch took %v, want it to interrupt the stalled read", elapsed)
-	}
-	if !f.prefetchDone.Load() {
-		t.Fatal("prefetch goroutine still running after stopPrefetch")
-	}
-}

internal/protocol/http/timeout_reader.go

@@ -6,56 +6,35 @@ import (
 	"time"
 )
 
-// TimeoutReader fails a Read that makes no progress within timeout.
-//
-// One timer per reader is armed when Read starts and stopped before it
-// returns, so time the caller spends between reads is not counted. If the
-// timer fires, it calls cancel, which should cancel the HTTP request the
-// reader belongs to so the transport unblocks the pending Read. Read still
-// waits for the underlying Read to return; that Read and every later one
-// return context.DeadlineExceeded. Errors from any other cancellation are
-// returned unchanged, and closing the response body is left to the caller.
-//
-// With a nil cancel the pending Read cannot be interrupted; it still reports
-// context.DeadlineExceeded, but only once it returns.
-//
-// TimeoutReader is not safe for concurrent use.
 type TimeoutReader struct {
-	reader   io.Reader
+	reader  io.Reader
-	timeout  time.Duration
+	timeout time.Duration
-	cancel   context.CancelFunc
-	timer    *time.Timer
-	timedOut bool
 }
 
-func NewTimeoutReader(r io.Reader, timeout time.Duration, cancel context.CancelFunc) *TimeoutReader {
+func NewTimeoutReader(r io.Reader, timeout time.Duration) *TimeoutReader {
-	if cancel == nil {
-		cancel = func() {}
-	}
 	return &TimeoutReader{
 		reader:  r,
 		timeout: timeout,
-		cancel:  cancel,
 	}
 }
 
 func (tr *TimeoutReader) Read(p []byte) (n int, err error) {
-	if tr.timedOut {
+	ctx, cancel := context.WithTimeout(context.Background(), tr.timeout)
-		return 0, context.DeadlineExceeded
+	defer cancel()
-	}
-	if tr.timer == nil {
-		tr.timer = time.AfterFunc(tr.timeout, tr.cancel)
-	} else {
-		tr.timer.Reset(tr.timeout)
-	}
 
-	n, err = tr.reader.Read(p)
+	done := make(chan struct{})
+	var readErr error
+	var bytesRead int
 
-	if !tr.timer.Stop() {
+	go func() {
-		// The timer fired during this Read and cancelled the request, so err is
+		bytesRead, readErr = tr.reader.Read(p)
-		// whatever the interrupted read produced. Report the timeout instead.
+		close(done)
-		tr.timedOut = true
+	}()
-		return n, context.DeadlineExceeded
+
+	select {
+	case <-done:
+		return bytesRead, readErr
+	case <-ctx.Done():
+		return 0, ctx.Err()
 	}
-	return n, err
 }

internal/protocol/http/timeout_reader_test.go

@@ -2,26 +2,17 @@ package http
 
 import (
 	"bytes"
-	"compress/gzip"
 	"context"
-	"crypto/tls"
-	"crypto/x509"
 	"errors"
 	"io"
-	gohttp "net/http"
-	"net/http/httptest"
-	"sync"
-	"sync/atomic"
 	"testing"
 	"time"
-
-	"github.com/GopeedLab/gopeed/internal/httpclient"
 )
 
 func TestTimeoutReader_Read(t *testing.T) {
 	data := []byte("Hello, World!")
 	reader := bytes.NewReader(data)
-	timeoutReader := NewTimeoutReader(reader, 1*time.Second, nil)
+	timeoutReader := NewTimeoutReader(reader, 1*time.Second)
 
 	buf := make([]byte, len(data))
 	n, err := timeoutReader.Read(buf)
@@ -38,7 +29,7 @@ func TestTimeoutReader_Read(t *testing.T) {
 
 func TestTimeoutReader_ReadTimeout(t *testing.T) {
 	reader := &slowReader{delay: 2 * time.Second}
-	timeoutReader := NewTimeoutReader(reader, 1*time.Second, nil)
+	timeoutReader := NewTimeoutReader(reader, 1*time.Second)
 
 	buf := make([]byte, 8192)
 	_, err := timeoutReader.Read(buf)
@@ -58,340 +49,3 @@ func (sr *slowReader) Read(p []byte) (n int, err error) {
 	time.Sleep(sr.delay)
 	return 0, io.EOF
 }
-
-// The timer must only cover time spent inside Read, not caller work between reads.
-func TestTimeoutReader_IdleBetweenReads(t *testing.T) {
-	var cancelled atomic.Bool
-	timeoutReader := NewTimeoutReader(bytes.NewReader([]byte("abcdef")), 50*time.Millisecond, func() {
-		cancelled.Store(true)
-	})
-
-	buf := make([]byte, 3)
-	if _, err := timeoutReader.Read(buf); err != nil {
-		t.Fatalf("first read: %v", err)
-	}
-	time.Sleep(200 * time.Millisecond)
-	if _, err := timeoutReader.Read(buf); err != nil {
-		t.Fatalf("second read after idle: %v", err)
-	}
-	if cancelled.Load() {
-		t.Fatal("request was cancelled while idle between reads")
-	}
-}
-
-// A timed-out Read must not return while the underlying Read can still write
-// into the caller's buffer, and must leave closing the reader to the caller.
-func TestTimeoutReader_TimedOutReadDoesNotOutliveCaller(t *testing.T) {
-	reader := &lateWriteReader{cancelled: make(chan struct{})}
-	timeoutReader := NewTimeoutReader(reader, 50*time.Millisecond, reader.cancel)
-
-	buf := make([]byte, 8)
-	_, err := timeoutReader.Read(buf)
-	if !errors.Is(err, context.DeadlineExceeded) {
-		t.Fatalf("expected %v, got %v", context.DeadlineExceeded, err)
-	}
-	if !reader.returned.Load() {
-		t.Fatal("Read returned before the underlying Read finished")
-	}
-	if _, err := timeoutReader.Read(buf); !errors.Is(err, context.DeadlineExceeded) {
-		t.Fatalf("read after timeout: expected %v, got %v", context.DeadlineExceeded, err)
-	}
-	if reader.closed.Load() {
-		t.Fatal("reader was closed by the timeout")
-	}
-}
-
-// lateWriteReader blocks until cancelled, then writes into p before returning.
-type lateWriteReader struct {
-	cancelOnce sync.Once
-	cancelled  chan struct{}
-	returned   atomic.Bool
-	closed     atomic.Bool
-}
-
-func (r *lateWriteReader) Read(p []byte) (int, error) {
-	<-r.cancelled
-	time.Sleep(20 * time.Millisecond)
-	p[0] = 'x'
-	r.returned.Store(true)
-	return 0, context.Canceled
-}
-
-func (r *lateWriteReader) cancel() {
-	r.cancelOnce.Do(func() { close(r.cancelled) })
-}
-
-func (r *lateWriteReader) Close() error {
-	r.closed.Store(true)
-	return nil
-}
-
-type timeoutReaderClientCase struct {
-	name   string
-	http2  bool
-	client func(t *testing.T, server *httptest.Server) *gohttp.Client
-}
-
-func timeoutReaderClientCases() []timeoutReaderClientCase {
-	newClient := func(mode httpclient.ImpersonationMode) func(t *testing.T, server *httptest.Server) *gohttp.Client {
-		return func(t *testing.T, server *httptest.Server) *gohttp.Client {
-			var tlsConfig *tls.Config
-			if server.TLS != nil {
-				roots := x509.NewCertPool()
-				roots.AddCert(server.Certificate())
-				tlsConfig = &tls.Config{RootCAs: roots}
-			}
-			client, err := httpclient.NewClient(httpclient.Options{
-				Transport: httpclient.TransportOptions{
-					TLSClientConfig: tlsConfig,
-				},
-				Impersonation: httpclient.ImpersonationOptions{
-					Mode:    mode,
-					Browser: httpclient.BrowserChrome,
-				},
-			})
-			if err != nil {
-				t.Fatal(err)
-			}
-			return client
-		}
-	}
-	var cases []timeoutReaderClientCase
-	for _, mode := range []httpclient.ImpersonationMode{httpclient.ImpersonationNative, httpclient.ImpersonationFixed} {
-		cases = append(cases,
-			timeoutReaderClientCase{name: string(mode) + "/http1", client: newClient(mode)},
-			timeoutReaderClientCase{name: string(mode) + "/http2", http2: true, client: newClient(mode)},
-		)
-	}
-	return cases
-}
-
-func startTimeoutReaderServer(t *testing.T, useHTTP2 bool, handler gohttp.HandlerFunc) *httptest.Server {
-	server := httptest.NewUnstartedServer(handler)
-	if useHTTP2 {
-		server.EnableHTTP2 = true
-		server.StartTLS()
-	} else {
-		server.Start()
-	}
-	t.Cleanup(server.Close)
-	return server
-}
-
-// readBodyWithTimeout sends the request under its own context derived from
-// ctx, as the fetcher does, and reads the body through a TimeoutReader.
-func readBodyWithTimeout(t *testing.T, ctx context.Context, client *gohttp.Client, url string, timeout time.Duration, wantProto int) ([]byte, error) {
-	t.Helper()
-	reqCtx, cancel := context.WithCancel(ctx)
-	defer cancel()
-	req, err := gohttp.NewRequestWithContext(reqCtx, gohttp.MethodGet, url, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer resp.Body.Close()
-	if resp.ProtoMajor != wantProto {
-		t.Fatalf("expected HTTP/%d, got %s", wantProto, resp.Proto)
-	}
-
-	type result struct {
-		data []byte
-		err  error
-	}
-	done := make(chan result, 1)
-	go func() {
-		data, err := io.ReadAll(NewTimeoutReader(resp.Body, timeout, cancel))
-		done <- result{data, err}
-	}()
-	select {
-	case r := <-done:
-		return r.data, r.err
-	case <-time.After(timeout + 10*time.Second):
-		t.Fatal("Read did not return after the read timeout")
-		return nil, nil
-	}
-}
-
-func TestTimeoutReader_StalledHTTPBodyTimesOut(t *testing.T) {
-	for _, tc := range timeoutReaderClientCases() {
-		t.Run(tc.name, func(t *testing.T) {
-			server := startTimeoutReaderServer(t, tc.http2, func(w gohttp.ResponseWriter, r *gohttp.Request) {
-				w.Header().Set("Content-Length", "1048576")
-				w.Write(bytes.Repeat([]byte("a"), 1024))
-				w.(gohttp.Flusher).Flush()
-				<-r.Context().Done()
-			})
-
-			wantProto := 1
-			if tc.http2 {
-				wantProto = 2
-			}
-			const timeout = 200 * time.Millisecond
-			start := time.Now()
-			data, err := readBodyWithTimeout(t, context.Background(), tc.client(t, server), server.URL, timeout, wantProto)
-			if !errors.Is(err, context.DeadlineExceeded) {
-				t.Fatalf("expected %v, got %v", context.DeadlineExceeded, err)
-			}
-			if len(data) != 1024 {
-				t.Fatalf("expected the 1024 bytes sent before the stall, got %d", len(data))
-			}
-			if elapsed := time.Since(start); elapsed < timeout {
-				t.Fatalf("timed out after %v, before the %v read timeout", elapsed, timeout)
-			}
-		})
-	}
-}
-
-func TestTimeoutReader_SlowSteadyHTTPBodyDoesNotTimeOut(t *testing.T) {
-	const (
-		timeout  = 300 * time.Millisecond
-		interval = 30 * time.Millisecond
-		chunks   = 40 // 1.2s in total, four times the read timeout
-	)
-	for _, tc := range timeoutReaderClientCases() {
-		t.Run(tc.name, func(t *testing.T) {
-			server := startTimeoutReaderServer(t, tc.http2, func(w gohttp.ResponseWriter, r *gohttp.Request) {
-				for i := 0; i < chunks; i++ {
-					w.Write([]byte("0123456789"))
-					w.(gohttp.Flusher).Flush()
-					time.Sleep(interval)
-				}
-			})
-
-			wantProto := 1
-			if tc.http2 {
-				wantProto = 2
-			}
-			data, err := readBodyWithTimeout(t, context.Background(), tc.client(t, server), server.URL, timeout, wantProto)
-			if err != nil {
-				t.Fatalf("expected no error, got %v", err)
-			}
-			if len(data) != chunks*10 {
-				t.Fatalf("expected %d bytes, got %d", chunks*10, len(data))
-			}
-		})
-	}
-}
-
-// A gzip-encoded body that stalls must time out without racing the caller's
-// Body.Close against the decompressing reader.
-func TestTimeoutReader_StalledGzipHTTPBodyTimesOut(t *testing.T) {
-	payload := bytes.Repeat([]byte("gopeed"), 1024)
-	stages := []struct {
-		name  string
-		write func(w io.Writer)
-		want  int
-	}{
-		{
-			// The first bytes of a gzip header, so the client blocks inside
-			// gzip.NewReader.
-			name:  "incomplete-header",
-			write: func(w io.Writer) { w.Write([]byte{0x1f, 0x8b, 0x08, 0x00}) },
-			want:  0,
-		},
-		{
-			// A complete header and some compressed data, flushed without
-			// finishing the gzip stream.
-			name: "stalled-body",
-			write: func(w io.Writer) {
-				gz := gzip.NewWriter(w)
-				gz.Write(payload)
-				gz.Flush()
-			},
-			want: len(payload),
-		},
-	}
-	for _, stage := range stages {
-		for _, tc := range timeoutReaderClientCases() {
-			t.Run(stage.name+"/"+tc.name, func(t *testing.T) {
-				server := startTimeoutReaderServer(t, tc.http2, func(w gohttp.ResponseWriter, r *gohttp.Request) {
-					w.Header().Set("Content-Encoding", "gzip")
-					stage.write(w)
-					w.(gohttp.Flusher).Flush()
-					<-r.Context().Done()
-				})
-
-				wantProto := 1
-				if tc.http2 {
-					wantProto = 2
-				}
-				data, err := readBodyWithTimeout(t, context.Background(), tc.client(t, server), server.URL, 200*time.Millisecond, wantProto)
-				if !errors.Is(err, context.DeadlineExceeded) {
-					t.Fatalf("expected %v, got %v", context.DeadlineExceeded, err)
-				}
-				if len(data) != stage.want {
-					t.Fatalf("expected the %d bytes sent before the stall, got %d", stage.want, len(data))
-				}
-			})
-		}
-	}
-}
-
-// Cancelling the caller's context must not be reported as a read timeout.
-func TestTimeoutReader_CallerCancellationIsNotTimeout(t *testing.T) {
-	for _, tc := range timeoutReaderClientCases() {
-		t.Run(tc.name, func(t *testing.T) {
-			server := startTimeoutReaderServer(t, tc.http2, func(w gohttp.ResponseWriter, r *gohttp.Request) {
-				w.Header().Set("Content-Length", "1048576")
-				w.Write(bytes.Repeat([]byte("a"), 1024))
-				w.(gohttp.Flusher).Flush()
-				<-r.Context().Done()
-			})
-
-			wantProto := 1
-			if tc.http2 {
-				wantProto = 2
-			}
-			// Cancel once the client has read the first bytes, so the next
-			// Read is the one blocked when the caller cancels.
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
-			client := tc.client(t, server)
-			next := client.Transport
-			client.Transport = roundTripFunc(func(r *gohttp.Request) (*gohttp.Response, error) {
-				resp, err := next.RoundTrip(r)
-				if err == nil {
-					resp.Body = &cancelAfterFirstRead{ReadCloser: resp.Body, cancel: cancel}
-				}
-				return resp, err
-			})
-
-			const timeout = 5 * time.Second
-			start := time.Now()
-			data, err := readBodyWithTimeout(t, ctx, client, server.URL, timeout, wantProto)
-			if !errors.Is(err, context.Canceled) {
-				t.Fatalf("expected %v, got %v", context.Canceled, err)
-			}
-			if len(data) == 0 {
-				t.Fatal("cancelled before any data was read")
-			}
-			if elapsed := time.Since(start); elapsed >= timeout {
-				t.Fatalf("read returned after %v, not on cancellation", elapsed)
-			}
-		})
-	}
-}
-
-type roundTripFunc func(*gohttp.Request) (*gohttp.Response, error)
-
-func (f roundTripFunc) RoundTrip(r *gohttp.Request) (*gohttp.Response, error) {
-	return f(r)
-}
-
-// cancelAfterFirstRead calls cancel once a Read has returned data.
-type cancelAfterFirstRead struct {
-	io.ReadCloser
-	once   sync.Once
-	cancel context.CancelFunc
-}
-
-func (b *cancelAfterFirstRead) Read(p []byte) (int, error) {
-	n, err := b.ReadCloser.Read(p)
-	if n > 0 {
-		b.once.Do(b.cancel)
-	}
-	return n, err
-}

pkg/api/service.go

@@ -180,11 +180,11 @@ func (s *Service) createTaskBatch(ctx *Context) *Response {
 	if len(request.Reqs) == 0 {
 		return newErrorResponse("param invalid: reqs", restmodel.CodeInvalidParam)
 	}
-	result, err := s.Downloader.CreateDirectBatchWithResult(&request)
+	taskIDs, err := s.Downloader.CreateDirectBatch(&request)
 	if err != nil {
 		return newErrorResponse(err.Error())
 	}
-	return newOKResponse(result)
+	return newOKResponse(taskIDs)
 }
 
 func (s *Service) patchTask(ctx *Context) *Response {

pkg/api/service_test.go

@@ -267,65 +267,3 @@ func TestFullConfigAndJobTriggerShareProtectedProtocolState(t *testing.T) {
 		t.Fatalf("job state overwritten: %s", raw)
 	}
 }
-
-func TestBatchResolvedAndDirectCreation(t *testing.T) {
-	upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		w.Header().Set("Content-Length", "4")
-		_, _ = w.Write([]byte("test"))
-	}))
-	t.Cleanup(upstream.Close)
-	d := download.NewDownloader(&download.DownloaderConfig{StorageDir: t.TempDir(), TempDir: t.TempDir(), FetchManagers: []fetcher.FetcherManager{&httpProtocol.FetcherManager{}}})
-	if err := d.Setup(); err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { d.Close() })
-	cfg, err := d.GetConfig()
-	if err != nil {
-		t.Fatal(err)
-	}
-	cfg.MaxRunning = 0
-	if err := d.PutConfig(cfg); err != nil {
-		t.Fatal(err)
-	}
-	service, err := NewService(d)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, grouped := range []bool{false, true} {
-		resolved := serviceTestRequest[*download.ResolveResult](t, service, http.MethodPost, "/api/v1/resolve", &restmodel.ResolveTask{Req: &base.Request{URL: upstream.URL + "/resolved"}})
-		result := serviceTestRequest[map[string]json.RawMessage](t, service, http.MethodPost, "/api/v1/tasks/batch", &base.CreateTaskBatch{
-			Group: grouped, GroupName: "folder", Opts: &base.Options{Path: t.TempDir()},
-			Reqs: []*base.CreateTaskBatchItem{
-				{Rid: "invalid"},
-				{Rid: resolved.ID, Req: &base.Request{URL: "unsupported://ignored"}, Opts: &base.Options{SelectFiles: []int{0}}},
-				{Req: &base.Request{URL: upstream.URL + "/direct"}},
-			},
-		})
-		var ids []string
-		if err := json.Unmarshal(result["taskIds"], &ids); err != nil || len(ids) != 2 {
-			t.Fatalf("unexpected task IDs: %+v, %v", result, err)
-		}
-		wantFields := 1
-		if grouped {
-			wantFields = 2
-		}
-		if len(result) != wantFields {
-			t.Fatalf("unexpected response fields: %+v", result)
-		}
-		var parentID string
-		if grouped {
-			if err := json.Unmarshal(result["parentId"], &parentID); err != nil || parentID == "" {
-				t.Fatalf("missing parent ID: %+v", result)
-			}
-		}
-		task := serviceTestRequest[*download.Task](t, service, http.MethodGet, "/api/v1/tasks/"+ids[0], nil)
-		if task.ParentID != parentID || !reflect.DeepEqual(task.Meta.Opts.SelectFiles, []int{0}) {
-			t.Fatalf("resolved task lost membership or selection: %+v", task)
-		}
-		status, response := service.JSON(http.MethodPost, "/api/v1/tasks/batch", nil, []byte(`{"reqs":[{"rid":"missing"},{"req":{"url":"unsupported://bad"}}]}`), nil)
-		var failed restmodel.Result[any]
-		if err := json.Unmarshal(response, &failed); err != nil || status != http.StatusOK || failed.Code == restmodel.CodeOk {
-			t.Fatalf("all-failed batch succeeded: %d %s", status, response)
-		}
-	}
-}

pkg/base/model.go

@@ -27,33 +27,6 @@ type Request struct {
 	SkipVerifyCert bool `json:"skipVerifyCert"`
 }
 
-// SetLabels replaces all labels on the request.
-//
-// Deprecated: In onResolve and onDone, assign request labels directly.
-// In onStart and onError, use task.meta.req.setLabels instead.
-func (r *Request) SetLabels(labels map[string]string) {
-	r.Labels = labels
-}
-
-// PutLabel sets a label on the request.
-//
-// Deprecated: In onResolve and onDone, assign request labels directly.
-// In onStart and onError, use task.meta.req.putLabel instead.
-func (r *Request) PutLabel(key, value string) {
-	if r.Labels == nil {
-		r.Labels = make(map[string]string)
-	}
-	r.Labels[key] = value
-}
-
-// DelLabel deletes a label from the request.
-//
-// Deprecated: In onResolve and onDone, delete request labels directly.
-// In onStart and onError, use task.meta.req.delLabel instead.
-func (r *Request) DelLabel(key string) {
-	delete(r.Labels, key)
-}
-
 func (r *Request) Validate() error {
 	if r.URL == "" {
 		return fmt.Errorf("invalid request url")
@@ -200,14 +173,11 @@ func ParseOptExtra[E any](opts *Options) error {
 }
 
 type CreateTaskBatch struct {
-	Reqs      []*CreateTaskBatchItem `json:"reqs"`
+	Reqs []*CreateTaskBatchItem `json:"reqs"`
-	Opts      *Options               `json:"opts"`
+	Opts *Options               `json:"opts"`
-	Group     bool                   `json:"group"`
-	GroupName string                 `json:"groupName"`
 }
 
 type CreateTaskBatchItem struct {
-	Rid  string   `json:"rid,omitempty"`
 	Req  *Request `json:"req"`
 	Opts *Options `json:"opts"`
 }

pkg/download/category.go

@@ -32,10 +32,6 @@ func categoryForResource(cfg *base.DownloaderStoreConfig, res *base.Resource) *b
 // runs on the result, so a category directory the white list rejects falls
 // back to the base directory of this task instead of failing it.
 func (d *Downloader) decideDownloadDir(opts *base.Options, res *base.Resource) (string, error) {
-	return d.decideDownloadDirForTask(opts, res, nil)
-}
-
-func (d *Downloader) decideDownloadDirForTask(opts *base.Options, res *base.Resource, group *TaskGroup) (string, error) {
 	if opts == nil {
 		opts = &base.Options{}
 	}
@@ -52,9 +48,6 @@ func (d *Downloader) decideDownloadDirForTask(opts *base.Options, res *base.Reso
 	if base == "" {
 		return "", errors.New("download directory is empty")
 	}
-	if group != nil && opts.SkipAutoCategorize {
-		return d.initDownloadPathForTask(base, group)
-	}
 	target := base
 	if !opts.SkipAutoCategorize {
 		if category := categoryForResource(cfg, res); category != nil {

pkg/download/category_test.go

@@ -234,38 +234,6 @@ func TestDecideDownloadDirWhiteList(t *testing.T) {
 	})
 }
 
-func TestDecideGroupDownloadDirWhiteList(t *testing.T) {
-	parent := t.TempDir()
-	root := filepath.Join(parent, "folder")
-	nested := filepath.Join(root, "nested")
-	for _, test := range []struct {
-		name    string
-		path    string
-		group   *TaskGroup
-		allowed string
-		wantErr bool
-	}{
-		{name: "group root", path: root, group: &TaskGroup{Path: root}, allowed: filepath.Join(parent, "*")},
-		{name: "nested member", path: nested, group: &TaskGroup{Path: root}, allowed: filepath.Join(parent, "*")},
-		{name: "ordinary nested task", path: nested, allowed: filepath.Join(parent, "*"), wantErr: true},
-		{name: "member outside group", path: filepath.Join(parent, "other"), group: &TaskGroup{Path: root}, allowed: filepath.Join(parent, "*"), wantErr: true},
-		{name: "group permission revoked", path: nested, group: &TaskGroup{Path: root}, allowed: nested, wantErr: true},
-		{name: "literal group name", path: filepath.Join(parent, "%year%", "nested"), group: &TaskGroup{Path: filepath.Join(parent, "%year%")}, allowed: filepath.Join(parent, "*")},
-	} {
-		t.Run(test.name, func(t *testing.T) {
-			d := newUnitCategoryDownloader(newTestCategoryConfig())
-			d.cfg.WhiteDownloadDirs = []string{test.allowed}
-			got, err := d.decideDownloadDirForTask(&base.Options{Path: test.path, SkipAutoCategorize: true}, singleFileResource("file.txt"), test.group)
-			if (err != nil) != test.wantErr {
-				t.Fatalf("decideDownloadDirForTask() = %q, %v; want error = %v", got, err, test.wantErr)
-			}
-			if err == nil && got != test.path {
-				t.Fatalf("path = %q, want %q", got, test.path)
-			}
-		})
-	}
-}
-
 func TestSuggestedDownloadDir(t *testing.T) {
 	programDir := filepath.Join("./downloads", "Program")
 

pkg/download/downloader.go

@@ -25,7 +25,6 @@ import (
 	"github.com/GopeedLab/gopeed/internal/tempfiles"
 	webviewproxy "github.com/GopeedLab/gopeed/internal/webview/proxy"
 	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/GopeedLab/gopeed/pkg/protocol/ftp"
 	"github.com/GopeedLab/gopeed/pkg/protocol/http"
 	"github.com/GopeedLab/gopeed/pkg/util"
 	gonanoid "github.com/matoous/go-nanoid/v2"
@@ -37,8 +36,7 @@ const (
 	uploadCheckpointInterval = 30 * time.Second
 
 	// task info bucket
-	bucketTask      = "task"
+	bucketTask = "task"
-	bucketTaskGroup = "task_group"
 	// task download data bucket
 	bucketSave = "save"
 	// task statistics snapshot bucket
@@ -114,16 +112,13 @@ type Downloader struct {
 	Logger              *logger.Logger
 	ExtensionLogger     *logger.Logger
 
-	cfg            *DownloaderConfig
+	cfg          *DownloaderConfig
-	fetcherCache   map[string]fetcher.Fetcher
+	fetcherCache map[string]fetcher.Fetcher
-	storage        Storage
+	storage      Storage
-	tasks          []*Task
+	tasks        []*Task
-	waitTasks      []*Task
+	waitTasks    []*Task
-	groups         map[string]*TaskGroup
+	watchedTasks sync.Map
-	creatingGroups map[string]struct{}
+	listener     Listener
-	deletingTasks  map[string]*Task
-	watchedTasks   sync.Map
-	listener       Listener
 
 	lock               *sync.Mutex
 	configLock         *sync.RWMutex
@@ -154,9 +149,6 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
 		cfg:              cfg,
 		fetcherCache:     make(map[string]fetcher.Fetcher),
 		waitTasks:        make([]*Task, 0),
-		groups:           make(map[string]*TaskGroup),
-		creatingGroups:   make(map[string]struct{}),
-		deletingTasks:    make(map[string]*Task),
 		storage:          cfg.Storage,
 
 		lock:               &sync.Mutex{},
@@ -183,7 +175,7 @@ func (d *Downloader) Setup() error {
 	d.blob = internalblob.NewRegistry("")
 
 	// setup storage
-	if err := d.storage.Setup([]string{bucketTask, bucketTaskGroup, bucketSave, bucketTaskStats, bucketProtocolState, bucketProtocolJobs, bucketConfig, bucketExtension, bucketExtensionStorage}); err != nil {
+	if err := d.storage.Setup([]string{bucketTask, bucketSave, bucketTaskStats, bucketProtocolState, bucketProtocolJobs, bucketConfig, bucketExtension, bucketExtensionStorage}); err != nil {
 		return err
 	}
 	// load config from storage
@@ -227,15 +219,6 @@ func (d *Downloader) Setup() error {
 		return err
 	}
 
-	// Group metadata is independent of task/fetcher recovery records.
-	var groups []*TaskGroup
-	if err := d.storage.List(bucketTaskGroup, &groups); err != nil {
-		return err
-	}
-	for _, group := range groups {
-		d.groups[group.ID] = group
-	}
-
 	// load tasks from storage
 	var tasks []*Task
 	if err = d.storage.List(bucketTask, &tasks); err != nil {
@@ -251,7 +234,6 @@ func (d *Downloader) Setup() error {
 				tasks = append(tasks[:i], tasks[i+1:]...)
 				continue
 			}
-			task.group = d.groups[task.ParentID]
 			d.assignFetcherManager(task)
 			initTask(task)
 			if task.Status != base.DownloadStatusDone && task.Status != base.DownloadStatusError {
@@ -260,11 +242,6 @@ func (d *Downloader) Setup() error {
 		}
 	}
 	d.tasks = tasks
-	groupIDs := make([]string, 0, len(d.groups))
-	for id := range d.groups {
-		groupIDs = append(groupIDs, id)
-	}
-	d.cleanupEmptyGroups(groupIDs)
 	// sort by create time
 	sort.Slice(d.tasks, func(i, j int) bool {
 		return d.tasks[i].CreatedAt.Before(d.tasks[j].CreatedAt)
@@ -482,9 +459,6 @@ func (d *Downloader) setupFetcher(fm fetcher.FetcherManager, fetcher fetcher.Fet
 	ctl.GetConfig = func(v any) {
 		d.getProtocolConfig(fm.Name(), v)
 	}
-	if d.Logger != nil {
-		ctl.Logger = &d.Logger.Logger
-	}
 	// Get proxy config, task request proxy config has higher priority, then use global proxy config
 	ctl.GetProxy = func(requestProxy *base.RequestProxy) func(*gohttp.Request) (*url.URL, error) {
 		// Registry-backed blob URLs are loopback capability URLs and must never be
@@ -629,14 +603,14 @@ func (d *Downloader) CreateDirect(req *base.Request, opts *base.Options) (taskId
 	if err != nil {
 		return "", err
 	}
-	taskId, err = d.createDirect(req, opts, "")
+	taskId, err = d.createDirect(req, opts)
 	if err == nil {
 		d.persistDefaultPathBestEffort(defaultPath)
 	}
 	return
 }
 
-func (d *Downloader) createDirect(req *base.Request, opts *base.Options, groupID string) (taskId string, err error) {
+func (d *Downloader) createDirect(req *base.Request, opts *base.Options) (taskId string, err error) {
 	ensureRequestRawURL(req)
 	var fetcher fetcher.Fetcher
 	fetcher, err = d.buildFetcher(req.URL)
@@ -648,203 +622,31 @@ func (d *Downloader) createDirect(req *base.Request, opts *base.Options, groupID
 	if err != nil {
 		return
 	}
-	return d.doCreate(fetcher, initOpt, groupID)
+	return d.doCreate(fetcher, initOpt)
 }
 
-// CreateDirectBatch retains the original Go API for callers that only need
+func (d *Downloader) CreateDirectBatch(req *base.CreateTaskBatch) (taskId []string, err error) {
-// the task IDs. APIs that expose group metadata use CreateDirectBatchWithResult.
-func (d *Downloader) CreateDirectBatch(req *base.CreateTaskBatch) ([]string, error) {
-	result, err := d.CreateDirectBatchWithResult(req)
-	if err != nil || result == nil {
-		return nil, err
-	}
-	return result.TaskIDs, nil
-}
-
-func (d *Downloader) CreateDirectBatchWithResult(req *base.CreateTaskBatch) (*CreateTaskBatchResult, error) {
-	if req == nil || len(req.Reqs) == 0 {
-		return nil, errors.New("batch requires at least one task")
-	}
 	defaultPath, err := d.prepareDefaultPath(req.Opts)
 	if err != nil {
 		return nil, err
 	}
-	result := &CreateTaskBatchResult{TaskIDs: make([]string, 0)}
+	taskIds := make([]string, 0)
-	var group *TaskGroup
+	for _, ir := range req.Reqs {
-	if req.Group {
+		opts := ir.Opts
-		parentPath := ""
-		if req.Opts != nil {
-			parentPath = req.Opts.Path
-		}
-		group, err = d.createTaskGroup(req.GroupName, parentPath)
-		if err != nil {
-			return nil, err
-		}
-		result.ParentID = group.ID
-		defer func() {
-			d.lock.Lock()
-			delete(d.creatingGroups, group.ID)
-			d.lock.Unlock()
-			d.cleanupEmptyGroups([]string{group.ID})
-		}()
-	}
-	var failures []error
-	for _, item := range req.Reqs {
-		var taskID string
-		var opts *base.Options
-		if item != nil {
-			opts = item.Opts
-		}
 		if opts == nil {
 			opts = req.Opts
 		}
-		if opts == nil {
+		if opts != nil {
-			opts = &base.Options{}
-		} else {
 			opts = opts.Clone()
 		}
-		var itemErr error
+		taskId, err := d.createDirect(ir.Req, opts)
-		groupID := ""
+		if err != nil {
-		if group != nil {
+			return nil, err
-			groupID = group.ID
-			parentPath := filepath.Dir(group.Path)
-			relative := "."
-			if item != nil && item.Opts != nil && opts.Path != "" {
-				requestedPath := util.ReplacePathPlaceholders(opts.Path)
-				if !filepath.IsAbs(requestedPath) {
-					requestedPath = filepath.Join(parentPath, requestedPath)
-				}
-				requested, pathErr := filepath.Abs(requestedPath)
-				if pathErr != nil {
-					itemErr = pathErr
-				} else {
-					relative, itemErr = filepath.Rel(parentPath, requested)
-					if itemErr == nil && !filepath.IsLocal(relative) {
-						itemErr = errors.New("task path is outside the group directory")
-					}
-				}
-			}
-			opts.Path = filepath.Join(group.Path, relative)
-			opts.SkipAutoCategorize = true
 		}
-		if itemErr == nil {
+		taskIds = append(taskIds, taskId)
-			switch {
-			case item == nil:
-				itemErr = errors.New("task request or rid is required")
-			case item.Rid != "":
-				taskID, itemErr = d.createResolved(item.Rid, opts, groupID)
-			case item.Req != nil:
-				taskID, itemErr = d.createDirect(item.Req, opts, groupID)
-			default:
-				itemErr = errors.New("task request or rid is required")
-			}
-		}
-		if taskID != "" {
-			result.TaskIDs = append(result.TaskIDs, taskID)
-		} else if itemErr != nil {
-			failures = append(failures, itemErr)
-		}
-	}
-	if len(result.TaskIDs) == 0 {
-		return nil, fmt.Errorf("all batch tasks failed: %w", errors.Join(failures...))
 	}
 	d.persistDefaultPathBestEffort(defaultPath)
-	return result, nil
+	return taskIds, nil
-}
-
-const maxTaskGroupDirSuffix = 1000
-
-func (d *Downloader) createTaskGroup(name, parentPath string) (*TaskGroup, error) {
-	parentOpts, err := d.initOptions(&base.Options{Path: parentPath}, "")
-	if err != nil {
-		return nil, err
-	}
-	parentPath = util.ReplacePathPlaceholders(strings.TrimSpace(parentOpts.Path))
-	if parentPath == "" {
-		return nil, errors.New("download directory is empty")
-	}
-	parentPath, err = filepath.Abs(parentPath)
-	if err != nil {
-		return nil, err
-	}
-	name = strings.TrimSpace(name)
-	if strings.ContainsAny(name, "/\\\x00") || filepath.IsAbs(name) {
-		return nil, errors.New("invalid task group name")
-	}
-	if strings.ContainsAny(name, `:*?"<>|`) || strings.HasSuffix(name, ".") {
-		return nil, errors.New("invalid task group name")
-	}
-	name = util.SafeFilename(name)
-	if name == "" || name == "." || name == ".." {
-		return nil, errors.New("invalid task group name")
-	}
-	d.lock.Lock()
-	defer d.lock.Unlock()
-	requested := filepath.Join(parentPath, name)
-	var dir string
-	for suffix := 0; suffix <= maxTaskGroupDirSuffix; suffix++ {
-		candidate := requested
-		if suffix > 0 {
-			candidate = fmt.Sprintf("%s (%d)", requested, suffix)
-		}
-		if !d.isDownloadPathAllowed(candidate) {
-			return nil, errors.New("task group directory is outside the white list")
-		}
-		reserved := false
-		for _, existing := range d.groups {
-			if existing.Path == candidate {
-				reserved = true
-				break
-			}
-		}
-		if reserved {
-			continue
-		}
-		if err := os.MkdirAll(parentPath, 0755); err != nil {
-			return nil, err
-		}
-		if err := os.Mkdir(candidate, 0755); err != nil {
-			if errors.Is(err, os.ErrExist) {
-				continue
-			}
-			return nil, err
-		}
-		dir = candidate
-		break
-	}
-	if dir == "" {
-		return nil, errors.New("too many duplicate task group directories")
-	}
-	group := &TaskGroup{ID: NewTask().ID, Name: filepath.Base(dir), Path: dir, CreatedAt: time.Now()}
-	if err := d.storage.Put(bucketTaskGroup, group.ID, group); err != nil {
-		_ = os.Remove(dir)
-		return nil, err
-	}
-	d.groups[group.ID] = group
-	d.creatingGroups[group.ID] = struct{}{}
-	return group, nil
-}
-
-// Group IDs expand through parentId, even when metadata is unavailable.
-// The caller holds d.lock.
-func (d *Downloader) expandGroupTaskIDsLocked(ids []string) []string {
-	selected := make(map[string]bool, len(ids))
-	for _, id := range ids {
-		selected[id] = true
-	}
-	expanded := make([]string, 0, len(ids))
-	for _, task := range d.tasks {
-		if selected[task.ID] || (task.ParentID != "" && selected[task.ParentID]) {
-			expanded = append(expanded, task.ID)
-		}
-	}
-	return expanded
-}
-
-func (d *Downloader) expandGroupTaskIDs(ids []string) []string {
-	d.lock.Lock()
-	defer d.lock.Unlock()
-	return d.expandGroupTaskIDsLocked(ids)
 }
 
 func (d *Downloader) Create(rrId string) (taskId string, err error) {
@@ -853,38 +655,22 @@ func (d *Downloader) Create(rrId string) (taskId string, err error) {
 
 // CreateWithOptions creates a resolved task using the submitted options, or the
 // default download options when opts is nil.
-func (d *Downloader) CreateWithOptions(rrId string, opts *base.Options) (string, error) {
+func (d *Downloader) CreateWithOptions(rrId string, opts *base.Options) (taskId string, err error) {
-	defaultPath, err := d.prepareDefaultPath(opts)
+	d.fetcherMapLock.RLock()
-	if err != nil {
-		return "", err
-	}
-	taskID, err := d.createResolved(rrId, opts, "")
-	if taskID != "" {
-		d.persistDefaultPathBestEffort(defaultPath)
-	}
-	return taskID, err
-}
-
-func (d *Downloader) createResolved(rrId string, opts *base.Options, groupID string) (taskId string, err error) {
-	d.fetcherMapLock.Lock()
 	fetcher, ok := d.fetcherCache[rrId]
-	delete(d.fetcherCache, rrId)
+	d.fetcherMapLock.RUnlock()
-	d.fetcherMapLock.Unlock()
 	if !ok {
 		return "", errors.New("invalid resource id")
 	}
-	// Only one creator may use a resolved fetcher. Failed creation makes it
-	// available again; a persisted task consumes it even if starting fails.
-	defer func() {
-		if taskId == "" {
-			d.fetcherMapLock.Lock()
-			d.fetcherCache[rrId] = fetcher
-			d.fetcherMapLock.Unlock()
-		}
-	}()
 	if opts == nil {
 		opts = &base.Options{}
 	}
+	// The options of the caller decide the global default download directory,
+	// the task options are prepared later, when the task starts.
+	defaultPath, err := d.prepareDefaultPath(opts)
+	if err != nil {
+		return "", err
+	}
 	taskOpts, err := d.initOptions(opts.Clone(), fetcher.Meta().Req.URL)
 	if err != nil {
 		return "", err
@@ -908,7 +694,15 @@ func (d *Downloader) createResolved(rrId string, opts *base.Options, groupID str
 			return "", err
 		}
 	}
-	taskId, err = d.doCreate(fetcher, nil, groupID)
+	defer func() {
+		d.fetcherMapLock.Lock()
+		delete(d.fetcherCache, rrId)
+		d.fetcherMapLock.Unlock()
+	}()
+	taskId, err = d.doCreate(fetcher, nil)
+	if err == nil {
+		d.persistDefaultPathBestEffort(defaultPath)
+	}
 	return
 }
 
@@ -964,30 +758,11 @@ func (d *Downloader) Pause(filter *TaskFilter) (err error) {
 		return d.pauseAll()
 	}
 
-	if len(filter.IDs) > 0 {
-		filter.IDs = d.expandGroupTaskIDs(filter.IDs)
-		if len(filter.IDs) == 0 {
-			return ErrTaskNotFound
-		}
-	}
 	filter.NotStatuses = []base.Status{base.DownloadStatusPause, base.DownloadStatusError, base.DownloadStatusDone}
 	pauseTasks := d.GetTasksByFilter(filter)
 	if len(pauseTasks) == 0 {
 		return ErrTaskNotFound
 	}
-	d.lock.Lock()
-	pausedIDs := make(map[string]struct{}, len(pauseTasks))
-	for _, task := range pauseTasks {
-		pausedIDs[task.ID] = struct{}{}
-	}
-	queued := d.waitTasks[:0]
-	for _, task := range d.waitTasks {
-		if _, paused := pausedIDs[task.ID]; !paused {
-			queued = append(queued, task)
-		}
-	}
-	d.waitTasks = queued
-	d.lock.Unlock()
 
 	for _, task := range pauseTasks {
 		if err = d.doPause(task); err != nil {
@@ -1023,12 +798,6 @@ func (d *Downloader) Continue(filter *TaskFilter) (err error) {
 		return d.continueAll()
 	}
 
-	if len(filter.IDs) > 0 {
-		filter.IDs = d.expandGroupTaskIDs(filter.IDs)
-		if len(filter.IDs) == 0 {
-			return ErrTaskNotFound
-		}
-	}
 	filter.NotStatuses = []base.Status{base.DownloadStatusRunning, base.DownloadStatusDone}
 	continueTasks := d.GetTasksByFilter(filter)
 	if len(continueTasks) == 0 {
@@ -1128,12 +897,6 @@ func (d *Downloader) ContinueBatch(filter *TaskFilter) (err error) {
 		return d.continueAll()
 	}
 
-	if len(filter.IDs) > 0 {
-		filter.IDs = d.expandGroupTaskIDs(filter.IDs)
-		if len(filter.IDs) == 0 {
-			return ErrTaskNotFound
-		}
-	}
 	continueTasks := d.GetTasksByFilter(filter)
 	for _, task := range continueTasks {
 		if err = d.doStart(task); err != nil {
@@ -1153,175 +916,72 @@ func (d *Downloader) ContinueOnStartup() error {
 	return d.Continue(nil)
 }
 
-func (d *Downloader) Delete(filter *TaskFilter, force bool) error {
+func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
-	d.lock.Lock()
-	groups := make(map[string]*TaskGroup)
 	if filter == nil || filter.IsEmpty() {
-		for id, group := range d.groups {
+		return d.deleteAll(force)
-			groups[id] = group
-		}
-	} else if len(filter.IDs) > 0 {
-		copyFilter := *filter
-		copyFilter.IDs = d.expandGroupTaskIDsLocked(filter.IDs)
-		for _, id := range filter.IDs {
-			if group := d.groups[id]; group != nil {
-				groups[id] = group
-			}
-		}
-		if len(copyFilter.IDs) == 0 {
-			if len(groups) == 0 {
-				d.lock.Unlock()
-				return nil
-			}
-			// An empty ID filter means all tasks; retain a nonmatching sentinel.
-			copyFilter.IDs = []string{""}
-		}
-		filter = &copyFilter
 	}
-	for id := range groups {
+
-		if _, creating := d.creatingGroups[id]; creating {
+	deleteTasks := d.GetTasksByFilter(filter)
-			d.lock.Unlock()
+	if len(deleteTasks) == 0 {
-			return errors.New("task group is being created")
+		return
-		}
 	}
-	tasks := append([]*Task(nil), d.getTasksByFilter(filter)...)
+
-	deleted := make(map[string]bool, len(tasks))
+	deleteIds := make([]string, 0)
-	groupIDs := make([]string, 0, len(groups))
+	deleteTasksPtr := make([]*Task, 0)
-	for id := range groups {
+	for _, task := range deleteTasks {
-		groupIDs = append(groupIDs, id)
+		deleteIds = append(deleteIds, task.ID)
+		deleteTasksPtr = append(deleteTasksPtr, task)
 	}
-	for _, task := range tasks {
+	func() {
-		d.deletingTasks[task.ID] = task
+		d.lock.Lock()
-		deleted[task.ID] = true
+		defer d.lock.Unlock()
-		if task.ParentID != "" {
+
-			groupIDs = append(groupIDs, task.ParentID)
+		for _, id := range deleteIds {
-		}
+			for i, t := range d.tasks {
-	}
+				if t.ID == id {
-	kept := d.tasks[:0]
+					d.tasks = append(d.tasks[:i], d.tasks[i+1:]...)
-	for _, task := range d.tasks {
+					break
-		if !deleted[task.ID] {
-			kept = append(kept, task)
-		}
-	}
-	d.tasks = kept
-	wasQueued := make(map[string]bool)
-	queued := d.waitTasks[:0]
-	for _, task := range d.waitTasks {
-		if deleted[task.ID] {
-			wasQueued[task.ID] = true
-		}
-		if !deleted[task.ID] {
-			queued = append(queued, task)
-		}
-	}
-	d.waitTasks = queued
-	d.lock.Unlock()
-	var firstErr error
-	for _, task := range tasks {
-		if err := d.doDelete(task, force); err != nil {
-			// Deletion can fail after removing bucketTask. Keep recovery durable.
-			if saveErr := d.storage.Put(bucketTask, task.ID, task.clone()); saveErr != nil {
-				d.Logger.Error().Err(saveErr).Msg("restore failed task deletion failed")
-				if firstErr == nil {
-					firstErr = saveErr
 				}
 			}
-			d.lock.Lock()
+			for i, t := range d.waitTasks {
-			d.tasks = append(d.tasks, task)
+				if t.ID == id {
-			if wasQueued[task.ID] {
+					d.waitTasks = append(d.waitTasks[:i], d.waitTasks[i+1:]...)
-				d.waitTasks = append(d.waitTasks, task)
+					break
-			}
+				}
-			d.lock.Unlock()
-			if firstErr == nil {
-				firstErr = err
 			}
 		}
+	}()
+
+	for _, task := range deleteTasksPtr {
+		err = d.doDelete(task, force)
+		if err != nil {
+			return
+		}
 	}
-	d.lock.Lock()
+
-	for _, task := range tasks {
-		delete(d.deletingTasks, task.ID)
-	}
-	d.lock.Unlock()
-	if !force {
-		groups = nil
-	}
-	if err := d.cleanupTaskGroups(groupIDs, groups); err != nil && firstErr == nil {
-		firstErr = err
-	}
 	d.notifyRunning()
-	return firstErr
+	return
 }
 
-// Active batches keep their metadata until the final creation attempt finishes.
+func (d *Downloader) deleteAll(force bool) (err error) {
-func (d *Downloader) cleanupEmptyGroups(groupIDs []string) {
+	var deleteTasksTemp []*Task
-	if err := d.cleanupTaskGroups(groupIDs, nil); err != nil {
+	func() {
-		d.Logger.Error().Err(err).Msg("cleanup empty task group failed")
+		d.lock.Lock()
-	}
+		defer d.lock.Unlock()
-}
 
-func (d *Downloader) cleanupTaskGroups(groupIDs []string, forceGroups map[string]*TaskGroup) error {
+		for _, task := range d.tasks {
-	d.lock.Lock()
+			deleteTasksTemp = append(deleteTasksTemp, task)
-	defer d.lock.Unlock()
-	candidates := make(map[string]bool, len(groupIDs))
-	for _, id := range groupIDs {
-		candidates[id] = true
-	}
-	for _, task := range d.tasks {
-		delete(candidates, task.ParentID)
-	}
-	for _, task := range d.deletingTasks {
-		delete(candidates, task.ParentID)
-	}
-	var firstErr error
-	for id := range candidates {
-		group := d.groups[id]
-		if group == nil {
-			continue
 		}
-		if _, creating := d.creatingGroups[id]; creating {
+		d.tasks = make([]*Task, 0)
-			continue
+		d.waitTasks = make([]*Task, 0)
-		}
+	}()
-		// Reserve the path until its final filesystem operation finishes.
-		if forceGroups[id] != nil {
-			if err := os.RemoveAll(group.Path); err != nil {
-				if firstErr == nil {
-					firstErr = err
-				}
-				continue
-			}
-		} else {
-			removeEmptyGroupDirectories(group.Path)
-		}
-		if err := d.storage.Delete(bucketTaskGroup, id); err != nil {
-			if firstErr == nil {
-				firstErr = err
-			}
-			continue
-		}
-		delete(d.groups, id)
-	}
-	return firstErr
-}
 
-// Remove empty directory trees without touching retained files or symlinks.
+	for _, task := range deleteTasksTemp {
-func removeEmptyGroupDirectories(root string) {
+		if err = d.doDelete(task, force); err != nil {
-	if root == "" {
+			return
-		return
-	}
-	info, err := os.Lstat(root)
-	if err != nil || !info.IsDir() {
-		return
-	}
-	entries, err := os.ReadDir(root)
-	if err != nil {
-		return
-	}
-	for _, entry := range entries {
-		if entry.IsDir() {
-			removeEmptyGroupDirectories(filepath.Join(root, entry.Name()))
 		}
 	}
-	_ = os.Remove(root)
+	return
 }
 
 func (d *Downloader) Stats(id string) (sr any, err error) {
@@ -1670,11 +1330,6 @@ func (d *Downloader) GetTasksByFilter(filter *TaskFilter) []*Task {
 	d.lock.Lock()
 	defer d.lock.Unlock()
 
-	return d.getTasksByFilter(filter)
-}
-
-// The caller holds d.lock.
-func (d *Downloader) getTasksByFilter(filter *TaskFilter) []*Task {
 	if filter == nil || filter.IsEmpty() {
 		return d.tasks
 	}
@@ -1939,7 +1594,7 @@ func (d *Downloader) watch(task *Task) {
 		d.triggerWebhooks(WebhookEventDownloadDone, task, nil)
 		d.triggerScripts(ScriptEventDownloadDone, task, nil)
 
-		if e := postDownloadExtra(task.Meta); e != nil {
+		if e, ok := task.Meta.Opts.Extra.(*http.OptsExtra); ok {
 			downloadFilePath := task.Meta.SingleFilepath()
 
 			cfg, _ := d.GetConfig()
@@ -1999,33 +1654,6 @@ func (d *Downloader) watch(task *Task) {
 	}
 }
 
-// postDownloadExtra returns the auto-torrent and auto-extract options of a
-// finished single-file task, in the HTTP options shape the extraction code
-// takes. FTP options carry the same fields. An FTP folder has no single file
-// to act on, so it gets nil, as does any other protocol.
-func postDownloadExtra(meta *fetcher.FetcherMeta) *http.OptsExtra {
-	if meta == nil || meta.Opts == nil {
-		return nil
-	}
-	switch e := meta.Opts.Extra.(type) {
-	case *http.OptsExtra:
-		return e
-	case *ftp.OptsExtra:
-		if meta.Res == nil || meta.Res.Name != "" || len(meta.Res.Files) != 1 {
-			return nil
-		}
-		return &http.OptsExtra{
-			Connections:                e.Connections,
-			AutoTorrent:                e.AutoTorrent,
-			DeleteTorrentAfterDownload: e.DeleteTorrentAfterDownload,
-			AutoExtract:                e.AutoExtract,
-			ArchivePassword:            e.ArchivePassword,
-			DeleteAfterExtract:         e.DeleteAfterExtract,
-		}
-	}
-	return nil
-}
-
 func (d *Downloader) doOnError(task *Task, err error) {
 	d.handleOnError(task, err, false)
 }
@@ -2160,7 +1788,7 @@ func (d *Downloader) restoreFetcher(task *Task) error {
 	return nil
 }
 
-func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options, groupID string) (taskId string, err error) {
+func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options) (taskId string, err error) {
 	if f.Meta().Opts == nil {
 		f.Meta().Opts = opts
 	}
@@ -2171,7 +1799,6 @@ func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options, groupID str
 		return
 	}
 	task := NewTask()
-	task.ParentID = groupID
 	task.fetcherManager = fm
 	task.fetcher = f
 	task.Protocol = fm.Name()
@@ -2190,21 +1817,15 @@ func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options, groupID str
 			d.releaseBlobTask(task)
 		}
 	}()
+	if err = d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
+		return
+	}
+	taskId = task.ID
+
 	func() {
 		d.lock.Lock()
 		defer d.lock.Unlock()
 
-		if groupID != "" {
-			task.group = d.groups[groupID]
-			if task.group == nil {
-				err = ErrTaskNotFound
-				return
-			}
-		}
-		if err = d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
-			return
-		}
-		taskId = task.ID
 		d.tasks = append(d.tasks, task)
 
 		remainRunningCount := d.remainRunningCount()
@@ -2261,40 +1882,21 @@ func (d *Downloader) initOptions(opts *base.Options, requestURL string) (*base.O
 func (d *Downloader) initDownloadPath(path string) (string, error) {
 	// Replace placeholders in download path (e.g., %year%, %month%, %day%, %date%)
 	path = util.ReplacePathPlaceholders(path)
-	if !d.isDownloadPathAllowed(path) {
-		return "", errors.New("download directory is not in white list")
-	}
-	return path, nil
-}
 
-func (d *Downloader) initDownloadPathForTask(path string, group *TaskGroup) (string, error) {
+	// if enable white download directory, check if the download directory is in the white list
-	if group == nil {
+	if len(d.cfg.WhiteDownloadDirs) > 0 {
-		return d.initDownloadPath(path)
+		inWhiteList := false
-	}
+		for _, dir := range d.cfg.WhiteDownloadDirs {
-	// Group paths are finalized at creation; validate the reserved root and
+			if match, err := filepath.Match(dir, path); match && err == nil {
-	// containment without expanding placeholders again.
+				inWhiteList = true
-	relative, err := filepath.Rel(filepath.Clean(group.Path), filepath.Clean(path))
+				break
-	if err != nil || !filepath.IsLocal(relative) {
+			}
-		return "", errors.New("task path is outside the group directory")
+		}
-	}
+		if !inWhiteList {
-	if !d.isDownloadPathAllowed(group.Path) {
+			return "", errors.New("download directory is not in white list")
-		return "", errors.New("task group directory is outside the white list")
-	}
-	return path, nil
-}
-
-// isDownloadPathAllowed reports whether the white list accepts this exact
-// path. With no white list configured every path is allowed.
-func (d *Downloader) isDownloadPathAllowed(path string) bool {
-	if len(d.cfg.WhiteDownloadDirs) == 0 {
-		return true
-	}
-	for _, dir := range d.cfg.WhiteDownloadDirs {
-		if match, err := filepath.Match(dir, path); match && err == nil {
-			return true
 		}
 	}
-	return false
+	return path, nil
 }
 
 func (d *Downloader) statusMut(task *Task, fn func() (bool, error)) (bool, error) {
@@ -2317,7 +1919,7 @@ func (d *Downloader) prepareTask(task *Task) error {
 	preparedOpts := *task.Meta.Opts
 	preparedMeta.Opts = &preparedOpts
 	preparedMeta.Res = util.DeepClone(task.Meta.Res)
-	dir, err := d.decideDownloadDirForTask(preparedMeta.Opts, preparedMeta.Res, task.group)
+	dir, err := d.decideDownloadDir(preparedMeta.Opts, preparedMeta.Res)
 	if err != nil {
 		return err
 	}
@@ -2441,20 +2043,19 @@ func (d *Downloader) doStart(task *Task) (err error) {
 			if err := d.prepareTask(task); err != nil {
 				return err
 			}
-		} else if _, err := d.initDownloadPathForTask(task.Meta.Opts.Path, task.group); err != nil {
+		} else if _, err := d.initDownloadPath(task.Meta.Opts.Path); err != nil {
 			// A prepared task keeps its directory, but the directory still has
 			// to pass the white list on every start.
 			return err
 		}
 
 		task.statusLock.Lock()
-		if task.Status != base.DownloadStatusRunning || task.runGeneration != generation {
+		task.Progress.Speed = 0
-			task.statusLock.Unlock()
+		task.statusLock.Unlock()
+		if !d.taskIsRunningGeneration(task, generation) {
 			return nil
 		}
-		task.Progress.Speed = 0
 		task.timer.Start()
-		task.statusLock.Unlock()
 		if err := task.fetcher.Start(); err != nil {
 			return err
 		}

pkg/download/extension.go

@@ -825,13 +825,6 @@ func newOnDoneExtensionTask(task *Task) *Task {
 	return cloneExtensionTask(task)
 }
 
-// SetUrl replaces the task request URL.
-//
-// Deprecated: Use task.meta.req.setUrl instead.
-func (t *ExtensionTask) SetUrl(url string) {
-	t.Meta.Req.SetUrl(url)
-}
-
 func (t *OnErrorExtensionTask) Continue() error {
 	return t.download.Continue(&TaskFilter{
 		IDs: []string{t.ID},

pkg/download/extension_compat_test.go

@@ -1,89 +0,0 @@
-package download
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"reflect"
-	"testing"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-func TestExtensionDeprecatedRequestAPIs(t *testing.T) {
-	for _, event := range []ActivationEvent{EventOnResolve, EventOnStart, EventOnError, EventOnDone} {
-		for _, withLabels := range []bool{false, true} {
-			t.Run(fmt.Sprintf("%s/labels=%v", event, withLabels), func(t *testing.T) {
-				d := NewDownloader(&DownloaderConfig{Storage: NewMemStorage(), StorageDir: t.TempDir()})
-				if err := d.Setup(); err != nil {
-					t.Fatal(err)
-				}
-				defer d.Clear()
-
-				extDir := t.TempDir()
-				manifest := fmt.Sprintf(`{"name":"legacy-request","title":"Legacy request APIs","version":"0.0.1","scripts":[{"event":%q,"match":{"urls":["*://example.com/*"]},"entry":"index.js"}]}`, event)
-				request := "ctx.task.meta.req"
-				urlMutation := ""
-				if event == EventOnResolve {
-					request = "ctx.req"
-				} else if event == EventOnStart || event == EventOnError {
-					urlMutation = `await ctx.task.setUrl('https://example.com/legacy');
-  if (req.url !== 'https://example.com/legacy') throw new Error('legacy URL did not write through');
-  await req.setUrl('https://example.com/new');
-  if (req.url !== 'https://example.com/new') throw new Error('new URL did not write through');
-  await ctx.task.setUrl('https://example.com/final');`
-				}
-				script := fmt.Sprintf(`gopeed.events.%s(async ctx => {
-  const req = %s;
-  await req.delLabel('missing');
-  await req.putLabel('initial', 'yes');
-  if (req.labels.initial !== 'yes') throw new Error('putLabel did not initialize labels');
-  await req.setLabels({keep: 'yes', remove: 'yes'});
-  if (req.labels.initial !== undefined || req.labels.old !== undefined) throw new Error('setLabels did not replace labels');
-  await req.putLabel('added', 'yes');
-  await req.delLabel('remove');
-  if (req.labels.keep !== 'yes' || req.labels.added !== 'yes' || req.labels.remove !== undefined) throw new Error('label mutation failed');
-  %s
-  await req.putLabel('completed', 'yes');
-});`, event, request, urlMutation)
-				for name, content := range map[string]string{"manifest.json": manifest, "index.js": script} {
-					if err := os.WriteFile(filepath.Join(extDir, name), []byte(content), 0600); err != nil {
-						t.Fatal(err)
-					}
-				}
-				if _, err := d.InstallExtensionByFolder(extDir, false); err != nil {
-					t.Fatal(err)
-				}
-				req := &base.Request{URL: "https://example.com/original"}
-				if withLabels {
-					req.Labels = map[string]string{"old": "yes"}
-				}
-				task := &Task{Protocol: "http", Meta: &fetcher.FetcherMeta{Req: req, Opts: &base.Options{}}}
-				switch event {
-				case EventOnResolve:
-					if _, err := d.triggerOnResolve(req); err != nil {
-						t.Fatal(err)
-					}
-				case EventOnStart:
-					d.triggerOnStart(task)
-				case EventOnError:
-					d.triggerOnError(task, errors.New("retry"))
-				case EventOnDone:
-					d.triggerOnDone(task)
-				}
-				if !reflect.DeepEqual(req.Labels, map[string]string{"keep": "yes", "added": "yes", "completed": "yes"}) {
-					t.Fatalf("legacy handler did not update the original request: %#v", req.Labels)
-				}
-				expectedURL := "https://example.com/original"
-				if urlMutation != "" {
-					expectedURL = "https://example.com/final"
-				}
-				if req.URL != expectedURL {
-					t.Fatalf("URL = %q, want %q", req.URL, expectedURL)
-				}
-			})
-		}
-	}
-}

pkg/download/extension_extra_mutation_test.go

@@ -152,7 +152,7 @@ func TestExtensionOnErrorRequestWritesToOriginalTask(t *testing.T) {
    request.setHeaders({Keep:'new'});
    request.putHeader('Authorization','Bearer new');
    request.setMethod('POST');
-   if (typeof task.setUrl !== 'function' || typeof task.extra !== 'undefined') throw new Error('unexpected legacy task API');
+   if (typeof task.setUrl !== 'undefined' || typeof task.extra !== 'undefined') throw new Error('legacy task API');
    request.setUrl('https://example.com/new');
    request.setLabels({keep:'yes',remove:'yes'});
    request.putLabel('new','value');

pkg/download/extension_match_test.go

@@ -1,56 +0,0 @@
-package download
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-func TestDownloader_Extension_MagnetMatch(t *testing.T) {
-	const magnetURL = "magnet:?xt=urn:btih:0123456789abcdef0123456789abcdef01234567"
-	for _, pattern := range []string{"magnet:*", "magnet:?*"} {
-		t.Run(pattern, func(t *testing.T) {
-			d := NewDownloader(&DownloaderConfig{
-				Storage:    NewMemStorage(),
-				StorageDir: t.TempDir(),
-				TempDir:    t.TempDir(),
-			})
-			if err := d.Setup(); err != nil {
-				t.Fatal(err)
-			}
-			defer d.Clear()
-
-			extDir := t.TempDir()
-			manifest := fmt.Sprintf(`{"name":"magnet-match","author":"test","title":"Magnet match","version":"1.0.0","scripts":[{"event":"onResolve","match":{"urls":[%q]},"entry":"index.js"}]}`, pattern)
-			script := `gopeed.events.onResolve(ctx => {
-  ctx.res = {files: [{name: "resolved.txt", size: 1, req: {url: "https://example.com/resolved.txt"}}]};
-});`
-			for name, content := range map[string]string{"manifest.json": manifest, "index.js": script} {
-				if err := os.WriteFile(filepath.Join(extDir, name), []byte(content), 0600); err != nil {
-					t.Fatal(err)
-				}
-			}
-			if _, err := d.InstallExtensionByFolder(extDir, true); err != nil {
-				t.Fatal(err)
-			}
-
-			for _, req := range []*base.Request{
-				{URL: magnetURL},
-				{URL: "https://example.com/rewritten", RawURL: magnetURL},
-			} {
-				// Exercise extension activation without falling back to a live
-				// BitTorrent metadata lookup when the pattern fails to match.
-				res, err := d.triggerOnResolve(req)
-				if err != nil {
-					t.Fatal(err)
-				}
-				if res == nil || len(res.Files) != 1 || res.Files[0].Name != "resolved.txt" {
-					t.Fatalf("magnet extension did not resolve request %+v: %+v", req, res)
-				}
-			}
-		})
-	}
-}

pkg/download/extension_resolve_size_test.go

@@ -70,11 +70,10 @@ func TestExtensionResolveSizeThroughTaskCreation(t *testing.T) {
 				if err := json.Unmarshal(wire, &submitted); err != nil {
 					t.Fatal(err)
 				}
-				batchResult, err := d.CreateDirectBatch(&submitted)
+				ids, err := d.CreateDirectBatch(&submitted)
 				if err != nil {
 					t.Fatal(err)
 				}
-				ids := batchResult
 				for i, id := range ids {
 					task := d.GetTask(id)
 					if task.Meta.Res != nil {

pkg/download/extension_test.go

@@ -2044,13 +2044,8 @@ func waitForTaskStatus(t *testing.T, downloader *Downloader, id string, status b
 	deadline := time.Now().Add(timeout)
 	for time.Now().Before(deadline) {
 		task := downloader.GetTask(id)
-		if task != nil && downloader.taskStatus(task) == status {
+		if task != nil && task.Status == status {
-			if status != base.DownloadStatusDone {
+			return
-				return
-			}
-			if _, watching := downloader.watchedTasks.Load(id); !watching {
-				return
-			}
 		}
 		time.Sleep(10 * time.Millisecond)
 	}
@@ -2058,6 +2053,9 @@ func waitForTaskStatus(t *testing.T, downloader *Downloader, id string, status b
 	if task == nil {
 		t.Fatalf("timeout waiting for task %s status %s: task not found", id, status)
 	}
-	snapshot, err := downloader.RuntimeStatus(id)
+	total := int64(0)
-	t.Fatalf("timeout waiting for task %s status %s: got %+v, error=%v", id, status, snapshot, err)
+	if task.Meta != nil && task.Meta.Res != nil {
+		total = task.Meta.Res.Size
+	}
+	t.Fatalf("timeout waiting for task %s status %s: got %s downloaded=%d total=%d", id, status, task.Status, task.Progress.Downloaded, total)
 }

pkg/download/ftp_test.go

@@ -1,57 +0,0 @@
-package download
-
-import (
-	"testing"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/GopeedLab/gopeed/pkg/protocol/ftp"
-	"github.com/GopeedLab/gopeed/pkg/protocol/http"
-)
-
-// TestTorrentNameIsFile checks the default manager order: an FTP URL whose
-// name looks like a torrent or a playlist is still an FTP download.
-func TestTorrentNameIsFile(t *testing.T) {
-	d := NewDownloader(nil)
-	for u, want := range map[string]string{
-		"ftp://h/x.torrent":    "ftp",
-		"ftp://h/v.m3u8":       "ftp",
-		"ftps://h/x.torrent":   "ftp",
-		"ftpes://h/a.bin":      "ftp",
-		"https://h/v.m3u8":     "hls",
-		"https://h/x.torrent":  "http",
-		"magnet:?xt=urn:btih:": "bt",
-	} {
-		fm, err := d.parseFm(u)
-		if err != nil {
-			t.Fatalf("%s: %v", u, err)
-		}
-		if fm.Name() != want {
-			t.Fatalf("%s goes to %q, want %q", u, fm.Name(), want)
-		}
-	}
-}
-
-func TestPostDownloadExtraAcceptsFTP(t *testing.T) {
-	yes := true
-	file := &base.Resource{Files: []*base.FileInfo{{Name: "a.zip"}}}
-	folder := &base.Resource{Name: "dir", Files: []*base.FileInfo{{Name: "a.zip"}}}
-
-	httpExtra := &http.OptsExtra{AutoExtract: &yes}
-	if got := postDownloadExtra(&fetcher.FetcherMeta{Res: file, Opts: &base.Options{Extra: httpExtra}}); got != httpExtra {
-		t.Fatalf("HTTP options must pass through unchanged, got %+v", got)
-	}
-
-	ftpExtra := &ftp.OptsExtra{Connections: 4, AutoTorrent: &yes, DeleteTorrentAfterDownload: &yes, AutoExtract: &yes, ArchivePassword: "pw", DeleteAfterExtract: true}
-	got := postDownloadExtra(&fetcher.FetcherMeta{Res: file, Opts: &base.Options{Extra: ftpExtra}})
-	if got == nil || got.AutoTorrent != &yes || got.DeleteTorrentAfterDownload != &yes || got.AutoExtract != &yes ||
-		got.ArchivePassword != "pw" || !got.DeleteAfterExtract {
-		t.Fatalf("FTP options were not carried over: %+v", got)
-	}
-	if got := postDownloadExtra(&fetcher.FetcherMeta{Res: folder, Opts: &base.Options{Extra: ftpExtra}}); got != nil {
-		t.Fatalf("an FTP folder has no single file to extract, got %+v", got)
-	}
-	if got := postDownloadExtra(&fetcher.FetcherMeta{Res: file, Opts: &base.Options{}}); got != nil {
-		t.Fatalf("no options, got %+v", got)
-	}
-}

pkg/download/model.go

@@ -10,7 +10,6 @@ import (
 	"github.com/GopeedLab/gopeed/internal/production"
 	"github.com/GopeedLab/gopeed/internal/protocol/bt"
 	"github.com/GopeedLab/gopeed/internal/protocol/ed2k"
-	"github.com/GopeedLab/gopeed/internal/protocol/ftp"
 	"github.com/GopeedLab/gopeed/internal/protocol/hls"
 	"github.com/GopeedLab/gopeed/internal/protocol/http"
 	"github.com/GopeedLab/gopeed/pkg/base"
@@ -29,34 +28,18 @@ type ResolveResult struct {
 	SuggestedDownloadDir string `json:"suggestedDownloadDir,omitempty"`
 }
 
-// TaskGroup stores the directory shared by independently scheduled tasks.
-type TaskGroup struct {
-	ID        string    `json:"id"`
-	Name      string    `json:"name"`
-	Path      string    `json:"path"`
-	CreatedAt time.Time `json:"createdAt"`
-}
-
-// CreateTaskBatchResult is shared by ordinary and grouped batches.
-type CreateTaskBatchResult struct {
-	TaskIDs  []string `json:"taskIds"`
-	ParentID string   `json:"parentId,omitempty"`
-}
-
 // Task represents a download unit.
 // Options flow path:
 // REST Request (model.CreateTask/ResolveTask) -> pkg/download Downloader -> Task.Meta.Opts (base.Options) -> Fetcher.Resolve/Start (e.g. internal/protocol/http/fetcher.go)
 type Task struct {
-	ID       string               `json:"id"`
+	ID        string               `json:"id"`
-	Protocol string               `json:"protocol"`
+	Protocol  string               `json:"protocol"`
-	Meta     *fetcher.FetcherMeta `json:"meta"`
+	Meta      *fetcher.FetcherMeta `json:"meta"`
-	// ParentID identifies the independently stored group.
+	Status    base.Status          `json:"status"`
-	ParentID  string      `json:"parentId,omitempty"`
+	Uploading bool                 `json:"uploading"`
-	Status    base.Status `json:"status"`
+	Progress  *Progress            `json:"progress"`
-	Uploading bool        `json:"uploading"`
+	CreatedAt time.Time            `json:"createdAt"`
-	Progress  *Progress   `json:"progress"`
+	UpdatedAt time.Time            `json:"updatedAt"`
-	CreatedAt time.Time   `json:"createdAt"`
-	UpdatedAt time.Time   `json:"updatedAt"`
 	// DoneAt is the time when the task completed; nil if it has never
 	// finished. A done task never leaves the done state, so the value is
 	// written once and kept.
@@ -70,8 +53,6 @@ type Task struct {
 	// does not have it and keeps its directory and name.
 	NeedsPreparation bool `json:"needsPreparation,omitempty"`
 
-	group *TaskGroup
-
 	producer         production.Source
 	producerReceived int64
 
@@ -162,12 +143,10 @@ func (t *Task) MarshalJSON() ([]byte, error) {
 	type rawTaskType Task
 	jsonTask := struct {
 		*rawTaskType
-		Name  string     `json:"name"`
+		Name string `json:"name"`
-		Group *TaskGroup `json:"group,omitempty"`
 	}{
 		(*rawTaskType)(t),
 		t.Name(),
-		t.group,
 	}
 	return json.Marshal(jsonTask)
 }
@@ -250,10 +229,6 @@ func (cfg *DownloaderConfig) Init() *DownloaderConfig {
 	}
 	if len(cfg.FetchManagers) == 0 {
 		cfg.FetchManagers = []fetcher.FetcherManager{
-			// FTP matches by URL scheme only. It comes before the managers that
-			// match by file extension, so ftp://host/x.torrent or x.m3u8 is
-			// downloaded as a file over FTP.
-			new(ftp.FetcherManager),
 			new(hls.FetcherManager),
 			new(http.FetcherManager),
 			new(bt.FetcherManager),

pkg/download/script.go

@@ -27,10 +27,6 @@ type ScriptData struct {
 // ScriptPayload contains the task data
 type ScriptPayload struct {
 	Task *Task
-	// TaskName is computed before Task is cloned. The clone has no fetcher
-	// manager, so for an unresolved task without Options.Name its Name()
-	// would return "unknown".
-	TaskName string
 }
 
 // getScriptPaths extracts script paths from config
@@ -107,7 +103,7 @@ func (d *Downloader) executeScriptAtPath(scriptPath string, data *ScriptData) er
 	cmd.Env = append(os.Environ(),
 		fmt.Sprintf("GOPEED_EVENT=%s", data.Event),
 		fmt.Sprintf("GOPEED_TASK_ID=%s", data.Payload.Task.ID),
-		fmt.Sprintf("GOPEED_TASK_NAME=%s", data.Payload.TaskName),
+		fmt.Sprintf("GOPEED_TASK_NAME=%s", data.Payload.Task.Name()),
 		fmt.Sprintf("GOPEED_TASK_STATUS=%s", data.Payload.Task.Status),
 	)
 
@@ -141,8 +137,7 @@ func (d *Downloader) triggerScripts(event ScriptEvent, task *Task, err error) {
 		Event: event,
 		Time:  time.Now().UnixMilli(),
 		Payload: &ScriptPayload{
-			Task:     task.clone(),
+			Task: task.clone(),
-			TaskName: task.Name(),
 		},
 	}
 

pkg/download/script_test.go

@@ -3,8 +3,6 @@ package download
 import (
 	"os"
 	"path/filepath"
-	"runtime"
-	"strings"
 	"testing"
 	"time"
 
@@ -128,46 +126,6 @@ func TestScript_ExecuteScriptAtPath_NonExistentFile(t *testing.T) {
 	})
 }
 
-func TestScript_TaskNameOfUnresolvedTask(t *testing.T) {
-	scriptPath := getTestScriptPath(t, envDumpScriptName())
-	ensureScriptExecutable(t, scriptPath)
-	outputFile := filepath.Join(t.TempDir(), "env_output.txt")
-
-	setupScriptTest(t, func(downloader *Downloader) {
-		cfg, _ := downloader.GetConfig()
-		cfg.Script = &base.ScriptConfig{
-			Enable: true,
-			Paths:  []string{scriptPath},
-		}
-		downloader.PutConfig(cfg)
-
-		// Without Options.Name and a resource, the name comes from the fetcher
-		// manager, which the cloned task in the script data does not have.
-		url := "http://127.0.0.1/error.bin"
-		fm, err := downloader.parseFm(url)
-		if err != nil {
-			t.Fatal(err)
-		}
-		task := NewTask()
-		task.Meta = &fetcher.FetcherMeta{
-			Req:  &base.Request{URL: url},
-			Opts: &base.Options{Path: t.TempDir()},
-		}
-		task.fetcherManager = fm
-		if name := task.Name(); name != "error.bin" {
-			t.Fatalf("Expected task name error.bin, got %q", name)
-		}
-
-		t.Setenv("GOPEED_TEST_OUTPUT_FILE", outputFile)
-		downloader.triggerScripts(ScriptEventDownloadDone, task, nil)
-
-		output := waitForFileContains(t, outputFile, "GOPEED_TASK_PATH=", 3*time.Second)
-		if !strings.Contains(output, "GOPEED_TASK_NAME=error.bin") {
-			t.Errorf("Expected GOPEED_TASK_NAME=error.bin in output, got: %s", output)
-		}
-	})
-}
-
 func createDownloadDoneTask(t *testing.T, downloadDir, fileName string) (*Task, string) {
 	t.Helper()
 	content := []byte("downloaded file")
@@ -213,31 +171,6 @@ func waitForFile(t *testing.T, path string, timeout time.Duration) {
 	t.Fatalf("Timeout waiting for file: %s", path)
 }
 
-// waitForFileContains waits until the file contains want and returns its content.
-// Test scripts write the file line by line, so waiting for the file to exist is not enough.
-func waitForFileContains(t *testing.T, path, want string, timeout time.Duration) string {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		if content, err := os.ReadFile(path); err == nil && strings.Contains(string(content), want) {
-			return string(content)
-		}
-		time.Sleep(50 * time.Millisecond)
-	}
-	content, _ := os.ReadFile(path)
-	t.Fatalf("Timeout waiting for %q in file %s, got: %q", want, path, content)
-	return ""
-}
-
-// envDumpScriptName returns the test script that writes the GOPEED_* variables
-// into the file named by GOPEED_TEST_OUTPUT_FILE.
-func envDumpScriptName() string {
-	if runtime.GOOS == "windows" {
-		return "env_dump.bat"
-	}
-	return "env_dump.sh"
-}
-
 func getTestScriptPath(t *testing.T, name string) string {
 	t.Helper()
 	path := filepath.Join("testdata", "scripts", name)

pkg/download/script_unix_test.go

@@ -91,8 +91,13 @@ func TestScript_EnvironmentVariables(t *testing.T) {
 		t.Setenv("GOPEED_TEST_OUTPUT_FILE", outputFile)
 		downloader.triggerScripts(ScriptEventDownloadDone, task, nil)
 
-		// GOPEED_TASK_PATH is the last line the script writes.
+		waitForFile(t, outputFile, 3*time.Second)
-		output := waitForFileContains(t, outputFile, "GOPEED_TASK_PATH=", 3*time.Second)
+		content, err := os.ReadFile(outputFile)
+		if err != nil {
+			t.Fatalf("Failed to read output file: %v", err)
+		}
+
+		output := string(content)
 		if !strings.Contains(output, "GOPEED_EVENT=DOWNLOAD_DONE") {
 			t.Errorf("Expected GOPEED_EVENT in output, got: %s", output)
 		}

pkg/download/script_windows_test.go

@@ -87,8 +87,13 @@ func TestScript_EnvironmentVariables(t *testing.T) {
 		t.Setenv("GOPEED_TEST_OUTPUT_FILE", outputFile)
 		downloader.triggerScripts(ScriptEventDownloadDone, task, nil)
 
-		// GOPEED_TASK_PATH is the last line the script writes.
+		waitForFile(t, outputFile, 5*time.Second)
-		output := waitForFileContains(t, outputFile, "GOPEED_TASK_PATH=", 5*time.Second)
+		content, err := os.ReadFile(outputFile)
+		if err != nil {
+			t.Fatalf("Failed to read output file: %v", err)
+		}
+
+		output := string(content)
 		if !strings.Contains(output, "GOPEED_EVENT=DOWNLOAD_DONE") {
 			t.Errorf("Expected GOPEED_EVENT in output, got: %s", output)
 		}

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

@@ -1,5 +1,5 @@
 gopeed.events.onResolve(async function (ctx) {
-    for (const method of ['setUrl', 'setMethod', 'putHeader', 'setTrackers']) {
+    for (const method of ['setUrl', 'setLabels', 'putLabel', 'delLabel', 'setMethod', 'putHeader', 'setTrackers']) {
         if (typeof ctx.req[method] !== 'undefined') throw new Error(`onResolve exposes ${method}`);
     }
     ctx.req.labels = { replaced: "true", removed: "true" };

pkg/mcpserver/output_schema_test.go

@@ -1,148 +0,0 @@
-package mcpserver
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/GopeedLab/gopeed/pkg/download"
-	"github.com/GopeedLab/gopeed/pkg/protocol/bt"
-	"github.com/GopeedLab/gopeed/pkg/protocol/ed2k"
-	phttp "github.com/GopeedLab/gopeed/pkg/protocol/http"
-	"github.com/google/jsonschema-go/jsonschema"
-)
-
-func TestToolSchemaPropertiesAreObjects(t *testing.T) {
-	downloader := download.NewDownloader(&download.DownloaderConfig{Storage: download.NewMemStorage()})
-	req := httptest.NewRequest(http.MethodPost, "http://localhost/mcp", bytes.NewBufferString(
-		`{"jsonrpc":"2.0","id":1,"method":"tools/list","params":{}}`,
-	))
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Accept", "application/json, text/event-stream")
-	recorder := httptest.NewRecorder()
-	NewHandler(downloader).ServeHTTP(recorder, req)
-	if recorder.Code != http.StatusOK {
-		t.Fatalf("tools/list status = %d: %s", recorder.Code, recorder.Body.String())
-	}
-	var response struct {
-		Result struct {
-			Tools []struct {
-				Name         string         `json:"name"`
-				InputSchema  map[string]any `json:"inputSchema"`
-				OutputSchema map[string]any `json:"outputSchema"`
-			} `json:"tools"`
-		} `json:"result"`
-	}
-	if err := json.Unmarshal(recorder.Body.Bytes(), &response); err != nil {
-		t.Fatal(err)
-	}
-	if len(response.Result.Tools) == 0 {
-		t.Fatal("tools/list returned no tools")
-	}
-	for _, tool := range response.Result.Tools {
-		t.Run(tool.Name, func(t *testing.T) {
-			checkSchemaProperties(t, tool.InputSchema, "inputSchema")
-			checkSchemaProperties(t, tool.OutputSchema, "outputSchema")
-		})
-	}
-}
-
-// Check the serialized definitions, including nested file requests and union
-// branches. Boolean additionalProperties remains valid; boolean entries inside
-// properties are what clients with object-only schema parsers cannot consume.
-func checkSchemaProperties(t *testing.T, value any, path string) {
-	t.Helper()
-	switch value := value.(type) {
-	case map[string]any:
-		for key, child := range value {
-			if key == "properties" {
-				properties, ok := child.(map[string]any)
-				if !ok {
-					t.Fatalf("%s.properties = %#v, want object", path, child)
-				}
-				for name, property := range properties {
-					if _, ok := property.(map[string]any); !ok {
-						t.Errorf("%s.properties.%s = %#v, want schema object", path, name, property)
-					}
-				}
-			}
-			checkSchemaProperties(t, child, path+"."+key)
-		}
-	case []any:
-		for i, child := range value {
-			checkSchemaProperties(t, child, fmt.Sprintf("%s[%d]", path, i))
-		}
-	}
-}
-
-func TestToolOutputSchemasPreserveDynamicValues(t *testing.T) {
-	statsSchema := toolOutputSchema[getTaskStatsOutput]()
-	for _, test := range []struct {
-		name  string
-		stats any
-	}{
-		{"unavailable", nil},
-		{"typed nil", (*fetcher.Stats)(nil)},
-		{"http", &fetcher.Stats{Snapshot: &phttp.Stats{Connections: []*phttp.StatsConnection{{Downloaded: 123}}}}},
-		{"bittorrent", &fetcher.Stats{Snapshot: &bt.StatsSnapshot{}, Runtime: &bt.StatsRuntime{}}},
-		{"ed2k", &fetcher.Stats{Snapshot: &ed2k.StatsSnapshot{}, Runtime: &ed2k.StatsRuntime{}}},
-		{"restored snapshot", &fetcher.Stats{Snapshot: json.RawMessage(`{"segmentsTotal":3,"segmentsDone":2,"segmentsFailed":0}`)}},
-		{"empty object", map[string]any{}},
-		{"nested JSON", map[string]any{"values": []any{nil, true, "text", 1.5, map[string]any{"key": "value"}}}},
-		{"array", []any{1, "two", false}},
-		{"string", "protocol value"},
-		{"number", 1.5},
-		{"boolean", true},
-	} {
-		t.Run(test.name, func(t *testing.T) {
-			validateToolOutput(t, statsSchema, &getTaskStatsOutput{Stats: test.stats})
-		})
-	}
-
-	// Output extras can be empty, null, or extension-specific. In particular,
-	// they need not satisfy the required settings in the download input schema.
-	for _, extra := range []any{nil, map[string]any{}, &phttp.ReqExtra{}, &bt.ReqExtra{},
-		map[string]any{"custom": []any{true, nil, 42}}, "custom value"} {
-		req := &base.Request{URL: "https://example.com/file", Extra: extra}
-		res := &base.Resource{Files: []*base.FileInfo{{Name: "file", Req: req}}}
-		validateToolOutput(t, toolOutputSchema[resolveTaskOutput](), &resolveTaskOutput{Res: res})
-		validateToolOutput(t, toolOutputSchema[getTaskOutput](), &getTaskOutput{Task: taskDetails{
-			Req: req, Res: res, Opts: &base.Options{Extra: extra},
-		}})
-	}
-
-	// Supplying an explicit schema must retain validation of the output envelope.
-	resolved, err := statsSchema.Resolve(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, invalid := range []map[string]any{{}, {"stats": nil, "unexpected": true}} {
-		if err := resolved.Validate(invalid); err == nil {
-			t.Errorf("accepted invalid output envelope: %#v", invalid)
-		}
-	}
-}
-
-func validateToolOutput(t *testing.T, schema *jsonschema.Schema, output any) {
-	t.Helper()
-	data, err := json.Marshal(output)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var value any
-	if err := json.Unmarshal(data, &value); err != nil {
-		t.Fatal(err)
-	}
-	resolved, err := schema.Resolve(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := resolved.Validate(value); err != nil {
-		t.Fatalf("output %s does not match schema: %v", data, err)
-	}
-}

pkg/mcpserver/server.go

@@ -190,37 +190,6 @@ func downloadInputSchema[T any]() *jsonschema.Schema {
 	return schema
 }
 
-// toolOutputSchema preserves arbitrary JSON values in protocol statistics and
-// task metadata. Unlike the boolean schema inferred for any, these object-form
-// schemas can also be parsed by clients that do not support boolean schemas in
-// properties. Output metadata may come from REST, extensions, or persisted tasks,
-// so it must not inherit the narrower download input restrictions.
-func toolOutputSchema[T any]() *jsonschema.Schema {
-	schema, err := jsonschema.For[T](&jsonschema.ForOptions{
-		TypeSchemas: map[reflect.Type]*jsonschema.Schema{
-			// Request.Labels is serialized as null when the map is nil.
-			reflect.TypeFor[map[string]string](): {
-				Types:                []string{"object", "null"},
-				AdditionalProperties: &jsonschema.Schema{Type: "string"},
-			},
-			reflect.TypeFor[any](): {
-				AnyOf: []*jsonschema.Schema{
-					{Type: "object"},
-					{Type: "array"},
-					{Type: "string"},
-					{Type: "number"},
-					{Type: "boolean"},
-					{Type: "null"},
-				},
-			},
-		},
-	})
-	if err != nil {
-		panic(fmt.Sprintf("mcpserver: build tool output schema: %v", err))
-	}
-	return schema
-}
-
 func (o *downloadOptions) baseOptions() *base.Options {
 	if o == nil {
 		return nil
@@ -350,12 +319,11 @@ func registerTools(server *mcp.Server, downloader *download.Downloader) {
 	destructive := true
 
 	mcp.AddTool(server, &mcp.Tool{
-		Name:         "resolve_task",
+		Name:        "resolve_task",
-		Title:        "Resolve task",
+		Title:       "Resolve task",
-		Description:  "Resolve an HTTP, HTTPS, BitTorrent, magnet, or ED2K download request and return its resource metadata and files. Use this before create_task when the user wants to inspect the resource or select files.",
+		Description: "Resolve an HTTP, HTTPS, BitTorrent, magnet, or ED2K download request and return its resource metadata and files. Use this before create_task when the user wants to inspect the resource or select files.",
-		InputSchema:  downloadInputSchema[resolveTaskInput](),
+		InputSchema: downloadInputSchema[resolveTaskInput](),
-		OutputSchema: toolOutputSchema[resolveTaskOutput](),
+		Annotations: &mcp.ToolAnnotations{ReadOnlyHint: true, OpenWorldHint: &openWorld},
-		Annotations:  &mcp.ToolAnnotations{ReadOnlyHint: true, OpenWorldHint: &openWorld},
 	}, func(_ context.Context, _ *mcp.CallToolRequest, input *resolveTaskInput) (*mcp.CallToolResult, *resolveTaskOutput, error) {
 		if input.Req == nil {
 			return nil, nil, fmt.Errorf("req is required")
@@ -435,11 +403,10 @@ func registerTools(server *mcp.Server, downloader *download.Downloader) {
 	})
 
 	mcp.AddTool(server, &mcp.Tool{
-		Name:         "get_task",
+		Name:        "get_task",
-		Title:        "Get task",
+		Title:       "Get task",
-		Description:  "Get one Gopeed task including its request, resource, options, and current progress.",
+		Description: "Get one Gopeed task including its request, resource, options, and current progress.",
-		OutputSchema: toolOutputSchema[getTaskOutput](),
+		Annotations: &mcp.ToolAnnotations{ReadOnlyHint: true, OpenWorldHint: &closedWorld},
-		Annotations:  &mcp.ToolAnnotations{ReadOnlyHint: true, OpenWorldHint: &closedWorld},
 	}, func(_ context.Context, _ *mcp.CallToolRequest, input *taskIDInput) (*mcp.CallToolResult, *getTaskOutput, error) {
 		task, err := requireTask(downloader, input.ID)
 		if err != nil {
@@ -475,11 +442,10 @@ func registerTools(server *mcp.Server, downloader *download.Downloader) {
 	})
 
 	mcp.AddTool(server, &mcp.Tool{
-		Name:         "get_task_stats",
+		Name:        "get_task_stats",
-		Title:        "Get task statistics",
+		Title:       "Get task statistics",
-		Description:  "Get protocol-specific statistics for one Gopeed task, such as HTTP connections or BitTorrent peers and seeding data.",
+		Description: "Get protocol-specific statistics for one Gopeed task, such as HTTP connections or BitTorrent peers and seeding data.",
-		OutputSchema: toolOutputSchema[getTaskStatsOutput](),
+		Annotations: &mcp.ToolAnnotations{ReadOnlyHint: true, OpenWorldHint: &closedWorld},
-		Annotations:  &mcp.ToolAnnotations{ReadOnlyHint: true, OpenWorldHint: &closedWorld},
 	}, func(_ context.Context, _ *mcp.CallToolRequest, input *taskIDInput) (*mcp.CallToolResult, *getTaskStatsOutput, error) {
 		if err := validateTaskID(input.ID); err != nil {
 			return nil, nil, err

pkg/mcpserver/server_test.go

@@ -192,36 +192,6 @@ func TestStreamableHTTPTools(t *testing.T) {
 	if tasks, ok := structured["tasks"].([]any); !ok || len(tasks) != 0 {
 		t.Fatalf("tasks = %#v, want empty array", structured["tasks"])
 	}
-
-	result, err = session.CallTool(context.Background(), &mcp.CallToolParams{
-		Name: "create_task",
-		Arguments: map[string]any{
-			"req": map[string]any{
-				"url":   downloadServer.URL,
-				"extra": map[string]any{"header": map[string]any{"X-Gopeed-Test": "mcp-object"}},
-			},
-			"opts": map[string]any{"path": t.TempDir()},
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result.IsError {
-		t.Fatalf("create_task returned tool error: %+v", result.Content)
-	}
-	created := result.StructuredContent.(map[string]any)
-	for _, name := range []string{"get_task", "get_task_stats"} {
-		result, err := session.CallTool(context.Background(), &mcp.CallToolParams{
-			Name:      name,
-			Arguments: map[string]any{"id": created["id"]},
-		})
-		if err != nil {
-			t.Fatalf("%s: %v", name, err)
-		}
-		if result.IsError {
-			t.Fatalf("%s returned tool error: %+v", name, result.Content)
-		}
-	}
 }
 
 func nestedSchemaProperty(t *testing.T, schema map[string]any, path ...string) map[string]any {

pkg/protocol/ftp/model.go

@@ -1,54 +0,0 @@
-package ftp
-
-// TLS modes for the "tls" field of an ftp:// request. ftps:// URLs always use
-// implicit TLS and ftpes:// URLs always use explicit TLS.
-const (
-	TLSNone     = "none"
-	TLSExplicit = "explicit"
-	TLSImplicit = "implicit"
-)
-
-// ReqExtra is the extra of an FTP request. The TLS mode is part of the request,
-// because resolving the link already needs a connection.
-type ReqExtra struct {
-	// TLS upgrades a plain ftp:// URL: "none" (default), "explicit" (AUTH TLS)
-	// or "implicit". It is ignored for ftps:// and ftpes:// URLs.
-	TLS string `json:"tls"`
-}
-
-type OptsExtra struct {
-	// Connections is the maximum number of parallel logins. Servers often cap
-	// logins per user, so the fetcher lowers it when the server refuses one.
-	Connections int `json:"connections"`
-	// AutoTorrent when task download complete, and it is a .torrent file, it will be auto create a new task for the torrent file
-	// nil means use global config, true/false means explicit setting
-	AutoTorrent *bool `json:"autoTorrent"`
-	// DeleteTorrentAfterDownload when true, deletes the .torrent file after creating BT task
-	// nil means use global config, true/false means explicit setting
-	DeleteTorrentAfterDownload *bool `json:"deleteTorrentAfterDownload"`
-	// AutoExtract when task download complete, and it is an archive file, it will be auto extracted
-	// nil means use global config, true/false means explicit setting
-	AutoExtract *bool `json:"autoExtract"`
-	// ArchivePassword is the password for extracting password-protected archives
-	ArchivePassword string `json:"archivePassword"`
-	// DeleteAfterExtract when true, deletes the archive file after successful extraction
-	DeleteAfterExtract bool `json:"deleteAfterExtract"`
-}
-
-// Stats for download. It has the same shape as the HTTP protocol's stats, so
-// clients can show FTP connections the way they show HTTP connections.
-type Stats struct {
-	Connections []*StatsConnection `json:"connections"`
-}
-
-// StatsConnection describes one login that took part in the download.
-type StatsConnection struct {
-	Downloaded int64 `json:"downloaded"`
-	// Total is the resource size divided by the number of connections,
-	// rounded up to a whole byte, as in the HTTP protocol's stats. It is zero
-	// when the resource size is unknown.
-	Total      int64 `json:"total"`
-	Completed  bool  `json:"completed"`
-	Failed     bool  `json:"failed"`
-	RetryTimes int   `json:"retryTimes"`
-}

pkg/rest/api.go

@@ -63,7 +63,7 @@ func CreateTaskBatch(w http.ResponseWriter, r *http.Request) {
 			WriteJson(w, model.NewErrorResult("param invalid: reqs", model.CodeInvalidParam))
 			return
 		}
-		taskIds, err := Downloader.CreateDirectBatchWithResult(&req)
+		taskIds, err := Downloader.CreateDirectBatch(&req)
 		if err != nil {
 			WriteJson(w, model.NewErrorResult(err.Error()))
 			return

pkg/rest/server_test.go

@@ -197,10 +197,9 @@ func TestCreateDirectTaskBatch(t *testing.T) {
 				Req: createReq.Req,
 			})
 		}
-		result := httpRequestCheckOk[download.CreateTaskBatchResult](http.MethodPost, "/api/v1/tasks/batch", &base.CreateTaskBatch{
+		taskIds := httpRequestCheckOk[[]string](http.MethodPost, "/api/v1/tasks/batch", &base.CreateTaskBatch{
 			Reqs: reqs,
 		})
-		taskIds := result.TaskIDs
 		if len(taskIds) != len(reqs) {
 			t.Errorf("CreateDirectTaskBatch() got = %v, want %v", len(taskIds), len(reqs))
 		}
@@ -221,13 +220,12 @@ func TestCreateDirectTaskBatchWithOpt(t *testing.T) {
 			}
 			reqs = append(reqs, item)
 		}
-		result := httpRequestCheckOk[download.CreateTaskBatchResult](http.MethodPost, "/api/v1/tasks/batch", &base.CreateTaskBatch{
+		taskIds := httpRequestCheckOk[[]string](http.MethodPost, "/api/v1/tasks/batch", &base.CreateTaskBatch{
 			Reqs: reqs,
 			Opts: &base.Options{
 				Name: "default_opt.data",
 			},
 		})
-		taskIds := result.TaskIDs
 		if len(taskIds) != len(reqs) {
 			t.Errorf("CreateDirectTaskBatch() got = %v, want %v", len(taskIds), len(reqs))
 		}
@@ -247,40 +245,6 @@ func TestCreateDirectTaskBatchWithOpt(t *testing.T) {
 	})
 }
 
-func TestCreateDirectTaskBatchWithGroup(t *testing.T) {
-	doTest(func() {
-		cfg, err := Downloader.GetConfig()
-		if err != nil {
-			t.Fatal(err)
-		}
-		cfg.MaxRunning = 0
-		if err := Downloader.PutConfig(cfg); err != nil {
-			t.Fatal(err)
-		}
-		parent := t.TempDir()
-		result := httpRequestCheckOk[download.CreateTaskBatchResult](http.MethodPost, "/api/v1/tasks/batch", &base.CreateTaskBatch{
-			Reqs: []*base.CreateTaskBatchItem{{Req: createReq.Req}, {Req: createReq.Req}},
-			Opts: &base.Options{Path: parent}, Group: true, GroupName: "folder",
-		})
-		if result.ParentID == "" || len(result.TaskIDs) != 2 {
-			t.Fatalf("unexpected group result: %+v", result)
-		}
-		all := httpRequestCheckOk[[]map[string]any](http.MethodGet, "/api/v1/tasks", nil)
-		if len(all) != 2 {
-			t.Fatalf("expected real tasks only, got %d", len(all))
-		}
-		for _, task := range all {
-			if task["parentId"] != result.ParentID || task["type"] != nil {
-				t.Fatalf("invalid member: %+v", task)
-			}
-			metadata, ok := task["group"].(map[string]any)
-			if !ok || metadata["path"] != filepath.Join(parent, "folder") || metadata["name"] != "folder" {
-				t.Fatalf("missing group metadata: %+v", task)
-			}
-		}
-	})
-}
-
 func TestPauseAndContinueTask(t *testing.T) {
 	doTest(func() {
 		var wg sync.WaitGroup

pkg/util/matcher.go

@@ -6,27 +6,14 @@ import (
 	"strings"
 )
 
-// Match url with pattern by chrome extension match pattern style.
+// Match url with pattern by chrome extension match pattern style
-// Magnet URI patterns such as magnet:?* are also supported, with * as a wildcard.
 // https://developer.chrome.com/docs/extensions/mv3/match_patterns/
 func Match(pattern string, u string) bool {
+	scheme, host, path := parsePattern(pattern)
 	url, err := url.Parse(u)
 	if err != nil {
 		return false
 	}
-	// Magnet URIs have no authority or path; match the raw scheme-specific
-	// part instead, preserving query punctuation and percent-encoding.
-	if strings.HasPrefix(pattern, "magnet:") && !strings.HasPrefix(pattern, "magnet://") {
-		if url.Scheme != "magnet" {
-			return false
-		}
-		_, target, _ := strings.Cut(u, ":")
-		expression := regexp.QuoteMeta(strings.TrimPrefix(pattern, "magnet:"))
-		expression = strings.ReplaceAll(expression, `\*`, ".*")
-		matched, _ := regexp.MatchString("^"+expression+"$", target)
-		return matched
-	}
-	scheme, host, path := parsePattern(pattern)
 	if scheme != "*" && scheme != url.Scheme {
 		return false
 	}

pkg/util/matcher_test.go

@@ -34,35 +34,3 @@ func TestMatch(t *testing.T) {
 		})
 	}
 }
-
-func TestMatchMagnet(t *testing.T) {
-	const magnetURL = "magnet:?xt=urn:btih:0123456789abcdef0123456789abcdef01234567&dn=example.zip"
-	tests := []struct {
-		name    string
-		pattern string
-		url     string
-		want    bool
-	}{
-		{"scheme wildcard", "magnet:*", magnetURL, true},
-		{"query wildcard", "magnet:?*", magnetURL, true},
-		{"info hash wildcard", "magnet:?xt=urn:btih:*", magnetURL, true},
-		{"exact URI", magnetURL, magnetURL, true},
-		{"encoded name", "magnet:?*&dn=example%20file.zip", "magnet:?xt=urn:btih:abc&dn=example%20file.zip", true},
-		{"literal query punctuation", "magnet:?*&dn=a+b[1].zip", "magnet:?xt=urn:btih:abc&dn=a+b[1].zip", true},
-		{"literal question mark", "magnet:?*", "magnet:xt=urn:btih:abc", false},
-		{"literal dot", "magnet:?*&dn=example.zip", "magnet:?xt=urn:btih:abc&dn=exampleXzip", false},
-		{"different hash type", "magnet:?xt=urn:btmh:*", magnetURL, false},
-		{"different hash", "magnet:?xt=urn:btih:other*", magnetURL, false},
-		{"different scheme", "magnet:*", "https://example.org/file.zip", false},
-		{"invalid URI", "magnet:*", "magnet:\x00", false},
-		{"existing catch-all", "*://*/*", magnetURL, true},
-		{"existing magnet pattern", "magnet://*", magnetURL, true},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := Match(tt.pattern, tt.url); got != tt.want {
-				t.Errorf("Match(%q, %q) = %v, want %v", tt.pattern, tt.url, got, tt.want)
-			}
-		})
-	}
-}

ui/flutter/docs/window-capability-rpc.md

@@ -94,8 +94,6 @@ State broadcasting must observe the owning Riverpod state centrally. Do not broa
 - Storage RPC methods expose business capabilities such as create-history operations, not raw `box.get` or `box.put` access.
 - Prefer batch mutations across the window boundary. For example, save all parsed URLs in one `saveCreateHistory(List<String>)` call.
 - New child-window storage requirements must be added to `StorageMethods` and bound in the main registry.
-- Config reads, full config saves, and create-history mutations share one main-window queue. Each history mutation reads, changes, and writes the config within that queue. History reads wait for earlier saves.
-- `StorageMethods` owns `extra.createHistory`; full config saves preserve its latest value inside the queue so stale settings or child-window snapshots cannot overwrite history.
 
 ## 7. Gopeed Backend Migration
 
@@ -130,42 +128,3 @@ Child-window code must not:
 - Parse RPC JSON directly inside a page or widget.
 
 These constraints keep all backend and persistence ownership in the main window and allow multiple child windows to operate concurrently without database locks or duplicated Gopeed runtimes.
-
-## 10. Batch Task Creation
-
-`GopeedMethods.createTaskBatch` carries `CreateTaskBatch` through the existing
-codec registry. Each member accepts either `rid` from resolve or `req`, plus
-creation `opts`. A nonempty `rid` takes priority. BT selections retain their
-original file indexes in `opts.selectFiles`.
-
-Both ordinary and grouped creation return `CreateTaskBatchResult`, an object
-with `taskIds` and an optional `parentId`. A successful response completes the
-batch, including partial success. The preview tracks completed batches so a
-failed batch can be retried without repeating successful batches. Creation does
-not accept a group ID to append members to an existing group.
-
-## 11. Opening Child Surfaces
-
-Use `AppRouter.openWindow(AppWindowPayload)` for child-window destinations.
-`AppRouter.openCreateTask(createTask: ...)` is the create-task convenience API.
-All entry points, including deep links, browser capture and the tray, use this
-API rather than selecting a presentation themselves:
-
-- Desktop launches an independent native child window through
-  `AppWindowLauncher.open(payload)` and the existing capability transport.
-- Web pushes an `AppWindowPage` on the root Navigator. This routed shadcn modal
-  keeps the current section, filters and scroll state mounted underneath it.
-- Native mobile retains the full-page flow, including later share requests.
-- If native child-window creation fails, the main window is brought forward
-  and the same in-app modal is used as a fallback.
-
-`AppWindowContent` owns the destination paths and content builders shared with
-`ChildWindowApp`. For another child surface, add its payload type, register its
-path and content, and use `AppWindowPage` for its in-app route. The modal's
-preferred size can be supplied per destination. Keep backend and storage access
-on the existing capability API in either presentation.
-
-Create-task content reports cancellation or completion through `onClose` when
-hosted in-app. Cancellation pops only the child surface. Completion selects the
-downloading list and returns home. The route payload uses a serializable string
-so browser history can restore a modal and its initial request.

ui/flutter/lib/api/api.dart

@@ -85,10 +85,10 @@ Future<String> createTask(CreateTask createTask) {
   return _parse<String>(() => _request('api/v1/tasks', method: 'POST', data: createTask), (data) => data as String);
 }
 
-Future<CreateTaskBatchResult> createTaskBatch(CreateTaskBatch createTaskBatch) {
+Future<List<String>> createTaskBatch(CreateTaskBatch createTaskBatch) {
-  return _parse<CreateTaskBatchResult>(
+  return _parse<List<String>>(
     () => _request('api/v1/tasks/batch', method: 'POST', data: createTaskBatch),
-    (json) => CreateTaskBatchResult.fromJson(json as Map<String, dynamic>),
+    (data) => (data as List<dynamic>).map((e) => e as String).toList(),
   );
 }
 

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

@@ -10,10 +10,7 @@ class CreateTaskBatch {
   List<CreateTaskBatchItem>? reqs;
   Options? opts;
 
-  bool group;
+  CreateTaskBatch({this.reqs, this.opts});
-  String groupName;
-
-  CreateTaskBatch({this.reqs, this.opts, this.group = false, this.groupName = ''});
 
   factory CreateTaskBatch.fromJson(Map<String, dynamic> json) => _$CreateTaskBatchFromJson(json);
 
@@ -22,23 +19,11 @@ class CreateTaskBatch {
 
 @JsonSerializable()
 class CreateTaskBatchItem {
-  String? rid;
   Request? req;
   Options? opts;
 
-  CreateTaskBatchItem({this.rid, this.req, this.opts});
+  CreateTaskBatchItem({this.req, this.opts});
 
   factory CreateTaskBatchItem.fromJson(Map<String, dynamic> json) => _$CreateTaskBatchItemFromJson(json);
   Map<String, dynamic> toJson() => _$CreateTaskBatchItemToJson(this);
 }
-
-@JsonSerializable()
-class CreateTaskBatchResult {
-  final List<String> taskIds;
-  final String? parentId;
-
-  CreateTaskBatchResult({required this.taskIds, this.parentId});
-
-  factory CreateTaskBatchResult.fromJson(Map<String, dynamic> json) => _$CreateTaskBatchResultFromJson(json);
-  Map<String, dynamic> toJson() => _$CreateTaskBatchResultToJson(this);
-}

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

@@ -6,55 +6,22 @@ part of 'create_task_batch.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-CreateTaskBatch _$CreateTaskBatchFromJson(Map<String, dynamic> json) =>
+CreateTaskBatch _$CreateTaskBatchFromJson(Map<String, dynamic> json) => CreateTaskBatch(
-    CreateTaskBatch(
+  reqs: (json['reqs'] as List<dynamic>?)?.map((e) => CreateTaskBatchItem.fromJson(e as Map<String, dynamic>)).toList(),
-      reqs: (json['reqs'] as List<dynamic>?)
+  opts: json['opts'] == null ? null : Options.fromJson(json['opts'] as Map<String, dynamic>),
-          ?.map((e) => CreateTaskBatchItem.fromJson(e as Map<String, dynamic>))
+);
-          .toList(),
-      opts: json['opts'] == null
-          ? null
-          : Options.fromJson(json['opts'] as Map<String, dynamic>),
-      group: json['group'] as bool? ?? false,
-      groupName: json['groupName'] as String? ?? '',
-    );
 
-Map<String, dynamic> _$CreateTaskBatchToJson(CreateTaskBatch instance) =>
+Map<String, dynamic> _$CreateTaskBatchToJson(CreateTaskBatch instance) => <String, dynamic>{
-    <String, dynamic>{
+  'reqs': ?instance.reqs?.map((e) => e.toJson()).toList(),
-      'reqs': ?instance.reqs?.map((e) => e.toJson()).toList(),
+  'opts': ?instance.opts?.toJson(),
-      'opts': ?instance.opts?.toJson(),
+};
-      'group': instance.group,
-      'groupName': instance.groupName,
-    };
 
-CreateTaskBatchItem _$CreateTaskBatchItemFromJson(Map<String, dynamic> json) =>
+CreateTaskBatchItem _$CreateTaskBatchItemFromJson(Map<String, dynamic> json) => CreateTaskBatchItem(
-    CreateTaskBatchItem(
+  req: json['req'] == null ? null : Request.fromJson(json['req'] as Map<String, dynamic>),
-      rid: json['rid'] as String?,
+  opts: json['opts'] == null ? null : Options.fromJson(json['opts'] as Map<String, dynamic>),
-      req: json['req'] == null
+);
-          ? null
-          : Request.fromJson(json['req'] as Map<String, dynamic>),
-      opts: json['opts'] == null
-          ? null
-          : Options.fromJson(json['opts'] as Map<String, dynamic>),
-    );
 
-Map<String, dynamic> _$CreateTaskBatchItemToJson(
+Map<String, dynamic> _$CreateTaskBatchItemToJson(CreateTaskBatchItem instance) => <String, dynamic>{
-  CreateTaskBatchItem instance,
-) => <String, dynamic>{
-  'rid': ?instance.rid,
   'req': ?instance.req,
   'opts': ?instance.opts,
 };
-
-CreateTaskBatchResult _$CreateTaskBatchResultFromJson(
-  Map<String, dynamic> json,
-) => CreateTaskBatchResult(
-  taskIds: (json['taskIds'] as List<dynamic>).map((e) => e as String).toList(),
-  parentId: json['parentId'] as String?,
-);
-
-Map<String, dynamic> _$CreateTaskBatchResultToJson(
-  CreateTaskBatchResult instance,
-) => <String, dynamic>{
-  'taskIds': instance.taskIds,
-  'parentId': ?instance.parentId,
-};

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

@@ -64,10 +64,6 @@ class ProtocolConfig {
   Ed2kConfig ed2k = Ed2kConfig();
   HlsConfig hls = HlsConfig();
 
-  /// A server without FTP support sends no `ftp` key; the defaults keep the rest of the config readable.
-  @JsonKey(fromJson: _ftpConfigFromJson)
-  FtpConfig ftp = FtpConfig();
-
   ProtocolConfig();
 
   factory ProtocolConfig.fromJson(Map<String, dynamic>? json) =>
@@ -95,20 +91,6 @@ class HlsConfig {
   Map<String, dynamic> toJson() => _$HlsConfigToJson(this);
 }
 
-FtpConfig _ftpConfigFromJson(Map<String, dynamic>? json) => json == null ? FtpConfig() : FtpConfig.fromJson(json);
-
-/// Global FTP defaults. It mirrors the `ftp` protocol config of the server.
-@JsonSerializable()
-class FtpConfig {
-  int connections;
-
-  FtpConfig({this.connections = 0});
-
-  factory FtpConfig.fromJson(Map<String, dynamic> json) => _$FtpConfigFromJson(json);
-
-  Map<String, dynamic> toJson() => _$FtpConfigToJson(this);
-}
-
 @JsonSerializable()
 class HttpConfig {
   String userAgent;
@@ -214,15 +196,13 @@ class ExtraConfig {
   List<String> createHistory;
   bool runAsMenubarApp;
   bool analyticsEnabled;
-
+  String analyticsClientId;
-  /// Persisted UUID fallback; IDs returned by platform APIs are not stored here.
-  String deviceId;
 
   ExtraConfig({
     this.themeMode = '',
     this.themeColor = 'green',
     this.locale = '',
-    this.lastDeleteTaskKeep = true,
+    this.lastDeleteTaskKeep = false,
     this.defaultDirectDownload = false,
     this.defaultBtClient = true,
     this.notifyWhenNewVersion = true,
@@ -234,7 +214,7 @@ class ExtraConfig {
     this.createHistory = const [],
     this.runAsMenubarApp = false,
     this.analyticsEnabled = true,
-    this.deviceId = '',
+    this.analyticsClientId = '',
   }) : windowState = windowState ?? WindowStateConfig();
 
   factory ExtraConfig.fromJson(Map<String, dynamic>? json) =>

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

@@ -67,15 +67,13 @@ ProtocolConfig _$ProtocolConfigFromJson(Map<String, dynamic> json) => ProtocolCo
   ..http = HttpConfig.fromJson(json['http'] as Map<String, dynamic>)
   ..bt = BtConfig.fromJson(json['bt'] as Map<String, dynamic>)
   ..ed2k = Ed2kConfig.fromJson(json['ed2k'] as Map<String, dynamic>)
-  ..hls = HlsConfig.fromJson(json['hls'] as Map<String, dynamic>)
+  ..hls = HlsConfig.fromJson(json['hls'] as Map<String, dynamic>);
-  ..ftp = _ftpConfigFromJson(json['ftp'] as Map<String, dynamic>?);
 
 Map<String, dynamic> _$ProtocolConfigToJson(ProtocolConfig instance) => <String, dynamic>{
   'http': instance.http.toJson(),
   'bt': instance.bt.toJson(),
   'ed2k': instance.ed2k.toJson(),
   'hls': instance.hls.toJson(),
-  'ftp': instance.ftp.toJson(),
 };
 
 HlsConfig _$HlsConfigFromJson(Map<String, dynamic> json) => HlsConfig(
@@ -92,11 +90,6 @@ Map<String, dynamic> _$HlsConfigToJson(HlsConfig instance) => <String, dynamic>{
   'prefetchContentLength': instance.prefetchContentLength,
 };
 
-FtpConfig _$FtpConfigFromJson(Map<String, dynamic> json) =>
-    FtpConfig(connections: (json['connections'] as num?)?.toInt() ?? 0);
-
-Map<String, dynamic> _$FtpConfigToJson(FtpConfig instance) => <String, dynamic>{'connections': instance.connections};
-
 HttpConfig _$HttpConfigFromJson(Map<String, dynamic> json) => HttpConfig(
   userAgent: json['userAgent'] as String? ?? '',
   connections: (json['connections'] as num?)?.toInt() ?? 0,
@@ -186,7 +179,7 @@ ExtraConfig _$ExtraConfigFromJson(Map<String, dynamic> json) => ExtraConfig(
   themeMode: json['themeMode'] as String? ?? '',
   themeColor: json['themeColor'] as String? ?? 'green',
   locale: json['locale'] as String? ?? '',
-  lastDeleteTaskKeep: json['lastDeleteTaskKeep'] as bool? ?? true,
+  lastDeleteTaskKeep: json['lastDeleteTaskKeep'] as bool? ?? false,
   defaultDirectDownload: json['defaultDirectDownload'] as bool? ?? false,
   defaultBtClient: json['defaultBtClient'] as bool? ?? true,
   notifyWhenNewVersion: json['notifyWhenNewVersion'] as bool? ?? true,
@@ -200,7 +193,7 @@ ExtraConfig _$ExtraConfigFromJson(Map<String, dynamic> json) => ExtraConfig(
   createHistory: (json['createHistory'] as List<dynamic>?)?.map((e) => e as String).toList() ?? const [],
   runAsMenubarApp: json['runAsMenubarApp'] as bool? ?? false,
   analyticsEnabled: json['analyticsEnabled'] as bool? ?? true,
-  deviceId: json['deviceId'] as String? ?? '',
+  analyticsClientId: json['analyticsClientId'] as String? ?? '',
 );
 
 Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) => <String, dynamic>{
@@ -219,7 +212,7 @@ Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) => <String, dynam
   'createHistory': instance.createHistory,
   'runAsMenubarApp': instance.runAsMenubarApp,
   'analyticsEnabled': instance.analyticsEnabled,
-  'deviceId': instance.deviceId,
+  'analyticsClientId': instance.analyticsClientId,
 };
 
 WindowStateConfig _$WindowStateConfigFromJson(Map<String, dynamic> json) => WindowStateConfig(

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

@@ -67,28 +67,3 @@ class OptsExtraHttp {
 
   Map<String, dynamic> toJson() => _$OptsExtraHttpToJson(this);
 }
-
-/// Options for an FTP task. It mirrors `pkg/protocol/ftp.OptsExtra`. The TLS
-/// mode of an `ftp://` link is on the request, see `ReqExtraFtp`.
-@JsonSerializable()
-class OptsExtraFtp {
-  int connections;
-  bool? autoTorrent;
-  bool? deleteTorrentAfterDownload;
-  bool? autoExtract;
-  String archivePassword;
-  bool deleteAfterExtract;
-
-  OptsExtraFtp({
-    this.connections = 0,
-    this.autoTorrent,
-    this.deleteTorrentAfterDownload,
-    this.autoExtract,
-    this.archivePassword = '',
-    this.deleteAfterExtract = false,
-  });
-
-  factory OptsExtraFtp.fromJson(Map<String, dynamic> json) => _$OptsExtraFtpFromJson(json);
-
-  Map<String, dynamic> toJson() => _$OptsExtraFtpToJson(this);
-}

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

@@ -65,21 +65,3 @@ Map<String, dynamic> _$OptsExtraHttpToJson(OptsExtraHttp instance) =>
       'deleteAfterExtract': instance.deleteAfterExtract,
       'checksum': ?instance.checksum?.toJson(),
     };
-
-OptsExtraFtp _$OptsExtraFtpFromJson(Map<String, dynamic> json) => OptsExtraFtp(
-  connections: (json['connections'] as num?)?.toInt() ?? 0,
-  autoTorrent: json['autoTorrent'] as bool?,
-  deleteTorrentAfterDownload: json['deleteTorrentAfterDownload'] as bool?,
-  autoExtract: json['autoExtract'] as bool?,
-  archivePassword: json['archivePassword'] as String? ?? '',
-  deleteAfterExtract: json['deleteAfterExtract'] as bool? ?? false,
-);
-
-Map<String, dynamic> _$OptsExtraFtpToJson(OptsExtraFtp instance) => <String, dynamic>{
-  'connections': instance.connections,
-  'autoTorrent': ?instance.autoTorrent,
-  'deleteTorrentAfterDownload': ?instance.deleteTorrentAfterDownload,
-  'autoExtract': ?instance.autoExtract,
-  'archivePassword': instance.archivePassword,
-  'deleteAfterExtract': instance.deleteAfterExtract,
-};

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

@@ -42,20 +42,6 @@ class ReqExtraBt {
   Map<String, dynamic> toJson() => _$ReqExtraBtToJson(this);
 }
 
-/// The request extra of an FTP task. It mirrors `pkg/protocol/ftp.ReqExtra`;
-/// [tls] only applies to `ftp://` URLs, because `ftps://` always uses
-/// implicit TLS and `ftpes://` always uses explicit TLS.
-@JsonSerializable()
-class ReqExtraFtp {
-  String tls;
-
-  ReqExtraFtp({this.tls = 'none'});
-
-  factory ReqExtraFtp.fromJson(Map<String, dynamic> json) => _$ReqExtraFtpFromJson(json);
-
-  Map<String, dynamic> toJson() => _$ReqExtraFtpToJson(this);
-}
-
 enum RequestProxyMode { follow, none, custom }
 
 @JsonSerializable()

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

@@ -41,10 +41,6 @@ ReqExtraBt _$ReqExtraBtFromJson(Map<String, dynamic> json) =>
 
 Map<String, dynamic> _$ReqExtraBtToJson(ReqExtraBt instance) => <String, dynamic>{'trackers': instance.trackers};
 
-ReqExtraFtp _$ReqExtraFtpFromJson(Map<String, dynamic> json) => ReqExtraFtp(tls: json['tls'] as String? ?? 'none');
-
-Map<String, dynamic> _$ReqExtraFtpToJson(ReqExtraFtp instance) => <String, dynamic>{'tls': instance.tls};
-
 RequestProxy _$RequestProxyFromJson(Map<String, dynamic> json) => RequestProxy(
   mode: $enumDecodeNullable(_$RequestProxyModeEnumMap, json['mode']) ?? RequestProxyMode.follow,
   scheme: json['scheme'] as String? ?? 'http',

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

@@ -6,7 +6,7 @@ part 'task.g.dart';
 
 enum Status { ready, running, pause, wait, error, done }
 
-enum Protocol { http, bt, ed2k, hls, ftp }
+enum Protocol { http, bt, ed2k, hls }
 
 // ExtractStatus enum matching Go backend
 enum ExtractStatus {
@@ -28,10 +28,7 @@ enum ExtractStatus {
 class Task {
   String id;
   String name;
-  @JsonKey(unknownEnumValue: JsonKey.nullForUndefinedEnumValue)
   Protocol? protocol;
-  TaskGroup? group;
-  String parentId;
   Meta meta;
   Status status;
   bool uploading;
@@ -50,8 +47,6 @@ class Task {
     required this.createdAt,
     required this.updatedAt,
     this.doneAt,
-    this.group,
-    this.parentId = '',
   });
 
   factory Task.fromJson(Map<String, dynamic> json) => _$TaskFromJson(json);
@@ -59,18 +54,6 @@ class Task {
   Map<String, dynamic> toJson() => _$TaskToJson(this);
 }
 
-@JsonSerializable()
-class TaskGroup {
-  final String id;
-  final String name;
-  final String path;
-  final DateTime createdAt;
-
-  TaskGroup({required this.id, required this.name, required this.path, required this.createdAt});
-  factory TaskGroup.fromJson(Map<String, dynamic> json) => _$TaskGroupFromJson(json);
-  Map<String, dynamic> toJson() => _$TaskGroupToJson(this);
-}
-
 @JsonSerializable()
 class Progress {
   int used;

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

@@ -16,16 +16,12 @@ Task _$TaskFromJson(Map<String, dynamic> json) => Task(
   createdAt: DateTime.parse(json['createdAt'] as String),
   updatedAt: DateTime.parse(json['updatedAt'] as String),
   doneAt: json['doneAt'] == null ? null : DateTime.parse(json['doneAt'] as String),
-  group: json['group'] == null ? null : TaskGroup.fromJson(json['group'] as Map<String, dynamic>),
+)..protocol = $enumDecodeNullable(_$ProtocolEnumMap, json['protocol']);
-  parentId: json['parentId'] as String? ?? '',
-)..protocol = $enumDecodeNullable(_$ProtocolEnumMap, json['protocol'], unknownValue: JsonKey.nullForUndefinedEnumValue);
 
 Map<String, dynamic> _$TaskToJson(Task instance) => <String, dynamic>{
   'id': instance.id,
   'name': instance.name,
   'protocol': ?_$ProtocolEnumMap[instance.protocol],
-  'group': ?instance.group?.toJson(),
-  'parentId': instance.parentId,
   'meta': instance.meta.toJson(),
   'status': _$StatusEnumMap[instance.status]!,
   'uploading': instance.uploading,
@@ -44,27 +40,7 @@ const _$StatusEnumMap = {
   Status.done: 'done',
 };
 
-const _$ProtocolEnumMap = {
+const _$ProtocolEnumMap = {Protocol.http: 'http', Protocol.bt: 'bt', Protocol.ed2k: 'ed2k', Protocol.hls: 'hls'};
-  Protocol.http: 'http',
-  Protocol.bt: 'bt',
-  Protocol.ed2k: 'ed2k',
-  Protocol.hls: 'hls',
-  Protocol.ftp: 'ftp',
-};
-
-TaskGroup _$TaskGroupFromJson(Map<String, dynamic> json) => TaskGroup(
-  id: json['id'] as String,
-  name: json['name'] as String,
-  path: json['path'] as String,
-  createdAt: DateTime.parse(json['createdAt'] as String),
-);
-
-Map<String, dynamic> _$TaskGroupToJson(TaskGroup instance) => <String, dynamic>{
-  'id': instance.id,
-  'name': instance.name,
-  'path': instance.path,
-  'createdAt': instance.createdAt.toIso8601String(),
-};
 
 Progress _$ProgressFromJson(Map<String, dynamic> json) => Progress(
   used: (json['used'] as num).toInt(),

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

@@ -52,8 +52,7 @@ sealed class TaskStats {
     final runtime = _map(json['runtime']);
     if (snapshot.isEmpty && runtime.isEmpty) return null;
     return switch (protocol) {
-      // FTP stats have the same shape as HTTP stats: one entry per connection.
+      Protocol.http => HttpTaskStats.fromJson(snapshot),
-      Protocol.http || Protocol.ftp => HttpTaskStats.fromJson(snapshot),
       Protocol.bt => BtTaskStats.fromJson(snapshot: snapshot, runtime: runtime),
       Protocol.ed2k => Ed2kTaskStats.fromJson(snapshot: snapshot, runtime: runtime),
       Protocol.hls || null => null,

ui/flutter/lib/app/application/app_deep_link_controller.dart

@@ -13,7 +13,9 @@ import '../../api/model/install_extension.dart';
 import '../../api/model/request.dart';
 import '../../core/entry/app_startup_options.dart';
 import '../../core/utils/content_uri_resolver.dart';
+import '../../core/window/app_window_launcher.dart';
 import '../../features/extensions/application/pending_extension_install.dart';
+import '../../features/tasks/application/pending_create_task.dart';
 import '../../util/util.dart';
 import '../router/app_router.dart';
 import 'app_runtime_controller.dart';
@@ -116,7 +118,18 @@ class AppDeepLinkController extends AsyncNotifier<AppDeepLinkState> {
     await _go('/');
   }
 
-  Future<void> _openCreate(CreateTask? createTask) => AppRouter.openCreateTask(createTask: createTask);
+  Future<void> _openCreate(CreateTask? createTask) async {
+    if (Util.isDesktop()) {
+      final opened = await AppWindowLauncher.openCreateTaskWindow(createTask: createTask);
+      if (!opened) {
+        ref.read(pendingCreateTaskProvider.notifier).set(createTask);
+        await _go('/create');
+      }
+      return;
+    }
+    ref.read(pendingCreateTaskProvider.notifier).set(createTask);
+    await _go('/create');
+  }
 
   Future<void> _go(String route) async {
     if (Util.isDesktop()) {

ui/flutter/lib/app/application/app_platform_controller.dart

@@ -14,7 +14,9 @@ import '../../api/api.dart' as api;
 import '../../api/model/downloader_config.dart';
 import '../../core/libgopeed_boot.dart';
 import '../../core/capabilities/app_capabilities.dart';
+import '../../core/window/app_window_launcher.dart';
 import '../../core/window/window_capability_transport.dart';
+import '../../features/tasks/application/pending_create_task.dart';
 import '../../features/tasks/application/pending_update_task.dart';
 import '../../l10n/l10n.dart';
 import '../../util/package_info.dart';
@@ -209,7 +211,11 @@ class AppPlatformController extends AsyncNotifier<AppPlatformState> with WindowL
           await ref.read(gopeedServiceProvider).createTask(createTask);
           return;
         }
-        await AppRouter.openCreateTask(createTask: createTask);
+        final opened = await AppWindowLauncher.openCreateTaskWindow(createTask: createTask);
+        if (!opened) {
+          ref.read(pendingCreateTaskProvider.notifier).set(createTask);
+          await _go('/create');
+        }
       },
       onForward: ({required path, required method, data, query}) {
         return api.forward(path, method: method, data: data, queryParameters: query);
@@ -342,7 +348,10 @@ class AppPlatformController extends AsyncNotifier<AppPlatformState> with WindowL
 
   Future<void> _openCreateTask() async {
     await _showMainWindow();
-    await AppRouter.openCreateTask();
+    final opened = await AppWindowLauncher.openCreateTaskWindow();
+    if (!opened) {
+      _go('/create');
+    }
   }
 
   Future<void> _go(String route) async {

ui/flutter/lib/app/application/app_runtime_controller.dart

@@ -53,7 +53,6 @@ class AppRuntimeState {
 class AppRuntimeController extends AsyncNotifier<AppRuntimeState> {
   static StartConfig? _defaultStartConfig;
   Future<void> _preferenceWrites = Future<void>.value();
-  bool _analyticsStarted = false;
 
   @override
   Future<AppRuntimeState> build() async {
@@ -74,7 +73,6 @@ class AppRuntimeController extends AsyncNotifier<AppRuntimeState> {
       startConfig
         ..apiEnable = true
         ..mcpEnable = config.api.mcpEnable;
-      await _initAnalytics(config);
     } else {
       startConfig
         ..apiEnable = config.api.enable
@@ -255,17 +253,15 @@ class AppRuntimeController extends AsyncNotifier<AppRuntimeState> {
   }
 
   Future<void> _initAnalytics(DownloaderConfig config) async {
-    if (_analyticsStarted || !AnalyticsConfig.isConfigured || !config.extra.analyticsEnabled) return;
+    if (!AnalyticsConfig.isConfigured || !config.extra.analyticsEnabled) return;
-    _analyticsStarted = true;
     try {
-      final generatedClientId = await Analytics.instance.init(fallbackClientId: config.extra.deviceId);
+      await Analytics.instance.init(fallbackClientId: config.extra.analyticsClientId);
-      if (generatedClientId != null) {
+      if (config.extra.analyticsClientId.isEmpty && Analytics.instance.clientId.isNotEmpty) {
-        config.extra.deviceId = generatedClientId;
+        config.extra.analyticsClientId = Analytics.instance.clientId;
         await ref.read(gopeedServiceProvider).putConfig(config);
       }
       unawaited(Analytics.instance.logAppOpen());
     } catch (error, stackTrace) {
-      _analyticsStarted = false;
       logger.w('GA4 init failed', error, stackTrace);
     }
   }

ui/flutter/lib/app/application/downloader_config_init.dart

@@ -19,7 +19,7 @@ Future<DownloaderConfig> loadDownloaderConfig({
     config = await load();
   } catch (error, stackTrace) {
     onLoadError?.call(error, stackTrace);
-    config = DownloaderConfig()..extra.analyticsEnabled = false;
+    config = DownloaderConfig();
     loaded = false;
   }
   final changed = await initDownloaderConfig(config, defaultDownloadDir: defaultDownloadDir);

ui/flutter/lib/app/child_window_app.dart

@@ -1,12 +1,13 @@
 import 'package:flutter/widgets.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart' as shad;
 
+import '../api/model/create_task.dart';
 import '../app/application/app_appearance_controller.dart';
 import '../core/window/app_window_bootstrap.dart';
 import '../core/window/app_window_frame.dart';
 import '../core/window/app_window_payload.dart';
 import '../core/window/window_capability_transport.dart';
-import 'router/app_window_content.dart';
+import '../features/tasks/presentation/pages/create_task_window_page.dart';
 import '../l10n/l10n.dart';
 import '../shared/theme/app_component_themes.dart';
 import '../shared/theme/app_theme.dart';
@@ -81,7 +82,10 @@ class _ChildWindowAppState extends State<ChildWindowApp> with WidgetsBindingObse
 
   Widget _buildPage(BuildContext context) {
     return switch (widget.payload.type) {
-      AppWindowType.createTask => AppWindowContent.build(widget.payload, windowController: widget.session.controller),
+      AppWindowType.createTask => CreateTaskWindowPage(
+        windowController: widget.session.controller,
+        initialTask: widget.payload.createTask == null ? null : CreateTask.fromJson(widget.payload.createTask!),
+      ),
       _ => shad.Scaffold(child: Center(child: Text(context.l10n.unsupportedWindowPayload))),
     };
   }

ui/flutter/lib/app/router/app_router.dart

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:go_router/go_router.dart';
@@ -13,13 +11,7 @@ import '../../features/auth/application/web_auth_controller.dart';
 import '../../features/auth/presentation/pages/login_page.dart';
 import '../../features/home/presentation/pages/home_page.dart';
 import '../../features/settings/presentation/pages/settings_page.dart';
-import '../../api/model/create_task.dart';
+import '../../features/tasks/presentation/pages/create_task_window_page.dart';
-import '../../core/window/app_window_chrome.dart';
-import '../../core/window/app_window_launcher.dart';
-import '../../core/window/app_window_payload.dart';
-import '../../features/tasks/application/pending_create_task.dart';
-import 'app_window_content.dart';
-import 'app_window_page.dart';
 import '../../features/tasks/domain/task_record.dart';
 import '../../features/tasks/presentation/pages/task_details_page.dart';
 import '../../features/tasks/presentation/pages/task_files_page.dart';
@@ -30,37 +22,6 @@ import 'runtime_page.dart';
 class AppRouter {
   static final GlobalKey<NavigatorState> rootNavigatorKey = GlobalKey<NavigatorState>();
 
-  static bool get _isMobile =>
-      !kIsWeb && (defaultTargetPlatform == TargetPlatform.android || defaultTargetPlatform == TargetPlatform.iOS);
-
-  static Future<void> openCreateTask({CreateTask? createTask}) =>
-      openWindow(AppWindowPayload.createTask(createTask: createTask?.toJson()));
-
-  /// Opens a desktop child window, a Web modal, or a native mobile page.
-  /// Callers never need to choose a presentation or implement a fallback.
-  static Future<void> openWindow(AppWindowPayload payload) async {
-    final location = AppWindowContent.location(payload.type);
-    if (AppWindowChrome.isDesktopWindow && await AppWindowLauncher.open(payload)) return;
-    final context = rootNavigatorKey.currentContext;
-    if (context == null || !context.mounted) return;
-    final router = GoRouter.of(context);
-    if (router.state.uri.path == location) {
-      // Native share intents may arrive while the creation page is already open.
-      if (payload.type == AppWindowType.createTask && payload.createTask != null) {
-        ProviderScope.containerOf(
-          context,
-          listen: false,
-        ).read(pendingCreateTaskProvider.notifier).set(CreateTask.fromJson(payload.createTask!));
-      }
-      return;
-    }
-    if (_isMobile) {
-      router.go(location, extra: payload.toRaw());
-    } else {
-      unawaited(router.push<void>(location, extra: payload.toRaw()));
-    }
-  }
-
   static void showDownloadingTasks() {
     final context = rootNavigatorKey.currentContext;
     if (context == null || !context.mounted) return;
@@ -70,7 +31,8 @@ class AppRouter {
 
   static GoRouter build(WebAuthController webAuthController) {
     // Keep desktop and web sections as peers; native mobile retains home below them.
-    final isMobile = _isMobile;
+    final isMobile =
+        !kIsWeb && (defaultTargetPlatform == TargetPlatform.android || defaultTargetPlatform == TargetPlatform.iOS);
     final sectionRoutes = [
       GoRoute(
         path: isMobile ? 'extensions' : '/extensions',
@@ -121,33 +83,7 @@ class AppRouter {
               path: '/',
               builder: _runtimePage((context, state) => const HomePage()),
               routes: [
-                GoRoute(
+                GoRoute(path: 'create', builder: _runtimePage((context, state) => const CreateTaskWindowPage())),
-                  path: 'create',
-                  parentNavigatorKey: rootNavigatorKey,
-                  pageBuilder: (context, state) {
-                    final payload = state.extra is String
-                        ? AppWindowPayload.fromRaw(state.extra! as String)
-                        : AppWindowPayload.createTask();
-                    final child = RuntimePage(
-                      builder: (context) => AppWindowContent.build(
-                        payload,
-                        modal: !isMobile,
-                        onClose: (created) {
-                          if (created) {
-                            showDownloadingTasks();
-                          } else if (context.canPop()) {
-                            context.pop();
-                          } else {
-                            context.go('/');
-                          }
-                        },
-                      ),
-                    );
-                    return isMobile
-                        ? NoTransitionPage<void>(key: state.pageKey, child: child)
-                        : AppWindowPage<void>(key: state.pageKey, child: child);
-                  },
-                ),
                 GoRoute(
                   path: 'tasks/:id',
                   builder: _runtimePage(

ui/flutter/lib/app/router/app_window_content.dart

@@ -1,29 +0,0 @@
-import 'package:desktop_multi_window/desktop_multi_window.dart';
-import 'package:flutter/widgets.dart';
-
-import '../../api/model/create_task.dart';
-import '../../core/window/app_window_payload.dart';
-import '../../features/tasks/presentation/pages/create_task_window_page.dart';
-
-/// Shared destination registry for desktop child engines and in-app windows.
-abstract final class AppWindowContent {
-  static String location(AppWindowType type) => switch (type) {
-    AppWindowType.createTask => '/create',
-    AppWindowType.main => throw ArgumentError.value(type, 'type', 'Expected a child window'),
-  };
-
-  static Widget build(
-    AppWindowPayload payload, {
-    WindowController? windowController,
-    ValueChanged<bool>? onClose,
-    bool modal = false,
-  }) => switch (payload.type) {
-    AppWindowType.createTask => CreateTaskWindowPage(
-      windowController: windowController,
-      initialTask: payload.createTask == null ? null : CreateTask.fromJson(payload.createTask!),
-      onClose: onClose,
-      modal: modal,
-    ),
-    AppWindowType.main => throw ArgumentError.value(payload.type, 'payload.type', 'Expected a child window'),
-  };
-}

ui/flutter/lib/app/router/app_window_page.dart

@@ -1,64 +0,0 @@
-import 'package:shadcn_flutter/shadcn_flutter.dart';
-
-import '../../shared/theme/app_design_tokens.dart';
-import '../../shared/theme/app_palette.dart';
-import '../../core/utils/breakpoints.dart';
-
-/// A routed modal keeps its underlying page mounted and participates in Back.
-class AppWindowPage<T> extends Page<T> {
-  const AppWindowPage({super.key, required this.child, this.preferredSize = AppDesignTokens.childWindowSize});
-
-  final Widget child;
-  final Size preferredSize;
-
-  @override
-  Route<T> createRoute(BuildContext context) => DialogRoute<T>(
-    context: context,
-    settings: this,
-    barrierDismissible: false,
-    barrierColor: Theme.of(context).colorScheme.background.withValues(alpha: 0.6),
-    traversalEdgeBehavior: TraversalEdgeBehavior.closedLoop,
-    alignment: Alignment.center,
-    fullScreen: true,
-    transitionBuilder: (context, animation, secondaryAnimation, child) =>
-        FadeTransition(opacity: animation, child: child),
-    builder: (context) => Padding(
-      padding: EdgeInsets.only(bottom: MediaQuery.viewInsetsOf(context).bottom),
-      child: LayoutBuilder(
-        builder: (context, constraints) {
-          final page = ModalRoute.settingsOf(context)! as AppWindowPage<T>;
-          final palette = AppPalette.of(context);
-          return Padding(
-            padding: EdgeInsets.all(
-              constraints.maxWidth < Breakpoints.mobile ? AppDesignTokens.space12 : AppDesignTokens.space32,
-            ),
-            child: Center(
-              child: ConstrainedBox(
-                constraints: BoxConstraints(maxWidth: page.preferredSize.width, maxHeight: page.preferredSize.height),
-                child: ModalContainer(
-                  key: const ValueKey('app-window-modal'),
-                  padding: EdgeInsets.zero,
-                  filled: true,
-                  fillColor: palette.sideBg,
-                  borderColor: palette.border,
-                  borderRadius: BorderRadius.circular(AppDesignTokens.windowRadius),
-                  clipBehavior: Clip.antiAlias,
-                  child: MediaQuery.removeViewInsets(
-                    context: context,
-                    removeBottom: true,
-                    child: MediaQuery.removePadding(
-                      context: context,
-                      removeTop: true,
-                      removeBottom: true,
-                      child: page.child,
-                    ),
-                  ),
-                ),
-              ),
-            ),
-          );
-        },
-      ),
-    ),
-  );
-}

ui/flutter/lib/app/router/shells/main_shell.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
 
 import '../../../api/model/create_task.dart';
 import '../../application/app_deep_link_controller.dart';
@@ -10,10 +11,11 @@ import '../../application/app_notification_controller.dart';
 import '../../application/app_runtime_controller.dart';
 import '../../application/app_platform_controller.dart';
 import '../../../features/settings/presentation/widgets/app_update_dialog.dart';
+import '../../../features/tasks/application/pending_create_task.dart';
 import '../../../features/tasks/application/pending_update_task.dart';
 import '../../../features/tasks/application/tasks_controller.dart';
 import '../../../features/tasks/presentation/widgets/pending_update_dialog.dart';
-import '../app_router.dart';
+import '../../../core/window/app_window_launcher.dart';
 import '../../../shared/widgets/app_toast.dart';
 
 class MainShell extends ConsumerStatefulWidget {
@@ -122,5 +124,11 @@ class _MainShellState extends ConsumerState<MainShell> {
     }
   }
 
-  Future<void> _openCapturedCreateTask(CreateTask createTask) => AppRouter.openCreateTask(createTask: createTask);
+  Future<void> _openCapturedCreateTask(CreateTask createTask) async {
+    final opened = await AppWindowLauncher.openCreateTaskWindow(createTask: createTask);
+    if (!opened && mounted) {
+      ref.read(pendingCreateTaskProvider.notifier).set(createTask);
+      context.go('/create');
+    }
+  }
 }

ui/flutter/lib/core/capabilities/app_capabilities.dart

@@ -34,9 +34,8 @@ class AppCapabilities {
 class LocalAppCapabilities {
   LocalAppCapabilities._() : codecs = createAppCapabilityCodecs() {
     registry = CapabilityRegistry(codecs);
-    final config = _ConfigStore();
+    _bindGopeed(registry);
-    _bindGopeed(registry, config);
+    _bindStorage(registry);
-    _bindStorage(registry, config);
     registry.bind(NavigationMethods.showDownloadingTasks, (_) {
       AppRouter.showDownloadingTasks();
       return const RpcUnit();
@@ -63,7 +62,6 @@ RpcCodecRegistry createAppCapabilityCodecs() {
     ..register<ResolveResult>((json) => ResolveResult.fromJson(json! as Map<String, dynamic>))
     ..register<CreateTask>((json) => CreateTask.fromJson(json! as Map<String, dynamic>))
     ..register<CreateTaskBatch>((json) => CreateTaskBatch.fromJson(json! as Map<String, dynamic>))
-    ..register<CreateTaskBatchResult>((json) => CreateTaskBatchResult.fromJson(json! as Map<String, dynamic>))
     ..register<DownloaderConfig>((json) => DownloaderConfig.fromJson(json! as Map<String, dynamic>))
     ..register<TaskRuntimeStatus>((json) => TaskRuntimeStatus.fromJson(json! as Map<String, dynamic>))
     ..register<List<Task>>(
@@ -82,7 +80,7 @@ RpcCodecRegistry createAppCapabilityCodecs() {
   return codecs;
 }
 
-void _bindGopeed(CapabilityRegistry registry, _ConfigStore configStore) {
+void _bindGopeed(CapabilityRegistry registry) {
   registry
     ..bind(GopeedMethods.triggerProtocolJob, (p) async {
       await api.triggerProtocolJob(p['protocol'] as String, p['name'] as String);
@@ -129,9 +127,9 @@ void _bindGopeed(CapabilityRegistry registry, _ConfigStore configStore) {
       await api.deleteTasks(_optionalStringList(params['ids']), params['force'] as bool? ?? false);
       return const RpcUnit();
     })
-    ..bind(GopeedMethods.getConfig, (_) => configStore.get())
+    ..bind(GopeedMethods.getConfig, (_) => api.getConfig())
     ..bind(GopeedMethods.putConfig, (config) async {
-      await configStore.put(config);
+      await api.putConfig(config);
       return const RpcUnit();
     })
     ..bind(GopeedMethods.installExtension, api.installExtension)
@@ -165,59 +163,35 @@ void _bindGopeed(CapabilityRegistry registry, _ConfigStore configStore) {
     });
 }
 
-// Shared by local and child-window handlers. History owns its config field;
+void _bindStorage(CapabilityRegistry registry) {
-// full config snapshots must preserve the latest history inside the same queue.
-class _ConfigStore {
-  Future<void> _tail = Future<void>.value();
-
-  Future<T> _run<T>(Future<T> Function() operation) {
-    final result = _tail.then((_) => operation());
-    _tail = result.then<void>((_) {}, onError: (Object _, StackTrace _) {});
-    return result;
-  }
-
-  Future<DownloaderConfig> get() => _run(api.getConfig);
-
-  Future<void> put(DownloaderConfig config) {
-    final snapshot = DownloaderConfig.fromJson(config.toJson());
-    return _run(() async {
-      final latest = await api.getConfig();
-      snapshot.extra.createHistory = latest.extra.createHistory;
-      await api.putConfig(snapshot);
-    });
-  }
-
-  Future<void> updateHistory(void Function(List<String>) mutation) => _run(() async {
-    final config = await api.getConfig();
-    final history = List<String>.of(config.extra.createHistory);
-    mutation(history);
-    config.extra.createHistory = history;
-    await api.putConfig(config);
-  });
-}
-
-void _bindStorage(CapabilityRegistry registry, _ConfigStore configStore) {
   registry
     ..bind(StorageMethods.getCreateHistory, (_) async {
-      final config = await configStore.get();
+      final config = await api.getConfig();
       return config.extra.createHistory;
     })
     ..bind(StorageMethods.saveCreateHistory, (urls) async {
-      await configStore.updateHistory((history) {
+      final config = await api.getConfig();
-        for (final url in urls) {
+      final history = List<String>.of(config.extra.createHistory);
-          history.remove(url);
+      for (final url in urls) {
-          history.insert(0, url);
+        history.remove(url);
-          if (history.length > 64) history.removeLast();
+        history.insert(0, url);
-        }
+        if (history.length > 64) history.removeLast();
-      });
+      }
+      config.extra.createHistory = history;
+      await api.putConfig(config);
       return const RpcUnit();
     })
     ..bind(StorageMethods.removeCreateHistory, (url) async {
-      await configStore.updateHistory((history) => history.remove(url));
+      final config = await api.getConfig();
+      final history = List<String>.of(config.extra.createHistory)..remove(url);
+      config.extra.createHistory = history;
+      await api.putConfig(config);
       return const RpcUnit();
     })
     ..bind(StorageMethods.clearCreateHistory, (_) async {
-      await configStore.updateHistory((history) => history.clear());
+      final config = await api.getConfig();
+      config.extra.createHistory = const [];
+      await api.putConfig(config);
       return const RpcUnit();
     });
 }

ui/flutter/lib/core/capabilities/gopeed_capability.dart

@@ -17,7 +17,7 @@ abstract final class GopeedMethods {
   static const getMirrorCandidates = RpcMethod<Map<String, dynamic>, List<String>>('gopeed.mirrors.candidates');
   static const resolve = RpcMethod<ResolveTask, ResolveResult>('gopeed.resolve');
   static const createTask = RpcMethod<CreateTask, String>('gopeed.task.create');
-  static const createTaskBatch = RpcMethod<CreateTaskBatch, CreateTaskBatchResult>('gopeed.task.createBatch');
+  static const createTaskBatch = RpcMethod<CreateTaskBatch, List<String>>('gopeed.task.createBatch');
   static const patchTask = RpcMethod<Map<String, dynamic>, RpcUnit>('gopeed.task.patch');
   static const getTasks = RpcMethod<List<String>, List<Task>>('gopeed.task.list');
   static const getTaskStatus = RpcMethod<String, TaskRuntimeStatus>('gopeed.task.status');
@@ -53,7 +53,7 @@ class GopeedService {
 
   Future<String> createTask(CreateTask request) => _invoker.invoke(GopeedMethods.createTask, request);
 
-  Future<CreateTaskBatchResult> createTaskBatch(CreateTaskBatch request) =>
+  Future<List<String>> createTaskBatch(CreateTaskBatch request) =>
       _invoker.invoke(GopeedMethods.createTaskBatch, request);
 
   Future<void> patchTask(String id, PatchTask request) async {

ui/flutter/lib/core/window/app_window_bootstrap.dart

@@ -4,7 +4,6 @@ import 'package:flutter/widgets.dart';
 import 'package:window_manager/window_manager.dart';
 
 import '../../l10n/l10n.dart';
-import '../../shared/theme/app_design_tokens.dart';
 import 'app_window_chrome.dart';
 import 'app_window_payload.dart';
 
@@ -47,7 +46,7 @@ class AppWindowBootstrap {
 
     final options = switch (type) {
       AppWindowType.createTask => WindowOptions(
-        size: AppDesignTokens.childWindowSize,
+        size: Size(820, 620),
         center: true,
         skipTaskbar: false,
         backgroundColor: Colors.transparent,

ui/flutter/lib/core/window/app_window_frame.dart

@@ -1,9 +1,7 @@
-import 'package:flutter/foundation.dart' show TargetPlatform, defaultTargetPlatform;
 import 'package:flutter/material.dart' show Colors;
 import 'package:flutter/widgets.dart';
 import 'package:window_manager/window_manager.dart';
 
-import '../../shared/theme/app_palette.dart';
 import '../../shared/widgets/window/desktop_window_header.dart';
 import 'app_window_chrome.dart';
 
@@ -18,15 +16,6 @@ class AppWindowFrame extends StatelessWidget {
   Widget build(BuildContext context) {
     Widget framedChild = child;
 
-    // System insets apply to mobile devices at every responsive breakpoint.
-    // SafeArea also consumes the padding so page-level SafeAreas do not add it twice.
-    if (defaultTargetPlatform == TargetPlatform.android || defaultTargetPlatform == TargetPlatform.iOS) {
-      framedChild = ColoredBox(
-        color: AppPalette.of(context).bg,
-        child: SafeArea(child: framedChild),
-      );
-    }
-
     if (AppWindowChrome.usesCustomChrome) {
       framedChild = Stack(
         children: [

ui/flutter/lib/core/window/app_window_launcher.dart

@@ -2,24 +2,22 @@ import 'dart:io';
 
 import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/foundation.dart';
-import 'package:window_manager/window_manager.dart';
 
+import '../../api/model/create_task.dart';
 import '../../util/log_util.dart';
 import '../capabilities/app_capabilities.dart';
 import 'app_window_payload.dart';
 import 'window_capability_transport.dart';
 
 class AppWindowLauncher {
-  static Future<bool> open(AppWindowPayload payload) async {
+  static Future<bool> openCreateTaskWindow({CreateTask? createTask}) async {
-    if (payload.type == AppWindowType.main) {
-      throw ArgumentError.value(payload.type, 'payload.type', 'Expected a child window');
-    }
     if (kIsWeb || !(Platform.isWindows || Platform.isMacOS || Platform.isLinux)) {
       return false;
     }
 
     try {
       await AppWindowCapabilityHost.instance.start(LocalAppCapabilities.instance.registry);
+      final payload = AppWindowPayload.createTask(createTask: createTask?.toJson());
       // Every request deliberately creates a new child window. Create-task
       // windows are independent and are never reused.
       await WindowController.create(WindowConfiguration(arguments: payload.toRaw(), hiddenAtLaunch: true));
@@ -29,16 +27,10 @@ class AppWindowLauncher {
       return true;
     } catch (error, stackTrace) {
       try {
-        logger.w('child window failed', error, stackTrace);
+        logger.w('create task window failed', error, stackTrace);
       } catch (_) {
-        debugPrint('child window failed: $error');
+        debugPrint('create task window failed: $error');
       }
-      // A tray/deep-link request can arrive while the main window is hidden.
-      // Bring the in-app fallback into view if the child engine cannot start.
-      try {
-        await windowManager.show();
-        await windowManager.focus();
-      } catch (_) {}
       return false;
     }
   }

ui/flutter/lib/core/window/window_capability_transport.dart

@@ -52,7 +52,6 @@ class AppWindowCapabilityHost {
   CapabilityRegistry? _registry;
   AppWindowAppearance _appearance = const AppWindowAppearance.defaults();
   final Map<String, WindowController> _subscribers = {};
-  StreamSubscription<void>? _windowsChanged;
 
   bool get started => _registry != null;
 
@@ -60,33 +59,14 @@ class AppWindowCapabilityHost {
     if (_registry != null) return;
     _registry = registry;
     await _hostChannel.setMethodCallHandler(_handleCall);
-    _windowsChanged = onWindowsChanged.listen((_) => unawaited(_removeClosedSubscribers()));
   }
 
   Future<void> stop() async {
     _registry = null;
-    await _windowsChanged?.cancel();
-    _windowsChanged = null;
     _subscribers.clear();
     await _hostChannel.setMethodCallHandler(null);
   }
 
-  Future<void> _removeClosedSubscribers() async {
-    // Engine shutdown does not run Widget.dispose, so a closed child cannot
-    // always send window.unsubscribe itself.
-    final registry = _registry;
-    final candidates = _subscribers.keys.toSet();
-    if (registry == null || candidates.isEmpty) return;
-    try {
-      final windows = await WindowController.getAll();
-      if (!identical(registry, _registry)) return;
-      final openIds = windows.map((window) => window.windowId).toSet();
-      _subscribers.removeWhere((id, _) => candidates.contains(id) && !openIds.contains(id));
-    } catch (_) {
-      // The native window registry can already be gone during app shutdown.
-    }
-  }
-
   void updateAppearance(AppWindowAppearance appearance) {
     if (_appearance == appearance) return;
     _appearance = appearance;

ui/flutter/lib/features/home/presentation/pages/home_page.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:flutter/foundation.dart' show TargetPlatform, defaultTargetPlatform;
 import 'package:flutter/material.dart' show Colors, Icons;
 import 'package:flutter/widgets.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -11,7 +10,7 @@ import '../../../../app/application/app_runtime_controller.dart';
 import '../../../../core/capabilities/app_capabilities.dart';
 import '../../../../core/utils/breakpoints.dart';
 import '../../../../core/utils/file_explorer.dart';
-import '../../../../app/router/app_router.dart';
+import '../../../../core/window/app_window_launcher.dart';
 import '../../../../core/window/app_window_chrome.dart';
 import '../../../../shared/theme/app_design_tokens.dart';
 import '../../../../shared/theme/app_palette.dart';
@@ -49,10 +48,10 @@ class _BatchActionAvailability {
 _BatchActionAvailability _batchActionAvailability(Iterable<TaskRecord> tasks, TaskBatchSelectionController selection) {
   var canPause = false;
   var canResume = false;
-  for (final task in tasks.expand((task) => [task, ...task.members])) {
+  for (final task in tasks) {
     if (!selection.contains(task.id)) continue;
-    canPause = canPause || task.canPause;
+    canPause = canPause || task.status == TaskStatus.downloading;
-    canResume = canResume || task.canResume;
+    canResume = canResume || task.status == TaskStatus.paused || task.status == TaskStatus.failed;
     if (canPause && canResume) break;
   }
   return _BatchActionAvailability(canPause: canPause, canResume: canResume);
@@ -70,7 +69,6 @@ class _HomePageState extends ConsumerState<HomePage> {
   _TaskFilter _activeFilter = _TaskFilter.downloading;
   TaskRecord? _selectedTask;
   bool _batchMode = false;
-  final Set<String> _expandedGroupIds = {};
   final TaskBatchSelectionController _batchSelection = TaskBatchSelectionController();
 
   @override
@@ -98,16 +96,11 @@ class _HomePageState extends ConsumerState<HomePage> {
     final tasksState = tasksAsync.value;
     final tasks = tasksState?.tasks ?? const <TaskRecord>[];
     final filteredTasks = _filteredTasks(tasks);
-    final visibleTasks = _visibleTasks(filteredTasks);
-    final memberIds = {
-      for (final task in tasks)
-        for (final member in task.members) member.id,
-    };
     final emptyStateMessage = _searchController.text.trim().isEmpty
         ? context.l10n.emptyTaskList
         : context.l10n.noMatchingTasks;
-    final selectedTask = _latestSelectedTask();
+    final selectedTask = _latestSelectedTask(tasks);
-    final visibleTaskIds = visibleTasks.map((task) => task.id).toList(growable: false);
+    final visibleTaskIds = filteredTasks.map((task) => task.id).toList(growable: false);
     final pendingUpdateTask = ref.watch(pendingUpdateTaskProvider);
     final navigationItems = _taskNavigationItems(tasks);
     final desktopBody = shad.Scaffold(
@@ -165,7 +158,7 @@ class _HomePageState extends ConsumerState<HomePage> {
                                           listenable: _batchSelection,
                                           builder: (context, _) => _TaskBatchRow(
                                             selectedCount: _batchSelection.count,
-                                            totalCount: visibleTasks.length,
+                                            totalCount: filteredTasks.length,
                                             allSelected: _batchSelection.areAllSelected(visibleTaskIds),
                                             someSelected:
                                                 _batchSelection.isNotEmpty &&
@@ -186,19 +179,16 @@ class _HomePageState extends ConsumerState<HomePage> {
                                           )
                                         : ListView.separated(
                                             padding: const EdgeInsets.only(bottom: 16),
-                                            itemCount: visibleTasks.length,
+                                            itemCount: filteredTasks.length,
                                             separatorBuilder: (_, _) => const SizedBox(height: 8),
                                             itemBuilder: (context, index) {
-                                              final task = visibleTasks[index];
+                                              final task = filteredTasks[index];
                                               return TaskBatchSelectionBuilder(
-                                                key: ValueKey(task.id),
                                                 controller: _batchSelection,
                                                 taskId: task.id,
                                                 visibleTaskIds: visibleTaskIds,
                                                 builder: (context, selectedInBatch, allSelected) => TaskCard(
                                                   task: task,
-                                                  nested: memberIds.contains(task.id),
-                                                  expanded: _expandedGroupIds.contains(task.id),
                                                   selected: _selectedTask?.id == task.id,
                                                   batchMode: _batchMode,
                                                   selectedInBatch: selectedInBatch,
@@ -252,8 +242,6 @@ class _HomePageState extends ConsumerState<HomePage> {
       final mobileBody = tasksAsync.when(
         loading: () => _MobileTasksView(
           tasks: const [],
-          memberIds: const {},
-          expandedGroupIds: _expandedGroupIds,
           batchMode: _batchMode,
           batchSelection: _batchSelection,
           loading: true,
@@ -274,9 +262,7 @@ class _HomePageState extends ConsumerState<HomePage> {
         ),
         error: (error, _) => ColoredBox(color: palette.bg, child: const TaskEmptyState()),
         data: (_) => _MobileTasksView(
-          tasks: visibleTasks,
+          tasks: filteredTasks,
-          memberIds: memberIds,
-          expandedGroupIds: _expandedGroupIds,
           emptyStateMessage: emptyStateMessage,
           onCreateTask: _searchController.text.trim().isEmpty ? _handleAddTask : null,
           batchMode: _batchMode,
@@ -345,20 +331,20 @@ class _HomePageState extends ConsumerState<HomePage> {
             _TaskFilter.completed => task.status == TaskStatus.completed,
             _TaskFilter.failed => task.status == TaskStatus.failed,
           };
-          final passesSearch = task.matchesSearch(query);
+          final passesSearch =
+              query.isEmpty || task.name.toLowerCase().contains(query) || task.url.toLowerCase().contains(query);
           return passesFilter && passesSearch;
         })
         .toList(growable: false);
   }
 
-  List<TaskRecord> _visibleTasks(List<TaskRecord> tasks) => [
+  TaskRecord? _latestSelectedTask(List<TaskRecord> tasks) {
-    for (final task in tasks) ...[task, if (_expandedGroupIds.contains(task.id)) ...task.members],
-  ];
-
-  TaskRecord? _latestSelectedTask() {
     final selectedTask = _selectedTask;
     if (selectedTask == null) return null;
-    return ref.read(tasksControllerProvider).value?.findTask(selectedTask.id);
+    for (final task in tasks) {
+      if (task.id == selectedTask.id) return task;
+    }
+    return selectedTask;
   }
 
   List<ResponsiveNavigationItem<_TaskFilter>> _taskNavigationItems(List<TaskRecord> tasks) {
@@ -390,13 +376,7 @@ class _HomePageState extends ConsumerState<HomePage> {
     if (_batchMode) {
       _toggleBatchTask(task.id);
     } else {
-      if (task.isGroup) {
+      _showTaskDetails(task);
-        setState(() {
-          if (!_expandedGroupIds.remove(task.id)) _expandedGroupIds.add(task.id);
-        });
-      } else {
-        _showTaskDetails(task);
-      }
     }
   }
 
@@ -426,8 +406,8 @@ class _HomePageState extends ConsumerState<HomePage> {
   void _toggleBatchTask(String taskId) => _batchSelection.toggle(taskId);
 
   void _toggleSelectAll() {
-    final visibleIds = _visibleTasks(
+    final visibleIds = _filteredTasks(
-      _filteredTasks(ref.read(tasksControllerProvider).value?.tasks ?? const []),
+      ref.read(tasksControllerProvider).value?.tasks ?? const [],
     ).map((task) => task.id).toList(growable: false);
     if (_batchSelection.areAllSelected(visibleIds)) {
       _batchSelection.clear();
@@ -450,20 +430,22 @@ class _HomePageState extends ConsumerState<HomePage> {
 
   void _pauseSelectedTasks() {
     if (_batchMode && _batchSelection.isEmpty) return;
-    final ids = _batchMode ? _selectedTaskIdsFor((task) => task.canPause) : null;
+    final ids = _batchMode ? _selectedTaskIdsFor((task) => task.status == TaskStatus.downloading) : null;
     if (_batchMode && ids!.isEmpty) return;
     unawaited(_runTaskAction(() => ref.read(tasksControllerProvider.notifier).pauseAll(ids)));
   }
 
   void _resumeSelectedTasks() {
     if (_batchMode && _batchSelection.isEmpty) return;
-    final ids = _batchMode ? _selectedTaskIdsFor((task) => task.canResume) : null;
+    final ids = _batchMode
+        ? _selectedTaskIdsFor((task) => task.status == TaskStatus.paused || task.status == TaskStatus.failed)
+        : null;
     if (_batchMode && ids!.isEmpty) return;
     unawaited(_runTaskAction(() => ref.read(tasksControllerProvider.notifier).resumeAll(ids)));
   }
 
   List<String> _selectedTaskIdsFor(bool Function(TaskRecord task) test) {
-    final tasks = ref.read(tasksControllerProvider).value?.allTasks ?? const <TaskRecord>[];
+    final tasks = ref.read(tasksControllerProvider).value?.tasks ?? const <TaskRecord>[];
     return tasks.where((task) => _batchSelection.contains(task.id) && test(task)).map((task) => task.id).toList();
   }
 
@@ -497,8 +479,8 @@ class _HomePageState extends ConsumerState<HomePage> {
   }
 
   List<String> _contextTaskIds(TaskRecord task) {
-    final visibleIds = _visibleTasks(
+    final visibleIds = _filteredTasks(
-      _filteredTasks(ref.read(tasksControllerProvider).value?.tasks ?? const []),
+      ref.read(tasksControllerProvider).value?.tasks ?? const [],
     ).map((item) => item.id).toSet();
     return <String>{..._batchSelection.where(visibleIds.contains), task.id}.toList(growable: false);
   }
@@ -520,28 +502,10 @@ class _HomePageState extends ConsumerState<HomePage> {
     if (ids.isEmpty) return;
     final runtime = ref.read(appRuntimeControllerProvider).value;
     final config = runtime?.downloaderConfig;
-    final selected =
-        ref.read(tasksControllerProvider).value?.allTasks.where((task) => ids.contains(task.id)).toList() ??
-        <TaskRecord>[];
-    final groupedMemberIds = {
-      for (final task in selected)
-        for (final member in task.members) member.id,
-    };
-    ids = ids.where((id) => !groupedMemberIds.contains(id)).toList();
-    selected.removeWhere((task) => groupedMemberIds.contains(task.id));
-    final hasGroups = selected.any((task) => task.isGroup);
     final keepFiles = await showTaskDeleteDialog(
       context,
       taskCount: ids.length,
-      memberCount: !hasGroups
+      keepFiles: config?.extra.lastDeleteTaskKeep ?? false,
-          ? null
-          : selected.fold<int>(0, (total, task) => total + (task.isGroup ? task.members.length : 1)),
-      // A task always downloads at least one file; records whose resource
-      // has no file list (plain single-file downloads) still count as one.
-      fileCount: !hasGroups
-          ? null
-          : selected.fold<int>(0, (total, task) => total + (task.files.isEmpty ? 1 : task.files.length)),
-      keepFiles: config?.extra.lastDeleteTaskKeep ?? true,
     );
     if (keepFiles == null || !mounted) return;
 
@@ -554,11 +518,10 @@ class _HomePageState extends ConsumerState<HomePage> {
       await ref.read(appRuntimeControllerProvider.notifier).reloadConfig();
     });
     if (!mounted) return;
-    _batchSelection.removeAll({...ids, ...groupedMemberIds});
+    _batchSelection.removeAll(ids);
     setState(() {
       _batchMode = false;
-      _expandedGroupIds.removeAll(ids);
+      if (_selectedTask != null && ids.contains(_selectedTask!.id)) {
-      if (_selectedTask != null && (ids.contains(_selectedTask!.id) || groupedMemberIds.contains(_selectedTask!.id))) {
         _selectedTask = null;
       }
     });
@@ -580,7 +543,19 @@ class _HomePageState extends ConsumerState<HomePage> {
     }
   }
 
-  void _handleAddTask() => unawaited(AppRouter.openCreateTask());
+  void _handleAddTask() {
+    if (!Util.isDesktop()) {
+      context.go('/create');
+      return;
+    }
+    unawaited(
+      AppWindowLauncher.openCreateTaskWindow().then((opened) {
+        if (!opened && mounted) {
+          context.go('/create');
+        }
+      }),
+    );
+  }
 
   Future<void> _runTaskAction(Future<void> Function() action) async {
     try {
@@ -594,8 +569,14 @@ class _HomePageState extends ConsumerState<HomePage> {
   Future<void> _updateTaskUrl(String id, String url, {Map<String, String> headers = const {}}) async {
     try {
       await ref.read(tasksControllerProvider.notifier).updateUrl(id, url, headers: headers);
-      if (mounted) {
+      final updatedTasks = ref.read(tasksControllerProvider).value?.tasks ?? const <TaskRecord>[];
-        setState(() => _selectedTask = ref.read(tasksControllerProvider).value?.findTask(id));
+      for (final task in updatedTasks) {
+        if (task.id == id) {
+          if (mounted) {
+            setState(() => _selectedTask = task);
+          }
+          break;
+        }
       }
     } catch (error) {
       if (!mounted) rethrow;
@@ -605,16 +586,6 @@ class _HomePageState extends ConsumerState<HomePage> {
   }
 
   Future<void> _openTask(TaskRecord task) async {
-    final nativeDirectory =
-        !Util.isWeb() &&
-        switch (defaultTargetPlatform) {
-          TargetPlatform.windows || TargetPlatform.macOS || TargetPlatform.linux => true,
-          _ => false,
-        };
-    if (task.isGroup && !nativeDirectory) {
-      await browseTaskFiles(context, task, mobile: MediaQuery.sizeOf(context).width < Breakpoints.mobile);
-      return;
-    }
     final opened = task.isFolder
         ? await FileExplorer.reveal(task.storagePath)
         : await FileExplorer.open(task.storagePath);
@@ -703,8 +674,6 @@ class _TaskBatchRow extends StatelessWidget {
 class _MobileTasksView extends StatelessWidget {
   const _MobileTasksView({
     required this.tasks,
-    required this.memberIds,
-    required this.expandedGroupIds,
     required this.batchMode,
     required this.batchSelection,
     required this.onToggleSelectAll,
@@ -726,8 +695,6 @@ class _MobileTasksView extends StatelessWidget {
   });
 
   final List<TaskRecord> tasks;
-  final Set<String> memberIds;
-  final Set<String> expandedGroupIds;
   final bool batchMode;
   final TaskBatchSelectionController batchSelection;
   final VoidCallback onToggleSelectAll;
@@ -793,14 +760,11 @@ class _MobileTasksView extends StatelessWidget {
                     itemBuilder: (context, index) {
                       final task = tasks[index];
                       return TaskBatchSelectionBuilder(
-                        key: ValueKey(task.id),
                         controller: batchSelection,
                         taskId: task.id,
                         visibleTaskIds: visibleTaskIds,
                         builder: (context, selectedInBatch, allSelected) => TaskCard(
                           task: task,
-                          nested: memberIds.contains(task.id),
-                          expanded: expandedGroupIds.contains(task.id),
                           selected: false,
                           batchMode: batchMode,
                           selectedInBatch: selectedInBatch,

ui/flutter/lib/features/home/presentation/widgets/primary_rail.dart

@@ -1,4 +1,5 @@
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:flutter/material.dart' show Icons;
+import 'package:flutter/widgets.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../../../core/window/app_window_chrome.dart';
@@ -27,21 +28,7 @@ class PrimaryRail extends StatelessWidget {
         children: [
           SizedBox(
             height: AppDesignTokens.contentHeaderHeight,
-            child: Center(
+            child: const Center(child: GopeedAppMark(key: ValueKey('primary-rail-app-mark'))),
-              child: AppTooltip(
-                message: context.l10n.task,
-                child: Semantics(
-                  label: context.l10n.task,
-                  button: true,
-                  child: GhostButton(
-                    key: const ValueKey('primary-rail-home-button'),
-                    density: ButtonDensity.icon,
-                    onPressed: () => context.go('/'),
-                    child: const ExcludeSemantics(child: GopeedAppMark(key: ValueKey('primary-rail-app-mark'))),
-                  ),
-                ),
-              ),
-            ),
           ),
           const SizedBox(height: AppDesignTokens.space8),
           _RailItem(

ui/flutter/lib/features/settings/application/settings_controller.dart

@@ -19,12 +19,6 @@ class SettingsState {
   }
 }
 
-class SettingsSaveResult {
-  const SettingsSaveResult({required this.btRestartRequired});
-
-  final bool btRestartRequired;
-}
-
 class SettingsController extends AsyncNotifier<SettingsState> {
   Future<void> _saveTail = Future<void>.value();
   int _saveRevision = 0;
@@ -42,7 +36,7 @@ class SettingsController extends AsyncNotifier<SettingsState> {
     state = AsyncValue.data(SettingsState(config: config));
   }
 
-  Future<SettingsSaveResult> save(DownloaderConfig config) {
+  Future<void> save(DownloaderConfig config) {
     final snapshot = DownloaderConfig.fromJson(config.toJson());
     final revision = ++_saveRevision;
     state = AsyncValue.data(SettingsState(config: config, saving: true));
@@ -53,21 +47,16 @@ class SettingsController extends AsyncNotifier<SettingsState> {
     return result;
   }
 
-  Future<SettingsSaveResult> _save(DownloaderConfig config, int revision) async {
+  Future<void> _save(DownloaderConfig config, int revision) async {
     try {
       final service = ref.read(gopeedServiceProvider);
       final latest = await service.getConfig();
-      final previousBt = (
-        latest.protocolConfig.bt.listenPort,
-        latest.protocolConfig.bt.disableDht,
-        latest.protocolConfig.bt.disablePex,
-      );
       config.extra
         ..windowState = latest.extra.windowState
         ..bookmarks = latest.extra.bookmarks
         ..createHistory = latest.extra.createHistory
         ..runAsMenubarApp = latest.extra.runAsMenubarApp
-        ..deviceId = latest.extra.deviceId;
+        ..analyticsClientId = latest.extra.analyticsClientId;
       // The backend preserves protocol-owned results and validates the whole PUT.
       await service.putConfig(config);
       final saved = await service.getConfig();
@@ -75,12 +64,6 @@ class SettingsController extends AsyncNotifier<SettingsState> {
         ref.read(appRuntimeControllerProvider.notifier).replaceDownloaderConfig(saved);
         if (revision == _saveRevision) state = AsyncValue.data(SettingsState(config: saved));
       }
-      final savedBt = (
-        saved.protocolConfig.bt.listenPort,
-        saved.protocolConfig.bt.disableDht,
-        saved.protocolConfig.bt.disablePex,
-      );
-      return SettingsSaveResult(btRestartRequired: previousBt != savedBt);
     } finally {
       if (ref.mounted && revision == _saveRevision && state.value?.saving == true) {
         state = AsyncValue.data(state.requireValue.copyWith(saving: false));

ui/flutter/lib/features/settings/presentation/pages/settings_page.dart

@@ -67,7 +67,6 @@ class _SettingsPageState extends ConsumerState<SettingsPage> {
   final _maxRunningController = TextEditingController();
   final _httpUserAgentController = TextEditingController();
   final _httpConnectionsController = TextEditingController();
-  final _ftpConnectionsController = TextEditingController();
   final _hlsConnectionsController = TextEditingController();
   final _hlsMaxRetriesController = TextEditingController();
   final _btListenPortController = TextEditingController();
@@ -102,7 +101,6 @@ class _SettingsPageState extends ConsumerState<SettingsPage> {
     _maxRunningController,
     _httpUserAgentController,
     _httpConnectionsController,
-    _ftpConnectionsController,
     _hlsConnectionsController,
     _hlsMaxRetriesController,
     _btListenPortController,
@@ -585,23 +583,6 @@ class _SettingsPageState extends ConsumerState<SettingsPage> {
                 ],
               ),
             ),
-            _SettingsBlock(
-              key: const ValueKey('settings-ftp-block'),
-              title: 'FTP',
-              child: _SettingsGroup(
-                children: [
-                  SettingsItem(
-                    title: context.l10n.connections,
-                    child: _NumberSettingControl(
-                      fieldKey: const ValueKey('ftp-connections-input'),
-                      controller: _ftpConnectionsController,
-                      min: 1,
-                      max: _ftpMaxConnections,
-                    ),
-                  ),
-                ],
-              ),
-            ),
             _SettingsBlock(
               title: 'BitTorrent',
               child: _SettingsGroup(
@@ -625,6 +606,7 @@ class _SettingsPageState extends ConsumerState<SettingsPage> {
                   ),
                   SettingsItem(
                     title: context.l10n.enableDht,
+                    subtitle: context.l10n.restartRequired,
                     child: shad.Switch(
                       value: !config.protocolConfig.bt.disableDht,
                       onChanged: (value) => _mutateConfig((next) => next.protocolConfig.bt.disableDht = !value),
@@ -632,6 +614,7 @@ class _SettingsPageState extends ConsumerState<SettingsPage> {
                   ),
                   SettingsItem(
                     title: context.l10n.enablePex,
+                    subtitle: context.l10n.restartRequired,
                     child: shad.Switch(
                       value: !config.protocolConfig.bt.disablePex,
                       onChanged: (value) => _mutateConfig((next) => next.protocolConfig.bt.disablePex = !value),
@@ -1027,7 +1010,6 @@ class _SettingsPageState extends ConsumerState<SettingsPage> {
     _maxRunningController.text = _config!.maxRunning.clamp(1, 256).toString();
     _httpUserAgentController.text = _config!.protocolConfig.http.userAgent;
     _httpConnectionsController.text = _config!.protocolConfig.http.connections.clamp(1, 256).toString();
-    _ftpConnectionsController.text = _config!.protocolConfig.ftp.connections.clamp(1, _ftpMaxConnections).toString();
     _hlsConnectionsController.text = _config!.protocolConfig.hls.segmentConnections.clamp(1, 256).toString();
     _hlsMaxRetriesController.text = _config!.protocolConfig.hls.maxRetries.clamp(0, 30).toString();
     _btListenPortController.text = _config!.protocolConfig.bt.listenPort.clamp(0, 65535).toString();
@@ -1131,12 +1113,6 @@ class _SettingsPageState extends ConsumerState<SettingsPage> {
       min: 1,
       max: 256,
     );
-    config.protocolConfig.ftp.connections = _boundedInt(
-      _ftpConnectionsController,
-      fallback: config.protocolConfig.ftp.connections,
-      min: 1,
-      max: _ftpMaxConnections,
-    );
     config.protocolConfig.hls.segmentConnections = _boundedInt(
       _hlsConnectionsController,
       fallback: config.protocolConfig.hls.segmentConnections,
@@ -1202,10 +1178,7 @@ class _SettingsPageState extends ConsumerState<SettingsPage> {
     final snapshot = DownloaderConfig.fromJson(config.toJson());
     _loadedSignature = _signature(snapshot);
     try {
-      final result = await ref.read(settingsControllerProvider.notifier).save(snapshot);
+      await ref.read(settingsControllerProvider.notifier).save(snapshot);
-      if (mounted && result.btRestartRequired) {
-        _toast(context.l10n.restartRequired, type: AppToastType.info);
-      }
       return true;
     } catch (error) {
       if (mounted) _toast(error.toString());
@@ -2272,7 +2245,3 @@ class _ErrorState extends StatelessWidget {
     );
   }
 }
-
-/// The highest number of parallel FTP logins offered, the same limit as on the create task page. FTP servers
-/// usually allow only a few logins per user.
-const _ftpMaxConnections = 32;

ui/flutter/lib/features/tasks/application/pending_download.dart

@@ -1,166 +0,0 @@
-import 'package:path/path.dart' as path;
-
-import '../../../api/model/create_task_batch.dart';
-import '../../../api/model/options.dart';
-import '../../../api/model/request.dart';
-import '../../../api/model/resource.dart';
-import '../../../api/model/resolve_result.dart';
-import '../../../api/model/resolve_task.dart';
-import '../../../core/capabilities/gopeed_capability.dart';
-
-/// IDs identify sources within one preview and are never sent as group IDs.
-class PendingDownload {
-  PendingDownload({required this.id, required this.request, required this.options});
-
-  final String id;
-  final Request request;
-  final Options options;
-  ResolveResult? result;
-  String? resolveError;
-  String? createError;
-  final Set<int> selected = {};
-  bool created = false;
-  bool resolving = false;
-
-  bool get loading => result == null && resolveError == null;
-  bool get isGroup => result != null && result!.id.isEmpty && result!.res.name.trim().isNotEmpty && files.length > 1;
-  bool get isFtp => RegExp(r'^(ftps?|ftpes):', caseSensitive: false).hasMatch(request.url.trim());
-  bool get isBt {
-    if (result?.id.isEmpty == true) return false;
-    final url = request.url.trim().toLowerCase();
-    if (url.startsWith('http:') || url.startsWith('https:') || isFtp) return false;
-    return url.startsWith('magnet:') ||
-        url.startsWith('data:application/x-bittorrent;base64,') ||
-        url.split(RegExp(r'[?#]')).first.endsWith('.torrent');
-  }
-
-  String get name {
-    if (!isBt &&
-        (!isFtp || result?.res.name.trim().isEmpty == true) &&
-        result?.id.isNotEmpty == true &&
-        files.length == 1 &&
-        files.single.name.isNotEmpty) {
-      return files.single.name;
-    }
-    if (result?.res.name.trim().isNotEmpty == true) return result!.res.name;
-    return request.url;
-  }
-
-  List<FileInfo> get files => result?.res.files ?? const [];
-  bool get hasSelection => !created && result != null && selected.isNotEmpty;
-
-  Future<void> resolve(GopeedService service) async {
-    if (result != null || resolving) return;
-    resolving = true;
-    resolveError = null;
-    try {
-      result = await service.resolve(ResolveTask(req: request));
-      selected.addAll(List.generate(files.isEmpty ? 1 : files.length, (index) => index));
-    } catch (error) {
-      resolveError = error.toString();
-    } finally {
-      resolving = false;
-    }
-  }
-
-  List<CreateTaskBatchItem> creationItems() {
-    final indexes = selected.toList()..sort();
-    if (result!.id.isNotEmpty || files.isEmpty) {
-      final opts = Options.fromJson(options.toJson());
-      if (files.isNotEmpty) opts.selectFiles = indexes;
-      if (indexes.length > 1) _omitChecksum(opts);
-      return [
-        CreateTaskBatchItem(
-          rid: result!.id.isEmpty ? null : result!.id,
-          req: result!.id.isEmpty ? request : null,
-          opts: opts,
-        ),
-      ];
-    }
-    final group = isGroup;
-    final resourceName = result!.res.name;
-    final parentSegments = [
-      if (!group && options.path.isNotEmpty) options.path,
-      if (!group && resourceName.trim().isNotEmpty) resourceName,
-    ];
-    final skipAutoCategorize = options.skipAutoCategorize || resourceName.isNotEmpty || files.length > 1;
-    final httpUrl = RegExp(r'^https?:', caseSensitive: false);
-    return indexes.map((index) {
-      final file = files[index];
-      final member = Options.fromJson(options.toJson());
-      member.name = files.length == 1 && options.name.isNotEmpty ? options.name : file.name;
-      final segments = [...parentSegments, if (file.path.isNotEmpty) file.path];
-      member.path = segments.isEmpty ? '' : path.joinAll(segments);
-      // The selected parent directory is persisted separately from members.
-      member.asDefaultPath = false;
-      member.skipAutoCategorize = skipAutoCategorize;
-      final req = file.req ?? request;
-      member.size = httpUrl.hasMatch(req.url) ? file.size : 0;
-      if (RegExp(r'^(ftps?|ftpes):', caseSensitive: false).hasMatch(req.url)) {
-        final extra = OptsExtraFtp.fromJson(Map<String, dynamic>.from(member.extra as Map? ?? const {}));
-        extra.connections = extra.connections.clamp(0, 32);
-        member.extra = extra.toJson();
-      }
-      if (indexes.length > 1) _omitChecksum(member);
-      return CreateTaskBatchItem(req: req, opts: member);
-    }).toList();
-  }
-
-  void _omitChecksum(Options opts) {
-    if (opts.extra is Map) opts.extra = Map<String, dynamic>.from(opts.extra! as Map)..remove('checksum');
-  }
-}
-
-/// A successful response completes the entire batch, including partial success.
-class DownloadSubmission {
-  DownloadSubmission({required this.sources, required this.request});
-
-  final List<PendingDownload> sources;
-  final CreateTaskBatch request;
-
-  Future<void> submit(GopeedService service) async {
-    for (final source in sources) {
-      source.createError = null;
-    }
-    try {
-      await service.createTaskBatch(request);
-      for (final source in sources) {
-        source.created = true;
-      }
-    } catch (error) {
-      for (final source in sources) {
-        source.createError = error.toString();
-      }
-    }
-  }
-}
-
-List<DownloadSubmission> planDownloads(List<PendingDownload> sources) {
-  final groups = <DownloadSubmission>[];
-  final independent = <PendingDownload>[];
-  for (final source in sources.where((source) => source.hasSelection)) {
-    if (source.isGroup) {
-      groups.add(
-        DownloadSubmission(
-          sources: [source],
-          request: CreateTaskBatch(
-            group: true,
-            groupName: source.options.name.isNotEmpty ? source.options.name : source.result!.res.name.trim(),
-            opts: source.options,
-            reqs: source.creationItems(),
-          ),
-        ),
-      );
-    } else {
-      independent.add(source);
-    }
-  }
-  return [
-    ...groups,
-    if (independent.isNotEmpty)
-      DownloadSubmission(
-        sources: independent,
-        request: CreateTaskBatch(reqs: [for (final source in independent) ...source.creationItems()]),
-      ),
-  ];
-}

ui/flutter/lib/features/tasks/application/tasks_controller.dart

@@ -23,10 +23,6 @@ class TasksState {
   final int uploadSpeedBytesPerSecond;
   final Object? lastError;
 
-  Iterable<TaskRecord> get allTasks => tasks.expand((task) => [task, ...task.members]);
-
-  TaskRecord? findTask(String id) => allTasks.where((task) => task.id == id).firstOrNull;
-
   TasksState copyWith({
     List<TaskRecord>? tasks,
     int? downloadSpeedBytesPerSecond,
@@ -126,14 +122,13 @@ class TasksController extends AsyncNotifier<TasksState> {
   Future<TasksState> _fetch() async {
     final tasks = await ref.read(gopeedServiceProvider).getTasks(api_model.Status.values);
     final transferSpeeds = aggregateTaskTransferSpeeds(tasks);
+    tasks.sort((a, b) {
+      if (a.status == api_model.Status.running && b.status != api_model.Status.running) return -1;
+      if (a.status != api_model.Status.running && b.status == api_model.Status.running) return 1;
+      return b.updatedAt.compareTo(a.updatedAt);
+    });
     return TasksState(
-      tasks: taskRecordsFromApi(tasks)
+      tasks: tasks.map(TaskRecord.fromApi).toList(growable: false),
-        ..sort((a, b) {
-          final aRunning = a.status == TaskStatus.downloading && !a.waiting;
-          final bRunning = b.status == TaskStatus.downloading && !b.waiting;
-          if (aRunning != bRunning) return aRunning ? -1 : 1;
-          return (b.updatedAt ?? b.createdAt!).compareTo(a.updatedAt ?? a.createdAt!);
-        }),
       downloadSpeedBytesPerSecond: transferSpeeds.downloadBytesPerSecond,
       uploadSpeedBytesPerSecond: transferSpeeds.uploadBytesPerSecond,
     );

ui/flutter/lib/features/tasks/domain/task_record.dart

@@ -42,10 +42,6 @@ class TaskFileNode {
     required this.sizeBytes,
     this.downloadedBytes,
     this.resourceIndex,
-    this.status,
-    this.taskId,
-    this.accessPath,
-    this.localPath,
   });
 
   final int? resourceIndex;
@@ -53,10 +49,6 @@ class TaskFileNode {
   final String name;
   final int sizeBytes;
   final int? downloadedBytes;
-  final TaskStatus? status;
-  final String? taskId;
-  final String? accessPath;
-  final String? localPath;
 
   double? get progress {
     final downloaded = downloadedBytes;
@@ -76,8 +68,6 @@ class TaskRecord {
     required this.files,
     required this.uploading,
     this.isFolder = false,
-    this.isGroup = false,
-    this.members = const [],
     this.protocol,
     this.requestHeaders = const {},
     this.total,
@@ -94,8 +84,6 @@ class TaskRecord {
     this.totalBytes,
     this.speedBytes,
     this.uploadedBytes,
-    this.uploadSpeedBytes,
-    this.updatedAt,
     this.remainingSeconds,
     this.waiting = false,
   }) : assert(!uploading || uploadSpeed != null);
@@ -120,31 +108,16 @@ class TaskRecord {
   final int? totalBytes;
   final int? speedBytes;
   final int? uploadedBytes;
-  final int? uploadSpeedBytes;
-  final DateTime? updatedAt;
   final int? remainingSeconds;
   final bool waiting;
   final List<TaskFileNode> files;
   final bool uploading;
   final bool isFolder;
-  final bool isGroup;
-  final List<TaskRecord> members;
   final api_task.Protocol? protocol;
   final Map<String, String> requestHeaders;
 
   bool get canUpdateUrl =>
-      !isGroup && protocol == api_task.Protocol.http && (status == TaskStatus.paused || status == TaskStatus.failed);
+      protocol == api_task.Protocol.http && (status == TaskStatus.paused || status == TaskStatus.failed);
-
-  bool get canPause => isGroup ? members.any((task) => task.canPause) : status == TaskStatus.downloading;
-  bool get canResume =>
-      isGroup ? members.any((task) => task.canResume) : status == TaskStatus.paused || status == TaskStatus.failed;
-
-  bool matchesSearch(String query) =>
-      query.isEmpty ||
-      name.toLowerCase().contains(query) ||
-      url.toLowerCase().contains(query) ||
-      files.any((file) => '${file.path}/${file.name}'.toLowerCase().contains(query)) ||
-      members.any((member) => member.matchesSearch(query));
 
   bool get isIndeterminate => status == TaskStatus.downloading && !waiting && total == null;
 
@@ -174,7 +147,6 @@ class TaskRecord {
       remainingSeconds: _remainingSeconds(task, totalBytes, downloadedBytes),
       downloadDuration: task.progress.used > 0 ? Duration(microseconds: (task.progress.used + 999) ~/ 1000) : null,
       createdAt: task.createdAt,
-      updatedAt: task.updatedAt,
       doneAt: task.doneAt,
       waiting: task.status == api_task.Status.wait,
       progress: progress,
@@ -184,7 +156,6 @@ class TaskRecord {
       totalBytes: totalBytes > 0 ? totalBytes : null,
       speedBytes: task.progress.speed,
       uploadedBytes: task.progress.uploaded,
-      uploadSpeedBytes: task.progress.uploadSpeed,
       files: _fileNodes(task.meta.res?.files, task.meta.opts.selectFiles),
       uploading: task.uploading,
       isFolder: task.meta.res?.name.isNotEmpty ?? false,
@@ -194,186 +165,6 @@ class TaskRecord {
   }
 }
 
-List<TaskRecord> taskRecordsFromApi(List<api_task.Task> tasks) {
-  final members = <String, List<TaskRecord>>{};
-  final metadata = <String, api_task.TaskGroup>{};
-  final records = <String, TaskRecord>{};
-  for (final task in tasks) {
-    final record = TaskRecord.fromApi(task);
-    records[task.id] = record;
-    if (task.parentId.isNotEmpty) {
-      members.putIfAbsent(task.parentId, () => []).add(record);
-      if (task.group != null) metadata[task.parentId] = task.group!;
-    }
-  }
-  final emitted = <String>{};
-  return [
-    for (final task in tasks)
-      if (task.parentId.isEmpty || !metadata.containsKey(task.parentId))
-        records[task.id]!
-      else if (emitted.add(task.parentId))
-        _groupRecord(metadata[task.parentId]!, members[task.parentId]!),
-  ];
-}
-
-TaskRecord _groupRecord(api_task.TaskGroup group, List<TaskRecord> members) {
-  final running = members.any((task) => task.status == TaskStatus.downloading && !task.waiting);
-  final failed = members.any((task) => task.status == TaskStatus.failed);
-  final paused = members.isEmpty || members.any((task) => task.status == TaskStatus.paused);
-  final completed = members.isNotEmpty && members.every((task) => task.status == TaskStatus.completed);
-  final status = running
-      ? TaskStatus.downloading
-      : failed
-      ? TaskStatus.failed
-      : paused
-      ? TaskStatus.paused
-      : completed
-      ? TaskStatus.completed
-      : TaskStatus.downloading;
-  final downloaded = members.fold(0, (total, task) => total + (task.downloadedBytes ?? 0));
-  final total = members.every((task) => task.totalBytes != null || task.status == TaskStatus.completed)
-      ? members.fold(0, (total, task) => total + (task.totalBytes ?? 0))
-      : null;
-  final speed = members.fold(
-    0,
-    (total, task) => total + (task.status == TaskStatus.downloading && !task.waiting ? task.speedBytes ?? 0 : 0),
-  );
-  // The backend freezes a finished single task's speed at bytes over active
-  // time (markTaskDone); a finished group reports the same ratio across its
-  // members instead of collapsing to "0 B/s" when the last member completes.
-  final reportedSpeed = speed > 0 ? speed : (completed ? _averageSpeed(members) ?? 0 : 0);
-  final uploadSpeed = members.fold(0, (total, task) => total + (task.uploading ? task.uploadSpeedBytes ?? 0 : 0));
-  final uploading = members.any((task) => task.uploading);
-  final uploaded = members.fold(0, (total, task) => total + (task.uploadedBytes ?? 0));
-  final pathContext = path.Context(
-    style: group.path.contains('\\') || members.any((task) => task.storagePath.contains('\\'))
-        ? path.Style.windows
-        : path.Style.posix,
-  );
-  final root = group.path;
-  final files = <TaskFileNode>[];
-  for (final member in members) {
-    final sourceFiles = member.isFolder
-        ? member.files
-        : [TaskFileNode(path: '', name: member.name, sizeBytes: member.totalBytes ?? 0)];
-    // Folder members do not carry per-file progress from the backend; spread
-    // the member's overall ratio over its files so the tree keeps moving
-    // instead of showing flat zeros.
-    final folderTotal = member.isFolder ? member.files.fold<int>(0, (total, file) => total + file.sizeBytes) : 0;
-    final folderRatio = folderTotal > 0 && member.downloadedBytes != null
-        ? (member.downloadedBytes! / folderTotal).clamp(0.0, 1.0)
-        : null;
-    for (final file in sourceFiles) {
-      final fullPath = member.isFolder
-          ? pathContext.join(member.storagePath, file.path, file.name)
-          : member.storagePath;
-      final relative = pathContext.relative(fullPath, from: root).replaceAll('\\', '/');
-      final String nodePath;
-      final String nodeName;
-      if (pathContext.isAbsolute(relative) || relative == '..' || relative.startsWith('../')) {
-        // Keep unexpected stored paths within the displayed tree.
-        if (member.isFolder) {
-          nodePath = path.posix.join(pathContext.basename(member.storagePath), file.path.replaceAll('\\', '/'));
-          nodeName = file.name;
-        } else {
-          nodePath = '';
-          nodeName = member.name;
-        }
-      } else {
-        nodePath = path.posix.dirname(relative) == '.' ? '' : path.posix.dirname(relative);
-        nodeName = path.posix.basename(relative);
-      }
-      files.add(
-        TaskFileNode(
-          resourceIndex: files.length,
-          path: nodePath,
-          name: nodeName,
-          sizeBytes: file.sizeBytes,
-          downloadedBytes: member.isFolder
-              ? folderRatio != null && file.sizeBytes > 0
-                    ? (file.sizeBytes * folderRatio).round()
-                    : null
-              : member.downloadedBytes,
-          status: member.status,
-          taskId: member.id,
-          localPath: fullPath,
-          accessPath: member.isFolder
-              ? path.posix.join(file.path.replaceAll('\\', '/'), file.name)
-              : pathContext.relative(fullPath, from: pathContext.dirname(member.storagePath)).replaceAll('\\', '/'),
-        ),
-      );
-    }
-  }
-  var updatedAt = group.createdAt;
-  DateTime? doneAt;
-  for (final member in members) {
-    final update = member.updatedAt;
-    if (update != null && update.isAfter(updatedAt)) updatedAt = update;
-    if (completed) {
-      final done = member.doneAt;
-      if (done != null && (doneAt == null || done.isAfter(doneAt))) doneAt = done;
-    }
-  }
-  // The folder card answers "how long did this download take end to end", so
-  // a completed group reports its wall-clock span; single tasks keep their
-  // active-time semantics.
-  final createdAt = group.createdAt;
-  final downloadDuration = doneAt != null && doneAt.isAfter(createdAt) ? doneAt.difference(createdAt) : null;
-  return TaskRecord(
-    id: group.id,
-    name: group.name,
-    status: status,
-    downloaded: _formatBytes(downloaded),
-    total: total == null ? null : _formatBytes(total),
-    downloadedBytes: downloaded,
-    totalBytes: total,
-    speed: TransferRateFormatter.format(reportedSpeed).text,
-    speedBytes: reportedSpeed,
-    uploadSpeed: uploading ? TransferRateFormatter.format(uploadSpeed).text : null,
-    uploadedBytes: uploaded,
-    uploadSpeedBytes: uploadSpeed,
-    uploading: uploading,
-    progress: completed
-        ? 1
-        : total != null && total > 0
-        ? (downloaded / total).clamp(0.0, 1.0)
-        : null,
-    remainingSeconds: total != null && speed > 0 && total > downloaded ? ((total - downloaded) / speed).ceil() : null,
-    waiting: status == TaskStatus.downloading && !running,
-    downloadDuration: downloadDuration,
-    url: '',
-    storagePath: root,
-    files: files,
-    isFolder: true,
-    isGroup: true,
-    members: members,
-    createdAt: group.createdAt,
-    updatedAt: updatedAt,
-    doneAt: doneAt,
-  );
-}
-
-// The combined average rate of a set of members: downloaded bytes over active
-// download time, the same ratio the backend freezes into a finished single
-// task's progress. Members without a measurable duration are skipped because
-// they would inflate the rate.
-int? _averageSpeed(List<TaskRecord> members) {
-  var downloaded = 0;
-  var microseconds = 0;
-  for (final member in members) {
-    final duration = member.downloadDuration;
-    if (duration == null || duration.inMicroseconds <= 0) {
-      continue;
-    }
-    downloaded += member.downloadedBytes ?? 0;
-    microseconds += duration.inMicroseconds;
-  }
-  if (microseconds <= 0) {
-    return null;
-  }
-  return (downloaded * Duration.microsecondsPerSecond / microseconds).round();
-}
-
 Map<String, String> _requestHeaders(Object? extra) {
   if (extra is! Map) return const {};
   final header = extra['header'];
@@ -513,7 +304,7 @@ TaskAssetType _assetType(String name, {required bool isFolder, required api_task
   return switch (protocol) {
     api_task.Protocol.bt => TaskAssetType.torrent,
     api_task.Protocol.ed2k => TaskAssetType.ed2k,
-    api_task.Protocol.hls || api_task.Protocol.http || api_task.Protocol.ftp || null => TaskAssetType.file,
+    api_task.Protocol.hls || api_task.Protocol.http || null => TaskAssetType.file,
   };
 }