eyevinn-channel-engine 4.3.4 → 4.3.6

package/dist/engine/server.d.ts

@@ -16,6 +16,7 @@ export interface ChannelEngineOpts {
     dummySubtitleEndpoint?: string;
     subtitleSliceEndpoint?: string;
     useVTTSubtitles?: boolean;
+    vttBasePath?: string;
     alwaysNewSegments?: boolean;
     partialStoreHLSVod?: boolean;
     alwaysMapBandwidthByNearest?: boolean;
@@ -30,6 +31,8 @@ export interface ChannelEngineOpts {
     volatileKeyTTL?: number;
     autoCreateSession?: boolean;
     sessionResetKey?: string;
+    keepAliveTimeout?: number;
+    sessionEventStream?: boolean;
 }
 export interface VodRequest {
     sessionId: string;
@@ -149,6 +152,7 @@ export declare class ChannelEngine {
     private adXchangeUri?;
     private autoCreateSession;
     private sessionResetKey;
+    private sessionEventStream;
     constructor(assetMgr: IAssetManager, options?: ChannelEngineOpts);
     updateStreamSwitchAsync(): Promise<void>;
     updateChannelsAsync(channelMgr: any, options: any): Promise<void>;

package/dist/engine/server.js

@@ -59,8 +59,8 @@ var sessionsLive = {}; // Should be a persistent store...
 var sessionSwitchers = {}; // Should be a persistent store...
 var switcherStatus = {}; // Should be a persistent store...
 var eventStreams = {};
-var DefaultDummySubtitleEndpointPath = "/vtt/dummyUrl";
-var DefaultSubtitleSpliceEndpointPath = "/vtt/sliceUrl";
+var DefaultDummySubtitleEndpointPath = "/dummyUrl";
+var DefaultSubtitleSpliceEndpointPath = "/sliceUrl";
 var ScheduleStreamType;
 (function (ScheduleStreamType) {
     ScheduleStreamType[ScheduleStreamType["LIVE"] = 1] = "LIVE";
@@ -72,6 +72,7 @@ var ChannelEngine = /** @class */ (function () {
         var _this = this;
         this.autoCreateSession = false;
         this.sessionResetKey = "";
+        this.sessionEventStream = false;
         this.options = options;
         if (options && options.adCopyMgrUri) {
             this.adCopyMgrUri = options.adCopyMgrUri;
@@ -84,8 +85,9 @@ var ChannelEngine = /** @class */ (function () {
             this.useDemuxedAudio = true;
         }
         this.useVTTSubtitles = (options && options.useVTTSubtitles) ? options.useVTTSubtitles : false;
-        this.dummySubtitleEndpoint = (options && options.dummySubtitleEndpoint) ? options.dummySubtitleEndpoint : DefaultDummySubtitleEndpointPath;
-        this.subtitleSliceEndpoint = (options && options.subtitleSliceEndpoint) ? options.subtitleSliceEndpoint : DefaultSubtitleSpliceEndpointPath;
+        var vttBasePath = (options && options.vttBasePath) ? options.vttBasePath : '/vtt';
+        this.dummySubtitleEndpoint = (options && options.dummySubtitleEndpoint) ? options.dummySubtitleEndpoint : vttBasePath + DefaultDummySubtitleEndpointPath;
+        this.subtitleSliceEndpoint = (options && options.subtitleSliceEndpoint) ? options.subtitleSliceEndpoint : vttBasePath + DefaultSubtitleSpliceEndpointPath;
         this.sessionResetKey = "";
         if (options && options.sessionResetKey) {
             this.sessionResetKey = options.sessionResetKey;
@@ -116,6 +118,10 @@ var ChannelEngine = /** @class */ (function () {
         this.assetMgr = assetMgr;
         this.monitorTimer = {};
         this.server = restify.createServer();
+        if (options && options.keepAliveTimeout) {
+            this.server.server.keepAliveTimeout = options.keepAliveTimeout;
+            this.server.server.headersTimeout = options.keepAliveTimeout + 1000;
+        }
         this.server.use(restify.plugins.queryParser());
         this.serverStartTime = Date.now();
         this.instanceId = uuidv4();
@@ -269,8 +275,8 @@ var ChannelEngine = /** @class */ (function () {
         this.server.get('/health/:sessionId', this._handleSessionHealth.bind(this));
         this.server.get('/reset', this._handleSessionsReset.bind(this));
         this.server.get('/reset/:sessionId', this._handleSessionReset.bind(this));
-        this.server.get(DefaultDummySubtitleEndpointPath, this._handleDummySubtitleEndpoint.bind(this));
-        this.server.get(DefaultSubtitleSpliceEndpointPath, this._handleSubtitleSliceEndpoint.bind(this));
+        this.server.get(vttBasePath + DefaultDummySubtitleEndpointPath, this._handleDummySubtitleEndpoint.bind(this));
+        this.server.get(vttBasePath + DefaultSubtitleSpliceEndpointPath, this._handleSubtitleSliceEndpoint.bind(this));
         this.server.on('NotFound', function (req, res, err, next) {
             res.header("X-Instance-Id", _this.instanceId + "<".concat(version, ">"));
             return next();
@@ -468,6 +474,7 @@ var ChannelEngine = /** @class */ (function () {
                                             slateRepetitions: channel.slate && channel.slate.repetitions ? channel.slate.repetitions : this.slateRepetitions,
                                             slateDuration: channel.slate && channel.slate.duration ? channel.slate.duration : this.slateDuration,
                                             cloudWatchMetrics: this.logCloudWatchMetrics,
+                                            sessionEventStream: options.sessionEventStream
                                         }, this.sessionStore);
                                         sessionsLive[channel.id] = new SessionLive({
                                             sessionId: channel.id,

package/dist/engine/session.d.ts

@@ -59,6 +59,7 @@ declare class Session {
     _subtitleTracks: any;
     _closedCaptions: any;
     _noSessionDataTags: any;
+    _sessionEventStream: any;
     slateUri: any;
     slateRepetitions: any;
     slateDuration: any;

package/dist/engine/session.js

@@ -56,6 +56,7 @@ var SessionState = require('./session_state.js').SessionState;
 var PlayheadState = require('./playhead_state.js').PlayheadState;
 var _a = require('./util.js'), applyFilter = _a.applyFilter, cloudWatchLog = _a.cloudWatchLog, m3u8Header = _a.m3u8Header, logerror = _a.logerror, codecsFromString = _a.codecsFromString;
 var ChaosMonkey = require('./chaos_monkey.js');
+var EVENT_LIST_LIMIT = 100;
 var AVERAGE_SEGMENT_DURATION = 3000;
 var DEFAULT_PLAYHEAD_DIFF_THRESHOLD = 1000;
 var DEFAULT_MAX_TICK_INTERVAL = 10000;
@@ -164,6 +165,9 @@ var Session = /** @class */ (function () {
             if (config.noSessionDataTags) {
                 this._noSessionDataTags = config.noSessionDataTags;
             }
+            if (config.sessionEventStream) {
+                this._sessionEventStream = config.sessionEventStream;
+            }
             if (config.slateUri) {
                 this.slateUri = config.slateUri;
                 this.slateRepetitions = config.slateRepetitions || 10;
@@ -1687,7 +1691,12 @@ var Session = /** @class */ (function () {
         return this._events.shift();
     };
     Session.prototype.produceEvent = function (event) {
-        this._events.push(event);
+        if (this._sessionEventStream) {
+            this._events.push(event);
+            if (this._events.length > EVENT_LIST_LIMIT) {
+                this.consumeEvent();
+            }
+        }
     };
     Session.prototype.hasPlayhead = function () {
         return !this.disabledPlayhead;

package/dist/examples/default.js

@@ -94,6 +94,7 @@ var engineOptions = {
     defaultSlateUri: "https://maitv-vod.lab.eyevinn.technology/slate-consuo.mp4/master.m3u8",
     slateRepetitions: 10,
     redisUrl: process.env.REDIS_URL,
+    keepAliveTimeout: process.env.KEEP_ALIVE_TIMEOUT ? parseInt(process.env.KEEP_ALIVE_TIMEOUT) * 1000 : undefined
 };
 var engine = new index_1.ChannelEngine(refAssetManager, engineOptions);
 engine.start();

package/dist/examples/demux.js

@@ -100,7 +100,8 @@ var engineOptions = {
     redisUrl: process.env.REDIS_URL,
     useDemuxedAudio: true,
     alwaysNewSegments: false,
-    useVTTSubtitles: true
+    useVTTSubtitles: true,
+    vttBasePath: '/subtitles'
 };
 var engine = new index_1.ChannelEngine(refAssetManager, engineOptions);
 engine.start();

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.3.4",
+  "version": "4.3.6",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.0",
     "@eyevinn/hls-truncate": "^0.3.0",
-    "@eyevinn/hls-vodtolive": "^4.0.1",
+    "@eyevinn/hls-vodtolive": "^4.1.0",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",

package/engine/server.ts

@@ -24,8 +24,8 @@ const sessionsLive = {}; // Should be a persistent store...
 const sessionSwitchers = {}; // Should be a persistent store...
 const switcherStatus = {}; // Should be a persistent store...
 const eventStreams = {};
-const DefaultDummySubtitleEndpointPath = "/vtt/dummyUrl"
-const DefaultSubtitleSpliceEndpointPath = "/vtt/sliceUrl"
+const DefaultDummySubtitleEndpointPath = "/dummyUrl"
+const DefaultSubtitleSpliceEndpointPath = "/sliceUrl"
 
 export interface ChannelEngineOpts {
   defaultSlateUri?: string;
@@ -45,6 +45,7 @@ export interface ChannelEngineOpts {
   dummySubtitleEndpoint?: string;
   subtitleSliceEndpoint?: string;
   useVTTSubtitles?: boolean;
+  vttBasePath?: string;
   alwaysNewSegments?: boolean;
   partialStoreHLSVod?: boolean;
   alwaysMapBandwidthByNearest?: boolean;
@@ -58,7 +59,9 @@ export interface ChannelEngineOpts {
   noSessionDataTags?: boolean;
   volatileKeyTTL?: number;
   autoCreateSession?: boolean;
-  sessionResetKey?:string;
+  sessionResetKey?: string;
+  keepAliveTimeout?: number;
+  sessionEventStream?: boolean;
 }
 
 interface StreamerOpts {
@@ -205,6 +208,7 @@ export class ChannelEngine {
   private adXchangeUri?: string;
   private autoCreateSession: boolean = false;
   private sessionResetKey: string = "";
+  private sessionEventStream: boolean = false;
   
   constructor(assetMgr: IAssetManager, options?: ChannelEngineOpts) {
     this.options = options;
@@ -220,8 +224,9 @@ export class ChannelEngine {
     }
 
     this.useVTTSubtitles = (options && options.useVTTSubtitles) ? options.useVTTSubtitles : false ;
-    this.dummySubtitleEndpoint = (options && options.dummySubtitleEndpoint) ? options.dummySubtitleEndpoint : DefaultDummySubtitleEndpointPath;
-    this.subtitleSliceEndpoint = (options && options.subtitleSliceEndpoint) ? options.subtitleSliceEndpoint : DefaultSubtitleSpliceEndpointPath;
+    const vttBasePath = (options && options.vttBasePath) ? options.vttBasePath : '/vtt';
+    this.dummySubtitleEndpoint = (options && options.dummySubtitleEndpoint) ? options.dummySubtitleEndpoint : vttBasePath + DefaultDummySubtitleEndpointPath;
+    this.subtitleSliceEndpoint = (options && options.subtitleSliceEndpoint) ? options.subtitleSliceEndpoint : vttBasePath + DefaultSubtitleSpliceEndpointPath;
 
     this.sessionResetKey = "";
     if (options && options.sessionResetKey) {
@@ -253,6 +258,10 @@ export class ChannelEngine {
     this.assetMgr = assetMgr;
     this.monitorTimer = {};
     this.server = restify.createServer();
+    if (options && options.keepAliveTimeout) {
+      this.server.server.keepAliveTimeout = options.keepAliveTimeout;
+      this.server.server.headersTimeout = options.keepAliveTimeout + 1000;  
+    }
     this.server.use(restify.plugins.queryParser());
     this.serverStartTime = Date.now();
     this.instanceId = uuidv4();
@@ -369,8 +378,8 @@ export class ChannelEngine {
     this.server.get('/health/:sessionId', this._handleSessionHealth.bind(this));
     this.server.get('/reset', this._handleSessionsReset.bind(this));
     this.server.get('/reset/:sessionId', this._handleSessionReset.bind(this));
-    this.server.get(DefaultDummySubtitleEndpointPath, this._handleDummySubtitleEndpoint.bind(this));
-    this.server.get(DefaultSubtitleSpliceEndpointPath, this._handleSubtitleSliceEndpoint.bind(this));
+    this.server.get(vttBasePath + DefaultDummySubtitleEndpointPath, this._handleDummySubtitleEndpoint.bind(this));
+    this.server.get(vttBasePath + DefaultSubtitleSpliceEndpointPath, this._handleSubtitleSliceEndpoint.bind(this));
 
     this.server.on('NotFound', (req, res, err, next) => {
       res.header("X-Instance-Id", this.instanceId + `<${version}>`);
@@ -490,6 +499,7 @@ export class ChannelEngine {
         slateRepetitions: channel.slate && channel.slate.repetitions ? channel.slate.repetitions : this.slateRepetitions,
         slateDuration: channel.slate && channel.slate.duration ? channel.slate.duration : this.slateDuration,
         cloudWatchMetrics: this.logCloudWatchMetrics,
+        sessionEventStream: options.sessionEventStream
       }, this.sessionStore);
 
       sessionsLive[channel.id] = new SessionLive({

package/engine/session.js

@@ -12,6 +12,7 @@ const { PlayheadState } = require('./playhead_state.js');
 const { applyFilter, cloudWatchLog, m3u8Header, logerror, codecsFromString } = require('./util.js');
 const ChaosMonkey = require('./chaos_monkey.js');
 
+const EVENT_LIST_LIMIT = 100;
 const AVERAGE_SEGMENT_DURATION = 3000;
 const DEFAULT_PLAYHEAD_DIFF_THRESHOLD = 1000;
 const DEFAULT_MAX_TICK_INTERVAL = 10000;
@@ -128,6 +129,9 @@ class Session {
       if (config.noSessionDataTags) {
         this._noSessionDataTags = config.noSessionDataTags;
       }
+      if (config.sessionEventStream) {
+        this._sessionEventStream = config.sessionEventStream;
+      }
       if (config.slateUri) {
         this.slateUri = config.slateUri;
         this.slateRepetitions = config.slateRepetitions || 10;
@@ -1246,7 +1250,12 @@ class Session {
   }
 
   produceEvent(event) {
-    this._events.push(event);
+  if (this._sessionEventStream) {
+      this._events.push(event);
+      if (this._events.length > EVENT_LIST_LIMIT) {
+        this.consumeEvent();
+      }
+    }
   }
 
   hasPlayhead() {

package/examples/default.ts

@@ -106,6 +106,7 @@ const engineOptions: ChannelEngineOpts = {
     "https://maitv-vod.lab.eyevinn.technology/slate-consuo.mp4/master.m3u8",
   slateRepetitions: 10,
   redisUrl: process.env.REDIS_URL,
+  keepAliveTimeout: process.env.KEEP_ALIVE_TIMEOUT ? parseInt(process.env.KEEP_ALIVE_TIMEOUT) * 1000: undefined
 };
 
 const engine = new ChannelEngine(refAssetManager, engineOptions);

package/examples/demux.ts

@@ -112,7 +112,8 @@ const engineOptions: ChannelEngineOpts = {
   redisUrl: process.env.REDIS_URL,
   useDemuxedAudio: true,
   alwaysNewSegments: false,
-  useVTTSubtitles: true
+  useVTTSubtitles: true,
+  vttBasePath: '/subtitles'
 };
 
 const engine = new ChannelEngine(refAssetManager, engineOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.3.4",
+  "version": "4.3.6",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.0",
     "@eyevinn/hls-truncate": "^0.3.0",
-    "@eyevinn/hls-vodtolive": "^4.0.1",
+    "@eyevinn/hls-vodtolive": "^4.1.0",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",