@eluvio/elv-client-js 4.0.105 → 4.0.107

package/dist/src/client/Contracts.js

@@ -935,21 +935,9 @@ exports.SendFunds = /*#__PURE__*/function () {
     return _ref36.apply(this, arguments);
   };
 }();
-
-/**
- * Retrieve the ID of the tenant contract for the specified object
- *
- * @methodGroup Tenant
- * @namedParams
- * @param {string=} contractAddress - The address of the object
- * @param {string=} objectId - The ID of the object
- * @param {string=} versionHash - A version hash of the object
- *
- * @returns {Promise<string|undefined>}
- */
-exports.TenantContractId = /*#__PURE__*/function () {
+var GetObjectIDAndContractAddress = /*#__PURE__*/function () {
   var _ref38 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref37) {
-    var contractAddress, objectId, versionHash, hasGetMetaMethod, tenantContractId, libraryId;
+    var contractAddress, objectId, versionHash;
     return _regeneratorRuntime.wrap(function _callee18$(_context18) {
       while (1) switch (_context18.prev = _context18.next) {
         case 0:
@@ -984,57 +972,190 @@ exports.TenantContractId = /*#__PURE__*/function () {
         case 17:
           throw Error("contractAddress or objectId or versionHash not specified");
         case 18:
-          _context18.next = 20;
+          return _context18.abrupt("return", {
+            contractAddress: contractAddress,
+            objectId: objectId
+          });
+        case 19:
+        case "end":
+          return _context18.stop();
+      }
+    }, _callee18, this);
+  }));
+  return function GetObjectIDAndContractAddress(_x16) {
+    return _ref38.apply(this, arguments);
+  };
+}();
+
+/**
+ * Retrieve the ID of the tenant admin group set for the specified object
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} contractAddress - The address of the object
+ * @param {string=} objectId - The ID of the object
+ * @param {string=} versionHash - A version hash of the object
+ *
+ * @returns {Promise<string|undefined>}
+ */
+exports.TenantId = /*#__PURE__*/function () {
+  var _ref40 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19(_ref39) {
+    var contractAddress, objectId, versionHash, tenantId, hasGetMetaMethod, libraryId;
+    return _regeneratorRuntime.wrap(function _callee19$(_context19) {
+      while (1) switch (_context19.prev = _context19.next) {
+        case 0:
+          contractAddress = _ref39.contractAddress, objectId = _ref39.objectId, versionHash = _ref39.versionHash;
+          _context19.next = 3;
+          return GetObjectIDAndContractAddress({
+            contractAddress: contractAddress,
+            objectId: objectId,
+            versionHash: versionHash
+          });
+        case 3:
+          objectInfo = _context19.sent;
+          contractAddress = objectInfo.contractAddress;
+          objectId = objectInfo.objectId;
+          _context19.prev = 6;
+          _context19.next = 9;
           return this.authClient.ContractHasMethod({
             contractAddress: contractAddress,
             methodName: "getMeta"
           });
+        case 9:
+          hasGetMetaMethod = _context19.sent;
+          if (!hasGetMetaMethod) {
+            _context19.next = 14;
+            break;
+          }
+          _context19.next = 13;
+          return this.ContractMetadata({
+            contractAddress: contractAddress,
+            metadataKey: "_tenantId"
+          });
+        case 13:
+          tenantId = _context19.sent;
+        case 14:
+          if (!(tenantId === undefined)) {
+            _context19.next = 21;
+            break;
+          }
+          _context19.next = 17;
+          return this.ContentObjectLibraryId({
+            objectId: objectId
+          });
+        case 17:
+          libraryId = _context19.sent;
+          _context19.next = 20;
+          return this.ContentObjectMetadata({
+            libraryId: libraryId,
+            objectId: objectId,
+            metadataSubtree: "tenantId"
+          });
         case 20:
-          hasGetMetaMethod = _context18.sent;
+          tenantId = _context19.sent;
+        case 21:
+          return _context19.abrupt("return", tenantId);
+        case 24:
+          _context19.prev = 24;
+          _context19.t0 = _context19["catch"](6);
+          return _context19.abrupt("return", "");
+        case 27:
+        case "end":
+          return _context19.stop();
+      }
+    }, _callee19, this, [[6, 24]]);
+  }));
+  return function (_x17) {
+    return _ref40.apply(this, arguments);
+  };
+}();
+
+/**
+ * Retrieve the ID of the tenant contract for the specified object
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} contractAddress - The address of the object
+ * @param {string=} objectId - The ID of the object
+ * @param {string=} versionHash - A version hash of the object
+ *
+ * @returns {Promise<string|undefined>}
+ */
+exports.TenantContractId = /*#__PURE__*/function () {
+  var _ref42 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20(_ref41) {
+    var contractAddress, objectId, versionHash, hasGetMetaMethod, _tenantContractId, libraryId;
+    return _regeneratorRuntime.wrap(function _callee20$(_context20) {
+      while (1) switch (_context20.prev = _context20.next) {
+        case 0:
+          contractAddress = _ref41.contractAddress, objectId = _ref41.objectId, versionHash = _ref41.versionHash;
+          _context20.next = 3;
+          return GetObjectIDAndContractAddress({
+            contractAddress: contractAddress,
+            objectId: objectId,
+            versionHash: versionHash
+          });
+        case 3:
+          objectInfo = _context20.sent;
+          contractAddress = objectInfo.contractAddress;
+          objectId = objectInfo.objectId;
+          _context20.prev = 6;
+          _context20.next = 9;
+          return this.authClient.ContractHasMethod({
+            contractAddress: contractAddress,
+            methodName: "getMeta"
+          });
+        case 9:
+          hasGetMetaMethod = _context20.sent;
           if (!hasGetMetaMethod) {
-            _context18.next = 27;
+            _context20.next = 14;
             break;
           }
-          _context18.next = 24;
+          _context20.next = 13;
           return this.ContractMetadata({
             contractAddress: contractAddress,
             metadataKey: "_ELV_TENANT_ID"
           });
-        case 24:
-          tenantContractId = _context18.sent;
-          if (!(tenantContractId !== "")) {
-            _context18.next = 27;
+        case 13:
+          _tenantContractId = _context20.sent;
+        case 14:
+          if (!(_tenantContractId === undefined)) {
+            _context20.next = 21;
             break;
           }
-          return _context18.abrupt("return", tenantContractId);
-        case 27:
-          _context18.next = 29;
+          _context20.next = 17;
           return this.ContentObjectLibraryId({
             objectId: objectId
           });
-        case 29:
-          libraryId = _context18.sent;
-          _context18.next = 32;
+        case 17:
+          libraryId = _context20.sent;
+          _context20.next = 20;
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: objectId,
             metadataSubtree: "tenantContractId"
           });
-        case 32:
-          return _context18.abrupt("return", _context18.sent);
-        case 33:
+        case 20:
+          _tenantContractId = _context20.sent;
+        case 21:
+          return _context20.abrupt("return", _tenantContractId);
+        case 24:
+          _context20.prev = 24;
+          _context20.t0 = _context20["catch"](6);
+          return _context20.abrupt("return", "");
+        case 27:
         case "end":
-          return _context18.stop();
+          return _context20.stop();
       }
-    }, _callee18, this);
+    }, _callee20, this, [[6, 24]]);
   }));
-  return function (_x16) {
-    return _ref38.apply(this, arguments);
+  return function (_x18) {
+    return _ref42.apply(this, arguments);
   };
 }();
 
 /**
- * Set the tenant contract ID for the specified object
+ * Set the tenant contract ID and tenant admin group ID for the specified object
+ * when tenant admin group ID is provided
  *
  * @methodGroup Tenant
  * @namedParams
@@ -1042,125 +1163,205 @@ exports.TenantContractId = /*#__PURE__*/function () {
  * @param {string=} objectId - The ID of the object
  * @param {string=} versionHash - A version hash of the object
  * @param {string} tenantContractId - The tenant contract ID to set
+ * @param {string} tenantId - The tenant ID to set
  *
  * @returns {Promise<{tenantId: (undefined|string), tenantContractId}>}
  */
-exports.SetTenantContractId = /*#__PURE__*/function () {
-  var _ref40 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19(_ref39) {
-    var contractAddress, objectId, versionHash, tenantContractId, tenantAddress, version, tenantAdminGroupAddress, hasPutMetaMethod, libraryId, editRequest;
-    return _regeneratorRuntime.wrap(function _callee19$(_context19) {
-      while (1) switch (_context19.prev = _context19.next) {
+exports.SetTenantId = /*#__PURE__*/function () {
+  var _ref44 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(_ref43) {
+    var contractAddress, objectId, versionHash, tenantId, objectVersion, version;
+    return _regeneratorRuntime.wrap(function _callee21$(_context21) {
+      while (1) switch (_context21.prev = _context21.next) {
         case 0:
-          contractAddress = _ref39.contractAddress, objectId = _ref39.objectId, versionHash = _ref39.versionHash, tenantContractId = _ref39.tenantContractId;
-          if (!contractAddress) {
-            _context19.next = 6;
+          contractAddress = _ref43.contractAddress, objectId = _ref43.objectId, versionHash = _ref43.versionHash, tenantId = _ref43.tenantId;
+          _context21.next = 3;
+          return GetObjectIDAndContractAddress({
+            contractAddress: contractAddress,
+            objectId: objectId,
+            versionHash: versionHash
+          });
+        case 3:
+          objectInfo = _context21.sent;
+          contractAddress = objectInfo.contractAddress;
+          objectId = objectInfo.objectId;
+          _context21.next = 8;
+          return this.authClient.AccessType(objectId);
+        case 8:
+          objectVersion = _context21.sent;
+          if (!(objectVersion !== this.authClient.ACCESS_TYPES.GROUP && objectVersion !== this.authClient.ACCESS_TYPES.WALLET && objectVersion !== this.authClient.ACCESS_TYPES.LIBRARY && objectVersion !== this.authClient.ACCESS_TYPES.TYPE && objectVersion !== this.authClient.ACCESS_TYPES.TENANT)) {
+            _context21.next = 11;
             break;
           }
-          ValidateAddress(contractAddress);
-          objectId = Utils.AddressToObjectId(contractAddress);
-          _context19.next = 18;
-          break;
-        case 6:
-          if (!versionHash) {
-            _context19.next = 12;
+          throw Error("Invalid object ID: ".concat(objectId, ", \n    applicable only for wallet,group, library or content_type object."));
+        case 11:
+          ValidateObject(tenantId);
+          if (!(!tenantId.startsWith("iten") || !Utils.ValidHash(tenantId))) {
+            _context21.next = 14;
             break;
           }
-          ValidateVersion(versionHash);
-          objectId = this.utils.DecodeVersionHash(versionHash).objectId;
-          contractAddress = Utils.HashToAddress(objectId);
-          _context19.next = 18;
-          break;
-        case 12:
-          if (!objectId) {
-            _context19.next = 17;
+          throw Error("Invalid tenant ID: ".concat(tenantId));
+        case 14:
+          _context21.next = 16;
+          return this.authClient.AccessType(tenantId);
+        case 16:
+          version = _context21.sent;
+          if (!(version !== this.authClient.ACCESS_TYPES.GROUP)) {
+            _context21.next = 19;
             break;
           }
-          ValidateObject(objectId);
-          contractAddress = Utils.HashToAddress(objectId);
-          _context19.next = 18;
-          break;
-        case 17:
-          throw Error("contractAddress or objectId or versionHash not specified");
-        case 18:
+          throw Error("Invalid tenant ID: " + tenantId);
+        case 19:
+          _context21.next = 21;
+          return this.TenantContractId({
+            objectId: tenantId
+          });
+        case 21:
+          tenantContractId = _context21.sent;
+          if (!tenantContractId) {
+            _context21.next = 28;
+            break;
+          }
+          _context21.next = 25;
+          return this.SetTenantContractId({
+            contractAddress: contractAddress,
+            objectId: objectId,
+            versionHash: versionHash,
+            tenantContractId: tenantContractId
+          });
+        case 25:
+          return _context21.abrupt("return", _context21.sent);
+        case 28:
+          throw Error("Invalid tenantId: tenant contract id not found");
+        case 29:
+        case "end":
+          return _context21.stop();
+      }
+    }, _callee21, this);
+  }));
+  return function (_x19) {
+    return _ref44.apply(this, arguments);
+  };
+}();
+
+/**
+ * Set the tenant contract ID and tenant admin group ID for the specified object
+ * when tenant contract ID is provided
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} contractAddress - The address of the object
+ * @param {string=} objectId - The ID of the object
+ * @param {string=} versionHash - A version hash of the object
+ * @param {string} tenantContractId - The tenant contract ID to set
+ *
+ * @returns {Promise<{tenantId: (undefined|string), tenantContractId}>}
+ */
+exports.SetTenantContractId = /*#__PURE__*/function () {
+  var _ref46 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee22(_ref45) {
+    var contractAddress, objectId, versionHash, tenantContractId, objectVersion, tenantAddress, version, tenantAdminGroupAddress, hasPutMetaMethod, libraryId, editRequest;
+    return _regeneratorRuntime.wrap(function _callee22$(_context22) {
+      while (1) switch (_context22.prev = _context22.next) {
+        case 0:
+          contractAddress = _ref45.contractAddress, objectId = _ref45.objectId, versionHash = _ref45.versionHash, tenantContractId = _ref45.tenantContractId;
+          _context22.next = 3;
+          return GetObjectIDAndContractAddress({
+            contractAddress: contractAddress,
+            objectId: objectId,
+            versionHash: versionHash
+          });
+        case 3:
+          objectInfo = _context22.sent;
+          contractAddress = objectInfo.contractAddress;
+          objectId = objectInfo.objectId;
+          _context22.next = 8;
+          return this.authClient.AccessType(objectId);
+        case 8:
+          objectVersion = _context22.sent;
+          if (!(objectVersion !== this.authClient.ACCESS_TYPES.GROUP && objectVersion !== this.authClient.ACCESS_TYPES.WALLET && objectVersion !== this.authClient.ACCESS_TYPES.LIBRARY && objectVersion !== this.authClient.ACCESS_TYPES.TYPE && objectVersion !== this.authClient.ACCESS_TYPES.TENANT)) {
+            _context22.next = 11;
+            break;
+          }
+          throw Error("Invalid object ID: ".concat(objectId, ", \n    applicable only for wallet,group, library or content_type object."));
+        case 11:
           ValidateObject(tenantContractId);
           if (!(tenantContractId && (!tenantContractId.startsWith("iten") || !Utils.ValidHash(tenantContractId)))) {
-            _context19.next = 21;
+            _context22.next = 14;
             break;
           }
           throw Error("Invalid tenant ID: ".concat(tenantContractId));
-        case 21:
+        case 14:
           tenantAddress = Utils.HashToAddress(tenantContractId);
-          _context19.next = 24;
+          _context22.next = 17;
           return this.authClient.AccessType(tenantContractId);
-        case 24:
-          version = _context19.sent;
+        case 17:
+          version = _context22.sent;
           if (!(version !== this.authClient.ACCESS_TYPES.TENANT)) {
-            _context19.next = 27;
+            _context22.next = 20;
             break;
           }
           throw Error("Invalid tenant ID: " + tenantContractId);
-        case 27:
-          _context19.next = 29;
+        case 20:
+          _context22.next = 22;
           return this.CallContractMethod({
             contractAddress: tenantAddress,
             methodName: "groupsMapping",
             methodArgs: ["tenant_admin", 0],
             formatArguments: true
           });
-        case 29:
-          tenantAdminGroupAddress = _context19.sent;
-          _context19.next = 32;
+        case 22:
+          tenantAdminGroupAddress = _context22.sent;
+          _context22.next = 25;
           return this.authClient.ContractHasMethod({
             contractAddress: contractAddress,
             methodName: "putMeta"
           });
-        case 32:
-          hasPutMetaMethod = _context19.sent;
+        case 25:
+          hasPutMetaMethod = _context22.sent;
           if (!hasPutMetaMethod) {
-            _context19.next = 44;
+            _context22.next = 37;
             break;
           }
-          _context19.next = 36;
+          _context22.next = 29;
           return this.ReplaceContractMetadata({
             contractAddress: contractAddress,
             metadataKey: "_ELV_TENANT_ID",
             metadata: tenantContractId
           });
-        case 36:
+        case 29:
           if (!tenantAdminGroupAddress) {
-            _context19.next = 41;
+            _context22.next = 34;
             break;
           }
-          _context19.next = 39;
+          _context22.next = 32;
           return this.ReplaceContractMetadata({
             contractAddress: contractAddress,
             metadataKey: "_tenantId",
             metadata: "iten".concat(Utils.AddressToHash(tenantAdminGroupAddress))
           });
-        case 39:
-          _context19.next = 42;
+        case 32:
+          _context22.next = 35;
           break;
-        case 41:
+        case 34:
           // eslint-disable-next-line no-console
           console.warn("No tenant ID associated with current tenant.");
-        case 42:
-          _context19.next = 54;
+        case 35:
+          _context22.next = 47;
           break;
-        case 44:
-          _context19.next = 46;
+        case 37:
+          _context22.next = 39;
           return this.ContentObjectLibraryId({
             objectId: objectId
           });
-        case 46:
-          libraryId = _context19.sent;
-          _context19.next = 49;
+        case 39:
+          libraryId = _context22.sent;
+          _context22.next = 42;
           return this.EditContentObject({
             libraryId: libraryId,
             objectId: objectId
           });
-        case 49:
-          editRequest = _context19.sent;
-          _context19.next = 52;
+        case 42:
+          editRequest = _context22.sent;
+          _context22.next = 45;
           return this.MergeMetadata({
             libraryId: libraryId,
             objectId: objectId,
@@ -1170,26 +1371,150 @@ exports.SetTenantContractId = /*#__PURE__*/function () {
               tenantId: !tenantAdminGroupAddress ? undefined : "iten".concat(Utils.AddressToHash(tenantAdminGroupAddress))
             }
           });
-        case 52:
-          _context19.next = 54;
+        case 45:
+          _context22.next = 47;
           return this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: editRequest.write_token,
             commitMessage: "set tenant_contract_id"
           });
-        case 54:
-          return _context19.abrupt("return", {
+        case 47:
+          return _context22.abrupt("return", {
             tenantContractId: tenantContractId,
             tenantId: !tenantAdminGroupAddress ? undefined : "iten".concat(Utils.AddressToHash(tenantAdminGroupAddress))
           });
-        case 55:
+        case 48:
         case "end":
-          return _context19.stop();
+          return _context22.stop();
       }
-    }, _callee19, this);
+    }, _callee22, this);
   }));
-  return function (_x17) {
-    return _ref40.apply(this, arguments);
+  return function (_x20) {
+    return _ref46.apply(this, arguments);
+  };
+}();
+
+/**
+ * Remove the tenant contract ID and tenant admin group ID for the specified object
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} contractAddress - The address of the object
+ * @param {string=} objectId - The ID of the object
+ * @param {string=} versionHash - A version hash of the object
+ *
+ * @returns {Promise<void>}
+ */
+exports.ResetTenantId = /*#__PURE__*/function () {
+  var _ref48 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee23(_ref47) {
+    var contractAddress, objectId, versionHash, objectVersion, tenantContractId, tenantId, hasPutMetaMethod, libraryId, editRequest;
+    return _regeneratorRuntime.wrap(function _callee23$(_context23) {
+      while (1) switch (_context23.prev = _context23.next) {
+        case 0:
+          contractAddress = _ref47.contractAddress, objectId = _ref47.objectId, versionHash = _ref47.versionHash;
+          _context23.next = 3;
+          return GetObjectIDAndContractAddress({
+            contractAddress: contractAddress,
+            objectId: objectId,
+            versionHash: versionHash
+          });
+        case 3:
+          objectInfo = _context23.sent;
+          contractAddress = objectInfo.contractAddress;
+          objectId = objectInfo.objectId;
+          _context23.next = 8;
+          return this.authClient.AccessType(objectId);
+        case 8:
+          objectVersion = _context23.sent;
+          if (!(objectVersion !== this.authClient.ACCESS_TYPES.GROUP && objectVersion !== this.authClient.ACCESS_TYPES.WALLET && objectVersion !== this.authClient.ACCESS_TYPES.LIBRARY && objectVersion !== this.authClient.ACCESS_TYPES.TYPE && objectVersion !== this.authClient.ACCESS_TYPES.TENANT)) {
+            _context23.next = 11;
+            break;
+          }
+          throw Error("Invalid object ID: ".concat(objectId, ", \n    applicable only for wallet,group, library or content_type object."));
+        case 11:
+          tenantContractId = this.TenantContractId({
+            objectId: objectId
+          });
+          tenantId = this.TenantId({
+            objectId: objectId
+          });
+          if (!(tenantContractId || tenantId)) {
+            _context23.next = 36;
+            break;
+          }
+          _context23.next = 16;
+          return this.authClient.ContractHasMethod({
+            contractAddress: contractAddress,
+            methodName: "putMeta"
+          });
+        case 16:
+          hasPutMetaMethod = _context23.sent;
+          if (!hasPutMetaMethod) {
+            _context23.next = 24;
+            break;
+          }
+          _context23.next = 20;
+          return this.ReplaceContractMetadata({
+            contractAddress: contractAddress,
+            metadataKey: "_ELV_TENANT_ID",
+            metadata: ""
+          });
+        case 20:
+          _context23.next = 22;
+          return this.ReplaceContractMetadata({
+            contractAddress: contractAddress,
+            metadataKey: "_tenantId",
+            metadata: ""
+          });
+        case 22:
+          _context23.next = 34;
+          break;
+        case 24:
+          _context23.next = 26;
+          return this.ContentObjectLibraryId({
+            objectId: objectId
+          });
+        case 26:
+          libraryId = _context23.sent;
+          _context23.next = 29;
+          return this.EditContentObject({
+            libraryId: libraryId,
+            objectId: objectId
+          });
+        case 29:
+          editRequest = _context23.sent;
+          _context23.next = 32;
+          return this.MergeMetadata({
+            libraryId: libraryId,
+            objectId: objectId,
+            writeToken: editRequest.write_token,
+            metadata: {
+              tenantContractId: undefined,
+              tenantId: undefined
+            }
+          });
+        case 32:
+          _context23.next = 34;
+          return this.FinalizeContentObject({
+            libraryId: libraryId,
+            objectId: objectId,
+            writeToken: editRequest.write_token,
+            commitMessage: "remove tenant_contract_id"
+          });
+        case 34:
+          _context23.next = 37;
+          break;
+        case 36:
+          // eslint-disable-next-line no-console
+          console.warn("No tenant ID associated with current tenant.");
+        case 37:
+        case "end":
+          return _context23.stop();
+      }
+    }, _callee23, this);
+  }));
+  return function (_x21) {
+    return _ref48.apply(this, arguments);
   };
 }();

package/dist/src/client/LiveConf.js

@@ -516,7 +516,7 @@ var LiveConf = /*#__PURE__*/function () {
         elem.media_type = 1;
         elem.stream_name = "video";
         elem.stream_index = 0;
-        elem.representation = "videovideo_" + videoStream.width + "x" + videoStream.height + "_h264@" + elem.bit_rate;
+        elem.representation = "videovideo_" + elem.width + "x" + elem.height + "_h264@" + elem.bit_rate;
         conf.live_recording.recording_config.recording_params.ladder_specs.push(elem);
       }
       // Currently the recording bitrate is the top bitrate of the ladder (it will be configurable separately in the future)