uvd-x402-sdk 2.24.2 → 2.26.0

package/dist/backend/index.d.mts

@@ -266,7 +266,12 @@ declare function getCorsHeaders(origin?: string): Record<string, string>;
 interface FacilitatorClientOptions {
     /** Base URL of the facilitator (default: https://facilitator.ultravioletadao.xyz) */
     baseUrl?: string;
-    /** Request timeout in milliseconds (default: 30000) */
+    /**
+     * Request timeout in milliseconds (default: auto per network).
+     * When not set, the client uses per-network defaults from ESCROW_TIMEOUT_MS
+     * (960s for Ethereum L1, 90s for L2s, 30s for others).
+     * Set explicitly to override per-network auto-detection.
+     */
     timeout?: number;
 }
 /**
@@ -292,7 +297,12 @@ interface FacilitatorClientOptions {
 declare class FacilitatorClient {
     private readonly baseUrl;
     private readonly timeout;
+    private readonly explicitTimeout;
     constructor(options?: FacilitatorClientOptions);
+    /**
+     * Get timeout for a specific network, using per-chain defaults when no explicit timeout was set.
+     */
+    private getTimeout;
     /**
      * Verify a payment with the facilitator
      *
@@ -1560,6 +1570,12 @@ declare const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
  * As of 2026-02-03, commerce-payments contracts enforce $100 max per deposit.
  */
 declare const DEPOSIT_LIMIT_USDC = "100000000";
+/**
+ * Default facilitator request timeout per chain in milliseconds.
+ * Ethereum L1 (~12s blocks) needs much longer than L2s (~2s blocks).
+ * Timeout chain: Client > SDK > Facilitator. The facilitator uses 900s for Ethereum L1.
+ */
+declare const ESCROW_TIMEOUT_MS: Record<number, number>;
 /**
  * USDC EIP-712 domain name per chain.
  * Most chains use "USD Coin", but some (Celo, Monad, HyperEVM) use "USDC".
@@ -1696,13 +1712,19 @@ interface AdvancedEscrowClientOptions {
      * Chain ID (default: 8453 for Base Mainnet).
      * Supported chains: 8453 (Base), 84532 (Base Sepolia), 1 (Ethereum),
      * 11155111 (Ethereum Sepolia), 137 (Polygon), 42161 (Arbitrum),
-     * 42220 (Celo), 143 (Monad), 43114 (Avalanche).
+     * 10 (Optimism), 42220 (Celo), 143 (Monad), 43114 (Avalanche).
      */
     chainId?: number;
     /** Contract addresses (auto-resolved from chainId if not provided) */
     contracts?: AdvancedEscrowContracts;
     /** Gas limit for transactions (default: 300000) */
     gasLimit?: number;
+    /**
+     * Request timeout in milliseconds for facilitator HTTP calls (authorize, gasless release/refund).
+     * Default is per-network: 960s for Ethereum L1, 90s for L2s.
+     * Ethereum L1 confirmations can take several minutes under congestion.
+     */
+    timeout?: number;
 }
 /**
  * Minimal PaymentOperator ABI for the 4 on-chain functions.
@@ -1715,7 +1737,7 @@ declare const OPERATOR_ABI: string[];
  *
  * Supported chains: Base (8453), Base Sepolia (84532), Ethereum (1),
  * Ethereum Sepolia (11155111), Polygon (137), Arbitrum (42161),
- * Celo (42220), Monad (143), Avalanche (43114).
+ * Optimism (10), Celo (42220), Monad (143), Avalanche (43114).
  *
  * Contract addresses are auto-resolved from the chain ID.
  * Pass custom contracts to override.
@@ -1752,6 +1774,7 @@ declare class AdvancedEscrowClient {
     private facilitatorUrl;
     private chainId;
     private gasLimit;
+    private readonly timeout;
     private contracts;
     private signer;
     private payerAddress;
@@ -1904,4 +1927,4 @@ declare class AdvancedEscrowClient {
     refundPostEscrow(paymentInfo: AdvancedPaymentInfo, amount?: string, tokenCollector?: string, collectorData?: string): Promise<AdvancedTransactionResult>;
 }
 
-export { type AdvancedAuthorizationResult, AdvancedEscrowClient, type AdvancedEscrowClientOptions, type AdvancedEscrowContracts, type AdvancedEscrowTaskTier, type AdvancedPaymentInfo, type AdvancedTransactionResult, type AgentIdentity, type AgentRegistration, type AgentRegistrationFile, type AgentService, BASE_MAINNET_CONTRACTS, type BazaarCategory, BazaarClient, type BazaarClientOptions, type BazaarDiscoverOptions, type BazaarDiscoverResponse, type BazaarNetwork, type BazaarRegisterOptions, type BazaarResource, type BazaarToken, type CreateEscrowOptions, DEPOSIT_LIMIT_USDC, type Dispute, type DisputeOutcome, ERC8004_CONTRACTS, ERC8004_EXTENSION_ID, ESCROW_CONTRACTS, Erc8004Client, type Erc8004ClientOptions, type Erc8004Network, EscrowClient, type EscrowClientOptions, type EscrowPayment, type EscrowStateResponse, type EscrowStatus, FacilitatorClient, type FacilitatorClientOptions, type FeedbackEntry, type FeedbackParams, type FeedbackRequest, type FeedbackResponse, type IdentityMetadataResponse, type IdentityTotalSupplyResponse, type MetadataEntryParam, OPERATOR_ABI, PAYMENT_INFO_TYPEHASH, type PaymentRequirements, type PaymentRequirementsOptions, type ProofOfPayment, type RefundRequest, type RefundStatus, type RegisterAgentRequest, type RegisterAgentResponse, type ReputationResponse, type ReputationSummary, type RequestRefundOptions, type SettleRequest, type SettleResponse, type SettleResponseWithProof, TIER_TIMINGS, USDC_DOMAIN_NAME, type VerifyRequest, type VerifyResponse, X402_CORS_HEADERS, X402_HEADER_NAMES, ZERO_ADDRESS, buildErc8004PaymentRequirements, buildPaymentRequirements, buildSettleRequest, buildVerifyRequest, canRefundEscrow, canReleaseEscrow, create402Response, createPaymentMiddleware, escrowTimeRemaining, extractPaymentFromHeaders, getCorsHeaders, getEscrowContractsByChainId, getEscrowSupportedChainIds, isEscrowExpired, isEscrowSupportedOnChain, parsePaymentHeader };
+export { type AdvancedAuthorizationResult, AdvancedEscrowClient, type AdvancedEscrowClientOptions, type AdvancedEscrowContracts, type AdvancedEscrowTaskTier, type AdvancedPaymentInfo, type AdvancedTransactionResult, type AgentIdentity, type AgentRegistration, type AgentRegistrationFile, type AgentService, BASE_MAINNET_CONTRACTS, type BazaarCategory, BazaarClient, type BazaarClientOptions, type BazaarDiscoverOptions, type BazaarDiscoverResponse, type BazaarNetwork, type BazaarRegisterOptions, type BazaarResource, type BazaarToken, type CreateEscrowOptions, DEPOSIT_LIMIT_USDC, type Dispute, type DisputeOutcome, ERC8004_CONTRACTS, ERC8004_EXTENSION_ID, ESCROW_CONTRACTS, ESCROW_TIMEOUT_MS, Erc8004Client, type Erc8004ClientOptions, type Erc8004Network, EscrowClient, type EscrowClientOptions, type EscrowPayment, type EscrowStateResponse, type EscrowStatus, FacilitatorClient, type FacilitatorClientOptions, type FeedbackEntry, type FeedbackParams, type FeedbackRequest, type FeedbackResponse, type IdentityMetadataResponse, type IdentityTotalSupplyResponse, type MetadataEntryParam, OPERATOR_ABI, PAYMENT_INFO_TYPEHASH, type PaymentRequirements, type PaymentRequirementsOptions, type ProofOfPayment, type RefundRequest, type RefundStatus, type RegisterAgentRequest, type RegisterAgentResponse, type ReputationResponse, type ReputationSummary, type RequestRefundOptions, type SettleRequest, type SettleResponse, type SettleResponseWithProof, TIER_TIMINGS, USDC_DOMAIN_NAME, type VerifyRequest, type VerifyResponse, X402_CORS_HEADERS, X402_HEADER_NAMES, ZERO_ADDRESS, buildErc8004PaymentRequirements, buildPaymentRequirements, buildSettleRequest, buildVerifyRequest, canRefundEscrow, canReleaseEscrow, create402Response, createPaymentMiddleware, escrowTimeRemaining, extractPaymentFromHeaders, getCorsHeaders, getEscrowContractsByChainId, getEscrowSupportedChainIds, isEscrowExpired, isEscrowSupportedOnChain, parsePaymentHeader };

package/dist/backend/index.d.ts

@@ -266,7 +266,12 @@ declare function getCorsHeaders(origin?: string): Record<string, string>;
 interface FacilitatorClientOptions {
     /** Base URL of the facilitator (default: https://facilitator.ultravioletadao.xyz) */
     baseUrl?: string;
-    /** Request timeout in milliseconds (default: 30000) */
+    /**
+     * Request timeout in milliseconds (default: auto per network).
+     * When not set, the client uses per-network defaults from ESCROW_TIMEOUT_MS
+     * (960s for Ethereum L1, 90s for L2s, 30s for others).
+     * Set explicitly to override per-network auto-detection.
+     */
     timeout?: number;
 }
 /**
@@ -292,7 +297,12 @@ interface FacilitatorClientOptions {
 declare class FacilitatorClient {
     private readonly baseUrl;
     private readonly timeout;
+    private readonly explicitTimeout;
     constructor(options?: FacilitatorClientOptions);
+    /**
+     * Get timeout for a specific network, using per-chain defaults when no explicit timeout was set.
+     */
+    private getTimeout;
     /**
      * Verify a payment with the facilitator
      *
@@ -1560,6 +1570,12 @@ declare const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
  * As of 2026-02-03, commerce-payments contracts enforce $100 max per deposit.
  */
 declare const DEPOSIT_LIMIT_USDC = "100000000";
+/**
+ * Default facilitator request timeout per chain in milliseconds.
+ * Ethereum L1 (~12s blocks) needs much longer than L2s (~2s blocks).
+ * Timeout chain: Client > SDK > Facilitator. The facilitator uses 900s for Ethereum L1.
+ */
+declare const ESCROW_TIMEOUT_MS: Record<number, number>;
 /**
  * USDC EIP-712 domain name per chain.
  * Most chains use "USD Coin", but some (Celo, Monad, HyperEVM) use "USDC".
@@ -1696,13 +1712,19 @@ interface AdvancedEscrowClientOptions {
      * Chain ID (default: 8453 for Base Mainnet).
      * Supported chains: 8453 (Base), 84532 (Base Sepolia), 1 (Ethereum),
      * 11155111 (Ethereum Sepolia), 137 (Polygon), 42161 (Arbitrum),
-     * 42220 (Celo), 143 (Monad), 43114 (Avalanche).
+     * 10 (Optimism), 42220 (Celo), 143 (Monad), 43114 (Avalanche).
      */
     chainId?: number;
     /** Contract addresses (auto-resolved from chainId if not provided) */
     contracts?: AdvancedEscrowContracts;
     /** Gas limit for transactions (default: 300000) */
     gasLimit?: number;
+    /**
+     * Request timeout in milliseconds for facilitator HTTP calls (authorize, gasless release/refund).
+     * Default is per-network: 960s for Ethereum L1, 90s for L2s.
+     * Ethereum L1 confirmations can take several minutes under congestion.
+     */
+    timeout?: number;
 }
 /**
  * Minimal PaymentOperator ABI for the 4 on-chain functions.
@@ -1715,7 +1737,7 @@ declare const OPERATOR_ABI: string[];
  *
  * Supported chains: Base (8453), Base Sepolia (84532), Ethereum (1),
  * Ethereum Sepolia (11155111), Polygon (137), Arbitrum (42161),
- * Celo (42220), Monad (143), Avalanche (43114).
+ * Optimism (10), Celo (42220), Monad (143), Avalanche (43114).
  *
  * Contract addresses are auto-resolved from the chain ID.
  * Pass custom contracts to override.
@@ -1752,6 +1774,7 @@ declare class AdvancedEscrowClient {
     private facilitatorUrl;
     private chainId;
     private gasLimit;
+    private readonly timeout;
     private contracts;
     private signer;
     private payerAddress;
@@ -1904,4 +1927,4 @@ declare class AdvancedEscrowClient {
     refundPostEscrow(paymentInfo: AdvancedPaymentInfo, amount?: string, tokenCollector?: string, collectorData?: string): Promise<AdvancedTransactionResult>;
 }
 
-export { type AdvancedAuthorizationResult, AdvancedEscrowClient, type AdvancedEscrowClientOptions, type AdvancedEscrowContracts, type AdvancedEscrowTaskTier, type AdvancedPaymentInfo, type AdvancedTransactionResult, type AgentIdentity, type AgentRegistration, type AgentRegistrationFile, type AgentService, BASE_MAINNET_CONTRACTS, type BazaarCategory, BazaarClient, type BazaarClientOptions, type BazaarDiscoverOptions, type BazaarDiscoverResponse, type BazaarNetwork, type BazaarRegisterOptions, type BazaarResource, type BazaarToken, type CreateEscrowOptions, DEPOSIT_LIMIT_USDC, type Dispute, type DisputeOutcome, ERC8004_CONTRACTS, ERC8004_EXTENSION_ID, ESCROW_CONTRACTS, Erc8004Client, type Erc8004ClientOptions, type Erc8004Network, EscrowClient, type EscrowClientOptions, type EscrowPayment, type EscrowStateResponse, type EscrowStatus, FacilitatorClient, type FacilitatorClientOptions, type FeedbackEntry, type FeedbackParams, type FeedbackRequest, type FeedbackResponse, type IdentityMetadataResponse, type IdentityTotalSupplyResponse, type MetadataEntryParam, OPERATOR_ABI, PAYMENT_INFO_TYPEHASH, type PaymentRequirements, type PaymentRequirementsOptions, type ProofOfPayment, type RefundRequest, type RefundStatus, type RegisterAgentRequest, type RegisterAgentResponse, type ReputationResponse, type ReputationSummary, type RequestRefundOptions, type SettleRequest, type SettleResponse, type SettleResponseWithProof, TIER_TIMINGS, USDC_DOMAIN_NAME, type VerifyRequest, type VerifyResponse, X402_CORS_HEADERS, X402_HEADER_NAMES, ZERO_ADDRESS, buildErc8004PaymentRequirements, buildPaymentRequirements, buildSettleRequest, buildVerifyRequest, canRefundEscrow, canReleaseEscrow, create402Response, createPaymentMiddleware, escrowTimeRemaining, extractPaymentFromHeaders, getCorsHeaders, getEscrowContractsByChainId, getEscrowSupportedChainIds, isEscrowExpired, isEscrowSupportedOnChain, parsePaymentHeader };
+export { type AdvancedAuthorizationResult, AdvancedEscrowClient, type AdvancedEscrowClientOptions, type AdvancedEscrowContracts, type AdvancedEscrowTaskTier, type AdvancedPaymentInfo, type AdvancedTransactionResult, type AgentIdentity, type AgentRegistration, type AgentRegistrationFile, type AgentService, BASE_MAINNET_CONTRACTS, type BazaarCategory, BazaarClient, type BazaarClientOptions, type BazaarDiscoverOptions, type BazaarDiscoverResponse, type BazaarNetwork, type BazaarRegisterOptions, type BazaarResource, type BazaarToken, type CreateEscrowOptions, DEPOSIT_LIMIT_USDC, type Dispute, type DisputeOutcome, ERC8004_CONTRACTS, ERC8004_EXTENSION_ID, ESCROW_CONTRACTS, ESCROW_TIMEOUT_MS, Erc8004Client, type Erc8004ClientOptions, type Erc8004Network, EscrowClient, type EscrowClientOptions, type EscrowPayment, type EscrowStateResponse, type EscrowStatus, FacilitatorClient, type FacilitatorClientOptions, type FeedbackEntry, type FeedbackParams, type FeedbackRequest, type FeedbackResponse, type IdentityMetadataResponse, type IdentityTotalSupplyResponse, type MetadataEntryParam, OPERATOR_ABI, PAYMENT_INFO_TYPEHASH, type PaymentRequirements, type PaymentRequirementsOptions, type ProofOfPayment, type RefundRequest, type RefundStatus, type RegisterAgentRequest, type RegisterAgentResponse, type ReputationResponse, type ReputationSummary, type RequestRefundOptions, type SettleRequest, type SettleResponse, type SettleResponseWithProof, TIER_TIMINGS, USDC_DOMAIN_NAME, type VerifyRequest, type VerifyResponse, X402_CORS_HEADERS, X402_HEADER_NAMES, ZERO_ADDRESS, buildErc8004PaymentRequirements, buildPaymentRequirements, buildSettleRequest, buildVerifyRequest, canRefundEscrow, canReleaseEscrow, create402Response, createPaymentMiddleware, escrowTimeRemaining, extractPaymentFromHeaders, getCorsHeaders, getEscrowContractsByChainId, getEscrowSupportedChainIds, isEscrowExpired, isEscrowSupportedOnChain, parsePaymentHeader };

package/dist/backend/index.js

@@ -954,10 +954,26 @@ function getCorsHeaders(origin = "*") {
 var FacilitatorClient = class {
   baseUrl;
   timeout;
+  explicitTimeout;
   constructor(options = {}) {
     this.baseUrl = options.baseUrl || "https://facilitator.ultravioletadao.xyz";
+    this.explicitTimeout = options.timeout !== void 0;
     this.timeout = options.timeout || 3e4;
   }
+  /**
+   * Get timeout for a specific network, using per-chain defaults when no explicit timeout was set.
+   */
+  getTimeout(network) {
+    if (this.explicitTimeout) return this.timeout;
+    if (!network) return this.timeout;
+    const match = network.match(/^eip155:(\d+)$/);
+    if (match) {
+      const chainId = parseInt(match[1], 10);
+      return ESCROW_TIMEOUT_MS[chainId] || this.timeout;
+    }
+    if (network === "ethereum" || network === "ethereum-mainnet") return ESCROW_TIMEOUT_MS[1];
+    return this.timeout;
+  }
   /**
    * Verify a payment with the facilitator
    *
@@ -1006,8 +1022,9 @@ var FacilitatorClient = class {
    */
   async settle(paymentHeader, requirements) {
     const body = buildSettleRequest(paymentHeader, requirements);
+    const settleTimeout = this.getTimeout(requirements.network);
     const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), this.timeout);
+    const timeoutId = setTimeout(() => controller.abort(), settleTimeout);
     try {
       const response = await fetch(`${this.baseUrl}/settle`, {
         method: "POST",
@@ -2474,6 +2491,29 @@ function buildErc8004PaymentRequirements(options) {
 var PAYMENT_INFO_TYPEHASH = "0xae68ac7ce30c86ece8196b61a7c486d8f0061f575037fbd34e7fe4e2820c6591";
 var ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
 var DEPOSIT_LIMIT_USDC = "100000000";
+var ESCROW_TIMEOUT_MS = {
+  1: 96e4,
+  // Ethereum L1: 960s (facilitator uses 900s TxWatcher)
+  11155111: 96e4,
+  // Ethereum Sepolia: same as L1
+  137: 9e4,
+  // Polygon: 90s
+  8453: 9e4,
+  // Base: 90s
+  84532: 9e4,
+  // Base Sepolia: 90s
+  42161: 9e4,
+  // Arbitrum: 90s
+  10: 9e4,
+  // Optimism: 90s
+  43114: 9e4,
+  // Avalanche: 90s
+  42220: 9e4,
+  // Celo: 90s
+  143: 9e4
+  // Monad: 90s
+};
+var DEFAULT_ESCROW_TIMEOUT_MS = 3e4;
 var USDC_DOMAIN_NAME = {
   8453: "USD Coin",
   // Base Mainnet
@@ -2522,13 +2562,13 @@ var ESCROW_CONTRACTS = {
     refundRequest: "0xc1256Bb30bd0cdDa07D8C8Cf67a59105f2EA1b98",
     usdc: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238"
   },
-  // Ethereum Mainnet (chain 1)
+  // Ethereum Mainnet (chain 1) - Updated from Ali's redeploy (commit e6cf29d)
   1: {
-    operator: "0xed02d3E5167BCc9582D851885A89b050AB816a56",
-    escrow: "0xc1256Bb30bd0cdDa07D8C8Cf67a59105f2EA1b98",
-    tokenCollector: "0xE78648e7af7B1BaDE717FF6E410B922F92adE80f",
-    protocolFeeConfig: "0xb33D6502EdBbC47201cd1E53C49d703EC0a660b8",
-    refundRequest: "0xc9BbA6A2CF9838e7Dd8c19BC8B3BAC620B9D8178",
+    operator: "0x69B67962ffb7c5C7078ff348a87DF604dfA8001b",
+    escrow: "0x9D4146EF898c8E60B3e865AE254ef438E7cEd2A0",
+    tokenCollector: "0x206D4DbB6E7b876e4B5EFAAD2a04e7d7813FB6ba",
+    protocolFeeConfig: "0x5b3e33791C1764cF7e2573Bf8116F1D361FD97Cd",
+    refundRequest: "0xFa8C4Cb156053b867Ae7489220A29b5939E3Df70",
     usdc: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
   },
   // Polygon (chain 137)
@@ -2612,6 +2652,7 @@ var AdvancedEscrowClient = class {
   facilitatorUrl;
   chainId;
   gasLimit;
+  timeout;
   contracts;
   signer;
   // ethers.Signer
@@ -2621,6 +2662,7 @@ var AdvancedEscrowClient = class {
     this.facilitatorUrl = (options.facilitatorUrl || "https://facilitator.ultravioletadao.xyz").replace(/\/$/, "");
     this.chainId = options.chainId || 8453;
     this.gasLimit = options.gasLimit || 3e5;
+    this.timeout = options.timeout || ESCROW_TIMEOUT_MS[this.chainId] || DEFAULT_ESCROW_TIMEOUT_MS;
     if (options.contracts) {
       this.contracts = options.contracts;
     } else {
@@ -2800,21 +2842,44 @@ var AdvancedEscrowClient = class {
           }
         }
       };
-      const response = await fetch(`${this.facilitatorUrl}/settle`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(payload)
-      });
-      const result = await response.json();
-      if (result.success) {
-        return {
-          success: true,
-          transactionHash: result.transaction,
-          paymentInfo,
-          salt: paymentInfo.salt
-        };
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), this.timeout);
+      try {
+        const response = await fetch(`${this.facilitatorUrl}/settle`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify(payload),
+          signal: controller.signal
+        });
+        clearTimeout(timeoutId);
+        const result = await response.json();
+        if (result.success) {
+          return {
+            success: true,
+            transactionHash: result.transaction,
+            paymentInfo,
+            salt: paymentInfo.salt
+          };
+        }
+        return { success: false, error: result.errorReason };
+      } catch (fetchErr) {
+        clearTimeout(timeoutId);
+        if (fetchErr.name === "AbortError") {
+          try {
+            const state = await this.queryEscrowState(paymentInfo);
+            if (state.capturableAmount && BigInt(state.capturableAmount) > 0n) {
+              return {
+                success: true,
+                paymentInfo,
+                salt: paymentInfo.salt
+              };
+            }
+          } catch {
+          }
+          return { success: false, error: `Authorize timed out after ${this.timeout}ms. On-chain state could not confirm escrow lock.` };
+        }
+        throw fetchErr;
       }
-      return { success: false, error: result.errorReason };
     } catch (e) {
       return { success: false, error: e.message || String(e) };
     }
@@ -2930,19 +2995,38 @@ var AdvancedEscrowClient = class {
           }
         }
       };
-      const response = await fetch(`${this.facilitatorUrl}/settle`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(payload)
-      });
-      const result = await response.json();
-      if (result.success) {
-        return {
-          success: true,
-          transactionHash: result.transaction || result.transactionHash || result.transaction_hash
-        };
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), this.timeout);
+      try {
+        const response = await fetch(`${this.facilitatorUrl}/settle`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify(payload),
+          signal: controller.signal
+        });
+        clearTimeout(timeoutId);
+        const result = await response.json();
+        if (result.success) {
+          return {
+            success: true,
+            transactionHash: result.transaction || result.transactionHash || result.transaction_hash
+          };
+        }
+        return { success: false, error: result.errorReason || result.error || "Release failed" };
+      } catch (fetchErr) {
+        clearTimeout(timeoutId);
+        if (fetchErr.name === "AbortError") {
+          try {
+            const state = await this.queryEscrowState(paymentInfo);
+            if (state.capturableAmount === "0" && state.hasCollectedPayment) {
+              return { success: true };
+            }
+          } catch {
+          }
+          return { success: false, error: `Gasless release timed out after ${this.timeout}ms. Check escrow state on-chain.` };
+        }
+        throw fetchErr;
       }
-      return { success: false, error: result.errorReason || result.error || "Release failed" };
     } catch (e) {
       return { success: false, error: e.message || String(e) };
     }
@@ -3001,19 +3085,38 @@ var AdvancedEscrowClient = class {
           }
         }
       };
-      const response = await fetch(`${this.facilitatorUrl}/settle`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(payload)
-      });
-      const result = await response.json();
-      if (result.success) {
-        return {
-          success: true,
-          transactionHash: result.transaction || result.transactionHash || result.transaction_hash
-        };
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), this.timeout);
+      try {
+        const response = await fetch(`${this.facilitatorUrl}/settle`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify(payload),
+          signal: controller.signal
+        });
+        clearTimeout(timeoutId);
+        const result = await response.json();
+        if (result.success) {
+          return {
+            success: true,
+            transactionHash: result.transaction || result.transactionHash || result.transaction_hash
+          };
+        }
+        return { success: false, error: result.errorReason || result.error || "Refund failed" };
+      } catch (fetchErr) {
+        clearTimeout(timeoutId);
+        if (fetchErr.name === "AbortError") {
+          try {
+            const state = await this.queryEscrowState(paymentInfo);
+            if (state.refundableAmount === "0") {
+              return { success: true };
+            }
+          } catch {
+          }
+          return { success: false, error: `Gasless refund timed out after ${this.timeout}ms. Check escrow state on-chain.` };
+        }
+        throw fetchErr;
       }
-      return { success: false, error: result.errorReason || result.error || "Refund failed" };
     } catch (e) {
       return { success: false, error: e.message || String(e) };
     }
@@ -3172,6 +3275,7 @@ exports.DEPOSIT_LIMIT_USDC = DEPOSIT_LIMIT_USDC;
 exports.ERC8004_CONTRACTS = ERC8004_CONTRACTS;
 exports.ERC8004_EXTENSION_ID = ERC8004_EXTENSION_ID;
 exports.ESCROW_CONTRACTS = ESCROW_CONTRACTS;
+exports.ESCROW_TIMEOUT_MS = ESCROW_TIMEOUT_MS;
 exports.Erc8004Client = Erc8004Client;
 exports.EscrowClient = EscrowClient;
 exports.FacilitatorClient = FacilitatorClient;