eyevinn-channel-engine 3.3.5 → 3.3.8

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:slim
+FROM node:12.16.1-alpine
 
 WORKDIR /app
 

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_RELOAD_INITIATING].includes(state)) {
+        debug(`[${this._sessionId}]: Recently reloaded Vod. PlayheadState not up-to-date (${playheadState.vodMediaSeqVideo}_${sessionState.vodMediaSeqVideo}). 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

@@ -85,7 +85,7 @@ class SessionLive {
     if (resetDelay === null || resetDelay < 0) {
       resetDelay = RESET_DELAY;
     }
-
+    debug(`[${this.instanceId}][${this.sessionId}]: LEADER: Resetting SessionLive values in Store ${resetDelay === 0 ? "Immediately" : `after a delay=(${resetDelay}ms)`}`);
     await timer(resetDelay);
     await this.sessionLiveState.set("liveSegsForFollowers", null);
     await this.sessionLiveState.set("lastRequestedMediaSeqRaw", null);
@@ -95,7 +95,7 @@ class SessionLive {
       mediaSeqCount: null,
       discSeqCount: null,
     });
-    debug(`[${this.instanceId}][${this.sessionId}]: LEADER: Resetting SessionLive values in Store ${resetDelay === 0 ? "Immediately" : `after a delay=(${resetDelay}ms)`}`);
+    debug(`[${this.instanceId}][${this.sessionId}]: LEADER: SessionLive values in Store have now been reset!`);
   }
 
   async resetSession() {
@@ -562,6 +562,18 @@ class SessionLive {
       let attempts = 10;
       //  CHECK AGAIN CASE 1: Store Empty
       while (!leadersMediaSeqRaw && attempts > 0) {
+        if (!leadersMediaSeqRaw) {
+          isLeader = await this.sessionLiveStateStore.isLeader(this.instanceId);
+          if (isLeader) {
+            debug(`[${this.instanceId}]: I'm the new leader`);
+            return;
+          }
+        }
+
+        if (!this.allowedToSet) {
+          debug(`[${this.sessionId}]: We are about to switch away from LIVE. Abort fetching from Store`);
+          break;
+        }
         const segDur = this._getAnyFirstSegmentDurationMs() || DEFAULT_PLAYHEAD_INTERVAL_MS;
         const waitTimeMs = parseInt(segDur / 3, 10);
         debug(`[${this.sessionId}]: FOLLOWER: Leader has not put anything in store... Will check again in ${waitTimeMs}ms (Tries left=[${attempts}])`);
@@ -572,42 +584,45 @@ class SessionLive {
       }
 
       if (!leadersMediaSeqRaw) {
-        isLeader = await this.sessionLiveStateStore.isLeader(this.instanceId);
-        if (isLeader) {
-          debug(`[${this.instanceId}]: I'm the new leader`);
-          return;
-        } else {
-          debug(`[${this.instanceId}]: The leader is still alive`);
-          return;
-        }
+        debug(`[${this.instanceId}]: The leader is still alive`);
+        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;
+        }
+        if (leadersMediaSeqRaw <= this.lastRequestedMediaSeqRaw) {
+          isLeader = await this.sessionLiveStateStore.isLeader(this.instanceId);
+          if (isLeader) {
+            debug(`[${this.instanceId}][${this.sessionId}]: I'm the new leader`);
+            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--;
       }
-
+      // FINALLY
       if (leadersMediaSeqRaw <= this.lastRequestedMediaSeqRaw) {
-        isLeader = await this.sessionLiveStateStore.isLeader(this.instanceId);
-        if (isLeader) {
-          debug(`[${this.instanceId}][${this.sessionId}]: I'm the new leader`);
-          return;
-        } else {
-          debug(`[${this.instanceId}][${this.sessionId}]: The leader is still alive`);
-          return;
-        }
+        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;
@@ -807,7 +822,7 @@ class SessionLive {
       const leadersCurrentMseqRaw = await this.sessionLiveState.get("lastRequestedMediaSeqRaw");
       const counts = await this.sessionLiveState.get("firstCounts");
       const leadersFirstMseqRaw = counts.liveSourceMseqCount;
-      if (leadersCurrentMseqRaw !== null && leadersCurrentMseqRaw !== currentMseqRaw) {
+      if (leadersCurrentMseqRaw !== null && leadersCurrentMseqRaw > currentMseqRaw) {
         // if leader never had any segs from prev mseq
         if (leadersFirstMseqRaw !== null && leadersFirstMseqRaw === leadersCurrentMseqRaw) {
           // Follower updates it's manifest ingedients (segment holders & counts)
@@ -855,8 +870,8 @@ class SessionLive {
         // Do not replace old data with empty data
         if (segListSize > 0) {
           debug(`[${this.sessionId}]: LEADER: Adding data to store!`);
-          await this.sessionLiveState.set("liveSegsForFollowers", this.liveSegsForFollowers);
           await this.sessionLiveState.set("lastRequestedMediaSeqRaw", this.lastRequestedMediaSeqRaw);
+          await this.sessionLiveState.set("liveSegsForFollowers", this.liveSegsForFollowers);
         }
       }
 
@@ -1435,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/engine/stream_switcher.js

@@ -307,9 +307,6 @@ class StreamSwitcher {
           liveSegments = await sessionLive.getCurrentMediaSequenceSegments();
           liveCounts = await sessionLive.getCurrentMediaAndDiscSequenceCount();
 
-          await sessionLive.resetSession();
-          sessionLive.resetLiveStoreAsync(RESET_DELAY); // In parallel
-
           if (scheduleObj && !scheduleObj.duration) {
             debug(`[${this.sessionId}]: Cannot switch VOD. No duration specified for schedule item: [${scheduleObj.assetId}]`);
           }
@@ -331,6 +328,9 @@ class StreamSwitcher {
           await session.setCurrentMediaAndDiscSequenceCount(liveCounts.mediaSeq, liveCounts.discSeq);
           await session.setCurrentMediaSequenceSegments(liveSegments.currMseqSegs, liveSegments.segCount);
 
+          await sessionLive.resetSession();
+          sessionLive.resetLiveStoreAsync(RESET_DELAY); // In parallel
+
           this.working = false;
           this.streamTypeLive = false;
           debug(`[${this.sessionId}]: [ Switched from LIVE->V2L ]`);
@@ -349,8 +349,6 @@ class StreamSwitcher {
           this.eventId = scheduleObj.eventId;
           liveSegments = await sessionLive.getCurrentMediaSequenceSegments();
           liveCounts = await sessionLive.getCurrentMediaAndDiscSequenceCount();
-          await sessionLive.resetSession();
-          sessionLive.resetLiveStoreAsync(RESET_DELAY); // In parallel
 
           eventSegments = await session.getTruncatedVodSegments(scheduleObj.uri, scheduleObj.duration / 1000);
           if (!eventSegments) {
@@ -369,9 +367,11 @@ class StreamSwitcher {
             const prerollSegments = this.prerollsCache[this.sessionId].segments;
             eventSegments = this._mergeSegments(prerollSegments, eventSegments, true);
           }
-
           await session.setCurrentMediaSequenceSegments(eventSegments, 0, true);
 
+          await sessionLive.resetSession();
+          sessionLive.resetLiveStoreAsync(RESET_DELAY); // In parallel
+          
           this.working = false;
           this.streamTypeLive = false;
           debug(`[${this.sessionId}]: Switched from LIVE->VOD`);

package/package.json

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