mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-19 14:53:44 +00:00
Compare commits
21
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
76bec67ab2 | ||
|
|
a2a9e3dc2a | ||
|
|
9a5680fb45 | ||
|
|
75a8a3a9ac | ||
|
|
3e8c85b945 | ||
|
|
90f70d1bf6 | ||
|
|
20a70d7f91 | ||
|
|
d33546a4b5 | ||
|
|
93614d46a8 | ||
|
|
04b0e691eb | ||
|
|
7f08fa0b23 | ||
|
|
df6a51d23c | ||
|
|
46c379d556 | ||
|
|
46cd9f7a3e | ||
|
|
5c2f66f4b6 | ||
|
|
cfdcb586ee | ||
|
|
55e6bdc4f7 | ||
|
|
b31b42301e | ||
|
|
7ce0d876b0 | ||
|
|
2fd2596aa0 | ||
|
|
e0973e4a34 |
No files matched your search
@@ -34,7 +34,7 @@ jobs:
|
|||||||
|
|
||||||
build-windows:
|
build-windows:
|
||||||
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'windows' }}
|
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'windows' }}
|
||||||
runs-on: windows-latest
|
runs-on: windows-2022
|
||||||
needs: [get-release]
|
needs: [get-release]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
@@ -265,12 +265,7 @@ jobs:
|
|||||||
- uses: actions/setup-go@v4
|
- uses: actions/setup-go@v4
|
||||||
with:
|
with:
|
||||||
go-version: ${{ env.GO_VERSION }}
|
go-version: ${{ env.GO_VERSION }}
|
||||||
- if: matrix.os == 'ubuntu-22.04'
|
- uses: subosito/flutter-action@v2
|
||||||
uses: subosito/flutter-action@v2
|
|
||||||
with:
|
|
||||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
|
||||||
- if: matrix.os == 'ubuntu-22.04-arm'
|
|
||||||
uses: subosito/flutter-action@v2
|
|
||||||
with:
|
with:
|
||||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
channel: master
|
channel: master
|
||||||
@@ -282,7 +277,6 @@ jobs:
|
|||||||
sudo apt install -y libfuse2 locate
|
sudo apt install -y libfuse2 locate
|
||||||
arch=$(uname -m)
|
arch=$(uname -m)
|
||||||
wget -O appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${arch}.AppImage"
|
wget -O appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${arch}.AppImage"
|
||||||
wget -O appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${arch}.AppImage"
|
|
||||||
chmod +x appimagetool
|
chmod +x appimagetool
|
||||||
sudo mv appimagetool /usr/local/bin/
|
sudo mv appimagetool /usr/local/bin/
|
||||||
- name: Build
|
- name: Build
|
||||||
@@ -508,7 +502,7 @@ jobs:
|
|||||||
overwrite: true
|
overwrite: true
|
||||||
build-ios:
|
build-ios:
|
||||||
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'ios' }}
|
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'ios' }}
|
||||||
runs-on: macos-latest
|
runs-on: macos-14
|
||||||
needs: [get-release]
|
needs: [get-release]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|||||||
@@ -53,7 +53,13 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
go-version: ${{ env.GO_VERSION }}
|
go-version: ${{ env.GO_VERSION }}
|
||||||
- name: Run Unit tests.
|
- name: Run Unit tests.
|
||||||
run: go test -v -coverpkg=$(go list ./... | grep -v /cmd/ | grep -v /bind/ | paste -sd "," -) -covermode=count -coverprofile=coverage.txt $(go list ./... | grep -v /cmd/ | grep -v /bind/)
|
run: |
|
||||||
|
# Get packages for testing and coverage (including cmd/web for flags_test.go)
|
||||||
|
PACKAGES=$(go list ./... | grep -v /bind/ | grep -v -E '/cmd/(?!web)')
|
||||||
|
go test -v -coverpkg=$(echo "$PACKAGES" | paste -sd "," -) -covermode=count -coverprofile=coverage.txt $PACKAGES
|
||||||
|
# Filter out main.go from coverage report to avoid lowering coverage percentage
|
||||||
|
grep -v "main.go" coverage.txt > coverage_filtered.txt || true
|
||||||
|
mv coverage_filtered.txt coverage.txt
|
||||||
- uses: codecov/codecov-action@v4
|
- uses: codecov/codecov-action@v4
|
||||||
with:
|
with:
|
||||||
files: ./coverage.txt
|
files: ./coverage.txt
|
||||||
@@ -63,8 +69,8 @@ jobs:
|
|||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ windows-latest, macos-latest, ubuntu-22.04, ubuntu-22.04-arm ]
|
os: [windows-latest, macos-latest, ubuntu-22.04, ubuntu-22.04-arm]
|
||||||
needs: [ test ]
|
needs: [test]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: actions/setup-go@v4
|
- uses: actions/setup-go@v4
|
||||||
@@ -96,8 +102,8 @@ jobs:
|
|||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ macos-latest, ubuntu-latest ]
|
os: [macos-14, ubuntu-latest]
|
||||||
needs: [ test ]
|
needs: [test]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: actions/setup-go@v4
|
- uses: actions/setup-go@v4
|
||||||
@@ -129,7 +135,7 @@ jobs:
|
|||||||
build-web:
|
build-web:
|
||||||
name: Build web check
|
name: Build web check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [ test ]
|
needs: [test]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: actions/setup-go@v4
|
- uses: actions/setup-go@v4
|
||||||
@@ -149,7 +155,7 @@ jobs:
|
|||||||
build-docker:
|
build-docker:
|
||||||
name: Build docker check
|
name: Build docker check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [ test ]
|
needs: [test]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: actions/setup-go@v4
|
- uses: actions/setup-go@v4
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/base"
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
"github.com/GopeedLab/gopeed/pkg/download"
|
"github.com/GopeedLab/gopeed/pkg/download"
|
||||||
"github.com/GopeedLab/gopeed/pkg/protocol/http"
|
"github.com/GopeedLab/gopeed/pkg/protocol/http"
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
//go:build !windows
|
||||||
|
// +build !windows
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Dial() (net.Conn, error) {
|
||||||
|
// Get binary path
|
||||||
|
exe, err := os.Executable()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return net.Dial("unix", filepath.Join(filepath.Dir(exe), "gopeed_host.sock"))
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
|
||||||
|
"github.com/Microsoft/go-winio"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Dial() (net.Conn, error) {
|
||||||
|
return winio.DialPipe(`\\.\pipe\gopeed_host`, nil)
|
||||||
|
}
|
||||||
+66
-21
@@ -1,22 +1,24 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"time"
|
||||||
|
|
||||||
"github.com/pkg/browser"
|
"github.com/pkg/browser"
|
||||||
"github.com/shirou/gopsutil/v4/process"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const identifier = "gopeed"
|
|
||||||
|
|
||||||
type Message struct {
|
type Message struct {
|
||||||
Method string `json:"method"`
|
Method string `json:"method"`
|
||||||
|
Meta map[string]any `json:"meta"`
|
||||||
Params json.RawMessage `json:"params"`
|
Params json.RawMessage `json:"params"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,31 +28,74 @@ type Response struct {
|
|||||||
Message string `json:"message,omitempty"`
|
Message string `json:"message,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
var apiMap = map[string]func(params json.RawMessage) (data any, err error){
|
func check() (data bool, err error) {
|
||||||
"ping": func(params json.RawMessage) (data any, err error) {
|
conn, err := Dial()
|
||||||
processes, err := process.Processes()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
defer conn.Close()
|
||||||
for _, p := range processes {
|
|
||||||
name, err := p.Name()
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if strings.Contains(strings.ToLower(name), strings.ToLower(identifier)) {
|
|
||||||
return true, nil
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func wakeup(hidden bool) error {
|
||||||
|
running, _ := check()
|
||||||
|
if running {
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uri := "gopeed:"
|
||||||
|
if hidden {
|
||||||
|
uri = uri + "?hidden=true"
|
||||||
}
|
}
|
||||||
return false, nil
|
if err := browser.OpenURL(uri); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
if ok, _ := check(); ok {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
time.Sleep(1 * time.Second)
|
||||||
|
}
|
||||||
|
return fmt.Errorf("start gopeed failed")
|
||||||
|
}
|
||||||
|
|
||||||
|
var apiMap = map[string]func(message *Message) (data any, err error){
|
||||||
|
"ping": func(message *Message) (data any, err error) {
|
||||||
|
return check()
|
||||||
},
|
},
|
||||||
"create": func(params json.RawMessage) (data any, err error) {
|
"create": func(message *Message) (data any, err error) {
|
||||||
var strParams string
|
buf, err := message.Params.MarshalJSON()
|
||||||
if err = json.Unmarshal(params, &strParams); err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
err = browser.OpenURL(fmt.Sprintf("%s:///create?params=%s", identifier, strParams))
|
|
||||||
|
silent := false
|
||||||
|
if v, ok := message.Meta["silent"]; ok {
|
||||||
|
silent, _ = v.(bool)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := wakeup(silent); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
client := &http.Client{
|
||||||
|
Transport: &http.Transport{
|
||||||
|
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
|
||||||
|
return Dial()
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Timeout: 10 * time.Second,
|
||||||
|
}
|
||||||
|
req, err := http.NewRequest("POST", "http://127.0.0.1/create", bytes.NewBuffer(buf))
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if message.Meta != nil {
|
||||||
|
metaJson, _ := json.Marshal(message.Meta)
|
||||||
|
req.Header.Set("X-Gopeed-Host-Meta", string(metaJson))
|
||||||
|
}
|
||||||
|
_, err = client.Do(req)
|
||||||
return
|
return
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -88,7 +133,7 @@ func main() {
|
|||||||
var data any
|
var data any
|
||||||
var err error
|
var err error
|
||||||
if handler, ok := apiMap[message.Method]; ok {
|
if handler, ok := apiMap[message.Method]; ok {
|
||||||
data, err = handler(message.Params)
|
data, err = handler(&message)
|
||||||
} else {
|
} else {
|
||||||
err = errors.New("Unknown method: " + message.Method)
|
err = errors.New("Unknown method: " + message.Method)
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-6
@@ -5,7 +5,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -19,6 +18,7 @@ func main() {
|
|||||||
pid := flag.Int("pid", 0, "PID of the process to update")
|
pid := flag.Int("pid", 0, "PID of the process to update")
|
||||||
updateChannel := flag.String("channel", "", "Update channel")
|
updateChannel := flag.String("channel", "", "Update channel")
|
||||||
packagePath := flag.String("asset", "", "Path to the package asset")
|
packagePath := flag.String("asset", "", "Path to the package asset")
|
||||||
|
exeDir := flag.String("exeDir", "", "Directory of the entry executable")
|
||||||
logPath := flag.String("log", "", "Log file path")
|
logPath := flag.String("log", "", "Log file path")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@ func main() {
|
|||||||
restart bool
|
restart bool
|
||||||
err error
|
err error
|
||||||
)
|
)
|
||||||
if restart, err = update(*pid, *updateChannel, *packagePath); err != nil {
|
if restart, err = update(*pid, *updateChannel, *packagePath, *exeDir); err != nil {
|
||||||
log.Printf("Update failed: %v\n", err)
|
log.Printf("Update failed: %v\n", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
@@ -61,7 +61,7 @@ func main() {
|
|||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
func update(pid int, updateChannel, packagePath string) (restart bool, err error) {
|
func update(pid int, updateChannel, packagePath, exeDir string) (restart bool, err error) {
|
||||||
killSignalChan := make(chan any, 1)
|
killSignalChan := make(chan any, 1)
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
@@ -76,9 +76,8 @@ func update(pid int, updateChannel, packagePath string) (restart bool, err error
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
appDir := filepath.Dir(os.Args[0])
|
log.Printf("Updating process updateChannel=%s packagePath=%s exeDir=%s\n", updateChannel, packagePath, exeDir)
|
||||||
log.Printf("Updating process updateChannel=%s packagePath=%s appDir=%s\n", updateChannel, packagePath, appDir)
|
if restart, err = install(killSignalChan, updateChannel, packagePath, exeDir); err != nil {
|
||||||
if restart, err = install(killSignalChan, updateChannel, packagePath, appDir); err != nil {
|
|
||||||
return false, errors.Wrap(err, "failed to install package")
|
return false, errors.Wrap(err, "failed to install package")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,16 +25,20 @@ func installByDmg(killSignalChan chan<- any, packagePath, destDir string) error
|
|||||||
mountPoint := ""
|
mountPoint := ""
|
||||||
for _, line := range strings.Split(string(output), "\n") {
|
for _, line := range strings.Split(string(output), "\n") {
|
||||||
if strings.Contains(line, "/Volumes/") {
|
if strings.Contains(line, "/Volumes/") {
|
||||||
fields := strings.Fields(line)
|
// Find the /Volumes/ path in the line
|
||||||
if len(fields) > 2 {
|
// hdiutil output format: /dev/disk4s1 Apple_HFS /Volumes/Gopeed
|
||||||
mountPoint = fields[len(fields)-1]
|
// or with sequence number: /dev/disk4s1 Apple_HFS /Volumes/Gopeed 1
|
||||||
|
idx := strings.Index(line, "/Volumes/")
|
||||||
|
if idx != -1 {
|
||||||
|
// Extract everything from /Volumes/ onwards and trim whitespace
|
||||||
|
mountPoint = strings.TrimSpace(line[idx:])
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if mountPoint == "" {
|
if mountPoint == "" {
|
||||||
return fmt.Errorf("failed to get mount point")
|
return fmt.Errorf("failed to get mount point from hdiutil output: %s", string(output))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Detach the mounted DMG
|
// Detach the mounted DMG
|
||||||
@@ -45,7 +49,7 @@ func installByDmg(killSignalChan chan<- any, packagePath, destDir string) error
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if len(matches) == 0 {
|
if len(matches) == 0 {
|
||||||
return fmt.Errorf("no .app found in dmg")
|
return fmt.Errorf("no .app found in dmg, mountPoint: %s", mountPoint)
|
||||||
}
|
}
|
||||||
|
|
||||||
killSignalChan <- nil
|
killSignalChan <- nil
|
||||||
|
|||||||
+159
-44
@@ -3,10 +3,13 @@ package main
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/base"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"reflect"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
)
|
)
|
||||||
|
|
||||||
type args struct {
|
type args struct {
|
||||||
@@ -16,6 +19,7 @@ type args struct {
|
|||||||
Password *string `json:"password"`
|
Password *string `json:"password"`
|
||||||
ApiToken *string `json:"apiToken"`
|
ApiToken *string `json:"apiToken"`
|
||||||
StorageDir *string `json:"storageDir"`
|
StorageDir *string `json:"storageDir"`
|
||||||
|
WhiteDownloadDirs []string `json:"whiteDownloadDirs"`
|
||||||
// DownloadConfig when the first time to start the server, it will be configured as initial value
|
// DownloadConfig when the first time to start the server, it will be configured as initial value
|
||||||
DownloadConfig *base.DownloaderStoreConfig `json:"downloadConfig"`
|
DownloadConfig *base.DownloaderStoreConfig `json:"downloadConfig"`
|
||||||
|
|
||||||
@@ -23,62 +27,173 @@ type args struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func parse() *args {
|
func parse() *args {
|
||||||
var cliArgs args
|
cfg := &args{}
|
||||||
cliArgs.Address = flag.String("A", "0.0.0.0", "Bind Address")
|
|
||||||
cliArgs.Port = flag.Int("P", 9999, "Bind Port")
|
cliConfig := loadCliArgs()
|
||||||
cliArgs.Username = flag.String("u", "gopeed", "Web Authentication Username")
|
loadConfigFile(cfg, *cliConfig.configPath)
|
||||||
cliArgs.Password = flag.String("p", "", "Web Authentication Password, if no password is set, web authentication will not be enabled")
|
loadEnvVars(cfg)
|
||||||
cliArgs.ApiToken = flag.String("T", "", "API token, it must be configured when using HTTP API in the case of enabling web authentication")
|
// override with non-default command line arguments
|
||||||
cliArgs.StorageDir = flag.String("d", "", "Storage directory")
|
overrideWithCliArgs(cfg, cliConfig)
|
||||||
cliArgs.configPath = flag.String("c", "./config.json", "Config file path")
|
// set default values
|
||||||
|
setDefaults(cfg, cliConfig)
|
||||||
|
return cfg
|
||||||
|
}
|
||||||
|
|
||||||
|
// loadCliArgs parses command line arguments and returns initial config
|
||||||
|
func loadCliArgs() *args {
|
||||||
|
cfg := &args{}
|
||||||
|
cfg.Address = flag.String("A", "0.0.0.0", "Bind Address")
|
||||||
|
cfg.Port = flag.Int("P", 9999, "Bind Port")
|
||||||
|
cfg.Username = flag.String("u", "gopeed", "Web Authentication Username")
|
||||||
|
cfg.Password = flag.String("p", "", "Web Authentication Password, if no password is set, web authentication will not be enabled")
|
||||||
|
cfg.ApiToken = flag.String("T", "", "API token, it must be configured when using HTTP API in the case of enabling web authentication")
|
||||||
|
cfg.StorageDir = flag.String("d", "", "Storage directory")
|
||||||
|
whiteDownloadDirs := flag.String("w", "", "White download directories, comma-separated")
|
||||||
|
cfg.configPath = flag.String("c", "./config.json", "Config file path")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
// args priority: config file > cli args
|
// Parse white download directories from comma-separated string
|
||||||
cfgArgs := loadConfig(*cliArgs.configPath)
|
if whiteDownloadDirs != nil && *whiteDownloadDirs != "" {
|
||||||
if cfgArgs.Address == nil {
|
dirs := strings.Split(*whiteDownloadDirs, ",")
|
||||||
cfgArgs.Address = cliArgs.Address
|
for i := range dirs {
|
||||||
|
dirs[i] = strings.TrimSpace(dirs[i])
|
||||||
}
|
}
|
||||||
if cfgArgs.Port == nil {
|
cfg.WhiteDownloadDirs = dirs
|
||||||
cfgArgs.Port = cliArgs.Port
|
|
||||||
}
|
}
|
||||||
if cfgArgs.Username == nil {
|
|
||||||
cfgArgs.Username = cliArgs.Username
|
return cfg
|
||||||
}
|
|
||||||
if cfgArgs.Password == nil {
|
|
||||||
cfgArgs.Password = cliArgs.Password
|
|
||||||
}
|
|
||||||
if cfgArgs.ApiToken == nil {
|
|
||||||
cfgArgs.ApiToken = cliArgs.ApiToken
|
|
||||||
}
|
|
||||||
if cfgArgs.StorageDir == nil {
|
|
||||||
cfgArgs.StorageDir = cliArgs.StorageDir
|
|
||||||
}
|
|
||||||
return cfgArgs
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadConfig(path string) *args {
|
// overrideWithCliArgs overrides config with non-empty command line arguments
|
||||||
var args args
|
func overrideWithCliArgs(cfg *args, cliConfig *args) {
|
||||||
|
flag.Visit(func(f *flag.Flag) {
|
||||||
|
switch f.Name {
|
||||||
|
case "A":
|
||||||
|
cfg.Address = cliConfig.Address
|
||||||
|
case "P":
|
||||||
|
cfg.Port = cliConfig.Port
|
||||||
|
case "u":
|
||||||
|
cfg.Username = cliConfig.Username
|
||||||
|
case "p":
|
||||||
|
cfg.Password = cliConfig.Password
|
||||||
|
case "T":
|
||||||
|
cfg.ApiToken = cliConfig.ApiToken
|
||||||
|
case "d":
|
||||||
|
cfg.StorageDir = cliConfig.StorageDir
|
||||||
|
case "w":
|
||||||
|
cfg.WhiteDownloadDirs = cliConfig.WhiteDownloadDirs
|
||||||
|
case "c":
|
||||||
|
cfg.configPath = cliConfig.configPath
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
if !filepath.IsAbs(path) {
|
// setDefaults sets default values for any unset configuration fields
|
||||||
|
func setDefaults(cfg *args, cliConfig *args) {
|
||||||
|
if cfg.Address == nil {
|
||||||
|
cfg.Address = cliConfig.Address
|
||||||
|
}
|
||||||
|
if cfg.Port == nil {
|
||||||
|
cfg.Port = cliConfig.Port
|
||||||
|
}
|
||||||
|
if cfg.Username == nil {
|
||||||
|
cfg.Username = cliConfig.Username
|
||||||
|
}
|
||||||
|
if cfg.Password == nil {
|
||||||
|
cfg.Password = cliConfig.Password
|
||||||
|
}
|
||||||
|
if cfg.ApiToken == nil {
|
||||||
|
cfg.ApiToken = cliConfig.ApiToken
|
||||||
|
}
|
||||||
|
if cfg.StorageDir == nil {
|
||||||
|
cfg.StorageDir = cliConfig.StorageDir
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// loadConfigFile loads configuration from file
|
||||||
|
func loadConfigFile(cfg *args, configPath string) {
|
||||||
|
if !filepath.IsAbs(configPath) {
|
||||||
dir, err := os.Getwd()
|
dir, err := os.Getwd()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("config dir get failed, reason:" + err.Error())
|
return
|
||||||
return &args
|
|
||||||
}
|
}
|
||||||
path = filepath.Join(dir, path)
|
configPath = filepath.Join(dir, configPath)
|
||||||
}
|
}
|
||||||
file, err := os.ReadFile(path)
|
|
||||||
|
file, err := os.ReadFile(configPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
return &args
|
return
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = json.Unmarshal(file, cfg); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// loadEnvVars loads configuration from environment variables with prefix GOPEED_
|
||||||
|
func loadEnvVars(cfg *args) {
|
||||||
|
v := reflect.ValueOf(cfg).Elem()
|
||||||
|
t := reflect.TypeOf(cfg).Elem()
|
||||||
|
|
||||||
|
for i := 0; i < v.NumField(); i++ {
|
||||||
|
field := v.Field(i)
|
||||||
|
fieldType := t.Field(i)
|
||||||
|
|
||||||
|
// Get json tag as environment variable suffix
|
||||||
|
jsonTag := fieldType.Tag.Get("json")
|
||||||
|
if jsonTag == "" || jsonTag == "-" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove options like omitempty
|
||||||
|
if commaIdx := strings.Index(jsonTag, ","); commaIdx != -1 {
|
||||||
|
jsonTag = jsonTag[:commaIdx]
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert to uppercase and add GOPEED_ prefix
|
||||||
|
envKey := "GOPEED_" + strings.ToUpper(jsonTag)
|
||||||
|
envValue := os.Getenv(envKey)
|
||||||
|
|
||||||
|
if envValue == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set value based on field type
|
||||||
|
if field.Kind() == reflect.Ptr {
|
||||||
|
if field.IsNil() {
|
||||||
|
// Create new pointer instance
|
||||||
|
newVal := reflect.New(field.Type().Elem())
|
||||||
|
field.Set(newVal)
|
||||||
|
}
|
||||||
|
|
||||||
|
switch field.Type().Elem().Kind() {
|
||||||
|
case reflect.String:
|
||||||
|
field.Elem().SetString(envValue)
|
||||||
|
case reflect.Int:
|
||||||
|
if intVal, err := strconv.Atoi(envValue); err == nil {
|
||||||
|
field.Elem().SetInt(int64(intVal))
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
// For complex types like DownloadConfig, try JSON unmarshaling
|
||||||
|
if field.Type().Elem() == reflect.TypeOf(base.DownloaderStoreConfig{}) {
|
||||||
|
var config base.DownloaderStoreConfig
|
||||||
|
if err := json.Unmarshal([]byte(envValue), &config); err == nil {
|
||||||
|
field.Set(reflect.ValueOf(&config))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if field.Kind() == reflect.Slice {
|
||||||
|
// Handle non-pointer slice types (like []string for WhiteDownloadDirs)
|
||||||
|
if field.Type().Elem().Kind() == reflect.String {
|
||||||
|
dirs := strings.Split(envValue, ",")
|
||||||
|
for i := range dirs {
|
||||||
|
dirs[i] = strings.TrimSpace(dirs[i])
|
||||||
|
}
|
||||||
|
field.Set(reflect.ValueOf(dirs))
|
||||||
}
|
}
|
||||||
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
|
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
+8
-6
@@ -6,11 +6,12 @@ package main
|
|||||||
import (
|
import (
|
||||||
"embed"
|
"embed"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/GopeedLab/gopeed/cmd"
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest/model"
|
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
|
"github.com/GopeedLab/gopeed/cmd"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/rest/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed dist/*
|
//go:embed dist/*
|
||||||
@@ -31,22 +32,23 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var dir string
|
var storageDir string
|
||||||
if args.StorageDir != nil && *args.StorageDir != "" {
|
if args.StorageDir != nil && *args.StorageDir != "" {
|
||||||
dir = *args.StorageDir
|
storageDir = *args.StorageDir
|
||||||
} else {
|
} else {
|
||||||
exe, err := os.Executable()
|
exe, err := os.Executable()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
dir = filepath.Dir(exe)
|
storageDir = filepath.Join(filepath.Dir(exe), "storage")
|
||||||
}
|
}
|
||||||
|
|
||||||
cfg := &model.StartConfig{
|
cfg := &model.StartConfig{
|
||||||
Network: "tcp",
|
Network: "tcp",
|
||||||
Address: fmt.Sprintf("%s:%d", *args.Address, *args.Port),
|
Address: fmt.Sprintf("%s:%d", *args.Address, *args.Port),
|
||||||
Storage: model.StorageBolt,
|
Storage: model.StorageBolt,
|
||||||
StorageDir: filepath.Join(dir, "storage"),
|
StorageDir: storageDir,
|
||||||
|
WhiteDownloadDirs: args.WhiteDownloadDirs,
|
||||||
ApiToken: *args.ApiToken,
|
ApiToken: *args.ApiToken,
|
||||||
DownloadConfig: args.DownloadConfig,
|
DownloadConfig: args.DownloadConfig,
|
||||||
ProductionMode: true,
|
ProductionMode: true,
|
||||||
|
|||||||
@@ -3,17 +3,18 @@ package bt
|
|||||||
import (
|
import (
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/json"
|
"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"
|
|
||||||
gohttp "net/http"
|
gohttp "net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"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"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestFetcher_Resolve_Torrent(t *testing.T) {
|
func TestFetcher_Resolve_Torrent(t *testing.T) {
|
||||||
|
|||||||
@@ -5,11 +5,12 @@ package bt
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/anacrolix/torrent/storage"
|
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
|
"github.com/anacrolix/torrent/storage"
|
||||||
|
|
||||||
"github.com/anacrolix/missinggo/v2"
|
"github.com/anacrolix/missinggo/v2"
|
||||||
|
|
||||||
"github.com/anacrolix/torrent/common"
|
"github.com/anacrolix/torrent/common"
|
||||||
@@ -34,7 +35,7 @@ func newFileOpts(opts newFileClientOpts) storage.ClientImplCloser {
|
|||||||
if opts.FilePathMaker == nil {
|
if opts.FilePathMaker == nil {
|
||||||
opts.FilePathMaker = func(opts storage.FilePathMakerOpts) string {
|
opts.FilePathMaker = func(opts storage.FilePathMakerOpts) string {
|
||||||
var parts []string
|
var parts []string
|
||||||
if opts.Info.Name != metainfo.NoName {
|
if opts.Info.Length == 0 || opts.File.Path == nil {
|
||||||
parts = append(parts, opts.Info.Name)
|
parts = append(parts, opts.Info.Name)
|
||||||
}
|
}
|
||||||
return filepath.Join(append(parts, opts.File.Path...)...)
|
return filepath.Join(append(parts, opts.File.Path...)...)
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import (
|
|||||||
"github.com/GopeedLab/gopeed/internal/fetcher"
|
"github.com/GopeedLab/gopeed/internal/fetcher"
|
||||||
"github.com/GopeedLab/gopeed/pkg/base"
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
fhttp "github.com/GopeedLab/gopeed/pkg/protocol/http"
|
fhttp "github.com/GopeedLab/gopeed/pkg/protocol/http"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/util"
|
||||||
"github.com/xiaoqidun/setft"
|
"github.com/xiaoqidun/setft"
|
||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
)
|
)
|
||||||
@@ -172,13 +173,13 @@ func (f *Fetcher) Resolve(req *base.Request) error {
|
|||||||
filename = strings.Replace(filename, "UTF8", "UTF-8", 1)
|
filename = strings.Replace(filename, "UTF8", "UTF-8", 1)
|
||||||
file.Name, _ = decoder.Decode(filename)
|
file.Name, _ = decoder.Decode(filename)
|
||||||
} else {
|
} else {
|
||||||
file.Name = filename
|
file.Name = util.TryUrlQueryUnescape(filename)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
substr := "attachment; filename="
|
substr := "attachment; filename="
|
||||||
index := strings.Index(contentDisposition, substr)
|
index := strings.Index(contentDisposition, substr)
|
||||||
if index != -1 {
|
if index != -1 {
|
||||||
file.Name = contentDisposition[index+len(substr):]
|
file.Name = util.TryUrlQueryUnescape(contentDisposition[index+len(substr):])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -385,19 +386,20 @@ func (f *Fetcher) run(index int, ctx context.Context) (err error) {
|
|||||||
resp *http.Response
|
resp *http.Response
|
||||||
)
|
)
|
||||||
f.redirectLock.Lock()
|
f.redirectLock.Lock()
|
||||||
if f.redirectURL != "" {
|
redirectURL := f.redirectURL
|
||||||
|
if redirectURL != "" {
|
||||||
f.redirectLock.Unlock()
|
f.redirectLock.Unlock()
|
||||||
}
|
} else {
|
||||||
err = func() (err error) {
|
// Only hold the lock when we need to potentially set redirectURL
|
||||||
defer func() {
|
defer func() {
|
||||||
if f.redirectURL == "" {
|
if redirectURL == "" && err == nil {
|
||||||
if err == nil {
|
|
||||||
f.redirectURL = resp.Request.URL.String()
|
f.redirectURL = resp.Request.URL.String()
|
||||||
}
|
}
|
||||||
f.redirectLock.Unlock()
|
f.redirectLock.Unlock()
|
||||||
}
|
|
||||||
}()
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
err = func() (err error) {
|
||||||
httpReq, err = f.buildRequest(ctx, f.meta.Req)
|
httpReq, err = f.buildRequest(ctx, f.meta.Req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
|
|||||||
+15
-14
@@ -2,15 +2,6 @@ package download
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/GopeedLab/gopeed/internal/controller"
|
|
||||||
"github.com/GopeedLab/gopeed/internal/fetcher"
|
|
||||||
"github.com/GopeedLab/gopeed/internal/logger"
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/base"
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/protocol/http"
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/util"
|
|
||||||
gonanoid "github.com/matoous/go-nanoid/v2"
|
|
||||||
"github.com/rs/zerolog"
|
|
||||||
"github.com/rs/zerolog/pkgerrors"
|
|
||||||
"math"
|
"math"
|
||||||
gohttp "net/http"
|
gohttp "net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
@@ -22,6 +13,16 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/GopeedLab/gopeed/internal/controller"
|
||||||
|
"github.com/GopeedLab/gopeed/internal/fetcher"
|
||||||
|
"github.com/GopeedLab/gopeed/internal/logger"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/protocol/http"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/util"
|
||||||
|
gonanoid "github.com/matoous/go-nanoid/v2"
|
||||||
|
"github.com/rs/zerolog"
|
||||||
|
"github.com/rs/zerolog/pkgerrors"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -532,7 +533,7 @@ func (d *Downloader) ContinueBatch(filter *TaskFilter) (err error) {
|
|||||||
|
|
||||||
func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
|
func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
|
||||||
if filter == nil || filter.IsEmpty() {
|
if filter == nil || filter.IsEmpty() {
|
||||||
return d.deleteAll()
|
return d.deleteAll(force)
|
||||||
}
|
}
|
||||||
|
|
||||||
deleteTasks := d.GetTasksByFilter(filter)
|
deleteTasks := d.GetTasksByFilter(filter)
|
||||||
@@ -577,7 +578,7 @@ func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Downloader) deleteAll() (err error) {
|
func (d *Downloader) deleteAll(force bool) (err error) {
|
||||||
var deleteTasksTemp []*Task
|
var deleteTasksTemp []*Task
|
||||||
func() {
|
func() {
|
||||||
d.lock.Lock()
|
d.lock.Lock()
|
||||||
@@ -591,7 +592,7 @@ func (d *Downloader) deleteAll() (err error) {
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
for _, task := range deleteTasksTemp {
|
for _, task := range deleteTasksTemp {
|
||||||
if err = d.doDelete(task, true); err != nil {
|
if err = d.doDelete(task, force); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -941,9 +942,9 @@ func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options) (taskId str
|
|||||||
}
|
}
|
||||||
|
|
||||||
// if enable white download directory, check if the download directory is in the white list
|
// if enable white download directory, check if the download directory is in the white list
|
||||||
if len(d.cfg.DownloadDirWhiteList) > 0 {
|
if len(d.cfg.WhiteDownloadDirs) > 0 {
|
||||||
inWhiteList := false
|
inWhiteList := false
|
||||||
for _, dir := range d.cfg.DownloadDirWhiteList {
|
for _, dir := range d.cfg.WhiteDownloadDirs {
|
||||||
if match, err := filepath.Match(dir, opts.Path); match && err == nil {
|
if match, err := filepath.Match(dir, opts.Path); match && err == nil {
|
||||||
inWhiteList = true
|
inWhiteList = true
|
||||||
break
|
break
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ func TestDownloader_CreateNotInWhite(t *testing.T) {
|
|||||||
defer listener.Close()
|
defer listener.Close()
|
||||||
|
|
||||||
downloader := NewDownloader(&DownloaderConfig{
|
downloader := NewDownloader(&DownloaderConfig{
|
||||||
DownloadDirWhiteList: []string{"./downloads"},
|
WhiteDownloadDirs: []string{"./downloads"},
|
||||||
})
|
})
|
||||||
if err := downloader.Setup(); err != nil {
|
if err := downloader.Setup(); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
|||||||
@@ -131,6 +131,7 @@ type XMLHttpRequest struct {
|
|||||||
responseHeaders http.Header
|
responseHeaders http.Header
|
||||||
aborted bool
|
aborted bool
|
||||||
client *req.Client
|
client *req.Client
|
||||||
|
fingerprint string
|
||||||
|
|
||||||
WithCredentials bool `json:"withCredentials"`
|
WithCredentials bool `json:"withCredentials"`
|
||||||
Upload *XMLHttpRequestUpload `json:"upload"`
|
Upload *XMLHttpRequestUpload `json:"upload"`
|
||||||
@@ -164,7 +165,7 @@ func (xhr *XMLHttpRequest) SetRequestHeader(key, value string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (xhr *XMLHttpRequest) Send(data goja.Value) {
|
func (xhr *XMLHttpRequest) Send(data goja.Value) {
|
||||||
setFingerprint(xhr.client)
|
setFingerprint(xhr.client, xhr.fingerprint)
|
||||||
|
|
||||||
d := xhr.parseData(data)
|
d := xhr.parseData(data)
|
||||||
var (
|
var (
|
||||||
@@ -382,6 +383,7 @@ func Enable(runtime *goja.Runtime, proxyHandler func(r *http.Request) (*url.URL,
|
|||||||
|
|
||||||
instance := &XMLHttpRequest{
|
instance := &XMLHttpRequest{
|
||||||
client: client,
|
client: client,
|
||||||
|
fingerprint: util.SafeGet[string](runtime, FingerprintMagicKey),
|
||||||
Upload: &XMLHttpRequestUpload{
|
Upload: &XMLHttpRequestUpload{
|
||||||
EventProp: &EventProp{
|
EventProp: &EventProp{
|
||||||
eventListeners: make(map[string]func(event *ProgressEvent)),
|
eventListeners: make(map[string]func(event *ProgressEvent)),
|
||||||
@@ -395,8 +397,8 @@ func Enable(runtime *goja.Runtime, proxyHandler func(r *http.Request) (*url.URL,
|
|||||||
instanceValue.SetPrototype(call.This.Prototype())
|
instanceValue.SetPrototype(call.This.Prototype())
|
||||||
return instanceValue
|
return instanceValue
|
||||||
})
|
})
|
||||||
runtime.Set("__gopeed_setFingerprint", func(fingerprint Fingerprint) {
|
runtime.Set("__gopeed_setFingerprint", func(fingerprint string) {
|
||||||
currentFingerprint = fingerprint
|
runtime.Set(FingerprintMagicKey, fingerprint)
|
||||||
})
|
})
|
||||||
if err := runtime.Set("ProgressEvent", progressEvent); err != nil {
|
if err := runtime.Set("ProgressEvent", progressEvent); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -1,21 +1,19 @@
|
|||||||
package xhr
|
package xhr
|
||||||
|
|
||||||
import (
|
import "github.com/imroc/req/v3"
|
||||||
"github.com/imroc/req/v3"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Fingerprint string
|
type Fingerprint string
|
||||||
|
|
||||||
const (
|
const (
|
||||||
fingerprintChrome Fingerprint = "chrome"
|
FingerprintMagicKey = "__gopeed_xhr_fingerprint"
|
||||||
fingerprintFirefox Fingerprint = "firefox"
|
|
||||||
fingerprintSafari Fingerprint = "safari"
|
fingerprintChrome = "chrome"
|
||||||
|
fingerprintFirefox = "firefox"
|
||||||
|
fingerprintSafari = "safari"
|
||||||
)
|
)
|
||||||
|
|
||||||
var currentFingerprint Fingerprint = ""
|
func setFingerprint(client *req.Client, fingerprint string) {
|
||||||
|
switch fingerprint {
|
||||||
func setFingerprint(client *req.Client) {
|
|
||||||
switch currentFingerprint {
|
|
||||||
case fingerprintChrome:
|
case fingerprintChrome:
|
||||||
client.ImpersonateChrome()
|
client.ImpersonateChrome()
|
||||||
case fingerprintFirefox:
|
case fingerprintFirefox:
|
||||||
|
|||||||
@@ -22,3 +22,16 @@ func AssertError[T error](err error) (t T, r bool) {
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func SafeGet[T any](vm *goja.Runtime, name string) T {
|
||||||
|
v := vm.Get(name)
|
||||||
|
if v == nil {
|
||||||
|
var init T
|
||||||
|
return init
|
||||||
|
}
|
||||||
|
if e, ok := v.Export().(T); ok {
|
||||||
|
return e
|
||||||
|
}
|
||||||
|
var init T
|
||||||
|
return init
|
||||||
|
}
|
||||||
@@ -137,10 +137,10 @@ type DownloaderConfig struct {
|
|||||||
Controller *controller.Controller
|
Controller *controller.Controller
|
||||||
FetchManagers []fetcher.FetcherManager
|
FetchManagers []fetcher.FetcherManager
|
||||||
|
|
||||||
RefreshInterval int `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms)
|
RefreshInterval int // RefreshInterval time duration to refresh task progress(ms)
|
||||||
Storage Storage
|
Storage Storage
|
||||||
StorageDir string
|
StorageDir string
|
||||||
DownloadDirWhiteList []string `json:"downloadDirWhiteList"`
|
WhiteDownloadDirs []string
|
||||||
|
|
||||||
ProductionMode bool
|
ProductionMode bool
|
||||||
|
|
||||||
|
|||||||
+5
-2
@@ -65,7 +65,9 @@ func Stop() {
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
if srv != nil {
|
if srv != nil {
|
||||||
if err := srv.Shutdown(context.TODO()); err != nil {
|
shutdownCtx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
if err := srv.Shutdown(shutdownCtx); err != nil {
|
||||||
Downloader.Logger.Warn().Err(err).Msg("shutdown server failed")
|
Downloader.Logger.Warn().Err(err).Msg("shutdown server failed")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -85,6 +87,7 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
|
|||||||
downloadCfg := &download.DownloaderConfig{
|
downloadCfg := &download.DownloaderConfig{
|
||||||
ProductionMode: startCfg.ProductionMode,
|
ProductionMode: startCfg.ProductionMode,
|
||||||
RefreshInterval: startCfg.RefreshInterval,
|
RefreshInterval: startCfg.RefreshInterval,
|
||||||
|
WhiteDownloadDirs: startCfg.WhiteDownloadDirs,
|
||||||
}
|
}
|
||||||
if startCfg.Storage == model.StorageBolt {
|
if startCfg.Storage == model.StorageBolt {
|
||||||
downloadCfg.Storage = download.NewBoltStorage(startCfg.StorageDir)
|
downloadCfg.Storage = download.NewBoltStorage(startCfg.StorageDir)
|
||||||
@@ -190,7 +193,7 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
|
|||||||
}
|
}
|
||||||
|
|
||||||
if enableBasicAuth {
|
if enableBasicAuth {
|
||||||
if r.URL.Path == "/api/web/login" {
|
if !strings.HasPrefix(r.URL.Path, "/api/") || r.URL.Path == "/api/web/login" {
|
||||||
h.ServeHTTP(w, r)
|
h.ServeHTTP(w, r)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,3 +56,13 @@ func ProxyUrlToHandler(proxyUrl *url.URL) func(*http.Request) (*url.URL, error)
|
|||||||
}
|
}
|
||||||
return http.ProxyURL(proxyUrl)
|
return http.ProxyURL(proxyUrl)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TryUrlQueryUnescape tries to unescape a URL-encoded string.
|
||||||
|
//
|
||||||
|
// If unescaping fails, it returns the original string.
|
||||||
|
func TryUrlQueryUnescape(s string) string {
|
||||||
|
if decoded, err := url.QueryUnescape(s); err == nil {
|
||||||
|
return decoded
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
@@ -128,3 +128,24 @@ func TestParseDataUri(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestTryURLDecode(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
input string
|
||||||
|
expected string
|
||||||
|
}{
|
||||||
|
{"normal.txt", "normal.txt"},
|
||||||
|
{"%E7%8F%80%E5%B0%94%E8%AF%BA.zip", "珀尔诺.zip"},
|
||||||
|
{"hello%20world.txt", "hello world.txt"},
|
||||||
|
{"bad%2-text", "bad%2-text"},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.input, func(t *testing.T) {
|
||||||
|
got := TryUrlQueryUnescape(tt.input)
|
||||||
|
if got != tt.expected {
|
||||||
|
t.Errorf("TryUrlQueryUnescape(%q) = %q, want %q", tt.input, got, tt.expected)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -81,6 +81,7 @@ class ExtraConfig {
|
|||||||
bool lastDeleteTaskKeep;
|
bool lastDeleteTaskKeep;
|
||||||
bool defaultDirectDownload;
|
bool defaultDirectDownload;
|
||||||
bool defaultBtClient;
|
bool defaultBtClient;
|
||||||
|
bool notifyWhenNewVersion;
|
||||||
|
|
||||||
ExtraConfigBt bt = ExtraConfigBt();
|
ExtraConfigBt bt = ExtraConfigBt();
|
||||||
|
|
||||||
@@ -90,6 +91,7 @@ class ExtraConfig {
|
|||||||
this.lastDeleteTaskKeep = false,
|
this.lastDeleteTaskKeep = false,
|
||||||
this.defaultDirectDownload = false,
|
this.defaultDirectDownload = false,
|
||||||
this.defaultBtClient = true,
|
this.defaultBtClient = true,
|
||||||
|
this.notifyWhenNewVersion = true,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory ExtraConfig.fromJson(Map<String, dynamic>? json) =>
|
factory ExtraConfig.fromJson(Map<String, dynamic>? json) =>
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ ExtraConfig _$ExtraConfigFromJson(Map<String, dynamic> json) => ExtraConfig(
|
|||||||
lastDeleteTaskKeep: json['lastDeleteTaskKeep'] as bool? ?? false,
|
lastDeleteTaskKeep: json['lastDeleteTaskKeep'] as bool? ?? false,
|
||||||
defaultDirectDownload: json['defaultDirectDownload'] as bool? ?? false,
|
defaultDirectDownload: json['defaultDirectDownload'] as bool? ?? false,
|
||||||
defaultBtClient: json['defaultBtClient'] as bool? ?? true,
|
defaultBtClient: json['defaultBtClient'] as bool? ?? true,
|
||||||
|
notifyWhenNewVersion: json['notifyWhenNewVersion'] as bool? ?? true,
|
||||||
)..bt = ExtraConfigBt.fromJson(json['bt'] as Map<String, dynamic>);
|
)..bt = ExtraConfigBt.fromJson(json['bt'] as Map<String, dynamic>);
|
||||||
|
|
||||||
Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) =>
|
Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) =>
|
||||||
@@ -83,6 +84,7 @@ Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) =>
|
|||||||
'lastDeleteTaskKeep': instance.lastDeleteTaskKeep,
|
'lastDeleteTaskKeep': instance.lastDeleteTaskKeep,
|
||||||
'defaultDirectDownload': instance.defaultDirectDownload,
|
'defaultDirectDownload': instance.defaultDirectDownload,
|
||||||
'defaultBtClient': instance.defaultBtClient,
|
'defaultBtClient': instance.defaultBtClient,
|
||||||
|
'notifyWhenNewVersion': instance.notifyWhenNewVersion,
|
||||||
'bt': instance.bt.toJson(),
|
'bt': instance.bt.toJson(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
|
import '../controllers/app_controller.dart';
|
||||||
|
|
||||||
|
class AppBinding extends Bindings {
|
||||||
|
@override
|
||||||
|
void dependencies() {
|
||||||
|
Get.lazyPut<AppController>(
|
||||||
|
() => AppController(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,6 +16,7 @@ import 'package:url_launcher/url_launcher.dart';
|
|||||||
import 'package:window_manager/window_manager.dart';
|
import 'package:window_manager/window_manager.dart';
|
||||||
|
|
||||||
import '../../../../api/api.dart';
|
import '../../../../api/api.dart';
|
||||||
|
import '../../../../api/model/create_task.dart';
|
||||||
import '../../../../api/model/downloader_config.dart';
|
import '../../../../api/model/downloader_config.dart';
|
||||||
import '../../../../api/model/request.dart';
|
import '../../../../api/model/request.dart';
|
||||||
import '../../../../core/common/start_config.dart';
|
import '../../../../core/common/start_config.dart';
|
||||||
@@ -31,7 +32,7 @@ import '../../../../util/package_info.dart';
|
|||||||
import '../../../../util/updater.dart';
|
import '../../../../util/updater.dart';
|
||||||
import '../../../../util/util.dart';
|
import '../../../../util/util.dart';
|
||||||
import '../../../routes/app_pages.dart';
|
import '../../../routes/app_pages.dart';
|
||||||
import '../../create/dto/create_router_params.dart';
|
import '../../../rpc/rpc.dart';
|
||||||
import '../../redirect/views/redirect_view.dart';
|
import '../../redirect/views/redirect_view.dart';
|
||||||
|
|
||||||
const unixSocketPath = 'gopeed.sock';
|
const unixSocketPath = 'gopeed.sock';
|
||||||
@@ -78,6 +79,9 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
_initTray().onError(
|
_initTray().onError(
|
||||||
(error, stackTrace) => logger.w("initTray error", error, stackTrace));
|
(error, stackTrace) => logger.w("initTray error", error, stackTrace));
|
||||||
|
|
||||||
|
_initRpcServer().onError((error, stackTrace) =>
|
||||||
|
logger.w("initRpcServer error", error, stackTrace));
|
||||||
|
|
||||||
_initForegroundTask().onError((error, stackTrace) =>
|
_initForegroundTask().onError((error, stackTrace) =>
|
||||||
logger.w("initForegroundTask error", error, stackTrace));
|
logger.w("initForegroundTask error", error, stackTrace));
|
||||||
|
|
||||||
@@ -119,7 +123,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void onTrayIconRightMouseDown() {
|
void onTrayIconRightMouseDown() {
|
||||||
trayManager.popUpContextMenu();
|
trayManager.popUpContextMenu(bringAppToFront: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -271,6 +275,37 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
trayManager.addListener(this);
|
trayManager.addListener(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> _initRpcServer() async {
|
||||||
|
if (!Util.isDesktop()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await startRpcServer({
|
||||||
|
"/create": (ctx) async {
|
||||||
|
final meta =
|
||||||
|
ctx.request.headers["X-Gopeed-Host-Meta"]?.firstOrNull ?? "{}";
|
||||||
|
final jsonMeta = jsonDecode(meta);
|
||||||
|
final silent = jsonMeta['silent'] as bool? ?? false;
|
||||||
|
final params = await ctx.readText();
|
||||||
|
final createTaskParams = _decodeToCreatTaskParams(params);
|
||||||
|
if (!silent) {
|
||||||
|
await windowManager.show();
|
||||||
|
_handleToCreate0(createTaskParams);
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
await createTask(createTaskParams);
|
||||||
|
} catch (e) {
|
||||||
|
logger.w(
|
||||||
|
"create task from extension fail", e, StackTrace.current);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
logger.w("start rpc server fail", e, StackTrace.current);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> _initForegroundTask() async {
|
Future<void> _initForegroundTask() async {
|
||||||
if (!Util.isMobile()) {
|
if (!Util.isMobile()) {
|
||||||
return;
|
return;
|
||||||
@@ -317,13 +352,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
if (uri.path == "/create") {
|
if (uri.path == "/create") {
|
||||||
final params = uri.queryParameters["params"];
|
final params = uri.queryParameters["params"];
|
||||||
if (params?.isNotEmpty == true) {
|
if (params?.isNotEmpty == true) {
|
||||||
final safeParams = params!.replaceAll(" ", "+");
|
_handleToCreate(params!);
|
||||||
final paramsJson =
|
|
||||||
String.fromCharCodes(base64Decode(base64.normalize(safeParams)));
|
|
||||||
Get.rootDelegate.offAndToNamed(Routes.REDIRECT,
|
|
||||||
arguments: RedirectArgs(Routes.CREATE,
|
|
||||||
arguments:
|
|
||||||
CreateRouterParams.fromJson(jsonDecode(paramsJson))));
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Get.rootDelegate.offAndToNamed(Routes.CREATE);
|
Get.rootDelegate.offAndToNamed(Routes.CREATE);
|
||||||
@@ -346,7 +375,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
}
|
}
|
||||||
Get.rootDelegate.offAndToNamed(Routes.REDIRECT,
|
Get.rootDelegate.offAndToNamed(Routes.REDIRECT,
|
||||||
arguments: RedirectArgs(Routes.CREATE,
|
arguments: RedirectArgs(Routes.CREATE,
|
||||||
arguments: CreateRouterParams(req: Request(url: path))));
|
arguments: CreateTask(req: Request(url: path))));
|
||||||
}
|
}
|
||||||
|
|
||||||
String runningAddress() {
|
String runningAddress() {
|
||||||
@@ -506,6 +535,11 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _initCheckUpdate() async {
|
Future<void> _initCheckUpdate() async {
|
||||||
|
// Check if auto check update is enabled
|
||||||
|
if (!downloaderConfig.value.extra.notifyWhenNewVersion) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final versionInfo = await checkUpdate();
|
final versionInfo = await checkUpdate();
|
||||||
if (versionInfo != null) {
|
if (versionInfo != null) {
|
||||||
await showUpdateDialog(Get.context!, versionInfo);
|
await showUpdateDialog(Get.context!, versionInfo);
|
||||||
@@ -519,4 +553,21 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
apiToken: startConfig.value.apiToken));
|
apiToken: startConfig.value.apiToken));
|
||||||
await putConfig(downloaderConfig.value);
|
await putConfig(downloaderConfig.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CreateTask _decodeToCreatTaskParams(String params) {
|
||||||
|
final safeParams = params.replaceAll('"', "").replaceAll(" ", "+");
|
||||||
|
final paramsJson =
|
||||||
|
String.fromCharCodes(base64Decode(base64.normalize(safeParams)));
|
||||||
|
return CreateTask.fromJson(jsonDecode(paramsJson));
|
||||||
|
}
|
||||||
|
|
||||||
|
_handleToCreate(String params) {
|
||||||
|
final createTaskParams = _decodeToCreatTaskParams(params);
|
||||||
|
_handleToCreate0(createTaskParams);
|
||||||
|
}
|
||||||
|
|
||||||
|
_handleToCreate0(CreateTask createTaskParams) {
|
||||||
|
Get.rootDelegate.offAndToNamed(Routes.REDIRECT,
|
||||||
|
arguments: RedirectArgs(Routes.CREATE, arguments: createTaskParams));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
import 'package:json_annotation/json_annotation.dart';
|
|
||||||
|
|
||||||
import '../../../../api/model/options.dart';
|
|
||||||
import '../../../../api/model/request.dart';
|
|
||||||
|
|
||||||
part 'create_router_params.g.dart';
|
|
||||||
|
|
||||||
@JsonSerializable(explicitToJson: true)
|
|
||||||
class CreateRouterParams {
|
|
||||||
Request? req;
|
|
||||||
Options? opt;
|
|
||||||
|
|
||||||
CreateRouterParams({
|
|
||||||
this.req,
|
|
||||||
this.opt,
|
|
||||||
});
|
|
||||||
|
|
||||||
factory CreateRouterParams.fromJson(
|
|
||||||
Map<String, dynamic> json,
|
|
||||||
) =>
|
|
||||||
_$CreateRouterParamsFromJson(json);
|
|
||||||
|
|
||||||
Map<String, dynamic> toJson() => _$CreateRouterParamsToJson(this);
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
|
||||||
|
|
||||||
part of 'create_router_params.dart';
|
|
||||||
|
|
||||||
// **************************************************************************
|
|
||||||
// JsonSerializableGenerator
|
|
||||||
// **************************************************************************
|
|
||||||
|
|
||||||
CreateRouterParams _$CreateRouterParamsFromJson(Map<String, dynamic> json) =>
|
|
||||||
CreateRouterParams(
|
|
||||||
req: json['req'] == null
|
|
||||||
? null
|
|
||||||
: Request.fromJson(json['req'] as Map<String, dynamic>),
|
|
||||||
opt: json['opt'] == null
|
|
||||||
? null
|
|
||||||
: Options.fromJson(json['opt'] as Map<String, dynamic>),
|
|
||||||
);
|
|
||||||
|
|
||||||
Map<String, dynamic> _$CreateRouterParamsToJson(CreateRouterParams instance) {
|
|
||||||
final val = <String, dynamic>{};
|
|
||||||
|
|
||||||
void writeNotNull(String key, dynamic value) {
|
|
||||||
if (value != null) {
|
|
||||||
val[key] = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
writeNotNull('req', instance.req?.toJson());
|
|
||||||
writeNotNull('opt', instance.opt?.toJson());
|
|
||||||
return val;
|
|
||||||
}
|
|
||||||
@@ -27,7 +27,6 @@ import '../../../views/file_tree_view.dart';
|
|||||||
import '../../app/controllers/app_controller.dart';
|
import '../../app/controllers/app_controller.dart';
|
||||||
import '../../history/views/history_view.dart';
|
import '../../history/views/history_view.dart';
|
||||||
import '../controllers/create_controller.dart';
|
import '../controllers/create_controller.dart';
|
||||||
import '../dto/create_router_params.dart';
|
|
||||||
|
|
||||||
class CreateView extends GetView<CreateController> {
|
class CreateView extends GetView<CreateController> {
|
||||||
final _confirmFormKey = GlobalKey<FormState>();
|
final _confirmFormKey = GlobalKey<FormState>();
|
||||||
@@ -76,7 +75,7 @@ class CreateView extends GetView<CreateController> {
|
|||||||
_pathController.text = appController.downloaderConfig.value.downloadDir;
|
_pathController.text = appController.downloaderConfig.value.downloadDir;
|
||||||
}
|
}
|
||||||
|
|
||||||
final CreateRouterParams? routerParams = Get.rootDelegate.arguments();
|
final CreateTask? routerParams = Get.rootDelegate.arguments();
|
||||||
if (routerParams?.req?.url.isNotEmpty ?? false) {
|
if (routerParams?.req?.url.isNotEmpty ?? false) {
|
||||||
// get url from route arguments
|
// get url from route arguments
|
||||||
final url = routerParams!.req!.url;
|
final url = routerParams!.req!.url;
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
import '../../../../util/network_monitor.dart';
|
|
||||||
import '../controllers/root_controller.dart';
|
import '../controllers/root_controller.dart';
|
||||||
|
|
||||||
class RootBinding extends Bindings {
|
class RootBinding extends Bindings {
|
||||||
@override
|
@override
|
||||||
void dependencies() {
|
void dependencies() {
|
||||||
Get.lazyPut<RootController>(() => RootController(), fenix: true);
|
Get.lazyPut<RootController>(() => RootController(), fenix: true);
|
||||||
Get.put<NetworkMonitor>(NetworkMonitor(), permanent: true);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,19 +1,15 @@
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
import '../../../../database/database.dart';
|
|
||||||
import '../../../../util/updater.dart';
|
import '../../../../util/updater.dart';
|
||||||
|
|
||||||
class SettingController extends GetxController {
|
class SettingController extends GetxController {
|
||||||
final tapStatues = <String, bool>{}.obs;
|
final tapStatues = <String, bool>{}.obs;
|
||||||
final latestVersion = Rxn<VersionInfo>();
|
final latestVersion = Rxn<VersionInfo>();
|
||||||
final networkAutoControl = false.obs;
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void onInit() {
|
void onInit() {
|
||||||
super.onInit();
|
super.onInit();
|
||||||
fetchLatestVersion();
|
fetchLatestVersion();
|
||||||
// Initialize network auto control setting
|
|
||||||
networkAutoControl.value = Database.instance.getNetworkAutoControl();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// set all tap status to false
|
// set all tap status to false
|
||||||
@@ -31,10 +27,4 @@ class SettingController extends GetxController {
|
|||||||
void fetchLatestVersion() async {
|
void fetchLatestVersion() async {
|
||||||
latestVersion.value = await checkUpdate();
|
latestVersion.value = await checkUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
// update network auto control setting
|
|
||||||
void updateNetworkAutoControl(bool value) {
|
|
||||||
networkAutoControl.value = value;
|
|
||||||
Database.instance.saveNetworkAutoControl(value);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -11,7 +11,6 @@ import 'package:launch_at_startup/launch_at_startup.dart';
|
|||||||
import 'package:url_launcher/url_launcher.dart';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|
||||||
import '../../../../api/model/downloader_config.dart';
|
import '../../../../api/model/downloader_config.dart';
|
||||||
import '../../../../database/database.dart';
|
|
||||||
import '../../../../i18n/message.dart';
|
import '../../../../i18n/message.dart';
|
||||||
import '../../../../util/input_formatter.dart';
|
import '../../../../util/input_formatter.dart';
|
||||||
import '../../../../util/locale_manager.dart';
|
import '../../../../util/locale_manager.dart';
|
||||||
@@ -532,6 +531,25 @@ class SettingView extends GetView<SettingController> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final buildAutoCheckUpdate = _buildConfigItem(
|
||||||
|
'notifyWhenNewVersion',
|
||||||
|
() =>
|
||||||
|
downloaderCfg.value.extra.notifyWhenNewVersion ? 'on'.tr : 'off'.tr,
|
||||||
|
(Key key) {
|
||||||
|
return Container(
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
child: Switch(
|
||||||
|
value: downloaderCfg.value.extra.notifyWhenNewVersion,
|
||||||
|
onChanged: (bool value) async {
|
||||||
|
downloaderCfg.update((val) {
|
||||||
|
val!.extra.notifyWhenNewVersion = value;
|
||||||
|
});
|
||||||
|
await debounceSave();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
buildThanks() {
|
buildThanks() {
|
||||||
const thankPage =
|
const thankPage =
|
||||||
'https://github.com/GopeedLab/gopeed/graphs/contributors';
|
'https://github.com/GopeedLab/gopeed/graphs/contributors';
|
||||||
@@ -544,24 +562,6 @@ class SettingView extends GetView<SettingController> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Network auto control setting (mobile only)
|
|
||||||
buildNetworkAutoControl() {
|
|
||||||
if (!Platform.isAndroid && !Platform.isIOS) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Obx(() => ListTile(
|
|
||||||
title: Text('networkAutoControl'.tr),
|
|
||||||
subtitle: Text('networkAutoControlTip'.tr),
|
|
||||||
trailing: Switch(
|
|
||||||
value: controller.networkAutoControl.value,
|
|
||||||
onChanged: (bool value) {
|
|
||||||
controller.updateNetworkAutoControl(value);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
// advanced config proxy items start
|
// advanced config proxy items start
|
||||||
final proxy = downloaderCfg.value.proxy;
|
final proxy = downloaderCfg.value.proxy;
|
||||||
final buildProxy = _buildConfigItem(
|
final buildProxy = _buildConfigItem(
|
||||||
@@ -976,6 +976,7 @@ class SettingView extends GetView<SettingController> {
|
|||||||
children: _addDivider([
|
children: _addDivider([
|
||||||
buildHomepage(),
|
buildHomepage(),
|
||||||
buildVersion(),
|
buildVersion(),
|
||||||
|
buildAutoCheckUpdate(),
|
||||||
buildThanks(),
|
buildThanks(),
|
||||||
]),
|
]),
|
||||||
)),
|
)),
|
||||||
@@ -1004,10 +1005,7 @@ class SettingView extends GetView<SettingController> {
|
|||||||
Text('network'.tr),
|
Text('network'.tr),
|
||||||
Card(
|
Card(
|
||||||
child: Column(
|
child: Column(
|
||||||
children: _addDivider([
|
children: _addDivider([buildProxy()]),
|
||||||
buildNetworkAutoControl(),
|
|
||||||
buildProxy(),
|
|
||||||
].where((e) => e != null).cast<Widget>().toList()),
|
|
||||||
)),
|
)),
|
||||||
const Text('API'),
|
const Text('API'),
|
||||||
Card(
|
Card(
|
||||||
|
|||||||
@@ -0,0 +1,133 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:dart_ipc/dart_ipc.dart';
|
||||||
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
|
||||||
|
import '../../util/util.dart';
|
||||||
|
|
||||||
|
/// RPC context class that contains request information and response methods
|
||||||
|
class RpcContext {
|
||||||
|
final HttpRequest request;
|
||||||
|
final HttpResponse response;
|
||||||
|
String? _bodyCache;
|
||||||
|
|
||||||
|
RpcContext(this.request, this.response);
|
||||||
|
|
||||||
|
/// Read and parse JSON request body
|
||||||
|
Future<Map<String, dynamic>> readJSON() async {
|
||||||
|
if (_bodyCache == null) {
|
||||||
|
final content = <int>[];
|
||||||
|
await for (var data in request) {
|
||||||
|
content.addAll(data);
|
||||||
|
}
|
||||||
|
_bodyCache = String.fromCharCodes(content);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_bodyCache!.isEmpty) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
return jsonDecode(_bodyCache!) as Map<String, dynamic>;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<String> readText() async {
|
||||||
|
if (_bodyCache == null) {
|
||||||
|
final content = <int>[];
|
||||||
|
await for (var data in request) {
|
||||||
|
content.addAll(data);
|
||||||
|
}
|
||||||
|
_bodyCache = String.fromCharCodes(content);
|
||||||
|
}
|
||||||
|
|
||||||
|
return _bodyCache ?? '';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Write JSON response
|
||||||
|
Future<void> writeJSON(Map<String, dynamic> data) async {
|
||||||
|
response.headers.contentType = ContentType.json;
|
||||||
|
response.write(jsonEncode(data));
|
||||||
|
await response.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Write error response
|
||||||
|
Future<void> writeError(String message, [int statusCode = 500]) async {
|
||||||
|
response.statusCode = statusCode;
|
||||||
|
await writeJSON({'error': message});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Route handler type definition
|
||||||
|
typedef RouteHandler = Future<void> Function(RpcContext ctx);
|
||||||
|
|
||||||
|
/// Route registry
|
||||||
|
class RouteRegistry {
|
||||||
|
final Map<String, RouteHandler> _routes = {};
|
||||||
|
|
||||||
|
/// Register a route
|
||||||
|
void register(String path, RouteHandler handler) {
|
||||||
|
_routes[path] = handler;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get route handler
|
||||||
|
RouteHandler? getHandler(String path) {
|
||||||
|
return _routes[path];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get all registered routes
|
||||||
|
List<String> get routes => _routes.keys.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Start RPC server
|
||||||
|
Future<void> startRpcServer([Map<String, RouteHandler>? routes]) async {
|
||||||
|
String path;
|
||||||
|
if (Util.isWindows()) {
|
||||||
|
path = r'\\.\pipe\gopeed_host';
|
||||||
|
} else {
|
||||||
|
path = await Util.homePathJoin("gopeed_host.sock");
|
||||||
|
// try to delete existing socket file
|
||||||
|
final socketFile = File(path);
|
||||||
|
if (await socketFile.exists()) {
|
||||||
|
try {
|
||||||
|
await socketFile.delete();
|
||||||
|
} catch (e) {
|
||||||
|
// ignore
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create route registry
|
||||||
|
final registry = RouteRegistry();
|
||||||
|
|
||||||
|
// Register provided routes
|
||||||
|
if (routes != null) {
|
||||||
|
routes.forEach((path, handler) {
|
||||||
|
registry.register(path, handler);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
final serverSocket = await bind(path);
|
||||||
|
final httpServer = HttpServer.listenOn(serverSocket);
|
||||||
|
|
||||||
|
httpServer.forEach((HttpRequest request) async {
|
||||||
|
final ctx = RpcContext(request, request.response);
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Get request path
|
||||||
|
final requestPath = request.uri.path;
|
||||||
|
// Find route handler
|
||||||
|
final handler = registry.getHandler(requestPath);
|
||||||
|
if (handler != null) {
|
||||||
|
// Execute route handler
|
||||||
|
await handler(ctx);
|
||||||
|
} else {
|
||||||
|
// 404 Route not found
|
||||||
|
await ctx.writeError('Route not found: $requestPath', 404);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
await ctx.writeError('Internal server error: $e', 500);
|
||||||
|
} finally {
|
||||||
|
await request.response.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -10,7 +10,6 @@ const String _windowState = 'windowState';
|
|||||||
const String _bookmark = 'bookmark';
|
const String _bookmark = 'bookmark';
|
||||||
const String _createHistory = 'createHistory';
|
const String _createHistory = 'createHistory';
|
||||||
const String _webToken = 'webToken';
|
const String _webToken = 'webToken';
|
||||||
const String _networkAutoControl = 'networkAutoControl';
|
|
||||||
|
|
||||||
class Database {
|
class Database {
|
||||||
static final Database _instance = Database._internal();
|
static final Database _instance = Database._internal();
|
||||||
@@ -110,12 +109,4 @@ class Database {
|
|||||||
void clearCreateHistory() {
|
void clearCreateHistory() {
|
||||||
clear(_createHistory);
|
clear(_createHistory);
|
||||||
}
|
}
|
||||||
|
|
||||||
void saveNetworkAutoControl(bool enabled) {
|
|
||||||
save<bool>(_networkAutoControl, enabled);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool getNetworkAutoControl() {
|
|
||||||
return get<bool>(_networkAutoControl, (json) => json as bool) ?? false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,129 @@
|
|||||||
|
const deDE = {
|
||||||
|
'de_DE': {
|
||||||
|
'label': 'Deutsch',
|
||||||
|
'error': 'Fehler',
|
||||||
|
'tip': 'Tipp',
|
||||||
|
'confirm': 'Bestätigen',
|
||||||
|
'cancel': 'Abbrechen',
|
||||||
|
'on': 'An',
|
||||||
|
'off': 'Aus',
|
||||||
|
'selectAll': 'Alle Auswählen',
|
||||||
|
'select': 'Auswählen',
|
||||||
|
'task': 'Aufgaben',
|
||||||
|
'downloading': 'Wird Heruntergeladen',
|
||||||
|
'downloaded': 'Heruntergeladen',
|
||||||
|
'setting': 'Einstellungen',
|
||||||
|
'donate': 'Spenden',
|
||||||
|
'exit': 'Beenden',
|
||||||
|
'create': 'Aufgabe Erstellen',
|
||||||
|
'directDownload': 'Direkter Download',
|
||||||
|
'advancedOptions': 'Erweiterte Einstellungen',
|
||||||
|
'followSettings': 'Einstellungen Folgen',
|
||||||
|
'downloadLink': 'Download Link',
|
||||||
|
'downloadLinkValid': 'Bitte geben Sie den Download-Link ein',
|
||||||
|
'downloadLinkHit': 'Bitte geben Sie den Download-Link ein, einen pro Zeile@append',
|
||||||
|
'downloadLinkHitDesktop': ', oder ziehen Sie die Torrent-Datei direkt hierher',
|
||||||
|
'download': 'Download',
|
||||||
|
'noFileSelected': 'Bitte wählen Sie mindestens eine Datei aus, um fortzufahren.',
|
||||||
|
'noStoragePermission': 'Speicherberechtigung erforderlich',
|
||||||
|
'selectFile': 'Datei auswählen',
|
||||||
|
'rename': 'Umbenennen',
|
||||||
|
'basic': 'Basic',
|
||||||
|
'advanced': 'Fortschrittlich',
|
||||||
|
'general': 'Allgemein',
|
||||||
|
'downloadDir': 'Download-Verzeichnis',
|
||||||
|
'downloadDirValid': 'Bitte wählen Sie das Download-Verzeichnis',
|
||||||
|
'connections': 'Anschlüsse',
|
||||||
|
'useServerCtime': 'Serverzeit für die Dateierstellung verwenden',
|
||||||
|
'maxRunning': 'Maximale Anzahl ausgeführter Aufgaben',
|
||||||
|
'defaultDirectDownload': 'Direkten Download standardmäßig aktivieren',
|
||||||
|
'items': '@count Artikel',
|
||||||
|
'subscribeTracker': 'Abonnement-Tracker',
|
||||||
|
'subscribeFail':
|
||||||
|
'Anmeldung fehlgeschlagen. Bitte überprüfen Sie das Netzwerk oder versuchen Sie es später erneut.',
|
||||||
|
'update': 'Aktualisieren',
|
||||||
|
'updateDaily': 'Tägliche Aktualisierung',
|
||||||
|
'lastUpdate': 'Letzte Aktualisierung: @time',
|
||||||
|
'addTracker': 'Tracker hinzufügen',
|
||||||
|
'addTrackerHit': 'Bitte geben Sie die URL des Tracker-Servers ein, eine pro Zeile',
|
||||||
|
'ui': 'Benutzeroberfläche',
|
||||||
|
'theme': 'Thema',
|
||||||
|
'themeSystem': 'System',
|
||||||
|
'themeLight': 'Lichtmodus',
|
||||||
|
'themeDark': 'Dunkler Modus',
|
||||||
|
'locale': 'Sprache',
|
||||||
|
'about': 'Über',
|
||||||
|
'homepage': 'Homepage',
|
||||||
|
'version': 'Version',
|
||||||
|
'protocol': 'Protokoll',
|
||||||
|
'port': 'Port',
|
||||||
|
'apiToken': 'API Token',
|
||||||
|
'notSet': 'NS',
|
||||||
|
'set': 'SET',
|
||||||
|
'portInUse': 'Port [@port] wird verwendet, bitte ändern Sie den Port',
|
||||||
|
'effectAfterRestart': 'Wirkung nach Neustart',
|
||||||
|
'developer': 'Entwickler-in',
|
||||||
|
'logDirectory': 'Protokollverzeichnis',
|
||||||
|
'show': 'Zeigen',
|
||||||
|
'continue': 'Weitermachen',
|
||||||
|
'pause': 'Pause',
|
||||||
|
'startAll': 'Alles starten',
|
||||||
|
'pauseAll': 'Alle pausieren',
|
||||||
|
'deleteTask': '@count Aufgaben löschen',
|
||||||
|
'deleteTaskTip': 'Heruntergeladene Dateien behalten',
|
||||||
|
'delete': 'Löschen',
|
||||||
|
'newVersionTitle': 'Entdecken Sie die neue Version @version',
|
||||||
|
'newVersionUpdate': 'Jetzt aktualisieren',
|
||||||
|
'newVersionLater': 'Später',
|
||||||
|
'extensions': 'Erweiterungen',
|
||||||
|
'extensionInstallUrl': 'Installations-URL',
|
||||||
|
'extensionInstallSuccess': 'Erfolgreich installiert',
|
||||||
|
'extensionUpdateSuccess': 'Erfolgreich aktualisiert',
|
||||||
|
'extensionDelete': 'Erweiterung löschen',
|
||||||
|
'extensionAlreadyLatest': 'Es ist bereits die neueste Version',
|
||||||
|
'extensionFind': 'Erweiterungen suchen',
|
||||||
|
'extensionDevelop': 'Erweiterungen entwickeln',
|
||||||
|
'history': 'Verlauf',
|
||||||
|
'clearHistory': 'Verlauf löschen',
|
||||||
|
'noHistoryFound': 'Kein Verlauf gefunden',
|
||||||
|
'serviceTitle': 'Download-Service',
|
||||||
|
'serviceText': 'Läuft',
|
||||||
|
'network': 'Netzwerk',
|
||||||
|
'proxy': 'Proxy',
|
||||||
|
'noProxy': 'Kein Proxy',
|
||||||
|
'systemProxy': 'System-Proxy',
|
||||||
|
'customProxy': 'Benutzerdefinierter Proxy',
|
||||||
|
'server': 'Server',
|
||||||
|
'username': 'Benutzername',
|
||||||
|
'password': 'Passwort',
|
||||||
|
'thanks': 'Danke',
|
||||||
|
'thanksDesc':
|
||||||
|
'Vielen Dank an alle Mitwirkenden, die beim Aufbau und der Entwicklung der Gopeed-Community geholfen haben!',
|
||||||
|
'browserExtension': 'Browsererweiterung',
|
||||||
|
'launchAtStartup': 'Beim Start starten',
|
||||||
|
'seedConfig': 'Seed-Konfiguration',
|
||||||
|
'seedKeep': 'Weiter-seeden bis manuell gestoppt',
|
||||||
|
'seedRatio': 'Seed Verhältniss',
|
||||||
|
'seedTime': 'Seed-Zeit (Minuten)',
|
||||||
|
'setAsDefaultBtClient': 'Als Standard-BT-Client festlegen',
|
||||||
|
'taskDetail': 'Aufgabendetails',
|
||||||
|
'taskName': 'Aufgabenname',
|
||||||
|
'taskUrl': 'Aufgaben-URL',
|
||||||
|
'downloadPath': 'Download-Pfad',
|
||||||
|
'skipVerifyCert': 'Zertifikatsüberprüfung überspringen',
|
||||||
|
'name': 'Name',
|
||||||
|
'size': 'Größe',
|
||||||
|
'unknown': 'Unbekannt',
|
||||||
|
'fileSelectedCount': 'Dateien: ',
|
||||||
|
'fileSelectedSize': 'Größe: ',
|
||||||
|
'httpHeaderName': 'Header-Name',
|
||||||
|
'httpHeaderValue': 'Header-Wert',
|
||||||
|
'login': 'Login',
|
||||||
|
'username_required': 'Bitte geben Sie Ihren Benutzernamen ein',
|
||||||
|
'password_required': 'Bitte geben Sie Ihr Passwort ein',
|
||||||
|
'login_success': 'Anmeldung erfolgreich',
|
||||||
|
'login_failed': 'Anmeldung fehlgeschlagen, bitte überprüfen Sie Ihren Benutzernamen und Ihr Passwort',
|
||||||
|
'login_failed_network':
|
||||||
|
'Anmeldung fehlgeschlagen, bitte überprüfen Sie Ihre Netzwerkverbindung',
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -52,6 +52,7 @@ const enUS = {
|
|||||||
'themeLight': 'Light',
|
'themeLight': 'Light',
|
||||||
'themeDark': 'Dark',
|
'themeDark': 'Dark',
|
||||||
'locale': 'Language',
|
'locale': 'Language',
|
||||||
|
'notifyWhenNewVersion': 'Notify for updates',
|
||||||
'about': 'About',
|
'about': 'About',
|
||||||
'homepage': 'Homepage',
|
'homepage': 'Homepage',
|
||||||
'version': 'Version',
|
'version': 'Version',
|
||||||
@@ -125,7 +126,5 @@ const enUS = {
|
|||||||
'login_failed': 'Login failed, please check your username and password',
|
'login_failed': 'Login failed, please check your username and password',
|
||||||
'login_failed_network':
|
'login_failed_network':
|
||||||
'Login failed, please check your network connection',
|
'Login failed, please check your network connection',
|
||||||
'networkAutoControl': 'Network Auto Control',
|
|
||||||
'networkAutoControlTip': 'Automatically pause downloads when switching from WiFi to mobile data, and resume when switching back to WiFi',
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -104,7 +104,5 @@ const esES = {
|
|||||||
'taskUrl': 'URL de la Tarea',
|
'taskUrl': 'URL de la Tarea',
|
||||||
'downloadPath': 'Ruta de Descarga',
|
'downloadPath': 'Ruta de Descarga',
|
||||||
'skipVerifyCert': 'Omitir Verificación de Certificado',
|
'skipVerifyCert': 'Omitir Verificación de Certificado',
|
||||||
'networkAutoControl': 'Control Automático de Red',
|
|
||||||
'networkAutoControlTip': 'Pausar automáticamente las descargas al cambiar de WiFi a datos móviles y reanudar al volver a WiFi',
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -93,7 +93,5 @@ const frFR = {
|
|||||||
'browserExtension': 'Extension du navigateur',
|
'browserExtension': 'Extension du navigateur',
|
||||||
'launchAtStartup': 'Lancer au démarrage',
|
'launchAtStartup': 'Lancer au démarrage',
|
||||||
'skipVerifyCert': 'Bypass Verifikasi Sertifikat',
|
'skipVerifyCert': 'Bypass Verifikasi Sertifikat',
|
||||||
'networkAutoControl': 'Contrôle automatique du réseau',
|
|
||||||
'networkAutoControlTip': 'Mettre automatiquement en pause les téléchargements lors du passage du WiFi aux données mobiles et reprendre lors du retour au WiFi',
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -97,7 +97,5 @@ const itIT = {
|
|||||||
'browserExtension': 'Estensione del browser',
|
'browserExtension': 'Estensione del browser',
|
||||||
'launchAtStartup': "Lancia all'avvio",
|
'launchAtStartup': "Lancia all'avvio",
|
||||||
'skipVerifyCert': 'Salta la verifica del certificato',
|
'skipVerifyCert': 'Salta la verifica del certificato',
|
||||||
'networkAutoControl': 'Controllo automatico della rete',
|
|
||||||
'networkAutoControlTip': 'Mette automaticamente in pausa i download quando si passa dal WiFi ai dati mobili e riprende quando si torna al WiFi',
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -63,7 +63,5 @@ const jaJP = {
|
|||||||
'thanksDesc': 'Gopeedコミュニティの建設に協力してくださったすべての貢献者の方々に感謝します!',
|
'thanksDesc': 'Gopeedコミュニティの建設に協力してくださったすべての貢献者の方々に感謝します!',
|
||||||
'browserExtension': 'ブラウザ拡張機能',
|
'browserExtension': 'ブラウザ拡張機能',
|
||||||
'skipVerifyCert': '証明書の検証をスキップ',
|
'skipVerifyCert': '証明書の検証をスキップ',
|
||||||
'networkAutoControl': 'ネットワーク自動制御',
|
|
||||||
'networkAutoControlTip': 'WiFiからモバイルデータに切り替わった時に自動的にダウンロードを一時停止し、WiFiに戻った時に自動的に再開します',
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -119,7 +119,5 @@ const ruRU = {
|
|||||||
'fileSelectedSize': 'Размер: ',
|
'fileSelectedSize': 'Размер: ',
|
||||||
'httpHeaderName': 'Название заголовка HTTP',
|
'httpHeaderName': 'Название заголовка HTTP',
|
||||||
'httpHeaderValue': 'Значение заголовка HTTP',
|
'httpHeaderValue': 'Значение заголовка HTTP',
|
||||||
'networkAutoControl': 'Автоматическое управление сетью',
|
|
||||||
'networkAutoControlTip': 'Автоматически приостанавливать загрузки при переключении с WiFi на мобильные данные и возобновлять при возврате к WiFi',
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -90,7 +90,5 @@ const viVN = {
|
|||||||
'Cảm ơn tất cả những người đóng góp đã giúp xây dựng và phát triển cộng đồng Gopeed!',
|
'Cảm ơn tất cả những người đóng góp đã giúp xây dựng và phát triển cộng đồng Gopeed!',
|
||||||
'browserExtension': 'Tiện ích mở rộng trình duyệt',
|
'browserExtension': 'Tiện ích mở rộng trình duyệt',
|
||||||
'skipVerifyCert': 'Bỏ qua xác thực chứng chỉ',
|
'skipVerifyCert': 'Bỏ qua xác thực chứng chỉ',
|
||||||
'networkAutoControl': 'Điều khiển mạng tự động',
|
|
||||||
'networkAutoControlTip': 'Tự động tạm dừng tải xuống khi chuyển từ WiFi sang dữ liệu di động và tiếp tục khi quay lại WiFi',
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -51,6 +51,7 @@ const zhCN = {
|
|||||||
'themeLight': '明亮主题',
|
'themeLight': '明亮主题',
|
||||||
'themeDark': '暗黑主题',
|
'themeDark': '暗黑主题',
|
||||||
'locale': '语言',
|
'locale': '语言',
|
||||||
|
'notifyWhenNewVersion': '有新版本时提醒',
|
||||||
'about': '关于',
|
'about': '关于',
|
||||||
'homepage': '主页',
|
'homepage': '主页',
|
||||||
'version': '版本',
|
'version': '版本',
|
||||||
@@ -122,7 +123,5 @@ const zhCN = {
|
|||||||
'login_success': '登录成功',
|
'login_success': '登录成功',
|
||||||
'login_failed': '登录失败,请检查用户名和密码',
|
'login_failed': '登录失败,请检查用户名和密码',
|
||||||
'login_failed_network': '登录失败,请检查网络连接',
|
'login_failed_network': '登录失败,请检查网络连接',
|
||||||
'networkAutoControl': '网络状态自动控制',
|
|
||||||
'networkAutoControlTip': '当网络从WiFi切换到移动数据时自动暂停下载,切换回WiFi时自动恢复下载',
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -116,7 +116,5 @@ const zhTW = {
|
|||||||
'fileSelectedSize': '大小:',
|
'fileSelectedSize': '大小:',
|
||||||
'httpHeaderName': '標頭名稱',
|
'httpHeaderName': '標頭名稱',
|
||||||
'httpHeaderValue': '標頭值',
|
'httpHeaderValue': '標頭值',
|
||||||
'networkAutoControl': '網路狀態自動控制',
|
|
||||||
'networkAutoControlTip': '當網路從WiFi切換到流動數據時自動暫停下載,切換回WiFi時自動恢復下載',
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
|
import 'langs/de_de.dart';
|
||||||
import 'langs/en_us.dart';
|
import 'langs/en_us.dart';
|
||||||
import 'langs/fa_ir.dart';
|
import 'langs/fa_ir.dart';
|
||||||
import 'langs/fr_fr.dart';
|
import 'langs/fr_fr.dart';
|
||||||
@@ -41,5 +42,6 @@ class _Messages extends Translations {
|
|||||||
...ukUA,
|
...ukUA,
|
||||||
...huHU,
|
...huHU,
|
||||||
...ptBR,
|
...ptBR,
|
||||||
|
...deDE
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -24,6 +24,8 @@ class Args {
|
|||||||
|
|
||||||
bool hidden = false;
|
bool hidden = false;
|
||||||
|
|
||||||
|
Args();
|
||||||
|
|
||||||
Args.parse(List<String> args) {
|
Args.parse(List<String> args) {
|
||||||
final parser = ArgParser();
|
final parser = ArgParser();
|
||||||
parser.addFlag(flagHidden);
|
parser.addFlag(flagHidden);
|
||||||
@@ -33,7 +35,22 @@ class Args {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void main(List<String> arguments) async {
|
void main(List<String> arguments) async {
|
||||||
final args = Args.parse(arguments);
|
Args args;
|
||||||
|
// Parse url scheme arguments, e.g. gopeed:?hidden=true
|
||||||
|
// TODO: macos open url handle
|
||||||
|
// TODO: macos updater test
|
||||||
|
if (arguments.firstOrNull?.startsWith("gopeed:") == true) {
|
||||||
|
try {
|
||||||
|
final uri = Uri.parse(arguments.first);
|
||||||
|
args = Args()..hidden = uri.queryParameters["hidden"] == "true";
|
||||||
|
} catch (e) {
|
||||||
|
// ignore
|
||||||
|
args = Args.parse([]);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
args = Args.parse(arguments);
|
||||||
|
}
|
||||||
|
|
||||||
await init(args);
|
await init(args);
|
||||||
onStart();
|
onStart();
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ const _firefoxNativeHostsKey = r'Software\Mozilla\NativeMessagingHosts';
|
|||||||
|
|
||||||
/// Install host binary for browser extension
|
/// Install host binary for browser extension
|
||||||
Future<void> doInstallHost() async {
|
Future<void> doInstallHost() async {
|
||||||
final hostPath = Util.homePathJoin(_hostExecName);
|
final hostPath = await Util.homePathJoin(_hostExecName);
|
||||||
await Util.installAsset('assets/exec/$_hostExecName', hostPath,
|
await Util.installAsset('assets/exec/$_hostExecName', hostPath,
|
||||||
executable: true);
|
executable: true);
|
||||||
}
|
}
|
||||||
@@ -62,7 +62,7 @@ Future<bool> doCheckBrowserInstalled(Browser browser) async {
|
|||||||
Future<bool> doCheckManifestInstalled(Browser browser) async {
|
Future<bool> doCheckManifestInstalled(Browser browser) async {
|
||||||
if (await checkBrowserInstalled(browser) == false) return false;
|
if (await checkBrowserInstalled(browser) == false) return false;
|
||||||
|
|
||||||
final manifestPath = _getManifestPath(browser);
|
final manifestPath = await _getManifestPath(browser);
|
||||||
if (manifestPath == null) return false;
|
if (manifestPath == null) return false;
|
||||||
|
|
||||||
if (Platform.isWindows) {
|
if (Platform.isWindows) {
|
||||||
@@ -86,7 +86,7 @@ Future<void> doInstallManifest(Browser browser) async {
|
|||||||
if (await checkBrowserInstalled(browser) == false) return;
|
if (await checkBrowserInstalled(browser) == false) return;
|
||||||
if (await checkManifestInstalled(browser)) return;
|
if (await checkManifestInstalled(browser)) return;
|
||||||
|
|
||||||
final manifestPath = _getManifestPath(browser)!;
|
final manifestPath = (await _getManifestPath(browser))!;
|
||||||
final manifestContent = await _getManifestContent(browser);
|
final manifestContent = await _getManifestContent(browser);
|
||||||
final manifestDir = path.dirname(manifestPath);
|
final manifestDir = path.dirname(manifestPath);
|
||||||
await Directory(manifestDir).create(recursive: true);
|
await Directory(manifestDir).create(recursive: true);
|
||||||
@@ -209,11 +209,11 @@ List<String> _getUnixExecutablePaths(Browser browser) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String? _getManifestPath(Browser browser) {
|
Future<String?> _getManifestPath(Browser browser) async {
|
||||||
final manifestName =
|
final manifestName =
|
||||||
browser == Browser.firefox ? '$_hostName.moz.json' : '$_hostName.json';
|
browser == Browser.firefox ? '$_hostName.moz.json' : '$_hostName.json';
|
||||||
if (Platform.isWindows) {
|
if (Platform.isWindows) {
|
||||||
return Util.homePathJoin(manifestName);
|
return await Util.homePathJoin(manifestName);
|
||||||
}
|
}
|
||||||
|
|
||||||
final home =
|
final home =
|
||||||
@@ -259,7 +259,7 @@ Future<bool> _checkWindowsRegistry(String keyPath) async {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<String> _getManifestContent(Browser browser) async {
|
Future<String> _getManifestContent(Browser browser) async {
|
||||||
final hostPath = Util.homePathJoin(_hostExecName);
|
final hostPath = await Util.homePathJoin(_hostExecName);
|
||||||
final manifest = {
|
final manifest = {
|
||||||
'name': _hostName,
|
'name': _hostName,
|
||||||
'description': 'Gopeed browser extension host',
|
'description': 'Gopeed browser extension host',
|
||||||
|
|||||||
@@ -2,10 +2,12 @@ import 'package:dio/dio.dart';
|
|||||||
|
|
||||||
// List of mirrors for GitHub
|
// List of mirrors for GitHub
|
||||||
const _sourceMirror = [
|
const _sourceMirror = [
|
||||||
// ghfast.top: https://ghfast.top/https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all.txt
|
// github.tbedu.top: https://github.tbedu.top/https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all.txt
|
||||||
["https://ghfast.top/", r"(.*)"],
|
["https://github.tbedu.top/", r"(.*)"],
|
||||||
// github.moeyy.xyz: https://github.moeyy.xyz/https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all.txt
|
// fastgit.cc: https://fastgit.cc/https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all.txt
|
||||||
["https://github.moeyy.xyz/", r"(.*)"],
|
["https://fastgit.cc/", r"(.*)"],
|
||||||
|
// gitproxy.click: https://gitproxy.click/https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all.txt
|
||||||
|
["https://gitproxy.click/", r"(.*)"],
|
||||||
// jsdelivr: https://fastly.jsdelivr.net/gh/ngosang/trackerslist/trackers_all.txt
|
// jsdelivr: https://fastly.jsdelivr.net/gh/ngosang/trackerslist/trackers_all.txt
|
||||||
[
|
[
|
||||||
"https://fastly.jsdelivr.net/gh",
|
"https://fastly.jsdelivr.net/gh",
|
||||||
@@ -15,10 +17,12 @@ const _sourceMirror = [
|
|||||||
|
|
||||||
// List of mirrors for GitHub release
|
// List of mirrors for GitHub release
|
||||||
const _assertMirror = [
|
const _assertMirror = [
|
||||||
// ghfast.top: https://ghfast.top/https://github.com/GopeedLab/gopeed/releases/download/v1.6.10/Gopeed-v1.6.10-windows-amd64.zip
|
// github.tbedu.top: https://https://github.tbedu.top/https://github.com/GopeedLab/gopeed/releases/download/v1.6.10/Gopeed-v1.6.10-windows-amd64.zip
|
||||||
["https://ghfast.top/", r"(.*)"],
|
["https://github.tbedu.top/", r"(.*)"],
|
||||||
// github.moeyy.xyz: https://github.moeyy.xyz/https://github.com/GopeedLab/gopeed/releases/download/v1.6.10/Gopeed-v1.6.10-windows-amd64.zip
|
// fastgit.cc: https://fastgit.cc/https://github.com/GopeedLab/gopeed/releases/download/v1.6.10/Gopeed-v1.6.10-windows-amd64.zip
|
||||||
["https://github.moeyy.xyz/", r"(.*)"],
|
["https://fastgit.cc/", r"(.*)"],
|
||||||
|
// gitproxy.click: https://gitproxy.click/https://github.com/GopeedLab/gopeed/releases/download/v1.6.10/Gopeed-v1.6.10-windows-amd64.zip
|
||||||
|
["https://gitproxy.click/", r"(.*)"],
|
||||||
];
|
];
|
||||||
|
|
||||||
enum MirrorType {
|
enum MirrorType {
|
||||||
|
|||||||
@@ -1,134 +0,0 @@
|
|||||||
import 'dart:async';
|
|
||||||
import 'dart:io';
|
|
||||||
|
|
||||||
import 'package:connectivity_plus/connectivity_plus.dart';
|
|
||||||
import 'package:get/get.dart';
|
|
||||||
|
|
||||||
import '../api/api.dart';
|
|
||||||
import '../database/database.dart';
|
|
||||||
import '../util/log_util.dart';
|
|
||||||
|
|
||||||
enum NetworkType { wifi, mobile, other, none }
|
|
||||||
|
|
||||||
class NetworkMonitor extends GetxService {
|
|
||||||
static NetworkMonitor get to => Get.find();
|
|
||||||
|
|
||||||
late final Connectivity _connectivity;
|
|
||||||
late StreamSubscription<List<ConnectivityResult>> _connectivitySubscription;
|
|
||||||
|
|
||||||
final _isWiFiConnected = false.obs;
|
|
||||||
bool get isWiFiConnected => _isWiFiConnected.value;
|
|
||||||
|
|
||||||
NetworkType _previousNetworkType = NetworkType.none;
|
|
||||||
bool _isInitialized = false;
|
|
||||||
|
|
||||||
@override
|
|
||||||
Future<void> onInit() async {
|
|
||||||
super.onInit();
|
|
||||||
|
|
||||||
logInfo('NetworkMonitor.onInit() called');
|
|
||||||
|
|
||||||
// Only monitor network on mobile platforms
|
|
||||||
if (!Platform.isAndroid && !Platform.isIOS) {
|
|
||||||
logInfo('NetworkMonitor: Not on mobile platform, skipping initialization');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_connectivity = Connectivity();
|
|
||||||
|
|
||||||
// Check initial connectivity state
|
|
||||||
final initialResult = await _connectivity.checkConnectivity();
|
|
||||||
logInfo('NetworkMonitor: Initial connectivity result: $initialResult');
|
|
||||||
_updateNetworkStatus(initialResult);
|
|
||||||
_previousNetworkType = _getNetworkType(initialResult);
|
|
||||||
logInfo('NetworkMonitor: Initial network type: $_previousNetworkType');
|
|
||||||
_isInitialized = true;
|
|
||||||
|
|
||||||
// Listen to connectivity changes
|
|
||||||
_connectivitySubscription = _connectivity.onConnectivityChanged.listen(
|
|
||||||
_onConnectivityChanged,
|
|
||||||
onError: (error) {
|
|
||||||
logError('Network monitoring error: $error');
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
logInfo('Network monitor initialized successfully');
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
void onClose() {
|
|
||||||
_connectivitySubscription.cancel();
|
|
||||||
super.onClose();
|
|
||||||
}
|
|
||||||
|
|
||||||
NetworkType _getNetworkType(List<ConnectivityResult> result) {
|
|
||||||
if (result.contains(ConnectivityResult.wifi)) {
|
|
||||||
return NetworkType.wifi;
|
|
||||||
} else if (result.contains(ConnectivityResult.mobile)) {
|
|
||||||
return NetworkType.mobile;
|
|
||||||
} else if (result.contains(ConnectivityResult.none)) {
|
|
||||||
return NetworkType.none;
|
|
||||||
} else {
|
|
||||||
// Ethernet, Bluetooth, VPN, or other connection types
|
|
||||||
return NetworkType.other;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void _updateNetworkStatus(List<ConnectivityResult> result) {
|
|
||||||
final hasWiFi = result.contains(ConnectivityResult.wifi);
|
|
||||||
_isWiFiConnected.value = hasWiFi;
|
|
||||||
}
|
|
||||||
|
|
||||||
void _onConnectivityChanged(List<ConnectivityResult> result) {
|
|
||||||
logInfo('NetworkMonitor: Connectivity changed event received: $result');
|
|
||||||
|
|
||||||
if (!_isInitialized) {
|
|
||||||
logInfo('NetworkMonitor: Not initialized yet, ignoring connectivity change');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if network auto control is enabled
|
|
||||||
final isNetworkAutoControlEnabled = Database.instance.getNetworkAutoControl();
|
|
||||||
logInfo('NetworkMonitor: Network auto control enabled: $isNetworkAutoControlEnabled');
|
|
||||||
if (!isNetworkAutoControlEnabled) {
|
|
||||||
logInfo('NetworkMonitor: Network auto control disabled, ignoring connectivity change');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_updateNetworkStatus(result);
|
|
||||||
final currentNetworkType = _getNetworkType(result);
|
|
||||||
|
|
||||||
logInfo('Network changed: previous=$_previousNetworkType, current=$currentNetworkType');
|
|
||||||
|
|
||||||
// Only handle WiFi ↔ Mobile transitions, ignore other connection types
|
|
||||||
if (_previousNetworkType == NetworkType.wifi && currentNetworkType == NetworkType.mobile) {
|
|
||||||
_pauseAllDownloads();
|
|
||||||
logInfo('Switched from WiFi to mobile data - pausing all downloads');
|
|
||||||
} else if (_previousNetworkType == NetworkType.mobile && currentNetworkType == NetworkType.wifi) {
|
|
||||||
_resumeAllDownloads();
|
|
||||||
logInfo('Switched from mobile data to WiFi - resuming all downloads');
|
|
||||||
} else {
|
|
||||||
logInfo('Network change ignored: not a WiFi ↔ Mobile transition');
|
|
||||||
}
|
|
||||||
|
|
||||||
_previousNetworkType = currentNetworkType;
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _pauseAllDownloads() async {
|
|
||||||
try {
|
|
||||||
await pauseAllTasks(null);
|
|
||||||
logInfo('Successfully paused all downloads due to network change');
|
|
||||||
} catch (e) {
|
|
||||||
logError('Failed to pause all downloads: $e');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _resumeAllDownloads() async {
|
|
||||||
try {
|
|
||||||
await continueAllTasks(null);
|
|
||||||
logInfo('Successfully resumed all downloads due to network change');
|
|
||||||
} catch (e) {
|
|
||||||
logError('Failed to resume all downloads: $e');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loaded 50 of 54 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user