eyevinn-channel-engine 4.0.8 → 4.0.9

package/dist/engine/redis_state_store.d.ts

@@ -2,6 +2,7 @@ export = RedisStateStore;
 declare class RedisStateStore {
     constructor(keyPrefix: any, opts: any);
     keyPrefix: any;
+    volatileKeyTTL: any;
     client: any;
     initAsync(id: any, initData: any): Promise<{}>;
     resetAsync(id: any, initData: any): Promise<void>;

package/dist/engine/redis_state_store.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var redis = require("redis");
 var debug = require("debug")("redis-state-store");
-var VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
+var DEFAULT_VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
 var RedisStateStore = /** @class */ (function () {
     function RedisStateStore(keyPrefix, opts) {
         this.keyPrefix = keyPrefix;
@@ -45,6 +45,11 @@ var RedisStateStore = /** @class */ (function () {
             this.keyPrefix = prependPrefix + this.keyPrefix;
             debug("Prepending keyprefix with ".concat(prependPrefix, " => ").concat(this.keyPrefix));
         }
+        this.volatileKeyTTL = DEFAULT_VOLATILE_KEY_TTL;
+        if (opts.volatileKeyTTL) {
+            debug("Overriding default, volatileKeyTTL=".concat(opts.volatileKeyTTL, "s"));
+            this.volatileKeyTTL = opts.volatileKeyTTL;
+        }
         this.client = redis.createClient(opts.redisUrl);
     }
     RedisStateStore.prototype.initAsync = function (id, initData) {
@@ -187,9 +192,9 @@ var RedisStateStore = /** @class */ (function () {
                         data = _a.sent();
                         storeKey = "" + this.keyPrefix + id + key;
                         expireAsync = new Promise(function (resolve, reject) {
-                            _this.client.expire(storeKey, VOLATILE_KEY_TTL, function (err, res) {
+                            _this.client.expire(storeKey, _this.volatileKeyTTL, function (err, res) {
                                 if (!err) {
-                                    debug("REDIS expire ".concat(storeKey, " ").concat(VOLATILE_KEY_TTL, "s: ").concat(res === 1 ? "OK" : "KEY DOES NOT EXIST"));
+                                    debug("REDIS expire ".concat(storeKey, " ").concat(_this.volatileKeyTTL, "s: ").concat(res === 1 ? "OK" : "KEY DOES NOT EXIST"));
                                     resolve();
                                 }
                                 else {

package/dist/engine/server.d.ts

@@ -22,6 +22,7 @@ export interface ChannelEngineOpts {
     adCopyMgrUri?: string;
     adXchangeUri?: string;
     noSessionDataTags?: boolean;
+    volatileKeyTTL?: number;
 }
 export interface VodRequest {
     sessionId: string;

package/dist/engine/server.js

@@ -101,11 +101,13 @@ var ChannelEngine = /** @class */ (function () {
                 redisUrl: options.redisUrl,
                 memcachedUrl: options.memcachedUrl,
                 cacheTTL: options.sharedStoreCacheTTL,
+                volatileKeyTTL: options.volatileKeyTTL,
             }),
             playheadStateStore: new PlayheadStateStore({
                 redisUrl: options.redisUrl,
                 memcachedUrl: options.memcachedUrl,
                 cacheTTL: options.sharedStoreCacheTTL,
+                volatileKeyTTL: options.volatileKeyTTL,
             }),
             instanceId: this.instanceId,
         };
@@ -114,6 +116,7 @@ var ChannelEngine = /** @class */ (function () {
                 redisUrl: options.redisUrl,
                 memcachedUrl: options.memcachedUrl,
                 cacheTTL: options.sharedStoreCacheTTL,
+                volatileKeyTTL: options.volatileKeyTTL,
             }),
             instanceId: this.instanceId,
         };

package/dist/engine/session.js

@@ -1031,6 +1031,7 @@ var Session = /** @class */ (function () {
                         index = 0;
                         audioSeqLastIdx = currentVod_1.getLiveMediaSequencesCount("audio") - 1;
                         thresh = 0.5;
+                        debug("[".concat(this._sessionId, "]: About to determine audio increment"));
                         _o.label = 19;
                     case 19: return [4 /*yield*/, this._getAudioPlayheadPosition(sessionState_1.vodMediaSeqAudio + index)];
                     case 20:
@@ -1058,6 +1059,7 @@ var Session = /** @class */ (function () {
                         audioIncrement = index;
                         _o.label = 23;
                     case 23:
+                        debug("[".concat(this._sessionId, "]: Will increment audio with ").concat(audioIncrement));
                         _d = sessionState;
                         return [4 /*yield*/, this._sessionState.increment("vodMediaSeqAudio", audioIncrement)];
                     case 24:
@@ -1636,7 +1638,8 @@ var Session = /** @class */ (function () {
                         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, "]: ").concat(currentVod.getPlayheadPositions()));
+                        debug("[".concat(this._sessionId, "]: playhead positions [V]=").concat(currentVod.getPlayheadPositions("video")));
+                        debug("[".concat(this._sessionId, "]: playhead positions [A]=").concat(currentVod.getPlayheadPositions("audio")));
                         //debug(newVod);
                         _c = sessionState;
                         return [4 /*yield*/, this._sessionState.set("mediaSeq", 0)];
@@ -1858,7 +1861,8 @@ var Session = /** @class */ (function () {
                         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, "]: ").concat(newVod.getPlayheadPositions()));
+                        debug("[".concat(this._sessionId, "]: playhead positions [V]=").concat(newVod.getPlayheadPositions("video")));
+                        debug("[".concat(this._sessionId, "]: playhead positions [A]=").concat(newVod.getPlayheadPositions("audio")));
                         currentVod = newVod;
                         debug("[".concat(this._sessionId, "]: msequences=").concat(currentVod.getLiveMediaSequencesCount(), "; audio msequences=").concat(currentVod.getLiveMediaSequencesCount("audio")));
                         _r = sessionState;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.0.8",
+  "version": "4.0.9",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/engine/redis_state_store.js

@@ -1,7 +1,7 @@
 const redis = require("redis");
 const debug = require("debug")("redis-state-store");
 
-const VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
+const DEFAULT_VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
 
 class RedisStateStore {
   constructor(keyPrefix, opts) {
@@ -11,6 +11,11 @@ class RedisStateStore {
       this.keyPrefix = prependPrefix + this.keyPrefix;
       debug(`Prepending keyprefix with ${prependPrefix} => ${this.keyPrefix}`);
     }
+    this.volatileKeyTTL = DEFAULT_VOLATILE_KEY_TTL;
+    if (opts.volatileKeyTTL) {
+      debug(`Overriding default, volatileKeyTTL=${opts.volatileKeyTTL}s`);
+      this.volatileKeyTTL = opts.volatileKeyTTL;  
+    }
     this.client = redis.createClient(opts.redisUrl);
   }
 
@@ -82,9 +87,9 @@ class RedisStateStore {
     const data = await this.setAsync(id, key, value);
     const storeKey = "" + this.keyPrefix + id + key;
     const expireAsync = new Promise((resolve, reject) => {
-      this.client.expire(storeKey, VOLATILE_KEY_TTL, (err, res) => {
+      this.client.expire(storeKey, this.volatileKeyTTL, (err, res) => {
         if (!err) {
-          debug(`REDIS expire ${storeKey} ${VOLATILE_KEY_TTL}s: ${res === 1 ? "OK" : "KEY DOES NOT EXIST"}`);
+          debug(`REDIS expire ${storeKey} ${this.volatileKeyTTL}s: ${res === 1 ? "OK" : "KEY DOES NOT EXIST"}`);
           resolve();
         } else {
           reject(err);

package/engine/server.ts

@@ -47,6 +47,7 @@ export interface ChannelEngineOpts {
   adCopyMgrUri?: string; // deprecated
   adXchangeUri?: string; // deprecated
   noSessionDataTags?: boolean;
+  volatileKeyTTL?: number;
 }
 
 interface StreamerOpts {
@@ -206,11 +207,13 @@ export class ChannelEngine {
         redisUrl: options.redisUrl, 
         memcachedUrl: options.memcachedUrl, 
         cacheTTL: options.sharedStoreCacheTTL,
+        volatileKeyTTL: options.volatileKeyTTL,
       }),
       playheadStateStore: new PlayheadStateStore({ 
         redisUrl: options.redisUrl, 
         memcachedUrl: options.memcachedUrl, 
         cacheTTL: options.sharedStoreCacheTTL,
+        volatileKeyTTL: options.volatileKeyTTL,
       }),
       instanceId: this.instanceId,
     };
@@ -220,6 +223,7 @@ export class ChannelEngine {
         redisUrl: options.redisUrl, 
         memcachedUrl: options.memcachedUrl, 
         cacheTTL: options.sharedStoreCacheTTL,
+        volatileKeyTTL: options.volatileKeyTTL,
       }),
       instanceId: this.instanceId,
     };

package/engine/session.js

@@ -733,6 +733,7 @@ class Session {
         let index = 0;
         const audioSeqLastIdx = currentVod.getLiveMediaSequencesCount("audio") - 1;
         const thresh = 0.5;
+        debug(`[${this._sessionId}]: About to determine audio increment`);
         do {
           const audioPosition = (await this._getAudioPlayheadPosition(sessionState.vodMediaSeqAudio + index)) * 1000;
           posDiff = position - audioPosition;
@@ -752,6 +753,7 @@ class Session {
         } while (!(-thresh < posDiff && posDiff < thresh));
         audioIncrement = index;
       }
+      debug(`[${this._sessionId}]: Will increment audio with ${audioIncrement}`);
       sessionState.vodMediaSeqAudio = await this._sessionState.increment("vodMediaSeqAudio", audioIncrement);
     }
 
@@ -1160,7 +1162,8 @@ class Session {
               { event: 'loadVod', channel: this._sessionId, loadTimeMs: Date.now() - loadStart });
             debug(`[${this._sessionId}]: first VOD loaded`);
             debug(`[${this._sessionId}]: ${currentVod.getDeltaTimes()}`);
-            debug(`[${this._sessionId}]: ${currentVod.getPlayheadPositions()}`);
+            debug(`[${this._sessionId}]: playhead positions [V]=${currentVod.getPlayheadPositions("video")}`);
+            debug(`[${this._sessionId}]: playhead positions [A]=${currentVod.getPlayheadPositions("audio")}`);
             //debug(newVod);
             sessionState.mediaSeq = await this._sessionState.set("mediaSeq", 0);
             sessionState.mediaSeqAudio = await this._sessionState.set("mediaSeqAudio", 0);
@@ -1323,7 +1326,8 @@ class Session {
               { event: 'loadVod', channel: this._sessionId, loadTimeMs: Date.now() - loadStart });
             this.leaderIsSettingNextVod = true;
             debug(`[${this._sessionId}]: next VOD loaded (${newVod.getDeltaTimes()})`);
-            debug(`[${this._sessionId}]: ${newVod.getPlayheadPositions()}`);
+            debug(`[${this._sessionId}]: playhead positions [V]=${newVod.getPlayheadPositions("video")}`);
+            debug(`[${this._sessionId}]: playhead positions [A]=${newVod.getPlayheadPositions("audio")}`);
             currentVod = newVod;
             debug(`[${this._sessionId}]: msequences=${currentVod.getLiveMediaSequencesCount()}; audio msequences=${currentVod.getLiveMediaSequencesCount("audio")}`);
             sessionState.vodMediaSeqVideo = await this._sessionState.set("vodMediaSeqVideo", 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.0.8",
+  "version": "4.0.9",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",