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
149 lines
4.4 KiB
Go
149 lines
4.4 KiB
Go
package handlers
|
|
|
|
import (
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/celestix/gotgproto/dispatcher"
|
|
"github.com/celestix/gotgproto/ext"
|
|
"github.com/charmbracelet/log"
|
|
"github.com/gotd/td/tg"
|
|
"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil"
|
|
"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
|
|
"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/shortcut"
|
|
"github.com/krau/SaveAny-Bot/common/i18n"
|
|
"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
|
|
"github.com/krau/SaveAny-Bot/config"
|
|
"github.com/krau/SaveAny-Bot/database"
|
|
"github.com/krau/SaveAny-Bot/pkg/tcbdata"
|
|
"github.com/krau/SaveAny-Bot/pkg/tfile"
|
|
"github.com/krau/SaveAny-Bot/storage"
|
|
)
|
|
|
|
// mediaGroupKey uniquely identifies a media group by chat, sender, and group
|
|
// ID so files from different users in the same chat can never be mixed.
|
|
type mediaGroupKey struct {
|
|
chatID int64
|
|
userID int64
|
|
groupID int64
|
|
}
|
|
|
|
type MediaGroupHandler struct {
|
|
groups map[mediaGroupKey][]tfile.TGFileMessage
|
|
timers map[mediaGroupKey]*time.Timer
|
|
mu sync.Mutex
|
|
timeout time.Duration
|
|
setupOnce sync.Once
|
|
}
|
|
|
|
func (m *MediaGroupHandler) SetupTimeout(timeoutSec int) {
|
|
m.setupOnce.Do(func() {
|
|
if timeoutSec < 1 {
|
|
timeoutSec = 1
|
|
}
|
|
m.timeout = time.Duration(timeoutSec) * time.Second
|
|
})
|
|
}
|
|
|
|
var (
|
|
mediaGroupHandler = &MediaGroupHandler{
|
|
groups: make(map[mediaGroupKey][]tfile.TGFileMessage),
|
|
timers: make(map[mediaGroupKey]*time.Timer),
|
|
mu: sync.Mutex{},
|
|
}
|
|
)
|
|
|
|
func handleGroupMediaMessage(ctx *ext.Context, update *ext.Update, message *tg.Message, groupID int64) error {
|
|
mediaGroupHandler.SetupTimeout(max(config.C().Telegram.MediaGroupTimeout, 1))
|
|
logger := log.FromContext(ctx)
|
|
media := message.Media
|
|
supported := mediautil.IsSupported(media)
|
|
if !supported {
|
|
return dispatcher.EndGroups
|
|
}
|
|
userId := update.GetUserChat().GetID()
|
|
userDB, err := database.GetUserByChatID(ctx, userId)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
tfOpts := mediautil.TfileOptions(ctx, userDB, message)
|
|
file, err := tfile.FromMediaMessage(media, ctx.Raw, message, tfOpts...)
|
|
if err != nil {
|
|
logger.Errorf("Failed to get file from media: %s", err)
|
|
return dispatcher.EndGroups
|
|
}
|
|
mediaGroupHandler.mu.Lock()
|
|
defer mediaGroupHandler.mu.Unlock()
|
|
key := mediaGroupKey{
|
|
chatID: update.EffectiveChat().GetID(),
|
|
userID: userId,
|
|
groupID: groupID,
|
|
}
|
|
if mediaGroupHandler.groups[key] == nil {
|
|
mediaGroupHandler.groups[key] = make([]tfile.TGFileMessage, 0)
|
|
}
|
|
mediaGroupHandler.groups[key] = append(mediaGroupHandler.groups[key], file)
|
|
|
|
if timer, exists := mediaGroupHandler.timers[key]; exists {
|
|
timer.Stop()
|
|
}
|
|
mediaGroupHandler.timers[key] = time.AfterFunc(mediaGroupHandler.timeout, func() {
|
|
processMediaGroup(ctx, update, key)
|
|
})
|
|
return dispatcher.EndGroups
|
|
}
|
|
|
|
func processMediaGroup(ctx *ext.Context, update *ext.Update, key mediaGroupKey) {
|
|
logger := log.FromContext(ctx)
|
|
mediaGroupHandler.mu.Lock()
|
|
items := mediaGroupHandler.groups[key]
|
|
delete(mediaGroupHandler.groups, key)
|
|
delete(mediaGroupHandler.timers, key)
|
|
mediaGroupHandler.mu.Unlock()
|
|
if len(items) == 0 {
|
|
logger.Warn("No media items to process for group", "groupID", key.groupID)
|
|
return
|
|
}
|
|
logger.Debugf("Processing media group %d with %d items", key.groupID, len(items))
|
|
|
|
userId := update.GetUserChat().GetID()
|
|
msg, err := ctx.Reply(update, ext.ReplyTextString(i18n.T(i18nk.BotMsgMediaGroupInfoSavingFiles, nil)), nil)
|
|
if err != nil {
|
|
logger.Errorf("Failed to reply: %s", err)
|
|
return
|
|
}
|
|
stor := storage.FromContext(ctx)
|
|
if stor != nil {
|
|
// In silent mode
|
|
if len(items) == 1 {
|
|
shortcut.CreateAndAddTGFileTaskWithEdit(ctx, userId, stor, "", items[0], msg.ID)
|
|
return
|
|
}
|
|
shortcut.CreateAndAddBatchTGFileTaskWithEdit(ctx, userId, stor, "", items, msg.ID)
|
|
return
|
|
}
|
|
|
|
stors := storage.GetUserStorages(ctx, userId)
|
|
markup, err := msgelem.BuildAddSelectStorageKeyboard(stors, tcbdata.Add{
|
|
Files: items,
|
|
AsBatch: len(items) > 1,
|
|
})
|
|
if err != nil {
|
|
logger.Errorf("Failed to build storage selection keyboard: %s", err)
|
|
ctx.EditMessage(userId, &tg.MessagesEditMessageRequest{
|
|
ID: msg.ID,
|
|
Message: i18n.T(i18nk.BotMsgMediaGroupErrorBuildStorageSelectKeyboardFailed, map[string]any{
|
|
"Error": err.Error(),
|
|
}),
|
|
})
|
|
return
|
|
}
|
|
ctx.EditMessage(userId, &tg.MessagesEditMessageRequest{
|
|
ID: msg.ID,
|
|
Message: i18n.T(i18nk.BotMsgMediaGroupInfoGroupFoundFilesSelectStorage, map[string]any{
|
|
"Count": len(items),
|
|
}),
|
|
ReplyMarkup: markup,
|
|
})
|
|
}
|