ci: release v1.0.0 again

.github/release-drafter.yml

@@ -0,0 +1,35 @@
+name-template: 'v1.0.0 🌈'
+tag-template: 'v1.0.0'
+categories:
+  - title: '🆕 Features'
+    labels:
+      - 'feat'
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '🧰 Maintenance'
+    label: 'chore'
+  - title: '📖 Document'
+    label: 'doc'
+  - title: '🚀 CI/CD'
+    label: 'ci'
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'minor'
+  patch:
+    labels:
+      - 'patch'
+  default: patch
+template: |
+  ## Changes
+
+  $CHANGES

.github/workflows/build.yml

@@ -1,48 +0,0 @@
-name: build
-
-on:
-  pull_request:
-  push:
-    branches:
-      - dev
-
-jobs:
-#  lint:
-#    name: Lint
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/setup-go@v2
-#        with:
-#          go-version: '^1.15.2'
-#      - uses: actions/checkout@v2
-#      - name: Lint Go Code
-#        run: |
-#          export PATH=$PATH:$(go env GOPATH)/bin # temporary fix. See https://github.com/actions/setup-go/issues/14
-#          go get -u golang.org/x/lint/golint
-#          golint -set_exit_status ./...
-  test:
-    name: Test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '^1.15.2'
-      - uses: actions/checkout@v2
-      - name: Run Unit tests.
-        run: go test ./... -v -covermode=count -coverprofile=coverage.txt
-      - uses: codecov/codecov-action@v1
-        with:
-          file: ./coverage.txt
-          fail_ci_if_error: true
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-#    needs: [lint, test]
-    needs: [test]
-    steps:
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '^1.15.2'
-      - uses: actions/checkout@v2
-      - name: Build
-        run: go build -ldflags="-s -w" -o bin/gopeed cmd/gopeed/gopeed.go

.github/workflows/release.yml

@@ -0,0 +1,328 @@
+name: release
+
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '_docs/**'
+      - '_examples/**'
+      - 'README*.md'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    outputs:
+      tag_name: ${{ steps.create_release.outputs.tag_name }}
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.19'
+      - uses: release-drafter/release-drafter@v5
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  build-windows:
+    runs-on: windows-latest
+    needs: [ release ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.19'
+          cache: true
+      - uses: subosito/flutter-action@v2
+      - name: Build
+        env:
+          VERSION: ${{ needs.release.outputs.tag_name }}
+        run: |
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/monkeyWie/gopeed/bind/desktop
+          cd ui/flutter
+          flutter build windows
+          $mingw = "C:\ProgramData\Chocolatey\lib\mingw\tools\install\mingw64\bin"
+          $system = "C:\Windows\System32"
+          $release = "build\windows\runner\Release\"
+          cp $mingw\libstdc++-6.dll $release
+          cp $mingw\libgcc_s_seh-1.dll $release
+          cp $mingw\libwinpthread-1.dll $release
+          cp $system\msvcp140.dll $release
+          cp $system\vcruntime140.dll $release
+          cp $system\vcruntime140_1.dll $release
+          
+          cd build/windows
+          echo @"
+          ; Script generated by the Inno Setup Script Wizard.
+          ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+          #define MyAppName "Gopeed"
+          #define MyAppVersion "$($env:VERSION.substring(1))"
+          #define MyAppPublisher "monkeyWie"
+          #define MyAppURL "https://gopeed.com"
+          #define MyAppExeName "gopeed.exe"
+
+          [Setup]
+          ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+          ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+          AppId={{5960F34D-1E42-402C-8C85-DE2FF24CBAE4}
+          AppName={#MyAppName}
+          AppVersion={#MyAppVersion}
+          ;AppVerName={#MyAppName} {#MyAppVersion}
+          AppPublisher={#MyAppPublisher}
+          AppPublisherURL={#MyAppURL}
+          AppSupportURL={#MyAppURL}
+          AppUpdatesURL={#MyAppURL}
+          DefaultDirName={autopf}\gopeed
+          DisableProgramGroupPage=yes
+          LicenseFile=..\..\..\..\LICENSE
+          ; Remove the following line to run in administrative install mode (install for all users.)
+          PrivilegesRequired=lowest
+          OutputBaseFilename=gopeed
+          SetupIconFile=..\..\assets\icon\icon.ico
+          Compression=lzma
+          SolidCompression=yes
+          WizardStyle=modern
+
+          [Languages]
+          Name: "english"; MessagesFile: "compiler:Default.isl"
+
+          [Tasks]
+          Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+          [Files]
+          Source: ".\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
+          ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+          [Icons]
+          Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+          Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+          [Run]
+          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"
+      - name: Upload
+        uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ needs.release.outputs.upload_url }}
+          asset_path: ui/flutter/build/windows/Output/*
+          overwrite: true
+  build-macos-arm64-lib:
+    runs-on: ubuntu-latest
+    needs: [ release ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.19'
+          cache: true
+      - run: mkdir -p ~/image-cache
+      - id: image-cache
+        uses: actions/cache@v3
+        with:
+          path: ~/image-cache
+          key: image-cache-xgo-v1.19
+      - if: steps.image-cache.outputs.cache-hit != 'true'
+        run: |
+          docker pull techknowlogick/xgo:go-1.19.x
+          docker save -o ~/image-cache/xgo.tar techknowlogick/xgo:go-1.19.x
+      - if: steps.image-cache.outputs.cache-hit == 'true'
+        run: docker load -i ~/image-cache/xgo.tar
+      - name: Build
+        run: |
+          go install src.techknowlogick.com/xgo@latest
+          xgo --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
+    needs: [ release, build-macos-arm64-lib ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.19'
+          cache: true
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - uses: subosito/flutter-action@v2
+      - name: Install appdmg
+        run: npm install -g appdmg
+      - uses: actions/download-artifact@v3
+        with:
+          name: macos-arm64-lib
+          path: ui/flutter/macos/Frameworks
+      - name: Build
+        env:
+          VERSION: ${{ needs.release.outputs.tag_name }}
+        run: |
+          PROJECT_DIR=$(pwd)
+          
+          cd ui/flutter
+          flutter build macos
+          cd build/macos/Build/Products/Release
+          cat>appdmg.json<<EOF
+          {
+            "title": "Gopeed",
+            "icon": "Gopeed.app/Contents/Resources/AppIcon.icns",
+            "contents": [
+              { "x": 448, "y": 344, "type": "link", "path": "/Applications" },
+              { "x": 192, "y": 344, "type": "file", "path": "Gopeed.app" }
+            ]
+          }
+          EOF
+          mkdir dist
+          appdmg appdmg.json dist/Gopeed-$VERSION-macos-arm64.dmg
+          
+          # amd64
+          cd $PROJECT_DIR
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o bin/libgopeed.dylib github.com/monkeyWie/gopeed/bind/desktop
+          cp bin/libgopeed.dylib ui/flutter/build/macos/Build/Products/Release/Gopeed.app/Contents/Frameworks/
+          cd ui/flutter/build/macos/Build/Products/Release
+          appdmg appdmg.json dist/Gopeed-$VERSION-macos-amd64.dmg
+      - name: Upload
+        uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ needs.release.outputs.upload_url }}
+          asset_path: ui/flutter/build/macos/Build/Products/Release/dist/*
+          overwrite: true
+  build-linux:
+    runs-on: ubuntu-latest
+    needs: [ release ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.19'
+          cache: true
+      - uses: subosito/flutter-action@v2
+      - run: |
+          sudo apt-get update -y
+          sudo apt-get install -y ninja-build libgtk-3-dev
+      - name: Build
+        env:
+          VERSION: ${{ needs.release.outputs.tag_name }}
+        run: |
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/monkeyWie/gopeed/bind/desktop
+          cd ui/flutter
+          flutter build linux
+          mkdir -p debian/gui
+          cp assets/icon/icon_1024.png debian/gui/gopeed.png
+          cat>debian/debian.yaml<<EOF
+          flutter_app: 
+            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.release.outputs.upload_url }}
+          asset_path: ui/flutter/debian/packages/*
+          overwrite: true
+  build-android:
+    runs-on: ubuntu-latest
+    needs: [ release ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.19'
+          cache: true
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+      - uses: subosito/flutter-action@v2
+      - name: Build
+        env:
+          VERSION: ${{ needs.release.outputs.tag_name }}
+        run: |
+          mkdir ui/flutter/android/app/libs
+          go install golang.org/x/mobile/cmd/gomobile@latest
+          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/monkeyWie/gopeed/bind/mobile
+          cd ui/flutter
+          flutter build apk
+          mkdir dist
+          cp build/app/outputs/flutter-apk/app-release.apk dist/Gopeed-$VERSION-android.apk
+      - name: Upload
+        uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ needs.release.outputs.upload_url }}
+          asset_path: ui/flutter/dist/*
+          overwrite: true
+  build-web:
+    runs-on: ubuntu-latest
+    needs: [ release ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.19'
+          cache: true
+      - uses: subosito/flutter-action@v2
+      - name: Build
+        env:
+          VERSION: ${{ needs.release.outputs.tag_name }}
+        run: |
+          cd ui/flutter
+          flutter build web
+          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
+          for goos in "${goos_arr[@]}"; do
+            for goarch in "${goarch_arr[@]}"; do
+              name=gopeed-web-$VERSION-$goos-$goarch
+              dir="dist/$name/"
+              (GOOS=$goos GOARCH=$goarch go build -tags nosqlite,web -ldflags="-s -w" -o $dir github.com/monkeyWie/gopeed/cmd/web \
+              && cd $dir \
+              && file=$(ls -AU | head -1) \
+              && mkdir $name \
+              && mv $file $name/$(echo $file | sed -e "s/web/gopeed/g") \
+              && zip -r ../zip/$name.zip * \
+              && cd ../..) \
+              || true
+            done
+          done
+      - name: Upload
+        uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ needs.release.outputs.upload_url }}
+          asset_path: dist/zip/*
+          overwrite: true

.github/workflows/test.yml

@@ -0,0 +1,64 @@
+name: test
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - '.github/workflows/release.yml'
+      - '.github/release-drafter.yml'
+      - '_docs/**'
+      - '_examples/**'
+      - 'README*.md'
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '.github/workflows/release.yml'
+      - '.github/release-drafter.yml'
+      - '_docs/**'
+      - '_examples/**'
+      - 'README*.md'
+
+jobs:
+#  lint:
+#    name: Lint
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/setup-go@v2
+#        with:
+#          go-version: '^1.19'
+#      - uses: actions/checkout@v2
+#      - name: Lint Go Code
+#        run: |
+#          export PATH=$PATH:$(go env GOPATH)/bin # temporary fix. See https://github.com/actions/setup-go/issues/14
+#          go get -u golang.org/x/lint/golint
+#          golint -set_exit_status ./...
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.19'
+          cache: true
+      - name: Run Unit tests.
+        run: go test $(go list ./... | grep -v /cmd/ | grep -v /bind/ ) -v -covermode=count -coverprofile=coverage.txt
+      - uses: codecov/codecov-action@v3
+        with:
+          files: ./coverage.txt
+          fail_ci_if_error: true
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+#    needs: [lint, test]
+    needs: [test]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.19'
+          cache: true
+      - name: Build
+        run: go build github.com/monkeyWie/gopeed/cmd/gopeed

.gitignore

@@ -11,6 +11,17 @@
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
-debug
-
 .idea/
+
+bin/
+
+.torrent.db
+.torrent.db-shm
+.torrent.db-wal
+
+*.data
+*.db
+
+.DS_Store
+
+dist/

README.md

@@ -1,38 +1,120 @@
-[![Build Status](https://github.com/monkeyWie/gopeed-core/workflows/build/badge.svg)](https://github.com/monkeyWie/gopeed-core/actions?query=workflow%3Abuild)
+[![Test Status](https://github.com/monkeyWie/gopeed/workflows/test/badge.svg)](https://github.com/monkeyWie/gopeed/actions?query=workflow%3Atest)
-[![Codecov](https://codecov.io/gh/monkeyWie/gopeed-core/branch/dev/graph/badge.svg)](https://codecov.io/gh/monkeyWie/gopeed-core)
+[![Codecov](https://codecov.io/gh/monkeyWie/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/monkeyWie/gopeed)
+[![Release](https://img.shields.io/github/release/monkeyWie/gopeed.svg?style=flat-square)](https://github.com/monkeyWie/gopeed/releases)
 
-## gopeed
+![](_docs/img/banner.png)
 
-支持多协议（HTTP、BitTorrent）下载的客户端，提供命令行、RESTful API、WebSocket、Go 类库方式来使用。
+## 介绍
 
-## 安装
+Gopeed 是一款由`Golang`+`Flutter`开发的高速下载器，支持（HTTP、BitTorrent、Magnet）协议下载，并且支持全平台使用。
 
-```sh
+## 下载
-go install github.com/monkeyWie/gopeed-core
+
+**已支持平台**
+
+- [x] windows
+- [x] macos
+- [x] linux
+- [x] android
+- [ ] ios
+- [x] web
+
+[点击前往](https://github.com/monkeyWie/gopeed/releases/latest)
+
+### 命令行工具
+
+使用`go install`安装：
+
+```bash
+go install github.com/monkeyWie/gopeed/cmd/gopeed
 ```
 
-## 示例
+## 界面展示
 
-```go
+![](_docs/img/ui-demo.png)
 
+## 开发
+
+本项目分为前端和后端两个部分，前端使用`flutter`，后端使用`Golang`，两边通过`http`协议进行通讯，在 unix 系统下，使用的是`unix socket`，在 windows 系统下，使用的是`tcp`协议。
+
+> 前端代码位于`ui/flutter`目录下。
+
+### 环境要求
+
+1. Golang 1.9+
+2. Flutter 3.0+
+
+### 克隆项目
+
+```bash
+git clone [email protected]:monkeyWie/gopeed.git
 ```
 
-## TODO
+### 编译
 
-- [x] HTTP 下载实现
+#### 桌面端
-- [ ] BitTorrent 下载实现
-  - [x] .torrent 文件解析
-  - [x] tracker 协议实现
-  - [x] peer wire protocol 协议实现
-  - [ ] DHT 协议实现
-  - [ ] 磁力链接支持
-  - [ ] uTP 协议实现
-- [x] 下载接口抽象(不关心具体协议)
-- [ ] 支持自定义配置
-- [ ] 限速功能实现
-- [x] 命令行工具提供
-- [ ] RESTful 服务提供
 
-## 参与
+首先需要按照[flutter desktop 官网文档](https://docs.flutter.dev/development/platform-integration/desktop)进行环境配置，然后需要准备好`cgo`环境，具体可以自行搜索。
 
-由于项目目前还未定型，代码可能随时有大的调整，所以暂不接受 PR，当然如果有什么好的想法可以在 issue 区提出来。
+构建命令：
+
+- windows
+
+```bash
+go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/monkeyWie/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/monkeyWie/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/monkeyWie/gopeed/bind/desktop
+cd ui/flutter
+flutter build linux
+```
+
+#### 移动端
+
+同样的也是需要准备好`cgo`环境，接着安装`gomobile`：
+
+```bash
+go install golang.org/x/mobile/cmd/gomobile@latest
+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/monkeyWie/gopeed/bind/mobile
+cd ui/flutter
+flutter build apk
+```
+
+#### Web 端（推荐本地调试使用）
+
+Web 端直接与后端 http 服务通讯，不需要额外准备环境。
+
+构建命令：
+
+```bash
+cd ui/flutter
+flutter build web
+cd ../../
+cp -r ui/flutter/build/web cmd/web/dist
+go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/monkeyWie/gopeed/cmd/web
+```
+
+## 开源许可
+
+基于 [GPLv3](LICENSE) 协议开源。

_examples/basic/main.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"fmt"
+	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/monkeyWie/gopeed/pkg/download"
+)
+
+func main() {
+	finallyCh := make(chan error)
+	_, err := download.Boot().
+		URL("https://www.baidu.com/index.html").
+		Listener(func(event *download.Event) {
+			if event.Key == download.EventKeyFinally {
+				finallyCh <- event.Err
+			}
+		}).
+		Create(&base.Options{
+			Connections: 8,
+		})
+	if err != nil {
+		panic(err)
+	}
+	err = <-finallyCh
+	if err != nil {
+		fmt.Printf("download fail:%v\n", err)
+	} else {
+		fmt.Println("download success")
+	}
+}

bind/desktop/main.go

@@ -0,0 +1,28 @@
+package main
+
+import "C"
+import (
+	"encoding/json"
+	"github.com/monkeyWie/gopeed/pkg/rest"
+	"github.com/monkeyWie/gopeed/pkg/rest/model"
+)
+
+func main() {}
+
+//export Start
+func Start(cfg *C.char) (int, *C.char) {
+	var config model.StartConfig
+	if err := json.Unmarshal([]byte(C.GoString(cfg)), &config); err != nil {
+		return 0, C.CString(err.Error())
+	}
+	realPort, err := rest.Start(&config)
+	if err != nil {
+		return 0, C.CString(err.Error())
+	}
+	return realPort, nil
+}
+
+//export Stop
+func Stop() {
+	rest.Stop()
+}

bind/mobile/main.go

@@ -0,0 +1,21 @@
+package libgopeed
+
+// #cgo LDFLAGS: -static-libstdc++
+import "C"
+import (
+	"encoding/json"
+	"github.com/monkeyWie/gopeed/pkg/rest"
+	"github.com/monkeyWie/gopeed/pkg/rest/model"
+)
+
+func Start(cfg string) (int, error) {
+	var config model.StartConfig
+	if err := json.Unmarshal([]byte(cfg), &config); err != nil {
+		return 0, err
+	}
+	return rest.Start(&config)
+}
+
+func Stop() {
+	rest.Stop()
+}

cmd/gopeed/flags.go

@@ -20,7 +20,7 @@ func parse() *args {
 	}
 	var args args
 	args.connections = flag.Int("C", 16, "Concurrent connections.")
-	args.dir = flag.String("D", dir, "Save directory.")
+	args.dir = flag.String("D", dir, "Store directory.")
 	flag.Parse()
 	t := flag.Args()
 	if len(t) > 0 {

cmd/gopeed/gopeed.go

@@ -1,64 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/monkeyWie/gopeed-core/internal/protocol/http"
-	"github.com/monkeyWie/gopeed-core/pkg/base"
-	"github.com/monkeyWie/gopeed-core/pkg/download"
-	"github.com/monkeyWie/gopeed-core/pkg/util"
-	"path/filepath"
-	"sync"
-)
-
-const progressWidth = 20
-
-func main() {
-	args := parse()
-
-	downloader := download.NewDownloader(http.FetcherBuilder)
-	res, err := downloader.Resolve(&base.Request{
-		URL: args.url,
-	})
-	if err != nil {
-		panic(err)
-	}
-
-	err = downloader.Create(res, &base.Options{
-		Path:        *args.dir,
-		Connections: *args.connections,
-	})
-	if err != nil {
-		panic(err)
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	downloader.Listener(func(taskInfo *download.TaskInfo, eventKey download.EventKey) {
-		if eventKey == download.EventKeyProgress {
-			printProgress(taskInfo, "downloading...")
-		}
-		if eventKey == download.EventKeyDone {
-			printProgress(taskInfo, "complete")
-			wg.Done()
-		}
-	})
-	wg.Wait()
-	fmt.Println()
-	gPrint("saving file " + filepath.Join(*args.dir, res.Files[0].Name))
-}
-
-func printProgress(taskInfo *download.TaskInfo, title string) {
-	rate := float64(taskInfo.Progress.Downloaded) / float64(taskInfo.Res.TotalSize)
-	completeWidth := int(progressWidth * rate)
-	speed := util.ByteFmt(taskInfo.Progress.Speed)
-	totalSize := util.ByteFmt(taskInfo.Res.TotalSize)
-	fmt.Printf("\r%s [", title)
-	for i := 0; i < progressWidth; i++ {
-		if i < completeWidth {
-			fmt.Print("■")
-		} else {
-			fmt.Print("□")
-		}
-	}
-	fmt.Printf("] %.1f%%    %s/s    %s", rate*100, speed, totalSize)
-}

cmd/gopeed/main.go

@@ -0,0 +1,80 @@
+package main
+
+import (
+	"fmt"
+	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/monkeyWie/gopeed/pkg/download"
+	"github.com/monkeyWie/gopeed/pkg/util"
+	"strings"
+	"sync"
+)
+
+const progressWidth = 20
+
+func main() {
+	args := parse()
+
+	var wg sync.WaitGroup
+	_, err := download.Boot().
+		URL(args.url).
+		Listener(func(event *download.Event) {
+			if event.Key == download.EventKeyProgress {
+				printProgress(event.Task, "downloading...")
+			}
+			if event.Key == download.EventKeyFinally {
+				var title string
+				if event.Err != nil {
+					title = "fail"
+				} else {
+					title = "complete"
+				}
+				printProgress(event.Task, title)
+				fmt.Println()
+				if event.Err != nil {
+					fmt.Printf("reason: %s", event.Err.Error())
+				} else {
+					fmt.Printf("saving path: %s", *args.dir)
+				}
+				wg.Done()
+			}
+		}).
+		Create(&base.Options{
+			Path:        *args.dir,
+			Connections: *args.connections,
+		})
+	if err != nil {
+		panic(err)
+	}
+	wg.Add(1)
+	wg.Wait()
+}
+
+var (
+	lastLineLen = 0
+	sb          = new(strings.Builder)
+)
+
+func printProgress(task *download.Task, title string) {
+	rate := float64(task.Progress.Downloaded) / float64(task.Res.Size)
+	completeWidth := int(progressWidth * rate)
+	speed := util.ByteFmt(task.Progress.Speed)
+	totalSize := util.ByteFmt(task.Res.Size)
+	sb.WriteString(fmt.Sprintf("\r%s [", title))
+	for i := 0; i < progressWidth; i++ {
+		if i < completeWidth {
+			sb.WriteString("■")
+		} else {
+			sb.WriteString("□")
+		}
+	}
+	sb.WriteString(fmt.Sprintf("] %.1f%%    %s/s    %s", rate*100, speed, totalSize))
+	if lastLineLen != 0 {
+		paddingLen := lastLineLen - sb.Len()
+		if paddingLen > 0 {
+			sb.WriteString(strings.Repeat(" ", paddingLen))
+		}
+	}
+	lastLineLen = sb.Len()
+	fmt.Print(sb.String())
+	sb.Reset()
+}

cmd/web/banner.txt

@@ -0,0 +1,7 @@
+
+  _______   ______   .______    _______  _______  _______
+ /  _____| /  __  \  |   _  \  |   ____||   ____||       \
+|  |  __  |  |  |  | |  |_)  | |  |__   |  |__   |  .--.  |
+|  | |_ | |  |  |  | |   ___/  |   __|  |   __|  |  |  |  |
+|  |__| | |  `--'  | |  |      |  |____ |  |____ |  '--'  |
+ \______|  \______/  | _|      |_______||_______||_______/

cmd/web/main.go

@@ -0,0 +1,42 @@
+//go:build web
+// +build web
+
+package main
+
+import (
+	"embed"
+	"fmt"
+	"github.com/monkeyWie/gopeed/pkg/rest"
+	"github.com/monkeyWie/gopeed/pkg/rest/model"
+	"io/fs"
+	"net/http"
+)
+
+//go:embed banner.txt
+var banner string
+
+//go:embed dist/*
+var dist embed.FS
+
+func main() {
+	sub, err := fs.Sub(dist, "dist")
+	if err != nil {
+		panic(err)
+	}
+	cfg := &model.StartConfig{
+		Network:   "tcp",
+		Address:   "127.0.0.1:9999",
+		Storage:   model.StorageMem,
+		WebEnable: true,
+		WebFS:     sub,
+	}
+	fmt.Println(banner)
+	srv, listener, err := rest.BuildServer(cfg)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
+	if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
+		panic(err)
+	}
+}

go.mod

@@ -1,17 +1,76 @@
-module github.com/monkeyWie/gopeed-core
+module github.com/monkeyWie/gopeed
 
-go 1.13
+go 1.19
 
 require (
-	github.com/RoaringBitmap/roaring v0.4.21
+	github.com/anacrolix/torrent v1.46.0
-	github.com/cenkalti/mse v0.0.0-20140930130441-6ef65f170972
+	github.com/gorilla/mux v1.8.0
-	github.com/gizak/termui/v3 v3.1.0
+	github.com/matoous/go-nanoid/v2 v2.0.0
-	github.com/google/uuid v1.1.1
+	go.etcd.io/bbolt v1.3.6
-	github.com/marksamman/bencode v0.0.0-20150821143521-dc84f26e086e
+	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
-	github.com/mattn/go-tty v0.0.3 // indirect
+)
-	github.com/sirupsen/logrus v1.4.2
+
-	github.com/superhawk610/bar v0.0.2
+require (
-	github.com/superhawk610/terminal v0.1.0 // indirect
+	crawshaw.io/sqlite v0.3.3-0.20210127221821-98b1f83c5508 // indirect
-	golang.org/x/net v0.0.0-20200707034311-ab3426394381
+	github.com/RoaringBitmap/roaring v1.0.1-0.20220510143707-3f418c4f42a4 // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 // indirect
+	github.com/anacrolix/chansync v0.3.0 // indirect
+	github.com/anacrolix/dht/v2 v2.16.2-0.20220311024416-dd658f18fd51 // indirect
+	github.com/anacrolix/envpprof v1.2.1 // indirect
+	github.com/anacrolix/generics v0.0.0-20220618083756-f99e35403a60 // indirect
+	github.com/anacrolix/go-libutp v1.2.0 // indirect
+	github.com/anacrolix/log v0.13.1 // indirect
+	github.com/anacrolix/missinggo v1.3.0 // indirect
+	github.com/anacrolix/missinggo/perf v1.0.0 // indirect
+	github.com/anacrolix/missinggo/v2 v2.7.0 // indirect
+	github.com/anacrolix/mmsg v1.0.0 // indirect
+	github.com/anacrolix/multiless v0.2.1-0.20211218050420-533661eef5dc // indirect
+	github.com/anacrolix/stm v0.3.0 // indirect
+	github.com/anacrolix/sync v0.4.0 // indirect
+	github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 // indirect
+	github.com/anacrolix/utp v0.1.0 // indirect
+	github.com/bahlo/generic-list-go v0.2.0 // indirect
+	github.com/benbjohnson/immutable v0.3.0 // indirect
+	github.com/bits-and-blooms/bitset v1.2.0 // indirect
+	github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/edsrzf/mmap-go v1.1.0 // indirect
+	github.com/felixge/httpsnoop v1.0.1 // indirect
+	github.com/google/btree v1.0.1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/handlers v1.5.1 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/huandu/xstrings v1.3.2 // indirect
+	github.com/lispad/go-generics-tools v1.0.0 // indirect
+	github.com/mschoch/smat v0.2.0 // indirect
+	github.com/pion/datachannel v1.5.2 // indirect
+	github.com/pion/dtls/v2 v2.1.2 // indirect
+	github.com/pion/ice/v2 v2.1.20 // indirect
+	github.com/pion/interceptor v0.1.7 // indirect
+	github.com/pion/logging v0.2.2 // indirect
+	github.com/pion/mdns v0.0.5 // indirect
+	github.com/pion/randutil v0.1.0 // indirect
+	github.com/pion/rtcp v1.2.9 // indirect
+	github.com/pion/rtp v1.7.4 // indirect
+	github.com/pion/sctp v1.8.2 // indirect
+	github.com/pion/sdp/v3 v3.0.4 // indirect
+	github.com/pion/srtp/v2 v2.0.5 // indirect
+	github.com/pion/stun v0.3.5 // indirect
+	github.com/pion/transport v0.13.0 // indirect
+	github.com/pion/turn/v2 v2.0.6 // indirect
+	github.com/pion/udp v0.1.1 // indirect
+	github.com/pion/webrtc/v3 v3.1.24-0.20220208053747-94262c1b2b38 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rs/dnscache v0.0.0-20210201191234-295bba877686 // indirect
+	github.com/tidwall/btree v1.3.1 // indirect
+	golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect
+	golang.org/x/exp v0.0.0-20220428152302-39d4317da171 // indirect
+	golang.org/x/mobile v0.0.0-20220928052126-fa6bcb076835 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57 // indirect
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 )

internal/controller/controller.go

@@ -1,61 +1,42 @@
 package controller
 
 import (
-	"golang.org/x/net/proxy"
+	"errors"
-	"net"
 	"os"
-	"time"
+	"path/filepath"
 )
 
 type Controller interface {
 	Touch(name string, size int64) (file *os.File, err error)
-	Open(name string) (file *os.File, err error)
+	//ContextDialer() (proxy.Dialer, error)
-	Write(name string, offset int64, buf []byte) (int, error)
-	Close(name string) error
-	ContextDialer() (proxy.Dialer, error)
 }
 
 type DefaultController struct {
-	Files map[string]*os.File
 }
 
 func NewController() *DefaultController {
-	return &DefaultController{Files: make(map[string]*os.File)}
+	return &DefaultController{}
 }
 
 func (c *DefaultController) Touch(name string, size int64) (file *os.File, err error) {
+	dir := filepath.Dir(name)
+	if err = os.MkdirAll(dir, os.ModePerm); err != nil {
+		return
+	}
 	file, err = os.Create(name)
+	if err != nil && !errors.Is(err, os.ErrExist) {
+		return
+	}
 	if size > 0 {
 		err = os.Truncate(name, size)
 		if err != nil {
 			return nil, err
 		}
 	}
-	if err == nil {
-		c.Files[name] = file
-	}
 	return
 }
 
-func (c *DefaultController) Open(name string) (file *os.File, err error) {
+/*func (c *DefaultController) ContextDialer() (proxy.Dialer, error) {
-	file, err = os.OpenFile(name, os.O_RDWR, os.ModePerm)
-	if err == nil {
-		c.Files[name] = file
-	}
-	return
-}
-
-func (c *DefaultController) Write(name string, offset int64, buf []byte) (int, error) {
-	return c.Files[name].WriteAt(buf, offset)
-}
-
-func (c *DefaultController) Close(name string) error {
-	err := c.Files[name].Close()
-	delete(c.Files, name)
-	return err
-}
-
-func (c *DefaultController) ContextDialer() (proxy.Dialer, error) {
 	// return proxy.SOCKS5("tpc", "127.0.0.1:9999", nil, nil)
 	var dialer proxy.Dialer
 	return &DialerWarp{dialer: dialer}, nil
@@ -107,4 +88,4 @@ func (d *DialerWarp) Dial(network, addr string) (c net.Conn, err error) {
 		return nil, err
 	}
 	return &ConnWarp{conn: conn}, nil
-}
+}*/

internal/fetcher/fetcher.go

@@ -1,13 +1,13 @@
 package fetcher
 
 import (
-	"github.com/monkeyWie/gopeed-core/internal/controller"
+	"github.com/monkeyWie/gopeed/internal/controller"
-	"github.com/monkeyWie/gopeed-core/pkg/base"
+	"github.com/monkeyWie/gopeed/pkg/base"
 )
 
 // 对应协议的下载支持
 type Fetcher interface {
-	Setup(ctl controller.Controller)
+	Setup(ctl controller.Controller) error
 	// 解析请求
 	Resolve(req *base.Request) (res *base.Resource, err error)
 	// 创建任务
@@ -15,6 +15,7 @@ type Fetcher interface {
 	Start() (err error)
 	Pause() (err error)
 	Continue() (err error)
+	Close() (err error)
 
 	// 获取任务各个文件下载进度
 	Progress() Progress
@@ -22,14 +23,25 @@ type Fetcher interface {
 	Wait() (err error)
 }
 
+type FetcherBuilder interface {
+	Schemes() []string
+	Build() Fetcher
+
+	// Store 存储任务
+	Store(fetcher Fetcher) (any, error)
+	// Restore 恢复任务
+	Restore() (v any, f func(res *base.Resource, opts *base.Options, v any) Fetcher)
+}
+
 type DefaultFetcher struct {
 	Ctl    controller.Controller
 	DoneCh chan error
 }
 
-func (f *DefaultFetcher) Setup(ctl controller.Controller) {
+func (f *DefaultFetcher) Setup(ctl controller.Controller) (err error) {
 	f.Ctl = ctl
 	f.DoneCh = make(chan error, 1)
+	return
 }
 
 func (f *DefaultFetcher) Wait() (err error) {

internal/protocol/bt/fetcher.go

@@ -0,0 +1,222 @@
+package bt
+
+import (
+	"github.com/anacrolix/torrent"
+	"github.com/anacrolix/torrent/metainfo"
+	"github.com/anacrolix/torrent/storage"
+	"github.com/monkeyWie/gopeed/internal/controller"
+	"github.com/monkeyWie/gopeed/internal/fetcher"
+	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/monkeyWie/gopeed/pkg/util"
+	"path/filepath"
+	"sync"
+	"sync/atomic"
+	"time"
+)
+
+var client *torrent.Client
+
+type Fetcher struct {
+	Ctl controller.Controller
+
+	torrent *torrent.Torrent
+	res     *base.Resource
+	opts    *base.Options
+
+	ready    atomic.Bool
+	progress fetcher.Progress
+
+	torrentPaths map[string]string
+}
+
+func (f *Fetcher) Setup(ctl controller.Controller) (err error) {
+	f.Ctl = ctl
+	var once sync.Once
+	once.Do(func() {
+		cfg := torrent.NewDefaultClientConfig()
+		cfg.ListenPort = 0
+
+		// Support custom download path for each torrent
+		pieceCompletion, err := storage.NewDefaultPieceCompletionForDir(cfg.DataDir)
+		if err != nil {
+			pieceCompletion = storage.NewMapPieceCompletion()
+		}
+		clientImplCloser := storage.NewFileOpts(storage.NewFileClientOpts{
+			ClientBaseDir: cfg.DataDir,
+			TorrentDirMaker: func(baseDir string, info *metainfo.Info, infoHash metainfo.Hash) string {
+				if dir, ok := f.torrentPaths[infoHash.String()]; ok {
+					return dir
+				}
+				return baseDir
+			},
+			PieceCompletion: pieceCompletion,
+		})
+		cfg.DefaultStorage = clientImplCloser
+		client, err = torrent.NewClient(cfg)
+		if err != nil {
+			return
+		}
+
+		f.torrentPaths = make(map[string]string)
+	})
+	return
+}
+
+func (f *Fetcher) Wait() (err error) {
+	for {
+		if f.ready.Load() {
+			done := true
+			for _, selectIndex := range f.opts.SelectFiles {
+				file := f.torrent.Files()[selectIndex]
+				if file.BytesCompleted() < file.Length() {
+					done = false
+					break
+				}
+			}
+			if done {
+				// remove unselected files
+				for i, file := range f.torrent.Files() {
+					selected := false
+					for _, selectIndex := range f.opts.SelectFiles {
+						if i == selectIndex {
+							selected = true
+							break
+						}
+					}
+					if !selected {
+						util.SafeRemove(filepath.Join(f.opts.Path, file.Path()))
+					}
+				}
+				break
+			}
+		}
+		time.Sleep(time.Millisecond * 500)
+	}
+	return nil
+}
+
+func (f *Fetcher) Resolve(req *base.Request) (res *base.Resource, err error) {
+	if err = f.addTorrent(req.URL, true); err != nil {
+		return
+	}
+	defer f.torrent.Drop()
+	res = &base.Resource{
+		Req:   req,
+		Name:  f.torrent.Name(),
+		Range: true,
+		Files: make([]*base.FileInfo, len(f.torrent.Files())),
+		Extra: map[string]any{
+			"infoHash": f.torrent.InfoHash().String(),
+		},
+	}
+	for i, file := range f.torrent.Files() {
+		res.Files[i] = &base.FileInfo{
+			Name: filepath.Base(file.DisplayPath()),
+			Path: util.Dir(file.Path()),
+			Size: file.Length(),
+		}
+		res.Size += file.Length()
+	}
+	return
+}
+
+func (f *Fetcher) Create(res *base.Resource, opts *base.Options) (err error) {
+	f.res = res
+	f.opts = opts
+	if len(f.opts.SelectFiles) == 0 {
+		f.opts.SelectFiles = make([]int, 0)
+		for i := range f.torrent.Files() {
+			f.opts.SelectFiles = append(f.opts.SelectFiles, i)
+		}
+	}
+	if f.opts.Path != "" {
+		if extra, ok := res.Extra.(map[string]any); ok {
+			f.torrentPaths[extra["infoHash"].(string)] = f.opts.Path
+		}
+	}
+	f.progress = make(fetcher.Progress, len(f.opts.SelectFiles))
+	f.ready.Store(false)
+	return nil
+}
+
+func (f *Fetcher) Start() (err error) {
+	if err = f.addTorrent(f.res.Req.URL, false); err != nil {
+		return
+	}
+	files := f.torrent.Files()
+	if len(f.opts.SelectFiles) == len(files) {
+		f.torrent.DownloadAll()
+	} else {
+		for _, selectIndex := range f.opts.SelectFiles {
+			file := files[selectIndex]
+			file.Download()
+		}
+	}
+	return
+}
+
+func (f *Fetcher) Pause() (err error) {
+	f.ready.Store(false)
+	f.torrent.Drop()
+	return
+}
+
+func (f *Fetcher) Continue() (err error) {
+	return f.Start()
+}
+
+func (f *Fetcher) Close() (err error) {
+	f.torrent.Drop()
+	return nil
+}
+
+func (f *Fetcher) Progress() fetcher.Progress {
+	if !f.ready.Load() {
+		return f.progress
+	}
+	for i := range f.progress {
+		selectIndex := f.opts.SelectFiles[i]
+		file := f.torrent.Files()[selectIndex]
+		f.progress[i] = file.BytesCompleted()
+	}
+	return f.progress
+}
+
+func (f *Fetcher) addTorrent(url string, resolve bool) (err error) {
+	schema := util.ParseSchema(url)
+	if schema == "MAGNET" {
+		f.torrent, err = client.AddMagnet(url)
+	} else {
+		f.torrent, err = client.AddTorrentFromFile(url)
+	}
+	if err != nil {
+		return
+	}
+	<-f.torrent.GotInfo()
+	if resolve {
+		return
+	}
+	f.ready.Store(true)
+	return
+}
+
+type FetcherBuilder struct {
+}
+
+var schemes = []string{"FILE", "MAGNET"}
+
+func (fb *FetcherBuilder) Schemes() []string {
+	return schemes
+}
+
+func (fb *FetcherBuilder) Build() fetcher.Fetcher {
+	return &Fetcher{}
+}
+
+func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
+	return nil, nil
+}
+
+func (fb *FetcherBuilder) Restore() (v any, f func(res *base.Resource, opts *base.Options, v any) fetcher.Fetcher) {
+	return nil, nil
+}

internal/protocol/bt/fetcher_test.go

@@ -0,0 +1,44 @@
+package bt
+
+import (
+	"github.com/monkeyWie/gopeed/internal/controller"
+	"github.com/monkeyWie/gopeed/internal/fetcher"
+	"github.com/monkeyWie/gopeed/pkg/base"
+	"reflect"
+	"testing"
+)
+
+func TestFetcher_Resolve_Torrent(t *testing.T) {
+	fetcher := buildFetcher()
+	res, err := fetcher.Resolve(&base.Request{
+		URL: "./testdata/ubuntu-22.04-live-server-amd64.iso.torrent",
+	})
+	if err != nil {
+		panic(err)
+	}
+
+	want := &base.Resource{
+		Req:   res.Req,
+		Name:  "ubuntu-22.04-live-server-amd64.iso",
+		Size:  1466714112,
+		Range: true,
+		Files: []*base.FileInfo{
+			{
+				Name: "ubuntu-22.04-live-server-amd64.iso",
+				Size: 1466714112,
+			},
+		},
+		Extra: map[string]any{
+			"infoHash": "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
+		},
+	}
+	if !reflect.DeepEqual(want, res) {
+		t.Errorf("Resolve() got = %v, want %v", res, want)
+	}
+}
+
+func buildFetcher() fetcher.Fetcher {
+	fetcher := new(FetcherBuilder).Build()
+	fetcher.Setup(controller.NewController())
+	return fetcher
+}

internal/protocol/http/fetcher.go

@@ -4,15 +4,16 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/monkeyWie/gopeed-core/internal/fetcher"
+	"github.com/monkeyWie/gopeed/internal/fetcher"
-	"github.com/monkeyWie/gopeed-core/pkg/base"
+	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/monkeyWie/gopeed/pkg/util"
 	"golang.org/x/sync/errgroup"
 	"io"
-	"io/ioutil"
 	"mime"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
+	"os"
 	"path"
 	"path/filepath"
 	"strconv"
@@ -39,29 +40,14 @@ type Fetcher struct {
 	res    *base.Resource
 	opts   *base.Options
 	status base.Status
-	clients []*http.Response
+	chunks []*chunk
-	chunks  []*Chunk
 
+	file    *os.File
 	ctx     context.Context
 	cancel  context.CancelFunc
 	pauseCh chan interface{}
 }
 
-func NewFetcher() *Fetcher {
-	return &Fetcher{
-		DefaultFetcher: new(fetcher.DefaultFetcher),
-		pauseCh:        make(chan interface{}),
-	}
-}
-
-var protocols = []string{"HTTP", "HTTPS"}
-
-func FetcherBuilder() ([]string, func() fetcher.Fetcher) {
-	return protocols, func() fetcher.Fetcher {
-		return NewFetcher()
-	}
-}
-
 func (f *Fetcher) Resolve(req *base.Request) (*base.Resource, error) {
 	httpReq, err := buildRequest(nil, req)
 	if err != nil {
@@ -91,7 +77,7 @@ func (f *Fetcher) Resolve(req *base.Request) (*base.Resource, error) {
 			if err != nil {
 				return nil, err
 			}
-			res.TotalSize = parse
+			res.Size = parse
 		}
 	} else if base.HttpCodeOK == httpResp.StatusCode {
 		// 返回200响应码，不支持断点下载，通过Content-Length头获取文件大小，获取不到的话可能是chunked编码
@@ -101,38 +87,36 @@ func (f *Fetcher) Resolve(req *base.Request) (*base.Resource, error) {
 			if err != nil {
 				return nil, err
 			}
-			res.TotalSize = parse
+			res.Size = parse
 		}
 	} else {
 		return nil, NewRequestError(httpResp.StatusCode, httpResp.Status)
 	}
 	file := &base.FileInfo{
-		Size: res.TotalSize,
+		Size: res.Size,
 	}
 	contentDisposition := httpResp.Header.Get(base.HttpHeaderContentDisposition)
 	if contentDisposition != "" {
 		_, params, _ := mime.ParseMediaType(contentDisposition)
-		filename := params["filename"]
+		filename := params["filePath"]
 		if filename != "" {
 			file.Name = filename
 		}
 	}
-	// Get file filename by URL
+	// Get file filePath by URL
 	if file.Name == "" && strings.Count(req.URL, "/") > 2 {
 		file.Name = filepath.Base(req.URL)
 	}
-	// unknown file filename
+	// unknown file filePath
 	if file.Name == "" {
 		file.Name = "unknown"
 	}
 	res.Files = append(res.Files, file)
+	res.Name = file.Name
 	return res, nil
 }
 
 func (f *Fetcher) Create(res *base.Resource, opts *base.Options) error {
-	if opts.Connections != 1 && !res.Range {
-		opts.Connections = 1
-	}
 	f.res = res
 	f.opts = opts
 	f.status = base.DownloadStatusReady
@@ -141,58 +125,36 @@ func (f *Fetcher) Create(res *base.Resource, opts *base.Options) error {
 
 func (f *Fetcher) Start() (err error) {
 	// 创建文件
-	name := f.filename()
+	name := f.filepath()
-	_, err = f.Ctl.Touch(name, f.res.TotalSize)
+	f.file, err = f.Ctl.Touch(name, f.res.Size)
 	if err != nil {
 		return err
 	}
-	f.status = base.DownloadStatusStart
+	f.status = base.DownloadStatusRunning
-	if f.res.Range {
+	f.chunks = splitChunk(f.res, f.opts)
-		// 每个连接平均需要下载的分块大小
-		chunkSize := f.res.TotalSize / int64(f.opts.Connections)
-		f.chunks = make([]*Chunk, f.opts.Connections)
-		f.clients = make([]*http.Response, f.opts.Connections)
-		for i := 0; i < f.opts.Connections; i++ {
-			var (
-				begin = chunkSize * int64(i)
-				end   int64
-			)
-			if i == f.opts.Connections-1 {
-				// 最后一个分块需要保证把文件下载完
-				end = f.res.TotalSize - 1
-			} else {
-				end = begin + chunkSize - 1
-			}
-			chunk := NewChunk(begin, end)
-			f.chunks[i] = chunk
-		}
-	} else {
-		// 只支持单连接下载
-		f.chunks = make([]*Chunk, 1)
-		f.clients = make([]*http.Response, 1)
-		f.chunks[0] = NewChunk(0, 0)
-	}
 	f.fetch()
 	return
 }
 
 func (f *Fetcher) Pause() (err error) {
-	if base.DownloadStatusStart != f.status {
+	if base.DownloadStatusRunning != f.status {
 		return
 	}
 	f.status = base.DownloadStatusPause
+
+	if f.cancel != nil {
 		f.cancel()
 		<-f.pauseCh
+	}
 	return
 }
 
 func (f *Fetcher) Continue() (err error) {
-	if base.DownloadStatusStart == f.status || base.DownloadStatusDone == f.status {
+	if base.DownloadStatusRunning == f.status || base.DownloadStatusDone == f.status {
 		return
 	}
-	f.status = base.DownloadStatusStart
+	f.status = base.DownloadStatusRunning
-	var name = f.filename()
+	f.file, err = os.OpenFile(f.filepath(), os.O_RDWR, os.ModeAppend)
-	_, err = f.Ctl.Open(name)
 	if err != nil {
 		return err
 	}
@@ -200,6 +162,13 @@ func (f *Fetcher) Continue() (err error) {
 	return
 }
 
+func (f *Fetcher) Close() (err error) {
+	if err = f.Pause(); err != nil {
+		return
+	}
+	return
+}
+
 func (f *Fetcher) Progress() fetcher.Progress {
 	p := make(fetcher.Progress, 0)
 	if len(f.chunks) > 0 {
@@ -212,13 +181,8 @@ func (f *Fetcher) Progress() fetcher.Progress {
 	return p
 }
 
-func (f *Fetcher) filename() string {
+func (f *Fetcher) filepath() string {
-	// 创建文件
+	return util.Filepath(f.opts.Path, f.res.Files[0].Name, f.opts.Name)
-	var filename = f.opts.Name
-	if filename == "" {
-		filename = f.res.Files[0].Name
-	}
-	return filepath.Join(f.opts.Path, filename)
 }
 
 func (f *Fetcher) fetch() {
@@ -234,7 +198,7 @@ func (f *Fetcher) fetch() {
 	go func() {
 		err := eg.Wait()
 		// 下载停止，关闭文件句柄
-		f.Ctl.Close(f.filename())
+		f.file.Close()
 		if f.status == base.DownloadStatusPause {
 			f.pauseCh <- nil
 		} else {
@@ -249,7 +213,6 @@ func (f *Fetcher) fetch() {
 }
 
 func (f *Fetcher) fetchChunk(index int) (err error) {
-	filename := f.filename()
 	chunk := f.chunks[index]
 
 	httpReq, err := buildRequest(f.ctx, f.res.Req)
@@ -285,7 +248,6 @@ func (f *Fetcher) fetchChunk(index int) (err error) {
 			if err != nil {
 				return err
 			}
-			f.clients[index] = resp
 			if resp.StatusCode != base.HttpCodeOK && resp.StatusCode != base.HttpCodePartialContent {
 				err = NewRequestError(resp.StatusCode, resp.Status)
 				return err
@@ -303,7 +265,7 @@ func (f *Fetcher) fetchChunk(index int) (err error) {
 			for {
 				n, err := resp.Body.Read(buf)
 				if n > 0 {
-					_, err := f.Ctl.Write(filename, chunk.Begin+chunk.Downloaded, buf[:n])
+					_, err := f.file.WriteAt(buf[:n], chunk.Begin+chunk.Downloaded)
 					if err != nil {
 						return false, err
 					}
@@ -324,16 +286,44 @@ func (f *Fetcher) fetchChunk(index int) (err error) {
 		}
 	}
 
-	if f.status == base.DownloadStatusPause {
-		chunk.Status = base.DownloadStatusPause
-	} else if chunk.Downloaded >= chunk.End-chunk.Begin+1 {
-		chunk.Status = base.DownloadStatusDone
-	} else {
 	if err != nil {
 		chunk.Status = base.DownloadStatusError
-		} else {
+		return
-			chunk.Status = base.DownloadStatusDone
 	}
+
+	isComplete := f.res.Range && chunk.Downloaded >= chunk.End-chunk.Begin+1
+	if f.status == base.DownloadStatusPause && !isComplete {
+		chunk.Status = base.DownloadStatusPause
+		return
+	}
+
+	chunk.Status = base.DownloadStatusDone
+	return
+}
+
+func splitChunk(res *base.Resource, opts *base.Options) (chunks []*chunk) {
+	if res.Range {
+		// 每个连接平均需要下载的分块大小
+		chunkSize := res.Size / int64(opts.Connections)
+		chunks = make([]*chunk, opts.Connections)
+		for i := 0; i < opts.Connections; i++ {
+			var (
+				begin = chunkSize * int64(i)
+				end   int64
+			)
+			if i == opts.Connections-1 {
+				// 最后一个分块需要保证把文件下载完
+				end = res.Size - 1
+			} else {
+				end = begin + chunkSize - 1
+			}
+			chunk := newChunk(begin, end)
+			chunks[i] = chunk
+		}
+	} else {
+		// 只支持单连接下载
+		chunks = make([]*chunk, 1)
+		chunks[0] = newChunk(0, 0)
 	}
 	return
 }
@@ -343,7 +333,7 @@ func buildClient() *http.Client {
 	jar, _ := cookiejar.New(nil)
 	return &http.Client{
 		Jar:     jar,
-		Timeout: time.Second * 10,
+		Timeout: time.Second * 60,
 	}
 }
 
@@ -361,7 +351,7 @@ func buildRequest(ctx context.Context, req *base.Request) (httpReq *http.Request
 	if req.Extra == nil {
 		method = http.MethodGet
 	} else {
-		extra := req.Extra.(Extra)
+		extra := req.Extra.(extra)
 		if extra.Method != "" {
 			method = extra.Method
 		} else {
@@ -373,7 +363,7 @@ func buildRequest(ctx context.Context, req *base.Request) (httpReq *http.Request
 			}
 		}
 		if extra.Body != "" {
-			body = ioutil.NopCloser(bytes.NewBufferString(extra.Body))
+			body = bytes.NewBufferString(extra.Body)
 		}
 	}
 
@@ -388,3 +378,47 @@ func buildRequest(ctx context.Context, req *base.Request) (httpReq *http.Request
 	httpReq.Header = headers
 	return httpReq, nil
 }
+
+type fetcherData struct {
+	Chunks []*chunk
+}
+
+type FetcherBuilder struct {
+}
+
+var schemes = []string{"HTTP", "HTTPS"}
+
+func (fb *FetcherBuilder) Schemes() []string {
+	return schemes
+}
+
+func (fb *FetcherBuilder) Build() fetcher.Fetcher {
+	return &Fetcher{
+		DefaultFetcher: new(fetcher.DefaultFetcher),
+		pauseCh:        make(chan interface{}),
+	}
+}
+
+func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
+	_f := f.(*Fetcher)
+	return &fetcherData{
+		Chunks: _f.chunks,
+	}, nil
+}
+
+func (fb *FetcherBuilder) Restore() (v any, f func(res *base.Resource, opts *base.Options, v any) fetcher.Fetcher) {
+	return &fetcherData{}, func(res *base.Resource, opts *base.Options, v any) fetcher.Fetcher {
+		fd := v.(*fetcherData)
+		fb := &FetcherBuilder{}
+		fetcher := fb.Build().(*Fetcher)
+		fetcher.res = res
+		fetcher.opts = opts
+		fetcher.status = base.DownloadStatusPause
+		if len(fd.Chunks) == 0 {
+			fetcher.chunks = splitChunk(res, opts)
+		} else {
+			fetcher.chunks = fd.Chunks
+		}
+		return fetcher
+	}
+}

internal/protocol/http/fetcher_test.go

@@ -1,10 +1,11 @@
 package http
 
 import (
-	"github.com/monkeyWie/gopeed-core/internal/controller"
+	"fmt"
-	"github.com/monkeyWie/gopeed-core/internal/fetcher"
+	"github.com/monkeyWie/gopeed/internal/controller"
-	"github.com/monkeyWie/gopeed-core/pkg/base"
+	"github.com/monkeyWie/gopeed/internal/fetcher"
-	"github.com/monkeyWie/gopeed-core/pkg/test"
+	"github.com/monkeyWie/gopeed/internal/test"
+	"github.com/monkeyWie/gopeed/pkg/base"
 	"net"
 	"reflect"
 	"testing"
@@ -13,7 +14,8 @@ import (
 
 func TestFetcher_Resolve(t *testing.T) {
 	testResolve(test.StartTestFileServer, &base.Resource{
-		TotalSize: test.BuildSize,
+		Name:  test.BuildName,
+		Size:  test.BuildSize,
 		Range: true,
 		Files: []*base.FileInfo{
 			{
@@ -23,7 +25,8 @@ func TestFetcher_Resolve(t *testing.T) {
 		},
 	}, t)
 	testResolve(test.StartTestChunkedServer, &base.Resource{
-		TotalSize: 0,
+		Name:  test.BuildName,
+		Size:  0,
 		Range: false,
 		Files: []*base.FileInfo{
 			{
@@ -37,7 +40,7 @@ func TestFetcher_Resolve(t *testing.T) {
 func testResolve(startTestServer func() net.Listener, want *base.Resource, t *testing.T) {
 	listener := startTestServer()
 	defer listener.Close()
-	fetcher := NewFetcher()
+	fetcher := buildFetcher()
 	res, err := fetcher.Resolve(&base.Request{
 		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
 	})
@@ -46,7 +49,7 @@ func testResolve(startTestServer func() net.Listener, want *base.Resource, t *te
 	}
 	res.Req = nil
 	if !reflect.DeepEqual(want, res) {
-		t.Errorf("Resolve error = %v, want %v", res, want)
+		t.Errorf("Resolve() got = %v, want %v", res, want)
 	}
 }
 
@@ -75,7 +78,13 @@ func TestFetcher_DownloadChunked(t *testing.T) {
 	defer listener.Close()
 	// chunked编码下载
 	downloadNormal(listener, 1, t)
-	downloadContinue(listener, 1, t)
+}
+
+func TestFetcher_DownloadPost(t *testing.T) {
+	listener := test.StartTestPostServer()
+	defer listener.Close()
+	// post下载
+	downloadPost(listener, 1, t)
 }
 
 func TestFetcher_DownloadRetry(t *testing.T) {
@@ -92,29 +101,38 @@ func TestFetcher_DownloadError(t *testing.T) {
 	downloadError(listener, 1, t)
 }
 
-func downloadReady(listener net.Listener, connections int, t *testing.T) fetcher.Fetcher {
+func TestFetcher_DownloadResume(t *testing.T) {
-	fetcher := NewFetcher()
+	listener := test.StartTestFileServer()
-	fetcher.Setup(controller.NewController())
+	defer listener.Close()
+
+	downloadResume(listener, 1, t)
+	downloadResume(listener, 5, t)
+	downloadResume(listener, 8, t)
+	downloadResume(listener, 16, t)
+}
+
+func downloadReady(listener net.Listener, connections int, t *testing.T) (fetcher fetcher.Fetcher, res *base.Resource, opts *base.Options) {
+	fetcher = buildFetcher()
 	res, err := fetcher.Resolve(&base.Request{
 		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = fetcher.Create(res, &base.Options{
+	opts = &base.Options{
 		Name:        test.DownloadName,
 		Path:        test.Dir,
 		Connections: connections,
-	})
+	}
+	err = fetcher.Create(res, opts)
 	if err != nil {
 		t.Fatal(err)
 	}
-	return fetcher
+	return
-
 }
 
 func downloadNormal(listener net.Listener, connections int, t *testing.T) {
-	fetcher := downloadReady(listener, connections, t)
+	fetcher, _, _ := downloadReady(listener, connections, t)
 	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)
@@ -126,21 +144,45 @@ func downloadNormal(listener net.Listener, connections int, t *testing.T) {
 	want := test.FileMd5(test.BuildFile)
 	got := test.FileMd5(test.DownloadFile)
 	if want != got {
-		t.Errorf("Download error = %v, want %v", got, want)
+		t.Errorf("Download() got = %v, want %v", got, want)
 	}
 }
 
-func downloadContinue(listener net.Listener, connections int, t *testing.T) {
+func downloadPost(listener net.Listener, connections int, t *testing.T) {
-	fetcher := downloadReady(listener, connections, t)
+	fetcher, _, _ := downloadReady(listener, connections, t)
+	fetcher.(*Fetcher).res.Req.Extra = extra{
+		Method: "POST",
+		Header: map[string]string{
+			"Authorization": "Bearer 123456",
+		},
+		Body: fmt.Sprintf(`{"name":"%s"}`, test.BuildName),
+	}
 	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)
 	}
-	time.Sleep(time.Millisecond * 200)
+	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 downloadContinue(listener net.Listener, connections int, t *testing.T) {
+	fetcher, _, _ := downloadReady(listener, connections, t)
+	err := fetcher.Start()
+	if err != nil {
+		t.Fatal(err)
+	}
+	time.Sleep(time.Millisecond * 50)
 	if err := fetcher.Pause(); err != nil {
 		t.Fatal(err)
 	}
-	time.Sleep(time.Millisecond * 200)
+	time.Sleep(time.Millisecond * 50)
 	if err := fetcher.Continue(); err != nil {
 		t.Fatal(err)
 	}
@@ -151,18 +193,59 @@ func downloadContinue(listener net.Listener, connections int, t *testing.T) {
 	want := test.FileMd5(test.BuildFile)
 	got := test.FileMd5(test.DownloadFile)
 	if want != got {
-		t.Errorf("Download error = %v, want %v", got, want)
+		t.Errorf("Download() got = %v, want %v", got, want)
 	}
 }
 
 func downloadError(listener net.Listener, connections int, t *testing.T) {
-	fetcher := downloadReady(listener, connections, t)
+	fetcher, _, _ := downloadReady(listener, connections, t)
 	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)
 	}
 	err = fetcher.Wait()
 	if err == nil {
-		t.Errorf("Download error = %v, want %v", err, nil)
+		t.Errorf("Download() got = %v, want %v", err, nil)
 	}
 }
+
+func downloadResume(listener net.Listener, connections int, t *testing.T) {
+	fetcher, res, opts := downloadReady(listener, connections, t)
+	err := fetcher.Start()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	fb := new(FetcherBuilder)
+	time.Sleep(time.Millisecond * 50)
+	data, err := fb.Store(fetcher)
+	if err != nil {
+		t.Fatal(err)
+	}
+	time.Sleep(time.Millisecond * 50)
+	fetcher.Pause()
+
+	_, f := fb.Restore()
+	f(res, opts, data)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fetcher.Setup(controller.NewController())
+	fetcher.Continue()
+
+	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)
+}

internal/protocol/http/model.go

@@ -1,23 +1,23 @@
 package http
 
-import "github.com/monkeyWie/gopeed-core/pkg/base"
+import "github.com/monkeyWie/gopeed/pkg/base"
 
-type Chunk struct {
+type chunk struct {
 	Status     base.Status
 	Begin      int64
 	End        int64
 	Downloaded int64
 }
 
-func NewChunk(begin int64, end int64) *Chunk {
+func newChunk(begin int64, end int64) *chunk {
-	return &Chunk{
+	return &chunk{
 		Status: base.DownloadStatusReady,
 		Begin:  begin,
 		End:    end,
 	}
 }
 
-type Extra struct {
+type extra struct {
 	Method string
 	Header map[string]string
 	Body   string

internal/test/httptest.go

@@ -1,12 +1,14 @@
 package test
 
 import (
+	"encoding/json"
 	"fmt"
 	"io"
 	"math/rand"
 	"net"
 	"net/http"
 	"os"
+	"time"
 )
 
 const (
@@ -25,6 +27,25 @@ func StartTestFileServer() net.Listener {
 	})
 }
 
+type SlowFileServer struct {
+	delay   time.Duration
+	handler http.Handler
+}
+
+func (s *SlowFileServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	time.Sleep(s.delay)
+	s.handler.ServeHTTP(w, r)
+}
+
+func StartTestSlowFileServer(delay time.Duration) net.Listener {
+	return startTestServer(func() http.Handler {
+		return &SlowFileServer{
+			delay:   delay,
+			handler: http.FileServer(http.Dir(Dir)),
+		}
+	})
+}
+
 func StartTestChunkedServer() net.Listener {
 	return startTestServer(func() http.Handler {
 		mux := http.NewServeMux()
@@ -61,6 +82,29 @@ func StartTestRetryServer() net.Listener {
 	})
 }
 
+func StartTestPostServer() net.Listener {
+	return startTestServer(func() http.Handler {
+		mux := http.NewServeMux()
+		mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
+			if request.Method == "POST" && request.Header.Get("Authorization") != "" {
+				var data map[string]interface{}
+				if err := json.NewDecoder(request.Body).Decode(&data); err != nil {
+					panic(err)
+				}
+				if data["name"] == BuildName {
+					file, err := os.Open(BuildFile)
+					if err != nil {
+						panic(err)
+					}
+					defer file.Close()
+					io.Copy(writer, file)
+				}
+			}
+		})
+		return mux
+	})
+}
+
 func StartTestErrorServer() net.Listener {
 	counter := 0
 	return startTestServer(func() http.Handler {

internal/test/util.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"io"
 	"os"
+	"path/filepath"
 )
 
 func FileMd5(filePath string) string {
@@ -26,6 +27,24 @@ func FileMd5(filePath string) string {
 	return hex.EncodeToString(hash.Sum(nil))
 }
 
+func DirMd5(dirPath string) string {
+	hash := md5.New()
+	filepath.Walk(dirPath, func(path string, info os.FileInfo, err error) error {
+		if info.IsDir() {
+			return nil
+		}
+		file, err := os.Open(path)
+		if err != nil {
+			return err
+		}
+		if _, err := io.Copy(hash, file); err != nil {
+			return err
+		}
+		return nil
+	})
+	return hex.EncodeToString(hash.Sum(nil))
+}
+
 func ToJson(v interface{}) string {
 	buf, _ := json.Marshal(v)
 	return string(buf)

main.go

@@ -1,23 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/monkeyWie/gopeed-core/pkg/protocol/http"
-)
-
-func main() {
-	request := &http.Request{
-		Method: "get",
-		URL:    "http://github.com/proxyee-down-org/proxyee-down/releases/download/3.4/proxyee-down-main.jar",
-		Header: map[string]string{
-			"Host":            "github.com",
-			"User-Agent":      "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36",
-			"Accept":          "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8",
-			"Referer":         "http://github.com/proxyee-down-org/proxyee-down/releases",
-			"Accept-Encoding": "gzip, deflate, br",
-			"Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
-		},
-	}
-	got, _ := http.Resolve(request)
-	fmt.Println(got)
-}

pkg/base/constants.go

@@ -1,15 +1,13 @@
 package base
 
-import "errors"
+type Status string
-
-type Status int
 
 const (
-	DownloadStatusReady Status = iota
+	DownloadStatusReady   Status = "ready"
-	DownloadStatusStart
+	DownloadStatusRunning Status = "running"
-	DownloadStatusPause
+	DownloadStatusPause   Status = "pause"
-	DownloadStatusError
+	DownloadStatusError   Status = "error"
-	DownloadStatusDone
+	DownloadStatusDone    Status = "done"
 )
 
 const (
@@ -23,7 +21,3 @@ const (
 
 	HttpHeaderRangeFormat = "bytes=%d-%d"
 )
-
-var (
-	DeleteErr = errors.New("delete")
-)

pkg/base/model.go

@@ -3,34 +3,40 @@ package base
 // 下载请求
 type Request struct {
 	// 下载链接
-	URL string
+	URL string `json:"url"`
 	// 附加信息
-	Extra interface{}
+	Extra interface{} `json:"extra"`
 }
 
 // 资源信息
 type Resource struct {
-	Req *Request
+	Req *Request `json:"req"`
+	// 资源名称
+	Name string `json:"name"`
 	// 资源总大小
-	TotalSize int64
+	Size int64 `json:"size"`
 	// 是否支持断点下载
-	Range bool
+	Range bool `json:"range"`
 	// 资源所包含的文件列表
-	Files []*FileInfo
+	Files []*FileInfo `json:"files"`
+	// 附加信息
+	Extra interface{} `json:"extra"`
 }
 
 type FileInfo struct {
-	Name string
+	Name string `json:"name"`
-	Path string
+	Path string `json:"path"`
-	Size int64
+	Size int64  `json:"size"`
 }
 
 // 下载选项
 type Options struct {
 	// 保存文件名
-	Name string
+	Name string `json:"name"`
 	// 保存目录
-	Path string
+	Path string `json:"path"`
 	// 并发连接数
-	Connections int
+	Connections int `json:"connections"`
+	// 选择下载的文件下标列表
+	SelectFiles []int `json:"selectFiles"`
 }

pkg/download/downloader_test.go

@@ -1,19 +1,23 @@
 package download
 
 import (
-	"github.com/monkeyWie/gopeed-core/internal/protocol/http"
+	"github.com/monkeyWie/gopeed/internal/test"
-	"github.com/monkeyWie/gopeed-core/pkg/base"
+	"github.com/monkeyWie/gopeed/pkg/base"
-	"github.com/monkeyWie/gopeed-core/pkg/test"
 	"reflect"
 	"sync"
 	"testing"
+	"time"
 )
 
 func TestDownloader_Resolve(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()
 
-	downloader := NewDownloader(http.FetcherBuilder)
+	downloader := NewDownloader(nil)
+	if err := downloader.Setup(); err != nil {
+		t.Fatal(err)
+	}
+	defer downloader.Clear()
 	req := &base.Request{
 		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
 	}
@@ -22,8 +26,9 @@ func TestDownloader_Resolve(t *testing.T) {
 		t.Fatal(err)
 	}
 	want := &base.Resource{
+		Name:  test.BuildName,
 		Req:   req,
-		TotalSize: test.BuildSize,
+		Size:  test.BuildSize,
 		Range: true,
 		Files: []*base.FileInfo{
 			{
@@ -33,8 +38,8 @@ func TestDownloader_Resolve(t *testing.T) {
 			},
 		},
 	}
-	if !reflect.DeepEqual(res, want) {
+	if !reflect.DeepEqual(want, res) {
-		t.Errorf("Resolve error = %s, want %s", test.ToJson(res), test.ToJson(want))
+		t.Errorf("Resolve() got = %v, want %v", res, want)
 	}
 }
 
@@ -42,7 +47,11 @@ func TestDownloader_Create(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()
 
-	downloader := NewDownloader(http.FetcherBuilder)
+	downloader := NewDownloader(nil)
+	if err := downloader.Setup(); err != nil {
+		t.Fatal(err)
+	}
+	defer downloader.Clear()
 	req := &base.Request{
 		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
 	}
@@ -53,12 +62,12 @@ func TestDownloader_Create(t *testing.T) {
 
 	var wg sync.WaitGroup
 	wg.Add(1)
-	downloader.Listener(func(taskInfo *TaskInfo, eventKey EventKey) {
+	downloader.Listener(func(event *Event) {
-		if eventKey == EventKeyDone {
+		if event.Key == EventKeyDone {
 			wg.Done()
 		}
 	})
-	err = downloader.Create(res, &base.Options{
+	_, err = downloader.Create(res, &base.Options{
 		Path:        test.Dir,
 		Name:        test.DownloadName,
 		Connections: 4,
@@ -70,6 +79,72 @@ func TestDownloader_Create(t *testing.T) {
 	want := test.FileMd5(test.BuildFile)
 	got := test.FileMd5(test.DownloadFile)
 	if want != got {
-		t.Errorf("Download error = %v, want %v", got, want)
+		t.Errorf("Download() got = %v, want %v", got, want)
 	}
 }
+
+func TestDownloader_StoreAndRestore(t *testing.T) {
+	listener := test.StartTestSlowFileServer(time.Millisecond * 2000)
+	defer listener.Close()
+
+	downloader := NewDownloader(&DownloaderConfig{
+		Storage: NewBoltStorage("./"),
+	})
+	if err := downloader.Setup(); err != nil {
+		t.Fatal(err)
+	}
+	defer downloader.Clear()
+	req := &base.Request{
+		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
+	}
+	res, err := downloader.Resolve(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	id, err := downloader.Create(res, &base.Options{
+		Path:        test.Dir,
+		Name:        test.DownloadName,
+		Connections: 4,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	time.Sleep(time.Millisecond * 1001)
+	err = downloader.Pause(id)
+	if err != nil {
+		t.Fatal(err)
+	}
+	downloader.Close()
+
+	downloader = NewDownloader(&DownloaderConfig{
+		Storage: NewBoltStorage("./"),
+	})
+	if err := downloader.Setup(); err != nil {
+		t.Fatal(err)
+	}
+	task := downloader.GetTask(id)
+
+	if task == nil {
+		t.Fatal("task is nil")
+	}
+	var wg sync.WaitGroup
+	wg.Add(1)
+	downloader.Listener(func(event *Event) {
+		if event.Key == EventKeyDone {
+			wg.Done()
+		}
+	})
+	err = downloader.Continue(id)
+	wg.Wait()
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := test.FileMd5(test.BuildFile)
+	got := test.FileMd5(test.DownloadFile)
+	if want != got {
+		t.Errorf("StoreAndResume() got = %v, want %v", got, want)
+	}
+
+	downloader.Clear()
+}

pkg/download/event.go

@@ -8,10 +8,13 @@ const (
 	EventKeyContinue = "continue"
 	EventKeyProgress = "progress"
 	EventKeyError    = "error"
+	EventKeyDelete   = "delete"
 	EventKeyDone     = "done"
+	EventKeyFinally  = "finally"
 )
 
 type Event struct {
-	EventKey
+	Key  EventKey
-	TaskInfo
+	Task *Task
+	Err  error
 }

pkg/download/storage.go

@@ -0,0 +1,228 @@
+package download
+
+import (
+	"encoding/json"
+	"go.etcd.io/bbolt"
+	"os"
+	"path/filepath"
+	"reflect"
+)
+
+type Storage interface {
+	Setup(buckets []string) error
+	Put(bucket string, key string, v any) error
+	Get(bucket string, key string, v any) (bool, error)
+	List(bucket string, v any) error
+	Pop(bucket string, key string, v any) error
+	Delete(bucket string, key string) error
+
+	Close() error
+	Clear() error
+}
+
+func changeValue(p any, v any) {
+	if v == nil {
+		return
+	}
+	rp := reflect.ValueOf(p)
+	rv := reflect.ValueOf(v)
+	if rv.Kind() == reflect.Slice {
+		if rv.Len() == 0 {
+			return
+		}
+		// get underlying type
+		tp := reflect.TypeOf(p).Elem().Elem()
+		for i := 0; i < rv.Len(); i++ {
+			// convert to underlying type
+			vv := rv.Index(i).Elem().Convert(tp)
+			rp.Elem().Set(reflect.Append(rp.Elem(), vv))
+		}
+	} else if rv.Kind() == reflect.Ptr {
+		rp.Elem().Set(rv.Elem())
+	} else {
+		rp.Elem().Set(rv)
+	}
+}
+
+var memData = make(map[string]map[string]any)
+
+type MemStorage struct {
+}
+
+func NewMemStorage() *MemStorage {
+	return &MemStorage{}
+}
+
+func (n *MemStorage) Setup(buckets []string) error {
+	for _, bucket := range buckets {
+		if _, ok := memData[bucket]; !ok {
+			memData[bucket] = make(map[string]any)
+		}
+	}
+	return nil
+}
+
+func (n *MemStorage) Put(bucket string, key string, v any) error {
+	memData[bucket][key] = v
+	return nil
+}
+
+func (n *MemStorage) Get(bucket string, key string, v any) (bool, error) {
+	if dv, ok := memData[bucket][key]; ok {
+		changeValue(v, dv)
+		return true, nil
+	}
+	return false, nil
+}
+
+func (n *MemStorage) List(bucket string, v any) error {
+	data := memData[bucket]
+	list := make([]any, 0)
+	for _, v := range data {
+		list = append(list, v)
+	}
+	changeValue(v, list)
+	return nil
+}
+
+func (n *MemStorage) Pop(bucket string, key string, v any) error {
+	data := memData[bucket]
+	changeValue(v, data[key])
+	delete(data, key)
+	return nil
+}
+
+func (n *MemStorage) Delete(bucket string, key string) error {
+	delete(memData[bucket], key)
+	return nil
+}
+
+func (n *MemStorage) Close() error {
+	return nil
+}
+
+func (n *MemStorage) Clear() error {
+	memData = make(map[string]map[string]any)
+	return nil
+}
+
+const (
+	dbFile = "gopeed.db"
+)
+
+type BoltStorage struct {
+	db   *bbolt.DB
+	path string
+}
+
+func NewBoltStorage(dir string) *BoltStorage {
+	path := filepath.Join(dir, dbFile)
+	db, err := bbolt.Open(path, 0600, nil)
+	if err != nil {
+		panic(err)
+	}
+	return &BoltStorage{
+		db:   db,
+		path: path,
+	}
+}
+
+func (b *BoltStorage) Setup(buckets []string) error {
+	return b.db.Update(func(tx *bbolt.Tx) error {
+		for _, bucket := range buckets {
+			_, err := tx.CreateBucketIfNotExists([]byte(bucket))
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+}
+
+func (b *BoltStorage) Put(bucket string, key string, v any) error {
+	buf, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+	return b.db.Update(func(tx *bbolt.Tx) error {
+		b := tx.Bucket([]byte(bucket))
+		return b.Put([]byte(key), buf)
+	})
+}
+
+func (b *BoltStorage) Get(bucket string, key string, v any) (bool, error) {
+	var data []byte
+	err := b.db.View(func(tx *bbolt.Tx) error {
+		b := tx.Bucket([]byte(bucket))
+		data = b.Get([]byte(key))
+		return nil
+	})
+	if err != nil {
+		return false, err
+	}
+	if data == nil {
+		return false, nil
+	}
+	if err := json.Unmarshal(data, v); err != nil {
+		return false, err
+	}
+	return true, nil
+}
+
+func (b *BoltStorage) List(bucket string, v any) error {
+	list := make([]any, 0)
+	tv := reflect.TypeOf(v).Elem().Elem()
+	if err := b.db.View(func(tx *bbolt.Tx) error {
+		b := tx.Bucket([]byte(bucket))
+		if err := b.ForEach(func(k, v []byte) error {
+			data := reflect.New(tv.Elem()).Interface()
+			if err := json.Unmarshal(v, &data); err != nil {
+				return err
+			}
+			list = append(list, data)
+			return nil
+		}); err != nil {
+			return err
+		}
+		return nil
+	}); err != nil {
+		return err
+	}
+	changeValue(v, list)
+	return nil
+}
+
+func (b *BoltStorage) Pop(bucket string, key string, v any) error {
+	var data []byte
+	err := b.db.Update(func(tx *bbolt.Tx) error {
+		b := tx.Bucket([]byte(bucket))
+		kb := []byte(key)
+		data = b.Get(kb)
+		return b.Delete(kb)
+	})
+	if err != nil {
+		return err
+	}
+	return json.Unmarshal(data, v)
+}
+
+func (b *BoltStorage) Delete(bucket string, key string) error {
+	return b.db.Update(func(tx *bbolt.Tx) error {
+		b := tx.Bucket([]byte(bucket))
+		return b.Delete([]byte(key))
+	})
+}
+
+func (b *BoltStorage) Close() error {
+	return b.db.Close()
+}
+
+func (b *BoltStorage) Clear() error {
+	if err := b.Close(); err != nil {
+		return err
+	}
+	if err := os.Remove(b.path); err != nil {
+		return err
+	}
+	return nil
+}

pkg/download/task.go

@@ -0,0 +1,49 @@
+package download
+
+import (
+	gonanoid "github.com/matoous/go-nanoid/v2"
+	"github.com/monkeyWie/gopeed/internal/fetcher"
+	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/monkeyWie/gopeed/pkg/util"
+	"sync"
+	"time"
+)
+
+type Task struct {
+	ID        string         `json:"id"`
+	Res       *base.Resource `json:"res"`
+	Opts      *base.Options  `json:"opts"`
+	Status    base.Status    `json:"status"`
+	Progress  *Progress      `json:"progress"`
+	Size      int64          `json:"size"`
+	CreatedAt time.Time      `json:"createdAt"`
+
+	fetcherBuilder fetcher.FetcherBuilder
+	fetcher        fetcher.Fetcher
+	timer          *util.Timer
+	lock           *sync.Mutex
+}
+
+func NewTask() *Task {
+	id, err := gonanoid.New()
+	if err != nil {
+		panic(err)
+	}
+	return &Task{
+		ID:        id,
+		Status:    base.DownloadStatusReady,
+		CreatedAt: time.Now(),
+	}
+}
+
+func (t *Task) clone() *Task {
+	return &Task{
+		ID:        t.ID,
+		Res:       t.Res,
+		Opts:      t.Opts,
+		Status:    t.Status,
+		Progress:  t.Progress,
+		Size:      t.Size,
+		CreatedAt: t.CreatedAt,
+	}
+}

pkg/protocol/bt/client.go

@@ -1,57 +0,0 @@
-package bt
-
-import (
-	"crypto/rand"
-	"github.com/monkeyWie/gopeed-core/pkg/protocol/bt/metainfo"
-	"github.com/monkeyWie/gopeed-core/pkg/protocol/bt/torrent"
-	"net/url"
-)
-
-type Client struct {
-	PeerID [20]byte
-
-	// torrents []torrent.Torrent
-}
-
-func NewClient() *Client {
-	client := &Client{}
-
-	// 生成Peer ID，规则为前三位固定字母(-GP)+SemVer(xyz)+End(-),后面随机生成
-	// 参考：https://wiki.theory.org/index.php/BitTorrentSpecification#peer_id
-	peerID := [20]byte{'-', 'G', 'P', '0', '0', '1', '-'}
-	_, err := rand.Read(peerID[7:])
-	if err != nil {
-		panic(err)
-	}
-	client.PeerID = peerID
-
-	return client
-}
-
-func (client *Client) AddTorrent(rawurl string) error {
-	parse, err := url.Parse(rawurl)
-	if err != nil {
-		return err
-	}
-	var metaInfo *metainfo.MetaInfo
-	switch parse.Scheme {
-	case "magnet":
-	// TODO 磁力链接解析
-	default:
-		metaInfo, err = metainfo.ParseFromFile(rawurl)
-		break
-	}
-	if err != nil {
-		return err
-	}
-
-	torrent := torrent.Torrent{
-		// client:   client,
-		MetaInfo: metaInfo,
-	}
-	// client.torrents = append(client.torrents, torrent)
-
-	torrent.Download("")
-
-	return nil
-}

pkg/protocol/bt/client_test.go

@@ -1,21 +0,0 @@
-package bt
-
-import (
-	"testing"
-)
-
-func TestClient_AddTorrent(t *testing.T) {
-	/*client := NewClient()
-	metaInfo, err := metainfo.ParseFromFile("testdata/Game.of.Thrones.S08E05.720p.WEB.H264-MEMENTO.torrent")
-	if err != nil {
-		panic(err)
-	}
-	torrent := &
-	torrent.MetaInfo.Announce = "udp://tracker.opentrackr.org:1337/announce"
-	torrent.MetaInfo.AnnounceList = [][]string{}
-	err = torrent.Tracker()
-	if err != nil {
-		panic(err)
-		return
-	}*/
-}

pkg/protocol/bt/dht/ping.go

@@ -1,34 +0,0 @@
-package dht
-
-import (
-	"github.com/marksamman/bencode"
-	"net"
-)
-
-func ping() string {
-	data := map[string]interface{}{
-		"t": "aa",
-		"y": "q",
-		"q": "ping",
-		"a": map[string]interface{}{"id": "abcdefghij0123456789"},
-	}
-	req := bencode.Encode(data)
-	// session.add_dht_router("router.utorrent.com", 6881)
-	// session.add_dht_router("router.bittorrent.com", 6881)
-	// session.add_dht_router("dht.transmissionbt.com", 6881)
-	// session.add_dht_router("router.bitcomet.com", 6881)
-	// session.add_dht_router("dht.aelitis.com", 6881)
-	dial, err := net.Dial("udp", "router.utorrent.com:6881")
-	if err != nil {
-		panic(err)
-	}
-	dial.Write(req)
-
-	reps := make([]byte, 65535)
-
-	n, err := dial.Read(reps)
-	if err != nil {
-		panic(err)
-	}
-	return string(reps[:n])
-}

pkg/protocol/bt/dht/ping_test.go

@@ -1,7 +0,0 @@
-package dht
-
-import "testing"
-
-func Test_ping(t *testing.T) {
-	println(ping())
-}

pkg/protocol/bt/metainfo/metainfo.go

@@ -1,144 +0,0 @@
-package metainfo
-
-import (
-	"crypto/sha1"
-	"encoding/json"
-	"os"
-
-	"github.com/marksamman/bencode"
-)
-
-type MetaInfo struct {
-	// tracker URL
-	// http://bittorrent.org/beps/bep_0003.html#metainfo-files
-	Announce string `json:"announce"`
-	// tracker URL
-	// http://bittorrent.org/beps/bep_0012.html
-	AnnounceList [][]string `json:"announce-list"`
-	Comment      string     `json:"comment"`
-	CreatedBy    string     `json:"created by"`
-	CreationDate int64      `json:"creation date"`
-	Encoding     string     `json:"encoding"`
-	// http://bittorrent.org/beps/bep_0019.html
-	UrlList []string `json:"url-list"`
-	Info    *Info    `json:"info"`
-
-	infoHash    [20]byte
-	totalSize   uint64
-	fileDetails []*FileDetail
-}
-
-type Info struct {
-	Name        string `json:"name"`
-	PieceLength int    `json:"piece length"`
-	Pieces      [][20]byte
-	// 单个文件时，length为该文件的长度
-	Length uint64 `json:"length"`
-	// 多个文件
-	Files []*File `json:"files"`
-}
-
-type File struct {
-	Length uint64   `json:"length"`
-	Path   []string `json:"path"`
-}
-
-type FileDetail struct {
-	Length uint64
-	Path   []string
-	Begin  int64
-	End    int64
-}
-
-type PieceMapping struct {
-	file  int
-	begin int64
-	end   int64
-}
-
-func ParseFromFile(path string) (*MetaInfo, error) {
-	file, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	// http://bittorrent.org/beps/bep_0003.html#bencoding
-	btDecode, err := bencode.Decode(file)
-	if err != nil {
-		return nil, err
-	}
-	bytes, err := json.Marshal(btDecode)
-	if err != nil {
-		return nil, err
-	}
-	var metaInfo MetaInfo
-	json.Unmarshal(bytes, &metaInfo)
-	if metaInfo.Info != nil {
-		// encode info hash
-		info := btDecode["info"].(map[string]interface{})
-		infoBtEncode := bencode.Encode(info)
-		metaInfo.infoHash = sha1.Sum(infoBtEncode[:])
-		// Split pieces hash
-		pieces := info["pieces"].(string)
-		if pieces != "" {
-			metaInfo.Info.Pieces = make([][20]byte, len(pieces)/20)
-			// pieces parse
-			for i := range metaInfo.Info.Pieces {
-				begin := i * 20
-				metaInfo.Info.Pieces[i] = [20]byte{}
-				copy(metaInfo.Info.Pieces[i][:], pieces[begin:begin+20])
-			}
-		}
-	}
-	calcFileSize(&metaInfo)
-	return &metaInfo, nil
-}
-
-// 获取某个分片的大小
-func (metaInfo *MetaInfo) GetPieceLength(index int) int {
-	// 是否为最后一个分片
-	if index == len(metaInfo.Info.Pieces)-1 {
-		size := metaInfo.totalSize % uint64(metaInfo.Info.PieceLength)
-		if size > 0 {
-			return int(size)
-		}
-	}
-	return metaInfo.Info.PieceLength
-}
-
-// 获取所有文件的大小
-func (metaInfo *MetaInfo) GetTotalSize() uint64 {
-	return metaInfo.totalSize
-}
-
-// 获取info hash
-func (metaInfo *MetaInfo) GetInfoHash() [20]byte {
-	return metaInfo.infoHash
-}
-
-// 获取所有文件的开始偏移字节
-func (metaInfo *MetaInfo) GetFileDetails() []*FileDetail {
-	return metaInfo.fileDetails
-}
-
-// 计算所有文件的大小
-func calcFileSize(metaInfo *MetaInfo) {
-	if metaInfo.Info != nil {
-		fileCount := len(metaInfo.Info.Files)
-		if fileCount > 0 {
-			metaInfo.fileDetails = make([]*FileDetail, fileCount)
-			var length uint64
-			for i, f := range metaInfo.Info.Files {
-				metaInfo.fileDetails[i] = &FileDetail{
-					Length: f.Length,
-					Path:   f.Path,
-					Begin:  int64(length),
-					End:    int64(length + f.Length),
-				}
-				length += f.Length
-			}
-			metaInfo.totalSize = length
-		} else {
-			metaInfo.totalSize = metaInfo.Info.Length
-		}
-	}
-}

pkg/protocol/bt/metainfo/metainfo_test.go

@@ -1,22 +0,0 @@
-package metainfo
-
-import (
-	"encoding/hex"
-	"fmt"
-	"testing"
-)
-
-func TestParseFromFile(t *testing.T) {
-	// metaInfo, err := ParseFromFile("../testdata/Game.of.Thrones.S08E05.720p.WEB.H264-MEMENTO.torrent")
-	metaInfo, err := ParseFromFile("E:\\bt\\win10.torrent")
-	if err != nil {
-		panic(err)
-	}
-	fmt.Printf("%+v\n", metaInfo.AnnounceList)
-	for _, file := range metaInfo.Info.Files {
-		fmt.Printf("%+v\n", file)
-	}
-	fmt.Printf("%+v\n", metaInfo.Info.PieceLength)
-	fmt.Printf("%+v\n", len(metaInfo.Info.Pieces))
-	fmt.Printf("%+v\n", hex.EncodeToString(metaInfo.infoHash[:]))
-}

pkg/protocol/bt/peer/handshake.go

@@ -1,51 +0,0 @@
-package peer
-
-import (
-	"bytes"
-	"encoding/binary"
-)
-
-const (
-	ProtocolIdentifier       = "BitTorrent protocol"
-	ProtocolIdentifierLength = 0x13
-)
-
-// Handshake of Peer wire protocol
-// Per https://wiki.theory.org/index.php/BitTorrentSpecification#Handshake
-type Handshake struct {
-	Pstrlen  byte
-	Pstr     [19]byte
-	Reserved [8]byte
-	InfoHash [20]byte
-	PeerID   [20]byte
-}
-
-func NewHandshake(reserved [8]byte, infoHash [20]byte, peerID [20]byte) *Handshake {
-	var arr [ProtocolIdentifierLength]byte
-	copy(arr[:], ProtocolIdentifier)
-	return &Handshake{
-		Pstrlen:  ProtocolIdentifierLength,
-		Pstr:     arr,
-		Reserved: reserved,
-		InfoHash: infoHash,
-		PeerID:   peerID,
-	}
-}
-
-func (handshake *Handshake) Encode() []byte {
-	writer := new(bytes.Buffer)
-	err := binary.Write(writer, binary.BigEndian, handshake)
-	if err != nil {
-		panic(err)
-	}
-	return writer.Bytes()
-}
-
-func (handshake *Handshake) Decode(buf []byte) error {
-	reader := bytes.NewReader(buf)
-	err := binary.Read(reader, binary.BigEndian, handshake)
-	if err != nil {
-		return err
-	}
-	return nil
-}

pkg/protocol/bt/peer/message/message.go

@@ -1,143 +0,0 @@
-package message
-
-import (
-	"encoding/binary"
-)
-
-// message ID
-type ID byte
-
-const (
-	IdChoke ID = iota
-	IdUnchoke
-	IdInterested
-	IdNotInterested
-	IdHave
-	IdBitfield
-	IdRequest
-	IdPiece
-	IdCancel
-)
-
-/*type Message struct {
-	Length  uint32
-	ID      MessageID
-	Payload []byte
-}*/
-
-type base struct {
-	id ID
-}
-
-func (base *base) ID() ID {
-	return base.id
-}
-
-func (base *base) Encode() []byte {
-	return encode(base, nil)
-}
-
-func (base *base) Decode(body []byte) {
-
-}
-
-type Message interface {
-	ID() ID
-	Encode() []byte
-	Decode(body []byte)
-}
-
-type TestMsg struct {
-	*base
-}
-
-func (base *TestMsg) Encode() []byte {
-	return []byte{1, 2, 3}
-}
-
-func (base *TestMsg) Decode(body []byte) {
-}
-
-func encode(base *base, body []byte) []byte {
-	buf := make([]byte, 5+len(body))
-	binary.BigEndian.PutUint32(buf, uint32(len(buf)))
-	buf[4] = byte(base.id)
-	copy(buf[4:], body)
-	return buf
-}
-
-/*func Decode(buf []byte) Message {
-	head := make([]byte, 5)
-	body := message.Encode()
-	binary.BigEndian.PutUint32(head, uint32(len(head)+len(body)))
-	head[4] = byte(message.ID())
-	return append(head, body...)
-}
-
-func (msg *Message) ToBytes() []byte {
-	buf := make([]byte, 5)
-	binary.BigEndian.PutUint32(buf, msg.Length)
-	buf[4] = byte(msg.ID)
-	if msg.Payload != nil {
-		return append(buf, msg.Payload.Encode()...)
-	} else {
-		return buf
-	}
-}
-
-func (msg *Message) FormBytes(buf []byte) {
-	msg.Length = binary.BigEndian.Uint32(buf)
-	msg.ID = ID(buf[4])
-	if msg.Payload != nil {
-		msg.Payload.Decode(buf[4:])
-	}
-}*/
-
-/*func NewMessage(id MessageID, Payload []byte) *Message {
-	message := &Message{ID: id, Payload: Payload}
-	if id == Keepalive {
-		message.Length = 0
-	} else {
-		message.Length = uint32(len(Payload) + 1)
-	}
-	return message
-}
-
-func (msg *Message) Encode() []byte {
-	if msg.ID == Keepalive {
-		return make([]byte, 4)
-	} else {
-		buf := make([]byte, 5+len(msg.Payload))
-		binary.BigEndian.PutUint32(buf, msg.Length)
-		buf[4] = byte(msg.ID)
-		copy(buf[5:], msg.Payload[:])
-		return buf
-	}
-}
-
-func (msg *Message) Decode(buf []byte) {
-	msg.Length = binary.BigEndian.Uint32(buf)
-	if msg.Length == 0 {
-		msg.ID = -1
-	} else {
-		msg.ID = MessageID(buf[4])
-		if msg.Length > 4 {
-			msg.Payload = buf[5:]
-		}
-	}
-}*/
-
-// Message protocol
-// Length prefix| message ID | Payload
-// 4-byte       | 1-byte     | remaining bytes
-// 100          | 5          | 99-bytes
-// https://wiki.theory.org/index.php/BitTorrentSpecification#Messages
-func SplitMessage(data []byte, atEOF bool) (advance int, token []byte, err error) {
-	if !atEOF && len(data) > 4 {
-		length := int(binary.BigEndian.Uint32(data))
-		if len(data)-4 >= length {
-			return length + 4, data[:length+4], nil
-		}
-	}
-	return
-}

pkg/protocol/bt/peer/message/msg_bitfield.go

@@ -1,68 +0,0 @@
-package message
-
-import (
-	"github.com/RoaringBitmap/roaring"
-	"math"
-)
-
-// bitfield: <len=0001+X><id=5><bitfield>
-type Bitfield struct {
-	*base
-	pieceCount int
-	bitmap     *roaring.Bitmap
-}
-
-func NewBitfield() *Bitfield {
-	return &Bitfield{
-		base: &base{
-			id: IdBitfield,
-		},
-	}
-}
-
-func BuildBitfield(pieceCount int, bitmap *roaring.Bitmap) *Bitfield {
-	bitfield := NewBitfield()
-	bitfield.pieceCount = pieceCount
-	bitfield.bitmap = bitmap
-	return bitfield
-}
-
-func (b *Bitfield) Encode() []byte {
-	buf := make([]byte, int(math.Ceil(float64(b.pieceCount)/8)))
-	for i := 0; i < len(buf); i++ {
-		temp := byte(0)
-		for j := 0; j < 8; j++ {
-			// 如果piece存在,位数标识为1
-			if b.bitmap.ContainsInt(i*8 + j) {
-				temp = temp | (1 << (7 - j))
-			}
-		}
-		buf[i] = temp
-	}
-	return encode(b.base, buf)
-}
-
-func (b *Bitfield) Decode(body []byte) {
-	b.bitmap = roaring.New()
-	// 初始化bitmap
-	for i := 0; i < len(body); i++ {
-		for j := 0; j < 8; j++ {
-			if body[i]&(1<<(7-j)) > 0 {
-				b.bitmap.AddInt(i*8 + j)
-			}
-		}
-	}
-}
-
-// 某个分片是否下载完成
-func (b *Bitfield) IsComplete(i int) bool {
-	return b.bitmap.ContainsInt(i)
-}
-
-// 给定一组分片下载状态，计算出当前peer能提供下载的分片下标，如果已经拥有则不用提供
-// has = 0b01111111,had = 0b10010000
-// has & ~had = 0b01111111 & 0b01101111 = 0b01101111
-func (b *Bitfield) Provide(had *roaring.Bitmap) []uint32 {
-	xor := roaring.AndNot(b.bitmap, had)
-	return xor.ToArray()
-}

pkg/protocol/bt/peer/message/msg_bitfield_test.go

@@ -1,111 +0,0 @@
-package message
-
-import (
-	"github.com/RoaringBitmap/roaring"
-	"reflect"
-	"testing"
-)
-
-func TestBitfield_IsComplete(t *testing.T) {
-	type fields struct {
-		payload *roaring.Bitmap
-	}
-	type args struct {
-		i int
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		args   args
-		want   bool
-	}{
-		{
-			"case-1",
-			fields{
-				payload: roaring.BitmapOf(1, 2, 3, 4),
-			},
-			args{
-				1,
-			},
-			true,
-		},
-		{
-			"case-2",
-			fields{
-				payload: roaring.BitmapOf(1, 2, 3, 4),
-			},
-			args{
-				5,
-			},
-			false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			b := &Bitfield{
-				pieceCount: 100,
-				bitmap:     tt.fields.payload,
-			}
-			if got := b.IsComplete(tt.args.i); got != tt.want {
-				t.Errorf("Bitfield.IsComplete() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestBitfield_Provide(t *testing.T) {
-	type fields struct {
-		payload *roaring.Bitmap
-	}
-	type args struct {
-		had *roaring.Bitmap
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		args   args
-		want   []uint32
-	}{
-		{
-			"case-1",
-			fields{
-				payload: roaring.BitmapOf(0, 1, 2, 3, 4),
-			},
-			args{
-				roaring.BitmapOf(0),
-			},
-			[]uint32{1, 2, 3, 4},
-		},
-		{
-			"case-2",
-			fields{
-				payload: roaring.BitmapOf(0, 1, 2, 3, 4, 5, 6, 7, 8),
-			},
-			args{
-				roaring.BitmapOf(0, 1, 3, 5, 6, 8),
-			},
-			[]uint32{2, 4, 7},
-		},
-		{
-			"case-3",
-			fields{
-				payload: roaring.BitmapOf(),
-			},
-			args{
-				roaring.BitmapOf(0, 1, 2, 3, 4, 5, 6, 7, 8, 9),
-			},
-			[]uint32{},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			b := &Bitfield{
-				pieceCount: 100,
-				bitmap:     tt.fields.payload,
-			}
-			if got := b.Provide(tt.args.had); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("Bitfield.Provide() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

pkg/protocol/bt/peer/message/msg_choke.go

@@ -1,14 +0,0 @@
-package message
-
-// choke: <len=0001><id=0>
-type Choke struct {
-	*base
-}
-
-func NewChoke() *Choke {
-	return &Choke{
-		base: &base{
-			id: IdChoke,
-		},
-	}
-}

pkg/protocol/bt/peer/message/msg_interested.go

@@ -1,14 +0,0 @@
-package message
-
-// choke: <len=0001><id=2>
-type Interested struct {
-	*base
-}
-
-func NewInterested() *Interested {
-	return &Interested{
-		base: &base{
-			id: IdInterested,
-		},
-	}
-}