hls.js 1.6.3-0.canary.11262 → 1.6.3

package/dist/hls.mjs

@@ -523,7 +523,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.3-0.canary.11262"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.3"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -10234,7 +10234,7 @@ function requireEventemitter3 () {
 var eventemitter3Exports = requireEventemitter3();
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.3-0.canary.11262";
+const version = "1.6.3";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -21550,6 +21550,14 @@ function performUriReplacement(uri, stableId, perOptionKey, uriReplacement) {
   return url.href;
 }
 
+function addEventListener(el, type, listener) {
+  removeEventListener(el, type, listener);
+  el.addEventListener(type, listener);
+}
+function removeEventListener(el, type, listener) {
+  el.removeEventListener(type, listener);
+}
+
 /**
  * Controller to deal with encrypted media extensions (EME)
  * @see https://developer.mozilla.org/en-US/docs/Web/API/Encrypted_Media_Extensions_API
@@ -21712,10 +21720,8 @@ class EMEController extends Logger {
     this.registerListeners();
   }
   destroy() {
-    const media = this.media;
-    this.unregisterListeners();
+    this.onDestroying();
     this.onMediaDetached();
-    this._clear(media);
     // Remove any references that could be held in config options or callbacks
     const config = this.config;
     config.requestMediaKeySystemAccessFunc = null;
@@ -21731,12 +21737,14 @@ class EMEController extends Logger {
     this.hls.on(Events.MEDIA_DETACHED, this.onMediaDetached, this);
     this.hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
     this.hls.on(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
+    this.hls.on(Events.DESTROYING, this.onDestroying, this);
   }
   unregisterListeners() {
     this.hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
     this.hls.off(Events.MEDIA_DETACHED, this.onMediaDetached, this);
     this.hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
     this.hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
+    this.hls.off(Events.DESTROYING, this.onDestroying, this);
   }
   getLicenseServerUrl(keySystem) {
     const {
@@ -22111,8 +22119,8 @@ class EMEController extends Logger {
         this.renewKeySession(context);
       }
     };
-    context.mediaKeysSession.addEventListener('message', onmessage);
-    context.mediaKeysSession.addEventListener('keystatuseschange', onkeystatuseschange);
+    addEventListener(context.mediaKeysSession, 'message', onmessage);
+    addEventListener(context.mediaKeysSession, 'keystatuseschange', onkeystatuseschange);
     const keyUsablePromise = new Promise((resolve, reject) => {
       licenseStatus.on('error', reject);
       licenseStatus.on('keyStatus', keyStatus => {
@@ -22389,6 +22397,10 @@ class EMEController extends Logger {
       });
     });
   }
+  onDestroying() {
+    this.unregisterListeners();
+    this._clear();
+  }
   onMediaAttached(event, data) {
     if (!this.config.emeEnabled) {
       return;
@@ -22397,28 +22409,29 @@ 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);
+    addEventListener(media, 'encrypted', this.onMediaEncrypted);
+    addEventListener(media, 'waitingforkey', this.onWaitingForKey);
   }
   onMediaDetached() {
     const media = this.media;
     if (media) {
-      media.removeEventListener('encrypted', this.onMediaEncrypted);
-      media.removeEventListener('waitingforkey', this.onWaitingForKey);
+      removeEventListener(media, 'encrypted', this.onMediaEncrypted);
+      removeEventListener(media, 'waitingforkey', this.onWaitingForKey);
       this.media = null;
       this.mediaKeys = null;
     }
   }
-  _clear(media) {
+  _clear() {
     var _media$setMediaKeys;
-    const mediaKeysList = this.mediaKeySessions;
     this._requestLicenseFailureCount = 0;
-    this.mediaKeys = null;
-    this.setMediaKeysQueue = [];
-    this.mediaKeySessions = [];
     this.keyIdToKeySessionPromise = {};
+    if (!this.mediaKeys && !this.mediaKeySessions.length) {
+      return;
+    }
+    const media = this.media;
+    const mediaKeysList = this.mediaKeySessions.slice();
+    this.mediaKeySessions = [];
+    this.mediaKeys = null;
     LevelKey.clearKeyUriToKeyIdMap();
 
     // Close all sessions and remove media keys from the video element.
@@ -22432,12 +22445,7 @@ class EMEController extends Logger {
         fatal: false,
         error: new Error(`Could not clear media keys: ${error}`)
       });
-    }))).then(() => {
-      if (keySessionCount) {
-        this.log('finished closing key sessions and clearing media keys');
-        mediaKeysList.length = 0;
-      }
-    }).catch(error => {
+    }))).catch(error => {
       var _this$hls3;
       this.log(`Could not close sessions and clear media keys: ${error}`);
       (_this$hls3 = this.hls) == null ? void 0 : _this$hls3.trigger(Events.ERROR, {
@@ -22446,6 +22454,10 @@ class EMEController extends Logger {
         fatal: false,
         error: new Error(`Could not close sessions and clear media keys: ${error}`)
       });
+    }).then(() => {
+      if (keySessionCount) {
+        this.log('finished closing key sessions and clearing media keys');
+      }
     });
   }
   onManifestLoading() {
@@ -24304,14 +24316,6 @@ class AssetListLoader {
   }
 }
 
-function addEventListener(el, type, listener) {
-  removeEventListener(el, type, listener);
-  el.addEventListener(type, listener);
-}
-function removeEventListener(el, type, listener) {
-  el.removeEventListener(type, listener);
-}
-
 function playWithCatch(media) {
   media == null ? void 0 : media.play().catch(() => {
     /* no-op */