@vue-solana/vue 0.3.1 → 0.3.2

package/README.md

@@ -169,7 +169,7 @@ await execute(transaction, {
 });
 ```
 
-The current wallet must be connected and support either `signAndSendTransaction` or `signTransaction`.
+The current wallet must be connected and support either `signAndSendTransaction` or `signTransaction`. Android Mobile Wallet Adapter wallets prefer `signTransaction` plus app-side RPC submission when available. `loading` is also cleared if a wallet adapter never returns a result; in that stale case, check the wallet or an explorer before retrying because chain status may be unknown.
 
 ## Example App
 

package/dist/index.cjs

@@ -1,16 +1,17 @@
 'use strict';
 
-const useBalance = require('./shared/vue.CNkyBND6.cjs');
+const useBalance = require('./shared/vue.DONKZzIb.cjs');
 const useConnection = require('./shared/vue.CwhEmATP.cjs');
 const useRpc = require('./shared/vue.COyyrsQU.cjs');
-const useSignAndSendTransaction = require('./shared/vue.CTM6XQ47.cjs');
+const useSignAndSendTransaction = require('./shared/vue.BwrQMPty.cjs');
 const useSolana = require('./shared/vue.C4tLiG3R.cjs');
-const useTransaction = require('./shared/vue.BSVxQ9Yi.cjs');
+const useTransaction = require('./shared/vue.CNhelr8H.cjs');
 const useWallet = require('./shared/vue.CwPjPFN6.cjs');
 const useWallets = require('./shared/vue.P9tgeC5S.cjs');
 const walletStandard = require('@vue-solana/core/wallet-standard');
 const rpc = require('@vue-solana/core/rpc');
 const vue = require('vue');
+require('@solana/web3-compat');
 require('@vue-solana/core/transaction');
 
 const RPC_CHECK_TIMEOUT_MS = 1e4;
@@ -109,6 +110,8 @@ function createSolanaPlugin(options = {}) {
           onChange: () => vue.triggerRef(wallet)
         });
         const cachedAdapter = {
+          platform: walletInfo.platform,
+          source: walletInfo.source,
           get publicKey() {
             return adaptedWallet.publicKey;
           },

package/dist/index.d.cts

@@ -3,7 +3,7 @@ export { useConnection } from './useConnection.cjs';
 export { useRpc } from './useRpc.cjs';
 export { useSignAndSendTransaction } from './useSignAndSendTransaction.cjs';
 export { tryUseSolana, useSolana } from './useSolana.cjs';
-export { useTransaction } from './useTransaction.cjs';
+export { UseTransactionOptions, useTransaction } from './useTransaction.cjs';
 export { useWallet } from './useWallet.cjs';
 export { useWallets } from './useWallets.cjs';
 export { S as SolanaConnectionStatus, V as VueSolanaContext, s as solanaInjectionKey } from './shared/vue.DGhodYJh.cjs';

package/dist/index.d.mts

@@ -3,7 +3,7 @@ export { useConnection } from './useConnection.mjs';
 export { useRpc } from './useRpc.mjs';
 export { useSignAndSendTransaction } from './useSignAndSendTransaction.mjs';
 export { tryUseSolana, useSolana } from './useSolana.mjs';
-export { useTransaction } from './useTransaction.mjs';
+export { UseTransactionOptions, useTransaction } from './useTransaction.mjs';
 export { useWallet } from './useWallet.mjs';
 export { useWallets } from './useWallets.mjs';
 export { S as SolanaConnectionStatus, V as VueSolanaContext, s as solanaInjectionKey } from './shared/vue.DGhodYJh.mjs';

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export { useConnection } from './useConnection.js';
 export { useRpc } from './useRpc.js';
 export { useSignAndSendTransaction } from './useSignAndSendTransaction.js';
 export { tryUseSolana, useSolana } from './useSolana.js';
-export { useTransaction } from './useTransaction.js';
+export { UseTransactionOptions, useTransaction } from './useTransaction.js';
 export { useWallet } from './useWallet.js';
 export { useWallets } from './useWallets.js';
 export { S as SolanaConnectionStatus, V as VueSolanaContext, s as solanaInjectionKey } from './shared/vue.DGhodYJh.js';

package/dist/index.mjs

@@ -1,15 +1,16 @@
-export { u as useBalance } from './shared/vue.CgR3nGpz.mjs';
+export { u as useBalance } from './shared/vue.DJqRk8z_.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.PoQ8Vpmy.mjs';
+export { u as useSignAndSendTransaction } from './shared/vue.BfF-kOvb.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.BMUEDN2t.mjs';
+export { u as useTransaction } from './shared/vue.CuhLIeDx.mjs';
 export { u as useWallet } from './shared/vue.DYf_CRDv.mjs';
 export { u as useWallets } from './shared/vue.h-uS8MXN.mjs';
 import { subscribeSolanaWallets, getRegisteredSolanaWallets, adaptSolanaStandardWallet, getSolanaChain } from '@vue-solana/core/wallet-standard';
 import { createSolanaContext } from '@vue-solana/core/rpc';
 import { shallowRef, ref, triggerRef } from 'vue';
+import '@solana/web3-compat';
 import '@vue-solana/core/transaction';
 
 const RPC_CHECK_TIMEOUT_MS = 1e4;
@@ -108,6 +109,8 @@ function createSolanaPlugin(options = {}) {
           onChange: () => triggerRef(wallet)
         });
         const cachedAdapter = {
+          platform: walletInfo.platform,
+          source: walletInfo.source,
           get publicKey() {
             return adaptedWallet.publicKey;
           },

package/dist/shared/vue.BfF-kOvb.mjs

@@ -0,0 +1,24 @@
+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';
+
+const SIGN_AND_SEND_TIMEOUT_MS = 12e4;
+function useSignAndSendTransaction() {
+  const connection = useConnection();
+  const { wallet } = useWallet();
+  return useTransaction(
+    (transaction, options) => {
+      if (!wallet.value) {
+        return Promise.reject(new Error("No Solana wallet is configured"));
+      }
+      return signAndSendTransaction(connection, wallet.value, transaction, options);
+    },
+    {
+      timeoutMs: SIGN_AND_SEND_TIMEOUT_MS,
+      timeoutMessage: "Wallet transaction did not return a result. Check your wallet or explorer for the final status."
+    }
+  );
+}
+
+export { useSignAndSendTransaction as u };

package/dist/shared/vue.BwrQMPty.cjs

@@ -0,0 +1,26 @@
+'use strict';
+
+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 SIGN_AND_SEND_TIMEOUT_MS = 12e4;
+function useSignAndSendTransaction() {
+  const connection = useConnection.useConnection();
+  const { wallet } = useWallet.useWallet();
+  return useTransaction.useTransaction(
+    (transaction$1, options) => {
+      if (!wallet.value) {
+        return Promise.reject(new Error("No Solana wallet is configured"));
+      }
+      return transaction.signAndSendTransaction(connection, wallet.value, transaction$1, options);
+    },
+    {
+      timeoutMs: SIGN_AND_SEND_TIMEOUT_MS,
+      timeoutMessage: "Wallet transaction did not return a result. Check your wallet or explorer for the final status."
+    }
+  );
+}
+
+exports.useSignAndSendTransaction = useSignAndSendTransaction;

package/dist/shared/vue.CNhelr8H.cjs

@@ -0,0 +1,59 @@
+'use strict';
+
+const vue = require('vue');
+
+function useTransaction(handler, options = {}) {
+  const signature = vue.ref(null);
+  const loading = vue.ref(false);
+  const error = vue.ref(null);
+  let executionId = 0;
+  async function execute(...args) {
+    const currentExecutionId = ++executionId;
+    loading.value = true;
+    error.value = null;
+    try {
+      const nextSignature = await withTimeout(
+        handler(...args),
+        options.timeoutMs,
+        options.timeoutMessage ?? "Transaction did not return a result before timing out."
+      );
+      if (currentExecutionId === executionId) {
+        signature.value = nextSignature;
+      }
+      return nextSignature;
+    } catch (cause) {
+      if (currentExecutionId === executionId) {
+        error.value = cause;
+      }
+      throw cause;
+    } finally {
+      if (currentExecutionId === executionId) {
+        loading.value = false;
+      }
+    }
+  }
+  return {
+    signature,
+    loading,
+    error,
+    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;

package/dist/shared/vue.CuhLIeDx.mjs

@@ -0,0 +1,57 @@
+import { ref } from 'vue';
+
+function useTransaction(handler, options = {}) {
+  const signature = ref(null);
+  const loading = ref(false);
+  const error = ref(null);
+  let executionId = 0;
+  async function execute(...args) {
+    const currentExecutionId = ++executionId;
+    loading.value = true;
+    error.value = null;
+    try {
+      const nextSignature = await withTimeout(
+        handler(...args),
+        options.timeoutMs,
+        options.timeoutMessage ?? "Transaction did not return a result before timing out."
+      );
+      if (currentExecutionId === executionId) {
+        signature.value = nextSignature;
+      }
+      return nextSignature;
+    } catch (cause) {
+      if (currentExecutionId === executionId) {
+        error.value = cause;
+      }
+      throw cause;
+    } finally {
+      if (currentExecutionId === executionId) {
+        loading.value = false;
+      }
+    }
+  }
+  return {
+    signature,
+    loading,
+    error,
+    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 };

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

@@ -1,3 +1,4 @@
+import { PublicKey } from '@solana/web3-compat';
 import { ref, onMounted, watch, toValue } from 'vue';
 import { u as useConnection } from './vue.DlEAL2G8.mjs';
 import { t as tryUseSolana } from './vue.1M_c5FWA.mjs';
@@ -17,7 +18,7 @@ function useBalance(address, commitment) {
     loading.value = true;
     error.value = null;
     try {
-      const publicKey = typeof value === "string" ? new (await import('@solana/web3-compat')).PublicKey(value) : value;
+      const publicKey = typeof value === "string" ? new PublicKey(value) : value;
       balance.value = await connection.getBalance(publicKey, commitment);
       return balance.value;
     } catch (cause) {

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

@@ -1,5 +1,6 @@
 'use strict';
 
+const web3Compat = require('@solana/web3-compat');
 const vue = require('vue');
 const useConnection = require('./vue.CwhEmATP.cjs');
 const useSolana = require('./vue.C4tLiG3R.cjs');
@@ -19,7 +20,7 @@ function useBalance(address, commitment) {
     loading.value = true;
     error.value = null;
     try {
-      const publicKey = typeof value === "string" ? new (await import('@solana/web3-compat')).PublicKey(value) : value;
+      const publicKey = typeof value === "string" ? new web3Compat.PublicKey(value) : value;
       balance.value = await connection.getBalance(publicKey, commitment);
       return balance.value;
     } catch (cause) {

package/dist/useBalance.cjs

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

package/dist/useBalance.mjs

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

package/dist/useSignAndSendTransaction.cjs

@@ -1,13 +1,13 @@
 'use strict';
 
-const useSignAndSendTransaction = require('./shared/vue.CTM6XQ47.cjs');
+const useSignAndSendTransaction = require('./shared/vue.BwrQMPty.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.BSVxQ9Yi.cjs');
+require('./shared/vue.CNhelr8H.cjs');
 
 
 

package/dist/useSignAndSendTransaction.d.cts

@@ -5,7 +5,7 @@ declare function useSignAndSendTransaction(): {
     signature: any;
     loading: vue.Ref<boolean, boolean>;
     error: vue.Ref<unknown, unknown>;
-    execute: (transaction: any, options?: SendTransactionOptions | undefined) => Promise<any>;
+    execute: (transaction: any, options?: SendTransactionOptions | undefined) => Promise<TransactionSignature>;
 };
 
 export { useSignAndSendTransaction };

package/dist/useSignAndSendTransaction.d.mts

@@ -5,7 +5,7 @@ declare function useSignAndSendTransaction(): {
     signature: any;
     loading: vue.Ref<boolean, boolean>;
     error: vue.Ref<unknown, unknown>;
-    execute: (transaction: any, options?: SendTransactionOptions | undefined) => Promise<any>;
+    execute: (transaction: any, options?: SendTransactionOptions | undefined) => Promise<TransactionSignature>;
 };
 
 export { useSignAndSendTransaction };

package/dist/useSignAndSendTransaction.d.ts

@@ -5,7 +5,7 @@ declare function useSignAndSendTransaction(): {
     signature: any;
     loading: vue.Ref<boolean, boolean>;
     error: vue.Ref<unknown, unknown>;
-    execute: (transaction: any, options?: SendTransactionOptions | undefined) => Promise<any>;
+    execute: (transaction: any, options?: SendTransactionOptions | undefined) => Promise<TransactionSignature>;
 };
 
 export { useSignAndSendTransaction };

package/dist/useSignAndSendTransaction.mjs

@@ -1,8 +1,8 @@
-export { u as useSignAndSendTransaction } from './shared/vue.PoQ8Vpmy.mjs';
+export { u as useSignAndSendTransaction } from './shared/vue.BfF-kOvb.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.BMUEDN2t.mjs';
+import './shared/vue.CuhLIeDx.mjs';

package/dist/useTransaction.cjs

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

package/dist/useTransaction.d.cts

@@ -1,11 +1,16 @@
 import * as vue from 'vue';
 import { TransactionSignature } from '@solana/web3-compat';
 
-declare function useTransaction<TArgs extends unknown[]>(handler: (...args: TArgs) => Promise<TransactionSignature>): {
+interface UseTransactionOptions {
+    timeoutMs?: number;
+    timeoutMessage?: string;
+}
+declare function useTransaction<TArgs extends unknown[]>(handler: (...args: TArgs) => Promise<TransactionSignature>, options?: UseTransactionOptions): {
     signature: any;
     loading: vue.Ref<boolean, boolean>;
     error: vue.Ref<unknown, unknown>;
-    execute: (...args: TArgs) => Promise<any>;
+    execute: (...args: TArgs) => Promise<TransactionSignature>;
 };
 
 export { useTransaction };
+export type { UseTransactionOptions };

package/dist/useTransaction.d.mts

@@ -1,11 +1,16 @@
 import * as vue from 'vue';
 import { TransactionSignature } from '@solana/web3-compat';
 
-declare function useTransaction<TArgs extends unknown[]>(handler: (...args: TArgs) => Promise<TransactionSignature>): {
+interface UseTransactionOptions {
+    timeoutMs?: number;
+    timeoutMessage?: string;
+}
+declare function useTransaction<TArgs extends unknown[]>(handler: (...args: TArgs) => Promise<TransactionSignature>, options?: UseTransactionOptions): {
     signature: any;
     loading: vue.Ref<boolean, boolean>;
     error: vue.Ref<unknown, unknown>;
-    execute: (...args: TArgs) => Promise<any>;
+    execute: (...args: TArgs) => Promise<TransactionSignature>;
 };
 
 export { useTransaction };
+export type { UseTransactionOptions };

package/dist/useTransaction.d.ts

@@ -1,11 +1,16 @@
 import * as vue from 'vue';
 import { TransactionSignature } from '@solana/web3-compat';
 
-declare function useTransaction<TArgs extends unknown[]>(handler: (...args: TArgs) => Promise<TransactionSignature>): {
+interface UseTransactionOptions {
+    timeoutMs?: number;
+    timeoutMessage?: string;
+}
+declare function useTransaction<TArgs extends unknown[]>(handler: (...args: TArgs) => Promise<TransactionSignature>, options?: UseTransactionOptions): {
     signature: any;
     loading: vue.Ref<boolean, boolean>;
     error: vue.Ref<unknown, unknown>;
-    execute: (...args: TArgs) => Promise<any>;
+    execute: (...args: TArgs) => Promise<TransactionSignature>;
 };
 
 export { useTransaction };
+export type { UseTransactionOptions };

package/dist/useTransaction.mjs

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

package/package.json

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

package/dist/shared/vue.BMUEDN2t.mjs

@@ -1,28 +0,0 @@
-import { ref } from 'vue';
-
-function useTransaction(handler) {
-  const signature = ref(null);
-  const loading = ref(false);
-  const error = ref(null);
-  async function execute(...args) {
-    loading.value = true;
-    error.value = null;
-    try {
-      signature.value = await handler(...args);
-      return signature.value;
-    } catch (cause) {
-      error.value = cause;
-      throw cause;
-    } finally {
-      loading.value = false;
-    }
-  }
-  return {
-    signature,
-    loading,
-    error,
-    execute
-  };
-}
-
-export { useTransaction as u };

package/dist/shared/vue.BSVxQ9Yi.cjs

@@ -1,30 +0,0 @@
-'use strict';
-
-const vue = require('vue');
-
-function useTransaction(handler) {
-  const signature = vue.ref(null);
-  const loading = vue.ref(false);
-  const error = vue.ref(null);
-  async function execute(...args) {
-    loading.value = true;
-    error.value = null;
-    try {
-      signature.value = await handler(...args);
-      return signature.value;
-    } catch (cause) {
-      error.value = cause;
-      throw cause;
-    } finally {
-      loading.value = false;
-    }
-  }
-  return {
-    signature,
-    loading,
-    error,
-    execute
-  };
-}
-
-exports.useTransaction = useTransaction;

package/dist/shared/vue.CTM6XQ47.cjs

@@ -1,19 +0,0 @@
-'use strict';
-
-const transaction = require('@vue-solana/core/transaction');
-const useConnection = require('./vue.CwhEmATP.cjs');
-const useWallet = require('./vue.CwPjPFN6.cjs');
-const useTransaction = require('./vue.BSVxQ9Yi.cjs');
-
-function useSignAndSendTransaction() {
-  const connection = useConnection.useConnection();
-  const { wallet } = useWallet.useWallet();
-  return useTransaction.useTransaction((transaction$1, options) => {
-    if (!wallet.value) {
-      return Promise.reject(new Error("No Solana wallet is configured"));
-    }
-    return transaction.signAndSendTransaction(connection, wallet.value, transaction$1, options);
-  });
-}
-
-exports.useSignAndSendTransaction = useSignAndSendTransaction;

package/dist/shared/vue.PoQ8Vpmy.mjs

@@ -1,17 +0,0 @@
-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.BMUEDN2t.mjs';
-
-function useSignAndSendTransaction() {
-  const connection = useConnection();
-  const { wallet } = useWallet();
-  return useTransaction((transaction, options) => {
-    if (!wallet.value) {
-      return Promise.reject(new Error("No Solana wallet is configured"));
-    }
-    return signAndSendTransaction(connection, wallet.value, transaction, options);
-  });
-}
-
-export { useSignAndSendTransaction as u };