diff --git a/web/src/stores/sourceTabs.ts b/web/src/stores/sourceTabs.ts index 652a6a8..8e03986 100644 --- a/web/src/stores/sourceTabs.ts +++ b/web/src/stores/sourceTabs.ts @@ -13,7 +13,13 @@ function readAll(): Partial> { const raw = localStorage.getItem(STORAGE_KEY); if (!raw) return {}; const parsed = JSON.parse(raw); - return typeof parsed === 'object' && parsed !== null ? parsed : {}; + // typeof null === 'object' and typeof [] === 'object' — both pass a + // naive check but neither is a valid record. Reject explicitly so a + // corrupted / manipulated value can't smuggle wrong shapes through. + if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) { + return {}; + } + return parsed as Partial>; } catch { return {}; } diff --git a/web/src/views/Playlist.vue b/web/src/views/Playlist.vue index adcdc7b..01ba118 100644 --- a/web/src/views/Playlist.vue +++ b/web/src/views/Playlist.vue @@ -77,20 +77,37 @@ onMounted(async () => { const id = route.params.id as string; const platform = (route.query.platform as string) || 'netease'; - try { - const [detailRes, songsRes] = await Promise.all([ - axios.get(`/api/music/playlist/${id}/detail`, { params: { platform } }), - axios.get(`/api/music/playlist/${id}`, { params: { platform } }), - ]); - playlist.value = detailRes.data.playlist; - songs.value = songsRes.data.songs; - } catch (err: any) { - console.error('Failed to load playlist:', err?.response?.status, err?.message); + // allSettled, not Promise.all — if detail 404s but songs is fine + // (e.g., a QQ playlist whose detail endpoint flaked but the song + // list resolved), we still want to show the songs rather than + // the "歌单不存在" empty state. + const [detailRes, songsRes] = await Promise.allSettled([ + axios.get(`/api/music/playlist/${id}/detail`, { params: { platform } }), + axios.get(`/api/music/playlist/${id}`, { params: { platform } }), + ]); + + const detail = detailRes.status === 'fulfilled' ? detailRes.value.data?.playlist : null; + const songList = songsRes.status === 'fulfilled' ? (songsRes.value.data?.songs ?? []) : []; + + if (detail) { + playlist.value = detail; + } else if (songList.length > 0) { + // Fall back to a stub built from the route + first song's cover. + playlist.value = { + id, + name: '歌单', + description: '', + coverUrl: songList[0]?.coverUrl ?? '', + songCount: songList.length, + }; + } else { playlist.value = null; - songs.value = []; - } finally { - loading.value = false; + if (detailRes.status === 'rejected') { + console.error('Failed to load playlist detail:', (detailRes.reason as any)?.response?.status, (detailRes.reason as any)?.message); + } } + songs.value = songList; + loading.value = false; }); diff --git a/web/src/views/Settings.vue b/web/src/views/Settings.vue index f8ce798..ba2a310 100755 --- a/web/src/views/Settings.vue +++ b/web/src/views/Settings.vue @@ -782,6 +782,13 @@ async function loadProfileConfig(botId: string) { profileLoadError[botId] = null; try { const res = await axios.get(`/api/player/${botId}/profile`); + // Defensive: a 200 response with non-object body (empty / proxy + // injection / etc.) would otherwise leave the row stuck on + // "加载中..." because profileConfigs[botId] would be falsy. + if (!res.data || typeof res.data !== 'object' || typeof res.data.avatarEnabled !== 'boolean') { + profileLoadError[botId] = '响应格式异常'; + return; + } profileConfigs[botId] = res.data; } catch (err: any) { profileLoadError[botId] = err?.response?.status === 404