rx-player 4.0.0-beta.1 → 4.0.0-beta.2

package/dist/_esm5.processed/core/api/track_management/track_dispatcher.d.ts

@@ -30,6 +30,14 @@ export default class TrackDispatcher extends EventEmitter<ITrackDispatcherEvent>
     private _lastEmitted;
     /** Interface allowing to clean-up resources when they are not needed anymore. */
     private _canceller;
+    /**
+     * Boolean set to `true` when a track-updating method is called and to `false`
+     * just before it performs the actual track change to allow checking for
+     * re-entrancy: if the token is already reset to `false` before the
+     * track change is officialized, then another track update has already been
+     * performed in the meantime.
+     */
+    private _updateToken;
     /**
      * Create a new `TrackDispatcher` by giving its Reference and an initial track
      * setting.
@@ -37,9 +45,12 @@ export default class TrackDispatcher extends EventEmitter<ITrackDispatcherEvent>
      * synchronously.
      * @param {Object} manifest
      * @param {Object} adaptationRef
+     */
+    constructor(manifest: Manifest, adaptationRef: ISharedReference<IAdaptationChoice | null | undefined>);
+    /**
      * @param {Object|null} initialTrackInfo
      */
-    constructor(manifest: Manifest, adaptationRef: ISharedReference<IAdaptationChoice | null | undefined>, initialTrackInfo: ITrackSetting | null);
+    start(initialTrackInfo: ITrackSetting | null): void;
     /**
      * Update the wanted track on the Reference linked to this `TrackDispatcher`.
      * @param {Object|null} newTrackInfo
@@ -65,6 +76,7 @@ export interface ITrackDispatcherEvent {
      * none of them are currently "playable".
      */
     noPlayableLockedRepresentation: null;
+    noPlayableRepresentation: null;
 }
 /** Define a new Track preference given to the `TrackDispatcher`. */
 export interface ITrackSetting {

package/dist/_esm5.processed/core/api/track_management/track_dispatcher.js

@@ -13,7 +13,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { MediaError } from "../../../errors";
 import EventEmitter from "../../../utils/event_emitter";
 import createSharedReference from "../../../utils/reference";
 import TaskCanceller from "../../../utils/task_canceller";
@@ -31,36 +30,49 @@ var TrackDispatcher = /** @class */ (function (_super) {
      * synchronously.
      * @param {Object} manifest
      * @param {Object} adaptationRef
-     * @param {Object|null} initialTrackInfo
      */
-    function TrackDispatcher(manifest, adaptationRef, initialTrackInfo) {
+    function TrackDispatcher(manifest, adaptationRef) {
         var _this = _super.call(this) || this;
         _this._canceller = new TaskCanceller();
         _this._manifest = manifest;
         _this._adaptationRef = adaptationRef;
+        _this._updateToken = false;
+        return _this;
+    }
+    /**
+     * @param {Object|null} initialTrackInfo
+     */
+    TrackDispatcher.prototype.start = function (initialTrackInfo) {
+        this._updateToken = true;
         if (initialTrackInfo === null) {
-            _this._lastEmitted = initialTrackInfo;
-            adaptationRef.setValue(null);
-            return _this;
+            this._lastEmitted = null;
+            this._updateToken = false;
+            this._adaptationRef.setValue(null);
+            return;
         }
-        var reference = _this._constructLockedRepresentationsReference(initialTrackInfo);
-        _this._lastEmitted = { adaptation: initialTrackInfo.adaptation,
+        var reference = this._constructLockedRepresentationsReference(initialTrackInfo);
+        if (!this._updateToken) {
+            return;
+        }
+        this._lastEmitted = { adaptation: initialTrackInfo.adaptation,
             switchingMode: initialTrackInfo.switchingMode,
             lockedRepresentations: null };
-        adaptationRef.setValue({ adaptation: initialTrackInfo.adaptation,
+        this._updateToken = false;
+        this._adaptationRef.setValue({ adaptation: initialTrackInfo.adaptation,
             switchingMode: initialTrackInfo.switchingMode,
             representations: reference });
-        return _this;
-    }
+    };
     /**
      * Update the wanted track on the Reference linked to this `TrackDispatcher`.
      * @param {Object|null} newTrackInfo
      */
     TrackDispatcher.prototype.updateTrack = function (newTrackInfo) {
+        this._updateToken = true;
         if (newTrackInfo === null) {
             if (this._lastEmitted === null) {
                 return;
             }
+            this._updateToken = false;
             this._canceller.cancel();
             // has no point but let's still create one for simplicity sake
             this._canceller = new TaskCanceller();
@@ -72,7 +84,11 @@ var TrackDispatcher = /** @class */ (function (_super) {
         this._canceller.cancel();
         this._canceller = new TaskCanceller();
         var reference = this._constructLockedRepresentationsReference(newTrackInfo);
+        if (!this._updateToken) {
+            return;
+        }
         this._lastEmitted = { adaptation: adaptation, switchingMode: switchingMode, lockedRepresentations: null };
+        this._updateToken = false;
         this._adaptationRef.setValue({ adaptation: adaptation, switchingMode: switchingMode, representations: reference });
     };
     /**
@@ -120,10 +136,9 @@ var TrackDispatcher = /** @class */ (function (_super) {
                 }
             }
             if (playableRepresentations.length <= 0) {
-                var adaptationType = trackInfo.adaptation.type;
-                var noRepErr = new MediaError("NO_PLAYABLE_REPRESENTATION", "No Representation in the chosen " +
-                    adaptationType + " Adaptation can be played");
-                throw noRepErr;
+                trackInfo.adaptation.isSupported = false;
+                self.trigger("noPlayableRepresentation", null);
+                return;
             }
             // Check if Locked Representations have changed
             var oldRef = reference.getValue();

package/dist/_esm5.processed/core/api/track_management/tracks_store.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Manifest, { Adaptation, Period } from "../../../manifest";
-import { IAudioRepresentationsSwitchingMode, IAudioTrack, IAudioTrackSwitchingMode, ITrackUpdateEventPayload, IAvailableAudioTrack, IAvailableTextTrack, IAvailableVideoTrack, IBrokenRepresentationsLockContext, IPeriod, ITextTrack, IVideoRepresentationsSwitchingMode, IVideoTrack, IVideoTrackSwitchingMode } from "../../../public_types";
+import { IAudioRepresentationsSwitchingMode, IAudioTrack, IAudioTrackSwitchingMode, ITrackUpdateEventPayload, IAvailableAudioTrack, IAvailableTextTrack, IAvailableVideoTrack, IBrokenRepresentationsLockContext, IPeriod, ITextTrack, IVideoRepresentationsSwitchingMode, IVideoTrack, IVideoTrackSwitchingMode, IPlayerError } from "../../../public_types";
 import EventEmitter from "../../../utils/event_emitter";
 import { ISharedReference } from "../../../utils/reference";
 import { IAdaptationChoice, IRepresentationsChoice } from "../../stream";
@@ -394,6 +394,8 @@ interface ITracksStoreEvents {
     newAvailablePeriods: IPeriod[];
     brokenRepresentationsLock: IBrokenRepresentationsLockContext;
     trackUpdate: ITrackUpdateEventPayload;
+    error: unknown;
+    warning: IPlayerError;
 }
 export interface IAudioRepresentationsLockSettings {
     representations: string[];

package/dist/_esm5.processed/core/api/track_management/tracks_store.js

@@ -33,12 +33,14 @@ var __extends = (this && this.__extends) || (function () {
  * switching for an easier API management.
  */
 import config from "../../../config";
+import { MediaError } from "../../../errors";
 import log from "../../../log";
 import arrayFind from "../../../utils/array_find";
 import assert from "../../../utils/assert";
 import EventEmitter from "../../../utils/event_emitter";
+import isNullOrUndefined from "../../../utils/is_null_or_undefined";
+import objectAssign from "../../../utils/object_assign";
 import createSharedReference from "../../../utils/reference";
-import takeFirstSet from "../../../utils/take_first_set";
 import TrackDispatcher from "./track_dispatcher";
 /**
  * Class helping with the management of the audio, video and text tracks and
@@ -115,7 +117,7 @@ var TracksStore = /** @class */ (function (_super) {
                     var stillHere = textAdaptations
                         .some(function (a) { return a.id === curWantedTextTrack_1.adaptation.id; });
                     if (!stillHere) {
-                        log.warn("TracksStore: Chosen text Adaptation not available anymore");
+                        log.warn("TS: Chosen text Adaptation not available anymore");
                         var periodInfo = this_1._storedPeriodInfo[i];
                         periodInfo.text.storedSettings = null;
                         this_1.trigger("trackUpdate", { period: toExposedPeriod(newPeriod),
@@ -138,7 +140,7 @@ var TracksStore = /** @class */ (function (_super) {
                     var stillHere = videoAdaptations
                         .some(function (a) { return a.id === curWantedVideoTrack_1.adaptation.id; });
                     if (!stillHere) {
-                        log.warn("TracksStore: Chosen video Adaptation not available anymore");
+                        log.warn("TS: Chosen video Adaptation not available anymore");
                         var periodItem = this_1._storedPeriodInfo[i];
                         var storedSettings = void 0;
                         if (videoAdaptations.length === 0) {
@@ -172,7 +174,7 @@ var TracksStore = /** @class */ (function (_super) {
                     var stillHere = audioAdaptations
                         .some(function (a) { return a.id === curWantedAudioTrack_1.adaptation.id; });
                     if (!stillHere) {
-                        log.warn("TracksStore: Chosen audio Adaptation not available anymore");
+                        log.warn("TS: Chosen audio Adaptation not available anymore");
                         var periodItem = this_1._storedPeriodInfo[i];
                         var storedSettings = audioAdaptations.length === 0 ?
                             null :
@@ -262,20 +264,58 @@ var TracksStore = /** @class */ (function (_super) {
                     end: period.end }]);
         }
         if (periodObj[bufferType].dispatcher !== null) {
-            log.error("TracksStore: Subject already added for ".concat(bufferType, " ") +
+            log.error("TS: Subject already added for ".concat(bufferType, " ") +
                 "and Period ".concat(period.start));
             return;
         }
         var trackSetting = periodObj[bufferType].storedSettings;
-        var dispatcher = new TrackDispatcher(manifest, adaptationRef, trackSetting);
+        var dispatcher = new TrackDispatcher(manifest, adaptationRef);
         periodObj[bufferType].dispatcher = dispatcher;
+        dispatcher.addEventListener("noPlayableRepresentation", function () {
+            var _a, _b, _c;
+            var nextAdaptation = arrayFind(period.getAdaptationsForType(bufferType), function (a) {
+                var playableRepresentations = a.getPlayableRepresentations();
+                return playableRepresentations.length > 0;
+            });
+            if (nextAdaptation === undefined) {
+                var noRepErr = new MediaError("NO_PLAYABLE_REPRESENTATION", "No ".concat(bufferType, " Representation can be played"), { adaptation: undefined });
+                _this.trigger("error", noRepErr);
+                _this.dispose();
+                return;
+            }
+            var typeInfo = (_a = getPeriodItem(_this._storedPeriodInfo, period.id)) === null || _a === void 0 ? void 0 : _a[bufferType];
+            if (isNullOrUndefined(typeInfo)) {
+                return;
+            }
+            var switchingMode = bufferType === "audio" ?
+                _this._defaultAudioTrackSwitchingMode :
+                "reload";
+            var storedSettings = { adaptation: nextAdaptation, switchingMode: switchingMode, lockedRepresentations: createSharedReference(null) };
+            typeInfo.storedSettings = storedSettings;
+            _this.trigger("trackUpdate", { period: toExposedPeriod(period),
+                trackType: bufferType,
+                reason: "no-playable-representation" });
+            // The previous event trigger could have had side-effects, so we
+            // re-check if we're still mostly in the same state
+            if (_this._isDisposed) {
+                return; // Someone disposed the `TracksStore` on the previous side-effect
+            }
+            typeInfo = (_b = getPeriodItem(_this._storedPeriodInfo, period.id)) === null || _b === void 0 ? void 0 : _b[bufferType];
+            if (isNullOrUndefined(typeInfo) || typeInfo.storedSettings !== storedSettings) {
+                return;
+            }
+            (_c = typeInfo.dispatcher) === null || _c === void 0 ? void 0 : _c.updateTrack(storedSettings);
+        });
         dispatcher.addEventListener("noPlayableLockedRepresentation", function () {
+            // TODO check that it doesn't already lead to segment loading or MediaSource
+            // reloading
             trackSetting === null || trackSetting === void 0 ? void 0 : trackSetting.lockedRepresentations.setValue(null);
             _this.trigger("brokenRepresentationsLock", { period: { id: period.id,
                     start: period.start,
                     end: period.end },
                 trackType: bufferType });
         });
+        dispatcher.start(trackSetting);
     };
     /**
      * Remove shared reference to choose an "audio", "video" or "text" Adaptation
@@ -286,13 +326,13 @@ var TracksStore = /** @class */ (function (_super) {
     TracksStore.prototype.removeTrackReference = function (bufferType, period) {
         var periodIndex = findPeriodIndex(this._storedPeriodInfo, period);
         if (periodIndex === undefined) {
-            log.warn("TracksStore: ".concat(bufferType, " not found for period"), period.start);
+            log.warn("TS: ".concat(bufferType, " not found for period"), period.start);
             return;
         }
         var periodObj = this._storedPeriodInfo[periodIndex];
         var choiceItem = periodObj[bufferType];
         if ((choiceItem === null || choiceItem === void 0 ? void 0 : choiceItem.dispatcher) === null) {
-            log.warn("TracksStore: TrackDispatcher already removed for ".concat(bufferType, " ") +
+            log.warn("TS: TrackDispatcher already removed for ".concat(bufferType, " ") +
                 "and Period ".concat(period.start));
             return;
         }
@@ -564,7 +604,7 @@ var TracksStore = /** @class */ (function (_super) {
     TracksStore.prototype.getChosenAudioTrack = function (periodObj) {
         return periodObj.audio.storedSettings === null ?
             null :
-            toAudioTrack(periodObj.audio.storedSettings.adaptation);
+            periodObj.audio.storedSettings.adaptation.toAudioTrack(true);
     };
     /**
      * Returns an object describing the chosen text track for the given text
@@ -579,7 +619,7 @@ var TracksStore = /** @class */ (function (_super) {
     TracksStore.prototype.getChosenTextTrack = function (periodObj) {
         return periodObj.text.storedSettings === null ?
             null :
-            toTextTrack(periodObj.text.storedSettings.adaptation);
+            periodObj.text.storedSettings.adaptation.toTextTrack();
     };
     /**
      * Returns an object describing the chosen video track for the given video
@@ -595,7 +635,7 @@ var TracksStore = /** @class */ (function (_super) {
         if (periodObj.video.storedSettings === null) {
             return null;
         }
-        return toVideoTrack(periodObj.video.storedSettings.adaptation);
+        return periodObj.video.storedSettings.adaptation.toVideoTrack(true);
     };
     /**
      * Returns all available audio tracks for a given Period, as an array of
@@ -613,21 +653,9 @@ var TracksStore = /** @class */ (function (_super) {
             null;
         return periodObj.period.getSupportedAdaptations("audio")
             .map(function (adaptation) {
-            var formatted = {
-                language: takeFirstSet(adaptation.language, ""),
-                normalized: takeFirstSet(adaptation.normalizedLanguage, ""),
-                audioDescription: adaptation.isAudioDescription === true,
-                id: adaptation.id,
-                active: currentId === null ? false :
-                    currentId === adaptation.id,
-                representations: adaptation.getPlayableRepresentations()
-                    .map(parseAudioRepresentation),
-                label: adaptation.label,
-            };
-            if (adaptation.isDub === true) {
-                formatted.dub = true;
-            }
-            return formatted;
+            var active = currentId === null ? false :
+                currentId === adaptation.id;
+            return objectAssign(adaptation.toAudioTrack(true), { active: active });
         });
     };
     /**
@@ -646,19 +674,9 @@ var TracksStore = /** @class */ (function (_super) {
             null;
         return periodObj.period.getSupportedAdaptations("text")
             .map(function (adaptation) {
-            var formatted = {
-                language: takeFirstSet(adaptation.language, ""),
-                normalized: takeFirstSet(adaptation.normalizedLanguage, ""),
-                closedCaption: adaptation.isClosedCaption === true,
-                id: adaptation.id,
-                active: currentId === null ? false :
-                    currentId === adaptation.id,
-                label: adaptation.label,
-            };
-            if (adaptation.isForcedSubtitles !== undefined) {
-                formatted.forced = adaptation.isForcedSubtitles;
-            }
-            return formatted;
+            var active = currentId === null ? false :
+                currentId === adaptation.id;
+            return objectAssign(adaptation.toTextTrack(), { active: active });
         });
     };
     /**
@@ -677,35 +695,21 @@ var TracksStore = /** @class */ (function (_super) {
             storedSettings.adaptation.id;
         return periodObj.period.getSupportedAdaptations("video")
             .map(function (adaptation) {
-            var trickModeTracks = adaptation.trickModeTracks !== undefined ?
-                adaptation.trickModeTracks.map(function (trickModeAdaptation) {
+            var active = currentId === null ? false :
+                currentId === adaptation.id;
+            var track = adaptation.toVideoTrack(true);
+            var trickModeTracks = track.trickModeTracks !== undefined ?
+                track.trickModeTracks.map(function (trickModeAdaptation) {
                     var isActive = currentId === null ? false :
                         currentId === trickModeAdaptation.id;
-                    var representations = trickModeAdaptation.getPlayableRepresentations()
-                        .map(parseVideoRepresentation);
-                    var trickMode = { id: trickModeAdaptation.id, representations: representations, isTrickModeTrack: true,
-                        active: isActive };
-                    if (trickModeAdaptation.isSignInterpreted === true) {
-                        trickMode.signInterpreted = true;
-                    }
-                    return trickMode;
+                    return objectAssign(trickModeAdaptation, { active: isActive });
                 }) :
-                undefined;
-            var formatted = {
-                id: adaptation.id,
-                active: currentId === null ? false :
-                    currentId === adaptation.id,
-                representations: adaptation.getPlayableRepresentations()
-                    .map(parseVideoRepresentation),
-                label: adaptation.label,
-            };
-            if (adaptation.isSignInterpreted === true) {
-                formatted.signInterpreted = true;
-            }
+                [];
+            var availableTrack = objectAssign(track, { active: active });
             if (trickModeTracks !== undefined) {
-                formatted.trickModeTracks = trickModeTracks;
+                availableTrack.trickModeTracks = trickModeTracks;
             }
-            return formatted;
+            return availableTrack;
         });
     };
     TracksStore.prototype.getLockedAudioRepresentations = function (periodObj) {
@@ -888,15 +892,6 @@ function getPeriodItem(periods, periodId) {
         }
     }
 }
-/**
- * Parse video Representation into a IVideoRepresentation.
- * @param {Object} representation
- * @returns {Object}
- */
-function parseVideoRepresentation(_a) {
-    var id = _a.id, bitrate = _a.bitrate, frameRate = _a.frameRate, width = _a.width, height = _a.height, codec = _a.codec, hdrInfo = _a.hdrInfo;
-    return { id: id, bitrate: bitrate, frameRate: frameRate, width: width, height: height, codec: codec, hdrInfo: hdrInfo };
-}
 /**
  * A `ITMPeriodObject` should only be removed once all References linked to it
  * do not exist anymore, to keep the possibility of making track choices.
@@ -910,15 +905,6 @@ function isPeriodItemRemovable(periodObj) {
         ((_b = periodObj.audio) === null || _b === void 0 ? void 0 : _b.dispatcher) === null &&
         ((_c = periodObj.video) === null || _c === void 0 ? void 0 : _c.dispatcher) === null;
 }
-/**
- * Parse audio Representation into a ITMAudioRepresentation.
- * @param {Object} representation
- * @returns {Object}
- */
-function parseAudioRepresentation(_a) {
-    var id = _a.id, bitrate = _a.bitrate, codec = _a.codec;
-    return { id: id, bitrate: bitrate, codec: codec };
-}
 function getRightVideoTrack(adaptation, isTrickModeEnabled) {
     var _a;
     if (isTrickModeEnabled &&
@@ -982,77 +968,6 @@ function generatePeriodInfo(period, inManifest, isTrickModeTrackEnabled, default
         text: { storedSettings: textSettings,
             dispatcher: null } };
 }
-/**
- * Format Adaptation structure into the format awaited by the API.
- * @param {Object} a
- * @returns {Object}
- */
-function toTextTrack(a) {
-    var _a, _b;
-    var formatted = {
-        language: (_a = a.language) !== null && _a !== void 0 ? _a : "",
-        normalized: (_b = a.normalizedLanguage) !== null && _b !== void 0 ? _b : "",
-        closedCaption: a.isClosedCaption === true,
-        id: a.id,
-        label: a.label,
-    };
-    if (a.isForcedSubtitles !== undefined) {
-        formatted.forced = a.isForcedSubtitles;
-    }
-    return formatted;
-}
-/**
- * Format Adaptation structure into the format awaited by the API.
- * @param {Object} a
- * @returns {Object}
- */
-function toVideoTrack(a) {
-    var trickModeTracks = a.trickModeTracks !== undefined ?
-        a.trickModeTracks.map(function (trickModeAdaptation) {
-            var representations = trickModeAdaptation.getPlayableRepresentations()
-                .map(parseVideoRepresentation);
-            var trickMode = { id: trickModeAdaptation.id, representations: representations, isTrickModeTrack: true };
-            if (trickModeAdaptation.isSignInterpreted === true) {
-                trickMode.signInterpreted = true;
-            }
-            return trickMode;
-        }) :
-        undefined;
-    var videoTrack = {
-        id: a.id,
-        representations: a.getPlayableRepresentations().map(parseVideoRepresentation),
-        label: a.label,
-    };
-    if (a.isSignInterpreted === true) {
-        videoTrack.signInterpreted = true;
-    }
-    if (a.isTrickModeTrack === true) {
-        videoTrack.isTrickModeTrack = true;
-    }
-    if (trickModeTracks !== undefined) {
-        videoTrack.trickModeTracks = trickModeTracks;
-    }
-    return videoTrack;
-}
-/**
- * Convert an audio Adaptation into an audio track.
- * @param {object|null} adaptation - Audio adaptation
- * @returns {object|null} - corresponding audio track object.
- */
-function toAudioTrack(adaptation) {
-    var audioTrack = {
-        language: takeFirstSet(adaptation.language, ""),
-        normalized: takeFirstSet(adaptation.normalizedLanguage, ""),
-        audioDescription: adaptation.isAudioDescription === true,
-        id: adaptation.id,
-        representations: adaptation.representations.map(parseAudioRepresentation),
-        label: adaptation.label,
-    };
-    if (adaptation.isDub === true) {
-        audioTrack.dub = true;
-    }
-    return audioTrack;
-}
 function toExposedPeriod(p) {
     return { start: p.start, end: p.end, id: p.id };
 }

package/dist/_esm5.processed/core/api/utils.d.ts

@@ -30,6 +30,16 @@ import { IPlaybackObservation, IReadOnlyPlaybackObserver } from "./playback_obse
  * remove all listeners this function has registered.
  */
 export declare function emitSeekEvents(mediaElement: HTMLMediaElement | null, playbackObserver: IReadOnlyPlaybackObserver<IPlaybackObservation>, onSeeking: () => void, onSeeked: () => void, cancelSignal: CancellationSignal): void;
+/**
+ * @param {HTMLMediaElement} mediaElement
+ * @param {function} onPlay - Callback called when a play operation has started
+ * on `mediaElement`.
+ * @param {function} onPause - Callback called when a pause operation has
+ * started on `mediaElement`.
+ * @param {Object} cancelSignal - When triggered, stop calling callbacks and
+ * remove all listeners this function has registered.
+ */
+export declare function emitPlayPauseEvents(mediaElement: HTMLMediaElement | null, onPlay: () => void, onPause: () => void, cancelSignal: CancellationSignal): void;
 /** Player state dictionnary. */
 export declare const enum PLAYER_STATES {
     STOPPED = "STOPPED",

package/dist/_esm5.processed/core/api/utils.js

@@ -49,6 +49,26 @@ export function emitSeekEvents(mediaElement, playbackObserver, onSeeking, onSeek
         }
     }, { includeLastObservation: true, clearSignal: cancelSignal });
 }
+/**
+ * @param {HTMLMediaElement} mediaElement
+ * @param {function} onPlay - Callback called when a play operation has started
+ * on `mediaElement`.
+ * @param {function} onPause - Callback called when a pause operation has
+ * started on `mediaElement`.
+ * @param {Object} cancelSignal - When triggered, stop calling callbacks and
+ * remove all listeners this function has registered.
+ */
+export function emitPlayPauseEvents(mediaElement, onPlay, onPause, cancelSignal) {
+    if (cancelSignal.isCancelled() || mediaElement === null) {
+        return;
+    }
+    mediaElement.addEventListener("play", onPlay);
+    mediaElement.addEventListener("pause", onPause);
+    cancelSignal.register(function () {
+        mediaElement.removeEventListener("play", onPlay);
+        mediaElement.removeEventListener("pause", onPause);
+    });
+}
 export function constructPlayerStateReference(initializer, mediaElement, playbackObserver, cancelSignal) {
     var playerStateRef = createSharedReference("LOADING" /* PLAYER_STATES.LOADING */, cancelSignal);
     initializer.addEventListener("loaded", function () {

package/dist/_esm5.processed/core/decrypt/session_events_listener.js

@@ -133,7 +133,13 @@ export default function SessionEventsListener(session, keySystemOptions, keySyst
                 log.info("DRM: No license given, skipping session.update");
             }
             else {
-                return updateSessionWithMessage(session, licenseObject);
+                try {
+                    return updateSessionWithMessage(session, licenseObject);
+                }
+                catch (err) {
+                    manualCanceller.cancel();
+                    callbacks.onError(err);
+                }
             }
         })
             .catch(function (err) {

package/dist/_esm5.processed/core/decrypt/utils/clean_old_loaded_sessions.js

@@ -49,6 +49,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+import log from "../../../log";
 /**
  * Close sessions from the loadedSessionsStore to allow at maximum `limit`
  * stored MediaKeySessions in it.
@@ -67,6 +68,7 @@ export default function cleanOldLoadedSessions(loadedSessionsStore, limit) {
                     if (limit < 0 || limit >= loadedSessionsStore.getLength()) {
                         return [2 /*return*/];
                     }
+                    log.info("DRM: LSS cache limit exceeded", limit, loadedSessionsStore.getLength());
                     proms = [];
                     entries = loadedSessionsStore.getAll().slice();
                     toDelete = entries.length - limit;

package/dist/_esm5.processed/core/decrypt/utils/loaded_sessions_store.js

@@ -92,6 +92,7 @@ var LoadedSessionsStore = /** @class */ (function () {
     LoadedSessionsStore.prototype.createSession = function (initData, sessionType) {
         var _this = this;
         var keySessionRecord = new KeySessionRecord(initData);
+        log.debug("DRM-LSS: calling `createSession`", sessionType);
         var mediaKeySession = this._mediaKeys.createSession(sessionType);
         var entry = { mediaKeySession: mediaKeySession, sessionType: sessionType, keySessionRecord: keySessionRecord, isGeneratingRequest: false,
             isLoadingPersistentSession: false,
@@ -99,6 +100,7 @@ var LoadedSessionsStore = /** @class */ (function () {
         if (!isNullOrUndefined(mediaKeySession.closed)) {
             mediaKeySession.closed
                 .then(function () {
+                log.info("DRM-LSS: session was closed, removing it.", mediaKeySession.sessionId);
                 var index = _this.getIndex(keySessionRecord);
                 if (index >= 0 &&
                     _this._storage[index].mediaKeySession === mediaKeySession) {
@@ -110,8 +112,8 @@ var LoadedSessionsStore = /** @class */ (function () {
                 log.warn("DRM-LSS: MediaKeySession.closed rejected: ".concat(e));
             });
         }
-        log.debug("DRM-LSS: Add MediaKeySession", entry.sessionType);
         this._storage.push(__assign({}, entry));
+        log.debug("DRM-LSS: MediaKeySession added", entry.sessionType, this._storage.length);
         return entry;
     };
     /**
@@ -132,6 +134,7 @@ var LoadedSessionsStore = /** @class */ (function () {
             if (stored.keySessionRecord.isCompatibleWith(initializationData)) {
                 this._storage.splice(i, 1);
                 this._storage.push(stored);
+                log.debug("DRM-LSS: Reusing session:", stored.mediaKeySession.sessionId, stored.sessionType);
                 return __assign({}, stored);
             }
         }
@@ -365,6 +368,7 @@ var LoadedSessionsStore = /** @class */ (function () {
         for (var i = this._storage.length - 1; i >= 0; i--) {
             var stored = this._storage[i];
             if (stored.mediaKeySession === mediaKeySession) {
+                log.debug("DRM-LSS: Removing session without closing it", mediaKeySession.sessionId);
                 this._storage.splice(i, 1);
                 return true;
             }

package/dist/_esm5.processed/core/init/directfile_content_initializer.js

@@ -73,7 +73,7 @@ var DirectFileContentInitializer = /** @class */ (function (_super) {
          * Class trying to avoid various stalling situations, emitting "stalled"
          * events when it cannot, as well as "unstalled" events when it get out of one.
          */
-        var rebufferingController = new RebufferingController(playbackObserver, null, speed);
+        var rebufferingController = new RebufferingController(playbackObserver, null, null, speed);
         rebufferingController.addEventListener("stalled", function (evt) {
             return _this.trigger("stalled", evt);
         });