fix: follow android 11 storage permissions (#66)

.github/workflows/build.yml

@@ -268,6 +268,7 @@ jobs:
           gomobile init
           gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/monkeyWie/gopeed/bind/mobile
           cd ui/flutter
+          echo $APK_KEYSTORE | base64 -d > android/app/upload-keystore.jks
           flutter build apk
           mkdir dist
           cp build/app/outputs/flutter-apk/app-release.apk dist/Gopeed-$VERSION-android.apk
@@ -324,13 +325,25 @@ jobs:
     needs: [get-release]
     steps:
       - uses: actions/checkout@v3
-      - name: Build
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: liwei2633
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and push
+        uses: docker/build-push-action@v2
         env:
           VERSION: ${{ needs.get-release.outputs.tag_name }}
-        run: |
+        with:
-          tag=liwei2633/gopeed:${VERSION:1}
+          push: true
-          docker build -t $tag .
+          platforms: |
-          docker login -u liwei2633 -p ${{ secrets.DOCKER_PASSWORD }}
+            linux/386
-          docker push $tag
+            linux/amd64
-          docker tag $tag liwei2633/gopeed:latest
+            linux/arm64
-          docker push liwei2633/gopeed:latest
+          tags: |
+            liwei2633/gopeed:latest
+            liwei2633/gopeed:${{ env.VERSION }}

.github/workflows/release.yml

@@ -11,6 +11,7 @@ on:
       - "pkg/**"
       - "ui/**"
       - ".github/workflows/release.yml"
+      - ".github/release-drafter.yml"
       - "go.mod"
       - "go.sum"
       - "Dockerfile"

README.md

@@ -37,10 +37,36 @@ go install github.com/monkeyWie/gopeed/cmd/gopeed
 
 ### Docker
 
+#### Start directly
+
 ```bash
 docker run -d -p 9999:9999 -v /path/to/download:/download liwei2633/gopeed
 ```
 
+#### Using Docker Compose
+
+```yaml
+version: '3'
+
+services:
+  gopeed:
+    container_name: gopeed
+    ports:
+      - 9999:9999
+    image: liwei2633/gopeed
+    volumes:
+      - ~/Downloads:/download
+    restart: unless-stopped
+```
+
+Use the command below to start container:
+
+```bash
+docker-compose up -d
+```
+
+#### Access Gopeed
+
 When the docker container is running, you can access the web page through `http://localhost:9999`.
 > Tip: Modify the download path to `/download` on the setting page to access the downloaded files on the host.
 
@@ -126,6 +152,7 @@ command:
 cd ui/flutter
 flutter build web
 cd ../../
+rm -rf cmd/web/dist
 cp -r ui/flutter/build/web cmd/web/dist
 go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/monkeyWie/gopeed/cmd/web
 ````

README_zh-CN.md

@@ -37,10 +37,36 @@ go install github.com/monkeyWie/gopeed/cmd/gopeed
 
 ### Docker
 
+#### 直接运行
+
 ```bash
 docker run -d -p 9999:9999 -v /path/to/download:/download liwei2633/gopeed
 ```
 
+#### 使用 Docker Compose
+
+```yaml
+version: '3'
+
+services:
+  gopeed:
+    container_name: gopeed
+    ports:
+      - 9999:9999
+    image: liwei2633/gopeed
+    volumes:
+      - ~/Downloads:/download
+    restart: unless-stopped
+```
+
+输入以下指令启动容器:
+
+```bash
+docker-compose up -d
+```
+
+#### 访问服务
+
 当 docker 容器运行时，可以通过 `http://localhost:9999` 访问 web 页面。
 > 提示：在设置页面把下载路径修改为 `/download` 以便在宿主机访问下载完的文件。
 
@@ -126,6 +152,7 @@ Web 端直接与后端 http 服务通讯，不需要额外准备环境。
 cd ui/flutter
 flutter build web
 cd ../../
+rm -rf cmd/web/dist
 cp -r ui/flutter/build/web cmd/web/dist
 go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/monkeyWie/gopeed/cmd/web
 ```

cmd/api/banner.txt

@@ -0,0 +1,7 @@
+
+  _______   ______   .______    _______  _______  _______
+ /  _____| /  __  \  |   _  \  |   ____||   ____||       \
+|  |  __  |  |  |  | |  |_)  | |  |__   |  |__   |  .--.  |
+|  | |_ | |  |  |  | |   ___/  |   __|  |   __|  |  |  |  |
+|  |__| | |  `--'  | |  |      |  |____ |  |____ |  '--'  |
+ \______|  \______/  | _|      |_______||_______||_______/

cmd/api/main.go

@@ -0,0 +1,29 @@
+package main
+
+import (
+	_ "embed"
+	"fmt"
+	"github.com/monkeyWie/gopeed/pkg/rest"
+	"github.com/monkeyWie/gopeed/pkg/rest/model"
+	"net/http"
+)
+
+//go:embed banner.txt
+var banner string
+
+func main() {
+	cfg := &model.StartConfig{
+		Network: "tcp",
+		Address: "127.0.0.1:9999",
+		Storage: model.StorageBolt,
+	}
+	fmt.Println(banner)
+	srv, listener, err := rest.BuildServer(cfg)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
+	if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
+		panic(err)
+	}
+}

cmd/gopeed/flags.go

@@ -25,7 +25,7 @@ func parse() *args {
 	if len(t) > 0 {
 		args.url = t[0]
 	} else {
-		gPrintln("missing url parameter")
+		gPrintln("missing url parameter, for example: gopeed https://www.google.com or gopeed bt.torrent or gopeed magnet:?xt=urn:btih:...")
 		gPrintln("try 'gopeed -h' for more information")
 		os.Exit(1)
 	}

cmd/gopeed/main.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/monkeyWie/gopeed/pkg/base"
 	"github.com/monkeyWie/gopeed/pkg/download"
+	"github.com/monkeyWie/gopeed/pkg/protocol/http"
 	"github.com/monkeyWie/gopeed/pkg/util"
 	"strings"
 	"sync"
@@ -40,7 +41,7 @@ func main() {
 		}).
 		Create(&base.Options{
 			Path:  *args.dir,
-			Connections: *args.connections,
+			Extra: http.OptsExtra{Connections: *args.connections},
 		})
 	if err != nil {
 		panic(err)

docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3'
+
+services:
+  gopeed:
+    container_name: gopeed
+    ports:
+      - 9999:9999 # HTTP port (host:container)
+    image: liwei2633/gopeed
+    volumes:
+      - ~/Downloads:/download # replace with your prefer path
+    restart: unless-stopped

internal/controller/controller.go

@@ -6,19 +6,29 @@ import (
 	"path/filepath"
 )
 
-type Controller interface {
+type Controller struct {
-	Touch(name string, size int64) (file *os.File, err error)
+	GetConfig func(v any) (bool, error)
+	FileController
 	//ContextDialer() (proxy.Dialer, error)
 }
 
-type DefaultController struct {
+type FileController interface {
+	Touch(name string, size int64) (file *os.File, err error)
 }
 
-func NewController() *DefaultController {
+type DefaultFileController struct {
-	return &DefaultController{}
 }
 
-func (c *DefaultController) Touch(name string, size int64) (file *os.File, err error) {
+func NewController() *Controller {
+	return &Controller{
+		FileController: &DefaultFileController{},
+		GetConfig: func(v any) (bool, error) {
+			return false, nil
+		},
+	}
+}
+
+func (c *DefaultFileController) Touch(name string, size int64) (file *os.File, err error) {
 	dir := filepath.Dir(name)
 	if err = os.MkdirAll(dir, os.ModePerm); err != nil {
 		return

internal/fetcher/fetcher.go

@@ -5,40 +5,46 @@ import (
 	"github.com/monkeyWie/gopeed/pkg/base"
 )
 
-// 对应协议的下载支持
+// Fetcher defines the interface for a download protocol.
 type Fetcher interface {
-	Setup(ctl controller.Controller) error
+	// Name return the name of the protocol.
-	// 解析请求
+	Name() string
+
+	Setup(ctl *controller.Controller) error
+	// Resolve resource info from request
 	Resolve(req *base.Request) (res *base.Resource, err error)
-	// 创建任务
+	// Create ready to download, but not started
 	Create(res *base.Resource, opts *base.Options) (err error)
 	Start() (err error)
 	Pause() (err error)
 	Continue() (err error)
 	Close() (err error)
 
-	// 获取任务各个文件下载进度
+	// Progress returns the progress of the download.
 	Progress() Progress
-	// 该方法会一直阻塞，直到任务下载结束
+	// Wait for the download to complete, this method will block until the download is done.
 	Wait() (err error)
 }
 
+// FetcherBuilder defines the interface for a fetcher builder.
 type FetcherBuilder interface {
+	// Schemes returns the schemes supported by the fetcher.
 	Schemes() []string
+	// Build returns a new fetcher.
 	Build() Fetcher
 
-	// Store 存储任务
+	// Store fetcher
 	Store(fetcher Fetcher) (any, error)
-	// Restore 恢复任务
+	// Restore fetcher
 	Restore() (v any, f func(res *base.Resource, opts *base.Options, v any) Fetcher)
 }
 
 type DefaultFetcher struct {
-	Ctl    controller.Controller
+	Ctl    *controller.Controller
 	DoneCh chan error
 }
 
-func (f *DefaultFetcher) Setup(ctl controller.Controller) (err error) {
+func (f *DefaultFetcher) Setup(ctl *controller.Controller) (err error) {
 	f.Ctl = ctl
 	f.DoneCh = make(chan error, 1)
 	return
@@ -48,10 +54,10 @@ func (f *DefaultFetcher) Wait() (err error) {
 	return <-f.DoneCh
 }
 
-// 获取任务中各个文件的已下载字节数
+// Progress is a map of the progress of each file in the torrent.
 type Progress []int64
 
-// TotalDownloaded 获取任务总下载字节数
+// TotalDownloaded returns the total downloaded bytes.
 func (p Progress) TotalDownloaded() int64 {
 	total := int64(0)
 	for _, d := range p {

internal/protocol/bt/config.go

@@ -0,0 +1,5 @@
+package bt
+
+type config struct {
+	Trackers []string `json:"trackers"`
+}

internal/protocol/bt/fetcher.go

@@ -17,7 +17,7 @@ import (
 var client *torrent.Client
 
 type Fetcher struct {
-	Ctl controller.Controller
+	Ctl *controller.Controller
 
 	torrent *torrent.Torrent
 	res     *base.Resource
@@ -29,7 +29,11 @@ type Fetcher struct {
 	torrentPaths map[string]string
 }
 
-func (f *Fetcher) Setup(ctl controller.Controller) (err error) {
+func (f *Fetcher) Name() string {
+	return "bt"
+}
+
+func (f *Fetcher) Setup(ctl *controller.Controller) (err error) {
 	f.Ctl = ctl
 	var once sync.Once
 	once.Do(func() {
@@ -105,9 +109,7 @@ func (f *Fetcher) Resolve(req *base.Request) (res *base.Resource, err error) {
 		Name:  f.torrent.Name(),
 		Range: true,
 		Files: make([]*base.FileInfo, len(f.torrent.Files())),
-		Extra: map[string]any{
+		Hash:  f.torrent.InfoHash().String(),
-			"infoHash": f.torrent.InfoHash().String(),
-		},
 	}
 	for i, file := range f.torrent.Files() {
 		res.Files[i] = &base.FileInfo{
@@ -130,10 +132,9 @@ func (f *Fetcher) Create(res *base.Resource, opts *base.Options) (err error) {
 		}
 	}
 	if f.opts.Path != "" {
-		if extra, ok := res.Extra.(map[string]any); ok {
+		f.torrentPaths[res.Hash] = f.opts.Path
-			f.torrentPaths[extra["infoHash"].(string)] = f.opts.Path
-		}
 	}
+
 	f.progress = make(fetcher.Progress, len(f.opts.SelectFiles))
 	f.ready.Store(false)
 	return nil
@@ -192,6 +193,18 @@ func (f *Fetcher) addTorrent(url string, resolve bool) (err error) {
 	if err != nil {
 		return
 	}
+	var cfg config
+	exist, err := f.Ctl.GetConfig(&cfg)
+	if err != nil {
+		return
+	}
+	if exist && len(cfg.Trackers) > 0 {
+		announceList := make([][]string, 0)
+		for _, tracker := range cfg.Trackers {
+			announceList = append(announceList, []string{tracker})
+		}
+		f.torrent.AddTrackers(announceList)
+	}
 	<-f.torrent.GotInfo()
 	if resolve {
 		return

internal/protocol/bt/fetcher_test.go

@@ -1,15 +1,24 @@
 package bt
 
 import (
+	"encoding/json"
 	"github.com/monkeyWie/gopeed/internal/controller"
 	"github.com/monkeyWie/gopeed/internal/fetcher"
+	"github.com/monkeyWie/gopeed/internal/test"
 	"github.com/monkeyWie/gopeed/pkg/base"
 	"reflect"
 	"testing"
 )
 
 func TestFetcher_Resolve_Torrent(t *testing.T) {
-	fetcher := buildFetcher()
+	doResolve(t, buildFetcher())
+}
+
+func TestFetcher_Config(t *testing.T) {
+	doResolve(t, buildConfigFetcher())
+}
+
+func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 	res, err := fetcher.Resolve(&base.Request{
 		URL: "./testdata/ubuntu-22.04-live-server-amd64.iso.torrent",
 	})
@@ -28,9 +37,7 @@ func TestFetcher_Resolve_Torrent(t *testing.T) {
 				Size: 1466714112,
 			},
 		},
-		Extra: map[string]any{
+		Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
-			"infoHash": "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
-		},
 	}
 	if !reflect.DeepEqual(want, res) {
 		t.Errorf("Resolve() got = %v, want %v", res, want)
@@ -42,3 +49,21 @@ func buildFetcher() fetcher.Fetcher {
 	fetcher.Setup(controller.NewController())
 	return fetcher
 }
+
+func buildConfigFetcher() fetcher.Fetcher {
+	fetcher := new(FetcherBuilder).Build()
+	newController := controller.NewController()
+	mockCfg := config{
+		Trackers: []string{
+			"udp://tracker.birkenwald.de:6969/announce",
+			"udp://tracker.bitsearch.to:1337/announce",
+		}}
+	newController.GetConfig = func(v any) (bool, error) {
+		if err := json.Unmarshal([]byte(test.ToJson(mockCfg)), v); err != nil {
+			return false, err
+		}
+		return true, nil
+	}
+	fetcher.Setup(newController)
+	return fetcher
+}

internal/protocol/http/config.go

@@ -0,0 +1,5 @@
+package http
+
+type config struct {
+	Connections int `json:"connections"`
+}

internal/protocol/http/fetcher.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"github.com/monkeyWie/gopeed/internal/fetcher"
 	"github.com/monkeyWie/gopeed/pkg/base"
+	fhttp "github.com/monkeyWie/gopeed/pkg/protocol/http"
 	"github.com/monkeyWie/gopeed/pkg/util"
 	"golang.org/x/sync/errgroup"
 	"io"
@@ -34,6 +35,21 @@ func (re *RequestError) Error() string {
 	return fmt.Sprintf("http request fail,code:%d", re.Code)
 }
 
+type chunk struct {
+	Status     base.Status
+	Begin      int64
+	End        int64
+	Downloaded int64
+}
+
+func newChunk(begin int64, end int64) *chunk {
+	return &chunk{
+		Status: base.DownloadStatusReady,
+		Begin:  begin,
+		End:    end,
+	}
+}
+
 type Fetcher struct {
 	*fetcher.DefaultFetcher
 
@@ -48,7 +64,14 @@ type Fetcher struct {
 	pauseCh chan interface{}
 }
 
+func (f *Fetcher) Name() string {
+	return "http"
+}
+
 func (f *Fetcher) Resolve(req *base.Request) (*base.Resource, error) {
+	if err := base.ParseReqExtra[fhttp.ReqExtra](req); err != nil {
+		return nil, err
+	}
 	httpReq, err := buildRequest(nil, req)
 	if err != nil {
 		return nil, err
@@ -120,6 +143,29 @@ func (f *Fetcher) Create(res *base.Resource, opts *base.Options) error {
 	f.res = res
 	f.opts = opts
 	f.status = base.DownloadStatusReady
+
+	if err := base.ParseReqExtra[fhttp.ReqExtra](res.Req); err != nil {
+		return err
+	}
+	if err := base.ParseOptsExtra[fhttp.OptsExtra](opts); err != nil {
+		return err
+	}
+	if opts.Extra == nil {
+		opts.Extra = &fhttp.OptsExtra{}
+	}
+	extra := opts.Extra.(*fhttp.OptsExtra)
+	if extra.Connections == 0 {
+		var cfg config
+		exist, err := f.Ctl.GetConfig(&cfg)
+		if err != nil {
+			return err
+		}
+		if exist {
+			extra.Connections = cfg.Connections
+		} else {
+			extra.Connections = 1
+		}
+	}
 	return nil
 }
 
@@ -131,7 +177,7 @@ func (f *Fetcher) Start() (err error) {
 		return err
 	}
 	f.status = base.DownloadStatusRunning
-	f.chunks = splitChunk(f.res, f.opts)
+	f.chunks = f.splitChunk()
 	f.fetch()
 	return
 }
@@ -188,7 +234,7 @@ func (f *Fetcher) filepath() string {
 func (f *Fetcher) fetch() {
 	f.ctx, f.cancel = context.WithCancel(context.Background())
 	eg, _ := errgroup.WithContext(f.ctx)
-	for i := 0; i < f.opts.Connections; i++ {
+	for i := 0; i < f.opts.Extra.(*fhttp.OptsExtra).Connections; i++ {
 		i := i
 		eg.Go(func() error {
 			return f.fetchChunk(i)
@@ -301,19 +347,20 @@ func (f *Fetcher) fetchChunk(index int) (err error) {
 	return
 }
 
-func splitChunk(res *base.Resource, opts *base.Options) (chunks []*chunk) {
+func (f *Fetcher) splitChunk() (chunks []*chunk) {
-	if res.Range {
+	if f.res.Range {
+		connections := f.opts.Extra.(*fhttp.OptsExtra).Connections
 		// 每个连接平均需要下载的分块大小
-		chunkSize := res.Size / int64(opts.Connections)
+		chunkSize := f.res.Size / int64(connections)
-		chunks = make([]*chunk, opts.Connections)
+		chunks = make([]*chunk, connections)
-		for i := 0; i < opts.Connections; i++ {
+		for i := 0; i < connections; i++ {
 			var (
 				begin = chunkSize * int64(i)
 				end   int64
 			)
-			if i == opts.Connections-1 {
+			if i == connections-1 {
 				// 最后一个分块需要保证把文件下载完
-				end = res.Size - 1
+				end = f.res.Size - 1
 			} else {
 				end = begin + chunkSize - 1
 			}
@@ -351,7 +398,7 @@ func buildRequest(ctx context.Context, req *base.Request) (httpReq *http.Request
 	if req.Extra == nil {
 		method = http.MethodGet
 	} else {
-		extra := req.Extra.(extra)
+		extra := req.Extra.(*fhttp.ReqExtra)
 		if extra.Method != "" {
 			method = extra.Method
 		} else {
@@ -414,8 +461,10 @@ func (fb *FetcherBuilder) Restore() (v any, f func(res *base.Resource, opts *bas
 		fetcher.res = res
 		fetcher.opts = opts
 		fetcher.status = base.DownloadStatusPause
+		base.ParseReqExtra[fhttp.ReqExtra](res.Req)
+		base.ParseOptsExtra[fhttp.OptsExtra](opts)
 		if len(fd.Chunks) == 0 {
-			fetcher.chunks = splitChunk(res, opts)
+			fetcher.chunks = fetcher.splitChunk()
 		} else {
 			fetcher.chunks = fd.Chunks
 		}

internal/protocol/http/fetcher_test.go

@@ -1,11 +1,13 @@
 package http
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/monkeyWie/gopeed/internal/controller"
 	"github.com/monkeyWie/gopeed/internal/fetcher"
 	"github.com/monkeyWie/gopeed/internal/test"
 	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/monkeyWie/gopeed/pkg/protocol/http"
 	"net"
 	"reflect"
 	"testing"
@@ -111,18 +113,45 @@ func TestFetcher_DownloadResume(t *testing.T) {
 	downloadResume(listener, 16, t)
 }
 
+func TestFetcher_Config(t *testing.T) {
+	fetcher, _, _ := doDownloadReady(buildConfigFetcher(), test.StartTestFileServer(), 0, t)
+	err := fetcher.Start()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = fetcher.Wait()
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := test.FileMd5(test.BuildFile)
+	got := test.FileMd5(test.DownloadFile)
+	if want != got {
+		t.Errorf("Download() got = %v, want %v", got, want)
+	}
+}
+
 func downloadReady(listener net.Listener, connections int, t *testing.T) (fetcher fetcher.Fetcher, res *base.Resource, opts *base.Options) {
-	fetcher = buildFetcher()
+	return doDownloadReady(buildFetcher(), listener, connections, t)
+}
+
+func doDownloadReady(f fetcher.Fetcher, listener net.Listener, connections int, t *testing.T) (fetcher fetcher.Fetcher, res *base.Resource, opts *base.Options) {
+	fetcher = f
 	res, err := fetcher.Resolve(&base.Request{
 		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
+	var extra any = nil
+	if connections > 0 {
+		extra = http.OptsExtra{
+			Connections: connections,
+		}
+	}
 	opts = &base.Options{
 		Name:  test.DownloadName,
 		Path:  test.Dir,
-		Connections: connections,
+		Extra: extra,
 	}
 	err = fetcher.Create(res, opts)
 	if err != nil {
@@ -150,7 +179,7 @@ func downloadNormal(listener net.Listener, connections int, t *testing.T) {
 
 func downloadPost(listener net.Listener, connections int, t *testing.T) {
 	fetcher, _, _ := downloadReady(listener, connections, t)
-	fetcher.(*Fetcher).res.Req.Extra = extra{
+	fetcher.(*Fetcher).res.Req.Extra = &http.ReqExtra{
 		Method: "POST",
 		Header: map[string]string{
 			"Authorization": "Bearer 123456",
@@ -249,3 +278,19 @@ func buildFetcher() *Fetcher {
 	fetcher.Setup(controller.NewController())
 	return fetcher.(*Fetcher)
 }
+
+func buildConfigFetcher() fetcher.Fetcher {
+	fetcher := new(FetcherBuilder).Build()
+	newController := controller.NewController()
+	mockCfg := config{
+		Connections: 16,
+	}
+	newController.GetConfig = func(v any) (bool, error) {
+		if err := json.Unmarshal([]byte(test.ToJson(mockCfg)), v); err != nil {
+			return false, err
+		}
+		return true, nil
+	}
+	fetcher.Setup(newController)
+	return fetcher
+}

internal/protocol/http/model.go

@@ -1,24 +0,0 @@
-package http
-
-import "github.com/monkeyWie/gopeed/pkg/base"
-
-type chunk struct {
-	Status     base.Status
-	Begin      int64
-	End        int64
-	Downloaded int64
-}
-
-func newChunk(begin int64, end int64) *chunk {
-	return &chunk{
-		Status: base.DownloadStatusReady,
-		Begin:  begin,
-		End:    end,
-	}
-}
-
-type extra struct {
-	Method string
-	Header map[string]string
-	Body   string
-}

internal/test/util.go

@@ -49,3 +49,7 @@ func ToJson(v interface{}) string {
 	buf, _ := json.Marshal(v)
 	return string(buf)
 }
+
+func JsonEqual(v1 any, v2 any) bool {
+	return ToJson(v1) == ToJson(v2)
+}

pkg/base/error.go

@@ -0,0 +1,8 @@
+package base
+
+import "errors"
+
+var (
+	NotFound  = errors.New("not found")
+	BadParams = errors.New("bad params")
+)

pkg/base/model.go

@@ -1,11 +1,13 @@
 package base
 
+import "github.com/monkeyWie/gopeed/pkg/util"
+
 // 下载请求
 type Request struct {
 	// 下载链接
 	URL string `json:"url"`
 	// 附加信息
-	Extra interface{} `json:"extra"`
+	Extra any `json:"extra"`
 }
 
 // 资源信息
@@ -19,8 +21,8 @@ type Resource struct {
 	Range bool `json:"range"`
 	// 资源所包含的文件列表
 	Files []*FileInfo `json:"files"`
-	// 附加信息
+	// 资源hash值
-	Extra interface{} `json:"extra"`
+	Hash string `json:"hash"`
 }
 
 type FileInfo struct {
@@ -35,8 +37,38 @@ type Options struct {
 	Name string `json:"name"`
 	// 保存目录
 	Path string `json:"path"`
-	// 并发连接数
-	Connections int `json:"connections"`
 	// 选择下载的文件下标列表
 	SelectFiles []int `json:"selectFiles"`
+	// 附加信息
+	Extra any `json:"extra"`
+}
+
+func ParseReqExtra[E any](req *Request) error {
+	if req.Extra == nil {
+		return nil
+	}
+	if _, ok := req.Extra.(*E); ok {
+		return nil
+	}
+	var t E
+	if err := util.MapToStruct(req.Extra, &t); err != nil {
+		return err
+	}
+	req.Extra = &t
+	return nil
+}
+
+func ParseOptsExtra[E any](opts *Options) error {
+	if opts.Extra == nil {
+		return nil
+	}
+	if _, ok := opts.Extra.(*E); ok {
+		return nil
+	}
+	var t E
+	if err := util.MapToStruct(opts.Extra, &t); err != nil {
+		return err
+	}
+	opts.Extra = &t
+	return nil
 }

pkg/download/downloader.go

@@ -4,8 +4,6 @@ import (
 	"errors"
 	"github.com/monkeyWie/gopeed/internal/controller"
 	"github.com/monkeyWie/gopeed/internal/fetcher"
-	"github.com/monkeyWie/gopeed/internal/protocol/bt"
-	"github.com/monkeyWie/gopeed/internal/protocol/http"
 	"github.com/monkeyWie/gopeed/pkg/base"
 	"github.com/monkeyWie/gopeed/pkg/util"
 	"strings"
@@ -32,7 +30,6 @@ type Progress struct {
 }
 
 type Downloader struct {
-	controller    *controller.DefaultController
 	fetchBuilders map[string]fetcher.FetcherBuilder
 	storage       Storage
 	tasks         []*Task
@@ -43,34 +40,6 @@ type Downloader struct {
 	closed          atomic.Bool
 }
 
-type DownloaderConfig struct {
-	Controller    *controller.DefaultController
-	FetchBuilders []fetcher.FetcherBuilder
-	Storage       Storage
-
-	// RefreshInterval time duration to refresh task progress(ms)
-	RefreshInterval int
-}
-
-func (cfg *DownloaderConfig) Init() *DownloaderConfig {
-	if cfg.Controller == nil {
-		cfg.Controller = controller.NewController()
-	}
-	if len(cfg.FetchBuilders) == 0 {
-		cfg.FetchBuilders = []fetcher.FetcherBuilder{
-			new(http.FetcherBuilder),
-			new(bt.FetcherBuilder),
-		}
-	}
-	if cfg.Storage == nil {
-		cfg.Storage = NewMemStorage()
-	}
-	if cfg.RefreshInterval == 0 {
-		cfg.RefreshInterval = 1000
-	}
-	return cfg
-}
-
 func NewDownloader(cfg *DownloaderConfig) *Downloader {
 	if cfg == nil {
 		cfg = &DownloaderConfig{}
@@ -78,7 +47,6 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
 	cfg.Init()
 
 	d := &Downloader{
-		controller:      cfg.Controller,
 		fetchBuilders:   make(map[string]fetcher.FetcherBuilder),
 		refreshInterval: cfg.RefreshInterval,
 		storage:         cfg.Storage,
@@ -134,7 +102,9 @@ func (d *Downloader) Setup() error {
 
 						current := task.fetcher.Progress().TotalDownloaded()
 						task.Progress.Used = task.timer.Used()
-						task.Progress.Speed = current - task.Progress.Downloaded
+						currUsedTime := float64(d.refreshInterval) / 1000
+						currSpeed := int64(float64(current-task.Progress.Downloaded) / currUsedTime)
+						task.Progress.Speed = (task.Progress.Speed + currSpeed) / 2
 						task.Progress.Downloaded = current
 						d.emit(EventKeyProgress, task)
 
@@ -166,12 +136,20 @@ func (d *Downloader) buildFetcher(url string) (fetcher.FetcherBuilder, fetcher.F
 	}
 	if ok {
 		fetcher := fetchBuilder.Build()
-		fetcher.Setup(d.controller)
+		d.setupFetcher(fetcher)
 		return fetchBuilder, fetcher, nil
 	}
 	return nil, nil, errors.New("unsupported protocol")
 }
 
+func (d *Downloader) setupFetcher(fetcher fetcher.Fetcher) {
+	ctl := controller.NewController()
+	ctl.GetConfig = func(v any) (bool, error) {
+		return d.getProtocolConfig(fetcher.Name(), v)
+	}
+	fetcher.Setup(ctl)
+}
+
 func (d *Downloader) Resolve(req *base.Request) (*base.Resource, error) {
 	_, fetcher, err := d.buildFetcher(req.URL)
 	if err != nil {
@@ -189,15 +167,21 @@ func (d *Downloader) Create(res *base.Resource, opts *base.Options) (taskId stri
 	if opts == nil {
 		opts = &base.Options{}
 	}
-	if !res.Range || opts.Connections < 1 {
-		opts.Connections = 1
-	}
 	if len(opts.SelectFiles) == 0 {
 		opts.SelectFiles = make([]int, 0)
 		for i := range res.Files {
 			opts.SelectFiles = append(opts.SelectFiles, i)
 		}
 	}
+	if opts.Path == "" {
+		exist, storeConfig, err := d.GetConfig()
+		if err != nil {
+			return "", err
+		}
+		if exist {
+			opts.Path = storeConfig.DownloadDir
+		}
+	}
 
 	fetcherBuilder, fetcher, err := d.buildFetcher(res.Req.URL)
 	if err != nil {
@@ -380,14 +364,36 @@ func (d *Downloader) GetTasks() []*Task {
 	return d.tasks
 }
 
-func (d *Downloader) GetConfig(v any) (bool, error) {
+func (d *Downloader) GetConfig() (bool, *DownloaderStoreConfig, error) {
-	return d.storage.Get(bucketConfig, "config", v)
+	var cfg DownloaderStoreConfig
+	exist, err := d.storage.Get(bucketConfig, "config", &cfg)
+	if err != nil {
+		return false, nil, err
+	}
+	return exist, &cfg, nil
 }
 
-func (d *Downloader) PutConfig(v any) error {
+func (d *Downloader) PutConfig(v *DownloaderStoreConfig) error {
 	return d.storage.Put(bucketConfig, "config", v)
 }
 
+func (d *Downloader) getProtocolConfig(name string, v any) (bool, error) {
+	exist, cfg, err := d.GetConfig()
+	if err != nil {
+		return false, err
+	}
+	if !exist {
+		return false, nil
+	}
+	if cfg.ProtocolConfig == nil || cfg.ProtocolConfig[name] == nil {
+		return false, nil
+	}
+	if err := util.MapToStruct(cfg.ProtocolConfig[name], v); err != nil {
+		return false, err
+	}
+	return true, nil
+}
+
 func (d *Downloader) watch(task *Task) {
 	err := task.fetcher.Wait()
 	if err != nil {
@@ -435,9 +441,9 @@ func (d *Downloader) restoreFetcher(task *Task) error {
 		}
 		if task.fetcher == nil {
 			task.fetcher = fetcherBuilder.Build()
-			task.fetcher.Create(task.Res, task.Opts)
 		}
-		task.fetcher.Setup(d.controller)
+		d.setupFetcher(task.fetcher)
+		task.fetcher.Create(task.Res, task.Opts)
 		go d.watch(task)
 	}
 	return nil

pkg/download/downloader_test.go

@@ -3,6 +3,7 @@ package download
 import (
 	"github.com/monkeyWie/gopeed/internal/test"
 	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/monkeyWie/gopeed/pkg/protocol/http"
 	"reflect"
 	"sync"
 	"testing"
@@ -70,7 +71,9 @@ func TestDownloader_Create(t *testing.T) {
 	_, err = downloader.Create(res, &base.Options{
 		Path: test.Dir,
 		Name: test.DownloadName,
+		Extra: http.OptsExtra{
 			Connections: 4,
+		},
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -105,7 +108,9 @@ func TestDownloader_StoreAndRestore(t *testing.T) {
 	id, err := downloader.Create(res, &base.Options{
 		Path: test.Dir,
 		Name: test.DownloadName,
+		Extra: http.OptsExtra{
 			Connections: 4,
+		},
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -148,3 +153,58 @@ func TestDownloader_StoreAndRestore(t *testing.T) {
 
 	downloader.Clear()
 }
+
+func TestDownloader_Protocol_Config(t *testing.T) {
+	downloader := NewDownloader(nil)
+	if err := downloader.Setup(); err != nil {
+		t.Fatal(err)
+	}
+	defer downloader.Clear()
+
+	var httpCfg map[string]any
+	exits, err := downloader.getProtocolConfig("http", &httpCfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if exits {
+		t.Errorf("getProtocolConfig() got = %v, want %v", exits, false)
+	}
+
+	storeCfg := &DownloaderStoreConfig{
+		RefreshInterval: 500,
+		DownloadDir:     "./downloads",
+		ProtocolConfig: map[string]any{
+			"http": map[string]any{
+				"connections": 4,
+			},
+			"bt": map[string]any{
+				"trackerSubscribeUrls": []string{
+					"https://raw.githubusercontent.com/XIU2/TrackersListCollection/master/best.txt",
+				},
+				"trackers": []string{
+					"udp://tracker.coppersurfer.tk:6969/announce",
+					"udp://tracker.leechers-paradise.org:6969/announce",
+				},
+			},
+		},
+		Extra: map[string]any{
+			"theme": "dark",
+		},
+	}
+
+	if err := downloader.PutConfig(storeCfg); err != nil {
+		t.Fatal(err)
+	}
+
+	exits, newStoreCfg, err := downloader.GetConfig()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !exits {
+		t.Errorf("GetConfig() got = %v, want %v", exits, true)
+	}
+
+	if !test.JsonEqual(storeCfg, newStoreCfg) {
+		t.Errorf("GetConfig() got = %v, want %v", test.ToJson(storeCfg), test.ToJson(newStoreCfg))
+	}
+}

pkg/download/model.go

@@ -0,0 +1,48 @@
+package download
+
+import (
+	"github.com/monkeyWie/gopeed/internal/controller"
+	"github.com/monkeyWie/gopeed/internal/fetcher"
+	"github.com/monkeyWie/gopeed/internal/protocol/bt"
+	"github.com/monkeyWie/gopeed/internal/protocol/http"
+)
+
+type DownloaderConfig struct {
+	Controller    *controller.Controller
+	FetchBuilders []fetcher.FetcherBuilder
+	Storage       Storage
+
+	*DownloaderStoreConfig
+}
+
+func (cfg *DownloaderConfig) Init() *DownloaderConfig {
+	if cfg.Controller == nil {
+		cfg.Controller = controller.NewController()
+	}
+	if len(cfg.FetchBuilders) == 0 {
+		cfg.FetchBuilders = []fetcher.FetcherBuilder{
+			new(http.FetcherBuilder),
+			new(bt.FetcherBuilder),
+		}
+	}
+	if cfg.Storage == nil {
+		cfg.Storage = NewMemStorage()
+	}
+
+	if cfg.DownloaderStoreConfig == nil {
+		cfg.DownloaderStoreConfig = &DownloaderStoreConfig{}
+	}
+
+	if cfg.RefreshInterval == 0 {
+		cfg.RefreshInterval = 350
+	}
+	return cfg
+}
+
+// DownloaderStoreConfig is the config that can restore the downloader.
+type DownloaderStoreConfig struct {
+	RefreshInterval int            `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms)
+	DownloadDir     string         `json:"downloadDir"`     // DownloadDir is the directory to save the downloaded files
+	ProtocolConfig  map[string]any `json:"protocolConfig"`  // ProtocolConfig is special config for each protocol
+	Extra           map[string]any `json:"extra"`           // Extra is the extra config
+}

pkg/protocol/http/model.go

@@ -0,0 +1,11 @@
+package http
+
+type ReqExtra struct {
+	Method string            `json:"method"`
+	Header map[string]string `json:"header"`
+	Body   string            `json:"body"`
+}
+
+type OptsExtra struct {
+	Connections int `json:"connections"`
+}

pkg/rest/api.go

@@ -1,12 +1,15 @@
 package rest
 
 import (
+	"compress/gzip"
 	"github.com/gorilla/mux"
 	"github.com/monkeyWie/gopeed/pkg/base"
 	"github.com/monkeyWie/gopeed/pkg/download"
 	"github.com/monkeyWie/gopeed/pkg/rest/model"
 	"github.com/monkeyWie/gopeed/pkg/rest/util"
+	"io"
 	"net/http"
+	"net/url"
 	"strings"
 )
 
@@ -25,12 +28,6 @@ func Resolve(w http.ResponseWriter, r *http.Request) {
 func CreateTask(w http.ResponseWriter, r *http.Request) {
 	var req model.CreateTask
 	if util.ReadJson(w, r, &req) {
-		if req.Opts.Connections == 0 {
-			req.Opts.Connections = getServerConfig().Connections
-		}
-		if req.Opts.Path == "" {
-			req.Opts.Path = getServerConfig().DownloadDir
-		}
 		taskId, err := Downloader.Create(req.Res, req.Opts)
 		if err != nil {
 			util.WriteJson(w, http.StatusInternalServerError, model.NewResultWithMsg(err.Error()))
@@ -106,7 +103,7 @@ func GetConfig(w http.ResponseWriter, r *http.Request) {
 }
 
 func PutConfig(w http.ResponseWriter, r *http.Request) {
-	var cfg model.ServerConfig
+	var cfg download.DownloaderStoreConfig
 	if util.ReadJson(w, r, &cfg) {
 		if err := Downloader.PutConfig(&cfg); err != nil {
 			util.WriteJson(w, http.StatusInternalServerError, model.NewResultWithMsg(err.Error()))
@@ -116,8 +113,47 @@ func PutConfig(w http.ResponseWriter, r *http.Request) {
 	util.WriteJsonOk(w, nil)
 }
 
-func getServerConfig() *model.ServerConfig {
+func DoProxy(w http.ResponseWriter, r *http.Request) {
-	var cfg model.ServerConfig
+	target := r.Header.Get("X-Target-Uri")
-	Downloader.GetConfig(&cfg)
+	if target == "" {
-	return &cfg
+		util.WriteJson(w, http.StatusBadRequest, model.NewResultWithMsg("header is required: X-Target-Uri"))
+		return
+	}
+	targetUrl, err := url.Parse(target)
+	if err != nil {
+		util.WriteJson(w, http.StatusBadRequest, model.NewResultWithMsg(err.Error()))
+		return
+	}
+	r.RequestURI = ""
+	r.URL = targetUrl
+	r.Host = targetUrl.Host
+	resp, err := http.DefaultClient.Do(r)
+	if err != nil {
+		util.WriteJson(w, http.StatusBadRequest, model.NewResultWithMsg(err.Error()))
+		return
+	}
+	defer resp.Body.Close()
+	w.WriteHeader(resp.StatusCode)
+	for k, vv := range resp.Header {
+		for _, v := range vv {
+			w.Header().Add(k, v)
+		}
+	}
+	var reader io.ReadCloser
+	switch resp.Header.Get("Content-Encoding") {
+	case "gzip":
+		reader, err = gzip.NewReader(resp.Body)
+		defer reader.Close()
+	default:
+		reader = resp.Body
+	}
+	if _, err := io.Copy(w, reader); err != nil {
+		util.WriteJson(w, http.StatusBadRequest, model.NewResultWithMsg(err.Error()))
+		return
+	}
+}
+
+func getServerConfig() *download.DownloaderStoreConfig {
+	_, cfg, _ := Downloader.GetConfig()
+	return cfg
 }

pkg/rest/config.go

@@ -0,0 +1,6 @@
+package rest
+
+type Config struct {
+	Host string `json:"host"`
+	Port int    `json:"port"`
+}

pkg/rest/model/action.go

@@ -0,0 +1,7 @@
+package model
+
+type Command struct {
+	Protocol string `json:"protocol"`
+	Action   string `json:"action"`
+	Params   any    `json:"params"`
+}

pkg/rest/model/server.go

@@ -15,6 +15,7 @@ type StartConfig struct {
 	Storage         Storage `json:"storage"`
 	StorageDir      string  `json:"storageDir"`
 	RefreshInterval int     `json:"refreshInterval"`
+	ApiToken        string  `json:"apiToken"`
 
 	WebEnable bool
 	WebFS     fs.FS
@@ -24,6 +25,9 @@ func (cfg *StartConfig) Init() *StartConfig {
 	if cfg.Network == "" {
 		cfg.Network = "tcp"
 	}
+	if cfg.Address == "" {
+		cfg.Address = "127.0.0.1:0"
+	}
 	if cfg.Storage == "" {
 		cfg.Storage = StorageBolt
 	}
@@ -32,27 +36,3 @@ func (cfg *StartConfig) Init() *StartConfig {
 	}
 	return cfg
 }
-
-// ServerConfig is present in the database
-type ServerConfig struct {
-	Host string `json:"host"`
-	Port int    `json:"port"`
-
-	Connections int    `json:"connections"`
-	DownloadDir string `json:"downloadDir"`
-
-	Extra map[string]any `json:"extra"`
-}
-
-func (cfg *ServerConfig) Init() *ServerConfig {
-	if cfg.Host == "" {
-		cfg.Host = "127.0.0.1"
-	}
-	if cfg.Port < 0 {
-		cfg.Port = 0
-	}
-	if cfg.Connections <= 0 {
-		cfg.Connections = 16
-	}
-	return cfg
-}

pkg/rest/server.go

@@ -6,10 +6,10 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/monkeyWie/gopeed/pkg/download"
 	"github.com/monkeyWie/gopeed/pkg/rest/model"
+	restUtil "github.com/monkeyWie/gopeed/pkg/rest/util"
 	"github.com/monkeyWie/gopeed/pkg/util"
 	"net"
 	"net/http"
-	"strconv"
 )
 
 var (
@@ -63,22 +63,18 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 	} else {
 		downloadCfg.Storage = download.NewMemStorage()
 	}
+	downloadCfg.Init()
 	downloadCfg.RefreshInterval = startCfg.RefreshInterval
-	Downloader = download.NewDownloader(downloadCfg.Init())
+	Downloader = download.NewDownloader(downloadCfg)
 	if err := Downloader.Setup(); err != nil {
 		return nil, nil, err
 	}
 
-	serverConfig := getAndPutServerConfig(startCfg)
-	var address string
 	if startCfg.Network == "unix" {
-		address = startCfg.Address
+		util.SafeRemove(startCfg.Address)
-		util.SafeRemove(address)
-	} else {
-		address = net.JoinHostPort(serverConfig.Host, strconv.Itoa(serverConfig.Port))
 	}
 
-	listener, err := net.Listen(startCfg.Network, address)
+	listener, err := net.Listen(startCfg.Network, startCfg.Address)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -93,33 +89,27 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 	r.Methods(http.MethodGet).Path("/api/v1/tasks").HandlerFunc(GetTasks)
 	r.Methods(http.MethodGet).Path("/api/v1/config").HandlerFunc(GetConfig)
 	r.Methods(http.MethodPut).Path("/api/v1/config").HandlerFunc(PutConfig)
+	r.Path("/api/v1/proxy").HandlerFunc(DoProxy)
 	if startCfg.WebEnable {
 		r.PathPrefix("/").Handler(http.FileServer(http.FS(startCfg.WebFS)))
 	}
 
+	if startCfg.ApiToken != "" {
+		r.Use(func(h http.Handler) http.Handler {
+			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				if r.Header.Get("X-Api-Token") != startCfg.ApiToken {
+					restUtil.WriteJson(w, http.StatusUnauthorized, model.NewResultWithMsg("invalid token"))
+					return
+				}
+				h.ServeHTTP(w, r)
+			})
+		})
+	}
+
 	srv = &http.Server{Handler: handlers.CORS(
-		handlers.AllowedHeaders([]string{"X-Requested-With", "Content-Type", "Authorization"}),
+		handlers.AllowedHeaders([]string{"Content-Type", "X-Api-Token", "X-Target-Uri"}),
-		handlers.AllowedMethods([]string{"GET", "POST", "PUT", "DELETE", "OPTIONS"}),
+		handlers.AllowedMethods([]string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"}),
 		handlers.AllowedOrigins([]string{"*"}),
 	)(r)}
 	return srv, listener, nil
 }
-
-func getAndPutServerConfig(startCfg *model.StartConfig) *model.ServerConfig {
-	var serverConfig model.ServerConfig
-	exist, err := Downloader.GetConfig(&serverConfig)
-	if err != nil {
-		// TODO log
-	}
-	// first start
-	if !exist {
-		if startCfg.Network == "tcp" {
-			host, port, _ := net.SplitHostPort(startCfg.Address)
-			serverConfig.Host = host
-			serverConfig.Port, _ = strconv.Atoi(port)
-		}
-		serverConfig.Init()
-		Downloader.PutConfig(serverConfig)
-	}
-	return &serverConfig
-}

pkg/rest/server_test.go

@@ -2,6 +2,7 @@ package rest
 
 import (
 	"bytes"
+	"crypto/md5"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -22,7 +23,15 @@ import (
 var (
 	restPort int
 
-	taskReq = &base.Request{}
+	taskReq = &base.Request{
+		Extra: map[string]any{
+			"method": "",
+			"header": map[string]string{
+				"User-Agent": "gopeed",
+			},
+			"body": "",
+		},
+	}
 	taskRes = &base.Resource{
 		Name:  test.BuildName,
 		Req:   taskReq,
@@ -41,7 +50,9 @@ var (
 		Opts: &base.Options{
 			Path: test.Dir,
 			Name: test.DownloadName,
-			Connections: 2,
+			Extra: map[string]any{
+				"connections": 2,
+			},
 		},
 	}
 )
@@ -49,8 +60,8 @@ var (
 func TestResolve(t *testing.T) {
 	doTest(func() {
 		resp := httpRequestCheckOk[*base.Resource](http.MethodPost, "/api/v1/resolve", taskReq)
-		if !reflect.DeepEqual(taskRes, resp) {
+		if !test.JsonEqual(taskRes, resp) {
-			t.Errorf("Resolve() got = %v, want %v", resp, taskRes)
+			t.Errorf("Resolve() got = %v, want %v", test.ToJson(resp), test.ToJson(taskRes))
 		}
 	})
 }
@@ -187,26 +198,68 @@ func TestGetTasks(t *testing.T) {
 
 func TestGetAndPutConfig(t *testing.T) {
 	doTest(func() {
-		cfg := httpRequestCheckOk[*model.ServerConfig](http.MethodGet, "/api/v1/config", nil)
+		cfg := httpRequestCheckOk[*download.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
-
-		cfg.Port = 8888
-		cfg.Connections = 32
 		cfg.DownloadDir = "./download"
 		cfg.Extra = map[string]any{
+			"serverConfig": &Config{
+				Host: "127.0.0.1",
+				Port: 8080,
+			},
 			"theme": "dark",
 		}
 		httpRequestCheckOk[any](http.MethodPut, "/api/v1/config", cfg)
 
-		newCfg := httpRequestCheckOk[*model.ServerConfig](http.MethodGet, "/api/v1/config", nil)
+		newCfg := httpRequestCheckOk[*download.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
-		if !reflect.DeepEqual(newCfg, cfg) {
+		if !test.JsonEqual(cfg, newCfg) {
-			t.Errorf("GetAndPutConfig() got = %v, want %v", newCfg, cfg)
+			t.Errorf("GetAndPutConfig() got = %v, want %v", test.ToJson(newCfg), test.ToJson(cfg))
 		}
 	})
 }
 
+func TestDoProxy(t *testing.T) {
+	doTest(func() {
+		code, respBody := doHttpRequest0(http.MethodGet, "/api/v1/proxy", map[string]string{
+			"X-Target-Uri": "https://github.com/monkeyWie/gopeed/raw/695da7ea87d2b455552b709d3cb4d7879484d4d1/README.md",
+		}, nil)
+		if code != http.StatusOK {
+			t.Errorf("DoProxy() got = %v, want %v", code, http.StatusOK)
+		}
+		want := "4ee193b676f1ebb2ad810e016350d52a"
+		got := fmt.Sprintf("%x", md5.Sum(respBody))
+		if got != want {
+			t.Errorf("DoProxy() got = %v, want %v", got, want)
+		}
+	})
+}
+
+func TestAuthorization(t *testing.T) {
+	var cfg = &model.StartConfig{}
+	cfg.Init()
+	cfg.ApiToken = "123456"
+	fileListener := doStart(cfg)
+	defer func() {
+		if err := fileListener.Close(); err != nil {
+			panic(err)
+		}
+		Stop()
+	}()
+
+	code, _ := doHttpRequest[any](http.MethodGet, "/api/v1/config", nil, nil)
+	checkCode(code, http.StatusUnauthorized)
+
+	code, _ = doHttpRequest[any](http.MethodGet, "/api/v1/config", map[string]string{
+		"X-Api-Token": cfg.ApiToken,
+	}, nil)
+	checkCode(code, http.StatusOK)
+
+}
+
 func doTest(handler func()) {
 	testFunc := func(storage model.Storage) {
-		fileListener := doStart(storage)
+		var cfg = &model.StartConfig{}
+		cfg.Init()
+		cfg.Storage = storage
+		fileListener := doStart(cfg)
 		defer func() {
 			if err := fileListener.Close(); err != nil {
 				panic(err)
@@ -221,10 +274,8 @@ func doTest(handler func()) {
 	testFunc(model.StorageBolt)
 }
 
-func doStart(storage model.Storage) net.Listener {
+func doStart(cfg *model.StartConfig) net.Listener {
-	port, err := Start((&model.StartConfig{
+	port, err := Start(cfg)
-		Storage: storage,
-	}).Init())
 	if err != nil {
 		panic(err)
 	}
@@ -232,32 +283,50 @@ func doStart(storage model.Storage) net.Listener {
 	return test.StartTestFileServer()
 }
 
-func httpRequest[T any](method string, path string, req any) (int, *model.Result[T]) {
+func doHttpRequest0(method string, path string, headers map[string]string, body any) (int, []byte) {
-	var body io.Reader
+	var reader io.Reader
-	if req != nil {
+	if body != nil {
-		buf, _ := json.Marshal(req)
+		buf, _ := json.Marshal(body)
-		body = bytes.NewBuffer(buf)
+		reader = bytes.NewBuffer(buf)
 	}
 
-	request, err := http.NewRequest(method, fmt.Sprintf("http://127.0.0.1:%d%s", restPort, path), body)
+	request, err := http.NewRequest(method, fmt.Sprintf("http://127.0.0.1:%d%s", restPort, path), reader)
 	if err != nil {
 		panic(err)
 	}
+	if headers != nil {
+		for k, v := range headers {
+			request.Header.Set(k, v)
+		}
+	}
 	response, err := http.DefaultClient.Do(request)
 	if err != nil {
 		panic(err)
 	}
 	defer response.Body.Close()
-
+	respBody, err := io.ReadAll(response.Body)
-	var r model.Result[T]
+	if err != nil {
-	if err := json.NewDecoder(response.Body).Decode(&r); err != nil {
 		panic(err)
 	}
-	return response.StatusCode, &r
+	return response.StatusCode, respBody
 }
 
-func httpRequestCheckOk[T any](method string, path string, req any) T {
+func doHttpRequest[T any](method string, path string, headers map[string]string, body any) (int, *model.Result[T]) {
-	code, result := httpRequest[T](method, path, req)
+	code, respBody := doHttpRequest0(method, path, headers, body)
+
+	var r model.Result[T]
+	if err := json.Unmarshal(respBody, &r); err != nil {
+		panic(err)
+	}
+	return code, &r
+}
+
+func httpRequest[T any](method string, path string, body any) (int, *model.Result[T]) {
+	return doHttpRequest[T](method, path, nil, body)
+}
+
+func httpRequestCheckOk[T any](method string, path string, body any) T {
+	code, result := httpRequest[T](method, path, body)
 	checkOk(code)
 	return result.Data
 }

pkg/rest/util/util.go

@@ -8,18 +8,18 @@ import (
 
 func ReadJson(w http.ResponseWriter, r *http.Request, v any) bool {
 	if err := json.NewDecoder(r.Body).Decode(v); err != nil {
-		WriteJson(w, 500, model.NewResultWithMsg(err.Error()))
+		WriteJson(w, http.StatusInternalServerError, model.NewResultWithMsg(err.Error()))
 		return false
 	}
 	return true
 }
 
 func WriteJsonOk(w http.ResponseWriter, v any) {
-	WriteJson(w, 200, v)
+	WriteJson(w, http.StatusOK, v)
 }
 
 func WriteJson(w http.ResponseWriter, code int, v any) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(code)
-	w.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(w).Encode(v)
 }

pkg/util/json.go

@@ -0,0 +1,14 @@
+package util
+
+import "encoding/json"
+
+func MapToStruct(s any, v any) error {
+	if s == nil {
+		return nil
+	}
+	b, err := json.Marshal(s)
+	if err != nil {
+		return err
+	}
+	return json.Unmarshal(b, v)
+}

pkg/util/url_test.go

@@ -0,0 +1,50 @@
+package util
+
+import "testing"
+
+func TestParseSchema(t *testing.T) {
+	type args struct {
+		url string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "http",
+			args: args{
+				url: "http://www.google.com",
+			},
+			want: "HTTP",
+		},
+		{
+			name: "https",
+			args: args{
+				url: "https://www.google.com",
+			},
+			want: "HTTPS",
+		},
+		{
+			name: "file",
+			args: args{
+				url: "file:///home/bt.torrent",
+			},
+			want: "FILE",
+		},
+		{
+			name: "file-no-scheme",
+			args: args{
+				url: "/home/bt.torrent",
+			},
+			want: "FILE",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := ParseSchema(tt.args.url); got != tt.want {
+				t.Errorf("ParseSchema() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

ui/flutter/android/app/build.gradle

@@ -48,18 +48,29 @@ android {
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         minSdkVersion 19
-        targetSdkVersion flutter.targetSdkVersion
+        targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
+    signingConfigs {
+        release {
+            keyAlias "upload"
+            keyPassword System.getenv("APK_KEY_PASSWORD")
+            storeFile file("upload-keystore.jks")
+            storePassword System.getenv("APK_STORE_PASSWORD")
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
+            if (signingConfigs.release.keyPassword != null) {
-            // Signing with the debug keys for now, so `flutter run --release` works.
+                signingConfig signingConfigs.release
+            } else {
                 signingConfig signingConfigs.debug
             }
         }
+    }
 
     repositories {
         flatDir {

ui/flutter/android/app/src/debug/AndroidManifest.xml

@@ -4,9 +4,5 @@
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
-    <application android:requestLegacyExternalStorage="true"/>
-
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 </manifest>

ui/flutter/android/app/src/main/AndroidManifest.xml

@@ -2,11 +2,8 @@
     package="com.gopeed">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
-        android:requestLegacyExternalStorage="true"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:label="Gopeed">

ui/flutter/android/app/src/profile/AndroidManifest.xml

@@ -4,9 +4,5 @@
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
-    <application android:requestLegacyExternalStorage="true"/>
-
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 </manifest>

ui/flutter/lib/api/api.dart

@@ -1,17 +1,16 @@
-import 'dart:convert';
 import 'dart:io';
 
 import 'package:dio/adapter.dart';
 import 'package:dio/dio.dart';
-import 'package:gopeed/util/util.dart';
+import 'package:flutter/foundation.dart';
+import '../util/util.dart';
 import 'model/create_task.dart';
 import 'model/request.dart';
 import 'model/resource.dart';
 import 'model/result.dart';
 import 'model/task.dart';
 
-import '../core/libgopeed_boot.dart';
+import 'model/downloader_config.dart';
-import 'model/server_config.dart';
 
 class _Client {
   static _Client? _instance;
@@ -20,25 +19,35 @@ class _Client {
 
   _Client._internal();
 
-  factory _Client() {
+  factory _Client(String network, String address, String apiToken) {
     if (_instance == null) {
       _instance = _Client._internal();
       var dio = Dio();
-      final isUnixSocket = LibgopeedBoot.instance.config.network == 'unix';
+      final isUnixSocket = network == 'unix';
-      dio.options.baseUrl = isUnixSocket
+      var baseUrl = 'http://127.0.0.1';
-          ? 'http://127.0.0.1'
+      if (!isUnixSocket) {
-          : (Util.isWeb()
+        if (Util.isWeb()) {
-              ? ""
+          baseUrl = kDebugMode ? 'http://127.0.0.1:9999' : '';
-              : 'http://${LibgopeedBoot.instance.config.address}');
+        } else {
+          baseUrl = 'http://$address';
+        }
+      }
+      dio.options.baseUrl = baseUrl;
+      dio.interceptors.add(InterceptorsWrapper(onRequest: (options, handler) {
+        if (apiToken.isNotEmpty) {
+          options.headers['X-Api-Token'] = apiToken;
+        }
+        handler.next(options);
+      }));
+
       _instance!.dio = dio;
       if (isUnixSocket) {
         (_instance!.dio.httpClientAdapter as DefaultHttpClientAdapter)
             .onHttpClientCreate = (client) {
           client.connectionFactory =
               (Uri uri, String? proxyHost, int? proxyPort) {
-            var address = InternetAddress(LibgopeedBoot.instance.config.address,
+            return Socket.startConnect(
-                type: InternetAddressType.unix);
+                InternetAddress(address, type: InternetAddressType.unix), 0);
-            return Socket.startConnect(address, 0);
           };
           return client;
         };
@@ -48,7 +57,11 @@ class _Client {
   }
 }
 
-var _client = _Client();
+late _Client _client;
+
+void init(String network, String address, String apiToken) {
+  _client = _Client(network, address, apiToken);
+}
 
 Future<T> _parse<T>(
   Future<Response> Function() fetch,
@@ -57,7 +70,7 @@ Future<T> _parse<T>(
   try {
     var resp = await fetch();
     if (fromJsonT != null) {
-      return Result<T>.fromJson(jsonDecode(resp.data), fromJsonT).data as T;
+      return Result<T>.fromJson(resp.data, fromJsonT).data as T;
     } else {
       return null as T;
     }
@@ -65,8 +78,7 @@ Future<T> _parse<T>(
     if (e.response == null) {
       throw Exception("Server error");
     }
-    throw Exception(
+    throw Exception(Result.fromJson(e.response?.data, (_) => null).msg);
-        Result.fromJson(jsonDecode(e.response?.data), (_) => null).msg);
   }
 }
 
@@ -77,7 +89,6 @@ Future<Resource> resolve(Request request) async {
 }
 
 Future<String> createTask(CreateTask createTask) async {
-  print(jsonEncode(createTask));
   return _parse<String>(
       () => _client.dio.post("/api/v1/tasks", data: createTask),
       (data) => data as String);
@@ -103,11 +114,20 @@ Future<void> deleteTask(String id, bool force) async {
       () => _client.dio.delete("/api/v1/tasks/$id?force=$force"), null);
 }
 
-Future<ServerConfig> getConfig() async {
+Future<DownloaderConfig> getConfig() async {
   return _parse(() => _client.dio.get("/api/v1/config"),
-      (data) => ServerConfig.fromJson(data));
+      (data) => DownloaderConfig.fromJson(data));
 }
 
-Future<void> putConfig(ServerConfig config) async {
+Future<void> putConfig(DownloaderConfig config) async {
   return _parse(() => _client.dio.put("/api/v1/config", data: config), null);
 }
+
+Future<Response<T>> proxyRequest<T>(String uri,
+    {data, Options? options}) async {
+  options ??= Options();
+  options.headers ??= {};
+  options.headers!["X-Target-Uri"] = uri;
+
+  return _client.dio.request("/api/v1/proxy", data: data, options: options);
+}

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

@@ -15,7 +15,9 @@ class CreateTask {
     this.opts,
   });
 
-  factory CreateTask.fromJson(Map<String, dynamic> json) =>
+  factory CreateTask.fromJson(
+    Map<String, dynamic> json,
+  ) =>
       _$CreateTaskFromJson(json);
 
   Map<String, dynamic> toJson() => _$CreateTaskToJson(this);

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

@@ -0,0 +1,78 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'downloader_config.g.dart';
+
+@JsonSerializable(explicitToJson: true)
+class DownloaderConfig {
+  String downloadDir = '';
+  ProtocolConfig protocolConfig = ProtocolConfig();
+  ExtraConfig extra = ExtraConfig();
+
+  DownloaderConfig();
+
+  factory DownloaderConfig.fromJson(Map<String, dynamic> json) =>
+      _$DownloaderConfigFromJson(json);
+  Map<String, dynamic> toJson() => _$DownloaderConfigToJson(this);
+}
+
+@JsonSerializable(explicitToJson: true)
+class ProtocolConfig {
+  HttpConfig http = HttpConfig();
+  BtConfig bt = BtConfig();
+
+  ProtocolConfig();
+
+  factory ProtocolConfig.fromJson(Map<String, dynamic> json) =>
+      _$ProtocolConfigFromJson(json);
+  Map<String, dynamic> toJson() => _$ProtocolConfigToJson(this);
+}
+
+@JsonSerializable()
+class HttpConfig {
+  int connections = 0;
+
+  HttpConfig();
+
+  factory HttpConfig.fromJson(Map<String, dynamic> json) =>
+      _$HttpConfigFromJson(json);
+  Map<String, dynamic> toJson() => _$HttpConfigToJson(this);
+}
+
+@JsonSerializable()
+class BtConfig {
+  List<String> trackers = [];
+
+  BtConfig();
+
+  factory BtConfig.fromJson(Map<String, dynamic> json) =>
+      _$BtConfigFromJson(json);
+  Map<String, dynamic> toJson() => _$BtConfigToJson(this);
+}
+
+@JsonSerializable(explicitToJson: true)
+class ExtraConfig {
+  String themeMode = '';
+  String locale = '';
+  ExtraConfigBt bt = ExtraConfigBt();
+
+  ExtraConfig();
+
+  factory ExtraConfig.fromJson(Map<String, dynamic> json) =>
+      _$ExtraConfigFromJson(json);
+  Map<String, dynamic> toJson() => _$ExtraConfigToJson(this);
+}
+
+@JsonSerializable()
+class ExtraConfigBt {
+  List<String> trackerSubscribeUrls = [];
+  List<String> subscribeTrackers = [];
+  DateTime? lastTrackerUpdateTime;
+
+  List<String> customTrackers = [];
+
+  ExtraConfigBt();
+
+  factory ExtraConfigBt.fromJson(Map<String, dynamic> json) =>
+      _$ExtraConfigBtFromJson(json);
+  Map<String, dynamic> toJson() => _$ExtraConfigBtToJson(this);
+}

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

@@ -0,0 +1,93 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'downloader_config.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+DownloaderConfig _$DownloaderConfigFromJson(Map<String, dynamic> json) =>
+    DownloaderConfig()
+      ..downloadDir = json['downloadDir'] as String
+      ..protocolConfig = ProtocolConfig.fromJson(
+          json['protocolConfig'] as Map<String, dynamic>)
+      ..extra = ExtraConfig.fromJson(json['extra'] as Map<String, dynamic>);
+
+Map<String, dynamic> _$DownloaderConfigToJson(DownloaderConfig instance) =>
+    <String, dynamic>{
+      'downloadDir': instance.downloadDir,
+      'protocolConfig': instance.protocolConfig.toJson(),
+      'extra': instance.extra.toJson(),
+    };
+
+ProtocolConfig _$ProtocolConfigFromJson(Map<String, dynamic> json) =>
+    ProtocolConfig()
+      ..http = HttpConfig.fromJson(json['http'] as Map<String, dynamic>)
+      ..bt = BtConfig.fromJson(json['bt'] as Map<String, dynamic>);
+
+Map<String, dynamic> _$ProtocolConfigToJson(ProtocolConfig instance) =>
+    <String, dynamic>{
+      'http': instance.http.toJson(),
+      'bt': instance.bt.toJson(),
+    };
+
+HttpConfig _$HttpConfigFromJson(Map<String, dynamic> json) =>
+    HttpConfig()..connections = json['connections'] as int;
+
+Map<String, dynamic> _$HttpConfigToJson(HttpConfig instance) =>
+    <String, dynamic>{
+      'connections': instance.connections,
+    };
+
+BtConfig _$BtConfigFromJson(Map<String, dynamic> json) => BtConfig()
+  ..trackers =
+      (json['trackers'] as List<dynamic>).map((e) => e as String).toList();
+
+Map<String, dynamic> _$BtConfigToJson(BtConfig instance) => <String, dynamic>{
+      'trackers': instance.trackers,
+    };
+
+ExtraConfig _$ExtraConfigFromJson(Map<String, dynamic> json) => ExtraConfig()
+  ..themeMode = json['themeMode'] as String
+  ..locale = json['locale'] as String
+  ..bt = ExtraConfigBt.fromJson(json['bt'] as Map<String, dynamic>);
+
+Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) =>
+    <String, dynamic>{
+      'themeMode': instance.themeMode,
+      'locale': instance.locale,
+      'bt': instance.bt.toJson(),
+    };
+
+ExtraConfigBt _$ExtraConfigBtFromJson(Map<String, dynamic> json) =>
+    ExtraConfigBt()
+      ..trackerSubscribeUrls = (json['trackerSubscribeUrls'] as List<dynamic>)
+          .map((e) => e as String)
+          .toList()
+      ..subscribeTrackers = (json['subscribeTrackers'] as List<dynamic>)
+          .map((e) => e as String)
+          .toList()
+      ..lastTrackerUpdateTime = json['lastTrackerUpdateTime'] == null
+          ? null
+          : DateTime.parse(json['lastTrackerUpdateTime'] as String)
+      ..customTrackers = (json['customTrackers'] as List<dynamic>)
+          .map((e) => e as String)
+          .toList();
+
+Map<String, dynamic> _$ExtraConfigBtToJson(ExtraConfigBt instance) {
+  final val = <String, dynamic>{
+    'trackerSubscribeUrls': instance.trackerSubscribeUrls,
+    'subscribeTrackers': instance.subscribeTrackers,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('lastTrackerUpdateTime',
+      instance.lastTrackerUpdateTime?.toIso8601String());
+  val['customTrackers'] = instance.customTrackers;
+  return val;
+}

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

@@ -2,17 +2,16 @@ import 'package:json_annotation/json_annotation.dart';
 
 part 'options.g.dart';
 
-@JsonSerializable()
+@JsonSerializable(explicitToJson: true, genericArgumentFactories: true)
 class Options {
   String name;
   String path;
-  int connections;
   List<int> selectFiles;
+  Map<String, dynamic>? extra;
 
   Options({
     required this.name,
     required this.path,
-    required this.connections,
     required this.selectFiles,
   });
 
@@ -21,3 +20,14 @@ class Options {
 
   Map<String, dynamic> toJson() => _$OptionsToJson(this);
 }
+
+@JsonSerializable()
+class OptsExtraHttp {
+  int connections = 0;
+
+  OptsExtraHttp();
+
+  factory OptsExtraHttp.fromJson(Map<String, dynamic> json) =>
+      _$OptsExtraHttpFromJson(json);
+  Map<String, dynamic> toJson() => _$OptsExtraHttpToJson(this);
+}

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

@@ -9,14 +9,31 @@ part of 'options.dart';
 Options _$OptionsFromJson(Map<String, dynamic> json) => Options(
       name: json['name'] as String,
       path: json['path'] as String,
-      connections: json['connections'] as int,
       selectFiles:
           (json['selectFiles'] as List<dynamic>).map((e) => e as int).toList(),
-    );
+    )..extra = json['extra'] as Map<String, dynamic>?;
 
-Map<String, dynamic> _$OptionsToJson(Options instance) => <String, dynamic>{
+Map<String, dynamic> _$OptionsToJson(Options instance) {
+  final val = <String, dynamic>{
     'name': instance.name,
     'path': instance.path,
-      'connections': instance.connections,
     'selectFiles': instance.selectFiles,
   };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('extra', instance.extra);
+  return val;
+}
+
+OptsExtraHttp _$OptsExtraHttpFromJson(Map<String, dynamic> json) =>
+    OptsExtraHttp()..connections = json['connections'] as int;
+
+Map<String, dynamic> _$OptsExtraHttpToJson(OptsExtraHttp instance) =>
+    <String, dynamic>{
+      'connections': instance.connections,
+    };

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

@@ -2,17 +2,31 @@ import 'package:json_annotation/json_annotation.dart';
 
 part 'request.g.dart';
 
-@JsonSerializable()
+@JsonSerializable(explicitToJson: true, genericArgumentFactories: true)
 class Request {
   String url;
   Map<String, dynamic>? extra;
 
   Request({
     required this.url,
-    this.extra,
   });
 
   factory Request.fromJson(Map<String, dynamic> json) =>
       _$RequestFromJson(json);
+
   Map<String, dynamic> toJson() => _$RequestToJson(this);
 }
+
+@JsonSerializable()
+class ReqExtraHttp {
+  String method = 'GET';
+  Map<String, String> headers = {};
+  String body = '';
+
+  ReqExtraHttp();
+
+  factory ReqExtraHttp.fromJson(Map<String, dynamic> json) =>
+      _$ReqExtraHttpFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ReqExtraHttpToJson(this);
+}

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

@@ -8,8 +8,7 @@ part of 'request.dart';
 
 Request _$RequestFromJson(Map<String, dynamic> json) => Request(
       url: json['url'] as String,
-      extra: json['extra'] as Map<String, dynamic>?,
+    )..extra = json['extra'] as Map<String, dynamic>?;
-    );
 
 Map<String, dynamic> _$RequestToJson(Request instance) {
   final val = <String, dynamic>{
@@ -25,3 +24,15 @@ Map<String, dynamic> _$RequestToJson(Request instance) {
   writeNotNull('extra', instance.extra);
   return val;
 }
+
+ReqExtraHttp _$ReqExtraHttpFromJson(Map<String, dynamic> json) => ReqExtraHttp()
+  ..method = json['method'] as String
+  ..headers = Map<String, String>.from(json['headers'] as Map)
+  ..body = json['body'] as String;
+
+Map<String, dynamic> _$ReqExtraHttpToJson(ReqExtraHttp instance) =>
+    <String, dynamic>{
+      'method': instance.method,
+      'headers': instance.headers,
+      'body': instance.body,
+    };

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

@@ -11,19 +11,19 @@ class Resource {
   int size;
   bool range;
   List<FileInfo> files;
-  Map<String, dynamic>? extra;
+  String hash;
 
-  Resource({
+  Resource(
-    required this.req,
+      {required this.req,
       required this.name,
       required this.size,
       required this.range,
       required this.files,
-    this.extra,
+      required this.hash});
-  });
 
   factory Resource.fromJson(Map<String, dynamic> json) =>
       _$ResourceFromJson(json);
+
   Map<String, dynamic> toJson() => _$ResourceToJson(this);
 }
 

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

@@ -14,28 +14,18 @@ Resource _$ResourceFromJson(Map<String, dynamic> json) => Resource(
       files: (json['files'] as List<dynamic>)
           .map((e) => FileInfo.fromJson(e as Map<String, dynamic>))
           .toList(),
-      extra: json['extra'] as Map<String, dynamic>?,
+      hash: json['hash'] as String,
     );
 
-Map<String, dynamic> _$ResourceToJson(Resource instance) {
+Map<String, dynamic> _$ResourceToJson(Resource instance) => <String, dynamic>{
-  final val = <String, dynamic>{
       'req': instance.req.toJson(),
       'name': instance.name,
       'size': instance.size,
       'range': instance.range,
       'files': instance.files.map((e) => e.toJson()).toList(),
+      'hash': instance.hash,
     };
 
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('extra', instance.extra);
-  return val;
-}
-
 FileInfo _$FileInfoFromJson(Map<String, dynamic> json) => FileInfo(
       name: json['name'] as String,
       path: json['path'] as String,

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

@@ -1,24 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'server_config.g.dart';
-
-@JsonSerializable()
-class ServerConfig {
-  late String host;
-  late int port;
-  late int connections;
-  late String downloadDir;
-  Map<String, dynamic>? extra;
-
-  ServerConfig({
-    required this.host,
-    required this.port,
-    required this.connections,
-    required this.downloadDir,
-    this.extra,
-  });
-
-  factory ServerConfig.fromJson(Map<String, dynamic> json) =>
-      _$ServerConfigFromJson(json);
-  Map<String, dynamic> toJson() => _$ServerConfigToJson(this);
-}

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

@@ -1,33 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'server_config.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-ServerConfig _$ServerConfigFromJson(Map<String, dynamic> json) => ServerConfig(
-      host: json['host'] as String,
-      port: json['port'] as int,
-      connections: json['connections'] as int,
-      downloadDir: json['downloadDir'] as String,
-      extra: json['extra'] as Map<String, dynamic>?,
-    );
-
-Map<String, dynamic> _$ServerConfigToJson(ServerConfig instance) {
-  final val = <String, dynamic>{
-    'host': instance.host,
-    'port': instance.port,
-    'connections': instance.connections,
-    'downloadDir': instance.downloadDir,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('extra', instance.extra);
-  return val;
-}