@srgssr/pillarbox-web 1.36.0 → 1.36.2

package/dist/pillarbox-core.cjs

@@ -3,7 +3,7 @@
 const videojs = require('video.js');
 require('videojs-contrib-eme');
 
-const version = "1.35.1";
+const version = "1.36.1";
 
 /** @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.35.1";
+const version = "1.36.1";
 
 /** @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.35.1";
+const version = "1.36.1";
 
 /** @import VJSPlayer from 'video.js/dist/types/player' */
 /** @import AudioTrack from 'video.js/dist/types/tracks/audio-track' */
@@ -3979,10 +3979,11 @@ class SrgSsr {
    * @param {Array<Segment>} [segments=[]]
    */
   static addBlockedSegments(_x) {
+    var _this = this;
     return _asyncToGenerator(function* (player, segments = []) {
       const trackId = 'srgssr-blocked-segments';
-      const blockedSegmentsToAdd = SrgSsr.getBlockedSegments(segments);
-      yield SrgSsr.createTextTrack(player, trackId, blockedSegmentsToAdd);
+      const blockedSegmentsToAdd = _this.getBlockedSegments(segments);
+      yield _this.createTextTrack(player, trackId, blockedSegmentsToAdd);
     }).apply(this, arguments);
   }
 
@@ -4043,7 +4044,7 @@ class SrgSsr {
   static addTextTrackCues(textTrack, cues = []) {
     if (!Array.isArray(cues)) return;
     cues.forEach(cue => {
-      SrgSsr.addTextTrackCue(textTrack, cue);
+      this.addTextTrackCue(textTrack, cue);
     });
   }
 
@@ -4056,10 +4057,10 @@ class SrgSsr {
   static addTextTracks(player, {
     mediaData
   }) {
-    SrgSsr.addRemoteTextTracks(player, mediaData.subtitles);
-    SrgSsr.addChapters(player, mediaData.urn, mediaData.chapters);
-    SrgSsr.addBlockedSegments(player, mediaData.blockedSegments);
-    SrgSsr.addIntervals(player, mediaData.intervals);
+    this.addRemoteTextTracks(player, mediaData.subtitles);
+    this.addChapters(player, mediaData.urn, mediaData.chapters);
+    this.addBlockedSegments(player, mediaData.blockedSegments);
+    this.addIntervals(player, mediaData.intervals);
   }
 
   /**
@@ -4070,10 +4071,11 @@ class SrgSsr {
    * @param {Array.<Chapter>} [chapters=[]]
    */
   static addChapters(_x2, _x3) {
+    var _this2 = this;
     return _asyncToGenerator(function* (player, chapterUrn, chapters = []) {
       const trackId = 'srgssr-chapters';
-      const chaptersToAdd = SrgSsr.getChapters(chapterUrn, chapters);
-      yield SrgSsr.createTextTrack(player, trackId, chaptersToAdd);
+      const chaptersToAdd = _this2.getChapters(chapterUrn, chapters);
+      yield _this2.createTextTrack(player, trackId, chaptersToAdd);
     }).apply(this, arguments);
   }
 
@@ -4084,10 +4086,11 @@ class SrgSsr {
    * @param {Array.<TimeInterval>} [intervals=[]]
    */
   static addIntervals(_x4) {
+    var _this3 = this;
     return _asyncToGenerator(function* (player, intervals = []) {
       const trackId = 'srgssr-intervals';
-      const instervalsToAdd = SrgSsr.getIntervals(intervals);
-      yield SrgSsr.createTextTrack(player, trackId, instervalsToAdd);
+      const instervalsToAdd = _this3.getIntervals(intervals);
+      yield _this3.createTextTrack(player, trackId, instervalsToAdd);
     }).apply(this, arguments);
   }
 
@@ -4103,7 +4106,7 @@ class SrgSsr {
   static blockingReason(player, srcMediaObj) {
     if (!srcMediaObj.mediaData.blockReason) return;
     const message = player.localize(srcMediaObj.mediaData.blockReason);
-    SrgSsr.error(player, {
+    this.error(player, {
       code: MediaError.MEDIA_ERR_ABORTED,
       message,
       metadata: {
@@ -4157,7 +4160,7 @@ class SrgSsr {
    * @returns {Promise<Array.<MainResourceWithKeySystems>>}
    */
   static composeMainResources(mediaComposition) {
-    return SrgSsr.composeAkamaiResources(SrgSsr.composeKeySystemsResources(SrgSsr.filterIncompatibleResources(mediaComposition.getMainResources())));
+    return this.composeAkamaiResources(this.composeKeySystemsResources(this.filterIncompatibleResources(mediaComposition.getMainResources())));
   }
 
   /**
@@ -4207,26 +4210,25 @@ class SrgSsr {
    * @returns {Promise<TextTrack>}
    */
   static createTextTrack(_x5, _x6) {
+    var _this4 = this;
     return _asyncToGenerator(function* (player, trackId, cues = []) {
-      const removeTrack = player.textTracks().getTrackById(trackId);
+      const removeTrack = player.remoteTextTracks().getTrackById(trackId);
       if (removeTrack) {
-        player.textTracks().removeTrack(removeTrack);
+        player.removeRemoteTextTrack(removeTrack);
       }
+      const textTrack = player.addRemoteTextTrack({
+        id: trackId,
+        kind: 'metadata',
+        label: trackId
+      });
+
+      // Safari
+      textTrack.track.mode = 'hidden';
 
       // 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;
+      yield new Promise(resolve => setTimeout(resolve, 100));
+      _this4.addTextTrackCues(textTrack.track, cues);
+      return textTrack.track;
     }).apply(this, arguments);
   }
 
@@ -4236,12 +4238,12 @@ class SrgSsr {
    * @param {Player} player
    */
   static cuechangeEventProxy(player) {
-    player.textTracks().on('addtrack', ({
+    player.textTracks().on('addtrack', /** @param {{ track: TextTrack }} */({
       track
     }) => {
       if (!['srgssr-chapters', 'srgssr-intervals'].includes(track.id)) return;
-      track.on('cuechange', () => {
-        const [cue] = Array.from(track.activeCues);
+      track.addEventListener('cuechange', () => {
+        const [cue] = Array.from(track.activeCues || []);
         const type = track.id.includes('srgssr-chapters') ? 'srgssr/chapter' : 'srgssr/interval';
         player.trigger({
           type,
@@ -4286,7 +4288,7 @@ class SrgSsr {
   static dataProviderError(player, error) {
     if (!error) return;
     const statusText = error.statusText ? error.statusText : error.message;
-    SrgSsr.error(player, {
+    this.error(player, {
       code: 0,
       message: player.localize('UNKNOWN'),
       metadata: {
@@ -4343,7 +4345,7 @@ class SrgSsr {
     if (!blockedSegmentsTrack) return;
 
     /** @type {VTTCue} */
-    const [blockedCue] = Array.from(blockedSegmentsTrack.activeCues);
+    const [blockedCue] = Array.from(blockedSegmentsTrack.activeCues || []);
     return blockedCue;
   }
 
@@ -4356,7 +4358,7 @@ class SrgSsr {
    * @returns {VTTCue|undefined} The VTT cue of a blocked segment, or undefined
    */
   static getBlockedSegmentByTime(player, currentTime) {
-    const blockedSegment = SrgSsr.getBlockedSegment(player);
+    const blockedSegment = this.getBlockedSegment(player);
     if (!blockedSegment) return;
     const isBlocked = currentTime >= blockedSegment.startTime && currentTime < blockedSegment.endTime;
     return isBlocked ? blockedSegment : undefined;
@@ -4440,24 +4442,25 @@ class SrgSsr {
    * @returns {Promise<ComposedSrcMediaData>} - The composed source media data.
    */
   static getSrcMediaObj(player, srcObj) {
+    var _this5 = this;
     return _asyncToGenerator(function* () {
-      if (SrgSsr.pillarboxMonitoring(player)) {
-        SrgSsr.pillarboxMonitoring(player).sessionStart();
+      if (_this5.pillarboxMonitoring(player)) {
+        _this5.pillarboxMonitoring(player).sessionStart();
       }
       const {
           src: urn
         } = srcObj,
         srcOptions = _objectWithoutProperties(srcObj, _excluded2);
-      const mediaComposition = yield SrgSsr.getMediaComposition(urn, SrgSsr.dataProvider(player));
-      const mainResources = yield SrgSsr.composeMainResources(mediaComposition);
-      let mediaData = SrgSsr.getMediaData(mainResources);
+      const mediaComposition = yield _this5.getMediaComposition(urn, _this5.dataProvider(player));
+      const mainResources = yield _this5.composeMainResources(mediaComposition);
+      let mediaData = _this5.getMediaData(mainResources);
       if (!mediaData) {
         mediaData = {
           blockReason: mediaComposition.getMainChapter().blockReason,
           imageUrl: mediaComposition.getMainChapterImageUrl()
         };
       }
-      return SrgSsr.composeSrcMediaData(srcOptions, mediaData);
+      return _this5.composeSrcMediaData(srcOptions, mediaData);
     })();
   }
 
@@ -4530,17 +4533,18 @@ class SrgSsr {
    * @returns {Promise<any>}
    */
   static handleSetSource(player, srcObj, next) {
+    var _this6 = this;
     return _asyncToGenerator(function* () {
       try {
-        const srcMediaObj = yield SrgSsr.getSrcMediaObj(player, srcObj);
-        SrgSsr.srgAnalytics(player);
-        SrgSsr.updateTitleBar(player, srcMediaObj);
-        SrgSsr.updatePoster(player, srcMediaObj);
-        if (SrgSsr.blockingReason(player, srcMediaObj)) return;
-        SrgSsr.addTextTracks(player, srcMediaObj);
+        const srcMediaObj = yield _this6.getSrcMediaObj(player, srcObj);
+        _this6.srgAnalytics(player);
+        _this6.updateTitleBar(player, srcMediaObj);
+        _this6.updatePoster(player, srcMediaObj);
+        if (_this6.blockingReason(player, srcMediaObj)) return;
+        _this6.addTextTracks(player, srcMediaObj);
         return next(null, srcMediaObj);
       } catch (error) {
-        if (SrgSsr.dataProviderError(player, error)) return;
+        if (_this6.dataProviderError(player, error)) return;
         return next(error);
       }
     })();
@@ -4627,14 +4631,15 @@ class SrgSsr {
    * @returns {Object}
    */
   static middleware(player) {
-    SrgSsr.pillarboxMonitoring(player);
-    SrgSsr.cuechangeEventProxy(player);
+    var _this7 = this;
+    this.pillarboxMonitoring(player);
+    this.cuechangeEventProxy(player);
     return {
-      currentTime: currentTime => SrgSsr.handleCurrentTime(player, currentTime),
-      setCurrentTime: currentTime => SrgSsr.handleSetCurrentTime(player, currentTime),
+      currentTime: currentTime => this.handleCurrentTime(player, currentTime),
+      setCurrentTime: currentTime => this.handleSetCurrentTime(player, currentTime),
       setSource: function () {
         var _ref = _asyncToGenerator(function* (srcObj, next) {
-          return SrgSsr.handleSetSource(player, srcObj, next);
+          return _this7.handleSetSource(player, srcObj, next);
         });
         return function setSource(_x8, _x9) {
           return _ref.apply(this, arguments);
@@ -4643,7 +4648,7 @@ class SrgSsr {
     };
   }
 }
-pillarbox.use('srgssr/urn', SrgSsr.middleware);
+pillarbox.use('srgssr/urn', player => SrgSsr.middleware(player));
 
 // Add Middleware specific options
 pillarbox.options.srgOptions = {