@eluvio/elv-client-js 4.0.147 → 4.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.147",
+  "version": "4.2.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/client/AccessGroups.js

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

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: [

package/dist/src/ContentObjectVerification.js

@@ -1,281 +0,0 @@
-var _regeneratorRuntime = require("@babel/runtime/regenerator");
-var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-var CBOR = require("cbor");
-var SJCL = require("sjcl");
-var MultiHash = require("multihashes");
-var DeepEqual = require("deep-equal");
-var Utils = require("./Utils");
-var ContentObjectVerification = {
-  VerifyContentObject: function VerifyContentObject(_ref) {
-    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var client, libraryId, objectId, versionHash, response, partHash, qpartsResponse, partVerification, qmdHash, metadataPartHash, metadataPartResponse, metadataVerification, metadata, qstructHash, structPartHash, structPartResponse, structVerification;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            client = _ref.client, libraryId = _ref.libraryId, objectId = _ref.objectId, versionHash = _ref.versionHash;
-            response = {
-              hash: versionHash
-            };
-            partHash = Utils.DecodeVersionHash(versionHash).partHash;
-            _context.next = 5;
-            return client.QParts({
-              libraryId: libraryId,
-              objectId: objectId,
-              partHash: partHash,
-              format: "arrayBuffer"
-            }).then(function (response) {
-              return Buffer.from(response);
-            });
-          case 5:
-            qpartsResponse = _context.sent;
-            partVerification = ContentObjectVerification._VerifyPart({
-              partHash: partHash,
-              qpartsResponse: qpartsResponse
-            });
-            if (partVerification.valid) {
-              response.qref = {
-                valid: true
-              };
-            } else {
-              response.qref = {
-                valid: false,
-                error: partVerification.error.message
-              };
-            }
-            response.qref.hash = partHash;
-            if (!response.qref.valid) {
-              _context.next = 32;
-              break;
-            }
-            // Validate Metadata
-            qmdHash = partVerification.cbor.QmdHash.value;
-            metadataPartHash = "hqp_" + MultiHash.toB58String(qmdHash.slice(1, qmdHash.length));
-            _context.next = 14;
-            return client.QParts({
-              libraryId: libraryId,
-              objectId: objectId,
-              partHash: metadataPartHash,
-              format: "arrayBuffer"
-            }).then(function (response) {
-              return Buffer.from(response);
-            });
-          case 14:
-            metadataPartResponse = _context.sent;
-            metadataVerification = ContentObjectVerification._VerifyPart({
-              partHash: metadataPartHash,
-              qpartsResponse: metadataPartResponse
-            });
-            if (metadataVerification.valid) {
-              response.qmd = {
-                valid: true
-              };
-            } else {
-              response.qmd = {
-                valid: false,
-                error: metadataVerification.error.message
-              };
-            }
-            response.qmd.hash = metadataPartHash;
-            if (!(response.qmd.valid && libraryId)) {
-              _context.next = 23;
-              break;
-            }
-            _context.next = 21;
-            return client.ContentObjectMetadata({
-              libraryId: libraryId,
-              objectId: objectId,
-              versionHash: partHash.replace("hqp_", "hq__")
-            });
-          case 21:
-            metadata = _context.sent;
-            response.qmd.check = ContentObjectVerification._VerifyMetadata({
-              metadataCbor: metadataVerification.cbor,
-              metadata: metadata
-            });
-          case 23:
-            // Validate Qstruct
-            qstructHash = partVerification.cbor.QstructHash.value;
-            structPartHash = "hqp_" + MultiHash.toB58String(qstructHash.slice(1, qstructHash.length));
-            _context.next = 27;
-            return client.QParts({
-              libraryId: libraryId,
-              objectId: objectId,
-              partHash: structPartHash,
-              format: "arrayBuffer"
-            }).then(function (response) {
-              return Buffer.from(response);
-            });
-          case 27:
-            structPartResponse = _context.sent;
-            structVerification = ContentObjectVerification._VerifyPart({
-              partHash: structPartHash,
-              qpartsResponse: structPartResponse
-            });
-            if (structVerification.valid) {
-              response.qstruct = {
-                valid: true
-              };
-            } else {
-              response.qstruct = {
-                valid: false,
-                error: structVerification.error.message
-              };
-            }
-            response.qstruct.hash = structPartHash;
-            if (response.qstruct.valid) {
-              response.qstruct.parts = ContentObjectVerification._FormatQStruct(structVerification.cbor.Parts);
-            }
-          case 32:
-            response.valid = response.qref.valid && response.qmd.valid && response.qstruct.valid && (!response.qmd.check || response.qmd.check.valid);
-            return _context.abrupt("return", response);
-          case 34:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }))();
-  },
-  // Content verification methods //
-  _FormatQStruct: function _FormatQStruct(structParts) {
-    if (!structParts) {
-      return [];
-    }
-    return structParts.map(function (structPart) {
-      return {
-        hash: "hqp_" + MultiHash.toB58String(structPart.Hash.value.slice(1, structPart.Hash.length)),
-        size: structPart.Size
-      };
-    });
-  },
-  _Hash: function _Hash(thing) {
-    function fromBits(arr) {
-      var out = [],
-        bl = SJCL.bitArray.bitLength(arr),
-        i,
-        tmp;
-      for (i = 0; i < bl / 8; i++) {
-        if ((i & 3) === 0) {
-          tmp = arr[i / 4];
-        }
-        out.push(tmp >>> 24);
-        tmp <<= 8;
-      }
-      return out;
-    }
-    function toBits(bytes) {
-      var out = [],
-        i,
-        tmp = 0;
-      for (i = 0; i < bytes.length; i++) {
-        tmp = tmp << 8 | bytes[i];
-        if ((i & 3) === 3) {
-          out.push(tmp);
-          tmp = 0;
-        }
-      }
-      if (i & 3) {
-        out.push(SJCL.bitArray.partial(8 * (i & 3), tmp));
-      }
-      return out;
-    }
-    var digest = SJCL.hash.sha256.hash(toBits(thing));
-    var bytes = fromBits(digest);
-    var out = Buffer.from(bytes, "binary");
-    return MultiHash.toB58String(MultiHash.encode(out, "sha2-256"));
-  },
-  _ParseCBOR: function _ParseCBOR(cborResponse) {
-    var buffer = cborResponse.slice(7, cborResponse.length);
-    var hex = buffer.toString("hex");
-    return CBOR.decodeFirstSync(hex);
-  },
-  _VerifyPart: function _VerifyPart(_ref2) {
-    var partHash = _ref2.partHash,
-      qpartsResponse = _ref2.qpartsResponse;
-    try {
-      if (ContentObjectVerification._Hash(qpartsResponse) !== partHash.replace("hqp_", "")) {
-        throw Error("Hashes do not match");
-      }
-      var cbor = ContentObjectVerification._ParseCBOR(qpartsResponse);
-      return {
-        valid: true,
-        cbor: cbor
-      };
-    } catch (error) {
-      return {
-        valid: false,
-        error: error
-      };
-    }
-  },
-  _VerifyMetadata: function _VerifyMetadata(_ref3) {
-    var metadataCbor = _ref3.metadataCbor,
-      metadata = _ref3.metadata;
-    if (!metadataCbor) {
-      metadataCbor = {};
-    }
-    if (!metadata) {
-      metadata = {};
-    }
-    var response = {
-      valid: true,
-      invalidValues: []
-    };
-    var cborKeys = Object.keys(metadataCbor);
-    var metadataKeys = Object.keys(metadata);
-
-    // Find any difference between top level keys
-    var differentKeys = cborKeys.filter(function (x) {
-      return !metadataKeys.includes(x);
-    }).concat(metadataKeys.filter(function (x) {
-      return !cborKeys.includes(x);
-    }));
-    var _iterator = _createForOfIteratorHelper(differentKeys),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var key = _step.value;
-        var cborValue = metadataCbor[key];
-        var metadataValue = metadata[key];
-        response.invalidValues.push({
-          key: key,
-          cborValue: cborValue,
-          metadataValue: metadataValue
-        });
-      }
-
-      // Deep comparison of up to 5 keys
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-    var _iterator2 = _createForOfIteratorHelper(Object.keys(metadataCbor).slice(0, 5)),
-      _step2;
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var fieldToValidate = _step2.value;
-        var _cborValue = metadataCbor[fieldToValidate];
-        var _metadataValue = metadata[fieldToValidate];
-        if (!DeepEqual(_cborValue, _metadataValue)) {
-          response.invalidValues.push({
-            key: fieldToValidate,
-            cborValue: _cborValue,
-            metadataValue: _metadataValue
-          });
-        }
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
-    if (response.invalidValues.length !== 0) {
-      response.valid = false;
-    }
-    return response;
-  }
-};
-module.exports = ContentObjectVerification;