@alleyboss/micropay-solana-x402-paywall 2.1.2 → 2.3.0

package/dist/index.d.cts

@@ -3,9 +3,9 @@ export { a as SessionConfig, S as SessionData, c as SessionJWTPayload, b as Sess
 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-D-dteoJw.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 { BuildPaymentParams, X402_HEADERS, buildPaymentRequirement, create402Headers, create402Response, create402ResponseBody, decodePaymentRequired, encodePaymentRequired, encodePaymentRequirement, encodePaymentResponse, parsePaymentHeader, verifyX402Payment } from './x402/index.cjs';
 export { StoreConfig, createRedisStore } from './store/index.cjs';
-export { M as MiddlewareResult, P as PaywallMiddlewareConfig, a as checkPaywallAccess, c as createPaywallMiddleware, w as withPaywall } from './nextjs-Bm272Jkj.cjs';
+export { M as MiddlewareResult, P as PaywallMiddlewareConfig, a as checkPaywallAccess, c as createPaywallMiddleware, w as withPaywall } from './nextjs-BDyOqGAq.cjs';
 export { RetryOptions, isRetryableRPCError, withRetry } from './utils/index.cjs';
 export { PaymentFlowConfig, SolanaPayUrlParams, buildSolanaPayUrl, createPaymentFlow, createPaymentReference } from './client/index.cjs';
 export { CustomPriceProvider, PriceConfig, PriceData, clearPriceCache, configurePricing, formatPriceDisplay, formatPriceSync, getProviders, getSolPrice, lamportsToUsd, usdToLamports } from './pricing/index.cjs';

package/dist/index.d.ts

@@ -3,9 +3,9 @@ export { a as SessionConfig, S as SessionData, c as SessionJWTPayload, b as Sess
 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-DfCIRrNG.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 { BuildPaymentParams, X402_HEADERS, buildPaymentRequirement, create402Headers, create402Response, create402ResponseBody, decodePaymentRequired, encodePaymentRequired, encodePaymentRequirement, encodePaymentResponse, parsePaymentHeader, verifyX402Payment } from './x402/index.js';
 export { StoreConfig, createRedisStore } from './store/index.js';
-export { M as MiddlewareResult, P as PaywallMiddlewareConfig, a as checkPaywallAccess, c as createPaywallMiddleware, w as withPaywall } from './nextjs-BK0pVb9Y.js';
+export { M as MiddlewareResult, P as PaywallMiddlewareConfig, a as checkPaywallAccess, c as createPaywallMiddleware, w as withPaywall } from './nextjs-CbX8_9yK.js';
 export { RetryOptions, isRetryableRPCError, withRetry } from './utils/index.js';
 export { PaymentFlowConfig, SolanaPayUrlParams, buildSolanaPayUrl, createPaymentFlow, createPaymentReference } from './client/index.js';
 export { CustomPriceProvider, PriceConfig, PriceData, clearPriceCache, configurePricing, formatPriceDisplay, formatPriceSync, getProviders, getSolPrice, lamportsToUsd, usdToLamports } from './pricing/index.js';

package/dist/index.js

@@ -146,7 +146,8 @@ async function verifyPayment(params) {
     expectedRecipient,
     expectedAmount,
     maxAgeSeconds = 300,
-    clientConfig
+    clientConfig,
+    signatureStore
   } = params;
   if (!isValidSignature(signature)) {
     return { valid: false, confirmed: false, signature, error: "Invalid signature format" };
@@ -157,6 +158,12 @@ async function verifyPayment(params) {
   if (expectedAmount <= 0n) {
     return { valid: false, confirmed: false, signature, error: "Invalid expected amount" };
   }
+  if (signatureStore) {
+    const isUsed = await signatureStore.hasBeenUsed(signature);
+    if (isUsed) {
+      return { valid: false, confirmed: true, signature, error: "Signature already used" };
+    }
+  }
   const effectiveMaxAge = Math.min(Math.max(maxAgeSeconds, 60), 3600);
   const connection = getConnection(clientConfig);
   try {
@@ -265,8 +272,6 @@ function solToLamports(sol) {
   }
   return BigInt(Math.floor(sol * LAMPORTS_PER_SOL));
 }
-
-// src/solana/spl.ts
 var SIGNATURE_REGEX2 = /^[1-9A-HJ-NP-Za-km-z]{87,88}$/;
 var WALLET_REGEX2 = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
 function resolveMintAddress(asset, network) {
@@ -360,8 +365,15 @@ async function verifySPLPayment(params) {
     expectedAmount,
     asset,
     clientConfig,
-    maxAgeSeconds = 300
+    maxAgeSeconds = 300,
+    signatureStore
   } = params;
+  if (signatureStore) {
+    const isUsed = await signatureStore.hasBeenUsed(signature);
+    if (isUsed) {
+      return { valid: false, confirmed: true, signature, error: "Signature already used" };
+    }
+  }
   if (!SIGNATURE_REGEX2.test(signature)) {
     return { valid: false, confirmed: false, signature, error: "Invalid signature format" };
   }
@@ -406,6 +418,27 @@ async function verifySPLPayment(params) {
         error: "No valid token transfer to recipient found"
       };
     }
+    if (transfer.to) {
+      try {
+        const destinationInfo = await connection.getParsedAccountInfo(new PublicKey(transfer.to));
+        const owner = destinationInfo.value?.data?.parsed?.info?.owner;
+        if (owner && owner !== expectedRecipient) {
+          return {
+            valid: false,
+            confirmed: true,
+            signature,
+            error: "Recipient mismatch: Token account not owned by merchant"
+          };
+        }
+      } catch (e) {
+        return {
+          valid: false,
+          confirmed: true,
+          signature,
+          error: "Could not verify token account owner"
+        };
+      }
+    }
     if (transfer.mint !== mintAddress) {
       return {
         valid: false,
@@ -827,9 +860,28 @@ function parsePaymentHeader(header) {
     return null;
   }
 }
+function encodePaymentRequirement(requirement) {
+  return Buffer.from(JSON.stringify(requirement)).toString("base64");
+}
 function encodePaymentResponse(response) {
   return Buffer.from(JSON.stringify(response)).toString("base64");
 }
+function create402Response(requirement, body) {
+  const headers = new Headers({
+    "Content-Type": "application/json",
+    "X-Payment-Required": encodePaymentRequirement(requirement)
+  });
+  const responseBody = body || {
+    error: "Payment Required",
+    message: "This resource requires payment to access",
+    x402Version: 1,
+    accepts: [requirement]
+  };
+  return new Response(JSON.stringify(responseBody), {
+    status: 402,
+    headers
+  });
+}
 
 // src/store/memory.ts
 function createMemoryStore(options = {}) {
@@ -974,16 +1026,22 @@ function createPaywallMiddleware(config2) {
     const sessionToken = cookies[cookieName];
     const result = await checkPaywallAccess(path, sessionToken, config2);
     if (!result.allowed && result.requiresPayment) {
+      const headers = {
+        "Content-Type": "application/json"
+      };
+      if (config2.paymentRequirement) {
+        const requirement = typeof config2.paymentRequirement === "function" ? config2.paymentRequirement(path) : config2.paymentRequirement;
+        headers["X-Payment-Required"] = encodePaymentRequirement(requirement);
+      }
       const body = config2.custom402Response ? config2.custom402Response(path) : {
         error: "Payment Required",
         message: "This resource requires payment to access",
+        x402Version: 1,
         path
       };
       return new Response(JSON.stringify(body), {
         status: 402,
-        headers: {
-          "Content-Type": "application/json"
-        }
+        headers
       });
     }
     return null;
@@ -1259,14 +1317,14 @@ async function getSolPrice() {
     }
   }
   if (cachedPrice) {
-    return cachedPrice;
+    return {
+      ...cachedPrice,
+      source: `${cachedPrice.source} (stale)`
+    };
   }
-  return {
-    solPrice: 150,
-    // Reasonable fallback
-    fetchedAt: /* @__PURE__ */ new Date(),
-    source: "fallback"
-  };
+  throw new Error(
+    "Failed to fetch SOL price from all providers. Configure a custom provider or ensure network connectivity."
+  );
 }
 async function lamportsToUsd(lamports) {
   const { solPrice } = await getSolPrice();
@@ -1301,6 +1359,6 @@ function getProviders() {
   return PROVIDERS.map((p) => ({ name: p.name, url: p.url }));
 }
 
-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 };
+export { TOKEN_MINTS, X402_HEADERS, addArticleToSession, buildPaymentRequirement, buildSolanaPayUrl, buildVersionedTransaction, calculatePriorityFeeCost, checkPaywallAccess, clearPriceCache, configurePricing, create402Headers, create402Response, create402ResponseBody, createMemoryStore, createPaymentFlow, createPaymentReference, createPaywallMiddleware, createPriorityFeeInstructions, createRedisStore, createSession, decodePaymentRequired, encodePaymentRequired, encodePaymentRequirement, 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