@apify/actors-mcp-server 0.16.1-beta.6 → 0.16.1-beta.7
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/payments/x402.d.ts +0 -6
- package/dist/payments/x402.d.ts.map +1 -1
- package/dist/payments/x402.js +0 -25
- package/dist/payments/x402.js.map +1 -1
- package/dist/test_kit/cases/payments.cases.d.ts.map +1 -1
- package/dist/test_kit/cases/payments.cases.js +1 -5
- package/dist/test_kit/cases/payments.cases.js.map +1 -1
- package/dist/test_kit/tsconfig.tsbuildinfo +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
package/dist/payments/x402.d.ts
CHANGED
|
@@ -85,12 +85,6 @@ export declare class X402PaymentProvider implements PaymentProvider {
|
|
|
85
85
|
* Falls back to a provider without full requirements if the fetch fails.
|
|
86
86
|
*/
|
|
87
87
|
static create(): Promise<X402PaymentProvider>;
|
|
88
|
-
/**
|
|
89
|
-
* Picks the preferred accept entry for flat `_meta.x402` advertising.
|
|
90
|
-
* Order follows `X402_PREFERRED_SCHEMES`; falls back to the first entry
|
|
91
|
-
* when no preferred scheme matches.
|
|
92
|
-
*/
|
|
93
|
-
private selectPreferredAcceptEntry;
|
|
94
88
|
decorateToolSchema(tool: ToolEntry): ToolEntry;
|
|
95
89
|
validatePayment(_args: Record<string, unknown>, meta?: PaymentMeta, requestHeaders?: RequestHeaders): string | null;
|
|
96
90
|
getPaymentHeaders(_args: Record<string, unknown>, meta?: PaymentMeta, requestHeaders?: RequestHeaders): PaymentHeaders;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"x402.d.ts","sourceRoot":"","sources":["../../src/payments/x402.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAG7C,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"x402.d.ts","sourceRoot":"","sources":["../../src/payments/x402.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAG7C,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAsB/F;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,iBAAiB,EAAE,CAAC;CACjC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;;;;;CAStC,CAAC;AA4BX;;;;;;;;GAQG;AACH,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC,CAoDjG;AA4BD;;;;;;;;;;;;;;GAcG;AACH,qBAAa,mBAAoB,YAAW,eAAe;IAI3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAH1C,QAAQ,CAAC,EAAE,EAAG,MAAM,CAAU;IAC9B,QAAQ,CAAC,qBAAqB,QAAQ;gBAET,YAAY,CAAC,EAAE,uBAAuB,YAAA;IAEnE;;;OAGG;WACU,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKnD,kBAAkB,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS;IAyC9C,eAAe,CACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,IAAI,CAAC,EAAE,WAAW,EAClB,cAAc,CAAC,EAAE,cAAc,GAChC,MAAM,GAAG,IAAI;IAIhB,iBAAiB,CACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,IAAI,CAAC,EAAE,WAAW,EAClB,cAAc,CAAC,EAAE,cAAc,GAChC,cAAc;IAOjB,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAK3E,sBAAsB,IAAI,uBAAuB,GAAG,SAAS;IAI7D,aAAa,IAAI,MAAM,GAAG,IAAI;IAI9B,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO;CAI3C"}
|
package/dist/payments/x402.js
CHANGED
|
@@ -17,15 +17,6 @@ const X402_TOOL_INSTRUCTIONS = [
|
|
|
17
17
|
'Include a valid x402 payment signature in the request metadata (_meta["x402/payment"]).',
|
|
18
18
|
'Your MCP client must support the x402 payment protocol.',
|
|
19
19
|
].join(' ');
|
|
20
|
-
/**
|
|
21
|
-
* Preferred scheme order when selecting the flat fields exposed on `_meta.x402`.
|
|
22
|
-
*
|
|
23
|
-
* `exact` first to keep the flat-fields contract back-compatible with clients
|
|
24
|
-
* that don't iterate `accepts[]` — they continue to sign `exact` payments as
|
|
25
|
-
* before this PR. Clients that walk `accepts[]` (post-#876 — the current
|
|
26
|
-
* mcpc, the canary) can opt into `upto` via their scheme preference.
|
|
27
|
-
*/
|
|
28
|
-
const X402_PREFERRED_SCHEMES = ['exact', 'upto'];
|
|
29
20
|
/**
|
|
30
21
|
* JSON Schema for the x402 `PaymentRequired` object a paid tool returns in
|
|
31
22
|
* `structuredContent` on a 402, per the x402 MCP transport spec
|
|
@@ -195,24 +186,10 @@ export class X402PaymentProvider {
|
|
|
195
186
|
const requirements = await fetchX402PaymentRequirements();
|
|
196
187
|
return new X402PaymentProvider(requirements);
|
|
197
188
|
}
|
|
198
|
-
/**
|
|
199
|
-
* Picks the preferred accept entry for flat `_meta.x402` advertising.
|
|
200
|
-
* Order follows `X402_PREFERRED_SCHEMES`; falls back to the first entry
|
|
201
|
-
* when no preferred scheme matches.
|
|
202
|
-
*/
|
|
203
|
-
selectPreferredAcceptEntry(accepts) {
|
|
204
|
-
for (const preferred of X402_PREFERRED_SCHEMES) {
|
|
205
|
-
const match = accepts.find((entry) => entry.scheme === preferred);
|
|
206
|
-
if (match)
|
|
207
|
-
return match;
|
|
208
|
-
}
|
|
209
|
-
return accepts[0];
|
|
210
|
-
}
|
|
211
189
|
decorateToolSchema(tool) {
|
|
212
190
|
if (!tool.paymentRequired)
|
|
213
191
|
return tool;
|
|
214
192
|
const cloned = cloneToolEntry(tool);
|
|
215
|
-
// Flat preferred fields stay for back-compat with clients that don't iterate `accepts[]`.
|
|
216
193
|
if (!cloned._meta) {
|
|
217
194
|
cloned._meta = {};
|
|
218
195
|
}
|
|
@@ -221,10 +198,8 @@ export class X402PaymentProvider {
|
|
|
221
198
|
const reqs = this.requirements ? structuredClone(this.requirements) : undefined;
|
|
222
199
|
const acceptsRaw = reqs === null || reqs === void 0 ? void 0 : reqs.accepts;
|
|
223
200
|
const accepts = Array.isArray(acceptsRaw) && acceptsRaw.length > 0 ? acceptsRaw : undefined;
|
|
224
|
-
const preferred = accepts ? this.selectPreferredAcceptEntry(accepts) : undefined;
|
|
225
201
|
metaRecord.x402 = {
|
|
226
202
|
paymentRequired: true,
|
|
227
|
-
...(preferred !== null && preferred !== void 0 ? preferred : {}),
|
|
228
203
|
...(accepts && { accepts }),
|
|
229
204
|
};
|
|
230
205
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"x402.js","sourceRoot":"","sources":["../../src/payments/x402.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAGrD;;;GAGG;AACH,MAAM,aAAa,GAAG,cAAc,CAAC;AAErC,gFAAgF;AAChF,MAAM,wBAAwB,GAAG,mBAAmB,CAAC;AAErD,MAAM,uBAAuB,GAAG,kBAAkB,CAAC;AAEnD,8EAA8E;AAC9E,MAAM,gBAAgB,GAAG,IAAK,CAAC;AAE/B,MAAM,sBAAsB,GAAG;IAC3B,qCAAqC;IACrC,yFAAyF;IACzF,yDAAyD;CAC5D,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"x402.js","sourceRoot":"","sources":["../../src/payments/x402.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payments.cases.d.ts","sourceRoot":"","sources":["../../../tests/test_kit/cases/payments.cases.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAExC,sCAAsC;AACtC,eAAO,MAAM,aAAa,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"payments.cases.d.ts","sourceRoot":"","sources":["../../../tests/test_kit/cases/payments.cases.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAExC,sCAAsC;AACtC,eAAO,MAAM,aAAa,EAAE,IAAI,EAqO/B,CAAC"}
|
|
@@ -60,17 +60,13 @@ export const paymentsCases = [
|
|
|
60
60
|
const client = await ctx.createClientFn({ payment: 'x402', tools: [...paidToolNames, ...freeToolNames] });
|
|
61
61
|
try {
|
|
62
62
|
const toolsList = await client.listTools();
|
|
63
|
-
// Positive: paid tools advertise _meta.x402 with
|
|
64
|
-
// flat preferred-scheme fields (back-compat) and the full accepts[] array.
|
|
63
|
+
// Positive: paid tools advertise _meta.x402 with the full accepts[] array.
|
|
65
64
|
for (const toolName of paidToolNames) {
|
|
66
65
|
const tool = toolsList.tools.find((t) => t.name === toolName);
|
|
67
66
|
expect(tool, `Tool "${toolName}" should exist in the tools list`).toBeDefined();
|
|
68
67
|
const x402 = (_a = tool === null || tool === void 0 ? void 0 : tool._meta) === null || _a === void 0 ? void 0 : _a.x402;
|
|
69
68
|
expect(x402, `Tool "${toolName}" should advertise _meta.x402`).toBeDefined();
|
|
70
69
|
expect(x402 === null || x402 === void 0 ? void 0 : x402.paymentRequired, `Tool "${toolName}" x402.paymentRequired should be true`).toBe(true);
|
|
71
|
-
for (const field of ['scheme', 'network', 'asset', 'payTo', 'amount']) {
|
|
72
|
-
expect(x402 === null || x402 === void 0 ? void 0 : x402[field], `Tool "${toolName}" should advertise x402.${field}`).toBeDefined();
|
|
73
|
-
}
|
|
74
70
|
const accepts = x402 === null || x402 === void 0 ? void 0 : x402.accepts;
|
|
75
71
|
expect(accepts, `Tool "${toolName}" should advertise x402.accepts[]`).toBeInstanceOf(Array);
|
|
76
72
|
expect(accepts === null || accepts === void 0 ? void 0 : accepts.length, `Tool "${toolName}" should advertise at least one accept entry`).toBeGreaterThan(0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payments.cases.js","sourceRoot":"","sources":["../../../tests/test_kit/cases/payments.cases.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"payments.cases.js","sourceRoot":"","sources":["../../../tests/test_kit/cases/payments.cases.ts"],"names":[],"mappings":"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"}
|