npm - @atxp/client - Versions diffs - 0.9.1 → 0.10.0 - Mend

@atxp/client 0.9.1 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/atxpFetcher.d.ts CHANGED Viewed

@@ -11,10 +11,11 @@ import { McpError } from '@modelcontextprotocol/sdk/types.js';
  */
 export declare function atxpFetch(config: ClientConfig): FetchLike;
 export declare class ATXPFetcher {
-    protected oauthClient: OAuthClient;
+    protected oauthClient: OAuthClient | null;
     protected account: Account;
     protected destinationMakers: Map<Network, DestinationMaker>;
     protected sideChannelFetch: FetchLike;
+    protected safeFetchFn: FetchLike;
     protected db: OAuthDb;
     protected allowedAuthorizationServers: AuthorizationServerUrl[];
     protected approvePayment: (payment: ProspectivePayment) => Promise<boolean>;
@@ -39,6 +40,8 @@ export declare class ATXPFetcher {
         error: Error;
         remainingNetworks: string[];
     }) => Promise<void>;
+    protected strict: boolean;
+    protected allowInsecureRequests: boolean;
     constructor(config: {
         account: Account;
         db: OAuthDb;
@@ -71,6 +74,10 @@ export declare class ATXPFetcher {
             remainingNetworks: string[];
         }) => Promise<void>;
     });
+    /**
+     * Get or create the OAuthClient (lazy initialization to support async accountId)
+     */
+    protected getOAuthClient(): Promise<OAuthClient>;
     private defaultPaymentFailureHandler;
     protected handleMultiDestinationPayment: (paymentRequest: PaymentRequest, paymentRequestUrl: string, paymentRequestId: string) => Promise<boolean>;
     protected handlePaymentRequestError: (paymentRequestError: McpError) => Promise<boolean>;

package/dist/atxpFetcher.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"atxpFetcher.d.ts","sourceRoot":"","sources":["../src/atxpFetcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gCAAgC,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,EAGL,WAAW,EACX,sBAAsB,EACtB,SAAS,EACT,OAAO,EACP,cAAc,EAEd,MAAM,EAKN,OAAO,EACP,gBAAgB,EAChB,OAAO,EAER,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGxG,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAG9D;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,CAkBzD;AAED,qBAAa,WAAW;IACtB,SAAS,CAAC,WAAW,EAAE,WAAW,~~CAAC~~;~~IACnC~~,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAC5D,SAAS,CAAC,gBAAgB,EAAE,SAAS,CAAC;IACtC,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,2BAA2B,EAAE,sBAAsB,EAAE,CAAC;IAChE,SAAS,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5E,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE;QAAE,mBAAmB,EAAE,sBAAsB,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChH,SAAS,CAAC,kBAAkB,EAAE,CAAC,IAAI,EAAE;QAAE,mBAAmB,EAAE,sBAAsB,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrI,SAAS,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,kBAAkB,CAAC;QAAC,eAAe,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxH,SAAS,CAAC,gBAAgB,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9E,SAAS,CAAC,sBAAsB,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAC;QAAC,iBAAiB,EAAE,MAAM,EAAE,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;~~gBAC/G~~,MAAM,EAAE;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,EAAE,EAAE,OAAO,CAAC;QACZ,iBAAiB,EAAE,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAClD,OAAO,CAAC,EAAE,SAAS,CAAC;QACpB,gBAAgB,CAAC,EAAE,SAAS,CAAC;QAC7B,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,qBAAqB,CAAC,EAAE,OAAO,CAAC;QAChC,2BAA2B,CAAC,EAAE,sBAAsB,EAAE,CAAC;QACvD,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;QACnE,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;YAAE,mBAAmB,EAAE,sBAAsB,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACvG,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE;YAAE,mBAAmB,EAAE,sBAAsB,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,KAAK,CAAA;SAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5H,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE;YAAE,OAAO,EAAE,kBAAkB,CAAC;YAAC,eAAe,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/G,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACrE,sBAAsB,CAAC,EAAE,CAAC,IAAI,EAAE;YAAE,OAAO,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,KAAK,CAAC;YAAC,iBAAiB,EAAE,MAAM,EAAE,CAAA;SAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KAClH;~~IAkDD~~,OAAO,CAAC,4BAA4B,CAkClC;IAGF,SAAS,CAAC,6BAA6B,GACrC,gBAAgB,cAAc,EAC9B,mBAAmB,MAAM,EACzB,kBAAkB,MAAM,KACvB,OAAO,CAAC,OAAO,CAAC,~~CAyJlB~~;IAED,SAAS,CAAC,yBAAyB,GAAU,qBAAqB,QAAQ,KAAG,OAAO,CAAC,OAAO,CAAC,CA6B5F;IAED,SAAS,CAAC,iBAAiB,GAAU,mBAAmB,MAAM,KAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAiB9F;IAED,SAAS,CAAC,mBAAmB,GAAI,KAAK,MAAM,GAAG,GAAG,KAAG,OAAO,CAI3D;IAED,SAAS,CAAC,+BAA+B,GAAU,kBAAkB,GAAG,EAAE,cAAc,YAAY,KAAG,OAAO,CAAC,MAAM,CAAC,~~CA6DrH~~;IAED,SAAS,CAAC,aAAa,GAAU,OAAO,gCAAgC,KAAG,OAAO,CAAC,IAAI,CAAC,~~CAmDvF~~;IAED,SAAS,CAAC,aAAa,GAAU,SAAS,WAAW,EAAE,gBAAgB,MAAM,KAAG,OAAO,CAAC,WAAW,CAAC,CAKnG;IAED,SAAS,CAAC,oBAAoB,GAAU,UAAU,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CA+BzE;IAED,KAAK,EAAE,SAAS,~~CAkDf~~;CACF"}
1	+ {"version":3,"file":"atxpFetcher.d.ts","sourceRoot":"","sources":["../src/atxpFetcher.ts"],"names":[],"mappings":"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"}

package/dist/atxpFetcher.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { OAuthAuthenticationRequiredError, OAuthClient } from './oAuth.js';
-import { getErrorRecoveryHint, PAYMENT_REQUIRED_ERROR_CODE, isSSEResponse, parseMcpMessages, parsePaymentRequests, paymentRequiredError, DEFAULT_AUTHORIZATION_SERVER, ConsoleLogger, getIsReactNative, createReactNativeSafeFetch } from '@atxp/common';
+import { getErrorRecoveryHint, PAYMENT_REQUIRED_ERROR_CODE, isSSEResponse, parseMcpMessages, parsePaymentRequests, paymentRequiredError, DEFAULT_AUTHORIZATION_SERVER, ConsoleLogger, createReactNativeSafeFetch, getIsReactNative } from '@atxp/common';
 import { InsufficientFundsError, ATXPPaymentError } from './errors.js';
 import { BigNumber } from 'bignumber.js';
@@ -31,6 +31,7 @@ function atxpFetch(config) {
 }
 class ATXPFetcher {
     constructor(config) {
+        this.oauthClient = null;
         this.defaultPaymentFailureHandler = async (context) => {
             const { payment, error, attemptedNetworks, retryable } = context;
             const recoveryHint = getErrorRecoveryHint(error);
@@ -90,8 +91,9 @@ class ATXPFetcher {
             }
             // Create prospective payment for approval (using first destination for display)
             const firstDest = mappedDestinations[0];
+            const accountId = await this.account.getAccountId();
             const prospectivePayment = {
-                accountId: this.account.accountId,
+                accountId,
                 resourceUrl: paymentRequest.resource?.toString() ?? '',
                 resourceName: paymentRequest.payeeName ?? '',
                 currency: firstDest.currency,
@@ -125,7 +127,7 @@ class ATXPFetcher {
                         network: result.chain
                     });
                     // Submit payment to the server
-                    const jwt = await paymentMaker.generateJWT({ paymentRequestId, codeChallenge: '', accountId: this.account.accountId });
+                    const jwt = await paymentMaker.generateJWT({ paymentRequestId, codeChallenge: '', accountId });
                     const response = await this.sideChannelFetch(paymentRequestUrl.toString(), {
                         method: 'PUT',
                         headers: {
@@ -253,7 +255,8 @@ class ATXPFetcher {
                 const paymentMakerCount = this.account.paymentMakers.length;
                 throw new Error(`Payment maker is missing generateJWT method. Available payment maker count: ${paymentMakerCount}. This indicates the payment maker object does not implement the PaymentMaker interface. If using TypeScript, ensure your payment maker properly implements the PaymentMaker interface.`);
             }
-            const authToken = await paymentMaker.generateJWT({ paymentRequestId: '', codeChallenge: codeChallenge, accountId: this.account.accountId });
+            const accountId = await this.account.getAccountId();
+            const authToken = await paymentMaker.generateJWT({ paymentRequestId: '', codeChallenge: codeChallenge, accountId });
             // Make a fetch call to the authorization URL with the payment ID
             // redirect=false is a hack
             // The OAuth spec calls for the authorization url to return with a redirect, but fetch
@@ -307,42 +310,47 @@ class ATXPFetcher {
             if (paymentMaker) {
                 // We can do the full OAuth flow - we'll generate a signed JWT and call /authorize on the
                 // AS to get a code, then exchange the code for an access token
-                const authorizationUrl = await this.oauthClient.makeAuthorizationUrl(error.url, error.resourceServerUrl);
+                const oauthClient = await this.getOAuthClient();
+                const authorizationUrl = await oauthClient.makeAuthorizationUrl(error.url, error.resourceServerUrl);
                 if (!this.isAllowedAuthServer(authorizationUrl)) {
                     throw new Error(`ATXP: resource server ${error.url} is requesting to use ${authorizationUrl} which is not in the allowed list of authorization servers ${this.allowedAuthorizationServers.join(', ')}`);
                 }
                 try {
                     const redirectUrl = await this.makeAuthRequestWithPaymentMaker(authorizationUrl, paymentMaker);
                     // Handle the OAuth callback
-                    await this.oauthClient.handleCallback(redirectUrl);
+                    const oauthClient = await this.getOAuthClient();
+                    await oauthClient.handleCallback(redirectUrl);
                     // Call onAuthorize callback after successful authorization
+                    const accountId = await this.account.getAccountId();
                     await this.onAuthorize({
                         authorizationServer: authorizationUrl.origin,
-                        userId: this.account.accountId
+                        userId: accountId
                     });
                 }
                 catch (authError) {
                     // Call onAuthorizeFailure callback if authorization fails
+                    const accountId = await this.account.getAccountId();
                     await this.onAuthorizeFailure({
                         authorizationServer: authorizationUrl.origin,
-                        userId: this.account.accountId,
+                        userId: accountId,
                         error: authError
                     });
                     throw authError;
                 }
             }
             else {
-                // Else, we'll see if we've already got an OAuth token from OUR caller (if any).
+                // Else, we'll see if we've already got an OAuth token from OUR caller (if any).
                 // If we do, we'll use it to auth to the downstream resource
                 // (In pass-through scenarios, the atxpServer() middleware stores the incoming
                 // token in the DB under the '' resource URL).
-                const existingToken = await this.db.getAccessToken(this.account.accountId, '');
+                const accountId = await this.account.getAccountId();
+                const existingToken = await this.db.getAccessToken(accountId, '');
                 if (!existingToken) {
                     this.logger.info(`ATXP: no token found for the current server - we can't exchange a token if we don't have one`);
                     throw error;
                 }
                 const newToken = await this.exchangeToken(existingToken, error.resourceServerUrl);
-                this.db.saveAccessToken(this.account.accountId, error.resourceServerUrl, newToken);
+                this.db.saveAccessToken(accountId, error.resourceServerUrl, newToken);
             }
         };
         this.exchangeToken = async (myToken, newResourceUrl) => {
@@ -386,9 +394,10 @@ class ATXPFetcher {
         this.fetch = async (url, init) => {
             let response = null;
             let fetchError = null;
+            const oauthClient = await this.getOAuthClient();
             try {
                 // Try to fetch the resource
-                response = await this.oauthClient.fetch(url, init);
+                response = await oauthClient.fetch(url, init);
                 await this.checkForATXPResponse(response);
                 return response;
             }
@@ -400,7 +409,7 @@ class ATXPFetcher {
                     await this.authToService(error);
                     try {
                         // Retry the request once - we should be auth'd now
-                        response = await this.oauthClient.fetch(url, init);
+                        response = await oauthClient.fetch(url, init);
                         await this.checkForATXPResponse(response);
                         return response;
                     }
@@ -416,7 +425,7 @@ class ATXPFetcher {
                     this.logger.info(`Payment required - ATXP client starting payment flow ${mcpError?.data?.paymentRequestUrl}`);
                     if (await this.handlePaymentRequestError(mcpError)) {
                         // Retry the request once - we should be auth'd now
-                        response = await this.oauthClient.fetch(url, init);
+                        response = await oauthClient.fetch(url, init);
                         await this.checkForATXPResponse(response);
                     }
                     else {
@@ -435,26 +444,15 @@ class ATXPFetcher {
         };
         const { account, db, destinationMakers, fetchFn = fetch, sideChannelFetch = fetchFn, strict = true, allowInsecureRequests = process.env.NODE_ENV === 'development', allowedAuthorizationServers = [DEFAULT_AUTHORIZATION_SERVER], approvePayment = async () => true, logger = new ConsoleLogger(), onAuthorize = async () => { }, onAuthorizeFailure = async () => { }, onPayment = async () => { }, onPaymentFailure, onPaymentAttemptFailed } = config;
         // Use React Native safe fetch if in React Native environment
-        const safeFetchFn = getIsReactNative() ? createReactNativeSafeFetch(fetchFn) : fetchFn;
+        this.safeFetchFn = getIsReactNative() ? createReactNativeSafeFetch(fetchFn) : fetchFn;
         const safeSideChannelFetch = getIsReactNative() ? createReactNativeSafeFetch(sideChannelFetch) : sideChannelFetch;
-        // ATXPClient should never actually use the callback url - instead of redirecting the user to
-        // an authorization url which redirects back to the callback url, ATXPClient posts the payment
-        // directly to the authorization server, then does the token exchange itself
-        this.oauthClient = new OAuthClient({
-            userId: account.accountId,
-            db,
-            callbackUrl: 'http://localhost:3000/unused-dummy-atxp-callback',
-            isPublic: false,
-            fetchFn: safeFetchFn,
-            sideChannelFetch: safeSideChannelFetch,
-            strict,
-            allowInsecureRequests,
-            logger: logger
-        });
+        // OAuthClient is initialized lazily in getOAuthClient() since it needs async accountId
         this.account = account;
         this.destinationMakers = destinationMakers;
         this.sideChannelFetch = safeSideChannelFetch;
         this.db = db;
+        this.strict = strict;
+        this.allowInsecureRequests = allowInsecureRequests;
         this.allowedAuthorizationServers = allowedAuthorizationServers;
         this.approvePayment = approvePayment;
         this.logger = logger;
@@ -464,6 +462,27 @@ class ATXPFetcher {
         this.onPaymentFailure = onPaymentFailure || this.defaultPaymentFailureHandler;
         this.onPaymentAttemptFailed = onPaymentAttemptFailed;
     }
+    /**
+     * Get or create the OAuthClient (lazy initialization to support async accountId)
+     */
+    async getOAuthClient() {
+        if (this.oauthClient) {
+            return this.oauthClient;
+        }
+        const accountId = await this.account.getAccountId();
+        this.oauthClient = new OAuthClient({
+            userId: accountId,
+            db: this.db,
+            callbackUrl: 'http://localhost:3000/unused-dummy-atxp-callback',
+            isPublic: false,
+            fetchFn: this.safeFetchFn,
+            sideChannelFetch: this.sideChannelFetch,
+            strict: this.strict,
+            allowInsecureRequests: this.allowInsecureRequests,
+            logger: this.logger
+        });
+        return this.oauthClient;
+    }
 }
 export { ATXPFetcher, atxpFetch };

package/dist/atxpFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"atxpFetcher.js","sources":["../src/atxpFetcher.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"atxpFetcher.js","sources":["../src/atxpFetcher.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/dist/index.cjs CHANGED Viewed

@@ -473,6 +473,7 @@ function atxpFetch(config) {
 }
 class ATXPFetcher {
     constructor(config) {
+        this.oauthClient = null;
         this.defaultPaymentFailureHandler = async (context) => {
             const { payment, error, attemptedNetworks, retryable } = context;
             const recoveryHint = common.getErrorRecoveryHint(error);
@@ -532,8 +533,9 @@ class ATXPFetcher {
             }
             // Create prospective payment for approval (using first destination for display)
             const firstDest = mappedDestinations[0];
+            const accountId = await this.account.getAccountId();
             const prospectivePayment = {
-                accountId: this.account.accountId,
+                accountId,
                 resourceUrl: paymentRequest.resource?.toString() ?? '',
                 resourceName: paymentRequest.payeeName ?? '',
                 currency: firstDest.currency,
@@ -567,7 +569,7 @@ class ATXPFetcher {
                         network: result.chain
                     });
                     // Submit payment to the server
-                    const jwt = await paymentMaker.generateJWT({ paymentRequestId, codeChallenge: '', accountId: this.account.accountId });
+                    const jwt = await paymentMaker.generateJWT({ paymentRequestId, codeChallenge: '', accountId });
                     const response = await this.sideChannelFetch(paymentRequestUrl.toString(), {
                         method: 'PUT',
                         headers: {
@@ -695,7 +697,8 @@ class ATXPFetcher {
                 const paymentMakerCount = this.account.paymentMakers.length;
                 throw new Error(`Payment maker is missing generateJWT method. Available payment maker count: ${paymentMakerCount}. This indicates the payment maker object does not implement the PaymentMaker interface. If using TypeScript, ensure your payment maker properly implements the PaymentMaker interface.`);
             }
-            const authToken = await paymentMaker.generateJWT({ paymentRequestId: '', codeChallenge: codeChallenge, accountId: this.account.accountId });
+            const accountId = await this.account.getAccountId();
+            const authToken = await paymentMaker.generateJWT({ paymentRequestId: '', codeChallenge: codeChallenge, accountId });
             // Make a fetch call to the authorization URL with the payment ID
             // redirect=false is a hack
             // The OAuth spec calls for the authorization url to return with a redirect, but fetch
@@ -749,42 +752,47 @@ class ATXPFetcher {
             if (paymentMaker) {
                 // We can do the full OAuth flow - we'll generate a signed JWT and call /authorize on the
                 // AS to get a code, then exchange the code for an access token
-                const authorizationUrl = await this.oauthClient.makeAuthorizationUrl(error.url, error.resourceServerUrl);
+                const oauthClient = await this.getOAuthClient();
+                const authorizationUrl = await oauthClient.makeAuthorizationUrl(error.url, error.resourceServerUrl);
                 if (!this.isAllowedAuthServer(authorizationUrl)) {
                     throw new Error(`ATXP: resource server ${error.url} is requesting to use ${authorizationUrl} which is not in the allowed list of authorization servers ${this.allowedAuthorizationServers.join(', ')}`);
                 }
                 try {
                     const redirectUrl = await this.makeAuthRequestWithPaymentMaker(authorizationUrl, paymentMaker);
                     // Handle the OAuth callback
-                    await this.oauthClient.handleCallback(redirectUrl);
+                    const oauthClient = await this.getOAuthClient();
+                    await oauthClient.handleCallback(redirectUrl);
                     // Call onAuthorize callback after successful authorization
+                    const accountId = await this.account.getAccountId();
                     await this.onAuthorize({
                         authorizationServer: authorizationUrl.origin,
-                        userId: this.account.accountId
+                        userId: accountId
                     });
                 }
                 catch (authError) {
                     // Call onAuthorizeFailure callback if authorization fails
+                    const accountId = await this.account.getAccountId();
                     await this.onAuthorizeFailure({
                         authorizationServer: authorizationUrl.origin,
-                        userId: this.account.accountId,
+                        userId: accountId,
                         error: authError
                     });
                     throw authError;
                 }
             }
             else {
-                // Else, we'll see if we've already got an OAuth token from OUR caller (if any).
+                // Else, we'll see if we've already got an OAuth token from OUR caller (if any).
                 // If we do, we'll use it to auth to the downstream resource
                 // (In pass-through scenarios, the atxpServer() middleware stores the incoming
                 // token in the DB under the '' resource URL).
-                const existingToken = await this.db.getAccessToken(this.account.accountId, '');
+                const accountId = await this.account.getAccountId();
+                const existingToken = await this.db.getAccessToken(accountId, '');
                 if (!existingToken) {
                     this.logger.info(`ATXP: no token found for the current server - we can't exchange a token if we don't have one`);
                     throw error;
                 }
                 const newToken = await this.exchangeToken(existingToken, error.resourceServerUrl);
-                this.db.saveAccessToken(this.account.accountId, error.resourceServerUrl, newToken);
+                this.db.saveAccessToken(accountId, error.resourceServerUrl, newToken);
             }
         };
         this.exchangeToken = async (myToken, newResourceUrl) => {
@@ -828,9 +836,10 @@ class ATXPFetcher {
         this.fetch = async (url, init) => {
             let response = null;
             let fetchError = null;
+            const oauthClient = await this.getOAuthClient();
             try {
                 // Try to fetch the resource
-                response = await this.oauthClient.fetch(url, init);
+                response = await oauthClient.fetch(url, init);
                 await this.checkForATXPResponse(response);
                 return response;
             }
@@ -842,7 +851,7 @@ class ATXPFetcher {
                     await this.authToService(error);
                     try {
                         // Retry the request once - we should be auth'd now
-                        response = await this.oauthClient.fetch(url, init);
+                        response = await oauthClient.fetch(url, init);
                         await this.checkForATXPResponse(response);
                         return response;
                     }
@@ -858,7 +867,7 @@ class ATXPFetcher {
                     this.logger.info(`Payment required - ATXP client starting payment flow ${mcpError?.data?.paymentRequestUrl}`);
                     if (await this.handlePaymentRequestError(mcpError)) {
                         // Retry the request once - we should be auth'd now
-                        response = await this.oauthClient.fetch(url, init);
+                        response = await oauthClient.fetch(url, init);
                         await this.checkForATXPResponse(response);
                     }
                     else {
@@ -877,26 +886,15 @@ class ATXPFetcher {
         };
         const { account, db, destinationMakers, fetchFn = fetch, sideChannelFetch = fetchFn, strict = true, allowInsecureRequests = process.env.NODE_ENV === 'development', allowedAuthorizationServers = [common.DEFAULT_AUTHORIZATION_SERVER], approvePayment = async () => true, logger = new common.ConsoleLogger(), onAuthorize = async () => { }, onAuthorizeFailure = async () => { }, onPayment = async () => { }, onPaymentFailure, onPaymentAttemptFailed } = config;
         // Use React Native safe fetch if in React Native environment
-        const safeFetchFn = common.getIsReactNative() ? common.createReactNativeSafeFetch(fetchFn) : fetchFn;
+        this.safeFetchFn = common.getIsReactNative() ? common.createReactNativeSafeFetch(fetchFn) : fetchFn;
         const safeSideChannelFetch = common.getIsReactNative() ? common.createReactNativeSafeFetch(sideChannelFetch) : sideChannelFetch;
-        // ATXPClient should never actually use the callback url - instead of redirecting the user to
-        // an authorization url which redirects back to the callback url, ATXPClient posts the payment
-        // directly to the authorization server, then does the token exchange itself
-        this.oauthClient = new OAuthClient({
-            userId: account.accountId,
-            db,
-            callbackUrl: 'http://localhost:3000/unused-dummy-atxp-callback',
-            isPublic: false,
-            fetchFn: safeFetchFn,
-            sideChannelFetch: safeSideChannelFetch,
-            strict,
-            allowInsecureRequests,
-            logger: logger
-        });
+        // OAuthClient is initialized lazily in getOAuthClient() since it needs async accountId
         this.account = account;
         this.destinationMakers = destinationMakers;
         this.sideChannelFetch = safeSideChannelFetch;
         this.db = db;
+        this.strict = strict;
+        this.allowInsecureRequests = allowInsecureRequests;
         this.allowedAuthorizationServers = allowedAuthorizationServers;
         this.approvePayment = approvePayment;
         this.logger = logger;
@@ -906,6 +904,27 @@ class ATXPFetcher {
         this.onPaymentFailure = onPaymentFailure || this.defaultPaymentFailureHandler;
         this.onPaymentAttemptFailed = onPaymentAttemptFailed;
     }
+    /**
+     * Get or create the OAuthClient (lazy initialization to support async accountId)
+     */
+    async getOAuthClient() {
+        if (this.oauthClient) {
+            return this.oauthClient;
+        }
+        const accountId = await this.account.getAccountId();
+        this.oauthClient = new OAuthClient({
+            userId: accountId,
+            db: this.db,
+            callbackUrl: 'http://localhost:3000/unused-dummy-atxp-callback',
+            isPublic: false,
+            fetchFn: this.safeFetchFn,
+            sideChannelFetch: this.sideChannelFetch,
+            strict: this.strict,
+            allowInsecureRequests: this.allowInsecureRequests,
+            logger: this.logger
+        });
+        return this.oauthClient;
+    }
 }
 var util$1;