@eluvio/elv-client-js 4.0.146 → 4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.146",
+  "version": "4.1.0",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",
@@ -14,13 +14,13 @@
     "build-wallet-client-docs": "./node_modules/.bin/jsdoc --configure ./.jsdoc-mc.json --readme ./src/walletClient/README.md",
     "build-dist": "node ./node_modules/@babel/cli/bin/babel.js --source-type=unambiguous --presets=@babel/preset-env --plugins @babel/plugin-transform-runtime src --out-dir dist/src",
     "build-contracts": "node build/BuildContracts.js",
-    "build-frame-client": "webpack -p --progress --entry ./dist/src/FrameClient.js --output-filename ElvFrameClient-min.js --devtool none --optimize-minimize && mv test/bundle-analysis/index.html test/bundle-analysis/frame-client.html",
-    "build-permissions-client": "webpack -p --progress --entry ./dist/src/PermissionsClient.js --output-filename ElvPermissionsClient-min.js --devtool none --optimize-minimize && mv test/bundle-analysis/index.html test/bundle-analysis/permissions-client.html",
-    "build-wallet-client-web": "webpack -p --progress --mode production --entry ./dist/src/walletClient/index.js --target web --output-filename ElvWalletClient-min.js --devtool none --optimize-minimize && mv test/bundle-analysis/index.html test/bundle-analysis/wallet-client.html",
-    "build-wallet-client-node": "webpack -p --progress --mode production --entry ./dist/src/walletClient/index.js --target node --output-filename ElvWalletClient-node-min.js --devtool none --optimize-minimize && mv test/bundle-analysis/index.html test/bundle-analysis/wallet-client.html",
+    "build-frame-client": "webpack --mode=production --progress --entry ./dist/src/FrameClient.js --output-filename ElvFrameClient-min.js && mv test/bundle-analysis/index.html test/bundle-analysis/frame-client.html",
+    "build-permissions-client": "webpack --mode=production --progress --entry ./dist/src/PermissionsClient.js --output-filename ElvPermissionsClient-min.js && mv test/bundle-analysis/index.html test/bundle-analysis/permissions-client.html",
+    "build-wallet-client-web": "webpack --mode=production --progress --mode production --entry ./dist/src/walletClient/index.js --target web --output-filename ElvWalletClient-min.js && mv test/bundle-analysis/index.html test/bundle-analysis/wallet-client.html",
+    "build-wallet-client-node": "webpack --mode=production --progress --mode production --entry ./dist/src/walletClient/index.js --target node --output-filename ElvWalletClient-node-min.js && mv test/bundle-analysis/index.html test/bundle-analysis/wallet-client.html",
     "build-prod": "npm run build-web && npm run build-node",
-    "build-web": "webpack --progress --mode production --target web --output-filename ElvClient-min.js --devtool none && mv test/bundle-analysis/index.html test/bundle-analysis/web.html",
-    "build-node": "webpack --progress --mode production --target node --output-filename ElvClient-node-min.js --devtool none && mv test/bundle-analysis/index.html test/bundle-analysis/node.html",
+    "build-web": "webpack --progress --mode production --target web --output-filename ElvClient-min.js && mv test/bundle-analysis/index.html test/bundle-analysis/web.html",
+    "build-node": "webpack --progress --mode production --target node --output-filename ElvClient-node-min.js && mv test/bundle-analysis/index.html test/bundle-analysis/node.html",
     "build-dev": "npm run build-web-dev && npm run build-node-dev",
     "build-web-dev": "webpack --progress --target web --output-filename ElvClient-min-dev.js",
     "build-node-dev": "webpack --progress --target node --output-filename ElvClient-node-min-dev.js",
@@ -66,6 +66,7 @@
     "columnify": "^1.5.4",
     "country-codes-list": "^1.6.8",
     "crocks": "^0.12.4",
+    "crypto-browserify": "^3.12.1",
     "deep-equal": "^1.0.1",
     "ellipsize": "^0.1.0",
     "ethers": "^5.7.2",
@@ -90,7 +91,6 @@
     "shell-escape": "^0.2.0",
     "sjcl": "^1.0.8",
     "typedarray": "0.0.6",
-    "unorm": "^1.5.0",
     "urijs": "^1.19.10",
     "url-join": "^4.0.0",
     "uuid": "^8.3.2",
@@ -98,27 +98,28 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.4.4",
+    "@babel/cli": "^7.28.0",
     "@babel/plugin-transform-runtime": "^7.8.3",
     "@babel/preset-env": "^7.4.5",
+    "@jsdoc/salty": "^0.2.9",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chrono-node": "^2.3.1",
     "colors": "^1.4.0",
     "copy-webpack-plugin": "^6.0.2",
-    "eslint": "^5.15.0",
+    "eslint": "^9.32.0",
     "eslint-plugin-html": "^5.0.0",
     "jsdoc": "^4.0.0",
-    "mocha": "^8.2.1",
+    "jsdom": "^26.1.0",
     "moment": "^2.27.0",
     "raw-loader": "^0.5.1",
     "shell-quote": "^1.7.2",
     "showdown": "^1.9.1",
     "simple-mock": "^0.8.0",
-    "taffydb": "^2.7.3",
-    "webpack": "^4.20.2",
-    "webpack-bundle-analyzer": "^3.3.2",
-    "webpack-cli": "^3.1.2",
-    "window": "^4.2.7"
+    "stream-browserify": "^3.0.0",
+    "vm-browserify": "^1.1.2",
+    "webpack": "^5.101.0",
+    "webpack-bundle-analyzer": "^4.10.2",
+    "webpack-cli": "^6.0.1"
   }
 }

package/src/ElvClient.js

@@ -422,6 +422,7 @@ class ElvClient {
     this.contentTypes = {};
     this.encryptionConks = {};
     this.stateChannelAccess = {};
+    this.objectInfo = {};
     this.objectTenantIds = {};
     this.objectLibraryIds = {};
     this.objectImageUrls = {};

package/src/FrameClient.js

@@ -377,10 +377,12 @@ class FrameClient {
       "CreatePart",
       "CreateProductionMaster",
       "CreateShare",
+      "CreateSignedMessageJSON",
       "CreateSignedToken",
       "CreateStaticToken",
       "CurrentAccountAddress",
       "CustomContractAddress",
+      "DecodeSignedMessageJSON",
       "Decrypt",
       "DecryptECIES",
       "DefaultKMSAddress",
@@ -444,6 +446,7 @@ class FrameClient {
       "NodeId",
       "Nodes",
       "NTPInstance",
+      "ObjectCleanup",
       "Permission",
       "PlayoutOptions",
       "PlayoutPathResolution",
@@ -465,6 +468,7 @@ class FrameClient {
       "ReplaceMetadata",
       "Request",
       "ResetRegion",
+      "ResetTenantId",
       "RevokeShare",
       "SendFunds",
       "SetAccessCharge",
@@ -480,8 +484,11 @@ class FrameClient {
       "SetPolicyAuthorization",
       "SetSignerFromOauthToken",
       "SetStaticToken",
+      "SetTenantContractId",
+      "SetTenantId",
       "SetVisibility",
       "SetPermission",
+      "ShareInfo",
       "Shares",
       "SpaceNodes",
       "StartABRMezzanineJobs",
@@ -493,10 +500,13 @@ class FrameClient {
       "StreamInsertion",
       "StreamListUrls",
       "StreamRemoveWatermark",
+      "StreamSetOfferingAndDRM",
       "StreamStatus",
       "StreamStartOrStopOrReset",
       "StreamStopSession",
       "SuspendNTPInstance",
+      "TenantContractId",
+      "TenantId",
       "UnlinkAccessGroupFromOauth",
       "UpdateContentObjectGraph",
       "UpdateNTPInstance",
@@ -523,6 +533,8 @@ class FrameClient {
       "MergeUserMetadata",
       "PublicUserMetadata",
       "ReplaceUserMetadata",
+      "ResetTenantId",
+      "SetTenantContractId",
       "TenantContractId",
       "TenantId",
       "UserMetadata",

package/src/client/AccessGroups.js

@@ -941,4 +941,4 @@ exports.UnlinkAccessGroupFromOauth = async function({groupAddress}) {
     methodName: "setOAuthEnabled",
     methodArgs: [false]
   });
-};
+};

package/src/client/ContentAccess.js

@@ -573,18 +573,17 @@ exports.ContentObjects = async function({libraryId, filterOptions={}}) {
 };
 
 /**
- * Get a specific content object in the library
+ * Get info about a specific content object
  *
  * @methodGroup Content Objects
  * @namedParams
- * @param {string=} libraryId - ID of the library
  * @param {string=} objectId - ID of the object
  * @param {string=} versionHash - Version hash of the object -- if not specified, latest version is returned
  * @param {string=} writeToken - Write token for an object draft -- if supplied, versionHash will be ignored
  *
  * @returns {Promise<Object>} - Description of content object
  */
-exports.ContentObject = async function({objectId, versionHash, writeToken}) {
+exports.ContentObject = async function({objectId, versionHash, writeToken, noCache}) {
   this.Log(`Retrieving content object: ${writeToken || versionHash || objectId}`);
 
   if(writeToken) {
@@ -595,13 +594,26 @@ exports.ContentObject = async function({objectId, versionHash, writeToken}) {
 
   ValidateObject(objectId);
 
-  let path = UrlJoin("q", writeToken || versionHash || objectId);
+  const id = writeToken || versionHash || objectId;
+  if(noCache || !this.objectInfo[id] || Date.now() - this.objectInfo[id].retrievedAt > 30000) {
+    let path = UrlJoin("q", id);
+    this.objectInfo[id] = {
+      retrievedAt: Date.now(),
+      info: (
+        await this.HttpClient.RequestJsonBody({
+          headers: await this.authClient.AuthorizationHeader({objectId, versionHash}),
+          method: "GET",
+          path: path,
+          queryParams: {
+            details: true,
+            profile: true
+          }
+        })
+      )
+    };
+  }
 
-  return await this.HttpClient.RequestJsonBody({
-    headers: await this.authClient.AuthorizationHeader({objectId, versionHash}),
-    method: "GET",
-    path: path
-  });
+  return this.objectInfo[id].info;
 };
 
 /**
@@ -609,22 +621,21 @@ exports.ContentObject = async function({objectId, versionHash, writeToken}) {
  *
  * @methodGroup Content Objects
  * @namedParams
- * @param {string} libraryId
+ * @param {string=} objectId - ID of the object
+ * @param {string=} versionHash - Version hash of the object
  *
  * @returns {Promise<string>} - The account address of the owner
  */
-exports.ContentObjectOwner = async function({objectId}) {
-  ValidateObject(objectId);
+exports.ContentObjectOwner = async function({objectId, versionHash}) {
+  versionHash ? ValidateVersion(versionHash) : ValidateObject(objectId);
+
+  if(versionHash) {
+    objectId = this.utils.DecodeVersionHash(versionHash).objectId;
+  }
 
   this.Log(`Retrieving content object owner: ${objectId}`);
 
-  return this.utils.FormatAddress(
-    await this.ethClient.CallContractMethod({
-      contractAddress: this.utils.HashToAddress(objectId),
-      methodName: "owner",
-      methodArgs: []
-    })
-  );
+  return (await this.ContentObject({objectId, versionHash})).content_profile.owner;
 };
 
 /**
@@ -641,16 +652,18 @@ exports.ContentObjectOwner = async function({objectId}) {
 exports.ContentObjectTenantId = async function({objectId, versionHash}) {
   versionHash ? ValidateVersion(versionHash) : ValidateObject(objectId);
 
-  if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
+  if(versionHash) {
+    objectId = this.utils.DecodeVersionHash(versionHash).objectId;
+  }
 
+  // Cache results because they will never change
   if(!this.objectTenantIds[objectId]) {
-    this.objectTenantIds[objectId] = await this.authClient.MakeElvMasterCall({
-      methodName: "elv_getTenantById",
-      params: [
-        this.contentSpaceId,
-        objectId
-      ]
-    });
+    try {
+      this.objectTenantIds[objectId] = (await this.ContentObject({objectId, versionHash})).content_profile.tenant_id;
+    } catch(error) {
+      error.message = `Unable to determine tenant ID for ${versionHash || objectId}`;
+      throw error;
+    }
   }
 
   return this.objectTenantIds[objectId];
@@ -668,6 +681,8 @@ exports.ContentObjectTenantId = async function({objectId, versionHash}) {
  * @returns {Promise<string>} - Library ID of the object
  */
 exports.ContentObjectLibraryId = async function({objectId, versionHash}) {
+  versionHash ? ValidateVersion(versionHash) : ValidateObject(objectId);
+
   if(versionHash) {
     objectId = this.utils.DecodeVersionHash(versionHash).objectId;
   }
@@ -677,7 +692,7 @@ exports.ContentObjectLibraryId = async function({objectId, versionHash}) {
     try {
       this.objectLibraryIds[objectId] = (await this.ContentObject({objectId, versionHash})).qlib_id;
     } catch(error) {
-      error.message = `Unable to determine latest library for ${versionHash || objectId}`;
+      error.message = `Unable to determine library ID for ${versionHash || objectId}`;
       throw error;
     }
   }
@@ -685,48 +700,6 @@ exports.ContentObjectLibraryId = async function({objectId, versionHash}) {
   return this.objectLibraryIds[objectId];
 };
 
-exports.ContentObjectLibraryId2 = async function({objectId, versionHash}) {
-  versionHash ? ValidateVersion(versionHash) : ValidateObject(objectId);
-
-  if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
-
-  switch(await this.authClient.AccessType(objectId)) {
-    case this.authClient.ACCESS_TYPES.LIBRARY:
-      return this.utils.AddressToLibraryId(this.utils.HashToAddress(objectId));
-    case this.authClient.ACCESS_TYPES.OBJECT:
-      if(!this.objectLibraryIds[objectId]) {
-        this.Log(`Retrieving content object library ID: ${objectId || versionHash}`);
-
-        this.objectLibraryIds[objectId] = new Promise(async (resolve, reject) => {
-          try {
-            resolve(
-              this.utils.AddressToLibraryId(
-                await this.CallContractMethod({
-                  contractAddress: this.utils.HashToAddress(objectId),
-                  methodName: "libraryAddress"
-                })
-              )
-            );
-          } catch(error) {
-            reject(error);
-          }
-        });
-      }
-
-      try {
-        return await this.objectLibraryIds[objectId];
-      } catch(error) {
-        delete this.objectLibraryIds[objectId];
-
-        throw error;
-      }
-    case this.authClient.ACCESS_TYPES.OTHER:
-      throw Error(`Unable to retrieve library ID for ${versionHash || objectId}: Unknown type. (wrong network or deleted object?)`);
-    default:
-      return this.contentSpaceLibraryId;
-  }
-};
-
 exports.ProduceMetadataLinks = async function({
   libraryId,
   objectId,
@@ -1103,7 +1076,7 @@ exports.LatestVersionHash = async function({objectId, versionHash}) {
   }
 
   try {
-    return (await this.ContentObject({objectId})).hash;
+    return (await this.ContentObject({objectId, noCache: true})).hash;
   } catch(error) {
     error.message = `Unable to determine latest version hash for ${versionHash || objectId}`;
     throw error;

package/testScripts/Test.js

@@ -1,10 +1,14 @@
-const { ElvClient } = require("../src/ElvClient");
+const { ElvClient } = require("../src/index");
 const { ElvWalletClient } = require("../src/walletClient/index");
 const ClientConfiguration = require("../TestConfiguration.json");
 const fs = require("fs");
 const HttpClient = require("../src/HttpClient");
+//const NodeFetch = require("node-fetch");
 
 const Test = async () => {
+  // For some reason, fetch isn't defined for ethers in the build node version, need to set this
+  //globalThis.fetch = NodeFetch;
+
   try {
     const client = await ElvClient.FromNetworkName({
       networkName: "demo"

package/webpack.config.js

@@ -15,42 +15,39 @@ let plugins = [
   new webpack.optimize.LimitChunkCountPlugin({
     maxChunks: 1,
   }),
-  new webpack.IgnorePlugin(/unorm/),
   new BundleAnalyzerPlugin({
     analyzerMode: "static",
     reportFilename: path.resolve(path.join(__dirname, "test", "bundle-analysis", "index.html")),
     openAnalyzer: false
-  })
+  }),
+  new webpack.IgnorePlugin({resourceRegExp: /window/})
 ];
 
-plugins.push(new webpack.IgnorePlugin(/window/));
-
-// Exclude node-fetch for web build
 if(cmdOpts["target"] !== "node") {
-  plugins.push(new webpack.IgnorePlugin(/node-fetch-polyfill/));
-  plugins.push(new webpack.IgnorePlugin(/@eluvio\/crypto\/dist\/elv-crypto.bundle.node/));
+  plugins.push(new webpack.IgnorePlugin({resourceRegExp: /@eluvio\/crypto\/dist\/elv-crypto.bundle.node/}));
 } else {
-  plugins.push(new webpack.IgnorePlugin(/@eluvio\/crypto\/dist\/elv-crypto.bundle.js/));
+  plugins.push(new webpack.IgnorePlugin({resourceRegExp: /@eluvio\/crypto\/dist\/elv-crypto.bundle.js/}));
 }
 
 module.exports = {
-  entry: "./dist/src/ElvClient.js",
+  entry: "./src/ElvClient.js",
   output: {
     path: path.resolve(__dirname, "dist"),
     filename: "ElvClient-min-dev.js",
     libraryTarget: "umd"
   },
-  node: {
-    fs: "empty"
-  },
   resolve: {
     alias: {
       // Force webpack to use *one* copy of bn.js instead of 8
       "bn.js": path.resolve(path.join(__dirname, "node_modules", "bn.js"))
+    },
+    fallback: {
+      "crypto": require.resolve("crypto-browserify"),
+      "stream": require.resolve("stream-browserify"),
+      "vm": require.resolve("vm-browserify")
     }
   },
   mode: "development",
-  devtool: cmdOpts["mode"] === "production" ? "" : "source-map",
   plugins: plugins,
   module: {
     noParse: [