@gcorevideo/player 2.20.19 → 2.20.21

package/dist/plugins/index.js

@@ -37249,7 +37249,7 @@ class ClipsPlugin extends UICorePlugin {
 
 const templateHtml$1 = "<ul class=\"context-menu-list\">\n    <% if(options) { %>\n        <% for (var i = 0; i < options.length; i++) { %>\n        <li class=\"context-menu-list-item <%= options[i].class %>\"\n            data-<%= options[i].name %>><%= options[i].label %></li>\n        <% } %>\n    <% } %>\n</ul>\n";
 
-var version$1 = "2.20.19";
+var version$1 = "2.20.21";
 
 var packages = {
 	"node_modules/@clappr/core": {
@@ -39730,6 +39730,7 @@ class SpinnerThreeBounce extends UIContainerPlugin {
     template = tmpl(spinnerHTML);
     hasFatalError = false;
     hasBuffering = false;
+    _showOnError = false;
     constructor(container) {
         super(container);
         this.listenTo(this.container, Events$1.CONTAINER_STATE_BUFFERING, this.onBuffering);
@@ -39740,6 +39741,9 @@ class SpinnerThreeBounce extends UIContainerPlugin {
         this.listenTo(this.container, Events$1.CONTAINER_ERROR, this.onError);
         this.listenTo(this.container, Events$1.CONTAINER_READY, this.render);
     }
+    showOnError() {
+        this._showOnError = true;
+    }
     onBuffering() {
         this.hasBuffering = true;
         this._show();
@@ -39755,26 +39759,27 @@ class SpinnerThreeBounce extends UIContainerPlugin {
     }
     onStop() {
         trace(`${T$4} onStop`, {
-            showOnError: this.options.spinner?.showOnError,
+            showOnError: this._showOnError,
             hasFatalError: this.hasFatalError,
         });
-        if (!(this.hasFatalError && this.options.spinner?.showOnError)) {
-            this._hide();
-        }
+        // if (!(this.hasFatalError && this._showOnError)) {
+        //   this._hide()
+        // }
+        this._hide();
     }
     onError(e) {
         this.hasFatalError = e.code === PlaybackErrorCode.MediaSourceUnavailable;
         trace(`${T$4} onError`, {
-            showOnError: this.options.spinner?.showOnError,
+            showOnError: this._showOnError,
             hasFatalError: this.hasFatalError,
             error: e.code,
         });
-        if (this.options.spinner?.showOnError) {
-            this._show();
-        }
-        else {
-            this._hide();
-        }
+        // if (this._showOnError) {
+        //   this._show()
+        // } else {
+        //   this._hide()
+        // }
+        this._hide();
     }
     /**
      * Shows the spinner.
@@ -39818,6 +39823,7 @@ class SpinnerThreeBounce extends UIContainerPlugin {
      * @internal
      */
     render() {
+        // TODO control via sourcecontroller instead
         const showOnStart = this.options.spinner?.showOnStart;
         trace(`${T$4} render`, {
             buffering: this.container.buffering});
@@ -39942,6 +39948,7 @@ class SourceController extends CorePlugin {
     }
     onCoreReady() {
         this.core.getPlugin('error_screen')?.disable(); //  TODO test
+        // this.core.getPlugin('spinner')?.showOnError()
     }
     onActiveContainerChanged() {
         trace(`${T$3} onActiveContainerChanged`, {

package/lib/playback/HTML5Video.d.ts

@@ -2,7 +2,6 @@ import { ErrorOptions } from '@clappr/core';
 import { BasePlayback } from './BasePlayback.js';
 export default class HTML5Video extends BasePlayback {
     private stallTimerId;
-    private statllTimerId;
     /**
      * @internal
      */
@@ -11,5 +10,6 @@ export default class HTML5Video extends BasePlayback {
     _onEnded(): void;
     _handleBufferingEvents(): void;
     _onPlaying(): void;
+    _onPause(): void;
 }
 //# sourceMappingURL=HTML5Video.d.ts.map

package/lib/playback/HTML5Video.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HTML5Video.d.ts","sourceRoot":"","sources":["../../src/playback/HTML5Video.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAG3C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAQhD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,YAAY;IAClD,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,aAAa,CAA8B;IAEnD;;OAEG;IACM,WAAW,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAyBlD,UAAU;IAKV,QAAQ;IASR,sBAAsB;IAyBtB,UAAU;CAQpB"}
+{"version":3,"file":"HTML5Video.d.ts","sourceRoot":"","sources":["../../src/playback/HTML5Video.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAG3C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAQhD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,YAAY;IAClD,OAAO,CAAC,YAAY,CAAuB;IAE3C;;OAEG;IACM,WAAW,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAyBlD,UAAU;IAKV,QAAQ;IASR,sBAAsB;IAsBtB,UAAU;IASV,QAAQ;CAQlB"}

package/lib/playback/HTML5Video.js

@@ -6,7 +6,6 @@ const T = 'playback.html5_video';
 const STALL_TIMEOUT = 15000;
 export default class HTML5Video extends BasePlayback {
     stallTimerId = null;
-    statllTimerId = null;
     /**
      * @internal
      */
@@ -46,22 +45,19 @@ export default class HTML5Video extends BasePlayback {
         trace(`${T} _handleBufferingEvents`, {
             networkState: this.el.networkState,
         });
-        if (!this.statllTimerId) {
-            this.statllTimerId = setTimeout(() => {
+        if (!this.stallTimerId) {
+            this.stallTimerId = setTimeout(() => {
                 trace(`${T} _handleBufferingEvents stall timeout`, {
                     buffering: this.buffering,
                     ended: this.ended,
-                    isPlaying: this.isPlaying,
                 });
-                this.statllTimerId = null;
-                if (!this.isPlaying) {
-                    this.createError({
-                        code: PlaybackErrorCode.MediaSourceUnavailable,
-                        level: PlayerError.Levels.FATAL,
-                        message: 'Stall timeout',
-                        description: 'Playback stalled for too long',
-                    });
-                }
+                this.stallTimerId = null;
+                this.createError({
+                    code: PlaybackErrorCode.MediaSourceUnavailable,
+                    level: PlayerError.Levels.FATAL,
+                    message: 'Stall timeout',
+                    description: 'Playback stalled for too long',
+                });
             }, STALL_TIMEOUT);
         }
         super._handleBufferingEvents();
@@ -74,4 +70,12 @@ export default class HTML5Video extends BasePlayback {
         }
         super._onPlaying();
     }
+    _onPause() {
+        trace(`${T} _onPause`);
+        super._onPause();
+        if (this.stallTimerId) {
+            clearTimeout(this.stallTimerId);
+            this.stallTimerId = null;
+        }
+    }
 }

package/lib/plugins/source-controller/SourceController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SourceController.d.ts","sourceRoot":"","sources":["../../../src/plugins/source-controller/SourceController.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,KAAK,IAAI,IAAI,UAAU,EACxB,MAAM,cAAc,CAAA;AAwBrB;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;IAuC9C,OAAO,CAAC,WAAW,CAA8B;IAEjD,OAAO,CAAC,kBAAkB,CAAI;IAE9B,OAAO,CAAC,YAAY,CAA6B;IAEjD,OAAO,CAAC,MAAM,CAAQ;IAEtB,OAAO,CAAC,SAAS,CAAQ;IAEzB,OAAO,CAAC,IAAI,CAAiB;IAE7B;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED;;OAEG;gBACS,IAAI,EAAE,UAAU;IAW5B;;OAEG;IACM,UAAU;IAWnB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,wBAAwB;IAoBhC,OAAO,CAAC,2BAA2B;IAwCnC,OAAO,CAAC,KAAK;IAKb,OAAO,CAAC,aAAa;IA4BrB,OAAO,CAAC,kBAAkB;IAe1B;;OAEG;IACH,MAAM,KAAK,OAAO,WAEjB;CACF"}
+{"version":3,"file":"SourceController.d.ts","sourceRoot":"","sources":["../../../src/plugins/source-controller/SourceController.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,KAAK,IAAI,IAAI,UAAU,EACxB,MAAM,cAAc,CAAA;AAwBrB;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;IAuC9C,OAAO,CAAC,WAAW,CAA8B;IAEjD,OAAO,CAAC,kBAAkB,CAAI;IAE9B,OAAO,CAAC,YAAY,CAA6B;IAEjD,OAAO,CAAC,MAAM,CAAQ;IAEtB,OAAO,CAAC,SAAS,CAAQ;IAEzB,OAAO,CAAC,IAAI,CAAiB;IAE7B;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED;;OAEG;gBACS,IAAI,EAAE,UAAU;IAW5B;;OAEG;IACM,UAAU;IAWnB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,wBAAwB;IAoBhC,OAAO,CAAC,2BAA2B;IAwCnC,OAAO,CAAC,KAAK;IAKb,OAAO,CAAC,aAAa;IA4BrB,OAAO,CAAC,kBAAkB;IAe1B;;OAEG;IACH,MAAM,KAAK,OAAO,WAEjB;CACF"}

package/lib/plugins/source-controller/SourceController.js

@@ -110,6 +110,7 @@ export class SourceController extends CorePlugin {
     onCoreReady() {
         trace(`${T} onCoreReady`);
         this.core.getPlugin('error_screen')?.disable(); //  TODO test
+        // this.core.getPlugin('spinner')?.showOnError()
     }
     onActiveContainerChanged() {
         trace(`${T} onActiveContainerChanged`, {

package/lib/plugins/spinner-three-bounce/SpinnerThreeBounce.d.ts

@@ -42,7 +42,9 @@ export declare class SpinnerThreeBounce extends UIContainerPlugin {
     private template;
     private hasFatalError;
     private hasBuffering;
+    private _showOnError;
     constructor(container: Container);
+    showOnError(): void;
     private onBuffering;
     private onBufferFull;
     private onPlay;

package/lib/plugins/spinner-three-bounce/SpinnerThreeBounce.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SpinnerThreeBounce.d.ts","sourceRoot":"","sources":["../../../src/plugins/spinner-three-bounce/SpinnerThreeBounce.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,SAAS,EAET,iBAAiB,EAElB,MAAM,cAAc,CAAA;AAKrB,OAAO,mDAAmD,CAAA;AAM1D;;;GAGG;AACH,oBAAY,aAAa;IACvB;;;OAGG;IACH,IAAI,yBAAyB;CAC9B;AAED;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,OAAO,CAAC,SAAS,CAAQ;IAEzB;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED;;OAEG;IACH,IAAa,UAAU;;;MAKtB;IAED,OAAO,CAAC,WAAW,CAAuB;IAE1C,OAAO,CAAC,QAAQ,CAAwB;IAExC,OAAO,CAAC,aAAa,CAAQ;IAE7B,OAAO,CAAC,YAAY,CAAQ;gBAEhB,SAAS,EAAE,SAAS;IAmBhC,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,MAAM;IAKd,OAAO,CAAC,MAAM;IAUd,OAAO,CAAC,OAAO;IAef;;;;OAIG;IACH,IAAI,CAAC,KAAK,SAAM;IAMhB;;OAEG;IACH,IAAI;IAKJ,OAAO,CAAC,KAAK;IASb,OAAO,CAAC,KAAK;IAeb;;OAEG;IACM,MAAM;CAmBhB"}
+{"version":3,"file":"SpinnerThreeBounce.d.ts","sourceRoot":"","sources":["../../../src/plugins/spinner-three-bounce/SpinnerThreeBounce.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,SAAS,EAET,iBAAiB,EAElB,MAAM,cAAc,CAAA;AAKrB,OAAO,mDAAmD,CAAA;AAM1D;;;GAGG;AACH,oBAAY,aAAa;IACvB;;;OAGG;IACH,IAAI,yBAAyB;CAC9B;AAED;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,OAAO,CAAC,SAAS,CAAQ;IAEzB;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED;;OAEG;IACH,IAAa,UAAU;;;MAKtB;IAED,OAAO,CAAC,WAAW,CAAuB;IAE1C,OAAO,CAAC,QAAQ,CAAwB;IAExC,OAAO,CAAC,aAAa,CAAQ;IAE7B,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,YAAY,CAAQ;gBAEhB,SAAS,EAAE,SAAS;IAmBzB,WAAW;IAIlB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,MAAM;IAKd,OAAO,CAAC,MAAM;IAWd,OAAO,CAAC,OAAO;IAgBf;;;;OAIG;IACH,IAAI,CAAC,KAAK,SAAM;IAMhB;;OAEG;IACH,IAAI;IAKJ,OAAO,CAAC,KAAK;IASb,OAAO,CAAC,KAAK;IAeb;;OAEG;IACM,MAAM;CAoBhB"}

package/lib/plugins/spinner-three-bounce/SpinnerThreeBounce.js

@@ -55,6 +55,7 @@ export class SpinnerThreeBounce extends UIContainerPlugin {
     template = template(spinnerHTML);
     hasFatalError = false;
     hasBuffering = false;
+    _showOnError = false;
     constructor(container) {
         super(container);
         this.listenTo(this.container, ClapprEvents.CONTAINER_STATE_BUFFERING, this.onBuffering);
@@ -65,6 +66,9 @@ export class SpinnerThreeBounce extends UIContainerPlugin {
         this.listenTo(this.container, ClapprEvents.CONTAINER_ERROR, this.onError);
         this.listenTo(this.container, ClapprEvents.CONTAINER_READY, this.render);
     }
+    showOnError() {
+        this._showOnError = true;
+    }
     onBuffering() {
         this.hasBuffering = true;
         this._show();
@@ -81,27 +85,28 @@ export class SpinnerThreeBounce extends UIContainerPlugin {
     }
     onStop() {
         trace(`${T} onStop`, {
-            showOnError: this.options.spinner?.showOnError,
+            showOnError: this._showOnError,
             hasFatalError: this.hasFatalError,
         });
-        if (!(this.hasFatalError && this.options.spinner?.showOnError)) {
-            this._hide();
-        }
+        // if (!(this.hasFatalError && this._showOnError)) {
+        //   this._hide()
+        // }
+        this._hide();
     }
     onError(e) {
         this.hasFatalError = e.code === PlaybackErrorCode.MediaSourceUnavailable;
         trace(`${T} onError`, {
             e,
-            showOnError: this.options.spinner?.showOnError,
+            showOnError: this._showOnError,
             hasFatalError: this.hasFatalError,
             error: e.code,
         });
-        if (this.options.spinner?.showOnError) {
-            this._show();
-        }
-        else {
-            this._hide();
-        }
+        // if (this._showOnError) {
+        //   this._show()
+        // } else {
+        //   this._hide()
+        // }
+        this._hide();
     }
     /**
      * Shows the spinner.
@@ -146,6 +151,7 @@ export class SpinnerThreeBounce extends UIContainerPlugin {
      * @internal
      */
     render() {
+        // TODO control via sourcecontroller instead
         const showOnStart = this.options.spinner?.showOnStart;
         trace(`${T} render`, {
             buffering: this.container.buffering,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcorevideo/player",
-  "version": "2.20.19",
+  "version": "2.20.21",
   "description": "Gcore JavaScript video player",
   "main": "dist/index.js",
   "type": "module",

package/src/playback/HTML5Video.ts

@@ -12,7 +12,6 @@ const STALL_TIMEOUT = 15000
 
 export default class HTML5Video extends BasePlayback {
   private stallTimerId: TimerId | null = null
-  private statllTimerId: NodeJS.Timeout | null = null
 
   /**
    * @internal
@@ -60,22 +59,19 @@ export default class HTML5Video extends BasePlayback {
     trace(`${T} _handleBufferingEvents`, {
       networkState: (this.el as HTMLMediaElement).networkState,
     })
-    if (!this.statllTimerId) {
-      this.statllTimerId = setTimeout(() => {
+    if (!this.stallTimerId) {
+      this.stallTimerId = setTimeout(() => {
         trace(`${T} _handleBufferingEvents stall timeout`, {
           buffering: this.buffering,
           ended: this.ended,
-          isPlaying: this.isPlaying,
         })
-        this.statllTimerId = null
-        if (!this.isPlaying) {
-          this.createError({
-            code: PlaybackErrorCode.MediaSourceUnavailable,
-            level: PlayerError.Levels.FATAL,
-            message: 'Stall timeout',
-            description: 'Playback stalled for too long',
-          })
-        }
+        this.stallTimerId = null
+        this.createError({
+          code: PlaybackErrorCode.MediaSourceUnavailable,
+          level: PlayerError.Levels.FATAL,
+          message: 'Stall timeout',
+          description: 'Playback stalled for too long',
+        })
       }, STALL_TIMEOUT)
     }
     super._handleBufferingEvents()
@@ -89,4 +85,13 @@ export default class HTML5Video extends BasePlayback {
     }
     super._onPlaying()
   }
+
+  override _onPause() {
+    trace(`${T} _onPause`)
+    super._onPause()
+    if (this.stallTimerId) {
+      clearTimeout(this.stallTimerId)
+      this.stallTimerId = null
+    }
+  }
 }

package/src/plugins/source-controller/SourceController.ts

@@ -139,6 +139,7 @@ export class SourceController extends CorePlugin {
   private onCoreReady() {
     trace(`${T} onCoreReady`)
     this.core.getPlugin('error_screen')?.disable() //  TODO test
+    // this.core.getPlugin('spinner')?.showOnError()
   }
 
   private onActiveContainerChanged() {

package/src/plugins/spinner-three-bounce/SpinnerThreeBounce.ts

@@ -73,6 +73,8 @@ export class SpinnerThreeBounce extends UIContainerPlugin {
 
   private hasBuffering = false
 
+  private _showOnError = false
+
   constructor(container: Container) {
     super(container)
     this.listenTo(
@@ -92,6 +94,10 @@ export class SpinnerThreeBounce extends UIContainerPlugin {
     this.listenTo(this.container, ClapprEvents.CONTAINER_READY, this.render)
   }
 
+  public showOnError() {
+    this._showOnError = true
+  }
+
   private onBuffering() {
     this.hasBuffering = true
     this._show()
@@ -111,27 +117,29 @@ export class SpinnerThreeBounce extends UIContainerPlugin {
 
   private onStop() {
     trace(`${T} onStop`, {
-      showOnError: this.options.spinner?.showOnError,
+      showOnError: this._showOnError,
       hasFatalError: this.hasFatalError,
     })
-    if (!(this.hasFatalError && this.options.spinner?.showOnError)) {
-      this._hide()
-    }
+    // if (!(this.hasFatalError && this._showOnError)) {
+    //   this._hide()
+    // }
+    this._hide()
   }
 
   private onError(e: PlaybackError) {
     this.hasFatalError = e.code === PlaybackErrorCode.MediaSourceUnavailable
     trace(`${T} onError`, {
       e,
-      showOnError: this.options.spinner?.showOnError,
+      showOnError: this._showOnError,
       hasFatalError: this.hasFatalError,
       error: e.code,
     })
-    if (this.options.spinner?.showOnError) {
-      this._show()
-    } else {
-      this._hide()
-    }
+    // if (this._showOnError) {
+    //   this._show()
+    // } else {
+    //   this._hide()
+    // }
+    this._hide()
   }
 
   /**
@@ -181,6 +189,7 @@ export class SpinnerThreeBounce extends UIContainerPlugin {
    * @internal
    */
   override render() {
+    // TODO control via sourcecontroller instead
     const showOnStart = this.options.spinner?.showOnStart
     trace(`${T} render`, {
       buffering: this.container.buffering,