@eluvio/elv-client-js 3.1.83 → 3.1.87

package/src/ElvClient.js

@@ -598,15 +598,17 @@ class ElvClient {
    * @param {string=} authToken - Eluvio authorization token previously issued from OAuth ID token
    * @param {string=} tenantId - If specified, user will be associated with the tenant
    * @param {Object=} extraData - Additional data to pass to the login API
+   * @param {boolean=} unsignedPublicAuth=false - If specified, the client will use an unsigned static token for calls that don't require authorization (reduces remote signature calls)
    */
-  async SetRemoteSigner({idToken, authToken, tenantId, extraData}) {
+  async SetRemoteSigner({idToken, authToken, tenantId, extraData, unsignedPublicAuth}) {
     const signer = new RemoteSigner({
       rpcUris: this.authServiceURIs,
       idToken,
       authToken,
       tenantId,
       provider: this.ethClient.provider,
-      extraData
+      extraData,
+      unsignedPublicAuth
     });
 
     await signer.Initialize();

package/src/RemoteSigner.js

@@ -10,11 +10,13 @@ class RemoteSigner extends Ethers.Signer {
     authToken,
     tenantId,
     provider,
-    extraData={}
+    extraData={},
+    unsignedPublicAuth=false
   }) {
     super();
 
     this.remoteSigner = true;
+    this.unsignedPublicAuth = unsignedPublicAuth;
 
     this.HttpClient = new HttpClient({uris: rpcUris});
     this.idToken = idToken;
@@ -24,6 +26,8 @@ class RemoteSigner extends Ethers.Signer {
     this.extraLoginData = extraData || {};
 
     this.provider = provider;
+
+    this.signatureCache = {};
   }
 
   async Initialize() {
@@ -55,7 +59,13 @@ class RemoteSigner extends Ethers.Signer {
         })
       );
 
-      this.address = Utils.HashToAddress(keys.eth[0]);
+      const address = keys.eth[0];
+
+      if(address && address.startsWith("0x")) {
+        this.address = address;
+      } else {
+        this.address = Utils.HashToAddress(keys.eth[0]);
+      }
     }
 
     this.id = this.address ? `ikms${Utils.AddressToHash(this.address)}` : undefined;
@@ -74,23 +84,29 @@ class RemoteSigner extends Ethers.Signer {
    * @returns - the signed message as a hex string
    */
   async signDigest(digest) {
-    let signature = await Utils.ResponseToJson(
-      this.HttpClient.Request({
-        method: "POST",
-        path: UrlJoin("as", "wlt", "sign", "eth", this.id),
-        headers: {
-          Authorization: `Bearer ${this.authToken}`
-        },
-        body: {
-          hash: digest
-        }
-      })
-    );
-
-    signature.v = parseInt(signature.v, 16);
-    signature.recoveryParam = signature.v - 27;
+    if(!this.signatureCache[digest]) {
+      this.signatureCache[digest] = new Promise(async resolve => {
+        let signature = await Utils.ResponseToJson(
+          this.HttpClient.Request({
+            method: "POST",
+            path: UrlJoin("as", "wlt", "sign", "eth", this.id),
+            headers: {
+              Authorization: `Bearer ${this.authToken}`
+            },
+            body: {
+              hash: digest
+            }
+          })
+        );
+
+        signature.v = parseInt(signature.v, 16);
+        signature.recoveryParam = signature.v - 27;
+
+        resolve(signature);
+      });
+    }
 
-    return signature;
+    return await this.signatureCache[digest];
   }
 
   async signMessage(message) {

package/src/Utils.js

@@ -5,6 +5,10 @@ const BigNumber = require("bignumber.js").default;
 const VarInt = require("varint");
 const URI = require("urijs");
 
+const {
+  keccak256
+} = require("ethers").utils;
+
 /**
  * @namespace
  * @description This is a utility namespace mostly containing functions for managing
@@ -149,11 +153,12 @@ const Utils = {
    * Convert contract address to multiformat hash
    *
    * @param {string} address - Address of contract
+   * @param {boolean} key - Whether or not the first param is a public key. Defaults to address type
    *
    * @returns {string} - Hash of contract address
    */
-  AddressToHash: (address) => {
-    address = address.replace("0x", "");
+  AddressToHash: (address, key=false) => {
+    address = address.replace(key ? "0x04" : "0x", "");
     return bs58.encode(Buffer.from(address, "hex"));
   },
 
@@ -194,12 +199,13 @@ const Utils = {
    * Convert any content fabric ID to the corresponding contract address
    *
    * @param {string} hash - Hash to convert to address
+   * @param {boolean} key - Whether or not the first param is a key. Defaults to address type
    *
    * @returns {string} - Contract address of item
    */
-  HashToAddress: (hash) => {
-    hash = hash.substr(4);
-    return Utils.FormatAddress("0x" + bs58.decode(hash).toString("hex"));
+  HashToAddress: (hash, key=false) => {
+    hash = key ? hash : hash.substr(4);
+    return Utils.FormatAddress((key ? "0x04" : "0x") + bs58.decode(hash).toString("hex"));
   },
 
   /**
@@ -505,6 +511,21 @@ const Utils = {
     }
   },
 
+  /**
+   * Converts the given string to a public address
+   *
+   * @param key - Public key to convert to a public address
+   *
+   * @returns {string} - the public address
+   */
+  PublicKeyToAddress: (key) => {
+    const keyData = new Uint8Array(Buffer.from(key.replace("0x04", ""), "hex"));
+    const keccakHash = keccak256(keyData);
+    const address = "0x" + keccakHash.slice(26);
+
+    return Utils.FormatAddress(address);
+  },
+
   PLATFORM_NODE: "node",
   PLATFORM_WEB: "web",
   PLATFORM_REACT_NATIVE: "react-native",

package/src/client/ContentAccess.js

@@ -1325,6 +1325,7 @@ exports.AvailableOfferings = async function({
  * @param {Object=} context - Additional audience data to include in the authorization request.
  * - Note: Context must be a map of string->string
  * @param {Object=} authorizationToken - Additional authorization token for authorizing this request
+ * @param {Object=} options - Additional query parameters to pass when requesting available playout options, such as clipping parameters.
  */
 exports.PlayoutOptions = async function({
   offeringURI,
@@ -1340,7 +1341,8 @@ exports.PlayoutOptions = async function({
   drms=[],
   context,
   hlsjsProfile=true,
-  authorizationToken
+  authorizationToken,
+  options={}
 }) {
   if(offeringURI) {
     const uriInfo = offeringURI.match(/(hq__[^/]+)\/rep\/([^/]+)\/([^/]+)\/options.json/);
@@ -1421,7 +1423,8 @@ exports.PlayoutOptions = async function({
 
   let queryParams = {
     authorization,
-    resolve: !!linkPath
+    resolve: !!linkPath,
+    ...options
   };
 
   const playoutOptions = Object.values(
@@ -1590,6 +1593,7 @@ exports.PlayoutOptions = async function({
  * @param {Object=} context - Additional audience data to include in the authorization request
  * - Note: Context must be a map of string->string
  * @param {Object=} authorizationToken - Additional authorization token for authorizing this request
+ * @param {Object=} options - Additional query parameters to pass when requesting available playout options, such as clipping parameters.
  */
 exports.BitmovinPlayoutOptions = async function({
   objectId,
@@ -1603,7 +1607,8 @@ exports.BitmovinPlayoutOptions = async function({
   offering="default",
   playoutType,
   context,
-  authorizationToken
+  authorizationToken,
+  options={}
 }) {
   versionHash ? ValidateVersion(versionHash) : ValidateObject(objectId);
 
@@ -1624,7 +1629,8 @@ exports.BitmovinPlayoutOptions = async function({
     playoutType,
     hlsjsProfile: false,
     context,
-    authorizationToken
+    authorizationToken,
+    options
   });
 
   delete playoutOptions.playoutMethods;

package/src/client/ContentManagement.js

@@ -22,7 +22,6 @@ const {
   ValidateWriteToken,
   ValidateParameters,
   ValidatePresence,
-  ValidateAddress
 } = require("../Validation");
 
 exports.SetVisibility = async function({id, visibility}) {
@@ -243,6 +242,7 @@ exports.CreateContentType = async function({name, metadata={}, bitcode}) {
  * @param {Object=} metadata - Metadata of library object
  * @param {string=} kmsId - ID of the KMS to use for content in this library. If not specified,
  * the default KMS will be used.
+ * @param {string=} tenantId - ID of the tenant to use for this library
  *
  * @returns {Promise<string>} - Library ID of created library
  */
@@ -253,6 +253,7 @@ exports.CreateContentLibrary = async function({
   imageName,
   metadata={},
   kmsId,
+  tenantId
 }) {
   if(!kmsId) {
     kmsId = `ikms${this.utils.AddressToHash(await this.DefaultKMSAddress())}`;
@@ -265,7 +266,10 @@ exports.CreateContentLibrary = async function({
 
 
   // Set tenant ID on the library if the user is associated with a tenant
-  const tenantId = await this.userProfileClient.TenantId();
+  if(!tenantId) {
+    tenantId = await this.userProfileClient.TenantId();
+  }
+
   if(tenantId) {
     await this.CallContractMethod({
       contractAddress,
@@ -691,13 +695,11 @@ exports.CopyContentObject = async function({libraryId, originalVersionHash, opti
  * @param {string} libraryId - ID of the library
  * @param {string} objectId - ID of the object
  * @param {string} publicKey - Public key for the target cap
- * @param {string} publicAddress - Public address for the target cap key
  * @param {string} writeToken - Write token for the content object - If specified, info will be retrieved from the write draft instead of creating a new draft and finalizing
  *
  * @returns {Promise<Object>}
  */
-exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, publicAddress, writeToken}) {
-  publicAddress = ValidateAddress(publicAddress);
+exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, writeToken}) {
   const userCapKey = `eluv.caps.iusr${this.utils.AddressToHash(this.signer.address)}`;
   const userCapValue = await this.ContentObjectMetadata({objectId, libraryId, metadataSubtree: userCapKey});
 
@@ -707,6 +709,8 @@ exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, publ
 
   const userConk = await this.Crypto.DecryptCap(userCapValue, this.signer.signingKey.privateKey);
 
+  const publicAddress = this.utils.PublicKeyToAddress(publicKey);
+
   const targetUserCapKey = `eluv.caps.iusr${this.utils.AddressToHash(publicAddress)}`;
   const targetUserCapValue = await this.Crypto.EncryptConk(userConk, publicKey);
 

package/testScripts/InitializeTenant.js

@@ -16,7 +16,6 @@ const reportTypes = [
 
 const liveTypes = [
   { name: "Eluvio LIVE Drop Event Site", spec: require("../typeSpecs/DropEventSite") },
-  { name: "Eluvio LIVE Event Site", spec: require("../typeSpecs/EventSite") },
   { name: "Eluvio LIVE Marketplace", spec: require("../typeSpecs/Marketplace") },
   { name: "Eluvio LIVE Tenant", spec: require("../typeSpecs/EventTenant") },
   { name: "NFT Collection", spec: require("../typeSpecs/NFTCollection") },