@aochuang/common 1.0.129 → 1.0.130

package/common/voice/voice-player-aac.js

@@ -2,19 +2,7 @@ import { loadScript } from '../../utils/file'
 import { getAacCodecParserLibPath } from './util'
 import axios from 'axios'
 
-async function appendBuffer(sourceBuffer, buffer) {
-  if (sourceBuffer.updating) {
-      await new Promise(resolve => {
-          sourceBuffer.addEventListener('updateend', resolve, { once: true });
-      });
-  }
-
-  sourceBuffer.appendBuffer(buffer);
-
-  return new Promise(resolve => {
-      sourceBuffer.addEventListener('updateend', resolve, { once: true });
-  });
-}
+const STREAMING_FILE_SIZE = 1 * 1024 * 1024
 
 export default class VoicePlayerAAC {
   constructor(options) {
@@ -59,12 +47,12 @@ export default class VoicePlayerAAC {
     this.bindAudioEvents()
   }
 
-  // 大于18M走分片解析逻辑
+  // AAC 的 SourceBuffer 配额在不同浏览器差异很大，超过 1MiB 统一走流式追加。
   isUseBigFile (audioData) {
     if (!audioData) {
       return false
     }
-    return audioData.byteLength > 18 * 1024 * 1024; // 18MB字节阈值
+    return audioData.byteLength > STREAMING_FILE_SIZE
   }
 
   bindAudioEvents() {
@@ -106,8 +94,7 @@ export default class VoicePlayerAAC {
       this.options.onEnded?.()
     })
 
-    this.$audio.addEventListener('error', (e) => {
-      console.error('Audio error:', this.$audio.error)
+    this.$audio.addEventListener('error', () => {
       this.options.onError?.({
         type: 'aac',
         url: this._url,
@@ -144,7 +131,6 @@ export default class VoicePlayerAAC {
       clearTimeout(this.seekDebounceTimer)
       this.seekDebounceTimer = setTimeout(async () => {
         const targetTime = Math.max(0, Math.min(position, this.estimatedDuration))
-        console.log('[setPosition] 防抖后执行跳转:', targetTime)
         await this.seekToTime(targetTime, targetTime < this.$audio.currentTime)
       }, 300)
     } else {
@@ -191,38 +177,40 @@ export default class VoicePlayerAAC {
         try {
           this.clearMediaResources()
           this.audioData = audioData
-          console.log('音频数据加载完成，大小:', this.audioData.byteLength)
+          const useStreaming = this.isUseBigFile(this.audioData)
           this.estimatedDuration = this.calculateEstimatedDuration(this.audioData.byteLength)
-          console.log('预估总时长:', this.estimatedDuration.toFixed(2), 's | 使用码率:', this.options.bitrateKbps, 'kbps')
           this.mediaSource = new MediaSource()
           this.currentMediaSource = this.mediaSource
           this.mediaSourceSrc = URL.createObjectURL(this.mediaSource)
           this.currentObjectUrl = this.mediaSourceSrc
           this.$audio.src = this.mediaSourceSrc
-          if (this.isUseBigFile(this.audioData)) {
+          if (useStreaming) {
             this.$audio.addEventListener('waiting', async () => {
               if (!this.isSeeking) {
-                console.log('检测到缓冲不足，补充10秒缓冲...')
                 await this.forcePreload(10)
               }
             }, { passive: true })
             this.$audio.addEventListener('playing', () => this.isPlaying = true)
             this.$audio.addEventListener('pause', () => this.isPlaying = false)
             this.mediaSource.addEventListener('sourceerror', (e) => {
-              console.error('媒体源错误:', e)
               this.options.onError?.({ type: 'mse', url: this._url, message: e })
             })
             this.mediaSource.addEventListener('sourceopen', async () => {
               if (!this._play) return
               try {
-                const MIME_TYPE = 'audio/aac; codecs=mp4a.40.2'
-                this.wrapper = new window.MSEAudioWrapper(MIME_TYPE)
+                this.wrapper = new window.MSEAudioWrapper('audio/aac')
                 this.iterator = this.wrapper.iterator(this.audioData)
-                this.sourceBuffer = this.mediaSource.addSourceBuffer(this.wrapper.mimeType || MIME_TYPE)
+                const firstSegment = this.iterator.next()
+                if (firstSegment.done || !firstSegment.value) {
+                  throw new Error('AAC 解析失败，未生成可播放分片')
+                }
+                if (!this.wrapper.mimeType) {
+                  throw new Error('AAC 解析失败，未识别出 MSE mimeType')
+                }
+                this.sourceBuffer = this.mediaSource.addSourceBuffer(this.wrapper.mimeType)
                 this.sourceBuffer.mode = 'sequence'
-                console.log('SourceBuffer 初始化完成，模式:', this.sourceBuffer.mode)
-                const initialSegments = []
-                for (let i = 0; i < 15; i++) {
+                const initialSegments = [firstSegment.value]
+                for (let i = 1; i < 15; i++) {
                   const { value, done } = this.iterator.next()
                   if (done) break
                   initialSegments.push(value)
@@ -230,7 +218,6 @@ export default class VoicePlayerAAC {
                 for (const seg of initialSegments) {
                   await this.appendBufferSafe(this.sourceBuffer, seg)
                 }
-                console.log('初始缓冲加载完成 | 缓冲范围:', this.getBufferedRange())
                 this.$audio.currentTime = 0
                 await this.$audio.play()
                 this.isPlaying = true
@@ -243,8 +230,8 @@ export default class VoicePlayerAAC {
                     if (bufferStart < cleanEnd && cleanEnd <= bufferEnd) {
                       try {
                         await this.safeRemoveBuffer(this.sourceBuffer, bufferStart, cleanEnd)
-                      } catch (err) {
-                        console.warn('清理缓冲失败，跳过本次操作:', err)
+                      } catch {
+                        // 清理失败时跳过本次清理，后续追加失败会走 appendBufferSafe 的配额兜底。
                       }
                     }
                   }
@@ -255,10 +242,12 @@ export default class VoicePlayerAAC {
                       if (!done) {
                         await this.appendBufferSafe(this.sourceBuffer, segment)
                       } else {
-                        this.mediaSource.endOfStream()
+                        if (this.mediaSource.readyState === 'open') {
+                          this.mediaSource.endOfStream()
+                        }
                       }
-                    } catch (err) {
-                      console.error('加载分片失败:', err)
+                    } catch {
+                      // 当前分片加载失败时停止本轮追加，下一轮缓冲检查会继续尝试。
                     } finally {
                       this.loadNextSegment = false
                     }
@@ -273,48 +262,32 @@ export default class VoicePlayerAAC {
                 }, 500)
   
               } catch (e) {
-                console.error('MSE 初始化失败:', e)
                 this.options.onError?.({ type: 'mse', url: this._url, message: e })
               }
             }, { once: true })
-            this.$audio.play().catch(err => console.log('等待缓冲中:', err.message))
+            this.$audio.play().catch(() => {})
           } else {
             this.mediaSource.addEventListener('sourceopen', async () => {
               if (!this._play) {
                 return
               }
               try {
-                this.wrapper = new window.MSEAudioWrapper('audio/aac');
-                this.sourceBuffer = null;
-                let segmentCount = 0;
-                let totalBytesProcessed = 0;
+                this.wrapper = new window.MSEAudioWrapper('audio/aac')
+                this.sourceBuffer = null
                 for (const segment of this.wrapper.iterator(this.audioData)) {
-                  segmentCount++;
-                  totalBytesProcessed += segment.byteLength;
-                  console.log(`Processing segment ${segmentCount}, size: ${segment.byteLength}`);
                   if (!this.sourceBuffer) {
                     if (this.wrapper.mimeType) {
-                      console.log('Creating SourceBuffer with mimeType:', this.wrapper.mimeType);
-                      this.sourceBuffer = this.mediaSource.addSourceBuffer(this.wrapper.mimeType);
-                      console.log('Default SourceBuffer mode:', this.sourceBuffer.mode);
-                      this.sourceBuffer.mode = 'sequence'; // Critical for timeline placement
-                      console.log('Set SourceBuffer mode to:', this.sourceBuffer.mode);
+                      this.sourceBuffer = this.mediaSource.addSourceBuffer(this.wrapper.mimeType)
+                      this.sourceBuffer.mode = 'sequence' // Critical for timeline placement
                     } else {
-                      throw new Error('MimeType not determined yet');
+                      throw new Error('MimeType not determined yet')
                     }
                   }
-                  await appendBuffer(this.sourceBuffer, segment);
-                }
-                console.log(`Finished processing. Total segments: ${segmentCount}, Total bytes: ${totalBytesProcessed}`);
-                this.mediaSource.endOfStream();
-                if (this.sourceBuffer && this.sourceBuffer.buffered.length > 0) {
-                  const buffered = this.sourceBuffer.buffered;
-                  console.log(`Buffered range: ${buffered.start(0)} - ${buffered.end(0)}`);
-                  console.log(`Audio duration: ${this.$audio.duration}`);
+                  await this.appendBufferSafe(this.sourceBuffer, segment)
                 }
+                this.mediaSource.endOfStream()
                 this.$audio.play()
               } catch (e) {
-                console.error(e);
                 this.options.onError && this.options.onError({
                   type: 'aac',
                   url: this._url,
@@ -324,7 +297,6 @@ export default class VoicePlayerAAC {
             })
           }
         } catch (err) {
-          console.error('音频播放全局错误:', err)
           this.options.onError?.({ type: 'global', url: this._url, message: err })
         }
       }).finally(() => {
@@ -341,21 +313,15 @@ export default class VoicePlayerAAC {
         }
         sourceBuffer.remove(start, end)
         await new Promise(resolve => sourceBuffer.addEventListener('updateend', resolve, { once: true }))
-        // 校验清理结果，确保无残留
-        if (sourceBuffer.buffered.length === 0) {
-          console.log(`缓冲清理成功: ${start.toFixed(1)}s -> ${end.toFixed(1)}s | 无残留`)
-          return true
-        }
+        return true
       } catch (err) {
         if (err.name === 'InvalidStateError' && i < retries - 1) {
-          console.warn(`缓冲清理重试 ${i + 1}/${retries}:`, err)
           await new Promise(resolve => setTimeout(resolve, delay))
         } else {
-          console.error('缓冲清理最终失败:', err)
           // 兜底：强制清空所有缓冲
           try {
             sourceBuffer.remove(0, sourceBuffer.buffered.end(0))
-          } catch (e) {}
+          } catch {}
           return false
         }
       }
@@ -375,16 +341,13 @@ export default class VoicePlayerAAC {
   // 重写：适配逻辑仅在缓冲覆盖目标时间后生效，不提前适配到分片起始
   getNearestValidPlayTime(targetTime) {
     if (!this.sourceBuffer || this.sourceBuffer.buffered.length === 0) {
-      console.log('[适配位置] 无缓冲，使用目标时间:', targetTime)
       return targetTime
     }
 
     const [bufferStart, bufferEnd] = this.getBufferedRange()
-    console.log(`[适配位置] 目标时间:${targetTime.toFixed(1)}s | 缓冲范围:${bufferStart.toFixed(1)}~${bufferEnd.toFixed(1)}s`)
 
     // 核心修改：如果缓冲未覆盖目标时间，返回目标时间（等待加载），而非跳转到缓冲边界
     if (targetTime > bufferEnd) {
-      console.log('[适配位置] 缓冲未覆盖目标时间，等待加载后再定位')
       return targetTime
     }
     if (targetTime < bufferStart) return bufferStart
@@ -397,7 +360,6 @@ export default class VoicePlayerAAC {
     const newTime = this.getNearestValidPlayTime(targetTime)
 
     if (newTime !== this.$audio.currentTime) {
-      console.log('[自动适配] 调整播放时间为:', newTime.toFixed(1))
       this.$audio.currentTime = newTime
     }
   }
@@ -416,10 +378,8 @@ export default class VoicePlayerAAC {
         preloaded++
       }
       const [start, end] = this.getBufferedRange()
-      console.log(`预加载完成，新增${preloaded}秒缓冲 | 当前缓冲:${start.toFixed(1)}~${end.toFixed(1)}s`)
       return [start, end]
-    } catch (err) {
-      console.error('强制预加载失败:', err)
+    } catch {
       return [0, 0]
     } finally {
       this.isPreloading = false
@@ -429,16 +389,14 @@ export default class VoicePlayerAAC {
   /**
    * 核心重写：解决定位到分片起始、向后跳转无反应、适配过早问题
    */
-  async seekToTime(targetTime, isBackwardSeek = false) {
+  async seekToTime(targetTime) {
     if (this.isSeeking) {
-      console.log('[seekToTime] 正在执行拖拽，跳过本次请求')
       return
     }
     this.isSeeking = true
     // 锁定最终目标时间，全程不改变
     const finalTargetTime = Math.max(0, Math.min(targetTime, this.estimatedDuration))
     this.lastSeekTarget = finalTargetTime
-    console.log(`[seekToTime] 锁定目标时间:${finalTargetTime.toFixed(1)}s | 向后跳转:${isBackwardSeek}`)
 
     try {
       // 1. 等待空闲 + 彻底清理旧缓冲
@@ -453,14 +411,12 @@ export default class VoicePlayerAAC {
       // 2. 精准计算字节位置（使用可配置码率），重置迭代器
       const targetBytePosition = Math.max(0, (finalTargetTime / this.estimatedDuration) * this.audioData.length)
       this.iterator = this.wrapper.iterator(this.audioData.slice(targetBytePosition))
-      console.log(`[seekToTime] 迭代器定位到字节:${targetBytePosition} | 对应目标时间:${finalTargetTime.toFixed(1)}s`)
 
       // 3. 预加载目标缓冲，等待加载完成
-      const [bufferStart, bufferEnd] = await this.forcePreload(20) // 增加预加载时长，确保覆盖目标时间
+      await this.forcePreload(20) // 增加预加载时长，确保覆盖目标时间
 
       // 4. 适配位置（此时缓冲已加载，不会跳转到分片起始）
       const adaptTime = this.getNearestValidPlayTime(finalTargetTime)
-      console.log(`[seekToTime] 缓冲加载完成 | 最终定位时间:${adaptTime.toFixed(1)}s`)
 
       // 5. 强制设置播放位置，解决向后跳转无反应
       this.$audio.currentTime = adaptTime
@@ -470,7 +426,7 @@ export default class VoicePlayerAAC {
       }
 
     } catch (err) {
-      console.error('定位失败:', err)
+      this.options.onError?.({ type: 'mse', url: this._url, message: err })
     } finally {
       // 延迟释放锁，确保缓冲完全加载
       setTimeout(() => {
@@ -497,12 +453,19 @@ export default class VoicePlayerAAC {
       await new Promise(resolve => sourceBuffer.addEventListener('updateend', resolve, { once: true }))
     } catch (err) {
       if (err.name === 'QuotaExceededError') {
-        console.warn('缓冲区已满，清理最旧的10秒缓冲...')
-        await this.safeRemoveBuffer(sourceBuffer, 0, Math.min(10, sourceBuffer.buffered.end(0)))
+        const bufferedEnd = sourceBuffer.buffered && sourceBuffer.buffered.length > 0
+          ? sourceBuffer.buffered.end(0)
+          : 0
+        if (bufferedEnd > 0) {
+          await this.safeRemoveBuffer(sourceBuffer, 0, Math.min(10, bufferedEnd))
+        }
+        if (sourceBuffer.updating) {
+          await new Promise(resolve => sourceBuffer.addEventListener('updateend', resolve, { once: true }))
+        }
         sourceBuffer.appendBuffer(buffer)
         await new Promise(resolve => sourceBuffer.addEventListener('updateend', resolve, { once: true }))
       } else {
-        console.error('追加缓冲失败:', err)
+        throw err
       }
     }
   }
@@ -557,11 +520,11 @@ export default class VoicePlayerAAC {
   }
 
   resume () {
-    console.log('aac不支持')
+    // AAC 暂不支持暂停/恢复。
   }
 
   pause () {
-    console.log('aac不支持')
+    // AAC 暂不支持暂停/恢复。
   }
 
   stop (callback) {
@@ -581,4 +544,4 @@ export default class VoicePlayerAAC {
     this.stop()
     this.clearMediaResources()
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/common",
-  "version": "1.0.129",
+  "version": "1.0.130",
   "description": "",
   "main": "index.js",
   "publishConfig": {