eyevinn-channel-engine 3.1.8 → 3.1.9

package/engine/session.js

@@ -446,7 +446,7 @@ class Session {
     const sessionState = await this._sessionState.getValues(["vodMediaSeqVideo", "discSeq"]);
     const playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"]);
 
-    if (this.prevVodMediaSeq.video !== null) {
+    if (this.prevVodMediaSeq.video === null) {
       this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
     }
 
@@ -940,7 +940,7 @@ class Session {
           }
         } else {
           // Handle edge case where store has been reset, but leader has not cleared cache.
-          if (this.prevVodMediaSeq.video !== null) {
+          if (this.prevVodMediaSeq.video === null) {
             this.prevVodMediaSeq.video = sessionState.vodMediaSeqVideo;
           }
           if (this.prevVodMediaSeq.video < sessionState.vodMediaSeqVideo) {

package/engine/session_live.js

@@ -159,16 +159,16 @@ class SessionLive {
         this.waitForPlayhead = false;
 
         // Let the playhead move at an interval set according to live segment duration
-        let liveSegmentDurationMs = DEFAULT_PLAYHEAD_INTERVAL_MS;
-        let liveBws = Object.keys(this.liveSegQueue);
-        if (liveBws.length !== 0 && this.liveSegQueue[liveBws[0]].length !== 0 && this.liveSegQueue[liveBws[0]][0].duration) {
-          liveSegmentDurationMs = this.liveSegQueue[liveBws[0]][0].duration * 1000;
-        }
+        const liveSegmentDurationMs = this._getAnyFirstSegmentDurationMs() || DEFAULT_PLAYHEAD_INTERVAL_MS;
 
         // Set the timer
         let timerValueMs = 0;
         if (this.timerCompensation) {
-          if (liveSegmentDurationMs - (tsIncrementEnd - tsIncrementBegin) > 0) {
+          const isLeader = await this.sessionLiveStateStore.isLeader(this.instanceId);
+          const incrementDuration = tsIncrementEnd - tsIncrementBegin;
+          if (incrementDuration >= liveSegmentDurationMs * 0.5 && isLeader) {
+            timerValueMs = liveSegmentDurationMs;
+          } else {
             timerValueMs = liveSegmentDurationMs - (tsIncrementEnd - tsIncrementBegin);
           }
         } else {
@@ -541,12 +541,14 @@ class SessionLive {
       if (!leadersMediaSeqRaw < this.lastRequestedMediaSeqRaw && this.blockGenerateManifest) {
         this.blockGenerateManifest = false;
       }
-      let attempts = 5;
 
+      let attempts = 5;
       //  CHECK AGAIN CASE 1: Store Empty
       while (!leadersMediaSeqRaw && attempts > 0) {
-        debug(`[${this.sessionId}]: FOLLOWER: Leader has not put anything in store... Will check again in 2000ms (Tries left=[${attempts}])`);
-        await timer(2000);
+        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}])`);
+        await timer(waitTimeMs);
         this.timerCompensation = false;
         leadersMediaSeqRaw = await this.sessionLiveState.get("lastRequestedMediaSeqRaw");
         attempts--;
@@ -566,8 +568,10 @@ class SessionLive {
       attempts = 5;
       //  CHECK AGAIN CASE 2: Store Old
       while (leadersMediaSeqRaw <= this.lastRequestedMediaSeqRaw && attempts > 0) {
-        debug(`[${this.sessionId}]: FOLLOWER: Cannot find anything NEW in store... Will check again in 2000ms (Tries left=[${attempts}])`);
-        await timer(2000);
+        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");
         attempts--;
@@ -1362,6 +1366,27 @@ class SessionLive {
     this.mediaManifestURIs = newItem;
   }
 
+  _getAnyFirstSegmentDurationMs() {
+    if (this._isEmpty(this.liveSegQueue)) {
+      return null;
+    }
+  
+    const bw0 = Object.keys(this.liveSegQueue)[0]; 
+    if (this.liveSegQueue[bw0].length === 0) {
+      return null;
+    }
+    
+    for (let i = 0; i < this.liveSegQueue[bw0].length; i++) {
+      const segment = this.liveSegQueue[bw0][i];
+      if (!segment.duration) {
+        continue;
+      }
+      return segment.duration * 1000;
+    }
+
+    return null;
+  }
+
   _isEmpty(obj) {
     if (!obj) {
       return true;

package/engine/stream_switcher.js

@@ -3,6 +3,7 @@ const crypto = require("crypto");
 const fetch = require("node-fetch");
 const { AbortController } = require("abort-controller");
 const { SessionState } = require('./session_state');
+const { timer } = require("./util")
 
 const SwitcherState = Object.freeze({
   V2L_TO_LIVE: 1,
@@ -151,6 +152,11 @@ class StreamSwitcher {
       );
       validURI = await this._validURI(scheduleObj.uri);
       tries++;
+      if (!validURI) {
+        const delayMs = tries * 500;
+        debug(`[${this.sessionId}]: Going to try validating Master URI again in ${delayMs}ms`);
+        await timer(delayMs);
+      }
     }
     if (!validURI) {
       debug(`[${this.sessionId}]: Unreachable URI: [${scheduleObj.uri}]`);

package/engine/util.js

@@ -122,6 +122,8 @@ const logerror = (sessionId, err) => {
   console.error(err);
 };
 
+const timer = ms => new Promise(res => setTimeout(res, ms));
+
 module.exports = {
   filterQueryParser,
   applyFilter,
@@ -129,4 +131,5 @@ module.exports = {
   m3u8Header,
   toHHMMSS,
   logerror,
+  timer
 };

package/package.json

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