fix(resolve): release cancelled previews and preserve task ownership

.github/workflows/build.yml

@@ -13,7 +13,7 @@ on:
         default: "false"
 
 env:
-  GO_VERSION: "1.26.11"
+  GO_VERSION: "1.25.4"
   FLUTTER_VERSION: "3.41.6"
   GA4_MEASUREMENT_ID: ${{ secrets.GA4_MEASUREMENT_ID }}
   GA4_API_SECRET: ${{ secrets.GA4_API_SECRET }}

.github/workflows/release.yml

@@ -17,7 +17,7 @@ on:
       - "Dockerfile"
 
 env:
-  GO_VERSION: "1.26.11"
+  GO_VERSION: "1.25.4"
 
 permissions:
   contents: write

.github/workflows/test.yml

@@ -28,7 +28,7 @@ on:
   workflow_dispatch:
 
 env:
-  GO_VERSION: "1.26.11"
+  GO_VERSION: "1.25.4"
   FLUTTER_VERSION: "3.41.6"
 
 jobs:
@@ -134,9 +134,6 @@ jobs:
         if: runner.os == 'macOS'
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
-      - name: Test Windows FFmpeg memory and stream lifecycle
-        if: runner.os == 'Windows'
-        run: go test -v -count=1 -timeout 180s ./pkg/download/engine/ffmpeg ./pkg/download/engine/inject/stream ./pkg/download/engine
       - name: Install Linux WebView dependencies
         if: runner.os == 'Linux'
         run: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.26.11-alpine3.23 AS go
+FROM golang:1.25.4-alpine3.22 AS go
 WORKDIR /app
 COPY ./go.mod ./go.sum ./
 RUN go mod download

go.mod

@@ -1,12 +1,11 @@
 module github.com/GopeedLab/gopeed
 
-go 1.26.0
+go 1.25.4
 
 require (
 	codeberg.org/gruf/go-ffmpreg v0.6.23-0.20260827095416-df1836cb5be0
 	github.com/GopeedLab/webview_go v0.0.0-20260918010912-0d4c27bb7914
-	github.com/RoaringBitmap/roaring/v2 v2.16.0
+	github.com/anacrolix/torrent v1.60.1-0.20251217073903-486bcbe758e0
-	github.com/anacrolix/torrent v1.62.0
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
 	github.com/bodgit/sevenzip v1.6.1
 	github.com/dop251/goja v0.0.0-20260106131823-651366fbe6e3
@@ -42,13 +41,11 @@ require (
 require (
 	github.com/STARRY-S/zip v0.2.3 // indirect
 	github.com/anacrolix/btree v0.1.1 // indirect
-	github.com/anacrolix/go-utp v0.0.0-20260908033909-9f1664acf866 // indirect
+	github.com/anacrolix/missinggo/v2 v2.10.0 // indirect
-	github.com/anacrolix/missinggo/v2 v2.11.0 // indirect
 	github.com/andybalholm/brotli v1.2.0 // indirect
 	github.com/bodgit/plumbing v1.3.0 // indirect
 	github.com/bodgit/windows v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/coder/websocket v1.8.15 // indirect
 	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	github.com/felixge/fgprof v0.9.5 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
@@ -72,19 +69,20 @@ require (
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
 	golang.org/x/oauth2 v0.35.0 // indirect
-	golang.org/x/sync v0.23.0 // indirect
+	golang.org/x/sync v0.22.0 // indirect
 )
 
 require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2
 	github.com/ProtonMail/go-crypto v1.1.6 // indirect
+	github.com/RoaringBitmap/roaring v1.9.4
 	github.com/alecthomas/atomic v0.1.0-alpha2 // indirect
-	github.com/anacrolix/chansync v0.8.0 // indirect
+	github.com/anacrolix/chansync v0.7.0 // indirect
-	github.com/anacrolix/dht/v2 v2.23.1-0.20260525063928-ec3a9bd99456 // 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/go-libutp v1.5.2-0.20260908013213-836dd42cdde6 // 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
 	github.com/anacrolix/missinggo/perf v1.0.0 // indirect
@@ -93,6 +91,7 @@ require (
 	github.com/anacrolix/stm v0.5.0 // indirect
 	github.com/anacrolix/sync v0.6.0 // indirect
 	github.com/anacrolix/upnp v0.1.4 // indirect
+	github.com/anacrolix/utp v0.2.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/benbjohnson/immutable v0.4.3 // indirect
 	github.com/bits-and-blooms/bitset v1.24.4 // indirect
@@ -109,13 +108,14 @@ require (
 	github.com/go-git/go-billy/v5 v5.9.2 // 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.4 // 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/google/btree v1.1.3 // indirect
 	github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
@@ -153,13 +153,13 @@ require (
 	github.com/tidwall/btree v1.8.1 // indirect
 	github.com/wlynxg/anet v0.0.5 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	go.opentelemetry.io/otel v1.45.0 // indirect
+	go.opentelemetry.io/otel v1.39.0 // indirect
-	go.opentelemetry.io/otel/metric v1.45.0 // indirect
+	go.opentelemetry.io/otel/metric v1.39.0 // indirect
-	go.opentelemetry.io/otel/trace v1.45.0 // indirect
+	go.opentelemetry.io/otel/trace v1.39.0 // indirect
-	golang.org/x/crypto v0.57.0 // indirect
+	golang.org/x/crypto v0.55.0 // indirect
-	golang.org/x/net v0.60.0
+	golang.org/x/net v0.58.0
-	golang.org/x/sys v0.48.0 // indirect
+	golang.org/x/sys v0.47.0 // indirect
-	golang.org/x/text v0.42.0
+	golang.org/x/text v0.41.0
 	golang.org/x/time v0.15.0
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	lukechampine.com/blake3 v1.4.1 // indirect

go.sum

@@ -39,8 +39,8 @@ github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQA
 github.com/RoaringBitmap/roaring v0.4.7/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w=
 github.com/RoaringBitmap/roaring v0.4.17/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrXIr8KVNvRsDi1NI=
 github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=
-github.com/RoaringBitmap/roaring/v2 v2.16.0 h1:Kys1UNf49d5W8Tq3bpuAhIr/Z8/yPB+59CO8A6c/BbE=
+github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ=
-github.com/RoaringBitmap/roaring/v2 v2.16.0/go.mod h1:eq4wdNXxtJIS/oikeCzdX1rBzek7ANzbth041hrU8Q4=
+github.com/RoaringBitmap/roaring v1.9.4/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90=
 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=
@@ -57,10 +57,10 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/anacrolix/btree v0.1.1 h1:igdFPLrt82L6qovzbEGSMkTeiwcU3EFIGl2K8XWocAc=
 github.com/anacrolix/btree v0.1.1/go.mod h1:KHWYRZuUULATjUGJC4dQDXx/BPOnWrJozGR6TndjOmc=
-github.com/anacrolix/chansync v0.8.0 h1:Z/YLVXRDMTy3jFfHKSwzCRVD88ldnFoM4THdWqLjNxM=
+github.com/anacrolix/chansync v0.7.0 h1:wgwxbsJRmOqNjil4INpxHrDp4rlqQhECxR8/WBP4Et0=
-github.com/anacrolix/chansync v0.8.0/go.mod h1:RT3KIkmAanMPsiKC/HTBOrSlgB4TQ8DW8dxgDOnQGsg=
+github.com/anacrolix/chansync v0.7.0/go.mod h1:DZsatdsdXxD0WiwcGl0nJVwyjCKMDv+knl1q2iBjA2k=
-github.com/anacrolix/dht/v2 v2.23.1-0.20260525063928-ec3a9bd99456 h1:5ylkQM8XiZxJw1yhWlV8ICyzl4DNRbEPR4FNlYKpEgs=
+github.com/anacrolix/dht/v2 v2.23.0 h1:EuD17ykTTEkAMPLjBsS5QjGOwuBgLTdQhds6zPAjeVY=
-github.com/anacrolix/dht/v2 v2.23.1-0.20260525063928-ec3a9bd99456/go.mod h1:0IpTSbqYnFcjmexGvnINUGq/kbx93S5cKIryH4oJL8U=
+github.com/anacrolix/dht/v2 v2.23.0/go.mod h1:seXRz6HLw8zEnxlysf9ye2eQbrKUmch6PyOHpe/Nb/U=
 github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c=
 github.com/anacrolix/envpprof v1.0.0/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c=
 github.com/anacrolix/envpprof v1.1.0/go.mod h1:My7T5oSqVfEn4MD4Meczkw/f5lSIndGAKu/0SM/rkf4=
@@ -69,17 +69,18 @@ github.com/anacrolix/envpprof v1.5.0/go.mod h1:OQPV3SNK6uVAlXL4slcZVXv+xLcE0ybWg
 github.com/anacrolix/generics v0.0.0-20230113004304-d6428d516633/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8=
 github.com/anacrolix/generics v0.2.0 h1:gPwGOs14irokFN9kUP1i1A0Bn0FPT7/hWWD3hHKSKNw=
 github.com/anacrolix/generics v0.2.0/go.mod h1:NGehhfeXJPBujPx0s6cstSj8B+TERsTY32Xckfx5ftc=
-github.com/anacrolix/go-libutp v1.5.2-0.20260908013213-836dd42cdde6 h1:eWpL7T6AXAC/Q5ttYsviaWIBEg4eBpB6LH/LCST8pBc=
+github.com/anacrolix/go-libutp v1.3.2 h1:WswiaxTIogchbkzNgGHuHRfbrYLpv4o290mlvcx+++M=
-github.com/anacrolix/go-libutp v1.5.2-0.20260908013213-836dd42cdde6/go.mod h1:qJ59Ax77trj2F6OIydwSHtvMpPZSo/zZPPHosbIJQDk=
+github.com/anacrolix/go-libutp v1.3.2/go.mod h1:fCUiEnXJSe3jsPG554A200Qv+45ZzIIyGEvE56SHmyA=
-github.com/anacrolix/go-utp v0.0.0-20260908033909-9f1664acf866 h1:JMYl7Xp9ZQwUFOzij7Ng+hrhbOymWY2B32p+IeZ8J3M=
-github.com/anacrolix/go-utp v0.0.0-20260908033909-9f1664acf866/go.mod h1:eCVeSbTCNP6qXMaRpjhCeiDd1Ao33c+qQuF+KtFQXzs=
 github.com/anacrolix/log v0.3.0/go.mod h1:lWvLTqzAnCWPJA08T2HCstZi0L1y2Wyvm3FJgwU9jwU=
 github.com/anacrolix/log v0.6.0/go.mod h1:lWvLTqzAnCWPJA08T2HCstZi0L1y2Wyvm3FJgwU9jwU=
+github.com/anacrolix/log v0.13.1/go.mod h1:D4+CvN8SnruK6zIFS/xPoRJmtvtnxs+CSfDQ+BFxZ68=
 github.com/anacrolix/log v0.14.2/go.mod h1:1OmJESOtxQGNMlUO5rcv96Vpp9mfMqXXbe2RdinFLdY=
 github.com/anacrolix/log v0.17.1-0.20251118025802-918f1157b7bb h1:nGNLCQbxFQZz7/9PXLGQ9GmavI/W+eX66pSwVeUwugU=
 github.com/anacrolix/log v0.17.1-0.20251118025802-918f1157b7bb/go.mod h1:YjBZbwe2v3RsU7WdoBlVSPVpfKuOAno9SRQ/8tIl+hk=
+github.com/anacrolix/lsan v0.0.0-20211126052245-807000409a62/go.mod h1:66cFKPCO7Sl4vbFnAaSq7e4OXtdMhRSBagJGWgmpJbM=
 github.com/anacrolix/lsan v0.1.0 h1:TbgB8fdVXgBwrNsJGHtht9+9FepNFu5H7dU8ek6XYAY=
 github.com/anacrolix/lsan v0.1.0/go.mod h1:66cFKPCO7Sl4vbFnAaSq7e4OXtdMhRSBagJGWgmpJbM=
+github.com/anacrolix/missinggo v0.0.0-20180725070939-60ef2fbf63df/go.mod h1:kwGiTUTZ0+p4vAz3VbAI5a30t2YbvemcmspjKwrAz5s=
 github.com/anacrolix/missinggo v1.1.0/go.mod h1:MBJu3Sk/k3ZfGYcS7z18gwfu72Ey/xopPFJJbTi5yIo=
 github.com/anacrolix/missinggo v1.1.2-0.20190815015349-b888af804467/go.mod h1:MBJu3Sk/k3ZfGYcS7z18gwfu72Ey/xopPFJJbTi5yIo=
 github.com/anacrolix/missinggo v1.2.1/go.mod h1:J5cMhif8jPmFoC3+Uvob3OXXNIhOUikzMt+uUjeM21Y=
@@ -89,8 +90,9 @@ github.com/anacrolix/missinggo/perf v1.0.0 h1:7ZOGYziGEBytW49+KmYGTaNfnwUqP1HBsy
 github.com/anacrolix/missinggo/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5urunoLS0Cbvb4V0uMQ=
 github.com/anacrolix/missinggo/v2 v2.2.0/go.mod h1:o0jgJoYOyaoYQ4E2ZMISVa9c88BbUBVQQW4QeRkNCGY=
 github.com/anacrolix/missinggo/v2 v2.5.1/go.mod h1:WEjqh2rmKECd0t1VhQkLGTdIWXO6f6NLjp5GlMZ+6FA=
-github.com/anacrolix/missinggo/v2 v2.11.0 h1:9vYHTNHa5q8tLeDbA6XWFyYeKrxrhfw7GZe9KpS2Wnw=
+github.com/anacrolix/missinggo/v2 v2.10.0 h1:pg0iO4Z/UhP2MAnmGcaMtp5ZP9kyWsusENWN9aolrkY=
-github.com/anacrolix/missinggo/v2 v2.11.0/go.mod h1:gcZICf9xhHZEuLIaxXG1gRg4hpbL7lqgVrq5jsYtQU4=
+github.com/anacrolix/missinggo/v2 v2.10.0/go.mod h1:nCRMW6bRCMOVcw5z9BnSYKF+kDbtenx+hQuphf4bK8Y=
+github.com/anacrolix/mmsg v1.0.1/go.mod h1:x8kRaJY/dCrY9Al0PEcj1mb/uFHwP6GCJ9fLl4thEPc=
 github.com/anacrolix/mmsg v1.1.1 h1:4ce/3I5kM7qSF6T5A8MOmDCfac3UqYlk5Bzh5XsWebM=
 github.com/anacrolix/mmsg v1.1.1/go.mod h1:lPCXEN1eDDQtKktdKEzdw+roswx6wWPpeXAl/WpWVDU=
 github.com/anacrolix/multiless v0.4.0 h1:lqSszHkliMsZd2hsyrDvHOw4AbYWa+ijQ66LzbjqWjM=
@@ -98,15 +100,19 @@ github.com/anacrolix/multiless v0.4.0/go.mod h1:zJv1JF9AqdZiHwxqPgjuOZDGWER6nyE4
 github.com/anacrolix/stm v0.2.0/go.mod h1:zoVQRvSiGjGoTmbM0vSLIiaKjWtNPeTvXUSdJQA4hsg=
 github.com/anacrolix/stm v0.5.0 h1:9df1KBpttF0TzLgDq51Z+TEabZKMythqgx89f1FQJt8=
 github.com/anacrolix/stm v0.5.0/go.mod h1:MOwrSy+jCm8Y7HYfMAwPj7qWVu7XoVvjOiYwJmpeB/M=
+github.com/anacrolix/sync v0.0.0-20180808010631-44578de4e778/go.mod h1:s735Etp3joe/voe2sdaXLcqDdJSay1O0OPnM0ystjqk=
+github.com/anacrolix/sync v0.3.0/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DCOj/I0g=
 github.com/anacrolix/sync v0.6.0 h1:W8jXs9tlj/oHhvLys2Cu8ncDAw6NVjm413t0BHp3LVo=
 github.com/anacrolix/sync v0.6.0/go.mod h1:zigHZiBXkcjo9uNACGCpovT+wNKMbzjO1qN2+eehq8Y=
 github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
 github.com/anacrolix/tagflag v1.0.0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
 github.com/anacrolix/tagflag v1.1.0/go.mod h1:Scxs9CV10NQatSmbyjqmqmeQNwGzlNe0CMUMIxqHIG8=
-github.com/anacrolix/torrent v1.62.0 h1:oWY/q8XdpkJaRd4QkSOaYWUXCmwR3PoLZEo5sneEPuA=
+github.com/anacrolix/torrent v1.60.1-0.20251217073903-486bcbe758e0 h1:lzjUG5O/Vzn4vodFZnrmVny08kMnujjmMLQw0X7cetI=
-github.com/anacrolix/torrent v1.62.0/go.mod h1:gmJQGJUN/XDHLWSKeHTPEH9nAM2E7Mr5cI1NidmdvSU=
+github.com/anacrolix/torrent v1.60.1-0.20251217073903-486bcbe758e0/go.mod h1:yKUKuZSSDdyOsCbuH+rDOpswl/g546gICapdrU7aUmQ=
 github.com/anacrolix/upnp v0.1.4 h1:+2t2KA6QOhm/49zeNyeVwDu1ZYS9dB9wfxyVvh/wk7U=
 github.com/anacrolix/upnp v0.1.4/go.mod h1:Qyhbqo69gwNWvEk1xNTXsS5j7hMHef9hdr984+9fIic=
+github.com/anacrolix/utp v0.2.0 h1:65Cdmr6q9WSw2KsM+rtJFu7rqDzLl2bdysf4KlNPcFI=
+github.com/anacrolix/utp v0.2.0/go.mod h1:HGk4GYQw1O/3T1+yhqT/F6EcBd+AAwlo9dYErNy7mj8=
 github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
 github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
@@ -122,6 +128,7 @@ github.com/benbjohnson/immutable v0.4.3/go.mod h1:qJIKKSmdqz1tVzNtst1DZzvaqOU1on
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/bits-and-blooms/bitset v1.24.4 h1:95H15Og1clikBrKr/DuzMXkQzECs1M6hhoGXLwLQOZE=
 github.com/bits-and-blooms/bitset v1.24.4/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/bodgit/plumbing v1.3.0 h1:pf9Itz1JOQgn7vEOE7v7nlEfBykYqvUYioC61TwWCFU=
@@ -152,8 +159,6 @@ github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38
 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.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
-github.com/coder/websocket v1.8.15 h1:6B2JPeOGlpff2Uz6vOEH1Vzpi0iUz20A+lPVhPHtNUA=
-github.com/coder/websocket v1.8.15/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg=
 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=
@@ -192,6 +197,7 @@ 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=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/frankban/quicktest v1.9.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
 github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
@@ -223,12 +229,12 @@ github.com/go-llsqlite/crawshaw v0.6.0/go.mod h1:/YJdV7uBQaYDE0fwe4z3wwJIZBJxdYz
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-quicktest/qt v1.102.0 h1:HSQxCeh5YZH3EL3W39ixjtyaEhcWSXQHtHnMBzSs474=
+github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
-github.com/go-quicktest/qt v1.102.0/go.mod h1:p4lGIVX+8Wa6ZPNDvqcxq36XpUDLh42FLetFU7odllI=
+github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
 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=
@@ -302,6 +308,8 @@ github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 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=
@@ -311,6 +319,7 @@ github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSo
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
+github.com/huandu/xstrings v1.3.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
 github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
@@ -346,6 +355,8 @@ github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQ
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -480,6 +491,8 @@ github.com/refraction-networking/utls v1.8.2/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V
 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=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
@@ -526,6 +539,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
@@ -565,12 +579,12 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU=
+go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
-go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ=
+go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
-go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M=
+go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
-go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s=
+go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
-go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag=
+go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
-go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc=
+go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
 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=
@@ -586,8 +600,9 @@ 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.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA=
+golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M=
+golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis=
 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=
@@ -619,8 +634,9 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 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.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o=
+golang.org/x/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk=
+golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40=
 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=
@@ -642,9 +658,12 @@ 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.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.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg=
+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.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU=
 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=
@@ -660,8 +679,9 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0=
+golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
+golang.org/x/sync v0.22.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=
@@ -696,14 +716,18 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.1.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.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
+golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
+golang.org/x/sys v0.47.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.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.46.0 h1:3+OXuTbaKDgwk8jTi3aSLHRlmWqHEUDUtxnbFigO4YE=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.46.0/go.mod h1:+K02xbkittuwc0Am4abfA3Fc+XRGXkvBXNO88NCXPoc=
+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.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
 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=
@@ -712,8 +736,10 @@ 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.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E=
+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.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M=
 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=
@@ -745,8 +771,9 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 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.49.0 h1:3NI7VXzL9+1WZD52Dx2ttoPwD5DWrFGpl9mFZDlmisI=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo=
+golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE=
+golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk=
 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=

internal/fetcher/fetcher.go

@@ -46,10 +46,6 @@ type Uploader interface {
 	WaitUpload() error
 }
 
-type DownloadCounter interface {
-	ReceivedBytes() int64
-}
-
 // FetcherMeta defines the meta information of a fetcher.
 type FetcherMeta struct {
 	Req  *base.Request  `json:"req"`

internal/protocol/bt/download_test.go

@@ -290,82 +290,6 @@ func TestBTDownloadSelectedFiles(t *testing.T) {
 	if f.Meta().Res.Size != 48*1024 {
 		t.Fatal("selected resource size is incorrect")
 	}
-	if downloaded := f.Progress().TotalDownloaded(); downloaded != 48*1024 || f.ReceivedBytes() <= downloaded {
-		t.Fatalf("selected progress = %d, received traffic = %d; want 48 KiB of progress and traffic across the shared piece", downloaded, f.ReceivedBytes())
-	}
-}
-
-func TestBTProgressOnlyCountsVerifiedFileBytes(t *testing.T) {
-	const fileSize = 56 * 1024
-	fixture := makeBTFixtureWithPieceSize(t, map[string][]byte{
-		"a.bin": btPayload(fileSize, "verified-a"),
-		"b.bin": btPayload(fileSize, "verified-b"),
-	}, 16*1024, false, true, 64*1024)
-	f := btDownloadFetcher(t, nil)
-	btResolve(t, f, fixture.Magnet)
-	dir := t.TempDir()
-	f.Meta().Opts = &base.Options{Path: dir}
-	btStart(t, f)
-	deadline := time.Now().Add(8 * time.Second)
-	for f.torrent.Files()[0].BytesCompleted() == 0 && time.Now().Before(deadline) {
-		time.Sleep(10 * time.Millisecond)
-	}
-	btPause(t, f)
-	if f.torrent.Files()[0].BytesCompleted() == 0 || f.torrent.Piece(0).State().Complete {
-		t.Fatal("expected some received bytes in a piece that is still incomplete")
-	}
-	if f.ReceivedBytes() == 0 {
-		t.Fatal("received traffic must be visible before a piece is verified")
-	}
-	if progress := f.Progress(); len(progress) != 2 || progress[0] != 0 {
-		t.Errorf("progress before the first file's piece is verified = %v, want zero for the first file", progress)
-	}
-	fixture.Limiter.SetLimit(rate.Inf)
-	btStart(t, f)
-	btAwaitDone(t, f)
-	fixture.AssertFiles(t, dir)
-	progress := f.Progress()
-	if len(progress) != 2 || progress[0] != fileSize || progress[1] != fileSize {
-		t.Fatalf("verified progress at completion = %v, want %d for each file", progress, fileSize)
-	}
-}
-
-func TestBTUploadedBytesSamplesLiveTraffic(t *testing.T) {
-	payload := btPayload(48*1024, "upload-counter")
-	fixture := newBTFixture(t, map[string][]byte{"": payload}, 0)
-	const saved = 1024
-	f := &Fetcher{
-		torrent:       fixture.Torrent,
-		data:          &fetcherData{SeedBytes: saved},
-		seedBaseBytes: saved,
-	}
-	f.torrentReady.Store(true)
-	f.torrentUpload.Store(true)
-
-	cfg := torrent.TestingConfig(t)
-	cfg.DataDir = t.TempDir()
-	cfg.DisableTrackers = true
-	cfg.DisableUTP = true
-	cfg.DisableIPv6 = true
-	peer, err := torrent.NewClient(cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { peer.Close() })
-	download, _, err := peer.AddTorrentSpec(torrent.TorrentSpecFromMetaInfo(fixture.MetaInfo))
-	if err != nil {
-		t.Fatal(err)
-	}
-	download.AddPeers([]torrent.PeerInfo{{Addr: fixture.Seeder.ListenAddrs()[0]}})
-	download.DownloadAll()
-	select {
-	case <-download.Complete().On():
-	case <-time.After(10 * time.Second):
-		t.Fatal("loopback peer did not complete")
-	}
-	if got, want := f.UploadedBytes(), int64(saved+len(payload)); got != want {
-		t.Fatalf("uploaded bytes = %d, want %d including the saved bytes", got, want)
-	}
 }
 
 func TestBTPauseAndResume(t *testing.T) {

internal/protocol/bt/fetcher.go

@@ -10,7 +10,6 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
-	"sort"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -21,7 +20,7 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/bt"
 	"github.com/GopeedLab/gopeed/pkg/util"
-	"github.com/RoaringBitmap/roaring/v2"
+	"github.com/RoaringBitmap/roaring"
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/metainfo"
 	"github.com/anacrolix/torrent/storage"
@@ -46,7 +45,6 @@ type Fetcher struct {
 	torrent *torrent.Torrent
 	meta    *fetcher.FetcherMeta
 	data    *fetcherData
-	seedBaseBytes int64
 
 	torrentReady    atomic.Bool
 	torrentUpload   atomic.Bool
@@ -465,46 +463,14 @@ func (f *Fetcher) Progress() fetcher.Progress {
 	if !f.torrentReady.Load() {
 		return append(fetcher.Progress(nil), f.data.Progress...)
 	}
-	pieceSize := f.torrent.Info().PieceLength
-	var offset int64
-	var verified []verifiedByteRange
-	for _, run := range f.torrent.PieceStateRuns() {
-		end := offset + int64(run.Length)*pieceSize
-		if pieceVerified(run.PieceState) {
-			verified = append(verified, verifiedByteRange{start: offset, end: end})
-		}
-		offset = end
-	}
-	files := f.torrent.Files()
 	for i := range f.data.Progress {
 		selectIndex := f.meta.Opts.SelectFiles[i]
-		file := files[selectIndex]
+		file := f.torrent.Files()[selectIndex]
-		f.data.Progress[i] = verifiedFileBytes(verified, file.Offset(), file.Length())
+		f.data.Progress[i] = file.BytesCompleted()
 	}
 	return append(fetcher.Progress(nil), f.data.Progress...)
 }
 
-type verifiedByteRange struct {
-	start, end int64
-}
-
-func verifiedFileBytes(verified []verifiedByteRange, offset, length int64) int64 {
-	first := sort.Search(len(verified), func(i int) bool { return verified[i].end > offset })
-	fileEnd := offset + length
-	var completed int64
-	for _, run := range verified[first:] {
-		if run.start >= fileEnd {
-			break
-		}
-		completed += min(fileEnd, run.end) - max(offset, run.start)
-	}
-	return completed
-}
-
-func pieceVerified(state torrent.PieceState) bool {
-	return state.Ok && state.Complete && !state.Hashing && !state.QueuedForHash
-}
-
 func (f *Fetcher) Wait() error {
 	f.mu.Lock()
 	var closed <-chan struct{}
@@ -621,7 +587,7 @@ func (f *Fetcher) isDoneLocked() bool {
 		file := f.torrent.Files()[index]
 		for i := file.BeginPieceIndex(); i < file.EndPieceIndex(); i++ {
 			state := f.torrent.Piece(i).State()
-			if !pieceVerified(state) {
+			if !state.Ok || !state.Complete || state.Hashing || state.QueuedForHash {
 				return false
 			}
 		}
@@ -719,13 +685,11 @@ func (f *Fetcher) Upload() (err error) {
 }
 
 func (f *Fetcher) doUpload(fromUpload bool) {
-	f.mu.Lock()
 	if !f.torrentUpload.CompareAndSwap(false, true) {
-		f.mu.Unlock()
 		return
 	}
-	f.seedBaseBytes = f.data.SeedBytes
+	f.mu.Lock()
-	initialTime := f.data.SeedTime
+	initialBytes, initialTime := f.data.SeedBytes, f.data.SeedTime
 	torrentClosed := f.torrent.Closed()
 	f.mu.Unlock()
 	var doneTime int64
@@ -743,7 +707,8 @@ func (f *Fetcher) doUpload(fromUpload bool) {
 				f.mu.Unlock()
 				continue
 			}
-			f.refreshSeedBytesLocked()
+			stats := f.torrentStats()
+			f.data.SeedBytes = initialBytes + stats.BytesWrittenData.Int64()
 			if !fromUpload && !f.isDoneLocked() {
 				f.mu.Unlock()
 				continue
@@ -776,27 +741,9 @@ func (f *Fetcher) torrentStats() torrent.TorrentStats {
 func (f *Fetcher) UploadedBytes() int64 {
 	f.mu.Lock()
 	defer f.mu.Unlock()
-	if f.torrentReady.Load() && f.torrentUpload.Load() {
-		f.refreshSeedBytesLocked()
-	}
 	return f.data.SeedBytes
 }
 
-func (f *Fetcher) refreshSeedBytesLocked() {
-	stats := f.torrentStats()
-	f.data.SeedBytes = max(f.data.SeedBytes, f.seedBaseBytes+stats.BytesWrittenData.Int64())
-}
-
-func (f *Fetcher) ReceivedBytes() int64 {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if !f.torrentReady.Load() {
-		return 0
-	}
-	stats := f.torrentStats()
-	return stats.BytesReadUsefulData.Int64()
-}
-
 func (f *Fetcher) WaitUpload() (err error) {
 	<-f.uploadDoneCh
 	return nil

internal/protocol/bt/fixture_test.go

@@ -46,11 +46,6 @@ func newBTHybridFixture(t testing.TB, payload []byte) *btFixture {
 }
 
 func makeBTFixture(t testing.TB, files map[string][]byte, bytesPerSecond int, v2, private bool) *btFixture {
-	t.Helper()
-	return makeBTFixtureWithPieceSize(t, files, bytesPerSecond, v2, private, 16*1024)
-}
-
-func makeBTFixtureWithPieceSize(t testing.TB, files map[string][]byte, bytesPerSecond int, v2, private bool, pieceSize int64) *btFixture {
 	t.Helper()
 	source := t.TempDir()
 	name := "payload.bin"
@@ -69,7 +64,7 @@ func makeBTFixtureWithPieceSize(t testing.TB, files map[string][]byte, bytesPerS
 		}
 		expected[filepath.Join(name, filepath.FromSlash(path))] = append([]byte(nil), data...)
 	}
-	info := metainfo.Info{PieceLength: pieceSize}
+	info := metainfo.Info{PieceLength: 16 * 1024}
 	if err := info.BuildFromFilePath(root); err != nil {
 		t.Fatal(err)
 	}

internal/protocol/bt/stats_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/GopeedLab/gopeed/internal/fetcher"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	protocolbt "github.com/GopeedLab/gopeed/pkg/protocol/bt"
-	"github.com/RoaringBitmap/roaring/v2"
+	"github.com/RoaringBitmap/roaring"
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/storage"
 )

internal/protocol/http/fetcher.go

@@ -418,6 +418,16 @@ func (f *Fetcher) updateMaxConnTime(d time.Duration) {
 }
 
 func (f *Fetcher) Resolve(req *base.Request) error {
+	return f.ResolveContext(context.Background(), req)
+}
+
+// ResolveContext cancels the initial request while waiting for headers. Once
+// Resolve has returned, the retained response belongs to the fetcher and its
+// existing Pause/Close lifecycle controls the body and prefetch.
+func (f *Fetcher) ResolveContext(ctx context.Context, req *base.Request) error {
+	if err := ctx.Err(); err != nil {
+		return err
+	}
 	if err := base.ParseReqExtra[fhttp.ReqExtra](req); err != nil {
 		return err
 	}
@@ -429,6 +439,8 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 	// 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.
 	reqCtx, reqCancel := context.WithCancel(context.Background())
+	stopCancel := context.AfterFunc(ctx, reqCancel)
+	defer stopCancel()
 	httpReq, err := f.buildRequest(reqCtx, req)
 	if err != nil {
 		reqCancel()

internal/protocol/http/filename_parse_test.go

@@ -125,26 +125,13 @@ func TestUnescapeHTMLEntities(t *testing.T) {
 			in:   "normal.txt",
 			want: "normal.txt",
 		},
-		{
-			name: "escaped ampersand before entity name is decoded once",
-			in:   "a<b.txt",
-			want: "a<b.txt",
-		},
-		{
-			name: "escaped ampersand before quote entity is decoded once",
-			in:   "a"b.txt",
-			want: "a"b.txt",
-		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			// Run repeatedly so that an order-dependent implementation fails reliably.
-			for i := 0; i < 200; i++ {
 			got := unescapeHTMLEntities(tt.in)
 			if got != tt.want {
-					t.Fatalf("unescapeHTMLEntities() = %q, want %q (run %d)", got, tt.want, i)
+				t.Errorf("unescapeHTMLEntities() = %q, want %q", got, tt.want)
-				}
 			}
 		})
 	}

internal/protocol/http/helper.go

@@ -408,21 +408,24 @@ func decodeFilenameParam(filename string) string {
 	return decoded
 }
 
-// htmlEntityReplacer replaces every entity in a single left-to-right pass, so an
-// escaped ampersand such as "<" becomes "<" and is not decoded twice.
-var htmlEntityReplacer = strings.NewReplacer(
-	"&", "&",
-	"&lt;", "<",
-	"&gt;", ">",
-	"&quot;", "\"",
-	"&#39;", "'",
-	"&apos;", "'",
-)
-
 // unescapeHTMLEntities unescapes common HTML entities in filenames
 // This handles cases where servers HTML-encode special characters like & to &amp;
 func unescapeHTMLEntities(s string) string {
-	return htmlEntityReplacer.Replace(s)
+	// Common HTML entities that might appear in filenames
+	replacements := map[string]string{
+		"&amp;":  "&",
+		"&lt;":   "<",
+		"&gt;":   ">",
+		"&quot;": "\"",
+		"&#39;":  "'",
+		"&apos;": "'",
+	}
+
+	result := s
+	for entity, char := range replacements {
+		result = strings.ReplaceAll(result, entity, char)
+	}
+	return result
 }
 
 // tryDecodeGBK attempts to decode string as GBK encoding

internal/webview/integrationtest/contract.go

@@ -25,6 +25,7 @@ const defaultAvailabilityTimeout = time.Minute
 type ContractOptions struct {
 	AvailabilityTimeout time.Duration
 	CookieDomainMode    CookieDomainMode
+	CookieTestURL       string
 }
 
 type CookieDomainMode int
@@ -43,7 +44,7 @@ func RunProviderContract(t *testing.T, provider enginewebview.Provider, opts Con
 	}
 	waitForProviderAvailable(t, provider, timeout)
 
-	page, _, testURL := openTestPage(t, provider, enginewebview.OpenOptions{
+	page, server, testURL := openTestPage(t, provider, enginewebview.OpenOptions{
 		Headless:  true,
 		Title:     "Gopeed WebView Integration",
 		Width:     640,
@@ -154,9 +155,11 @@ func RunProviderContract(t *testing.T, provider enginewebview.Provider, opts Con
 		t.Fatal("expected missing selector wait to time out")
 	}
 
-	// Keep cookie navigation on the same local fixture as the DOM assertions:
+	cookieTestURL := opts.CookieTestURL
-	// this contract must not depend on public DNS, TLS, or site availability.
+	if cookieTestURL == "" {
-	runCookieLifecycleAssertions(t, page, testURL, opts.CookieDomainMode)
+		cookieTestURL = testURL
+	}
+	runCookieLifecycleAssertions(t, page, server, cookieTestURL, opts.CookieDomainMode)
 }
 
 func waitForProviderAvailable(t *testing.T, provider enginewebview.Provider, timeout time.Duration) {
@@ -267,7 +270,7 @@ func openTestPage(t *testing.T, provider enginewebview.Provider, opts enginewebv
 	return page, server, server.URL
 }
 
-func runCookieLifecycleAssertions(t *testing.T, page *enginewebview.PageHandle, testURL string, domainMode CookieDomainMode) {
+func runCookieLifecycleAssertions(t *testing.T, page *enginewebview.PageHandle, _ *httptest.Server, testURL string, domainMode CookieDomainMode) {
 	t.Helper()
 
 	parsedURL, err := url.Parse(testURL)

internal/webview/rpcprovider/provider_integration_test.go

@@ -26,6 +26,7 @@ func TestProviderContract(t *testing.T) {
 	})
 	integrationtest.RunProviderContract(t, provider, integrationtest.ContractOptions{
 		CookieDomainMode: integrationtest.CookieDomainModeRequired,
+		CookieTestURL:    "https://example.com/",
 	})
 }
 

pkg/api/resolve_release_test.go

@@ -0,0 +1,36 @@
+package api
+
+import (
+	"net/http"
+	"path/filepath"
+	"testing"
+
+	"github.com/GopeedLab/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/download"
+	restmodel "github.com/GopeedLab/gopeed/pkg/rest/model"
+)
+
+func TestCancelledTorrentPreviewCanBeResolvedAgain(t *testing.T) {
+	d := download.NewDownloader(&download.DownloaderConfig{StorageDir: t.TempDir(), TempDir: t.TempDir()})
+	if err := d.Setup(); err != nil {
+		t.Fatal(err)
+	}
+	defer d.Close()
+	service, err := NewService(d)
+	if err != nil {
+		t.Fatal(err)
+	}
+	path, err := filepath.Abs("../../internal/protocol/bt/testdata/test.torrent")
+	if err != nil {
+		t.Fatal(err)
+	}
+	req := &restmodel.ResolveTask{Req: &base.Request{URL: path}}
+	first := serviceTestRequest[*download.ResolveResult](t, service, http.MethodPost, "/api/v1/resolve", req)
+	serviceTestRequest[any](t, service, http.MethodDelete, "/api/v1/resolve/"+first.ID, nil)
+	// Release is idempotent, including an old window disposing after Create.
+	serviceTestRequest[any](t, service, http.MethodDelete, "/api/v1/resolve/"+first.ID, nil)
+	second := serviceTestRequest[*download.ResolveResult](t, service, http.MethodPost, "/api/v1/resolve", req)
+	if second.Res.Hash != first.Res.Hash {
+		t.Fatalf("different torrent after release: %v", second)
+	}
+}

pkg/api/service.go

@@ -51,6 +51,7 @@ func NewService(downloader *download.Downloader) (*Service, error) {
 	service.routes = []RouteSpec{
 		newRoute(http.MethodGet, "/api/v1/info", service.info),
 		newRoute(http.MethodPost, "/api/v1/resolve", service.resolve),
+		newRoute(http.MethodDelete, "/api/v1/resolve/{id}", service.releaseResolve),
 		newRoute(http.MethodPost, "/api/v1/tasks", service.createTask),
 		newRoute(http.MethodPost, "/api/v1/tasks/batch", service.createTaskBatch),
 		newRoute(http.MethodPatch, "/api/v1/tasks/{id}", service.patchTask),
@@ -143,13 +144,20 @@ func (s *Service) resolve(ctx *Context) *Response {
 	if response := decodeRequest(ctx.Body, &request); response != nil {
 		return response
 	}
-	result, err := s.Downloader.Resolve(request.Req)
+	result, err := s.Downloader.ResolveWithID(request.ID, request.Req)
 	if err != nil {
 		return newErrorResponse(err.Error())
 	}
 	return newOKResponse(result)
 }
 
+func (s *Service) releaseResolve(ctx *Context) *Response {
+	if err := s.Downloader.ReleaseResolve(ctx.PathParam("id")); err != nil {
+		return newErrorResponse(err.Error())
+	}
+	return newOKResponse(nil)
+}
+
 func (s *Service) createTask(ctx *Context) *Response {
 	var request restmodel.CreateTask
 	if response := decodeRequest(ctx.Body, &request); response != nil {

pkg/download/crash_log_test.go

@@ -1,26 +0,0 @@
-package download
-
-import (
-	"os"
-	"path/filepath"
-	"runtime/debug"
-	"testing"
-)
-
-func TestLogPanicPreservesPreviousCrash(t *testing.T) {
-	dir := t.TempDir()
-	path := filepath.Join(dir, "crash.log")
-	const previous = "previous crash traceback\n"
-	if err := os.WriteFile(path, []byte(previous), 0600); err != nil {
-		t.Fatal(err)
-	}
-	logPanic(dir)
-	t.Cleanup(func() { _ = debug.SetCrashOutput(nil, debug.CrashOptions{}) })
-	data, err := os.ReadFile(path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(data) != previous {
-		t.Fatalf("previous crash was overwritten: %q", data)
-	}
-}

pkg/download/delete_lifecycle_test.go

@@ -1,259 +0,0 @@
-package download
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-type deleteResolveManager struct {
-	*generationTestManager
-	returned chan struct{}
-}
-
-func (m *deleteResolveManager) Build() fetcher.Fetcher {
-	return &deleteResolveFetcher{generationTestFetcher: m.generationTestManager.Build().(*generationTestFetcher), returned: m.returned}
-}
-
-type deleteResolveFetcher struct {
-	*generationTestFetcher
-	returned chan struct{}
-}
-
-func (f *deleteResolveFetcher) Resolve(req *base.Request) error {
-	defer close(f.returned)
-	return f.generationTestFetcher.Resolve(req)
-}
-func waitDeleteTest(t *testing.T, ch <-chan struct{}) {
-	t.Helper()
-	select {
-	case <-ch:
-	case <-time.After(3 * time.Second):
-		t.Fatal("operation did not finish")
-	}
-}
-func TestDeleteDuringResolveCannotRestartOrPersist(t *testing.T) {
-	for _, force := range []bool{false, true} {
-		for _, resolveErr := range []error{nil, errors.New("late resolve error")} {
-			t.Run(fmt.Sprintf("force=%v/error=%v", force, resolveErr != nil), func(t *testing.T) {
-				release := make(chan struct{})
-				var once sync.Once
-				defer once.Do(func() { close(release) })
-				m := &deleteResolveManager{generationTestManager: &generationTestManager{resolveStarted: make(chan struct{}), resolveRelease: release, resolveErr: resolveErr}, returned: make(chan struct{})}
-				d := NewDownloader(&DownloaderConfig{Storage: NewMemStorage(), StorageDir: t.TempDir(), TempDir: t.TempDir(), FetchManagers: []fetcher.FetcherManager{m}})
-				if err := d.Setup(); err != nil {
-					t.Fatal(err)
-				}
-				defer d.Close()
-				id, err := d.CreateDirect(&base.Request{URL: "generation://delete"}, &base.Options{Path: t.TempDir(), Name: "delete.bin"})
-				if err != nil {
-					t.Fatal(err)
-				}
-				waitDeleteTest(t, m.resolveStarted)
-				task := d.GetTask(id)
-				if err := d.Delete(&TaskFilter{IDs: []string{id}}, force); err != nil {
-					t.Fatal(err)
-				}
-				once.Do(func() { close(release) })
-				waitDeleteTest(t, m.returned)
-				task.lock.Lock()
-				task.lock.Unlock()
-				// A stale error callback can run immediately after the startup handler exits.
-				d.doOnError(task, errors.New("late callback"))
-				if got := m.starts.Load(); got != 0 {
-					t.Errorf("deleted task started %d time(s)", got)
-				}
-				if d.GetTask(id) != nil {
-					t.Error("deleted task is still listed")
-				}
-				for _, bucket := range []string{bucketTask, bucketSave, bucketTaskStats} {
-					var value any
-					present, err := d.storage.Get(bucket, id, &value)
-					if err != nil {
-						t.Fatal(err)
-					}
-					if present {
-						t.Errorf("deleted task resurrected in %s", bucket)
-					}
-				}
-			})
-		}
-	}
-}
-
-type blockedTaskStorage struct {
-	Storage
-	entered chan struct{}
-	release chan struct{}
-	blockID string
-	once    sync.Once
-}
-
-func (s *blockedTaskStorage) Put(bucket, key string, value any) error {
-	if bucket == bucketTask && key == s.blockID {
-		s.once.Do(func() { close(s.entered); <-s.release })
-	}
-	return s.Storage.Put(bucket, key, value)
-}
-func TestDeleteSerializesInFlightTaskCheckpoint(t *testing.T) {
-	s := &blockedTaskStorage{Storage: NewMemStorage(), entered: make(chan struct{}), release: make(chan struct{})}
-	d := NewDownloader(&DownloaderConfig{Storage: s, StorageDir: t.TempDir(), TempDir: t.TempDir(), FetchManagers: []fetcher.FetcherManager{&generationTestManager{}}})
-	if err := d.Setup(); err != nil {
-		t.Fatal(err)
-	}
-	defer d.Close()
-	d.cfg.MaxRunning = 0
-	id, err := d.CreateDirect(&base.Request{URL: "generation://checkpoint"}, &base.Options{Path: t.TempDir()})
-	if err != nil {
-		t.Fatal(err)
-	}
-	task := d.GetTask(id)
-	s.blockID = id
-	saved := make(chan struct{})
-	go func() { defer close(saved); _ = d.saveTask(task) }()
-	waitDeleteTest(t, s.entered)
-	deleted := make(chan struct{})
-	go func() { defer close(deleted); _ = d.Delete(&TaskFilter{IDs: []string{id}}, false) }()
-	deadline := time.Now().Add(3 * time.Second)
-	for d.GetTask(id) != nil && time.Now().Before(deadline) {
-		time.Sleep(time.Millisecond)
-	}
-	close(s.release)
-	waitDeleteTest(t, saved)
-	waitDeleteTest(t, deleted)
-	var value any
-	present, err := s.Get(bucketTask, id, &value)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if present {
-		t.Fatal("in-flight checkpoint restored a deleted task")
-	}
-}
-
-func TestDeleteDuringPreparationCannotStartOrPersist(t *testing.T) {
-	s := &blockedTaskStorage{Storage: NewMemStorage(), entered: make(chan struct{}), release: make(chan struct{})}
-	m := &generationTestManager{}
-	d := NewDownloader(&DownloaderConfig{Storage: s, StorageDir: t.TempDir(), TempDir: t.TempDir(), FetchManagers: []fetcher.FetcherManager{m}})
-	if err := d.Setup(); err != nil {
-		t.Fatal(err)
-	}
-	defer d.Close()
-	d.cfg.MaxRunning = 0
-	id, err := d.CreateDirect(&base.Request{URL: "generation://preparation"}, &base.Options{Path: t.TempDir()})
-	if err != nil {
-		t.Fatal(err)
-	}
-	task := d.GetTask(id)
-	s.blockID = id
-	d.cfg.MaxRunning = 1
-	if err := d.Continue(&TaskFilter{IDs: []string{id}}); err != nil {
-		t.Fatal(err)
-	}
-	waitDeleteTest(t, s.entered)
-	done := make(chan struct{})
-	go func() { defer close(done); _ = d.Delete(&TaskFilter{IDs: []string{id}}, true) }()
-	deadline := time.Now().Add(2 * time.Second)
-	for d.GetTask(id) != nil && time.Now().Before(deadline) {
-		time.Sleep(time.Millisecond)
-	}
-	close(s.release)
-	waitDeleteTest(t, done)
-	task.lock.Lock()
-	task.lock.Unlock()
-	if m.starts.Load() != 0 {
-		t.Fatal("deleted preparation started downloading")
-	}
-	var saved Task
-	if exists, err := s.Get(bucketTask, id, &saved); err != nil || exists {
-		t.Fatalf("deleted preparation persisted: exists=%v err=%v", exists, err)
-	}
-}
-func TestDeletedTaskRejectsLateSnapshotsAndCompletion(t *testing.T) {
-	d := NewDownloader(&DownloaderConfig{Storage: NewMemStorage(), StorageDir: t.TempDir(), TempDir: t.TempDir(), FetchManagers: []fetcher.FetcherManager{&generationTestManager{}}})
-	if err := d.Setup(); err != nil {
-		t.Fatal(err)
-	}
-	defer d.Close()
-	d.cfg.MaxRunning = 0
-	id, err := d.CreateDirect(&base.Request{URL: "generation://late"}, &base.Options{Path: t.TempDir()})
-	if err != nil {
-		t.Fatal(err)
-	}
-	task := d.GetTask(id)
-	snapshot := task.clone()
-	task.fetcher.(*generationTestFetcher).stats = &fetcher.Stats{Snapshot: map[string]any{"bytes": 1}}
-	if err := d.Delete(&TaskFilter{IDs: []string{id}}, false); err != nil {
-		t.Fatal(err)
-	}
-	if err := d.putTaskRecord(task, snapshot); err != nil {
-		t.Fatal(err)
-	}
-	if err := d.captureTaskStats(task, false, true); err != nil {
-		t.Fatal(err)
-	}
-	if err := d.saveTask(task); err != nil {
-		t.Fatal(err)
-	}
-	if d.markTaskDone(task) {
-		t.Error("deleted task accepted a late completion")
-	}
-	for _, bucket := range []string{bucketTask, bucketSave, bucketTaskStats} {
-		var value any
-		if exists, err := d.storage.Get(bucket, id, &value); err != nil || exists {
-			t.Errorf("late callback restored %s: exists=%v err=%v", bucket, exists, err)
-		}
-	}
-}
-
-type singleFailureTaskDeleteStorage struct {
-	Storage
-	fail atomic.Bool
-}
-
-func (s *singleFailureTaskDeleteStorage) Delete(bucket, key string) error {
-	if bucket == bucketTask && s.fail.Swap(false) {
-		return errors.New("task deletion failed")
-	}
-	return s.Storage.Delete(bucket, key)
-}
-
-func TestFailedDeleteCanBeRetriedWithoutRevivingOldRun(t *testing.T) {
-	s := &singleFailureTaskDeleteStorage{Storage: NewMemStorage()}
-	m := &generationTestManager{holdOpen: true}
-	d := NewDownloader(&DownloaderConfig{Storage: s, StorageDir: t.TempDir(), TempDir: t.TempDir(), FetchManagers: []fetcher.FetcherManager{m}})
-	if err := d.Setup(); err != nil {
-		t.Fatal(err)
-	}
-	defer d.Close()
-	d.cfg.MaxRunning = 0
-	id, err := d.CreateDirect(&base.Request{URL: "generation://failed-delete"}, &base.Options{Path: t.TempDir()})
-	if err != nil {
-		t.Fatal(err)
-	}
-	s.fail.Store(true)
-	if err := d.Delete(&TaskFilter{IDs: []string{id}}, false); err == nil {
-		t.Fatal("expected storage deletion failure")
-	}
-	task := d.GetTask(id)
-	if task == nil || d.taskStatus(task) != base.DownloadStatusWait {
-		t.Fatal("failed deletion did not restore queued task")
-	}
-	d.cfg.MaxRunning = 1
-	if err := d.Continue(&TaskFilter{IDs: []string{id}}); err != nil {
-		t.Fatal(err)
-	}
-	deadline := time.Now().Add(time.Second)
-	for m.starts.Load() < 1 && time.Now().Before(deadline) {
-		time.Sleep(time.Millisecond)
-	}
-	if m.starts.Load() != 1 {
-		t.Fatal("failed deletion could not be retried")
-	}
-}

pkg/download/delete_recovery_test.go

@@ -1,253 +0,0 @@
-package download
-
-import (
-	"errors"
-	"os"
-	"path/filepath"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-func TestFailedDeleteDuringResolveCanContinue(t *testing.T) {
-	release := make(chan struct{})
-	var once sync.Once
-	defer once.Do(func() { close(release) })
-	m := &deleteResolveManager{generationTestManager: &generationTestManager{
-		resolveStarted: make(chan struct{}), resolveRelease: release, holdOpen: true,
-	}, returned: make(chan struct{})}
-	s := &singleFailureTaskDeleteStorage{Storage: NewMemStorage()}
-	d := NewDownloader(&DownloaderConfig{Storage: s, StorageDir: t.TempDir(), TempDir: t.TempDir(), FetchManagers: []fetcher.FetcherManager{m}})
-	if err := d.Setup(); err != nil {
-		t.Fatal(err)
-	}
-	defer d.Close()
-	id, err := d.CreateDirect(&base.Request{URL: "generation://failed-delete-resolve"}, &base.Options{Path: t.TempDir()})
-	if err != nil {
-		t.Fatal(err)
-	}
-	waitDeleteTest(t, m.resolveStarted)
-	task := d.GetTask(id)
-	s.fail.Store(true)
-	if err := d.Delete(&TaskFilter{IDs: []string{id}}, false); err == nil {
-		t.Fatal("expected storage deletion failure")
-	}
-	once.Do(func() { close(release) })
-	waitDeleteTest(t, m.returned)
-	task.lock.Lock()
-	task.lock.Unlock()
-	if m.starts.Load() != 0 {
-		t.Fatal("invalidated startup must not reach Start")
-	}
-	if err := d.Continue(&TaskFilter{IDs: []string{id}}); err != nil {
-		t.Fatalf("failed deletion left task in %s, cannot continue: %v", d.taskStatus(task), err)
-	}
-	deadline := time.Now().Add(3 * time.Second)
-	for m.starts.Load() == 0 && time.Now().Before(deadline) {
-		time.Sleep(time.Millisecond)
-	}
-	if m.starts.Load() != 1 {
-		t.Fatal("continued task did not start exactly once")
-	}
-	task.lock.Lock()
-	task.lock.Unlock()
-}
-
-type deleteRecoveryStorage struct {
-	Storage
-	bucket string
-	fail   atomic.Bool
-}
-
-func (s *deleteRecoveryStorage) Delete(bucket, key string) error {
-	if bucket == s.bucket && s.fail.Swap(false) {
-		return errors.New("injected deletion failure")
-	}
-	return s.Storage.Delete(bucket, key)
-}
-
-// Unlike the generation fixture, this fetcher stops its watcher on Pause and
-// cannot be started again after Close, as with a dropped BT torrent.
-type deleteRecoveryManager struct {
-	generationTestManager
-	failClose atomic.Bool
-	restored  atomic.Int64
-}
-
-func (m *deleteRecoveryManager) Build() fetcher.Fetcher {
-	return m.wrap(m.generationTestManager.Build().(*generationTestFetcher))
-}
-
-func (m *deleteRecoveryManager) wrap(f *generationTestFetcher) *deleteRecoveryFetcher {
-	return &deleteRecoveryFetcher{generationTestFetcher: f, manager: m, waiting: make(chan struct{})}
-}
-
-func (m *deleteRecoveryManager) Store(fetcher.Fetcher) (any, error) {
-	return &recoveryTestData{SeedBytes: 42}, nil
-}
-
-func (m *deleteRecoveryManager) Restore() (any, func(*fetcher.FetcherMeta, any) fetcher.Fetcher) {
-	return &recoveryTestData{}, func(meta *fetcher.FetcherMeta, value any) fetcher.Fetcher {
-		m.restored.Store(value.(*recoveryTestData).SeedBytes)
-		return m.wrap(&generationTestFetcher{manager: &m.generationTestManager, meta: meta})
-	}
-}
-
-type deleteRecoveryFetcher struct {
-	*generationTestFetcher
-	manager     *deleteRecoveryManager
-	closed      atomic.Bool
-	running     atomic.Bool
-	waiting     chan struct{}
-	once        sync.Once
-	waitRelease <-chan struct{}
-	waitSuccess bool
-}
-
-func (f *deleteRecoveryFetcher) Start() error {
-	if f.closed.Load() {
-		return errors.New("cannot restart a closed fetcher")
-	}
-	f.running.Store(true)
-	return f.generationTestFetcher.Start()
-}
-
-func (f *deleteRecoveryFetcher) Pause() error {
-	if f.running.Swap(false) {
-		f.done <- errors.New("paused")
-	}
-	return nil
-}
-
-func (f *deleteRecoveryFetcher) Close() error {
-	f.closed.Store(true)
-	_ = f.Pause()
-	if f.manager.failClose.Swap(false) {
-		return errors.New("close failed after stopping the fetcher")
-	}
-	return nil
-}
-
-func (f *deleteRecoveryFetcher) Wait() error {
-	f.once.Do(func() { close(f.waiting) })
-	err := f.generationTestFetcher.Wait()
-	if f.waitRelease != nil {
-		<-f.waitRelease
-		if f.waitSuccess {
-			return nil
-		}
-	}
-	return err
-}
-
-func TestFailedDeleteRunningTaskCanResumeAndComplete(t *testing.T) {
-	for _, stage := range []string{bucketTask, bucketTaskStats, bucketSave, "close", "files", "late-close", "late-close-error"} {
-		t.Run(stage, func(t *testing.T) {
-			s := &deleteRecoveryStorage{Storage: NewMemStorage(), bucket: stage}
-			lateClose := stage == "late-close" || stage == "late-close-error"
-			if lateClose {
-				s.bucket = bucketSave
-			}
-			m := &deleteRecoveryManager{generationTestManager: generationTestManager{holdOpen: true}}
-			d := NewDownloader(&DownloaderConfig{Storage: s, StorageDir: t.TempDir(), TempDir: t.TempDir(), FetchManagers: []fetcher.FetcherManager{m}})
-			if err := d.Setup(); err != nil {
-				t.Fatal(err)
-			}
-			defer d.Close()
-			id, err := d.CreateDirect(&base.Request{URL: "generation://recover-running"}, &base.Options{Path: t.TempDir()})
-			if err != nil {
-				t.Fatal(err)
-			}
-			task := d.GetTask(id)
-			task.lock.Lock()
-			f := task.fetcher.(*deleteRecoveryFetcher)
-			task.lock.Unlock()
-			waitDeleteTest(t, f.waiting)
-			watcher, _ := d.watchedTasks.Load(id)
-			var release chan struct{}
-			var releaseOnce sync.Once
-			if lateClose {
-				release = make(chan struct{})
-				defer releaseOnce.Do(func() { close(release) })
-				f.waitRelease = release
-				f.waitSuccess = stage == "late-close"
-			}
-			var blockedPath string
-			if stage == "files" {
-				blockedPath = task.Meta.SingleFilepath()
-				if err := os.MkdirAll(blockedPath, 0700); err != nil {
-					t.Fatal(err)
-				}
-				if err := os.WriteFile(filepath.Join(blockedPath, "keep"), []byte("nonempty"), 0600); err != nil {
-					t.Fatal(err)
-				}
-			}
-			s.fail.Store(true)
-			m.failClose.Store(stage == "close")
-			if err := d.Delete(&TaskFilter{IDs: []string{id}}, stage == "files"); err == nil {
-				t.Fatal("expected deletion failure")
-			}
-			if f.running.Load() || d.taskStatus(task) != base.DownloadStatusPause {
-				t.Fatal("failed deletion must restore a paused task and stop transmission")
-			}
-			if !lateClose {
-				waitDeleteTest(t, watcher.(*taskWatcher).done)
-			}
-			var saved Task
-			if exists, err := s.Get(bucketTask, id, &saved); err != nil || !exists || saved.Status != base.DownloadStatusPause {
-				t.Fatalf("failed deletion did not persist paused recovery: exists=%v err=%v status=%s", exists, err, saved.Status)
-			}
-			var checkpoint recoveryTestData
-			exists, err := s.Get(bucketSave, id, &checkpoint)
-			if stage == "files" {
-				if err != nil || exists {
-					t.Fatalf("file cleanup must not leave a checkpoint for removed bytes: exists=%v err=%v", exists, err)
-				}
-			} else if err != nil || !exists || checkpoint.SeedBytes != 42 {
-				t.Fatalf("failed deletion lost checkpoint: exists=%v err=%v checkpoint=%+v", exists, err, checkpoint)
-			}
-			if blockedPath != "" {
-				if err := os.RemoveAll(blockedPath); err != nil {
-					t.Fatal(err)
-				}
-			}
-			if err := d.Continue(&TaskFilter{IDs: []string{id}}); err != nil {
-				t.Fatal(err)
-			}
-			task.lock.Lock()
-			resumed := task.fetcher.(*deleteRecoveryFetcher)
-			task.lock.Unlock()
-			waitDeleteTest(t, resumed.waiting)
-			if stage == bucketSave || stage == "close" || stage == "files" || lateClose {
-				wantSeed := int64(42)
-				if stage == "files" {
-					wantSeed = 0
-				}
-				if resumed == f || m.restored.Load() != wantSeed {
-					t.Fatal("closed fetcher was not rebuilt from the retained checkpoint")
-				}
-			}
-			if lateClose {
-				releaseOnce.Do(func() { close(release) })
-				waitDeleteTest(t, watcher.(*taskWatcher).done)
-				if d.taskStatus(task) != base.DownloadStatusRunning {
-					t.Fatal("old completion changed the replacement run's status")
-				}
-				current, exists := d.watchedTasks.Load(id)
-				if !exists || current.(*taskWatcher).fetcher != resumed {
-					t.Fatal("old completion removed the replacement watcher")
-				}
-			}
-			resumed.running.Store(false)
-			resumed.done <- nil
-			waitForTaskStatus(t, d, id, base.DownloadStatusDone, 3*time.Second)
-			if m.starts.Load() != 2 {
-				t.Fatal("resuming should start one new transfer")
-			}
-		})
-	}
-}

pkg/download/engine/cancellation_test.go

@@ -1,47 +0,0 @@
-package engine
-
-import (
-	"context"
-	"errors"
-	"github.com/dop251/goja"
-	"testing"
-	"time"
-)
-
-func TestCloseUnblocksPendingPromise(t *testing.T) {
-	e := NewEngine(nil)
-	entered := make(chan struct{})
-	_, err := e.runOnLoop(func(r *goja.Runtime) (goja.Value, error) {
-		return goja.Undefined(), r.Set("entered", func() { close(entered) })
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	done := make(chan error, 1)
-	go func() { _, err := e.RunString(`entered(); new Promise(()=>{});`); done <- err }()
-	select {
-	case <-entered:
-	case <-time.After(time.Second):
-		t.Fatal("script did not enter")
-	}
-	e.Close()
-	select {
-	case err := <-done:
-		if err == nil {
-			t.Fatal("closed execution returned success")
-		}
-	case <-time.After(300 * time.Millisecond):
-		t.Fatal("Engine.Close left the Promise waiter blocked")
-	}
-}
-
-func TestExecutionDeadlineInterruptsSynchronousScript(t *testing.T) {
-	e := NewEngine(nil)
-	defer e.Close()
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Millisecond)
-	defer cancel()
-	_, err := e.RunStringContext(ctx, `while (true) {}`)
-	if !errors.Is(err, context.DeadlineExceeded) {
-		t.Fatalf("got %v, want deadline exceeded", err)
-	}
-}

pkg/download/engine/engine.go

@@ -1,7 +1,6 @@
 package engine
 
 import (
-	"context"
 	_ "embed"
 	"errors"
 	"fmt"
@@ -27,7 +26,6 @@ var polyfillScript string
 
 type Engine struct {
 	loop *eventloop.EventLoop
-	done chan struct{}
 
 	closeOnce sync.Once
 	cleanupMu sync.Mutex
@@ -41,13 +39,7 @@ type JSFunction func(goja.FunctionCall) goja.Value
 // RunString executes the script and returns the go type value
 // if script result is promise, it will be resolved
 func (e *Engine) RunString(script string) (value any, err error) {
-	return e.RunStringContext(context.Background(), script)
+	return e.runOnLoop(func(runtime *goja.Runtime) (goja.Value, error) {
-}
-
-// RunStringContext bounds an execution, including awaited promises. Cancelling
-// an execution closes its engine so outstanding operations cannot outlive it.
-func (e *Engine) RunStringContext(ctx context.Context, script string) (any, error) {
-	return e.runOnLoopContext(ctx, func(runtime *goja.Runtime) (goja.Value, error) {
 		return runtime.RunString(script)
 	})
 }
@@ -55,11 +47,7 @@ func (e *Engine) RunStringContext(ctx context.Context, script string) (any, erro
 // CallFunction calls the function and returns the go type value
 // if function result is promise, it will be resolved
 func (e *Engine) CallFunction(fn any, args ...any) (value any, err error) {
-	return e.CallFunctionContext(context.Background(), fn, args...)
+	return e.runOnLoop(func(runtime *goja.Runtime) (goja.Value, error) {
-}
-
-func (e *Engine) CallFunctionContext(ctx context.Context, fn any, args ...any) (value any, err error) {
-	return e.runOnLoopContext(ctx, func(runtime *goja.Runtime) (goja.Value, error) {
 		var jsArgs []goja.Value
 		for _, arg := range args {
 			jsArgs = append(jsArgs, runtime.ToValue(arg))
@@ -81,20 +69,6 @@ func (e *Engine) CallFunctionContext(ctx context.Context, fn any, args ...any) (
 }
 
 func (e *Engine) runOnLoop(fn func(runtime *goja.Runtime) (goja.Value, error)) (any, error) {
-	return e.runOnLoopContext(context.Background(), fn)
-}
-
-var ErrClosed = errors.New("engine closed")
-
-func (e *Engine) runOnLoopContext(ctx context.Context, fn func(runtime *goja.Runtime) (goja.Value, error)) (any, error) {
-	if err := ctx.Err(); err != nil {
-		return nil, err
-	}
-	select {
-	case <-e.done:
-		return nil, ErrClosed
-	default:
-	}
 	type result struct {
 		value any
 		err   error
@@ -158,31 +132,15 @@ func (e *Engine) runOnLoopContext(ctx context.Context, fn func(runtime *goja.Run
 	if !ok {
 		return nil, errors.New("engine loop terminated")
 	}
-	select {
+	res := <-ch
-	case res := <-ch:
+	if res.err != nil {
-		return res.value, res.err
+		return nil, res.err
-	case <-ctx.Done():
-		// Interrupt synchronous JS too; a select alone only stops Promise waiting.
-		e.Close()
-		return nil, ctx.Err()
-	case <-e.done:
-		return nil, ErrClosed
 	}
+	return res.value, nil
 }
 
 func (e *Engine) Close() {
 	e.closeOnce.Do(func() {
-		close(e.done)
-		e.Runtime.Interrupt(ErrClosed)
-		// Wait for interrupted JS to leave the loop, then allow cleanup hooks
-		// to execute their JS cancellation callbacks before terminating it.
-		cleared := make(chan struct{})
-		if e.loop.RunOnLoop(func(runtime *goja.Runtime) {
-			runtime.ClearInterrupt()
-			close(cleared)
-		}) {
-			<-cleared
-		}
 		e.cleanupMu.Lock()
 		cleanups := e.cleanups
 		e.cleanups = nil
@@ -219,7 +177,6 @@ func NewEngine(cfg *Config) *Engine {
 	loop := eventloop.NewEventLoop()
 	engine := &Engine{
 		loop: loop,
-		done: make(chan struct{}),
 	}
 	loop.Start()
 	done := make(chan struct{})

pkg/download/engine/ffmpeg/README.md

@@ -174,12 +174,3 @@ compilation memory, host buffers and JS allocations are additional to the
 linear-memory limit. Playback support depends on the selected codecs, not just
 the `.mp4` suffix. Platform execution and performance must be tested on target
 devices, especially mobile/32-bit devices.
-
-On 64-bit Windows, instance linear memory uses a reserved virtual address range with
-pages committed as it grows. Module completion, errors and cancellation release
-this range directly through `VirtualFree`, rather than waiting for Go's garbage
-collector to reclaim large buffers. Growing an instance preserves its address
-without copying the previous buffer. The 512 MiB limit is unchanged; reservation
-does not commit that entire amount. Shared compilation remains resident after
-the first merge, so process memory is not expected to return exactly to the
-pre-FFmpeg baseline. This does not diagnose unrelated idle memory growth.

pkg/download/engine/ffmpeg/memory.go

@@ -1,32 +0,0 @@
-package ffmpeg
-
-import (
-	"context"
-	"sync"
-
-	"github.com/tetratelabs/wazero/experimental"
-)
-
-// The runtime does not always invoke Free when a module's start function traps.
-// Keep host ownership until execution returns, including failed instantiation.
-func withOwnedMemory(ctx context.Context, allocator experimental.MemoryAllocator) (context.Context, func()) {
-	var memories []*ownedLinearMemory
-	ctx = experimental.WithMemoryAllocator(ctx, experimental.MemoryAllocatorFunc(
-		func(cap, max uint64) experimental.LinearMemory {
-			memory := &ownedLinearMemory{LinearMemory: allocator.Allocate(cap, max)}
-			memories = append(memories, memory)
-			return memory
-		}))
-	return ctx, func() {
-		for _, memory := range memories {
-			memory.Free()
-		}
-	}
-}
-
-type ownedLinearMemory struct {
-	experimental.LinearMemory
-	once sync.Once
-}
-
-func (m *ownedLinearMemory) Free() { m.once.Do(m.LinearMemory.Free) }

pkg/download/engine/ffmpeg/memory_other.go

@@ -1,7 +0,0 @@
-//go:build !windows || (!amd64 && !arm64)
-
-package ffmpeg
-
-import "context"
-
-func withLinearMemory(ctx context.Context) (context.Context, func()) { return ctx, func() {} }

pkg/download/engine/ffmpeg/memory_test.go

@@ -1,88 +0,0 @@
-package ffmpeg
-
-import (
-	"context"
-	"encoding/hex"
-	"testing"
-	"time"
-
-	"github.com/tetratelabs/wazero"
-	"github.com/tetratelabs/wazero/experimental"
-)
-
-// Verify the pinned runtime's allocator lifecycle on every development host:
-// host-owned buffers must not be released before execution ends, or retained
-// after failed instantiation, traps or cancellation.
-func TestLinearMemoryModuleLifecycle(t *testing.T) {
-	testLinearMemoryModuleLifecycle(t, func(_, _ uint64) experimental.LinearMemory {
-		return &testLinearMemory{}
-	})
-}
-
-type testLinearMemory struct{ buffer []byte }
-
-func (m *testLinearMemory) Reallocate(size uint64) []byte {
-	m.buffer = append(m.buffer, make([]byte, int(size)-len(m.buffer))...)
-	return m.buffer
-}
-func (m *testLinearMemory) Free() { m.buffer = nil }
-
-type trackedLinearMemory struct {
-	experimental.LinearMemory
-	freeCount int
-}
-
-func (m *trackedLinearMemory) Free() {
-	m.freeCount++
-	m.LinearMemory.Free()
-}
-
-func testLinearMemoryModuleLifecycle(t *testing.T, allocate experimental.MemoryAllocatorFunc) {
-	t.Helper()
-	for _, tt := range []struct {
-		name string
-		// A module with one memory (min=1/max=2 pages), optionally a start
-		// function that traps or loops until its context is cancelled.
-		wasm    string
-		wantErr bool
-	}{
-		{"close", "0061736d01000000050401010102", false},
-		{"trap", "0061736d01000000010401600000030201000504010101020801000a05010300000b", true},
-		{"cancel", "0061736d01000000010401600000030201000504010101020801000a0901070003400c000b0b", true},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			ctx, cancel := context.WithTimeout(context.Background(), time.Second)
-			defer cancel()
-			var memory *trackedLinearMemory
-			ctx, release := withOwnedMemory(ctx, experimental.MemoryAllocatorFunc(
-				func(_, max uint64) experimental.LinearMemory {
-					memory = &trackedLinearMemory{LinearMemory: allocate(0, max)}
-					return memory
-				}))
-			defer release()
-			rt := wazero.NewRuntimeWithConfig(ctx, wazero.NewRuntimeConfig().WithCloseOnContextDone(true))
-			defer rt.Close(context.Background())
-			binary, err := hex.DecodeString(tt.wasm)
-			if err != nil {
-				t.Fatal(err)
-			}
-			module, err := rt.Instantiate(ctx, binary)
-			if (err != nil) != tt.wantErr {
-				t.Fatalf("instantiate: %v", err)
-			}
-			if !tt.wantErr {
-				if memory == nil || memory.freeCount != 0 {
-					t.Fatal("module did not allocate native memory")
-				}
-				if err := module.Close(ctx); err != nil {
-					t.Fatal(err)
-				}
-			}
-			release()
-			release()
-			if memory == nil || memory.freeCount != 1 {
-				t.Fatal("host did not release memory exactly once")
-			}
-		})
-	}
-}

pkg/download/engine/ffmpeg/memory_windows.go

@@ -1,70 +0,0 @@
-//go:build windows && (amd64 || arm64)
-
-package ffmpeg
-
-import (
-	"context"
-	"fmt"
-	"unsafe"
-
-	"github.com/tetratelabs/wazero/experimental"
-	"golang.org/x/sys/windows"
-)
-
-// Keep large, short-lived WASM buffers out of the Go heap. Closing a module
-// releases its committed pages immediately, without waiting for GC/scavenging.
-func withLinearMemory(ctx context.Context) (context.Context, func()) {
-	return withOwnedMemory(ctx, experimental.MemoryAllocatorFunc(
-		func(_, max uint64) experimental.LinearMemory {
-			return &windowsLinearMemory{max: max}
-		}))
-}
-
-// Reserve the address range once, committing zero-filled pages on demand. This
-// avoids both copying the previous buffer and temporarily retaining two large
-// Go allocations when memory.grow runs. The backing address never changes.
-type windowsLinearMemory struct {
-	address uintptr
-	max     uint64
-	size    uint64
-	freed   bool
-}
-
-func (m *windowsLinearMemory) Reallocate(size uint64) []byte {
-	if m.freed || size > m.max || m.max > uint64(^uint(0)>>1) {
-		return nil
-	}
-	if size == 0 {
-		return []byte{}
-	}
-	if m.address == 0 {
-		address, err := windows.VirtualAlloc(0, uintptr(m.max), windows.MEM_RESERVE, windows.PAGE_READWRITE)
-		if err != nil {
-			panic(fmt.Errorf("ffmpeg: reserve WASM memory: %w", err))
-		}
-		m.address = address
-	}
-	if size > m.size {
-		_, err := windows.VirtualAlloc(m.address, uintptr(size), windows.MEM_COMMIT, windows.PAGE_READWRITE)
-		if err != nil {
-			if m.size == 0 {
-				// Instantiation cannot proceed without the minimum memory. Wazero
-				// has not taken ownership yet, so release the reservation here.
-				m.Free()
-				panic(fmt.Errorf("ffmpeg: commit WASM memory: %w", err))
-			}
-			return nil // memory.grow reports failure to the guest.
-		}
-		m.size = size
-	}
-	return unsafe.Slice((*byte)(unsafe.Pointer(m.address)), int(size))
-}
-
-func (m *windowsLinearMemory) Free() {
-	if m.address != 0 {
-		_ = windows.VirtualFree(m.address, 0, windows.MEM_RELEASE)
-		m.address = 0
-	}
-	m.size = 0
-	m.freed = true
-}

pkg/download/engine/ffmpeg/memory_windows_test.go

@@ -1,54 +0,0 @@
-//go:build windows && (amd64 || arm64)
-
-package ffmpeg
-
-import (
-	"testing"
-	"unsafe"
-
-	"github.com/tetratelabs/wazero/experimental"
-	"golang.org/x/sys/windows"
-)
-
-func TestWindowsLinearMemoryGrowthAndRelease(t *testing.T) {
-	const page = 65536
-	m := &windowsLinearMemory{max: 4 * page}
-	defer m.Free()
-	first := m.Reallocate(page)
-	if len(first) != page {
-		t.Fatalf("initial allocation: %d", len(first))
-	}
-	first[0], first[page-1] = 17, 29
-	address := m.address
-	grown := m.Reallocate(3 * page)
-	if unsafe.SliceData(first) != unsafe.SliceData(grown) || grown[0] != 17 || grown[page-1] != 29 {
-		t.Fatal("growing memory moved or lost existing bytes")
-	}
-	for _, b := range grown[page:] {
-		if b != 0 {
-			t.Fatal("newly committed memory is not zero-filled")
-		}
-	}
-	if m.Reallocate(5*page) != nil || m.address != address || m.size != 3*page {
-		t.Fatal("failed growth changed the existing allocation")
-	}
-	m.Free()
-	m.Free()
-	if m.address != 0 || m.Reallocate(page) != nil {
-		t.Fatal("freed memory can still be used")
-	}
-	var info windows.MemoryBasicInformation
-	if err := windows.VirtualQuery(address, &info, unsafe.Sizeof(info)); err != nil {
-		t.Fatal(err)
-	}
-	const memFree = 0x10000 // MEMORY_BASIC_INFORMATION.State: MEM_FREE.
-	if info.State != memFree {
-		t.Fatalf("pages remain reserved after Free: state=%x", info.State)
-	}
-}
-
-func TestWindowsLinearMemoryModuleLifecycle(t *testing.T) {
-	testLinearMemoryModuleLifecycle(t, func(_, max uint64) experimental.LinearMemory {
-		return &windowsLinearMemory{max: max}
-	})
-}

pkg/download/engine/ffmpeg/runtime.go

@@ -151,9 +151,7 @@ func RunAcquired(ctx context.Context, video, audio Input, out io.Writer, format
 	files := &inputFS{files: map[string]Input{"video": video, "audio": audio}}
 	fsconfig := wazero.NewFSConfig().(sysfs.FSConfig).WithSysFSMount(files, "/inputs")
 	logs := &tailLog{}
-	runCtx, freeMemory := withLinearMemory(ctx)
+	rc, err := wasm.Run(ctx, shared.runtime, shared.module, wasm.Args{
-	defer freeMemory()
-	rc, err := wasm.Run(runCtx, shared.runtime, shared.module, wasm.Args{
 		Name: "ffmpeg", Args: args, Stdout: out, Stderr: logs,
 		Config: func(c wazero.ModuleConfig) wazero.ModuleConfig { return c.WithFSConfig(fsconfig) },
 	})

pkg/download/extension.go

@@ -3,7 +3,6 @@ package download
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"net/url"
@@ -328,8 +327,8 @@ func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource, er
 	return
 }
 
-func (d *Downloader) triggerOnStart(task *Task) error {
+func (d *Downloader) triggerOnStart(task *Task) {
-	return doTrigger(d,
+	doTrigger(d,
 		EventOnStart,
 		task.Meta.Req,
 		&OnStartContext{
@@ -414,13 +413,6 @@ func doTrigger[T any](d *Downloader, event ActivationEvent, req *base.Request, c
 					}
 					engine, session := d.newExtensionEngine()
 					defer session.CloseIfIdle()
-					eventCtx, cancelEvent := context.WithTimeout(d.backgroundCtx, d.cfg.ExtensionEventTimeout)
-					defer cancelEvent()
-					defer func() {
-						if eventCtx.Err() != nil {
-							session.Close()
-						}
-					}()
 					gopeed.Runtime = &InstanceRuntime{
 						WebView: d.newExtensionWebViewRuntime(session, ext.buildIdentity()),
 					}
@@ -429,13 +421,13 @@ func doTrigger[T any](d *Downloader, event ActivationEvent, req *base.Request, c
 						gopeed.Logger.logger.Error().Err(err).Msgf("[%s] engine inject failed", ext.buildIdentity())
 						return
 					}
-					_, err = engine.RunStringContext(eventCtx, string(scriptBuf))
+					_, err = engine.RunString(string(scriptBuf))
 					if err != nil {
 						gopeed.Logger.logger.Error().Err(err).Msgf("[%s] run script failed", ext.buildIdentity())
 						return
 					}
 					if fn, ok := gopeed.Events[event]; ok {
-						_, err = engine.CallFunctionContext(eventCtx, fn, ctx)
+						_, err = engine.CallFunction(fn, ctx)
 						if err != nil {
 							gopeed.Logger.logger.Error().Err(err).Msgf("[%s] call function failed: %s", ext.buildIdentity(), event)
 							return
@@ -445,9 +437,6 @@ func doTrigger[T any](d *Downloader, event ActivationEvent, req *base.Request, c
 						}
 					}
 				}()
-				if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
-					return err
-				}
 			}
 		}
 	}

pkg/download/extension_cancellation_test.go

@@ -1,149 +0,0 @@
-package download
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/GopeedLab/gopeed/pkg/base"
-)
-
-func installCancellationExtension(t *testing.T, d *Downloader, event, script string) {
-	t.Helper()
-	dir := t.TempDir()
-	manifest := fmt.Sprintf(`{"name":"cancel-%s","author":"test","title":"Cancel","version":"1.0.0","scripts":[{"event":%q,"match":{"urls":["*://example.com/*"]},"entry":"index.js"}]}`, event, event)
-	for name, body := range map[string]string{"manifest.json": manifest, "index.js": script} {
-		if err := os.WriteFile(filepath.Join(dir, name), []byte(body), 0600); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if _, err := d.InstallExtensionByFolder(dir, true); err != nil {
-		t.Fatal(err)
-	}
-}
-func newCancellationDownloader(t *testing.T) *Downloader {
-	t.Helper()
-	d := NewDownloader(&DownloaderConfig{Storage: NewMemStorage(), StorageDir: t.TempDir(), TempDir: t.TempDir(), FetchManagers: []fetcher.FetcherManager{&generationTestManager{holdOpen: true}}})
-	if err := d.Setup(); err != nil {
-		t.Fatal(err)
-	}
-	return d
-}
-func TestResolveExtensionStopsOnShutdown(t *testing.T) {
-	entered, release := make(chan struct{}), make(chan struct{})
-	var once sync.Once
-	defer once.Do(func() { close(release) })
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		close(entered)
-		select {
-		case <-release:
-		case <-r.Context().Done():
-		}
-		w.Write([]byte("ok"))
-	}))
-	defer server.Close()
-	d := newCancellationDownloader(t)
-	defer d.Close()
-	installCancellationExtension(t, d, "onResolve", fmt.Sprintf(`gopeed.events.onResolve(async ctx=>{await fetch(%q);});`, server.URL))
-	done := make(chan error, 1)
-	go func() { _, err := d.Resolve(&base.Request{URL: "https://example.com/cancel"}); done <- err }()
-	select {
-	case <-entered:
-	case <-time.After(2 * time.Second):
-		t.Fatal("handler did not enter")
-	}
-	if err := d.Close(); err != nil {
-		t.Fatal(err)
-	}
-	select {
-	case err := <-done:
-		if !errors.Is(err, context.Canceled) {
-			t.Errorf("got %v, want cancellation", err)
-		}
-	case <-time.After(300 * time.Millisecond):
-		once.Do(func() { close(release) })
-		t.Fatal("shutdown did not cancel extension Resolve")
-	}
-}
-func TestOnErrorCancellationReleasesTaskAPIs(t *testing.T) {
-	entered, release := make(chan struct{}), make(chan struct{})
-	var once sync.Once
-	defer once.Do(func() { close(release) })
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		close(entered)
-		select {
-		case <-release:
-		case <-r.Context().Done():
-		}
-		w.Write([]byte("ok"))
-	}))
-	defer server.Close()
-	d := newCancellationDownloader(t)
-	defer d.Close()
-	parent, cancel := context.WithCancel(d.backgroundCtx)
-	d.backgroundCtx = parent
-	defer cancel()
-	installCancellationExtension(t, d, "onError", fmt.Sprintf(`gopeed.events.onError(async ctx=>{await fetch(%q);});`, server.URL))
-	d.cfg.MaxRunning = 0
-	id, err := d.CreateDirect(&base.Request{URL: "generation://example.com/task"}, &base.Options{Path: t.TempDir()})
-	if err != nil {
-		t.Fatal(err)
-	}
-	task := d.GetTask(id)
-	task.statusLock.Lock()
-	task.Status = base.DownloadStatusRunning
-	task.statusLock.Unlock()
-	handled := make(chan struct{})
-	go func() { d.doOnError(task, errors.New("source failed")); close(handled) }()
-	select {
-	case <-entered:
-	case <-time.After(2 * time.Second):
-		t.Fatal("onError did not enter")
-	}
-	status, stats := make(chan struct{}), make(chan struct{})
-	go func() { d.RuntimeStatus(id); close(status) }()
-	go func() { d.Stats(id); close(stats) }()
-	cancel()
-	for name, ch := range map[string]<-chan struct{}{"onError": handled, "RuntimeStatus": status, "Stats": stats} {
-		select {
-		case <-ch:
-		case <-time.After(300 * time.Millisecond):
-			once.Do(func() { close(release) })
-			<-handled
-			t.Fatalf("%s stayed blocked after cancellation", name)
-		}
-	}
-}
-
-func TestExtensionEventDeadlineRejectsUnsettledResolve(t *testing.T) {
-	d := newCancellationDownloader(t)
-	defer d.Close()
-	d.cfg.ExtensionEventTimeout = 30 * time.Millisecond
-	installCancellationExtension(t, d, "onResolve", `gopeed.events.onResolve(async ctx=>{await new Promise(()=>{});});`)
-	_, err := d.Resolve(&base.Request{URL: "https://example.com/timeout"})
-	if !errors.Is(err, context.DeadlineExceeded) {
-		t.Fatalf("got %v, want event deadline exceeded", err)
-	}
-}
-func TestExtensionStartDeadlinePreventsFetcherStart(t *testing.T) {
-	d := newCancellationDownloader(t)
-	defer d.Close()
-	d.cfg.ExtensionEventTimeout = 30 * time.Millisecond
-	installCancellationExtension(t, d, "onStart", `gopeed.events.onStart(async ctx=>{await new Promise(()=>{});});`)
-	id, err := d.CreateDirect(&base.Request{URL: "generation://example.com/timeout"}, &base.Options{Path: t.TempDir()})
-	if err != nil {
-		t.Fatal(err)
-	}
-	waitForTaskStatus(t, d, id, base.DownloadStatusError, 2*time.Second)
-	if starts := d.cfg.FetchManagers[0].(*generationTestManager).starts.Load(); starts != 0 {
-		t.Fatalf("timed out onStart still started fetcher %d times", starts)
-	}
-}

pkg/download/extension_engine_session.go

@@ -59,21 +59,6 @@ func (s *engineSession) Release() {
 	}
 }
 
-// Close releases retained resources when the owning event is cancelled.
-func (s *engineSession) Close() {
-	s.mu.Lock()
-	if s.closed {
-		s.mu.Unlock()
-		return
-	}
-	s.closed = true
-	s.mu.Unlock()
-	s.runClosers()
-	if s.engine != nil {
-		s.engine.Close()
-	}
-}
-
 func (s *engineSession) CloseIfIdle() {
 	s.mu.Lock()
 	shouldClose := s.refs == 0 && !s.closed

pkg/download/model.go

@@ -3,7 +3,6 @@ package download
 import (
 	"encoding/json"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"github.com/GopeedLab/gopeed/internal/controller"
@@ -44,16 +43,6 @@ type CreateTaskBatchResult struct {
 	ParentID string   `json:"parentId,omitempty"`
 }
 
-// taskLifetime is shared with preparation candidates. Its mutex serializes
-// physical starts and persistence with deletion; the tombstone also invalidates
-// work that is currently outside that mutex (for example Resolve).
-type taskLifetime struct {
-	mu      sync.Mutex
-	deleted atomic.Bool
-	// Close can make a fetcher unusable even when a later deletion step fails.
-	restoreFetcher atomic.Bool
-}
-
 // 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)
@@ -98,12 +87,8 @@ type Task struct {
 	blobRefLock    *sync.Mutex
 	blobURL        string
 	runGeneration  uint64
-	lifetime          *taskLifetime
+	speedArr       []int64
-	speedArr          []speedSample
+	uploadSpeedArr []int64
-	uploadSpeedArr    []speedSample
-	downloadSampledAt time.Time
-	uploadSampledAt   time.Time
-	receivedBytes     int64
 }
 
 // TaskRuntimeStatus is the lightweight, frequently refreshed view of a task.
@@ -138,7 +123,6 @@ func NewTask() *Task {
 	}
 	return &Task{
 		ID:        id,
-		lifetime:  &taskLifetime{},
 		Status:    base.DownloadStatusReady,
 		CreatedAt: time.Now(),
 		UpdatedAt: time.Now(),
@@ -211,21 +195,7 @@ func (t *Task) updateUploadSpeed(downloaded int64, usedTime float64) int64 {
 	return calcSpeed(&t.uploadSpeedArr, downloaded, usedTime)
 }
 
-type speedSample struct {
+func calcSpeed(speedArr *[]int64, downloaded int64, usedTime float64) int64 {
-	bytes   int64
-	seconds float64
-}
-
-func sampleSeconds(lastSample *time.Time, now time.Time) float64 {
-	previous := *lastSample
-	*lastSample = now
-	if previous.IsZero() {
-		return 0
-	}
-	return now.Sub(previous).Seconds()
-}
-
-func calcSpeed(speedArr *[]speedSample, downloaded int64, usedTime float64) int64 {
 	if usedTime <= 0 {
 		return 0
 	}
@@ -234,18 +204,18 @@ func calcSpeed(speedArr *[]speedSample, downloaded int64, usedTime float64) int6
 		return 0
 	}
 
-	*speedArr = append(*speedArr, speedSample{bytes: downloaded, seconds: usedTime})
+	*speedArr = append(*speedArr, downloaded)
-	var total int64
+	// Record last 5 seconds of download speed to calculate the average speed
-	var elapsed float64
+	if len(*speedArr) > int(5.0/usedTime) {
-	first := len(*speedArr)
+		*speedArr = (*speedArr)[1:]
-	for first > 0 && elapsed < 5 {
-		first--
-		sample := (*speedArr)[first]
-		total += sample.bytes
-		elapsed += sample.seconds
 	}
-	*speedArr = (*speedArr)[first:]
+
-	return int64(float64(total) / elapsed)
+	var total int64
+	for _, v := range *speedArr {
+		total += v
+	}
+
+	return int64(float64(total) / float64(len(*speedArr)) / usedTime)
 }
 
 type TaskFilter struct {
@@ -262,9 +232,6 @@ type DownloaderConfig struct {
 	Controller    *controller.Controller
 	FetchManagers []fetcher.FetcherManager
 
-	// ExtensionEventTimeout bounds one script load and its awaited event handler.
-	// Zero uses one minute. Embedders may increase it for long-running handlers.
-	ExtensionEventTimeout time.Duration
 	RefreshInterval   int // RefreshInterval time duration to refresh task progress(ms)
 	Storage           Storage
 	StorageDir        string
@@ -293,9 +260,6 @@ func (cfg *DownloaderConfig) Init() *DownloaderConfig {
 			new(ed2k.FetcherManager),
 		}
 	}
-	if cfg.ExtensionEventTimeout <= 0 {
-		cfg.ExtensionEventTimeout = time.Minute
-	}
 	if cfg.RefreshInterval == 0 {
 		cfg.RefreshInterval = 350
 	}

pkg/download/model_test.go

@@ -1,32 +1,9 @@
 package download
 
-import (
+import "testing"
-	"testing"
-	"time"
-)
-
-func TestTransferSpeedWithUnevenSamples(t *testing.T) {
-	var task Task
-	for _, sample := range []struct {
-		bytes   int64
-		seconds float64
-	}{
-		{1000, 1},
-		{2000, 2},
-		{4000, 4},
-		{6000, 6},
-	} {
-		if got := task.updateSpeed(sample.bytes, sample.seconds); got != 1000 {
-			t.Errorf("download speed after %v seconds = %d, want 1000", sample.seconds, got)
-		}
-		if got := task.updateUploadSpeed(sample.bytes, sample.seconds); got != 1000 {
-			t.Errorf("upload speed after %v seconds = %d, want 1000", sample.seconds, got)
-		}
-	}
-}
 
 func TestCalcSpeedResetOnRollback(t *testing.T) {
-	speedArr := []speedSample{{1024, 1}, {2048, 1}, {4096, 1}}
+	speedArr := []int64{1024, 2048, 4096}
 
 	if got := calcSpeed(&speedArr, -512, 1); got != 0 {
 		t.Fatalf("calcSpeed() = %d, want 0 after rollback", got)
@@ -39,17 +16,3 @@ func TestCalcSpeedResetOnRollback(t *testing.T) {
 		t.Fatalf("calcSpeed() = %d, want 1024 after reset", got)
 	}
 }
-
-func TestSampleSecondsUsesThePreviousSuccessfulSample(t *testing.T) {
-	start := time.Now()
-	var last time.Time
-	if got := sampleSeconds(&last, start); got != 0 {
-		t.Fatalf("first sample elapsed = %v, want 0", got)
-	}
-	if got := sampleSeconds(&last, start.Add(1500*time.Millisecond)); got != 1.5 {
-		t.Fatalf("elapsed after a delayed sample = %v, want 1.5", got)
-	}
-	if got := sampleSeconds(&last, start.Add(2*time.Second)); got != 0.5 {
-		t.Fatalf("elapsed after the next sample = %v, want 0.5", got)
-	}
-}

pkg/download/resolve_lifecycle_test.go

@@ -0,0 +1,224 @@
+package download
+
+import (
+	"errors"
+	"fmt"
+	"github.com/GopeedLab/gopeed/internal/fetcher"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/GopeedLab/gopeed/pkg/base"
+)
+
+func TestReleaseResolveCancelsPendingHTTPHeaders(t *testing.T) {
+	entered := make(chan struct{})
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { close(entered); <-r.Context().Done() }))
+	defer server.Close()
+	d := NewDownloader(&DownloaderConfig{Storage: NewMemStorage(), StorageDir: t.TempDir(), TempDir: t.TempDir()})
+	if err := d.Setup(); err != nil {
+		t.Fatal(err)
+	}
+	defer d.Close()
+	done := make(chan error, 1)
+	go func() {
+		_, err := d.ResolveWithID("pending-http", &base.Request{URL: server.URL + "/file"})
+		done <- err
+	}()
+	select {
+	case <-entered:
+	case <-time.After(time.Second):
+		t.Fatal("request did not start")
+	}
+	if err := d.ReleaseResolve("pending-http"); err != nil {
+		t.Fatal(err)
+	}
+	select {
+	case err := <-done:
+		if err == nil {
+			t.Fatal("cancelled Resolve succeeded")
+		}
+	case <-time.After(300 * time.Millisecond):
+		server.CloseClientConnections()
+		t.Fatal("ReleaseResolve did not cancel the request waiting for headers")
+	}
+	if len(d.fetcherCache) != 0 || len(d.resolveStates) != 0 {
+		t.Fatal("cancelled operation retained resources")
+	}
+}
+func TestReleaseResolveAfterCreateDoesNotCloseTask(t *testing.T) {
+	d := NewDownloader(&DownloaderConfig{Storage: NewMemStorage(), StorageDir: t.TempDir(), TempDir: t.TempDir(), FetchManagers: nil})
+	if err := d.Setup(); err != nil {
+		t.Fatal(err)
+	}
+	defer d.Close()
+	d.cfg.MaxRunning = 0
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.Write([]byte("ok")) }))
+	defer server.Close()
+	rr, err := d.Resolve(&base.Request{URL: server.URL})
+	if err != nil {
+		t.Fatal(err)
+	}
+	id, err := d.CreateWithOptions(rr.ID, &base.Options{Path: t.TempDir()})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := d.ReleaseResolve(rr.ID); err != nil {
+		t.Fatal(err)
+	}
+	task := d.GetTask(id)
+	if task == nil {
+		t.Fatal("late release removed task")
+	}
+	if err := d.doStart(task); err != nil {
+		t.Fatal(err)
+	}
+	waitForTaskStatus(t, d, id, base.DownloadStatusDone, 3*time.Second)
+}
+func TestResolveRejectsClosedDownloader(t *testing.T) {
+	d := NewDownloader(&DownloaderConfig{StorageDir: t.TempDir(), TempDir: t.TempDir()})
+	if err := d.Setup(); err != nil {
+		t.Fatal(err)
+	}
+	d.Close()
+	if _, err := d.ResolveWithID("closed", &base.Request{URL: "http://127.0.0.1/"}); err == nil {
+		t.Fatalf("closed downloader accepted Resolve: %v", err)
+	}
+}
+
+func TestReleaseResolveCancelsPendingMagnetMetadata(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.Close()
+	done := make(chan error, 1)
+	go func() {
+		_, err := d.ResolveWithID("pending-magnet", &base.Request{URL: "magnet:?xt=urn:btih:0123456789abcdef0123456789abcdef01234567"})
+		done <- err
+	}()
+	deadline := time.Now().Add(2 * time.Second)
+	for {
+		d.fetcherMapLock.Lock()
+		state := d.resolveStates["pending-magnet"]
+		ready := state != nil && state.fetcher != nil
+		d.fetcherMapLock.Unlock()
+		if ready {
+			break
+		}
+		if time.Now().After(deadline) {
+			t.Fatal("magnet resolve did not start")
+		}
+		time.Sleep(time.Millisecond)
+	}
+	if err := d.ReleaseResolve("pending-magnet"); err != nil {
+		t.Fatal(err)
+	}
+	select {
+	case err := <-done:
+		if err == nil {
+			t.Fatal("cancelled magnet Resolve succeeded")
+		}
+	case <-time.After(time.Second):
+		t.Fatal("cancelled magnet remained in metadata wait")
+	}
+	if len(d.fetcherCache) != 0 || len(d.resolveStates) != 0 {
+		t.Fatal("cancelled magnet retained its resource")
+	}
+}
+func TestCloseDrainsResolvedPreviewCache(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.Write([]byte("ok")) }))
+	defer server.Close()
+	d := NewDownloader(&DownloaderConfig{Storage: NewMemStorage(), StorageDir: t.TempDir(), TempDir: t.TempDir()})
+	if err := d.Setup(); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := d.Resolve(&base.Request{URL: server.URL}); err != nil {
+		t.Fatal(err)
+	}
+	if err := d.Close(); err != nil {
+		t.Fatal(err)
+	}
+	if len(d.fetcherCache) != 0 || len(d.resolveStates) != 0 {
+		t.Fatal("shutdown retained preview resources")
+	}
+}
+
+type cancelledCreationFetcher struct {
+	fetcher.Fetcher
+	entered chan struct{}
+	release chan struct{}
+	err     error
+}
+
+func (f *cancelledCreationFetcher) Patch(*base.Request, *base.Options) error {
+	close(f.entered)
+	<-f.release
+	return f.err
+}
+func TestReleaseResolveDuringCreationTransfersOrClosesOwnership(t *testing.T) {
+	for _, fail := range []bool{false, true} {
+		t.Run(fmt.Sprintf("fail=%v", fail), func(t *testing.T) {
+			d := NewDownloader(&DownloaderConfig{StorageDir: t.TempDir(), TempDir: t.TempDir()})
+			if err := d.Setup(); err != nil {
+				t.Fatal(err)
+			}
+			defer d.Close()
+			d.cfg.MaxRunning = 0
+			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.Write([]byte("ok")) }))
+			defer server.Close()
+			rr, err := d.Resolve(&base.Request{URL: server.URL})
+			if err != nil {
+				t.Fatal(err)
+			}
+			f := &cancelledCreationFetcher{Fetcher: d.fetcherCache[rr.ID], entered: make(chan struct{}), release: make(chan struct{})}
+			if fail {
+				f.err = errors.New("creation failed")
+			}
+			d.fetcherMapLock.Lock()
+			d.fetcherCache[rr.ID] = f
+			d.fetcherMapLock.Unlock()
+			done := make(chan struct{})
+			var id string
+			var createErr error
+			go func() {
+				defer close(done)
+				id, createErr = d.CreateWithOptions(rr.ID, &base.Options{Path: t.TempDir(), Size: 2})
+			}()
+			select {
+			case <-f.entered:
+			case <-time.After(time.Second):
+				t.Fatal("creation did not claim resource")
+			}
+			if err := d.ReleaseResolve(rr.ID); err != nil {
+				t.Fatal(err)
+			}
+			close(f.release)
+			select {
+			case <-done:
+			case <-time.After(time.Second):
+				t.Fatal("creation did not return")
+			}
+			if len(d.fetcherCache) != 0 || len(d.resolveStates) != 0 {
+				t.Fatal("cancelled creation returned ownership to preview cache")
+			}
+			if fail {
+				if createErr == nil {
+					t.Fatal("expected creation failure")
+				}
+				return
+			}
+			if createErr != nil {
+				t.Fatal(createErr)
+			}
+			// The protocol manager persists its concrete Fetcher type.
+			task := d.GetTask(id)
+			task.fetcher = f.Fetcher
+			if err := d.doStart(task); err != nil {
+				t.Fatal(err)
+			}
+			waitForTaskStatus(t, d, id, base.DownloadStatusDone, 3*time.Second)
+		})
+	}
+}

pkg/download/webhook_test.go

@@ -190,14 +190,14 @@ func TestWebhook_NoWebhookConfigured(t *testing.T) {
 }
 
 func TestWebhook_MultipleUrls(t *testing.T) {
-	received := make(chan string, 2)
+	count := 0
 	server1 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		received <- "server1"
+		count++
 		w.WriteHeader(http.StatusOK)
 	}))
 	defer server1.Close()
 	server2 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		received <- "server2"
+		count++
 		w.WriteHeader(http.StatusOK)
 	}))
 	defer server2.Close()
@@ -219,21 +219,11 @@ func TestWebhook_MultipleUrls(t *testing.T) {
 		// Trigger webhook
 		downloader.triggerWebhooks(WebhookEventDownloadDone, task, nil)
 
-		// Wait for each destination, rather than racing on a shared counter or
+		// Wait for webhooks
-		// assuming that both requests finish within a fixed sleep.
+		time.Sleep(500 * time.Millisecond)
-		timer := time.NewTimer(2 * time.Second)
+
-		defer timer.Stop()
+		if count != 2 {
-		seen := make(map[string]bool)
+			t.Errorf("Expected 2 webhook calls, got %d", count)
-		for len(seen) < 2 {
-			select {
-			case server := <-received:
-				if seen[server] {
-					t.Fatalf("Duplicate webhook call to %s", server)
-				}
-				seen[server] = true
-			case <-timer.C:
-				t.Fatalf("Timeout waiting for both webhook destinations; received: %v", seen)
-			}
 		}
 	})
 }
@@ -639,9 +629,9 @@ func TestWebhook_SendWebhookToUrl_VariousStatusCodes(t *testing.T) {
 }
 
 func TestWebhook_TriggerWebhooks_EmptyUrlSkipped(t *testing.T) {
-	received := make(chan struct{}, 2)
+	requestCount := 0
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		received <- struct{}{}
+		requestCount++
 		w.WriteHeader(http.StatusOK)
 	}))
 	defer server.Close()
@@ -660,14 +650,10 @@ func TestWebhook_TriggerWebhooks_EmptyUrlSkipped(t *testing.T) {
 
 		downloader.triggerWebhooks(WebhookEventDownloadDone, task, nil)
 
-		timer := time.NewTimer(2 * time.Second)
+		time.Sleep(500 * time.Millisecond)
-		defer timer.Stop()
+
-		for count := 0; count < 2; count++ {
+		if requestCount != 2 {
-			select {
+			t.Errorf("Expected 2 requests (empty URL should be skipped), got %d", requestCount)
-			case <-received:
-			case <-timer.C:
-				t.Fatalf("Expected 2 requests (empty URL should be skipped), got %d", count)
-			}
 		}
 	})
 }

pkg/rest/api.go

@@ -24,7 +24,7 @@ func Info(w http.ResponseWriter, r *http.Request) {
 func Resolve(w http.ResponseWriter, r *http.Request) {
 	var req model.ResolveTask
 	if ReadJson(r, w, &req) {
-		rr, err := Downloader.Resolve(req.Req)
+		rr, err := Downloader.ResolveWithID(req.ID, req.Req)
 		if err != nil {
 			WriteJson(w, model.NewErrorResult(err.Error()))
 			return

pkg/rest/model/task.go

@@ -3,6 +3,7 @@ package model
 import "github.com/GopeedLab/gopeed/pkg/base"
 
 type ResolveTask struct {
+	ID  string        `json:"id,omitempty"`
 	Req *base.Request `json:"req"`
 }
 

ui/flutter/lib/api/api.dart

@@ -81,6 +81,9 @@ Future<ResolveResult> resolve(ResolveTask resolveTask) {
   );
 }
 
+Future<void> releaseResolve(String id) =>
+    _parse<void>(() => _request('api/v1/resolve/${Uri.encodeComponent(id)}', method: 'DELETE'), null);
+
 Future<String> createTask(CreateTask createTask) {
   return _parse<String>(() => _request('api/v1/tasks', method: 'POST', data: createTask), (data) => data as String);
 }

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

@@ -8,7 +8,10 @@ part 'resolve_task.g.dart';
 class ResolveTask {
   Request? req;
 
-  ResolveTask({this.req});
+  @JsonKey(includeIfNull: false)
+  String? id;
+
+  ResolveTask({this.req, this.id});
 
   factory ResolveTask.fromJson(Map<String, dynamic> json) => _$ResolveTaskFromJson(json);
   Map<String, dynamic> toJson() => _$ResolveTaskToJson(this);

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

@@ -10,7 +10,8 @@ ResolveTask _$ResolveTaskFromJson(Map<String, dynamic> json) => ResolveTask(
   req: json['req'] == null
       ? null
       : Request.fromJson(json['req'] as Map<String, dynamic>),
+  id: json['id'] as String?,
 );
 
 Map<String, dynamic> _$ResolveTaskToJson(ResolveTask instance) =>
-    <String, dynamic>{'req': ?instance.req};
+    <String, dynamic>{'req': ?instance.req, 'id': ?instance.id};

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,8 +253,7 @@ 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);
       if (generatedClientId != null) {
@@ -265,7 +262,6 @@ class AppRuntimeController extends AsyncNotifier<AppRuntimeState> {
       }
       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/core/capabilities/app_capabilities.dart

@@ -93,6 +93,10 @@ void _bindGopeed(CapabilityRegistry registry, _ConfigStore configStore) {
       (p) => api.getMirrorCandidates(p['provider'] as String, p['url'] as String),
     )
     ..bind(GopeedMethods.resolve, api.resolve)
+    ..bind(GopeedMethods.releaseResolve, (id) async {
+      await api.releaseResolve(id);
+      return const RpcUnit();
+    })
     ..bind(GopeedMethods.createTask, api.createTask)
     ..bind(GopeedMethods.createTaskBatch, api.createTaskBatch)
     ..bind(GopeedMethods.patchTask, (params) async {

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

@@ -16,6 +16,7 @@ abstract final class GopeedMethods {
   static const triggerProtocolJob = RpcMethod<Map<String, dynamic>, RpcUnit>('gopeed.protocol.job.trigger');
   static const getMirrorCandidates = RpcMethod<Map<String, dynamic>, List<String>>('gopeed.mirrors.candidates');
   static const resolve = RpcMethod<ResolveTask, ResolveResult>('gopeed.resolve');
+  static const releaseResolve = RpcMethod<String, RpcUnit>('gopeed.releaseResolve');
   static const createTask = RpcMethod<CreateTask, String>('gopeed.task.create');
   static const createTaskBatch = RpcMethod<CreateTaskBatch, CreateTaskBatchResult>('gopeed.task.createBatch');
   static const patchTask = RpcMethod<Map<String, dynamic>, RpcUnit>('gopeed.task.patch');
@@ -50,6 +51,7 @@ class GopeedService {
   Future<List<String>> getMirrorCandidates(String provider, String url) =>
       _invoker.invoke(GopeedMethods.getMirrorCandidates, {'provider': provider, 'url': url});
   Future<ResolveResult> resolve(ResolveTask request) => _invoker.invoke(GopeedMethods.resolve, request);
+  Future<void> releaseResolve(String id) async => _invoker.invoke(GopeedMethods.releaseResolve, id);
 
   Future<String> createTask(CreateTask request) => _invoker.invoke(GopeedMethods.createTask, request);
 

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,15 +47,10 @@ 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
@@ -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

@@ -625,6 +625,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 +633,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),
@@ -1202,10 +1204,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());

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

@@ -1,3 +1,5 @@
+import 'dart:developer' as developer;
+import 'package:uuid/uuid.dart';
 import 'package:path/path.dart' as path;
 
 import '../../../api/model/create_task_batch.dart';
@@ -16,6 +18,8 @@ class PendingDownload {
   final Request request;
   final Options options;
   ResolveResult? result;
+  String? _resolveID;
+  bool _cancelled = false;
   String? resolveError;
   String? createError;
   final Set<int> selected = {};
@@ -50,11 +54,16 @@ class PendingDownload {
   bool get hasSelection => !created && result != null && selected.isNotEmpty;
 
   Future<void> resolve(GopeedService service) async {
-    if (result != null || resolving) return;
+    if (_cancelled || result != null || resolving) return;
     resolving = true;
     resolveError = null;
     try {
-      result = await service.resolve(ResolveTask(req: request));
+      _resolveID = const Uuid().v4();
+      result = await service.resolve(ResolveTask(req: request, id: _resolveID));
+      if (_cancelled) {
+        await _release(service, result!.id);
+        return;
+      }
       selected.addAll(List.generate(files.isEmpty ? 1 : files.length, (index) => index));
     } catch (error) {
       resolveError = error.toString();
@@ -63,6 +72,23 @@ class PendingDownload {
     }
   }
 
+  /// Stop an outstanding preview and release any resource it already owns.
+  /// A response arriving after cancellation is released by resolve() as well.
+  Future<void> cancel(GopeedService service) async {
+    if (_cancelled || created) return;
+    _cancelled = true;
+    await _release(service, result?.id.isNotEmpty == true ? result!.id : _resolveID);
+  }
+
+  Future<void> _release(GopeedService service, String? id) async {
+    if (id == null || id.isEmpty) return;
+    try {
+      await service.releaseResolve(id);
+    } catch (error, stack) {
+      developer.log('Failed to release resolved resource', name: 'gopeed.resolve', error: error, stackTrace: stack);
+    }
+  }
+
   List<CreateTaskBatchItem> creationItems() {
     final indexes = selected.toList()..sort();
     if (result!.id.isNotEmpty || files.isEmpty) {