@sundaeswap/wallet-lite 0.0.86 → 0.0.88-dev.0

package/dist/cjs/classes/WalletObserver.class.js

@@ -93,7 +93,7 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
      * @returns {Promise<IWalletObserverSync<AssetMetadata>>} - A promise that resolves to the wallet sync data.
      */
     _defineProperty(_this, "sync", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var start, newNetwork, _yield$Promise$all, _yield$Promise$all2, newBalanceMap, newUsedAddresses, newUnusedAddresses, newOutputs, newCollateral, newFeeAddress, result, end;
+      var start, newBalanceMap, _yield$Promise$all, _yield$Promise$all2, newNetwork, newUsedAddresses, newUnusedAddresses, newOutputs, newCollateral, newFeeAddress, result, end;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -107,11 +107,13 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
             _context.prev = 3;
             _this._performingSync = true;
             _this.dispatch(_events.EWalletObserverEvents.SYNCING_WALLET_START);
+
+            // Check if account has changed.
             _context.next = 8;
-            return _this.getNetwork();
+            return _this.getBalanceMap();
           case 8:
-            newNetwork = _context.sent;
-            if (!(newNetwork instanceof Error)) {
+            newBalanceMap = _context.sent;
+            if (!(newBalanceMap instanceof Error)) {
               _context.next = 19;
               break;
             }
@@ -119,23 +121,23 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
             return _this.syncApi();
           case 12:
             _context.next = 14;
-            return _this.getNetwork();
+            return _this.getBalanceMap();
           case 14:
-            newNetwork = _context.sent;
-            if (!(newNetwork instanceof Error)) {
+            newBalanceMap = _context.sent;
+            if (!(newBalanceMap instanceof Error)) {
               _context.next = 19;
               break;
             }
             _this.dispatch(_events.EWalletObserverEvents.SYNCING_WALLET_END);
             _this._performingSync = false;
-            throw newNetwork;
+            throw newBalanceMap;
           case 19:
             _context.next = 21;
-            return Promise.all([_this.getBalanceMap(), _this.getUsedAddresses(), _this.getUnusedAddresses(), _this.getUtxos(), _this.getCollateral(), _this.getFeeAddress()]);
+            return Promise.all([_this.getNetwork(), _this.getUsedAddresses(), _this.getUnusedAddresses(), _this.getUtxos(), _this.getCollateral(), _this.getFeeAddress()]);
           case 21:
             _yield$Promise$all = _context.sent;
             _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 6);
-            newBalanceMap = _yield$Promise$all2[0];
+            newNetwork = _yield$Promise$all2[0];
             newUsedAddresses = _yield$Promise$all2[1];
             newUnusedAddresses = _yield$Promise$all2[2];
             newOutputs = _yield$Promise$all2[3];
@@ -179,7 +181,7 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
      * @returns {Promise<Cip30WalletApi | undefined>} - A promise that resolves to the API instance.
      */
     _defineProperty(_this, "syncApi", /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(activeWallet) {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(activeWallet, abortSignal) {
         var selectedWallet, attempts, shouldContinue, _window, _window2, _cardano$selectedWall, cardano, api;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -193,65 +195,62 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
               selectedWallet = activeWallet || _this.activeWallet;
               attempts = 0;
               shouldContinue = true;
-            case 5:
+              abortSignal === null || abortSignal === void 0 || abortSignal.addEventListener("abort", function () {
+                shouldContinue = false;
+              });
+            case 6:
               if (!shouldContinue) {
-                _context2.next = 32;
+                _context2.next = 31;
                 break;
               }
               if (!(attempts === 10)) {
-                _context2.next = 8;
+                _context2.next = 9;
                 break;
               }
               throw new Error("Could not reconnect to the selected wallet. Please check your extension.");
-            case 8:
-              _context2.prev = 8;
+            case 9:
+              _context2.prev = 9;
               cardano = ((_window = window) === null || _window === void 0 ? void 0 : _window.cardano) || ((_window2 = window) === null || _window2 === void 0 || (_window2 = _window2.parent) === null || _window2 === void 0 ? void 0 : _window2.cardano);
-              _context2.next = 12;
+              _context2.next = 13;
               return cardano === null || cardano === void 0 || (_cardano$selectedWall = cardano[selectedWallet]) === null || _cardano$selectedWall === void 0 ? void 0 : _cardano$selectedWall.enable();
-            case 12:
+            case 13:
               api = _context2.sent;
-              if (api) {
-                _context2.next = 15;
-                break;
-              }
-              throw Error;
-            case 15:
               _this.api = api;
-              _context2.next = 18;
+              _context2.next = 17;
               return api.getNetworkId();
-            case 18:
+            case 17:
               _this.network = _context2.sent;
               shouldContinue = false;
-              _context2.next = 30;
+              _context2.next = 29;
               break;
-            case 22:
-              _context2.prev = 22;
-              _context2.t0 = _context2["catch"](8);
-              if (!(["user canceled connection", "User declined to sign the data."].includes(_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.message) || (_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.code) === _dappConnector.APIErrorCode.Refused)) {
-                _context2.next = 27;
+            case 21:
+              _context2.prev = 21;
+              _context2.t0 = _context2["catch"](9);
+              if (!(["user canceled connection", "User declined to sign the data.", "Attempt to connect timed out after 10 seconds"].includes(_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.message) || (_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.code) === _dappConnector.APIErrorCode.Refused)) {
+                _context2.next = 26;
                 break;
               }
               shouldContinue = false;
               return _context2.abrupt("return", undefined);
-            case 27:
-              _context2.next = 29;
+            case 26:
+              _context2.next = 28;
               return new Promise(function (res) {
                 return setTimeout(res, 200);
               });
-            case 29:
+            case 28:
               attempts++;
-            case 30:
-              _context2.next = 5;
+            case 29:
+              _context2.next = 6;
               break;
-            case 32:
+            case 31:
               return _context2.abrupt("return", _this.api);
-            case 33:
+            case 32:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[8, 22]]);
+        }, _callee2, null, [[9, 21]]);
       }));
-      return function (_x) {
+      return function (_x, _x2) {
         return _ref2.apply(this, arguments);
       };
     }());
@@ -272,72 +271,78 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
      * @return {Promise<IWalletObserverSync<AssetMetadata> | Error>}
      */
     _defineProperty(_this, "connectWallet", /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(extension) {
-        var _window$cardano;
-        var start, attempts, extensionObject, _this$peerConnectInst, _window$cardano2, data, seed, end;
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(extension, abortSignal) {
+        var start, _window$cardano, attempts, extensionObject, _this$peerConnectInst, _window$cardano2, api, data, seed, end;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               start = performance.now();
               _this.dispatch(_events.EWalletObserverEvents.CONNECT_WALLET_START);
+              _context3.prev = 2;
               attempts = 0;
               extensionObject = (_window$cardano = window.cardano) === null || _window$cardano === void 0 ? void 0 : _window$cardano[extension]; // Disconnect any CIP45 connections.
               if (!(extension !== null && extension !== void 0 && extension.includes("p2p"))) {
                 (_this$peerConnectInst = _this.peerConnectInstance) === null || _this$peerConnectInst === void 0 || _this$peerConnectInst.shutdownServer();
               }
-            case 5:
+            case 6:
               if (!(typeof extensionObject === "undefined")) {
-                _context3.next = 14;
+                _context3.next = 15;
                 break;
               }
               if (!(attempts === 40)) {
-                _context3.next = 8;
+                _context3.next = 9;
                 break;
               }
-              return _context3.abrupt("break", 14);
-            case 8:
-              _context3.next = 10;
+              return _context3.abrupt("break", 15);
+            case 9:
+              _context3.next = 11;
               return new Promise(function (res) {
                 return setTimeout(res, _this._options.connectTimeout / 40);
               });
-            case 10:
+            case 11:
               extensionObject = (_window$cardano2 = window.cardano) === null || _window$cardano2 === void 0 ? void 0 : _window$cardano2[extension];
               attempts++;
-              _context3.next = 5;
+              _context3.next = 6;
               break;
-            case 14:
+            case 15:
               if (extensionObject) {
                 _context3.next = 17;
                 break;
               }
-              _this.dispatch(_events.EWalletObserverEvents.CONNECT_WALLET_END);
               throw new Error("Wallet extension not found in the global context.");
             case 17:
               _this.activeWallet = extension;
               _context3.next = 20;
-              return _this.syncApi(extension);
+              return _this.syncApi(extension, abortSignal);
             case 20:
-              _context3.next = 22;
+              api = _context3.sent;
+              if (api) {
+                _context3.next = 23;
+                break;
+              }
+              throw new Error("API could not be found.");
+            case 23:
+              _context3.next = 25;
               return _this.sync();
-            case 22:
+            case 25:
               data = _context3.sent;
               if (!_this._options.persistence) {
-                _context3.next = 29;
+                _context3.next = 32;
                 break;
               }
               if (!(data.usedAddresses instanceof Error)) {
-                _context3.next = 27;
+                _context3.next = 30;
                 break;
               }
               data.usedAddresses.cause = "Could not get a list of used addresses from the wallet when trying to save the connection.";
               throw data.usedAddresses;
-            case 27:
+            case 30:
               seed = {
                 activeWallet: extension,
                 mainAddress: data.usedAddresses[0]
               };
               window.localStorage.setItem(WalletObserver.PERSISTENCE_CACHE_KEY, JSON.stringify(seed));
-            case 29:
+            case 32:
               _this.dispatch(_events.EWalletObserverEvents.CONNECT_WALLET_END, _objectSpread(_objectSpread({}, data), {}, {
                 activeWallet: extension
               }));
@@ -346,13 +351,18 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
                 console.log("connectWallet: ".concat(end - start, "ms"));
               }
               return _context3.abrupt("return", data);
-            case 33:
+            case 38:
+              _context3.prev = 38;
+              _context3.t0 = _context3["catch"](2);
+              _this.dispatch(_events.EWalletObserverEvents.CONNECT_WALLET_END);
+              throw _context3.t0;
+            case 42:
             case "end":
               return _context3.stop();
           }
-        }, _callee3);
+        }, _callee3, null, [[2, 38]]);
       }));
-      return function (_x2) {
+      return function (_x3, _x4) {
         return _ref3.apply(this, arguments);
       };
     }());
@@ -859,7 +869,7 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
           }
         }, _callee12, null, [[10, 16]]);
       }));
-      return function (_x3) {
+      return function (_x5) {
         return _ref12.apply(this, arguments);
       };
     }());
@@ -889,7 +899,7 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
           }
         }, _callee13);
       }));
-      return function (_x4) {
+      return function (_x6) {
         return _ref14.apply(this, arguments);
       };
     }());