mirror of
https://github.com/krau/SaveAny-Bot.git
synced 2026-09-01 05:36:40 +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
289 lines
7.3 KiB
Go
289 lines
7.3 KiB
Go
package rclone
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"os/exec"
|
|
"path"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/charmbracelet/log"
|
|
"github.com/krau/SaveAny-Bot/common/utils/fsutil"
|
|
config "github.com/krau/SaveAny-Bot/config/storage"
|
|
"github.com/krau/SaveAny-Bot/pkg/enums/ctxkey"
|
|
storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
|
|
"github.com/krau/SaveAny-Bot/pkg/storagetypes"
|
|
)
|
|
|
|
type Rclone struct {
|
|
config config.RcloneStorageConfig
|
|
logger *log.Logger
|
|
}
|
|
|
|
func (r *Rclone) Init(ctx context.Context, cfg config.StorageConfig) error {
|
|
rcloneConfig, ok := cfg.(*config.RcloneStorageConfig)
|
|
if !ok {
|
|
return fmt.Errorf("failed to cast rclone config")
|
|
}
|
|
if err := rcloneConfig.Validate(); err != nil {
|
|
return err
|
|
}
|
|
r.config = *rcloneConfig
|
|
r.logger = log.FromContext(ctx).WithPrefix(fmt.Sprintf("rclone[%s]", r.config.Name))
|
|
|
|
// 检查 rclone 是否安装
|
|
if _, err := exec.LookPath("rclone"); err != nil {
|
|
return ErrRcloneNotFound
|
|
}
|
|
|
|
args := r.buildBaseArgs()
|
|
args = append(args, "listremotes")
|
|
cmd := exec.CommandContext(ctx, "rclone", args...)
|
|
output, err := cmd.Output()
|
|
if err != nil {
|
|
r.logger.Errorf("Failed to list remotes: %v", err)
|
|
return fmt.Errorf("failed to verify rclone: %w", err)
|
|
}
|
|
|
|
remoteName := strings.TrimSuffix(r.config.Remote, ":")
|
|
|
|
found := false
|
|
scanner := bufio.NewScanner(bytes.NewReader(output))
|
|
for scanner.Scan() {
|
|
line := strings.TrimSpace(scanner.Text())
|
|
line = strings.TrimSuffix(line, ":")
|
|
if line == remoteName {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
|
|
if !found {
|
|
r.logger.Errorf("Remote %s not found in rclone config", r.config.Remote)
|
|
return ErrRemoteNotFound
|
|
}
|
|
|
|
r.logger.Infof("Initialized rclone storage with remote: %s", r.config.Remote)
|
|
return nil
|
|
}
|
|
|
|
func (r *Rclone) Type() storenum.StorageType {
|
|
return storenum.Rclone
|
|
}
|
|
|
|
func (r *Rclone) Name() string {
|
|
return r.config.Name
|
|
}
|
|
|
|
func (r *Rclone) buildBaseArgs() []string {
|
|
var args []string
|
|
if r.config.ConfigPath != "" {
|
|
args = append(args, "--config", r.config.ConfigPath)
|
|
}
|
|
args = append(args, r.config.Flags...)
|
|
return args
|
|
}
|
|
|
|
func (r *Rclone) getRemotePath(storagePath string) string {
|
|
remote := r.config.Remote
|
|
if !strings.HasSuffix(remote, ":") {
|
|
remote += ":"
|
|
}
|
|
basePath := strings.TrimPrefix(r.config.BasePath, "/")
|
|
fullPath := path.Join(basePath, storagePath)
|
|
return remote + fullPath
|
|
}
|
|
|
|
func (r *Rclone) Save(ctx context.Context, reader io.Reader, storagePath string) error {
|
|
r.logger.Infof("Saving file to %s", storagePath)
|
|
|
|
candidate := storagePath
|
|
if overwrite, _ := ctx.Value(ctxkey.OverwriteExisting).(bool); !overwrite {
|
|
candidate = fsutil.UniquePath("", storagePath, func(c string) bool {
|
|
return r.Exists(ctx, c)
|
|
}, 100)
|
|
}
|
|
|
|
remotePath := r.getRemotePath(candidate)
|
|
r.logger.Debugf("Remote path: %s", remotePath)
|
|
|
|
// Use rclone rcat to read from stdin and upload
|
|
args := r.buildBaseArgs()
|
|
args = append(args, "rcat", remotePath)
|
|
|
|
cmd := exec.CommandContext(ctx, "rclone", args...)
|
|
cmd.Stdin = reader
|
|
|
|
var stderr bytes.Buffer
|
|
cmd.Stderr = &stderr
|
|
|
|
if err := cmd.Run(); err != nil {
|
|
r.logger.Errorf("Failed to save file: %v, stderr: %s", err, stderr.String())
|
|
return fmt.Errorf("%w: %s", ErrFailedToSaveFile, stderr.String())
|
|
}
|
|
|
|
r.logger.Infof("Successfully saved file to %s", candidate)
|
|
return nil
|
|
}
|
|
|
|
func (r *Rclone) Exists(ctx context.Context, storagePath string) bool {
|
|
remotePath := r.getRemotePath(storagePath)
|
|
|
|
args := r.buildBaseArgs()
|
|
args = append(args, "lsf", remotePath)
|
|
|
|
cmd := exec.CommandContext(ctx, "rclone", args...)
|
|
err := cmd.Run()
|
|
return err == nil
|
|
}
|
|
|
|
// lsjsonItem represents a single entry in the output of `rclone lsjson`
|
|
type lsjsonItem struct {
|
|
Path string `json:"Path"`
|
|
Name string `json:"Name"`
|
|
Size int64 `json:"Size"`
|
|
MimeType string `json:"MimeType"`
|
|
ModTime string `json:"ModTime"`
|
|
IsDir bool `json:"IsDir"`
|
|
}
|
|
|
|
// ListFiles implements storage.StorageListable
|
|
func (r *Rclone) ListFiles(ctx context.Context, dirPath string) ([]storagetypes.FileInfo, error) {
|
|
r.logger.Infof("Listing files in %s", dirPath)
|
|
|
|
remotePath := r.getRemotePath(dirPath)
|
|
|
|
args := r.buildBaseArgs()
|
|
args = append(args, "lsjson", remotePath)
|
|
|
|
cmd := exec.CommandContext(ctx, "rclone", args...)
|
|
var stdout, stderr bytes.Buffer
|
|
cmd.Stdout = &stdout
|
|
cmd.Stderr = &stderr
|
|
|
|
if err := cmd.Run(); err != nil {
|
|
r.logger.Errorf("Failed to list files: %v, stderr: %s", err, stderr.String())
|
|
return nil, fmt.Errorf("%w: %s", ErrFailedToListFiles, stderr.String())
|
|
}
|
|
|
|
var items []lsjsonItem
|
|
if err := json.Unmarshal(stdout.Bytes(), &items); err != nil {
|
|
r.logger.Errorf("Failed to parse lsjson output: %v", err)
|
|
return nil, fmt.Errorf("failed to parse lsjson output: %w", err)
|
|
}
|
|
|
|
files := make([]storagetypes.FileInfo, 0, len(items))
|
|
for _, item := range items {
|
|
var modTime time.Time
|
|
if item.ModTime != "" {
|
|
parsedTime, err := time.Parse(time.RFC3339Nano, item.ModTime)
|
|
if err != nil {
|
|
r.logger.Warnf("Failed to parse mod time %q for %s: %v", item.ModTime, item.Name, err)
|
|
} else {
|
|
modTime = parsedTime
|
|
}
|
|
}
|
|
|
|
files = append(files, storagetypes.FileInfo{
|
|
Name: item.Name,
|
|
Path: path.Join(dirPath, item.Name),
|
|
Size: item.Size,
|
|
IsDir: item.IsDir,
|
|
ModTime: modTime,
|
|
})
|
|
}
|
|
|
|
r.logger.Debugf("Found %d files/directories in %s", len(files), dirPath)
|
|
return files, nil
|
|
}
|
|
|
|
// OpenFile implements storage.StorageReadable
|
|
func (r *Rclone) OpenFile(ctx context.Context, filePath string) (io.ReadCloser, int64, error) {
|
|
r.logger.Infof("Opening file %s", filePath)
|
|
|
|
remotePath := r.getRemotePath(filePath)
|
|
|
|
size, err := r.getFileSize(ctx, remotePath)
|
|
if err != nil {
|
|
r.logger.Errorf("Failed to get file size: %v", err)
|
|
return nil, 0, fmt.Errorf("%w: %v", ErrFailedToOpenFile, err)
|
|
}
|
|
|
|
args := r.buildBaseArgs()
|
|
args = append(args, "cat", remotePath)
|
|
|
|
cmd := exec.CommandContext(ctx, "rclone", args...)
|
|
|
|
stdout, err := cmd.StdoutPipe()
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("failed to create stdout pipe: %w", err)
|
|
}
|
|
|
|
if err := cmd.Start(); err != nil {
|
|
return nil, 0, fmt.Errorf("failed to start rclone cat: %w", err)
|
|
}
|
|
|
|
reader := &rcloneCatReader{
|
|
reader: stdout,
|
|
cmd: cmd,
|
|
logger: r.logger,
|
|
}
|
|
|
|
r.logger.Debugf("Opened file %s (size: %d bytes)", filePath, size)
|
|
return reader, size, nil
|
|
}
|
|
|
|
func (r *Rclone) getFileSize(ctx context.Context, remotePath string) (int64, error) {
|
|
args := r.buildBaseArgs()
|
|
args = append(args, "lsjson", remotePath)
|
|
|
|
cmd := exec.CommandContext(ctx, "rclone", args...)
|
|
var stdout bytes.Buffer
|
|
cmd.Stdout = &stdout
|
|
|
|
if err := cmd.Run(); err != nil {
|
|
return 0, err
|
|
}
|
|
|
|
var items []lsjsonItem
|
|
if err := json.Unmarshal(stdout.Bytes(), &items); err != nil {
|
|
return 0, err
|
|
}
|
|
|
|
if len(items) > 0 {
|
|
return items[0].Size, nil
|
|
}
|
|
return 0, nil
|
|
}
|
|
|
|
type rcloneCatReader struct {
|
|
reader io.ReadCloser
|
|
cmd *exec.Cmd
|
|
logger *log.Logger
|
|
}
|
|
|
|
func (r *rcloneCatReader) Read(p []byte) (n int, err error) {
|
|
return r.reader.Read(p)
|
|
}
|
|
|
|
func (r *rcloneCatReader) Close() error {
|
|
if err := r.reader.Close(); err != nil {
|
|
r.logger.Warnf("Failed to close reader: %v", err)
|
|
}
|
|
// Kill the cat process so Wait cannot block on a hung pipe.
|
|
if r.cmd.Process != nil {
|
|
if err := r.cmd.Process.Kill(); err != nil {
|
|
r.logger.Warnf("Failed to kill rclone cat process: %v", err)
|
|
}
|
|
}
|
|
if err := r.cmd.Wait(); err != nil {
|
|
r.logger.Warnf("rclone cat process exited with error: %v", err)
|
|
}
|
|
return nil
|
|
}
|