Find escape in AES key loading (revert/remove before merging)

Author: robwalch

src/controller/base-stream-controller.ts

@@ -839,15 +839,17 @@ export default class BaseStreamController
       );
       this.state = State.KEY_LOADING;
       this.fragCurrent = frag;
-      keyLoadingPromise = this.keyLoader.load(frag).then((keyLoadedData) => {
-        if (!this.fragContextChanged(keyLoadedData.frag)) {
-          this.hls.trigger(Events.KEY_LOADED, keyLoadedData);
-          if (this.state === State.KEY_LOADING) {
-            this.state = State.IDLE;
+      keyLoadingPromise = Promise.resolve().then(() =>
+        this.keyLoader.load(frag).then((keyLoadedData) => {
+          if (!this.fragContextChanged(keyLoadedData.frag)) {
+            this.hls.trigger(Events.KEY_LOADED, keyLoadedData);
+            if (this.state === State.KEY_LOADING) {
+              this.state = State.IDLE;
+            }
+            return keyLoadedData;
           }
-          return keyLoadedData;
-        }
-      });
+        }),
+      );
       this.hls.trigger(Events.KEY_LOADING, { frag });
       if ((this.fragCurrent as Fragment | null) === null) {
         this.log(`context changed in KEY_LOADING`);

src/loader/key-loader.ts

@@ -8,6 +8,7 @@ import {
   keySystemFormatToKeySystemDomain,
 } from '../utils/mediakeys-helper';
 import { KeySystemFormats } from '../utils/mediakeys-helper';
+import { stringify } from '../utils/safe-json-stringify';
 import type { LevelKey } from './level-key';
 import type { HlsConfig } from '../config';
 import type EMEController from '../controller/eme-controller';
@@ -148,6 +149,9 @@ export default class KeyLoader extends Logger implements ComponentAPI {
   }
 
   load(frag: Fragment): Promise<KeyLoadedData> {
+    this.log(
+      `load key for sn: ${frag.type} level: ${frag.level} decryptdata: ${frag.decryptdata} encrypted: ${frag.encrypted} emeEnabled: ${this.config?.emeEnabled} emeController: ${this.emeController}`,
+    );
     if (
       !frag.decryptdata &&
       frag.encrypted &&
@@ -169,6 +173,7 @@ export default class KeyLoader extends Logger implements ComponentAPI {
     frag: Fragment,
     keySystemFormat?: KeySystemFormats,
   ): Promise<KeyLoadedData> {
+    this.log(`loadInternal: keySystemFormat: ${keySystemFormat}`);
     if (keySystemFormat) {
       frag.setKeyFormat(keySystemFormat);
     }
@@ -183,6 +188,7 @@ export default class KeyLoader extends Logger implements ComponentAPI {
         this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_ERROR, error),
       );
     }
+    this.log(`decryptdata.uri: ${decryptdata.uri}`);
     const uri = decryptdata.uri;
     if (!uri) {
       return Promise.reject(
@@ -195,6 +201,7 @@ export default class KeyLoader extends Logger implements ComponentAPI {
     }
     const id = getKeyId(decryptdata);
     let keyInfo = this.keyIdToKeyInfo[id];
+    this.log(`id: ${id} ${stringify(keyInfo)}`);
 
     if (keyInfo?.decryptdata.key) {
       decryptdata.key = keyInfo.decryptdata.key;
@@ -282,6 +289,7 @@ export default class KeyLoader extends Logger implements ComponentAPI {
     const Loader = config.loader;
     const keyLoader = new Loader(config) as Loader<KeyLoaderContext>;
     frag.keyLoader = keyInfo.loader = keyLoader;
+    this.log(`HTTP key request ${keyInfo.decryptdata.uri}`);
 
     return (keyInfo.keyLoadPromise = new Promise((resolve, reject) => {
       const loaderContext: KeyLoaderContext = {