mirror of
https://github.com/algerkong/AlgerMusicPlayer.git
synced 2026-04-21 22:07:23 +08:00
refactor(player): 重构播放控制系统，移除 Howler.js 改用原生 HTMLAudioElement
- 新建 playbackController.ts，使用 generation-based 取消替代 playbackRequestManager 状态机 - audioService 重写：单一持久 HTMLAudioElement + Web Audio API，createMediaElementSource 只调一次 - playerCore 瘦身为纯状态管理，移除 handlePlayMusic/playAudio/checkPlaybackState - playlist next/prev 简化，区分用户手动切歌和歌曲自然播完 - MusicHook 适配 HTMLAudioElement API（.currentTime/.duration/.paused） - preloadService 从 Howl 实例缓存改为 URL 可用性验证 - 所有 view/component 调用者迁移到 playbackController.playTrack() 修复：快速切歌竞态、seek 到未缓冲位置失败、重启后自动播放循环提示、EQ 重建崩溃
This commit is contained in:
alger
@@ -140,6 +140,9 @@ onMounted(async () => {
|
||||
|
||||
// 初始化 MusicHook，注入 playerStore
|
||||
initMusicHook(playerStore);
|
||||
// 设置 URL 过期自动续播处理器
|
||||
const { setupUrlExpiredHandler } = await import('@/services/playbackController');
|
||||
setupUrlExpiredHandler();
|
||||
// 初始化播放状态
|
||||
await playerStore.initializePlayState();
|
||||
|
||||
|
||||
@@ -409,6 +409,7 @@ import {
|
||||
} from '@/hooks/MusicHook';
|
||||
import { useArtist } from '@/hooks/useArtist';
|
||||
import { usePlayMode } from '@/hooks/usePlayMode';
|
||||
import { audioService } from '@/services/audioService';
|
||||
import { usePlayerStore } from '@/store/modules/player';
|
||||
import { DEFAULT_LYRIC_CONFIG, LyricConfig } from '@/types/lyric';
|
||||
import { getImgUrl, secondToMinute } from '@/utils';
|
||||
@@ -757,7 +758,7 @@ const handleProgressBarClick = (e: MouseEvent) => {
|
||||
|
||||
console.log(`进度条点击: ${percentage.toFixed(2)}, 新时间: ${newTime.toFixed(2)}`);
|
||||
|
||||
sound.value.seek(newTime);
|
||||
audioService.seek(newTime);
|
||||
nowTime.value = newTime;
|
||||
};
|
||||
|
||||
@@ -817,7 +818,7 @@ const handleMouseUp = (e: MouseEvent) => {
|
||||
e.preventDefault();
|
||||
|
||||
// 释放时跳转到指定位置
|
||||
sound.value.seek(nowTime.value);
|
||||
audioService.seek(nowTime.value);
|
||||
console.log(`鼠标释放，跳转到: ${nowTime.value.toFixed(2)}秒`);
|
||||
|
||||
isMouseDragging.value = false;
|
||||
@@ -871,7 +872,7 @@ const handleThumbTouchEnd = (e: TouchEvent) => {
|
||||
|
||||
// 拖动结束时执行seek操作
|
||||
console.log(`拖动结束，跳转到: ${nowTime.value.toFixed(2)}秒`);
|
||||
sound.value.seek(nowTime.value);
|
||||
audioService.seek(nowTime.value);
|
||||
isThumbDragging.value = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -100,9 +100,9 @@ import { useI18n } from 'vue-i18n';
|
||||
import { CacheManager } from '@/api/musicParser';
|
||||
import { playMusic } from '@/hooks/MusicHook';
|
||||
import { initLxMusicRunner, setLxMusicRunner } from '@/services/LxMusicSourceRunner';
|
||||
import { reparseCurrentSong } from '@/services/playbackController';
|
||||
import { SongSourceConfigManager } from '@/services/SongSourceConfigManager';
|
||||
import { useSettingsStore } from '@/store';
|
||||
import { usePlayerStore } from '@/store/modules/player';
|
||||
import type { LxMusicScriptConfig } from '@/types/lxMusic';
|
||||
import type { Platform } from '@/types/music';
|
||||
import { type MusicSourceGroup, useMusicSources } from '@/utils/musicSourceConfig';
|
||||
@@ -119,7 +119,6 @@ type ReparseSourceItem = {
|
||||
lxScriptId?: string;
|
||||
};
|
||||
|
||||
const playerStore = usePlayerStore();
|
||||
const settingsStore = useSettingsStore();
|
||||
const { t } = useI18n();
|
||||
const message = useMessage();
|
||||
@@ -253,7 +252,7 @@ const reparseWithLxScript = async (source: ReparseSourceItem) => {
|
||||
selectedSourceId.value = source.id;
|
||||
SongSourceConfigManager.setConfig(songId, ['lxMusic'], 'manual');
|
||||
|
||||
const success = await playerStore.reparseCurrentSong('lxMusic', false);
|
||||
const success = await reparseCurrentSong('lxMusic', false);
|
||||
|
||||
if (success) {
|
||||
message.success(t('player.reparse.success'));
|
||||
@@ -283,7 +282,7 @@ const directReparseMusic = async (source: ReparseSourceItem) => {
|
||||
selectedSourceId.value = source.id;
|
||||
SongSourceConfigManager.setConfig(songId, [source.platform], 'manual');
|
||||
|
||||
const success = await playerStore.reparseCurrentSong(source.platform, false);
|
||||
const success = await reparseCurrentSong(source.platform, false);
|
||||
|
||||
if (success) {
|
||||
message.success(t('player.reparse.success'));
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { cloneDeep } from 'lodash';
|
||||
import { createDiscreteApi } from 'naive-ui';
|
||||
import { computed, type ComputedRef, nextTick, onUnmounted, ref, watch } from 'vue';
|
||||
|
||||
import useIndexedDB from '@/hooks/IndexDBHook';
|
||||
@@ -45,7 +44,7 @@ export const nowTime = ref(0); // 当前播放时间
|
||||
export const allTime = ref(0); // 总播放时间
|
||||
export const nowIndex = ref(0); // 当前播放歌词
|
||||
export const currentLrcProgress = ref(0); // 来存储当前歌词的进度
|
||||
export const sound = ref<Howl | null>(audioService.getCurrentSound());
|
||||
export const sound = ref<HTMLAudioElement | null>(audioService.getCurrentSound());
|
||||
export const isLyricWindowOpen = ref(false); // 新增状态
|
||||
export const textColors = ref<any>(getTextColors());
|
||||
|
||||
@@ -86,8 +85,6 @@ const setupKeyboardListeners = () => {
|
||||
};
|
||||
};
|
||||
|
||||
const { message } = createDiscreteApi(['message']);
|
||||
|
||||
let audioListenersInitialized = false;
|
||||
|
||||
/**
|
||||
@@ -307,12 +304,7 @@ const setupAudioListeners = () => {
|
||||
return;
|
||||
}
|
||||
|
||||
if (typeof currentSound.seek !== 'function') {
|
||||
// seek 方法不可用，跳过本次更新，不清除 interval
|
||||
return;
|
||||
}
|
||||
|
||||
const currentTime = currentSound.seek() as number;
|
||||
const currentTime = currentSound.currentTime;
|
||||
if (typeof currentTime !== 'number' || Number.isNaN(currentTime)) {
|
||||
// 无效时间，跳过本次更新
|
||||
return;
|
||||
@@ -324,7 +316,7 @@ const setupAudioListeners = () => {
|
||||
}
|
||||
|
||||
nowTime.value = currentTime;
|
||||
allTime.value = currentSound.duration() as number;
|
||||
allTime.value = currentSound.duration;
|
||||
|
||||
// === 歌词索引更新 ===
|
||||
const newIndex = getLrcIndex(nowTime.value);
|
||||
@@ -396,7 +388,7 @@ const setupAudioListeners = () => {
|
||||
const store = getPlayerStore();
|
||||
if (store.play && !interval) {
|
||||
const currentSound = audioService.getCurrentSound();
|
||||
if (currentSound && currentSound.playing()) {
|
||||
if (currentSound && !currentSound.paused) {
|
||||
console.warn('[MusicHook] 检测到播放中但 interval 丢失，自动恢复');
|
||||
startProgressInterval();
|
||||
}
|
||||
@@ -422,7 +414,7 @@ const setupAudioListeners = () => {
|
||||
const currentSound = audioService.getCurrentSound();
|
||||
if (currentSound) {
|
||||
// 立即更新显示时间，不进行任何检查
|
||||
const currentTime = currentSound.seek() as number;
|
||||
const currentTime = currentSound.currentTime;
|
||||
if (typeof currentTime === 'number' && !Number.isNaN(currentTime)) {
|
||||
nowTime.value = currentTime;
|
||||
|
||||
@@ -447,10 +439,10 @@ const setupAudioListeners = () => {
|
||||
if (currentSound) {
|
||||
try {
|
||||
// 更新当前时间和总时长
|
||||
const currentTime = currentSound.seek() as number;
|
||||
const currentTime = currentSound.currentTime;
|
||||
if (typeof currentTime === 'number' && !Number.isNaN(currentTime)) {
|
||||
nowTime.value = currentTime;
|
||||
allTime.value = currentSound.duration() as number;
|
||||
allTime.value = currentSound.duration;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('初始化时间和进度失败:', error);
|
||||
@@ -481,34 +473,25 @@ const setupAudioListeners = () => {
|
||||
}
|
||||
});
|
||||
|
||||
const replayMusic = async (retryCount: number = 0) => {
|
||||
const replayMusic = async (retryCount = 0) => {
|
||||
const MAX_REPLAY_RETRIES = 3;
|
||||
try {
|
||||
// 如果当前有音频实例，先停止并销毁
|
||||
const currentSound = audioService.getCurrentSound();
|
||||
if (currentSound) {
|
||||
currentSound.stop();
|
||||
currentSound.unload();
|
||||
}
|
||||
sound.value = null;
|
||||
|
||||
// 重新播放当前歌曲
|
||||
if (getPlayerStore().playMusicUrl && playMusic.value) {
|
||||
const newSound = await audioService.play(getPlayerStore().playMusicUrl, playMusic.value);
|
||||
sound.value = newSound as Howl;
|
||||
await audioService.play(getPlayerStore().playMusicUrl, playMusic.value);
|
||||
sound.value = audioService.getCurrentSound();
|
||||
setupAudioListeners();
|
||||
} else {
|
||||
console.error('单曲循环：无可用 URL 或歌曲数据');
|
||||
getPlayerStore().nextPlay();
|
||||
const { usePlaylistStore } = await import('@/store/modules/playlist');
|
||||
usePlaylistStore().nextPlayOnEnd();
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('单曲循环重播失败:', error);
|
||||
if (retryCount < MAX_REPLAY_RETRIES) {
|
||||
console.log(`单曲循环重试 ${retryCount + 1}/${MAX_REPLAY_RETRIES}`);
|
||||
setTimeout(() => replayMusic(retryCount + 1), 1000 * (retryCount + 1));
|
||||
} else {
|
||||
console.error('单曲循环重试次数用尽，切换下一首');
|
||||
getPlayerStore().nextPlay();
|
||||
const { usePlaylistStore } = await import('@/store/modules/playlist');
|
||||
usePlaylistStore().nextPlayOnEnd();
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -544,7 +527,8 @@ const setupAudioListeners = () => {
|
||||
const playlistStore = usePlaylistStore();
|
||||
playlistStore.setPlayList([fmSong], false, false);
|
||||
getPlayerStore().isFmPlaying = true; // setPlayList 会清除，需重设
|
||||
await getPlayerStore().handlePlayMusic(fmSong, true);
|
||||
const { playTrack } = await import('@/services/playbackController');
|
||||
await playTrack(fmSong, true);
|
||||
} else {
|
||||
getPlayerStore().setIsPlay(false);
|
||||
}
|
||||
@@ -553,8 +537,9 @@ const setupAudioListeners = () => {
|
||||
getPlayerStore().setIsPlay(false);
|
||||
}
|
||||
} else {
|
||||
// 顺序播放、列表循环、随机播放模式都使用统一的nextPlay方法
|
||||
getPlayerStore().nextPlay();
|
||||
// 顺序播放、列表循环、随机播放模式：歌曲自然结束
|
||||
const { usePlaylistStore } = await import('@/store/modules/playlist');
|
||||
usePlaylistStore().nextPlayOnEnd();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -576,8 +561,6 @@ export const play = () => {
|
||||
const currentSound = audioService.getCurrentSound();
|
||||
if (currentSound) {
|
||||
currentSound.play();
|
||||
// 在播放时也进行状态检测，防止URL已过期导致无声
|
||||
getPlayerStore().checkPlaybackState(getPlayerStore().playMusic);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -586,7 +569,7 @@ export const pause = () => {
|
||||
if (currentSound) {
|
||||
try {
|
||||
// 保存当前播放进度
|
||||
const currentTime = currentSound.seek() as number;
|
||||
const currentTime = currentSound.currentTime;
|
||||
if (getPlayerStore().playMusic && getPlayerStore().playMusic.id) {
|
||||
localStorage.setItem(
|
||||
'playProgress',
|
||||
@@ -739,7 +722,7 @@ export const setAudioTime = (index: number) => {
|
||||
const currentSound = sound.value;
|
||||
if (!currentSound) return;
|
||||
|
||||
currentSound.seek(lrcTimeArray.value[index]);
|
||||
audioService.seek(lrcTimeArray.value[index]);
|
||||
currentSound.play();
|
||||
};
|
||||
|
||||
@@ -1042,45 +1025,24 @@ export const initAudioListeners = async () => {
|
||||
}
|
||||
};
|
||||
|
||||
// 监听URL过期事件，自动重新获取URL并恢复播放
|
||||
audioService.on('url_expired', async (expiredTrack) => {
|
||||
if (!expiredTrack) return;
|
||||
|
||||
console.log('检测到URL过期事件，准备重新获取URL', expiredTrack.name);
|
||||
|
||||
try {
|
||||
// 使用 handlePlayMusic 重新播放，它会自动处理 URL 获取和状态跟踪
|
||||
// 我们将 isFirstPlay 设为 true 以强制获取新 URL
|
||||
const trackToPlay = {
|
||||
...expiredTrack,
|
||||
isFirstPlay: true,
|
||||
playMusicUrl: undefined
|
||||
};
|
||||
|
||||
await getPlayerStore().handlePlayMusic(trackToPlay, getPlayerStore().play);
|
||||
|
||||
message.success('已自动恢复播放');
|
||||
} catch (error) {
|
||||
console.error('处理URL过期事件失败:', error);
|
||||
message.error('恢复播放失败，请手动点击播放');
|
||||
}
|
||||
});
|
||||
|
||||
// 添加音频就绪事件监听器
|
||||
window.addEventListener('audio-ready', ((event: CustomEvent) => {
|
||||
try {
|
||||
const { sound: newSound } = event.detail;
|
||||
if (newSound) {
|
||||
// 更新本地 sound 引用
|
||||
sound.value = newSound as Howl;
|
||||
sound.value = audioService.getCurrentSound();
|
||||
|
||||
// 设置音频监听器
|
||||
setupAudioListeners();
|
||||
|
||||
// 获取当前播放位置并更新显示
|
||||
const currentPosition = newSound.seek() as number;
|
||||
if (typeof currentPosition === 'number' && !Number.isNaN(currentPosition)) {
|
||||
nowTime.value = currentPosition;
|
||||
const currentSound = audioService.getCurrentSound();
|
||||
if (currentSound) {
|
||||
const currentPosition = currentSound.currentTime;
|
||||
if (typeof currentPosition === 'number' && !Number.isNaN(currentPosition)) {
|
||||
nowTime.value = currentPosition;
|
||||
}
|
||||
}
|
||||
|
||||
console.log('音频就绪，已设置监听器并更新进度显示');
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,531 @@
|
||||
/**
|
||||
* 播放控制器
|
||||
*
|
||||
* 核心播放流程管理，使用 generation-based 取消模式替代原 playerCore.ts 中的控制流。
|
||||
* 每次 playTrack() 调用递增 generation，所有异步操作在 await 后检查 generation 是否过期。
|
||||
*
|
||||
* 导出：playTrack, reparseCurrentSong, initializePlayState, setupUrlExpiredHandler, getCurrentGeneration
|
||||
*/
|
||||
|
||||
import { cloneDeep } from 'lodash';
|
||||
import { createDiscreteApi } from 'naive-ui';
|
||||
|
||||
import i18n from '@/../i18n/renderer';
|
||||
import { getParsingMusicUrl } from '@/api/music';
|
||||
import { loadLrc, useSongDetail } from '@/hooks/usePlayerHooks';
|
||||
import { audioService } from '@/services/audioService';
|
||||
import { playbackRequestManager } from '@/services/playbackRequestManager';
|
||||
// preloadService 用于预加载下一首的 URL 验证（triggerPreload 中使用）
|
||||
import { SongSourceConfigManager } from '@/services/SongSourceConfigManager';
|
||||
import type { Platform, SongResult } from '@/types/music';
|
||||
import { getImgUrl } from '@/utils';
|
||||
import { getImageLinearBackground } from '@/utils/linearColor';
|
||||
|
||||
const { message } = createDiscreteApi(['message']);
|
||||
|
||||
// Generation counter for cancellation
|
||||
let generation = 0;
|
||||
|
||||
/**
|
||||
* 获取当前 generation（用于外部检查）
|
||||
*/
|
||||
export const getCurrentGeneration = (): number => generation;
|
||||
|
||||
// ==================== 懒加载 Store（避免循环依赖） ====================
|
||||
|
||||
const getPlayerCoreStore = async () => {
|
||||
const { usePlayerCoreStore } = await import('@/store/modules/playerCore');
|
||||
return usePlayerCoreStore();
|
||||
};
|
||||
|
||||
const getPlaylistStore = async () => {
|
||||
const { usePlaylistStore } = await import('@/store/modules/playlist');
|
||||
return usePlaylistStore();
|
||||
};
|
||||
|
||||
const getPlayHistoryStore = async () => {
|
||||
const { usePlayHistoryStore } = await import('@/store/modules/playHistory');
|
||||
return usePlayHistoryStore();
|
||||
};
|
||||
|
||||
const getSettingsStore = async () => {
|
||||
const { useSettingsStore } = await import('@/store/modules/settings');
|
||||
return useSettingsStore();
|
||||
};
|
||||
|
||||
// ==================== 内部辅助函数 ====================
|
||||
|
||||
/**
|
||||
* 加载元数据（歌词 + 背景色），并行执行
|
||||
*/
|
||||
const loadMetadata = async (
|
||||
music: SongResult
|
||||
): Promise<{
|
||||
lyrics: SongResult['lyric'];
|
||||
backgroundColor: string;
|
||||
primaryColor: string;
|
||||
}> => {
|
||||
const [lyrics, { backgroundColor, primaryColor }] = await Promise.all([
|
||||
(async () => {
|
||||
if (music.lyric && music.lyric.lrcTimeArray.length > 0) {
|
||||
return music.lyric;
|
||||
}
|
||||
return await loadLrc(music.id);
|
||||
})(),
|
||||
(async () => {
|
||||
if (music.backgroundColor && music.primaryColor) {
|
||||
return { backgroundColor: music.backgroundColor, primaryColor: music.primaryColor };
|
||||
}
|
||||
return await getImageLinearBackground(getImgUrl(music?.picUrl, '30y30'));
|
||||
})()
|
||||
]);
|
||||
|
||||
return { lyrics, backgroundColor, primaryColor };
|
||||
};
|
||||
|
||||
/**
|
||||
* 加载并播放音频
|
||||
*/
|
||||
const loadAndPlayAudio = async (song: SongResult, shouldPlay: boolean): Promise<boolean> => {
|
||||
if (!song.playMusicUrl) {
|
||||
throw new Error('歌曲没有播放URL');
|
||||
}
|
||||
|
||||
// 检查保存的进度
|
||||
let initialPosition = 0;
|
||||
const savedProgress = JSON.parse(localStorage.getItem('playProgress') || '{}');
|
||||
if (savedProgress.songId === song.id) {
|
||||
initialPosition = savedProgress.progress;
|
||||
console.log('[playbackController] 恢复播放进度:', initialPosition);
|
||||
}
|
||||
|
||||
// 直接通过 audioService 播放（单一 audio 元素，换 src 即可）
|
||||
console.log(`[playbackController] 开始播放: ${song.name}`);
|
||||
await audioService.play(song.playMusicUrl, song, shouldPlay, initialPosition || 0);
|
||||
|
||||
// 发布音频就绪事件
|
||||
window.dispatchEvent(
|
||||
new CustomEvent('audio-ready', {
|
||||
detail: { sound: audioService.getCurrentSound(), shouldPlay }
|
||||
})
|
||||
);
|
||||
|
||||
return true;
|
||||
};
|
||||
|
||||
/**
|
||||
* 触发预加载下一首/下下首歌曲
|
||||
*/
|
||||
const triggerPreload = async (song: SongResult): Promise<void> => {
|
||||
try {
|
||||
const playlistStore = await getPlaylistStore();
|
||||
const list = playlistStore.playList;
|
||||
if (Array.isArray(list) && list.length > 0) {
|
||||
const idx = list.findIndex(
|
||||
(item: SongResult) => item.id === song.id && item.source === song.source
|
||||
);
|
||||
if (idx !== -1) {
|
||||
setTimeout(() => {
|
||||
playlistStore.preloadNextSongs(idx);
|
||||
}, 3000);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn('预加载触发失败（可能是依赖未加载或循环依赖），已忽略:', e);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 更新文档标题
|
||||
*/
|
||||
const updateDocumentTitle = (music: SongResult): void => {
|
||||
let title = music.name;
|
||||
if (music.source === 'netease' && music?.song?.artists) {
|
||||
title += ` - ${music.song.artists.reduce(
|
||||
(prev: string, curr: any) => `${prev}${curr.name}/`,
|
||||
''
|
||||
)}`;
|
||||
}
|
||||
document.title = 'AlgerMusic - ' + title;
|
||||
};
|
||||
|
||||
// ==================== 导出函数 ====================
|
||||
|
||||
/**
|
||||
* 核心播放函数
|
||||
*
|
||||
* @param music 要播放的歌曲
|
||||
* @param shouldPlay 是否立即播放（默认 true）
|
||||
* @returns 是否成功
|
||||
*/
|
||||
export const playTrack = async (
|
||||
music: SongResult,
|
||||
shouldPlay: boolean = true
|
||||
): Promise<boolean> => {
|
||||
// 1. 递增 generation，创建 requestId
|
||||
const gen = ++generation;
|
||||
const requestId = playbackRequestManager.createRequest(music);
|
||||
console.log(
|
||||
`[playbackController] playTrack gen=${gen}, 歌曲: ${music.name}, requestId: ${requestId}`
|
||||
);
|
||||
|
||||
// 如果是新歌曲，重置已尝试的音源
|
||||
const playerCore = await getPlayerCoreStore();
|
||||
if (music.id !== playerCore.playMusic.id) {
|
||||
SongSourceConfigManager.clearTriedSources(music.id);
|
||||
}
|
||||
|
||||
// 2. 停止当前音频
|
||||
audioService.stop();
|
||||
|
||||
// 验证 & 激活请求
|
||||
if (!playbackRequestManager.isRequestValid(requestId)) {
|
||||
console.log(`[playbackController] 请求创建后即失效: ${requestId}`);
|
||||
return false;
|
||||
}
|
||||
if (!playbackRequestManager.activateRequest(requestId)) {
|
||||
console.log(`[playbackController] 无法激活请求: ${requestId}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// 3. 更新播放意图状态（不设置 playMusic，等歌词加载完再设置以触发 watcher）
|
||||
playerCore.play = shouldPlay;
|
||||
playerCore.isPlay = shouldPlay;
|
||||
playerCore.userPlayIntent = shouldPlay;
|
||||
|
||||
// 4. 加载元数据（歌词 + 背景色）
|
||||
try {
|
||||
const { lyrics, backgroundColor, primaryColor } = await loadMetadata(music);
|
||||
|
||||
// 检查 generation
|
||||
if (gen !== generation) {
|
||||
console.log(`[playbackController] gen=${gen} 已过期（加载元数据后），当前 gen=${generation}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
music.lyric = lyrics;
|
||||
music.backgroundColor = backgroundColor;
|
||||
music.primaryColor = primaryColor;
|
||||
} catch (error) {
|
||||
if (gen !== generation) return false;
|
||||
console.error('[playbackController] 加载元数据失败:', error);
|
||||
// 元数据加载失败不阻塞播放，继续执行
|
||||
}
|
||||
|
||||
// 5. 歌词已加载，现在设置 playMusic（触发 MusicHook 的歌词 watcher）
|
||||
music.playLoading = true;
|
||||
playerCore.playMusic = music;
|
||||
updateDocumentTitle(music);
|
||||
|
||||
const originalMusic = { ...music };
|
||||
|
||||
// 5. 添加到播放历史
|
||||
try {
|
||||
const playHistoryStore = await getPlayHistoryStore();
|
||||
if (music.isPodcast) {
|
||||
if (music.program) {
|
||||
playHistoryStore.addPodcast(music.program);
|
||||
}
|
||||
} else {
|
||||
playHistoryStore.addMusic(music);
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn('[playbackController] 添加播放历史失败:', e);
|
||||
}
|
||||
|
||||
// 6. 获取歌曲详情（解析 URL）
|
||||
try {
|
||||
const { getSongDetail } = useSongDetail();
|
||||
const updatedPlayMusic = await getSongDetail(originalMusic, requestId);
|
||||
|
||||
// 检查 generation
|
||||
if (gen !== generation) {
|
||||
console.log(`[playbackController] gen=${gen} 已过期（获取详情后），当前 gen=${generation}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
updatedPlayMusic.lyric = music.lyric;
|
||||
playerCore.playMusic = updatedPlayMusic;
|
||||
playerCore.playMusicUrl = updatedPlayMusic.playMusicUrl as string;
|
||||
music.playMusicUrl = updatedPlayMusic.playMusicUrl as string;
|
||||
} catch (error) {
|
||||
if (gen !== generation) return false;
|
||||
console.error('[playbackController] 获取歌曲详情失败:', error);
|
||||
message.error(i18n.global.t('player.playFailed'));
|
||||
if (playerCore.playMusic) {
|
||||
playerCore.playMusic.playLoading = false;
|
||||
}
|
||||
playbackRequestManager.failRequest(requestId);
|
||||
return false;
|
||||
}
|
||||
|
||||
// 7. 触发预加载下一首（异步，不阻塞）
|
||||
triggerPreload(playerCore.playMusic);
|
||||
|
||||
// 8. 加载并播放音频
|
||||
try {
|
||||
const success = await loadAndPlayAudio(playerCore.playMusic, shouldPlay);
|
||||
|
||||
// 检查 generation
|
||||
if (gen !== generation) {
|
||||
console.log(`[playbackController] gen=${gen} 已过期（播放音频后），当前 gen=${generation}`);
|
||||
audioService.stop();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (success) {
|
||||
// 9. 播放成功
|
||||
playerCore.playMusic.playLoading = false;
|
||||
playerCore.playMusic.isFirstPlay = false;
|
||||
playbackRequestManager.completeRequest(requestId);
|
||||
console.log(`[playbackController] gen=${gen} 播放成功: ${music.name}`);
|
||||
return true;
|
||||
} else {
|
||||
playbackRequestManager.failRequest(requestId);
|
||||
return false;
|
||||
}
|
||||
} catch (error) {
|
||||
// 10. 播放失败
|
||||
if (gen !== generation) {
|
||||
console.log(`[playbackController] gen=${gen} 已过期（播放异常），静默返回`);
|
||||
return false;
|
||||
}
|
||||
|
||||
console.error('[playbackController] 播放音频失败:', error);
|
||||
|
||||
const errorMsg = error instanceof Error ? error.message : String(error);
|
||||
|
||||
// 操作锁错误：强制重置后重试一次
|
||||
if (errorMsg.includes('操作锁激活')) {
|
||||
try {
|
||||
audioService.forceResetOperationLock();
|
||||
console.log('[playbackController] 已强制重置操作锁');
|
||||
} catch (e) {
|
||||
console.error('[playbackController] 重置操作锁失败:', e);
|
||||
}
|
||||
}
|
||||
|
||||
message.error(i18n.global.t('player.playFailed'));
|
||||
if (playerCore.playMusic) {
|
||||
playerCore.playMusic.playLoading = false;
|
||||
}
|
||||
playerCore.setIsPlay(false);
|
||||
playbackRequestManager.failRequest(requestId);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 使用指定音源重新解析当前歌曲
|
||||
*
|
||||
* @param sourcePlatform 目标音源平台
|
||||
* @param isAuto 是否为自动切换
|
||||
* @returns 是否成功
|
||||
*/
|
||||
export const reparseCurrentSong = async (
|
||||
sourcePlatform: Platform,
|
||||
isAuto: boolean = false
|
||||
): Promise<boolean> => {
|
||||
try {
|
||||
const playerCore = await getPlayerCoreStore();
|
||||
const currentSong = playerCore.playMusic;
|
||||
|
||||
if (!currentSong || !currentSong.id) {
|
||||
console.warn('[playbackController] 没有有效的播放对象');
|
||||
return false;
|
||||
}
|
||||
|
||||
// 使用 SongSourceConfigManager 保存配置
|
||||
SongSourceConfigManager.setConfig(currentSong.id, [sourcePlatform], isAuto ? 'auto' : 'manual');
|
||||
|
||||
const currentSound = audioService.getCurrentSound();
|
||||
if (currentSound) {
|
||||
currentSound.pause();
|
||||
}
|
||||
|
||||
const numericId =
|
||||
typeof currentSong.id === 'string' ? parseInt(currentSong.id, 10) : currentSong.id;
|
||||
|
||||
console.log(`[playbackController] 使用音源 ${sourcePlatform} 重新解析歌曲 ${numericId}`);
|
||||
|
||||
const songData = cloneDeep(currentSong);
|
||||
const res = await getParsingMusicUrl(numericId, songData);
|
||||
|
||||
if (res && res.data && res.data.data && res.data.data.url) {
|
||||
const newUrl = res.data.data.url;
|
||||
console.log(`[playbackController] 解析成功，获取新URL: ${newUrl.substring(0, 50)}...`);
|
||||
|
||||
const updatedMusic: SongResult = {
|
||||
...currentSong,
|
||||
playMusicUrl: newUrl,
|
||||
expiredAt: Date.now() + 1800000
|
||||
};
|
||||
|
||||
await playTrack(updatedMusic, true);
|
||||
|
||||
// 更新播放列表中的歌曲信息
|
||||
const playlistStore = await getPlaylistStore();
|
||||
playlistStore.updateSong(updatedMusic);
|
||||
|
||||
return true;
|
||||
} else {
|
||||
console.warn(`[playbackController] 使用音源 ${sourcePlatform} 解析失败`);
|
||||
return false;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('[playbackController] 重新解析失败:', error);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 设置 URL 过期事件处理器
|
||||
* 监听 audioService 的 url_expired 事件，自动重新获取 URL 并恢复播放
|
||||
*/
|
||||
export const setupUrlExpiredHandler = (): void => {
|
||||
audioService.on('url_expired', async (expiredTrack: SongResult) => {
|
||||
if (!expiredTrack) return;
|
||||
|
||||
console.log('[playbackController] 检测到URL过期事件，准备重新获取URL', expiredTrack.name);
|
||||
|
||||
const playerCore = await getPlayerCoreStore();
|
||||
|
||||
// 只在用户有播放意图或正在播放时处理
|
||||
if (!playerCore.userPlayIntent && !playerCore.play) {
|
||||
console.log('[playbackController] 用户无播放意图，跳过URL过期处理');
|
||||
return;
|
||||
}
|
||||
|
||||
// 保存当前播放位置
|
||||
const currentSound = audioService.getCurrentSound();
|
||||
let seekPosition = 0;
|
||||
if (currentSound) {
|
||||
try {
|
||||
seekPosition = currentSound.currentTime;
|
||||
const duration = currentSound.duration;
|
||||
if (duration > 0 && seekPosition > 0 && duration - seekPosition < 5) {
|
||||
console.log('[playbackController] 歌曲接近末尾，跳过URL过期处理');
|
||||
return;
|
||||
}
|
||||
} catch {
|
||||
// 静默忽略
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
const trackToPlay: SongResult = {
|
||||
...expiredTrack,
|
||||
isFirstPlay: true,
|
||||
playMusicUrl: undefined
|
||||
};
|
||||
|
||||
const success = await playTrack(trackToPlay, true);
|
||||
|
||||
if (success) {
|
||||
// 恢复播放位置
|
||||
if (seekPosition > 0) {
|
||||
// 延迟一小段时间确保音频已就绪
|
||||
setTimeout(() => {
|
||||
try {
|
||||
audioService.seek(seekPosition);
|
||||
} catch {
|
||||
console.warn('[playbackController] 恢复播放位置失败');
|
||||
}
|
||||
}, 300);
|
||||
}
|
||||
message.success(i18n.global.t('player.autoResumed') || '已自动恢复播放');
|
||||
} else {
|
||||
// 检查歌曲是否仍然是当前歌曲
|
||||
const currentPlayerCore = await getPlayerCoreStore();
|
||||
if (currentPlayerCore.playMusic?.id === expiredTrack.id) {
|
||||
message.error(i18n.global.t('player.resumeFailed') || '恢复播放失败，请手动点击播放');
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('[playbackController] 处理URL过期事件失败:', error);
|
||||
message.error(i18n.global.t('player.resumeFailed') || '恢复播放失败，请手动点击播放');
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 初始化播放状态
|
||||
* 应用启动时恢复上次的播放状态
|
||||
*/
|
||||
export const initializePlayState = async (): Promise<void> => {
|
||||
const playerCore = await getPlayerCoreStore();
|
||||
const settingsStore = await getSettingsStore();
|
||||
|
||||
if (!playerCore.playMusic || Object.keys(playerCore.playMusic).length === 0) {
|
||||
console.log('[playbackController] 没有保存的播放状态，跳过初始化');
|
||||
// 设置播放速率
|
||||
setTimeout(() => {
|
||||
audioService.setPlaybackRate(playerCore.playbackRate);
|
||||
}, 2000);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
console.log('[playbackController] 恢复上次播放的音乐:', playerCore.playMusic.name);
|
||||
const isPlaying = settingsStore.setData.autoPlay;
|
||||
|
||||
if (!isPlaying) {
|
||||
// 自动播放禁用：仅加载元数据，不播放
|
||||
console.log('[playbackController] 自动播放已禁用，仅加载元数据');
|
||||
|
||||
try {
|
||||
const { lyrics, backgroundColor, primaryColor } = await loadMetadata(playerCore.playMusic);
|
||||
playerCore.playMusic.lyric = lyrics;
|
||||
playerCore.playMusic.backgroundColor = backgroundColor;
|
||||
playerCore.playMusic.primaryColor = primaryColor;
|
||||
} catch (e) {
|
||||
console.warn('[playbackController] 加载元数据失败:', e);
|
||||
}
|
||||
|
||||
playerCore.play = false;
|
||||
playerCore.isPlay = false;
|
||||
playerCore.userPlayIntent = false;
|
||||
|
||||
updateDocumentTitle(playerCore.playMusic);
|
||||
|
||||
// 恢复上次保存的播放进度（仅UI显示）
|
||||
try {
|
||||
const savedProgress = JSON.parse(localStorage.getItem('playProgress') || '{}');
|
||||
if (savedProgress.songId === playerCore.playMusic.id && savedProgress.progress > 0) {
|
||||
const { nowTime, allTime } = await import('@/hooks/MusicHook');
|
||||
nowTime.value = savedProgress.progress;
|
||||
// 用歌曲时长设置 allTime（dt 单位是毫秒）
|
||||
if (playerCore.playMusic.dt) {
|
||||
allTime.value = playerCore.playMusic.dt / 1000;
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn('[playbackController] 恢复播放进度失败:', e);
|
||||
}
|
||||
} else {
|
||||
// 自动播放启用：调用 playTrack 恢复播放
|
||||
// 本地音乐（local:// 协议）不需要重新获取 URL，保留原始路径
|
||||
const isLocalMusic = playerCore.playMusic.playMusicUrl?.startsWith('local://');
|
||||
|
||||
await playTrack(
|
||||
{
|
||||
...playerCore.playMusic,
|
||||
isFirstPlay: true,
|
||||
playMusicUrl: isLocalMusic ? playerCore.playMusic.playMusicUrl : undefined
|
||||
},
|
||||
true
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('[playbackController] 恢复播放状态失败:', error);
|
||||
playerCore.play = false;
|
||||
playerCore.isPlay = false;
|
||||
playerCore.playMusic = {} as SongResult;
|
||||
playerCore.playMusicUrl = '';
|
||||
}
|
||||
|
||||
// 延迟设置播放速率
|
||||
setTimeout(() => {
|
||||
audioService.setPlaybackRate(playerCore.playbackRate);
|
||||
}, 2000);
|
||||
};
|
||||
@@ -1,208 +1,51 @@
|
||||
/**
|
||||
* 播放请求管理器
|
||||
* 负责管理播放请求的队列、取消、状态跟踪，防止竞态条件
|
||||
* 薄请求 ID 追踪器
|
||||
* 用于 usePlayerHooks.ts 内部检查请求是否仍为最新。
|
||||
* 实际的取消逻辑在 playbackController.ts 中（generation ID）。
|
||||
*/
|
||||
|
||||
import type { SongResult } from '@/types/music';
|
||||
|
||||
/**
|
||||
* 请求状态枚举
|
||||
*/
|
||||
export enum RequestStatus {
|
||||
PENDING = 'pending',
|
||||
ACTIVE = 'active',
|
||||
COMPLETED = 'completed',
|
||||
CANCELLED = 'cancelled',
|
||||
FAILED = 'failed'
|
||||
}
|
||||
|
||||
/**
|
||||
* 播放请求接口
|
||||
*/
|
||||
export interface PlaybackRequest {
|
||||
id: string;
|
||||
song: SongResult;
|
||||
status: RequestStatus;
|
||||
timestamp: number;
|
||||
abortController?: AbortController;
|
||||
}
|
||||
|
||||
/**
|
||||
* 播放请求管理器类
|
||||
*/
|
||||
class PlaybackRequestManager {
|
||||
private currentRequestId: string | null = null;
|
||||
private requestMap: Map<string, PlaybackRequest> = new Map();
|
||||
private requestCounter = 0;
|
||||
private counter = 0;
|
||||
|
||||
/**
|
||||
* 生成唯一的请求ID
|
||||
*/
|
||||
private generateRequestId(): string {
|
||||
return `playback_${Date.now()}_${++this.requestCounter}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建新的播放请求
|
||||
* @param song 要播放的歌曲
|
||||
* @returns 新请求的ID
|
||||
* 创建新请求，使之前的请求失效
|
||||
*/
|
||||
createRequest(song: SongResult): string {
|
||||
// 取消所有之前的请求
|
||||
this.cancelAllRequests();
|
||||
|
||||
const requestId = this.generateRequestId();
|
||||
const abortController = new AbortController();
|
||||
|
||||
const request: PlaybackRequest = {
|
||||
id: requestId,
|
||||
song,
|
||||
status: RequestStatus.PENDING,
|
||||
timestamp: Date.now(),
|
||||
abortController
|
||||
};
|
||||
|
||||
this.requestMap.set(requestId, request);
|
||||
const requestId = `req_${Date.now()}_${++this.counter}`;
|
||||
this.currentRequestId = requestId;
|
||||
|
||||
console.log(`[PlaybackRequestManager] 创建新请求: ${requestId}, 歌曲: ${song.name}`);
|
||||
|
||||
console.log(`[RequestManager] 新请求: ${requestId}, 歌曲: ${song.name}`);
|
||||
return requestId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 激活请求（标记为正在处理）
|
||||
* @param requestId 请求ID
|
||||
* 检查请求是否仍为当前请求
|
||||
*/
|
||||
activateRequest(requestId: string): boolean {
|
||||
const request = this.requestMap.get(requestId);
|
||||
if (!request) {
|
||||
console.warn(`[PlaybackRequestManager] 请求不存在: ${requestId}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (request.status === RequestStatus.CANCELLED) {
|
||||
console.warn(`[PlaybackRequestManager] 请求已被取消: ${requestId}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
request.status = RequestStatus.ACTIVE;
|
||||
console.log(`[PlaybackRequestManager] 激活请求: ${requestId}`);
|
||||
return true;
|
||||
isRequestValid(requestId: string): boolean {
|
||||
return this.currentRequestId === requestId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 完成请求
|
||||
* @param requestId 请求ID
|
||||
* 激活请求（兼容旧调用，直接返回 isRequestValid 结果）
|
||||
*/
|
||||
activateRequest(requestId: string): boolean {
|
||||
return this.isRequestValid(requestId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 标记请求完成
|
||||
*/
|
||||
completeRequest(requestId: string): void {
|
||||
const request = this.requestMap.get(requestId);
|
||||
if (!request) {
|
||||
return;
|
||||
}
|
||||
|
||||
request.status = RequestStatus.COMPLETED;
|
||||
console.log(`[PlaybackRequestManager] 完成请求: ${requestId}`);
|
||||
|
||||
// 清理旧请求（保留最近3个）
|
||||
this.cleanupOldRequests();
|
||||
console.log(`[RequestManager] 完成: ${requestId}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* 标记请求失败
|
||||
* @param requestId 请求ID
|
||||
*/
|
||||
failRequest(requestId: string): void {
|
||||
const request = this.requestMap.get(requestId);
|
||||
if (!request) {
|
||||
return;
|
||||
}
|
||||
|
||||
request.status = RequestStatus.FAILED;
|
||||
console.log(`[PlaybackRequestManager] 请求失败: ${requestId}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消指定请求
|
||||
* @param requestId 请求ID
|
||||
*/
|
||||
cancelRequest(requestId: string): void {
|
||||
const request = this.requestMap.get(requestId);
|
||||
if (!request) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (request.status === RequestStatus.CANCELLED) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 取消AbortController
|
||||
if (request.abortController && !request.abortController.signal.aborted) {
|
||||
request.abortController.abort();
|
||||
}
|
||||
|
||||
request.status = RequestStatus.CANCELLED;
|
||||
console.log(`[PlaybackRequestManager] 取消请求: ${requestId}, 歌曲: ${request.song.name}`);
|
||||
|
||||
// 如果是当前请求，清除当前请求ID
|
||||
if (this.currentRequestId === requestId) {
|
||||
this.currentRequestId = null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消所有请求
|
||||
*/
|
||||
cancelAllRequests(): void {
|
||||
console.log(`[PlaybackRequestManager] 取消所有请求，当前请求数: ${this.requestMap.size}`);
|
||||
|
||||
this.requestMap.forEach((request) => {
|
||||
if (
|
||||
request.status !== RequestStatus.COMPLETED &&
|
||||
request.status !== RequestStatus.CANCELLED
|
||||
) {
|
||||
this.cancelRequest(request.id);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查请求是否仍然有效（是当前活动请求）
|
||||
* @param requestId 请求ID
|
||||
* @returns 是否有效
|
||||
*/
|
||||
isRequestValid(requestId: string): boolean {
|
||||
// 检查是否是当前请求
|
||||
if (this.currentRequestId !== requestId) {
|
||||
console.warn(
|
||||
`[PlaybackRequestManager] 请求已过期: ${requestId}, 当前请求: ${this.currentRequestId}`
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
const request = this.requestMap.get(requestId);
|
||||
if (!request) {
|
||||
console.warn(`[PlaybackRequestManager] 请求不存在: ${requestId}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// 检查请求状态
|
||||
if (request.status === RequestStatus.CANCELLED) {
|
||||
console.warn(`[PlaybackRequestManager] 请求已被取消: ${requestId}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查请求是否应该中止（用于 AbortController）
|
||||
* @param requestId 请求ID
|
||||
* @returns AbortSignal 或 undefined
|
||||
*/
|
||||
getAbortSignal(requestId: string): AbortSignal | undefined {
|
||||
const request = this.requestMap.get(requestId);
|
||||
return request?.abortController?.signal;
|
||||
console.log(`[RequestManager] 失败: ${requestId}`);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -211,84 +54,6 @@ class PlaybackRequestManager {
|
||||
getCurrentRequestId(): string | null {
|
||||
return this.currentRequestId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取请求信息
|
||||
* @param requestId 请求ID
|
||||
*/
|
||||
getRequest(requestId: string): PlaybackRequest | undefined {
|
||||
return this.requestMap.get(requestId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理旧请求（保留最近3个）
|
||||
*/
|
||||
private cleanupOldRequests(): void {
|
||||
if (this.requestMap.size <= 3) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 按时间戳排序，保留最新的3个
|
||||
const sortedRequests = Array.from(this.requestMap.values()).sort(
|
||||
(a, b) => b.timestamp - a.timestamp
|
||||
);
|
||||
|
||||
const toKeep = new Set(sortedRequests.slice(0, 3).map((r) => r.id));
|
||||
const toDelete: string[] = [];
|
||||
|
||||
this.requestMap.forEach((_, id) => {
|
||||
if (!toKeep.has(id)) {
|
||||
toDelete.push(id);
|
||||
}
|
||||
});
|
||||
|
||||
toDelete.forEach((id) => {
|
||||
this.requestMap.delete(id);
|
||||
});
|
||||
|
||||
if (toDelete.length > 0) {
|
||||
console.log(`[PlaybackRequestManager] 清理了 ${toDelete.length} 个旧请求`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 重置管理器（用于调试或特殊情况）
|
||||
*/
|
||||
reset(): void {
|
||||
console.log('[PlaybackRequestManager] 重置管理器');
|
||||
this.cancelAllRequests();
|
||||
this.requestMap.clear();
|
||||
this.currentRequestId = null;
|
||||
this.requestCounter = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取调试信息
|
||||
*/
|
||||
getDebugInfo(): {
|
||||
currentRequestId: string | null;
|
||||
totalRequests: number;
|
||||
requestsByStatus: Record<string, number>;
|
||||
} {
|
||||
const requestsByStatus: Record<string, number> = {
|
||||
[RequestStatus.PENDING]: 0,
|
||||
[RequestStatus.ACTIVE]: 0,
|
||||
[RequestStatus.COMPLETED]: 0,
|
||||
[RequestStatus.CANCELLED]: 0,
|
||||
[RequestStatus.FAILED]: 0
|
||||
};
|
||||
|
||||
this.requestMap.forEach((request) => {
|
||||
requestsByStatus[request.status]++;
|
||||
});
|
||||
|
||||
return {
|
||||
currentRequestId: this.currentRequestId,
|
||||
totalRequests: this.requestMap.size,
|
||||
requestsByStatus
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// 导出单例实例
|
||||
export const playbackRequestManager = new PlaybackRequestManager();
|
||||
|
||||
@@ -1,152 +1,150 @@
|
||||
import { Howl } from 'howler';
|
||||
|
||||
import type { SongResult } from '@/types/music';
|
||||
|
||||
/**
|
||||
* 预加载服务
|
||||
*
|
||||
* 新架构下 audioService 使用单一 HTMLAudioElement（换歌改 src），
|
||||
* 不再需要预创建 Howl 实例。PreloadService 改为验证 URL 可用性并缓存元数据。
|
||||
*/
|
||||
class PreloadService {
|
||||
private loadingPromises: Map<string | number, Promise<Howl>> = new Map();
|
||||
private preloadedSounds: Map<string | number, Howl> = new Map();
|
||||
private validatedUrls: Map<string | number, string> = new Map();
|
||||
private loadingPromises: Map<string | number, Promise<string>> = new Map();
|
||||
|
||||
/**
|
||||
* 加载并验证音频
|
||||
* 如果已经在加载中，返回现有的 Promise
|
||||
* 如果已经加载完成，返回缓存的 Howl 实例
|
||||
* 验证歌曲 URL 可用性
|
||||
* 通过 HEAD 请求检查 URL 是否可访问，并缓存验证结果
|
||||
*/
|
||||
public async load(song: SongResult): Promise<Howl> {
|
||||
public async load(song: SongResult): Promise<string> {
|
||||
if (!song || !song.id) {
|
||||
throw new Error('无效的歌曲对象');
|
||||
}
|
||||
|
||||
// 1. 检查是否有正在进行的加载
|
||||
if (!song.playMusicUrl) {
|
||||
throw new Error('歌曲没有 URL');
|
||||
}
|
||||
|
||||
// 已验证过的 URL
|
||||
if (this.validatedUrls.has(song.id)) {
|
||||
console.log(`[PreloadService] 歌曲 ${song.name} URL 已验证，直接使用`);
|
||||
return this.validatedUrls.get(song.id)!;
|
||||
}
|
||||
|
||||
// 正在验证中
|
||||
if (this.loadingPromises.has(song.id)) {
|
||||
console.log(`[PreloadService] 歌曲 ${song.name} 正在加载中，复用现有请求`);
|
||||
console.log(`[PreloadService] 歌曲 ${song.name} 正在验证中，复用现有请求`);
|
||||
return this.loadingPromises.get(song.id)!;
|
||||
}
|
||||
|
||||
// 2. 检查是否有已完成的缓存
|
||||
if (this.preloadedSounds.has(song.id)) {
|
||||
const sound = this.preloadedSounds.get(song.id)!;
|
||||
if (sound.state() === 'loaded') {
|
||||
console.log(`[PreloadService] 歌曲 ${song.name} 已预加载完成，直接使用`);
|
||||
return sound;
|
||||
} else {
|
||||
// 如果缓存的音频状态不正常，清理并重新加载
|
||||
this.preloadedSounds.delete(song.id);
|
||||
}
|
||||
}
|
||||
console.log(`[PreloadService] 开始验证歌曲: ${song.name}`);
|
||||
|
||||
// 3. 开始新的加载过程
|
||||
const loadPromise = this._performLoad(song);
|
||||
const url = song.playMusicUrl;
|
||||
const loadPromise = this._validate(url, song);
|
||||
this.loadingPromises.set(song.id, loadPromise);
|
||||
|
||||
try {
|
||||
const sound = await loadPromise;
|
||||
this.preloadedSounds.set(song.id, sound);
|
||||
return sound;
|
||||
const validatedUrl = await loadPromise;
|
||||
this.validatedUrls.set(song.id, validatedUrl);
|
||||
return validatedUrl;
|
||||
} finally {
|
||||
this.loadingPromises.delete(song.id);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行实际的加载和验证逻辑
|
||||
* 验证 URL 可用性（通过创建临时 Audio 元素检测是否可加载）
|
||||
*/
|
||||
private async _performLoad(song: SongResult): Promise<Howl> {
|
||||
console.log(`[PreloadService] 开始加载歌曲: ${song.name}`);
|
||||
private async _validate(url: string, song: SongResult): Promise<string> {
|
||||
return new Promise<string>((resolve, reject) => {
|
||||
const testAudio = new Audio();
|
||||
testAudio.crossOrigin = 'anonymous';
|
||||
testAudio.preload = 'metadata';
|
||||
|
||||
if (!song.playMusicUrl) {
|
||||
throw new Error('歌曲没有 URL');
|
||||
}
|
||||
const cleanup = () => {
|
||||
testAudio.removeEventListener('loadedmetadata', onLoaded);
|
||||
testAudio.removeEventListener('error', onError);
|
||||
testAudio.src = '';
|
||||
testAudio.load();
|
||||
};
|
||||
|
||||
// 创建初始音频实例
|
||||
const sound = await this._createSound(song.playMusicUrl);
|
||||
const onLoaded = () => {
|
||||
// 检查时长
|
||||
const duration = testAudio.duration;
|
||||
const expectedDuration = (song.dt || 0) / 1000;
|
||||
|
||||
// 检查时长
|
||||
const duration = sound.duration();
|
||||
const expectedDuration = (song.dt || 0) / 1000;
|
||||
if (expectedDuration > 0 && duration > 0 && isFinite(duration)) {
|
||||
const durationDiff = Math.abs(duration - expectedDuration);
|
||||
if (duration < expectedDuration * 0.5 && durationDiff > 10) {
|
||||
console.warn(
|
||||
`[PreloadService] 时长严重不足：实际 ${duration.toFixed(1)}s, 预期 ${expectedDuration.toFixed(1)}s (${song.name})，可能是试听版`
|
||||
);
|
||||
window.dispatchEvent(
|
||||
new CustomEvent('audio-duration-mismatch', {
|
||||
detail: {
|
||||
songId: song.id,
|
||||
songName: song.name,
|
||||
actualDuration: duration,
|
||||
expectedDuration
|
||||
}
|
||||
})
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (expectedDuration > 0 && duration > 0) {
|
||||
const durationDiff = Math.abs(duration - expectedDuration);
|
||||
// 如果实际时长远小于预期（可能是试听版），记录警告
|
||||
if (duration < expectedDuration * 0.5 && durationDiff > 10) {
|
||||
console.warn(
|
||||
`[PreloadService] 时长严重不足：实际 ${duration.toFixed(1)}s, 预期 ${expectedDuration.toFixed(1)}s (${song.name})，可能是试听版`
|
||||
);
|
||||
// 通过自定义事件通知上层，可用于后续自动切换音源
|
||||
window.dispatchEvent(
|
||||
new CustomEvent('audio-duration-mismatch', {
|
||||
detail: {
|
||||
songId: song.id,
|
||||
songName: song.name,
|
||||
actualDuration: duration,
|
||||
expectedDuration
|
||||
}
|
||||
})
|
||||
);
|
||||
} else if (durationDiff > 5) {
|
||||
console.warn(
|
||||
`[PreloadService] 时长差异警告：实际 ${duration.toFixed(1)}s, 预期 ${expectedDuration.toFixed(1)}s (${song.name})`
|
||||
);
|
||||
}
|
||||
}
|
||||
cleanup();
|
||||
resolve(url);
|
||||
};
|
||||
|
||||
return sound;
|
||||
}
|
||||
const onError = () => {
|
||||
cleanup();
|
||||
reject(new Error(`URL 验证失败: ${song.name}`));
|
||||
};
|
||||
|
||||
private _createSound(url: string): Promise<Howl> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const sound = new Howl({
|
||||
src: [url],
|
||||
html5: true,
|
||||
preload: true,
|
||||
autoplay: false,
|
||||
onload: () => resolve(sound),
|
||||
onloaderror: (_, err) => reject(err)
|
||||
});
|
||||
testAudio.addEventListener('loadedmetadata', onLoaded);
|
||||
testAudio.addEventListener('error', onError);
|
||||
testAudio.src = url;
|
||||
testAudio.load();
|
||||
|
||||
// 5秒超时
|
||||
setTimeout(() => {
|
||||
cleanup();
|
||||
// 超时不算失败，URL 可能是可用的只是服务器慢
|
||||
resolve(url);
|
||||
}, 5000);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消特定歌曲的预加载（如果可能）
|
||||
* 注意：Promise 无法真正取消，但我们可以清理结果
|
||||
* 消耗已验证的 URL（从缓存移除）
|
||||
*/
|
||||
public cancel(songId: string | number) {
|
||||
if (this.preloadedSounds.has(songId)) {
|
||||
const sound = this.preloadedSounds.get(songId)!;
|
||||
sound.unload();
|
||||
this.preloadedSounds.delete(songId);
|
||||
}
|
||||
// loadingPromises 中的任务会继续执行，但因为 preloadedSounds 中没有记录，
|
||||
// 下次请求时会重新加载（或者我们可以让 _performLoad 检查一个取消标记，但这增加了复杂性）
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取已预加载的音频实例（如果存在）
|
||||
*/
|
||||
public getPreloadedSound(songId: string | number): Howl | undefined {
|
||||
return this.preloadedSounds.get(songId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 消耗（使用）已预加载的音频
|
||||
* 从缓存中移除但不 unload（由调用方管理生命周期）
|
||||
* @returns 预加载的 Howl 实例，如果没有则返回 undefined
|
||||
*/
|
||||
public consume(songId: string | number): Howl | undefined {
|
||||
const sound = this.preloadedSounds.get(songId);
|
||||
if (sound) {
|
||||
this.preloadedSounds.delete(songId);
|
||||
console.log(`[PreloadService] 消耗预加载的歌曲: ${songId}`);
|
||||
return sound;
|
||||
public consume(songId: string | number): string | undefined {
|
||||
const url = this.validatedUrls.get(songId);
|
||||
if (url) {
|
||||
this.validatedUrls.delete(songId);
|
||||
console.log(`[PreloadService] 消耗预验证的歌曲: ${songId}`);
|
||||
return url;
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理所有预加载资源
|
||||
* 取消预加载
|
||||
*/
|
||||
public cancel(songId: string | number) {
|
||||
this.validatedUrls.delete(songId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取已验证的 URL
|
||||
*/
|
||||
public getPreloadedSound(songId: string | number): string | undefined {
|
||||
return this.validatedUrls.get(songId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理所有缓存
|
||||
*/
|
||||
public clearAll() {
|
||||
this.preloadedSounds.forEach((sound) => sound.unload());
|
||||
this.preloadedSounds.clear();
|
||||
this.validatedUrls.clear();
|
||||
this.loadingPromises.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,11 +28,9 @@ export const useIntelligenceModeStore = defineStore('intelligenceMode', () => {
|
||||
*/
|
||||
const playIntelligenceMode = async () => {
|
||||
const { useUserStore } = await import('./user');
|
||||
const { usePlayerCoreStore } = await import('./playerCore');
|
||||
const { usePlaylistStore } = await import('./playlist');
|
||||
|
||||
const userStore = useUserStore();
|
||||
const playerCore = usePlayerCoreStore();
|
||||
const playlistStore = usePlaylistStore();
|
||||
const { t } = i18n.global;
|
||||
|
||||
@@ -101,7 +99,8 @@ export const useIntelligenceModeStore = defineStore('intelligenceMode', () => {
|
||||
|
||||
// 替换播放列表并开始播放
|
||||
playlistStore.setPlayList(intelligenceSongs, false, true);
|
||||
await playerCore.handlePlayMusic(intelligenceSongs[0], true);
|
||||
const { playTrack } = await import('@/services/playbackController');
|
||||
await playTrack(intelligenceSongs[0], true);
|
||||
} else {
|
||||
message.error(t('player.playBar.intelligenceMode.failed'));
|
||||
}
|
||||
|
||||
@@ -75,7 +75,8 @@ export const usePlayerStore = defineStore('player', () => {
|
||||
const playHistoryStore = usePlayHistoryStore();
|
||||
playHistoryStore.migrateFromLocalStorage();
|
||||
|
||||
await playerCore.initializePlayState();
|
||||
const { initializePlayState: initPlayState } = await import('@/services/playbackController');
|
||||
await initPlayState();
|
||||
await playlist.initializePlaylist();
|
||||
};
|
||||
|
||||
@@ -112,11 +113,7 @@ export const usePlayerStore = defineStore('player', () => {
|
||||
getVolume: playerCore.getVolume,
|
||||
increaseVolume: playerCore.increaseVolume,
|
||||
decreaseVolume: playerCore.decreaseVolume,
|
||||
handlePlayMusic: playerCore.handlePlayMusic,
|
||||
playAudio: playerCore.playAudio,
|
||||
handlePause: playerCore.handlePause,
|
||||
checkPlaybackState: playerCore.checkPlaybackState,
|
||||
reparseCurrentSong: playerCore.reparseCurrentSong,
|
||||
|
||||
// ========== 播放列表管理 (Playlist) ==========
|
||||
playList,
|
||||
|
||||
@@ -1,23 +1,9 @@
|
||||
import { cloneDeep } from 'lodash';
|
||||
import { createDiscreteApi } from 'naive-ui';
|
||||
import { defineStore } from 'pinia';
|
||||
import { computed, ref } from 'vue';
|
||||
|
||||
import i18n from '@/../i18n/renderer';
|
||||
import { getParsingMusicUrl } from '@/api/music';
|
||||
import { useLyrics, useSongDetail } from '@/hooks/usePlayerHooks';
|
||||
import { audioService } from '@/services/audioService';
|
||||
import { playbackRequestManager } from '@/services/playbackRequestManager';
|
||||
import { preloadService } from '@/services/preloadService';
|
||||
import { SongSourceConfigManager } from '@/services/SongSourceConfigManager';
|
||||
import type { AudioOutputDevice } from '@/types/audio';
|
||||
import type { Platform, SongResult } from '@/types/music';
|
||||
import { getImgUrl } from '@/utils';
|
||||
import { getImageLinearBackground } from '@/utils/linearColor';
|
||||
|
||||
import { usePlayHistoryStore } from './playHistory';
|
||||
|
||||
const { message } = createDiscreteApi(['message']);
|
||||
import type { SongResult } from '@/types/music';
|
||||
|
||||
/**
|
||||
* 核心播放控制 Store
|
||||
@@ -43,10 +29,6 @@ export const usePlayerCoreStore = defineStore(
|
||||
);
|
||||
const availableAudioDevices = ref<AudioOutputDevice[]>([]);
|
||||
|
||||
let checkPlayTime: NodeJS.Timeout | null = null;
|
||||
let checkPlaybackRetryCount = 0;
|
||||
const MAX_CHECKPLAYBACK_RETRIES = 3;
|
||||
|
||||
// ==================== Computed ====================
|
||||
const currentSong = computed(() => playMusic.value);
|
||||
const isPlaying = computed(() => isPlay.value);
|
||||
@@ -109,413 +91,6 @@ export const usePlayerCoreStore = defineStore(
|
||||
return newVolume;
|
||||
};
|
||||
|
||||
/**
|
||||
* 播放状态检测
|
||||
* 在播放开始后延迟检查音频是否真正在播放，防止无声播放
|
||||
*/
|
||||
const checkPlaybackState = (song: SongResult, requestId?: string, timeout: number = 6000) => {
|
||||
if (checkPlayTime) {
|
||||
clearTimeout(checkPlayTime);
|
||||
}
|
||||
const sound = audioService.getCurrentSound();
|
||||
if (!sound) return;
|
||||
|
||||
// 如果没有提供 requestId，创建一个临时标识
|
||||
const actualRequestId = requestId || `check_${Date.now()}`;
|
||||
|
||||
const onPlayHandler = () => {
|
||||
console.log(`[${actualRequestId}] 播放事件触发，歌曲成功开始播放`);
|
||||
audioService.off('play', onPlayHandler);
|
||||
audioService.off('playerror', onPlayErrorHandler);
|
||||
checkPlaybackRetryCount = 0; // 播放成功，重置重试计数
|
||||
if (checkPlayTime) {
|
||||
clearTimeout(checkPlayTime);
|
||||
checkPlayTime = null;
|
||||
}
|
||||
};
|
||||
|
||||
const onPlayErrorHandler = async () => {
|
||||
console.log('播放错误事件触发，检查是否需要重新获取URL');
|
||||
audioService.off('play', onPlayHandler);
|
||||
audioService.off('playerror', onPlayErrorHandler);
|
||||
|
||||
// 如果有 requestId，验证其有效性
|
||||
if (requestId && !playbackRequestManager.isRequestValid(requestId)) {
|
||||
console.log('请求已过期，跳过重试');
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查重试次数限制
|
||||
if (checkPlaybackRetryCount >= MAX_CHECKPLAYBACK_RETRIES) {
|
||||
console.warn(`播放重试已达上限 (${MAX_CHECKPLAYBACK_RETRIES} 次)，停止重试`);
|
||||
checkPlaybackRetryCount = 0;
|
||||
setPlayMusic(false);
|
||||
return;
|
||||
}
|
||||
|
||||
if (userPlayIntent.value && play.value) {
|
||||
checkPlaybackRetryCount++;
|
||||
console.log(
|
||||
`播放失败，尝试刷新URL并重新播放 (重试 ${checkPlaybackRetryCount}/${MAX_CHECKPLAYBACK_RETRIES})`
|
||||
);
|
||||
// 本地音乐不需要刷新 URL
|
||||
if (!playMusic.value.playMusicUrl?.startsWith('local://')) {
|
||||
playMusic.value.playMusicUrl = undefined;
|
||||
}
|
||||
const refreshedSong = { ...song, isFirstPlay: true };
|
||||
await handlePlayMusic(refreshedSong, true);
|
||||
}
|
||||
};
|
||||
|
||||
audioService.on('play', onPlayHandler);
|
||||
audioService.on('playerror', onPlayErrorHandler);
|
||||
|
||||
checkPlayTime = setTimeout(() => {
|
||||
// 如果有 requestId，验证其有效性
|
||||
if (requestId && !playbackRequestManager.isRequestValid(requestId)) {
|
||||
console.log('请求已过期，跳过超时重试');
|
||||
audioService.off('play', onPlayHandler);
|
||||
audioService.off('playerror', onPlayErrorHandler);
|
||||
return;
|
||||
}
|
||||
|
||||
// 双重确认：Howler 报告未播放 + 用户仍想播放
|
||||
// 额外检查底层 HTMLAudioElement 的状态，避免 EQ 重建期间的误判
|
||||
const currentSound = audioService.getCurrentSound();
|
||||
let htmlPlaying = false;
|
||||
if (currentSound) {
|
||||
try {
|
||||
const sounds = (currentSound as any)._sounds as any[];
|
||||
if (sounds?.[0]?._node instanceof HTMLMediaElement) {
|
||||
const node = sounds[0]._node as HTMLMediaElement;
|
||||
htmlPlaying = !node.paused && !node.ended && node.readyState > 2;
|
||||
}
|
||||
} catch {
|
||||
// 静默忽略
|
||||
}
|
||||
}
|
||||
|
||||
if (htmlPlaying) {
|
||||
// 底层 HTMLAudioElement 实际在播放，不需要重试
|
||||
console.log('底层音频元素正在播放，跳过超时重试');
|
||||
audioService.off('play', onPlayHandler);
|
||||
audioService.off('playerror', onPlayErrorHandler);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!audioService.isActuallyPlaying() && userPlayIntent.value && play.value) {
|
||||
audioService.off('play', onPlayHandler);
|
||||
audioService.off('playerror', onPlayErrorHandler);
|
||||
|
||||
// 检查重试次数限制
|
||||
if (checkPlaybackRetryCount >= MAX_CHECKPLAYBACK_RETRIES) {
|
||||
console.warn(`超时重试已达上限 (${MAX_CHECKPLAYBACK_RETRIES} 次)，停止重试`);
|
||||
checkPlaybackRetryCount = 0;
|
||||
setPlayMusic(false);
|
||||
return;
|
||||
}
|
||||
|
||||
checkPlaybackRetryCount++;
|
||||
console.log(
|
||||
`${timeout}ms后歌曲未真正播放，尝试重新获取URL (重试 ${checkPlaybackRetryCount}/${MAX_CHECKPLAYBACK_RETRIES})`
|
||||
);
|
||||
|
||||
// 本地音乐不需要刷新 URL
|
||||
if (!playMusic.value.playMusicUrl?.startsWith('local://')) {
|
||||
playMusic.value.playMusicUrl = undefined;
|
||||
}
|
||||
(async () => {
|
||||
const refreshedSong = { ...song, isFirstPlay: true };
|
||||
await handlePlayMusic(refreshedSong, true);
|
||||
})();
|
||||
} else {
|
||||
audioService.off('play', onPlayHandler);
|
||||
audioService.off('playerror', onPlayErrorHandler);
|
||||
}
|
||||
}, timeout);
|
||||
};
|
||||
|
||||
/**
|
||||
* 核心播放处理函数
|
||||
*/
|
||||
const handlePlayMusic = async (music: SongResult, shouldPlay: boolean = true) => {
|
||||
// 如果是新歌曲，重置已尝试的音源和重试计数
|
||||
if (music.id !== playMusic.value.id) {
|
||||
SongSourceConfigManager.clearTriedSources(music.id);
|
||||
checkPlaybackRetryCount = 0;
|
||||
}
|
||||
|
||||
// 创建新的播放请求并取消之前的所有请求
|
||||
const requestId = playbackRequestManager.createRequest(music);
|
||||
console.log(`[handlePlayMusic] 开始处理歌曲: ${music.name}, 请求ID: ${requestId}`);
|
||||
|
||||
const currentSound = audioService.getCurrentSound();
|
||||
if (currentSound) {
|
||||
console.log('主动停止并卸载当前音频实例');
|
||||
currentSound.stop();
|
||||
currentSound.unload();
|
||||
}
|
||||
|
||||
// 验证请求是否仍然有效
|
||||
if (!playbackRequestManager.isRequestValid(requestId)) {
|
||||
console.log(`[handlePlayMusic] 请求已失效: ${requestId}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// 激活请求
|
||||
if (!playbackRequestManager.activateRequest(requestId)) {
|
||||
console.log(`[handlePlayMusic] 无法激活请求: ${requestId}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
const originalMusic = { ...music };
|
||||
|
||||
const { loadLrc } = useLyrics();
|
||||
const { getSongDetail } = useSongDetail();
|
||||
|
||||
// 并行加载歌词和背景色
|
||||
const [lyrics, { backgroundColor, primaryColor }] = await Promise.all([
|
||||
(async () => {
|
||||
if (music.lyric && music.lyric.lrcTimeArray.length > 0) {
|
||||
return music.lyric;
|
||||
}
|
||||
return await loadLrc(music.id);
|
||||
})(),
|
||||
(async () => {
|
||||
if (music.backgroundColor && music.primaryColor) {
|
||||
return { backgroundColor: music.backgroundColor, primaryColor: music.primaryColor };
|
||||
}
|
||||
return await getImageLinearBackground(getImgUrl(music?.picUrl, '30y30'));
|
||||
})()
|
||||
]);
|
||||
|
||||
// 在更新状态前再次验证请求
|
||||
if (!playbackRequestManager.isRequestValid(requestId)) {
|
||||
console.log(`[handlePlayMusic] 加载歌词/背景色后请求已失效: ${requestId}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// 设置歌词和背景色
|
||||
music.lyric = lyrics;
|
||||
music.backgroundColor = backgroundColor;
|
||||
music.primaryColor = primaryColor;
|
||||
music.playLoading = true;
|
||||
|
||||
// 更新 playMusic 和播放状态
|
||||
playMusic.value = music;
|
||||
play.value = shouldPlay;
|
||||
isPlay.value = shouldPlay;
|
||||
userPlayIntent.value = shouldPlay;
|
||||
|
||||
// 更新标题
|
||||
let title = music.name;
|
||||
if (music.source === 'netease' && music?.song?.artists) {
|
||||
title += ` - ${music.song.artists.reduce(
|
||||
(prev: string, curr: any) => `${prev}${curr.name}/`,
|
||||
''
|
||||
)}`;
|
||||
}
|
||||
document.title = 'AlgerMusic - ' + title;
|
||||
|
||||
try {
|
||||
// 添加到历史记录
|
||||
const playHistoryStore = usePlayHistoryStore();
|
||||
if (music.isPodcast) {
|
||||
if (music.program) {
|
||||
playHistoryStore.addPodcast(music.program);
|
||||
}
|
||||
} else {
|
||||
playHistoryStore.addMusic(music);
|
||||
}
|
||||
|
||||
// 获取歌曲详情
|
||||
const updatedPlayMusic = await getSongDetail(originalMusic, requestId);
|
||||
|
||||
// 在获取详情后再次验证请求
|
||||
if (!playbackRequestManager.isRequestValid(requestId)) {
|
||||
console.log(`[handlePlayMusic] 获取歌曲详情后请求已失效: ${requestId}`);
|
||||
playbackRequestManager.failRequest(requestId);
|
||||
return false;
|
||||
}
|
||||
|
||||
updatedPlayMusic.lyric = lyrics;
|
||||
|
||||
playMusic.value = updatedPlayMusic;
|
||||
playMusicUrl.value = updatedPlayMusic.playMusicUrl as string;
|
||||
music.playMusicUrl = updatedPlayMusic.playMusicUrl as string;
|
||||
|
||||
// 在拆分后补充：触发预加载下一首/下下首（与 playlist store 保持一致）
|
||||
try {
|
||||
const { usePlaylistStore } = await import('./playlist');
|
||||
const playlistStore = usePlaylistStore();
|
||||
// 基于当前歌曲在播放列表中的位置来预加载
|
||||
const list = playlistStore.playList;
|
||||
if (Array.isArray(list) && list.length > 0) {
|
||||
const idx = list.findIndex(
|
||||
(item: SongResult) =>
|
||||
item.id === updatedPlayMusic.id && item.source === updatedPlayMusic.source
|
||||
);
|
||||
if (idx !== -1) {
|
||||
setTimeout(() => {
|
||||
playlistStore.preloadNextSongs(idx);
|
||||
}, 3000);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn('预加载触发失败（可能是依赖未加载或循环依赖），已忽略:', e);
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await playAudio(requestId);
|
||||
|
||||
if (result) {
|
||||
// 播放成功，清除 isFirstPlay 标记，避免暂停时被误判为新歌
|
||||
playMusic.value.isFirstPlay = false;
|
||||
playbackRequestManager.completeRequest(requestId);
|
||||
return true;
|
||||
} else {
|
||||
playbackRequestManager.failRequest(requestId);
|
||||
return false;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('自动播放音频失败:', error);
|
||||
playbackRequestManager.failRequest(requestId);
|
||||
return false;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('处理播放音乐失败:', error);
|
||||
message.error(i18n.global.t('player.playFailed'));
|
||||
if (playMusic.value) {
|
||||
playMusic.value.playLoading = false;
|
||||
}
|
||||
playbackRequestManager.failRequest(requestId);
|
||||
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 播放音频
|
||||
*/
|
||||
const playAudio = async (requestId?: string) => {
|
||||
if (!playMusicUrl.value || !playMusic.value) return null;
|
||||
|
||||
// 如果提供了 requestId，验证请求是否仍然有效
|
||||
if (requestId && !playbackRequestManager.isRequestValid(requestId)) {
|
||||
console.log(`[playAudio] 请求已失效: ${requestId}`);
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
const shouldPlay = play.value;
|
||||
console.log('播放音频，当前播放状态:', shouldPlay ? '播放' : '暂停');
|
||||
|
||||
// 检查保存的进度
|
||||
let initialPosition = 0;
|
||||
const savedProgress = JSON.parse(localStorage.getItem('playProgress') || '{}');
|
||||
console.log(
|
||||
'[playAudio] 读取保存的进度:',
|
||||
savedProgress,
|
||||
'当前歌曲ID:',
|
||||
playMusic.value.id
|
||||
);
|
||||
if (savedProgress.songId === playMusic.value.id) {
|
||||
initialPosition = savedProgress.progress;
|
||||
console.log('[playAudio] 恢复播放进度:', initialPosition);
|
||||
}
|
||||
|
||||
// 使用 PreloadService 获取音频
|
||||
// 优先使用已预加载的 sound（通过 consume 获取并从缓存中移除）
|
||||
// 如果没有预加载，则进行加载
|
||||
let sound: Howl;
|
||||
try {
|
||||
// 先尝试消耗预加载的 sound
|
||||
const preloadedSound = preloadService.consume(playMusic.value.id);
|
||||
if (preloadedSound && preloadedSound.state() === 'loaded') {
|
||||
console.log(`[playAudio] 使用预加载的音频: ${playMusic.value.name}`);
|
||||
sound = preloadedSound;
|
||||
} else {
|
||||
// 没有预加载或预加载状态不正常，需要加载
|
||||
console.log(`[playAudio] 没有预加载，开始加载: ${playMusic.value.name}`);
|
||||
sound = await preloadService.load(playMusic.value);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('PreloadService 加载失败:', error);
|
||||
// 如果 PreloadService 失败，尝试直接播放作为回退
|
||||
// 但通常 PreloadService 失败意味着 URL 问题
|
||||
throw error;
|
||||
}
|
||||
|
||||
// 播放新音频，传入已加载的 sound 实例
|
||||
const newSound = await audioService.play(
|
||||
playMusicUrl.value,
|
||||
playMusic.value,
|
||||
shouldPlay,
|
||||
initialPosition || 0,
|
||||
sound
|
||||
);
|
||||
|
||||
// 播放后再次验证请求
|
||||
if (requestId && !playbackRequestManager.isRequestValid(requestId)) {
|
||||
console.log(`[playAudio] 播放后请求已失效: ${requestId}`);
|
||||
newSound.stop();
|
||||
newSound.unload();
|
||||
return null;
|
||||
}
|
||||
|
||||
// 添加播放状态检测
|
||||
if (shouldPlay && requestId) {
|
||||
checkPlaybackState(playMusic.value, requestId);
|
||||
}
|
||||
|
||||
// 发布音频就绪事件
|
||||
window.dispatchEvent(
|
||||
new CustomEvent('audio-ready', { detail: { sound: newSound, shouldPlay } })
|
||||
);
|
||||
|
||||
// 时长检查已在 preloadService.ts 中完成
|
||||
|
||||
return newSound;
|
||||
} catch (error) {
|
||||
console.error('播放音频失败:', error);
|
||||
|
||||
const errorMsg = error instanceof Error ? error.message : String(error);
|
||||
|
||||
// 操作锁错误不应该停止播放状态，只需要重试
|
||||
if (errorMsg.includes('操作锁激活')) {
|
||||
console.log('由于操作锁正在使用，将在1000ms后重试');
|
||||
|
||||
try {
|
||||
audioService.forceResetOperationLock();
|
||||
console.log('已强制重置操作锁');
|
||||
} catch (e) {
|
||||
console.error('重置操作锁失败:', e);
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
// 验证请求是否仍然有效再重试
|
||||
if (requestId && !playbackRequestManager.isRequestValid(requestId)) {
|
||||
console.log('重试时请求已失效，跳过重试');
|
||||
return;
|
||||
}
|
||||
if (userPlayIntent.value && play.value) {
|
||||
playAudio(requestId).catch((e) => {
|
||||
console.error('重试播放失败:', e);
|
||||
setPlayMusic(false);
|
||||
});
|
||||
}
|
||||
}, 1000);
|
||||
} else {
|
||||
// 非操作锁错误，停止播放并通知用户
|
||||
setPlayMusic(false);
|
||||
console.warn('播放音频失败（非操作锁错误），由调用方处理重试');
|
||||
message.error(i18n.global.t('player.playFailed'));
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 暂停播放
|
||||
*/
|
||||
@@ -540,109 +115,14 @@ export const usePlayerCoreStore = defineStore(
|
||||
setIsPlay(value);
|
||||
userPlayIntent.value = value;
|
||||
} else {
|
||||
await handlePlayMusic(value);
|
||||
const { playTrack } = await import('@/services/playbackController');
|
||||
await playTrack(value);
|
||||
play.value = true;
|
||||
isPlay.value = true;
|
||||
userPlayIntent.value = true;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 使用指定音源重新解析当前歌曲
|
||||
*/
|
||||
const reparseCurrentSong = async (sourcePlatform: Platform, isAuto: boolean = false) => {
|
||||
try {
|
||||
const currentSong = playMusic.value;
|
||||
if (!currentSong || !currentSong.id) {
|
||||
console.warn('没有有效的播放对象');
|
||||
return false;
|
||||
}
|
||||
|
||||
// 使用 SongSourceConfigManager 保存配置
|
||||
SongSourceConfigManager.setConfig(
|
||||
currentSong.id,
|
||||
[sourcePlatform],
|
||||
isAuto ? 'auto' : 'manual'
|
||||
);
|
||||
|
||||
const currentSound = audioService.getCurrentSound();
|
||||
if (currentSound) {
|
||||
currentSound.pause();
|
||||
}
|
||||
|
||||
const numericId =
|
||||
typeof currentSong.id === 'string' ? parseInt(currentSong.id, 10) : currentSong.id;
|
||||
|
||||
console.log(`使用音源 ${sourcePlatform} 重新解析歌曲 ${numericId}`);
|
||||
|
||||
const songData = cloneDeep(currentSong);
|
||||
const res = await getParsingMusicUrl(numericId, songData);
|
||||
|
||||
if (res && res.data && res.data.data && res.data.data.url) {
|
||||
const newUrl = res.data.data.url;
|
||||
console.log(`解析成功，获取新URL: ${newUrl.substring(0, 50)}...`);
|
||||
|
||||
const updatedMusic = {
|
||||
...currentSong,
|
||||
playMusicUrl: newUrl,
|
||||
expiredAt: Date.now() + 1800000
|
||||
};
|
||||
|
||||
await handlePlayMusic(updatedMusic, true);
|
||||
|
||||
// 更新播放列表中的歌曲信息
|
||||
const { usePlaylistStore } = await import('./playlist');
|
||||
const playlistStore = usePlaylistStore();
|
||||
playlistStore.updateSong(updatedMusic);
|
||||
|
||||
return true;
|
||||
} else {
|
||||
console.warn(`使用音源 ${sourcePlatform} 解析失败`);
|
||||
return false;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('重新解析失败:', error);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 初始化播放状态
|
||||
*/
|
||||
const initializePlayState = async () => {
|
||||
const { useSettingsStore } = await import('./settings');
|
||||
const settingStore = useSettingsStore();
|
||||
|
||||
if (playMusic.value && Object.keys(playMusic.value).length > 0) {
|
||||
try {
|
||||
console.log('恢复上次播放的音乐:', playMusic.value.name);
|
||||
const isPlaying = settingStore.setData.autoPlay;
|
||||
|
||||
// 本地音乐（local:// 协议）不需要重新获取 URL，保留原始路径
|
||||
const isLocalMusic = playMusic.value.playMusicUrl?.startsWith('local://');
|
||||
|
||||
await handlePlayMusic(
|
||||
{
|
||||
...playMusic.value,
|
||||
isFirstPlay: true,
|
||||
playMusicUrl: isLocalMusic ? playMusic.value.playMusicUrl : undefined
|
||||
},
|
||||
isPlaying
|
||||
);
|
||||
} catch (error) {
|
||||
console.error('重新获取音乐链接失败:', error);
|
||||
play.value = false;
|
||||
isPlay.value = false;
|
||||
playMusic.value = {} as SongResult;
|
||||
playMusicUrl.value = '';
|
||||
}
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
audioService.setPlaybackRate(playbackRate.value);
|
||||
}, 2000);
|
||||
};
|
||||
|
||||
// ==================== 音频输出设备管理 ====================
|
||||
|
||||
/**
|
||||
@@ -707,12 +187,7 @@ export const usePlayerCoreStore = defineStore(
|
||||
getVolume,
|
||||
increaseVolume,
|
||||
decreaseVolume,
|
||||
handlePlayMusic,
|
||||
playAudio,
|
||||
handlePause,
|
||||
checkPlaybackState,
|
||||
reparseCurrentSong,
|
||||
initializePlayState,
|
||||
refreshAudioDevices,
|
||||
setAudioOutputDevice,
|
||||
initAudioDeviceListener
|
||||
|
||||
@@ -87,7 +87,6 @@ export const usePlaylistStore = defineStore(
|
||||
// 连续失败计数器（用于防止无限循环）
|
||||
const consecutiveFailCount = ref(0);
|
||||
const MAX_CONSECUTIVE_FAILS = 5; // 最大连续失败次数
|
||||
const SINGLE_TRACK_MAX_RETRIES = 3; // 单曲最大重试次数
|
||||
|
||||
// ==================== Computed ====================
|
||||
const currentPlayList = computed(() => playList.value);
|
||||
@@ -416,103 +415,104 @@ export const usePlaylistStore = defineStore(
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 下一首
|
||||
* @param singleTrackRetryCount 单曲重试次数（同一首歌的重试）
|
||||
*/
|
||||
const _nextPlay = async (singleTrackRetryCount: number = 0) => {
|
||||
let nextPlayRetryTimer: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
const cancelRetryTimer = () => {
|
||||
if (nextPlayRetryTimer) {
|
||||
clearTimeout(nextPlayRetryTimer);
|
||||
nextPlayRetryTimer = null;
|
||||
}
|
||||
};
|
||||
|
||||
const _nextPlay = async (retryCount: number = 0, autoEnd: boolean = false) => {
|
||||
try {
|
||||
if (playList.value.length === 0) {
|
||||
return;
|
||||
if (playList.value.length === 0) return;
|
||||
|
||||
// User-initiated (retryCount=0): reset state
|
||||
if (retryCount === 0) {
|
||||
cancelRetryTimer();
|
||||
consecutiveFailCount.value = 0;
|
||||
}
|
||||
|
||||
const playerCore = usePlayerCoreStore();
|
||||
const sleepTimerStore = useSleepTimerStore();
|
||||
|
||||
// 检查是否超过最大连续失败次数
|
||||
if (consecutiveFailCount.value >= MAX_CONSECUTIVE_FAILS) {
|
||||
console.error(`[nextPlay] 连续${MAX_CONSECUTIVE_FAILS}首歌曲播放失败，停止播放`);
|
||||
console.error(`[nextPlay] 连续${MAX_CONSECUTIVE_FAILS}首播放失败，停止`);
|
||||
getMessage().warning(i18n.global.t('player.consecutiveFailsError'));
|
||||
consecutiveFailCount.value = 0; // 重置计数器
|
||||
consecutiveFailCount.value = 0;
|
||||
playerCore.setIsPlay(false);
|
||||
return;
|
||||
}
|
||||
|
||||
// 顺序播放模式：播放到最后一首后停止
|
||||
// Sequential mode: at the last song
|
||||
if (playMode.value === 0 && playListIndex.value >= playList.value.length - 1) {
|
||||
if (sleepTimerStore.sleepTimer.type === 'end') {
|
||||
sleepTimerStore.stopPlayback();
|
||||
if (autoEnd) {
|
||||
// 歌曲自然播放结束：停止播放
|
||||
console.log('[nextPlay] 顺序播放：最后一首播放完毕，停止');
|
||||
if (sleepTimerStore.sleepTimer.type === 'end') {
|
||||
sleepTimerStore.stopPlayback();
|
||||
}
|
||||
getMessage().info(i18n.global.t('player.playListEnded'));
|
||||
playerCore.setIsPlay(false);
|
||||
const { audioService } = await import('@/services/audioService');
|
||||
audioService.pause();
|
||||
} else {
|
||||
// 用户手动点击下一首：保持当前播放，只提示
|
||||
console.log('[nextPlay] 顺序播放：已是最后一首，保持当前播放');
|
||||
getMessage().info(i18n.global.t('player.playListEnded'));
|
||||
}
|
||||
console.log('[nextPlay] 顺序播放模式：已播放到最后一首，停止播放');
|
||||
playerCore.setIsPlay(false);
|
||||
const { audioService } = await import('@/services/audioService');
|
||||
audioService.pause();
|
||||
return;
|
||||
}
|
||||
|
||||
const currentIndex = playListIndex.value;
|
||||
const nowPlayListIndex = (playListIndex.value + 1) % playList.value.length;
|
||||
const nextSong = { ...playList.value[nowPlayListIndex] };
|
||||
|
||||
// 同一首歌重试时强制刷新在线 URL，避免卡在失效链接上
|
||||
if (singleTrackRetryCount > 0 && !nextSong.playMusicUrl?.startsWith('local://')) {
|
||||
// Force refresh URL on retry
|
||||
if (retryCount > 0 && !nextSong.playMusicUrl?.startsWith('local://')) {
|
||||
nextSong.playMusicUrl = undefined;
|
||||
nextSong.expiredAt = undefined;
|
||||
}
|
||||
|
||||
console.log(
|
||||
`[nextPlay] 尝试播放: ${nextSong.name}, 索引: ${currentIndex} -> ${nowPlayListIndex}, 单曲重试: ${singleTrackRetryCount}/${SINGLE_TRACK_MAX_RETRIES}, 连续失败: ${consecutiveFailCount.value}/${MAX_CONSECUTIVE_FAILS}`
|
||||
);
|
||||
console.log(
|
||||
'[nextPlay] Current mode:',
|
||||
playMode.value,
|
||||
'Playlist length:',
|
||||
playList.value.length
|
||||
`[nextPlay] ${nextSong.name}, 索引: ${playListIndex.value} -> ${nowPlayListIndex}, 重试: ${retryCount}/1`
|
||||
);
|
||||
|
||||
// 先尝试播放歌曲
|
||||
const success = await playerCore.handlePlayMusic(nextSong, true);
|
||||
const { playTrack } = await import('@/services/playbackController');
|
||||
const success = await playTrack(nextSong, true);
|
||||
|
||||
// Check if we were superseded by a newer operation
|
||||
if (playerCore.playMusic.id !== nextSong.id) {
|
||||
console.log('[nextPlay] 被新操作取代，静默退出');
|
||||
return;
|
||||
}
|
||||
|
||||
if (success) {
|
||||
// 播放成功，重置所有计数器并更新索引
|
||||
consecutiveFailCount.value = 0;
|
||||
playListIndex.value = nowPlayListIndex;
|
||||
console.log(`[nextPlay] 播放成功，索引已更新为: ${nowPlayListIndex}`);
|
||||
console.log(
|
||||
'[nextPlay] New current song in list:',
|
||||
playList.value[playListIndex.value]?.name
|
||||
);
|
||||
console.log(`[nextPlay] 播放成功，索引: ${nowPlayListIndex}`);
|
||||
sleepTimerStore.handleSongChange();
|
||||
} else {
|
||||
console.error(`[nextPlay] 播放失败: ${nextSong.name}`);
|
||||
|
||||
// 单曲重试逻辑
|
||||
if (singleTrackRetryCount < SINGLE_TRACK_MAX_RETRIES) {
|
||||
console.log(
|
||||
`[nextPlay] 单曲重试 ${singleTrackRetryCount + 1}/${SINGLE_TRACK_MAX_RETRIES}`
|
||||
);
|
||||
// 不更新索引，重试同一首歌
|
||||
setTimeout(() => {
|
||||
_nextPlay(singleTrackRetryCount + 1);
|
||||
// Retry once, then skip to next
|
||||
if (retryCount < 1) {
|
||||
console.log(`[nextPlay] 播放失败，1秒后重试`);
|
||||
nextPlayRetryTimer = setTimeout(() => {
|
||||
nextPlayRetryTimer = null;
|
||||
_nextPlay(retryCount + 1);
|
||||
}, 1000);
|
||||
} else {
|
||||
// 单曲重试次数用尽，递增连续失败计数，尝试下一首
|
||||
consecutiveFailCount.value++;
|
||||
console.log(
|
||||
`[nextPlay] 单曲重试用尽，连续失败计数: ${consecutiveFailCount.value}/${MAX_CONSECUTIVE_FAILS}`
|
||||
`[nextPlay] 重试用尽，连续失败: ${consecutiveFailCount.value}/${MAX_CONSECUTIVE_FAILS}`
|
||||
);
|
||||
|
||||
if (playList.value.length > 1) {
|
||||
// 更新索引到失败的歌曲位置，这样下次递归调用会继续往下
|
||||
playListIndex.value = nowPlayListIndex;
|
||||
getMessage().warning(i18n.global.t('player.parseFailedPlayNext'));
|
||||
|
||||
// 延迟后尝试下一首（重置单曲重试计数）
|
||||
setTimeout(() => {
|
||||
nextPlayRetryTimer = setTimeout(() => {
|
||||
nextPlayRetryTimer = null;
|
||||
_nextPlay(0);
|
||||
}, 500);
|
||||
} else {
|
||||
// 只有一首歌且失败
|
||||
getMessage().error(i18n.global.t('player.playFailed'));
|
||||
playerCore.setIsPlay(false);
|
||||
}
|
||||
@@ -525,73 +525,33 @@ export const usePlaylistStore = defineStore(
|
||||
|
||||
const nextPlay = useThrottleFn(_nextPlay, 500);
|
||||
|
||||
/**
|
||||
* 上一首
|
||||
*/
|
||||
/** 歌曲自然播放结束时调用，顺序模式最后一首会停止 */
|
||||
const nextPlayOnEnd = () => {
|
||||
_nextPlay(0, true);
|
||||
};
|
||||
|
||||
const _prevPlay = async () => {
|
||||
try {
|
||||
if (playList.value.length === 0) {
|
||||
return;
|
||||
}
|
||||
if (playList.value.length === 0) return;
|
||||
|
||||
cancelRetryTimer();
|
||||
const playerCore = usePlayerCoreStore();
|
||||
const currentIndex = playListIndex.value;
|
||||
const nowPlayListIndex =
|
||||
(playListIndex.value - 1 + playList.value.length) % playList.value.length;
|
||||
|
||||
const prevSong = { ...playList.value[nowPlayListIndex] };
|
||||
|
||||
console.log(
|
||||
`[prevPlay] 尝试播放上一首: ${prevSong.name}, 索引: ${currentIndex} -> ${nowPlayListIndex}`
|
||||
`[prevPlay] ${prevSong.name}, 索引: ${playListIndex.value} -> ${nowPlayListIndex}`
|
||||
);
|
||||
|
||||
let success = false;
|
||||
let retryCount = 0;
|
||||
const maxRetries = 2;
|
||||
|
||||
// 先尝试播放歌曲，成功后再更新索引
|
||||
while (!success && retryCount < maxRetries) {
|
||||
success = await playerCore.handlePlayMusic(prevSong);
|
||||
|
||||
if (!success) {
|
||||
retryCount++;
|
||||
console.error(`播放上一首失败，尝试 ${retryCount}/${maxRetries}`);
|
||||
|
||||
if (retryCount >= maxRetries) {
|
||||
console.error('多次尝试播放失败，将从播放列表中移除此歌曲');
|
||||
const newPlayList = [...playList.value];
|
||||
newPlayList.splice(nowPlayListIndex, 1);
|
||||
|
||||
if (newPlayList.length > 0) {
|
||||
const keepCurrentIndexPosition = true;
|
||||
setPlayList(newPlayList, keepCurrentIndexPosition);
|
||||
|
||||
if (newPlayList.length === 1) {
|
||||
playListIndex.value = 0;
|
||||
} else {
|
||||
const newPrevIndex =
|
||||
(playListIndex.value - 1 + newPlayList.length) % newPlayList.length;
|
||||
playListIndex.value = newPrevIndex;
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
prevPlay();
|
||||
}, 300);
|
||||
return;
|
||||
} else {
|
||||
console.error('播放列表为空，停止尝试');
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
const { playTrack } = await import('@/services/playbackController');
|
||||
const success = await playTrack(prevSong);
|
||||
|
||||
if (success) {
|
||||
// 播放成功，更新索引
|
||||
playListIndex.value = nowPlayListIndex;
|
||||
console.log(`[prevPlay] 播放成功，索引已更新为: ${nowPlayListIndex}`);
|
||||
} else {
|
||||
console.error(`[prevPlay] 播放上一首失败，保持当前索引: ${currentIndex}`);
|
||||
console.log(`[prevPlay] 播放成功，索引: ${nowPlayListIndex}`);
|
||||
} else if (playerCore.playMusic.id === prevSong.id) {
|
||||
// Only show error if not superseded
|
||||
playerCore.setIsPlay(false);
|
||||
getMessage().error(i18n.global.t('player.playFailed'));
|
||||
}
|
||||
@@ -609,16 +569,12 @@ export const usePlaylistStore = defineStore(
|
||||
playListDrawerVisible.value = value;
|
||||
};
|
||||
|
||||
/**
|
||||
* 设置播放（兼容旧API）
|
||||
*/
|
||||
const setPlay = async (song: SongResult) => {
|
||||
try {
|
||||
const playerCore = usePlayerCoreStore();
|
||||
|
||||
// 检查URL是否已过期
|
||||
// Check URL expiration
|
||||
if (song.expiredAt && song.expiredAt < Date.now()) {
|
||||
// 本地音乐（local:// 协议）不会过期
|
||||
if (!song.playMusicUrl?.startsWith('local://')) {
|
||||
console.info(`歌曲URL已过期，重新获取: ${song.name}`);
|
||||
song.playMusicUrl = undefined;
|
||||
@@ -626,7 +582,7 @@ export const usePlaylistStore = defineStore(
|
||||
}
|
||||
}
|
||||
|
||||
// 如果是当前正在播放的音乐，则切换播放/暂停状态
|
||||
// Toggle play/pause for current song
|
||||
if (
|
||||
playerCore.playMusic.id === song.id &&
|
||||
playerCore.playMusic.playMusicUrl === song.playMusicUrl &&
|
||||
@@ -644,10 +600,9 @@ export const usePlaylistStore = defineStore(
|
||||
const sound = audioService.getCurrentSound();
|
||||
if (sound) {
|
||||
sound.play();
|
||||
// 在恢复播放时也进行状态检测，防止URL已过期导致无声
|
||||
playerCore.checkPlaybackState(playerCore.playMusic);
|
||||
} else {
|
||||
console.warn('[PlaylistStore.setPlay] 无可用音频实例，尝试重建播放链路');
|
||||
// No audio instance, rebuild via playTrack
|
||||
const { playTrack } = await import('@/services/playbackController');
|
||||
const recoverSong = {
|
||||
...playerCore.playMusic,
|
||||
isFirstPlay: true,
|
||||
@@ -655,7 +610,7 @@ export const usePlaylistStore = defineStore(
|
||||
? playerCore.playMusic.playMusicUrl
|
||||
: undefined
|
||||
};
|
||||
const recovered = await playerCore.handlePlayMusic(recoverSong, true);
|
||||
const recovered = await playTrack(recoverSong, true);
|
||||
if (!recovered) {
|
||||
playerCore.setIsPlay(false);
|
||||
getMessage().error(i18n.global.t('player.playFailed'));
|
||||
@@ -665,33 +620,24 @@ export const usePlaylistStore = defineStore(
|
||||
return;
|
||||
}
|
||||
|
||||
if (song.isFirstPlay) {
|
||||
song.isFirstPlay = false;
|
||||
}
|
||||
if (song.isFirstPlay) song.isFirstPlay = false;
|
||||
|
||||
// 查找歌曲在播放列表中的索引
|
||||
// Update playlist index
|
||||
const songIndex = playList.value.findIndex(
|
||||
(item: SongResult) => item.id === song.id && item.source === song.source
|
||||
);
|
||||
|
||||
// 更新播放索引
|
||||
if (songIndex !== -1 && songIndex !== playListIndex.value) {
|
||||
console.log('歌曲索引不匹配，更新为:', songIndex);
|
||||
playListIndex.value = songIndex;
|
||||
}
|
||||
|
||||
const success = await playerCore.handlePlayMusic(song);
|
||||
|
||||
// playerCore 的状态由其自己的 store 管理
|
||||
const { playTrack } = await import('@/services/playbackController');
|
||||
const success = await playTrack(song);
|
||||
|
||||
if (success) {
|
||||
playerCore.isPlay = true;
|
||||
|
||||
// 预加载下一首歌曲
|
||||
if (songIndex !== -1) {
|
||||
setTimeout(() => {
|
||||
preloadNextSongs(playListIndex.value);
|
||||
}, 3000);
|
||||
setTimeout(() => preloadNextSongs(playListIndex.value), 3000);
|
||||
}
|
||||
}
|
||||
return success;
|
||||
@@ -740,6 +686,7 @@ export const usePlaylistStore = defineStore(
|
||||
restoreOriginalOrder,
|
||||
preloadNextSongs,
|
||||
nextPlay: nextPlay as unknown as typeof _nextPlay,
|
||||
nextPlayOnEnd,
|
||||
prevPlay: prevPlay as unknown as typeof _prevPlay,
|
||||
setPlayListDrawerVisible,
|
||||
setPlay,
|
||||
|
||||
@@ -99,9 +99,9 @@ import { useRoute, useRouter } from 'vue-router';
|
||||
|
||||
import { getNewAlbums } from '@/api/album';
|
||||
import { getAlbum } from '@/api/list';
|
||||
import StickyTabPage from '@/components/common/StickyTabPage.vue';
|
||||
import { navigateToMusicList } from '@/components/common/MusicListNavigator';
|
||||
import { usePlayerCoreStore } from '@/store/modules/playerCore';
|
||||
import StickyTabPage from '@/components/common/StickyTabPage.vue';
|
||||
import { playTrack } from '@/services/playbackController';
|
||||
import { usePlaylistStore } from '@/store/modules/playlist';
|
||||
import { calculateAnimationDelay, getImgUrl } from '@/utils';
|
||||
|
||||
@@ -213,7 +213,6 @@ const playAlbum = async (album: any) => {
|
||||
try {
|
||||
const { data } = await getAlbum(album.id);
|
||||
if (data.code === 200 && data.songs?.length > 0) {
|
||||
const playerCore = usePlayerCoreStore();
|
||||
const playlistStore = usePlaylistStore();
|
||||
|
||||
const albumCover = data.album?.picUrl || album.picUrl;
|
||||
@@ -228,7 +227,7 @@ const playAlbum = async (album: any) => {
|
||||
}));
|
||||
|
||||
playlistStore.setPlayList(playlist, false, false);
|
||||
await playerCore.handlePlayMusic(playlist[0], true);
|
||||
await playTrack(playlist[0], true);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to play album:', error);
|
||||
|
||||
@@ -61,7 +61,7 @@ import { useRouter } from 'vue-router';
|
||||
import { getTopAlbum } from '@/api/home';
|
||||
import { getAlbum } from '@/api/list';
|
||||
import { navigateToMusicList } from '@/components/common/MusicListNavigator';
|
||||
import { usePlayerCoreStore } from '@/store/modules/playerCore';
|
||||
import { playTrack } from '@/services/playbackController';
|
||||
import { usePlaylistStore } from '@/store/modules/playlist';
|
||||
import { calculateAnimationDelay, isElectron, isMobile } from '@/utils';
|
||||
|
||||
@@ -178,7 +178,6 @@ const playAlbum = async (album: any) => {
|
||||
try {
|
||||
const { data } = await getAlbum(album.id);
|
||||
if (data.code === 200 && data.songs?.length > 0) {
|
||||
const playerCore = usePlayerCoreStore();
|
||||
const playlistStore = usePlaylistStore();
|
||||
|
||||
const albumCover = data.album?.picUrl || album.picUrl;
|
||||
@@ -193,7 +192,7 @@ const playAlbum = async (album: any) => {
|
||||
}));
|
||||
|
||||
playlistStore.setPlayList(playlist, false, false);
|
||||
await playerCore.handlePlayMusic(playlist[0], true);
|
||||
await playTrack(playlist[0], true);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to play album:', error);
|
||||
|
||||
@@ -146,10 +146,9 @@ const getArtistNames = (song: any) => {
|
||||
};
|
||||
|
||||
const handleSongClick = async (_song: any, index: number) => {
|
||||
const { usePlayerCoreStore } = await import('@/store/modules/playerCore');
|
||||
const { usePlaylistStore } = await import('@/store/modules/playlist');
|
||||
const { playTrack } = await import('@/services/playbackController');
|
||||
|
||||
const playerCore = usePlayerCoreStore();
|
||||
const playlistStore = usePlaylistStore();
|
||||
|
||||
const playlist = songs.value.map((s: any) => ({
|
||||
@@ -163,16 +162,15 @@ const handleSongClick = async (_song: any, index: number) => {
|
||||
}));
|
||||
|
||||
playlistStore.setPlayList(playlist, false, false);
|
||||
await playerCore.handlePlayMusic(playlist[index], true);
|
||||
await playTrack(playlist[index], true);
|
||||
};
|
||||
|
||||
const playAll = async () => {
|
||||
if (songs.value.length === 0) return;
|
||||
|
||||
const { usePlayerCoreStore } = await import('@/store/modules/playerCore');
|
||||
const { usePlaylistStore } = await import('@/store/modules/playlist');
|
||||
const { playTrack } = await import('@/services/playbackController');
|
||||
|
||||
const playerCore = usePlayerCoreStore();
|
||||
const playlistStore = usePlaylistStore();
|
||||
|
||||
const playlist = songs.value.map((s: any) => ({
|
||||
@@ -186,7 +184,7 @@ const playAll = async () => {
|
||||
}));
|
||||
|
||||
playlistStore.setPlayList(playlist, false, false);
|
||||
await playerCore.handlePlayMusic(playlist[0], true);
|
||||
await playTrack(playlist[0], true);
|
||||
};
|
||||
</script>
|
||||
|
||||
|
||||
@@ -441,7 +441,8 @@ const handleFmPlay = async () => {
|
||||
];
|
||||
playlistStore.setPlayList(playlist, false, false);
|
||||
playerCore.isFmPlaying = true;
|
||||
await playerCore.handlePlayMusic(playlist[0], true);
|
||||
const { playTrack } = await import('@/services/playbackController');
|
||||
await playTrack(playlist[0], true);
|
||||
} catch (error) {
|
||||
console.error('Failed to play Personal FM:', error);
|
||||
}
|
||||
@@ -597,9 +598,7 @@ const showDayRecommend = () => {
|
||||
const playDayRecommend = async () => {
|
||||
if (dayRecommendSongs.value.length === 0) return;
|
||||
try {
|
||||
const { usePlayerCoreStore } = await import('@/store/modules/playerCore');
|
||||
const { usePlaylistStore } = await import('@/store/modules/playlist');
|
||||
const playerCore = usePlayerCoreStore();
|
||||
const playlistStore = usePlaylistStore();
|
||||
const songs = dayRecommendSongs.value.map((s: any) => ({
|
||||
id: s.id,
|
||||
@@ -611,7 +610,8 @@ const playDayRecommend = async () => {
|
||||
playLoading: false
|
||||
}));
|
||||
playlistStore.setPlayList(songs, false, false);
|
||||
await playerCore.handlePlayMusic(songs[0], true);
|
||||
const { playTrack } = await import('@/services/playbackController');
|
||||
await playTrack(songs[0], true);
|
||||
} catch (error) {
|
||||
console.error('Failed to play daily recommend:', error);
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ import { useRouter } from 'vue-router';
|
||||
import { getPersonalizedPlaylist } from '@/api/home';
|
||||
import { getListDetail } from '@/api/list';
|
||||
import { navigateToMusicList } from '@/components/common/MusicListNavigator';
|
||||
import { usePlayerCoreStore } from '@/store/modules/playerCore';
|
||||
import { playTrack } from '@/services/playbackController';
|
||||
import { usePlaylistStore } from '@/store/modules/playlist';
|
||||
import { calculateAnimationDelay, isElectron, isMobile } from '@/utils';
|
||||
|
||||
@@ -154,7 +154,6 @@ const playPlaylist = async (item: any) => {
|
||||
try {
|
||||
const { data } = await getListDetail(item.id);
|
||||
if (data.playlist?.tracks?.length > 0) {
|
||||
const playerCore = usePlayerCoreStore();
|
||||
const playlistStore = usePlaylistStore();
|
||||
|
||||
const playlist = data.playlist.tracks.map((s: any) => ({
|
||||
@@ -168,7 +167,7 @@ const playPlaylist = async (item: any) => {
|
||||
}));
|
||||
|
||||
playlistStore.setPlayList(playlist, false, false);
|
||||
await playerCore.handlePlayMusic(playlist[0], true);
|
||||
await playTrack(playlist[0], true);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to play playlist:', error);
|
||||
|
||||
Reference in New Issue
Block a user