@eluvio/elv-client-js 4.0.15 → 4.0.16

package/dist/src/RemoteSigner.js

@@ -116,12 +116,6 @@ var RemoteSigner = /*#__PURE__*/function (_Ethers$Signer) {
     value: function getAddress() {
       return this.address;
     }
-
-    /**
-     * Sign a hashed piece of data
-     * @param {String} digest - Hex string of hashed data
-     * @returns - the signed message as a hex string
-     */
   }, {
     key: "signDigest",
     value: function () {

package/dist/src/client/ContentAccess.js

@@ -1276,7 +1276,8 @@ exports.ProduceMetadataLinks = /*#__PURE__*/function () {
             objectId: objectId,
             versionHash: versionHash,
             linkPath: path,
-            authorizationToken: authorizationToken
+            authorizationToken: authorizationToken,
+            noAuth: noAuth
           });
         case 13:
           _context22.t3 = _context22.sent;
@@ -1341,7 +1342,7 @@ exports.MetadataAuth = /*#__PURE__*/function () {
           if (versionHash) {
             objectId = this.utils.DecodeVersionHash(versionHash).objectId;
           }
-          noAuth = this.noAuth || noAuth;
+          noAuth = this.noAuth || noAuth || this.staticToken;
           isPublic = noAuth;
           if (noAuth) {
             _context23.next = 14;
@@ -1551,8 +1552,25 @@ exports.ContentObjectMetadata = /*#__PURE__*/function () {
           if (versionHash) {
             objectId = this.utils.DecodeVersionHash(versionHash).objectId;
           }
-          path = UrlJoin("q", writeToken || versionHash || objectId, "meta", metadataSubtree); // Main authorization
-          _context24.next = 8;
+          path = UrlJoin("q", writeToken || versionHash || objectId, "meta", metadataSubtree);
+          if (versionHash) {
+            _context24.next = 12;
+            break;
+          }
+          if (libraryId) {
+            _context24.next = 11;
+            break;
+          }
+          _context24.next = 10;
+          return this.ContentObjectLibraryId({
+            objectId: objectId
+          });
+        case 10:
+          libraryId = _context24.sent;
+        case 11:
+          path = UrlJoin("qlibs", libraryId, path);
+        case 12:
+          _context24.next = 14;
           return this.MetadataAuth({
             libraryId: libraryId,
             objectId: objectId,
@@ -1560,15 +1578,15 @@ exports.ContentObjectMetadata = /*#__PURE__*/function () {
             path: metadataSubtree,
             noAuth: noAuth
           });
-        case 8:
+        case 14:
           defaultAuthToken = _context24.sent;
           // All authorization
           authTokens = [authorizationToken, queryParams.authorization, defaultAuthToken].flat().filter(function (token) {
             return token;
           });
           delete queryParams.authorization;
-          _context24.prev = 11;
-          _context24.next = 14;
+          _context24.prev = 17;
+          _context24.next = 20;
           return this.utils.ResponseToJson(this.HttpClient.Request({
             headers: {
               "Authorization": authTokens.map(function (token) {
@@ -1586,37 +1604,37 @@ exports.ContentObjectMetadata = /*#__PURE__*/function () {
             method: "GET",
             path: path
           }));
-        case 14:
+        case 20:
           metadata = _context24.sent;
-          _context24.next = 27;
+          _context24.next = 33;
           break;
-        case 17:
-          _context24.prev = 17;
-          _context24.t0 = _context24["catch"](11);
+        case 23:
+          _context24.prev = 23;
+          _context24.t0 = _context24["catch"](17);
           if (!(_context24.t0.status !== 404)) {
-            _context24.next = 21;
+            _context24.next = 27;
             break;
           }
           throw _context24.t0;
-        case 21:
+        case 27:
           // For a 404 error, check if error was due to write token not found
           errQwtoken = objectPath.get(_context24.t0.body, "errors[0].cause.cause.cause.qwtoken");
           if (!errQwtoken) {
-            _context24.next = 26;
+            _context24.next = 32;
             break;
           }
           throw _context24.t0;
-        case 26:
+        case 32:
           // For all other 404 errors (not just 'subtree not found'), suppress error and
           // return an empty value. (there are function call chains that depend on this behavior,
           //  e.g. CreateABRMezzanine -> CreateEncryptionConk -> ContentObjectMetadata)
           metadata = metadataSubtree === "/" ? {} : undefined;
-        case 27:
+        case 33:
           if (!produceLinkUrls) {
-            _context24.next = 31;
+            _context24.next = 37;
             break;
           }
-          _context24.next = 30;
+          _context24.next = 36;
           return this.ProduceMetadataLinks({
             libraryId: libraryId,
             objectId: objectId,
@@ -1626,36 +1644,36 @@ exports.ContentObjectMetadata = /*#__PURE__*/function () {
             authorizationToken: authorizationToken,
             noAuth: noAuth
           });
-        case 30:
+        case 36:
           metadata = _context24.sent;
-        case 31:
+        case 37:
           if (localizationSubtree) {
-            _context24.next = 33;
+            _context24.next = 39;
             break;
           }
           return _context24.abrupt("return", metadata);
-        case 33:
-          _context24.prev = 33;
-          _context24.next = 36;
+        case 39:
+          _context24.prev = 39;
+          _context24.next = 42;
           return this.ContentObjectMetadata(_objectSpread(_objectSpread({}, _args24[0]), {}, {
             metadataSubtree: localizationSubtree,
             localizationSubtree: undefined
           }));
-        case 36:
+        case 42:
           localizedMetadata = _context24.sent;
           return _context24.abrupt("return", MergeWith({}, metadata, localizedMetadata, function (a, b) {
             return b === null || b === "" ? a : undefined;
           }));
-        case 40:
-          _context24.prev = 40;
-          _context24.t1 = _context24["catch"](33);
+        case 46:
+          _context24.prev = 46;
+          _context24.t1 = _context24["catch"](39);
           this.Log(_context24.t1, true);
           return _context24.abrupt("return", metadata);
-        case 44:
+        case 50:
         case "end":
           return _context24.stop();
       }
-    }, _callee24, this, [[11, 17], [33, 40]]);
+    }, _callee24, this, [[17, 23], [39, 46]]);
   }));
   return function (_x25) {
     return _ref41.apply(this, arguments);

package/dist/src/client/ContentManagement.js

@@ -11,7 +11,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  */
 
 var UrlJoin = require("url-join");
-var ImageType = require("image-type");
 var Ethers = require("ethers");
 var Pako = require("pako");
 
@@ -577,7 +576,7 @@ exports.SetContentLibraryImage = /*#__PURE__*/function () {
  */
 exports.SetContentObjectImage = /*#__PURE__*/function () {
   var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref12) {
-    var libraryId, objectId, writeToken, image, imageName, _ref12$imagePath, imagePath, type, mimeType;
+    var libraryId, objectId, writeToken, image, imageName, _ref12$imagePath, imagePath;
     return _regeneratorRuntime.wrap(function _callee7$(_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
@@ -598,10 +597,7 @@ exports.SetContentObjectImage = /*#__PURE__*/function () {
         case 8:
           image = _context7.sent;
         case 9:
-          // Determine image type
-          type = ImageType(image);
-          mimeType = ["jpg", "jpeg", "png", "gif", "webp"].includes(type.ext) ? type.mime : "image/*";
-          _context7.next = 13;
+          _context7.next = 11;
           return this.UploadFiles({
             libraryId: libraryId,
             objectId: objectId,
@@ -609,13 +605,13 @@ exports.SetContentObjectImage = /*#__PURE__*/function () {
             encrypted: false,
             fileInfo: [{
               path: imageName,
-              mime_type: mimeType,
+              mime_type: "image/*",
               size: image.size || image.length || image.byteLength,
               data: image
             }]
           });
-        case 13:
-          _context7.next = 15;
+        case 11:
+          _context7.next = 13;
           return this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: objectId,
@@ -625,7 +621,7 @@ exports.SetContentObjectImage = /*#__PURE__*/function () {
               "/": "./files/".concat(imageName)
             }
           });
-        case 15:
+        case 13:
         case "end":
           return _context7.stop();
       }

package/dist/src/walletClient/ClientMethods.js

@@ -2092,7 +2092,7 @@ exports.CollectionRedemptionStatus = /*#__PURE__*/function () {
 exports.LoadDrop = /*#__PURE__*/function () {
   var _ref76 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee38(_ref75) {
     var _this = this;
-    var tenantSlug, eventSlug, dropId, mainSiteHash, event, eventId;
+    var tenantSlug, eventSlug, dropId, event, eventId;
     return _regeneratorRuntime.wrap(function _callee38$(_context38) {
       while (1) switch (_context38.prev = _context38.next) {
         case 0:
@@ -2107,18 +2107,13 @@ exports.LoadDrop = /*#__PURE__*/function () {
             this.drops[tenantSlug][eventSlug] = {};
           }
           if (this.drops[tenantSlug][eventSlug][dropId]) {
-            _context38.next = 16;
+            _context38.next = 13;
             break;
           }
           _context38.next = 7;
-          return this.client.LatestVersionHash({
-            objectId: this.mainSiteId
-          });
-        case 7:
-          mainSiteHash = _context38.sent;
-          _context38.next = 10;
           return this.client.ContentObjectMetadata({
-            versionHash: mainSiteHash,
+            libraryId: this.mainSiteLibraryId,
+            objectId: this.mainSiteId,
             metadataSubtree: UrlJoin("public", "asset_metadata", "tenants", tenantSlug, "sites", eventSlug, "info"),
             resolveLinks: true,
             linkDepthLimit: 2,
@@ -2127,14 +2122,14 @@ exports.LoadDrop = /*#__PURE__*/function () {
             select: [".", "drops"],
             noAuth: true
           });
-        case 10:
+        case 7:
           _context38.t0 = _context38.sent;
           if (_context38.t0) {
-            _context38.next = 13;
+            _context38.next = 10;
             break;
           }
           _context38.t0 = [];
-        case 13:
+        case 10:
           event = _context38.t0;
           eventId = Utils.DecodeVersionHash(event["."].source).objectId;
           event.drops.forEach(function (drop) {
@@ -2144,9 +2139,9 @@ exports.LoadDrop = /*#__PURE__*/function () {
             _this.drops[tenantSlug][eventSlug][drop.uuid] = drop;
             _this.drops[drop.uuid] = drop;
           });
-        case 16:
+        case 13:
           return _context38.abrupt("return", this.drops[dropId]);
-        case 17:
+        case 14:
         case "end":
           return _context38.stop();
       }

package/dist/src/walletClient/Configuration.js

@@ -3,20 +3,23 @@ var WalletConfiguration = {
     configUrl: "https://demov3.net955210.contentfabric.io/config",
     stateStoreUrls: ["https://appsvc.svc.eluv.io/dv3"],
     staging: {
+      siteLibraryId: "ilib36Wi5fJDLXix8ckL7ZfaAJwJXWGD",
       siteId: "iq__2gkNh8CCZqFFnoRpEUmz7P3PaBQG",
       purchaseMode: "develop",
-      appUrl: "https://core.test.contentfabric.io/wallet-demo"
+      appUrl: "https://wallet.demov3.contentfabric.io"
     }
   },
   main: {
     configUrl: "https://main.net955305.contentfabric.io/config",
     stateStoreUrls: ["https://appsvc.svc.eluv.io/main"],
     staging: {
+      siteLibraryId: "ilib2GdaYEFxB7HyLPhSDPKMyPLhV8x9",
       siteId: "iq__inauxD1KLyKWPHargCWjdCh2ayr",
       purchaseMode: "production",
       appUrl: "https://wallet.preview.contentfabric.io"
     },
     production: {
+      siteLibraryId: "ilib2GdaYEFxB7HyLPhSDPKMyPLhV8x9",
       siteId: "iq__suqRJUt2vmXsyiWS5ZaSGwtFU9R",
       purchaseMode: "production",
       appUrl: "https://wallet.contentfabric.io"

package/dist/src/walletClient/index.js

@@ -53,6 +53,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     this.network = network;
     this.mode = mode;
     this.purchaseMode = Configuration[network][mode].purchaseMode;
+    this.mainSiteLibraryId = Configuration[network][mode].siteLibraryId;
     this.mainSiteId = Configuration[network][mode].siteId;
     this.appUrl = Configuration[network][mode].appUrl;
     this.publicStaticToken = client.staticToken;
@@ -828,7 +829,6 @@ var ElvWalletClient = /*#__PURE__*/function () {
       var _LoadAvailableMarketplaces = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
         var _this4 = this;
         var forceReload,
-          mainSiteHash,
           metadata,
           previewTenantSlug,
           previewMarketplaceSlug,
@@ -847,14 +847,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
               return _context12.abrupt("return");
             case 3:
               _context12.next = 5;
-              return this.client.LatestVersionHash({
-                objectId: this.mainSiteId
-              });
-            case 5:
-              mainSiteHash = _context12.sent;
-              _context12.next = 8;
               return this.client.ContentObjectMetadata({
-                versionHash: mainSiteHash,
+                libraryId: this.mainSiteLibraryId,
+                objectId: this.mainSiteId,
                 metadataSubtree: "public/asset_metadata/tenants",
                 resolveLinks: true,
                 linkDepthLimit: 2,
@@ -866,10 +861,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 select: ["*/.", "*/marketplaces/*/.", "*/marketplaces/*/info/tenant_id", "*/marketplaces/*/info/tenant_name", "*/marketplaces/*/info/branding", "*/marketplaces/*/info/storefront/background", "*/marketplaces/*/info/storefront/background_mobile"],
                 remove: ["*/marketplaces/*/info/branding/custom_css"]
               });
-            case 8:
+            case 5:
               metadata = _context12.sent;
               if (!this.previewMarketplaceId) {
-                _context12.next = 24;
+                _context12.next = 21;
                 break;
               }
               previewTenantSlug = "PREVIEW";
@@ -892,10 +887,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
 
               // Marketplace not present in branch, or preview version is different - Load metadata directly
               if (previewMarketplaceMetadata) {
-                _context12.next = 17;
+                _context12.next = 14;
                 break;
               }
-              _context12.next = 15;
+              _context12.next = 12;
               return this.client.ContentObjectMetadata({
                 versionHash: this.previewMarketplaceHash,
                 metadataSubtree: "public/asset_metadata",
@@ -905,12 +900,12 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 select: ["slug", "info/tenant_id", "info/tenant_name", "info/branding"],
                 remove: ["info/branding/custom_css"]
               });
-            case 15:
+            case 12:
               previewMarketplaceMetadata = _context12.sent;
               if (!previewMarketplaceSlug) {
                 previewMarketplaceSlug = previewMarketplaceMetadata.slug;
               }
-            case 17:
+            case 14:
               previewMarketplaceMetadata["."] = {
                 source: this.previewMarketplaceHash
               };
@@ -922,7 +917,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
               metadata[previewTenantSlug] = metadata[previewTenantSlug] || {};
               metadata[previewTenantSlug].marketplaces = metadata[previewTenantSlug].marketplaces || {};
               metadata[previewTenantSlug].marketplaces[previewMarketplaceSlug] = previewMarketplaceMetadata;
-            case 24:
+            case 21:
               availableMarketplaces = _objectSpread({}, this.availableMarketplaces || {});
               availableMarketplacesById = _objectSpread({}, this.availableMarketplacesById || {});
               Object.keys(metadata || {}).forEach(function (tenantSlug) {
@@ -964,7 +959,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
               });
               this.availableMarketplaces = availableMarketplaces;
               this.availableMarketplacesById = availableMarketplacesById;
-            case 29:
+            case 26:
             case "end":
               return _context12.stop();
           }
@@ -979,7 +974,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     key: "LatestMarketplaceHash",
     value: function () {
       var _LatestMarketplaceHash = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref12) {
-        var marketplaceParams, marketplaceInfo, mainSiteHash, marketplaceLink;
+        var marketplaceParams, marketplaceInfo, marketplaceLink;
         return _regeneratorRuntime.wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -997,21 +992,17 @@ var ElvWalletClient = /*#__PURE__*/function () {
               return _context13.abrupt("return", this.availableMarketplaces[marketplaceInfo.tenantSlug][marketplaceInfo.marketplaceSlug]["."].source);
             case 6:
               _context13.next = 8;
-              return this.client.LatestVersionHash({
-                objectId: this.mainSiteId
-              });
-            case 8:
-              mainSiteHash = _context13.sent;
-              _context13.next = 11;
               return this.client.ContentObjectMetadata({
-                versionHash: mainSiteHash,
+                libraryId: this.mainSiteLibraryId,
+                objectId: this.mainSiteId,
                 metadataSubtree: UrlJoin("/public", "asset_metadata", "tenants", marketplaceInfo.tenantSlug, "marketplaces", marketplaceInfo.marketplaceSlug),
-                resolveLinks: false
+                resolveLinks: false,
+                noAuth: true
               });
-            case 11:
+            case 8:
               marketplaceLink = _context13.sent;
               return _context13.abrupt("return", LinkTargetHash(marketplaceLink));
-            case 13:
+            case 10:
             case "end":
               return _context13.stop();
           }
@@ -1027,7 +1018,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     value: function () {
       var _LoadMarketplace = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(marketplaceParams) {
         var _this5 = this;
-        var marketplaceInfo, marketplaceId, marketplaceHash, marketplace;
+        var marketplaceInfo, marketplaceId, marketplaceHashPromise, marketplace;
         return _regeneratorRuntime.wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1035,23 +1026,21 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 marketplaceParams: marketplaceParams
               });
               marketplaceId = marketplaceInfo.marketplaceId;
-              _context15.next = 4;
-              return this.LatestMarketplaceHash({
+              marketplaceHashPromise = this.LatestMarketplaceHash({
                 marketplaceParams: marketplaceParams
               });
-            case 4:
-              marketplaceHash = _context15.sent;
               if (this.cachedMarketplaces[marketplaceId] && this.cachedMarketplaces[marketplaceId].versionHash !== marketplaceHash) {
                 delete this.cachedMarketplaces[marketplaceId];
               }
               if (this.cachedMarketplaces[marketplaceId]) {
-                _context15.next = 21;
+                _context15.next = 23;
                 break;
               }
-              _context15.next = 9;
+              _context15.next = 7;
               return this.client.ContentObjectMetadata({
-                versionHash: marketplaceHash,
-                metadataSubtree: "public/asset_metadata/info",
+                libraryId: this.mainSiteLibraryId,
+                objectId: this.mainSiteId,
+                metadataSubtree: UrlJoin("/public", "asset_metadata", "tenants", marketplaceInfo.tenantSlug, "marketplaces", marketplaceInfo.marketplaceSlug, "info"),
                 localizationSubtree: this.localization ? UrlJoin("public", "asset_metadata", "localizations", this.localization, "info") : "",
                 linkDepthLimit: 1,
                 resolveLinks: true,
@@ -1060,9 +1049,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 produceLinkUrls: true,
                 authorizationToken: this.publicStaticToken
               });
-            case 9:
+            case 7:
               marketplace = _context15.sent;
-              _context15.next = 12;
+              _context15.next = 10;
               return Promise.all(marketplace.items.map( /*#__PURE__*/function () {
                 var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(item, index) {
                   var authorizationToken;
@@ -1112,7 +1101,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   return _ref13.apply(this, arguments);
                 };
               }()));
-            case 12:
+            case 10:
               marketplace.items = _context15.sent;
               marketplace.collections = (marketplace.collections || []).map(function (collection, collectionIndex) {
                 return _objectSpread(_objectSpread({}, collection), {}, {
@@ -1121,8 +1110,14 @@ var ElvWalletClient = /*#__PURE__*/function () {
               });
               marketplace.retrievedAt = Date.now();
               marketplace.marketplaceId = marketplaceId;
-              marketplace.versionHash = marketplaceHash;
-              marketplace.marketplaceHash = marketplaceHash;
+              _context15.next = 16;
+              return marketplaceHashPromise;
+            case 16:
+              marketplace.versionHash = _context15.sent;
+              _context15.next = 19;
+              return marketplaceHashPromise;
+            case 19:
+              marketplace.marketplaceHash = _context15.sent;
               if (this.previewMarketplaceId && marketplaceId === this.previewMarketplaceId) {
                 marketplace.branding.preview = true;
               }
@@ -1148,9 +1143,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 } catch (error) {}
               });
               this.cachedMarketplaces[marketplaceId] = marketplace;
-            case 21:
+            case 23:
               return _context15.abrupt("return", this.cachedMarketplaces[marketplaceId]);
-            case 22:
+            case 24:
             case "end":
               return _context15.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.15",
+  "version": "4.0.16",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",
@@ -69,7 +69,6 @@
     "ethers": "^5.7.2",
     "fraction.js": "^4.0.12",
     "hash.js": "^1.1.7",
-    "image-type": "^5.2.0",
     "isarray": "^2.0.5",
     "js-polyfills": "^0.1.42",
     "jsonpath-plus": "^6.0.1",

package/src/client/ContentManagement.js

@@ -5,7 +5,6 @@
  */
 
 const UrlJoin = require("url-join");
-const ImageType = require("image-type");
 const Ethers = require("ethers");
 const Pako = require("pako");
 
@@ -386,10 +385,6 @@ exports.SetContentObjectImage = async function({libraryId, objectId, writeToken,
     image = await new Response(image).arrayBuffer();
   }
 
-  // Determine image type
-  const type = ImageType(image);
-  let mimeType = ["jpg", "jpeg", "png", "gif", "webp"].includes(type.ext) ? type.mime : "image/*";
-
   await this.UploadFiles({
     libraryId,
     objectId,
@@ -398,7 +393,7 @@ exports.SetContentObjectImage = async function({libraryId, objectId, writeToken,
     fileInfo: [
       {
         path: imageName,
-        mime_type: mimeType,
+        mime_type: "image/*",
         size: image.size || image.length || image.byteLength,
         data: image
       }