@eluvio/elv-client-js 4.2.23 → 4.2.25

package/dist/src/client/ContentManagement.js

@@ -1068,7 +1068,7 @@ exports.CopyContentObject = /*#__PURE__*/function () {
             break;
           }
           _context13.next = 20;
-          return this.Crypto.DecryptCap(metadata[userCapKey], this.signer._signingKey().privateKey);
+          return this.Crypto.DecryptCap(metadata[userCapKey], this.signer);
         case 20:
           userConkKey = _context13.sent;
           userConkKey.qid = objectId;
@@ -1185,7 +1185,7 @@ exports.CreateNonOwnerCap = /*#__PURE__*/function () {
           throw Error("No user cap found for current user");
         case 7:
           _context14.next = 9;
-          return this.Crypto.DecryptCap(userCapValue, this.signer._signingKey().privateKey);
+          return this.Crypto.DecryptCap(userCapValue, this.signer);
         case 9:
           userConk = _context14.sent;
           publicAddress = this.utils.PublicKeyToAddress(publicKey);

package/dist/src/client/Contracts.js

@@ -1579,13 +1579,13 @@ function _GetTenantGroupAddress() {
         case 20:
           _context33.prev = 20;
           _context33.t0 = _context33["catch"](11);
-          this.Log(_context33.t0);
+          ctx.Log(_context33.t0);
           throw new Error("Failed to retrieve ".concat(groupName, " group address."));
         case 24:
         case "end":
           return _context33.stop();
       }
-    }, _callee33, this, [[11, 20]]);
+    }, _callee33, null, [[11, 20]]);
   }));
   return _GetTenantGroupAddress.apply(this, arguments);
 }

package/dist/src/client/LiveConf.js

@@ -1,11 +1,13 @@
-var _slicedToArray = require("@babel/runtime/helpers/slicedToArray");
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
+var _objectWithoutProperties = require("@babel/runtime/helpers/objectWithoutProperties");
+var _typeof = require("@babel/runtime/helpers/typeof");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
+var _excluded = ["recording_config", "recording_params"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /* eslint no-console: 0 */
-
+var R = require("ramda");
 var DefaultABRLadder = {
   "video": [{
     bit_rate: 14000000,
@@ -51,8 +53,9 @@ var LiveconfTemplate = {
     },
     playout_config: {
       dvr_enabled: true,
-      dvr_max_duration: 0,
+      dvr_max_duration: 14400,
       rebroadcast_start_time_sec_epoch: 0,
+      playout_sharding_level: 2,
       vod_enabled: false
     },
     recording_config: {
@@ -60,11 +63,11 @@ var LiveconfTemplate = {
         description: "",
         ladder_specs: [],
         listen: true,
-        live_delay_nano: 2000000000,
+        live_delay_nano: 6000000000,
         max_duration_sec: -1,
         name: "",
         origin_url: "",
-        part_ttl: 3600,
+        part_ttl: 86400,
         playout_type: "live",
         source_timescale: null,
         reconnect_timeout: 600,
@@ -101,20 +104,52 @@ var LiveconfTemplate = {
 var LiveConf = /*#__PURE__*/function () {
   "use strict";
 
-  function LiveConf(probeData, nodeId, nodeUrl, includeAVSegDurations, overwriteOriginUrl, syncAudioToVideo) {
+  function LiveConf(_ref) {
+    var url = _ref.url,
+      probeData = _ref.probeData,
+      nodeId = _ref.nodeId,
+      nodeUrl = _ref.nodeUrl,
+      includeAVSegDurations = _ref.includeAVSegDurations,
+      overwriteOriginUrl = _ref.overwriteOriginUrl,
+      syncAudioToVideo = _ref.syncAudioToVideo,
+      liveRecordingMeta = _ref.liveRecordingMeta;
     _classCallCheck(this, LiveConf);
+    this.url = url;
     this.probeData = probeData;
     this.nodeId = nodeId;
     this.nodeUrl = nodeUrl;
     this.includeAVSegDurations = includeAVSegDurations;
     this.overwriteOriginUrl = overwriteOriginUrl;
     this.syncAudioToVideo = syncAudioToVideo;
+    this.currentLiveRecordingMeta = liveRecordingMeta;
   }
   _createClass(LiveConf, [{
-    key: "probeKind",
-    value: function probeKind() {
-      var fileNameSplit = this.probeData.format.filename.split(":");
-      return fileNameSplit[0];
+    key: "getFormat",
+    value: function getFormat() {
+      var _this$probeData$forma;
+      if (this.probeData.format.format_name) {
+        return this.probeData.format.format_name;
+      }
+      var fileNameSplit = (_this$probeData$forma = this.probeData.format) === null || _this$probeData$forma === void 0 || (_this$probeData$forma = _this$probeData$forma.filename) === null || _this$probeData$forma === void 0 ? void 0 : _this$probeData$forma.split(":");
+      if (fileNameSplit.length > 1) {
+        var protoScheme = fileNameSplit[0];
+        switch (protoScheme) {
+          case "rtmp":
+            return "flv";
+          case "udp":
+          case "rtp":
+          case "srt":
+            return "mpegts";
+          default:
+            return "format_unknown";
+        }
+      }
+    }
+  }, {
+    key: "getProtocol",
+    value: function getProtocol() {
+      var protoScheme = this.url.split(":")[0];
+      return protoScheme;
     }
   }, {
     key: "getStreamDataForCodecType",
@@ -132,19 +167,27 @@ var LiveConf = /*#__PURE__*/function () {
     // Used by generateAudioStreamsConfig()
   }, {
     key: "getAudioStreamsFromProbe",
-    value: function getAudioStreamsFromProbe() {
+    value: function getAudioStreamsFromProbe(_ref2) {
+      var ladderProfile = _ref2.ladderProfile;
       var audioStreams = {};
       var audioStreamData = this.probeData.streams.filter(function (value) {
         return value.codec_type === "audio";
       });
-      for (var index = 0; index < audioStreamData.length; index++) {
+      var _loop = function _loop() {
+        var _ladderProfile$audio, _profileAudioForType$, _currentStreamData$bi;
         var currentStreamIndex = audioStreamData[index].stream_index;
         var currentStreamData = audioStreamData[index];
+        var profileAudioForType = ladderProfile === null || ladderProfile === void 0 || (_ladderProfile$audio = ladderProfile.audio) === null || _ladderProfile$audio === void 0 ? void 0 : _ladderProfile$audio.find(function (a) {
+          return a.channels === currentStreamData.channels;
+        });
         audioStreams[currentStreamIndex] = {
-          recordingBitrate: Math.max(currentStreamData.bit_rate, 128000),
+          recordingBitrate: (_profileAudioForType$ = profileAudioForType === null || profileAudioForType === void 0 ? void 0 : profileAudioForType.bit_rate) !== null && _profileAudioForType$ !== void 0 ? _profileAudioForType$ : Math.max((_currentStreamData$bi = currentStreamData.bit_rate) !== null && _currentStreamData$bi !== void 0 ? _currentStreamData$bi : 0, 12800),
           recordingChannels: currentStreamData.channels,
           playoutLabel: "Audio ".concat(index + 1)
         };
+      };
+      for (var index = 0; index < audioStreamData.length; index++) {
+        _loop();
       }
       return audioStreams;
     }
@@ -199,21 +242,20 @@ var LiveConf = /*#__PURE__*/function () {
      */
   }, {
     key: "calcSegDuration",
-    value: function calcSegDuration(_ref) {
-      var sourceTimescale = _ref.sourceTimescale,
-        sampleRate = _ref.sampleRate,
-        audioCodec = _ref.audioCodec;
+    value: function calcSegDuration(_ref3) {
+      var sourceTimescale = _ref3.sourceTimescale,
+        sampleRate = _ref3.sampleRate,
+        audioCodec = _ref3.audioCodec;
       var seg = {};
-      switch (this.probeKind()) {
-        case "rtmp":
+      switch (this.getFormat()) {
+        case "flv":
           seg = this.calcSegDurationRtmp({
             sourceTimescale: sourceTimescale,
             sampleRate: sampleRate,
             audioCodec: audioCodec
           });
           break;
-        case "udp":
-        case "srt":
+        case "mpegts":
           seg = this.calcSegDurationMpegts({
             sourceTimescale: sourceTimescale,
             sampleRate: sampleRate,
@@ -221,7 +263,7 @@ var LiveConf = /*#__PURE__*/function () {
           });
           break;
         default:
-          throw "protocol not supported - " + this.probeKind();
+          throw "protocol not supported - " + this.getFormat();
       }
       if (audioCodec == "aac") {
         seg.audio = 29.76 * sampleRate;
@@ -245,8 +287,8 @@ var LiveConf = /*#__PURE__*/function () {
     }
   }, {
     key: "calcSegDurationMpegts",
-    value: function calcSegDurationMpegts(_ref2) {
-      var sourceTimescale = _ref2.sourceTimescale;
+    value: function calcSegDurationMpegts(_ref4) {
+      var sourceTimescale = _ref4.sourceTimescale;
       var videoStream = this.getStreamDataForCodecType("video");
       var frameRate = videoStream.frame_rate;
 
@@ -308,8 +350,8 @@ var LiveConf = /*#__PURE__*/function () {
     }
   }, {
     key: "calcSegDurationRtmp",
-    value: function calcSegDurationRtmp(_ref3) {
-      var sourceTimescale = _ref3.sourceTimescale;
+    value: function calcSegDurationRtmp(_ref5) {
+      var sourceTimescale = _ref5.sourceTimescale;
       var videoStream = this.getStreamDataForCodecType("video");
       var frameRate = videoStream.frame_rate;
       var seg = {};
@@ -372,60 +414,123 @@ var LiveConf = /*#__PURE__*/function () {
     value: function syncAudioToStreamIdValue() {
       var sync_id = -1;
       var videoStream = this.getStreamDataForCodecType("video");
-      switch (this.probeKind()) {
-        case "udp":
-        case "srt":
+      switch (this.getFormat()) {
+        case "mpegts":
           sync_id = videoStream.stream_id;
           break;
-        case "rtmp":
+        case "flv":
           sync_id = videoStream.stream_index;
           break;
       }
       return sync_id;
     }
 
+    /**
+     * Map custom live recording profile to the expected config structure
+     * @param {Object} customProfile - User's custom recording profile
+     * @return {Object} - Mapped config in live_recording format
+     */
+  }, {
+    key: "MapCustomProfileToLiveConfig",
+    value: function MapCustomProfileToLiveConfig(_ref6) {
+      var customProfile = _ref6.customProfile;
+      if (!customProfile) return {};
+      var CompactDeep = function CompactDeep(obj) {
+        if (obj === null || _typeof(obj) !== "object" || Array.isArray(obj)) {
+          return obj;
+        }
+        return R.pipe(R.reject(R.isNil), R.map(function (val) {
+          return _typeof(val) === "object" ? CompactDeep(val) : val;
+        }))(obj);
+      };
+      var recording_config = customProfile.recording_config,
+        recording_params = customProfile.recording_params,
+        rest = _objectWithoutProperties(customProfile, _excluded);
+      return CompactDeep({
+        live_recording: _objectSpread(_objectSpread({}, rest), {}, {
+          recording_config: {
+            recording_params: _objectSpread(_objectSpread({}, recording_params), {}, {
+              part_ttl: recording_config === null || recording_config === void 0 ? void 0 : recording_config.part_ttl,
+              reconnect_timeout: recording_config === null || recording_config === void 0 ? void 0 : recording_config.reconnect_timeout,
+              xc_params: _objectSpread(_objectSpread({}, (recording_params === null || recording_params === void 0 ? void 0 : recording_params.xc_params) || {}), {}, {
+                connection_timeout: recording_config === null || recording_config === void 0 ? void 0 : recording_config.connection_timeout,
+                copy_mpegts: recording_config === null || recording_config === void 0 ? void 0 : recording_config.copy_mpegts,
+                input_cfg: recording_config === null || recording_config === void 0 ? void 0 : recording_config.input_cfg
+              })
+            })
+          }
+        })
+      });
+    }
+
     /*
     * Generate audio streams recording configuration based on the optional custom settings.
     * If no custom "audio" section is present, record all the acceptable audio streams found in the probe
     */
   }, {
     key: "generateAudioStreamsConfig",
-    value: function generateAudioStreamsConfig(_ref4) {
-      var customSettings = _ref4.customSettings;
+    value: function generateAudioStreamsConfig(_ref7) {
+      var _liveRecordingConfigP, _liveRecordingConfigP2;
+      var liveRecordingConfigProfile = _ref7.liveRecordingConfigProfile;
+      var ladderProfile = (liveRecordingConfigProfile === null || liveRecordingConfigProfile === void 0 || (_liveRecordingConfigP = liveRecordingConfigProfile.playout_config) === null || _liveRecordingConfigP === void 0 ? void 0 : _liveRecordingConfigP.ladder_specs) || DefaultABRLadder;
+      var audioSettings = liveRecordingConfigProfile === null || liveRecordingConfigProfile === void 0 || (_liveRecordingConfigP2 = liveRecordingConfigProfile.recording_stream_config) === null || _liveRecordingConfigP2 === void 0 ? void 0 : _liveRecordingConfigP2.audio;
       var audioStreams = {};
-      if (customSettings && customSettings.audio && Object.keys(customSettings.audio).length > 0) {
-        for (var i = 0; i < Object.keys(customSettings.audio).length; i++) {
-          var audioIdx = Object.keys(customSettings.audio)[i];
-          var audio = customSettings.audio[audioIdx];
+      if (audioSettings && Object.keys(audioSettings).length > 0) {
+        var _loop2 = function _loop2() {
+          var _audio$recording_bitr;
+          var audioIdx = Object.keys(audioSettings)[i];
+          var audio = audioSettings[audioIdx];
+          var profileAudioForType = ladderProfile === null || ladderProfile === void 0 ? void 0 : ladderProfile.audio.find(function (a) {
+            var _audio$channels;
+            return a.channels === ((_audio$channels = audio.channels) !== null && _audio$channels !== void 0 ? _audio$channels : 2);
+          });
           audioStreams[audioIdx] = {
-            recordingBitrate: audio.recording_bitrate || 192000,
-            recordingChannels: audio.recording_channels || 2
+            recordingBitrate: ladderProfile !== null && ladderProfile !== void 0 && ladderProfile.audio ? profileAudioForType.bit_rate : (_audio$recording_bitr = audio.recording_bitrate) !== null && _audio$recording_bitr !== void 0 ? _audio$recording_bitr : 192000,
+            recordingChannels: audio.recording_channels || 2,
+            lang: audio.lang,
+            isDefault: audio["default"]
           };
           if (audio.playout) {
             audioStreams[audioIdx].playoutLabel = audio.playout_label || "Audio ".concat(i + 1);
           }
+        };
+        for (var i = 0; i < Object.keys(audioSettings).length; i++) {
+          _loop2();
         }
       }
 
       // If no audio streams specified in custom config, set up all the suitable audio streams in the probe
-      if (!customSettings.audio || Object.keys(customSettings.audio).length == 0) {
-        audioStreams = this.getAudioStreamsFromProbe();
+      if (!audioSettings || Object.keys(audioSettings).length === 0) {
+        audioStreams = this.getAudioStreamsFromProbe({
+          ladderProfile: ladderProfile
+        });
       }
       return audioStreams;
     }
 
     /*
-    * Generate the live recording config as required by QFAB, based on defaults and optional custom settings.
+    * Generate the live recording config as required by QFAB, based on defaults, existing settings and optional custom settings.
     */
   }, {
     key: "generateLiveConf",
-    value: function generateLiveConf(_ref5) {
-      var customSettings = _ref5.customSettings;
-      // gather required data
-      var conf = JSON.parse(JSON.stringify(LiveconfTemplate));
-      var fileName = this.overwriteOriginUrl || this.probeData.format.filename;
+    value: function generateLiveConf(_ref8) {
+      var _customSettings$liveR, _customSettings$liveR2, _ladder_specs$video;
+      var customSettings = _ref8.customSettings;
+      // Saved config overrides defaults and is preserved on reconfiguration
+      var conf = R.clone(LiveconfTemplate);
+      if (this.currentLiveRecordingMeta) {
+        conf = R.mergeDeepRight(conf, {
+          live_recording: this.currentLiveRecordingMeta
+        });
+      }
+      if (customSettings.liveRecordingConfigProfile) {
+        conf = R.mergeDeepRight(conf, this.MapCustomProfileToLiveConfig({
+          customProfile: customSettings.liveRecordingConfigProfile
+        }));
+      }
+      var fileName = this.url;
       var audioStreams = this.generateAudioStreamsConfig({
-        customSettings: customSettings
+        liveRecordingConfigProfile: customSettings.liveRecordingConfigProfile
       });
 
       // Retrieve one audio stream from the probe to read the sample rate and codec name
@@ -453,17 +558,13 @@ var LiveConf = /*#__PURE__*/function () {
       }
 
       // Fill in specifics for protocol
-      switch (this.probeKind()) {
-        case "udp":
+      switch (this.getFormat()) {
+        case "mpegts":
           sourceTimescale = 90000;
           conf.live_recording.recording_config.recording_params.source_timescale = sourceTimescale;
           break;
-        case "srt":
-          sourceTimescale = 90000;
-          conf.live_recording.recording_config.recording_params.source_timescale = sourceTimescale;
-          conf.live_recording.recording_config.recording_params.live_delay_nano = 4000000000;
-          break;
         case "rtmp":
+        case "flv":
           sourceTimescale = 16000;
           conf.live_recording.recording_config.recording_params.source_timescale = sourceTimescale;
           break;
@@ -471,7 +572,14 @@ var LiveConf = /*#__PURE__*/function () {
           console.log("HLS detected. Not yet implemented");
           break;
         default:
-          console.log("Unsupported media", this.probeKind());
+          console.log("Unsupported media", this.getFormat());
+          break;
+      }
+      switch (this.getProtocol()) {
+        case "srt":
+          if (!((_customSettings$liveR = customSettings.liveRecordingConfigProfile) !== null && _customSettings$liveR !== void 0 && (_customSettings$liveR = _customSettings$liveR.recording_params) !== null && _customSettings$liveR !== void 0 && _customSettings$liveR.live_delay_nano)) {
+            conf.live_recording.recording_config.recording_params.live_delay_nano = 6000000000;
+          }
           break;
       }
       var segDurations = this.calcSegDuration({
@@ -496,10 +604,14 @@ var LiveConf = /*#__PURE__*/function () {
       if (segDurations.videoFrameDurationTs) {
         conf.live_recording.recording_config.recording_params.xc_params.video_frame_duration_ts = segDurations.videoFrameDurationTs;
       }
-      var ladderProfile = customSettings.ladder_profile || DefaultABRLadder;
+      var ladder_specs = (_customSettings$liveR2 = customSettings.liveRecordingConfigProfile) === null || _customSettings$liveR2 === void 0 || (_customSettings$liveR2 = _customSettings$liveR2.playout_config) === null || _customSettings$liveR2 === void 0 ? void 0 : _customSettings$liveR2.ladder_specs;
+      var ladderProfile = (ladder_specs === null || ladder_specs === void 0 || (_ladder_specs$video = ladder_specs.video) === null || _ladder_specs$video === void 0 ? void 0 : _ladder_specs$video.length) > 0 ? ladder_specs : DefaultABRLadder;
       conf.live_recording.recording_config.recording_params.xc_params.enc_height = videoStream.height;
       conf.live_recording.recording_config.recording_params.xc_params.enc_width = videoStream.width;
 
+      // Reset ladder specs (updating existing stream will carry over old specs
+      conf.live_recording.recording_config.recording_params.ladder_specs = [];
+
       // Determine video recording bitrate and ABR ladder
       var topLadderRate = 0;
       for (var _i = 0; _i < ladderProfile.video.length; _i++) {
@@ -521,6 +633,7 @@ var LiveConf = /*#__PURE__*/function () {
       var globalAudioBitrate = 0;
       var nAudio = 0;
       for (var _i2 = 0; _i2 < Object.keys(audioStreams).length; _i2++) {
+        var _audio$lang;
         var audioLadderSpec = {};
         var audioIndex = Object.keys(audioStreams)[_i2];
         var audio = audioStreams[audioIndex];
@@ -543,7 +656,8 @@ var LiveConf = /*#__PURE__*/function () {
         audioLadderSpec.stream_name = "audio_".concat(audioIndex);
         audioLadderSpec.stream_label = audio.playoutLabel ? audio.playoutLabel : null;
         audioLadderSpec.media_type = 2;
-        if (Object.keys(audioStreams).length === 1) {
+        audioLadderSpec.lang = (_audio$lang = audio.lang) !== null && _audio$lang !== void 0 ? _audio$lang : "";
+        if (Object.keys(audioStreams).length === 1 || audio.isDefault) {
           audioLadderSpec["default"] = true;
         }
         conf.live_recording.recording_config.recording_params.ladder_specs.push(audioLadderSpec);
@@ -556,33 +670,6 @@ var LiveConf = /*#__PURE__*/function () {
       // Global recording bitrate for all audio streams
       conf.live_recording.recording_config.recording_params.xc_params.audio_bitrate = globalAudioBitrate;
       conf.live_recording.recording_config.recording_params.xc_params.n_audio = nAudio;
-
-      // Iterate through custom settings (which will override any existing setting)
-      function SetByPath(_ref6) {
-        var obj = _ref6.obj,
-          path = _ref6.path,
-          value = _ref6.value;
-        var keys = path.split(".");
-        var temp = obj;
-        for (var _i3 = 0; _i3 < keys.length - 1; _i3++) {
-          if (!temp[keys[_i3]]) {
-            temp[keys[_i3]] = {};
-          }
-          temp = temp[keys[_i3]];
-        }
-        temp[keys[keys.length - 1]] = value;
-      }
-      var metaPathValues = customSettings.metaPathValues;
-      for (var _i4 = 0, _Object$entries = Object.entries(metaPathValues || {}); _i4 < _Object$entries.length; _i4++) {
-        var _Object$entries$_i = _slicedToArray(_Object$entries[_i4], 2),
-          path = _Object$entries$_i[0],
-          value = _Object$entries$_i[1];
-        SetByPath({
-          obj: conf,
-          path: path,
-          value: value
-        });
-      }
       return conf;
     }
   }]);