@give-tech/ec-player 0.0.1-beta.35 → 0.0.1-beta.37

package/dist/index.js

@@ -1371,6 +1371,10 @@ class SegmentPrefetcher extends BasePrefetcher {
       callbacks.onSegmentFetched?.(nextIndex, data);
       console.log(`[SegmentPrefetcher] Fetched segment #${nextIndex}: ${data.length} bytes, ${fetchTime.toFixed(0)}ms`);
     } catch (error) {
+      if (error.name === "AbortError") {
+        console.log(`[SegmentPrefetcher] Fetch aborted`);
+        return;
+      }
       console.error(`[SegmentPrefetcher] Fetch failed:`, error.message);
       this.callbacks.onError?.(error);
     } finally {
@@ -1544,6 +1548,10 @@ class StreamPrefetcher extends BasePrefetcher {
         console.log(`[StreamPrefetcher] Download complete: ${this.totalDownloadedBytes} bytes`);
       }
     } catch (error) {
+      if (error.name === "AbortError") {
+        console.log(`[StreamPrefetcher] Read aborted`);
+        return;
+      }
       console.error(`[StreamPrefetcher] Read error:`, error.message);
       this.callbacks.onError?.(error);
     }
@@ -1664,7 +1672,8 @@ class HLSSegmentPrefetcher extends SegmentPrefetcher {
       const { start, end } = segment.byteRange;
       headers["Range"] = `bytes=${start}-${end}`;
     }
-    const response = await fetch(url, { headers });
+    const signal = this.player.getAbortSignal();
+    const response = await fetch(url, { headers, signal });
     return new Uint8Array(await response.arrayBuffer());
   }
   /**
@@ -1708,6 +1717,7 @@ class HLSPlayer extends BasePlayer {
     this._sampleQueue = [];
     this._currentSegmentDuration = 0;
     this.prefetcher = null;
+    this.abortController = null;
     this._nalCountInCurrentSegment = 0;
     this.lastRenderTime = 0;
     this.playStartTime = 0;
@@ -1768,7 +1778,7 @@ class HLSPlayer extends BasePlayer {
           this.frameBuffer.shift();
           this.renderer.render(frame);
           this.accumulatedMediaTime += frameDurationMs;
-          this.setCurrentTime(this.accumulatedMediaTime / 1e3);
+          this.setCurrentTime(this.accumulatedMediaTime);
           this.updateState({ resolution: `${frame.width}x${frame.height}` });
           const fps = this.renderer.updateFps();
           this.updateState({ fps });
@@ -1797,11 +1807,24 @@ class HLSPlayer extends BasePlayer {
   get sampleQueue() {
     return this._sampleQueue;
   }
+  /** 获取 AbortSignal（供预取器使用） */
+  getAbortSignal() {
+    if (!this.abortController) {
+      const controller = new AbortController();
+      controller.abort();
+      return controller.signal;
+    }
+    return this.abortController.signal;
+  }
   /**
    * 加载 HLS 播放列表
    */
   async load(url) {
     this.currentPlaylistUrl = url;
+    if (this.abortController) {
+      this.abortController.abort();
+    }
+    this.abortController = new AbortController();
     this.segments = [];
     this.fmp4Segments = [];
     this.initSegment = null;
@@ -1869,6 +1892,24 @@ class HLSPlayer extends BasePlayer {
     this.decodeLoop();
     this.frameTimer = requestAnimationFrame(this.renderLoop);
   }
+  /**
+   * 销毁播放器，释放所有资源
+   */
+  destroy() {
+    if (this.abortController) {
+      this.abortController.abort();
+      this.abortController = null;
+    }
+    if (this.prefetcher) {
+      this.prefetcher.reset();
+      this.prefetcher = null;
+    }
+    if (this.hevcDecoder) {
+      this.hevcDecoder.destroy();
+      this.hevcDecoder = null;
+    }
+    super.destroy();
+  }
   /**
    * 跳转到指定时间
    */
@@ -2101,7 +2142,16 @@ class HLSPlayer extends BasePlayer {
       const { start, end } = this.initSegment.byteRange;
       headers["Range"] = `bytes=${start}-${end}`;
     }
-    const response = await fetch(url, { headers });
+    let response;
+    try {
+      response = await fetch(url, { headers, signal: this.abortController?.signal });
+    } catch (error) {
+      if (error.name === "AbortError") {
+        console.log("[fMP4] Load init segment aborted");
+        return;
+      }
+      throw error;
+    }
     const data = new Uint8Array(await response.arrayBuffer());
     console.log("[fMP4] Init segment data size:", data.length, "bytes");
     const initInfo = this.fmp4Demuxer.parseInitSegment(data);
@@ -2141,7 +2191,16 @@ class HLSPlayer extends BasePlayer {
       headers["Range"] = `bytes=${start}-${end}`;
       console.log("[fMP4] Using byte range for init segment:", { start, end });
     }
-    const response = await fetch(url, { headers });
+    let response;
+    try {
+      response = await fetch(url, { headers, signal: this.abortController?.signal });
+    } catch (error) {
+      if (error.name === "AbortError") {
+        console.log("[fMP4] Load new init segment aborted");
+        return;
+      }
+      throw error;
+    }
     const data = new Uint8Array(await response.arrayBuffer());
     console.log("[fMP4] New init segment data size:", data.length, "bytes");
     const initInfo = this.fmp4Demuxer.parseInitSegment(data);
@@ -2265,7 +2324,16 @@ class HLSPlayer extends BasePlayer {
    * 解析 HLS 播放列表
    */
   async parsePlaylist(url) {
-    const response = await fetch(url);
+    let response;
+    try {
+      response = await fetch(url, { signal: this.abortController?.signal });
+    } catch (error) {
+      if (error.name === "AbortError") {
+        console.log("[HLSPlayer] Parse playlist aborted");
+        return { isMaster: true, isFMP4: false, segments: [], fmp4Segments: [], variants: 0 };
+      }
+      throw error;
+    }
     const content = await response.text();
     const lines = content.split("\n");
     const segments = [];
@@ -3010,6 +3078,7 @@ class FLVPlayer extends BasePlayer {
     this.liveReader = null;
     this.liveDownloadAbort = false;
     this._lastQueuedTimestamp = -1;
+    this.abortController = null;
     this._currentDownloadSpeed = 0;
     this.renderedFrames = 0;
     this.lastRenderLogTime = 0;
@@ -3149,6 +3218,7 @@ class FLVPlayer extends BasePlayer {
     console.log("[FLVPlayer] Loading URL:", url);
     this.currentUrl = url;
     this.stopLiveDownload();
+    this.abortController = new AbortController();
     this._timedFrameBuffer = [];
     this._videoTagQueue = [];
     this.liveDownloadAbort = false;
@@ -3449,7 +3519,17 @@ class FLVPlayer extends BasePlayer {
    */
   async loadFLV(url) {
     console.log("[FLVPlayer] Fetching FLV...");
-    const response = await fetch(url);
+    const signal = this.abortController?.signal;
+    let response;
+    try {
+      response = await fetch(url, { signal });
+    } catch (error) {
+      if (error.name === "AbortError") {
+        console.log("[FLVPlayer] Fetch aborted");
+        return;
+      }
+      throw error;
+    }
     if (!response.ok) {
       throw new Error(`Failed to fetch FLV: ${response.status}`);
     }
@@ -3524,6 +3604,10 @@ class FLVPlayer extends BasePlayer {
         }
       }
     } catch (error) {
+      if (error.name === "AbortError" || this.liveDownloadAbort) {
+        console.log("[FLVPlayer] Loading aborted");
+        return;
+      }
       console.error("[FLVPlayer] Error loading FLV:", error);
       throw error;
     } finally {
@@ -3568,6 +3652,10 @@ class FLVPlayer extends BasePlayer {
    */
   stopLiveDownload() {
     this.liveDownloadAbort = true;
+    if (this.abortController) {
+      this.abortController.abort();
+      this.abortController = null;
+    }
     if (this.liveReader) {
       this.liveReader.cancel();
       this.liveReader = null;