eyevinn-channel-engine 4.2.3 → 4.2.5

package/dist/engine/session.js

@@ -2477,26 +2477,34 @@ var Session = /** @class */ (function () {
     Session.prototype._truncateVod = function (vodResponse) {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            var truncatedVod = new HLSTruncateVod(vodResponse.uri, vodResponse.desiredDuration / 1000);
-            truncatedVod.load()
-                .then(function () {
-                var audioManifestLoader;
-                var mediaManifestLoader = function (bw) {
-                    var mediaManifestStream = new Readable();
-                    mediaManifestStream.push(truncatedVod.getMediaManifest(bw));
-                    mediaManifestStream.push(null);
-                    return mediaManifestStream;
-                };
-                if (_this.use_demuxed_audio) {
-                    audioManifestLoader = function (audioGroupId, audioLanguage) {
+            try {
+                var truncatedVod_1 = new HLSTruncateVod(vodResponse.uri, vodResponse.desiredDuration / 1000);
+                truncatedVod_1.load()
+                    .then(function () {
+                    var audioManifestLoader;
+                    var mediaManifestLoader = function (bw) {
                         var mediaManifestStream = new Readable();
-                        mediaManifestStream.push(truncatedVod.getAudioManifest(audioGroupId, audioLanguage));
+                        mediaManifestStream.push(truncatedVod_1.getMediaManifest(bw));
                         mediaManifestStream.push(null);
                         return mediaManifestStream;
                     };
-                }
-                resolve({ mediaManifestLoader: mediaManifestLoader, audioManifestLoader: audioManifestLoader });
-            });
+                    if (_this.use_demuxed_audio) {
+                        audioManifestLoader = function (audioGroupId, audioLanguage) {
+                            var mediaManifestStream = new Readable();
+                            mediaManifestStream.push(truncatedVod_1.getAudioManifest(audioGroupId, audioLanguage));
+                            mediaManifestStream.push(null);
+                            return mediaManifestStream;
+                        };
+                    }
+                    resolve({ mediaManifestLoader: mediaManifestLoader, audioManifestLoader: audioManifestLoader });
+                }).catch(function (err) {
+                    debug(err);
+                    reject(err);
+                });
+            }
+            catch (err) {
+                reject(err);
+            }
         });
     };
     Session.prototype._truncateSlate = function (afterVod, requestedDuration, vodUri) {

package/dist/engine/session_state.js

@@ -126,31 +126,34 @@ var SharedSessionState = /** @class */ (function () {
     };
     SharedSessionState.prototype.setCurrentVod = function (hlsVod, opts) {
         return __awaiter(this, void 0, void 0, function () {
-            var newHlsVodJson, isLeader;
+            var isLeader;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.sessionId) {
                             throw new Error("shared session state store has not been initialized");
                         }
-                        if (!this.store.isShared()) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.set("currentVod", hlsVod.toJSON())];
+                        if (!this.store.isShared()) return [3 /*break*/, 6];
+                        return [4 /*yield*/, this.store.clearLeaderCache()];
                     case 1:
-                        newHlsVodJson = _a.sent();
+                        _a.sent();
                         return [4 /*yield*/, this.store.isLeader(this.instanceId)];
                     case 2:
                         isLeader = _a.sent();
-                        if (!isLeader) {
-                            debug("[".concat(this.sessionId, "]: not a leader, will not overwrite currentVod in shared store"));
-                            hlsVod = new HLSVod();
-                            hlsVod.fromJSON(newHlsVodJson);
-                        }
+                        if (!isLeader) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.set("currentVod", hlsVod.toJSON())];
+                    case 3:
+                        _a.sent();
                         return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, this.set("currentVod", hlsVod)];
                     case 4:
-                        _a.sent();
+                        debug("[".concat(this.sessionId, "]: not a leader, will not overwrite currentVod in shared store"));
                         _a.label = 5;
-                    case 5:
+                    case 5: return [3 /*break*/, 8];
+                    case 6: return [4 /*yield*/, this.set("currentVod", hlsVod)];
+                    case 7:
+                        _a.sent();
+                        _a.label = 8;
+                    case 8:
                         if (this.cache.currentVod) {
                             this.cache.currentVod.ts = Date.now();
                             this.cache.currentVod.ttl = CURRENTVOD_CACHE_TTL;

package/dist/examples/truncate.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/examples/truncate.js

@@ -0,0 +1,92 @@
+"use strict";
+/*
+ * Reference implementation of Channel Engine library
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+var index_1 = require("../index");
+var DEFAULT_ASSETS = [
+    {
+        id: 1,
+        title: "Tears of Steel",
+        uri: "https://maitv-vod.lab.eyevinn.technology/tearsofsteel_4k.mov/master.m3u8",
+    },
+    {
+        id: 2,
+        title: "VINN",
+        uri: "https://maitv-vod.lab.eyevinn.technology/VINN.mp4/master.m3u8",
+    },
+];
+var RefAssetManager = /** @class */ (function () {
+    function RefAssetManager(opts) {
+        this.assets = {};
+        this.assets['1'] = DEFAULT_ASSETS;
+        this.pos = {
+            '1': 0,
+        };
+    }
+    /**
+     *
+     * @param {Object} vodRequest
+     *   {
+     *      sessionId,
+     *      category,
+     *      playlistId
+     *   }
+     */
+    RefAssetManager.prototype.getNextVod = function (vodRequest) {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            var channelId = vodRequest.playlistId;
+            if (_this.pos[channelId] === undefined) {
+                _this.pos[channelId] = 0;
+                _this.assets[channelId] = DEFAULT_ASSETS;
+            }
+            if (_this.assets[channelId]) {
+                var vod = _this.assets[channelId][_this.pos[channelId]++];
+                if (_this.pos[channelId] > _this.assets[channelId].length - 1) {
+                    _this.pos[channelId] = 0;
+                }
+                var vodResponse = {
+                    id: vod.id,
+                    title: vod.title,
+                    uri: vod.uri,
+                    desiredDuration: 50000
+                };
+                resolve(vodResponse);
+            }
+            else {
+                reject("Invalid channelId provided");
+            }
+        });
+    };
+    return RefAssetManager;
+}());
+var RefChannelManager = /** @class */ (function () {
+    function RefChannelManager() {
+        this.channels = [];
+        this.channels.push({ id: "1", profile: this._getProfile() });
+    }
+    RefChannelManager.prototype.getChannels = function () {
+        return this.channels;
+    };
+    RefChannelManager.prototype._getProfile = function () {
+        return [
+            { bw: 6134000, codecs: "avc1.4d001f,mp4a.40.2", resolution: [1024, 458] },
+            { bw: 2323000, codecs: "avc1.4d001f,mp4a.40.2", resolution: [640, 286] },
+            { bw: 1313000, codecs: "avc1.4d001f,mp4a.40.2", resolution: [480, 214] },
+        ];
+    };
+    return RefChannelManager;
+}());
+var refAssetManager = new RefAssetManager();
+var refChannelManager = new RefChannelManager();
+var engineOptions = {
+    heartbeat: "/",
+    averageSegmentDuration: 2000,
+    channelManager: refChannelManager,
+    defaultSlateUri: "https://maitv-vod.lab.eyevinn.technology/slate-consuo.mp4/master.m3u8",
+    slateRepetitions: 10,
+};
+var engine = new index_1.ChannelEngine(refAssetManager, engineOptions);
+engine.start();
+engine.listen(process.env.PORT || 8000);

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.2.3",
+  "version": "4.2.5",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.0",
     "@eyevinn/hls-truncate": "^0.2.0",
-    "@eyevinn/hls-vodtolive": "^3.0.0",
+    "@eyevinn/hls-vodtolive": "^3.0.1",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",

package/engine/session.js

@@ -1794,29 +1794,34 @@ class Session {
 
   _truncateVod(vodResponse) {
     return new Promise((resolve, reject) => {
-      const truncatedVod = new HLSTruncateVod(vodResponse.uri, vodResponse.desiredDuration / 1000);
-      truncatedVod.load()
-        .then(() => {
-          let audioManifestLoader;
-          const mediaManifestLoader = (bw) => {
-            let mediaManifestStream = new Readable();
-            mediaManifestStream.push(truncatedVod.getMediaManifest(bw));
-            mediaManifestStream.push(null);
-            return mediaManifestStream;
-          };
-          if (this.use_demuxed_audio) {
-            audioManifestLoader = (audioGroupId, audioLanguage) => {
+      try {
+        const truncatedVod = new HLSTruncateVod(vodResponse.uri, vodResponse.desiredDuration / 1000);
+        truncatedVod.load()
+          .then(() => {
+            let audioManifestLoader;
+            const mediaManifestLoader = (bw) => {
               let mediaManifestStream = new Readable();
-              mediaManifestStream.push(truncatedVod.getAudioManifest(audioGroupId, audioLanguage));
+              mediaManifestStream.push(truncatedVod.getMediaManifest(bw));
               mediaManifestStream.push(null);
               return mediaManifestStream;
             };
-          }
-          resolve({ mediaManifestLoader, audioManifestLoader });
-        });
+            if (this.use_demuxed_audio) {
+              audioManifestLoader = (audioGroupId, audioLanguage) => {
+                let mediaManifestStream = new Readable();
+                mediaManifestStream.push(truncatedVod.getAudioManifest(audioGroupId, audioLanguage));
+                mediaManifestStream.push(null);
+                return mediaManifestStream;
+              };
+            }
+            resolve({ mediaManifestLoader, audioManifestLoader });
+          }).catch(err => {
+            debug(err);
+            reject(err);
+          });
+      } catch (err) {
+        reject(err);
+      }
     });
-
-
   }
 
   _truncateSlate(afterVod, requestedDuration, vodUri) {

package/engine/session_state.js

@@ -75,12 +75,12 @@ class SharedSessionState {
     }
 
     if (this.store.isShared()) {
-      let newHlsVodJson = await this.set("currentVod", hlsVod.toJSON());
+      await this.store.clearLeaderCache();
       const isLeader = await this.store.isLeader(this.instanceId);
-      if (!isLeader) {
+      if (isLeader) {
+        await this.set("currentVod", hlsVod.toJSON());
+      } else {
         debug(`[${this.sessionId}]: not a leader, will not overwrite currentVod in shared store`);
-        hlsVod = new HLSVod();
-        hlsVod.fromJSON(newHlsVodJson);
       }
     } else {
       await this.set("currentVod", hlsVod);

package/examples/truncate.ts

@@ -0,0 +1,104 @@
+/*
+ * Reference implementation of Channel Engine library
+ */
+
+import { ChannelEngine, ChannelEngineOpts, 
+  IAssetManager, IChannelManager, 
+  VodRequest, VodResponse, Channel, ChannelProfile
+} from "../index";
+
+const DEFAULT_ASSETS = [
+  {
+    id: 1,
+    title: "Tears of Steel",
+    uri: "https://maitv-vod.lab.eyevinn.technology/tearsofsteel_4k.mov/master.m3u8",
+  },
+  {
+    id: 2,
+    title: "VINN",
+    uri: "https://maitv-vod.lab.eyevinn.technology/VINN.mp4/master.m3u8",
+  },
+];
+
+class RefAssetManager implements IAssetManager {
+  private assets;
+  private pos;
+
+  constructor(opts?) {
+    this.assets = {};
+    this.assets['1'] = DEFAULT_ASSETS;
+    this.pos = {
+      '1': 0,
+    };
+  }
+
+  /**
+   *
+   * @param {Object} vodRequest
+   *   {
+   *      sessionId,
+   *      category,
+   *      playlistId
+   *   }
+   */
+  getNextVod(vodRequest: VodRequest): Promise<VodResponse> {
+    return new Promise((resolve, reject) => {
+      const channelId = vodRequest.playlistId;
+      if (this.pos[channelId] === undefined) {
+        this.pos[channelId] = 0;
+        this.assets[channelId] = DEFAULT_ASSETS;
+      }
+      if (this.assets[channelId]) {
+        let vod = this.assets[channelId][this.pos[channelId]++];
+        if (this.pos[channelId] > this.assets[channelId].length - 1) {
+          this.pos[channelId] = 0;
+        }
+        const vodResponse = {
+          id: vod.id,
+          title: vod.title,
+          uri: vod.uri,
+          desiredDuration: 50000
+        };
+        resolve(vodResponse);
+      } else {
+        reject("Invalid channelId provided");
+      }
+    });
+  }
+}
+
+class RefChannelManager implements IChannelManager {
+  private channels: Channel[] = [];
+
+  constructor() {
+    this.channels.push({ id: "1", profile: this._getProfile() });
+  }
+
+  getChannels(): Channel[] {
+    return this.channels;
+  }
+
+  _getProfile(): ChannelProfile[] {
+    return [
+      { bw: 6134000, codecs: "avc1.4d001f,mp4a.40.2", resolution: [1024, 458] },
+      { bw: 2323000, codecs: "avc1.4d001f,mp4a.40.2", resolution: [640, 286] },
+      { bw: 1313000, codecs: "avc1.4d001f,mp4a.40.2", resolution: [480, 214] },
+    ];
+  }
+}
+
+const refAssetManager = new RefAssetManager();
+const refChannelManager = new RefChannelManager();
+
+const engineOptions: ChannelEngineOpts = {
+  heartbeat: "/",
+  averageSegmentDuration: 2000,
+  channelManager: refChannelManager,
+  defaultSlateUri:
+    "https://maitv-vod.lab.eyevinn.technology/slate-consuo.mp4/master.m3u8",
+  slateRepetitions: 10,
+};
+
+const engine = new ChannelEngine(refAssetManager, engineOptions);
+engine.start();
+engine.listen(process.env.PORT || 8000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.2.3",
+  "version": "4.2.5",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.0",
     "@eyevinn/hls-truncate": "^0.2.0",
-    "@eyevinn/hls-vodtolive": "^3.0.0",
+    "@eyevinn/hls-vodtolive": "^3.0.1",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",