eyevinn-channel-engine 4.3.9 → 4.3.10

package/dist/engine/session.d.ts

@@ -97,7 +97,7 @@ declare class Session {
     }>;
     getCurrentMediaManifestAsync(bw: any, playbackSessionId: any): Promise<any>;
     getCurrentAudioManifestAsync(audioGroupId: any, audioLanguage: any, playbackSessionId: any): Promise<any>;
-    getCurrentSubtitleManifestAsync(subtitleGroupId: any, subtitleLanguage: any): Promise<any>;
+    getCurrentSubtitleManifestAsync(subtitleGroupId: any, subtitleLanguage: any, playbackSessionId: any): Promise<any>;
     incrementAsync(): Promise<any>;
     getMediaManifestAsync(bw: any, opts: any): Promise<any>;
     getAudioManifestAsync(audioGroupId: any, audioLanguage: any, opts: any): Promise<any>;
@@ -128,4 +128,6 @@ declare class Session {
         position: number;
         diff: string;
     }>;
+    _getM3u8File(variantType: any, variantKey: any, playbackSessionId: any): Promise<any>;
+    _getCurrentVodData(dataName: any, variantType: any, vod: any): any;
 }

package/dist/engine/session.js

@@ -794,300 +794,45 @@ var Session = /** @class */ (function () {
     };
     Session.prototype.getCurrentMediaManifestAsync = function (bw, playbackSessionId) {
         return __awaiter(this, void 0, void 0, function () {
-            var tries, sessionState, playheadState, state, DELAY_TIME_MS, ACTION, isLeader, diffMs, currentVod, manifestMseq, manifestDseq, mediaSequenceValue, m3u8_1, err_4;
+            var m3u8;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this._sessionState) {
-                            throw new Error('Session not ready');
-                        }
-                        tries = 12;
-                        _a.label = 1;
-                    case 1:
-                        if (!(tries > 0 && this.leaderIsSettingNextVod)) return [3 /*break*/, 3];
-                        debug("[".concat(this._sessionId, "]: Leader is setting the next vod. Waiting 500ms_").concat(tries));
-                        return [4 /*yield*/, timer(500)];
-                    case 2:
-                        _a.sent();
-                        tries--;
-                        return [3 /*break*/, 1];
-                    case 3: return [4 /*yield*/, this._sessionState.getValues(["vodMediaSeqVideo", "discSeq"])];
-                    case 4:
-                        sessionState = _a.sent();
-                        return [4 /*yield*/, this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"])];
-                    case 5:
-                        playheadState = _a.sent();
-                        if (this.prevVodMediaSeq.video === null) {
-                            this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
-                        }
-                        if (this.prevMediaSeqOffset.video === null) {
-                            this.prevMediaSeqOffset.video = playheadState.mediaSeq;
-                        }
-                        if (!(playheadState.vodMediaSeqVideo > sessionState.vodMediaSeqVideo || (playheadState.vodMediaSeqVideo < sessionState.vodMediaSeqVideo && playheadState.mediaSeq === this.prevMediaSeqOffset.video))) return [3 /*break*/, 9];
-                        return [4 /*yield*/, this._sessionState.get("state")];
-                    case 6:
-                        state = _a.sent();
-                        DELAY_TIME_MS = 1000;
-                        ACTION = [SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state) ? "Reloaded" : "Loaded Next";
-                        debug("[".concat(this._sessionId, "]: Recently ").concat(ACTION, " Vod. PlayheadState not up-to-date (").concat(playheadState.vodMediaSeqVideo, "_").concat(sessionState.vodMediaSeqVideo, "). Waiting ").concat(DELAY_TIME_MS, "ms before reading from store again"));
-                        return [4 /*yield*/, timer(DELAY_TIME_MS)];
-                    case 7:
-                        _a.sent();
-                        return [4 /*yield*/, this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"])];
-                    case 8:
-                        playheadState = _a.sent();
-                        _a.label = 9;
-                    case 9:
-                        if (!(playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video)) return [3 /*break*/, 14];
-                        debug("[".concat(this._sessionId, "]: current[").concat(playheadState.vodMediaSeqVideo, "]_prev[").concat(this.prevVodMediaSeq.video, "]"));
-                        debug("[".concat(this._sessionId, "]: current-offset[").concat(playheadState.mediaSeq, "]_prev-offset[").concat(this.prevMediaSeqOffset.video, "]"));
-                        // If true, then we have not updated the prev-values and not cleared the cache yet.
-                        if (playheadState.vodMediaSeqVideo < this.prevVodMediaSeq.video || playheadState.mediaSeq !== this.prevMediaSeqOffset.video) {
-                            this.isAllowedToClearVodCache = true;
-                        }
-                        return [4 /*yield*/, this._sessionStateStore.isLeader(this._instanceId)];
-                    case 10:
-                        isLeader = _a.sent();
-                        if (!(!isLeader && this.isAllowedToClearVodCache)) return [3 /*break*/, 13];
-                        debug("[".concat(this._sessionId, "]: Not a leader and first|second media sequence in a VOD is requested. Invalidate cache to ensure having the correct VOD."));
-                        return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 11:
-                        _a.sent();
-                        this.isAllowedToClearVodCache = false;
-                        return [4 /*yield*/, this._playheadState.get("diffCompensation")];
-                    case 12:
-                        diffMs = _a.sent();
-                        if (diffMs) {
-                            this.diffCompensation = diffMs;
-                            debug("[".concat(this._sessionId, "]: Setting diffCompensation->").concat(this.diffCompensation));
-                            if (this.diffCompensation) {
-                                this.timePositionOffset = this.diffCompensation;
-                                cloudWatchLog(!this.cloudWatchLogging, 'engine-session', { event: 'timePositionOffsetUpdated', channel: this._sessionId, offsetMs: this.timePositionOffset });
-                            }
-                            else {
-                                this.timePositionOffset = 0;
-                            }
-                        }
-                        _a.label = 13;
-                    case 13: return [3 /*break*/, 15];
-                    case 14:
-                        this.isAllowedToClearVodCache = true;
-                        _a.label = 15;
-                    case 15: return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 16:
-                        currentVod = _a.sent();
-                        if (!currentVod) return [3 /*break*/, 21];
-                        _a.label = 17;
-                    case 17:
-                        _a.trys.push([17, 18, , 20]);
-                        manifestMseq = playheadState.mediaSeq + playheadState.vodMediaSeqVideo;
-                        manifestDseq = sessionState.discSeq + currentVod.discontinuities[playheadState.vodMediaSeqVideo];
-                        if (currentVod.sequenceAlwaysContainNewSegments) {
-                            mediaSequenceValue = currentVod.mediaSequenceValues[playheadState.vodMediaSeqVideo];
-                            debug("[".concat(this._sessionId, "]: {").concat(mediaSequenceValue, "}_{").concat(currentVod.getLastSequenceMediaSequenceValue(), "}"));
-                            manifestMseq = playheadState.mediaSeq + mediaSequenceValue;
-                        }
-                        debug("[".concat(this._sessionId, "]: [").concat(playheadState.vodMediaSeqVideo, "]_[").concat(currentVod.getLiveMediaSequencesCount(), "]"));
-                        m3u8_1 = currentVod.getLiveMediaSequences(playheadState.mediaSeq, bw, playheadState.vodMediaSeqVideo, sessionState.discSeq, this.targetDurationPadding, this.forceTargetDuration);
-                        debug("[".concat(this._sessionId, "]: [").concat(manifestMseq, "][").concat(manifestDseq, "][+").concat(this.targetDurationPadding || 0, "] Current media manifest for ").concat(bw, " requested"));
-                        this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
-                        this.prevMediaSeqOffset.video = playheadState.mediaSeq;
-                        return [2 /*return*/, m3u8_1];
-                    case 18:
-                        err_4 = _a.sent();
-                        logerror(this._sessionId, err_4);
-                        return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 19:
-                        _a.sent(); // force reading up from shared store
-                        throw new Error("Failed to generate manifest: " + JSON.stringify(playheadState));
-                    case 20: return [3 /*break*/, 22];
-                    case 21: throw new Error("Engine not ready");
-                    case 22: return [2 /*return*/];
+                if (!this._sessionState) {
+                    throw new Error('Session not ready');
                 }
+                m3u8 = this._getM3u8File("video", bw, playbackSessionId);
+                return [2 /*return*/, m3u8];
             });
         });
     };
     Session.prototype.getCurrentAudioManifestAsync = function (audioGroupId, audioLanguage, playbackSessionId) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentVod, sessionState, playheadState, state, DELAY_TIME_MS, ACTION, manifestMseq, manifestDseq, mediaSequenceValue, m3u8_2, err_5;
+            var variantKey, m3u8;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this._sessionState) {
-                            throw new Error('Session not ready');
-                        }
-                        currentVod = null;
-                        return [4 /*yield*/, this._sessionState.getValues(["discSeqAudio", "vodMediaSeqAudio"])];
-                    case 1:
-                        sessionState = _a.sent();
-                        return [4 /*yield*/, this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio", "playheadRef"])];
-                    case 2:
-                        playheadState = _a.sent();
-                        if (!(playheadState.vodMediaSeqAudio > sessionState.vodMediaSeqAudio || (playheadState.vodMediaSeqAudio < sessionState.vodMediaSeqAudio && playheadState.mediaSeqAudio === this.prevMediaSeqOffset.audio))) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this._sessionState.get("state")];
-                    case 3:
-                        state = _a.sent();
-                        DELAY_TIME_MS = 1000;
-                        ACTION = [SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state) ? "Reloaded" : "Loaded Next";
-                        debug("[".concat(this._sessionId, "]: Recently ").concat(ACTION, " Vod. PlayheadState not up-to-date (").concat(playheadState.vodMediaSeqAudio, "_").concat(sessionState.vodMediaSeqAudio, "). Waiting ").concat(DELAY_TIME_MS, "ms before reading from store again"));
-                        return [4 /*yield*/, timer(DELAY_TIME_MS)];
-                    case 4:
-                        _a.sent();
-                        return [4 /*yield*/, this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"])];
-                    case 5:
-                        playheadState = _a.sent();
-                        _a.label = 6;
-                    case 6:
-                        // local store the prev values
-                        if (this.prevVodMediaSeq.audio === null) {
-                            this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
-                        }
-                        if (this.prevMediaSeqOffset.audio === null) {
-                            this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
-                        }
-                        return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 7:
-                        currentVod = _a.sent();
-                        if (!currentVod) return [3 /*break*/, 15];
-                        if (!(playheadState.vodMediaSeqAudio < 2 || playheadState.mediaSeqAudio !== this.prevMediaSeqOffset.audio)) return [3 /*break*/, 11];
-                        if (!(playheadState.playheadRef > this.currentPlayheadRef)) return [3 /*break*/, 11];
-                        return [4 /*yield*/, timer(500)];
-                    case 8:
-                        _a.sent();
-                        this.currentPlayheadRef = playheadState.playheadRef;
-                        debug("[".concat(this._sessionId, "]: While requesting audio manifest for ").concat(audioGroupId, "-").concat(audioLanguage, ", (mseq=").concat(playheadState.vodMediaSeqAudio, ")"));
-                        return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 9:
-                        _a.sent(); // force reading up from shared store
-                        return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 10:
-                        currentVod = _a.sent();
-                        _a.label = 11;
-                    case 11:
-                        _a.trys.push([11, 12, , 14]);
-                        manifestMseq = playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio;
-                        manifestDseq = sessionState.discSeqAudio + currentVod.discontinuitiesAudio[playheadState.vodMediaSeqAudio];
-                        if (currentVod.sequenceAlwaysContainNewSegments) {
-                            mediaSequenceValue = currentVod.mediaSequenceValuesAudio[playheadState.vodMediaSeqAudio];
-                            debug("[".concat(this._sessionId, "]: {").concat(mediaSequenceValue, "}_{").concat(currentVod.getLastSequenceMediaSequenceValueAudio(), "} AUDIO"));
-                            manifestMseq = playheadState.mediaSeqAudio + mediaSequenceValue;
-                        }
-                        debug("[".concat(this._sessionId, "]: [").concat(playheadState.vodMediaSeqAudio, "]_[").concat(currentVod.getLiveMediaSequencesCount("audio"), "] AUDIO (").concat(audioGroupId, ")"));
-                        m3u8_2 = currentVod.getLiveMediaAudioSequences(playheadState.mediaSeqAudio, audioGroupId, audioLanguage, playheadState.vodMediaSeqAudio, sessionState.discSeqAudio, this.targetDurationPadding, this.forceTargetDuration);
-                        // # Case: current VOD does not have the selected track.
-                        if (!m3u8_2) {
-                            debug("[".concat(this._sessionId, "]: [").concat(playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio, "] Request Failed for current audio manifest for ").concat(audioGroupId, "-").concat(audioLanguage));
-                        }
-                        debug("[".concat(this._sessionId, "]: [").concat(manifestMseq, "][").concat(manifestDseq, "] Current audio manifest for ").concat(audioGroupId, "-").concat(audioLanguage, " requested"));
-                        this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
-                        this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
-                        return [2 /*return*/, m3u8_2];
-                    case 12:
-                        err_5 = _a.sent();
-                        logerror(this._sessionId, err_5);
-                        return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 13:
-                        _a.sent(); // force reading up from shared store
-                        throw new Error("Failed to generate audio manifest: " + JSON.stringify(playheadState));
-                    case 14: return [3 /*break*/, 16];
-                    case 15: throw new Error("Engine not ready");
-                    case 16: return [2 /*return*/];
+                if (!this._sessionState) {
+                    throw new Error('Session not ready');
                 }
+                variantKey = JSON.stringify({ groupId: audioGroupId, lang: audioLanguage });
+                m3u8 = this._getM3u8File("audio", variantKey, playbackSessionId);
+                return [2 /*return*/, m3u8];
             });
         });
     };
-    Session.prototype.getCurrentSubtitleManifestAsync = function (subtitleGroupId, subtitleLanguage) {
+    Session.prototype.getCurrentSubtitleManifestAsync = function (subtitleGroupId, subtitleLanguage, playbackSessionId) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentVod, sessionState, playheadState, state, DELAY_TIME_MS, ACTION, manifestMseq, manifestDseq, mediaSequenceValue, m3u8_3, err_6;
+            var variantKey, m3u8;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this._sessionState) {
-                            throw new Error('Session not ready');
-                        }
-                        currentVod = null;
-                        return [4 /*yield*/, this._sessionState.getValues(["discSeqSubtitle", "vodMediaSeqSubtitle"])];
-                    case 1:
-                        sessionState = _a.sent();
-                        return [4 /*yield*/, this._playheadState.getValues(["mediaSeqSubtitle", "vodMediaSeqSubtitle", "playheadRef"])];
-                    case 2:
-                        playheadState = _a.sent();
-                        if (!(playheadState.vodMediaSeqSubtitle > sessionState.vodMediaSeqSubtitle || (playheadState.vodMediaSeqSubtitle < sessionState.vodMediaSeqSubtitle && playheadState.mediaSeqSubtitle === this.prevMediaSeqOffset.subtitle))) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this._sessionState.get("state")];
-                    case 3:
-                        state = _a.sent();
-                        DELAY_TIME_MS = 1000;
-                        ACTION = [SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state) ? "Reloaded" : "Loaded Next";
-                        debug("[".concat(this._sessionId, "]: Recently ").concat(ACTION, " Vod. PlayheadState not up-to-date (").concat(playheadState.vodMediaSeqSubtitle, "_").concat(sessionState.vodMediaSeqSubtitle, "). Waiting ").concat(DELAY_TIME_MS, "ms before reading from store again"));
-                        return [4 /*yield*/, timer(DELAY_TIME_MS)];
-                    case 4:
-                        _a.sent();
-                        return [4 /*yield*/, this._playheadState.getValues(["mediaSeqSubtitle", "vodMediaSeqSubtitle"])];
-                    case 5:
-                        playheadState = _a.sent();
-                        _a.label = 6;
-                    case 6:
-                        // local store the prev values
-                        if (this.prevVodMediaSeq.subtitle === null) {
-                            this.prevVodMediaSeq.subtitle = playheadState.vodMediaSeqSubtitle;
-                        }
-                        if (this.prevMediaSeqOffset.subtitle === null) {
-                            this.prevMediaSeqOffset.subtitle = playheadState.mediaSeqSubtitle;
-                        }
-                        return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 7:
-                        currentVod = _a.sent();
-                        if (!currentVod) return [3 /*break*/, 15];
-                        if (!(playheadState.vodMediaSeqSubtitle < 2 || playheadState.mediaSeqSubtitle !== this.prevMediaSeqOffset.subtitle)) return [3 /*break*/, 11];
-                        if (!(playheadState.playheadRef > this.currentPlayheadRef)) return [3 /*break*/, 11];
-                        return [4 /*yield*/, timer(500)];
-                    case 8:
-                        _a.sent();
-                        this.currentPlayheadRef = playheadState.playheadRef;
-                        debug("[".concat(this._sessionId, "]: While requesting subtitle manifest for ").concat(subtitleGroupId, "-").concat(subtitleLanguage, ", (mseq=").concat(playheadState.vodMediaSeqSubtitle, ")"));
-                        return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 9:
-                        _a.sent(); // force reading up from shared store
-                        return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 10:
-                        currentVod = _a.sent();
-                        _a.label = 11;
-                    case 11:
-                        _a.trys.push([11, 12, , 14]);
-                        manifestMseq = playheadState.mediaSeqSubtitle + playheadState.vodMediaSeqSubtitle;
-                        manifestDseq = sessionState.discSeqSubtitle + currentVod.discontinuitiesSubtitle[playheadState.vodMediaSeqSubtitle];
-                        if (currentVod.sequenceAlwaysContainNewSegments) {
-                            mediaSequenceValue = currentVod.mediaSequenceValuesSubtitle[playheadState.vodMediaSeqSubtitle];
-                            debug("[".concat(this._sessionId, "]: {").concat(mediaSequenceValue, "}_{").concat(currentVod.getLastSequenceMediaSequenceValueSubtitle(), "} SUBTITLES"));
-                            manifestMseq = playheadState.mediaSeqSubtitle + mediaSequenceValue;
-                        }
-                        debug("[".concat(this._sessionId, "]: [").concat(playheadState.vodMediaSeqSubtitle, "]_[").concat(currentVod.getLiveMediaSequencesCount("subtitle"), "] SUBTITLES (").concat(subtitleGroupId, ")"));
-                        m3u8_3 = currentVod.getLiveMediaSubtitleSequences(playheadState.mediaSeqSubtitle, subtitleGroupId, subtitleLanguage, playheadState.vodMediaSeqSubtitle, sessionState.discSeqSubtitle, this.targetDurationPadding, this.forceTargetDuration);
-                        // # Case: current VOD does not have the selected track.
-                        if (!m3u8_3) {
-                            debug("[".concat(this._sessionId, "]: [").concat(playheadState.mediaSeqSubtitle + playheadState.vodMediaSeqSubtitle, "] Request Failed for current subtitle manifest for ").concat(subtitleGroupId, "-").concat(subtitleLanguage));
-                        }
-                        debug("[".concat(this._sessionId, "]: [").concat(manifestMseq, "][").concat(manifestDseq, "] Current subtitle manifest for ").concat(subtitleGroupId, "-").concat(subtitleLanguage, " requested"));
-                        this.prevVodMediaSeq.subtitle = playheadState.vodMediaSeqSubtitle;
-                        this.prevMediaSeqOffset.subtitle = playheadState.mediaSeqSubtitle;
-                        return [2 /*return*/, m3u8_3];
-                    case 12:
-                        err_6 = _a.sent();
-                        logerror(this._sessionId, err_6);
-                        return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 13:
-                        _a.sent(); // force reading up from shared store
-                        throw new Error("Failed to generate subtitle manifest: " + JSON.stringify(playheadState));
-                    case 14: return [3 /*break*/, 16];
-                    case 15: throw new Error("Engine not ready");
-                    case 16: return [2 /*return*/];
+                if (!this._sessionState) {
+                    throw new Error('Session not ready');
                 }
+                variantKey = JSON.stringify({ groupId: subtitleGroupId, lang: subtitleLanguage });
+                m3u8 = this._getM3u8File("subtitle", variantKey, playbackSessionId);
+                return [2 /*return*/, m3u8];
             });
         });
     };
     Session.prototype.incrementAsync = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var isLeader, sessionState, playheadState, currentVod, _a, isOldVod, nextState, leaderAction, leaderState, _b, m3u8_4, _c, playheadPosVideoMs, playheadAudio, playheadSubtitle, audioSeqLastIdx, sessionStateObj, _d, playheadPosVideo, _e, subtitleSeqLastIdx, sessionStateObj, _f, newSessionState, updatedValues, updatedPlayhead, mediaSequenceValue, audioInfo, mediaSequenceValueAudio, subsInfo, mediaSequenceValueSubtitle, diffMs, m3u8;
+            var isLeader, sessionState, playheadState, currentVod, _a, isOldVod, nextState, leaderAction, leaderState, _b, m3u8_1, _c, playheadPosVideoMs, playheadAudio, playheadSubtitle, audioSeqLastIdx, sessionStateObj, _d, playheadPosVideo, _e, subtitleSeqLastIdx, sessionStateObj, _f, newSessionState, updatedValues, updatedPlayhead, mediaSequenceValue, audioInfo, mediaSequenceValueAudio, subsInfo, mediaSequenceValueSubtitle, diffMs, m3u8;
             return __generator(this, function (_g) {
                 switch (_g.label) {
                     case 0: return [4 /*yield*/, this._tickAsync()];
@@ -1145,9 +890,9 @@ var Session = /** @class */ (function () {
                         debug("[".concat(this._sessionId, "]: Return the last generated m3u8 to give the leader some time"));
                         return [4 /*yield*/, this._playheadState.getLastM3u8()];
                     case 12:
-                        m3u8_4 = _g.sent();
-                        if (m3u8_4) {
-                            return [2 /*return*/, m3u8_4];
+                        m3u8_1 = _g.sent();
+                        if (m3u8_1) {
+                            return [2 /*return*/, m3u8_1];
                         }
                         else {
                             debug("[".concat(this._sessionId, "]: We don't have any previously generated m3u8"));
@@ -1756,7 +1501,7 @@ var Session = /** @class */ (function () {
     };
     Session.prototype._tickAsync = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var newVod, sessionState, isLeader, currentVod, vodResponse, _a, nextVodPromise, nextVodStart, _b, loadPromise, hlsOpts, _c, mediaManifestLoader, audioManifestLoader, loadStart, updatedSessionState, _d, _e, _f, _g, err_7, _h, length_1, endMseqValue, endMseqValueAudio, endMseqValueSubtitle, lastDiscontinuity, lastDiscontinuityAudio, lastDiscontinuitySubtitle, _j, vodPromise, gracePeriod, nextVodStart, _k, loadPromise, hlsOpts, _l, mediaManifestLoader, audioManifestLoader, loadStart, _m, _o, updatedSessionState, _p, _q, diffMs, err_8, startTS, _r, mSeq, currentVod_1, dSeq, mSeqOffset, reloadBehind, segments, playheadState, nextMseq, _s, _t, err_9;
+            var newVod, sessionState, isLeader, currentVod, vodResponse, _a, nextVodPromise, nextVodStart, _b, loadPromise, hlsOpts, _c, mediaManifestLoader, audioManifestLoader, loadStart, updatedSessionState, _d, _e, _f, _g, err_4, _h, length_1, endMseqValue, endMseqValueAudio, endMseqValueSubtitle, lastDiscontinuity, lastDiscontinuityAudio, lastDiscontinuitySubtitle, _j, vodPromise, gracePeriod, nextVodStart, _k, loadPromise, hlsOpts, _l, mediaManifestLoader, audioManifestLoader, loadStart, _m, _o, updatedSessionState, _p, _q, diffMs, err_5, startTS, _r, mSeq, currentVod_1, dSeq, mSeqOffset, reloadBehind, segments, playheadState, nextMseq, _s, _t, err_6;
             var _this = this;
             return __generator(this, function (_u) {
                 switch (_u.label) {
@@ -1910,13 +1655,13 @@ var Session = /** @class */ (function () {
                         return [2 /*return*/];
                     case 22: return [3 /*break*/, 26];
                     case 23:
-                        err_7 = _u.sent();
+                        err_4 = _u.sent();
                         console.error("[".concat(this._sessionId, "]: Failed to init first VOD"));
                         if (this._assetManager.handleError) {
                             this._assetManager.handleError(new Error("Failed to init first VOD"), vodResponse);
                         }
-                        cloudWatchLog(!this.cloudWatchLogging, 'engine-session', { event: 'error', on: 'firstvod', channel: this._sessionId, err: err_7, vod: vodResponse });
-                        debug(err_7);
+                        cloudWatchLog(!this.cloudWatchLogging, 'engine-session', { event: 'error', on: 'firstvod', channel: this._sessionId, err: err_4, vod: vodResponse });
+                        debug(err_4);
                         return [4 /*yield*/, this._sessionState.remove("nextVod")];
                     case 24:
                         _u.sent();
@@ -1925,7 +1670,7 @@ var Session = /** @class */ (function () {
                         currentVod = _u.sent();
                         if (!currentVod) {
                             debug("No slate to load");
-                            throw err_7;
+                            throw err_4;
                         }
                         return [3 /*break*/, 26];
                     case 26:
@@ -2175,13 +1920,13 @@ var Session = /** @class */ (function () {
                         _u.label = 56;
                     case 56: return [3 /*break*/, 60];
                     case 57:
-                        err_8 = _u.sent();
+                        err_5 = _u.sent();
                         console.error("[".concat(this._sessionId, "]: Failed to init next VOD"));
-                        debug("[".concat(this._sessionId, "]: ").concat(err_8));
+                        debug("[".concat(this._sessionId, "]: ").concat(err_5));
                         if (this._assetManager.handleError) {
                             this._assetManager.handleError(new Error("Failed to init next VOD"), vodResponse);
                         }
-                        cloudWatchLog(!this.cloudWatchLogging, 'engine-session', { event: 'error', on: 'nextvod', channel: this._sessionId, err: err_8, vod: vodResponse });
+                        cloudWatchLog(!this.cloudWatchLogging, 'engine-session', { event: 'error', on: 'nextvod', channel: this._sessionId, err: err_5, vod: vodResponse });
                         return [4 /*yield*/, this._sessionState.remove("nextVod")];
                     case 58:
                         _u.sent();
@@ -2190,7 +1935,7 @@ var Session = /** @class */ (function () {
                         currentVod = _u.sent();
                         if (!currentVod) {
                             debug("No slate to load");
-                            throw err_8;
+                            throw err_5;
                         }
                         // Allow Leader|Follower to clear vodCache...
                         this.isAllowedToClearVodCache = true;
@@ -2301,9 +2046,9 @@ var Session = /** @class */ (function () {
                         _u.label = 80;
                     case 80: return [3 /*break*/, 82];
                     case 81:
-                        err_9 = _u.sent();
+                        err_6 = _u.sent();
                         debug("Failed to init reload vod");
-                        throw err_9;
+                        throw err_6;
                     case 82: return [3 /*break*/, 88];
                     case 83:
                         debug("[".concat(this._sessionId, "]: state=VOD_RELOAD_INITIATING (").concat(sessionState.vodMediaSeqVideo, "_").concat(sessionState.vodMediaSeqAudio, "_").concat(sessionState.vodMediaSeqSubtitle, ", ").concat(currentVod.getLiveMediaSequencesCount(), "_").concat(currentVod.getLiveMediaSequencesCount("audio"), "_").concat(currentVod.getLiveMediaSequencesCount("subtitle"), ")"));
@@ -2765,6 +2510,211 @@ var Session = /** @class */ (function () {
             });
         });
     };
+    Session.prototype._getM3u8File = function (variantType, variantKey, playbackSessionId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var tries, delayMs, MSDKeys, currentVod, sessionState, playheadState, state, DELAY_TIME_MS, ACTION, isLeader, diffMs, manifestMseq, manifestDseq, mediaSequenceValue, m3u8_2, parsedGroupId, parsedLang, data, data, err_7;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        tries = 12;
+                        _a.label = 1;
+                    case 1:
+                        if (!(tries > 0 && this.leaderIsSettingNextVod)) return [3 /*break*/, 3];
+                        delayMs = 250;
+                        debug("[".concat(this._sessionId, "]: Leader is setting the next vod. Waiting ").concat(delayMs, "ms_").concat(tries));
+                        return [4 /*yield*/, timer(delayMs)];
+                    case 2:
+                        _a.sent();
+                        tries--;
+                        return [3 /*break*/, 1];
+                    case 3:
+                        MSDKeys = {
+                            mediaSeq: null,
+                            vodMediaSeq: null,
+                            discSeq: null
+                        };
+                        if (variantType === "video") {
+                            MSDKeys.mediaSeq = "mediaSeq";
+                            MSDKeys.vodMediaSeq = "vodMediaSeqVideo";
+                            MSDKeys.discSeq = "discSeq";
+                        }
+                        else if (variantType === "audio") {
+                            MSDKeys.mediaSeq = "mediaSeqAudio";
+                            MSDKeys.vodMediaSeq = "vodMediaSeqAudio";
+                            MSDKeys.discSeq = "discSeqAudio";
+                        }
+                        else if (variantType === "subtitle") {
+                            MSDKeys.mediaSeq = "mediaSeqSubtitle";
+                            MSDKeys.vodMediaSeq = "vodMediaSeqSubtitle";
+                            MSDKeys.discSeq = "discSeqSubtitle";
+                        }
+                        currentVod = null;
+                        return [4 /*yield*/, this._sessionState.getValues([MSDKeys.vodMediaSeq, MSDKeys.discSeq])];
+                    case 4:
+                        sessionState = _a.sent();
+                        return [4 /*yield*/, this._playheadState.getValues([MSDKeys.mediaSeq, MSDKeys.vodMediaSeq, "playheadRef"])];
+                    case 5:
+                        playheadState = _a.sent();
+                        if (this.prevVodMediaSeq[variantType] === null) {
+                            this.prevVodMediaSeq[variantType] = playheadState[MSDKeys.vodMediaSeq];
+                        }
+                        if (this.prevMediaSeqOffset[variantType] === null) {
+                            this.prevMediaSeqOffset[variantType] = playheadState[MSDKeys.mediaSeq];
+                        }
+                        if (!(playheadState[MSDKeys.vodMediaSeq] > sessionState[MSDKeys.vodMediaSeq] ||
+                            (playheadState[MSDKeys.vodMediaSeq] < sessionState[MSDKeys.vodMediaSeq] &&
+                                playheadState[MSDKeys.mediaSeq] === this.prevMediaSeqOffset[variantType]))) return [3 /*break*/, 9];
+                        return [4 /*yield*/, this._sessionState.get("state")];
+                    case 6:
+                        state = _a.sent();
+                        DELAY_TIME_MS = 1000;
+                        ACTION = [SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state) ? "Reloaded" : "Loaded Next";
+                        debug("[".concat(this._sessionId, "]: Recently ").concat(ACTION, " Vod. PlayheadState not up-to-date (").concat(playheadState[MSDKeys.vodMediaSeq], "_").concat(sessionState[MSDKeys.vodMediaSeq], "). Waiting ").concat(DELAY_TIME_MS, "ms before reading from store again (").concat(variantType, ")"));
+                        return [4 /*yield*/, timer(DELAY_TIME_MS)];
+                    case 7:
+                        _a.sent();
+                        return [4 /*yield*/, this._playheadState.getValues([MSDKeys.mediaSeq, MSDKeys.vodMediaSeq])];
+                    case 8:
+                        playheadState = _a.sent();
+                        _a.label = 9;
+                    case 9:
+                        if (!(variantType === "video")) return [3 /*break*/, 15];
+                        if (!(playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video)) return [3 /*break*/, 14];
+                        debug("[".concat(this._sessionId, "]: current[").concat(playheadState.vodMediaSeqVideo, "]_prev[").concat(this.prevVodMediaSeq.video, "]"));
+                        debug("[".concat(this._sessionId, "]: current-offset[").concat(playheadState.mediaSeq, "]_prev-offset[").concat(this.prevMediaSeqOffset.video, "]"));
+                        // If true, then we have not updated the prev-values and not cleared the cache yet.
+                        if (playheadState.vodMediaSeqVideo < this.prevVodMediaSeq.video || playheadState.mediaSeq !== this.prevMediaSeqOffset.video) {
+                            this.isAllowedToClearVodCache = true;
+                        }
+                        return [4 /*yield*/, this._sessionStateStore.isLeader(this._instanceId)];
+                    case 10:
+                        isLeader = _a.sent();
+                        if (!(!isLeader && this.isAllowedToClearVodCache)) return [3 /*break*/, 13];
+                        debug("[".concat(this._sessionId, "]: Not a leader and first|second media sequence in a VOD is requested. Invalidate cache to ensure having the correct VOD."));
+                        return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
+                    case 11:
+                        _a.sent();
+                        this.isAllowedToClearVodCache = false;
+                        return [4 /*yield*/, this._playheadState.get("diffCompensation")];
+                    case 12:
+                        diffMs = _a.sent();
+                        if (diffMs) {
+                            this.diffCompensation = diffMs;
+                            debug("[".concat(this._sessionId, "]: Setting diffCompensation->").concat(this.diffCompensation));
+                            if (this.diffCompensation) {
+                                this.timePositionOffset = this.diffCompensation;
+                                cloudWatchLog(!this.cloudWatchLogging, "engine-session", {
+                                    event: "timePositionOffsetUpdated",
+                                    channel: this._sessionId,
+                                    offsetMs: this.timePositionOffset,
+                                });
+                            }
+                            else {
+                                this.timePositionOffset = 0;
+                            }
+                        }
+                        _a.label = 13;
+                    case 13: return [3 /*break*/, 15];
+                    case 14:
+                        this.isAllowedToClearVodCache = true;
+                        _a.label = 15;
+                    case 15: return [4 /*yield*/, this._sessionState.getCurrentVod()];
+                    case 16:
+                        currentVod = _a.sent();
+                        if (!currentVod) return [3 /*break*/, 24];
+                        if (!(playheadState[MSDKeys.vodMediaSeq] < 2 || playheadState[MSDKeys.mediaSeq] !== this.prevMediaSeqOffset.video)) return [3 /*break*/, 20];
+                        if (!(playheadState.playheadRef > this.currentPlayheadRef)) return [3 /*break*/, 20];
+                        return [4 /*yield*/, timer(500)];
+                    case 17:
+                        _a.sent();
+                        this.currentPlayheadRef = playheadState.playheadRef;
+                        debug("[".concat(this._sessionId, "]: While requesting ").concat(variantType, " manifest for ").concat(variantKey, ", (mseq=").concat(playheadState[MSDKeys.vodMediaSeq], ")"));
+                        return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
+                    case 18:
+                        _a.sent(); // force reading up from shared store
+                        return [4 /*yield*/, this._sessionState.getCurrentVod()];
+                    case 19:
+                        currentVod = _a.sent();
+                        _a.label = 20;
+                    case 20:
+                        _a.trys.push([20, 21, , 23]);
+                        manifestMseq = playheadState[MSDKeys.mediaSeq] + playheadState[MSDKeys.vodMediaSeq];
+                        manifestDseq = sessionState[MSDKeys.discSeq] + this._getCurrentVodData("discontinuities", variantType, currentVod)[playheadState[MSDKeys.vodMediaSeq]];
+                        if (currentVod.sequenceAlwaysContainNewSegments) {
+                            mediaSequenceValue = this._getCurrentVodData("mseqValues", variantType, currentVod)[playheadState[MSDKeys.vodMediaSeq]];
+                            debug("[".concat(this._sessionId, "]: {").concat(mediaSequenceValue, "}_{").concat(this._getCurrentVodData("finalMseqValue", variantType, currentVod), "}"));
+                            manifestMseq = playheadState[MSDKeys.mediaSeq] + mediaSequenceValue;
+                        }
+                        debug("[".concat(this._sessionId, "]: [").concat(playheadState[MSDKeys.vodMediaSeq], "]_[").concat(this._getCurrentVodData("mseqCount", variantType, currentVod), "]"));
+                        parsedGroupId = void 0;
+                        parsedLang = void 0;
+                        if (variantType === "video") {
+                            m3u8_2 = currentVod.getLiveMediaSequences(playheadState[MSDKeys.mediaSeq], variantKey, playheadState[MSDKeys.vodMediaSeq], sessionState[MSDKeys.discSeq], this.targetDurationPadding, this.forceTargetDuration);
+                        }
+                        else if ((variantType === "audio")) {
+                            data = JSON.parse(variantKey);
+                            parsedGroupId = data.groupId;
+                            parsedLang = data.lang;
+                            m3u8_2 = currentVod.getLiveMediaAudioSequences(playheadState[MSDKeys.mediaSeq], parsedGroupId, parsedLang, playheadState[MSDKeys.vodMediaSeq], sessionState[MSDKeys.discSeq], this.targetDurationPadding, this.forceTargetDuration);
+                        }
+                        else if (variantType === "subtitle") {
+                            data = JSON.parse(variantKey);
+                            parsedGroupId = data.groupId;
+                            parsedLang = data.lang;
+                            m3u8_2 = currentVod.getLiveMediaSubtitleSequences(playheadState[MSDKeys.mediaSeq], parsedGroupId, parsedLang, playheadState[MSDKeys.vodMediaSeq], sessionState[MSDKeys.discSeq], this.targetDurationPadding, this.forceTargetDuration);
+                        }
+                        debug("[".concat(this._sessionId, "]:").concat(playbackSessionId ? "[".concat(playbackSessionId, "]:") : "", " [").concat(manifestMseq, "][").concat(manifestDseq, "][+").concat(this.targetDurationPadding || 0, "] Current ").concat(variantType, " manifest for ").concat(variantType === "video" ? variantKey : "".concat(parsedGroupId, "_").concat(parsedLang), " requested"));
+                        this.prevVodMediaSeq[variantType] = playheadState[MSDKeys.vodMediaSeq];
+                        this.prevMediaSeqOffset[variantType] = playheadState[MSDKeys.mediaSeq];
+                        return [2 /*return*/, m3u8_2];
+                    case 21:
+                        err_7 = _a.sent();
+                        logerror(this._sessionId, err_7);
+                        return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
+                    case 22:
+                        _a.sent(); // force reading up from shared store
+                        throw new Error("Failed to generate manifest: " + JSON.stringify(playheadState));
+                    case 23: return [3 /*break*/, 25];
+                    case 24: throw new Error("Engine not ready");
+                    case 25: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Session.prototype._getCurrentVodData = function (dataName, variantType, vod) {
+        switch (dataName) {
+            case "discontinuities":
+                if (variantType === "video")
+                    return vod.discontinuities;
+                if (variantType === "audio")
+                    return vod.discontinuitiesAudio;
+                if (variantType === "subtitle")
+                    return vod.discontinuitiesSubtitle;
+            case "mseqValues":
+                if (variantType === "video")
+                    return vod.mediaSequenceValues;
+                if (variantType === "audio")
+                    return vod.mediaSequenceValuesAudio;
+                if (variantType === "subtitle")
+                    return vod.mediaSequenceValuesSubtitle;
+            case "finalMseqValue":
+                if (variantType === "video")
+                    return vod.getLastSequenceMediaSequenceValue();
+                if (variantType === "audio")
+                    return vod.getLastSequenceMediaSequenceValueAudio();
+                if (variantType === "subtitle")
+                    return vod.getLastSequenceMediaSequenceValueSubtitle();
+            case "mseqCount":
+                if (variantType === "video")
+                    return vod.getLiveMediaSequencesCount();
+                if (variantType === "audio")
+                    return vod.getLiveMediaSequencesCount("audio");
+                if (variantType === "subtitle")
+                    return vod.getLiveMediaSequencesCount("subtitle");
+            default:
+                console.log("WARNING! dataName:".concat(dataName, " is not valid"));
+        }
+    };
     return Session;
 }());
 module.exports = Session;

package/dist/examples/demux.js

@@ -78,7 +78,7 @@ var RefChannelManager = /** @class */ (function () {
     RefChannelManager.prototype._getAudioTracks = function () {
         return [
             { language: "en", name: "English", default: true },
-            { language: "es", name: "Spanish", default: false },
+            { language: "sp", name: "Spanish", default: false },
         ];
     };
     RefChannelManager.prototype._getSubtitleTracks = function () {

package/dist/package.json

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

package/engine/session.js

@@ -560,231 +560,26 @@ class Session {
     if (!this._sessionState) {
       throw new Error('Session not ready');
     }
-    // Be sure that the leader is not in the middle of setting new vod data in store.
-    // Followers will never run this part...
-    let tries = 12;
-    while (tries > 0 && this.leaderIsSettingNextVod) {
-      debug(`[${this._sessionId}]: Leader is setting the next vod. Waiting 500ms_${tries}`);
-      await timer(500);
-      tries--;
-    }
-
-    const sessionState = await this._sessionState.getValues(["vodMediaSeqVideo", "discSeq"]);
-    let playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"]);
-
-    if (this.prevVodMediaSeq.video === null) {
-      this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
-    }
-    if (this.prevMediaSeqOffset.video === null) {
-      this.prevMediaSeqOffset.video = playheadState.mediaSeq;
-    }
-
-    if (playheadState.vodMediaSeqVideo > sessionState.vodMediaSeqVideo || (playheadState.vodMediaSeqVideo < sessionState.vodMediaSeqVideo && playheadState.mediaSeq === this.prevMediaSeqOffset.video)) {
-      const state = await this._sessionState.get("state");
-      const DELAY_TIME_MS = 1000;
-      const ACTION = [SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state) ? "Reloaded" : "Loaded Next";
-      debug(`[${this._sessionId}]: Recently ${ACTION} Vod. PlayheadState not up-to-date (${playheadState.vodMediaSeqVideo}_${sessionState.vodMediaSeqVideo}). Waiting ${DELAY_TIME_MS}ms before reading from store again`);
-      await timer(DELAY_TIME_MS);
-      playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"]);
-    }
-
-    // Force reading up from store, but only once if the condition is right
-    if (playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video) {
-      debug(`[${this._sessionId}]: current[${playheadState.vodMediaSeqVideo}]_prev[${this.prevVodMediaSeq.video}]`);
-      debug(`[${this._sessionId}]: current-offset[${playheadState.mediaSeq}]_prev-offset[${this.prevMediaSeqOffset.video}]`);
-      // If true, then we have not updated the prev-values and not cleared the cache yet.
-      if (playheadState.vodMediaSeqVideo < this.prevVodMediaSeq.video || playheadState.mediaSeq !== this.prevMediaSeqOffset.video) {
-        this.isAllowedToClearVodCache = true;
-      }
-      const isLeader = await this._sessionStateStore.isLeader(this._instanceId);
-      if (!isLeader && this.isAllowedToClearVodCache) {
-        debug(`[${this._sessionId}]: Not a leader and first|second media sequence in a VOD is requested. Invalidate cache to ensure having the correct VOD.`);
-        await this._sessionState.clearCurrentVodCache();
-        this.isAllowedToClearVodCache = false;
-        const diffMs = await this._playheadState.get("diffCompensation");
-        if (diffMs) {
-          this.diffCompensation = diffMs;
-          debug(`[${this._sessionId}]: Setting diffCompensation->${this.diffCompensation}`);
-          if (this.diffCompensation) {
-            this.timePositionOffset = this.diffCompensation;
-            cloudWatchLog(!this.cloudWatchLogging, 'engine-session',
-              { event: 'timePositionOffsetUpdated', channel: this._sessionId, offsetMs: this.timePositionOffset });
-          } else {
-            this.timePositionOffset = 0;
-          }
-        }
-      }
-    } else {
-      this.isAllowedToClearVodCache = true;
-    }
-
-    const currentVod = await this._sessionState.getCurrentVod();
-    if (currentVod) {
-      try {
-        let manifestMseq = playheadState.mediaSeq + playheadState.vodMediaSeqVideo;
-        let manifestDseq = sessionState.discSeq + currentVod.discontinuities[playheadState.vodMediaSeqVideo];
-        if (currentVod.sequenceAlwaysContainNewSegments) {
-          const mediaSequenceValue = currentVod.mediaSequenceValues[playheadState.vodMediaSeqVideo];
-          debug(`[${this._sessionId}]: {${mediaSequenceValue}}_{${currentVod.getLastSequenceMediaSequenceValue()}}`);
-          manifestMseq = playheadState.mediaSeq + mediaSequenceValue;
-        }
-
-        debug(`[${this._sessionId}]: [${playheadState.vodMediaSeqVideo}]_[${currentVod.getLiveMediaSequencesCount()}]`);
-        const m3u8 = currentVod.getLiveMediaSequences(playheadState.mediaSeq, bw, playheadState.vodMediaSeqVideo, sessionState.discSeq, this.targetDurationPadding, this.forceTargetDuration);
-        debug(`[${this._sessionId}]: [${manifestMseq}][${manifestDseq}][+${this.targetDurationPadding || 0}] Current media manifest for ${bw} requested`);
-        this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
-        this.prevMediaSeqOffset.video = playheadState.mediaSeq;
-        return m3u8;
-      } catch (err) {
-        logerror(this._sessionId, err);
-        await this._sessionState.clearCurrentVodCache(); // force reading up from shared store
-        throw new Error("Failed to generate manifest: " + JSON.stringify(playheadState));
-      }
-    } else {
-      throw new Error("Engine not ready");
-    }
+    const m3u8 = this._getM3u8File("video", bw, playbackSessionId);
+    return m3u8;
   }
 
   async getCurrentAudioManifestAsync(audioGroupId, audioLanguage, playbackSessionId) {
     if (!this._sessionState) {
       throw new Error('Session not ready');
     }
-    let currentVod = null;
-    const sessionState = await this._sessionState.getValues(["discSeqAudio", "vodMediaSeqAudio"]);
-    let playheadState = await this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio", "playheadRef"]);
-
-    if (playheadState.vodMediaSeqAudio > sessionState.vodMediaSeqAudio || (playheadState.vodMediaSeqAudio < sessionState.vodMediaSeqAudio && playheadState.mediaSeqAudio === this.prevMediaSeqOffset.audio)) {
-      const state = await this._sessionState.get("state");
-      const DELAY_TIME_MS = 1000;
-      const ACTION = [SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state) ? "Reloaded" : "Loaded Next";
-      debug(`[${this._sessionId}]: Recently ${ACTION} Vod. PlayheadState not up-to-date (${playheadState.vodMediaSeqAudio}_${sessionState.vodMediaSeqAudio}). Waiting ${DELAY_TIME_MS}ms before reading from store again`);
-      await timer(DELAY_TIME_MS);
-      playheadState = await this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"]);
-    }
-    // local store the prev values
-    if (this.prevVodMediaSeq.audio === null) {
-      this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
-    }
-    if (this.prevMediaSeqOffset.audio === null) {
-      this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
-    }
-    currentVod = await this._sessionState.getCurrentVod();
-    if (currentVod) {
-      // condition suggesting that a new vod should exist
-      if (playheadState.vodMediaSeqAudio < 2 || playheadState.mediaSeqAudio !== this.prevMediaSeqOffset.audio) {
-        if (playheadState.playheadRef > this.currentPlayheadRef) {
-          await timer(500);
-          this.currentPlayheadRef = playheadState.playheadRef;
-          debug(`[${this._sessionId}]: While requesting audio manifest for ${audioGroupId}-${audioLanguage}, (mseq=${playheadState.vodMediaSeqAudio})`);
-          await this._sessionState.clearCurrentVodCache(); // force reading up from shared store
-          currentVod = await this._sessionState.getCurrentVod();
-        }
-      }
-      try {
-        let manifestMseq = playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio;
-        let manifestDseq = sessionState.discSeqAudio + currentVod.discontinuitiesAudio[playheadState.vodMediaSeqAudio];
-        if (currentVod.sequenceAlwaysContainNewSegments) {
-          const mediaSequenceValue = currentVod.mediaSequenceValuesAudio[playheadState.vodMediaSeqAudio];
-          debug(`[${this._sessionId}]: {${mediaSequenceValue}}_{${currentVod.getLastSequenceMediaSequenceValueAudio()}} AUDIO`);
-          manifestMseq = playheadState.mediaSeqAudio + mediaSequenceValue;
-        }
-        debug(`[${this._sessionId}]: [${playheadState.vodMediaSeqAudio}]_[${currentVod.getLiveMediaSequencesCount("audio")}] AUDIO (${audioGroupId})`);
-        const m3u8 = currentVod.getLiveMediaAudioSequences(
-          playheadState.mediaSeqAudio,
-          audioGroupId,
-          audioLanguage,
-          playheadState.vodMediaSeqAudio,
-          sessionState.discSeqAudio,
-          this.targetDurationPadding,
-          this.forceTargetDuration
-        );
-        // # Case: current VOD does not have the selected track.
-        if (!m3u8) {
-          debug(`[${this._sessionId}]: [${playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio}] Request Failed for current audio manifest for ${audioGroupId}-${audioLanguage}`);
-        }
-        debug(`[${this._sessionId}]: [${manifestMseq}][${manifestDseq}] Current audio manifest for ${audioGroupId}-${audioLanguage} requested`);
-        this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
-        this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
-        return m3u8;
-      } catch (err) {
-        logerror(this._sessionId, err);
-        await this._sessionState.clearCurrentVodCache(); // force reading up from shared store
-        throw new Error("Failed to generate audio manifest: " + JSON.stringify(playheadState));
-      }
-    } else {
-      throw new Error("Engine not ready");
-    }
+    const variantKey = JSON.stringify({groupId: audioGroupId, lang: audioLanguage});
+    const m3u8 = this._getM3u8File("audio", variantKey, playbackSessionId);
+    return m3u8;
   }
   
-  async getCurrentSubtitleManifestAsync(subtitleGroupId, subtitleLanguage) {
+  async getCurrentSubtitleManifestAsync(subtitleGroupId, subtitleLanguage, playbackSessionId) {
     if (!this._sessionState) {
       throw new Error('Session not ready');
     }
-    let currentVod = null;
-    const sessionState = await this._sessionState.getValues(["discSeqSubtitle", "vodMediaSeqSubtitle"]);
-    let playheadState = await this._playheadState.getValues(["mediaSeqSubtitle", "vodMediaSeqSubtitle", "playheadRef"]);
-
-    if (playheadState.vodMediaSeqSubtitle > sessionState.vodMediaSeqSubtitle || (playheadState.vodMediaSeqSubtitle < sessionState.vodMediaSeqSubtitle && playheadState.mediaSeqSubtitle === this.prevMediaSeqOffset.subtitle)) {
-      const state = await this._sessionState.get("state");
-      const DELAY_TIME_MS = 1000;
-      const ACTION = [SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state) ? "Reloaded" : "Loaded Next";
-      debug(`[${this._sessionId}]: Recently ${ACTION} Vod. PlayheadState not up-to-date (${playheadState.vodMediaSeqSubtitle}_${sessionState.vodMediaSeqSubtitle}). Waiting ${DELAY_TIME_MS}ms before reading from store again`);
-      await timer(DELAY_TIME_MS);
-      playheadState = await this._playheadState.getValues(["mediaSeqSubtitle", "vodMediaSeqSubtitle"]);
-    }
-    // local store the prev values
-    if (this.prevVodMediaSeq.subtitle === null) {
-      this.prevVodMediaSeq.subtitle = playheadState.vodMediaSeqSubtitle;
-    }
-    if (this.prevMediaSeqOffset.subtitle === null) {
-      this.prevMediaSeqOffset.subtitle = playheadState.mediaSeqSubtitle;
-    }
-    currentVod = await this._sessionState.getCurrentVod();
-    if (currentVod) {
-      // condition suggesting that a new vod should exist
-      if (playheadState.vodMediaSeqSubtitle < 2 || playheadState.mediaSeqSubtitle !== this.prevMediaSeqOffset.subtitle) {
-        if (playheadState.playheadRef > this.currentPlayheadRef) {
-          await timer(500);
-          this.currentPlayheadRef = playheadState.playheadRef;
-          debug(`[${this._sessionId}]: While requesting subtitle manifest for ${subtitleGroupId}-${subtitleLanguage}, (mseq=${playheadState.vodMediaSeqSubtitle})`);
-          await this._sessionState.clearCurrentVodCache(); // force reading up from shared store
-          currentVod = await this._sessionState.getCurrentVod();
-        }
-      }
-      try {
-        let manifestMseq = playheadState.mediaSeqSubtitle + playheadState.vodMediaSeqSubtitle;
-        let manifestDseq = sessionState.discSeqSubtitle + currentVod.discontinuitiesSubtitle[playheadState.vodMediaSeqSubtitle];
-        if (currentVod.sequenceAlwaysContainNewSegments) {
-          const mediaSequenceValue = currentVod.mediaSequenceValuesSubtitle[playheadState.vodMediaSeqSubtitle];
-          debug(`[${this._sessionId}]: {${mediaSequenceValue}}_{${currentVod.getLastSequenceMediaSequenceValueSubtitle()}} SUBTITLES`);
-          manifestMseq = playheadState.mediaSeqSubtitle + mediaSequenceValue;
-        }
-        debug(`[${this._sessionId}]: [${playheadState.vodMediaSeqSubtitle}]_[${currentVod.getLiveMediaSequencesCount("subtitle")}] SUBTITLES (${subtitleGroupId})`);
-        const m3u8 = currentVod.getLiveMediaSubtitleSequences(
-          playheadState.mediaSeqSubtitle,
-          subtitleGroupId,
-          subtitleLanguage,
-          playheadState.vodMediaSeqSubtitle,
-          sessionState.discSeqSubtitle,
-          this.targetDurationPadding,
-          this.forceTargetDuration
-        );
-        // # Case: current VOD does not have the selected track.
-        if (!m3u8) {
-          debug(`[${this._sessionId}]: [${playheadState.mediaSeqSubtitle + playheadState.vodMediaSeqSubtitle}] Request Failed for current subtitle manifest for ${subtitleGroupId}-${subtitleLanguage}`);
-        }
-        debug(`[${this._sessionId}]: [${manifestMseq}][${manifestDseq}] Current subtitle manifest for ${subtitleGroupId}-${subtitleLanguage} requested`);
-        this.prevVodMediaSeq.subtitle = playheadState.vodMediaSeqSubtitle;
-        this.prevMediaSeqOffset.subtitle = playheadState.mediaSeqSubtitle;
-        return m3u8;
-      } catch (err) {
-        logerror(this._sessionId, err);
-        await this._sessionState.clearCurrentVodCache(); // force reading up from shared store
-        throw new Error("Failed to generate subtitle manifest: " + JSON.stringify(playheadState));
-      }
-    } else {
-      throw new Error("Engine not ready");
-    }
+    const variantKey = JSON.stringify({groupId: subtitleGroupId, lang: subtitleLanguage});
+    const m3u8 = this._getM3u8File("subtitle", variantKey, playbackSessionId);
+    return m3u8;
   }
 
   async incrementAsync() {
@@ -2134,6 +1929,204 @@ class Session {
       diff: posDiff
     };
   }
+
+  async _getM3u8File(variantType, variantKey, playbackSessionId) {
+    // Be sure that the leader is not in the middle of setting new vod data in store.
+    // Followers will never run this part...
+    let tries = 12;
+    while (tries > 0 && this.leaderIsSettingNextVod) {
+      const delayMs = 250;
+      debug(`[${this._sessionId}]: Leader is setting the next vod. Waiting ${delayMs}ms_${tries}`);
+      await timer(delayMs);
+      tries--;
+    }
+    // Media Sequence Data Keys
+    const MSDKeys = {
+      mediaSeq: null,
+      vodMediaSeq: null,
+      discSeq: null
+    };
+    if (variantType === "video") {
+      MSDKeys.mediaSeq = "mediaSeq";
+      MSDKeys.vodMediaSeq = "vodMediaSeqVideo";
+      MSDKeys.discSeq = "discSeq";
+    } else if (variantType === "audio") {
+      MSDKeys.mediaSeq = "mediaSeqAudio";
+      MSDKeys.vodMediaSeq = "vodMediaSeqAudio";
+      MSDKeys.discSeq = "discSeqAudio";
+    } else if (variantType === "subtitle") {
+      MSDKeys.mediaSeq = "mediaSeqSubtitle";
+      MSDKeys.vodMediaSeq = "vodMediaSeqSubtitle";
+      MSDKeys.discSeq = "discSeqSubtitle";
+    }
+    let currentVod = null;
+    const sessionState = await this._sessionState.getValues([MSDKeys.vodMediaSeq, MSDKeys.discSeq]);
+    let playheadState = await this._playheadState.getValues([MSDKeys.mediaSeq, MSDKeys.vodMediaSeq, "playheadRef"]);
+
+    if (this.prevVodMediaSeq[variantType] === null) {
+      this.prevVodMediaSeq[variantType] = playheadState[MSDKeys.vodMediaSeq];
+    }
+    if (this.prevMediaSeqOffset[variantType] === null) {
+      this.prevMediaSeqOffset[variantType] = playheadState[MSDKeys.mediaSeq];
+    }
+
+    if (
+      playheadState[MSDKeys.vodMediaSeq] > sessionState[MSDKeys.vodMediaSeq] ||
+      (playheadState[MSDKeys.vodMediaSeq] < sessionState[MSDKeys.vodMediaSeq] &&
+        playheadState[MSDKeys.mediaSeq] === this.prevMediaSeqOffset[variantType])
+    ) {
+      const state = await this._sessionState.get("state");
+      const DELAY_TIME_MS = 1000;
+      const ACTION = [SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state) ? "Reloaded" : "Loaded Next";
+      debug(
+        `[${this._sessionId}]: Recently ${ACTION} Vod. PlayheadState not up-to-date (${playheadState[MSDKeys.vodMediaSeq]}_${
+          sessionState[MSDKeys.vodMediaSeq]
+        }). Waiting ${DELAY_TIME_MS}ms before reading from store again (${variantType})`
+      );
+      await timer(DELAY_TIME_MS);
+      playheadState = await this._playheadState.getValues([MSDKeys.mediaSeq, MSDKeys.vodMediaSeq]);
+    }
+
+    if (variantType === "video") {
+      // Force reading up from store, but only once if the condition is right.
+      if (playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video) {
+        debug(`[${this._sessionId}]: current[${playheadState.vodMediaSeqVideo}]_prev[${this.prevVodMediaSeq.video}]`);
+        debug(`[${this._sessionId}]: current-offset[${playheadState.mediaSeq}]_prev-offset[${this.prevMediaSeqOffset.video}]`);
+        // If true, then we have not updated the prev-values and not cleared the cache yet.
+        if (playheadState.vodMediaSeqVideo < this.prevVodMediaSeq.video || playheadState.mediaSeq !== this.prevMediaSeqOffset.video) {
+          this.isAllowedToClearVodCache = true;
+        }
+        const isLeader = await this._sessionStateStore.isLeader(this._instanceId);
+        if (!isLeader && this.isAllowedToClearVodCache) {
+          debug(
+            `[${this._sessionId}]: Not a leader and first|second media sequence in a VOD is requested. Invalidate cache to ensure having the correct VOD.`
+          );
+          await this._sessionState.clearCurrentVodCache();
+          this.isAllowedToClearVodCache = false;
+          const diffMs = await this._playheadState.get("diffCompensation");
+          if (diffMs) {
+            this.diffCompensation = diffMs;
+            debug(`[${this._sessionId}]: Setting diffCompensation->${this.diffCompensation}`);
+            if (this.diffCompensation) {
+              this.timePositionOffset = this.diffCompensation;
+              cloudWatchLog(!this.cloudWatchLogging, "engine-session", {
+                event: "timePositionOffsetUpdated",
+                channel: this._sessionId,
+                offsetMs: this.timePositionOffset,
+              });
+            } else {
+              this.timePositionOffset = 0;
+            }
+          }
+        }
+      } else {
+        this.isAllowedToClearVodCache = true;
+      }
+    }
+
+    currentVod = await this._sessionState.getCurrentVod();
+    if (currentVod) {
+      // condition suggesting that a new vod should exist
+      if (playheadState[MSDKeys.vodMediaSeq] < 2 || playheadState[MSDKeys.mediaSeq] !== this.prevMediaSeqOffset.video) {
+        if (playheadState.playheadRef > this.currentPlayheadRef) {
+          await timer(500);
+          this.currentPlayheadRef = playheadState.playheadRef;
+          debug(`[${this._sessionId}]: While requesting ${variantType} manifest for ${variantKey}, (mseq=${playheadState[MSDKeys.vodMediaSeq]})`);
+          await this._sessionState.clearCurrentVodCache(); // force reading up from shared store
+          currentVod = await this._sessionState.getCurrentVod();
+        }
+      }
+      try {
+        let manifestMseq = playheadState[MSDKeys.mediaSeq] + playheadState[MSDKeys.vodMediaSeq];
+        let manifestDseq =
+          sessionState[MSDKeys.discSeq] + this._getCurrentVodData("discontinuities", variantType, currentVod)[playheadState[MSDKeys.vodMediaSeq]];
+        if (currentVod.sequenceAlwaysContainNewSegments) {
+          const mediaSequenceValue = this._getCurrentVodData("mseqValues", variantType, currentVod)[playheadState[MSDKeys.vodMediaSeq]];
+          debug(`[${this._sessionId}]: {${mediaSequenceValue}}_{${this._getCurrentVodData("finalMseqValue", variantType, currentVod)}}`);
+          manifestMseq = playheadState[MSDKeys.mediaSeq] + mediaSequenceValue;
+        }
+
+        debug(`[${this._sessionId}]: [${playheadState[MSDKeys.vodMediaSeq]}]_[${this._getCurrentVodData("mseqCount", variantType, currentVod)}]`);
+
+        let m3u8;
+        let parsedGroupId;
+        let parsedLang;
+        if (variantType === "video") {
+          m3u8 = currentVod.getLiveMediaSequences(
+            playheadState[MSDKeys.mediaSeq],
+            variantKey,
+            playheadState[MSDKeys.vodMediaSeq],
+            sessionState[MSDKeys.discSeq],
+            this.targetDurationPadding,
+            this.forceTargetDuration
+          );
+        } else if ((variantType === "audio")) {
+          const data = JSON.parse(variantKey);
+          parsedGroupId = data.groupId;
+          parsedLang = data.lang;
+          m3u8 = currentVod.getLiveMediaAudioSequences(
+            playheadState[MSDKeys.mediaSeq],
+            parsedGroupId,
+            parsedLang,
+            playheadState[MSDKeys.vodMediaSeq],
+            sessionState[MSDKeys.discSeq],
+            this.targetDurationPadding,
+            this.forceTargetDuration
+          );
+        } else if (variantType === "subtitle") {
+          const data = JSON.parse(variantKey);
+          parsedGroupId = data.groupId;
+          parsedLang = data.lang;
+          m3u8 = currentVod.getLiveMediaSubtitleSequences(
+            playheadState[MSDKeys.mediaSeq],
+            parsedGroupId,
+            parsedLang,
+            playheadState[MSDKeys.vodMediaSeq],
+            sessionState[MSDKeys.discSeq],
+            this.targetDurationPadding,
+            this.forceTargetDuration
+          );
+        }
+        debug(
+          `[${this._sessionId}]:${playbackSessionId ? `[${playbackSessionId}]:` : ""} [${manifestMseq}][${manifestDseq}][+${this.targetDurationPadding || 0}] Current ${variantType} manifest for ${
+            variantType === "video" ? variantKey : `${parsedGroupId}_${parsedLang}`
+          } requested`
+        );
+        this.prevVodMediaSeq[variantType] = playheadState[MSDKeys.vodMediaSeq];
+        this.prevMediaSeqOffset[variantType] = playheadState[MSDKeys.mediaSeq];
+        return m3u8;
+      } catch (err) {
+        logerror(this._sessionId, err);
+        await this._sessionState.clearCurrentVodCache(); // force reading up from shared store
+        throw new Error("Failed to generate manifest: " + JSON.stringify(playheadState));
+      }
+    } else {
+      throw new Error("Engine not ready");
+    }
+  }
+
+  _getCurrentVodData(dataName, variantType, vod) {
+    switch (dataName) {
+      case "discontinuities":
+        if (variantType === "video") return vod.discontinuities;
+        if (variantType === "audio") return vod.discontinuitiesAudio;
+        if (variantType === "subtitle") return vod.discontinuitiesSubtitle;
+      case "mseqValues":
+        if (variantType === "video") return vod.mediaSequenceValues;
+        if (variantType === "audio") return vod.mediaSequenceValuesAudio;
+        if (variantType === "subtitle") return vod.mediaSequenceValuesSubtitle;
+      case "finalMseqValue":
+        if (variantType === "video") return vod.getLastSequenceMediaSequenceValue();
+        if (variantType === "audio") return vod.getLastSequenceMediaSequenceValueAudio();
+        if (variantType === "subtitle") return vod.getLastSequenceMediaSequenceValueSubtitle();
+      case "mseqCount":
+        if (variantType === "video") return vod.getLiveMediaSequencesCount();
+        if (variantType === "audio") return vod.getLiveMediaSequencesCount("audio");
+        if (variantType === "subtitle") return vod.getLiveMediaSequencesCount("subtitle");
+      default:
+        console.log(`WARNING! dataName:${dataName} is not valid`);
+    }
+  }
 }
 
 module.exports = Session;

package/examples/demux.ts

@@ -89,7 +89,7 @@ class RefChannelManager implements IChannelManager {
   _getAudioTracks(): AudioTracks[] {
     return [
       { language: "en", name: "English", default: true },
-      { language: "es", name: "Spanish", default: false },
+      { language: "sp", name: "Spanish", default: false },
     ];
   }
   _getSubtitleTracks(): SubtitleTracks[] {

package/package.json

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