fix: avoid hanging the main thread on repeat start (#584)

Fix filename discrepancies for .deb and .AppImage

.github/release-drafter.yml

@@ -11,12 +11,16 @@ categories:
       - 'fix'
       - 'bugfix'
       - 'bug'
+  - title: '🧪 Tests'
+    label: 'test'
   - title: '🧰 Maintenance'
     label: 'chore'
   - title: '📖 Document'
-    label: 'doc'
+    label: 'docs'
   - title: '🚀 CI/CD'
     label: 'ci'
+  - title: '🌎 Internationalization'
+    label: 'translation'
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 version-resolver:
   major:
@@ -30,6 +34,10 @@ version-resolver:
       - 'patch'
   default: patch
 template: |
-  ## Changes
+  # Release notes
+
+  $CHANGES
+  
+  # 更新日志
 
   $CHANGES

.github/workflows/build.yml

@@ -2,10 +2,19 @@ name: build
 
 on:
   workflow_dispatch:
+    inputs:
+      platform:
+        description: 'Build platform'
+        required: true
+        default: 'all'
+      test:
+        description: 'Test mode'
+        required: true
+        default: "false"
 
 env:
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.21"
-  FLUTTER_VERSION: "3.10.6"
+  FLUTTER_VERSION: "3.16.8"
 
 permissions:
   contents: write
@@ -14,39 +23,41 @@ jobs:
   get-release:
     runs-on: ubuntu-latest
     outputs:
-      tag_name: ${{ steps.get-release.outputs.tag_name }}
+      version: ${{ steps.get-release.outputs.version }}
       upload_url: ${{ steps.get-release.outputs.upload_url }}
 
     steps:
-      - uses: monkeyWie/get-latest-release@v1
+      - uses: monkeyWie/get-latest-release@v2.1
         id: get-release
         with:
           myToken: ${{ github.token }}
 
   build-windows:
+    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'windows' }}
     runs-on: windows-latest
     needs: [ get-release ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: ${{ env.GO_VERSION }}
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Build
         env:
-          VERSION: ${{ needs.get-release.outputs.tag_name }}
+          VERSION: ${{ needs.get-release.outputs.version }}
         run: |
           Invoke-WebRequest -Uri "https://github.com/jrsoftware/issrc/raw/main/Files/Languages/Unofficial/ChineseSimplified.isl" -OutFile "ChineseSimplified.isl"
           mv ChineseSimplified.isl "C:\Program Files (x86)\Inno Setup 6\Languages\"
 
-          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
+          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
           cd ui/flutter
+          $TAG = "v$env:VERSION"
           flutter build windows
-          $mingw = "C:\ProgramData\Chocolatey\lib\mingw\tools\install\mingw64\bin"
+          $mingw = "C:\Program Files\Git\mingw64\bin"
           $system = "C:\Windows\System32"
-          $release = "build\windows\runner\Release\"
+          $release = "build\windows\x64\runner\Release\"
           cp $mingw\libstdc++-6.dll $release
           cp $mingw\libgcc_s_seh-1.dll $release
           cp $mingw\libwinpthread-1.dll $release
@@ -55,7 +66,7 @@ jobs:
           cp $system\vcruntime140_1.dll $release
 
           New-Item -Path build\windows\Output -ItemType Directory
-          Compress-Archive -Path "$release*" -DestinationPath "build\windows\Output\Gopeed-$env:VERSION-windows-amd64-portable.zip"
+          Compress-Archive -Path "$release*" -DestinationPath "build\windows\Output\Gopeed-$TAG-windows-amd64-portable.zip"
 
           cd build/windows
           echo @"
@@ -63,7 +74,7 @@ jobs:
           ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
           #define MyAppName "Gopeed"
-          #define MyAppVersion "$($env:VERSION.substring(1))"
+          #define MyAppVersion "$env:VERSION"
           #define MyAppPublisher "monkeyWie"
           #define MyAppURL "https://gopeed.com"
           #define MyAppExeName "gopeed.exe"
@@ -100,7 +111,7 @@ jobs:
           Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
           [Files]
-          Source: ".\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
+          Source: ".\x64\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
           ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
           [UninstallDelete]
@@ -114,9 +125,9 @@ jobs:
           Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
           "@ > setup.iss
           iscc.exe setup.iss
-          mv "Output\gopeed.exe" "Output\Gopeed-$env:VERSION-windows-amd64.exe"
+          mv "Output\gopeed.exe" "Output\Gopeed-$TAG-windows-amd64.exe"
-          Compress-Archive -Path "Output\Gopeed-$env:VERSION-windows-amd64.exe" -DestinationPath "Output\Gopeed-$env:VERSION-windows-amd64.zip"
+          Compress-Archive -Path "Output\Gopeed-$TAG-windows-amd64.exe" -DestinationPath "Output\Gopeed-$TAG-windows-amd64.zip"
-          Remove-Item -Path "Output\Gopeed-$env:VERSION-windows-amd64.exe"
+          Remove-Item -Path "Output\Gopeed-$TAG-windows-amd64.exe"
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -124,7 +135,8 @@ jobs:
           asset_path: ui/flutter/build/windows/Output/*
           overwrite: true
   build-macos-arm64-lib:
-    runs-on: ubuntu-latest
+    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
+    runs-on: macos-latest
     needs: [ get-release ]
     steps:
       - uses: actions/checkout@v3
@@ -132,16 +144,17 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Build
+        env:
+          VERSION: ${{ needs.get-release.outputs.version }}
         run: |
-          go install src.techknowlogick.com/xgo@latest
+          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
-          xgo -go go-1.19.x --targets=darwin/arm64 -tags="nosqlite" -ldflags="-w -s" -buildmode=c-shared -pkg=bind/desktop -out=libgopeed .
-          mv libgopeed-*.dylib libgopeed.dylib
       - uses: actions/upload-artifact@v3
         with:
           name: macos-arm64-lib
           path: libgopeed.dylib
   build-macos:
-    runs-on: macos-latest
+    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
+    runs-on: macos-13
     needs: [ get-release, build-macos-arm64-lib ]
     steps:
       - uses: actions/checkout@v3
@@ -155,19 +168,21 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Install appdmg
-        run: npm install -g appdmg
+        run: |
+          python3 -m pip install setuptools --break-system-packages
+          npm install -g appdmg
       - uses: actions/download-artifact@v3
         with:
           name: macos-arm64-lib
           path: ui/flutter/lib-arm64
       - name: Build
         env:
-          VERSION: ${{ needs.get-release.outputs.tag_name }}
+          VERSION: ${{ needs.get-release.outputs.version }}
         run: |
           PROJECT_DIR=$(pwd)
 
           # amd64 lib
-          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/lib-amd64/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
+          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/lib-amd64/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
           # universal binary
           mkdir -p ui/flutter/macos/Frameworks
           cp ui/flutter/lib-amd64/libgopeed.dylib ui/flutter/macos/Frameworks/amd64-lib
@@ -189,7 +204,7 @@ jobs:
           }
           EOF
           mkdir dist
-          appdmg appdmg.json dist/Gopeed-$VERSION-macos.dmg
+          appdmg appdmg.json dist/Gopeed-v$VERSION-macos.dmg
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -197,6 +212,7 @@ jobs:
           asset_path: ui/flutter/build/macos/Build/Products/Release/dist/*
           overwrite: true
   build-linux:
+    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'linux' }}
     runs-on: ubuntu-latest
     needs: [ get-release ]
     steps:
@@ -208,55 +224,138 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - run: |
-          sudo apt-get update -y
+          sudo apt update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev
+          # flutter build dependencies
+          sudo apt install -y ninja-build libgtk-3-dev libayatana-appindicator3-1 libayatana-appindicator3-dev
+          # 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 }}
+          VERSION: ${{ needs.get-release.outputs.version }}
         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
+          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
           cd ui/flutter
-          flutter build linux
+          dart pub global activate -sgit https://github.com/GopeedLab/flutter_distributor.git --git-path packages/flutter_distributor
-          mkdir -p debian/gui
+          flutter_distributor package --platform linux --targets appimage,deb
-          cp assets/icon/icon_1024.png debian/gui/gopeed.png
+          cd dist/*
-          cat>debian/debian.yaml<<EOF
+          mv gopeed-*-linux.AppImage Gopeed-v${VERSION}-linux-x86_64.AppImage
-          flutter_app:
+          mv gopeed-*-linux.deb Gopeed-v${VERSION}-linux-amd64.deb
-            command: gopeed
-            arch: x64
-            parent: /usr/local/lib
-          control:
-            Package: gopeed
-            Version: ${VERSION:1}
-            Architecture: amd64
-            Essential: no
-            Priority: optional
-            Depends:
-            Maintainer: monkeyWie
-            Description: High speed downloader that supports all platforms.
-          EOF
-
-          cat>debian/gui/gopeed.desktop<<EOF
-          [Desktop Entry]
-          Version=${VERSION:1}
-          Name=Gopeed
-          GenericName=Gopeed
-          Comment=High speed downloader that supports all platforms.
-          Terminal=false
-          Type=Application
-          Categories=Utility
-          Keywords=Flutter;Downloader;
-          EOF
-
-          dart pub global activate flutter_to_debian
-          flutter_to_debian
-          mv debian/packages/gopeed*.deb debian/packages/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/debian/packages/*
+          asset_path: ui/flutter/dist/*/*
           overwrite: true
+  build-snap:
+    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'snap' }}
+    runs-on: ubuntu-latest
+    needs: [ get-release ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      - name: Setup LXD
+        uses: canonical/[email protected]
+        with:
+          channel: latest/stable
+      - name: Build
+        env:
+          VERSION: ${{ needs.get-release.outputs.version }}
+        run: |
+          go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
+          cd ui/flutter
+          
+          sudo snap install snapcraft --classic
+          mkdir -p snap/gui
+          cp assets/icon/icon.svg snap/gui/gopeed.svg
+          
+          cat>snap/snapcraft.yaml<<EOF
+          name: gopeed
+          version: $VERSION
+          summary: A modern download manager
+          description: High speed downloader that supports all platforms.
+          
+          confinement: strict
+          base: core22
+          grade: stable
+          
+          architectures:
+            - build-on: amd64
+              build-for: amd64
+          
+          slots:
+            dbus-gopeed:
+              interface: dbus
+              bus: session
+              name: com.gopeed.gopeed
+          
+          apps:
+            gopeed:
+              command: bin/gopeed
+              extensions: [gnome]
+              plugs:
+                - network
+                - home
+              slots:
+                - dbus-gopeed
+          parts:
+            flutter-git:
+              source: https://github.com/flutter/flutter.git
+              source-tag: $FLUTTER_VERSION
+              source-depth: 1
+              plugin: nil
+              override-build: |
+                mkdir -p \$CRAFT_PART_INSTALL/usr/bin
+                mkdir -p \$CRAFT_PART_INSTALL/usr/libexec
+                cp -r \$CRAFT_PART_SRC \$CRAFT_PART_INSTALL/usr/libexec/flutter
+                ln -s \$CRAFT_PART_INSTALL/usr/libexec/flutter/bin/flutter \$CRAFT_PART_INSTALL/usr/bin/flutter
+                ln -s \$SNAPCRAFT_PART_INSTALL/usr/libexec/flutter/bin/dart \$SNAPCRAFT_PART_INSTALL/usr/bin/dart
+                \$CRAFT_PART_INSTALL/usr/bin/flutter doctor
+              build-packages:
+                - clang
+                - cmake
+                - curl
+                - libgtk-3-dev
+                - ninja-build
+                - unzip
+                - xz-utils
+                - zip
+              override-prime: ''
+            zenity:
+              plugin: nil
+              stage-packages:
+                - zenity
+            gopeed:
+              after: [flutter-git,zenity]
+              source: .
+              plugin: nil
+              stage-packages:
+                - libgtk-3-dev
+                - libappindicator3-dev
+              override-build: |
+                # work around pub get stack overflow # https://github.com/dart-lang/sdk/issues/51068#issuecomment-1396588253
+                set +e
+                dart pub get
+                set -eux
+                flutter build linux --release -v
+                mkdir -p \$CRAFT_PART_INSTALL/bin/
+                cp -r build/linux/*/release/bundle/* \$CRAFT_PART_INSTALL/bin/
+          EOF
+          
+          cp linux/assets/com.gopeed.Gopeed.desktop snap/gui/gopeed.desktop
+          sed -i 's/Icon=com.gopeed.Gopeed/Icon=\${SNAP}\/meta\/gui\/gopeed.svg/g' snap/gui/gopeed.desktop
+          
+          snapcraft --use-lxd
+
+          # Snapcraft login
+          export SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.SNAP_STORE_LOGIN }}
+          snapcraft upload --release=${{ github.event.inputs.test == 'true' && 'edge' || 'stable' }} gopeed_${VERSION}_amd64.snap
   build-android:
+    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'android' }}
     runs-on: ubuntu-latest
     needs: [ get-release ]
     steps:
@@ -273,7 +372,7 @@ jobs:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Build
         env:
-          VERSION: ${{ needs.get-release.outputs.tag_name }}
+          VERSION: ${{ needs.get-release.outputs.version }}
           APK_KEYSTORE: ${{ secrets.APK_KEYSTORE }}
           APK_KEY_PASSWORD: ${{ secrets.APK_KEY_PASSWORD }}
           APK_STORE_PASSWORD: ${{ secrets.APK_STORE_PASSWORD }}
@@ -281,12 +380,12 @@ jobs:
           go install golang.org/x/mobile/cmd/gomobile@latest
           go get golang.org/x/mobile/bind
           gomobile init
-          gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
+          gomobile bind -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
           cd ui/flutter
           echo $APK_KEYSTORE | base64 -di > android/app/upload-keystore.jks
           flutter build apk
           mkdir dist
-          cp build/app/outputs/flutter-apk/app-release.apk dist/Gopeed-$VERSION-android.apk
+          cp build/app/outputs/flutter-apk/app-release.apk dist/Gopeed-v$VERSION-android.apk
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -294,6 +393,7 @@ jobs:
           asset_path: ui/flutter/dist/*
           overwrite: true
   build-ios:
+    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'ios' }}
     runs-on: macos-latest
     needs: [ get-release ]
     steps:
@@ -306,19 +406,19 @@ jobs:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Build
         env:
-          VERSION: ${{ needs.get-release.outputs.tag_name }}
+          VERSION: ${{ needs.get-release.outputs.version }}
         run: |
           go install golang.org/x/mobile/cmd/gomobile@latest
           go get golang.org/x/mobile/bind
           gomobile init
-          gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
+          gomobile bind -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -o ui/flutter/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
           cd ui/flutter
           flutter build ios --no-codesign
           mkdir Payload
           cp -r build/ios/iphoneos/Runner.app Payload
           zip -r -y Payload.zip Payload/Runner.app
           mkdir dist
-          mv Payload.zip dist/Gopeed-$VERSION-ios.ipa
+          mv Payload.zip dist/Gopeed-v$VERSION-ios.ipa
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -326,6 +426,7 @@ jobs:
           asset_path: ui/flutter/dist/*
           overwrite: true
   build-web:
+    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'web' }}
     runs-on: ubuntu-latest
     needs: [ get-release ]
     steps:
@@ -338,13 +439,14 @@ jobs:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Build
         env:
-          VERSION: ${{ needs.get-release.outputs.tag_name }}
+          VERSION: ${{ needs.get-release.outputs.version }}
         run: |
           cd ui/flutter
           flutter build web --web-renderer html
           cd ../../
           cp -r ui/flutter/build/web cmd/web/dist
           mkdir -p dist/zip
+          
           goos_arr=(windows darwin linux)
           goarch_arr=(386 amd64 arm64)
           export CGO_ENABLED=0
@@ -354,9 +456,9 @@ jobs:
               if [ $goos = "darwin" ]; then
                 goos_name="macos"
               fi
-              name=gopeed-web-$VERSION-$goos_name-$goarch
+              name=gopeed-web-v$VERSION-$goos_name-$goarch
               dir="dist/$name/"
-              (GOOS=$goos GOARCH=$goarch go build -tags nosqlite,web -ldflags="-s -w" -o $dir github.com/GopeedLab/gopeed/cmd/web \
+              (GOOS=$goos GOARCH=$goarch go build -tags nosqlite,web -ldflags="-s -w -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -o $dir github.com/GopeedLab/gopeed/cmd/web \
               && cd $dir \
               && file=$(ls -AU | head -1) \
               && mkdir $name \
@@ -373,6 +475,7 @@ jobs:
           asset_path: dist/zip/*
           overwrite: true
   build-docker:
+    if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'docker' }}
     runs-on: ubuntu-latest
     needs: [ get-release ]
     steps:
@@ -393,15 +496,18 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v2
         env:
-          VERSION: ${{ needs.get-release.outputs.tag_name }}
+          VERSION: ${{ needs.get-release.outputs.version }}
         with:
-          push: true
+          push: ${{ github.event.inputs.test == 'true' && 'false' || 'true' }}
+          build-args: |
+            VERSION=${{ env.VERSION }}
+            IN_DOCKER=true
           platforms: |
             linux/386
             linux/amd64
             linux/arm64
-            linux/arm/v6
             linux/arm/v7
+            linux/arm64/v8
           tags: |
             liwei2633/gopeed:latest
-            liwei2633/gopeed:${{ env.VERSION }}
+            liwei2633/gopeed:v${{ env.VERSION }}

.github/workflows/test.yml

@@ -27,8 +27,8 @@ on:
       - "go.sum"
 
 env:
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.21"
-  FLUTTER_VERSION: "3.10.6"
+  FLUTTER_VERSION: "3.16.8"
 
 jobs:
   #  lint:

.gitignore

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

CONTRIBUTING.md

@@ -17,18 +17,11 @@ 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.
+words prefixed with `@` are not meant to be translated.
 
 ## flutter development
 
@@ -39,16 +32,3 @@ 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_vi-VN.md

@@ -0,0 +1,29 @@
+# Hướng dẫn đóng góp cho Gopeed
+
+Trước tiên, cảm ơn bạn đã quan tâm đến việc đóng góp cho Gopeed. Hướng dẫn này sẽ giúp bạn tham gia
+phát triển Gopeed một cách tốt hơn.
+
+## Mô tả nhánh
+
+Dự án này chỉ có một nhánh chính duy nhất, đó là nhánh `main`. Nếu bạn muốn tham gia vào
+phát triển Gopeed, hãy fork dự án này trước, sau đó phát triển trong dự án fork của bạn. Sau khi
+hoàn thành phát triển, gửi một PR đến dự án này và merge vào nhánh `main`.
+
+## Phát triển cục bộ
+
+Đề nghị phát triển và gỡ lỗi thông qua web. Đầu tiên, khởi động dịch vụ backend bằng cách chạy
+lệnh `go run cmd/api/main.go` trong dòng lệnh, cổng mặc định của dịch vụ là `9999`, sau đó
+khởi động dự án flutter frontend trong chế độ `debug` để chạy.
+
+## Dịch thuật
+
+Các tệp quốc tế hóa của Gopeed được đặt trong thư mục `ui/flutter/lib/i18n/langs`.
+Bạn chỉ cần thêm tệp ngôn ngữ tương ứng trong thư mục này.
+
+Vui lòng tham khảo `en_us.dart` để biết cách dịch thuật.
+
+## Phát triển flutter
+
+Đừng quên chạy `dart format ./ui/flutter` trước khi commit để giữ mã của bạn theo định dạng dart chuẩn.
+
+Bật build_runner watcher nếu bạn muốn chỉnh sửa api/models:

CONTRIBUTING_zh-CN.md

@@ -14,15 +14,9 @@ flutter 项目即可运行。
 
 ## 翻译
  
-Gopeed 的国际化文件位于 `ui/flutter/assets/locales` 目录下，只需要在该目录下添加对应的语言文件即可。
+Gopeed 的国际化文件位于 `ui/flutter/lib/i18n/langs` 目录下，只需要在该目录下添加对应的语言文件即可。
 
-编辑locales后请运行以下命令:
+请注意以 `en_us.dart` 为参照进行翻译。
-
-```
-get generate locales 
-```
-
-请注意以 `en_US.json` 为参照进行翻译。
 
 ## 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

@@ -0,0 +1,28 @@
+# Gopeed 協助指南
+
+首先感謝您願意幫助我們改進並優化該項目，這份指南將會幫助您更好的參與 Gopeed 的開發。
+
+## 分支說明
+
+本項目只有一個分支，即 `main` 分支，如果您想要參與 Gopeed 的開發，請先 fork 該項目，再在您自己的 fork 中進行開發，開發完成後再開啟PR，以合併至 `main` 分支。
+
+## 離線開發
+
+建議使用 web 端進行開發與調試，首先啟動服務，使用指令 `go run cmd/api/main.go` 啟動 ，該服務默認連接埠為 `9999`，接著以 `debug` 模式啟動前端 flutter 項目即可。
+
+## 翻譯
+ 
+Gopeed 的翻譯文件位於 `ui/flutter/lib/i18n/langs` 目錄中，只需要修改或新建翻譯文件即可。
+
+
+請以 `en_us.dart` 作為參照。
+
+## flutter開發
+
+每次提交PR前請務必執行 `dart format ./ui/flutter`
+
+如果需要編輯 api/models，請打開build_runner watcher:
+
+```
+flutter pub run build_runner watch
+```

Dockerfile

@@ -1,21 +1,32 @@
-FROM instrumentisto/flutter:3.10.6 AS flutter
+FROM instrumentisto/flutter:3.16.8 AS flutter
 WORKDIR /app
 COPY ./ui/flutter/pubspec.yaml ./ui/flutter/pubspec.lock ./
 RUN flutter pub get
 COPY ./ui/flutter ./
 RUN flutter build web --web-renderer html
 
-FROM golang:1.19.3 AS go
+FROM golang:1.21.6 AS go
 WORKDIR /app
 COPY ./go.mod ./go.sum ./
 RUN go mod download
 COPY . .
 COPY --from=flutter /app/build/web ./cmd/web/dist
-RUN CGO_ENABLED=0 go build -tags nosqlite,web -ldflags="-s -w" -o dist/gopeed github.com/GopeedLab/gopeed/cmd/web
+ARG VERSION=dev
+RUN CGO_ENABLED=0 go build -tags nosqlite,web \
+      -ldflags="-s -w -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION -X github.com/GopeedLab/gopeed/pkg/base.InDocker=true" \
+      -o dist/gopeed github.com/GopeedLab/gopeed/cmd/web
 
 FROM alpine:3.14.2
 LABEL maintainer="monkeyWie"
 WORKDIR /app
 COPY --from=go /app/dist/gopeed ./
+COPY entrypoint.sh ./entrypoint.sh
+RUN apk update && \
+    apk upgrade --no-cache && \
+    apk add --no-cache bash su-exec; \
+    chmod +x ./entrypoint.sh && \
+    rm -rf /var/cache/apk/*
+VOLUME ["/app/storage"]
+ENV PUID=0 PGID=0 UMASK=022
 EXPOSE 9999
-ENTRYPOINT ["./gopeed"]
+ENTRYPOINT ["./entrypoint.sh"]

README.md

@@ -9,29 +9,80 @@
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
 
-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md)
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
 
 ## Introduction
 
-Gopeed (full name Go Speed), a high-speed downloader developed by `Golang` + `Flutter`, supports (HTTP, BitTorrent, Magnet) protocol, and supports all platforms.
+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
+## Download
 
-**Supported platforms**
+<table>
+    <thead>
+        <tr>
+            <th>Platform</th>
+            <th>Package Type</th>
+            <th>Download Link</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td rowspan=2>Windows</td>
+            <td><code>EXE Installer</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>Portable ZIP</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">Link</a></td>
+        </tr>
+        <tr>
+            <td>MacOS</td>
+            <td><code>DMG Installer</code></td>          
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">Link</a></td>
+        </tr>
+        <tr>
+            <td rowspan=4>Linux</td>
+            <td><code>Flathub</code></td>
+            <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>SNAP</code></td>
+            <td><a href="https://snapcraft.io/gopeed">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>DEB</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>AppImage</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">Link</a></td>
+        </tr>
+        <tr>
+            <td>Android</td>
+            <td><code>APK</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">Link</a></td>
+        </tr>
+        <tr>
+            <td>iOS</td>
+            <td><code>IPA</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
+        </tr>
+        <tr>
+            <td>Web</td>
+            <td></td>
+            <td><a href="https://github.com/GopeedLab/gopeed/releases/latest">Link</a></td>
+        </tr>
+        <tr>
+            <td>Docker</td>
+            <td></td>
+            <td><a href="https://hub.docker.com/r/liwei2633/gopeed">Link</a></td>
+        </tr>
+    </tbody>
+</table>
 
-- [x] windows
+More about installation, please refer to [Installation](https://docs.gopeed.com/install.html)
-- [x] macos
-- [x] linux
-- [x] android
-- [x] ios
-- [x] web
-- [x] docker
-
-[Download](https://github.com/GopeedLab/gopeed/releases/latest)
-
-> Tips: If the macos open failed, please execute the `xattr -d com.apple.quarantine /Applications/Gopeed.app` command in the terminal
 
 ### Command tool
 
@@ -41,23 +92,9 @@ use `go install`:
 go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ```
 
-### Docker
+## Browser Extension
 
-#### Start directly
+Gopeed also provides a browser extension to take over browser downloads, supporting browsers such as Chrome, Edge, Firefox, etc., please refer to: [https://github.com/GopeedLab/browser-extension](https://github.com/GopeedLab/browser-extension)
-
-```bash
-docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads liwei2633/gopeed
-```
-
-#### Using Docker Compose
-
-```bash
-docker-compose up -d
-```
-
-#### Access Gopeed
-
-When the docker container is running, you can access the web page through `http://localhost:9999`.
 
 ## Donate
 
@@ -75,8 +112,8 @@ This project is divided into two parts, the front end uses `flutter`, the back e
 
 ### Environment
 
-1. Golang 1.19+
+1. Golang 1.21+
-2. Flutter 3.10+
+2. Flutter 3.16+
 
 ### Clone
 
@@ -135,7 +172,7 @@ command:
 - android
 
 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```
@@ -159,7 +196,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

@@ -9,59 +9,84 @@
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
 
-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md)
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
 
 ## はじめに
 
-Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された高速ダウンローダーで、(HTTP、BitTorrent、Magnet) プロトコルをサポートし、すべてのプラットフォームをサポートします。
+Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された高速ダウンローダーで、(HTTP、BitTorrent、Magnet) プロトコルをサポートし、すべてのプラットフォームをサポートします。基本的なダウンロード機能に加え、[APIs](https://docs.gopeed.com/dev-api.html)との連動や[拡張機能](https://docs.gopeed.com/dev-extension.html)のインストール・開発による追加機能にも対応した、カスタマイズ性の高いダウンローダーです。
 
 見て下さい ✈ [公式ウェブサイト](https://gopeed.com) | 📖 [開発ドキュメント](https://docs.gopeed.com)
 
 ## インストール
 
-**サポートするプラットフォーム**
+<table>
+    <thead>
+        <tr>
+            <th>Platform</th>
+            <th>Package Type</th>
+            <th>Download Link</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td rowspan=2>Windows</td>
+            <td><code>EXE Installer</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>Portable ZIP</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">Link</a></td>
+        </tr>
+        <tr>
+            <td>MacOS</td>
+            <td><code>DMG Installer</code></td>          
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">Link</a></td>
+        </tr>
+        <tr>
+            <td rowspan=4>Linux</td>
+            <td><code>Flathub</code></td>
+            <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>SNAP</code></td>
+            <td><a href="https://snapcraft.io/gopeed">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>DEB</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">Link</a></td>
+        </tr>
+        <tr>
+            <td><code>AppImage</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">Link</a></td>
+        </tr>
+        <tr>
+            <td>Android</td>
+            <td><code>APK</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">Link</a></td>
+        </tr>
+        <tr>
+            <td>iOS</td>
+            <td><code>IPA</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
+        </tr>
+        <tr>
+            <td>Web</td>
+            <td></td>
+            <td><a href="https://github.com/GopeedLab/gopeed/releases/latest">Link</a></td>
+        </tr>
+        <tr>
+            <td>Docker</td>
+            <td></td>
+            <td><a href="https://hub.docker.com/r/liwei2633/gopeed">Link</a></td>
+        </tr>
+    </tbody>
+</table>
 
-- [x] windows
+インストールについての詳細は、[インストール](https://docs.gopeed.com/install.html)を参照してください。
-- [x] macos
-- [x] linux
-- [x] android
-- [x] ios
-- [x] web
-- [x] docker
-
-[ダウンロード](https://github.com/GopeedLab/gopeed/releases/latest)
-
-> ヒント: macos を開くのに失敗した場合は、ターミナルで `xattr -d com.apple.quarantine /Applications/Gopeed.app` コマンドを実行してください
-
-### コマンドツール
-
-`go install` を使用:
-
-```bash
-go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
-```
-
-### Docker
-
-#### 直接始める
-
-```bash
-docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads liwei2633/gopeed
-```
-
-#### Docker Compose の使用
-
-```bash
-docker-compose up -d
-```
-
-#### Gopeed へのアクセス
-
-docker コンテナが起動しているときは、`http://localhost:9999` からウェブページにアクセスできます。
 
 ## 寄付
 
-もしこのプロジェクトがお気に召しましたら、このプロジェクトの発展を支援するために[寄付](/.donate/index.md#donate)をご検討ください！
+もしこのプロジェクトがお気に召しましたら、このプロジェクトの発展を支援するために[寄付](https://docs.gopeed.com/donate.html)をご検討ください！
 
 ## ショーケース
 
@@ -75,8 +100,8 @@ docker コンテナが起動しているときは、`http://localhost:9999` か
 
 ### 環境
 
-1. Go 言語 1.19+
+1. Go 言語 1.21+
-2. Flutter 3.10+
+2. Flutter 3.16+
 
 ### クローン
 
@@ -135,7 +160,7 @@ gomobile init
 - android
 
 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```
@@ -159,7 +184,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_vi-VN.md

@@ -0,0 +1,211 @@
+[![Trạng thái kiểm tra](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
+[![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
+[![Phiên bản](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
+[![Tải về](https://img.shields.io/github/downloads/GopeedLab/gopeed/total.svg)](https://github.com/GopeedLab/gopeed/releases)
+[![Ủng hộ](https://img.shields.io/badge/%24-ủng%20hộ-ff69b4.svg)](https://docs.gopeed.com/donate.html)
+[![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)
+
+![](_docs/img/banner.png)
+
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
+
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
+
+## Giới thiệu
+
+Gopeed (tên đầy đủ Go Speed), một công cụ tải xuống tốc độ cao được phát triển bởi `Golang` + `Flutter`, hỗ trợ giao thức (HTTP, BitTorrent, Magnet) và hỗ trợ tất cả các nền tảng. Ngoài các chức năng tải xuống cơ bản, Gopeed còn là một công cụ tải xuống có thể tùy chỉnh cao cho phép triển khai thêm tính năng thông qua việc tích hợp với [APIs](https://docs.gopeed.com/dev-api.html) hoặc cài đặt và phát triển các [tiện ích mở rộng](https://docs.gopeed.com/dev-extension.html).
+
+Truy cập ✈ [Trang web chính thức](https://gopeed.com) | 📖 [Tài liệu chính thức](https://docs.gopeed.com)
+
+## Tải về
+
+<table>
+    <thead>
+        <tr>
+            <th>Nền tảng</th>
+            <th>Loại gói</th>
+            <th>Liên kết tải xuống</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td rowspan=2>Windows</td>
+            <td><code>Bộ cài đặt EXE</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td><code>ZIP Portable</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td>MacOS</td>
+            <td><code>Bộ cài đặt DMG</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td rowspan=4>Linux</td>
+            <td><code>Flathub</code></td>
+            <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td><code>SNAP</code></td>
+            <td><a href="https://snapcraft.io/gopeed">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td><code>DEB</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td><code>AppImage</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td>Android</td>
+            <td><code>APK</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td>iOS</td>
+            <td><code>IPA</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td>Web</td>
+            <td></td>
+            <td><a href="https://github.com/GopeedLab/gopeed/releases/latest">Liên kết</a></td>
+        </tr>
+        <tr>
+            <td>Docker</td>
+            <td></td>
+            <td><a href="https://hub.docker.com/r/liwei2633/gopeed">Liên kết</a></td>
+        </tr>
+    </tbody>
+</table>
+
+Thêm thông tin về cài đặt, vui lòng tham khảo [Cài đặt](https://docs.gopeed.com/install.html)
+
+### Command tool
+
+Sử dụng `go install`:
+
+```bash
+go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
+```
+
+## Quyên góp
+
+Nếu bạn thích dự án này, xin vui lòng xem xét [quyên góp](https://docs.gopeed.com/donate.html) để hỗ trợ phát triển dự án này, cảm ơn bạn!
+
+## Trưng bày
+
+![](_docs/img/ui-demo.png)
+
+## Development
+
+Dự án này được chia thành hai phần, phần giao diện sử dụng `flutter`, phần backend sử dụng `Golang`, và hai phía giao tiếp thông qua giao thức `http`. Trên hệ thống unix, sử dụng `unix socket`, và trên hệ thống windows, sử dụng giao thức `tcp`.
+
+> Mã giao diện nằm trong thư mục `ui/flutter`.
+
+### Environment
+
+1. Golang 1.21+
+2. Flutter 3.16+
+
+### Clone
+
+```bash
+git clone [email protected]:GopeedLab/gopeed.git
+```
+
+### Đóng góp
+
+Vui lòng tham khảo [CONTRIBUTING_vi-VN.md](/CONTRIBUTING_vi-VN.md)
+
+### Xây dựng
+
+#### Desktop
+
+Trước tiên, bạn cần cấu hình môi trường theo tài liệu chính thức của [Tài liệu trang web máy tính để bàn Flutter](https://docs.flutter.dev/development/platform-integration/desktop), sau đó bạn cần đảm bảo môi trường cgo được thiết lập đúng. Để biết hướng dẫn chi tiết về cách thiết lập môi trường cgo, vui lòng tham khảo các tài liệu tương ứng có sẵn trực tuyến.
+
+command:
+
+- windows
+
+```bash
+go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
+cd ui/flutter
+flutter build windows
+```
+
+- macos
+
+```bash
+go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
+cd ui/flutter
+flutter build macos
+```
+
+- linux
+
+```bash
+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
+```
+
+#### Mobile
+
+Giống như trước đây, bạn cũng cần chuẩn bị môi trường `cgo` và sau đó cài đặt `gomobile`:
+
+```bash
+go install golang.org/x/mobile/cmd/gomobile@latest
+go get golang.org/x/mobile/bind
+gomobile init
+```
+
+command:
+
+- android
+
+```bash
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
+cd ui/flutter
+flutter build apk
+```
+
+- ios
+
+```bash
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
+cd ui/flutter
+flutter build ios --no-codesign
+```
+
+#### Web
+
+command:
+
+```bash
+cd ui/flutter
+flutter build web
+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
+```
+
+## Tín dụng
+
+### Người đóng góp
+
+<a href="https://github.com/GopeedLab/gopeed/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=GopeedLab/gopeed" />
+</a>
+
+### JetBrains
+
+[![goland](_docs/img/goland.svg)](https://www.jetbrains.com/?from=gopeed)
+
+## Giấy phép
+
+[GPLv3](LICENSE)

README_zh-CN.md

@@ -9,29 +9,80 @@
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
 
-[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md)
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
 
 ## 介绍
 
-Gopeed（全称 Go Speed），是一款由`Golang`+`Flutter`开发的高速下载器，支持（HTTP、BitTorrent、Magnet）协议下载，并且支持全平台使用。
+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/)
 
-## 安装
+## 下载
 
-**已支持平台**
+<table>
+    <thead>
+        <tr>
+            <th>运行平台</th>
+            <th>安装包类型</th>
+            <th>下载链接</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td rowspan=2>Windows</td>
+            <td><code>EXE Installer</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>Portable ZIP</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">前往</a></td>
+        </tr>
+        <tr>
+            <td>MacOS</td>
+            <td><code>DMG Installer</code></td>          
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">前往</a></td>
+        </tr>
+        <tr>
+            <td rowspan=4>Linux</td>
+            <td><code>Flathub</code></td>
+            <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>SNAP</code></td>
+            <td><a href="https://snapcraft.io/gopeed">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>DEB</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>AppImage</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">前往</a></td>
+        </tr>
+        <tr>
+            <td>Android</td>
+            <td><code>APK</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">前往</a></td>
+        </tr>
+        <tr>
+            <td>iOS</td>
+            <td><code>IPA</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">前往</a></td>
+        </tr>
+        <tr>
+            <td>Web</td>
+            <td></td>
+            <td><a href="https://github.com/GopeedLab/gopeed/releases/latest">前往</a></td>
+        </tr>
+        <tr>
+            <td>Docker</td>
+            <td></td>
+            <td><a href="https://hub.docker.com/r/liwei2633/gopeed">前往</a></td>
+        </tr>
+    </tbody>
+</table>
 
-- [x] windows
+更多关于安装的内容请参考[安装文档](https://docs.gopeed.com/zh/install.html)
-- [x] macos
-- [x] linux
-- [x] android
-- [x] ios
-- [x] web
-- [x] docker
-
-[前往下载](https://github.com/GopeedLab/gopeed/releases/latest)
-
-> 注：macos 版本运行如果提示损坏，请在终端执行 `xattr -d com.apple.quarantine /Applications/Gopeed.app` 命令
 
 ### 命令行工具
 
@@ -41,23 +92,9 @@ Gopeed（全称 Go Speed），是一款由`Golang`+`Flutter`开发的高速下
 go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ```
 
-### Docker
+## 浏览器扩展
 
-#### 直接运行
+Gopeed 还提供了浏览器扩展用于接管浏览器下载，支持 Chrome、Edge、Firefox 等浏览器，具体请参考：[https://github.com/GopeedLab/browser-extension](https://github.com/GopeedLab/browser-extension)
-
-```bash
-docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads liwei2633/gopeed
-```
-
-#### 使用 Docker Compose
-
-```bash
-docker-compose up -d
-```
-
-#### 访问服务
-
-当 docker 容器运行时，可以通过 `http://localhost:9999` 访问 web 页面。
 
 ## 赞助
 
@@ -75,8 +112,8 @@ docker-compose up -d
 
 ### 环境要求
 
-1. Golang 1.19+
+1. Golang 1.21+
-2. Flutter 3.10+
+2. Flutter 3.16+
 
 ### 克隆项目
 
@@ -135,7 +172,7 @@ gomobile init
 - android
 
 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```
@@ -159,7 +196,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

@@ -0,0 +1,211 @@
+[![Test Status](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
+[![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
+[![Release](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
+[![Download](https://img.shields.io/github/downloads/GopeedLab/gopeed/total.svg)](https://github.com/GopeedLab/gopeed/releases)
+[![Donate](https://img.shields.io/badge/%24-donate-ff69b4.svg)](https://docs.gopeed.com/donate.html)
+[![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)
+
+![](_docs/img/banner.png)
+
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
+
+[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
+
+## 簡介
+
+Gopeed（全稱 Go Speed），是一款使用`Golang`+`Flutter`編寫的高速下載軟體，支援（HTTP、BitTorrent、Magnet）協定，同時支援所有的平台。
+
+前往 ✈ [主頁](https://gopeed.com/zh-CN) | 📖 [文檔](https://docs.gopeed.com/zh/)
+
+## 下載
+
+<table>
+    <thead>
+        <tr>
+            <th>運行平台</th>
+            <th>安裝包類型</th>
+            <th>下載鏈接</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td rowspan=2>Windows</td>
+            <td><code>EXE Installer</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>Portable ZIP</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">前往</a></td>
+        </tr>
+        <tr>
+            <td>MacOS</td>
+            <td><code>DMG Installer</code></td>          
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">前往</a></td>
+        </tr>
+        <tr>
+            <td rowspan=4>Linux</td>
+            <td><code>Flathub</code></td>
+            <td><a href="https://flathub.org/apps/com.gopeed.Gopeed">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>SNAP</code></td>
+            <td><a href="https://snapcraft.io/gopeed">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>DEB</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">前往</a></td>
+        </tr>
+        <tr>
+            <td><code>AppImage</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">前往</a></td>
+        </tr>
+        <tr>
+            <td>Android</td>
+            <td><code>APK</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">前往</a></td>
+        </tr>
+        <tr>
+            <td>iOS</td>
+            <td><code>IPA</code></td>
+            <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">前往</a></td>
+        </tr>
+        <tr>
+            <td>Web</td>
+            <td></td>
+            <td><a href="https://github.com/GopeedLab/gopeed/releases/latest">前往</a></td>
+        </tr>
+        <tr>
+            <td>Docker</td>
+            <td></td>
+            <td><a href="https://hub.docker.com/r/liwei2633/gopeed">前往</a></td>
+        </tr>
+    </tbody>
+</table>
+
+更多關於安裝的內容請參考[安裝文檔](https://docs.gopeed.com/zh/install.html)
+
+### 使用CLI安裝
+
+使用`go install`安裝：
+
+```bash
+go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
+```
+
+## 贊助
+
+如果你認為該項目對你有所幫助，請考慮[贊助](https://docs.gopeed.com/zh/donate)以支持該項目的持續發展，謝謝！
+
+## 軟體介面
+
+![](_docs/img/ui-demo.png)
+
+## 開發
+
+該項目分為前端與後端，前端使用`flutter`編寫，後端使用`Golang`編寫，兩邊通過`http`協定進行通訊，在 unix 系統下，則使用`unix socket`，在 windows 系統下，則使用`tcp`協定。
+
+> 前端代碼位於`ui/flutter`目錄內。
+
+### 開發環境
+
+1. Golang 1.21+
+2. Flutter 3.16+
+
+### 克隆項目
+
+```bash
+git clone [email protected]:GopeedLab/gopeed.git
+```
+
+### 協助開發
+
+請參考[協助指南](CONTRIBUTING_zh-TW.md)
+
+### 編譯
+
+#### 桌面端
+
+首先需要按照[flutter desktop 官方文檔](https://docs.flutter.dev/development/platform-integration/desktop)配置開發環境，並準備好`cgo`環境，具體方法可以自行搜索。
+
+組建指令：
+
+- windows
+
+```bash
+go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
+cd ui/flutter
+flutter build windows
+```
+
+- macos
+
+```bash
+go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
+cd ui/flutter
+flutter build macos
+```
+
+- linux
+
+```bash
+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
+```
+
+#### 移動設備
+
+需要`cgo`環境，並安裝`gomobile`：
+
+```bash
+go install golang.org/x/mobile/cmd/gomobile@latest
+go get golang.org/x/mobile/bind
+gomobile init
+```
+
+組建指令：
+
+- android
+
+```bash
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
+cd ui/flutter
+flutter build apk
+```
+
+- ios
+
+```bash
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
+cd ui/flutter
+flutter build ios --no-codesign
+```
+
+#### 網頁端
+
+組建指令：
+
+```bash
+cd ui/flutter
+flutter build web
+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
+```
+
+## 感謝
+
+### 貢獻者
+
+<a href="https://github.com/GopeedLab/gopeed/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=GopeedLab/gopeed" />
+</a>
+
+### JetBrains
+
+[![goland](_docs/img/goland.svg)](https://www.jetbrains.com/?from=gopeed)
+
+## 軟體許可
+
+該軟體遵循 [GPLv3](LICENSE) 。

cmd/api/main.go

@@ -11,6 +11,7 @@ func main() {
 		Network:   "tcp",
 		Address:   "127.0.0.1:9999",
 		Storage:   model.StorageBolt,
+		WebEnable: true,
 	}
 	cmd.Start(cfg)
 }

cmd/gopeed/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"github.com/GopeedLab/gopeed/internal/fetcher"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/download"
 	"github.com/GopeedLab/gopeed/pkg/protocol/http"
@@ -47,16 +48,31 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
+	printProgress(emptyTask, "downloading...")
 	wg.Wait()
 }
 
 var (
 	lastLineLen = 0
 	sb          = new(strings.Builder)
+	emptyTask   = &download.Task{
+		Progress: &download.Progress{},
+		Meta: &fetcher.FetcherMeta{
+			Res: &base.Resource{},
+		},
+	}
 )
 
 func printProgress(task *download.Task, title string) {
-	rate := float64(task.Progress.Downloaded) / float64(task.Meta.Res.Size)
+	var rate float64
+	if task.Meta.Res == nil {
+		task = emptyTask
+	}
+	if task.Meta.Res.Size <= 0 {
+		rate = 0
+	} else {
+		rate = float64(task.Progress.Downloaded) / float64(task.Meta.Res.Size)
+	}
 	completeWidth := int(progressWidth * rate)
 	speed := util.ByteFmt(task.Progress.Speed)
 	totalSize := util.ByteFmt(task.Meta.Res.Size)

cmd/server.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	_ "embed"
 	"fmt"
+	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/rest"
 	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"net/http"
@@ -24,14 +25,20 @@ func Start(cfg *model.StartConfig) {
 		panic(err)
 	}
 	if downloadCfg.FirstLoad {
-		// Set default download dir to user download dir
+		// Set default download dir, in docker, it will be ${exe}/Downloads, else it will be ${user}/Downloads
+		var downloadDir string
+		if base.InDocker == "true" {
+			downloadDir = filepath.Join(filepath.Dir(cfg.StorageDir), "Downloads")
+		} else {
 			userDir, err := os.UserHomeDir()
 			if err == nil {
-			downloadDir := filepath.Join(userDir, "Downloads")
+				downloadDir = filepath.Join(userDir, "Downloads")
+			}
+		}
+		if downloadDir != "" {
 			downloadCfg.DownloadDir = downloadDir
 			rest.Downloader.PutConfig(downloadCfg)
 		}
-
 	}
 	fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
 	if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {

cmd/web/flags.go

@@ -14,6 +14,7 @@ type args struct {
 	Username   *string `json:"username"`
 	Password   *string `json:"password"`
 	ApiToken   *string `json:"apiToken"`
+	StorageDir *string `json:"storageDir"`
 
 	configPath *string
 }
@@ -23,8 +24,9 @@ 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.StorageDir = flag.String("d", "", "Storage directory")
 	cliArgs.configPath = flag.String("c", "./config.json", "Config file path")
 	flag.Parse()
 
@@ -45,6 +47,9 @@ func parse() *args {
 	if cfgArgs.ApiToken == nil {
 		cfgArgs.ApiToken = cliArgs.ApiToken
 	}
+	if cfgArgs.StorageDir == nil {
+		cfgArgs.StorageDir = cliArgs.StorageDir
+	}
 	return cfgArgs
 }
 

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,22 @@ func main() {
 		}
 	}
 
+	var dir string
+	if args.StorageDir != nil && *args.StorageDir != "" {
+		dir = *args.StorageDir
+	} else {
+		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

entrypoint.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+chown -R ${PUID}:${PGID} /app
+
+umask ${UMASK}
+
+exec su-exec ${PUID}:${PGID} ./gopeed "$@"

go.mod

@@ -1,107 +1,118 @@
 module github.com/GopeedLab/gopeed
 
-go 1.19
+go 1.21
 
 require (
-	github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9
+	github.com/anacrolix/missinggo/v2 v2.7.3
-	github.com/anacrolix/torrent v1.52.5
+	github.com/anacrolix/torrent v1.53.3
-	github.com/dop251/goja v0.0.0-20230828202809-3dbe69dd2b8e
+	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
-	github.com/dop251/goja_nodejs v0.0.0-20230821135201-94e508132562
+	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
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
 	github.com/matoous/go-nanoid/v2 v2.0.0
+	github.com/mattn/go-ieproxy v0.0.12
+	github.com/pkg/errors v0.9.1
+	github.com/rs/zerolog v1.31.0
 	github.com/virtuald/go-paniclog v0.0.0-20190812204905-43a7fa316459
-	go.etcd.io/bbolt v1.3.7-0.20231005155708-db45d0d6b1f6
+	github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad
-	golang.org/x/sync v0.3.0
+	go.etcd.io/bbolt v1.3.8
+	golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
+	golang.org/x/sync v0.6.0
 )
 
 require (
-	crawshaw.io/sqlite v0.3.3-0.20220618202545-d1964889ea3c // indirect
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
-	github.com/RoaringBitmap/roaring v1.2.3 // indirect
+	github.com/RoaringBitmap/roaring v1.7.0 // indirect
 	github.com/acomagu/bufpipe v1.0.4 // indirect
 	github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 // indirect
 	github.com/alecthomas/atomic v0.1.0-alpha2 // indirect
-	github.com/anacrolix/chansync v0.3.0 // indirect
+	github.com/anacrolix/chansync v0.4.0 // indirect
-	github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444 // indirect
+	github.com/anacrolix/dht/v2 v2.21.0 // indirect
-	github.com/anacrolix/envpprof v1.2.1 // indirect
+	github.com/anacrolix/envpprof v1.3.0 // indirect
-	github.com/anacrolix/generics v0.0.0-20230428105757-683593396d68 // indirect
+	github.com/anacrolix/generics v0.0.0-20230911070922-5dd7545c6b13 // indirect
 	github.com/anacrolix/go-libutp v1.3.1 // indirect
-	github.com/anacrolix/log v0.14.0 // indirect
+	github.com/anacrolix/log v0.14.6-0.20231202035202-ed7a02cad0b4 // indirect
 	github.com/anacrolix/missinggo v1.3.0 // indirect
 	github.com/anacrolix/missinggo/perf v1.0.0 // indirect
 	github.com/anacrolix/mmsg v1.0.0 // indirect
-	github.com/anacrolix/multiless v0.3.0 // indirect
+	github.com/anacrolix/multiless v0.3.1-0.20221221005021-2d12701f83f7 // indirect
-	github.com/anacrolix/stm v0.4.0 // indirect
+	github.com/anacrolix/stm v0.5.0 // indirect
-	github.com/anacrolix/sync v0.4.0 // indirect
+	github.com/anacrolix/sync v0.5.1 // indirect
-	github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 // indirect
+	github.com/anacrolix/upnp v0.1.3 // indirect
-	github.com/anacrolix/utp v0.1.0 // indirect
+	github.com/anacrolix/utp v0.2.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
-	github.com/benbjohnson/immutable v0.3.0 // indirect
+	github.com/benbjohnson/immutable v0.4.3 // indirect
-	github.com/bits-and-blooms/bitset v1.2.2 // indirect
+	github.com/bits-and-blooms/bitset v1.13.0 // indirect
 	github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
 	github.com/cloudflare/circl v1.3.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dlclark/regexp2 v1.7.0 // indirect
+	github.com/dlclark/regexp2 v1.10.0 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/edsrzf/mmap-go v1.1.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/felixge/httpsnoop v1.0.1 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.4.1 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-llsqlite/adapter v0.1.0 // indirect
+	github.com/go-llsqlite/crawshaw v0.5.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
+	github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.5.0 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
-	github.com/huandu/xstrings v1.3.2 // indirect
+	github.com/huandu/xstrings v1.4.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/lispad/go-generics-tools v1.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mschoch/smat v0.2.0 // indirect
-	github.com/pion/datachannel v1.5.2 // indirect
+	github.com/pion/datachannel v1.5.5 // indirect
-	github.com/pion/dtls/v2 v2.2.4 // indirect
+	github.com/pion/dtls/v2 v2.2.9 // indirect
-	github.com/pion/ice/v2 v2.2.6 // indirect
+	github.com/pion/ice/v2 v2.3.12 // indirect
-	github.com/pion/interceptor v0.1.11 // indirect
+	github.com/pion/interceptor v0.1.25 // indirect
 	github.com/pion/logging v0.2.2 // indirect
-	github.com/pion/mdns v0.0.5 // indirect
+	github.com/pion/mdns v0.0.9 // indirect
 	github.com/pion/randutil v0.1.0 // indirect
-	github.com/pion/rtcp v1.2.9 // indirect
+	github.com/pion/rtcp v1.2.13 // indirect
-	github.com/pion/rtp v1.7.13 // indirect
+	github.com/pion/rtp v1.8.3 // indirect
-	github.com/pion/sctp v1.8.2 // indirect
+	github.com/pion/sctp v1.8.9 // indirect
-	github.com/pion/sdp/v3 v3.0.5 // indirect
+	github.com/pion/sdp/v3 v3.0.6 // indirect
-	github.com/pion/srtp/v2 v2.0.9 // indirect
+	github.com/pion/srtp/v2 v2.0.18 // indirect
-	github.com/pion/stun v0.3.5 // indirect
+	github.com/pion/stun v0.6.1 // indirect
-	github.com/pion/transport v0.13.1 // indirect
+	github.com/pion/transport/v2 v2.2.4 // indirect
-	github.com/pion/transport/v2 v2.0.0 // indirect
+	github.com/pion/turn/v2 v2.1.4 // indirect
-	github.com/pion/turn/v2 v2.0.8 // indirect
+	github.com/pion/webrtc/v3 v3.2.24 // indirect
-	github.com/pion/udp v0.1.4 // indirect
-	github.com/pion/webrtc/v3 v3.1.42 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/rs/zerolog v1.31.0 // indirect
+	github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/skeema/knownhosts v1.2.0 // indirect
-	github.com/tidwall/btree v1.6.0 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
+	github.com/tidwall/btree v1.7.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	go.opentelemetry.io/otel v1.8.0 // indirect
+	go.opentelemetry.io/otel v1.22.0 // indirect
-	go.opentelemetry.io/otel/trace v1.8.0 // indirect
+	go.opentelemetry.io/otel/metric v1.22.0 // indirect
-	golang.org/x/crypto v0.11.0 // indirect
+	go.opentelemetry.io/otel/trace v1.22.0 // indirect
-	golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d // indirect
+	golang.org/x/crypto v0.23.0 // indirect
-	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
-	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
+	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.6.0 // indirect
+	golang.org/x/tools v0.17.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	modernc.org/libc v1.40.6 // indirect
+	modernc.org/mathutil v1.6.0 // indirect
+	modernc.org/memory v1.7.2 // indirect
+	modernc.org/sqlite v1.28.0 // indirect
+	zombiezen.com/go/sqlite v1.1.0 // indirect
 )

internal/controller/controller.go

@@ -1,12 +1,14 @@
 package controller
 
 import (
+	"github.com/GopeedLab/gopeed/pkg/base"
 	"os"
 	"path/filepath"
 )
 
 type Controller struct {
-	GetConfig func(v any) (bool, error)
+	GetConfig   func(v any) bool
+	ProxyConfig *base.DownloaderProxyConfig
 	FileController
 	//ContextDialer() (proxy.Dialer, error)
 }
@@ -21,8 +23,8 @@ type DefaultFileController struct {
 func NewController() *Controller {
 	return &Controller{
 		FileController: &DefaultFileController{},
-		GetConfig: func(v any) (bool, error) {
+		GetConfig: func(v any) bool {
-			return false, nil
+			return false
 		},
 	}
 }

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.
@@ -57,6 +59,15 @@ func (m *FetcherMeta) SingleFilepath() string {
 	return path.Join(m.Opts.Path, file.Path, fileName)
 }
 
+// RootDirPath return the root dir path of the task file.
+func (m *FetcherMeta) RootDirPath() string {
+	if m.Res.Name != "" {
+		return m.FolderPath()
+	} else {
+		return m.Opts.Path
+	}
+}
+
 // FetcherBuilder defines the interface for a fetcher builder.
 type FetcherBuilder interface {
 	// Schemes returns the schemes supported by the fetcher.

internal/protocol/bt/config.go

@@ -1,5 +1,6 @@
 package bt
 
 type config struct {
+	ListenPort int      `json:"listenPort"`
 	Trackers   []string `json:"trackers"`
 }

internal/protocol/bt/fetcher.go

@@ -2,6 +2,7 @@ package bt
 
 import (
 	"bytes"
+	"fmt"
 	"github.com/GopeedLab/gopeed/internal/controller"
 	"github.com/GopeedLab/gopeed/internal/fetcher"
 	"github.com/GopeedLab/gopeed/pkg/base"
@@ -10,6 +11,7 @@ import (
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/metainfo"
 	"path/filepath"
+	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -24,11 +26,13 @@ var (
 
 type Fetcher struct {
 	ctl    *controller.Controller
+	config *config
 
 	torrent *torrent.Torrent
 	meta    *fetcher.FetcherMeta
 
 	torrentReady atomic.Bool
+	torrentDrop  atomic.Bool
 	create       atomic.Bool
 	progress     fetcher.Progress
 }
@@ -42,6 +46,13 @@ func (f *Fetcher) Setup(ctl *controller.Controller) {
 	if f.meta == nil {
 		f.meta = &fetcher.FetcherMeta{}
 	}
+	exist := f.ctl.GetConfig(&f.config)
+	if !exist {
+		f.config = &config{
+			ListenPort: 0,
+			Trackers:   []string{},
+		}
+	}
 	return
 }
 
@@ -54,7 +65,10 @@ func (f *Fetcher) initClient() (err error) {
 	}
 
 	cfg := torrent.NewDefaultClientConfig()
-	cfg.ListenPort = 0
+	cfg.Bep20 = fmt.Sprintf("-GP%s-", parseBep20())
+	cfg.ExtendedHandshakeClientVersion = fmt.Sprintf("Gopeed %s", base.Version)
+	cfg.ListenPort = f.config.ListenPort
+	cfg.HTTPProxy = f.ctl.ProxyConfig.ToHandler()
 	cfg.DefaultStorage = newFileOpts(newFileClientOpts{
 		ClientBaseDir: cfg.DataDir,
 		HandleFileTorrent: func(infoHash metainfo.Hash, ft *fileTorrentImpl) {
@@ -69,10 +83,6 @@ func (f *Fetcher) initClient() (err error) {
 }
 
 func (f *Fetcher) Resolve(req *base.Request) error {
-	if err := base.ParseReqExtra[bt.ReqExtra](req); err != nil {
-		return err
-	}
-
 	if err := f.addTorrent(req); err != nil {
 		return err
 	}
@@ -87,7 +97,6 @@ func (f *Fetcher) Create(opts *base.Options) (err error) {
 	if f.meta.Res != nil {
 		torrentDirMap[f.meta.Res.Hash] = f.meta.FolderPath()
 	}
-	f.progress = make(fetcher.Progress, len(f.meta.Opts.SelectFiles))
 	return nil
 }
 
@@ -101,6 +110,14 @@ func (f *Fetcher) Start() (err error) {
 		ft.setTorrentDir(f.meta.FolderPath())
 	}
 	files := f.torrent.Files()
+	// If the user does not specify the file to download, all files will be downloaded by default
+	if len(f.meta.Opts.SelectFiles) == 0 {
+		f.meta.Opts.SelectFiles = make([]int, len(files))
+		for i := range files {
+			f.meta.Opts.SelectFiles[i] = i
+		}
+	}
+	f.progress = make(fetcher.Progress, len(f.meta.Opts.SelectFiles))
 	if len(f.meta.Opts.SelectFiles) == len(files) {
 		f.torrent.DownloadAll()
 	} else {
@@ -109,6 +126,7 @@ func (f *Fetcher) Start() (err error) {
 			file.Download()
 		}
 	}
+
 	return
 }
 
@@ -119,6 +137,7 @@ func (f *Fetcher) Pause() (err error) {
 }
 
 func (f *Fetcher) Close() (err error) {
+	f.torrentDrop.Store(false)
 	f.safeDrop()
 	return nil
 }
@@ -134,7 +153,10 @@ func (f *Fetcher) safeDrop() {
 
 func (f *Fetcher) Wait() (err error) {
 	for {
-		if f.torrentReady.Load() {
+		if f.torrentDrop.Load() {
+			break
+		}
+		if f.torrentReady.Load() && len(f.meta.Opts.SelectFiles) > 0 {
 			done := true
 			for _, selectIndex := range f.meta.Opts.SelectFiles {
 				file := f.torrent.Files()[selectIndex]
@@ -154,7 +176,7 @@ func (f *Fetcher) Wait() (err error) {
 						}
 					}
 					if !selected {
-						util.SafeRemove(filepath.Join(f.meta.Opts.Path, file.Path()))
+						util.SafeRemove(filepath.Join(f.meta.Opts.Path, f.meta.Res.Name, file.Path()))
 					}
 				}
 				break
@@ -169,6 +191,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
@@ -188,6 +220,7 @@ func (f *Fetcher) updateRes() {
 		Files: make([]*base.FileInfo, len(f.torrent.Files())),
 		Hash:  f.torrent.InfoHash().String(),
 	}
+	f.torrent.PeerConns()
 	for i, file := range f.torrent.Files() {
 		res.Files[i] = &base.FileInfo{
 			Name: filepath.Base(file.DisplayPath()),
@@ -195,7 +228,7 @@ func (f *Fetcher) updateRes() {
 			Size: file.Length(),
 		}
 	}
-	res.CalcSize()
+	res.CalcSize(nil)
 	f.meta.Res = res
 	if f.meta.Opts != nil {
 		f.meta.Opts.InitSelectFiles(len(res.Files))
@@ -203,6 +236,9 @@ func (f *Fetcher) updateRes() {
 }
 
 func (f *Fetcher) addTorrent(req *base.Request) (err error) {
+	if err = base.ParseReqExtra[bt.ReqExtra](req); err != nil {
+		return
+	}
 	if err = f.initClient(); err != nil {
 		return
 	}
@@ -224,11 +260,6 @@ func (f *Fetcher) addTorrent(req *base.Request) (err error) {
 	if err != nil {
 		return
 	}
-	var cfg config
-	exist, err := f.ctl.GetConfig(&cfg)
-	if err != nil {
-		return
-	}
 
 	// use map to deduplicate
 	trackers := make(map[string]bool)
@@ -240,8 +271,8 @@ func (f *Fetcher) addTorrent(req *base.Request) (err error) {
 			}
 		}
 	}
-	if exist && len(cfg.Trackers) > 0 {
+	if len(f.config.Trackers) > 0 {
-		for _, tracker := range cfg.Trackers {
+		for _, tracker := range f.config.Trackers {
 			trackers[tracker] = true
 		}
 	}
@@ -281,3 +312,12 @@ func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v
 		}
 	}
 }
+
+// parse version to bep20 format, fixed length 4, if not enough, fill 0
+func parseBep20() string {
+	s := strings.ReplaceAll(base.Version, ".", "")
+	if len(s) < 4 {
+		s += strings.Repeat("0", 4-len(s))
+	}
+	return s
+}

internal/protocol/bt/fetcher_test.go

@@ -50,7 +50,22 @@ 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(&base.DownloaderProxyConfig{
+		Enable: true,
+		System: false,
+		Scheme: "socks5",
+		Host:   proxyListener.Addr().String(),
+		Usr:    usr,
+		Pwd:    pwd,
+	}))
 }
 
 func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
@@ -90,7 +105,7 @@ func buildFetcher() fetcher.Fetcher {
 	return fetcher
 }
 
-func buildConfigFetcher() fetcher.Fetcher {
+func buildConfigFetcher(proxyConfig *base.DownloaderProxyConfig) fetcher.Fetcher {
 	fetcher := new(FetcherBuilder).Build()
 	newController := controller.NewController()
 	mockCfg := config{
@@ -98,12 +113,13 @@ func buildConfigFetcher() fetcher.Fetcher {
 			"udp://tracker.birkenwald.de:6969/announce",
 			"udp://tracker.bitsearch.to:1337/announce",
 		}}
-	newController.GetConfig = func(v any) (bool, error) {
+	newController.GetConfig = func(v any) bool {
 		if err := json.Unmarshal([]byte(test.ToJson(mockCfg)), v); err != nil {
-			return false, err
+			return false
 		}
-		return true, nil
+		return true
 	}
+	newController.ProxyConfig = proxyConfig
 	fetcher.Setup(newController)
 	return fetcher
 }

internal/protocol/http/config.go

@@ -1,5 +1,7 @@
 package http
 
 type config struct {
+	UserAgent      string `json:"userAgent"`
 	Connections    int    `json:"connections"`
+	UseServerCtime bool   `json:"useServerCtime"`
 }

internal/protocol/http/fetcher.go

@@ -9,6 +9,7 @@ import (
 	"github.com/GopeedLab/gopeed/internal/fetcher"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	fhttp "github.com/GopeedLab/gopeed/pkg/protocol/http"
+	"github.com/xiaoqidun/setft"
 	"golang.org/x/sync/errgroup"
 	"io"
 	"mime"
@@ -18,6 +19,8 @@ import (
 	"os"
 	"path"
 	"strconv"
+	"strings"
+	"time"
 )
 
 type RequestError struct {
@@ -37,6 +40,8 @@ type chunk struct {
 	Begin      int64
 	End        int64
 	Downloaded int64
+
+	retryTimes int
 }
 
 func newChunk(begin int64, end int64) *chunk {
@@ -48,6 +53,7 @@ func newChunk(begin int64, end int64) *chunk {
 
 type Fetcher struct {
 	ctl    *controller.Controller
+	config *config
 	doneCh chan error
 
 	meta   *fetcher.FetcherMeta
@@ -68,6 +74,13 @@ func (f *Fetcher) Setup(ctl *controller.Controller) {
 	if f.meta == nil {
 		f.meta = &fetcher.FetcherMeta{}
 	}
+	exist := f.ctl.GetConfig(&f.config)
+	if !exist {
+		f.config = &config{
+			UserAgent:   "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
+			Connections: 1,
+		}
+	}
 	return
 }
 
@@ -75,11 +88,11 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 	if err := base.ParseReqExtra[fhttp.ReqExtra](req); err != nil {
 		return err
 	}
-	httpReq, err := buildRequest(nil, req)
+	httpReq, err := f.buildRequest(nil, req)
 	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))
@@ -93,8 +106,9 @@ 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))
@@ -118,8 +132,17 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 	} else {
 		return NewRequestError(httpResp.StatusCode, httpResp.Status)
 	}
+	// Parse last modified time
+	var lastModifiedTime *time.Time
+	lastModified := httpResp.Header.Get(base.HttpHeaderLastModified)
+	if lastModified != "" {
+		// ignore parse error
+		t, _ := time.Parse(time.RFC1123, lastModified)
+		lastModifiedTime = &t
+	}
 	file := &base.FileInfo{
 		Size:  res.Size,
+		Ctime: lastModifiedTime,
 	}
 	contentDisposition := httpResp.Header.Get(base.HttpHeaderContentDisposition)
 	if contentDisposition != "" {
@@ -157,16 +180,7 @@ func (f *Fetcher) Create(opts *base.Options) error {
 	}
 	extra := opts.Extra.(*fhttp.OptsExtra)
 	if extra.Connections == 0 {
-		var cfg config
+		extra.Connections = f.config.Connections
-		exist, err := f.ctl.GetConfig(&cfg)
-		if err != nil {
-			return err
-		}
-		if exist {
-			extra.Connections = cfg.Connections
-		} else {
-			extra.Connections = 1
-		}
 	}
 	return nil
 }
@@ -215,6 +229,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 {
@@ -249,31 +268,55 @@ func (f *Fetcher) fetch() {
 			return
 		}
 		f.file.Close()
+		// Update file last modified time
+		if f.config.UseServerCtime && f.meta.Res.Files[0].Ctime != nil {
+			setft.SetFileTime(f.file.Name(), time.Now(), *f.meta.Res.Files[0].Ctime, *f.meta.Res.Files[0].Ctime)
+		}
 		f.doneCh <- err
 	}()
 }
 
 func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
 	chunk := f.chunks[index]
+	chunk.retryTimes = 0
 
-	httpReq, err := buildRequest(ctx, f.meta.Req)
-	if err != nil {
-		return err
-	}
 	var (
-		client = buildClient()
+		client     = f.buildClient()
 		buf        = make([]byte, 8192)
+		maxRetries = 3
 	)
-	// 重试5次
+	// retry until all remain chunks failed
-	for i := 0; i < 5; i++ {
+	for {
 		// if chunk is completed, return
 		if f.meta.Res.Range && chunk.Downloaded >= chunk.End-chunk.Begin+1 {
 			return
 		}
+
+		if chunk.retryTimes >= maxRetries {
+			if !f.meta.Res.Range {
+				return
+			}
+			// check if all failed
+			allFailed := true
+			for _, c := range f.chunks {
+				if chunk.Downloaded < chunk.End-chunk.Begin+1 && c.retryTimes < maxRetries {
+					allFailed = false
+					break
+				}
+			}
+			if allFailed {
+				return
+			}
+		}
+
 		var (
+			httpReq *http.Request
 			resp    *http.Response
-			retry bool
 		)
+		httpReq, err = f.buildRequest(ctx, f.meta.Req)
+		if err != nil {
+			return
+		}
 		if f.meta.Res.Range {
 			httpReq.Header.Set(base.HttpHeaderRange,
 				fmt.Sprintf(base.HttpHeaderRangeFormat, chunk.Begin+chunk.Downloaded, chunk.End))
@@ -285,46 +328,100 @@ 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
+			// Http request success, reset retry times
-		}()
+			chunk.retryTimes = 0
-		if err != nil {
-			// retry request
-			continue
-		}
-		// 请求成功就重置错误次数，连续失败5次才终止
-		i = 0
-		retry, err = func() (bool, error) {
-			defer resp.Body.Close()
 			for {
 				n, err := resp.Body.Read(buf)
 				if n > 0 {
 					_, err := f.file.WriteAt(buf[:n], chunk.Begin+chunk.Downloaded)
 					if err != nil {
-						return false, err
+						return err
 					}
 					chunk.Downloaded += int64(n)
 				}
 				if err != nil {
-					if err != io.EOF {
+					if err == io.EOF {
-						return true, err
+						return nil
 					}
-					break
+					return err
 				}
 			}
-			return false, nil
+			return nil
 		}()
-		if !retry {
+		if err != nil {
-			// 下载成功，跳出重试
+			// If canceled, do not retry
-			break
+			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 {
+				if c != chunk && c.retryTimes > 0 {
+					c.retryTimes = 0
+				}
+			}
+		}
+		break
 	}
 	return
 }
 
+func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq *http.Request, err error) {
+	url, err := url.Parse(req.URL)
+	if err != nil {
+		return
+	}
+
+	var (
+		method string
+		body   io.Reader
+	)
+	headers := make(map[string][]string)
+	if req.Extra == nil {
+		method = http.MethodGet
+	} else {
+		extra := req.Extra.(*fhttp.ReqExtra)
+		if extra.Method != "" {
+			method = extra.Method
+		} else {
+			method = http.MethodGet
+		}
+		if len(extra.Header) > 0 {
+			for k, v := range extra.Header {
+				headers[k] = []string{v}
+			}
+		}
+		if extra.Body != "" {
+			body = bytes.NewBufferString(extra.Body)
+		}
+	}
+	if _, ok := headers[base.HttpHeaderUserAgent]; !ok {
+		// load user agent from config
+		headers[base.HttpHeaderUserAgent] = []string{f.config.UserAgent}
+	}
+
+	if ctx != nil {
+		httpReq, err = http.NewRequestWithContext(ctx, method, url.String(), body)
+	} else {
+		httpReq, err = http.NewRequest(method, url.String(), body)
+	}
+	if err != nil {
+		return
+	}
+	httpReq.Header = headers
+	return httpReq, nil
+}
+
 func (f *Fetcher) splitChunk() (chunks []*chunk) {
 	if f.meta.Res.Range {
 		connections := f.meta.Opts.Extra.(*fhttp.OptsExtra).Connections
@@ -353,59 +450,18 @@ func (f *Fetcher) splitChunk() (chunks []*chunk) {
 	return
 }
 
-func buildClient() *http.Client {
+func (f *Fetcher) buildClient() *http.Client {
+	transport := &http.Transport{
+		Proxy: f.ctl.ProxyConfig.ToHandler(),
+	}
 	// Cookie handle
 	jar, _ := cookiejar.New(nil)
 	return &http.Client{
+		Transport: transport,
 		Jar:       jar,
 	}
 }
 
-func buildRequest(ctx context.Context, req *base.Request) (httpReq *http.Request, err error) {
-	url, err := url.Parse(req.URL)
-	if err != nil {
-		return
-	}
-
-	var (
-		method string
-		body   io.Reader
-	)
-	headers := make(map[string][]string)
-	if req.Extra == nil {
-		method = http.MethodGet
-	} else {
-		extra := req.Extra.(*fhttp.ReqExtra)
-		if extra.Method != "" {
-			method = extra.Method
-		} else {
-			method = http.MethodGet
-		}
-		if len(extra.Header) > 0 {
-			for k, v := range extra.Header {
-				headers[k] = []string{v}
-			}
-		}
-		if extra.Body != "" {
-			body = bytes.NewBufferString(extra.Body)
-		}
-	}
-	if _, ok := headers[base.HttpHeaderUserAgent]; !ok {
-		headers[base.HttpHeaderUserAgent] = []string{base.AgentName}
-	}
-
-	if ctx != nil {
-		httpReq, err = http.NewRequestWithContext(ctx, method, url.String(), body)
-	} else {
-		httpReq, err = http.NewRequest(method, url.String(), body)
-	}
-	if err != nil {
-		return
-	}
-	httpReq.Header = headers
-	return httpReq, nil
-}
-
 type fetcherData struct {
 	Chunks []*chunk
 }
@@ -438,9 +494,7 @@ func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v
 		fetcher.meta = meta
 		base.ParseReqExtra[fhttp.ReqExtra](fetcher.meta.Req)
 		base.ParseOptsExtra[fhttp.OptsExtra](fetcher.meta.Opts)
-		if len(fd.Chunks) == 0 {
+		if len(fd.Chunks) > 0 {
-			fetcher.chunks = fetcher.splitChunk()
-		} else {
 			fetcher.chunks = fd.Chunks
 		}
 		return fetcher

internal/protocol/http/fetcher_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/http"
 	"net"
-	"reflect"
 	"testing"
 	"time"
 )
@@ -68,7 +67,7 @@ func testResolve(startTestServer func() net.Listener, path string, want *base.Re
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !reflect.DeepEqual(want, fetcher.meta.Res) {
+	if !test.AssertResourceEqual(want, fetcher.meta.Res) {
 		t.Errorf("Resolve() got = %v, want %v", fetcher.meta.Res, want)
 	}
 }
@@ -76,7 +75,7 @@ func testResolve(startTestServer func() net.Listener, path string, want *base.Re
 func TestFetcher_DownloadNormal(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()
-	// 正常下载
+
 	downloadNormal(listener, 1, t)
 	downloadNormal(listener, 5, t)
 	downloadNormal(listener, 8, t)
@@ -86,7 +85,7 @@ func TestFetcher_DownloadNormal(t *testing.T) {
 func TestFetcher_DownloadContinue(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()
-	// 暂停继续
+
 	downloadContinue(listener, 1, t)
 	downloadContinue(listener, 5, t)
 	downloadContinue(listener, 8, t)
@@ -96,7 +95,7 @@ func TestFetcher_DownloadContinue(t *testing.T) {
 func TestFetcher_DownloadChunked(t *testing.T) {
 	listener := test.StartTestCustomServer()
 	defer listener.Close()
-	// chunked编码下载
+
 	downloadNormal(listener, 1, t)
 	downloadNormal(listener, 2, t)
 }
@@ -104,24 +103,33 @@ func TestFetcher_DownloadChunked(t *testing.T) {
 func TestFetcher_DownloadPost(t *testing.T) {
 	listener := test.StartTestPostServer()
 	defer listener.Close()
-	// post下载
+
 	downloadPost(listener, 1, t)
 }
 
 func TestFetcher_DownloadRetry(t *testing.T) {
 	listener := test.StartTestRetryServer()
 	defer listener.Close()
-	// chunked编码下载
+
 	downloadNormal(listener, 1, t)
 }
 
 func TestFetcher_DownloadError(t *testing.T) {
 	listener := test.StartTestErrorServer()
 	defer listener.Close()
-	// chunked编码下载
+
 	downloadError(listener, 1, t)
 }
 
+func TestFetcher_DownloadLimit(t *testing.T) {
+	listener := test.StartTestLimitServer(4, 0)
+	defer listener.Close()
+
+	downloadNormal(listener, 1, t)
+	downloadNormal(listener, 2, t)
+	downloadNormal(listener, 8, t)
+}
+
 func TestFetcher_DownloadResume(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()
@@ -132,10 +140,43 @@ func TestFetcher_DownloadResume(t *testing.T) {
 	downloadResume(listener, 16, t)
 }
 
-func TestFetcher_Config(t *testing.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_ConfigConnections(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()
-	fetcher := doDownloadReady(buildConfigFetcher(), listener, 0, t)
+	fetcher := doDownloadReady(buildConfigFetcher(config{
+		Connections: 16,
+	}), listener, 0, t)
+	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 TestFetcher_ConfigUseServerCtime(t *testing.T) {
+	listener := test.StartTestFileServer()
+	defer listener.Close()
+	fetcher := doDownloadReady(buildConfigFetcher(config{
+		Connections:    16,
+		UseServerCtime: true,
+	}), listener, 0, t)
 	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)
@@ -293,23 +334,44 @@ 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.ProxyConfig = &base.DownloaderProxyConfig{
+		Enable: true,
+		Scheme: "socks5",
+		Host:   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())
 	return fetcher.(*Fetcher)
 }
 
-func buildConfigFetcher() fetcher.Fetcher {
+func buildConfigFetcher(cfg config) fetcher.Fetcher {
 	fetcher := new(FetcherBuilder).Build()
 	newController := controller.NewController()
-	mockCfg := config{
+	newController.GetConfig = func(v any) bool {
-		Connections: 16,
+		if err := json.Unmarshal([]byte(test.ToJson(cfg)), v); err != nil {
+			return false
 		}
-	newController.GetConfig = func(v any) (bool, error) {
+		return true
-		if err := json.Unmarshal([]byte(test.ToJson(mockCfg)), v); err != nil {
-			return false, err
-		}
-		return true, nil
 	}
 	fetcher.Setup(newController)
 	return fetcher

internal/test/httptest.go

@@ -4,11 +4,17 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	"github.com/armon/go-socks5"
 	"io"
 	"math/rand"
 	"net"
 	"net/http"
 	"os"
+	"reflect"
+	"strconv"
+	"strings"
+	"sync/atomic"
 	"time"
 )
 
@@ -18,6 +24,11 @@ const (
 	Dir       = "./"
 	BuildFile = Dir + BuildName
 
+	ExternalDownloadUrl  = "https://raw.githubusercontent.com/GopeedLab/gopeed/v1.5.6/_docs/img/banner.png"
+	ExternalDownloadName = "banner.png"
+	ExternalDownloadSize = 26416
+	//ExternalDownloadMd5 = "c67c6e3cae79a95342485676571e8a5c"
+
 	DownloadName       = "download.data"
 	DownloadRename     = "download (1).data"
 	DownloadFile       = Dir + DownloadName
@@ -81,7 +92,7 @@ func StartTestRetryServer() net.Listener {
 		mux := http.NewServeMux()
 		mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
 			counter++
-			if counter != 1 && counter < 5 {
+			if counter != 1 && counter < 2 {
 				writer.WriteHeader(500)
 				return
 			}
@@ -134,6 +145,123 @@ func StartTestErrorServer() net.Listener {
 	})
 }
 
+// StartTestLimitServer connections limit server
+func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
+	var connections atomic.Int32
+
+	return startTestServer(func() http.Handler {
+		mux := http.NewServeMux()
+		mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
+			defer func() {
+				connections.Add(-1)
+			}()
+			connections.Add(1)
+			if maxConnections != 0 && connections.Load() > maxConnections {
+				writer.WriteHeader(403)
+				return
+			}
+
+			r := request.Header.Get("Range")
+			if r == "" {
+				writer.Header().Set("Content-Length", fmt.Sprintf("%d", BuildSize))
+				writer.WriteHeader(200)
+				file, err := os.Open(BuildFile)
+				if err != nil {
+					panic(err)
+				}
+				defer file.Close()
+				slowCopy(writer, file, delay)
+			} else {
+				// split range
+				s := strings.Split(r, "=")
+				if len(s) != 2 {
+					writer.WriteHeader(400)
+					return
+				}
+				s = strings.Split(s[1], "-")
+				if len(s) != 2 {
+					writer.WriteHeader(400)
+					return
+				}
+				start, err := strconv.ParseInt(s[0], 10, 64)
+				if err != nil {
+					writer.WriteHeader(400)
+					return
+				}
+				end, err := strconv.ParseInt(s[1], 10, 64)
+				if err != nil {
+					writer.WriteHeader(400)
+					return
+				}
+				if start < 0 || end < 0 || start > end {
+					writer.WriteHeader(400)
+					return
+				}
+				if end >= BuildSize {
+					end = BuildSize - 1
+				}
+				writer.Header().Set("Content-Length", fmt.Sprintf("%d", end-start+1))
+				writer.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", start, end, BuildSize))
+				writer.Header().Set("Accept-Ranges", "bytes")
+				writer.WriteHeader(206)
+				file, err := os.Open(BuildFile)
+				if err != nil {
+					writer.WriteHeader(500)
+					return
+				}
+				defer file.Close()
+				file.Seek(start, 0)
+				slowCopyN(writer, file, end-start+1, delay)
+			}
+		})
+		return mux
+	})
+}
+
+// slowCopyN copies n bytes from src to dst, speed limit is bytes per second
+func slowCopy(dst io.Writer, src io.Reader, delay int64) (written int64, err error) {
+	buf := make([]byte, 32*1024)
+	for {
+		nr, er := src.Read(buf)
+		if nr > 0 {
+			nw, ew := dst.Write(buf[0:nr])
+			if nw > 0 {
+				written += int64(nw)
+			}
+			if ew != nil {
+				err = ew
+				break
+			}
+			if nr != nw {
+				err = io.ErrShortWrite
+				break
+			}
+		}
+		if er != nil {
+			if er != io.EOF {
+				err = er
+			}
+			break
+		}
+		if delay > 0 {
+			time.Sleep(time.Millisecond * time.Duration(delay))
+		}
+	}
+	return written, err
+}
+
+func slowCopyN(dst io.Writer, src io.Reader, n int64, delay int64) (written int64, err error) {
+	written, err = slowCopy(dst, io.LimitReader(src, n), delay)
+	if written == n {
+		return n, nil
+	}
+	if written < n && err == nil {
+		// src stopped early; must have been EOF.
+		err = io.EOF
+	}
+	return
+}
+
 func startTestServer(serverHandle func() http.Handler) net.Listener {
 	listener, err := net.Listen("tcp", "127.0.0.1:0")
 	if err != nil {
@@ -195,3 +323,32 @@ 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
+}
+
+func AssertResourceEqual(want, got *base.Resource) bool {
+	// Ignore ctime
+	if got != nil && len(got.Files) > 0 {
+		got.Files[0].Ctime = nil
+	}
+	return reflect.DeepEqual(want, got)
+}

pkg/base/constants.go

@@ -16,14 +16,13 @@ const (
 	HttpCodePartialContent = 206
 
 	HttpHeaderRange              = "Range"
+	HttpHeaderAcceptRanges       = "Accept-Ranges"
 	HttpHeaderContentLength      = "Content-Length"
 	HttpHeaderContentRange       = "Content-Range"
 	HttpHeaderContentDisposition = "Content-Disposition"
 	HttpHeaderUserAgent          = "User-Agent"
+	HttpHeaderLastModified       = "Last-Modified"
 
+	HttpHeaderBytes       = "bytes"
 	HttpHeaderRangeFormat = "bytes=%d-%d"
 )
-
-const (
-	AgentName = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
-)

pkg/base/info.go

@@ -0,0 +1,11 @@
+package base
+
+// Version is the build version, set at build time, using `go build -ldflags "-X github.com/GopeedLab/gopeed/pkg/base.Version=1.0.0"`.
+var Version string
+var InDocker string
+
+func init() {
+	if Version == "" {
+		Version = "dev"
+	}
+}

pkg/base/model.go

@@ -3,12 +3,26 @@ package base
 import (
 	"fmt"
 	"github.com/GopeedLab/gopeed/pkg/util"
+	"github.com/mattn/go-ieproxy"
+	"golang.org/x/exp/slices"
+	"net/http"
+	"net/url"
+	"time"
 )
 
 // Request download request
 type Request struct {
 	URL   string `json:"url"`
 	Extra any    `json:"extra"`
+	// Labels is used to mark the download task
+	Labels map[string]string `json:"labels"`
+}
+
+func (r *Request) Validate() error {
+	if r.URL == "" {
+		return fmt.Errorf("invalid request url")
+	}
+	return nil
 }
 
 // Resource download resource
@@ -36,14 +50,15 @@ func (r *Resource) Validate() error {
 		}
 	}
 	return nil
-
 }
 
-func (r *Resource) CalcSize() {
+func (r *Resource) CalcSize(selectFiles []int) {
 	var size int64
-	for _, file := range r.Files {
+	for i, file := range r.Files {
+		if len(selectFiles) == 0 || slices.Contains(selectFiles, i) {
 			size += file.Size
 		}
+	}
 	r.Size = size
 }
 
@@ -51,6 +66,7 @@ type FileInfo struct {
 	Name  string     `json:"name"`
 	Path  string     `json:"path"`
 	Size  int64      `json:"size"`
+	Ctime *time.Time `json:"ctime"`
 
 	Req *Request `json:"req"`
 }
@@ -115,3 +131,88 @@ func ParseOptsExtra[E any](opts *Options) error {
 	opts.Extra = &t
 	return nil
 }
+
+// DownloaderStoreConfig is the config that can restore the downloader.
+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"`
+	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
+}
+
+type DownloaderProxyConfig struct {
+	Enable bool `json:"enable"`
+	// System is the flag that use system proxy
+	System bool   `json:"system"`
+	Scheme string `json:"scheme"`
+	Host   string `json:"host"`
+	Usr    string `json:"usr"`
+	Pwd    string `json:"pwd"`
+}
+
+func (cfg *DownloaderProxyConfig) ToHandler() func(r *http.Request) (*url.URL, error) {
+	if cfg == nil || cfg.Enable == false {
+		return nil
+	}
+	if cfg.System {
+		ieproxy.ReloadConf()
+		return ieproxy.GetProxyFunc()
+	}
+	if cfg.Scheme == "" || cfg.Host == "" {
+		return nil
+	}
+	return http.ProxyURL(util.BuildProxyUrl(cfg.Scheme, cfg.Host, cfg.Usr, cfg.Pwd))
+}
+
+// ToUrl returns the proxy url, just for git clone
+func (cfg *DownloaderProxyConfig) ToUrl() *url.URL {
+	if cfg == nil || cfg.Enable == false {
+		return nil
+	}
+	if cfg.System {
+		ieproxy.ReloadConf()
+		static := ieproxy.GetConf().Static
+		if static.Active && len(static.Protocols) > 0 {
+			// If only one protocol, use it
+			if len(static.Protocols) == 1 {
+				for _, v := range static.Protocols {
+					return parseUrlSafe(v)
+				}
+			}
+			// Check https
+			if v, ok := static.Protocols["https"]; ok {
+				return parseUrlSafe(v)
+			}
+			// Check http
+			if v, ok := static.Protocols["http"]; ok {
+				return parseUrlSafe(v)
+			}
+		}
+		return nil
+	}
+	if cfg.Scheme == "" || cfg.Host == "" {
+		return nil
+	}
+	return util.BuildProxyUrl(cfg.Scheme, cfg.Host, cfg.Usr, cfg.Pwd)
+}
+
+func parseUrlSafe(rawUrl string) *url.URL {
+	u, err := url.Parse(rawUrl)
+	if err != nil {
+		return nil
+	}
+	return u
+}

pkg/download/downloader_test.go

@@ -4,7 +4,7 @@ import (
 	"github.com/GopeedLab/gopeed/internal/test"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/http"
-	"reflect"
+	"os"
 	"sync"
 	"testing"
 	"time"
@@ -37,7 +37,7 @@ func TestDownloader_Resolve(t *testing.T) {
 			},
 		},
 	}
-	if !reflect.DeepEqual(want, rr.Res) {
+	if !test.AssertResourceEqual(want, rr.Res) {
 		t.Errorf("Resolve() got = %v, want %v", rr.Res, want)
 	}
 }
@@ -84,6 +84,142 @@ func TestDownloader_Create(t *testing.T) {
 	}
 }
 
+func TestDownloader_CreateDirectBatch(t *testing.T) {
+	listener := test.StartTestFileServer()
+	defer listener.Close()
+
+	downloader := NewDownloader(nil)
+	if err := downloader.Setup(); err != nil {
+		t.Fatal(err)
+	}
+	defer downloader.Clear()
+
+	reqs := make([]*base.Request, 0)
+	for i := 0; i < 6; i++ {
+		req := &base.Request{
+			URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
+		}
+		reqs = append(reqs, req)
+	}
+
+	_, err := downloader.CreateDirectBatch(reqs, &base.Options{
+		Path: test.Dir,
+		Name: test.DownloadName,
+		Extra: http.OptsExtra{
+			Connections: 4,
+		},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	tasks := downloader.GetTasks()
+	if len(tasks) != len(reqs) {
+		t.Errorf("CreateDirectBatch() got = %v, want %v", len(tasks), len(reqs))
+	}
+}
+
+func TestDownloader_CreateWithProxy(t *testing.T) {
+	// No proxy
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+		return nil
+	}, nil)
+	// Disable proxy
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+		proxyCfg.Enable = false
+		return proxyCfg
+	}, nil)
+	// Enable system proxy but not set proxy environment variable
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+		proxyCfg.System = true
+		return proxyCfg
+	}, nil)
+	// Enable proxy but error proxy environment variable
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+		os.Setenv("HTTP_PROXY", "http://127.0.0.1:1234")
+		os.Setenv("HTTPS_PROXY", "http://127.0.0.1:1234")
+		proxyCfg.System = true
+		return proxyCfg
+	}, func(err error) {
+		if err == nil {
+			t.Fatal("doTestDownloaderCreateWithProxy() got = nil, want error")
+		}
+	})
+	// Enable system proxy and set proxy environment variable
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+		os.Setenv("HTTP_PROXY", proxyCfg.ToUrl().String())
+		os.Setenv("HTTPS_PROXY", proxyCfg.ToUrl().String())
+		proxyCfg.System = true
+		return proxyCfg
+	}, nil)
+	// Invalid proxy scheme
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+		proxyCfg.Scheme = ""
+		return proxyCfg
+	}, nil)
+	// Invalid proxy host
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+		proxyCfg.Host = ""
+		return proxyCfg
+	}, nil)
+	// Use proxy without auth
+	doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+		return proxyCfg
+	}, nil)
+	// Use proxy with auth
+	doTestDownloaderCreateWithProxy(t, true, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
+		return proxyCfg
+	}, nil)
+}
+
+func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildProxyConfig func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig, errHandler func(err error)) {
+	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(&base.DownloaderProxyConfig{
+		Enable: true,
+		Scheme: "socks5",
+		Host:   proxyListener.Addr().String(),
+		Usr:    usr,
+		Pwd:    pwd,
+	})
+
+	req := &base.Request{
+		URL: test.ExternalDownloadUrl,
+	}
+	rr, err := downloader.Resolve(req)
+	if err != nil {
+		if errHandler == nil {
+			t.Fatal(err)
+		}
+		errHandler(err)
+		return
+	}
+	want := &base.Resource{
+		Size:  test.ExternalDownloadSize,
+		Range: true,
+		Files: []*base.FileInfo{
+			{
+				Name: test.ExternalDownloadName,
+				Path: "",
+				Size: test.ExternalDownloadSize,
+			},
+		},
+	}
+	if !test.AssertResourceEqual(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()
@@ -205,15 +341,12 @@ func TestDownloader_Protocol_Config(t *testing.T) {
 	defer downloader.Clear()
 
 	var httpCfg map[string]any
-	exits, err := downloader.getProtocolConfig("http", &httpCfg)
+	exits := downloader.getProtocolConfig("http", &httpCfg)
-	if err != nil {
-		t.Fatal(err)
-	}
 	if exits {
 		t.Errorf("getProtocolConfig() got = %v, want %v", exits, false)
 	}
 
-	storeCfg := &DownloaderStoreConfig{
+	storeCfg := &base.DownloaderStoreConfig{
 		DownloadDir: "./downloads",
 		ProtocolConfig: map[string]any{
 			"http": map[string]any{
@@ -234,7 +367,7 @@ func TestDownloader_Protocol_Config(t *testing.T) {
 		},
 	}
 
-	if err = downloader.PutConfig(storeCfg); err != nil {
+	if err := downloader.PutConfig(storeCfg); err != nil {
 		t.Fatal(err)
 	}
 

pkg/download/engine/engine.go

@@ -3,14 +3,16 @@ package engine
 import (
 	_ "embed"
 	"errors"
-	"fmt"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	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/process"
+	gojaurl "github.com/dop251/goja_nodejs/url"
-	"github.com/dop251/goja_nodejs/url"
+	"time"
 )
 
 //go:embed polyfill/out/index.js
@@ -27,12 +29,16 @@ type Engine struct {
 func (e *Engine) RunString(script string) (value any, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = fmt.Errorf("%v", r)
+			err = r.(error)
 		}
 	}()
+
 	var result goja.Value
 	e.loop.Run(func(runtime *goja.Runtime) {
 		result, err = runtime.RunString(script)
+		if err == nil {
+			go e.await(result)
+		}
 	})
 	if err != nil {
 		return
@@ -45,9 +51,10 @@ func (e *Engine) RunString(script string) (value any, err error) {
 func (e *Engine) CallFunction(fn goja.Callable, args ...any) (value any, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = fmt.Errorf("%v", r)
+			err = r.(error)
 		}
 	}()
+
 	var result goja.Value
 	e.loop.Run(func(runtime *goja.Runtime) {
 		if args == nil {
@@ -59,18 +66,57 @@ func (e *Engine) CallFunction(fn goja.Callable, args ...any) (value any, err err
 			}
 			result, err = fn(nil, jsArgs...)
 		}
+		if err == nil {
+			go e.await(result)
+		}
 	})
 	if err != nil {
-		return nil, err
+		return
 	}
 	return resolveResult(result)
 }
 
+// loop.Run will hang if the script result has a non-stop code, such as setInterval.
+// This method will stop the event loop when the promise result is resolved.
+func (e *Engine) await(value any) {
+	if value == nil {
+		return
+	}
+
+	if v, ok := value.(goja.Value); ok {
+		// if result is promise, wait for it to be resolved
+		if p, ok := v.Export().(*goja.Promise); ok {
+			if p.State() != goja.PromiseStatePending {
+				return
+			}
+
+			// check promise state every 100 milliseconds, until it is resolved
+			for {
+				time.Sleep(time.Millisecond * 100)
+				if p.State() == goja.PromiseStatePending {
+					continue
+				}
+				break
+			}
+
+			// stop the event loop
+			e.loop.StopNoWait()
+		}
+	}
+}
+
 func (e *Engine) Close() {
 	e.loop.Stop()
 }
 
-func NewEngine() *Engine {
+type Config struct {
+	ProxyConfig *base.DownloaderProxyConfig
+}
+
+func NewEngine(cfg *Config) *Engine {
+	if cfg == nil {
+		cfg = &Config{}
+	}
 	loop := eventloop.NewEventLoop()
 	engine := &Engine{
 		loop: loop,
@@ -78,15 +124,18 @@ func NewEngine() *Engine {
 	loop.Run(func(runtime *goja.Runtime) {
 		engine.Runtime = runtime
 		runtime.SetFieldNameMapper(goja.TagFieldNameMapper("json", true))
-		url.Enable(runtime)
+		vm.Enable(runtime)
-		process.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.ProxyConfig.ToHandler()); err != nil {
 			return
 		}
 		if _, err := runtime.RunString(polyfillScript); err != nil {
@@ -96,13 +145,21 @@ func NewEngine() *Engine {
 		if err := runtime.Set("global", runtime.GlobalObject()); err != nil {
 			return
 		}
+		// polyfill window
+		if err := runtime.Set("window", runtime.GlobalObject()); err != nil {
+			return
+		}
+		// polyfill window.location
+		if _, err := runtime.RunString("global.location = new URL('http://localhost');"); err != nil {
+			return
+		}
 		return
 	})
 	return engine
 }
 
 func Run(script string) (value any, err error) {
-	engine := NewEngine()
+	engine := NewEngine(nil)
 	return engine.RunString(script)
 }
 
@@ -118,8 +175,12 @@ func resolveResult(value goja.Value) (any, error) {
 		case goja.PromiseStateFulfilled:
 			return p.Result().Export(), nil
 		case goja.PromiseStateRejected:
+			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"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	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/dop251/goja"
 	"io"
 	"net"
@@ -19,16 +22,28 @@ import (
 )
 
 func TestPolyfill(t *testing.T) {
+	doTestPolyfill(t, "MessageError")
 	doTestPolyfill(t, "XMLHttpRequest")
 	doTestPolyfill(t, "Blob")
 	doTestPolyfill(t, "FormData")
 	doTestPolyfill(t, "fetch")
+	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)
 	}
@@ -65,6 +80,30 @@ async function testFormData(file){
 	return await resp.json();
 }
 
+function testHeader(){
+	return new Promise((resolve, reject) => {
+		const xhr = new XMLHttpRequest();
+		xhr.open('GET', host+'/header');
+		xhr.setRequestHeader('X-Gopeed-Test', 'test1');
+		xhr.setRequestHeader('x-gopeed-test', 'test2');
+		xhr.setRequestHeader('x-Gopeed-test', 'test3');
+		xhr.onload = function(){
+			const testHeader1 = xhr.getResponseHeader("X-Gopeed-Test");
+		    const testHeader2 = xhr.getResponseHeader("x-gopeed-test");
+		    const testHeader3 = xhr.getResponseHeader("x-Gopeed-test");
+			const expect = 'test1, test2, test3';
+			const all = xhr.getAllResponseHeaders();
+			if(testHeader1 === expect && testHeader2 === expect && testHeader3 === expect 
+				&& all.includes('X-Gopeed-Test: '+expect)){
+				resolve();
+			}else{
+				reject();
+			}
+		};
+		xhr.send();
+	});
+}
+
 function testProgress(){
 	return new Promise((resolve, reject) => {
 		const xhr = new XMLHttpRequest();
@@ -175,14 +214,19 @@ function testTimeout(){
 		}
 	}()
 
+	_, err = callTestFun(engine, "testHeader")
+	if err != nil {
+		t.Fatal("header test failed", err)
+	}
+
 	_, err = callTestFun(engine, "testProgress")
 	if err != nil {
-		t.Fatal("progress test failed")
+		t.Fatal("progress test failed", err)
 	}
 
 	_, err = callTestFun(engine, "testAbort")
 	if err != nil {
-		t.Fatal("abort test failed")
+		t.Fatal("abort test failed", err)
 	}
 
 	_, err = callTestFun(engine, "testTimeout")
@@ -191,6 +235,105 @@ 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{
+		ProxyConfig: &base.DownloaderProxyConfig{
+			Enable: true,
+			System: false,
+			Scheme: "socks5",
+			Host:   proxyListener.Addr().String(),
+			Usr:    usr,
+			Pwd:    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(nil)
+
+	value, err := engine.RunString(`
+const vm = __gopeed_create_vm()
+vm.set('a', 1)
+vm.set('b', 2)
+const result = vm.runString('a=a+1;b=b+1;a+b;')
+const out = {
+	"a": vm.get('a'),
+	"b": vm.get('b'),
+	"result": result
+}
+out
+`)
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := map[string]any{
+		"a":      2,
+		"b":      3,
+		"result": 5,
+	}
+	if !test.JsonEqual(value, want) {
+		t.Fatalf("vm test failed, want %v, got %v", want, value)
+	}
+}
+
+func TestNonStopLoop(t *testing.T) {
+	engine := NewEngine(nil)
+
+	_, err := engine.RunString(`
+function leak(){
+	setInterval(() => {
+	},500)
+}
+
+function test(){
+	leak()
+	return new Promise((resolve, reject) => {
+		setTimeout(() => {
+			resolve('done')
+		}, 1000)	
+	})
+}
+`)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	val, err := callTestFun(engine, "test")
+	if err != nil {
+		panic(err)
+	}
+	if val != "done" {
+		t.Fatalf("infinite loop test failed, want %s, got %s", "done", val)
+	}
+}
+
 func doTestPolyfill(t *testing.T, module string) {
 	value, err := Run(fmt.Sprintf(`
 !!globalThis['%s']
@@ -214,6 +357,15 @@ func startServer() net.Listener {
 		w.WriteHeader(http.StatusOK)
 		w.Write([]byte("ok"))
 	})
+	mux.HandleFunc("/header", func(w http.ResponseWriter, r *http.Request) {
+		for k, v := range r.Header {
+			if strings.HasPrefix(k, "X-Gopeed") {
+				w.Header().Set(k, strings.Join(v, ", "))
+			}
+		}
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte("ok"))
+	})
 	mux.HandleFunc("/text", func(w http.ResponseWriter, r *http.Request) {
 		buf, _ := io.ReadAll(r.Body)
 		w.WriteHeader(http.StatusOK)

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/vm/module.go

@@ -0,0 +1,44 @@
+package vm
+
+import (
+	"github.com/dop251/goja"
+	"github.com/dop251/goja_nodejs/eventloop"
+)
+
+type Vm struct {
+	loop *eventloop.EventLoop
+}
+
+func (vm *Vm) Set(name string, value any) {
+	vm.loop.Run(func(runtime *goja.Runtime) {
+		runtime.Set(name, value)
+	})
+}
+
+func (vm *Vm) Get(name string) (value any) {
+	vm.loop.Run(func(runtime *goja.Runtime) {
+		value = runtime.Get(name)
+	})
+	return
+}
+
+func (vm *Vm) RunString(script string) (value any, err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			err = r.(error)
+		}
+	}()
+
+	vm.loop.Run(func(runtime *goja.Runtime) {
+		value, err = runtime.RunString(script)
+	})
+	return
+}
+
+func Enable(runtime *goja.Runtime) error {
+	return runtime.Set("__gopeed_create_vm", func(call goja.FunctionCall) goja.Value {
+		return runtime.ToValue(&Vm{
+			loop: eventloop.NewEventLoop(),
+		})
+	})
+}

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

@@ -2,14 +2,17 @@ package xhr
 
 import (
 	"bytes"
-	"github.com/GopeedLab/gopeed/pkg/download/engine/inject"
+	"errors"
 	"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"
+	"strings"
 	"time"
 )
 
@@ -116,9 +119,10 @@ type XMLHttpRequestUpload struct {
 type XMLHttpRequest struct {
 	method          string
 	url             string
-	requestHeaders  map[string]string
+	requestHeaders  http.Header
-	responseHeaders map[string]string
+	responseHeaders http.Header
 	aborted         bool
+	proxyHandler    func(r *http.Request) (*url.URL, error)
 
 	Upload       *XMLHttpRequestUpload `json:"upload"`
 	Timeout      int                   `json:"timeout"`
@@ -134,13 +138,13 @@ type XMLHttpRequest struct {
 func (xhr *XMLHttpRequest) Open(method, url string) {
 	xhr.method = method
 	xhr.url = url
-	xhr.requestHeaders = make(map[string]string)
+	xhr.requestHeaders = make(http.Header)
-	xhr.responseHeaders = make(map[string]string)
+	xhr.responseHeaders = make(http.Header)
 	xhr.doReadystatechange(1)
 }
 
 func (xhr *XMLHttpRequest) SetRequestHeader(key, value string) {
-	xhr.requestHeaders[key] = value
+	xhr.requestHeaders.Add(key, value)
 }
 
 func (xhr *XMLHttpRequest) Send(data goja.Value) {
@@ -191,22 +195,25 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
 		xhr.callOnerror()
 		return
 	}
+	req.Header = xhr.requestHeaders
 	if contentType != "" {
 		req.Header.Set("Content-Type", contentType)
 	}
 	if contentLength > 0 {
 		req.ContentLength = contentLength
 	}
-	for k, v := range xhr.requestHeaders {
+	transport := &http.Transport{
-		req.Header.Set(k, v)
+		Proxy: xhr.proxyHandler,
 	}
 	client := &http.Client{
+		Transport: transport,
 		Timeout:   time.Duration(xhr.Timeout) * time.Millisecond,
 	}
 	resp, err := client.Do(req)
 	if err != nil {
 		// handle timeout error
-		if err, ok := err.(net.Error); ok && err.Timeout() {
+		var ne net.Error
+		if errors.As(err, &ne) && ne.Timeout() {
 			if xhr.Timeout > 0 {
 				xhr.Upload.callOntimeout()
 				xhr.callOntimeout()
@@ -222,9 +229,7 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
 	if !xhr.aborted {
 		xhr.Upload.callOnload()
 	}
-	for k, v := range resp.Header {
+	xhr.responseHeaders = resp.Header
-		xhr.responseHeaders[k] = v[0]
-	}
 	xhr.Status = resp.StatusCode
 	xhr.StatusText = resp.Status
 	xhr.doReadystatechange(2)
@@ -253,7 +258,7 @@ func (xhr *XMLHttpRequest) Abort() {
 }
 
 func (xhr *XMLHttpRequest) GetResponseHeader(key string) string {
-	return xhr.responseHeaders[key]
+	return strings.Join(xhr.responseHeaders.Values(key), ", ")
 }
 
 func (xhr *XMLHttpRequest) GetAllResponseHeaders() string {
@@ -261,7 +266,7 @@ func (xhr *XMLHttpRequest) GetAllResponseHeaders() string {
 	for k, v := range xhr.responseHeaders {
 		buf.WriteString(k)
 		buf.WriteString(": ")
-		buf.WriteString(v)
+		buf.WriteString(strings.Join(v, ", "))
 		buf.WriteString("\r\n")
 	}
 	return buf.String()
@@ -306,10 +311,10 @@ func (xhr *XMLHttpRequest) parseData(data goja.Value) any {
 	return data.String()
 }
 
-func Enable(runtime *goja.Runtime) error {
+func Enable(runtime *goja.Runtime, proxyHandler func(r *http.Request) (*url.URL, error)) 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 +325,7 @@ func Enable(runtime *goja.Runtime) error {
 	})
 	xhr := runtime.ToValue(func(call goja.ConstructorCall) *goja.Object {
 		instance := &XMLHttpRequest{
+			proxyHandler: proxyHandler,
 			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"
@@ -33,7 +36,8 @@ type ActivationEvent string
 
 const (
 	EventOnResolve ActivationEvent = "onResolve"
-	//EventOnError   ActivationEvent = "onError"
+	EventOnStart   ActivationEvent = "onStart"
+	EventOnError   ActivationEvent = "onError"
 	//EventOnDone    ActivationEvent = "onDone"
 )
 
@@ -47,7 +51,7 @@ func (d *Downloader) InstallExtensionByFolder(path string, devMode bool) (*Exten
 		return nil, err
 	}
 
-	// if dev mode, don't copy the extension to the extensions' directory
+	// if dev mode, don't copy to the extensions' directory
 	if devMode {
 		ext.DevMode = true
 		ext.DevPath, _ = filepath.Abs(path)
@@ -194,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.DownloaderStoreConfig.Proxy.ToUrl()
+	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,
+		ProxyOptions: proxyOptions,
 	}); err != nil {
 		return nil, err
 	}
@@ -228,24 +240,86 @@ func (d *Downloader) parseExtensionByPath(path string) (*Extension, error) {
 	return &ext, nil
 }
 
-func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource) {
+func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource, err error) {
+	err = doTrigger(d,
+		EventOnResolve,
+		req,
+		&OnResolveContext{
+			Req: req,
+		},
+		func(ext *Extension, gopeed *Instance, ctx *OnResolveContext) {
+			// Validate resource structure
+			if ctx.Res != nil && len(ctx.Res.Files) > 0 {
+				if err := ctx.Res.Validate(); err != nil {
+					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
+		},
+	)
+	return
+}
+
+func (d *Downloader) triggerOnStart(task *Task) {
+	doTrigger(d,
+		EventOnStart,
+		task.Meta.Req,
+		&OnStartContext{
+			Task: NewExtensionTask(d, task),
+		},
+		func(ext *Extension, gopeed *Instance, ctx *OnStartContext) {
+			// Validate request structure
+			if ctx.Task.Meta.Req != nil {
+				if err := ctx.Task.Meta.Req.Validate(); err != nil {
+					gopeed.Logger.logger.Warn().Err(err).Msgf("[%s] request invalid", ext.buildIdentity())
+					return
+				}
+			}
+		},
+	)
+	return
+}
+
+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),
 	}
-	ctx := &Context{
-		Req: req,
-	}
 	var err error
 	for _, ext := range d.extensions {
 		if ext.Disabled {
 			continue
 		}
 		for _, script := range ext.Scripts {
-			if script.match(EventOnResolve, req.URL) {
+			if script.match(event, req) {
+				gopeed.Info = NewExtensionInfo(ext)
 				gopeed.Logger = newInstanceLogger(ext, d.ExtensionLogger)
+				gopeed.Settings = parseSettings(ext.Settings)
+				gopeed.Storage = &ContextStorage{
+					storage:  d.storage,
+					identity: ext.buildIdentity(),
+				}
 				scriptFilePath := filepath.Join(d.ExtensionPath(ext), script.Entry)
 				if _, err = os.Stat(scriptFilePath); os.IsNotExist(err) {
+					gopeed.Logger.logger.Error().Err(err).Msgf("[%s] script file not exist", ext.buildIdentity())
 					continue
 				}
 				func() {
@@ -256,14 +330,19 @@ func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource) {
 						return
 					}
 					defer scriptFile.Close()
-					ctx.Settings = parseSettings(ext.Settings)
 					var scriptBuf []byte
 					scriptBuf, err = io.ReadAll(scriptFile)
 					if err != nil {
 						gopeed.Logger.logger.Error().Err(err).Msgf("[%s] read script file failed", ext.buildIdentity())
 						return
 					}
-					engine := engine.NewEngine()
+					// Init request labels
+					if req.Labels == nil {
+						req.Labels = make(map[string]string)
+					}
+					engine := engine.NewEngine(&engine.Config{
+						ProxyConfig: d.cfg.Proxy,
+					})
 					defer engine.Close()
 					err = engine.Runtime.Set("gopeed", gopeed)
 					if err != nil {
@@ -275,27 +354,26 @@ func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource) {
 						gopeed.Logger.logger.Error().Err(err).Msgf("[%s] run script failed", ext.buildIdentity())
 						return
 					}
-					if fn, ok := gopeed.Events[EventOnResolve]; ok {
+					if fn, ok := gopeed.Events[event]; ok {
 						_, err = engine.CallFunction(fn, ctx)
 						if err != nil {
-							gopeed.Logger.logger.Error().Err(err).Msgf("[%s] call function failed: %s", EventOnResolve, ext.buildIdentity())
+							gopeed.Logger.logger.Error().Err(err).Msgf("[%s] call function failed: %s", ext.buildIdentity(), event)
 							return
 						}
-						// calculate resource total size
+						if handler != nil {
-						if ctx.Res != nil && len(ctx.Res.Files) > 0 {
+							handler(ext, gopeed, ctx)
-							if err = ctx.Res.Validate(); err != nil {
-								gopeed.Logger.logger.Warn().Err(err).Msgf("[%s] resource invalid", ext.buildIdentity())
-								return
 						}
-							ctx.Res.CalcSize()
-						}
-						res = ctx.Res
 					}
 				}()
 			}
 		}
 	}
-	return
+
+	// Only return MessageError
+	if me, ok := gojautil.AssertError[*gojaerror.MessageError](err); ok {
+		return me
+	}
+	return nil
 }
 
 func (d *Downloader) ExtensionPath(ext *Extension) string {
@@ -378,8 +456,50 @@ func (e *Extension) update(newExt *Extension) error {
 	e.Homepage = newExt.Homepage
 	e.Repository = newExt.Repository
 	e.Scripts = newExt.Scripts
-	// don't override settings
+	// merge settings
-	//e.Settings = newExt.Settings
+	// if new setting not exist in old settings, append it
+	for _, newSetting := range newExt.Settings {
+		var exist bool
+		for _, setting := range e.Settings {
+			if setting.Name == newSetting.Name {
+				exist = true
+				break
+			}
+		}
+		if !exist {
+			e.Settings = append(e.Settings, newSetting)
+		}
+	}
+	// if old setting not exist in new settings, remove it
+	for i := 0; i < len(e.Settings); i++ {
+		var exist bool
+		for _, setting := range newExt.Settings {
+			if setting.Name == e.Settings[i].Name {
+				exist = true
+				break
+			}
+		}
+		if !exist {
+			e.Settings = append(e.Settings[:i], e.Settings[i+1:]...)
+			i--
+		}
+	}
+	// if new setting exist in old settings, update it
+	for _, newSetting := range newExt.Settings {
+		for _, setting := range e.Settings {
+			if setting.Name == newSetting.Name {
+				setting.Title = newSetting.Title
+				setting.Description = newSetting.Description
+				setting.Options = newSetting.Options
+				// if type changed, reset value
+				if setting.Type != newSetting.Type {
+					setting.Type = newSetting.Type
+					setting.Value = newSetting.Value
+				}
+				break
+			}
+		}
+	}
 	e.UpdatedAt = time.Now()
 	return nil
 }
@@ -392,30 +512,46 @@ type Repository struct {
 type Script struct {
 	// Event active event name
 	Event string `json:"event"`
-	// Matches match request url pattern list
+	// Match rules
-	Matches []string `json:"matches"`
+	Match *Match `json:"match"`
 	// Entry js script file path
 	Entry string `json:"entry"`
 }
 
-func (s *Script) match(event ActivationEvent, url string) bool {
+func (s *Script) match(event ActivationEvent, req *base.Request) bool {
 	if s.Event == "" {
 		return false
 	}
 	if s.Event != string(event) {
 		return false
 	}
-	if len(s.Matches) == 0 {
+	if s.Match == nil || (len(s.Match.Urls) == 0 && len(s.Match.Labels) == 0) {
 		return false
 	}
-	for _, match := range s.Matches {
+
-		if util.Match(match, url) {
+	// match url
+	for _, url := range s.Match.Urls {
+		if util.Match(url, req.URL) {
+			return true
+		}
+	}
+
+	// match label
+	for _, label := range s.Match.Labels {
+		if _, ok := req.Labels[label]; ok {
 			return true
 		}
 	}
 	return false
 }
 
+type Match struct {
+	// Urls match expression, refer to https://developer.chrome.com/docs/extensions/mv3/match_patterns/
+	Urls []string `json:"urls"`
+	// Labels match request labels
+	Labels []string `json:"labels"`
+}
+
 type SettingType string
 
 const (
@@ -442,10 +578,13 @@ type Option struct {
 	Value any    `json:"value"`
 }
 
-// Instance inject to js context
+// Instance inject to js context when extension script is activated
 type Instance struct {
 	Events   InstanceEvents  `json:"events"`
+	Info     *ExtensionInfo  `json:"info"`
 	Logger   *InstanceLogger `json:"logger"`
+	Settings map[string]any  `json:"settings"`
+	Storage  *ContextStorage `json:"storage"`
 }
 
 type InstanceEvents map[ActivationEvent]goja.Callable
@@ -458,42 +597,64 @@ func (h InstanceEvents) OnResolve(fn goja.Callable) {
 	h.register(EventOnResolve, fn)
 }
 
-//func (h InstanceEvents) OnError(fn goja.Callable) {
+func (h InstanceEvents) OnStart(fn goja.Callable) {
-//	h.register(HookEventOnError, fn)
+	h.register(EventOnStart, fn)
-//}
+}
-//
+
+func (h InstanceEvents) OnError(fn goja.Callable) {
+	h.register(EventOnError, fn)
+}
+
 //func (h InstanceEvents) OnDone(fn goja.Callable) {
 //	h.register(HookEventOnDone, fn)
 //}
 
+type ExtensionInfo struct {
+	Identity string `json:"identity"`
+	Name     string `json:"name"`
+	Author   string `json:"author"`
+	Title    string `json:"title"`
+	Version  string `json:"version"`
+}
+
+func NewExtensionInfo(ext *Extension) *ExtensionInfo {
+	return &ExtensionInfo{
+		Identity: ext.buildIdentity(),
+		Name:     ext.Name,
+		Author:   ext.Author,
+		Title:    ext.Title,
+		Version:  ext.Version,
+	}
+}
+
 type InstanceLogger struct {
 	identity string
 	devMode  bool
 	logger   *logger.Logger
 }
 
-func (l *InstanceLogger) Debug(msg ...any) {
+func (l *InstanceLogger) Debug(msg ...goja.Value) {
 	if l.devMode {
 		l.logger.Debug().Msg(l.append(msg...))
 	}
 }
 
-func (l *InstanceLogger) Info(msg ...any) {
+func (l *InstanceLogger) Info(msg ...goja.Value) {
 	l.logger.Info().Msg(l.append(msg...))
 }
 
-func (l *InstanceLogger) Warn(msg ...any) {
+func (l *InstanceLogger) Warn(msg ...goja.Value) {
 	l.logger.Warn().Msg(l.append(msg...))
 }
 
-func (l *InstanceLogger) Error(msg ...any) {
+func (l *InstanceLogger) Error(msg ...goja.Value) {
 	l.logger.Error().Msg(l.append(msg...))
 }
 
-func (l *InstanceLogger) append(msg ...any) string {
+func (l *InstanceLogger) append(msg ...goja.Value) string {
 	strMsg := make([]string, len(msg))
 	for i, m := range msg {
-		strMsg[i] = fmt.Sprint(m)
+		strMsg[i] = m.String()
 	}
 	return fmt.Sprintf("[%s] %s", l.identity, strings.Join(strMsg, " "))
 }
@@ -506,10 +667,39 @@ func newInstanceLogger(extension *Extension, logger *logger.Logger) *InstanceLog
 	}
 }
 
-type Context struct {
+type OnResolveContext struct {
 	Req *base.Request  `json:"req"`
 	Res *base.Resource `json:"res"`
-	Settings map[string]any `json:"settings"`
+}
+
+type OnStartContext struct {
+	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 {
@@ -547,3 +737,50 @@ func tryParse(val any, settingType SettingType) any {
 		return nil
 	}
 }
+
+type ContextStorage struct {
+	storage  Storage
+	identity string
+}
+
+func (s *ContextStorage) Get(key string) any {
+	raw := s.getRawData()
+	if v, ok := raw[key]; ok {
+		return v
+	}
+	return nil
+}
+
+func (s *ContextStorage) Set(key string, value string) {
+	raw := s.getRawData()
+	raw[key] = value
+	s.storage.Put(bucketExtensionStorage, s.identity, raw)
+}
+
+func (s *ContextStorage) Remove(key string) {
+	raw := s.getRawData()
+	delete(raw, key)
+	s.storage.Put(bucketExtensionStorage, s.identity, raw)
+}
+
+func (s *ContextStorage) Keys() []string {
+	raw := s.getRawData()
+	keys := make([]string, 0)
+	for k := range raw {
+		keys = append(keys, k)
+	}
+	return keys
+}
+
+func (s *ContextStorage) Clear() {
+	s.storage.Delete(bucketExtensionStorage, s.identity)
+}
+
+func (s *ContextStorage) getRawData() map[string]string {
+	var data map[string]string
+	s.storage.Get(bucketExtensionStorage, s.identity, &data)
+	if data == nil {
+		data = make(map[string]string)
+	}
+	return data
+}

pkg/download/extension_test.go

@@ -1,10 +1,14 @@
 package download
 
 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"
+	"time"
 )
 
 func TestDownloader_InstallExtensionByFolder(t *testing.T) {
@@ -93,6 +97,15 @@ func TestDownloader_InstallExtensionByGitFull(t *testing.T) {
 }
 
 func TestDownloader_UpgradeExtension(t *testing.T) {
+	getSetting := func(settings []*Setting, name string) *Setting {
+		for _, setting := range settings {
+			if setting.Name == name {
+				return setting
+			}
+		}
+		return nil
+	}
+
 	setupDownloader(func(downloader *Downloader) {
 		installedExt, err := downloader.InstallExtensionByFolder("./testdata/extensions/update", false)
 		if err != nil {
@@ -120,14 +133,177 @@ func TestDownloader_UpgradeExtension(t *testing.T) {
 			t.Fatal("extension update fail")
 		}
 
+		// check setting update
+		s1 := getSetting(upgradeExt.Settings, "s1")
+		if s1.Title == "S1 old" {
+			t.Fatal("setting update fail")
+		}
+		// check setting type update
+		s2 := getSetting(upgradeExt.Settings, "s2")
+		if s2.Type == "number" {
+			t.Fatal("setting type update fail")
+		}
+		// check setting remove
+		d1 := getSetting(upgradeExt.Settings, "d1")
+		if d1 != nil {
+			t.Fatal("setting remove fail")
+		}
+		// check setting add
+		s3 := getSetting(upgradeExt.Settings, "s3")
+		if s3 == nil {
+			t.Fatal("setting add fail")
+		}
+
 		rr, err := downloader.Resolve(&base.Request{
-			URL: "https://github.com/GopeedLab/gopeed/releases",
+			URL: "https://test.com",
 		})
 		if err != nil {
 			t.Fatal(err)
 		}
-		if len(rr.Res.Files) == 1 {
+		if rr.Res.Name != "test" {
-			t.Fatal("resolve error")
+			t.Fatal("script update fail")
+		}
+	})
+}
+
+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 {
+				t.Fatal(err)
+			}
+			errCh := make(chan error, 1)
+			downloader.Listener(func(event *Event) {
+				if event.Key == EventKeyFinally {
+					errCh <- event.Err
+				}
+			})
+			id, err := downloader.CreateDirect(req, 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 start download error: " + err.Error())
+			}
+			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.Meta.Req.Labels["modified"] != "true" {
+				t.Fatalf("except label: modified=true, actual: %s", task.Meta.Req.Labels["modified"])
+			}
+		})
+	}
+
+	// url match
+	downloadAndCheck(&base.Request{
+		URL: "https://github.com/gopeed/test/404",
+	})
+
+	// label match
+	downloadAndCheck(&base.Request{
+		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 * 30):
+			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 {
+			t.Fatal(err)
+		}
+		rr, err := downloader.Resolve(&base.Request{
+			URL: "https://github.com/test",
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		if len(rr.Res.Files) == 2 {
+			t.Fatal("script error catch failed")
+		}
+	})
+
+	setupDownloader(func(downloader *Downloader) {
+		if _, err := downloader.InstallExtensionByFolder("./testdata/extensions/function_error", false); err != nil {
+			t.Fatal(err)
+		}
+		rr, err := downloader.Resolve(&base.Request{
+			URL: "https://github.com/test",
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		if len(rr.Res.Files) == 2 {
+			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)
 		}
 	})
 }
@@ -170,6 +346,23 @@ func TestDownloader_Extension_Settings(t *testing.T) {
 	})
 }
 
+func TestDownloader_ExtensionStorage(t *testing.T) {
+	setupDownloader(func(downloader *Downloader) {
+		if _, err := downloader.InstallExtensionByFolder("./testdata/extensions/storage", false); err != nil {
+			t.Fatal(err)
+		}
+		rr, err := downloader.Resolve(&base.Request{
+			URL: "https://github.com/test",
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		if len(rr.Res.Files) == 1 {
+			t.Fatal("resolve error")
+		}
+	})
+}
+
 func TestDownloader_SwitchExtension(t *testing.T) {
 	setupDownloader(func(downloader *Downloader) {
 		installedExt, err := downloader.InstallExtensionByFolder("./testdata/extensions/basic", false)
@@ -205,31 +398,15 @@ 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{
 		Name: "test",
 	}, logger)
-	il.Debug("msg1", "msg2")
+	il.Debug(goja.NaN(), goja.Undefined())
-	il.Info("msg1", "msg2")
+	il.Info(goja.NaN(), goja.Undefined())
-	il.Warn("msg1", "msg2")
+	il.Warn(goja.NaN(), goja.Undefined())
-	il.Error("msg1", "msg2")
+	il.Error(goja.NaN(), goja.Undefined())
 }
 
 func setupDownloader(fn func(downloader *Downloader)) {

pkg/download/model.go

@@ -21,13 +21,15 @@ type Task struct {
 	ID        string               `json:"id"`
 	Meta      *fetcher.FetcherMeta `json:"meta"`
 	Status    base.Status          `json:"status"`
+	Protocol  string               `json:"protocol"`
 	Progress  *Progress            `json:"progress"`
-	Size      int64                `json:"size"`
 	CreatedAt time.Time            `json:"createdAt"`
+	UpdatedAt time.Time            `json:"updatedAt"`
 
 	fetcherBuilder fetcher.FetcherBuilder
 	fetcher        fetcher.Fetcher
 	timer          *util.Timer
+	statusLock     *sync.Mutex
 	lock           *sync.Mutex
 	speedArr       []int64
 }
@@ -41,17 +43,23 @@ 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,
 		Meta:      t.Meta,
 		Status:    t.Status,
 		Progress:  t.Progress,
-		Size:      t.Size,
 		CreatedAt: t.CreatedAt,
+		UpdatedAt: t.UpdatedAt,
 	}
 }
 
@@ -77,7 +85,7 @@ type DownloaderConfig struct {
 
 	ProductionMode bool
 
-	*DownloaderStoreConfig
+	*base.DownloaderStoreConfig
 }
 
 func (cfg *DownloaderConfig) Init() *DownloaderConfig {
@@ -98,20 +106,3 @@ func (cfg *DownloaderConfig) Init() *DownloaderConfig {
 	}
 	return cfg
 }
-
-// DownloaderStoreConfig is the config that can restore the downloader.
-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
-}
-
-func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
-	if cfg.MaxRunning == 0 {
-		cfg.MaxRunning = 5
-	}
-	return cfg
-}

pkg/download/storage.go

@@ -69,7 +69,9 @@ func (n *MemStorage) Setup(buckets []string) error {
 func (n *MemStorage) Put(bucket string, key string, v any) error {
 	n.lock.Lock()
 	defer n.lock.Unlock()
-	memData[bucket][key] = v
+	if bucketData, ok := memData[bucket]; ok {
+		bucketData[key] = v
+	}
 	return nil
 }
 
@@ -222,6 +224,9 @@ func (b *BoltStorage) Pop(bucket string, key string, v any) error {
 	if err != nil {
 		return err
 	}
+	if len(data) == 0 {
+		return nil
+	}
 	return json.Unmarshal(data, v)
 }