* perf(catalog): fix audiobook detail N+1 + slow people facets Audiobook detail pages were slow in proportion to track count (up to 433 files/book). Root causes, found by EXPLAIN ANALYZE on the live DB: - effectiveAudioSelection ran 3-4 user-store queries (profile, audio pref, library pref) per file inside buildPlaybackInfo's loop, though the results are invariant across a request. Introduce a request-scoped audioPrefResolver that memoizes the store lookups (library prefs keyed by folder); a 400-file audiobook now issues each query once instead of per file. Selection logic is unchanged (audioPreference returns a copy so the original-language sentinel is still resolved per file). - buildAudiobookExtension ran its four independent related-content queries serially; run them concurrently so latency is the slowest, not the sum. - author/narrator browse facets did a full people-table scan; add a (kind, content_id, person_id) index so the facet resolves from an index-only scan of just that kind's credits (~112ms -> ~49ms on the live library). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * perf(catalog): cache audiobook author/narrator group browse The Authors/Narrators audiobook pages were slow on cold load and slow again after a hard refresh (fast only while the React Query client cache was warm). Root cause (EXPLAIN ANALYZE on live, 31K-audiobook library): the grouped browse query is ~234ms/page, there are ~13K distinct authors, and the client pages through the entire list on every load (sequential 500-row requests). With no server-side cache each of the ~20 pages re-ran the full aggregation (COUNT(*) OVER() forces it), so a cold load was ~20x234ms. The client's 60s staleTime was the only thing making a warm revisit fast; a refresh wiped it. Fix: AudiobookGroupsCache caches the full sorted group list per (library, group_by, sort, viewer) for 60s (matching the client staleTime, so no extra staleness) and serves every page as an in-memory slice — one aggregation per window instead of one per page, and a refresh is a cache hit. Also raise the client page size 500->2000 so fewer sequential round-trips are needed now that a larger page is a cheap slice. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * perf(settings): throttle per-request device last_seen upserts Device-setting reads (HandleGetDeviceSetting, HandleGetEffectiveSettings, HandleGetEffectiveSubtitleAppearance) each registered the request's device — an INSERT ... ON CONFLICT upsert of last_seen_at on a single per-device row. A page that fetches many settings fired hundreds of these concurrently; they serialized on that row's lock (observed 100-237ms each, ~250 per page load in the slow query log), taxing every settings fetch. Throttle device registration to one upsert per (profile, device) per 5 minutes via an in-process TTL cache, marking the device seen before the upsert so a concurrent burst collapses to a single write. last_seen_at stays fresh to within the window. Reads no longer issue a contended write on the hot path. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * perf+fix(audiobooks): probe-repair, resume position, cache storm, groups reveal, hot-row + stats index From the full audiobook code review (EXPLAIN + slow-query trace on live): - #1 (P0, detail-page killer): NeedsCriticalProbeRepair required video codec/ resolution/tracks, which audio-only files never have, so PlaybackProbeEnsurer re-ran ffprobe per file on every detail/watch load (up to N serial spawns for an N-track book) and never converged. Gate video-field checks on the file actually having a video stream. TDD. - #3 (P0): abs session-sync rewound the resume cursor — UpdateProgressPosition did an unconditional SET with no monotonic guard, ignored its error, and no-op'd when no row existed (first-listen resume lost). Now a finish-preserving GREATEST upsert; caller logs failures. - #4 (P0 perf): progress reports fired every ~10s invalidated all of catalogKeys.all → refetched every active browse/detail query incl the 13k audiobook group lists. Scope invalidation to the reported item's detail. - #6 (P1 perf): Authors/Narrators page rendered all ~13k groups + cover images at once (main-thread freeze). Incremental reveal: render a capped window, grow on scroll via IntersectionObserver. - #10: throttle abs TouchToken last_seen upsert (one per token per 5min) — same hot-row contention class as the device fix. - #8: index abs_playback_sessions (user_id, profile_id, started_at) for the listening-stats aggregations. Deferred (need contract/validation): listening-time idempotency (client delta-vs- cumulative), scanner deleted-file reconcile, abs session retention job, abs list- handler batch fetch, scanner-output P2s (need re-backfill). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * perf(audiobooks): batch-fetch abs list/shelf handlers (kill N+1) handleSimilarItems, handleItemsInProgress, and handleGetMyProgress called MediaStore.GetAudiobookByID once per row — up to ~500 single fetches (each a few queries) on app open. Add GetAudiobooksByIDs (one access-scoped fetch + people/series hydrated once for the whole set) and look results up from the returned map, preserving order. Underlying primitives (GetByIDsWithAccess, hydratePeople/Series) were already batch-capable. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(audiobooks): reconcile deleted files on scan + prune session history #5: ScanAudiobookFolder only ever upserted — deleted/renamed books leaked media_items/media_files/memberships forever. Mirror the ebook reconcile: collect seenPaths during the walk, MarkMissing files no longer on disk, then reconcileLibraryMemberships. Safety mirrors ebooks/video: an inaccessible root (unmounted source) is skipped entirely, and a walk that saw zero files while the DB has rows only reconciles after operator cleanup confirmation (ebookEmptyCleanupAllowed) — so a flapping mount can't wipe the catalog. Soft mark only; the existing grace-period purge hard-deletes later. Reconcile runs only on a fully-completed (non-cancelled) scan. (#9 coarse case already handled: audiobookFolderShouldSkip skips unchanged folders; per-file reuse deferred.) #8-retention: abs_playback_sessions grew unbounded (one row per play-start, never deleted) and fed every listening-stats scan. Add an hourly sweep in SessionCleaner: close abandoned open sessions (no /close, stopped syncing >24h) and delete closed sessions older than 90 days. Mirrors the recommendation_cache / missing-files prune pattern. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(audiobooks): address max-effort code-review findings From /code-review max on the pre-PR diff: - DATA RACE (P0): SessionCleaner.lastABSSessionPrune is read+written by both the 15s ticker goroutine and the shutdown-path CleanStale call (main.go defers Stop() to after that call). Guard the prune-due gate with a mutex. (CleanStale was stateless before this branch, so concurrent calls were previously safe.) - ScanAudiobookFolder hardcoded fullScan=true into the empty-walk cleanup guard, but it's also called from ScanSubtree (incremental scans). An empty subtree scan would wrongly consume the operator's one-shot empty-cleanup allowance and warn. Thread a real fullScan flag (true from ScanFolder, false from the two subtree call sites), mirroring the ebook path. - Revert UpdateProgressPosition to UPDATE-only (drop the INSERT-on-missing): keep the monotonic GREATEST + finish guard that fixes the resume rewind, but restore the no-op-on-missing contract so a stray sync tick can't resurrect just-cleared progress or create a zero-duration continue-listening row. - Clamp the audiobook-groups handler limit (paging moved into the cache, leaving the old 500/page bound stranded); also gofmt the Scanner struct. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(audiobooks): address review feedback for scanner and stats * fix(audiobooks): address review feedback * fix(audiobooks): retry failed session prune --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: Quick <31828688+Quick104@users.noreply.github.com>
142 lines
4.2 KiB
Go
142 lines
4.2 KiB
Go
package catalog
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"sort"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/jackc/pgx/v5/pgxpool"
|
|
"golang.org/x/sync/singleflight"
|
|
|
|
"github.com/Silo-Server/silo-server/internal/cache"
|
|
)
|
|
|
|
type groupsCacheEntry struct {
|
|
groups []AudiobookGroup
|
|
total int
|
|
}
|
|
|
|
// audiobookGroupsFetcher fetches the complete grouped list for a query.
|
|
type audiobookGroupsFetcher func(ctx context.Context, q AudiobookGroupsQuery, filter AccessFilter) ([]AudiobookGroup, int, error)
|
|
|
|
// AudiobookGroupsCache serves paged audiobook-group browse results from a
|
|
// short-lived in-process cache of the full grouped list.
|
|
//
|
|
// The author/narrator grouping is an expensive aggregation over the whole
|
|
// library, and the client pages through the entire result on every load
|
|
// (sequential 500-row requests until the total is reached). Without a cache
|
|
// each page re-runs the full aggregation, so a cold load is N pages times the
|
|
// per-page cost; caching the full sorted list per (library, group_by, sort,
|
|
// viewer) lets one computation serve every page and survive a quick refresh.
|
|
type AudiobookGroupsCache struct {
|
|
cache *cache.TTLCache[*groupsCacheEntry]
|
|
ttl time.Duration
|
|
fetch audiobookGroupsFetcher
|
|
group singleflight.Group
|
|
}
|
|
|
|
// NewAudiobookGroupsCache builds a cache that warms itself from the given pool.
|
|
func NewAudiobookGroupsCache(pool *pgxpool.Pool, ttl time.Duration) *AudiobookGroupsCache {
|
|
return &AudiobookGroupsCache{
|
|
cache: cache.NewTTLCache[*groupsCacheEntry](),
|
|
ttl: ttl,
|
|
fetch: func(ctx context.Context, q AudiobookGroupsQuery, filter AccessFilter) ([]AudiobookGroup, int, error) {
|
|
return listAllAudiobookGroups(ctx, pool, q, filter)
|
|
},
|
|
}
|
|
}
|
|
|
|
// Close stops the cache's background expiry sweeper.
|
|
func (c *AudiobookGroupsCache) Close() {
|
|
if c != nil && c.cache != nil {
|
|
c.cache.Close()
|
|
}
|
|
}
|
|
|
|
// Page returns the offset/limit slice of the grouped list plus the full group
|
|
// count.
|
|
func (c *AudiobookGroupsCache) Page(ctx context.Context, q AudiobookGroupsQuery, filter AccessFilter) ([]AudiobookGroup, int, error) {
|
|
key := audiobookGroupsCacheKey(q, filter)
|
|
if entry, ok := c.cache.Get(key); ok {
|
|
return sliceGroups(entry.groups, q.Offset, q.Limit), entry.total, nil
|
|
}
|
|
|
|
value, err, _ := c.group.Do(key, func() (any, error) {
|
|
if entry, ok := c.cache.Get(key); ok {
|
|
return entry, nil
|
|
}
|
|
groups, total, err := c.fetch(ctx, q, filter)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
entry := &groupsCacheEntry{groups: groups, total: total}
|
|
c.cache.Set(key, entry, c.ttl)
|
|
return entry, nil
|
|
})
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
entry := value.(*groupsCacheEntry)
|
|
return sliceGroups(entry.groups, q.Offset, q.Limit), entry.total, nil
|
|
}
|
|
|
|
func sliceGroups(groups []AudiobookGroup, offset, limit int) []AudiobookGroup {
|
|
if offset < 0 {
|
|
offset = 0
|
|
}
|
|
if offset >= len(groups) {
|
|
return []AudiobookGroup{}
|
|
}
|
|
end := len(groups)
|
|
if limit > 0 && offset+limit < end {
|
|
end = offset + limit
|
|
}
|
|
return groups[offset:end]
|
|
}
|
|
|
|
// audiobookGroupsCacheKey identifies a cached full list. It includes every
|
|
// AccessFilter field that changes the rows or the per-profile progress counts
|
|
// so two viewers (or two access scopes) never share an entry.
|
|
func audiobookGroupsCacheKey(q AudiobookGroupsQuery, filter AccessFilter) string {
|
|
sortKey := strings.ToLower(strings.TrimSpace(q.Sort))
|
|
if sortKey == "" {
|
|
sortKey = "name"
|
|
}
|
|
var b strings.Builder
|
|
fmt.Fprintf(&b, "%d|%s|%s|u=%d|p=%s|cr=%s", q.LibraryID, q.GroupBy, sortKey, filter.UserID, filter.ProfileID, filter.MaxContentRating)
|
|
b.WriteString("|allow=")
|
|
b.WriteString(joinSortedInts(filter.AllowedLibraryIDs))
|
|
b.WriteString("|deny=")
|
|
b.WriteString(joinSortedInts(filter.DisabledLibraryIDs))
|
|
b.WriteString("|cids=")
|
|
b.WriteString(strings.Join(sortedCopy(filter.AllowedContentIDs), ","))
|
|
b.WriteString("|excluded_types=")
|
|
b.WriteString(strings.Join(sortedCopy(filter.ExcludedMediaTypes), ","))
|
|
return b.String()
|
|
}
|
|
|
|
func joinSortedInts(values []int) string {
|
|
if len(values) == 0 {
|
|
return ""
|
|
}
|
|
cp := append([]int(nil), values...)
|
|
sort.Ints(cp)
|
|
parts := make([]string, len(cp))
|
|
for i, v := range cp {
|
|
parts[i] = strconv.Itoa(v)
|
|
}
|
|
return strings.Join(parts, ",")
|
|
}
|
|
|
|
func sortedCopy(values []string) []string {
|
|
if len(values) == 0 {
|
|
return nil
|
|
}
|
|
cp := append([]string(nil), values...)
|
|
sort.Strings(cp)
|
|
return cp
|
|
}
|