@eluvio/elv-client-js 3.2.11 → 3.2.14

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", "");
 
@@ -1241,15 +1273,17 @@ var ElvWalletClient = /*#__PURE__*/function () {
             _ref14$sortDesc,
             sortDesc,
             filter,
-            editionFilter,
+            editionFilters,
             attributeFilters,
             contractAddress,
             tokenId,
             currency,
             marketplaceParams,
             tenantId,
-            _ref14$collectionInde,
-            collectionIndex,
+            collectionIndexes,
+            priceRange,
+            tokenIdRange,
+            capLimit,
             sellerAddress,
             _ref14$lastNDays,
             lastNDays,
@@ -1261,7 +1295,6 @@ var ElvWalletClient = /*#__PURE__*/function () {
             marketplaceInfo,
             marketplace,
             filters,
-            collection,
             path,
             _ref16,
             contents,
@@ -1272,8 +1305,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
           while (1) {
             switch (_context16.prev = _context16.next) {
               case 0:
-                _ref14 = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {}, _ref14$mode = _ref14.mode, mode = _ref14$mode === void 0 ? "listings" : _ref14$mode, _ref14$sortBy = _ref14.sortBy, sortBy = _ref14$sortBy === void 0 ? "created" : _ref14$sortBy, _ref14$sortDesc = _ref14.sortDesc, sortDesc = _ref14$sortDesc === void 0 ? false : _ref14$sortDesc, filter = _ref14.filter, editionFilter = _ref14.editionFilter, attributeFilters = _ref14.attributeFilters, contractAddress = _ref14.contractAddress, tokenId = _ref14.tokenId, currency = _ref14.currency, marketplaceParams = _ref14.marketplaceParams, tenantId = _ref14.tenantId, _ref14$collectionInde = _ref14.collectionIndex, collectionIndex = _ref14$collectionInde === void 0 ? -1 : _ref14$collectionInde, sellerAddress = _ref14.sellerAddress, _ref14$lastNDays = _ref14.lastNDays, lastNDays = _ref14$lastNDays === void 0 ? -1 : _ref14$lastNDays, _ref14$start = _ref14.start, start = _ref14$start === void 0 ? 0 : _ref14$start, _ref14$limit = _ref14.limit, limit = _ref14$limit === void 0 ? 50 : _ref14$limit;
-                collectionIndex = parseInt(collectionIndex);
+                _ref14 = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {}, _ref14$mode = _ref14.mode, mode = _ref14$mode === void 0 ? "listings" : _ref14$mode, _ref14$sortBy = _ref14.sortBy, sortBy = _ref14$sortBy === void 0 ? "created" : _ref14$sortBy, _ref14$sortDesc = _ref14.sortDesc, sortDesc = _ref14$sortDesc === void 0 ? false : _ref14$sortDesc, filter = _ref14.filter, editionFilters = _ref14.editionFilters, attributeFilters = _ref14.attributeFilters, contractAddress = _ref14.contractAddress, tokenId = _ref14.tokenId, currency = _ref14.currency, marketplaceParams = _ref14.marketplaceParams, tenantId = _ref14.tenantId, collectionIndexes = _ref14.collectionIndexes, priceRange = _ref14.priceRange, tokenIdRange = _ref14.tokenIdRange, capLimit = _ref14.capLimit, sellerAddress = _ref14.sellerAddress, _ref14$lastNDays = _ref14.lastNDays, lastNDays = _ref14$lastNDays === void 0 ? -1 : _ref14$lastNDays, _ref14$start = _ref14.start, start = _ref14$start === void 0 ? 0 : _ref14$start, _ref14$limit = _ref14.limit, limit = _ref14$limit === void 0 ? 50 : _ref14$limit;
+                collectionIndexes = (collectionIndexes || []).map(function (i) {
+                  return parseInt(i);
+                });
                 params = {
                   sort_by: sortBy,
                   sort_descending: sortDesc,
@@ -1294,7 +1329,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
               case 6:
                 marketplaceInfo = _context16.sent;
 
-                if (!(collectionIndex >= 0)) {
+                if (!(collectionIndexes.length > 0)) {
                   _context16.next = 11;
                   break;
                 }
@@ -1315,65 +1350,33 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   filters.push("seller:eq:".concat(this.client.utils.FormatAddress(sellerAddress)));
                 }
 
-                if (!(marketplace && collectionIndex >= 0)) {
-                  _context16.next = 25;
-                  break;
-                }
-
-                collection = marketplace.collections[collectionIndex];
-                collection.items.forEach(function (sku) {
-                  if (!sku) {
-                    return;
-                  }
-
-                  var item = marketplace.items.find(function (item) {
-                    return item.sku === sku;
-                  });
-
-                  if (!item) {
-                    return;
-                  }
-
-                  var address = Utils.SafeTraverse(item, "nft_template", "nft", "address");
-
-                  if (address) {
-                    filters.push("".concat(mode === "owned" ? "contract_addr" : "contract", ":eq:").concat(Utils.FormatAddress(address)));
-                  }
-                }); // No valid items, so there must not be anything relevant in the collection
-
-                if (!(filters.length === 0)) {
-                  _context16.next = 23;
-                  break;
-                }
-
-                if (!mode.includes("stats")) {
-                  _context16.next = 22;
-                  break;
-                }
+                if (marketplace && collectionIndexes.length >= 0) {
+                  collectionIndexes.forEach(function (collectionIndex) {
+                    var collection = marketplace.collections[collectionIndex];
+                    collection.items.forEach(function (sku) {
+                      if (!sku) {
+                        return;
+                      }
 
-                return _context16.abrupt("return", {});
+                      var item = marketplace.items.find(function (item) {
+                        return item.sku === sku;
+                      });
 
-              case 22:
-                return _context16.abrupt("return", {
-                  paging: {
-                    start: params.start,
-                    limit: params.limit,
-                    total: 0,
-                    more: false
-                  },
-                  results: []
-                });
+                      if (!item) {
+                        return;
+                      }
 
-              case 23:
-                _context16.next = 26;
-                break;
+                      var address = Utils.SafeTraverse(item, "nft_template", "nft", "address");
 
-              case 25:
-                if (mode !== "owned" && marketplaceInfo || tenantId) {
+                      if (address) {
+                        filters.push("".concat(mode === "owned" ? "contract_addr" : "contract", ":eq:").concat(Utils.FormatAddress(address)));
+                      }
+                    });
+                  });
+                } else if (mode !== "owned" && marketplaceInfo || tenantId) {
                   filters.push("tenant:eq:".concat(marketplaceInfo ? marketplaceInfo.tenantId : tenantId));
                 }
 
-              case 26:
                 if (contractAddress) {
                   if (mode === "owned") {
                     filters.push("contract_addr:eq:".concat(Utils.FormatAddress(contractAddress)));
@@ -1395,15 +1398,17 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   }
                 }
 
-                if (editionFilter) {
-                  if (mode.includes("listing")) {
-                    filters.push("nft/edition_name:eq:".concat(editionFilter));
-                  } else if (mode === "owned") {
-                    filters.push("meta:@>:{\"edition_name\":\"".concat(editionFilter, "\"}"));
-                    params.exact = false;
-                  } else {
-                    filters.push("edition:eq:".concat(editionFilter));
-                  }
+                if (editionFilters) {
+                  editionFilters.forEach(function (editionFilter) {
+                    if (mode.includes("listing")) {
+                      filters.push("nft/edition_name:eq:".concat(editionFilter));
+                    } else if (mode === "owned") {
+                      filters.push("meta:@>:{\"edition_name\":\"".concat(editionFilter, "\"}"));
+                      params.exact = false;
+                    } else {
+                      filters.push("edition:eq:".concat(editionFilter));
+                    }
+                  });
                 }
 
                 if (attributeFilters) {
@@ -1427,65 +1432,89 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   filters.push("created:gt:".concat((Date.now() / 1000 - lastNDays * 24 * 60 * 60).toFixed(0)));
                 }
 
+                if (priceRange) {
+                  if (priceRange.min) {
+                    filters.push("price:ge:".concat(parseFloat(priceRange.min)));
+                  }
+
+                  if (priceRange.max) {
+                    filters.push("price:le:".concat(parseFloat(priceRange.max)));
+                  }
+                }
+
+                if (tokenIdRange) {
+                  if (tokenIdRange.min) {
+                    filters.push("info/token_id:ge:".concat(parseInt(tokenIdRange.min)));
+                  }
+
+                  if (tokenIdRange.max) {
+                    filters.push("info/token_id:le:".concat(parseInt(tokenIdRange.max)));
+                  }
+                }
+
+                if (capLimit) {
+                  filters.push("info/cap:le:".concat(parseInt(capLimit)));
+                }
+
                 _context16.t0 = mode;
-                _context16.next = _context16.t0 === "owned" ? 34 : _context16.t0 === "listings" ? 37 : _context16.t0 === "transfers" ? 39 : _context16.t0 === "sales" ? 43 : _context16.t0 === "listing-stats" ? 46 : _context16.t0 === "sales-stats" ? 48 : 50;
+                _context16.next = _context16.t0 === "owned" ? 26 : _context16.t0 === "listings" ? 29 : _context16.t0 === "transfers" ? 31 : _context16.t0 === "sales" ? 35 : _context16.t0 === "listing-stats" ? 38 : _context16.t0 === "sales-stats" ? 40 : 42;
                 break;
 
-              case 34:
+              case 26:
                 path = UrlJoin("as", "wlt", "nfts");
 
                 if (marketplaceInfo) {
                   path = UrlJoin("as", "wlt", "nfts", marketplaceInfo.tenantId);
                 }
 
-                return _context16.abrupt("break", 50);
+                return _context16.abrupt("break", 42);
 
-              case 37:
+              case 29:
                 path = UrlJoin("as", "mkt", "f");
-                return _context16.abrupt("break", 50);
+                return _context16.abrupt("break", 42);
 
-              case 39:
+              case 31:
                 path = UrlJoin("as", "mkt", "hst", "f");
                 filters.push("action:eq:TRANSFERRED");
                 filters.push("action:eq:SOLD");
-                return _context16.abrupt("break", 50);
+                return _context16.abrupt("break", 42);
 
-              case 43:
+              case 35:
                 path = UrlJoin("as", "mkt", "hst", "f");
                 filters.push("action:eq:SOLD");
-                return _context16.abrupt("break", 50);
+                return _context16.abrupt("break", 42);
 
-              case 46:
+              case 38:
                 path = UrlJoin("as", "mkt", "stats", "listed");
-                return _context16.abrupt("break", 50);
+                return _context16.abrupt("break", 42);
 
-              case 48:
+              case 40:
                 path = UrlJoin("as", "mkt", "stats", "sold");
-                return _context16.abrupt("break", 50);
+                return _context16.abrupt("break", 42);
 
-              case 50:
+              case 42:
                 if (filters.length > 0) {
                   params.filter = filters;
                 }
 
                 if (!mode.includes("stats")) {
-                  _context16.next = 55;
+                  _context16.next = 47;
                   break;
                 }
 
-                _context16.next = 54;
+                _context16.next = 46;
                 return Utils.ResponseToJson(this.client.authClient.MakeAuthServiceRequest({
                   path: path,
                   method: "GET",
                   queryParams: params
                 }));
 
-              case 54:
+              case 46:
                 return _context16.abrupt("return", _context16.sent);
 
-              case 55:
+              case 47:
                 _context16.t2 = Utils;
-                _context16.next = 58;
+                _context16.next = 50;
                 return this.client.authClient.MakeAuthServiceRequest({
                   path: path,
                   method: "GET",
@@ -1495,22 +1524,22 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   } : {}
                 });
 
-              case 58:
+              case 50:
                 _context16.t3 = _context16.sent;
-                _context16.next = 61;
+                _context16.next = 53;
                 return _context16.t2.ResponseToJson.call(_context16.t2, _context16.t3);
 
-              case 61:
+              case 53:
                 _context16.t1 = _context16.sent;
 
                 if (_context16.t1) {
-                  _context16.next = 64;
+                  _context16.next = 56;
                   break;
                 }
 
                 _context16.t1 = [];
 
-              case 64:
+              case 56:
                 _ref16 = _context16.t1;
                 contents = _ref16.contents;
                 paging = _ref16.paging;
@@ -1526,12 +1555,12 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   })
                 });
 
-              case 70:
-                _context16.prev = 70;
+              case 62:
+                _context16.prev = 62;
                 _context16.t4 = _context16["catch"](11);
 
                 if (!(_context16.t4.status && _context16.t4.status.toString() === "404")) {
-                  _context16.next = 74;
+                  _context16.next = 66;
                   break;
                 }
 
@@ -1545,15 +1574,15 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   results: []
                 });
 
-              case 74:
+              case 66:
                 throw _context16.t4;
 
-              case 75:
+              case 67:
               case "end":
                 return _context16.stop();
             }
           }
-        }, _callee16, this, [[11, 70]]);
+        }, _callee16, this, [[11, 62]]);
       }));
 
       function FilteredQuery() {
@@ -1646,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.11",
+  "version": "3.2.14",
   "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;