@eluvio/elv-client-js 4.0.83 → 4.0.85

package/dist/src/client/ContentAccess.js

@@ -1967,8 +1967,8 @@ exports.LatestVersionHashV2 = /*#__PURE__*/function () {
         case 19:
           _context28.prev = 19;
           _context28.t6 = _context28["catch"](3);
-          console.log("ERROR", _context28.t6);
-          throw Error("Unable to determine latest version hash for ".concat(versionHash || objectId));
+          _context28.t6.message = "Unable to determine latest version hash for ".concat(versionHash || objectId);
+          throw _context28.t6;
         case 23:
           return _context28.abrupt("return", latestHash);
         case 24:

package/dist/src/client/ContentManagement.js

@@ -1800,41 +1800,62 @@ exports.PublishContentVersion = /*#__PURE__*/function () {
           break;
         case 34:
           if (!awaitCommitConfirmation) {
-            _context21.next = 48;
+            _context21.next = 63;
             break;
           }
           _pollingInterval = 500; // ms
           tries = 20;
         case 37:
           if (!(tries > 0)) {
-            _context21.next = 48;
+            _context21.next = 63;
             break;
           }
-          _context21.next = 40;
+          h = void 0;
+          _context21.prev = 39;
+          _context21.next = 42;
           return this.LatestVersionHashV2({
             objectId: objectId
           });
-        case 40:
+        case 42:
           h = _context21.sent;
-          if (!(h == versionHash)) {
-            _context21.next = 44;
+          if (!(h === versionHash)) {
+            _context21.next = 48;
             break;
           }
           this.Log("Commit confirmed on fabric node: ".concat(versionHash));
-          return _context21.abrupt("break", 48);
-        case 44:
-          _context21.next = 46;
+          return _context21.abrupt("break", 63);
+        case 48:
+          tries--;
+          _context21.next = 51;
           return new Promise(function (resolve) {
             return setTimeout(resolve, _pollingInterval);
           });
-        case 46:
+        case 51:
+          _context21.next = 61;
+          break;
+        case 53:
+          _context21.prev = 53;
+          _context21.t0 = _context21["catch"](39);
+          console.error(_context21.t0);
+          if (!(_context21.t0.status !== 404)) {
+            _context21.next = 58;
+            break;
+          }
+          throw _context21.t0;
+        case 58:
+          tries--;
+          _context21.next = 61;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, _pollingInterval);
+          });
+        case 61:
           _context21.next = 37;
           break;
-        case 48:
+        case 63:
         case "end":
           return _context21.stop();
       }
-    }, _callee21, this);
+    }, _callee21, this, [[39, 53]]);
   }));
   return function (_x20) {
     return _ref38.apply(this, arguments);

package/dist/src/client/LiveConf.js

@@ -1,5 +1,8 @@
+var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
+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; }
 var LadderTemplate = {
   "2160": {
     bit_rate: 14000000,
@@ -17,6 +20,7 @@ var LadderTemplate = {
     media_type: 1,
     representation: "videovideo_1920x1080_h264@9500000",
     stream_name: "video",
+    stream_index: 0,
     width: 1920
   },
   "720": {
@@ -26,6 +30,7 @@ var LadderTemplate = {
     media_type: 1,
     representation: "videovideo_1280x720_h264@4500000",
     stream_name: "video",
+    stream_index: 0,
     width: 1280
   },
   "540": {
@@ -35,6 +40,7 @@ var LadderTemplate = {
     media_type: 1,
     representation: "videovideo_960x540_h264@2000000",
     stream_name: "video",
+    stream_index: 0,
     width: 960
   },
   "540_low": {
@@ -44,6 +50,7 @@ var LadderTemplate = {
     media_type: 1,
     representation: "videovideo_960x540_h264@900000",
     stream_name: "video",
+    stream_index: 0,
     width: 960
   }
 };
@@ -60,14 +67,7 @@ var LiveconfTemplate = {
     recording_config: {
       recording_params: {
         description: "",
-        ladder_specs: [{
-          bit_rate: 384000,
-          channels: 2,
-          codecs: "mp4a.40.2",
-          media_type: 2,
-          representation: "audioaudio_aac@384000",
-          stream_name: "audio"
-        }],
+        ladder_specs: [],
         listen: true,
         live_delay_nano: 2000000000,
         max_duration_sec: -1,
@@ -80,6 +80,7 @@ var LiveconfTemplate = {
           audio_bitrate: 384000,
           audio_index: [0, 0, 0, 0, 0, 0, 0, 0],
           audio_seg_duration_ts: null,
+          connection_timeout: 60,
           ecodec2: "aac",
           enc_height: null,
           enc_width: null,
@@ -98,12 +99,22 @@ var LiveconfTemplate = {
           video_bitrate: null,
           video_seg_duration_ts: null,
           video_time_base: null,
+          video_frame_duration_ts: null,
           xc_type: 3
         }
       }
     }
   }
 };
+var LadderSpecAudio = {
+  bit_rate: 384000,
+  channels: 2,
+  codecs: "mp4a.40.2",
+  media_type: 2,
+  representation: "audioaudio_aac@384000",
+  stream_name: "audio",
+  stream_index: 0
+};
 var LiveConf = /*#__PURE__*/function () {
   "use strict";
 
@@ -133,6 +144,24 @@ var LiveConf = /*#__PURE__*/function () {
       }
       return stream;
     }
+
+    // Return all audio streams found in the probe
+    // Used by generateAudioStreamsConfig()
+  }, {
+    key: "getAudioStreamsFromProbe",
+    value: function getAudioStreamsFromProbe() {
+      var audioStreams = {};
+      for (var index = 0; index < this.probeData.streams.length; index++) {
+        if (this.probeData.streams[index].codec_type == "audio") {
+          audioStreams[index] = {
+            recordingBitrate: Math.max(this.probeData.streams[index].bit_rate, 128000),
+            recordingChannels: this.probeData.streams[index].channels,
+            playoutLabel: "Audio ".concat(index)
+          };
+        }
+      }
+      return audioStreams;
+    }
   }, {
     key: "getFrameRate",
     value: function getFrameRate() {
@@ -234,7 +263,12 @@ var LiveConf = /*#__PURE__*/function () {
       var sourceTimescale = _ref2.sourceTimescale;
       var videoStream = this.getStreamDataForCodecType("video");
       var frameRate = videoStream.frame_rate;
-      var seg = {};
+
+      // PENDING(SS) - calculate frame duration here
+      // let frameRateNum = 0;
+      var seg = {
+        //  videoFrameDurationTs: sourceTimescale / frameRateNum
+      };
       switch (frameRate) {
         case "24":
           seg.video = sourceTimescale * 30;
@@ -252,21 +286,25 @@ var LiveConf = /*#__PURE__*/function () {
           seg.duration = "30";
           break;
         case "30000/1001":
+          //seg.videoFrameDurationTs = 3003;
           seg.video = sourceTimescale * 30;
           seg.keyint = 60;
           seg.duration = "30.03";
           break;
         case "48":
+          //seg.videoFrameDurationTs = 1875;
           seg.video = sourceTimescale * 30;
           seg.keyint = 96;
           seg.duration = "30";
           break;
         case "50":
+          //seg.videoFrameDurationTs = 1800;
           seg.video = sourceTimescale * 30;
           seg.keyint = 100;
           seg.duration = "30";
           break;
         case "60":
+          //seg.videoFrameDurationTs = 1500;
           seg.video = sourceTimescale * 30;
           seg.keyint = 120;
           seg.duration = "30";
@@ -292,7 +330,7 @@ var LiveConf = /*#__PURE__*/function () {
       var seg = {};
       switch (frameRate) {
         case "24":
-          seg.videoTimeBase = 1536; // Output timebase: 12288
+          seg.videoTimeBase = 768; // Note 1536 produces low output bitrate
           seg.videoFrameDurationTs = 512;
           seg.video = this.calcOutputTimebase(seg.videoTimeBase) * 30;
           seg.keyint = 48;
@@ -361,16 +399,52 @@ var LiveConf = /*#__PURE__*/function () {
       }
       return sync_id;
     }
+
+    /*
+     * 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;
+      var audioStreams = {};
+      if (customSettings && customSettings.audio) {
+        for (var i = 0; i < Object.keys(customSettings.audio).length; i++) {
+          var audioIdx = Object.keys(customSettings.audio)[i];
+          var audio = customSettings.audio[audioIdx];
+          audioStreams[audioIdx] = {
+            recordingBitrate: audio.recording_bitrate || 192000,
+            recordingChannels: audio.recording_channels || 2
+          };
+          if (audio.playout) {
+            audioStreams[audioIdx].playoutLabel = audio.playout_label || "Audio ".concat(audioIdx);
+          }
+        }
+      }
+
+      // If no audio streams specified in custom config, set up all the suitable audio streams in the probe
+      if (!customSettings.audio) {
+        audioStreams = this.getAudioStreamsFromProbe();
+      }
+      return audioStreams;
+    }
+
+    /*
+     * Generate the live recording config as required by QFAB, based on defaults and optional custom settings.
+     */
   }, {
     key: "generateLiveConf",
-    value: function generateLiveConf(_ref4) {
-      var audioBitrate = _ref4.audioBitrate,
-        audioIndex = _ref4.audioIndex,
-        partTtl = _ref4.partTtl,
-        channelLayout = _ref4.channelLayout;
+    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;
+      var audioStreams = this.generateAudioStreamsConfig({
+        customSettings: customSettings
+      });
+
+      // Retrieve one audio stream from the probe to read the sample rate and codec name
       var audioStream = this.getStreamDataForCodecType("audio");
       var sampleRate = parseInt(audioStream.sample_rate);
       var audioCodec = audioStream.codec_name;
@@ -378,22 +452,26 @@ var LiveConf = /*#__PURE__*/function () {
       var sourceTimescale;
 
       // Fill in liveconf all formats have in common
-      conf.live_recording.probe_info = this.probeData;
       conf.live_recording.fabric_config.ingress_node_api = this.nodeUrl || null;
       conf.live_recording.fabric_config.ingress_node_id = this.nodeId || null;
       conf.live_recording.recording_config.recording_params.description;
       conf.live_recording.recording_config.recording_params.origin_url = fileName;
       conf.live_recording.recording_config.recording_params.description = "Ingest stream ".concat(fileName);
       conf.live_recording.recording_config.recording_params.name = "Ingest stream ".concat(fileName);
-      conf.live_recording.recording_config.recording_params.xc_params.audio_index[0] = audioIndex === undefined ? audioStream.stream_index : audioIndex;
       conf.live_recording.recording_config.recording_params.xc_params.sample_rate = sampleRate;
       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;
+      for (var i = 0; i < Object.keys(audioStreams).length; i++) {
+        conf.live_recording.recording_config.recording_params.xc_params.audio_index[i] = parseInt(Object.keys(audioStreams)[i]);
+      }
       if (this.syncAudioToVideo) {
         conf.live_recording.recording_config.recording_params.xc_params.sync_audio_to_stream_id = this.syncAudioToStreamIdValue();
       }
-      if (partTtl) {
-        conf.live_recording.recording_config.recording_params.part_ttl = partTtl;
+      if (customSettings.edge_write_token) {
+        conf.live_recording.fabric_config.edge_write_token = customSettings.edge_write_token;
+      }
+      if (customSettings.part_ttl) {
+        conf.live_recording.recording_config.recording_params.part_ttl = customSettings.part_ttl;
       }
 
       // Fill in specifics for protocol
@@ -468,20 +546,29 @@ var LiveConf = /*#__PURE__*/function () {
         default:
           throw new Error("ERROR: Probed stream does not conform to one of the following built in resolution ladders [4096, 2160], [1920, 1080] [1280, 720], [960, 540]");
       }
-      if (audioBitrate || channelLayout) {
-        var audioLadderSpec = conf.live_recording.recording_config.recording_params.ladder_specs.find(function (spec) {
-          return spec.stream_name === "audio";
-        });
-        if (audioBitrate) {
-          conf.live_recording.recording_config.recording_params.xc_params.audio_bitrate = audioBitrate;
-          audioLadderSpec.bit_rate = audioBitrate;
-          audioLadderSpec.representation = "audioaudio_aac@".concat(audioBitrate);
-        }
-        if (channelLayout) {
-          audioLadderSpec.channels = channelLayout;
+      var globalAudioBitrate = 0;
+      var nAudio = 0;
+      for (var _i = 0; _i < Object.keys(audioStreams).length; _i++) {
+        var audioLadderSpec = _objectSpread({}, LadderSpecAudio);
+        var audioIndex = Object.keys(audioStreams)[_i];
+        var audio = audioStreams[audioIndex];
+        audioLadderSpec.bit_rate = audio.recordingBitrate;
+        audioLadderSpec.representation = "audioaudio_aac@".concat(audio.recordingBitrate);
+        audioLadderSpec.channels = audio.recordingChannels;
+        audioLadderSpec.stream_index = parseInt(audioIndex);
+        audioLadderSpec.stream_name = "audio_".concat(audioIndex);
+        audioLadderSpec.stream_label = audio.playoutLabel ? audio.playoutLabel : null;
+        conf.live_recording.recording_config.recording_params.ladder_specs.push(audioLadderSpec);
+        if (audio.recordingBitrate > globalAudioBitrate) {
+          globalAudioBitrate = audio.recordingBitrate;
         }
+        nAudio++;
       }
-      return JSON.stringify(conf, null, 2);
+
+      // 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;
+      return conf;
     }
   }]);
   return LiveConf;