@apify/actors-mcp-server 0.11.8-beta.0 → 0.11.8-beta.2
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/apify_client.d.ts +8 -0
- package/dist/apify_client.d.ts.map +1 -1
- package/dist/apify_client.js +11 -4
- package/dist/apify_client.js.map +1 -1
- package/dist/const.d.ts +5 -0
- package/dist/const.d.ts.map +1 -1
- package/dist/const.js +5 -0
- package/dist/const.js.map +1 -1
- package/dist/dev_server.d.ts.map +1 -1
- package/dist/dev_server.js +6 -1
- package/dist/dev_server.js.map +1 -1
- package/dist/mcp/server.d.ts +1 -0
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +58 -44
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/task_execution.d.ts.map +1 -1
- package/dist/mcp/task_execution.js +94 -83
- package/dist/mcp/task_execution.js.map +1 -1
- package/dist/mcp/tool_call_error_mapper.d.ts.map +1 -1
- package/dist/mcp/tool_call_error_mapper.js +4 -11
- package/dist/mcp/tool_call_error_mapper.js.map +1 -1
- package/dist/mcp/tool_call_telemetry.d.ts.map +1 -1
- package/dist/mcp/tool_call_telemetry.js +3 -1
- package/dist/mcp/tool_call_telemetry.js.map +1 -1
- package/dist/mcp/tool_dispatch.d.ts.map +1 -1
- package/dist/mcp/tool_dispatch.js +7 -8
- package/dist/mcp/tool_dispatch.js.map +1 -1
- package/dist/payments/helpers.d.ts +3 -0
- package/dist/payments/helpers.d.ts.map +1 -1
- package/dist/payments/helpers.js +4 -4
- package/dist/payments/helpers.js.map +1 -1
- package/dist/tools/actors/search_actors.js +1 -1
- package/dist/tools/actors/search_actors.js.map +1 -1
- package/dist/tools/runs/get_actor_run_list.d.ts.map +1 -1
- package/dist/tools/runs/get_actor_run_list.js +2 -4
- package/dist/tools/runs/get_actor_run_list.js.map +1 -1
- package/dist/tools/widgets/search_actors_widget.js +1 -1
- package/dist/tools/widgets/search_actors_widget.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/actor_details.js +1 -1
- package/dist/utils/actor_details.js.map +1 -1
- package/dist/utils/actor_search.d.ts +4 -2
- package/dist/utils/actor_search.d.ts.map +1 -1
- package/dist/utils/actor_search.js +4 -6
- package/dist/utils/actor_search.js.map +1 -1
- package/dist/utils/mcp_clients.d.ts +4 -7
- package/dist/utils/mcp_clients.d.ts.map +1 -1
- package/dist/utils/mcp_clients.js +9 -8
- package/dist/utils/mcp_clients.js.map +1 -1
- package/dist/utils/tool_status.d.ts +18 -0
- package/dist/utils/tool_status.d.ts.map +1 -1
- package/dist/utils/tool_status.js +21 -0
- package/dist/utils/tool_status.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
|
|
1
2
|
import log from '@apify/log';
|
|
2
3
|
import { FAILURE_CATEGORY, TOOL_STATUS } from '../const.js';
|
|
3
4
|
import { withReportProblemNudge } from '../tools/dev/report_problem.js';
|
|
@@ -216,92 +217,102 @@ export async function executeToolAndUpdateTask(params) {
|
|
|
216
217
|
actorId,
|
|
217
218
|
isAborted: Boolean(cancelWatcher.signal.aborted),
|
|
218
219
|
});
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
220
|
+
switch (errorResult.kind) {
|
|
221
|
+
case TOOL_CALL_ERROR_KIND.PAYMENT: {
|
|
222
|
+
// Handle 402 Payment Required — return structured x402 result so clients can auto-pay
|
|
223
|
+
logHttpError(error, 'Payment required while calling tool (task mode)', { toolName: tool.name });
|
|
224
|
+
// Per MCP tasks spec: once a task is cancelled it MUST remain cancelled,
|
|
225
|
+
// so guard storeTaskResult against a cancel that raced with this 402.
|
|
226
|
+
if (await skipIfTaskCancelled(', skipping 402 result storage', TOOL_STATUS.ABORTED, {
|
|
227
|
+
...buildActorFields(actorName, actorId),
|
|
228
|
+
}))
|
|
229
|
+
return;
|
|
230
|
+
await completeTask('completed', errorResult.response, errorResult.toolStatus, errorResult.callDiagnostics);
|
|
227
231
|
return;
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
232
|
+
}
|
|
233
|
+
case TOOL_CALL_ERROR_KIND.APPROVAL: {
|
|
234
|
+
logHttpError(error, 'Permission approval required while calling tool (task mode)', {
|
|
235
|
+
toolName: tool.name,
|
|
236
|
+
});
|
|
237
|
+
// Per MCP tasks spec: once a task is cancelled it MUST remain cancelled,
|
|
238
|
+
// so guard storeTaskResult against a cancel that raced with this approval error.
|
|
239
|
+
if (await skipIfTaskCancelled(', skipping permission-approval result storage', TOOL_STATUS.ABORTED, {
|
|
240
|
+
...buildActorFields(actorName, actorId),
|
|
241
|
+
}))
|
|
242
|
+
return;
|
|
243
|
+
await completeTask('completed', errorResult.response, errorResult.toolStatus, errorResult.callDiagnostics);
|
|
240
244
|
return;
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
245
|
+
}
|
|
246
|
+
case TOOL_CALL_ERROR_KIND.EXECUTION: {
|
|
247
|
+
toolStatus = errorResult.toolStatus;
|
|
248
|
+
callDiagnostics = errorResult.callDiagnostics;
|
|
249
|
+
// Log level follows the already-classified toolStatus:
|
|
250
|
+
// SOFT_FAIL (e.g. 402/403 user quota, client-side issues) → softFail
|
|
251
|
+
// FAILED/ABORTED/other → error
|
|
252
|
+
if (toolStatus === TOOL_STATUS.SOFT_FAIL) {
|
|
253
|
+
// Mezmo promotes on "error" in message/keys — use errMessage key, sanitized.
|
|
254
|
+
const errMessage = sanitizeMezmoMessage(error instanceof Error ? error.message : String(error));
|
|
255
|
+
log.softFail('Tool execution soft-failed for task', {
|
|
256
|
+
taskId,
|
|
257
|
+
toolName: tool.name,
|
|
258
|
+
toolStatus,
|
|
259
|
+
mcpSessionId,
|
|
260
|
+
failureCategory: callDiagnostics.failure_category,
|
|
261
|
+
failureHttpStatus: callDiagnostics.failure_http_status,
|
|
262
|
+
actorName: callDiagnostics.actor_name,
|
|
263
|
+
errMessage,
|
|
264
|
+
});
|
|
265
|
+
}
|
|
266
|
+
else {
|
|
267
|
+
log.error('Error executing tool for task', {
|
|
268
|
+
taskId,
|
|
269
|
+
toolName: tool.name,
|
|
270
|
+
toolStatus,
|
|
271
|
+
mcpSessionId,
|
|
272
|
+
failureCategory: callDiagnostics.failure_category,
|
|
273
|
+
failureHttpStatus: callDiagnostics.failure_http_status,
|
|
274
|
+
actorName: callDiagnostics.actor_name,
|
|
275
|
+
error,
|
|
276
|
+
});
|
|
277
|
+
}
|
|
278
|
+
const { userText } = errorResult;
|
|
279
|
+
// Check if task was cancelled before storing result
|
|
280
|
+
if (await skipIfTaskCancelled(', skipping result storage', toolStatus, callDiagnostics))
|
|
281
|
+
return;
|
|
282
|
+
log.debug('[executeToolAndUpdateTask] Storing failed result', {
|
|
283
|
+
taskId,
|
|
284
|
+
mcpSessionId,
|
|
285
|
+
});
|
|
286
|
+
// Nudge on a genuinely-failed task result (mirrors the completed path and the sync
|
|
287
|
+
// captureResult). INTERNAL_ERROR and an unknown category get the full nudge; a genuine
|
|
288
|
+
// INVALID_INPUT gets the softer nudge; payment (402) is suppressed via the HTTP status and
|
|
289
|
+
// AUTH / PERMISSION_APPROVAL_REQUIRED via NON_NUDGE_FAILURE_CATEGORIES. The 402 branch above
|
|
290
|
+
// returns before reaching here, so this only sees non-payment failures.
|
|
291
|
+
const failedResult = withReportProblemNudge({
|
|
292
|
+
result: {
|
|
293
|
+
content: [
|
|
294
|
+
{
|
|
295
|
+
type: 'text',
|
|
296
|
+
text: userText,
|
|
297
|
+
},
|
|
298
|
+
],
|
|
299
|
+
isError: true,
|
|
300
|
+
internalToolStatus: toolStatus,
|
|
294
301
|
},
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
302
|
+
tools: apifyMcpServer.tools,
|
|
303
|
+
failingToolName: tool.name,
|
|
304
|
+
failureCategory: callDiagnostics.failure_category,
|
|
305
|
+
failureHttpStatus: callDiagnostics.failure_http_status,
|
|
306
|
+
});
|
|
307
|
+
await completeTask('failed', failedResult, toolStatus, callDiagnostics);
|
|
308
|
+
break;
|
|
309
|
+
}
|
|
310
|
+
default:
|
|
311
|
+
// Compile-time exhaustiveness guard (same `satisfies never` idiom as dispatchToolCall's
|
|
312
|
+
// default arm): a new TOOL_CALL_ERROR_KIND makes `errorResult` non-`never` here and fails
|
|
313
|
+
// to compile. Unreachable at runtime.
|
|
314
|
+
throw new McpError(ErrorCode.InvalidParams, `Unknown tool-call error kind "${errorResult.kind}"`);
|
|
315
|
+
}
|
|
305
316
|
}
|
|
306
317
|
finally {
|
|
307
318
|
cancelWatcher.dispose();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task_execution.js","sourceRoot":"","sources":["../../src/mcp/task_execution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task_execution.js","sourceRoot":"","sources":["../../src/mcp/task_execution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool_call_error_mapper.d.ts","sourceRoot":"","sources":["../../src/mcp/tool_call_error_mapper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"tool_call_error_mapper.d.ts","sourceRoot":"","sources":["../../src/mcp/tool_call_error_mapper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAUpD,sEAAsE;AACtE,MAAM,MAAM,mBAAmB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,uFAAuF;AACvF,eAAO,MAAM,oBAAoB;;;;CAIvB,CAAC;AACX,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,OAAO,oBAAoB,CAAC,CAAC;AAEpG,oGAAoG;AACpG,KAAK,mBAAmB,GAAG;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,YAAY,CAAC;CAC1B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GACzB,CAAC;IAAE,IAAI,EAAE,OAAO,oBAAoB,CAAC,OAAO,CAAA;CAAE,GAAG,mBAAmB,CAAC,GACrE,CAAC;IAAE,IAAI,EAAE,OAAO,oBAAoB,CAAC,QAAQ,CAAA;CAAE,GAAG,mBAAmB,CAAC,GACtE;IACI,IAAI,EAAE,OAAO,oBAAoB,CAAC,SAAS,CAAC;IAC5C,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAER;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,mBAAmB,GAAG,mBAAmB,CAoCzG"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { FAILURE_CATEGORY, TOOL_STATUS } from '../const.js';
|
|
2
2
|
import { isPermissionApprovalError } from '../utils/apify_errors.js';
|
|
3
|
-
import { getHttpStatusCode } from '../utils/logging.js';
|
|
4
3
|
import { getToolCallErrorUserText } from '../utils/mcp.js';
|
|
5
4
|
import { buildPaymentRequiredResponse, buildPermissionApprovalResponse, isX402PaymentRequiredError, } from '../utils/payment_errors.js';
|
|
6
|
-
import {
|
|
5
|
+
import { buildExecutionDiagnostics } from '../utils/tool_status.js';
|
|
7
6
|
import { buildActorFields } from '../utils/tools.js';
|
|
8
7
|
/** Discriminants of `ToolCallErrorResult` — reference these, never string literals. */
|
|
9
8
|
export const TOOL_CALL_ERROR_KIND = {
|
|
@@ -18,7 +17,6 @@ export const TOOL_CALL_ERROR_KIND = {
|
|
|
18
17
|
*/
|
|
19
18
|
export function buildToolCallErrorResult(error, params) {
|
|
20
19
|
const { toolName, actorName, actorId, isAborted } = params;
|
|
21
|
-
const httpStatus = getHttpStatusCode(error);
|
|
22
20
|
if (isX402PaymentRequiredError(error)) {
|
|
23
21
|
return {
|
|
24
22
|
kind: TOOL_CALL_ERROR_KIND.PAYMENT,
|
|
@@ -43,16 +41,11 @@ export function buildToolCallErrorResult(error, params) {
|
|
|
43
41
|
response: buildPermissionApprovalResponse(error),
|
|
44
42
|
};
|
|
45
43
|
}
|
|
46
|
-
const
|
|
44
|
+
const { toolStatus, callDiagnostics } = buildExecutionDiagnostics({ error, isAborted, actorName, actorId });
|
|
47
45
|
return {
|
|
48
46
|
kind: TOOL_CALL_ERROR_KIND.EXECUTION,
|
|
49
|
-
toolStatus
|
|
50
|
-
callDiagnostics
|
|
51
|
-
failure_category: classifyFailureCategory(error),
|
|
52
|
-
...(httpStatus !== undefined ? { failure_http_status: httpStatus } : {}),
|
|
53
|
-
failure_detail: failureDetail,
|
|
54
|
-
...buildActorFields(actorName, actorId),
|
|
55
|
-
},
|
|
47
|
+
toolStatus,
|
|
48
|
+
callDiagnostics,
|
|
56
49
|
userText: getToolCallErrorUserText(toolName, error),
|
|
57
50
|
};
|
|
58
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool_call_error_mapper.js","sourceRoot":"","sources":["../../src/mcp/tool_call_error_mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"tool_call_error_mapper.js","sourceRoot":"","sources":["../../src/mcp/tool_call_error_mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EACH,4BAA4B,EAC5B,+BAA+B,EAC/B,0BAA0B,GAC7B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAUrD,uFAAuF;AACvF,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAChC,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,WAAW;CAChB,CAAC;AAyBX;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,KAAc,EAAE,MAA2B;IAChF,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAE3D,IAAI,0BAA0B,CAAC,KAAK,CAAC,EAAE,CAAC;QACpC,OAAO;YACH,IAAI,EAAE,oBAAoB,CAAC,OAAO;YAClC,UAAU,EAAE,WAAW,CAAC,SAAS;YACjC,eAAe,EAAE;gBACb,gBAAgB,EAAE,gBAAgB,CAAC,aAAa;gBAChD,mBAAmB,EAAE,GAAG;gBACxB,GAAG,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC;aAC1C;YACD,QAAQ,EAAE,4BAA4B,CAAC,KAAK,CAAC;SAChD,CAAC;IACN,CAAC;IAED,IAAI,yBAAyB,CAAC,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO;YACH,IAAI,EAAE,oBAAoB,CAAC,QAAQ;YACnC,UAAU,EAAE,WAAW,CAAC,SAAS;YACjC,eAAe,EAAE;gBACb,gBAAgB,EAAE,gBAAgB,CAAC,4BAA4B;gBAC/D,mBAAmB,EAAE,KAAK,CAAC,UAAU;gBACrC,GAAG,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC;aAC1C;YACD,QAAQ,EAAE,+BAA+B,CAAC,KAAK,CAAC;SACnD,CAAC;IACN,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,yBAAyB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;IAC5G,OAAO;QACH,IAAI,EAAE,oBAAoB,CAAC,SAAS;QACpC,UAAU;QACV,eAAe;QACf,QAAQ,EAAE,wBAAwB,CAAC,QAAQ,EAAE,KAAK,CAAC;KACtD,CAAC;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool_call_telemetry.d.ts","sourceRoot":"","sources":["../../src/mcp/tool_call_telemetry.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,2BAA2B,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"tool_call_telemetry.d.ts","sourceRoot":"","sources":["../../src/mcp/tool_call_telemetry.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,2BAA2B,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAM5F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,KAAK,0BAA0B,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF;;GAEG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,0BAA0B,GACnC,OAAO,CAAC;IAAE,aAAa,EAAE,2BAA2B,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CA+BvF;AAED;;;;;GAKG;AACH,KAAK,6BAA6B,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,2BAA2B,GAAG,IAAI,CAAC;IAClD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,6BAA6B,GAAG,IAAI,CAmDnF"}
|
|
@@ -3,6 +3,7 @@ import { ApifyClient } from '../apify_client.js';
|
|
|
3
3
|
import { HELPER_TOOLS, TOOL_STATUS } from '../const.js';
|
|
4
4
|
import { buildReportedProblemProperties, trackReportedProblem, trackToolCall } from '../telemetry.js';
|
|
5
5
|
import { computeToolResponseBytes } from '../utils/mcp.js';
|
|
6
|
+
import { getRequestOriginForClient } from '../utils/mcp_clients.js';
|
|
6
7
|
import { deriveResourceIds } from '../utils/tool_status.js';
|
|
7
8
|
import { getUserInfoCached } from '../utils/userid_cache.js';
|
|
8
9
|
import { getPackageVersion } from '../utils/version.js';
|
|
@@ -18,7 +19,8 @@ export async function prepareTelemetryData(params) {
|
|
|
18
19
|
// Get userId from cache or fetch from API
|
|
19
20
|
let userId = null;
|
|
20
21
|
if (apifyToken) {
|
|
21
|
-
const
|
|
22
|
+
const requestOrigin = getRequestOriginForClient(apifyMcpServer.options.initializeRequestData);
|
|
23
|
+
const apifyClient = new ApifyClient({ token: apifyToken, requestOrigin });
|
|
22
24
|
({ userId } = await getUserInfoCached(apifyToken, apifyClient));
|
|
23
25
|
log.debug('Telemetry: fetched userId', { userId, mcpSessionId });
|
|
24
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool_call_telemetry.js","sourceRoot":"","sources":["../../src/mcp/tool_call_telemetry.ts"],"names":[],"mappings":"AAEA,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,8BAA8B,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEtG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAUxD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,MAAkC;;IAElC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IACtE,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;QACnC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACjD,CAAC;IAED,0CAA0C;IAC1C,IAAI,MAAM,GAAkB,IAAI,CAAC;IACjC,IAAI,UAAU,EAAE,CAAC;QACb,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tool_call_telemetry.js","sourceRoot":"","sources":["../../src/mcp/tool_call_telemetry.ts"],"names":[],"mappings":"AAEA,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,8BAA8B,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEtG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAUxD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,MAAkC;;IAElC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IACtE,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;QACnC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACjD,CAAC;IAED,0CAA0C;IAC1C,IAAI,MAAM,GAAkB,IAAI,CAAC;IACjC,IAAI,UAAU,EAAE,CAAC;QACb,MAAM,aAAa,GAAG,yBAAyB,CAAC,cAAc,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAC9F,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;QAC1E,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;QAChE,GAAG,CAAC,KAAK,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;IACrE,CAAC;IACD,MAAM,YAAY,GAAG,MAAA,MAAA,cAAc,CAAC,OAAO,CAAC,qBAAqB,0CAAE,MAAM,0CAAE,YAAY,CAAC;IACxF,MAAM,gBAAgB,GAAG,MAAA,cAAc,CAAC,OAAO,CAAC,qBAAqB,0CAAE,MAAqC,CAAC;IAC7G,MAAM,aAAa,GAAgC;QAC/C,GAAG,EAAE,KAAK;QACV,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE;QACtC,eAAe,EAAE,CAAA,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,UAAU,0CAAE,IAAI,KAAI,EAAE;QACzD,kBAAkB,EAAE,CAAA,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,UAAU,0CAAE,OAAO,KAAI,EAAE;QAC/D,oBAAoB,EAAE,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,eAAe,KAAI,EAAE;QAC7D,uBAAuB,EAAE,YAAY,IAAI,IAAI;QAC7C,cAAc,EAAE,YAAY,IAAI,EAAE;QAClC,cAAc,EAAE,cAAc,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE;QAC1D,SAAS,EAAE,QAAQ;QACnB,WAAW,EAAE,WAAW,CAAC,SAAS,EAAE,6BAA6B;QACjE,iBAAiB,EAAE,CAAC,EAAE,gCAAgC;KACzD,CAAC;IAEF,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC;AACrC,CAAC;AAsBD,MAAM,UAAU,uBAAuB,CAAC,MAAqC;IACzE,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC;IACjD,0FAA0F;IAC1F,wFAAwF;IACxF,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAExG,GAAG,CAAC,IAAI,CAAC,qBAAqB,EAAE;QAC5B,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,UAAU;QACV,GAAG,CAAC,aAAa,KAAK,SAAS,IAAI;YAC/B,oBAAoB,EAAE,aAAa,CAAC,YAAY;YAChD,8BAA8B,EAAE,aAAa,CAAC,sBAAsB;YACpE,iBAAiB,EAAE,aAAa,CAAC,SAAS;SAC7C,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;KAChE,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,MAAM,sBAAsB,GAAgC;YACxD,GAAG,MAAM,CAAC,aAAa;YACvB,WAAW,EAAE,MAAM,CAAC,UAAU;YAC9B,iBAAiB,EAAE,UAAU;YAC7B,GAAG,CAAC,aAAa,IAAI;gBACjB,2BAA2B,EAAE,aAAa,CAAC,YAAY;gBACvD,sCAAsC,EAAE,aAAa,CAAC,sBAAsB;gBAC5E,wBAAwB,EAAE,aAAa,CAAC,SAAS;aACpD,CAAC;YACF,8GAA8G;YAC9G,GAAG,MAAM,CAAC,eAAe;YACzB,oFAAoF;YACpF,qEAAqE;YACrE,GAAG,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;SACnD,CAAC;QACF,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAC;QAEzF,sFAAsF;QACtF,4EAA4E;QAC5E,IACI,MAAM,CAAC,QAAQ,KAAK,YAAY,CAAC,cAAc;YAC/C,MAAM,CAAC,UAAU,KAAK,WAAW,CAAC,SAAS;YAC3C,MAAM,CAAC,IAAI,EACb,CAAC;YACC,oBAAoB,CAChB,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,cAAc,CAAC,YAAY,EAClC,8BAA8B,CAAC,sBAAsB,EAAE,MAAM,CAAC,IAAI,CAAC,CACtE,CAAC;QACN,CAAC;IACL,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool_dispatch.d.ts","sourceRoot":"","sources":["../../src/mcp/tool_dispatch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAWhF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGtD,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAK1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAKlE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,gBAAgB,CAAC,MAAM,EAAE;IAC3C,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,eAAe,CAAC;IAChC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAC3C,eAAe,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;IAC1D,0BAA0B,EAAE,OAAO,CAAC;IACpC,KAAK,EAAE,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAGlB,UAAU,CAAC,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC;CAC3E,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,eAAe,EAAE,eAAe,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"tool_dispatch.d.ts","sourceRoot":"","sources":["../../src/mcp/tool_dispatch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAWhF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGtD,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAK1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAKlE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,gBAAgB,CAAC,MAAM,EAAE;IAC3C,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,eAAe,CAAC;IAChC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAC3C,eAAe,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;IAC1D,0BAA0B,EAAE,OAAO,CAAC;IACpC,KAAK,EAAE,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAGlB,UAAU,CAAC,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC;CAC3E,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,eAAe,EAAE,eAAe,CAAA;CAAE,CAAC,CAmNzG"}
|
|
@@ -7,7 +7,7 @@ import { TOOL_TYPE } from '../types.js';
|
|
|
7
7
|
import { remoteMcpFailureDetail } from '../utils/apify_errors.js';
|
|
8
8
|
import { logHttpError } from '../utils/logging.js';
|
|
9
9
|
import { respondErrorNoTelemetry } from '../utils/mcp.js';
|
|
10
|
-
import { applyToolTelemetry,
|
|
10
|
+
import { applyToolTelemetry, buildExecutionDiagnostics } from '../utils/tool_status.js';
|
|
11
11
|
import { buildActorFields } from '../utils/tools.js';
|
|
12
12
|
import { connectMCPClient } from './client.js';
|
|
13
13
|
import { EXTERNAL_TOOL_CALL_TIMEOUT_MSEC } from './const.js';
|
|
@@ -135,13 +135,12 @@ export async function dispatchToolCall(params) {
|
|
|
135
135
|
result = { ...res };
|
|
136
136
|
}
|
|
137
137
|
catch (error) {
|
|
138
|
-
toolStatus
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
};
|
|
138
|
+
({ toolStatus, callDiagnostics } = buildExecutionDiagnostics({
|
|
139
|
+
error,
|
|
140
|
+
isAborted: Boolean((_c = extra.signal) === null || _c === void 0 ? void 0 : _c.aborted),
|
|
141
|
+
actorName,
|
|
142
|
+
actorId,
|
|
143
|
+
}));
|
|
145
144
|
logHttpError(error, `Failed to call MCP tool '${tool.originToolName}' on Actor '${tool.actorId}'`, {
|
|
146
145
|
actorId: tool.actorId,
|
|
147
146
|
toolName: tool.originToolName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool_dispatch.js","sourceRoot":"","sources":["../../src/mcp/tool_dispatch.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,oBAAoB,EACpB,SAAS,EACT,QAAQ,EACR,wBAAwB,GAC3B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,GAAG,MAAM,YAAY,CAAC;AAG7B,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE1D,OAAO,EAAE,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"tool_dispatch.js","sourceRoot":"","sources":["../../src/mcp/tool_dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { REQUEST_ORIGIN } from '../apify_client.js';
|
|
1
2
|
import { ApifyClient } from '../apify_client.js';
|
|
2
3
|
import type { ApifyToken, ToolEntry } from '../types.js';
|
|
3
4
|
import { buildPaymentRequiredResponse } from '../utils/payment_errors.js';
|
|
@@ -40,5 +41,7 @@ export declare function prepareToolCallContext(input: {
|
|
|
40
41
|
apifyToken: ApifyToken;
|
|
41
42
|
meta?: PaymentMeta;
|
|
42
43
|
requestHeaders?: RequestHeaders;
|
|
44
|
+
/** Request origin to attribute started runs to (from getRequestOriginForClient). Defaults to MCP. */
|
|
45
|
+
requestOrigin?: REQUEST_ORIGIN;
|
|
43
46
|
}): PrepareToolCallContextResult;
|
|
44
47
|
//# sourceMappingURL=helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/payments/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAsC,MAAM,4BAA4B,CAAC;AAC9G,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE/E;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACvC,yFAAyF;IACzF,qBAAqB,CAAC,EAAE,UAAU,CAAC,OAAO,4BAA4B,CAAC,CAAC;IACxE,gGAAgG;IAChG,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChD,+FAA+F;IAC/F,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qFAAqF;IACrF,WAAW,EAAE,WAAW,CAAC;CAC5B,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC1C,QAAQ,EAAE,eAAe,GAAG,SAAS,CAAC;IACtC,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,cAAc,CAAC,EAAE,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/payments/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAsC,MAAM,4BAA4B,CAAC;AAC9G,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE/E;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACvC,yFAAyF;IACzF,qBAAqB,CAAC,EAAE,UAAU,CAAC,OAAO,4BAA4B,CAAC,CAAC;IACxE,gGAAgG;IAChG,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChD,+FAA+F;IAC/F,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qFAAqF;IACrF,WAAW,EAAE,WAAW,CAAC;CAC5B,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC1C,QAAQ,EAAE,eAAe,GAAG,SAAS,CAAC;IACtC,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,qGAAqG;IACrG,aAAa,CAAC,EAAE,cAAc,CAAC;CAClC,GAAG,4BAA4B,CA+B/B"}
|
package/dist/payments/helpers.js
CHANGED
|
@@ -18,9 +18,9 @@ import { buildPaymentRequiredResponse, registerPaymentRequiredInterceptor } from
|
|
|
18
18
|
* - createApifyClient (returns apifyClient)
|
|
19
19
|
*/
|
|
20
20
|
export function prepareToolCallContext(input) {
|
|
21
|
-
const { provider, tool, args, apifyToken, meta, requestHeaders } = input;
|
|
21
|
+
const { provider, tool, args, apifyToken, meta, requestHeaders, requestOrigin } = input;
|
|
22
22
|
if (!provider) {
|
|
23
|
-
const apifyClient = new ApifyClient({ token: apifyToken });
|
|
23
|
+
const apifyClient = new ApifyClient({ token: apifyToken, requestOrigin });
|
|
24
24
|
registerPaymentRequiredInterceptor(apifyClient);
|
|
25
25
|
return {
|
|
26
26
|
toolArgsWithoutPayment: { ...args },
|
|
@@ -34,8 +34,8 @@ export function prepareToolCallContext(input) {
|
|
|
34
34
|
const toolArgsRedacted = provider.redactForLogging(args);
|
|
35
35
|
const paymentHeaders = provider.getPaymentHeaders(args, meta, requestHeaders);
|
|
36
36
|
const apifyClient = Object.keys(paymentHeaders).length > 0
|
|
37
|
-
? new ApifyClient({ paymentHeaders })
|
|
38
|
-
: new ApifyClient({ token: apifyToken });
|
|
37
|
+
? new ApifyClient({ paymentHeaders, requestOrigin })
|
|
38
|
+
: new ApifyClient({ token: apifyToken, requestOrigin });
|
|
39
39
|
registerPaymentRequiredInterceptor(apifyClient);
|
|
40
40
|
return {
|
|
41
41
|
paymentRequiredResult: error ? buildPaymentRequiredResponse(error, errorData) : undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/payments/helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/payments/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,4BAA4B,EAAE,kCAAkC,EAAE,MAAM,4BAA4B,CAAC;AAkB9G;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAStC;IACG,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAExF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;QAC1E,kCAAkC,CAAC,WAAW,CAAC,CAAC;QAChD,OAAO;YACH,sBAAsB,EAAE,EAAE,GAAG,IAAI,EAAE;YACnC,gBAAgB,EAAE,IAAI;YACtB,WAAW;SACd,CAAC;IACN,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACjG,MAAM,SAAS,GAAG,KAAK,IAAI,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,QAAQ,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3G,MAAM,sBAAsB,GAAG,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAClE,MAAM,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAEzD,MAAM,cAAc,GAAG,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IAC9E,MAAM,WAAW,GACb,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,GAAG,CAAC;QAClC,CAAC,CAAC,IAAI,WAAW,CAAC,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC;QACpD,CAAC,CAAC,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;IAChE,kCAAkC,CAAC,WAAW,CAAC,CAAC;IAEhD,OAAO;QACH,qBAAqB,EAAE,KAAK,CAAC,CAAC,CAAC,4BAA4B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;QACzF,sBAAsB;QACtB,gBAAgB;QAChB,WAAW;KACd,CAAC;AACN,CAAC"}
|
|
@@ -147,7 +147,7 @@ export const searchActors = Object.freeze({
|
|
|
147
147
|
const [actors, { userPlanTier }] = await Promise.all([
|
|
148
148
|
searchAgentSafeActors({
|
|
149
149
|
keywords: parsed.keywords,
|
|
150
|
-
|
|
150
|
+
apifyClient,
|
|
151
151
|
limit: parsed.limit,
|
|
152
152
|
offset: parsed.offset,
|
|
153
153
|
paymentProvider: apifyMcpServer.options.paymentProvider,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search_actors.js","sourceRoot":"","sources":["../../../src/tools/actors/search_actors.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"search_actors.js","sourceRoot":"","sources":["../../../src/tools/actors/search_actors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_actor_run_list.d.ts","sourceRoot":"","sources":["../../../src/tools/runs/get_actor_run_list.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get_actor_run_list.d.ts","sourceRoot":"","sources":["../../../src/tools/runs/get_actor_run_list.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AA4BnF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,SAmCnB,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { ApifyClient } from '../../apify_client.js';
|
|
3
2
|
import { HELPER_TOOLS } from '../../const.js';
|
|
4
3
|
import { TOOL_TYPE } from '../../types.js';
|
|
5
4
|
import { compileSchema } from '../../utils/ajv.js';
|
|
@@ -52,10 +51,9 @@ USAGE EXAMPLES:
|
|
|
52
51
|
openWorldHint: false,
|
|
53
52
|
},
|
|
54
53
|
call: async (toolArgs) => {
|
|
55
|
-
const { args,
|
|
54
|
+
const { args, apifyClient } = toolArgs;
|
|
56
55
|
const parsed = getUserRunsListArgs.parse(args);
|
|
57
|
-
const
|
|
58
|
-
const runs = await client
|
|
56
|
+
const runs = await apifyClient
|
|
59
57
|
.runs()
|
|
60
58
|
.list({ limit: parsed.limit, offset: parsed.offset, desc: parsed.desc, status: parsed.status });
|
|
61
59
|
return respondRaw({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_actor_run_list.js","sourceRoot":"","sources":["../../../src/tools/runs/get_actor_run_list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"get_actor_run_list.js","sourceRoot":"","sources":["../../../src/tools/runs/get_actor_run_list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAE3E,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,MAAM,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,QAAQ,CAAC,uFAAuF,CAAC;SACjG,OAAO,CAAC,CAAC,CAAC;IACf,KAAK,EAAE,CAAC;SACH,MAAM,EAAE;SACR,GAAG,CAAC,EAAE,CAAC;SACP,QAAQ,CAAC,+FAA+F,CAAC;SACzG,OAAO,CAAC,EAAE,CAAC;IAChB,IAAI,EAAE,CAAC;SACF,OAAO,EAAE;SACT,QAAQ,CACL,uHAAuH,CAC1H;SACA,OAAO,CAAC,KAAK,CAAC;IACnB,MAAM,EAAE,CAAC;SACJ,IAAI,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;SACnG,QAAQ,EAAE;SACV,QAAQ,CAAC,4CAA4C,CAAC;CAC9D,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAc,MAAM,CAAC,MAAM,CAAC;IACpD,IAAI,EAAE,SAAS,CAAC,QAAQ;IACxB,IAAI,EAAE,YAAY,CAAC,kBAAkB;IACrC,KAAK,EAAE,oBAAoB;IAC3B,WAAW,EAAE;;;;;;;;;uCASsB;IACnC,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,mBAAmB,CAAoB;IACnE,YAAY,EAAE,wBAAwB;IACtC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;IAC/D,WAAW,EAAE;QACT,KAAK,EAAE,oBAAoB;QAC3B,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,KAAK;QACtB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,KAAK;KACvB;IACD,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;QACvC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;QACvC,MAAM,MAAM,GAAG,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAM,WAAW;aACzB,IAAI,EAAE;aACN,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACpG,OAAO,UAAU,CAAC;YACd,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACvD,iBAAiB,EAAE,IAA0C;SAChE,CAAC,CAAC;IACP,CAAC;CACK,CAAC,CAAC"}
|
|
@@ -58,7 +58,7 @@ export const searchActorsWidget = Object.freeze({
|
|
|
58
58
|
const [actors, { userPlanTier }] = await Promise.all([
|
|
59
59
|
searchAgentSafeActors({
|
|
60
60
|
keywords: parsed.keywords,
|
|
61
|
-
|
|
61
|
+
apifyClient,
|
|
62
62
|
limit: parsed.limit,
|
|
63
63
|
offset: parsed.offset,
|
|
64
64
|
paymentProvider: apifyMcpServer.options.paymentProvider,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search_actors_widget.js","sourceRoot":"","sources":["../../../src/tools/widgets/search_actors_widget.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE1E,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EACH,8BAA8B,EAC9B,uBAAuB,EACvB,0BAA0B,GAC7B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAEhF;;;;;GAKG;AACH,MAAM,4BAA4B,GAAG,0BAA0B,CAAC,MAAM,EAAE,CAAC;AAEzE,MAAM,gCAAgC,GAAG,MAAM,CAAA;;;;;;;;0EAQ2B,YAAY,CAAC,YAAY;;;;CAIlG,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAc,MAAM,CAAC,MAAM,CAAC;IACvD,IAAI,EAAE,SAAS,CAAC,QAAQ;IACxB,IAAI,EAAE,YAAY,CAAC,mBAAmB;IACtC,KAAK,EAAE,wBAAwB;IAC/B,WAAW,EAAE,gCAAgC;IAC7C,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,4BAA4B,CAAoB;IAC5E,YAAY,EAAE,6BAA6B;IAC3C,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAC;IACxE,2FAA2F;IAC3F,KAAK,EAAE;QACH,GAAG,MAAA,eAAe,CAAC,WAAW,CAAC,aAAa,CAAC,0CAAE,IAAI;KACtD;IACD,WAAW,EAAE;QACT,KAAK,EAAE,wBAAwB;QAC/B,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,KAAK;QACtB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,KAAK;KACvB;IACD,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;QACvC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;QACnE,MAAM,MAAM,GAAG,4BAA4B,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACxD,+EAA+E;QAC/E,uCAAuC;QACvC,MAAM,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACjD,qBAAqB,CAAC;gBAClB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,
|
|
1
|
+
{"version":3,"file":"search_actors_widget.js","sourceRoot":"","sources":["../../../src/tools/widgets/search_actors_widget.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE1E,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EACH,8BAA8B,EAC9B,uBAAuB,EACvB,0BAA0B,GAC7B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAEhF;;;;;GAKG;AACH,MAAM,4BAA4B,GAAG,0BAA0B,CAAC,MAAM,EAAE,CAAC;AAEzE,MAAM,gCAAgC,GAAG,MAAM,CAAA;;;;;;;;0EAQ2B,YAAY,CAAC,YAAY;;;;CAIlG,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAc,MAAM,CAAC,MAAM,CAAC;IACvD,IAAI,EAAE,SAAS,CAAC,QAAQ;IACxB,IAAI,EAAE,YAAY,CAAC,mBAAmB;IACtC,KAAK,EAAE,wBAAwB;IAC/B,WAAW,EAAE,gCAAgC;IAC7C,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,4BAA4B,CAAoB;IAC5E,YAAY,EAAE,6BAA6B;IAC3C,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAC;IACxE,2FAA2F;IAC3F,KAAK,EAAE;QACH,GAAG,MAAA,eAAe,CAAC,WAAW,CAAC,aAAa,CAAC,0CAAE,IAAI;KACtD;IACD,WAAW,EAAE;QACT,KAAK,EAAE,wBAAwB;QAC/B,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,KAAK;QACtB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,KAAK;KACvB;IACD,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;QACvC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;QACnE,MAAM,MAAM,GAAG,4BAA4B,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACxD,+EAA+E;QAC/E,uCAAuC;QACvC,MAAM,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACjD,qBAAqB,CAAC;gBAClB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,WAAW;gBACX,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,eAAe,EAAE,cAAc,CAAC,OAAO,CAAC,eAAe;aAC1D,CAAC;YACF,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC;SAC7C,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,8EAA8E;YAC9E,sDAAsD;YACtD,MAAM,YAAY,GAAG,8BAA8B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACrE,OAAO,SAAS,CAAC,YAAY,EAAE;gBAC3B,iBAAiB,EAAE;oBACf,MAAM,EAAE,EAAE;oBACV,KAAK,EAAE,MAAM,CAAC,QAAQ;oBACtB,KAAK,EAAE,CAAC;oBACR,YAAY,EAAE,EAAE;iBACnB;aACJ,CAAC,CAAC;QACP,CAAC;QAED,MAAM,EAAE,mBAAmB,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAC9E,MAAM,iBAAiB,GAAG;YACtB,MAAM,EAAE,mBAAmB;YAC3B,KAAK,EAAE,MAAM,CAAC,QAAQ;YACtB,KAAK,EAAE,MAAM,CAAC,MAAM;YACpB,QAAQ,EAAE,YAAY;YACtB,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,oBAAoB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;SACjF,CAAC;QAEF,MAAM,KAAK,GAAG;YACV,MAAM,CAAA;;kCAEgB,MAAM,CAAC,QAAQ;4CACL,MAAM,CAAC,MAAM;;;;;SAKhD;SACA,CAAC;QAEF,MAAM,YAAY,GAAG,eAAe,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QAChE,OAAO,SAAS,CAAC,KAAK,EAAE;YACpB,iBAAiB;YACjB,+EAA+E;YAC/E,IAAI,EAAE;gBACF,GAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI;gBACrB,0BAA0B,EAAE,4CAA4C,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,mBAAmB;aACvJ;SACJ,CAAC,CAAC;IACP,CAAC;CACK,CAAC,CAAC"}
|