mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-15 12:53:41 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4736a91904 | ||
|
|
0a4d74a513 | ||
|
|
a06549a11a | ||
|
|
63296f6950 | ||
|
|
4b4c03fd90 | ||
|
|
91dfd78b77 | ||
|
|
467ada5500 |
No files matched your search
@@ -4,17 +4,17 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
platform:
|
platform:
|
||||||
description: "Build platform"
|
description: 'Build platform'
|
||||||
required: true
|
required: true
|
||||||
default: "all"
|
default: 'all'
|
||||||
test:
|
test:
|
||||||
description: "Test mode"
|
description: 'Test mode'
|
||||||
required: true
|
required: true
|
||||||
default: "false"
|
default: "false"
|
||||||
|
|
||||||
env:
|
env:
|
||||||
GO_VERSION: "1.23"
|
GO_VERSION: "1.23"
|
||||||
FLUTTER_VERSION: "3.24.5"
|
FLUTTER_VERSION: "3.16.8"
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -97,13 +97,11 @@ jobs:
|
|||||||
PrivilegesRequired=lowest
|
PrivilegesRequired=lowest
|
||||||
OutputBaseFilename=gopeed
|
OutputBaseFilename=gopeed
|
||||||
SetupIconFile=..\..\assets\icon\icon.ico
|
SetupIconFile=..\..\assets\icon\icon.ico
|
||||||
UninstallDisplayIcon={app}\{#MyAppExeName}
|
|
||||||
Compression=lzma
|
Compression=lzma
|
||||||
SolidCompression=yes
|
SolidCompression=yes
|
||||||
WizardStyle=modern
|
WizardStyle=modern
|
||||||
LanguageDetectionMethod=uilanguage
|
LanguageDetectionMethod=uilanguage
|
||||||
ShowLanguageDialog=yes
|
ShowLanguageDialog=yes
|
||||||
CloseApplications=force
|
|
||||||
|
|
||||||
[Languages]
|
[Languages]
|
||||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||||
@@ -113,7 +111,7 @@ jobs:
|
|||||||
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
||||||
|
|
||||||
[Files]
|
[Files]
|
||||||
Source: ".\x64\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
|
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
||||||
|
|
||||||
[UninstallDelete]
|
[UninstallDelete]
|
||||||
@@ -368,7 +366,7 @@ jobs:
|
|||||||
- uses: actions/setup-java@v3
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
distribution: "zulu"
|
distribution: "zulu"
|
||||||
java-version: "17"
|
java-version: "11"
|
||||||
- uses: subosito/flutter-action@v2
|
- uses: subosito/flutter-action@v2
|
||||||
with:
|
with:
|
||||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
@@ -445,7 +443,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
VERSION=${VERSION:-$(date +%y%m%d%H%M)} # Use current time as version if not specified
|
VERSION=${VERSION:-$(date +%y%m%d%H%M)} # Use current time as version if not specified
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build web --no-web-resources-cdn
|
flutter build web --web-renderer html
|
||||||
cd ../../
|
cd ../../
|
||||||
cp -r ui/flutter/build/web cmd/web/dist
|
cp -r ui/flutter/build/web cmd/web/dist
|
||||||
mkdir -p dist/zip
|
mkdir -p dist/zip
|
||||||
@@ -535,7 +533,7 @@ jobs:
|
|||||||
- name: Build flutter web
|
- name: Build flutter web
|
||||||
run: |
|
run: |
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build web --no-web-resources-cdn
|
flutter build web --web-renderer html
|
||||||
cd ../../
|
cd ../../
|
||||||
rm -rf cmd/web/dist
|
rm -rf cmd/web/dist
|
||||||
cp -r ui/flutter/build/web cmd/web/dist
|
cp -r ui/flutter/build/web cmd/web/dist
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
GO_VERSION: "1.23"
|
GO_VERSION: "1.23"
|
||||||
FLUTTER_VERSION: "3.24.5"
|
FLUTTER_VERSION: "3.16.8"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# lint:
|
# lint:
|
||||||
@@ -73,17 +73,17 @@ jobs:
|
|||||||
- uses: subosito/flutter-action@v2
|
- uses: subosito/flutter-action@v2
|
||||||
with:
|
with:
|
||||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
- if: runner.os == 'windows-latest'
|
- if: runner.os == 'windows'
|
||||||
run: |
|
run: |
|
||||||
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" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build windows
|
flutter build windows
|
||||||
- if: runner.os == 'macos-latest'
|
- if: runner.os == 'macOS'
|
||||||
run: |
|
run: |
|
||||||
go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
|
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
|
cd ui/flutter
|
||||||
flutter build macos
|
flutter build macos
|
||||||
- if: runner.os == 'ubuntu-latest'
|
- if: runner.os == 'Linux'
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -y
|
sudo apt-get update -y
|
||||||
sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev
|
sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev
|
||||||
@@ -140,7 +140,7 @@ jobs:
|
|||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build web --no-web-resources-cdn
|
flutter build web --web-renderer html
|
||||||
cd ../../
|
cd ../../
|
||||||
rm -rf cmd/web/dist
|
rm -rf cmd/web/dist
|
||||||
cp -r ui/flutter/build/web cmd/web/dist
|
cp -r ui/flutter/build/web cmd/web/dist
|
||||||
@@ -160,7 +160,7 @@ jobs:
|
|||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build web --no-web-resources-cdn
|
flutter build web --web-renderer html
|
||||||
cd ../../
|
cd ../../
|
||||||
rm -rf cmd/web/dist
|
rm -rf cmd/web/dist
|
||||||
cp -r ui/flutter/build/web cmd/web/dist
|
cp -r ui/flutter/build/web cmd/web/dist
|
||||||
|
|||||||
@@ -71,11 +71,6 @@ Visit ✈ [Official Website](https://gopeed.com) | 📖 [Official Docs](https://
|
|||||||
<td><code>IPA</code></td>
|
<td><code>IPA</code></td>
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
|
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>Qnap</td>
|
|
||||||
<td><code>QPKG</code></td>
|
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=gopeed-qnap-$version-amd64.qpkg">Link</a></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>Web</td>
|
<td>Web</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
@@ -120,7 +115,7 @@ This project is divided into two parts, the front end uses `flutter`, the back e
|
|||||||
### Environment
|
### Environment
|
||||||
|
|
||||||
1. Golang 1.23+
|
1. Golang 1.23+
|
||||||
2. Flutter 3.24+
|
2. Flutter 3.16+
|
||||||
|
|
||||||
### Clone
|
### Clone
|
||||||
|
|
||||||
@@ -179,7 +174,7 @@ command:
|
|||||||
- android
|
- android
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -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 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build apk
|
flutter build apk
|
||||||
```
|
```
|
||||||
|
|||||||
+2
-7
@@ -71,11 +71,6 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
|
|||||||
<td><code>IPA</code></td>
|
<td><code>IPA</code></td>
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
|
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>Qnap</td>
|
|
||||||
<td><code>QPKG</code></td>
|
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=gopeed-qnap-$version-amd64.qpkg">Link</a></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>Web</td>
|
<td>Web</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
@@ -108,7 +103,7 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
|
|||||||
### 環境
|
### 環境
|
||||||
|
|
||||||
1. Go 言語 1.23+
|
1. Go 言語 1.23+
|
||||||
2. Flutter 3.24+
|
2. Flutter 3.16+
|
||||||
|
|
||||||
### クローン
|
### クローン
|
||||||
|
|
||||||
@@ -167,7 +162,7 @@ gomobile init
|
|||||||
- android
|
- android
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -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 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build apk
|
flutter build apk
|
||||||
```
|
```
|
||||||
|
|||||||
+2
-7
@@ -71,11 +71,6 @@ Truy cập ✈ [Trang web chính thức](https://gopeed.com) | 📖 [Tài liệu
|
|||||||
<td><code>IPA</code></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>
|
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Liên kết</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>Qnap</td>
|
|
||||||
<td><code>QPKG</code></td>
|
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=gopeed-qnap-$version-amd64.qpkg">Liên kết</a></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>Web</td>
|
<td>Web</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
@@ -116,7 +111,7 @@ Dự án này được chia thành hai phần, phần giao diện sử dụng `f
|
|||||||
### Environment
|
### Environment
|
||||||
|
|
||||||
1. Golang 1.23+
|
1. Golang 1.23+
|
||||||
2. Flutter 3.24+
|
2. Flutter 3.16+
|
||||||
|
|
||||||
### Clone
|
### Clone
|
||||||
|
|
||||||
@@ -175,7 +170,7 @@ command:
|
|||||||
- android
|
- android
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -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 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build apk
|
flutter build apk
|
||||||
```
|
```
|
||||||
|
|||||||
+2
-7
@@ -71,11 +71,6 @@ Gopeed(全称 Go Speed),直译过来中文名叫做`够快下载器`(不
|
|||||||
<td><code>IPA</code></td>
|
<td><code>IPA</code></td>
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">前往</a></td>
|
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">前往</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>Qnap</td>
|
|
||||||
<td><code>QPKG</code></td>
|
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=gopeed-qnap-$version-amd64.qpkg">前往</a></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>Web</td>
|
<td>Web</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
@@ -120,7 +115,7 @@ Gopeed 还提供了浏览器扩展用于接管浏览器下载,支持 Chrome、
|
|||||||
### 环境要求
|
### 环境要求
|
||||||
|
|
||||||
1. Golang 1.23+
|
1. Golang 1.23+
|
||||||
2. Flutter 3.24+
|
2. Flutter 3.16+
|
||||||
|
|
||||||
### 克隆项目
|
### 克隆项目
|
||||||
|
|
||||||
@@ -179,7 +174,7 @@ gomobile init
|
|||||||
- android
|
- android
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -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 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build apk
|
flutter build apk
|
||||||
```
|
```
|
||||||
|
|||||||
+2
-7
@@ -71,11 +71,6 @@ Gopeed(全稱 Go Speed),是一款使用`Golang`+`Flutter`編寫的高速
|
|||||||
<td><code>IPA</code></td>
|
<td><code>IPA</code></td>
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">前往</a></td>
|
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">前往</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>Qnap</td>
|
|
||||||
<td><code>QPKG</code></td>
|
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=gopeed-qnap-$version-amd64.qpkg">前往</a></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>Web</td>
|
<td>Web</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
@@ -116,7 +111,7 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
|
|||||||
### 開發環境
|
### 開發環境
|
||||||
|
|
||||||
1. Golang 1.23+
|
1. Golang 1.23+
|
||||||
2. Flutter 3.24+
|
2. Flutter 3.16+
|
||||||
|
|
||||||
### 克隆項目
|
### 克隆項目
|
||||||
|
|
||||||
@@ -175,7 +170,7 @@ gomobile init
|
|||||||
- android
|
- android
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -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 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build apk
|
flutter build apk
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
package bind
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/api"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/api/model"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Global singleton instance
|
||||||
|
var instance *api.Instance
|
||||||
|
|
||||||
|
func Init(config *model.StartConfig) (err error) {
|
||||||
|
if instance != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
config.ProductionMode = true
|
||||||
|
instance, err = api.Create(config)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func Invoke(request *api.Request) string {
|
||||||
|
if instance == nil {
|
||||||
|
return BuildResult(errors.New("instance not initialized"))
|
||||||
|
}
|
||||||
|
return jsonEncode(api.Invoke(instance, request))
|
||||||
|
}
|
||||||
|
|
||||||
|
func BuildResult(data any) string {
|
||||||
|
if err, ok := data.(error); ok {
|
||||||
|
buf, _ := json.Marshal(model.NewErrorResult[any](err.Error()))
|
||||||
|
return string(buf)
|
||||||
|
}
|
||||||
|
return jsonEncode(model.NewOkResult(data))
|
||||||
|
}
|
||||||
|
|
||||||
|
func jsonEncode(data any) string {
|
||||||
|
buf, _ := json.Marshal(data)
|
||||||
|
return string(buf)
|
||||||
|
}
|
||||||
+19
-14
@@ -3,27 +3,32 @@ package main
|
|||||||
import "C"
|
import "C"
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest"
|
"github.com/GopeedLab/gopeed/bind"
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest/model"
|
"github.com/GopeedLab/gopeed/pkg/api"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/api/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {}
|
func main() {}
|
||||||
|
|
||||||
//export Start
|
//export Init
|
||||||
func Start(cfg *C.char) (int, *C.char) {
|
func Init(cfg *C.char) *C.char {
|
||||||
var config model.StartConfig
|
var config model.StartConfig
|
||||||
if err := json.Unmarshal([]byte(C.GoString(cfg)), &config); err != nil {
|
if err := json.Unmarshal([]byte(C.GoString(cfg)), &config); err != nil {
|
||||||
return 0, C.CString(err.Error())
|
return C.CString(err.Error())
|
||||||
}
|
}
|
||||||
config.ProductionMode = true
|
if err := bind.Init(&config); err != nil {
|
||||||
realPort, err := rest.Start(&config)
|
return C.CString(err.Error())
|
||||||
if err != nil {
|
|
||||||
return 0, C.CString(err.Error())
|
|
||||||
}
|
|
||||||
return realPort, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//export Stop
|
return nil
|
||||||
func Stop() {
|
}
|
||||||
rest.Stop()
|
|
||||||
|
//export Invoke
|
||||||
|
func Invoke(req *C.char) *C.char {
|
||||||
|
var request api.Request
|
||||||
|
if err := json.Unmarshal([]byte(C.GoString(req)), &request); err != nil {
|
||||||
|
return C.CString(bind.BuildResult(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
return C.CString(bind.Invoke(&request))
|
||||||
}
|
}
|
||||||
+7
-12
@@ -3,20 +3,15 @@ package libgopeed
|
|||||||
// #cgo LDFLAGS: -static-libstdc++
|
// #cgo LDFLAGS: -static-libstdc++
|
||||||
import "C"
|
import "C"
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"github.com/GopeedLab/gopeed/bind"
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest"
|
"github.com/GopeedLab/gopeed/pkg/api"
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest/model"
|
"github.com/GopeedLab/gopeed/pkg/api/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Start(cfg string) (int, error) {
|
func Init(cfg *model.StartConfig) error {
|
||||||
var config model.StartConfig
|
return bind.Init(cfg)
|
||||||
if err := json.Unmarshal([]byte(cfg), &config); err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
config.ProductionMode = true
|
|
||||||
return rest.Start(&config)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func Stop() {
|
func Invoke(request *api.Request) string {
|
||||||
rest.Stop()
|
return bind.Invoke(request)
|
||||||
}
|
}
|
||||||
+9
-3
@@ -2,15 +2,21 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/GopeedLab/gopeed/cmd"
|
"github.com/GopeedLab/gopeed/cmd"
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest/model"
|
"github.com/GopeedLab/gopeed/pkg/api/model"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
)
|
)
|
||||||
|
|
||||||
// only for local development
|
// only for local development
|
||||||
func main() {
|
func main() {
|
||||||
cfg := &model.StartConfig{
|
cfg := &model.StartConfig{
|
||||||
Network: "tcp",
|
|
||||||
Address: "127.0.0.1:9999",
|
|
||||||
Storage: model.StorageBolt,
|
Storage: model.StorageBolt,
|
||||||
|
DownloadConfig: &base.DownloaderStoreConfig{
|
||||||
|
Http: &base.DownloaderHttpConfig{
|
||||||
|
Enable: true,
|
||||||
|
Host: "127.0.0.1",
|
||||||
|
Port: 9999,
|
||||||
|
},
|
||||||
|
},
|
||||||
WebEnable: true,
|
WebEnable: true,
|
||||||
}
|
}
|
||||||
cmd.Start(cfg)
|
cmd.Start(cfg)
|
||||||
|
|||||||
+18
-14
@@ -3,10 +3,9 @@ package cmd
|
|||||||
import (
|
import (
|
||||||
_ "embed"
|
_ "embed"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/api"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/api/model"
|
||||||
"github.com/GopeedLab/gopeed/pkg/base"
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest"
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest/model"
|
|
||||||
"net/http"
|
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@@ -18,20 +17,22 @@ var banner string
|
|||||||
|
|
||||||
func Start(cfg *model.StartConfig) {
|
func Start(cfg *model.StartConfig) {
|
||||||
fmt.Println(banner)
|
fmt.Println(banner)
|
||||||
srv, listener, err := rest.BuildServer(cfg)
|
instance, err := api.Create(cfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
downloadCfg, err := rest.Downloader.GetConfig()
|
|
||||||
if err != nil {
|
downloadCfgResult := instance.GetConfig()
|
||||||
panic(err)
|
if downloadCfgResult.HasError() {
|
||||||
|
panic(downloadCfgResult.Msg)
|
||||||
}
|
}
|
||||||
|
downloadCfg := downloadCfgResult.Data
|
||||||
if downloadCfg.FirstLoad {
|
if downloadCfg.FirstLoad {
|
||||||
// Set default download config
|
// Set default download config
|
||||||
if cfg.DownloadConfig != nil {
|
if cfg.DownloadConfig != nil {
|
||||||
cfg.DownloadConfig.Merge(downloadCfg)
|
cfg.DownloadConfig.Merge(downloadCfg)
|
||||||
// TODO Use PatchConfig
|
// TODO Use PatchConfig
|
||||||
rest.Downloader.PutConfig(cfg.DownloadConfig)
|
instance.PutConfig(cfg.DownloadConfig)
|
||||||
downloadCfg = cfg.DownloadConfig
|
downloadCfg = cfg.DownloadConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,25 +49,28 @@ func Start(cfg *model.StartConfig) {
|
|||||||
}
|
}
|
||||||
if downloadDir != "" {
|
if downloadDir != "" {
|
||||||
downloadCfg.DownloadDir = downloadDir
|
downloadCfg.DownloadDir = downloadDir
|
||||||
rest.Downloader.PutConfig(downloadCfg)
|
instance.PutConfig(downloadCfg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
watchExit()
|
|
||||||
|
|
||||||
fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
|
watchExit(instance)
|
||||||
if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
|
|
||||||
|
port, start, err := api.ListenHttp(cfg.DownloadConfig.Http, instance)
|
||||||
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
fmt.Printf("Server start success on http://%s:%d\n", cfg.DownloadConfig.Http.Host, port)
|
||||||
|
start()
|
||||||
}
|
}
|
||||||
|
|
||||||
func watchExit() {
|
func watchExit(instance *api.Instance) {
|
||||||
sigs := make(chan os.Signal, 1)
|
sigs := make(chan os.Signal, 1)
|
||||||
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
|
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
|
||||||
go func() {
|
go func() {
|
||||||
sig := <-sigs
|
sig := <-sigs
|
||||||
fmt.Printf("Server is shutting down due to signal: %s\n", sig)
|
fmt.Printf("Server is shutting down due to signal: %s\n", sig)
|
||||||
rest.Downloader.Close()
|
instance.Close()
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
+4
-4
@@ -10,7 +10,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type args struct {
|
type args struct {
|
||||||
Address *string `json:"address"`
|
Host *string `json:"host"`
|
||||||
Port *int `json:"port"`
|
Port *int `json:"port"`
|
||||||
Username *string `json:"username"`
|
Username *string `json:"username"`
|
||||||
Password *string `json:"password"`
|
Password *string `json:"password"`
|
||||||
@@ -24,7 +24,7 @@ type args struct {
|
|||||||
|
|
||||||
func parse() *args {
|
func parse() *args {
|
||||||
var cliArgs args
|
var cliArgs args
|
||||||
cliArgs.Address = flag.String("A", "0.0.0.0", "Bind Address")
|
cliArgs.Host = flag.String("H", "0.0.0.0", "Bind Host")
|
||||||
cliArgs.Port = flag.Int("P", 9999, "Bind Port")
|
cliArgs.Port = flag.Int("P", 9999, "Bind Port")
|
||||||
cliArgs.Username = flag.String("u", "gopeed", "HTTP Basic Auth Username")
|
cliArgs.Username = flag.String("u", "gopeed", "HTTP Basic Auth Username")
|
||||||
cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Pwd")
|
cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Pwd")
|
||||||
@@ -35,8 +35,8 @@ func parse() *args {
|
|||||||
|
|
||||||
// args priority: config file > cli args
|
// args priority: config file > cli args
|
||||||
cfgArgs := loadConfig(*cliArgs.configPath)
|
cfgArgs := loadConfig(*cliArgs.configPath)
|
||||||
if cfgArgs.Address == nil {
|
if cfgArgs.Host == nil {
|
||||||
cfgArgs.Address = cliArgs.Address
|
cfgArgs.Host = cliArgs.Host
|
||||||
}
|
}
|
||||||
if cfgArgs.Port == nil {
|
if cfgArgs.Port == nil {
|
||||||
cfgArgs.Port = cliArgs.Port
|
cfgArgs.Port = cliArgs.Port
|
||||||
|
|||||||
+12
-5
@@ -5,9 +5,9 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"embed"
|
"embed"
|
||||||
"fmt"
|
|
||||||
"github.com/GopeedLab/gopeed/cmd"
|
"github.com/GopeedLab/gopeed/cmd"
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest/model"
|
"github.com/GopeedLab/gopeed/pkg/api/model"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@@ -42,12 +42,19 @@ func main() {
|
|||||||
dir = filepath.Dir(exe)
|
dir = filepath.Dir(exe)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if args.DownloadConfig == nil {
|
||||||
|
args.DownloadConfig = &base.DownloaderStoreConfig{}
|
||||||
|
}
|
||||||
|
args.DownloadConfig.Http = &base.DownloaderHttpConfig{
|
||||||
|
Enable: true,
|
||||||
|
Host: *args.Host,
|
||||||
|
Port: *args.Port,
|
||||||
|
ApiToken: *args.ApiToken,
|
||||||
|
}
|
||||||
|
|
||||||
cfg := &model.StartConfig{
|
cfg := &model.StartConfig{
|
||||||
Network: "tcp",
|
|
||||||
Address: fmt.Sprintf("%s:%d", *args.Address, *args.Port),
|
|
||||||
Storage: model.StorageBolt,
|
Storage: model.StorageBolt,
|
||||||
StorageDir: filepath.Join(dir, "storage"),
|
StorageDir: filepath.Join(dir, "storage"),
|
||||||
ApiToken: *args.ApiToken,
|
|
||||||
DownloadConfig: args.DownloadConfig,
|
DownloadConfig: args.DownloadConfig,
|
||||||
ProductionMode: true,
|
ProductionMode: true,
|
||||||
WebEnable: true,
|
WebEnable: true,
|
||||||
|
|||||||
@@ -11,9 +11,7 @@ import (
|
|||||||
"github.com/GopeedLab/gopeed/pkg/util"
|
"github.com/GopeedLab/gopeed/pkg/util"
|
||||||
"github.com/anacrolix/torrent"
|
"github.com/anacrolix/torrent"
|
||||||
"github.com/anacrolix/torrent/metainfo"
|
"github.com/anacrolix/torrent/metainfo"
|
||||||
"io"
|
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -334,7 +332,7 @@ func (f *Fetcher) doUpload(fromUpload bool) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get torrent stats maybe panic, see https://github.com/anacrolix/torrent/issues/972
|
// get torrent stats maybe panic, see https://github.com/anacrolix/torrent/issues/972
|
||||||
func (f *Fetcher) torrentStats() torrent.TorrentStats {
|
func (f *Fetcher) torrentStats() torrent.TorrentStats {
|
||||||
defer func() {
|
defer func() {
|
||||||
if r := recover(); r != nil {
|
if r := recover(); r != nil {
|
||||||
@@ -361,34 +359,17 @@ func (f *Fetcher) addTorrent(req *base.Request, fromUpload bool) (err error) {
|
|||||||
schema := util.ParseSchema(req.URL)
|
schema := util.ParseSchema(req.URL)
|
||||||
if schema == "MAGNET" {
|
if schema == "MAGNET" {
|
||||||
f.torrent, err = client.AddMagnet(req.URL)
|
f.torrent, err = client.AddMagnet(req.URL)
|
||||||
} else {
|
|
||||||
var reader io.Reader
|
|
||||||
if schema == "FILE" {
|
|
||||||
fileUrl, _ := url.Parse(req.URL)
|
|
||||||
filePath := fileUrl.Path[1:]
|
|
||||||
reader, err = os.Open(filePath)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} else if schema == "DATA" {
|
} else if schema == "DATA" {
|
||||||
_, data := util.ParseDataUri(req.URL)
|
_, data := util.ParseDataUri(req.URL)
|
||||||
reader = bytes.NewBuffer(data)
|
buf := bytes.NewBuffer(data)
|
||||||
} else {
|
|
||||||
reader, err = os.Open(req.URL)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer reader.(io.Closer).Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
var metaInfo *metainfo.MetaInfo
|
var metaInfo *metainfo.MetaInfo
|
||||||
metaInfo, err = metainfo.Load(reader)
|
metaInfo, err = metainfo.Load(buf)
|
||||||
// Hotfix for https://github.com/anacrolix/torrent/issues/992, ignore "expected EOF" error
|
if err != nil {
|
||||||
// TODO remove this after the issue is fixed
|
|
||||||
if err != nil && !strings.Contains(err.Error(), "expected EOF") {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
f.torrent, err = client.AddTorrent(metaInfo)
|
f.torrent, err = client.AddTorrent(metaInfo)
|
||||||
|
} else {
|
||||||
|
f.torrent, err = client.AddTorrentFromFile(req.URL)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import (
|
|||||||
gohttp "net/http"
|
gohttp "net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
@@ -97,7 +96,7 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
|
|||||||
Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
|
Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
|
||||||
}
|
}
|
||||||
if !reflect.DeepEqual(want, fetcher.Meta().Res) {
|
if !reflect.DeepEqual(want, fetcher.Meta().Res) {
|
||||||
t.Errorf("Resolve Single File Resolve() got = %v, want %v", fetcher.Meta().Res, want)
|
t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, want)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -137,29 +136,10 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
|
|||||||
Hash: "ccbc92b0cd8deec16a2ef4be242a8c9243b1cedb",
|
Hash: "ccbc92b0cd8deec16a2ef4be242a8c9243b1cedb",
|
||||||
}
|
}
|
||||||
if !reflect.DeepEqual(want, fetcher.Meta().Res) {
|
if !reflect.DeepEqual(want, fetcher.Meta().Res) {
|
||||||
t.Errorf("Resolve Multi Files Resolve() got = %v, want %v", fetcher.Meta().Res, want)
|
t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, want)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("Resolve Unclean Torrent", func(t *testing.T) {
|
|
||||||
err := fetcher.Resolve(&base.Request{
|
|
||||||
URL: "./testdata/test.unclean.torrent",
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Resolve Unclean Torrent Resolve() got = %v, want nil", err)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("Resolve file scheme Torrent", func(t *testing.T) {
|
|
||||||
file, _ := filepath.Abs("./testdata/test.unclean.torrent")
|
|
||||||
uri := "file:///" + file
|
|
||||||
err := fetcher.Resolve(&base.Request{
|
|
||||||
URL: uri,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Resolve file scheme Torrent Resolve() got = %v, want nil", err)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFetcherManager_ParseName(t *testing.T) {
|
func TestFetcherManager_ParseName(t *testing.T) {
|
||||||
|
|||||||
Binary file not shown.
@@ -8,7 +8,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"mime"
|
"mime"
|
||||||
"net"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/cookiejar"
|
"net/http/cookiejar"
|
||||||
"net/url"
|
"net/url"
|
||||||
@@ -26,9 +25,6 @@ import (
|
|||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
)
|
)
|
||||||
|
|
||||||
const connectTimeout = 15 * time.Second
|
|
||||||
const readTimeout = 15 * time.Second
|
|
||||||
|
|
||||||
type RequestError struct {
|
type RequestError struct {
|
||||||
Code int
|
Code int
|
||||||
Msg string
|
Msg string
|
||||||
@@ -107,9 +103,9 @@ func (f *Fetcher) Resolve(req *base.Request) error {
|
|||||||
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)) {
|
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)) {
|
||||||
// response 206 status code, support breakpoint continuation
|
// response 206 status code, support breakpoint continuation
|
||||||
res.Range = true
|
res.Range = true
|
||||||
// parse content length from Content-Range header, eg: bytes 0-1000/1001 or bytes 0-0/*
|
// 解析资源大小: bytes 0-1000/1001 => 1001
|
||||||
contentTotal := path.Base(httpResp.Header.Get(base.HttpHeaderContentRange))
|
contentTotal := path.Base(httpResp.Header.Get(base.HttpHeaderContentRange))
|
||||||
if contentTotal != "" && contentTotal != "*" {
|
if contentTotal != "" {
|
||||||
parse, err := strconv.ParseInt(contentTotal, 10, 64)
|
parse, err := strconv.ParseInt(contentTotal, 10, 64)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -254,42 +250,23 @@ func (f *Fetcher) Wait() (err error) {
|
|||||||
return <-f.doneCh
|
return <-f.doneCh
|
||||||
}
|
}
|
||||||
|
|
||||||
type fetchResult struct {
|
|
||||||
err error
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *Fetcher) fetch() {
|
func (f *Fetcher) fetch() {
|
||||||
var ctx context.Context
|
var ctx context.Context
|
||||||
ctx, f.cancel = context.WithCancel(context.Background())
|
ctx, f.cancel = context.WithCancel(context.Background())
|
||||||
f.eg, _ = errgroup.WithContext(ctx)
|
f.eg, _ = errgroup.WithContext(ctx)
|
||||||
chunkErrs := make([]error, len(f.chunks))
|
|
||||||
for i := 0; i < len(f.chunks); i++ {
|
for i := 0; i < len(f.chunks); i++ {
|
||||||
i := i
|
i := i
|
||||||
f.eg.Go(func() error {
|
f.eg.Go(func() error {
|
||||||
err := f.fetchChunk(i, ctx)
|
return f.fetchChunk(i, ctx)
|
||||||
// if canceled, fail fast
|
|
||||||
if errors.Is(err, context.Canceled) {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
chunkErrs[i] = err
|
|
||||||
return nil
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
err := f.eg.Wait()
|
err := f.eg.Wait()
|
||||||
// error returned only if canceled, just return
|
// check if canceled
|
||||||
if err != nil {
|
if errors.Is(err, context.Canceled) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// check all fetch results, if any error, return
|
|
||||||
for _, chunkErr := range chunkErrs {
|
|
||||||
if chunkErr != nil {
|
|
||||||
err = chunkErr
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
f.file.Close()
|
f.file.Close()
|
||||||
// Update file last modified time
|
// Update file last modified time
|
||||||
if f.config.UseServerCtime && f.meta.Res.Files[0].Ctime != nil {
|
if f.config.UseServerCtime && f.meta.Res.Files[0].Ctime != nil {
|
||||||
@@ -312,12 +289,25 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
|
|||||||
for {
|
for {
|
||||||
// if chunk is completed, return
|
// if chunk is completed, return
|
||||||
if f.meta.Res.Range && chunk.Downloaded >= chunk.End-chunk.Begin+1 {
|
if f.meta.Res.Range && chunk.Downloaded >= chunk.End-chunk.Begin+1 {
|
||||||
return nil
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if chunk.retryTimes >= maxRetries {
|
if chunk.retryTimes >= maxRetries {
|
||||||
|
if !f.meta.Res.Range {
|
||||||
return
|
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 (
|
var (
|
||||||
httpReq *http.Request
|
httpReq *http.Request
|
||||||
@@ -343,9 +333,10 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
|
|||||||
err = NewRequestError(resp.StatusCode, resp.Status)
|
err = NewRequestError(resp.StatusCode, resp.Status)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
reader := NewTimeoutReader(resp.Body, readTimeout)
|
// Http request success, reset retry times
|
||||||
|
chunk.retryTimes = 0
|
||||||
for {
|
for {
|
||||||
n, err := reader.Read(buf)
|
n, err := resp.Body.Read(buf)
|
||||||
if n > 0 {
|
if n > 0 {
|
||||||
_, err := f.file.WriteAt(buf[:n], chunk.Begin+chunk.Downloaded)
|
_, err := f.file.WriteAt(buf[:n], chunk.Begin+chunk.Downloaded)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -360,6 +351,7 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return nil
|
||||||
}()
|
}()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// If canceled, do not retry
|
// If canceled, do not retry
|
||||||
@@ -427,10 +419,6 @@ func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
httpReq.Header = headers
|
httpReq.Header = headers
|
||||||
// Override Host header
|
|
||||||
if host := headers.Get(base.HttpHeaderHost); host != "" {
|
|
||||||
httpReq.Host = host
|
|
||||||
}
|
|
||||||
return httpReq, nil
|
return httpReq, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -464,9 +452,6 @@ func (f *Fetcher) splitChunk() (chunks []*chunk) {
|
|||||||
|
|
||||||
func (f *Fetcher) buildClient() *http.Client {
|
func (f *Fetcher) buildClient() *http.Client {
|
||||||
transport := &http.Transport{
|
transport := &http.Transport{
|
||||||
DialContext: (&net.Dialer{
|
|
||||||
Timeout: connectTimeout,
|
|
||||||
}).DialContext,
|
|
||||||
Proxy: f.ctl.GetProxy(f.meta.Req.Proxy),
|
Proxy: f.ctl.GetProxy(f.meta.Req.Proxy),
|
||||||
TLSClientConfig: &tls.Config{
|
TLSClientConfig: &tls.Config{
|
||||||
InsecureSkipVerify: f.meta.Req.SkipVerifyCert,
|
InsecureSkipVerify: f.meta.Req.SkipVerifyCert,
|
||||||
@@ -514,7 +499,7 @@ func (fm *FetcherManager) ParseName(u string) string {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
// Get filePath by URL
|
// get filePath by URL
|
||||||
name = path.Base(url.Path)
|
name = path.Base(url.Path)
|
||||||
// If file name is empty, use host name
|
// If file name is empty, use host name
|
||||||
if name == "" || name == "/" || name == "." {
|
if name == "" || name == "/" || name == "." {
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import (
|
|||||||
"net"
|
"net"
|
||||||
gohttp "net/http"
|
gohttp "net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strings"
|
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -60,21 +59,6 @@ func TestFetcher_Resolve(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFetcher_ResolveWithHostHeader(t *testing.T) {
|
|
||||||
fetcher := buildFetcher()
|
|
||||||
err := fetcher.Resolve(&base.Request{
|
|
||||||
URL: "https://bing.com",
|
|
||||||
Extra: &http.ReqExtra{
|
|
||||||
Header: map[string]string{
|
|
||||||
"Host": "test",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
if err == nil || !strings.Contains(err.Error(), "400") {
|
|
||||||
t.Errorf("Resolve() got = %v, want %v", err, "400")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func testResolve(startTestServer func() net.Listener, path string, want *base.Resource, t *testing.T) {
|
func testResolve(startTestServer func() net.Listener, path string, want *base.Resource, t *testing.T) {
|
||||||
listener := startTestServer()
|
listener := startTestServer()
|
||||||
defer listener.Close()
|
defer listener.Close()
|
||||||
@@ -148,14 +132,6 @@ func TestFetcher_DownloadLimit(t *testing.T) {
|
|||||||
downloadNormal(listener, 8, t)
|
downloadNormal(listener, 8, t)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFetcher_DownloadResponseBodyReadTimeout(t *testing.T) {
|
|
||||||
listener := test.StartTestLimitServer(16, readTimeout.Milliseconds()+5000)
|
|
||||||
defer listener.Close()
|
|
||||||
|
|
||||||
downloadError(listener, 1, t)
|
|
||||||
downloadError(listener, 4, t)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFetcher_DownloadResume(t *testing.T) {
|
func TestFetcher_DownloadResume(t *testing.T) {
|
||||||
listener := test.StartTestFileServer()
|
listener := test.StartTestFileServer()
|
||||||
defer listener.Close()
|
defer listener.Close()
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
package http
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
type TimeoutReader struct {
|
|
||||||
reader io.Reader
|
|
||||||
timeout time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewTimeoutReader(r io.Reader, timeout time.Duration) *TimeoutReader {
|
|
||||||
return &TimeoutReader{
|
|
||||||
reader: r,
|
|
||||||
timeout: timeout,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tr *TimeoutReader) Read(p []byte) (n int, err error) {
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), tr.timeout)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
done := make(chan struct{})
|
|
||||||
var readErr error
|
|
||||||
var bytesRead int
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
bytesRead, readErr = tr.reader.Read(p)
|
|
||||||
close(done)
|
|
||||||
}()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-done:
|
|
||||||
return bytesRead, readErr
|
|
||||||
case <-ctx.Done():
|
|
||||||
return 0, ctx.Err()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
package http
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"io"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestTimeoutReader_Read(t *testing.T) {
|
|
||||||
data := []byte("Hello, World!")
|
|
||||||
reader := bytes.NewReader(data)
|
|
||||||
timeoutReader := NewTimeoutReader(reader, 1*time.Second)
|
|
||||||
|
|
||||||
buf := make([]byte, len(data))
|
|
||||||
n, err := timeoutReader.Read(buf)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("expected no error, got %v", err)
|
|
||||||
}
|
|
||||||
if n != len(data) {
|
|
||||||
t.Fatalf("expected to read %d bytes, read %d", len(data), n)
|
|
||||||
}
|
|
||||||
if !bytes.Equal(buf, data) {
|
|
||||||
t.Fatalf("expected %s, got %s", data, buf)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestTimeoutReader_ReadTimeout(t *testing.T) {
|
|
||||||
reader := &slowReader{delay: 2 * time.Second}
|
|
||||||
timeoutReader := NewTimeoutReader(reader, 1*time.Second)
|
|
||||||
|
|
||||||
buf := make([]byte, 8192)
|
|
||||||
_, err := timeoutReader.Read(buf)
|
|
||||||
if err == nil {
|
|
||||||
t.Fatal("expected timeout error, got nil")
|
|
||||||
}
|
|
||||||
if !errors.Is(err, context.DeadlineExceeded) {
|
|
||||||
t.Fatalf("expected %v, got %v", context.DeadlineExceeded, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type slowReader struct {
|
|
||||||
delay time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
func (sr *slowReader) Read(p []byte) (n int, err error) {
|
|
||||||
time.Sleep(sr.delay)
|
|
||||||
return 0, io.EOF
|
|
||||||
}
|
|
||||||
+18
-29
@@ -4,7 +4,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/GopeedLab/gopeed/pkg/base"
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
"github.com/armon/go-socks5"
|
"github.com/armon/go-socks5"
|
||||||
@@ -37,7 +36,7 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func StartTestFileServer() net.Listener {
|
func StartTestFileServer() net.Listener {
|
||||||
return startTestServer(func(sl *shutdownListener) http.Handler {
|
return startTestServer(func() http.Handler {
|
||||||
return http.FileServer(http.Dir(Dir))
|
return http.FileServer(http.Dir(Dir))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -53,7 +52,7 @@ func (s *SlowFileServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func StartTestSlowFileServer(delay time.Duration) net.Listener {
|
func StartTestSlowFileServer(delay time.Duration) net.Listener {
|
||||||
return startTestServer(func(sl *shutdownListener) http.Handler {
|
return startTestServer(func() http.Handler {
|
||||||
return &SlowFileServer{
|
return &SlowFileServer{
|
||||||
delay: delay,
|
delay: delay,
|
||||||
handler: http.FileServer(http.Dir(Dir)),
|
handler: http.FileServer(http.Dir(Dir)),
|
||||||
@@ -62,7 +61,7 @@ func StartTestSlowFileServer(delay time.Duration) net.Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func StartTestCustomServer() net.Listener {
|
func StartTestCustomServer() net.Listener {
|
||||||
return startTestServer(func(sl *shutdownListener) http.Handler {
|
return startTestServer(func() http.Handler {
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
|
mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
|
||||||
file, err := os.Open(BuildFile)
|
file, err := os.Open(BuildFile)
|
||||||
@@ -89,7 +88,7 @@ func StartTestCustomServer() net.Listener {
|
|||||||
|
|
||||||
func StartTestRetryServer() net.Listener {
|
func StartTestRetryServer() net.Listener {
|
||||||
counter := 0
|
counter := 0
|
||||||
return startTestServer(func(sl *shutdownListener) http.Handler {
|
return startTestServer(func() http.Handler {
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
|
mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
|
||||||
counter++
|
counter++
|
||||||
@@ -109,7 +108,7 @@ func StartTestRetryServer() net.Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func StartTestPostServer() net.Listener {
|
func StartTestPostServer() net.Listener {
|
||||||
return startTestServer(func(sl *shutdownListener) http.Handler {
|
return startTestServer(func() http.Handler {
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
|
mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
|
||||||
if request.Method == "POST" && request.Header.Get("Authorization") != "" {
|
if request.Method == "POST" && request.Header.Get("Authorization") != "" {
|
||||||
@@ -133,7 +132,7 @@ func StartTestPostServer() net.Listener {
|
|||||||
|
|
||||||
func StartTestErrorServer() net.Listener {
|
func StartTestErrorServer() net.Listener {
|
||||||
counter := 0
|
counter := 0
|
||||||
return startTestServer(func(sl *shutdownListener) http.Handler {
|
return startTestServer(func() http.Handler {
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
|
mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
|
||||||
counter++
|
counter++
|
||||||
@@ -150,7 +149,7 @@ func StartTestErrorServer() net.Listener {
|
|||||||
func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
|
func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
|
||||||
var connections atomic.Int32
|
var connections atomic.Int32
|
||||||
|
|
||||||
return startTestServer(func(sl *shutdownListener) http.Handler {
|
return startTestServer(func() http.Handler {
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
|
mux.HandleFunc("/"+BuildName, func(writer http.ResponseWriter, request *http.Request) {
|
||||||
defer func() {
|
defer func() {
|
||||||
@@ -166,14 +165,12 @@ func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
|
|||||||
if r == "" {
|
if r == "" {
|
||||||
writer.Header().Set("Content-Length", fmt.Sprintf("%d", BuildSize))
|
writer.Header().Set("Content-Length", fmt.Sprintf("%d", BuildSize))
|
||||||
writer.WriteHeader(200)
|
writer.WriteHeader(200)
|
||||||
(writer.(http.Flusher)).Flush()
|
|
||||||
|
|
||||||
file, err := os.Open(BuildFile)
|
file, err := os.Open(BuildFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
defer file.Close()
|
defer file.Close()
|
||||||
slowCopy(sl, writer, file, delay)
|
slowCopy(writer, file, delay)
|
||||||
} else {
|
} else {
|
||||||
// split range
|
// split range
|
||||||
s := strings.Split(r, "=")
|
s := strings.Split(r, "=")
|
||||||
@@ -207,8 +204,6 @@ func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
|
|||||||
writer.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", start, end, BuildSize))
|
writer.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", start, end, BuildSize))
|
||||||
writer.Header().Set("Accept-Ranges", "bytes")
|
writer.Header().Set("Accept-Ranges", "bytes")
|
||||||
writer.WriteHeader(206)
|
writer.WriteHeader(206)
|
||||||
(writer.(http.Flusher)).Flush()
|
|
||||||
|
|
||||||
file, err := os.Open(BuildFile)
|
file, err := os.Open(BuildFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
writer.WriteHeader(500)
|
writer.WriteHeader(500)
|
||||||
@@ -216,7 +211,7 @@ func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
|
|||||||
}
|
}
|
||||||
defer file.Close()
|
defer file.Close()
|
||||||
file.Seek(start, 0)
|
file.Seek(start, 0)
|
||||||
slowCopyN(sl, writer, file, end-start+1, delay)
|
slowCopyN(writer, file, end-start+1, delay)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
return mux
|
return mux
|
||||||
@@ -224,12 +219,9 @@ func StartTestLimitServer(maxConnections int32, delay int64) net.Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// slowCopyN copies n bytes from src to dst, speed limit is bytes per second
|
// slowCopyN copies n bytes from src to dst, speed limit is bytes per second
|
||||||
func slowCopy(sl *shutdownListener, dst io.Writer, src io.Reader, delay int64) (written int64, err error) {
|
func slowCopy(dst io.Writer, src io.Reader, delay int64) (written int64, err error) {
|
||||||
buf := make([]byte, 32*1024)
|
buf := make([]byte, 32*1024)
|
||||||
for {
|
for {
|
||||||
if sl.isShutdown {
|
|
||||||
return 0, errors.New("server shutdown")
|
|
||||||
}
|
|
||||||
nr, er := src.Read(buf)
|
nr, er := src.Read(buf)
|
||||||
if nr > 0 {
|
if nr > 0 {
|
||||||
nw, ew := dst.Write(buf[0:nr])
|
nw, ew := dst.Write(buf[0:nr])
|
||||||
@@ -258,8 +250,8 @@ func slowCopy(sl *shutdownListener, dst io.Writer, src io.Reader, delay int64) (
|
|||||||
return written, err
|
return written, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func slowCopyN(sl *shutdownListener, dst io.Writer, src io.Reader, n int64, delay int64) (written int64, err error) {
|
func slowCopyN(dst io.Writer, src io.Reader, n int64, delay int64) (written int64, err error) {
|
||||||
written, err = slowCopy(sl, dst, io.LimitReader(src, n), delay)
|
written, err = slowCopy(dst, io.LimitReader(src, n), delay)
|
||||||
if written == n {
|
if written == n {
|
||||||
return n, nil
|
return n, nil
|
||||||
}
|
}
|
||||||
@@ -270,7 +262,7 @@ func slowCopyN(sl *shutdownListener, dst io.Writer, src io.Reader, n int64, dela
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func startTestServer(serverHandle func(sl *shutdownListener) http.Handler) net.Listener {
|
func startTestServer(serverHandle func() http.Handler) net.Listener {
|
||||||
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
@@ -280,7 +272,7 @@ func startTestServer(serverHandle func(sl *shutdownListener) http.Handler) net.L
|
|||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
defer file.Close()
|
defer file.Close()
|
||||||
// Write random data
|
// 随机生成一个文件
|
||||||
l := int64(8192)
|
l := int64(8192)
|
||||||
buf := make([]byte, l)
|
buf := make([]byte, l)
|
||||||
size := int64(0)
|
size := int64(0)
|
||||||
@@ -297,24 +289,21 @@ func startTestServer(serverHandle func(sl *shutdownListener) http.Handler) net.L
|
|||||||
size += l
|
size += l
|
||||||
}
|
}
|
||||||
server := &http.Server{}
|
server := &http.Server{}
|
||||||
sl := &shutdownListener{
|
server.Handler = serverHandle()
|
||||||
|
go server.Serve(listener)
|
||||||
|
|
||||||
|
return &shutdownListener{
|
||||||
server: server,
|
server: server,
|
||||||
Listener: listener,
|
Listener: listener,
|
||||||
}
|
}
|
||||||
server.Handler = serverHandle(sl)
|
|
||||||
go server.Serve(listener)
|
|
||||||
|
|
||||||
return sl
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type shutdownListener struct {
|
type shutdownListener struct {
|
||||||
server *http.Server
|
server *http.Server
|
||||||
isShutdown bool
|
|
||||||
net.Listener
|
net.Listener
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *shutdownListener) Close() error {
|
func (c *shutdownListener) Close() error {
|
||||||
c.isShutdown = true
|
|
||||||
closeErr := c.server.Shutdown(context.Background())
|
closeErr := c.server.Shutdown(context.Background())
|
||||||
if err := ifExistAndRemove(BuildFile); err != nil {
|
if err := ifExistAndRemove(BuildFile); err != nil {
|
||||||
fmt.Println(err)
|
fmt.Println(err)
|
||||||
|
|||||||
+400
@@ -0,0 +1,400 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/api/model"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/download"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/util"
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
"reflect"
|
||||||
|
"runtime"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Instance struct {
|
||||||
|
startCfg *model.StartConfig
|
||||||
|
downloader *download.Downloader
|
||||||
|
|
||||||
|
httpLock sync.Mutex
|
||||||
|
srv *http.Server
|
||||||
|
listener net.Listener
|
||||||
|
}
|
||||||
|
|
||||||
|
func Create(startCfg *model.StartConfig) (*Instance, error) {
|
||||||
|
if startCfg == nil {
|
||||||
|
startCfg = &model.StartConfig{}
|
||||||
|
}
|
||||||
|
startCfg.Init()
|
||||||
|
|
||||||
|
i := &Instance{
|
||||||
|
startCfg: startCfg,
|
||||||
|
}
|
||||||
|
|
||||||
|
downloadCfg := &download.DownloaderConfig{
|
||||||
|
ProductionMode: startCfg.ProductionMode,
|
||||||
|
RefreshInterval: startCfg.RefreshInterval,
|
||||||
|
}
|
||||||
|
if startCfg.Storage == model.StorageBolt {
|
||||||
|
downloadCfg.Storage = download.NewBoltStorage(startCfg.StorageDir)
|
||||||
|
} else {
|
||||||
|
downloadCfg.Storage = download.NewMemStorage()
|
||||||
|
}
|
||||||
|
downloadCfg.StorageDir = startCfg.StorageDir
|
||||||
|
downloadCfg.Init()
|
||||||
|
downloader := download.NewDownloader(downloadCfg)
|
||||||
|
if err := downloader.Setup(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
i.downloader = downloader
|
||||||
|
i.httpLock = sync.Mutex{}
|
||||||
|
|
||||||
|
return i, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) Listener(listener download.Listener) *model.Result[any] {
|
||||||
|
i.downloader.Listener(listener)
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) StartHttp() *model.Result[int] {
|
||||||
|
i.httpLock.Lock()
|
||||||
|
defer i.httpLock.Unlock()
|
||||||
|
|
||||||
|
return i.startHttp()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) startHttp() *model.Result[int] {
|
||||||
|
httpCfg := i.getHttpConfig()
|
||||||
|
if httpCfg == nil || !httpCfg.Enable {
|
||||||
|
return model.NewErrorResult[int]("HTTP API server not enabled")
|
||||||
|
}
|
||||||
|
if i.srv != nil {
|
||||||
|
return model.NewErrorResult[int]("HTTP API server already started")
|
||||||
|
}
|
||||||
|
|
||||||
|
port, start, err := ListenHttp(httpCfg, i)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[int](err.Error())
|
||||||
|
}
|
||||||
|
httpCfg.RunningPort = port
|
||||||
|
go start()
|
||||||
|
return model.NewOkResult(port)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) getHttpConfig() *base.DownloaderHttpConfig {
|
||||||
|
var httpCfg *base.DownloaderHttpConfig
|
||||||
|
if i.startCfg.DownloadConfig != nil && i.startCfg.DownloadConfig.Http != nil {
|
||||||
|
httpCfg = i.startCfg.DownloadConfig.Http
|
||||||
|
} else {
|
||||||
|
cfg, _ := i.downloader.GetConfig()
|
||||||
|
httpCfg = cfg.Http
|
||||||
|
}
|
||||||
|
return httpCfg
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) StopHttp() *model.Result[any] {
|
||||||
|
i.httpLock.Lock()
|
||||||
|
defer i.httpLock.Unlock()
|
||||||
|
|
||||||
|
return i.stopHttp()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) stopHttp() *model.Result[any] {
|
||||||
|
if i.srv != nil {
|
||||||
|
if err := i.srv.Shutdown(context.Background()); err != nil {
|
||||||
|
i.downloader.Logger.Warn().Err(err).Msg("shutdown http server failed")
|
||||||
|
}
|
||||||
|
i.srv = nil
|
||||||
|
i.listener = nil
|
||||||
|
}
|
||||||
|
httpCfg := i.getHttpConfig()
|
||||||
|
if httpCfg != nil {
|
||||||
|
httpCfg.RunningPort = 0
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) RestartHttp() *model.Result[int] {
|
||||||
|
i.httpLock.Lock()
|
||||||
|
defer i.httpLock.Unlock()
|
||||||
|
|
||||||
|
i.stopHttp()
|
||||||
|
return i.startHttp()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) Info() *model.Result[map[string]any] {
|
||||||
|
return model.NewOkResult(map[string]any{
|
||||||
|
"version": base.Version,
|
||||||
|
"runtime": runtime.Version(),
|
||||||
|
"os": runtime.GOOS,
|
||||||
|
"arch": runtime.GOARCH,
|
||||||
|
"inDocker": base.InDocker == "true",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) Resolve(req *base.Request) *model.Result[*download.ResolveResult] {
|
||||||
|
rr, err := i.downloader.Resolve(req)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[*download.ResolveResult](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewOkResult(rr)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) CreateTask(req *model.CreateTask) *model.Result[string] {
|
||||||
|
var (
|
||||||
|
taskId string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if req.Rid != "" {
|
||||||
|
taskId, err = i.downloader.Create(req.Rid, req.Opt)
|
||||||
|
} else if req.Req != nil {
|
||||||
|
taskId, err = i.downloader.CreateDirect(req.Req, req.Opt)
|
||||||
|
} else {
|
||||||
|
return model.NewErrorResult[string]("param invalid: rid or req", model.CodeInvalidParam)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[string](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewOkResult(taskId)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) CreateTaskBatch(req *model.CreateTaskBatch) *model.Result[[]string] {
|
||||||
|
if len(req.Reqs) == 0 {
|
||||||
|
return model.NewErrorResult[[]string]("param invalid: reqs", model.CodeInvalidParam)
|
||||||
|
}
|
||||||
|
taskIds, err := i.downloader.CreateDirectBatch(req.Reqs, req.Opt)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[[]string](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewOkResult(taskIds)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) PauseTask(taskId string) *model.Result[any] {
|
||||||
|
err := i.downloader.Pause(&download.TaskFilter{
|
||||||
|
ID: []string{taskId},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) PauseTasks(filter *download.TaskFilter) *model.Result[any] {
|
||||||
|
err := i.downloader.Pause(filter)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) ContinueTask(taskId string) *model.Result[any] {
|
||||||
|
err := i.downloader.Continue(&download.TaskFilter{
|
||||||
|
ID: []string{taskId},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) ContinueTasks(filter *download.TaskFilter) *model.Result[any] {
|
||||||
|
err := i.downloader.Continue(filter)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) DeleteTask(taskId string, force bool) *model.Result[any] {
|
||||||
|
err := i.downloader.Delete(&download.TaskFilter{
|
||||||
|
ID: []string{taskId},
|
||||||
|
}, force)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) DeleteTasks(filter *download.TaskFilter, force bool) *model.Result[any] {
|
||||||
|
err := i.downloader.Delete(filter, force)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) GetTask(taskId string) *model.Result[*download.Task] {
|
||||||
|
if taskId == "" {
|
||||||
|
return model.NewErrorResult[*download.Task]("param invalid: id", model.CodeInvalidParam)
|
||||||
|
}
|
||||||
|
task := i.downloader.GetTask(taskId)
|
||||||
|
if task == nil {
|
||||||
|
return model.NewErrorResult[*download.Task]("task not found", model.CodeTaskNotFound)
|
||||||
|
}
|
||||||
|
return model.NewOkResult(task)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) GetTasks(filter *download.TaskFilter) *model.Result[[]*download.Task] {
|
||||||
|
return model.NewOkResult(i.downloader.GetTasksByFilter(filter))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) GetTaskStats(taskId string) *model.Result[any] {
|
||||||
|
stats, err := i.downloader.GetTaskStats(taskId)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewOkResult(stats)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) GetConfig() *model.Result[*base.DownloaderStoreConfig] {
|
||||||
|
config, err := i.downloader.GetConfig()
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[*base.DownloaderStoreConfig](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewOkResult(config)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) PutConfig(cfg *base.DownloaderStoreConfig) *model.Result[any] {
|
||||||
|
err := i.downloader.PutConfig(cfg)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) InstallExtension(req *model.InstallExtension) *model.Result[string] {
|
||||||
|
var (
|
||||||
|
installedExt *download.Extension
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if req.DevMode {
|
||||||
|
installedExt, err = i.downloader.InstallExtensionByFolder(req.URL, true)
|
||||||
|
} else {
|
||||||
|
installedExt, err = i.downloader.InstallExtensionByGit(req.URL)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[string](err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
return model.NewOkResult(installedExt.Identity)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) GetExtension(identity string) *model.Result[*download.Extension] {
|
||||||
|
extension, err := i.downloader.GetExtension(identity)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[*download.Extension](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewOkResult(extension)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) GetExtensions() *model.Result[[]*download.Extension] {
|
||||||
|
return model.NewOkResult(i.downloader.GetExtensions())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) UpdateExtensionSettings(identity string, req *model.UpdateExtensionSettings) *model.Result[any] {
|
||||||
|
err := i.downloader.UpdateExtensionSettings(identity, req.Settings)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) SwitchExtension(identity string, req *model.SwitchExtension) *model.Result[any] {
|
||||||
|
err := i.downloader.SwitchExtension(identity, req.Status)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) DeleteExtension(identity string) *model.Result[any] {
|
||||||
|
err := i.downloader.DeleteExtension(identity)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) UpgradeCheckExtension(identity string) *model.Result[*model.UpgradeCheckExtensionResp] {
|
||||||
|
newVersion, err := i.downloader.UpgradeCheckExtension(identity)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[*model.UpgradeCheckExtensionResp](err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
return model.NewOkResult(&model.UpgradeCheckExtensionResp{
|
||||||
|
NewVersion: newVersion,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) UpgradeExtension(identity string) *model.Result[any] {
|
||||||
|
err := i.downloader.UpgradeExtension(identity)
|
||||||
|
if err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) Close() *model.Result[any] {
|
||||||
|
i.StopHttp()
|
||||||
|
if i.downloader != nil {
|
||||||
|
if err := i.downloader.Close(); err != nil {
|
||||||
|
i.downloader.Logger.Warn().Err(err).Msg("close downloader failed")
|
||||||
|
}
|
||||||
|
i.downloader = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Instance) Clear() *model.Result[any] {
|
||||||
|
if err := i.downloader.Clear(); err != nil {
|
||||||
|
return model.NewErrorResult[any](err.Error())
|
||||||
|
}
|
||||||
|
return model.NewNilResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
type Request struct {
|
||||||
|
Method string `json:"method"`
|
||||||
|
Params []any `json:"params"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Invoke support dynamic call method
|
||||||
|
func Invoke(instance *Instance, request *Request) (ret any) {
|
||||||
|
defer func() {
|
||||||
|
if err := recover(); err != nil {
|
||||||
|
ret = model.NewErrorResult[any](fmt.Sprintf("%v", err))
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
method, args := request.Method, request.Params
|
||||||
|
dsType := reflect.ValueOf(instance)
|
||||||
|
fn := dsType.MethodByName(method)
|
||||||
|
numIn := fn.Type().NumIn()
|
||||||
|
in := make([]reflect.Value, numIn)
|
||||||
|
for i := 0; i < numIn; i++ {
|
||||||
|
paramType := fn.Type().In(i)
|
||||||
|
arg := args[i]
|
||||||
|
if arg == nil {
|
||||||
|
in[i] = reflect.Zero(fn.Type().In(i))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
var param reflect.Value
|
||||||
|
var paramPtr any
|
||||||
|
if paramType.Kind() == reflect.Ptr {
|
||||||
|
param = reflect.New(paramType.Elem())
|
||||||
|
paramPtr = param.Interface()
|
||||||
|
} else {
|
||||||
|
param = reflect.New(paramType).Elem()
|
||||||
|
paramPtr = param.Addr().Interface()
|
||||||
|
}
|
||||||
|
if err := util.MapToStruct(arg, paramPtr); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
in[i] = param
|
||||||
|
}
|
||||||
|
retVals := fn.Call(in)
|
||||||
|
return retVals[0].Interface()
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/api/model"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/download"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestInvoke(t *testing.T) {
|
||||||
|
doTestInvoke(t, "Info", []any{}, model.CodeOk)
|
||||||
|
doTestInvoke(t, "Info1", []any{}, model.CodeError)
|
||||||
|
doTestInvoke(t, "CreateTask", []any{nil}, model.CodeError)
|
||||||
|
doTestInvoke(t, "GetTasks", nil, model.CodeError)
|
||||||
|
doTestInvoke(t, "GetTasks", []any{}, model.CodeError)
|
||||||
|
doTestInvoke(t, "GetTasks", []any{"{abc:123"}, model.CodeError)
|
||||||
|
doTestInvoke(t, "GetTasks", []any{&download.TaskFilter{}}, model.CodeOk)
|
||||||
|
doTestInvoke(t, "SwitchExtension", []any{"test", &model.SwitchExtension{Status: true}}, model.CodeError)
|
||||||
|
}
|
||||||
|
|
||||||
|
func doTestInvoke(t *testing.T, method string, params []any, expectCode model.RespCode) {
|
||||||
|
instance, _ := Create(nil)
|
||||||
|
defer instance.Close()
|
||||||
|
|
||||||
|
result := Invoke(instance, &Request{
|
||||||
|
Method: method,
|
||||||
|
Params: params,
|
||||||
|
})
|
||||||
|
buf, err := json.Marshal(result)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var res model.Result[any]
|
||||||
|
if err := json.Unmarshal(buf, &res); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if res.Code != expectCode {
|
||||||
|
t.Fatalf("Invoke method [%s] failed, expect code [%d], got [%d], msg: %s", method, expectCode, res.Code, res.Msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
+451
@@ -0,0 +1,451 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/api/model"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/download"
|
||||||
|
"github.com/gorilla/handlers"
|
||||||
|
"github.com/gorilla/mux"
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
"io"
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
const instanceKey string = "apiInstance"
|
||||||
|
|
||||||
|
func ListenHttp(httpCfg *base.DownloaderHttpConfig, ai *Instance) (int, func(), error) {
|
||||||
|
var r = mux.NewRouter()
|
||||||
|
r.Methods(http.MethodGet).Path("/api/v1/info").HandlerFunc(Info)
|
||||||
|
r.Methods(http.MethodPost).Path("/api/v1/resolve").HandlerFunc(Resolve)
|
||||||
|
r.Methods(http.MethodPost).Path("/api/v1/tasks").HandlerFunc(CreateTask)
|
||||||
|
r.Methods(http.MethodPost).Path("/api/v1/tasks/batch").HandlerFunc(CreateTaskBatch)
|
||||||
|
r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/pause").HandlerFunc(PauseTask)
|
||||||
|
r.Methods(http.MethodPut).Path("/api/v1/tasks/pause").HandlerFunc(PauseTasks)
|
||||||
|
r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/continue").HandlerFunc(ContinueTask)
|
||||||
|
r.Methods(http.MethodPut).Path("/api/v1/tasks/continue").HandlerFunc(ContinueTasks)
|
||||||
|
r.Methods(http.MethodDelete).Path("/api/v1/tasks/{id}").HandlerFunc(DeleteTask)
|
||||||
|
r.Methods(http.MethodDelete).Path("/api/v1/tasks").HandlerFunc(DeleteTasks)
|
||||||
|
r.Methods(http.MethodGet).Path("/api/v1/tasks/{id}").HandlerFunc(GetTask)
|
||||||
|
r.Methods(http.MethodGet).Path("/api/v1/tasks").HandlerFunc(GetTasks)
|
||||||
|
r.Methods(http.MethodGet).Path("/api/v1/tasks/{id}/stats").HandlerFunc(GetTaskStats)
|
||||||
|
r.Methods(http.MethodGet).Path("/api/v1/config").HandlerFunc(GetConfig)
|
||||||
|
r.Methods(http.MethodPut).Path("/api/v1/config").HandlerFunc(PutConfig)
|
||||||
|
r.Methods(http.MethodPost).Path("/api/v1/extensions").HandlerFunc(InstallExtension)
|
||||||
|
r.Methods(http.MethodGet).Path("/api/v1/extensions").HandlerFunc(GetExtensions)
|
||||||
|
r.Methods(http.MethodGet).Path("/api/v1/extensions/{identity}").HandlerFunc(GetExtension)
|
||||||
|
r.Methods(http.MethodPut).Path("/api/v1/extensions/{identity}/settings").HandlerFunc(UpdateExtensionSettings)
|
||||||
|
r.Methods(http.MethodPut).Path("/api/v1/extensions/{identity}/switch").HandlerFunc(SwitchExtension)
|
||||||
|
r.Methods(http.MethodDelete).Path("/api/v1/extensions/{identity}").HandlerFunc(DeleteExtension)
|
||||||
|
r.Methods(http.MethodGet).Path("/api/v1/extensions/{identity}/upgrade").HandlerFunc(UpgradeCheckExtension)
|
||||||
|
r.Methods(http.MethodPost).Path("/api/v1/extensions/{identity}/upgrade").HandlerFunc(UpgradeExtension)
|
||||||
|
if ai.startCfg.WebEnable {
|
||||||
|
r.Path("/api/v1/proxy").HandlerFunc(DoProxy)
|
||||||
|
r.PathPrefix("/fs/tasks").Handler(http.FileServer(&taskFileSystem{
|
||||||
|
downloader: ai.downloader,
|
||||||
|
}))
|
||||||
|
r.PathPrefix("/fs/extensions").Handler(http.FileServer(&extensionFileSystem{
|
||||||
|
downloader: ai.downloader,
|
||||||
|
}))
|
||||||
|
r.PathPrefix("/").Handler(http.FileServer(http.FS(ai.startCfg.WebFS)))
|
||||||
|
}
|
||||||
|
|
||||||
|
r.Use(func(h http.Handler) http.Handler {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
ctx := context.WithValue(r.Context(), instanceKey, ai)
|
||||||
|
h.ServeHTTP(w, r.WithContext(ctx))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
if httpCfg.ApiToken != "" || (ai.startCfg.WebEnable && ai.startCfg.WebBasicAuth != nil) {
|
||||||
|
r.Use(func(h http.Handler) http.Handler {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if httpCfg.ApiToken != "" && r.Header.Get("X-Api-Token") == httpCfg.ApiToken {
|
||||||
|
h.ServeHTTP(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if ai.startCfg.WebEnable && ai.startCfg.WebBasicAuth != nil {
|
||||||
|
if r.Header.Get("Authorization") == ai.startCfg.WebBasicAuth.Authorization() {
|
||||||
|
h.ServeHTTP(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Header().Set("WWW-Authenticate", "Basic realm=\"gopeed web\"")
|
||||||
|
}
|
||||||
|
WriteStatusJson(w, http.StatusUnauthorized, model.NewErrorResult[any]("unauthorized", model.CodeUnauthorized))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// recover panic
|
||||||
|
r.Use(func(h http.Handler) http.Handler {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
defer func() {
|
||||||
|
if v := recover(); v != nil {
|
||||||
|
err := errors.WithStack(fmt.Errorf("%v", v))
|
||||||
|
ai.downloader.Logger.Error().Stack().Err(err).Msgf("http server panic: %s %s", r.Method, r.RequestURI)
|
||||||
|
WriteJson(w, model.NewErrorResult[any](err.Error(), model.CodeError))
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
h.ServeHTTP(w, r)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
srv := &http.Server{Handler: handlers.CORS(
|
||||||
|
handlers.AllowedHeaders([]string{"Content-Type", "X-Api-Token", "X-Target-Uri"}),
|
||||||
|
handlers.AllowedMethods([]string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"}),
|
||||||
|
handlers.AllowedOrigins([]string{"*"}),
|
||||||
|
)(r)}
|
||||||
|
|
||||||
|
listener, err := net.Listen("tcp", net.JoinHostPort(httpCfg.Host, fmt.Sprintf("%d", httpCfg.Port)))
|
||||||
|
if err != nil {
|
||||||
|
return 0, nil, err
|
||||||
|
}
|
||||||
|
ai.srv = srv
|
||||||
|
ai.listener = listener
|
||||||
|
|
||||||
|
return listener.Addr().(*net.TCPAddr).Port, func() {
|
||||||
|
if err := srv.Serve(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
||||||
|
ai.downloader.Logger.Error().Err(err).Msg("http server listen error")
|
||||||
|
}
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getInstance(r *http.Request) *Instance {
|
||||||
|
return r.Context().Value(instanceKey).(*Instance)
|
||||||
|
}
|
||||||
|
|
||||||
|
func Info(w http.ResponseWriter, r *http.Request) {
|
||||||
|
WriteJson(w, getInstance(r).Info())
|
||||||
|
}
|
||||||
|
|
||||||
|
func Resolve(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req base.Request
|
||||||
|
if ReadJson(r, w, &req) {
|
||||||
|
WriteJson(w, getInstance(r).Resolve(&req))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func CreateTask(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req model.CreateTask
|
||||||
|
if ReadJson(r, w, &req) {
|
||||||
|
WriteJson(w, getInstance(r).CreateTask(&req))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func CreateTaskBatch(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req model.CreateTaskBatch
|
||||||
|
if ReadJson(r, w, &req) {
|
||||||
|
WriteJson(w, getInstance(r).CreateTaskBatch(&req))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func PauseTask(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var taskId string
|
||||||
|
if !parseTaskId(r, w, &taskId) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).PauseTask(taskId))
|
||||||
|
}
|
||||||
|
|
||||||
|
func PauseTasks(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var filter download.TaskFilter
|
||||||
|
if !parseFilter(r, w, &filter) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).PauseTasks(&filter))
|
||||||
|
}
|
||||||
|
|
||||||
|
func ContinueTask(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var taskId string
|
||||||
|
if !parseTaskId(r, w, &taskId) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).ContinueTask(taskId))
|
||||||
|
}
|
||||||
|
|
||||||
|
func ContinueTasks(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var filter download.TaskFilter
|
||||||
|
if !parseFilter(r, w, &filter) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).ContinueTasks(&filter))
|
||||||
|
}
|
||||||
|
|
||||||
|
func DeleteTask(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var taskId string
|
||||||
|
if !parseTaskId(r, w, &taskId) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
force := r.FormValue("force")
|
||||||
|
WriteJson(w, getInstance(r).DeleteTask(taskId, force == "true"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func DeleteTasks(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var filter download.TaskFilter
|
||||||
|
if !parseFilter(r, w, &filter) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
force := r.FormValue("force")
|
||||||
|
WriteJson(w, getInstance(r).DeleteTasks(&filter, force == "true"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetTask(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var taskId string
|
||||||
|
if !parseTaskId(r, w, &taskId) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).GetTask(taskId))
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetTasks(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var filter download.TaskFilter
|
||||||
|
if !parseFilter(r, w, &filter) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).GetTasks(&filter))
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetTaskStats(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var taskId string
|
||||||
|
if !parseTaskId(r, w, &taskId) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).GetTaskStats(taskId))
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetConfig(w http.ResponseWriter, r *http.Request) {
|
||||||
|
WriteJson(w, getInstance(r).GetConfig())
|
||||||
|
}
|
||||||
|
|
||||||
|
func PutConfig(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var cfg base.DownloaderStoreConfig
|
||||||
|
if !ReadJson(r, w, &cfg) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).PutConfig(&cfg))
|
||||||
|
}
|
||||||
|
|
||||||
|
func InstallExtension(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req model.InstallExtension
|
||||||
|
if !ReadJson(r, w, &req) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).InstallExtension(&req))
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetExtensions(w http.ResponseWriter, r *http.Request) {
|
||||||
|
WriteJson(w, getInstance(r).GetExtensions())
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetExtension(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var identity string
|
||||||
|
if !parseIdentity(r, w, &identity) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).GetExtension(identity))
|
||||||
|
}
|
||||||
|
|
||||||
|
func UpdateExtensionSettings(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var identity string
|
||||||
|
if !parseIdentity(r, w, &identity) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var req model.UpdateExtensionSettings
|
||||||
|
if !ReadJson(r, w, &req) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).UpdateExtensionSettings(identity, &req))
|
||||||
|
}
|
||||||
|
|
||||||
|
func SwitchExtension(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var identity string
|
||||||
|
if !parseIdentity(r, w, &identity) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var switchExtension model.SwitchExtension
|
||||||
|
if !ReadJson(r, w, &switchExtension) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).SwitchExtension(identity, &switchExtension))
|
||||||
|
}
|
||||||
|
|
||||||
|
func DeleteExtension(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var identity string
|
||||||
|
if !parseIdentity(r, w, &identity) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).DeleteExtension(identity))
|
||||||
|
}
|
||||||
|
|
||||||
|
func UpgradeCheckExtension(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var identity string
|
||||||
|
if !parseIdentity(r, w, &identity) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).UpgradeCheckExtension(identity))
|
||||||
|
}
|
||||||
|
|
||||||
|
func UpgradeExtension(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var identity string
|
||||||
|
if !parseIdentity(r, w, &identity) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, getInstance(r).UpgradeExtension(identity))
|
||||||
|
}
|
||||||
|
|
||||||
|
func DoProxy(w http.ResponseWriter, r *http.Request) {
|
||||||
|
target := r.Header.Get("X-Target-Uri")
|
||||||
|
if target == "" {
|
||||||
|
writeError(w, "param invalid: X-Target-Uri")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
targetUrl, err := url.Parse(target)
|
||||||
|
if err != nil {
|
||||||
|
writeError(w, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
r.RequestURI = ""
|
||||||
|
r.URL = targetUrl
|
||||||
|
r.Host = targetUrl.Host
|
||||||
|
resp, err := http.DefaultClient.Do(r)
|
||||||
|
if err != nil {
|
||||||
|
writeError(w, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
for k, vv := range resp.Header {
|
||||||
|
for _, v := range vv {
|
||||||
|
w.Header().Set(k, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
w.WriteHeader(resp.StatusCode)
|
||||||
|
buf, err := io.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
writeError(w, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Write(buf)
|
||||||
|
}
|
||||||
|
|
||||||
|
func parsePathParam(r *http.Request, w http.ResponseWriter, name string, value *string) bool {
|
||||||
|
vars := mux.Vars(r)
|
||||||
|
*value = vars[name]
|
||||||
|
if *value == "" {
|
||||||
|
WriteJson(w, model.NewErrorResult[any]("param invalid: id", model.CodeInvalidParam))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseTaskId(r *http.Request, w http.ResponseWriter, taskId *string) bool {
|
||||||
|
return parsePathParam(r, w, "id", taskId)
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseIdentity(r *http.Request, w http.ResponseWriter, identity *string) bool {
|
||||||
|
return parsePathParam(r, w, "identity", identity)
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseFilter(r *http.Request, w http.ResponseWriter, filter *download.TaskFilter) bool {
|
||||||
|
if err := r.ParseForm(); err != nil {
|
||||||
|
WriteJson(w, model.NewErrorResult[any](err.Error()))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
filter.ID = r.Form["id"]
|
||||||
|
filter.Status = convertStatues(r.Form["status"])
|
||||||
|
filter.NotStatus = convertStatues(r.Form["notStatus"])
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func convertStatues(statues []string) []base.Status {
|
||||||
|
result := make([]base.Status, 0)
|
||||||
|
for _, status := range statues {
|
||||||
|
result = append(result, base.Status(status))
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeError(w http.ResponseWriter, msg string) {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
w.Write([]byte(msg))
|
||||||
|
}
|
||||||
|
|
||||||
|
func ReadJson(r *http.Request, w http.ResponseWriter, v any) bool {
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(v); err != nil {
|
||||||
|
WriteJson(w, model.NewErrorResult[any](err.Error()))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func WriteJson(w http.ResponseWriter, v any) {
|
||||||
|
WriteStatusJson(w, http.StatusOK, v)
|
||||||
|
}
|
||||||
|
|
||||||
|
func WriteStatusJson(w http.ResponseWriter, statusCode int, v any) {
|
||||||
|
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||||
|
w.WriteHeader(statusCode)
|
||||||
|
json.NewEncoder(w).Encode(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolvePath(urlPath string, prefix string) (identity string, path string, err error) {
|
||||||
|
// remove prefix
|
||||||
|
clearPath := strings.TrimPrefix(urlPath, prefix)
|
||||||
|
// match extension identity, eg: /fs/extensions/identity/xxx
|
||||||
|
reg := regexp.MustCompile(`^/([^/]+)/(.*)$`)
|
||||||
|
if !reg.MatchString(clearPath) {
|
||||||
|
err = os.ErrNotExist
|
||||||
|
return
|
||||||
|
}
|
||||||
|
matched := reg.FindStringSubmatch(clearPath)
|
||||||
|
if len(matched) != 3 {
|
||||||
|
err = os.ErrNotExist
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return matched[1], matched[2], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// handle task file resource
|
||||||
|
type taskFileSystem struct {
|
||||||
|
downloader *download.Downloader
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *taskFileSystem) Open(name string) (http.File, error) {
|
||||||
|
// get extension identity
|
||||||
|
identity, path, err := resolvePath(name, "/fs/tasks")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
task := e.downloader.GetTask(identity)
|
||||||
|
if task == nil {
|
||||||
|
return nil, os.ErrNotExist
|
||||||
|
}
|
||||||
|
return os.Open(filepath.Join(task.Meta.RootDirPath(), path))
|
||||||
|
}
|
||||||
|
|
||||||
|
// handle extension file resource
|
||||||
|
type extensionFileSystem struct {
|
||||||
|
downloader *download.Downloader
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *extensionFileSystem) Open(name string) (http.File, error) {
|
||||||
|
// get extension identity
|
||||||
|
identity, path, err := resolvePath(name, "/fs/extensions")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
extension, err := e.downloader.GetExtension(identity)
|
||||||
|
if err != nil {
|
||||||
|
return nil, os.ErrNotExist
|
||||||
|
}
|
||||||
|
extensionPath := e.downloader.ExtensionPath(extension)
|
||||||
|
return os.Open(filepath.Join(extensionPath, path))
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package rest
|
package api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
@@ -7,9 +7,9 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/GopeedLab/gopeed/internal/test"
|
"github.com/GopeedLab/gopeed/internal/test"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/api/model"
|
||||||
"github.com/GopeedLab/gopeed/pkg/base"
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
"github.com/GopeedLab/gopeed/pkg/download"
|
"github.com/GopeedLab/gopeed/pkg/download"
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest/model"
|
|
||||||
"io"
|
"io"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
@@ -21,6 +21,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
httpInstance *Instance
|
||||||
restPort int
|
restPort int
|
||||||
|
|
||||||
taskReq = &base.Request{
|
taskReq = &base.Request{
|
||||||
@@ -90,7 +91,7 @@ func TestCreateTask(t *testing.T) {
|
|||||||
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
wg.Add(1)
|
wg.Add(1)
|
||||||
Downloader.Listener(func(event *download.Event) {
|
httpInstance.Listener(func(event *download.Event) {
|
||||||
if event.Key == download.EventKeyFinally {
|
if event.Key == download.EventKeyFinally {
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}
|
}
|
||||||
@@ -117,7 +118,7 @@ func TestCreateDirectTask(t *testing.T) {
|
|||||||
doTest(func() {
|
doTest(func() {
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
wg.Add(1)
|
wg.Add(1)
|
||||||
Downloader.Listener(func(event *download.Event) {
|
httpInstance.Listener(func(event *download.Event) {
|
||||||
if event.Key == download.EventKeyFinally {
|
if event.Key == download.EventKeyFinally {
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}
|
}
|
||||||
@@ -156,7 +157,7 @@ func TestCreateDirectTaskWithResoled(t *testing.T) {
|
|||||||
doTest(func() {
|
doTest(func() {
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
wg.Add(1)
|
wg.Add(1)
|
||||||
Downloader.Listener(func(event *download.Event) {
|
httpInstance.Listener(func(event *download.Event) {
|
||||||
if event.Key == download.EventKeyFinally {
|
if event.Key == download.EventKeyFinally {
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}
|
}
|
||||||
@@ -180,7 +181,7 @@ func TestPauseAndContinueTask(t *testing.T) {
|
|||||||
doTest(func() {
|
doTest(func() {
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
wg.Add(1)
|
wg.Add(1)
|
||||||
Downloader.Listener(func(event *download.Event) {
|
httpInstance.Listener(func(event *download.Event) {
|
||||||
switch event.Key {
|
switch event.Key {
|
||||||
case download.EventKeyFinally:
|
case download.EventKeyFinally:
|
||||||
wg.Done()
|
wg.Done()
|
||||||
@@ -214,10 +215,7 @@ func TestPauseAndContinueTask(t *testing.T) {
|
|||||||
|
|
||||||
func TestPauseAllAndContinueALLTasks(t *testing.T) {
|
func TestPauseAllAndContinueALLTasks(t *testing.T) {
|
||||||
doTest(func() {
|
doTest(func() {
|
||||||
cfg, err := Downloader.GetConfig()
|
cfg := UnwrapResult(httpInstance.GetConfig())
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
createAndPause := func() {
|
createAndPause := func() {
|
||||||
taskId := httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", createReq)
|
taskId := httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", createReq)
|
||||||
@@ -275,7 +273,7 @@ func TestDeleteAllTasks(t *testing.T) {
|
|||||||
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
wg.Add(taskCount)
|
wg.Add(taskCount)
|
||||||
Downloader.Listener(func(event *download.Event) {
|
httpInstance.Listener(func(event *download.Event) {
|
||||||
if event.Key == download.EventKeyFinally {
|
if event.Key == download.EventKeyFinally {
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}
|
}
|
||||||
@@ -301,7 +299,7 @@ func TestDeleteTasksByStatues(t *testing.T) {
|
|||||||
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
wg.Add(taskCount)
|
wg.Add(taskCount)
|
||||||
Downloader.Listener(func(event *download.Event) {
|
httpInstance.Listener(func(event *download.Event) {
|
||||||
if event.Key == download.EventKeyFinally {
|
if event.Key == download.EventKeyFinally {
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}
|
}
|
||||||
@@ -325,7 +323,7 @@ func TestGetTasks(t *testing.T) {
|
|||||||
doTest(func() {
|
doTest(func() {
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
wg.Add(1)
|
wg.Add(1)
|
||||||
Downloader.Listener(func(event *download.Event) {
|
httpInstance.Listener(func(event *download.Event) {
|
||||||
if event.Key == download.EventKeyFinally {
|
if event.Key == download.EventKeyFinally {
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}
|
}
|
||||||
@@ -354,7 +352,10 @@ func TestGetAndPutConfig(t *testing.T) {
|
|||||||
cfg := httpRequestCheckOk[*base.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
|
cfg := httpRequestCheckOk[*base.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
|
||||||
cfg.DownloadDir = "./download"
|
cfg.DownloadDir = "./download"
|
||||||
cfg.Extra = map[string]any{
|
cfg.Extra = map[string]any{
|
||||||
"serverConfig": &Config{
|
"serverConfig": &struct {
|
||||||
|
Host string `json:"host"`
|
||||||
|
Port int `json:"port"`
|
||||||
|
}{
|
||||||
Host: "127.0.0.1",
|
Host: "127.0.0.1",
|
||||||
Port: 8080,
|
Port: 8080,
|
||||||
},
|
},
|
||||||
@@ -446,16 +447,16 @@ func TestDeleteExtension(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestUpdateCheckExtension(t *testing.T) {
|
func TestUpgradeCheckExtension(t *testing.T) {
|
||||||
doTest(func() {
|
doTest(func() {
|
||||||
identity := httpRequestCheckOk[string](http.MethodPost, "/api/v1/extensions", installExtensionReq)
|
identity := httpRequestCheckOk[string](http.MethodPost, "/api/v1/extensions", installExtensionReq)
|
||||||
resp := httpRequestCheckOk[*model.UpdateCheckExtensionResp](http.MethodGet, "/api/v1/extensions/"+identity+"/update", nil)
|
resp := httpRequestCheckOk[*model.UpgradeCheckExtensionResp](http.MethodGet, "/api/v1/extensions/"+identity+"/upgrade", nil)
|
||||||
// no new version
|
// no new version
|
||||||
if resp.NewVersion != "" {
|
if resp.NewVersion != "" {
|
||||||
t.Errorf("UpdateCheckExtension() got = %v, want %v", resp.NewVersion, "")
|
t.Errorf("UpgradeCheckExtension() got = %v, want %v", resp.NewVersion, "")
|
||||||
}
|
}
|
||||||
// force update
|
// force update
|
||||||
httpRequestCheckOk[any](http.MethodPost, "/api/v1/extensions/"+identity+"/update", nil)
|
httpRequestCheckOk[any](http.MethodPost, "/api/v1/extensions/"+identity+"/upgrade", nil)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -506,13 +507,19 @@ func TestDoProxy(t *testing.T) {
|
|||||||
func TestApiToken(t *testing.T) {
|
func TestApiToken(t *testing.T) {
|
||||||
var cfg = &model.StartConfig{}
|
var cfg = &model.StartConfig{}
|
||||||
cfg.Init()
|
cfg.Init()
|
||||||
cfg.ApiToken = "123456"
|
cfg.DownloadConfig = &base.DownloaderStoreConfig{
|
||||||
fileListener := doStart(cfg)
|
Http: &base.DownloaderHttpConfig{
|
||||||
|
Enable: true,
|
||||||
|
ApiToken: "123456",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
httpInstance, _ = Create(cfg)
|
||||||
|
fileListener := doStart()
|
||||||
defer func() {
|
defer func() {
|
||||||
if err := fileListener.Close(); err != nil {
|
if err := fileListener.Close(); err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
Stop()
|
httpInstance.Close()
|
||||||
}()
|
}()
|
||||||
|
|
||||||
status, _ := doHttpRequest0(http.MethodGet, "/api/v1/config", nil, nil)
|
status, _ := doHttpRequest0(http.MethodGet, "/api/v1/config", nil, nil)
|
||||||
@@ -521,7 +528,7 @@ func TestApiToken(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
|
status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
|
||||||
"X-Api-Token": cfg.ApiToken,
|
"X-Api-Token": cfg.DownloadConfig.Http.ApiToken,
|
||||||
}, nil)
|
}, nil)
|
||||||
if status != http.StatusOK {
|
if status != http.StatusOK {
|
||||||
t.Errorf("TestApiToken() got = %v, want %v", status, http.StatusOK)
|
t.Errorf("TestApiToken() got = %v, want %v", status, http.StatusOK)
|
||||||
@@ -532,18 +539,24 @@ func TestApiToken(t *testing.T) {
|
|||||||
func TestAuthorization(t *testing.T) {
|
func TestAuthorization(t *testing.T) {
|
||||||
var cfg = &model.StartConfig{}
|
var cfg = &model.StartConfig{}
|
||||||
cfg.Init()
|
cfg.Init()
|
||||||
cfg.ApiToken = "123456"
|
cfg.DownloadConfig = &base.DownloaderStoreConfig{
|
||||||
|
Http: &base.DownloaderHttpConfig{
|
||||||
|
Enable: true,
|
||||||
|
ApiToken: "123456",
|
||||||
|
},
|
||||||
|
}
|
||||||
cfg.WebEnable = true
|
cfg.WebEnable = true
|
||||||
cfg.WebBasicAuth = &model.WebBasicAuth{
|
cfg.WebBasicAuth = &model.WebBasicAuth{
|
||||||
Username: "admin",
|
Username: "admin",
|
||||||
Password: "123456",
|
Password: "123456",
|
||||||
}
|
}
|
||||||
fileListener := doStart(cfg)
|
httpInstance, _ = Create(cfg)
|
||||||
|
fileListener := doStart()
|
||||||
defer func() {
|
defer func() {
|
||||||
if err := fileListener.Close(); err != nil {
|
if err := fileListener.Close(); err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
Stop()
|
httpInstance.Close()
|
||||||
}()
|
}()
|
||||||
|
|
||||||
status, _ := doHttpRequest0(http.MethodGet, "/api/v1/config", nil, nil)
|
status, _ := doHttpRequest0(http.MethodGet, "/api/v1/config", nil, nil)
|
||||||
@@ -559,7 +572,7 @@ func TestAuthorization(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
|
status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
|
||||||
"X-Api-Token": cfg.ApiToken,
|
"X-Api-Token": cfg.DownloadConfig.Http.ApiToken,
|
||||||
}, nil)
|
}, nil)
|
||||||
if status != http.StatusOK {
|
if status != http.StatusOK {
|
||||||
t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusOK)
|
t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusOK)
|
||||||
@@ -573,17 +586,23 @@ func doTest(handler func()) {
|
|||||||
cfg.Storage = storage
|
cfg.Storage = storage
|
||||||
cfg.StorageDir = ".test_storage"
|
cfg.StorageDir = ".test_storage"
|
||||||
cfg.WebEnable = true
|
cfg.WebEnable = true
|
||||||
fileListener := doStart(cfg)
|
cfg.DownloadConfig = &base.DownloaderStoreConfig{
|
||||||
|
Http: &base.DownloaderHttpConfig{
|
||||||
|
Enable: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
httpInstance, _ = Create(cfg)
|
||||||
|
fileListener := doStart()
|
||||||
defer func() {
|
defer func() {
|
||||||
if err := fileListener.Close(); err != nil {
|
if err := fileListener.Close(); err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
Stop()
|
httpInstance.StopHttp()
|
||||||
Downloader.Clear()
|
httpInstance.Clear()
|
||||||
}()
|
}()
|
||||||
defer func() {
|
defer func() {
|
||||||
Downloader.Pause(nil)
|
httpInstance.PauseTasks(nil)
|
||||||
Downloader.Delete(nil, true)
|
httpInstance.DeleteTasks(nil, true)
|
||||||
os.RemoveAll(cfg.StorageDir)
|
os.RemoveAll(cfg.StorageDir)
|
||||||
}()
|
}()
|
||||||
taskReq.URL = "http://" + fileListener.Addr().String() + "/" + test.BuildName
|
taskReq.URL = "http://" + fileListener.Addr().String() + "/" + test.BuildName
|
||||||
@@ -593,15 +612,19 @@ func doTest(handler func()) {
|
|||||||
testFunc(model.StorageBolt)
|
testFunc(model.StorageBolt)
|
||||||
}
|
}
|
||||||
|
|
||||||
func doStart(cfg *model.StartConfig) net.Listener {
|
func doStart() net.Listener {
|
||||||
port, err := Start(cfg)
|
port := UnwrapResult(httpInstance.StartHttp())
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
restPort = port
|
restPort = port
|
||||||
return test.StartTestFileServer()
|
return test.StartTestFileServer()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func UnwrapResult[T any](result *model.Result[T]) T {
|
||||||
|
if result.HasError() {
|
||||||
|
panic(result.Msg)
|
||||||
|
}
|
||||||
|
return result.Data
|
||||||
|
}
|
||||||
|
|
||||||
func doHttpRequest0(method string, path string, headers map[string]string, body any) (int, []byte) {
|
func doHttpRequest0(method string, path string, headers map[string]string, body any) (int, []byte) {
|
||||||
var reader io.Reader
|
var reader io.Reader
|
||||||
if body != nil {
|
if body != nil {
|
||||||
@@ -14,13 +14,10 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type StartConfig struct {
|
type StartConfig struct {
|
||||||
Network string `json:"network"`
|
|
||||||
Address string `json:"address"`
|
|
||||||
RefreshInterval int `json:"refreshInterval"`
|
RefreshInterval int `json:"refreshInterval"`
|
||||||
Storage Storage `json:"storage"`
|
Storage Storage `json:"storage"`
|
||||||
StorageDir string `json:"storageDir"`
|
StorageDir string `json:"storageDir"`
|
||||||
WhiteDownloadDirs []string `json:"whiteDownloadDirs"`
|
WhiteDownloadDirs []string `json:"whiteDownloadDirs"`
|
||||||
ApiToken string `json:"apiToken"`
|
|
||||||
DownloadConfig *base.DownloaderStoreConfig `json:"downloadConfig"`
|
DownloadConfig *base.DownloaderStoreConfig `json:"downloadConfig"`
|
||||||
|
|
||||||
ProductionMode bool
|
ProductionMode bool
|
||||||
@@ -31,12 +28,6 @@ type StartConfig struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (cfg *StartConfig) Init() *StartConfig {
|
func (cfg *StartConfig) Init() *StartConfig {
|
||||||
if cfg.Network == "" {
|
|
||||||
cfg.Network = "tcp"
|
|
||||||
}
|
|
||||||
if cfg.Address == "" {
|
|
||||||
cfg.Address = "127.0.0.1:0"
|
|
||||||
}
|
|
||||||
if cfg.RefreshInterval == 0 {
|
if cfg.RefreshInterval == 0 {
|
||||||
cfg.RefreshInterval = 350
|
cfg.RefreshInterval = 350
|
||||||
}
|
}
|
||||||
@@ -59,3 +50,9 @@ func (cfg *WebBasicAuth) Authorization() string {
|
|||||||
userId := cfg.Username + ":" + cfg.Password
|
userId := cfg.Username + ":" + cfg.Password
|
||||||
return "Basic " + base64.StdEncoding.EncodeToString([]byte(userId))
|
return "Basic " + base64.StdEncoding.EncodeToString([]byte(userId))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type HttpListenResult struct {
|
||||||
|
Host string `json:"host"`
|
||||||
|
// Port is the http server real listen port.
|
||||||
|
Port int `json:"port"`
|
||||||
|
}
|
||||||
@@ -13,6 +13,6 @@ type SwitchExtension struct {
|
|||||||
Status bool `json:"status"`
|
Status bool `json:"status"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type UpdateCheckExtensionResp struct {
|
type UpgradeCheckExtensionResp struct {
|
||||||
NewVersion string `json:"newVersion"`
|
NewVersion string `json:"newVersion"`
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
package model
|
package model
|
||||||
|
|
||||||
|
import "encoding/json"
|
||||||
|
|
||||||
type RespCode int
|
type RespCode int
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -20,6 +22,15 @@ type Result[T any] struct {
|
|||||||
Data T `json:"data"`
|
Data T `json:"data"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *Result[T]) Json() string {
|
||||||
|
buf, _ := json.Marshal(r)
|
||||||
|
return string(buf)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Result[T]) HasError() bool {
|
||||||
|
return r.Code != CodeOk
|
||||||
|
}
|
||||||
|
|
||||||
func NewOkResult[T any](data T) *Result[T] {
|
func NewOkResult[T any](data T) *Result[T] {
|
||||||
return &Result[T]{
|
return &Result[T]{
|
||||||
Code: CodeOk,
|
Code: CodeOk,
|
||||||
@@ -33,14 +44,14 @@ func NewNilResult() *Result[any] {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewErrorResult(msg string, code ...RespCode) *Result[any] {
|
func NewErrorResult[T any](msg string, code ...RespCode) *Result[T] {
|
||||||
// if code is not provided, the default code is CodeError
|
// if code is not provided, the default code is CodeError
|
||||||
c := CodeError
|
c := CodeError
|
||||||
if len(code) > 0 {
|
if len(code) > 0 {
|
||||||
c = code[0]
|
c = code[0]
|
||||||
}
|
}
|
||||||
|
|
||||||
return &Result[any]{
|
return &Result[T]{
|
||||||
Code: c,
|
Code: c,
|
||||||
Msg: msg,
|
Msg: msg,
|
||||||
}
|
}
|
||||||
File renamed without changes.
@@ -15,7 +15,6 @@ const (
|
|||||||
HttpCodeOK = 200
|
HttpCodeOK = 200
|
||||||
HttpCodePartialContent = 206
|
HttpCodePartialContent = 206
|
||||||
|
|
||||||
HttpHeaderHost = "Host"
|
|
||||||
HttpHeaderRange = "Range"
|
HttpHeaderRange = "Range"
|
||||||
HttpHeaderAcceptRanges = "Accept-Ranges"
|
HttpHeaderAcceptRanges = "Accept-Ranges"
|
||||||
HttpHeaderContentLength = "Content-Length"
|
HttpHeaderContentLength = "Content-Length"
|
||||||
|
|||||||
@@ -171,6 +171,7 @@ type DownloaderStoreConfig struct {
|
|||||||
MaxRunning int `json:"maxRunning"` // MaxRunning is the max running download count
|
MaxRunning int `json:"maxRunning"` // MaxRunning is the max running download count
|
||||||
ProtocolConfig map[string]any `json:"protocolConfig"` // ProtocolConfig is special config for each protocol
|
ProtocolConfig map[string]any `json:"protocolConfig"` // ProtocolConfig is special config for each protocol
|
||||||
Extra map[string]any `json:"extra"`
|
Extra map[string]any `json:"extra"`
|
||||||
|
Http *DownloaderHttpConfig `json:"http"`
|
||||||
Proxy *DownloaderProxyConfig `json:"proxy"`
|
Proxy *DownloaderProxyConfig `json:"proxy"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,6 +182,12 @@ func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
|
|||||||
if cfg.ProtocolConfig == nil {
|
if cfg.ProtocolConfig == nil {
|
||||||
cfg.ProtocolConfig = make(map[string]any)
|
cfg.ProtocolConfig = make(map[string]any)
|
||||||
}
|
}
|
||||||
|
if cfg.Extra == nil {
|
||||||
|
cfg.Extra = make(map[string]any)
|
||||||
|
}
|
||||||
|
if cfg.Http == nil {
|
||||||
|
cfg.Http = &DownloaderHttpConfig{}
|
||||||
|
}
|
||||||
if cfg.Proxy == nil {
|
if cfg.Proxy == nil {
|
||||||
cfg.Proxy = &DownloaderProxyConfig{}
|
cfg.Proxy = &DownloaderProxyConfig{}
|
||||||
}
|
}
|
||||||
@@ -203,12 +210,28 @@ func (cfg *DownloaderStoreConfig) Merge(beforeCfg *DownloaderStoreConfig) *Downl
|
|||||||
if cfg.Extra == nil {
|
if cfg.Extra == nil {
|
||||||
cfg.Extra = beforeCfg.Extra
|
cfg.Extra = beforeCfg.Extra
|
||||||
}
|
}
|
||||||
|
if cfg.Http == nil {
|
||||||
|
cfg.Http = beforeCfg.Http
|
||||||
|
}
|
||||||
if cfg.Proxy == nil {
|
if cfg.Proxy == nil {
|
||||||
cfg.Proxy = beforeCfg.Proxy
|
cfg.Proxy = beforeCfg.Proxy
|
||||||
}
|
}
|
||||||
return cfg
|
return cfg
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type DownloaderHttpConfig struct {
|
||||||
|
// Enable is the flag that enable http server
|
||||||
|
Enable bool `json:"Enable"`
|
||||||
|
// Host is the http server listen address.
|
||||||
|
Host string `json:"host"`
|
||||||
|
// Port is the http server listen port.
|
||||||
|
Port int `json:"port"`
|
||||||
|
// ApiToken is the auth token for http API
|
||||||
|
ApiToken string `json:"apiToken"`
|
||||||
|
// RunningPort is the http server real listen port.
|
||||||
|
RunningPort int `json:"runningPort"`
|
||||||
|
}
|
||||||
|
|
||||||
type DownloaderProxyConfig struct {
|
type DownloaderProxyConfig struct {
|
||||||
Enable bool `json:"enable"`
|
Enable bool `json:"enable"`
|
||||||
// System is the flag that use system proxy
|
// System is the flag that use system proxy
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
|
|||||||
&DownloaderStoreConfig{
|
&DownloaderStoreConfig{
|
||||||
MaxRunning: 5,
|
MaxRunning: 5,
|
||||||
ProtocolConfig: map[string]any{},
|
ProtocolConfig: map[string]any{},
|
||||||
|
Extra: make(map[string]any),
|
||||||
|
Http: &DownloaderHttpConfig{},
|
||||||
Proxy: &DownloaderProxyConfig{},
|
Proxy: &DownloaderProxyConfig{},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -28,6 +30,8 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
|
|||||||
&DownloaderStoreConfig{
|
&DownloaderStoreConfig{
|
||||||
MaxRunning: 10,
|
MaxRunning: 10,
|
||||||
ProtocolConfig: map[string]any{},
|
ProtocolConfig: map[string]any{},
|
||||||
|
Extra: make(map[string]any),
|
||||||
|
Http: &DownloaderHttpConfig{},
|
||||||
Proxy: &DownloaderProxyConfig{},
|
Proxy: &DownloaderProxyConfig{},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -43,6 +47,8 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
|
|||||||
ProtocolConfig: map[string]any{
|
ProtocolConfig: map[string]any{
|
||||||
"key": "value",
|
"key": "value",
|
||||||
},
|
},
|
||||||
|
Extra: make(map[string]any),
|
||||||
|
Http: &DownloaderHttpConfig{},
|
||||||
Proxy: &DownloaderProxyConfig{},
|
Proxy: &DownloaderProxyConfig{},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -56,6 +62,8 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
|
|||||||
&DownloaderStoreConfig{
|
&DownloaderStoreConfig{
|
||||||
MaxRunning: 5,
|
MaxRunning: 5,
|
||||||
ProtocolConfig: map[string]any{},
|
ProtocolConfig: map[string]any{},
|
||||||
|
Extra: make(map[string]any),
|
||||||
|
Http: &DownloaderHttpConfig{},
|
||||||
Proxy: &DownloaderProxyConfig{
|
Proxy: &DownloaderProxyConfig{
|
||||||
Enable: true,
|
Enable: true,
|
||||||
},
|
},
|
||||||
|
|||||||
+18
-15
@@ -252,7 +252,7 @@ func (d *Downloader) setupFetcher(fm fetcher.FetcherManager, fetcher fetcher.Fet
|
|||||||
ctl.GetConfig = func(v any) {
|
ctl.GetConfig = func(v any) {
|
||||||
d.getProtocolConfig(fm.Name(), v)
|
d.getProtocolConfig(fm.Name(), v)
|
||||||
}
|
}
|
||||||
// Get proxy config, task request proxy config has higher priority, then use global proxy config
|
// get proxy config, task request proxy config has higher priority, then use global proxy config
|
||||||
ctl.GetProxy = func(requestProxy *base.RequestProxy) func(*gohttp.Request) (*url.URL, error) {
|
ctl.GetProxy = func(requestProxy *base.RequestProxy) func(*gohttp.Request) (*url.URL, error) {
|
||||||
if requestProxy == nil {
|
if requestProxy == nil {
|
||||||
return d.cfg.Proxy.ToHandler()
|
return d.cfg.Proxy.ToHandler()
|
||||||
@@ -390,7 +390,7 @@ func (d *Downloader) Pause(filter *TaskFilter) (err error) {
|
|||||||
return d.pauseAll()
|
return d.pauseAll()
|
||||||
}
|
}
|
||||||
|
|
||||||
filter.NotStatuses = []base.Status{base.DownloadStatusPause, base.DownloadStatusError, base.DownloadStatusDone}
|
filter.NotStatus = []base.Status{base.DownloadStatusPause, base.DownloadStatusError, base.DownloadStatusDone}
|
||||||
pauseTasks := d.GetTasksByFilter(filter)
|
pauseTasks := d.GetTasksByFilter(filter)
|
||||||
if len(pauseTasks) == 0 {
|
if len(pauseTasks) == 0 {
|
||||||
return ErrTaskNotFound
|
return ErrTaskNotFound
|
||||||
@@ -430,7 +430,7 @@ func (d *Downloader) Continue(filter *TaskFilter) (err error) {
|
|||||||
return d.continueAll()
|
return d.continueAll()
|
||||||
}
|
}
|
||||||
|
|
||||||
filter.NotStatuses = []base.Status{base.DownloadStatusRunning, base.DownloadStatusDone}
|
filter.NotStatus = []base.Status{base.DownloadStatusRunning, base.DownloadStatusDone}
|
||||||
continueTasks := d.GetTasksByFilter(filter)
|
continueTasks := d.GetTasksByFilter(filter)
|
||||||
if len(continueTasks) == 0 {
|
if len(continueTasks) == 0 {
|
||||||
return ErrTaskNotFound
|
return ErrTaskNotFound
|
||||||
@@ -527,7 +527,7 @@ func (d *Downloader) ContinueBatch(filter *TaskFilter) (err error) {
|
|||||||
|
|
||||||
func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
|
func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
|
||||||
if filter == nil || filter.IsEmpty() {
|
if filter == nil || filter.IsEmpty() {
|
||||||
return d.deleteAll()
|
return d.deleteAll(force)
|
||||||
}
|
}
|
||||||
|
|
||||||
deleteTasks := d.GetTasksByFilter(filter)
|
deleteTasks := d.GetTasksByFilter(filter)
|
||||||
@@ -572,24 +572,27 @@ func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Downloader) deleteAll() (err error) {
|
func (d *Downloader) deleteAll(force bool) (err error) {
|
||||||
|
deleteTasksPtr := make([]*Task, 0)
|
||||||
|
|
||||||
func() {
|
func() {
|
||||||
d.lock.Lock()
|
d.lock.Lock()
|
||||||
defer d.lock.Unlock()
|
defer d.lock.Unlock()
|
||||||
|
|
||||||
|
deleteTasksPtr = append(deleteTasksPtr, d.tasks...)
|
||||||
d.tasks = make([]*Task, 0)
|
d.tasks = make([]*Task, 0)
|
||||||
d.waitTasks = make([]*Task, 0)
|
d.waitTasks = make([]*Task, 0)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
for _, task := range d.tasks {
|
for _, task := range deleteTasksPtr {
|
||||||
if err = d.doDelete(task, true); err != nil {
|
if err = d.doDelete(task, force); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Downloader) Stats(id string) (sr any, err error) {
|
func (d *Downloader) GetTaskStats(id string) (sr any, err error) {
|
||||||
task := d.GetTask(id)
|
task := d.GetTask(id)
|
||||||
if task == nil {
|
if task == nil {
|
||||||
return sr, ErrTaskNotFound
|
return sr, ErrTaskNotFound
|
||||||
@@ -719,10 +722,10 @@ func (d *Downloader) GetTasksByFilter(filter *TaskFilter) []*Task {
|
|||||||
}
|
}
|
||||||
|
|
||||||
idMatch := func(task *Task) bool {
|
idMatch := func(task *Task) bool {
|
||||||
if len(filter.IDs) == 0 {
|
if len(filter.ID) == 0 {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
for _, id := range filter.IDs {
|
for _, id := range filter.ID {
|
||||||
if task.ID == id {
|
if task.ID == id {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -730,10 +733,10 @@ func (d *Downloader) GetTasksByFilter(filter *TaskFilter) []*Task {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
statusMatch := func(task *Task) bool {
|
statusMatch := func(task *Task) bool {
|
||||||
if len(filter.Statuses) == 0 {
|
if len(filter.Status) == 0 {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
for _, status := range filter.Statuses {
|
for _, status := range filter.Status {
|
||||||
if task.Status == status {
|
if task.Status == status {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -741,10 +744,10 @@ func (d *Downloader) GetTasksByFilter(filter *TaskFilter) []*Task {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
notStatusMatch := func(task *Task) bool {
|
notStatusMatch := func(task *Task) bool {
|
||||||
if len(filter.NotStatuses) == 0 {
|
if len(filter.NotStatus) == 0 {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
for _, status := range filter.NotStatuses {
|
for _, status := range filter.NotStatus {
|
||||||
if task.Status == status {
|
if task.Status == status {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
@@ -826,7 +829,7 @@ func (d *Downloader) watch(task *Task) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// When delete a not resolved task, need check if the task resource is nil
|
// When delete a not resolved task, need check if the task resource is nil
|
||||||
if task.Meta.Res == nil || d.GetTask(task.ID) == nil {
|
if task.Meta.Res == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -400,7 +400,7 @@ func TestDownloader_StoreAndRestore(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 1001)
|
time.Sleep(time.Millisecond * 1001)
|
||||||
err = downloader.Pause(&TaskFilter{IDs: []string{id}})
|
err = downloader.Pause(&TaskFilter{ID: []string{id}})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
@@ -424,7 +424,7 @@ func TestDownloader_StoreAndRestore(t *testing.T) {
|
|||||||
wg.Done()
|
wg.Done()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
err = downloader.Continue(&TaskFilter{IDs: []string{id}})
|
err = downloader.Continue(&TaskFilter{ID: []string{id}})
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
@@ -551,7 +551,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("GetTasksByFilter ids", func(t *testing.T) {
|
t.Run("GetTasksByFilter ids", func(t *testing.T) {
|
||||||
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
IDs: taskIds,
|
ID: taskIds,
|
||||||
})
|
})
|
||||||
if len(tasks) != len(reqs) {
|
if len(tasks) != len(reqs) {
|
||||||
t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), len(reqs))
|
t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), len(reqs))
|
||||||
@@ -560,7 +560,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("GetTasksByFilter match ids", func(t *testing.T) {
|
t.Run("GetTasksByFilter match ids", func(t *testing.T) {
|
||||||
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
IDs: []string{taskIds[0]},
|
ID: []string{taskIds[0]},
|
||||||
})
|
})
|
||||||
if len(tasks) != 1 {
|
if len(tasks) != 1 {
|
||||||
t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), 1)
|
t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), 1)
|
||||||
@@ -569,7 +569,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("GetTasksByFilter not match ids", func(t *testing.T) {
|
t.Run("GetTasksByFilter not match ids", func(t *testing.T) {
|
||||||
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
IDs: []string{"xxx"},
|
ID: []string{"xxx"},
|
||||||
})
|
})
|
||||||
if len(tasks) != 0 {
|
if len(tasks) != 0 {
|
||||||
t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), 0)
|
t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), 0)
|
||||||
@@ -578,7 +578,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("GetTasksByFilter status", func(t *testing.T) {
|
t.Run("GetTasksByFilter status", func(t *testing.T) {
|
||||||
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
Statuses: []base.Status{base.DownloadStatusDone},
|
Status: []base.Status{base.DownloadStatusDone},
|
||||||
})
|
})
|
||||||
if len(tasks) != len(reqs) {
|
if len(tasks) != len(reqs) {
|
||||||
t.Errorf("GetTasksByFilter status task got = %v, want %v", len(tasks), len(reqs))
|
t.Errorf("GetTasksByFilter status task got = %v, want %v", len(tasks), len(reqs))
|
||||||
@@ -587,7 +587,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("GetTasksByFilter not match status", func(t *testing.T) {
|
t.Run("GetTasksByFilter not match status", func(t *testing.T) {
|
||||||
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
Statuses: []base.Status{base.DownloadStatusError},
|
Status: []base.Status{base.DownloadStatusError},
|
||||||
})
|
})
|
||||||
if len(tasks) != 0 {
|
if len(tasks) != 0 {
|
||||||
t.Errorf("GetTasksByFilter status task got = %v, want %v", len(tasks), 0)
|
t.Errorf("GetTasksByFilter status task got = %v, want %v", len(tasks), 0)
|
||||||
@@ -596,7 +596,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("GetTasksByFilter match notStatus", func(t *testing.T) {
|
t.Run("GetTasksByFilter match notStatus", func(t *testing.T) {
|
||||||
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
NotStatuses: []base.Status{base.DownloadStatusRunning, base.DownloadStatusPause},
|
NotStatus: []base.Status{base.DownloadStatusRunning, base.DownloadStatusPause},
|
||||||
})
|
})
|
||||||
if len(tasks) != len(reqs) {
|
if len(tasks) != len(reqs) {
|
||||||
t.Errorf("GetTasksByFilter match notStatus task got = %v, want %v", len(tasks), len(reqs))
|
t.Errorf("GetTasksByFilter match notStatus task got = %v, want %v", len(tasks), len(reqs))
|
||||||
@@ -605,7 +605,7 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("GetTasksByFilter not match notStatus", func(t *testing.T) {
|
t.Run("GetTasksByFilter not match notStatus", func(t *testing.T) {
|
||||||
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
NotStatuses: []base.Status{base.DownloadStatusDone},
|
NotStatus: []base.Status{base.DownloadStatusDone},
|
||||||
})
|
})
|
||||||
if len(tasks) != 0 {
|
if len(tasks) != 0 {
|
||||||
t.Errorf("GetTasksByFilter not match notStatus task got = %v, want %v", len(tasks), 0)
|
t.Errorf("GetTasksByFilter not match notStatus task got = %v, want %v", len(tasks), 0)
|
||||||
@@ -614,8 +614,8 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("GetTasksByFilter match ids and status", func(t *testing.T) {
|
t.Run("GetTasksByFilter match ids and status", func(t *testing.T) {
|
||||||
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
IDs: []string{taskIds[0]},
|
ID: []string{taskIds[0]},
|
||||||
Statuses: []base.Status{base.DownloadStatusDone},
|
Status: []base.Status{base.DownloadStatusDone},
|
||||||
})
|
})
|
||||||
if len(tasks) != 1 {
|
if len(tasks) != 1 {
|
||||||
t.Errorf("GetTasksByFilter match ids and status task got = %v, want %v", len(tasks), 1)
|
t.Errorf("GetTasksByFilter match ids and status task got = %v, want %v", len(tasks), 1)
|
||||||
@@ -624,8 +624,8 @@ func TestDownloader_GetTasksByFilter(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("GetTasksByFilter not match ids and status", func(t *testing.T) {
|
t.Run("GetTasksByFilter not match ids and status", func(t *testing.T) {
|
||||||
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
IDs: []string{taskIds[0]},
|
ID: []string{taskIds[0]},
|
||||||
Statuses: []base.Status{base.DownloadStatusError},
|
Status: []base.Status{base.DownloadStatusError},
|
||||||
})
|
})
|
||||||
if len(tasks) != 0 {
|
if len(tasks) != 0 {
|
||||||
t.Errorf("GetTasksByFilter not match ids and status task got = %v, want %v", len(tasks), 0)
|
t.Errorf("GetTasksByFilter not match ids and status task got = %v, want %v", len(tasks), 0)
|
||||||
|
|||||||
@@ -702,34 +702,38 @@ type OnDoneContext struct {
|
|||||||
Task *Task `json:"task"`
|
Task *Task `json:"task"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ExtensionTask is a wrapper of Task, it's used to interact with extension scripts.
|
|
||||||
// Avoid extension scripts modifying task directly, use ExtensionTask to encapsulate task,
|
|
||||||
// only some fields can be modified, such as request info.
|
|
||||||
type ExtensionTask struct {
|
type ExtensionTask struct {
|
||||||
download *Downloader
|
download *Downloader
|
||||||
|
task *Task
|
||||||
|
|
||||||
*Task
|
Meta *ExtensionTaskMeta `json:"meta"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExtensionTaskMeta restricts extension scripts to only modify request info
|
||||||
|
type ExtensionTaskMeta struct {
|
||||||
|
Req *base.Request `json:"req"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewExtensionTask(download *Downloader, task *Task) *ExtensionTask {
|
func NewExtensionTask(download *Downloader, task *Task) *ExtensionTask {
|
||||||
// restricts extension scripts to only modify request info
|
|
||||||
newTask := task.clone()
|
newTask := task.clone()
|
||||||
newTask.Meta.Req = task.Meta.Req
|
|
||||||
return &ExtensionTask{
|
return &ExtensionTask{
|
||||||
|
task: newTask,
|
||||||
download: download,
|
download: download,
|
||||||
Task: newTask,
|
Meta: &ExtensionTaskMeta{
|
||||||
|
Req: task.Meta.Req,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *ExtensionTask) Continue() error {
|
func (t *ExtensionTask) Continue() error {
|
||||||
return t.download.Continue(&TaskFilter{
|
return t.download.Continue(&TaskFilter{
|
||||||
IDs: []string{t.ID},
|
ID: []string{t.task.ID},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *ExtensionTask) Pause() error {
|
func (t *ExtensionTask) Pause() error {
|
||||||
return t.download.Pause(&TaskFilter{
|
return t.download.Pause(&TaskFilter{
|
||||||
IDs: []string{t.ID},
|
ID: []string{t.task.ID},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ func (t *Task) Name() string {
|
|||||||
return t.Meta.Res.Name
|
return t.Meta.Res.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get the name of the first file
|
// get the name of the first file
|
||||||
return t.Meta.Res.Files[0].Name
|
return t.Meta.Res.Files[0].Name
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,13 +113,13 @@ func (t *Task) calcSpeed(speedArr []int64, downloaded int64, usedTime float64) i
|
|||||||
}
|
}
|
||||||
|
|
||||||
type TaskFilter struct {
|
type TaskFilter struct {
|
||||||
IDs []string
|
ID []string `json:"id"`
|
||||||
Statuses []base.Status
|
Status []base.Status `json:"status"`
|
||||||
NotStatuses []base.Status
|
NotStatus []base.Status `json:"notStatus"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *TaskFilter) IsEmpty() bool {
|
func (f *TaskFilter) IsEmpty() bool {
|
||||||
return len(f.IDs) == 0 && len(f.Statuses) == 0 && len(f.NotStatuses) == 0
|
return len(f.ID) == 0 && len(f.Status) == 0 && len(f.NotStatus) == 0
|
||||||
}
|
}
|
||||||
|
|
||||||
type DownloaderConfig struct {
|
type DownloaderConfig struct {
|
||||||
|
|||||||
-389
@@ -1,389 +0,0 @@
|
|||||||
package rest
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/base"
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/download"
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest/model"
|
|
||||||
"github.com/gorilla/mux"
|
|
||||||
"io"
|
|
||||||
"net/http"
|
|
||||||
"net/url"
|
|
||||||
"runtime"
|
|
||||||
)
|
|
||||||
|
|
||||||
func Info(w http.ResponseWriter, r *http.Request) {
|
|
||||||
info := map[string]any{
|
|
||||||
"version": base.Version,
|
|
||||||
"runtime": runtime.Version(),
|
|
||||||
"os": runtime.GOOS,
|
|
||||||
"arch": runtime.GOARCH,
|
|
||||||
"inDocker": base.InDocker == "true",
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewOkResult(info))
|
|
||||||
}
|
|
||||||
|
|
||||||
func Resolve(w http.ResponseWriter, r *http.Request) {
|
|
||||||
var req base.Request
|
|
||||||
if ReadJson(r, w, &req) {
|
|
||||||
rr, err := Downloader.Resolve(&req)
|
|
||||||
if err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewOkResult(rr))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func CreateTask(w http.ResponseWriter, r *http.Request) {
|
|
||||||
var req model.CreateTask
|
|
||||||
if ReadJson(r, w, &req) {
|
|
||||||
var (
|
|
||||||
taskId string
|
|
||||||
err error
|
|
||||||
)
|
|
||||||
if req.Rid != "" {
|
|
||||||
taskId, err = Downloader.Create(req.Rid, req.Opt)
|
|
||||||
} else if req.Req != nil {
|
|
||||||
taskId, err = Downloader.CreateDirect(req.Req, req.Opt)
|
|
||||||
} else {
|
|
||||||
WriteJson(w, model.NewErrorResult("param invalid: rid or req", model.CodeInvalidParam))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewOkResult(taskId))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func CreateTaskBatch(w http.ResponseWriter, r *http.Request) {
|
|
||||||
var req model.CreateTaskBatch
|
|
||||||
if ReadJson(r, w, &req) {
|
|
||||||
if len(req.Reqs) == 0 {
|
|
||||||
WriteJson(w, model.NewErrorResult("param invalid: reqs", model.CodeInvalidParam))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
taskIds, err := Downloader.CreateDirectBatch(req.Reqs, req.Opt)
|
|
||||||
if err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewOkResult(taskIds))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func PauseTask(w http.ResponseWriter, r *http.Request) {
|
|
||||||
filter, errResult := parseIdFilter(r)
|
|
||||||
if errResult != nil {
|
|
||||||
WriteJson(w, errResult)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := Downloader.Pause(filter); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewNilResult())
|
|
||||||
}
|
|
||||||
|
|
||||||
func PauseTasks(w http.ResponseWriter, r *http.Request) {
|
|
||||||
filter, errResult := parseFilter(r)
|
|
||||||
if errResult != nil {
|
|
||||||
WriteJson(w, errResult)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := Downloader.Pause(filter); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewNilResult())
|
|
||||||
}
|
|
||||||
|
|
||||||
func ContinueTask(w http.ResponseWriter, r *http.Request) {
|
|
||||||
filter, errResult := parseIdFilter(r)
|
|
||||||
if errResult != nil {
|
|
||||||
WriteJson(w, errResult)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := Downloader.Continue(filter); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewNilResult())
|
|
||||||
}
|
|
||||||
|
|
||||||
func ContinueTasks(w http.ResponseWriter, r *http.Request) {
|
|
||||||
filter, errResult := parseFilter(r)
|
|
||||||
if errResult != nil {
|
|
||||||
WriteJson(w, errResult)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := Downloader.Continue(filter); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewNilResult())
|
|
||||||
}
|
|
||||||
|
|
||||||
func DeleteTask(w http.ResponseWriter, r *http.Request) {
|
|
||||||
filter, errResult := parseIdFilter(r)
|
|
||||||
if errResult != nil {
|
|
||||||
WriteJson(w, errResult)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
force := r.FormValue("force")
|
|
||||||
|
|
||||||
if err := Downloader.Delete(filter, force == "true"); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewNilResult())
|
|
||||||
}
|
|
||||||
|
|
||||||
func DeleteTasks(w http.ResponseWriter, r *http.Request) {
|
|
||||||
filter, errResult := parseFilter(r)
|
|
||||||
if errResult != nil {
|
|
||||||
WriteJson(w, errResult)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
force := r.FormValue("force")
|
|
||||||
|
|
||||||
if err := Downloader.Delete(filter, force == "true"); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewNilResult())
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetTask(w http.ResponseWriter, r *http.Request) {
|
|
||||||
vars := mux.Vars(r)
|
|
||||||
taskId := vars["id"]
|
|
||||||
if taskId == "" {
|
|
||||||
WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
task := Downloader.GetTask(taskId)
|
|
||||||
if task == nil {
|
|
||||||
WriteJson(w, model.NewErrorResult("task not found", model.CodeTaskNotFound))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewOkResult(task))
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetTasks(w http.ResponseWriter, r *http.Request) {
|
|
||||||
filter, errResult := parseFilter(r)
|
|
||||||
if errResult != nil {
|
|
||||||
WriteJson(w, errResult)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks := Downloader.GetTasksByFilter(filter)
|
|
||||||
WriteJson(w, model.NewOkResult(tasks))
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetConfig(w http.ResponseWriter, r *http.Request) {
|
|
||||||
WriteJson(w, model.NewOkResult(getServerConfig()))
|
|
||||||
}
|
|
||||||
|
|
||||||
func PutConfig(w http.ResponseWriter, r *http.Request) {
|
|
||||||
var cfg base.DownloaderStoreConfig
|
|
||||||
if ReadJson(r, w, &cfg) {
|
|
||||||
if err := Downloader.PutConfig(&cfg); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewNilResult())
|
|
||||||
}
|
|
||||||
|
|
||||||
func InstallExtension(w http.ResponseWriter, r *http.Request) {
|
|
||||||
var req model.InstallExtension
|
|
||||||
if ReadJson(r, w, &req) {
|
|
||||||
var (
|
|
||||||
installedExt *download.Extension
|
|
||||||
err error
|
|
||||||
)
|
|
||||||
if req.DevMode {
|
|
||||||
installedExt, err = Downloader.InstallExtensionByFolder(req.URL, true)
|
|
||||||
} else {
|
|
||||||
installedExt, err = Downloader.InstallExtensionByGit(req.URL)
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewOkResult(installedExt.Identity))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetExtensions(w http.ResponseWriter, r *http.Request) {
|
|
||||||
list := Downloader.GetExtensions()
|
|
||||||
WriteJson(w, model.NewOkResult(list))
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetExtension(w http.ResponseWriter, r *http.Request) {
|
|
||||||
vars := mux.Vars(r)
|
|
||||||
identity := vars["identity"]
|
|
||||||
ext, err := Downloader.GetExtension(identity)
|
|
||||||
if err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewOkResult(ext))
|
|
||||||
}
|
|
||||||
|
|
||||||
func UpdateExtensionSettings(w http.ResponseWriter, r *http.Request) {
|
|
||||||
vars := mux.Vars(r)
|
|
||||||
identity := vars["identity"]
|
|
||||||
var req model.UpdateExtensionSettings
|
|
||||||
if ReadJson(r, w, &req) {
|
|
||||||
if err := Downloader.UpdateExtensionSettings(identity, req.Settings); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewNilResult())
|
|
||||||
}
|
|
||||||
|
|
||||||
func SwitchExtension(w http.ResponseWriter, r *http.Request) {
|
|
||||||
vars := mux.Vars(r)
|
|
||||||
identity := vars["identity"]
|
|
||||||
var switchExtension model.SwitchExtension
|
|
||||||
if ReadJson(r, w, &switchExtension) {
|
|
||||||
if err := Downloader.SwitchExtension(identity, switchExtension.Status); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewNilResult())
|
|
||||||
}
|
|
||||||
|
|
||||||
func DeleteExtension(w http.ResponseWriter, r *http.Request) {
|
|
||||||
vars := mux.Vars(r)
|
|
||||||
identity := vars["identity"]
|
|
||||||
if err := Downloader.DeleteExtension(identity); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewNilResult())
|
|
||||||
}
|
|
||||||
|
|
||||||
func UpdateCheckExtension(w http.ResponseWriter, r *http.Request) {
|
|
||||||
vars := mux.Vars(r)
|
|
||||||
identity := vars["identity"]
|
|
||||||
newVersion, err := Downloader.UpgradeCheckExtension(identity)
|
|
||||||
if err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewOkResult(&model.UpdateCheckExtensionResp{
|
|
||||||
NewVersion: newVersion,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
func UpdateExtension(w http.ResponseWriter, r *http.Request) {
|
|
||||||
vars := mux.Vars(r)
|
|
||||||
identity := vars["identity"]
|
|
||||||
if err := Downloader.UpgradeExtension(identity); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewNilResult())
|
|
||||||
}
|
|
||||||
|
|
||||||
func DoProxy(w http.ResponseWriter, r *http.Request) {
|
|
||||||
target := r.Header.Get("X-Target-Uri")
|
|
||||||
if target == "" {
|
|
||||||
writeError(w, "param invalid: X-Target-Uri")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
targetUrl, err := url.Parse(target)
|
|
||||||
if err != nil {
|
|
||||||
writeError(w, err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
r.RequestURI = ""
|
|
||||||
r.URL = targetUrl
|
|
||||||
r.Host = targetUrl.Host
|
|
||||||
resp, err := http.DefaultClient.Do(r)
|
|
||||||
if err != nil {
|
|
||||||
writeError(w, err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer resp.Body.Close()
|
|
||||||
for k, vv := range resp.Header {
|
|
||||||
for _, v := range vv {
|
|
||||||
w.Header().Set(k, v)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
w.WriteHeader(resp.StatusCode)
|
|
||||||
buf, err := io.ReadAll(resp.Body)
|
|
||||||
if err != nil {
|
|
||||||
writeError(w, err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.Write(buf)
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetStats(w http.ResponseWriter, r *http.Request) {
|
|
||||||
vars := mux.Vars(r)
|
|
||||||
taskId := vars["id"]
|
|
||||||
if taskId == "" {
|
|
||||||
WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
statsResult, err := Downloader.Stats(taskId)
|
|
||||||
if err != nil {
|
|
||||||
writeError(w, err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
WriteJson(w, model.NewOkResult(statsResult))
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseIdFilter(r *http.Request) (*download.TaskFilter, any) {
|
|
||||||
vars := mux.Vars(r)
|
|
||||||
taskId := vars["id"]
|
|
||||||
if taskId == "" {
|
|
||||||
return nil, model.NewErrorResult("param invalid: id", model.CodeInvalidParam)
|
|
||||||
}
|
|
||||||
|
|
||||||
filter := &download.TaskFilter{
|
|
||||||
IDs: []string{taskId},
|
|
||||||
}
|
|
||||||
return filter, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseFilter(r *http.Request) (*download.TaskFilter, any) {
|
|
||||||
if err := r.ParseForm(); err != nil {
|
|
||||||
return nil, model.NewErrorResult(err.Error())
|
|
||||||
}
|
|
||||||
|
|
||||||
filter := &download.TaskFilter{
|
|
||||||
IDs: r.Form["id"],
|
|
||||||
Statuses: convertStatues(r.Form["status"]),
|
|
||||||
NotStatuses: convertStatues(r.Form["notStatus"]),
|
|
||||||
}
|
|
||||||
return filter, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func convertStatues(statues []string) []base.Status {
|
|
||||||
result := make([]base.Status, 0)
|
|
||||||
for _, status := range statues {
|
|
||||||
result = append(result, base.Status(status))
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
func writeError(w http.ResponseWriter, msg string) {
|
|
||||||
w.WriteHeader(http.StatusInternalServerError)
|
|
||||||
w.Write([]byte(msg))
|
|
||||||
}
|
|
||||||
|
|
||||||
func getServerConfig() *base.DownloaderStoreConfig {
|
|
||||||
cfg, _ := Downloader.GetConfig()
|
|
||||||
return cfg
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
package rest
|
|
||||||
|
|
||||||
type Config struct {
|
|
||||||
Host string `json:"host"`
|
|
||||||
Port int `json:"port"`
|
|
||||||
}
|
|
||||||
@@ -1,241 +0,0 @@
|
|||||||
package rest
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/download"
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest/model"
|
|
||||||
"github.com/GopeedLab/gopeed/pkg/util"
|
|
||||||
"github.com/gorilla/handlers"
|
|
||||||
"github.com/gorilla/mux"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"net"
|
|
||||||
"net/http"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"regexp"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
srv *http.Server
|
|
||||||
runningPort int
|
|
||||||
|
|
||||||
Downloader *download.Downloader
|
|
||||||
)
|
|
||||||
|
|
||||||
func Start(startCfg *model.StartConfig) (port int, err error) {
|
|
||||||
// avoid repeat start
|
|
||||||
if srv != nil {
|
|
||||||
return runningPort, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var listener net.Listener
|
|
||||||
srv, listener, err = BuildServer(startCfg)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
if err := srv.Serve(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
if addr, ok := listener.Addr().(*net.TCPAddr); ok {
|
|
||||||
port = addr.Port
|
|
||||||
runningPort = port
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func Stop() {
|
|
||||||
defer func() {
|
|
||||||
srv = nil
|
|
||||||
}()
|
|
||||||
|
|
||||||
if srv != nil {
|
|
||||||
if err := srv.Shutdown(context.TODO()); err != nil {
|
|
||||||
Downloader.Logger.Warn().Err(err).Msg("shutdown server failed")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if Downloader != nil {
|
|
||||||
if err := Downloader.Close(); err != nil {
|
|
||||||
Downloader.Logger.Warn().Err(err).Msg("close downloader failed")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error) {
|
|
||||||
if startCfg == nil {
|
|
||||||
startCfg = &model.StartConfig{}
|
|
||||||
}
|
|
||||||
startCfg.Init()
|
|
||||||
|
|
||||||
downloadCfg := &download.DownloaderConfig{
|
|
||||||
ProductionMode: startCfg.ProductionMode,
|
|
||||||
RefreshInterval: startCfg.RefreshInterval,
|
|
||||||
}
|
|
||||||
if startCfg.Storage == model.StorageBolt {
|
|
||||||
downloadCfg.Storage = download.NewBoltStorage(startCfg.StorageDir)
|
|
||||||
} else {
|
|
||||||
downloadCfg.Storage = download.NewMemStorage()
|
|
||||||
}
|
|
||||||
downloadCfg.StorageDir = startCfg.StorageDir
|
|
||||||
downloadCfg.Init()
|
|
||||||
Downloader = download.NewDownloader(downloadCfg)
|
|
||||||
if err := Downloader.Setup(); err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if startCfg.Network == "unix" {
|
|
||||||
util.SafeRemove(startCfg.Address)
|
|
||||||
}
|
|
||||||
|
|
||||||
listener, err := net.Listen(startCfg.Network, startCfg.Address)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var r = mux.NewRouter()
|
|
||||||
r.Methods(http.MethodGet).Path("/api/v1/info").HandlerFunc(Info)
|
|
||||||
r.Methods(http.MethodPost).Path("/api/v1/resolve").HandlerFunc(Resolve)
|
|
||||||
r.Methods(http.MethodPost).Path("/api/v1/tasks").HandlerFunc(CreateTask)
|
|
||||||
r.Methods(http.MethodPost).Path("/api/v1/tasks/batch").HandlerFunc(CreateTaskBatch)
|
|
||||||
r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/pause").HandlerFunc(PauseTask)
|
|
||||||
r.Methods(http.MethodPut).Path("/api/v1/tasks/pause").HandlerFunc(PauseTasks)
|
|
||||||
r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/continue").HandlerFunc(ContinueTask)
|
|
||||||
r.Methods(http.MethodPut).Path("/api/v1/tasks/continue").HandlerFunc(ContinueTasks)
|
|
||||||
r.Methods(http.MethodDelete).Path("/api/v1/tasks/{id}").HandlerFunc(DeleteTask)
|
|
||||||
r.Methods(http.MethodDelete).Path("/api/v1/tasks").HandlerFunc(DeleteTasks)
|
|
||||||
r.Methods(http.MethodGet).Path("/api/v1/tasks/{id}").HandlerFunc(GetTask)
|
|
||||||
r.Methods(http.MethodGet).Path("/api/v1/tasks").HandlerFunc(GetTasks)
|
|
||||||
r.Methods(http.MethodGet).Path("/api/v1/tasks/{id}/stats").HandlerFunc(GetStats)
|
|
||||||
r.Methods(http.MethodGet).Path("/api/v1/config").HandlerFunc(GetConfig)
|
|
||||||
r.Methods(http.MethodPut).Path("/api/v1/config").HandlerFunc(PutConfig)
|
|
||||||
r.Methods(http.MethodPost).Path("/api/v1/extensions").HandlerFunc(InstallExtension)
|
|
||||||
r.Methods(http.MethodGet).Path("/api/v1/extensions").HandlerFunc(GetExtensions)
|
|
||||||
r.Methods(http.MethodGet).Path("/api/v1/extensions/{identity}").HandlerFunc(GetExtension)
|
|
||||||
r.Methods(http.MethodPut).Path("/api/v1/extensions/{identity}/settings").HandlerFunc(UpdateExtensionSettings)
|
|
||||||
r.Methods(http.MethodPut).Path("/api/v1/extensions/{identity}/switch").HandlerFunc(SwitchExtension)
|
|
||||||
r.Methods(http.MethodDelete).Path("/api/v1/extensions/{identity}").HandlerFunc(DeleteExtension)
|
|
||||||
r.Methods(http.MethodGet).Path("/api/v1/extensions/{identity}/update").HandlerFunc(UpdateCheckExtension)
|
|
||||||
r.Methods(http.MethodPost).Path("/api/v1/extensions/{identity}/update").HandlerFunc(UpdateExtension)
|
|
||||||
r.Path("/api/v1/proxy").HandlerFunc(DoProxy)
|
|
||||||
if startCfg.WebEnable {
|
|
||||||
r.PathPrefix("/fs/tasks").Handler(http.FileServer(new(taskFileSystem)))
|
|
||||||
r.PathPrefix("/fs/extensions").Handler(http.FileServer(new(extensionFileSystem)))
|
|
||||||
r.PathPrefix("/").Handler(http.FileServer(http.FS(startCfg.WebFS)))
|
|
||||||
}
|
|
||||||
|
|
||||||
if startCfg.ApiToken != "" || (startCfg.WebEnable && startCfg.WebBasicAuth != nil) {
|
|
||||||
r.Use(func(h http.Handler) http.Handler {
|
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if startCfg.ApiToken != "" && r.Header.Get("X-Api-Token") == startCfg.ApiToken {
|
|
||||||
h.ServeHTTP(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if startCfg.WebEnable && startCfg.WebBasicAuth != nil {
|
|
||||||
if r.Header.Get("Authorization") == startCfg.WebBasicAuth.Authorization() {
|
|
||||||
h.ServeHTTP(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.Header().Set("WWW-Authenticate", "Basic realm=\"gopeed web\"")
|
|
||||||
}
|
|
||||||
WriteStatusJson(w, http.StatusUnauthorized, model.NewErrorResult("unauthorized", model.CodeUnauthorized))
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// recover panic
|
|
||||||
r.Use(func(h http.Handler) http.Handler {
|
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
defer func() {
|
|
||||||
if v := recover(); v != nil {
|
|
||||||
err := errors.WithStack(fmt.Errorf("%v", v))
|
|
||||||
Downloader.Logger.Error().Stack().Err(err).Msgf("http server panic: %s %s", r.Method, r.RequestURI)
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error(), model.CodeError))
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
h.ServeHTTP(w, r)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
srv = &http.Server{Handler: handlers.CORS(
|
|
||||||
handlers.AllowedHeaders([]string{"Content-Type", "X-Api-Token", "X-Target-Uri"}),
|
|
||||||
handlers.AllowedMethods([]string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"}),
|
|
||||||
handlers.AllowedOrigins([]string{"*"}),
|
|
||||||
)(r)}
|
|
||||||
return srv, listener, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func resolvePath(urlPath string, prefix string) (identity string, path string, err error) {
|
|
||||||
// remove prefix
|
|
||||||
clearPath := strings.TrimPrefix(urlPath, prefix)
|
|
||||||
// match extension identity, eg: /fs/extensions/identity/xxx
|
|
||||||
reg := regexp.MustCompile(`^/([^/]+)/(.*)$`)
|
|
||||||
if !reg.MatchString(clearPath) {
|
|
||||||
err = os.ErrNotExist
|
|
||||||
return
|
|
||||||
}
|
|
||||||
matched := reg.FindStringSubmatch(clearPath)
|
|
||||||
if len(matched) != 3 {
|
|
||||||
err = os.ErrNotExist
|
|
||||||
return
|
|
||||||
}
|
|
||||||
return matched[1], matched[2], nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// handle task file resource
|
|
||||||
type taskFileSystem struct {
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *taskFileSystem) Open(name string) (http.File, error) {
|
|
||||||
// get extension identity
|
|
||||||
identity, path, err := resolvePath(name, "/fs/tasks")
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
task := Downloader.GetTask(identity)
|
|
||||||
if task == nil {
|
|
||||||
return nil, os.ErrNotExist
|
|
||||||
}
|
|
||||||
return os.Open(filepath.Join(task.Meta.RootDirPath(), path))
|
|
||||||
}
|
|
||||||
|
|
||||||
// handle extension file resource
|
|
||||||
type extensionFileSystem struct {
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *extensionFileSystem) Open(name string) (http.File, error) {
|
|
||||||
// get extension identity
|
|
||||||
identity, path, err := resolvePath(name, "/fs/extensions")
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
extension, err := Downloader.GetExtension(identity)
|
|
||||||
if err != nil {
|
|
||||||
return nil, os.ErrNotExist
|
|
||||||
}
|
|
||||||
extensionPath := Downloader.ExtensionPath(extension)
|
|
||||||
return os.Open(filepath.Join(extensionPath, path))
|
|
||||||
}
|
|
||||||
|
|
||||||
func ReadJson(r *http.Request, w http.ResponseWriter, v any) bool {
|
|
||||||
if err := json.NewDecoder(r.Body).Decode(v); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
func WriteJson(w http.ResponseWriter, v any) {
|
|
||||||
WriteStatusJson(w, http.StatusOK, v)
|
|
||||||
}
|
|
||||||
|
|
||||||
func WriteStatusJson(w http.ResponseWriter, statusCode int, v any) {
|
|
||||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
|
||||||
w.WriteHeader(statusCode)
|
|
||||||
json.NewEncoder(w).Encode(v)
|
|
||||||
}
|
|
||||||
@@ -10,6 +10,7 @@ import (
|
|||||||
|
|
||||||
func ParseSchema(url string) string {
|
func ParseSchema(url string) string {
|
||||||
index := strings.Index(url, ":")
|
index := strings.Index(url, ":")
|
||||||
|
// if no schema or windows path like C:\a.txt, return FILE
|
||||||
if index == -1 || index == 1 {
|
if index == -1 || index == 1 {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -74,14 +74,8 @@ typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
extern __declspec(dllexport) char* Init(char* cfg);
|
||||||
/* Return type for Start */
|
extern __declspec(dllexport) char* Invoke(char* req);
|
||||||
struct Start_return {
|
|
||||||
GoInt r0;
|
|
||||||
char* r1;
|
|
||||||
};
|
|
||||||
extern struct Start_return Start(char* cfg);
|
|
||||||
extern void Stop();
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,227 +0,0 @@
|
|||||||
import 'dart:io';
|
|
||||||
|
|
||||||
import 'package:dio/dio.dart';
|
|
||||||
import 'package:dio/io.dart';
|
|
||||||
import 'package:flutter/foundation.dart';
|
|
||||||
import 'package:gopeed/api/model/extension.dart';
|
|
||||||
import 'package:gopeed/api/model/install_extension.dart';
|
|
||||||
import 'package:gopeed/api/model/switch_extension.dart';
|
|
||||||
|
|
||||||
import '../util/util.dart';
|
|
||||||
import 'model/create_task.dart';
|
|
||||||
import 'model/downloader_config.dart';
|
|
||||||
import 'model/request.dart';
|
|
||||||
import 'model/resolve_result.dart';
|
|
||||||
import 'model/result.dart';
|
|
||||||
import 'model/task.dart';
|
|
||||||
import 'model/update_extension_settings.dart';
|
|
||||||
import 'model/update_check_extension_resp.dart';
|
|
||||||
|
|
||||||
class _Client {
|
|
||||||
static _Client? _instance;
|
|
||||||
|
|
||||||
late Dio dio;
|
|
||||||
|
|
||||||
_Client._internal();
|
|
||||||
|
|
||||||
factory _Client(String network, String address, String apiToken) {
|
|
||||||
if (_instance == null) {
|
|
||||||
_instance = _Client._internal();
|
|
||||||
var dio = Dio();
|
|
||||||
final isUnixSocket = network == 'unix';
|
|
||||||
var baseUrl = 'http://127.0.0.1';
|
|
||||||
if (!isUnixSocket) {
|
|
||||||
if (Util.isWeb()) {
|
|
||||||
baseUrl = kDebugMode ? 'http://127.0.0.1:9999' : '';
|
|
||||||
} else {
|
|
||||||
baseUrl = 'http://$address';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dio.options.baseUrl = baseUrl;
|
|
||||||
dio.options.contentType = Headers.jsonContentType;
|
|
||||||
dio.options.sendTimeout = const Duration(seconds: 5);
|
|
||||||
dio.options.connectTimeout = const Duration(seconds: 5);
|
|
||||||
dio.options.receiveTimeout = const Duration(seconds: 60);
|
|
||||||
dio.interceptors.add(InterceptorsWrapper(onRequest: (options, handler) {
|
|
||||||
if (apiToken.isNotEmpty) {
|
|
||||||
options.headers['X-Api-Token'] = apiToken;
|
|
||||||
}
|
|
||||||
handler.next(options);
|
|
||||||
}));
|
|
||||||
|
|
||||||
_instance!.dio = dio;
|
|
||||||
if (isUnixSocket) {
|
|
||||||
(_instance!.dio.httpClientAdapter as IOHttpClientAdapter)
|
|
||||||
.createHttpClient = () {
|
|
||||||
final client = HttpClient();
|
|
||||||
client.connectionFactory =
|
|
||||||
(Uri uri, String? proxyHost, int? proxyPort) {
|
|
||||||
return Socket.startConnect(
|
|
||||||
InternetAddress(address, type: InternetAddressType.unix), 0);
|
|
||||||
};
|
|
||||||
return client;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return _instance!;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class TimeoutException implements Exception {
|
|
||||||
final String message;
|
|
||||||
|
|
||||||
TimeoutException(this.message);
|
|
||||||
}
|
|
||||||
|
|
||||||
late _Client _client;
|
|
||||||
|
|
||||||
void init(String network, String address, String apiToken) {
|
|
||||||
_client = _Client(network, address, apiToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<T> _parse<T>(
|
|
||||||
Future<Response> Function() fetch,
|
|
||||||
T Function(dynamic json)? fromJsonT,
|
|
||||||
) async {
|
|
||||||
try {
|
|
||||||
var resp = await fetch();
|
|
||||||
fromJsonT ??= (json) => null as T;
|
|
||||||
final result = Result<T>.fromJson(resp.data, fromJsonT);
|
|
||||||
if (result.code == 0) {
|
|
||||||
return result.data as T;
|
|
||||||
} else {
|
|
||||||
throw Exception(result);
|
|
||||||
}
|
|
||||||
} on DioException catch (e) {
|
|
||||||
if (e.type == DioExceptionType.sendTimeout ||
|
|
||||||
e.type == DioExceptionType.receiveTimeout ||
|
|
||||||
e.type == DioExceptionType.connectionTimeout) {
|
|
||||||
throw TimeoutException("request timeout");
|
|
||||||
}
|
|
||||||
throw Exception(Result(code: 1000, msg: e.message));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<ResolveResult> resolve(Request request) async {
|
|
||||||
return _parse<ResolveResult>(
|
|
||||||
() => _client.dio.post("/api/v1/resolve", data: request),
|
|
||||||
(data) => ResolveResult.fromJson(data));
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<String> createTask(CreateTask createTask) async {
|
|
||||||
return _parse<String>(
|
|
||||||
() => _client.dio.post("/api/v1/tasks", data: createTask),
|
|
||||||
(data) => data as String);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<List<Task>> getTasks(List<Status> statuses) async {
|
|
||||||
return _parse<List<Task>>(
|
|
||||||
() => _client.dio.get(
|
|
||||||
"/api/v1/tasks?${statuses.map((e) => "status=${e.name}").join("&")}"),
|
|
||||||
(data) => (data as List).map((e) => Task.fromJson(e)).toList());
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> pauseTask(String id) async {
|
|
||||||
return _parse(() => _client.dio.put("/api/v1/tasks/$id/pause"), null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> continueTask(String id) async {
|
|
||||||
return _parse(() => _client.dio.put("/api/v1/tasks/$id/continue"), null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> pauseAllTasks(List<String>? ids) async {
|
|
||||||
return _parse(
|
|
||||||
() => _client.dio.put("/api/v1/tasks/pause", queryParameters: {
|
|
||||||
"id": ids,
|
|
||||||
}),
|
|
||||||
null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> continueAllTasks(List<String>? ids) async {
|
|
||||||
return _parse(
|
|
||||||
() => _client.dio.put("/api/v1/tasks/continue", queryParameters: {
|
|
||||||
"id": ids,
|
|
||||||
}),
|
|
||||||
null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> deleteTask(String id, bool force) async {
|
|
||||||
return _parse(
|
|
||||||
() => _client.dio.delete("/api/v1/tasks/$id?force=$force"), null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> deleteTasks(List<String>? ids, bool force) async {
|
|
||||||
return _parse(
|
|
||||||
() => _client.dio.delete("/api/v1/tasks", queryParameters: {
|
|
||||||
"id": ids,
|
|
||||||
"force": force,
|
|
||||||
}),
|
|
||||||
null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<DownloaderConfig> getConfig() async {
|
|
||||||
return _parse(() => _client.dio.get("/api/v1/config"),
|
|
||||||
(data) => DownloaderConfig.fromJson(data));
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> putConfig(DownloaderConfig config) async {
|
|
||||||
return _parse(() => _client.dio.put("/api/v1/config", data: config), null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> installExtension(InstallExtension installExtension) async {
|
|
||||||
return _parse(
|
|
||||||
() => _client.dio.post("/api/v1/extensions", data: installExtension),
|
|
||||||
null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<List<Extension>> getExtensions() async {
|
|
||||||
return _parse<List<Extension>>(() => _client.dio.get("/api/v1/extensions"),
|
|
||||||
(data) => (data as List).map((e) => Extension.fromJson(e)).toList());
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> updateExtensionSettings(
|
|
||||||
String identity, UpdateExtensionSettings updateExtensionSettings) async {
|
|
||||||
return _parse(
|
|
||||||
() => _client.dio.put("/api/v1/extensions/$identity/settings",
|
|
||||||
data: updateExtensionSettings),
|
|
||||||
null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> switchExtension(
|
|
||||||
String identity, SwitchExtension switchExtension) async {
|
|
||||||
return _parse(
|
|
||||||
() => _client.dio
|
|
||||||
.put("/api/v1/extensions/$identity/switch", data: switchExtension),
|
|
||||||
null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> deleteExtension(String identity) async {
|
|
||||||
return _parse(() => _client.dio.delete("/api/v1/extensions/$identity"), null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<UpdateCheckExtensionResp> upgradeCheckExtension(String identity) async {
|
|
||||||
return _parse(() => _client.dio.get("/api/v1/extensions/$identity/update"),
|
|
||||||
(data) => UpdateCheckExtensionResp.fromJson(data));
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> updateExtension(String identity) async {
|
|
||||||
return _parse(
|
|
||||||
() => _client.dio.post("/api/v1/extensions/$identity/update"), null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<Response<String>> proxyRequest<T>(String uri,
|
|
||||||
{data, Options? options}) async {
|
|
||||||
options ??= Options();
|
|
||||||
options.headers ??= {};
|
|
||||||
options.headers!["X-Target-Uri"] = uri;
|
|
||||||
|
|
||||||
// add timestamp to avoid cache
|
|
||||||
return _client.dio.request(
|
|
||||||
"/api/v1/proxy?t=${DateTime.now().millisecondsSinceEpoch}",
|
|
||||||
data: data,
|
|
||||||
options: options);
|
|
||||||
}
|
|
||||||
|
|
||||||
String join(String path) {
|
|
||||||
return "${_client.dio.options.baseUrl}/${Util.cleanPath(path)}";
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
class ApiException implements Exception {
|
||||||
|
final int code;
|
||||||
|
final String message;
|
||||||
|
|
||||||
|
ApiException(this.code, this.message);
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
import 'package:dio/dio.dart';
|
||||||
|
|
||||||
|
import '../api_exception.dart';
|
||||||
|
import '../model/result.dart';
|
||||||
|
|
||||||
|
mixin LibgopeedBootBase {
|
||||||
|
Dio createDio() {
|
||||||
|
Dio dio = Dio();
|
||||||
|
dio.options.contentType = Headers.jsonContentType;
|
||||||
|
dio.options.sendTimeout = const Duration(seconds: 5);
|
||||||
|
dio.options.connectTimeout = const Duration(seconds: 5);
|
||||||
|
dio.options.receiveTimeout = const Duration(seconds: 60);
|
||||||
|
return dio;
|
||||||
|
}
|
||||||
|
|
||||||
|
T handleResult<T>(
|
||||||
|
Result<T> result,
|
||||||
|
) {
|
||||||
|
if (result.code == 0) {
|
||||||
|
return result.data as T;
|
||||||
|
} else {
|
||||||
|
throw ApiException(result.code, result.msg ?? '');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,239 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:convert';
|
||||||
|
import 'dart:ffi';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:dio/dio.dart';
|
||||||
|
|
||||||
|
import '../../api/model/create_task.dart';
|
||||||
|
import '../../api/model/create_task_batch.dart';
|
||||||
|
import '../../api/model/downloader_config.dart';
|
||||||
|
import '../../api/model/extension.dart';
|
||||||
|
import '../../api/model/http_listen_result.dart';
|
||||||
|
import '../../api/model/info.dart';
|
||||||
|
import '../../api/model/install_extension.dart';
|
||||||
|
import '../../api/model/request.dart';
|
||||||
|
import '../../api/model/resolve_result.dart';
|
||||||
|
import '../../api/model/result.dart';
|
||||||
|
import '../../api/model/switch_extension.dart';
|
||||||
|
import '../../api/model/task.dart';
|
||||||
|
import '../../api/model/task_filter.dart';
|
||||||
|
import '../../api/model/update_check_extension_resp.dart';
|
||||||
|
import '../../api/model/update_extension_settings.dart';
|
||||||
|
import '../../util/extensions.dart';
|
||||||
|
import '../../util/util.dart';
|
||||||
|
import '../libgopeed_boot.dart';
|
||||||
|
import '../native/channel/libgopeed_channel.dart';
|
||||||
|
import '../native/ffi/libgopeed_bind.dart';
|
||||||
|
import '../native/ffi/libgopeed_ffi.dart';
|
||||||
|
import '../native/libgopeed_interface.dart';
|
||||||
|
import '../native/model/invoke_request.dart';
|
||||||
|
import '../native/model/start_config.dart';
|
||||||
|
import 'libgopeed_boot_base.dart';
|
||||||
|
|
||||||
|
LibgopeedBoot create() => LibgopeedBootNative();
|
||||||
|
|
||||||
|
class LibgopeedBootNative
|
||||||
|
with LibgopeedBootBase
|
||||||
|
implements LibgopeedBoot, LibgopeedApi {
|
||||||
|
late LibgopeedAbi _libgopeedAbi;
|
||||||
|
late Dio _dio;
|
||||||
|
|
||||||
|
LibgopeedBootNative() {
|
||||||
|
if (Util.isDesktop()) {
|
||||||
|
var libName = "libgopeed.";
|
||||||
|
if (Platform.isWindows) {
|
||||||
|
libName += "dll";
|
||||||
|
}
|
||||||
|
if (Platform.isMacOS) {
|
||||||
|
libName += "dylib";
|
||||||
|
}
|
||||||
|
if (Platform.isLinux) {
|
||||||
|
libName += "so";
|
||||||
|
}
|
||||||
|
_libgopeedAbi = LibgopeedFFi(LibgopeedBind(DynamicLibrary.open(libName)));
|
||||||
|
} else {
|
||||||
|
_libgopeedAbi = LibgopeedChannel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<T> _invoke<T>(
|
||||||
|
String method,
|
||||||
|
List<dynamic> params,
|
||||||
|
T Function(dynamic json)? fromJsonT,
|
||||||
|
) async {
|
||||||
|
final invokeRequest = InvokeRequest(method: method, params: params);
|
||||||
|
final resp = await _libgopeedAbi.invoke(jsonEncode(invokeRequest));
|
||||||
|
final result =
|
||||||
|
Result<T>.fromJson(jsonDecode(resp), fromJsonT ??= (json) => null as T);
|
||||||
|
return handleResult(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
List<dynamic> _parseTaskFilter(TaskFilter? filter) {
|
||||||
|
if (filter == null) {
|
||||||
|
return [null];
|
||||||
|
}
|
||||||
|
return [filter];
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<LibgopeedApi> init(StartConfig cfg) async {
|
||||||
|
await _libgopeedAbi.init(jsonEncode(cfg.toJson()));
|
||||||
|
_dio = createDio();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<HttpListenResult> startHttp() async {
|
||||||
|
return _invoke<HttpListenResult>(
|
||||||
|
"StartHttp", [], (json) => HttpListenResult.fromJson(json));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> stopHttp() async {
|
||||||
|
await _invoke<void>("StopHttp", [], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> restartHttp() async {
|
||||||
|
await _invoke<void>("RestartHttp", [], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<Info> info() async {
|
||||||
|
return _invoke<Info>("Info", [], (json) => Info.fromJson(json));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<ResolveResult> resolve(Request request) async {
|
||||||
|
return _invoke<ResolveResult>(
|
||||||
|
"Resolve", [request], (json) => ResolveResult.fromJson(json));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<String> createTask(CreateTask createTask) async {
|
||||||
|
return _invoke<String>(
|
||||||
|
"CreateTask", [createTask], (json) => json as String);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<String> createTaskBatch(CreateTaskBatch createTask) async {
|
||||||
|
return _invoke<String>(
|
||||||
|
"CreateTaskBatch", [createTask], (json) => json as String);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> pauseTask(String id) async {
|
||||||
|
await _invoke<void>("PauseTask", [id], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> pauseTasks(TaskFilter? filter) async {
|
||||||
|
await _invoke<void>("PauseTasks", _parseTaskFilter(filter), null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> continueTask(String id) async {
|
||||||
|
await _invoke<void>("ContinueTask", [id], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> continueTasks(TaskFilter? filter) async {
|
||||||
|
await _invoke<void>("ContinueTasks", _parseTaskFilter(filter), null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> deleteTask(String id, bool force) async {
|
||||||
|
await _invoke<void>("DeleteTask", [id, force], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> deleteTasks(TaskFilter? filter, bool force) async {
|
||||||
|
await _invoke<void>(
|
||||||
|
"DeleteTasks",
|
||||||
|
_parseTaskFilter(filter).apply((it) {
|
||||||
|
it.add(force);
|
||||||
|
}),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<Task> getTask(String id) async {
|
||||||
|
return _invoke<Task>("GetTask", [id], (json) => Task.fromJson(json));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<List<Task>> getTasks(TaskFilter? filter) async {
|
||||||
|
return _invoke<List<Task>>("GetTasks", _parseTaskFilter(filter),
|
||||||
|
(json) => (json as List).map((e) => Task.fromJson(e)).toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<Map<String, dynamic>> getTaskStats(String id) async {
|
||||||
|
return _invoke<Map<String, dynamic>>(
|
||||||
|
"GetTaskStats", [id], (json) => json as Map<String, dynamic>);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<DownloaderConfig> getConfig() async {
|
||||||
|
return _invoke<DownloaderConfig>(
|
||||||
|
"GetConfig", [], (json) => DownloaderConfig.fromJson(json));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> putConfig(DownloaderConfig config) async {
|
||||||
|
await _invoke<void>("PutConfig", [config], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> installExtension(InstallExtension installExtension) async {
|
||||||
|
await _invoke<void>("InstallExtension", [installExtension], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<List<Extension>> getExtensions() async {
|
||||||
|
return _invoke<List<Extension>>("GetExtensions", [],
|
||||||
|
(json) => (json as List).map((e) => Extension.fromJson(e)).toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> updateExtensionSettings(
|
||||||
|
String identity, UpdateExtensionSettings updateExtensionSettings) async {
|
||||||
|
await _invoke<void>(
|
||||||
|
"UpdateExtensionSettings", [identity, updateExtensionSettings], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> switchExtension(
|
||||||
|
String identity, SwitchExtension switchExtension) async {
|
||||||
|
await _invoke<void>("SwitchExtension", [identity, switchExtension], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> deleteExtension(String identity) async {
|
||||||
|
await _invoke<void>("DeleteExtension", [identity], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<UpdateCheckExtensionResp> upgradeCheckExtension(
|
||||||
|
String identity) async {
|
||||||
|
return _invoke<UpdateCheckExtensionResp>("UpgradeCheckExtension",
|
||||||
|
[identity], (json) => UpdateCheckExtensionResp.fromJson(json));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> upgradeExtension(String identity) async {
|
||||||
|
await _invoke<void>("UpgradeExtension", [identity], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> close() async {
|
||||||
|
await _invoke<void>("Close", [], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<Response<String>> proxyRequest<T>(String uri,
|
||||||
|
{data, Options? options}) {
|
||||||
|
return _dio.request(uri, data: data, options: options);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,277 @@
|
|||||||
|
import 'package:dio/dio.dart';
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
|
||||||
|
import '../../api/model/create_task.dart';
|
||||||
|
import '../../api/model/create_task_batch.dart';
|
||||||
|
import '../../api/model/downloader_config.dart';
|
||||||
|
import '../../api/model/extension.dart';
|
||||||
|
import '../../api/model/http_listen_result.dart';
|
||||||
|
import '../../api/model/info.dart';
|
||||||
|
import '../../api/model/install_extension.dart';
|
||||||
|
import '../../api/model/request.dart';
|
||||||
|
import '../../api/model/resolve_result.dart';
|
||||||
|
import '../../api/model/result.dart';
|
||||||
|
import '../../api/model/switch_extension.dart';
|
||||||
|
import '../../api/model/task.dart';
|
||||||
|
import '../../api/model/task_filter.dart';
|
||||||
|
import '../../api/model/update_check_extension_resp.dart';
|
||||||
|
import '../../api/model/update_extension_settings.dart';
|
||||||
|
import '../../util/extensions.dart';
|
||||||
|
import '../../util/util.dart';
|
||||||
|
import '../api_exception.dart';
|
||||||
|
import '../libgopeed_boot.dart';
|
||||||
|
import '../native/libgopeed_interface.dart';
|
||||||
|
import '../native/model/start_config.dart';
|
||||||
|
import 'libgopeed_boot_base.dart';
|
||||||
|
|
||||||
|
LibgopeedBoot create() => LibgopeedBootWeb();
|
||||||
|
|
||||||
|
class LibgopeedBootWeb
|
||||||
|
with LibgopeedBootBase
|
||||||
|
implements LibgopeedBoot, LibgopeedApi {
|
||||||
|
late Dio _dio;
|
||||||
|
static const String _apiPrefix = '/api/v1';
|
||||||
|
|
||||||
|
LibgopeedBootWeb();
|
||||||
|
|
||||||
|
Future<T> _fetch<T>(
|
||||||
|
Future<Response> Function() fetch,
|
||||||
|
T Function(dynamic json)? fromJsonT,
|
||||||
|
) async {
|
||||||
|
try {
|
||||||
|
var resp = await fetch();
|
||||||
|
fromJsonT ??= (json) => null as T;
|
||||||
|
final result = Result<T>.fromJson(resp.data, fromJsonT);
|
||||||
|
return handleResult(result);
|
||||||
|
} on DioException catch (e) {
|
||||||
|
if (e.type == DioExceptionType.sendTimeout ||
|
||||||
|
e.type == DioExceptionType.receiveTimeout ||
|
||||||
|
e.type == DioExceptionType.connectionTimeout) {
|
||||||
|
throw ApiException(1000, 'request timeout');
|
||||||
|
}
|
||||||
|
throw ApiException(1000, e.message ?? "");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, dynamic>? _parseTaskFilter(TaskFilter? filter) {
|
||||||
|
if (filter == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, dynamic> params = {};
|
||||||
|
if (filter.id != null) {
|
||||||
|
params['id'] = filter.id;
|
||||||
|
}
|
||||||
|
if (filter.status != null) {
|
||||||
|
params['status'] = filter.status;
|
||||||
|
}
|
||||||
|
if (filter.notStatus != null) {
|
||||||
|
params['notStatus'] = filter.notStatus;
|
||||||
|
}
|
||||||
|
if (params.isEmpty) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return params;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<LibgopeedApi> init(StartConfig cfg) async {
|
||||||
|
_dio = createDio();
|
||||||
|
_dio.options.baseUrl = kDebugMode ? 'http://127.0.0.1:9999' : '';
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<HttpListenResult> startHttp() async {
|
||||||
|
throw UnimplementedError();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> stopHttp() async {
|
||||||
|
throw UnimplementedError();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> restartHttp() async {
|
||||||
|
throw UnimplementedError();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<Info> info() {
|
||||||
|
return _fetch<Info>(
|
||||||
|
() => _dio.get("$_apiPrefix/info"), (data) => Info.fromJson(data));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<ResolveResult> resolve(Request request) async {
|
||||||
|
return _fetch<ResolveResult>(
|
||||||
|
() => _dio.post("$_apiPrefix/resolve", data: request),
|
||||||
|
(data) => ResolveResult.fromJson(data));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<String> createTask(CreateTask createTask) async {
|
||||||
|
return _fetch<String>(
|
||||||
|
() => _dio.post("$_apiPrefix/tasks", data: createTask),
|
||||||
|
(data) => data as String);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<String> createTaskBatch(CreateTaskBatch createTask) async {
|
||||||
|
return _fetch<String>(
|
||||||
|
() => _dio.post("$_apiPrefix/tasks", data: createTask),
|
||||||
|
(data) => data as String);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> pauseTask(String id) async {
|
||||||
|
await _fetch<void>(() => _dio.put("$_apiPrefix/tasks/$id/pause"), null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> pauseTasks(TaskFilter? filter) async {
|
||||||
|
await _fetch<void>(
|
||||||
|
() => _dio.put("$_apiPrefix/tasks/pause",
|
||||||
|
queryParameters: _parseTaskFilter(filter)),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> continueTask(String id) async {
|
||||||
|
await _fetch<void>(() => _dio.put("$_apiPrefix/tasks/$id/continue"), null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> continueTasks(TaskFilter? filter) async {
|
||||||
|
await _fetch<void>(
|
||||||
|
() => _dio.put("$_apiPrefix/tasks/continue",
|
||||||
|
queryParameters: _parseTaskFilter(filter)),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> deleteTask(String id, bool force) async {
|
||||||
|
await _fetch<void>(
|
||||||
|
() => _dio
|
||||||
|
.delete("$_apiPrefix/tasks/$id", queryParameters: {'force': force}),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> deleteTasks(TaskFilter? filter, bool force) async {
|
||||||
|
await _fetch<void>(
|
||||||
|
() => _dio.delete("$_apiPrefix/tasks",
|
||||||
|
queryParameters: _parseTaskFilter(filter)?.apply((it) {
|
||||||
|
it['force'] = force;
|
||||||
|
})),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<Task> getTask(String id) async {
|
||||||
|
return _fetch<Task>(
|
||||||
|
() => _dio.get("$_apiPrefix/tasks/$id"), (data) => Task.fromJson(data));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<List<Task>> getTasks(TaskFilter? filter) async {
|
||||||
|
return _fetch<List<Task>>(
|
||||||
|
() => _dio.get("$_apiPrefix/tasks",
|
||||||
|
queryParameters: _parseTaskFilter(filter)),
|
||||||
|
(data) => (data as List).map((e) => Task.fromJson(e)).toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<Map<String, dynamic>> getTaskStats(String id) async {
|
||||||
|
return _fetch<Map<String, dynamic>>(
|
||||||
|
() => _dio.get("$_apiPrefix/tasks/$id/stats"),
|
||||||
|
(data) => data as Map<String, dynamic>);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<DownloaderConfig> getConfig() async {
|
||||||
|
return _fetch<DownloaderConfig>(() => _dio.get("$_apiPrefix/config"),
|
||||||
|
(data) => DownloaderConfig.fromJson(data));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> putConfig(DownloaderConfig config) async {
|
||||||
|
await _fetch<void>(
|
||||||
|
() => _dio.put("$_apiPrefix/config", data: config), null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> installExtension(InstallExtension installExtension) async {
|
||||||
|
await _fetch<void>(
|
||||||
|
() => _dio.post("$_apiPrefix/extensions", data: installExtension),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<List<Extension>> getExtensions() async {
|
||||||
|
return _fetch<List<Extension>>(() => _dio.get("$_apiPrefix/extensions"),
|
||||||
|
(data) => (data as List).map((e) => Extension.fromJson(e)).toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> updateExtensionSettings(
|
||||||
|
String identity, UpdateExtensionSettings updateExtensionSettings) async {
|
||||||
|
await _fetch<void>(
|
||||||
|
() => _dio.put("$_apiPrefix/extensions/$identity/settings",
|
||||||
|
data: updateExtensionSettings),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> switchExtension(
|
||||||
|
String identity, SwitchExtension switchExtension) async {
|
||||||
|
await _fetch<void>(
|
||||||
|
() => _dio.put("$_apiPrefix/extensions/$identity/switch",
|
||||||
|
data: switchExtension),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> deleteExtension(String identity) async {
|
||||||
|
await _fetch<void>(
|
||||||
|
() => _dio.delete("$_apiPrefix/extensions/$identity"), null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<UpdateCheckExtensionResp> upgradeCheckExtension(
|
||||||
|
String identity) async {
|
||||||
|
return _fetch<UpdateCheckExtensionResp>(
|
||||||
|
() => _dio.get("$_apiPrefix/extensions/$identity/upgrade"),
|
||||||
|
(data) => UpdateCheckExtensionResp.fromJson(data));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> upgradeExtension(String identity) async {
|
||||||
|
await _fetch<void>(
|
||||||
|
() => _dio.post("$_apiPrefix/extensions/$identity/upgrade"), null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> close() async {
|
||||||
|
throw UnimplementedError();
|
||||||
|
}
|
||||||
|
|
||||||
|
// To avoid CORS, use a backend proxy to forward the request
|
||||||
|
@override
|
||||||
|
Future<Response<String>> proxyRequest<T>(String uri,
|
||||||
|
{data, Options? options}) async {
|
||||||
|
options ??= Options();
|
||||||
|
options.headers ??= {};
|
||||||
|
options.headers!["X-Target-Uri"] = uri;
|
||||||
|
|
||||||
|
// add timestamp to avoid cache
|
||||||
|
return _dio.request(
|
||||||
|
"/api/v1/proxy?t=${DateTime.now().millisecondsSinceEpoch}",
|
||||||
|
data: data,
|
||||||
|
options: options);
|
||||||
|
}
|
||||||
|
|
||||||
|
String join(String path) {
|
||||||
|
return "${_dio.options.baseUrl}/${Util.cleanPath(path)}";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
import "libgopeed_boot_stub.dart"
|
||||||
|
if (dart.library.html) 'entry/libgopeed_boot_browser.dart'
|
||||||
|
if (dart.library.io) 'entry/libgopeed_boot_native.dart';
|
||||||
|
import 'native/libgopeed_interface.dart';
|
||||||
|
|
||||||
|
abstract class LibgopeedBoot implements LibgopeedApiSingleton {
|
||||||
|
static LibgopeedApi? _instance;
|
||||||
|
|
||||||
|
static void singleton(LibgopeedApi instance) {
|
||||||
|
_instance ??= instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
static LibgopeedApi get instance {
|
||||||
|
return _instance!;
|
||||||
|
}
|
||||||
|
|
||||||
|
factory LibgopeedBoot() => create();
|
||||||
|
}
|
||||||
Loaded 50 of 140 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user