@eluvio/elv-client-js 4.0.56 → 4.0.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.56",
+  "version": "4.0.58",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",

package/src/client/Files.js

@@ -516,14 +516,35 @@ exports.UploadJobStatus = async function({libraryId, objectId, writeToken, uploa
 
   const path = UrlJoin("q", writeToken, "file_jobs", uploadId, "uploads", jobId);
 
-  return await this.utils.ResponseToJson(
+  let response = await this.utils.ResponseToJson(
     this.HttpClient.Request({
       headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
       method: "GET",
       path: path,
-      allowFailover: false
+      allowFailover: false,
+      queryParams: { start: 0, limit: 10000 }
     })
   );
+
+  while(response.next !== response.total && response.next >= 0) {
+    const newResponse = await this.utils.ResponseToJson(
+      this.HttpClient.Request({
+        headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
+        method: "GET",
+        path: path,
+        allowFailover: false,
+        queryParams: { start: response.next }
+      })
+    );
+
+    response.files = [
+      ...response.files,
+      ...newResponse.files
+    ];
+    response.next = newResponse.next;
+  }
+
+  return response;
 };
 
 exports.UploadFileData = async function({libraryId, objectId, writeToken, encryption, uploadId, jobId, filePath, fileData}) {

package/src/client/LiveConf.js

@@ -35,14 +35,14 @@ const LadderTemplate = {
     stream_name: "video",
     width: 960
   },
-  "360": {
-    bit_rate: 520000,
+  "540_low": {
+    bit_rate: 900000,
     codecs: "avc1.640028,mp4a.40.2",
-    height: 360,
+    height: 540,
     media_type: 1,
-    representation: "videovideo_640x360_h264@520000",
+    representation: "videovideo_960x540_h264@900000",
     stream_name: "video",
-    width: 640
+    width: 960
   }
 };
 
@@ -236,9 +236,9 @@ class LiveConf {
     return sync_id;
   }
 
-  generateLiveConf() {
+  generateLiveConf({audioBitrate, audioIndex, partTtl, channelLayout}) {
     // gather required data
-    const conf = LiveconfTemplate;
+    const conf = JSON.parse(JSON.stringify(LiveconfTemplate));
     const fileName = this.overwriteOriginUrl || this.probeData.format.filename;
     const audioStream = this.getStreamDataForCodecType("audio");
     const sampleRate = parseInt(audioStream.sample_rate);
@@ -255,7 +255,7 @@ class LiveConf {
     conf.live_recording.recording_config.recording_params.origin_url = fileName;
     conf.live_recording.recording_config.recording_params.description = `Ingest stream ${fileName}`;
     conf.live_recording.recording_config.recording_params.name = `Ingest stream ${fileName}`;
-    conf.live_recording.recording_config.recording_params.xc_params.audio_index[0] = audioStream.stream_index;
+    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;
@@ -264,6 +264,10 @@ class LiveConf {
       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;
+    }
+
     // Fill in specifics for protocol
     switch(this.probeKind()) {
       case "udp":
@@ -297,7 +301,7 @@ class LiveConf {
           LadderTemplate[1080],
           LadderTemplate[720],
           LadderTemplate[540],
-          LadderTemplate[360]
+          LadderTemplate["540_low"]
         );
         conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[2160].bit_rate;
         conf.live_recording.recording_config.recording_params.xc_params.enc_height = 2160;
@@ -309,7 +313,7 @@ class LiveConf {
           LadderTemplate[1080],
           LadderTemplate[720],
           LadderTemplate[540],
-          LadderTemplate[360]
+          LadderTemplate["540_low"]
         );
         conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[1080].bit_rate;
         conf.live_recording.recording_config.recording_params.xc_params.enc_height = 1080;
@@ -319,7 +323,7 @@ class LiveConf {
         conf.live_recording.recording_config.recording_params.ladder_specs.unshift(
           LadderTemplate[720],
           LadderTemplate[540],
-          LadderTemplate[360]
+          LadderTemplate["540_low"]
         );
         conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[720].bit_rate;
         conf.live_recording.recording_config.recording_params.xc_params.enc_height = 720;
@@ -328,21 +332,28 @@ class LiveConf {
       case 540:
         conf.live_recording.recording_config.recording_params.ladder_specs.unshift(
           LadderTemplate[540],
-          LadderTemplate[360]
+          LadderTemplate["540_low"]
         );
         conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[540].bit_rate;
         conf.live_recording.recording_config.recording_params.xc_params.enc_height = 540;
         conf.live_recording.recording_config.recording_params.xc_params.enc_width = 960;
         break;
-      case 360:
-        conf.live_recording.recording_config.recording_params.ladder_specs.unshift(LadderTemplate[360]);
-        conf.live_recording.recording_config.recording_params.ladder_specs.unshift(LadderTemplate[360]);
-        conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[360].bit_rate;
-        conf.live_recording.recording_config.recording_params.xc_params.enc_height = 360;
-        conf.live_recording.recording_config.recording_params.xc_params.enc_width = 640;
-        break;
       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], [640, 360]");
+        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) {
+      const audioLadderSpec = conf.live_recording.recording_config.recording_params.ladder_specs.find(spec => 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@${audioBitrate}`;
+      }
+
+      if(channelLayout) {
+        audioLadderSpec.channels = channelLayout;
+      }
     }
 
     return JSON.stringify(conf, null, 2);

package/src/client/LiveStream.js

@@ -1118,7 +1118,7 @@ exports.LoadConf = async function({name}) {
  * @return {Object} - The status response for the stream
  *
  */
-exports.StreamConfig = async function({name}) {
+exports.StreamConfig = async function({name, customSettings}) {
   let conf = await this.LoadConf({name});
   let status = {name};
 
@@ -1191,10 +1191,15 @@ exports.StreamConfig = async function({name}) {
   console.log("PROBE", probe);
   probe.format.filename = streamUrl.href;
 
-  // Create live reocording config
+  // Create live recording config
   let lc = new LiveConf(probe, node.id, endpoint, false, false, true);
 
-  const liveRecordingConfigStr = lc.generateLiveConf();
+  const liveRecordingConfigStr = lc.generateLiveConf({
+    audioBitrate: customSettings.audioBitrate,
+    audioIndex: customSettings.audioIndex,
+    partTtl: customSettings.partTtl,
+    channelLayout: customSettings.channelLayout
+  });
   let liveRecordingConfig = JSON.parse(liveRecordingConfigStr);
   console.log("CONFIG", JSON.stringify(liveRecordingConfig.live_recording));
 
@@ -1213,6 +1218,14 @@ exports.StreamConfig = async function({name}) {
     metadata: liveRecordingConfig.live_recording
   });
 
+  await this.ReplaceMetadata({
+    libraryId,
+    objectId: conf.objectId,
+    writeToken,
+    metadataSubtree: "probe",
+    metadata: probe
+  });
+
   status.fin = await this.FinalizeContentObject({
     libraryId,
     objectId: conf.objectId,

package/testScripts/Test.js

@@ -16,20 +16,6 @@ const Test = async () => {
     });
 
     client.SetSigner({signer});
-
-    client.ToggleLogging(true);
-    const response = await client.CallContractMethod({
-      cacheContract: true,
-      contractAddress: "0xc4958836b7f883a02e9fedcc11f7ebbcc8c2d5bb",
-      formatAgruments: true,
-      methodArgs: [1],
-      methodName: "membersList",
-      overrideCachedContract: false,
-      overrides: {}
-    });
-    client.ToggleLogging(false);
-
-    console.log("response", response)
   } catch(error) {
     console.error(error);
     console.error(JSON.stringify(error, null, 2));