eyevinn-channel-engine 4.3.5 → 4.3.7

package/dist/engine/preflight.d.ts

@@ -0,0 +1 @@
+export function handler(req: any, res: any, next: any): any;

package/dist/engine/preflight.js

@@ -0,0 +1,43 @@
+var constants = {
+    ALLOW_HEADERS: [
+        'accept',
+        'accept-version',
+        'content-type',
+        'request-id',
+        'origin',
+        'x-api-version',
+        'x-request-id',
+        'x-requested-with'
+    ],
+    EXPOSE_HEADERS: [
+        'api-version',
+        'content-length',
+        'content-md5',
+        'content-type',
+        'date',
+        'request-id',
+        'response-time'
+    ],
+    AC_REQ_METHOD: 'access-control-request-method',
+    AC_REQ_HEADERS: 'access-control-request-headers',
+    AC_ALLOW_CREDS: 'access-control-allow-credentials',
+    AC_ALLOW_ORIGIN: 'access-control-allow-origin',
+    AC_ALLOW_HEADERS: 'access-control-allow-headers',
+    AC_ALLOW_METHODS: 'access-control-allow-methods',
+    AC_EXPOSE_HEADERS: 'access-control-expose-headers',
+    AC_MAX_AGE: 'access-control-max-age',
+    STR_VARY: 'vary',
+    STR_ORIGIN: 'origin',
+    HTTP_NO_CONTENT: 204
+};
+exports.handler = function (req, res, next) {
+    if (req.method !== 'OPTIONS')
+        return next();
+    res.once('header', function () {
+        res.header(constants.AC_ALLOW_ORIGIN, '*');
+        res.header(constants.AC_ALLOW_CREDS, true);
+        res.header(constants.AC_ALLOW_METHODS, ['GET', 'OPTIONS']);
+        res.header(constants.AC_ALLOW_HEADERS, ['x-health-key']);
+    });
+    res.send(constants.HTTP_NO_CONTENT);
+};

package/dist/engine/server.d.ts

@@ -32,6 +32,8 @@ export interface ChannelEngineOpts {
     autoCreateSession?: boolean;
     sessionResetKey?: string;
     keepAliveTimeout?: number;
+    sessionEventStream?: boolean;
+    sessionHealthKey?: string;
 }
 export interface VodRequest {
     sessionId: string;
@@ -151,6 +153,8 @@ export declare class ChannelEngine {
     private adXchangeUri?;
     private autoCreateSession;
     private sessionResetKey;
+    private sessionEventStream;
+    private sessionHealthKey;
     constructor(assetMgr: IAssetManager, options?: ChannelEngineOpts);
     updateStreamSwitchAsync(): Promise<void>;
     updateChannelsAsync(channelMgr: any, options: any): Promise<void>;

package/dist/engine/server.js

@@ -52,6 +52,7 @@ var SessionStateStore = require('./session_state.js').SessionStateStore;
 var SessionLiveStateStore = require('./session_live_state.js').SessionLiveStateStore;
 var PlayheadStateStore = require('./playhead_state.js').PlayheadStateStore;
 var _a = require('./util.js'), filterQueryParser = _a.filterQueryParser, toHHMMSS = _a.toHHMMSS, WaitTimeGenerator = _a.WaitTimeGenerator;
+var preflight = require('./preflight.js');
 var version = require('../package.json').version;
 var AUTO_CREATE_CHANNEL_TIMEOUT = 3000;
 var sessions = {}; // Should be a persistent store...
@@ -72,6 +73,8 @@ var ChannelEngine = /** @class */ (function () {
         var _this = this;
         this.autoCreateSession = false;
         this.sessionResetKey = "";
+        this.sessionEventStream = false;
+        this.sessionHealthKey = "";
         this.options = options;
         if (options && options.adCopyMgrUri) {
             this.adCopyMgrUri = options.adCopyMgrUri;
@@ -91,6 +94,9 @@ var ChannelEngine = /** @class */ (function () {
         if (options && options.sessionResetKey) {
             this.sessionResetKey = options.sessionResetKey;
         }
+        if (options && options.sessionHealthKey) {
+            this.sessionHealthKey = options.sessionHealthKey;
+        }
         this.alwaysNewSegments = false;
         if (options && options.alwaysNewSegments) {
             this.alwaysNewSegments = true;
@@ -121,7 +127,6 @@ var ChannelEngine = /** @class */ (function () {
             this.server.server.keepAliveTimeout = options.keepAliveTimeout;
             this.server.server.headersTimeout = options.keepAliveTimeout + 1000;
         }
-        console.log(this.server);
         this.server.use(restify.plugins.queryParser());
         this.serverStartTime = Date.now();
         this.instanceId = uuidv4();
@@ -245,30 +250,7 @@ var ChannelEngine = /** @class */ (function () {
                 }
             });
         }); });
-        this.server.opts('/live/:file', function (req, res, next) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                res.sendRaw(204, "", {
-                    headers: {
-                        "Access-Control-Allow-Origin": "*",
-                        "Access-Control-Allow-Methods": "GET, OPTIONS",
-                    },
-                });
-                next();
-                return [2 /*return*/];
-            });
-        }); });
-        this.server.opts('/channels/:channelId/:file', function (req, res, next) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                res.sendRaw(204, "", {
-                    headers: {
-                        "Access-Control-Allow-Origin": "*",
-                        "Access-Control-Allow-Methods": "GET, OPTIONS",
-                    },
-                });
-                next();
-                return [2 /*return*/];
-            });
-        }); });
+        this.server.pre(preflight.handler);
         this.server.get('/eventstream/:sessionId', this._handleEventStream.bind(this));
         this.server.get('/status/:sessionId', this._handleStatus.bind(this));
         this.server.get('/health', this._handleAggregatedSessionHealth.bind(this));
@@ -474,6 +456,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,
@@ -1202,6 +1185,15 @@ var ChannelEngine = /** @class */ (function () {
                 switch (_b.label) {
                     case 0:
                         debug("req.url=".concat(req.url));
+                        if (this.sessionHealthKey && this.sessionHealthKey !== req.headers['x-health-key']) {
+                            res.sendRaw(403, JSON.stringify({ "message": "Invalid Session-Health-Key" }), {
+                                "Content-Type": "application/json",
+                                "Access-Control-Allow-Origin": "*",
+                                "Cache-Control": "no-cache",
+                            });
+                            next();
+                            return [2 /*return*/];
+                        }
                         failingSessions = [];
                         endpoints = [];
                         _i = 0, _a = Object.keys(sessions);

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,7 +94,8 @@ 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
+    keepAliveTimeout: process.env.KEEP_ALIVE_TIMEOUT ? parseInt(process.env.KEEP_ALIVE_TIMEOUT) * 1000 : undefined,
+    sessionHealthKey: 'eyevinn'
 };
 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.5",
+  "version": "4.3.7",
   "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/preflight.js

@@ -0,0 +1,44 @@
+const constants = {
+  ALLOW_HEADERS: [
+    'accept',
+    'accept-version',
+    'content-type',
+    'request-id',
+    'origin',
+    'x-api-version',
+    'x-request-id',
+    'x-requested-with'
+  ],
+  EXPOSE_HEADERS: [
+    'api-version',
+    'content-length',
+    'content-md5',
+    'content-type',
+    'date',
+    'request-id',
+    'response-time'
+  ],
+  AC_REQ_METHOD: 'access-control-request-method',
+  AC_REQ_HEADERS: 'access-control-request-headers',
+  AC_ALLOW_CREDS: 'access-control-allow-credentials',
+  AC_ALLOW_ORIGIN: 'access-control-allow-origin',
+  AC_ALLOW_HEADERS: 'access-control-allow-headers',
+  AC_ALLOW_METHODS: 'access-control-allow-methods',
+  AC_EXPOSE_HEADERS: 'access-control-expose-headers',
+  AC_MAX_AGE: 'access-control-max-age',
+  STR_VARY: 'vary',
+  STR_ORIGIN: 'origin',
+  HTTP_NO_CONTENT: 204
+}
+
+exports.handler = function (req, res, next) {
+  if (req.method !== 'OPTIONS') return next();
+  res.once('header', function () {
+    res.header(constants.AC_ALLOW_ORIGIN, '*');
+    res.header(constants.AC_ALLOW_CREDS, true);
+    res.header(constants.AC_ALLOW_METHODS, ['GET', 'OPTIONS']);
+    res.header(constants.AC_ALLOW_HEADERS, ['x-health-key']);
+  });
+
+  res.send(constants.HTTP_NO_CONTENT);
+}

package/engine/server.ts

@@ -15,6 +15,8 @@ const { SessionLiveStateStore } = require('./session_live_state.js');
 const { PlayheadStateStore } = require('./playhead_state.js');
 
 const { filterQueryParser, toHHMMSS, WaitTimeGenerator } = require('./util.js');
+const preflight = require('./preflight.js');
+
 const { version } = require('../package.json');
 
 const AUTO_CREATE_CHANNEL_TIMEOUT = 3000;
@@ -61,6 +63,8 @@ export interface ChannelEngineOpts {
   autoCreateSession?: boolean;
   sessionResetKey?: string;
   keepAliveTimeout?: number;
+  sessionEventStream?: boolean;
+  sessionHealthKey?: string;
 }
 
 interface StreamerOpts {
@@ -207,6 +211,8 @@ export class ChannelEngine {
   private adXchangeUri?: string;
   private autoCreateSession: boolean = false;
   private sessionResetKey: string = "";
+  private sessionEventStream: boolean = false;
+  private sessionHealthKey: string = "";
   
   constructor(assetMgr: IAssetManager, options?: ChannelEngineOpts) {
     this.options = options;
@@ -230,6 +236,9 @@ export class ChannelEngine {
     if (options && options.sessionResetKey) {
       this.sessionResetKey = options.sessionResetKey;
     }
+    if (options && options.sessionHealthKey) {
+      this.sessionHealthKey = options.sessionHealthKey;
+    }
     this.alwaysNewSegments = false;
     if (options && options.alwaysNewSegments) {
       this.alwaysNewSegments = true;
@@ -260,7 +269,6 @@ export class ChannelEngine {
       this.server.server.keepAliveTimeout = options.keepAliveTimeout;
       this.server.server.headersTimeout = options.keepAliveTimeout + 1000;  
     }
-    console.log(this.server);
     this.server.use(restify.plugins.queryParser());
     this.serverStartTime = Date.now();
     this.instanceId = uuidv4();
@@ -352,25 +360,8 @@ export class ChannelEngine {
     this.server.get('/channels/:channelId/:file', async (req, res, next) => {
       req.query['channel'] = req.params.channelId;
       await handleMasterRoute(req, res, next);
-    });   
-    this.server.opts('/live/:file', async (req, res, next) => {
-      res.sendRaw(204, "", {
-        headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "GET, OPTIONS",
-        },
-      });
-      next();
-    });
-    this.server.opts('/channels/:channelId/:file', async (req, res, next) => {
-      res.sendRaw(204, "", {
-        headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "GET, OPTIONS",
-        },
-      });
-      next();
     });
+    this.server.pre(preflight.handler);
     this.server.get('/eventstream/:sessionId', this._handleEventStream.bind(this));
     this.server.get('/status/:sessionId', this._handleStatus.bind(this));
     this.server.get('/health', this._handleAggregatedSessionHealth.bind(this));
@@ -498,6 +489,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({
@@ -955,6 +947,16 @@ export class ChannelEngine {
 
   async _handleAggregatedSessionHealth(req, res, next) {
     debug(`req.url=${req.url}`);
+    if (this.sessionHealthKey && this.sessionHealthKey !== req.headers['x-health-key']) {
+      res.sendRaw(403, JSON.stringify({ "message": "Invalid Session-Health-Key" }),
+      {
+        "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": "*",
+        "Cache-Control": "no-cache",
+      });
+      next();
+      return;
+    }
     let failingSessions = [];
     let endpoints = [];
     for (const sessionId of Object.keys(sessions)) {

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,7 +106,8 @@ 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
+  keepAliveTimeout: process.env.KEEP_ALIVE_TIMEOUT ? parseInt(process.env.KEEP_ALIVE_TIMEOUT) * 1000: undefined,
+  sessionHealthKey: 'eyevinn'
 };
 
 const engine = new ChannelEngine(refAssetManager, engineOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.3.5",
+  "version": "4.3.7",
   "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",