@eluvio/elv-client-js 4.0.7 → 4.0.9

package/package.json

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

package/src/Crypto.js

@@ -1,4 +1,4 @@
-const Buffer = require("buffer/").Buffer;
+if(typeof globalThis.Buffer === "undefined") { globalThis.Buffer = require("buffer/").Buffer; }
 
 const bs58 = require("bs58");
 const Stream = require("stream");
@@ -7,7 +7,7 @@ const Utils = require("./Utils");
 if(typeof crypto === "undefined") {
   const crypto = require("crypto");
   crypto.getRandomValues = arr => crypto.randomBytes(arr.length);
-  global.crypto = crypto;
+  globalThis.crypto = crypto;
 }
 
 let ElvCrypto;

package/src/ElvClient.js

@@ -1,4 +1,4 @@
-const Buffer = require("buffer/").Buffer;
+if(typeof globalThis.Buffer === "undefined") { globalThis.Buffer = require("buffer/").Buffer; }
 
 const URI = require("urijs");
 const Ethers = require("ethers");
@@ -31,7 +31,7 @@ const networks = {
 if(Utils.Platform() === Utils.PLATFORM_NODE) {
   // Define Response in node
   // eslint-disable-next-line no-global-assign
-  global.Response = (require("node-fetch")).Response;
+  globalThis.Response = (require("node-fetch")).Response;
 }
 
 /**

package/src/Utils.js

@@ -1,4 +1,4 @@
-const Buffer = require("buffer/").Buffer;
+if(typeof globalThis.Buffer === "undefined") { globalThis.Buffer = require("buffer/").Buffer; }
 
 const bs58 = require("bs58");
 const BigNumber = require("bignumber.js").default;

package/src/client/ContentAccess.js

@@ -874,6 +874,7 @@ exports.ContentObjectMetadata = async function({
   versionHash,
   writeToken,
   metadataSubtree="/",
+  localizationSubtree,
   queryParams={},
   select=[],
   remove=[],
@@ -940,17 +941,33 @@ exports.ContentObjectMetadata = async function({
     }
   }
 
-  if(!produceLinkUrls) { return metadata; }
+  if(produceLinkUrls) {
+    metadata = await this.ProduceMetadataLinks({
+      libraryId,
+      objectId,
+      versionHash,
+      path: metadataSubtree,
+      metadata,
+      authorizationToken,
+      noAuth
+    });
+  }
 
-  return await this.ProduceMetadataLinks({
-    libraryId,
-    objectId,
-    versionHash,
-    path: metadataSubtree,
-    metadata,
-    authorizationToken,
-    noAuth
-  });
+  if(!localizationSubtree) { return metadata; }
+
+  try {
+    const localizedMetadata = await this.ContentObjectMetadata({
+      ...arguments[0],
+      metadataSubtree: localizationSubtree,
+      localizationSubtree: undefined
+    });
+
+    return MergeWith({}, metadata, localizedMetadata, (a, b) => b === null || b === "" ? a : undefined);
+  } catch(error) {
+    this.Log(error, true);
+
+    return metadata;
+  }
 };
 
 

package/src/client/Files.js

@@ -10,7 +10,7 @@ let fs;
 if(Utils.Platform() === Utils.PLATFORM_NODE) {
   // Define Response in node
   // eslint-disable-next-line no-global-assign
-  global.Response = (require("node-fetch")).Response;
+  globalThis.Response = (require("node-fetch")).Response;
   fs = require("fs");
 }
 

package/src/walletClient/ClientMethods.js

@@ -1,6 +1,7 @@
 const Utils = require("../Utils");
 const UrlJoin = require("url-join");
 const {FormatNFTDetails, FormatNFTMetadata, FormatNFT} = require("./Utils");
+const MergeWith = require("lodash/mergeWith");
 
 /**
  * Methods
@@ -571,16 +572,23 @@ exports.NFT = async function({tokenId, contractAddress}) {
     )
   );
 
-  nft.metadata = {
-    ...(
-      (await this.client.ContentObjectMetadata({
-        versionHash: nft.details.VersionHash,
-        metadataSubtree: "public/asset_metadata/nft",
-        produceLinkUrls: true
-      })) || {}
-    ),
-    ...(nft.metadata || {})
-  };
+  const assetMetadata = (await this.client.ContentObjectMetadata({
+    versionHash: nft.details.VersionHash,
+    metadataSubtree: "public/asset_metadata/nft",
+    produceLinkUrls: true
+  })) || {};
+
+  nft.metadata = MergeWith({}, assetMetadata, nft.metadata, (a, b) => b === null || b === "" ? a : undefined);
+
+  if(this.localization) {
+    const localizedMetadata = (await this.client.ContentObjectMetadata({
+      versionHash: nft.details.VersionHash,
+      metadataSubtree: UrlJoin("public", "asset_metadata", "localizations", this.localization, "nft"),
+      produceLinkUrls: true
+    })) || {};
+
+    nft.metadata = MergeWith({}, nft.metadata, localizedMetadata, (a, b) => b === null || b === "" ? a : undefined);
+  }
 
   nft.config = await this.TenantConfiguration({contractAddress});
 

package/src/walletClient/Utils.js

@@ -55,8 +55,8 @@ const FormatNFTDetails = function(entry) {
     USDCOnly: !!paymentAccounts.find(entry => entry.preferred),
     EthUSDCAccepted: !!paymentAccounts.find(account => account.type === "eth"),
     EthUSDCOnly: !!paymentAccounts.find(account => account.type === "eth" && account.preferred),
-    SolUSDCAccepted: !!paymentAccounts.find(account => account.type === "eth"),
-    SolUSDCOnly: !!paymentAccounts.find(account => account.type === "eth" && account.preferred),
+    SolUSDCAccepted: !!paymentAccounts.find(account => account.type === "sol"),
+    SolUSDCOnly: !!paymentAccounts.find(account => account.type === "sol" && account.preferred),
 
     TenantId: entry.tenant || entry.tenant_id,
     ContractAddr: info.contract_addr,

package/src/walletClient/index.js

@@ -23,12 +23,14 @@ try {
  * See the Modules section on the sidebar for all client methods unrelated to login and authorization
  */
 class ElvWalletClient {
-  constructor({appId, client, network, mode, marketplaceInfo, previewMarketplaceHash, storeAuthToken}) {
+  constructor({appId, client, network, mode, localization, marketplaceInfo, previewMarketplaceHash, storeAuthToken}) {
     this.appId = appId;
 
     this.client = client;
     this.loggedIn = false;
 
+    this.localization = localization;
+
     this.network = network;
     this.mode = mode;
     this.purchaseMode = Configuration[network][mode].purchaseMode;
@@ -93,6 +95,7 @@ class ElvWalletClient {
     appId="general",
     network="main",
     mode="production",
+    localization,
     marketplaceParams,
     previewMarketplaceId,
     storeAuthToken=true
@@ -119,6 +122,7 @@ class ElvWalletClient {
       client,
       network,
       mode,
+      localization,
       marketplaceInfo: {
         tenantSlug,
         marketplaceSlug,
@@ -756,6 +760,7 @@ class ElvWalletClient {
       let marketplace = await this.client.ContentObjectMetadata({
         versionHash: marketplaceHash,
         metadataSubtree: "public/asset_metadata/info",
+        localizationSubtree: this.localization ? UrlJoin("public", "asset_metadata", "localizations", this.localization, "info") : "",
         linkDepthLimit: 1,
         resolveLinks: true,
         resolveIgnoreErrors: true,
@@ -810,7 +815,7 @@ class ElvWalletClient {
       }
 
       // Generate embed URLs for pack opening animations
-      ["purchase_animation", "purchase_animation__mobile", "reveal_animation", "reveal_animation_mobile"].forEach(key => {
+      ["purchase_animation", "purchase_animation_mobile", "reveal_animation", "reveal_animation_mobile"].forEach(key => {
         try {
           if(marketplace.storefront[key]) {
             let embedUrl = new URL("https://embed.v3.contentfabric.io");