@eluvio/elv-client-js 4.0.14 → 4.0.15

package/package.json

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

package/src/client/ContentAccess.js

@@ -747,7 +747,7 @@ exports.ProduceMetadataLinks = async function({
     // Is file or rep link - produce a url
     return {
       ...metadata,
-      url: await this.LinkUrl({libraryId, objectId, versionHash, linkPath: path, authorizationToken})
+      url: await this.LinkUrl({libraryId, objectId, versionHash, linkPath: path, authorizationToken, noAuth})
     };
   }
 
@@ -783,7 +783,8 @@ exports.MetadataAuth = async function({
 
   if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
 
-  noAuth = this.noAuth || noAuth;
+  noAuth = this.noAuth || noAuth || this.staticToken;
+
   let isPublic = noAuth;
   let accessType;
   if(!noAuth) {
@@ -900,6 +901,14 @@ exports.ContentObjectMetadata = async function({
 
   let path = UrlJoin("q", writeToken || versionHash || objectId, "meta", metadataSubtree);
 
+  if(!versionHash) {
+    if(!libraryId) {
+      libraryId = await this.ContentObjectLibraryId({objectId});
+    }
+
+    path = UrlJoin("qlibs", libraryId, path);
+  }
+
   // Main authorization
   let defaultAuthToken = await this.MetadataAuth({libraryId, objectId, versionHash, path: metadataSubtree, noAuth});
 

package/src/walletClient/ClientMethods.js

@@ -1244,9 +1244,9 @@ exports.LoadDrop = async function({tenantSlug, eventSlug, dropId}) {
   }
 
   if(!this.drops[tenantSlug][eventSlug][dropId]) {
-    const mainSiteHash = await this.client.LatestVersionHash({objectId: this.mainSiteId});
     const event = (await 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,

package/src/walletClient/Configuration.js

@@ -3,20 +3,23 @@ let 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/src/walletClient/index.js

@@ -34,6 +34,7 @@ class ElvWalletClient {
     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;
@@ -595,9 +596,9 @@ class ElvWalletClient {
       return;
     }
 
-    const mainSiteHash = await this.client.LatestVersionHash({objectId: this.mainSiteId});
     let metadata = await this.client.ContentObjectMetadata({
-      versionHash: mainSiteHash,
+      libraryId: this.mainSiteLibraryId,
+      objectId: this.mainSiteId,
       metadataSubtree: "public/asset_metadata/tenants",
       resolveLinks: true,
       linkDepthLimit: 2,
@@ -736,11 +737,12 @@ class ElvWalletClient {
       return this.availableMarketplaces[marketplaceInfo.tenantSlug][marketplaceInfo.marketplaceSlug]["."].source;
     }
 
-    const mainSiteHash = await this.client.LatestVersionHash({objectId: this.mainSiteId});
     const marketplaceLink = await 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
     });
 
     return LinkTargetHash(marketplaceLink);
@@ -750,7 +752,7 @@ class ElvWalletClient {
     const marketplaceInfo = this.MarketplaceInfo({marketplaceParams});
 
     const marketplaceId = marketplaceInfo.marketplaceId;
-    const marketplaceHash = await this.LatestMarketplaceHash({marketplaceParams});
+    const marketplaceHashPromise = this.LatestMarketplaceHash({marketplaceParams});
 
     if(this.cachedMarketplaces[marketplaceId] && this.cachedMarketplaces[marketplaceId].versionHash !== marketplaceHash) {
       delete this.cachedMarketplaces[marketplaceId];
@@ -758,8 +760,9 @@ class ElvWalletClient {
 
     if(!this.cachedMarketplaces[marketplaceId]) {
       let marketplace = await 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,
@@ -807,8 +810,8 @@ class ElvWalletClient {
 
       marketplace.retrievedAt = Date.now();
       marketplace.marketplaceId = marketplaceId;
-      marketplace.versionHash = marketplaceHash;
-      marketplace.marketplaceHash = marketplaceHash;
+      marketplace.versionHash = await marketplaceHashPromise;
+      marketplace.marketplaceHash = await marketplaceHashPromise;
 
       if(this.previewMarketplaceId && marketplaceId === this.previewMarketplaceId) {
         marketplace.branding.preview = true;