@vue-solana/vue 4.0.0-rc.0 → 4.0.0-rc.1

package/README.md

@@ -276,6 +276,8 @@ const { publicKey, connected, connecting, canSignMessage, connect, disconnect }
 
 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`.
 
+Connecting a wallet also disconnects every other discovered wallet through its `standard:disconnect` feature, so only one wallet stays authorized for the app. An extension the user authorized in an earlier page session can otherwise keep answering signing requests, which is the usual cause of the wrong wallet prompting for a `signMessage` confirmation. A wallet that fails or never answers its disconnect is ignored after a 2 second timeout, and `connect()` resolves only after the sweep finishes.
+
 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.

package/dist/index.mjs

@@ -11,12 +11,12 @@ export { u as useRequest } from './shared/vue.B8VvC8d2.mjs';
 export { u as useRpc } from './shared/vue.D8zNWw2t.mjs';
 export { S as SelectedWalletAccountProvider, c as createSelectedWalletAccountContext, p as provideSelectedWalletAccount, s as selectedWalletAccountInjectionKey, u as useSelectedWalletAccount } from './shared/vue.BngCaeXJ.mjs';
 export { u as useSendTransaction, a as useSendTransactions } from './shared/vue.CLAqNcLp.mjs';
-export { u as useSignMessage } from './shared/vue.DbJG4-ku.mjs';
-export { u as useSignAndSendTransaction } from './shared/vue.4ne5EBD9.mjs';
-export { u as useSignTransactions } from './shared/vue.CW-1AuSO.mjs';
-export { P as PartialSignAndSendError, u as useSignAndSendTransactions } from './shared/vue.UrCjmf0T.mjs';
+export { u as useSignMessage } from './shared/vue.Ddf_Cdjx.mjs';
+export { u as useSignAndSendTransaction } from './shared/vue.BTD4usyi.mjs';
+export { u as useSignTransactions } from './shared/vue.BHBifdbc.mjs';
+export { P as PartialSignAndSendError, u as useSignAndSendTransactions } from './shared/vue.C-7v1l8q.mjs';
 export { u as useSignatureStatus } from './shared/vue.Bu2cQ690.mjs';
-export { u as useSignIn } from './shared/vue.BBN9aU6D.mjs';
+export { u as useSignIn } from './shared/vue.SeuJipQ8.mjs';
 export { t as tryUseSolana, u as useSolana } from './shared/vue.CcOZ9858.mjs';
 export { u as useSolanaClient } from './shared/vue.CZApWQAY.mjs';
 export { u as useSubscription } from './shared/vue.D5pqR5Fa.mjs';
@@ -25,7 +25,7 @@ export { u as useTokenBalance } from './shared/vue.FehFeE3w.mjs';
 export { u as useTrackedData } from './shared/vue.BNJTXSnQ.mjs';
 export { u as useTransaction } from './shared/vue.5euWd6-V.mjs';
 export { g as getConfirmedTransactionStatus, u as useTransactionConfirmation } from './shared/vue.DPwdqRO_.mjs';
-export { u as useWallet } from './shared/vue.DY9VadLH.mjs';
+export { u as useWallet } from './shared/vue.Bc_Kbwr5.mjs';
 export { u as useWallets } from './shared/vue.DyLgoSbX.mjs';
 import { s as solanaInjectionKey } from './shared/vue.D_P5SqqD.mjs';
 import { createSolanaError, normalizeSolanaError } from '@vue-solana/core/errors';
@@ -33,7 +33,7 @@ export { SolanaError, isSolanaError } from '@vue-solana/core/errors';
 import { isSolanaMobileWalletSupported } from '@vue-solana/core/mobile-wallet-support';
 import { createSolanaContext } from '@vue-solana/core/rpc';
 import { withTimeout } from '@vue-solana/core/timeout';
-import { getRegisteredSolanaWallets, getSolanaChain, adaptSolanaStandardWallet, subscribeSolanaWallets } from '@vue-solana/core/wallet-standard';
+import { getRegisteredSolanaWallets, getSolanaChain, adaptSolanaStandardWallet, disconnectSolanaStandardWallet, subscribeSolanaWallets } from '@vue-solana/core/wallet-standard';
 import { shallowRef, ref, triggerRef } from 'vue';
 import { handleSolanaIosWalletCallback, getSolanaIosWallets, isSolanaIosWalletInfo, adaptSolanaIosWallet } from '@vue-solana/core/ios-wallet';
 export * from '@vue-solana/core/types';
@@ -112,6 +112,7 @@ function getLocalStorage() {
   }
 }
 
+const DISCONNECT_TIMEOUT_MS = 2e3;
 function createSolanaWalletRegistry(options) {
   const adaptedWallets = /* @__PURE__ */ new WeakMap();
   const adaptedPrimitiveWallets = /* @__PURE__ */ new Map();
@@ -126,25 +127,31 @@ function createSolanaWalletRegistry(options) {
       if (cachedIosWallet) {
         return cachedIosWallet;
       }
-      const iosAdapter = adaptSolanaIosWallet(walletInfo, {
-        chain: getSolanaChain(options.cluster),
-        cluster: options.cluster,
-        onChange: options.onWalletChange,
-        ...options.iosWallet || {}
-      });
+      const iosAdapter = makeConnectExclusive(
+        adaptSolanaIosWallet(walletInfo, {
+          chain: getSolanaChain(options.cluster),
+          cluster: options.cluster,
+          onChange: options.onWalletChange,
+          ...options.iosWallet || {}
+        }),
+        walletInfo
+      );
       adaptedWallets.set(walletInfo.wallet, iosAdapter);
       return trackAdapter(iosAdapter);
     }
     if (!isObject(walletInfo.wallet)) {
-      const primitiveKey = `${walletInfo.name}::${String(walletInfo.wallet)}`;
+      const primitiveKey = getPrimitiveWalletKey(walletInfo);
       const cachedPrimitiveWallet = adaptedPrimitiveWallets.get(primitiveKey);
       if (cachedPrimitiveWallet) {
         return cachedPrimitiveWallet;
       }
-      const primitiveAdapter = adaptSolanaStandardWallet(walletInfo, {
-        chain: getSolanaChain(options.cluster),
-        onChange: options.onWalletChange
-      });
+      const primitiveAdapter = makeConnectExclusive(
+        adaptSolanaStandardWallet(walletInfo, {
+          chain: getSolanaChain(options.cluster),
+          onChange: options.onWalletChange
+        }),
+        walletInfo
+      );
       adaptedPrimitiveWallets.set(primitiveKey, primitiveAdapter);
       return trackAdapter(primitiveAdapter);
     }
@@ -152,30 +159,19 @@ function createSolanaWalletRegistry(options) {
     if (cachedWallet) {
       return cachedWallet;
     }
-    const adaptedWallet = adaptSolanaStandardWallet(walletInfo, {
-      chain: getSolanaChain(options.cluster),
-      onChange: options.onWalletChange
-    });
-    const cachedAdapter = new Proxy(adaptedWallet, {
-      get(target, property) {
-        if (property === "connect") {
-          return connectAndDisconnectOthers;
-        }
-        const value = Reflect.get(target, property);
-        return typeof value === "function" ? value.bind(target) : value;
-      }
-    });
-    async function connectAndDisconnectOthers() {
-      await adaptedWallet.connect();
-      await Promise.all(
-        Array.from(getCachedWallets()).map(
-          (otherWallet) => otherWallet !== cachedAdapter && otherWallet.connected ? otherWallet.disconnect() : void 0
-        )
-      );
-    }
+    const cachedAdapter = makeConnectExclusive(
+      adaptSolanaStandardWallet(walletInfo, {
+        chain: getSolanaChain(options.cluster),
+        onChange: options.onWalletChange
+      }),
+      walletInfo
+    );
     adaptedWallets.set(walletInfo.wallet, cachedAdapter);
     return trackAdapter(cachedAdapter);
   }
+  function getCachedAdapter(walletInfo) {
+    return isObject(walletInfo.wallet) ? adaptedWallets.get(walletInfo.wallet) : adaptedPrimitiveWallets.get(getPrimitiveWalletKey(walletInfo));
+  }
   function getDiscoveredWallets() {
     return [
       ...getRegisteredSolanaWallets(),
@@ -190,17 +186,41 @@ function createSolanaWalletRegistry(options) {
     try {
       handleSolanaIosWalletCallback({ clearUrl: true });
     } catch (cause) {
+      options.onError?.(cause);
     }
   }
-  function* getCachedWallets() {
-    for (const walletInfo of options.getWalletInfos()) {
-      if (isObject(walletInfo.wallet)) {
-        const cachedWallet = adaptedWallets.get(walletInfo.wallet);
-        if (cachedWallet) {
-          yield cachedWallet;
+  function makeConnectExclusive(adapter, walletInfo) {
+    const connect = adapter.connect.bind(adapter);
+    adapter.connect = async () => {
+      await connect();
+      await disconnectOtherWallets(walletInfo, adapter);
+    };
+    return adapter;
+  }
+  async function disconnectOtherWallets(currentWallet, currentAdapter) {
+    await Promise.all(
+      options.getWalletInfos().map(async (walletInfo) => {
+        const cachedWallet = getCachedAdapter(walletInfo);
+        if (cachedWallet === currentAdapter || isSameWalletInfo(walletInfo, currentWallet)) {
+          return;
         }
-      }
+        try {
+          await withTimeout(
+            disconnectWallet(walletInfo, cachedWallet),
+            DISCONNECT_TIMEOUT_MS,
+            () => new Error(`Solana wallet "${walletInfo.name}" did not disconnect within its timeout`)
+          );
+        } catch {
+        }
+      })
+    );
+  }
+  async function disconnectWallet(walletInfo, cachedWallet) {
+    if (cachedWallet) {
+      await cachedWallet.disconnect();
+      return;
     }
+    await disconnectSolanaStandardWallet(walletInfo);
   }
   function disposeAllAdaptedWallets() {
     for (const adapter of trackedAdapters) {
@@ -217,6 +237,12 @@ function createSolanaWalletRegistry(options) {
 function isObject(value) {
   return typeof value === "object" && value !== null || typeof value === "function";
 }
+function getPrimitiveWalletKey(walletInfo) {
+  return `${walletInfo.name}::${String(walletInfo.wallet)}`;
+}
+function isSameWalletInfo(a, b) {
+  return a.wallet === b.wallet || a.name === b.name && a.source === b.source;
+}
 
 const RPC_CHECK_TIMEOUT_MS = 1e4;
 function createSolanaPlugin(options = {}) {
@@ -235,7 +261,11 @@ function createSolanaPlugin(options = {}) {
         cluster: context.cluster,
         iosWallet: options.iosWallet,
         getWalletInfos: () => wallets.value,
-        onWalletChange: () => triggerRef(wallet)
+        onWalletChange: () => triggerRef(wallet),
+        onError: (cause) => {
+          error.value = normalizeSolanaError(cause, "WALLET_FAILURE");
+          logDevError("Failed to handle Solana iOS wallet callback", cause);
+        }
       });
       let unsubscribeWallets = null;
       let mobileWalletRegistrationPromise = null;
@@ -267,6 +297,7 @@ function createSolanaPlugin(options = {}) {
           }
           status.value = "error";
           error.value = normalizeSolanaError(cause, "RPC_FAILURE");
+          logDevError("Connection failed", cause);
         }
       }
       function refreshWallets() {
@@ -286,6 +317,7 @@ function createSolanaPlugin(options = {}) {
           const persistedWallet = readSelectedWallet();
           if (persistedWallet.error) {
             error.value = persistedWallet.error;
+            logDevError("Failed to read the persisted Solana wallet", persistedWallet.error);
           }
           restoredWallet = persistedWallet.wallet ? wallets.value.find(
             (nextWallet) => isSameWallet(nextWallet, persistedWallet.wallet)
@@ -316,6 +348,8 @@ function createSolanaPlugin(options = {}) {
           });
           refreshWallets();
         }).catch((cause) => {
+          error.value = normalizeSolanaError(cause, "WALLET_FAILURE");
+          logDevError("Failed to register Solana mobile wallet", cause);
         }).finally(() => {
           mobileWalletRegistrationPromise = null;
         });
@@ -326,6 +360,7 @@ function createSolanaPlugin(options = {}) {
         const storageError = writeSelectedWallet(nextWallet);
         if (storageError) {
           error.value = storageError;
+          logDevError("Failed to persist the selected Solana wallet", storageError);
         }
       }
       function autoConnectWallet(walletInfo) {
@@ -339,6 +374,8 @@ function createSolanaPlugin(options = {}) {
         }
         attemptedAutoConnectWallet = storageValue;
         void activeWallet.connect().catch((cause) => {
+          error.value = normalizeSolanaError(cause, "WALLET_FAILURE");
+          logDevError("Failed to auto-connect Solana wallet", cause);
         }).finally(() => {
           triggerRef(wallet);
         });
@@ -360,6 +397,7 @@ function createSolanaPlugin(options = {}) {
           const storageError = writeSelectedWallet(null);
           if (storageError) {
             error.value = storageError;
+            logDevError("Failed to clear the persisted Solana wallet", storageError);
           }
         }
       };
@@ -378,11 +416,13 @@ function createSolanaPlugin(options = {}) {
       };
       if (typeof window !== "undefined") {
         bootstrapId = window.setTimeout(() => {
+          void checkConnection();
           try {
             refreshWallets();
           } catch (cause) {
+            error.value = normalizeSolanaError(cause, "WALLET_FAILURE");
+            logDevError("Failed to refresh Solana wallets", cause);
           }
-          void checkConnection();
         }, 0);
       }
     },
@@ -395,6 +435,24 @@ function createSolanaPlugin(options = {}) {
 function isSameWallet(wallet, selectedWallet) {
   return wallet.name === selectedWallet?.name && wallet.source === selectedWallet.source && wallet.platform === selectedWallet.platform;
 }
+function isDevEnvironment() {
+  try {
+    if (import.meta.env?.DEV === true) {
+      return true;
+    }
+  } catch {
+  }
+  if (typeof process === "undefined") {
+    return false;
+  }
+  const mode = process.env?.NODE_ENV;
+  return mode === "development" || mode === "test";
+}
+function logDevError(message, cause) {
+  if (isDevEnvironment()) {
+    console.error(`[Vue Solana] ${message}`, cause);
+  }
+}
 const VueSolana = createSolanaPlugin;
 
 export { VueSolana, createSolanaPlugin, solanaInjectionKey };

package/dist/shared/{vue.CW-1AuSO.mjs → vue.BHBifdbc.mjs}

@@ -1,7 +1,7 @@
 import { createNoWalletSelectedError, assertWalletCanSignTransactions } from '@vue-solana/core/wallet';
 import { shallowRef } from 'vue';
 import { u as useExecution } from './vue.BiKE9Xuv.mjs';
-import { u as useWallet } from './vue.DY9VadLH.mjs';
+import { u as useWallet } from './vue.Bc_Kbwr5.mjs';
 
 function useSignTransactions() {
   const { wallet } = useWallet();

package/dist/shared/{vue.4ne5EBD9.mjs → vue.BTD4usyi.mjs}

@@ -4,7 +4,7 @@ import { signAndSendTransaction, confirmTransactionSignature } from '@vue-solana
 import { createNoWalletSelectedError } from '@vue-solana/core/wallet';
 import { ref, computed } from 'vue';
 import { u as useSolanaClient } from './vue.CZApWQAY.mjs';
-import { u as useWallet } from './vue.DY9VadLH.mjs';
+import { u as useWallet } from './vue.Bc_Kbwr5.mjs';
 import { g as getConfirmedTransactionStatus } from './vue.DPwdqRO_.mjs';
 
 const SIGN_AND_SEND_TIMEOUT_MS = 12e4;

package/dist/shared/{vue.DY9VadLH.mjs → vue.Bc_Kbwr5.mjs}

@@ -8,6 +8,12 @@ function useWallet() {
   const wallet = solana.wallet;
   const connecting = ref(false);
   const disconnecting = ref(false);
+  function clearWalletError() {
+    const current = solana.error.value;
+    if (current?.code === "WALLET_FAILURE" || current?.code === "USER_REJECTED") {
+      solana.error.value = null;
+    }
+  }
   async function connect() {
     if (connecting.value || wallet.value?.connecting) {
       return;
@@ -22,9 +28,10 @@ function useWallet() {
       triggerRef(wallet);
       await connection;
       assertWalletConnected(activeWallet);
+      clearWalletError();
       triggerRef(wallet);
     } catch (error) {
-      const normalizedError = normalizeSolanaError(error, "RPC_FAILURE");
+      const normalizedError = normalizeSolanaError(error, "WALLET_FAILURE");
       triggerRef(wallet);
       throw normalizedError;
     } finally {
@@ -39,9 +46,10 @@ function useWallet() {
     disconnecting.value = true;
     try {
       await activeWallet.disconnect();
+      clearWalletError();
       triggerRef(wallet);
     } catch (error) {
-      const normalizedError = normalizeSolanaError(error, "RPC_FAILURE");
+      const normalizedError = normalizeSolanaError(error, "WALLET_FAILURE");
       triggerRef(wallet);
       throw normalizedError;
     } finally {

package/dist/shared/{vue.UrCjmf0T.mjs → vue.C-7v1l8q.mjs}

@@ -3,7 +3,7 @@ import { withSolanaTimeout } from '@vue-solana/core/timeout';
 import { createNoWalletSelectedError, assertWalletCanSignAndSendTransactions } from '@vue-solana/core/wallet';
 import { shallowRef } from 'vue';
 import { u as useExecution } from './vue.BiKE9Xuv.mjs';
-import { u as useWallet } from './vue.DY9VadLH.mjs';
+import { u as useWallet } from './vue.Bc_Kbwr5.mjs';
 
 const SIGN_AND_SEND_TIMEOUT_MS = 12e4;
 class PartialSignAndSendError extends SolanaError {

package/dist/shared/{vue.DbJG4-ku.mjs → vue.Ddf_Cdjx.mjs}

@@ -1,7 +1,7 @@
 import { createNoWalletSelectedError, assertWalletCanSignMessage } from '@vue-solana/core/wallet';
 import { ref } from 'vue';
 import { u as useExecution } from './vue.BiKE9Xuv.mjs';
-import { u as useWallet } from './vue.DY9VadLH.mjs';
+import { u as useWallet } from './vue.Bc_Kbwr5.mjs';
 
 function useSignMessage() {
   const { wallet } = useWallet();

package/dist/shared/{vue.BBN9aU6D.mjs → vue.SeuJipQ8.mjs}

@@ -1,7 +1,7 @@
 import { createNoWalletSelectedError, assertWalletCanSignIn } from '@vue-solana/core/wallet';
 import { shallowRef } from 'vue';
 import { u as useExecution } from './vue.BiKE9Xuv.mjs';
-import { u as useWallet } from './vue.DY9VadLH.mjs';
+import { u as useWallet } from './vue.Bc_Kbwr5.mjs';
 
 function useSignIn() {
   const { wallet } = useWallet();

package/dist/useSignAndSendTransaction.mjs

@@ -1 +1 @@
-export { u as useSignAndSendTransaction } from './shared/vue.4ne5EBD9.mjs';
+export { u as useSignAndSendTransaction } from './shared/vue.BTD4usyi.mjs';

package/dist/useSignAndSendTransactions.mjs

@@ -1 +1 @@
-export { P as PartialSignAndSendError, u as useSignAndSendTransactions } from './shared/vue.UrCjmf0T.mjs';
+export { P as PartialSignAndSendError, u as useSignAndSendTransactions } from './shared/vue.C-7v1l8q.mjs';

package/dist/useSignIn.mjs

@@ -1 +1 @@
-export { u as useSignIn } from './shared/vue.BBN9aU6D.mjs';
+export { u as useSignIn } from './shared/vue.SeuJipQ8.mjs';

package/dist/useSignMessage.mjs

@@ -1 +1 @@
-export { u as useSignMessage } from './shared/vue.DbJG4-ku.mjs';
+export { u as useSignMessage } from './shared/vue.Ddf_Cdjx.mjs';

package/dist/useSignTransactions.mjs

@@ -1 +1 @@
-export { u as useSignTransactions } from './shared/vue.CW-1AuSO.mjs';
+export { u as useSignTransactions } from './shared/vue.BHBifdbc.mjs';

package/dist/useWallet.mjs

@@ -1 +1 @@
-export { u as useWallet } from './shared/vue.DY9VadLH.mjs';
+export { u as useWallet } from './shared/vue.Bc_Kbwr5.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-solana/vue",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.0-rc.1",
   "description": "Vue plugin and composables for Solana applications.",
   "license": "MIT",
   "keywords": [
@@ -178,7 +178,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue-solana/core": "4.0.0-rc.0"
+    "@vue-solana/core": "4.0.0-rc.1"
   },
   "peerDependencies": {
     "vue": "^3.5.0"