@eluvio/elv-client-js 4.0.136 → 4.0.138

package/dist/src/walletClient/index.js

@@ -7,8 +7,8 @@ var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
 var _excluded = ["code", "address", "type", "authToken", "expiresAt"];
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var _require = require("../ElvClient"),
   ElvClient = _require.ElvClient;
 var Configuration = require("./Configuration");
@@ -79,7 +79,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     this.utils = client.utils;
     this.ForbiddenMethods = ElvWalletClient.ForbiddenMethods;
   }
-  return _createClass(ElvWalletClient, [{
+  _createClass(ElvWalletClient, [{
     key: "Log",
     value: function Log(message) {
       var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -136,7 +136,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "PersonalSign",
-    value: (function () {
+    value: function () {
       var _PersonalSign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
         var message, parameters, url;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -265,7 +265,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _PersonalSign.apply(this, arguments);
       }
       return PersonalSign;
-    }())
+    }()
   }, {
     key: "LogInURL",
     value: function () {
@@ -344,7 +344,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "LogIn",
-    value: (function () {
+    value: function () {
       var _LogIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref5) {
         var _this = this;
         var _ref5$method, method, provider, _ref5$mode, mode, callbackUrl, marketplaceParams, _ref5$clearLogin, clearLogin, callback, loginUrl;
@@ -463,10 +463,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @methodGroup Login
      */
-    )
   }, {
     key: "LogOut",
-    value: (function () {
+    value: function () {
       var _LogOut = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
         return _regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
@@ -509,7 +508,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _LogOut.apply(this, arguments);
       }
       return LogOut;
-    }())
+    }()
   }, {
     key: "TokenStatus",
     value: function () {
@@ -549,7 +548,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Authenticate",
-    value: (function () {
+    value: function () {
       var _Authenticate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref7) {
         var token, decodedToken;
         return _regeneratorRuntime.wrap(function _callee10$(_context10) {
@@ -606,7 +605,6 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * @param {string=} email - Email address of the user. If not specified, this method will attempt to extract the email from the ID token.
      * @param {Array<string>=} signerURIs - (Only if using custom OAuth) - URIs corresponding to the key server(s) to use
      * @param {boolean=} shareEmail=false - Whether or not the user consents to sharing their email
-     * @param {number=} tokenDuration=24 - Token expiration duration, in hours
      *
      * @returns {Promise<Object>} - Returns an authorization tokens that can be used to initialize the client using <a href="#Authenticate">Authenticate</a>.
      * Save this token to avoid having to reauthenticate with OAuth. This token expires after 24 hours.
@@ -616,26 +614,26 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * - signingToken - Identical to `authToken`, but also includes the ability to perform arbitrary signatures with the custodial wallet. This token should be protected and should not be
      * shared with third parties.
      */
-    )
   }, {
     key: "AuthenticateOAuth",
-    value: (function () {
+    value: function () {
       var _AuthenticateOAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref8) {
-        var idToken, tenantId, email, signerURIs, _ref8$shareEmail, shareEmail, _ref8$extraData, extraData, nonce, _ref8$createRemoteTok, createRemoteToken, _ref8$force, force, _ref8$tokenDuration, tokenDuration, fabricToken, expiresAt, tokenResponse, address, decodedToken;
+        var idToken, tenantId, email, signerURIs, _ref8$shareEmail, shareEmail, _ref8$extraData, extraData, nonce, _ref8$createRemoteTok, createRemoteToken, _ref8$force, force, tokenDuration, fabricToken, expiresAt, tokenResponse, address, decodedToken;
         return _regeneratorRuntime.wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              idToken = _ref8.idToken, tenantId = _ref8.tenantId, email = _ref8.email, signerURIs = _ref8.signerURIs, _ref8$shareEmail = _ref8.shareEmail, shareEmail = _ref8$shareEmail === void 0 ? false : _ref8$shareEmail, _ref8$extraData = _ref8.extraData, extraData = _ref8$extraData === void 0 ? {} : _ref8$extraData, nonce = _ref8.nonce, _ref8$createRemoteTok = _ref8.createRemoteToken, createRemoteToken = _ref8$createRemoteTok === void 0 ? true : _ref8$createRemoteTok, _ref8$force = _ref8.force, force = _ref8$force === void 0 ? false : _ref8$force, _ref8$tokenDuration = _ref8.tokenDuration, tokenDuration = _ref8$tokenDuration === void 0 ? 24 : _ref8$tokenDuration;
+              idToken = _ref8.idToken, tenantId = _ref8.tenantId, email = _ref8.email, signerURIs = _ref8.signerURIs, _ref8$shareEmail = _ref8.shareEmail, shareEmail = _ref8$shareEmail === void 0 ? false : _ref8$shareEmail, _ref8$extraData = _ref8.extraData, extraData = _ref8$extraData === void 0 ? {} : _ref8$extraData, nonce = _ref8.nonce, _ref8$createRemoteTok = _ref8.createRemoteToken, createRemoteToken = _ref8$createRemoteTok === void 0 ? true : _ref8$createRemoteTok, _ref8$force = _ref8.force, force = _ref8$force === void 0 ? false : _ref8$force;
+              tokenDuration = 24;
               if (!(!tenantId && this.selectedMarketplaceInfo)) {
-                _context11.next = 5;
+                _context11.next = 6;
                 break;
               }
-              _context11.next = 4;
+              _context11.next = 5;
               return this.AvailableMarketplaces();
-            case 4:
-              tenantId = this.selectedMarketplaceInfo.tenantId;
             case 5:
-              _context11.next = 7;
+              tenantId = this.selectedMarketplaceInfo.tenantId;
+            case 6:
+              _context11.next = 8;
               return this.client.SetRemoteSigner({
                 idToken: idToken,
                 tenantId: tenantId,
@@ -645,55 +643,54 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 }),
                 unsignedPublicAuth: true
               });
-            case 7:
+            case 8:
               if (!(createRemoteToken && this.client.signer.remoteSigner)) {
-                _context11.next = 16;
+                _context11.next = 17;
                 break;
               }
-              expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
-              _context11.next = 11;
+              expiresAt = Date.now() + 24 * 60 * 60 * 1000;
+              _context11.next = 12;
               return this.client.signer.RetrieveCSAT({
                 email: email,
                 nonce: nonce,
                 tenantId: tenantId,
-                force: force,
-                duration: tokenDuration
+                force: force
               });
-            case 11:
+            case 12:
               tokenResponse = _context11.sent;
               fabricToken = tokenResponse.token;
               nonce = tokenResponse.nonce;
-              _context11.next = 20;
+              _context11.next = 21;
               break;
-            case 16:
+            case 17:
               expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
-              _context11.next = 19;
+              _context11.next = 20;
               return this.client.CreateFabricToken({
-                duration: parseInt(tokenDuration * 60 * 60 * 1000),
+                duration: tokenDuration * 60 * 60 * 1000,
                 context: email ? {
                   usr: {
                     email: email
                   }
                 } : {}
               });
-            case 19:
-              fabricToken = _context11.sent;
             case 20:
+              fabricToken = _context11.sent;
+            case 21:
               address = this.client.utils.FormatAddress(this.client.CurrentAccountAddress());
               if (email) {
-                _context11.next = 30;
+                _context11.next = 31;
                 break;
               }
-              _context11.prev = 22;
+              _context11.prev = 23;
               decodedToken = JSON.parse(this.utils.FromB64URL(idToken.split(".")[1]));
               email = decodedToken.email;
-              _context11.next = 30;
+              _context11.next = 31;
               break;
-            case 27:
-              _context11.prev = 27;
-              _context11.t0 = _context11["catch"](22);
+            case 28:
+              _context11.prev = 28;
+              _context11.t0 = _context11["catch"](23);
               throw Error("Failed to decode ID token");
-            case 30:
+            case 31:
               this.client.SetStaticToken({
                 token: fabricToken
               });
@@ -723,11 +720,11 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   nonce: nonce
                 })
               });
-            case 32:
+            case 33:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[22, 27]]);
+        }, _callee11, this, [[23, 28]]);
       }));
       function AuthenticateOAuth(_x13) {
         return _AuthenticateOAuth.apply(this, arguments);
@@ -747,10 +744,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * @returns {Promise<string>} - Returns an authorization token that can be used to initialize the client using <a href="#Authenticate">Authenticate</a>.
      * Save this token to avoid having to reauthenticate. This token expires after 24 hours.
      */
-    )
   }, {
     key: "AuthenticateExternalWallet",
-    value: (function () {
+    value: function () {
       var _AuthenticateExternalWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref9) {
         var _this2 = this;
         var address, _ref9$tokenDuration, tokenDuration, _ref9$walletName, walletName, Sign, expiresAt, fabricToken;
@@ -819,7 +815,6 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @returns {string} - The client auth token
      */
-    )
   }, {
     key: "ClientAuthToken",
     value: function ClientAuthToken() {
@@ -1883,7 +1878,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Initialize",
-    value: (function () {
+    value: function () {
       var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref24) {
         var client, _ref24$appId, appId, _ref24$network, network, _ref24$mode, mode, localization, marketplaceParams, previewMarketplaceId, _ref24$storeAuthToken, storeAuthToken, _ref24$skipMarketplac, skipMarketplaceLoad, _ref25, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken;
         return _regeneratorRuntime.wrap(function _callee25$(_context25) {
@@ -1983,46 +1978,36 @@ var ElvWalletClient = /*#__PURE__*/function () {
               _context25.prev = 35;
               _context25.t0 = _context25["catch"](28);
             case 37:
-              _context25.prev = 37;
-              _context25.next = 40;
+              _context25.next = 39;
               return client.utils.ResponseToJson(client.MakeAuthServiceRequest({
                 path: "/as/mw/toplevel",
                 queryParams: {
                   env: mode
                 }
               }));
-            case 40:
+            case 39:
               walletClient.topLevelInfo = _context25.sent;
-              _context25.next = 47;
-              break;
-            case 43:
-              _context25.prev = 43;
-              _context25.t1 = _context25["catch"](37);
-              // eslint-disable-next-line no-console
-              console.error("Unable to load top level info:");
-              // eslint-disable-next-line no-console
-              console.error(_context25.t1);
-            case 47:
               if (skipMarketplaceLoad) {
-                _context25.next = 50;
+                _context25.next = 43;
                 break;
               }
-              _context25.next = 50;
+              _context25.next = 43;
               return walletClient.LoadAvailableMarketplaces();
-            case 50:
+            case 43:
               return _context25.abrupt("return", walletClient);
-            case 51:
+            case 44:
             case "end":
               return _context25.stop();
           }
-        }, _callee25, null, [[28, 35], [37, 43]]);
+        }, _callee25, null, [[28, 35]]);
       }));
       function Initialize(_x25) {
         return _Initialize.apply(this, arguments);
       }
       return Initialize;
-    }())
+    }()
   }]);
+  return ElvWalletClient;
 }();
 Object.assign(ElvWalletClient.prototype, require("./ClientMethods"));
 Object.assign(ElvWalletClient.prototype, require("./Profile"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.136",
+  "version": "4.0.138",
   "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,12 +186,19 @@ class ElvWalletClient {
     }
 
     try {
-      walletClient.topLevelInfo = await client.utils.ResponseToJson(
+      walletClient.topLevelInfoPromise = client.utils.ResponseToJson(
         client.MakeAuthServiceRequest({
           path: "/as/mw/toplevel",
           queryParams: {env: mode}
         })
-      );
+      )
+        .then(info => {
+          walletClient.topLevelInfo = info;
+
+          if(!skipMarketplaceLoad) {
+            walletClient.LoadAvailableMarketplaces();
+          }
+        });
     } catch(error) {
       // eslint-disable-next-line no-console
       console.error("Unable to load top level info:");
@@ -199,10 +206,6 @@ class ElvWalletClient {
       console.error(error);
     }
 
-    if(!skipMarketplaceLoad) {
-      await walletClient.LoadAvailableMarketplaces();
-    }
-
     return walletClient;
   }
 
@@ -823,6 +826,7 @@ class ElvWalletClient {
   }
 
   async LoadMarketplace(marketplaceParams) {
+    await this.topLevelInfoPromise;
     const marketplaceInfo = this.MarketplaceInfo({marketplaceParams});
 
     const marketplaceId = marketplaceInfo.marketplaceId;