eyevinn-channel-engine 4.0.10 → 4.0.12

package/README.md

@@ -17,6 +17,7 @@ A live demo and example is available here: [https://vod2live.eyevinn.technology]
 - Produce a personalized 24/7 HLS live channel unique for each viewer
 - Mix VOD2Live channel with a "real" live HLS stream
 - Develop adapters to plugin with custom scheduling endpoints
+- High Availability with Redis Cache as shared state store
 - And much more!
 
 ## System Requirements
@@ -38,6 +39,16 @@ Supported Node.js Versions
 
 *\* not supported with demuxed sources*
 
+## High Availability Support
+
+[High availability support](https://vod2live.docs.eyevinn.technology/usage-guide.html#high-availability) is from v3 general available in the Channel Engine and it uses Redis as the shared storage. This allows you to run a replicaset behind a round-robin load balancer. Supported Redis Engine versions:
+
+| Version | Supported | 
+| ------- | --------- |
+| 5.x     | Yes       |
+| 6.x     | Yes       |
+| 7.x    | No        |
+
 ## Usage
 
 Follow [this tutorial](https://vod2live.docs.eyevinn.technology/getting-started.html) to get started building your own FAST channel engine.

package/dist/engine/redis_state_store.js

@@ -34,7 +34,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var redis = require("redis");
+var createClient = require("redis").createClient;
 var debug = require("debug")("redis-state-store");
 var DEFAULT_VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
 var RedisStateStore = /** @class */ (function () {
@@ -50,7 +50,7 @@ var RedisStateStore = /** @class */ (function () {
             debug("Overriding default, volatileKeyTTL=".concat(opts.volatileKeyTTL, "s"));
             this.volatileKeyTTL = opts.volatileKeyTTL;
         }
-        this.client = redis.createClient(opts.redisUrl);
+        this.client = createClient(opts.redisUrl);
     }
     RedisStateStore.prototype.initAsync = function (id, initData) {
         return __awaiter(this, void 0, void 0, function () {

package/dist/engine/session.js

@@ -1373,6 +1373,7 @@ var Session = /** @class */ (function () {
                             throw new Error('Session not ready');
                         }
                         audioGroupIds = currentVod.getAudioGroups();
+                        debug("[".concat(this._sessionId, "]: currentVod.getAudioGroups()=").concat(audioGroupIds.join(",")));
                         hasClosedCaptions = this._closedCaptions && this._closedCaptions.length > 0;
                         if (hasClosedCaptions) {
                             this._closedCaptions.forEach(function (cc) {
@@ -1412,7 +1413,11 @@ var Session = /** @class */ (function () {
                                     if (audioCodec) {
                                         var profileChannels = profile.channels ? profile.channels : "2";
                                         audioGroupIdToUse = currentVod.getAudioGroupIdForCodecs(audioCodec, profileChannels);
+                                        if (!audioGroupIds.includes(audioGroupIdToUse)) {
+                                            audioGroupIdToUse = defaultAudioGroupId;
+                                        }
                                     }
+                                    debug("[".concat(_this._sessionId, "]: audioGroupIdToUse=").concat(audioGroupIdToUse));
                                     // skip stream if no corresponding audio group can be found
                                     if (audioGroupIdToUse) {
                                         m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw +

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.0.10",
+  "version": "4.0.12",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,7 +34,7 @@
     "nock": "^13.1.1",
     "node-fetch": "^2.6.1",
     "promise.allsettled": "^1.0.4",
-    "redis": "^3.0.2",
+    "redis": "3.1.0",
     "request": ">=2.88.0",
     "restify": "9.0.0",
     "restify-errors": "^8.0.2",

package/engine/redis_state_store.js

@@ -1,4 +1,4 @@
-const redis = require("redis");
+const { createClient } = require("redis");
 const debug = require("debug")("redis-state-store");
 
 const DEFAULT_VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
@@ -16,7 +16,7 @@ class RedisStateStore {
       debug(`Overriding default, volatileKeyTTL=${opts.volatileKeyTTL}s`);
       this.volatileKeyTTL = opts.volatileKeyTTL;  
     }
-    this.client = redis.createClient(opts.redisUrl);
+    this.client = createClient(opts.redisUrl);
   }
 
   async initAsync(id, initData) {

package/engine/session.js

@@ -951,6 +951,7 @@ class Session {
       throw new Error('Session not ready');
     }
     let audioGroupIds = currentVod.getAudioGroups();
+    debug(`[${this._sessionId}]: currentVod.getAudioGroups()=${audioGroupIds.join(",")}`);
     let defaultAudioGroupId;
     let hasClosedCaptions = this._closedCaptions && this._closedCaptions.length > 0;
     if (hasClosedCaptions) {
@@ -987,12 +988,17 @@ class Session {
         if (this.use_demuxed_audio) {
           // find matching audio group based on codec in stream
           let audioGroupIdToUse;
-          const [_, audioCodec] = codecsFromString(profile.codecs);        
+          const [_, audioCodec] = codecsFromString(profile.codecs);
           if (audioCodec) {
             const profileChannels = profile.channels ? profile.channels : "2";
             audioGroupIdToUse = currentVod.getAudioGroupIdForCodecs(audioCodec, profileChannels);
+            if (!audioGroupIds.includes(audioGroupIdToUse)) {
+              audioGroupIdToUse = defaultAudioGroupId; 
+            }
           }
 
+          debug(`[${this._sessionId}]: audioGroupIdToUse=${audioGroupIdToUse}`);
+
           // skip stream if no corresponding audio group can be found
           if (audioGroupIdToUse) {
             m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw + 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.0.10",
+  "version": "4.0.12",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,7 +34,7 @@
     "nock": "^13.1.1",
     "node-fetch": "^2.6.1",
     "promise.allsettled": "^1.0.4",
-    "redis": "^3.0.2",
+    "redis": "3.1.0",
     "request": ">=2.88.0",
     "restify": "9.0.0",
     "restify-errors": "^8.0.2",