mirror of
https://github.com/navidrome/navidrome.git
synced 2026-08-31 07:30:32 +00:00
* feat(artwork): record the resolution trace so explain works without --live The worker never attached a ChainTrace, so `artwork explain` had to re-walk the priority chain at CLI time. That reconstruction could disagree with what actually happened, and without --live it could not report the external tier at all. The worker now traces every acquisition and stores it. `explain` reads the stored trace by default and reports when it was recorded; --live re-walks and calls the agents. Disc artwork keeps no row, so it always walks live. A chain trace alone would have explained almost nothing about failures: six of the seven ways an item can fail happen after the chain has already picked a winner. The trace now covers those stages too, and has somewhere to live when they fail: the retrying queue row carries the last failure, and the state row keeps it in last_failure once the retry budget is spent and the queue row is deleted. Measured on a copy of a 682MB / 43.6k-item library: +9.7MB (+1.4%). No row crosses the WITHOUT ROWID overflow threshold, so list hydration is unchanged; only full scans of item_artwork, which no request performs, read more pages. * test(artwork): pin the give-up ordering that keeps a failure for unresolved items recordGiveUp updates an existing row, and for a kind with a recheck path that row is only created moments earlier by the absent settle. Recording before the settle would lose the failure for every item that never resolved, with nothing to catch it. * refactor(artwork): tighten the trace code after review Four fixes worth taking: The doc comments on ChainTrace and chainState.trace still said the worker never attaches a trace and resolution stays allocation-free — the exact invariant this branch reverses. explain's report field meant both "the chain shown was walked just now" and "go out for real", and was being passed to loadPluginAgents, which --live documents as the only thing that may open external connections. Renamed to `walked` and restored explainLive as the sole input to that decision. A stored Detail is an error string on the failure paths, with no bound. The measured "no row reaches the WITHOUT ROWID overflow limit" only holds while it is bounded, so cap it at 200 runes. offlineGate was a factory returning a constant closure; make it a plain gateFunc like its sibling passthroughGate. Collapse five copies of the age-a-queue-row loop in the worker tests into one helper. * refactor(artwork): drop the offline explain walk, now that traces are stored `artwork explain` reported the external tier without calling it, so a diagnostic could not add load to a provider already rate-limiting us. Reading the stored trace answers that better: it reports what the agents actually returned, not what would be tried. Nothing could reach the offline gate any more. It was installed only for a walk with --live unset, which now happens for disc artwork alone, and disc rejects the external candidate before any gate call. That made the gate, its sentinel error, the would-try outcome and two of explain's verdicts unreachable. Removes offlineGate, errOfflineSkipped, OutcomeWouldTry, the NewTracingResolver live parameter and the CreateArtworkResolver argument threaded through wire. Verified against a copy of a real library: disc artwork with "external" first in DiscArtPriority and external services enabled still records the skip and issues no agent call. * fix(artwork): make explain's no-network guarantee structural, not incidental Serving falls back disc -> album and track -> disc -> album. The resolver layer explain uses has no such fallback today, so dropping the offline gate did not leak. But the guarantee rested on which chains happen to lack an external tier, and the serving layer already shows the fallback shape someone could mirror. Without --live the tracing resolver is now built with no agents at all, so no chain and no fallback added later can reach a provider. That is stronger than the gate it replaces, which only intercepted the call. The test pins it against exactly that regression: with the guard removed and the serving fallback mirrored into resolveDisc, it fails. * refactor(artwork): trim the trace plumbing EncodeTrace was exported for nobody: only this package writes traces, and cmd reads them. It becomes a ChainTrace method, which also drops the copy Steps made for a caller that only wanted to serialize. explain's report carried queuedSteps and failureSteps, both pure functions of the queue and state rows already in the struct, which let a test set the two out of step with each other. formatExplain derives them, as it already does for every other display value. The trace row format and its tabwriter empty-cell rule lived in two places, and the "nothing was ever recorded" predicate in three. * fix(artwork): clear the queue trace on a fresh re-enqueue Enqueue's conflict clause reset attempts to 0 but left the new trace column, so after a scan or refresh re-enqueued a previously-failed item artwork explain showed "Attempts: 0" next to the prior lifecycle's "Last attempt failed" trace. Clear trace in Enqueue (a fresh lifecycle has no last attempt); EnqueuePreservingBackoff still keeps it. * fix(artwork): treat a processing-stage error as indeterminate in explain A read/hash/decode/store failure records an OutcomeError step and writes an absent row, but explainResult only mapped external errors and unreadable candidates to indeterminate, so the default verdict read "not resolved" — presenting a processing failure as a definitive miss. The worker retries these exactly as it retries an unreadable candidate, so classify any OutcomeError as indeterminate too. * fix(artwork): record a trace step when a chainless resolver faults Playlist and radio resolvers walk no priority chain, so a fault (unreadable upload/sidecar, or an m3u fetch error with no grid) returned localError/extError without recording any trace step. The attempt then encoded [], leaving artwork explain with an empty "Last attempt failed" and "Gave up after". Record a fallback step in the faulted-no-image branch when nothing else did, and carry the source label through resolveLocalFile so the step can name it. * fix(artwork): trace the m3u failure at its source, not via the empty guard A playlist's grid sampling records album-chain steps into the shared trace, so the processor's empty-trace fallback no longer fires when the m3u remote image fetch failed — the error that forced the retry was omitted from explain. Record it where it happens, in resolvePlaylist's external step, as external:m3u. * test(artwork): skip the chainless-fault spec on Windows The spec provokes an open fault with a non-directory parent, but Windows maps that to a not-exist error, so localError is never set and the item resolves absent instead of failed. The sibling failed-on-unreadable-upload spec skips Windows for the same class of reason. * fix(artwork): don't label an absent empty-chain row as pre-tracing explain reported "resolved before traces were recorded" for any stored row with an empty chain, but an empty CoverArtPriority records a real, empty [] chain and resolves absent. A recorded resolution that finds an image always records its winning candidate, so only a row with a hash and no chain predates tracing; split on the hash and report an absent empty chain plainly instead. * fix(db): retimestamp the artwork trace migration after rebase master merged a 2026-08-18 migration, so the original 2026-08-16 timestamp is now older than the newest on the base branch and Goose would silently skip it on an already-upgraded database. Bumped past it; the SQL is unchanged. * fix(artwork): keep the m3u error detail in the trace The m3u trace step recorded OutcomeError with no detail because resolveExternalStep collapsed the gate's error to a bool, so explain showed only "external:m3u error -" and could not tell a timeout from an HTTP error or an open breaker. Return the error (normalizing not-found to nil so it stays a definitive miss, not a failure) and store its message as the step detail; encodeSteps already bounds it. * docs(artwork): note the give-up write relies on serial draining recordGiveUp writes last_failure unconditionally; that is only correct because the drain resolves each item serially, so no concurrent success can store artwork between the write and the queue delete. Record the invariant at the call site.
353 lines
12 KiB
Go
353 lines
12 KiB
Go
package artwork
|
|
|
|
import (
|
|
"bytes"
|
|
"cmp"
|
|
"context"
|
|
"encoding/base64"
|
|
"errors"
|
|
"fmt"
|
|
"image"
|
|
"image/draw"
|
|
_ "image/gif" // the only artwork format with no other importer in this package
|
|
"io"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/navidrome/navidrome/conf"
|
|
"github.com/navidrome/navidrome/consts"
|
|
"github.com/navidrome/navidrome/core/artwork/blurhash"
|
|
"github.com/navidrome/navidrome/core/artwork/dominant"
|
|
"github.com/navidrome/navidrome/core/artwork/thumbhash"
|
|
"github.com/navidrome/navidrome/log"
|
|
"github.com/navidrome/navidrome/model"
|
|
xdraw "golang.org/x/image/draw"
|
|
)
|
|
|
|
// outcome tells the worker whether to delete the queue row (found/absent) or reschedule it.
|
|
type outcome int
|
|
|
|
const (
|
|
outcomeFound outcome = iota
|
|
// outcomeFoundStale: state was written and is served, but a higher-priority external
|
|
// source failed, so the row must retry to give it another chance.
|
|
outcomeFoundStale
|
|
outcomeAbsent
|
|
outcomeFailed
|
|
)
|
|
|
|
func (o outcome) String() string {
|
|
switch o {
|
|
case outcomeFound:
|
|
return "found"
|
|
case outcomeFoundStale:
|
|
return "foundStale"
|
|
case outcomeAbsent:
|
|
return "absent"
|
|
default:
|
|
return "failed"
|
|
}
|
|
}
|
|
|
|
// thumbnailSize is the max dimension fed to both hash encoders; thumbhash rejects anything larger.
|
|
const thumbnailSize = 100
|
|
|
|
// maxImageBytes caps a resolved image read: a user-editable ExternalImageURL could point at
|
|
// an arbitrarily large endpoint.
|
|
func maxImageBytes() int64 {
|
|
return parseSize(conf.Server.MaxImageSize, consts.DefaultMaxImageSize)
|
|
}
|
|
|
|
// maxImagePixels guards against decompression bombs: a tiny file can declare a canvas that
|
|
// image.Decode would expand into gigabytes.
|
|
const maxImagePixels = 64 << 20
|
|
|
|
// acquired is what a successful acquire persisted, handed back so the caller can warm the resize
|
|
// cache without re-reading the rows and the file it just wrote.
|
|
type acquired struct {
|
|
ia *model.ItemArtwork
|
|
mime string
|
|
data []byte
|
|
}
|
|
|
|
// processor turns one queue item into stored artwork; settling the queue row is the Worker's job.
|
|
type processor struct {
|
|
ds model.DataStore
|
|
store *ImageStore
|
|
resolver *resolver
|
|
pruneLock sync.Locker
|
|
}
|
|
|
|
// acquire resolves one queue item end to end: find an image, hash/decode/
|
|
// blurhash it, place its bytes, and persist the resulting state.
|
|
func (p *processor) acquire(ctx context.Context, item model.ArtworkQueueItem) (out outcome, got *acquired) {
|
|
repo := p.ds.Artwork(ctx)
|
|
start := time.Now()
|
|
defer func() {
|
|
log.Debug(ctx, "Artwork: Acquisition finished", "kind", item.ItemKind, "id", item.ItemID,
|
|
"outcome", out, "elapsed", time.Since(start))
|
|
}()
|
|
|
|
res, err := p.resolver.resolve(ctx, item)
|
|
if err != nil {
|
|
traceStage(ctx, "resolve", err)
|
|
log.Warn(ctx, "Artwork: Could not resolve item", "kind", item.ItemKind, "id", item.ItemID, err)
|
|
return outcomeFailed, nil
|
|
}
|
|
if res.reader == nil {
|
|
if res.extError || res.localError {
|
|
// A fault is not a definitive "no image": never settle absent, keep serving old state.
|
|
// A chainless resolver (playlist/radio) records no step, so leave a fallback or explain is blank.
|
|
if t := traceFrom(ctx); len(t.Steps()) == 0 {
|
|
outcome := OutcomeError
|
|
if res.localError {
|
|
outcome = OutcomeUnreadable
|
|
}
|
|
t.add(TraceStep{Candidate: cmp.Or(res.source, "source"), Outcome: outcome})
|
|
}
|
|
log.Debug(ctx, "Artwork: No image, but a source faulted; keeping previous state",
|
|
"kind", item.ItemKind, "id", item.ItemID, "extError", res.extError, "localError", res.localError)
|
|
return outcomeFailed, nil
|
|
}
|
|
return writeAbsent(ctx, repo, item), nil
|
|
}
|
|
defer res.reader.Close()
|
|
|
|
readStart := time.Now()
|
|
data, err := readCapped(res.reader)
|
|
if err != nil {
|
|
traceStage(ctx, "read", err)
|
|
log.Warn(ctx, "Artwork: Failed to read resolved image", "kind", item.ItemKind, "id", item.ItemID, "source", res.source, err)
|
|
return outcomeFailed, nil
|
|
}
|
|
log.Debug(ctx, "Artwork: Read resolved image", "kind", item.ItemKind, "id", item.ItemID,
|
|
"source", res.source, "bytes", len(data), "elapsed", time.Since(readStart))
|
|
|
|
hashStart := time.Now()
|
|
hash, err := hashImage(bytes.NewReader(data))
|
|
if err != nil {
|
|
traceStage(ctx, "hash", err)
|
|
log.Warn(ctx, "Artwork: Failed to hash image", "kind", item.ItemKind, "id", item.ItemID, err)
|
|
return outcomeFailed, nil
|
|
}
|
|
log.Trace(ctx, "Artwork: Hashed image", "kind", item.ItemKind, "id", item.ItemID,
|
|
"hash", hash, "bytes", len(data), "elapsed", time.Since(hashStart))
|
|
|
|
art, err := repo.GetImage(hash)
|
|
switch {
|
|
case err == nil && art.Width > 0:
|
|
log.Debug(ctx, "Artwork: Reusing a known image, skipping decode", "kind", item.ItemKind,
|
|
"id", item.ItemID, "hash", hash)
|
|
// A row with no dimensions was stored when no decoder matched; retry in case one exists now.
|
|
case err == nil, errors.Is(err, model.ErrNotFound):
|
|
decodeStart := time.Now()
|
|
art, err = decodeArtwork(ctx, hash, data)
|
|
// Extension-matched local bytes we cannot decode are most likely a codec we lack; an
|
|
// external body carries no such guarantee, and empty bytes are no image at all.
|
|
if errors.Is(err, image.ErrFormat) && len(data) > 0 && isLocalSource(res.source) {
|
|
log.Debug(ctx, "Artwork: No decoder for this image format, storing it without placeholders",
|
|
"kind", item.ItemKind, "id", item.ItemID, "source", res.source, "bytes", len(data))
|
|
art, err = undecodedArtwork(hash), nil
|
|
}
|
|
if err != nil {
|
|
traceStage(ctx, "decode", err)
|
|
log.Warn(ctx, "Artwork: Failed to decode resolved image", "kind", item.ItemKind, "id", item.ItemID, err)
|
|
return outcomeFailed, nil
|
|
}
|
|
log.Debug(ctx, "Artwork: Decoded new image", "kind", item.ItemKind, "id", item.ItemID, "hash", hash,
|
|
"width", art.Width, "height", art.Height, "mime", art.Mime, "elapsed", time.Since(decodeStart))
|
|
default:
|
|
traceStage(ctx, "lookup", err)
|
|
log.Warn(ctx, "Artwork: Failed to look up image hash", "kind", item.ItemKind, "id", item.ItemID, err)
|
|
return outcomeFailed, nil
|
|
}
|
|
art.SizeBytes = int64(len(data))
|
|
|
|
ia, err := p.persist(ctx, repo, item, art, res, data)
|
|
if err != nil {
|
|
traceStage(ctx, "store", err)
|
|
log.Warn(ctx, "Artwork: Failed to persist resolved image", "kind", item.ItemKind, "id", item.ItemID, err)
|
|
return outcomeFailed, nil
|
|
}
|
|
got = &acquired{ia: ia, mime: art.Mime, data: data}
|
|
if res.extError {
|
|
log.Debug(ctx, "Artwork: Serving a lower-priority source after an external failure",
|
|
"kind", item.ItemKind, "id", item.ItemID, "source", res.source)
|
|
return outcomeFoundStale, got
|
|
}
|
|
return outcomeFound, got
|
|
}
|
|
|
|
// persist places the bytes and commits the rows referencing them, excluding Prune for that
|
|
// window only so a slow resolution can never hold it off.
|
|
func (p *processor) persist(ctx context.Context, repo model.ArtworkRepository, item model.ArtworkQueueItem,
|
|
art *model.Artwork, res resolution, data []byte,
|
|
) (*model.ItemArtwork, error) {
|
|
if p.pruneLock != nil {
|
|
p.pruneLock.Lock()
|
|
defer p.pruneLock.Unlock()
|
|
}
|
|
sourcePath, refMtime, err := placeBytes(p.store, art, res, data)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("writing image store: %w", err)
|
|
}
|
|
if err := repo.PutImage(art); err != nil {
|
|
return nil, fmt.Errorf("persisting artwork image: %w", err)
|
|
}
|
|
ia := &model.ItemArtwork{
|
|
ItemKind: item.ItemKind,
|
|
ItemID: item.ItemID,
|
|
ImageType: item.ImageType,
|
|
Hash: art.Hash,
|
|
Source: res.source,
|
|
SourcePath: sourcePath,
|
|
RefMtime: refMtime,
|
|
AttemptedAt: time.Now(),
|
|
Trace: traceFrom(ctx).encode(sourcePath),
|
|
}
|
|
// PutItemArtwork stamps UpdatedAt on ia, so the returned struct matches the persisted row.
|
|
if err := repo.PutItemArtwork(ia); err != nil {
|
|
return nil, fmt.Errorf("persisting item artwork state: %w", err)
|
|
}
|
|
return ia, nil
|
|
}
|
|
|
|
// writeAbsent records a known-absent state: every source answered definitively "no".
|
|
func writeAbsent(ctx context.Context, repo model.ArtworkRepository, item model.ArtworkQueueItem) outcome {
|
|
err := repo.PutItemArtwork(&model.ItemArtwork{
|
|
ItemKind: item.ItemKind,
|
|
ItemID: item.ItemID,
|
|
ImageType: item.ImageType,
|
|
AttemptedAt: time.Now(),
|
|
Trace: traceFrom(ctx).encode(""),
|
|
})
|
|
if err != nil {
|
|
log.Warn(ctx, "Artwork: Failed to persist absent state", "kind", item.ItemKind, "id", item.ItemID, err)
|
|
return outcomeFailed
|
|
}
|
|
log.Debug(ctx, "Artwork: Settled absent, every source answered definitively",
|
|
"kind", item.ItemKind, "id", item.ItemID)
|
|
return outcomeAbsent
|
|
}
|
|
|
|
func readCapped(r io.Reader) ([]byte, error) {
|
|
limit := maxImageBytes()
|
|
data, err := io.ReadAll(io.LimitReader(r, limit+1))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if int64(len(data)) > limit {
|
|
return nil, fmt.Errorf("image exceeds size cap %d", limit)
|
|
}
|
|
return data, nil
|
|
}
|
|
|
|
// decodeCapped rejects declared dimensions over maxImagePixels before the full-decode allocation.
|
|
func decodeCapped(data []byte) (image.Image, string, error) {
|
|
cfg, format, err := image.DecodeConfig(bytes.NewReader(data))
|
|
if err != nil {
|
|
return nil, "", fmt.Errorf("decode image config: %w", err)
|
|
}
|
|
// Compared by division so the cap cannot be defeated by an int64 overflow.
|
|
if cfg.Width <= 0 || cfg.Height <= 0 || cfg.Width > maxImagePixels/cfg.Height {
|
|
return nil, "", fmt.Errorf("image dimensions %dx%d exceed pixel cap %d", cfg.Width, cfg.Height, maxImagePixels)
|
|
}
|
|
img, _, err := image.Decode(bytes.NewReader(data))
|
|
if err != nil {
|
|
return nil, "", fmt.Errorf("decode image: %w", err)
|
|
}
|
|
return img, format, nil
|
|
}
|
|
|
|
// undecodedArtwork is the row for bytes no decoder matched: servable, but with no dimensions
|
|
// and none of the placeholders a decode would have produced.
|
|
func undecodedArtwork(hash string) *model.Artwork {
|
|
return &model.Artwork{Hash: hash, Mime: mimeForFormat("")}
|
|
}
|
|
|
|
// decodeArtwork builds a new Artwork row from raw bytes: dimensions, mime and the two
|
|
// placeholder hashes, both encoded from one shared downscaled thumbnail.
|
|
func decodeArtwork(ctx context.Context, hash string, data []byte) (*model.Artwork, error) {
|
|
img, format, err := decodeCapped(data)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
thumb := makeThumbnail(img, thumbnailSize)
|
|
bh, err := blurhash.Encode(thumb)
|
|
if err != nil {
|
|
log.Warn(ctx, "Artwork: Blurhash encoding failed", "hash", hash, err)
|
|
bh = ""
|
|
}
|
|
|
|
var th string
|
|
if raw, err := thumbhash.Encode(thumb); err != nil {
|
|
log.Warn(ctx, "Artwork: Thumbhash encoding failed", "hash", hash, err)
|
|
} else {
|
|
th = base64.StdEncoding.EncodeToString(raw)
|
|
}
|
|
|
|
return &model.Artwork{
|
|
Hash: hash,
|
|
Mime: mimeForFormat(format),
|
|
Width: img.Bounds().Dx(),
|
|
Height: img.Bounds().Dy(),
|
|
BlurHash: bh,
|
|
ThumbHash: th,
|
|
DominantColor: dominant.Color(thumb),
|
|
}, nil
|
|
}
|
|
|
|
// makeThumbnail downscales img to fit within maxSize on its longest side; it never upscales.
|
|
func makeThumbnail(img image.Image, maxSize int) image.Image {
|
|
b := img.Bounds()
|
|
w, h := b.Dx(), b.Dy()
|
|
if w <= maxSize && h <= maxSize {
|
|
return toFastScaleType(img)
|
|
}
|
|
scale := float64(maxSize) / float64(max(w, h))
|
|
// NRGBA, not RGBA: thumbhash requires straight alpha, and blurhash reads this type without
|
|
// converting, so neither encoder allocates a second copy of the thumbnail.
|
|
dst := image.NewNRGBA(image.Rect(0, 0, max(1, int(float64(w)*scale)), max(1, int(float64(h)*scale))))
|
|
xdraw.CatmullRom.Scale(dst, dst.Bounds(), toFastScaleType(img), b, draw.Src, nil)
|
|
return dst
|
|
}
|
|
|
|
// isFileBacked reports whether the bytes already live in a library/upload file, so the
|
|
// content-addressed store must not duplicate them.
|
|
func isFileBacked(source string) bool {
|
|
return source == "folder" || source == "upload"
|
|
}
|
|
|
|
// isLocalSource reports whether the bytes came off disk rather than off the network.
|
|
func isLocalSource(source string) bool {
|
|
return isFileBacked(source) || source == "embedded"
|
|
}
|
|
|
|
// placeBytes reports the item's backing-file provenance and writes the bytes into the store
|
|
// for the sources that have none.
|
|
func placeBytes(store *ImageStore, art *model.Artwork, res resolution, data []byte) (sourcePath string, refMtime int64, err error) {
|
|
if isFileBacked(res.source) {
|
|
return res.sourcePath, res.refMtime, nil
|
|
}
|
|
if res.source == "embedded" {
|
|
sourcePath, refMtime = res.sourcePath, res.refMtime
|
|
}
|
|
return sourcePath, refMtime, store.Write(art.Hash, art.Mime, bytes.NewReader(data))
|
|
}
|
|
|
|
// mimeForFormat maps an image.Decode format name to its MIME type; extForMime is the inverse.
|
|
func mimeForFormat(format string) string {
|
|
switch format {
|
|
case "jpeg":
|
|
return "image/jpeg"
|
|
case "png":
|
|
return "image/png"
|
|
case "gif":
|
|
return "image/gif"
|
|
case "webp":
|
|
return "image/webp"
|
|
}
|
|
return "application/octet-stream"
|
|
}
|