hls.js 1.5.14-0.canary.10643 → 1.5.14-0.canary.10646

package/dist/hls.mjs

@@ -421,7 +421,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.5.14-0.canary.10643"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.5.14-0.canary.10646"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -11092,7 +11092,7 @@ function concatUint8Arrays(chunks, dataLength) {
   return result;
 }
 
-const version = "1.5.14-0.canary.10643";
+const version = "1.5.14-0.canary.10646";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -23677,6 +23677,7 @@ class EMEController extends Logger {
           keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(() => {
             return this.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
           });
+          keySessionContextPromise.catch(error => this.handleError(error));
           break;
         }
       }
@@ -23701,8 +23702,8 @@ class EMEController extends Logger {
             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`);
@@ -24051,8 +24052,11 @@ class EMEController extends Logger {
       this.log(`"${messageType}" message event for session "${keySession.sessionId}" message size: ${message.byteLength}`);
       if (messageType === 'license-request' || messageType === 'license-renewal') {
         this.renewLicense(context, message).catch(error => {
-          this.handleError(error);
-          licenseStatus.emit('error', error);
+          if (licenseStatus.eventNames().length) {
+            licenseStatus.emit('error', error);
+          } else {
+            this.handleError(error);
+          }
         });
       } else if (messageType === 'license-release') {
         if (context.keySystem === KeySystems.FAIRPLAY) {
@@ -24356,6 +24360,8 @@ class EMEController extends Logger {
 
     // keep reference of media
     this.media = media;
+    media.removeEventListener('encrypted', this.onMediaEncrypted);
+    media.removeEventListener('waitingforkey', this.onWaitingForKey);
     media.addEventListener('encrypted', this.onMediaEncrypted);
     media.addEventListener('waitingforkey', this.onWaitingForKey);
   }