@eluvio/elv-client-js 4.0.11 → 4.0.13

package/dist/src/HttpClient.js

@@ -1,33 +1,23 @@
 var _regeneratorRuntime = require("@babel/runtime/regenerator");
-
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
-
 var _createClass = require("@babel/runtime/helpers/createClass");
-
 var URI = require("urijs");
-
 var _Fetch = typeof fetch !== "undefined" ? fetch : require("node-fetch")["default"];
-
 var _require = require("./LogMessage"),
-    LogMessage = _require.LogMessage;
-
+  LogMessage = _require.LogMessage;
 var HttpClient = /*#__PURE__*/function () {
   "use strict";
 
   function HttpClient(_ref) {
     var uris = _ref.uris,
-        debug = _ref.debug;
-
+      debug = _ref.debug;
     _classCallCheck(this, HttpClient);
-
     this.uris = uris;
     this.uriIndex = 0;
     this.debug = debug;
     this.draftURIs = {};
   }
-
   _createClass(HttpClient, [{
     key: "Log",
     value: function Log(message) {
@@ -42,23 +32,22 @@ var HttpClient = /*#__PURE__*/function () {
   }, {
     key: "RecordWriteToken",
     value: function RecordWriteToken(writeToken, nodeUrlStr) {
-      this.draftURIs[writeToken] = nodeUrlStr ? new URI(nodeUrlStr) : this.BaseURI();
+      if (!nodeUrlStr) throw Error("RecordWriteToken() - nodeUrlStr not supplied");
+      if (!writeToken) throw Error("RecordWriteToken() - writeToken not supplied");
+      this.draftURIs[writeToken] = new URI(nodeUrlStr);
     }
   }, {
     key: "RequestHeaders",
     value: function RequestHeaders(bodyType) {
       var headers = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       if (!headers.Accept) {
         headers["Accept"] = "application/json";
       }
-
       if (bodyType === "JSON") {
         headers["Content-type"] = "application/json";
       } else if (bodyType === "BINARY") {
         headers["Content-type"] = "application/octet-stream";
       }
-
       return headers;
     }
   }, {
@@ -66,160 +55,134 @@ var HttpClient = /*#__PURE__*/function () {
     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;
-
         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;
-                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) {
-                  if (this.draftURIs[writeToken]) {
-                    // Use saved write token URI
-                    baseURI = this.draftURIs[writeToken];
-                  } else {
-                    // Save current URI for all future requests involving this write token
-                    this.draftURIs[writeToken] = baseURI;
-                  }
+          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;
+              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) {
+                if (this.draftURIs[writeToken]) {
+                  // Use saved write token URI
+                  baseURI = this.draftURIs[writeToken];
+                } else {
+                  // Save current URI for all future requests involving this write token
+                  this.draftURIs[writeToken] = baseURI;
                 }
-
-                uri = baseURI.path(path).query(queryParams).hash("");
-                fetchParameters = {
-                  method: method,
-                  headers: this.RequestHeaders(bodyType, headers)
-                };
-
-                if (method === "POST" || method === "PUT" || method === "DELETE") {
-                  if (body && bodyType === "JSON") {
-                    fetchParameters.body = JSON.stringify(body);
-                  } else if (body) {
-                    fetchParameters.body = body;
-                  }
+              }
+              uri = baseURI.path(path).query(queryParams).hash("");
+              fetchParameters = {
+                method: method,
+                headers: this.RequestHeaders(bodyType, headers)
+              };
+              if (method === "POST" || method === "PUT" || method === "DELETE") {
+                if (body && bodyType === "JSON") {
+                  fetchParameters.body = JSON.stringify(body);
+                } else if (body) {
+                  fetchParameters.body = body;
                 }
-
-                _context.prev = 8;
-                _context.next = 11;
-                return HttpClient.Fetch(uri.toString(), fetchParameters);
-
-              case 11:
-                response = _context.sent;
-                _context.next = 17;
+              }
+              this.Log("".concat(method, " - ").concat(uri.toString()));
+              _context.prev = 9;
+              _context.next = 12;
+              return HttpClient.Fetch(uri.toString(), fetchParameters);
+            case 12:
+              response = _context.sent;
+              _context.next = 18;
+              break;
+            case 15:
+              _context.prev = 15;
+              _context.t0 = _context["catch"](9);
+              response = {
+                ok: false,
+                status: 500,
+                statusText: "ElvClient Error: " + _context.t0.message,
+                url: uri.toString(),
+                stack: _context.t0.stack
+              };
+            case 18:
+              if (response.ok) {
+                _context.next = 41;
                 break;
-
-              case 14:
-                _context.prev = 14;
-                _context.t0 = _context["catch"](8);
-                response = {
-                  ok: false,
-                  status: 500,
-                  statusText: "ElvClient Error: " + _context.t0.message,
-                  url: uri.toString(),
-                  stack: _context.t0.stack
-                };
-
-              case 17:
-                if (response.ok) {
-                  _context.next = 40;
-                  break;
-                }
-
-                if (!(!writeToken && (failover && parseInt(response.status) >= 500 || forceFailover) && attempts < this.uris.length)) {
-                  _context.next = 24;
-                  break;
-                }
-
-                // Server error - Try next node
-                this.Log("HttpClient failing over from ".concat(this.BaseURI(), ": ").concat(attempts + 1, " attempts"), true);
-                this.uriIndex = (this.uriIndex + 1) % this.uris.length;
-                _context.next = 23;
-                return this.Request({
-                  method: method,
-                  path: path,
-                  queryParams: queryParams,
-                  body: body,
-                  bodyType: bodyType,
-                  headers: headers,
-                  attempts: attempts + 1,
-                  forceFailover: forceFailover
-                });
-
-              case 23:
-                return _context.abrupt("return", _context.sent);
-
-              case 24:
-                // Parse JSON error if headers indicate JSON
-                responseType = response.headers ? response.headers.get("content-type") || "" : "";
-                errorBody = "";
-
-                if (!(response.text && response.json)) {
-                  _context.next = 37;
-                  break;
-                }
-
-                if (!responseType.includes("application/json")) {
-                  _context.next = 33;
-                  break;
-                }
-
-                _context.next = 30;
-                return response.json();
-
-              case 30:
-                _context.t1 = _context.sent;
-                _context.next = 36;
+              }
+              if (!(!writeToken && (failover && parseInt(response.status) >= 500 || forceFailover) && attempts < this.uris.length)) {
+                _context.next = 25;
                 break;
-
-              case 33:
-                _context.next = 35;
-                return response.text();
-
-              case 35:
-                _context.t1 = _context.sent;
-
-              case 36:
-                errorBody = _context.t1;
-
-              case 37:
-                error = {
-                  name: "ElvHttpClientError",
-                  status: response.status,
-                  statusText: response.statusText,
-                  message: response.statusText,
-                  url: uri.toString(),
-                  body: errorBody,
-                  requestParams: fetchParameters
-                };
-                this.Log(JSON.stringify(error, null, 2), true);
-                throw error;
-
-              case 40:
-                this.Log("".concat(response.status, " - ").concat(method, " ").concat(uri.toString()));
-                return _context.abrupt("return", response);
-
-              case 42:
-              case "end":
-                return _context.stop();
-            }
+              }
+              // Server error - Try next node
+              this.Log("HttpClient failing over from ".concat(this.BaseURI(), ": ").concat(attempts + 1, " attempts"), true);
+              this.uriIndex = (this.uriIndex + 1) % this.uris.length;
+              _context.next = 24;
+              return this.Request({
+                method: method,
+                path: path,
+                queryParams: queryParams,
+                body: body,
+                bodyType: bodyType,
+                headers: headers,
+                attempts: attempts + 1,
+                forceFailover: forceFailover
+              });
+            case 24:
+              return _context.abrupt("return", _context.sent);
+            case 25:
+              // Parse JSON error if headers indicate JSON
+              responseType = response.headers ? response.headers.get("content-type") || "" : "";
+              errorBody = "";
+              if (!(response.text && response.json)) {
+                _context.next = 38;
+                break;
+              }
+              if (!responseType.includes("application/json")) {
+                _context.next = 34;
+                break;
+              }
+              _context.next = 31;
+              return response.json();
+            case 31:
+              _context.t1 = _context.sent;
+              _context.next = 37;
+              break;
+            case 34:
+              _context.next = 36;
+              return response.text();
+            case 36:
+              _context.t1 = _context.sent;
+            case 37:
+              errorBody = _context.t1;
+            case 38:
+              error = {
+                name: "ElvHttpClientError",
+                status: response.status,
+                statusText: response.statusText,
+                message: response.statusText,
+                url: uri.toString(),
+                body: errorBody,
+                requestParams: fetchParameters
+              };
+              this.Log(JSON.stringify(error, null, 2), true);
+              throw error;
+            case 41:
+              this.Log("".concat(response.status, " - ").concat(method, " ").concat(uri.toString()));
+              return _context.abrupt("return", response);
+            case 43:
+            case "end":
+              return _context.stop();
           }
-        }, _callee, this, [[8, 14]]);
+        }, _callee, this, [[9, 15]]);
       }));
-
       function Request(_x) {
         return _Request.apply(this, arguments);
       }
-
       return Request;
     }()
   }, {
     key: "URL",
     value: function URL(_ref3) {
       var path = _ref3.path,
-          _ref3$queryParams = _ref3.queryParams,
-          queryParams = _ref3$queryParams === void 0 ? {} : _ref3$queryParams;
+        _ref3$queryParams = _ref3.queryParams,
+        queryParams = _ref3$queryParams === void 0 ? {} : _ref3$queryParams;
       return this.BaseURI().path(path).query(queryParams).hash("").toString();
     }
   }], [{
@@ -229,8 +192,6 @@ var HttpClient = /*#__PURE__*/function () {
       return _Fetch(url, params);
     }
   }]);
-
   return HttpClient;
 }();
-
 module.exports = HttpClient;

package/dist/src/Id.js

@@ -1,17 +1,14 @@
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
-
 var _createClass = require("@babel/runtime/helpers/createClass");
-
 // Incremental numerical IDs
-var __id = 0;
 
+var __id = 0;
 var Id = /*#__PURE__*/function () {
   "use strict";
 
   function Id() {
     _classCallCheck(this, Id);
   }
-
   _createClass(Id, null, [{
     key: "next",
     value: function next() {
@@ -19,8 +16,6 @@ var Id = /*#__PURE__*/function () {
       return __id;
     }
   }]);
-
   return Id;
 }();
-
 module.exports = Id;

package/dist/src/LogMessage.js

@@ -1,29 +1,25 @@
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 var CustomLogFunc = function CustomLogFunc(attrName, debugOpts) {
   return _typeof(debugOpts) === "object" && typeof debugOpts[attrName] === "function" ? debugOpts[attrName] : null;
 };
-
 var StringifyIfObject = function StringifyIfObject(message) {
   return _typeof(message) === "object" ? JSON.stringify(message) : message;
 };
-
 var LogMessage = function LogMessage(reporter, message) {
   var error = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-
   if (!reporter.debug) {
     return;
   }
-
   var customLog = CustomLogFunc("log", reporter.debugOptions);
   var customError = CustomLogFunc("error", reporter.debugOptions);
   var prefix = "(elv-client-js#".concat(reporter.constructor.name, ")");
   var standardMsg = "\n".concat(prefix, " ").concat(StringifyIfObject(message), "\n");
-  error ? customError ? customError(prefix, message) : // eslint-disable-next-line no-console
-  console.error(standardMsg) : customLog ? customLog(prefix, message) : // eslint-disable-next-line no-console
+  error ? customError ? customError(prefix, message) :
+  // eslint-disable-next-line no-console
+  console.error(standardMsg) : customLog ? customLog(prefix, message) :
+  // eslint-disable-next-line no-console
   console.log(standardMsg);
 };
-
 module.exports = {
   LogMessage: LogMessage
 };