@eluvio/elv-client-js 4.2.17 → 4.2.18

package/package.json

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

package/src/AuthorizationClient.js

@@ -570,18 +570,13 @@ class AuthorizationClient {
       const stateChannelApi = "elv_channelContentRequestContext";
       const additionalParams = [JSON.stringify(audienceData)];
 
-      const payload = await this.MakeKMSCall({
+      token = await this.MakeKMSCall({
         objectId,
         methodName: stateChannelApi,
         paramTypes: ["address", "address", "uint", "uint"],
         params: [this.client.signer.address, Utils.HashToAddress(objectId), value, Date.now()],
         additionalParams
       });
-
-      const signature = await this.Sign(Ethers.utils.keccak256(Ethers.utils.toUtf8Bytes(payload)));
-      const multiSig = Utils.FormatSignature(signature);
-
-      token = `${payload}.${Utils.B64(multiSig)}`;
     }
 
     if(!this.noCache) {

package/src/client/ContentAccess.js

@@ -20,6 +20,8 @@ const {
 } = require("../Validation");
 
 const MergeWith = require("lodash/mergeWith");
+const LodashSet = require("lodash/set");
+const LodashGet = require("lodash/get");
 
 // Note: Keep these ordered by most-restrictive to least-restrictive
 exports.permissionLevels = {
@@ -583,7 +585,7 @@ exports.ContentObjects = async function({libraryId, filterOptions={}}) {
  *
  * @returns {Promise<Object>} - Description of content object
  */
-exports.ContentObject = async function({objectId, versionHash, writeToken, noCache}) {
+exports.ContentObject = async function({objectId, versionHash, writeToken, noCache, authorizationToken}) {
   this.Log(`Retrieving content object: ${writeToken || versionHash || objectId}`);
 
   if(writeToken) {
@@ -598,7 +600,9 @@ exports.ContentObject = async function({objectId, versionHash, writeToken, noCac
   if(noCache || !this.objectInfo[id] || Date.now() - this.objectInfo[id].retrievedAt > 30000) {
     let path = UrlJoin("q", id);
     const info = await this.HttpClient.RequestJsonBody({
-      headers: await this.authClient.AuthorizationHeader({objectId, versionHash}),
+      headers: {
+        Authorization: `Bearer ${authorizationToken || await this.authClient.AuthorizationToken({objectId, versionHash})}`,
+      },
       method: "GET",
       path: path,
       queryParams: {
@@ -626,7 +630,7 @@ exports.ContentObject = async function({objectId, versionHash, writeToken, noCac
  *
  * @returns {Promise<string>} - The account address of the owner
  */
-exports.ContentObjectOwner = async function({objectId, versionHash}) {
+exports.ContentObjectOwner = async function({objectId, versionHash, authorizationToken}) {
   versionHash ? ValidateVersion(versionHash) : ValidateObject(objectId);
 
   if(versionHash) {
@@ -635,7 +639,7 @@ exports.ContentObjectOwner = async function({objectId, versionHash}) {
 
   this.Log(`Retrieving content object owner: ${objectId}`);
 
-  return this.utils.HashToAddress((await this.ContentObject({objectId, versionHash})).content_profile.owner);
+  return this.utils.HashToAddress((await this.ContentObject({objectId, versionHash, authorizationToken})).content_profile.owner);
 };
 
 /**
@@ -649,7 +653,7 @@ exports.ContentObjectOwner = async function({objectId, versionHash}) {
  *
  * @returns {Promise<string>} - Tenant ID of the object
  */
-exports.ContentObjectTenantId = async function({objectId, versionHash}) {
+exports.ContentObjectTenantId = async function({objectId, versionHash, authorizationToken}) {
   versionHash ? ValidateVersion(versionHash) : ValidateObject(objectId);
 
   if(versionHash) {
@@ -659,7 +663,7 @@ exports.ContentObjectTenantId = async function({objectId, versionHash}) {
   // Cache results because they will never change
   if(!this.objectTenantIds[objectId]) {
     try {
-      this.objectTenantIds[objectId] = (await this.ContentObject({objectId, versionHash})).content_profile.tenant_id;
+      this.objectTenantIds[objectId] = (await this.ContentObject({objectId, versionHash, authorizationToken})).content_profile.tenant_id;
     } catch(error) {
       error.message = `Unable to determine tenant ID for ${versionHash || objectId}`;
       throw error;
@@ -680,7 +684,7 @@ exports.ContentObjectTenantId = async function({objectId, versionHash}) {
  *
  * @returns {Promise<string>} - Library ID of the object
  */
-exports.ContentObjectLibraryId = async function({objectId, versionHash}) {
+exports.ContentObjectLibraryId = async function({objectId, versionHash, authorizationToken}) {
   versionHash ? ValidateVersion(versionHash) : ValidateObject(objectId);
 
   if(versionHash) {
@@ -690,7 +694,7 @@ exports.ContentObjectLibraryId = async function({objectId, versionHash}) {
   // Cache results because they will never change
   if(!this.objectLibraryIds[objectId]) {
     try {
-      this.objectLibraryIds[objectId] = (await this.ContentObject({objectId, versionHash})).qlib_id;
+      this.objectLibraryIds[objectId] = (await this.ContentObject({objectId, versionHash, authorizationToken})).qlib_id;
     } catch(error) {
       error.message = `Unable to determine library ID for ${versionHash || objectId}`;
       throw error;
@@ -709,56 +713,43 @@ exports.ProduceMetadataLinks = async function({
   authorizationToken,
   noAuth
 }) {
-  // Primitive
-  if(!metadata || typeof metadata !== "object") { return metadata; }
+  path = UrlJoin(path || "").replace(/^\//, "").replace(/\/$/, "");
 
-  // Array
-  if(Array.isArray(metadata)) {
-    return await this.utils.LimitedMap(
-      5,
-      metadata,
-      async (entry, i) => await this.ProduceMetadataLinks({
-        libraryId,
-        objectId,
-        versionHash,
-        path: UrlJoin(path, i.toString()),
-        metadata: entry,
-        authorizationToken,
-        noAuth
-      })
-    );
-  }
+  const Traverse = async (currentPath="") => {
+    const currentMetadata = !currentPath ? metadata : LodashGet(metadata, currentPath.split("/"));
 
-  // Object
-  if(metadata["/"] &&
-    (metadata["/"].match(/\.\/(rep|files)\/.+/) ||
-      metadata["/"].match(/^\/?qfab\/([\w]+)\/?(rep|files)\/.+/)))
-  {
-    // Is file or rep link - produce a url
-    return {
-      ...metadata,
-      url: await this.LinkUrl({libraryId, objectId, versionHash, linkPath: path, authorizationToken, noAuth})
-    };
-  }
+    // Primitive
+    if(!currentMetadata || typeof currentMetadata !== "object") {
+      return;
+    }
 
-  let result = {};
-  await this.utils.LimitedMap(
-    5,
-    Object.keys(metadata),
-    async key => {
-      result[key] = await this.ProduceMetadataLinks({
-        libraryId,
-        objectId,
-        versionHash,
-        path: UrlJoin(path, key),
-        metadata: metadata[key],
-        authorizationToken,
-        noAuth
-      });
+    // Array
+    if(Array.isArray(currentMetadata)) {
+      for(let i = 0; i < currentMetadata.length; i++) {
+        await Traverse(UrlJoin(currentPath, i.toString()));
+      }
     }
-  );
 
-  return result;
+    // Object
+    if(currentMetadata["/"] &&
+      (currentMetadata["/"].match(/\.\/(rep|files)\/.+/) ||
+        currentMetadata["/"].match(/^\/?qfab\/([\w]+)\/?(rep|files)\/.+/))) {
+      // Is file or rep link - produce a url
+      LodashSet(
+        metadata,
+        UrlJoin(currentPath, "url").split("/"),
+        await this.LinkUrl({libraryId, objectId, versionHash, linkPath: UrlJoin(path, currentPath), authorizationToken, noAuth})
+      )
+    } else {
+      for(let key of Object.keys(currentMetadata)) {
+        await Traverse(UrlJoin(currentPath, key))
+      }
+    }
+  }
+
+  Traverse();
+
+  return metadata;
 };
 
 exports.MetadataAuth = async function({
@@ -1056,7 +1047,7 @@ exports.ContentObjectVersions = async function({libraryId, objectId}) {
   return this.HttpClient.RequestJsonBody({
     headers: await this.authClient.AuthorizationHeader({libraryId, objectId}),
     method: "GET",
-    path: path
+    path
   });
 };
 
@@ -1070,13 +1061,13 @@ exports.ContentObjectVersions = async function({libraryId, objectId}) {
  *
  * @returns {Promise<string>} - The latest version hash of the object
  */
-exports.LatestVersionHash = async function({objectId, versionHash}) {
+exports.LatestVersionHash = async function({objectId, versionHash, authorizationToken}) {
   if(versionHash) {
     objectId = this.utils.DecodeVersionHash(versionHash).objectId;
   }
 
   try {
-    return (await this.ContentObject({objectId, noCache: true})).hash;
+    return (await this.ContentObject({objectId, noCache: true, authorizationToken})).hash;
   } catch(error) {
     error.message = `Unable to determine latest version hash for ${versionHash || objectId}`;
     throw error;
@@ -1175,11 +1166,11 @@ exports.PlayoutPathResolution = async function({
   authorizationToken
 }) {
   if(!libraryId) {
-    libraryId = await this.ContentObjectLibraryId({objectId});
+    libraryId = await this.ContentObjectLibraryId({objectId, authorizationToken});
   }
 
   if(!versionHash) {
-    versionHash = await this.LatestVersionHash({objectId});
+    versionHash = await this.LatestVersionHash({objectId, authorizationToken});
   }
 
   let path = UrlJoin("qlibs", libraryId, "q", writeToken || versionHash, "rep", handler, offering, "options.json");
@@ -1215,7 +1206,7 @@ exports.PlayoutPathResolution = async function({
         authorizationToken
       });
       linkTargetId = this.utils.DecodeVersionHash(linkTargetHash).objectId;
-      linkTargetLibraryId = await this.ContentObjectLibraryId({objectId: linkTargetId});
+      linkTargetLibraryId = await this.ContentObjectLibraryId({objectId: linkTargetId, authorizationToken});
 
       if(!multiOfferingLink && !offering) {
         // If the offering is not specified, the intent is to get available offerings. For a single offering link, must
@@ -1272,7 +1263,7 @@ exports.AvailableOfferings = async function({
 
   if(directLink) {
     return await this.ContentObjectMetadata({
-      libraryId: await this.ContentObjectLibraryId({objectId}),
+      libraryId: await this.ContentObjectLibraryId({objectId, authorizationToken}),
       objectId,
       versionHash,
       metadataSubtree: linkPath,
@@ -1383,10 +1374,10 @@ exports.PlayoutOptions = async function({
   if(!objectId) {
     objectId = this.utils.DecodeVersionHash(versionHash).objectId;
   } else if(!versionHash) {
-    versionHash = await this.LatestVersionHash({objectId});
+    versionHash = await this.LatestVersionHash({objectId, authorizationToken});
   }
 
-  const libraryId = await this.ContentObjectLibraryId({objectId});
+  const libraryId = await this.ContentObjectLibraryId({objectId, authorizationToken});
 
   try {
     // If public/asset_metadata/sources/<offering> exists, use that instead of directly calling on object

package/src/client/LiveConf.js

@@ -540,6 +540,7 @@ class LiveConf {
         conf.live_recording.recording_config.recording_params.source_timescale = sourceTimescale;
         break;
       case "rtmp":
+      case "flv":
         sourceTimescale = 16000;
         conf.live_recording.recording_config.recording_params.source_timescale = sourceTimescale;
         break;

package/src/client/LiveStream.js

@@ -2265,14 +2265,6 @@ exports.StreamApplyProfile = async function({
     }));
   }
 
-  // Load the base config profile and merge with overrides
-  const overrides = await this.ContentObjectMetadata({
-    libraryId,
-    objectId,
-    writeToken: streamWriteToken,
-    metadataSubtree: "live_recording_overrides"
-  }) || {};
-
   const currentConfig = await this.ContentObjectMetadata({
     libraryId,
     objectId,
@@ -2280,8 +2272,9 @@ exports.StreamApplyProfile = async function({
     metadataSubtree: "live_recording_config"
   }) || {};
 
-  // Preserve stream-specific fields (e.g. url) from the current config, then apply profile, then overrides
-  const config = R.mergeDeepRight(R.mergeDeepRight(currentConfig, profile), overrides);
+  // Only preserve stream-identity fields from the current config; all technical settings come from the new profile
+  const preservedConfig = R.pick(["url", "name"], currentConfig);
+  const config = R.mergeDeepRight(preservedConfig, profile);
 
   const currentProfileName = await this.ContentObjectMetadata({
     libraryId,
@@ -2299,6 +2292,34 @@ exports.StreamApplyProfile = async function({
     liveRecordingConfig: config
   });
 
+  // Clear live_recording and live_recording_overrides so stale settings from the previous profile don't persist
+  await this.ReplaceMetadata({
+    libraryId,
+    objectId,
+    writeToken: streamWriteToken,
+    metadataSubtree: "live_recording",
+    metadata: {}
+  });
+
+  await this.ReplaceMetadata({
+    libraryId,
+    objectId,
+    writeToken: streamWriteToken,
+    metadataSubtree: "live_recording_overrides",
+    metadata: {}
+  });
+
+  // If input_stream_info is available, regenerate live_recording from the new profile now
+  if(config.input_stream_info) {
+    await this.StreamConfig({
+      name: objectId,
+      liveRecordingConfig: config,
+      inputStreamInfo: config.input_stream_info,
+      writeToken: streamWriteToken,
+      finalize: false
+    });
+  }
+
   if(!profileSlug) {
     profileSlug = slugify(profile.name);
   }
@@ -2578,13 +2599,6 @@ exports.StreamConfig = async function({
     objectId: objectId,
   }
 
-  const liveRecordingMeta = await this.ContentObjectMetadata({
-    libraryId: libraryId,
-    objectId,
-    writeToken,
-    metadataSubtree: "/live_recording"
-  });
-
   let liveRecordingConfigProfile;
   if(liveRecordingConfig && Object.keys(liveRecordingConfig || {}).length > 0) {
     // Extract values that may have been saved during Create but aren't being repeated in the Config step
@@ -2612,6 +2626,15 @@ exports.StreamConfig = async function({
 
   status.userConfig = liveRecordingConfigProfile;
 
+  // If the stored probe is from a different protocol than the current URL, discard it and re-probe
+  if(probe && !inputStreamInfo) {
+    const urlProtocol = liveRecordingConfigProfile.url?.split(":")?.[0];
+    const probeProtocol = (probe.format?.filename || "").split(":")?.[0];
+    if(urlProtocol && probeProtocol && urlProtocol !== probeProtocol) {
+      probe = null;
+    }
+  }
+
   const streamData = {
     client: this
   };
@@ -2648,7 +2671,6 @@ exports.StreamConfig = async function({
   const liveConf = new LiveConf({
     url: liveRecordingConfigProfile.url,
     probeData: probe,
-    liveRecordingMeta,
     nodeId,
     nodeUrl: endpoint,
     includeAVSegDurations: false,
@@ -3392,9 +3414,8 @@ exports.OutputsList = async function({libraryId, objectId, includeState=true}) {
       value.input.status = streamStatus?.state;
     }
 
-    value = await this.OutputsResolveSrtPullUrls({value});
-
     if(includeState) {
+      await this.OutputsResolveSrtPullUrls({value});
       try {
         const nodeId = value.srt_pull?.node_ids?.[0];
         const result = await this.OutputsState({outputId: key, objectId, libraryId, nodeId, includeState: true});
@@ -3464,7 +3485,7 @@ exports.OutputsListItem = async function({libraryId, objectId, outputId, include
     value.input.status = streamStatus?.state;
   }
 
-  value = await this.OutputsResolveSrtPullUrls({value});
+  await this.OutputsResolveSrtPullUrls({value});
 
   if(includeState) {
     try {
@@ -3567,7 +3588,7 @@ const RouteToOutputNode = async ({client, libraryId, objectId, outputId, nodeId}
     const fabricUrl = nodes?.[0]?.services?.fabric_api?.urls?.[0];
     if(fabricUrl) {
       client.SetNodes({fabricURIs: [fabricUrl]});
-      if(config) { config = await client.OutputsResolveSrtPullUrls({value: config}); }
+      if(config) { await client.OutputsResolveSrtPullUrls({value: config}); }
     }
   }
 

package/src/client/NTP.js

@@ -253,6 +253,51 @@ exports.DeleteNTPInstance = async function({tenantId, ntpId}) {
   });
 };
 
+/**
+ * Generate a report for the specified NTP instance.
+ *
+ * @methodGroup NTP Instances
+ * @namedParams
+ * @param {string} tenantId - The ID of the tenant in which this NTP instance was created
+ * @param {string} ntpId - The ID of the NTP instance
+ * @param {string} password - The code associated with the NTP instance
+ * @param {string=} email - Email address associated with the code
+ */
+exports.ReportNTPInstance = async function({tenantId, ntpId, password, email}) {
+  ValidatePresence("tenantId", tenantId);
+  ValidatePresence("ntpId", ntpId);
+
+  let paramsJSON = [];
+
+  if (password) {
+    paramsJSON.push(`pwd:${password}`);
+  }
+
+  if (email) {
+    paramsJSON.push(`eml:${email}`);
+  }
+
+  const res = await this.authClient.MakeKMSCall({
+    tenantId,
+    methodName: "elv_updateOTPInstance",
+    params: [
+      tenantId,
+      ntpId,
+      "report",
+      JSON.stringify(paramsJSON),
+      Date.now()
+    ],
+    paramTypes: [
+      "string",
+      "string",
+      "string",
+      "string",
+      "int"
+    ]
+  });
+  return res || {};
+};
+
 /**
  * Retrieve info for NTP instances in the specified tenant
  *
@@ -389,6 +434,32 @@ exports.IssueSignedNTPCode = async function({tenantId, ntpId, email, maxRedempti
   return result;
 };
 
+/**
+ * Check the status of the specified ticket/code without redeeming it.
+ *
+ * @methodGroup Tickets
+ * @namedParams
+ * @param {string} tenantId - The ID of the tenant from which the ticket was issued
+ * @param {string} ntpId - The ID of the NTP instance from which the ticket was issued
+ * @param {string} code - Access code
+ * @param {string=} email - Email address associated with the code
+ *
+ * @return {Promise<Object>} - Status information for the ticket
+ */
+exports.NTPStatus = async function({tenantId, ntpId, code, email}) {
+  ValidatePresence("tenantId", tenantId);
+  ValidatePresence("ntpId", ntpId);
+  ValidatePresence("code", code);
+
+  const response = await this.HttpClient.Request({
+    method: "POST",
+    path: UrlJoin("ks", "otp", "ntp", tenantId, ntpId, "status"),
+    body: {"_PASSWORD": code, "_EMAIL": email}
+  });
+
+  return await response.json();
+};
+
 /**
  * Redeem the specified ticket/code to authorize the client. Must provide either issuer or tenantId and ntpId
  *