@gcorevideo/player 2.28.30 → 2.28.35

package/lib/Player.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../src/Player.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../src/Player.ts"],"names":[],"mappings":"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"}

package/lib/plugins/subtitles/ClosedCaptions.d.ts

@@ -11,6 +11,9 @@ export type ClosedCaptionsPluginSettings = {
     language?: string;
     /**
      * Whether to use builtin subtitles.
+     *
+     * native: video player element renders the subtitles
+     * custom: plugin manages the subtitles rendition
      */
     mode?: 'native' | 'custom';
 };
@@ -50,9 +53,10 @@ export type ClosedCaptionsPluginSettings = {
  * ```
  */
 export declare class ClosedCaptions extends UICorePlugin {
-    private isPreselectedApplied;
+    private isSelectedApplied;
     private active;
     private open;
+    private userSelectedItemId;
     private track;
     private tracks;
     private $line;
@@ -116,7 +120,7 @@ export declare class ClosedCaptions extends UICorePlugin {
     private findById;
     private selectItem;
     private onItemSelect;
-    private applyPreselectedSubtitles;
+    private applySelectedSubtitles;
     private hideMenu;
     private toggleMenu;
     private setKeepVisible;

package/lib/plugins/subtitles/ClosedCaptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClosedCaptions.d.ts","sourceRoot":"","sources":["../../../src/plugins/subtitles/ClosedCaptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAwB,MAAM,cAAc,CAAA;AAOzE,OAAO,sCAAsC,CAAA;AAkB7C;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAA;CAC3B,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,oBAAoB,CAAQ;IAEpC,OAAO,CAAC,MAAM,CAAQ;IAEtB,OAAO,CAAC,IAAI,CAAQ;IAEpB,OAAO,CAAC,KAAK,CAA6B;IAE1C,OAAO,CAAC,MAAM,CAAsB;IAEpC,OAAO,CAAC,KAAK,CAA2B;IAExC;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED;;OAEG;IACH,MAAM,KAAK,OAAO,WAEjB;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAyB;IAEhE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAuB;IAE3D;;OAEG;IACH,IAAa,UAAU;;MAItB;IAED;;OAEG;IACH,IAAa,MAAM;;;MAKlB;IAED,OAAO,KAAK,mBAAmB,GAI9B;IAED,OAAO,CAAC,qBAAqB;IAO7B;;OAEG;IACM,UAAU;IAWnB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,kBAAkB;IAiD1B,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,mBAAmB;IAK3B,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,aAAa;IAmCrB,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,iBAAiB;IAqBzB;;OAEG;IACH,IAAI;IAYJ;;OAEG;IACH,IAAI;IAiBJ,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,UAAU;IAUlB;;OAEG;IACM,MAAM;IA+Bf,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,UAAU;IAclB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,KAAK;IAOb,OAAO,KAAK,kBAAkB,GAO7B;IAED,OAAO,KAAK,aAAa,GAExB;IAED,OAAO,KAAK,YAAY,GAEvB;IAED,OAAO,KAAK,YAAY,QAEvB;IAED,OAAO,KAAK,aAAa,QAMxB;IAED,OAAO,CAAC,SAAS,CAA+C;CACjE"}
+{"version":3,"file":"ClosedCaptions.d.ts","sourceRoot":"","sources":["../../../src/plugins/subtitles/ClosedCaptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAwB,MAAM,cAAc,CAAA;AAOzE,OAAO,sCAAsC,CAAA;AAmB7C;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAA;CAC3B,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,iBAAiB,CAAQ;IAEjC,OAAO,CAAC,MAAM,CAAQ;IAEtB,OAAO,CAAC,IAAI,CAAQ;IAEpB,OAAO,CAAC,kBAAkB,CAAa;IAEvC,OAAO,CAAC,KAAK,CAA6B;IAE1C,OAAO,CAAC,MAAM,CAAsB;IAEpC,OAAO,CAAC,KAAK,CAA2B;IAExC;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED;;OAEG;IACH,MAAM,KAAK,OAAO,WAEjB;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAyB;IAEhE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAuB;IAE3D;;OAEG;IACH,IAAa,UAAU;;MAItB;IAED;;OAEG;IACH,IAAa,MAAM;;;MAKlB;IAED,OAAO,KAAK,mBAAmB,GAI9B;IAED,OAAO,CAAC,qBAAqB;IAO7B;;OAEG;IACM,UAAU;IAWnB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,kBAAkB;IAiD1B,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,mBAAmB;IAK3B,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,aAAa;IAmCrB,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,iBAAiB;IAqBzB;;OAEG;IACH,IAAI;IAYJ;;OAEG;IACH,IAAI;IAiBJ,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,UAAU;IAUlB;;OAEG;IACM,MAAM;IA+Bf,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,sBAAsB;IAuB9B,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,UAAU;IAclB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,KAAK;IAOb,OAAO,KAAK,kBAAkB,GAO7B;IAED,OAAO,KAAK,aAAa,GAExB;IAED,OAAO,KAAK,YAAY,GAEvB;IAED,OAAO,KAAK,YAAY,QAEvB;IAED,OAAO,KAAK,aAAa,QAMxB;IAED,OAAO,CAAC,SAAS,CAA+C;CACjE"}

package/lib/plugins/subtitles/ClosedCaptions.js

@@ -1,5 +1,5 @@
 import { Events, UICorePlugin, Browser, template, $ } from '@clappr/core';
-import { reportError, trace } from '@gcorevideo/utils';
+import { reportError } from '@gcorevideo/utils';
 import assert from 'assert';
 import { CLAPPR_VERSION } from '../../build.js';
 import '../../../assets/subtitles/style.scss';
@@ -11,7 +11,8 @@ import { isFullscreen } from '../utils/fullscreen.js';
 import { ExtendedEvents } from '../media-control/MediaControl.js';
 import { mediaControlClickaway } from '../../utils/clickaway.js';
 const VERSION = '2.19.14';
-const LOCAL_STORAGE_CC_ID = 'gplayer.plugins.cc.selected';
+// TODO review
+// const LOCAL_STORAGE_CC_ID = 'gplayer.plugins.cc.selected'
 const T = 'plugins.cc';
 /**
  * `PLUGIN` that provides a UI to select the subtitles when available.
@@ -49,9 +50,10 @@ const T = 'plugins.cc';
  * ```
  */
 export class ClosedCaptions extends UICorePlugin {
-    isPreselectedApplied = false;
+    isSelectedApplied = false;
     active = false;
     open = false;
+    userSelectedItemId = -1;
     track = null;
     tracks = [];
     $line = null;
@@ -149,10 +151,9 @@ export class ClosedCaptions extends UICorePlugin {
                 video.classList.remove('ios-fullscreen');
             }
         });
-        this.isPreselectedApplied = false;
+        this.isSelectedApplied = false;
     }
     onPlaybackReady() {
-        trace(`${T} onPlaybackReady`);
         this.core.activePlayback.oncueenter = (e) => {
             this.setSubtitleText(e.text);
         };
@@ -173,7 +174,7 @@ export class ClosedCaptions extends UICorePlugin {
         this.activateTrack(id);
     }
     activateTrack(id) {
-        if (['dash', 'hls'].includes(this.core.activePlayback?.name)) {
+        if (this.core.activePlayback && ['dash', 'hls'].includes(this.core.activePlayback.name)) {
             this.core.activePlayback.setTextTrack(id);
             return;
         }
@@ -211,7 +212,7 @@ export class ClosedCaptions extends UICorePlugin {
         try {
             // TODO ensure to apply only once
             this.currentTracks = this.core.activePlayback.closedCaptionsTracks;
-            this.applyPreselectedSubtitles();
+            this.applySelectedSubtitles();
             this.render();
         }
         catch (error) {
@@ -318,22 +319,36 @@ export class ClosedCaptions extends UICorePlugin {
     }
     onItemSelect(event) {
         // event.target does not exist for some reason in tests
-        const id = (event.target ?? event.currentTarget).dataset?.item ??
-            '-1';
-        localStorage.setItem(LOCAL_STORAGE_CC_ID, id); // TODO store language instead?
-        this.selectItem(this.findById(Number(id)));
+        const id = Number((event.target ?? event.currentTarget).dataset?.item ??
+            '-1');
+        // TODO review, make configurable, and emit event in addition
+        // localStorage.setItem(LOCAL_STORAGE_CC_ID, id) // TODO store language instead?
+        this.userSelectedItemId = id;
+        this.selectItem(this.findById(id));
         this.hideMenu();
         return false;
     }
-    applyPreselectedSubtitles() {
-        if (!this.isPreselectedApplied) {
-            this.isPreselectedApplied = true;
-            // if the language is undefined, then let the engine decide
-            // to hide the subtitles forcefully, set the language to 'none'
-            setTimeout(() => {
-                this.selectItem(this.tracks.find((t) => this.isPreselectedLanguage(t.track.language)) ?? null);
-            }, 0);
+    applySelectedSubtitles() {
+        if (this.isSelectedApplied) {
+            return;
+        }
+        this.isSelectedApplied = true;
+        // If user selected a language, activate that
+        // Otherwise, if there is no configured language, then let the engine decide
+        // To hide the subtitles initially forcefully, set the language to 'none'
+        let matcher;
+        if (this.userSelectedItemId !== -1) {
+            matcher = (track) => track.id === this.userSelectedItemId;
+        }
+        else if (this.preselectedLanguage) {
+            matcher = (track) => this.isPreselectedLanguage(track.track.language);
+        }
+        else {
+            return;
         }
+        setTimeout(() => {
+            this.selectItem(this.tracks.find(matcher) ?? null);
+        }, 0);
     }
     hideMenu() {
         this.open = false;
@@ -367,10 +382,9 @@ export class ClosedCaptions extends UICorePlugin {
         return this.$el.find('#gplayer-cc-menu li'); // TODO fix semantically
     }
     selectSubtitles() {
-        const trackId = this.currentTrack?.id ?? -1;
-        // TODO find out if this is needed
-        this.core.activePlayback.closedCaptionsTrackId = trackId;
-        // this.core.activePlayback.closedCaptionsTrackId = -1
+        if (this.currentTrack) {
+            this.core.activePlayback.closedCaptionsTrackId = this.currentTrack.id;
+        }
     }
     getSubtitleText(track) {
         const currentTime = this.core.activePlayback?.getCurrentTime() ?? 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcorevideo/player",
-  "version": "2.28.30",
+  "version": "2.28.35",
   "description": "Gcore JavaScript video player",
   "main": "dist/index.js",
   "type": "module",
@@ -66,5 +66,8 @@
     "human-format": "^1.2.1",
     "mousetrap": "^1.6.5",
     "videojs-vtt.js": "^0.15.5"
+  },
+  "overrides": {
+    "ua-parser-js": "^1.0.0"
   }
 }

package/src/Player.ts

@@ -32,18 +32,18 @@ import { SourceController } from './plugins/source-controller/SourceController.j
  */
 export type PlayerEventParams<E extends PlayerEvent> =
   E extends PlayerEvent.Seek
-    ? [number]
-    : E extends PlayerEvent.VolumeUpdate
-      ? [number]
-      : E extends PlayerEvent.TimeUpdate
-        ? [TimePosition]
-        : E extends PlayerEvent.Resize
-          ? [{ width: number; height: number }]
-          : E extends PlayerEvent.Fullscreen
-            ? [boolean]
-            : E extends PlayerEvent.Error
-              ? [PlaybackError]
-              : []
+  ? [number]
+  : E extends PlayerEvent.VolumeUpdate
+  ? [number]
+  : E extends PlayerEvent.TimeUpdate
+  ? [TimePosition]
+  : E extends PlayerEvent.Resize
+  ? [{ width: number; height: number }]
+  : E extends PlayerEvent.Fullscreen
+  ? [boolean]
+  : E extends PlayerEvent.Error
+  ? [PlaybackError]
+  : []
 
 /**
  * Type of a listener callback function for a player event.

package/src/plugins/subtitles/ClosedCaptions.ts

@@ -1,5 +1,5 @@
 import { Events, UICorePlugin, Browser, template, $ } from '@clappr/core'
-import { reportError, trace } from '@gcorevideo/utils'
+import { reportError } from '@gcorevideo/utils'
 import assert from 'assert'
 
 import { CLAPPR_VERSION } from '../../build.js'
@@ -19,7 +19,8 @@ import { VTTCueInfo } from '../../playback.types.js'
 
 const VERSION: string = '2.19.14'
 
-const LOCAL_STORAGE_CC_ID = 'gplayer.plugins.cc.selected'
+// TODO review
+// const LOCAL_STORAGE_CC_ID = 'gplayer.plugins.cc.selected'
 
 const T = 'plugins.cc'
 
@@ -35,6 +36,9 @@ export type ClosedCaptionsPluginSettings = {
 
   /**
    * Whether to use builtin subtitles.
+   *
+   * native: video player element renders the subtitles
+   * custom: plugin manages the subtitles rendition
    */
   mode?: 'native' | 'custom'
 }
@@ -75,12 +79,14 @@ export type ClosedCaptionsPluginSettings = {
  * ```
  */
 export class ClosedCaptions extends UICorePlugin {
-  private isPreselectedApplied = false
+  private isSelectedApplied = false
 
   private active = false
 
   private open = false
 
+  private userSelectedItemId: number = -1
+
   private track: TextTrackItem | null = null
 
   private tracks: TextTrackItem[] = []
@@ -223,11 +229,10 @@ export class ClosedCaptions extends UICorePlugin {
       }
     })
 
-    this.isPreselectedApplied = false
+    this.isSelectedApplied = false
   }
 
   private onPlaybackReady() {
-    trace(`${T} onPlaybackReady`)
     this.core.activePlayback.oncueenter = (e: VTTCueInfo) => {
       this.setSubtitleText(e.text)
     }
@@ -251,7 +256,7 @@ export class ClosedCaptions extends UICorePlugin {
   }
 
   private activateTrack(id: number) {
-    if (['dash', 'hls'].includes(this.core.activePlayback?.name)) {
+    if (this.core.activePlayback && ['dash', 'hls'].includes(this.core.activePlayback.name)) {
       this.core.activePlayback.setTextTrack(id)
       return
     }
@@ -289,7 +294,7 @@ export class ClosedCaptions extends UICorePlugin {
     try {
       // TODO ensure to apply only once
       this.currentTracks = this.core.activePlayback.closedCaptionsTracks
-      this.applyPreselectedSubtitles()
+      this.applySelectedSubtitles()
       this.render()
     } catch (error) {
       reportError(error)
@@ -418,29 +423,40 @@ export class ClosedCaptions extends UICorePlugin {
 
   private onItemSelect(event: MouseEvent) {
     // event.target does not exist for some reason in tests
-    const id =
+    const id = Number(
       ((event.target ?? event.currentTarget) as HTMLElement).dataset?.item ??
-      '-1'
+      '-1',
+    )
 
-    localStorage.setItem(LOCAL_STORAGE_CC_ID, id) // TODO store language instead?
-    this.selectItem(this.findById(Number(id)))
+    // TODO review, make configurable, and emit event in addition
+    // localStorage.setItem(LOCAL_STORAGE_CC_ID, id) // TODO store language instead?
+    this.userSelectedItemId = id
+    this.selectItem(this.findById(id))
     this.hideMenu()
     return false
   }
 
-  private applyPreselectedSubtitles() {
-    if (!this.isPreselectedApplied) {
-      this.isPreselectedApplied = true
-      // if the language is undefined, then let the engine decide
-      // to hide the subtitles forcefully, set the language to 'none'
-      setTimeout(() => {
-        this.selectItem(
-          this.tracks.find((t) =>
-            this.isPreselectedLanguage(t.track.language),
-          ) ?? null,
-        )
-      }, 0)
+  private applySelectedSubtitles() {
+    if (this.isSelectedApplied) {
+      return;
+    }
+    this.isSelectedApplied = true
+    // If user selected a language, activate that
+    // Otherwise, if there is no configured language, then let the engine decide
+    // To hide the subtitles initially forcefully, set the language to 'none'
+    let matcher: (track: TextTrackItem) => boolean;
+    if (this.userSelectedItemId !== -1) {
+      matcher = (track: TextTrackItem) => track.id === this.userSelectedItemId;
+    } else if (this.preselectedLanguage) {
+      matcher = (track: TextTrackItem) => this.isPreselectedLanguage(track.track.language);
+    } else {
+      return;
     }
+    setTimeout(() => {
+      this.selectItem(
+        this.tracks.find(matcher) ?? null,
+      )
+    }, 0)
   }
 
   private hideMenu() {
@@ -479,11 +495,9 @@ export class ClosedCaptions extends UICorePlugin {
   }
 
   private selectSubtitles() {
-    const trackId = this.currentTrack?.id ?? -1
-
-    // TODO find out if this is needed
-    this.core.activePlayback.closedCaptionsTrackId = trackId
-    // this.core.activePlayback.closedCaptionsTrackId = -1
+    if (this.currentTrack) {
+      this.core.activePlayback.closedCaptionsTrackId = this.currentTrack.id
+    }
   }
 
   private getSubtitleText(track: TextTrack) {