fix(ui): keep the NowPlayingPanel badge in sync.

Introduced a new event, EVENT_STREAM_RECONNECTED, to track the last
timestamp of stream reconnections. This change updates the activity
reducer to handle the new event and modifies the NowPlayingPanel to
refresh data based on server and stream status.

Signed-off-by: Deluan <deluan@navidrome.org>
This commit is contained in:
Deluan
2025-06-29 11:35:10 -04:00
parent dce7705999
commit 4f83987840
6 changed files with 197 additions and 22 deletions
+21 -6
View File
@@ -245,6 +245,12 @@ NowPlayingList.propTypes = {
const NowPlayingPanel = () => {
const dispatch = useDispatch()
const count = useSelector((state) => state.activity.nowPlayingCount)
const streamReconnected = useSelector(
(state) => state.activity.streamReconnected,
)
const serverUp = useSelector(
(state) => !!state.activity.serverStart.startTime,
)
const translate = useTranslate()
const notify = useNotify()
const theme = useTheme()
@@ -301,23 +307,32 @@ const NowPlayingPanel = () => {
[dispatch, notify],
)
// Initialize count and entries on mount
// Initialize count and entries on mount, and refresh on server/stream changes
useEffect(() => {
fetchList()
}, [fetchList])
if (serverUp) fetchList()
}, [fetchList, serverUp, streamReconnected])
// Refresh when count changes from WebSocket events (if panel is open)
useEffect(() => {
if (open) fetchList()
}, [count, open, fetchList])
if (open && serverUp) fetchList()
}, [count, open, fetchList, serverUp])
// Periodic refresh when panel is open (10 seconds)
useInterval(
() => {
if (open) fetchList()
if (open && serverUp) fetchList()
},
open ? 10000 : null,
)
// Periodic refresh when panel is closed (60 seconds) to keep badge accurate
useInterval(
() => {
if (!open && serverUp) fetchList()
},
!open ? 60000 : null,
)
return (
<div>
<NowPlayingButton count={count} onClick={handleMenuOpen} />
+148 -15
View File
@@ -55,6 +55,21 @@ vi.mock('@material-ui/core/styles/useTheme', () => ({
}))
describe('<NowPlayingPanel />', () => {
const createMockStore = (overrides = {}) => {
const defaultState = {
activity: {
nowPlayingCount: 1,
serverStart: { startTime: Date.now() }, // Server is up by default
streamReconnected: 0,
...overrides,
},
}
return createStore(
combineReducers({ activity: activityReducer }),
defaultState,
)
}
beforeEach(() => {
vi.clearAllMocks()
mockUseMediaQuery.mockReturnValue(false) // Default to large screen
@@ -83,9 +98,7 @@ describe('<NowPlayingPanel />', () => {
})
it('fetches and displays entries when opened', async () => {
const store = createStore(combineReducers({ activity: activityReducer }), {
activity: { nowPlayingCount: 1 },
})
const store = createMockStore()
render(
<Provider store={store}>
<NowPlayingPanel />
@@ -108,9 +121,7 @@ describe('<NowPlayingPanel />', () => {
})
it('displays player name after username', async () => {
const store = createStore(combineReducers({ activity: activityReducer }), {
activity: { nowPlayingCount: 1 },
})
const store = createMockStore()
render(
<Provider store={store}>
<NowPlayingPanel />
@@ -152,9 +163,7 @@ describe('<NowPlayingPanel />', () => {
},
})
const store = createStore(combineReducers({ activity: activityReducer }), {
activity: { nowPlayingCount: 1 },
})
const store = createMockStore()
render(
<Provider store={store}>
<NowPlayingPanel />
@@ -178,9 +187,7 @@ describe('<NowPlayingPanel />', () => {
'subsonic-response': { status: 'ok', nowPlaying: { entry: [] } },
},
})
const store = createStore(combineReducers({ activity: activityReducer }), {
activity: { nowPlayingCount: 0 },
})
const store = createMockStore({ nowPlayingCount: 0 })
render(
<Provider store={store}>
<NowPlayingPanel />
@@ -201,9 +208,7 @@ describe('<NowPlayingPanel />', () => {
it('does not close panel when artist link is clicked on large screens', async () => {
mockUseMediaQuery.mockReturnValue(false) // Simulate large screen
const store = createStore(combineReducers({ activity: activityReducer }), {
activity: { nowPlayingCount: 1 },
})
const store = createMockStore()
render(
<Provider store={store}>
<NowPlayingPanel />
@@ -231,4 +236,132 @@ describe('<NowPlayingPanel />', () => {
expect(screen.getByRole('presentation')).toBeInTheDocument()
expect(screen.getByText('Artist')).toBeInTheDocument()
})
it('does not fetch on mount when server is down', () => {
const store = createMockStore({
nowPlayingCount: 1,
serverStart: { startTime: null }, // Server is down
})
render(
<Provider store={store}>
<NowPlayingPanel />
</Provider>,
)
// Should not have made initial fetch request due to server being down
expect(subsonic.getNowPlaying).not.toHaveBeenCalled()
})
it('does not fetch on stream reconnection when server is down', () => {
const store = createMockStore({
nowPlayingCount: 1,
serverStart: { startTime: null }, // Server is down
streamReconnected: Date.now(), // Stream reconnected
})
render(
<Provider store={store}>
<NowPlayingPanel />
</Provider>,
)
// Should not have made fetch request due to server being down
expect(subsonic.getNowPlaying).not.toHaveBeenCalled()
})
it('does not double-fetch on server reconnection', () => {
const initialStore = createMockStore({
nowPlayingCount: 1,
serverStart: { startTime: null }, // Server initially down
streamReconnected: 0,
})
const { rerender } = render(
<Provider store={initialStore}>
<NowPlayingPanel />
</Provider>,
)
// Clear initial (empty) calls
vi.clearAllMocks()
// Simulate server coming back up with stream reconnection (both state changes happen)
const reconnectedStore = createMockStore({
nowPlayingCount: 1,
serverStart: { startTime: Date.now() }, // Server back up
streamReconnected: Date.now(), // Stream reconnected
})
rerender(
<Provider store={reconnectedStore}>
<NowPlayingPanel />
</Provider>,
)
// Should only make one call despite both serverUp and streamReconnected changing
expect(subsonic.getNowPlaying).toHaveBeenCalledTimes(1)
})
it('skips polling when server is down', () => {
vi.useFakeTimers()
const store = createMockStore({
nowPlayingCount: 1,
serverStart: { startTime: null }, // Server is down
})
render(
<Provider store={store}>
<NowPlayingPanel />
</Provider>,
)
// Clear initial mount fetch
vi.clearAllMocks()
// Advance time by 70 seconds to trigger polling interval
vi.advanceTimersByTime(70000)
// Should not have made any additional requests due to server being down
expect(subsonic.getNowPlaying).not.toHaveBeenCalled()
vi.useRealTimers()
})
it('resumes polling when server comes back up', () => {
vi.useFakeTimers()
const store = createMockStore({
nowPlayingCount: 1,
serverStart: { startTime: null }, // Server is down
})
const { rerender } = render(
<Provider store={store}>
<NowPlayingPanel />
</Provider>,
)
// Clear initial mount fetch
vi.clearAllMocks()
// Advance time - should not poll when server is down
vi.advanceTimersByTime(70000)
expect(subsonic.getNowPlaying).not.toHaveBeenCalled()
// Update state to indicate server is back up
const updatedStore = createMockStore({
nowPlayingCount: 1,
serverStart: { startTime: Date.now() }, // Server is back up
})
rerender(
<Provider store={updatedStore}>
<NowPlayingPanel />
</Provider>,
)
// Clear the fetch that happens due to initial mount of rerender
vi.clearAllMocks()
// Advance time again - should now poll since server is up
vi.advanceTimersByTime(70000)
expect(subsonic.getNowPlaying).toHaveBeenCalled()
vi.useRealTimers()
})
})