mirror of
https://github.com/krau/SaveAny-Bot.git
synced 2026-08-28 19:56:41 +08:00
* fix: prevent queue deadlock after cancelling tasks Get no longer recurses while holding the mutex. Cancelled queued tasks leave the map, making their IDs reusable. Closed empty queues return ErrQueueClosed. * fix: init task queue lazily and close on shutdown AddTask is safe before Run by initializing the queue once. Close unblocks workers waiting in Get. * fix: make resource fingerprints deterministic Sort map keys before hashing so Resource.ID is stable. * fix: harden per-item processing tracking in tasks Use the resource fingerprint as the dedup key on insert and delete. Check and set processing entries atomically instead of TOCTOU. Count only successful downloads. * fix: honor IgnoreErrors in batch tasks Element failures no longer cancel sibling elements or stop later groups. * fix: report streamed upload bytes in batch tasks Stream downloads report their byte count as the upload total. * fix: validate i18n key parity across locales geni18n fails when a language file misses any key. Align the syncpeers completion key between en and zh-Hans. Translate three untranslated parse keys in zh-Hans. * refactor: share progress throttling helpers Move size-tiered and count-based throttling into progressutil. Localize hardcoded Chinese progress strings. Drop five duplicated implementations and dead local copies. * refactor: share unique filename logic Storage backends use fsutil.UniquePath instead of local loops. * fix: sanitize local storage paths Reject absolute paths and dot-dot escapes in Save. Check close errors and wrap creation failures. * fix: preserve webdav error causes Wrap mkdir and write failures with %w and drop dead error values. * fix: kill rclone subprocess on reader close Prevent cat processes from hanging after the pipe is closed. * fix: fail alist init instead of exiting Replace log.Fatalf with wrapped errors so a bad alist cannot kill the bot. Cancel token refresh with the init context and re-login on 401. * fix: enforce telegram album limits and track saved paths Use tglimit.MaxAlbumItems for album batching and video splitting. Exists now reports previously saved paths instead of always false. * fix: guard storage registry maps Protect Storages and UserStorages with mutexes and expose read accessors. * fix: harden JS parser plugin runtime Validate semver instead of panicking and require canHandle. Recover plugin worker panics and time out CanHandle calls. Return a copy from the registry and sanitize install filenames. * fix: guard kemono parser against nil fields Skip sparse preview and attachment entries instead of panicking. * refactor: remove commented-out dead code Drop unused kemono legacy types and commented response structs. * test: cover invalid plugin version rejection * fix: show all queued tasks in /task list Render up to ten tasks and append the truncation note once. * fix: guard callback data parsing Reject malformed callback payloads before indexing split parts. * fix: isolate media groups per user Key pending groups by chat, user and group id. * fix: require permission for callback handlers * fix: initialize userbot context once Replace the racy lazy init with sync.OnceValue. * fix: avoid leaking raw errors in /dir reply * fix: notify users on invalid update version * fix: fail fast when API listen fails Bind synchronously and surface errors instead of logging them. * fix: add timeouts and backoff to webhook delivery * refactor: remove dead code from api and bot Drop the empty ProgressTracker shim, unused token context key and a redundant SetBotCommands call. * fix: load remote config without local lookup Skip the local file search after reading a config URL and add a timeout. * refactor: drop unused hook config * docs: document parser plugin config * ci: fix BuildTime formatting and align checkout Actions format does not format dates; pass the raw timestamp. * chore: ignore cache directory * fix: make cache init idempotent * fix: upload only downloaded batch elements Failed elements keep partial cache files and never reach the backend. Successfully downloaded siblings still upload when one element fails. * fix: record telegram saved paths only after upload Skip-large returns a sentinel so skipped files are not marked as saved. * fix: deduplicate alist token refreshes Guard token access with a mutex and merge concurrent logins. Reuse a recent refresh to avoid login storms. * test: cover concurrent alist 401 retry Ten parallel uploads share a single re-login under -race. * fix: count parsed resources in progress text * fix: localize storage lookup errors in /dir Use the shared i18n key and escape the dynamic error. * fix: deduplicate concurrent storage initialization singleflight merges first-time inits so side effects are not duplicated. * fix: guard nil progress trackers in api-created tasks Batch, telegraph and transfer tasks run without a Telegram tracker when created through the API; their callbacks must not panic. * fix: keep album order when filtering failed batch items Download results are stored by original index so surviving elements keep their source order. * test: cover nil-tracker task execution * fix: report partial failure in batch done message IgnoreErrors runs with failed elements show success and failed counts instead of claiming every file completed. * fix: skip login refresh for token-only alist storage 401 responses surface the auth error instead of sending a credential-less login; the refresh window never exceeds TokenExp. * test: cover alist refresh semantics Concurrent refresh uses username/password; token-only storage never attempts a login on 401. * fix: call tracker from notifyProgress instead of recursing The helper called itself, overflowing the stack on any batch task with a progress tracker. * fix: propagate cancellation past IgnoreErrors Cancelled tasks must not be reported as successful: only ordinary element failures are ignored. * test: cover notifyProgress tracker call * test: cover cancellation with IgnoreErrors * fix: refresh alist token after startup 401s The init login no longer satisfies the dedup window, so an early 401 triggers a real refresh; later 401s reuse it. Clarify that streaming uploads cannot replay their body. * test: exercise the alist 401 refresh path Concurrent uploads now reject the init token, share one refresh and retry with the new token; token-only stays inert. * style: trim verbose comments Drop process-style explanations; keep one-line behavior notes. * style: gofmt test files * fix: drop unbounded saved-path cache in telegram storage Telegram cannot reliably query remote file existence, so the cache answered a question it could not answer and grew without bound. Exists returns false again, as before. * style: format codes
243 lines
6.5 KiB
Go
243 lines
6.5 KiB
Go
package api
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/krau/SaveAny-Bot/core"
|
|
"github.com/krau/SaveAny-Bot/pkg/enums/tasktype"
|
|
"github.com/krau/SaveAny-Bot/storage"
|
|
)
|
|
|
|
// Handlers 处理器结构体
|
|
type Handlers struct {
|
|
factory *TaskFactory
|
|
}
|
|
|
|
// NewHandlers 创建处理器
|
|
func NewHandlers(factory *TaskFactory) *Handlers {
|
|
return &Handlers{factory: factory}
|
|
}
|
|
|
|
// CreateTaskHandler 创建任务处理器
|
|
func (h *Handlers) CreateTaskHandler(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodPost {
|
|
WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only POST method is allowed")
|
|
return
|
|
}
|
|
|
|
var req CreateTaskRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
WriteError(w, http.StatusBadRequest, "invalid_request", "failed to decode request body: "+err.Error())
|
|
return
|
|
}
|
|
|
|
// 验证请求
|
|
if req.Type == "" {
|
|
WriteError(w, http.StatusBadRequest, "invalid_request", "task type is required")
|
|
return
|
|
}
|
|
|
|
if req.Storage == "" {
|
|
WriteError(w, http.StatusBadRequest, "invalid_request", "storage is required")
|
|
return
|
|
}
|
|
|
|
// 创建任务
|
|
resp, err := h.factory.CreateTask(&req)
|
|
if err != nil {
|
|
WriteError(w, http.StatusBadRequest, "task_creation_failed", err.Error())
|
|
return
|
|
}
|
|
|
|
WriteJSON(w, http.StatusCreated, resp)
|
|
}
|
|
|
|
// ListTasksHandler 列出任务处理器
|
|
func (h *Handlers) ListTasksHandler(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodGet {
|
|
WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only GET method is allowed")
|
|
return
|
|
}
|
|
|
|
tasks := GetAllTasks()
|
|
response := make([]TaskInfoResponse, 0, len(tasks))
|
|
|
|
for _, task := range tasks {
|
|
info := convertTaskProgressToResponse(task)
|
|
response = append(response, info)
|
|
}
|
|
|
|
WriteJSON(w, http.StatusOK, TasksListResponse{
|
|
Tasks: response,
|
|
Total: len(response),
|
|
})
|
|
}
|
|
|
|
// GetTaskHandler 获取单个任务处理器
|
|
func (h *Handlers) GetTaskHandler(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodGet {
|
|
WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only GET method is allowed")
|
|
return
|
|
}
|
|
|
|
taskID := extractTaskIDFromPath(r.URL.Path)
|
|
if taskID == "" {
|
|
WriteError(w, http.StatusBadRequest, "invalid_request", "task ID is required")
|
|
return
|
|
}
|
|
|
|
task, ok := GetTask(taskID)
|
|
if !ok {
|
|
WriteError(w, http.StatusNotFound, "task_not_found", "task not found: "+taskID)
|
|
return
|
|
}
|
|
|
|
resp := convertTaskProgressToResponse(task)
|
|
WriteJSON(w, http.StatusOK, resp)
|
|
}
|
|
|
|
// CancelTaskHandler 取消任务处理器
|
|
func (h *Handlers) CancelTaskHandler(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodDelete {
|
|
WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only DELETE method is allowed")
|
|
return
|
|
}
|
|
|
|
taskID := extractTaskIDFromPath(r.URL.Path)
|
|
if taskID == "" {
|
|
WriteError(w, http.StatusBadRequest, "invalid_request", "task ID is required")
|
|
return
|
|
}
|
|
|
|
task, ok := GetTask(taskID)
|
|
if !ok {
|
|
WriteError(w, http.StatusNotFound, "task_not_found", "task not found: "+taskID)
|
|
return
|
|
}
|
|
|
|
// Cancel the task; the terminal status is set via the task event stream.
|
|
if err := core.CancelTask(r.Context(), taskID); err != nil {
|
|
WriteError(w, http.StatusInternalServerError, "cancel_failed", "failed to cancel task: "+err.Error())
|
|
return
|
|
}
|
|
|
|
task.UpdateStatus(TaskStatusCancelled)
|
|
WriteJSON(w, http.StatusOK, map[string]string{"message": "task cancelled successfully"})
|
|
}
|
|
|
|
// ListStoragesHandler 列出存储处理器
|
|
func (h *Handlers) ListStoragesHandler(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodGet {
|
|
WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only GET method is allowed")
|
|
return
|
|
}
|
|
|
|
all := storage.AllStorages()
|
|
storages := make([]StorageInfo, 0, len(all))
|
|
for name, stor := range all {
|
|
storages = append(storages, StorageInfo{
|
|
Name: name,
|
|
Type: string(stor.Type()),
|
|
})
|
|
}
|
|
|
|
WriteJSON(w, http.StatusOK, StoragesResponse{Storages: storages})
|
|
}
|
|
|
|
// GetTaskTypesHandler 获取支持的任务类型
|
|
func (h *Handlers) GetTaskTypesHandler(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodGet {
|
|
WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only GET method is allowed")
|
|
return
|
|
}
|
|
|
|
types := []tasktype.TaskType{
|
|
tasktype.TaskTypeDirectlinks,
|
|
tasktype.TaskTypeYtdlp,
|
|
tasktype.TaskTypeAria2,
|
|
tasktype.TaskTypeParseditem,
|
|
tasktype.TaskTypeTgfiles,
|
|
tasktype.TaskTypeTphpics,
|
|
tasktype.TaskTypeTransfer,
|
|
}
|
|
|
|
WriteJSON(w, http.StatusOK, map[string]any{
|
|
"types": types,
|
|
})
|
|
}
|
|
|
|
// HealthCheckHandler 健康检查处理器
|
|
func (h *Handlers) HealthCheckHandler(w http.ResponseWriter, r *http.Request) {
|
|
WriteJSON(w, http.StatusOK, map[string]string{
|
|
"status": "ok",
|
|
})
|
|
}
|
|
|
|
// extractTaskIDFromPath 从路径中提取任务 ID
|
|
// 路径格式: /api/v1/tasks/:id
|
|
func extractTaskIDFromPath(path string) string {
|
|
parts := strings.Split(strings.Trim(path, "/"), "/")
|
|
if len(parts) < 4 {
|
|
return ""
|
|
}
|
|
return parts[3]
|
|
}
|
|
|
|
// convertTaskProgressToResponse renders a task's current state, computing
|
|
// percent and speed from the snapshot taken under the task's mutex.
|
|
func convertTaskProgressToResponse(task *TaskProgressInfo) TaskInfoResponse {
|
|
status, total, downloaded, totalFiles, downloadedFiles, startedAt, errMsg, updatedAt := task.snapshot()
|
|
|
|
resp := TaskInfoResponse{
|
|
TaskID: task.TaskID,
|
|
Type: tasktype.TaskType(task.Type),
|
|
Status: status,
|
|
Title: task.Title,
|
|
Storage: task.Storage,
|
|
Path: task.Path,
|
|
Error: errMsg,
|
|
CreatedAt: task.CreatedAt,
|
|
UpdatedAt: updatedAt,
|
|
}
|
|
|
|
var percent float64
|
|
var speedMBPS float64
|
|
if total > 0 {
|
|
percent = float64(downloaded) * 100 / float64(total)
|
|
} else if totalFiles > 0 {
|
|
percent = float64(downloadedFiles) * 100 / float64(totalFiles)
|
|
}
|
|
if !startedAt.IsZero() {
|
|
elapsed := time.Since(startedAt).Seconds()
|
|
if elapsed > 0 {
|
|
speedMBPS = float64(downloaded) / elapsed / (1024 * 1024)
|
|
}
|
|
}
|
|
|
|
if total > 0 || totalFiles > 0 {
|
|
resp.Progress = &TaskProgress{
|
|
TotalBytes: total,
|
|
DownloadedBytes: downloaded,
|
|
TotalFiles: totalFiles,
|
|
DownloadedFiles: downloadedFiles,
|
|
Percent: percent,
|
|
SpeedMBPS: speedMBPS,
|
|
}
|
|
}
|
|
|
|
return resp
|
|
}
|
|
|
|
// NotFoundHandler 404 处理器
|
|
func NotFoundHandler(w http.ResponseWriter, r *http.Request) {
|
|
WriteError(w, http.StatusNotFound, "not_found", "endpoint not found: "+r.URL.Path)
|
|
}
|
|
|
|
// MethodNotAllowedHandler 405 处理器
|
|
func MethodNotAllowedHandler(w http.ResponseWriter, r *http.Request) {
|
|
WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "method not allowed: "+r.Method)
|
|
}
|