* feat(req): add Float64Or helper for parsing float query params * feat(scrobbler): extend NowPlayingInfo with state/position/rate fields * feat(scrobbler): implement ReportPlayback with state machine and auto-scrobble * feat(responses): add state/positionMs/playbackRate to NowPlayingEntry * feat(subsonic): add reportPlayback endpoint handler * feat(subsonic): include state/positionMs/playbackRate in getNowPlaying response * feat(subsonic): register playbackReport OpenSubsonic extension * test(e2e): add reportPlayback endpoint e2e tests * refactor(scrobbler): simplify ReportPlayback — extract helpers, remove duplication - Add state constants and exported ValidStates map - Extract remainingTTL() helper (was duplicated 3x) - Merge playing/paused switch cases into single branch - Use Get instead of GetWithParticipants for non-stopped states - Guard NowPlayingCount broadcast with count-change detection - Use cache entry for NowPlaying dispatch instead of extra DB query - Remove redundant Position field from NowPlayingInfo * refactor(scrobbler): skip DB query in playing/paused when playMap has entry * fix(play_tracker): handle errors when adding/updating NowPlayingInfo in cache Signed-off-by: Deluan <deluan@navidrome.org> * refactor(play_tracker): replace sort with slices.SortFunc for NowPlayingInfo Signed-off-by: Deluan <deluan@navidrome.org> * fix(play_tracker): check all ReportPlayback errors in tests Replace _ = with explicit error assertions to avoid masking failures in intermediate calls. Signed-off-by: Deluan <deluan@navidrome.org> * test(e2e): use real PlayTracker and assert getNowPlaying after reportPlayback Replace noopPlayTracker with a real PlayTracker backed by the E2E database. E2E tests now verify the full round-trip: reportPlayback creates/updates/removes entries visible via getNowPlaying, including state, positionMs, and playbackRate fields. Export NewPlayTracker constructor for use outside the scrobbler package. * fix(play_tracker): account for playback rate in TTL and detect track switches The remainingTTL function now divides remaining time by the playback rate, so cache entries expire correctly at non-1x speeds (e.g., 2x playback halves the TTL). Zero/negative rates default to 1.0. The playing/paused case now checks if the cached MediaFile ID matches the reported mediaId, falling back to a DB fetch when the client switches tracks without sending stopped/starting. Adds parameterized tests for remainingTTL covering rate variations and edge cases. * fix(subsonic): validate positionMs and playbackRate in reportPlayback Reject negative positionMs values and invalid playbackRate values (NaN, Inf, zero, negative) at the API boundary before they reach TTL and position estimation math. Returns clear error messages for each case. * feat(play_tracker): add ClientId and ClientName to ReportPlayback parameters Signed-off-by: Deluan <deluan@navidrome.org> * refactor(play_tracker): replace NowPlaying method with ReportPlayback calls Signed-off-by: Deluan <deluan@navidrome.org> * refactor(play_tracker_test): remove redundant TTL behavior tests and clean up mockPluginLoader Signed-off-by: Deluan <deluan@navidrome.org> --------- Signed-off-by: Deluan <deluan@navidrome.org>
231 lines
7.7 KiB
Go
231 lines
7.7 KiB
Go
package subsonic
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/navidrome/navidrome/core/scrobbler"
|
|
"github.com/navidrome/navidrome/model"
|
|
"github.com/navidrome/navidrome/model/request"
|
|
"github.com/navidrome/navidrome/server/events"
|
|
"github.com/navidrome/navidrome/server/subsonic/responses"
|
|
"github.com/navidrome/navidrome/tests"
|
|
. "github.com/onsi/ginkgo/v2"
|
|
. "github.com/onsi/gomega"
|
|
)
|
|
|
|
var _ = Describe("MediaAnnotationController", func() {
|
|
var router *Router
|
|
var ds model.DataStore
|
|
var playTracker *fakePlayTracker
|
|
var eventBroker *fakeEventBroker
|
|
var ctx context.Context
|
|
|
|
BeforeEach(func() {
|
|
ctx = context.Background()
|
|
ds = &tests.MockDataStore{}
|
|
playTracker = &fakePlayTracker{}
|
|
eventBroker = &fakeEventBroker{}
|
|
router = New(ds, nil, nil, nil, nil, nil, nil, eventBroker, nil, playTracker, nil, nil, nil, nil, nil, nil)
|
|
})
|
|
|
|
Describe("Scrobble", func() {
|
|
It("submit all scrobbles with only the id", func() {
|
|
// Back-date the baseline so the assertion still passes on platforms
|
|
// with millisecond clock resolution (e.g. Windows).
|
|
submissionTime := time.Now().Add(-time.Second)
|
|
r := newGetRequest("id=12", "id=34")
|
|
|
|
_, err := router.Scrobble(r)
|
|
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(playTracker.Submissions).To(HaveLen(2))
|
|
Expect(playTracker.Submissions[0].Timestamp).To(BeTemporally(">", submissionTime))
|
|
Expect(playTracker.Submissions[0].TrackID).To(Equal("12"))
|
|
Expect(playTracker.Submissions[1].Timestamp).To(BeTemporally(">", submissionTime))
|
|
Expect(playTracker.Submissions[1].TrackID).To(Equal("34"))
|
|
})
|
|
|
|
It("submit all scrobbles with respective times", func() {
|
|
time1 := time.Now().Add(-20 * time.Minute)
|
|
t1 := time1.UnixMilli()
|
|
time2 := time.Now().Add(-10 * time.Minute)
|
|
t2 := time2.UnixMilli()
|
|
r := newGetRequest("id=12", "id=34", fmt.Sprintf("time=%d", t1), fmt.Sprintf("time=%d", t2))
|
|
|
|
_, err := router.Scrobble(r)
|
|
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(playTracker.Submissions).To(HaveLen(2))
|
|
Expect(playTracker.Submissions[0].Timestamp).To(BeTemporally("~", time1))
|
|
Expect(playTracker.Submissions[0].TrackID).To(Equal("12"))
|
|
Expect(playTracker.Submissions[1].Timestamp).To(BeTemporally("~", time2))
|
|
Expect(playTracker.Submissions[1].TrackID).To(Equal("34"))
|
|
})
|
|
|
|
It("checks if number of ids match number of times", func() {
|
|
r := newGetRequest("id=12", "id=34", "time=1111")
|
|
|
|
_, err := router.Scrobble(r)
|
|
|
|
Expect(err).To(HaveOccurred())
|
|
Expect(playTracker.Submissions).To(BeEmpty())
|
|
})
|
|
|
|
Context("submission=false", func() {
|
|
var req *http.Request
|
|
BeforeEach(func() {
|
|
_ = ds.MediaFile(ctx).Put(&model.MediaFile{ID: "12"})
|
|
ctx = request.WithPlayer(ctx, model.Player{ID: "player-1"})
|
|
req = newGetRequest("id=12", "submission=false")
|
|
req = req.WithContext(ctx)
|
|
})
|
|
|
|
It("does not scrobble", func() {
|
|
_, err := router.Scrobble(req)
|
|
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(playTracker.Submissions).To(BeEmpty())
|
|
})
|
|
|
|
It("registers a NowPlaying via ReportPlayback", func() {
|
|
_, err := router.Scrobble(req)
|
|
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(playTracker.ReportedPlayback).To(HaveLen(1))
|
|
Expect(playTracker.ReportedPlayback[0].MediaId).To(Equal("12"))
|
|
Expect(playTracker.ReportedPlayback[0].State).To(Equal(scrobbler.StatePlaying))
|
|
Expect(playTracker.ReportedPlayback[0].ClientId).To(Equal("player-1"))
|
|
})
|
|
})
|
|
})
|
|
|
|
Describe("ReportPlayback", func() {
|
|
It("returns error when mediaId is missing", func() {
|
|
r := newGetRequest("mediaType=song", "positionMs=0", "state=playing")
|
|
_, err := router.ReportPlayback(r)
|
|
Expect(err).To(HaveOccurred())
|
|
})
|
|
|
|
It("returns error when mediaType is missing", func() {
|
|
r := newGetRequest("mediaId=123", "positionMs=0", "state=playing")
|
|
_, err := router.ReportPlayback(r)
|
|
Expect(err).To(HaveOccurred())
|
|
})
|
|
|
|
It("returns error when positionMs is missing", func() {
|
|
r := newGetRequest("mediaId=123", "mediaType=song", "state=playing")
|
|
_, err := router.ReportPlayback(r)
|
|
Expect(err).To(HaveOccurred())
|
|
})
|
|
|
|
It("returns error when state is missing", func() {
|
|
r := newGetRequest("mediaId=123", "mediaType=song", "positionMs=0")
|
|
_, err := router.ReportPlayback(r)
|
|
Expect(err).To(HaveOccurred())
|
|
})
|
|
|
|
It("returns error for invalid state value", func() {
|
|
r := newGetRequest("mediaId=123", "mediaType=song", "positionMs=0", "state=invalid")
|
|
_, err := router.ReportPlayback(r)
|
|
Expect(err).To(HaveOccurred())
|
|
})
|
|
|
|
It("returns error for negative positionMs", func() {
|
|
r := newGetRequest("mediaId=123", "mediaType=song", "positionMs=-1", "state=playing")
|
|
_, err := router.ReportPlayback(r)
|
|
Expect(err).To(HaveOccurred())
|
|
})
|
|
|
|
It("returns error for NaN playbackRate", func() {
|
|
r := newGetRequest("mediaId=123", "mediaType=song", "positionMs=0", "state=playing", "playbackRate=NaN")
|
|
_, err := router.ReportPlayback(r)
|
|
Expect(err).To(HaveOccurred())
|
|
})
|
|
|
|
It("returns error for Inf playbackRate", func() {
|
|
r := newGetRequest("mediaId=123", "mediaType=song", "positionMs=0", "state=playing", "playbackRate=Inf")
|
|
_, err := router.ReportPlayback(r)
|
|
Expect(err).To(HaveOccurred())
|
|
})
|
|
|
|
It("returns error for negative playbackRate", func() {
|
|
r := newGetRequest("mediaId=123", "mediaType=song", "positionMs=0", "state=playing", "playbackRate=-1.0")
|
|
_, err := router.ReportPlayback(r)
|
|
Expect(err).To(HaveOccurred())
|
|
})
|
|
|
|
It("returns error for zero playbackRate", func() {
|
|
r := newGetRequest("mediaId=123", "mediaType=song", "positionMs=0", "state=playing", "playbackRate=0")
|
|
_, err := router.ReportPlayback(r)
|
|
Expect(err).To(HaveOccurred())
|
|
})
|
|
|
|
It("accepts mediaType=podcast without error", func() {
|
|
r := newGetRequest("mediaId=123", "mediaType=podcast", "positionMs=0", "state=playing")
|
|
ctx := request.WithPlayer(r.Context(), model.Player{ID: "p1"})
|
|
r = r.WithContext(ctx)
|
|
resp, err := router.ReportPlayback(r)
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(resp.Status).To(Equal(responses.StatusOK))
|
|
})
|
|
|
|
It("defaults playbackRate to 1.0 and ignoreScrobble to false", func() {
|
|
r := newGetRequest("mediaId=123", "mediaType=song", "positionMs=5000", "state=playing")
|
|
ctx := request.WithPlayer(r.Context(), model.Player{ID: "p1"})
|
|
r = r.WithContext(ctx)
|
|
_, err := router.ReportPlayback(r)
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(playTracker.ReportedPlayback).To(HaveLen(1))
|
|
Expect(playTracker.ReportedPlayback[0].PlaybackRate).To(Equal(1.0))
|
|
Expect(playTracker.ReportedPlayback[0].IgnoreScrobble).To(BeFalse())
|
|
Expect(playTracker.ReportedPlayback[0].ClientId).To(Equal("p1"))
|
|
Expect(playTracker.ReportedPlayback[0].ClientName).To(BeEmpty())
|
|
})
|
|
})
|
|
})
|
|
|
|
type fakePlayTracker struct {
|
|
Submissions []scrobbler.Submission
|
|
ReportedPlayback []scrobbler.ReportPlaybackParams
|
|
Error error
|
|
}
|
|
|
|
func (f *fakePlayTracker) GetNowPlaying(_ context.Context) ([]scrobbler.NowPlayingInfo, error) {
|
|
return nil, f.Error
|
|
}
|
|
|
|
func (f *fakePlayTracker) Submit(_ context.Context, submissions []scrobbler.Submission) error {
|
|
if f.Error != nil {
|
|
return f.Error
|
|
}
|
|
f.Submissions = append(f.Submissions, submissions...)
|
|
return nil
|
|
}
|
|
|
|
func (f *fakePlayTracker) ReportPlayback(_ context.Context, params scrobbler.ReportPlaybackParams) error {
|
|
if f.Error != nil {
|
|
return f.Error
|
|
}
|
|
f.ReportedPlayback = append(f.ReportedPlayback, params)
|
|
return nil
|
|
}
|
|
|
|
var _ scrobbler.PlayTracker = (*fakePlayTracker)(nil)
|
|
|
|
type fakeEventBroker struct {
|
|
http.Handler
|
|
Events []events.Event
|
|
}
|
|
|
|
func (f *fakeEventBroker) SendMessage(_ context.Context, event events.Event) {
|
|
f.Events = append(f.Events, event)
|
|
}
|
|
|
|
func (f *fakeEventBroker) SendBroadcastMessage(_ context.Context, event events.Event) {
|
|
f.Events = append(f.Events, event)
|
|
}
|
|
|
|
var _ events.Broker = (*fakeEventBroker)(nil)
|