fix: excessive requests when using HDCP fallback with LDL

src/eme.js

@@ -133,12 +133,13 @@ export const makeNewRequest = (player, requestOptions) => {
       keySession
     });
 
-    player.on('dispose', () => {
+    player.on(['dispose', 'ended'], () => {
       keySession.close().then(() => {
         safeTriggerOnEventBus(eventBus, {
           type: 'keysessionclosed',
           keySession
         });
+        removeSession(initData);
       }).catch((error) => {
         const metadata = {
           errorType: EmeError.EMEFailedToCloseSession,
@@ -245,7 +246,6 @@ export const makeNewRequest = (player, requestOptions) => {
               keySession
             });
             removeSession(initData);
-            makeNewRequest(player, requestOptions);
           }).catch((error) => {
             const metadata = {
               errorType: EmeError.EMEFailedToCloseSession,

src/plugin.js

@@ -308,9 +308,21 @@ const eme = function(options = {}) {
   const player = this;
 
   const emeError = emeErrorHandler(player);
+  let contentHasEnded = false;
 
   player.ready(() => onPlayerReady(player, emeError));
 
+  player.on('ended', () =>{
+    contentHasEnded = true;
+
+    player.one('play', () => {
+      if (contentHasEnded && player.currentTime() === 0) {
+        contentHasEnded = true;
+        onPlayerReady(player, emeError);
+      }
+    });
+  });
+
   // Plugin API
   player.eme = {
     /**

test/eme.test.js

@@ -259,8 +259,6 @@ QUnit.test('keystatuseschange with expired key closes and recreates session', fu
   // synchronously
   assert.equal(removeSessionCalls.length, 1, 'called remove session');
   assert.equal(removeSessionCalls[0], initData, 'called to remove session with initData');
-
-  assert.equal(creates, 2, 'created another session');
 });
 
 QUnit.test('keystatuseschange with internal-error logs a warning', function(assert) {