eyevinn-channel-engine 2.22.4 → 2.23.3

package/engine/server.js

@@ -83,7 +83,7 @@ class ChannelEngine {
     if (options && options.forceTargetDuration) {
       this.streamerOpts.forceTargetDuration = options.forceTargetDuration;
     }
-    this.server.get('/live/:file', async (req, res, next) => {
+    const handleMasterRoute = async (req, res, next) => {
       debug(req.params);
       let m;
       if (req.params.file.match(/master.m3u8/)) {
@@ -98,6 +98,14 @@ class ChannelEngine {
         req.params[2] = m[3];
         await this._handleAudioManifest(req, res, next);
       }
+    };
+    
+    this.server.get('/live/:file', async (req, res, next) => {
+      await handleMasterRoute(req, res, next);
+    });
+    this.server.get('/channels/:channelId/:file', async (req, res, next) => {
+      req.query['channel'] = req.params.channelId;
+      await handleMasterRoute(req, res, next);
     });
     this.server.get('/eventstream/:sessionId', this._handleEventStream.bind(this));
     this.server.get('/status/:sessionId', this._handleStatus.bind(this));

package/engine/session.js

@@ -673,8 +673,8 @@ class Session {
           }
         }
       case SessionState.VOD_PLAYING:
-        if (!isLeader && sessionState.vodMediaSeqVideo === 0) {
-          debug(`[${this._sessionId}]: First mediasequence in VOD and I am not the leader so invalidate current VOD cache and fetch the new one from the leader`);
+        if (!isLeader && (sessionState.vodMediaSeqVideo === 0 || sessionState.vodMediaSeqVideo === 1)) {
+          debug(`[${this._sessionId}]: First or second mediasequence in VOD and I am not the leader so invalidate current VOD cache and fetch the new one from the leader`);
           await this._sessionState.clearCurrentVodCache();
           currentVod = await this._sessionState.getCurrentVod();    
         }
@@ -684,8 +684,8 @@ class Session {
         debug(`[${this._sessionId}]: state=VOD_NEXT_INITIATING (${sessionState.vodMediaSeqVideo}_${sessionState.vodMediaSeqAudio}, ${currentVod.getLiveMediaSequencesCount()})`);
         if (!isLeader) {
           debug(`[${this._sessionId}]: not the leader so just waiting for the VOD to be initiated`);
-          if (sessionState.vodMediaSeqVideo === 0) {
-            debug(`[${this._sessionId}]: First mediasequence in VOD and I am not the leader so invalidate current VOD cache and fetch the new one from the leader`);
+          if (sessionState.vodMediaSeqVideo === 0 || sessionState.vodMediaSeqVideo === 1) {
+            debug(`[${this._sessionId}]: First or second mediasequence in VOD and I am not the leader so invalidate current VOD cache and fetch the new one from the leader`);
             await this._sessionState.clearCurrentVodCache();
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "2.22.4",
+  "version": "2.23.3",
   "description": "OTT TV Channel Engine",
   "main": "index.js",
   "scripts": {
@@ -19,9 +19,9 @@
   "repository": "https://github.com/Eyevinn/channel-engine",
   "license": "Apache-2.0",
   "dependencies": {
-    "@eyevinn/hls-repeat": "^0.1.1",
-    "@eyevinn/hls-truncate": "^0.1.0",
-    "@eyevinn/hls-vodtolive": "^1.14.0",
+    "@eyevinn/hls-repeat": "0.1.6",
+    "@eyevinn/hls-truncate": "0.1.1",
+    "@eyevinn/hls-vodtolive": "1.16.3",
     "@eyevinn/m3u8": "^0.4.0",
     "debug": "^3.2.7",
     "memcache-client": "^0.10.1",