🐞 fix: 统一错误码 & 原生播放器去除跳转等待

Author: imsyy

src/core/audio-player/AudioElementPlayer.ts

@@ -1,4 +1,9 @@
-import { AUDIO_EVENTS, BaseAudioPlayer, type AudioEventType } from "./BaseAudioPlayer";
+import {
+  AUDIO_EVENTS,
+  AudioErrorCode,
+  BaseAudioPlayer,
+  type AudioEventType,
+} from "./BaseAudioPlayer";
 
 /**
  * 基于 HTMLAudioElement 的播放器实现
@@ -76,7 +81,8 @@ export class AudioElementPlayer extends BaseAudioPlayer {
     this.isInternalSeeking = true;
     this.targetSeekTime = time;
 
-    await super.seek(time);
+    this.cancelPendingPause();
+    this.doSeek(time);
   }
 
   /**
@@ -149,13 +155,13 @@ export class AudioElementPlayer extends BaseAudioPlayer {
     if (!this.audioElement.error) return 0;
     switch (this.audioElement.error.code) {
       case MediaError.MEDIA_ERR_ABORTED:
-        return 1;
+        return AudioErrorCode.ABORTED;
       case MediaError.MEDIA_ERR_NETWORK:
-        return 2;
+        return AudioErrorCode.NETWORK;
       case MediaError.MEDIA_ERR_DECODE:
-        return 3;
+        return AudioErrorCode.DECODE;
       case MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED:
-        return 4;
+        return AudioErrorCode.SRC_NOT_SUPPORTED;
       default:
         return 0;
     }

src/core/audio-player/BaseAudioPlayer.ts

@@ -28,6 +28,19 @@ export type AudioEventMap = {
     : Event;
 };
 
+export enum AudioErrorCode {
+  /** 用户中止 */
+  ABORTED = 1,
+  /** 网络错误 */
+  NETWORK = 2,
+  /** 解码错误 */
+  DECODE = 3,
+  /** 格式不支持 */
+  SRC_NOT_SUPPORTED = 4,
+  /** DOMException: AbortError */
+  DOM_ABORT = 20,
+}
+
 const SEEK_FADE_TIME = 0.05;
 
 /**
@@ -263,7 +276,6 @@ export abstract class BaseAudioPlayer extends EventTarget {
 
   /**
    * 取消正在进行的暂停计划
-   *
    * 用于在淡出期间点击了播放或跳转，取消之前的暂停指令
    */
   protected cancelPendingPause() {

src/core/audio-player/ffmpeg-engine/FFmpegAudioPlayer.ts

@@ -1,4 +1,4 @@
-import { AUDIO_EVENTS, BaseAudioPlayer } from "../BaseAudioPlayer";
+import { AUDIO_EVENTS, AudioErrorCode, BaseAudioPlayer } from "../BaseAudioPlayer";
 import AudioWorker from "./audio.worker?worker";
 import type { AudioMetadata, PlayerState, WorkerResponse } from "./types";
 
@@ -7,13 +7,6 @@ const HIGH_WATER_MARK = 30;
 /** 缓冲区低水位标记（秒），低于此值恢复解码 */
 const LOW_WATER_MARK = 10;
 
-// const ERR_ABORTED = 1;
-/** 网络错误码 */
-const ERR_NETWORK = 2;
-/** 解码错误码 */
-const ERR_DECODE = 3;
-// const ERR_SRC_NOT_SUPPORTED = 4;
-
 /**
  * 基于 FFmpeg WASM 的音频播放器实现
  *
@@ -159,7 +152,7 @@ export class FFmpegAudioPlayer extends BaseAudioPlayer {
           }
         } catch (e) {
           this.cleanupLoadPromise();
-          this.handleError((e as Error).message, ERR_NETWORK);
+          this.handleError((e as Error).message, AudioErrorCode.NETWORK);
           reject(e);
         }
       };
@@ -348,7 +341,7 @@ export class FFmpegAudioPlayer extends BaseAudioPlayer {
    * @param msg 错误消息
    * @param code 错误码
    */
-  private handleError(msg: string, code: number = ERR_DECODE) {
+  private handleError(msg: string, code: number = AudioErrorCode.DECODE) {
     console.error("[FFmpegAudioPlayer]", msg, code);
 
     this._errorCode = code;
@@ -381,7 +374,7 @@ export class FFmpegAudioPlayer extends BaseAudioPlayer {
             this.metadataReject(new Error(resp.error));
             this.cleanupLoadPromise();
           }
-          this.handleError(resp.error, ERR_DECODE);
+          this.handleError(resp.error, AudioErrorCode.DECODE);
           break;
         case "METADATA":
           this.metadata = {

src/core/player/PlayerController.ts

@@ -12,6 +12,7 @@ import lastfmScrobbler from "@/utils/lastfmScrobbler";
 import { calculateProgress } from "@/utils/time";
 import { LyricLine } from "@applemusic-like-lyrics/lyric";
 import { DebouncedFunc, throttle } from "lodash-es";
+import { AudioErrorCode } from "@/core/audio-player/BaseAudioPlayer";
 import { useAudioManager } from "./AudioManager";
 import { useLyricManager } from "./LyricManager";
 import { mediaSessionManager } from "./MediaSessionManager";
@@ -454,7 +455,7 @@ class PlayerController {
     );
 
     // 用户主动中止 (Code 1) 或 AbortError (Code 20) - 不重试
-    if (errCode === 1 || errCode === 20) {
+    if (errCode === AudioErrorCode.ABORTED || errCode === AudioErrorCode.DOM_ABORT) {
       statusStore.playLoading = false;
       this.retryInfo.count = 0;
       return;