eyevinn-channel-engine 4.3.3 → 4.3.5

package/dist/engine/redis_state_store.js

@@ -36,7 +36,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var Redis = require("ioredis");
 var debug = require("debug")("redis-state-store");
+var cloudWatchLog = require("./util.js").cloudWatchLog;
 var DEFAULT_VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
+function isTrue(s) {
+    var regex = /^\s*(true|1)\s*$/i;
+    return regex.test(s);
+}
+var REDIS_VERBOSE_LOG = process.env.REDIS_VERBOSE_LOG ? isTrue(process.env.REDIS_VERBOSE_LOG) : false;
 var RedisStateStore = /** @class */ (function () {
     function RedisStateStore(keyPrefix, opts) {
         this.keyPrefix = keyPrefix;
@@ -135,12 +141,13 @@ var RedisStateStore = /** @class */ (function () {
     };
     RedisStateStore.prototype.getValues = function (id, keys) {
         return __awaiter(this, void 0, void 0, function () {
-            var pipeline, data, _loop_1, this_1, _i, keys_1, key;
+            var pipeline, data, startMs, _loop_1, this_1, _i, keys_1, key, ops, ioTimeMs;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         pipeline = this.client.pipeline();
                         data = {};
+                        startMs = Date.now();
                         _loop_1 = function (key) {
                             var storeKey = "" + this_1.keyPrefix + id + key;
                             pipeline.get(storeKey, function (err, reply) {
@@ -160,9 +167,12 @@ var RedisStateStore = /** @class */ (function () {
                             key = keys_1[_i];
                             _loop_1(key);
                         }
+                        ops = pipeline.length;
                         return [4 /*yield*/, pipeline.exec()];
                     case 1:
                         _a.sent();
+                        ioTimeMs = Date.now() - startMs;
+                        cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', { event: 'getValues', operations: ops, ioTimeMs: ioTimeMs });
                         return [2 /*return*/, data];
                 }
             });
@@ -189,6 +199,7 @@ var RedisStateStore = /** @class */ (function () {
                                     catch (err) {
                                         console.error("REDIS get: Failed to parse ".concat(storeKey, " data: '").concat(reply, "'"));
                                     }
+                                    cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', { event: 'get', operations: 1, ioTimeMs: ioTimeMs });
                                     resolve(data_1);
                                 }
                                 else {
@@ -206,11 +217,12 @@ var RedisStateStore = /** @class */ (function () {
     };
     RedisStateStore.prototype.setValues = function (id, data) {
         return __awaiter(this, void 0, void 0, function () {
-            var returnData, pipeline, _loop_2, this_2, _i, _a, key;
+            var returnData, startMs, pipeline, _loop_2, this_2, _i, _a, key, ops, ioTimeMs;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         returnData = {};
+                        startMs = Date.now();
                         pipeline = this.client.pipeline();
                         _loop_2 = function (key) {
                             var storeKey = "" + this_2.keyPrefix + id + key;
@@ -227,9 +239,12 @@ var RedisStateStore = /** @class */ (function () {
                             key = _a[_i];
                             _loop_2(key);
                         }
+                        ops = pipeline.length;
                         return [4 /*yield*/, pipeline.exec()];
                     case 1:
                         _b.sent();
+                        ioTimeMs = Date.now() - startMs;
+                        cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', { event: 'setValues', operations: ops, ioTimeMs: ioTimeMs });
                         return [2 /*return*/, returnData];
                 }
             });
@@ -249,6 +264,7 @@ var RedisStateStore = /** @class */ (function () {
                                 var ioTimeMs = Date.now() - startMs;
                                 debug("REDIS set ".concat(storeKey, ": ").concat(res, " (").concat(ioTimeMs, "ms) ").concat(ioTimeMs > 1000 ? "REDISSLOW!" : ""));
                                 if (!err) {
+                                    cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', { event: 'set', operations: 1, ioTimeMs: ioTimeMs });
                                     resolve(value);
                                 }
                                 else {
@@ -305,6 +321,7 @@ var RedisStateStore = /** @class */ (function () {
                                 var ioTimeMs = Date.now() - startMs;
                                 debug("REDIS remove ".concat(storeKey, ": (").concat(ioTimeMs, "ms) ").concat(ioTimeMs > 1000 ? "REDISSLOW!" : ""));
                                 if (!err) {
+                                    cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', { event: 'remove', operations: 1, ioTimeMs: ioTimeMs });
                                     resolve();
                                 }
                                 else {

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,7 @@ export interface ChannelEngineOpts {
     volatileKeyTTL?: number;
     autoCreateSession?: boolean;
     sessionResetKey?: string;
+    keepAliveTimeout?: number;
 }
 export interface VodRequest {
     sessionId: string;

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";
@@ -84,8 +84,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 +117,11 @@ 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;
+        }
+        console.log(this.server);
         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();

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.3",
+  "version": "4.3.5",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/engine/redis_state_store.js

@@ -1,8 +1,16 @@
 const Redis = require("ioredis");
 const debug = require("debug")("redis-state-store");
+const { cloudWatchLog } = require("./util.js");
 
 const DEFAULT_VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
 
+function isTrue(s) {
+  const regex = /^\s*(true|1)\s*$/i;
+  return regex.test(s);
+}
+
+const REDIS_VERBOSE_LOG = process.env.REDIS_VERBOSE_LOG ? isTrue(process.env.REDIS_VERBOSE_LOG) : false;
+
 class RedisStateStore {
   constructor(keyPrefix, opts) {
     this.keyPrefix = keyPrefix;
@@ -59,6 +67,7 @@ class RedisStateStore {
   async getValues(id, keys) {
     const pipeline = this.client.pipeline();
     let data = {};
+    const startMs = Date.now();
     for (const key of keys) {
       const storeKey = "" + this.keyPrefix + id + key;
       pipeline.get(storeKey, (err, reply) => {
@@ -72,7 +81,11 @@ class RedisStateStore {
         }
       });
     }
+    const ops = pipeline.length;
     await pipeline.exec();
+    const ioTimeMs = Date.now() - startMs;
+    cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', 
+      { event: 'getValues', operations: ops, ioTimeMs: ioTimeMs });
     return data;
   }
 
@@ -90,6 +103,8 @@ class RedisStateStore {
           } catch (err) {
             console.error(`REDIS get: Failed to parse ${storeKey} data: '${reply}'`);
           }
+          cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', 
+            { event: 'get', operations: 1, ioTimeMs: ioTimeMs });
           resolve(data);
         } else {
           reject(err);
@@ -102,6 +117,7 @@ class RedisStateStore {
 
   async setValues(id, data) {
     const returnData = {};
+    const startMs = Date.now();
     const pipeline = this.client.pipeline();
     for (const key of Object.keys(data)) {
       const storeKey = "" + this.keyPrefix + id + key;
@@ -113,7 +129,11 @@ class RedisStateStore {
         }
       });
     }
+    const ops = pipeline.length;
     await pipeline.exec();
+    const ioTimeMs = Date.now() - startMs;  
+    cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', 
+      { event: 'setValues', operations: ops, ioTimeMs: ioTimeMs });
     return returnData;
   }
 
@@ -125,6 +145,8 @@ class RedisStateStore {
         const ioTimeMs = Date.now() - startMs;
         debug(`REDIS set ${storeKey}: ${res} (${ioTimeMs}ms) ${ioTimeMs > 1000 ? "REDISSLOW!" : ""}`);
         if (!err) {
+          cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', 
+            { event: 'set', operations: 1, ioTimeMs: ioTimeMs });    
           resolve(value);
         } else {
           reject(err);
@@ -159,6 +181,8 @@ class RedisStateStore {
         const ioTimeMs = Date.now() - startMs;
         debug(`REDIS remove ${storeKey}: (${ioTimeMs}ms) ${ioTimeMs > 1000 ? "REDISSLOW!" : ""}`);
         if (!err) {
+          cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', 
+            { event: 'remove', operations: 1, ioTimeMs: ioTimeMs });    
           resolve();
         } else {
           reject(err);

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,8 @@ export interface ChannelEngineOpts {
   noSessionDataTags?: boolean;
   volatileKeyTTL?: number;
   autoCreateSession?: boolean;
-  sessionResetKey?:string;
+  sessionResetKey?: string;
+  keepAliveTimeout?: number;
 }
 
 interface StreamerOpts {
@@ -220,8 +222,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 +256,11 @@ 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;  
+    }
+    console.log(this.server);
     this.server.use(restify.plugins.queryParser());
     this.serverStartTime = Date.now();
     this.instanceId = uuidv4();
@@ -369,8 +377,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}>`);

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.3",
+  "version": "4.3.5",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",