@vue-solana/core 0.6.0 → 0.7.0

package/dist/address.cjs

@@ -1,13 +1,21 @@
 'use strict';
 
 const web3Compat = require('@solana/web3-compat');
+const errors = require('./errors.cjs');
 
 function parsePublicKey(value) {
   const publicKeyInput = toPublicKeyInput(value);
   if (!publicKeyInput) {
     return null;
   }
-  return typeof publicKeyInput === "string" ? new web3Compat.PublicKey(publicKeyInput) : publicKeyInput;
+  if (typeof publicKeyInput !== "string") {
+    return publicKeyInput;
+  }
+  try {
+    return new web3Compat.PublicKey(publicKeyInput);
+  } catch (cause) {
+    throw errors.createSolanaError("INVALID_ADDRESS", "Invalid Solana address", { cause });
+  }
 }
 function toPublicKeyInput(value) {
   if (!value) {

package/dist/address.mjs

@@ -1,11 +1,19 @@
 import { PublicKey } from '@solana/web3-compat';
+import { createSolanaError } from './errors.mjs';
 
 function parsePublicKey(value) {
   const publicKeyInput = toPublicKeyInput(value);
   if (!publicKeyInput) {
     return null;
   }
-  return typeof publicKeyInput === "string" ? new PublicKey(publicKeyInput) : publicKeyInput;
+  if (typeof publicKeyInput !== "string") {
+    return publicKeyInput;
+  }
+  try {
+    return new PublicKey(publicKeyInput);
+  } catch (cause) {
+    throw createSolanaError("INVALID_ADDRESS", "Invalid Solana address", { cause });
+  }
 }
 function toPublicKeyInput(value) {
   if (!value) {

package/dist/errors.cjs

@@ -0,0 +1,50 @@
+'use strict';
+
+class SolanaError extends Error {
+  constructor(code, message, options = {}) {
+    super(message);
+    this.code = code;
+    this.name = "SolanaError";
+    this.cause = options.cause;
+    this.feature = options.feature;
+  }
+  cause;
+  feature;
+}
+function createSolanaError(code, message, options) {
+  return new SolanaError(code, message, options);
+}
+function isSolanaError(error) {
+  return error instanceof SolanaError;
+}
+function normalizeSolanaError(cause, fallbackCode, fallbackMessage, options = {}) {
+  if (isSolanaError(cause)) {
+    return cause;
+  }
+  const code = isUserRejectedError(cause) ? "USER_REJECTED" : fallbackCode;
+  const message = fallbackMessage ?? getErrorMessage(cause);
+  return createSolanaError(code, message, { ...options, cause });
+}
+function getErrorMessage(cause) {
+  if (cause instanceof Error) {
+    return cause.message;
+  }
+  return typeof cause === "string" ? cause : "An unknown Solana error occurred";
+}
+function isUserRejectedError(cause) {
+  if (hasErrorCode(cause) && (cause.code === 4001 || cause.code === "4001")) {
+    return true;
+  }
+  const message = getErrorMessage(cause).toLowerCase();
+  return message.includes("user rejected") || message.includes("user denied");
+}
+function hasErrorCode(cause) {
+  return Boolean(
+    cause && typeof cause === "object" && "code" in cause && (typeof cause.code === "number" || typeof cause.code === "string")
+  );
+}
+
+exports.SolanaError = SolanaError;
+exports.createSolanaError = createSolanaError;
+exports.isSolanaError = isSolanaError;
+exports.normalizeSolanaError = normalizeSolanaError;

package/dist/errors.d.cts

@@ -0,0 +1,17 @@
+type SolanaErrorCode = "NO_WALLET_SELECTED" | "WALLET_NOT_CONNECTED" | "WALLET_FEATURE_UNSUPPORTED" | "USER_REJECTED" | "INVALID_ADDRESS" | "TRANSACTION_TIMEOUT" | "RPC_FAILURE" | "STORAGE_FAILURE";
+interface SolanaErrorOptions {
+    cause?: unknown;
+    feature?: string;
+}
+declare class SolanaError extends Error {
+    readonly code: SolanaErrorCode;
+    readonly cause?: unknown;
+    readonly feature?: string;
+    constructor(code: SolanaErrorCode, message: string, options?: SolanaErrorOptions);
+}
+declare function createSolanaError(code: SolanaErrorCode, message: string, options?: SolanaErrorOptions): SolanaError;
+declare function isSolanaError(error: unknown): error is SolanaError;
+declare function normalizeSolanaError(cause: unknown, fallbackCode: SolanaErrorCode, fallbackMessage?: string, options?: Omit<SolanaErrorOptions, "cause">): SolanaError;
+
+export { SolanaError, createSolanaError, isSolanaError, normalizeSolanaError };
+export type { SolanaErrorCode, SolanaErrorOptions };

package/dist/errors.d.mts

@@ -0,0 +1,17 @@
+type SolanaErrorCode = "NO_WALLET_SELECTED" | "WALLET_NOT_CONNECTED" | "WALLET_FEATURE_UNSUPPORTED" | "USER_REJECTED" | "INVALID_ADDRESS" | "TRANSACTION_TIMEOUT" | "RPC_FAILURE" | "STORAGE_FAILURE";
+interface SolanaErrorOptions {
+    cause?: unknown;
+    feature?: string;
+}
+declare class SolanaError extends Error {
+    readonly code: SolanaErrorCode;
+    readonly cause?: unknown;
+    readonly feature?: string;
+    constructor(code: SolanaErrorCode, message: string, options?: SolanaErrorOptions);
+}
+declare function createSolanaError(code: SolanaErrorCode, message: string, options?: SolanaErrorOptions): SolanaError;
+declare function isSolanaError(error: unknown): error is SolanaError;
+declare function normalizeSolanaError(cause: unknown, fallbackCode: SolanaErrorCode, fallbackMessage?: string, options?: Omit<SolanaErrorOptions, "cause">): SolanaError;
+
+export { SolanaError, createSolanaError, isSolanaError, normalizeSolanaError };
+export type { SolanaErrorCode, SolanaErrorOptions };

package/dist/errors.d.ts

@@ -0,0 +1,17 @@
+type SolanaErrorCode = "NO_WALLET_SELECTED" | "WALLET_NOT_CONNECTED" | "WALLET_FEATURE_UNSUPPORTED" | "USER_REJECTED" | "INVALID_ADDRESS" | "TRANSACTION_TIMEOUT" | "RPC_FAILURE" | "STORAGE_FAILURE";
+interface SolanaErrorOptions {
+    cause?: unknown;
+    feature?: string;
+}
+declare class SolanaError extends Error {
+    readonly code: SolanaErrorCode;
+    readonly cause?: unknown;
+    readonly feature?: string;
+    constructor(code: SolanaErrorCode, message: string, options?: SolanaErrorOptions);
+}
+declare function createSolanaError(code: SolanaErrorCode, message: string, options?: SolanaErrorOptions): SolanaError;
+declare function isSolanaError(error: unknown): error is SolanaError;
+declare function normalizeSolanaError(cause: unknown, fallbackCode: SolanaErrorCode, fallbackMessage?: string, options?: Omit<SolanaErrorOptions, "cause">): SolanaError;
+
+export { SolanaError, createSolanaError, isSolanaError, normalizeSolanaError };
+export type { SolanaErrorCode, SolanaErrorOptions };

package/dist/errors.mjs

@@ -0,0 +1,45 @@
+class SolanaError extends Error {
+  constructor(code, message, options = {}) {
+    super(message);
+    this.code = code;
+    this.name = "SolanaError";
+    this.cause = options.cause;
+    this.feature = options.feature;
+  }
+  cause;
+  feature;
+}
+function createSolanaError(code, message, options) {
+  return new SolanaError(code, message, options);
+}
+function isSolanaError(error) {
+  return error instanceof SolanaError;
+}
+function normalizeSolanaError(cause, fallbackCode, fallbackMessage, options = {}) {
+  if (isSolanaError(cause)) {
+    return cause;
+  }
+  const code = isUserRejectedError(cause) ? "USER_REJECTED" : fallbackCode;
+  const message = fallbackMessage ?? getErrorMessage(cause);
+  return createSolanaError(code, message, { ...options, cause });
+}
+function getErrorMessage(cause) {
+  if (cause instanceof Error) {
+    return cause.message;
+  }
+  return typeof cause === "string" ? cause : "An unknown Solana error occurred";
+}
+function isUserRejectedError(cause) {
+  if (hasErrorCode(cause) && (cause.code === 4001 || cause.code === "4001")) {
+    return true;
+  }
+  const message = getErrorMessage(cause).toLowerCase();
+  return message.includes("user rejected") || message.includes("user denied");
+}
+function hasErrorCode(cause) {
+  return Boolean(
+    cause && typeof cause === "object" && "code" in cause && (typeof cause.code === "number" || typeof cause.code === "string")
+  );
+}
+
+export { SolanaError, createSolanaError, isSolanaError, normalizeSolanaError };

package/dist/index.cjs

@@ -2,10 +2,12 @@
 
 const clusters = require('./clusters.cjs');
 const address = require('./address.cjs');
+const errors = require('./errors.cjs');
 const adapter = require('./shared/core.BsekSwcZ.cjs');
 const mobileWallet = require('./mobile-wallet.cjs');
 const rpc = require('./rpc.cjs');
 const transaction = require('./transaction.cjs');
+const timeout = require('./timeout.cjs');
 const wallet = require('./wallet.cjs');
 const discovery = require('./shared/core.DX2frf65.cjs');
 require('@solana/web3-compat');
@@ -23,6 +25,10 @@ exports.getClusterEndpoint = clusters.getClusterEndpoint;
 exports.getClusterWebSocketEndpoint = clusters.getClusterWebSocketEndpoint;
 exports.getWebSocketEndpoint = clusters.getWebSocketEndpoint;
 exports.parsePublicKey = address.parsePublicKey;
+exports.SolanaError = errors.SolanaError;
+exports.createSolanaError = errors.createSolanaError;
+exports.isSolanaError = errors.isSolanaError;
+exports.normalizeSolanaError = errors.normalizeSolanaError;
 exports.adaptSolanaIosWallet = adapter.adaptSolanaIosWallet;
 exports.getDefaultIosWalletAppIdentity = adapter.getDefaultIosWalletAppIdentity;
 exports.getDefaultIosWalletRedirectUrl = adapter.getDefaultIosWalletRedirectUrl;
@@ -38,10 +44,13 @@ exports.createSolanaConnection = rpc.createSolanaConnection;
 exports.createSolanaContext = rpc.createSolanaContext;
 exports.confirmTransactionSignature = transaction.confirmTransactionSignature;
 exports.signAndSendTransaction = transaction.signAndSendTransaction;
+exports.withSolanaTimeout = timeout.withSolanaTimeout;
+exports.withTimeout = timeout.withTimeout;
 exports.SolanaWalletError = wallet.SolanaWalletError;
 exports.assertWalletCanSign = wallet.assertWalletCanSign;
 exports.assertWalletCanSignMessage = wallet.assertWalletCanSignMessage;
 exports.assertWalletConnected = wallet.assertWalletConnected;
+exports.createNoWalletSelectedError = wallet.createNoWalletSelectedError;
 exports.isWalletConnected = wallet.isWalletConnected;
 exports.SOLANA_CHAINS = discovery.SOLANA_CHAINS;
 exports.SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME = discovery.SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME;

package/dist/index.d.cts

@@ -1,11 +1,13 @@
 export { DEFAULT_CLUSTER, getClusterEndpoint, getClusterWebSocketEndpoint, getWebSocketEndpoint } from './clusters.cjs';
 export { MaybePublicKeyInput, PublicKeyInput, parsePublicKey } from './address.cjs';
+export { SolanaError, SolanaErrorCode, SolanaErrorOptions, createSolanaError, isSolanaError, normalizeSolanaError } from './errors.cjs';
 export { AdaptSolanaIosWalletOptions, GetSolanaIosWalletsOptions, IosWalletCallbackResult, IosWalletInfo, IosWalletMethod, SolanaIosWalletAppIdentity, adaptSolanaIosWallet, getDefaultIosWalletAppIdentity, getDefaultIosWalletRedirectUrl, getSolanaIosWallets, handleSolanaIosWalletCallback, isIosBrowser, isSolanaIosBrowserWalletSupported, isSolanaIosWalletInfo } from './ios-wallet.cjs';
 export { RegisterSolanaMobileWalletOptions, SolanaMobileWalletAppIdentity, getDefaultMobileWalletAppIdentity, isSolanaMobileWalletSupported, registerSolanaMobileWallet } from './mobile-wallet.cjs';
 export { createSolanaConnection, createSolanaContext } from './rpc.cjs';
 export { confirmTransactionSignature, signAndSendTransaction } from './transaction.cjs';
+export { withSolanaTimeout, withTimeout } from './timeout.cjs';
 export { ConfirmTransactionOptions, SendTransactionOptions, SolanaChain, SolanaCluster, SolanaConfig, SolanaContext, SolanaSignMessageResult, SolanaTransaction, SolanaWallet, SolanaWalletInfo, TransactionConfirmation } from './types.cjs';
-export { SolanaWalletError, SolanaWalletErrorCode, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, isWalletConnected } from './wallet.cjs';
+export { SolanaWalletError, SolanaWalletErrorCode, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, createNoWalletSelectedError, isWalletConnected } from './wallet.cjs';
 export { AdaptSolanaWalletOptions, SOLANA_CHAINS, SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets } from './wallet-standard.cjs';
 import '@solana/web3-compat';
 import '@wallet-standard/base';

package/dist/index.d.mts

@@ -1,11 +1,13 @@
 export { DEFAULT_CLUSTER, getClusterEndpoint, getClusterWebSocketEndpoint, getWebSocketEndpoint } from './clusters.mjs';
 export { MaybePublicKeyInput, PublicKeyInput, parsePublicKey } from './address.mjs';
+export { SolanaError, SolanaErrorCode, SolanaErrorOptions, createSolanaError, isSolanaError, normalizeSolanaError } from './errors.mjs';
 export { AdaptSolanaIosWalletOptions, GetSolanaIosWalletsOptions, IosWalletCallbackResult, IosWalletInfo, IosWalletMethod, SolanaIosWalletAppIdentity, adaptSolanaIosWallet, getDefaultIosWalletAppIdentity, getDefaultIosWalletRedirectUrl, getSolanaIosWallets, handleSolanaIosWalletCallback, isIosBrowser, isSolanaIosBrowserWalletSupported, isSolanaIosWalletInfo } from './ios-wallet.mjs';
 export { RegisterSolanaMobileWalletOptions, SolanaMobileWalletAppIdentity, getDefaultMobileWalletAppIdentity, isSolanaMobileWalletSupported, registerSolanaMobileWallet } from './mobile-wallet.mjs';
 export { createSolanaConnection, createSolanaContext } from './rpc.mjs';
 export { confirmTransactionSignature, signAndSendTransaction } from './transaction.mjs';
+export { withSolanaTimeout, withTimeout } from './timeout.mjs';
 export { ConfirmTransactionOptions, SendTransactionOptions, SolanaChain, SolanaCluster, SolanaConfig, SolanaContext, SolanaSignMessageResult, SolanaTransaction, SolanaWallet, SolanaWalletInfo, TransactionConfirmation } from './types.mjs';
-export { SolanaWalletError, SolanaWalletErrorCode, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, isWalletConnected } from './wallet.mjs';
+export { SolanaWalletError, SolanaWalletErrorCode, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, createNoWalletSelectedError, isWalletConnected } from './wallet.mjs';
 export { AdaptSolanaWalletOptions, SOLANA_CHAINS, SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets } from './wallet-standard.mjs';
 import '@solana/web3-compat';
 import '@wallet-standard/base';

package/dist/index.d.ts

@@ -1,11 +1,13 @@
 export { DEFAULT_CLUSTER, getClusterEndpoint, getClusterWebSocketEndpoint, getWebSocketEndpoint } from './clusters.js';
 export { MaybePublicKeyInput, PublicKeyInput, parsePublicKey } from './address.js';
+export { SolanaError, SolanaErrorCode, SolanaErrorOptions, createSolanaError, isSolanaError, normalizeSolanaError } from './errors.js';
 export { AdaptSolanaIosWalletOptions, GetSolanaIosWalletsOptions, IosWalletCallbackResult, IosWalletInfo, IosWalletMethod, SolanaIosWalletAppIdentity, adaptSolanaIosWallet, getDefaultIosWalletAppIdentity, getDefaultIosWalletRedirectUrl, getSolanaIosWallets, handleSolanaIosWalletCallback, isIosBrowser, isSolanaIosBrowserWalletSupported, isSolanaIosWalletInfo } from './ios-wallet.js';
 export { RegisterSolanaMobileWalletOptions, SolanaMobileWalletAppIdentity, getDefaultMobileWalletAppIdentity, isSolanaMobileWalletSupported, registerSolanaMobileWallet } from './mobile-wallet.js';
 export { createSolanaConnection, createSolanaContext } from './rpc.js';
 export { confirmTransactionSignature, signAndSendTransaction } from './transaction.js';
+export { withSolanaTimeout, withTimeout } from './timeout.js';
 export { ConfirmTransactionOptions, SendTransactionOptions, SolanaChain, SolanaCluster, SolanaConfig, SolanaContext, SolanaSignMessageResult, SolanaTransaction, SolanaWallet, SolanaWalletInfo, TransactionConfirmation } from './types.js';
-export { SolanaWalletError, SolanaWalletErrorCode, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, isWalletConnected } from './wallet.js';
+export { SolanaWalletError, SolanaWalletErrorCode, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, createNoWalletSelectedError, isWalletConnected } from './wallet.js';
 export { AdaptSolanaWalletOptions, SOLANA_CHAINS, SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets } from './wallet-standard.js';
 import '@solana/web3-compat';
 import '@wallet-standard/base';

package/dist/index.mjs

@@ -1,10 +1,12 @@
 export { DEFAULT_CLUSTER, getClusterEndpoint, getClusterWebSocketEndpoint, getWebSocketEndpoint } from './clusters.mjs';
 export { parsePublicKey } from './address.mjs';
+export { SolanaError, createSolanaError, isSolanaError, normalizeSolanaError } from './errors.mjs';
 export { a as adaptSolanaIosWallet, g as getDefaultIosWalletAppIdentity, b as getDefaultIosWalletRedirectUrl, c as getSolanaIosWallets, h as handleSolanaIosWalletCallback, i as isIosBrowser, d as isSolanaIosBrowserWalletSupported, e as isSolanaIosWalletInfo } from './shared/core.Ch_Z7_17.mjs';
 export { getDefaultMobileWalletAppIdentity, isSolanaMobileWalletSupported, registerSolanaMobileWallet } from './mobile-wallet.mjs';
 export { createSolanaConnection, createSolanaContext } from './rpc.mjs';
 export { confirmTransactionSignature, signAndSendTransaction } from './transaction.mjs';
-export { SolanaWalletError, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, isWalletConnected } from './wallet.mjs';
+export { withSolanaTimeout, withTimeout } from './timeout.mjs';
+export { SolanaWalletError, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, createNoWalletSelectedError, isWalletConnected } from './wallet.mjs';
 export { S as SOLANA_CHAINS, a as SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME, b as adaptSolanaStandardWallet, g as getRegisteredSolanaWallets, c as getSolanaChain, i as isSolanaStandardWallet, s as subscribeSolanaWallets } from './shared/core.DSMNiaHD.mjs';
 import '@solana/web3-compat';
 import 'bs58';

package/dist/timeout.cjs

@@ -0,0 +1,32 @@
+'use strict';
+
+const errors = require('./errors.cjs');
+
+function withTimeout(promise, timeoutMs, createError) {
+  if (timeoutMs === void 0) {
+    return promise;
+  }
+  let timeoutId;
+  return Promise.race([
+    promise,
+    new Promise((_, reject) => {
+      timeoutId = setTimeout(() => {
+        try {
+          reject(createError());
+        } catch (error) {
+          reject(error);
+        }
+      }, timeoutMs);
+    })
+  ]).finally(() => {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+  });
+}
+function withSolanaTimeout(promise, timeoutMs, message) {
+  return withTimeout(promise, timeoutMs, () => errors.createSolanaError("TRANSACTION_TIMEOUT", message));
+}
+
+exports.withSolanaTimeout = withSolanaTimeout;
+exports.withTimeout = withTimeout;

package/dist/timeout.d.cts

@@ -0,0 +1,4 @@
+declare function withTimeout<T>(promise: Promise<T>, timeoutMs: number | undefined, createError: () => unknown): Promise<T>;
+declare function withSolanaTimeout<T>(promise: Promise<T>, timeoutMs: number | undefined, message: string): Promise<T>;
+
+export { withSolanaTimeout, withTimeout };

package/dist/timeout.d.mts

@@ -0,0 +1,4 @@
+declare function withTimeout<T>(promise: Promise<T>, timeoutMs: number | undefined, createError: () => unknown): Promise<T>;
+declare function withSolanaTimeout<T>(promise: Promise<T>, timeoutMs: number | undefined, message: string): Promise<T>;
+
+export { withSolanaTimeout, withTimeout };

package/dist/timeout.d.ts

@@ -0,0 +1,4 @@
+declare function withTimeout<T>(promise: Promise<T>, timeoutMs: number | undefined, createError: () => unknown): Promise<T>;
+declare function withSolanaTimeout<T>(promise: Promise<T>, timeoutMs: number | undefined, message: string): Promise<T>;
+
+export { withSolanaTimeout, withTimeout };

package/dist/timeout.mjs

@@ -0,0 +1,29 @@
+import { createSolanaError } from './errors.mjs';
+
+function withTimeout(promise, timeoutMs, createError) {
+  if (timeoutMs === void 0) {
+    return promise;
+  }
+  let timeoutId;
+  return Promise.race([
+    promise,
+    new Promise((_, reject) => {
+      timeoutId = setTimeout(() => {
+        try {
+          reject(createError());
+        } catch (error) {
+          reject(error);
+        }
+      }, timeoutMs);
+    })
+  ]).finally(() => {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+  });
+}
+function withSolanaTimeout(promise, timeoutMs, message) {
+  return withTimeout(promise, timeoutMs, () => createSolanaError("TRANSACTION_TIMEOUT", message));
+}
+
+export { withSolanaTimeout, withTimeout };

package/dist/transaction.cjs

@@ -1,32 +1,47 @@
 'use strict';
 
+const errors = require('./errors.cjs');
+const timeout = require('./timeout.cjs');
 const wallet = require('./wallet.cjs');
 
 const DEFAULT_CONFIRMATION_COMMITMENT = "confirmed";
 const DEFAULT_CONFIRMATION_TIMEOUT_MS = 6e4;
 async function signAndSendTransaction(connection, wallet$1, transaction, options) {
-  wallet.assertWalletConnected(wallet$1);
-  if (isMobileWalletAdapterWallet(wallet$1) && wallet$1.signTransaction) {
+  try {
+    wallet.assertWalletConnected(wallet$1);
+    if (isMobileWalletAdapterWallet(wallet$1) && wallet$1.signTransaction) {
+      wallet.assertWalletCanSign(wallet$1);
+      return await signAndSendRawTransaction(connection, wallet$1, transaction, options);
+    }
+    if (wallet$1.signAndSendTransaction) {
+      const result = await wallet$1.signAndSendTransaction(transaction, options);
+      return result.signature;
+    }
     wallet.assertWalletCanSign(wallet$1);
-    return signAndSendRawTransaction(connection, wallet$1, transaction, options);
+    return await signAndSendRawTransaction(connection, wallet$1, transaction, options);
+  } catch (cause) {
+    throw errors.normalizeSolanaError(cause, "RPC_FAILURE");
   }
-  if (wallet$1.signAndSendTransaction) {
-    const result = await wallet$1.signAndSendTransaction(transaction, options);
-    return result.signature;
-  }
-  wallet.assertWalletCanSign(wallet$1);
-  return signAndSendRawTransaction(connection, wallet$1, transaction, options);
 }
 async function confirmTransactionSignature(connection, signature, options = {}) {
   const commitment = options.commitment ?? DEFAULT_CONFIRMATION_COMMITMENT;
   const confirmation = connection.confirmTransaction(signature, commitment);
-  const result = await withTransactionTimeout(
-    confirmation,
-    options.timeoutMs ?? DEFAULT_CONFIRMATION_TIMEOUT_MS,
-    `Timed out waiting for transaction ${signature} to reach ${commitment} commitment.`
-  );
+  let result;
+  try {
+    result = await timeout.withSolanaTimeout(
+      confirmation,
+      options.timeoutMs ?? DEFAULT_CONFIRMATION_TIMEOUT_MS,
+      `Timed out waiting for transaction ${signature} to reach ${commitment} commitment.`
+    );
+  } catch (cause) {
+    throw errors.normalizeSolanaError(cause, "RPC_FAILURE");
+  }
   if (result.value.err) {
-    throw new Error(`Transaction ${signature} failed to reach ${commitment} commitment.`);
+    throw errors.createSolanaError(
+      "RPC_FAILURE",
+      `Transaction ${signature} failed to reach ${commitment} commitment.`,
+      { cause: result.value.err }
+    );
   }
   return {
     signature,
@@ -42,21 +57,6 @@ async function signAndSendRawTransaction(connection, wallet, transaction, option
 function isMobileWalletAdapterWallet(wallet) {
   return wallet.source === "mobile-wallet-adapter";
 }
-async function withTransactionTimeout(promise, timeoutMs, message) {
-  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);
-    }
-  }
-}
 
 exports.confirmTransactionSignature = confirmTransactionSignature;
 exports.signAndSendTransaction = signAndSendTransaction;

package/dist/transaction.mjs

@@ -1,30 +1,45 @@
+import { normalizeSolanaError, createSolanaError } from './errors.mjs';
+import { withSolanaTimeout } from './timeout.mjs';
 import { assertWalletConnected, assertWalletCanSign } from './wallet.mjs';
 
 const DEFAULT_CONFIRMATION_COMMITMENT = "confirmed";
 const DEFAULT_CONFIRMATION_TIMEOUT_MS = 6e4;
 async function signAndSendTransaction(connection, wallet, transaction, options) {
-  assertWalletConnected(wallet);
-  if (isMobileWalletAdapterWallet(wallet) && wallet.signTransaction) {
+  try {
+    assertWalletConnected(wallet);
+    if (isMobileWalletAdapterWallet(wallet) && wallet.signTransaction) {
+      assertWalletCanSign(wallet);
+      return await signAndSendRawTransaction(connection, wallet, transaction, options);
+    }
+    if (wallet.signAndSendTransaction) {
+      const result = await wallet.signAndSendTransaction(transaction, options);
+      return result.signature;
+    }
     assertWalletCanSign(wallet);
-    return signAndSendRawTransaction(connection, wallet, transaction, options);
+    return await signAndSendRawTransaction(connection, wallet, transaction, options);
+  } catch (cause) {
+    throw normalizeSolanaError(cause, "RPC_FAILURE");
   }
-  if (wallet.signAndSendTransaction) {
-    const result = await wallet.signAndSendTransaction(transaction, options);
-    return result.signature;
-  }
-  assertWalletCanSign(wallet);
-  return signAndSendRawTransaction(connection, wallet, transaction, options);
 }
 async function confirmTransactionSignature(connection, signature, options = {}) {
   const commitment = options.commitment ?? DEFAULT_CONFIRMATION_COMMITMENT;
   const confirmation = connection.confirmTransaction(signature, commitment);
-  const result = await withTransactionTimeout(
-    confirmation,
-    options.timeoutMs ?? DEFAULT_CONFIRMATION_TIMEOUT_MS,
-    `Timed out waiting for transaction ${signature} to reach ${commitment} commitment.`
-  );
+  let result;
+  try {
+    result = await withSolanaTimeout(
+      confirmation,
+      options.timeoutMs ?? DEFAULT_CONFIRMATION_TIMEOUT_MS,
+      `Timed out waiting for transaction ${signature} to reach ${commitment} commitment.`
+    );
+  } catch (cause) {
+    throw normalizeSolanaError(cause, "RPC_FAILURE");
+  }
   if (result.value.err) {
-    throw new Error(`Transaction ${signature} failed to reach ${commitment} commitment.`);
+    throw createSolanaError(
+      "RPC_FAILURE",
+      `Transaction ${signature} failed to reach ${commitment} commitment.`,
+      { cause: result.value.err }
+    );
   }
   return {
     signature,
@@ -40,20 +55,5 @@ async function signAndSendRawTransaction(connection, wallet, transaction, option
 function isMobileWalletAdapterWallet(wallet) {
   return wallet.source === "mobile-wallet-adapter";
 }
-async function withTransactionTimeout(promise, timeoutMs, message) {
-  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);
-    }
-  }
-}
 
 export { confirmTransactionSignature, signAndSendTransaction };

package/dist/wallet.cjs

@@ -1,12 +1,16 @@
 'use strict';
 
-class SolanaWalletError extends Error {
-  constructor(code, message) {
-    super(message);
-    this.code = code;
+const errors = require('./errors.cjs');
+
+class SolanaWalletError extends errors.SolanaError {
+  constructor(code, message, options = {}) {
+    super(code, message, options);
     this.name = "SolanaWalletError";
   }
 }
+function createNoWalletSelectedError(cause) {
+  return new SolanaWalletError("NO_WALLET_SELECTED", "No Solana wallet is selected", { cause });
+}
 function isWalletConnected(wallet) {
   return Boolean(wallet?.connected && wallet.publicKey);
 }
@@ -19,8 +23,9 @@ function assertWalletCanSign(wallet) {
   assertWalletConnected(wallet);
   if (!wallet.signTransaction) {
     throw new SolanaWalletError(
-      "WALLET_SIGN_TRANSACTION_UNSUPPORTED",
-      "Solana wallet does not support signTransaction"
+      "WALLET_FEATURE_UNSUPPORTED",
+      "Solana wallet does not support signTransaction",
+      { feature: "signTransaction" }
     );
   }
 }
@@ -28,8 +33,9 @@ function assertWalletCanSignMessage(wallet) {
   assertWalletConnected(wallet);
   if (!wallet.signMessage) {
     throw new SolanaWalletError(
-      "WALLET_SIGN_MESSAGE_UNSUPPORTED",
-      "Solana wallet does not support signMessage"
+      "WALLET_FEATURE_UNSUPPORTED",
+      "Solana wallet does not support signMessage",
+      { feature: "signMessage" }
     );
   }
 }
@@ -38,4 +44,5 @@ exports.SolanaWalletError = SolanaWalletError;
 exports.assertWalletCanSign = assertWalletCanSign;
 exports.assertWalletCanSignMessage = assertWalletCanSignMessage;
 exports.assertWalletConnected = assertWalletConnected;
+exports.createNoWalletSelectedError = createNoWalletSelectedError;
 exports.isWalletConnected = isWalletConnected;

package/dist/wallet.d.cts

@@ -1,11 +1,15 @@
 import { SolanaWallet } from './types.cjs';
+import { SolanaError } from './errors.cjs';
 import '@solana/web3-compat';
 
-type SolanaWalletErrorCode = "WALLET_NOT_CONNECTED" | "WALLET_SIGN_MESSAGE_UNSUPPORTED" | "WALLET_SIGN_TRANSACTION_UNSUPPORTED";
-declare class SolanaWalletError extends Error {
-    readonly code: SolanaWalletErrorCode;
-    constructor(code: SolanaWalletErrorCode, message: string);
+type SolanaWalletErrorCode = "NO_WALLET_SELECTED" | "WALLET_NOT_CONNECTED" | "WALLET_FEATURE_UNSUPPORTED";
+declare class SolanaWalletError extends SolanaError {
+    constructor(code: SolanaWalletErrorCode, message: string, options?: {
+        cause?: unknown;
+        feature?: string;
+    });
 }
+declare function createNoWalletSelectedError(cause?: unknown): SolanaWalletError;
 declare function isWalletConnected(wallet: Pick<SolanaWallet, "connected" | "publicKey"> | null | undefined): boolean;
 declare function assertWalletConnected(wallet: SolanaWallet | null | undefined): asserts wallet is SolanaWallet & {
     publicKey: NonNullable<SolanaWallet["publicKey"]>;
@@ -13,5 +17,5 @@ declare function assertWalletConnected(wallet: SolanaWallet | null | undefined):
 declare function assertWalletCanSign(wallet: SolanaWallet | null | undefined): asserts wallet is SolanaWallet & Required<Pick<SolanaWallet, "signTransaction">>;
 declare function assertWalletCanSignMessage(wallet: SolanaWallet | null | undefined): asserts wallet is SolanaWallet & Required<Pick<SolanaWallet, "signMessage">>;
 
-export { SolanaWalletError, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, isWalletConnected };
+export { SolanaWalletError, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, createNoWalletSelectedError, isWalletConnected };
 export type { SolanaWalletErrorCode };

package/dist/wallet.d.mts

@@ -1,11 +1,15 @@
 import { SolanaWallet } from './types.mjs';
+import { SolanaError } from './errors.mjs';
 import '@solana/web3-compat';
 
-type SolanaWalletErrorCode = "WALLET_NOT_CONNECTED" | "WALLET_SIGN_MESSAGE_UNSUPPORTED" | "WALLET_SIGN_TRANSACTION_UNSUPPORTED";
-declare class SolanaWalletError extends Error {
-    readonly code: SolanaWalletErrorCode;
-    constructor(code: SolanaWalletErrorCode, message: string);
+type SolanaWalletErrorCode = "NO_WALLET_SELECTED" | "WALLET_NOT_CONNECTED" | "WALLET_FEATURE_UNSUPPORTED";
+declare class SolanaWalletError extends SolanaError {
+    constructor(code: SolanaWalletErrorCode, message: string, options?: {
+        cause?: unknown;
+        feature?: string;
+    });
 }
+declare function createNoWalletSelectedError(cause?: unknown): SolanaWalletError;
 declare function isWalletConnected(wallet: Pick<SolanaWallet, "connected" | "publicKey"> | null | undefined): boolean;
 declare function assertWalletConnected(wallet: SolanaWallet | null | undefined): asserts wallet is SolanaWallet & {
     publicKey: NonNullable<SolanaWallet["publicKey"]>;
@@ -13,5 +17,5 @@ declare function assertWalletConnected(wallet: SolanaWallet | null | undefined):
 declare function assertWalletCanSign(wallet: SolanaWallet | null | undefined): asserts wallet is SolanaWallet & Required<Pick<SolanaWallet, "signTransaction">>;
 declare function assertWalletCanSignMessage(wallet: SolanaWallet | null | undefined): asserts wallet is SolanaWallet & Required<Pick<SolanaWallet, "signMessage">>;
 
-export { SolanaWalletError, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, isWalletConnected };
+export { SolanaWalletError, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, createNoWalletSelectedError, isWalletConnected };
 export type { SolanaWalletErrorCode };

package/dist/wallet.d.ts

@@ -1,11 +1,15 @@
 import { SolanaWallet } from './types.js';
+import { SolanaError } from './errors.js';
 import '@solana/web3-compat';
 
-type SolanaWalletErrorCode = "WALLET_NOT_CONNECTED" | "WALLET_SIGN_MESSAGE_UNSUPPORTED" | "WALLET_SIGN_TRANSACTION_UNSUPPORTED";
-declare class SolanaWalletError extends Error {
-    readonly code: SolanaWalletErrorCode;
-    constructor(code: SolanaWalletErrorCode, message: string);
+type SolanaWalletErrorCode = "NO_WALLET_SELECTED" | "WALLET_NOT_CONNECTED" | "WALLET_FEATURE_UNSUPPORTED";
+declare class SolanaWalletError extends SolanaError {
+    constructor(code: SolanaWalletErrorCode, message: string, options?: {
+        cause?: unknown;
+        feature?: string;
+    });
 }
+declare function createNoWalletSelectedError(cause?: unknown): SolanaWalletError;
 declare function isWalletConnected(wallet: Pick<SolanaWallet, "connected" | "publicKey"> | null | undefined): boolean;
 declare function assertWalletConnected(wallet: SolanaWallet | null | undefined): asserts wallet is SolanaWallet & {
     publicKey: NonNullable<SolanaWallet["publicKey"]>;
@@ -13,5 +17,5 @@ declare function assertWalletConnected(wallet: SolanaWallet | null | undefined):
 declare function assertWalletCanSign(wallet: SolanaWallet | null | undefined): asserts wallet is SolanaWallet & Required<Pick<SolanaWallet, "signTransaction">>;
 declare function assertWalletCanSignMessage(wallet: SolanaWallet | null | undefined): asserts wallet is SolanaWallet & Required<Pick<SolanaWallet, "signMessage">>;
 
-export { SolanaWalletError, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, isWalletConnected };
+export { SolanaWalletError, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, createNoWalletSelectedError, isWalletConnected };
 export type { SolanaWalletErrorCode };

package/dist/wallet.mjs

@@ -1,10 +1,14 @@
-class SolanaWalletError extends Error {
-  constructor(code, message) {
-    super(message);
-    this.code = code;
+import { SolanaError } from './errors.mjs';
+
+class SolanaWalletError extends SolanaError {
+  constructor(code, message, options = {}) {
+    super(code, message, options);
     this.name = "SolanaWalletError";
   }
 }
+function createNoWalletSelectedError(cause) {
+  return new SolanaWalletError("NO_WALLET_SELECTED", "No Solana wallet is selected", { cause });
+}
 function isWalletConnected(wallet) {
   return Boolean(wallet?.connected && wallet.publicKey);
 }
@@ -17,8 +21,9 @@ function assertWalletCanSign(wallet) {
   assertWalletConnected(wallet);
   if (!wallet.signTransaction) {
     throw new SolanaWalletError(
-      "WALLET_SIGN_TRANSACTION_UNSUPPORTED",
-      "Solana wallet does not support signTransaction"
+      "WALLET_FEATURE_UNSUPPORTED",
+      "Solana wallet does not support signTransaction",
+      { feature: "signTransaction" }
     );
   }
 }
@@ -26,10 +31,11 @@ function assertWalletCanSignMessage(wallet) {
   assertWalletConnected(wallet);
   if (!wallet.signMessage) {
     throw new SolanaWalletError(
-      "WALLET_SIGN_MESSAGE_UNSUPPORTED",
-      "Solana wallet does not support signMessage"
+      "WALLET_FEATURE_UNSUPPORTED",
+      "Solana wallet does not support signMessage",
+      { feature: "signMessage" }
     );
   }
 }
 
-export { SolanaWalletError, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, isWalletConnected };
+export { SolanaWalletError, assertWalletCanSign, assertWalletCanSignMessage, assertWalletConnected, createNoWalletSelectedError, isWalletConnected };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-solana/core",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Framework-agnostic primitives for Vue Solana libraries.",
   "license": "MIT",
   "keywords": [
@@ -45,6 +45,11 @@
       "import": "./dist/clusters.mjs",
       "require": "./dist/clusters.cjs"
     },
+    "./errors": {
+      "types": "./dist/errors.d.ts",
+      "import": "./dist/errors.mjs",
+      "require": "./dist/errors.cjs"
+    },
     "./ios-wallet": {
       "types": "./dist/ios-wallet.d.ts",
       "import": "./dist/ios-wallet.mjs",
@@ -60,6 +65,11 @@
       "import": "./dist/rpc.mjs",
       "require": "./dist/rpc.cjs"
     },
+    "./timeout": {
+      "types": "./dist/timeout.d.ts",
+      "import": "./dist/timeout.mjs",
+      "require": "./dist/timeout.cjs"
+    },
     "./transaction": {
       "types": "./dist/transaction.d.ts",
       "import": "./dist/transaction.mjs",