@eluvio/elv-client-js 4.2.18 → 4.2.19

package/package.json

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

package/src/client/ContentAccess.js

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