@srgssr/pillarbox-web 1.29.0 → 1.31.0

package/dist/pillarbox-core.cjs

@@ -3,7 +3,7 @@
 const videojs = require('video.js');
 require('videojs-contrib-eme');
 
-const version = "1.28.0";
+const version = "1.30.0";
 
 /** @import VJSPlayer from 'video.js/dist/types/player' */
 /** @import AudioTrack from 'video.js/dist/types/tracks/audio-track' */

package/dist/pillarbox-core.es.js

@@ -1,7 +1,7 @@
 import videojs from 'video.js';
 import 'videojs-contrib-eme';
 
-const version = "1.28.0";
+const version = "1.30.0";
 
 /** @import VJSPlayer from 'video.js/dist/types/player' */
 /** @import AudioTrack from 'video.js/dist/types/tracks/audio-track' */

package/dist/pillarbox.cjs

@@ -94,7 +94,7 @@ function _toPropertyKey(t) {
   return "symbol" == typeof i ? i : i + "";
 }
 
-const version = "1.28.0";
+const version = "1.30.0";
 
 /** @import VJSPlayer from 'video.js/dist/types/player' */
 /** @import AudioTrack from 'video.js/dist/types/tracks/audio-track' */
@@ -3653,13 +3653,8 @@ class SrgSsr {
   static addBlockedSegments(_x) {
     return _asyncToGenerator(function* (player, segments = []) {
       const trackId = 'srgssr-blocked-segments';
-      const segmentTrack = yield SrgSsr.createTextTrack(player, trackId);
-      if (!Array.isArray(segments) || !segments.length) return;
-      const blockedSegments = segments.filter(segment => segment.blockReason);
-      if (!blockedSegments.length) return;
-      blockedSegments.forEach(segment => {
-        SrgSsr.addTextTrackCue(segmentTrack, segment);
-      });
+      const blockedSegmentsToAdd = SrgSsr.getBlockedSegments(segments);
+      yield SrgSsr.createTextTrack(player, trackId, blockedSegmentsToAdd);
     }).apply(this, arguments);
   }
 
@@ -3699,7 +3694,29 @@ class SrgSsr {
   static addTextTrackCue(textTrack, data) {
     const startTime = (Number.isFinite(data.markIn) ? data.markIn : data.fullLengthMarkIn) / 1000;
     const endTime = (Number.isFinite(data.markOut) ? data.markOut : data.fullLengthMarkOut) / 1000;
-    textTrack.addCue(new VTTCue(startTime, endTime, JSON.stringify(data)));
+    const text = JSON.stringify(data);
+    const cue = new VTTCue(startTime, endTime, text);
+    if (data.urn) {
+      cue.id = data.urn;
+    }
+    textTrack.addCue(cue);
+  }
+
+  /**
+   * Add a new cues to a text track with the given array.
+   *
+   * @param {TextTrack} textTrack
+   * @param {Array.<
+   *   Segment |
+   *   Chapter |
+   *   TimeInterval>
+   * } cues SRG SSR's cues-like representation
+   */
+  static addTextTrackCues(textTrack, cues = []) {
+    if (!Array.isArray(cues)) return;
+    cues.forEach(cue => {
+      SrgSsr.addTextTrackCue(textTrack, cue);
+    });
   }
 
   /**
@@ -3727,12 +3744,8 @@ class SrgSsr {
   static addChapters(_x2, _x3) {
     return _asyncToGenerator(function* (player, chapterUrn, chapters = []) {
       const trackId = 'srgssr-chapters';
-      const chapterTrack = yield SrgSsr.createTextTrack(player, trackId);
-      if (!Array.isArray(chapters) || !chapters.length) return;
-      chapters.forEach(chapter => {
-        if (chapterUrn !== chapter.fullLengthUrn) return;
-        SrgSsr.addTextTrackCue(chapterTrack, chapter);
-      });
+      const chaptersToAdd = SrgSsr.getChapters(chapterUrn, chapters);
+      yield SrgSsr.createTextTrack(player, trackId, chaptersToAdd);
     }).apply(this, arguments);
   }
 
@@ -3745,11 +3758,8 @@ class SrgSsr {
   static addIntervals(_x4) {
     return _asyncToGenerator(function* (player, intervals = []) {
       const trackId = 'srgssr-intervals';
-      const intervalTrack = yield SrgSsr.createTextTrack(player, trackId);
-      if (!Array.isArray(intervals) || !intervals.length) return;
-      intervals.forEach(interval => {
-        SrgSsr.addTextTrackCue(intervalTrack, interval);
-      });
+      const instervalsToAdd = SrgSsr.getIntervals(intervals);
+      yield SrgSsr.createTextTrack(player, trackId, instervalsToAdd);
     }).apply(this, arguments);
   }
 
@@ -3860,11 +3870,16 @@ class SrgSsr {
    *
    * @param {Player} player
    * @param {String} trackId Text track unique ID
+   * @param {Array.<
+   *   Segment |
+   *   Chapter |
+   *   TimeInterval>
+   * } cues SRG SSR's cues-like representation
    *
    * @returns {Promise<TextTrack>}
    */
-  static createTextTrack(player, trackId) {
-    return _asyncToGenerator(function* () {
+  static createTextTrack(_x5, _x6) {
+    return _asyncToGenerator(function* (player, trackId, cues = []) {
       const removeTrack = player.textTracks().getTrackById(trackId);
       if (removeTrack) {
         player.textTracks().removeTrack(removeTrack);
@@ -3881,9 +3896,10 @@ class SrgSsr {
           }));
         }, 100);
       });
+      SrgSsr.addTextTrackCues(textTrack, cues);
       player.textTracks().addTrack(textTrack);
       return textTrack;
-    })();
+    }).apply(this, arguments);
   }
 
   /**
@@ -4018,6 +4034,44 @@ class SrgSsr {
     return isBlocked ? blockedSegment : undefined;
   }
 
+  /**
+   * Get blocked segments.
+   *
+   * @param {Player} player
+   * @param {Array<Segment>} [segments=[]]
+   *
+   * @returns {Array<Segment>}
+   */
+  static getBlockedSegments(segments = []) {
+    if (!Array.isArray(segments) || !segments.length) return [];
+    return segments.filter(segment => segment.blockReason);
+  }
+
+  /**
+   * Get chapters related to the main chapter.
+   *
+   * @param {string} chapterUrn The URN of the main chapter.
+   * @param {Array.<Chapter>} [chapters=[]]
+   *
+   * @returns {Array.<Chapter>}
+   */
+  static getChapters(chapterUrn, chapters = []) {
+    if (!Array.isArray(chapters) || !chapters.length) return [];
+    return chapters.filter(chapter => chapterUrn === chapter.fullLengthUrn);
+  }
+
+  /**
+   * Get intervals.
+   *
+   * @param {Array<TimeInterval>} [segments=[]]
+   *
+   * @returns {Array<TimeInterval>}
+   */
+  static getIntervals(intervals = []) {
+    if (!Array.isArray(intervals) || !intervals.length) return [];
+    return intervals;
+  }
+
   /**
    * Get mediaComposition from an URN.
    *
@@ -4026,7 +4080,7 @@ class SrgSsr {
    *
    * @returns {Promise<MediaComposition>}
    */
-  static getMediaComposition(_x5) {
+  static getMediaComposition(_x7) {
     return _asyncToGenerator(function* (urn, handleRequest = new DataProvider().handleRequest()) {
       const data = yield handleRequest(urn);
       return Object.assign(new MediaComposition(), data);
@@ -4253,7 +4307,7 @@ class SrgSsr {
         var _ref = _asyncToGenerator(function* (srcObj, next) {
           return SrgSsr.handleSetSource(player, srcObj, next);
         });
-        return function setSource(_x6, _x7) {
+        return function setSource(_x8, _x9) {
           return _ref.apply(this, arguments);
         };
       }()