release: v1.3.10

README.md

@@ -74,7 +74,7 @@ This project is divided into two parts, the front end uses `flutter`, the back e
 ### Environment
 
 1. Golang 1.19+
-2. Flutter 3.7+
+2. Flutter 3.10+
 
 ### Clone
 

README_ja-JP.md

@@ -74,7 +74,7 @@ docker コンテナが起動しているときは、`http://localhost:9999` か
 ### 環境
 
 1. Go 言語 1.19+
-2. Flutter 3.7+
+2. Flutter 3.10+
 
 ### クローン
 

README_zh-CN.md

@@ -74,7 +74,7 @@ docker-compose up -d
 ### 环境要求
 
 1. Golang 1.19+
-2. Flutter 3.7+
+2. Flutter 3.10+
 
 ### 克隆项目
 

cmd/web/flags.go

@@ -0,0 +1,77 @@
+package main
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+)
+
+type args struct {
+	Address  *string `json:"address"`
+	Port     *int    `json:"port"`
+	Username *string `json:"username"`
+	Password *string `json:"password"`
+	ApiToken *string `json:"apiToken"`
+
+	configPath *string
+}
+
+func parse() *args {
+	var cliArgs args
+	cliArgs.Address = flag.String("A", "0.0.0.0", "Bind Address")
+	cliArgs.Port = flag.Int("P", 9999, "Bind Port")
+	cliArgs.Username = flag.String("u", "gopeed", "HTTP Basic Auth Username")
+	cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Password")
+	cliArgs.ApiToken = flag.String("T", "", "API token, that can only be used when basic authentication is enabled.")
+	cliArgs.configPath = flag.String("c", "./config.json", "Config file path")
+	flag.Parse()
+
+	fmt.Println("parse")
+
+	// args priority: config file > cli args
+	cfgArgs := loadConfig(*cliArgs.configPath)
+	if cfgArgs.Address == nil {
+		cfgArgs.Address = cliArgs.Address
+	}
+	if cfgArgs.Port == nil {
+		cfgArgs.Port = cliArgs.Port
+	}
+	if cfgArgs.Username == nil {
+		cfgArgs.Username = cliArgs.Username
+	}
+	if cfgArgs.Password == nil {
+		cfgArgs.Password = cliArgs.Password
+	}
+	if cfgArgs.ApiToken == nil {
+		cfgArgs.ApiToken = cliArgs.ApiToken
+	}
+	return cfgArgs
+}
+
+func loadConfig(path string) *args {
+	var args args
+
+	if !filepath.IsAbs(path) {
+		dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
+		if err != nil {
+			return &args
+		}
+		path = filepath.Join(dir, path)
+	}
+	file, err := os.ReadFile(path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return &args
+		}
+		fmt.Println("config file read failed, reason:" + err.Error())
+		return &args
+	}
+	if err = json.Unmarshal(file, &args); err != nil {
+		fmt.Println("config file parse failed, reason:" + err.Error())
+		return &args
+	}
+	fmt.Printf("config file loaded: %s\n", path)
+	return &args
+}

cmd/web/main.go

@@ -5,6 +5,7 @@ package main
 
 import (
 	"embed"
+	"fmt"
 	"github.com/GopeedLab/gopeed/cmd"
 	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"io/fs"
@@ -18,12 +19,28 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
+
+	args := parse()
+	var webBasicAuth *model.WebBasicAuth
+	if isNotBlank(args.Username) && isNotBlank(args.Password) {
+		webBasicAuth = &model.WebBasicAuth{
+			Username: *args.Username,
+			Password: *args.Password,
+		}
+	}
+
 	cfg := &model.StartConfig{
-		Network:   "tcp",
-		Address:   "0.0.0.0:9999",
-		Storage:   model.StorageBolt,
-		WebEnable: true,
-		WebFS:     sub,
+		Network:      "tcp",
+		Address:      fmt.Sprintf("%s:%d", *args.Address, *args.Port),
+		Storage:      model.StorageBolt,
+		ApiToken:     *args.ApiToken,
+		WebEnable:    true,
+		WebFS:        sub,
+		WebBasicAuth: webBasicAuth,
 	}
 	cmd.Start(cfg)
 }
+
+func isNotBlank(str *string) bool {
+	return str != nil && *str != ""
+}

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9
-	github.com/anacrolix/torrent v1.52.3
+	github.com/anacrolix/torrent v1.52.5
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
 	github.com/matoous/go-nanoid/v2 v2.0.0
@@ -13,8 +13,6 @@ require (
 	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
 )
 
-replace github.com/anacrolix/torrent => github.com/monkeyWie/torrent v1.52.5-alpha
-
 require (
 	crawshaw.io/sqlite v0.3.3-0.20220618202545-d1964889ea3c // indirect
 	github.com/RoaringBitmap/roaring v1.2.3 // indirect
@@ -24,7 +22,7 @@ require (
 	github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444 // indirect
 	github.com/anacrolix/envpprof v1.2.1 // indirect
 	github.com/anacrolix/generics v0.0.0-20230428105757-683593396d68 // indirect
-	github.com/anacrolix/go-libutp v1.2.0 // indirect
+	github.com/anacrolix/go-libutp v1.3.1 // indirect
 	github.com/anacrolix/log v0.14.0 // indirect
 	github.com/anacrolix/missinggo v1.3.0 // indirect
 	github.com/anacrolix/missinggo/perf v1.0.0 // indirect

go.sum

@@ -35,12 +35,12 @@ github.com/anacrolix/envpprof v1.2.1 h1:25TJe6t/i0AfzzldiGFKCpD+s+dk8lONBcacJZB2
 github.com/anacrolix/envpprof v1.2.1/go.mod h1:My7T5oSqVfEn4MD4Meczkw/f5lSIndGAKu/0SM/rkf4=
 github.com/anacrolix/generics v0.0.0-20230428105757-683593396d68 h1:fyXlBfnlFzZSFckJ8QLb2lfmWfY++4RiUnae7ZMuv0A=
 github.com/anacrolix/generics v0.0.0-20230428105757-683593396d68/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8=
-github.com/anacrolix/go-libutp v1.2.0 h1:sjxoB+/ARiKUR7IK/6wLWyADIBqGmu1fm0xo+8Yy7u0=
-github.com/anacrolix/go-libutp v1.2.0/go.mod h1:RrJ3KcaDcf9Jqp33YL5V/5CBEc6xMc7aJL8wXfuWL50=
+github.com/anacrolix/go-libutp v1.3.1 h1:idJzreNLl+hNjGC3ZnUOjujEaryeOGgkwHLqSGoige0=
+github.com/anacrolix/go-libutp v1.3.1/go.mod h1:heF41EC8kN0qCLMokLBVkB8NXiLwx3t8R8810MTNI5o=
 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.10.0/go.mod h1:s5yBP/j046fm9odtUTbHOfDUq/zh1W8OkPpJtnX0oQI=
 github.com/anacrolix/log v0.10.1-0.20220123034749-3920702c17f8/go.mod h1:GmnE2c0nvz8pOIPUSC9Rawgefy1sDXqposC2wgtBZE4=
+github.com/anacrolix/log v0.13.1/go.mod h1:D4+CvN8SnruK6zIFS/xPoRJmtvtnxs+CSfDQ+BFxZ68=
 github.com/anacrolix/log v0.14.0 h1:mYhTSemILe/Z8tIxbGdTIWWpPspI8W/fhZHpoFbDaL0=
 github.com/anacrolix/log v0.14.0/go.mod h1:1OmJESOtxQGNMlUO5rcv96Vpp9mfMqXXbe2RdinFLdY=
 github.com/anacrolix/lsan v0.0.0-20211126052245-807000409a62 h1:P04VG6Td13FHMgS5ZBcJX23NPC/fiC4cp9bXwYujdYM=
@@ -73,6 +73,8 @@ github.com/anacrolix/sync v0.4.0/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DC
 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.52.5 h1:jWowdx+EU6zFVfBwmnL0d3H4J6vTFEGOrHI35YdfIT8=
+github.com/anacrolix/torrent v1.52.5/go.mod h1:CcM8oPMYye5J42cSqJrmUpqwRFgSsJQ1jCEHwygqnqQ=
 github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 h1:QAVZ3pN/J4/UziniAhJR2OZ9Ox5kOY2053tBbbqUPYA=
 github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96/go.mod h1:Wa6n8cYIdaG35x15aH3Zy6d03f7P728QfdcDeD/IEOs=
 github.com/anacrolix/utp v0.1.0 h1:FOpQOmIwYsnENnz7tAGohA+r6iXpRjrq8ssKSre2Cp4=
@@ -210,8 +212,6 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/monkeyWie/torrent v1.52.5-alpha h1:JnGTtfwrnrxaMdpzDgHbzfLEnXhkmldnk0iyka+2Ntw=
-github.com/monkeyWie/torrent v1.52.5-alpha/go.mod h1:yBUcBuIOlttGEgAW/6gamzQGD+k2+wUh65fOPPzxvC4=
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
 github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
@@ -365,7 +365,6 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20180524181706-dfa909b99c79/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 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=
@@ -441,6 +440,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -448,6 +448,7 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U=
 golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

internal/protocol/bt/fetcher.go

@@ -1,6 +1,7 @@
 package bt
 
 import (
+	"bytes"
 	"github.com/GopeedLab/gopeed/internal/controller"
 	"github.com/GopeedLab/gopeed/internal/fetcher"
 	"github.com/GopeedLab/gopeed/pkg/base"
@@ -223,6 +224,15 @@ func (f *Fetcher) addTorrent(req *base.Request) (err error) {
 	schema := util.ParseSchema(req.URL)
 	if schema == "MAGNET" {
 		f.torrent, err = client.AddMagnet(req.URL)
+	} else if schema == "APPLICATION/X-BITTORRENT" {
+		_, data := util.ParseDataUri(req.URL)
+		buf := bytes.NewBuffer(data)
+		var metaInfo *metainfo.MetaInfo
+		metaInfo, err = metainfo.Load(buf)
+		if err != nil {
+			return err
+		}
+		f.torrent, err = client.AddTorrent(metaInfo)
 	} else {
 		f.torrent, err = client.AddTorrentFromFile(req.URL)
 	}
@@ -265,7 +275,7 @@ func (f *Fetcher) addTorrent(req *base.Request) (err error) {
 type FetcherBuilder struct {
 }
 
-var schemes = []string{"FILE", "MAGNET"}
+var schemes = []string{"FILE", "MAGNET", "APPLICATION/X-BITTORRENT"}
 
 func (fb *FetcherBuilder) Schemes() []string {
 	return schemes

internal/protocol/bt/fetcher_test.go

@@ -1,12 +1,14 @@
 package bt
 
 import (
+	"encoding/base64"
 	"encoding/json"
 	"github.com/GopeedLab/gopeed/internal/controller"
 	"github.com/GopeedLab/gopeed/internal/fetcher"
 	"github.com/GopeedLab/gopeed/internal/test"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/bt"
+	"os"
 	"reflect"
 	"testing"
 )
@@ -15,6 +17,39 @@ func TestFetcher_Resolve_Torrent(t *testing.T) {
 	doResolve(t, buildFetcher())
 }
 
+func TestFetcher_Resolve_DataUri_Torrent(t *testing.T) {
+	fetcher := buildFetcher()
+	buf, err := os.ReadFile("./testdata/ubuntu-22.04-live-server-amd64.iso.torrent")
+	if err != nil {
+		t.Fatal(err)
+	}
+	// convert to data uri
+	dataUri := "data:application/x-bittorrent;base64," + base64.StdEncoding.EncodeToString(buf)
+	err = fetcher.Resolve(&base.Request{
+		URL: dataUri,
+	})
+	if err != nil {
+		panic(err)
+	}
+
+	want := &base.Resource{
+		Name:    "ubuntu-22.04-live-server-amd64.iso",
+		Size:    1466714112,
+		Range:   true,
+		RootDir: "ubuntu-22.04-live-server-amd64.iso",
+		Files: []*base.FileInfo{
+			{
+				Name: "ubuntu-22.04-live-server-amd64.iso",
+				Size: 1466714112,
+			},
+		},
+		Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
+	}
+	if !reflect.DeepEqual(want, fetcher.Meta().Res) {
+		t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, want)
+	}
+}
+
 func TestFetcher_Config(t *testing.T) {
 	doResolve(t, buildConfigFetcher())
 }

internal/protocol/http/fetcher.go

@@ -17,7 +17,6 @@ import (
 	"os"
 	"path"
 	"strconv"
-	"time"
 )
 
 type RequestError struct {
@@ -85,13 +84,14 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 		return err
 	}
 	client := buildClient()
-	// 只访问一个字节，测试资源是否支持Range请求
+	// send Range request to check whether the server supports breakpoint continuation
+	// just test one byte, Range: bytes=0-0
 	httpReq.Header.Set(base.HttpHeaderRange, fmt.Sprintf(base.HttpHeaderRangeFormat, 0, 0))
 	httpResp, err := client.Do(httpReq)
 	if err != nil {
 		return err
 	}
-	// 拿到响应头就关闭，不用加defer
+	// close response body immediately
 	httpResp.Body.Close()
 	res := &base.Resource{
 		Range: false,
@@ -395,8 +395,7 @@ func buildClient() *http.Client {
 	// Cookie handle
 	jar, _ := cookiejar.New(nil)
 	return &http.Client{
-		Jar:     jar,
-		Timeout: time.Second * 60,
+		Jar: jar,
 	}
 }
 

pkg/download/downloader.go

@@ -47,8 +47,9 @@ type Downloader struct {
 	tasks         []*Task
 	listener      Listener
 
-	lock   *sync.Mutex
-	closed atomic.Bool
+	lock           *sync.Mutex
+	fetcherMapLock *sync.RWMutex
+	closed         atomic.Bool
 }
 
 func NewDownloader(cfg *DownloaderConfig) *Downloader {
@@ -63,8 +64,9 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
 		fetchBuilders: make(map[string]fetcher.FetcherBuilder),
 		fetcherMap:    make(map[string]fetcher.Fetcher),
 
-		storage: cfg.Storage,
-		lock:    &sync.Mutex{},
+		storage:        cfg.Storage,
+		lock:           &sync.Mutex{},
+		fetcherMapLock: &sync.RWMutex{},
 	}
 	for _, f := range cfg.FetchBuilders {
 		for _, p := range f.Schemes() {
@@ -169,9 +171,6 @@ func (d *Downloader) Setup() error {
 func (d *Downloader) parseFb(url string) (fetcher.FetcherBuilder, error) {
 	schema := util.ParseSchema(url)
 	fetchBuilder, ok := d.fetchBuilders[schema]
-	if !ok {
-		fetchBuilder, ok = d.fetchBuilders[util.FileSchema]
-	}
 	if ok {
 		return fetchBuilder, nil
 	}
@@ -201,7 +200,9 @@ func (d *Downloader) Resolve(req *base.Request) (rr *ResolveResult, err error) {
 	if err != nil {
 		return
 	}
+	d.fetcherMapLock.Lock()
 	d.fetcherMap[rrId] = fetcher
+	d.fetcherMapLock.Unlock()
 	rr = &ResolveResult{
 		ID:  rrId,
 		Res: fetcher.Meta().Res,
@@ -221,11 +222,17 @@ func (d *Downloader) Create(rrId string, opts *base.Options) (taskId string, err
 	if opts == nil {
 		opts = &base.Options{}
 	}
+	d.fetcherMapLock.RLock()
 	fetcher, ok := d.fetcherMap[rrId]
+	d.fetcherMapLock.RUnlock()
 	if !ok {
 		return "", errors.New("invalid resource id")
 	}
-	defer delete(d.fetcherMap, rrId)
+	defer func() {
+		d.fetcherMapLock.Lock()
+		delete(d.fetcherMap, rrId)
+		d.fetcherMapLock.Unlock()
+	}()
 
 	meta := fetcher.Meta()
 	meta.Opts = opts
@@ -521,7 +528,9 @@ func (d *Downloader) watch(task *Task) {
 		d.emit(EventKeyDone, task)
 	}
 	d.emit(EventKeyFinally, task, err)
-	d.notifyRunning()
+	if task.Status == EventKeyDone {
+		d.notifyRunning()
+	}
 }
 
 func (d *Downloader) restoreFetcher(task *Task) error {

pkg/rest/model/server.go

@@ -1,6 +1,9 @@
 package model
 
-import "io/fs"
+import (
+	"encoding/base64"
+	"io/fs"
+)
 
 type Storage string
 
@@ -17,8 +20,9 @@ type StartConfig struct {
 	StorageDir      string  `json:"storageDir"`
 	ApiToken        string  `json:"apiToken"`
 
-	WebEnable bool
-	WebFS     fs.FS
+	WebEnable    bool
+	WebFS        fs.FS
+	WebBasicAuth *WebBasicAuth
 }
 
 func (cfg *StartConfig) Init() *StartConfig {
@@ -39,3 +43,14 @@ func (cfg *StartConfig) Init() *StartConfig {
 	}
 	return cfg
 }
+
+type WebBasicAuth struct {
+	Username string
+	Password string
+}
+
+// Authorization returns the value of the Authorization header to be used in HTTP requests.
+func (cfg *WebBasicAuth) Authorization() string {
+	userId := cfg.Username + ":" + cfg.Password
+	return "Basic " + base64.StdEncoding.EncodeToString([]byte(userId))
+}

pkg/rest/server.go

@@ -98,14 +98,21 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 		r.PathPrefix("/").Handler(http.FileServer(http.FS(startCfg.WebFS)))
 	}
 
-	if startCfg.ApiToken != "" {
+	if startCfg.ApiToken != "" || (startCfg.WebEnable && startCfg.WebBasicAuth != nil) {
 		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 {
-					WriteJson(w, model.NewErrorResult("invalid token", model.CodeUnauthorized))
+				if startCfg.ApiToken != "" && r.Header.Get("X-Api-Token") == startCfg.ApiToken {
+					h.ServeHTTP(w, r)
 					return
 				}
-				h.ServeHTTP(w, r)
+				if startCfg.WebEnable && startCfg.WebBasicAuth != nil {
+					if r.Header.Get("Authorization") == startCfg.WebBasicAuth.Authorization() {
+						h.ServeHTTP(w, r)
+						return
+					}
+					w.Header().Set("WWW-Authenticate", "Basic realm=\"gopeed web\"")
+				}
+				WriteStatusJson(w, http.StatusUnauthorized, model.NewErrorResult("unauthorized", model.CodeUnauthorized))
 			})
 		})
 	}
@@ -127,7 +134,11 @@ func ReadJson(r *http.Request, w http.ResponseWriter, v any) bool {
 }
 
 func WriteJson(w http.ResponseWriter, v any) {
+	WriteStatusJson(w, http.StatusOK, v)
+}
+
+func WriteStatusJson(w http.ResponseWriter, statusCode int, v any) {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(http.StatusOK)
+	w.WriteHeader(statusCode)
 	json.NewEncoder(w).Encode(v)
 }

pkg/rest/server_test.go

@@ -273,7 +273,7 @@ func TestDoProxy(t *testing.T) {
 	})
 }
 
-func TestAuthorization(t *testing.T) {
+func TestApiToken(t *testing.T) {
 	var cfg = &model.StartConfig{}
 	cfg.Init()
 	cfg.ApiToken = "123456"
@@ -285,16 +285,57 @@ func TestAuthorization(t *testing.T) {
 		Stop()
 	}()
 
-	code, _ := doHttpRequest[any](http.MethodGet, "/api/v1/config", nil, nil)
-	checkCode(code, model.CodeUnauthorized)
+	status, _ := doHttpRequest0(http.MethodGet, "/api/v1/config", nil, nil)
+	if status != http.StatusUnauthorized {
+		t.Errorf("TestApiToken() got = %v, want %v", status, http.StatusUnauthorized)
+	}
 
-	code, _ = doHttpRequest[any](http.MethodGet, "/api/v1/config", map[string]string{
+	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
 		"X-Api-Token": cfg.ApiToken,
 	}, nil)
-	checkCode(code, model.CodeOk)
+	if status != http.StatusOK {
+		t.Errorf("TestApiToken() got = %v, want %v", status, http.StatusOK)
+	}
 
 }
 
+func TestAuthorization(t *testing.T) {
+	var cfg = &model.StartConfig{}
+	cfg.Init()
+	cfg.ApiToken = "123456"
+	cfg.WebEnable = true
+	cfg.WebBasicAuth = &model.WebBasicAuth{
+		Username: "admin",
+		Password: "123456",
+	}
+	fileListener := doStart(cfg)
+	defer func() {
+		if err := fileListener.Close(); err != nil {
+			panic(err)
+		}
+		Stop()
+	}()
+
+	status, _ := doHttpRequest0(http.MethodGet, "/api/v1/config", nil, nil)
+	if status != http.StatusUnauthorized {
+		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusUnauthorized)
+	}
+
+	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
+		"Authorization": cfg.WebBasicAuth.Authorization(),
+	}, nil)
+	if status != http.StatusOK {
+		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusOK)
+	}
+
+	status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
+		"X-Api-Token": cfg.ApiToken,
+	}, nil)
+	if status != http.StatusOK {
+		t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusOK)
+	}
+}
+
 func doTest(handler func()) {
 	testFunc := func(storage model.Storage) {
 		var cfg = &model.StartConfig{}

pkg/util/path.go

@@ -88,3 +88,13 @@ func CreateDirIfNotExist(dir string) error {
 	}
 	return nil
 }
+
+// IsExistsFile check file exists and is a file
+func IsExistsFile(path string) bool {
+	info, err := os.Stat(path)
+	// 判断路径是否存在，并且是一个文件
+	if err == nil && !info.IsDir() {
+		return true
+	}
+	return false
+}

pkg/util/path_test.go

@@ -199,3 +199,43 @@ func doCheckDuplicateAndRename(t *testing.T, exitsPaths []string, path string, e
 		t.Errorf("CheckDuplicateAndRename() = %v, want %v", got, except)
 	}
 }
+
+func TestIsExistsFile(t *testing.T) {
+	type args struct {
+		path string
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		{
+			name: "exist",
+			args: args{
+				path: "./path.go",
+			},
+			want: true,
+		},
+		{
+			name: "not exist",
+			args: args{
+				path: "./path_not_exist.go",
+			},
+			want: false,
+		},
+		{
+			name: "is dir",
+			args: args{
+				path: "../util",
+			},
+			want: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := IsExistsFile(tt.args.path); got != tt.want {
+				t.Errorf("IsExistsFile() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

pkg/util/url.go

@@ -1,13 +1,39 @@
 package util
 
-import "strings"
+import (
+	"encoding/base64"
+	"regexp"
+	"strings"
+)
 
 const FileSchema = "FILE"
 
 func ParseSchema(url string) string {
 	index := strings.Index(url, ":")
-	if index == -1 {
+	// if no schema or windows path like C:\a.txt, return FILE
+	if index == -1 || index == 1 {
 		return FileSchema
 	}
-	return strings.ToUpper(url[:index])
+	schema := url[:index]
+	if schema == "data" {
+		schema, _ = ParseDataUri(url)
+	}
+	return strings.ToUpper(schema)
+}
+
+// ParseDataUri parses a data URI and returns the MIME type and decode data.
+func ParseDataUri(uri string) (string, []byte) {
+	re := regexp.MustCompile(`^data:(.*);base64,(.*)$`)
+	matches := re.FindStringSubmatch(uri)
+	if len(matches) != 3 {
+		return "", nil
+	}
+	mime := matches[1]
+	base64Data := matches[2]
+	// 解码Base64数据
+	data, err := base64.StdEncoding.DecodeString(base64Data)
+	if err != nil {
+		return "", nil
+	}
+	return mime, data
 }

pkg/util/url_test.go

@@ -1,6 +1,10 @@
 package util
 
-import "testing"
+import (
+	"encoding/base64"
+	"reflect"
+	"testing"
+)
 
 func TestParseSchema(t *testing.T) {
 	type args struct {
@@ -35,7 +39,21 @@ func TestParseSchema(t *testing.T) {
 		{
 			name: "file-no-scheme",
 			args: args{
-				url: "/home/bt.torrent",
+				url: "./url.go",
+			},
+			want: "FILE",
+		},
+		{
+			name: "data-uri",
+			args: args{
+				url: "data:application/x-bittorrent;base64,test",
+			},
+			want: "APPLICATION/X-BITTORRENT",
+		},
+		{
+			name: "windows-path",
+			args: args{
+				url: "D:\\bt.torrent",
 			},
 			want: "FILE",
 		},
@@ -48,3 +66,65 @@ func TestParseSchema(t *testing.T) {
 		})
 	}
 }
+
+func TestParseDataUri(t *testing.T) {
+	type args struct {
+		uri string
+	}
+	type result struct {
+		mime string
+		data []byte
+	}
+
+	testData := []byte("test")
+	testData64 := base64.StdEncoding.EncodeToString(testData)
+
+	tests := []struct {
+		name string
+		args args
+		want result
+	}{
+		{
+			name: "success",
+			args: args{
+				uri: "data:application/x-bittorrent;base64," + testData64,
+			},
+			want: result{
+				mime: "application/x-bittorrent",
+				data: testData,
+			},
+		},
+		{
+			name: "fail-dirty-data",
+			args: args{
+				uri: "data::application/x-bittorrent;base64,!@$",
+			},
+			want: result{
+				mime: "",
+				data: nil,
+			},
+		},
+		{
+			name: "fail-miss-data",
+			args: args{
+				uri: ":application/x-bittorrent;base64," + testData64,
+			},
+			want: result{
+				mime: "",
+				data: nil,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			mime, data := ParseDataUri(tt.args.uri)
+			got := result{
+				mime: mime,
+				data: data,
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("ParseDataUri() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

ui/flutter/lib/app/modules/app/controllers/app_controller.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:ui' as ui;
 import 'dart:ui';
 
 import 'package:app_links/app_links.dart';

ui/flutter/lib/app/modules/create/controllers/create_controller.dart

@@ -1,3 +1,6 @@
+import 'dart:convert';
+import 'dart:typed_data';
+
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
@@ -10,6 +13,7 @@ class CreateController extends GetxController
   final isResolving = false.obs;
   final showAdvanced = false.obs;
   late TabController advancedTabController;
+  final fileDataUri = "".obs;
 
   @override
   void onInit() {
@@ -22,4 +26,13 @@ class CreateController extends GetxController
     advancedTabController.dispose();
     super.onClose();
   }
+
+  void setFileDataUri(Uint8List bytes) {
+    fileDataUri.value =
+        "data:application/x-bittorrent;base64,${base64.encode(bytes)}";
+  }
+
+  void clearFileDataUri() {
+    fileDataUri.value = "";
+  }
 }

ui/flutter/lib/app/modules/create/views/create_view.dart

@@ -51,8 +51,14 @@ class CreateView extends GetView<CreateController> {
         title: Text('create'.tr),
       ),
       body: DropTarget(
-        onDragDone: (details) {
-          _urlController.text = details.files[0].path;
+        onDragDone: (details) async {
+          if (!Util.isWeb()) {
+            _urlController.text = details.files[0].path;
+            return;
+          }
+          _urlController.text = details.files[0].name;
+          final bytes = await details.files[0].readAsBytes();
+          controller.setFileDataUri(bytes);
         },
         child: Padding(
             padding:
@@ -61,44 +67,54 @@ class CreateView extends GetView<CreateController> {
                 key: _resolveFormKey,
                 autovalidateMode: AutovalidateMode.onUserInteraction,
                 child: Column(children: [
-                  Row(
-                    children: [
-                      Expanded(
-                        child: TextFormField(
-                            autofocus: true,
-                            controller: _urlController,
-                            minLines: 1,
-                            maxLines: 5,
-                            decoration: InputDecoration(
-                              hintText: _hitText(),
-                              hintStyle: const TextStyle(fontSize: 12),
-                              labelText: 'downloadLink'.tr,
-                              icon: const Icon(Icons.link),
-                              suffixIcon: IconButton(
-                                onPressed: _urlController.clear,
-                                icon: const Icon(Icons.clear),
-                              ),
-                            ),
-                            validator: (v) {
-                              return v!.trim().isNotEmpty
-                                  ? null
-                                  : 'downloadLinkValid'.tr;
-                            }),
+                  Row(children: [
+                    Expanded(
+                      child: TextFormField(
+                        autofocus: true,
+                        controller: _urlController,
+                        minLines: 1,
+                        maxLines: 5,
+                        decoration: InputDecoration(
+                          hintText: _hitText(),
+                          hintStyle: const TextStyle(fontSize: 12),
+                          labelText: 'downloadLink'.tr,
+                          icon: const Icon(Icons.link),
+                          suffixIcon: IconButton(
+                            onPressed: () {
+                              _urlController.clear();
+                              controller.clearFileDataUri();
+                            },
+                            icon: const Icon(Icons.clear),
+                          ),
+                        ),
+                        validator: (v) {
+                          return v!.trim().isNotEmpty
+                              ? null
+                              : 'downloadLinkValid'.tr;
+                        },
+                        onChanged: (v) async {
+                          controller.clearFileDataUri();
+                        },
+                      ),
+                    ),
+                    IconButton(
+                        icon: const Icon(Icons.folder_open),
+                        onPressed: () async {
+                          var pr = await FilePicker.platform.pickFiles(
+                              type: FileType.custom,
+                              allowedExtensions: ["torrent"]);
+                          if (pr != null) {
+                            if (!Util.isWeb()) {
+                              _urlController.text = pr.files[0].path ?? "";
+                              return;
+                            }
+                            _urlController.text = pr.files[0].name;
+                            controller.setFileDataUri(pr.files[0].bytes!);
+                          }
+                        }),
+                  ]
+                      //.where((e) => e != null).map((e) => e!).toList(),
                       ),
-                      Util.isWeb()
-                          ? null
-                          : IconButton(
-                              icon: const Icon(Icons.folder_open),
-                              onPressed: () async {
-                                var pr = await FilePicker.platform.pickFiles(
-                                    type: FileType.custom,
-                                    allowedExtensions: ["torrent"]);
-                                if (pr != null) {
-                                  _urlController.text = pr.files[0].path ?? "";
-                                }
-                              }),
-                    ].where((e) => e != null).map((e) => e!).toList(),
-                  ),
                   Obx(() => Visibility(
                       visible: controller.showAdvanced.value,
                       child: Padding(
@@ -205,8 +221,11 @@ class CreateView extends GetView<CreateController> {
       _confirmController.start();
       if (_resolveFormKey.currentState!.validate()) {
         Object? extra;
+        final submitUrl = Util.isWeb() && controller.fileDataUri.isNotEmpty
+            ? controller.fileDataUri.value
+            : _urlController.text;
         if (controller.showAdvanced.value) {
-          final u = Uri.parse(_urlController.text);
+          final u = Uri.parse(submitUrl);
           if (u.scheme.startsWith("http")) {
             extra = ReqExtraHttp()
               ..header = {
@@ -220,7 +239,7 @@ class CreateView extends GetView<CreateController> {
           }
         }
         final rr = await resolve(Request(
-          url: _urlController.text,
+          url: submitUrl,
           extra: extra,
         ));
         await _showResolveDialog(rr);
@@ -235,7 +254,8 @@ class CreateView extends GetView<CreateController> {
 
   String _hitText() {
     return 'downloadLinkHit'.trParams({
-      'append': Util.isDesktop() ? 'downloadLinkHitDesktop'.tr : '',
+      'append':
+          Util.isDesktop() || Util.isWeb() ? 'downloadLinkHitDesktop'.tr : '',
     });
   }
 

ui/flutter/pubspec.lock

@@ -245,10 +245,10 @@ packages:
     dependency: "direct main"
     description:
       name: desktop_drop
-      sha256: "0cd056191b701a2b5ba040f2306349e461fafdaa5df4569b2228cdf87b58eced"
+      sha256: "4ca4d960f4b11c032e9adfd2a0a8ac615bc3fddb4cbe73dcf840dd8077582186"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.3"
+    version: "0.4.1"
   dio:
     dependency: "direct main"
     description:

ui/flutter/pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.3.7+1
+version: 1.3.10+1
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
@@ -48,7 +48,7 @@ dependencies:
   url_launcher: ^6.1.6
   shared_preferences: ^2.2.0
   logger: ^1.3.0
-  desktop_drop: ^0.3.3
+  desktop_drop: ^0.4.3
   package_info_plus: ^4.0.0
   fluent_ui: ^4.4.0
   path: any