Replay error handling repeated playlist key tags

Fix escalation of unresolved level removal to fatal

Author: robwalch

src/controller/eme-controller.ts

@@ -64,9 +64,8 @@ export interface MediaKeySessionContext {
   _onkeystatuseschange?: (this: MediaKeySession, ev: Event) => any;
 }
 
-// TODO: move to config?
 export type MediaKeySessionContextAndLevelKey = {
-  decryptdata: LevelKey; // soft-deprecated
+  decryptdata: LevelKey; // soft-deprecated (replaced by levelKeys)
   keySystem: KeySystems;
   levelKeys: LevelKey[];
   mediaKeys: MediaKeys;
@@ -555,6 +554,16 @@ class EMEController extends Logger implements ComponentAPI {
       return keySessionContextPromise;
     }
 
+    // Re-emit error for playlist key loading
+    keyContextPromise.catch((error) => {
+      if (error instanceof EMEKeyError) {
+        const errorData = { ...error.data };
+        errorData.decryptdata = levelKey;
+        const clonedError = new EMEKeyError(errorData, error.message);
+        this.handleError(clonedError, data.frag);
+      }
+    });
+
     return keyContextPromise;
   }
 

src/controller/error-controller.ts

@@ -528,7 +528,8 @@ export default class ErrorController
         if (levelKey) {
           // Penalize all levels with key
           const levels = this.hls.levels;
-          for (let i = levels.length; i--; ) {
+          const levelCountWithError = levels.length;
+          for (let i = levelCountWithError; i--; ) {
             if (this.variantHasKey(levels[i], levelKey)) {
               this.log(
                 `Banned key found in level ${i} (${levels[i].bitrate}bps) or audio group "${levels[i].audioGroups?.join(',')}" (${data.frag?.type} fragment) ${arrayToHex(levelKey.keyId || [])}`,
@@ -539,7 +540,7 @@ export default class ErrorController
               this.hls.removeLevel(i);
             }
           }
-          if (levels.length) {
+          if (this.hls.levels.length < levelCountWithError) {
             errorAction.resolved = true;
           }
         }