hls error handler

shiyiya · May 7, 2024 · 060aa83 · 060aa83
1 parent 9491e84
commit 060aa83
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 24 deletions.
diff --git a/packages/dash/src/index.ts b/packages/dash/src/index.ts
@@ -5,8 +5,6 @@ const PLUGIN_NAME = 'oplayer-plugin-dash'
 
 export type Matcher = (video: HTMLVideoElement, source: Source) => boolean
 
-export type Active = (instance: MediaPlayerClass, library: typeof import('dashjs')) => void
-
 export interface DashPluginOptions {
   library?: string
   matcher?: Matcher

diff --git a/packages/docs/public/oplayer.html b/packages/docs/public/oplayer.html
@@ -185,7 +185,7 @@
     <script src="https://cdn.jsdelivr.net/npm/@oplayer/[email protected]/dist/index.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/@oplayer/[email protected]/dist/index.min.js"></script>
 
-    <script src="https://cdn.jsdelivr.net/npm/@oplayer/[email protected].3/dist/index.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@oplayer/[email protected].4/dist/index.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/@oplayer/[email protected]/dist/index.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/@oplayer/[email protected]/dist/index.min.js"></script>
 

diff --git a/packages/hls/README.md b/packages/hls/README.md
@@ -88,7 +88,7 @@ export interface HlsPluginOptions {
 }
 ```
 
-## Handle Hls.js Error **v1.2.24.beta.0+**
+## Handle Hls.js Error
 
 ```ts
 OPlayer.make('#oplayer', {
@@ -99,11 +99,14 @@ OPlayer.make('#oplayer', {
 })
   .use([
     OHls({
-      errorHandler(player, data, cb) {
+      errorHandler(player, data) {
         // skip bufferAppendError
         if (data.details == 'bufferAppendError') return
 
-        cb(player, data)
+        player.emit('error', {
+          ...data,
+          message: data.type + ': ' + data.details
+        })
       }
     })
   ])

diff --git a/packages/hls/package.json b/packages/hls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oplayer/hls",
-  "version": "1.2.26-beta.3",
+  "version": "1.2.26-beta.4",
   "description": "Hls plugin for oplayer",
   "type": "module",
   "main": "./dist/index.es.js",

diff --git a/packages/hls/src/index.ts b/packages/hls/src/index.ts
@@ -6,20 +6,15 @@ const PLUGIN_NAME = 'oplayer-plugin-hls'
 
 export type Matcher = (video: HTMLVideoElement, source: Source, forceHLS: boolean) => boolean
 
-export type Active = (instance: Hls, library: typeof import('hls.js/dist/hls.min.js')) => void
-
 export interface HlsPluginOptions {
   library?: string
 
   matcher?: Matcher
 
   /**
    * custom handle hls fatal error
-   * @param {Events}
-   * @param {ErrorData}
-   * @returns {boolean}
    */
-  errorHandler?: (player: Player, data: ErrorData, cb: typeof defaultErrorHandler) => void
+  errorHandler?: (player: Player, data: ErrorData) => void
   /**
    * config for hls.js
    *
@@ -70,12 +65,6 @@ const defaultMatcher: Matcher = (video, source, forceHLS) => {
   )
 }
 
-const defaultErrorHandler = (player: Player, data: ErrorData) => {
-  const { type, details } = data
-  player.hasError = true
-  player.emit('error', { ...data, pluginName: PLUGIN_NAME, message: type + ': ' + details })
-}
-
 class HlsPlugin implements PlayerPlugin {
   key = 'hls'
   name = PLUGIN_NAME
@@ -87,16 +76,15 @@ class HlsPlugin implements PlayerPlugin {
 
   instance?: Hls
 
-  options: RequiredPartial<HlsPluginOptions, 'library'> = {
+  options: RequiredPartial<HlsPluginOptions, 'library' | 'errorHandler'> = {
     config: {},
     forceHLS: false,
     textControl: true,
     audioControl: true,
     qualityControl: true,
     withBitrate: false,
     qualitySwitch: 'immediate',
-    matcher: defaultMatcher,
-    errorHandler: defaultErrorHandler
+    matcher: defaultMatcher
   }
 
   constructor(options?: HlsPluginOptions) {
@@ -134,7 +122,7 @@ class HlsPlugin implements PlayerPlugin {
     $source.setAttribute('data-hls', '')
     $video.append($source)
 
-    instance.once(HlsPlugin.library.Events.DESTROYING, () => {
+    instance.on(HlsPlugin.library.Events.DESTROYING, () => {
       $source.remove()
     })
 
@@ -145,8 +133,21 @@ class HlsPlugin implements PlayerPlugin {
             instance.recoverMediaError()
             break
           case 'networkError':
+            if (!(data.networkDetails?.status === 404)) {
+              instance.startLoad()
+            }
+            break
           default:
-            errorHandler(player, data, defaultErrorHandler)
+            if (errorHandler) {
+              errorHandler(player, data)
+            } else {
+              player.hasError = true
+              player.emit('error', {
+                ...data,
+                pluginName: PLUGIN_NAME,
+                message: data.type + ': ' + data.details
+              })
+            }
             break
         }
       }