eyevinn-channel-engine 4.0.2 → 4.0.4

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;
@@ -920,7 +923,7 @@ var Session = /** @class */ (function () {
                     case 2:
                         playheadState = _a.sent();
                         if (!(playheadState.vodMediaSeqAudio > sessionState.vodMediaSeqAudio ||
-                            (playheadState.vodMediaSeqAudio < sessionState.vodMediaSeqAudio && playheadState.mediaSeqAudio === this.prevMediaSeqOffset.audio))) return [3 /*break*/, 8];
+                            (playheadState.vodMediaSeqAudio < sessionState.vodMediaSeqAudio && playheadState.mediaSeqAudio === this.prevMediaSeqOffset.audio))) return [3 /*break*/, 9];
                         return [4 /*yield*/, this._sessionState.get("state")];
                     case 3:
                         state = _a.sent();
@@ -932,14 +935,17 @@ var Session = /** @class */ (function () {
                         return [4 /*yield*/, this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"])];
                     case 5:
                         playheadState = _a.sent();
-                        return [3 /*break*/, 8];
+                        return [3 /*break*/, 9];
                     case 6:
                         debug("[".concat(this._sessionId, "]: Recently Loaded Next Vod. PlayheadState not up-to-date. Delay audio-m3u8 Response by 1000ms"));
                         return [4 /*yield*/, timer(1000)];
                     case 7:
                         _a.sent();
-                        _a.label = 8;
+                        return [4 /*yield*/, this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"])];
                     case 8:
+                        playheadState = _a.sent();
+                        _a.label = 9;
+                    case 9:
                         // local store the prev values
                         if (this.prevVodMediaSeq.audio === null) {
                             this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
@@ -948,29 +954,29 @@ var Session = /** @class */ (function () {
                             this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
                         }
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 9:
+                    case 10:
                         currentVod = _a.sent();
-                        if (!currentVod) return [3 /*break*/, 17];
-                        if (!(playheadState.vodMediaSeqAudio < 2 || playheadState.mediaSeqAudio !== this.prevMediaSeqOffset.audio)) return [3 /*break*/, 13];
+                        if (!currentVod) return [3 /*break*/, 18];
+                        if (!(playheadState.vodMediaSeqAudio < 2 || playheadState.mediaSeqAudio !== this.prevMediaSeqOffset.audio)) return [3 /*break*/, 14];
                         AGE_THRESH = 20 * 1000;
                         cacheAge = null;
                         if (this._sessionState.cache && this._sessionState.cache.currentVod.ts) {
                             cacheAge = Date.now() - this._sessionState.cache.currentVod.ts;
                         }
-                        if (!(cacheAge !== null && cacheAge > AGE_THRESH)) return [3 /*break*/, 13];
+                        if (!(cacheAge !== null && cacheAge > AGE_THRESH)) return [3 /*break*/, 14];
                         return [4 /*yield*/, timer(500)];
-                    case 10:
+                    case 11:
                         _a.sent();
                         debug("[".concat(this._sessionId, "]: While requesting audio manifest for ").concat(audioGroupId, "-").concat(audioLanguage, ", (mseq=").concat(playheadState.vodMediaSeqAudio, ")(vod cache age=").concat(cacheAge, ")"));
                         return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 11:
+                    case 12:
                         _a.sent(); // force reading up from shared store
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 12:
-                        currentVod = _a.sent();
-                        _a.label = 13;
                     case 13:
-                        _a.trys.push([13, 14, , 16]);
+                        currentVod = _a.sent();
+                        _a.label = 14;
+                    case 14:
+                        _a.trys.push([14, 15, , 17]);
                         manifestMseq = playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio;
                         manifestDseq = sessionState.discSeqAudio + currentVod.discontinuitiesAudio[playheadState.vodMediaSeqAudio];
                         if (currentVod.sequenceAlwaysContainNewSegments) {
@@ -988,16 +994,16 @@ var Session = /** @class */ (function () {
                         this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
                         this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
                         return [2 /*return*/, m3u8_2];
-                    case 14:
+                    case 15:
                         err_5 = _a.sent();
                         logerror(this._sessionId, err_5);
                         return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 15:
+                    case 16:
                         _a.sent(); // force reading up from shared store
                         throw new Error("Failed to generate audio manifest: " + JSON.stringify(playheadState));
-                    case 16: return [3 /*break*/, 18];
-                    case 17: throw new Error("Engine not ready");
-                    case 18: return [2 /*return*/];
+                    case 17: return [3 /*break*/, 19];
+                    case 18: throw new Error("Engine not ready");
+                    case 19: return [2 /*return*/];
                 }
             });
         });
@@ -1364,8 +1370,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.2",
+  "version": "4.0.4",
   "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;
@@ -650,7 +653,7 @@ class Session {
     }
     let currentVod = null;
     const sessionState = await this._sessionState.getValues(["discSeqAudio", "vodMediaSeqAudio"]);
-    const playheadState = await this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"]);
+    let playheadState = await this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"]);
 
     if (
       playheadState.vodMediaSeqAudio > sessionState.vodMediaSeqAudio ||
@@ -666,6 +669,7 @@ class Session {
       } else {
         debug(`[${this._sessionId}]: Recently Loaded Next Vod. PlayheadState not up-to-date. Delay audio-m3u8 Response by 1000ms`);
         await timer(1000);
+        playheadState = await this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"]);
       }
     }
 
@@ -951,8 +955,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.2",
+  "version": "4.0.4",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",