@eluvio/elv-client-js 4.0.147 → 4.2.0

package/dist/src/Utils.js

@@ -3,8 +3,8 @@ var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _slicedToArray = require("@babel/runtime/helpers/slicedToArray");
-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; }
+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; }
 if (typeof globalThis.Buffer === "undefined") {
   globalThis.Buffer = require("buffer/").Buffer;
 }
@@ -281,7 +281,6 @@ var Utils = {
       flags: flags // flags for part write token (tqp_)
     };
   },
-
   /**
    * Convert contract address to multiformat hash
    *
@@ -470,37 +469,37 @@ var Utils = {
     });
   },
   LimitedMap: function () {
-    var _LimitedMap = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(limit, array, f) {
+    var _LimitedMap = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(limit, array, f) {
       var index, locked, nextIndex, results, active;
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      return _regeneratorRuntime.wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             index = 0;
             locked = false;
             nextIndex = /*#__PURE__*/function () {
-              var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+              var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
                 var thisIndex;
-                return _regeneratorRuntime.wrap(function _callee$(_context) {
+                return _regeneratorRuntime.wrap(function (_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
                       if (!locked) {
-                        _context.next = 5;
+                        _context.next = 2;
                         break;
                       }
-                      _context.next = 3;
+                      _context.next = 1;
                       return new Promise(function (resolve) {
                         return setTimeout(resolve, 10);
                       });
-                    case 3:
+                    case 1:
                       _context.next = 0;
                       break;
-                    case 5:
+                    case 2:
                       locked = true;
                       thisIndex = index;
                       index += 1;
                       locked = false;
                       return _context.abrupt("return", thisIndex);
-                    case 10:
+                    case 3:
                     case "end":
                       return _context.stop();
                   }
@@ -513,53 +512,53 @@ var Utils = {
             results = [];
             active = 0;
             return _context3.abrupt("return", new Promise(function (resolve, reject) {
-              _toConsumableArray(Array(limit || 1)).forEach( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-                var index;
-                return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+              _toConsumableArray(Array(limit || 1)).forEach(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+                var index, _t;
+                return _regeneratorRuntime.wrap(function (_context2) {
                   while (1) switch (_context2.prev = _context2.next) {
                     case 0:
                       active += 1;
-                      _context2.next = 3;
+                      _context2.next = 1;
                       return nextIndex();
-                    case 3:
+                    case 1:
                       index = _context2.sent;
-                    case 4:
+                    case 2:
                       if (!(index < array.length)) {
-                        _context2.next = 19;
+                        _context2.next = 8;
                         break;
                       }
-                      _context2.prev = 5;
-                      _context2.next = 8;
+                      _context2.prev = 3;
+                      _context2.next = 4;
                       return f(array[index], index);
-                    case 8:
+                    case 4:
                       results[index] = _context2.sent;
-                      _context2.next = 14;
+                      _context2.next = 6;
                       break;
-                    case 11:
-                      _context2.prev = 11;
-                      _context2.t0 = _context2["catch"](5);
-                      reject(_context2.t0);
-                    case 14:
-                      _context2.next = 16;
+                    case 5:
+                      _context2.prev = 5;
+                      _t = _context2["catch"](3);
+                      reject(_t);
+                    case 6:
+                      _context2.next = 7;
                       return nextIndex();
-                    case 16:
+                    case 7:
                       index = _context2.sent;
-                      _context2.next = 4;
+                      _context2.next = 2;
                       break;
-                    case 19:
+                    case 8:
                       // When finished and no more workers are active, resolve
                       active -= 1;
                       if (active === 0) {
                         resolve(results);
                       }
-                    case 21:
+                    case 9:
                     case "end":
                       return _context2.stop();
                   }
-                }, _callee2, null, [[5, 11]]);
+                }, _callee2, null, [[3, 5]]);
               })));
             }));
-          case 6:
+          case 1:
           case "end":
             return _context3.stop();
         }
@@ -579,20 +578,20 @@ var Utils = {
    * @return {*} - Result of parsing response body as JSON
    */
   ResponseToJson: function () {
-    var _ResponseToJson = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(response) {
+    var _ResponseToJson = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(response) {
       var debug,
         logFn,
         _args4 = arguments;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      return _regeneratorRuntime.wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             debug = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : false;
             logFn = _args4.length > 2 ? _args4[2] : undefined;
-            _context4.next = 4;
+            _context4.next = 1;
             return Utils.ResponseToFormat("json", response, debug, logFn);
-          case 4:
+          case 1:
             return _context4.abrupt("return", _context4.sent);
-          case 5:
+          case 2:
           case "end":
             return _context4.stop();
         }
@@ -613,60 +612,61 @@ var Utils = {
    * @return {*} - Result of converting response body into the requested format
    */
   ResponseToFormat: function () {
-    var _ResponseToFormat = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(format, response) {
+    var _ResponseToFormat = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(format, response) {
       var debug,
         logFn,
         formattedBody,
-        _args5 = arguments;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        _args5 = arguments,
+        _t2;
+      return _regeneratorRuntime.wrap(function (_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             debug = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : false;
             logFn = _args5.length > 3 ? _args5[3] : undefined;
-            _context5.next = 4;
+            _context5.next = 1;
             return response;
-          case 4:
+          case 1:
             response = _context5.sent;
-            _context5.t0 = format.toLowerCase();
-            _context5.next = _context5.t0 === "json" ? 8 : _context5.t0 === "text" ? 13 : _context5.t0 === "blob" ? 18 : _context5.t0 === "arraybuffer" ? 21 : _context5.t0 === "formdata" ? 24 : _context5.t0 === "buffer" ? 27 : 30;
+            _t2 = format.toLowerCase();
+            _context5.next = _t2 === "json" ? 2 : _t2 === "text" ? 4 : _t2 === "blob" ? 6 : _t2 === "arraybuffer" ? 8 : _t2 === "formdata" ? 10 : _t2 === "buffer" ? 12 : 14;
             break;
-          case 8:
-            _context5.next = 10;
+          case 2:
+            _context5.next = 3;
             return response.json();
-          case 10:
+          case 3:
             formattedBody = _context5.sent;
             if (debug) logFn("response body: ".concat(JSON.stringify(formattedBody, null, 2)));
             return _context5.abrupt("return", formattedBody);
-          case 13:
-            _context5.next = 15;
+          case 4:
+            _context5.next = 5;
             return response.text();
-          case 15:
+          case 5:
             formattedBody = _context5.sent;
             if (debug) logFn("response body: ".concat(formattedBody));
             return _context5.abrupt("return", formattedBody);
-          case 18:
-            _context5.next = 20;
+          case 6:
+            _context5.next = 7;
             return response.blob();
-          case 20:
+          case 7:
             return _context5.abrupt("return", _context5.sent);
-          case 21:
-            _context5.next = 23;
+          case 8:
+            _context5.next = 9;
             return response.arrayBuffer();
-          case 23:
+          case 9:
             return _context5.abrupt("return", _context5.sent);
-          case 24:
-            _context5.next = 26;
+          case 10:
+            _context5.next = 11;
             return response.formData();
-          case 26:
+          case 11:
             return _context5.abrupt("return", _context5.sent);
-          case 27:
-            _context5.next = 29;
+          case 12:
+            _context5.next = 13;
             return response.buffer();
-          case 29:
+          case 13:
             return _context5.abrupt("return", _context5.sent);
-          case 30:
+          case 14:
             return _context5.abrupt("return", response);
-          case 31:
+          case 15:
           case "end":
             return _context5.stop();
         }

package/dist/src/Validation.js

@@ -27,11 +27,19 @@ exports.ValidateVersion = function (versionHash) {
     throw Error("Invalid version hash: ".concat(versionHash));
   }
 };
+
+// Validates that write token is in valid format and is properly encoded.
+// If objectId is also supplied, then write token's encoded object id is checked to make sure it matches
+// the supplied object id.
 exports.ValidateWriteToken = function (writeToken) {
+  var objectId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
   if (!writeToken) {
     throw Error("Write token not specified");
-  } else if (!writeToken.toString().startsWith("t")) {
-    throw Error("Invalid write token: ".concat(writeToken));
+  } else {
+    var decoded = Utils.DecodeWriteToken(writeToken);
+    if (objectId && objectId !== decoded.objectId) {
+      throw Error("Object id (".concat(objectId, ") does not match the the id (").concat(decoded.objectId, ") decoded from write token (").concat(writeToken, ")"));
+    }
   }
 };
 exports.ValidatePartHash = function (partHash) {
@@ -80,36 +88,36 @@ exports.ValidateDate = function (date) {
   return new Date(date).getTime();
 };
 exports.ValidateUserWallet = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref2) {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref2) {
     var address, client, walletAddress;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
+    return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           address = _ref2.address, client = _ref2.client;
           if (address) {
-            _context.next = 5;
+            _context.next = 1;
             break;
           }
           throw Error("Address not specified");
-        case 5:
+        case 1:
           if (client) {
-            _context.next = 7;
+            _context.next = 2;
             break;
           }
           throw Error("Client not specified");
-        case 7:
-          _context.next = 9;
+        case 2:
+          _context.next = 3;
           return client.userProfileClient.UserWalletAddress({
             address: address
           });
-        case 9:
+        case 3:
           walletAddress = _context.sent;
           if (walletAddress) {
-            _context.next = 12;
+            _context.next = 4;
             break;
           }
           throw Error("User address has no wallet: ".concat(address));
-        case 12:
+        case 4:
         case "end":
           return _context.stop();
       }