@eluvio/elv-client-js 3.1.75 → 3.1.79

package/dist/src/AuthorizationClient.js

@@ -241,7 +241,7 @@ function () {
   }, {
     key: "GenerateAuthorizationToken",
     value: function GenerateAuthorizationToken(_ref3) {
-      var libraryId, objectId, versionHash, partHash, encryption, _ref3$update, update, _ref3$noAuth, noAuth, publicKey, owner, cap, token, _ref4, transactionHash, signature, multiSig;
+      var libraryId, objectId, versionHash, partHash, encryption, _ref3$update, update, _ref3$noAuth, noAuth, publicKey, owner, ownerCapKey, ownerCap, cap, token, _ref4, transactionHash, signature, multiSig;
 
       return _regeneratorRuntime.async(function GenerateAuthorizationToken$(_context3) {
         while (1) {
@@ -271,7 +271,7 @@ function () {
 
             case 9:
               if (!_context3.t0) {
-                _context3.next = 18;
+                _context3.next = 22;
                 break;
               }
 
@@ -282,34 +282,44 @@ function () {
 
             case 12:
               owner = _context3.sent;
+              ownerCapKey = "eluv.caps.iusr".concat(Utils.AddressToHash(this.client.signer.address));
+              _context3.next = 16;
+              return _regeneratorRuntime.awrap(client.ContentObjectMetadata({
+                libraryId: libraryId,
+                objectId: objectId,
+                metadataSubtree: ownerCapKey
+              }));
 
-              if (Utils.EqualAddress(owner, this.client.signer.address)) {
-                _context3.next = 18;
+            case 16:
+              ownerCap = _context3.sent;
+
+              if (!(!Utils.EqualAddress(owner, this.client.signer.address) && !ownerCap)) {
+                _context3.next = 22;
                 break;
               }
 
-              _context3.next = 16;
+              _context3.next = 20;
               return _regeneratorRuntime.awrap(this.ReEncryptionConk({
                 libraryId: libraryId,
                 objectId: objectId
               }));
 
-            case 16:
+            case 20:
               cap = _context3.sent;
               publicKey = cap.public_key;
 
-            case 18:
+            case 22:
               token = {
                 qspace_id: this.contentSpaceId,
                 addr: Utils.FormatAddress(this.client.signer && this.client.signer.address || "")
               };
 
               if (this.noAuth || noAuth) {
-                _context3.next = 25;
+                _context3.next = 29;
                 break;
               }
 
-              _context3.next = 22;
+              _context3.next = 26;
               return _regeneratorRuntime.awrap(this.MakeAccessRequest({
                 libraryId: libraryId,
                 objectId: objectId,
@@ -320,7 +330,7 @@ function () {
                 noAuth: this.noAuth || noAuth
               }));
 
-            case 22:
+            case 26:
               _ref4 = _context3.sent;
               transactionHash = _ref4.transactionHash;
 
@@ -328,7 +338,7 @@ function () {
                 token.tx_id = transactionHash;
               }
 
-            case 25:
+            case 29:
               if (libraryId) {
                 token.qlib_id = libraryId;
               }
@@ -342,15 +352,15 @@ function () {
               }
 
               token = Utils.B64(JSON.stringify(token));
-              _context3.next = 31;
+              _context3.next = 35;
               return _regeneratorRuntime.awrap(this.Sign(Ethers.utils.keccak256(Ethers.utils.toUtf8Bytes(token))));
 
-            case 31:
+            case 35:
               signature = _context3.sent;
               multiSig = Utils.FormatSignature(signature);
               return _context3.abrupt("return", "".concat(token, ".").concat(Utils.B64(multiSig)));
 
-            case 34:
+            case 38:
             case "end":
               return _context3.stop();
           }

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/FrameClient.js

@@ -445,7 +445,7 @@ function () {
      * @returns {Array<string>} - List of ElvClient methods available to a FrameClient
      */
     value: function AllowedMethods() {
-      return ["AccessGroupManagers", "AccessGroupMembers", "AccessGroupOwner", "AccessInfo", "AccessRequest", "AccessType", "AddAccessGroupManager", "AddAccessGroupMember", "AddContentLibraryGroup", "AddContentObjectGroupPermission", "AddLibraryContentType", "AssetMetadata", "AvailableDRMs", "AvailableOfferings", "AwaitPending", "BitmovinPlayoutOptions", "BlockNumber", "CallBitcodeMethod", "CallContractMethod", "CallContractMethodAndWait", "ClearCache", "ClearStaticToken", "Collection", "CollectionTransactions", "ConfigUrl", "ContentLibraries", "ContentLibrary", "ContentLibraryGroupPermissions", "ContentLibraryOwner", "ContentObject", "ContentObjectAccessComplete", "ContentObjectGraph", "ContentObjectGroupPermissions", "ContentObjectImageUrl", "ContentObjectLibraryId", "ContentObjectMetadata", "ContentObjectOwner", "ContentObjectTenantId", "ContentObjectVersions", "ContentObjects", "ContentPart", "ContentParts", "ContentSpaceId", "ContentType", "ContentTypeOwner", "ContentTypes", "ContractAbi", "ContractEvents", "ContractMetadata", "ContractName", "CopyContentObject", "CreateABRMezzanine", "CreateAccessGroup", "CreateAndFinalizeContentObject", "CreateContentLibrary", "CreateContentObject", "CreateContentType", "CreateEncryptionConk", "CreateFileDirectories", "CreateFileUploadJob", "CreateLinks", "CreateNTPInstance", "CreatePart", "CreateProductionMaster", "CreateSignedToken", "CurrentAccountAddress", "CustomContractAddress", "Decrypt", "DecryptECIES", "DefaultKMSAddress", "DeleteAccessGroup", "DeleteContentLibrary", "DeleteContentObject", "DeleteContentVersion", "DeleteFiles", "DeleteMetadata", "DeleteNTPInstance", "DeletePart", "DeployContract", "Download", "DownloadEncrypted", "DownloadFile", "DownloadPart", "EditAndFinalizeContentObject", "EditContentObject", "Encrypt", "EncryptECIES", "EncryptionConk", "Events", "ExtractEventFromLogs", "ExtractValueFromEvent", "FabricUrl", "FileUrl", "FinalizeABRMezzanine", "FinalizeContentObject", "FinalizePart", "FinalizeStateChannelAccess", "FinalizeUploadJob", "FormatContractArguments", "GenerateStateChannelToken", "GetBalance", "InitializeAuthPolicy", "IssueNTPCode", "IssueSignedNTPCode", "LatestVersionHash", "LibraryContentTypes", "LinkAccessGroupToOauth", "LinkData", "LinkTarget", "LinkUrl", "ListAccessGroups", "ListFiles", "ListNTPInstances", "LROStatus", "MergeContractMetadata", "MergeMetadata", "MetadataAuth", "MintNFT", "NetworkInfo", "NodeId", "Nodes", "NTPInstance", "Permission", "PlayoutOptions", "PlayoutPathResolution", "ProduceMetadataLinks", "Proofs", "PublicRep", "PublishContentVersion", "QParts", "RedeemCode", "RemoveAccessGroupManager", "RemoveAccessGroupMember", "RemoveContentObjectGroupPermission", "RemoveContentLibraryGroup", "RemoveLibraryContentType", "Rep", "ReplaceContractMetadata", "ReplaceMetadata", "Request", "ResetRegion", "SendFunds", "SetAccessCharge", "SetAuth", "SetAuthContext", "SetAuthPolicy", "SetContentLibraryImage", "SetContentObjectImage", "SetCustomContentContract", "SetGroupPermission", "SetNodes", "SetOauthToken", "SetPolicyAuthorization", "SetSignerFromOauthToken", "SetStaticToken", "SetVisibility", "SetPermission", "StartABRMezzanineJobs", "SuspendNTPInstance", "UnlinkAccessGroupFromOauth", "UpdateContentObjectGraph", "UpdateNTPInstance", "UploadFileData", "UploadFiles", "UploadFilesFromS3", "UploadJobStatus", "UploadPart", "UploadPartChunk", "UploadStatus", "UseRegion", "VerifyContentObject", "Visibility"];
+      return ["AccessGroupManagers", "AccessGroupMembers", "AccessGroupOwner", "AccessInfo", "AccessRequest", "AccessType", "AddAccessGroupManager", "AddAccessGroupMember", "AddContentLibraryGroup", "AddContentObjectGroupPermission", "AddLibraryContentType", "AssetMetadata", "AvailableDRMs", "AvailableOfferings", "AwaitPending", "BitmovinPlayoutOptions", "BlockNumber", "CallBitcodeMethod", "CallContractMethod", "CallContractMethodAndWait", "ClearCache", "ClearStaticToken", "Collection", "CollectionTransactions", "ConfigUrl", "ContentLibraries", "ContentLibrary", "ContentLibraryGroupPermissions", "ContentLibraryOwner", "ContentObject", "ContentObjectAccessComplete", "ContentObjectGraph", "ContentObjectGroupPermissions", "ContentObjectImageUrl", "ContentObjectLibraryId", "ContentObjectMetadata", "ContentObjectOwner", "ContentObjectTenantId", "ContentObjectVersions", "ContentObjects", "ContentPart", "ContentParts", "ContentSpaceId", "ContentType", "ContentTypeOwner", "ContentTypes", "ContractAbi", "ContractEvents", "ContractMetadata", "ContractName", "CopyContentObject", "CreateABRMezzanine", "CreateAccessGroup", "CreateAndFinalizeContentObject", "CreateContentLibrary", "CreateContentObject", "CreateContentType", "CreateEncryptionConk", "CreateFileDirectories", "CreateFileUploadJob", "CreateLinks", "CreateNTPInstance", "CreateNonOwnerCap", "CreatePart", "CreateProductionMaster", "CreateSignedToken", "CurrentAccountAddress", "CustomContractAddress", "Decrypt", "DecryptECIES", "DefaultKMSAddress", "DeleteAccessGroup", "DeleteContentLibrary", "DeleteContentObject", "DeleteContentVersion", "DeleteFiles", "DeleteMetadata", "DeleteNTPInstance", "DeletePart", "DeployContract", "Download", "DownloadEncrypted", "DownloadFile", "DownloadPart", "EditAndFinalizeContentObject", "EditContentObject", "Encrypt", "EncryptECIES", "EncryptionConk", "Events", "ExtractEventFromLogs", "ExtractValueFromEvent", "FabricUrl", "FileUrl", "FinalizeABRMezzanine", "FinalizeContentObject", "FinalizePart", "FinalizeStateChannelAccess", "FinalizeUploadJob", "FormatContractArguments", "GenerateStateChannelToken", "GetBalance", "InitializeAuthPolicy", "IssueNTPCode", "IssueSignedNTPCode", "LatestVersionHash", "LibraryContentTypes", "LinkAccessGroupToOauth", "LinkData", "LinkTarget", "LinkUrl", "ListAccessGroups", "ListFiles", "ListNTPInstances", "LROStatus", "MergeContractMetadata", "MergeMetadata", "MetadataAuth", "MintNFT", "NetworkInfo", "NodeId", "Nodes", "NTPInstance", "Permission", "PlayoutOptions", "PlayoutPathResolution", "ProduceMetadataLinks", "Proofs", "PublicRep", "PublishContentVersion", "QParts", "RedeemCode", "RemoveAccessGroupManager", "RemoveAccessGroupMember", "RemoveContentObjectGroupPermission", "RemoveContentLibraryGroup", "RemoveLibraryContentType", "Rep", "ReplaceContractMetadata", "ReplaceMetadata", "Request", "ResetRegion", "SendFunds", "SetAccessCharge", "SetAuth", "SetAuthContext", "SetAuthPolicy", "SetContentLibraryImage", "SetContentObjectImage", "SetCustomContentContract", "SetGroupPermission", "SetNodes", "SetOauthToken", "SetPolicyAuthorization", "SetSignerFromOauthToken", "SetStaticToken", "SetVisibility", "SetPermission", "StartABRMezzanineJobs", "SuspendNTPInstance", "UnlinkAccessGroupFromOauth", "UpdateContentObjectGraph", "UpdateNTPInstance", "UploadFileData", "UploadFiles", "UploadFilesFromS3", "UploadJobStatus", "UploadPart", "UploadPartChunk", "UploadStatus", "UseRegion", "VerifyContentObject", "Visibility"];
     }
   }, {
     key: "AllowedUserProfileMethods",

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/dist/src/client/ContentAccess.js

@@ -944,9 +944,8 @@ exports.LibraryContentTypes = function _callee13(_ref8) {
  * @param {object=} filterOptions - Pagination, sorting and filtering options
  * @param {number=} filterOptions.start - Start index for pagination
  * @param {number=} filterOptions.limit - Max number of objects to return
- * @param {string=} filterOptions.cacheId - Cache ID corresponding a previous query
  * @param {(Array<string> | string)=} filterOptions.sort - Sort by the specified key(s)
- * @param {boolean=} filterOptions.sortDesc=false - Sort in descending order
+ * @param {boolean=} filterOptions.sortDesc - Sort in descending order
  * @param {(Array<string> | string)=} filterOptions.select - Include only the specified metadata keys (all must start with /public)
  * @param {(Array<object> | object)=} filterOptions.filter - Filter objects by metadata
  * @param {string=} filterOptions.filter.key - Key to filter on (must start with /public)
@@ -4259,7 +4258,7 @@ exports.CreateEncryptionConk = function _callee46(_ref39) {
 
 
 exports.EncryptionConk = function _callee47(_ref40) {
-  var libraryId, objectId, versionHash, writeToken, _ref40$download, download, owner, capKey, existingUserCap;
+  var libraryId, objectId, versionHash, writeToken, _ref40$download, download, owner, ownerCapKey, ownerCap, capKey, existingUserCap;
 
   return _regeneratorRuntime.async(function _callee47$(_context47) {
     while (1) {
@@ -4287,46 +4286,56 @@ exports.EncryptionConk = function _callee47(_ref40) {
 
         case 6:
           owner = _context47.sent;
+          ownerCapKey = "eluv.caps.iusr".concat(this.utils.AddressToHash(this.signer.address));
+          _context47.next = 10;
+          return _regeneratorRuntime.awrap(this.ContentObjectMetadata({
+            libraryId: libraryId,
+            objectId: objectId,
+            metadataSubtree: ownerCapKey
+          }));
 
-          if (this.utils.EqualAddress(owner, this.signer.address)) {
-            _context47.next = 17;
+        case 10:
+          ownerCap = _context47.sent;
+
+          if (!(!this.utils.EqualAddress(owner, this.signer.address) && !ownerCap)) {
+            _context47.next = 21;
             break;
           }
 
           if (!download) {
-            _context47.next = 14;
+            _context47.next = 18;
             break;
           }
 
-          _context47.next = 11;
+          _context47.next = 15;
           return _regeneratorRuntime.awrap(this.authClient.ReEncryptionConk({
             libraryId: libraryId,
             objectId: objectId,
             versionHash: versionHash
           }));
 
-        case 11:
+        case 15:
           return _context47.abrupt("return", _context47.sent);
 
-        case 14:
-          _context47.next = 16;
+        case 18:
+          _context47.next = 20;
           return _regeneratorRuntime.awrap(this.authClient.EncryptionConk({
             libraryId: libraryId,
             objectId: objectId,
             versionHash: versionHash
           }));
 
-        case 16:
+        case 20:
           return _context47.abrupt("return", _context47.sent);
 
-        case 17:
+        case 21:
           if (this.encryptionConks[objectId]) {
-            _context47.next = 34;
+            _context47.next = 38;
             break;
           }
 
           capKey = "eluv.caps.iusr".concat(this.utils.AddressToHash(this.signer.address));
-          _context47.next = 21;
+          _context47.next = 25;
           return _regeneratorRuntime.awrap(this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: objectId,
@@ -4336,29 +4345,29 @@ exports.EncryptionConk = function _callee47(_ref40) {
             metadataSubtree: capKey
           }));
 
-        case 21:
+        case 25:
           existingUserCap = _context47.sent;
 
           if (!existingUserCap) {
-            _context47.next = 28;
+            _context47.next = 32;
             break;
           }
 
-          _context47.next = 25;
+          _context47.next = 29;
           return _regeneratorRuntime.awrap(this.Crypto.DecryptCap(existingUserCap, this.signer.signingKey.privateKey));
 
-        case 25:
+        case 29:
           this.encryptionConks[objectId] = _context47.sent;
-          _context47.next = 34;
+          _context47.next = 38;
           break;
 
-        case 28:
+        case 32:
           if (!writeToken) {
-            _context47.next = 33;
+            _context47.next = 37;
             break;
           }
 
-          _context47.next = 31;
+          _context47.next = 35;
           return _regeneratorRuntime.awrap(this.CreateEncryptionConk({
             libraryId: libraryId,
             objectId: objectId,
@@ -4367,17 +4376,17 @@ exports.EncryptionConk = function _callee47(_ref40) {
             createKMSConk: false
           }));
 
-        case 31:
-          _context47.next = 34;
+        case 35:
+          _context47.next = 38;
           break;
 
-        case 33:
+        case 37:
           throw "No encryption conk present for " + objectId;
 
-        case 34:
+        case 38:
           return _context47.abrupt("return", this.encryptionConks[objectId]);
 
-        case 35:
+        case 39:
         case "end":
           return _context47.stop();
       }