@eluvio/elv-client-js 4.0.8 → 4.0.10

package/src/client/ContentManagement.js

@@ -174,20 +174,20 @@ exports.CreateContentType = async function({name, metadata={}, bitcode}) {
   this.Log(`Created type: ${contractAddress} ${objectId}`);
 
   /* Create object, upload bitcode and finalize */
-  const createResponse = await this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({
-        libraryId: this.contentSpaceLibraryId,
-        objectId,
-        update: true
-      }),
-      method: "POST",
-      path: path
-    })
-  );
+  const rawCreateResponse = await this.HttpClient.Request({
+    headers: await this.authClient.AuthorizationHeader({
+      libraryId: this.contentSpaceLibraryId,
+      objectId,
+      update: true
+    }),
+    method: "POST",
+    path: path
+  });
+  const nodeUrl = (new URL(rawCreateResponse.url)).origin;
+  const createResponse = await this.utils.ResponseToJson(rawCreateResponse);
 
   // Record the node used in creating this write token
-  this.HttpClient.RecordWriteToken(createResponse.write_token);
+  this.HttpClient.RecordWriteToken(createResponse.write_token, nodeUrl);
 
   await this.ReplaceMetadata({
     libraryId: this.contentSpaceLibraryId,
@@ -605,20 +605,21 @@ exports.CreateContentObject = async function({libraryId, objectId, options={}})
 
   const path = UrlJoin("qid", objectId);
 
-  let createResponse = await this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
-      method: "POST",
-      path: path,
-      body: options
-    })
-  );
+  const rawCreateResponse = await this.HttpClient.Request({
+    headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
+    method: "POST",
+    path: path,
+    body: options
+  });
+  const nodeUrl = (new URL(rawCreateResponse.url)).origin;
+  const createResponse = await this.utils.ResponseToJson(rawCreateResponse);
 
   // Record the node used in creating this write token
-  this.HttpClient.RecordWriteToken(createResponse.write_token);
+  this.HttpClient.RecordWriteToken(createResponse.write_token, nodeUrl);
 
   createResponse.writeToken = createResponse.write_token;
   createResponse.objectId = createResponse.id;
+  createResponse.nodeUrl = nodeUrl;
 
   return createResponse;
 };
@@ -780,14 +781,8 @@ exports.EditContentObject = async function({libraryId, objectId, options={}}) {
     path: path,
     body: options
   });
-
-  const actualUrl = new URL(rawEditResponse.url);
-  actualUrl.pathname = "";
-  actualUrl.search = "";
-  actualUrl.hash = "";
-  const nodeUrl = actualUrl.href;
-
-  let editResponse = await this.utils.ResponseToJson(rawEditResponse);
+  const nodeUrl = (new URL(rawEditResponse.url)).origin;
+  const editResponse = await this.utils.ResponseToJson(rawEditResponse);
 
   // Record the node used in creating this write token
   this.HttpClient.RecordWriteToken(editResponse.write_token, nodeUrl);

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/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");