fix: clear UPNP port mapping when exist app (#624)

internal/fetcher/fetcher.go

@@ -4,6 +4,7 @@ import (
 	"github.com/GopeedLab/gopeed/internal/controller"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"path"
+	"strings"
 )
 
 // Fetcher defines the interface for a download protocol.
@@ -71,12 +72,42 @@ func (m *FetcherMeta) RootDirPath() string {
 	}
 }
 
-// FetcherBuilder defines the interface for a fetcher builder.
-type FetcherBuilder interface {
+type FilterType int
+
+const (
+	// FilterTypeUrl url type, pattern is the scheme, e.g. http://github.com -> http
+	FilterTypeUrl FilterType = iota
+	// FilterTypeFile file type, pattern is the file extension name, e.g. test.torrent -> torrent
+	FilterTypeFile
+	// FilterTypeBase64 base64 data type, pattern is the data mime type, e.g. data:application/x-bittorrent;base64 -> application/x-bittorrent
+	FilterTypeBase64
+)
+
+type SchemeFilter struct {
+	Type    FilterType
+	Pattern string
+}
+
+func (s *SchemeFilter) Match(uri string) bool {
+	uriUpper := strings.ToUpper(uri)
+	patternUpper := strings.ToUpper(s.Pattern)
+	switch s.Type {
+	case FilterTypeUrl:
+		return strings.HasPrefix(uriUpper, patternUpper+":")
+	case FilterTypeFile:
+		return strings.HasSuffix(uriUpper, "."+patternUpper)
+	case FilterTypeBase64:
+		return strings.HasPrefix(uriUpper, "DATA:"+patternUpper+";BASE64,")
+	}
+	return false
+}
+
+// FetcherManager manage and control the fetcher
+type FetcherManager interface {
 	// Name return the name of the protocol.
 	Name() string
-	// Schemes returns the schemes supported by the fetcher.
-	Schemes() []string
+	// Filters registers the supported schemes.
+	Filters() []*SchemeFilter
 	// Build returns a new fetcher.
 	Build() Fetcher
 
@@ -86,6 +117,8 @@ type FetcherBuilder interface {
 	Store(fetcher Fetcher) (any, error)
 	// Restore fetcher
 	Restore() (v any, f func(meta *FetcherMeta, v any) Fetcher)
+	// Close the fetcher manager, release resources.
+	Close() error
 }
 
 type DefaultFetcher struct {

internal/fetcher/fetcher_test.go

@@ -0,0 +1,97 @@
+package fetcher
+
+import "testing"
+
+func TestSchemeFilter_Match(t *testing.T) {
+	type fields struct {
+		Type    FilterType
+		Pattern string
+	}
+	type args struct {
+		uri string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+		want   bool
+	}{
+		{
+			name: "url match",
+			fields: fields{
+				Type:    FilterTypeUrl,
+				Pattern: "https",
+			},
+			args: args{
+				uri: "https://github.com",
+			},
+			want: true,
+		},
+		{
+			name: "url not match",
+			fields: fields{
+				Type:    FilterTypeUrl,
+				Pattern: "https",
+			},
+			args: args{
+				uri: "ftp://github.com",
+			},
+			want: false,
+		},
+		{
+			name: "file match",
+			fields: fields{
+				Type:    FilterTypeFile,
+				Pattern: "torrent",
+			},
+			args: args{
+				uri: "d:/temp/test.torrent",
+			},
+			want: true,
+		},
+		{
+			name: "file not match",
+			fields: fields{
+				Type:    FilterTypeFile,
+				Pattern: "torrent",
+			},
+			args: args{
+				uri: "d:/temp/test.txt",
+			},
+			want: false,
+		},
+		{
+			name: "base64 match",
+			fields: fields{
+				Type:    FilterTypeBase64,
+				Pattern: "application/x-bittorrent",
+			},
+			args: args{
+				uri: "data:application/x-bittorrent;base64,xxx",
+			},
+			want: true,
+		},
+		{
+			name: "base64 not match",
+			fields: fields{
+				Type:    FilterTypeBase64,
+				Pattern: "application/x-bittorrent",
+			},
+			args: args{
+				uri: "data:application/javascript;base64,xxx",
+			},
+			want: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := &SchemeFilter{
+				Type:    tt.fields.Type,
+				Pattern: tt.fields.Pattern,
+			}
+			if got := s.Match(tt.args.uri); got != tt.want {
+				t.Errorf("Match() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

internal/protocol/bt/fetcher.go

@@ -205,6 +205,9 @@ func (f *Fetcher) Wait() (err error) {
 }
 
 func (f *Fetcher) isDone() bool {
+	if f.meta.Opts == nil {
+		return false
+	}
 	for _, selectIndex := range f.meta.Opts.SelectFiles {
 		file := f.torrent.Files()[selectIndex]
 		if file.BytesCompleted() < file.Length() {
@@ -318,7 +321,7 @@ 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" {
+	} else if schema == "DATA" {
 		_, data := util.ParseDataUri(req.URL)
 		buf := bytes.NewBuffer(data)
 		var metaInfo *metainfo.MetaInfo
@@ -379,24 +382,35 @@ type fetcherData struct {
 	SeedTime int64
 }
 
-type FetcherBuilder struct {
+type FetcherManager struct {
 }
 
-var schemes = []string{"FILE", "MAGNET", "APPLICATION/X-BITTORRENT"}
-
-func (fb *FetcherBuilder) Name() string {
+func (fm *FetcherManager) Name() string {
 	return "bt"
 }
 
-func (fb *FetcherBuilder) Schemes() []string {
-	return schemes
+func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
+	return []*fetcher.SchemeFilter{
+		{
+			Type:    fetcher.FilterTypeUrl,
+			Pattern: "MAGNET",
+		},
+		{
+			Type:    fetcher.FilterTypeFile,
+			Pattern: "TORRENT",
+		},
+		{
+			Type:    fetcher.FilterTypeBase64,
+			Pattern: "APPLICATION/X-BITTORRENT",
+		},
+	}
 }
 
-func (fb *FetcherBuilder) Build() fetcher.Fetcher {
+func (fm *FetcherManager) Build() fetcher.Fetcher {
 	return &Fetcher{}
 }
 
-func (fb *FetcherBuilder) DefaultConfig() any {
+func (fm *FetcherManager) DefaultConfig() any {
 	return &config{
 		ListenPort: 0,
 		Trackers:   []string{},
@@ -406,12 +420,12 @@ func (fb *FetcherBuilder) DefaultConfig() any {
 	}
 }
 
-func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
+func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
 	_f := f.(*Fetcher)
 	return _f.data, nil
 }
 
-func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
+func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
 	return &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
 		return &Fetcher{
 			meta: meta,
@@ -420,6 +434,19 @@ func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v
 	}
 }
 
+func (fm *FetcherManager) Close() error {
+	lock.Lock()
+	defer lock.Unlock()
+
+	if client != nil {
+		errs := client.Close()
+		if len(errs) > 0 {
+			return errs[0]
+		}
+	}
+	return nil
+}
+
 // parse version to bep20 format, fixed length 4, if not enough, fill 0
 func parseBep20() string {
 	s := strings.ReplaceAll(base.Version, ".", "")

internal/protocol/bt/fetcher_test.go

@@ -100,7 +100,7 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 }
 
 func buildFetcher() fetcher.Fetcher {
-	fb := new(FetcherBuilder)
+	fb := new(FetcherManager)
 	fetcher := fb.Build()
 	newController := controller.NewController()
 	newController.GetConfig = func(v any) {
@@ -111,7 +111,7 @@ func buildFetcher() fetcher.Fetcher {
 }
 
 func buildConfigFetcher(proxyConfig *base.DownloaderProxyConfig) fetcher.Fetcher {
-	fetcher := new(FetcherBuilder).Build()
+	fetcher := new(FetcherManager).Build()
 	newController := controller.NewController()
 	mockCfg := config{
 		Trackers: []string{

internal/protocol/http/fetcher.go

@@ -456,41 +456,48 @@ type fetcherData struct {
 	Chunks []*chunk
 }
 
-type FetcherBuilder struct {
+type FetcherManager struct {
 }
 
-var schemes = []string{"HTTP", "HTTPS"}
-
-func (fb *FetcherBuilder) Name() string {
+func (fm *FetcherManager) Name() string {
 	return "http"
 }
 
-func (fb *FetcherBuilder) Schemes() []string {
-	return schemes
+func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
+	return []*fetcher.SchemeFilter{
+		{
+			Type:    fetcher.FilterTypeUrl,
+			Pattern: "HTTP",
+		},
+		{
+			Type:    fetcher.FilterTypeUrl,
+			Pattern: "HTTPS",
+		},
+	}
 }
 
-func (fb *FetcherBuilder) Build() fetcher.Fetcher {
+func (fm *FetcherManager) Build() fetcher.Fetcher {
 	return &Fetcher{}
 }
 
-func (fb *FetcherBuilder) DefaultConfig() any {
+func (fm *FetcherManager) DefaultConfig() any {
 	return &config{
 		UserAgent:   "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
 		Connections: 16,
 	}
 }
 
-func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
+func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
 	_f := f.(*Fetcher)
 	return &fetcherData{
 		Chunks: _f.chunks,
 	}, nil
 }
 
-func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
+func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
 	return &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
 		fd := v.(*fetcherData)
-		fb := &FetcherBuilder{}
+		fb := &FetcherManager{}
 		fetcher := fb.Build().(*Fetcher)
 		fetcher.meta = meta
 		base.ParseReqExtra[fhttp.ReqExtra](fetcher.meta.Req)
@@ -501,3 +508,7 @@ func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v
 		return fetcher
 	}
 }
+
+func (fm *FetcherManager) Close() error {
+	return nil
+}

internal/protocol/http/fetcher_test.go

@@ -306,7 +306,7 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
 		t.Fatal(err)
 	}
 
-	fb := new(FetcherBuilder)
+	fb := new(FetcherManager)
 	time.Sleep(time.Millisecond * 50)
 	data, err := fb.Store(fetcher)
 	if err != nil {
@@ -359,7 +359,7 @@ func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t
 }
 
 func buildFetcher() *Fetcher {
-	fb := new(FetcherBuilder)
+	fb := new(FetcherManager)
 	fetcher := fb.Build()
 	newController := controller.NewController()
 	newController.GetConfig = func(v any) {
@@ -370,7 +370,7 @@ func buildFetcher() *Fetcher {
 }
 
 func buildConfigFetcher(cfg config) fetcher.Fetcher {
-	fetcher := new(FetcherBuilder).Build()
+	fetcher := new(FetcherManager).Build()
 	newController := controller.NewController()
 	newController.GetConfig = func(v any) {
 		json.Unmarshal([]byte(test.ToJson(cfg)), v)