eyevinn-channel-engine 4.3.12 → 5.0.0-rc.2

package/dist/engine/playhead_state.js

@@ -148,7 +148,7 @@ var PlayheadStateStore = /** @class */ (function (_super) {
     function PlayheadStateStore(opts) {
         return _super.call(this, "playhead", opts, {
             state: PlayheadState.IDLE,
-            tickInterval: 3,
+            tickInterval: opts ? (opts.averageSegmentDuration / 1000) : 3,
             mediaSeq: 0,
             vodMediaSeqVideo: 0,
             vodMediaSeqAudio: 0,

package/dist/engine/server.d.ts

@@ -171,11 +171,11 @@ export declare class ChannelEngine {
     getSubtitleManifests(channelId: any): Promise<{}>;
     _handleHeartbeat(req: any, res: any, next: any): void;
     _handleMasterManifest(req: any, res: any, next: any): Promise<void>;
+    _handleMediaManifest(req: any, res: any, next: any): Promise<void>;
     _handleAudioManifest(req: any, res: any, next: any): Promise<void>;
     _handleSubtitleManifest(req: any, res: any, next: any): Promise<void>;
     _handleDummySubtitleEndpoint(req: any, res: any, next: any): Promise<void>;
     _handleSubtitleSliceEndpoint(req: any, res: any, next: any): Promise<void>;
-    _handleMediaManifest(req: any, res: any, next: any): Promise<void>;
     _handleEventStream(req: any, res: any, next: any): void;
     _handleStatus(req: any, res: any, next: any): Promise<void>;
     _handleAggregatedSessionHealth(req: any, res: any, next: any): Promise<void>;

package/dist/engine/server.js

@@ -139,6 +139,7 @@ var ChannelEngine = /** @class */ (function () {
                 volatileKeyTTL: options.volatileKeyTTL,
             }),
             playheadStateStore: new PlayheadStateStore({
+                averageSegmentDuration: options.averageSegmentDuration,
                 redisUrl: options.redisUrl,
                 memcachedUrl: options.memcachedUrl,
                 cacheTTL: options.sharedStoreCacheTTL,
@@ -408,7 +409,7 @@ var ChannelEngine = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 3:
                         err_2 = _a.sent();
-                        debug('Problem occured when updating streamSwitchers');
+                        debug('Problem occurred when updating streamSwitchers');
                         throw new Error(err_2);
                     case 4: return [2 /*return*/];
                 }
@@ -463,12 +464,14 @@ var ChannelEngine = /** @class */ (function () {
                                             useDemuxedAudio: options.useDemuxedAudio,
                                             dummySubtitleEndpoint: this.dummySubtitleEndpoint,
                                             subtitleSliceEndpoint: this.subtitleSliceEndpoint,
-                                            useVTTSubtitles: this.useVTTSubtitles,
+                                            useVTTSubtitles: false,
                                             cloudWatchMetrics: this.logCloudWatchMetrics,
                                             profile: channel.profile,
+                                            audioTracks: channel.audioTracks
                                         }, this.sessionLiveStore);
                                         sessionSwitchers[channel.id] = new StreamSwitcher({
                                             sessionId: channel.id,
+                                            useDemuxedAudio: options.useDemuxedAudio,
                                             streamSwitchManager: this.streamSwitchManager ? this.streamSwitchManager : null
                                         });
                                         return [4 /*yield*/, sessions[channel.id].initAsync()];
@@ -929,21 +932,55 @@ var ChannelEngine = /** @class */ (function () {
             });
         });
     };
-    ChannelEngine.prototype._handleAudioManifest = function (req, res, next) {
+    ChannelEngine.prototype._handleMediaManifest = function (req, res, next) {
         return __awaiter(this, void 0, void 0, function () {
-            var session, body, err_5, err;
+            var session, sessionLive, ts1, body, err_5, err;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        debug("req.url=".concat(req.url));
-                        session = sessions[req.params[2]];
-                        if (!session) return [3 /*break*/, 5];
+                        debug("x-playback-session-id=".concat(req.headers["x-playback-session-id"], " req.url=").concat(req.url));
+                        debug(req.params);
+                        session = sessions[req.params[1]];
+                        sessionLive = sessionsLive[req.params[1]];
+                        if (!(session && sessionLive)) return [3 /*break*/, 13];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, session.getCurrentAudioManifestAsync(req.params[0], req.params[1], req.headers["x-playback-session-id"])];
+                        _a.trys.push([1, 11, , 12]);
+                        ts1 = Date.now();
+                        body = null;
+                        if (!!this.streamSwitchManager) return [3 /*break*/, 3];
+                        debug("[".concat(req.params[1], "]: Responding with VOD2Live manifest"));
+                        return [4 /*yield*/, session.getCurrentMediaManifestAsync(req.params[0], req.headers["x-playback-session-id"])];
                     case 2:
                         body = _a.sent();
+                        return [3 /*break*/, 10];
+                    case 3:
+                        if (!(switcherStatus[req.params[1]] === null || switcherStatus[req.params[1]] === undefined)) return [3 /*break*/, 5];
+                        debug("[".concat(req.params[1], "]: (").concat(switcherStatus[req.params[1]], ") Waiting for streamSwitcher to respond"));
+                        return [4 /*yield*/, timer(500)];
+                    case 4:
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 5:
+                        debug("switcherStatus[".concat(req.params[1], "]=[").concat(switcherStatus[req.params[1]], "]"));
+                        if (!switcherStatus[req.params[1]]) return [3 /*break*/, 7];
+                        debug("[".concat(req.params[1], "]: Responding with Live-stream manifest"));
+                        return [4 /*yield*/, sessionLive.getCurrentMediaManifestAsync(req.params[0])];
+                    case 6:
+                        body = _a.sent();
+                        return [3 /*break*/, 9];
+                    case 7:
+                        debug("[".concat(req.params[1], "]: Responding with VOD2Live manifest"));
+                        return [4 /*yield*/, session.getCurrentMediaManifestAsync(req.params[0], req.headers["x-playback-session-id"])];
+                    case 8:
+                        body = _a.sent();
+                        _a.label = 9;
+                    case 9:
+                        debug("[".concat(req.params[1], "]: Media Manifest Request Took (").concat(Date.now() - ts1, ")ms"));
+                        _a.label = 10;
+                    case 10:
+                        //verbose(`[${session.sessionId}] body=`);
+                        //verbose(body);
                         res.sendRaw(200, Buffer.from(body, 'utf8'), {
                             "Content-Type": "application/vnd.apple.mpegurl",
                             "Access-Control-Allow-Origin": "*",
@@ -951,24 +988,93 @@ var ChannelEngine = /** @class */ (function () {
                             "X-Instance-Id": this.instanceId + "<".concat(version, ">"),
                         });
                         next();
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 12];
+                    case 11:
                         err_5 = _a.sent();
                         next(this._gracefulErrorHandler(err_5));
-                        return [3 /*break*/, 4];
-                    case 4: return [3 /*break*/, 6];
+                        return [3 /*break*/, 12];
+                    case 12: return [3 /*break*/, 14];
+                    case 13:
+                        err = new errs.NotFoundError('Invalid session(s)');
+                        next(err);
+                        _a.label = 14;
+                    case 14: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    ChannelEngine.prototype._handleAudioManifest = function (req, res, next) {
+        return __awaiter(this, void 0, void 0, function () {
+            var session, sessionLive, body, ts1, err_6, err;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        debug("x-playback-session-id=".concat(req.headers["x-playback-session-id"], " req.url=").concat(req.url));
+                        debug(req.params);
+                        session = sessions[req.params[2]];
+                        sessionLive = sessionsLive[req.params[2]];
+                        if (!(session && sessionLive)) return [3 /*break*/, 13];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 11, , 12]);
+                        body = null;
+                        ts1 = Date.now();
+                        if (!!this.streamSwitchManager) return [3 /*break*/, 3];
+                        debug("[".concat(req.params[2], "]: Responding with VOD2Live manifest"));
+                        return [4 /*yield*/, session.getCurrentAudioManifestAsync(req.params[0], req.params[1], req.headers["x-playback-session-id"])];
+                    case 2:
+                        body = _a.sent();
+                        return [3 /*break*/, 10];
+                    case 3:
+                        if (!(switcherStatus[req.params[2]] === null || switcherStatus[req.params[2]] === undefined)) return [3 /*break*/, 5];
+                        debug("[".concat(req.params[2], "]: (").concat(switcherStatus[req.params[1]], ") Waiting for streamSwitcher to respond"));
+                        return [4 /*yield*/, timer(500)];
+                    case 4:
+                        _a.sent();
+                        return [3 /*break*/, 3];
                     case 5:
-                        err = new errs.NotFoundError('Invalid session');
+                        debug("switcherStatus[".concat(req.params[1], "]=[").concat(switcherStatus[req.params[2]], "]"));
+                        if (!switcherStatus[req.params[2]]) return [3 /*break*/, 7];
+                        debug("[".concat(req.params[2], "]: Responding with Live-stream manifest"));
+                        return [4 /*yield*/, sessionLive.getCurrentAudioManifestAsync(req.params[0], req.params[1])];
+                    case 6:
+                        body = _a.sent();
+                        return [3 /*break*/, 9];
+                    case 7:
+                        debug("[".concat(req.params[2], "]: Responding with VOD2Live manifest"));
+                        return [4 /*yield*/, session.getCurrentAudioManifestAsync(req.params[0], req.params[1], req.headers["x-playback-session-id"])];
+                    case 8:
+                        body = _a.sent();
+                        _a.label = 9;
+                    case 9:
+                        debug("[".concat(req.params[2], "]: Audio Manifest Request Took (").concat(Date.now() - ts1, ")ms"));
+                        _a.label = 10;
+                    case 10:
+                        res.sendRaw(200, Buffer.from(body, 'utf8'), {
+                            "Content-Type": "application/vnd.apple.mpegurl",
+                            "Access-Control-Allow-Origin": "*",
+                            "Cache-Control": "max-age=".concat(this.streamerOpts.cacheTTL || '4'),
+                            "X-Instance-Id": this.instanceId + "<".concat(version, ">"),
+                        });
+                        next();
+                        return [3 /*break*/, 12];
+                    case 11:
+                        err_6 = _a.sent();
+                        next(this._gracefulErrorHandler(err_6));
+                        return [3 /*break*/, 12];
+                    case 12: return [3 /*break*/, 14];
+                    case 13:
+                        err = new errs.NotFoundError('Invalid session(s)');
                         next(err);
-                        _a.label = 6;
-                    case 6: return [2 /*return*/];
+                        _a.label = 14;
+                    case 14: return [2 /*return*/];
                 }
             });
         });
     };
     ChannelEngine.prototype._handleSubtitleManifest = function (req, res, next) {
         return __awaiter(this, void 0, void 0, function () {
-            var session, body, err_6, err;
+            var session, body, err_7, err;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -990,8 +1096,8 @@ var ChannelEngine = /** @class */ (function () {
                         next();
                         return [3 /*break*/, 4];
                     case 3:
-                        err_6 = _a.sent();
-                        next(this._gracefulErrorHandler(err_6));
+                        err_7 = _a.sent();
+                        next(this._gracefulErrorHandler(err_7));
                         return [3 /*break*/, 4];
                     case 4: return [3 /*break*/, 6];
                     case 5:
@@ -1027,7 +1133,7 @@ var ChannelEngine = /** @class */ (function () {
     };
     ChannelEngine.prototype._handleSubtitleSliceEndpoint = function (req, res, next) {
         return __awaiter(this, void 0, void 0, function () {
-            var slicer, body, err_7;
+            var slicer, body, err_8;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1048,77 +1154,10 @@ var ChannelEngine = /** @class */ (function () {
                         next();
                         return [3 /*break*/, 4];
                     case 3:
-                        err_7 = _a.sent();
-                        next(this._gracefulErrorHandler(err_7));
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    ChannelEngine.prototype._handleMediaManifest = function (req, res, next) {
-        return __awaiter(this, void 0, void 0, function () {
-            var session, sessionLive, body, err_8, err;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        debug("x-playback-session-id=".concat(req.headers["x-playback-session-id"], " req.url=").concat(req.url));
-                        debug(req.params);
-                        session = sessions[req.params[1]];
-                        sessionLive = sessionsLive[req.params[1]];
-                        if (!(session && sessionLive)) return [3 /*break*/, 12];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 10, , 11]);
-                        body = null;
-                        if (!!this.streamSwitchManager) return [3 /*break*/, 3];
-                        debug("[".concat(req.params[1], "]: Responding with VOD2Live manifest"));
-                        return [4 /*yield*/, session.getCurrentMediaManifestAsync(req.params[0], req.headers["x-playback-session-id"])];
-                    case 2:
-                        body = _a.sent();
-                        return [3 /*break*/, 9];
-                    case 3:
-                        if (!(switcherStatus[req.params[1]] === null || switcherStatus[req.params[1]] === undefined)) return [3 /*break*/, 5];
-                        debug("[".concat(req.params[1], "]: (").concat(switcherStatus[req.params[1]], ") Waiting for streamSwitcher to respond"));
-                        return [4 /*yield*/, timer(500)];
-                    case 4:
-                        _a.sent();
-                        return [3 /*break*/, 3];
-                    case 5:
-                        debug("switcherStatus[".concat(req.params[1], "]=[").concat(switcherStatus[req.params[1]], "]"));
-                        if (!switcherStatus[req.params[1]]) return [3 /*break*/, 7];
-                        debug("[".concat(req.params[1], "]: Responding with Live-stream manifest"));
-                        return [4 /*yield*/, sessionLive.getCurrentMediaManifestAsync(req.params[0])];
-                    case 6:
-                        body = _a.sent();
-                        return [3 /*break*/, 9];
-                    case 7:
-                        debug("[".concat(req.params[1], "]: Responding with VOD2Live manifest"));
-                        return [4 /*yield*/, session.getCurrentMediaManifestAsync(req.params[0], req.headers["x-playback-session-id"])];
-                    case 8:
-                        body = _a.sent();
-                        _a.label = 9;
-                    case 9:
-                        //verbose(`[${session.sessionId}] body=`);
-                        //verbose(body);
-                        res.sendRaw(200, Buffer.from(body, 'utf8'), {
-                            "Content-Type": "application/vnd.apple.mpegurl",
-                            "Access-Control-Allow-Origin": "*",
-                            "Cache-Control": "max-age=".concat(this.streamerOpts.cacheTTL || '4'),
-                            "X-Instance-Id": this.instanceId + "<".concat(version, ">"),
-                        });
-                        next();
-                        return [3 /*break*/, 11];
-                    case 10:
                         err_8 = _a.sent();
                         next(this._gracefulErrorHandler(err_8));
-                        return [3 /*break*/, 11];
-                    case 11: return [3 /*break*/, 13];
-                    case 12:
-                        err = new errs.NotFoundError('Invalid session(s)');
-                        next(err);
-                        _a.label = 13;
-                    case 13: return [2 /*return*/];
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
                 }
             });
         });

package/dist/engine/session.d.ts

@@ -45,6 +45,10 @@ declare class Session {
         discSeq: any;
         mediaSeqOffset: any;
         transitionSegments: any;
+        audioSeq: any;
+        discAudioSeq: any;
+        audioSeqOffset: any;
+        transitionAudioSegments: any;
         reloadBehind: any;
     };
     isAllowedToClearVodCache: boolean;
@@ -87,9 +91,11 @@ declare class Session {
     resetAsync(id: any): Promise<void>;
     getSessionState(): Promise<any>;
     getTruncatedVodSegments(vodUri: any, duration: any): Promise<any>;
-    setCurrentMediaSequenceSegments(segments: any, mSeqOffset: any, reloadBehind: any): Promise<void>;
+    getTruncatedVodAudioSegments(vodUri: any, duration: any): Promise<any>;
+    setCurrentMediaSequenceSegments(segments: any, mSeqOffset: any, reloadBehind: any, audioSegments: any, aSeqOffset: any): Promise<void>;
     getCurrentMediaSequenceSegments(opts: any): Promise<any>;
-    setCurrentMediaAndDiscSequenceCount(_mediaSeq: any, _discSeq: any): Promise<void>;
+    getCurrentAudioSequenceSegments(opts: any): Promise<any>;
+    setCurrentMediaAndDiscSequenceCount(_mediaSeq: any, _discSeq: any, _audioSeq: any, _discAudioSeq: any): Promise<void>;
     getCurrentMediaAndDiscSequenceCount(): Promise<{
         mediaSeq: any;
         discSeq: any;