@eluvio/elv-client-js 3.1.76 → 3.1.77

package/dist/src/EthClient.js

@@ -480,7 +480,7 @@ function () {
 
             case 22:
               if (success) {
-                _context6.next = 45;
+                _context6.next = 49;
                 break;
               }
 
@@ -491,7 +491,7 @@ function () {
             case 26:
               result = _context6.sent;
               success = true;
-              _context6.next = 43;
+              _context6.next = 47;
               break;
 
             case 30:
@@ -513,41 +513,51 @@ function () {
               latestBlock = _context6.sent;
               overrides.gasLimit = latestBlock.gasLimit;
               overrides.gasPrice = overrides.gasPrice ? overrides.gasPrice * 1.50 : 8000000000;
-              _context6.next = 43;
+              _context6.next = 47;
               break;
 
             case 40:
+              if (!(_context6.t0.code === "NONCE_EXPIRED" && _context6.t0.reason === "nonce has already been used")) {
+                _context6.next = 44;
+                break;
+              }
+
+              this.Log("Retrying method call ".concat(methodName));
+              _context6.next = 47;
+              break;
+
+            case 44:
               if ((_context6.t0.message || _context6.t0).includes("invalid response")) {
-                _context6.next = 43;
+                _context6.next = 47;
                 break;
               }
 
               this.Log(_typeof(_context6.t0) === "object" ? JSON.stringify(_context6.t0, null, 2) : _context6.t0, true);
               throw _context6.t0;
 
-            case 43:
+            case 47:
               _context6.next = 22;
               break;
 
-            case 45:
+            case 49:
               return _context6.abrupt("return", result);
 
-            case 46:
-              _context6.prev = 46;
+            case 50:
+              _context6.prev = 50;
 
               // Unlock if performing a transaction
               if (!methodAbi || !methodAbi.constant) {
                 this.locked = false;
               }
 
-              return _context6.finish(46);
+              return _context6.finish(50);
 
-            case 49:
+            case 53:
             case "end":
               return _context6.stop();
           }
         }
-      }, null, this, [[20,, 46, 49], [23, 30]]);
+      }, null, this, [[20,, 50, 53], [23, 30]]);
     }
   }, {
     key: "CallContractMethodAndWait",

package/dist/src/client/ABRPublishing.js

@@ -15,6 +15,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  *
  * @module ElvClient/ABRPublishing
  */
+var R = require("ramda");
+
 var UrlJoin = require("url-join");
 
 var HttpClient = require("../HttpClient");
@@ -344,7 +346,7 @@ exports.CreateProductionMaster = function _callee(_ref) {
 
 
 exports.CreateABRMezzanine = function _callee2(_ref4) {
-  var libraryId, objectId, type, name, description, metadata, masterVersionHash, abrProfile, _ref4$variant, variant, _ref4$offeringKey, offeringKey, existingMez, options, id, write_token, editResponse, createResponse, masterName, authorizationTokens, headers, body, storeClear, _ref5, logs, errors, warnings, finalizeResponse;
+  var libraryId, objectId, type, name, description, metadata, masterVersionHash, abrProfile, _ref4$variant, variant, _ref4$offeringKey, offeringKey, existingMez, options, id, write_token, editResponse, createResponse, masterName, authorizationTokens, headers, body, storeClear, _ref5, logs, errors, warnings, existingMetadata, finalizeResponse;
 
   return _regeneratorRuntime.async(function _callee2$(_context2) {
     while (1) {
@@ -541,7 +543,6 @@ exports.CreateABRMezzanine = function _callee2(_ref4) {
               "/": "./rep/playout/".concat(offeringKey, "/options.json")
             })
           }, metadata["public"].asset_metadata);
-          metadata.elv_created_at = new Date().getTime();
 
           if (name || !existingMez) {
             metadata.name = name || "".concat(masterName, " Mezzanine");
@@ -551,18 +552,38 @@ exports.CreateABRMezzanine = function _callee2(_ref4) {
           if (description || !existingMez) {
             metadata.description = description || "";
             metadata["public"].description = description || "";
-          }
+          } // retrieve existing metadata to merge with updated metadata
 
-          _context2.next = 72;
-          return _regeneratorRuntime.awrap(this.MergeMetadata({
+
+          _context2.next = 71;
+          return _regeneratorRuntime.awrap(this.ContentObjectMetadata({
+            libraryId: libraryId,
+            objectId: id,
+            writeToken: write_token
+          }));
+
+        case 71:
+          existingMetadata = _context2.sent;
+          // newer metadata values replace existing metadata, unless both new and old values are objects,
+          // in which case their keys are merged recursively
+          metadata = R.mergeDeepRight(existingMetadata, metadata);
+
+          if (!existingMez) {
+            // set creation date
+            metadata.elv_created_at = new Date().getTime();
+          } // write metadata to mezzanine object
+
+
+          _context2.next = 76;
+          return _regeneratorRuntime.awrap(this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: id,
             writeToken: write_token,
             metadata: metadata
           }));
 
-        case 72:
-          _context2.next = 74;
+        case 76:
+          _context2.next = 78;
           return _regeneratorRuntime.awrap(this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: id,
@@ -570,7 +591,7 @@ exports.CreateABRMezzanine = function _callee2(_ref4) {
             commitMessage: "Create ABR mezzanine"
           }));
 
-        case 74:
+        case 78:
           finalizeResponse = _context2.sent;
           return _context2.abrupt("return", _objectSpread({
             logs: logs || [],
@@ -578,7 +599,7 @@ exports.CreateABRMezzanine = function _callee2(_ref4) {
             errors: errors || []
           }, finalizeResponse));
 
-        case 76:
+        case 80:
         case "end":
           return _context2.stop();
       }

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "3.1.76",
+  "version": "3.1.77",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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

package/src/EthClient.js

@@ -285,6 +285,8 @@ class EthClient {
             const latestBlock = await this.MakeProviderCall({methodName: "getBlock", args: ["latest"]});
             overrides.gasLimit = latestBlock.gasLimit;
             overrides.gasPrice = overrides.gasPrice ? overrides.gasPrice * 1.50 : 8000000000;
+          } else if(error.code === "NONCE_EXPIRED" && error.reason === "nonce has already been used") {
+            this.Log(`Retrying method call ${methodName}`);
           } else if(!(error.message || error).includes("invalid response")) {
             this.Log(typeof error === "object" ? JSON.stringify(error, null, 2) : error, true);
             throw error;

package/src/client/ABRPublishing.js

@@ -6,6 +6,7 @@
  * @module ElvClient/ABRPublishing
  */
 
+const R = require("ramda");
 const UrlJoin = require("url-join");
 const HttpClient = require("../HttpClient");
 
@@ -355,8 +356,6 @@ exports.CreateABRMezzanine = async function({
     ...metadata.public.asset_metadata
   };
 
-  metadata.elv_created_at = new Date().getTime();
-
   if(name || !existingMez) {
     metadata.name = name || `${masterName} Mezzanine`;
     metadata.public.name = name || `${masterName} Mezzanine`;
@@ -367,7 +366,23 @@ exports.CreateABRMezzanine = async function({
     metadata.public.description = description || "";
   }
 
-  await this.MergeMetadata({
+  // retrieve existing metadata to merge with updated metadata
+  const existingMetadata = await this.ContentObjectMetadata({
+    libraryId,
+    objectId: id,
+    writeToken: write_token,
+  });
+  // newer metadata values replace existing metadata, unless both new and old values are objects,
+  // in which case their keys are merged recursively
+  metadata = R.mergeDeepRight(existingMetadata, metadata);
+
+  if(!existingMez) {
+    // set creation date
+    metadata.elv_created_at = new Date().getTime();
+  }
+
+  // write metadata to mezzanine object
+  await this.ReplaceMetadata({
     libraryId,
     objectId: id,
     writeToken: write_token,

package/utilities/MezzanineCreate.js

@@ -126,7 +126,7 @@ class MezzanineCreate extends Utility {
 
     if(!existingPublicMetadata.asset_metadata) existingPublicMetadata.asset_metadata = {};
 
-    const mergedExistingAndArgMetadata = R.mergeRight(
+    const mergedExistingAndArgMetadata = R.mergeDeepRight(
       {public: existingPublicMetadata},
       metadataFromArg
     );
@@ -248,4 +248,4 @@ if(require.main === module) {
   Utility.cmdLineInvoke(MezzanineCreate);
 } else {
   module.exports = MezzanineCreate;
-}
+}