@eluvio/elv-client-js 3.1.76 → 3.1.80

package/dist/src/client/ContentManagement.js

@@ -880,7 +880,7 @@ exports.RemoveLibraryContentType = function _callee9(_ref12) {
 
 
 exports.CreateContentObject = function _callee10(_ref13) {
-  var libraryId, objectId, _ref13$options, options, typeId, type, _ref14, contractAddress, path, createResponse;
+  var libraryId, objectId, _ref13$options, options, typeId, type, currentAccountAddress, canContribute, _ref14, contractAddress, path, createResponse;
 
   return _regeneratorRuntime.async(function _callee10$(_context11) {
     while (1) {
@@ -957,65 +957,88 @@ exports.CreateContentObject = function _callee10(_ref13) {
 
         case 26:
           if (objectId) {
-            _context11.next = 36;
+            _context11.next = 44;
             break;
           }
 
+          _context11.next = 29;
+          return _regeneratorRuntime.awrap(this.CurrentAccountAddress());
+
+        case 29:
+          currentAccountAddress = _context11.sent;
+          _context11.next = 32;
+          return _regeneratorRuntime.awrap(this.CallContractMethod({
+            contractAddress: this.utils.HashToAddress(libraryId),
+            methodName: "canContribute",
+            methodArgs: [currentAccountAddress]
+          }));
+
+        case 32:
+          canContribute = _context11.sent;
+
+          if (canContribute) {
+            _context11.next = 35;
+            break;
+          }
+
+          throw Error("Current user does not have permission to create content in library ".concat(libraryId));
+
+        case 35:
           this.Log("Deploying contract...");
-          _context11.next = 30;
+          _context11.next = 38;
           return _regeneratorRuntime.awrap(this.authClient.CreateContentObject({
             libraryId: libraryId,
             typeId: typeId
           }));
 
-        case 30:
+        case 38:
           _ref14 = _context11.sent;
           contractAddress = _ref14.contractAddress;
           objectId = this.utils.AddressToObjectId(contractAddress);
           this.Log("Contract deployed: ".concat(contractAddress, " ").concat(objectId));
-          _context11.next = 43;
+          _context11.next = 51;
           break;
 
-        case 36:
+        case 44:
           _context11.t0 = this;
           _context11.t1 = "Contract already deployed for contract type: ";
-          _context11.next = 40;
+          _context11.next = 48;
           return _regeneratorRuntime.awrap(this.AccessType({
             id: objectId
           }));
 
-        case 40:
+        case 48:
           _context11.t2 = _context11.sent;
           _context11.t3 = _context11.t1.concat.call(_context11.t1, _context11.t2);
 
           _context11.t0.Log.call(_context11.t0, _context11.t3);
 
-        case 43:
+        case 51:
           if (!options.visibility) {
-            _context11.next = 47;
+            _context11.next = 55;
             break;
           }
 
           this.Log("Setting visibility to ".concat(options.visibility));
-          _context11.next = 47;
+          _context11.next = 55;
           return _regeneratorRuntime.awrap(this.SetVisibility({
             id: objectId,
             visibility: options.visibility
           }));
 
-        case 47:
+        case 55:
           path = UrlJoin("qid", objectId);
           _context11.t4 = _regeneratorRuntime;
           _context11.t5 = this.utils;
           _context11.t6 = this.HttpClient;
-          _context11.next = 53;
+          _context11.next = 61;
           return _regeneratorRuntime.awrap(this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             update: true
           }));
 
-        case 53:
+        case 61:
           _context11.t7 = _context11.sent;
           _context11.t8 = path;
           _context11.t9 = options;
@@ -1027,10 +1050,10 @@ exports.CreateContentObject = function _callee10(_ref13) {
           };
           _context11.t11 = _context11.t6.Request.call(_context11.t6, _context11.t10);
           _context11.t12 = _context11.t5.ResponseToJson.call(_context11.t5, _context11.t11);
-          _context11.next = 61;
+          _context11.next = 69;
           return _context11.t4.awrap.call(_context11.t4, _context11.t12);
 
-        case 61:
+        case 69:
           createResponse = _context11.sent;
           // Record the node used in creating this write token
           this.HttpClient.RecordWriteToken(createResponse.write_token);
@@ -1038,7 +1061,7 @@ exports.CreateContentObject = function _callee10(_ref13) {
           createResponse.objectId = createResponse.id;
           return _context11.abrupt("return", createResponse);
 
-        case 66:
+        case 74:
         case "end":
           return _context11.stop();
       }

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "3.1.76",
+  "version": "3.1.80",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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

package/src/AuthorizationClient.js

@@ -84,6 +84,16 @@ class AuthorizationClient {
     this.providers = {};
   }
 
+  CreateStaticToken({libraryId}) {
+    let token = { qspace_id: this.client.contentSpaceId };
+
+    if(libraryId) {
+      token.qlib_id = libraryId;
+    }
+
+    return Utils.B64(JSON.stringify(token));
+  }
+
   // Return authorization token in appropriate headers
   async AuthorizationHeader(params) {
     const authorizationToken = await this.AuthorizationToken(params);
@@ -150,6 +160,10 @@ class AuthorizationClient {
           oauthToken
         });
       } else {
+        if(noAuth) {
+          return this.CreateStaticToken({libraryId});
+        }
+
         authorizationToken = await this.GenerateAuthorizationToken({
           libraryId,
           objectId,
@@ -177,7 +191,7 @@ class AuthorizationClient {
     if(encryption && encryption !== "none" && objectId && await this.AccessType(objectId) === ACCESS_TYPES.OBJECT) {
       const owner = await this.Owner({id: objectId});
       const ownerCapKey = `eluv.caps.iusr${Utils.AddressToHash(this.client.signer.address)}`;
-      const ownerCap = await client.ContentObjectMetadata({libraryId, objectId, metadataSubtree: ownerCapKey});
+      const ownerCap = await this.client.ContentObjectMetadata({libraryId, objectId, metadataSubtree: ownerCapKey});
 
       if(!Utils.EqualAddress(owner, this.client.signer.address) && !ownerCap) {
         const cap = await this.ReEncryptionConk({libraryId, objectId});
@@ -613,6 +627,10 @@ class AuthorizationClient {
   }
 
   async IsV3({id}) {
+    if(this.client.assumeV3) {
+      return true;
+    }
+
     const contractName = await this.client.ethClient.ContractName(Utils.HashToAddress(id), true);
 
     if(!this.accessVersions[contractName]) {

package/src/ElvClient.js

@@ -148,7 +148,8 @@ class ElvClient {
     trustAuthorityId,
     staticToken,
     noCache=false,
-    noAuth=false
+    noAuth=false,
+    assumeV3=false
   }) {
     this.utils = Utils;
 
@@ -171,6 +172,7 @@ class ElvClient {
 
     this.noCache = noCache;
     this.noAuth = noAuth;
+    this.assumeV3 = assumeV3;
 
     this.debug = false;
 
@@ -270,7 +272,8 @@ class ElvClient {
     staticToken,
     ethereumContractTimeout=10,
     noCache=false,
-    noAuth=false
+    noAuth=false,
+    assumeV3
   }) {
     const configUrl = networks[networkName];
 
@@ -283,7 +286,8 @@ class ElvClient {
       staticToken,
       ethereumContractTimeout,
       noCache,
-      noAuth
+      noAuth,
+      assumeV3
     });
   }
 
@@ -309,7 +313,8 @@ class ElvClient {
     staticToken,
     ethereumContractTimeout=10,
     noCache=false,
-    noAuth=false
+    noAuth=false,
+    assumeV3=false
   }) {
     const {
       contentSpaceId,
@@ -336,7 +341,8 @@ class ElvClient {
       trustAuthorityId,
       staticToken,
       noCache,
-      noAuth
+      noAuth,
+      assumeV3
     });
 
     client.configUrl = configUrl;

package/src/EthClient.js

@@ -285,6 +285,8 @@ class EthClient {
             const latestBlock = await this.MakeProviderCall({methodName: "getBlock", args: ["latest"]});
             overrides.gasLimit = latestBlock.gasLimit;
             overrides.gasPrice = overrides.gasPrice ? overrides.gasPrice * 1.50 : 8000000000;
+          } else if(error.code === "NONCE_EXPIRED" && error.reason === "nonce has already been used") {
+            this.Log(`Retrying method call ${methodName}`);
           } else if(!(error.message || error).includes("invalid response")) {
             this.Log(typeof error === "object" ? JSON.stringify(error, null, 2) : error, true);
             throw error;

package/src/UserProfileClient.js

@@ -56,6 +56,8 @@ await client.userProfileClient.UserMetadata()
     this.client = client;
     this.debug = debug;
     this.userWalletAddresses = {};
+    this.walletAddress = undefined;
+    this.walletAddressRetrieved = false;
   }
 
   async CreateWallet() {
@@ -130,13 +132,17 @@ await client.userProfileClient.UserMetadata()
    * @return {Promise<string>} - The contract address of the current user's wallet contract
    */
   async WalletAddress(autoCreate=true) {
-    if(this.walletAddress) { return this.walletAddress; }
+    if(this.walletAddress || this.walletAddressRetrieved) { return this.walletAddress; }
 
-    const walletAddress = await this.client.CallContractMethod({
-      contractAddress: Utils.HashToAddress(this.client.contentSpaceId),
-      methodName: "userWallets",
-      methodArgs: [this.client.signer.address]
-    });
+    if(!this.walletAddressPromise) {
+      this.walletAddressPromise = this.client.CallContractMethod({
+        contractAddress: Utils.HashToAddress(this.client.contentSpaceId),
+        methodName: "userWallets",
+        methodArgs: [this.client.signer.address]
+      });
+    }
+
+    const walletAddress = await this.walletAddressPromise;
 
     if(!Utils.EqualAddress(walletAddress, Utils.nullAddress)) {
       this.walletAddress = walletAddress;
@@ -146,6 +152,8 @@ await client.userProfileClient.UserMetadata()
       await this.CreateWallet();
     }
 
+    this.walletAddressRetrieved = true;
+
     return this.walletAddress;
   }
 

package/src/client/ABRPublishing.js

@@ -6,6 +6,7 @@
  * @module ElvClient/ABRPublishing
  */
 
+const R = require("ramda");
 const UrlJoin = require("url-join");
 const HttpClient = require("../HttpClient");
 
@@ -355,8 +356,6 @@ exports.CreateABRMezzanine = async function({
     ...metadata.public.asset_metadata
   };
 
-  metadata.elv_created_at = new Date().getTime();
-
   if(name || !existingMez) {
     metadata.name = name || `${masterName} Mezzanine`;
     metadata.public.name = name || `${masterName} Mezzanine`;
@@ -367,7 +366,23 @@ exports.CreateABRMezzanine = async function({
     metadata.public.description = description || "";
   }
 
-  await this.MergeMetadata({
+  // retrieve existing metadata to merge with updated metadata
+  const existingMetadata = await this.ContentObjectMetadata({
+    libraryId,
+    objectId: id,
+    writeToken: write_token,
+  });
+  // newer metadata values replace existing metadata, unless both new and old values are objects,
+  // in which case their keys are merged recursively
+  metadata = R.mergeDeepRight(existingMetadata, metadata);
+
+  if(!existingMez) {
+    // set creation date
+    metadata.elv_created_at = new Date().getTime();
+  }
+
+  // write metadata to mezzanine object
+  await this.ReplaceMetadata({
     libraryId,
     objectId: id,
     writeToken: write_token,

package/src/client/ContentAccess.js

@@ -760,17 +760,22 @@ exports.MetadataAuth = async function({
   objectId,
   versionHash,
   path="/",
-  channelAuth=false
+  channelAuth=false,
+  noAuth=false
 }) {
   ValidateParameters({libraryId, objectId, versionHash});
 
   if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
 
-  const visibility = await this.Visibility({id: objectId});
-  const accessType = await this.AccessType({id: objectId});
-  const isPublic = (path || "").replace(/^\/+/, "").startsWith("public");
-
-  let noAuth = visibility >= 10 || (isPublic && visibility >= 1);
+  noAuth = this.noAuth || noAuth;
+  let isPublic = noAuth;
+  let accessType;
+  if(!noAuth) {
+    const visibility = await this.Visibility({id: objectId});
+    accessType = await this.AccessType({id: objectId});
+    isPublic = (path || "").replace(/^\/+/, "").startsWith("public");
+    noAuth = visibility >= 10 || (isPublic && visibility >= 1);
+  }
 
   if(this.oauthToken) {
     // Check that KMS is set on this object
@@ -823,6 +828,7 @@ exports.MetadataAuth = async function({
  * - Note: Selection is relative to "metadataSubtree". For example, metadataSubtree="public" and select=["name", "description"] would select "public/name" and "public/description"
  * @param {Array<string>=} remove - Exclude the specified items from the retrieved metadata
  * @param {string=} authorizationToken - Additional authorization token for this request
+ * @param {string=} noAuth=false - If specified, the normal authorization flow will be skipped. Useful if you know the metadata you're retrieving is publicly accessible
  * @param {boolean=} resolveLinks=false - If specified, links in the metadata will be resolved
  * @param {boolean=} resolveIncludeSource=false - If specified, resolved links will include the hash of the link at the root of the metadata
 
@@ -857,6 +863,7 @@ exports.ContentObjectMetadata = async function({
   select=[],
   remove=[],
   authorizationToken,
+  noAuth=false,
   resolveLinks=false,
   resolveIncludeSource=false,
   resolveIgnoreErrors=false,
@@ -877,7 +884,7 @@ exports.ContentObjectMetadata = async function({
   let path = UrlJoin("q", writeToken || versionHash || objectId, "meta", metadataSubtree);
 
   // Main authorization
-  let defaultAuthToken = await this.MetadataAuth({libraryId, objectId, versionHash, path: metadataSubtree});
+  let defaultAuthToken = await this.MetadataAuth({libraryId, objectId, versionHash, path: metadataSubtree, noAuth});
 
   // All authorization
   const authTokens = [authorizationToken, queryParams.authorization, defaultAuthToken].flat().filter(token => token);
@@ -2259,9 +2266,7 @@ exports.LinkUrl = async function({
   }
 
   let authorization = [ authorizationToken ];
-  if(!noAuth) {
-    authorization.push(await this.MetadataAuth({libraryId, objectId, versionHash, path: linkPath, channelAuth}));
-  }
+  authorization.push(await this.MetadataAuth({libraryId, objectId, versionHash, path: linkPath, channelAuth, noAuth}));
 
   if(queryParams.authorization) {
     authorization.push(queryParams.authorization);

package/src/client/ContentManagement.js

@@ -567,6 +567,17 @@ exports.CreateContentObject = async function({libraryId, objectId, options={}})
   }
 
   if(!objectId) {
+    const currentAccountAddress = await this.CurrentAccountAddress();
+    const canContribute = await this.CallContractMethod({
+      contractAddress: this.utils.HashToAddress(libraryId),
+      methodName: "canContribute",
+      methodArgs: [currentAccountAddress]
+    });
+
+    if(!canContribute) {
+      throw Error(`Current user does not have permission to create content in library ${libraryId}`);
+    }
+
     this.Log("Deploying contract...");
     const { contractAddress } = await this.authClient.CreateContentObject({libraryId, typeId});
 

package/testScripts/CreateABRMezzanine.js

@@ -270,7 +270,6 @@ const Create = async ({
     Report(createResponse);
 
     const objectId = createResponse.id;
-    await client.SetVisibility({id: objectId, visibility: 0});
 
     console.log("Starting Mezzanine Job(s)");
 

package/testScripts/OfferingRemoveDash.js

@@ -0,0 +1,49 @@
+/* eslint-disable no-console */
+
+// Removes HLS playout options from an existing offering of a mezzanine
+
+const ScriptOffering = require("./parentClasses/ScriptOffering");
+
+class OfferingRemoveDash extends ScriptOffering {
+
+  async body() {
+    const client = await this.client();
+
+    const libraryId = this.args.libraryId;
+    const objectId = this.args.objectId;
+    const offeringKey = this.args.offeringKey;
+
+    let dashFound = false;
+
+    let metadata = await client.ContentObjectMetadata({
+      libraryId,
+      objectId
+    });
+
+    this.validateOffering(metadata, offeringKey);
+
+    // loop through playout formats, delete ones where protocol is Dash
+    const playoutFormatKeys = Object.keys(metadata.offerings[offeringKey].playout.playout_formats);
+    for(let i = 0; i < playoutFormatKeys.length; i++) {
+      const key = playoutFormatKeys[i];
+      if(metadata.offerings[offeringKey].playout.playout_formats[key].protocol.type === "ProtoDash") {
+        console.log("Found Dash playout format '" + key + "', removing...");
+        delete metadata.offerings[offeringKey].playout.playout_formats[key];
+        dashFound = true;
+      }
+    }
+
+    if(dashFound) {
+      await this.metadataWrite(metadata);
+    } else {
+      console.log("No playout formats found with Dash");
+    }
+  }
+
+  header() {
+    return "Removing playout formats with Dash from mezzanine offering '" + this.args.offeringKey + "'... ";
+  }
+}
+
+const script = new OfferingRemoveDash;
+script.run();