@atxp/client 0.8.2 → 0.8.3
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.
- package/dist/atxpFetcher.d.ts +3 -3
- package/dist/atxpFetcher.d.ts.map +1 -1
- package/dist/atxpFetcher.js +21 -21
- package/dist/atxpFetcher.js.map +1 -1
- package/dist/clientTestHelpers.d.ts.map +1 -1
- package/dist/index.cjs +23 -22
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +23 -22
- package/dist/index.js.map +1 -1
- package/dist/oAuth.d.ts.map +1 -1
- package/dist/oAuth.js +2 -1
- package/dist/oAuth.js.map +1 -1
- package/package.json +2 -2
package/dist/atxpFetcher.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { OAuthAuthenticationRequiredError, OAuthClient } from './oAuth.js';
|
|
2
|
-
import { AccessToken, AuthorizationServerUrl, FetchLike, OAuthDb,
|
|
2
|
+
import { AccessToken, AuthorizationServerUrl, FetchLike, OAuthDb, PaymentRequest, Logger, Network, DestinationMaker, Account } from '@atxp/common';
|
|
3
3
|
import type { PaymentMaker, ProspectivePayment, ClientConfig } from './types.js';
|
|
4
4
|
import { McpError } from '@modelcontextprotocol/sdk/types.js';
|
|
5
5
|
/**
|
|
@@ -64,9 +64,9 @@ export declare class ATXPFetcher {
|
|
|
64
64
|
}) => Promise<void>;
|
|
65
65
|
});
|
|
66
66
|
private defaultPaymentFailureHandler;
|
|
67
|
-
protected handleMultiDestinationPayment: (
|
|
67
|
+
protected handleMultiDestinationPayment: (paymentRequest: PaymentRequest, paymentRequestUrl: string, paymentRequestId: string) => Promise<boolean>;
|
|
68
68
|
protected handlePaymentRequestError: (paymentRequestError: McpError) => Promise<boolean>;
|
|
69
|
-
protected
|
|
69
|
+
protected getPaymentRequest: (paymentRequestUrl: string) => Promise<PaymentRequest | null>;
|
|
70
70
|
protected isAllowedAuthServer: (url: string | URL) => boolean;
|
|
71
71
|
protected makeAuthRequestWithPaymentMaker: (authorizationUrl: URL, paymentMaker: PaymentMaker) => Promise<string>;
|
|
72
72
|
protected authToService: (error: OAuthAuthenticationRequiredError) => Promise<void>;
|
|
@@ -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,EAAqD,WAAW,EAAE,sBAAsB,EAAE,SAAS,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"atxpFetcher.d.ts","sourceRoot":"","sources":["../src/atxpFetcher.ts"],"names":[],"mappings":"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"}
|
package/dist/atxpFetcher.js
CHANGED
|
@@ -47,16 +47,16 @@ class ATXPFetcher {
|
|
|
47
47
|
this.logger.info(`PAYMENT FAILED: ${error.message}`);
|
|
48
48
|
}
|
|
49
49
|
};
|
|
50
|
-
this.handleMultiDestinationPayment = async (
|
|
51
|
-
if (!
|
|
50
|
+
this.handleMultiDestinationPayment = async (paymentRequest, paymentRequestUrl, paymentRequestId) => {
|
|
51
|
+
if (!paymentRequest.options || paymentRequest.options.length === 0) {
|
|
52
52
|
return false;
|
|
53
53
|
}
|
|
54
54
|
// Get sources from the account
|
|
55
55
|
const sources = await this.account.getSources();
|
|
56
|
-
// Apply destination mappers to transform
|
|
57
|
-
// Convert
|
|
56
|
+
// Apply destination mappers to transform options
|
|
57
|
+
// Convert PaymentRequestOption[] to Destination[] for mapper compatibility
|
|
58
58
|
const mappedDestinations = [];
|
|
59
|
-
for (const option of
|
|
59
|
+
for (const option of paymentRequest.options) {
|
|
60
60
|
const destinationMaker = this.destinationMakers.get(option.network);
|
|
61
61
|
if (!destinationMaker) {
|
|
62
62
|
this.logger.debug(`ATXP: destination maker for network '${option.network}' not available, trying next destination`);
|
|
@@ -78,11 +78,11 @@ class ATXPFetcher {
|
|
|
78
78
|
const firstDest = mappedDestinations[0];
|
|
79
79
|
const prospectivePayment = {
|
|
80
80
|
accountId: this.account.accountId,
|
|
81
|
-
resourceUrl:
|
|
82
|
-
resourceName:
|
|
81
|
+
resourceUrl: paymentRequest.resource?.toString() ?? '',
|
|
82
|
+
resourceName: paymentRequest.payeeName ?? '',
|
|
83
83
|
currency: firstDest.currency,
|
|
84
84
|
amount: firstDest.amount,
|
|
85
|
-
iss:
|
|
85
|
+
iss: paymentRequest.payeeName ?? '',
|
|
86
86
|
};
|
|
87
87
|
// Ask for approval once for all payment attempts
|
|
88
88
|
if (!await this.approvePayment(prospectivePayment)) {
|
|
@@ -95,7 +95,7 @@ class ATXPFetcher {
|
|
|
95
95
|
for (const paymentMaker of this.account.paymentMakers) {
|
|
96
96
|
try {
|
|
97
97
|
// Pass all destinations to payment maker - it will filter and pick the one it can handle
|
|
98
|
-
const result = await paymentMaker.makePayment(mappedDestinations,
|
|
98
|
+
const result = await paymentMaker.makePayment(mappedDestinations, paymentRequest.payeeName ?? '', paymentRequestId);
|
|
99
99
|
if (result === null) {
|
|
100
100
|
this.logger.debug(`ATXP: payment maker cannot handle these destinations, trying next`);
|
|
101
101
|
continue; // Try next payment maker
|
|
@@ -159,28 +159,28 @@ class ATXPFetcher {
|
|
|
159
159
|
this.logger.info(`ATXP: payment requirement is not allowed on this server`);
|
|
160
160
|
return false;
|
|
161
161
|
}
|
|
162
|
-
const
|
|
163
|
-
if (!
|
|
162
|
+
const paymentRequest = await this.getPaymentRequest(paymentRequestUrl);
|
|
163
|
+
if (!paymentRequest) {
|
|
164
164
|
throw new Error(`ATXP: payment request ${paymentRequestId} not found on server ${paymentRequestUrl}`);
|
|
165
165
|
}
|
|
166
|
-
// Handle multi-
|
|
167
|
-
if (
|
|
168
|
-
return this.handleMultiDestinationPayment(
|
|
166
|
+
// Handle multi-option format
|
|
167
|
+
if (paymentRequest.options && paymentRequest.options.length > 0) {
|
|
168
|
+
return this.handleMultiDestinationPayment(paymentRequest, paymentRequestUrl, paymentRequestId);
|
|
169
169
|
}
|
|
170
|
-
// Payment request doesn't have
|
|
171
|
-
throw new Error(`ATXP: payment request does not contain
|
|
170
|
+
// Payment request doesn't have options - this shouldn't happen with new SDK
|
|
171
|
+
throw new Error(`ATXP: payment request does not contain options array`);
|
|
172
172
|
};
|
|
173
|
-
this.
|
|
173
|
+
this.getPaymentRequest = async (paymentRequestUrl) => {
|
|
174
174
|
const prRequest = await this.sideChannelFetch(paymentRequestUrl);
|
|
175
175
|
if (!prRequest.ok) {
|
|
176
176
|
throw new Error(`ATXP: GET ${paymentRequestUrl} failed: ${prRequest.status} ${prRequest.statusText}`);
|
|
177
177
|
}
|
|
178
178
|
const paymentRequest = await prRequest.json();
|
|
179
179
|
// Parse amount strings to BigNumber objects
|
|
180
|
-
if (paymentRequest.
|
|
181
|
-
for (const
|
|
182
|
-
if (typeof
|
|
183
|
-
|
|
180
|
+
if (paymentRequest.options) {
|
|
181
|
+
for (const option of paymentRequest.options) {
|
|
182
|
+
if (typeof option.amount === 'string' || typeof option.amount === 'number') {
|
|
183
|
+
option.amount = new BigNumber(option.amount);
|
|
184
184
|
}
|
|
185
185
|
}
|
|
186
186
|
}
|
package/dist/atxpFetcher.js.map
CHANGED
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientTestHelpers.d.ts","sourceRoot":"","sources":["../src/clientTestHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,GAAE,MAA8B,EAAE,YAAY,GAAE,MAAe,EAAE,aAAa,GAAE,MAAqC,aAqB/K;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,GAAE,MAAqC,EAAE,eAAe,GAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAM,
|
|
1
|
+
{"version":3,"file":"clientTestHelpers.d.ts","sourceRoot":"","sources":["../src/clientTestHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,GAAE,MAA8B,EAAE,YAAY,GAAE,MAAe,EAAE,aAAa,GAAE,MAAqC,aAqB/K;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,GAAE,MAAqC,EAAE,eAAe,GAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAM,aA0ExJ"}
|
package/dist/index.cjs
CHANGED
|
@@ -73,7 +73,8 @@ class OAuthClient extends common.OAuthResourceClient {
|
|
|
73
73
|
strict,
|
|
74
74
|
allowInsecureRequests,
|
|
75
75
|
clientName,
|
|
76
|
-
logger
|
|
76
|
+
logger,
|
|
77
|
+
registrationType: 'client'
|
|
77
78
|
});
|
|
78
79
|
this.extractResourceUrl = (response) => {
|
|
79
80
|
if (response.status !== 401) {
|
|
@@ -368,16 +369,16 @@ class ATXPFetcher {
|
|
|
368
369
|
this.logger.info(`PAYMENT FAILED: ${error.message}`);
|
|
369
370
|
}
|
|
370
371
|
};
|
|
371
|
-
this.handleMultiDestinationPayment = async (
|
|
372
|
-
if (!
|
|
372
|
+
this.handleMultiDestinationPayment = async (paymentRequest, paymentRequestUrl, paymentRequestId) => {
|
|
373
|
+
if (!paymentRequest.options || paymentRequest.options.length === 0) {
|
|
373
374
|
return false;
|
|
374
375
|
}
|
|
375
376
|
// Get sources from the account
|
|
376
377
|
const sources = await this.account.getSources();
|
|
377
|
-
// Apply destination mappers to transform
|
|
378
|
-
// Convert
|
|
378
|
+
// Apply destination mappers to transform options
|
|
379
|
+
// Convert PaymentRequestOption[] to Destination[] for mapper compatibility
|
|
379
380
|
const mappedDestinations = [];
|
|
380
|
-
for (const option of
|
|
381
|
+
for (const option of paymentRequest.options) {
|
|
381
382
|
const destinationMaker = this.destinationMakers.get(option.network);
|
|
382
383
|
if (!destinationMaker) {
|
|
383
384
|
this.logger.debug(`ATXP: destination maker for network '${option.network}' not available, trying next destination`);
|
|
@@ -399,11 +400,11 @@ class ATXPFetcher {
|
|
|
399
400
|
const firstDest = mappedDestinations[0];
|
|
400
401
|
const prospectivePayment = {
|
|
401
402
|
accountId: this.account.accountId,
|
|
402
|
-
resourceUrl:
|
|
403
|
-
resourceName:
|
|
403
|
+
resourceUrl: paymentRequest.resource?.toString() ?? '',
|
|
404
|
+
resourceName: paymentRequest.payeeName ?? '',
|
|
404
405
|
currency: firstDest.currency,
|
|
405
406
|
amount: firstDest.amount,
|
|
406
|
-
iss:
|
|
407
|
+
iss: paymentRequest.payeeName ?? '',
|
|
407
408
|
};
|
|
408
409
|
// Ask for approval once for all payment attempts
|
|
409
410
|
if (!await this.approvePayment(prospectivePayment)) {
|
|
@@ -416,7 +417,7 @@ class ATXPFetcher {
|
|
|
416
417
|
for (const paymentMaker of this.account.paymentMakers) {
|
|
417
418
|
try {
|
|
418
419
|
// Pass all destinations to payment maker - it will filter and pick the one it can handle
|
|
419
|
-
const result = await paymentMaker.makePayment(mappedDestinations,
|
|
420
|
+
const result = await paymentMaker.makePayment(mappedDestinations, paymentRequest.payeeName ?? '', paymentRequestId);
|
|
420
421
|
if (result === null) {
|
|
421
422
|
this.logger.debug(`ATXP: payment maker cannot handle these destinations, trying next`);
|
|
422
423
|
continue; // Try next payment maker
|
|
@@ -480,28 +481,28 @@ class ATXPFetcher {
|
|
|
480
481
|
this.logger.info(`ATXP: payment requirement is not allowed on this server`);
|
|
481
482
|
return false;
|
|
482
483
|
}
|
|
483
|
-
const
|
|
484
|
-
if (!
|
|
484
|
+
const paymentRequest = await this.getPaymentRequest(paymentRequestUrl);
|
|
485
|
+
if (!paymentRequest) {
|
|
485
486
|
throw new Error(`ATXP: payment request ${paymentRequestId} not found on server ${paymentRequestUrl}`);
|
|
486
487
|
}
|
|
487
|
-
// Handle multi-
|
|
488
|
-
if (
|
|
489
|
-
return this.handleMultiDestinationPayment(
|
|
488
|
+
// Handle multi-option format
|
|
489
|
+
if (paymentRequest.options && paymentRequest.options.length > 0) {
|
|
490
|
+
return this.handleMultiDestinationPayment(paymentRequest, paymentRequestUrl, paymentRequestId);
|
|
490
491
|
}
|
|
491
|
-
// Payment request doesn't have
|
|
492
|
-
throw new Error(`ATXP: payment request does not contain
|
|
492
|
+
// Payment request doesn't have options - this shouldn't happen with new SDK
|
|
493
|
+
throw new Error(`ATXP: payment request does not contain options array`);
|
|
493
494
|
};
|
|
494
|
-
this.
|
|
495
|
+
this.getPaymentRequest = async (paymentRequestUrl) => {
|
|
495
496
|
const prRequest = await this.sideChannelFetch(paymentRequestUrl);
|
|
496
497
|
if (!prRequest.ok) {
|
|
497
498
|
throw new Error(`ATXP: GET ${paymentRequestUrl} failed: ${prRequest.status} ${prRequest.statusText}`);
|
|
498
499
|
}
|
|
499
500
|
const paymentRequest = await prRequest.json();
|
|
500
501
|
// Parse amount strings to BigNumber objects
|
|
501
|
-
if (paymentRequest.
|
|
502
|
-
for (const
|
|
503
|
-
if (typeof
|
|
504
|
-
|
|
502
|
+
if (paymentRequest.options) {
|
|
503
|
+
for (const option of paymentRequest.options) {
|
|
504
|
+
if (typeof option.amount === 'string' || typeof option.amount === 'number') {
|
|
505
|
+
option.amount = new BigNumber.BigNumber(option.amount);
|
|
505
506
|
}
|
|
506
507
|
}
|
|
507
508
|
}
|