@eluvio/elv-client-js 4.2.34 → 4.2.36

package/package.json

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

package/src/HttpClient.js

@@ -65,10 +65,16 @@ class HttpClient {
     allowFailover=true,
     forceFailover=false,
     allowRetry=true,
-    uriIndex
+    uriIndex,
+    nodeUrl
   }) {
     let baseURI = this.BaseURI(uriIndex);
 
+    if(nodeUrl) {
+      baseURI = new URI(nodeUrl);
+      allowFailover = false;
+    }
+
     // If URL contains a write token, it must go to the correct server and can not fail over
     const writeTokenMatch = path.replace(/^\//, "").match(/(qlibs\/ilib[a-zA-Z0-9]+|q|qid)\/(tqw__[a-zA-Z0-9]+)/);
     const writeToken = writeTokenMatch ? writeTokenMatch[2] : undefined;
@@ -171,7 +177,8 @@ class HttpClient {
           headers,
           attempts: attempts + 1,
           uriIndex,
-          forceFailover
+          forceFailover,
+          nodeUrl
         });
       }
 

package/src/client/ContentAccess.js

@@ -1902,6 +1902,8 @@ exports.MakeFileServiceRequest = async function({
  * @param {boolean=} constant=true - If specified, a GET request authenticated with an AccessRequest will be made.
  * Otherwise, a POST with an UpdateRequest will be performed
  * @param {string=} format=json - The format of the response
+ * @param {string=} nodeUrl - If specified, the call is made directly to this fabric node instead of
+ * the client's currently configured node(s)
  *
  * @returns {Promise<format>} - The response from the call in the specified format
  */
@@ -1916,7 +1918,8 @@ exports.CallBitcodeMethod = async function({
   body={},
   headers={},
   constant=true,
-  format="json"
+  format="json",
+  nodeUrl
 }) {
   ValidateParameters({libraryId, objectId, versionHash});
   if(!method) { throw "Bitcode method not specified"; }
@@ -1960,7 +1963,8 @@ exports.CallBitcodeMethod = async function({
       method: verb,
       path,
       queryParams,
-      allowFailover: false
+      allowFailover: false,
+      nodeUrl
     }),
     this.HttpClient.debug,
     this.HttpClient.Log.bind(this.HttpClient)

package/src/client/ContentManagement.js

@@ -813,10 +813,11 @@ exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, writ
  * @param {object=} options -
  * @param {object=} options.meta - New metadata for the object - will be merged into existing metadata if specified
  * @param {string=} options.type - New type for the object - Object ID, version hash or name of type
+ * @param {string=} nodeUrl - Fabric node URL to create the draft on
  *
  * @returns {Promise<object>} - Response containing the object ID and write token of the draft, as well as URL of node handling the draft
  */
-exports.EditContentObject = async function({libraryId, objectId, options={}}) {
+exports.EditContentObject = async function({libraryId, objectId, options={}, nodeUrl}) {
   ValidateParameters({libraryId, objectId});
 
   this.Log(`Opening content draft: ${libraryId} ${objectId}`);
@@ -842,11 +843,12 @@ exports.EditContentObject = async function({libraryId, objectId, options={}}) {
     headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
     method: "POST",
     path: path,
-    body: options
+    body: options,
+    nodeUrl
   });
   // extract the url for the node that handled the request
   // TODO: remove/simplify after we start using /nodes API call to get node URLs for write tokens
-  const nodeUrl = (new URL(rawEditResponse.url)).origin;
+  const responseNodeUrl = (new URL(rawEditResponse.url)).origin;
   const editResponse = await this.utils.ResponseToJson(
     rawEditResponse,
     this.HttpClient.debug,
@@ -854,11 +856,11 @@ exports.EditContentObject = async function({libraryId, objectId, options={}}) {
   );
 
   // Record the node used in creating this write token
-  this.RecordWriteToken({writeToken: editResponse.write_token, fabricNodeUrl: nodeUrl});
+  this.RecordWriteToken({writeToken: editResponse.write_token, fabricNodeUrl: responseNodeUrl});
 
   editResponse.writeToken = editResponse.write_token;
   editResponse.objectId = editResponse.id;
-  editResponse.nodeUrl = nodeUrl;
+  editResponse.nodeUrl = responseNodeUrl;
 
   return editResponse;
 };

package/src/client/LiveConf.js

@@ -538,8 +538,12 @@ class LiveConf {
     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.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;
+
+    // Encoding dimensions default to the source but are overridden by profile values if present
+    conf.live_recording.recording_config.recording_params.xc_params.enc_height =
+      customXcParams?.enc_height ?? videoStream.height;
+    conf.live_recording.recording_config.recording_params.xc_params.enc_width =
+      customXcParams?.enc_width ?? videoStream.width;
 
     for(let 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]);
@@ -606,9 +610,6 @@ class LiveConf {
     const ladder_specs = customSettings.liveRecordingConfigProfile?.playout_config?.ladder_specs;
     const ladderProfile = 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 = [];
 

package/src/client/LiveStream.js

@@ -393,15 +393,42 @@ exports.StreamCreate = async function({
     metadata
   });
 
+  // If the profile is changing, only carry over name and url so stale
+  // settings from the old profile are cleared
+  const changingProfile = liveRecordingConfig?.name && liveRecordingConfig.name !== oldProfile;
+  const baseLiveRecordingConfig = changingProfile ?
+    R.pick(["url", "name"], currentLiveRecordingConfig) :
+    currentLiveRecordingConfig;
+
   // Full overwrite avoids the server-side merge mixing streams from the old and new profile
   await this.ReplaceMetadata({
     libraryId,
     objectId,
     writeToken,
     metadataSubtree: "live_recording_config",
-    metadata: R.mergeDeepRight(currentLiveRecordingConfig, liveRecordingConfig)
+    metadata: R.mergeDeepRight(baseLiveRecordingConfig, liveRecordingConfig)
   });
 
+  if(changingProfile) {
+    // Clear live_recording and live_recording_overrides so stale settings from the
+    // previous profile don't persist, matching StreamApplyProfile
+    await this.ReplaceMetadata({
+      libraryId,
+      objectId,
+      writeToken,
+      metadataSubtree: "live_recording",
+      metadata: {}
+    });
+
+    await this.ReplaceMetadata({
+      libraryId,
+      objectId,
+      writeToken,
+      metadataSubtree: "live_recording_overrides",
+      metadata: {}
+    });
+  }
+
   try {
     await this.CreateLinks({
       libraryId,
@@ -1269,13 +1296,12 @@ exports.StreamStartRecording = async function({name, start=false}) {
     fabURI = "https://" + fabURI;
   }
 
-  this.SetNodes({fabricURIs: [fabURI]});
-
   console.log("Node URI", fabURI, "ID", liveRecording.fabric_config.ingress_node_id);
 
   let response = await this.EditContentObject({
     libraryId: libraryId,
-    objectId: objectId
+    objectId: objectId,
+    nodeUrl: fabURI
   });
   const edgeToken = response.write_token;
   console.log("Edge token:", edgeToken);
@@ -1285,7 +1311,8 @@ exports.StreamStartRecording = async function({name, start=false}) {
   */
   response = await this.EditContentObject({
     libraryId: libraryId,
-    objectId: objectId
+    objectId: objectId,
+    nodeUrl: fabURI
   });
   let writeToken = response.write_token;
 
@@ -1371,8 +1398,6 @@ exports.StreamRestartRecording = async function({name}) {
     throw new Error("Unable to restart stream - ingress node API is unavailable");
   }
 
-  this.SetNodes({fabricURIs: [fabricApi]});
-
   let mainWriteToken;
   let newEdgeWriteToken;
   let mainObjectFinalizeStarted = false;
@@ -1380,12 +1405,14 @@ exports.StreamRestartRecording = async function({name}) {
   try {
     ({writeToken: mainWriteToken} = await this.EditContentObject({
       libraryId,
-      objectId
+      objectId,
+      nodeUrl: fabricApi
     }));
 
     ({writeToken: newEdgeWriteToken} = await this.EditContentObject({
       libraryId,
-      objectId
+      objectId,
+      nodeUrl: fabricApi
     }));
 
     await this.MergeMetadata({
@@ -1595,8 +1622,6 @@ exports.StreamStopRecording = async function({name}) {
       fabURI = "https://" + fabURI;
     }
 
-    this.SetNodes({fabricURIs: [fabURI]});
-
     const metaEdgeWriteToken = mainMeta.live_recording.fabric_config.edge_write_token;
 
     if(!metaEdgeWriteToken) {
@@ -1634,7 +1659,8 @@ exports.StreamStopRecording = async function({name}) {
 
     const {writeToken} = await this.EditContentObject({
       libraryId: libraryId,
-      objectId: objectId
+      objectId: objectId,
+      nodeUrl: fabURI
     });
 
     // Set stop time and inactive state

package/testScripts/Test.js

@@ -11,7 +11,7 @@ const Test = async () => {
 
   try {
     const client = await ElvClient.FromNetworkName({
-      networkName: "main"
+      networkName: "demo"
     });
 
     const wallet = client.GenerateWallet();
@@ -21,19 +21,7 @@ const Test = async () => {
 
     client.SetSigner({signer});
 
-    const configUrl = new URL(await client.ConfigUrl());
-    configUrl.pathname = "/config";
-    // if(geo) { configUrl.searchParams.set("elvgeo", geo); }   // optional region scoping
-
-    const fabricInfo = await (await fetch(configUrl.toString())).json();
-    // fabricInfo.network.services.*  e.g. live_egress, ethereum, authority, etc.
-    const liveEgressUrls = fabricInfo?.network?.services?.live_egress;
-    console.log('fabricINfo', fabricInfo.network?.services?.tenant_query)
-
-    // tenant_query nodes are now wired into the client and used automatically by TenantContent:
-    console.log('client tenantQueryURIs', client.Nodes().tenantQueryURIs)
-    // const result = await client.TenantContent({limit: 5});
-    // console.log(JSON.stringify(result, null, 2));
+    console.log(await client.ContentLibraries());
   } catch(error) {
     console.error(error);
     console.error(JSON.stringify(error, null, 2));