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

This commit is contained in:
Levi authored and GitHub committed 2024-07-30 18:43:54 +08:00
1 parent 3b50465708
commit 4fbe13a1f0
22 files changed
+506 -320

No files matched your search

+1 -1
View File
@@ -13,7 +13,7 @@ on:
default: "false" default: "false"
env: env:
GO_VERSION: "1.21" GO_VERSION: "1.22"
FLUTTER_VERSION: "3.16.8" FLUTTER_VERSION: "3.16.8"
permissions: permissions:
+1 -1
View File
@@ -17,7 +17,7 @@ on:
- "Dockerfile" - "Dockerfile"
env: env:
GO_VERSION: "1.19" GO_VERSION: "1.22"
permissions: permissions:
contents: write contents: write
+1 -1
View File
@@ -27,7 +27,7 @@ on:
- "go.sum" - "go.sum"
env: env:
GO_VERSION: "1.21" GO_VERSION: "1.22"
FLUTTER_VERSION: "3.16.8" FLUTTER_VERSION: "3.16.8"
jobs: jobs:
+1 -1
View File
@@ -102,7 +102,7 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
### 環境 ### 環境
1. Go 言語 1.21+ 1. Go 言語 1.22+
2. Flutter 3.16+ 2. Flutter 3.16+
### クローン ### クローン
+1 -1
View File
@@ -110,7 +110,7 @@ Dự án này được chia thành hai phần, phần giao diện sử dụng `f
### Environment ### Environment
1. Golang 1.21+ 1. Golang 1.22+
2. Flutter 3.16+ 2. Flutter 3.16+
### Clone ### Clone
+1 -1
View File
@@ -114,7 +114,7 @@ Gopeed 还提供了浏览器扩展用于接管浏览器下载,支持 Chrome、
### 环境要求 ### 环境要求
1. Golang 1.21+ 1. Golang 1.22+
2. Flutter 3.16+ 2. Flutter 3.16+
### 克隆项目 ### 克隆项目
+1 -1
View File
@@ -110,7 +110,7 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
### 開發環境 ### 開發環境
1. Golang 1.21+ 1. Golang 1.22+
2. Flutter 3.16+ 2. Flutter 3.16+
### 克隆項目 ### 克隆項目
+15
View File
@@ -8,7 +8,9 @@ import (
"github.com/GopeedLab/gopeed/pkg/rest/model" "github.com/GopeedLab/gopeed/pkg/rest/model"
"net/http" "net/http"
"os" "os"
"os/signal"
"path/filepath" "path/filepath"
"syscall"
) )
//go:embed banner.txt //go:embed banner.txt
@@ -40,8 +42,21 @@ func Start(cfg *model.StartConfig) {
rest.Downloader.PutConfig(downloadCfg) rest.Downloader.PutConfig(downloadCfg)
} }
} }
watchExit()
fmt.Printf("Server start success on http://%s\n", listener.Addr().String()) fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed { if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
panic(err) panic(err)
} }
} }
func watchExit() {
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
go func() {
sig := <-sigs
fmt.Printf("Server is shutting down due to signal: %s\n", sig)
rest.Downloader.Close()
os.Exit(0)
}()
}
+54 -44
View File
@@ -1,10 +1,10 @@
module github.com/GopeedLab/gopeed module github.com/GopeedLab/gopeed
go 1.21 go 1.22
require ( require (
github.com/anacrolix/missinggo/v2 v2.7.3 github.com/anacrolix/missinggo/v2 v2.7.3
github.com/anacrolix/torrent v1.53.3 github.com/anacrolix/torrent v1.56.1
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
github.com/dop251/goja_nodejs v0.0.0-20231122114759-e84d9a924c5c github.com/dop251/goja_nodejs v0.0.0-20231122114759-e84d9a924c5c
@@ -17,37 +17,38 @@ require (
github.com/rs/zerolog v1.31.0 github.com/rs/zerolog v1.31.0
github.com/virtuald/go-paniclog v0.0.0-20190812204905-43a7fa316459 github.com/virtuald/go-paniclog v0.0.0-20190812204905-43a7fa316459
github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad
go.etcd.io/bbolt v1.3.8 go.etcd.io/bbolt v1.3.10
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
golang.org/x/sync v0.6.0 golang.org/x/sync v0.7.0
) )
require ( require (
dario.cat/mergo v1.0.0 // indirect dario.cat/mergo v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
github.com/RoaringBitmap/roaring v1.7.0 // indirect github.com/RoaringBitmap/roaring v1.9.4 // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 // indirect github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 // indirect
github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect
github.com/anacrolix/chansync v0.4.0 // indirect github.com/anacrolix/chansync v0.5.1 // indirect
github.com/anacrolix/dht/v2 v2.21.0 // indirect github.com/anacrolix/dht/v2 v2.21.1 // indirect
github.com/anacrolix/envpprof v1.3.0 // indirect github.com/anacrolix/envpprof v1.3.0 // indirect
github.com/anacrolix/generics v0.0.0-20230911070922-5dd7545c6b13 // indirect github.com/anacrolix/generics v0.0.2 // indirect
github.com/anacrolix/go-libutp v1.3.1 // indirect github.com/anacrolix/go-libutp v1.3.1 // indirect
github.com/anacrolix/log v0.14.6-0.20231202035202-ed7a02cad0b4 // indirect github.com/anacrolix/log v0.15.2 // indirect
github.com/anacrolix/missinggo v1.3.0 // indirect github.com/anacrolix/missinggo v1.3.0 // indirect
github.com/anacrolix/missinggo/perf v1.0.0 // indirect github.com/anacrolix/missinggo/perf v1.0.0 // indirect
github.com/anacrolix/mmsg v1.0.0 // indirect github.com/anacrolix/mmsg v1.0.0 // indirect
github.com/anacrolix/multiless v0.3.1-0.20221221005021-2d12701f83f7 // indirect github.com/anacrolix/multiless v0.3.1-0.20221221005021-2d12701f83f7 // indirect
github.com/anacrolix/stm v0.5.0 // indirect github.com/anacrolix/stm v0.5.0 // indirect
github.com/anacrolix/sync v0.5.1 // indirect github.com/anacrolix/sync v0.5.1 // indirect
github.com/anacrolix/upnp v0.1.3 // indirect github.com/anacrolix/upnp v0.1.4 // indirect
github.com/anacrolix/utp v0.2.0 // indirect github.com/anacrolix/utp v0.2.0 // indirect
github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect
github.com/benbjohnson/immutable v0.4.3 // indirect github.com/benbjohnson/immutable v0.4.3 // indirect
github.com/bits-and-blooms/bitset v1.13.0 // indirect github.com/bits-and-blooms/bitset v1.13.0 // indirect
github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cloudflare/circl v1.3.3 // indirect github.com/cloudflare/circl v1.3.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dlclark/regexp2 v1.10.0 // indirect github.com/dlclark/regexp2 v1.10.0 // indirect
@@ -58,61 +59,70 @@ require (
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.4.1 // indirect github.com/go-git/go-billy/v5 v5.4.1 // indirect
github.com/go-llsqlite/adapter v0.1.0 // indirect github.com/go-llsqlite/adapter v0.1.0 // indirect
github.com/go-llsqlite/crawshaw v0.5.0 // indirect github.com/go-llsqlite/crawshaw v0.5.3 // indirect
github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/btree v1.1.2 // indirect github.com/google/btree v1.1.2 // indirect
github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd // indirect
github.com/google/uuid v1.5.0 // indirect github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect github.com/gorilla/websocket v1.5.3 // indirect
github.com/huandu/xstrings v1.4.0 // indirect github.com/huandu/xstrings v1.5.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-isatty v0.0.20 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/mschoch/smat v0.2.0 // indirect github.com/mschoch/smat v0.2.0 // indirect
github.com/pion/datachannel v1.5.5 // indirect github.com/multiformats/go-multihash v0.2.3 // indirect
github.com/pion/dtls/v2 v2.2.9 // indirect github.com/multiformats/go-varint v0.0.7 // indirect
github.com/pion/ice/v2 v2.3.12 // indirect github.com/ncruces/go-strftime v0.1.9 // indirect
github.com/pion/interceptor v0.1.25 // indirect github.com/pion/datachannel v1.5.8 // indirect
github.com/pion/dtls/v2 v2.2.12 // indirect
github.com/pion/ice/v2 v2.3.31 // indirect
github.com/pion/interceptor v0.1.29 // indirect
github.com/pion/logging v0.2.2 // indirect github.com/pion/logging v0.2.2 // indirect
github.com/pion/mdns v0.0.9 // indirect github.com/pion/mdns v0.0.12 // indirect
github.com/pion/randutil v0.1.0 // indirect github.com/pion/randutil v0.1.0 // indirect
github.com/pion/rtcp v1.2.13 // indirect github.com/pion/rtcp v1.2.14 // indirect
github.com/pion/rtp v1.8.3 // indirect github.com/pion/rtp v1.8.7 // indirect
github.com/pion/sctp v1.8.9 // indirect github.com/pion/sctp v1.8.19 // indirect
github.com/pion/sdp/v3 v3.0.6 // indirect github.com/pion/sdp/v3 v3.0.9 // indirect
github.com/pion/srtp/v2 v2.0.18 // indirect github.com/pion/srtp/v2 v2.0.20 // indirect
github.com/pion/stun v0.6.1 // indirect github.com/pion/stun v0.6.1 // indirect
github.com/pion/transport/v2 v2.2.4 // indirect github.com/pion/transport/v2 v2.2.9 // indirect
github.com/pion/turn/v2 v2.1.4 // indirect github.com/pion/turn/v2 v2.1.6 // indirect
github.com/pion/webrtc/v3 v3.2.24 // indirect github.com/pion/webrtc/v3 v3.2.50 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 // indirect github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 // indirect
github.com/sergi/go-diff v1.1.0 // indirect github.com/sergi/go-diff v1.1.0 // indirect
github.com/skeema/knownhosts v1.2.0 // indirect github.com/skeema/knownhosts v1.2.0 // indirect
github.com/stretchr/testify v1.8.4 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/tidwall/btree v1.7.0 // indirect github.com/tidwall/btree v1.7.0 // indirect
github.com/wlynxg/anet v0.0.3 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect
go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect
golang.org/x/crypto v0.23.0 // indirect golang.org/x/crypto v0.25.0 // indirect
golang.org/x/mod v0.14.0 // indirect golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.25.0 // indirect golang.org/x/net v0.27.0 // indirect
golang.org/x/sys v0.20.0 // indirect golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.15.0 // indirect golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.17.0 // indirect golang.org/x/tools v0.23.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect
modernc.org/libc v1.40.6 // indirect lukechampine.com/blake3 v1.3.0 // indirect
modernc.org/libc v1.55.6 // indirect
modernc.org/mathutil v1.6.0 // indirect modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.7.2 // indirect modernc.org/memory v1.8.0 // indirect
modernc.org/sqlite v1.28.0 // indirect modernc.org/sqlite v1.31.1 // indirect
zombiezen.com/go/sqlite v1.1.0 // indirect zombiezen.com/go/sqlite v1.3.0 // indirect
) )
+137 -145
View File
File diff suppressed because it is too large. Load diff
+37 -4
View File
@@ -4,6 +4,7 @@ import (
"github.com/GopeedLab/gopeed/internal/controller" "github.com/GopeedLab/gopeed/internal/controller"
"github.com/GopeedLab/gopeed/pkg/base" "github.com/GopeedLab/gopeed/pkg/base"
"path" "path"
"strings"
) )
// Fetcher defines the interface for a download protocol. // 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 FilterType int
type FetcherBuilder interface {
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 return the name of the protocol.
Name() string Name() string
// Schemes returns the schemes supported by the fetcher. // Filters registers the supported schemes.
Schemes() []string Filters() []*SchemeFilter
// Build returns a new fetcher. // Build returns a new fetcher.
Build() Fetcher Build() Fetcher
@@ -86,6 +117,8 @@ type FetcherBuilder interface {
Store(fetcher Fetcher) (any, error) Store(fetcher Fetcher) (any, error)
// Restore fetcher // Restore fetcher
Restore() (v any, f func(meta *FetcherMeta, v any) Fetcher) Restore() (v any, f func(meta *FetcherMeta, v any) Fetcher)
// Close the fetcher manager, release resources.
Close() error
} }
type DefaultFetcher struct { type DefaultFetcher struct {
+97
View File
@@ -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)
}
})
}
}
+38 -11
View File
@@ -205,6 +205,9 @@ func (f *Fetcher) Wait() (err error) {
} }
func (f *Fetcher) isDone() bool { func (f *Fetcher) isDone() bool {
if f.meta.Opts == nil {
return false
}
for _, selectIndex := range f.meta.Opts.SelectFiles { for _, selectIndex := range f.meta.Opts.SelectFiles {
file := f.torrent.Files()[selectIndex] file := f.torrent.Files()[selectIndex]
if file.BytesCompleted() < file.Length() { if file.BytesCompleted() < file.Length() {
@@ -318,7 +321,7 @@ func (f *Fetcher) addTorrent(req *base.Request) (err error) {
schema := util.ParseSchema(req.URL) schema := util.ParseSchema(req.URL)
if schema == "MAGNET" { if schema == "MAGNET" {
f.torrent, err = client.AddMagnet(req.URL) f.torrent, err = client.AddMagnet(req.URL)
} else if schema == "APPLICATION/X-BITTORRENT" { } else if schema == "DATA" {
_, data := util.ParseDataUri(req.URL) _, data := util.ParseDataUri(req.URL)
buf := bytes.NewBuffer(data) buf := bytes.NewBuffer(data)
var metaInfo *metainfo.MetaInfo var metaInfo *metainfo.MetaInfo
@@ -379,24 +382,35 @@ type fetcherData struct {
SeedTime int64 SeedTime int64
} }
type FetcherBuilder struct { type FetcherManager struct {
} }
var schemes = []string{"FILE", "MAGNET", "APPLICATION/X-BITTORRENT"} func (fm *FetcherManager) Name() string {
func (fb *FetcherBuilder) Name() string {
return "bt" return "bt"
} }
func (fb *FetcherBuilder) Schemes() []string { func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
return schemes 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{} return &Fetcher{}
} }
func (fb *FetcherBuilder) DefaultConfig() any { func (fm *FetcherManager) DefaultConfig() any {
return &config{ return &config{
ListenPort: 0, ListenPort: 0,
Trackers: []string{}, 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) _f := f.(*Fetcher)
return _f.data, nil 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 &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
return &Fetcher{ return &Fetcher{
meta: meta, 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 // parse version to bep20 format, fixed length 4, if not enough, fill 0
func parseBep20() string { func parseBep20() string {
s := strings.ReplaceAll(base.Version, ".", "") s := strings.ReplaceAll(base.Version, ".", "")
+2 -2
View File
@@ -100,7 +100,7 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
} }
func buildFetcher() fetcher.Fetcher { func buildFetcher() fetcher.Fetcher {
fb := new(FetcherBuilder) fb := new(FetcherManager)
fetcher := fb.Build() fetcher := fb.Build()
newController := controller.NewController() newController := controller.NewController()
newController.GetConfig = func(v any) { newController.GetConfig = func(v any) {
@@ -111,7 +111,7 @@ func buildFetcher() fetcher.Fetcher {
} }
func buildConfigFetcher(proxyConfig *base.DownloaderProxyConfig) fetcher.Fetcher { func buildConfigFetcher(proxyConfig *base.DownloaderProxyConfig) fetcher.Fetcher {
fetcher := new(FetcherBuilder).Build() fetcher := new(FetcherManager).Build()
newController := controller.NewController() newController := controller.NewController()
mockCfg := config{ mockCfg := config{
Trackers: []string{ Trackers: []string{
+22 -11
View File
@@ -456,41 +456,48 @@ type fetcherData struct {
Chunks []*chunk Chunks []*chunk
} }
type FetcherBuilder struct { type FetcherManager struct {
} }
var schemes = []string{"HTTP", "HTTPS"} func (fm *FetcherManager) Name() string {
func (fb *FetcherBuilder) Name() string {
return "http" return "http"
} }
func (fb *FetcherBuilder) Schemes() []string { func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
return schemes 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{} return &Fetcher{}
} }
func (fb *FetcherBuilder) DefaultConfig() any { func (fm *FetcherManager) DefaultConfig() any {
return &config{ 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", 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, 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) _f := f.(*Fetcher)
return &fetcherData{ return &fetcherData{
Chunks: _f.chunks, Chunks: _f.chunks,
}, nil }, 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 &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
fd := v.(*fetcherData) fd := v.(*fetcherData)
fb := &FetcherBuilder{} fb := &FetcherManager{}
fetcher := fb.Build().(*Fetcher) fetcher := fb.Build().(*Fetcher)
fetcher.meta = meta fetcher.meta = meta
base.ParseReqExtra[fhttp.ReqExtra](fetcher.meta.Req) 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 return fetcher
} }
} }
func (fm *FetcherManager) Close() error {
return nil
}
+3 -3
View File
@@ -306,7 +306,7 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
fb := new(FetcherBuilder) fb := new(FetcherManager)
time.Sleep(time.Millisecond * 50) time.Sleep(time.Millisecond * 50)
data, err := fb.Store(fetcher) data, err := fb.Store(fetcher)
if err != nil { if err != nil {
@@ -359,7 +359,7 @@ func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t
} }
func buildFetcher() *Fetcher { func buildFetcher() *Fetcher {
fb := new(FetcherBuilder) fb := new(FetcherManager)
fetcher := fb.Build() fetcher := fb.Build()
newController := controller.NewController() newController := controller.NewController()
newController.GetConfig = func(v any) { newController.GetConfig = func(v any) {
@@ -370,7 +370,7 @@ func buildFetcher() *Fetcher {
} }
func buildConfigFetcher(cfg config) fetcher.Fetcher { func buildConfigFetcher(cfg config) fetcher.Fetcher {
fetcher := new(FetcherBuilder).Build() fetcher := new(FetcherManager).Build()
newController := controller.NewController() newController := controller.NewController()
newController.GetConfig = func(v any) { newController.GetConfig = func(v any) {
json.Unmarshal([]byte(test.ToJson(cfg)), v) json.Unmarshal([]byte(test.ToJson(cfg)), v)
+53 -44
View File
@@ -58,13 +58,12 @@ type Downloader struct {
Logger *logger.Logger Logger *logger.Logger
ExtensionLogger *logger.Logger ExtensionLogger *logger.Logger
cfg *DownloaderConfig cfg *DownloaderConfig
fetcherBuilders map[string]fetcher.FetcherBuilder fetcherCache map[string]fetcher.Fetcher
fetcherCache map[string]fetcher.Fetcher storage Storage
storage Storage tasks []*Task
tasks []*Task waitTasks []*Task
waitTasks []*Task listener Listener
listener Listener
lock *sync.Mutex lock *sync.Mutex
fetcherMapLock *sync.RWMutex fetcherMapLock *sync.RWMutex
@@ -81,11 +80,10 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
cfg.Init() cfg.Init()
d := &Downloader{ d := &Downloader{
cfg: cfg, cfg: cfg,
fetcherBuilders: make(map[string]fetcher.FetcherBuilder), fetcherCache: make(map[string]fetcher.Fetcher),
fetcherCache: make(map[string]fetcher.Fetcher), waitTasks: make([]*Task, 0),
waitTasks: make([]*Task, 0), storage: cfg.Storage,
storage: cfg.Storage,
lock: &sync.Mutex{}, lock: &sync.Mutex{},
fetcherMapLock: &sync.RWMutex{}, fetcherMapLock: &sync.RWMutex{},
@@ -93,11 +91,6 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
extensions: make([]*Extension, 0), extensions: make([]*Extension, 0),
} }
for _, f := range cfg.FetchBuilders {
for _, p := range f.Schemes() {
d.fetcherBuilders[strings.ToUpper(p)] = f
}
}
zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
d.Logger = logger.NewLogger(cfg.ProductionMode, filepath.Join(cfg.StorageDir, "logs", "core.log")) d.Logger = logger.NewLogger(cfg.ProductionMode, filepath.Join(cfg.StorageDir, "logs", "core.log"))
@@ -129,10 +122,10 @@ func (d *Downloader) Setup() error {
// init default config // init default config
d.cfg.DownloaderStoreConfig.Init() d.cfg.DownloaderStoreConfig.Init()
// init protocol config, if not exist, use default config // init protocol config, if not exist, use default config
for _, fb := range d.fetcherBuilders { for _, fm := range d.cfg.FetchManagers {
protocol := fb.Name() protocol := fm.Name()
if _, ok := d.cfg.DownloaderStoreConfig.ProtocolConfig[protocol]; !ok { if _, ok := d.cfg.DownloaderStoreConfig.ProtocolConfig[protocol]; !ok {
d.cfg.DownloaderStoreConfig.ProtocolConfig[protocol] = fb.DefaultConfig() d.cfg.DownloaderStoreConfig.ProtocolConfig[protocol] = fm.DefaultConfig()
} }
} }
@@ -209,19 +202,19 @@ func (d *Downloader) Setup() error {
tick := float64(d.cfg.RefreshInterval) / 1000 tick := float64(d.cfg.RefreshInterval) / 1000
if task.Status == base.DownloadStatusRunning { if task.Status == base.DownloadStatusRunning {
task.Progress.Used = task.timer.Used() task.Progress.Used = task.timer.Used()
task.Progress.Speed = task.calcSpeed(current-task.Progress.Downloaded, tick) task.Progress.Speed = task.calcSpeed(task.speedArr, current-task.Progress.Downloaded, tick)
task.Progress.Downloaded = current task.Progress.Downloaded = current
} }
if task.Uploading { if task.Uploading {
uploader := task.fetcher.(fetcher.Uploader) uploader := task.fetcher.(fetcher.Uploader)
currentUploaded := uploader.UploadedBytes() currentUploaded := uploader.UploadedBytes()
task.Progress.UploadSpeed = task.calcSpeed(currentUploaded-task.Progress.Uploaded, tick) task.Progress.UploadSpeed = task.calcSpeed(task.uploadSpeedArr, currentUploaded-task.Progress.Uploaded, tick)
task.Progress.Uploaded = currentUploaded task.Progress.Uploaded = currentUploaded
} }
d.emit(EventKeyProgress, task) d.emit(EventKeyProgress, task)
// store fetcher progress // store fetcher progress
data, err := task.fetcherBuilder.Store(task.fetcher) data, err := task.fetcherManager.Store(task.fetcher)
if err != nil { if err != nil {
d.Logger.Error().Stack().Err(err).Msgf("serialize fetcher failed: %s", task.ID) d.Logger.Error().Stack().Err(err).Msgf("serialize fetcher failed: %s", task.ID)
return return
@@ -243,19 +236,21 @@ func (d *Downloader) Setup() error {
return nil return nil
} }
func (d *Downloader) parseFb(url string) (fetcher.FetcherBuilder, error) { func (d *Downloader) parseFm(url string) (fetcher.FetcherManager, error) {
schema := util.ParseSchema(url) for _, fm := range d.cfg.FetchManagers {
fetchBuilder, ok := d.fetcherBuilders[schema] for _, filter := range fm.Filters() {
if ok { if filter.Match(url) {
return fetchBuilder, nil return fm, nil
}
}
} }
return nil, ErrUnSupportedProtocol return nil, ErrUnSupportedProtocol
} }
func (d *Downloader) setupFetcher(fb fetcher.FetcherBuilder, fetcher fetcher.Fetcher) { func (d *Downloader) setupFetcher(fm fetcher.FetcherManager, fetcher fetcher.Fetcher) {
ctl := controller.NewController() ctl := controller.NewController()
ctl.GetConfig = func(v any) { ctl.GetConfig = func(v any) {
d.getProtocolConfig(fb.Name(), v) d.getProtocolConfig(fm.Name(), v)
} }
ctl.ProxyConfig = d.cfg.Proxy ctl.ProxyConfig = d.cfg.Proxy
fetcher.Setup(ctl) fetcher.Setup(ctl)
@@ -580,10 +575,23 @@ func (d *Downloader) doDelete(task *Task, force bool) (err error) {
func (d *Downloader) Close() error { func (d *Downloader) Close() error {
d.closed.Store(true) d.closed.Store(true)
if err := d.PauseAll(); err != nil {
return err closeArr := []func() error{
d.PauseAll,
d.storage.Close,
} }
return d.storage.Close() for _, fm := range d.cfg.FetchManagers {
closeArr = append(closeArr, fm.Close)
}
// Make sure all resources are released, if had error, return the last error
var lastErr error
for i, close := range closeArr {
if err := close(); err != nil {
lastErr = err
d.Logger.Error().Stack().Err(err).Msgf("downloader close failed, index: %d", i)
}
}
return lastErr
} }
func (d *Downloader) Clear() error { func (d *Downloader) Clear() error {
@@ -753,13 +761,13 @@ func (d *Downloader) doOnError(task *Task, err error) {
func (d *Downloader) restoreFetcher(task *Task) error { func (d *Downloader) restoreFetcher(task *Task) error {
if task.fetcher == nil { if task.fetcher == nil {
fb, err := d.parseFb(task.Meta.Req.URL) fm, err := d.parseFm(task.Meta.Req.URL)
if err != nil { if err != nil {
return err return err
} }
task.fetcherBuilder = fb task.fetcherManager = fm
err = func() error { err = func() error {
v, f := fb.Restore() v, f := fm.Restore()
if v != nil { if v != nil {
err := d.storage.Pop(bucketSave, task.ID, v) err := d.storage.Pop(bucketSave, task.ID, v)
if err != nil { if err != nil {
@@ -773,9 +781,9 @@ func (d *Downloader) restoreFetcher(task *Task) error {
d.Logger.Error().Stack().Err(err).Msgf("deserialize fetcher failed, task id: %s", task.ID) d.Logger.Error().Stack().Err(err).Msgf("deserialize fetcher failed, task id: %s", task.ID)
} }
if task.fetcher == nil { if task.fetcher == nil {
task.fetcher = fb.Build() task.fetcher = fm.Build()
} }
d.setupFetcher(fb, task.fetcher) d.setupFetcher(fm, task.fetcher)
if task.fetcher.Meta().Req == nil { if task.fetcher.Meta().Req == nil {
task.fetcher.Meta().Req = task.Meta.Req task.fetcher.Meta().Req = task.Meta.Req
} }
@@ -808,15 +816,15 @@ func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options) (taskId str
opts.Path = storeConfig.DownloadDir opts.Path = storeConfig.DownloadDir
} }
fb, err := d.parseFb(f.Meta().Req.URL) fm, err := d.parseFm(f.Meta().Req.URL)
if err != nil { if err != nil {
return return
} }
task := NewTask() task := NewTask()
task.fetcherBuilder = fb task.fetcherManager = fm
task.fetcher = f task.fetcher = f
task.Protocol = fb.Name() task.Protocol = fm.Name()
task.Meta = f.Meta() task.Meta = f.Meta()
task.Progress = &Progress{} task.Progress = &Progress{}
_, task.Uploading = f.(fetcher.Uploader) _, task.Uploading = f.(fetcher.Uploader)
@@ -997,12 +1005,12 @@ func logPanic(logDir string) {
} }
func (d *Downloader) buildFetcher(url string) (fetcher.Fetcher, error) { func (d *Downloader) buildFetcher(url string) (fetcher.Fetcher, error) {
fb, err := d.parseFb(url) fm, err := d.parseFm(url)
if err != nil { if err != nil {
return nil, err return nil, err
} }
fetcher := fb.Build() fetcher := fm.Build()
d.setupFetcher(fb, fetcher) d.setupFetcher(fm, fetcher)
return fetcher, nil return fetcher, nil
} }
@@ -1012,6 +1020,7 @@ func initTask(task *Task) {
task.statusLock = &sync.Mutex{} task.statusLock = &sync.Mutex{}
task.lock = &sync.Mutex{} task.lock = &sync.Mutex{}
task.speedArr = make([]int64, 0) task.speedArr = make([]int64, 0)
task.uploadSpeedArr = make([]int64, 0)
} }
var defaultDownloader = NewDownloader(nil) var defaultDownloader = NewDownloader(nil)
+13 -12
View File
@@ -27,12 +27,13 @@ type Task struct {
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"` UpdatedAt time.Time `json:"updatedAt"`
fetcherBuilder fetcher.FetcherBuilder fetcherManager fetcher.FetcherManager
fetcher fetcher.Fetcher fetcher fetcher.Fetcher
timer *util.Timer timer *util.Timer
statusLock *sync.Mutex statusLock *sync.Mutex
lock *sync.Mutex lock *sync.Mutex
speedArr []int64 speedArr []int64
uploadSpeedArr []int64
} }
func NewTask() *Task { func NewTask() *Task {
@@ -66,21 +67,21 @@ func (t *Task) clone() *Task {
} }
} }
func (t *Task) calcSpeed(downloaded int64, usedTime float64) int64 { func (t *Task) calcSpeed(speedArr []int64, downloaded int64, usedTime float64) int64 {
t.speedArr = append(t.speedArr, downloaded) speedArr = append(speedArr, downloaded)
if len(t.speedArr) > 6 { if len(speedArr) > 6 {
t.speedArr = t.speedArr[1:] speedArr = speedArr[1:]
} }
var total int64 var total int64
for _, v := range t.speedArr { for _, v := range speedArr {
total += v total += v
} }
return int64(float64(total) / float64(len(t.speedArr)) / usedTime) return int64(float64(total) / float64(len(speedArr)) / usedTime)
} }
type DownloaderConfig struct { type DownloaderConfig struct {
Controller *controller.Controller Controller *controller.Controller
FetchBuilders []fetcher.FetcherBuilder FetchManagers []fetcher.FetcherManager
RefreshInterval int `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms) RefreshInterval int `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms)
Storage Storage Storage Storage
@@ -95,10 +96,10 @@ func (cfg *DownloaderConfig) Init() *DownloaderConfig {
if cfg.Controller == nil { if cfg.Controller == nil {
cfg.Controller = controller.NewController() cfg.Controller = controller.NewController()
} }
if len(cfg.FetchBuilders) == 0 { if len(cfg.FetchManagers) == 0 {
cfg.FetchBuilders = []fetcher.FetcherBuilder{ cfg.FetchManagers = []fetcher.FetcherManager{
new(http.FetcherBuilder), new(http.FetcherManager),
new(bt.FetcherBuilder), new(bt.FetcherManager),
} }
} }
if cfg.RefreshInterval == 0 { if cfg.RefreshInterval == 0 {
+1 -7
View File
@@ -8,18 +8,13 @@ import (
"strings" "strings"
) )
const FileSchema = "FILE"
func ParseSchema(url string) string { func ParseSchema(url string) string {
index := strings.Index(url, ":") index := strings.Index(url, ":")
// if no schema or windows path like C:\a.txt, return FILE // if no schema or windows path like C:\a.txt, return FILE
if index == -1 || index == 1 { if index == -1 || index == 1 {
return FileSchema return ""
} }
schema := url[:index] schema := url[:index]
if schema == "data" {
schema, _ = ParseDataUri(url)
}
return strings.ToUpper(schema) return strings.ToUpper(schema)
} }
@@ -32,7 +27,6 @@ func ParseDataUri(uri string) (string, []byte) {
} }
mime := matches[1] mime := matches[1]
base64Data := matches[2] base64Data := matches[2]
// 解码Base64数据
data, err := base64.StdEncoding.DecodeString(base64Data) data, err := base64.StdEncoding.DecodeString(base64Data)
if err != nil { if err != nil {
return "", nil return "", nil
+3 -3
View File
@@ -41,21 +41,21 @@ func TestParseSchema(t *testing.T) {
args: args{ args: args{
url: "./url.go", url: "./url.go",
}, },
want: "FILE", want: "",
}, },
{ {
name: "data-uri", name: "data-uri",
args: args{ args: args{
url: "data:application/x-bittorrent;base64,test", url: "data:application/x-bittorrent;base64,test",
}, },
want: "APPLICATION/X-BITTORRENT", want: "DATA",
}, },
{ {
name: "windows-path", name: "windows-path",
args: args{ args: args{
url: "D:\\bt.torrent", url: "D:\\bt.torrent",
}, },
want: "FILE", want: "",
}, },
} }
for _, tt := range tests { for _, tt := range tests {
@@ -17,6 +17,7 @@ import 'package:window_manager/window_manager.dart';
import '../../../../api/api.dart'; import '../../../../api/api.dart';
import '../../../../api/model/downloader_config.dart'; import '../../../../api/model/downloader_config.dart';
import '../../../../core/common/start_config.dart'; import '../../../../core/common/start_config.dart';
import '../../../../core/libgopeed_boot.dart';
import '../../../../database/database.dart'; import '../../../../database/database.dart';
import '../../../../database/entity.dart'; import '../../../../database/entity.dart';
import '../../../../i18n/message.dart'; import '../../../../i18n/message.dart';
@@ -110,6 +111,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
void onClose() { void onClose() {
_linkSubscription?.cancel(); _linkSubscription?.cancel();
trayManager.removeListener(this); trayManager.removeListener(this);
LibgopeedBoot.instance.stop();
} }
@override @override
@@ -240,7 +242,14 @@ class AppController extends GetxController with WindowListener, TrayListener {
MenuItem.separator(), MenuItem.separator(),
MenuItem( MenuItem(
label: 'exit'.tr, label: 'exit'.tr,
onClick: (menuItem) => {windowManager.destroy()}, onClick: (menuItem) async {
try {
await LibgopeedBoot.instance.stop();
} catch (e) {
logger.w("libgopeed stop fail", e);
}
windowManager.destroy();
},
), ),
]); ]);
if (!Util.isLinux()) { if (!Util.isLinux()) {
@@ -1,7 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:ffi'; import 'dart:ffi';
import 'dart:io'; import 'dart:io';
import 'dart:isolate';
import '../../util/util.dart'; import '../../util/util.dart';
import '../common/libgopeed_channel.dart'; import '../common/libgopeed_channel.dart';
@@ -17,7 +16,19 @@ class LibgopeedBootNative implements LibgopeedBoot {
late LibgopeedInterface _libgopeed; late LibgopeedInterface _libgopeed;
LibgopeedBootNative() { LibgopeedBootNative() {
if (!Util.isDesktop()) { if (Util.isDesktop()) {
var libName = "libgopeed.";
if (Platform.isWindows) {
libName += "dll";
}
if (Platform.isMacOS) {
libName += "dylib";
}
if (Platform.isLinux) {
libName += "so";
}
_libgopeed = LibgopeedFFi(LibgopeedBind(DynamicLibrary.open(libName)));
} else {
_libgopeed = LibgopeedChannel(); _libgopeed = LibgopeedChannel();
} }
} }
@@ -27,8 +38,7 @@ class LibgopeedBootNative implements LibgopeedBoot {
cfg.storage = 'bolt'; cfg.storage = 'bolt';
cfg.storageDir = Util.getStorageDir(); cfg.storageDir = Util.getStorageDir();
cfg.refreshInterval = 0; cfg.refreshInterval = 0;
var port = var port = await _libgopeed.start(cfg);
Util.isDesktop() ? await _ffiStart(cfg) : await _libgopeed.start(cfg);
return port; return port;
} }
@@ -36,26 +46,4 @@ class LibgopeedBootNative implements LibgopeedBoot {
Future<void> stop() async { Future<void> stop() async {
await _libgopeed.stop(); await _libgopeed.stop();
} }
_ffiInit() {
var libName = "libgopeed.";
if (Platform.isWindows) {
libName += "dll";
}
if (Platform.isMacOS) {
libName += "dylib";
}
if (Platform.isLinux) {
libName += "so";
}
_libgopeed = LibgopeedFFi(LibgopeedBind(DynamicLibrary.open(libName)));
}
// FFI run in isolate
Future<int> _ffiStart(StartConfig cfg) async {
return await Isolate.run(() async {
_ffiInit();
return await _libgopeed.start(cfg);
});
}
} }