test

1. support onError event
2. add built-in MessageError

.github/release-drafter.yml

@@ -19,6 +19,8 @@ categories:
     label: 'doc'
   - title: '🚀 CI/CD'
     label: 'ci'
+  - title: '🌎 Internationalization'
+    label: 'translation'
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 version-resolver:
   major:

.github/workflows/build.yml

@@ -223,126 +223,32 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - run: |
-          sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev
+          sudo apt update -y
+          # flutter build dependencies
+          sudo apt install -y ninja-build libgtk-3-dev libappindicator3-dev
+          # rpm build dependencies
+          sudo apt install -y rpm patchelf
+          # appimage build dependencies
+          sudo apt install -y libfuse2 locate
+          wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
+          chmod +x appimagetool
+          sudo mv appimagetool /usr/local/bin/
       - name: Build
         env:
           VERSION: ${{ needs.get-release.outputs.tag_name }}
         run: |
           go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
           cd ui/flutter
-          flutter build linux
-          mkdir -p build/dist
-          
-          # Build portable
-          tar -C build/linux/x64/release/bundle -czaf build/dist/Gopeed-$VERSION-linux-amd64-portable.tar.gz ./
-          
-          # Build deb package
-          mkdir -p debian/gopeed/opt/gopeed
-          mkdir -p debian/gopeed/usr/share/applications
-          mkdir -p debian/gopeed/usr/share/icons/hicolor/scalable/apps
-          mkdir -p debian/gopeed/DEBIAN
-
-          cp -r build/linux/x64/release/bundle/* debian/gopeed/opt/gopeed/
-          cp assets/icon/icon.svg debian/gopeed/usr/share/icons/hicolor/scalable/apps/com.gopeed.Gopeed.svg
-          
-          cat>debian/gopeed/DEBIAN/postinst<<EOF
-          #!/bin/bash
-          ln -sf /opt/gopeed/gopeed /usr/bin/gopeed
-          EOF
-
-          cat>debian/gopeed/DEBIAN/postrm<<EOF
-          #!/bin/bash
-          rm -rf /usr/bin/gopeed
-          EOF
-
-          chmod 0755 debian/gopeed/DEBIAN/postinst
-          chmod 0755 debian/gopeed/DEBIAN/postrm
-
-          cat>debian/gopeed/DEBIAN/control<<EOF
-          Package: gopeed
-          Version: ${VERSION:1}
-          Architecture: amd64
-          Essential: no
-          Priority: optional
-          Depends: 
-          Maintainer: monkeyWie
-          Description: High speed downloader that supports all platforms.
-          EOF
-
-          cp linux/assets/com.gopeed.Gopeed.desktop debian/gopeed/usr/share/applications/gopeed.desktop
-
-          dpkg-deb --build debian/gopeed
-          mv debian/gopeed.deb build/dist/Gopeed-$VERSION-linux-amd64.deb
-          
-          # Build AppImage
-          sudo apt-get -y install libfuse2
-          wget -O appimage-builder https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage
-          chmod +x appimage-builder
-          mkdir AppDir
-          cp -r build/linux/x64/release/bundle/* AppDir
-          mkdir -p AppDir/usr/share/icons/hicolor/scalable/apps/
-          cp assets/icon/icon.svg AppDir/usr/share/icons/hicolor/scalable/apps/gopeed.svg
-          cat>AppImageBuilder.yml<<EOF
-          version: 1
-          AppDir:
-            path: ${PWD}/AppDir
-            app_info:
-              id: com.gopeed.gopeed
-              name: Gopeed
-              icon: gopeed
-              version: ${VERSION:1}
-              exec: gopeed
-              exec_args: \$@
-            apt:
-              arch: amd64
-              allow_unauthenticated: true
-              sources:
-                - sourceline: deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy main restricted
-                    universe multiverse
-                - sourceline: deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-updates main
-                    restricted universe multiverse
-                - sourceline: deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-backports
-                    main restricted universe multiverse
-                - sourceline: deb http://security.ubuntu.com/ubuntu/ jammy-security main restricted
-                    universe multiverse
-              include: []
-            files:
-              include: []
-              exclude:
-                - usr/share/man
-                - usr/share/doc/*/README.*
-                - usr/share/doc/*/changelog.*
-                - usr/share/doc/*/NEWS.*
-                - usr/share/doc/*/TODO.*
-            test:
-              fedora-30:
-                image: appimagecrafters/tests-env:fedora-30
-                command: ./AppRun
-              debian-stable:
-                image: appimagecrafters/tests-env:debian-stable
-                command: ./AppRun
-              archlinux-latest:
-                image: appimagecrafters/tests-env:archlinux-latest
-                command: ./AppRun
-              centos-7:
-                image: appimagecrafters/tests-env:centos-7
-                command: ./AppRun
-              ubuntu-xenial:
-                image: appimagecrafters/tests-env:ubuntu-xenial
-                command: ./AppRun
-          AppImage:
-            arch: x86_64
-            update-information: guess
-          EOF
-          ./appimage-builder --skip-tests --recipe AppImageBuilder.yml
-          mv Gopeed-*-x86_64.AppImage build/dist/Gopeed-$VERSION-linux-amd64.AppImage
-
+          dart pub global activate -sgit https://github.com/GopeedLab/flutter_distributor.git --git-path packages/flutter_distributor
+          flutter_distributor package --platform linux --targets appimage,deb
+          cd dist/*
+          mv gopeed-*-linux.AppImage Gopeed-${VERSION}-linux-x86_64.AppImage
+          mv gopeed-*-linux.deb Gopeed-${VERSION}-linux-amd64.deb
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
           upload_url: ${{ needs.get-release.outputs.upload_url }}
-          asset_path: ui/flutter/build/dist/*
+          asset_path: ui/flutter/dist/*/*
           overwrite: true
   build-snap:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'snap' }}
@@ -405,7 +311,7 @@ jobs:
               plugin: flutter
               stage-packages:
                 - libgtk-3-dev
-                - libayatana-appindicator3-dev
+                - libappindicator3-dev
               flutter-target: lib/main.dart
           EOF
           

.gitignore

@@ -4,7 +4,7 @@
 *.dll
 *.so
 *.dylib
-
+ui/flutter/dist/
 # Test binary, built with `go test -c`
 *.test
 

CONTRIBUTING.md

@@ -17,17 +17,9 @@ start the front-end flutter project in `debug` mode to run.
 
 ## Translation
 
-The internationalization files of Gopeed are located in the `ui/flutter/assets/locales` directory.
+The internationalization files of Gopeed are located in the `ui/flutter/lib/i18n/langs` directory.
 You only need to add the corresponding language file in this directory.
 
-
-Generate locales after you edit locales:
-
-
-```
-get generate locales 
-```
-
 Please refer to `en_us.dart` for translation.
 
 ## flutter development
@@ -38,17 +30,4 @@ Turn on build_runner watcher if you want to edit api/models:
 
 ```
 flutter pub run build_runner watch
-```
-
-
-get-cli commands usages:
-
-```
- create:  
-    controller:  Generate controller
-    page:  Use to generate pages
-    view:  Generate view
-  generate:
-    locales:  Generate translation file from json files
-    model:  generate Class model from json
-```
+```

CONTRIBUTING_ja-JP.md

@@ -17,17 +17,9 @@
 
 ## 翻訳
 
-Gopeed の国際化ファイルは `ui/flutter/assets/locales` ディレクトリにあります。
+Gopeed の国際化ファイルは `ui/flutter/lib/i18n/langs` ディレクトリにあります。
 このディレクトリに対応する言語ファイルを追加するだけでよいです。
 
-
-ロケール編集後にロケールを生成:
-
-
-```
-get generate locales
-```
-
 翻訳については `en_us.dart` を参照してください。
 
 ## flutter での開発
@@ -39,16 +31,3 @@ api/models を編集したい場合は build_runner watcher をオンにしま
 ```
 flutter pub run build_runner watch
 ```
-
-
-get-cli コマンドの使用法:
-
-```
- create:
-    controller:  Generate controller
-    page:  Use to generate pages
-    view:  Generate view
-  generate:
-    locales:  Generate translation file from json files
-    model:  generate Class model from json
-```

CONTRIBUTING_zh-CN.md

@@ -14,15 +14,9 @@ flutter 项目即可运行。
 
 ## 翻译
  
-Gopeed 的国际化文件位于 `ui/flutter/assets/locales` 目录下，只需要在该目录下添加对应的语言文件即可。
+Gopeed 的国际化文件位于 `ui/flutter/lib/i18n/langs` 目录下，只需要在该目录下添加对应的语言文件即可。
 
-编辑locales后请运行以下命令:
-
-```
-get generate locales 
-```
-
-请注意以 `en_US.json` 为参照进行翻译。
+请注意以 `en_us.dart` 为参照进行翻译。
 
 ## flutter开发
 
@@ -34,15 +28,3 @@ get generate locales
 flutter pub run build_runner watch
 ```
 
-适用get-cli 命令:
-
-```
- create:  
-    controller:  Generate controller
-    page:  Use to generate pages
-    view:  Generate view
-  generate:
-    locales:  Generate translation file from json files
-    model:  generate Class model from json
-```
-

CONTRIBUTING_zh-TW.md

@@ -12,15 +12,10 @@
 
 ## 翻譯
  
-Gopeed 的翻譯文件位於 `ui/flutter/assets/locales` 目錄中，只需要修改或新建翻譯文件即可。
+Gopeed 的翻譯文件位於 `ui/flutter/lib/i18n/langs` 目錄中，只需要修改或新建翻譯文件即可。
 
-修改locales後請執行一下指令:
 
-```
-get generate locales 
-```
-
-請以 `en_US.json` 作為參照。
+請以 `en_us.dart` 作為參照。
 
 ## flutter開發
 
@@ -31,16 +26,3 @@ get generate locales
 ```
 flutter pub run build_runner watch
 ```
-
-適用於 get-cli 的指令:
-
-```
- create:  
-    controller:  Generate controller
-    page:  Use to generate pages
-    view:  Generate view
-  generate:
-    locales:  Generate translation file from json files
-    model:  generate Class model from json
-```
-

Dockerfile

@@ -17,5 +17,6 @@ FROM alpine:3.14.2
 LABEL maintainer="monkeyWie"
 WORKDIR /app
 COPY --from=go /app/dist/gopeed ./
+VOLUME ["/app/storage"]
 EXPOSE 9999
 ENTRYPOINT ["./gopeed"]

README.md

@@ -16,7 +16,7 @@
 Gopeed (full name Go Speed), a high-speed downloader developed by `Golang` + `Flutter`, supports (HTTP, BitTorrent, Magnet) protocol, and supports all platforms. In addition to basic download functions, Gopeed is also a highly customizable downloader that supports implementing more features through integration with [APIs](https://docs.gopeed.com/dev-api.html) or installation and development of [extensions](https://docs.gopeed.com/dev-extension.html).
 
 
-Visit ✈ [Official Website](https://gopeed.com) | 📖 [Develop Docs](https://docs.gopeed.com)
+Visit ✈ [Official Website](https://gopeed.com) | 📖 [Official Docs](https://docs.gopeed.com)
 
 ## Install
 
@@ -47,9 +47,11 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 #### Start directly
 
 ```bash
-docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads liwei2633/gopeed
+docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads -v /path/to/storage:/app/storage liwei2633/gopeed
 ```
 
+[More details for docker](https://docs.gopeed.com/install.html#docker-installation)
+
 #### Using Docker Compose
 
 ```bash
@@ -160,7 +162,6 @@ cd ../../
 rm -rf cmd/web/dist
 cp -r ui/flutter/build/web cmd/web/dist
 go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
-go run cmd/web/main.go
 ```
 
 ## Credits

README_ja-JP.md

@@ -46,9 +46,11 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 #### 直接始める
 
 ```bash
-docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads liwei2633/gopeed
+docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads -v /path/to/storage:/app/storage liwei2633/gopeed
 ```
 
+[Dockerの使用については](https://docs.gopeed.com/install.html#docker-installation)
+
 #### Docker Compose の使用
 
 ```bash
@@ -159,7 +161,6 @@ cd ../../
 rm -rf cmd/web/dist
 cp -r ui/flutter/build/web cmd/web/dist
 go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
-go run cmd/web/main.go
 ```
 
 ## 感謝

README_zh-CN.md

@@ -13,9 +13,9 @@
 
 ## 介绍
 
-Gopeed（全称 Go Speed），是一款由`Golang`+`Flutter`开发的高速下载器，支持（HTTP、BitTorrent、Magnet）协议下载，并且支持全平台使用。除了基本的下载功能外，Gopeed 还是一款高度可定制化的下载器，支持通过对接[APIs](https://docs.gopeed.com/zh/dev-api.html)或者安装和开发[扩展](https://docs.gopeed.com/zh/dev-extension.html)来实现更多的功能。
+Gopeed（全称 Go Speed），直译过来中文名叫做`够快下载器`（不是狗屁下载器！），是一款由`Golang`+`Flutter`开发的高速下载器，支持（HTTP、BitTorrent、Magnet）协议下载，并且支持全平台使用。除了基本的下载功能外，Gopeed 还是一款高度可定制化的下载器，支持通过对接[APIs](https://docs.gopeed.com/zh/dev-api.html)或者安装和开发[扩展](https://docs.gopeed.com/zh/dev-extension.html)来实现更多的功能。
 
-访问 ✈ [官方网站](https://gopeed.com/zh-CN) | 📖 [开发文档](https://docs.gopeed.com/zh/)
+访问 ✈ [官方网站](https://gopeed.com/zh-CN) | 📖 [官方文档](https://docs.gopeed.com/zh/)
 
 ## 安装
 
@@ -46,9 +46,11 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 #### 直接运行
 
 ```bash
-docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads liwei2633/gopeed
+docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads -v /path/to/storage:/app/storage liwei2633/gopeed
 ```
 
+[更多关于 Docker 的使用](https://docs.gopeed.com/zh/install.html#docker-%E5%AE%89%E8%A3%85)
+
 #### 使用 Docker Compose
 
 ```bash
@@ -159,7 +161,6 @@ cd ../../
 rm -rf cmd/web/dist
 cp -r ui/flutter/build/web cmd/web/dist
 go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
-go run cmd/web/main.go
 ```
 
 ## 感谢

README_zh-TW.md

@@ -46,9 +46,11 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 #### 直接執行
 
 ```bash
-docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads liwei2633/gopeed
+docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads -v /path/to/storage:/app/storage liwei2633/gopeed
 ```
 
+[更多關於 Docker 的使用](https://docs.gopeed.com/zh/install.html#docker-%E5%AE%89%E8%A3%85)
+
 #### 使用 Docker Compose
 
 ```bash
@@ -159,7 +161,6 @@ cd ../../
 rm -rf cmd/web/dist
 cp -r ui/flutter/build/web cmd/web/dist
 go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
-go run cmd/web/main.go
 ```
 
 ## 感謝

cmd/web/flags.go

@@ -23,7 +23,7 @@ func parse() *args {
 	cliArgs.Address = flag.String("A", "0.0.0.0", "Bind Address")
 	cliArgs.Port = flag.Int("P", 9999, "Bind Port")
 	cliArgs.Username = flag.String("u", "gopeed", "HTTP Basic Auth Username")
-	cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Password")
+	cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Pwd")
 	cliArgs.ApiToken = flag.String("T", "", "API token, that can only be used when basic authentication is enabled.")
 	cliArgs.configPath = flag.String("c", "./config.json", "Config file path")
 	flag.Parse()

cmd/web/main.go

@@ -9,6 +9,8 @@ import (
 	"github.com/GopeedLab/gopeed/cmd"
 	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"io/fs"
+	"os"
+	"path/filepath"
 )
 
 //go:embed dist/*
@@ -29,10 +31,17 @@ func main() {
 		}
 	}
 
+	exe, err := os.Executable()
+	if err != nil {
+		panic(err)
+	}
+	dir := filepath.Dir(exe)
+
 	cfg := &model.StartConfig{
 		Network:        "tcp",
 		Address:        fmt.Sprintf("%s:%d", *args.Address, *args.Port),
 		Storage:        model.StorageBolt,
+		StorageDir:     filepath.Join(dir, "storage"),
 		ApiToken:       *args.ApiToken,
 		ProductionMode: true,
 		WebEnable:      true,

docker-compose.yml

@@ -4,8 +4,9 @@ services:
   gopeed:
     container_name: gopeed
     ports:
-      - 9999:9999 # HTTP port (host:container)
+      - "9999:9999" # HTTP port (host:container)
     image: liwei2633/gopeed
     volumes:
-      - ~/Downloads:/root/Downloads # replace with your prefer path
+      - ~/gopeed/Downloads:/root/Downloads # mount download path
+      #- ~/gopeed/storage:/app/storage # if you need to mount storage path, uncomment this line
     restart: unless-stopped

go.mod

@@ -5,6 +5,7 @@ go 1.19
 require (
 	github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9
 	github.com/anacrolix/torrent v1.52.5
+	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
 	github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
 	github.com/dop251/goja_nodejs v0.0.0-20231122114759-e84d9a924c5c
 	github.com/go-git/go-git/v5 v5.8.1

go.sum

@@ -8,7 +8,6 @@ crawshaw.io/sqlite v0.3.3-0.20220618202545-d1964889ea3c/go.mod h1:igAO5JulrQ1Dbd
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU=
-filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
@@ -34,7 +33,6 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alexflint/go-scalar v1.1.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o=
 github.com/anacrolix/chansync v0.3.0 h1:lRu9tbeuw3wl+PhMu/r+JJCRu5ArFXIluOgdF0ao6/U=
 github.com/anacrolix/chansync v0.3.0/go.mod h1:DZsatdsdXxD0WiwcGl0nJVwyjCKMDv+knl1q2iBjA2k=
 github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444 h1:8V0K09lrGoeT2KRJNOtspA7q+OMxGwQqK/Ug0IiaaRE=
@@ -74,7 +72,6 @@ github.com/anacrolix/mmsg v1.0.0 h1:btC7YLjOn29aTUAExJiVUhQOuf/8rhm+/nWCMAnL3Hg=
 github.com/anacrolix/mmsg v1.0.0/go.mod h1:x8kRaJY/dCrY9Al0PEcj1mb/uFHwP6GCJ9fLl4thEPc=
 github.com/anacrolix/multiless v0.3.0 h1:5Bu0DZncjE4e06b9r1Ap2tUY4Au0NToBP5RpuEngSis=
 github.com/anacrolix/multiless v0.3.0/go.mod h1:TrCLEZfIDbMVfLoQt5tOoiBS/uq4y8+ojuEVVvTNPX4=
-github.com/anacrolix/publicip v0.2.0/go.mod h1:67G1lVkLo8UjdEcJkwScWVTvlJ35OCDsRJoWXl/wi4g=
 github.com/anacrolix/stm v0.2.0/go.mod h1:zoVQRvSiGjGoTmbM0vSLIiaKjWtNPeTvXUSdJQA4hsg=
 github.com/anacrolix/stm v0.4.0 h1:tOGvuFwaBjeu1u9X1eIh9TX8OEedEiEQ1se1FjhFnXY=
 github.com/anacrolix/stm v0.4.0/go.mod h1:GCkwqWoAsP7RfLW+jw+Z0ovrt2OO7wRzcTtFYMYY5t8=
@@ -85,7 +82,6 @@ github.com/anacrolix/sync v0.4.0/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DC
 github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
 github.com/anacrolix/tagflag v1.0.0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
 github.com/anacrolix/tagflag v1.1.0/go.mod h1:Scxs9CV10NQatSmbyjqmqmeQNwGzlNe0CMUMIxqHIG8=
-github.com/anacrolix/tagflag v1.3.0/go.mod h1:Scxs9CV10NQatSmbyjqmqmeQNwGzlNe0CMUMIxqHIG8=
 github.com/anacrolix/torrent v1.52.5 h1:jWowdx+EU6zFVfBwmnL0d3H4J6vTFEGOrHI35YdfIT8=
 github.com/anacrolix/torrent v1.52.5/go.mod h1:CcM8oPMYye5J42cSqJrmUpqwRFgSsJQ1jCEHwygqnqQ=
 github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 h1:QAVZ3pN/J4/UziniAhJR2OZ9Ox5kOY2053tBbbqUPYA=
@@ -95,6 +91,7 @@ github.com/anacrolix/utp v0.1.0/go.mod h1:MDwc+vsGEq7RMw6lr2GKOEqjWny5hO5OZXRVNa
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
 github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
 github.com/benbjohnson/immutable v0.2.0/go.mod h1:uc6OHo6PN2++n98KHLxW8ef4W42ylHiQSENghE1ezxI=
@@ -144,7 +141,6 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP
 github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ=
 github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
 github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819 h1:RIB4cRk+lBqKK3Oy0r2gRX4ui7tuhiZq2SuTtTCi0/0=
-github.com/elliotchance/orderedmap v1.4.0/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=
@@ -242,7 +238,6 @@ github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq
 github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
@@ -282,7 +277,6 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
 github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
-github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -368,7 +362,6 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
@@ -404,8 +397,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg=
 github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
@@ -419,8 +412,6 @@ github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.etcd.io/bbolt v1.3.7-0.20231005155708-db45d0d6b1f6 h1:NkHVT1GBVV9hUj1iWglFxAuNlvLHELFn71U2H7aOIog=
-go.etcd.io/bbolt v1.3.7-0.20231005155708-db45d0d6b1f6/go.mod h1:tDI2vlr15+D9cyN3odhFrZJi3oJj8HlHaOEFPrUiGSY=
 go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
 go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
@@ -537,8 +528,6 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

internal/controller/controller.go

@@ -1,12 +1,14 @@
 package controller
 
 import (
+	"net/url"
 	"os"
 	"path/filepath"
 )
 
 type Controller struct {
 	GetConfig func(v any) bool
+	ProxyUrl  *url.URL
 	FileController
 	//ContextDialer() (proxy.Dialer, error)
 }

internal/fetcher/fetcher.go

@@ -21,6 +21,8 @@ type Fetcher interface {
 	Pause() error
 	Close() error
 
+	// Stats refreshes health statistics and returns the latest information
+	Stats() any
 	// Meta returns the meta information of the download.
 	Meta() *FetcherMeta
 	// Progress returns the progress of the download.

internal/protocol/bt/fetcher.go

@@ -9,6 +9,7 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/util"
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/metainfo"
+	"net/http"
 	"path/filepath"
 	"sync"
 	"sync/atomic"
@@ -63,6 +64,9 @@ func (f *Fetcher) initClient() (err error) {
 
 	cfg := torrent.NewDefaultClientConfig()
 	cfg.ListenPort = f.config.ListenPort
+	if f.ctl.ProxyUrl != nil {
+		cfg.HTTPProxy = http.ProxyURL(f.ctl.ProxyUrl)
+	}
 	cfg.DefaultStorage = newFileOpts(newFileClientOpts{
 		ClientBaseDir: cfg.DataDir,
 		HandleFileTorrent: func(infoHash metainfo.Hash, ft *fileTorrentImpl) {
@@ -124,6 +128,7 @@ func (f *Fetcher) Start() (err error) {
 			file.Download()
 		}
 	}
+
 	return
 }
 
@@ -184,6 +189,16 @@ func (f *Fetcher) Meta() *fetcher.FetcherMeta {
 	return f.meta
 }
 
+func (f *Fetcher) Stats() any {
+	stats := f.torrent.Stats()
+	baseStats := &bt.Stats{
+		TotalPeers:       stats.TotalPeers,
+		ActivePeers:      stats.ActivePeers,
+		ConnectedSeeders: stats.ConnectedSeeders,
+	}
+	return baseStats
+}
+
 func (f *Fetcher) Progress() fetcher.Progress {
 	if !f.torrentReady.Load() {
 		return f.progress

internal/protocol/bt/fetcher_test.go

@@ -8,6 +8,8 @@ import (
 	"github.com/GopeedLab/gopeed/internal/test"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/bt"
+	"github.com/GopeedLab/gopeed/pkg/util"
+	"net/url"
 	"os"
 	"reflect"
 	"testing"
@@ -50,7 +52,15 @@ func TestFetcher_Resolve_DataUri_Torrent(t *testing.T) {
 }
 
 func TestFetcher_Config(t *testing.T) {
-	doResolve(t, buildConfigFetcher())
+	doResolve(t, buildConfigFetcher(nil))
+}
+
+func TestFetcher_ResolveWithProxy(t *testing.T) {
+	usr, pwd := "admin", "123"
+	proxyListener := test.StartSocks5Server(usr, pwd)
+	defer proxyListener.Close()
+
+	doResolve(t, buildConfigFetcher(util.BuildProxyUrl("socks5", proxyListener.Addr().String(), usr, pwd)))
 }
 
 func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
@@ -90,7 +100,7 @@ func buildFetcher() fetcher.Fetcher {
 	return fetcher
 }
 
-func buildConfigFetcher() fetcher.Fetcher {
+func buildConfigFetcher(proxyUrl *url.URL) fetcher.Fetcher {
 	fetcher := new(FetcherBuilder).Build()
 	newController := controller.NewController()
 	mockCfg := config{
@@ -104,6 +114,7 @@ func buildConfigFetcher() fetcher.Fetcher {
 		}
 		return true
 	}
+	newController.ProxyUrl = proxyUrl
 	fetcher.Setup(newController)
 	return fetcher
 }

internal/protocol/http/fetcher.go

@@ -18,6 +18,7 @@ import (
 	"os"
 	"path"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -90,7 +91,7 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 	if err != nil {
 		return err
 	}
-	client := buildClient()
+	client := f.buildClient()
 	// send Range request to check whether the server supports breakpoint continuation
 	// just test one byte, Range: bytes=0-0
 	httpReq.Header.Set(base.HttpHeaderRange, fmt.Sprintf(base.HttpHeaderRangeFormat, 0, 0))
@@ -104,8 +105,8 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 		Range: false,
 		Files: []*base.FileInfo{},
 	}
-	if base.HttpCodePartialContent == httpResp.StatusCode {
-		// 返回206响应码表示支持断点下载
+	if base.HttpCodePartialContent == httpResp.StatusCode || (base.HttpCodeOK == httpResp.StatusCode && httpResp.Header.Get(base.HttpHeaderAcceptRanges) == base.HttpHeaderBytes && strings.HasPrefix(httpResp.Header.Get(base.HttpHeaderContentRange), base.HttpHeaderBytes)) {
+		// 1.返回206响应码表示支持断点下载 2.不返回206但是Accept-Ranges首部并且等于bytes也表示支持断点下载
 		res.Range = true
 		// 解析资源大小: bytes 0-1000/1001 => 1001
 		contentTotal := path.Base(httpResp.Header.Get(base.HttpHeaderContentRange))
@@ -217,6 +218,11 @@ func (f *Fetcher) Meta() *fetcher.FetcherMeta {
 	return f.meta
 }
 
+func (f *Fetcher) Stats() any {
+	// todo http download health
+	return &fhttp.Stats{}
+}
+
 func (f *Fetcher) Progress() fetcher.Progress {
 	p := make(fetcher.Progress, 0)
 	if len(f.chunks) > 0 {
@@ -264,7 +270,7 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
 		return err
 	}
 	var (
-		client     = buildClient()
+		client     = f.buildClient()
 		buf        = make([]byte, 8192)
 		maxRetries = 3
 	)
@@ -306,26 +312,13 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
 			if err != nil {
 				return err
 			}
+			defer resp.Body.Close()
 			if resp.StatusCode != base.HttpCodeOK && resp.StatusCode != base.HttpCodePartialContent {
 				err = NewRequestError(resp.StatusCode, resp.Status)
 				return err
 			}
-			return nil
-		}()
-		if err != nil {
-			// If canceled, do not retry
-			if errors.Is(err, context.Canceled) {
-				return
-			}
-			// retry request after 1 second
-			chunk.retryTimes = chunk.retryTimes + 1
-			time.Sleep(time.Second)
-			continue
-		}
-		// Http request success, reset retry times
-		chunk.retryTimes = 0
-		err = func() error {
-			defer resp.Body.Close()
+			// Http request success, reset retry times
+			chunk.retryTimes = 0
 			for {
 				n, err := resp.Body.Read(buf)
 				if n > 0 {
@@ -342,7 +335,18 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
 					return err
 				}
 			}
+			return nil
 		}()
+		if err != nil {
+			// If canceled, do not retry
+			if errors.Is(err, context.Canceled) {
+				return
+			}
+			// retry request after 1 second
+			chunk.retryTimes = chunk.retryTimes + 1
+			time.Sleep(time.Second)
+			continue
+		}
 		// if chunk is completed, reset other not complete chunks retry times
 		if err == nil {
 			for _, c := range f.chunks {
@@ -430,11 +434,16 @@ func (f *Fetcher) splitChunk() (chunks []*chunk) {
 	return
 }
 
-func buildClient() *http.Client {
+func (f *Fetcher) buildClient() *http.Client {
+	transport := &http.Transport{}
 	// Cookie handle
 	jar, _ := cookiejar.New(nil)
+	if f.ctl.ProxyUrl != nil {
+		transport.Proxy = http.ProxyURL(f.ctl.ProxyUrl)
+	}
 	return &http.Client{
-		Jar: jar,
+		Transport: transport,
+		Jar:       jar,
 	}
 }
 

internal/protocol/http/fetcher_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/GopeedLab/gopeed/internal/test"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/http"
+	"github.com/GopeedLab/gopeed/pkg/util"
 	"net"
 	"reflect"
 	"testing"
@@ -141,6 +142,15 @@ func TestFetcher_DownloadResume(t *testing.T) {
 	downloadResume(listener, 16, t)
 }
 
+func TestFetcher_DownloadWithProxy(t *testing.T) {
+	httpListener := test.StartTestFileServer()
+	defer httpListener.Close()
+	proxyListener := test.StartSocks5Server("", "")
+	defer proxyListener.Close()
+
+	downloadWithProxy(httpListener, proxyListener, t)
+}
+
 func TestFetcher_Config(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()
@@ -302,6 +312,26 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
 	}
 }
 
+func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t *testing.T) {
+	fetcher := downloadReady(httpListener, 4, t)
+	ctl := controller.NewController()
+	ctl.ProxyUrl = util.BuildProxyUrl("socks5", proxyListener.Addr().String(), "", "")
+	fetcher.Setup(ctl)
+	err := fetcher.Start()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = fetcher.Wait()
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := test.FileMd5(test.BuildFile)
+	got := test.FileMd5(test.DownloadFile)
+	if want != got {
+		t.Errorf("Download() got = %v, want %v", got, want)
+	}
+}
+
 func buildFetcher() *Fetcher {
 	fetcher := new(FetcherBuilder).Build()
 	fetcher.Setup(controller.NewController())

internal/test/httptest.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/armon/go-socks5"
 	"io"
 	"math/rand"
 	"net"
@@ -315,3 +316,24 @@ func ifExistAndRemove(name string) error {
 	}
 	return nil
 }
+
+func StartSocks5Server(usr, pwd string) net.Listener {
+	conf := &socks5.Config{}
+	if usr != "" && pwd != "" {
+		conf.Credentials = socks5.StaticCredentials{
+			usr: pwd,
+		}
+	}
+
+	server, err := socks5.New(conf)
+	if err != nil {
+		panic(err)
+	}
+
+	listener, err := net.Listen("tcp", "127.0.0.1:0") // 你可以根据需要更改监听地址
+	if err != nil {
+		panic(err)
+	}
+	go server.Serve(listener)
+	return listener
+}

pkg/base/constants.go

@@ -16,10 +16,12 @@ const (
 	HttpCodePartialContent = 206
 
 	HttpHeaderRange              = "Range"
+	HttpHeaderAcceptRanges       = "Accept-Ranges"
 	HttpHeaderContentLength      = "Content-Length"
 	HttpHeaderContentRange       = "Content-Range"
 	HttpHeaderContentDisposition = "Content-Disposition"
-	HttpHeaderUserAgent          = "User-Agent"
+	HttpHeaderUserAgent          = "Usr-Agent"
 
+	HttpHeaderBytes       = "bytes"
 	HttpHeaderRangeFormat = "bytes=%d-%d"
 )

pkg/download/downloader.go

@@ -6,8 +6,11 @@ import (
 	"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"
 	"github.com/virtuald/go-paniclog"
 	"os"
 	"path/filepath"
@@ -91,6 +94,7 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
 		}
 	}
 
+	zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
 	d.Logger = logger.NewLogger(cfg.ProductionMode, filepath.Join(cfg.StorageDir, "logs", "core.log"))
 	d.ExtensionLogger = logger.NewLogger(cfg.ProductionMode, filepath.Join(cfg.StorageDir, "logs", "extension.log"))
 	if cfg.ProductionMode {
@@ -215,6 +219,7 @@ func (d *Downloader) setupFetcher(fetcher fetcher.Fetcher) {
 	ctl.GetConfig = func(v any) bool {
 		return d.getProtocolConfig(fetcher.Name(), v)
 	}
+	ctl.ProxyUrl = d.cfg.ProxyUrl()
 	fetcher.Setup(ctl)
 }
 
@@ -224,7 +229,10 @@ func (d *Downloader) Resolve(req *base.Request) (rr *ResolveResult, err error) {
 		return
 	}
 
-	res := d.triggerOnResolve(req)
+	res, err := d.triggerOnResolve(req)
+	if err != nil {
+		return
+	}
 	if res != nil && len(res.Files) > 0 {
 		rr = &ResolveResult{
 			Res: res,
@@ -524,9 +532,6 @@ func (d *Downloader) emit(eventKey EventKey, task *Task, errs ...error) {
 			Task: task,
 			Err:  err,
 		})
-		if eventKey == EventKeyError {
-			d.emit(EventKeyFinally, task, err)
-		}
 	}
 }
 
@@ -571,26 +576,56 @@ func (d *Downloader) getProtocolConfig(name string, v any) bool {
 func (d *Downloader) watch(task *Task) {
 	err := task.fetcher.Wait()
 	if err != nil {
-		task.Status = base.DownloadStatusError
-		d.emit(EventKeyError, task, err)
-	} else {
-		task.Progress.Used = task.timer.Used()
-		if task.Meta.Res.Size == 0 {
-			task.Meta.Res.Size = task.fetcher.Progress().TotalDownloaded()
-		}
-		used := task.Progress.Used / int64(time.Second)
-		if used == 0 {
-			used = 1
-		}
-		totalSize := task.Meta.Res.Size
-		task.Progress.Speed = totalSize / used
-		task.Progress.Downloaded = totalSize
-		task.Status = base.DownloadStatusDone
-		d.storage.Put(bucketTask, task.ID, task.clone())
-		d.emit(EventKeyDone, task)
-		d.emit(EventKeyFinally, task, err)
+		d.doOnError(task, err)
+		return
 	}
+	task.Progress.Used = task.timer.Used()
+	if task.Meta.Res.Size == 0 {
+		task.Meta.Res.Size = task.fetcher.Progress().TotalDownloaded()
+	}
+	used := task.Progress.Used / int64(time.Second)
+	if used == 0 {
+		used = 1
+	}
+	totalSize := task.Meta.Res.Size
+	task.Progress.Speed = totalSize / used
+	task.Progress.Downloaded = totalSize
+	task.updateStatus(base.DownloadStatusDone)
+	d.storage.Put(bucketTask, task.ID, task.clone())
+	d.emit(EventKeyDone, task)
+	d.emit(EventKeyFinally, task, err)
 	d.notifyRunning()
+
+	if e, ok := task.Meta.Opts.Extra.(*http.OptsExtra); ok {
+		downloadFilePath := task.Meta.SingleFilepath()
+		if e.AutoTorrent && strings.HasSuffix(downloadFilePath, ".torrent") {
+			go func() {
+				_, err2 := d.CreateDirect(
+					&base.Request{
+						URL: downloadFilePath,
+					},
+					&base.Options{
+						Path:        task.Meta.Opts.Path,
+						SelectFiles: make([]int, 0),
+					})
+				if err2 != nil {
+					d.Logger.Error().Err(err2).Msgf("auto create torrent task failed, task id: %s", task.ID)
+				}
+
+			}()
+		}
+	}
+}
+
+func (d *Downloader) doOnError(task *Task, err error) {
+	d.Logger.Warn().Err(err).Msgf("task download failed, task id: %s", task.ID)
+	task.updateStatus(base.DownloadStatusError)
+	d.triggerOnError(task, err)
+	if task.Status == base.DownloadStatusError {
+		d.emit(EventKeyError, task, err)
+		d.emit(EventKeyFinally, task, err)
+		d.notifyRunning()
+	}
 }
 
 func (d *Downloader) restoreFetcher(task *Task) error {
@@ -657,7 +692,6 @@ func (d *Downloader) doCreate(fetcher fetcher.Fetcher, opts *base.Options) (task
 	task.fetcher = fetcher
 	task.Meta = fetcher.Meta()
 	task.Progress = &Progress{}
-	task.Status = base.DownloadStatusReady
 	initTask(task)
 	if err = fetcher.Create(opts); err != nil {
 		return
@@ -696,25 +730,18 @@ func (d *Downloader) doStart(task *Task) (err error) {
 		}
 	}
 
-	cloneTask := task.clone()
 	isCreate := task.Status == base.DownloadStatusReady
-	task.Status = base.DownloadStatusRunning
 
 	doStart := func() error {
 		task.lock.Lock()
 		defer task.lock.Unlock()
 
-		req := d.triggerOnStart(cloneTask)
-		if req != nil {
-			task.Meta.Req = req
-			task.fetcher.Meta().Req = req
-		}
+		d.triggerOnStart(task)
+		task.updateStatus(base.DownloadStatusRunning)
 
 		if task.Meta.Res == nil {
 			err := task.fetcher.Resolve(task.Meta.Req)
 			if err != nil {
-				task.Status = base.DownloadStatusError
-				d.emit(EventKeyError, task, err)
 				return err
 			}
 			task.Meta.Res = task.fetcher.Meta().Res
@@ -723,8 +750,10 @@ func (d *Downloader) doStart(task *Task) (err error) {
 		if isCreate {
 			d.checkDuplicateLock.Lock()
 			defer d.checkDuplicateLock.Unlock()
+			task.Meta.Opts.Name = util.ReplaceInvalidFilename(task.Meta.Opts.Name)
 			// check if the download file is duplicated and rename it automatically.
 			if task.Meta.Res.Name != "" {
+				task.Meta.Res.Name = util.ReplaceInvalidFilename(task.Meta.Res.Name)
 				fullDirPath := task.Meta.FolderPath()
 				newName, err := util.CheckDuplicateAndRename(fullDirPath)
 				if err != nil {
@@ -732,6 +761,7 @@ func (d *Downloader) doStart(task *Task) (err error) {
 				}
 				task.Meta.Opts.Name = newName
 			} else {
+				task.Meta.Res.Files[0].Name = util.ReplaceInvalidFilename(task.Meta.Res.Files[0].Name)
 				fullFilePath := task.Meta.SingleFilepath()
 				newName, err := util.CheckDuplicateAndRename(fullFilePath)
 				if err != nil {
@@ -757,7 +787,7 @@ func (d *Downloader) doStart(task *Task) (err error) {
 	go func() {
 		err := doStart()
 		if err != nil {
-			d.Logger.Error().Stack().Err(err).Msgf("start task failed, task id: %s", task.ID)
+			d.doOnError(task, err)
 		}
 	}()
 
@@ -767,7 +797,7 @@ func (d *Downloader) doStart(task *Task) (err error) {
 func (d *Downloader) doPause(task *Task) (err error) {
 	err = func() error {
 		if task.Status != base.DownloadStatusDone {
-			task.Status = base.DownloadStatusPause
+			task.updateStatus(base.DownloadStatusPause)
 			task.timer.Pause()
 			if task.fetcher != nil {
 				if err := task.fetcher.Pause(); err != nil {

pkg/download/downloader_test.go

@@ -84,6 +84,82 @@ func TestDownloader_Create(t *testing.T) {
 	}
 }
 
+func TestDownloader_CreateWithProxy(t *testing.T) {
+	// No proxy
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
+		return nil
+	})
+	// Disable proxy
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
+		proxyCfg.Enable = false
+		return proxyCfg
+	})
+	// Invalid proxy scheme
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
+		proxyCfg.Scheme = ""
+		return proxyCfg
+	})
+	// Invalid proxy host
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
+		proxyCfg.Host = ""
+		return proxyCfg
+	})
+	// Use proxy without auth
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
+		return proxyCfg
+	})
+	// Use proxy with auth
+	doTestDownloaderCreateWithProxy(t, true, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig {
+		return proxyCfg
+	})
+}
+
+func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildProxyConfig func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig) {
+	httpListener := test.StartTestFileServer()
+	defer httpListener.Close()
+	usr, pwd := "", ""
+	if auth {
+		usr, pwd = "admin", "123"
+	}
+	proxyListener := test.StartSocks5Server(usr, pwd)
+	defer proxyListener.Close()
+
+	downloader := NewDownloader(nil)
+	if err := downloader.Setup(); err != nil {
+		t.Fatal(err)
+	}
+	defer downloader.Clear()
+	downloader.cfg.DownloaderStoreConfig.Proxy = buildProxyConfig(&DownloaderProxyConfig{
+		Enable: true,
+		Scheme: "socks5",
+		Host:   proxyListener.Addr().String(),
+		Usr:    usr,
+		Pwd:    pwd,
+	})
+
+	req := &base.Request{
+		URL: "http://" + httpListener.Addr().String() + "/" + test.BuildName,
+	}
+	rr, err := downloader.Resolve(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := &base.Resource{
+		Size:  test.BuildSize,
+		Range: true,
+		Files: []*base.FileInfo{
+			{
+				Name: test.BuildName,
+				Path: "",
+				Size: test.BuildSize,
+			},
+		},
+	}
+	if !reflect.DeepEqual(want, rr.Res) {
+		t.Errorf("Resolve() got = %v, want %v", rr.Res, want)
+	}
+}
+
 func TestDownloader_CreateRename(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()

pkg/download/engine/engine.go

@@ -3,13 +3,15 @@ package engine
 import (
 	_ "embed"
 	"errors"
+	gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
 	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
 	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/formdata"
 	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/vm"
 	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/xhr"
 	"github.com/dop251/goja"
 	"github.com/dop251/goja_nodejs/eventloop"
-	"github.com/dop251/goja_nodejs/url"
+	gojaurl "github.com/dop251/goja_nodejs/url"
+	"net/url"
 	"time"
 )
 
@@ -107,7 +109,14 @@ func (e *Engine) Close() {
 	e.loop.Stop()
 }
 
-func NewEngine() *Engine {
+type Config struct {
+	ProxyURL *url.URL
+}
+
+func NewEngine(cfg *Config) *Engine {
+	if cfg == nil {
+		cfg = &Config{}
+	}
 	loop := eventloop.NewEventLoop()
 	engine := &Engine{
 		loop: loop,
@@ -116,14 +125,17 @@ func NewEngine() *Engine {
 		engine.Runtime = runtime
 		runtime.SetFieldNameMapper(goja.TagFieldNameMapper("json", true))
 		vm.Enable(runtime)
-		url.Enable(runtime)
+		gojaurl.Enable(runtime)
+		if err := gojaerror.Enable(runtime); err != nil {
+			return
+		}
 		if err := file.Enable(runtime); err != nil {
 			return
 		}
 		if err := formdata.Enable(runtime); err != nil {
 			return
 		}
-		if err := xhr.Enable(runtime); err != nil {
+		if err := xhr.Enable(runtime, cfg.ProxyURL); err != nil {
 			return
 		}
 		if _, err := runtime.RunString(polyfillScript); err != nil {
@@ -143,7 +155,7 @@ func NewEngine() *Engine {
 }
 
 func Run(script string) (value any, err error) {
-	engine := NewEngine()
+	engine := NewEngine(nil)
 	return engine.RunString(script)
 }
 
@@ -159,7 +171,11 @@ func resolveResult(value goja.Value) (any, error) {
 		case goja.PromiseStateFulfilled:
 			return p.Result().Export(), nil
 		case goja.PromiseStateRejected:
-			return nil, errors.New(p.Result().String())
+			if err, ok := p.Result().Export().(error); ok {
+				return nil, err
+			} else {
+				return nil, errors.New(p.Result().String())
+			}
 		}
 	}
 	return export, nil

pkg/download/engine/engine_test.go

@@ -7,7 +7,10 @@ import (
 	"errors"
 	"fmt"
 	"github.com/GopeedLab/gopeed/internal/test"
+	gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
 	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
+	gojautil "github.com/GopeedLab/gopeed/pkg/download/engine/util"
+	"github.com/GopeedLab/gopeed/pkg/util"
 	"github.com/dop251/goja"
 	"io"
 	"net"
@@ -19,6 +22,7 @@ import (
 )
 
 func TestPolyfill(t *testing.T) {
+	doTestPolyfill(t, "MessageError")
 	doTestPolyfill(t, "XMLHttpRequest")
 	doTestPolyfill(t, "Blob")
 	doTestPolyfill(t, "FormData")
@@ -26,10 +30,20 @@ func TestPolyfill(t *testing.T) {
 	doTestPolyfill(t, "__gopeed_create_vm")
 }
 
+func TestError(t *testing.T) {
+	engine := NewEngine(nil)
+	_, err := engine.RunString(`
+      throw new MessageError('test');
+	`)
+	if me, ok := gojautil.AssertError[*gojaerror.MessageError](err); !ok {
+		t.Fatalf("expect MessageError, but got %v", me)
+	}
+}
+
 func TestFetch(t *testing.T) {
 	server := startServer()
 	defer server.Close()
-	engine := NewEngine()
+	engine := NewEngine(nil)
 	if _, err := engine.RunString(fmt.Sprintf("var host = 'http://%s';", server.Addr().String())); err != nil {
 		t.Fatal(err)
 	}
@@ -192,8 +206,40 @@ function testTimeout(){
 	}
 }
 
+func TestFetchWithProxy(t *testing.T) {
+	doTestFetchWithProxy(t, "", "")
+	doTestFetchWithProxy(t, "admin", "123")
+}
+
+func doTestFetchWithProxy(t *testing.T, usr, pwd string) {
+	httpListener := startServer()
+	defer httpListener.Close()
+
+	proxyListener := test.StartSocks5Server(usr, pwd)
+	defer proxyListener.Close()
+
+	engine := NewEngine(&Config{ProxyURL: util.BuildProxyUrl("socks5", proxyListener.Addr().String(), usr, pwd)})
+
+	if _, err := engine.RunString(fmt.Sprintf("var host = 'http://%s';", httpListener.Addr().String())); err != nil {
+		t.Fatal(err)
+	}
+
+	respCode, err := engine.RunString(`
+(async function(){
+	const resp = await fetch(host+'/get');
+	return resp.status;
+})()
+`)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if respCode != int64(200) {
+		t.Fatalf("fetch with proxy failed, want %d, got %d", 200, respCode)
+	}
+}
+
 func TestVm(t *testing.T) {
-	engine := NewEngine()
+	engine := NewEngine(nil)
 
 	value, err := engine.RunString(`
 const vm = __gopeed_create_vm()
@@ -221,7 +267,7 @@ out
 }
 
 func TestNonStopLoop(t *testing.T) {
-	engine := NewEngine()
+	engine := NewEngine(nil)
 
 	_, err := engine.RunString(`
 function leak(){

pkg/download/engine/inject/error/module.go

@@ -0,0 +1,29 @@
+package error
+
+import (
+	"github.com/dop251/goja"
+)
+
+type MessageError struct {
+	Message string `json:"message"`
+}
+
+func (e *MessageError) Error() string {
+	return e.Message
+}
+
+func Enable(runtime *goja.Runtime) error {
+	messageError := runtime.ToValue(func(call goja.ConstructorCall) *goja.Object {
+		var message string
+		if len(call.Arguments) > 0 {
+			message = call.Arguments[0].String()
+		}
+		instance := &MessageError{
+			Message: message,
+		}
+		instanceValue := runtime.ToValue(instance).(*goja.Object)
+		instanceValue.SetPrototype(call.This.Prototype())
+		return instanceValue
+	})
+	return runtime.Set("MessageError", messageError)
+}

pkg/download/engine/inject/util.go

@@ -1,9 +0,0 @@
-package inject
-
-import (
-	"github.com/dop251/goja"
-)
-
-func ThrowTypeError(vm *goja.Runtime, msg string) {
-	panic(vm.NewTypeError(msg))
-}

pkg/download/engine/inject/xhr/module.go

@@ -2,14 +2,15 @@ package xhr
 
 import (
 	"bytes"
-	"github.com/GopeedLab/gopeed/pkg/download/engine/inject"
 	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
 	"github.com/GopeedLab/gopeed/pkg/download/engine/inject/formdata"
+	"github.com/GopeedLab/gopeed/pkg/download/engine/util"
 	"github.com/dop251/goja"
 	"io"
 	"mime/multipart"
 	"net"
 	"net/http"
+	"net/url"
 	"time"
 )
 
@@ -119,6 +120,7 @@ type XMLHttpRequest struct {
 	requestHeaders  map[string]string
 	responseHeaders map[string]string
 	aborted         bool
+	proxyUrl        *url.URL
 
 	Upload       *XMLHttpRequestUpload `json:"upload"`
 	Timeout      int                   `json:"timeout"`
@@ -200,8 +202,13 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
 	for k, v := range xhr.requestHeaders {
 		req.Header.Set(k, v)
 	}
+	transport := &http.Transport{}
+	if xhr.proxyUrl != nil {
+		transport.Proxy = http.ProxyURL(xhr.proxyUrl)
+	}
 	client := &http.Client{
-		Timeout: time.Duration(xhr.Timeout) * time.Millisecond,
+		Transport: transport,
+		Timeout:   time.Duration(xhr.Timeout) * time.Millisecond,
 	}
 	resp, err := client.Do(req)
 	if err != nil {
@@ -306,10 +313,10 @@ func (xhr *XMLHttpRequest) parseData(data goja.Value) any {
 	return data.String()
 }
 
-func Enable(runtime *goja.Runtime) error {
+func Enable(runtime *goja.Runtime, proxyUrl *url.URL) error {
 	progressEvent := runtime.ToValue(func(call goja.ConstructorCall) *goja.Object {
 		if len(call.Arguments) < 1 {
-			inject.ThrowTypeError(runtime, "Failed to construct 'ProgressEvent': 1 argument required, but only 0 present.")
+			util.ThrowTypeError(runtime, "Failed to construct 'ProgressEvent': 1 argument required, but only 0 present.")
 		}
 		instance := &ProgressEvent{
 			Type: call.Argument(0).String(),
@@ -320,6 +327,7 @@ func Enable(runtime *goja.Runtime) error {
 	})
 	xhr := runtime.ToValue(func(call goja.ConstructorCall) *goja.Object {
 		instance := &XMLHttpRequest{
+			proxyUrl: proxyUrl,
 			Upload: &XMLHttpRequestUpload{
 				EventProp: &EventProp{
 					eventListeners: make(map[string]func(event *ProgressEvent)),

pkg/download/engine/util/util.go

@@ -0,0 +1,24 @@
+package util
+
+import (
+	"github.com/dop251/goja"
+)
+
+func ThrowTypeError(vm *goja.Runtime, msg string) {
+	panic(vm.NewTypeError(msg))
+}
+
+func AssertError[T error](err error) (t T, r bool) {
+	if err == nil {
+		return
+	}
+	if e, ok := err.(T); ok {
+		return e, true
+	}
+	if e, ok := err.(*goja.Exception); ok {
+		if ee, okk := e.Value().Export().(T); okk {
+			return ee, true
+		}
+	}
+	return
+}

pkg/download/extension.go

@@ -6,9 +6,12 @@ import (
 	"github.com/GopeedLab/gopeed/internal/logger"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/download/engine"
+	gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
+	gojautil "github.com/GopeedLab/gopeed/pkg/download/engine/util"
 	"github.com/GopeedLab/gopeed/pkg/util"
 	"github.com/dop251/goja"
 	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/plumbing/transport"
 	"io"
 	"os"
 	"path"
@@ -34,7 +37,7 @@ type ActivationEvent string
 const (
 	EventOnResolve ActivationEvent = "onResolve"
 	EventOnStart   ActivationEvent = "onStart"
-	//EventOnError   ActivationEvent = "onError"
+	EventOnError   ActivationEvent = "onError"
 	//EventOnDone    ActivationEvent = "onDone"
 )
 
@@ -195,11 +198,19 @@ func (d *Downloader) fetchExtensionByGit(url string, handler func(tempExtPath st
 	if err := util.RmAndMkDirAll(tempExtDir); err != nil {
 		return nil, err
 	}
+	proxyOptions := transport.ProxyOptions{}
+	proxyUrl := d.cfg.ProxyUrl()
+	if proxyUrl != nil {
+		proxyOptions.URL = proxyUrl.Scheme + "://" + proxyUrl.Host
+		proxyOptions.Username = proxyUrl.User.Username()
+		proxyOptions.Password, _ = proxyUrl.User.Password()
+	}
 	// clone project to extension temp dir
 	gitUrl := parentPath + projectPath + gitSuffix
 	if _, err := git.PlainClone(tempExtDir, false, &git.CloneOptions{
-		URL:   gitUrl,
-		Depth: 1,
+		URL:          gitUrl,
+		Depth:        1,
+		ProxyOptions: proxyOptions,
 	}); err != nil {
 		return nil, err
 	}
@@ -229,8 +240,8 @@ func (d *Downloader) parseExtensionByPath(path string) (*Extension, error) {
 	return &ext, nil
 }
 
-func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource) {
-	doTrigger(d,
+func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource, err error) {
+	err = doTrigger(d,
 		EventOnResolve,
 		req,
 		&OnResolveContext{
@@ -243,6 +254,10 @@ func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource) {
 					gopeed.Logger.logger.Warn().Err(err).Msgf("[%s] resource invalid", ext.buildIdentity())
 					return
 				}
+				ctx.Res.Name = util.ReplaceInvalidFilename(ctx.Res.Name)
+				for _, file := range ctx.Res.Files {
+					file.Name = util.ReplaceInvalidFilename(file.Name)
+				}
 				ctx.Res.CalcSize(nil)
 			}
 			res = ctx.Res
@@ -251,12 +266,12 @@ func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource) {
 	return
 }
 
-func (d *Downloader) triggerOnStart(task *Task) (req *base.Request) {
+func (d *Downloader) triggerOnStart(task *Task) {
 	doTrigger(d,
 		EventOnStart,
 		task.Meta.Req,
 		&OnStartContext{
-			Task: task,
+			Task: NewExtensionTask(d, task),
 		},
 		func(ext *Extension, gopeed *Instance, ctx *OnStartContext) {
 			// Validate request structure
@@ -265,14 +280,25 @@ func (d *Downloader) triggerOnStart(task *Task) (req *base.Request) {
 					gopeed.Logger.logger.Warn().Err(err).Msgf("[%s] request invalid", ext.buildIdentity())
 					return
 				}
-				req = ctx.Task.Meta.Req
 			}
 		},
 	)
 	return
 }
 
-func doTrigger[T any](d *Downloader, event ActivationEvent, req *base.Request, ctx T, handler func(ext *Extension, gopeed *Instance, ctx T)) {
+func (d *Downloader) triggerOnError(task *Task, err error) {
+	doTrigger(d,
+		EventOnError,
+		task.Meta.Req,
+		&OnErrorContext{
+			Task:  NewExtensionTask(d, task),
+			Error: err,
+		},
+		nil,
+	)
+}
+
+func doTrigger[T any](d *Downloader, event ActivationEvent, req *base.Request, ctx T, handler func(ext *Extension, gopeed *Instance, ctx T)) error {
 	// init extension global object
 	gopeed := &Instance{
 		Events: make(InstanceEvents),
@@ -314,7 +340,9 @@ func doTrigger[T any](d *Downloader, event ActivationEvent, req *base.Request, c
 					if req.Labels == nil {
 						req.Labels = make(map[string]string)
 					}
-					engine := engine.NewEngine()
+					engine := engine.NewEngine(&engine.Config{
+						ProxyURL: d.cfg.ProxyUrl(),
+					})
 					defer engine.Close()
 					err = engine.Runtime.Set("gopeed", gopeed)
 					if err != nil {
@@ -332,13 +360,20 @@ func doTrigger[T any](d *Downloader, event ActivationEvent, req *base.Request, c
 							gopeed.Logger.logger.Error().Err(err).Msgf("[%s] call function failed: %s", ext.buildIdentity(), event)
 							return
 						}
-						handler(ext, gopeed, ctx)
+						if handler != nil {
+							handler(ext, gopeed, ctx)
+						}
 					}
 				}()
 			}
 		}
 	}
-	return
+
+	// Only return MessageError
+	if me, ok := gojautil.AssertError[*gojaerror.MessageError](err); ok {
+		return me
+	}
+	return nil
 }
 
 func (d *Downloader) ExtensionPath(ext *Extension) string {
@@ -566,10 +601,10 @@ func (h InstanceEvents) OnStart(fn goja.Callable) {
 	h.register(EventOnStart, fn)
 }
 
-//func (h InstanceEvents) OnError(fn goja.Callable) {
-//	h.register(HookEventOnError, fn)
-//}
-//
+func (h InstanceEvents) OnError(fn goja.Callable) {
+	h.register(EventOnError, fn)
+}
+
 //func (h InstanceEvents) OnDone(fn goja.Callable) {
 //	h.register(HookEventOnDone, fn)
 //}
@@ -638,7 +673,33 @@ type OnResolveContext struct {
 }
 
 type OnStartContext struct {
-	Task *Task `json:"task"`
+	Task *ExtensionTask `json:"task"`
+}
+
+type OnErrorContext struct {
+	Task  *ExtensionTask `json:"task"`
+	Error error          `json:"error"`
+}
+
+type ExtensionTask struct {
+	*Task
+
+	download *Downloader
+}
+
+func NewExtensionTask(download *Downloader, task *Task) *ExtensionTask {
+	return &ExtensionTask{
+		Task:     task.clone(),
+		download: download,
+	}
+}
+
+func (t *ExtensionTask) Continue() error {
+	return t.download.Continue(t.ID)
+}
+
+func (t *ExtensionTask) Pause() error {
+	return t.download.Pause(t.ID)
 }
 
 func parseSettings(settings []*Setting) map[string]any {

pkg/download/extension_test.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"github.com/GopeedLab/gopeed/internal/logger"
 	"github.com/GopeedLab/gopeed/pkg/base"
+	gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
 	"github.com/dop251/goja"
 	"os"
 	"testing"
@@ -165,7 +166,7 @@ func TestDownloader_UpgradeExtension(t *testing.T) {
 	})
 }
 
-func TestDownloader_ExtensionByOnStart(t *testing.T) {
+func TestDownloader_Extension_OnStart(t *testing.T) {
 	downloadAndCheck := func(req *base.Request) {
 		setupDownloader(func(downloader *Downloader) {
 			if _, err := downloader.InstallExtensionByFolder("./testdata/extensions/on_start", false); err != nil {
@@ -192,10 +193,10 @@ func TestDownloader_ExtensionByOnStart(t *testing.T) {
 			}
 			task := downloader.GetTask(id)
 			if task.Meta.Req.URL != "https://github.com" {
-				panic("extension on start modify url error")
+				t.Fatalf("except url: https://github.com, actual: %s", task.Meta.Req.URL)
 			}
 			if task.Meta.Req.Labels["modified"] != "true" {
-				panic("extension on start modify label error")
+				t.Fatalf("except label: modified=true, actual: %s", task.Meta.Req.Labels["modified"])
 			}
 		})
 	}
@@ -207,13 +208,54 @@ func TestDownloader_ExtensionByOnStart(t *testing.T) {
 
 	// label match
 	downloadAndCheck(&base.Request{
-		URL: "https://xxx.com",
+		URL: "https://test.com",
 		Labels: map[string]string{
 			"test": "true",
 		},
 	})
 }
 
+func TestDownloader_Extension_OnError(t *testing.T) {
+	setupDownloader(func(downloader *Downloader) {
+		if _, err := downloader.InstallExtensionByFolder("./testdata/extensions/on_error", false); err != nil {
+			t.Fatal(err)
+		}
+		errCh := make(chan error, 1)
+		downloader.Listener(func(event *Event) {
+			if event.Key == EventKeyFinally {
+				errCh <- event.Err
+			}
+		})
+		id, err := downloader.CreateDirect(&base.Request{
+			URL: "https://github.com/gopeed/test/404",
+			Labels: map[string]string{
+				"test": "true",
+			},
+		}, nil)
+		if err != nil {
+			t.Fatal(err)
+		}
+		select {
+		case err = <-errCh:
+			break
+		case <-time.After(time.Second * 10):
+			err = errors.New("timeout")
+		}
+
+		if err != nil {
+			panic("extension on error download error: " + err.Error())
+		}
+		// extension on error modify url and continue download
+		task := downloader.GetTask(id)
+		if task.Meta.Req.URL != "https://github.com" {
+			t.Fatalf("except url: https://github.com, actual: %s", task.Meta.Req.URL)
+		}
+		if task.Status != base.DownloadStatusDone {
+			t.Fatalf("except status is done, actual: %s", task.Status)
+		}
+	})
+}
+
 func TestDownloader_Extension_Errors(t *testing.T) {
 	setupDownloader(func(downloader *Downloader) {
 		if _, err := downloader.InstallExtensionByFolder("./testdata/extensions/script_error", false); err != nil {
@@ -244,6 +286,26 @@ func TestDownloader_Extension_Errors(t *testing.T) {
 			t.Fatal("function error catch failed")
 		}
 	})
+
+	setupDownloader(func(downloader *Downloader) {
+		if _, err := downloader.InstallExtensionByFolder("./testdata/extensions/message_error", false); err != nil {
+			t.Fatal(err)
+		}
+		_, err := downloader.Resolve(&base.Request{
+			URL: "https://github.com/test",
+		})
+		if err == nil {
+			t.Fatalf("except error, but got nil")
+		}
+		me, ok := err.(*gojaerror.MessageError)
+		if !ok {
+			t.Fatalf("except MessageError type, but got %s", err)
+		}
+		want := "test"
+		if me.Error() != want {
+			t.Fatalf("except MessageError message %s, but got %s", want, me.Message)
+		}
+	})
 }
 
 func TestDownloader_Extension_Settings(t *testing.T) {
@@ -336,22 +398,6 @@ func TestDownloader_DeleteExtension(t *testing.T) {
 	})
 }
 
-func TestDownloader_Extension_OnResolve(t *testing.T) {
-	setupDownloader(func(downloader *Downloader) {
-		installedExt, err := downloader.InstallExtensionByFolder("./testdata/extensions/settings_all", false)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := downloader.DeleteExtension(installedExt.Identity); err != nil {
-			t.Fatal(err)
-		}
-		extensions := downloader.GetExtensions()
-		if len(extensions) != 0 {
-			t.Fatal("extension delete fail")
-		}
-	})
-}
-
 func TestDownloader_Extension_Logger(t *testing.T) {
 	logger := logger.NewLogger(false, "")
 	il := newInstanceLogger(&Extension{

pkg/download/model.go

@@ -8,6 +8,7 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/util"
 	gonanoid "github.com/matoous/go-nanoid/v2"
+	"net/url"
 	"sync"
 	"time"
 )
@@ -23,6 +24,7 @@ type Task struct {
 	Status    base.Status          `json:"status"`
 	Progress  *Progress            `json:"progress"`
 	CreatedAt time.Time            `json:"createdAt"`
+	UpdatedAt time.Time            `json:"updatedAt"`
 
 	fetcherBuilder fetcher.FetcherBuilder
 	fetcher        fetcher.Fetcher
@@ -40,9 +42,15 @@ func NewTask() *Task {
 		ID:        id,
 		Status:    base.DownloadStatusReady,
 		CreatedAt: time.Now(),
+		UpdatedAt: time.Now(),
 	}
 }
 
+func (t *Task) updateStatus(status base.Status) {
+	t.UpdatedAt = time.Now()
+	t.Status = status
+}
+
 func (t *Task) clone() *Task {
 	return &Task{
 		ID:        t.ID,
@@ -50,6 +58,7 @@ func (t *Task) clone() *Task {
 		Status:    t.Status,
 		Progress:  t.Progress,
 		CreatedAt: t.CreatedAt,
+		UpdatedAt: t.UpdatedAt,
 	}
 }
 
@@ -101,15 +110,37 @@ func (cfg *DownloaderConfig) Init() *DownloaderConfig {
 type DownloaderStoreConfig struct {
 	FirstLoad bool `json:"-"` // FirstLoad is the flag that the config is first time init and not from store
 
-	DownloadDir    string         `json:"downloadDir"`    // DownloadDir is the default directory to save the downloaded files
-	MaxRunning     int            `json:"maxRunning"`     // MaxRunning is the max running download count
-	ProtocolConfig map[string]any `json:"protocolConfig"` // ProtocolConfig is special config for each protocol
-	Extra          map[string]any `json:"extra"`          // Extra is the extra config
+	DownloadDir    string                 `json:"downloadDir"`    // DownloadDir is the default directory to save the downloaded files
+	MaxRunning     int                    `json:"maxRunning"`     // MaxRunning is the max running download count
+	ProtocolConfig map[string]any         `json:"protocolConfig"` // ProtocolConfig is special config for each protocol
+	Extra          map[string]any         `json:"extra"`
+	Proxy          *DownloaderProxyConfig `json:"proxy"`
 }
 
 func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
 	if cfg.MaxRunning == 0 {
 		cfg.MaxRunning = 5
 	}
+	if cfg.Proxy == nil {
+		cfg.Proxy = &DownloaderProxyConfig{}
+	}
 	return cfg
 }
+
+func (cfg *DownloaderStoreConfig) ProxyUrl() *url.URL {
+	if cfg.Proxy == nil {
+		return nil
+	}
+	if cfg.Proxy.Enable == false || cfg.Proxy.Scheme == "" || cfg.Proxy.Host == "" {
+		return nil
+	}
+	return util.BuildProxyUrl(cfg.Proxy.Scheme, cfg.Proxy.Host, cfg.Proxy.Usr, cfg.Proxy.Pwd)
+}
+
+type DownloaderProxyConfig struct {
+	Enable bool   `json:"enable"`
+	Scheme string `json:"scheme"`
+	Host   string `json:"host"`
+	Usr    string `json:"usr"`
+	Pwd    string `json:"pwd"`
+}

pkg/download/testdata/extensions/function_error/index.js

@@ -1,5 +1,6 @@
 gopeed.events.onResolve(async function (ctx) {
     const aaa = {};
+    // access undefined property
     gopeed.logger.info(aaa.bbb.ccc);
 
     ctx.res = {

pkg/download/testdata/extensions/message_error/index.js

@@ -0,0 +1,3 @@
+gopeed.events.onResolve(async function (ctx) {
+    throw new MessageError("test");
+});

pkg/download/testdata/extensions/message_error/manifest.json

@@ -0,0 +1,16 @@
+{
+  "name": "message-error",
+  "title": "gopeed extension message error test",
+  "version": "0.0.1",
+  "scripts": [
+    {
+      "event": "onResolve",
+      "match": {
+        "urls": [
+          "*://github.com/*"
+        ]
+      },
+      "entry": "index.js"
+    }
+  ]
+}

pkg/download/testdata/extensions/on_error/index.js

@@ -0,0 +1,8 @@
+gopeed.events.onError(async function (ctx) {
+    gopeed.logger.info("url", ctx.task.meta.req.url);
+    gopeed.logger.info("error", ctx.error);
+    ctx.task.meta.req.url = "https://github.com";
+    ctx.task.pause();
+    ctx.task.continue();
+});
+

pkg/download/testdata/extensions/on_error/manifest.json

@@ -0,0 +1,16 @@
+{
+  "name": "on-error",
+  "title": "gopeed extension on error event test",
+  "version": "0.0.1",
+  "scripts": [
+    {
+      "event": "onError",
+      "match": {
+        "labels": [
+          "test"
+        ]
+      },
+      "entry": "index.js"
+    }
+  ]
+}

pkg/download/testdata/extensions/on_start/index.js

@@ -1,4 +1,5 @@
 gopeed.events.onStart(async function (ctx) {
+    gopeed.logger.info("url", ctx.task.meta.req.url);
     ctx.task.meta.req.url = "https://github.com";
     ctx.task.meta.req.labels['modified'] = 'true';
 });

pkg/protocol/bt/model.go

@@ -3,3 +3,12 @@ package bt
 type ReqExtra struct {
 	Trackers []string `json:"trackers"`
 }
+
+// Stats for download
+type Stats struct {
+	// bt stats
+	// health indicators of torrents, from large to small, ConnectedSeeders are also the key to the health of seed resources
+	TotalPeers       int `json:"totalPeers"`
+	ActivePeers      int `json:"activePeers"`
+	ConnectedSeeders int `json:"connectedSeeders"`
+}

pkg/protocol/http/model.go

@@ -8,4 +8,12 @@ type ReqExtra struct {
 
 type OptsExtra struct {
 	Connections int `json:"connections"`
+	// AutoTorrent when task download complete, and it is a .torrent file, it will be auto create a new task for the torrent file
+	AutoTorrent bool `json:"autoTorrent"`
+}
+
+// Stats for download
+type Stats struct {
+	// http stats
+	// health indicators of http
 }

pkg/rest/server.go

@@ -3,11 +3,13 @@ package rest
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"github.com/GopeedLab/gopeed/pkg/download"
 	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"github.com/GopeedLab/gopeed/pkg/util"
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
+	"github.com/pkg/errors"
 	"net"
 	"net/http"
 	"os"
@@ -131,6 +133,20 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 		})
 	}
 
+	// recover panic
+	r.Use(func(h http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			defer func() {
+				if v := recover(); v != nil {
+					err := errors.WithStack(fmt.Errorf("%v", v))
+					Downloader.Logger.Error().Stack().Err(err).Msg("http server panic")
+					WriteJson(w, model.NewErrorResult(err.Error(), model.CodeError))
+				}
+			}()
+			h.ServeHTTP(w, r)
+		})
+	})
+
 	srv = &http.Server{Handler: handlers.CORS(
 		handlers.AllowedHeaders([]string{"Content-Type", "X-Api-Token", "X-Target-Uri"}),
 		handlers.AllowedMethods([]string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"}),

pkg/rest/server_test.go

@@ -27,7 +27,7 @@ var (
 		Extra: map[string]any{
 			"method": "",
 			"header": map[string]string{
-				"User-Agent": "gopeed",
+				"Usr-Agent": "gopeed",
 			},
 			"body": "",
 		},
@@ -204,12 +204,14 @@ func TestPauseAllAndContinueALLTasks(t *testing.T) {
 
 		// continue all
 		httpRequestCheckOk[any](http.MethodPut, "/api/v1/tasks/continue", nil)
+		time.Sleep(time.Millisecond * 100)
 		tasks := httpRequestCheckOk[[]*download.Task](http.MethodGet, fmt.Sprintf("/api/v1/tasks?status=%s", base.DownloadStatusRunning), nil)
 		if len(tasks) != cfg.MaxRunning {
 			t.Errorf("ContinueAllTasks() got = %v, want %v", len(tasks), cfg.MaxRunning)
 		}
 		// pause all
 		httpRequestCheckOk[any](http.MethodPut, "/api/v1/tasks/pause", nil)
+		time.Sleep(time.Millisecond * 100)
 		tasks = httpRequestCheckOk[[]*download.Task](http.MethodGet, fmt.Sprintf("/api/v1/tasks?status=%s", base.DownloadStatusPause), nil)
 		if len(tasks) != total {
 			t.Errorf("PauseAllTasks() got = %v, want %v", len(tasks), total)

pkg/util/path.go

@@ -183,3 +183,14 @@ func IsExistsFile(path string) bool {
 	}
 	return false
 }
+
+// ReplaceInvalidFilename replace invalid path characters
+func ReplaceInvalidFilename(path string) string {
+	if path == "" {
+		return ""
+	}
+	for _, char := range invalidPathChars {
+		path = strings.ReplaceAll(path, char, "_")
+	}
+	return path
+}

pkg/util/path_other.go

@@ -0,0 +1,6 @@
+//go:build !windows
+// +build !windows
+
+package util
+
+var invalidPathChars = []string{`/`, `:`}

pkg/util/path_test.go

@@ -178,3 +178,50 @@ func TestIsExistsFile(t *testing.T) {
 		})
 	}
 }
+
+func TestReplaceInvalidFilename(t *testing.T) {
+	type args struct {
+		path string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "blank",
+			args: args{
+				path: "",
+			},
+			want: "",
+		},
+		{
+			name: "normal",
+			args: args{
+				path: "test.txt",
+			},
+			want: "test.txt",
+		},
+		{
+			name: "case1",
+			args: args{
+				path: "te/st.txt",
+			},
+			want: "te_st.txt",
+		},
+		{
+			name: "case2",
+			args: args{
+				path: "te/st:.txt",
+			},
+			want: "te_st_.txt",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := ReplaceInvalidFilename(tt.args.path); got != tt.want {
+				t.Errorf("ReplaceInvalidFilename() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

pkg/util/path_windows.go

@@ -0,0 +1,3 @@
+package util
+
+var invalidPathChars = []string{`\`, `/`, `:`, `*`, `?`, `"`, `<`, `>`, `|`}