@zeroxyz/sdk 0.13.0 → 0.14.0

package/dist/{chunk-CYB4Y3ID.js → chunk-FWHVWIO2.js}

@@ -6,7 +6,6 @@ import { x402Client } from '@x402/core/client';
 import { x402HTTPClient, decodePaymentResponseHeader, encodePaymentRequiredHeader } from '@x402/core/http';
 import { registerExactEvmScheme } from '@x402/evm/exact/client';
 import { createSIWxClientHook } from '@x402/extensions/sign-in-with-x';
-import { wrapFetchWithPayment } from '@x402/fetch';
 import { Receipt, Challenge } from 'mppx';
 import { Mppx, tempo } from 'mppx/client';
 import { createHash } from 'crypto';
@@ -698,6 +697,9 @@ var Payments = class {
       input.walletAddress
     );
     let capturedAmount = null;
+    let pendingAmountUnits = 0n;
+    let identityChallengeHandled = false;
+    let paidChallengeHandled = false;
     let capturedNetwork;
     let preflightError = null;
     const x402 = registerExactEvmScheme(new x402Client(), { signer: account });
@@ -726,11 +728,25 @@ var Payments = class {
         };
       }
       const rawAmountUnits = BigInt(rawAmount);
-      capturedAmount = formatUnits(rawAmountUnits, 6);
+      pendingAmountUnits = rawAmountUnits;
+      const challengeAmount = formatUnits(rawAmountUnits, 6);
+      if (rawAmountUnits === 0n) {
+        if (identityChallengeHandled || paidChallengeHandled) {
+          return {
+            abort: true,
+            reason: "Only one zero-value identity challenge is allowed, and it must precede payment."
+          };
+        }
+      } else if (paidChallengeHandled) {
+        return {
+          abort: true,
+          reason: "A positive-value x402 payment was already attempted for this fetch; refusing a second charge."
+        };
+      }
       if (maxPayUnits !== null && rawAmountUnits > maxPayUnits) {
         return {
           abort: true,
-          reason: `Payment of ${capturedAmount} USDC exceeds maxPay ${input.maxPay}`
+          reason: `Payment of ${challengeAmount} USDC exceeds maxPay ${input.maxPay}`
         };
       }
       const detected = networkToChain(capturedNetwork);
@@ -750,9 +766,10 @@ var Payments = class {
       }
       if (balance !== null && balance < rawAmountUnits) {
         const have = formatUnits(balance, 6);
+        const requiredAmount = formatUnits(rawAmountUnits, 6);
         preflightError = new ZeroInsufficientFundsError(
-          `wallet has ${have} USDC on Base, needs ${capturedAmount}.`,
-          { have, need: capturedAmount }
+          `wallet has ${have} USDC on Base, needs ${requiredAmount}.`,
+          { have, need: requiredAmount }
         );
         return { abort: true, reason: preflightError.message };
       }
@@ -763,18 +780,64 @@ var Payments = class {
     const httpClient = new x402HTTPClient(x402).onPaymentRequired(
       createSIWxClientHook(account)
     );
-    const wrappedFetch = wrapFetchWithPayment(
-      withSynthesizedX402Header(configuredFetch),
-      httpClient
-    );
+    const paymentFetch = withSynthesizedX402Header(configuredFetch);
     let response;
     try {
-      response = await wrappedFetch(input.url, {
+      const request2 = new Request(input.url, {
         method: input.method ?? "GET",
         headers: input.headers,
         body: input.body,
         signal: input.signal
       });
+      response = await paymentFetch(request2.clone());
+      for (let paymentStage = 0; paymentStage < 2; paymentStage++) {
+        if (response.status !== 402) break;
+        const parseChallenge = async (challengeResponse) => {
+          let body;
+          try {
+            const text = await challengeResponse.clone().text();
+            if (text) body = JSON.parse(text);
+          } catch {
+          }
+          return httpClient.getPaymentRequiredResponse(
+            (name) => challengeResponse.headers.get(name),
+            body
+          );
+        };
+        let paymentRequired = await parseChallenge(response);
+        const hookHeaders = await httpClient.handlePaymentRequired(paymentRequired);
+        if (hookHeaders) {
+          const hookRequest = request2.clone();
+          for (const [key, value] of Object.entries(hookHeaders)) {
+            hookRequest.headers.set(key, value);
+          }
+          response = await paymentFetch(hookRequest);
+          if (response.status === 402) {
+            paymentRequired = await parseChallenge(response);
+          } else {
+            break;
+          }
+        }
+        pendingAmountUnits = 0n;
+        const paymentPayload = await x402.createPaymentPayload(paymentRequired);
+        if (pendingAmountUnits === 0n) {
+          identityChallengeHandled = true;
+          capturedAmount = "0";
+        } else {
+          paidChallengeHandled = true;
+          capturedAmount = formatUnits(pendingAmountUnits, 6);
+        }
+        const paymentHeaders = httpClient.encodePaymentSignatureHeader(paymentPayload);
+        const paidRequest = request2.clone();
+        for (const [key, value] of Object.entries(paymentHeaders)) {
+          paidRequest.headers.set(key, value);
+        }
+        paidRequest.headers.set(
+          "Access-Control-Expose-Headers",
+          "PAYMENT-RESPONSE,X-PAYMENT-RESPONSE"
+        );
+        response = await paymentFetch(paidRequest);
+      }
     } catch (err) {
       if (preflightError) throw preflightError;
       if (err instanceof ZeroError) throw err;
@@ -1342,8 +1405,17 @@ var cancelBody2 = (response) => {
   } catch {
   }
 };
-var detectPaymentRequirement = async (response) => {
+var detectPaymentRequirement = async (response, preferredProtocol) => {
   if (response.status !== 402) return null;
+  const wwwAuth = response.headers.get("www-authenticate");
+  const advertisesMpp = wwwAuth ? splitWwwAuthenticateChallenges(wwwAuth).some((challenge) => {
+    const scheme = challenge.trim().split(/\s+/)[0]?.toLowerCase() ?? "";
+    return MPP_SCHEME_TOKENS.has(scheme);
+  }) : false;
+  if (preferredProtocol === "mpp") {
+    cancelBody2(response);
+    return advertisesMpp ? { protocol: "mpp", raw: { "www-authenticate": wwwAuth } } : { protocol: "unknown", raw: { requestedProtocol: "mpp" } };
+  }
   const x402Header = response.headers.get("payment-required") ?? response.headers.get("x-payment-required");
   if (x402Header) {
     cancelBody2(response);
@@ -1373,15 +1445,13 @@ var detectPaymentRequirement = async (response) => {
     } catch {
     }
   }
-  const wwwAuth = response.headers.get("www-authenticate");
-  if (wwwAuth) {
-    const schemes = splitWwwAuthenticateChallenges(wwwAuth).map(
-      (challenge) => challenge.trim().split(/\s+/)[0]?.toLowerCase() ?? ""
-    );
-    if (schemes.some((scheme) => MPP_SCHEME_TOKENS.has(scheme))) {
-      cancelBody2(response);
-      return { protocol: "mpp", raw: { "www-authenticate": wwwAuth } };
-    }
+  if (preferredProtocol === "x402") {
+    cancelBody2(response);
+    return { protocol: "unknown", raw: { requestedProtocol: "x402" } };
+  }
+  if (advertisesMpp) {
+    cancelBody2(response);
+    return { protocol: "mpp", raw: { "www-authenticate": wwwAuth } };
   }
   cancelBody2(response);
   return { protocol: "unknown", raw: {} };
@@ -1707,7 +1777,10 @@ var clientFetch = async (client, url, opts = {}) => {
     return result2;
   }
   if (response.status === 402) {
-    const requirement = await detectPaymentRequirement(response);
+    const requirement = await detectPaymentRequirement(
+      response,
+      opts.paymentProtocol
+    );
     if (requirement?.protocol === "x402" || requirement?.protocol === "mpp") {
       const payCall = requirement.protocol === "x402" ? client.payments.pay : client.payments.payMpp;
       try {
@@ -1779,7 +1852,7 @@ var clientFetch = async (client, url, opts = {}) => {
     } else if (requirement?.protocol === "unknown") {
       const result2 = errorFetchResult(
         startedAt,
-        "Capability returned 402 with an unrecognized payment protocol. Neither x402 nor MPP markers were detected in the response headers or body.",
+        opts.paymentProtocol ? `Capability did not advertise the requested ${opts.paymentProtocol} payment protocol.` : "Capability returned 402 with an unrecognized payment protocol. Neither x402 nor MPP markers were detected in the response headers or body.",
         "unrecognized_402_protocol",
         capabilityIdRequested,
         "payment_failed",
@@ -1963,7 +2036,7 @@ var clientFetch = async (client, url, opts = {}) => {
 
 // package.json
 var package_default = {
-  version: "0.13.0"};
+  version: "0.14.0"};
 
 // src/version.ts
 var SDK_VERSION = package_default.version;
@@ -3914,5 +3987,5 @@ var ZeroClient = class _ZeroClient {
 };
 
 export { Auth, AuthAgent, AuthDevice, BUG_REPORT_CATEGORIES, BugReports, Capabilities, DEFAULT_BASE_URL, DEFAULT_MAX_RETRIES, DEFAULT_TIMEOUT_MS, FETCH_SKIP_REASONS, FETCH_WARNINGS, Payments, Runs, SDK_VERSION, TEMPO_CHAIN_ID2 as TEMPO_CHAIN_ID, TEMPO_TESTNET_CHAIN_ID, USDC_BASE, USDC_DECIMALS, USDC_TEMPO, Wallet, ZeroAgentAuthError, ZeroApiError, ZeroAuthError, ZeroClient, ZeroConfigurationError, ZeroError, ZeroPaymentError, ZeroSessionCloseFailedError, ZeroTimeoutError, ZeroValidationError, ZeroWalletError, asSchemaNode, coerceTempoChainId, createManagedAccount, extractInputEnvelope, isShortToken, normalizeTransportEnvelopeRequest, paymentHasAnchor, tempoChainLabelFromId, unwrapTransportEnvelope };
-//# sourceMappingURL=chunk-CYB4Y3ID.js.map
-//# sourceMappingURL=chunk-CYB4Y3ID.js.map
+//# sourceMappingURL=chunk-FWHVWIO2.js.map
+//# sourceMappingURL=chunk-FWHVWIO2.js.map