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

package/dist/_esm5.processed/compat/eme/custom_media_keys/webkit_media_keys.js

@@ -28,10 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { merge as observableMerge, Subject, takeUntil, } from "rxjs";
 import EventEmitter from "../../../utils/event_emitter";
+import noop from "../../../utils/noop";
 import PPromise from "../../../utils/promise";
-import * as events from "../../event_listeners";
 import getWebKitFairplayInitData from "../get_webkit_fairplay_initdata";
 import { WebKitMediaKeysConstructor, } from "./webkit_media_keys_constructor";
 /**
@@ -74,52 +73,39 @@ var WebkitMediaKeySession = /** @class */ (function (_super) {
     function WebkitMediaKeySession(mediaElement, keyType, serverCertificate) {
         var _this = _super.call(this) || this;
         _this._serverCertificate = serverCertificate;
-        _this._closeSession$ = new Subject();
         _this._videoElement = mediaElement;
         _this._keyType = keyType;
+        _this._unbindSession = noop;
+        _this._closeSession = noop; // Just here to make TypeScript happy
         _this.closed = new PPromise(function (resolve) {
-            _this._closeSession$.subscribe(resolve);
+            _this._closeSession = resolve;
         });
         _this.keyStatuses = new Map();
         _this.expiration = NaN;
-        _this.update = function (license) {
-            return new PPromise(function (resolve, reject) {
-                /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-                if (_this._nativeSession === undefined ||
-                    _this._nativeSession.update === undefined ||
-                    typeof _this._nativeSession.update !== "function") {
-                    return reject("Unavailable WebKit key session.");
-                }
-                try {
-                    var uInt8Arraylicense = void 0;
-                    if (license instanceof ArrayBuffer) {
-                        uInt8Arraylicense = new Uint8Array(license);
-                    }
-                    else if (license instanceof Uint8Array) {
-                        uInt8Arraylicense = license;
-                    }
-                    else {
-                        uInt8Arraylicense = new Uint8Array(license.buffer);
-                    }
-                    /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-                    resolve(_this._nativeSession.update(uInt8Arraylicense));
-                    /* eslint-enable @typescript-eslint/no-unsafe-member-access */
-                }
-                catch (err) {
-                    reject(err);
-                }
-                /* eslint-enable @typescript-eslint/no-unsafe-member-access */
-            });
+        _this._onEvent = function (evt) {
+            _this.trigger(evt.type, evt);
         };
         return _this;
     }
-    WebkitMediaKeySession.prototype.listenEvent = function (session) {
+    WebkitMediaKeySession.prototype.update = function (license) {
         var _this = this;
-        observableMerge(events.onKeyMessage$(session), events.onKeyAdded$(session), events.onKeyError$(session))
-            .pipe(takeUntil(this._closeSession$))
-            .subscribe(function (evt) {
-            _this.trigger(evt.type, evt);
+        return new PPromise(function (resolve, reject) {
+            /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+            if (_this._nativeSession === undefined ||
+                _this._nativeSession.update === undefined ||
+                typeof _this._nativeSession.update !== "function") {
+                return reject("Unavailable WebKit key session.");
+            }
+            try {
+                /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+                resolve(_this._nativeSession.update(license));
+                /* eslint-enable @typescript-eslint/no-unsafe-member-access */
+            }
+            catch (err) {
+                reject(err);
+            }
+            /* eslint-enable @typescript-eslint/no-unsafe-member-access */
         });
     };
     WebkitMediaKeySession.prototype.generateRequest = function (_initDataType, initData) {
@@ -144,7 +130,7 @@ var WebkitMediaKeySession = /** @class */ (function (_super) {
             if (keySession === undefined || keySession === null) {
                 throw new Error("Impossible to get the key sessions");
             }
-            _this.listenEvent(keySession);
+            _this._listenEvent(keySession);
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             _this._nativeSession = keySession;
             resolve();
@@ -153,8 +139,8 @@ var WebkitMediaKeySession = /** @class */ (function (_super) {
     WebkitMediaKeySession.prototype.close = function () {
         var _this = this;
         return new PPromise(function (resolve, reject) {
-            _this._closeSession$.next();
-            _this._closeSession$.complete();
+            _this._unbindSession();
+            _this._closeSession();
             if (_this._nativeSession === undefined) {
                 reject("No session to close.");
                 return;
@@ -183,6 +169,22 @@ var WebkitMediaKeySession = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    WebkitMediaKeySession.prototype._listenEvent = function (session) {
+        var _this = this;
+        this._unbindSession(); // If previous session was linked
+        /* eslint-disable @typescript-eslint/no-unsafe-call */
+        /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+        /* eslint-disable @typescript-eslint/no-unsafe-return */
+        ["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
+            .forEach(function (evt) { return session.addEventListener(evt, _this._onEvent); });
+        this._unbindSession = function () {
+            ["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
+                .forEach(function (evt) { return session.removeEventListener(evt, _this._onEvent); });
+        };
+        /* eslint-disable @typescript-eslint/no-unsafe-return */
+        /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+        /* eslint-enable @typescript-eslint/no-unsafe-call */
+    };
     return WebkitMediaKeySession;
 }(EventEmitter));
 var WebKitCustomMediaKeys = /** @class */ (function () {

package/dist/_esm5.processed/compat/eme/generate_key_request.d.ts

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Observable } from "rxjs";
 import { ICustomMediaKeySession } from "./custom_media_keys";
 /**
  * Modify "initialization data" sent to a `generateKeyRequest` EME call to
@@ -52,6 +51,6 @@ export declare function patchInitData(initData: Uint8Array): Uint8Array;
  * "encrypted" event for the corresponding request.
  * @param {string} sessionType - Type of session you want to generate. Consult
  * EME Specification for more information on session types.
- * @returns {Observable} - Emit when done. Errors if fails.
+ * @returns {Promise} - Emit when done. Errors if fails.
  */
-export default function generateKeyRequest(session: MediaKeySession | ICustomMediaKeySession, initializationDataType: string | undefined, initializationData: Uint8Array): Observable<unknown>;
+export default function generateKeyRequest(session: MediaKeySession | ICustomMediaKeySession, initializationDataType: string | undefined, initializationData: Uint8Array): Promise<unknown>;

package/dist/_esm5.processed/compat/eme/generate_key_request.js

@@ -13,11 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { catchError, defer as observableDefer, } from "rxjs";
 import log from "../../log";
 import { getNextBoxOffsets } from "../../parsers/containers/isobmff";
 import { be4toi, concat, } from "../../utils/byte_parsing";
-import castToObservable from "../../utils/cast_to_observable";
 import { PSSH_TO_INTEGER } from "./constants";
 /**
  * Modify "initialization data" sent to a `generateKeyRequest` EME call to
@@ -122,32 +120,30 @@ export function patchInitData(initData) {
  * "encrypted" event for the corresponding request.
  * @param {string} sessionType - Type of session you want to generate. Consult
  * EME Specification for more information on session types.
- * @returns {Observable} - Emit when done. Errors if fails.
+ * @returns {Promise} - Emit when done. Errors if fails.
  */
 export default function generateKeyRequest(session, initializationDataType, initializationData) {
-    return observableDefer(function () {
-        log.debug("Compat: Calling generateRequest on the MediaKeySession");
-        var patchedInit;
-        try {
-            patchedInit = patchInitData(initializationData);
-        }
-        catch (_e) {
-            patchedInit = initializationData;
+    log.debug("Compat: Calling generateRequest on the MediaKeySession");
+    var patchedInit;
+    try {
+        patchedInit = patchInitData(initializationData);
+    }
+    catch (_e) {
+        patchedInit = initializationData;
+    }
+    var initDataType = initializationDataType !== null && initializationDataType !== void 0 ? initializationDataType : "";
+    return session.generateRequest(initDataType, patchedInit)
+        .catch(function (error) {
+        if (initDataType !== "" || !(error instanceof TypeError)) {
+            throw error;
         }
-        var initDataType = initializationDataType !== null && initializationDataType !== void 0 ? initializationDataType : "";
-        return castToObservable(session.generateRequest(initDataType, patchedInit))
-            .pipe(catchError(function (error) {
-            if (initDataType !== "" || !(error instanceof TypeError)) {
-                throw error;
-            }
-            // On newer EME versions of the specification, the initialization data
-            // type given to generateRequest cannot be an empty string (it returns
-            // a rejected promise with a TypeError in that case).
-            // Retry with a default "cenc" value for initialization data type if
-            // we're in that condition.
-            log.warn("Compat: error while calling `generateRequest` with an empty " +
-                "initialization data type. Retrying with a default \"cenc\" value.", error);
-            return castToObservable(session.generateRequest("cenc", patchedInit));
-        }));
+        // On newer EME versions of the specification, the initialization data
+        // type given to generateRequest cannot be an empty string (it returns
+        // a rejected promise with a TypeError in that case).
+        // Retry with a default "cenc" value for initialization data type if
+        // we're in that condition.
+        log.warn("Compat: error while calling `generateRequest` with an empty " +
+            "initialization data type. Retrying with a default \"cenc\" value.", error);
+        return session.generateRequest("cenc", patchedInit);
     });
 }

package/dist/_esm5.processed/compat/eme/load_session.d.ts

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Observable } from "rxjs";
 import { ICustomMediaKeySession } from "./custom_media_keys";
 /**
  * Load a persistent session, based on its `sessionId`, on the given
@@ -29,4 +28,4 @@ import { ICustomMediaKeySession } from "./custom_media_keys";
  * @param {string} sessionId
  * @returns {Observable}
  */
-export default function loadSession(session: MediaKeySession | ICustomMediaKeySession, sessionId: string): Observable<boolean>;
+export default function loadSession(session: MediaKeySession | ICustomMediaKeySession, sessionId: string): Promise<boolean>;

package/dist/_esm5.processed/compat/eme/load_session.js

@@ -13,11 +13,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { defer as observableDefer, map, mergeMap, of as observableOf, race as observableRace, take, timer as observableTimer, } from "rxjs";
+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 PPromise from "pinkie";
 import log from "../../log";
-import castToObservable from "../../utils/cast_to_observable";
-import tryCatch from "../../utils/rx-try_catch";
-import { onKeyStatusesChange$ } from "../event_listeners";
 var EME_WAITING_DELAY_LOADED_SESSION_EMPTY_KEYSTATUSES = 100;
 /**
  * Load a persistent session, based on its `sessionId`, on the given
@@ -34,17 +67,35 @@ var EME_WAITING_DELAY_LOADED_SESSION_EMPTY_KEYSTATUSES = 100;
  * @returns {Observable}
  */
 export default function loadSession(session, sessionId) {
-    return observableDefer(function () {
-        log.info("Compat/EME: Load persisted session", sessionId);
-        return tryCatch(function () { return castToObservable(session.load(sessionId)); }, undefined);
-    }).pipe(mergeMap(function (isLoaded) {
-        if (!isLoaded || session.keyStatuses.size > 0) {
-            return observableOf(isLoaded);
-        }
-        // A browser race condition can exist, seen for example in some
-        // Chromium/Chrome versions where the `keyStatuses` property from a loaded
-        // MediaKeySession would not be populated directly as the load answer but
-        // asynchronously after.
-        return observableRace(observableTimer(EME_WAITING_DELAY_LOADED_SESSION_EMPTY_KEYSTATUSES), onKeyStatusesChange$(session)).pipe(take(1), map(function () { return isLoaded; }));
-    }));
+    return __awaiter(this, void 0, void 0, function () {
+        var isLoaded;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    log.info("Compat/DRM: Load persisted session", sessionId);
+                    return [4 /*yield*/, session.load(sessionId)];
+                case 1:
+                    isLoaded = _a.sent();
+                    if (!isLoaded || session.keyStatuses.size > 0) {
+                        return [2 /*return*/, isLoaded];
+                    }
+                    // A browser race condition can exist, seen for example in some
+                    // Chromium/Chrome versions where the `keyStatuses` property from a loaded
+                    // MediaKeySession would not be populated directly as the load answer but
+                    // asynchronously after.
+                    return [2 /*return*/, new PPromise(function (resolve) {
+                            session.addEventListener("keystatuseschange", resolveWithLoadedStatus);
+                            var timeout = setTimeout(resolveWithLoadedStatus, EME_WAITING_DELAY_LOADED_SESSION_EMPTY_KEYSTATUSES);
+                            function resolveWithLoadedStatus() {
+                                cleanUp();
+                                resolve(isLoaded);
+                            }
+                            function cleanUp() {
+                                clearTimeout(timeout);
+                                session.removeEventListener("keystatuseschange", resolveWithLoadedStatus);
+                            }
+                        })];
+            }
+        });
+    });
 }

package/dist/_esm5.processed/compat/event_listeners.js

@@ -24,7 +24,6 @@ import isNonEmptyString from "../utils/is_non_empty_string";
 import isNode from "./is_node";
 import shouldFavourCustomSafariEME from "./should_favour_custom_safari_EME";
 var BROWSER_PREFIXES = ["", "webkit", "moz", "ms"];
-var INACTIVITY_DELAY = config.INACTIVITY_DELAY;
 var pixelRatio = isNode ||
     window.devicePixelRatio == null ||
     window.devicePixelRatio === 0 ? 1 :
@@ -140,6 +139,7 @@ function visibilityChange() {
  * @returns {Observable}
  */
 function isPageActive() {
+    var INACTIVITY_DELAY = config.getCurrent().INACTIVITY_DELAY;
     return visibilityChange().pipe(switchMap(function (x) {
         if (!x) {
             return observableOf(x).pipe(delay(INACTIVITY_DELAY));
@@ -195,6 +195,7 @@ function onPictureInPictureEvent$(elt) {
  * @returns {Observable}
  */
 function isVideoVisible(pip$) {
+    var INACTIVITY_DELAY = config.getCurrent().INACTIVITY_DELAY;
     return observableCombineLatest([visibilityChange(), pip$]).pipe(switchMap(function (_a) {
         var isVisible = _a[0], pip = _a[1];
         if (pip.isEnabled || isVisible) {

package/dist/_esm5.processed/compat/should_favour_custom_safari_EME.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { isSafari } from "./browser_detection";
+import { isSafariDesktop, isSafariMobile, } from "./browser_detection";
 import { WebKitMediaKeysConstructor, } from "./eme/custom_media_keys/webkit_media_keys_constructor";
 /**
  * On Safari 12.1, it seems that since fairplay CDM implementation
@@ -23,5 +23,5 @@ import { WebKitMediaKeysConstructor, } from "./eme/custom_media_keys/webkit_medi
  * @returns {boolean}
  */
 export default function shouldFavourCustomSafariEME() {
-    return isSafari && WebKitMediaKeysConstructor !== undefined;
+    return (isSafariDesktop || isSafariMobile) && WebKitMediaKeysConstructor !== undefined;
 }