@alleyboss/micropay-solana-x402-paywall 2.0.2 → 2.1.1

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 export { A as ArticlePaymentConfig, d as PaymentAsset, a as PaymentPayload, P as PaymentRequirement, c as PaymentStatus, e as SPLTokenAsset, S as SolanaNetwork, T as TOKEN_MINTS, V as VerificationRequest, b as VerificationResponse, X as X402Network } from './payment-CTxdtqmc.cjs';
 export { a as SessionConfig, S as SessionData, c as SessionJWTPayload, b as SessionValidation } from './session-D2IoWAWV.cjs';
-export { S as SolanaClientConfig, g as getConnection, i as isMainnet, r as resetConnection, t as toX402Network } from './client-vRr48m2x.cjs';
-export { SPLVerificationResult, TransactionVerificationResult, VerifyPaymentParams, VerifySPLPaymentParams, getTokenDecimals, getWalletTransactions, isNativeAsset, lamportsToSol, resolveMintAddress, solToLamports, verifyPayment, verifySPLPayment, waitForConfirmation } from './solana/index.cjs';
+export { R as RpcConnectionWithFallback, S as SolanaClientConfig, g as getConnection, a as getConnectionWithFallback, i as isMainnet, r as resetConnection, t as toX402Network, w as withFallback } from './client-Blkcv17a.cjs';
+export { PriorityFeeConfig, SPLVerificationResult, TransactionVerificationResult, VerifyPaymentParams, VerifySPLPaymentParams, VersionedTransactionConfig, VersionedTransactionResult, buildVersionedTransaction, calculatePriorityFeeCost, createPriorityFeeInstructions, estimatePriorityFee, fetchLookupTables, getTokenDecimals, getWalletTransactions, isNativeAsset, isVersionedTransaction, lamportsToSol, resolveMintAddress, solToLamports, verifyPayment, verifySPLPayment, waitForConfirmation } from './solana/index.cjs';
 export { addArticleToSession, createSession, isArticleUnlocked, validateSession } from './session/index.cjs';
 export { BuildPaymentParams, X402_HEADERS, buildPaymentRequirement, create402Headers, create402ResponseBody, decodePaymentRequired, encodePaymentRequired, encodePaymentResponse, parsePaymentHeader, verifyX402Payment } from './x402/index.cjs';
 export { StoreConfig, createRedisStore } from './store/index.cjs';

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { A as ArticlePaymentConfig, d as PaymentAsset, a as PaymentPayload, P as PaymentRequirement, c as PaymentStatus, e as SPLTokenAsset, S as SolanaNetwork, T as TOKEN_MINTS, V as VerificationRequest, b as VerificationResponse, X as X402Network } from './payment-CTxdtqmc.js';
 export { a as SessionConfig, S as SessionData, c as SessionJWTPayload, b as SessionValidation } from './session-D2IoWAWV.js';
-export { S as SolanaClientConfig, g as getConnection, i as isMainnet, r as resetConnection, t as toX402Network } from './client-CSZHI8o8.js';
-export { SPLVerificationResult, TransactionVerificationResult, VerifyPaymentParams, VerifySPLPaymentParams, getTokenDecimals, getWalletTransactions, isNativeAsset, lamportsToSol, resolveMintAddress, solToLamports, verifyPayment, verifySPLPayment, waitForConfirmation } from './solana/index.js';
+export { R as RpcConnectionWithFallback, S as SolanaClientConfig, g as getConnection, a as getConnectionWithFallback, i as isMainnet, r as resetConnection, t as toX402Network, w as withFallback } from './client-xhJSoeOH.js';
+export { PriorityFeeConfig, SPLVerificationResult, TransactionVerificationResult, VerifyPaymentParams, VerifySPLPaymentParams, VersionedTransactionConfig, VersionedTransactionResult, buildVersionedTransaction, calculatePriorityFeeCost, createPriorityFeeInstructions, estimatePriorityFee, fetchLookupTables, getTokenDecimals, getWalletTransactions, isNativeAsset, isVersionedTransaction, lamportsToSol, resolveMintAddress, solToLamports, verifyPayment, verifySPLPayment, waitForConfirmation } from './solana/index.js';
 export { addArticleToSession, createSession, isArticleUnlocked, validateSession } from './session/index.js';
 export { BuildPaymentParams, X402_HEADERS, buildPaymentRequirement, create402Headers, create402ResponseBody, decodePaymentRequired, encodePaymentRequired, encodePaymentResponse, parsePaymentHeader, verifyX402Payment } from './x402/index.js';
 export { StoreConfig, createRedisStore } from './store/index.js';

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Connection, PublicKey, LAMPORTS_PER_SOL, clusterApiUrl } from '@solana/web3.js';
+import { PublicKey, LAMPORTS_PER_SOL, ComputeBudgetProgram, TransactionMessage, VersionedTransaction, clusterApiUrl, Connection } from '@solana/web3.js';
 import { SignJWT, jwtVerify } from 'jose';
 import { v4 } from 'uuid';
 
@@ -13,6 +13,8 @@ var TOKEN_MINTS = {
 };
 var cachedConnection = null;
 var cachedNetwork = null;
+var cachedFallbacks = [];
+var cachedFallbackEnabled = false;
 function buildRpcUrl(config2) {
   const { network, rpcUrl, tatumApiKey } = config2;
   if (rpcUrl) {
@@ -27,19 +29,65 @@ function buildRpcUrl(config2) {
   }
   return clusterApiUrl(network);
 }
+function createConnection(rpcUrl) {
+  return new Connection(rpcUrl, {
+    commitment: "confirmed",
+    confirmTransactionInitialTimeout: 6e4
+  });
+}
 function getConnection(config2) {
   const { network } = config2;
   if (cachedConnection && cachedNetwork === network) {
     return cachedConnection;
   }
   const rpcUrl = buildRpcUrl(config2);
-  cachedConnection = new Connection(rpcUrl, {
-    commitment: "confirmed",
-    confirmTransactionInitialTimeout: 6e4
-  });
+  cachedConnection = createConnection(rpcUrl);
   cachedNetwork = network;
+  cachedFallbackEnabled = config2.enableFallback ?? false;
+  cachedFallbacks = [];
+  if (cachedFallbackEnabled && config2.fallbackRpcUrls?.length) {
+    cachedFallbacks = config2.fallbackRpcUrls.map(createConnection);
+  }
   return cachedConnection;
 }
+function getConnectionWithFallback(config2) {
+  const connection = getConnection(config2);
+  return {
+    connection,
+    fallbacks: cachedFallbacks,
+    fallbackEnabled: cachedFallbackEnabled
+  };
+}
+async function withFallback(config2, operation) {
+  const { connection, fallbacks, fallbackEnabled } = getConnectionWithFallback(config2);
+  try {
+    return await operation(connection);
+  } catch (error) {
+    if (!fallbackEnabled || fallbacks.length === 0) {
+      throw error;
+    }
+    if (!isRetryableError(error)) {
+      throw error;
+    }
+    for (let i = 0; i < fallbacks.length; i++) {
+      try {
+        return await operation(fallbacks[i]);
+      } catch (fallbackError) {
+        if (i === fallbacks.length - 1) {
+          throw fallbackError;
+        }
+      }
+    }
+    throw error;
+  }
+}
+function isRetryableError(error) {
+  if (error instanceof Error) {
+    const message = error.message.toLowerCase();
+    return message.includes("429") || message.includes("503") || message.includes("502") || message.includes("timeout") || message.includes("econnrefused") || message.includes("enotfound") || message.includes("rate limit");
+  }
+  return false;
+}
 function resetConnection() {
   cachedConnection = null;
   cachedNetwork = null;
@@ -396,6 +444,88 @@ async function verifySPLPayment(params) {
 function isNativeAsset(asset) {
   return asset === "native";
 }
+var DEFAULT_COMPUTE_UNITS = 2e5;
+var DEFAULT_MICRO_LAMPORTS = 1e3;
+function createPriorityFeeInstructions(config2 = {}) {
+  const { enabled = false, microLamports, computeUnits } = config2;
+  if (!enabled) {
+    return [];
+  }
+  const instructions = [];
+  const units = computeUnits ?? DEFAULT_COMPUTE_UNITS;
+  instructions.push(ComputeBudgetProgram.setComputeUnitLimit({ units }));
+  const price = microLamports ?? DEFAULT_MICRO_LAMPORTS;
+  instructions.push(ComputeBudgetProgram.setComputeUnitPrice({ microLamports: price }));
+  return instructions;
+}
+async function estimatePriorityFee(connection, accounts = []) {
+  try {
+    const fees = await connection.getRecentPrioritizationFees({
+      lockedWritableAccounts: accounts
+    });
+    if (fees.length === 0) {
+      return DEFAULT_MICRO_LAMPORTS;
+    }
+    const sortedFees = fees.map((f) => f.prioritizationFee).filter((f) => f > 0).sort((a, b) => a - b);
+    if (sortedFees.length === 0) {
+      return DEFAULT_MICRO_LAMPORTS;
+    }
+    const medianIndex = Math.floor(sortedFees.length / 2);
+    return sortedFees[medianIndex];
+  } catch {
+    return DEFAULT_MICRO_LAMPORTS;
+  }
+}
+function calculatePriorityFeeCost(microLamportsPerCU, computeUnits) {
+  return Math.ceil(microLamportsPerCU * computeUnits / 1e6);
+}
+async function buildVersionedTransaction(config2) {
+  const {
+    connection,
+    payer,
+    instructions,
+    lookupTables = [],
+    priorityFee,
+    recentBlockhash
+  } = config2;
+  const priorityIxs = createPriorityFeeInstructions(priorityFee);
+  const allInstructions = [...priorityIxs, ...instructions];
+  let blockhash;
+  let lastValidBlockHeight;
+  if (recentBlockhash) {
+    blockhash = recentBlockhash;
+    const slot = await connection.getSlot();
+    lastValidBlockHeight = slot + 150;
+  } else {
+    const latestBlockhash = await connection.getLatestBlockhash("confirmed");
+    blockhash = latestBlockhash.blockhash;
+    lastValidBlockHeight = latestBlockhash.lastValidBlockHeight;
+  }
+  const message = new TransactionMessage({
+    payerKey: payer,
+    recentBlockhash: blockhash,
+    instructions: allInstructions
+  }).compileToV0Message(lookupTables);
+  const transaction = new VersionedTransaction(message);
+  return {
+    transaction,
+    blockhash,
+    lastValidBlockHeight
+  };
+}
+async function fetchLookupTables(connection, addresses) {
+  const tables = [];
+  for (const address of addresses) {
+    const result = await connection.getAddressLookupTable(address);
+    if (result.value) {
+      tables.push(result.value);
+    }
+  }
+  return tables;
+}
+function isVersionedTransaction(tx) {
+  return tx instanceof VersionedTransaction;
+}
 var MAX_ARTICLES_PER_SESSION = 100;
 var MIN_SECRET_LENGTH = 32;
 function getSecretKey(secret) {
@@ -1170,6 +1300,6 @@ function getProviders() {
   return PROVIDERS.map((p) => ({ name: p.name, url: p.url }));
 }
 
-export { TOKEN_MINTS, X402_HEADERS, addArticleToSession, buildPaymentRequirement, buildSolanaPayUrl, checkPaywallAccess, clearPriceCache, configurePricing, create402Headers, create402ResponseBody, createMemoryStore, createPaymentFlow, createPaymentReference, createPaywallMiddleware, createRedisStore, createSession, decodePaymentRequired, encodePaymentRequired, encodePaymentResponse, formatPriceDisplay, formatPriceSync, getConnection, getProviders, getSolPrice, getTokenDecimals, getWalletTransactions, isArticleUnlocked, isMainnet, isNativeAsset, isRetryableRPCError, lamportsToSol, lamportsToUsd, parsePaymentHeader, resetConnection, resolveMintAddress, solToLamports, toX402Network, usdToLamports, validateSession, verifyPayment, verifySPLPayment, verifyX402Payment, waitForConfirmation, withPaywall, withRetry };
+export { TOKEN_MINTS, X402_HEADERS, addArticleToSession, buildPaymentRequirement, buildSolanaPayUrl, buildVersionedTransaction, calculatePriorityFeeCost, checkPaywallAccess, clearPriceCache, configurePricing, create402Headers, create402ResponseBody, createMemoryStore, createPaymentFlow, createPaymentReference, createPaywallMiddleware, createPriorityFeeInstructions, createRedisStore, createSession, decodePaymentRequired, encodePaymentRequired, encodePaymentResponse, estimatePriorityFee, fetchLookupTables, formatPriceDisplay, formatPriceSync, getConnection, getConnectionWithFallback, getProviders, getSolPrice, getTokenDecimals, getWalletTransactions, isArticleUnlocked, isMainnet, isNativeAsset, isRetryableRPCError, isVersionedTransaction, lamportsToSol, lamportsToUsd, parsePaymentHeader, resetConnection, resolveMintAddress, solToLamports, toX402Network, usdToLamports, validateSession, verifyPayment, verifySPLPayment, verifyX402Payment, waitForConfirmation, withFallback, withPaywall, withRetry };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map