@srgssr/pillarbox-web 1.28.0 → 1.30.0

package/dist/pillarbox-core.cjs

@@ -3,7 +3,7 @@
 const videojs = require('video.js');
 require('videojs-contrib-eme');
 
-const version = "1.27.0";
+const version = "1.29.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.27.0";
+const version = "1.29.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.27.0";
+const version = "1.29.0";
 
 /** @import VJSPlayer from 'video.js/dist/types/player' */
 /** @import AudioTrack from 'video.js/dist/types/tracks/audio-track' */
@@ -3650,21 +3650,12 @@ class SrgSsr {
    * @param {Player} player
    * @param {Array<Segment>} [segments=[]]
    */
-  static addBlockedSegments(player, segments = []) {
-    const trackId = 'srgssr-blocked-segments';
-    const removeTrack = player.textTracks().getTrackById(trackId);
-    if (removeTrack) {
-      player.textTracks().removeTrack(removeTrack);
-    }
-    if (!Array.isArray(segments) || !segments.length) return;
-    const blockedSegments = segments.filter(segment => segment.blockReason);
-    if (!blockedSegments.length) return;
-    SrgSsr.createTextTrack(player, trackId).then(segmentTrack => {
-      blockedSegments.forEach(segment => {
-        SrgSsr.addTextTrackCue(segmentTrack, segment);
-      });
-      player.textTracks().addTrack(segmentTrack);
-    });
+  static addBlockedSegments(_x) {
+    return _asyncToGenerator(function* (player, segments = []) {
+      const trackId = 'srgssr-blocked-segments';
+      const blockedSegmentsToAdd = SrgSsr.getBlockedSegments(segments);
+      yield SrgSsr.createTextTrack(player, trackId, blockedSegmentsToAdd);
+    }).apply(this, arguments);
   }
 
   /**
@@ -3706,6 +3697,23 @@ class SrgSsr {
     textTrack.addCue(new VTTCue(startTime, endTime, JSON.stringify(data)));
   }
 
+  /**
+   * 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);
+    });
+  }
+
   /**
    * Add multiple text tracks to the player.
    *
@@ -3728,20 +3736,12 @@ class SrgSsr {
    * @param {string} chapterUrn The URN of the main chapter.
    * @param {Array.<Chapter>} [chapters=[]]
    */
-  static addChapters(player, chapterUrn, chapters = []) {
-    const trackId = 'srgssr-chapters';
-    const removeTrack = player.textTracks().getTrackById(trackId);
-    if (removeTrack) {
-      player.textTracks().removeTrack(removeTrack);
-    }
-    if (!Array.isArray(chapters) || !chapters.length) return;
-    SrgSsr.createTextTrack(player, trackId).then(chapterTrack => {
-      chapters.forEach(chapter => {
-        if (chapterUrn !== chapter.fullLengthUrn) return;
-        SrgSsr.addTextTrackCue(chapterTrack, chapter);
-      });
-      player.textTracks().addTrack(chapterTrack);
-    });
+  static addChapters(_x2, _x3) {
+    return _asyncToGenerator(function* (player, chapterUrn, chapters = []) {
+      const trackId = 'srgssr-chapters';
+      const chaptersToAdd = SrgSsr.getChapters(chapterUrn, chapters);
+      yield SrgSsr.createTextTrack(player, trackId, chaptersToAdd);
+    }).apply(this, arguments);
   }
 
   /**
@@ -3750,19 +3750,12 @@ class SrgSsr {
    * @param {Player} player
    * @param {Array.<TimeInterval>} [intervals=[]]
    */
-  static addIntervals(player, intervals = []) {
-    const trackId = 'srgssr-intervals';
-    const removeTrack = player.textTracks().getTrackById(trackId);
-    if (removeTrack) {
-      player.textTracks().removeTrack(removeTrack);
-    }
-    if (!Array.isArray(intervals) || !intervals.length) return;
-    SrgSsr.createTextTrack(player, trackId).then(intervalTrack => {
-      intervals.forEach(interval => {
-        SrgSsr.addTextTrackCue(intervalTrack, interval);
-      });
-      player.textTracks().addTrack(intervalTrack);
-    });
+  static addIntervals(_x4) {
+    return _asyncToGenerator(function* (player, intervals = []) {
+      const trackId = 'srgssr-intervals';
+      const instervalsToAdd = SrgSsr.getIntervals(intervals);
+      yield SrgSsr.createTextTrack(player, trackId, instervalsToAdd);
+    }).apply(this, arguments);
   }
 
   /**
@@ -3866,25 +3859,42 @@ class SrgSsr {
   }
 
   /**
-   * Create a new metadata text track.
+   * Create a new metadata text track and add it to the player.
+   *
+   * If a text track with the same trackId exists, it is deleted beforehand.
    *
    * @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) {
-    // See https://github.com/videojs/video.js/issues/8519
-    return new Promise(resolve => {
-      setTimeout(() => {
-        resolve(new pillarbox.TextTrack({
-          id: trackId,
-          kind: 'metadata',
-          label: trackId,
-          tech: player.tech(true)
-        }));
-      }, 100);
-    });
+  static createTextTrack(_x5, _x6) {
+    return _asyncToGenerator(function* (player, trackId, cues = []) {
+      const removeTrack = player.textTracks().getTrackById(trackId);
+      if (removeTrack) {
+        player.textTracks().removeTrack(removeTrack);
+      }
+
+      // See https://github.com/videojs/video.js/issues/8519
+      const textTrack = yield new Promise(resolve => {
+        setTimeout(() => {
+          resolve(new pillarbox.TextTrack({
+            id: trackId,
+            kind: 'metadata',
+            label: trackId,
+            tech: player.tech(true)
+          }));
+        }, 100);
+      });
+      SrgSsr.addTextTrackCues(textTrack, cues);
+      player.textTracks().addTrack(textTrack);
+      return textTrack;
+    }).apply(this, arguments);
   }
 
   /**
@@ -4019,6 +4029,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.
    *
@@ -4027,7 +4075,7 @@ class SrgSsr {
    *
    * @returns {Promise<MediaComposition>}
    */
-  static getMediaComposition(_x) {
+  static getMediaComposition(_x7) {
     return _asyncToGenerator(function* (urn, handleRequest = new DataProvider().handleRequest()) {
       const data = yield handleRequest(urn);
       return Object.assign(new MediaComposition(), data);
@@ -4254,7 +4302,7 @@ class SrgSsr {
         var _ref = _asyncToGenerator(function* (srcObj, next) {
           return SrgSsr.handleSetSource(player, srcObj, next);
         });
-        return function setSource(_x2, _x3) {
+        return function setSource(_x8, _x9) {
           return _ref.apply(this, arguments);
         };
       }()