@vue-solana/vue 0.4.1 → 0.5.0

package/README.md

@@ -154,6 +154,8 @@ const { publicKey, connected, connecting, connect, disconnect } = useWallet();
 
 Browser extension wallets are discovered through the Solana Wallet Standard. Android Mobile Wallet Adapter wallets are registered through `@solana-mobile/wallet-standard-mobile` and exposed through the same `useWallets()` list on supported Android Chrome clients. iOS Phantom, Solflare, and Backpack entries are exposed through wallet-specific universal links on iOS browsers. `connect()` works after selecting a discovered wallet or configuring a custom `SolanaWallet`.
 
+Selected discovered wallets are persisted under `localStorage["vue-solana:selected-wallet"]` as non-sensitive identity metadata: `name`, and `platform`/`source` when available. On reload, Vue Solana restores the selected wallet if the same wallet is discovered again. Pass `autoConnect: true` to opt into calling `connect()` for that restored wallet; arbitrary installed wallets are never auto-connected. Calling `selectWallet(null)` or `setWallet(customWallet)` clears the stored selection.
+
 Desktop native app wallet adapters are planned but not implemented yet.
 
 Composables return inert SSR-safe state when no plugin context is available. Real RPC and wallet operations still require the plugin-provided client context.
@@ -202,9 +204,9 @@ Docs: [Vue Solana Agent Skill](https://vue-solana-docs.vercel.app/agent-skill)
 - `useRpc()`: returns cluster, endpoint, connection status, latest blockhash, and `checkConnection()`.
 - `useConnection()`: returns the Solana `Connection`.
 - `useWallet()`: returns wallet refs, computed connection state, and wallet actions.
-- `useWallets()`: returns discovered browser extension wallets, Android Mobile Wallet Adapter wallets, and wallet selection actions.
+- `useWallets()`: returns discovered browser extension wallets, Android Mobile Wallet Adapter wallets, iOS browser wallet links, and wallet selection actions.
 - `useBalance(address, commitment?)`: loads lamport balance for a `PublicKey` or address string.
-- `useTransaction(handler)`: generic async transaction state helper.
+- `useTransaction(handler, options?)`: generic async transaction state helper with optional timeout settings.
 - `useSignAndSendTransaction()`: signs and sends a transaction through the configured wallet.
 
 Direct composable subpaths:

package/dist/index.cjs

@@ -1,20 +1,169 @@
 'use strict';
 
-const useBalance = require('./shared/vue.DONKZzIb.cjs');
+const useBalance = require('./shared/vue.D_AM1Nl8.cjs');
 const useConnection = require('./shared/vue.CwhEmATP.cjs');
 const useRpc = require('./shared/vue.COyyrsQU.cjs');
-const useSignAndSendTransaction = require('./shared/vue.BwrQMPty.cjs');
+const useSignAndSendTransaction = require('./shared/vue.DQmAPXVB.cjs');
 const useSolana = require('./shared/vue.C4tLiG3R.cjs');
-const useTransaction = require('./shared/vue.CNhelr8H.cjs');
+const useTransaction = require('./shared/vue.DQi38JeF.cjs');
 const useWallet = require('./shared/vue.CwPjPFN6.cjs');
 const useWallets = require('./shared/vue.P9tgeC5S.cjs');
-const iosWallet = require('@vue-solana/core/ios-wallet');
-const walletStandard = require('@vue-solana/core/wallet-standard');
 const rpc = require('@vue-solana/core/rpc');
+const walletStandard = require('@vue-solana/core/wallet-standard');
 const vue = require('vue');
+const iosWallet = require('@vue-solana/core/ios-wallet');
 require('@solana/web3-compat');
 require('@vue-solana/core/transaction');
 
+const SELECTED_WALLET_STORAGE_KEY = "vue-solana:selected-wallet";
+function readSelectedWallet() {
+  const storage = getLocalStorage();
+  if (!storage) {
+    return null;
+  }
+  try {
+    const value = storage.getItem(SELECTED_WALLET_STORAGE_KEY);
+    if (!value) {
+      return null;
+    }
+    const wallet = JSON.parse(value);
+    return typeof wallet.name === "string" ? {
+      name: wallet.name,
+      platform: wallet.platform,
+      source: wallet.source
+    } : null;
+  } catch {
+    return null;
+  }
+}
+function writeSelectedWallet(wallet) {
+  const storage = getLocalStorage();
+  if (!storage) {
+    return;
+  }
+  try {
+    if (wallet) {
+      storage.setItem(SELECTED_WALLET_STORAGE_KEY, stringifySelectedWallet(wallet));
+    } else {
+      storage.removeItem(SELECTED_WALLET_STORAGE_KEY);
+    }
+  } catch {
+  }
+}
+function stringifySelectedWallet(wallet) {
+  const value = { name: wallet.name };
+  if (wallet.platform) {
+    value.platform = wallet.platform;
+  }
+  if (wallet.source) {
+    value.source = wallet.source;
+  }
+  return JSON.stringify(value);
+}
+function getLocalStorage() {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  try {
+    return window.localStorage;
+  } catch {
+    return null;
+  }
+}
+
+function createSolanaWalletRegistry(options) {
+  const adaptedWallets = /* @__PURE__ */ new WeakMap();
+  function getAdaptedWallet(walletInfo) {
+    if (iosWallet.isSolanaIosWalletInfo(walletInfo)) {
+      return iosWallet.adaptSolanaIosWallet(walletInfo, {
+        chain: walletStandard.getSolanaChain(options.cluster),
+        cluster: options.cluster,
+        onChange: options.onWalletChange,
+        ...options.iosWallet || {}
+      });
+    }
+    if (!isObject(walletInfo.wallet)) {
+      return walletStandard.adaptSolanaStandardWallet(walletInfo, {
+        chain: walletStandard.getSolanaChain(options.cluster),
+        onChange: options.onWalletChange
+      });
+    }
+    const cachedWallet = adaptedWallets.get(walletInfo.wallet);
+    if (cachedWallet) {
+      return cachedWallet;
+    }
+    const adaptedWallet = walletStandard.adaptSolanaStandardWallet(walletInfo, {
+      chain: walletStandard.getSolanaChain(options.cluster),
+      onChange: options.onWalletChange
+    });
+    const cachedAdapter = {
+      platform: walletInfo.platform,
+      source: walletInfo.source,
+      get publicKey() {
+        return adaptedWallet.publicKey;
+      },
+      get connected() {
+        return adaptedWallet.connected;
+      },
+      get connecting() {
+        return adaptedWallet.connecting;
+      },
+      get disconnecting() {
+        return adaptedWallet.disconnecting;
+      },
+      async connect() {
+        await adaptedWallet.connect();
+        await Promise.all(
+          Array.from(getCachedWallets()).map(
+            (otherWallet) => otherWallet !== cachedAdapter && otherWallet.connected ? otherWallet.disconnect() : void 0
+          )
+        );
+      },
+      disconnect: () => adaptedWallet.disconnect(),
+      signTransaction: adaptedWallet.signTransaction?.bind(adaptedWallet),
+      signAllTransactions: adaptedWallet.signAllTransactions?.bind(adaptedWallet),
+      signAndSendTransaction: adaptedWallet.signAndSendTransaction?.bind(adaptedWallet)
+    };
+    adaptedWallets.set(walletInfo.wallet, cachedAdapter);
+    return cachedAdapter;
+  }
+  function getDiscoveredWallets() {
+    return [
+      ...walletStandard.getRegisteredSolanaWallets(),
+      ...options.iosWallet === false ? [] : iosWallet.getSolanaIosWallets({
+        chains: [walletStandard.getSolanaChain(options.cluster)],
+        cluster: options.cluster,
+        ...options.iosWallet || {}
+      })
+    ];
+  }
+  function handleIosWalletCallback() {
+    try {
+      iosWallet.handleSolanaIosWalletCallback({ clearUrl: true });
+    } catch (cause) {
+      console.error("[Vue Solana] iOS wallet callback failed", cause);
+    }
+  }
+  function* getCachedWallets() {
+    for (const walletInfo of options.getWalletInfos()) {
+      if (isObject(walletInfo.wallet)) {
+        const cachedWallet = adaptedWallets.get(walletInfo.wallet);
+        if (cachedWallet) {
+          yield cachedWallet;
+        }
+      }
+    }
+  }
+  return {
+    getAdaptedWallet,
+    getDiscoveredWallets,
+    handleIosWalletCallback
+  };
+}
+function isObject(value) {
+  return typeof value === "object" && value !== null || typeof value === "function";
+}
+
 const RPC_CHECK_TIMEOUT_MS = 1e4;
 function createSolanaPlugin(options = {}) {
   return {
@@ -26,9 +175,15 @@ function createSolanaPlugin(options = {}) {
       const status = vue.ref("idle");
       const error = vue.ref(null);
       const latestBlockhash = vue.ref(null);
-      const adaptedWallets = /* @__PURE__ */ new WeakMap();
+      const walletRegistry = createSolanaWalletRegistry({
+        cluster: context.cluster,
+        iosWallet: options.iosWallet,
+        getWalletInfos: () => wallets.value,
+        onWalletChange: () => vue.triggerRef(wallet)
+      });
       let unsubscribeWallets = null;
       let mobileWalletRegistrationPromise = null;
+      let attemptedAutoConnectWallet = null;
       let rpcCheckId = 0;
       async function checkConnection() {
         const checkId = ++rpcCheckId;
@@ -40,7 +195,7 @@ function createSolanaPlugin(options = {}) {
           wsEndpoint: context.wsEndpoint
         });
         try {
-          const blockhash = await withTimeout(
+          const blockhash = await useTransaction.withTimeout(
             context.connection.getLatestBlockhash(),
             RPC_CHECK_TIMEOUT_MS,
             `RPC connection check timed out after ${RPC_CHECK_TIMEOUT_MS / 1e3} seconds.`
@@ -67,17 +222,28 @@ function createSolanaPlugin(options = {}) {
       }
       function refreshWallets() {
         unsubscribeWallets ??= walletStandard.subscribeSolanaWallets(refreshWallets);
-        handleIosWalletCallback();
-        wallets.value = getDiscoveredWallets();
+        walletRegistry.handleIosWalletCallback();
+        wallets.value = walletRegistry.getDiscoveredWallets();
+        let restoredWallet = null;
         if (selectedWallet.value) {
           selectedWallet.value = wallets.value.find((nextWallet) => isSameWallet(nextWallet, selectedWallet.value)) ?? null;
           if (!selectedWallet.value) {
             wallet.value = options.wallet ?? null;
           }
+        } else if (!options.wallet) {
+          const persistedWallet = readSelectedWallet();
+          restoredWallet = persistedWallet ? wallets.value.find((nextWallet) => isSameWallet(nextWallet, persistedWallet)) ?? null : null;
+          if (restoredWallet) {
+            selectedWallet.value = restoredWallet;
+            wallet.value = walletRegistry.getAdaptedWallet(restoredWallet);
+          }
         }
         if (options.mobileWallet !== false) {
           registerMobileWallets();
         }
+        if (restoredWallet) {
+          autoConnectWallet(restoredWallet);
+        }
       }
       function registerMobileWallets() {
         mobileWalletRegistrationPromise ??= import('@vue-solana/core/mobile-wallet').then(({ registerSolanaMobileWallet }) => {
@@ -85,7 +251,7 @@ function createSolanaPlugin(options = {}) {
             chains: [walletStandard.getSolanaChain(context.cluster)],
             ...options.mobileWallet || {}
           });
-          wallets.value = getDiscoveredWallets();
+          refreshWallets();
         }).catch((cause) => {
           console.error("[Vue Solana] Mobile wallet registration failed", cause);
         }).finally(() => {
@@ -94,88 +260,24 @@ function createSolanaPlugin(options = {}) {
       }
       function selectWallet(nextWallet) {
         selectedWallet.value = nextWallet;
-        wallet.value = nextWallet ? getAdaptedWallet(nextWallet) : options.wallet ?? null;
+        wallet.value = nextWallet ? walletRegistry.getAdaptedWallet(nextWallet) : options.wallet ?? null;
+        writeSelectedWallet(nextWallet);
       }
-      function getAdaptedWallet(walletInfo) {
-        if (iosWallet.isSolanaIosWalletInfo(walletInfo)) {
-          return iosWallet.adaptSolanaIosWallet(walletInfo, {
-            chain: walletStandard.getSolanaChain(context.cluster),
-            cluster: context.cluster,
-            onChange: () => vue.triggerRef(wallet),
-            ...options.iosWallet || {}
-          });
+      function autoConnectWallet(walletInfo) {
+        if (!options.autoConnect) {
+          return;
         }
-        if (!isObject(walletInfo.wallet)) {
-          return walletStandard.adaptSolanaStandardWallet(walletInfo, {
-            chain: walletStandard.getSolanaChain(context.cluster),
-            onChange: () => vue.triggerRef(wallet)
-          });
+        const activeWallet = wallet.value;
+        const storageValue = stringifySelectedWallet(walletInfo);
+        if (!activeWallet || activeWallet.connected || activeWallet.connecting || attemptedAutoConnectWallet === storageValue) {
+          return;
         }
-        const cachedWallet = adaptedWallets.get(walletInfo.wallet);
-        if (cachedWallet) {
-          return cachedWallet;
-        }
-        const adaptedWallet = walletStandard.adaptSolanaStandardWallet(walletInfo, {
-          chain: walletStandard.getSolanaChain(context.cluster),
-          onChange: () => vue.triggerRef(wallet)
+        attemptedAutoConnectWallet = storageValue;
+        void activeWallet.connect().catch((cause) => {
+          console.error("[Vue Solana] Wallet auto-connect failed", cause);
+        }).finally(() => {
+          vue.triggerRef(wallet);
         });
-        const cachedAdapter = {
-          platform: walletInfo.platform,
-          source: walletInfo.source,
-          get publicKey() {
-            return adaptedWallet.publicKey;
-          },
-          get connected() {
-            return adaptedWallet.connected;
-          },
-          get connecting() {
-            return adaptedWallet.connecting;
-          },
-          get disconnecting() {
-            return adaptedWallet.disconnecting;
-          },
-          async connect() {
-            await adaptedWallet.connect();
-            await Promise.all(
-              Array.from(getCachedWallets()).map(
-                (otherWallet) => otherWallet !== cachedAdapter && otherWallet.connected ? otherWallet.disconnect() : void 0
-              )
-            );
-          },
-          disconnect: () => adaptedWallet.disconnect(),
-          signTransaction: adaptedWallet.signTransaction?.bind(adaptedWallet),
-          signAllTransactions: adaptedWallet.signAllTransactions?.bind(adaptedWallet),
-          signAndSendTransaction: adaptedWallet.signAndSendTransaction?.bind(adaptedWallet)
-        };
-        adaptedWallets.set(walletInfo.wallet, cachedAdapter);
-        return cachedAdapter;
-      }
-      function getDiscoveredWallets() {
-        return [
-          ...walletStandard.getRegisteredSolanaWallets(),
-          ...options.iosWallet === false ? [] : iosWallet.getSolanaIosWallets({
-            chains: [walletStandard.getSolanaChain(context.cluster)],
-            cluster: context.cluster,
-            ...options.iosWallet || {}
-          })
-        ];
-      }
-      function handleIosWalletCallback() {
-        try {
-          iosWallet.handleSolanaIosWalletCallback({ clearUrl: true });
-        } catch (cause) {
-          console.error("[Vue Solana] iOS wallet callback failed", cause);
-        }
-      }
-      function* getCachedWallets() {
-        for (const walletInfo of wallets.value) {
-          if (isObject(walletInfo.wallet)) {
-            const cachedWallet = adaptedWallets.get(walletInfo.wallet);
-            if (cachedWallet) {
-              yield cachedWallet;
-            }
-          }
-        }
       }
       const vueContext = {
         ...context,
@@ -191,37 +293,27 @@ function createSolanaPlugin(options = {}) {
         setWallet(nextWallet) {
           selectedWallet.value = null;
           wallet.value = nextWallet;
+          writeSelectedWallet(null);
         }
       };
       app.provide(useSolana.solanaInjectionKey, vueContext);
       if (typeof window !== "undefined") {
         window.setTimeout(() => {
+          try {
+            refreshWallets();
+          } catch (cause) {
+            console.error("[Vue Solana] Wallet refresh failed", cause);
+          }
           void checkConnection();
         }, 0);
       }
     }
   };
 }
-function isObject(value) {
-  return typeof value === "object" && value !== null || typeof value === "function";
-}
 function isSameWallet(wallet, selectedWallet) {
   return wallet.name === selectedWallet?.name && wallet.source === selectedWallet.source && wallet.platform === selectedWallet.platform;
 }
 const VueSolana = createSolanaPlugin;
-function withTimeout(promise, timeoutMs, message) {
-  let timeoutId;
-  const timeout = new Promise((_, reject) => {
-    timeoutId = setTimeout(() => {
-      reject(new Error(message));
-    }, timeoutMs);
-  });
-  return Promise.race([promise, timeout]).finally(() => {
-    if (timeoutId) {
-      clearTimeout(timeoutId);
-    }
-  });
-}
 
 exports.useBalance = useBalance.useBalance;
 exports.useConnection = useConnection.useConnection;

package/dist/index.mjs

@@ -1,19 +1,169 @@
-export { u as useBalance } from './shared/vue.DJqRk8z_.mjs';
+export { u as useBalance } from './shared/vue.DQhHHVu6.mjs';
 export { u as useConnection } from './shared/vue.DlEAL2G8.mjs';
 export { u as useRpc } from './shared/vue.BqDzSepb.mjs';
-export { u as useSignAndSendTransaction } from './shared/vue.BfF-kOvb.mjs';
+export { u as useSignAndSendTransaction } from './shared/vue.DJ42Zrow.mjs';
 import { s as solanaInjectionKey } from './shared/vue.1M_c5FWA.mjs';
 export { t as tryUseSolana, u as useSolana } from './shared/vue.1M_c5FWA.mjs';
-export { u as useTransaction } from './shared/vue.CuhLIeDx.mjs';
+import { w as withTimeout } from './shared/vue.gLqkzJY4.mjs';
+export { u as useTransaction } from './shared/vue.gLqkzJY4.mjs';
 export { u as useWallet } from './shared/vue.DYf_CRDv.mjs';
 export { u as useWallets } from './shared/vue.h-uS8MXN.mjs';
-import { isSolanaIosWalletInfo, adaptSolanaIosWallet, handleSolanaIosWalletCallback, getSolanaIosWallets } from '@vue-solana/core/ios-wallet';
-import { subscribeSolanaWallets, getSolanaChain, adaptSolanaStandardWallet, getRegisteredSolanaWallets } from '@vue-solana/core/wallet-standard';
 import { createSolanaContext } from '@vue-solana/core/rpc';
+import { getRegisteredSolanaWallets, getSolanaChain, adaptSolanaStandardWallet, subscribeSolanaWallets } from '@vue-solana/core/wallet-standard';
 import { shallowRef, ref, triggerRef } from 'vue';
+import { handleSolanaIosWalletCallback, getSolanaIosWallets, isSolanaIosWalletInfo, adaptSolanaIosWallet } from '@vue-solana/core/ios-wallet';
 import '@solana/web3-compat';
 import '@vue-solana/core/transaction';
 
+const SELECTED_WALLET_STORAGE_KEY = "vue-solana:selected-wallet";
+function readSelectedWallet() {
+  const storage = getLocalStorage();
+  if (!storage) {
+    return null;
+  }
+  try {
+    const value = storage.getItem(SELECTED_WALLET_STORAGE_KEY);
+    if (!value) {
+      return null;
+    }
+    const wallet = JSON.parse(value);
+    return typeof wallet.name === "string" ? {
+      name: wallet.name,
+      platform: wallet.platform,
+      source: wallet.source
+    } : null;
+  } catch {
+    return null;
+  }
+}
+function writeSelectedWallet(wallet) {
+  const storage = getLocalStorage();
+  if (!storage) {
+    return;
+  }
+  try {
+    if (wallet) {
+      storage.setItem(SELECTED_WALLET_STORAGE_KEY, stringifySelectedWallet(wallet));
+    } else {
+      storage.removeItem(SELECTED_WALLET_STORAGE_KEY);
+    }
+  } catch {
+  }
+}
+function stringifySelectedWallet(wallet) {
+  const value = { name: wallet.name };
+  if (wallet.platform) {
+    value.platform = wallet.platform;
+  }
+  if (wallet.source) {
+    value.source = wallet.source;
+  }
+  return JSON.stringify(value);
+}
+function getLocalStorage() {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  try {
+    return window.localStorage;
+  } catch {
+    return null;
+  }
+}
+
+function createSolanaWalletRegistry(options) {
+  const adaptedWallets = /* @__PURE__ */ new WeakMap();
+  function getAdaptedWallet(walletInfo) {
+    if (isSolanaIosWalletInfo(walletInfo)) {
+      return adaptSolanaIosWallet(walletInfo, {
+        chain: getSolanaChain(options.cluster),
+        cluster: options.cluster,
+        onChange: options.onWalletChange,
+        ...options.iosWallet || {}
+      });
+    }
+    if (!isObject(walletInfo.wallet)) {
+      return adaptSolanaStandardWallet(walletInfo, {
+        chain: getSolanaChain(options.cluster),
+        onChange: options.onWalletChange
+      });
+    }
+    const cachedWallet = adaptedWallets.get(walletInfo.wallet);
+    if (cachedWallet) {
+      return cachedWallet;
+    }
+    const adaptedWallet = adaptSolanaStandardWallet(walletInfo, {
+      chain: getSolanaChain(options.cluster),
+      onChange: options.onWalletChange
+    });
+    const cachedAdapter = {
+      platform: walletInfo.platform,
+      source: walletInfo.source,
+      get publicKey() {
+        return adaptedWallet.publicKey;
+      },
+      get connected() {
+        return adaptedWallet.connected;
+      },
+      get connecting() {
+        return adaptedWallet.connecting;
+      },
+      get disconnecting() {
+        return adaptedWallet.disconnecting;
+      },
+      async connect() {
+        await adaptedWallet.connect();
+        await Promise.all(
+          Array.from(getCachedWallets()).map(
+            (otherWallet) => otherWallet !== cachedAdapter && otherWallet.connected ? otherWallet.disconnect() : void 0
+          )
+        );
+      },
+      disconnect: () => adaptedWallet.disconnect(),
+      signTransaction: adaptedWallet.signTransaction?.bind(adaptedWallet),
+      signAllTransactions: adaptedWallet.signAllTransactions?.bind(adaptedWallet),
+      signAndSendTransaction: adaptedWallet.signAndSendTransaction?.bind(adaptedWallet)
+    };
+    adaptedWallets.set(walletInfo.wallet, cachedAdapter);
+    return cachedAdapter;
+  }
+  function getDiscoveredWallets() {
+    return [
+      ...getRegisteredSolanaWallets(),
+      ...options.iosWallet === false ? [] : getSolanaIosWallets({
+        chains: [getSolanaChain(options.cluster)],
+        cluster: options.cluster,
+        ...options.iosWallet || {}
+      })
+    ];
+  }
+  function handleIosWalletCallback() {
+    try {
+      handleSolanaIosWalletCallback({ clearUrl: true });
+    } catch (cause) {
+      console.error("[Vue Solana] iOS wallet callback failed", cause);
+    }
+  }
+  function* getCachedWallets() {
+    for (const walletInfo of options.getWalletInfos()) {
+      if (isObject(walletInfo.wallet)) {
+        const cachedWallet = adaptedWallets.get(walletInfo.wallet);
+        if (cachedWallet) {
+          yield cachedWallet;
+        }
+      }
+    }
+  }
+  return {
+    getAdaptedWallet,
+    getDiscoveredWallets,
+    handleIosWalletCallback
+  };
+}
+function isObject(value) {
+  return typeof value === "object" && value !== null || typeof value === "function";
+}
+
 const RPC_CHECK_TIMEOUT_MS = 1e4;
 function createSolanaPlugin(options = {}) {
   return {
@@ -25,9 +175,15 @@ function createSolanaPlugin(options = {}) {
       const status = ref("idle");
       const error = ref(null);
       const latestBlockhash = ref(null);
-      const adaptedWallets = /* @__PURE__ */ new WeakMap();
+      const walletRegistry = createSolanaWalletRegistry({
+        cluster: context.cluster,
+        iosWallet: options.iosWallet,
+        getWalletInfos: () => wallets.value,
+        onWalletChange: () => triggerRef(wallet)
+      });
       let unsubscribeWallets = null;
       let mobileWalletRegistrationPromise = null;
+      let attemptedAutoConnectWallet = null;
       let rpcCheckId = 0;
       async function checkConnection() {
         const checkId = ++rpcCheckId;
@@ -66,17 +222,28 @@ function createSolanaPlugin(options = {}) {
       }
       function refreshWallets() {
         unsubscribeWallets ??= subscribeSolanaWallets(refreshWallets);
-        handleIosWalletCallback();
-        wallets.value = getDiscoveredWallets();
+        walletRegistry.handleIosWalletCallback();
+        wallets.value = walletRegistry.getDiscoveredWallets();
+        let restoredWallet = null;
         if (selectedWallet.value) {
           selectedWallet.value = wallets.value.find((nextWallet) => isSameWallet(nextWallet, selectedWallet.value)) ?? null;
           if (!selectedWallet.value) {
             wallet.value = options.wallet ?? null;
           }
+        } else if (!options.wallet) {
+          const persistedWallet = readSelectedWallet();
+          restoredWallet = persistedWallet ? wallets.value.find((nextWallet) => isSameWallet(nextWallet, persistedWallet)) ?? null : null;
+          if (restoredWallet) {
+            selectedWallet.value = restoredWallet;
+            wallet.value = walletRegistry.getAdaptedWallet(restoredWallet);
+          }
         }
         if (options.mobileWallet !== false) {
           registerMobileWallets();
         }
+        if (restoredWallet) {
+          autoConnectWallet(restoredWallet);
+        }
       }
       function registerMobileWallets() {
         mobileWalletRegistrationPromise ??= import('@vue-solana/core/mobile-wallet').then(({ registerSolanaMobileWallet }) => {
@@ -84,7 +251,7 @@ function createSolanaPlugin(options = {}) {
             chains: [getSolanaChain(context.cluster)],
             ...options.mobileWallet || {}
           });
-          wallets.value = getDiscoveredWallets();
+          refreshWallets();
         }).catch((cause) => {
           console.error("[Vue Solana] Mobile wallet registration failed", cause);
         }).finally(() => {
@@ -93,88 +260,24 @@ function createSolanaPlugin(options = {}) {
       }
       function selectWallet(nextWallet) {
         selectedWallet.value = nextWallet;
-        wallet.value = nextWallet ? getAdaptedWallet(nextWallet) : options.wallet ?? null;
+        wallet.value = nextWallet ? walletRegistry.getAdaptedWallet(nextWallet) : options.wallet ?? null;
+        writeSelectedWallet(nextWallet);
       }
-      function getAdaptedWallet(walletInfo) {
-        if (isSolanaIosWalletInfo(walletInfo)) {
-          return adaptSolanaIosWallet(walletInfo, {
-            chain: getSolanaChain(context.cluster),
-            cluster: context.cluster,
-            onChange: () => triggerRef(wallet),
-            ...options.iosWallet || {}
-          });
+      function autoConnectWallet(walletInfo) {
+        if (!options.autoConnect) {
+          return;
         }
-        if (!isObject(walletInfo.wallet)) {
-          return adaptSolanaStandardWallet(walletInfo, {
-            chain: getSolanaChain(context.cluster),
-            onChange: () => triggerRef(wallet)
-          });
-        }
-        const cachedWallet = adaptedWallets.get(walletInfo.wallet);
-        if (cachedWallet) {
-          return cachedWallet;
+        const activeWallet = wallet.value;
+        const storageValue = stringifySelectedWallet(walletInfo);
+        if (!activeWallet || activeWallet.connected || activeWallet.connecting || attemptedAutoConnectWallet === storageValue) {
+          return;
         }
-        const adaptedWallet = adaptSolanaStandardWallet(walletInfo, {
-          chain: getSolanaChain(context.cluster),
-          onChange: () => triggerRef(wallet)
+        attemptedAutoConnectWallet = storageValue;
+        void activeWallet.connect().catch((cause) => {
+          console.error("[Vue Solana] Wallet auto-connect failed", cause);
+        }).finally(() => {
+          triggerRef(wallet);
         });
-        const cachedAdapter = {
-          platform: walletInfo.platform,
-          source: walletInfo.source,
-          get publicKey() {
-            return adaptedWallet.publicKey;
-          },
-          get connected() {
-            return adaptedWallet.connected;
-          },
-          get connecting() {
-            return adaptedWallet.connecting;
-          },
-          get disconnecting() {
-            return adaptedWallet.disconnecting;
-          },
-          async connect() {
-            await adaptedWallet.connect();
-            await Promise.all(
-              Array.from(getCachedWallets()).map(
-                (otherWallet) => otherWallet !== cachedAdapter && otherWallet.connected ? otherWallet.disconnect() : void 0
-              )
-            );
-          },
-          disconnect: () => adaptedWallet.disconnect(),
-          signTransaction: adaptedWallet.signTransaction?.bind(adaptedWallet),
-          signAllTransactions: adaptedWallet.signAllTransactions?.bind(adaptedWallet),
-          signAndSendTransaction: adaptedWallet.signAndSendTransaction?.bind(adaptedWallet)
-        };
-        adaptedWallets.set(walletInfo.wallet, cachedAdapter);
-        return cachedAdapter;
-      }
-      function getDiscoveredWallets() {
-        return [
-          ...getRegisteredSolanaWallets(),
-          ...options.iosWallet === false ? [] : getSolanaIosWallets({
-            chains: [getSolanaChain(context.cluster)],
-            cluster: context.cluster,
-            ...options.iosWallet || {}
-          })
-        ];
-      }
-      function handleIosWalletCallback() {
-        try {
-          handleSolanaIosWalletCallback({ clearUrl: true });
-        } catch (cause) {
-          console.error("[Vue Solana] iOS wallet callback failed", cause);
-        }
-      }
-      function* getCachedWallets() {
-        for (const walletInfo of wallets.value) {
-          if (isObject(walletInfo.wallet)) {
-            const cachedWallet = adaptedWallets.get(walletInfo.wallet);
-            if (cachedWallet) {
-              yield cachedWallet;
-            }
-          }
-        }
       }
       const vueContext = {
         ...context,
@@ -190,36 +293,26 @@ function createSolanaPlugin(options = {}) {
         setWallet(nextWallet) {
           selectedWallet.value = null;
           wallet.value = nextWallet;
+          writeSelectedWallet(null);
         }
       };
       app.provide(solanaInjectionKey, vueContext);
       if (typeof window !== "undefined") {
         window.setTimeout(() => {
+          try {
+            refreshWallets();
+          } catch (cause) {
+            console.error("[Vue Solana] Wallet refresh failed", cause);
+          }
           void checkConnection();
         }, 0);
       }
     }
   };
 }
-function isObject(value) {
-  return typeof value === "object" && value !== null || typeof value === "function";
-}
 function isSameWallet(wallet, selectedWallet) {
   return wallet.name === selectedWallet?.name && wallet.source === selectedWallet.source && wallet.platform === selectedWallet.platform;
 }
 const VueSolana = createSolanaPlugin;
-function withTimeout(promise, timeoutMs, message) {
-  let timeoutId;
-  const timeout = new Promise((_, reject) => {
-    timeoutId = setTimeout(() => {
-      reject(new Error(message));
-    }, timeoutMs);
-  });
-  return Promise.race([promise, timeout]).finally(() => {
-    if (timeoutId) {
-      clearTimeout(timeoutId);
-    }
-  });
-}
 
 export { VueSolana, createSolanaPlugin, solanaInjectionKey };

package/dist/shared/{vue.BfF-kOvb.mjs → vue.DJ42Zrow.mjs}

@@ -1,7 +1,7 @@
 import { signAndSendTransaction } from '@vue-solana/core/transaction';
 import { u as useConnection } from './vue.DlEAL2G8.mjs';
 import { u as useWallet } from './vue.DYf_CRDv.mjs';
-import { u as useTransaction } from './vue.CuhLIeDx.mjs';
+import { u as useTransaction } from './vue.gLqkzJY4.mjs';
 
 const SIGN_AND_SEND_TIMEOUT_MS = 12e4;
 function useSignAndSendTransaction() {

package/dist/shared/{vue.DJqRk8z_.mjs → vue.DQhHHVu6.mjs}

@@ -1,31 +1,42 @@
 import { PublicKey } from '@solana/web3-compat';
-import { ref, onMounted, watch, toValue } from 'vue';
+import { shallowRef, onMounted, watch, toValue } from 'vue';
 import { u as useConnection } from './vue.DlEAL2G8.mjs';
 import { t as tryUseSolana } from './vue.1M_c5FWA.mjs';
 
 function useBalance(address, commitment) {
   const solana = tryUseSolana();
   const connection = solana?.connection ?? useConnection();
-  const balance = ref(null);
-  const loading = ref(false);
-  const error = ref(null);
+  const balance = shallowRef(null);
+  const loading = shallowRef(false);
+  const error = shallowRef(null);
+  let refreshId = 0;
   async function refresh() {
+    const requestId = ++refreshId;
     const value = toValue(address);
     if (!value || !solana) {
       balance.value = null;
+      loading.value = false;
+      error.value = null;
       return null;
     }
     loading.value = true;
     error.value = null;
     try {
       const publicKey = typeof value === "string" ? new PublicKey(value) : value;
-      balance.value = await connection.getBalance(publicKey, commitment);
-      return balance.value;
+      const nextBalance = await connection.getBalance(publicKey, commitment);
+      if (requestId === refreshId) {
+        balance.value = nextBalance;
+      }
+      return nextBalance;
     } catch (cause) {
-      error.value = cause;
+      if (requestId === refreshId) {
+        error.value = cause;
+      }
       throw cause;
     } finally {
-      loading.value = false;
+      if (requestId === refreshId) {
+        loading.value = false;
+      }
     }
   }
   onMounted(() => {

package/dist/shared/{vue.CNhelr8H.cjs → vue.DQi38JeF.cjs}

@@ -2,6 +2,25 @@
 
 const vue = require('vue');
 
+async function withTimeout(promise, timeoutMs, message) {
+  if (!timeoutMs) {
+    return promise;
+  }
+  let timeoutId;
+  try {
+    const timeout = new Promise((_, reject) => {
+      timeoutId = setTimeout(() => {
+        reject(new Error(message));
+      }, timeoutMs);
+    });
+    return await Promise.race([promise, timeout]);
+  } finally {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+  }
+}
+
 function useTransaction(handler, options = {}) {
   const signature = vue.ref(null);
   const loading = vue.ref(false);
@@ -39,21 +58,6 @@ function useTransaction(handler, options = {}) {
     execute
   };
 }
-function withTimeout(promise, timeoutMs, message) {
-  if (!timeoutMs) {
-    return promise;
-  }
-  let timeoutId;
-  const timeout = new Promise((_, reject) => {
-    timeoutId = setTimeout(() => {
-      reject(new Error(message));
-    }, timeoutMs);
-  });
-  return Promise.race([promise, timeout]).finally(() => {
-    if (timeoutId) {
-      clearTimeout(timeoutId);
-    }
-  });
-}
 
 exports.useTransaction = useTransaction;
+exports.withTimeout = withTimeout;

package/dist/shared/{vue.BwrQMPty.cjs → vue.DQmAPXVB.cjs}

@@ -3,7 +3,7 @@
 const transaction = require('@vue-solana/core/transaction');
 const useConnection = require('./vue.CwhEmATP.cjs');
 const useWallet = require('./vue.CwPjPFN6.cjs');
-const useTransaction = require('./vue.CNhelr8H.cjs');
+const useTransaction = require('./vue.DQi38JeF.cjs');
 
 const SIGN_AND_SEND_TIMEOUT_MS = 12e4;
 function useSignAndSendTransaction() {

package/dist/shared/{vue.DONKZzIb.cjs → vue.D_AM1Nl8.cjs}

@@ -8,26 +8,37 @@ const useSolana = require('./vue.C4tLiG3R.cjs');
 function useBalance(address, commitment) {
   const solana = useSolana.tryUseSolana();
   const connection = solana?.connection ?? useConnection.useConnection();
-  const balance = vue.ref(null);
-  const loading = vue.ref(false);
-  const error = vue.ref(null);
+  const balance = vue.shallowRef(null);
+  const loading = vue.shallowRef(false);
+  const error = vue.shallowRef(null);
+  let refreshId = 0;
   async function refresh() {
+    const requestId = ++refreshId;
     const value = vue.toValue(address);
     if (!value || !solana) {
       balance.value = null;
+      loading.value = false;
+      error.value = null;
       return null;
     }
     loading.value = true;
     error.value = null;
     try {
       const publicKey = typeof value === "string" ? new web3Compat.PublicKey(value) : value;
-      balance.value = await connection.getBalance(publicKey, commitment);
-      return balance.value;
+      const nextBalance = await connection.getBalance(publicKey, commitment);
+      if (requestId === refreshId) {
+        balance.value = nextBalance;
+      }
+      return nextBalance;
     } catch (cause) {
-      error.value = cause;
+      if (requestId === refreshId) {
+        error.value = cause;
+      }
       throw cause;
     } finally {
-      loading.value = false;
+      if (requestId === refreshId) {
+        loading.value = false;
+      }
     }
   }
   vue.onMounted(() => {

package/dist/shared/{vue.CuhLIeDx.mjs → vue.gLqkzJY4.mjs}

@@ -1,5 +1,24 @@
 import { ref } from 'vue';
 
+async function withTimeout(promise, timeoutMs, message) {
+  if (!timeoutMs) {
+    return promise;
+  }
+  let timeoutId;
+  try {
+    const timeout = new Promise((_, reject) => {
+      timeoutId = setTimeout(() => {
+        reject(new Error(message));
+      }, timeoutMs);
+    });
+    return await Promise.race([promise, timeout]);
+  } finally {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+  }
+}
+
 function useTransaction(handler, options = {}) {
   const signature = ref(null);
   const loading = ref(false);
@@ -37,21 +56,5 @@ function useTransaction(handler, options = {}) {
     execute
   };
 }
-function withTimeout(promise, timeoutMs, message) {
-  if (!timeoutMs) {
-    return promise;
-  }
-  let timeoutId;
-  const timeout = new Promise((_, reject) => {
-    timeoutId = setTimeout(() => {
-      reject(new Error(message));
-    }, timeoutMs);
-  });
-  return Promise.race([promise, timeout]).finally(() => {
-    if (timeoutId) {
-      clearTimeout(timeoutId);
-    }
-  });
-}
 
-export { useTransaction as u };
+export { useTransaction as u, withTimeout as w };

package/dist/useBalance.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const useBalance = require('./shared/vue.DONKZzIb.cjs');
+const useBalance = require('./shared/vue.D_AM1Nl8.cjs');
 require('@solana/web3-compat');
 require('vue');
 require('./shared/vue.CwhEmATP.cjs');

package/dist/useBalance.d.cts

@@ -3,10 +3,10 @@ import { MaybeRefOrGetter } from 'vue';
 import { PublicKey, Commitment } from '@solana/web3-compat';
 
 declare function useBalance(address: MaybeRefOrGetter<PublicKey | string | null | undefined>, commitment?: Commitment): {
-    balance: vue.Ref<number | null, number | null>;
-    loading: vue.Ref<boolean, boolean>;
-    error: vue.Ref<unknown, unknown>;
-    refresh: () => Promise<number | null>;
+    balance: vue.ShallowRef<number | null, number | null>;
+    loading: vue.ShallowRef<boolean, boolean>;
+    error: vue.ShallowRef<unknown, unknown>;
+    refresh: () => Promise<any>;
 };
 
 export { useBalance };

package/dist/useBalance.d.mts

@@ -3,10 +3,10 @@ import { MaybeRefOrGetter } from 'vue';
 import { PublicKey, Commitment } from '@solana/web3-compat';
 
 declare function useBalance(address: MaybeRefOrGetter<PublicKey | string | null | undefined>, commitment?: Commitment): {
-    balance: vue.Ref<number | null, number | null>;
-    loading: vue.Ref<boolean, boolean>;
-    error: vue.Ref<unknown, unknown>;
-    refresh: () => Promise<number | null>;
+    balance: vue.ShallowRef<number | null, number | null>;
+    loading: vue.ShallowRef<boolean, boolean>;
+    error: vue.ShallowRef<unknown, unknown>;
+    refresh: () => Promise<any>;
 };
 
 export { useBalance };

package/dist/useBalance.d.ts

@@ -3,10 +3,10 @@ import { MaybeRefOrGetter } from 'vue';
 import { PublicKey, Commitment } from '@solana/web3-compat';
 
 declare function useBalance(address: MaybeRefOrGetter<PublicKey | string | null | undefined>, commitment?: Commitment): {
-    balance: vue.Ref<number | null, number | null>;
-    loading: vue.Ref<boolean, boolean>;
-    error: vue.Ref<unknown, unknown>;
-    refresh: () => Promise<number | null>;
+    balance: vue.ShallowRef<number | null, number | null>;
+    loading: vue.ShallowRef<boolean, boolean>;
+    error: vue.ShallowRef<unknown, unknown>;
+    refresh: () => Promise<any>;
 };
 
 export { useBalance };

package/dist/useBalance.mjs

@@ -1,4 +1,4 @@
-export { u as useBalance } from './shared/vue.DJqRk8z_.mjs';
+export { u as useBalance } from './shared/vue.DQhHHVu6.mjs';
 import '@solana/web3-compat';
 import 'vue';
 import './shared/vue.DlEAL2G8.mjs';

package/dist/useSignAndSendTransaction.cjs

@@ -1,13 +1,13 @@
 'use strict';
 
-const useSignAndSendTransaction = require('./shared/vue.BwrQMPty.cjs');
+const useSignAndSendTransaction = require('./shared/vue.DQmAPXVB.cjs');
 require('@vue-solana/core/transaction');
 require('./shared/vue.CwhEmATP.cjs');
 require('./shared/vue.COyyrsQU.cjs');
 require('vue');
 require('./shared/vue.C4tLiG3R.cjs');
 require('./shared/vue.CwPjPFN6.cjs');
-require('./shared/vue.CNhelr8H.cjs');
+require('./shared/vue.DQi38JeF.cjs');
 
 
 

package/dist/useSignAndSendTransaction.mjs

@@ -1,8 +1,8 @@
-export { u as useSignAndSendTransaction } from './shared/vue.BfF-kOvb.mjs';
+export { u as useSignAndSendTransaction } from './shared/vue.DJ42Zrow.mjs';
 import '@vue-solana/core/transaction';
 import './shared/vue.DlEAL2G8.mjs';
 import './shared/vue.BqDzSepb.mjs';
 import 'vue';
 import './shared/vue.1M_c5FWA.mjs';
 import './shared/vue.DYf_CRDv.mjs';
-import './shared/vue.CuhLIeDx.mjs';
+import './shared/vue.gLqkzJY4.mjs';

package/dist/useTransaction.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const useTransaction = require('./shared/vue.CNhelr8H.cjs');
+const useTransaction = require('./shared/vue.DQi38JeF.cjs');
 require('vue');
 
 

package/dist/useTransaction.mjs

@@ -1,2 +1,2 @@
-export { u as useTransaction } from './shared/vue.CuhLIeDx.mjs';
+export { u as useTransaction } from './shared/vue.gLqkzJY4.mjs';
 import 'vue';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-solana/vue",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Vue plugin and composables for Solana applications.",
   "license": "MIT",
   "keywords": [
@@ -78,7 +78,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue-solana/core": "0.4.1"
+    "@vue-solana/core": "0.4.2"
   },
   "peerDependencies": {
     "@solana/web3-compat": "^0.0.21",