🐞 fix: 修复播放错误判断

Author: imsyy

package.json

@@ -73,7 +73,8 @@
     "pinia": "^3.0.4",
     "pinia-plugin-persistedstate": "^4.7.1",
     "plyr": "^3.8.3",
-    "sortablejs": "^1.15.6"
+    "sortablejs": "^1.15.6",
+    "vue-virtual-scroller": "2.0.0-beta.8"
   },
   "devDependencies": {
     "@electron-toolkit/preload": "^3.0.1",

pnpm-lock.yaml

@@ -3,10 +3,7 @@ import { keywords, regexes } from "@/assets/data/exclude";
 import { SongUnlockServer } from "@/utils/songManager";
 import type { SongLevelType } from "@/types/main";
 import { defaultAMLLDbServer } from "@/utils/meta";
-import {
-  CURRENT_SETTING_SCHEMA_VERSION,
-  settingMigrations,
-} from "./migrations/settingMigrations";
+import { CURRENT_SETTING_SCHEMA_VERSION, settingMigrations } from "./migrations/settingMigrations";
 
 export interface SettingState {
   /** Schema 版本号（可选，用于数据迁移） */
@@ -251,7 +248,7 @@ export interface SettingState {
 
 export const useSettingStore = defineStore("setting", {
   state: (): SettingState => ({
-    schemaVersion: CURRENT_SETTING_SCHEMA_VERSION,
+    schemaVersion: 0,
     themeMode: "auto",
     themeColorType: "default",
     themeCustomColor: "#fe7971",

src/stores/setting.ts

@@ -300,9 +300,21 @@ class AudioManager {
 
     events.forEach((event) => {
       this.audioElement!.addEventListener(event, (e) => {
-        const listeners = this.eventListeners.get(event);
-        if (listeners) {
-          listeners.forEach((cb) => cb(e));
+        // 传递错误码
+        if (event === "error" && this.audioElement) {
+          const errCode = this.getErrorCode();
+          const customEvent = new CustomEvent("error", {
+            detail: { originalEvent: e, errorCode: errCode },
+          });
+          const listeners = this.eventListeners.get(event);
+          if (listeners) {
+            listeners.forEach((cb) => cb(customEvent));
+          }
+        } else {
+          const listeners = this.eventListeners.get(event);
+          if (listeners) {
+            listeners.forEach((cb) => cb(e));
+          }
         }
       });
     });
@@ -390,6 +402,32 @@ class AudioManager {
   public get src() {
     return this.audioElement?.src || "";
   }
+
+  /**
+   * 获取音频错误码
+   * @returns 错误码
+   */
+  private getErrorCode(): number {
+    if (!this.audioElement?.error) return 0;
+
+    // 参考 HTML Audio Element 错误码
+    // MEDIA_ERR_ABORTED (1): 用户中止了加载
+    // MEDIA_ERR_NETWORK (2): 网络错误或资源过期
+    // MEDIA_ERR_DECODE (3): 解码错误
+    // MEDIA_ERR_SRC_NOT_SUPPORTED (4): 不支持的格式
+    switch (this.audioElement.error.code) {
+      case MediaError.MEDIA_ERR_ABORTED:
+        return 1;
+      case MediaError.MEDIA_ERR_NETWORK:
+        return 2; // 网络错误或资源过期
+      case MediaError.MEDIA_ERR_DECODE:
+        return 3;
+      case MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED:
+        return 4;
+      default:
+        return 0;
+    }
+  }
 }
 
 export default new AudioManager();

src/utils/audioManager.ts

@@ -113,7 +113,12 @@ class Player {
     const errorCallback = (e: Event) => {
       const playSongData = songManager.getPlaySongData();
       console.error("❌ song error:", playSongData, e);
-      this.handlePlaybackError();
+      // 提取错误码
+      let errCode: number | undefined;
+      if ("detail" in e && e.detail) {
+        errCode = (e.detail as { errorCode?: number }).errorCode;
+      }
+      this.handlePlaybackError(errCode);
     };
     audioManager.on("error", errorCallback);
     this.eventCallbacks.set("error", errorCallback);
@@ -301,19 +306,28 @@ class Player {
     const dataStore = useDataStore();
     const playSongData = songManager.getPlaySongData();
     const currentSongId = playSongData?.type === "radio" ? playSongData.dj?.id : playSongData?.id;
+    // 保存当前播放进度，用于恢复
+    const currentSeek = this.getSeek();
     // 初始化/切换曲目时重置计数
     if (!this.retryInfo.songId || this.retryInfo.songId !== Number(currentSongId || 0)) {
       this.retryInfo = { songId: Number(currentSongId || 0), count: 0 };
     }
     this.retryInfo.count += 1;
-    // 错误码 2：资源过期或临时网络错误
+    // 2：资源过期或临时网络错误（通常是长时间暂停导致URL过期）
     if (errCode === 2 && this.retryInfo.count <= 2) {
-      await this.initPlayer(true, this.getSeek());
+      console.log("🔄 检测到资源过期，重新获取播放地址并从原位置继续:", currentSeek);
+      await this.initPlayer(true, currentSeek);
       return;
     }
-    // 其它错误：最多 3 次
+    // 其它错误：最多 3 次，首次重试从原位置开始
     if (this.retryInfo.count <= 3) {
-      await this.initPlayer(true, 0);
+      const seekPosition = this.retryInfo.count === 1 ? currentSeek : 0;
+      console.log("🔄 播放出错，尝试重试:", { count: this.retryInfo.count, seekPosition });
+      // 只在第一次重试时显示提示，避免过于频繁
+      if (this.retryInfo.count === 1) {
+        window.$message.info("播放出现问题，正在尝试恢复...");
+      }
+      await this.initPlayer(true, seekPosition);
       return;
     }
     // 超过次数：切到下一首或清空