@eluvio/elv-client-js 4.0.137 → 4.0.139

package/package.json

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

package/src/AuthorizationClient.js

@@ -122,6 +122,7 @@ class AuthorizationClient {
     const isWalletRequest =
       objectId &&
       this.client.signer &&
+      !this.client.signer.anonymous &&
       this.client.utils.EqualAddress(
         await this.client.userProfileClient.WalletAddress(false),
         this.client.utils.HashToAddress(objectId)
@@ -958,7 +959,7 @@ class AuthorizationClient {
 
         const kmsUrl = KMSUrls[i];
         if(!this.providers[kmsUrl]) {
-          this.providers[kmsUrl] = new Ethers.providers.JsonRpcProvider(kmsUrl, this.client.networkId);
+          this.providers[kmsUrl] = new Ethers.providers.StaticJsonRpcProvider(kmsUrl, this.client.networkId);
         }
 
         return await this.providers[kmsUrl].send(methodName, params);

package/src/ElvClient.js

@@ -434,6 +434,7 @@ class ElvClient {
     if(!this.signer) {
       const wallet = this.GenerateWallet();
       const signer = wallet.AddAccountFromMnemonic({mnemonic: wallet.GenerateMnemonic()});
+      signer.anonymous = true;
 
       this.SetSigner({signer, reset: false});
       this.SetStaticToken({token: staticToken});
@@ -739,6 +740,7 @@ class ElvClient {
     );
 
     if(!nodeUrl) {
+      // eslint-disable-next-line no-console
       console.error(`No node url found for write token: ${writeToken}`);
 
       return "";

package/src/EthClient.js

@@ -50,7 +50,7 @@ class EthClient {
 
   Provider() {
     if(!this.provider) {
-      this.provider = new Ethers.providers.JsonRpcProvider(this.ethereumURIs[this.ethereumURIIndex], this.networkId);
+      this.provider = new Ethers.providers.StaticJsonRpcProvider(this.ethereumURIs[this.ethereumURIIndex], this.networkId);
 
       // Ethers.js uses eth_getCode to ensure a contract is deployed and nothing else - this pulls a large chunk of pointless
       // data every time a contract is initialized in the client (often). Ethers.js just checks that the code isn't == "0x", so

package/src/client/ABRPublishing.js

@@ -832,7 +832,7 @@ exports.FinalizeABRMezzanine = async function({libraryId, objectId, preFinalizeF
   }
 
   const finalizeResponse = {};
-  if (!writeToken) {
+  if(!writeToken) {
     finalizeResponse = await this.FinalizeContentObject({
       libraryId,
       objectId: objectId,

package/src/client/ContentAccess.js

@@ -584,17 +584,21 @@ exports.ContentObjects = async function({libraryId, filterOptions={}}) {
  *
  * @returns {Promise<Object>} - Description of content object
  */
-exports.ContentObject = async function({libraryId, objectId, versionHash, writeToken}) {
-  ValidateParameters({libraryId, objectId, versionHash});
+exports.ContentObject = async function({objectId, versionHash, writeToken}) {
+  this.Log(`Retrieving content object: ${writeToken || versionHash || objectId}`);
 
-  this.Log(`Retrieving content object: ${libraryId || ""} ${writeToken || versionHash || objectId}`);
+  if(writeToken) {
+    objectId = this.utils.DecodeWriteToken(writeToken).objectId;
+  } else if(versionHash) {
+    objectId = this.utils.DecodeVersionHash(versionHash).objectId;
+  }
 
-  if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
+  ValidateObject(objectId);
 
   let path = UrlJoin("q", writeToken || versionHash || objectId);
 
   return await this.HttpClient.RequestJsonBody({
-    headers: await this.authClient.AuthorizationHeader({libraryId, objectId, versionHash}),
+    headers: await this.authClient.AuthorizationHeader({objectId, versionHash}),
     method: "GET",
     path: path
   });
@@ -664,6 +668,24 @@ exports.ContentObjectTenantId = async function({objectId, versionHash}) {
  * @returns {Promise<string>} - Library ID of the object
  */
 exports.ContentObjectLibraryId = async function({objectId, versionHash}) {
+  if(versionHash) {
+    objectId = this.utils.DecodeVersionHash(versionHash).objectId;
+  }
+
+  // Cache results because they will never change
+  if(!this.objectLibraryIds[objectId]) {
+    try {
+      this.objectLibraryIds[objectId] = (await this.ContentObject({objectId, versionHash})).qlib_id;
+    } catch(error) {
+      error.message = `Unable to determine latest library for ${versionHash || objectId}`;
+      throw error;
+    }
+  }
+
+  return this.objectLibraryIds[objectId];
+};
+
+exports.ContentObjectLibraryId2 = async function({objectId, versionHash}) {
   versionHash ? ValidateVersion(versionHash) : ValidateObject(objectId);
 
   if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
@@ -1065,57 +1087,8 @@ exports.ContentObjectVersions = async function({libraryId, objectId}) {
   });
 };
 
-/**
- * Retrieve the version hash of the latest version of the specified object from chain
- *
- * @methodGroup Content Objects
- * @namedParams
- * @param {string=} objectId - ID of the object
- * @param {string=} versionHash - Version hash of the object
- *
- * @returns {Promise<string>} - The latest version hash of the object
- */
-exports.LatestVersionHash = async function({objectId, versionHash}) {
-  if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
-
-  ValidateObject(objectId);
-
-  let latestHash;
-  try {
-    latestHash = await this.CallContractMethod({
-      contractAddress: this.utils.HashToAddress(objectId),
-      methodName: "objectHash"
-    });
-  // eslint-disable-next-line no-empty
-  } catch(error) {}
-
-  if(!latestHash) {
-    let versionCount;
-    try {
-      versionCount = await this.CallContractMethod({
-        contractAddress: this.utils.HashToAddress(objectId),
-        methodName: "countVersionHashes"
-      });
-    // eslint-disable-next-line no-empty
-    } catch(error) {}
-
-    if(!versionCount || !versionCount.toNumber()) {
-      throw Error(`Unable to determine latest version hash for ${versionHash || objectId} - Item deleted?`);
-    }
-
-    latestHash = await this.CallContractMethod({
-      contractAddress: this.utils.HashToAddress(objectId),
-      methodName: "versionHashes",
-      methodArgs: [versionCount - 1]
-    });
-  }
-
-  return latestHash;
-};
-
 /**
  * Retrieve the version hash of the latest version of the specified object via fabric API.
- * Requires authorization.
  *
  * @methodGroup Content Objects
  * @namedParams
@@ -1124,27 +1097,13 @@ exports.LatestVersionHash = async function({objectId, versionHash}) {
  *
  * @returns {Promise<string>} - The latest version hash of the object
  */
-exports.LatestVersionHashV2 = async function({objectId, versionHash}) {
-  if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
-
-  ValidateObject(objectId);
-
-  let latestHash;
+exports.LatestVersionHash = async function({objectId, versionHash}) {
   try {
-    let path = UrlJoin("q", objectId);
-
-    let q = await this.HttpClient.RequestJsonBody({
-      headers: await this.authClient.AuthorizationHeader({objectId}),
-      method: "GET",
-      path: path
-    });
-    latestHash = q.hash;
-
+    return (await this.ContentObject({objectId, versionHash})).hash;
   } catch(error) {
     error.message = `Unable to determine latest version hash for ${versionHash || objectId}`;
     throw error;
   }
-  return latestHash;
 };
 
 /* URL Methods */
@@ -1946,7 +1905,7 @@ exports.MakeFileServiceRequest = async function({
   ]
     .flat()
     .filter(token => token);
-  
+
   return this.utils.ResponseToFormat(
     format,
     await this.FileServiceHttpClient.Request({

package/src/walletClient/index.js

@@ -186,19 +186,22 @@ class ElvWalletClient {
     }
 
     try {
-      walletClient.topLevelInfoPromise = client.utils.ResponseToJson(
-        client.MakeAuthServiceRequest({
-          path: "/as/mw/toplevel",
-          queryParams: {env: mode}
-        })
-      )
-        .then(info => {
-          walletClient.topLevelInfo = info;
+      walletClient.topLevelInfoPromise = new Promise(resolve =>
+        client.utils.ResponseToJson(
+          client.MakeAuthServiceRequest({
+            path: "/as/mw/toplevel",
+            queryParams: {env: mode}
+          })
+        )
+          .then(info => {
+            walletClient.topLevelInfo = info;
+            resolve();
 
-          if(!skipMarketplaceLoad) {
-            walletClient.LoadAvailableMarketplaces();
-          }
-        });
+            if(!skipMarketplaceLoad) {
+              walletClient.LoadAvailableMarketplaces();
+            }
+          })
+      );
     } catch(error) {
       // eslint-disable-next-line no-console
       console.error("Unable to load top level info:");