@atxp/client 0.2.9 → 0.2.11
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/README.md +2 -2
- package/dist/atxpAccount.d.ts +2 -2
- package/dist/atxpAccount.d.ts.map +1 -1
- package/dist/atxpAccount.js +2 -2
- package/dist/atxpAccount.js.map +1 -1
- package/dist/atxpFetcher.d.ts +1 -0
- package/dist/atxpFetcher.d.ts.map +1 -1
- package/dist/atxpFetcher.js +19 -2
- package/dist/atxpFetcher.js.map +1 -1
- package/dist/baseAccount.d.ts +2 -2
- package/dist/baseAccount.d.ts.map +1 -1
- package/dist/baseAccount.js.map +1 -1
- package/dist/basePaymentMaker.d.ts +4 -4
- package/dist/basePaymentMaker.d.ts.map +1 -1
- package/dist/basePaymentMaker.js +49 -27
- package/dist/basePaymentMaker.js.map +1 -1
- package/dist/setup.expo.js +0 -12
- package/dist/setup.expo.js.map +1 -1
- package/dist/solanaPaymentMaker.d.ts +2 -1
- package/dist/solanaPaymentMaker.d.ts.map +1 -1
- package/dist/solanaPaymentMaker.js +37 -18
- package/dist/solanaPaymentMaker.js.map +1 -1
- package/dist/types.d.ts +13 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +21 -1
- package/dist/types.js.map +1 -1
- package/package.json +3 -5
package/README.md
CHANGED
|
@@ -46,8 +46,8 @@ const result = await client.callTool('hello_world', {
|
|
|
46
46
|
|
|
47
47
|
## Platform Support
|
|
48
48
|
|
|
49
|
-
- **Node.js**: Full support with
|
|
50
|
-
- **React Native/Expo**: Requires `expo-crypto`
|
|
49
|
+
- **Node.js**: Full support with in-memory OAuth database (install `@atxp/sqlite` for persistence)
|
|
50
|
+
- **React Native/Expo**: Requires `expo-crypto` peer dependency
|
|
51
51
|
|
|
52
52
|
## Authentication Flow
|
|
53
53
|
|
package/dist/atxpAccount.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Account, PaymentMaker } from './types.js';
|
|
2
|
-
import type { FetchLike } from '@atxp/common';
|
|
2
|
+
import type { FetchLike, Network } from '@atxp/common';
|
|
3
3
|
export declare class ATXPAccount implements Account {
|
|
4
4
|
accountId: string;
|
|
5
5
|
paymentMakers: {
|
|
@@ -7,7 +7,7 @@ export declare class ATXPAccount implements Account {
|
|
|
7
7
|
};
|
|
8
8
|
constructor(connectionString: string, opts?: {
|
|
9
9
|
fetchFn?: FetchLike;
|
|
10
|
-
network?:
|
|
10
|
+
network?: Network;
|
|
11
11
|
});
|
|
12
12
|
}
|
|
13
13
|
//# sourceMappingURL=atxpAccount.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atxpAccount.d.ts","sourceRoot":"","sources":["../src/atxpAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"atxpAccount.d.ts","sourceRoot":"","sources":["../src/atxpAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAY,MAAM,cAAc,CAAA;AAgFhE,qBAAa,WAAY,YAAW,OAAO;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;gBAEnC,gBAAgB,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,SAAS,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE;CAWxF"}
|
package/dist/atxpAccount.js
CHANGED
|
@@ -21,7 +21,7 @@ class ATXPHttpPaymentMaker {
|
|
|
21
21
|
async makePayment(amount, currency, receiver, memo) {
|
|
22
22
|
const body = {
|
|
23
23
|
amount: amount.toString(),
|
|
24
|
-
currency
|
|
24
|
+
currency,
|
|
25
25
|
receiver,
|
|
26
26
|
memo,
|
|
27
27
|
};
|
|
@@ -70,7 +70,7 @@ export class ATXPAccount {
|
|
|
70
70
|
constructor(connectionString, opts) {
|
|
71
71
|
const { origin, token } = parseConnectionString(connectionString);
|
|
72
72
|
const fetchFn = opts?.fetchFn ?? fetch;
|
|
73
|
-
const network = opts?.network ?? '
|
|
73
|
+
const network = opts?.network ?? 'base';
|
|
74
74
|
// Use token as a stable accountId namespace to keep OAuth/ATXP state per-connection
|
|
75
75
|
this.accountId = `atxp:${token}`;
|
|
76
76
|
this.paymentMakers = {
|
package/dist/atxpAccount.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atxpAccount.js","sourceRoot":"","sources":["../src/atxpAccount.ts"],"names":[],"mappings":"AAIA,SAAS,WAAW,CAAC,KAAa;IAChC,+DAA+D;IAC/D,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxD,OAAO,SAAS,GAAG,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,qBAAqB,CAAC,gBAAwB;IACrD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC;IAC7D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC3B,CAAC;AAED,MAAM,oBAAoB;IAKxB,YAAY,MAAc,EAAE,KAAa,EAAE,UAAqB,KAAK;QACnE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"atxpAccount.js","sourceRoot":"","sources":["../src/atxpAccount.ts"],"names":[],"mappings":"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"}
|
package/dist/atxpFetcher.d.ts
CHANGED
|
@@ -59,6 +59,7 @@ export declare class ATXPFetcher {
|
|
|
59
59
|
error: Error;
|
|
60
60
|
}) => Promise<void>;
|
|
61
61
|
constructor({ accountId, db, paymentMakers, fetchFn, sideChannelFetch, strict, allowInsecureRequests, allowedAuthorizationServers, approvePayment, logger, onAuthorize, onAuthorizeFailure, onPayment, onPaymentFailure }: ATXPFetcherConfig);
|
|
62
|
+
private defaultPaymentFailureHandler;
|
|
62
63
|
protected handlePaymentRequestError: (paymentRequestError: McpError) => Promise<boolean>;
|
|
63
64
|
protected getPaymentRequestData: (paymentRequestUrl: string) => Promise<PaymentRequestData | null>;
|
|
64
65
|
protected isAllowedAuthServer: (url: string | URL) => boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atxpFetcher.d.ts","sourceRoot":"","sources":["../src/atxpFetcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gCAAgC,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,EAAqD,WAAW,EAAE,sBAAsB,EAAE,SAAS,EAAE,OAAO,EAAE,kBAAkB,EAAgC,MAAM,EAAwE,MAAM,cAAc,CAAC;AAC1Q,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"atxpFetcher.d.ts","sourceRoot":"","sources":["../src/atxpFetcher.ts"],"names":[],"mappings":"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"}
|
package/dist/atxpFetcher.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { BigNumber } from 'bignumber.js';
|
|
2
2
|
import { OAuthAuthenticationRequiredError, OAuthClient } from './oAuth.js';
|
|
3
3
|
import { PAYMENT_REQUIRED_ERROR_CODE, paymentRequiredError, DEFAULT_AUTHORIZATION_SERVER, parsePaymentRequests, parseMcpMessages, ConsoleLogger, isSSEResponse } from '@atxp/common';
|
|
4
|
+
import { InsufficientFundsError, PaymentNetworkError } from './types.js';
|
|
4
5
|
import { getIsReactNative, createReactNativeSafeFetch } from '@atxp/common';
|
|
5
6
|
import { McpError } from '@modelcontextprotocol/sdk/types.js';
|
|
6
7
|
export function atxpFetch(config) {
|
|
@@ -9,6 +10,22 @@ export function atxpFetch(config) {
|
|
|
9
10
|
}
|
|
10
11
|
export class ATXPFetcher {
|
|
11
12
|
constructor({ accountId, db, paymentMakers, 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 = async () => { } }) {
|
|
13
|
+
this.defaultPaymentFailureHandler = async ({ payment, error }) => {
|
|
14
|
+
if (error instanceof InsufficientFundsError) {
|
|
15
|
+
this.logger.info(`PAYMENT FAILED: Insufficient ${error.currency} funds on ${payment.network}`);
|
|
16
|
+
this.logger.info(`Required: ${error.required} ${error.currency}`);
|
|
17
|
+
if (error.available) {
|
|
18
|
+
this.logger.info(`Available: ${error.available} ${error.currency}`);
|
|
19
|
+
}
|
|
20
|
+
this.logger.info(`Account: ${payment.accountId}`);
|
|
21
|
+
}
|
|
22
|
+
else if (error instanceof PaymentNetworkError) {
|
|
23
|
+
this.logger.info(`PAYMENT FAILED: Network error on ${payment.network}: ${error.message}`);
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
this.logger.info(`PAYMENT FAILED: ${error.message}`);
|
|
27
|
+
}
|
|
28
|
+
};
|
|
12
29
|
this.handlePaymentRequestError = async (paymentRequestError) => {
|
|
13
30
|
if (paymentRequestError.code !== PAYMENT_REQUIRED_ERROR_CODE) {
|
|
14
31
|
throw new Error(`ATXP: expected payment required error (code ${PAYMENT_REQUIRED_ERROR_CODE}); got code ${paymentRequestError.code}`);
|
|
@@ -56,7 +73,7 @@ export class ATXPFetcher {
|
|
|
56
73
|
}
|
|
57
74
|
const paymentMaker = this.paymentMakers.get(requestedNetwork);
|
|
58
75
|
if (!paymentMaker) {
|
|
59
|
-
this.logger.info(`ATXP: payment network ${requestedNetwork} not set up for this
|
|
76
|
+
this.logger.info(`ATXP: payment network '${requestedNetwork}' not set up for this client (available networks: ${Array.from(this.paymentMakers.keys()).join(', ')})`);
|
|
60
77
|
return false;
|
|
61
78
|
}
|
|
62
79
|
const prospectivePayment = {
|
|
@@ -341,7 +358,7 @@ export class ATXPFetcher {
|
|
|
341
358
|
this.onAuthorize = onAuthorize;
|
|
342
359
|
this.onAuthorizeFailure = onAuthorizeFailure;
|
|
343
360
|
this.onPayment = onPayment;
|
|
344
|
-
this.onPaymentFailure = onPaymentFailure;
|
|
361
|
+
this.onPaymentFailure = onPaymentFailure || this.defaultPaymentFailureHandler;
|
|
345
362
|
}
|
|
346
363
|
}
|
|
347
364
|
//# sourceMappingURL=atxpFetcher.js.map
|
package/dist/atxpFetcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atxpFetcher.js","sourceRoot":"","sources":["../src/atxpFetcher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"atxpFetcher.js","sourceRoot":"","sources":["../src/atxpFetcher.ts"],"names":[],"mappings":"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"}
|
package/dist/baseAccount.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type { Account, PaymentMaker } from './types.js';
|
|
1
|
+
import type { Account, PaymentMaker, Hex } from './types.js';
|
|
2
2
|
export declare class BaseAccount implements Account {
|
|
3
3
|
accountId: string;
|
|
4
4
|
paymentMakers: {
|
|
5
5
|
[key: string]: PaymentMaker;
|
|
6
6
|
};
|
|
7
|
-
constructor(baseRPCUrl: string, sourceSecretKey:
|
|
7
|
+
constructor(baseRPCUrl: string, sourceSecretKey: Hex);
|
|
8
8
|
}
|
|
9
9
|
//# sourceMappingURL=baseAccount.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseAccount.d.ts","sourceRoot":"","sources":["../src/baseAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"baseAccount.d.ts","sourceRoot":"","sources":["../src/baseAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAI7D,qBAAa,WAAY,YAAW,OAAO;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;gBAEnC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG;CAerD"}
|
package/dist/baseAccount.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseAccount.js","sourceRoot":"","sources":["../src/baseAccount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,OAAO,WAAW;IAItB,YAAY,UAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"baseAccount.js","sourceRoot":"","sources":["../src/baseAccount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,OAAO,WAAW;IAItB,YAAY,UAAkB,EAAE,eAAoB;QAClD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,OAAO,GAAG,mBAAmB,CAAC,eAAe,CAAC,CAAC;QAErD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG;YACnB,MAAM,EAAE,IAAI,gBAAgB,CAAC,UAAU,EAAE,eAAe,CAAC;SAC1D,CAAA;IACH,CAAC;CACF"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import type { PaymentMaker } from './types.js';
|
|
2
|
-
import { Logger } from '@atxp/common';
|
|
1
|
+
import type { PaymentMaker, Hex } from './types.js';
|
|
2
|
+
import { Logger, Currency } from '@atxp/common';
|
|
3
3
|
export declare class BasePaymentMaker implements PaymentMaker {
|
|
4
4
|
private signingClient;
|
|
5
5
|
private account;
|
|
6
6
|
private logger;
|
|
7
|
-
constructor(baseRPCUrl: string, sourceSecretKey:
|
|
7
|
+
constructor(baseRPCUrl: string, sourceSecretKey: Hex, logger?: Logger);
|
|
8
8
|
generateJWT: ({ paymentRequestId, codeChallenge }: {
|
|
9
9
|
paymentRequestId: string;
|
|
10
10
|
codeChallenge: string;
|
|
11
11
|
}) => Promise<string>;
|
|
12
|
-
makePayment: (amount: BigNumber, currency:
|
|
12
|
+
makePayment: (amount: BigNumber, currency: Currency, receiver: string) => Promise<string>;
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=basePaymentMaker.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basePaymentMaker.d.ts","sourceRoot":"","sources":["../src/basePaymentMaker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"basePaymentMaker.d.ts","sourceRoot":"","sources":["../src/basePaymentMaker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAqDhD,qBAAa,gBAAiB,YAAW,YAAY;IACnD,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,OAAO,CAAyC;IACxD,OAAO,CAAC,MAAM,CAAS;gBAEX,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM;IAiBrE,WAAW,GAAS,qCAAmC;QAAC,gBAAgB,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAC,KAAG,OAAO,CAAC,MAAM,CAAC,CA6BzH;IAED,WAAW,GAAU,QAAQ,SAAS,EAAE,UAAU,QAAQ,EAAE,UAAU,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,CA6D7F;CACF"}
|
package/dist/basePaymentMaker.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { InsufficientFundsError as InsufficientFundsErrorClass, PaymentNetworkError as PaymentNetworkErrorClass } from './types.js';
|
|
1
2
|
import { ConsoleLogger } from '@atxp/common';
|
|
2
3
|
import { createWalletClient, http, parseEther, publicActions, encodeFunctionData, } from "viem";
|
|
3
4
|
import { privateKeyToAccount } from "viem/accounts";
|
|
4
5
|
import { base } from "viem/chains";
|
|
6
|
+
import { BigNumber } from "bignumber.js";
|
|
5
7
|
const USDC_CONTRACT_ADDRESS = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"; // USDC on Base mainnet
|
|
6
8
|
const USDC_DECIMALS = 6;
|
|
7
9
|
const ERC20_ABI = [
|
|
@@ -64,36 +66,56 @@ export class BasePaymentMaker {
|
|
|
64
66
|
return `${header}.${payload}.${signature}`;
|
|
65
67
|
};
|
|
66
68
|
this.makePayment = async (amount, currency, receiver) => {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
throw new Error('Only usdc currency is supported; received ' + currency);
|
|
69
|
+
if (currency.toUpperCase() !== 'USDC') {
|
|
70
|
+
throw new PaymentNetworkErrorClass('Only USDC currency is supported; received ' + currency);
|
|
70
71
|
}
|
|
71
72
|
this.logger.info(`Making payment of ${amount} ${currency} to ${receiver} on Base`);
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
73
|
+
try {
|
|
74
|
+
// Check balance before attempting payment
|
|
75
|
+
const balanceRaw = await this.signingClient.readContract({
|
|
76
|
+
address: USDC_CONTRACT_ADDRESS,
|
|
77
|
+
abi: ERC20_ABI,
|
|
78
|
+
functionName: 'balanceOf',
|
|
79
|
+
args: [this.account.address],
|
|
80
|
+
});
|
|
81
|
+
const balance = new BigNumber(balanceRaw.toString()).dividedBy(10 ** USDC_DECIMALS);
|
|
82
|
+
if (balance.lt(amount)) {
|
|
83
|
+
this.logger.warn(`Insufficient ${currency} balance for payment. Required: ${amount}, Available: ${balance}`);
|
|
84
|
+
throw new InsufficientFundsErrorClass(currency, amount, balance, 'base');
|
|
85
|
+
}
|
|
86
|
+
// Convert amount to USDC units (6 decimals) as BigInt
|
|
87
|
+
const amountInUSDCUnits = BigInt(amount.multipliedBy(10 ** USDC_DECIMALS).toFixed(0));
|
|
88
|
+
const data = encodeFunctionData({
|
|
89
|
+
abi: ERC20_ABI,
|
|
90
|
+
functionName: "transfer",
|
|
91
|
+
args: [receiver, amountInUSDCUnits],
|
|
92
|
+
});
|
|
93
|
+
const hash = await this.signingClient.sendTransaction({
|
|
94
|
+
chain: base,
|
|
95
|
+
account: this.account,
|
|
96
|
+
to: USDC_CONTRACT_ADDRESS,
|
|
97
|
+
data: data,
|
|
98
|
+
value: parseEther('0'),
|
|
99
|
+
});
|
|
100
|
+
// Wait for transaction confirmation with more blocks to ensure propagation
|
|
101
|
+
this.logger.info(`Waiting for transaction confirmation: ${hash}`);
|
|
102
|
+
const receipt = await this.signingClient.waitForTransactionReceipt({
|
|
103
|
+
hash: hash,
|
|
104
|
+
confirmations: 3 // Wait for 3 confirmations to ensure better propagation
|
|
105
|
+
});
|
|
106
|
+
if (receipt.status === 'reverted') {
|
|
107
|
+
throw new PaymentNetworkErrorClass(`Transaction reverted: ${hash}`, new Error('Transaction reverted on chain'));
|
|
108
|
+
}
|
|
109
|
+
this.logger.info(`Transaction confirmed: ${hash} in block ${receipt.blockNumber}`);
|
|
110
|
+
return hash;
|
|
111
|
+
}
|
|
112
|
+
catch (error) {
|
|
113
|
+
if (error instanceof InsufficientFundsErrorClass || error instanceof PaymentNetworkErrorClass) {
|
|
114
|
+
throw error;
|
|
115
|
+
}
|
|
116
|
+
// Wrap other errors in PaymentNetworkError
|
|
117
|
+
throw new PaymentNetworkErrorClass(`Payment failed on Base network: ${error.message}`, error);
|
|
94
118
|
}
|
|
95
|
-
this.logger.info(`Transaction confirmed: ${hash} in block ${receipt.blockNumber}`);
|
|
96
|
-
return hash;
|
|
97
119
|
};
|
|
98
120
|
if (!baseRPCUrl) {
|
|
99
121
|
throw new Error('Base RPC URL is required');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basePaymentMaker.js","sourceRoot":"","sources":["../src/basePaymentMaker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"basePaymentMaker.js","sourceRoot":"","sources":["../src/basePaymentMaker.ts"],"names":[],"mappings":"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"}
|
package/dist/setup.expo.js
CHANGED
|
@@ -4,18 +4,6 @@ import { vi } from 'vitest';
|
|
|
4
4
|
process.env.NODE_ENV = 'test';
|
|
5
5
|
// Skip React Native navigator setup for now - causes syntax errors
|
|
6
6
|
// Mock Expo modules
|
|
7
|
-
vi.mock('expo-sqlite', () => ({
|
|
8
|
-
openDatabase: vi.fn(() => ({
|
|
9
|
-
execAsync: vi.fn(async () => { }),
|
|
10
|
-
prepareAsync: vi.fn(async () => ({
|
|
11
|
-
executeAsync: vi.fn(async () => ({
|
|
12
|
-
getFirstAsync: vi.fn(async () => ({ name: 'test-name' })),
|
|
13
|
-
})),
|
|
14
|
-
finalizeAsync: vi.fn(async () => { }),
|
|
15
|
-
})),
|
|
16
|
-
closeAsync: vi.fn(async () => { }),
|
|
17
|
-
})),
|
|
18
|
-
}));
|
|
19
7
|
vi.mock('expo-crypto', () => ({
|
|
20
8
|
digestStringAsync: vi.fn(async (algorithm, data) => {
|
|
21
9
|
// Simple mock implementation that returns a hex string
|
package/dist/setup.expo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.expo.js","sourceRoot":"","sources":["../src/setup.expo.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE5B,uBAAuB;AACvB,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC;AAE9B,mEAAmE;AAEnE,oBAAoB;AACpB,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5B,
|
|
1
|
+
{"version":3,"file":"setup.expo.js","sourceRoot":"","sources":["../src/setup.expo.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE5B,uBAAuB;AACvB,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC;AAE9B,mEAAmE;AAEnE,oBAAoB;AACpB,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5B,iBAAiB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,SAAiB,EAAE,IAAY,EAAE,EAAE;QACjE,uDAAuD;QACvD,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAClC,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB;QAC5D,oEAAoE;QACpE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACzD,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnF,CAAC,CAAC;IACF,qBAAqB,EAAE;QACrB,MAAM,EAAE,QAAQ;KACjB;IACD,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAChF,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1C,GAAG,EAAE,MAAM,CAAC,GAAG;CAChB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAEtD,0BAA0B;AAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { PaymentMaker } from './types.js';
|
|
2
2
|
import { ValidateTransferError as _ValidateTransferError } from "@solana/pay";
|
|
3
3
|
import BigNumber from "bignumber.js";
|
|
4
|
+
import { Currency } from '@atxp/common';
|
|
4
5
|
import { Logger } from '@atxp/common';
|
|
5
6
|
export declare const ValidateTransferError: typeof _ValidateTransferError;
|
|
6
7
|
export declare class SolanaPaymentMaker implements PaymentMaker {
|
|
@@ -12,6 +13,6 @@ export declare class SolanaPaymentMaker implements PaymentMaker {
|
|
|
12
13
|
paymentRequestId: string;
|
|
13
14
|
codeChallenge: string;
|
|
14
15
|
}) => Promise<string>;
|
|
15
|
-
makePayment: (amount: BigNumber, currency:
|
|
16
|
+
makePayment: (amount: BigNumber, currency: Currency, receiver: string) => Promise<string>;
|
|
16
17
|
}
|
|
17
18
|
//# sourceMappingURL=solanaPaymentMaker.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solanaPaymentMaker.d.ts","sourceRoot":"","sources":["../src/solanaPaymentMaker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"solanaPaymentMaker.d.ts","sourceRoot":"","sources":["../src/solanaPaymentMaker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAkB,qBAAqB,IAAI,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG9F,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAe,QAAQ,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAMtC,eAAO,MAAM,qBAAqB,+BAAyB,CAAC;AAE5D,qBAAa,kBAAmB,YAAW,YAAY;IACrD,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,MAAM,CAAS;gBAEX,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAY5E,WAAW,GAAS,qCAAmC;QAAC,gBAAgB,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAC,KAAG,OAAO,CAAC,MAAM,CAAC,CAezH;IAED,WAAW,GAAU,QAAQ,SAAS,EAAE,UAAU,QAAQ,EAAE,UAAU,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,CA2D7F;CACF"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import { InsufficientFundsError, PaymentNetworkError } from './types.js';
|
|
1
2
|
import { Keypair, Connection, PublicKey, ComputeBudgetProgram, sendAndConfirmTransaction } from "@solana/web3.js";
|
|
2
3
|
import { createTransfer, ValidateTransferError as _ValidateTransferError } from "@solana/pay";
|
|
4
|
+
import { getAccount, getAssociatedTokenAddress } from "@solana/spl-token";
|
|
3
5
|
import bs58 from "bs58";
|
|
6
|
+
import BigNumber from "bignumber.js";
|
|
4
7
|
import { generateJWT } from '@atxp/common';
|
|
5
8
|
import { importJWK } from 'jose';
|
|
6
9
|
import { ConsoleLogger } from '@atxp/common';
|
|
@@ -26,27 +29,43 @@ export class SolanaPaymentMaker {
|
|
|
26
29
|
return generateJWT(this.source.publicKey.toBase58(), privateKey, paymentRequestId || '', codeChallenge || '');
|
|
27
30
|
};
|
|
28
31
|
this.makePayment = async (amount, currency, receiver) => {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
throw new Error('Only usdc currency is supported; received ' + currency);
|
|
32
|
+
if (currency.toUpperCase() !== 'USDC') {
|
|
33
|
+
throw new PaymentNetworkError('Only USDC currency is supported; received ' + currency);
|
|
32
34
|
}
|
|
33
35
|
const receiverKey = new PublicKey(receiver);
|
|
34
|
-
const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
|
|
35
|
-
units: 10000,
|
|
36
|
-
});
|
|
37
|
-
const addPriorityFee = ComputeBudgetProgram.setComputeUnitPrice({
|
|
38
|
-
microLamports: 20000,
|
|
39
|
-
});
|
|
40
36
|
this.logger.info(`Making payment of ${amount} ${currency} to ${receiver} on Solana`);
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
37
|
+
try {
|
|
38
|
+
// Check balance before attempting payment
|
|
39
|
+
const tokenAccountAddress = await getAssociatedTokenAddress(USDC_MINT, this.source.publicKey);
|
|
40
|
+
const tokenAccount = await getAccount(this.connection, tokenAccountAddress);
|
|
41
|
+
const balance = new BigNumber(tokenAccount.amount.toString()).dividedBy(10 ** 6); // USDC has 6 decimals
|
|
42
|
+
if (balance.lt(amount)) {
|
|
43
|
+
this.logger.warn(`Insufficient ${currency} balance for payment. Required: ${amount}, Available: ${balance}`);
|
|
44
|
+
throw new InsufficientFundsError(currency, amount, balance, 'solana');
|
|
45
|
+
}
|
|
46
|
+
const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
|
|
47
|
+
units: 10000,
|
|
48
|
+
});
|
|
49
|
+
const addPriorityFee = ComputeBudgetProgram.setComputeUnitPrice({
|
|
50
|
+
microLamports: 20000,
|
|
51
|
+
});
|
|
52
|
+
const transaction = await createTransfer(this.connection, this.source.publicKey, {
|
|
53
|
+
amount: amount,
|
|
54
|
+
recipient: receiverKey,
|
|
55
|
+
splToken: USDC_MINT,
|
|
56
|
+
});
|
|
57
|
+
transaction.add(modifyComputeUnits);
|
|
58
|
+
transaction.add(addPriorityFee);
|
|
59
|
+
const transactionHash = await sendAndConfirmTransaction(this.connection, transaction, [this.source]);
|
|
60
|
+
return transactionHash;
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
if (error instanceof InsufficientFundsError || error instanceof PaymentNetworkError) {
|
|
64
|
+
throw error;
|
|
65
|
+
}
|
|
66
|
+
// Wrap other errors in PaymentNetworkError
|
|
67
|
+
throw new PaymentNetworkError(`Payment failed on Solana network: ${error.message}`, error);
|
|
68
|
+
}
|
|
50
69
|
};
|
|
51
70
|
if (!solanaEndpoint) {
|
|
52
71
|
throw new Error('Solana endpoint is required');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solanaPaymentMaker.js","sourceRoot":"","sources":["../src/solanaPaymentMaker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAClH,OAAO,EAAE,cAAc,EAAE,qBAAqB,IAAI,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAC9F,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"solanaPaymentMaker.js","sourceRoot":"","sources":["../src/solanaPaymentMaker.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AuthorizationServerUrl, Currency, Logger, Network, OAuthDb, FetchLike } from "@atxp/common";
|
|
2
2
|
import { ClientOptions } from "@modelcontextprotocol/sdk/client/index.js";
|
|
3
3
|
import { Implementation } from "@modelcontextprotocol/sdk/types.js";
|
|
4
|
+
export type Hex = `0x${string}`;
|
|
4
5
|
type AccountPrefix = Network;
|
|
5
6
|
export type AccountIdString = `${AccountPrefix}${string}`;
|
|
6
7
|
export type Account = {
|
|
@@ -47,8 +48,19 @@ export type ClientConfig = {
|
|
|
47
48
|
error: Error;
|
|
48
49
|
}) => Promise<void>;
|
|
49
50
|
};
|
|
51
|
+
export declare class InsufficientFundsError extends Error {
|
|
52
|
+
readonly currency: Currency;
|
|
53
|
+
readonly required: BigNumber;
|
|
54
|
+
readonly available?: BigNumber | undefined;
|
|
55
|
+
readonly network?: string | undefined;
|
|
56
|
+
constructor(currency: Currency, required: BigNumber, available?: BigNumber | undefined, network?: string | undefined);
|
|
57
|
+
}
|
|
58
|
+
export declare class PaymentNetworkError extends Error {
|
|
59
|
+
readonly originalError?: Error | undefined;
|
|
60
|
+
constructor(message: string, originalError?: Error | undefined);
|
|
61
|
+
}
|
|
50
62
|
export interface PaymentMaker {
|
|
51
|
-
makePayment: (amount: BigNumber, currency:
|
|
63
|
+
makePayment: (amount: BigNumber, currency: Currency, receiver: string, memo: string) => Promise<string>;
|
|
52
64
|
generateJWT: (params: {
|
|
53
65
|
paymentRequestId: string;
|
|
54
66
|
codeChallenge: string;
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACrG,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/dist/types.js
CHANGED
|
@@ -1,2 +1,22 @@
|
|
|
1
|
-
export {
|
|
1
|
+
export class InsufficientFundsError extends Error {
|
|
2
|
+
constructor(currency, required, available, network) {
|
|
3
|
+
const availableText = available ? `, Available: ${available}` : '';
|
|
4
|
+
const networkText = network ? ` on ${network}` : '';
|
|
5
|
+
super(`Payment failed due to insufficient ${currency} funds${networkText}. ` +
|
|
6
|
+
`Required: ${required}${availableText}. ` +
|
|
7
|
+
`Please ensure your account has adequate balance before retrying.`);
|
|
8
|
+
this.currency = currency;
|
|
9
|
+
this.required = required;
|
|
10
|
+
this.available = available;
|
|
11
|
+
this.network = network;
|
|
12
|
+
this.name = 'InsufficientFundsError';
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
export class PaymentNetworkError extends Error {
|
|
16
|
+
constructor(message, originalError) {
|
|
17
|
+
super(`Payment failed due to network error: ${message}. Please check your network connection and try again.`);
|
|
18
|
+
this.originalError = originalError;
|
|
19
|
+
this.name = 'PaymentNetworkError';
|
|
20
|
+
}
|
|
21
|
+
}
|
|
2
22
|
//# sourceMappingURL=types.js.map
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AA4CA,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IAC/C,YACkB,QAAkB,EAClB,QAAmB,EACnB,SAAqB,EACrB,OAAgB;QAEhC,MAAM,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,gBAAgB,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,KAAK,CACH,sCAAsC,QAAQ,SAAS,WAAW,IAAI;YACtE,aAAa,QAAQ,GAAG,aAAa,IAAI;YACzC,kEAAkE,CACnE,CAAC;QAXc,aAAQ,GAAR,QAAQ,CAAU;QAClB,aAAQ,GAAR,QAAQ,CAAW;QACnB,cAAS,GAAT,SAAS,CAAY;QACrB,YAAO,GAAP,OAAO,CAAS;QAShC,IAAI,CAAC,IAAI,GAAG,wBAAwB,CAAC;IACvC,CAAC;CACF;AAED,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IAC5C,YAAY,OAAe,EAAkB,aAAqB;QAChE,KAAK,CAAC,wCAAwC,OAAO,uDAAuD,CAAC,CAAC;QADnE,kBAAa,GAAb,aAAa,CAAQ;QAEhE,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;IACpC,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atxp/client",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.11",
|
|
4
4
|
"description": "ATXP Client - MCP client with OAuth authentication and payment processing",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -22,11 +22,10 @@
|
|
|
22
22
|
"test": "vitest run"
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@atxp/common": "0.2.
|
|
25
|
+
"@atxp/common": "0.2.11",
|
|
26
26
|
"@modelcontextprotocol/sdk": "^1.15.0",
|
|
27
27
|
"@solana/pay": "^0.2.5",
|
|
28
28
|
"@solana/web3.js": "^1.98.1",
|
|
29
|
-
"better-sqlite3": "^12.2.0",
|
|
30
29
|
"bignumber.js": "^9.3.0",
|
|
31
30
|
"bs58": "^6.0.0",
|
|
32
31
|
"oauth4webapi": "^3.5.0",
|
|
@@ -34,8 +33,7 @@
|
|
|
34
33
|
"viem": "^2.34.0"
|
|
35
34
|
},
|
|
36
35
|
"peerDependencies": {
|
|
37
|
-
"expo-crypto": ">=14.0.0"
|
|
38
|
-
"expo-sqlite": ">=15.0.0"
|
|
36
|
+
"expo-crypto": ">=14.0.0"
|
|
39
37
|
},
|
|
40
38
|
"devDependencies": {
|
|
41
39
|
"@types/node": "^22.13.0",
|