@gcorevideo/player 2.22.16 → 2.22.18

package/lib/plugins/clappr-stats/types.js

@@ -1,8 +1,43 @@
+/**
+ * @beta
+ */
+export var Chronograph;
+(function (Chronograph) {
+    Chronograph["Startup"] = "startup";
+    Chronograph["Watch"] = "watch";
+    Chronograph["Pause"] = "pause";
+    Chronograph["Buffering"] = "buffering";
+    Chronograph["Session"] = "session";
+    // Latency = 'latency',
+})(Chronograph || (Chronograph = {}));
+/**
+ * @beta
+ */
+export var Counter;
+(function (Counter) {
+    Counter["Play"] = "play";
+    Counter["Pause"] = "pause";
+    Counter["Error"] = "error";
+    Counter["Buffering"] = "buffering";
+    Counter["DecodedFrames"] = "decodedFrames";
+    Counter["DroppedFrames"] = "droppedFrames";
+    Counter["Fps"] = "fps";
+    Counter["ChangeLevel"] = "changeLevel";
+    Counter["Seek"] = "seek";
+    Counter["Fullscreen"] = "fullscreen";
+    Counter["DvrUsage"] = "dvrUsage";
+})(Counter || (Counter = {}));
 /**
  * @beta
  */
 export var ClapprStatsEvents;
 (function (ClapprStatsEvents) {
-    ClapprStatsEvents["REPORT_EVENT"] = "clappr:stats:report";
-    ClapprStatsEvents["PERCENTAGE_EVENT"] = "clappr:stats:percentage";
+    /**
+     * Emitted periodically with current measurements.
+     */
+    ClapprStatsEvents["REPORT"] = "clappr:stats:report";
+    /**
+     * Emitted when the playback reaches a certain percentage of the total duration.
+     */
+    // PERCENTAGE = 'clappr:stats:percentage',
 })(ClapprStatsEvents || (ClapprStatsEvents = {}));

package/lib/plugins/clappr-stats/utils.d.ts

@@ -1,3 +1,3 @@
-import type { Metrics } from "./types";
+import type { Metrics } from './types';
 export declare function newMetrics(): Metrics;
 //# sourceMappingURL=utils.d.ts.map

package/lib/plugins/clappr-stats/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/plugins/clappr-stats/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC,wBAAgB,UAAU,IAAI,OAAO,CAuCpC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/plugins/clappr-stats/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,wBAAgB,UAAU,IAAI,OAAO,CAqCpC"}

package/lib/plugins/clappr-stats/utils.js

@@ -13,13 +13,12 @@ export function newMetrics() {
             fullscreen: 0,
             dvrUsage: 0,
         },
-        timers: {
+        chrono: {
             startup: 0,
             watch: 0,
             pause: 0,
             buffering: 0,
             session: 0,
-            latency: 0,
         },
         extra: {
             playbackName: '',
@@ -35,6 +34,5 @@ export function newMetrics() {
             duration: 0,
             currentTime: 0,
         },
-        custom: {},
     };
 }

package/lib/plugins/seek-time/SeekTime.d.ts

@@ -28,7 +28,7 @@ export declare class SeekTime extends UICorePlugin {
     private $seekTimeEl;
     bindEvents(): void;
     private onContainerChanged;
-    private updateDuration;
+    private onTimeUpdate;
     private showTime;
     private hideTime;
     private calculateHoverPosition;

package/lib/plugins/seek-time/SeekTime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SeekTime.d.ts","sourceRoot":"","sources":["../../../src/plugins/seek-time/SeekTime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAoB,YAAY,EAAmB,MAAM,cAAc,CAAC;AAM/E,OAAO,0CAA0C,CAAC;AAKlD;;;GAGG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACxC,IAAI,IAAI,WAEP;IAED,IAAI,gBAAgB;;MAEnB;IAED,IAAI,QAAQ,QAEX;IAED,IAAa,UAAU;;;MAKtB;IAED,IAAI,YAAY,QAEf;IAED,IAAI,qBAAqB,QAExB;IAED,IAAI,mBAAmB,QAItB;IAED,IAAI,aAAa,YAEhB;IAED,OAAO,CAAC,mBAAmB,CAAS;IAEpC,OAAO,CAAC,aAAa,CAAK;IAE1B,OAAO,CAAC,iBAAiB,CAAuB;IAEhD,OAAO,CAAC,iBAAiB,CAAsB;IAE/C,OAAO,CAAC,QAAQ,CAAK;IAGrB,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,WAAW,CAA4B;IAE/C,OAAO,CAAC,WAAW,CAA4B;IAEtC,UAAU;IAWnB,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,sBAAsB;IAO9B,WAAW;;;IAYX,MAAM;IA8CN,eAAe;IAQN,MAAM;CAahB"}
+{"version":3,"file":"SeekTime.d.ts","sourceRoot":"","sources":["../../../src/plugins/seek-time/SeekTime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAoB,YAAY,EAAmB,MAAM,cAAc,CAAC;AAM/E,OAAO,0CAA0C,CAAC;AAKlD;;;GAGG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACxC,IAAI,IAAI,WAEP;IAED,IAAI,gBAAgB;;MAEnB;IAED,IAAI,QAAQ,QAEX;IAED,IAAa,UAAU;;;MAKtB;IAED,IAAI,YAAY,QAEf;IAED,IAAI,qBAAqB,QAExB;IAED,IAAI,mBAAmB,QAItB;IAED,IAAI,aAAa,YAEhB;IAED,OAAO,CAAC,mBAAmB,CAAS;IAEpC,OAAO,CAAC,aAAa,CAAK;IAE1B,OAAO,CAAC,iBAAiB,CAAuB;IAEhD,OAAO,CAAC,iBAAiB,CAAsB;IAE/C,OAAO,CAAC,QAAQ,CAAK;IAGrB,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,WAAW,CAA4B;IAE/C,OAAO,CAAC,WAAW,CAA4B;IAEtC,UAAU;IAWnB,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,sBAAsB;IAO9B,WAAW;;;IAYX,MAAM;IA8CN,eAAe;IAQN,MAAM;CAahB"}

package/lib/plugins/seek-time/SeekTime.js

@@ -56,7 +56,7 @@ export class SeekTime extends UICorePlugin {
         this.listenTo(this.mediaControl, Events.MEDIACONTROL_CONTAINERCHANGED, this.onContainerChanged);
         if (this.mediaControlContainer) {
             this.listenTo(this.mediaControlContainer, Events.CONTAINER_PLAYBACKDVRSTATECHANGED, this.update);
-            this.listenTo(this.mediaControlContainer, Events.CONTAINER_TIMEUPDATE, this.updateDuration);
+            this.listenTo(this.mediaControlContainer, Events.CONTAINER_TIMEUPDATE, this.onTimeUpdate);
         }
     }
     onContainerChanged() {
@@ -64,9 +64,8 @@ export class SeekTime extends UICorePlugin {
         this.stopListening();
         this.bindEvents();
     }
-    updateDuration(timeProgress) {
-        this.duration = timeProgress.total;
-        // this.firstFragDateTime = timeProgress.firstFragDateTime;
+    onTimeUpdate({ total }) {
+        this.duration = total;
         this.update();
     }
     showTime(event) {

package/lib/testUtils.d.ts

@@ -94,9 +94,10 @@ export declare function createMockPlayback(name?: string): Events<string | symbo
     switchAudioTrack: import("vitest").Mock<(...args: any[]) => any>;
     trigger: <T extends string | symbol>(event: T, ...args: any[]) => boolean;
 };
-export declare function createMockContainer(playback?: any): Events<string | symbol, any> & {
+export declare function createMockContainer(options?: Record<string, unknown>, playback?: any): Events<string | symbol, any> & {
     el: any;
     playback: any;
+    options: Record<string, unknown>;
     $el: any;
     getDuration: import("vitest").Mock<(...args: any[]) => any>;
     getPlugin: import("vitest").Mock<(...args: any[]) => any>;

package/lib/testUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../src/testUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,YAAY,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,MAAM;IAErC,SAAS,CAAC,OAAO,EAAE,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,GAAG;IAClB,SAAS,CAAC,WAAW,CAAC,EAAE,GAAG;gBAFjB,OAAO,EAAE,GAAG,EACb,IAAI,EAAE,GAAG,EACR,WAAW,CAAC,EAAE,GAAG,YAAA;IAK7B,IAAI,IAAI,WAEP;IAED,OAAO;IAEP,IAAI;IAEJ,KAAK;IAEL,IAAI;IAEJ,OAAO;IAEP,IAAI;IAEJ,cAAc;IAEd,WAAW;IAIX,QAAQ;IAER,OAAO;IAEP,eAAe;IAIf,kBAAkB;IAIlB,cAAc;IAId,qBAAqB;IAIrB,IAAI;IAEJ,MAAM;IAEN,MAAM;IAEN,SAAS;IAET,eAAe;IAIf,WAAW;IAIX,QAAQ;IAIR,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;CAGtC;AAED,wBAAgB,cAAc,CAC5B,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACrC,SAAS,GAAE,GAA2B;;;;;;;;;;;;;;;;EAqBvC;AAED,wBAAgB,gBAAgB;;;EAK/B;AAED,wBAAgB,mBAAmB;;;;;;EAKlC;AAED,wBAAgB,kBAAkB,CAAC,IAAI,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkC/C;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,GAAE,GAA0B;;;;;;;;;;;;;;EAkBvE;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,gBAc/C;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,OAY7C"}
+{"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../src/testUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,YAAY,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,MAAM;IAErC,SAAS,CAAC,OAAO,EAAE,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,GAAG;IAClB,SAAS,CAAC,WAAW,CAAC,EAAE,GAAG;gBAFjB,OAAO,EAAE,GAAG,EACb,IAAI,EAAE,GAAG,EACR,WAAW,CAAC,EAAE,GAAG,YAAA;IAK7B,IAAI,IAAI,WAEP;IAED,OAAO;IAEP,IAAI;IAEJ,KAAK;IAEL,IAAI;IAEJ,OAAO;IAEP,IAAI;IAEJ,cAAc;IAEd,WAAW;IAIX,QAAQ;IAER,OAAO;IAEP,eAAe;IAIf,kBAAkB;IAIlB,cAAc;IAId,qBAAqB;IAIrB,IAAI;IAEJ,MAAM;IAEN,MAAM;IAEN,SAAS;IAET,eAAe;IAIf,WAAW;IAIX,QAAQ;IAIR,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;CAGtC;AAED,wBAAgB,cAAc,CAC5B,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACrC,SAAS,GAAE,GAAkC;;;;;;;;;;;;;;;;EAqB9C;AAED,wBAAgB,gBAAgB;;;EAK/B;AAED,wBAAgB,mBAAmB;;;;;;EAKlC;AAED,wBAAgB,kBAAkB,CAAC,IAAI,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkC/C;AAED,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAAE,QAAQ,GAAE,GAA0B;;;;;;;;;;;;;;;EAmB9G;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,gBAc/C;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,OAY7C"}

package/lib/testUtils.js

@@ -60,7 +60,7 @@ export class _MockPlayback extends Events {
         this.emit(event, ...args);
     }
 }
-export function createMockCore(options = {}, container = createMockContainer()) {
+export function createMockCore(options = {}, container = createMockContainer(options)) {
     const el = document.createElement('div');
     const emitter = new Events();
     return Object.assign(emitter, {
@@ -128,12 +128,13 @@ export function createMockPlayback(name = 'mock') {
         trigger: emitter.emit,
     });
 }
-export function createMockContainer(playback = createMockPlayback()) {
+export function createMockContainer(options = {}, playback = createMockPlayback()) {
     const el = playback.el;
     const emitter = new Events();
     return Object.assign(emitter, {
         el,
         playback,
+        options,
         $el: $(el),
         getDuration: vi.fn().mockReturnValue(0),
         getPlugin: vi.fn(),

package/package.json

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

package/src/index.plugins.ts

@@ -4,8 +4,9 @@ export * from "./plugins/audio-selector/AudioSelector.js";
 export { AudioTracks as AudioSelector } from "./plugins/audio-selector/AudioSelector.js";
 export * from "./plugins/big-mute-button/BigMuteButton.js";
 export * from "./plugins/bottom-gear/BottomGear.js";
-export * from "./plugins/clappr-nerd-stats/ClapprNerdStats.js";
 export * from "./plugins/clappr-stats/ClapprStats.js";
+export * from "./plugins/clappr-nerd-stats/NerdStats.js";
+export { NerdStats as ClapprNerdStats } from "./plugins/clappr-nerd-stats/NerdStats.js";
 export * from "./plugins/click-to-pause/ClickToPause.js";
 export * from "./plugins/clips/Clips.js";
 export * from "./plugins/context-menu/ContextMenu.js";

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

@@ -20,7 +20,6 @@ import {
   PlaybackErrorCode,
   QualityLevel,
   TimePosition,
-  TimeUpdate,
   TimeValue,
 } from '../../playback.types.js'
 import { isDashSource } from '../../utils/mediaSources.js'
@@ -77,7 +76,6 @@ export default class DashPlayback extends BasePlayback {
   // #EXT-X-PLAYLIST-TYPE
   _playlistType: PlaylistType | null = null
 
-  // #EXT-X-PROGRAM-DATE-TIME
   _programDateTime: TimeValue = 0
 
   _dash: DASHJS.MediaPlayerClass | null = null
@@ -350,9 +348,9 @@ export default class DashPlayback extends BasePlayback {
     }
   }
 
-  getProgramDateTime() {
-    return this._programDateTime
-  }
+  // getProgramDateTime() {
+  //   return this._programDateTime
+  // }
 
   // the duration on the video element itself should not be used
   // as this does not necesarily represent the duration of the stream
@@ -498,10 +496,10 @@ export default class DashPlayback extends BasePlayback {
     if (this.startChangeQuality) {
       return
     }
-    const update: TimeUpdate = {
+    const update: TimePosition = {
       current: this.getCurrentTime(),
       total: this.getDuration(),
-      firstFragDateTime: this.getProgramDateTime(),
+      // firstFragDateTime: this.getProgramDateTime(), // TODO figure out if needed
     }
     const isSame =
       this._lastTimeUpdate &&
@@ -543,15 +541,12 @@ export default class DashPlayback extends BasePlayback {
   }
 
   override _onProgress() {
-    if (!this._dash) {
-      return
-    }
-
-    let buffer = this._dash.getDashMetrics().getCurrentBufferLevel('video')
+    const buffer =
+      // @ts-expect-error
+      this._dash.getDashMetrics().getCurrentBufferLevel('video') ||
+      // @ts-expect-error
+      this._dash.getDashMetrics().getCurrentBufferLevel('audio')
 
-    if (!buffer) {
-      buffer = this._dash.getDashMetrics().getCurrentBufferLevel('audio')
-    }
     const progress = {
       start: this.getCurrentTime(),
       current: this.getCurrentTime() + buffer,

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

@@ -27,7 +27,6 @@ import {
   PlayerComponentType,
   QualityLevel,
   TimePosition,
-  TimeUpdate,
 } from '../../playback.types.js'
 import { PlaybackType } from '../../types.js'
 import { isHlsSource } from '../../utils/mediaSources.js'
@@ -742,11 +741,10 @@ export default class HlsPlayback extends BasePlayback {
     )
   }
 
-  private _onTimeUpdate() {
-    const update: TimeUpdate = {
+  override _onTimeUpdate() {
+    const update: TimePosition = {
       current: this.getCurrentTime(),
       total: this.getDuration(),
-      firstFragDateTime: this.getProgramDateTime(),
     }
     const isSame =
       this._lastTimeUpdate &&

package/src/playback.types.ts

@@ -1,5 +1,6 @@
 /**
- * Playback time in seconds since the beginning of the stream (or a segment for the live streams)
+ * Playback time position in seconds since the beginning of the stream.
+ * For the live streams this is limited to the length of a segment. When DVR is enabled, this refers to the 
  * @public
  */
 export type TimeValue = number
@@ -10,44 +11,57 @@ export type TimeValue = number
  */
 export interface TimePosition {
   /**
-   * Current playback time, 0..duration, seconds.
+   * Current playback time, 0..duration
    */
   current: TimeValue
   /**
-   * Total duration of the media, seconds.
+   * Total duration of the media content (or DVR window size or segment duration for live streams)
    */
   total: TimeValue
 }
 
 /**
- * For the plugin development
+ * Time progress information indicated by Clappr CONTAINER_PROGRESS and PLAYBACK_PROGRESS events.
  * @beta
  */
-export type TimeProgress = TimePosition & { start: number }
+export type TimeProgress = {
+  /**
+   * Current playback time
+   */
+  start: TimeValue
+  /**
+   * Current buffer length beginning from the start (=current) time
+   */
+  current: TimeValue
+  /**
+   * Total duration of the media content
+   */
+  total: TimeValue
+}
 
 /**
  * For the plugin development
  * @beta
+ * @deprecated  Use TimePosition instead
  */
-export type TimeUpdate = TimePosition & {
-  firstFragDateTime: number
-}
+export type TimeUpdate = TimePosition
 
 /**
- * A level of quality within a media source.
+ * A level of quality within a media source/representation.
  * @public
  */
 export interface QualityLevel {
   /**
    * Zero-based index of the quality level.
+   * Quality levels go from low to high
    */
   level: number
   /**
-   * Width of the video, pixels.
+   * Width of the video frame, pixels.
    */
   width: number
   /**
-   * Height of the video, pixels.
+   * Height of the video frame, pixels.
    */
   height: number
   /**