@aochuang/common 1.0.142 → 1.0.144

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

@@ -65,7 +65,7 @@ export default class VoicePlayerAAC {
       this._timer = setInterval(() => {
         if (!this._play) return
         const currPosition = this.$audio.currentTime
-        this.options.onPlaying?.({
+        this.options.onPlaying && this.options.onPlaying({
           currPosition,
           totalPosition
         })
@@ -76,7 +76,7 @@ export default class VoicePlayerAAC {
       }, 100)
     }
     this.$audio.onplay = () => {
-      this.options.onPlay?.()
+      this.options.onPlay && this.options.onPlay()
     }
 
     this.$audio.onended = () => {
@@ -91,11 +91,11 @@ export default class VoicePlayerAAC {
 
     this.$audio.addEventListener('stop', () => {
       clearInterval(this._timer)
-      this.options.onEnded?.()
+      this.options.onEnded && this.options.onEnded()
     })
 
     this.$audio.addEventListener('error', () => {
-      this.options.onError?.({
+      this.options.onError && this.options.onError({
         type: 'aac',
         url: this._url,
         message: this.$audio.error || '未知音频错误'
@@ -146,7 +146,7 @@ export default class VoicePlayerAAC {
     if (!url) {
       this.stop()
     }
-    cb?.({ status: 'success' })
+    cb && cb({ status: 'success' })
   }
 
   start() {
@@ -193,7 +193,7 @@ export default class VoicePlayerAAC {
             this.$audio.addEventListener('playing', () => this.isPlaying = true)
             this.$audio.addEventListener('pause', () => this.isPlaying = false)
             this.mediaSource.addEventListener('sourceerror', (e) => {
-              this.options.onError?.({ type: 'mse', url: this._url, message: e })
+              this.options.onError && this.options.onError({ type: 'mse', url: this._url, message: e })
             })
             this.mediaSource.addEventListener('sourceopen', async () => {
               if (!this._play) return
@@ -230,7 +230,7 @@ export default class VoicePlayerAAC {
                     if (bufferStart < cleanEnd && cleanEnd <= bufferEnd) {
                       try {
                         await this.safeRemoveBuffer(this.sourceBuffer, bufferStart, cleanEnd)
-                      } catch {
+                      } catch (e) {
                         // 清理失败时跳过本次清理，后续追加失败会走 appendBufferSafe 的配额兜底。
                       }
                     }
@@ -246,7 +246,7 @@ export default class VoicePlayerAAC {
                           this.mediaSource.endOfStream()
                         }
                       }
-                    } catch {
+                    } catch (e) {
                       // 当前分片加载失败时停止本轮追加，下一轮缓冲检查会继续尝试。
                     } finally {
                       this.loadNextSegment = false
@@ -262,7 +262,7 @@ export default class VoicePlayerAAC {
                 }, 500)
   
               } catch (e) {
-                this.options.onError?.({ type: 'mse', url: this._url, message: e })
+                this.options.onError && this.options.onError({ type: 'mse', url: this._url, message: e })
               }
             }, { once: true })
             this.$audio.play().catch(() => {})
@@ -297,7 +297,7 @@ export default class VoicePlayerAAC {
             })
           }
         } catch (err) {
-          this.options.onError?.({ type: 'global', url: this._url, message: err })
+          this.options.onError && this.options.onError({ type: 'global', url: this._url, message: err })
         }
       }).finally(() => {
         this.downloading = false
@@ -321,7 +321,7 @@ export default class VoicePlayerAAC {
           // 兜底：强制清空所有缓冲
           try {
             sourceBuffer.remove(0, sourceBuffer.buffered.end(0))
-          } catch {}
+          } catch (e) {}
           return false
         }
       }
@@ -379,7 +379,7 @@ export default class VoicePlayerAAC {
       }
       const [start, end] = this.getBufferedRange()
       return [start, end]
-    } catch {
+    } catch (e) {
       return [0, 0]
     } finally {
       this.isPreloading = false
@@ -426,7 +426,7 @@ export default class VoicePlayerAAC {
       }
 
     } catch (err) {
-      this.options.onError?.({ type: 'mse', url: this._url, message: err })
+      this.options.onError && this.options.onError({ type: 'mse', url: this._url, message: err })
     } finally {
       // 延迟释放锁，确保缓冲完全加载
       setTimeout(() => {
@@ -529,14 +529,14 @@ export default class VoicePlayerAAC {
 
   stop (callback) {
     if (!this._play) {
-      callback?.()
+      callback && callback()
       return 
     }
     this._play = false
     this.$audio.pause()
     this.$audio.currentTime = 0
     this.$audio.dispatchEvent(new Event('stop'))
-    callback?.()
+    callback && callback()
   }
 
   destroy() {

package/package.json

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

package/utils/util.js

@@ -221,6 +221,9 @@ export function createThrottleRequest (requestFn, idField = 'id') {
   let loadMap = {}
   let timer = null
 	return (id) => {
+    if (cacheMap[id]) {
+      return cacheMap[id]
+    }
     const ps = createPromise()
     cacheMap[id] = ps
     loadMap[id] = true
@@ -231,12 +234,15 @@ export function createThrottleRequest (requestFn, idField = 'id') {
       requestFn(keys).then(rs => {
         if (rs && rs.length) {
           rs.forEach(v => {
-            cacheMap[v[idField]]._execed = true
-            cacheMap[v[idField]].resolve(v)
+            const cacheId = v[idField]
+            if (cacheMap[cacheId]) {
+              cacheMap[cacheId]._execed = true
+              cacheMap[cacheId].resolve(v)
+            }
           })
         }
         keys.forEach(id => {
-          if (!cacheMap[id]._execed) {
+          if (cacheMap[id] && !cacheMap[id]._execed) {
             // 如果没有返回表示没有找到数据
             cacheMap[id].reject(new Error('未找到数据'))
           }
@@ -244,8 +250,10 @@ export function createThrottleRequest (requestFn, idField = 'id') {
         return rs
       }, err => {
         keys.forEach(id => {
-          cacheMap[id]._execed = true
-          cacheMap[id].reject(err)
+          if (cacheMap[id]) {
+            cacheMap[id]._execed = true
+            cacheMap[id].reject(err)
+          }
         })
       }).finally(() => {
         cacheMap = {}
@@ -424,4 +432,4 @@ export const retryRequest = (() => {
 			}
 		}
 	}
-})()
+})()