@solana-mobile/wallet-adapter-mobile 0.9.2 → 0.9.4

package/lib/cjs/index.browser.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 var walletAdapterBase = require('@solana/wallet-adapter-base');
 var web3_js = require('@solana/web3.js');
+var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -31,13 +31,6 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-function toUint8Array(base64EncodedByteArray) {
-    return new Uint8Array(window
-        .atob(base64EncodedByteArray)
-        .split('')
-        .map((c) => c.charCodeAt(0)));
-}
-
 function getIsSupported() {
     return (typeof window !== 'undefined' &&
         window.isSecureContext &&
@@ -45,6 +38,13 @@ function getIsSupported() {
         /android/i.test(navigator.userAgent));
 }
 
+function toUint8Array(base64EncodedByteArray) {
+    return new Uint8Array(window
+        .atob(base64EncodedByteArray)
+        .split('')
+        .map((c) => c.charCodeAt(0)));
+}
+
 const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
 function getPublicKeyFromAddress(address) {
@@ -72,7 +72,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                     // Having a prior authorization result is, right now, the best
                     // indication that a mobile wallet is installed. There is no API
                     // we can use to test for whether the association URI is supported.
-                    this.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
+                    this.declareWalletAsInstalled();
                 }
             });
         }
@@ -97,6 +97,11 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
     get readyState() {
         return this._readyState;
     }
+    declareWalletAsInstalled() {
+        if (this._readyState !== walletAdapterBase.WalletReadyState.Installed) {
+            this.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
+        }
+    }
     runWithGuard(callback) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -108,34 +113,59 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             }
         });
     }
-    connect() {
+    autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.connecting || this.connected) {
+                return;
+            }
             return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
                 if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
                     throw new walletAdapterBase.WalletNotReadyError();
                 }
                 this._connecting = true;
-                const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                if (cachedAuthorizationResult) {
-                    this._authorizationResult = cachedAuthorizationResult;
-                    this._connecting = false;
-                    if (this._readyState !== walletAdapterBase.WalletReadyState.Installed) {
-                        this.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
+                try {
+                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                    if (cachedAuthorizationResult) {
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        this.handleAuthorizationResult(cachedAuthorizationResult);
                     }
-                    this._selectedAddress = yield this._addressSelector.select(cachedAuthorizationResult.accounts.map(({ address }) => address));
-                    this.emit('connect', 
-                    // Having just set `this._selectedAddress`, `this.publicKey` is definitely non-null
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    this.publicKey);
-                    return;
                 }
+                catch (e) {
+                    throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+                }
+                finally {
+                    this._connecting = false;
+                }
+            }));
+        });
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.connecting || this.connected) {
+                return;
+            }
+            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
+                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
+                    throw new walletAdapterBase.WalletNotReadyError();
+                }
+                this._connecting = true;
                 try {
+                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                    if (cachedAuthorizationResult) {
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        this.handleAuthorizationResult(cachedAuthorizationResult);
+                        return;
+                    }
                     yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
                         const authorizationResult = yield wallet.authorize({
                             cluster: this._cluster,
                             identity: this._appIdentity,
                         });
-                        this.handleAuthorizationResult(authorizationResult); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        Promise.all([
+                            this._authorizationResultCache.set(authorizationResult),
+                            this.handleAuthorizationResult(authorizationResult),
+                        ]);
                     }));
                 }
                 catch (e) {
@@ -158,6 +188,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                 // Case 3: The new list of addresses isn't exactly the same as the old list, in the same order.
                 this._authorizationResult.accounts.some((account, ii) => account.address !== authorizationResult.accounts[ii].address);
             this._authorizationResult = authorizationResult;
+            this.declareWalletAsInstalled();
             if (didPublicKeysChange) {
                 const nextSelectedAddress = yield this._addressSelector.select(authorizationResult.accounts.map(({ address }) => address));
                 if (nextSelectedAddress !== this._selectedAddress) {
@@ -169,7 +200,6 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                     this.publicKey);
                 }
             }
-            yield this._authorizationResultCache.set(authorizationResult);
         });
     }
     performReauthorization(wallet, authToken) {
@@ -178,7 +208,11 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                 const authorizationResult = yield wallet.reauthorize({
                     auth_token: authToken,
                 });
-                this.handleAuthorizationResult(authorizationResult); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                Promise.all([
+                    this._authorizationResultCache.set(authorizationResult),
+                    this.handleAuthorizationResult(authorizationResult),
+                ]);
             }
             catch (e) {
                 this.disconnect();

package/lib/cjs/index.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 var walletAdapterBase = require('@solana/wallet-adapter-base');
 var web3_js = require('@solana/web3.js');
+var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -31,13 +31,6 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-function toUint8Array(base64EncodedByteArray) {
-    return new Uint8Array(window
-        .atob(base64EncodedByteArray)
-        .split('')
-        .map((c) => c.charCodeAt(0)));
-}
-
 function getIsSupported() {
     return (typeof window !== 'undefined' &&
         window.isSecureContext &&
@@ -45,6 +38,13 @@ function getIsSupported() {
         /android/i.test(navigator.userAgent));
 }
 
+function toUint8Array(base64EncodedByteArray) {
+    return new Uint8Array(window
+        .atob(base64EncodedByteArray)
+        .split('')
+        .map((c) => c.charCodeAt(0)));
+}
+
 const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
 function getPublicKeyFromAddress(address) {
@@ -72,7 +72,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                     // Having a prior authorization result is, right now, the best
                     // indication that a mobile wallet is installed. There is no API
                     // we can use to test for whether the association URI is supported.
-                    this.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
+                    this.declareWalletAsInstalled();
                 }
             });
         }
@@ -97,6 +97,11 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
     get readyState() {
         return this._readyState;
     }
+    declareWalletAsInstalled() {
+        if (this._readyState !== walletAdapterBase.WalletReadyState.Installed) {
+            this.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
+        }
+    }
     runWithGuard(callback) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -108,34 +113,59 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             }
         });
     }
-    connect() {
+    autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.connecting || this.connected) {
+                return;
+            }
             return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
                 if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
                     throw new walletAdapterBase.WalletNotReadyError();
                 }
                 this._connecting = true;
-                const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                if (cachedAuthorizationResult) {
-                    this._authorizationResult = cachedAuthorizationResult;
-                    this._connecting = false;
-                    if (this._readyState !== walletAdapterBase.WalletReadyState.Installed) {
-                        this.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
+                try {
+                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                    if (cachedAuthorizationResult) {
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        this.handleAuthorizationResult(cachedAuthorizationResult);
                     }
-                    this._selectedAddress = yield this._addressSelector.select(cachedAuthorizationResult.accounts.map(({ address }) => address));
-                    this.emit('connect', 
-                    // Having just set `this._selectedAddress`, `this.publicKey` is definitely non-null
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    this.publicKey);
-                    return;
                 }
+                catch (e) {
+                    throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+                }
+                finally {
+                    this._connecting = false;
+                }
+            }));
+        });
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.connecting || this.connected) {
+                return;
+            }
+            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
+                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
+                    throw new walletAdapterBase.WalletNotReadyError();
+                }
+                this._connecting = true;
                 try {
+                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                    if (cachedAuthorizationResult) {
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        this.handleAuthorizationResult(cachedAuthorizationResult);
+                        return;
+                    }
                     yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
                         const authorizationResult = yield wallet.authorize({
                             cluster: this._cluster,
                             identity: this._appIdentity,
                         });
-                        this.handleAuthorizationResult(authorizationResult); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        Promise.all([
+                            this._authorizationResultCache.set(authorizationResult),
+                            this.handleAuthorizationResult(authorizationResult),
+                        ]);
                     }));
                 }
                 catch (e) {
@@ -158,6 +188,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                 // Case 3: The new list of addresses isn't exactly the same as the old list, in the same order.
                 this._authorizationResult.accounts.some((account, ii) => account.address !== authorizationResult.accounts[ii].address);
             this._authorizationResult = authorizationResult;
+            this.declareWalletAsInstalled();
             if (didPublicKeysChange) {
                 const nextSelectedAddress = yield this._addressSelector.select(authorizationResult.accounts.map(({ address }) => address));
                 if (nextSelectedAddress !== this._selectedAddress) {
@@ -169,7 +200,6 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                     this.publicKey);
                 }
             }
-            yield this._authorizationResultCache.set(authorizationResult);
         });
     }
     performReauthorization(wallet, authToken) {
@@ -178,7 +208,11 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                 const authorizationResult = yield wallet.reauthorize({
                     auth_token: authToken,
                 });
-                this.handleAuthorizationResult(authorizationResult); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                Promise.all([
+                    this._authorizationResultCache.set(authorizationResult),
+                    this.handleAuthorizationResult(authorizationResult),
+                ]);
             }
             catch (e) {
                 this.disconnect();

package/lib/cjs/index.native.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 var walletAdapterBase = require('@solana/wallet-adapter-base');
 var web3_js = require('@solana/web3.js');
-var jsBase64 = require('js-base64');
+var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 var reactNative = require('react-native');
+var jsBase64 = require('js-base64');
 var AsyncStorage = require('@react-native-async-storage/async-storage');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -69,7 +69,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                     // Having a prior authorization result is, right now, the best
                     // indication that a mobile wallet is installed. There is no API
                     // we can use to test for whether the association URI is supported.
-                    this.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
+                    this.declareWalletAsInstalled();
                 }
             });
         }
@@ -94,6 +94,11 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
     get readyState() {
         return this._readyState;
     }
+    declareWalletAsInstalled() {
+        if (this._readyState !== walletAdapterBase.WalletReadyState.Installed) {
+            this.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
+        }
+    }
     runWithGuard(callback) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -105,34 +110,59 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             }
         });
     }
-    connect() {
+    autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.connecting || this.connected) {
+                return;
+            }
             return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
                 if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
                     throw new walletAdapterBase.WalletNotReadyError();
                 }
                 this._connecting = true;
-                const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                if (cachedAuthorizationResult) {
-                    this._authorizationResult = cachedAuthorizationResult;
-                    this._connecting = false;
-                    if (this._readyState !== walletAdapterBase.WalletReadyState.Installed) {
-                        this.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
+                try {
+                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                    if (cachedAuthorizationResult) {
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        this.handleAuthorizationResult(cachedAuthorizationResult);
                     }
-                    this._selectedAddress = yield this._addressSelector.select(cachedAuthorizationResult.accounts.map(({ address }) => address));
-                    this.emit('connect', 
-                    // Having just set `this._selectedAddress`, `this.publicKey` is definitely non-null
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    this.publicKey);
-                    return;
                 }
+                catch (e) {
+                    throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+                }
+                finally {
+                    this._connecting = false;
+                }
+            }));
+        });
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.connecting || this.connected) {
+                return;
+            }
+            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
+                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
+                    throw new walletAdapterBase.WalletNotReadyError();
+                }
+                this._connecting = true;
                 try {
+                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                    if (cachedAuthorizationResult) {
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        this.handleAuthorizationResult(cachedAuthorizationResult);
+                        return;
+                    }
                     yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
                         const authorizationResult = yield wallet.authorize({
                             cluster: this._cluster,
                             identity: this._appIdentity,
                         });
-                        this.handleAuthorizationResult(authorizationResult); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        Promise.all([
+                            this._authorizationResultCache.set(authorizationResult),
+                            this.handleAuthorizationResult(authorizationResult),
+                        ]);
                     }));
                 }
                 catch (e) {
@@ -155,6 +185,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                 // Case 3: The new list of addresses isn't exactly the same as the old list, in the same order.
                 this._authorizationResult.accounts.some((account, ii) => account.address !== authorizationResult.accounts[ii].address);
             this._authorizationResult = authorizationResult;
+            this.declareWalletAsInstalled();
             if (didPublicKeysChange) {
                 const nextSelectedAddress = yield this._addressSelector.select(authorizationResult.accounts.map(({ address }) => address));
                 if (nextSelectedAddress !== this._selectedAddress) {
@@ -166,7 +197,6 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                     this.publicKey);
                 }
             }
-            yield this._authorizationResultCache.set(authorizationResult);
         });
     }
     performReauthorization(wallet, authToken) {
@@ -175,7 +205,11 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                 const authorizationResult = yield wallet.reauthorize({
                     auth_token: authToken,
                 });
-                this.handleAuthorizationResult(authorizationResult); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                Promise.all([
+                    this._authorizationResultCache.set(authorizationResult),
+                    this.handleAuthorizationResult(authorizationResult),
+                ]);
             }
             catch (e) {
                 this.disconnect();

package/lib/esm/index.browser.mjs

@@ -1,6 +1,6 @@
-import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
 import { BaseMessageSignerWalletAdapter, WalletReadyState, WalletPublicKeyError, WalletNotReadyError, WalletConnectionError, WalletDisconnectedError, WalletNotConnectedError, WalletSignTransactionError, WalletSendTransactionError, WalletSignMessageError } from '@solana/wallet-adapter-base';
 import { PublicKey } from '@solana/web3.js';
+import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -27,13 +27,6 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-function toUint8Array(base64EncodedByteArray) {
-    return new Uint8Array(window
-        .atob(base64EncodedByteArray)
-        .split('')
-        .map((c) => c.charCodeAt(0)));
-}
-
 function getIsSupported() {
     return (typeof window !== 'undefined' &&
         window.isSecureContext &&
@@ -41,6 +34,13 @@ function getIsSupported() {
         /android/i.test(navigator.userAgent));
 }
 
+function toUint8Array(base64EncodedByteArray) {
+    return new Uint8Array(window
+        .atob(base64EncodedByteArray)
+        .split('')
+        .map((c) => c.charCodeAt(0)));
+}
+
 const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
 function getPublicKeyFromAddress(address) {
@@ -68,7 +68,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
                     // Having a prior authorization result is, right now, the best
                     // indication that a mobile wallet is installed. There is no API
                     // we can use to test for whether the association URI is supported.
-                    this.emit('readyStateChange', (this._readyState = WalletReadyState.Installed));
+                    this.declareWalletAsInstalled();
                 }
             });
         }
@@ -93,6 +93,11 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     get readyState() {
         return this._readyState;
     }
+    declareWalletAsInstalled() {
+        if (this._readyState !== WalletReadyState.Installed) {
+            this.emit('readyStateChange', (this._readyState = WalletReadyState.Installed));
+        }
+    }
     runWithGuard(callback) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -104,34 +109,59 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             }
         });
     }
-    connect() {
+    autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.connecting || this.connected) {
+                return;
+            }
             return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
                 if (this._readyState !== WalletReadyState.Installed && this._readyState !== WalletReadyState.Loadable) {
                     throw new WalletNotReadyError();
                 }
                 this._connecting = true;
-                const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                if (cachedAuthorizationResult) {
-                    this._authorizationResult = cachedAuthorizationResult;
-                    this._connecting = false;
-                    if (this._readyState !== WalletReadyState.Installed) {
-                        this.emit('readyStateChange', (this._readyState = WalletReadyState.Installed));
+                try {
+                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                    if (cachedAuthorizationResult) {
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        this.handleAuthorizationResult(cachedAuthorizationResult);
                     }
-                    this._selectedAddress = yield this._addressSelector.select(cachedAuthorizationResult.accounts.map(({ address }) => address));
-                    this.emit('connect', 
-                    // Having just set `this._selectedAddress`, `this.publicKey` is definitely non-null
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    this.publicKey);
-                    return;
                 }
+                catch (e) {
+                    throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+                }
+                finally {
+                    this._connecting = false;
+                }
+            }));
+        });
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.connecting || this.connected) {
+                return;
+            }
+            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
+                if (this._readyState !== WalletReadyState.Installed && this._readyState !== WalletReadyState.Loadable) {
+                    throw new WalletNotReadyError();
+                }
+                this._connecting = true;
                 try {
+                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                    if (cachedAuthorizationResult) {
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        this.handleAuthorizationResult(cachedAuthorizationResult);
+                        return;
+                    }
                     yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
                         const authorizationResult = yield wallet.authorize({
                             cluster: this._cluster,
                             identity: this._appIdentity,
                         });
-                        this.handleAuthorizationResult(authorizationResult); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        Promise.all([
+                            this._authorizationResultCache.set(authorizationResult),
+                            this.handleAuthorizationResult(authorizationResult),
+                        ]);
                     }));
                 }
                 catch (e) {
@@ -154,6 +184,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
                 // Case 3: The new list of addresses isn't exactly the same as the old list, in the same order.
                 this._authorizationResult.accounts.some((account, ii) => account.address !== authorizationResult.accounts[ii].address);
             this._authorizationResult = authorizationResult;
+            this.declareWalletAsInstalled();
             if (didPublicKeysChange) {
                 const nextSelectedAddress = yield this._addressSelector.select(authorizationResult.accounts.map(({ address }) => address));
                 if (nextSelectedAddress !== this._selectedAddress) {
@@ -165,7 +196,6 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
                     this.publicKey);
                 }
             }
-            yield this._authorizationResultCache.set(authorizationResult);
         });
     }
     performReauthorization(wallet, authToken) {
@@ -174,7 +204,11 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
                 const authorizationResult = yield wallet.reauthorize({
                     auth_token: authToken,
                 });
-                this.handleAuthorizationResult(authorizationResult); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                Promise.all([
+                    this._authorizationResultCache.set(authorizationResult),
+                    this.handleAuthorizationResult(authorizationResult),
+                ]);
             }
             catch (e) {
                 this.disconnect();

package/lib/esm/index.mjs

@@ -1,6 +1,6 @@
-import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
 import { BaseMessageSignerWalletAdapter, WalletReadyState, WalletPublicKeyError, WalletNotReadyError, WalletConnectionError, WalletDisconnectedError, WalletNotConnectedError, WalletSignTransactionError, WalletSendTransactionError, WalletSignMessageError } from '@solana/wallet-adapter-base';
 import { PublicKey } from '@solana/web3.js';
+import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -27,13 +27,6 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-function toUint8Array(base64EncodedByteArray) {
-    return new Uint8Array(window
-        .atob(base64EncodedByteArray)
-        .split('')
-        .map((c) => c.charCodeAt(0)));
-}
-
 function getIsSupported() {
     return (typeof window !== 'undefined' &&
         window.isSecureContext &&
@@ -41,6 +34,13 @@ function getIsSupported() {
         /android/i.test(navigator.userAgent));
 }
 
+function toUint8Array(base64EncodedByteArray) {
+    return new Uint8Array(window
+        .atob(base64EncodedByteArray)
+        .split('')
+        .map((c) => c.charCodeAt(0)));
+}
+
 const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
 function getPublicKeyFromAddress(address) {
@@ -68,7 +68,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
                     // Having a prior authorization result is, right now, the best
                     // indication that a mobile wallet is installed. There is no API
                     // we can use to test for whether the association URI is supported.
-                    this.emit('readyStateChange', (this._readyState = WalletReadyState.Installed));
+                    this.declareWalletAsInstalled();
                 }
             });
         }
@@ -93,6 +93,11 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     get readyState() {
         return this._readyState;
     }
+    declareWalletAsInstalled() {
+        if (this._readyState !== WalletReadyState.Installed) {
+            this.emit('readyStateChange', (this._readyState = WalletReadyState.Installed));
+        }
+    }
     runWithGuard(callback) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -104,34 +109,59 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             }
         });
     }
-    connect() {
+    autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.connecting || this.connected) {
+                return;
+            }
             return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
                 if (this._readyState !== WalletReadyState.Installed && this._readyState !== WalletReadyState.Loadable) {
                     throw new WalletNotReadyError();
                 }
                 this._connecting = true;
-                const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                if (cachedAuthorizationResult) {
-                    this._authorizationResult = cachedAuthorizationResult;
-                    this._connecting = false;
-                    if (this._readyState !== WalletReadyState.Installed) {
-                        this.emit('readyStateChange', (this._readyState = WalletReadyState.Installed));
+                try {
+                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                    if (cachedAuthorizationResult) {
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        this.handleAuthorizationResult(cachedAuthorizationResult);
                     }
-                    this._selectedAddress = yield this._addressSelector.select(cachedAuthorizationResult.accounts.map(({ address }) => address));
-                    this.emit('connect', 
-                    // Having just set `this._selectedAddress`, `this.publicKey` is definitely non-null
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    this.publicKey);
-                    return;
                 }
+                catch (e) {
+                    throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+                }
+                finally {
+                    this._connecting = false;
+                }
+            }));
+        });
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.connecting || this.connected) {
+                return;
+            }
+            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
+                if (this._readyState !== WalletReadyState.Installed && this._readyState !== WalletReadyState.Loadable) {
+                    throw new WalletNotReadyError();
+                }
+                this._connecting = true;
                 try {
+                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                    if (cachedAuthorizationResult) {
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        this.handleAuthorizationResult(cachedAuthorizationResult);
+                        return;
+                    }
                     yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
                         const authorizationResult = yield wallet.authorize({
                             cluster: this._cluster,
                             identity: this._appIdentity,
                         });
-                        this.handleAuthorizationResult(authorizationResult); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                        Promise.all([
+                            this._authorizationResultCache.set(authorizationResult),
+                            this.handleAuthorizationResult(authorizationResult),
+                        ]);
                     }));
                 }
                 catch (e) {
@@ -154,6 +184,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
                 // Case 3: The new list of addresses isn't exactly the same as the old list, in the same order.
                 this._authorizationResult.accounts.some((account, ii) => account.address !== authorizationResult.accounts[ii].address);
             this._authorizationResult = authorizationResult;
+            this.declareWalletAsInstalled();
             if (didPublicKeysChange) {
                 const nextSelectedAddress = yield this._addressSelector.select(authorizationResult.accounts.map(({ address }) => address));
                 if (nextSelectedAddress !== this._selectedAddress) {
@@ -165,7 +196,6 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
                     this.publicKey);
                 }
             }
-            yield this._authorizationResultCache.set(authorizationResult);
         });
     }
     performReauthorization(wallet, authToken) {
@@ -174,7 +204,11 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
                 const authorizationResult = yield wallet.reauthorize({
                     auth_token: authToken,
                 });
-                this.handleAuthorizationResult(authorizationResult); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                Promise.all([
+                    this._authorizationResultCache.set(authorizationResult),
+                    this.handleAuthorizationResult(authorizationResult),
+                ]);
             }
             catch (e) {
                 this.disconnect();

package/lib/types/index.browser.d.mts

@@ -35,7 +35,9 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     get connected(): boolean;
     get connecting(): boolean;
     get readyState(): WalletReadyState;
+    private declareWalletAsInstalled;
     private runWithGuard;
+    autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(): Promise<void>;
     connect(): Promise<void>;
     private handleAuthorizationResult;
     private performReauthorization;

package/lib/types/index.browser.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.browser.d.mts","sourceRoot":"","sources":["../../src/index.ts","../../src/base64Utils.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.browser.d.mts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/base64Utils.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}

package/lib/types/index.browser.d.ts

@@ -35,7 +35,9 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     get connected(): boolean;
     get connecting(): boolean;
     get readyState(): WalletReadyState;
+    private declareWalletAsInstalled;
     private runWithGuard;
+    autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(): Promise<void>;
     connect(): Promise<void>;
     private handleAuthorizationResult;
     private performReauthorization;

package/lib/types/index.browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.browser.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/base64Utils.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.browser.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/base64Utils.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}

package/lib/types/index.d.mts

@@ -35,7 +35,9 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     get connected(): boolean;
     get connecting(): boolean;
     get readyState(): WalletReadyState;
+    private declareWalletAsInstalled;
     private runWithGuard;
+    autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(): Promise<void>;
     connect(): Promise<void>;
     private handleAuthorizationResult;
     private performReauthorization;

package/lib/types/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/index.ts","../../src/base64Utils.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/base64Utils.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}

package/lib/types/index.d.ts

@@ -35,7 +35,9 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     get connected(): boolean;
     get connecting(): boolean;
     get readyState(): WalletReadyState;
+    private declareWalletAsInstalled;
     private runWithGuard;
+    autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(): Promise<void>;
     connect(): Promise<void>;
     private handleAuthorizationResult;
     private performReauthorization;

package/lib/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/base64Utils.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/base64Utils.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}

package/lib/types/index.native.d.ts

@@ -35,7 +35,9 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     get connected(): boolean;
     get connecting(): boolean;
     get readyState(): WalletReadyState;
+    private declareWalletAsInstalled;
     private runWithGuard;
+    autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(): Promise<void>;
     connect(): Promise<void>;
     private handleAuthorizationResult;
     private performReauthorization;

package/lib/types/index.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/base64Utils.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts","../../src/__forks__/react-native/createDefaultAuthorizationResultCache.ts","../../src/__forks__/react-native/getIsSupported.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/base64Utils.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts","../../src/__forks__/react-native/createDefaultAuthorizationResultCache.ts","../../src/__forks__/react-native/getIsSupported.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@solana-mobile/wallet-adapter-mobile",
     "description": "An adapter for mobile wallet apps that conform to the Solana Mobile Wallet Adapter protocol",
-    "version": "0.9.2",
+    "version": "0.9.4",
     "author": "Steven Luscher <steven.luscher@solanamobile.com>",
     "repository": "https://github.com/solana-mobile/mobile-wallet-adapter",
     "license": "Apache-2.0",
@@ -19,7 +19,7 @@
         "./package.json": "./package.json",
         ".": {
             "import": "./lib/esm/index.mjs",
-            "require": "./lib/esm/index.cjs"
+            "require": "./lib/cjs/index.js"
         }
     },
     "files": [
@@ -41,7 +41,7 @@
     },
     "dependencies": {
         "@react-native-async-storage/async-storage": "^1.17.7",
-        "@solana-mobile/mobile-wallet-adapter-protocol-web3js": "^0.9.2",
+        "@solana-mobile/mobile-wallet-adapter-protocol-web3js": "^0.9.4",
         "@solana/wallet-adapter-base": "^0.9.17",
         "js-base64": "^3.7.2"
     },
@@ -51,5 +51,5 @@
         "cross-env": "^7.0.3",
         "shx": "^0.3.4"
     },
-    "gitHead": "2d6baf8692d29f164cec7f772f7a9779fe5f0220"
+    "gitHead": "83d9987d68083fe62de95a094bea10faa1bce5ea"
 }