修复 fetchError websockeError stremEnd 异常的时候没有结束播放

langhuihui · May 24, 2024 · b95f68e · b95f68e
1 parent 6c1e216
commit b95f68e
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 10 deletions.
diff --git a/demo/document.md b/demo/document.md
@@ -1086,6 +1086,9 @@ const jessibuca = new JessibucaPro({
 
 3.如果条件允许，把出问题的流，保存个flv文件，发给作者。
 
+#### 日志下载
+
+<img src="/public/img/save-log.png">
 
 ### 关于绿屏和花屏
 

diff --git a/demo/public/dist.zip b/demo/public/dist.zip
diff --git a/demo/public/img/save-log.png b/demo/public/img/save-log.png
diff --git a/dist/jessibuca.js b/dist/jessibuca.js
diff --git a/src/jessibuca.js b/src/jessibuca.js
@@ -454,7 +454,6 @@ class Jessibuca extends Emitter {
                     }
                 })
             })
-
             //
             this.player.once(EVENTS_ERROR.webcodecsH265NotSupport, () => {
                 this.pause().then(() => {
@@ -532,20 +531,50 @@ class Jessibuca extends Emitter {
                         this.play(url, options).then(() => {
                             // resolve();
                             this.debug.log('Jessibuca', 'wasm decode error and reset player and play success')
-                        }).catch(() => {
+                        }).catch((e) => {
                             // reject();
                             this.debug.warn('Jessibuca', 'wasm decode error and reset player and play error')
                         });
                     })
                 } else {
-                    this.debug.warn('Jessibuca', 'wasm decode error and paused');
+                    this.pause().then(() => {
+                        this.debug.log('Jessibuca', 'wasm decode error and paused');
+                    }).catch((e) => {
+                        this.debug.warn('Jessibuca', 'wasm decode error and paused error', e)
+                    })
                 }
             })
+            // fetch error
+            this.player.once(EVENTS_ERROR.fetchError, () => {
+                this.pause().then(() => {
+                    this.debug.log('Jessibuca', 'fetch error and pause play')
+                }).catch((e) => {
+                    this.debug.warn('Jessibuca', 'fetch error and pause play error', e)
+                })
+            })
 
+            //
+            this.player.once(EVENTS_ERROR.websocketError, () => {
+                this.pause().then(() => {
+                    this.debug.log('Jessibuca', 'websocket Error and pause play')
+                }).catch((e) => {
+                    this.debug.warn('Jessibuca', 'websocket Error and pause play error', e)
+                })
+            })
+
+            //
+            this.player.once(EVENTS.streamEnd, () => {
+                this.pause().then(() => {
+                    this.debug.log('Jessibuca', 'stream End and pause play')
+                }).catch((e) => {
+                    this.debug.warn('Jessibuca', 'stream End and pause play error', e)
+                })
+            })
 
             // 监听 delay timeout
             this.player.on(EVENTS.delayTimeout, () => {
-                if (this.player._opt.heartTimeoutReplay && (this._heartTimeoutReplayTimes < this.player._opt.heartTimeoutReplayTimes || this.player._opt.heartTimeoutReplayTimes === -1)) {
+                if (this.player._opt.heartTimeoutReplay &&
+                    (this._heartTimeoutReplayTimes < this.player._opt.heartTimeoutReplayTimes || this.player._opt.heartTimeoutReplayTimes === -1)) {
                     this.debug.log('Jessibuca', `delay timeout replay time is ${this._heartTimeoutReplayTimes}`)
                     this._heartTimeoutReplayTimes += 1;
                     this.play(url, options).then(() => {
@@ -559,7 +588,8 @@ class Jessibuca extends Emitter {
 
             // 监听 loading timeout
             this.player.on(EVENTS.loadingTimeout, () => {
-                if (this.player._opt.loadingTimeoutReplay && (this._loadingTimeoutReplayTimes < this.player._opt.loadingTimeoutReplayTimes || this.player._opt.loadingTimeoutReplayTimes === -1)) {
+                if (this.player._opt.loadingTimeoutReplay &&
+                    (this._loadingTimeoutReplayTimes < this.player._opt.loadingTimeoutReplayTimes || this.player._opt.loadingTimeoutReplayTimes === -1)) {
                     this.debug.log('Jessibuca', `loading timeout replay time is ${this._loadingTimeoutReplayTimes}`)
                     this._loadingTimeoutReplayTimes += 1;
                     this.play(url, options).then(() => {

diff --git a/src/player/index.js b/src/player/index.js
@@ -520,17 +520,20 @@ export default class Player extends Emitter {
                 this.checkLoadingTimeout();
                 // fetch error
                 this.stream.once(EVENTS_ERROR.fetchError, (error) => {
-                    reject(error)
+                    // reject(error)
+                    this.emitError(EVENTS_ERROR.fetchError, error);
                 })
 
                 // ws
                 this.stream.once(EVENTS_ERROR.websocketError, (error) => {
-                    reject(error)
+                    // reject(error)
+                    this.emitError(EVENTS_ERROR.websocketError, error);
                 })
 
                 // stream end
-                this.stream.once(EVENTS.streamEnd, () => {
-                    reject();
+                this.stream.once(EVENTS.streamEnd, (msg) => {
+                    // reject();
+                    this.emitError(EVENTS.streamEnd, msg);
                 })
 
                 // success