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

package/dist/hls.d.mts

@@ -997,6 +997,7 @@ export declare class EMEController extends Logger implements ComponentAPI {
     private unpackPlayReadyKeyMessage;
     private setupLicenseXHR;
     private requestLicense;
+    private onDestroying;
     private onMediaAttached;
     private onMediaDetached;
     private _clear;

package/dist/hls.d.ts

@@ -997,6 +997,7 @@ export declare class EMEController extends Logger implements ComponentAPI {
     private unpackPlayReadyKeyMessage;
     private setupLicenseXHR;
     private requestLicense;
+    private onDestroying;
     private onMediaAttached;
     private onMediaDetached;
     private _clear;

package/dist/hls.js

@@ -1165,7 +1165,7 @@
       // 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();
@@ -16674,7 +16674,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.3-0.canary.11262";
+  var 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
@@ -22233,6 +22233,14 @@
     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
@@ -22413,10 +22421,8 @@
     _inheritsLoose(EMEController, _Logger);
     var _proto = EMEController.prototype;
     _proto.destroy = function destroy() {
-      var media = this.media;
-      this.unregisterListeners();
+      this.onDestroying();
       this.onMediaDetached();
-      this._clear(media);
       // Remove any references that could be held in config options or callbacks
       var config = this.config;
       config.requestMediaKeySystemAccessFunc = null;
@@ -22432,12 +22438,14 @@
       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);
     };
     _proto.unregisterListeners = function 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);
     };
     _proto.getLicenseServerUrl = function getLicenseServerUrl(keySystem) {
       var _this$config = this.config,
@@ -22831,8 +22839,8 @@
           _this0.renewKeySession(context);
         }
       };
-      context.mediaKeysSession.addEventListener('message', onmessage);
-      context.mediaKeysSession.addEventListener('keystatuseschange', onkeystatuseschange);
+      addEventListener(context.mediaKeysSession, 'message', onmessage);
+      addEventListener(context.mediaKeysSession, 'keystatuseschange', onkeystatuseschange);
       var keyUsablePromise = new Promise(function (resolve, reject) {
         licenseStatus.on('error', reject);
         licenseStatus.on('keyStatus', function (keyStatus) {
@@ -23115,6 +23123,10 @@
         });
       });
     };
+    _proto.onDestroying = function onDestroying() {
+      this.unregisterListeners();
+      this._clear();
+    };
     _proto.onMediaAttached = function onMediaAttached(event, data) {
       if (!this.config.emeEnabled) {
         return;
@@ -23123,29 +23135,30 @@
 
       // 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);
     };
     _proto.onMediaDetached = function onMediaDetached() {
       var 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;
       }
     };
-    _proto._clear = function _clear(media) {
+    _proto._clear = function _clear() {
       var _this14 = this,
         _media$setMediaKeys;
-      var mediaKeysList = this.mediaKeySessions;
       this._requestLicenseFailureCount = 0;
-      this.mediaKeys = null;
-      this.setMediaKeysQueue = [];
-      this.mediaKeySessions = [];
       this.keyIdToKeySessionPromise = {};
+      if (!this.mediaKeys && !this.mediaKeySessions.length) {
+        return;
+      }
+      var media = this.media;
+      var mediaKeysList = this.mediaKeySessions.slice();
+      this.mediaKeySessions = [];
+      this.mediaKeys = null;
       LevelKey.clearKeyUriToKeyIdMap();
 
       // Close all sessions and remove media keys from the video element.
@@ -23161,12 +23174,7 @@
           fatal: false,
           error: new Error("Could not clear media keys: " + error)
         });
-      }))).then(function () {
-        if (keySessionCount) {
-          _this14.log('finished closing key sessions and clearing media keys');
-          mediaKeysList.length = 0;
-        }
-      }).catch(function (error) {
+      }))).catch(function (error) {
         var _this14$hls2;
         _this14.log("Could not close sessions and clear media keys: " + error);
         (_this14$hls2 = _this14.hls) == null ? void 0 : _this14$hls2.trigger(Events.ERROR, {
@@ -23175,6 +23183,10 @@
           fatal: false,
           error: new Error("Could not close sessions and clear media keys: " + error)
         });
+      }).then(function () {
+        if (keySessionCount) {
+          _this14.log('finished closing key sessions and clearing media keys');
+        }
       });
     };
     _proto.onManifestLoading = function onManifestLoading() {
@@ -24514,14 +24526,6 @@
     return 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(function () {
       /* no-op */

package/dist/hls.js.d.ts

@@ -997,6 +997,7 @@ export declare class EMEController extends Logger implements ComponentAPI {
     private unpackPlayReadyKeyMessage;
     private setupLicenseXHR;
     private requestLicense;
+    private onDestroying;
     private onMediaAttached;
     private onMediaDetached;
     private _clear;