eyevinn-channel-engine 4.0.3 → 4.0.5

package/dist/engine/server.d.ts

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

package/dist/engine/server.js

@@ -406,6 +406,7 @@ var ChannelEngine = /** @class */ (function () {
                                             averageSegmentDuration: channel.options && channel.options.averageSegmentDuration ? channel.options.averageSegmentDuration : this.streamerOpts.defaultAverageSegmentDuration,
                                             useDemuxedAudio: options.useDemuxedAudio,
                                             alwaysNewSegments: options.alwaysNewSegments,
+                                            noSessionDataTags: options.noSessionDataTags,
                                             playheadDiffThreshold: channel.options && channel.options.playheadDiffThreshold ? channel.options.playheadDiffThreshold : this.streamerOpts.defaultPlayheadDiffThreshold,
                                             maxTickInterval: channel.options && channel.options.maxTickInterval ? channel.options.maxTickInterval : this.streamerOpts.defaultMaxTickInterval,
                                             targetDurationPadding: channel.options && channel.options.targetDurationPadding ? channel.options.targetDurationPadding : this.streamerOpts.targetDurationPadding,

package/dist/engine/session.d.ts

@@ -49,6 +49,7 @@ declare class Session {
     _sessionProfile: any;
     _audioTracks: any;
     _closedCaptions: any;
+    _noSessionDataTags: any;
     slateUri: any;
     slateRepetitions: any;
     slateDuration: any;

package/dist/engine/session.js

@@ -124,6 +124,9 @@ var Session = /** @class */ (function () {
             if (config.closedCaptions) {
                 this._closedCaptions = config.closedCaptions;
             }
+            if (config.noSessionDataTags) {
+                this._noSessionDataTags = config.noSessionDataTags;
+            }
             if (config.slateUri) {
                 this.slateUri = config.slateUri;
                 this.slateRepetitions = config.slateRepetitions || 10;
@@ -1080,66 +1083,69 @@ var Session = /** @class */ (function () {
                         _d.vodMediaSeqAudio = _o.sent();
                         _o.label = 17;
                     case 17:
-                        if (!(sessionState.vodMediaSeqVideo >= currentVod.getLiveMediaSequencesCount() - 1)) return [3 /*break*/, 21];
+                        if (!(sessionState.vodMediaSeqVideo >= currentVod.getLiveMediaSequencesCount() - 1)) return [3 /*break*/, 20];
                         _e = sessionState;
                         return [4 /*yield*/, this._sessionState.set("vodMediaSeqVideo", currentVod.getLiveMediaSequencesCount() - 1)];
                     case 18:
                         _e.vodMediaSeqVideo = _o.sent();
                         _f = sessionState;
-                        return [4 /*yield*/, this._sessionState.set("vodMediaSeqAudio", currentVod.getLiveMediaSequencesCount("audio") - 1)];
-                    case 19:
-                        _f.vodMediaSeqAudio = _o.sent();
-                        _g = sessionState;
                         return [4 /*yield*/, this._sessionState.set("state", SessionState.VOD_NEXT_INIT)];
+                    case 19:
+                        _f.state = _o.sent();
+                        _o.label = 20;
                     case 20:
-                        _g.state = _o.sent();
-                        _o.label = 21;
+                        if (!(sessionState.vodMediaSeqAudio >= currentVod.getLiveMediaSequencesCount("audio") - 1)) return [3 /*break*/, 22];
+                        _g = sessionState;
+                        return [4 /*yield*/, this._sessionState.set("vodMediaSeqAudio", currentVod.getLiveMediaSequencesCount("audio") - 1)];
                     case 21:
-                        if (!this.isSwitchingBackToV2L) return [3 /*break*/, 23];
+                        _g.vodMediaSeqAudio = _o.sent();
+                        _o.label = 22;
+                    case 22:
+                        if (!this.isSwitchingBackToV2L) return [3 /*break*/, 24];
                         _h = sessionState;
                         return [4 /*yield*/, this._sessionState.set("state", SessionState.VOD_RELOAD_INIT)];
-                    case 22:
+                    case 23:
                         _h.state = _o.sent();
                         this.isSwitchingBackToV2L = false;
-                        _o.label = 23;
-                    case 23:
+                        _o.label = 24;
+                    case 24:
                         _j = playheadState;
                         return [4 /*yield*/, this._playheadState.set("mediaSeq", sessionState.mediaSeq)];
-                    case 24:
+                    case 25:
                         _j.mediaSeq = _o.sent();
                         _k = playheadState;
                         return [4 /*yield*/, this._playheadState.set("mediaSeqAudio", sessionState.mediaSeqAudio)];
-                    case 25:
+                    case 26:
                         _k.mediaSeqAudio = _o.sent();
                         _l = playheadState;
                         return [4 /*yield*/, this._playheadState.set("vodMediaSeqVideo", sessionState.vodMediaSeqVideo)];
-                    case 26:
+                    case 27:
                         _l.vodMediaSeqVideo = _o.sent();
                         _m = playheadState;
                         return [4 /*yield*/, this._playheadState.set("vodMediaSeqAudio", sessionState.vodMediaSeqAudio)];
-                    case 27:
+                    case 28:
                         _m.vodMediaSeqAudio = _o.sent();
                         if (currentVod.sequenceAlwaysContainNewSegments) {
                             mediaSequenceValue = currentVod.mediaSequenceValues[playheadState.vodMediaSeqVideo];
                             debug("[".concat(this._sessionId, "]: Session can now serve mseq={").concat(playheadState.mediaSeq + mediaSequenceValue, "}"));
                         }
                         debug("[".concat(this._sessionId, "]: INCREMENT (mseq=").concat(playheadState.mediaSeq + playheadState.vodMediaSeqVideo, ") vodMediaSeq=(").concat(playheadState.vodMediaSeqVideo, "_").concat(playheadState.vodMediaSeqAudio, " of ").concat(currentVod.getLiveMediaSequencesCount(), "_").concat(currentVod.getLiveMediaSequencesCount("audio"), ")"));
-                        if (!(playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video)) return [3 /*break*/, 32];
+                        if (!(playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video)) return [3 /*break*/, 33];
                         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 (playheadState.vodMediaSeqVideo < this.prevVodMediaSeq.video || playheadState.mediaSeq !== this.prevMediaSeqOffset.video) {
                             this.isAllowedToClearVodCache = true;
                         }
-                        if (!(!isLeader && this.isAllowedToClearVodCache)) return [3 /*break*/, 31];
+                        if (!(!isLeader && this.isAllowedToClearVodCache)) return [3 /*break*/, 32];
                         debug("[".concat(this._sessionId, "]: Not a leader and have just set 'playheadState.vodMediaSeqVideo' to 0|1. Invalidate cache to ensure having the correct VOD."));
                         return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 28:
+                    case 29:
                         _o.sent();
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 29:
+                    case 30:
                         currentVod = _o.sent();
                         return [4 /*yield*/, this._playheadState.get("diffCompensation")];
-                    case 30:
+                    case 31:
                         diffMs = _o.sent();
                         if (diffMs) {
                             this.diffCompensation = diffMs;
@@ -1153,12 +1159,12 @@ var Session = /** @class */ (function () {
                             }
                         }
                         this.isAllowedToClearVodCache = false;
-                        _o.label = 31;
-                    case 31: return [3 /*break*/, 33];
-                    case 32:
-                        this.isAllowedToClearVodCache = true;
-                        _o.label = 33;
+                        _o.label = 32;
+                    case 32: return [3 /*break*/, 34];
                     case 33:
+                        this.isAllowedToClearVodCache = true;
+                        _o.label = 34;
+                    case 34:
                         // Update Value for Previous Sequence
                         this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
                         this.prevMediaSeqOffset.video = playheadState.mediaSeq;
@@ -1168,7 +1174,7 @@ var Session = /** @class */ (function () {
                         }
                         m3u8 = currentVod.getLiveMediaSequences(playheadState.mediaSeq, 180000, playheadState.vodMediaSeqVideo, sessionState.discSeq);
                         return [4 /*yield*/, this._playheadState.setLastM3u8(m3u8)];
-                    case 34:
+                    case 35:
                         _o.sent();
                         return [2 /*return*/, m3u8];
                 }
@@ -1367,8 +1373,10 @@ var Session = /** @class */ (function () {
                         m3u8 = "#EXTM3U\n";
                         m3u8 += "#EXT-X-VERSION:4\n";
                         m3u8 += m3u8Header(this._instanceId);
-                        m3u8 += "#EXT-X-SESSION-DATA:DATA-ID=\"eyevinn.tv.session.id\",VALUE=\"".concat(this._sessionId, "\"\n");
-                        m3u8 += "#EXT-X-SESSION-DATA:DATA-ID=\"eyevinn.tv.eventstream\",VALUE=\"/eventstream/".concat(this._sessionId, "\"\n");
+                        if (!this._noSessionDataTags) {
+                            m3u8 += "#EXT-X-SESSION-DATA:DATA-ID=\"eyevinn.tv.session.id\",VALUE=\"".concat(this._sessionId, "\"\n");
+                            m3u8 += "#EXT-X-SESSION-DATA:DATA-ID=\"eyevinn.tv.eventstream\",VALUE=\"/eventstream/".concat(this._sessionId, "\"\n");
+                        }
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
                     case 1:
                         currentVod = _a.sent();

package/dist/package.json

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

package/engine/server.ts

@@ -46,6 +46,7 @@ export interface ChannelEngineOpts {
   forceTargetDuration?: boolean;
   adCopyMgrUri?: string; // deprecated
   adXchangeUri?: string; // deprecated
+  noSessionDataTags?: boolean;
 }
 
 interface StreamerOpts {
@@ -396,6 +397,7 @@ export class ChannelEngine {
         averageSegmentDuration: channel.options && channel.options.averageSegmentDuration ? channel.options.averageSegmentDuration : this.streamerOpts.defaultAverageSegmentDuration,
         useDemuxedAudio: options.useDemuxedAudio,
         alwaysNewSegments: options.alwaysNewSegments,
+        noSessionDataTags: options.noSessionDataTags,
         playheadDiffThreshold: channel.options && channel.options.playheadDiffThreshold ? channel.options.playheadDiffThreshold : this.streamerOpts.defaultPlayheadDiffThreshold,
         maxTickInterval: channel.options && channel.options.maxTickInterval ? channel.options.maxTickInterval : this.streamerOpts.defaultMaxTickInterval,
         targetDurationPadding: channel.options && channel.options.targetDurationPadding ? channel.options.targetDurationPadding : this.streamerOpts.targetDurationPadding,

package/engine/session.js

@@ -97,6 +97,9 @@ class Session {
       if (config.closedCaptions) {
         this._closedCaptions = config.closedCaptions;
       }
+      if (config.noSessionDataTags) {
+        this._noSessionDataTags = config.noSessionDataTags;
+      }
       if (config.slateUri) {
         this.slateUri = config.slateUri;
         this.slateRepetitions = config.slateRepetitions || 10;
@@ -776,10 +779,13 @@ class Session {
 
     if (sessionState.vodMediaSeqVideo >= currentVod.getLiveMediaSequencesCount() - 1) {
       sessionState.vodMediaSeqVideo = await this._sessionState.set("vodMediaSeqVideo", currentVod.getLiveMediaSequencesCount() - 1);
-      sessionState.vodMediaSeqAudio = await this._sessionState.set("vodMediaSeqAudio", currentVod.getLiveMediaSequencesCount("audio") - 1);
       sessionState.state = await this._sessionState.set("state", SessionState.VOD_NEXT_INIT);
     }
 
+    if (sessionState.vodMediaSeqAudio >= currentVod.getLiveMediaSequencesCount("audio") - 1) {
+      sessionState.vodMediaSeqAudio = await this._sessionState.set("vodMediaSeqAudio", currentVod.getLiveMediaSequencesCount("audio") - 1);
+    }
+
     if (this.isSwitchingBackToV2L) {
       sessionState.state = await this._sessionState.set("state", SessionState.VOD_RELOAD_INIT);
       this.isSwitchingBackToV2L = false;
@@ -952,8 +958,10 @@ class Session {
     let m3u8 = "#EXTM3U\n";
     m3u8 += "#EXT-X-VERSION:4\n";
     m3u8 += m3u8Header(this._instanceId);
-    m3u8 += `#EXT-X-SESSION-DATA:DATA-ID="eyevinn.tv.session.id",VALUE="${this._sessionId}"\n`;
-    m3u8 += `#EXT-X-SESSION-DATA:DATA-ID="eyevinn.tv.eventstream",VALUE="/eventstream/${this._sessionId}"\n`;
+    if (!this._noSessionDataTags) {
+      m3u8 += `#EXT-X-SESSION-DATA:DATA-ID="eyevinn.tv.session.id",VALUE="${this._sessionId}"\n`;
+      m3u8 += `#EXT-X-SESSION-DATA:DATA-ID="eyevinn.tv.eventstream",VALUE="/eventstream/${this._sessionId}"\n`;
+    }
     const currentVod = await this._sessionState.getCurrentVod();
     if (!currentVod) {
       throw new Error('Session not ready');

package/package.json

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