@eluvio/elv-client-js 4.0.81 → 4.0.82

package/dist/src/client/ContentManagement.js

@@ -1711,7 +1711,7 @@ exports.FinalizeContentObject = /*#__PURE__*/function () {
  */
 exports.PublishContentVersion = /*#__PURE__*/function () {
   var _ref38 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(_ref37) {
-    var objectId, versionHash, _ref37$awaitCommitCon, awaitCommitConfirmation, commit, abi, fromBlock, objectHash, pendingHash, pollingInterval, events, confirmEvent;
+    var objectId, versionHash, _ref37$awaitCommitCon, awaitCommitConfirmation, commit, abi, fromBlock, objectHash, pendingHash, pollingInterval, events, confirmEvent, _pollingInterval, tries, h;
     return _regeneratorRuntime.wrap(function _callee21$(_context21) {
       while (1) switch (_context21.prev = _context21.next) {
         case 0:
@@ -1793,12 +1793,44 @@ exports.PublishContentVersion = /*#__PURE__*/function () {
             break;
           }
           // Found confirmation
-          this.Log("Commit confirmed: ".concat(objectHash));
+          this.Log("Commit confirmed on chain: ".concat(objectHash));
           return _context21.abrupt("break", 34);
         case 32:
           _context21.next = 22;
           break;
         case 34:
+          if (!awaitCommitConfirmation) {
+            _context21.next = 48;
+            break;
+          }
+          _pollingInterval = 500; // ms
+          tries = 20;
+        case 37:
+          if (!(tries > 0)) {
+            _context21.next = 48;
+            break;
+          }
+          _context21.next = 40;
+          return this.LatestVersionHashV2({
+            objectId: objectId
+          });
+        case 40:
+          h = _context21.sent;
+          if (!(h == versionHash)) {
+            _context21.next = 44;
+            break;
+          }
+          this.Log("Commit confirmed on fabric node: ".concat(versionHash));
+          return _context21.abrupt("break", 48);
+        case 44:
+          _context21.next = 46;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, _pollingInterval);
+          });
+        case 46:
+          _context21.next = 37;
+          break;
+        case 48:
         case "end":
           return _context21.stop();
       }

package/package.json

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

package/src/client/ContentAccess.js

@@ -1075,7 +1075,7 @@ exports.ContentObjectVersions = async function({libraryId, objectId}) {
 };
 
 /**
- * Retrieve the version hash of the latest version of the specified object
+ * Retrieve the version hash of the latest version of the specified object from chain
  *
  * @methodGroup Content Objects
  * @namedParams
@@ -1122,6 +1122,42 @@ exports.LatestVersionHash = async function({objectId, versionHash}) {
   return latestHash;
 };
 
+/**
+ * Retrieve the version hash of the latest version of the specified object via fabric API.
+ * Requires authorization.
+ *
+ * @methodGroup Content Objects
+ * @namedParams
+ * @param {string=} objectId - ID of the object
+ * @param {string=} versionHash - Version hash of the object
+ *
+ * @returns {Promise<string>} - The latest version hash of the object
+ */
+exports.LatestVersionHashV2 = async function({objectId, versionHash}) {
+  if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
+
+  ValidateObject(objectId);
+
+  let latestHash;
+  try {
+    let path = UrlJoin("q", objectId);
+
+    let q = await this.utils.ResponseToJson(
+      this.HttpClient.Request({
+        headers: await this.authClient.AuthorizationHeader({objectId}),
+        method: "GET",
+        path: path
+      })
+    );
+    latestHash = q.hash;
+
+  } catch(error) {
+    console.log("ERROR", error);
+    throw Error(`Unable to determine latest version hash for ${versionHash || objectId}`);
+  }
+  return latestHash;
+};
+
 /* URL Methods */
 
 /**

package/src/client/ContentManagement.js

@@ -1044,11 +1044,26 @@ exports.PublishContentVersion = async function({objectId, versionHash, awaitComm
 
       if(confirmEvent) {
         // Found confirmation
-        this.Log(`Commit confirmed: ${objectHash}`);
+        this.Log(`Commit confirmed on chain: ${objectHash}`);
         break;
       }
     }
   }
+
+  // APIv2 ensure the fabric API returns the correct hash
+  if(awaitCommitConfirmation) {
+    const pollingInterval = 500; // ms
+    let tries = 20;
+    while (tries > 0) {
+      const h = await this.LatestVersionHashV2({objectId});
+      if (h == versionHash) {
+        this.Log(`Commit confirmed on fabric node: ${versionHash}`);
+        break;
+      }
+      await new Promise(resolve => setTimeout(resolve, pollingInterval));
+    }
+  }
+
 };
 
 /**