diff --git a/components/player/Player.vue b/components/player/Player.vue index 6e3a856c..bd464058 100644 --- a/components/player/Player.vue +++ b/components/player/Player.vue @@ -205,6 +205,7 @@ import { isCurrentMediaPlaying, playbackWatchdogAction, nextRecoverySourceIndex, import { stationReportUrl, stationReportEmailUrl } from "~/utils/station-sharing.mjs"; import { resolvePlaylistSource } from "~/utils/radio-playlist.mjs"; import { resolveLiveTrack } from "~/utils/live-track.mjs"; +import { readPlayerStorage, writePlayerStorage } from "~/utils/player-storage.mjs"; import { createTimedHlsTrackBuffer, extractNativeHlsId3Track } from "~/utils/hls-song-metadata.mjs"; interface CurrentMedia { @@ -297,7 +298,7 @@ const finishPlayerAction = () => { const action = pendingPlayerAction; pendingPl const wideViewport = ref(false); const updateViewport = () => { wideViewport.value = window.innerWidth >= 1536; if (wideViewport.value) mobileQueueOpen.value = false; }; const persistQueueOpen = (): void => { - if (import.meta.client) localStorage.setItem(PLAYER_QUEUE_OPEN_KEY, playback.queueOpen ? '1' : '0'); + if (import.meta.client) writePlayerStorage(PLAYER_QUEUE_OPEN_KEY, playback.queueOpen ? '1' : '0'); }; const setQueueOpen = (value: boolean): void => { playback.queueOpen = value; @@ -399,7 +400,7 @@ const playerMini = toRef(playback, 'playerMini'); const playerStatusVisible = computed(() => streamError.value || !online.value || waiting.value || resolvingGlobalSelection.value || !hasPlayableSource.value || Boolean(sleepRemaining.value)); const togglePlayerCompact = (): void => { playerCompact.value = !playerCompact.value; - if (import.meta.client) localStorage.setItem('radio:player-compact', playerCompact.value ? '1' : '0'); + if (import.meta.client) writePlayerStorage('radio:player-compact', playerCompact.value ? '1' : '0'); }; const setPlayerMini = (value: boolean): void => { playerMini.value = value; @@ -407,7 +408,7 @@ const setPlayerMini = (value: boolean): void => { setQueueOpen(false); mobileQueueOpen.value = false; } - if (import.meta.client) localStorage.setItem('radio:player-mini', value ? '1' : '0'); + if (import.meta.client) writePlayerStorage('radio:player-mini', value ? '1' : '0'); }; let hlsInstance: any = null; @@ -1362,7 +1363,7 @@ const onVolumeChange = (): void => { muted.value = media.muted; if (preferences.rememberVolume) { try { - localStorage.setItem(AUDIO_PREFERENCES_KEY, JSON.stringify({ volume: media.volume, muted: media.muted })); + writePlayerStorage(AUDIO_PREFERENCES_KEY, JSON.stringify({ volume: media.volume, muted: media.muted })); } catch { /* Storage restrictions must not interrupt audio. */ } } }; @@ -1507,9 +1508,9 @@ onMounted(() => { window.addEventListener('radio:listening-duration-reset', resetListeningTracking); document.addEventListener("visibilitychange", checkSleepDeadline); window.addEventListener("pageshow", checkSleepDeadline); - playerCompact.value = localStorage.getItem('radio:player-compact') === '1'; - playerMini.value = localStorage.getItem('radio:player-mini') === '1'; - playback.queueOpen = localStorage.getItem(PLAYER_QUEUE_OPEN_KEY) === '1' && !playerMini.value; + playerCompact.value = readPlayerStorage('radio:player-compact') === '1'; + playerMini.value = readPlayerStorage('radio:player-mini') === '1'; + playback.queueOpen = readPlayerStorage(PLAYER_QUEUE_OPEN_KEY) === '1' && !playerMini.value; systemVolumeOnly.value = usesSystemVolumeControls(navigator); const [, area, country] = props.country.split("."); if (area && country) { @@ -1524,7 +1525,7 @@ onMounted(() => { const savedMedia = mediaElement.value; if (savedMedia && preferences.rememberVolume) { try { - const saved = JSON.parse(localStorage.getItem(AUDIO_PREFERENCES_KEY) || 'null'); + const saved = JSON.parse(readPlayerStorage(AUDIO_PREFERENCES_KEY) || 'null'); if (saved && typeof saved.muted === 'boolean') savedMedia.muted = saved.muted; if (!systemVolumeOnly.value && typeof saved?.volume === 'number' && Number.isFinite(saved.volume) && saved.volume >= 0 && saved.volume <= 1) { diff --git a/components/player/Queue.vue b/components/player/Queue.vue index 5333f769..aeffd408 100644 --- a/components/player/Queue.vue +++ b/components/player/Queue.vue @@ -492,19 +492,29 @@ watch( ); let scheduleClockTimer: ReturnType | null = null; +const needsScheduleClock = computed(() => + activeTab.value === 'schedule' && props.visible && props.scheduleIsReference && props.program.length > 0, +); +const stopScheduleClock = () => { + if (scheduleClockTimer === null) return; + clearInterval(scheduleClockTimer); + scheduleClockTimer = null; +}; onMounted(() => { scheduleNow.value = Math.floor(Date.now() / 1000); - scheduleClockTimer = setInterval(() => { - // Clock and the timeline fill move once per second. Only update the - // visible reference guide; real-time provider EPG is unaffected. - if (activeTab.value === 'schedule' && props.visible && props.scheduleIsReference) { + watch(needsScheduleClock, (active) => { + stopScheduleClock(); + if (!active) return; + scheduleNow.value = Math.floor(Date.now() / 1000); + scheduleClockTimer = setInterval(() => { + // Do not wake the queue when hidden, showing stations or without a guide. scheduleNow.value = Math.floor(Date.now() / 1000); - } - }, 1_000); + }, 1_000); + }, { immediate: true }); if (activeTab.value === 'schedule' && props.visible) void jumpToSchedulePosition(); }); onBeforeUnmount(() => { - if (scheduleClockTimer !== null) clearInterval(scheduleClockTimer); + stopScheduleClock(); scrollGeneration += 1; }); diff --git a/tests/player-storage.test.mjs b/tests/player-storage.test.mjs new file mode 100644 index 00000000..58f11af3 --- /dev/null +++ b/tests/player-storage.test.mjs @@ -0,0 +1,31 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readPlayerStorage, writePlayerStorage } from '../utils/player-storage.mjs'; + +test('player storage round-trips persisted UI and volume values', () => { + const values = new Map(); + const storage = () => ({ + getItem: key => values.get(key) ?? null, + setItem: (key, value) => { values.set(key, value); }, + }); + assert.equal(readPlayerStorage('radio:player-mini', storage), null); + assert.equal(writePlayerStorage('radio:player-mini', '1', storage), true); + assert.equal(readPlayerStorage('radio:player-mini', storage), '1'); + assert.equal(writePlayerStorage('radio:audio-preferences:v1', '{"volume":0.5}', storage), true); + assert.equal(readPlayerStorage('radio:audio-preferences:v1', storage), '{"volume":0.5}'); +}); + +test('player remains functional when storage access is blocked', () => { + const denied = () => { throw new DOMException('Access denied', 'SecurityError'); }; + assert.equal(readPlayerStorage('radio:player-mini', denied), null); + assert.equal(writePlayerStorage('radio:player-mini', '1', denied), false); +}); + +test('player tolerates getItem and setItem failures independently', () => { + const storage = () => ({ + getItem: () => { throw new Error('get failed'); }, + setItem: () => { throw new Error('quota exceeded'); }, + }); + assert.equal(readPlayerStorage('radio:player-compact', storage), null); + assert.equal(writePlayerStorage('radio:player-compact', '1', storage), false); +}); diff --git a/tests/station-schedule.test.mjs b/tests/station-schedule.test.mjs index 145cfa66..826430e6 100644 --- a/tests/station-schedule.test.mjs +++ b/tests/station-schedule.test.mjs @@ -20,6 +20,10 @@ test("normalizes only real HTTP schedule URLs", () => { assert.equal(normalizeScheduleUrl(false), ""); assert.equal(normalizeScheduleUrl(""), ""); assert.equal(normalizeScheduleUrl("schedule-only"), ""); + assert.equal(normalizeScheduleUrl("https://"), ""); + assert.equal(normalizeScheduleUrl("https://example.com:bad/epg"), ""); + assert.equal(normalizeScheduleUrl("https://user:pass@example.com/epg"), ""); + assert.equal(normalizeScheduleUrl("https://example.com/epg"), "https://example.com/epg"); }); test("detects Zing schedule by provider endpoint instead of country", () => { @@ -157,9 +161,16 @@ test('live time bar is wired to a one-second clock only for visible reference gu const q = await readFile(new URL('../components/player/Queue.vue', import.meta.url), 'utf8'); const gap = await readFile(new URL('../components/player/ScheduleGap.vue', import.meta.url), 'utf8'); assert.match(q, /scheduleTimelineProgress\(item\.startTime, item\.endTime, scheduleNow\.value\)/); + assert.match(q, /watch\(needsScheduleClock, \(active\) => \{/); assert.match(q, /scheduleClockTimer = setInterval\(/); assert.match(q, /\}, 1_000\)/); - assert.match(q, /props\.visible && props\.scheduleIsReference/); + assert.match(q, /activeTab\.value === 'schedule' && props\.visible && props\.scheduleIsReference && props\.program\.length > 0/); + assert.match(q, /if \(!active\) return/); + assert.match(q, /stopScheduleClock\(\)/); + assert.match(q, /onBeforeUnmount\(\(\) => \{\s*stopScheduleClock\(\)/); + const intervalBody = q.match(/scheduleClockTimer = setInterval\(\(\) => \{([\s\S]*?)\}, 1_000\)/)?.[1]; + assert.ok(intervalBody, 'one-second callback exists only behind the eligibility watcher'); + assert.doesNotMatch(intervalBody, /if \(activeTab\.value === 'schedule'/); assert.match(q, /data-schedule-clock role="timer"/); assert.match(q, /data-schedule-time-progress/); assert.match(q, /:start-time="gapStartTime\(scheduleGap\.insertIndex\)"/); diff --git a/utils/player-storage.mjs b/utils/player-storage.mjs new file mode 100644 index 00000000..48ffa9b6 --- /dev/null +++ b/utils/player-storage.mjs @@ -0,0 +1,9 @@ +// Storage can throw in private browsing, sandboxed frames or restricted browsers. +// Player controls must remain usable even when persistence is unavailable. +export function readPlayerStorage(key, getStorage = () => globalThis.localStorage) { + try { return getStorage().getItem(key); } catch { return null; } +} + +export function writePlayerStorage(key, value, getStorage = () => globalThis.localStorage) { + try { getStorage().setItem(key, value); return true; } catch { return false; } +} diff --git a/utils/station-schedule.mjs b/utils/station-schedule.mjs index afb163a2..e76e9252 100644 --- a/utils/station-schedule.mjs +++ b/utils/station-schedule.mjs @@ -4,7 +4,14 @@ export const normalizeScheduleUrl = (value) => { const url = value.trim(); if (!/^https?:\/\//i.test(url)) return ""; - return url; + try { + const parsed = new URL(url); + // Reject malformed endpoints and embedded credentials before a schedule fetch. + if (!["http:", "https:"].includes(parsed.protocol) || !parsed.hostname || parsed.username || parsed.password) return ""; + return url; + } catch { + return ""; + } }; export const isZingScheduleUrl = (value) => {