@atxp/client 0.10.11 → 0.10.13

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Account, Logger, FetchLike, Currency, Network, DestinationMaker, AuthorizationServerUrl, AccountId, OAuthDb, ProtocolFlag, OAuthResourceClient, ClientCredentials, PKCEValues, AccessToken, PaymentRequestOption, Source, Destination, PaymentProtocol, AuthorizeResult } from '@atxp/common';
+import { Account, Logger, FetchLike, Currency, Network, DestinationMaker, AuthorizationServerUrl, AccountId, OAuthDb, ProtocolFlag, OAuthResourceClient, ClientCredentials, PKCEValues, AccessToken, PaymentRequestOption, Source, Destination, AuthorizeResult } from '@atxp/common';
 export { ATXPAccount, Account, AuthorizeResult, PaymentMaker } from '@atxp/common';
 import { ClientOptions, Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { Implementation } from '@modelcontextprotocol/sdk/types.js';
@@ -468,9 +468,6 @@ declare class PassthroughDestinationMaker implements DestinationMaker {
     makeDestinations(option: PaymentRequestOption, _logger: Logger, _paymentRequestId: string, _sources: Source[]): Promise<Destination[]>;
 }
 
-interface X402ProtocolHandlerConfig {
-    accountsServer?: string;
-}
 /**
  * Protocol handler for X402 payment challenges.
  *
@@ -479,8 +476,6 @@ interface X402ProtocolHandlerConfig {
  */
 declare class X402ProtocolHandler implements ProtocolHandler {
     readonly protocol = "x402";
-    private accountsServer;
-    constructor(config?: X402ProtocolHandlerConfig);
     canHandle(response: Response): Promise<boolean>;
     handlePaymentChallenge(response: Response, originalRequest: {
         url: string | URL;
@@ -505,12 +500,6 @@ declare class ATXPProtocolHandler implements ProtocolHandler {
     private extractPaymentRequests;
 }
 
-/**
- * Configuration for MPP protocol handler.
- */
-interface MPPProtocolHandlerConfig {
-    accountsServer?: string;
-}
 /**
  * Protocol handler for MPP (Machine Payments Protocol) payment challenges.
  *
@@ -518,13 +507,11 @@ interface MPPProtocolHandlerConfig {
  * 1. HTTP level: HTTP 402 with WWW-Authenticate: Payment header
  * 2. MCP level: JSON-RPC error with code -32042 containing MPP data
  *
- * Handles the challenge by calling /authorize/mpp on the accounts service
+ * Handles the challenge by calling /authorize/auto on the accounts service
  * and retrying with an Authorization: Payment header.
  */
 declare class MPPProtocolHandler implements ProtocolHandler {
     readonly protocol = "mpp";
-    private accountsServer;
-    constructor(config?: MPPProtocolHandlerConfig);
     canHandle(response: Response): Promise<boolean>;
     handlePaymentChallenge(response: Response, originalRequest: {
         url: string | URL;
@@ -558,50 +545,6 @@ declare class MPPProtocolHandler implements ProtocolHandler {
  * @returns New Headers object with protocol-specific payment headers added
  */
 declare function buildPaymentHeaders(result: AuthorizeResult, originalHeaders?: HeadersInit): Headers;
-/**
- * Client for authorizing payments.
- *
- * Resolves the payment protocol via protocolFlag, then delegates to
- * account.authorize() for the actual authorization logic.
- */
-declare class PaymentClient {
-    private protocolFlag?;
-    private logger;
-    constructor(config: {
-        protocolFlag?: ProtocolFlag;
-        logger: Logger;
-        /** @deprecated No longer used — authorization delegates to account.authorize() */
-        accountsServer?: string;
-        /** @deprecated No longer used — authorization delegates to account.authorize() */
-        fetchFn?: FetchLike;
-    });
-    /**
-     * Authorize a payment by delegating to the account's authorize method.
-     *
-     * PaymentClient resolves the protocol (via explicit param or protocolFlag),
-     * then delegates all protocol-specific logic to account.authorize().
-     *
-     * @param params.account - The account to authorize the payment through
-     * @param params.userId - Passed to protocolFlag for protocol selection
-     * @param params.destination - Payment destination address
-     * @param params.protocol - Explicit protocol override (skips protocolFlag)
-     * @param params.amount - Payment amount
-     * @param params.memo - Payment memo
-     * @param params.paymentRequirements - X402 payment requirements
-     * @param params.challenge - MPP challenge object
-     * @returns AuthorizeResult with protocol and opaque credential
-     */
-    authorize(params: {
-        account: Account;
-        userId: string;
-        destination: string;
-        protocol?: PaymentProtocol;
-        amount?: BigNumber;
-        memo?: string;
-        paymentRequirements?: unknown;
-        challenge?: unknown;
-    }): Promise<AuthorizeResult>;
-}
 
-export { ATXPDestinationMaker, ATXPLocalAccount, ATXPPaymentError, ATXPProtocolHandler, DEFAULT_CLIENT_CONFIG, GasEstimationError, InsufficientFundsError, MPPProtocolHandler, OAuthAuthenticationRequiredError, OAuthClient, POLYGON_AMOY, POLYGON_MAINNET, PassthroughDestinationMaker, PaymentClient, PaymentExpiredError, PaymentNetworkError, PaymentServerError, RpcError, TransactionRevertedError, USDC_CONTRACT_ADDRESS_POLYGON_AMOY, USDC_CONTRACT_ADDRESS_POLYGON_MAINNET, USDC_CONTRACT_ADDRESS_WORLD_MAINNET, USDC_CONTRACT_ADDRESS_WORLD_SEPOLIA, UnsupportedCurrencyError, UserRejectedError, WORLD_CHAIN_MAINNET, WORLD_CHAIN_SEPOLIA, X402ProtocolHandler, atxpClient, atxpFetch, buildClientConfig, buildPaymentHeaders, buildStreamableTransport, getPolygonAmoyWithRPC, getPolygonByChainId, getPolygonMainnetWithRPC, getPolygonUSDCAddress, getWorldChainByChainId, getWorldChainMainnetWithRPC, getWorldChainSepoliaWithRPC, getWorldChainUSDCAddress };
+export { ATXPDestinationMaker, ATXPLocalAccount, ATXPPaymentError, ATXPProtocolHandler, DEFAULT_CLIENT_CONFIG, GasEstimationError, InsufficientFundsError, MPPProtocolHandler, OAuthAuthenticationRequiredError, OAuthClient, POLYGON_AMOY, POLYGON_MAINNET, PassthroughDestinationMaker, PaymentExpiredError, PaymentNetworkError, PaymentServerError, RpcError, TransactionRevertedError, USDC_CONTRACT_ADDRESS_POLYGON_AMOY, USDC_CONTRACT_ADDRESS_POLYGON_MAINNET, USDC_CONTRACT_ADDRESS_WORLD_MAINNET, USDC_CONTRACT_ADDRESS_WORLD_SEPOLIA, UnsupportedCurrencyError, UserRejectedError, WORLD_CHAIN_MAINNET, WORLD_CHAIN_SEPOLIA, X402ProtocolHandler, atxpClient, atxpFetch, buildClientConfig, buildPaymentHeaders, buildStreamableTransport, getPolygonAmoyWithRPC, getPolygonByChainId, getPolygonMainnetWithRPC, getPolygonUSDCAddress, getWorldChainByChainId, getWorldChainMainnetWithRPC, getWorldChainSepoliaWithRPC, getWorldChainUSDCAddress };
 export type { AccountIdString, ClientArgs, ClientConfig, FetchWrapper, Hex, OAuthClientConfig, PaymentFailureContext, PolygonChain, ProspectivePayment, ProtocolConfig, ProtocolHandler, WorldChain };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,wBAAwB,EACxB,UAAU,EACX,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,gCAAgC,EAChC,KAAK,iBAAiB,EACtB,WAAW,EACZ,MAAM,YAAY,CAAC;AAGpB,OAAO,EACL,SAAS,EACV,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,WAAW,EACZ,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,mCAAmC,EACnC,mCAAmC,EACnC,mBAAmB,EACnB,mBAAmB,EACnB,2BAA2B,EAC3B,2BAA2B,EAC3B,sBAAsB,EACtB,wBAAwB,EACxB,KAAK,UAAU,EAChB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,qCAAqC,EACrC,kCAAkC,EAClC,eAAe,EACf,YAAY,EACZ,wBAAwB,EACxB,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,KAAK,YAAY,EAClB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACL,KAAK,GAAG,EACR,KAAK,eAAe,EACpB,KAAK,OAAO,EACZ,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,YAAY,EAClB,MAAM,YAAY,CAAC;AAGpB,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,EACxB,wBAAwB,EACxB,kBAAkB,EAClB,QAAQ,EACR,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,aAAa,CAAC;AAGrB,OAAO,EACL,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACL,oBAAoB,EACpB,2BAA2B,GAC5B,MAAM,8BAA8B,CAAC;AAGtC,YAAY,EACV,eAAe,EACf,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EACL,aAAa,EACb,mBAAmB,EACnB,KAAK,eAAe,EACrB,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,wBAAwB,EACxB,UAAU,EACX,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,gCAAgC,EAChC,KAAK,iBAAiB,EACtB,WAAW,EACZ,MAAM,YAAY,CAAC;AAGpB,OAAO,EACL,SAAS,EACV,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,WAAW,EACZ,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,mCAAmC,EACnC,mCAAmC,EACnC,mBAAmB,EACnB,mBAAmB,EACnB,2BAA2B,EAC3B,2BAA2B,EAC3B,sBAAsB,EACtB,wBAAwB,EACxB,KAAK,UAAU,EAChB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,qCAAqC,EACrC,kCAAkC,EAClC,eAAe,EACf,YAAY,EACZ,wBAAwB,EACxB,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,KAAK,YAAY,EAClB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACL,KAAK,GAAG,EACR,KAAK,eAAe,EACpB,KAAK,OAAO,EACZ,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,YAAY,EAClB,MAAM,YAAY,CAAC;AAGpB,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,EACxB,wBAAwB,EACxB,kBAAkB,EAClB,QAAQ,EACR,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,aAAa,CAAC;AAGrB,OAAO,EACL,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACL,oBAAoB,EACpB,2BAA2B,GAC5B,MAAM,8BAA8B,CAAC;AAGtC,YAAY,EACV,eAAe,EACf,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EACL,mBAAmB,EACnB,KAAK,eAAe,EACrB,MAAM,qBAAqB,CAAC"}

package/dist/index.js

@@ -24967,49 +24967,6 @@ function buildPaymentHeaders(result, originalHeaders) {
     }
     return headers;
 }
-/**
- * Client for authorizing payments.
- *
- * Resolves the payment protocol via protocolFlag, then delegates to
- * account.authorize() for the actual authorization logic.
- */
-class PaymentClient {
-    constructor(config) {
-        this.protocolFlag = config.protocolFlag;
-        this.logger = config.logger;
-    }
-    /**
-     * Authorize a payment by delegating to the account's authorize method.
-     *
-     * PaymentClient resolves the protocol (via explicit param or protocolFlag),
-     * then delegates all protocol-specific logic to account.authorize().
-     *
-     * @param params.account - The account to authorize the payment through
-     * @param params.userId - Passed to protocolFlag for protocol selection
-     * @param params.destination - Payment destination address
-     * @param params.protocol - Explicit protocol override (skips protocolFlag)
-     * @param params.amount - Payment amount
-     * @param params.memo - Payment memo
-     * @param params.paymentRequirements - X402 payment requirements
-     * @param params.challenge - MPP challenge object
-     * @returns AuthorizeResult with protocol and opaque credential
-     */
-    async authorize(params) {
-        const { account, userId, destination } = params;
-        // Determine protocol
-        const protocol = params.protocol
-            ?? (this.protocolFlag ? this.protocolFlag(userId, destination) : 'atxp');
-        // Delegate to the account's authorize method
-        return account.authorize({
-            protocol,
-            amount: params.amount,
-            destination,
-            memo: params.memo,
-            paymentRequirements: params.paymentRequirements,
-            challenge: params.challenge,
-        });
-    }
-}
 
 function isX402Challenge(obj) {
     if (typeof obj !== 'object' || obj === null)
@@ -25025,9 +24982,8 @@ function isX402Challenge(obj) {
  * Creates payment headers using the x402 library and retries the request.
  */
 class X402ProtocolHandler {
-    constructor(config) {
+    constructor() {
         this.protocol = 'x402';
-        this.accountsServer = config?.accountsServer ?? 'https://accounts.atxp.ai';
     }
     async canHandle(response) {
         if (response.status !== 402)
@@ -25093,16 +25049,9 @@ class X402ProtocolHandler {
             // Authorize via account.authorize() — ATXPAccount calls the accounts
             // service, BaseAccount signs locally. No fallback — each account type
             // handles authorization according to its capabilities.
-            const client = new PaymentClient({
-                accountsServer: this.accountsServer,
-                logger,
-                fetchFn,
-            });
-            const authorizeResult = await client.authorize({
-                account,
-                userId: accountId,
+            const authorizeResult = await account.authorize({
+                protocols: ['x402'],
                 destination: url,
-                protocol: 'x402',
                 paymentRequirements: selectedPaymentRequirements,
             });
             const paymentHeader = authorizeResult.credential;
@@ -25251,13 +25200,12 @@ class ATXPProtocolHandler {
  * 1. HTTP level: HTTP 402 with WWW-Authenticate: Payment header
  * 2. MCP level: JSON-RPC error with code -32042 containing MPP data
  *
- * Handles the challenge by calling /authorize/mpp on the accounts service
+ * Handles the challenge by calling /authorize/auto on the accounts service
  * and retrying with an Authorization: Payment header.
  */
 class MPPProtocolHandler {
-    constructor(config) {
+    constructor() {
         this.protocol = 'mpp';
-        this.accountsServer = config?.accountsServer ?? 'https://accounts.atxp.ai';
     }
     async canHandle(response) {
         if (hasMPPChallenge(response))
@@ -25363,20 +25311,12 @@ class MPPProtocolHandler {
     async authorizeAndRetry(challenge, prospectivePayment, originalRequest, config, bodyText, originalResponse) {
         const { account, logger, fetchFn, onPayment } = config;
         try {
-            logger.debug('MPP: calling /authorize/mpp on accounts service');
-            const client = new PaymentClient({
-                accountsServer: this.accountsServer,
-                logger,
-                fetchFn,
-            });
-            const accountId = await account.getAccountId();
+            logger.debug('MPP: calling /authorize/auto on accounts service');
             let authorizeResult;
             try {
-                authorizeResult = await client.authorize({
-                    account,
-                    userId: accountId,
+                authorizeResult = await account.authorize({
+                    protocols: ['mpp'],
                     destination: typeof originalRequest.url === 'string' ? originalRequest.url : originalRequest.url.toString(),
-                    protocol: 'mpp',
                     challenge,
                 });
             }
@@ -25384,7 +25324,7 @@ class MPPProtocolHandler {
                 // AuthorizationError = server rejected the request (HTTP error from accounts)
                 // Other errors = data validation or network failure
                 if (authorizeError instanceof AuthorizationError) {
-                    logger.debug(`MPP: /authorize/mpp rejected (${authorizeError.statusCode}), returning original response`);
+                    logger.debug(`MPP: authorize rejected (${authorizeError.statusCode}), returning original response`);
                     return this.reconstructResponse(bodyText, originalResponse);
                 }
                 throw authorizeError;
@@ -25419,5 +25359,5 @@ class MPPProtocolHandler {
     }
 }
 
-export { ATXPDestinationMaker, ATXPLocalAccount, ATXPPaymentError, ATXPProtocolHandler, DEFAULT_CLIENT_CONFIG, GasEstimationError, InsufficientFundsError, MPPProtocolHandler, OAuthAuthenticationRequiredError, OAuthClient, POLYGON_AMOY, POLYGON_MAINNET, PassthroughDestinationMaker, PaymentClient, PaymentExpiredError, PaymentNetworkError, PaymentServerError, RpcError, TransactionRevertedError, USDC_CONTRACT_ADDRESS_POLYGON_AMOY, USDC_CONTRACT_ADDRESS_POLYGON_MAINNET, USDC_CONTRACT_ADDRESS_WORLD_MAINNET, USDC_CONTRACT_ADDRESS_WORLD_SEPOLIA, UnsupportedCurrencyError, UserRejectedError, WORLD_CHAIN_MAINNET, WORLD_CHAIN_SEPOLIA, X402ProtocolHandler, atxpClient, atxpFetch, buildClientConfig, buildPaymentHeaders, buildStreamableTransport, getPolygonAmoyWithRPC, getPolygonByChainId, getPolygonMainnetWithRPC, getPolygonUSDCAddress, getWorldChainByChainId, getWorldChainMainnetWithRPC, getWorldChainSepoliaWithRPC, getWorldChainUSDCAddress };
+export { ATXPDestinationMaker, ATXPLocalAccount, ATXPPaymentError, ATXPProtocolHandler, DEFAULT_CLIENT_CONFIG, GasEstimationError, InsufficientFundsError, MPPProtocolHandler, OAuthAuthenticationRequiredError, OAuthClient, POLYGON_AMOY, POLYGON_MAINNET, PassthroughDestinationMaker, PaymentExpiredError, PaymentNetworkError, PaymentServerError, RpcError, TransactionRevertedError, USDC_CONTRACT_ADDRESS_POLYGON_AMOY, USDC_CONTRACT_ADDRESS_POLYGON_MAINNET, USDC_CONTRACT_ADDRESS_WORLD_MAINNET, USDC_CONTRACT_ADDRESS_WORLD_SEPOLIA, UnsupportedCurrencyError, UserRejectedError, WORLD_CHAIN_MAINNET, WORLD_CHAIN_SEPOLIA, X402ProtocolHandler, atxpClient, atxpFetch, buildClientConfig, buildPaymentHeaders, buildStreamableTransport, getPolygonAmoyWithRPC, getPolygonByChainId, getPolygonMainnetWithRPC, getPolygonUSDCAddress, getWorldChainByChainId, getWorldChainMainnetWithRPC, getWorldChainSepoliaWithRPC, getWorldChainUSDCAddress };
 //# sourceMappingURL=index.js.map