eyevinn-channel-engine 4.0.17 → 4.0.18

package/dist/engine/session.js

@@ -952,7 +952,7 @@ var Session = /** @class */ (function () {
     };
     Session.prototype.incrementAsync = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var isLeader, sessionState, playheadState, currentVod, _a, leaderAction, _b, m3u8_3, _c, audioIncrement, position, currentVod_1, sessionState_1, posDiff, incrementValue, index, audioSeqLastIdx, thresh, audioPosition, _d, _e, _f, _g, _h, _j, _k, _l, _m, mediaSequenceValue, diffMs, m3u8;
+            var isLeader, sessionState, playheadState, currentVod, _a, leaderAction, _b, m3u8_3, _c, audioIncrement, positionV, positionA, position, currentVod_1, sessionState_1, posDiff, incrementValue, index, audioSeqLastIdx, thresh, audioPosition, _d, _e, _f, _g, _h, _j, _k, _l, _m, mediaSequenceValue, diffMs, m3u8;
             return __generator(this, function (_o) {
                 switch (_o.label) {
                     case 0: return [4 /*yield*/, this._tickAsync()];
@@ -1020,9 +1020,12 @@ var Session = /** @class */ (function () {
                         _c.vodMediaSeqVideo = _o.sent();
                         audioIncrement = void 0;
                         if (!this.use_demuxed_audio) return [3 /*break*/, 23];
+                        positionV = 0;
+                        positionA = 0;
                         return [4 /*yield*/, this._getCurrentPlayheadPosition()];
                     case 16:
                         position = (_o.sent()) * 1000;
+                        positionV = position / 1000;
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
                     case 17:
                         currentVod_1 = _o.sent();
@@ -1039,6 +1042,7 @@ var Session = /** @class */ (function () {
                     case 19: return [4 /*yield*/, this._getAudioPlayheadPosition(sessionState_1.vodMediaSeqAudio + index)];
                     case 20:
                         audioPosition = (_o.sent()) * 1000;
+                        positionA = audioPosition / 1000;
                         posDiff = position - audioPosition;
                         if (posDiff <= 0) {
                             return [3 /*break*/, 22];
@@ -1060,6 +1064,7 @@ var Session = /** @class */ (function () {
                         _o.label = 22;
                     case 22:
                         audioIncrement = index;
+                        debug("[".concat(this._sessionId, "]: Current VOD Playhead Positions are to be: [").concat(positionV.toFixed(3), "][").concat(positionA.toFixed(3), "] (").concat((positionA - positionV).toFixed(3), ")"));
                         _o.label = 23;
                     case 23:
                         debug("[".concat(this._sessionId, "]: Will increment audio with ").concat(audioIncrement));

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.0.17",
+  "version": "4.0.18",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,6 +13,9 @@
     "start-demux": "node dist/server-demux.js",
     "start-livemix": "node dist/server-livemix.js"
   },
+  "engines": {
+    "node": "<18"
+  },
   "author": "Eyevinn Technology AB <work@eyevinn.se>",
   "contributors": [
     "Jonas Birmé <jonas.birme@eyevinn.se> (Eyevinn Technology AB)",
@@ -26,7 +29,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.0",
     "@eyevinn/hls-truncate": "^0.2.0",
-    "@eyevinn/hls-vodtolive": "^2.3.7",
+    "@eyevinn/hls-vodtolive": "^2.3.8",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",

package/engine/session.js

@@ -726,7 +726,10 @@ class Session {
       sessionState.vodMediaSeqVideo = await this._sessionState.increment("vodMediaSeqVideo");
       let audioIncrement;
       if (this.use_demuxed_audio) {
+        let positionV = 0;
+        let positionA = 0;
         const position = (await this._getCurrentPlayheadPosition()) * 1000;
+        positionV = position / 1000;
         let currentVod = await this._sessionState.getCurrentVod();
         const sessionState = await this._sessionState.getValues(["vodMediaSeqAudio"]);
         let posDiff;
@@ -737,6 +740,7 @@ class Session {
         debug(`[${this._sessionId}]: About to determine audio increment`);
         do {
           const audioPosition = (await this._getAudioPlayheadPosition(sessionState.vodMediaSeqAudio + index)) * 1000;
+          positionA = audioPosition / 1000;
           posDiff = position - audioPosition;
           if (posDiff <= 0) {
             break;
@@ -753,6 +757,7 @@ class Session {
           }
         } while (!(-thresh < posDiff && posDiff < thresh));
         audioIncrement = index;
+        debug(`[${this._sessionId}]: Current VOD Playhead Positions are to be: [${positionV.toFixed(3)}][${positionA.toFixed(3)}] (${(positionA-positionV).toFixed(3)})`);
       }
       debug(`[${this._sessionId}]: Will increment audio with ${audioIncrement}`);
       sessionState.vodMediaSeqAudio = await this._sessionState.increment("vodMediaSeqAudio", audioIncrement);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.0.17",
+  "version": "4.0.18",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,6 +13,9 @@
     "start-demux": "node dist/server-demux.js",
     "start-livemix": "node dist/server-livemix.js"
   },
+  "engines": {
+    "node": "<18"
+  },
   "author": "Eyevinn Technology AB <work@eyevinn.se>",
   "contributors": [
     "Jonas Birmé <jonas.birme@eyevinn.se> (Eyevinn Technology AB)",
@@ -26,7 +29,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.0",
     "@eyevinn/hls-truncate": "^0.2.0",
-    "@eyevinn/hls-vodtolive": "^2.3.7",
+    "@eyevinn/hls-vodtolive": "^2.3.8",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",

package/spec/engine/init_switching_spec.js

@@ -751,7 +751,8 @@ describe("The initialize switching", () => {
 
     const expectedLastVODSegItem = {
       discontinuity: true,
-      daterange: null
+      daterange: null,
+      vodTransition: true
     }
     const expectedFirstV2LSegItem = {
       duration: 7.2,