eyevinn-channel-engine 4.3.0 → 4.3.2

package/dist/engine/memcached_state_store.d.ts

@@ -5,6 +5,7 @@ declare class MemcachedStateStore {
     client: any;
     initAsync(id: any, initData: any): Promise<{}>;
     resetAsync(id: any, initData: any): Promise<void>;
+    resetAllAsync(): Promise<void>;
     getAsync(id: any, key: any): Promise<any>;
     setAsync(id: any, key: any, value: any): Promise<any>;
     setVolatileAsync(id: any, key: any, value: any): Promise<void>;

package/dist/engine/memcached_state_store.js

@@ -112,6 +112,14 @@ var MemcachedStateStore = /** @class */ (function () {
             });
         });
     };
+    MemcachedStateStore.prototype.resetAllAsync = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                console.error("Shared Storage Reset Failed.\nMemcache-client: Flush All Command Not Implemented Yet");
+                return [2 /*return*/];
+            });
+        });
+    };
     MemcachedStateStore.prototype.getAsync = function (id, key) {
         return __awaiter(this, void 0, void 0, function () {
             var storeKey, data;

package/dist/engine/memory_state_store.d.ts

@@ -4,6 +4,8 @@ declare class MemoryStateStore {
     sharedStates: {};
     globalSharedStates: {};
     initAsync(id: any, initData: any): Promise<any>;
+    resetAsync(id: any, initData: any): Promise<void>;
+    resetAllAsync(): Promise<void>;
     getAsync(id: any, key: any): Promise<any>;
     setAsync(id: any, key: any, value: any): Promise<any>;
     setVolatileAsync(id: any, key: any, value: any): Promise<any>;

package/dist/engine/memory_state_store.js

@@ -54,6 +54,29 @@ var MemoryStateStore = /** @class */ (function () {
             });
         });
     };
+    MemoryStateStore.prototype.resetAsync = function (id, initData) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.sharedStates[id] = null;
+                        return [4 /*yield*/, this.initAsync(id, initData)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    MemoryStateStore.prototype.resetAllAsync = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                this.sharedStates = {};
+                this.globalSharedStates = {};
+                return [2 /*return*/];
+            });
+        });
+    };
     MemoryStateStore.prototype.getAsync = function (id, key) {
         return __awaiter(this, void 0, void 0, function () {
             var value;
@@ -62,6 +85,9 @@ var MemoryStateStore = /** @class */ (function () {
                     value = this.globalSharedStates[key];
                 }
                 else {
+                    if (!this.sharedStates[id]) {
+                        return [2 /*return*/, null];
+                    }
                     value = this.sharedStates[id][key];
                 }
                 return [2 /*return*/, value];
@@ -75,6 +101,9 @@ var MemoryStateStore = /** @class */ (function () {
                     this.globalSharedStates[key] = value;
                 }
                 else {
+                    if (!this.sharedStates[id]) {
+                        this.sharedStates[id] = {};
+                    }
                     this.sharedStates[id][key] = value;
                     return [2 /*return*/, this.sharedStates[id][key]];
                 }

package/dist/engine/redis_state_store.d.ts

@@ -6,6 +6,7 @@ declare class RedisStateStore {
     client: any;
     initAsync(id: any, initData: any): Promise<{}>;
     resetAsync(id: any, initData: any): Promise<void>;
+    resetAllAsync(): Promise<void>;
     getAsync(id: any, key: any): Promise<any>;
     setAsync(id: any, key: any, value: any): Promise<any>;
     setVolatileAsync(id: any, key: any, value: any): Promise<any>;

package/dist/engine/redis_state_store.js

@@ -104,6 +104,21 @@ var RedisStateStore = /** @class */ (function () {
         });
     };
     RedisStateStore.prototype.resetAsync = function (id, initData) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.setAsync(id, "_initiated", false)];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, this.initAsync(id, initData)];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    RedisStateStore.prototype.resetAllAsync = function () {
         return __awaiter(this, void 0, void 0, function () {
             var resetAsync;
             var _this = this;
@@ -170,7 +185,7 @@ var RedisStateStore = /** @class */ (function () {
                         setAsync = new Promise(function (resolve, reject) {
                             _this.client.set(storeKey, JSON.stringify(value), function (err, res) {
                                 var ioTimeMs = Date.now() - startMs;
-                                debug("REDIS set ".concat(storeKey, ": ").concat(res, " (").concat(ioTimeMs, "ms) ").concat(ioTimeMs > 1000 ? 'REDISSLOW!' : ''));
+                                debug("REDIS set ".concat(storeKey, ": ").concat(res, " (").concat(ioTimeMs, "ms) ").concat(ioTimeMs > 1000 ? "REDISSLOW!" : ""));
                                 if (!err) {
                                     resolve(value);
                                 }
@@ -226,7 +241,7 @@ var RedisStateStore = /** @class */ (function () {
                         delAsync = new Promise(function (resolve, reject) {
                             _this.client.del(storeKey, function (err, res) {
                                 var ioTimeMs = Date.now() - startMs;
-                                debug("REDIS remove ".concat(storeKey, ": (").concat(ioTimeMs, "ms) ").concat(ioTimeMs > 1000 ? 'REDISSLOW!' : ''));
+                                debug("REDIS remove ".concat(storeKey, ": (").concat(ioTimeMs, "ms) ").concat(ioTimeMs > 1000 ? "REDISSLOW!" : ""));
                                 if (!err) {
                                     resolve();
                                 }

package/dist/engine/server.d.ts

@@ -29,6 +29,7 @@ export interface ChannelEngineOpts {
     noSessionDataTags?: boolean;
     volatileKeyTTL?: number;
     autoCreateSession?: boolean;
+    sessionResetKey?: string;
 }
 export interface VodRequest {
     sessionId: string;
@@ -147,6 +148,7 @@ export declare class ChannelEngine {
     private adCopyMgrUri?;
     private adXchangeUri?;
     private autoCreateSession;
+    private sessionResetKey;
     constructor(assetMgr: IAssetManager, options?: ChannelEngineOpts);
     updateStreamSwitchAsync(): Promise<void>;
     updateChannelsAsync(channelMgr: any, options: any): Promise<void>;
@@ -172,6 +174,7 @@ export declare class ChannelEngine {
     _handleStatus(req: any, res: any, next: any): Promise<void>;
     _handleAggregatedSessionHealth(req: any, res: any, next: any): Promise<void>;
     _handleSessionHealth(req: any, res: any, next: any): Promise<void>;
+    _handleSessionsReset(req: any, res: any, next: any): Promise<void>;
     _handleSessionReset(req: any, res: any, next: any): Promise<void>;
     _gracefulErrorHandler(errMsg: any): any;
     _errorHandler(errMsg: any): any;

package/dist/engine/server.js

@@ -71,6 +71,7 @@ var ChannelEngine = /** @class */ (function () {
     function ChannelEngine(assetMgr, options) {
         var _this = this;
         this.autoCreateSession = false;
+        this.sessionResetKey = "";
         this.options = options;
         if (options && options.adCopyMgrUri) {
             this.adCopyMgrUri = options.adCopyMgrUri;
@@ -85,6 +86,10 @@ var ChannelEngine = /** @class */ (function () {
         this.useVTTSubtitles = (options && options.useVTTSubtitles) ? options.useVTTSubtitles : false;
         this.dummySubtitleEndpoint = (options && options.dummySubtitleEndpoint) ? options.dummySubtitleEndpoint : DefaultDummySubtitleEndpointPath;
         this.subtitleSliceEndpoint = (options && options.subtitleSliceEndpoint) ? options.subtitleSliceEndpoint : DefaultSubtitleSpliceEndpointPath;
+        this.sessionResetKey = "";
+        if (options && options.sessionResetKey) {
+            this.sessionResetKey = options.sessionResetKey;
+        }
         this.alwaysNewSegments = false;
         if (options && options.alwaysNewSegments) {
             this.alwaysNewSegments = true;
@@ -262,7 +267,8 @@ var ChannelEngine = /** @class */ (function () {
         this.server.get('/status/:sessionId', this._handleStatus.bind(this));
         this.server.get('/health', this._handleAggregatedSessionHealth.bind(this));
         this.server.get('/health/:sessionId', this._handleSessionHealth.bind(this));
-        this.server.get('/reset', this._handleSessionReset.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.on('NotFound', function (req, res, err, next) {
@@ -445,6 +451,7 @@ var ChannelEngine = /** @class */ (function () {
                                             subtitleSliceEndpoint: this.subtitleSliceEndpoint,
                                             useVTTSubtitles: this.useVTTSubtitles,
                                             alwaysNewSegments: options.alwaysNewSegments,
+                                            sessionResetKey: options.sessionResetKey,
                                             partialStoreHLSVod: options.partialStoreHLSVod,
                                             alwaysMapBandwidthByNearest: options.alwaysMapBandwidthByNearest,
                                             noSessionDataTags: options.noSessionDataTags,
@@ -1013,7 +1020,7 @@ var ChannelEngine = /** @class */ (function () {
             return __generator(this, function (_a) {
                 debug("req.url=".concat(req.url));
                 try {
-                    body = "WEBVTT\nX-TIMESTAMP-MAP=MPEGTS:0,LOCAL:00:00:00.000";
+                    body = "WEBVTT\nX-TIMESTAMP-MAP=MPEGTS:0,LOCAL:00:00:00.000\n\n";
                     res.sendRaw(200, Buffer.from(body, 'utf8'), {
                         "Content-Type": "text/vtt",
                         "Access-Control-Allow-Origin": "*",
@@ -1275,13 +1282,22 @@ var ChannelEngine = /** @class */ (function () {
             });
         });
     };
-    ChannelEngine.prototype._handleSessionReset = function (req, res, next) {
+    ChannelEngine.prototype._handleSessionsReset = function (req, res, next) {
         return __awaiter(this, void 0, void 0, function () {
             var sessionResets, _i, _a, sessionId, session, sessionLive, err;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         debug("req.url=".concat(req.url));
+                        if (this.sessionResetKey && req.query.key !== this.sessionResetKey) {
+                            res.sendRaw(403, JSON.stringify({ "message": "Invalid Session-Reset-Key" }), {
+                                "Content-Type": "application/json",
+                                "Access-Control-Allow-Origin": "*",
+                                "Cache-Control": "no-cache",
+                            });
+                            next();
+                            return [2 /*return*/];
+                        }
                         sessionResets = [];
                         _i = 0, _a = Object.keys(sessions);
                         _b.label = 1;
@@ -1314,6 +1330,69 @@ var ChannelEngine = /** @class */ (function () {
             });
         });
     };
+    ChannelEngine.prototype._handleSessionReset = function (req, res, next) {
+        return __awaiter(this, void 0, void 0, function () {
+            var sessionId, sessionResets, session, sessionLive, e_1, err;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        debug("req.url=".concat(req.url));
+                        if (this.sessionResetKey && req.query.key !== this.sessionResetKey) {
+                            res.sendRaw(403, JSON.stringify({ "message": "Invalid Session-Reset-Key" }), {
+                                "Content-Type": "application/json",
+                                "Access-Control-Allow-Origin": "*",
+                                "Cache-Control": "no-cache",
+                            });
+                            next();
+                            return [2 /*return*/];
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 5, , 6]);
+                        sessionId = void 0;
+                        if (req.params && req.params.sessionId) {
+                            sessionId = req.params.sessionId;
+                        }
+                        sessionResets = [];
+                        session = sessions[sessionId];
+                        sessionLive = sessionsLive[sessionId];
+                        if (!(session && sessionLive)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, session.resetAsync(sessionId)];
+                    case 2:
+                        _a.sent();
+                        sessionResets.push(sessionId);
+                        return [3 /*break*/, 4];
+                    case 3:
+                        res.sendRaw(400, JSON.stringify({ "message": "Invalid Session ID" }), {
+                            "Content-Type": "application/json",
+                            "Access-Control-Allow-Origin": "*",
+                            "Cache-Control": "no-cache",
+                        });
+                        next();
+                        return [2 /*return*/];
+                    case 4:
+                        res.sendRaw(200, JSON.stringify({ "status": "ok", "instanceId": this.instanceId, "resets": sessionResets }), {
+                            "Content-Type": "application/json",
+                            "Access-Control-Allow-Origin": "*",
+                            "Cache-Control": "no-cache",
+                        });
+                        next();
+                        return [3 /*break*/, 6];
+                    case 5:
+                        e_1 = _a.sent();
+                        res.sendRaw(500, JSON.stringify({ "error": e_1 }), {
+                            "Content-Type": "application/json",
+                            "Access-Control-Allow-Origin": "*",
+                            "Cache-Control": "no-cache",
+                        });
+                        err = new errs.NotFoundError('Session Reset Failed');
+                        next(err);
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
+                }
+            });
+        });
+    };
     ChannelEngine.prototype._gracefulErrorHandler = function (errMsg) {
         console.error(errMsg);
         var err = new errs.NotFoundError(errMsg);

package/dist/engine/session.d.ts

@@ -83,7 +83,7 @@ declare class Session {
     } | {
         sessionId: any;
     }>;
-    resetAsync(): Promise<void>;
+    resetAsync(id: any): Promise<void>;
     getSessionState(): Promise<any>;
     getTruncatedVodSegments(vodUri: any, duration: any): Promise<any>;
     setCurrentMediaSequenceSegments(segments: any, mSeqOffset: any, reloadBehind: any): Promise<void>;

package/dist/engine/session.js

@@ -454,15 +454,24 @@ var Session = /** @class */ (function () {
             });
         });
     };
-    Session.prototype.resetAsync = function () {
+    Session.prototype.resetAsync = function (id) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._sessionStateStore.reset(this._sessionId)];
+                    case 0:
+                        if (!id) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this._sessionStateStore.reset(id)];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, this._playheadStateStore.reset(this._sessionId)];
+                        return [4 /*yield*/, this._playheadStateStore.reset(id)];
                     case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3: return [4 /*yield*/, this._sessionStateStore.resetAll()];
+                    case 4:
+                        _a.sent();
+                        return [4 /*yield*/, this._playheadStateStore.resetAll()];
+                    case 5:
                         _a.sent();
                         return [2 /*return*/];
                 }

package/dist/engine/shared_state_store.d.ts

@@ -10,6 +10,7 @@ declare class SharedStateStore {
     isShared(): boolean;
     init(id: any): Promise<void>;
     reset(id: any): Promise<void>;
+    resetAll(): Promise<void>;
     get(id: any, key: any): Promise<any>;
     set(id: any, key: any, value: any): Promise<any>;
     setVolatile(id: any, key: any, value: any): Promise<any>;

package/dist/engine/shared_state_store.js

@@ -87,6 +87,18 @@ var SharedStateStore = /** @class */ (function () {
             });
         });
     };
+    SharedStateStore.prototype.resetAll = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.store.resetAllAsync()];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     SharedStateStore.prototype.get = function (id, key) {
         return __awaiter(this, void 0, void 0, function () {
             var data;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.3.0",
+  "version": "4.3.2",
   "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.0",
+    "@eyevinn/hls-vodtolive": "^4.0.1",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",

package/engine/memcached_state_store.js

@@ -36,6 +36,10 @@ class MemcachedStateStore {
     await this.initAsync(id, initData);
   }
 
+  async resetAllAsync() {
+    console.error("Shared Storage Reset Failed.\nMemcache-client: Flush All Command Not Implemented Yet");
+  }
+
   async getAsync(id, key) {
     const storeKey = "" + this.keyPrefix + id + key;
     const data = await this.client.get(storeKey);

package/engine/memory_state_store.js

@@ -9,18 +9,31 @@ class MemoryStateStore {
   async initAsync(id, initData) {
     if (!this.sharedStates[id]) {
       this.sharedStates[id] = {};
-      Object.keys(initData).forEach(key => {
+      Object.keys(initData).forEach((key) => {
         this.sharedStates[id][key] = initData[key];
       });
     }
     return this.sharedStates[id];
   }
 
+  async resetAsync(id, initData) {
+    this.sharedStates[id] = null;
+    await this.initAsync(id, initData);
+  }
+
+  async resetAllAsync() {
+      this.sharedStates = {};
+      this.globalSharedStates = {};
+  }
+
   async getAsync(id, key) {
     let value;
     if (id === "" || id === null) {
       value = this.globalSharedStates[key];
     } else {
+      if (!this.sharedStates[id]) {
+        return null;
+      }
       value = this.sharedStates[id][key];
     }
     return value;
@@ -30,6 +43,9 @@ class MemoryStateStore {
     if (id === "" || id === null) {
       this.globalSharedStates[key] = value;
     } else {
+      if (!this.sharedStates[id]) {
+        this.sharedStates[id] = {};
+      }
       this.sharedStates[id][key] = value;
       return this.sharedStates[id][key];
     }
@@ -41,7 +57,7 @@ class MemoryStateStore {
 
   async removeAsync(id, key) {
     delete this.sharedStates[id][key];
-  }  
+  }
 }
 
 module.exports = MemoryStateStore;

package/engine/redis_state_store.js

@@ -14,7 +14,7 @@ class RedisStateStore {
     this.volatileKeyTTL = DEFAULT_VOLATILE_KEY_TTL;
     if (opts.volatileKeyTTL) {
       debug(`Overriding default, volatileKeyTTL=${opts.volatileKeyTTL}s`);
-      this.volatileKeyTTL = opts.volatileKeyTTL;  
+      this.volatileKeyTTL = opts.volatileKeyTTL;
     }
     this.client = createClient(opts.redisUrl);
   }
@@ -23,14 +23,14 @@ class RedisStateStore {
     const isInitiated = await this.getAsync(id, "_initiated");
     let data = {};
     if (!isInitiated) {
-      for(const key of Object.keys(initData)) {
+      for (const key of Object.keys(initData)) {
         debug(`${this.keyPrefix}:${id}: Initiating key ${key} with init data`);
         data[key] = await this.setAsync(id, key, initData[key]);
       }
       await this.setAsync(id, "_initiated", true);
     } else {
       debug(`${this.keyPrefix}:${id}: Already initiated, not initiating with init data`);
-      for(const key of Object.keys(initData)) {
+      for (const key of Object.keys(initData)) {
         debug(`${this.keyPrefix}:${id}: Initiating key ${key} with data from store`);
         data[key] = await this.getAsync(id, key);
       }
@@ -39,8 +39,13 @@ class RedisStateStore {
   }
 
   async resetAsync(id, initData) {
+      await this.setAsync(id, "_initiated", false);
+      await this.initAsync(id, initData);
+  }
+
+  async resetAllAsync() {
     const resetAsync = new Promise((resolve, reject) => {
-      this.client.flushall((err, reply) => {        
+      this.client.flushall((err, reply) => {
         if (!err) {
           console.log("Flushed Redis db: ", reply);
           resolve();
@@ -64,7 +69,7 @@ class RedisStateStore {
         } else {
           reject(err);
         }
-        });
+      });
     });
     const data = await getAsync;
     return data;
@@ -76,7 +81,7 @@ class RedisStateStore {
     const setAsync = new Promise((resolve, reject) => {
       this.client.set(storeKey, JSON.stringify(value), (err, res) => {
         const ioTimeMs = Date.now() - startMs;
-        debug(`REDIS set ${storeKey}: ${res} (${ioTimeMs}ms) ${ioTimeMs > 1000 ? 'REDISSLOW!' : ''}`);
+        debug(`REDIS set ${storeKey}: ${res} (${ioTimeMs}ms) ${ioTimeMs > 1000 ? "REDISSLOW!" : ""}`);
         if (!err) {
           resolve(value);
         } else {
@@ -110,7 +115,7 @@ class RedisStateStore {
     const delAsync = new Promise((resolve, reject) => {
       this.client.del(storeKey, (err, res) => {
         const ioTimeMs = Date.now() - startMs;
-        debug(`REDIS remove ${storeKey}: (${ioTimeMs}ms) ${ioTimeMs > 1000 ? 'REDISSLOW!' : ''}`);
+        debug(`REDIS remove ${storeKey}: (${ioTimeMs}ms) ${ioTimeMs > 1000 ? "REDISSLOW!" : ""}`);
         if (!err) {
           resolve();
         } else {

package/engine/server.ts

@@ -58,6 +58,7 @@ export interface ChannelEngineOpts {
   noSessionDataTags?: boolean;
   volatileKeyTTL?: number;
   autoCreateSession?: boolean;
+  sessionResetKey?:string;
 }
 
 interface StreamerOpts {
@@ -203,6 +204,7 @@ export class ChannelEngine {
   private adCopyMgrUri?: string;
   private adXchangeUri?: string;
   private autoCreateSession: boolean = false;
+  private sessionResetKey: string = "";
   
   constructor(assetMgr: IAssetManager, options?: ChannelEngineOpts) {
     this.options = options;
@@ -221,6 +223,10 @@ export class ChannelEngine {
     this.dummySubtitleEndpoint = (options && options.dummySubtitleEndpoint) ? options.dummySubtitleEndpoint : DefaultDummySubtitleEndpointPath;
     this.subtitleSliceEndpoint = (options && options.subtitleSliceEndpoint) ? options.subtitleSliceEndpoint : DefaultSubtitleSpliceEndpointPath;
 
+    this.sessionResetKey = "";
+    if (options && options.sessionResetKey) {
+      this.sessionResetKey = options.sessionResetKey;
+    }
     this.alwaysNewSegments = false;
     if (options && options.alwaysNewSegments) {
       this.alwaysNewSegments = true;
@@ -361,7 +367,8 @@ export class ChannelEngine {
     this.server.get('/status/:sessionId', this._handleStatus.bind(this));
     this.server.get('/health', this._handleAggregatedSessionHealth.bind(this));
     this.server.get('/health/:sessionId', this._handleSessionHealth.bind(this));
-    this.server.get('/reset', this._handleSessionReset.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));
 
@@ -466,6 +473,7 @@ export class ChannelEngine {
         subtitleSliceEndpoint: this.subtitleSliceEndpoint,
         useVTTSubtitles: this.useVTTSubtitles,
         alwaysNewSegments: options.alwaysNewSegments,
+        sessionResetKey: options.sessionResetKey,
         partialStoreHLSVod: options.partialStoreHLSVod,
         alwaysMapBandwidthByNearest: options.alwaysMapBandwidthByNearest,
         noSessionDataTags: options.noSessionDataTags,
@@ -820,7 +828,7 @@ export class ChannelEngine {
   async _handleDummySubtitleEndpoint(req,res,next) {
     debug(`req.url=${req.url}`);
     try {
-      const body = `WEBVTT\nX-TIMESTAMP-MAP=MPEGTS:0,LOCAL:00:00:00.000`;
+      const body = `WEBVTT\nX-TIMESTAMP-MAP=MPEGTS:0,LOCAL:00:00:00.000\n\n`;
       res.sendRaw(200, Buffer.from(body, 'utf8'), {
         "Content-Type": "text/vtt",
         "Access-Control-Allow-Origin": "*",
@@ -1005,8 +1013,18 @@ export class ChannelEngine {
     }
   }
 
-  async _handleSessionReset(req, res, next) {
+  async _handleSessionsReset(req, res, next) {
     debug(`req.url=${req.url}`);
+    if (this.sessionResetKey && req.query.key !== this.sessionResetKey) {
+      res.sendRaw(403, JSON.stringify({ "message": "Invalid Session-Reset-Key" }),
+      {
+        "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": "*",
+        "Cache-Control": "no-cache",
+      });
+      next();
+      return;
+    }
     let sessionResets = [];
     for (const sessionId of Object.keys(sessions)) {
       const session = sessions[sessionId];
@@ -1027,6 +1045,60 @@ export class ChannelEngine {
     });
   }
 
+  async _handleSessionReset(req, res, next) {
+    debug(`req.url=${req.url}`);
+    if (this.sessionResetKey && req.query.key !== this.sessionResetKey) {
+      res.sendRaw(403, JSON.stringify({ "message": "Invalid Session-Reset-Key" }),
+      {
+        "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": "*",
+        "Cache-Control": "no-cache",
+      });
+      next();
+      return;
+    }
+    try {
+      let sessionId;
+      if (req.params && req.params.sessionId) {
+        sessionId = req.params.sessionId;
+      }
+      let sessionResets = [];
+      const session = sessions[sessionId];
+      const sessionLive = sessionsLive[sessionId];
+      if (session && sessionLive) {
+        await session.resetAsync(sessionId); 
+        sessionResets.push(sessionId);
+      } else {
+        res.sendRaw(400, JSON.stringify({ "message": "Invalid Session ID" }),
+        {
+          "Content-Type": "application/json",
+          "Access-Control-Allow-Origin": "*",
+          "Cache-Control": "no-cache",
+        });
+        next();
+        return;
+      }
+      
+      res.sendRaw(200, JSON.stringify({ "status": "ok", "instanceId": this.instanceId, "resets": sessionResets }),
+      {
+        "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": "*",
+        "Cache-Control": "no-cache",
+      });
+      next();
+    } catch (e) {
+      res.sendRaw(500, JSON.stringify({ "error": e}),
+      {
+        "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": "*",
+        "Cache-Control": "no-cache",
+      });
+      const err = new errs.NotFoundError('Session Reset Failed');
+      next(err);
+    }
+  }
+
+
   _gracefulErrorHandler(errMsg) {
     console.error(errMsg);
     const err = new errs.NotFoundError(errMsg);

package/engine/session.js

@@ -341,9 +341,13 @@ class Session {
     }
   }
 
-  async resetAsync() {
-    await this._sessionStateStore.reset(this._sessionId);
-    await this._playheadStateStore.reset(this._sessionId);
+  async resetAsync(id) {
+    if (id) {
+      await this._sessionStateStore.reset(id);
+      await this._playheadStateStore.reset(id);
+    }
+    await this._sessionStateStore.resetAll();
+    await this._playheadStateStore.resetAll();
   }
 
   async getSessionState() {

package/engine/shared_state_store.js

@@ -38,6 +38,10 @@ class SharedStateStore {
     await this.store.resetAsync(id, this.initData);
   }
 
+  async resetAll() {
+    await this.store.resetAllAsync();
+  }
+
   async get(id, key) {
     //debug(`${this.type}:${id}:${key} Reading from shared store`);
     let data = await this.store.getAsync(id, key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.3.0",
+  "version": "4.3.2",
   "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.0",
+    "@eyevinn/hls-vodtolive": "^4.0.1",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",