eyevinn-channel-engine 3.2.3 → 3.2.6

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) {
@@ -341,7 +341,7 @@ class Session {
     }
   }
 
-  async getCurrentMediaSequenceSegments() {
+  async getCurrentMediaSequenceSegments(opts) {
     if (!this._sessionState) {
       throw new Error('Session not ready');
     }
@@ -361,7 +361,10 @@ class Session {
       state = await this.getSessionState();
     }
 
-    const playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"]);
+    const playheadState = await this._playheadState.getValues(["vodMediaSeqVideo"]);
+    if (opts && opts.targetMseq) {
+      playheadState.vodMediaSeqVideo = opts.targetMseq;
+    }
 
     // NOTE: Assume that VOD cache was already cleared in 'getCurrentMediaAndDiscSequenceCount()'
     // and that we now have access to the correct vod cache
@@ -426,6 +429,7 @@ class Session {
         return {
           'mediaSeq': (playheadState.mediaSeq + playheadState.vodMediaSeqVideo),
           'discSeq': discSeqCount,
+          'vodMediaSeqVideo': playheadState.vodMediaSeqVideo,
         };
       } catch (err) {
         logerror(this._sessionId, err);
@@ -472,14 +476,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();
@@ -593,14 +596,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;
@@ -955,12 +957,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;
@@ -969,7 +978,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 {
@@ -1143,6 +1153,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/engine/stream_switcher.js

@@ -233,7 +233,7 @@ class StreamSwitcher {
           debug(`[${this.sessionId}]: [ INIT Switching from V2L->LIVE ]`);
           this.eventId = scheduleObj.eventId;
           currVodCounts = await session.getCurrentMediaAndDiscSequenceCount();
-          currVodSegments = await session.getCurrentMediaSequenceSegments();
+          currVodSegments = await session.getCurrentMediaSequenceSegments({ targetMseq: currVodCounts.vodMediaSeqVideo });
 
           // Insert preroll if available for current channel
           if (this.prerollsCache[this.sessionId]) {

package/package.json

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

package/spec/engine/init_switching_spec.js

@@ -324,6 +324,7 @@ describe("The initialize switching", () => {
     expect(currVodCounts).toEqual({
       mediaSeq: 2,
       discSeq: 0,
+      vodMediaSeqVideo: 2
     });
     expect(currVodSegments[1313000][0]).toEqual({
       duration: 7.5,
@@ -403,6 +404,7 @@ describe("The initialize switching", () => {
     const expectedCounts = {
       mediaSeq: 23,
       discSeq: 1,
+      vodMediaSeqVideo: 3
     };
 
     expect(expectedCounts).toEqual(sessionCounts);
@@ -448,6 +450,7 @@ describe("The initialize switching", () => {
     const expectedCounts = {
       mediaSeq: 8,
       discSeq: 0,
+      vodMediaSeqVideo: 2
     };
 
     expect(expectedCounts).toEqual(sessionCounts);