rx-player 3.26.3-dev.2022021400 → 3.27.0-dev.2022032100

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

@@ -56,11 +56,10 @@ import areArraysOfNumbersEqual from "../../utils/are_arrays_of_numbers_equal";
 import EventEmitter, { fromEvent, } from "../../utils/event_emitter";
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
 import objectAssign from "../../utils/object_assign";
-import PPromise from "../../utils/promise";
 import { getLeftSizeOfRange, getPlayedSizeOfRange, getSizeOfRange, } from "../../utils/ranges";
 import createSharedReference from "../../utils/reference";
 import warnOnce from "../../utils/warn_once";
-import { clearEMESession, disposeEME, getCurrentKeySystem, } from "../eme";
+import { clearOnStop, disposeDecryptionResources, getCurrentKeySystem, } from "../decrypt";
 import { ManifestFetcher, SegmentFetcherCreator, } from "../fetchers";
 import initializeMediaSourcePlayback from "../init";
 import emitSeekEvents from "./emit_seek_events";
@@ -69,7 +68,6 @@ import { checkReloadOptions, parseConstructorOptions, parseLoadVideoOptions, } f
 import PlaybackObserver from "./playback_observer";
 import TrackChoiceManager from "./track_choice_manager";
 /* eslint-disable @typescript-eslint/naming-convention */
-var DEFAULT_UNMUTED_VOLUME = config.DEFAULT_UNMUTED_VOLUME;
 var isPageActive = events.isPageActive, isVideoVisible = events.isVideoVisible, onEnded$ = events.onEnded$, onFullscreenChange$ = events.onFullscreenChange$, onPlayPause$ = events.onPlayPause$, onPictureInPictureEvent$ = events.onPictureInPictureEvent$, onSeeking$ = events.onSeeking$, onTextTrackChanges$ = events.onTextTrackChanges$, videoWidth$ = events.videoWidth$;
 /**
  * @class Player
@@ -84,11 +82,12 @@ var Player = /** @class */ (function (_super) {
     function Player(options) {
         if (options === void 0) { options = {}; }
         var _this = _super.call(this) || this;
-        var _a = parseConstructorOptions(options), initialAudioBitrate = _a.initialAudioBitrate, initialVideoBitrate = _a.initialVideoBitrate, limitVideoWidth = _a.limitVideoWidth, minAudioBitrate = _a.minAudioBitrate, minVideoBitrate = _a.minVideoBitrate, maxAudioBitrate = _a.maxAudioBitrate, maxBufferAhead = _a.maxBufferAhead, maxBufferBehind = _a.maxBufferBehind, maxVideoBitrate = _a.maxVideoBitrate, preferredAudioTracks = _a.preferredAudioTracks, preferredTextTracks = _a.preferredTextTracks, preferredVideoTracks = _a.preferredVideoTracks, throttleWhenHidden = _a.throttleWhenHidden, throttleVideoBitrateWhenHidden = _a.throttleVideoBitrateWhenHidden, videoElement = _a.videoElement, wantedBufferAhead = _a.wantedBufferAhead, stopAtEnd = _a.stopAtEnd;
+        var _a = parseConstructorOptions(options), initialAudioBitrate = _a.initialAudioBitrate, initialVideoBitrate = _a.initialVideoBitrate, limitVideoWidth = _a.limitVideoWidth, minAudioBitrate = _a.minAudioBitrate, minVideoBitrate = _a.minVideoBitrate, maxAudioBitrate = _a.maxAudioBitrate, maxBufferAhead = _a.maxBufferAhead, maxBufferBehind = _a.maxBufferBehind, maxVideoBitrate = _a.maxVideoBitrate, preferredAudioTracks = _a.preferredAudioTracks, preferredTextTracks = _a.preferredTextTracks, preferredVideoTracks = _a.preferredVideoTracks, throttleWhenHidden = _a.throttleWhenHidden, throttleVideoBitrateWhenHidden = _a.throttleVideoBitrateWhenHidden, videoElement = _a.videoElement, wantedBufferAhead = _a.wantedBufferAhead, maxVideoBufferSize = _a.maxVideoBufferSize, stopAtEnd = _a.stopAtEnd;
+        var DEFAULT_UNMUTED_VOLUME = config.getCurrent().DEFAULT_UNMUTED_VOLUME;
         // Workaround to support Firefox autoplay on FF 42.
         // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1194624
         videoElement.preload = "auto";
-        _this.version = /* PLAYER_VERSION */ "3.26.3-dev.2022021400";
+        _this.version = /* PLAYER_VERSION */ "3.27.0-dev.2022032100";
         _this.log = log;
         _this.state = "STOPPED";
         _this.videoElement = videoElement;
@@ -138,6 +137,7 @@ var Player = /** @class */ (function (_super) {
             wantedBufferAhead: createSharedReference(wantedBufferAhead),
             maxBufferAhead: createSharedReference(maxBufferAhead),
             maxBufferBehind: createSharedReference(maxBufferBehind),
+            maxVideoBufferSize: createSharedReference(maxVideoBufferSize),
         };
         _this._priv_bitrateInfos = {
             lastBitrates: { audio: initialAudioBitrate,
@@ -224,8 +224,13 @@ var Player = /** @class */ (function (_super) {
         // free resources linked to the loaded content
         this.stop();
         if (this.videoElement !== null) {
-            // free resources used for EME management
-            disposeEME(this.videoElement);
+            // free resources used for decryption management
+            disposeDecryptionResources(this.videoElement)
+                .catch(function (err) {
+                var message = err instanceof Error ? err.message :
+                    "Unknown error";
+                log.error("API: Could not dispose decryption resources: " + message);
+            });
         }
         // free Observables linked to the Player instance
         this._priv_destroy$.next();
@@ -236,6 +241,7 @@ var Player = /** @class */ (function (_super) {
         this._priv_speed.finish();
         this._priv_contentLock.finish();
         this._priv_bufferOptions.wantedBufferAhead.finish();
+        this._priv_bufferOptions.maxVideoBufferSize.finish();
         this._priv_bufferOptions.maxBufferAhead.finish();
         this._priv_bufferOptions.maxBufferBehind.finish();
         this._priv_bitrateInfos.manualBitrates.video.finish();
@@ -527,18 +533,23 @@ var Player = /** @class */ (function (_super) {
         }));
         /** Emit all player "state" updates. */
         var playerState$ = observableConcat(observableOf(PLAYER_STATES.LOADING), // Begin with LOADING
-        // LOADED as soon as the first "loaded" event is sent
-        loaded$.pipe(take(1), map(function () { return PLAYER_STATES.LOADED; })), observableMerge(loadedStateUpdates$
-            .pipe(
-        // From the first reload onward, we enter another dynamic (below)
-        takeUntil(reloading$), skipWhile(function (state) { return state === PLAYER_STATES.PAUSED; })), 
-        // when reloading
-        reloading$.pipe(switchMap(function () {
-            return loaded$.pipe(take(1), // wait for the next loaded event
-            mergeMap(function () { return loadedStateUpdates$; }), // to update the state as usual
-            startWith(PLAYER_STATES.RELOADING) // Starts with "RELOADING" state
-            );
-        })))).pipe(distinctUntilChanged());
+        loaded$.pipe(switchMap(function (_, i) {
+            var isFirstLoad = i === 0;
+            return observableMerge(
+            // Purposely subscribed first so a RELOADING triggered synchronously
+            // after a LOADED state is catched.
+            reloading$.pipe(map(function () { return PLAYER_STATES.RELOADING; })), 
+            // Only switch to LOADED state for the first (i.e. non-RELOADING) load
+            isFirstLoad ? observableOf(PLAYER_STATES.LOADED) :
+                EMPTY, 
+            // Purposely put last so any other state change happens after we've
+            // already switched to LOADED
+            loadedStateUpdates$.pipe(takeUntil(reloading$), 
+            // For the first load, we prefer staying at the LOADED state over
+            // PAUSED when autoPlay is disabled.
+            // For consecutive loads however, there's no LOADED state.
+            skipWhile(function (state) { return isFirstLoad && state === PLAYER_STATES.PAUSED; })));
+        }))).pipe(distinctUntilChanged());
         var playbackSubscription;
         stopContent$
             .pipe(take(1))
@@ -794,7 +805,22 @@ var Player = /** @class */ (function (_super) {
         }
         var _a = this._priv_contentInfos, isDirectFile = _a.isDirectFile, manifest = _a.manifest;
         if (isDirectFile) {
-            return this.videoElement.currentTime;
+            // Calculating the "wall-clock time" necessitate to obtain first an offset,
+            // and then adding that offset to the HTMLMediaElement's current position.
+            // That offset is in most case present inside the Manifest file, yet in
+            // directfile mode, the RxPlayer won't parse that file, the browser does it.
+            //
+            // Thankfully Safari declares a `getStartDate` method allowing to obtain
+            // that offset when available. This logic is thus mainly useful when
+            // playing HLS contents in directfile mode on Safari.
+            var mediaElement = this.videoElement;
+            if (typeof mediaElement.getStartDate === "function") {
+                var startDate = mediaElement.getStartDate();
+                if (typeof startDate === "number" && !isNaN(startDate)) {
+                    return startDate + mediaElement.currentTime;
+                }
+            }
+            return mediaElement.currentTime;
         }
         if (manifest !== null) {
             var currentTime = this.videoElement.currentTime;
@@ -1018,7 +1044,7 @@ var Player = /** @class */ (function (_super) {
         /* eslint-disable @typescript-eslint/unbound-method */
         if (isNullOrUndefined(playPromise) || typeof playPromise.catch !== "function") {
             /* eslint-enable @typescript-eslint/unbound-method */
-            return PPromise.resolve();
+            return Promise.resolve();
         }
         return playPromise.catch(function (error) {
             if (error.name === "NotAllowedError") {
@@ -1173,6 +1199,7 @@ var Player = /** @class */ (function (_super) {
      * If the volume was set to 0, set a default volume instead (see config).
      */
     Player.prototype.unMute = function () {
+        var DEFAULT_UNMUTED_VOLUME = config.getCurrent().DEFAULT_UNMUTED_VOLUME;
         var vol = this.getVolume();
         if (vol === 0) {
             this.setVolume(this._priv_mutedMemory === 0 ? DEFAULT_UNMUTED_VOLUME :
@@ -1271,6 +1298,14 @@ var Player = /** @class */ (function (_super) {
     Player.prototype.setWantedBufferAhead = function (sizeInSeconds) {
         this._priv_bufferOptions.wantedBufferAhead.setValue(sizeInSeconds);
     };
+    /**
+     * Set the max buffer size the buffer should take in memory
+     * The player . will stop downloading chunks when this size is reached.
+     * @param {Number} sizeInKBytes
+     */
+    Player.prototype.setMaxVideoBufferSize = function (sizeInKBytes) {
+        this._priv_bufferOptions.maxVideoBufferSize.setValue(sizeInKBytes);
+    };
     /**
      * Returns the max buffer size for the buffer behind the current position.
      * @returns {Number}
@@ -1292,6 +1327,13 @@ var Player = /** @class */ (function (_super) {
     Player.prototype.getWantedBufferAhead = function () {
         return this._priv_bufferOptions.wantedBufferAhead.getValue();
     };
+    /**
+     * Returns the max buffer memory size for the buffer in kilobytes
+     * @returns {Number}
+     */
+    Player.prototype.getMaxVideoBufferSize = function () {
+        return this._priv_bufferOptions.maxVideoBufferSize.getValue();
+    };
     /**
      * Returns type of current keysystem (e.g. playready, widevine) if the content
      * is encrypted. null otherwise.
@@ -1712,24 +1754,20 @@ var Player = /** @class */ (function (_super) {
         (_a = this._priv_mediaElementTrackChoiceManager) === null || _a === void 0 ? void 0 : _a.dispose();
         this._priv_mediaElementTrackChoiceManager = null;
         this._priv_contentEventsMemory = {};
-        // EME cleaning
+        // DRM-related clean-up
         var freeUpContentLock = function () {
             log.debug("Unlocking `contentLock`. Next content can begin.");
             _this._priv_contentLock.setValue(false);
         };
         if (!isNullOrUndefined(this.videoElement)) {
-            clearEMESession(this.videoElement)
-                .subscribe({
-                error: function (err) {
-                    log.error("API: An error arised when trying to clean-up the EME session:" +
-                        (err instanceof Error ? err.toString() :
-                            "Unknown Error"));
-                    freeUpContentLock();
-                },
-                complete: function () {
-                    log.debug("API: EME session cleaned-up with success!");
-                    freeUpContentLock();
-                },
+            clearOnStop(this.videoElement).then(function () {
+                log.debug("API: DRM session cleaned-up with success!");
+                freeUpContentLock();
+            }, function (err) {
+                log.error("API: An error arised when trying to clean-up the DRM session:" +
+                    (err instanceof Error ? err.toString() :
+                        "Unknown Error"));
+                freeUpContentLock();
             });
         }
         else {
@@ -2264,5 +2302,5 @@ var Player = /** @class */ (function (_super) {
     };
     return Player;
 }(EventEmitter));
-Player.version = /* PLAYER_VERSION */ "3.26.3-dev.2022021400";
+Player.version = /* PLAYER_VERSION */ "3.27.0-dev.2022032100";
 export default Player;

package/dist/_esm5.processed/core/{eme → decrypt}/__tests__/__global__/utils.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /// <reference types="jest" />
-import { Observable, Subject } from "rxjs";
+import { Subject } from "rxjs";
 import { IEncryptedEventData } from "../../../../compat/eme";
 import EventEmitter from "../../../../utils/event_emitter";
 /** Default MediaKeySystemAccess configuration used by the RxPlayer. */
@@ -97,7 +97,7 @@ export declare class MediaKeySystemAccessImpl {
     createMediaKeys(): Promise<MediaKeysImpl>;
     getConfiguration(): MediaKeySystemConfiguration[];
 }
-export declare function requestMediaKeySystemAccessImpl(keySystem: string, config: MediaKeySystemConfiguration[]): Observable<MediaKeySystemAccessImpl>;
+export declare function requestMediaKeySystemAccessImpl(keySystem: string, config: MediaKeySystemConfiguration[]): Promise<MediaKeySystemAccessImpl>;
 /**
  * Mock functions coming from the compat directory.
  */
@@ -109,15 +109,13 @@ export declare function mockCompat(exportedFunctions?: {}): {
         triggerKeyError: Subject<unknown>;
         triggerKeyStatusesChange: Subject<unknown>;
     };
-    requestMediaKeySystemAccessSpy: jest.Mock<Observable<MediaKeySystemAccessImpl>, [keySystem: string, config: MediaKeySystemConfiguration[]]>;
+    requestMediaKeySystemAccessSpy: jest.Mock<Promise<MediaKeySystemAccessImpl>, [keySystem: string, config: MediaKeySystemConfiguration[]]>;
     getInitDataSpy: jest.Mock<IEncryptedEventData, [encryptedEvent: IEncryptedEventData]>;
-    setMediaKeysSpy: jest.Mock<Observable<null>, []>;
-    generateKeyRequestSpy: jest.Mock<Observable<void>, [mks: MediaKeySessionImpl, initializationDataType: any, initializationData: any]>;
+    setMediaKeysSpy: jest.Mock<any, any>;
+    generateKeyRequestSpy: jest.Mock<Promise<void>, [mks: MediaKeySessionImpl, initializationDataType: any, initializationData: any]>;
 };
 /**
- * Check that the EMEManager, when called with those arguments, throws
- * directly without any event emitted.
- *
+ * Check that the ContentDecryptor, when called with those arguments, throws.
  * If that's the case, resolve with the corresponding error.
  * Else, reject.
  * @param {HTMLMediaElement} mediaElement
@@ -125,47 +123,7 @@ export declare function mockCompat(exportedFunctions?: {}): {
  * @param {Observable} contentProtections$
  * @returns {Promise}
  */
-export declare function testEMEManagerImmediateError(EMEManager: any, mediaElement: HTMLMediaElement, keySystemsConfigs: unknown[], contentProtections$: Observable<unknown>): Promise<unknown>;
-/**
- * Check that the event received corresponds to the session-message event for a
- * license request.
- * @param {Object} evt
- * @param {Object} initDataVal
- */
-export declare function expectLicenseRequestMessage(evt: {
-    type: string;
-    value: any;
-}, initDataVal: {
-    type: string | undefined;
-    values: Array<{
-        systemId: string | unknown;
-        data: Uint8Array;
-    }>;
-}): void;
-/**
- * @param {Object} evt
- * @param {Uint8Array} initData
- * @param {string|undefined} initDataType
- */
-export declare function expectInitDataIgnored(evt: {
-    type: string;
-    value: any;
-}, initDataVal: {
-    type: string | undefined;
-    values: Array<{
-        systemId: string | undefined;
-        data: Uint8Array;
-    }>;
-}): void;
-/**
- * @param {Object} evt
- * @param {Uint8Array} initData
- * @param {string|undefined} initDataType
- */
-export declare function expectEncryptedEventReceived(evt: {
-    type: string;
-    value: any;
-}, initData: IEncryptedEventData): void;
+export declare function testContentDecryptorError(ContentDecryptor: any, mediaElement: HTMLMediaElement, keySystemsConfigs: unknown[]): Promise<unknown>;
 /**
  * Does the reverse operation than what `formatFakeChallengeFromInitData` does:
  * Retrieve initialization data from a fake challenge done in our tests

package/dist/_esm5.processed/core/{eme → decrypt}/__tests__/__global__/utils.js

@@ -46,10 +46,12 @@ var __assign = (this && this.__assign) || function () {
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/naming-convention */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable no-restricted-properties */
-import { defer as observableDefer, of as observableOf, Subject, } from "rxjs";
+import { Subject } from "rxjs";
 import { base64ToBytes, bytesToBase64, } from "../../../../utils/base64";
-import castToObservable from "../../../../utils/cast_to_observable";
 import EventEmitter, { fromEvent } from "../../../../utils/event_emitter";
 import flatMap from "../../../../utils/flat_map";
 import { strToUtf8, utf8ToStr, } from "../../../../utils/string_parsing";
@@ -155,13 +157,16 @@ var MediaKeySessionImpl = /** @class */ (function (_super) {
         return Promise.resolve();
     };
     MediaKeySessionImpl.prototype.generateRequest = function (initDataType, initData) {
+        var _this = this;
         var msg = formatFakeChallengeFromInitData(initData, initDataType);
-        var event = Object.assign(new CustomEvent("message"), { message: msg.buffer,
-            messageType: "license-request" });
-        this.trigger("message", event);
-        if (this.onmessage !== null && this.onmessage !== undefined) {
-            this.onmessage(event);
-        }
+        setTimeout(function () {
+            var event = Object.assign(new CustomEvent("message"), { message: msg.buffer,
+                messageType: "license-request" });
+            _this.trigger("message", event);
+            if (_this.onmessage !== null && _this.onmessage !== undefined) {
+                _this.onmessage(event);
+            }
+        }, 5);
         return Promise.resolve();
     };
     MediaKeySessionImpl.prototype.load = function (_sessionId) {
@@ -220,7 +225,7 @@ var MediaKeySystemAccessImpl = /** @class */ (function () {
 }());
 export { MediaKeySystemAccessImpl };
 export function requestMediaKeySystemAccessImpl(keySystem, config) {
-    return observableOf(new MediaKeySystemAccessImpl(keySystem, config));
+    return Promise.resolve(new MediaKeySystemAccessImpl(keySystem, config));
 }
 /**
  * Mock functions coming from the compat directory.
@@ -245,11 +250,9 @@ export function mockCompat(exportedFunctions) {
         }),
     };
     var rmksaSpy = jest.fn(requestMediaKeySystemAccessImpl);
-    var setMediaKeysSpy = jest.fn(function () { return observableOf(null); });
+    var setMediaKeysSpy = jest.fn();
     var generateKeyRequestSpy = jest.fn(function (mks, initializationDataType, initializationData) {
-        return observableDefer(function () {
-            return castToObservable(mks.generateRequest(initializationDataType, initializationData));
-        });
+        return mks.generateRequest(initializationDataType, initializationData);
     });
     var getInitDataSpy = jest.fn(function (encryptedEvent) {
         return encryptedEvent;
@@ -259,9 +262,7 @@ export function mockCompat(exportedFunctions) {
         requestMediaKeySystemAccessSpy: rmksaSpy, getInitDataSpy: getInitDataSpy, setMediaKeysSpy: setMediaKeysSpy, generateKeyRequestSpy: generateKeyRequestSpy };
 }
 /**
- * Check that the EMEManager, when called with those arguments, throws
- * directly without any event emitted.
- *
+ * Check that the ContentDecryptor, when called with those arguments, throws.
  * If that's the case, resolve with the corresponding error.
  * Else, reject.
  * @param {HTMLMediaElement} mediaElement
@@ -269,58 +270,17 @@ export function mockCompat(exportedFunctions) {
  * @param {Observable} contentProtections$
  * @returns {Promise}
  */
-export function testEMEManagerImmediateError(
-/* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-EMEManager, 
-/* eslint-enable @typescript-eslint/no-explicit-any */
-/* eslint-enable @typescript-eslint/naming-convention */
-mediaElement, keySystemsConfigs, contentProtections$) {
+export function testContentDecryptorError(ContentDecryptor, mediaElement, keySystemsConfigs) {
     return new Promise(function (res, rej) {
-        EMEManager(mediaElement, keySystemsConfigs, contentProtections$)
-            .subscribe(function (evt) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            var eventStr = JSON.stringify(evt);
-            rej(new Error("Received an EMEManager event: " + eventStr));
-        }, function (err) { res(err); }, function () { return rej(new Error("EMEManager completed.")); });
+        var contentDecryptor = new ContentDecryptor(mediaElement, keySystemsConfigs);
+        contentDecryptor.addEventListener("error", function (error) {
+            res(error);
+        });
+        setTimeout(function () {
+            rej(new Error("Timeout exceeded"));
+        }, 10);
     });
 }
-/**
- * Check that the event received corresponds to the session-message event for a
- * license request.
- * @param {Object} evt
- * @param {Object} initDataVal
- */
-export function expectLicenseRequestMessage(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-evt, initDataVal) {
-    expect(evt.type).toEqual("session-message");
-    expect(evt.value.messageType).toEqual("license-request");
-    expect(evt.value.initializationData).toEqual(initDataVal);
-}
-/**
- * @param {Object} evt
- * @param {Uint8Array} initData
- * @param {string|undefined} initDataType
- */
-export function expectInitDataIgnored(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-evt, initDataVal) {
-    expect(evt.type).toEqual("init-data-ignored");
-    expect(evt.value.initializationData).toEqual(initDataVal);
-}
-/**
- * @param {Object} evt
- * @param {Uint8Array} initData
- * @param {string|undefined} initDataType
- */
-export function expectEncryptedEventReceived(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-evt, initData) {
-    expect(evt.type).toEqual("encrypted-event-received");
-    expect(evt.value).toEqual(initData);
-}
 /**
  * Does the reverse operation than what `formatFakeChallengeFromInitData` does:
  * Retrieve initialization data from a fake challenge done in our tests

package/dist/_esm5.processed/core/{eme → decrypt}/attach_media_keys.d.ts

@@ -13,16 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Observable } from "rxjs";
 import { ICustomMediaKeys, ICustomMediaKeySystemAccess } from "../../compat";
+import { CancellationSignal } from "../../utils/task_canceller";
 import { IKeySystemOption } from "./types";
 import LoadedSessionsStore from "./utils/loaded_sessions_store";
 /**
- * Dispose the media keys on media element.
+ * Dispose of the MediaKeys instance attached to the given media element, if
+ * one.
  * @param {Object} mediaElement
+ */
+export declare function disableMediaKeys(mediaElement: HTMLMediaElement): void;
+/**
+ * Attach MediaKeys and its associated state to an HTMLMediaElement.
+ *
+ * /!\ Mutates heavily MediaKeysInfosStore
+ * @param {Object} mediaKeysInfos
+ * @param {HTMLMediaElement} mediaElement
  * @returns {Observable}
  */
-export declare function disableMediaKeys(mediaElement: HTMLMediaElement): Observable<unknown>;
+export default function attachMediaKeys(mediaElement: HTMLMediaElement, { keySystemOptions, loadedSessionsStore, mediaKeySystemAccess, mediaKeys }: IMediaKeysState, cancelSignal: CancellationSignal): Promise<void>;
 /** MediaKeys and associated state attached to a media element. */
 export interface IMediaKeysState {
     /** Options set when the MediaKeys has been attached. */
@@ -34,12 +43,3 @@ export interface IMediaKeysState {
     /** The MediaKeys instance to attach to the media element. */
     mediaKeys: MediaKeys | ICustomMediaKeys;
 }
-/**
- * Attach MediaKeys and its associated state to an HTMLMediaElement.
- *
- * /!\ Mutates heavily MediaKeysInfosStore
- * @param {Object} mediaKeysInfos
- * @param {HTMLMediaElement} mediaElement
- * @returns {Observable}
- */
-export default function attachMediaKeys(mediaElement: HTMLMediaElement, { keySystemOptions, loadedSessionsStore, mediaKeySystemAccess, mediaKeys }: IMediaKeysState): Observable<unknown>;

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

@@ -0,0 +1,103 @@
+/**
+ * Copyright 2015 CANAL+ Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { setMediaKeys, } from "../../compat";
+import log from "../../log";
+import MediaKeysInfosStore from "./utils/media_keys_infos_store";
+/**
+ * Dispose of the MediaKeys instance attached to the given media element, if
+ * one.
+ * @param {Object} mediaElement
+ */
+export function disableMediaKeys(mediaElement) {
+    MediaKeysInfosStore.setState(mediaElement, null);
+    setMediaKeys(mediaElement, null);
+}
+/**
+ * Attach MediaKeys and its associated state to an HTMLMediaElement.
+ *
+ * /!\ Mutates heavily MediaKeysInfosStore
+ * @param {Object} mediaKeysInfos
+ * @param {HTMLMediaElement} mediaElement
+ * @returns {Observable}
+ */
+export default function attachMediaKeys(mediaElement, _a, cancelSignal) {
+    var keySystemOptions = _a.keySystemOptions, loadedSessionsStore = _a.loadedSessionsStore, mediaKeySystemAccess = _a.mediaKeySystemAccess, mediaKeys = _a.mediaKeys;
+    return __awaiter(this, void 0, void 0, function () {
+        var previousState, closeAllSessions;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    previousState = MediaKeysInfosStore.getState(mediaElement);
+                    closeAllSessions = previousState !== null &&
+                        previousState.loadedSessionsStore !== loadedSessionsStore ?
+                        previousState.loadedSessionsStore.closeAllSessions() :
+                        Promise.resolve();
+                    return [4 /*yield*/, closeAllSessions];
+                case 1:
+                    _b.sent();
+                    // If this task has been cancelled while we were closing previous sessions,
+                    // stop now (and thus avoid setting the new media keys);
+                    if (cancelSignal.isCancelled) {
+                        throw cancelSignal.cancellationError;
+                    }
+                    MediaKeysInfosStore.setState(mediaElement, { keySystemOptions: keySystemOptions, mediaKeySystemAccess: mediaKeySystemAccess, mediaKeys: mediaKeys, loadedSessionsStore: loadedSessionsStore });
+                    if (mediaElement.mediaKeys === mediaKeys) {
+                        return [2 /*return*/];
+                    }
+                    log.info("DRM: Attaching MediaKeys to the media element");
+                    setMediaKeys(mediaElement, mediaKeys);
+                    log.info("DRM: MediaKeys attached with success");
+                    return [2 /*return*/];
+            }
+        });
+    });
+}

package/dist/_esm5.processed/core/{eme/clear_eme_session.d.ts → decrypt/clear_on_stop.d.ts}

@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Observable } from "rxjs";
 /**
- * Clear EME ressources that should be cleared when the current content stops
- * its playback.
+ * Clear DRM-related resources that should be cleared when the current content
+ * stops its playback.
  * @param {HTMLMediaElement} mediaElement
  * @returns {Observable}
  */
-export default function clearEMESession(mediaElement: HTMLMediaElement): Observable<never>;
+export default function clearOnStop(mediaElement: HTMLMediaElement): Promise<void>;

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

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2015 CANAL+ Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { shouldUnsetMediaKeys } from "../../compat/";
+import log from "../../log";
+import disposeDecryptionResources from "./dispose_decryption_resources";
+import MediaKeysInfosStore from "./utils/media_keys_infos_store";
+/**
+ * Clear DRM-related resources that should be cleared when the current content
+ * stops its playback.
+ * @param {HTMLMediaElement} mediaElement
+ * @returns {Observable}
+ */
+export default function clearOnStop(mediaElement) {
+    log.info("DRM: Clearing-up DRM session.");
+    if (shouldUnsetMediaKeys()) {
+        log.info("DRM: disposing current MediaKeys.");
+        return disposeDecryptionResources(mediaElement);
+    }
+    var currentState = MediaKeysInfosStore.getState(mediaElement);
+    if (currentState !== null &&
+        currentState.keySystemOptions.closeSessionsOnStop === true) {
+        log.info("DRM: closing all current sessions.");
+        return currentState.loadedSessionsStore.closeAllSessions();
+    }
+    log.info("DRM: Nothing to clear. Returning right away. No state =", currentState === null);
+    return Promise.resolve();
+}