@eluvio/elv-client-js 4.0.91 → 4.0.93

package/dist/src/ContentObjectAudit.js

@@ -12,11 +12,11 @@ var _require = require("./Validation"),
 var ContentObjectAudit = {
   AuditContentObject: function AuditContentObject(_ref) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var client, libraryId, objectId, versionHash, salt, samples, _ref$live, live, queryParams, uris, httpClient, path, responses, auditHash, verified, audits, _iterator, _step, response, url, audit, res;
+      var client, libraryId, objectId, versionHash, salt, samples, _ref$live, live, authorizationToken, queryParams, uris, httpClient, path, responses, auditHash, verified, audits, _iterator, _step, response, url, audit, res;
       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, salt = _ref.salt, samples = _ref.samples, _ref$live = _ref.live, live = _ref$live === void 0 ? false : _ref$live;
+            client = _ref.client, libraryId = _ref.libraryId, objectId = _ref.objectId, versionHash = _ref.versionHash, salt = _ref.salt, samples = _ref.samples, _ref$live = _ref.live, live = _ref$live === void 0 ? false : _ref$live, authorizationToken = _ref.authorizationToken;
             if (!salt) {
               salt = client.utils.B64(UUID());
             }
@@ -73,33 +73,45 @@ var ContentObjectAudit = {
             });
             path = UrlJoin("qlibs", libraryId, "q", versionHash || objectId, live ? "call/live/audit" : "audit");
             _context.t4 = httpClient;
-            _context.next = 24;
+            if (!authorizationToken) {
+              _context.next = 26;
+              break;
+            }
+            _context.t5 = {
+              Authorization: "Bearer ".concat(authorizationToken)
+            };
+            _context.next = 29;
+            break;
+          case 26:
+            _context.next = 28;
             return client.authClient.AuthorizationHeader({
               libraryId: libraryId,
               objectId: objectId,
               versionHash: versionHash
             });
-          case 24:
+          case 28:
             _context.t5 = _context.sent;
-            _context.t6 = queryParams;
-            _context.t7 = path;
-            _context.t8 = {
-              headers: _context.t5,
-              queryParams: _context.t6,
+          case 29:
+            _context.t6 = _context.t5;
+            _context.t7 = queryParams;
+            _context.t8 = path;
+            _context.t9 = {
+              headers: _context.t6,
+              queryParams: _context.t7,
               method: "GET",
-              path: _context.t7
+              path: _context.t8
             };
-            _context.next = 30;
-            return _context.t4.RequestAll.call(_context.t4, _context.t8);
-          case 30:
+            _context.next = 35;
+            return _context.t4.RequestAll.call(_context.t4, _context.t9);
+          case 35:
             responses = _context.sent;
             audits = [];
             _iterator = _createForOfIteratorHelper(responses);
-            _context.prev = 33;
+            _context.prev = 38;
             _iterator.s();
-          case 35:
+          case 40:
             if ((_step = _iterator.n()).done) {
-              _context.next = 52;
+              _context.next = 57;
               break;
             }
             response = _step.value;
@@ -108,17 +120,17 @@ var ContentObjectAudit = {
               host: url.hostname
             };
             if (response.ok) {
-              _context.next = 44;
+              _context.next = 49;
               break;
             }
             audit.error = response;
             audit.errorMessage = response.message || JSON.stringify(response);
-            _context.next = 49;
+            _context.next = 54;
             break;
-          case 44:
-            _context.next = 46;
+          case 49:
+            _context.next = 51;
             return client.utils.ResponseToJson(response);
-          case 46:
+          case 51:
             res = _context.sent;
             if (auditHash === undefined) {
               auditHash = res.audit_hash;
@@ -128,23 +140,23 @@ var ContentObjectAudit = {
               verified = true;
             }
             audit.audit_hash = res.audit_hash;
-          case 49:
+          case 54:
             audits.push(audit);
-          case 50:
-            _context.next = 35;
-            break;
-          case 52:
-            _context.next = 57;
+          case 55:
+            _context.next = 40;
             break;
-          case 54:
-            _context.prev = 54;
-            _context.t9 = _context["catch"](33);
-            _iterator.e(_context.t9);
           case 57:
-            _context.prev = 57;
+            _context.next = 62;
+            break;
+          case 59:
+            _context.prev = 59;
+            _context.t10 = _context["catch"](38);
+            _iterator.e(_context.t10);
+          case 62:
+            _context.prev = 62;
             _iterator.f();
-            return _context.finish(57);
-          case 60:
+            return _context.finish(62);
+          case 65:
             verified = verified || false;
             return _context.abrupt("return", {
               verified: verified,
@@ -152,11 +164,11 @@ var ContentObjectAudit = {
               samples: samples,
               audits: audits
             });
-          case 62:
+          case 67:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[33, 54, 57, 60]]);
+      }, _callee, null, [[38, 59, 62, 65]]);
     }))();
   }
 };

package/dist/src/client/ContentAccess.js

@@ -4811,16 +4811,17 @@ exports.Collection = /*#__PURE__*/function () {
  * @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 = /*#__PURE__*/function () {
   var _ref109 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee59(_ref108) {
-    var libraryId, objectId, versionHash, salt, samples;
+    var libraryId, objectId, versionHash, salt, samples, authorizationToken;
     return _regeneratorRuntime.wrap(function _callee59$(_context59) {
       while (1) switch (_context59.prev = _context59.next) {
         case 0:
-          libraryId = _ref108.libraryId, objectId = _ref108.objectId, versionHash = _ref108.versionHash, salt = _ref108.salt, samples = _ref108.samples;
+          libraryId = _ref108.libraryId, objectId = _ref108.objectId, versionHash = _ref108.versionHash, salt = _ref108.salt, samples = _ref108.samples, authorizationToken = _ref108.authorizationToken;
           _context59.next = 3;
           return ContentObjectAudit.AuditContentObject({
             client: this,
@@ -4828,7 +4829,8 @@ exports.AuditContentObject = /*#__PURE__*/function () {
             objectId: objectId,
             versionHash: versionHash,
             salt: salt,
-            samples: samples
+            samples: samples,
+            authorizationToken: authorizationToken
           });
         case 3:
           return _context59.abrupt("return", _context59.sent);

package/dist/src/client/ContentManagement.js

@@ -1761,14 +1761,14 @@ exports.PublishContentVersion = /*#__PURE__*/function () {
           throw Error("Pending version hash mismatch on ".concat(objectId, ": expected ").concat(objectHash, ", currently ").concat(pendingHash));
         case 19:
           if (!awaitCommitConfirmation) {
-            _context21.next = 34;
+            _context21.next = 48;
             break;
           }
           this.Log("Awaiting commit confirmation for ".concat(objectHash));
           pollingInterval = this.ethClient.Provider().pollingInterval || 500; // eslint-disable-next-line no-constant-condition
         case 22:
           if (!true) {
-            _context21.next = 34;
+            _context21.next = 48;
             break;
           }
           _context21.next = 25;
@@ -1776,15 +1776,37 @@ exports.PublishContentVersion = /*#__PURE__*/function () {
             return setTimeout(resolve, pollingInterval);
           });
         case 25:
-          _context21.next = 27;
-          return this.ContractEvents({
-            contractAddress: this.utils.HashToAddress(objectId),
-            abi: abi,
-            fromBlock: fromBlock,
-            topics: [Ethers.utils.id("VersionConfirm(address,address,string)")],
-            count: 1000
+          _context21.t0 = this;
+          _context21.t1 = this.utils.HashToAddress(objectId);
+          _context21.t2 = abi;
+          _context21.t3 = fromBlock;
+          _context21.next = 31;
+          return this.authClient.IsV3({
+            id: objectId
           });
-        case 27:
+        case 31:
+          if (!_context21.sent) {
+            _context21.next = 35;
+            break;
+          }
+          _context21.t4 = Ethers.utils.id("VersionConfirm(address,address,string)");
+          _context21.next = 36;
+          break;
+        case 35:
+          _context21.t4 = Ethers.utils.id("VersionConfirm(address,string)");
+        case 36:
+          _context21.t5 = _context21.t4;
+          _context21.t6 = [_context21.t5];
+          _context21.t7 = {
+            contractAddress: _context21.t1,
+            abi: _context21.t2,
+            fromBlock: _context21.t3,
+            topics: _context21.t6,
+            count: 1000
+          };
+          _context21.next = 41;
+          return _context21.t0.ContractEvents.call(_context21.t0, _context21.t7);
+        case 41:
           events = _context21.sent;
           confirmEvent = events.find(function (blockEvents) {
             return blockEvents.find(function (event) {
@@ -1792,72 +1814,72 @@ exports.PublishContentVersion = /*#__PURE__*/function () {
             });
           });
           if (!confirmEvent) {
-            _context21.next = 32;
+            _context21.next = 46;
             break;
           }
           // Found confirmation
           this.Log("Commit confirmed on chain: ".concat(objectHash));
-          return _context21.abrupt("break", 34);
-        case 32:
+          return _context21.abrupt("break", 48);
+        case 46:
           _context21.next = 22;
           break;
-        case 34:
+        case 48:
           if (!awaitCommitConfirmation) {
-            _context21.next = 62;
+            _context21.next = 76;
             break;
           }
           _pollingInterval = 500; // ms
           tries = 20;
-        case 37:
+        case 51:
           if (!(tries > 0)) {
-            _context21.next = 62;
+            _context21.next = 76;
             break;
           }
           h = void 0;
-          _context21.prev = 39;
-          _context21.next = 42;
+          _context21.prev = 53;
+          _context21.next = 56;
           return this.LatestVersionHashV2({
             objectId: objectId
           });
-        case 42:
+        case 56:
           h = _context21.sent;
           if (!(h === versionHash)) {
-            _context21.next = 48;
+            _context21.next = 62;
             break;
           }
           this.Log("Commit confirmed on fabric node: ".concat(versionHash));
-          return _context21.abrupt("break", 62);
-        case 48:
+          return _context21.abrupt("break", 76);
+        case 62:
           tries--;
-          _context21.next = 51;
+          _context21.next = 65;
           return new Promise(function (resolve) {
             return setTimeout(resolve, _pollingInterval);
           });
-        case 51:
-          _context21.next = 60;
+        case 65:
+          _context21.next = 74;
           break;
-        case 53:
-          _context21.prev = 53;
-          _context21.t0 = _context21["catch"](39);
-          if (!(_context21.t0.status !== 404)) {
-            _context21.next = 57;
+        case 67:
+          _context21.prev = 67;
+          _context21.t8 = _context21["catch"](53);
+          if (!(_context21.t8.status !== 404)) {
+            _context21.next = 71;
             break;
           }
-          throw _context21.t0;
-        case 57:
+          throw _context21.t8;
+        case 71:
           tries--;
-          _context21.next = 60;
+          _context21.next = 74;
           return new Promise(function (resolve) {
             return setTimeout(resolve, _pollingInterval);
           });
-        case 60:
-          _context21.next = 37;
+        case 74:
+          _context21.next = 51;
           break;
-        case 62:
+        case 76:
         case "end":
           return _context21.stop();
       }
-    }, _callee21, this, [[39, 53]]);
+    }, _callee21, this, [[53, 67]]);
   }));
   return function (_x20) {
     return _ref38.apply(this, arguments);

package/dist/src/client/LiveStream.js

@@ -2497,16 +2497,17 @@ exports.StreamAddWatermark = /*#__PURE__*/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 = /*#__PURE__*/function () {
   var _ref33 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(_ref32) {
-    var objectId, versionHash, salt, samples;
+    var objectId, versionHash, salt, samples, authorizationToken;
     return _regeneratorRuntime.wrap(function _callee17$(_context17) {
       while (1) switch (_context17.prev = _context17.next) {
         case 0:
-          objectId = _ref32.objectId, versionHash = _ref32.versionHash, salt = _ref32.salt, samples = _ref32.samples;
+          objectId = _ref32.objectId, versionHash = _ref32.versionHash, salt = _ref32.salt, samples = _ref32.samples, authorizationToken = _ref32.authorizationToken;
           _context17.next = 3;
           return ContentObjectAudit.AuditContentObject({
             client: this,
@@ -2514,7 +2515,8 @@ exports.AuditStream = /*#__PURE__*/function () {
             versionHash: versionHash,
             salt: salt,
             samples: samples,
-            live: true
+            live: true,
+            authorizationToken: authorizationToken
           });
         case 3:
           return _context17.abrupt("return", _context17.sent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.91",
+  "version": "4.0.93",
   "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

@@ -1050,7 +1050,11 @@ exports.PublishContentVersion = async function({objectId, versionHash, awaitComm
         contractAddress: this.utils.HashToAddress(objectId),
         abi,
         fromBlock,
-        topics: [ Ethers.utils.id("VersionConfirm(address,address,string)") ],
+        topics: [
+          await this.authClient.IsV3({id: objectId}) ?
+            Ethers.utils.id("VersionConfirm(address,address,string)") :
+            Ethers.utils.id("VersionConfirm(address,string)")
+        ],
         count: 1000
       });
 

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
   });
 };