@eluvio/elv-client-js 4.0.120 → 4.0.121

package/dist/src/walletClient/index.js

@@ -7,8 +7,8 @@ var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
 var _excluded = ["code", "address", "type", "authToken", "expiresAt"];
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var _require = require("../ElvClient"),
   ElvClient = _require.ElvClient;
 var Configuration = require("./Configuration");
@@ -79,7 +79,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     this.utils = client.utils;
     this.ForbiddenMethods = ElvWalletClient.ForbiddenMethods;
   }
-  _createClass(ElvWalletClient, [{
+  return _createClass(ElvWalletClient, [{
     key: "Log",
     value: function Log(message) {
       var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -136,7 +136,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "PersonalSign",
-    value: function () {
+    value: (function () {
       var _PersonalSign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
         var message, parameters, url;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -265,7 +265,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _PersonalSign.apply(this, arguments);
       }
       return PersonalSign;
-    }()
+    }())
   }, {
     key: "LogInURL",
     value: function () {
@@ -344,7 +344,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "LogIn",
-    value: function () {
+    value: (function () {
       var _LogIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref5) {
         var _this = this;
         var _ref5$method, method, provider, _ref5$mode, mode, callbackUrl, marketplaceParams, _ref5$clearLogin, clearLogin, callback, loginUrl;
@@ -463,9 +463,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @methodGroup Login
      */
+    )
   }, {
     key: "LogOut",
-    value: function () {
+    value: (function () {
       var _LogOut = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
         return _regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
@@ -508,7 +509,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _LogOut.apply(this, arguments);
       }
       return LogOut;
-    }()
+    }())
   }, {
     key: "TokenStatus",
     value: function () {
@@ -548,7 +549,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Authenticate",
-    value: function () {
+    value: (function () {
       var _Authenticate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref7) {
         var token, decodedToken;
         return _regeneratorRuntime.wrap(function _callee10$(_context10) {
@@ -614,9 +615,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * - signingToken - Identical to `authToken`, but also includes the ability to perform arbitrary signatures with the custodial wallet. This token should be protected and should not be
      * shared with third parties.
      */
+    )
   }, {
     key: "AuthenticateOAuth",
-    value: function () {
+    value: (function () {
       var _AuthenticateOAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref8) {
         var idToken, tenantId, email, signerURIs, _ref8$shareEmail, shareEmail, _ref8$extraData, extraData, nonce, _ref8$createRemoteTok, createRemoteToken, _ref8$force, force, tokenDuration, fabricToken, expiresAt, tokenResponse, address, decodedToken;
         return _regeneratorRuntime.wrap(function _callee11$(_context11) {
@@ -744,9 +746,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * @returns {Promise<string>} - Returns an authorization token that can be used to initialize the client using <a href="#Authenticate">Authenticate</a>.
      * Save this token to avoid having to reauthenticate. This token expires after 24 hours.
      */
+    )
   }, {
     key: "AuthenticateExternalWallet",
-    value: function () {
+    value: (function () {
       var _AuthenticateExternalWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref9) {
         var _this2 = this;
         var address, _ref9$tokenDuration, tokenDuration, _ref9$walletName, walletName, Sign, expiresAt, fabricToken;
@@ -815,6 +818,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @returns {string} - The client auth token
      */
+    )
   }, {
     key: "ClientAuthToken",
     value: function ClientAuthToken() {
@@ -1085,11 +1089,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
       var _LoadAvailableMarketplaces = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18() {
         var _this4 = this;
         var forceReload,
-          metadata,
-          marketplaceOrder,
-          previewTenantSlug,
-          previewMarketplaceSlug,
-          previewMarketplaceMetadata,
+          marketplaces,
           availableMarketplaces,
           availableMarketplacesById,
           _args18 = arguments;
@@ -1103,124 +1103,27 @@ var ElvWalletClient = /*#__PURE__*/function () {
               }
               return _context18.abrupt("return");
             case 3:
-              _context18.next = 5;
-              return this.client.ContentObjectMetadata({
-                libraryId: this.mainSiteLibraryId,
-                objectId: this.mainSiteId,
-                metadataSubtree: "public/asset_metadata",
-                resolveLinks: true,
-                linkDepthLimit: 2,
-                resolveIncludeSource: true,
-                resolveIgnoreErrors: true,
-                produceLinkUrls: true,
-                authorizationToken: this.publicStaticToken,
-                noAuth: true,
-                select: ["info/marketplace_order", "tenants/*/.", "tenants/*/info/branding/show", "tenants/*/info/branding/name", "tenants/*/marketplaces/*/.", "tenants/*/marketplaces/*/info/tenant_id", "tenants/*/marketplaces/*/info/tenant_name", "tenants/*/marketplaces/*/info/branding/show", "tenants/*/marketplaces/*/info/branding/name"]
-              });
-            case 5:
-              metadata = _context18.sent;
-              marketplaceOrder = ((metadata || {}).info || {}).marketplace_order || [];
-              metadata = (metadata || {}).tenants || {};
-
-              // If preview marketplace is specified, load it appropriately
-              if (!this.previewMarketplaceId) {
-                _context18.next = 23;
-                break;
-              }
-              previewTenantSlug = "PREVIEW";
-              Object.keys(metadata || {}).forEach(function (tenantSlug) {
-                return Object.keys(metadata[tenantSlug].marketplaces || {}).forEach(function (marketplaceSlug) {
-                  var versionHash = metadata[tenantSlug].marketplaces[marketplaceSlug]["."].source;
-                  var objectId = _this4.utils.DecodeVersionHash(versionHash).objectId;
-                  if (objectId === _this4.previewMarketplaceId) {
-                    // Marketplace exists in site meta
-                    previewTenantSlug = tenantSlug;
-                    previewMarketplaceSlug = marketplaceSlug;
-
-                    // Deployed marketplace is same as preview marketplace
-                    if (versionHash === _this4.previewMarketplaceHash) {
-                      previewMarketplaceMetadata = metadata[tenantSlug].marketplaces[marketplaceSlug];
-                    }
-                  }
-                });
-              });
-
-              // Marketplace not present in branch, or preview version is different - Load metadata directly
-              if (previewMarketplaceMetadata) {
-                _context18.next = 16;
-                break;
-              }
-              _context18.next = 14;
-              return this.client.ContentObjectMetadata({
-                versionHash: this.previewMarketplaceHash,
-                metadataSubtree: "public/asset_metadata",
-                produceLinkUrls: true,
-                authorizationToken: this.publicStaticToken,
-                noAuth: true,
-                select: ["slug", "info/tenant_id", "info/tenant_name", "info/branding"],
-                remove: ["info/branding/custom_css"]
-              });
-            case 14:
-              previewMarketplaceMetadata = _context18.sent;
-              if (!previewMarketplaceSlug) {
-                previewMarketplaceSlug = previewMarketplaceMetadata.slug;
-              }
-            case 16:
-              previewMarketplaceMetadata["."] = {
-                source: this.previewMarketplaceHash
-              };
-              previewMarketplaceMetadata.info["."] = {
-                source: this.previewMarketplaceHash
-              };
-              previewMarketplaceMetadata.info.branding.preview = true;
-              previewMarketplaceMetadata.info.branding.show = true;
-              metadata[previewTenantSlug] = metadata[previewTenantSlug] || {};
-              metadata[previewTenantSlug].marketplaces = metadata[previewTenantSlug].marketplaces || {};
-              metadata[previewTenantSlug].marketplaces[previewMarketplaceSlug] = previewMarketplaceMetadata;
-            case 23:
+              marketplaces = this.topLevelInfo.marketplaces;
               availableMarketplaces = _objectSpread({}, this.availableMarketplaces || {});
               availableMarketplacesById = _objectSpread({}, this.availableMarketplacesById || {});
-              Object.keys(metadata || {}).forEach(function (tenantSlug) {
-                try {
-                  availableMarketplaces[tenantSlug] = metadata[tenantSlug]["."] ? {
-                    versionHash: metadata[tenantSlug]["."].source
-                  } : {};
-                  Object.keys(metadata[tenantSlug].marketplaces || {}).forEach(function (marketplaceSlug) {
-                    try {
-                      var versionHash = metadata[tenantSlug].marketplaces[marketplaceSlug]["."].source;
-                      var objectId = _this4.utils.DecodeVersionHash(versionHash).objectId;
-                      availableMarketplaces[tenantSlug][marketplaceSlug] = _objectSpread(_objectSpread({}, metadata[tenantSlug].marketplaces[marketplaceSlug].info || {}), {}, {
-                        tenantName: metadata[tenantSlug].marketplaces[marketplaceSlug].info.tenant_name,
-                        tenantId: metadata[tenantSlug].marketplaces[marketplaceSlug].info.tenant_id,
-                        tenantSlug: tenantSlug,
-                        marketplaceSlug: marketplaceSlug,
-                        marketplaceId: objectId,
-                        marketplaceHash: versionHash,
-                        tenantBranding: (metadata[tenantSlug].info || {}).branding || {},
-                        order: marketplaceOrder.findIndex(function (slug) {
-                          return slug === marketplaceSlug;
-                        })
-                      });
-                      availableMarketplacesById[objectId] = availableMarketplaces[tenantSlug][marketplaceSlug];
-                      _this4.marketplaceHashes[objectId] = versionHash;
-
-                      // Fill out selected marketplace info
-                      if (_this4.selectedMarketplaceInfo) {
-                        if (_this4.selectedMarketplaceInfo.tenantSlug === tenantSlug && _this4.selectedMarketplaceInfo.marketplaceSlug === marketplaceSlug || _this4.selectedMarketplaceInfo.marketplaceId === objectId) {
-                          _this4.selectedMarketplaceInfo = availableMarketplaces[tenantSlug][marketplaceSlug];
-                        }
-                      }
-                    } catch (error) {
-                      _this4.Log("Eluvio Wallet Client: Unable to load info for marketplace ".concat(tenantSlug, "/").concat(marketplaceSlug), true);
-                    }
-                  });
-                } catch (error) {
-                  _this4.Log("Eluvio Wallet Client: Failed to load tenant info ".concat(tenantSlug), true, error);
-                }
+              marketplaces.map(function (marketplaceInfo) {
+                var marketplaceId = Utils.DecodeVersionHash(marketplaceInfo.source_hash).objectId;
+                var marketplaceSlug = marketplaceInfo.slug || marketplaceInfo.name;
+                availableMarketplaces[marketplaceInfo.tenant_slug] = availableMarketplaces[marketplaceInfo.tenant_slug] || {};
+                availableMarketplaces[marketplaceInfo.tenant_slug][marketplaceSlug] = _objectSpread(_objectSpread({}, marketplaceInfo), {}, {
+                  tenantName: marketplaceInfo.tenant_slug,
+                  tenantSlug: marketplaceInfo.tenant_slug,
+                  tenantId: marketplaceInfo.tenant_id,
+                  marketplaceSlug: marketplaceSlug,
+                  marketplaceId: marketplaceId,
+                  marketplaceHash: marketplaceInfo.source_hash
+                });
+                availableMarketplacesById[marketplaceId] = availableMarketplaces[marketplaceInfo.tenant_slug][marketplaceSlug];
+                _this4.marketplaceHashes[marketplaceId] = marketplaceInfo.source_hash;
               });
               this.availableMarketplaces = availableMarketplaces;
               this.availableMarketplacesById = availableMarketplacesById;
-            case 28:
+            case 9:
             case "end":
               return _context18.stop();
           }
@@ -1830,6 +1733,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   offerId = status.op.split(":")[3];
                 }
                 if (op === "nft-claim-entitlement") {
+                  // eslint-disable-next-line no-unused-vars
                   var _status$op$split3 = status.op.split(":"),
                     _status$op$split4 = _slicedToArray(_status$op$split3, 4),
                     _op = _status$op$split4[0],
@@ -1978,7 +1882,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Initialize",
-    value: function () {
+    value: (function () {
       var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref24) {
         var client, _ref24$appId, appId, _ref24$network, network, _ref24$mode, mode, localization, marketplaceParams, previewMarketplaceId, _ref24$storeAuthToken, storeAuthToken, _ref24$skipMarketplac, skipMarketplaceLoad, _ref25, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken;
         return _regeneratorRuntime.wrap(function _callee25$(_context25) {
@@ -2078,15 +1982,24 @@ var ElvWalletClient = /*#__PURE__*/function () {
               _context25.prev = 35;
               _context25.t0 = _context25["catch"](28);
             case 37:
+              _context25.next = 39;
+              return client.utils.ResponseToJson(client.MakeAuthServiceRequest({
+                path: "/as/mw/toplevel",
+                queryParams: {
+                  env: mode
+                }
+              }));
+            case 39:
+              walletClient.topLevelInfo = _context25.sent;
               if (skipMarketplaceLoad) {
-                _context25.next = 40;
+                _context25.next = 43;
                 break;
               }
-              _context25.next = 40;
+              _context25.next = 43;
               return walletClient.LoadAvailableMarketplaces();
-            case 40:
+            case 43:
               return _context25.abrupt("return", walletClient);
-            case 41:
+            case 44:
             case "end":
               return _context25.stop();
           }
@@ -2096,9 +2009,8 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _Initialize.apply(this, arguments);
       }
       return Initialize;
-    }()
+    }())
   }]);
-  return ElvWalletClient;
 }();
 Object.assign(ElvWalletClient.prototype, require("./ClientMethods"));
 Object.assign(ElvWalletClient.prototype, require("./Profile"));

package/package.json

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

package/src/client/LiveStream.js

@@ -1358,10 +1358,19 @@ exports.StreamInsertion = async function({name, insertionTime, sinceStart=false,
  * @param {string} name - Object ID or name of the live stream object
  * @param {Object=} customSettings - Additional options to customize configuration settings
  * @param {Object=} probeMetadata - Metadata for the probe. If not specified, a new probe will be configured
+ * @param {string=} writeToken - Write token of the draft
+ * @param {boolean=} finalize - If enabled, target object will be finalized after configuring
+ *
  * @return {Promise<Object>} - The status response for the stream
  *
  */
-exports.StreamConfig = async function({name, customSettings={}, probeMetadata}) {
+exports.StreamConfig = async function({
+  name,
+  customSettings={},
+  probeMetadata,
+  writeToken,
+  finalize=true
+}) {
   let objectId = name;
   let status = {name};
 
@@ -1444,11 +1453,13 @@ exports.StreamConfig = async function({name, customSettings={}, probeMetadata})
   });
 
   // Store live recording config into the stream object
-  let e = await this.EditContentObject({
-    libraryId,
-    objectId: objectId
-  });
-  let writeToken = e.write_token;
+  if(!writeToken) {
+    let e = await this.EditContentObject({
+      libraryId,
+      objectId: objectId
+    });
+    writeToken = e.write_token;
+  }
 
   await this.ReplaceMetadata({
     libraryId,
@@ -1466,12 +1477,14 @@ exports.StreamConfig = async function({name, customSettings={}, probeMetadata})
     metadata: probe
   });
 
-  status.fin = await this.FinalizeContentObject({
-    libraryId,
-    objectId,
-    writeToken,
-    commitMessage: "Apply live stream configuration"
-  });
+  if(finalize) {
+    status.fin = await this.FinalizeContentObject({
+      libraryId,
+      objectId,
+      writeToken,
+      commitMessage: "Apply live stream configuration"
+    });
+  }
 
   return status;
 };