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

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

@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright 2015 CANAL+ Group
  *
@@ -13,54 +14,27 @@
  * 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 (g && (g = 0, op[0] && (_ = 0)), _) 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";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.disableMediaKeys = void 0;
+const eme_1 = require("../../compat/eme");
+const log_1 = require("../../log");
+const media_keys_infos_store_1 = require("./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);
+function disableMediaKeys(mediaElement) {
+    media_keys_infos_store_1.default.setState(mediaElement, null);
+    eme_1.default.setMediaKeys(mediaElement, null)
+        .then(() => {
+        log_1.default.info("DRM: MediaKeys disabled with success");
+    })
+        .catch((err) => {
+        log_1.default.error("DRM: Could not disable MediaKeys", err instanceof Error ? err : "Unknown Error");
+    });
 }
+exports.disableMediaKeys = disableMediaKeys;
 /**
  * Attach MediaKeys and its associated state to an HTMLMediaElement.
  *
@@ -70,35 +44,33 @@ export function disableMediaKeys(mediaElement) {
  * @param {Object} cancelSignal
  * @returns {Promise}
  */
-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*/];
-            }
-        });
+async function attachMediaKeys(mediaElement, { emeImplementation, keySystemOptions, loadedSessionsStore, mediaKeySystemAccess, mediaKeys }, cancelSignal) {
+    const previousState = media_keys_infos_store_1.default.getState(mediaElement);
+    const closeAllSessions = previousState !== null &&
+        previousState.loadedSessionsStore !== loadedSessionsStore ?
+        previousState.loadedSessionsStore.closeAllSessions() :
+        Promise.resolve();
+    await closeAllSessions;
+    // 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;
+    }
+    media_keys_infos_store_1.default.setState(mediaElement, { emeImplementation,
+        keySystemOptions,
+        mediaKeySystemAccess,
+        mediaKeys,
+        loadedSessionsStore });
+    if (mediaElement.mediaKeys === mediaKeys) {
+        return;
+    }
+    log_1.default.info("DRM: Attaching MediaKeys to the media element");
+    emeImplementation.setMediaKeys(mediaElement, mediaKeys)
+        .then(() => {
+        log_1.default.info("DRM: MediaKeys attached with success");
+    })
+        .catch((err) => {
+        log_1.default.error("DRM: Could not set MediaKeys", err instanceof Error ? err : "Unknown Error");
     });
 }
+exports.default = attachMediaKeys;

package/dist/_esm5.processed/core/decrypt/clear_on_stop.d.ts

@@ -19,4 +19,4 @@
  * @param {HTMLMediaElement} mediaElement
  * @returns {Promise}
  */
-export default function clearOnStop(mediaElement: HTMLMediaElement): Promise<void>;
+export default function clearOnStop(mediaElement: HTMLMediaElement): Promise<unknown>;

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

@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright 2015 CANAL+ Group
  *
@@ -13,28 +14,30 @@
  * 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";
+Object.defineProperty(exports, "__esModule", { value: true });
+const compat_1 = require("../../compat/");
+const log_1 = require("../../log");
+const dispose_decryption_resources_1 = require("./dispose_decryption_resources");
+const media_keys_infos_store_1 = require("./utils/media_keys_infos_store");
 /**
  * Clear DRM-related resources that should be cleared when the current content
  * stops its playback.
  * @param {HTMLMediaElement} mediaElement
  * @returns {Promise}
  */
-export default function clearOnStop(mediaElement) {
-    log.info("DRM: Clearing-up DRM session.");
-    if (shouldUnsetMediaKeys()) {
-        log.info("DRM: disposing current MediaKeys.");
-        return disposeDecryptionResources(mediaElement);
+function clearOnStop(mediaElement) {
+    log_1.default.info("DRM: Clearing-up DRM session.");
+    if ((0, compat_1.shouldUnsetMediaKeys)()) {
+        log_1.default.info("DRM: disposing current MediaKeys.");
+        return (0, dispose_decryption_resources_1.default)(mediaElement);
     }
-    var currentState = MediaKeysInfosStore.getState(mediaElement);
+    const currentState = media_keys_infos_store_1.default.getState(mediaElement);
     if (currentState !== null &&
         currentState.keySystemOptions.closeSessionsOnStop === true) {
-        log.info("DRM: closing all current sessions.");
+        log_1.default.info("DRM: closing all current sessions.");
         return currentState.loadedSessionsStore.closeAllSessions();
     }
-    log.info("DRM: Nothing to clear. Returning right away. No state =", currentState === null);
+    log_1.default.info("DRM: Nothing to clear. Returning right away. No state =", currentState === null);
     return Promise.resolve();
 }
+exports.default = clearOnStop;

package/dist/_esm5.processed/core/decrypt/content_decryptor.d.ts

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { IKeySystemOption, IPlayerError } from "../../public_types";
+import { IKeySystemOption } from "../../public_types";
 import EventEmitter from "../../utils/event_emitter";
-import { IProtectionData } from "./types";
+import { IProtectionData, ContentDecryptorState, IContentDecryptorEvent } from "./types";
 /**
  * Module communicating with the Content Decryption Module (or CDM) to be able
  * to decrypt contents.
@@ -69,11 +69,6 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
      * ContentDecryptor.
      */
     private _canceller;
-    /**
-     * `true` once the `attach` method has been called`.
-     * Allows to avoid calling multiple times that function.
-     */
-    private _wasAttachCalled;
     /**
      * This queue stores initialization data which hasn't been processed yet,
      * probably because the "queue is locked" for now. (@see _stateData private
@@ -83,6 +78,13 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
      * initializing so it can be processed when the initialization is done.
      */
     private _initDataQueue;
+    /**
+     * `true` if the EME API are available on the current platform according to
+     * the default EME implementation used.
+     * `false` otherwise.
+     * @returns {boolean}
+     */
+    static hasEmeApis(): boolean;
     /**
      * Create a new `ContentDecryptor`, and initialize its decryption capabilities
      * right away.
@@ -180,63 +182,3 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
      */
     private _unlockInitDataQueue;
 }
-/** Events sent by the `ContentDecryptor`, in a `{ event: payload }` format. */
-export interface IContentDecryptorEvent {
-    /**
-     * Event emitted when a major error occured which made the ContentDecryptor
-     * stopped.
-     * When that event is sent, the `ContentDecryptor` is in the `Error` state and
-     * cannot be used anymore.
-     */
-    error: Error;
-    /**
-     * Event emitted when a minor error occured which the ContentDecryptor can
-     * recover from.
-     */
-    warning: IPlayerError;
-    /**
-     * Event emitted when the `ContentDecryptor`'s state changed.
-     * States are a central aspect of the `ContentDecryptor`, be sure to check the
-     * ContentDecryptorState type.
-     */
-    stateChange: ContentDecryptorState;
-}
-/** Enumeration of the various "state" the `ContentDecryptor` can be in. */
-export declare enum ContentDecryptorState {
-    /**
-     * The `ContentDecryptor` is not yet ready to create key sessions and request
-     * licenses.
-     * This is is the initial state of the ContentDecryptor.
-     */
-    Initializing = 0,
-    /**
-     * The `ContentDecryptor` has been initialized.
-     * You should now called the `attach` method when you want to add decryption
-     * capabilities to the HTMLMediaElement. The ContentDecryptor won't go to the
-     * `ReadyForContent` state until `attach` is called.
-     *
-     * For compatibility reasons, this should be done after the HTMLMediaElement's
-     * src attribute is set.
-     *
-     * It is also from when this state is reached that the `ContentDecryptor`'s
-     * `systemId` property may be known.
-     *
-     * This state is always coming after the `Initializing` state.
-     */
-    WaitingForAttachment = 1,
-    /**
-     * Content (encrypted or not) can begin to be pushed on the HTMLMediaElement
-     * (this state was needed because some browser quirks sometimes forces us to
-     * call EME API before this can be done).
-     *
-     * This state is always coming after the `WaitingForAttachment` state.
-     */
-    ReadyForContent = 2,
-    /**
-     * The `ContentDecryptor` has encountered a fatal error and has been stopped.
-     * It is now unusable.
-     */
-    Error = 3,
-    /** The `ContentDecryptor` has been disposed of and is now unusable. */
-    Disposed = 4
-}