eyevinn-channel-engine 3.2.4 → 3.2.7

package/engine/session.js

@@ -57,7 +57,7 @@ class Session {
       transitionSegments: null,
       reloadBehind: null,
     }
-    this.alreadyClearedVodCache = null;
+    this.isAllowedToClearVodCache = null;
 
     if (config) {
       if (config.sessionId) {
@@ -361,9 +361,13 @@ class Session {
       state = await this.getSessionState();
     }
 
-    const playheadState = await this._playheadState.getValues(["vodMediaSeqVideo"]);
-    if (opts && opts.targetMseq) {
+    const playheadState = {
+      vodMediaSeqVideo: null
+    }
+    if (opts && opts.targetMseq !== undefined) {
       playheadState.vodMediaSeqVideo = opts.targetMseq;
+    } else {
+      playheadState.vodMediaSeqVideo = await this._playheadState.get("vodMediaSeqVideo");
     }
 
     // NOTE: Assume that VOD cache was already cleared in 'getCurrentMediaAndDiscSequenceCount()'
@@ -476,14 +480,13 @@ class Session {
     if (playheadState.vodMediaSeqVideo < 2 || playheadState.vodMediaSeqVideo < this.prevVodMediaSeq.video) { 
       debug(`[${this._sessionId}]: current[${playheadState.vodMediaSeqVideo}]_prev[${this.prevVodMediaSeq.video}]`);
       const isLeader = await this._sessionStateStore.isLeader(this._instanceId);
-      if (!isLeader && !this.alreadyClearedVodCache) {
+      if (!isLeader && this.isAllowedToClearVodCache) {
         debug(`[${this._sessionId}]: Not a leader and first|second media sequence in a VOD is requested. Invalidate cache to ensure having the correct VOD.`);
         await this._sessionState.clearCurrentVodCache();
-        this.alreadyClearedVodCache = true;
+        this.isAllowedToClearVodCache = false;
       }
     } else {
-      // Reset the value
-      this.alreadyClearedVodCache = false;
+      this.isAllowedToClearVodCache = true;
     }
 
     const currentVod = await this._sessionState.getCurrentVod();
@@ -567,6 +570,7 @@ class Session {
         } else {
           debug(`[${this._sessionId}]: We don't have any previously generated m3u8`);
         }
+        this.isAllowedToClearVodCache = true;
       }
     } else {
       sessionState.vodMediaSeqVideo = await this._sessionState.increment("vodMediaSeqVideo");
@@ -597,14 +601,13 @@ class Session {
       if (playheadState.vodMediaSeqVideo < this.prevVodMediaSeq.video) {
         this.alreadyCleredVodCache = false;
       }
-      if (!isLeader && !this.alreadyClearedVodCache) {
+      if (!isLeader && this.isAllowedToClearVodCache) {
         debug(`[${this._sessionId}]: Not a leader and have just set 'playheadState.vodMediaSeqVideo' to 0|1. Invalidate cache to ensure having the correct VOD.`);
         await this._sessionState.clearCurrentVodCache();
-        this.alreadyClearedVodCache = true;
+        this.isAllowedToClearVodCache = false;
       }
     } else {
-      // Reset the value
-      this.alreadyClearedVodCache = false;
+      this.isAllowedToClearVodCache = true;
     }
     // Update Value for Previous Sequence
     this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
@@ -959,12 +962,19 @@ class Session {
             this.prevVodMediaSeq.video = sessionState.vodMediaSeqVideo;
           }
           // Clear Cache if prev count is HIGHER than current...
-          if (sessionState.vodMediaSeqVideo < this.prevVodMediaSeq.video ) {
-            debug(`[${this._sessionId}]: current[${sessionState.vodMediaSeqVideo}], prev[${this.prevVodMediaSeq.video}], total[${currentVod.getLiveMediaSequencesCount()}]`);
+          if (sessionState.vodMediaSeqVideo < this.prevVodMediaSeq.video) {
+            debug(`[${this._sessionId}]: state=VOD_PLAYING, current[${sessionState.vodMediaSeqVideo}], prev[${this.prevVodMediaSeq.video}], total[${currentVod.getLiveMediaSequencesCount()}]`);
             await this._sessionState.clearCurrentVodCache();
             currentVod = await this._sessionState.getCurrentVod();
             this.prevVodMediaSeq.video = sessionState.vodMediaSeqVideo;
           }
+        } else {
+          // Handle edge case where Leader loaded next vod but Follower remained in state=VOD_PLAYING
+          if (this.prevVodMediaSeq.video !== null & sessionState.vodMediaSeqVideo < this.prevVodMediaSeq.video) {
+            debug(`[${this._sessionId}]: state=VOD_PLAYING, current[${sessionState.vodMediaSeqVideo}], prev[${this.prevVodMediaSeq.video}], total[${currentVod.getLiveMediaSequencesCount()}]`);
+            // Allow Follower to clear VodCache...
+            this.isAllowedToClearVodCache = true;
+          }
         }
         debug(`[${this._sessionId}]: state=VOD_PLAYING (${sessionState.vodMediaSeqVideo}_${sessionState.vodMediaSeqAudio}, ${currentVod.getLiveMediaSequencesCount()})`);
         return;
@@ -973,7 +983,8 @@ class Session {
         if (!isLeader) {
           debug(`[${this._sessionId}]: not the leader so just waiting for the VOD to be initiated`);
         }
-        this.alreadyClearedVodCache = false;
+        // Allow Leader|Follower to clear vodCache...
+        this.isAllowedToClearVodCache = true;
         return;
       case SessionState.VOD_NEXT_INIT:
         try {
@@ -1059,6 +1070,8 @@ class Session {
             debug(`[${this._sessionId}]: not a leader so will go directly to state VOD_NEXT_INITIATING`);
             this.waitingForNextVod = true;
             sessionState.state = await this._sessionState.set("state", SessionState.VOD_NEXT_INITIATING);
+            // Allow Leader|Follower to clear vodCache...
+            this.isAllowedToClearVodCache = true;
             sessionState.currentVod = await this._sessionState.getCurrentVod();
           }
         } catch (err) {
@@ -1075,6 +1088,8 @@ class Session {
             debug("No slate to load");
             throw err;
           }
+          // Allow Leader|Follower to clear vodCache...
+          this.isAllowedToClearVodCache = true;
         }
         break;
         case SessionState.VOD_RELOAD_INIT:
@@ -1147,6 +1162,8 @@ class Session {
             }
             this.waitingForNextVod = true;
           }
+          // Allow Leader|Follower to clear vodCache...
+          this.isAllowedToClearVodCache = true;
           return;
       default:
         throw new Error("Invalid state: " + sessionState.state);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "3.2.4",
+  "version": "3.2.7",
   "description": "OTT TV Channel Engine",
   "main": "index.js",
   "scripts": {