@eluvio/elv-client-js 3.2.12 → 3.2.13

package/dist/src/index.js

@@ -2,10 +2,10 @@ var _require = require("./ElvClient.js"),
     ElvClient = _require.ElvClient;
 
 var _require2 = require("./walletClient/index.js"),
-    ElvMarketplaceClient = _require2.ElvMarketplaceClient;
+    ElvWalletClient = _require2.ElvWalletClient;
 
 var Utils = require("./Utils.js");
 
 exports.ElvClient = ElvClient;
-exports.ElvMarketplaceClient = ElvMarketplaceClient;
+exports.ElvWalletClient = ElvWalletClient;
 exports.Utils = Utils;

package/dist/src/walletClient/ClientMethods.js

@@ -514,11 +514,10 @@ exports.TenantConfiguration = /*#__PURE__*/function () {
           case 7:
             _context7.prev = 7;
             _context7.t0 = _context7["catch"](1);
-            this.Log("Failed to load tenant configuration", true);
-            this.Log(_context7.t0, true);
+            this.Log("Failed to load tenant configuration", true, _context7.t0);
             return _context7.abrupt("return", {});
 
-          case 12:
+          case 11:
           case "end":
             return _context7.stop();
         }

package/dist/src/walletClient/index.js

@@ -33,6 +33,7 @@ var Utils = require("../Utils");
 var Ethers = require("ethers");
 
 var inBrowser = typeof window !== "undefined";
+var embedded = inBrowser && window.top !== window.self;
 /**
  * Use the <a href="#.Initialize">Initialize</a> method to initialize a new client.
  *
@@ -75,6 +76,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     key: "Log",
     value: function Log(message) {
       var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      var errorObject = arguments.length > 2 ? arguments[2] : undefined;
 
       if (error) {
         // eslint-disable-next-line no-console
@@ -83,6 +85,11 @@ var ElvWalletClient = /*#__PURE__*/function () {
         // eslint-disable-next-line no-console
         console.log("Eluvio Wallet Client:", message);
       }
+
+      if (errorObject) {
+        // eslint-disable-next-line no-console
+        console.error(errorObject);
+      }
     }
     /**
      * Initialize the wallet client.
@@ -210,7 +217,16 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 url = new URL(this.appUrl);
                 url.hash = UrlJoin("/action", "sign", Utils.B58(JSON.stringify(parameters)));
                 url.searchParams.set("origin", window.location.origin);
-                _context3.next = 27;
+
+                if (!(!embedded && window.location.origin === url.origin)) {
+                  _context3.next = 27;
+                  break;
+                }
+
+                throw Error("ElvWalletClient: Unable to sign");
+
+              case 27:
+                _context3.next = 29;
                 return new Promise( /*#__PURE__*/function () {
                   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
                     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -275,10 +291,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   };
                 }());
 
-              case 27:
+              case 29:
                 return _context3.abrupt("return", _context3.sent);
 
-              case 28:
+              case 30:
               case "end":
                 return _context3.stop();
             }
@@ -558,7 +574,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 this.client.SetStaticToken({
                   token: decodedToken.fabricToken
                 });
-                return _context7.abrupt("return", this.SetAuthorization(decodedToken));
+                return _context7.abrupt("return", this.SetAuthorization(_objectSpread({}, decodedToken)));
 
               case 15:
               case "end":
@@ -670,7 +686,8 @@ var ElvWalletClient = /*#__PURE__*/function () {
                     expiresAt: expiresAt,
                     signerURIs: signerURIs,
                     walletType: "Custodial",
-                    walletName: "Eluvio"
+                    walletName: "Eluvio",
+                    register: true
                   }),
                   signingToken: this.SetAuthorization({
                     clusterToken: this.client.signer.authToken,
@@ -775,7 +792,8 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   address: address,
                   expiresAt: expiresAt,
                   walletType: "External",
-                  walletName: walletName
+                  walletName: walletName,
+                  register: true
                 }));
 
               case 9:
@@ -821,6 +839,8 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "SetAuthorization",
     value: function SetAuthorization(_ref10) {
+      var _this3 = this;
+
       var clusterToken = _ref10.clusterToken,
           fabricToken = _ref10.fabricToken,
           tenantId = _ref10.tenantId,
@@ -829,7 +849,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
           expiresAt = _ref10.expiresAt,
           signerURIs = _ref10.signerURIs,
           walletType = _ref10.walletType,
-          walletName = _ref10.walletName;
+          walletName = _ref10.walletName,
+          _ref10$register = _ref10.register,
+          register = _ref10$register === void 0 ? false : _ref10$register;
       address = this.client.utils.FormatAddress(address);
       this.__authorization = {
         fabricToken: fabricToken,
@@ -859,6 +881,18 @@ var ElvWalletClient = /*#__PURE__*/function () {
         } catch (error) {}
       }
 
+      if (register) {
+        this.client.authClient.MakeAuthServiceRequest({
+          path: "/as/wlt/register",
+          method: "POST",
+          headers: {
+            Authorization: "Bearer ".concat(this.AuthToken())
+          }
+        })["catch"](function (error) {
+          _this3.Log("Failed to register account: ", true, error);
+        });
+      }
+
       return token;
     }
   }, {
@@ -926,7 +960,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     key: "LoadAvailableMarketplaces",
     value: function () {
       var _LoadAvailableMarketplaces = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-        var _this3 = this;
+        var _this4 = this;
 
         var forceReload,
             mainSiteHash,
@@ -983,7 +1017,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                       try {
                         var versionHash = metadata[tenantSlug].marketplaces[marketplaceSlug]["."].source;
 
-                        var objectId = _this3.utils.DecodeVersionHash(versionHash).objectId;
+                        var objectId = _this4.utils.DecodeVersionHash(versionHash).objectId;
 
                         availableMarketplaces[tenantSlug][marketplaceSlug] = _objectSpread(_objectSpread({}, metadata[tenantSlug].marketplaces[marketplaceSlug].info || {}), {}, {
                           tenantName: metadata[tenantSlug].marketplaces[marketplaceSlug].info.tenant_name,
@@ -997,21 +1031,19 @@ var ElvWalletClient = /*#__PURE__*/function () {
                           })
                         });
                         availableMarketplacesById[objectId] = availableMarketplaces[tenantSlug][marketplaceSlug];
-                        _this3.marketplaceHashes[objectId] = versionHash; // Fill out selected marketplace info
+                        _this4.marketplaceHashes[objectId] = versionHash; // Fill out selected marketplace info
 
-                        if (_this3.selectedMarketplaceInfo) {
-                          if (_this3.selectedMarketplaceInfo.tenantSlug === tenantSlug && _this3.selectedMarketplaceInfo.marketplaceSlug === marketplaceSlug || _this3.selectedMarketplaceInfo.marketplaceId === objectId) {
-                            _this3.selectedMarketplaceInfo = availableMarketplaces[tenantSlug][marketplaceSlug];
+                        if (_this4.selectedMarketplaceInfo) {
+                          if (_this4.selectedMarketplaceInfo.tenantSlug === tenantSlug && _this4.selectedMarketplaceInfo.marketplaceSlug === marketplaceSlug || _this4.selectedMarketplaceInfo.marketplaceId === objectId) {
+                            _this4.selectedMarketplaceInfo = availableMarketplaces[tenantSlug][marketplaceSlug];
                           }
                         }
                       } catch (error) {
-                        _this3.Log("Eluvio Wallet Client: Unable to load info for marketplace ".concat(tenantSlug, "/").concat(marketplaceSlug), true);
+                        _this4.Log("Eluvio Wallet Client: Unable to load info for marketplace ".concat(tenantSlug, "/").concat(marketplaceSlug), true);
                       }
                     });
                   } catch (error) {
-                    _this3.Log("Eluvio Wallet Client: Failed to load tenant info ".concat(tenantSlug), true);
-
-                    _this3.Log(error, true);
+                    _this4.Log("Eluvio Wallet Client: Failed to load tenant info ".concat(tenantSlug), true, error);
                   }
                 });
                 this.availableMarketplaces = availableMarketplaces;
@@ -1078,7 +1110,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     key: "LoadMarketplace",
     value: function () {
       var _LoadMarketplace = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(marketplaceParams) {
-        var _this4 = this;
+        var _this5 = this;
 
         var marketplaceInfo, marketplaceId, marketplaceHash, marketplace;
         return _regeneratorRuntime.wrap(function _callee15$(_context15) {
@@ -1133,7 +1165,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                               break;
                             }
 
-                            if (_this4.loggedIn) {
+                            if (_this5.loggedIn) {
                               _context14.next = 5;
                               break;
                             }
@@ -1145,7 +1177,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                           case 5:
                             _context14.prev = 5;
                             _context14.next = 8;
-                            return _this4.client.ContentObjectMetadata({
+                            return _this5.client.ContentObjectMetadata({
                               versionHash: LinkTargetHash(item.nft_template),
                               metadataSubtree: "permissioned"
                             });
@@ -1195,8 +1227,8 @@ var ElvWalletClient = /*#__PURE__*/function () {
                       var embedUrl = new URL("https://embed.v3.contentfabric.io");
                       var targetHash = LinkTargetHash(marketplace.storefront[key]);
                       embedUrl.searchParams.set("p", "");
-                      embedUrl.searchParams.set("net", _this4.network === "main" ? "main" : "demo");
-                      embedUrl.searchParams.set("ath", (_this4.__authorization || {}).authToken || _this4.publicStaticToken);
+                      embedUrl.searchParams.set("net", _this5.network === "main" ? "main" : "demo");
+                      embedUrl.searchParams.set("ath", (_this5.__authorization || {}).authToken || _this5.publicStaticToken);
                       embedUrl.searchParams.set("vid", targetHash);
                       embedUrl.searchParams.set("ap", "");
 
@@ -1402,26 +1434,26 @@ var ElvWalletClient = /*#__PURE__*/function () {
 
                 if (priceRange) {
                   if (priceRange.min) {
-                    filters.push("price:gt:".concat(parseFloat(priceRange.min) - 0.01));
+                    filters.push("price:gte:".concat(parseFloat(priceRange.min)));
                   }
 
                   if (priceRange.max) {
-                    filters.push("price:lt:".concat(parseFloat(priceRange.max) + 0.01));
+                    filters.push("price:lte:".concat(parseFloat(priceRange.max)));
                   }
                 }
 
                 if (tokenIdRange) {
                   if (tokenIdRange.min) {
-                    filters.push("info/ordinal:gt:".concat(parseInt(tokenIdRange.min) - 1));
+                    filters.push("info/token_id:gte:".concat(parseInt(tokenIdRange.min)));
                   }
 
                   if (tokenIdRange.max) {
-                    filters.push("info/ordinal:lt:".concat(parseInt(tokenIdRange.max) + 1));
+                    filters.push("info/token_id:lte:".concat(parseInt(tokenIdRange.max)));
                   }
                 }
 
                 if (capLimit) {
-                  filters.push("info/cap:lt:".concat(parseInt(capLimit) + 1));
+                  filters.push("info/cap:lte:".concat(parseInt(capLimit)));
                 }
 
                 _context16.t0 = mode;
@@ -1643,11 +1675,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
               case 13:
                 _context17.prev = 13;
                 _context17.t0 = _context17["catch"](6);
-                this.Log("Failed to retrieve minting status", true);
-                this.Log(_context17.t0);
+                this.Log("Failed to retrieve minting status", true, _context17.t0);
                 return _context17.abrupt("return", []);
 
-              case 18:
+              case 17:
               case "end":
                 return _context17.stop();
             }

package/package.json

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

package/src/index.js

@@ -1,7 +1,7 @@
 const {ElvClient} = require("./ElvClient.js");
-const {ElvMarketplaceClient} = require("./walletClient/index.js");
+const {ElvWalletClient} = require("./walletClient/index.js");
 const Utils = require("./Utils.js");
 
 exports.ElvClient = ElvClient;
-exports.ElvMarketplaceClient = ElvMarketplaceClient;
+exports.ElvWalletClient = ElvWalletClient;
 exports.Utils = Utils;

package/src/walletClient/ClientMethods.js

@@ -317,8 +317,7 @@ exports.TenantConfiguration = async function({tenantId, contractAddress}) {
       })
     );
   } catch(error) {
-    this.Log("Failed to load tenant configuration", true);
-    this.Log(error, true);
+    this.Log("Failed to load tenant configuration", true, error);
 
     return {};
   }

package/src/walletClient/index.js

@@ -6,6 +6,7 @@ const Utils = require("../Utils");
 const Ethers = require("ethers");
 
 const inBrowser = typeof window !== "undefined";
+const embedded = inBrowser && window.top !== window.self;
 
 /**
  * Use the <a href="#.Initialize">Initialize</a> method to initialize a new client.
@@ -39,7 +40,7 @@ class ElvWalletClient {
     this.utils = client.utils;
   }
 
-  Log(message, error=false) {
+  Log(message, error=false, errorObject) {
     if(error) {
       // eslint-disable-next-line no-console
       console.error("Eluvio Wallet Client:", message);
@@ -47,6 +48,11 @@ class ElvWalletClient {
       // eslint-disable-next-line no-console
       console.log("Eluvio Wallet Client:", message);
     }
+
+    if(errorObject) {
+      // eslint-disable-next-line no-console
+      console.error(errorObject);
+    }
   }
 
   /**
@@ -130,8 +136,7 @@ class ElvWalletClient {
   CanSign() {
     if(!this.loggedIn) { return false; }
 
-    return !!this.__authorization.clusterToken ||
-      (inBrowser && !!(this.UserInfo().walletName.toLowerCase() === "metamask" && window.ethereum && window.ethereum.isMetaMask && window.ethereum.chainId));
+    return !!this.__authorization.clusterToken || (inBrowser && !!(this.UserInfo().walletName.toLowerCase() === "metamask" && window.ethereum && window.ethereum.isMetaMask && window.ethereum.chainId));
   }
 
   /**
@@ -182,6 +187,11 @@ class ElvWalletClient {
     url.hash = UrlJoin("/action", "sign", Utils.B58(JSON.stringify(parameters)));
     url.searchParams.set("origin", window.location.origin);
 
+    if(!embedded && window.location.origin === url.origin) {
+      // Already in wallet app, but still can't sign
+      throw Error("ElvWalletClient: Unable to sign");
+    }
+
     return await new Promise(async (resolve, reject) => {
       await ActionPopup({
         mode: "tab",
@@ -339,7 +349,7 @@ class ElvWalletClient {
 
     this.client.SetStaticToken({token: decodedToken.fabricToken});
 
-    return this.SetAuthorization(decodedToken);
+    return this.SetAuthorization({...decodedToken});
   }
 
   /**
@@ -396,7 +406,8 @@ class ElvWalletClient {
         expiresAt,
         signerURIs,
         walletType: "Custodial",
-        walletName: "Eluvio"
+        walletName: "Eluvio",
+        register: true
       }),
       signingToken: this.SetAuthorization({
         clusterToken: this.client.signer.authToken,
@@ -444,7 +455,7 @@ class ElvWalletClient {
       addEthereumPrefix: false
     });
 
-    return this.SetAuthorization({fabricToken, address, expiresAt, walletType: "External", walletName});
+    return this.SetAuthorization({fabricToken, address, expiresAt, walletType: "External", walletName, register: true});
   }
 
   /**
@@ -468,7 +479,7 @@ class ElvWalletClient {
     return this.__authorization.fabricToken;
   }
 
-  SetAuthorization({clusterToken, fabricToken, tenantId, address, email, expiresAt, signerURIs, walletType, walletName}) {
+  SetAuthorization({clusterToken, fabricToken, tenantId, address, email, expiresAt, signerURIs, walletType, walletName, register=false}) {
     address = this.client.utils.FormatAddress(address);
 
     this.__authorization = {
@@ -502,6 +513,19 @@ class ElvWalletClient {
       } catch(error) {}
     }
 
+    if(register) {
+      this.client.authClient.MakeAuthServiceRequest({
+        path: "/as/wlt/register",
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${this.AuthToken()}`
+        }
+      })
+        .catch(error => {
+          this.Log("Failed to register account: ", true, error);
+        });
+    }
+
     return token;
   }
 
@@ -524,7 +548,6 @@ class ElvWalletClient {
   }
 
 
-
   // Internal loading methods
 
 
@@ -597,8 +620,7 @@ class ElvWalletClient {
           }
         });
       } catch(error) {
-        this.Log(`Eluvio Wallet Client: Failed to load tenant info ${tenantSlug}`, true);
-        this.Log(error, true);
+        this.Log(`Eluvio Wallet Client: Failed to load tenant info ${tenantSlug}`, true, error);
       }
     });
 
@@ -831,26 +853,26 @@ class ElvWalletClient {
 
       if(priceRange) {
         if(priceRange.min) {
-          filters.push(`price:gt:${parseFloat(priceRange.min) - 0.01}`);
+          filters.push(`price:ge:${parseFloat(priceRange.min)}`);
         }
 
         if(priceRange.max) {
-          filters.push(`price:lt:${parseFloat(priceRange.max) + 0.01}`);
+          filters.push(`price:le:${parseFloat(priceRange.max)}`);
         }
       }
 
       if(tokenIdRange) {
         if(tokenIdRange.min) {
-          filters.push(`info/ordinal:gt:${parseInt(tokenIdRange.min) - 1}`);
+          filters.push(`info/token_id:ge:${parseInt(tokenIdRange.min)}`);
         }
 
         if(tokenIdRange.max) {
-          filters.push(`info/ordinal:lt:${parseInt(tokenIdRange.max) + 1}`);
+          filters.push(`info/token_id:le:${parseInt(tokenIdRange.max)}`);
         }
       }
 
       if(capLimit) {
-        filters.push(`info/cap:lt:${parseInt(capLimit) + 1}`);
+        filters.push(`info/cap:le:${parseInt(capLimit)}`);
       }
 
 
@@ -996,8 +1018,7 @@ class ElvWalletClient {
         })
         .sort((a, b) => a.ts < b.ts ? 1 : -1);
     } catch(error) {
-      this.Log("Failed to retrieve minting status", true);
-      this.Log(error);
+      this.Log("Failed to retrieve minting status", true, error);
 
       return [];
     }

package/testScripts/TestMarketplaceClient.js

@@ -1,25 +0,0 @@
-const { ElvMarketplaceClient } = require("../src/walletClient/ElvMarketplaceClient");
-const ClientConfiguration = require("../TestConfiguration.json");
-
-const Test = async () => {
-  try {
-    const idToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Inlwd1ZUbXJkWENkYU5tcjAzVGRDaCJ9.eyJodHRwczovL2F1dGguY29udGVudGZhYnJpYy5pby9nZW8iOnsiY291bnRyeV9jb2RlIjoiVVMiLCJjb3VudHJ5X2NvZGUzIjoiVVNBIiwiY291bnRyeV9uYW1lIjoiVW5pdGVkIFN0YXRlcyIsImNpdHlfbmFtZSI6IlJhbmNobyBDb3Jkb3ZhIiwibGF0aXR1ZGUiOjM4LjYxMDYsImxvbmdpdHVkZSI6LTEyMS4yNzg5LCJ0aW1lX3pvbmUiOiJBbWVyaWNhL0xvc19BbmdlbGVzIiwiY29udGluZW50X2NvZGUiOiJOQSIsInN1YmRpdmlzaW9uX2NvZGUiOiJDQSIsInN1YmRpdmlzaW9uX25hbWUiOiJDYWxpZm9ybmlhIn0sIm5pY2tuYW1lIjoia2V2aW4rNyIsIm5hbWUiOiJrZXZpbis3QGVsdXYuaW8iLCJwaWN0dXJlIjoiaHR0cHM6Ly9zLmdyYXZhdGFyLmNvbS9hdmF0YXIvZmQ0MzE3ZjhmN2YzMGM1NWRlMDZhMjljYTFjYjY5ZjE_cz00ODAmcj1wZyZkPWh0dHBzJTNBJTJGJTJGY2RuLmF1dGgwLmNvbSUyRmF2YXRhcnMlMkZrZS5wbmciLCJ1cGRhdGVkX2F0IjoiMjAyMi0wNi0xN1QxOTo1Nzo0NC4yODZaIiwiZW1haWwiOiJrZXZpbis3QGVsdXYuaW8iLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImlzcyI6Imh0dHBzOi8vYXV0aC5jb250ZW50ZmFicmljLmlvLyIsInN1YiI6ImF1dGgwfDYxNjY3NzE3ODk5YjkyMDA3MGYzNGFjNCIsImF1ZCI6Ik9OeXViUDlyRkk1Qkh6bVlnbFFLQloxYkJiaXlvQjNTIiwiaWF0IjoxNjU1NDk1ODY1LCJleHAiOjE2NTU1MzE4NjUsIm5vbmNlIjoiY0c4MlFrTkplV2wwU1U1RVVrOUpaR1kwTW1oRlZXaFpOSE5LVGxZNU5VWjJjRmwwWkhwVmIxQjJNQT09In0.dPBk0hGjHAW5Dz8yfhW0IEG-ArJ258Q7x3dYMz0tIIj9EUY438issp0rJwfoAVWu4hw6SBUGNS2bnAZ9bvhag8IMZm_YYRfKTnY7gV7ST_-ni72mQ04F2Kpc9H2jzNKwRWqdKdXy3Rp0YoIR1PYOTwk2BWJtiqoyA11og-QNiI4pBEhZ6JRyDO7693jPoGXdUPJpXPHsfEJqLbGM8BYcv5X-PwVnU8TzSqgFpB5G4pZSfnoyz26wbmpFs5jc2_QgWAIvc94pW-cwpMbfpHb10LejrBFbO9FW3Sv6eOPY9W-AuxAj1UT-ZDJytNRD72R0aFKlv8r0fvOiTDWGXE4P5g";
-
-    const marketplaceClient = await ElvMarketplaceClient.Initialize({
-      configUrl: ClientConfiguration["config-url"]
-    });
-
-    const token = await marketplaceClient.AuthenticateOAuth({
-      idToken
-    });
-
-    console.log(token);
-  } catch(error) {
-    console.error(error);
-    console.error(JSON.stringify(error, null, 2));
-  }
-
-  process.exit(0);
-};
-
-Test();