eyevinn-channel-engine 3.3.6 → 3.3.7

package/engine/session.js

@@ -512,7 +512,7 @@ class Session {
     }
 
     const sessionState = await this._sessionState.getValues(["vodMediaSeqVideo", "discSeq"]);
-    const playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"]);
+    let playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"]);
 
     if (this.prevVodMediaSeq.video === null) {
       this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
@@ -522,13 +522,20 @@ class Session {
     }
 
     if (playheadState.vodMediaSeqVideo > sessionState.vodMediaSeqVideo) {
-      debug(`[${this._sessionId}]: Recently Loaded Next Vod. PlayheadState not up-to-date. Return the last generated m3u8`);
-      const m3u8 = await this._playheadState.getLastM3u8();
-      if (m3u8) {
-        this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
-        return m3u8;
+      const state = await this._sessionState.get("state");
+      if ([SessionState.VOD_RELOAD_INIT, SessionState.VOD_NEXT_INITIATING].includes(state)) {
+        debug(`[${this._sessionId}]: Recently reloaded Vod. PlayheadState not up-to-date. Waiting 500ms before reading from store again`);
+        await timer(500);
+        playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"]);
       } else {
-        debug(`[${this._sessionId}]: We don't have any previously generated m3u8`);
+        debug(`[${this._sessionId}]: Recently Loaded Next Vod. PlayheadState not up-to-date. Return the last generated m3u8`);
+        const m3u8 = await this._playheadState.getLastM3u8();
+        if (m3u8) {
+          this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
+          return m3u8;
+        } else {
+          debug(`[${this._sessionId}]: We don't have any previously generated m3u8`);
+        }
       }
     }
 

package/engine/session_live.js

@@ -588,9 +588,10 @@ class SessionLive {
         return;
       }
 
+      let liveSegsInStore = await this.sessionLiveState.get("liveSegsForFollowers");
       attempts = 10;
       //  CHECK AGAIN CASE 2: Store Old
-      while (leadersMediaSeqRaw <= this.lastRequestedMediaSeqRaw && attempts > 0) {
+      while ((leadersMediaSeqRaw <= this.lastRequestedMediaSeqRaw && attempts > 0) || (this._containsSegment(this.liveSegsForFollowers, liveSegsInStore) && attempts > 0)) {
         if (!this.allowedToSet) {
           debug(`[${this.sessionId}]: We are about to switch away from LIVE. Abort fetching from Store`);
           break;
@@ -602,22 +603,26 @@ class SessionLive {
             return;
           }
         }
-
+        if (this._containsSegment(this.liveSegsForFollowers, liveSegsInStore)) {
+          debug(`[${this.sessionId}]: FOLLOWER: _containsSegment=true,${leadersMediaSeqRaw},${this.lastRequestedMediaSeqRaw}`);
+        }
         const segDur = this._getAnyFirstSegmentDurationMs() || DEFAULT_PLAYHEAD_INTERVAL_MS;
         const waitTimeMs = parseInt(segDur / 3, 10);
         debug(`[${this.sessionId}]: FOLLOWER: Cannot find anything NEW in store... Will check again in ${waitTimeMs}ms (Tries left=[${attempts}])`);
         await timer(waitTimeMs);
         this.timerCompensation = false;
         leadersMediaSeqRaw = await this.sessionLiveState.get("lastRequestedMediaSeqRaw");
+        liveSegsInStore = await this.sessionLiveState.get("liveSegsForFollowers");
         attempts--;
       }
-      if(leadersMediaSeqRaw <= this.lastRequestedMediaSeqRaw) {
+      // FINALLY
+      if (leadersMediaSeqRaw <= this.lastRequestedMediaSeqRaw) {
         debug(`[${this.instanceId}][${this.sessionId}]: The leader is still alive`);
         return;
       }
       // Follower updates its manifest building blocks (segment holders & counts)
       this.lastRequestedMediaSeqRaw = leadersMediaSeqRaw;
-      this.liveSegsForFollowers = await this.sessionLiveState.get("liveSegsForFollowers");
+      this.liveSegsForFollowers = liveSegsInStore;
       debug(`[${this.sessionId}]: These are the segments from store: [${JSON.stringify(this.liveSegsForFollowers)}]`);
       this._updateLiveSegQueue();
       return;
@@ -1445,6 +1450,26 @@ class SessionLive {
     }
     return true;
   }
+
+  _containsSegment(segments, newSegments) {
+    if (!segments || !newSegments) {
+      return false;
+    }
+    if (Object.keys(segments).length === 0 || Object.keys(newSegments).length === 0) {
+      return false;
+    }
+    const someBw = Object.keys(segments)[0];
+    const segList = segments[someBw];
+    const mostRecentSegment = segList[segList.length - 1];
+
+    const segListNew = newSegments[someBw];
+    const mostRecentSegmentNew = segListNew[segListNew.length - 1];
+
+    if (mostRecentSegmentNew.uri === mostRecentSegment.uri) {
+      return true;
+    }
+    return false;
+  }
 }
 
 module.exports = SessionLive;

package/package.json

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