@gcorevideo/player 2.22.8 → 2.22.9

package/dist/plugins/index.js

@@ -13320,7 +13320,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.22.8";
+var version$1 = "2.22.9";
 
 var packages = {
 	"node_modules/@clappr/core": {
@@ -16017,6 +16017,7 @@ class PlaybackRate extends UICorePlugin {
     // Saved when an ad starts to restore after it finishes
     // private prevSelectedRate: string | undefined
     selectedRate = DEFAULT_PLAYBACK_RATE;
+    metadataLoaded = false;
     /**
      * @internal
      */
@@ -16073,6 +16074,7 @@ class PlaybackRate extends UICorePlugin {
         this.listenTo(gear, GearEvents.RENDERED, this.onGearRendered);
     }
     onActiveContainerChange() {
+        this.metadataLoaded = false;
         this.listenTo(this.core.activePlayback, Events.PLAYBACK_STOP, this.onStop);
         this.listenTo(this.core.activePlayback, Events.PLAYBACK_PLAY, this.onPlay);
         this.listenTo(this.core.activePlayback, PlaybackEvents.PLAYBACK_RATE_CHANGED, this.onPlaybackRateChange);
@@ -16102,6 +16104,7 @@ class PlaybackRate extends UICorePlugin {
         })));
     }
     onMetaDataLoaded() {
+        this.metadataLoaded = true;
         this.render();
     }
     allRateElements() {
@@ -16122,9 +16125,13 @@ class PlaybackRate extends UICorePlugin {
         }
     }
     shouldMount() {
-        if (!this.core.activePlayback) {
+        if (!this.core.activePlayback || !this.metadataLoaded) {
             return false;
         }
+        trace(`${T$7} shouldMount`, {
+            playbackType: this.core.activePlayback.getPlaybackType(),
+            dvrEnabled: this.core.activePlayback.dvrEnabled,
+        });
         if (this.core.activePlayback.getPlaybackType() === Playback.LIVE &&
             !this.core.activePlayback.dvrEnabled) {
             return false;

package/lib/plugins/playback-rate/PlaybackRate.d.ts

@@ -46,6 +46,7 @@ export type PlaybackRateSettings = {
  */
 export declare class PlaybackRate extends UICorePlugin {
     private selectedRate;
+    private metadataLoaded;
     /**
      * @internal
      */

package/lib/plugins/playback-rate/PlaybackRate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PlaybackRate.d.ts","sourceRoot":"","sources":["../../../src/plugins/playback-rate/PlaybackRate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAsB,IAAI,EAAK,MAAM,cAAc,CAAA;AAiBhF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAA;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAgBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBAAa,YAAa,SAAQ,YAAY;IAI5C,OAAO,CAAC,YAAY,CAAwB;IAE5C;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAuB;IAE7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAqB;gBAE7C,IAAI,EAAE,IAAI;IAOtB,OAAO,KAAK,aAAa,GAExB;IAED;;OAEG;IACH,IAAa,UAAU;;MAItB;IAED;;OAEG;IACH,IAAa,MAAM;;;MAKlB;IAED;;OAEG;IACM,UAAU;IASnB,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,uBAAuB;IAgB/B,OAAO,CAAC,sBAAsB;IAK9B,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,KAAK;IAsBb,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,oBAAoB;IAe5B,OAAO,CAAC,WAAW;IAenB;;OAEG;IACM,MAAM;IAoCf,OAAO,CAAC,MAAM;IAWd,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,QAAQ;IAYhB,OAAO,CAAC,MAAM;IAMd,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,qBAAqB;CAM9B"}
+{"version":3,"file":"PlaybackRate.d.ts","sourceRoot":"","sources":["../../../src/plugins/playback-rate/PlaybackRate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAsB,IAAI,EAAK,MAAM,cAAc,CAAA;AAiBhF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAA;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAgBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBAAa,YAAa,SAAQ,YAAY;IAI5C,OAAO,CAAC,YAAY,CAAwB;IAE5C,OAAO,CAAC,cAAc,CAAQ;IAE9B;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAuB;IAE7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAqB;gBAE7C,IAAI,EAAE,IAAI;IAOtB,OAAO,KAAK,aAAa,GAExB;IAED;;OAEG;IACH,IAAa,UAAU;;MAItB;IAED;;OAEG;IACH,IAAa,MAAM;;;MAKlB;IAED;;OAEG;IACM,UAAU;IASnB,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,uBAAuB;IAiB/B,OAAO,CAAC,sBAAsB;IAK9B,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,KAAK;IAsBb,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,oBAAoB;IAe5B,OAAO,CAAC,WAAW;IAoBnB;;OAEG;IACM,MAAM;IAoCf,OAAO,CAAC,MAAM;IAWd,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,QAAQ;IAYhB,OAAO,CAAC,MAAM;IAMd,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,qBAAqB;CAM9B"}

package/lib/plugins/playback-rate/PlaybackRate.js

@@ -56,6 +56,7 @@ export class PlaybackRate extends UICorePlugin {
     // Saved when an ad starts to restore after it finishes
     // private prevSelectedRate: string | undefined
     selectedRate = DEFAULT_PLAYBACK_RATE;
+    metadataLoaded = false;
     /**
      * @internal
      */
@@ -114,6 +115,7 @@ export class PlaybackRate extends UICorePlugin {
     }
     onActiveContainerChange() {
         trace(`${T} onActiveContainerChange`);
+        this.metadataLoaded = false;
         this.listenTo(this.core.activePlayback, Events.PLAYBACK_STOP, this.onStop);
         this.listenTo(this.core.activePlayback, Events.PLAYBACK_PLAY, this.onPlay);
         this.listenTo(this.core.activePlayback, PlaybackEvents.PLAYBACK_RATE_CHANGED, this.onPlaybackRateChange);
@@ -146,6 +148,7 @@ export class PlaybackRate extends UICorePlugin {
     }
     onMetaDataLoaded() {
         trace(`${T} onMetaDataLoaded`);
+        this.metadataLoaded = true;
         this.render();
     }
     allRateElements() {
@@ -167,9 +170,13 @@ export class PlaybackRate extends UICorePlugin {
         }
     }
     shouldMount() {
-        if (!this.core.activePlayback) {
+        if (!this.core.activePlayback || !this.metadataLoaded) {
             return false;
         }
+        trace(`${T} shouldMount`, {
+            playbackType: this.core.activePlayback.getPlaybackType(),
+            dvrEnabled: this.core.activePlayback.dvrEnabled,
+        });
         if (this.core.activePlayback.getPlaybackType() === Playback.LIVE &&
             !this.core.activePlayback.dvrEnabled) {
             return false;

package/package.json

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

package/src/plugins/media-control/__tests__/MediaControl.test.ts

@@ -235,8 +235,5 @@ describe('MediaControl', () => {
 })
 
 function arraySubtract<T extends string>(arr1: T[], arr2: T[]) {
-  // const ret = arr1.filter((item) => !arr2.includes(item))
   return arr1.filter((item) => !arr2.includes(item))
-  // console.log('arraySubtract %s - %s: %s', arr1, arr2, ret)
-  // return ret
 }

package/src/plugins/playback-rate/PlaybackRate.ts

@@ -82,6 +82,8 @@ export class PlaybackRate extends UICorePlugin {
 
   private selectedRate = DEFAULT_PLAYBACK_RATE
 
+  private metadataLoaded = false
+
   /**
    * @internal
    */
@@ -159,6 +161,7 @@ export class PlaybackRate extends UICorePlugin {
 
   private onActiveContainerChange() {
     trace(`${T} onActiveContainerChange`)
+    this.metadataLoaded = false
     this.listenTo(this.core.activePlayback, Events.PLAYBACK_STOP, this.onStop)
     this.listenTo(this.core.activePlayback, Events.PLAYBACK_PLAY, this.onPlay)
     this.listenTo(
@@ -207,6 +210,7 @@ export class PlaybackRate extends UICorePlugin {
 
   private onMetaDataLoaded() {
     trace(`${T} onMetaDataLoaded`)
+    this.metadataLoaded = true
     this.render()
   }
 
@@ -236,10 +240,15 @@ export class PlaybackRate extends UICorePlugin {
   }
 
   private shouldMount() {
-    if (!this.core.activePlayback) {
+    if (!this.core.activePlayback || !this.metadataLoaded) {
       return false
     }
 
+    trace(`${T} shouldMount`, {
+      playbackType: this.core.activePlayback.getPlaybackType(),
+      dvrEnabled: this.core.activePlayback.dvrEnabled,
+    })
+
     if (
       this.core.activePlayback.getPlaybackType() === Playback.LIVE &&
       !this.core.activePlayback.dvrEnabled

package/src/plugins/playback-rate/__tests__/PlaybackRate.test.ts

@@ -7,6 +7,7 @@ import {
 } from '../../../testUtils'
 import { Events } from '@clappr/core'
 import { GearEvents } from '../../bottom-gear/BottomGear'
+import { PlaybackType } from '../../../types'
 // import { Logger, LogTracer, setTracer } from '@gcorevideo/utils'
 
 // Logger.enable('*')
@@ -19,6 +20,7 @@ describe('PlaybackRate', () => {
   let playbackRate: PlaybackRate
   beforeEach(() => {
     core = createMockCore()
+    setupPlaybackType(core, 'vod')
     mediaControl = createMockMediaControl(core)
     bottomGear = createMockBottomGear(core)
     core.getPlugin.mockImplementation((name: string) => {
@@ -36,11 +38,9 @@ describe('PlaybackRate', () => {
       playbackRate = new PlaybackRate(core)
       core.emit(Events.CORE_READY)
       mediaControl.trigger(Events.MEDIACONTROL_RENDERED)
-      core.activePlayback.getPlaybackType.mockReturnValue('live')
-      core.activeContainer.getPlaybackType.mockReturnValue('live')
-      core.getPlaybackType.mockReturnValue('live')
-      core.emit(Events.CORE_ACTIVE_CONTAINER_CHANGED)
       bottomGear.trigger(GearEvents.RENDERED)
+      setupPlaybackType(core, 'live')
+      core.emit(Events.CORE_ACTIVE_CONTAINER_CHANGED)
     })
     it('should render', () => {
       expect(playbackRate.el.innerHTML).toMatchSnapshot()
@@ -137,9 +137,7 @@ describe('PlaybackRate', () => {
       playbackRate = new PlaybackRate(core)
       core.emit(Events.CORE_READY)
       mediaControl.trigger(Events.MEDIACONTROL_RENDERED)
-      core.activePlayback.getPlaybackType.mockReturnValue('live')
-      core.activeContainer.getPlaybackType.mockReturnValue('live')
-      core.getPlaybackType.mockReturnValue('live')
+      setupPlaybackType(core, 'live')
       core.emit(Events.CORE_ACTIVE_CONTAINER_CHANGED)
       bottomGear.trigger(GearEvents.RENDERED)
       core.activePlayback.dvrEnabled = true
@@ -180,3 +178,9 @@ expect.extend({
     }
   },
 })
+
+function setupPlaybackType(core: any, type: PlaybackType) {
+  core.activePlayback.getPlaybackType.mockReturnValue(type)
+  core.activeContainer.getPlaybackType.mockReturnValue(type)
+  core.getPlaybackType.mockReturnValue(type)
+}