hls.js 1.6.0-beta.2.0.canary.10876 → 1.6.0-beta.2.0.canary.10877

package/dist/hls.mjs

@@ -401,7 +401,7 @@ function enableLogs(debugConfig, context, id) {
     // Some browsers don't allow to use bind on console object anyway
     // fallback to default if needed
     try {
-      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.2.0.canary.10876"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.2.0.canary.10877"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -9847,7 +9847,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.2.0.canary.10876";
+const version = "1.6.0-beta.2.0.canary.10877";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -21102,109 +21102,127 @@ class EMEController extends Logger {
       if (initData === null) {
         return;
       }
-      let keyId;
-      let keySystemDomain;
-      if (initDataType === 'sinf' && this.getLicenseServerUrl(KeySystems.FAIRPLAY)) {
-        // Match sinf keyId to playlist skd://keyId=
-        const json = bin2str(new Uint8Array(initData));
-        try {
-          const sinf = base64Decode(JSON.parse(json).sinf);
-          const tenc = parseSinf(sinf);
-          if (!tenc) {
-            throw new Error(`'schm' box missing or not cbcs/cenc with schi > tenc`);
-          }
-          keyId = tenc.subarray(8, 24);
-          keySystemDomain = KeySystems.FAIRPLAY;
-        } catch (error) {
-          this.warn(`${logMessage} Failed to parse sinf: ${error}`);
-          return;
-        }
-      } else if (this.getLicenseServerUrl(KeySystems.WIDEVINE)) {
-        // Support Widevine clear-lead key-session creation (otherwise depend on playlist keys)
-        const psshResults = parseMultiPssh(initData);
-
-        // TODO: If using keySystemAccessPromises we might want to wait until one is resolved
+      if (!this.keyFormatPromise) {
         let keySystems = Object.keys(this.keySystemAccessPromises);
         if (!keySystems.length) {
           keySystems = getKeySystemsForConfig(this.config);
         }
-        const psshInfo = psshResults.filter(pssh => {
-          const keySystem = pssh.systemId ? keySystemIdToKeySystemDomain(pssh.systemId) : null;
-          return keySystem ? keySystems.indexOf(keySystem) > -1 : false;
-        })[0];
-        if (!psshInfo) {
-          if (psshResults.length === 0 || psshResults.some(pssh => !pssh.systemId)) {
-            this.warn(`${logMessage} contains incomplete or invalid pssh data`);
-          } else {
-            this.log(`ignoring ${logMessage} for ${psshResults.map(pssh => keySystemIdToKeySystemDomain(pssh.systemId)).join(',')} pssh data in favor of playlist keys`);
+        const keyFormats = keySystems.map(keySystemDomainToKeySystemFormat).filter(k => !!k);
+        this.keyFormatPromise = this.getKeyFormatPromise(keyFormats);
+      }
+      this.keyFormatPromise.then(keySystemFormat => {
+        const keySystem = keySystemFormatToKeySystemDomain(keySystemFormat);
+        let keyId;
+        let keySystemDomain;
+        if (initDataType === 'sinf') {
+          if (keySystem !== KeySystems.FAIRPLAY) {
+            this.warn(`Ignoring unexpected "${event.type}" event with init data type: "${initDataType}" for selected key-system ${keySystem}`);
+            return;
           }
-          return;
-        }
-        keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
-        if (psshInfo.version === 0 && psshInfo.data) {
-          if (keySystemDomain === KeySystems.WIDEVINE) {
-            const offset = psshInfo.data.length - 22;
-            keyId = psshInfo.data.subarray(offset, offset + 16);
-          } else if (keySystemDomain === KeySystems.PLAYREADY) {
-            keyId = parsePlayReadyWRM(psshInfo.data);
+          // Match sinf keyId to playlist skd://keyId=
+          const json = bin2str(new Uint8Array(initData));
+          try {
+            const sinf = base64Decode(JSON.parse(json).sinf);
+            const tenc = parseSinf(sinf);
+            if (!tenc) {
+              throw new Error(`'schm' box missing or not cbcs/cenc with schi > tenc`);
+            }
+            keyId = tenc.subarray(8, 24);
+            keySystemDomain = KeySystems.FAIRPLAY;
+          } catch (error) {
+            this.warn(`${logMessage} Failed to parse sinf: ${error}`);
+            return;
+          }
+        } else {
+          if (keySystem !== KeySystems.WIDEVINE && keySystem !== KeySystems.PLAYREADY) {
+            this.warn(`Ignoring unexpected "${event.type}" event with init data type: "${initDataType}" for selected key-system ${keySystem}`);
+            return;
+          }
+          // Support Widevine/PlayReady clear-lead key-session creation (otherwise depend on playlist keys)
+          const psshResults = parseMultiPssh(initData);
+          const psshInfos = psshResults.filter(pssh => !!pssh.systemId && keySystemIdToKeySystemDomain(pssh.systemId) === keySystem);
+          if (psshInfos.length) {
+            this.warn(`${logMessage} Using first of ${psshInfos.length} pssh found for selected key-system ${keySystem}`);
+          }
+          const psshInfo = psshInfos[0];
+          if (!psshInfo) {
+            if (psshResults.length === 0 || psshResults.some(pssh => !pssh.systemId)) {
+              this.warn(`${logMessage} contains incomplete or invalid pssh data`);
+            } else {
+              this.log(`ignoring ${logMessage} for ${psshResults.map(pssh => keySystemIdToKeySystemDomain(pssh.systemId)).join(',')} pssh data in favor of playlist keys`);
+            }
+            return;
+          }
+          keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
+          if (psshInfo.version === 0 && psshInfo.data) {
+            if (keySystemDomain === KeySystems.WIDEVINE) {
+              const offset = psshInfo.data.length - 22;
+              keyId = psshInfo.data.subarray(offset, offset + 16);
+            } else if (keySystemDomain === KeySystems.PLAYREADY) {
+              keyId = parsePlayReadyWRM(psshInfo.data);
+            }
           }
         }
-      }
-      if (!keySystemDomain || !keyId) {
-        return;
-      }
-      const keyIdHex = Hex.hexDump(keyId);
-      const {
-        keyIdToKeySessionPromise,
-        mediaKeySessions
-      } = this;
-      let keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex];
-      for (let i = 0; i < mediaKeySessions.length; i++) {
-        // Match playlist key
-        const keyContext = mediaKeySessions[i];
-        const decryptdata = keyContext.decryptdata;
-        if (!decryptdata.keyId) {
-          continue;
+        if (!keySystemDomain || !keyId) {
+          return;
         }
-        const oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
-        if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
-          keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
-          if (decryptdata.pssh) {
+        const keyIdHex = Hex.hexDump(keyId);
+        const {
+          keyIdToKeySessionPromise,
+          mediaKeySessions
+        } = this;
+        let keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex];
+        for (let i = 0; i < mediaKeySessions.length; i++) {
+          // Match playlist key
+          const keyContext = mediaKeySessions[i];
+          const decryptdata = keyContext.decryptdata;
+          if (!decryptdata.keyId) {
+            continue;
+          }
+          const oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
+          if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
+            keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
+            if (decryptdata.pssh) {
+              break;
+            }
+            delete keyIdToKeySessionPromise[oldKeyIdHex];
+            decryptdata.pssh = new Uint8Array(initData);
+            decryptdata.keyId = keyId;
+            keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(() => {
+              return this.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
+            });
+            keySessionContextPromise.catch(error => this.handleError(error));
             break;
           }
-          delete keyIdToKeySessionPromise[oldKeyIdHex];
-          decryptdata.pssh = new Uint8Array(initData);
-          decryptdata.keyId = keyId;
-          keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(() => {
-            return this.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
-          });
-          keySessionContextPromise.catch(error => this.handleError(error));
-          break;
         }
-      }
-      if (!keySessionContextPromise) {
-        // Clear-lead key (not encountered in playlist)
-        keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = this.getKeySystemSelectionPromise([keySystemDomain]).then(({
-          keySystem,
-          mediaKeys
-        }) => {
-          var _keySystemToKeySystem;
-          this.throwIfDestroyed();
-          const decryptdata = new LevelKey('ISO-23001-7', keyIdHex, (_keySystemToKeySystem = keySystemDomainToKeySystemFormat(keySystem)) != null ? _keySystemToKeySystem : '');
-          decryptdata.pssh = new Uint8Array(initData);
-          decryptdata.keyId = keyId;
-          return this.attemptSetMediaKeys(keySystem, mediaKeys).then(() => {
+        if (!keySessionContextPromise) {
+          if (keySystemDomain !== keySystem) {
+            this.log(`Ignoring "${event.type}" event with ${keySystemDomain} init data for selected key-system ${keySystem}`);
+            return;
+          }
+          // "Clear-lead" (misc key not encountered in playlist)
+          keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = this.getKeySystemSelectionPromise([keySystemDomain]).then(({
+            keySystem,
+            mediaKeys
+          }) => {
+            var _keySystemToKeySystem;
             this.throwIfDestroyed();
-            const keySessionContext = this.createMediaKeySessionContext({
-              decryptdata,
-              keySystem,
-              mediaKeys
+            const decryptdata = new LevelKey('ISO-23001-7', keyIdHex, (_keySystemToKeySystem = keySystemDomainToKeySystemFormat(keySystem)) != null ? _keySystemToKeySystem : '');
+            decryptdata.pssh = new Uint8Array(initData);
+            decryptdata.keyId = keyId;
+            return this.attemptSetMediaKeys(keySystem, mediaKeys).then(() => {
+              this.throwIfDestroyed();
+              const keySessionContext = this.createMediaKeySessionContext({
+                decryptdata,
+                keySystem,
+                mediaKeys
+              });
+              return this.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
             });
-            return this.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
           });
-        });
-        keySessionContextPromise.catch(error => this.handleError(error));
-      }
+          keySessionContextPromise.catch(error => this.handleError(error));
+        }
+      });
     };
     this.onWaitingForKey = event => {
       this.log(`"${event.type}" event`);
@@ -32567,7 +32585,7 @@ class KeyLoader {
     }
   }
   load(frag) {
-    if (!frag.decryptdata && frag.encrypted && this.emeController) {
+    if (!frag.decryptdata && frag.encrypted && this.emeController && this.config.emeEnabled) {
       // Multiple keys, but none selected, resolve in eme-controller
       return this.emeController.selectKeySystemFormat(frag).then(keySystemFormat => {
         return this.loadInternal(frag, keySystemFormat);