eyevinn-channel-engine 5.0.0 → 5.0.3

package/dist/engine/server.js

@@ -431,7 +431,6 @@ var ChannelEngine = /** @class */ (function () {
                     case 0:
                         debug("Do we have any new channels?");
                         newChannels = channelMgr.getChannels().filter(function (channel) { return !sessions[channel.id]; });
-                        debug(JSON.stringify(newChannels));
                         addAsync = function (channel) { return __awaiter(_this, void 0, void 0, function () {
                             var _this = this;
                             return __generator(this, function (_a) {

package/dist/engine/session.d.ts

@@ -138,4 +138,5 @@ declare class Session {
     _getM3u8File(variantType: any, variantKey: any, playbackSessionId: any): Promise<any>;
     _getCurrentVodData(dataName: any, variantType: any, vod: any): any;
     _logCurrentPlayheadPositions(playheadPosVideoMs: any, playheadAudio: any, playheadSubtitle: any): void;
+    _logAllPlayheadPositions: (sessionId: any, vod: any) => void;
 }

package/dist/engine/session.js

@@ -70,6 +70,23 @@ var Session = /** @class */ (function () {
      *
      */
     function Session(assetManager, config, sessionStore) {
+        this._logAllPlayheadPositions = function (sessionId, vod) {
+            if (!vod) {
+                return;
+            }
+            if (!vod.getPlayheadPositions) {
+                return;
+            }
+            if (vod.getPlayheadPositions("video")) {
+                debug("[".concat(sessionId, "]: playhead positions [V]=").concat(vod.getPlayheadPositions("video").map(roundToThreeDecimals).join(",")));
+            }
+            if (vod.getPlayheadPositions("audio")) {
+                debug("[".concat(sessionId, "]: playhead positions [A]=").concat(vod.getPlayheadPositions("audio").map(roundToThreeDecimals).join(",")));
+            }
+            if (vod.getPlayheadPositions("subtitle")) {
+                debug("[".concat(sessionId, "]: playhead positions [S]=").concat(vod.getPlayheadPositions("subtitle").map(roundToThreeDecimals).join(",")));
+            }
+        };
         this._assetManager = assetManager;
         this._sessionId = crypto.randomBytes(20).toString('hex');
         this._sessionStateStore = sessionStore.sessionStateStore;
@@ -365,7 +382,7 @@ var Session = /** @class */ (function () {
                                 }
                             }
                             else {
-                                console.warn("[".concat(this._sessionId, "]: Playhead tick interval went over Max tick interval by ").concat(changeMaxTick, "ms.\n              If the value keeps increasing, consider increasing the 'maxTickInterval' in engineOptions"));
+                                debug("[".concat(this._sessionId, "]: Playhead tick interval went over Max tick interval by ").concat(changeMaxTick, "ms.\n              If the value keeps increasing, consider increasing the 'maxTickInterval' in engineOptions"));
                             }
                             tickInterval = this.maxTickInterval / 1000;
                         }
@@ -1777,11 +1794,8 @@ var Session = /** @class */ (function () {
                     case 17:
                         _u.sent();
                         cloudWatchLog(!this.cloudWatchLogging, 'engine-session', { event: 'loadVod', channel: this._sessionId, loadTimeMs: Date.now() - loadStart });
-                        debug("[".concat(this._sessionId, "]: first VOD loaded"));
-                        debug("[".concat(this._sessionId, "]: ").concat(currentVod.getDeltaTimes()));
-                        debug("[".concat(this._sessionId, "]: playhead positions [V]=").concat(currentVod.getPlayheadPositions("video")));
-                        debug("[".concat(this._sessionId, "]: playhead positions [A]=").concat(currentVod.getPlayheadPositions("audio")));
-                        debug("[".concat(this._sessionId, "]: playhead positions [S]=").concat(currentVod.getPlayheadPositions("subtitle")));
+                        debug("[".concat(this._sessionId, "]: first VOD loaded. DeltaTimes ").concat(currentVod.getDeltaTimes().map(roundToThreeDecimals).join(",")));
+                        this._logAllPlayheadPositions(this._sessionId, currentVod);
                         return [4 /*yield*/, this._sessionState.setValues({
                                 "mediaSeq": 0,
                                 "mediaSeqAudio": 0,
@@ -2029,10 +2043,8 @@ var Session = /** @class */ (function () {
                         _u.sent();
                         cloudWatchLog(!this.cloudWatchLogging, 'engine-session', { event: 'loadVod', channel: this._sessionId, loadTimeMs: Date.now() - loadStart });
                         this.leaderIsSettingNextVod = true;
-                        debug("[".concat(this._sessionId, "]: next VOD loaded (").concat(newVod.getDeltaTimes(), ")"));
-                        debug("[".concat(this._sessionId, "]: playhead positions [V]=").concat(newVod.getPlayheadPositions("video")));
-                        debug("[".concat(this._sessionId, "]: playhead positions [A]=").concat(newVod.getPlayheadPositions("audio")));
-                        debug("[".concat(this._sessionId, "]: playhead positions [S]=").concat(newVod.getPlayheadPositions("subtitle")));
+                        debug("[".concat(this._sessionId, "]: next VOD loaded (").concat(newVod.getDeltaTimes().map(roundToThreeDecimals).join(","), ")"));
+                        this._logAllPlayheadPositions(this._sessionId, newVod);
                         currentVod = newVod;
                         debug("[".concat(this._sessionId, "]: msequences=").concat(currentVod.getLiveMediaSequencesCount(), "; audio msequences=").concat(currentVod.getLiveMediaSequencesCount("audio"), "; subtitle msequences=").concat(currentVod.getLiveMediaSequencesCount("subtitle")));
                         _m = sessionState;

package/dist/engine/util.d.ts

@@ -21,7 +21,7 @@ export function fetchWithRetry(uri: any, opts: any, maxRetries: any, retryDelayM
 export function codecsFromString(codecs: any): any[];
 export function timeLeft(endTimestamp: any, currentTimestamp: any): string;
 export function findAudioGroupOrLang(val: any, array: any): any;
-export function roundToThreeDecimals(number: any): number;
+export function roundToThreeDecimals(number: any): any;
 export const COMMON_HEADERS: {
     "Content-Type": string;
     "Access-Control-Allow-Origin": string;

package/dist/engine/util.js

@@ -309,6 +309,15 @@ var timeLeft = function (endTimestamp, currentTimestamp) {
     return msg;
 };
 var roundToThreeDecimals = function (number) {
+    if (typeof number !== "number") {
+        try {
+            number = parseFloat(number);
+        }
+        catch (e) {
+            console.error("Could not convert to number:", number);
+            return number;
+        }
+    }
     var r = Math.round(number * 1000) / 1000;
     return r;
 };

package/dist/examples/livemix-demux.js

@@ -8,8 +8,8 @@ var uuidv4 = require('uuid').v4;
 var DEMUX_CONTENT = {
     TS: {
         slate: "https://testcontent.eyevinn.technology/ce_test_content/DEMUX_VINJETTE_TS_001/master.m3u8",
-        vod: "https://testcontent.eyevinn.technology/ce_test_content/DEMUX_VOD_TS_001/master.m3u8",
-        trailer: "https://testcontent.eyevinn.technology/ce_test_content/DEMUX_TRAILER_TS_001/index.m3u8",
+        vod: "https://maitv-vod.lab.eyevinn.technology/VINN.mp4/master_demux.m3u8",
+        trailer: "https://maitv-vod.lab.eyevinn.technology/ads/apotea-15s.mp4/master_demux.m3u8",
         bumper: "https://testcontent.eyevinn.technology/ce_test_content/DEMUX_VINJETTE_TS_001/master.m3u8",
         // If you do not have a demux live stream available, you can always use a local CE V2L stream (ex: demux.ts) 
         live: null
@@ -23,7 +23,7 @@ var DEMUX_CONTENT = {
         live: null
     }
 };
-var HLS_CONTENT = DEMUX_CONTENT.CMAF;
+var HLS_CONTENT = DEMUX_CONTENT.TS;
 var FIRST_PLAYED_VOD = true;
 var CONFIGS = {
     USE_STITCHER: 0,
@@ -86,13 +86,13 @@ var RefAssetManager = /** @class */ (function () {
                     resolve(vodResponse);
                 }
                 else {
-                    FIRST_PLAYED_VOD = false;
                     var vodResponse = {
                         id: vod.id,
                         title: vod.title,
                         uri: vod.uri,
                         unixTs: unixTs
                     };
+                    FIRST_PLAYED_VOD = false;
                     resolve(vodResponse);
                 }
             }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "5.0.0",
+  "version": "5.0.3",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,8 +30,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.1",
-    "@eyevinn/hls-truncate": "^0.3.1",
-    "@eyevinn/hls-vodtolive": "^4.1.5",
+    "@eyevinn/hls-truncate": "^0.3.3",
+    "@eyevinn/hls-vodtolive": "^4.1.7",
     "@eyevinn/m3u8": "^0.5.6",
     "@fastify/static": "^5.0.0",
     "abort-controller": "^3.0.0",

package/engine/server.ts

@@ -472,7 +472,6 @@ export class ChannelEngine {
   async updateChannelsAsync(channelMgr, options) {
     debug(`Do we have any new channels?`);
     const newChannels = channelMgr.getChannels().filter(channel => !sessions[channel.id]);
-    debug(JSON.stringify(newChannels));
     const addAsync = async (channel) => {
       debug(`Adding channel with ID ${channel.id}`);
       sessions[channel.id] = new Session(this.assetMgr, {

package/engine/session.js

@@ -9,7 +9,14 @@ const Readable = require('stream').Readable;
 const { SessionState } = require('./session_state.js');
 const { PlayheadState } = require('./playhead_state.js');
 
-const { applyFilter, cloudWatchLog, m3u8Header, logerror, codecsFromString, roundToThreeDecimals } = require('./util.js');
+const {
+  applyFilter,
+  cloudWatchLog,
+  m3u8Header,
+  logerror,
+  codecsFromString,
+  roundToThreeDecimals
+} = require('./util.js');
 const ChaosMonkey = require('./chaos_monkey.js');
 
 const EVENT_LIST_LIMIT = 100;
@@ -281,7 +288,7 @@ class Session {
                 numberOfLargeTicks++;
               }
             } else {
-              console.warn(`[${this._sessionId}]: Playhead tick interval went over Max tick interval by ${changeMaxTick}ms.
+              debug(`[${this._sessionId}]: Playhead tick interval went over Max tick interval by ${changeMaxTick}ms.
               If the value keeps increasing, consider increasing the 'maxTickInterval' in engineOptions`);
             }
             tickInterval = this.maxTickInterval / 1000;
@@ -1301,11 +1308,8 @@ class Session {
             await loadPromise;
             cloudWatchLog(!this.cloudWatchLogging, 'engine-session',
               { event: 'loadVod', channel: this._sessionId, loadTimeMs: Date.now() - loadStart });
-            debug(`[${this._sessionId}]: first VOD loaded`);
-            debug(`[${this._sessionId}]: ${currentVod.getDeltaTimes()}`);
-            debug(`[${this._sessionId}]: playhead positions [V]=${currentVod.getPlayheadPositions("video")}`);
-            debug(`[${this._sessionId}]: playhead positions [A]=${currentVod.getPlayheadPositions("audio")}`);
-            debug(`[${this._sessionId}]: playhead positions [S]=${currentVod.getPlayheadPositions("subtitle")}`);
+            debug(`[${this._sessionId}]: first VOD loaded. DeltaTimes ${currentVod.getDeltaTimes().map(roundToThreeDecimals).join(",")}`);
+            this._logAllPlayheadPositions(this._sessionId, currentVod);
             //debug(newVod);
             const updatedSessionState = await this._sessionState.setValues({
               "mediaSeq": 0,
@@ -1505,10 +1509,8 @@ class Session {
             cloudWatchLog(!this.cloudWatchLogging, 'engine-session',
               { event: 'loadVod', channel: this._sessionId, loadTimeMs: Date.now() - loadStart });
             this.leaderIsSettingNextVod = true;
-            debug(`[${this._sessionId}]: next VOD loaded (${newVod.getDeltaTimes()})`);
-            debug(`[${this._sessionId}]: playhead positions [V]=${newVod.getPlayheadPositions("video")}`);
-            debug(`[${this._sessionId}]: playhead positions [A]=${newVod.getPlayheadPositions("audio")}`);
-            debug(`[${this._sessionId}]: playhead positions [S]=${newVod.getPlayheadPositions("subtitle")}`);
+            debug(`[${this._sessionId}]: next VOD loaded (${newVod.getDeltaTimes().map(roundToThreeDecimals).join(",")})`);
+            this._logAllPlayheadPositions(this._sessionId, newVod);
             currentVod = newVod;
             debug(`[${this._sessionId}]: msequences=${currentVod.getLiveMediaSequencesCount()}; audio msequences=${currentVod.getLiveMediaSequencesCount("audio")}; subtitle msequences=${currentVod.getLiveMediaSequencesCount("subtitle")}`);
             sessionState.currentVod = await this._sessionState.setCurrentVod(currentVod, { ttl: currentVod.getDuration() * 1000 });
@@ -2372,6 +2374,24 @@ class Session {
       logerror(this._sessionId, err);
     }
   }
+
+  _logAllPlayheadPositions = (sessionId, vod) => {
+  if (!vod) {
+    return;
+  }
+  if (!vod.getPlayheadPositions) {
+    return;
+  }
+  if (vod.getPlayheadPositions("video")) {
+    debug(`[${sessionId}]: playhead positions [V]=${vod.getPlayheadPositions("video").map(roundToThreeDecimals).join(",")}`);
+  }
+  if (vod.getPlayheadPositions("audio")) {
+    debug(`[${sessionId}]: playhead positions [A]=${vod.getPlayheadPositions("audio").map(roundToThreeDecimals).join(",")}`);
+  }
+  if (vod.getPlayheadPositions("subtitle")) {
+    debug(`[${sessionId}]: playhead positions [S]=${vod.getPlayheadPositions("subtitle").map(roundToThreeDecimals).join(",")}`);
+  }
+  };
 }
 
 module.exports = Session;

package/engine/util.js

@@ -257,6 +257,14 @@ const timeLeft = (endTimestamp, currentTimestamp) => {
 };
 
 const roundToThreeDecimals = (number) => {
+  if (typeof number !== "number") {
+    try {
+      number = parseFloat(number);
+    } catch (e) {
+      console.error("Could not convert to number:", number);
+      return number;
+    }
+  }
   const r = Math.round(number * 1000) / 1000;
   return r
 }

package/examples/livemix-demux.ts

@@ -12,9 +12,9 @@ import { ChannelEngine, ChannelEngineOpts,
   const DEMUX_CONTENT = {
     TS: {
       slate: "https://testcontent.eyevinn.technology/ce_test_content/DEMUX_VINJETTE_TS_001/master.m3u8",
-      vod: "https://testcontent.eyevinn.technology/ce_test_content/DEMUX_VOD_TS_001/master.m3u8", // Elephant's Dream 11 min 
-      trailer: "https://testcontent.eyevinn.technology/ce_test_content/DEMUX_TRAILER_TS_001/index.m3u8",
-      bumper:  "https://testcontent.eyevinn.technology/ce_test_content/DEMUX_VINJETTE_TS_001/master.m3u8",
+      vod: "https://maitv-vod.lab.eyevinn.technology/VINN.mp4/master_demux.m3u8",
+      trailer: "https://maitv-vod.lab.eyevinn.technology/ads/apotea-15s.mp4/master_demux.m3u8",
+      bumper: "https://testcontent.eyevinn.technology/ce_test_content/DEMUX_VINJETTE_TS_001/master.m3u8",
       // If you do not have a demux live stream available, you can always use a local CE V2L stream (ex: demux.ts) 
       live: null
     },
@@ -28,7 +28,7 @@ import { ChannelEngine, ChannelEngineOpts,
     }
   };
   
-  const HLS_CONTENT = DEMUX_CONTENT.CMAF;
+  const HLS_CONTENT = DEMUX_CONTENT.TS;
 
   let FIRST_PLAYED_VOD = true;
   
@@ -98,13 +98,13 @@ import { ChannelEngine, ChannelEngineOpts,
             };
             resolve(vodResponse);
           } else {
-            FIRST_PLAYED_VOD = false;
             const vodResponse = {
               id: vod.id,
               title: vod.title,
               uri:  vod.uri,
               unixTs: unixTs
             };
+            FIRST_PLAYED_VOD = false;
             resolve(vodResponse);
           }
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "5.0.0",
+  "version": "5.0.3",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,8 +30,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.1",
-    "@eyevinn/hls-truncate": "^0.3.1",
-    "@eyevinn/hls-vodtolive": "^4.1.5",
+    "@eyevinn/hls-truncate": "^0.3.3",
+    "@eyevinn/hls-vodtolive": "^4.1.7",
     "@eyevinn/m3u8": "^0.5.6",
     "@fastify/static": "^5.0.0",
     "abort-controller": "^3.0.0",