@eluvio/elv-client-js 4.0.61 → 4.0.63

package/dist/src/walletClient/Utils.js

@@ -2,8 +2,8 @@ var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _slicedToArray = require("@babel/runtime/helpers/slicedToArray");
-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 Utils = require("../Utils");
 var RarityToPercentage = function RarityToPercentage(rarity) {
   if (!rarity) {

package/dist/src/walletClient/index.js

@@ -5,8 +5,8 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
-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");
@@ -1155,11 +1155,11 @@ var ElvWalletClient = /*#__PURE__*/function () {
               });
             case 3:
               marketplaceInfo = _context17.sent;
-              if (!(this.previewMarketplaceId && this.previewMarketplaceId === marketplaceInfo.marketplaceId)) {
+              if (!(this.previewMarketplaceId && Utils.EqualHash(this.previewMarketplaceId, marketplaceInfo.marketplaceId))) {
                 _context17.next = 6;
                 break;
               }
-              return _context17.abrupt("return", this.availableMarketplaces[marketplaceInfo.tenantSlug][marketplaceInfo.marketplaceSlug]["."].source);
+              return _context17.abrupt("return", this.previewMarketplaceHash);
             case 6:
               _context17.next = 8;
               return this.client.ContentObjectMetadata({
@@ -1206,15 +1206,36 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 delete this.cachedMarketplaces[marketplaceId];
               }
               if (this.cachedMarketplaces[marketplaceId]) {
-                _context19.next = 28;
+                _context19.next = 34;
                 break;
               }
-              _context19.next = 9;
+              if (!(this.previewMarketplaceId && Utils.EqualHash(marketplaceId, this.previewMarketplaceId))) {
+                _context19.next = 13;
+                break;
+              }
+              _context19.next = 10;
+              return this.client.ContentObjectMetadata({
+                versionHash: this.previewMarketplaceHash,
+                metadataSubtree: "/public/asset_metadata/info",
+                localizationSubtree: this.localization ? UrlJoin("public", "asset_metadata", "localizations", this.localization, "info") : undefined,
+                linkDepthLimit: 1,
+                resolveLinks: true,
+                resolveIgnoreErrors: true,
+                resolveIncludeSource: true,
+                produceLinkUrls: true,
+                authorizationToken: this.publicStaticToken
+              });
+            case 10:
+              marketplace = _context19.sent;
+              _context19.next = 16;
+              break;
+            case 13:
+              _context19.next = 15;
               return this.client.ContentObjectMetadata({
                 libraryId: this.mainSiteLibraryId,
                 objectId: this.mainSiteId,
                 metadataSubtree: UrlJoin("/public", "asset_metadata", "tenants", marketplaceInfo.tenantSlug, "marketplaces", marketplaceInfo.marketplaceSlug, "info"),
-                localizationSubtree: this.localization ? UrlJoin("public", "asset_metadata", "localizations", this.localization, "info") : "",
+                localizationSubtree: this.localization ? UrlJoin("/public", "asset_metadata", "tenants", marketplaceInfo.tenantSlug, "marketplaces", marketplaceInfo.marketplaceSlug, "localizations", this.localization, "info") : undefined,
                 linkDepthLimit: 1,
                 resolveLinks: true,
                 resolveIgnoreErrors: true,
@@ -1222,13 +1243,14 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 produceLinkUrls: true,
                 authorizationToken: this.publicStaticToken
               });
-            case 9:
+            case 15:
               marketplace = _context19.sent;
+            case 16:
               if (!marketplace.branding.use_tenant_styling) {
-                _context19.next = 17;
+                _context19.next = 23;
                 break;
               }
-              _context19.next = 13;
+              _context19.next = 19;
               return this.client.ContentObjectMetadata({
                 libraryId: this.mainSiteLibraryId,
                 objectId: this.mainSiteId,
@@ -1236,17 +1258,17 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 authorizationToken: this.publicStaticToken,
                 produceLinkUrls: true
               });
-            case 13:
+            case 19:
               _context19.t0 = _context19.sent;
               if (_context19.t0) {
-                _context19.next = 16;
+                _context19.next = 22;
                 break;
               }
               _context19.t0 = {};
-            case 16:
+            case 22:
               marketplace.tenantBranding = _context19.t0;
-            case 17:
-              _context19.next = 19;
+            case 23:
+              _context19.next = 25;
               return Promise.all(marketplace.items.map( /*#__PURE__*/function () {
                 var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(item, index) {
                   var authorizationToken;
@@ -1296,7 +1318,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   return _ref18.apply(this, arguments);
                 };
               }()));
-            case 19:
+            case 25:
               marketplace.items = _context19.sent;
               marketplace.collections = (marketplace.collections || []).map(function (collection, collectionIndex) {
                 return _objectSpread(_objectSpread({}, collection), {}, {
@@ -1332,9 +1354,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 } catch (error) {}
               });
               this.cachedMarketplaces[marketplaceId] = marketplace;
-            case 28:
+            case 34:
               return _context19.abrupt("return", this.cachedMarketplaces[marketplaceId]);
-            case 29:
+            case 35:
             case "end":
               return _context19.stop();
           }

package/package.json

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

package/src/Utils.js

@@ -444,6 +444,11 @@ const Utils = {
     return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
   },
 
+  FromHex: str => {
+    str = str.replace(/^0x/, "");
+    return Buffer.from(str, "hex").toString();
+  },
+
   B64: (str, encoding="utf-8") => {
     return Buffer.from(str, encoding).toString("base64");
   },
@@ -743,36 +748,47 @@ const Utils = {
     }
   },
 
-  LiveHLSJSSettings({lowLatency=false, ultraLowLatency=false}) {
+  HLSJSSettings({profile="default"}={}) {
     const isSafari =
       typeof window !== "undefined" &&
       typeof window.navigator !== "undefined" &&
       /^((?!chrome|android).)*safari/i.test(window.navigator.userAgent);
 
-    if(ultraLowLatency && !isSafari) {
+    const defaultSettings = {
+      "maxBufferHole": 2.2,
+      "nudgeOffset": 0.2,
+      "nudgeMaxRetry": 12,
+      "highBufferWatchdogPeriod": 1
+    };
+
+    if(!isSafari && ["ull", "ultraLowLatency"].includes(profile)) {
       return {
-        "capLevelToPlayerSize": false,
-        "enableWorker": true,
         "lowLatencyMode": true,
-        "maxBufferLength": 8,
-        "backBufferLength": 4,
         "liveSyncDuration": 4,
         "liveMaxLatencyDuration": 5,
         "liveDurationInfinity": false,
-        "highBufferWatchdogPeriod": 1
+        "maxBufferLength": 8,
+        "backBufferLength": 4,
+        ...defaultSettings
+      };
+    } else if(["ll", "lowLatency", "ull", "ultraLowLatency"].includes(profile)) {
+      return {
+        "lowLatencyMode": true,
+        "liveSyncDuration": 5,
+        "liveMaxLatencyDuration": isSafari ? 15 : 10,
+        "liveDurationInfinity": false,
+        "maxBufferLength": 5,
+        "backBufferLength": 5,
+        ...defaultSettings
       };
+    } else {
+      return defaultSettings;
     }
+  },
 
-    return {
-      "enableWorker": true,
-      "lowLatencyMode": true,
-      "maxBufferLength": 5,
-      "backBufferLength": 5,
-      "liveSyncDuration": 5,
-      "liveMaxLatencyDuration": !lowLatency || isSafari ? 15 : 10,
-      "liveDurationInfinity": false,
-      "highBufferWatchdogPeriod": 1
-    };
+  // Alias for HLSJSSettings
+  LiveHLSJSSettings({lowLatency=false, ultraLowLatency=false}) {
+    return Utils.HLSJSSettings({profile: ultraLowLatency ? "ull" : lowLatency ? "ll" : "default"});
   }
 };
 

package/src/Validation.js

@@ -88,3 +88,23 @@ exports.ValidateDate = (date) => {
 
   return new Date(date).getTime();
 };
+
+exports.ValidateUserWallet = async ({address, client}) => {
+  if(!address) {
+    throw Error("Address not specified");
+  } else if(!client) {
+    throw Error("Client not specified");
+  }
+
+  const walletAddress = await client.userProfileClient.UserWalletAddress({address});
+
+  if(!walletAddress) {
+    throw Error(`User address has no wallet: ${address}`);
+  }
+
+  const balance = await client.GetBalance({address});
+
+  if(balance < 0.1) {
+    throw Error(`User has no funds: ${address}`);
+  }
+};

package/src/client/AccessGroups.js

@@ -15,7 +15,8 @@ const {
   ValidatePresence,
   ValidateLibrary,
   ValidateObject,
-  ValidateAddress
+  ValidateAddress,
+  ValidateUserWallet
 } = require("../Validation");
 
 
@@ -137,22 +138,39 @@ exports.AccessGroupMembers = async function({contractAddress}) {
 
   this.Log(`Retrieving members for group ${contractAddress}`);
 
-  const length = (await this.CallContractMethod({
+  const hasMethod = await this.authClient.ContractHasMethod({
     contractAddress,
-    methodName: "membersNum"
-  })).toNumber();
-
-  return await Promise.all(
-    [...Array(length)].map(async (_, i) =>
-      this.utils.FormatAddress(
-        await this.CallContractMethod({
-          contractAddress,
-          methodName: "membersList",
-          methodArgs: [i]
-        })
+    methodName: "membersList"
+  });
+
+  if(hasMethod) {
+    const length = (await this.CallContractMethod({
+      contractAddress,
+      methodName: "membersNum"
+    })).toNumber();
+
+    return await Promise.all(
+      [...Array(length)].map(async (_, i) =>
+        this.utils.FormatAddress(
+          await this.CallContractMethod({
+            contractAddress,
+            methodName: "membersList",
+            methodArgs: [i]
+          })
+        )
       )
-    )
-  );
+    );
+  } else {
+    const response = this.utils.FromHex(
+      await this.CallContractMethod({
+        contractAddress,
+        methodName: "getMeta",
+        methodArgs: ["members"]
+      })
+    );
+
+    return response && JSON.parse(response) ? JSON.parse(response) : [];
+  }
 };
 
 /**
@@ -170,22 +188,39 @@ exports.AccessGroupManagers = async function({contractAddress}) {
 
   this.Log(`Retrieving managers for group ${contractAddress}`);
 
-  const length = (await this.CallContractMethod({
+  const hasMethod = await this.authClient.ContractHasMethod({
     contractAddress,
-    methodName: "managersNum"
-  })).toNumber();
-
-  return await Promise.all(
-    [...Array(length)].map(async (_, i) =>
-      this.utils.FormatAddress(
-        await this.CallContractMethod({
-          contractAddress,
-          methodName: "managersList",
-          methodArgs: [i]
-        })
+    methodName: "managersList"
+  });
+
+  if(hasMethod) {
+    const length = (await this.CallContractMethod({
+      contractAddress,
+      methodName: "managersNum"
+    })).toNumber();
+
+    return await Promise.all(
+      [...Array(length)].map(async (_, i) =>
+        this.utils.FormatAddress(
+          await this.CallContractMethod({
+            contractAddress,
+            methodName: "managersList",
+            methodArgs: [i]
+          })
+        )
       )
-    )
-  );
+    );
+  } else {
+    const response = this.utils.FromHex(
+      await this.CallContractMethod({
+        contractAddress,
+        methodName: "getMeta",
+        methodArgs: ["managers"]
+      })
+    );
+
+    return response && JSON.parse(response) ? JSON.parse(response) : [];
+  }
 };
 
 /**
@@ -202,12 +237,13 @@ exports.AccessGroupManagers = async function({contractAddress}) {
  *
  * @returns {Promise<string>} - Contract address of created access group
  */
-exports.CreateAccessGroup = async function({name, description, metadata={}}={}) {
+exports.CreateAccessGroup = async function({name, description, metadata={}, visibility=1}={}) {
   this.Log(`Creating access group: ${name || ""} ${description || ""}`);
   let { contractAddress } = await this.authClient.CreateAccessGroup();
   contractAddress = this.utils.FormatAddress(contractAddress);
 
   const objectId = this.utils.AddressToObjectId(contractAddress);
+  const tenantId = await this.userProfileClient.TenantId();
 
   this.Log(`Access group: ${contractAddress} ${objectId}`);
 
@@ -216,19 +252,47 @@ exports.CreateAccessGroup = async function({name, description, metadata={}}={})
     objectId: objectId
   });
 
+  const groupMetadata = {
+    public: {
+      name,
+      description
+    },
+    name,
+    description,
+    ...metadata
+  };
+
+  if(tenantId) {
+    let tenantAdminGroupAddress = this.utils.HashToAddress(tenantId);
+
+    await this.AddContentObjectGroupPermission({
+      objectId,
+      groupAddress: tenantAdminGroupAddress,
+      permission: "manage"
+    });
+
+    await this.ReplaceContractMetadata({
+      contractAddress,
+      metadataKey: "_tenantId",
+      metadata: tenantId
+    });
+
+    groupMetadata["tenantId"] = tenantId;
+  } else {
+    console.warn("No tenant ID associated with current tenant.");
+  }
+
   await this.ReplaceMetadata({
     libraryId: this.contentSpaceLibraryId,
     objectId,
     writeToken: editResponse.write_token,
-    metadata: {
-      public: {
-        name,
-        description
-      },
-      name,
-      description,
-      ...metadata
-    }
+    metadata: groupMetadata
+  });
+
+  await this.CallContractMethodAndWait({
+    contractAddress,
+    methodName: "setVisibility",
+    methodArgs: [visibility],
   });
 
   await this.FinalizeContentObject({
@@ -332,13 +396,39 @@ exports.AccessGroupMembershipMethod = async function({
 exports.AddAccessGroupMember = async function({contractAddress, memberAddress}) {
   contractAddress = ValidateAddress(contractAddress);
   memberAddress = ValidateAddress(memberAddress);
+  await ValidateUserWallet({address: memberAddress, client: this});
 
-  return await this.AccessGroupMembershipMethod({
+  const hasMethod = await this.authClient.ContractHasMethod({
+    contractAddress,
+    methodName: "membersList"
+  });
+
+  const response = await this.AccessGroupMembershipMethod({
     contractAddress,
     memberAddress,
     methodName: "grantAccess",
     eventName: "MemberAdded"
   });
+
+  if(!hasMethod) {
+    let memberList = await this.AccessGroupMembers({
+      contractAddress
+    });
+
+    memberList.push(memberAddress);
+
+    memberList = memberList.filter((value, index, self) => {
+      return self.indexOf(value) === index;
+    });
+
+    await this.ReplaceContractMetadata({
+      contractAddress,
+      metadataKey: "members",
+      metadata: memberList
+    });
+  }
+
+  return response;
 };
 
 /**
@@ -357,12 +447,33 @@ exports.RemoveAccessGroupMember = async function({contractAddress, memberAddress
   contractAddress = ValidateAddress(contractAddress);
   memberAddress = ValidateAddress(memberAddress);
 
-  return await this.AccessGroupMembershipMethod({
+  const hasMethod = await this.authClient.ContractHasMethod({
+    contractAddress,
+    methodName: "membersList"
+  });
+
+  const response = await this.AccessGroupMembershipMethod({
     contractAddress,
     memberAddress,
     methodName: "revokeAccess",
     eventName: "MemberRevoked"
   });
+
+  if(!hasMethod) {
+    let memberList = await this.AccessGroupMembers({
+      contractAddress
+    });
+
+    memberList = memberList.filter(element => element !== memberAddress);
+
+    return await this.ReplaceContractMetadata({
+      contractAddress,
+      metadataKey: "members",
+      metadata: memberList
+    });
+  }
+
+  return response;
 };
 
 /**
@@ -380,13 +491,39 @@ exports.RemoveAccessGroupMember = async function({contractAddress, memberAddress
 exports.AddAccessGroupManager = async function({contractAddress, memberAddress}) {
   contractAddress = ValidateAddress(contractAddress);
   memberAddress = ValidateAddress(memberAddress);
+  await ValidateUserWallet({address: memberAddress, client: this});
 
-  return await this.AccessGroupMembershipMethod({
+  const hasMethod = await this.authClient.ContractHasMethod({
+    contractAddress,
+    methodName: "membersList"
+  });
+
+  const response = await this.AccessGroupMembershipMethod({
     contractAddress,
     memberAddress,
     methodName: "grantManagerAccess",
     eventName: "ManagerAccessGranted"
   });
+
+  if(!hasMethod) {
+    let managerList = await this.AccessGroupManagers({
+      contractAddress
+    });
+
+    managerList.push(memberAddress);
+
+    managerList = managerList.filter((value, index, self) => {
+      return self.indexOf(value) === index;
+    });
+
+    await this.ReplaceContractMetadata({
+      contractAddress,
+      metadataKey: "managers",
+      metadata: managerList
+    });
+  }
+
+  return response;
 };
 
 /**
@@ -405,12 +542,33 @@ exports.RemoveAccessGroupManager = async function({contractAddress, memberAddres
   contractAddress = ValidateAddress(contractAddress);
   memberAddress = ValidateAddress(memberAddress);
 
-  return await this.AccessGroupMembershipMethod({
+  const hasMethod = await this.authClient.ContractHasMethod({
+    contractAddress,
+    methodName: "managersList"
+  });
+
+  const response = await this.AccessGroupMembershipMethod({
     contractAddress,
     memberAddress,
     methodName: "revokeManagerAccess",
     eventName: "ManagerAccessRevoked"
   });
+
+  if(!hasMethod) {
+    let managerList = await this.AccessGroupManagers({
+      contractAddress
+    });
+
+    managerList = managerList.filter(element => element !== memberAddress);
+
+    return await this.ReplaceContractMetadata({
+      contractAddress,
+      metadataKey: "managers",
+      metadata: managerList
+    });
+  }
+
+  return response;
 };
 
 /**

package/src/client/LiveConf.js

@@ -161,57 +161,50 @@ class LiveConf {
   }
 
   calcSegDuration({sourceTimescale}) {
-
     let videoStream = this.getStreamDataForCodecType("video");
     let frameRate = videoStream.frame_rate;
 
-    let seg ={};
+    let seg = {};
+    seg.audio = 29.76 * 48000;
+
     switch(frameRate) {
       case "24":
         seg.video = 30 * sourceTimescale;
-        seg.audio = 30 * 48000;
         seg.keyint = 48;
         seg.duration = "30";
         break;
       case "25":
         seg.video = 30 * sourceTimescale;
-        seg.audio = 30 * 48000;
         seg.keyint = 50;
         seg.duration = "30";
         break;
       case "30":
         seg.video = 30 * sourceTimescale;
-        seg.audio = 30 * 48000;
         seg.keyint = 60;
         seg.duration = "30";
         break;
       case "30000/1001":
         seg.video = 30.03 * sourceTimescale;
-        seg.audio = 29.76 * 48000;
         seg.keyint = 60;
         seg.duration = "30.03";
         break;
       case "48":
         seg.video = 30 * sourceTimescale;
-        seg.audio = 30 * 48000;
         seg.keyint = 96;
         seg.duration = "30";
         break;
       case "50":
         seg.video = 30 * sourceTimescale;
-        seg.audio = 30 * 48000;
         seg.keyint = 100;
         seg.duration = "30";
         break;
       case "60":
         seg.video = 30 * sourceTimescale;
-        seg.audio = 30 * 48000;
         seg.keyint = 120;
         seg.duration = "30";
         break;
       case "60000/1001":
         seg.video = 30.03 * sourceTimescale;
-        seg.audio = 29.76 * 48000;
         seg.keyint = 120;
         seg.duration = "30.03";
         break;