@eluvio/elv-client-js 4.0.113 → 4.0.115

package/package.json

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

package/src/AuthorizationClient.js

@@ -85,16 +85,8 @@ class AuthorizationClient {
     this.requestIds = {};
 
     this.providers = {};
-  }
-
-  CreateStaticToken({libraryId}) {
-    let token = { qspace_id: this.client.contentSpaceId };
-
-    if(libraryId) {
-      token.qlib_id = libraryId;
-    }
 
-    return Utils.B64(JSON.stringify(token));
+    this.CreateStaticToken = client.CreateStaticToken;
   }
 
   // Return authorization token in appropriate headers
@@ -150,8 +142,7 @@ class AuthorizationClient {
 
       if(channelAuth && this.client.signer && this.client.signer.remoteSigner) {
         // Channel auth not supported for remote signer, use a self-signed no-auth token instead
-        noAuth = true;
-        channelAuth = false;
+        return this.client.CreateFabricToken({context});
       }
 
       let authorizationToken;
@@ -165,7 +156,7 @@ class AuthorizationClient {
         });
       } else {
         if(noAuth && this.client.signer && this.client.signer.remoteSigner && this.client.signer.unsignedPublicAuth) {
-          return this.CreateStaticToken({libraryId});
+          return this.client.CreateStaticToken({libraryId});
         }
 
         authorizationToken = await this.GenerateAuthorizationToken({
@@ -328,12 +319,25 @@ class AuthorizationClient {
 
       // Make the request
       let accessRequest;
-      if(update) {
-        this.Log(`Making update request on ${accessType} ${id}`);
-        accessRequest = await this.UpdateRequest({id, abi});
-      } else {
-        this.Log(`Making access request on ${accessType} ${id}`);
-        accessRequest = await this.AccessRequest({id, args: accessArgs, checkAccessCharge});
+      try {
+        if(update) {
+          this.Log(`Making update request on ${accessType} ${id}`);
+          accessRequest = await this.UpdateRequest({id, abi});
+        } else {
+          this.Log(`Making access request on ${accessType} ${id}`);
+          accessRequest = await this.AccessRequest({id, args: accessArgs, checkAccessCharge});
+        }
+      } catch(error) {
+        // Handle specific errors like permission denied
+        if(error.message.includes("UNPREDICTABLE_GAS_LIMIT")) {
+          this.Log(`Permission denied for ${id}: ${error.message}`);
+          throw Error(`Permission denied for ${Utils.FormatAddress(this.client.signer.address)} on ${id} or 
+          ${Utils.FormatAddress(this.client.signer.address)} have insufficient funds`);
+        }
+
+        // Handle other unexpected errors
+        this.Log(`Error during request for ${id}: ${error.message}`);
+        throw error;
       }
 
       const cache = update ? this.modifyTransactions : this.accessTransactions;
@@ -381,6 +385,9 @@ class AuthorizationClient {
           const accessChargeArgs = isV3 ? [0, [], []] : [args[0], args[3], args[4]];
           // Access charge is in wei, but methods take ether - convert to charge to ether
           accessCharge = Utils.WeiToEther(await this.GetAccessCharge({objectId: id, args: accessChargeArgs}));
+          if(isNaN(accessCharge) || !accessCharge){
+            accessCharge = 0;
+          }
         } catch(error) {
           this.Log("Failed to get access charge for", id);
           this.Log(error);

package/src/ElvClient.js

@@ -1170,6 +1170,25 @@ class ElvClient {
     }
   }
 
+  /**
+   * Create a static authorization token
+   *
+   * @methodGroup Authorization
+   * @namedParams
+   * @param {string=} libraryId - The library ID to associate with the static token
+   *
+   * @return {string} - The created static token
+   */
+  CreateStaticToken({libraryId}) {
+    let token = { qspace_id: this.client.contentSpaceId };
+
+    if(libraryId) {
+      token.qlib_id = libraryId;
+    }
+
+    return Utils.B64(JSON.stringify(token));
+  }
+
   /**
    * Set a static token for the client to use for all authorization
    *

package/src/client/ContentAccess.js

@@ -1557,6 +1557,7 @@ exports.PlayoutOptions = async function({
 
     const licenseServers = option.properties.license_servers;
     const cert = option.properties.cert;
+    const thumbnailTrackUri = option.properties.thumbnails_webvtt_uri;
 
     if(hlsjsProfile && protocol === "hls" && drm === "aes-128") {
       queryParams.player_profile = "hls-js";
@@ -1594,7 +1595,15 @@ exports.PlayoutOptions = async function({
                 path: UrlJoin("rep", handler, offering, playoutPath),
                 queryParams
               }),
-          drms: drm ? {[drm]: {licenseServers, cert}} : undefined
+          drms: drm ? {[drm]: {licenseServers, cert}} : undefined,
+          thumbnailTrack: !thumbnailTrackUri ? undefined :
+            await this.Rep({
+              libraryId: linkTarget.libraryId || libraryId,
+              objectId: linkTarget.objectId || objectId,
+              versionHash: linkTarget.versionHash || versionHash,
+              rep: UrlJoin(handler, offering, thumbnailTrackUri),
+              queryParams
+            }),
         }
       }
     };

package/src/client/LiveConf.js

@@ -1,3 +1,5 @@
+/* eslint no-console: 0 */
+
 const DefaultABRLadder = {
   "video" : [
     {
@@ -497,13 +499,13 @@ class LiveConf {
     conf.live_recording.recording_config.recording_params.xc_params.enc_width = videoStream.width;
 
     // Determine video recording bitrate and ABR ladder
-    let topLadderRate = 0
-    for (let i = 0; i < ladderProfile.video.length; i ++) {
+    let topLadderRate = 0;
+    for(let i = 0; i < ladderProfile.video.length; i ++) {
       let elem = ladderProfile.video[i];
-      if (elem.height > videoStream.height)
+      if(elem.height > videoStream.height)
         continue;
-      if (elem.bit_rate > topLadderRate) {
-        topLadderRate = elem.bit_rate
+      if(elem.bit_rate > topLadderRate) {
+        topLadderRate = elem.bit_rate;
       }
       elem.media_type = 1;
       elem.stream_name = "video";
@@ -524,14 +526,14 @@ class LiveConf {
       const audio = audioStreams[audioIndex];
 
       // Find ladder rung for the specific channel layout (2 or 6 channels)
-      for (let j = 0; j < ladderProfile.audio.length; j ++) {
+      for(let j = 0; j < ladderProfile.audio.length; j ++) {
         let elem = ladderProfile.audio[j];
-        if (elem.channels == audio.recordingChannels) {
+        if(elem.channels == audio.recordingChannels) {
           audioLadderSpec = {...elem};
           break;
         }
       }
-      if (Object.keys(audioLadderSpec).length === 0) {
+      if(Object.keys(audioLadderSpec).length === 0) {
         // If no channels layout match, just use the first element in the ladder
         audioLadderSpec = {...ladderProfile.audio[0]};
       }

package/src/client/LiveStream.js

@@ -1,3 +1,5 @@
+/* eslint no-console: 0 */
+
 /**
  * Methods for Live Stream creation and management
  *
@@ -515,7 +517,7 @@ exports.StreamStatus = async function({name, stopLro=false, showParams=false}) {
       return status;
     }
 
-    const segDurationMeta = edgeMeta.live_recording.recording_config.recording_params.xc_params.seg_duration
+    const segDurationMeta = edgeMeta.live_recording.recording_config.recording_params.xc_params.seg_duration;
 
     // Convert LRO 'state' to desired 'state'
     if(state === "running" && videoLastFinalizationTimeEpochSec <= 0) {
@@ -1047,7 +1049,7 @@ exports.StreamSetOfferingAndDRM = async function({name, typeAbrMaster, typeLiveS
             "min_buffer_length": 2,
             "type": "ProtoDash"
           }
-        }
+        };
         continue;
       }
 
@@ -1983,12 +1985,12 @@ exports.StreamAddWatermark = async function({
   }
 
   const watermarkArgCount = [simpleWatermark, imageWatermark, forensicWatermark].filter(i => !!i).length;
-  console.log("watermark arg count", watermarkArgCount)
+  console.log("watermark arg count", watermarkArgCount);
 
   if(watermarkArgCount === 0) {
     throw Error("No watermark was provided");
   } else if(watermarkArgCount > 1) {
-    throw Error("Only one watermark is allowed")
+    throw Error("Only one watermark is allowed");
   }
 
   if(simpleWatermark) {