@eluvio/elv-client-js 4.0.20 → 4.0.22

package/dist/src/AuthorizationClient.js

@@ -265,6 +265,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
               return this.client.ContentObjectMetadata({
                 libraryId: libraryId,
                 objectId: objectId,
+                versionHash: versionHash,
                 metadataSubtree: ownerCapKey
               });
             case 16:

package/dist/src/HttpClient.js

@@ -17,6 +17,7 @@ var HttpClient = /*#__PURE__*/function () {
     this.uriIndex = 0;
     this.debug = debug;
     this.draftURIs = {};
+    this.retries = Math.max(3, uris.length);
   }
   _createClass(HttpClient, [{
     key: "Log",
@@ -54,15 +55,16 @@ var HttpClient = /*#__PURE__*/function () {
     key: "Request",
     value: function () {
       var _Request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref2) {
-        var method, path, _ref2$queryParams, queryParams, body, _ref2$bodyType, bodyType, _ref2$headers, headers, _ref2$attempts, attempts, _ref2$failover, failover, _ref2$forceFailover, forceFailover, baseURI, writeTokenMatch, writeToken, uri, fetchParameters, response, responseType, errorBody, error;
+        var method, path, _ref2$queryParams, queryParams, body, _ref2$bodyType, bodyType, _ref2$headers, headers, _ref2$attempts, attempts, _ref2$allowFailover, allowFailover, _ref2$forceFailover, forceFailover, _ref2$allowRetry, allowRetry, baseURI, writeTokenMatch, writeToken, uri, fetchParameters, response, responseType, errorBody, error;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              method = _ref2.method, path = _ref2.path, _ref2$queryParams = _ref2.queryParams, queryParams = _ref2$queryParams === void 0 ? {} : _ref2$queryParams, body = _ref2.body, _ref2$bodyType = _ref2.bodyType, bodyType = _ref2$bodyType === void 0 ? "JSON" : _ref2$bodyType, _ref2$headers = _ref2.headers, headers = _ref2$headers === void 0 ? {} : _ref2$headers, _ref2$attempts = _ref2.attempts, attempts = _ref2$attempts === void 0 ? 0 : _ref2$attempts, _ref2$failover = _ref2.failover, failover = _ref2$failover === void 0 ? true : _ref2$failover, _ref2$forceFailover = _ref2.forceFailover, forceFailover = _ref2$forceFailover === void 0 ? false : _ref2$forceFailover;
+              method = _ref2.method, path = _ref2.path, _ref2$queryParams = _ref2.queryParams, queryParams = _ref2$queryParams === void 0 ? {} : _ref2$queryParams, body = _ref2.body, _ref2$bodyType = _ref2.bodyType, bodyType = _ref2$bodyType === void 0 ? "JSON" : _ref2$bodyType, _ref2$headers = _ref2.headers, headers = _ref2$headers === void 0 ? {} : _ref2$headers, _ref2$attempts = _ref2.attempts, attempts = _ref2$attempts === void 0 ? 0 : _ref2$attempts, _ref2$allowFailover = _ref2.allowFailover, allowFailover = _ref2$allowFailover === void 0 ? true : _ref2$allowFailover, _ref2$forceFailover = _ref2.forceFailover, forceFailover = _ref2$forceFailover === void 0 ? false : _ref2$forceFailover, _ref2$allowRetry = _ref2.allowRetry, allowRetry = _ref2$allowRetry === void 0 ? true : _ref2$allowRetry;
               baseURI = this.BaseURI(); // If URL contains a write token, it must go to the correct server and can not fail over
               writeTokenMatch = path.replace(/^\//, "").match(/(qlibs\/ilib[a-zA-Z0-9]+|q|qid)\/(tqw__[a-zA-Z0-9]+)/);
               writeToken = writeTokenMatch ? writeTokenMatch[2] : undefined;
               if (writeToken) {
+                allowFailover = false;
                 if (this.draftURIs[writeToken]) {
                   // Use saved write token URI
                   baseURI = this.draftURIs[writeToken];
@@ -103,17 +105,31 @@ var HttpClient = /*#__PURE__*/function () {
               };
             case 18:
               if (response.ok) {
-                _context.next = 41;
+                _context.next = 47;
                 break;
               }
-              if (!(!writeToken && (failover && parseInt(response.status) >= 500 || forceFailover) && attempts < this.uris.length)) {
+              if (!((parseInt(response.status) >= 500 || forceFailover) && allowRetry && attempts < this.retries)) {
+                _context.next = 31;
+                break;
+              }
+              if (!allowFailover) {
                 _context.next = 25;
                 break;
               }
-              // Server error - Try next node
-              this.Log("HttpClient failing over from ".concat(this.BaseURI(), ": ").concat(attempts + 1, " attempts"), true);
+              // Fail over to alternate node
               this.uriIndex = (this.uriIndex + 1) % this.uris.length;
-              _context.next = 24;
+              this.Log("HttpClient failing over from ".concat(baseURI.toString(), ": ").concat(attempts + 1, " attempts"), true);
+              _context.next = 28;
+              break;
+            case 25:
+              // Wait and retry
+              this.Log("HttpClient retrying request from ".concat(baseURI.toString(), ": ").concat(attempts + 1, " attempts"), true);
+              _context.next = 28;
+              return new Promise(function (resolve) {
+                return setTimeout(resolve, 1000);
+              });
+            case 28:
+              _context.next = 30;
               return this.Request({
                 method: method,
                 path: path,
@@ -124,34 +140,34 @@ var HttpClient = /*#__PURE__*/function () {
                 attempts: attempts + 1,
                 forceFailover: forceFailover
               });
-            case 24:
+            case 30:
               return _context.abrupt("return", _context.sent);
-            case 25:
+            case 31:
               // Parse JSON error if headers indicate JSON
               responseType = response.headers ? response.headers.get("content-type") || "" : "";
               errorBody = "";
               if (!(response.text && response.json)) {
-                _context.next = 38;
+                _context.next = 44;
                 break;
               }
               if (!responseType.includes("application/json")) {
-                _context.next = 34;
+                _context.next = 40;
                 break;
               }
-              _context.next = 31;
+              _context.next = 37;
               return response.json();
-            case 31:
+            case 37:
               _context.t1 = _context.sent;
-              _context.next = 37;
+              _context.next = 43;
               break;
-            case 34:
-              _context.next = 36;
+            case 40:
+              _context.next = 42;
               return response.text();
-            case 36:
+            case 42:
               _context.t1 = _context.sent;
-            case 37:
+            case 43:
               errorBody = _context.t1;
-            case 38:
+            case 44:
               error = {
                 name: "ElvHttpClientError",
                 status: response.status,
@@ -163,10 +179,10 @@ var HttpClient = /*#__PURE__*/function () {
               };
               this.Log(JSON.stringify(error, null, 2), true);
               throw error;
-            case 41:
+            case 47:
               this.Log("".concat(response.status, " - ").concat(method, " ").concat(uri.toString()));
               return _context.abrupt("return", response);
-            case 43:
+            case 49:
             case "end":
               return _context.stop();
           }

package/dist/src/client/ContentAccess.js

@@ -2807,7 +2807,7 @@ exports.CallBitcodeMethod = /*#__PURE__*/function () {
             method: constant ? "GET" : "POST",
             path: path,
             queryParams: queryParams,
-            failover: false
+            allowFailover: false
           });
         case 17:
           _context35.t2 = _context35.sent;
@@ -3904,6 +3904,7 @@ exports.EncryptionConk = /*#__PURE__*/function () {
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: objectId,
+            versionHash: versionHash,
             metadataSubtree: ownerCapKey
           });
         case 10:

package/dist/src/client/ContentManagement.js

@@ -1646,7 +1646,7 @@ exports.FinalizeContentObject = /*#__PURE__*/function () {
             headers: _context20.t13,
             method: "POST",
             path: _context20.t14,
-            failover: false
+            allowFailover: false
           };
           _context20.t16 = _context20.t12.Request.call(_context20.t12, _context20.t15);
           _context20.next = 34;
@@ -1904,7 +1904,7 @@ exports.MergeMetadata = /*#__PURE__*/function () {
             method: "POST",
             path: _context24.t2,
             body: _context24.t3,
-            failover: false
+            allowFailover: false
           };
           _context24.next = 15;
           return _context24.t0.Request.call(_context24.t0, _context24.t4);
@@ -1961,7 +1961,7 @@ exports.ReplaceMetadata = /*#__PURE__*/function () {
             method: "PUT",
             path: _context25.t2,
             body: _context25.t3,
-            failover: false
+            allowFailover: false
           };
           _context25.next = 15;
           return _context25.t0.Request.call(_context25.t0, _context25.t4);
@@ -2016,7 +2016,7 @@ exports.DeleteMetadata = /*#__PURE__*/function () {
             headers: _context26.t1,
             method: "DELETE",
             path: _context26.t2,
-            failover: false
+            allowFailover: false
           };
           _context26.next = 14;
           return _context26.t0.Request.call(_context26.t0, _context26.t3);