@alleyboss/micropay-solana-x402-paywall 3.3.11 → 3.3.13

package/README.md

@@ -22,6 +22,7 @@ npm install @alleyboss/micropay-solana-x402-paywall @x402/core @x402/svm @solana
 |---------|-------------|--------|
 | 💰 **SOL & USDC** | Native SOL and SPL tokens (USDC, USDT) | ✅ Verified by `@x402/svm` |
 | 🔐 **x402 Protocol** | Full HTTP 402 compliance | ✅ Powered by `@x402/core` |
+| 🌐 **PayAI Format** | Multi-chain payment format support | ✅ Built-in |
 | 🔑 **JWT Sessions** | "Pay once, unlock for 24h" logic | ✅ Built-in (Hybrid Support) |
 | 🛡️ **Replay Protection** | Prevent double-spend / replay attacks | ✅ Managed by x402 Facilitator |
 | 🔌 **Express Integration** | Middleware for Express/Node.js | ✅ Built-in |
@@ -133,6 +134,61 @@ const withMicropay = createX402Middleware({
 | **Setup** | Zero-config | Requires RPC URL |
 | **Best For** | Quick startups, MVPs | Production, High-Volume, Agents |
 
+## 🌐 PayAI Format Support (New in v3.3.13)
+
+Native support for the **PayAI payment format** - a universal payment protocol that works across Solana, Ethereum, Base, and other chains.
+
+```typescript
+// PayAI format is automatically detected and processed
+const payaiPayload = {
+  scheme: 'exact-svm',
+  networkId: 'solana-devnet',
+  authorization: {
+    signatures: ['5j8...']
+  }
+};
+
+const response = await fetch('/api/premium', {
+  headers: {
+    'Authorization': `x402 ${btoa(JSON.stringify(payaiPayload))}`
+  }
+});
+```
+
+**Features:**
+- ✅ Automatic format detection and transformation
+- ✅ Multi-chain ready (Solana, Ethereum, Base)
+- ✅ Full TypeScript support
+- ✅ Backward compatible with x402 format
+
+**Learn more:** [PayAI Integration Guide](https://github.com/AlleyBo55/micropay-solana-x402-paywall/blob/main/docs/PAYAI_INTEGRATION.md)
+
+## 🌐 Public Facilitator Mode (New in v3.3.12)
+
+Use a public facilitator service like [x402.org](https://x402.org) or [PayAI Network](https://facilitator.payai.network) without running your own RPC node:
+
+```typescript
+import { RemoteSvmFacilitator } from '@alleyboss/micropay-solana-x402-paywall';
+
+// Use a public facilitator for verification
+const facilitator = new RemoteSvmFacilitator('https://x402.org/facilitator');
+
+// Or in middleware config
+const withMicropay = createX402Middleware({
+    walletAddress: 'YOUR_WALLET',
+    network: 'mainnet-beta',
+    facilitatorUrl: 'https://facilitator.payai.network'
+    // No rpcUrl = uses remote facilitator
+});
+```
+
+### 🆚 Verification Modes Comparison
+
+| Mode | Class | Best For |
+|------|-------|----------|
+| **Self-Sovereign** | `LocalSvmFacilitator` | Full control, privacy, production |
+| **Public Facilitator** | `RemoteSvmFacilitator` | Quick setup, no RPC management |
+
 ## 🤖 AI Agent Payments
 
 Enable autonomous AI agents to pay for premium API access.

package/dist/agent/index.d.cts

@@ -1,5 +1,5 @@
 import { Connection, Keypair } from '@solana/web3.js';
-import { S as SessionConfig, a as SessionData } from '../types-BWYQMw03.cjs';
+import { S as SessionConfig, a as SessionData } from '../types-BfKfgout.cjs';
 
 /** Configuration for priority fees */
 interface PriorityFeeConfig {

package/dist/agent/index.d.ts

@@ -1,5 +1,5 @@
 import { Connection, Keypair } from '@solana/web3.js';
-import { S as SessionConfig, a as SessionData } from '../types-BWYQMw03.js';
+import { S as SessionConfig, a as SessionData } from '../types-BfKfgout.js';
 
 /** Configuration for priority fees */
 interface PriorityFeeConfig {

package/dist/client/index.cjs

@@ -100,13 +100,9 @@ function createX402AuthorizationHeader(signature, paymentRequiredHeader) {
   const required = http.decodePaymentRequiredHeader(cleanHeader);
   const accepts = Array.isArray(required.accepts) ? required.accepts[0] : required.accepts;
   const payload = {
-    accepted: accepts,
-    client: {
-      scheme: accepts.scheme,
-      // TypeScript knows this exists on PaymentRequirements
-      network: accepts.network
-    },
-    payment: {
+    scheme: accepts.scheme,
+    network: accepts.network,
+    payload: {
       signature
     }
   };
@@ -233,20 +229,28 @@ function usePaywallResource({
   const unlock = react.useCallback(async () => {
     if (!paymentHeader || !price || !recipient) {
       setError("Missing payment requirements");
+      console.error("[usePaywallResource] Missing requirements:", { paymentHeader: !!paymentHeader, price, recipient });
       return;
     }
     setIsLoading(true);
+    console.log("[usePaywallResource] Starting unlock. Price:", price.toString(), "Recipient:", recipient);
     try {
+      console.log("[usePaywallResource] Step 1: Sending payment...");
       const { signature } = await sendSolanaPayment({
         connection,
         wallet,
         recipientAddress: recipient,
         amount: price
       });
+      console.log("[usePaywallResource] Step 1 Complete: Payment signature:", signature);
+      console.log("[usePaywallResource] Step 2: Creating auth header...");
       const authHeader = createX402AuthorizationHeader(signature, paymentHeader);
+      console.log("[usePaywallResource] Step 2 Complete: Auth header created (length:", authHeader.length, ")");
+      console.log("[usePaywallResource] Step 3: Retrying fetch with auth header...");
       await fetchData(authHeader);
+      console.log("[usePaywallResource] Step 3 Complete: Fetch completed");
     } catch (err) {
-      console.error("Unlock failed", err);
+      console.error("[usePaywallResource] Unlock failed at step:", err);
       setError(err.message || "Payment/Unlock failed");
       setIsLoading(false);
     }

package/dist/client/index.js

@@ -98,13 +98,9 @@ function createX402AuthorizationHeader(signature, paymentRequiredHeader) {
   const required = decodePaymentRequiredHeader(cleanHeader);
   const accepts = Array.isArray(required.accepts) ? required.accepts[0] : required.accepts;
   const payload = {
-    accepted: accepts,
-    client: {
-      scheme: accepts.scheme,
-      // TypeScript knows this exists on PaymentRequirements
-      network: accepts.network
-    },
-    payment: {
+    scheme: accepts.scheme,
+    network: accepts.network,
+    payload: {
       signature
     }
   };
@@ -231,20 +227,28 @@ function usePaywallResource({
   const unlock = useCallback(async () => {
     if (!paymentHeader || !price || !recipient) {
       setError("Missing payment requirements");
+      console.error("[usePaywallResource] Missing requirements:", { paymentHeader: !!paymentHeader, price, recipient });
       return;
     }
     setIsLoading(true);
+    console.log("[usePaywallResource] Starting unlock. Price:", price.toString(), "Recipient:", recipient);
     try {
+      console.log("[usePaywallResource] Step 1: Sending payment...");
       const { signature } = await sendSolanaPayment({
         connection,
         wallet,
         recipientAddress: recipient,
         amount: price
       });
+      console.log("[usePaywallResource] Step 1 Complete: Payment signature:", signature);
+      console.log("[usePaywallResource] Step 2: Creating auth header...");
       const authHeader = createX402AuthorizationHeader(signature, paymentHeader);
+      console.log("[usePaywallResource] Step 2 Complete: Auth header created (length:", authHeader.length, ")");
+      console.log("[usePaywallResource] Step 3: Retrying fetch with auth header...");
       await fetchData(authHeader);
+      console.log("[usePaywallResource] Step 3 Complete: Fetch completed");
     } catch (err) {
-      console.error("Unlock failed", err);
+      console.error("[usePaywallResource] Unlock failed at step:", err);
       setError(err.message || "Payment/Unlock failed");
       setIsLoading(false);
     }

package/dist/index.cjs

@@ -18,7 +18,6 @@ var LocalSvmFacilitator = class {
   caipFamily = "solana:*";
   connection;
   constructor(rpcUrl) {
-    console.log("[LocalSvmFacilitator] Initialized with RPC:", rpcUrl);
     this.connection = new web3_js.Connection(rpcUrl, "confirmed");
   }
   /**
@@ -102,25 +101,18 @@ var LocalSvmFacilitator = class {
   getSigners(_network) {
     return [];
   }
-  /**
-   * Enable debug logging (disable in production)
-   */
-  debug = process.env.NODE_ENV === "development";
   /**
    * Verify a payment on-chain
    */
   async verify(payload, requirements) {
     try {
-      const signature = payload.payload.signature;
+      const signature = payload.payload?.signature;
       if (!signature) {
         return { isValid: false, invalidReason: "Missing signature in payment payload" };
       }
       const payTo = requirements.payTo;
       const amountVal = requirements.amount || requirements.maxAmountRequired || "0";
       const requiredAmount = BigInt(amountVal);
-      if (this.debug) {
-        console.log(`[LocalSvmFacilitator] Verifying tx: ${signature.slice(0, 8)}...`);
-      }
       const tx = await this.fetchTransactionWithRetry(signature, 3);
       if (!tx) {
         return { isValid: false, invalidReason: "Transaction not found or not confirmed" };
@@ -136,19 +128,8 @@ var LocalSvmFacilitator = class {
             if (!payer) payer = parsed.info.source;
           }
         }
-        if ("program" in ix && (ix.program === "spl-token" || ix.program === "spl-token-2022")) {
-          const parsed = ix.parsed;
-          if (parsed?.type === "transferChecked" || parsed?.type === "transfer") {
-            if (this.debug) {
-              console.log(`[LocalSvmFacilitator] Found SPL transfer`);
-            }
-          }
-        }
       }
       if (paidAmount >= requiredAmount) {
-        if (this.debug) {
-          console.log(`[LocalSvmFacilitator] Verification SUCCESS for tx: ${signature.slice(0, 8)}...`);
-        }
         return {
           isValid: true,
           payer: payer || tx.transaction.message.accountKeys[0].pubkey.toBase58()
@@ -161,9 +142,6 @@ var LocalSvmFacilitator = class {
       };
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "Unknown error";
-      if (this.debug) {
-        console.error("[LocalSvmFacilitator] Verify error:", errorMessage);
-      }
       throw new types.VerifyError(500, {
         isValid: false,
         invalidReason: errorMessage

package/dist/index.d.cts

@@ -6,7 +6,7 @@ export * from '@x402/svm';
 export { AgentPaymentResult, CreditSessionClaims, CreditSessionConfig, CreditSessionData, CreditValidation, ExecuteAgentPaymentParams, UseCreditResult, addCredits, createCreditSession, executeAgentPayment, generateAgentKeypair, getAgentBalance, getRemainingCredits, hasAgentSufficientBalance, keypairFromBase58, useCredit, validateCreditSession } from './agent/index.cjs';
 export { CustomPriceProvider, PriceConfig, PriceData, clearPriceCache, configurePricing, formatPriceDisplay, formatPriceSync, getProviders, getSolPrice, lamportsToSol, lamportsToUsd, usdToLamports } from './pricing/index.cjs';
 import '@solana/web3.js';
-import './types-BWYQMw03.cjs';
+import './types-BfKfgout.cjs';
 
 interface FacilitatorClient$1 {
     verify(paymentPayload: PaymentPayload, paymentRequirements: PaymentRequirements): Promise<VerifyResponse>;
@@ -75,10 +75,6 @@ declare class LocalSvmFacilitator implements FacilitatorClient$1 {
      * Get default signers (not used for local verification usually, but required by interface)
      */
     getSigners(_network: string): string[];
-    /**
-     * Enable debug logging (disable in production)
-     */
-    private debug;
     /**
      * Verify a payment on-chain
      */
@@ -127,4 +123,32 @@ declare class RemoteSvmFacilitator implements FacilitatorClient {
     settle(payload: PaymentPayload, requirements: PaymentRequirements): Promise<SettleResponse>;
 }
 
-export { LocalSvmFacilitator, RemoteSvmFacilitator };
+/**
+ * PayAI Payment Format Types
+ */
+type PayAIScheme = 'exact-evm' | 'exact-svm' | string;
+type PayAINetworkId = 'base' | 'solana' | 'solana-devnet' | 'polygon-amoy' | string;
+interface PayAISvmAuthorization {
+    message?: string;
+    signatures?: string[];
+}
+interface PayAIEvmAuthorization {
+    from: string;
+    to: string;
+    value: string;
+    data: string;
+    validAfter: number;
+    validBefore: number;
+    nonce: string;
+    v: number;
+    r: string;
+    s: string;
+}
+interface PayAIPayload {
+    scheme: PayAIScheme;
+    networkId: PayAINetworkId;
+    paymentDetails?: Record<string, any>;
+    authorization: PayAISvmAuthorization | PayAIEvmAuthorization | Record<string, any>;
+}
+
+export { LocalSvmFacilitator, type PayAIEvmAuthorization, type PayAINetworkId, type PayAIPayload, type PayAIScheme, type PayAISvmAuthorization, RemoteSvmFacilitator };

package/dist/index.d.ts

@@ -6,7 +6,7 @@ export * from '@x402/svm';
 export { AgentPaymentResult, CreditSessionClaims, CreditSessionConfig, CreditSessionData, CreditValidation, ExecuteAgentPaymentParams, UseCreditResult, addCredits, createCreditSession, executeAgentPayment, generateAgentKeypair, getAgentBalance, getRemainingCredits, hasAgentSufficientBalance, keypairFromBase58, useCredit, validateCreditSession } from './agent/index.js';
 export { CustomPriceProvider, PriceConfig, PriceData, clearPriceCache, configurePricing, formatPriceDisplay, formatPriceSync, getProviders, getSolPrice, lamportsToSol, lamportsToUsd, usdToLamports } from './pricing/index.js';
 import '@solana/web3.js';
-import './types-BWYQMw03.js';
+import './types-BfKfgout.js';
 
 interface FacilitatorClient$1 {
     verify(paymentPayload: PaymentPayload, paymentRequirements: PaymentRequirements): Promise<VerifyResponse>;
@@ -75,10 +75,6 @@ declare class LocalSvmFacilitator implements FacilitatorClient$1 {
      * Get default signers (not used for local verification usually, but required by interface)
      */
     getSigners(_network: string): string[];
-    /**
-     * Enable debug logging (disable in production)
-     */
-    private debug;
     /**
      * Verify a payment on-chain
      */
@@ -127,4 +123,32 @@ declare class RemoteSvmFacilitator implements FacilitatorClient {
     settle(payload: PaymentPayload, requirements: PaymentRequirements): Promise<SettleResponse>;
 }
 
-export { LocalSvmFacilitator, RemoteSvmFacilitator };
+/**
+ * PayAI Payment Format Types
+ */
+type PayAIScheme = 'exact-evm' | 'exact-svm' | string;
+type PayAINetworkId = 'base' | 'solana' | 'solana-devnet' | 'polygon-amoy' | string;
+interface PayAISvmAuthorization {
+    message?: string;
+    signatures?: string[];
+}
+interface PayAIEvmAuthorization {
+    from: string;
+    to: string;
+    value: string;
+    data: string;
+    validAfter: number;
+    validBefore: number;
+    nonce: string;
+    v: number;
+    r: string;
+    s: string;
+}
+interface PayAIPayload {
+    scheme: PayAIScheme;
+    networkId: PayAINetworkId;
+    paymentDetails?: Record<string, any>;
+    authorization: PayAISvmAuthorization | PayAIEvmAuthorization | Record<string, any>;
+}
+
+export { LocalSvmFacilitator, type PayAIEvmAuthorization, type PayAINetworkId, type PayAIPayload, type PayAIScheme, type PayAISvmAuthorization, RemoteSvmFacilitator };

package/dist/index.js

@@ -13,7 +13,6 @@ var LocalSvmFacilitator = class {
   caipFamily = "solana:*";
   connection;
   constructor(rpcUrl) {
-    console.log("[LocalSvmFacilitator] Initialized with RPC:", rpcUrl);
     this.connection = new Connection(rpcUrl, "confirmed");
   }
   /**
@@ -97,25 +96,18 @@ var LocalSvmFacilitator = class {
   getSigners(_network) {
     return [];
   }
-  /**
-   * Enable debug logging (disable in production)
-   */
-  debug = process.env.NODE_ENV === "development";
   /**
    * Verify a payment on-chain
    */
   async verify(payload, requirements) {
     try {
-      const signature = payload.payload.signature;
+      const signature = payload.payload?.signature;
       if (!signature) {
         return { isValid: false, invalidReason: "Missing signature in payment payload" };
       }
       const payTo = requirements.payTo;
       const amountVal = requirements.amount || requirements.maxAmountRequired || "0";
       const requiredAmount = BigInt(amountVal);
-      if (this.debug) {
-        console.log(`[LocalSvmFacilitator] Verifying tx: ${signature.slice(0, 8)}...`);
-      }
       const tx = await this.fetchTransactionWithRetry(signature, 3);
       if (!tx) {
         return { isValid: false, invalidReason: "Transaction not found or not confirmed" };
@@ -131,19 +123,8 @@ var LocalSvmFacilitator = class {
             if (!payer) payer = parsed.info.source;
           }
         }
-        if ("program" in ix && (ix.program === "spl-token" || ix.program === "spl-token-2022")) {
-          const parsed = ix.parsed;
-          if (parsed?.type === "transferChecked" || parsed?.type === "transfer") {
-            if (this.debug) {
-              console.log(`[LocalSvmFacilitator] Found SPL transfer`);
-            }
-          }
-        }
       }
       if (paidAmount >= requiredAmount) {
-        if (this.debug) {
-          console.log(`[LocalSvmFacilitator] Verification SUCCESS for tx: ${signature.slice(0, 8)}...`);
-        }
         return {
           isValid: true,
           payer: payer || tx.transaction.message.accountKeys[0].pubkey.toBase58()
@@ -156,9 +137,6 @@ var LocalSvmFacilitator = class {
       };
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "Unknown error";
-      if (this.debug) {
-        console.error("[LocalSvmFacilitator] Verify error:", errorMessage);
-      }
       throw new VerifyError(500, {
         isValid: false,
         invalidReason: errorMessage

package/dist/next/index.cjs

@@ -13,7 +13,6 @@ var LocalSvmFacilitator = class {
   caipFamily = "solana:*";
   connection;
   constructor(rpcUrl) {
-    console.log("[LocalSvmFacilitator] Initialized with RPC:", rpcUrl);
     this.connection = new web3_js.Connection(rpcUrl, "confirmed");
   }
   /**
@@ -97,25 +96,18 @@ var LocalSvmFacilitator = class {
   getSigners(_network) {
     return [];
   }
-  /**
-   * Enable debug logging (disable in production)
-   */
-  debug = process.env.NODE_ENV === "development";
   /**
    * Verify a payment on-chain
    */
   async verify(payload, requirements) {
     try {
-      const signature = payload.payload.signature;
+      const signature = payload.payload?.signature;
       if (!signature) {
         return { isValid: false, invalidReason: "Missing signature in payment payload" };
       }
       const payTo = requirements.payTo;
       const amountVal = requirements.amount || requirements.maxAmountRequired || "0";
       const requiredAmount = BigInt(amountVal);
-      if (this.debug) {
-        console.log(`[LocalSvmFacilitator] Verifying tx: ${signature.slice(0, 8)}...`);
-      }
       const tx = await this.fetchTransactionWithRetry(signature, 3);
       if (!tx) {
         return { isValid: false, invalidReason: "Transaction not found or not confirmed" };
@@ -131,19 +123,8 @@ var LocalSvmFacilitator = class {
             if (!payer) payer = parsed.info.source;
           }
         }
-        if ("program" in ix && (ix.program === "spl-token" || ix.program === "spl-token-2022")) {
-          const parsed = ix.parsed;
-          if (parsed?.type === "transferChecked" || parsed?.type === "transfer") {
-            if (this.debug) {
-              console.log(`[LocalSvmFacilitator] Found SPL transfer`);
-            }
-          }
-        }
       }
       if (paidAmount >= requiredAmount) {
-        if (this.debug) {
-          console.log(`[LocalSvmFacilitator] Verification SUCCESS for tx: ${signature.slice(0, 8)}...`);
-        }
         return {
           isValid: true,
           payer: payer || tx.transaction.message.accountKeys[0].pubkey.toBase58()
@@ -156,9 +137,6 @@ var LocalSvmFacilitator = class {
       };
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "Unknown error";
-      if (this.debug) {
-        console.error("[LocalSvmFacilitator] Verify error:", errorMessage);
-      }
       throw new types.VerifyError(500, {
         isValid: false,
         invalidReason: errorMessage
@@ -220,29 +198,98 @@ var LocalSvmFacilitator = class {
 };
 
 // src/next/index.ts
+function transformPayAIToX402(payaiPayload, defaultNetwork) {
+  const { scheme, networkId, authorization } = payaiPayload;
+  const x402Scheme = scheme === "exact-svm" || scheme === "exact-evm" ? "exact" : scheme;
+  let network = defaultNetwork;
+  if (networkId === "solana") {
+    network = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
+  } else if (networkId === "solana-devnet") {
+    network = "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1";
+  }
+  let signature;
+  if (scheme === "exact-svm" && "signatures" in authorization) {
+    signature = authorization.signatures?.[0];
+  }
+  return {
+    scheme: x402Scheme,
+    network,
+    payload: {
+      signature,
+      ...authorization
+    },
+    paymentDetails: payaiPayload.paymentDetails
+  };
+}
 function createX402Middleware(config) {
+  const isLocalVerification = !!config.rpcUrl;
   let facilitatorClient;
-  if (config.rpcUrl) {
+  if (isLocalVerification) {
     facilitatorClient = new LocalSvmFacilitator(config.rpcUrl);
   } else {
     const facilitatorUrl = config.facilitatorUrl || "https://x402.org/facilitator";
-    facilitatorClient = new http.HTTPFacilitatorClient({
-      url: facilitatorUrl
-    });
+    facilitatorClient = new http.HTTPFacilitatorClient({ url: facilitatorUrl });
   }
   const server$2 = new server.x402ResourceServer(facilitatorClient);
   server$1.registerExactSvmScheme(server$2);
+  const networkId = config.network === "mainnet-beta" ? "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp" : "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1";
   return function withMicropay(handler, routeConfig) {
+    const priceValue = config.price?.toString() || "0";
+    const amountValue = (BigInt(priceValue) * BigInt(1e6)).toString();
+    const paymentSpec = {
+      scheme: "exact",
+      payTo: config.walletAddress,
+      amount: amountValue,
+      network: networkId,
+      asset: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
+      // Native SOL asset
+    };
     const finalConfig = routeConfig || {
       accepts: {
-        scheme: "exact",
-        payTo: config.walletAddress,
-        price: config.price?.toString() || "0",
-        network: config.network === "mainnet-beta" ? "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp" : "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1"
+        ...paymentSpec,
+        price: priceValue
+        // Include for x402 SDK 402 generation
       }
     };
     const wrappedHandler = next.withX402(handler, finalConfig, server$2);
     return async (req, ctx) => {
+      const authHeader = req.headers?.get?.("authorization") || req.headers?.authorization;
+      if (authHeader && authHeader.toLowerCase().startsWith("x402 ")) {
+        try {
+          const base64Payload = authHeader.slice(5);
+          const payloadJson = Buffer.from(base64Payload, "base64").toString("utf8");
+          let payload = JSON.parse(payloadJson);
+          if (payload.scheme === "exact-svm" || payload.scheme === "exact-evm") {
+            payload = transformPayAIToX402(payload, networkId);
+          }
+          const signature = payload.payload?.signature;
+          if (signature) {
+            const verifyPaymentSpec = {
+              scheme: payload.scheme || "exact",
+              network: payload.network || networkId,
+              amount: amountValue,
+              payTo: config.walletAddress
+            };
+            let verifyResult;
+            try {
+              verifyResult = await facilitatorClient.verify(payload, verifyPaymentSpec);
+            } catch (facilitatorError) {
+              if (!isLocalVerification && config.rpcUrl) {
+                const localFacilitator = new LocalSvmFacilitator(config.rpcUrl);
+                verifyResult = await localFacilitator.verify(payload, verifyPaymentSpec);
+              } else {
+                throw facilitatorError;
+              }
+            }
+            if (verifyResult.isValid) {
+              const payerAddress = verifyResult.payer || "verified";
+              req.headers.set?.("x-payment-payer", payerAddress);
+              return await handler(req, ctx);
+            }
+          }
+        } catch (parseError) {
+        }
+      }
       const compatibleReq = new Proxy(req, {
         get(target, prop) {
           if (prop === "url") {
@@ -252,6 +299,10 @@ function createX402Middleware(config) {
             const headers = target.headers;
             return new Proxy(headers, {
               get(hTarget, hProp) {
+                if (hProp === "authorization" || hProp === "Authorization") {
+                  const val3 = hTarget.get("authorization");
+                  return val3;
+                }
                 if (typeof hProp === "string" && !["get", "set", "has", "delete", "entries", "keys", "values", "forEach", "append"].includes(hProp) && typeof hTarget[hProp] === "undefined") {
                   return hTarget.get(hProp) || void 0;
                 }
@@ -264,7 +315,7 @@ function createX402Middleware(config) {
           return typeof val === "function" ? val.bind(target) : val;
         }
       });
-      return wrappedHandler(compatibleReq, ctx);
+      return await wrappedHandler(compatibleReq, ctx);
     };
   };
 }

package/dist/next/index.js

@@ -12,7 +12,6 @@ var LocalSvmFacilitator = class {
   caipFamily = "solana:*";
   connection;
   constructor(rpcUrl) {
-    console.log("[LocalSvmFacilitator] Initialized with RPC:", rpcUrl);
     this.connection = new Connection(rpcUrl, "confirmed");
   }
   /**
@@ -96,25 +95,18 @@ var LocalSvmFacilitator = class {
   getSigners(_network) {
     return [];
   }
-  /**
-   * Enable debug logging (disable in production)
-   */
-  debug = process.env.NODE_ENV === "development";
   /**
    * Verify a payment on-chain
    */
   async verify(payload, requirements) {
     try {
-      const signature = payload.payload.signature;
+      const signature = payload.payload?.signature;
       if (!signature) {
         return { isValid: false, invalidReason: "Missing signature in payment payload" };
       }
       const payTo = requirements.payTo;
       const amountVal = requirements.amount || requirements.maxAmountRequired || "0";
       const requiredAmount = BigInt(amountVal);
-      if (this.debug) {
-        console.log(`[LocalSvmFacilitator] Verifying tx: ${signature.slice(0, 8)}...`);
-      }
       const tx = await this.fetchTransactionWithRetry(signature, 3);
       if (!tx) {
         return { isValid: false, invalidReason: "Transaction not found or not confirmed" };
@@ -130,19 +122,8 @@ var LocalSvmFacilitator = class {
             if (!payer) payer = parsed.info.source;
           }
         }
-        if ("program" in ix && (ix.program === "spl-token" || ix.program === "spl-token-2022")) {
-          const parsed = ix.parsed;
-          if (parsed?.type === "transferChecked" || parsed?.type === "transfer") {
-            if (this.debug) {
-              console.log(`[LocalSvmFacilitator] Found SPL transfer`);
-            }
-          }
-        }
       }
       if (paidAmount >= requiredAmount) {
-        if (this.debug) {
-          console.log(`[LocalSvmFacilitator] Verification SUCCESS for tx: ${signature.slice(0, 8)}...`);
-        }
         return {
           isValid: true,
           payer: payer || tx.transaction.message.accountKeys[0].pubkey.toBase58()
@@ -155,9 +136,6 @@ var LocalSvmFacilitator = class {
       };
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "Unknown error";
-      if (this.debug) {
-        console.error("[LocalSvmFacilitator] Verify error:", errorMessage);
-      }
       throw new VerifyError(500, {
         isValid: false,
         invalidReason: errorMessage
@@ -219,29 +197,98 @@ var LocalSvmFacilitator = class {
 };
 
 // src/next/index.ts
+function transformPayAIToX402(payaiPayload, defaultNetwork) {
+  const { scheme, networkId, authorization } = payaiPayload;
+  const x402Scheme = scheme === "exact-svm" || scheme === "exact-evm" ? "exact" : scheme;
+  let network = defaultNetwork;
+  if (networkId === "solana") {
+    network = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
+  } else if (networkId === "solana-devnet") {
+    network = "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1";
+  }
+  let signature;
+  if (scheme === "exact-svm" && "signatures" in authorization) {
+    signature = authorization.signatures?.[0];
+  }
+  return {
+    scheme: x402Scheme,
+    network,
+    payload: {
+      signature,
+      ...authorization
+    },
+    paymentDetails: payaiPayload.paymentDetails
+  };
+}
 function createX402Middleware(config) {
+  const isLocalVerification = !!config.rpcUrl;
   let facilitatorClient;
-  if (config.rpcUrl) {
+  if (isLocalVerification) {
     facilitatorClient = new LocalSvmFacilitator(config.rpcUrl);
   } else {
     const facilitatorUrl = config.facilitatorUrl || "https://x402.org/facilitator";
-    facilitatorClient = new HTTPFacilitatorClient({
-      url: facilitatorUrl
-    });
+    facilitatorClient = new HTTPFacilitatorClient({ url: facilitatorUrl });
   }
   const server = new x402ResourceServer(facilitatorClient);
   registerExactSvmScheme(server);
+  const networkId = config.network === "mainnet-beta" ? "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp" : "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1";
   return function withMicropay(handler, routeConfig) {
+    const priceValue = config.price?.toString() || "0";
+    const amountValue = (BigInt(priceValue) * BigInt(1e6)).toString();
+    const paymentSpec = {
+      scheme: "exact",
+      payTo: config.walletAddress,
+      amount: amountValue,
+      network: networkId,
+      asset: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
+      // Native SOL asset
+    };
     const finalConfig = routeConfig || {
       accepts: {
-        scheme: "exact",
-        payTo: config.walletAddress,
-        price: config.price?.toString() || "0",
-        network: config.network === "mainnet-beta" ? "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp" : "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1"
+        ...paymentSpec,
+        price: priceValue
+        // Include for x402 SDK 402 generation
       }
     };
     const wrappedHandler = withX402$1(handler, finalConfig, server);
     return async (req, ctx) => {
+      const authHeader = req.headers?.get?.("authorization") || req.headers?.authorization;
+      if (authHeader && authHeader.toLowerCase().startsWith("x402 ")) {
+        try {
+          const base64Payload = authHeader.slice(5);
+          const payloadJson = Buffer.from(base64Payload, "base64").toString("utf8");
+          let payload = JSON.parse(payloadJson);
+          if (payload.scheme === "exact-svm" || payload.scheme === "exact-evm") {
+            payload = transformPayAIToX402(payload, networkId);
+          }
+          const signature = payload.payload?.signature;
+          if (signature) {
+            const verifyPaymentSpec = {
+              scheme: payload.scheme || "exact",
+              network: payload.network || networkId,
+              amount: amountValue,
+              payTo: config.walletAddress
+            };
+            let verifyResult;
+            try {
+              verifyResult = await facilitatorClient.verify(payload, verifyPaymentSpec);
+            } catch (facilitatorError) {
+              if (!isLocalVerification && config.rpcUrl) {
+                const localFacilitator = new LocalSvmFacilitator(config.rpcUrl);
+                verifyResult = await localFacilitator.verify(payload, verifyPaymentSpec);
+              } else {
+                throw facilitatorError;
+              }
+            }
+            if (verifyResult.isValid) {
+              const payerAddress = verifyResult.payer || "verified";
+              req.headers.set?.("x-payment-payer", payerAddress);
+              return await handler(req, ctx);
+            }
+          }
+        } catch (parseError) {
+        }
+      }
       const compatibleReq = new Proxy(req, {
         get(target, prop) {
           if (prop === "url") {
@@ -251,6 +298,10 @@ function createX402Middleware(config) {
             const headers = target.headers;
             return new Proxy(headers, {
               get(hTarget, hProp) {
+                if (hProp === "authorization" || hProp === "Authorization") {
+                  const val3 = hTarget.get("authorization");
+                  return val3;
+                }
                 if (typeof hProp === "string" && !["get", "set", "has", "delete", "entries", "keys", "values", "forEach", "append"].includes(hProp) && typeof hTarget[hProp] === "undefined") {
                   return hTarget.get(hProp) || void 0;
                 }
@@ -263,7 +314,7 @@ function createX402Middleware(config) {
           return typeof val === "function" ? val.bind(target) : val;
         }
       });
-      return wrappedHandler(compatibleReq, ctx);
+      return await wrappedHandler(compatibleReq, ctx);
     };
   };
 }

package/dist/session/index.d.cts

@@ -1,4 +1,5 @@
-import { S as SessionConfig, a as SessionData, b as SessionValidation } from '../types-BWYQMw03.cjs';
+import { S as SessionConfig, a as SessionData, b as SessionValidation } from '../types-BfKfgout.cjs';
+export { c as SessionJWTPayload } from '../types-BfKfgout.cjs';
 
 /**
  * Create a new session after successful payment
@@ -26,4 +27,4 @@ declare function addArticleToSession(token: string, articleId: string, secret: s
  */
 declare function isArticleUnlocked(token: string, articleId: string, secret: string): Promise<boolean>;
 
-export { addArticleToSession, createSession, isArticleUnlocked, validateSession };
+export { SessionConfig, SessionData, SessionValidation, addArticleToSession, createSession, isArticleUnlocked, validateSession };

package/dist/session/index.d.ts

@@ -1,4 +1,5 @@
-import { S as SessionConfig, a as SessionData, b as SessionValidation } from '../types-BWYQMw03.js';
+import { S as SessionConfig, a as SessionData, b as SessionValidation } from '../types-BfKfgout.js';
+export { c as SessionJWTPayload } from '../types-BfKfgout.js';
 
 /**
  * Create a new session after successful payment
@@ -26,4 +27,4 @@ declare function addArticleToSession(token: string, articleId: string, secret: s
  */
 declare function isArticleUnlocked(token: string, articleId: string, secret: string): Promise<boolean>;
 
-export { addArticleToSession, createSession, isArticleUnlocked, validateSession };
+export { SessionConfig, SessionData, SessionValidation, addArticleToSession, createSession, isArticleUnlocked, validateSession };

package/dist/{types-BWYQMw03.d.cts → types-BfKfgout.d.cts}

@@ -29,5 +29,20 @@ interface SessionValidation {
     /** Reason for invalid session */
     reason?: string;
 }
+/** JWT payload structure for sessions */
+interface SessionJWTPayload {
+    /** Wallet address (subject) */
+    sub: string;
+    /** Session ID */
+    sid: string;
+    /** Unlocked article IDs */
+    articles: string[];
+    /** Site-wide unlock flag */
+    siteWide: boolean;
+    /** Issued at timestamp */
+    iat: number;
+    /** Expiration timestamp */
+    exp: number;
+}
 
-export type { SessionConfig as S, SessionData as a, SessionValidation as b };
+export type { SessionConfig as S, SessionData as a, SessionValidation as b, SessionJWTPayload as c };

package/dist/{types-BWYQMw03.d.ts → types-BfKfgout.d.ts}

@@ -29,5 +29,20 @@ interface SessionValidation {
     /** Reason for invalid session */
     reason?: string;
 }
+/** JWT payload structure for sessions */
+interface SessionJWTPayload {
+    /** Wallet address (subject) */
+    sub: string;
+    /** Session ID */
+    sid: string;
+    /** Unlocked article IDs */
+    articles: string[];
+    /** Site-wide unlock flag */
+    siteWide: boolean;
+    /** Issued at timestamp */
+    iat: number;
+    /** Expiration timestamp */
+    exp: number;
+}
 
-export type { SessionConfig as S, SessionData as a, SessionValidation as b };
+export type { SessionConfig as S, SessionData as a, SessionValidation as b, SessionJWTPayload as c };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alleyboss/micropay-solana-x402-paywall",
-    "version": "3.3.11",
+    "version": "3.3.13",
     "description": "Production-ready Solana micropayments library wrapper for official x402 SDK",
     "author": "AlleyBoss",
     "license": "MIT",