@eluvio/elv-client-js 4.0.90 → 4.0.92

package/dist/src/walletClient/index.js

@@ -5,8 +5,8 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var _require = require("../ElvClient"),
   ElvClient = _require.ElvClient;
 var Configuration = require("./Configuration");
@@ -77,7 +77,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     this.utils = client.utils;
     this.ForbiddenMethods = ElvWalletClient.ForbiddenMethods;
   }
-  return _createClass(ElvWalletClient, [{
+  _createClass(ElvWalletClient, [{
     key: "Log",
     value: function Log(message) {
       var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -134,7 +134,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "PersonalSign",
-    value: (function () {
+    value: function () {
       var _PersonalSign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
         var message, parameters, url;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -263,7 +263,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _PersonalSign.apply(this, arguments);
       }
       return PersonalSign;
-    }())
+    }()
   }, {
     key: "LogInURL",
     value: function () {
@@ -342,7 +342,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "LogIn",
-    value: (function () {
+    value: function () {
       var _LogIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref5) {
         var _this = this;
         var _ref5$method, method, provider, _ref5$mode, mode, callbackUrl, marketplaceParams, _ref5$clearLogin, clearLogin, callback, loginUrl;
@@ -461,10 +461,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @methodGroup Login
      */
-    )
   }, {
     key: "LogOut",
-    value: (function () {
+    value: function () {
       var _LogOut = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
         return _regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
@@ -507,7 +506,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _LogOut.apply(this, arguments);
       }
       return LogOut;
-    }())
+    }()
   }, {
     key: "TokenStatus",
     value: function () {
@@ -547,7 +546,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Authenticate",
-    value: (function () {
+    value: function () {
       var _Authenticate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref7) {
         var token, decodedToken;
         return _regeneratorRuntime.wrap(function _callee10$(_context10) {
@@ -613,10 +612,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * - signingToken - Identical to `authToken`, but also includes the ability to perform arbitrary signatures with the custodial wallet. This token should be protected and should not be
      * shared with third parties.
      */
-    )
   }, {
     key: "AuthenticateOAuth",
-    value: (function () {
+    value: function () {
       var _AuthenticateOAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref8) {
         var idToken, tenantId, email, signerURIs, _ref8$shareEmail, shareEmail, _ref8$extraData, extraData, nonce, _ref8$createRemoteTok, createRemoteToken, _ref8$force, force, tokenDuration, fabricToken, expiresAt, tokenResponse, address, decodedToken;
         return _regeneratorRuntime.wrap(function _callee11$(_context11) {
@@ -743,10 +741,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * @returns {Promise<string>} - Returns an authorization token that can be used to initialize the client using <a href="#Authenticate">Authenticate</a>.
      * Save this token to avoid having to reauthenticate. This token expires after 24 hours.
      */
-    )
   }, {
     key: "AuthenticateExternalWallet",
-    value: (function () {
+    value: function () {
       var _AuthenticateExternalWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref9) {
         var _this2 = this;
         var address, _ref9$tokenDuration, tokenDuration, _ref9$walletName, walletName, Sign, expiresAt, fabricToken;
@@ -815,7 +812,6 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @returns {string} - The client auth token
      */
-    )
   }, {
     key: "ClientAuthToken",
     value: function ClientAuthToken() {
@@ -1978,7 +1974,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Initialize",
-    value: (function () {
+    value: function () {
       var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref24) {
         var client, _ref24$appId, appId, _ref24$network, network, _ref24$mode, mode, localization, marketplaceParams, previewMarketplaceId, _ref24$storeAuthToken, storeAuthToken, _ref24$skipMarketplac, skipMarketplaceLoad, _ref25, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken;
         return _regeneratorRuntime.wrap(function _callee25$(_context25) {
@@ -2096,8 +2092,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _Initialize.apply(this, arguments);
       }
       return Initialize;
-    }())
+    }()
   }]);
+  return ElvWalletClient;
 }();
 Object.assign(ElvWalletClient.prototype, require("./ClientMethods"));
 Object.assign(ElvWalletClient.prototype, require("./Profile"));

package/package.json

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

package/src/ContentObjectAudit.js

@@ -5,7 +5,7 @@ const UUID = require("uuid").v4;
 const {ValidateParameters} = require("./Validation");
 
 const ContentObjectAudit = {
-  async AuditContentObject({client, libraryId, objectId, versionHash, salt, samples, live=false}) {
+  async AuditContentObject({client, libraryId, objectId, versionHash, salt, samples, live=false, authorizationToken}) {
     if(!salt){
       salt = client.utils.B64(UUID());
     }
@@ -53,7 +53,9 @@ const ContentObjectAudit = {
 
     let path = UrlJoin("qlibs", libraryId, "q", versionHash || objectId, live ? "call/live/audit" : "audit");
     let responses = await httpClient.RequestAll({
-      headers: await client.authClient.AuthorizationHeader({libraryId, objectId, versionHash}),
+      headers: authorizationToken ?
+        { Authorization: `Bearer ${authorizationToken}`} :
+        await client.authClient.AuthorizationHeader({libraryId, objectId, versionHash}),
       queryParams: queryParams,
       method: "GET",
       path

package/src/client/ContentAccess.js

@@ -3056,17 +3056,19 @@ exports.Collection = async function({collectionType}) {
  * @param {string=} versionHash - Version hash of the object -- if not specified, latest version is returned
  * @param {string=} salt - base64-encoded byte sequence for salting the audit hash
  * @param {Array<number>=} samples - list of percentages (0.0 - <1.0) used for sampling the content part list, up to 3
+ * @param {string=} authorizationToken - Additional authorization token for this request
  *
  * @returns {Promise<Object>} - Response describing audit results
  */
-exports.AuditContentObject = async function({libraryId, objectId, versionHash, salt, samples}) {
+exports.AuditContentObject = async function({libraryId, objectId, versionHash, salt, samples, authorizationToken}) {
   return await ContentObjectAudit.AuditContentObject({
     client: this,
     libraryId,
     objectId,
     versionHash,
     salt,
-    samples
+    samples,
+    authorizationToken
   });
 };
 

package/src/client/ContentManagement.js

@@ -1020,7 +1020,8 @@ exports.PublishContentVersion = async function({objectId, versionHash, awaitComm
   });
 
   const abi = await this.ContractAbi({id: objectId});
-  const fromBlock = commit.blockNumber + 1;
+  const fromBlock = commit.blockNumber - 30; // due to block re-org
+
   const objectHash = await this.ExtractValueFromEvent({
     abi,
     event: commit,
@@ -1049,6 +1050,7 @@ exports.PublishContentVersion = async function({objectId, versionHash, awaitComm
         contractAddress: this.utils.HashToAddress(objectId),
         abi,
         fromBlock,
+        topics: [ Ethers.utils.id("VersionConfirm(address,address,string)") ],
         count: 1000
       });
 
@@ -1091,7 +1093,6 @@ exports.PublishContentVersion = async function({objectId, versionHash, awaitComm
       }
     }
   }
-
 };
 
 /**

package/src/client/LiveStream.js

@@ -1955,16 +1955,18 @@ exports.StreamAddWatermark = async function({
  * @param {string=} versionHash - Version hash of the live stream -- if not specified, latest version is returned
  * @param {string=} salt - base64-encoded byte sequence for salting the audit hash
  * @param {Array<number>=} samples - list of percentages (0.0 - <1.0) used for sampling the content part list, up to 3
+ * @param {string=} authorizationToken - Additional authorization token for this request
  *
  * @returns {Promise<Object>} - Response describing audit results
  */
-exports.AuditStream = async function({objectId, versionHash, salt, samples}) {
+exports.AuditStream = async function({objectId, versionHash, salt, samples, authorizationToken}) {
   return await ContentObjectAudit.AuditContentObject({
     client: this,
     objectId,
     versionHash,
     salt,
     samples,
-    live: true
+    live: true,
+    authorizationToken
   });
 };

package/testScripts/BasicObjectOperations.js

@@ -0,0 +1,93 @@
+/* eslint-disable no-console */
+
+const { ElvClient } = require("../src/ElvClient");
+
+const configUrl = "https://test.net955205.contentfabric.io/config";
+const libraryId = "ilibE6vhm2YCR6vZCtW9mope6Dbo2Tn"; // to create and edit content
+
+const Tool = async () => {
+
+  const client = await ElvClient.FromConfigurationUrl({configUrl});
+
+  let wallet = client.GenerateWallet();
+  let signer = wallet.AddAccount({
+    privateKey: process.env.PRIVATE_KEY
+  });
+
+  client.SetSigner({signer});
+  client.ToggleLogging(true);
+
+
+  try {
+    let start = new Date().getTime();
+    const {objectId, writeToken} = await client.CreateContentObject({
+      libraryId: libraryId,
+      options: {
+        meta: {commit: "Create Content-" + start.toString()}
+      }
+    });
+    let end = new Date().getTime();
+    let timeDifference = end - start;
+    console.log("content object completed after: ", timeDifference, "ms");
+
+    start = new Date().getTime();
+    const {hash} = await client.FinalizeContentObject({
+      libraryId,
+      objectId,
+      writeToken
+    });
+    end = new Date();
+    timeDifference = end - start;
+    console.log("finalize object completed after: ", timeDifference, "ms");
+
+    start = new Date().getTime();
+    const editResponse = await client.EditContentObject({
+      libraryId,
+      objectId,
+    });
+    end = new Date().getTime();
+    timeDifference = end - start;
+    console.log("edit object completed after: ", timeDifference, "ms");
+
+    const metadata = {
+      description: "edit content",
+    };
+
+    start = new Date().getTime();
+    await client.ReplaceMetadata({
+      libraryId,
+      objectId,
+      writeToken: editResponse.write_token,
+      metadata
+    });
+    end = new Date().getTime();
+    timeDifference = end - start;
+    console.log("replace metadata completed after: ", timeDifference, "ms");
+
+
+    start = new Date().getTime();
+    await client.FinalizeContentObject({
+      libraryId,
+      objectId,
+      writeToken: editResponse.write_token,
+    });
+    end = new Date().getTime();
+    timeDifference = end - start;
+    console.log("finalize object completed after: ", timeDifference, "ms");
+
+    console.log(`\nSuccessfully created new content version: ${hash}`);
+  } catch(error) {
+    console.error("Error creating content object:");
+    console.error(error);
+  }
+};
+
+const privateKey = process.env.PRIVATE_KEY;
+if(!privateKey) {
+  console.error("PRIVATE_KEY environment variable must be specified");
+  return;
+}
+
+Tool();
+
+