@gcorevideo/player 2.7.5 → 2.8.1

package/package.json

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

package/src/Player.ts

@@ -16,7 +16,6 @@ import type {
   PlayerMediaSource,
 } from './internal.types.js'
 import type {
-  PlaybackType,
   PlayerPlugin,
 } from './types.js'
 import { reportError, trace } from './trace/index.js'
@@ -28,7 +27,6 @@ import {
   buildSourcesSet,
   unwrapSource,
 } from './utils/mediaSources.js'
-import { QualityLevel } from './playback.types.js'
 
 // TODO implement transport retry/failover and fallback logic
 
@@ -57,8 +55,6 @@ type PluginOptions = Record<string, unknown>
  * @beta
  */
 export class Player {
-  private qLevel: QualityLevel | null = null
-
   private config: PlayerConfig = DEFAULT_OPTIONS
 
   private emitter = new EventLite()
@@ -73,39 +69,6 @@ export class Player {
 
   private tunedIn = false
 
-  // get activePlayback(): PlaybackModule | null {
-  //   if (!this.player?.core.activePlayback) {
-  //     return null
-  //   }
-  //   switch (this.player.core.activePlayback.name) {
-  //     case 'dash':
-  //       return 'dash'
-  //     case 'hls':
-  //       return 'hls'
-  //     default:
-  //       return 'native'
-  //   }
-  // }
-
-  // get activeSource(): string | null {
-  //   if (!this.player?.core.activePlayback) {
-  //     return null
-  //   }
-  //   return this.player.core.activePlayback.options.src
-  // }
-
-  get bitrate(): QualityLevel | null {
-    return this.qLevel
-  }
-
-  get hd() {
-    return this.player?.core.activePlayback?.isHighDefinitionInUse || false
-  }
-
-  get playbackType(): PlaybackType | undefined {
-    return this.player?.core.activePlayback?.getPlaybackType()
-  }
-
   constructor(config: PlayerConfig) {
     this.setConfig(config)
   }
@@ -165,7 +128,6 @@ export class Player {
       clearTimeout(this.tuneInTimerId)
       this.tuneInTimerId = null
     }
-    this.qLevel = null
   }
 
   pause() {
@@ -209,7 +171,6 @@ export class Player {
 
   private initPlayer(coreOptions: CoreOptions) {
     trace(`${T} initPlayer`, {
-      // coreOptions,
       // TODO selected options
     })
 
@@ -218,18 +179,6 @@ export class Player {
     const player = new PlayerClappr(coreOptions)
     this.player = player
 
-    if (player.core.activeContainer) {
-      trace(`${T} tuneIn bindBitrateChangeHandler`)
-      this.bindBitrateChangeHandler()
-    }
-    player.core.on(
-      ClapprEvents.CORE_ACTIVE_CONTAINER_CHANGED,
-      () => {
-        this.bindBitrateChangeHandler()
-      },
-      null,
-    )
-
     // TODO checks if the whole thing is necessary
     this.tuneInTimerId = globalThis.setTimeout(() => {
       trace(`${T} tuneInTimer`, {
@@ -367,20 +316,7 @@ export class Player {
   }
 
   private buildCoreOptions(rootNode: HTMLElement): CoreOptions {
-    // TODO extract
-    // const multisources = this.config.multisources
-    // const mainSource =
-    //   this.config.playbackType === 'live'
-    //     ? multisources.find((ms) => ms.live !== false)
-    //     : multisources[0]
-    // const mediaSources = mainSource
-    //   ? this.buildMediaSourcesList(mainSource)
-    //   : []
-    // const mainSourceUrl = mediaSources[0];
-    // const poster = mainSource?.poster ?? this.config.poster
-    // const poster = this.config.poster
-
-    const source = this.selectMediaSource() // TODO
+    const source = this.selectMediaSource()
 
     this.rootNode = rootNode
 
@@ -406,10 +342,8 @@ export class Player {
       },
       parent: rootNode,
       playbackType: this.config.playbackType,
-      // poster,
       width: rootNode.clientWidth,
       source: source ? unwrapSource(source) : undefined,
-      // sources: mediaSources,
       strings: this.config.strings,
     }
     return coreOptions
@@ -421,25 +355,6 @@ export class Player {
     Loader.registerPlayback(HlsPlayback)
   }
 
-  private bindBitrateChangeHandler() {
-    // TODO implement a plugin for the whole thing
-    trace(`${T} bindBitrateChangeHandler`, { activeContainer: this.player?.core?.activeContainer?.name })
-    const currentPlayback = this.player?.core.activePlayback;
-    currentPlayback.on(ClapprEvents.PLAYBACK_LEVELS_AVAILABLE, (levels: QualityLevel[]) => {
-      // TODO test
-      if (!this.qLevel) {
-        this.qLevel = levels[0]
-      }
-    });
-    this.player?.core.activeContainer.on(
-      ClapprEvents.CONTAINER_BITRATE,
-      (bitrate: QualityLevel) => {
-        trace(`${T} bitrate has changed`, { bitrate })
-        this.qLevel = bitrate
-      },
-    )
-  }
-
   // Select a single source to play according to the priority transport and the modules support
   private selectMediaSource(): PlayerMediaSource | undefined {
     return buildSourcesPriorityList(

package/src/plugins/dash-playback/DashPlayback.ts

@@ -13,7 +13,7 @@ import DASHJS, {
 } from 'dashjs'
 import { trace } from '../../trace/index.js'
 
-import { BitrateInfo, QualityLevel, TimePosition, TimeValue } from '../../playback.types.js'
+import { QualityLevel, TimePosition, TimeValue } from '../../playback.types.js'
 
 const AUTO = -1
 
@@ -34,6 +34,7 @@ type LocalTimeCorrelation = {
 
 const T = 'DashPlayback'
 
+// @ts-expect-error
 export default class DashPlayback extends HTML5Video {
   _levels: QualityLevel[] | null = null
 
@@ -299,7 +300,7 @@ export default class DashPlayback extends HTML5Video {
   }
 
   // override
-  _setupSrc() {
+  private override _setupSrc() {
     // this playback manages the src on the video element itself
   }
 
@@ -386,27 +387,31 @@ export default class DashPlayback extends HTML5Video {
     this.trigger(Events.PLAYBACK_STATS_ADD, { dvr: status })
   }
 
-  _updateSettings() {
+  override _updateSettings() {
     if (this._playbackType === Playback.VOD) {
+      // @ts-expect-error
       this.settings.left = ['playpause', 'position', 'duration']
     } else if (this.dvrEnabled) {
+      // @ts-expect-error
       this.settings.left = ['playpause']
     } else {
+      // @ts-expect-error
       this.settings.left = ['playstop']
     }
-
+    // @ts-expect-error
     this.settings.seekEnabled = this.isSeekEnabled()
     this.trigger(Events.PLAYBACK_SETTINGSUPDATE)
   }
 
-  _onPlaybackError = (event: DashPlaybackErrorEvent) => {
+  private _onPlaybackError = (event: DashPlaybackErrorEvent) => {
     // TODO
+    trace(`${T} _onPlaybackError`, { event })
   }
 
-  _onDASHJSSError = (event: DashErrorEvent) => {
+  private _onDASHJSSError = (event: DashErrorEvent) => {
+    trace(`${T} _onDASHJSSError`, { event })
     // TODO
     // only report/handle errors if they are fatal
-    // hlsjs should automatically handle non fatal errors
     this._stopTimeUpdateTimer()
     if (event.error === 'capability' && event.event === 'mediasource') {
       // No support for MSE
@@ -542,10 +547,10 @@ export default class DashPlayback extends HTML5Video {
   }
 
   get dvrEnabled() {
-    assert.ok(
-      this._dash,
-      'An instance of dashjs MediaPlayer is required to get the DVR status',
-    )
+    if (!this._dash) {
+      trace(`${T} dvrEnable no dash player instance`)
+      return false
+    }
     return (
       this._dash?.getDVRWindowSize() >= this._minDvrSize &&
       this.getPlaybackType() === Playback.LIVE

package/src/plugins/hls-playback/HlsPlayback.ts

@@ -61,6 +61,7 @@ type CustomListener = {
 // TODO level, code, description, etc
 type ErrorInfo = Record<string, unknown>;
 
+// @ts-expect-error
 export default class HlsPlayback extends HTML5Video {
   private _ccIsSetup = false;
 
@@ -436,7 +437,7 @@ export default class HlsPlayback extends HTML5Video {
 
   // override
   // this playback manages the src on the video element itself
-  _setupSrc(srcUrl: string) { } // eslint-disable-line no-unused-vars
+  private override _setupSrc(srcUrl: string) { } // eslint-disable-line no-unused-vars
 
   _startTimeUpdateTimer() {
     if (this._timeUpdateTimer) {
@@ -511,13 +512,17 @@ export default class HlsPlayback extends HTML5Video {
 
   _updateSettings() {
     if (this._playbackType === Playback.VOD) {
+      // @ts-expect-error
       this.settings.left = ['playpause', 'position', 'duration'];
     } else if (this.dvrEnabled) {
+      // @ts-expect-error
       this.settings.left = ['playpause'];
     } else {
+      // @ts-expect-error
       this.settings.left = ['playstop'];
     }
 
+      // @ts-expect-error
     this.settings.seekEnabled = this.isSeekEnabled();
     this.trigger(Events.PLAYBACK_SETTINGSUPDATE);
   }

package/src/typings/@clappr/core/html5_video.d.ts

@@ -1,29 +1,28 @@
 import '@clappr/core';
 
 declare module "@clappr/core" {
-    declare type HTML5VideoSettingsItem =
-        | "seekbar"
-        | "playpause"
-        | "position"
-        | "duration"
-        | "fullscreen"
-        | "live"
-        | "volume"
-        | "hd-indicator"
-        | "playstop";
+    // declare type HTML5VideoSettingsItem =
+    //     | "seekbar"
+    //     | "playpause"
+    //     | "position"
+    //     | "duration"
+    //     | "fullscreen"
+    //     | "volume"
+    //     | "hd-indicator"
+    //     | "playstop";
 
-    declare type HTML5VideoSettings = {
-        default: HTML5VideoSettingsItem[];
-        left?: HTML5VideoSettingsItem[];
-        right?: HTML5VideoSettingsItem[];
-        seekEnabled?: boolean;
-    }
+    // declare type HTML5VideoSettings = {
+    //     default: HTML5VideoSettingsItem[];
+    //     left?: HTML5VideoSettingsItem[];
+    //     right?: HTML5VideoSettingsItem[];
+    //     seekEnabled?: boolean;
+    // }
 
-    declare class HTML5Video extends Playback {
-        settings: HTML5VideoSettings;
+    // declare class HTML5Video extends Playback {
+    //     settings: HTML5VideoSettings;
 
-        readonly _minDvrSize: number;
+    //     readonly _minDvrSize: number;
 
-        _onDurationChange(): void;
-    }
+    //     _onDurationChange(): void;
+    // }
 }

package/src/utils/mediaSources.ts

@@ -65,13 +65,13 @@ export function buildSourcesPriorityList(
   }
 
   function addHls() {
-    if (sources.hls && HlsPlayback.canPlay(sources.hls)) {
+    if (sources.hls && HlsPlayback.canPlay(sources.hls, undefined)) {
       msl.push(sources.hls)
       sources.hls = null
     }
     if (
       sources.master?.endsWith('.m3u8') &&
-      HlsPlayback.canPlay(sources.master)
+      HlsPlayback.canPlay(sources.master, undefined)
     ) {
       msl.push(sources.master)
       sources.master = null
@@ -79,7 +79,7 @@ export function buildSourcesPriorityList(
   }
 
   function addDash() {
-    if (sources.dash && DashPlayback.canPlay(sources.dash)) {
+    if (sources.dash && DashPlayback.canPlay(sources.dash, undefined)) {
       msl.push(sources.dash)
       sources.dash = null
     }