chore(deps): bump github.com/bmatcuk/doublestar/v4 from 4.9.2 to 4.10.0

Bumps [github.com/bmatcuk/doublestar/v4](https://github.com/bmatcuk/doublestar) from 4.9.2 to 4.10.0.
- [Release notes](https://github.com/bmatcuk/doublestar/releases)
- [Commits](https://github.com/bmatcuk/doublestar/compare/v4.9.2...v4.10.0)

---
updated-dependencies:
- dependency-name: github.com/bmatcuk/doublestar/v4
  dependency-version: 4.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/pipeline.yml

@@ -14,7 +14,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CROSS_TAGLIB_VERSION: "2.1.1-2"
+  CROSS_TAGLIB_VERSION: "2.1.1-1"
   CGO_CFLAGS_ALLOW: "--define-prefix"
   IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') && 'true' || 'false' }}
 
@@ -193,7 +193,7 @@ jobs:
     needs: [js, go, go-lint, i18n-lint, git-version, check-push-enabled]
     strategy:
       matrix:
-        platform: [ linux/amd64, linux/arm64, linux/arm/v5, linux/arm/v6, linux/arm/v7, linux/386, linux/riscv64, darwin/amd64, darwin/arm64, windows/amd64, windows/386 ]
+        platform: [ linux/amd64, linux/arm64, linux/arm/v5, linux/arm/v6, linux/arm/v7, linux/386, darwin/amd64, darwin/arm64, windows/amd64, windows/386 ]
     runs-on: ubuntu-latest
     env:
       IS_LINUX: ${{ startsWith(matrix.platform, 'linux/') && 'true' || 'false' }}

Dockerfile

@@ -28,7 +28,7 @@ COPY --from=xx-build /out/ /usr/bin/
 ### Get TagLib
 FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/alpine:3.20 AS taglib-build
 ARG TARGETPLATFORM
-ARG CROSS_TAGLIB_VERSION=2.1.1-2
+ARG CROSS_TAGLIB_VERSION=2.1.1-1
 ENV CROSS_TAGLIB_RELEASES_URL=https://github.com/navidrome/cross-taglib/releases/download/v${CROSS_TAGLIB_VERSION}/
 
 # wget in busybox can't follow redirects
@@ -63,7 +63,7 @@ COPY --from=ui /build /build
 
 ########################################################################################################################
 ### Build Navidrome binary
-FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.25-trixie AS base
+FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.25-bookworm AS base
 RUN apt-get update && apt-get install -y clang lld
 COPY --from=xx / /
 WORKDIR /workspace

Makefile

@@ -13,13 +13,13 @@ GIT_SHA=source_archive
 GIT_TAG=$(patsubst navidrome-%,v%,$(notdir $(PWD)))-SNAPSHOT
 endif
 
-SUPPORTED_PLATFORMS ?= linux/amd64,linux/arm64,linux/arm/v5,linux/arm/v6,linux/arm/v7,linux/386,linux/riscv64,darwin/amd64,darwin/arm64,windows/amd64,windows/386
+SUPPORTED_PLATFORMS ?= linux/amd64,linux/arm64,linux/arm/v5,linux/arm/v6,linux/arm/v7,linux/386,darwin/amd64,darwin/arm64,windows/amd64,windows/386
 IMAGE_PLATFORMS ?= $(shell echo $(SUPPORTED_PLATFORMS) | tr ',' '\n' | grep "linux" | grep -v "arm/v5" | tr '\n' ',' | sed 's/,$$//')
 PLATFORMS ?= $(SUPPORTED_PLATFORMS)
 DOCKER_TAG ?= deluan/navidrome:develop
 
 # Taglib version to use in cross-compilation, from https://github.com/navidrome/cross-taglib
-CROSS_TAGLIB_VERSION ?= 2.1.1-2
+CROSS_TAGLIB_VERSION ?= 2.1.1-1
 GOLANGCI_LINT_VERSION ?= v2.8.0
 
 UI_SRC_FILES := $(shell find ui -type f -not -path "ui/build/*" -not -path "ui/node_modules/*")

adapters/deezer/client.go

@@ -29,12 +29,14 @@ type httpDoer interface {
 
 type client struct {
 	httpDoer httpDoer
+	language string
 	jwt      jwtToken
 }
 
-func newClient(hc httpDoer) *client {
+func newClient(hc httpDoer, language string) *client {
 	return &client{
 		httpDoer: hc,
+		language: language,
 	}
 }
 
@@ -127,7 +129,7 @@ const pipeAPIURL = "https://pipe.deezer.com/api"
 
 var strictPolicy = bluemonday.StrictPolicy()
 
-func (c *client) getArtistBio(ctx context.Context, artistID int, lang string) (string, error) {
+func (c *client) getArtistBio(ctx context.Context, artistID int) (string, error) {
 	jwt, err := c.getJWT(ctx)
 	if err != nil {
 		return "", fmt.Errorf("deezer: failed to get JWT: %w", err)
@@ -158,10 +160,10 @@ func (c *client) getArtistBio(ctx context.Context, artistID int, lang string) (s
 	}
 
 	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Accept-Language", lang)
+	req.Header.Set("Accept-Language", c.language)
 	req.Header.Set("Authorization", "Bearer "+jwt)
 
-	log.Trace(ctx, "Fetching Deezer artist biography via GraphQL", "artistId", artistID, "language", lang)
+	log.Trace(ctx, "Fetching Deezer artist biography via GraphQL", "artistId", artistID, "language", c.language)
 	resp, err := c.httpDoer.Do(req)
 	if err != nil {
 		return "", err

adapters/deezer/client_auth_test.go

@@ -21,7 +21,7 @@ var _ = Describe("JWT Authentication", func() {
 
 	BeforeEach(func() {
 		httpClient = &fakeHttpClient{}
-		client = newClient(httpClient)
+		client = newClient(httpClient, "en")
 		ctx = context.Background()
 	})
 

adapters/deezer/client_test.go

@@ -18,7 +18,7 @@ var _ = Describe("client", func() {
 
 	BeforeEach(func() {
 		httpClient = &fakeHttpClient{}
-		client = newClient(httpClient)
+		client = newClient(httpClient, "en")
 	})
 
 	Describe("ArtistImages", func() {
@@ -78,33 +78,40 @@ var _ = Describe("client", func() {
 		})
 
 		It("returns artist bio from a successful request", func() {
-			f, err := os.Open("tests/fixtures/deezer.artist.bio.en.json")
+			f, err := os.Open("tests/fixtures/deezer.artist.bio.json")
 			Expect(err).To(BeNil())
 			httpClient.mock("https://pipe.deezer.com/api", http.Response{Body: f, StatusCode: 200})
 
-			bio, err := client.getArtistBio(GinkgoT().Context(), 27, "en")
+			bio, err := client.getArtistBio(GinkgoT().Context(), 27)
 			Expect(err).To(BeNil())
 			Expect(bio).To(ContainSubstring("Schoolmates Thomas and Guy-Manuel"))
 			Expect(bio).ToNot(ContainSubstring("<p>"))
 			Expect(bio).ToNot(ContainSubstring("</p>"))
 		})
 
-		It("uses the provided language", func() {
-			f, err := os.Open("tests/fixtures/deezer.artist.bio.fr.json")
+		It("uses the configured language", func() {
+			client = newClient(httpClient, "fr")
+			// Mock JWT token for the new client instance with a valid JWT
+			testJWT := createTestJWT(5 * time.Minute)
+			httpClient.mock("https://auth.deezer.com/login/anonymous", http.Response{
+				StatusCode: 200,
+				Body:       io.NopCloser(bytes.NewBufferString(fmt.Sprintf(`{"jwt":"%s","refresh_token":""}`, testJWT))),
+			})
+			f, err := os.Open("tests/fixtures/deezer.artist.bio.json")
 			Expect(err).To(BeNil())
 			httpClient.mock("https://pipe.deezer.com/api", http.Response{Body: f, StatusCode: 200})
 
-			_, err = client.getArtistBio(GinkgoT().Context(), 27, "fr")
+			_, err = client.getArtistBio(GinkgoT().Context(), 27)
 			Expect(err).To(BeNil())
 			Expect(httpClient.lastRequest.Header.Get("Accept-Language")).To(Equal("fr"))
 		})
 
 		It("includes the JWT token in the request", func() {
-			f, err := os.Open("tests/fixtures/deezer.artist.bio.en.json")
+			f, err := os.Open("tests/fixtures/deezer.artist.bio.json")
 			Expect(err).To(BeNil())
 			httpClient.mock("https://pipe.deezer.com/api", http.Response{Body: f, StatusCode: 200})
 
-			_, err = client.getArtistBio(GinkgoT().Context(), 27, "en")
+			_, err = client.getArtistBio(GinkgoT().Context(), 27)
 			Expect(err).To(BeNil())
 			// Verify that the Authorization header has the Bearer token format
 			authHeader := httpClient.lastRequest.Header.Get("Authorization")
@@ -135,7 +142,7 @@ var _ = Describe("client", func() {
 				Body:       io.NopCloser(bytes.NewBufferString(errorResponse)),
 			})
 
-			_, err := client.getArtistBio(GinkgoT().Context(), 999, "en")
+			_, err := client.getArtistBio(GinkgoT().Context(), 999)
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(ContainSubstring("GraphQL error"))
 			Expect(err.Error()).To(ContainSubstring("Artist not found"))
@@ -157,7 +164,7 @@ var _ = Describe("client", func() {
 				Body:       io.NopCloser(bytes.NewBufferString(emptyBioResponse)),
 			})
 
-			_, err := client.getArtistBio(GinkgoT().Context(), 27, "en")
+			_, err := client.getArtistBio(GinkgoT().Context(), 27)
 			Expect(err).To(MatchError("deezer: biography not found"))
 		})
 
@@ -167,7 +174,7 @@ var _ = Describe("client", func() {
 				Body:       io.NopCloser(bytes.NewBufferString(`{"error":"Internal server error"}`)),
 			})
 
-			_, err := client.getArtistBio(GinkgoT().Context(), 27, "en")
+			_, err := client.getArtistBio(GinkgoT().Context(), 27)
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(ContainSubstring("failed to get JWT"))
 		})
@@ -180,7 +187,7 @@ var _ = Describe("client", func() {
 				Body:       io.NopCloser(bytes.NewBufferString(fmt.Sprintf(`{"jwt":"%s","refresh_token":""}`, expiredJWT))),
 			})
 
-			_, err := client.getArtistBio(GinkgoT().Context(), 27, "en")
+			_, err := client.getArtistBio(GinkgoT().Context(), 27)
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(ContainSubstring("JWT token already expired or expires too soon"))
 		})

adapters/deezer/deezer.go

@@ -26,19 +26,15 @@ const deezerArtistSearchLimit = 50
 type deezerAgent struct {
 	dataStore model.DataStore
 	client    *client
-	languages []string
 }
 
 func deezerConstructor(dataStore model.DataStore) agents.Interface {
-	agent := &deezerAgent{
-		dataStore: dataStore,
-		languages: conf.Server.Deezer.Languages,
-	}
+	agent := &deezerAgent{dataStore: dataStore}
 	httpClient := &http.Client{
 		Timeout: consts.DefaultHttpClientTimeOut,
 	}
 	cachedHttpClient := cache.NewHTTPClient(httpClient, consts.DefaultHttpClientTimeOut)
-	agent.client = newClient(cachedHttpClient)
+	agent.client = newClient(cachedHttpClient, conf.Server.Deezer.Language)
 	return agent
 }
 
@@ -139,9 +135,8 @@ func (s *deezerAgent) GetArtistTopSongs(ctx context.Context, _, artistName, _ st
 
 	res := slice.Map(tracks, func(r Track) agents.Song {
 		return agents.Song{
-			Name:     r.Title,
-			Album:    r.Album.Title,
-			Duration: uint32(r.Duration * 1000), // Convert seconds to milliseconds
+			Name:  r.Title,
+			Album: r.Album.Title,
 		}
 	})
 	return res, nil
@@ -153,14 +148,7 @@ func (s *deezerAgent) GetArtistBiography(ctx context.Context, _, name, _ string)
 		return "", err
 	}
 
-	for _, lang := range s.languages {
-		bio, err := s.client.getArtistBio(ctx, artist.ID, lang)
-		if err == nil && bio != "" {
-			return bio, nil
-		}
-		log.Debug(ctx, "Deezer/artist.bio returned empty/error, trying next language", "artist", name, "lang", lang, err)
-	}
-	return "", agents.ErrNotFound
+	return s.client.getArtistBio(ctx, artist.ID)
 }
 
 func init() {

adapters/deezer/deezer_test.go

@@ -1,171 +0,0 @@
-package deezer
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"time"
-
-	"github.com/navidrome/navidrome/conf"
-	"github.com/navidrome/navidrome/conf/configtest"
-	"github.com/navidrome/navidrome/core/agents"
-	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("deezerAgent", func() {
-	var ctx context.Context
-
-	BeforeEach(func() {
-		ctx = context.Background()
-		DeferCleanup(configtest.SetupConfig())
-		conf.Server.Deezer.Enabled = true
-	})
-
-	Describe("deezerConstructor", func() {
-		It("uses configured languages", func() {
-			conf.Server.Deezer.Languages = []string{"pt", "en"}
-			agent := deezerConstructor(&tests.MockDataStore{}).(*deezerAgent)
-			Expect(agent.languages).To(Equal([]string{"pt", "en"}))
-		})
-	})
-
-	Describe("GetArtistBiography - Language Fallback", func() {
-		var agent *deezerAgent
-		var httpClient *langAwareHttpClient
-
-		BeforeEach(func() {
-			httpClient = newLangAwareHttpClient()
-
-			// Mock search artist (returns Michael Jackson)
-			fSearch, _ := os.Open("tests/fixtures/deezer.search.artist.json")
-			httpClient.searchResponse = &http.Response{Body: fSearch, StatusCode: 200}
-
-			// Mock JWT token
-			testJWT := createTestJWT(5 * time.Minute)
-			httpClient.jwtResponse = &http.Response{
-				StatusCode: 200,
-				Body:       io.NopCloser(bytes.NewBufferString(fmt.Sprintf(`{"jwt":"%s","refresh_token":""}`, testJWT))),
-			}
-		})
-
-		setupAgent := func(languages []string) {
-			conf.Server.Deezer.Languages = languages
-			agent = &deezerAgent{
-				dataStore: &tests.MockDataStore{},
-				client:    newClient(httpClient),
-				languages: languages,
-			}
-		}
-
-		It("returns content in first language when available (1 bio API call)", func() {
-			setupAgent([]string{"fr", "en"})
-
-			// French biography available
-			fFr, _ := os.Open("tests/fixtures/deezer.artist.bio.fr.json")
-			httpClient.bioResponses["fr"] = &http.Response{Body: fFr, StatusCode: 200}
-
-			bio, err := agent.GetArtistBiography(ctx, "", "Michael Jackson", "")
-
-			Expect(err).ToNot(HaveOccurred())
-			Expect(bio).To(ContainSubstring("Guy-Manuel de Homem Christo et Thomas Bangalter"))
-			Expect(httpClient.bioRequestCount).To(Equal(1))
-			Expect(httpClient.bioRequests[0].Header.Get("Accept-Language")).To(Equal("fr"))
-		})
-
-		It("falls back to second language when first returns empty (2 bio API calls)", func() {
-			setupAgent([]string{"ja", "en"})
-
-			// Japanese returns empty biography
-			fJa, _ := os.Open("tests/fixtures/deezer.artist.bio.empty.json")
-			httpClient.bioResponses["ja"] = &http.Response{Body: fJa, StatusCode: 200}
-			// English returns full biography
-			fEn, _ := os.Open("tests/fixtures/deezer.artist.bio.en.json")
-			httpClient.bioResponses["en"] = &http.Response{Body: fEn, StatusCode: 200}
-
-			bio, err := agent.GetArtistBiography(ctx, "", "Michael Jackson", "")
-
-			Expect(err).ToNot(HaveOccurred())
-			Expect(bio).To(ContainSubstring("Schoolmates Thomas and Guy-Manuel"))
-			Expect(httpClient.bioRequestCount).To(Equal(2))
-			Expect(httpClient.bioRequests[0].Header.Get("Accept-Language")).To(Equal("ja"))
-			Expect(httpClient.bioRequests[1].Header.Get("Accept-Language")).To(Equal("en"))
-		})
-
-		It("returns ErrNotFound when all languages return empty", func() {
-			setupAgent([]string{"ja", "xx"})
-
-			// Both languages return empty biography
-			fJa, _ := os.Open("tests/fixtures/deezer.artist.bio.empty.json")
-			httpClient.bioResponses["ja"] = &http.Response{Body: fJa, StatusCode: 200}
-			fXx, _ := os.Open("tests/fixtures/deezer.artist.bio.empty.json")
-			httpClient.bioResponses["xx"] = &http.Response{Body: fXx, StatusCode: 200}
-
-			_, err := agent.GetArtistBiography(ctx, "", "Michael Jackson", "")
-
-			Expect(err).To(MatchError(agents.ErrNotFound))
-			Expect(httpClient.bioRequestCount).To(Equal(2))
-		})
-	})
-})
-
-// langAwareHttpClient is a mock HTTP client that returns different responses based on the Accept-Language header
-type langAwareHttpClient struct {
-	searchResponse  *http.Response
-	jwtResponse     *http.Response
-	bioResponses    map[string]*http.Response
-	bioRequests     []*http.Request
-	bioRequestCount int
-}
-
-func newLangAwareHttpClient() *langAwareHttpClient {
-	return &langAwareHttpClient{
-		bioResponses: make(map[string]*http.Response),
-		bioRequests:  make([]*http.Request, 0),
-	}
-}
-
-func (c *langAwareHttpClient) Do(req *http.Request) (*http.Response, error) {
-	// Handle search artist request
-	if req.URL.Host == "api.deezer.com" && req.URL.Path == "/search/artist" {
-		if c.searchResponse != nil {
-			return c.searchResponse, nil
-		}
-		return &http.Response{
-			StatusCode: 200,
-			Body:       io.NopCloser(bytes.NewBufferString(`{"data":[],"total":0}`)),
-		}, nil
-	}
-
-	// Handle JWT token request
-	if req.URL.Host == "auth.deezer.com" && req.URL.Path == "/login/anonymous" {
-		if c.jwtResponse != nil {
-			return c.jwtResponse, nil
-		}
-		return &http.Response{
-			StatusCode: 500,
-			Body:       io.NopCloser(bytes.NewBufferString(`{"error":"no mock"}`)),
-		}, nil
-	}
-
-	// Handle bio request (GraphQL API)
-	if req.URL.Host == "pipe.deezer.com" && req.URL.Path == "/api" {
-		c.bioRequestCount++
-		c.bioRequests = append(c.bioRequests, req)
-		lang := req.Header.Get("Accept-Language")
-		if resp, ok := c.bioResponses[lang]; ok {
-			return resp, nil
-		}
-		// Return empty bio by default
-		return &http.Response{
-			StatusCode: 200,
-			Body:       io.NopCloser(bytes.NewBufferString(`{"data":{"artist":{"bio":{"full":""}}}}`)),
-		}, nil
-	}
-
-	panic("URL not mocked: " + req.URL.String())
-}

adapters/gotaglib/gotaglib.go

@@ -6,22 +6,19 @@
 // efficient access to format-specific tags (ID3v2 frames, MP4 atoms, ASF attributes)
 // through a single file open operation.
 //
-// This extractor is registered under the name "taglib". It only works with a filesystem
+// This extractor is registered under the name "gotaglib". It only works with a filesystem
 // (fs.FS) and does not support direct local file paths. Files returned by the filesystem
 // must implement io.ReadSeeker for go-taglib to read them.
 package gotaglib
 
 import (
 	"errors"
-	"fmt"
 	"io"
 	"io/fs"
-	"runtime/debug"
 	"strings"
 	"time"
 
 	"github.com/navidrome/navidrome/core/storage/local"
-	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model/metadata"
 	"go.senan.xyz/taglib"
 )
@@ -64,7 +61,6 @@ func (e extractor) extractMetadata(filePath string) (*metadata.Info, error) {
 		Channels:   int(props.Channels),
 		SampleRate: int(props.SampleRate),
 		BitDepth:   int(props.BitsPerSample),
-		Codec:      props.Codec,
 	}
 
 	// Convert normalized tags to lowercase keys (go-taglib returns UPPERCASE keys)
@@ -98,17 +94,7 @@ func (e extractor) extractMetadata(filePath string) (*metadata.Info, error) {
 
 // openFile opens the file at filePath using the extractor's filesystem.
 // It returns a TagLib File handle and a cleanup function to close resources.
-func (e extractor) openFile(filePath string) (f *taglib.File, closeFunc func(), err error) {
-	// Recover from panics in the WASM runtime (e.g., wazero failing to mmap executable memory
-	// on hardened systems like NixOS with MemoryDenyWriteExecute=true)
-	debug.SetPanicOnFault(true)
-	defer func() {
-		if r := recover(); r != nil {
-			log.Error("WASM runtime panic: This may be caused by a hardened system that blocks executable memory mapping.", "file", filePath, "panic", r)
-			err = fmt.Errorf("WASM runtime panic (hardened system?): %v", r)
-		}
-	}()
-
+func (e extractor) openFile(filePath string) (*taglib.File, func(), error) {
 	// Open the file from the filesystem
 	file, err := e.fs.Open(filePath)
 	if err != nil {
@@ -119,12 +105,12 @@ func (e extractor) openFile(filePath string) (f *taglib.File, closeFunc func(),
 		file.Close()
 		return nil, nil, errors.New("file is not seekable")
 	}
-	f, err = taglib.OpenStream(rs, taglib.WithReadStyle(taglib.ReadStyleFast))
+	f, err := taglib.OpenStream(rs, taglib.WithReadStyle(taglib.ReadStyleFast))
 	if err != nil {
 		file.Close()
 		return nil, nil, err
 	}
-	closeFunc = func() {
+	closeFunc := func() {
 		f.Close()
 		file.Close()
 	}

adapters/lastfm/agent.go

@@ -26,8 +26,8 @@ const (
 	sessionKeyProperty = "LastFMSessionKey"
 )
 
-var ignoredContent = []string{
-	// Empty Artist/Album
+var ignoredBiographies = []string{
+	// Unknown Artist
 	`<a href="https://www.last.fm/music/`,
 }
 
@@ -36,7 +36,7 @@ type lastfmAgent struct {
 	sessionKeys  *agents.SessionKeys
 	apiKey       string
 	secret       string
-	languages    []string
+	lang         string
 	client       *client
 	httpClient   httpDoer
 	getInfoMutex sync.Mutex
@@ -48,7 +48,7 @@ func lastFMConstructor(ds model.DataStore) *lastfmAgent {
 	}
 	l := &lastfmAgent{
 		ds:          ds,
-		languages:   conf.Server.LastFM.Languages,
+		lang:        conf.Server.LastFM.Language,
 		apiKey:      conf.Server.LastFM.ApiKey,
 		secret:      conf.Server.LastFM.Secret,
 		sessionKeys: &agents.SessionKeys{DataStore: ds, KeyName: sessionKeyProperty},
@@ -58,7 +58,7 @@ func lastFMConstructor(ds model.DataStore) *lastfmAgent {
 	}
 	chc := cache.NewHTTPClient(hc, consts.DefaultHttpClientTimeOut)
 	l.httpClient = chc
-	l.client = newClient(l.apiKey, l.secret, chc)
+	l.client = newClient(l.apiKey, l.secret, l.lang, chc)
 	return l
 }
 
@@ -68,47 +68,22 @@ func (l *lastfmAgent) AgentName() string {
 
 var imageRegex = regexp.MustCompile(`u\/(\d+)`)
 
-// isValidContent checks if content is non-empty and not in the ignored list
-func isValidContent(content string) bool {
-	content = strings.TrimSpace(content)
-	if content == "" {
-		return false
-	}
-	for _, ign := range ignoredContent {
-		if strings.HasPrefix(content, ign) {
-			return false
-		}
-	}
-	return true
-}
-
 func (l *lastfmAgent) GetAlbumInfo(ctx context.Context, name, artist, mbid string) (*agents.AlbumInfo, error) {
-	var a *Album
-	var resp agents.AlbumInfo
-	for _, lang := range l.languages {
-		var err error
-		a, err = l.callAlbumGetInfo(ctx, name, artist, mbid, lang)
-		if err != nil {
-			return nil, err
-		}
-		resp.Name = a.Name
-		resp.MBID = a.MBID
-		resp.URL = a.URL
-		if isValidContent(a.Description.Summary) {
-			resp.Description = strings.TrimSpace(a.Description.Summary)
-			return &resp, nil
-		}
-		log.Debug(ctx, "LastFM/album.getInfo returned empty/ignored description, trying next language", "album", name, "artist", artist, "lang", lang)
+	a, err := l.callAlbumGetInfo(ctx, name, artist, mbid)
+	if err != nil {
+		return nil, err
 	}
-	// This condition should not be hit (languages default to ["en"]), but just in case
-	if a == nil {
-		return nil, agents.ErrNotFound
-	}
-	return &resp, nil
+
+	return &agents.AlbumInfo{
+		Name:        a.Name,
+		MBID:        a.MBID,
+		Description: a.Description.Summary,
+		URL:         a.URL,
+	}, nil
 }
 
 func (l *lastfmAgent) GetAlbumImages(ctx context.Context, name, artist, mbid string) ([]agents.ExternalImage, error) {
-	a, err := l.callAlbumGetInfo(ctx, name, artist, mbid, l.languages[0])
+	a, err := l.callAlbumGetInfo(ctx, name, artist, mbid)
 	if err != nil {
 		return nil, err
 	}
@@ -143,7 +118,7 @@ func (l *lastfmAgent) GetAlbumImages(ctx context.Context, name, artist, mbid str
 }
 
 func (l *lastfmAgent) GetArtistMBID(ctx context.Context, id string, name string) (string, error) {
-	a, err := l.callArtistGetInfo(ctx, name, l.languages[0])
+	a, err := l.callArtistGetInfo(ctx, name)
 	if err != nil {
 		return "", err
 	}
@@ -154,7 +129,7 @@ func (l *lastfmAgent) GetArtistMBID(ctx context.Context, id string, name string)
 }
 
 func (l *lastfmAgent) GetArtistURL(ctx context.Context, id, name, mbid string) (string, error) {
-	a, err := l.callArtistGetInfo(ctx, name, l.languages[0])
+	a, err := l.callArtistGetInfo(ctx, name)
 	if err != nil {
 		return "", err
 	}
@@ -165,17 +140,20 @@ func (l *lastfmAgent) GetArtistURL(ctx context.Context, id, name, mbid string) (
 }
 
 func (l *lastfmAgent) GetArtistBiography(ctx context.Context, id, name, mbid string) (string, error) {
-	for _, lang := range l.languages {
-		a, err := l.callArtistGetInfo(ctx, name, lang)
-		if err != nil {
-			return "", err
-		}
-		if isValidContent(a.Bio.Summary) {
-			return strings.TrimSpace(a.Bio.Summary), nil
-		}
-		log.Debug(ctx, "LastFM/artist.getInfo returned empty/ignored biography, trying next language", "artist", name, "lang", lang)
+	a, err := l.callArtistGetInfo(ctx, name)
+	if err != nil {
+		return "", err
 	}
-	return "", agents.ErrNotFound
+	a.Bio.Summary = strings.TrimSpace(a.Bio.Summary)
+	if a.Bio.Summary == "" {
+		return "", agents.ErrNotFound
+	}
+	for _, ign := range ignoredBiographies {
+		if strings.HasPrefix(a.Bio.Summary, ign) {
+			return "", nil
+		}
+	}
+	return a.Bio.Summary, nil
 }
 
 func (l *lastfmAgent) GetSimilarArtists(ctx context.Context, id, name, mbid string, limit int) ([]agents.Artist, error) {
@@ -241,7 +219,7 @@ var (
 
 func (l *lastfmAgent) GetArtistImages(ctx context.Context, _, name, mbid string) ([]agents.ExternalImage, error) {
 	log.Debug(ctx, "Getting artist images from Last.fm", "name", name)
-	a, err := l.callArtistGetInfo(ctx, name, l.languages[0])
+	a, err := l.callArtistGetInfo(ctx, name)
 	if err != nil {
 		return nil, fmt.Errorf("get artist info: %w", err)
 	}
@@ -281,14 +259,14 @@ func (l *lastfmAgent) GetArtistImages(ctx context.Context, _, name, mbid string)
 	return res, nil
 }
 
-func (l *lastfmAgent) callAlbumGetInfo(ctx context.Context, name, artist, mbid string, lang string) (*Album, error) {
-	a, err := l.client.albumGetInfo(ctx, name, artist, mbid, lang)
+func (l *lastfmAgent) callAlbumGetInfo(ctx context.Context, name, artist, mbid string) (*Album, error) {
+	a, err := l.client.albumGetInfo(ctx, name, artist, mbid)
 	var lfErr *lastFMError
 	isLastFMError := errors.As(err, &lfErr)
 
 	if mbid != "" && (isLastFMError && lfErr.Code == 6) {
 		log.Debug(ctx, "LastFM/album.getInfo could not find album by mbid, trying again", "album", name, "mbid", mbid)
-		return l.callAlbumGetInfo(ctx, name, artist, "", lang)
+		return l.callAlbumGetInfo(ctx, name, artist, "")
 	}
 
 	if err != nil {
@@ -302,11 +280,11 @@ func (l *lastfmAgent) callAlbumGetInfo(ctx context.Context, name, artist, mbid s
 	return a, nil
 }
 
-func (l *lastfmAgent) callArtistGetInfo(ctx context.Context, name string, lang string) (*Artist, error) {
+func (l *lastfmAgent) callArtistGetInfo(ctx context.Context, name string) (*Artist, error) {
 	l.getInfoMutex.Lock()
 	defer l.getInfoMutex.Unlock()
 
-	a, err := l.client.artistGetInfo(ctx, name, lang)
+	a, err := l.client.artistGetInfo(ctx, name)
 	if err != nil {
 		log.Error(ctx, "Error calling LastFM/artist.getInfo", "artist", name, err)
 		return nil, err

adapters/lastfm/agent_test.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"io"
 	"net/http"
-	"net/url"
 	"os"
 	"strconv"
 	"time"
@@ -39,12 +38,12 @@ var _ = Describe("lastfmAgent", func() {
 	})
 	Describe("lastFMConstructor", func() {
 		When("Agent is properly configured", func() {
-			It("uses configured api key and languages", func() {
-				conf.Server.LastFM.Languages = []string{"pt", "en"}
+			It("uses configured api key and language", func() {
+				conf.Server.LastFM.Language = "pt"
 				agent := lastFMConstructor(ds)
 				Expect(agent.apiKey).To(Equal("123"))
 				Expect(agent.secret).To(Equal("secret"))
-				Expect(agent.languages).To(Equal([]string{"pt", "en"}))
+				Expect(agent.lang).To(Equal("pt"))
 			})
 		})
 		When("Agent is disabled", func() {
@@ -72,7 +71,7 @@ var _ = Describe("lastfmAgent", func() {
 		var httpClient *tests.FakeHttpClient
 		BeforeEach(func() {
 			httpClient = &tests.FakeHttpClient{}
-			client := newClient("API_KEY", "SECRET", httpClient)
+			client := newClient("API_KEY", "SECRET", "pt", httpClient)
 			agent = lastFMConstructor(ds)
 			agent.client = client
 		})
@@ -102,129 +101,12 @@ var _ = Describe("lastfmAgent", func() {
 		})
 	})
 
-	Describe("Language Fallback", func() {
-		Describe("GetArtistBiography", func() {
-			var agent *lastfmAgent
-			var httpClient *langAwareHttpClient
-
-			BeforeEach(func() {
-				httpClient = newLangAwareHttpClient()
-			})
-
-			It("returns content in first language when available (1 API call)", func() {
-				conf.Server.LastFM.Languages = []string{"pt", "en"}
-				agent = lastFMConstructor(ds)
-				agent.client = newClient("API_KEY", "SECRET", httpClient)
-
-				// Portuguese biography available
-				f, _ := os.Open("tests/fixtures/lastfm.artist.getinfo.json")
-				httpClient.responses["pt"] = http.Response{Body: f, StatusCode: 200}
-
-				bio, err := agent.GetArtistBiography(ctx, "123", "U2", "")
-
-				Expect(err).ToNot(HaveOccurred())
-				Expect(bio).To(ContainSubstring("U2 é uma das mais importantes bandas de rock"))
-				Expect(httpClient.requestCount).To(Equal(1))
-				Expect(httpClient.requests[0].URL.Query().Get("lang")).To(Equal("pt"))
-			})
-
-			It("falls back to second language when first returns empty (2 API calls)", func() {
-				conf.Server.LastFM.Languages = []string{"ja", "en"}
-				agent = lastFMConstructor(ds)
-				agent.client = newClient("API_KEY", "SECRET", httpClient)
-
-				// Japanese returns empty/ignored biography (actual Last.fm response with just "Read more" link)
-				fJa, _ := os.Open("tests/fixtures/lastfm.artist.getinfo.empty.json")
-				httpClient.responses["ja"] = http.Response{Body: fJa, StatusCode: 200}
-				// English returns full biography
-				fEn, _ := os.Open("tests/fixtures/lastfm.artist.getinfo.en.json")
-				httpClient.responses["en"] = http.Response{Body: fEn, StatusCode: 200}
-
-				bio, err := agent.GetArtistBiography(ctx, "123", "Legião Urbana", "")
-
-				Expect(err).ToNot(HaveOccurred())
-				Expect(bio).To(ContainSubstring("Legião Urbana was a Brazilian post-punk band"))
-				Expect(httpClient.requestCount).To(Equal(2))
-				Expect(httpClient.requests[0].URL.Query().Get("lang")).To(Equal("ja"))
-				Expect(httpClient.requests[1].URL.Query().Get("lang")).To(Equal("en"))
-			})
-
-			It("returns ErrNotFound when all languages return empty", func() {
-				conf.Server.LastFM.Languages = []string{"ja", "xx"}
-				agent = lastFMConstructor(ds)
-				agent.client = newClient("API_KEY", "SECRET", httpClient)
-
-				// Both languages return empty/ignored biography (using actual Last.fm response format)
-				fJa, _ := os.Open("tests/fixtures/lastfm.artist.getinfo.empty.json")
-				httpClient.responses["ja"] = http.Response{Body: fJa, StatusCode: 200}
-				// Second language also returns empty
-				fXx, _ := os.Open("tests/fixtures/lastfm.artist.getinfo.empty.json")
-				httpClient.responses["xx"] = http.Response{Body: fXx, StatusCode: 200}
-
-				_, err := agent.GetArtistBiography(ctx, "123", "Legião Urbana", "")
-
-				Expect(err).To(MatchError(agents.ErrNotFound))
-				Expect(httpClient.requestCount).To(Equal(2))
-			})
-		})
-
-		Describe("GetAlbumInfo", func() {
-			var agent *lastfmAgent
-			var httpClient *langAwareHttpClient
-
-			BeforeEach(func() {
-				httpClient = newLangAwareHttpClient()
-			})
-
-			It("falls back to second language when first returns empty description (2 API calls)", func() {
-				conf.Server.LastFM.Languages = []string{"ja", "en"}
-				agent = lastFMConstructor(ds)
-				agent.client = newClient("API_KEY", "SECRET", httpClient)
-
-				// Japanese returns album without wiki/description (actual Last.fm response)
-				fJa, _ := os.Open("tests/fixtures/lastfm.album.getinfo.empty.json")
-				httpClient.responses["ja"] = http.Response{Body: fJa, StatusCode: 200}
-				// English returns album with description
-				fEn, _ := os.Open("tests/fixtures/lastfm.album.getinfo.en.json")
-				httpClient.responses["en"] = http.Response{Body: fEn, StatusCode: 200}
-
-				albumInfo, err := agent.GetAlbumInfo(ctx, "Dois", "Legião Urbana", "")
-
-				Expect(err).ToNot(HaveOccurred())
-				Expect(albumInfo.Name).To(Equal("Dois"))
-				Expect(albumInfo.Description).To(ContainSubstring("segundo álbum de estúdio"))
-				Expect(httpClient.requestCount).To(Equal(2))
-				Expect(httpClient.requests[0].URL.Query().Get("lang")).To(Equal("ja"))
-				Expect(httpClient.requests[1].URL.Query().Get("lang")).To(Equal("en"))
-			})
-
-			It("returns album without description when all languages return empty", func() {
-				conf.Server.LastFM.Languages = []string{"ja", "xx"}
-				agent = lastFMConstructor(ds)
-				agent.client = newClient("API_KEY", "SECRET", httpClient)
-
-				// Both languages return album without description
-				fJa, _ := os.Open("tests/fixtures/lastfm.album.getinfo.empty.json")
-				httpClient.responses["ja"] = http.Response{Body: fJa, StatusCode: 200}
-				fXx, _ := os.Open("tests/fixtures/lastfm.album.getinfo.empty.json")
-				httpClient.responses["xx"] = http.Response{Body: fXx, StatusCode: 200}
-
-				albumInfo, err := agent.GetAlbumInfo(ctx, "Dois", "Legião Urbana", "")
-
-				Expect(err).ToNot(HaveOccurred())
-				Expect(albumInfo.Name).To(Equal("Dois"))
-				Expect(albumInfo.Description).To(BeEmpty())
-				Expect(httpClient.requestCount).To(Equal(2))
-			})
-		})
-	})
-
 	Describe("GetSimilarArtists", func() {
 		var agent *lastfmAgent
 		var httpClient *tests.FakeHttpClient
 		BeforeEach(func() {
 			httpClient = &tests.FakeHttpClient{}
-			client := newClient("API_KEY", "SECRET", httpClient)
+			client := newClient("API_KEY", "SECRET", "pt", httpClient)
 			agent = lastFMConstructor(ds)
 			agent.client = client
 		})
@@ -262,7 +144,7 @@ var _ = Describe("lastfmAgent", func() {
 		var httpClient *tests.FakeHttpClient
 		BeforeEach(func() {
 			httpClient = &tests.FakeHttpClient{}
-			client := newClient("API_KEY", "SECRET", httpClient)
+			client := newClient("API_KEY", "SECRET", "pt", httpClient)
 			agent = lastFMConstructor(ds)
 			agent.client = client
 		})
@@ -300,7 +182,7 @@ var _ = Describe("lastfmAgent", func() {
 		var httpClient *tests.FakeHttpClient
 		BeforeEach(func() {
 			httpClient = &tests.FakeHttpClient{}
-			client := newClient("API_KEY", "SECRET", httpClient)
+			client := newClient("API_KEY", "SECRET", "pt", httpClient)
 			agent = lastFMConstructor(ds)
 			agent.client = client
 		})
@@ -350,7 +232,7 @@ var _ = Describe("lastfmAgent", func() {
 		BeforeEach(func() {
 			_ = ds.UserProps(ctx).Put("user-1", sessionKeyProperty, "SK-1")
 			httpClient = &tests.FakeHttpClient{}
-			client := newClient("API_KEY", "SECRET", httpClient)
+			client := newClient("API_KEY", "SECRET", "en", httpClient)
 			agent = lastFMConstructor(ds)
 			agent.client = client
 			track = &model.MediaFile{
@@ -383,8 +265,7 @@ var _ = Describe("lastfmAgent", func() {
 
 				Expect(err).ToNot(HaveOccurred())
 				Expect(httpClient.SavedRequest.Method).To(Equal(http.MethodPost))
-				body, _ := io.ReadAll(httpClient.SavedRequest.Body)
-				sentParams, _ := url.ParseQuery(string(body))
+				sentParams := httpClient.SavedRequest.URL.Query()
 				Expect(sentParams.Get("method")).To(Equal("track.updateNowPlaying"))
 				Expect(sentParams.Get("sk")).To(Equal("SK-1"))
 				Expect(sentParams.Get("track")).To(Equal(track.Title))
@@ -412,8 +293,7 @@ var _ = Describe("lastfmAgent", func() {
 					err := agent.NowPlaying(ctx, "user-1", track, 0)
 
 					Expect(err).ToNot(HaveOccurred())
-					body, _ := io.ReadAll(httpClient.SavedRequest.Body)
-					sentParams, _ := url.ParseQuery(string(body))
+					sentParams := httpClient.SavedRequest.URL.Query()
 					Expect(sentParams.Get("artist")).To(Equal("First Artist"))
 					Expect(sentParams.Get("albumArtist")).To(Equal("First Album Artist"))
 				})
@@ -429,8 +309,7 @@ var _ = Describe("lastfmAgent", func() {
 
 				Expect(err).ToNot(HaveOccurred())
 				Expect(httpClient.SavedRequest.Method).To(Equal(http.MethodPost))
-				body, _ := io.ReadAll(httpClient.SavedRequest.Body)
-				sentParams, _ := url.ParseQuery(string(body))
+				sentParams := httpClient.SavedRequest.URL.Query()
 				Expect(sentParams.Get("method")).To(Equal("track.scrobble"))
 				Expect(sentParams.Get("sk")).To(Equal("SK-1"))
 				Expect(sentParams.Get("track")).To(Equal(track.Title))
@@ -455,8 +334,7 @@ var _ = Describe("lastfmAgent", func() {
 					err := agent.Scrobble(ctx, "user-1", scrobbler.Scrobble{MediaFile: *track, TimeStamp: ts})
 
 					Expect(err).ToNot(HaveOccurred())
-					body, _ := io.ReadAll(httpClient.SavedRequest.Body)
-					sentParams, _ := url.ParseQuery(string(body))
+					sentParams := httpClient.SavedRequest.URL.Query()
 					Expect(sentParams.Get("artist")).To(Equal("First Artist"))
 					Expect(sentParams.Get("albumArtist")).To(Equal("First Album Artist"))
 				})
@@ -524,7 +402,7 @@ var _ = Describe("lastfmAgent", func() {
 		var httpClient *tests.FakeHttpClient
 		BeforeEach(func() {
 			httpClient = &tests.FakeHttpClient{}
-			client := newClient("API_KEY", "SECRET", httpClient)
+			client := newClient("API_KEY", "SECRET", "pt", httpClient)
 			agent = lastFMConstructor(ds)
 			agent.client = client
 		})
@@ -594,7 +472,7 @@ var _ = Describe("lastfmAgent", func() {
 		BeforeEach(func() {
 			apiClient = &tests.FakeHttpClient{}
 			httpClient = &tests.FakeHttpClient{}
-			client := newClient("API_KEY", "SECRET", apiClient)
+			client := newClient("API_KEY", "SECRET", "pt", apiClient)
 			agent = lastFMConstructor(ds)
 			agent.client = client
 			agent.httpClient = httpClient
@@ -655,31 +533,3 @@ var _ = Describe("lastfmAgent", func() {
 		})
 	})
 })
-
-// langAwareHttpClient is a mock HTTP client that returns different responses based on the lang parameter
-type langAwareHttpClient struct {
-	responses    map[string]http.Response
-	requests     []*http.Request
-	requestCount int
-}
-
-func newLangAwareHttpClient() *langAwareHttpClient {
-	return &langAwareHttpClient{
-		responses: make(map[string]http.Response),
-		requests:  make([]*http.Request, 0),
-	}
-}
-
-func (c *langAwareHttpClient) Do(req *http.Request) (*http.Response, error) {
-	c.requestCount++
-	c.requests = append(c.requests, req)
-	lang := req.URL.Query().Get("lang")
-	if resp, ok := c.responses[lang]; ok {
-		return &resp, nil
-	}
-	// Return default empty response if no specific response is configured
-	return &http.Response{
-		StatusCode: 200,
-		Body:       io.NopCloser(bytes.NewBufferString(`{}`)),
-	}, nil
-}

adapters/lastfm/auth_router.go

@@ -44,7 +44,7 @@ func NewRouter(ds model.DataStore) *Router {
 	hc := &http.Client{
 		Timeout: consts.DefaultHttpClientTimeOut,
 	}
-	r.client = newClient(r.apiKey, r.secret, hc)
+	r.client = newClient(r.apiKey, r.secret, "en", hc)
 	return r
 }
 

adapters/lastfm/client.go

@@ -34,23 +34,24 @@ type httpDoer interface {
 	Do(req *http.Request) (*http.Response, error)
 }
 
-func newClient(apiKey string, secret string, hc httpDoer) *client {
-	return &client{apiKey, secret, hc}
+func newClient(apiKey string, secret string, lang string, hc httpDoer) *client {
+	return &client{apiKey, secret, lang, hc}
 }
 
 type client struct {
 	apiKey string
 	secret string
+	lang   string
 	hc     httpDoer
 }
 
-func (c *client) albumGetInfo(ctx context.Context, name string, artist string, mbid string, lang string) (*Album, error) {
+func (c *client) albumGetInfo(ctx context.Context, name string, artist string, mbid string) (*Album, error) {
 	params := url.Values{}
 	params.Add("method", "album.getInfo")
 	params.Add("album", name)
 	params.Add("artist", artist)
 	params.Add("mbid", mbid)
-	params.Add("lang", lang)
+	params.Add("lang", c.lang)
 	response, err := c.makeRequest(ctx, http.MethodGet, params, false)
 	if err != nil {
 		return nil, err
@@ -58,11 +59,11 @@ func (c *client) albumGetInfo(ctx context.Context, name string, artist string, m
 	return &response.Album, nil
 }
 
-func (c *client) artistGetInfo(ctx context.Context, name string, lang string) (*Artist, error) {
+func (c *client) artistGetInfo(ctx context.Context, name string) (*Artist, error) {
 	params := url.Values{}
 	params.Add("method", "artist.getInfo")
 	params.Add("artist", name)
-	params.Add("lang", lang)
+	params.Add("lang", c.lang)
 	response, err := c.makeRequest(ctx, http.MethodGet, params, false)
 	if err != nil {
 		return nil, err
@@ -197,15 +198,8 @@ func (c *client) makeRequest(ctx context.Context, method string, params url.Valu
 		c.sign(params)
 	}
 
-	var req *http.Request
-	if method == http.MethodPost {
-		body := strings.NewReader(params.Encode())
-		req, _ = http.NewRequestWithContext(ctx, method, apiBaseUrl, body)
-		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	} else {
-		req, _ = http.NewRequestWithContext(ctx, method, apiBaseUrl, nil)
-		req.URL.RawQuery = params.Encode()
-	}
+	req, _ := http.NewRequestWithContext(ctx, method, apiBaseUrl, nil)
+	req.URL.RawQuery = params.Encode()
 
 	log.Trace(ctx, fmt.Sprintf("Sending Last.fm %s request", req.Method), "url", req.URL)
 	resp, err := c.hc.Do(req)

adapters/lastfm/client_test.go

@@ -22,7 +22,7 @@ var _ = Describe("client", func() {
 
 	BeforeEach(func() {
 		httpClient = &tests.FakeHttpClient{}
-		client = newClient("API_KEY", "SECRET", httpClient)
+		client = newClient("API_KEY", "SECRET", "pt", httpClient)
 	})
 
 	Describe("albumGetInfo", func() {
@@ -30,7 +30,7 @@ var _ = Describe("client", func() {
 			f, _ := os.Open("tests/fixtures/lastfm.album.getinfo.json")
 			httpClient.Res = http.Response{Body: f, StatusCode: 200}
 
-			album, err := client.albumGetInfo(context.Background(), "Believe", "U2", "mbid-1234", "pt")
+			album, err := client.albumGetInfo(context.Background(), "Believe", "U2", "mbid-1234")
 			Expect(err).To(BeNil())
 			Expect(album.Name).To(Equal("Believe"))
 			Expect(httpClient.SavedRequest.URL.String()).To(Equal(apiBaseUrl + "?album=Believe&api_key=API_KEY&artist=U2&format=json&lang=pt&mbid=mbid-1234&method=album.getInfo"))
@@ -42,7 +42,7 @@ var _ = Describe("client", func() {
 			f, _ := os.Open("tests/fixtures/lastfm.artist.getinfo.json")
 			httpClient.Res = http.Response{Body: f, StatusCode: 200}
 
-			artist, err := client.artistGetInfo(context.Background(), "U2", "pt")
+			artist, err := client.artistGetInfo(context.Background(), "U2")
 			Expect(err).To(BeNil())
 			Expect(artist.Name).To(Equal("U2"))
 			Expect(httpClient.SavedRequest.URL.String()).To(Equal(apiBaseUrl + "?api_key=API_KEY&artist=U2&format=json&lang=pt&method=artist.getInfo"))
@@ -54,7 +54,7 @@ var _ = Describe("client", func() {
 				StatusCode: 500,
 			}
 
-			_, err := client.artistGetInfo(context.Background(), "U2", "pt")
+			_, err := client.artistGetInfo(context.Background(), "U2")
 			Expect(err).To(MatchError("last.fm http status: (500)"))
 		})
 
@@ -64,7 +64,7 @@ var _ = Describe("client", func() {
 				StatusCode: 400,
 			}
 
-			_, err := client.artistGetInfo(context.Background(), "U2", "pt")
+			_, err := client.artistGetInfo(context.Background(), "U2")
 			Expect(err).To(MatchError(&lastFMError{Code: 3, Message: "Invalid Method - No method with that name in this package"}))
 		})
 
@@ -74,14 +74,14 @@ var _ = Describe("client", func() {
 				StatusCode: 200,
 			}
 
-			_, err := client.artistGetInfo(context.Background(), "U2", "pt")
+			_, err := client.artistGetInfo(context.Background(), "U2")
 			Expect(err).To(MatchError(&lastFMError{Code: 6, Message: "The artist you supplied could not be found"}))
 		})
 
 		It("fails if HttpClient.Do() returns error", func() {
 			httpClient.Err = errors.New("generic error")
 
-			_, err := client.artistGetInfo(context.Background(), "U2", "pt")
+			_, err := client.artistGetInfo(context.Background(), "U2")
 			Expect(err).To(MatchError("generic error"))
 		})
 
@@ -91,7 +91,7 @@ var _ = Describe("client", func() {
 				StatusCode: 200,
 			}
 
-			_, err := client.artistGetInfo(context.Background(), "U2", "pt")
+			_, err := client.artistGetInfo(context.Background(), "U2")
 			Expect(err).To(MatchError("invalid character '<' looking for beginning of value"))
 		})
 
@@ -178,74 +178,6 @@ var _ = Describe("client", func() {
 		})
 	})
 
-	Describe("scrobble", func() {
-		It("sends parameters in request body for POST", func() {
-			httpClient.Res = http.Response{
-				Body:       io.NopCloser(bytes.NewBufferString(`{"scrobbles":{"scrobble":{"ignoredMessage":{"code":"0"}},"@attr":{"accepted":1}}}`)),
-				StatusCode: 200,
-			}
-
-			info := ScrobbleInfo{
-				artist:      "U2",
-				track:       "One",
-				album:       "Achtung Baby",
-				trackNumber: 1,
-				duration:    276,
-				albumArtist: "U2",
-			}
-			err := client.scrobble(context.Background(), "SESSION_KEY", info)
-			Expect(err).To(BeNil())
-
-			req := httpClient.SavedRequest
-			Expect(req.Method).To(Equal(http.MethodPost))
-			Expect(req.Header.Get("Content-Type")).To(Equal("application/x-www-form-urlencoded"))
-			Expect(req.URL.RawQuery).To(BeEmpty())
-
-			body, _ := io.ReadAll(req.Body)
-			bodyParams, _ := url.ParseQuery(string(body))
-			Expect(bodyParams.Get("method")).To(Equal("track.scrobble"))
-			Expect(bodyParams.Get("artist")).To(Equal("U2"))
-			Expect(bodyParams.Get("track")).To(Equal("One"))
-			Expect(bodyParams.Get("sk")).To(Equal("SESSION_KEY"))
-			Expect(bodyParams.Get("api_key")).To(Equal("API_KEY"))
-			Expect(bodyParams.Get("api_sig")).ToNot(BeEmpty())
-		})
-	})
-
-	Describe("updateNowPlaying", func() {
-		It("sends parameters in request body for POST", func() {
-			httpClient.Res = http.Response{
-				Body:       io.NopCloser(bytes.NewBufferString(`{"nowplaying":{"ignoredMessage":{"code":"0"}}}`)),
-				StatusCode: 200,
-			}
-
-			info := ScrobbleInfo{
-				artist:      "U2",
-				track:       "One",
-				album:       "Achtung Baby",
-				trackNumber: 1,
-				duration:    276,
-				albumArtist: "U2",
-			}
-			err := client.updateNowPlaying(context.Background(), "SESSION_KEY", info)
-			Expect(err).To(BeNil())
-
-			req := httpClient.SavedRequest
-			Expect(req.Method).To(Equal(http.MethodPost))
-			Expect(req.Header.Get("Content-Type")).To(Equal("application/x-www-form-urlencoded"))
-			Expect(req.URL.RawQuery).To(BeEmpty())
-
-			body, _ := io.ReadAll(req.Body)
-			bodyParams, _ := url.ParseQuery(string(body))
-			Expect(bodyParams.Get("method")).To(Equal("track.updateNowPlaying"))
-			Expect(bodyParams.Get("artist")).To(Equal("U2"))
-			Expect(bodyParams.Get("track")).To(Equal("One"))
-			Expect(bodyParams.Get("sk")).To(Equal("SESSION_KEY"))
-			Expect(bodyParams.Get("api_key")).To(Equal("API_KEY"))
-			Expect(bodyParams.Get("api_sig")).ToNot(BeEmpty())
-		})
-	})
-
 	Describe("sign", func() {
 		It("adds an api_sig param with the signature", func() {
 			params := url.Values{}

cmd/wire_gen.go

@@ -102,8 +102,7 @@ func CreateSubsonicAPIRouter(ctx context.Context) *subsonic.Router {
 	modelScanner := scanner.New(ctx, dataStore, cacheWarmer, broker, playlists, metricsMetrics)
 	playTracker := scrobbler.GetPlayTracker(dataStore, broker, manager)
 	playbackServer := playback.GetInstance(dataStore)
-	transcodeDecision := core.NewTranscodeDecision(dataStore)
-	router := subsonic.New(dataStore, artworkArtwork, mediaStreamer, archiver, players, provider, modelScanner, broker, playlists, playTracker, share, playbackServer, metricsMetrics, transcodeDecision)
+	router := subsonic.New(dataStore, artworkArtwork, mediaStreamer, archiver, players, provider, modelScanner, broker, playlists, playTracker, share, playbackServer, metricsMetrics)
 	return router
 }
 

conf/configuration.go

@@ -1,7 +1,6 @@
 package conf
 
 import (
-	"cmp"
 	"fmt"
 	"net/url"
 	"os"
@@ -175,9 +174,6 @@ type lastfmOptions struct {
 	Secret                  string
 	Language                string
 	ScrobbleFirstArtistOnly bool
-
-	// Computed values
-	Languages []string // Computed from Language, split by comma
 }
 
 type spotifyOptions struct {
@@ -188,9 +184,6 @@ type spotifyOptions struct {
 type deezerOptions struct {
 	Enabled  bool
 	Language string
-
-	// Computed values
-	Languages []string // Computed from Language, split by comma
 }
 
 type listenBrainzOptions struct {
@@ -376,16 +369,6 @@ func Load(noConfigDump bool) {
 		disableExternalServices()
 	}
 
-	// Make sure we don't have empty PIDs
-	Server.PID.Album = cmp.Or(Server.PID.Album, consts.DefaultAlbumPID)
-	Server.PID.Track = cmp.Or(Server.PID.Track, consts.DefaultTrackPID)
-
-	// Parse LastFM.Language into Languages slice (comma-separated, with fallback to DefaultInfoLanguage)
-	Server.LastFM.Languages = parseLanguages(Server.LastFM.Language)
-
-	// Parse Deezer.Language into Languages slice (comma-separated, with fallback to DefaultInfoLanguage)
-	Server.Deezer.Languages = parseLanguages(Server.Deezer.Language)
-
 	logDeprecatedOptions("Scanner.GenreSeparators", "")
 	logDeprecatedOptions("Scanner.GroupAlbumReleases", "")
 	logDeprecatedOptions("DevEnableBufferedScrobble", "") // Deprecated: Buffered scrobbling is now always enabled and this option is ignored
@@ -474,22 +457,6 @@ func validatePlaylistsPath() error {
 	return nil
 }
 
-// parseLanguages parses a comma-separated language string into a slice.
-// It trims whitespace from each entry and ensures at least [DefaultInfoLanguage] is returned.
-func parseLanguages(lang string) []string {
-	var languages []string
-	for _, l := range strings.Split(lang, ",") {
-		l = strings.TrimSpace(l)
-		if l != "" {
-			languages = append(languages, l)
-		}
-	}
-	if len(languages) == 0 {
-		return []string{consts.DefaultInfoLanguage}
-	}
-	return languages
-}
-
 func validatePurgeMissingOption() error {
 	allowedValues := []string{consts.PurgeMissingNever, consts.PurgeMissingAlways, consts.PurgeMissingFull}
 	valid := false
@@ -643,18 +610,17 @@ func setViperDefaults() {
 	viper.SetDefault("subsonic.artistparticipations", false)
 	viper.SetDefault("subsonic.defaultreportrealpath", false)
 	viper.SetDefault("subsonic.enableaveragerating", true)
-	viper.SetDefault("subsonic.legacyclients", "DSub")
-	viper.SetDefault("subsonic.minimalclients", "SubMusic")
+	viper.SetDefault("subsonic.legacyclients", "DSub,SubMusic")
 	viper.SetDefault("agents", "lastfm,spotify,deezer")
 	viper.SetDefault("lastfm.enabled", true)
-	viper.SetDefault("lastfm.language", consts.DefaultInfoLanguage)
+	viper.SetDefault("lastfm.language", "en")
 	viper.SetDefault("lastfm.apikey", "")
 	viper.SetDefault("lastfm.secret", "")
 	viper.SetDefault("lastfm.scrobblefirstartistonly", false)
 	viper.SetDefault("spotify.id", "")
 	viper.SetDefault("spotify.secret", "")
 	viper.SetDefault("deezer.enabled", true)
-	viper.SetDefault("deezer.language", consts.DefaultInfoLanguage)
+	viper.SetDefault("deezer.language", "en")
 	viper.SetDefault("listenbrainz.enabled", true)
 	viper.SetDefault("listenbrainz.baseurl", "https://api.listenbrainz.org/1/")
 	viper.SetDefault("enablescrobblehistory", true)
@@ -669,7 +635,7 @@ func setViperDefaults() {
 	viper.SetDefault("inspect.backloglimit", consts.RequestThrottleBacklogLimit)
 	viper.SetDefault("inspect.backlogtimeout", consts.RequestThrottleBacklogTimeout)
 	viper.SetDefault("plugins.folder", "")
-	viper.SetDefault("plugins.enabled", true)
+	viper.SetDefault("plugins.enabled", false)
 	viper.SetDefault("plugins.cachesize", "200MB")
 	viper.SetDefault("plugins.autoreload", false)
 

conf/configuration_test.go

@@ -26,32 +26,6 @@ var _ = Describe("Configuration", func() {
 		conf.ResetConf()
 	})
 
-	Describe("ParseLanguages", func() {
-		It("parses single language", func() {
-			Expect(conf.ParseLanguages("en")).To(Equal([]string{"en"}))
-		})
-
-		It("parses multiple comma-separated languages", func() {
-			Expect(conf.ParseLanguages("pt,en")).To(Equal([]string{"pt", "en"}))
-		})
-
-		It("trims whitespace from languages", func() {
-			Expect(conf.ParseLanguages(" pt , en ")).To(Equal([]string{"pt", "en"}))
-		})
-
-		It("returns default 'en' when empty", func() {
-			Expect(conf.ParseLanguages("")).To(Equal([]string{"en"}))
-		})
-
-		It("returns default 'en' when only whitespace", func() {
-			Expect(conf.ParseLanguages("   ")).To(Equal([]string{"en"}))
-		})
-
-		It("handles multiple languages with various spacing", func() {
-			Expect(conf.ParseLanguages("ja, pt, en")).To(Equal([]string{"ja", "pt", "en"}))
-		})
-	})
-
 	DescribeTable("should load configuration from",
 		func(format string) {
 			filename := filepath.Join("testdata", "cfg."+format)

conf/export_test.go

@@ -5,5 +5,3 @@ func ResetConf() {
 }
 
 var SetViperDefaults = setViperDefaults
-
-var ParseLanguages = parseLanguages

consts/consts.go

@@ -56,8 +56,6 @@ const (
 
 	ServerReadHeaderTimeout = 3 * time.Second
 
-	DefaultInfoLanguage = "en"
-
 	ArtistInfoTimeToLive      = 24 * time.Hour
 	AlbumInfoTimeToLive       = 7 * 24 * time.Hour
 	UpdateLastAccessFrequency = time.Minute

core/agents/interfaces.go

@@ -36,12 +36,10 @@ type Song struct {
 	ID         string
 	Name       string
 	MBID       string
-	ISRC       string
 	Artist     string
 	ArtistMBID string
 	Album      string
 	AlbumMBID  string
-	Duration   uint32 // Duration in milliseconds, 0 means unknown
 }
 
 var (

core/artwork/artwork_internal_test.go

@@ -302,33 +302,6 @@ var _ = Describe("Artwork", func() {
 				Entry("landscape jpg image", "jpg", true, 200),
 			)
 		})
-		When("Requested size is larger than original", func() {
-			It("clamps size to original dimensions", func() {
-				conf.Server.CoverArtPriority = "front.png"
-				// front.png is 16x16, requesting 99999 should return at original size
-				r, _, err := aw.Get(context.Background(), alMultipleCovers.CoverArtID(), 99999, false)
-				Expect(err).ToNot(HaveOccurred())
-
-				img, _, err := image.Decode(r)
-				Expect(err).ToNot(HaveOccurred())
-				// Should be clamped to original size (16), not 99999
-				Expect(img.Bounds().Size().X).To(Equal(16))
-				Expect(img.Bounds().Size().Y).To(Equal(16))
-			})
-
-			It("clamps square size to original dimensions", func() {
-				conf.Server.CoverArtPriority = "front.png"
-				// front.png is 16x16, requesting 99999 with square should return 16x16 square
-				r, _, err := aw.Get(context.Background(), alMultipleCovers.CoverArtID(), 99999, true)
-				Expect(err).ToNot(HaveOccurred())
-
-				img, _, err := image.Decode(r)
-				Expect(err).ToNot(HaveOccurred())
-				// Should be clamped to original size (16), not 99999
-				Expect(img.Bounds().Size().X).To(Equal(16))
-				Expect(img.Bounds().Size().Y).To(Equal(16))
-			})
-		})
 	})
 })
 

core/artwork/reader_resized.go

@@ -87,11 +87,6 @@ func resizeImage(reader io.Reader, size int, square bool) (io.Reader, int, error
 	bounds := original.Bounds()
 	originalSize := max(bounds.Max.X, bounds.Max.Y)
 
-	// Clamp size to original dimensions - upscaling wastes resources and adds no information
-	if size > originalSize {
-		size = originalSize
-	}
-
 	if originalSize <= size && !square {
 		return nil, originalSize, nil
 	}

core/external/extdata_helper_test.go

@@ -92,11 +92,6 @@ func (m *mockMediaFileRepo) Get(id string) (*model.MediaFile, error) {
 	return args.Get(0).(*model.MediaFile), args.Error(1)
 }
 
-// GetAllByTags implements model.MediaFileRepository.
-func (m *mockMediaFileRepo) GetAllByTags(_ model.TagName, _ []string, options ...model.QueryOptions) (model.MediaFiles, error) {
-	return m.GetAll(options...)
-}
-
 // GetAll implements model.MediaFileRepository.
 func (m *mockMediaFileRepo) GetAll(options ...model.QueryOptions) (model.MediaFiles, error) {
 	argsSlice := make([]interface{}, len(options))

core/external/provider_matching.go

@@ -3,7 +3,6 @@ package external
 import (
 	"context"
 	"fmt"
-	"math"
 
 	"github.com/Masterminds/squirrel"
 	"github.com/navidrome/navidrome/conf"
@@ -19,18 +18,17 @@ import (
 // # Algorithm Overview
 //
 // The algorithm matches songs from external agents (Last.fm, Deezer, etc.) to tracks in the
-// local music library using four matching strategies in priority order:
+// local music library using three matching strategies in priority order:
 //
 //  1. Direct ID match: Songs with an ID field are matched directly to MediaFiles by ID
 //  2. MusicBrainz Recording ID (MBID) match: Songs with MBID are matched to tracks with
 //     matching mbz_recording_id
-//  3. ISRC match: Songs with ISRC are matched to tracks with matching ISRC tag
-//  4. Title+Artist fuzzy match: Remaining songs are matched using fuzzy string comparison
+//  3. Title+Artist fuzzy match: Remaining songs are matched using fuzzy string comparison
 //     with metadata specificity scoring
 //
 // # Matching Priority
 //
-// When selecting the final result, matches are prioritized in order: ID > MBID > ISRC > Title+Artist.
+// When selecting the final result, matches are prioritized in order: ID > MBID > Title+Artist.
 // This ensures that more reliable identifiers take precedence over fuzzy text matching.
 //
 // # Fuzzy Matching Details
@@ -39,15 +37,14 @@ import (
 // via SimilarSongsMatchThreshold, default 85%). Matches are ranked by:
 //
 //  1. Title similarity (Jaro-Winkler score, 0.0-1.0)
-//  2. Duration proximity (closer duration = higher score, 1.0 if unknown)
-//  3. Specificity level (0-5, based on metadata precision):
+//  2. Specificity level (0-5, based on metadata precision):
 //     - Level 5: Title + Artist MBID + Album MBID (most specific)
 //     - Level 4: Title + Artist MBID + Album name (fuzzy)
 //     - Level 3: Title + Artist name + Album name (fuzzy)
 //     - Level 2: Title + Artist MBID
 //     - Level 1: Title + Artist name
 //     - Level 0: Title only
-//  4. Album similarity (Jaro-Winkler, as final tiebreaker)
+//  3. Album similarity (Jaro-Winkler, as final tiebreaker)
 //
 // # Examples
 //
@@ -60,16 +57,7 @@ import (
 //	]
 //	Result: t1 (MBID match takes priority over title+artist)
 //
-// Example 2 - ISRC Priority:
-//
-//	Agent returns: {Name: "Paranoid Android", ISRC: "GBAYE0000351", Artist: "Radiohead"}
-//	Library has: [
-//	  {ID: "t1", Title: "Paranoid Android", Tags: {isrc: ["GBAYE0000351"]}},
-//	  {ID: "t2", Title: "Paranoid Android", Artist: "Radiohead"},
-//	]
-//	Result: t1 (ISRC match takes priority over title+artist)
-//
-// Example 3 - Specificity Ranking:
+// Example 2 - Specificity Ranking:
 //
 //	Agent returns: {Name: "Enjoy the Silence", Artist: "Depeche Mode", Album: "Violator"}
 //	Library has: [
@@ -78,7 +66,7 @@ import (
 //	]
 //	Result: t2 (Level 3 beats Level 1 due to album match)
 //
-// Example 4 - Fuzzy Title Matching:
+// Example 3 - Fuzzy Title Matching:
 //
 //	Agent returns: {Name: "Bohemian Rhapsody", Artist: "Queen"}
 //	Library has: {ID: "t1", Title: "Bohemian Rhapsody - Remastered", Artist: "Queen"}
@@ -100,43 +88,16 @@ func (e *provider) matchSongsToLibrary(ctx context.Context, songs []agents.Song,
 	if err != nil {
 		return nil, fmt.Errorf("failed to load tracks by ID: %w", err)
 	}
-	mbidMatches, err := e.loadTracksByMBID(ctx, songs, idMatches)
+	mbidMatches, err := e.loadTracksByMBID(ctx, songs)
 	if err != nil {
 		return nil, fmt.Errorf("failed to load tracks by MBID: %w", err)
 	}
-	isrcMatches, err := e.loadTracksByISRC(ctx, songs, idMatches, mbidMatches)
-	if err != nil {
-		return nil, fmt.Errorf("failed to load tracks by ISRC: %w", err)
-	}
-	titleMatches, err := e.loadTracksByTitleAndArtist(ctx, songs, idMatches, mbidMatches, isrcMatches)
+	titleMatches, err := e.loadTracksByTitleAndArtist(ctx, songs, idMatches, mbidMatches)
 	if err != nil {
 		return nil, fmt.Errorf("failed to load tracks by title: %w", err)
 	}
 
-	return e.selectBestMatchingSongs(songs, idMatches, mbidMatches, isrcMatches, titleMatches, count), nil
-}
-
-// songMatchedIn checks if a song has already been matched in any of the provided match maps.
-// It checks the song's ID, MBID, and ISRC fields against the corresponding map keys.
-func songMatchedIn(s agents.Song, priorMatches ...map[string]model.MediaFile) bool {
-	_, found := lookupByIdentifiers(s, priorMatches...)
-	return found
-}
-
-// lookupByIdentifiers searches for a song's identifiers (ID, MBID, ISRC) in the provided maps.
-// Returns the first matching MediaFile found and true, or an empty MediaFile and false if no match.
-func lookupByIdentifiers(s agents.Song, maps ...map[string]model.MediaFile) (model.MediaFile, bool) {
-	keys := []string{s.ID, s.MBID, s.ISRC}
-	for _, m := range maps {
-		for _, key := range keys {
-			if key != "" {
-				if mf, ok := m[key]; ok && mf.ID != "" {
-					return mf, true
-				}
-			}
-		}
-	}
-	return model.MediaFile{}, false
+	return e.selectBestMatchingSongs(songs, idMatches, mbidMatches, titleMatches, count), nil
 }
 
 // loadTracksByID fetches MediaFiles from the library using direct ID matching.
@@ -175,10 +136,10 @@ func (e *provider) loadTracksByID(ctx context.Context, songs []agents.Song) (map
 // It extracts all non-empty MBID fields from the input songs and performs a single
 // batch query against the mbz_recording_id column. Returns a map keyed by MBID for
 // O(1) lookup. Only non-missing files are returned.
-func (e *provider) loadTracksByMBID(ctx context.Context, songs []agents.Song, priorMatches ...map[string]model.MediaFile) (map[string]model.MediaFile, error) {
+func (e *provider) loadTracksByMBID(ctx context.Context, songs []agents.Song) (map[string]model.MediaFile, error) {
 	var mbids []string
 	for _, s := range songs {
-		if s.MBID != "" && !songMatchedIn(s, priorMatches...) {
+		if s.MBID != "" {
 			mbids = append(mbids, s.MBID)
 		}
 	}
@@ -205,37 +166,6 @@ func (e *provider) loadTracksByMBID(ctx context.Context, songs []agents.Song, pr
 	return matches, nil
 }
 
-// loadTracksByISRC fetches MediaFiles from the library using ISRC (International Standard
-// Recording Code) matching. It extracts all non-empty ISRC fields from the input songs and
-// queries the tags JSON column for matching ISRC values. Returns a map keyed by ISRC for
-// O(1) lookup. Only non-missing files are returned.
-func (e *provider) loadTracksByISRC(ctx context.Context, songs []agents.Song, priorMatches ...map[string]model.MediaFile) (map[string]model.MediaFile, error) {
-	var isrcs []string
-	for _, s := range songs {
-		if s.ISRC != "" && !songMatchedIn(s, priorMatches...) {
-			isrcs = append(isrcs, s.ISRC)
-		}
-	}
-	matches := map[string]model.MediaFile{}
-	if len(isrcs) == 0 {
-		return matches, nil
-	}
-	res, err := e.ds.MediaFile(ctx).GetAllByTags(model.TagISRC, isrcs, model.QueryOptions{
-		Filters: squirrel.Eq{"missing": false},
-	})
-	if err != nil {
-		return matches, err
-	}
-	for _, mf := range res {
-		for _, isrc := range mf.Tags.Values(model.TagISRC) {
-			if _, ok := matches[isrc]; !ok {
-				matches[isrc] = mf
-			}
-		}
-	}
-	return matches, nil
-}
-
 // songQuery represents a normalized query for matching a song to library tracks.
 // All string fields are sanitized (lowercased, diacritics removed) for comparison.
 // This struct is used internally by loadTracksByTitleAndArtist to group queries by artist.
@@ -245,26 +175,21 @@ type songQuery struct {
 	artistMBID string // MusicBrainz Artist ID (optional, for higher specificity matching)
 	album      string // Sanitized album name (optional, for specificity scoring)
 	albumMBID  string // MusicBrainz Album ID (optional, for highest specificity matching)
-	durationMs uint32 // Duration in milliseconds (0 means unknown, skip duration filtering)
 }
 
 // matchScore combines title/album similarity with metadata specificity for ranking matches
 type matchScore struct {
-	titleSimilarity   float64 // 0.0-1.0 (Jaro-Winkler)
-	durationProximity float64 // 0.0-1.0 (closer duration = higher, 1.0 if unknown)
-	albumSimilarity   float64 // 0.0-1.0 (Jaro-Winkler), used as tiebreaker
-	specificityLevel  int     // 0-5 (higher = more specific metadata match)
+	titleSimilarity  float64 // 0.0-1.0 (Jaro-Winkler)
+	albumSimilarity  float64 // 0.0-1.0 (Jaro-Winkler), used as tiebreaker
+	specificityLevel int     // 0-5 (higher = more specific metadata match)
 }
 
 // betterThan returns true if this score beats another.
-// Comparison order: title similarity > duration proximity > specificity level > album similarity
+// Comparison order: title similarity > specificity level > album similarity
 func (s matchScore) betterThan(other matchScore) bool {
 	if s.titleSimilarity != other.titleSimilarity {
 		return s.titleSimilarity > other.titleSimilarity
 	}
-	if s.durationProximity != other.durationProximity {
-		return s.durationProximity > other.durationProximity
-	}
 	if s.specificityLevel != other.specificityLevel {
 		return s.specificityLevel > other.specificityLevel
 	}
@@ -314,8 +239,8 @@ func computeSpecificityLevel(q songQuery, mf model.MediaFile, albumThreshold flo
 // Uses a unified scoring approach that combines title similarity (Jaro-Winkler) with
 // metadata specificity (MBIDs, album names) for both exact and fuzzy matches.
 // Returns a map keyed by "title|artist" for compatibility with selectBestMatchingSongs.
-func (e *provider) loadTracksByTitleAndArtist(ctx context.Context, songs []agents.Song, priorMatches ...map[string]model.MediaFile) (map[string]model.MediaFile, error) {
-	queries := e.buildTitleQueries(songs, priorMatches...)
+func (e *provider) loadTracksByTitleAndArtist(ctx context.Context, songs []agents.Song, idMatches, mbidMatches map[string]model.MediaFile) (map[string]model.MediaFile, error) {
+	queries := e.buildTitleQueries(songs, idMatches, mbidMatches)
 	if len(queries) == 0 {
 		return map[string]model.MediaFile{}, nil
 	}
@@ -357,25 +282,11 @@ func (e *provider) loadTracksByTitleAndArtist(ctx context.Context, songs []agent
 	return matches, nil
 }
 
-// durationProximity returns a score from 0.0 to 1.0 indicating how close
-// the track's duration is to the target. A perfect match returns 1.0, and the
-// score decreases as the difference grows (using 1 / (1 + diff)). Returns 1.0
-// if durationMs is 0 (unknown), so duration does not influence scoring.
-func durationProximity(durationMs uint32, mediaFileDurationSec float32) float64 {
-	if durationMs <= 0 {
-		return 1.0 // Unknown duration — don't penalise
-	}
-	durationSec := float64(durationMs) / 1000.0
-	diff := math.Abs(durationSec - float64(mediaFileDurationSec))
-	return 1.0 / (1.0 + diff)
-}
-
 // findBestMatch finds the best matching track using combined title/album similarity and specificity scoring.
 // A track must meet the threshold for title similarity, then the best match is chosen by:
 // 1. Highest title similarity
-// 2. Duration proximity (closer duration = higher score, 1.0 if unknown)
-// 3. Highest specificity level
-// 4. Highest album similarity (as final tiebreaker)
+// 2. Highest specificity level
+// 3. Highest album similarity (as final tiebreaker)
 func (e *provider) findBestMatch(q songQuery, tracks model.MediaFiles, threshold float64) (model.MediaFile, bool) {
 	var bestMatch model.MediaFile
 	bestScore := matchScore{titleSimilarity: -1}
@@ -397,10 +308,9 @@ func (e *provider) findBestMatch(q songQuery, tracks model.MediaFiles, threshold
 		}
 
 		score := matchScore{
-			titleSimilarity:   titleSim,
-			durationProximity: durationProximity(q.durationMs, mf.Duration),
-			albumSimilarity:   albumSim,
-			specificityLevel:  computeSpecificityLevel(q, mf, threshold),
+			titleSimilarity:  titleSim,
+			albumSimilarity:  albumSim,
+			specificityLevel: computeSpecificityLevel(q, mf, threshold),
 		}
 
 		if score.betterThan(bestScore) {
@@ -412,13 +322,14 @@ func (e *provider) findBestMatch(q songQuery, tracks model.MediaFiles, threshold
 	return bestMatch, found
 }
 
-// buildTitleQueries converts agent songs into normalized songQuery structs for title+artist matching.
-// It skips songs that have already been matched in prior phases (by ID, MBID, or ISRC) and sanitizes
-// all string fields for consistent comparison (lowercase, diacritics removed, articles stripped from artist names).
-func (e *provider) buildTitleQueries(songs []agents.Song, priorMatches ...map[string]model.MediaFile) []songQuery {
+func (e *provider) buildTitleQueries(songs []agents.Song, idMatches, mbidMatches map[string]model.MediaFile) []songQuery {
 	var queries []songQuery
 	for _, s := range songs {
-		if songMatchedIn(s, priorMatches...) {
+		// Skip if already matched by ID or MBID
+		if s.ID != "" && idMatches[s.ID].ID != "" {
+			continue
+		}
+		if s.MBID != "" && mbidMatches[s.MBID].ID != "" {
 			continue
 		}
 		queries = append(queries, songQuery{
@@ -427,67 +338,40 @@ func (e *provider) buildTitleQueries(songs []agents.Song, priorMatches ...map[st
 			artistMBID: s.ArtistMBID,
 			album:      str.SanitizeFieldForSorting(s.Album),
 			albumMBID:  s.AlbumMBID,
-			durationMs: s.Duration,
 		})
 	}
 	return queries
 }
 
-// selectBestMatchingSongs assembles the final result by mapping input songs to their best matching
-// library tracks. It iterates through the input songs in order and selects the first available match
-// using priority order: ID > MBID > ISRC > title+artist.
-//
-// The function also handles deduplication: when multiple different input songs would match the same
-// library track (e.g., "Song (Live)" and "Song (Remastered)" both matching "Song (Live)" in the library),
-// only the first match is kept. However, if the same input song appears multiple times (intentional
-// repetition), duplicates are preserved in the output.
-//
-// Returns up to 'count' MediaFiles, preserving the input order. Songs that cannot be matched are skipped.
-func (e *provider) selectBestMatchingSongs(songs []agents.Song, byID, byMBID, byISRC, byTitleArtist map[string]model.MediaFile, count int) model.MediaFiles {
-	mfs := make(model.MediaFiles, 0, len(songs))
-	// Track MediaFile.ID -> input song that added it, for deduplication
-	addedBy := make(map[string]agents.Song, len(songs))
-
+func (e *provider) selectBestMatchingSongs(songs []agents.Song, byID, byMBID, byTitleArtist map[string]model.MediaFile, count int) model.MediaFiles {
+	var mfs model.MediaFiles
 	for _, t := range songs {
 		if len(mfs) == count {
 			break
 		}
-
-		mf, found := findMatchingTrack(t, byID, byMBID, byISRC, byTitleArtist)
-		if !found {
-			continue
-		}
-
-		// Check for duplicate library track
-		if prevSong, alreadyAdded := addedBy[mf.ID]; alreadyAdded {
-			// Only add duplicate if input songs are identical
-			if t != prevSong {
-				continue // Different input songs → skip mismatch-induced duplicate
+		// Try ID match first
+		if t.ID != "" {
+			if mf, ok := byID[t.ID]; ok {
+				mfs = append(mfs, mf)
+				continue
 			}
-		} else {
-			addedBy[mf.ID] = t
 		}
-
-		mfs = append(mfs, mf)
+		// Try MBID match second
+		if t.MBID != "" {
+			if mf, ok := byMBID[t.MBID]; ok {
+				mfs = append(mfs, mf)
+				continue
+			}
+		}
+		// Fall back to title+artist match (composite key preserves duplicate titles)
+		key := str.SanitizeFieldForSorting(t.Name) + "|" + str.SanitizeFieldForSortingNoArticle(t.Artist)
+		if mf, ok := byTitleArtist[key]; ok {
+			mfs = append(mfs, mf)
+		}
 	}
 	return mfs
 }
 
-// findMatchingTrack looks up a song in the match maps using priority order: ID > MBID > ISRC > title+artist.
-// Returns the matched MediaFile and true if found, or an empty MediaFile and false if no match exists.
-func findMatchingTrack(t agents.Song, byID, byMBID, byISRC, byTitleArtist map[string]model.MediaFile) (model.MediaFile, bool) {
-	// Try identifier-based matches first (ID, MBID, ISRC)
-	if mf, found := lookupByIdentifiers(t, byID, byMBID, byISRC); found {
-		return mf, true
-	}
-	// Fall back to title+artist fuzzy match
-	key := str.SanitizeFieldForSorting(t.Name) + "|" + str.SanitizeFieldForSortingNoArticle(t.Artist)
-	if mf, ok := byTitleArtist[key]; ok {
-		return mf, true
-	}
-	return model.MediaFile{}, false
-}
-
 // similarityRatio calculates the similarity between two strings using Jaro-Winkler algorithm.
 // Returns a value between 0.0 (completely different) and 1.0 (identical).
 // Jaro-Winkler is well-suited for matching song titles because it gives higher scores

core/external/provider_matching_test.go

@@ -41,26 +41,6 @@ var _ = Describe("Provider - Song Matching", func() {
 		provider = NewProvider(ds, agentsCombined)
 	})
 
-	// Shared helper for tests that only need artist track queries (no ID/MBID matching)
-	setupSimilarSongsExpectations := func(returnedSongs []agents.Song, artistTracks model.MediaFiles) {
-		agentsCombined.On("GetSimilarSongsByTrack", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
-			Return(returnedSongs, nil).Once()
-
-		// loadTracksByTitleAndArtist - queries by artist name
-		mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool {
-			and, ok := opt.Filters.(squirrel.And)
-			if !ok || len(and) < 2 {
-				return false
-			}
-			eq, hasEq := and[0].(squirrel.Eq)
-			if !hasEq {
-				return false
-			}
-			_, hasArtist := eq["order_artist_name"]
-			return hasArtist
-		})).Return(artistTracks, nil).Maybe()
-	}
-
 	Describe("matchSongsToLibrary priority matching", func() {
 		var track model.MediaFile
 
@@ -281,6 +261,26 @@ var _ = Describe("Provider - Song Matching", func() {
 			mediaFileRepo.On("Get", "track-1").Return(&track, nil).Once()
 		})
 
+		setupFuzzyExpectations := func(returnedSongs []agents.Song, artistTracks model.MediaFiles) {
+			agentsCombined.On("GetSimilarSongsByTrack", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+				Return(returnedSongs, nil).Once()
+
+			// loadTracksByTitleAndArtist now queries by artist in a single pass
+			// Note: loadTracksByID and loadTracksByMBID return early when no IDs/MBIDs
+			mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool {
+				and, ok := opt.Filters.(squirrel.And)
+				if !ok || len(and) < 2 {
+					return false
+				}
+				eq, hasEq := and[0].(squirrel.Eq)
+				if !hasEq {
+					return false
+				}
+				_, hasArtist := eq["order_artist_name"]
+				return hasArtist
+			})).Return(artistTracks, nil).Maybe()
+		}
+
 		Context("with default threshold (85%)", func() {
 			It("matches songs with remastered suffix", func() {
 				conf.Server.SimilarSongsMatchThreshold = 85
@@ -294,7 +294,7 @@ var _ = Describe("Provider - Song Matching", func() {
 					{ID: "remastered", Title: "Paranoid Android - Remastered", Artist: "Radiohead"},
 				}
 
-				setupSimilarSongsExpectations(returnedSongs, artistTracks)
+				setupFuzzyExpectations(returnedSongs, artistTracks)
 
 				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
 
@@ -313,7 +313,7 @@ var _ = Describe("Provider - Song Matching", func() {
 					{ID: "live", Title: "Bohemian Rhapsody (Live)", Artist: "Queen"},
 				}
 
-				setupSimilarSongsExpectations(returnedSongs, artistTracks)
+				setupFuzzyExpectations(returnedSongs, artistTracks)
 
 				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
 
@@ -334,7 +334,7 @@ var _ = Describe("Provider - Song Matching", func() {
 					{ID: "different2", Title: "Here Comes The Sun", Artist: "The Beatles"},
 				}
 
-				setupSimilarSongsExpectations(returnedSongs, artistTracks)
+				setupFuzzyExpectations(returnedSongs, artistTracks)
 
 				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
 
@@ -355,7 +355,7 @@ var _ = Describe("Provider - Song Matching", func() {
 					{ID: "remastered", Title: "Paranoid Android - Remastered", Artist: "Radiohead"},
 				}
 
-				setupSimilarSongsExpectations(returnedSongs, artistTracks)
+				setupFuzzyExpectations(returnedSongs, artistTracks)
 
 				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
 
@@ -375,7 +375,7 @@ var _ = Describe("Provider - Song Matching", func() {
 					{ID: "extended", Title: "Song (Extended Mix)", Artist: "Artist"},
 				}
 
-				setupSimilarSongsExpectations(returnedSongs, artistTracks)
+				setupFuzzyExpectations(returnedSongs, artistTracks)
 
 				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
 
@@ -401,7 +401,7 @@ var _ = Describe("Provider - Song Matching", func() {
 					ID: "wrong", Title: "Bohemian Rhapsody", Artist: "Queen", Album: "Greatest Hits",
 				}
 
-				setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{wrongMatch, correctMatch})
+				setupFuzzyExpectations(returnedSongs, model.MediaFiles{wrongMatch, correctMatch})
 
 				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
 
@@ -424,7 +424,7 @@ var _ = Describe("Provider - Song Matching", func() {
 					ID: "wrong", Title: "Enjoy the Silence", Artist: "Depeche Mode", Album: "101",
 				}
 
-				setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{wrongMatch, correctMatch})
+				setupFuzzyExpectations(returnedSongs, model.MediaFiles{wrongMatch, correctMatch})
 
 				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
 
@@ -446,7 +446,7 @@ var _ = Describe("Provider - Song Matching", func() {
 					ID: "fuzzy", Title: "Enjoy the Silence", Artist: "Depeche Mode", Album: "Violator (Deluxe Edition)",
 				}
 
-				setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{fuzzyMatch, exactMatch})
+				setupFuzzyExpectations(returnedSongs, model.MediaFiles{fuzzyMatch, exactMatch})
 
 				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
 
@@ -457,306 +457,4 @@ var _ = Describe("Provider - Song Matching", func() {
 			})
 		})
 	})
-
-	Describe("Duration matching", func() {
-		var track model.MediaFile
-
-		BeforeEach(func() {
-			DeferCleanup(configtest.SetupConfig())
-			conf.Server.SimilarSongsMatchThreshold = 100 // Exact title match for predictable tests
-
-			track = model.MediaFile{ID: "track-1", Title: "Test Track", Artist: "Test Artist"}
-
-			// Setup for GetEntityByID to return the track
-			artistRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once()
-			albumRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once()
-			mediaFileRepo.On("Get", "track-1").Return(&track, nil).Once()
-		})
-
-		Context("when agent provides duration", func() {
-			It("prefers tracks with matching duration", func() {
-				// Agent returns song with duration 180000ms (180 seconds)
-				returnedSongs := []agents.Song{
-					{Name: "Similar Song", Artist: "Test Artist", Duration: 180000},
-				}
-				// Library has two versions: one matching duration, one not
-				correctMatch := model.MediaFile{
-					ID: "correct", Title: "Similar Song", Artist: "Test Artist", Duration: 180.0,
-				}
-				wrongDuration := model.MediaFile{
-					ID: "wrong", Title: "Similar Song", Artist: "Test Artist", Duration: 240.0,
-				}
-
-				setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{wrongDuration, correctMatch})
-
-				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
-
-				Expect(err).ToNot(HaveOccurred())
-				Expect(songs).To(HaveLen(1))
-				Expect(songs[0].ID).To(Equal("correct"))
-			})
-
-			It("matches tracks with close duration", func() {
-				// Agent returns song with duration 180000ms (180 seconds)
-				returnedSongs := []agents.Song{
-					{Name: "Similar Song", Artist: "Test Artist", Duration: 180000},
-				}
-				// Library has track with 182.5 seconds (close to target)
-				closeDuration := model.MediaFile{
-					ID: "close-duration", Title: "Similar Song", Artist: "Test Artist", Duration: 182.5,
-				}
-
-				setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{closeDuration})
-
-				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
-
-				Expect(err).ToNot(HaveOccurred())
-				Expect(songs).To(HaveLen(1))
-				Expect(songs[0].ID).To(Equal("close-duration"))
-			})
-
-			It("prefers closer duration over farther duration", func() {
-				// Agent returns song with duration 180000ms (180 seconds)
-				returnedSongs := []agents.Song{
-					{Name: "Similar Song", Artist: "Test Artist", Duration: 180000},
-				}
-				// Library has one close, one far
-				closeDuration := model.MediaFile{
-					ID: "close", Title: "Similar Song", Artist: "Test Artist", Duration: 181.0,
-				}
-				farDuration := model.MediaFile{
-					ID: "far", Title: "Similar Song", Artist: "Test Artist", Duration: 190.0,
-				}
-
-				setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{farDuration, closeDuration})
-
-				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
-
-				Expect(err).ToNot(HaveOccurred())
-				Expect(songs).To(HaveLen(1))
-				Expect(songs[0].ID).To(Equal("close"))
-			})
-
-			It("still matches when no tracks have matching duration", func() {
-				// Agent returns song with duration 180000ms
-				returnedSongs := []agents.Song{
-					{Name: "Similar Song", Artist: "Test Artist", Duration: 180000},
-				}
-				// Library only has tracks with very different duration
-				differentDuration := model.MediaFile{
-					ID: "different", Title: "Similar Song", Artist: "Test Artist", Duration: 300.0,
-				}
-
-				setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{differentDuration})
-
-				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
-
-				Expect(err).ToNot(HaveOccurred())
-				// Duration mismatch doesn't exclude the track; it's just scored lower
-				Expect(songs).To(HaveLen(1))
-				Expect(songs[0].ID).To(Equal("different"))
-			})
-
-			It("prefers title match over duration match when titles differ", func() {
-				// Agent returns "Similar Song" with duration 180000ms
-				returnedSongs := []agents.Song{
-					{Name: "Similar Song", Artist: "Test Artist", Duration: 180000},
-				}
-				// Library has:
-				// - differentTitle: matches duration but has different title (won't pass title threshold)
-				// - correctTitle: doesn't match duration but has correct title (wins on title similarity)
-				differentTitle := model.MediaFile{
-					ID: "wrong-title", Title: "Different Song", Artist: "Test Artist", Duration: 180.0,
-				}
-				correctTitle := model.MediaFile{
-					ID: "correct-title", Title: "Similar Song", Artist: "Test Artist", Duration: 300.0,
-				}
-
-				setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{differentTitle, correctTitle})
-
-				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
-
-				Expect(err).ToNot(HaveOccurred())
-				// Title similarity is the top priority, so the correct title wins despite duration mismatch
-				Expect(songs).To(HaveLen(1))
-				Expect(songs[0].ID).To(Equal("correct-title"))
-			})
-		})
-
-		Context("when agent does not provide duration", func() {
-			It("matches without duration filtering (duration=0)", func() {
-				// Agent returns song without duration
-				returnedSongs := []agents.Song{
-					{Name: "Similar Song", Artist: "Test Artist", Duration: 0},
-				}
-				// Library tracks with various durations should all be candidates
-				anyTrack := model.MediaFile{
-					ID: "any", Title: "Similar Song", Artist: "Test Artist", Duration: 999.0,
-				}
-
-				setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{anyTrack})
-
-				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
-
-				Expect(err).ToNot(HaveOccurred())
-				Expect(songs).To(HaveLen(1))
-				Expect(songs[0].ID).To(Equal("any"))
-			})
-		})
-
-		Context("edge cases", func() {
-			It("handles very short songs with close duration", func() {
-				// 30-second song with 1-second difference
-				returnedSongs := []agents.Song{
-					{Name: "Short Song", Artist: "Test Artist", Duration: 30000},
-				}
-				shortTrack := model.MediaFile{
-					ID: "short", Title: "Short Song", Artist: "Test Artist", Duration: 31.0,
-				}
-
-				setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{shortTrack})
-
-				songs, err := provider.SimilarSongs(ctx, "track-1", 5)
-
-				Expect(err).ToNot(HaveOccurred())
-				Expect(songs).To(HaveLen(1))
-				Expect(songs[0].ID).To(Equal("short"))
-			})
-		})
-	})
-
-	Describe("Deduplication of mismatched songs", func() {
-		var track model.MediaFile
-
-		BeforeEach(func() {
-			DeferCleanup(configtest.SetupConfig())
-			conf.Server.SimilarSongsMatchThreshold = 85 // Allow fuzzy matching
-
-			track = model.MediaFile{ID: "track-1", Title: "Test Track", Artist: "Test Artist"}
-
-			// Setup for GetEntityByID to return the track
-			artistRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once()
-			albumRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once()
-			mediaFileRepo.On("Get", "track-1").Return(&track, nil).Once()
-		})
-
-		It("removes duplicates when different input songs match the same library track", func() {
-			// Agent returns two different versions that will both fuzzy-match to the same library track
-			returnedSongs := []agents.Song{
-				{Name: "Bohemian Rhapsody (Live)", Artist: "Queen"},
-				{Name: "Bohemian Rhapsody (Original Mix)", Artist: "Queen"},
-			}
-			// Library only has one version
-			libraryTrack := model.MediaFile{
-				ID: "br-live", Title: "Bohemian Rhapsody (Live)", Artist: "Queen",
-			}
-
-			setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{libraryTrack})
-
-			songs, err := provider.SimilarSongs(ctx, "track-1", 5)
-
-			Expect(err).ToNot(HaveOccurred())
-			// Should only return one track, not two duplicates
-			Expect(songs).To(HaveLen(1))
-			Expect(songs[0].ID).To(Equal("br-live"))
-		})
-
-		It("preserves duplicates when identical input songs match the same library track", func() {
-			// Agent returns the exact same song twice (intentional repetition)
-			returnedSongs := []agents.Song{
-				{Name: "Bohemian Rhapsody", Artist: "Queen", Album: "A Night at the Opera"},
-				{Name: "Bohemian Rhapsody", Artist: "Queen", Album: "A Night at the Opera"},
-			}
-			// Library has matching track
-			libraryTrack := model.MediaFile{
-				ID: "br", Title: "Bohemian Rhapsody", Artist: "Queen", Album: "A Night at the Opera",
-			}
-
-			setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{libraryTrack})
-
-			songs, err := provider.SimilarSongs(ctx, "track-1", 5)
-
-			Expect(err).ToNot(HaveOccurred())
-			// Should return two tracks since input songs were identical
-			Expect(songs).To(HaveLen(2))
-			Expect(songs[0].ID).To(Equal("br"))
-			Expect(songs[1].ID).To(Equal("br"))
-		})
-
-		It("handles mixed scenario with both identical and different input songs", func() {
-			// Agent returns: Song A, Song B (different from A), Song A again (same as first)
-			// All three match to the same library track
-			returnedSongs := []agents.Song{
-				{Name: "Yesterday", Artist: "The Beatles", Album: "Help!"},
-				{Name: "Yesterday (Remastered)", Artist: "The Beatles", Album: "1"},        // Different version
-				{Name: "Yesterday", Artist: "The Beatles", Album: "Help!"},                 // Same as first
-				{Name: "Yesterday (Anthology)", Artist: "The Beatles", Album: "Anthology"}, // Another different version
-			}
-			// Library only has one version
-			libraryTrack := model.MediaFile{
-				ID: "yesterday", Title: "Yesterday", Artist: "The Beatles", Album: "Help!",
-			}
-
-			setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{libraryTrack})
-
-			songs, err := provider.SimilarSongs(ctx, "track-1", 5)
-
-			Expect(err).ToNot(HaveOccurred())
-			// Should return 2 tracks:
-			// 1. First "Yesterday" (original)
-			// 2. Third "Yesterday" (same as first, so kept)
-			// Skip: Second "Yesterday (Remastered)" (different input, same library track)
-			// Skip: Fourth "Yesterday (Anthology)" (different input, same library track)
-			Expect(songs).To(HaveLen(2))
-			Expect(songs[0].ID).To(Equal("yesterday"))
-			Expect(songs[1].ID).To(Equal("yesterday"))
-		})
-
-		It("does not deduplicate songs that match different library tracks", func() {
-			// Agent returns different songs that match different library tracks
-			returnedSongs := []agents.Song{
-				{Name: "Song A", Artist: "Artist"},
-				{Name: "Song B", Artist: "Artist"},
-				{Name: "Song C", Artist: "Artist"},
-			}
-			// Library has all three songs
-			trackA := model.MediaFile{ID: "track-a", Title: "Song A", Artist: "Artist"}
-			trackB := model.MediaFile{ID: "track-b", Title: "Song B", Artist: "Artist"}
-			trackC := model.MediaFile{ID: "track-c", Title: "Song C", Artist: "Artist"}
-
-			setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{trackA, trackB, trackC})
-
-			songs, err := provider.SimilarSongs(ctx, "track-1", 5)
-
-			Expect(err).ToNot(HaveOccurred())
-			// All three should be returned since they match different library tracks
-			Expect(songs).To(HaveLen(3))
-			Expect(songs[0].ID).To(Equal("track-a"))
-			Expect(songs[1].ID).To(Equal("track-b"))
-			Expect(songs[2].ID).To(Equal("track-c"))
-		})
-
-		It("respects count limit after deduplication", func() {
-			// Agent returns 4 songs: 2 unique + 2 that would create duplicates
-			returnedSongs := []agents.Song{
-				{Name: "Song A", Artist: "Artist"},
-				{Name: "Song A (Live)", Artist: "Artist"}, // Different, matches same track
-				{Name: "Song B", Artist: "Artist"},
-				{Name: "Song B (Remix)", Artist: "Artist"}, // Different, matches same track
-			}
-			trackA := model.MediaFile{ID: "track-a", Title: "Song A", Artist: "Artist"}
-			trackB := model.MediaFile{ID: "track-b", Title: "Song B", Artist: "Artist"}
-
-			setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{trackA, trackB})
-
-			// Request only 2 songs
-			songs, err := provider.SimilarSongs(ctx, "track-1", 2)
-
-			Expect(err).ToNot(HaveOccurred())
-			// Should return exactly 2: Song A and Song B (skipping duplicates)
-			Expect(songs).To(HaveLen(2))
-			Expect(songs[0].ID).To(Equal("track-a"))
-			Expect(songs[1].ID).To(Equal("track-b"))
-		})
-	})
 })

core/metrics/insights.go

@@ -215,7 +215,6 @@ var staticData = sync.OnceValue(func() insights.Data {
 	data.Config.BackupCount = conf.Server.Backup.Count
 	data.Config.DevActivityPanel = conf.Server.DevActivityPanel
 	data.Config.ScannerEnabled = conf.Server.Scanner.Enabled
-	data.Config.ScannerExtractor = conf.Server.Scanner.Extractor
 	data.Config.ScanSchedule = conf.Server.Scanner.Schedule
 	data.Config.ScanWatcherWait = uint64(math.Trunc(conf.Server.Scanner.WatcherWait.Seconds()))
 	data.Config.ScanOnStartup = conf.Server.Scanner.ScanOnStartup

core/metrics/insights/data.go

@@ -47,7 +47,6 @@ type Data struct {
 		LogFileConfigured       bool   `json:"logFileConfigured,omitempty"`
 		TLSConfigured           bool   `json:"tlsConfigured,omitempty"`
 		ScannerEnabled          bool   `json:"scannerEnabled,omitempty"`
-		ScannerExtractor        string `json:"scannerExtractor,omitempty"`
 		ScanSchedule            string `json:"scanSchedule,omitempty"`
 		ScanWatcherWait         uint64 `json:"scanWatcherWait,omitempty"`
 		ScanOnStartup           bool   `json:"scanOnStartup,omitempty"`

core/transcode_decision.go

@@ -1,663 +0,0 @@
-package core
-
-import (
-	"context"
-	"slices"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/navidrome/navidrome/core/auth"
-	"github.com/navidrome/navidrome/model"
-)
-
-const (
-	transcodeTokenTTL       = 12 * time.Hour
-	defaultTranscodeBitrate = 256 // kbps
-)
-
-// TranscodeDecision is the core service interface for making transcoding decisions
-type TranscodeDecision interface {
-	MakeDecision(ctx context.Context, mf *model.MediaFile, clientInfo *ClientInfo) (*Decision, error)
-	CreateToken(decision *Decision) (string, error)
-	ParseToken(token string) (*TranscodeParams, error)
-}
-
-// ClientInfo represents client playback capabilities.
-// All bitrate values are in kilobits per second (kbps), matching Navidrome conventions.
-type ClientInfo struct {
-	Name                       string
-	Platform                   string
-	MaxAudioBitrate            int
-	MaxTranscodingAudioBitrate int
-	DirectPlayProfiles         []DirectPlayProfile
-	TranscodingProfiles        []TranscodingProfile
-	CodecProfiles              []CodecProfile
-}
-
-// DirectPlayProfile describes a format the client can play directly
-type DirectPlayProfile struct {
-	Containers       []string
-	AudioCodecs      []string
-	Protocols        []string
-	MaxAudioChannels int
-}
-
-// TranscodingProfile describes a transcoding target the client supports
-type TranscodingProfile struct {
-	Container        string
-	AudioCodec       string
-	Protocol         string
-	MaxAudioChannels int
-}
-
-// CodecProfile describes codec-specific limitations
-type CodecProfile struct {
-	Type        string
-	Name        string
-	Limitations []Limitation
-}
-
-// Limitation describes a specific codec limitation
-type Limitation struct {
-	Name       string
-	Comparison string
-	Values     []string
-	Required   bool
-}
-
-// Protocol values (OpenSubsonic spec enum)
-const (
-	ProtocolHTTP = "http"
-	ProtocolHLS  = "hls"
-)
-
-// Comparison operators (OpenSubsonic spec enum)
-const (
-	ComparisonEquals           = "Equals"
-	ComparisonNotEquals        = "NotEquals"
-	ComparisonLessThanEqual    = "LessThanEqual"
-	ComparisonGreaterThanEqual = "GreaterThanEqual"
-)
-
-// Limitation names (OpenSubsonic spec enum)
-const (
-	LimitationAudioChannels   = "audioChannels"
-	LimitationAudioBitrate    = "audioBitrate"
-	LimitationAudioProfile    = "audioProfile"
-	LimitationAudioSamplerate = "audioSamplerate"
-	LimitationAudioBitdepth   = "audioBitdepth"
-)
-
-// Codec profile types (OpenSubsonic spec enum)
-const (
-	CodecProfileTypeAudio = "AudioCodec"
-)
-
-// Decision represents the internal decision result.
-// All bitrate values are in kilobits per second (kbps).
-type Decision struct {
-	MediaID          string
-	CanDirectPlay    bool
-	CanTranscode     bool
-	TranscodeReasons []string
-	ErrorReason      string
-	TargetFormat     string
-	TargetBitrate    int
-	TargetChannels   int
-	SourceStream     StreamDetails
-	TranscodeStream  *StreamDetails
-}
-
-// StreamDetails describes audio stream properties.
-// Bitrate is in kilobits per second (kbps).
-type StreamDetails struct {
-	Container  string
-	Codec      string
-	Profile    string // Audio profile (e.g., "LC", "HE-AAC"). Empty until scanner support is added.
-	Bitrate    int
-	SampleRate int
-	BitDepth   int
-	Channels   int
-	Duration   float32
-	Size       int64
-	IsLossless bool
-}
-
-// TranscodeParams contains the parameters extracted from a transcode token.
-// TargetBitrate is in kilobits per second (kbps).
-type TranscodeParams struct {
-	MediaID        string
-	DirectPlay     bool
-	TargetFormat   string
-	TargetBitrate  int
-	TargetChannels int
-}
-
-func NewTranscodeDecision(ds model.DataStore) TranscodeDecision {
-	return &transcodeDecisionService{
-		ds: ds,
-	}
-}
-
-type transcodeDecisionService struct {
-	ds model.DataStore
-}
-
-func (s *transcodeDecisionService) MakeDecision(ctx context.Context, mf *model.MediaFile, clientInfo *ClientInfo) (*Decision, error) {
-	decision := &Decision{
-		MediaID: mf.ID,
-	}
-
-	sourceBitrate := mf.BitRate // kbps
-
-	// Build source stream details
-	decision.SourceStream = StreamDetails{
-		Container:  mf.Suffix,
-		Codec:      mf.AudioCodec(),
-		Bitrate:    sourceBitrate,
-		SampleRate: mf.SampleRate,
-		BitDepth:   mf.BitDepth,
-		Channels:   mf.Channels,
-		Duration:   mf.Duration,
-		Size:       mf.Size,
-		IsLossless: mf.IsLossless(),
-	}
-
-	// Check global bitrate constraint first.
-	if clientInfo.MaxAudioBitrate > 0 && sourceBitrate > clientInfo.MaxAudioBitrate {
-		decision.TranscodeReasons = append(decision.TranscodeReasons, "audio bitrate not supported")
-		// Skip direct play profiles entirely — global constraint fails
-	} else {
-		// Try direct play profiles, collecting reasons for each failure
-		for _, profile := range clientInfo.DirectPlayProfiles {
-			if reason := s.checkDirectPlayProfile(mf, sourceBitrate, &profile, clientInfo); reason == "" {
-				decision.CanDirectPlay = true
-				decision.TranscodeReasons = nil // Clear any previously collected reasons
-				break
-			} else {
-				decision.TranscodeReasons = append(decision.TranscodeReasons, reason)
-			}
-		}
-	}
-
-	// If direct play is possible, we're done
-	if decision.CanDirectPlay {
-		return decision, nil
-	}
-
-	// Try transcoding profiles (in order of preference)
-	for _, profile := range clientInfo.TranscodingProfiles {
-		if ts := s.computeTranscodedStream(ctx, mf, sourceBitrate, &profile, clientInfo); ts != nil {
-			decision.CanTranscode = true
-			decision.TargetFormat = ts.Container
-			decision.TargetBitrate = ts.Bitrate
-			decision.TargetChannels = ts.Channels
-			decision.TranscodeStream = ts
-			break
-		}
-	}
-
-	// If neither direct play nor transcode is possible
-	if !decision.CanDirectPlay && !decision.CanTranscode {
-		decision.ErrorReason = "no compatible playback profile found"
-	}
-
-	return decision, nil
-}
-
-// checkDirectPlayProfile returns "" if the profile matches (direct play OK),
-// or a typed reason string if it doesn't match.
-func (s *transcodeDecisionService) checkDirectPlayProfile(mf *model.MediaFile, sourceBitrate int, profile *DirectPlayProfile, clientInfo *ClientInfo) string {
-	// Check protocol (only http for now)
-	if len(profile.Protocols) > 0 && !containsIgnoreCase(profile.Protocols, ProtocolHTTP) {
-		return "protocol not supported"
-	}
-
-	// Check container
-	if len(profile.Containers) > 0 && !matchesContainer(mf.Suffix, profile.Containers) {
-		return "container not supported"
-	}
-
-	// Check codec
-	if len(profile.AudioCodecs) > 0 && !matchesCodec(mf.AudioCodec(), profile.AudioCodecs) {
-		return "audio codec not supported"
-	}
-
-	// Check channels
-	if profile.MaxAudioChannels > 0 && mf.Channels > profile.MaxAudioChannels {
-		return "audio channels not supported"
-	}
-
-	// Check codec-specific limitations
-	for _, codecProfile := range clientInfo.CodecProfiles {
-		if strings.EqualFold(codecProfile.Type, CodecProfileTypeAudio) && matchesCodec(mf.AudioCodec(), []string{codecProfile.Name}) {
-			if reason := checkLimitations(mf, sourceBitrate, codecProfile.Limitations); reason != "" {
-				return reason
-			}
-		}
-	}
-
-	return ""
-}
-
-// checkLimitations checks codec profile limitations against source media.
-// Returns "" if all limitations pass, or a typed reason string for the first failure.
-func checkLimitations(mf *model.MediaFile, sourceBitrate int, limitations []Limitation) string {
-	for _, lim := range limitations {
-		var ok bool
-		var reason string
-
-		switch lim.Name {
-		case LimitationAudioChannels:
-			ok = checkIntLimitation(mf.Channels, lim.Comparison, lim.Values)
-			reason = "audio channels not supported"
-		case LimitationAudioSamplerate:
-			ok = checkIntLimitation(mf.SampleRate, lim.Comparison, lim.Values)
-			reason = "audio samplerate not supported"
-		case LimitationAudioBitrate:
-			ok = checkIntLimitation(sourceBitrate, lim.Comparison, lim.Values)
-			reason = "audio bitrate not supported"
-		case LimitationAudioBitdepth:
-			ok = checkIntLimitation(mf.BitDepth, lim.Comparison, lim.Values)
-			reason = "audio bitdepth not supported"
-		case LimitationAudioProfile:
-			// TODO: populate source profile when MediaFile has audio profile info
-			ok = checkStringLimitation("", lim.Comparison, lim.Values)
-			reason = "audio profile not supported"
-		default:
-			continue
-		}
-
-		if !ok && lim.Required {
-			return reason
-		}
-	}
-	return ""
-}
-
-// adjustResult represents the outcome of applying a limitation to a transcoded stream value
-type adjustResult int
-
-const (
-	adjustNone      adjustResult = iota // Value already satisfies the limitation
-	adjustAdjusted                      // Value was changed to fit the limitation
-	adjustCannotFit                     // Cannot satisfy the limitation (reject this profile)
-)
-
-// computeTranscodedStream attempts to build a valid transcoded stream for the given profile.
-// Returns nil if the profile cannot produce a valid output.
-func (s *transcodeDecisionService) computeTranscodedStream(ctx context.Context, mf *model.MediaFile, sourceBitrate int, profile *TranscodingProfile, clientInfo *ClientInfo) *StreamDetails {
-	// Check protocol (only http for now)
-	if profile.Protocol != "" && !strings.EqualFold(profile.Protocol, ProtocolHTTP) {
-		return nil
-	}
-
-	targetFormat := strings.ToLower(profile.Container)
-	if targetFormat == "" {
-		targetFormat = strings.ToLower(profile.AudioCodec)
-	}
-
-	// Verify we have a transcoding config for this format
-	tc, err := s.ds.Transcoding(ctx).FindByFormat(targetFormat)
-	if err != nil || tc == nil {
-		return nil
-	}
-
-	targetIsLossless := isLosslessFormat(targetFormat)
-
-	// Reject lossy to lossless conversion
-	if !mf.IsLossless() && targetIsLossless {
-		return nil
-	}
-
-	ts := &StreamDetails{
-		Container:  targetFormat,
-		Codec:      strings.ToLower(profile.AudioCodec),
-		SampleRate: mf.SampleRate,
-		Channels:   mf.Channels,
-		IsLossless: targetIsLossless,
-	}
-	if ts.Codec == "" {
-		ts.Codec = targetFormat
-	}
-
-	// Determine target bitrate (all in kbps)
-	if mf.IsLossless() {
-		if !targetIsLossless {
-			// Lossless to lossy: use client's max transcoding bitrate or default
-			if clientInfo.MaxTranscodingAudioBitrate > 0 {
-				ts.Bitrate = clientInfo.MaxTranscodingAudioBitrate
-			} else {
-				ts.Bitrate = defaultTranscodeBitrate
-			}
-		} else {
-			// Lossless to lossless: check if bitrate is under the global max
-			if clientInfo.MaxAudioBitrate > 0 && sourceBitrate > clientInfo.MaxAudioBitrate {
-				return nil // Cannot guarantee bitrate within limit for lossless
-			}
-			// No explicit bitrate for lossless target (leave 0)
-		}
-	} else {
-		// Lossy to lossy: preserve source bitrate
-		ts.Bitrate = sourceBitrate
-	}
-
-	// Apply maxAudioBitrate as final cap on transcoded stream (#5)
-	if clientInfo.MaxAudioBitrate > 0 && ts.Bitrate > 0 && ts.Bitrate > clientInfo.MaxAudioBitrate {
-		ts.Bitrate = clientInfo.MaxAudioBitrate
-	}
-
-	// Apply MaxAudioChannels from the transcoding profile
-	if profile.MaxAudioChannels > 0 && mf.Channels > profile.MaxAudioChannels {
-		ts.Channels = profile.MaxAudioChannels
-	}
-
-	// Apply codec profile limitations to the TARGET codec (#4)
-	targetCodec := ts.Codec
-	for _, codecProfile := range clientInfo.CodecProfiles {
-		if !strings.EqualFold(codecProfile.Type, CodecProfileTypeAudio) {
-			continue
-		}
-		if !matchesCodec(targetCodec, []string{codecProfile.Name}) {
-			continue
-		}
-		for _, lim := range codecProfile.Limitations {
-			result := applyLimitation(sourceBitrate, &lim, ts)
-			// For lossless codecs, adjusting bitrate is not valid
-			if strings.EqualFold(lim.Name, LimitationAudioBitrate) && targetIsLossless && result == adjustAdjusted {
-				return nil
-			}
-			if result == adjustCannotFit {
-				return nil
-			}
-		}
-	}
-
-	return ts
-}
-
-// applyLimitation adjusts a transcoded stream parameter to satisfy the limitation.
-// Returns the adjustment result.
-func applyLimitation(sourceBitrate int, lim *Limitation, ts *StreamDetails) adjustResult {
-	switch lim.Name {
-	case LimitationAudioChannels:
-		return applyIntLimitation(lim.Comparison, lim.Values, ts.Channels, func(v int) { ts.Channels = v })
-	case LimitationAudioBitrate:
-		current := ts.Bitrate
-		if current == 0 {
-			current = sourceBitrate
-		}
-		return applyIntLimitation(lim.Comparison, lim.Values, current, func(v int) { ts.Bitrate = v })
-	case LimitationAudioSamplerate:
-		return applyIntLimitation(lim.Comparison, lim.Values, ts.SampleRate, func(v int) { ts.SampleRate = v })
-	case LimitationAudioBitdepth:
-		if ts.BitDepth > 0 {
-			return applyIntLimitation(lim.Comparison, lim.Values, ts.BitDepth, func(v int) { ts.BitDepth = v })
-		}
-	case LimitationAudioProfile:
-		// TODO: implement when audio profile data is available
-	}
-	return adjustNone
-}
-
-// applyIntLimitation applies a limitation comparison to a value.
-// If the value needs adjusting, calls the setter and returns the result.
-func applyIntLimitation(comparison string, values []string, current int, setter func(int)) adjustResult {
-	if len(values) == 0 {
-		return adjustNone
-	}
-
-	switch comparison {
-	case ComparisonLessThanEqual:
-		limit, ok := parseInt(values[0])
-		if !ok {
-			return adjustNone
-		}
-		if current <= limit {
-			return adjustNone
-		}
-		setter(limit)
-		return adjustAdjusted
-	case ComparisonGreaterThanEqual:
-		limit, ok := parseInt(values[0])
-		if !ok {
-			return adjustNone
-		}
-		if current >= limit {
-			return adjustNone
-		}
-		// Cannot upscale
-		return adjustCannotFit
-	case ComparisonEquals:
-		// Check if current value matches any allowed value
-		for _, v := range values {
-			if limit, ok := parseInt(v); ok && current == limit {
-				return adjustNone
-			}
-		}
-		// Find the closest allowed value below current (don't upscale)
-		var closest int
-		found := false
-		for _, v := range values {
-			if limit, ok := parseInt(v); ok && limit < current {
-				if !found || limit > closest {
-					closest = limit
-					found = true
-				}
-			}
-		}
-		if found {
-			setter(closest)
-			return adjustAdjusted
-		}
-		return adjustCannotFit
-	case ComparisonNotEquals:
-		for _, v := range values {
-			if limit, ok := parseInt(v); ok && current == limit {
-				return adjustCannotFit
-			}
-		}
-		return adjustNone
-	}
-
-	return adjustNone
-}
-
-func (s *transcodeDecisionService) CreateToken(decision *Decision) (string, error) {
-	exp := time.Now().Add(transcodeTokenTTL)
-	claims := map[string]any{
-		"mid": decision.MediaID,
-		"dp":  decision.CanDirectPlay,
-	}
-	if decision.CanTranscode && decision.TargetFormat != "" {
-		claims["fmt"] = decision.TargetFormat
-		claims["br"] = decision.TargetBitrate
-		if decision.TargetChannels > 0 {
-			claims["ch"] = decision.TargetChannels
-		}
-	}
-	return auth.CreateExpiringPublicToken(exp, claims)
-}
-
-func (s *transcodeDecisionService) ParseToken(token string) (*TranscodeParams, error) {
-	claims, err := auth.Validate(token)
-	if err != nil {
-		return nil, err
-	}
-
-	params := &TranscodeParams{}
-	if mid, ok := claims["mid"].(string); ok {
-		params.MediaID = mid
-	}
-	if dp, ok := claims["dp"].(bool); ok {
-		params.DirectPlay = dp
-	}
-	if fmt, ok := claims["fmt"].(string); ok {
-		params.TargetFormat = fmt
-	}
-	if br, ok := claims["br"].(float64); ok {
-		params.TargetBitrate = int(br)
-	}
-	if ch, ok := claims["ch"].(float64); ok {
-		params.TargetChannels = int(ch)
-	}
-
-	return params, nil
-}
-
-func containsIgnoreCase(slice []string, s string) bool {
-	return slices.ContainsFunc(slice, func(item string) bool {
-		return strings.EqualFold(item, s)
-	})
-}
-
-// containerAliasGroups maps each container alias to a canonical group name.
-var containerAliasGroups = func() map[string]string {
-	groups := [][]string{
-		{"aac", "adts", "m4a", "mp4", "m4b", "m4p"},
-		{"mpeg", "mp3", "mp2"},
-		{"ogg", "oga"},
-		{"aif", "aiff"},
-		{"asf", "wma"},
-		{"mpc", "mpp"},
-		{"wv"},
-	}
-	m := make(map[string]string)
-	for _, g := range groups {
-		canonical := g[0]
-		for _, name := range g {
-			m[name] = canonical
-		}
-	}
-	return m
-}()
-
-// matchesWithAliases checks if a value matches any entry in candidates,
-// consulting the alias map for equivalent names.
-func matchesWithAliases(value string, candidates []string, aliases map[string]string) bool {
-	value = strings.ToLower(value)
-	canonical := aliases[value]
-	for _, c := range candidates {
-		c = strings.ToLower(c)
-		if c == value {
-			return true
-		}
-		if canonical != "" && aliases[c] == canonical {
-			return true
-		}
-	}
-	return false
-}
-
-// matchesContainer checks if a file suffix matches any of the container names,
-// including common aliases.
-func matchesContainer(suffix string, containers []string) bool {
-	return matchesWithAliases(suffix, containers, containerAliasGroups)
-}
-
-// codecAliasGroups maps each codec alias to a canonical group name.
-// Codecs within the same group are considered equivalent.
-var codecAliasGroups = func() map[string]string {
-	groups := [][]string{
-		{"aac", "adts"},
-		{"ac3", "ac-3"},
-		{"eac3", "e-ac3", "e-ac-3", "eac-3"},
-		{"mpc7", "musepack7"},
-		{"mpc8", "musepack8"},
-		{"wma1", "wmav1"},
-		{"wma2", "wmav2"},
-		{"wmalossless", "wma9lossless"},
-		{"wmapro", "wma9pro"},
-		{"shn", "shorten"},
-		{"mp4als", "als"},
-	}
-	m := make(map[string]string)
-	for _, g := range groups {
-		for _, name := range g {
-			m[name] = g[0] // canonical = first entry
-		}
-	}
-	return m
-}()
-
-// matchesCodec checks if a codec matches any of the codec names,
-// including common aliases.
-func matchesCodec(codec string, codecs []string) bool {
-	return matchesWithAliases(codec, codecs, codecAliasGroups)
-}
-
-func checkIntLimitation(value int, comparison string, values []string) bool {
-	if len(values) == 0 {
-		return true
-	}
-
-	switch comparison {
-	case ComparisonLessThanEqual:
-		limit, ok := parseInt(values[0])
-		if !ok {
-			return true
-		}
-		return value <= limit
-	case ComparisonGreaterThanEqual:
-		limit, ok := parseInt(values[0])
-		if !ok {
-			return true
-		}
-		return value >= limit
-	case ComparisonEquals:
-		for _, v := range values {
-			if limit, ok := parseInt(v); ok && value == limit {
-				return true
-			}
-		}
-		return false
-	case ComparisonNotEquals:
-		for _, v := range values {
-			if limit, ok := parseInt(v); ok && value == limit {
-				return false
-			}
-		}
-		return true
-	}
-	return true
-}
-
-// checkStringLimitation checks a string value against a limitation.
-// Only Equals and NotEquals comparisons are meaningful for strings.
-// LessThanEqual/GreaterThanEqual are not applicable and always pass.
-func checkStringLimitation(value string, comparison string, values []string) bool {
-	switch comparison {
-	case ComparisonEquals:
-		for _, v := range values {
-			if strings.EqualFold(value, v) {
-				return true
-			}
-		}
-		return false
-	case ComparisonNotEquals:
-		for _, v := range values {
-			if strings.EqualFold(value, v) {
-				return false
-			}
-		}
-		return true
-	}
-	return true
-}
-
-func parseInt(s string) (int, bool) {
-	v, err := strconv.Atoi(s)
-	if err != nil || v < 0 {
-		return 0, false
-	}
-	return v, true
-}
-
-func isLosslessFormat(format string) bool {
-	switch strings.ToLower(format) {
-	case "flac", "alac", "wav", "aiff", "ape", "wv", "tta", "tak", "shn", "dsd":
-		return true
-	}
-	return false
-}

core/transcode_decision_test.go

@@ -1,657 +0,0 @@
-package core
-
-import (
-	"context"
-
-	"github.com/navidrome/navidrome/core/auth"
-	"github.com/navidrome/navidrome/model"
-	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("TranscodeDecision", func() {
-	var (
-		ds  *tests.MockDataStore
-		svc TranscodeDecision
-		ctx context.Context
-	)
-
-	BeforeEach(func() {
-		ctx = context.Background()
-		ds = &tests.MockDataStore{
-			MockedProperty:    &tests.MockedPropertyRepo{},
-			MockedTranscoding: &tests.MockTranscodingRepo{},
-		}
-		auth.Init(ds)
-		svc = NewTranscodeDecision(ds)
-	})
-
-	Describe("MakeDecision", func() {
-		Context("Direct Play", func() {
-			It("allows direct play when profile matches", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "mp3", Codec: "MP3", BitRate: 320, Channels: 2, SampleRate: 44100}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"mp3"}, AudioCodecs: []string{"mp3"}, Protocols: []string{"http"}, MaxAudioChannels: 2},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeTrue())
-				Expect(decision.CanTranscode).To(BeFalse())
-				Expect(decision.TranscodeReasons).To(BeEmpty())
-			})
-
-			It("rejects direct play when container doesn't match", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 2}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"mp3"}, Protocols: []string{"http"}},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeFalse())
-				Expect(decision.TranscodeReasons).To(ContainElement("container not supported"))
-			})
-
-			It("rejects direct play when codec doesn't match", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "m4a", Codec: "ALAC", BitRate: 1000, Channels: 2}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"m4a"}, AudioCodecs: []string{"aac"}, Protocols: []string{"http"}},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeFalse())
-				Expect(decision.TranscodeReasons).To(ContainElement("audio codec not supported"))
-			})
-
-			It("rejects direct play when channels exceed limit", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 6}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"flac"}, Protocols: []string{"http"}, MaxAudioChannels: 2},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeFalse())
-				Expect(decision.TranscodeReasons).To(ContainElement("audio channels not supported"))
-			})
-
-			It("handles container aliases (aac -> m4a)", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "m4a", Codec: "AAC", BitRate: 256, Channels: 2}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"aac"}, AudioCodecs: []string{"aac"}, Protocols: []string{"http"}},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeTrue())
-			})
-
-			It("handles container aliases (mp4 -> m4a)", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "m4a", Codec: "AAC", BitRate: 256, Channels: 2}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"mp4"}, AudioCodecs: []string{"aac"}, Protocols: []string{"http"}},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeTrue())
-			})
-
-			It("handles codec aliases (adts -> aac)", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "m4a", Codec: "AAC", BitRate: 256, Channels: 2}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"m4a"}, AudioCodecs: []string{"adts"}, Protocols: []string{"http"}},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeTrue())
-			})
-
-			It("allows when protocol list is empty (any protocol)", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 2}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"flac"}, AudioCodecs: []string{"flac"}},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeTrue())
-			})
-
-			It("allows when both container and codec lists are empty (wildcard)", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "mp3", Codec: "MP3", BitRate: 128, Channels: 2}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{}, AudioCodecs: []string{}},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeTrue())
-			})
-		})
-
-		Context("MaxAudioBitrate constraint", func() {
-			It("revokes direct play when bitrate exceeds maxAudioBitrate", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1500, Channels: 2}
-				ci := &ClientInfo{
-					MaxAudioBitrate: 500, // kbps
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"flac"}, Protocols: []string{"http"}},
-					},
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "mp3", AudioCodec: "mp3", Protocol: "http"},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeFalse())
-				Expect(decision.CanTranscode).To(BeTrue())
-				Expect(decision.TranscodeReasons).To(ContainElement("audio bitrate not supported"))
-			})
-		})
-
-		Context("Transcoding", func() {
-			It("selects transcoding when direct play isn't possible", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 2, SampleRate: 44100, BitDepth: 16}
-				ci := &ClientInfo{
-					MaxTranscodingAudioBitrate: 256, // kbps
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"mp3"}, Protocols: []string{"http"}},
-					},
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "mp3", AudioCodec: "mp3", Protocol: "http", MaxAudioChannels: 2},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeFalse())
-				Expect(decision.CanTranscode).To(BeTrue())
-				Expect(decision.TargetFormat).To(Equal("mp3"))
-				Expect(decision.TargetBitrate).To(Equal(256)) // kbps
-				Expect(decision.TranscodeReasons).To(ContainElement("container not supported"))
-			})
-
-			It("rejects lossy to lossless transcoding", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "mp3", Codec: "MP3", BitRate: 320, Channels: 2}
-				ci := &ClientInfo{
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "flac", Protocol: "http"},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanTranscode).To(BeFalse())
-			})
-
-			It("uses default bitrate when client doesn't specify", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 2, BitDepth: 16}
-				ci := &ClientInfo{
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "mp3", Protocol: "http"},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanTranscode).To(BeTrue())
-				Expect(decision.TargetBitrate).To(Equal(defaultTranscodeBitrate)) // 256 kbps
-			})
-
-			It("preserves lossy bitrate when under max", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "ogg", BitRate: 192, Channels: 2}
-				ci := &ClientInfo{
-					MaxTranscodingAudioBitrate: 256, // kbps
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "mp3", Protocol: "http"},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanTranscode).To(BeTrue())
-				Expect(decision.TargetBitrate).To(Equal(192)) // source bitrate in kbps
-			})
-
-			It("rejects unsupported transcoding format", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 2}
-				ci := &ClientInfo{
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "aac", Protocol: "http"},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanTranscode).To(BeFalse())
-			})
-
-			It("applies maxAudioBitrate as final cap on transcoded stream", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "mp3", Codec: "MP3", BitRate: 320, Channels: 2}
-				ci := &ClientInfo{
-					MaxAudioBitrate: 96, // kbps
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "mp3", AudioCodec: "mp3", Protocol: "http"},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanTranscode).To(BeTrue())
-				Expect(decision.TargetBitrate).To(Equal(96)) // capped by maxAudioBitrate
-			})
-
-			It("selects first valid transcoding profile in order", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 2, SampleRate: 48000, BitDepth: 16}
-				ci := &ClientInfo{
-					MaxTranscodingAudioBitrate: 320,
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"mp3"}, Protocols: []string{"http"}},
-					},
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "opus", AudioCodec: "opus", Protocol: "http"},
-						{Container: "mp3", AudioCodec: "mp3", Protocol: "http", MaxAudioChannels: 2},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanTranscode).To(BeTrue())
-				Expect(decision.TargetFormat).To(Equal("opus"))
-			})
-		})
-
-		Context("Lossless to lossless transcoding", func() {
-			It("allows lossless to lossless when samplerate needs downsampling", func() {
-				// MockTranscodingRepo doesn't support "flac" format, so this would fail to find a config.
-				// This test documents the behavior: lossless→lossless requires server transcoding config.
-				mf := &model.MediaFile{ID: "1", Suffix: "dsf", Codec: "DSD", BitRate: 5644, Channels: 2, SampleRate: 176400, BitDepth: 1}
-				ci := &ClientInfo{
-					MaxAudioBitrate: 1000,
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"flac"}, Protocols: []string{"http"}},
-					},
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "mp3", AudioCodec: "mp3", Protocol: "http"},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanTranscode).To(BeTrue())
-				Expect(decision.TargetFormat).To(Equal("mp3"))
-			})
-
-			It("sets IsLossless=true on transcoded stream when target is lossless", func() {
-				// Simulate DSD→FLAC transcoding by using a mock that supports "flac"
-				mockTranscoding := &tests.MockTranscodingRepo{}
-				ds.MockedTranscoding = mockTranscoding
-				svc = NewTranscodeDecision(ds)
-
-				// MockTranscodingRepo doesn't support flac, so this will skip lossless profile.
-				// Use mp3 which is supported as the fallback.
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 2, SampleRate: 96000, BitDepth: 24}
-				ci := &ClientInfo{
-					MaxTranscodingAudioBitrate: 320,
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "mp3", AudioCodec: "mp3", Protocol: "http"},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanTranscode).To(BeTrue())
-				Expect(decision.TranscodeStream.IsLossless).To(BeFalse()) // mp3 is lossy
-			})
-		})
-
-		Context("No compatible profile", func() {
-			It("returns error when nothing matches", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 6}
-				ci := &ClientInfo{}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeFalse())
-				Expect(decision.CanTranscode).To(BeFalse())
-				Expect(decision.ErrorReason).To(Equal("no compatible playback profile found"))
-			})
-		})
-
-		Context("Codec limitations on direct play", func() {
-			It("rejects direct play when codec limitation fails (required)", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "mp3", Codec: "MP3", BitRate: 512, Channels: 2, SampleRate: 44100}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"mp3"}, AudioCodecs: []string{"mp3"}, Protocols: []string{"http"}},
-					},
-					CodecProfiles: []CodecProfile{
-						{
-							Type: CodecProfileTypeAudio,
-							Name: "mp3",
-							Limitations: []Limitation{
-								{Name: LimitationAudioBitrate, Comparison: ComparisonLessThanEqual, Values: []string{"320"}, Required: true},
-							},
-						},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeFalse())
-				Expect(decision.TranscodeReasons).To(ContainElement("audio bitrate not supported"))
-			})
-
-			It("allows direct play when optional limitation fails", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "mp3", Codec: "MP3", BitRate: 512, Channels: 2, SampleRate: 44100}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"mp3"}, AudioCodecs: []string{"mp3"}, Protocols: []string{"http"}},
-					},
-					CodecProfiles: []CodecProfile{
-						{
-							Type: CodecProfileTypeAudio,
-							Name: "mp3",
-							Limitations: []Limitation{
-								{Name: LimitationAudioBitrate, Comparison: ComparisonLessThanEqual, Values: []string{"320"}, Required: false},
-							},
-						},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeTrue())
-			})
-
-			It("handles Equals comparison with multiple values", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 2, SampleRate: 44100}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"flac"}, Protocols: []string{"http"}},
-					},
-					CodecProfiles: []CodecProfile{
-						{
-							Type: CodecProfileTypeAudio,
-							Name: "flac",
-							Limitations: []Limitation{
-								{Name: LimitationAudioChannels, Comparison: ComparisonEquals, Values: []string{"1", "2"}, Required: true},
-							},
-						},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeTrue())
-			})
-
-			It("rejects when Equals comparison doesn't match any value", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 6, SampleRate: 44100}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"flac"}, Protocols: []string{"http"}},
-					},
-					CodecProfiles: []CodecProfile{
-						{
-							Type: CodecProfileTypeAudio,
-							Name: "flac",
-							Limitations: []Limitation{
-								{Name: LimitationAudioChannels, Comparison: ComparisonEquals, Values: []string{"1", "2"}, Required: true},
-							},
-						},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeFalse())
-			})
-
-			It("rejects direct play when audioProfile limitation fails (required)", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "m4a", Codec: "AAC", BitRate: 256, Channels: 2, SampleRate: 44100}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"m4a"}, AudioCodecs: []string{"aac"}, Protocols: []string{"http"}},
-					},
-					CodecProfiles: []CodecProfile{
-						{
-							Type: CodecProfileTypeAudio,
-							Name: "aac",
-							Limitations: []Limitation{
-								{Name: LimitationAudioProfile, Comparison: ComparisonEquals, Values: []string{"LC"}, Required: true},
-							},
-						},
-					},
-				}
-				// Source profile is empty (not yet populated from scanner), so Equals("LC") fails
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeFalse())
-				Expect(decision.TranscodeReasons).To(ContainElement("audio profile not supported"))
-			})
-
-			It("allows direct play when audioProfile limitation is optional", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "m4a", Codec: "AAC", BitRate: 256, Channels: 2, SampleRate: 44100}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"m4a"}, AudioCodecs: []string{"aac"}, Protocols: []string{"http"}},
-					},
-					CodecProfiles: []CodecProfile{
-						{
-							Type: CodecProfileTypeAudio,
-							Name: "aac",
-							Limitations: []Limitation{
-								{Name: LimitationAudioProfile, Comparison: ComparisonEquals, Values: []string{"LC"}, Required: false},
-							},
-						},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeTrue())
-			})
-
-			It("rejects direct play due to samplerate limitation", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 2, SampleRate: 96000, BitDepth: 24}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"flac"}, Protocols: []string{"http"}},
-					},
-					CodecProfiles: []CodecProfile{
-						{
-							Type: CodecProfileTypeAudio,
-							Name: "flac",
-							Limitations: []Limitation{
-								{Name: LimitationAudioSamplerate, Comparison: ComparisonLessThanEqual, Values: []string{"48000"}, Required: true},
-							},
-						},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeFalse())
-				Expect(decision.TranscodeReasons).To(ContainElement("audio samplerate not supported"))
-			})
-		})
-
-		Context("Codec limitations on transcoded output", func() {
-			It("applies bitrate limitation to transcoded stream", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "mp3", Codec: "MP3", BitRate: 192, Channels: 2, SampleRate: 44100}
-				ci := &ClientInfo{
-					MaxAudioBitrate: 96, // force transcode
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "mp3", AudioCodec: "mp3", Protocol: "http"},
-					},
-					CodecProfiles: []CodecProfile{
-						{
-							Type: CodecProfileTypeAudio,
-							Name: "mp3",
-							Limitations: []Limitation{
-								{Name: LimitationAudioBitrate, Comparison: ComparisonLessThanEqual, Values: []string{"96"}, Required: true},
-							},
-						},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanTranscode).To(BeTrue())
-				Expect(decision.TranscodeStream.Bitrate).To(Equal(96))
-			})
-
-			It("applies channel limitation to transcoded stream", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 6, SampleRate: 48000, BitDepth: 16}
-				ci := &ClientInfo{
-					MaxTranscodingAudioBitrate: 320,
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "mp3", AudioCodec: "mp3", Protocol: "http"},
-					},
-					CodecProfiles: []CodecProfile{
-						{
-							Type: CodecProfileTypeAudio,
-							Name: "mp3",
-							Limitations: []Limitation{
-								{Name: LimitationAudioChannels, Comparison: ComparisonLessThanEqual, Values: []string{"2"}, Required: true},
-							},
-						},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanTranscode).To(BeTrue())
-				Expect(decision.TranscodeStream.Channels).To(Equal(2))
-			})
-
-			It("applies samplerate limitation to transcoded stream", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 2, SampleRate: 96000, BitDepth: 24}
-				ci := &ClientInfo{
-					MaxTranscodingAudioBitrate: 320,
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "mp3", AudioCodec: "mp3", Protocol: "http"},
-					},
-					CodecProfiles: []CodecProfile{
-						{
-							Type: CodecProfileTypeAudio,
-							Name: "mp3",
-							Limitations: []Limitation{
-								{Name: LimitationAudioSamplerate, Comparison: ComparisonLessThanEqual, Values: []string{"48000"}, Required: true},
-							},
-						},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanTranscode).To(BeTrue())
-				Expect(decision.TranscodeStream.SampleRate).To(Equal(48000))
-			})
-
-			It("rejects transcoding profile when GreaterThanEqual cannot be satisfied", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 2, SampleRate: 44100, BitDepth: 16}
-				ci := &ClientInfo{
-					MaxTranscodingAudioBitrate: 320,
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "mp3", AudioCodec: "mp3", Protocol: "http"},
-					},
-					CodecProfiles: []CodecProfile{
-						{
-							Type: CodecProfileTypeAudio,
-							Name: "mp3",
-							Limitations: []Limitation{
-								{Name: LimitationAudioSamplerate, Comparison: ComparisonGreaterThanEqual, Values: []string{"96000"}, Required: true},
-							},
-						},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanTranscode).To(BeFalse())
-			})
-		})
-
-		Context("Typed transcode reasons from multiple profiles", func() {
-			It("collects reasons from each failed direct play profile", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "ogg", Codec: "Vorbis", BitRate: 128, Channels: 2, SampleRate: 48000}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"flac"}, Protocols: []string{"http"}},
-						{Containers: []string{"mp3"}, AudioCodecs: []string{"mp3"}, Protocols: []string{"http"}},
-						{Containers: []string{"m4a", "mp4"}, AudioCodecs: []string{"aac"}, Protocols: []string{"http"}},
-					},
-					TranscodingProfiles: []TranscodingProfile{
-						{Container: "mp3", AudioCodec: "mp3", Protocol: "http"},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.CanDirectPlay).To(BeFalse())
-				Expect(decision.TranscodeReasons).To(HaveLen(3))
-				Expect(decision.TranscodeReasons[0]).To(Equal("container not supported"))
-				Expect(decision.TranscodeReasons[1]).To(Equal("container not supported"))
-				Expect(decision.TranscodeReasons[2]).To(Equal("container not supported"))
-			})
-		})
-
-		Context("Source stream details", func() {
-			It("populates source stream correctly with kbps bitrate", func() {
-				mf := &model.MediaFile{ID: "1", Suffix: "flac", Codec: "FLAC", BitRate: 1000, Channels: 2, SampleRate: 96000, BitDepth: 24, Duration: 300.5, Size: 50000000}
-				ci := &ClientInfo{
-					DirectPlayProfiles: []DirectPlayProfile{
-						{Containers: []string{"flac"}, Protocols: []string{"http"}},
-					},
-				}
-				decision, err := svc.MakeDecision(ctx, mf, ci)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(decision.SourceStream.Container).To(Equal("flac"))
-				Expect(decision.SourceStream.Codec).To(Equal("flac"))
-				Expect(decision.SourceStream.Bitrate).To(Equal(1000)) // kbps
-				Expect(decision.SourceStream.SampleRate).To(Equal(96000))
-				Expect(decision.SourceStream.BitDepth).To(Equal(24))
-				Expect(decision.SourceStream.Channels).To(Equal(2))
-			})
-		})
-	})
-
-	Describe("Token round-trip", func() {
-		It("creates and parses a direct play token", func() {
-			decision := &Decision{
-				MediaID:       "media-123",
-				CanDirectPlay: true,
-			}
-			token, err := svc.CreateToken(decision)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(token).ToNot(BeEmpty())
-
-			params, err := svc.ParseToken(token)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(params.MediaID).To(Equal("media-123"))
-			Expect(params.DirectPlay).To(BeTrue())
-			Expect(params.TargetFormat).To(BeEmpty())
-		})
-
-		It("creates and parses a transcode token with kbps bitrate", func() {
-			decision := &Decision{
-				MediaID:        "media-456",
-				CanDirectPlay:  false,
-				CanTranscode:   true,
-				TargetFormat:   "mp3",
-				TargetBitrate:  256, // kbps
-				TargetChannels: 2,
-			}
-			token, err := svc.CreateToken(decision)
-			Expect(err).ToNot(HaveOccurred())
-
-			params, err := svc.ParseToken(token)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(params.MediaID).To(Equal("media-456"))
-			Expect(params.DirectPlay).To(BeFalse())
-			Expect(params.TargetFormat).To(Equal("mp3"))
-			Expect(params.TargetBitrate).To(Equal(256)) // kbps
-			Expect(params.TargetChannels).To(Equal(2))
-		})
-
-		It("rejects an invalid token", func() {
-			_, err := svc.ParseToken("invalid-token")
-			Expect(err).To(HaveOccurred())
-		})
-	})
-})

core/wire_providers.go

@@ -20,7 +20,6 @@ var Set = wire.NewSet(
 	NewLibrary,
 	NewUser,
 	NewMaintenance,
-	NewTranscodeDecision,
 	agents.GetAgents,
 	external.NewProvider,
 	wire.Bind(new(external.Agents), new(*agents.Agents)),

db/migrations/20260205120000_add_codec_to_media_file.sql

@@ -1,11 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-ALTER TABLE media_file ADD COLUMN codec VARCHAR(255) DEFAULT '' NOT NULL;
-CREATE INDEX IF NOT EXISTS media_file_codec ON media_file(codec);
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-DROP INDEX IF EXISTS media_file_codec;
-ALTER TABLE media_file DROP COLUMN codec;
--- +goose StatementEnd

go.mod

@@ -7,14 +7,14 @@ replace (
 	github.com/dhowden/tag v0.0.0-20240417053706-3d75831295e8 => github.com/deluan/tag v0.0.0-20241002021117-dfe5e6ea396d
 
 	// Fork to implement raw tags support
-	go.senan.xyz/taglib => github.com/deluan/go-taglib v0.0.0-20260205042457-5d80806aee57
+	go.senan.xyz/taglib => github.com/deluan/go-taglib v0.0.0-20260119020817-8753c7531798
 )
 
 require (
 	github.com/Masterminds/squirrel v1.5.4
 	github.com/RaveNoX/go-jsoncommentstrip v1.0.0
 	github.com/andybalholm/cascadia v1.3.3
-	github.com/bmatcuk/doublestar/v4 v4.9.2
+	github.com/bmatcuk/doublestar/v4 v4.10.0
 	github.com/bradleyjkemp/cupaloy/v2 v2.8.0
 	github.com/deluan/rest v0.0.0-20211102003136-6260bc399cbf
 	github.com/deluan/sanitize v0.0.0-20241120162836-fdfd8fdfaa55

go.sum

@@ -16,8 +16,8 @@ github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuP
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bmatcuk/doublestar/v4 v4.9.2 h1:b0mc6WyRSYLjzofB2v/0cuDUZ+MqoGyH3r0dVij35GI=
-github.com/bmatcuk/doublestar/v4 v4.9.2/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bmatcuk/doublestar/v4 v4.10.0 h1:zU9WiOla1YA122oLM6i4EXvGW62DvKZVxIe6TYWexEs=
+github.com/bmatcuk/doublestar/v4 v4.10.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M=
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0=
 github.com/cespare/reflex v0.3.1 h1:N4Y/UmRrjwOkNT0oQQnYsdr6YBxvHqtSfPB4mqOyAKk=
@@ -36,8 +36,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=
-github.com/deluan/go-taglib v0.0.0-20260205042457-5d80806aee57 h1:SXIwfjzTv0UzoUWpFREl8p3AxXVLmbcto1/ISih11a0=
-github.com/deluan/go-taglib v0.0.0-20260205042457-5d80806aee57/go.mod h1:sKDN0U4qXDlq6LFK+aOAkDH4Me5nDV1V/A4B+B69xBA=
+github.com/deluan/go-taglib v0.0.0-20260119020817-8753c7531798 h1:q4fvcIK/LxElpyQILCejG6WPYjVb2F/4P93+k017ANk=
+github.com/deluan/go-taglib v0.0.0-20260119020817-8753c7531798/go.mod h1:sKDN0U4qXDlq6LFK+aOAkDH4Me5nDV1V/A4B+B69xBA=
 github.com/deluan/rest v0.0.0-20211102003136-6260bc399cbf h1:tb246l2Zmpt/GpF9EcHCKTtwzrd0HGfEmoODFA/qnk4=
 github.com/deluan/rest v0.0.0-20211102003136-6260bc399cbf/go.mod h1:tSgDythFsl0QgS/PFWfIZqcJKnkADWneY80jaVRlqK8=
 github.com/deluan/sanitize v0.0.0-20241120162836-fdfd8fdfaa55 h1:wSCnggTs2f2ji6nFwQmfwgINcmSMj0xF0oHnoyRSPe4=

model/mediafile.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/gohugoio/hashstructure"
 	"github.com/navidrome/navidrome/conf"
-	confmime "github.com/navidrome/navidrome/conf/mime"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/utils"
 	"github.com/navidrome/navidrome/utils/slice"
@@ -57,7 +56,6 @@ type MediaFile struct {
 	SampleRate           int      `structs:"sample_rate" json:"sampleRate"`
 	BitDepth             int      `structs:"bit_depth" json:"bitDepth"`
 	Channels             int      `structs:"channels" json:"channels"`
-	Codec                string   `structs:"codec" json:"codec"`
 	Genre                string   `structs:"genre" json:"genre"`
 	Genres               Genres   `structs:"-" json:"genres,omitempty"`
 	SortTitle            string   `structs:"sort_title" json:"sortTitle,omitempty"`
@@ -163,79 +161,6 @@ func (mf MediaFile) AbsolutePath() string {
 	return filepath.Join(mf.LibraryPath, mf.Path)
 }
 
-// AudioCodec returns the audio codec for this file.
-// Uses the stored Codec field if available, otherwise infers from Suffix and audio properties.
-func (mf MediaFile) AudioCodec() string {
-	// If we have a stored codec from scanning, normalize and return it
-	if mf.Codec != "" {
-		return strings.ToLower(mf.Codec)
-	}
-	// Fallback: infer from Suffix + BitDepth
-	return mf.inferCodecFromSuffix()
-}
-
-// inferCodecFromSuffix infers the codec from the file extension when Codec field is empty.
-func (mf MediaFile) inferCodecFromSuffix() string {
-	switch strings.ToLower(mf.Suffix) {
-	case "mp3", "mpga":
-		return "mp3"
-	case "mp2":
-		return "mp2"
-	case "ogg", "oga":
-		return "vorbis"
-	case "opus":
-		return "opus"
-	case "mpc":
-		return "mpc"
-	case "wma":
-		return "wma"
-	case "flac":
-		return "flac"
-	case "wav":
-		return "pcm"
-	case "aif", "aiff", "aifc":
-		return "pcm"
-	case "ape":
-		return "ape"
-	case "wv", "wvp":
-		return "wv"
-	case "tta":
-		return "tta"
-	case "tak":
-		return "tak"
-	case "shn":
-		return "shn"
-	case "dsf", "dff":
-		return "dsd"
-	case "m4a":
-		// AAC if BitDepth==0, ALAC if BitDepth>0
-		if mf.BitDepth > 0 {
-			return "alac"
-		}
-		return "aac"
-	case "m4b", "m4p", "m4r":
-		return "aac"
-	default:
-		return ""
-	}
-}
-
-// IsLossless returns true if this file uses a lossless codec.
-func (mf MediaFile) IsLossless() bool {
-	codec := mf.AudioCodec()
-	// Primary: codec-based check (most accurate for containers like M4A)
-	switch codec {
-	case "flac", "alac", "pcm", "ape", "wv", "tta", "tak", "shn", "dsd":
-		return true
-	}
-	// Secondary: suffix-based check using configurable list from YAML
-	if slices.Contains(confmime.LosslessFormats, mf.Suffix) {
-		return true
-	}
-	// Fallback heuristic: if BitDepth is set, it's likely lossless
-	return mf.BitDepth > 0
-}
-
 type MediaFiles []MediaFile
 
 // ToAlbum creates an Album object based on the attributes of this MediaFiles collection.
@@ -434,7 +359,6 @@ type MediaFileRepository interface {
 	Get(id string) (*MediaFile, error)
 	GetWithParticipants(id string) (*MediaFile, error)
 	GetAll(options ...QueryOptions) (MediaFiles, error)
-	GetAllByTags(tag TagName, values []string, options ...QueryOptions) (MediaFiles, error)
 	GetCursor(options ...QueryOptions) (MediaFileCursor, error)
 	Delete(id string) error
 	DeleteMissing(ids []string) error

model/mediafile_test.go

@@ -475,7 +475,7 @@ var _ = Describe("MediaFile", func() {
 		DeferCleanup(configtest.SetupConfig())
 		conf.Server.EnableMediaFileCoverArt = true
 	})
-	Describe("CoverArtId", func() {
+	Describe(".CoverArtId()", func() {
 		It("returns its own id if it HasCoverArt", func() {
 			mf := MediaFile{ID: "111", AlbumID: "1", HasCoverArt: true}
 			id := mf.CoverArtID()
@@ -496,94 +496,6 @@ var _ = Describe("MediaFile", func() {
 			Expect(id.ID).To(Equal(mf.AlbumID))
 		})
 	})
-
-	Describe("AudioCodec", func() {
-		It("returns normalized stored codec when available", func() {
-			mf := MediaFile{Codec: "AAC", Suffix: "m4a"}
-			Expect(mf.AudioCodec()).To(Equal("aac"))
-		})
-
-		It("returns stored codec lowercased", func() {
-			mf := MediaFile{Codec: "ALAC", Suffix: "m4a"}
-			Expect(mf.AudioCodec()).To(Equal("alac"))
-		})
-
-		DescribeTable("infers codec from suffix when Codec field is empty",
-			func(suffix string, bitDepth int, expected string) {
-				mf := MediaFile{Suffix: suffix, BitDepth: bitDepth}
-				Expect(mf.AudioCodec()).To(Equal(expected))
-			},
-			Entry("mp3", "mp3", 0, "mp3"),
-			Entry("mpga", "mpga", 0, "mp3"),
-			Entry("mp2", "mp2", 0, "mp2"),
-			Entry("ogg", "ogg", 0, "vorbis"),
-			Entry("oga", "oga", 0, "vorbis"),
-			Entry("opus", "opus", 0, "opus"),
-			Entry("mpc", "mpc", 0, "mpc"),
-			Entry("wma", "wma", 0, "wma"),
-			Entry("flac", "flac", 0, "flac"),
-			Entry("wav", "wav", 0, "pcm"),
-			Entry("aif", "aif", 0, "pcm"),
-			Entry("aiff", "aiff", 0, "pcm"),
-			Entry("aifc", "aifc", 0, "pcm"),
-			Entry("ape", "ape", 0, "ape"),
-			Entry("wv", "wv", 0, "wv"),
-			Entry("wvp", "wvp", 0, "wv"),
-			Entry("tta", "tta", 0, "tta"),
-			Entry("tak", "tak", 0, "tak"),
-			Entry("shn", "shn", 0, "shn"),
-			Entry("dsf", "dsf", 0, "dsd"),
-			Entry("dff", "dff", 0, "dsd"),
-			Entry("m4a with BitDepth=0 (AAC)", "m4a", 0, "aac"),
-			Entry("m4a with BitDepth>0 (ALAC)", "m4a", 16, "alac"),
-			Entry("m4b", "m4b", 0, "aac"),
-			Entry("m4p", "m4p", 0, "aac"),
-			Entry("m4r", "m4r", 0, "aac"),
-			Entry("unknown suffix", "xyz", 0, ""),
-		)
-
-		It("prefers stored codec over suffix inference", func() {
-			mf := MediaFile{Codec: "ALAC", Suffix: "m4a", BitDepth: 0}
-			Expect(mf.AudioCodec()).To(Equal("alac"))
-		})
-	})
-
-	Describe("IsLossless", func() {
-		BeforeEach(func() {
-			DeferCleanup(configtest.SetupConfig())
-		})
-
-		DescribeTable("detects lossless codecs",
-			func(codec string, suffix string, bitDepth int, expected bool) {
-				mf := MediaFile{Codec: codec, Suffix: suffix, BitDepth: bitDepth}
-				Expect(mf.IsLossless()).To(Equal(expected))
-			},
-			Entry("flac", "FLAC", "flac", 16, true),
-			Entry("alac", "ALAC", "m4a", 24, true),
-			Entry("pcm via wav", "", "wav", 16, true),
-			Entry("pcm via aiff", "", "aiff", 24, true),
-			Entry("ape", "", "ape", 16, true),
-			Entry("wv", "", "wv", 0, true),
-			Entry("tta", "", "tta", 0, true),
-			Entry("tak", "", "tak", 0, true),
-			Entry("shn", "", "shn", 0, true),
-			Entry("dsd", "", "dsf", 0, true),
-			Entry("mp3 is lossy", "MP3", "mp3", 0, false),
-			Entry("aac is lossy", "AAC", "m4a", 0, false),
-			Entry("vorbis is lossy", "", "ogg", 0, false),
-			Entry("opus is lossy", "", "opus", 0, false),
-		)
-
-		It("detects lossless via BitDepth fallback when codec is unknown", func() {
-			mf := MediaFile{Suffix: "xyz", BitDepth: 24}
-			Expect(mf.IsLossless()).To(BeTrue())
-		})
-
-		It("returns false for unknown with no BitDepth", func() {
-			mf := MediaFile{Suffix: "xyz", BitDepth: 0}
-			Expect(mf.IsLossless()).To(BeFalse())
-		})
-	})
 })
 
 func t(v string) time.Time {

model/metadata/map_mediafile.go

@@ -65,7 +65,6 @@ func (md Metadata) ToMediaFile(libID int, folderID string) model.MediaFile {
 	mf.SampleRate = md.AudioProperties().SampleRate
 	mf.BitDepth = md.AudioProperties().BitDepth
 	mf.Channels = md.AudioProperties().Channels
-	mf.Codec = md.AudioProperties().Codec
 	mf.Path = md.FilePath()
 	mf.Suffix = md.Suffix()
 	mf.Size = md.Size()

model/metadata/metadata.go

@@ -35,7 +35,6 @@ type AudioProperties struct {
 	BitDepth   int
 	SampleRate int
 	Channels   int
-	Codec      string
 }
 
 type Date string

persistence/mediafile_repository.go

@@ -195,31 +195,6 @@ func (r *mediaFileRepository) GetAll(options ...model.QueryOptions) (model.Media
 	return res.toModels(), nil
 }
 
-func (r *mediaFileRepository) GetAllByTags(tag model.TagName, values []string, options ...model.QueryOptions) (model.MediaFiles, error) {
-	placeholders := make([]string, len(values))
-	args := make([]any, len(values))
-	for i, v := range values {
-		placeholders[i] = "?"
-		args[i] = v
-	}
-	tagFilter := Expr(
-		fmt.Sprintf("exists (select 1 from json_tree(media_file.tags, '$.%s') where key='value' and value in (%s))",
-			tag, strings.Join(placeholders, ",")),
-		args...,
-	)
-
-	var opts model.QueryOptions
-	if len(options) > 0 {
-		opts = options[0]
-	}
-	if opts.Filters != nil {
-		opts.Filters = And{tagFilter, opts.Filters}
-	} else {
-		opts.Filters = tagFilter
-	}
-	return r.GetAll(opts)
-}
-
 func (r *mediaFileRepository) GetCursor(options ...model.QueryOptions) (model.MediaFileCursor, error) {
 	sq := r.selectMediaFile(options...)
 	cursor, err := queryWithStableResults[dbMediaFile](r.sqlRepository, sq)

plugins/README.md

@@ -1036,8 +1036,9 @@ See [examples/](examples/) for complete working plugins:
 | [coverartarchive-py](examples/coverartarchive-py/)             | Python   | MetadataAgent | HTTP                                       | Cover Art Archive              |
 | [webhook-rs](examples/webhook-rs/)                             | Rust     | Scrobbler     | HTTP                                       | HTTP webhooks                  |
 | [nowplaying-py](examples/nowplaying-py/)                       | Python   | Lifecycle     | Scheduler, SubsonicAPI                     | Periodic now-playing logger    |
-| [library-inspector](examples/library-inspector-rs/)            | Rust     | Lifecycle     | Library, Scheduler                         | Periodic library stats logging |
+| [library-inspector](examples/library-inspector-rs/)               | Rust     | Lifecycle     | Library, Scheduler                         | Periodic library stats logging |
 | [crypto-ticker](examples/crypto-ticker/)                       | Go       | Lifecycle     | WebSocket, Scheduler                       | Real-time crypto prices demo   |
+| [discord-rich-presence](examples/discord-rich-presence/)       | Go       | Scrobbler     | HTTP, WebSocket, Cache, Scheduler, Artwork | Discord integration            |
 | [discord-rich-presence-rs](examples/discord-rich-presence-rs/) | Rust     | Scrobbler     | HTTP, WebSocket, Cache, Scheduler, Artwork | Discord integration (Rust)     |
 
 ---

plugins/capabilities/metadata_agent.go

@@ -40,18 +40,6 @@ type MetadataAgent interface {
 	// GetAlbumImages retrieves images for an album.
 	//nd:export name=nd_get_album_images
 	GetAlbumImages(AlbumRequest) (*AlbumImagesResponse, error)
-
-	// GetSimilarSongsByTrack retrieves songs similar to a specific track.
-	//nd:export name=nd_get_similar_songs_by_track
-	GetSimilarSongsByTrack(SimilarSongsByTrackRequest) (*SimilarSongsResponse, error)
-
-	// GetSimilarSongsByAlbum retrieves songs similar to tracks on an album.
-	//nd:export name=nd_get_similar_songs_by_album
-	GetSimilarSongsByAlbum(SimilarSongsByAlbumRequest) (*SimilarSongsResponse, error)
-
-	// GetSimilarSongsByArtist retrieves songs similar to an artist's catalog.
-	//nd:export name=nd_get_similar_songs_by_artist
-	GetSimilarSongsByArtist(SimilarSongsByArtistRequest) (*SimilarSongsResponse, error)
 }
 
 // ArtistMBIDRequest is the request for GetArtistMBID.
@@ -134,7 +122,7 @@ type TopSongsRequest struct {
 	Count int32 `json:"count"`
 }
 
-// SongRef is a reference to a song with metadata for matching.
+// SongRef is a reference to a song with name and optional MBID.
 type SongRef struct {
 	// ID is the internal Navidrome mediafile ID (if known).
 	ID string `json:"id,omitempty"`
@@ -142,18 +130,6 @@ type SongRef struct {
 	Name string `json:"name"`
 	// MBID is the MusicBrainz ID for the song.
 	MBID string `json:"mbid,omitempty"`
-	// ISRC is the International Standard Recording Code for the song.
-	ISRC string `json:"isrc,omitempty"`
-	// Artist is the artist name.
-	Artist string `json:"artist,omitempty"`
-	// ArtistMBID is the MusicBrainz artist ID.
-	ArtistMBID string `json:"artistMbid,omitempty"`
-	// Album is the album name.
-	Album string `json:"album,omitempty"`
-	// AlbumMBID is the MusicBrainz release ID.
-	AlbumMBID string `json:"albumMbid,omitempty"`
-	// Duration is the song duration in seconds.
-	Duration float32 `json:"duration,omitempty"`
 }
 
 // TopSongsResponse is the response for GetArtistTopSongs.
@@ -189,49 +165,3 @@ type AlbumImagesResponse struct {
 	// Images is the list of album images.
 	Images []ImageInfo `json:"images"`
 }
-
-// SimilarSongsByTrackRequest is the request for GetSimilarSongsByTrack.
-type SimilarSongsByTrackRequest struct {
-	// ID is the internal Navidrome mediafile ID.
-	ID string `json:"id"`
-	// Name is the track title.
-	Name string `json:"name"`
-	// Artist is the artist name.
-	Artist string `json:"artist"`
-	// MBID is the MusicBrainz recording ID (if known).
-	MBID string `json:"mbid,omitempty"`
-	// Count is the maximum number of similar songs to return.
-	Count int32 `json:"count"`
-}
-
-// SimilarSongsByAlbumRequest is the request for GetSimilarSongsByAlbum.
-type SimilarSongsByAlbumRequest struct {
-	// ID is the internal Navidrome album ID.
-	ID string `json:"id"`
-	// Name is the album name.
-	Name string `json:"name"`
-	// Artist is the album artist name.
-	Artist string `json:"artist"`
-	// MBID is the MusicBrainz release ID (if known).
-	MBID string `json:"mbid,omitempty"`
-	// Count is the maximum number of similar songs to return.
-	Count int32 `json:"count"`
-}
-
-// SimilarSongsByArtistRequest is the request for GetSimilarSongsByArtist.
-type SimilarSongsByArtistRequest struct {
-	// ID is the internal Navidrome artist ID.
-	ID string `json:"id"`
-	// Name is the artist name.
-	Name string `json:"name"`
-	// MBID is the MusicBrainz artist ID (if known).
-	MBID string `json:"mbid,omitempty"`
-	// Count is the maximum number of similar songs to return.
-	Count int32 `json:"count"`
-}
-
-// SimilarSongsResponse is the response for GetSimilarSongsBy* functions.
-type SimilarSongsResponse struct {
-	// Songs is the list of similar songs.
-	Songs []SongRef `json:"songs"`
-}

plugins/capabilities/metadata_agent.yaml

@@ -64,30 +64,6 @@ exports:
         output:
             $ref: '#/components/schemas/AlbumImagesResponse'
             contentType: application/json
-    nd_get_similar_songs_by_track:
-        description: GetSimilarSongsByTrack retrieves songs similar to a specific track.
-        input:
-            $ref: '#/components/schemas/SimilarSongsByTrackRequest'
-            contentType: application/json
-        output:
-            $ref: '#/components/schemas/SimilarSongsResponse'
-            contentType: application/json
-    nd_get_similar_songs_by_album:
-        description: GetSimilarSongsByAlbum retrieves songs similar to tracks on an album.
-        input:
-            $ref: '#/components/schemas/SimilarSongsByAlbumRequest'
-            contentType: application/json
-        output:
-            $ref: '#/components/schemas/SimilarSongsResponse'
-            contentType: application/json
-    nd_get_similar_songs_by_artist:
-        description: GetSimilarSongsByArtist retrieves songs similar to an artist's catalog.
-        input:
-            $ref: '#/components/schemas/SimilarSongsByArtistRequest'
-            contentType: application/json
-        output:
-            $ref: '#/components/schemas/SimilarSongsResponse'
-            contentType: application/json
 components:
     schemas:
         AlbumImagesResponse:
@@ -253,86 +229,8 @@ components:
                         $ref: '#/components/schemas/ArtistRef'
             required:
                 - artists
-        SimilarSongsByAlbumRequest:
-            description: SimilarSongsByAlbumRequest is the request for GetSimilarSongsByAlbum.
-            properties:
-                id:
-                    type: string
-                    description: ID is the internal Navidrome album ID.
-                name:
-                    type: string
-                    description: Name is the album name.
-                artist:
-                    type: string
-                    description: Artist is the album artist name.
-                mbid:
-                    type: string
-                    description: MBID is the MusicBrainz release ID (if known).
-                count:
-                    type: integer
-                    format: int32
-                    description: Count is the maximum number of similar songs to return.
-            required:
-                - id
-                - name
-                - artist
-                - count
-        SimilarSongsByArtistRequest:
-            description: SimilarSongsByArtistRequest is the request for GetSimilarSongsByArtist.
-            properties:
-                id:
-                    type: string
-                    description: ID is the internal Navidrome artist ID.
-                name:
-                    type: string
-                    description: Name is the artist name.
-                mbid:
-                    type: string
-                    description: MBID is the MusicBrainz artist ID (if known).
-                count:
-                    type: integer
-                    format: int32
-                    description: Count is the maximum number of similar songs to return.
-            required:
-                - id
-                - name
-                - count
-        SimilarSongsByTrackRequest:
-            description: SimilarSongsByTrackRequest is the request for GetSimilarSongsByTrack.
-            properties:
-                id:
-                    type: string
-                    description: ID is the internal Navidrome mediafile ID.
-                name:
-                    type: string
-                    description: Name is the track title.
-                artist:
-                    type: string
-                    description: Artist is the artist name.
-                mbid:
-                    type: string
-                    description: MBID is the MusicBrainz recording ID (if known).
-                count:
-                    type: integer
-                    format: int32
-                    description: Count is the maximum number of similar songs to return.
-            required:
-                - id
-                - name
-                - artist
-                - count
-        SimilarSongsResponse:
-            description: SimilarSongsResponse is the response for GetSimilarSongsBy* functions.
-            properties:
-                songs:
-                    type: array
-                    description: Songs is the list of similar songs.
-                    items:
-                        $ref: '#/components/schemas/SongRef'
-            required:
-                - songs
         SongRef:
-            description: SongRef is a reference to a song with metadata for matching.
+            description: SongRef is a reference to a song with name and optional MBID.
             properties:
                 id:
                     type: string
@@ -343,25 +241,6 @@ components:
                 mbid:
                     type: string
                     description: MBID is the MusicBrainz ID for the song.
-                isrc:
-                    type: string
-                    description: ISRC is the International Standard Recording Code for the song.
-                artist:
-                    type: string
-                    description: Artist is the artist name.
-                artistMbid:
-                    type: string
-                    description: ArtistMBID is the MusicBrainz artist ID.
-                album:
-                    type: string
-                    description: Album is the album name.
-                albumMbid:
-                    type: string
-                    description: AlbumMBID is the MusicBrainz release ID.
-                duration:
-                    type: number
-                    format: float
-                    description: Duration is the song duration in seconds.
             required:
                 - name
         TopSongsRequest:

plugins/cmd/ndpgen/integration_test.go

@@ -282,9 +282,6 @@ type ServiceB interface {
 
 			Entry("option pattern (value, exists bool)",
 				"config_service.go.txt", "config_client_expected.go.txt", "config_client_expected.py", "config_client_expected.rs"),
-
-			Entry("raw=true binary response",
-				"raw_service.go.txt", "raw_client_expected.go.txt", "raw_client_expected.py", "raw_client_expected.rs"),
 		)
 
 		It("generates compilable client code for comprehensive service", func() {

plugins/cmd/ndpgen/internal/generator.go

@@ -568,18 +568,6 @@ func skipSerializingFunc(goType string) string {
 		return "String::is_empty"
 	case "bool":
 		return "std::ops::Not::not"
-	case "int32":
-		return "is_zero_i32"
-	case "uint32":
-		return "is_zero_u32"
-	case "int64":
-		return "is_zero_i64"
-	case "uint64":
-		return "is_zero_u64"
-	case "float32":
-		return "is_zero_f32"
-	case "float64":
-		return "is_zero_f64"
 	default:
 		return "Option::is_none"
 	}

plugins/cmd/ndpgen/internal/generator_test.go

@@ -264,96 +264,6 @@ var _ = Describe("Generator", func() {
 			Expect(codeStr).To(ContainSubstring(`extism "github.com/extism/go-sdk"`))
 		})
 
-		It("should generate binary framing for raw=true methods", func() {
-			svc := Service{
-				Name:       "Stream",
-				Permission: "stream",
-				Interface:  "StreamService",
-				Methods: []Method{
-					{
-						Name:     "GetStream",
-						HasError: true,
-						Raw:      true,
-						Params:   []Param{NewParam("uri", "string")},
-						Returns: []Param{
-							NewParam("contentType", "string"),
-							NewParam("data", "[]byte"),
-						},
-					},
-				},
-			}
-
-			code, err := GenerateHost(svc, "host")
-			Expect(err).NotTo(HaveOccurred())
-
-			_, err = format.Source(code)
-			Expect(err).NotTo(HaveOccurred())
-
-			codeStr := string(code)
-
-			// Should include encoding/binary import for raw methods
-			Expect(codeStr).To(ContainSubstring(`"encoding/binary"`))
-
-			// Should NOT generate a response type for raw methods
-			Expect(codeStr).NotTo(ContainSubstring("type StreamGetStreamResponse struct"))
-
-			// Should generate request type (request is still JSON)
-			Expect(codeStr).To(ContainSubstring("type StreamGetStreamRequest struct"))
-
-			// Should build binary frame [0x00][4-byte CT len][CT][data]
-			Expect(codeStr).To(ContainSubstring("frame[0] = 0x00"))
-			Expect(codeStr).To(ContainSubstring("binary.BigEndian.PutUint32"))
-
-			// Should have writeRawError helper
-			Expect(codeStr).To(ContainSubstring("streamWriteRawError"))
-
-			// Should use writeRawError instead of writeError for raw methods
-			Expect(codeStr).To(ContainSubstring("streamWriteRawError(p, stack"))
-		})
-
-		It("should generate both writeError and writeRawError for mixed services", func() {
-			svc := Service{
-				Name:       "API",
-				Permission: "api",
-				Interface:  "APIService",
-				Methods: []Method{
-					{
-						Name:     "Call",
-						HasError: true,
-						Params:   []Param{NewParam("uri", "string")},
-						Returns:  []Param{NewParam("response", "string")},
-					},
-					{
-						Name:     "CallRaw",
-						HasError: true,
-						Raw:      true,
-						Params:   []Param{NewParam("uri", "string")},
-						Returns: []Param{
-							NewParam("contentType", "string"),
-							NewParam("data", "[]byte"),
-						},
-					},
-				},
-			}
-
-			code, err := GenerateHost(svc, "host")
-			Expect(err).NotTo(HaveOccurred())
-
-			_, err = format.Source(code)
-			Expect(err).NotTo(HaveOccurred())
-
-			codeStr := string(code)
-
-			// Should have both helpers
-			Expect(codeStr).To(ContainSubstring("apiWriteResponse"))
-			Expect(codeStr).To(ContainSubstring("apiWriteError"))
-			Expect(codeStr).To(ContainSubstring("apiWriteRawError"))
-
-			// Should generate response type for non-raw method only
-			Expect(codeStr).To(ContainSubstring("type APICallResponse struct"))
-			Expect(codeStr).NotTo(ContainSubstring("type APICallRawResponse struct"))
-		})
-
 		It("should always include json import for JSON protocol", func() {
 			// All services use JSON protocol, so json import is always needed
 			svc := Service{
@@ -716,72 +626,6 @@ var _ = Describe("Generator", func() {
 			Expect(codeStr).To(ContainSubstring(`response.get("floatVal", 0.0)`))
 			Expect(codeStr).To(ContainSubstring(`response.get("boolVal", False)`))
 		})
-
-		It("should generate binary frame parsing for raw methods", func() {
-			svc := Service{
-				Name:       "Stream",
-				Permission: "stream",
-				Interface:  "StreamService",
-				Methods: []Method{
-					{
-						Name:     "GetStream",
-						HasError: true,
-						Raw:      true,
-						Params:   []Param{NewParam("uri", "string")},
-						Returns: []Param{
-							NewParam("contentType", "string"),
-							NewParam("data", "[]byte"),
-						},
-						Doc: "GetStream returns raw binary stream data.",
-					},
-				},
-			}
-
-			code, err := GenerateClientPython(svc)
-			Expect(err).NotTo(HaveOccurred())
-
-			codeStr := string(code)
-
-			// Should import Tuple and struct for raw methods
-			Expect(codeStr).To(ContainSubstring("from typing import Any, Tuple"))
-			Expect(codeStr).To(ContainSubstring("import struct"))
-
-			// Should return Tuple[str, bytes]
-			Expect(codeStr).To(ContainSubstring("-> Tuple[str, bytes]:"))
-
-			// Should parse binary frame instead of JSON
-			Expect(codeStr).To(ContainSubstring("response_bytes = response_mem.bytes()"))
-			Expect(codeStr).To(ContainSubstring("response_bytes[0] == 0x01"))
-			Expect(codeStr).To(ContainSubstring("struct.unpack"))
-			Expect(codeStr).To(ContainSubstring("return content_type, data"))
-
-			// Should NOT use json.loads for response
-			Expect(codeStr).NotTo(ContainSubstring("json.loads(extism.memory.string(response_mem))"))
-		})
-
-		It("should not import Tuple or struct for non-raw services", func() {
-			svc := Service{
-				Name:       "Test",
-				Permission: "test",
-				Interface:  "TestService",
-				Methods: []Method{
-					{
-						Name:     "Call",
-						HasError: true,
-						Params:   []Param{NewParam("uri", "string")},
-						Returns:  []Param{NewParam("response", "string")},
-					},
-				},
-			}
-
-			code, err := GenerateClientPython(svc)
-			Expect(err).NotTo(HaveOccurred())
-
-			codeStr := string(code)
-
-			Expect(codeStr).NotTo(ContainSubstring("Tuple"))
-			Expect(codeStr).NotTo(ContainSubstring("import struct"))
-		})
 	})
 
 	Describe("GenerateGoDoc", func() {
@@ -938,47 +782,6 @@ var _ = Describe("Generator", func() {
 			// Check for PDK import
 			Expect(codeStr).To(ContainSubstring("github.com/navidrome/navidrome/plugins/pdk/go/pdk"))
 		})
-
-		It("should include encoding/binary import for raw methods", func() {
-			svc := Service{
-				Name:       "Stream",
-				Permission: "stream",
-				Interface:  "StreamService",
-				Methods: []Method{
-					{
-						Name:     "GetStream",
-						HasError: true,
-						Raw:      true,
-						Params:   []Param{NewParam("uri", "string")},
-						Returns: []Param{
-							NewParam("contentType", "string"),
-							NewParam("data", "[]byte"),
-						},
-					},
-				},
-			}
-
-			code, err := GenerateClientGo(svc, "host")
-			Expect(err).NotTo(HaveOccurred())
-
-			codeStr := string(code)
-
-			// Should include encoding/binary for raw binary frame parsing
-			Expect(codeStr).To(ContainSubstring(`"encoding/binary"`))
-
-			// Should NOT generate response type struct for raw methods
-			Expect(codeStr).NotTo(ContainSubstring("streamGetStreamResponse struct"))
-
-			// Should still generate request type
-			Expect(codeStr).To(ContainSubstring("streamGetStreamRequest struct"))
-
-			// Should parse binary frame
-			Expect(codeStr).To(ContainSubstring("responseBytes[0] == 0x01"))
-			Expect(codeStr).To(ContainSubstring("binary.BigEndian.Uint32"))
-
-			// Should return (string, []byte, error)
-			Expect(codeStr).To(ContainSubstring("func StreamGetStream(uri string) (string, []byte, error)"))
-		})
 	})
 
 	Describe("GenerateClientGoStub", func() {
@@ -1431,37 +1234,6 @@ type OnInitOutput struct {
 })
 
 var _ = Describe("Rust Generation", func() {
-	Describe("skipSerializingFunc", func() {
-		It("should return Option::is_none for pointer, slice, and map types", func() {
-			Expect(skipSerializingFunc("*string")).To(Equal("Option::is_none"))
-			Expect(skipSerializingFunc("*MyStruct")).To(Equal("Option::is_none"))
-			Expect(skipSerializingFunc("[]string")).To(Equal("Option::is_none"))
-			Expect(skipSerializingFunc("[]int32")).To(Equal("Option::is_none"))
-			Expect(skipSerializingFunc("map[string]int")).To(Equal("Option::is_none"))
-		})
-
-		It("should return String::is_empty for string type", func() {
-			Expect(skipSerializingFunc("string")).To(Equal("String::is_empty"))
-		})
-
-		It("should return std::ops::Not::not for bool type", func() {
-			Expect(skipSerializingFunc("bool")).To(Equal("std::ops::Not::not"))
-		})
-
-		It("should return is_zero_* functions for numeric types", func() {
-			Expect(skipSerializingFunc("int32")).To(Equal("is_zero_i32"))
-			Expect(skipSerializingFunc("uint32")).To(Equal("is_zero_u32"))
-			Expect(skipSerializingFunc("int64")).To(Equal("is_zero_i64"))
-			Expect(skipSerializingFunc("uint64")).To(Equal("is_zero_u64"))
-			Expect(skipSerializingFunc("float32")).To(Equal("is_zero_f32"))
-			Expect(skipSerializingFunc("float64")).To(Equal("is_zero_f64"))
-		})
-
-		It("should return Option::is_none for unknown types", func() {
-			Expect(skipSerializingFunc("CustomType")).To(Equal("Option::is_none"))
-		})
-	})
-
 	Describe("rustOutputType", func() {
 		It("should convert Go primitives to Rust primitives", func() {
 			Expect(rustOutputType("bool")).To(Equal("bool"))
@@ -1747,51 +1519,6 @@ var _ = Describe("Rust Generation", func() {
 			Expect(codeStr).To(ContainSubstring("Result<bool, Error>"))
 			Expect(codeStr).NotTo(ContainSubstring("Option<bool>"))
 		})
-
-		It("should generate raw extern C import and binary frame parsing for raw methods", func() {
-			svc := Service{
-				Name:       "Stream",
-				Permission: "stream",
-				Interface:  "StreamService",
-				Methods: []Method{
-					{
-						Name:     "GetStream",
-						HasError: true,
-						Raw:      true,
-						Params:   []Param{NewParam("uri", "string")},
-						Returns: []Param{
-							NewParam("contentType", "string"),
-							NewParam("data", "[]byte"),
-						},
-						Doc: "GetStream returns raw binary stream data.",
-					},
-				},
-			}
-
-			code, err := GenerateClientRust(svc)
-			Expect(err).NotTo(HaveOccurred())
-
-			codeStr := string(code)
-
-			// Should use extern "C" with wasm_import_module for raw methods, not #[host_fn] extern "ExtismHost"
-			Expect(codeStr).To(ContainSubstring(`#[link(wasm_import_module = "extism:host/user")]`))
-			Expect(codeStr).To(ContainSubstring(`extern "C"`))
-			Expect(codeStr).To(ContainSubstring("fn stream_getstream(offset: u64) -> u64"))
-
-			// Should NOT generate response type for raw methods
-			Expect(codeStr).NotTo(ContainSubstring("StreamGetStreamResponse"))
-
-			// Should generate request type (request is still JSON)
-			Expect(codeStr).To(ContainSubstring("struct StreamGetStreamRequest"))
-
-			// Should return Result<(String, Vec<u8>), Error>
-			Expect(codeStr).To(ContainSubstring("Result<(String, Vec<u8>), Error>"))
-
-			// Should parse binary frame
-			Expect(codeStr).To(ContainSubstring("response_bytes[0] == 0x01"))
-			Expect(codeStr).To(ContainSubstring("u32::from_be_bytes"))
-			Expect(codeStr).To(ContainSubstring("String::from_utf8_lossy"))
-		})
 	})
 })
 

plugins/cmd/ndpgen/internal/parser.go

@@ -761,7 +761,6 @@ func parseMethod(name string, funcType *ast.FuncType, annotation map[string]stri
 	m := Method{
 		Name:       name,
 		ExportName: annotation["name"],
-		Raw:        annotation["raw"] == "true",
 		Doc:        doc,
 	}
 
@@ -800,13 +799,6 @@ func parseMethod(name string, funcType *ast.FuncType, annotation map[string]stri
 		}
 	}
 
-	// Validate raw=true methods: must return exactly (string, []byte, error)
-	if m.Raw {
-		if !m.HasError || len(m.Returns) != 2 || m.Returns[0].Type != "string" || m.Returns[1].Type != "[]byte" {
-			return m, fmt.Errorf("raw=true method %s must return (string, []byte, error) — content-type, data, error", name)
-		}
-	}
-
 	return m, nil
 }
 

plugins/cmd/ndpgen/internal/parser_test.go

@@ -122,119 +122,6 @@ type TestService interface {
 			Expect(services[0].Methods[0].Name).To(Equal("Exported"))
 		})
 
-		It("should parse raw=true annotation", func() {
-			src := `package host
-
-import "context"
-
-//nd:hostservice name=Stream permission=stream
-type StreamService interface {
-	//nd:hostfunc raw=true
-	GetStream(ctx context.Context, uri string) (contentType string, data []byte, err error)
-}
-`
-			err := os.WriteFile(filepath.Join(tmpDir, "stream.go"), []byte(src), 0600)
-			Expect(err).NotTo(HaveOccurred())
-
-			services, err := ParseDirectory(tmpDir)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(services).To(HaveLen(1))
-
-			m := services[0].Methods[0]
-			Expect(m.Name).To(Equal("GetStream"))
-			Expect(m.Raw).To(BeTrue())
-			Expect(m.HasError).To(BeTrue())
-			Expect(m.Returns).To(HaveLen(2))
-			Expect(m.Returns[0].Name).To(Equal("contentType"))
-			Expect(m.Returns[0].Type).To(Equal("string"))
-			Expect(m.Returns[1].Name).To(Equal("data"))
-			Expect(m.Returns[1].Type).To(Equal("[]byte"))
-		})
-
-		It("should set Raw=false when raw annotation is absent", func() {
-			src := `package host
-
-import "context"
-
-//nd:hostservice name=Test permission=test
-type TestService interface {
-	//nd:hostfunc
-	Call(ctx context.Context, uri string) (response string, err error)
-}
-`
-			err := os.WriteFile(filepath.Join(tmpDir, "test.go"), []byte(src), 0600)
-			Expect(err).NotTo(HaveOccurred())
-
-			services, err := ParseDirectory(tmpDir)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(services[0].Methods[0].Raw).To(BeFalse())
-		})
-
-		It("should reject raw=true with invalid return signature", func() {
-			src := `package host
-
-import "context"
-
-//nd:hostservice name=Test permission=test
-type TestService interface {
-	//nd:hostfunc raw=true
-	BadRaw(ctx context.Context, uri string) (result string, err error)
-}
-`
-			err := os.WriteFile(filepath.Join(tmpDir, "test.go"), []byte(src), 0600)
-			Expect(err).NotTo(HaveOccurred())
-
-			_, err = ParseDirectory(tmpDir)
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("raw=true"))
-			Expect(err.Error()).To(ContainSubstring("must return (string, []byte, error)"))
-		})
-
-		It("should reject raw=true without error return", func() {
-			src := `package host
-
-import "context"
-
-//nd:hostservice name=Test permission=test
-type TestService interface {
-	//nd:hostfunc raw=true
-	BadRaw(ctx context.Context, uri string) (contentType string, data []byte)
-}
-`
-			err := os.WriteFile(filepath.Join(tmpDir, "test.go"), []byte(src), 0600)
-			Expect(err).NotTo(HaveOccurred())
-
-			_, err = ParseDirectory(tmpDir)
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("raw=true"))
-		})
-
-		It("should parse mixed raw and non-raw methods", func() {
-			src := `package host
-
-import "context"
-
-//nd:hostservice name=API permission=api
-type APIService interface {
-	//nd:hostfunc
-	Call(ctx context.Context, uri string) (responseJSON string, err error)
-
-	//nd:hostfunc raw=true
-	CallRaw(ctx context.Context, uri string) (contentType string, data []byte, err error)
-}
-`
-			err := os.WriteFile(filepath.Join(tmpDir, "api.go"), []byte(src), 0600)
-			Expect(err).NotTo(HaveOccurred())
-
-			services, err := ParseDirectory(tmpDir)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(services).To(HaveLen(1))
-			Expect(services[0].Methods).To(HaveLen(2))
-			Expect(services[0].Methods[0].Raw).To(BeFalse())
-			Expect(services[0].Methods[1].Raw).To(BeTrue())
-			Expect(services[0].HasRawMethods()).To(BeTrue())
-		})
-
 		It("should handle custom export name", func() {
 			src := `package host
 

plugins/cmd/ndpgen/internal/templates/capability.rs.tmpl

@@ -7,20 +7,6 @@ use serde::{Deserialize, Serialize};
 {{- if hasHashMap .Capability}}
 use std::collections::HashMap;
 {{- end}}
-
-// Helper functions for skip_serializing_if with numeric types
-#[allow(dead_code)]
-fn is_zero_i32(value: &i32) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_u32(value: &u32) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_i64(value: &i64) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_u64(value: &u64) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_f32(value: &f32) -> bool { *value == 0.0 }
-#[allow(dead_code)]
-fn is_zero_f64(value: &f64) -> bool { *value == 0.0 }
 {{- end}}
 
 {{- /* Generate type alias definitions */ -}}

plugins/cmd/ndpgen/internal/templates/client.go.tmpl

@@ -8,9 +8,6 @@
 package {{.Package}}
 
 import (
-{{- if .Service.HasRawMethods}}
-	"encoding/binary"
-{{- end}}
 	"encoding/json"
 {{- if .Service.HasErrors}}
 	"errors"
@@ -52,7 +49,7 @@ type {{requestType .}} struct {
 {{- end}}
 }
 {{- end}}
-{{- if and (not .IsErrorOnly) (not .Raw)}}
+{{- if not .IsErrorOnly}}
 
 type {{responseType .}} struct {
 {{- range .Returns}}
@@ -98,27 +95,7 @@ func {{$.Service.Name}}{{.Name}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{
 	// Read the response from memory
 	responseMem := pdk.FindMemory(responsePtr)
 	responseBytes := responseMem.ReadBytes()
-{{- if .Raw}}
-
-	// Parse binary-framed response
-	if len(responseBytes) == 0 {
-		return "", nil, errors.New("empty response from host")
-	}
-	if responseBytes[0] == 0x01 { // error
-		return "", nil, errors.New(string(responseBytes[1:]))
-	}
-	if responseBytes[0] != 0x00 {
-		return "", nil, errors.New("unknown response status")
-	}
-	if len(responseBytes) < 5 {
-		return "", nil, errors.New("malformed raw response: incomplete header")
-	}
-	ctLen := binary.BigEndian.Uint32(responseBytes[1:5])
-	if uint32(len(responseBytes)) < 5+ctLen {
-		return "", nil, errors.New("malformed raw response: content-type overflow")
-	}
-	return string(responseBytes[5 : 5+ctLen]), responseBytes[5+ctLen:], nil
-{{- else if .IsErrorOnly}}
+{{- if .IsErrorOnly}}
 
 	// Parse error-only response
 	var response struct {

plugins/cmd/ndpgen/internal/templates/client.py.tmpl

@@ -8,13 +8,10 @@
 # main __init__.py file. Copy the needed functions from this file into your plugin.
 
 from dataclasses import dataclass
-from typing import Any{{- if .Service.HasRawMethods}}, Tuple{{end}}
+from typing import Any
 
 import extism
 import json
-{{- if .Service.HasRawMethods}}
-import struct
-{{- end}}
 
 
 class HostFunctionError(Exception):
@@ -32,7 +29,7 @@ def _{{exportName .}}(offset: int) -> int:
 {{- end}}
 {{- /* Generate dataclasses for multi-value returns */ -}}
 {{range .Service.Methods}}
-{{- if and .NeedsResultClass (not .Raw)}}
+{{- if .NeedsResultClass}}
 
 
 @dataclass
@@ -47,7 +44,7 @@ class {{pythonResultType .}}:
 {{range .Service.Methods}}
 
 
-def {{pythonFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.PythonName}}: {{$p.PythonType}}{{end}}){{if .Raw}} -> Tuple[str, bytes]{{else if .NeedsResultClass}} -> {{pythonResultType .}}{{else if .HasReturns}} -> {{(index .Returns 0).PythonType}}{{else}} -> None{{end}}:
+def {{pythonFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.PythonName}}: {{$p.PythonType}}{{end}}){{if .NeedsResultClass}} -> {{pythonResultType .}}{{else if .HasReturns}} -> {{(index .Returns 0).PythonType}}{{else}} -> None{{end}}:
     """{{if .Doc}}{{.Doc}}{{else}}Call the {{exportName .}} host function.{{end}}
 {{- if .HasParams}}
 
@@ -56,11 +53,7 @@ def {{pythonFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.PythonNam
         {{.PythonName}}: {{.PythonType}} parameter.
 {{- end}}
 {{- end}}
-{{- if .Raw}}
-
-    Returns:
-        Tuple of (content_type, data) with the raw binary response.
-{{- else if .HasReturns}}
+{{- if .HasReturns}}
 
     Returns:
 {{- if .NeedsResultClass}}
@@ -86,24 +79,6 @@ def {{pythonFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.PythonNam
     request_mem = extism.memory.alloc(request_bytes)
     response_offset = _{{exportName .}}(request_mem.offset)
     response_mem = extism.memory.find(response_offset)
-{{- if .Raw}}
-    response_bytes = response_mem.bytes()
-
-    if len(response_bytes) == 0:
-        raise HostFunctionError("empty response from host")
-    if response_bytes[0] == 0x01:
-        raise HostFunctionError(response_bytes[1:].decode("utf-8"))
-    if response_bytes[0] != 0x00:
-        raise HostFunctionError("unknown response status")
-    if len(response_bytes) < 5:
-        raise HostFunctionError("malformed raw response: incomplete header")
-    ct_len = struct.unpack(">I", response_bytes[1:5])[0]
-    if len(response_bytes) < 5 + ct_len:
-        raise HostFunctionError("malformed raw response: content-type overflow")
-    content_type = response_bytes[5:5 + ct_len].decode("utf-8")
-    data = response_bytes[5 + ct_len:]
-    return content_type, data
-{{- else}}
     response = json.loads(extism.memory.string(response_mem))
 {{if .HasError}}
     if response.get("error"):
@@ -119,4 +94,3 @@ def {{pythonFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.PythonNam
     return response.get("{{(index .Returns 0).JSONName}}"{{pythonDefault (index .Returns 0)}})
 {{- end}}
 {{- end}}
-{{- end}}

plugins/cmd/ndpgen/internal/templates/client.rs.tmpl

@@ -33,7 +33,6 @@ struct {{requestType .}} {
 {{- end}}
 }
 {{- end}}
-{{- if not .Raw}}
 
 #[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -48,92 +47,16 @@ struct {{responseType .}} {
 {{- end}}
 }
 {{- end}}
-{{- end}}
 
 #[host_fn]
 extern "ExtismHost" {
 {{- range .Service.Methods}}
-{{- if not .Raw}}
     fn {{exportName .}}(input: Json<{{if .HasParams}}{{requestType .}}{{else}}serde_json::Value{{end}}>) -> Json<{{responseType .}}>;
 {{- end}}
-{{- end}}
 }
-{{- /* Declare raw extern "C" imports for raw methods */ -}}
-{{- range .Service.Methods}}
-{{- if .Raw}}
-
-#[link(wasm_import_module = "extism:host/user")]
-extern "C" {
-    fn {{exportName .}}(offset: u64) -> u64;
-}
-{{- end}}
-{{- end}}
 
 {{- /* Generate wrapper functions */ -}}
 {{range .Service.Methods}}
-{{- if .Raw}}
-
-{{if .Doc}}{{rustDocComment .Doc}}{{else}}/// Calls the {{exportName .}} host function.{{end}}
-{{- if .HasParams}}
-///
-/// # Arguments
-{{- range .Params}}
-/// * `{{.RustName}}` - {{rustType .}} parameter.
-{{- end}}
-{{- end}}
-///
-/// # Returns
-/// A tuple of (content_type, data) with the raw binary response.
-///
-/// # Errors
-/// Returns an error if the host function call fails.
-pub fn {{rustFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.RustName}}: {{rustParamType $p}}{{end}}) -> Result<(String, Vec<u8>), Error> {
-{{- if .HasParams}}
-    let req = {{requestType .}} {
-{{- range .Params}}
-        {{.RustName}}: {{.RustName}}{{if .NeedsToOwned}}.to_owned(){{end}},
-{{- end}}
-    };
-    let input_bytes = serde_json::to_vec(&req).map_err(|e| Error::msg(e.to_string()))?;
-{{- else}}
-    let input_bytes = b"{}".to_vec();
-{{- end}}
-    let input_mem = Memory::from_bytes(&input_bytes).map_err(|e| Error::msg(e.to_string()))?;
-
-    let response_offset = unsafe { {{exportName .}}(input_mem.offset()) };
-
-    let response_mem = Memory::find(response_offset)
-        .ok_or_else(|| Error::msg("empty response from host"))?;
-    let response_bytes = response_mem.to_vec();
-
-    if response_bytes.is_empty() {
-        return Err(Error::msg("empty response from host"));
-    }
-    if response_bytes[0] == 0x01 {
-        let msg = String::from_utf8_lossy(&response_bytes[1..]).to_string();
-        return Err(Error::msg(msg));
-    }
-    if response_bytes[0] != 0x00 {
-        return Err(Error::msg("unknown response status"));
-    }
-    if response_bytes.len() < 5 {
-        return Err(Error::msg("malformed raw response: incomplete header"));
-    }
-    let ct_len = u32::from_be_bytes([
-        response_bytes[1],
-        response_bytes[2],
-        response_bytes[3],
-        response_bytes[4],
-    ]) as usize;
-    if ct_len > response_bytes.len() - 5 {
-        return Err(Error::msg("malformed raw response: content-type overflow"));
-    }
-    let ct_end = 5 + ct_len;
-    let content_type = String::from_utf8_lossy(&response_bytes[5..ct_end]).to_string();
-    let data = response_bytes[ct_end..].to_vec();
-    Ok((content_type, data))
-}
-{{- else}}
 
 {{if .Doc}}{{rustDocComment .Doc}}{{else}}/// Calls the {{exportName .}} host function.{{end}}
 {{- if .HasParams}}
@@ -209,4 +132,3 @@ pub fn {{rustFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.RustName
 }
 {{- end}}
 {{- end}}
-{{- end}}

plugins/cmd/ndpgen/internal/templates/host.go.tmpl

@@ -4,9 +4,6 @@ package {{.Package}}
 
 import (
 	"context"
-{{- if .Service.HasRawMethods}}
-	"encoding/binary"
-{{- end}}
 	"encoding/json"
 
 	extism "github.com/extism/go-sdk"
@@ -23,7 +20,6 @@ type {{requestType .}} struct {
 {{- end}}
 }
 {{- end}}
-{{- if not .Raw}}
 
 // {{responseType .}} is the response type for {{$.Service.Name}}.{{.Name}}.
 type {{responseType .}} struct {
@@ -34,7 +30,6 @@ type {{responseType .}} struct {
 	Error string `json:"error,omitempty"`
 {{- end}}
 }
-{{- end}}
 {{end}}
 
 // Register{{.Service.Name}}HostFunctions registers {{.Service.Name}} service host functions.
@@ -56,48 +51,18 @@ func new{{$.Service.Name}}{{.Name}}HostFunction(service {{$.Service.Interface}})
 			// Read JSON request from plugin memory
 			reqBytes, err := p.ReadBytes(stack[0])
 			if err != nil {
-{{- if .Raw}}
-				{{$.Service.Name | lower}}WriteRawError(p, stack, err)
-{{- else}}
 				{{$.Service.Name | lower}}WriteError(p, stack, err)
-{{- end}}
 				return
 			}
 			var req {{requestType .}}
 			if err := json.Unmarshal(reqBytes, &req); err != nil {
-{{- if .Raw}}
-				{{$.Service.Name | lower}}WriteRawError(p, stack, err)
-{{- else}}
 				{{$.Service.Name | lower}}WriteError(p, stack, err)
-{{- end}}
 				return
 			}
 {{- end}}
 
 			// Call the service method
-{{- if .Raw}}
-			{{range $i, $r := .Returns}}{{if $i}}, {{end}}{{lower $r.Name}}{{end}}, svcErr := service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}})
-			if svcErr != nil {
-				{{$.Service.Name | lower}}WriteRawError(p, stack, svcErr)
-				return
-			}
-
-			// Write binary-framed response to plugin memory:
-			// [0x00][4-byte content-type length (big-endian)][content-type string][raw data]
-			ctBytes := []byte({{lower (index .Returns 0).Name}})
-			frame := make([]byte, 1+4+len(ctBytes)+len({{lower (index .Returns 1).Name}}))
-			frame[0] = 0x00 // success
-			binary.BigEndian.PutUint32(frame[1:5], uint32(len(ctBytes)))
-			copy(frame[5:5+len(ctBytes)], ctBytes)
-			copy(frame[5+len(ctBytes):], {{lower (index .Returns 1).Name}})
-
-			respPtr, err := p.WriteBytes(frame)
-			if err != nil {
-				stack[0] = 0
-				return
-			}
-			stack[0] = respPtr
-{{- else if .HasReturns}}
+{{- if .HasReturns}}
 {{- if .HasError}}
 			{{range $i, $r := .Returns}}{{if $i}}, {{end}}{{lower $r.Name}}{{end}}, svcErr := service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}})
 			if svcErr != nil {
@@ -107,6 +72,14 @@ func new{{$.Service.Name}}{{.Name}}HostFunction(service {{$.Service.Interface}})
 {{- else}}
 			{{range $i, $r := .Returns}}{{if $i}}, {{end}}{{lower $r.Name}}{{end}} := service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}})
 {{- end}}
+{{- else if .HasError}}
+			if svcErr := service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}}); svcErr != nil {
+				{{$.Service.Name | lower}}WriteError(p, stack, svcErr)
+				return
+			}
+{{- else}}
+			service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}})
+{{- end}}
 
 			// Write JSON response to plugin memory
 			resp := {{responseType .}}{
@@ -115,22 +88,6 @@ func new{{$.Service.Name}}{{.Name}}HostFunction(service {{$.Service.Interface}})
 {{- end}}
 			}
 			{{$.Service.Name | lower}}WriteResponse(p, stack, resp)
-{{- else if .HasError}}
-			if svcErr := service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}}); svcErr != nil {
-				{{$.Service.Name | lower}}WriteError(p, stack, svcErr)
-				return
-			}
-
-			// Write JSON response to plugin memory
-			resp := {{responseType .}}{}
-			{{$.Service.Name | lower}}WriteResponse(p, stack, resp)
-{{- else}}
-			service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}})
-
-			// Write JSON response to plugin memory
-			resp := {{responseType .}}{}
-			{{$.Service.Name | lower}}WriteResponse(p, stack, resp)
-{{- end}}
 		},
 		[]extism.ValueType{extism.ValueTypePTR},
 		[]extism.ValueType{extism.ValueTypePTR},
@@ -162,16 +119,3 @@ func {{.Service.Name | lower}}WriteError(p *extism.CurrentPlugin, stack []uint64
 	respPtr, _ := p.WriteBytes(respBytes)
 	stack[0] = respPtr
 }
-{{- if .Service.HasRawMethods}}
-
-// {{.Service.Name | lower}}WriteRawError writes a binary-framed error response to plugin memory.
-// Format: [0x01][UTF-8 error message]
-func {{.Service.Name | lower}}WriteRawError(p *extism.CurrentPlugin, stack []uint64, err error) {
-	errMsg := []byte(err.Error())
-	frame := make([]byte, 1+len(errMsg))
-	frame[0] = 0x01 // error
-	copy(frame[1:], errMsg)
-	respPtr, _ := p.WriteBytes(frame)
-	stack[0] = respPtr
-}
-{{- end}}

plugins/cmd/ndpgen/internal/types.go

@@ -173,16 +173,6 @@ func (s Service) HasErrors() bool {
 	return false
 }
 
-// HasRawMethods returns true if any method in the service uses raw binary framing.
-func (s Service) HasRawMethods() bool {
-	for _, m := range s.Methods {
-		if m.Raw {
-			return true
-		}
-	}
-	return false
-}
-
 // Method represents a host function method within a service.
 type Method struct {
 	Name       string  // Go method name (e.g., "Call")
@@ -191,7 +181,6 @@ type Method struct {
 	Returns    []Param // Return values (excluding error)
 	HasError   bool    // Whether the method returns an error
 	Doc        string  // Documentation comment for the method
-	Raw        bool    // If true, response uses binary framing instead of JSON
 }
 
 // FunctionName returns the Extism host function export name.
@@ -477,7 +466,9 @@ func RustDefaultValue(goType string) string {
 	switch goType {
 	case "string":
 		return `String::new()`
-	case "int", "int32", "int64", "uint", "uint32", "uint64":
+	case "int", "int32":
+		return "0"
+	case "int64":
 		return "0"
 	case "float32", "float64":
 		return "0.0"
@@ -611,10 +602,6 @@ func ToRustTypeWithStructs(goType string, knownStructs map[string]bool) string {
 		return "i32"
 	case "int64":
 		return "i64"
-	case "uint", "uint32":
-		return "u32"
-	case "uint64":
-		return "u64"
 	case "float32":
 		return "f32"
 	case "float64":

plugins/cmd/ndpgen/internal/xtp_schema.go

@@ -106,7 +106,7 @@ func buildExport(export Export) xtpExport {
 // isPrimitiveGoType returns true if the Go type is a primitive type.
 func isPrimitiveGoType(goType string) bool {
 	switch goType {
-	case "bool", "string", "int", "int32", "int64", "uint", "uint32", "uint64", "float32", "float64", "[]byte":
+	case "bool", "string", "int", "int32", "int64", "float32", "float64", "[]byte":
 		return true
 	}
 	return false
@@ -302,12 +302,6 @@ func goTypeToXTPTypeAndFormat(goType string) (typ, format string) {
 		return "integer", "int32"
 	case "int64":
 		return "integer", "int64"
-	case "uint", "uint32":
-		// XTP schema doesn't support unsigned formats; use int64 to hold full uint32 range
-		return "integer", "int64"
-	case "uint64":
-		// XTP schema doesn't support unsigned formats; use int64 (may lose precision for large values)
-		return "integer", "int64"
 	case "float32":
 		return "number", "float"
 	case "float64":

plugins/cmd/ndpgen/testdata/raw_client_expected.go.txt

@@ -1,66 +0,0 @@
-// Code generated by ndpgen. DO NOT EDIT.
-//
-// This file contains client wrappers for the Stream host service.
-// It is intended for use in Navidrome plugins built with TinyGo.
-//
-//go:build wasip1
-
-package ndpdk
-
-import (
-	"encoding/binary"
-	"encoding/json"
-	"errors"
-
-	"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
-)
-
-// stream_getstream is the host function provided by Navidrome.
-//
-//go:wasmimport extism:host/user stream_getstream
-func stream_getstream(uint64) uint64
-
-type streamGetStreamRequest struct {
-	Uri string `json:"uri"`
-}
-
-// StreamGetStream calls the stream_getstream host function.
-// GetStream returns raw binary stream data with content type.
-func StreamGetStream(uri string) (string, []byte, error) {
-	// Marshal request to JSON
-	req := streamGetStreamRequest{
-		Uri: uri,
-	}
-	reqBytes, err := json.Marshal(req)
-	if err != nil {
-		return "", nil, err
-	}
-	reqMem := pdk.AllocateBytes(reqBytes)
-	defer reqMem.Free()
-
-	// Call the host function
-	responsePtr := stream_getstream(reqMem.Offset())
-
-	// Read the response from memory
-	responseMem := pdk.FindMemory(responsePtr)
-	responseBytes := responseMem.ReadBytes()
-
-	// Parse binary-framed response
-	if len(responseBytes) == 0 {
-		return "", nil, errors.New("empty response from host")
-	}
-	if responseBytes[0] == 0x01 { // error
-		return "", nil, errors.New(string(responseBytes[1:]))
-	}
-	if responseBytes[0] != 0x00 {
-		return "", nil, errors.New("unknown response status")
-	}
-	if len(responseBytes) < 5 {
-		return "", nil, errors.New("malformed raw response: incomplete header")
-	}
-	ctLen := binary.BigEndian.Uint32(responseBytes[1:5])
-	if uint32(len(responseBytes)) < 5+ctLen {
-		return "", nil, errors.New("malformed raw response: content-type overflow")
-	}
-	return string(responseBytes[5 : 5+ctLen]), responseBytes[5+ctLen:], nil
-}

plugins/cmd/ndpgen/testdata/raw_client_expected.py

@@ -1,63 +0,0 @@
-# Code generated by ndpgen. DO NOT EDIT.
-#
-# This file contains client wrappers for the Stream host service.
-# It is intended for use in Navidrome plugins built with extism-py.
-#
-# IMPORTANT: Due to a limitation in extism-py, you cannot import this file directly.
-# The @extism.import_fn decorators are only detected when defined in the plugin's
-# main __init__.py file. Copy the needed functions from this file into your plugin.
-
-from dataclasses import dataclass
-from typing import Any, Tuple
-
-import extism
-import json
-import struct
-
-
-class HostFunctionError(Exception):
-    """Raised when a host function returns an error."""
-    pass
-
-
-@extism.import_fn("extism:host/user", "stream_getstream")
-def _stream_getstream(offset: int) -> int:
-    """Raw host function - do not call directly."""
-    ...
-
-
-def stream_get_stream(uri: str) -> Tuple[str, bytes]:
-    """GetStream returns raw binary stream data with content type.
-
-    Args:
-        uri: str parameter.
-
-    Returns:
-        Tuple of (content_type, data) with the raw binary response.
-
-    Raises:
-        HostFunctionError: If the host function returns an error.
-    """
-    request = {
-        "uri": uri,
-    }
-    request_bytes = json.dumps(request).encode("utf-8")
-    request_mem = extism.memory.alloc(request_bytes)
-    response_offset = _stream_getstream(request_mem.offset)
-    response_mem = extism.memory.find(response_offset)
-    response_bytes = response_mem.bytes()
-
-    if len(response_bytes) == 0:
-        raise HostFunctionError("empty response from host")
-    if response_bytes[0] == 0x01:
-        raise HostFunctionError(response_bytes[1:].decode("utf-8"))
-    if response_bytes[0] != 0x00:
-        raise HostFunctionError("unknown response status")
-    if len(response_bytes) < 5:
-        raise HostFunctionError("malformed raw response: incomplete header")
-    ct_len = struct.unpack(">I", response_bytes[1:5])[0]
-    if len(response_bytes) < 5 + ct_len:
-        raise HostFunctionError("malformed raw response: content-type overflow")
-    content_type = response_bytes[5:5 + ct_len].decode("utf-8")
-    data = response_bytes[5 + ct_len:]
-    return content_type, data

plugins/cmd/ndpgen/testdata/raw_client_expected.rs

@@ -1,73 +0,0 @@
-// Code generated by ndpgen. DO NOT EDIT.
-//
-// This file contains client wrappers for the Stream host service.
-// It is intended for use in Navidrome plugins built with extism-pdk.
-
-use extism_pdk::*;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct StreamGetStreamRequest {
-    uri: String,
-}
-
-#[host_fn]
-extern "ExtismHost" {
-}
-
-#[link(wasm_import_module = "extism:host/user")]
-extern "C" {
-    fn stream_getstream(offset: u64) -> u64;
-}
-
-/// GetStream returns raw binary stream data with content type.
-///
-/// # Arguments
-/// * `uri` - String parameter.
-///
-/// # Returns
-/// A tuple of (content_type, data) with the raw binary response.
-///
-/// # Errors
-/// Returns an error if the host function call fails.
-pub fn get_stream(uri: &str) -> Result<(String, Vec<u8>), Error> {
-    let req = StreamGetStreamRequest {
-        uri: uri.to_owned(),
-    };
-    let input_bytes = serde_json::to_vec(&req).map_err(|e| Error::msg(e.to_string()))?;
-    let input_mem = Memory::from_bytes(&input_bytes).map_err(|e| Error::msg(e.to_string()))?;
-
-    let response_offset = unsafe { stream_getstream(input_mem.offset()) };
-
-    let response_mem = Memory::find(response_offset)
-        .ok_or_else(|| Error::msg("empty response from host"))?;
-    let response_bytes = response_mem.to_vec();
-
-    if response_bytes.is_empty() {
-        return Err(Error::msg("empty response from host"));
-    }
-    if response_bytes[0] == 0x01 {
-        let msg = String::from_utf8_lossy(&response_bytes[1..]).to_string();
-        return Err(Error::msg(msg));
-    }
-    if response_bytes[0] != 0x00 {
-        return Err(Error::msg("unknown response status"));
-    }
-    if response_bytes.len() < 5 {
-        return Err(Error::msg("malformed raw response: incomplete header"));
-    }
-    let ct_len = u32::from_be_bytes([
-        response_bytes[1],
-        response_bytes[2],
-        response_bytes[3],
-        response_bytes[4],
-    ]) as usize;
-    if ct_len > response_bytes.len() - 5 {
-        return Err(Error::msg("malformed raw response: content-type overflow"));
-    }
-    let ct_end = 5 + ct_len;
-    let content_type = String::from_utf8_lossy(&response_bytes[5..ct_end]).to_string();
-    let data = response_bytes[ct_end..].to_vec();
-    Ok((content_type, data))
-}

plugins/cmd/ndpgen/testdata/raw_service.go.txt

@@ -1,10 +0,0 @@
-package testpkg
-
-import "context"
-
-//nd:hostservice name=Stream permission=stream
-type StreamService interface {
-	// GetStream returns raw binary stream data with content type.
-	//nd:hostfunc raw=true
-	GetStream(ctx context.Context, uri string) (contentType string, data []byte, err error)
-}

plugins/examples/README.md

@@ -9,6 +9,7 @@ This folder contains example plugins demonstrating various capabilities and lang
 | [minimal](minimal/)                                   | Go       | MetadataAgent                                   | Basic plugin structure         |
 | [wikimedia](wikimedia/)                               | Go       | MetadataAgent                                   | Wikidata/Wikipedia metadata    |
 | [crypto-ticker](crypto-ticker/)                       | Go       | Scheduler, WebSocket, Cache                     | Real-time crypto prices (demo) |
+| [discord-rich-presence](discord-rich-presence/)       | Go       | Scrobbler, Scheduler, WebSocket, Cache, Artwork | Discord integration            |
 | [coverartarchive-py](coverartarchive-py/)             | Python   | MetadataAgent                                   | Cover Art Archive              |
 | [nowplaying-py](nowplaying-py/)                       | Python   | Scheduler, SubsonicAPI                          | Now playing logger             |
 | [webhook-rs](webhook-rs/)                             | Rust     | Scrobbler                                       | HTTP webhook on scrobble       |
@@ -36,7 +37,7 @@ This creates `.ndp` package files for each plugin.
 ```bash
 make minimal.ndp
 make wikimedia.ndp
-make discord-rich-presence-rs.ndp
+make discord-rich-presence.ndp
 ```
 
 ### Clean

plugins/examples/crypto-ticker/manifest.json

@@ -60,6 +60,9 @@
     }
   },
   "permissions": {
+    "config": {
+      "reason": "To read ticker symbols configuration"
+    },
     "scheduler": {
       "reason": "To schedule reconnection attempts on connection loss"
     },

plugins/examples/discord-rich-presence-rs/README.md

@@ -29,7 +29,7 @@ This plugin implements multiple capabilities to demonstrate the nd-pdk library:
 
 ## Configuration
 
-Configure in the Navidrome UI (Settings → Plugins → discord-rich-presence-rs):
+Configure in the Navidrome UI (Settings → Plugins → discord-rich-presence):
 
 | Key           | Description                          | Example                   |
 |---------------|--------------------------------------|---------------------------|

plugins/examples/discord-rich-presence/README.md

@@ -0,0 +1,135 @@
+# Discord Rich Presence Plugin
+
+This example plugin integrates Navidrome with Discord Rich Presence. It shows how a plugin can keep a real-time connection to an external service while remaining completely stateless. This plugin is based on the [Navicord](https://github.com/logixism/navicord) project, which provides similar functionality.
+
+**⚠️ WARNING: This plugin is for demonstration purposes only. It relies on the user's Discord token being stored in the Navidrome configuration file, which is not secure and may be against Discord's terms of service. Use it at your own risk.**
+
+## Overview
+
+The plugin exposes three capabilities:
+
+- **Scrobbler** – receives `NowPlaying` notifications from Navidrome
+- **WebSocketCallback** – handles Discord gateway messages
+- **SchedulerCallback** – used to clear presence and send periodic heartbeats
+
+It relies on several host services declared in the manifest:
+
+- `http` – queries Discord API endpoints
+- `websocket` – maintains gateway connections
+- `scheduler` – schedules heartbeats and presence cleanup
+- `cache` – stores sequence numbers for heartbeats
+- `artwork` – resolves track artwork URLs
+
+## Architecture
+
+The plugin registers capabilities using the PDK Register pattern:
+
+```go
+import (
+    "github.com/navidrome/navidrome/plugins/pdk/go/scrobbler"
+    "github.com/navidrome/navidrome/plugins/pdk/go/scheduler"
+    "github.com/navidrome/navidrome/plugins/pdk/go/websocket"
+)
+
+type discordPlugin struct{}
+
+func init() {
+    scrobbler.Register(&discordPlugin{})
+    scheduler.Register(&discordPlugin{})
+    websocket.Register(&discordPlugin{})
+}
+```
+
+The PDK generates the appropriate export wrappers automatically.
+
+When `NowPlaying` is invoked the plugin:
+
+1. Loads `clientid` and user tokens from the configuration (because plugins are stateless).
+2. Connects to Discord using `WebSocketService` if no connection exists.
+3. Sends the activity payload with track details and artwork.
+4. Schedules a one-time callback to clear the presence after the track finishes.
+
+Heartbeat messages are sent by a recurring scheduler job. Sequence numbers received from Discord are stored in `CacheService` to remain available across plugin instances.
+
+The scheduler callback uses the `payload` field to route to the appropriate handler:
+- `"heartbeat"` – sends a heartbeat to Discord (recurring)
+- `"clear-activity"` – clears the presence and disconnects (one-time)
+
+## Stateless Operation
+
+Navidrome plugins are completely stateless – each method call instantiates a new plugin instance and discards it afterwards.
+
+To work within this model the plugin stores no in-memory state. Connections are keyed by username inside the host services and any transient data (like Discord sequence numbers) is kept in the cache. Configuration is reloaded on every method call.
+
+## Configuration
+
+Configure in the Navidrome UI (Settings → Plugins → discord-rich-presence):
+
+| Key           | Description                                | Example                        |
+|---------------|-------------------------------------------|--------------------------------|
+| `clientid`    | Your Discord application ID               | `123456789012345678`           |
+| `user.<name>` | Discord token for the specified user      | `user.alice` = `token123`      |
+
+Each user is configured as a separate key with the `user.` prefix.
+
+## Building
+
+From the `plugins/examples/` directory:
+
+```sh
+make discord-rich-presence.ndp
+```
+
+Or manually:
+
+```sh
+cd discord-rich-presence
+tinygo build -target wasip1 -buildmode=c-shared -o plugin.wasm .
+zip -j discord-rich-presence.ndp manifest.json plugin.wasm
+```
+
+## Installation
+
+Place the resulting `discord-rich-presence.ndp` in your Navidrome plugins folder and enable plugins in your configuration:
+
+```toml
+[Plugins]
+Enabled = true
+Folder = "/path/to/plugins"
+```
+
+## Files
+
+| File      | Description                                                      |
+|-----------|------------------------------------------------------------------|
+| `main.go` | Plugin entry point, capability registration, and implementations |
+| `rpc.go`  | Discord gateway communication and RPC logic                      |
+| `go.mod`  | Go module file                                                   |
+
+## PDK
+
+This plugin imports the Navidrome PDK subpackages directly:
+
+```go
+import (
+    "github.com/navidrome/navidrome/plugins/pdk/go/host"
+    "github.com/navidrome/navidrome/plugins/pdk/go/scheduler"
+    "github.com/navidrome/navidrome/plugins/pdk/go/scrobbler"
+    "github.com/navidrome/navidrome/plugins/pdk/go/websocket"
+)
+```
+
+The `go.mod` file uses `replace` directives to point to the local packages for development.
+
+## Host Services Used
+
+| Service   | Purpose                                                          |
+|-----------|------------------------------------------------------------------|
+| Cache     | Store Discord sequence numbers and processed image URLs          |
+| Scheduler | Schedule heartbeats (recurring) and activity clearing (one-time) |
+| WebSocket | Maintain persistent connection to Discord gateway                |
+| Artwork   | Get track artwork URLs for rich presence display                 |
+
+## Implementation Details
+
+See `main.go` and `rpc.go` for the complete implementation.

plugins/examples/discord-rich-presence/go.mod

@@ -0,0 +1,32 @@
+module discord-rich-presence
+
+go 1.25
+
+require (
+	github.com/navidrome/navidrome/plugins/pdk/go v0.0.0
+	github.com/onsi/ginkgo/v2 v2.27.3
+	github.com/onsi/gomega v1.38.3
+	github.com/stretchr/testify v1.11.1
+)
+
+require (
+	github.com/Masterminds/semver/v3 v3.4.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/extism/go-pdk v1.1.3 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/mod v0.27.0 // indirect
+	golang.org/x/net v0.43.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
+	golang.org/x/tools v0.36.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
+
+replace github.com/navidrome/navidrome/plugins/pdk/go => ../../pdk/go

plugins/examples/discord-rich-presence/go.sum

@@ -0,0 +1,73 @@
+github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
+github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/extism/go-pdk v1.1.3 h1:hfViMPWrqjN6u67cIYRALZTZLk/enSPpNKa+rZ9X2SQ=
+github.com/extism/go-pdk v1.1.3/go.mod h1:Gz+LIU/YCKnKXhgge8yo5Yu1F/lbv7KtKFkiCSzW/P4=
+github.com/gkampitakis/ciinfo v0.3.2 h1:JcuOPk8ZU7nZQjdUhctuhQofk7BGHuIy0c9Ez8BNhXs=
+github.com/gkampitakis/ciinfo v0.3.2/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo=
+github.com/gkampitakis/go-diff v1.3.2 h1:Qyn0J9XJSDTgnsgHRdz9Zp24RaJeKMUHg2+PDZZdC4M=
+github.com/gkampitakis/go-diff v1.3.2/go.mod h1:LLgOrpqleQe26cte8s36HTWcTmMEur6OPYerdAAS9tk=
+github.com/gkampitakis/go-snaps v0.5.15 h1:amyJrvM1D33cPHwVrjo9jQxX8g/7E2wYdZ+01KS3zGE=
+github.com/gkampitakis/go-snaps v0.5.15/go.mod h1:HNpx/9GoKisdhw9AFOBT1N7DBs9DiHo/hGheFGBZ+mc=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
+github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
+github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
+github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
+github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE=
+github.com/joshdk/go-junit v1.0.0/go.mod h1:TiiV0PqkaNfFXjEiyjWM3XXrhVyCa1K4Zfga6W52ung=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo=
+github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
+github.com/mfridman/tparse v0.18.0 h1:wh6dzOKaIwkUGyKgOntDW4liXSo37qg5AXbIhkMV3vE=
+github.com/mfridman/tparse v0.18.0/go.mod h1:gEvqZTuCgEhPbYk/2lS3Kcxg1GmTxxU7kTC8DvP0i/A=
+github.com/onsi/ginkgo/v2 v2.27.3 h1:ICsZJ8JoYafeXFFlFAG75a7CxMsJHwgKwtO+82SE9L8=
+github.com/onsi/ginkgo/v2 v2.27.3/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
+github.com/onsi/gomega v1.38.3 h1:eTX+W6dobAYfFeGC2PV6RwXRu/MyT+cQguijutvkpSM=
+github.com/onsi/gomega v1.38.3/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
+github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
+github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
+go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
+golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
+golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
+golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
+google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
+google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

plugins/examples/discord-rich-presence/main.go

@@ -0,0 +1,219 @@
+// Discord Rich Presence Plugin for Navidrome
+//
+// This plugin integrates Navidrome with Discord Rich Presence. It shows how a plugin can
+// keep a real-time connection to an external service while remaining completely stateless.
+//
+// Capabilities: Scrobbler, SchedulerCallback, WebSocketCallback
+//
+// NOTE: This plugin is for demonstration purposes only. It relies on the user's Discord
+// token being stored in the Navidrome configuration file, which is not secure and may be
+// against Discord's terms of service. Use it at your own risk.
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/navidrome/navidrome/plugins/pdk/go/host"
+	"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
+	"github.com/navidrome/navidrome/plugins/pdk/go/scheduler"
+	"github.com/navidrome/navidrome/plugins/pdk/go/scrobbler"
+	"github.com/navidrome/navidrome/plugins/pdk/go/websocket"
+)
+
+// Configuration keys
+const (
+	clientIDKey = "clientid"
+	usersKey    = "users"
+)
+
+// userToken represents a user-token mapping from the config
+type userToken struct {
+	Username string `json:"username"`
+	Token    string `json:"token"`
+}
+
+// discordPlugin implements the scrobbler and scheduler interfaces.
+type discordPlugin struct{}
+
+// rpc handles Discord gateway communication (via websockets).
+var rpc = &discordRPC{}
+
+// init registers the plugin capabilities
+func init() {
+	scrobbler.Register(&discordPlugin{})
+	scheduler.Register(&discordPlugin{})
+	websocket.Register(rpc)
+}
+
+// getConfig loads the plugin configuration.
+func getConfig() (clientID string, users map[string]string, err error) {
+	clientID, ok := pdk.GetConfig(clientIDKey)
+	if !ok || clientID == "" {
+		pdk.Log(pdk.LogWarn, "missing ClientID in configuration")
+		return "", nil, nil
+	}
+
+	// Get the users array from config
+	usersJSON, ok := pdk.GetConfig(usersKey)
+	if !ok || usersJSON == "" {
+		pdk.Log(pdk.LogWarn, "no users configured")
+		return clientID, nil, nil
+	}
+
+	// Parse the JSON array
+	var userTokens []userToken
+	if err := json.Unmarshal([]byte(usersJSON), &userTokens); err != nil {
+		pdk.Log(pdk.LogError, fmt.Sprintf("failed to parse users config: %v", err))
+		return clientID, nil, nil
+	}
+
+	if len(userTokens) == 0 {
+		pdk.Log(pdk.LogWarn, "no users configured")
+		return clientID, nil, nil
+	}
+
+	// Build the users map
+	users = make(map[string]string)
+	for _, ut := range userTokens {
+		if ut.Username != "" && ut.Token != "" {
+			users[ut.Username] = ut.Token
+		}
+	}
+
+	if len(users) == 0 {
+		pdk.Log(pdk.LogWarn, "no valid users configured")
+		return clientID, nil, nil
+	}
+
+	return clientID, users, nil
+}
+
+// getImageURL retrieves the track artwork URL.
+func getImageURL(trackID string) string {
+	artworkURL, err := host.ArtworkGetTrackUrl(trackID, 300)
+	if err != nil {
+		pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to get artwork URL: %v", err))
+		return ""
+	}
+
+	// Don't use localhost URLs
+	if strings.HasPrefix(artworkURL, "http://localhost") {
+		return ""
+	}
+	return artworkURL
+}
+
+// ============================================================================
+// Scrobbler Implementation
+// ============================================================================
+
+// IsAuthorized checks if a user is authorized for Discord Rich Presence.
+func (p *discordPlugin) IsAuthorized(input scrobbler.IsAuthorizedRequest) (bool, error) {
+	_, users, err := getConfig()
+	if err != nil {
+		return false, fmt.Errorf("failed to check user authorization: %w", err)
+	}
+
+	_, authorized := users[input.Username]
+	pdk.Log(pdk.LogInfo, fmt.Sprintf("IsAuthorized for user %s: %v", input.Username, authorized))
+	return authorized, nil
+}
+
+// NowPlaying sends a now playing notification to Discord.
+func (p *discordPlugin) NowPlaying(input scrobbler.NowPlayingRequest) error {
+	pdk.Log(pdk.LogInfo, fmt.Sprintf("Setting presence for user %s, track: %s", input.Username, input.Track.Title))
+
+	// Load configuration
+	clientID, users, err := getConfig()
+	if err != nil {
+		return fmt.Errorf("%w: failed to get config: %v", scrobbler.ScrobblerErrorRetryLater, err)
+	}
+
+	// Check authorization
+	userToken, authorized := users[input.Username]
+	if !authorized {
+		return fmt.Errorf("%w: user '%s' not authorized", scrobbler.ScrobblerErrorNotAuthorized, input.Username)
+	}
+
+	// Connect to Discord
+	if err := rpc.connect(input.Username, userToken); err != nil {
+		return fmt.Errorf("%w: failed to connect to Discord: %v", scrobbler.ScrobblerErrorRetryLater, err)
+	}
+
+	// Cancel any existing completion schedule
+	_ = host.SchedulerCancelSchedule(fmt.Sprintf("%s-clear", input.Username))
+
+	// Calculate timestamps
+	now := time.Now().Unix()
+	startTime := (now - int64(input.Position)) * 1000
+	endTime := startTime + int64(input.Track.Duration)*1000
+
+	// Send activity update
+	if err := rpc.sendActivity(clientID, input.Username, userToken, activity{
+		Application: clientID,
+		Name:        "Navidrome",
+		Type:        2, // Listening
+		Details:     input.Track.Title,
+		State:       input.Track.Artist,
+		Timestamps: activityTimestamps{
+			Start: startTime,
+			End:   endTime,
+		},
+		Assets: activityAssets{
+			LargeImage: getImageURL(input.Track.ID),
+			LargeText:  input.Track.Album,
+		},
+	}); err != nil {
+		return fmt.Errorf("%w: failed to send activity: %v", scrobbler.ScrobblerErrorRetryLater, err)
+	}
+
+	// Schedule a timer to clear the activity after the track completes
+	remainingSeconds := int32(input.Track.Duration) - input.Position + 5
+	_, err = host.SchedulerScheduleOneTime(remainingSeconds, payloadClearActivity, fmt.Sprintf("%s-clear", input.Username))
+	if err != nil {
+		pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to schedule completion timer: %v", err))
+	}
+
+	return nil
+}
+
+// Scrobble handles scrobble requests (no-op for Discord).
+func (p *discordPlugin) Scrobble(_ scrobbler.ScrobbleRequest) error {
+	// Discord Rich Presence doesn't need scrobble events
+	return nil
+}
+
+// ============================================================================
+// Scheduler Callback Implementation
+// ============================================================================
+
+// OnCallback handles scheduler callbacks.
+func (p *discordPlugin) OnCallback(input scheduler.SchedulerCallbackRequest) error {
+	pdk.Log(pdk.LogDebug, fmt.Sprintf("Scheduler callback: id=%s, payload=%s, recurring=%v", input.ScheduleID, input.Payload, input.IsRecurring))
+
+	// Route based on payload
+	switch input.Payload {
+	case payloadHeartbeat:
+		// Heartbeat callback - scheduleId is the username
+		if err := rpc.handleHeartbeatCallback(input.ScheduleID); err != nil {
+			return err
+		}
+
+	case payloadClearActivity:
+		// Clear activity callback - scheduleId is "username-clear"
+		username := strings.TrimSuffix(input.ScheduleID, "-clear")
+		if err := rpc.handleClearActivityCallback(username); err != nil {
+			return err
+		}
+
+	default:
+		pdk.Log(pdk.LogWarn, fmt.Sprintf("Unknown scheduler callback payload: %s", input.Payload))
+	}
+
+	return nil
+}
+
+func main() {}

plugins/examples/discord-rich-presence/main_test.go

@@ -0,0 +1,227 @@
+package main
+
+import (
+	"errors"
+	"strings"
+	"testing"
+
+	"github.com/navidrome/navidrome/plugins/pdk/go/host"
+	"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
+	"github.com/navidrome/navidrome/plugins/pdk/go/scheduler"
+	"github.com/navidrome/navidrome/plugins/pdk/go/scrobbler"
+	"github.com/stretchr/testify/mock"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+func TestDiscordPlugin(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Discord Plugin Main Suite")
+}
+
+var _ = Describe("discordPlugin", func() {
+	var plugin discordPlugin
+
+	BeforeEach(func() {
+		plugin = discordPlugin{}
+		pdk.ResetMock()
+		host.CacheMock.ExpectedCalls = nil
+		host.CacheMock.Calls = nil
+		host.ConfigMock.ExpectedCalls = nil
+		host.ConfigMock.Calls = nil
+		host.WebSocketMock.ExpectedCalls = nil
+		host.WebSocketMock.Calls = nil
+		host.SchedulerMock.ExpectedCalls = nil
+		host.SchedulerMock.Calls = nil
+		host.ArtworkMock.ExpectedCalls = nil
+		host.ArtworkMock.Calls = nil
+	})
+
+	Describe("getConfig", func() {
+		It("returns config values when properly set", func() {
+			pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true)
+			host.ConfigMock.On("Keys", userKeyPrefix).Return([]string{"user.user1", "user.user2"})
+			host.ConfigMock.On("Get", "user.user1").Return("token1", true)
+			host.ConfigMock.On("Get", "user.user2").Return("token2", true)
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+
+			clientID, users, err := getConfig()
+			Expect(err).ToNot(HaveOccurred())
+			Expect(clientID).To(Equal("test-client-id"))
+			Expect(users).To(HaveLen(2))
+			Expect(users["user1"]).To(Equal("token1"))
+			Expect(users["user2"]).To(Equal("token2"))
+		})
+
+		It("returns empty client ID when not set", func() {
+			pdk.PDKMock.On("GetConfig", clientIDKey).Return("", false)
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+
+			clientID, users, err := getConfig()
+			Expect(err).ToNot(HaveOccurred())
+			Expect(clientID).To(BeEmpty())
+			Expect(users).To(BeNil())
+		})
+
+		It("returns nil users when users not configured", func() {
+			pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true)
+			host.ConfigMock.On("Keys", userKeyPrefix).Return([]string{})
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+
+			clientID, users, err := getConfig()
+			Expect(err).ToNot(HaveOccurred())
+			Expect(clientID).To(Equal("test-client-id"))
+			Expect(users).To(BeNil())
+		})
+	})
+
+	Describe("IsAuthorized", func() {
+		BeforeEach(func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+		})
+
+		It("returns true for authorized user", func() {
+			pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true)
+			host.ConfigMock.On("Keys", userKeyPrefix).Return([]string{"user.testuser"})
+			host.ConfigMock.On("Get", "user.testuser").Return("token123", true)
+
+			authorized, err := plugin.IsAuthorized(scrobbler.IsAuthorizedRequest{
+				Username: "testuser",
+			})
+			Expect(err).ToNot(HaveOccurred())
+			Expect(authorized).To(BeTrue())
+		})
+
+		It("returns false for unauthorized user", func() {
+			pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true)
+			host.ConfigMock.On("Keys", userKeyPrefix).Return([]string{"user.otheruser"})
+			host.ConfigMock.On("Get", "user.otheruser").Return("token123", true)
+
+			authorized, err := plugin.IsAuthorized(scrobbler.IsAuthorizedRequest{
+				Username: "testuser",
+			})
+			Expect(err).ToNot(HaveOccurred())
+			Expect(authorized).To(BeFalse())
+		})
+	})
+
+	Describe("NowPlaying", func() {
+		BeforeEach(func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+		})
+
+		It("returns not authorized error when user not in config", func() {
+			pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true)
+			host.ConfigMock.On("Keys", userKeyPrefix).Return([]string{"user.otheruser"})
+			host.ConfigMock.On("Get", "user.otheruser").Return("token", true)
+
+			err := plugin.NowPlaying(scrobbler.NowPlayingRequest{
+				Username: "testuser",
+				Track:    scrobbler.TrackInfo{Title: "Test Song"},
+			})
+			Expect(err).To(HaveOccurred())
+			Expect(errors.Is(err, scrobbler.ScrobblerErrorNotAuthorized)).To(BeTrue())
+		})
+
+		It("successfully sends now playing update", func() {
+			pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true)
+			host.ConfigMock.On("Keys", userKeyPrefix).Return([]string{"user.testuser"})
+			host.ConfigMock.On("Get", "user.testuser").Return("test-token", true)
+
+			// Connect mocks (isConnected check via heartbeat)
+			host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(0), false, errors.New("not found"))
+
+			// Mock HTTP GET request for gateway discovery
+			gatewayResp := []byte(`{"url":"wss://gateway.discord.gg"}`)
+			gatewayReq := &pdk.HTTPRequest{}
+			pdk.PDKMock.On("NewHTTPRequest", pdk.MethodGet, "https://discord.com/api/gateway").Return(gatewayReq).Once()
+			pdk.PDKMock.On("Send", gatewayReq).Return(pdk.NewStubHTTPResponse(200, nil, gatewayResp)).Once()
+
+			// Mock WebSocket connection
+			host.WebSocketMock.On("Connect", mock.MatchedBy(func(url string) bool {
+				return strings.Contains(url, "gateway.discord.gg")
+			}), mock.Anything, "testuser").Return("testuser", nil)
+			host.WebSocketMock.On("SendText", "testuser", mock.Anything).Return(nil)
+			host.SchedulerMock.On("ScheduleRecurring", mock.Anything, payloadHeartbeat, "testuser").Return("testuser", nil)
+
+			// Cancel existing clear schedule (may or may not exist)
+			host.SchedulerMock.On("CancelSchedule", "testuser-clear").Return(nil)
+
+			// Image mocks - cache miss, will make HTTP request to Discord
+			host.CacheMock.On("GetString", mock.MatchedBy(func(key string) bool {
+				return strings.HasPrefix(key, "discord.image.")
+			})).Return("", false, nil)
+			host.CacheMock.On("SetString", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+			host.ArtworkMock.On("GetTrackUrl", "track1", int32(300)).Return("https://example.com/art.jpg", nil)
+
+			// Mock HTTP request for Discord external assets API
+			assetsReq := &pdk.HTTPRequest{}
+			pdk.PDKMock.On("NewHTTPRequest", pdk.MethodPost, mock.MatchedBy(func(url string) bool {
+				return strings.Contains(url, "external-assets")
+			})).Return(assetsReq)
+			pdk.PDKMock.On("Send", assetsReq).Return(pdk.NewStubHTTPResponse(200, nil, []byte(`{"key":"test-key"}`)))
+
+			// Schedule clear activity callback
+			host.SchedulerMock.On("ScheduleOneTime", mock.Anything, payloadClearActivity, "testuser-clear").Return("testuser-clear", nil)
+
+			err := plugin.NowPlaying(scrobbler.NowPlayingRequest{
+				Username: "testuser",
+				Position: 10,
+				Track: scrobbler.TrackInfo{
+					ID:       "track1",
+					Title:    "Test Song",
+					Artist:   "Test Artist",
+					Album:    "Test Album",
+					Duration: 180,
+				},
+			})
+			Expect(err).ToNot(HaveOccurred())
+		})
+	})
+
+	Describe("Scrobble", func() {
+		It("does nothing (returns nil)", func() {
+			err := plugin.Scrobble(scrobbler.ScrobbleRequest{})
+			Expect(err).ToNot(HaveOccurred())
+		})
+	})
+
+	Describe("OnCallback", func() {
+		BeforeEach(func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+		})
+
+		It("handles heartbeat callback", func() {
+			host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(42), true, nil)
+			host.WebSocketMock.On("SendText", "testuser", mock.Anything).Return(nil)
+
+			err := plugin.OnCallback(scheduler.SchedulerCallbackRequest{
+				ScheduleID:  "testuser",
+				Payload:     payloadHeartbeat,
+				IsRecurring: true,
+			})
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("handles clearActivity callback", func() {
+			host.WebSocketMock.On("SendText", "testuser", mock.Anything).Return(nil)
+			host.SchedulerMock.On("CancelSchedule", "testuser").Return(nil)
+			host.WebSocketMock.On("CloseConnection", "testuser", int32(1000), "Navidrome disconnect").Return(nil)
+
+			err := plugin.OnCallback(scheduler.SchedulerCallbackRequest{
+				ScheduleID: "testuser-clear",
+				Payload:    payloadClearActivity,
+			})
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("logs warning for unknown payload", func() {
+			err := plugin.OnCallback(scheduler.SchedulerCallbackRequest{
+				ScheduleID: "testuser",
+				Payload:    "unknown",
+			})
+			Expect(err).ToNot(HaveOccurred())
+		})
+	})
+})

plugins/examples/discord-rich-presence/manifest.json

@@ -0,0 +1,102 @@
+{
+  "name": "Discord Rich Presence",
+  "author": "Navidrome Team",
+  "version": "1.0.0",
+  "description": "Discord Rich Presence integration for Navidrome",
+  "website": "https://github.com/navidrome/navidrome/tree/master/plugins/examples/discord-rich-presence",
+  "permissions": {
+    "users": {
+      "reason": "To process scrobbles on behalf of users"
+    },
+    "http": {
+      "reason": "To communicate with Discord API for gateway discovery and image uploads",
+      "requiredHosts": [
+        "discord.com"
+      ]
+    },
+    "websocket": {
+      "reason": "To maintain real-time connection with Discord gateway",
+      "requiredHosts": [
+        "gateway.discord.gg"
+      ]
+    },
+    "cache": {
+      "reason": "To store connection state and sequence numbers"
+    },
+    "scheduler": {
+      "reason": "To schedule heartbeat messages and activity clearing"
+    },
+    "artwork": {
+      "reason": "To get track artwork URLs for rich presence display"
+    }
+  },
+  "config": {
+    "schema": {
+      "type": "object",
+      "properties": {
+        "clientid": {
+          "type": "string",
+          "title": "Discord Application Client ID",
+          "description": "The Client ID from your Discord Developer Application. Create one at https://discord.com/developers/applications",
+          "minLength": 17,
+          "maxLength": 20,
+          "pattern": "^[0-9]+$"
+        },
+        "users": {
+          "type": "array",
+          "title": "User Tokens",
+          "description": "Discord tokens for each Navidrome user. WARNING: Store tokens securely!",
+          "minItems": 1,
+          "items": {
+            "type": "object",
+            "properties": {
+              "username": {
+                "type": "string",
+                "title": "Navidrome Username",
+                "description": "The Navidrome username to associate with this Discord token",
+                "minLength": 1
+              },
+              "token": {
+                "type": "string",
+                "title": "Discord Token",
+                "description": "The user's Discord token (keep this secret!)",
+                "minLength": 1
+              }
+            },
+            "required": ["username", "token"]
+          }
+        }
+      },
+      "required": ["clientid", "users"]
+    },
+    "uiSchema": {
+      "type": "VerticalLayout",
+      "elements": [
+        {
+          "type": "Control",
+          "scope": "#/properties/clientid"
+        },
+        {
+          "type": "Control",
+          "scope": "#/properties/users",
+          "options": {
+            "elementLabelProp": "username",
+            "detail": {
+              "type": "HorizontalLayout",
+              "elements": [
+                {
+                  "type": "Control",
+                  "scope": "#/properties/username"
+                },
+                {
+                  "type": "Control",
+                  "scope": "#/properties/token"
+                }
+              ]
+            }
+          }
+        }
+      ]
+    }
+  }
+}

plugins/examples/discord-rich-presence/rpc.go

@@ -0,0 +1,400 @@
+// Discord Rich Presence Plugin - RPC Communication
+//
+// This file handles all Discord gateway communication including WebSocket connections,
+// presence updates, and heartbeat management. The discordRPC struct implements WebSocket
+// callback interfaces and encapsulates all Discord communication logic.
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/navidrome/navidrome/plugins/pdk/go/host"
+	"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
+	"github.com/navidrome/navidrome/plugins/pdk/go/websocket"
+)
+
+// Discord WebSocket Gateway constants
+const (
+	heartbeatOpCode = 1 // Heartbeat operation code
+	gateOpCode      = 2 // Identify operation code
+	presenceOpCode  = 3 // Presence update operation code
+)
+
+const (
+	heartbeatInterval = 41 // Heartbeat interval in seconds
+	defaultImage      = "https://i.imgur.com/hb3XPzA.png"
+)
+
+// Scheduler callback payloads for routing
+const (
+	payloadHeartbeat     = "heartbeat"
+	payloadClearActivity = "clear-activity"
+)
+
+// discordRPC handles Discord gateway communication and implements WebSocket callbacks.
+type discordRPC struct{}
+
+// ============================================================================
+// WebSocket Callback Implementation
+// ============================================================================
+
+// OnTextMessage handles incoming WebSocket text messages.
+func (r *discordRPC) OnTextMessage(input websocket.OnTextMessageRequest) error {
+	return r.handleWebSocketMessage(input.ConnectionID, input.Message)
+}
+
+// OnBinaryMessage handles incoming WebSocket binary messages.
+func (r *discordRPC) OnBinaryMessage(input websocket.OnBinaryMessageRequest) error {
+	pdk.Log(pdk.LogDebug, fmt.Sprintf("Received unexpected binary message for connection '%s'", input.ConnectionID))
+	return nil
+}
+
+// OnError handles WebSocket errors.
+func (r *discordRPC) OnError(input websocket.OnErrorRequest) error {
+	pdk.Log(pdk.LogWarn, fmt.Sprintf("WebSocket error for connection '%s': %s", input.ConnectionID, input.Error))
+	return nil
+}
+
+// OnClose handles WebSocket connection closure.
+func (r *discordRPC) OnClose(input websocket.OnCloseRequest) error {
+	pdk.Log(pdk.LogInfo, fmt.Sprintf("WebSocket connection '%s' closed with code %d: %s", input.ConnectionID, input.Code, input.Reason))
+	return nil
+}
+
+// activity represents a Discord activity.
+type activity struct {
+	Name        string             `json:"name"`
+	Type        int                `json:"type"`
+	Details     string             `json:"details"`
+	State       string             `json:"state"`
+	Application string             `json:"application_id"`
+	Timestamps  activityTimestamps `json:"timestamps"`
+	Assets      activityAssets     `json:"assets"`
+}
+
+type activityTimestamps struct {
+	Start int64 `json:"start"`
+	End   int64 `json:"end"`
+}
+
+type activityAssets struct {
+	LargeImage string `json:"large_image"`
+	LargeText  string `json:"large_text"`
+}
+
+// presencePayload represents a Discord presence update.
+type presencePayload struct {
+	Activities []activity `json:"activities"`
+	Since      int64      `json:"since"`
+	Status     string     `json:"status"`
+	Afk        bool       `json:"afk"`
+}
+
+// identifyPayload represents a Discord identify payload.
+type identifyPayload struct {
+	Token      string             `json:"token"`
+	Intents    int                `json:"intents"`
+	Properties identifyProperties `json:"properties"`
+}
+
+type identifyProperties struct {
+	OS      string `json:"os"`
+	Browser string `json:"browser"`
+	Device  string `json:"device"`
+}
+
+// ============================================================================
+// Image Processing
+// ============================================================================
+
+// processImage processes an image URL for Discord, with fallback to default image.
+func (r *discordRPC) processImage(imageURL, clientID, token string, isDefaultImage bool) (string, error) {
+	if imageURL == "" {
+		if isDefaultImage {
+			return "", fmt.Errorf("default image URL is empty")
+		}
+		return r.processImage(defaultImage, clientID, token, true)
+	}
+
+	if strings.HasPrefix(imageURL, "mp:") {
+		return imageURL, nil
+	}
+
+	// Check cache first
+	cacheKey := fmt.Sprintf("discord.image.%x", imageURL)
+	cachedValue, exists, err := host.CacheGetString(cacheKey)
+	if err == nil && exists {
+		pdk.Log(pdk.LogDebug, fmt.Sprintf("Cache hit for image URL: %s", imageURL))
+		return cachedValue, nil
+	}
+
+	// Process via Discord API
+	body := fmt.Sprintf(`{"urls":[%q]}`, imageURL)
+	req := pdk.NewHTTPRequest(pdk.MethodPost, fmt.Sprintf("https://discord.com/api/v9/applications/%s/external-assets", clientID))
+	req.SetHeader("Authorization", token)
+	req.SetHeader("Content-Type", "application/json")
+	req.SetBody([]byte(body))
+
+	resp := req.Send()
+	if resp.Status() >= 400 {
+		if isDefaultImage {
+			return "", fmt.Errorf("failed to process default image: HTTP %d", resp.Status())
+		}
+		return r.processImage(defaultImage, clientID, token, true)
+	}
+
+	var data []map[string]string
+	if err := json.Unmarshal(resp.Body(), &data); err != nil {
+		if isDefaultImage {
+			return "", fmt.Errorf("failed to unmarshal default image response: %w", err)
+		}
+		return r.processImage(defaultImage, clientID, token, true)
+	}
+
+	if len(data) == 0 {
+		if isDefaultImage {
+			return "", fmt.Errorf("no data returned for default image")
+		}
+		return r.processImage(defaultImage, clientID, token, true)
+	}
+
+	image := data[0]["external_asset_path"]
+	if image == "" {
+		if isDefaultImage {
+			return "", fmt.Errorf("empty external_asset_path for default image")
+		}
+		return r.processImage(defaultImage, clientID, token, true)
+	}
+
+	processedImage := fmt.Sprintf("mp:%s", image)
+
+	// Cache the processed image URL
+	var ttl int64 = 4 * 60 * 60 // 4 hours for regular images
+	if isDefaultImage {
+		ttl = 48 * 60 * 60 // 48 hours for default image
+	}
+
+	_ = host.CacheSetString(cacheKey, processedImage, ttl)
+	pdk.Log(pdk.LogDebug, fmt.Sprintf("Cached processed image URL for %s (TTL: %ds)", imageURL, ttl))
+
+	return processedImage, nil
+}
+
+// ============================================================================
+// Activity Management
+// ============================================================================
+
+// sendActivity sends an activity update to Discord.
+func (r *discordRPC) sendActivity(clientID, username, token string, data activity) error {
+	pdk.Log(pdk.LogInfo, fmt.Sprintf("Sending activity for user %s: %s - %s", username, data.Details, data.State))
+
+	processedImage, err := r.processImage(data.Assets.LargeImage, clientID, token, false)
+	if err != nil {
+		pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to process image for user %s, continuing without image: %v", username, err))
+		data.Assets.LargeImage = ""
+	} else {
+		data.Assets.LargeImage = processedImage
+	}
+
+	presence := presencePayload{
+		Activities: []activity{data},
+		Status:     "dnd",
+		Afk:        false,
+	}
+	return r.sendMessage(username, presenceOpCode, presence)
+}
+
+// clearActivity clears the Discord activity for a user.
+func (r *discordRPC) clearActivity(username string) error {
+	pdk.Log(pdk.LogInfo, fmt.Sprintf("Clearing activity for user %s", username))
+	return r.sendMessage(username, presenceOpCode, presencePayload{})
+}
+
+// ============================================================================
+// Low-level Communication
+// ============================================================================
+
+// sendMessage sends a message over the WebSocket connection.
+func (r *discordRPC) sendMessage(username string, opCode int, payload any) error {
+	message := map[string]any{
+		"op": opCode,
+		"d":  payload,
+	}
+	b, err := json.Marshal(message)
+	if err != nil {
+		return fmt.Errorf("failed to marshal message: %w", err)
+	}
+
+	err = host.WebSocketSendText(username, string(b))
+	if err != nil {
+		return fmt.Errorf("failed to send message: %w", err)
+	}
+	return nil
+}
+
+// getDiscordGateway retrieves the Discord gateway URL.
+func (r *discordRPC) getDiscordGateway() (string, error) {
+	req := pdk.NewHTTPRequest(pdk.MethodGet, "https://discord.com/api/gateway")
+	resp := req.Send()
+	if resp.Status() != 200 {
+		return "", fmt.Errorf("failed to get Discord gateway: HTTP %d", resp.Status())
+	}
+
+	var result map[string]string
+	if err := json.Unmarshal(resp.Body(), &result); err != nil {
+		return "", fmt.Errorf("failed to parse Discord gateway response: %w", err)
+	}
+	return result["url"], nil
+}
+
+// sendHeartbeat sends a heartbeat to Discord.
+func (r *discordRPC) sendHeartbeat(username string) error {
+	seqNum, _, err := host.CacheGetInt(fmt.Sprintf("discord.seq.%s", username))
+	if err != nil {
+		return fmt.Errorf("failed to get sequence number: %w", err)
+	}
+
+	pdk.Log(pdk.LogDebug, fmt.Sprintf("Sending heartbeat for user %s: %d", username, seqNum))
+	return r.sendMessage(username, heartbeatOpCode, seqNum)
+}
+
+// cleanupFailedConnection cleans up a failed Discord connection.
+func (r *discordRPC) cleanupFailedConnection(username string) {
+	pdk.Log(pdk.LogInfo, fmt.Sprintf("Cleaning up failed connection for user %s", username))
+
+	// Cancel the heartbeat schedule
+	if err := host.SchedulerCancelSchedule(username); err != nil {
+		pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to cancel heartbeat schedule for user %s: %v", username, err))
+	}
+
+	// Close the WebSocket connection
+	if err := host.WebSocketCloseConnection(username, 1000, "Connection lost"); err != nil {
+		pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to close WebSocket connection for user %s: %v", username, err))
+	}
+
+	// Clean up cache entries
+	_ = host.CacheRemove(fmt.Sprintf("discord.seq.%s", username))
+
+	pdk.Log(pdk.LogInfo, fmt.Sprintf("Cleaned up connection for user %s", username))
+}
+
+// isConnected checks if a user is connected to Discord by testing the heartbeat.
+func (r *discordRPC) isConnected(username string) bool {
+	err := r.sendHeartbeat(username)
+	if err != nil {
+		pdk.Log(pdk.LogDebug, fmt.Sprintf("Heartbeat test failed for user %s: %v", username, err))
+		return false
+	}
+	return true
+}
+
+// connect establishes a connection to Discord for a user.
+func (r *discordRPC) connect(username, token string) error {
+	if r.isConnected(username) {
+		pdk.Log(pdk.LogInfo, fmt.Sprintf("Reusing existing connection for user %s", username))
+		return nil
+	}
+	pdk.Log(pdk.LogInfo, fmt.Sprintf("Creating new connection for user %s", username))
+
+	// Get Discord Gateway URL
+	gateway, err := r.getDiscordGateway()
+	if err != nil {
+		return fmt.Errorf("failed to get Discord gateway: %w", err)
+	}
+	pdk.Log(pdk.LogDebug, fmt.Sprintf("Using gateway: %s", gateway))
+
+	// Connect to Discord Gateway
+	_, err = host.WebSocketConnect(gateway, nil, username)
+	if err != nil {
+		return fmt.Errorf("failed to connect to WebSocket: %w", err)
+	}
+
+	// Send identify payload
+	payload := identifyPayload{
+		Token:   token,
+		Intents: 0,
+		Properties: identifyProperties{
+			OS:      "Windows 10",
+			Browser: "Discord Client",
+			Device:  "Discord Client",
+		},
+	}
+	if err := r.sendMessage(username, gateOpCode, payload); err != nil {
+		return fmt.Errorf("failed to send identify payload: %w", err)
+	}
+
+	// Schedule heartbeats for this user/connection
+	cronExpr := fmt.Sprintf("@every %ds", heartbeatInterval)
+	scheduleID, err := host.SchedulerScheduleRecurring(cronExpr, payloadHeartbeat, username)
+	if err != nil {
+		return fmt.Errorf("failed to schedule heartbeat: %w", err)
+	}
+	pdk.Log(pdk.LogInfo, fmt.Sprintf("Scheduled heartbeat for user %s with ID %s", username, scheduleID))
+
+	pdk.Log(pdk.LogInfo, fmt.Sprintf("Successfully authenticated user %s", username))
+	return nil
+}
+
+// disconnect closes the Discord connection for a user.
+func (r *discordRPC) disconnect(username string) error {
+	if err := host.SchedulerCancelSchedule(username); err != nil {
+		return fmt.Errorf("failed to cancel schedule: %w", err)
+	}
+
+	if err := host.WebSocketCloseConnection(username, 1000, "Navidrome disconnect"); err != nil {
+		return fmt.Errorf("failed to close WebSocket connection: %w", err)
+	}
+	return nil
+}
+
+// handleWebSocketMessage processes incoming WebSocket messages from Discord.
+func (r *discordRPC) handleWebSocketMessage(connectionID, message string) error {
+	if len(message) < 1024 {
+		pdk.Log(pdk.LogTrace, fmt.Sprintf("Received WebSocket message for connection '%s': %s", connectionID, message))
+	} else {
+		pdk.Log(pdk.LogTrace, fmt.Sprintf("Received WebSocket message for connection '%s' (truncated): %s...", connectionID, message[:1021]))
+	}
+
+	// Parse the message
+	var msg map[string]any
+	if err := json.Unmarshal([]byte(message), &msg); err != nil {
+		return fmt.Errorf("failed to parse WebSocket message: %w", err)
+	}
+
+	// Store sequence number if present
+	if v := msg["s"]; v != nil {
+		seq := int64(v.(float64))
+		pdk.Log(pdk.LogTrace, fmt.Sprintf("Received sequence number for connection '%s': %d", connectionID, seq))
+		if err := host.CacheSetInt(fmt.Sprintf("discord.seq.%s", connectionID), seq, int64(heartbeatInterval*2)); err != nil {
+			return fmt.Errorf("failed to store sequence number for user %s: %w", connectionID, err)
+		}
+	}
+	return nil
+}
+
+// handleHeartbeatCallback processes heartbeat scheduler callbacks.
+func (r *discordRPC) handleHeartbeatCallback(username string) error {
+	if err := r.sendHeartbeat(username); err != nil {
+		// On first heartbeat failure, immediately clean up the connection
+		pdk.Log(pdk.LogWarn, fmt.Sprintf("Heartbeat failed for user %s, cleaning up connection: %v", username, err))
+		r.cleanupFailedConnection(username)
+		return fmt.Errorf("heartbeat failed, connection cleaned up: %w", err)
+	}
+	return nil
+}
+
+// handleClearActivityCallback processes clear activity scheduler callbacks.
+func (r *discordRPC) handleClearActivityCallback(username string) error {
+	pdk.Log(pdk.LogInfo, fmt.Sprintf("Removing presence for user %s", username))
+	if err := r.clearActivity(username); err != nil {
+		return fmt.Errorf("failed to clear activity: %w", err)
+	}
+
+	pdk.Log(pdk.LogInfo, fmt.Sprintf("Disconnecting user %s", username))
+	if err := r.disconnect(username); err != nil {
+		return fmt.Errorf("failed to disconnect from Discord: %w", err)
+	}
+	return nil
+}

plugins/examples/discord-rich-presence/rpc_test.go

@@ -0,0 +1,279 @@
+package main
+
+import (
+	"errors"
+	"strings"
+
+	"github.com/navidrome/navidrome/plugins/pdk/go/host"
+	"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
+	"github.com/navidrome/navidrome/plugins/pdk/go/websocket"
+	"github.com/stretchr/testify/mock"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("discordRPC", func() {
+	var r *discordRPC
+
+	BeforeEach(func() {
+		r = &discordRPC{}
+		pdk.ResetMock()
+		host.CacheMock.ExpectedCalls = nil
+		host.CacheMock.Calls = nil
+		host.WebSocketMock.ExpectedCalls = nil
+		host.WebSocketMock.Calls = nil
+		host.SchedulerMock.ExpectedCalls = nil
+		host.SchedulerMock.Calls = nil
+	})
+
+	Describe("sendMessage", func() {
+		It("sends JSON message over WebSocket", func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool {
+				return strings.Contains(msg, `"op":3`)
+			})).Return(nil)
+
+			err := r.sendMessage("testuser", presenceOpCode, map[string]string{"status": "online"})
+			Expect(err).ToNot(HaveOccurred())
+			host.WebSocketMock.AssertExpectations(GinkgoT())
+		})
+
+		It("returns error when WebSocket send fails", func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.WebSocketMock.On("SendText", mock.Anything, mock.Anything).
+				Return(errors.New("connection closed"))
+
+			err := r.sendMessage("testuser", presenceOpCode, map[string]string{})
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring("connection closed"))
+		})
+	})
+
+	Describe("sendHeartbeat", func() {
+		It("retrieves sequence number from cache and sends heartbeat", func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(123), true, nil)
+			host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool {
+				return strings.Contains(msg, `"op":1`) && strings.Contains(msg, "123")
+			})).Return(nil)
+
+			err := r.sendHeartbeat("testuser")
+			Expect(err).ToNot(HaveOccurred())
+			host.CacheMock.AssertExpectations(GinkgoT())
+			host.WebSocketMock.AssertExpectations(GinkgoT())
+		})
+
+		It("returns error when cache get fails", func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(0), false, errors.New("cache error"))
+
+			err := r.sendHeartbeat("testuser")
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring("cache error"))
+		})
+	})
+
+	Describe("connect", func() {
+		It("establishes WebSocket connection and sends identify payload", func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(0), false, errors.New("not found"))
+
+			// Mock HTTP GET request for gateway discovery
+			gatewayResp := []byte(`{"url":"wss://gateway.discord.gg"}`)
+			httpReq := &pdk.HTTPRequest{}
+			pdk.PDKMock.On("NewHTTPRequest", pdk.MethodGet, "https://discord.com/api/gateway").Return(httpReq)
+			pdk.PDKMock.On("Send", mock.Anything).Return(pdk.NewStubHTTPResponse(200, nil, gatewayResp))
+
+			// Mock WebSocket connection
+			host.WebSocketMock.On("Connect", mock.MatchedBy(func(url string) bool {
+				return strings.Contains(url, "gateway.discord.gg")
+			}), mock.Anything, "testuser").Return("testuser", nil)
+			host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool {
+				return strings.Contains(msg, `"op":2`) && strings.Contains(msg, "test-token")
+			})).Return(nil)
+			host.SchedulerMock.On("ScheduleRecurring", "@every 41s", payloadHeartbeat, "testuser").
+				Return("testuser", nil)
+
+			err := r.connect("testuser", "test-token")
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("reuses existing connection if connected", func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(42), true, nil)
+			host.WebSocketMock.On("SendText", "testuser", mock.Anything).Return(nil)
+
+			err := r.connect("testuser", "test-token")
+			Expect(err).ToNot(HaveOccurred())
+			host.WebSocketMock.AssertNotCalled(GinkgoT(), "Connect", mock.Anything, mock.Anything, mock.Anything)
+		})
+	})
+
+	Describe("disconnect", func() {
+		It("cancels schedule and closes WebSocket connection", func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.SchedulerMock.On("CancelSchedule", "testuser").Return(nil)
+			host.WebSocketMock.On("CloseConnection", "testuser", int32(1000), "Navidrome disconnect").Return(nil)
+
+			err := r.disconnect("testuser")
+			Expect(err).ToNot(HaveOccurred())
+			host.SchedulerMock.AssertExpectations(GinkgoT())
+			host.WebSocketMock.AssertExpectations(GinkgoT())
+		})
+	})
+
+	Describe("cleanupFailedConnection", func() {
+		It("cancels schedule, closes WebSocket, and clears cache", func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.SchedulerMock.On("CancelSchedule", "testuser").Return(nil)
+			host.WebSocketMock.On("CloseConnection", "testuser", int32(1000), "Connection lost").Return(nil)
+			host.CacheMock.On("Remove", "discord.seq.testuser").Return(nil)
+
+			r.cleanupFailedConnection("testuser")
+
+			host.SchedulerMock.AssertExpectations(GinkgoT())
+			host.WebSocketMock.AssertExpectations(GinkgoT())
+		})
+	})
+
+	Describe("handleHeartbeatCallback", func() {
+		It("sends heartbeat successfully", func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(42), true, nil)
+			host.WebSocketMock.On("SendText", "testuser", mock.Anything).Return(nil)
+
+			err := r.handleHeartbeatCallback("testuser")
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("cleans up connection on heartbeat failure", func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(0), false, errors.New("cache miss"))
+			host.SchedulerMock.On("CancelSchedule", "testuser").Return(nil)
+			host.WebSocketMock.On("CloseConnection", "testuser", int32(1000), "Connection lost").Return(nil)
+			host.CacheMock.On("Remove", "discord.seq.testuser").Return(nil)
+
+			err := r.handleHeartbeatCallback("testuser")
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring("connection cleaned up"))
+		})
+	})
+
+	Describe("handleClearActivityCallback", func() {
+		It("clears activity and disconnects", func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool {
+				return strings.Contains(msg, `"op":3`) && strings.Contains(msg, `"activities":null`)
+			})).Return(nil)
+			host.SchedulerMock.On("CancelSchedule", "testuser").Return(nil)
+			host.WebSocketMock.On("CloseConnection", "testuser", int32(1000), "Navidrome disconnect").Return(nil)
+
+			err := r.handleClearActivityCallback("testuser")
+			Expect(err).ToNot(HaveOccurred())
+		})
+	})
+
+	Describe("WebSocket callbacks", func() {
+		Describe("OnTextMessage", func() {
+			It("handles valid JSON message", func() {
+				pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+				host.CacheMock.On("SetInt", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+
+				err := r.OnTextMessage(websocket.OnTextMessageRequest{
+					ConnectionID: "testuser",
+					Message:      `{"s":42}`,
+				})
+				Expect(err).ToNot(HaveOccurred())
+			})
+
+			It("returns error for invalid JSON", func() {
+				pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+				err := r.OnTextMessage(websocket.OnTextMessageRequest{
+					ConnectionID: "testuser",
+					Message:      `not json`,
+				})
+				Expect(err).To(HaveOccurred())
+			})
+		})
+
+		Describe("OnBinaryMessage", func() {
+			It("handles binary message without error", func() {
+				pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+				err := r.OnBinaryMessage(websocket.OnBinaryMessageRequest{
+					ConnectionID: "testuser",
+					Data:         "AQID", // base64 encoded [0x01, 0x02, 0x03]
+				})
+				Expect(err).ToNot(HaveOccurred())
+			})
+		})
+
+		Describe("OnError", func() {
+			It("handles error without returning error", func() {
+				pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+				err := r.OnError(websocket.OnErrorRequest{
+					ConnectionID: "testuser",
+					Error:        "test error",
+				})
+				Expect(err).ToNot(HaveOccurred())
+			})
+		})
+
+		Describe("OnClose", func() {
+			It("handles close without returning error", func() {
+				pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+				err := r.OnClose(websocket.OnCloseRequest{
+					ConnectionID: "testuser",
+					Code:         1000,
+					Reason:       "normal close",
+				})
+				Expect(err).ToNot(HaveOccurred())
+			})
+		})
+	})
+
+	Describe("sendActivity", func() {
+		BeforeEach(func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.CacheMock.On("GetString", mock.MatchedBy(func(key string) bool {
+				return strings.HasPrefix(key, "discord.image.")
+			})).Return("", false, nil)
+			host.CacheMock.On("SetString", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+
+			// Mock HTTP request for Discord external assets API (image processing)
+			// When processImage is called, it makes an HTTP request
+			httpReq := &pdk.HTTPRequest{}
+			pdk.PDKMock.On("NewHTTPRequest", pdk.MethodPost, mock.Anything).Return(httpReq)
+			pdk.PDKMock.On("Send", mock.Anything).Return(pdk.NewStubHTTPResponse(200, nil, []byte(`{"key":"test-key"}`)))
+		})
+
+		It("sends activity update to Discord", func() {
+			host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool {
+				return strings.Contains(msg, `"op":3`) &&
+					strings.Contains(msg, `"name":"Test Song"`) &&
+					strings.Contains(msg, `"state":"Test Artist"`)
+			})).Return(nil)
+
+			err := r.sendActivity("client123", "testuser", "token123", activity{
+				Application: "client123",
+				Name:        "Test Song",
+				Type:        2,
+				State:       "Test Artist",
+				Details:     "Test Album",
+			})
+			Expect(err).ToNot(HaveOccurred())
+		})
+	})
+
+	Describe("clearActivity", func() {
+		It("sends presence update with nil activities", func() {
+			pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
+			host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool {
+				return strings.Contains(msg, `"op":3`) && strings.Contains(msg, `"activities":null`)
+			})).Return(nil)
+
+			err := r.clearActivity("testuser")
+			Expect(err).ToNot(HaveOccurred())
+		})
+	})
+})

plugins/host/subsonicapi.go

@@ -15,10 +15,4 @@ type SubsonicAPIService interface {
 	// e.g., "getAlbumList2?type=random&size=10". The response is returned as raw JSON.
 	//nd:hostfunc
 	Call(ctx context.Context, uri string) (responseJSON string, err error)
-
-	// CallRaw executes a Subsonic API request and returns the raw binary response.
-	// Optimized for binary endpoints like getCoverArt and stream that return
-	// non-JSON data. The response is returned as raw bytes without JSON encoding overhead.
-	//nd:hostfunc raw=true
-	CallRaw(ctx context.Context, uri string) (contentType string, data []byte, err error)
 }

plugins/host/subsonicapi_gen.go

@@ -4,7 +4,6 @@ package host
 
 import (
 	"context"
-	"encoding/binary"
 	"encoding/json"
 
 	extism "github.com/extism/go-sdk"
@@ -21,17 +20,11 @@ type SubsonicAPICallResponse struct {
 	Error        string `json:"error,omitempty"`
 }
 
-// SubsonicAPICallRawRequest is the request type for SubsonicAPI.CallRaw.
-type SubsonicAPICallRawRequest struct {
-	Uri string `json:"uri"`
-}
-
 // RegisterSubsonicAPIHostFunctions registers SubsonicAPI service host functions.
 // The returned host functions should be added to the plugin's configuration.
 func RegisterSubsonicAPIHostFunctions(service SubsonicAPIService) []extism.HostFunction {
 	return []extism.HostFunction{
 		newSubsonicAPICallHostFunction(service),
-		newSubsonicAPICallRawHostFunction(service),
 	}
 }
 
@@ -69,50 +62,6 @@ func newSubsonicAPICallHostFunction(service SubsonicAPIService) extism.HostFunct
 	)
 }
 
-func newSubsonicAPICallRawHostFunction(service SubsonicAPIService) extism.HostFunction {
-	return extism.NewHostFunctionWithStack(
-		"subsonicapi_callraw",
-		func(ctx context.Context, p *extism.CurrentPlugin, stack []uint64) {
-			// Read JSON request from plugin memory
-			reqBytes, err := p.ReadBytes(stack[0])
-			if err != nil {
-				subsonicapiWriteRawError(p, stack, err)
-				return
-			}
-			var req SubsonicAPICallRawRequest
-			if err := json.Unmarshal(reqBytes, &req); err != nil {
-				subsonicapiWriteRawError(p, stack, err)
-				return
-			}
-
-			// Call the service method
-			contenttype, data, svcErr := service.CallRaw(ctx, req.Uri)
-			if svcErr != nil {
-				subsonicapiWriteRawError(p, stack, svcErr)
-				return
-			}
-
-			// Write binary-framed response to plugin memory:
-			// [0x00][4-byte content-type length (big-endian)][content-type string][raw data]
-			ctBytes := []byte(contenttype)
-			frame := make([]byte, 1+4+len(ctBytes)+len(data))
-			frame[0] = 0x00 // success
-			binary.BigEndian.PutUint32(frame[1:5], uint32(len(ctBytes)))
-			copy(frame[5:5+len(ctBytes)], ctBytes)
-			copy(frame[5+len(ctBytes):], data)
-
-			respPtr, err := p.WriteBytes(frame)
-			if err != nil {
-				stack[0] = 0
-				return
-			}
-			stack[0] = respPtr
-		},
-		[]extism.ValueType{extism.ValueTypePTR},
-		[]extism.ValueType{extism.ValueTypePTR},
-	)
-}
-
 // subsonicapiWriteResponse writes a JSON response to plugin memory.
 func subsonicapiWriteResponse(p *extism.CurrentPlugin, stack []uint64, resp any) {
 	respBytes, err := json.Marshal(resp)
@@ -137,14 +86,3 @@ func subsonicapiWriteError(p *extism.CurrentPlugin, stack []uint64, err error) {
 	respPtr, _ := p.WriteBytes(respBytes)
 	stack[0] = respPtr
 }
-
-// subsonicapiWriteRawError writes a binary-framed error response to plugin memory.
-// Format: [0x01][UTF-8 error message]
-func subsonicapiWriteRawError(p *extism.CurrentPlugin, stack []uint64, err error) {
-	errMsg := []byte(err.Error())
-	frame := make([]byte, 1+len(errMsg))
-	frame[0] = 0x01 // error
-	copy(frame[1:], errMsg)
-	respPtr, _ := p.WriteBytes(frame)
-	stack[0] = respPtr
-}

plugins/host_subsonicapi.go

@@ -24,7 +24,7 @@ const subsonicAPIVersion = "1.16.1"
 //
 // Authentication: The plugin must provide a valid 'u' (username) parameter in the URL.
 // URL Format: Only the path and query parameters are used - host/protocol are ignored.
-// Automatic Parameters: The service adds 'c' (client), 'v' (version), and optionally 'f' (format).
+// Automatic Parameters: The service adds 'c' (client), 'v' (version), 'f' (format).
 type subsonicAPIServiceImpl struct {
 	pluginID       string
 	router         SubsonicRouter
@@ -50,18 +50,15 @@ func newSubsonicAPIService(pluginID string, router SubsonicRouter, ds model.Data
 	}
 }
 
-// executeRequest handles URL parsing, validation, permission checks, HTTP request creation,
-// and router invocation. Shared between Call and CallRaw.
-// If setJSON is true, the 'f=json' query parameter is added.
-func (s *subsonicAPIServiceImpl) executeRequest(ctx context.Context, uri string, setJSON bool) (*httptest.ResponseRecorder, error) {
+func (s *subsonicAPIServiceImpl) Call(ctx context.Context, uri string) (string, error) {
 	if s.router == nil {
-		return nil, fmt.Errorf("SubsonicAPI router not available")
+		return "", fmt.Errorf("SubsonicAPI router not available")
 	}
 
 	// Parse the input URL
 	parsedURL, err := url.Parse(uri)
 	if err != nil {
-		return nil, fmt.Errorf("invalid URL format: %w", err)
+		return "", fmt.Errorf("invalid URL format: %w", err)
 	}
 
 	// Extract query parameters
@@ -70,20 +67,18 @@ func (s *subsonicAPIServiceImpl) executeRequest(ctx context.Context, uri string,
 	// Validate that 'u' (username) parameter is present
 	username := query.Get("u")
 	if username == "" {
-		return nil, fmt.Errorf("missing required parameter 'u' (username)")
+		return "", fmt.Errorf("missing required parameter 'u' (username)")
 	}
 
 	if err := s.checkPermissions(ctx, username); err != nil {
 		log.Warn(ctx, "SubsonicAPI call blocked by permissions", "plugin", s.pluginID, "user", username, err)
-		return nil, err
+		return "", err
 	}
 
 	// Add required Subsonic API parameters
 	query.Set("c", s.pluginID)         // Client name (plugin ID)
+	query.Set("f", "json")             // Response format
 	query.Set("v", subsonicAPIVersion) // API version
-	if setJSON {
-		query.Set("f", "json") // Response format
-	}
 
 	// Extract the endpoint from the path
 	endpoint := path.Base(parsedURL.Path)
@@ -101,7 +96,7 @@ func (s *subsonicAPIServiceImpl) executeRequest(ctx context.Context, uri string,
 	// explicitly added in the next step via request.WithInternalAuth.
 	httpReq, err := http.NewRequest("GET", finalURL.String(), nil)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create HTTP request: %w", err)
+		return "", fmt.Errorf("failed to create HTTP request: %w", err)
 	}
 
 	// Set internal authentication context using the username from the 'u' parameter
@@ -114,26 +109,10 @@ func (s *subsonicAPIServiceImpl) executeRequest(ctx context.Context, uri string,
 	// Call the subsonic router
 	s.router.ServeHTTP(recorder, httpReq)
 
-	return recorder, nil
-}
-
-func (s *subsonicAPIServiceImpl) Call(ctx context.Context, uri string) (string, error) {
-	recorder, err := s.executeRequest(ctx, uri, true)
-	if err != nil {
-		return "", err
-	}
+	// Return the response body as JSON
 	return recorder.Body.String(), nil
 }
 
-func (s *subsonicAPIServiceImpl) CallRaw(ctx context.Context, uri string) (string, []byte, error) {
-	recorder, err := s.executeRequest(ctx, uri, false)
-	if err != nil {
-		return "", nil, err
-	}
-	contentType := recorder.Header().Get("Content-Type")
-	return contentType, recorder.Body.Bytes(), nil
-}
-
 func (s *subsonicAPIServiceImpl) checkPermissions(ctx context.Context, username string) error {
 	// If allUsers is true, allow any user
 	if s.allUsers {

plugins/host_subsonicapi_test.go

@@ -8,7 +8,6 @@ import (
 	"encoding/json"
 	"net/http"
 	"os"
-	"path"
 	"path/filepath"
 
 	"github.com/navidrome/navidrome/conf"
@@ -178,61 +177,6 @@ var _ = Describe("SubsonicAPI Host Function", Ordered, func() {
 			Expect(err.Error()).To(ContainSubstring("missing required parameter"))
 		})
 	})
-
-	Describe("SubsonicAPI CallRaw", func() {
-		var plugin *plugin
-
-		BeforeEach(func() {
-			manager.mu.RLock()
-			plugin = manager.plugins["test-subsonicapi-plugin"]
-			manager.mu.RUnlock()
-			Expect(plugin).ToNot(BeNil())
-		})
-
-		It("successfully calls getCoverArt and returns binary data", func() {
-			instance, err := plugin.instance(GinkgoT().Context())
-			Expect(err).ToNot(HaveOccurred())
-			defer instance.Close(GinkgoT().Context())
-
-			exit, output, err := instance.Call("call_subsonic_api_raw", []byte("/getCoverArt?u=testuser&id=al-1"))
-			Expect(err).ToNot(HaveOccurred())
-			Expect(exit).To(Equal(uint32(0)))
-
-			// Parse the metadata response from the test plugin
-			var result map[string]any
-			err = json.Unmarshal(output, &result)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(result["contentType"]).To(Equal("image/png"))
-			Expect(result["size"]).To(BeNumerically("==", len(fakePNGHeader)))
-			Expect(result["firstByte"]).To(BeNumerically("==", 0x89)) // PNG magic byte
-		})
-
-		It("does NOT set f=json parameter for raw calls", func() {
-			instance, err := plugin.instance(GinkgoT().Context())
-			Expect(err).ToNot(HaveOccurred())
-			defer instance.Close(GinkgoT().Context())
-
-			_, _, err = instance.Call("call_subsonic_api_raw", []byte("/getCoverArt?u=testuser&id=al-1"))
-			Expect(err).ToNot(HaveOccurred())
-
-			Expect(router.lastRequest).ToNot(BeNil())
-			query := router.lastRequest.URL.Query()
-			Expect(query.Get("f")).To(BeEmpty())
-			Expect(query.Get("c")).To(Equal("test-subsonicapi-plugin"))
-			Expect(query.Get("v")).To(Equal("1.16.1"))
-		})
-
-		It("returns error when username is missing", func() {
-			instance, err := plugin.instance(GinkgoT().Context())
-			Expect(err).ToNot(HaveOccurred())
-			defer instance.Close(GinkgoT().Context())
-
-			exit, _, err := instance.Call("call_subsonic_api_raw", []byte("/getCoverArt"))
-			Expect(err).To(HaveOccurred())
-			Expect(exit).To(Equal(uint32(1)))
-			Expect(err.Error()).To(ContainSubstring("missing required parameter"))
-		})
-	})
 })
 
 var _ = Describe("SubsonicAPIService", func() {
@@ -379,66 +323,6 @@ var _ = Describe("SubsonicAPIService", func() {
 		})
 	})
 
-	Describe("CallRaw", func() {
-		It("returns binary data and content-type", func() {
-			service := newSubsonicAPIService("test-plugin", router, dataStore, nil, true)
-
-			ctx := GinkgoT().Context()
-			contentType, data, err := service.CallRaw(ctx, "/getCoverArt?u=testuser&id=al-1")
-			Expect(err).ToNot(HaveOccurred())
-			Expect(contentType).To(Equal("image/png"))
-			Expect(data).To(Equal(fakePNGHeader))
-		})
-
-		It("does not set f=json parameter", func() {
-			service := newSubsonicAPIService("test-plugin", router, dataStore, nil, true)
-
-			ctx := GinkgoT().Context()
-			_, _, err := service.CallRaw(ctx, "/getCoverArt?u=testuser&id=al-1")
-			Expect(err).ToNot(HaveOccurred())
-
-			Expect(router.lastRequest).ToNot(BeNil())
-			query := router.lastRequest.URL.Query()
-			Expect(query.Get("f")).To(BeEmpty())
-		})
-
-		It("enforces permission checks", func() {
-			service := newSubsonicAPIService("test-plugin", router, dataStore, []string{"user2"}, false)
-
-			ctx := GinkgoT().Context()
-			_, _, err := service.CallRaw(ctx, "/getCoverArt?u=testuser&id=al-1")
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("not authorized"))
-		})
-
-		It("returns error when username is missing", func() {
-			service := newSubsonicAPIService("test-plugin", router, dataStore, nil, true)
-
-			ctx := GinkgoT().Context()
-			_, _, err := service.CallRaw(ctx, "/getCoverArt")
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("missing required parameter"))
-		})
-
-		It("returns error when router is nil", func() {
-			service := newSubsonicAPIService("test-plugin", nil, dataStore, nil, true)
-
-			ctx := GinkgoT().Context()
-			_, _, err := service.CallRaw(ctx, "/getCoverArt?u=testuser")
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("router not available"))
-		})
-
-		It("returns error for invalid URL", func() {
-			service := newSubsonicAPIService("test-plugin", router, dataStore, nil, true)
-
-			ctx := GinkgoT().Context()
-			_, _, err := service.CallRaw(ctx, "://invalid")
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("invalid URL"))
-		})
-	})
-
 	Describe("Router Availability", func() {
 		It("returns error when router is nil", func() {
 			service := newSubsonicAPIService("test-plugin", nil, dataStore, nil, true)
@@ -451,9 +335,6 @@ var _ = Describe("SubsonicAPIService", func() {
 	})
 })
 
-// fakePNGHeader is a minimal PNG file header used in tests.
-var fakePNGHeader = []byte{0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A}
-
 // fakeSubsonicRouter is a mock Subsonic router that returns predictable responses.
 type fakeSubsonicRouter struct {
 	lastRequest *http.Request
@@ -462,20 +343,13 @@ type fakeSubsonicRouter struct {
 func (r *fakeSubsonicRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	r.lastRequest = req
 
-	endpoint := path.Base(req.URL.Path)
-	switch endpoint {
-	case "getCoverArt":
-		w.Header().Set("Content-Type", "image/png")
-		_, _ = w.Write(fakePNGHeader)
-	default:
-		// Return a successful ping response
-		response := map[string]any{
-			"subsonic-response": map[string]any{
-				"status":  "ok",
-				"version": "1.16.1",
-			},
-		}
-		w.Header().Set("Content-Type", "application/json")
-		_ = json.NewEncoder(w).Encode(response)
+	// Return a successful ping response
+	response := map[string]any{
+		"subsonic-response": map[string]any{
+			"status":  "ok",
+			"version": "1.16.1",
+		},
 	}
+	w.Header().Set("Content-Type", "application/json")
+	_ = json.NewEncoder(w).Encode(response)
 }

plugins/host_websocket.go

@@ -324,52 +324,105 @@ func (s *webSocketServiceImpl) readLoop(ctx context.Context, connectionID string
 	}
 }
 
-// invokeWebSocketCallback is a generic helper that handles the common callback invocation pattern.
-func invokeWebSocketCallback[I any](ctx context.Context, s *webSocketServiceImpl, funcName string, input I, callbackName string, connectionID string) {
+func (s *webSocketServiceImpl) invokeOnTextMessage(ctx context.Context, connectionID, message string) {
 	instance := s.getPluginInstance()
 	if instance == nil {
 		return
 	}
 
+	input := capabilities.OnTextMessageRequest{
+		ConnectionID: connectionID,
+		Message:      message,
+	}
+
+	// Create a timeout context for this callback invocation
 	callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout)
 	defer cancel()
 
 	start := time.Now()
-	err := callPluginFunctionNoOutput(callbackCtx, instance, funcName, input)
+	err := callPluginFunctionNoOutput(callbackCtx, instance, FuncWebSocketOnTextMessage, input)
 	if err != nil {
+		// Don't log error if function simply doesn't exist (optional callback)
 		if !errors.Is(errFunctionNotFound, err) {
-			log.Error(ctx, "WebSocket "+callbackName+" callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err)
+			log.Error(ctx, "WebSocket text message callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err)
 		}
 	}
 }
 
-func (s *webSocketServiceImpl) invokeOnTextMessage(ctx context.Context, connectionID, message string) {
-	invokeWebSocketCallback(ctx, s, FuncWebSocketOnTextMessage, capabilities.OnTextMessageRequest{
-		ConnectionID: connectionID,
-		Message:      message,
-	}, "text message", connectionID)
-}
-
 func (s *webSocketServiceImpl) invokeOnBinaryMessage(ctx context.Context, connectionID string, data []byte) {
-	invokeWebSocketCallback(ctx, s, FuncWebSocketOnBinaryMessage, capabilities.OnBinaryMessageRequest{
+	instance := s.getPluginInstance()
+	if instance == nil {
+		return
+	}
+
+	input := capabilities.OnBinaryMessageRequest{
 		ConnectionID: connectionID,
 		Data:         base64.StdEncoding.EncodeToString(data),
-	}, "binary message", connectionID)
+	}
+
+	// Create a timeout context for this callback invocation
+	callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout)
+	defer cancel()
+
+	start := time.Now()
+	err := callPluginFunctionNoOutput(callbackCtx, instance, FuncWebSocketOnBinaryMessage, input)
+	if err != nil {
+		// Don't log error if function simply doesn't exist (optional callback)
+		if !errors.Is(errFunctionNotFound, err) {
+			log.Error(ctx, "WebSocket binary message callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err)
+		}
+	}
 }
 
 func (s *webSocketServiceImpl) invokeOnError(ctx context.Context, connectionID, errorMsg string) {
-	invokeWebSocketCallback(ctx, s, FuncWebSocketOnError, capabilities.OnErrorRequest{
+	instance := s.getPluginInstance()
+	if instance == nil {
+		return
+	}
+
+	input := capabilities.OnErrorRequest{
 		ConnectionID: connectionID,
 		Error:        errorMsg,
-	}, "error", connectionID)
+	}
+
+	// Create a timeout context for this callback invocation
+	callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout)
+	defer cancel()
+
+	start := time.Now()
+	err := callPluginFunctionNoOutput(callbackCtx, instance, FuncWebSocketOnError, input)
+	if err != nil {
+		// Don't log error if function simply doesn't exist (optional callback)
+		if !errors.Is(errFunctionNotFound, err) {
+			log.Error(ctx, "WebSocket error callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err)
+		}
+	}
 }
 
 func (s *webSocketServiceImpl) invokeOnClose(ctx context.Context, connectionID string, code int32, reason string) {
-	invokeWebSocketCallback(ctx, s, FuncWebSocketOnClose, capabilities.OnCloseRequest{
+	instance := s.getPluginInstance()
+	if instance == nil {
+		return
+	}
+
+	input := capabilities.OnCloseRequest{
 		ConnectionID: connectionID,
 		Code:         code,
 		Reason:       reason,
-	}, "close", connectionID)
+	}
+
+	// Create a timeout context for this callback invocation
+	callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout)
+	defer cancel()
+
+	start := time.Now()
+	err := callPluginFunctionNoOutput(callbackCtx, instance, FuncWebSocketOnClose, input)
+	if err != nil {
+		// Don't log error if function simply doesn't exist (optional callback)
+		if !errors.Is(errFunctionNotFound, err) {
+			log.Error(ctx, "WebSocket close callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err)
+		}
+	}
 }
 
 func (s *webSocketServiceImpl) getPluginInstance() *plugin {

plugins/manager_call.go

@@ -72,9 +72,7 @@ func callPluginFunction[I any, O any](ctx context.Context, plugin *plugin, funcN
 	}
 	if exit != 0 {
 		if exit == notImplementedCode {
-			log.Trace(ctx, "Plugin function not implemented", "plugin", plugin.name, "function", funcName, "pluginDuration", elapsed, "navidromeDuration", startCall.Sub(start))
-			// TODO Should we record metrics for not implemented calls?
-			//plugin.metrics.RecordPluginRequest(ctx, plugin.name, funcName, true, elapsed.Milliseconds())
+			plugin.metrics.RecordPluginRequest(ctx, plugin.name, funcName, false, elapsed.Milliseconds())
 			return result, fmt.Errorf("%w: %s", errNotImplemented, funcName)
 		}
 		plugin.metrics.RecordPluginRequest(ctx, plugin.name, funcName, false, elapsed.Milliseconds())

plugins/manager_call_test.go

@@ -106,7 +106,7 @@ var _ = Describe("callPluginFunction metrics", Ordered, func() {
 		Expect(calls[0].ok).To(BeFalse())
 	})
 
-	It("does not record metrics for not-implemented functions", func() {
+	It("records metrics for not-implemented functions", func() {
 		// Use partial metadata agent that doesn't implement GetArtistMBID
 		partialRecorder := &mockMetricsRecorder{}
 		partialManager, _ := createTestManagerWithPluginsAndMetrics(
@@ -123,6 +123,9 @@ var _ = Describe("callPluginFunction metrics", Ordered, func() {
 		Expect(err).To(MatchError(errNotImplemented))
 
 		calls := partialRecorder.getCalls()
-		Expect(calls).To(HaveLen(0))
+		Expect(calls).To(HaveLen(1))
+		Expect(calls[0].plugin).To(Equal("partial-metadata-agent"))
+		Expect(calls[0].method).To(Equal(FuncGetArtistMBID))
+		Expect(calls[0].ok).To(BeFalse())
 	})
 })

plugins/manifest-schema.json

@@ -153,6 +153,17 @@
         }
       }
     },
+    "ConfigPermission": {
+      "type": "object",
+      "description": "Configuration access permissions for a plugin",
+      "additionalProperties": false,
+      "properties": {
+        "reason": {
+          "type": "string",
+          "description": "Explanation for why config access is needed"
+        }
+      }
+    },
     "SubsonicAPIPermission": {
       "type": "object",
       "description": "SubsonicAPI service permissions. Requires 'users' permission to be declared.",

plugins/manifest_gen.go

@@ -45,6 +45,12 @@ func (j *ConfigDefinition) UnmarshalJSON(value []byte) error {
 	return nil
 }
 
+// Configuration access permissions for a plugin
+type ConfigPermission struct {
+	// Explanation for why config access is needed
+	Reason *string `json:"reason,omitempty" yaml:"reason,omitempty" mapstructure:"reason,omitempty"`
+}
+
 // Experimental features that may change or be removed in future versions
 type Experimental struct {
 	// Threads corresponds to the JSON schema field "threads".

plugins/metadata_agent.go

@@ -14,17 +14,14 @@ const CapabilityMetadataAgent Capability = "MetadataAgent"
 
 // Export function names (snake_case as per design)
 const (
-	FuncGetArtistMBID           = "nd_get_artist_mbid"
-	FuncGetArtistURL            = "nd_get_artist_url"
-	FuncGetArtistBiography      = "nd_get_artist_biography"
-	FuncGetSimilarArtists       = "nd_get_similar_artists"
-	FuncGetArtistImages         = "nd_get_artist_images"
-	FuncGetArtistTopSongs       = "nd_get_artist_top_songs"
-	FuncGetAlbumInfo            = "nd_get_album_info"
-	FuncGetAlbumImages          = "nd_get_album_images"
-	FuncGetSimilarSongsByTrack  = "nd_get_similar_songs_by_track"
-	FuncGetSimilarSongsByAlbum  = "nd_get_similar_songs_by_album"
-	FuncGetSimilarSongsByArtist = "nd_get_similar_songs_by_artist"
+	FuncGetArtistMBID      = "nd_get_artist_mbid"
+	FuncGetArtistURL       = "nd_get_artist_url"
+	FuncGetArtistBiography = "nd_get_artist_biography"
+	FuncGetSimilarArtists  = "nd_get_similar_artists"
+	FuncGetArtistImages    = "nd_get_artist_images"
+	FuncGetArtistTopSongs  = "nd_get_artist_top_songs"
+	FuncGetAlbumInfo       = "nd_get_album_info"
+	FuncGetAlbumImages     = "nd_get_album_images"
 )
 
 func init() {
@@ -38,9 +35,6 @@ func init() {
 		FuncGetArtistTopSongs,
 		FuncGetAlbumInfo,
 		FuncGetAlbumImages,
-		FuncGetSimilarSongsByTrack,
-		FuncGetSimilarSongsByAlbum,
-		FuncGetSimilarSongsByArtist,
 	)
 }
 
@@ -153,7 +147,12 @@ func (a *MetadataAgent) GetArtistTopSongs(ctx context.Context, id, artistName, m
 		return nil, agents.ErrNotFound
 	}
 
-	return songRefsToAgentSongs(result.Songs), nil
+	songs := make([]agents.Song, len(result.Songs))
+	for i, s := range result.Songs {
+		songs[i] = agents.Song{ID: s.ID, Name: s.Name, MBID: s.MBID}
+	}
+
+	return songs, nil
 }
 
 // GetAlbumInfo retrieves album information
@@ -196,63 +195,15 @@ func (a *MetadataAgent) GetAlbumImages(ctx context.Context, name, artist, mbid s
 	return images, nil
 }
 
-func callSimilarSongsPluginFunction[T any](ctx context.Context, plugin *plugin, funcName string, input T) ([]agents.Song, error) {
-	result, err := callPluginFunction[T, *capabilities.SimilarSongsResponse](ctx, plugin, funcName, input)
-	if err != nil {
-		return nil, err
-	}
-	if result == nil || len(result.Songs) == 0 {
-		return nil, agents.ErrNotFound
-	}
-	return songRefsToAgentSongs(result.Songs), nil
-}
-
-// GetSimilarSongsByTrack retrieves songs similar to a specific track
-func (a *MetadataAgent) GetSimilarSongsByTrack(ctx context.Context, id, name, artist, mbid string, count int) ([]agents.Song, error) {
-	return callSimilarSongsPluginFunction[capabilities.SimilarSongsByTrackRequest](ctx, a.plugin, FuncGetSimilarSongsByTrack, capabilities.SimilarSongsByTrackRequest{ID: id, Name: name, Artist: artist, MBID: mbid, Count: int32(count)})
-}
-
-// GetSimilarSongsByAlbum retrieves songs similar to tracks on an album
-func (a *MetadataAgent) GetSimilarSongsByAlbum(ctx context.Context, id, name, artist, mbid string, count int) ([]agents.Song, error) {
-	return callSimilarSongsPluginFunction[capabilities.SimilarSongsByAlbumRequest](ctx, a.plugin, FuncGetSimilarSongsByAlbum, capabilities.SimilarSongsByAlbumRequest{ID: id, Name: name, Artist: artist, MBID: mbid, Count: int32(count)})
-}
-
-// GetSimilarSongsByArtist retrieves songs similar to an artist's catalog
-func (a *MetadataAgent) GetSimilarSongsByArtist(ctx context.Context, id, name, mbid string, count int) ([]agents.Song, error) {
-	return callSimilarSongsPluginFunction[capabilities.SimilarSongsByArtistRequest](ctx, a.plugin, FuncGetSimilarSongsByArtist, capabilities.SimilarSongsByArtistRequest{ID: id, Name: name, MBID: mbid, Count: int32(count)})
-}
-
-// songRefsToAgentSongs converts a slice of SongRef to agents.Song
-func songRefsToAgentSongs(refs []capabilities.SongRef) []agents.Song {
-	songs := make([]agents.Song, len(refs))
-	for i, s := range refs {
-		songs[i] = agents.Song{
-			ID:         s.ID,
-			Name:       s.Name,
-			MBID:       s.MBID,
-			ISRC:       s.ISRC,
-			Artist:     s.Artist,
-			ArtistMBID: s.ArtistMBID,
-			Album:      s.Album,
-			AlbumMBID:  s.AlbumMBID,
-			Duration:   uint32(s.Duration * 1000),
-		}
-	}
-	return songs
-}
-
 // Verify interface implementations at compile time
 var (
-	_ agents.Interface                     = (*MetadataAgent)(nil)
-	_ agents.ArtistMBIDRetriever           = (*MetadataAgent)(nil)
-	_ agents.ArtistURLRetriever            = (*MetadataAgent)(nil)
-	_ agents.ArtistBiographyRetriever      = (*MetadataAgent)(nil)
-	_ agents.ArtistSimilarRetriever        = (*MetadataAgent)(nil)
-	_ agents.ArtistImageRetriever          = (*MetadataAgent)(nil)
-	_ agents.ArtistTopSongsRetriever       = (*MetadataAgent)(nil)
-	_ agents.AlbumInfoRetriever            = (*MetadataAgent)(nil)
-	_ agents.AlbumImageRetriever           = (*MetadataAgent)(nil)
-	_ agents.SimilarSongsByTrackRetriever  = (*MetadataAgent)(nil)
-	_ agents.SimilarSongsByAlbumRetriever  = (*MetadataAgent)(nil)
-	_ agents.SimilarSongsByArtistRetriever = (*MetadataAgent)(nil)
+	_ agents.Interface                = (*MetadataAgent)(nil)
+	_ agents.ArtistMBIDRetriever      = (*MetadataAgent)(nil)
+	_ agents.ArtistURLRetriever       = (*MetadataAgent)(nil)
+	_ agents.ArtistBiographyRetriever = (*MetadataAgent)(nil)
+	_ agents.ArtistSimilarRetriever   = (*MetadataAgent)(nil)
+	_ agents.ArtistImageRetriever     = (*MetadataAgent)(nil)
+	_ agents.ArtistTopSongsRetriever  = (*MetadataAgent)(nil)
+	_ agents.AlbumInfoRetriever       = (*MetadataAgent)(nil)
+	_ agents.AlbumImageRetriever      = (*MetadataAgent)(nil)
 )

plugins/metadata_agent_test.go

@@ -108,37 +108,6 @@ var _ = Describe("MetadataAgent", Ordered, func() {
 			Expect(images[0].Size).To(Equal(500))
 		})
 	})
-
-	Describe("GetSimilarSongsByTrack", func() {
-		It("returns similar songs from the plugin", func() {
-			retriever := agent.(agents.SimilarSongsByTrackRetriever)
-			songs, err := retriever.GetSimilarSongsByTrack(GinkgoT().Context(), "track-1", "Yesterday", "The Beatles", "some-mbid", 3)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(songs).To(HaveLen(3))
-			Expect(songs[0].Name).To(Equal("Similar to Yesterday #1"))
-			Expect(songs[0].Artist).To(Equal("The Beatles"))
-		})
-	})
-
-	Describe("GetSimilarSongsByAlbum", func() {
-		It("returns similar songs from the plugin", func() {
-			retriever := agent.(agents.SimilarSongsByAlbumRetriever)
-			songs, err := retriever.GetSimilarSongsByAlbum(GinkgoT().Context(), "album-1", "Abbey Road", "The Beatles", "album-mbid", 3)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(songs).To(HaveLen(3))
-			Expect(songs[0].Album).To(Equal("Abbey Road"))
-		})
-	})
-
-	Describe("GetSimilarSongsByArtist", func() {
-		It("returns similar songs from the plugin", func() {
-			retriever := agent.(agents.SimilarSongsByArtistRetriever)
-			songs, err := retriever.GetSimilarSongsByArtist(GinkgoT().Context(), "artist-1", "The Beatles", "some-mbid", 3)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(songs).To(HaveLen(3))
-			Expect(songs[0].Name).To(ContainSubstring("The Beatles Style Song"))
-		})
-	})
 })
 
 var _ = Describe("MetadataAgent error handling", Ordered, func() {
@@ -217,27 +186,6 @@ var _ = Describe("MetadataAgent error handling", Ordered, func() {
 		Expect(err).To(HaveOccurred())
 		Expect(err.Error()).To(ContainSubstring("simulated plugin error"))
 	})
-
-	It("returns error from GetSimilarSongsByTrack", func() {
-		retriever := errorAgent.(agents.SimilarSongsByTrackRetriever)
-		_, err := retriever.GetSimilarSongsByTrack(GinkgoT().Context(), "track-1", "Test", "Artist", "mbid", 5)
-		Expect(err).To(HaveOccurred())
-		Expect(err.Error()).To(ContainSubstring("simulated plugin error"))
-	})
-
-	It("returns error from GetSimilarSongsByAlbum", func() {
-		retriever := errorAgent.(agents.SimilarSongsByAlbumRetriever)
-		_, err := retriever.GetSimilarSongsByAlbum(GinkgoT().Context(), "album-1", "Album", "Artist", "mbid", 5)
-		Expect(err).To(HaveOccurred())
-		Expect(err.Error()).To(ContainSubstring("simulated plugin error"))
-	})
-
-	It("returns error from GetSimilarSongsByArtist", func() {
-		retriever := errorAgent.(agents.SimilarSongsByArtistRetriever)
-		_, err := retriever.GetSimilarSongsByArtist(GinkgoT().Context(), "artist-1", "Artist", "mbid", 5)
-		Expect(err).To(HaveOccurred())
-		Expect(err.Error()).To(ContainSubstring("simulated plugin error"))
-	})
 })
 
 var _ = Describe("MetadataAgent partial implementation", Ordered, func() {
@@ -307,23 +255,6 @@ var _ = Describe("MetadataAgent partial implementation", Ordered, func() {
 		retriever := partialAgent.(agents.AlbumImageRetriever)
 		_, err := retriever.GetAlbumImages(GinkgoT().Context(), "Album", "Artist", "mbid")
 		Expect(err).To(MatchError(errNotImplemented))
-	})
 
-	It("returns ErrNotFound for unimplemented method (GetSimilarSongsByTrack)", func() {
-		retriever := partialAgent.(agents.SimilarSongsByTrackRetriever)
-		_, err := retriever.GetSimilarSongsByTrack(GinkgoT().Context(), "track-1", "Test", "Artist", "mbid", 5)
-		Expect(err).To(MatchError(errNotImplemented))
-	})
-
-	It("returns ErrNotFound for unimplemented method (GetSimilarSongsByAlbum)", func() {
-		retriever := partialAgent.(agents.SimilarSongsByAlbumRetriever)
-		_, err := retriever.GetSimilarSongsByAlbum(GinkgoT().Context(), "album-1", "Album", "Artist", "mbid", 5)
-		Expect(err).To(MatchError(errNotImplemented))
-	})
-
-	It("returns ErrNotFound for unimplemented method (GetSimilarSongsByArtist)", func() {
-		retriever := partialAgent.(agents.SimilarSongsByArtistRetriever)
-		_, err := retriever.GetSimilarSongsByArtist(GinkgoT().Context(), "artist-1", "Artist", "mbid", 5)
-		Expect(err).To(MatchError(errNotImplemented))
 	})
 })

plugins/pdk/go/go.mod

@@ -6,3 +6,10 @@ require (
 	github.com/extism/go-pdk v1.1.3
 	github.com/stretchr/testify v1.11.1
 )
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

plugins/pdk/go/host/nd_host_subsonicapi.go

@@ -8,7 +8,6 @@
 package host
 
 import (
-	"encoding/binary"
 	"encoding/json"
 	"errors"
 
@@ -20,11 +19,6 @@ import (
 //go:wasmimport extism:host/user subsonicapi_call
 func subsonicapi_call(uint64) uint64
 
-// subsonicapi_callraw is the host function provided by Navidrome.
-//
-//go:wasmimport extism:host/user subsonicapi_callraw
-func subsonicapi_callraw(uint64) uint64
-
 type subsonicAPICallRequest struct {
 	Uri string `json:"uri"`
 }
@@ -34,10 +28,6 @@ type subsonicAPICallResponse struct {
 	Error        string `json:"error,omitempty"`
 }
 
-type subsonicAPICallRawRequest struct {
-	Uri string `json:"uri"`
-}
-
 // SubsonicAPICall calls the subsonicapi_call host function.
 // Call executes a Subsonic API request and returns the JSON response.
 //
@@ -75,46 +65,3 @@ func SubsonicAPICall(uri string) (string, error) {
 
 	return response.ResponseJSON, nil
 }
-
-// SubsonicAPICallRaw calls the subsonicapi_callraw host function.
-// CallRaw executes a Subsonic API request and returns the raw binary response.
-// Optimized for binary endpoints like getCoverArt and stream that return
-// non-JSON data. The response is returned as raw bytes without JSON encoding overhead.
-func SubsonicAPICallRaw(uri string) (string, []byte, error) {
-	// Marshal request to JSON
-	req := subsonicAPICallRawRequest{
-		Uri: uri,
-	}
-	reqBytes, err := json.Marshal(req)
-	if err != nil {
-		return "", nil, err
-	}
-	reqMem := pdk.AllocateBytes(reqBytes)
-	defer reqMem.Free()
-
-	// Call the host function
-	responsePtr := subsonicapi_callraw(reqMem.Offset())
-
-	// Read the response from memory
-	responseMem := pdk.FindMemory(responsePtr)
-	responseBytes := responseMem.ReadBytes()
-
-	// Parse binary-framed response
-	if len(responseBytes) == 0 {
-		return "", nil, errors.New("empty response from host")
-	}
-	if responseBytes[0] == 0x01 { // error
-		return "", nil, errors.New(string(responseBytes[1:]))
-	}
-	if responseBytes[0] != 0x00 {
-		return "", nil, errors.New("unknown response status")
-	}
-	if len(responseBytes) < 5 {
-		return "", nil, errors.New("malformed raw response: incomplete header")
-	}
-	ctLen := binary.BigEndian.Uint32(responseBytes[1:5])
-	if uint32(len(responseBytes)) < 5+ctLen {
-		return "", nil, errors.New("malformed raw response: content-type overflow")
-	}
-	return string(responseBytes[5 : 5+ctLen]), responseBytes[5+ctLen:], nil
-}

plugins/pdk/go/host/nd_host_subsonicapi_stub.go

@@ -33,17 +33,3 @@ func (m *mockSubsonicAPIService) Call(uri string) (string, error) {
 func SubsonicAPICall(uri string) (string, error) {
 	return SubsonicAPIMock.Call(uri)
 }
-
-// CallRaw is the mock method for SubsonicAPICallRaw.
-func (m *mockSubsonicAPIService) CallRaw(uri string) (string, []byte, error) {
-	args := m.Called(uri)
-	return args.String(0), args.Get(1).([]byte), args.Error(2)
-}
-
-// SubsonicAPICallRaw delegates to the mock instance.
-// CallRaw executes a Subsonic API request and returns the raw binary response.
-// Optimized for binary endpoints like getCoverArt and stream that return
-// non-JSON data. The response is returned as raw bytes without JSON encoding overhead.
-func SubsonicAPICallRaw(uri string) (string, []byte, error) {
-	return SubsonicAPIMock.CallRaw(uri)
-}

plugins/pdk/go/metadata/metadata.go

@@ -117,53 +117,7 @@ type SimilarArtistsResponse struct {
 	Artists []ArtistRef `json:"artists"`
 }
 
-// SimilarSongsByAlbumRequest is the request for GetSimilarSongsByAlbum.
-type SimilarSongsByAlbumRequest struct {
-	// ID is the internal Navidrome album ID.
-	ID string `json:"id"`
-	// Name is the album name.
-	Name string `json:"name"`
-	// Artist is the album artist name.
-	Artist string `json:"artist"`
-	// MBID is the MusicBrainz release ID (if known).
-	MBID string `json:"mbid,omitempty"`
-	// Count is the maximum number of similar songs to return.
-	Count int32 `json:"count"`
-}
-
-// SimilarSongsByArtistRequest is the request for GetSimilarSongsByArtist.
-type SimilarSongsByArtistRequest struct {
-	// ID is the internal Navidrome artist ID.
-	ID string `json:"id"`
-	// Name is the artist name.
-	Name string `json:"name"`
-	// MBID is the MusicBrainz artist ID (if known).
-	MBID string `json:"mbid,omitempty"`
-	// Count is the maximum number of similar songs to return.
-	Count int32 `json:"count"`
-}
-
-// SimilarSongsByTrackRequest is the request for GetSimilarSongsByTrack.
-type SimilarSongsByTrackRequest struct {
-	// ID is the internal Navidrome mediafile ID.
-	ID string `json:"id"`
-	// Name is the track title.
-	Name string `json:"name"`
-	// Artist is the artist name.
-	Artist string `json:"artist"`
-	// MBID is the MusicBrainz recording ID (if known).
-	MBID string `json:"mbid,omitempty"`
-	// Count is the maximum number of similar songs to return.
-	Count int32 `json:"count"`
-}
-
-// SimilarSongsResponse is the response for GetSimilarSongsBy* functions.
-type SimilarSongsResponse struct {
-	// Songs is the list of similar songs.
-	Songs []SongRef `json:"songs"`
-}
-
-// SongRef is a reference to a song with metadata for matching.
+// SongRef is a reference to a song with name and optional MBID.
 type SongRef struct {
 	// ID is the internal Navidrome mediafile ID (if known).
 	ID string `json:"id,omitempty"`
@@ -171,18 +125,6 @@ type SongRef struct {
 	Name string `json:"name"`
 	// MBID is the MusicBrainz ID for the song.
 	MBID string `json:"mbid,omitempty"`
-	// ISRC is the International Standard Recording Code for the song.
-	ISRC string `json:"isrc,omitempty"`
-	// Artist is the artist name.
-	Artist string `json:"artist,omitempty"`
-	// ArtistMBID is the MusicBrainz artist ID.
-	ArtistMBID string `json:"artistMbid,omitempty"`
-	// Album is the album name.
-	Album string `json:"album,omitempty"`
-	// AlbumMBID is the MusicBrainz release ID.
-	AlbumMBID string `json:"albumMbid,omitempty"`
-	// Duration is the song duration in seconds.
-	Duration float32 `json:"duration,omitempty"`
 }
 
 // TopSongsRequest is the request for GetArtistTopSongs.
@@ -251,34 +193,16 @@ type AlbumInfoProvider interface {
 // AlbumImagesProvider provides the GetAlbumImages function.
 type AlbumImagesProvider interface {
 	GetAlbumImages(AlbumRequest) (*AlbumImagesResponse, error)
-}
-
-// SimilarSongsByTrackProvider provides the GetSimilarSongsByTrack function.
-type SimilarSongsByTrackProvider interface {
-	GetSimilarSongsByTrack(SimilarSongsByTrackRequest) (*SimilarSongsResponse, error)
-}
-
-// SimilarSongsByAlbumProvider provides the GetSimilarSongsByAlbum function.
-type SimilarSongsByAlbumProvider interface {
-	GetSimilarSongsByAlbum(SimilarSongsByAlbumRequest) (*SimilarSongsResponse, error)
-}
-
-// SimilarSongsByArtistProvider provides the GetSimilarSongsByArtist function.
-type SimilarSongsByArtistProvider interface {
-	GetSimilarSongsByArtist(SimilarSongsByArtistRequest) (*SimilarSongsResponse, error)
 } // Internal implementation holders
 var (
-	artistMBIDImpl           func(ArtistMBIDRequest) (*ArtistMBIDResponse, error)
-	artistURLImpl            func(ArtistRequest) (*ArtistURLResponse, error)
-	artistBiographyImpl      func(ArtistRequest) (*ArtistBiographyResponse, error)
-	similarArtistsImpl       func(SimilarArtistsRequest) (*SimilarArtistsResponse, error)
-	artistImagesImpl         func(ArtistRequest) (*ArtistImagesResponse, error)
-	artistTopSongsImpl       func(TopSongsRequest) (*TopSongsResponse, error)
-	albumInfoImpl            func(AlbumRequest) (*AlbumInfoResponse, error)
-	albumImagesImpl          func(AlbumRequest) (*AlbumImagesResponse, error)
-	similarSongsByTrackImpl  func(SimilarSongsByTrackRequest) (*SimilarSongsResponse, error)
-	similarSongsByAlbumImpl  func(SimilarSongsByAlbumRequest) (*SimilarSongsResponse, error)
-	similarSongsByArtistImpl func(SimilarSongsByArtistRequest) (*SimilarSongsResponse, error)
+	artistMBIDImpl      func(ArtistMBIDRequest) (*ArtistMBIDResponse, error)
+	artistURLImpl       func(ArtistRequest) (*ArtistURLResponse, error)
+	artistBiographyImpl func(ArtistRequest) (*ArtistBiographyResponse, error)
+	similarArtistsImpl  func(SimilarArtistsRequest) (*SimilarArtistsResponse, error)
+	artistImagesImpl    func(ArtistRequest) (*ArtistImagesResponse, error)
+	artistTopSongsImpl  func(TopSongsRequest) (*TopSongsResponse, error)
+	albumInfoImpl       func(AlbumRequest) (*AlbumInfoResponse, error)
+	albumImagesImpl     func(AlbumRequest) (*AlbumImagesResponse, error)
 )
 
 // Register registers a metadata implementation.
@@ -308,15 +232,6 @@ func Register(impl Metadata) {
 	if p, ok := impl.(AlbumImagesProvider); ok {
 		albumImagesImpl = p.GetAlbumImages
 	}
-	if p, ok := impl.(SimilarSongsByTrackProvider); ok {
-		similarSongsByTrackImpl = p.GetSimilarSongsByTrack
-	}
-	if p, ok := impl.(SimilarSongsByAlbumProvider); ok {
-		similarSongsByAlbumImpl = p.GetSimilarSongsByAlbum
-	}
-	if p, ok := impl.(SimilarSongsByArtistProvider); ok {
-		similarSongsByArtistImpl = p.GetSimilarSongsByArtist
-	}
 }
 
 // NotImplementedCode is the standard return code for unimplemented functions.
@@ -538,84 +453,3 @@ func _NdGetAlbumImages() int32 {
 
 	return 0
 }
-
-//go:wasmexport nd_get_similar_songs_by_track
-func _NdGetSimilarSongsByTrack() int32 {
-	if similarSongsByTrackImpl == nil {
-		// Return standard code - host will skip this plugin gracefully
-		return NotImplementedCode
-	}
-
-	var input SimilarSongsByTrackRequest
-	if err := pdk.InputJSON(&input); err != nil {
-		pdk.SetError(err)
-		return -1
-	}
-
-	output, err := similarSongsByTrackImpl(input)
-	if err != nil {
-		pdk.SetError(err)
-		return -1
-	}
-
-	if err := pdk.OutputJSON(output); err != nil {
-		pdk.SetError(err)
-		return -1
-	}
-
-	return 0
-}
-
-//go:wasmexport nd_get_similar_songs_by_album
-func _NdGetSimilarSongsByAlbum() int32 {
-	if similarSongsByAlbumImpl == nil {
-		// Return standard code - host will skip this plugin gracefully
-		return NotImplementedCode
-	}
-
-	var input SimilarSongsByAlbumRequest
-	if err := pdk.InputJSON(&input); err != nil {
-		pdk.SetError(err)
-		return -1
-	}
-
-	output, err := similarSongsByAlbumImpl(input)
-	if err != nil {
-		pdk.SetError(err)
-		return -1
-	}
-
-	if err := pdk.OutputJSON(output); err != nil {
-		pdk.SetError(err)
-		return -1
-	}
-
-	return 0
-}
-
-//go:wasmexport nd_get_similar_songs_by_artist
-func _NdGetSimilarSongsByArtist() int32 {
-	if similarSongsByArtistImpl == nil {
-		// Return standard code - host will skip this plugin gracefully
-		return NotImplementedCode
-	}
-
-	var input SimilarSongsByArtistRequest
-	if err := pdk.InputJSON(&input); err != nil {
-		pdk.SetError(err)
-		return -1
-	}
-
-	output, err := similarSongsByArtistImpl(input)
-	if err != nil {
-		pdk.SetError(err)
-		return -1
-	}
-
-	if err := pdk.OutputJSON(output); err != nil {
-		pdk.SetError(err)
-		return -1
-	}
-
-	return 0
-}

plugins/pdk/go/metadata/metadata_stub.go

@@ -114,53 +114,7 @@ type SimilarArtistsResponse struct {
 	Artists []ArtistRef `json:"artists"`
 }
 
-// SimilarSongsByAlbumRequest is the request for GetSimilarSongsByAlbum.
-type SimilarSongsByAlbumRequest struct {
-	// ID is the internal Navidrome album ID.
-	ID string `json:"id"`
-	// Name is the album name.
-	Name string `json:"name"`
-	// Artist is the album artist name.
-	Artist string `json:"artist"`
-	// MBID is the MusicBrainz release ID (if known).
-	MBID string `json:"mbid,omitempty"`
-	// Count is the maximum number of similar songs to return.
-	Count int32 `json:"count"`
-}
-
-// SimilarSongsByArtistRequest is the request for GetSimilarSongsByArtist.
-type SimilarSongsByArtistRequest struct {
-	// ID is the internal Navidrome artist ID.
-	ID string `json:"id"`
-	// Name is the artist name.
-	Name string `json:"name"`
-	// MBID is the MusicBrainz artist ID (if known).
-	MBID string `json:"mbid,omitempty"`
-	// Count is the maximum number of similar songs to return.
-	Count int32 `json:"count"`
-}
-
-// SimilarSongsByTrackRequest is the request for GetSimilarSongsByTrack.
-type SimilarSongsByTrackRequest struct {
-	// ID is the internal Navidrome mediafile ID.
-	ID string `json:"id"`
-	// Name is the track title.
-	Name string `json:"name"`
-	// Artist is the artist name.
-	Artist string `json:"artist"`
-	// MBID is the MusicBrainz recording ID (if known).
-	MBID string `json:"mbid,omitempty"`
-	// Count is the maximum number of similar songs to return.
-	Count int32 `json:"count"`
-}
-
-// SimilarSongsResponse is the response for GetSimilarSongsBy* functions.
-type SimilarSongsResponse struct {
-	// Songs is the list of similar songs.
-	Songs []SongRef `json:"songs"`
-}
-
-// SongRef is a reference to a song with metadata for matching.
+// SongRef is a reference to a song with name and optional MBID.
 type SongRef struct {
 	// ID is the internal Navidrome mediafile ID (if known).
 	ID string `json:"id,omitempty"`
@@ -168,18 +122,6 @@ type SongRef struct {
 	Name string `json:"name"`
 	// MBID is the MusicBrainz ID for the song.
 	MBID string `json:"mbid,omitempty"`
-	// ISRC is the International Standard Recording Code for the song.
-	ISRC string `json:"isrc,omitempty"`
-	// Artist is the artist name.
-	Artist string `json:"artist,omitempty"`
-	// ArtistMBID is the MusicBrainz artist ID.
-	ArtistMBID string `json:"artistMbid,omitempty"`
-	// Album is the album name.
-	Album string `json:"album,omitempty"`
-	// AlbumMBID is the MusicBrainz release ID.
-	AlbumMBID string `json:"albumMbid,omitempty"`
-	// Duration is the song duration in seconds.
-	Duration float32 `json:"duration,omitempty"`
 }
 
 // TopSongsRequest is the request for GetArtistTopSongs.
@@ -250,21 +192,6 @@ type AlbumImagesProvider interface {
 	GetAlbumImages(AlbumRequest) (*AlbumImagesResponse, error)
 }
 
-// SimilarSongsByTrackProvider provides the GetSimilarSongsByTrack function.
-type SimilarSongsByTrackProvider interface {
-	GetSimilarSongsByTrack(SimilarSongsByTrackRequest) (*SimilarSongsResponse, error)
-}
-
-// SimilarSongsByAlbumProvider provides the GetSimilarSongsByAlbum function.
-type SimilarSongsByAlbumProvider interface {
-	GetSimilarSongsByAlbum(SimilarSongsByAlbumRequest) (*SimilarSongsResponse, error)
-}
-
-// SimilarSongsByArtistProvider provides the GetSimilarSongsByArtist function.
-type SimilarSongsByArtistProvider interface {
-	GetSimilarSongsByArtist(SimilarSongsByArtistRequest) (*SimilarSongsResponse, error)
-}
-
 // NotImplementedCode is the standard return code for unimplemented functions.
 const NotImplementedCode int32 = -2
 

plugins/pdk/python/host/nd_host_subsonicapi.py

@@ -8,11 +8,10 @@
 # main __init__.py file. Copy the needed functions from this file into your plugin.
 
 from dataclasses import dataclass
-from typing import Any, Tuple
+from typing import Any
 
 import extism
 import json
-import struct
 
 
 class HostFunctionError(Exception):
@@ -26,12 +25,6 @@ def _subsonicapi_call(offset: int) -> int:
     ...
 
 
-@extism.import_fn("extism:host/user", "subsonicapi_callraw")
-def _subsonicapi_callraw(offset: int) -> int:
-    """Raw host function - do not call directly."""
-    ...
-
-
 def subsonicapi_call(uri: str) -> str:
     """Call executes a Subsonic API request and returns the JSON response.
 
@@ -60,42 +53,3 @@ e.g., "getAlbumList2?type=random&size=10". The response is returned as raw JSON.
         raise HostFunctionError(response["error"])
 
     return response.get("responseJson", "")
-
-
-def subsonicapi_call_raw(uri: str) -> Tuple[str, bytes]:
-    """CallRaw executes a Subsonic API request and returns the raw binary response.
-Optimized for binary endpoints like getCoverArt and stream that return
-non-JSON data. The response is returned as raw bytes without JSON encoding overhead.
-
-    Args:
-        uri: str parameter.
-
-    Returns:
-        Tuple of (content_type, data) with the raw binary response.
-
-    Raises:
-        HostFunctionError: If the host function returns an error.
-    """
-    request = {
-        "uri": uri,
-    }
-    request_bytes = json.dumps(request).encode("utf-8")
-    request_mem = extism.memory.alloc(request_bytes)
-    response_offset = _subsonicapi_callraw(request_mem.offset)
-    response_mem = extism.memory.find(response_offset)
-    response_bytes = response_mem.bytes()
-
-    if len(response_bytes) == 0:
-        raise HostFunctionError("empty response from host")
-    if response_bytes[0] == 0x01:
-        raise HostFunctionError(response_bytes[1:].decode("utf-8"))
-    if response_bytes[0] != 0x00:
-        raise HostFunctionError("unknown response status")
-    if len(response_bytes) < 5:
-        raise HostFunctionError("malformed raw response: incomplete header")
-    ct_len = struct.unpack(">I", response_bytes[1:5])[0]
-    if len(response_bytes) < 5 + ct_len:
-        raise HostFunctionError("malformed raw response: content-type overflow")
-    content_type = response_bytes[5:5 + ct_len].decode("utf-8")
-    data = response_bytes[5 + ct_len:]
-    return content_type, data

plugins/pdk/rust/nd-pdk-capabilities/src/metadata.rs

@@ -4,20 +4,6 @@
 // It is intended for use in Navidrome plugins built with extism-pdk.
 
 use serde::{Deserialize, Serialize};
-
-// Helper functions for skip_serializing_if with numeric types
-#[allow(dead_code)]
-fn is_zero_i32(value: &i32) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_u32(value: &u32) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_i64(value: &i64) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_u64(value: &u64) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_f32(value: &f32) -> bool { *value == 0.0 }
-#[allow(dead_code)]
-fn is_zero_f64(value: &f64) -> bool { *value == 0.0 }
 /// AlbumImagesResponse is the response for GetAlbumImages.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -164,72 +150,7 @@ pub struct SimilarArtistsResponse {
     #[serde(default)]
     pub artists: Vec<ArtistRef>,
 }
-/// SimilarSongsByAlbumRequest is the request for GetSimilarSongsByAlbum.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SimilarSongsByAlbumRequest {
-    /// ID is the internal Navidrome album ID.
-    #[serde(default)]
-    pub id: String,
-    /// Name is the album name.
-    #[serde(default)]
-    pub name: String,
-    /// Artist is the album artist name.
-    #[serde(default)]
-    pub artist: String,
-    /// MBID is the MusicBrainz release ID (if known).
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub mbid: String,
-    /// Count is the maximum number of similar songs to return.
-    #[serde(default)]
-    pub count: i32,
-}
-/// SimilarSongsByArtistRequest is the request for GetSimilarSongsByArtist.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SimilarSongsByArtistRequest {
-    /// ID is the internal Navidrome artist ID.
-    #[serde(default)]
-    pub id: String,
-    /// Name is the artist name.
-    #[serde(default)]
-    pub name: String,
-    /// MBID is the MusicBrainz artist ID (if known).
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub mbid: String,
-    /// Count is the maximum number of similar songs to return.
-    #[serde(default)]
-    pub count: i32,
-}
-/// SimilarSongsByTrackRequest is the request for GetSimilarSongsByTrack.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SimilarSongsByTrackRequest {
-    /// ID is the internal Navidrome mediafile ID.
-    #[serde(default)]
-    pub id: String,
-    /// Name is the track title.
-    #[serde(default)]
-    pub name: String,
-    /// Artist is the artist name.
-    #[serde(default)]
-    pub artist: String,
-    /// MBID is the MusicBrainz recording ID (if known).
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub mbid: String,
-    /// Count is the maximum number of similar songs to return.
-    #[serde(default)]
-    pub count: i32,
-}
-/// SimilarSongsResponse is the response for GetSimilarSongsBy* functions.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SimilarSongsResponse {
-    /// Songs is the list of similar songs.
-    #[serde(default)]
-    pub songs: Vec<SongRef>,
-}
-/// SongRef is a reference to a song with metadata for matching.
+/// SongRef is a reference to a song with name and optional MBID.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SongRef {
@@ -242,24 +163,6 @@ pub struct SongRef {
     /// MBID is the MusicBrainz ID for the song.
     #[serde(default, skip_serializing_if = "String::is_empty")]
     pub mbid: String,
-    /// ISRC is the International Standard Recording Code for the song.
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub isrc: String,
-    /// Artist is the artist name.
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub artist: String,
-    /// ArtistMBID is the MusicBrainz artist ID.
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub artist_mbid: String,
-    /// Album is the album name.
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub album: String,
-    /// AlbumMBID is the MusicBrainz release ID.
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub album_mbid: String,
-    /// Duration is the song duration in seconds.
-    #[serde(default, skip_serializing_if = "is_zero_f32")]
-    pub duration: f32,
 }
 /// TopSongsRequest is the request for GetArtistTopSongs.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
@@ -474,66 +377,3 @@ macro_rules! register_metadata_album_images {
         }
     };
 }
-
-/// SimilarSongsByTrackProvider provides the GetSimilarSongsByTrack function.
-pub trait SimilarSongsByTrackProvider {
-    fn get_similar_songs_by_track(&self, req: SimilarSongsByTrackRequest) -> Result<SimilarSongsResponse, Error>;
-}
-
-/// Register the get_similar_songs_by_track export.
-/// This macro generates the WASM export function for this method.
-#[macro_export]
-macro_rules! register_metadata_similar_songs_by_track {
-    ($plugin_type:ty) => {
-        #[extism_pdk::plugin_fn]
-        pub fn nd_get_similar_songs_by_track(
-            req: extism_pdk::Json<$crate::metadata::SimilarSongsByTrackRequest>
-        ) -> extism_pdk::FnResult<extism_pdk::Json<$crate::metadata::SimilarSongsResponse>> {
-            let plugin = <$plugin_type>::default();
-            let result = $crate::metadata::SimilarSongsByTrackProvider::get_similar_songs_by_track(&plugin, req.into_inner())?;
-            Ok(extism_pdk::Json(result))
-        }
-    };
-}
-
-/// SimilarSongsByAlbumProvider provides the GetSimilarSongsByAlbum function.
-pub trait SimilarSongsByAlbumProvider {
-    fn get_similar_songs_by_album(&self, req: SimilarSongsByAlbumRequest) -> Result<SimilarSongsResponse, Error>;
-}
-
-/// Register the get_similar_songs_by_album export.
-/// This macro generates the WASM export function for this method.
-#[macro_export]
-macro_rules! register_metadata_similar_songs_by_album {
-    ($plugin_type:ty) => {
-        #[extism_pdk::plugin_fn]
-        pub fn nd_get_similar_songs_by_album(
-            req: extism_pdk::Json<$crate::metadata::SimilarSongsByAlbumRequest>
-        ) -> extism_pdk::FnResult<extism_pdk::Json<$crate::metadata::SimilarSongsResponse>> {
-            let plugin = <$plugin_type>::default();
-            let result = $crate::metadata::SimilarSongsByAlbumProvider::get_similar_songs_by_album(&plugin, req.into_inner())?;
-            Ok(extism_pdk::Json(result))
-        }
-    };
-}
-
-/// SimilarSongsByArtistProvider provides the GetSimilarSongsByArtist function.
-pub trait SimilarSongsByArtistProvider {
-    fn get_similar_songs_by_artist(&self, req: SimilarSongsByArtistRequest) -> Result<SimilarSongsResponse, Error>;
-}
-
-/// Register the get_similar_songs_by_artist export.
-/// This macro generates the WASM export function for this method.
-#[macro_export]
-macro_rules! register_metadata_similar_songs_by_artist {
-    ($plugin_type:ty) => {
-        #[extism_pdk::plugin_fn]
-        pub fn nd_get_similar_songs_by_artist(
-            req: extism_pdk::Json<$crate::metadata::SimilarSongsByArtistRequest>
-        ) -> extism_pdk::FnResult<extism_pdk::Json<$crate::metadata::SimilarSongsResponse>> {
-            let plugin = <$plugin_type>::default();
-            let result = $crate::metadata::SimilarSongsByArtistProvider::get_similar_songs_by_artist(&plugin, req.into_inner())?;
-            Ok(extism_pdk::Json(result))
-        }
-    };
-}

plugins/pdk/rust/nd-pdk-capabilities/src/scheduler.rs

@@ -4,20 +4,6 @@
 // It is intended for use in Navidrome plugins built with extism-pdk.
 
 use serde::{Deserialize, Serialize};
-
-// Helper functions for skip_serializing_if with numeric types
-#[allow(dead_code)]
-fn is_zero_i32(value: &i32) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_u32(value: &u32) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_i64(value: &i64) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_u64(value: &u64) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_f32(value: &f32) -> bool { *value == 0.0 }
-#[allow(dead_code)]
-fn is_zero_f64(value: &f64) -> bool { *value == 0.0 }
 /// SchedulerCallbackRequest is the request provided when a scheduled task fires.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]

plugins/pdk/rust/nd-pdk-capabilities/src/scrobbler.rs

@@ -4,20 +4,6 @@
 // It is intended for use in Navidrome plugins built with extism-pdk.
 
 use serde::{Deserialize, Serialize};
-
-// Helper functions for skip_serializing_if with numeric types
-#[allow(dead_code)]
-fn is_zero_i32(value: &i32) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_u32(value: &u32) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_i64(value: &i64) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_u64(value: &u64) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_f32(value: &f32) -> bool { *value == 0.0 }
-#[allow(dead_code)]
-fn is_zero_f64(value: &f64) -> bool { *value == 0.0 }
 /// ScrobblerError represents an error type for scrobbling operations.
 pub type ScrobblerError = &'static str;
 /// ScrobblerErrorNotAuthorized indicates the user is not authorized.

plugins/pdk/rust/nd-pdk-capabilities/src/websocket.rs

@@ -4,20 +4,6 @@
 // It is intended for use in Navidrome plugins built with extism-pdk.
 
 use serde::{Deserialize, Serialize};
-
-// Helper functions for skip_serializing_if with numeric types
-#[allow(dead_code)]
-fn is_zero_i32(value: &i32) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_u32(value: &u32) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_i64(value: &i64) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_u64(value: &u64) -> bool { *value == 0 }
-#[allow(dead_code)]
-fn is_zero_f32(value: &f32) -> bool { *value == 0.0 }
-#[allow(dead_code)]
-fn is_zero_f64(value: &f64) -> bool { *value == 0.0 }
 /// OnBinaryMessageRequest is the request provided when a binary message is received.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]

plugins/pdk/rust/nd-pdk-host/Cargo.lock

@@ -28,9 +28,9 @@ checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
 
 [[package]]
 name = "bytes"
-version = "1.11.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
 
 [[package]]
 name = "either"
@@ -171,7 +171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
-name = "nd-pdk-host"
+name = "nd-host"
 version = "0.1.0"
 dependencies = [
  "extism-pdk",

plugins/pdk/rust/nd-pdk-host/src/nd_host_subsonicapi.rs

@@ -21,22 +21,11 @@ struct SubsonicAPICallResponse {
     error: Option<String>,
 }
 
-#[derive(Debug, Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct SubsonicAPICallRawRequest {
-    uri: String,
-}
-
 #[host_fn]
 extern "ExtismHost" {
     fn subsonicapi_call(input: Json<SubsonicAPICallRequest>) -> Json<SubsonicAPICallResponse>;
 }
 
-#[link(wasm_import_module = "extism:host/user")]
-extern "C" {
-    fn subsonicapi_callraw(offset: u64) -> u64;
-}
-
 /// Call executes a Subsonic API request and returns the JSON response.
 /// 
 /// The uri parameter should be the Subsonic API path without the server prefix,
@@ -63,56 +52,3 @@ pub fn call(uri: &str) -> Result<String, Error> {
 
     Ok(response.0.response_json)
 }
-
-/// CallRaw executes a Subsonic API request and returns the raw binary response.
-/// Optimized for binary endpoints like getCoverArt and stream that return
-/// non-JSON data. The response is returned as raw bytes without JSON encoding overhead.
-///
-/// # Arguments
-/// * `uri` - String parameter.
-///
-/// # Returns
-/// A tuple of (content_type, data) with the raw binary response.
-///
-/// # Errors
-/// Returns an error if the host function call fails.
-pub fn call_raw(uri: &str) -> Result<(String, Vec<u8>), Error> {
-    let req = SubsonicAPICallRawRequest {
-        uri: uri.to_owned(),
-    };
-    let input_bytes = serde_json::to_vec(&req).map_err(|e| Error::msg(e.to_string()))?;
-    let input_mem = Memory::from_bytes(&input_bytes).map_err(|e| Error::msg(e.to_string()))?;
-
-    let response_offset = unsafe { subsonicapi_callraw(input_mem.offset()) };
-
-    let response_mem = Memory::find(response_offset)
-        .ok_or_else(|| Error::msg("empty response from host"))?;
-    let response_bytes = response_mem.to_vec();
-
-    if response_bytes.is_empty() {
-        return Err(Error::msg("empty response from host"));
-    }
-    if response_bytes[0] == 0x01 {
-        let msg = String::from_utf8_lossy(&response_bytes[1..]).to_string();
-        return Err(Error::msg(msg));
-    }
-    if response_bytes[0] != 0x00 {
-        return Err(Error::msg("unknown response status"));
-    }
-    if response_bytes.len() < 5 {
-        return Err(Error::msg("malformed raw response: incomplete header"));
-    }
-    let ct_len = u32::from_be_bytes([
-        response_bytes[1],
-        response_bytes[2],
-        response_bytes[3],
-        response_bytes[4],
-    ]) as usize;
-    if ct_len > response_bytes.len() - 5 {
-        return Err(Error::msg("malformed raw response: content-type overflow"));
-    }
-    let ct_end = 5 + ct_len;
-    let content_type = String::from_utf8_lossy(&response_bytes[5..ct_end]).to_string();
-    let data = response_bytes[ct_end..].to_vec();
-    Ok((content_type, data))
-}

plugins/testdata/test-metadata-agent/main.go

@@ -120,65 +120,4 @@ func (t *testMetadataAgent) GetAlbumImages(input metadata.AlbumRequest) (*metada
 	}, nil
 }
 
-func (t *testMetadataAgent) GetSimilarSongsByTrack(input metadata.SimilarSongsByTrackRequest) (*metadata.SimilarSongsResponse, error) {
-	if err := checkConfigError(); err != nil {
-		return nil, err
-	}
-	count := int(input.Count)
-	if count == 0 {
-		count = 5
-	}
-	songs := make([]metadata.SongRef, 0, count)
-	for i := range count {
-		songs = append(songs, metadata.SongRef{
-			ID:         "similar-track-id-" + strconv.Itoa(i+1),
-			Name:       "Similar to " + input.Name + " #" + strconv.Itoa(i+1),
-			MBID:       "similar-mbid-" + strconv.Itoa(i+1),
-			ISRC:       "similar-isrc-" + strconv.Itoa(i+1),
-			Artist:     input.Artist,
-			ArtistMBID: "artist-mbid-" + strconv.Itoa(i+1),
-		})
-	}
-	return &metadata.SimilarSongsResponse{Songs: songs}, nil
-}
-
-func (t *testMetadataAgent) GetSimilarSongsByAlbum(input metadata.SimilarSongsByAlbumRequest) (*metadata.SimilarSongsResponse, error) {
-	if err := checkConfigError(); err != nil {
-		return nil, err
-	}
-	count := int(input.Count)
-	if count == 0 {
-		count = 5
-	}
-	songs := make([]metadata.SongRef, 0, count)
-	for i := range count {
-		songs = append(songs, metadata.SongRef{
-			ID:     "album-similar-id-" + strconv.Itoa(i+1),
-			Name:   "Album Similar #" + strconv.Itoa(i+1),
-			Artist: input.Artist,
-			Album:  input.Name,
-		})
-	}
-	return &metadata.SimilarSongsResponse{Songs: songs}, nil
-}
-
-func (t *testMetadataAgent) GetSimilarSongsByArtist(input metadata.SimilarSongsByArtistRequest) (*metadata.SimilarSongsResponse, error) {
-	if err := checkConfigError(); err != nil {
-		return nil, err
-	}
-	count := int(input.Count)
-	if count == 0 {
-		count = 5
-	}
-	songs := make([]metadata.SongRef, 0, count)
-	for i := range count {
-		songs = append(songs, metadata.SongRef{
-			ID:     "artist-similar-id-" + strconv.Itoa(i+1),
-			Name:   input.Name + " Style Song #" + strconv.Itoa(i+1),
-			Artist: input.Name + " Similar Artist",
-		})
-	}
-	return &metadata.SimilarSongsResponse{Songs: songs}, nil
-}
-
 func main() {}

plugins/testdata/test-subsonicapi-plugin/main.go

@@ -3,8 +3,6 @@
 package main
 
 import (
-	"fmt"
-
 	"github.com/navidrome/navidrome/plugins/pdk/go/host"
 	"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
 )
@@ -30,28 +28,4 @@ func callSubsonicAPIExport() int32 {
 	return 0
 }
 
-// call_subsonic_api_raw is the exported function that tests the SubsonicAPI CallRaw host function.
-// Input: URI string (e.g., "/getCoverArt?u=testuser&id=al-1")
-// Output: JSON with contentType, size, and first bytes of the raw response
-//
-//go:wasmexport call_subsonic_api_raw
-func callSubsonicAPIRawExport() int32 {
-	uri := pdk.InputString()
-
-	contentType, data, err := host.SubsonicAPICallRaw(uri)
-	if err != nil {
-		pdk.SetErrorString("failed to call SubsonicAPI raw: " + err.Error())
-		return 1
-	}
-
-	// Return metadata about the raw response as JSON
-	firstByte := 0
-	if len(data) > 0 {
-		firstByte = int(data[0])
-	}
-	result := fmt.Sprintf(`{"contentType":%q,"size":%d,"firstByte":%d}`, contentType, len(data), firstByte)
-	pdk.OutputString(result)
-	return 0
-}
-
 func main() {}

release/goreleaser.yml

@@ -19,7 +19,6 @@ builds:
       - linux_arm_v6
       - linux_arm_v7
       - linux_arm64
-      - linux_riscv64
       - windows_386
       - windows_amd64
 

resources/i18n/bg.json

@@ -36,8 +36,7 @@
         "bitDepth": "Битова дълбочина",
         "sampleRate": "",
         "missing": "Липсва",
-        "libraryName": "",
-        "composer": ""
+        "libraryName": ""
       },
       "actions": {
         "addToQueue": "Пусни по-късно",
@@ -47,8 +46,7 @@
         "download": "Свали",
         "playNext": "Следваща",
         "info": "Информация",
-        "showInPlaylist": "",
-        "instantMix": ""
+        "showInPlaylist": ""
       }
     },
     "album": {
@@ -304,7 +302,7 @@
         "scan": "",
         "manageUsers": "",
         "viewDetails": "",
-        "quickScan": "Quick Scan",
+        "quickScan": "",
         "fullScan": ""
       },
       "notifications": {
@@ -330,80 +328,6 @@
         "scanInProgress": "",
         "noLibrariesAssigned": ""
       }
-    },
-    "plugin": {
-      "name": "",
-      "fields": {
-        "id": "",
-        "name": "",
-        "description": "",
-        "version": "",
-        "author": "",
-        "website": "",
-        "permissions": "",
-        "enabled": "",
-        "status": "",
-        "path": "",
-        "lastError": "",
-        "hasError": "",
-        "updatedAt": "",
-        "createdAt": "",
-        "configKey": "",
-        "configValue": "",
-        "allUsers": "",
-        "selectedUsers": "",
-        "allLibraries": "",
-        "selectedLibraries": ""
-      },
-      "sections": {
-        "status": "",
-        "info": "",
-        "configuration": "",
-        "manifest": "",
-        "usersPermission": "",
-        "libraryPermission": ""
-      },
-      "status": {
-        "enabled": "",
-        "disabled": ""
-      },
-      "actions": {
-        "enable": "",
-        "disable": "",
-        "disabledDueToError": "",
-        "disabledUsersRequired": "",
-        "disabledLibrariesRequired": "",
-        "addConfig": "",
-        "rescan": ""
-      },
-      "notifications": {
-        "enabled": "",
-        "disabled": "",
-        "updated": "",
-        "error": ""
-      },
-      "validation": {
-        "invalidJson": ""
-      },
-      "messages": {
-        "configHelp": "",
-        "clickPermissions": "",
-        "noConfig": "",
-        "allUsersHelp": "",
-        "noUsers": "",
-        "permissionReason": "",
-        "usersRequired": "",
-        "allLibrariesHelp": "",
-        "noLibraries": "",
-        "librariesRequired": "",
-        "requiredHosts": "",
-        "configValidationError": "",
-        "schemaRenderError": ""
-      },
-      "placeholders": {
-        "configKey": "",
-        "configValue": ""
-      }
     }
   },
   "ra": {
@@ -587,8 +511,7 @@
     "remove_all_missing_title": "Премахни всички липсващи файлове",
     "remove_all_missing_content": "Сигурни ли сте, че желаете да премахнете всички липсващи файлове от базата данни? Това ще премахне завинаги всички препратки към тях, включително броя на възпроизвежданията и оценките им.",
     "noSimilarSongsFound": "",
-    "noTopSongsFound": "",
-    "startingInstantMix": ""
+    "noTopSongsFound": ""
   },
   "menu": {
     "library": "Библиотека",

resources/i18n/de.json

@@ -36,8 +36,7 @@
         "bitDepth": "Bittiefe",
         "sampleRate": "Samplerate",
         "missing": "Fehlend",
-        "libraryName": "Bibliothek",
-        "composer": "Komponist"
+        "libraryName": "Bibliothek"
       },
       "actions": {
         "addToQueue": "Später abspielen",
@@ -47,8 +46,7 @@
         "download": "Herunterladen",
         "playNext": "Als nächstes abspielen",
         "info": "Mehr Informationen",
-        "showInPlaylist": "In Wiedergabeliste anzeigen",
-        "instantMix": "Sofort-Mix"
+        "showInPlaylist": "In Wiedergabeliste anzeigen"
       }
     },
     "album": {
@@ -330,80 +328,6 @@
         "scanInProgress": "Bibliothek Scan läuft...",
         "noLibrariesAssigned": "Keine Bibliotheken zugeordnet"
       }
-    },
-    "plugin": {
-      "name": "Plugin |||| Plugins",
-      "fields": {
-        "id": "ID",
-        "name": "Name",
-        "description": "Beschreibung",
-        "version": "Version",
-        "author": "Autor",
-        "website": "Website",
-        "permissions": "Berechtigungen",
-        "enabled": "Aktiv",
-        "status": "Status",
-        "path": "Pfad",
-        "lastError": "Fehler",
-        "hasError": "Fehler",
-        "updatedAt": "Aktualisiert am",
-        "createdAt": "Installiert",
-        "configKey": "Schlüssel",
-        "configValue": "Wert",
-        "allUsers": "Alle Benutzer",
-        "selectedUsers": "Ausgewählte Benutzer",
-        "allLibraries": "Alle Bibliotheken",
-        "selectedLibraries": "Ausgewählte Bibliotheken"
-      },
-      "sections": {
-        "status": "Status",
-        "info": "Plugin Information",
-        "configuration": "Konfiguration",
-        "manifest": "Manifest",
-        "usersPermission": "Benutzer Zugriff",
-        "libraryPermission": "Bibliotheken Zugriff"
-      },
-      "status": {
-        "enabled": "Aktiv",
-        "disabled": "Inaktiv"
-      },
-      "actions": {
-        "enable": "Aktivieren",
-        "disable": "Deaktivieren",
-        "disabledDueToError": "Fehler beheben um Plugin zu aktivieren",
-        "disabledUsersRequired": "Wähle Benutzer Zugriff um Plugin zu aktivieren",
-        "disabledLibrariesRequired": "Wähle Bibliotheken Zugriff um Plugin zu aktivieren",
-        "addConfig": "Konfiguration hinzufügen",
-        "rescan": "Scan"
-      },
-      "notifications": {
-        "enabled": "Plugin aktiv",
-        "disabled": "Plugin inaktiv",
-        "updated": "Plugin aktualisiert",
-        "error": "Fehler beim aktualisieren des Plugins"
-      },
-      "validation": {
-        "invalidJson": "Konfiguration muss valides JSON sein"
-      },
-      "messages": {
-        "configHelp": "Plugin mit Schlüssel-Werte Paaren konfigurieren. Leer lassen wenn das Plugin keine Konfiguration benötigt.",
-        "clickPermissions": "Berechtigung anklicken für mehr Details",
-        "noConfig": "Keine Konfiguration gesetzt",
-        "allUsersHelp": "Wenn aktiviert, erhält das Plugin Zugriff auf alle Benutzer, inklusive solcher, die in Zukunft erstellt werden.",
-        "noUsers": "Keine Benutzer ausgewählt",
-        "permissionReason": "Begründung",
-        "usersRequired": "Dieses Plugin benötigt Zugriff auf Benutzerinformationen. Wähle aus, auf welche Nutzer das Plugin zugreifen darf oder wähle 'Alle Benutzer'.",
-        "allLibrariesHelp": "Wenn aktiviert, erhält das Plugin Zugriff auf alle Bibliotheken, inklusive solcher, die in Zukunft erstellt werden.",
-        "noLibraries": "Keine Bibliotheken ausgewählt",
-        "librariesRequired": "Dieses Plugin benötigt Zugriff auf Bibliotheken. Wähle aus, auf welche Bibliotheken das Plugin zugreifen darf oder wähle 'Alle Bibliotheken'.",
-        "requiredHosts": "Benötigte Hosts",
-        "configValidationError": "Validierung der Konfiguration fehlgeschlagen:",
-        "schemaRenderError": "Rendern der Konfiguration fehlgeschlagen. Das Schema das Plugins ist eventuell nicht korrekt."
-      },
-      "placeholders": {
-        "configKey": "Schlüssel",
-        "configValue": "Wert"
-      }
     }
   },
   "ra": {
@@ -587,8 +511,7 @@
     "remove_all_missing_title": "Alle fehlenden Dateien entfernen",
     "remove_all_missing_content": "Möchtest du wirklich alle Fehlenden Dateien aus der Datenbank entfernen? Alle Referenzen zu den Dateien wie Anzahl Wiedergaben und Bewertungen werden permanent gelöscht.",
     "noSimilarSongsFound": "Keine ähnlichen Titel gefunden",
-    "noTopSongsFound": "Keine beliebten Titel gefunden",
-    "startingInstantMix": "Lade Sofort-Mix..."
+    "noTopSongsFound": "Keine beliebten Titel gefunden"
   },
   "menu": {
     "library": "Bibliothek",

resources/i18n/el.json

@@ -36,8 +36,7 @@
         "bitDepth": "Λίγο βάθος",
         "sampleRate": "Ποσοστό δειγματοληψίας",
         "missing": "Απών",
-        "libraryName": "Βιβλιοθήκη",
-        "composer": "Συνθέτης"
+        "libraryName": "Βιβλιοθήκη"
       },
       "actions": {
         "addToQueue": "Αναπαραγωγη Μετα",
@@ -47,8 +46,7 @@
         "download": "Ληψη",
         "playNext": "Επόμενη Αναπαραγωγή",
         "info": "Εμφάνιση Πληροφοριών",
-        "showInPlaylist": "Εμφάνιση στη λίστα αναπαραγωγής",
-        "instantMix": "Άμεση Μίξη"
+        "showInPlaylist": "Εμφάνιση στη λίστα αναπαραγωγής"
       }
     },
     "album": {
@@ -330,80 +328,6 @@
         "scanInProgress": "Σάρωση σε εξέλιξη...",
         "noLibrariesAssigned": "Δεν έχουν αντιστοιχιστεί βιβλιοθήκες σε αυτόν τον χρήστη"
       }
-    },
-    "plugin": {
-      "name": "Πρόσθετο |||| Πρόσθετα",
-      "fields": {
-        "id": "ID",
-        "name": "Όνομα",
-        "description": "Περιγραφή",
-        "version": "Έκδοση",
-        "author": "Καλλιτέχνης",
-        "website": "Ιστοσελίδα",
-        "permissions": "Άδειες",
-        "enabled": "Ενεργό",
-        "status": "Κατάσταση",
-        "path": "Διαδρομή",
-        "lastError": "Σφάλμα",
-        "hasError": "Σφάλμα",
-        "updatedAt": "Ενημερώθηκε",
-        "createdAt": "Εγκατασταθηκε",
-        "configKey": "Κλειδί",
-        "configValue": "Τιμή",
-        "allUsers": "Επιτρέψτε όλους τους χρήστες",
-        "selectedUsers": "Επιλογή χρηστών",
-        "allLibraries": "Επιτρέψτε όλες τις βιβλιοθήκες",
-        "selectedLibraries": "Επιλεγμένες βιβλιοθήκες"
-      },
-      "sections": {
-        "status": "Κατάσταση",
-        "info": "Πληροφορίες Πρόσθετου",
-        "configuration": "Παραμετροποίηση",
-        "manifest": "Manifest",
-        "usersPermission": "Άδειες Χρηστών",
-        "libraryPermission": "Άδειες Βιβλιοθηκών"
-      },
-      "status": {
-        "enabled": "Ενεργό",
-        "disabled": "Ανενεργό"
-      },
-      "actions": {
-        "enable": "Ενεργοποίηση",
-        "disable": "Απενεργοποίηση",
-        "disabledDueToError": "Διορθώστε το σφάλμα πριν την ενεργοποίηση",
-        "disabledUsersRequired": "Επιλέξτε χρήστες πριν την ενεργοποίηση",
-        "disabledLibrariesRequired": "Επιλέξτε βιβλιοθήκες πριν την ενεργοποίηση",
-        "addConfig": "Προσθήκη παραμετροποίησης",
-        "rescan": "Σάρωση ξανά"
-      },
-      "notifications": {
-        "enabled": "Πρόσθετο ενεργοποιημένο",
-        "disabled": "Πρόσθετο απενεργοποιημένο",
-        "updated": "Πρόσθετο ενημερωμένο",
-        "error": "Σφάλμα κατά την ενημέρωση του πρόσθετου"
-      },
-      "validation": {
-        "invalidJson": "Η παραμετροποίηση πρέπει να είναι συμβατό JSON"
-      },
-      "messages": {
-        "configHelp": "Παραμετροποιήστε το πρόσθετο με χρήση ζεύγων κλειδιών-τιμών. Αφήστε κενό αν το πρόσθετο δεν απαιτεί παραμετροποίηση",
-        "clickPermissions": "Κάνετε κλικ για λεπτομέρειες αδειών",
-        "noConfig": "Δεν ορίστηκε παραμετροποίηση",
-        "allUsersHelp": "Όταν είναι ενεργό, το πρόσθετο θα έχει πρόσβαση σε όλους τους χρήστες, συμπεριλαμβανομένων και όσων δημιουργηθούν στο μέλλον.",
-        "noUsers": "Δεν επιλέχθηκαν χρήστες",
-        "permissionReason": "Αιτία",
-        "usersRequired": "Το πρόσθετο απαιτεί πρόσβαση στις πληροφορίες χρηστών. Ορίστε τους χρήστες που θα έχει πρόσβαση το πρόσθετο, ή ενεργοποιήστε το 'Επιτρέψτε όλους τους χρήστες'",
-        "allLibrariesHelp": "Όταν είναι ενεργό, το πρόσθετο θα έχει πρόσβαση σε όλες τις βιβλιοθήκες, συμπεριλαμβανομένων και όσων δημιουργηθούν στο μέλλον.",
-        "noLibraries": "Δεν επιλέχθηκαν βιβλιοθήκες",
-        "librariesRequired": "Αυτό το πρόσθετο απαιτεί πρόσβαση στις πληροφορίες βιβλιοθήκης. Επιλέξτε σε ποιές βιβλιοθήκες μπορεί να έχει πρόσβαση το πρόσθετο, ή ενεργοποιήστε το 'Επιτρέψτε όλες τις βιβλιοθήκες'",
-        "requiredHosts": "Απαιτούμενοι hosts",
-        "configValidationError": "Η επικύρωση διαμόρφωσης απέτυχε:",
-        "schemaRenderError": "Δεν είναι δυνατή η απόδοση της φόρμας διαμόρφωσης. Το σχήμα της προσθήκης ενδέχεται να μην είναι έγκυρο."
-      },
-      "placeholders": {
-        "configKey": "κλειδί",
-        "configValue": "τιμή"
-      }
     }
   },
   "ra": {
@@ -587,8 +511,7 @@
     "remove_all_missing_title": "Αφαίρεση όλων των αρχείων που λείπουν",
     "remove_all_missing_content": "Είστε βέβαιοι ότι θέλετε να καταργήσετε όλα τα αρχεία που λείπουν από τη βάση δεδομένων? Αυτό θα καταργήσει οριστικά τυχόν αναφορές σε αυτά, συμπεριλαμβανομένου του αριθμού αναπαραγωγών και των αξιολογήσεών τους.",
     "noSimilarSongsFound": "Δεν βρέθηκαν παρόμοια τραγούδια",
-    "noTopSongsFound": "Δεν βρέθηκαν κορυφαία τραγούδια",
-    "startingInstantMix": "Φόρτωση Άμεσης Μίξης..."
+    "noTopSongsFound": "Δεν βρέθηκαν κορυφαία τραγούδια"
   },
   "menu": {
     "library": "Βιβλιοθήκη",

resources/i18n/es.json

@@ -12,12 +12,16 @@
         "artist": "Artista",
         "album": "Álbum",
         "path": "Ruta del archivo",
+        "libraryName": "Biblioteca",
         "genre": "Género",
         "compilation": "Compilación",
         "year": "Año",
         "size": "Tamaño del archivo",
         "updatedAt": "Actualizado el",
         "bitRate": "Tasa de bits",
+        "bitDepth": "Profundidad de bits",
+        "sampleRate": "Frecuencia de muestreo",
+        "channels": "Canales",
         "discSubtitle": "Subtítulo del disco",
         "starred": "Favorito",
         "comment": "Comentario",
@@ -25,7 +29,6 @@
         "quality": "Calidad",
         "bpm": "BPM",
         "playDate": "Últimas reproducciones",
-        "channels": "Canales",
         "createdAt": "Creado el",
         "grouping": "Agrupación",
         "mood": "Estado de ánimo",
@@ -33,22 +36,17 @@
         "tags": "Etiquetas",
         "mappedTags": "Etiquetas asignadas",
         "rawTags": "Etiquetas sin procesar",
-        "bitDepth": "Profundidad de bits",
-        "sampleRate": "Frecuencia de muestreo",
-        "missing": "Faltante",
-        "libraryName": "Biblioteca",
-        "composer": "Compositor"
+        "missing": "Faltante"
       },
       "actions": {
         "addToQueue": "Reproducir después",
         "playNow": "Reproducir ahora",
         "addToPlaylist": "Agregar a la playlist",
+        "showInPlaylist": "Mostrar en la lista de reproducción",
         "shuffleAll": "Todas aleatorias",
         "download": "Descarga",
         "playNext": "Siguiente",
-        "info": "Obtener información",
-        "showInPlaylist": "Mostrar en la lista de reproducción",
-        "instantMix": "Mezcla instantánea"
+        "info": "Obtener información"
       }
     },
     "album": {
@@ -59,38 +57,38 @@
         "duration": "Duración",
         "songCount": "Canciones",
         "playCount": "Reproducciones",
+        "size": "Tamaño del archivo",
         "name": "Nombre",
+        "libraryName": "Biblioteca",
         "genre": "Género",
         "compilation": "Compilación",
         "year": "Año",
-        "updatedAt": "Actualizado el",
-        "comment": "Comentario",
-        "rating": "Calificación",
-        "createdAt": "Creado el",
-        "size": "Tamaño del archivo",
+        "date": "Fecha de grabación",
         "originalDate": "Original",
         "releaseDate": "Publicado",
         "releases": "Lanzamiento |||| Lanzamientos",
         "released": "Publicado",
+        "updatedAt": "Actualizado el",
+        "comment": "Comentario",
+        "rating": "Calificación",
+        "createdAt": "Creado el",
         "recordLabel": "Discográfica",
         "catalogNum": "Número de catálogo",
         "releaseType": "Tipo de lanzamiento",
         "grouping": "Agrupación",
         "media": "Medios",
         "mood": "Estado de ánimo",
-        "date": "Fecha de grabación",
-        "missing": "Faltante",
-        "libraryName": "Biblioteca"
+        "missing": "Faltante"
       },
       "actions": {
         "playAll": "Reproducir",
         "playNext": "Reproducir siguiente",
         "addToQueue": "Reproducir después",
+        "share": "Compartir",
         "shuffle": "Aleatorio",
         "addToPlaylist": "Agregar a la lista",
         "download": "Descargar",
-        "info": "Obtener información",
-        "share": "Compartir"
+        "info": "Obtener información"
       },
       "lists": {
         "all": "Todos",
@@ -108,10 +106,10 @@
         "name": "Nombre",
         "albumCount": "Número de álbumes",
         "songCount": "Número de canciones",
+        "size": "Tamaño",
         "playCount": "Reproducciones",
         "rating": "Calificación",
         "genre": "Género",
-        "size": "Tamaño",
         "role": "Rol",
         "missing": "Faltante"
       },
@@ -132,9 +130,9 @@
         "maincredit": "Artista del álbum o Artista |||| Artistas del álbum o Artistas"
       },
       "actions": {
+        "topSongs": "Más destacadas",
         "shuffle": "Aleatorio",
-        "radio": "Radio",
-        "topSongs": "Más destacadas"
+        "radio": "Radio"
       }
     },
     "user": {
@@ -143,6 +141,7 @@
         "userName": "Nombre de usuario",
         "isAdmin": "Es administrador",
         "lastLoginAt": "Último inicio de sesión",
+        "lastAccessAt": "Último acceso",
         "updatedAt": "Actualizado el",
         "name": "Nombre",
         "password": "Contraseña",
@@ -151,7 +150,6 @@
         "currentPassword": "Contraseña actual",
         "newPassword": "Nueva contraseña",
         "token": "Token",
-        "lastAccessAt": "Último acceso",
         "libraries": "Bibliotecas"
       },
       "helperTexts": {
@@ -213,9 +211,9 @@
         "selectPlaylist": "Seleccione una lista:",
         "addNewPlaylist": "Creada \"%{name}\"",
         "export": "Exportar",
+        "saveQueue": "Guardar la fila de reproducción en una playlist",
         "makePublic": "Hazla pública",
         "makePrivate": "Hazla privada",
-        "saveQueue": "Guardar la fila de reproducción en una playlist",
         "searchOrCreate": "Buscar listas de reproducción o escribe para crear una nueva…",
         "pressEnterToCreate": "Pulsa Enter para crear una nueva lista de reproducción",
         "removeFromSelection": "Quitar de la selección"
@@ -246,6 +244,7 @@
         "username": "Compartido por",
         "url": "URL",
         "description": "Descripción",
+        "downloadable": "¿Permitir descargas?",
         "contents": "Contenido",
         "expiresAt": "Caduca el",
         "lastVisitedAt": "Visitado por última vez el",
@@ -253,12 +252,14 @@
         "format": "Formato",
         "maxBitRate": "Tasa de bits Máx.",
         "updatedAt": "Actualizado el",
-        "createdAt": "Creado el",
-        "downloadable": "¿Permitir descargas?"
-      }
+        "createdAt": "Creado el"
+      },
+      "notifications": {},
+      "actions": {}
     },
     "missing": {
       "name": "Fichero faltante |||| Ficheros faltantes",
+      "empty": "No faltan archivos",
       "fields": {
         "path": "Ruta",
         "size": "Tamaño",
@@ -271,8 +272,7 @@
       },
       "notifications": {
         "removed": "Eliminado"
-      },
-      "empty": "No faltan archivos"
+      }
     },
     "library": {
       "name": "Biblioteca |||| Bibliotecas",
@@ -302,20 +302,20 @@
       },
       "actions": {
         "scan": "Escanear biblioteca",
-        "manageUsers": "Gestionar el acceso de usarios",
-        "viewDetails": "Ver detalles",
         "quickScan": "Escaneo rápido",
-        "fullScan": "Escaneo completo"
+        "fullScan": "Escaneo completo",
+        "manageUsers": "Gestionar el acceso de usarios",
+        "viewDetails": "Ver detalles"
       },
       "notifications": {
         "created": "La biblioteca se creó correctamente",
         "updated": "La biblioteca se actualizó correctamente",
         "deleted": "La biblioteca se eliminó correctamente",
         "scanStarted": "El escaneo de la biblioteca ha comenzado",
-        "scanCompleted": "El escaneo de la biblioteca se completó",
         "quickScanStarted": "Escaneo rápido ha comenzado",
         "fullScanStarted": "Escaneo completo ha comenzado",
-        "scanError": "Error al iniciar el escaneo. Revisa los registros"
+        "scanError": "Error al iniciar el escaneo. Revisa los registros",
+        "scanCompleted": "El escaneo de la biblioteca se completó"
       },
       "validation": {
         "nameRequired": "El nombre de la biblioteca es obligatorio",
@@ -396,9 +396,7 @@
         "allLibrariesHelp": "Cuando se active, el plugin tendrá acceso a todas las bibliotecas, incluidas las que se creen en el futuro.",
         "noLibraries": "Ninguna biblioteca seleccionada",
         "librariesRequired": "Este plugin requiere acceso a la información de las bibliotecas. Selecciona a qué bibliotecas puede acceder el plugin, o activa 'Permitir todas las bibliotecas'.",
-        "requiredHosts": "Hosts requeridos",
-        "configValidationError": "La validación de la configuración falló:",
-        "schemaRenderError": "No se pudo renderizar el formulario de configuración. Es posible que el esquema del complemento no sea válido."
+        "requiredHosts": "Hosts requeridos"
       },
       "placeholders": {
         "configKey": "clave",
@@ -441,6 +439,7 @@
       "add": "Añadir",
       "back": "Ir atrás",
       "bulk_actions": "1 elemento seleccionado |||| %{smart_count} elementos seleccionados",
+      "bulk_actions_mobile": "1 |||| %{smart_count}",
       "cancel": "Cancelar",
       "clear_input_value": "Limpiar valor",
       "clone": "Duplicar",
@@ -464,7 +463,6 @@
       "close_menu": "Cerrar menú",
       "unselect": "Deseleccionado",
       "skip": "Omitir",
-      "bulk_actions_mobile": "1 |||| %{smart_count}",
       "share": "Compartir",
       "download": "Descargar"
     },
@@ -556,42 +554,47 @@
     "transcodingDisabled": "Cambiar la configuración de la transcodificación a través de la interfaz web esta deshabilitado por motivos de seguridad. Si quieres cambiar (editar o agregar) opciones de transcodificación, reinicia el servidor con la %{config} opción de configuración.",
     "transcodingEnabled": "Navidrom se esta ejecutando con %{config}, lo que hace posible ejecutar comandos de sistema desde el apartado de transcodificación en la interfaz web. Recomendamos deshabilitarlo por motivos de seguridad y solo habilitarlo cuando se este configurando opciones de transcodificación.",
     "songsAddedToPlaylist": "1 canción agregada a la lista |||| %{smart_count} canciones agregadas a la lista",
+    "noSimilarSongsFound": "No se encontraron canciones similares",
+    "noTopSongsFound": "No se encontraron canciones destacadas",
     "noPlaylistsAvailable": "Ninguna lista disponible",
     "delete_user_title": "Eliminar usuario '%{name}'",
     "delete_user_content": "¿Esta seguro de eliminar a este usuario y todos sus datos (incluyendo listas y preferencias)?",
+    "remove_missing_title": "Eliminar archivos faltantes",
+    "remove_missing_content": "¿Realmente desea eliminar los archivos faltantes seleccionados de la base de datos? Esto eliminará permanentemente cualquier referencia a ellos, incluidas sus reproducciones y valoraciones.",
+    "remove_all_missing_title": "Eliminar todos los archivos faltantes",
+    "remove_all_missing_content": "¿Realmente desea eliminar todos los archivos faltantes de la base de datos? Esto eliminará permanentemente cualquier referencia a ellos, incluidas sus reproducciones y valoraciones.",
     "notifications_blocked": "Las notificaciones de este sitio están bloqueadas en tu navegador",
     "notifications_not_available": "Este navegador no soporta notificaciones o no ingresaste a Navidrome usando https",
     "lastfmLinkSuccess": "Last.fm esta conectado y el scrobbling esta activado",
     "lastfmLinkFailure": "No se pudo conectar con Last.fm",
     "lastfmUnlinkSuccess": "Last.fm se ha desconectado y el scrobbling se desactivo",
     "lastfmUnlinkFailure": "No se pudo desconectar Last.fm",
+    "listenBrainzLinkSuccess": "Se ha conectado correctamente a ListenBrainz y se activó el scrobbling como el usuario: %{user}",
+    "listenBrainzLinkFailure": "No se pudo conectar con ListenBrainz: %{error}",
+    "listenBrainzUnlinkSuccess": "Se desconectó ListenBrainz y se desactivó el scrobbling",
+    "listenBrainzUnlinkFailure": "No se pudo desconectar ListenBrainz",
     "openIn": {
       "lastfm": "Ver en Last.fm",
       "musicbrainz": "Ver en MusicBrainz"
     },
     "lastfmLink": "Leer más...",
-    "listenBrainzLinkSuccess": "Se ha conectado correctamente a ListenBrainz y se activó el scrobbling como el usuario: %{user}",
-    "listenBrainzLinkFailure": "No se pudo conectar con ListenBrainz: %{error}",
-    "listenBrainzUnlinkSuccess": "Se desconectó ListenBrainz y se desactivó el scrobbling",
-    "listenBrainzUnlinkFailure": "No se pudo desconectar ListenBrainz",
-    "downloadOriginalFormat": "Descargar formato original",
     "shareOriginalFormat": "Compartir formato original",
     "shareDialogTitle": "Compartir %{resource} '%{name}'",
     "shareBatchDialogTitle": "Compartir 1 %{resource} |||| Compartir %{smart_count} %{resource}",
+    "shareCopyToClipboard": "Copiar al portapapeles: Ctrl+C, Intro",
     "shareSuccess": "URL copiada al portapapeles: %{url}",
     "shareFailure": "Error al copiar la URL %{url} al portapapeles",
     "downloadDialogTitle": "Descargar %{resource} '%{name}' (%{size})",
-    "shareCopyToClipboard": "Copiar al portapapeles: Ctrl+C, Intro",
-    "remove_missing_title": "Eliminar archivos faltantes",
-    "remove_missing_content": "¿Realmente desea eliminar los archivos faltantes seleccionados de la base de datos? Esto eliminará permanentemente cualquier referencia a ellos, incluidas sus reproducciones y valoraciones.",
-    "remove_all_missing_title": "Eliminar todos los archivos faltantes",
-    "remove_all_missing_content": "¿Realmente desea eliminar todos los archivos faltantes de la base de datos? Esto eliminará permanentemente cualquier referencia a ellos, incluidas sus reproducciones y valoraciones.",
-    "noSimilarSongsFound": "No se encontraron canciones similares",
-    "noTopSongsFound": "No se encontraron canciones destacadas",
-    "startingInstantMix": "Cargando la mezcla instantánea..."
+    "downloadOriginalFormat": "Descargar formato original"
   },
   "menu": {
     "library": "Biblioteca",
+    "librarySelector": {
+      "allLibraries": "Todas las bibliotecas (%{count})",
+      "multipleLibraries": "%{selected} de %{total} bibliotecas",
+      "selectLibraries": "Seleccionar bibliotecas",
+      "none": "Ninguno"
+    },
     "settings": "Ajustes",
     "version": "Versión",
     "theme": "Tema",
@@ -602,6 +605,7 @@
         "language": "Idioma",
         "defaultView": "Vista por defecto",
         "desktop_notifications": "Notificaciones de escritorio",
+        "lastfmNotConfigured": "La clave API de Last.fm no está configurada",
         "lastfmScrobbling": "Scrobble a Last.fm",
         "listenBrainzScrobbling": "Scrobble a ListenBrainz",
         "replaygain": "Modo de ReplayGain",
@@ -610,20 +614,13 @@
           "none": "Desactivado",
           "album": "Ganancia del álbum",
           "track": "Ganancia de pista"
-        },
-        "lastfmNotConfigured": "La clave API de Last.fm no está configurada"
+        }
       }
     },
     "albumList": "Álbumes",
-    "about": "Acerca de",
     "playlists": "Playlists",
     "sharedPlaylists": "Playlists Compartidas",
-    "librarySelector": {
-      "allLibraries": "Todas las bibliotecas (%{count})",
-      "multipleLibraries": "%{selected} de %{total} bibliotecas",
-      "selectLibraries": "Seleccionar bibliotecas",
-      "none": "Ninguno"
-    }
+    "about": "Acerca de"
   },
   "player": {
     "playListsText": "Fila de reproducción",
@@ -682,12 +679,17 @@
     "totalScanned": "Total de carpetas escaneadas",
     "quickScan": "Escaneo rápido",
     "fullScan": "Escaneo completo",
+    "selectiveScan": "Selectivo",
     "serverUptime": "Uptime del servidor",
     "serverDown": "OFFLINE",
     "scanType": "Tipo",
     "status": "Error de escaneo",
-    "elapsedTime": "Tiempo transcurrido",
-    "selectiveScan": "Selectivo"
+    "elapsedTime": "Tiempo transcurrido"
+  },
+  "nowPlaying": {
+    "title": "En reproducción",
+    "empty": "Nada en reproducción",
+    "minutesAgo": "Hace %{smart_count} minuto |||| Hace %{smart_count} minutos"
   },
   "help": {
     "title": "Atajos de teclado de Navidrome",
@@ -697,15 +699,10 @@
       "toggle_play": "Reproducir / Pausar",
       "prev_song": "Canción anterior",
       "next_song": "Siguiente canción",
+      "current_song": "Canción actual",
       "vol_up": "Subir volumen",
       "vol_down": "Bajar volumen",
-      "toggle_love": "Marca esta canción como favorita",
-      "current_song": "Canción actual"
+      "toggle_love": "Marca esta canción como favorita"
     }
-  },
-  "nowPlaying": {
-    "title": "En reproducción",
-    "empty": "Nada en reproducción",
-    "minutesAgo": "Hace %{smart_count} minuto |||| Hace %{smart_count} minutos"
   }
-}
+}

resources/i18n/fi.json

@@ -36,8 +36,7 @@
         "bitDepth": "Bittisyvyys",
         "sampleRate": "Näytteenottotaajuus",
         "missing": "Puuttuva",
-        "libraryName": "Kirjasto",
-        "composer": "Säveltäjä"
+        "libraryName": "Kirjasto"
       },
       "actions": {
         "addToQueue": "Lisää jonoon",
@@ -47,8 +46,7 @@
         "download": "Lataa",
         "playNext": "Soita seuraavaksi",
         "info": "Info",
-        "showInPlaylist": "Näytä soittolistassa",
-        "instantMix": "Pikasekoitus"
+        "showInPlaylist": "Näytä soittolistassa"
       }
     },
     "album": {
@@ -330,80 +328,6 @@
         "scanInProgress": "Skannaus käynnissä...",
         "noLibrariesAssigned": "Tälle käyttäjälle ei ole määritetty kirjastoja"
       }
-    },
-    "plugin": {
-      "name": "Liitännäinen |||| Liitännäiset",
-      "fields": {
-        "id": "ID",
-        "name": "Nimi",
-        "description": "Kuvaus",
-        "version": "Versio",
-        "author": "Tekijä",
-        "website": "Verkkosivusto",
-        "permissions": "Oikeudet",
-        "enabled": "Käytössä",
-        "status": "Tila",
-        "path": "Polku",
-        "lastError": "Virhe",
-        "hasError": "Virhe",
-        "updatedAt": "Päivitetty",
-        "createdAt": "Asennettu",
-        "configKey": "Avain",
-        "configValue": "Arvo",
-        "allUsers": "Salli kaikki käyttäjät",
-        "selectedUsers": "Valitut käyttäjät",
-        "allLibraries": "Salli kaikki kirjastot",
-        "selectedLibraries": "Valitut kirjastot"
-      },
-      "sections": {
-        "status": "Tila",
-        "info": "Lisäosan tiedot",
-        "configuration": "Määritykset",
-        "manifest": "Luettelo",
-        "usersPermission": "Käyttäjäoikeudet",
-        "libraryPermission": "Kirjaston oikeudet"
-      },
-      "status": {
-        "enabled": "Käytössä",
-        "disabled": "Ei käytössä"
-      },
-      "actions": {
-        "enable": "Ota käyttöön",
-        "disable": "Poista käytöstä",
-        "disabledDueToError": "Korjaa virhe ennen käyttöönottoa",
-        "disabledUsersRequired": "Valitse käyttäjät ennen käyttöönottoa",
-        "disabledLibrariesRequired": "Valitse kirjastot ennen käyttöönottoa",
-        "addConfig": "Lisää määritykset",
-        "rescan": "Skannaa uudelleen"
-      },
-      "notifications": {
-        "enabled": "Lisäosa käytössä",
-        "disabled": "Lisäosa ei käytössä",
-        "updated": "Lisäosa päivitetty",
-        "error": "Virhe lisäosaa päivitettäessä"
-      },
-      "validation": {
-        "invalidJson": "Määrityksen on oltava kelvollinen JSON"
-      },
-      "messages": {
-        "configHelp": "Määritä lisäosa avain-arvo-parien avulla. Jätä tyhjäksi, jos lisäosa ei vaadi määrityksiä.",
-        "clickPermissions": "Napsauta käyttöoikeutta saadaksesi lisätietoja",
-        "noConfig": "Ei määritettyjä asetuksia",
-        "allUsersHelp": "Kun tämä on käytössä, laajennuksella on pääsy kaikkiin käyttäjiin, myös tulevaisuudessa luotaviin.",
-        "noUsers": "Ei valittuja käyttäjiä",
-        "permissionReason": "Syy",
-        "usersRequired": "Tämä laajennus vaatii pääsyn käyttäjätietoihin. Valitse käyttäjät, joihin laajennus voi päästä, tai ota käyttöön 'Salli kaikki käyttäjät'.",
-        "allLibrariesHelp": "Kun tämä on käytössä, laajennuksella on pääsy kaikkiin kirjastoihin, myös tulevaisuudessa luotaviin.",
-        "noLibraries": "Ei valittuja kirjastoja",
-        "librariesRequired": "Tämä laajennus vaatii pääsyn kirjastotietoihin. Valitse, mihin kirjastoihin laajennus voi käyttää, tai ota käyttöön 'Salli kaikki kirjastot'.",
-        "requiredHosts": "Vaaditut palvelimet",
-        "configValidationError": "Määrityksen validointi epäonnistui:",
-        "schemaRenderError": "Konfiguraatiolomaketta ei voi näyttää. Lisäosan skeema saattaa olla virheellinen."
-      },
-      "placeholders": {
-        "configKey": "avain",
-        "configValue": "arvo"
-      }
     }
   },
   "ra": {
@@ -587,8 +511,7 @@
     "remove_all_missing_title": "Poista kaikki puuttuvat tiedostot",
     "remove_all_missing_content": "Haluatko varmasti poistaa kaikki puuttuvat tiedostot tietokannasta? Tämä poistaa pysyvästi kaikki viittaukset niihin, mukaan lukien toistomäärät ja arvostelut.",
     "noSimilarSongsFound": "Samankaltaisia kappaleita ei löytynyt",
-    "noTopSongsFound": "Suosituimpia kappaleita ei löytynyt",
-    "startingInstantMix": "Ladataan Pikasekoitus..."
+    "noTopSongsFound": "Suosituimpia kappaleita ei löytynyt"
   },
   "menu": {
     "library": "Kirjasto",
@@ -663,16 +586,16 @@
     },
     "tabs": {
       "about": "Tietoja",
-      "config": "Määritykset"
+      "config": "Kokoonpano"
     },
     "config": {
       "configName": "Konfiguraation nimi",
       "environmentVariable": "Ympäristömuuttuja",
       "currentValue": "Nykyinen arvo",
-      "configurationFile": "Määritystiedosto",
-      "exportToml": "Vie määritys (TOML)",
-      "exportSuccess": "Määritykset viety leikepöydälle TOML-muodossa",
-      "exportFailed": "Määritysten kopiointi epäonnistui",
+      "configurationFile": "Konfiguraatiotiedosto",
+      "exportToml": "Vie konfiguraatio (TOML)",
+      "exportSuccess": "Konfiguraatio viety leikepöydälle TOML-muodossa",
+      "exportFailed": "Konfiguraation kopiointi epäonnistui",
       "devFlagsHeader": "Kehitysliput (voivat muuttua/poistua)",
       "devFlagsComment": "Nämä ovat kokeellisia asetuksia ja ne voidaan poistaa tulevissa versioissa"
     }