@eluvio/elv-client-js 4.0.49 → 4.0.51

package/package.json

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

package/src/UserProfileClient.js

@@ -482,6 +482,53 @@ await client.userProfileClient.UserMetadata()
     return this.tenantContractId;
   }
 
+  /**
+   * Set the current user's tenant contract.
+   *
+   * Note: This method is not accessible to applications. Eluvio core will drop the request.
+   *
+   * @namedParams
+   * @param {string} tenantContractId - The tenant contract ID in hash format
+   * @param {string} address - The group address to use in the hash if id is not provided
+   */
+  async SetTenantContractId({tenantContractId, address}) {
+    if(tenantContractId && (!tenantContractId.startsWith("iten") || !Utils.ValidHash(tenantContractId))) {
+      throw Error(`Invalid tenant ID: ${tenantContractId}`);
+    }
+
+    if(address) {
+      if(!Utils.ValidAddress(address)) {
+        throw Error(`Invalid address: ${address}`);
+      }
+
+      tenantContractId = `iten${Utils.AddressToHash(address)}`;
+    }
+
+    try {
+      const version = await this.client.AccessType({id: tenantContractId});
+
+      if(version !== this.client.authClient.ACCESS_TYPES.TENANT) {
+        throw Error("Invalid tenant ID: " + tenantContractId);
+      }
+    } catch(error) {
+      throw Error("Invalid tenant ID: " + tenantContractId);
+    }
+
+    const tenantAdminGroupAddress = await this.client.CallContractMethod({
+      contractAddress: address || Utils.HashToAddress(tenantContractId),
+      methodName: "groupsMapping",
+      methodArgs : ["tenant_admin", 0],
+      formatArguments: true,
+    });
+
+    await this.MergeUserMetadata({
+      metadata: {
+        tenantContractId,
+        tenantId: !tenantAdminGroupAddress ? undefined : `iten${Utils.AddressToHash(tenantAdminGroupAddress)}`
+      }
+    });
+  }
+
   /**
    * Get the URL of the current user's profile image
    *

package/src/client/ContentAccess.js

@@ -2140,23 +2140,23 @@ exports.ContentObjectImageUrl = async function({libraryId, objectId, versionHash
  * @param {string} versionHash - Version hash of the object
  * @param {number} duration - Time until the token expires, in milliseconds (1 day = 24 * 60 * 60 * 1000 = 86400000)
  * @param {Object} options - Additional video/player options
- * autoplay - If enabled, video will autoplay
- * capLevelToPlayerSize - Caps video quality to player size
- * clipEnd - End time for the video
- * clipStart - Start time for the video
- * controls - Sets the player control visibility. Values: browserDefault | autoHide | show | hide | hideWithVolume. Defaults to autoHide
- * description - Sets the page description
- * directLink - If enabled, sets direct link
- * linkPath - Video link path
- * loop - If enabled, video will loop
- * muted - Mutes the player
- * offerings - Offerings to play, as an array
- * posterUrl - URL of the player poster image
- * protocols - Video protocols, as an array
- * showShare - Show social media share buttons
- * showTitle - Shows the video title, which is set from the title option (if set) or the metadata
- * title - Sets the page title
- * viewRecordKey - Contains record key
+  - `autoplay` - If enabled, video will autoplay. Note that videos block autoplay of videos with audio by default
+  - `capLevelToPlayerSize` - Caps video quality to player size
+  - `clipEnd` - End time for the video
+  - `clipStart` - Start time for the video
+  - `controls` - Sets the player control visibility. Values: browserDefault | autoHide | show | hide | hideWithVolume. Defaults to autoHide
+  - `description` - Sets the page description
+  - `directLink` - If enabled, sets direct link
+  - `linkPath` - Video link path
+  - `loop` - If enabled, video will loop
+  - `muted` - Mutes the player
+  - `offerings` - Offerings to play, as an array
+  - `posterUrl` - URL of the player poster image
+  - `protocols` - Video protocols, as an array
+  - `showShare` - Show social media share buttons
+  - `showTitle` - Shows the video title, which is set from the title option (if set) or the metadata
+  - `title` - Sets the page title
+  - `viewRecordKey` - Contains record key
  *
  * @returns {Promise<string>} - Will return an embed URL
  */

package/src/client/LiveStream.js

@@ -1122,108 +1122,105 @@ exports.StreamConfig = async function({name}) {
   let conf = await this.LoadConf({name});
   let status = {name};
 
-  try {
-    let libraryId = await this.ContentObjectLibraryId({objectId: conf.objectId});
-    status.library_id = libraryId;
-    status.object_id = conf.objectId;
+  let libraryId = await this.ContentObjectLibraryId({objectId: conf.objectId});
+  status.library_id = libraryId;
+  status.object_id = conf.objectId;
 
-    let mainMeta = await this.ContentObjectMetadata({
-      libraryId: libraryId,
-      objectId: conf.objectId
-    });
+  let mainMeta = await this.ContentObjectMetadata({
+    libraryId: libraryId,
+    objectId: conf.objectId
+  });
 
-    let userConfig = mainMeta.live_recording_config;
-    status.user_config = userConfig;
+  let userConfig = mainMeta.live_recording_config;
+  status.user_config = userConfig;
 
-    // Get node URI from user config
-    const hostName = userConfig.url.replace("udp://", "").replace("rtmp://", "").split(":")[0];
-    const streamUrl = new URL(userConfig.url);
+  // Get node URI from user config
+  const hostName = userConfig.url.replace("udp://", "").replace("rtmp://", "").split(":")[0];
+  const streamUrl = new URL(userConfig.url);
 
-    console.log("Retrieving nodes...");
-    let nodes = await this.SpaceNodes({matchEndpoint: hostName});
-    if(nodes.length < 1) {
-      status.error = "No node matching stream URL " + streamUrl.href;
-      return status;
-    }
-    const node = nodes[0];
-    status.node = node;
-
-    let endpoint = node.endpoints[0];
-    this.SetNodes({fabricURIs: [endpoint]});
-
-    // Probe the stream
-    let probe = {};
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => {
-      controller.abort();
-    }, 60 * 1000); // milliseconds
-    try {
-
-      let probeUrl = await this.Rep({
-        libraryId,
-        objectId: conf.objectId,
-        rep: "probe"
-      });
-
-      probe = await this.utils.ResponseToJson(
-        await HttpClient.Fetch(probeUrl, {
-          body: JSON.stringify({
-            "filename": streamUrl.href,
-            "listen": true
-          }),
-          method: "POST",
-          signal: controller.signal
-        })
-      );
+  console.log("Retrieving nodes...");
+  let nodes = await this.SpaceNodes({matchEndpoint: hostName});
+  if(nodes.length < 1) {
+    status.error = "No node matching stream URL " + streamUrl.href;
+    return status;
+  }
+  const node = nodes[0];
+  status.node = node;
+
+  let endpoint = node.endpoints[0];
+  this.SetNodes({fabricURIs: [endpoint]});
+
+  // Probe the stream
+  let probe = {};
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => {
+    controller.abort();
+  }, 60 * 1000); // milliseconds
+  try {
 
-      if(probe) { clearTimeout(timeoutId); }
-    } catch(error) {
-      if(error.code === "ETIMEDOUT") {
-        status.error = "Stream probe time out - make sure the stream source is available";
-      } else {
-        console.log("Stream probe failed", error);
-      }
-    }
+    let probeUrl = await this.Rep({
+      libraryId,
+      objectId: conf.objectId,
+      rep: "probe"
+    });
 
-    probe.format.filename = streamUrl.href;
-    console.log("PROBE", probe);
+    probe = await this.utils.ResponseToJson(
+      await HttpClient.Fetch(probeUrl, {
+        body: JSON.stringify({
+          "filename": streamUrl.href,
+          "listen": true
+        }),
+        method: "POST",
+        signal: controller.signal
+      })
+    );
 
-    // Create live reocording config
-    let lc = new LiveConf(probe, node.id, endpoint, false, false, true);
+    if(probe) { clearTimeout(timeoutId); }
 
-    const liveRecordingConfigStr = lc.generateLiveConf();
-    let liveRecordingConfig = JSON.parse(liveRecordingConfigStr);
-    console.log("CONFIG", JSON.stringify(liveRecordingConfig.live_recording));
+    if(probe.errors) {
+      throw probe.errors[0];
+    }
+  } catch(error) {
+    if(error.code === "ETIMEDOUT") {
+      throw "Stream probe time out - make sure the stream source is available";
+    } else {
+      throw error;
+    }
+  }
 
-    // Store live recording config into the stream object
-    let e = await this.EditContentObject({
-      libraryId,
-      objectId: conf.objectId
-    });
-    let writeToken = e.write_token;
+  console.log("PROBE", probe);
+  probe.format.filename = streamUrl.href;
 
-    await this.ReplaceMetadata({
-      libraryId,
-      objectId: conf.objectId,
-      writeToken,
-      metadataSubtree: "live_recording",
-      metadata: liveRecordingConfig.live_recording
-    });
+  // Create live reocording config
+  let lc = new LiveConf(probe, node.id, endpoint, false, false, true);
 
-    let fin = await this.FinalizeContentObject({
-      libraryId,
-      objectId: conf.objectId,
-      writeToken,
-      commitMessage: "Apply live stream configuration"
-    });
+  const liveRecordingConfigStr = lc.generateLiveConf();
+  let liveRecordingConfig = JSON.parse(liveRecordingConfigStr);
+  console.log("CONFIG", JSON.stringify(liveRecordingConfig.live_recording));
 
-    status.fin = fin;
+  // Store live recording config into the stream object
+  let e = await this.EditContentObject({
+    libraryId,
+    objectId: conf.objectId
+  });
+  let writeToken = e.write_token;
+
+  await this.ReplaceMetadata({
+    libraryId,
+    objectId: conf.objectId,
+    writeToken,
+    metadataSubtree: "live_recording",
+    metadata: liveRecordingConfig.live_recording
+  });
 
-    return status;
+  status.fin = await this.FinalizeContentObject({
+    libraryId,
+    objectId: conf.objectId,
+    writeToken,
+    commitMessage: "Apply live stream configuration"
+  });
 
-  } catch(e) {
-    console.log("ERROR", e);
-  }
+  return status;
 };
 
 // const ChannelStatus = async ({client, name}) => {