@eluvio/elv-client-js 3.2.28 → 3.2.30

package/dist/src/FrameClient.js

@@ -24,6 +24,11 @@ var Utils = require("./Utils");
 
 var permissionLevels = require("./client/ContentAccess").permissionLevels;
 
+var _require = require("./LogMessage"),
+    LogMessage = _require.LogMessage;
+
+var Crypto = require("./Crypto");
+
 var FrameClient = /*#__PURE__*/function () {
   "use strict";
 
@@ -75,7 +80,9 @@ var FrameClient = /*#__PURE__*/function () {
 
     this.target = target;
     this.timeout = timeout;
-    this.utils = Utils; // Dynamically defined methods defined in AllowedMethods
+    this.utils = Utils;
+    this.Crypto = Crypto;
+    this.Crypto.ElvCrypto(); // Dynamically defined methods defined in AllowedMethods
 
     var _iterator = _createForOfIteratorHelper(this.AllowedMethods()),
         _step;
@@ -202,6 +209,12 @@ var FrameClient = /*#__PURE__*/function () {
 
 
   _createClass(FrameClient, [{
+    key: "Log",
+    value: function Log(message) {
+      var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      LogMessage(this, message, error);
+    }
+  }, {
     key: "PassRequest",
     value: function () {
       var _PassRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref4) {
@@ -476,7 +489,10 @@ var FrameClient = /*#__PURE__*/function () {
      * @returns {Array<string>} - List of ElvClient methods available to a FrameClient
      */
     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", "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"];
+      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",*/
+      //Override
+      "UploadFilesFromS3", "UploadJobStatus", "UploadPart", "UploadPartChunk", "UploadStatus", "UseRegion", "VerifyContentObject", "Visibility"];
     }
   }, {
     key: "AllowedUserProfileMethods",
@@ -503,4 +519,8 @@ var FrameClient = /*#__PURE__*/function () {
   return FrameClient;
 }();
 
+var _require2 = require("./client/Files"),
+    UploadFiles = _require2.UploadFiles;
+
+FrameClient.prototype.UploadFiles = UploadFiles;
 exports.FrameClient = FrameClient;

package/dist/src/walletClient/ClientMethods.js

@@ -2037,17 +2037,18 @@ exports.ListingAttributes = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regene
  * @methodGroup Purchase
  * @namedParams
  * @param {Object} marketplaceParams - Parameters of the marketplace
- * @param {string} sku - The SKU of the item to claime
+ * @param {string} sku - The SKU of the item to claim
+ * @param {string=} email - Email address of the user. If specified, this will bind the user to the tenant of the specified marketplace
  */
 
 exports.ClaimItem = /*#__PURE__*/function () {
   var _ref63 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee32(_ref62) {
-    var marketplaceParams, sku, marketplaceInfo;
+    var marketplaceParams, sku, email, marketplaceInfo;
     return _regeneratorRuntime.wrap(function _callee32$(_context32) {
       while (1) {
         switch (_context32.prev = _context32.next) {
           case 0:
-            marketplaceParams = _ref62.marketplaceParams, sku = _ref62.sku;
+            marketplaceParams = _ref62.marketplaceParams, sku = _ref62.sku, email = _ref62.email;
             _context32.next = 3;
             return this.MarketplaceInfo({
               marketplaceParams: marketplaceParams
@@ -2062,7 +2063,8 @@ exports.ClaimItem = /*#__PURE__*/function () {
               body: {
                 op: "nft-claim",
                 sid: marketplaceInfo.marketplaceId,
-                sku: sku
+                sku: sku,
+                email: email
               },
               headers: {
                 Authorization: "Bearer ".concat(this.AuthToken())

package/dist/src/walletClient/index.js

@@ -36,6 +36,12 @@ var Ethers = require("ethers");
 
 var inBrowser = typeof window !== "undefined";
 var embedded = inBrowser && window.top !== window.self;
+var localStorageAvailable = false;
+
+try {
+  typeof localStorage !== "undefined" && localStorage.getItem("test");
+  localStorageAvailable = true; // eslint-disable-next-line no-empty
+} catch (error) {}
 /**
  * Use the <a href="#.Initialize">Initialize</a> method to initialize a new client.
  *
@@ -43,6 +49,7 @@ var embedded = inBrowser && window.top !== window.self;
  * See the Modules section on the sidebar for all client methods unrelated to login and authorization
  */
 
+
 var ElvWalletClient = /*#__PURE__*/function () {
   "use strict";
 
@@ -115,6 +122,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * @param {string} mode=production - Environment to use (`production`, `staging`)
      * @param {Object=} marketplaceParams - Marketplace parameters
      * @param {boolean=} storeAuthToken=true - If specified, auth tokens will be stored in localstorage (if available)
+     * @param {Object=} client - Existing instance of ElvClient to use instead of initializing a new one
      *
      * @returns {Promise<ElvWalletClient>}
      */
@@ -532,7 +540,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
       this.loggedIn = false;
       this.cachedMarketplaces = {}; // Delete saved auth token
 
-      if (typeof localStorage !== "undefined") {
+      if (localStorageAvailable) {
         try {
           localStorage.removeItem("__elv-token-".concat(this.network)); // eslint-disable-next-line no-empty
         } catch (error) {}
@@ -891,7 +899,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
       this.cachedMarketplaces = {};
       var token = this.ClientAuthToken();
 
-      if (this.storeAuthToken && typeof localStorage !== "undefined") {
+      if (this.storeAuthToken && localStorageAvailable) {
         try {
           localStorage.setItem("__elv-token-".concat(this.network), token); // eslint-disable-next-line no-empty
         } catch (error) {}
@@ -1809,13 +1817,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
     key: "Initialize",
     value: function () {
       var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref18) {
-        var _ref18$appId, appId, _ref18$network, network, _ref18$mode, mode, marketplaceParams, previewMarketplaceId, _ref18$storeAuthToken, storeAuthToken, _ref19, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, client, previewMarketplaceHash, walletClient, url, savedToken;
+        var client, _ref18$appId, appId, _ref18$network, network, _ref18$mode, mode, marketplaceParams, previewMarketplaceId, _ref18$storeAuthToken, storeAuthToken, _ref19, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken;
 
         return _regeneratorRuntime.wrap(function _callee18$(_context18) {
           while (1) {
             switch (_context18.prev = _context18.next) {
               case 0:
-                _ref18$appId = _ref18.appId, appId = _ref18$appId === void 0 ? "general" : _ref18$appId, _ref18$network = _ref18.network, network = _ref18$network === void 0 ? "main" : _ref18$network, _ref18$mode = _ref18.mode, mode = _ref18$mode === void 0 ? "production" : _ref18$mode, marketplaceParams = _ref18.marketplaceParams, previewMarketplaceId = _ref18.previewMarketplaceId, _ref18$storeAuthToken = _ref18.storeAuthToken, storeAuthToken = _ref18$storeAuthToken === void 0 ? true : _ref18$storeAuthToken;
+                client = _ref18.client, _ref18$appId = _ref18.appId, appId = _ref18$appId === void 0 ? "general" : _ref18$appId, _ref18$network = _ref18.network, network = _ref18$network === void 0 ? "main" : _ref18$network, _ref18$mode = _ref18.mode, mode = _ref18$mode === void 0 ? "production" : _ref18$mode, marketplaceParams = _ref18.marketplaceParams, previewMarketplaceId = _ref18.previewMarketplaceId, _ref18$storeAuthToken = _ref18.storeAuthToken, storeAuthToken = _ref18$storeAuthToken === void 0 ? true : _ref18$storeAuthToken;
                 _ref19 = marketplaceParams || {}, tenantSlug = _ref19.tenantSlug, marketplaceSlug = _ref19.marketplaceSlug, marketplaceId = _ref19.marketplaceId, marketplaceHash = _ref19.marketplaceHash;
 
                 if (Configuration[network]) {
@@ -1834,30 +1842,37 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 throw Error("ElvWalletClient: Invalid mode ".concat(mode));
 
               case 8:
-                _context18.next = 10;
+                if (client) {
+                  _context18.next = 12;
+                  break;
+                }
+
+                _context18.next = 11;
                 return ElvClient.FromNetworkName({
                   networkName: network,
                   assumeV3: true
                 });
 
-              case 10:
+              case 11:
                 client = _context18.sent;
+
+              case 12:
                 previewMarketplaceHash = previewMarketplaceId;
 
                 if (!(previewMarketplaceHash && !previewMarketplaceHash.startsWith("hq__"))) {
-                  _context18.next = 16;
+                  _context18.next = 17;
                   break;
                 }
 
-                _context18.next = 15;
+                _context18.next = 16;
                 return client.LatestVersionHash({
                   objectId: previewMarketplaceId
                 });
 
-              case 15:
+              case 16:
                 previewMarketplaceHash = _context18.sent;
 
-              case 16:
+              case 17:
                 walletClient = new ElvWalletClient({
                   appId: appId,
                   client: client,
@@ -1874,69 +1889,69 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 });
 
                 if (!(inBrowser && window.location && window.location.href)) {
-                  _context18.next = 36;
+                  _context18.next = 37;
                   break;
                 }
 
                 url = new URL(window.location.href);
 
                 if (!url.searchParams.get("elvToken")) {
-                  _context18.next = 26;
+                  _context18.next = 27;
                   break;
                 }
 
-                _context18.next = 22;
+                _context18.next = 23;
                 return walletClient.Authenticate({
                   token: url.searchParams.get("elvToken")
                 });
 
-              case 22:
+              case 23:
                 url.searchParams["delete"]("elvToken");
                 window.history.replaceState("", "", url);
-                _context18.next = 36;
+                _context18.next = 37;
                 break;
 
-              case 26:
-                if (!(storeAuthToken && typeof localStorage !== "undefined")) {
-                  _context18.next = 36;
+              case 27:
+                if (!(storeAuthToken && localStorageAvailable)) {
+                  _context18.next = 37;
                   break;
                 }
 
-                _context18.prev = 27;
+                _context18.prev = 28;
                 // Load saved auth token
                 savedToken = localStorage.getItem("__elv-token-".concat(network));
 
                 if (!savedToken) {
-                  _context18.next = 32;
+                  _context18.next = 33;
                   break;
                 }
 
-                _context18.next = 32;
+                _context18.next = 33;
                 return walletClient.Authenticate({
                   token: savedToken
                 });
 
-              case 32:
-                _context18.next = 36;
+              case 33:
+                _context18.next = 37;
                 break;
 
-              case 34:
-                _context18.prev = 34;
-                _context18.t0 = _context18["catch"](27);
+              case 35:
+                _context18.prev = 35;
+                _context18.t0 = _context18["catch"](28);
 
-              case 36:
-                _context18.next = 38;
+              case 37:
+                _context18.next = 39;
                 return walletClient.LoadAvailableMarketplaces();
 
-              case 38:
+              case 39:
                 return _context18.abrupt("return", walletClient);
 
-              case 39:
+              case 40:
               case "end":
                 return _context18.stop();
             }
           }
-        }, _callee18, null, [[27, 34]]);
+        }, _callee18, null, [[28, 35]]);
       }));
 
       function Initialize(_x21) {

package/package.json

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

package/src/FrameClient.js

@@ -1,8 +1,14 @@
 const Id = require("./Id");
 const Utils = require("./Utils");
 const permissionLevels = require("./client/ContentAccess").permissionLevels;
+const {LogMessage} = require("./LogMessage");
+const Crypto = require("./Crypto");
 
 class FrameClient {
+  Log(message, error = false) {
+    LogMessage(this, message, error);
+  }
+
   /**
    * FrameClient is a client that looks to the user like an ElvClient, but works by passing messages
    * to another frame with an actual ElvClient instead of making the calls itself.
@@ -45,6 +51,10 @@ class FrameClient {
 
     this.utils = Utils;
 
+    this.Crypto = Crypto;
+    this.Crypto.ElvCrypto();
+
+
     // Dynamically defined methods defined in AllowedMethods
     for(const methodName of this.AllowedMethods()){
       this[methodName] = async (args) => {
@@ -195,7 +205,6 @@ class FrameClient {
       methodListener = async (event) => {
         try {
           const message = event.data;
-
           if(message.type !== "ElvFrameResponse" || message.requestId !== requestId) {
             return;
           }
@@ -431,7 +440,7 @@ class FrameClient {
       "UpdateContentObjectGraph",
       "UpdateNTPInstance",
       "UploadFileData",
-      "UploadFiles",
+      /*"UploadFiles",*/ //Override
       "UploadFilesFromS3",
       "UploadJobStatus",
       "UploadPart",
@@ -462,4 +471,7 @@ class FrameClient {
   }
 }
 
+const { UploadFiles } = require("./client/Files");
+FrameClient.prototype.UploadFiles=UploadFiles;
+
 exports.FrameClient = FrameClient;