@eluvio/elv-client-js 4.2.16 → 4.2.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.2.16",
+  "version": "4.2.18",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",
@@ -79,6 +79,7 @@
     "lodash": "^4.17.19",
     "lodash.isequal": "^4.5.0",
     "mime-types": "^2.1.24",
+    "moment": "^2.27.0",
     "multihashes": "^0.4.14",
     "node-fetch": "^2.6.7",
     "object-path": "^0.11.8",
@@ -112,7 +113,7 @@
     "eslint": "^9.32.0",
     "jsdoc": "^4.0.0",
     "jsdom": "^26.1.0",
-    "moment": "^2.27.0",
+    "mocha": "^11.7.5",
     "raw-loader": "^0.5.1",
     "shell-quote": "^1.7.2",
     "showdown": "^1.9.1",

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/FrameClient.js

@@ -447,6 +447,15 @@ class FrameClient {
       "Nodes",
       "NTPInstance",
       "ObjectCleanup",
+      "OutputsCreate",
+      "OutputsDelete",
+      "OutputsList",
+      "OutputsListItem",
+      "OutputsModify",
+      "OutputsModifyBatch",
+      "OutputsResolveSrtPullUrls",
+      "OutputsState",
+      "OutputsStop",
       "Permission",
       "PlayoutOptions",
       "PlayoutPathResolution",
@@ -472,6 +481,7 @@ class FrameClient {
       "RevokeShare",
       "SendFunds",
       "SetAccessCharge",
+      "StreamApplyProfile",
       "SetAuth",
       "SetAuthContext",
       "SetAuthPolicy",
@@ -496,17 +506,28 @@ class FrameClient {
       "SpaceNodes",
       "StartABRMezzanineJobs",
       "StreamAddWatermark",
+      "StreamApplyProfile",
+      "StreamAssignProfile",
       "StreamConfig",
+      "StreamConfigProfile",
+      "StreamConfigProfiles",
       "StreamCopyToVod",
       "StreamCreate",
       "StreamInitialize",
       "StreamInsertion",
+      "StreamLinkToSite",
       "StreamListUrls",
+      "StreamRemoveLinkToSite",
       "StreamRemoveWatermark",
+      "StreamSaveConfigProfile",
       "StreamSetOfferingAndDRM",
-      "StreamStatus",
+      "StreamSiteSettings",
+      "StreamStartRecording",
       "StreamStartOrStopOrReset",
-      "StreamStopSession",
+      "StreamStatus",
+      "StreamStopRecording",
+      "StreamUnassignProfile",
+      "StreamUpdateConfig",
       "SuspendNTPInstance",
       "TenantContractId",
       "TenantId",

package/src/abr_profiles/abr_profile_live_drm.js

@@ -1863,16 +1863,6 @@ const AbrProfileLiveDrm = {
     }
   },
   "playout_formats": {
-    "dash-playready-cenc": {
-      "drm": {
-        "enc_scheme_name": "cenc",
-        "type": "DrmPlayReady"
-      },
-      "protocol": {
-        "min_buffer_length": 2,
-        "type": "ProtoDash"
-      }
-    },
     "dash-widevine": {
       "drm": {
         "content_id": "",

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
@@ -1804,7 +1795,6 @@ exports.GlobalUrl = async function({
     }
   }
 
-  console.log("Updated")
   let urlPath = UrlJoin("s", network);
   if(versionHash) {
     objectId = this.utils.DecodeVersionHash(versionHash).objectId;
@@ -2824,7 +2814,7 @@ exports.EncryptionConk = async function({libraryId, objectId, versionHash, write
   const owner = await this.authClient.Owner({id: objectId});
 
   const ownerCapKey = `eluv.caps.iusr${this.utils.AddressToHash(this.signer.address)}`;
-  const ownerCap = await this.ContentObjectMetadata({libraryId, objectId, versionHash, metadataSubtree: ownerCapKey});
+  const ownerCap = await this.ContentObjectMetadata({libraryId, objectId, versionHash, writeToken, metadataSubtree: ownerCapKey});
 
   if(!this.utils.EqualAddress(owner, this.signer.address) && !ownerCap) {
     if(download) {