eyevinn-channel-engine 4.1.0 → 4.1.1

package/.github/workflows/publish.yml

@@ -2,7 +2,7 @@ name: Publish
   
 on:
   release:
-    types: [created]
+    types: [released]
 
 jobs:
   build:

package/.github/workflows/rc.yml

@@ -0,0 +1,22 @@
+name: Publish release candidate
+  
+on:
+  release:
+    types: [prereleased]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 16
+          registry-url: https://registry.npmjs.org/
+      - run: |
+          npm install
+          npm run build
+          npm publish --tag rc
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

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, 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;
+            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, audioInfo, mediaSequenceValueAudio, diffMs, m3u8;
             return __generator(this, function (_o) {
                 switch (_o.label) {
                     case 0: return [4 /*yield*/, this._tickAsync()];
@@ -1121,7 +1121,12 @@ var Session = /** @class */ (function () {
                         _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, "}"));
+                            audioInfo = "";
+                            if (this.use_demuxed_audio) {
+                                mediaSequenceValueAudio = currentVod.mediaSequenceValuesAudio[playheadState.vodMediaSeqAudio];
+                                audioInfo = " mseq[A]={".concat(playheadState.mediaSeqAudio + mediaSequenceValueAudio, "}");
+                            }
+                            debug("[".concat(this._sessionId, "]: Session can now serve mseq[V]={").concat(playheadState.mediaSeq + mediaSequenceValue, "}") + audioInfo);
                         }
                         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*/, 41];

package/dist/engine/session_state.js

@@ -52,6 +52,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var HLSVod = require('@eyevinn/hls-vodtolive');
 var SharedStateStore = require('./shared_state_store.js');
 var debug = require("debug")("session-state-store");
+var timeLeft = require('./util.js').timeLeft;
 var SessionState = Object.freeze({
     VOD_INIT: 1,
     VOD_PLAYING: 2,
@@ -99,7 +100,7 @@ var SharedSessionState = /** @class */ (function () {
                             throw new Error("shared session state store has not been initialized");
                         }
                         if (this.cache.currentVod.value && Date.now() < this.cache.currentVod.ts + this.cache.currentVod.ttl) {
-                            debug("[".concat(this.sessionId, "]: reading 'currentVod' from cache"));
+                            debug("[".concat(this.sessionId, "]: reading 'currentVod' from cache. Expires in ").concat(timeLeft(this.cache.currentVod.ts + this.cache.currentVod.ttl, Date.now())));
                             return [2 /*return*/, this.cache.currentVod.value];
                         }
                         return [4 /*yield*/, this.get("currentVod")];

package/dist/engine/util.d.ts

@@ -18,3 +18,4 @@ export function findNearestValue(val: any, array: any): any;
 export function isValidUrl(url: any): boolean;
 export function fetchWithRetry(uri: any, opts: any, maxRetries: any, retryDelayMs: any, timeoutMs: any, debug: any): Promise<any>;
 export function codecsFromString(codecs: any): any[];
+export function timeLeft(endTimestamp: any, currentTimestamp: any): string;

package/dist/engine/util.js

@@ -275,6 +275,26 @@ var codecsFromString = function (codecs) {
     });
     return [videoCodecs, audioCodecs];
 };
+var timeLeft = function (endTimestamp, currentTimestamp) {
+    var secondsLeft = Math.floor((endTimestamp - currentTimestamp) / 1000);
+    if (secondsLeft < 0) {
+        return "Time has already passed.";
+    }
+    var hours = Math.floor(secondsLeft / 3600);
+    var minutes = Math.floor((secondsLeft % 3600) / 60);
+    var seconds = secondsLeft % 60;
+    var msg = "";
+    if (hours) {
+        msg = "".concat(hours, "h").concat(minutes, "m").concat(seconds, "s");
+    }
+    else if (minutes) {
+        msg = "".concat(minutes, "m").concat(seconds, "s");
+    }
+    else {
+        msg = "".concat(seconds, "s");
+    }
+    return msg;
+};
 module.exports = {
     filterQueryParser: filterQueryParser,
     applyFilter: applyFilter,
@@ -287,5 +307,6 @@ module.exports = {
     findNearestValue: findNearestValue,
     isValidUrl: isValidUrl,
     fetchWithRetry: fetchWithRetry,
-    codecsFromString: codecsFromString
+    codecsFromString: codecsFromString,
+    timeLeft: timeLeft,
 };

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,6 +8,7 @@
     "build": "tsc --project ./ && cp ./package.json dist/",
     "debug-server": "DEBUG=engine-*,vod-to-live node dist/server.js",
     "test": "jasmine",
+    "version:rc": "npm version prerelease --preid=rc",
     "postversion": "git push && git push --tags",
     "start": "node dist/server.js",
     "start-demux": "node dist/server-demux.js",
@@ -29,7 +30,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.0",
     "@eyevinn/hls-truncate": "^0.2.0",
-    "@eyevinn/hls-vodtolive": "^2.3.10",
+    "@eyevinn/hls-vodtolive": "^2.3.12",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",

package/engine/session.js

@@ -787,7 +787,12 @@ class Session {
 
     if (currentVod.sequenceAlwaysContainNewSegments) {
       const mediaSequenceValue = currentVod.mediaSequenceValues[playheadState.vodMediaSeqVideo];
-      debug(`[${this._sessionId}]: Session can now serve mseq={${playheadState.mediaSeq + mediaSequenceValue}}`);
+      let audioInfo = "";
+      if (this.use_demuxed_audio) {
+        const mediaSequenceValueAudio = currentVod.mediaSequenceValuesAudio[playheadState.vodMediaSeqAudio];
+        audioInfo = ` mseq[A]={${playheadState.mediaSeqAudio + mediaSequenceValueAudio}}`
+      }
+      debug(`[${this._sessionId}]: Session can now serve mseq[V]={${playheadState.mediaSeq + mediaSequenceValue}}` + audioInfo);
     }
 
     debug(`[${this._sessionId}]: INCREMENT (mseq=${playheadState.mediaSeq + playheadState.vodMediaSeqVideo}) vodMediaSeq=(${playheadState.vodMediaSeqVideo}_${playheadState.vodMediaSeqAudio} of ${currentVod.getLiveMediaSequencesCount()}_${currentVod.getLiveMediaSequencesCount("audio")})`);

package/engine/session_state.js

@@ -1,6 +1,7 @@
 const HLSVod = require('@eyevinn/hls-vodtolive');
 const SharedStateStore = require('./shared_state_store.js');
 const debug = require("debug")("session-state-store");
+const { timeLeft } = require('./util.js');
 
 const SessionState = Object.freeze({
   VOD_INIT: 1,
@@ -43,7 +44,12 @@ class SharedSessionState {
     }
 
     if (this.cache.currentVod.value && Date.now() < this.cache.currentVod.ts + this.cache.currentVod.ttl) {
-      debug(`[${this.sessionId}]: reading 'currentVod' from cache`);
+      debug(
+        `[${this.sessionId}]: reading 'currentVod' from cache. Expires in ${timeLeft(
+          this.cache.currentVod.ts + this.cache.currentVod.ttl,
+          Date.now()
+        )}`
+      );
       return this.cache.currentVod.value;
     }
 

package/engine/util.js

@@ -6,7 +6,7 @@ const filterQueryParser = (filterQuery) => {
   const conditions = filterQuery.match(/\(([^\(\)]*?)\)/g);
 
   let filter = {};
-  
+
   if (!conditions) {
     return filter;
   }
@@ -157,7 +157,7 @@ const findNearestValue = (val, array) => {
   return sorted.reduce((a, b) => {
     return Math.abs(b - val) < Math.abs(a - val) ? b : a;
   });
-}
+};
 
 const isValidUrl = (url) => {
   try {
@@ -166,8 +166,7 @@ const isValidUrl = (url) => {
   } catch (err) {
     return false;
   }
-}
-
+};
 
 const fetchWithRetry = async (uri, opts, maxRetries, retryDelayMs, timeoutMs, debug) => {
   if (!debug) {
@@ -224,6 +223,25 @@ const codecsFromString = (codecs) => {
   return [videoCodecs, audioCodecs];
 };
 
+const timeLeft = (endTimestamp, currentTimestamp) => {
+  const secondsLeft = Math.floor((endTimestamp - currentTimestamp) / 1000);
+  if (secondsLeft < 0) {
+    return "Time has already passed.";
+  }
+  const hours = Math.floor(secondsLeft / 3600);
+  const minutes = Math.floor((secondsLeft % 3600) / 60);
+  const seconds = secondsLeft % 60;
+  let msg = "";
+  if (hours) {
+    msg = `${hours}h${minutes}m${seconds}s`;
+  } else if (minutes) {
+    msg = `${minutes}m${seconds}s`;
+  } else {
+    msg = `${seconds}s`;
+  }
+  return msg;
+};
+
 module.exports = {
   filterQueryParser,
   applyFilter,
@@ -236,5 +254,6 @@ module.exports = {
   findNearestValue,
   isValidUrl,
   fetchWithRetry,
-  codecsFromString
+  codecsFromString,
+  timeLeft,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,6 +8,7 @@
     "build": "tsc --project ./ && cp ./package.json dist/",
     "debug-server": "DEBUG=engine-*,vod-to-live node dist/server.js",
     "test": "jasmine",
+    "version:rc": "npm version prerelease --preid=rc",
     "postversion": "git push && git push --tags",
     "start": "node dist/server.js",
     "start-demux": "node dist/server-demux.js",
@@ -29,7 +30,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.0",
     "@eyevinn/hls-truncate": "^0.2.0",
-    "@eyevinn/hls-vodtolive": "^2.3.10",
+    "@eyevinn/hls-vodtolive": "^2.3.12",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",