@vue-solana/vue 4.1.2 → 4.1.4

package/README.md

@@ -319,7 +319,7 @@ Browser extension wallets are discovered through the Solana Wallet Standard. And
 
 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.
+Selected discovered wallets are persisted under `localStorage["vue-solana:selected-wallet"]` as non-sensitive identity metadata: `name`, `platform`/`source` when available, and `connected: true` while the wallet is connected. On reload, Vue Solana restores the selected wallet if the same wallet is discovered again. A wallet the user left connected is restored after a reload even without `autoConnect`, through a silent connect (`connect({ silent: true })`) that does not prompt or launch a wallet app for wallets that honour the Wallet Standard `silent` hint (a wallet that ignores it can prompt on page load); an explicit `disconnect()` forgets that session. Pass `autoConnect: true` to also connect a restored wallet that was only selected; 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.d.ts

@@ -14,7 +14,7 @@ export { SendTransactionConfig, SendTransactionInput, SendTransactionStatus, Sen
 export { SignMessageStatus, useSignMessage } from './useSignMessage.js';
 export { SignAndSendTransactionOptions, SignAndSendTransactionStatus, useSignAndSendTransaction } from './useSignAndSendTransaction.js';
 export { SignTransactionsStatus, useSignTransactions } from './useSignTransactions.js';
-export { PartialSignAndSendError, SignAndSendTransactionsStatus, useSignAndSendTransactions } from './useSignAndSendTransactions.js';
+export { SignAndSendTransactionsStatus, useSignAndSendTransactions } from './useSignAndSendTransactions.js';
 export { SignatureStatus, UseSignatureStatusOptions, useSignatureStatus } from './useSignatureStatus.js';
 export { SignInStatus, useSignIn } from './useSignIn.js';
 export { tryUseSolana, useSolana } from './useSolana.js';
@@ -39,7 +39,7 @@ import { SolanaConfig, SolanaWallet } from '@vue-solana/core/types';
 export * from '@vue-solana/core/types';
 export { TransactionStatus } from '@vue-solana/core/types';
 import { App } from 'vue';
-export { SolanaError, SolanaErrorCode, isSolanaError } from '@vue-solana/core/errors';
+export { PartialSignAndSendError, SolanaError, SolanaErrorCode, isSolanaError } from '@vue-solana/core/errors';
 export * from '@vue-solana/core/kit';
 import '@vue-solana/core';
 import '@solana/kit-plugin-rpc';

package/dist/index.mjs

@@ -14,7 +14,7 @@ export { u as useSendTransaction, a as useSendTransactions } from './shared/vue.
 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 useSignAndSendTransactions } from './shared/vue.sPcsjyKU.mjs';
 export { u as useSignatureStatus } from './shared/vue.Bu2cQ690.mjs';
 export { u as useSignIn } from './shared/vue.SeuJipQ8.mjs';
 export { t as tryUseSolana, u as useSolana } from './shared/vue.CcOZ9858.mjs';
@@ -33,13 +33,14 @@ 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';
-export { SolanaError, isSolanaError } from '@vue-solana/core/errors';
+export { PartialSignAndSendError, 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, 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';
+import { sendSignedTransaction } from '@vue-solana/core/transaction';
 export * from '@vue-solana/core/types';
 export * from '@vue-solana/core/kit';
 
@@ -47,39 +48,47 @@ const SELECTED_WALLET_STORAGE_KEY = "vue-solana:selected-wallet";
 function readSelectedWallet() {
   const { storage, error } = getLocalStorage();
   if (error || !storage) {
-    return { wallet: null, error };
+    return { wallet: null, connected: false, error };
   }
   try {
     const value = storage.getItem(SELECTED_WALLET_STORAGE_KEY);
     if (!value) {
-      return { wallet: null, error: null };
+      return { wallet: null, connected: false, error: null };
     }
     const wallet = JSON.parse(value);
+    const hasName = typeof wallet.name === "string";
     return {
-      wallet: typeof wallet.name === "string" ? {
+      wallet: hasName ? {
         name: wallet.name,
         platform: wallet.platform,
         source: wallet.source
       } : null,
+      connected: hasName && wallet.connected === true,
       error: null
     };
   } catch (cause) {
     return {
       wallet: null,
+      connected: false,
       error: createSolanaError("STORAGE_FAILURE", "Unable to read the selected Solana wallet", {
         cause
       })
     };
   }
 }
-function writeSelectedWallet(wallet) {
+function writeSelectedWallet(wallet, connected = false) {
   const { storage, error } = getLocalStorage();
   if (error || !storage) {
     return error;
   }
   try {
     if (wallet) {
-      storage.setItem(SELECTED_WALLET_STORAGE_KEY, stringifySelectedWallet(wallet));
+      storage.setItem(
+        SELECTED_WALLET_STORAGE_KEY,
+        JSON.stringify(
+          connected ? { ...toPersistedSelectedWallet(wallet), connected: true } : toPersistedSelectedWallet(wallet)
+        )
+      );
     } else {
       storage.removeItem(SELECTED_WALLET_STORAGE_KEY);
     }
@@ -91,6 +100,9 @@ function writeSelectedWallet(wallet) {
   }
 }
 function stringifySelectedWallet(wallet) {
+  return JSON.stringify(toPersistedSelectedWallet(wallet));
+}
+function toPersistedSelectedWallet(wallet) {
   const value = { name: wallet.name };
   if (wallet.platform) {
     value.platform = wallet.platform;
@@ -98,7 +110,7 @@ function stringifySelectedWallet(wallet) {
   if (wallet.source) {
     value.source = wallet.source;
   }
-  return JSON.stringify(value);
+  return value;
 }
 function getLocalStorage() {
   if (typeof window === "undefined") {
@@ -121,6 +133,7 @@ function createSolanaWalletRegistry(options) {
   const adaptedWallets = /* @__PURE__ */ new WeakMap();
   const adaptedPrimitiveWallets = /* @__PURE__ */ new Map();
   const trackedAdapters = /* @__PURE__ */ new Set();
+  const sendTransaction = (signedTransaction, sendOptions) => sendSignedTransaction(options.client, signedTransaction, sendOptions);
   function trackAdapter(adapter) {
     trackedAdapters.add(adapter);
     return adapter;
@@ -131,7 +144,7 @@ function createSolanaWalletRegistry(options) {
       if (cachedIosWallet) {
         return cachedIosWallet;
       }
-      const iosAdapter = makeConnectExclusive(
+      const iosAdapter = decorateAdapter(
         adaptSolanaIosWallet(walletInfo, {
           chain: getSolanaChain(options.cluster),
           cluster: options.cluster,
@@ -149,10 +162,11 @@ function createSolanaWalletRegistry(options) {
       if (cachedPrimitiveWallet) {
         return cachedPrimitiveWallet;
       }
-      const primitiveAdapter = makeConnectExclusive(
+      const primitiveAdapter = decorateAdapter(
         adaptSolanaStandardWallet(walletInfo, {
           chain: getSolanaChain(options.cluster),
-          onChange: options.onWalletChange
+          onChange: options.onWalletChange,
+          sendTransaction
         }),
         walletInfo
       );
@@ -163,10 +177,11 @@ function createSolanaWalletRegistry(options) {
     if (cachedWallet) {
       return cachedWallet;
     }
-    const cachedAdapter = makeConnectExclusive(
+    const cachedAdapter = decorateAdapter(
       adaptSolanaStandardWallet(walletInfo, {
         chain: getSolanaChain(options.cluster),
-        onChange: options.onWalletChange
+        onChange: options.onWalletChange,
+        sendTransaction
       }),
       walletInfo
     );
@@ -193,14 +208,50 @@ function createSolanaWalletRegistry(options) {
       options.onError?.(cause);
     }
   }
+  function decorateAdapter(adapter, walletInfo) {
+    return reportConnectionChanges(makeConnectExclusive(adapter, walletInfo), walletInfo);
+  }
   function makeConnectExclusive(adapter, walletInfo) {
     const connect = adapter.connect.bind(adapter);
-    adapter.connect = async () => {
-      await connect();
+    adapter.connect = async (connectOptions) => {
+      await connect(connectOptions);
+      if (connectOptions?.silent && !adapter.connected) {
+        return;
+      }
       await disconnectOtherWallets(walletInfo, adapter);
     };
     return adapter;
   }
+  function reportConnectionChanges(adapter, walletInfo) {
+    const connect = adapter.connect.bind(adapter);
+    const disconnect = adapter.disconnect.bind(adapter);
+    const signIn = adapter.signIn?.bind(adapter);
+    const report = () => options.onConnectionChange?.(walletInfo, adapter.connected);
+    adapter.connect = async (connectOptions) => {
+      await connect(connectOptions);
+      report();
+    };
+    adapter.disconnect = async () => {
+      try {
+        await disconnect();
+      } finally {
+        report();
+      }
+    };
+    if (signIn) {
+      adapter.signIn = async (input) => {
+        const wasConnected = adapter.connected;
+        try {
+          return await signIn(input);
+        } finally {
+          if (adapter.connected !== wasConnected) {
+            report();
+          }
+        }
+      };
+    }
+    return adapter;
+  }
   async function disconnectOtherWallets(currentWallet, currentAdapter) {
     await Promise.all(
       options.getWalletInfos().map(async (walletInfo) => {
@@ -263,9 +314,15 @@ function createSolanaPlugin(options = {}) {
       const latestBlockhash = ref(null);
       const walletRegistry = createSolanaWalletRegistry({
         cluster: context.cluster,
+        client: context.client,
         iosWallet: options.iosWallet,
         getWalletInfos: () => wallets.value,
         onWalletChange: () => triggerRef(wallet),
+        onConnectionChange: (walletInfo, connected) => {
+          if (selectedWallet.value && isSameWallet(walletInfo, selectedWallet.value)) {
+            persistSelectedWallet(selectedWallet.value, connected);
+          }
+        },
         onError: (cause) => {
           error.value = normalizeSolanaError(cause, "WALLET_FAILURE");
           logDevError("Failed to handle Solana iOS wallet callback", cause);
@@ -312,6 +369,7 @@ function createSolanaPlugin(options = {}) {
         walletRegistry.handleIosWalletCallback();
         wallets.value = walletRegistry.getDiscoveredWallets();
         let restoredWallet = null;
+        let restoreConnection = false;
         if (selectedWallet.value) {
           selectedWallet.value = wallets.value.find((nextWallet) => isSameWallet(nextWallet, selectedWallet.value)) ?? null;
           if (!selectedWallet.value) {
@@ -319,6 +377,7 @@ function createSolanaPlugin(options = {}) {
           }
         } else if (!options.wallet) {
           const persistedWallet = readSelectedWallet();
+          restoreConnection = persistedWallet.connected;
           if (persistedWallet.error) {
             error.value = persistedWallet.error;
             logDevError("Failed to read the persisted Solana wallet", persistedWallet.error);
@@ -335,7 +394,7 @@ function createSolanaPlugin(options = {}) {
           registerMobileWallets();
         }
         if (restoredWallet) {
-          autoConnectWallet(restoredWallet);
+          autoConnectWallet(restoredWallet, restoreConnection);
         }
       }
       function registerMobileWallets() {
@@ -361,14 +420,17 @@ function createSolanaPlugin(options = {}) {
       function selectWallet(nextWallet) {
         selectedWallet.value = nextWallet;
         wallet.value = nextWallet ? walletRegistry.getAdaptedWallet(nextWallet) : options.wallet ?? null;
-        const storageError = writeSelectedWallet(nextWallet);
+        persistSelectedWallet(nextWallet, Boolean(nextWallet && wallet.value?.connected));
+      }
+      function persistSelectedWallet(walletInfo, connected) {
+        const storageError = writeSelectedWallet(walletInfo, connected);
         if (storageError) {
           error.value = storageError;
           logDevError("Failed to persist the selected Solana wallet", storageError);
         }
       }
-      function autoConnectWallet(walletInfo) {
-        if (!options.autoConnect) {
+      function autoConnectWallet(walletInfo, wasConnected) {
+        if (!options.autoConnect && !wasConnected) {
           return;
         }
         const activeWallet = wallet.value;
@@ -377,8 +439,10 @@ function createSolanaPlugin(options = {}) {
           return;
         }
         attemptedAutoConnectWallet = storageValue;
-        void activeWallet.connect().catch((cause) => {
-          error.value = normalizeSolanaError(cause, "WALLET_FAILURE");
+        void activeWallet.connect({ silent: true }).catch((cause) => {
+          if (options.autoConnect) {
+            error.value = normalizeSolanaError(cause, "WALLET_FAILURE");
+          }
           logDevError("Failed to auto-connect Solana wallet", cause);
         }).finally(() => {
           triggerRef(wallet);

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

@@ -1,4 +1,4 @@
-import { SolanaError, normalizeSolanaError } from '@vue-solana/core/errors';
+import { PartialSignAndSendError, normalizeSolanaError } from '@vue-solana/core/errors';
 import { withSolanaTimeout } from '@vue-solana/core/timeout';
 import { createNoWalletSelectedError, assertWalletCanSignAndSendTransactions } from '@vue-solana/core/wallet';
 import { shallowRef } from 'vue';
@@ -6,13 +6,6 @@ import { u as useExecution } from './vue.BiKE9Xuv.mjs';
 import { u as useWallet } from './vue.Bc_Kbwr5.mjs';
 
 const SIGN_AND_SEND_TIMEOUT_MS = 12e4;
-class PartialSignAndSendError extends SolanaError {
-  constructor(cause, signatures) {
-    super(cause.code, cause.message, { cause: cause.cause, feature: cause.feature });
-    this.signatures = signatures;
-    this.name = "PartialSignAndSendError";
-  }
-}
 function useSignAndSendTransactions() {
   const { wallet } = useWallet();
   const signatures = shallowRef(null);
@@ -63,4 +56,4 @@ function useSignAndSendTransactions() {
   };
 }
 
-export { PartialSignAndSendError as P, useSignAndSendTransactions as u };
+export { useSignAndSendTransactions as u };

package/dist/useSignAndSendTransactions.d.ts

@@ -1,18 +1,11 @@
+import * as _vue_solana_core from '@vue-solana/core';
 import * as vue from 'vue';
 import { Signature } from '@vue-solana/core/kit';
 import { SolanaTransaction, SendTransactionOptions } from '@vue-solana/core/types';
-import { SolanaError } from '@vue-solana/core/errors';
+export { PartialSignAndSendError } from '@vue-solana/core/errors';
 
 type SignAndSendTransactionsStatus = "idle" | "sending" | "sent" | "error";
-/**
- * Thrown when the singular fallback path fails partway through: the earlier
- * transactions in the batch have already been sent, and their signatures are
- * exposed here so callers can avoid resubmitting them.
- */
-declare class PartialSignAndSendError extends SolanaError {
-    readonly signatures: Signature[];
-    constructor(cause: SolanaError, signatures: Signature[]);
-}
+
 /**
  * Sign and send multiple serialized transactions in a single wallet request,
  * returning one signature per transaction.
@@ -27,9 +20,9 @@ declare function useSignAndSendTransactions(): {
     signatures: vue.ShallowRef<Signature[] | null, Signature[] | null>;
     status: vue.ShallowRef<SignAndSendTransactionsStatus>;
     loading: vue.ComputedRef<boolean>;
-    error: vue.Ref<SolanaError | null, SolanaError | null>;
+    error: vue.Ref<_vue_solana_core.SolanaError | null, _vue_solana_core.SolanaError | null>;
     execute: (transactions: SolanaTransaction[], options?: SendTransactionOptions) => Promise<Signature[]>;
 };
 
-export { PartialSignAndSendError, useSignAndSendTransactions };
+export { useSignAndSendTransactions };
 export type { SignAndSendTransactionsStatus };

package/dist/useSignAndSendTransactions.mjs

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

package/package.json

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