@apify/actors-mcp-server 0.7.0 → 0.7.4
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/actor/server.d.ts.map +1 -1
- package/dist/actor/server.js +8 -0
- package/dist/actor/server.js.map +1 -1
- package/dist/apify-client.d.ts +12 -0
- package/dist/apify-client.d.ts.map +1 -1
- package/dist/apify-client.js +14 -0
- 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 +17 -0
- package/dist/const.js.map +1 -1
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +66 -134
- package/dist/mcp/server.js.map +1 -1
- package/dist/resources/resource_service.d.ts +23 -0
- package/dist/resources/resource_service.d.ts.map +1 -0
- package/dist/resources/resource_service.js +108 -0
- package/dist/resources/resource_service.js.map +1 -0
- package/dist/{utils → resources}/widgets.d.ts +19 -16
- package/dist/resources/widgets.d.ts.map +1 -0
- package/dist/{utils → resources}/widgets.js +2 -0
- package/dist/resources/widgets.js.map +1 -0
- package/dist/tools/actor.d.ts.map +1 -1
- package/dist/tools/actor.js +6 -21
- package/dist/tools/actor.js.map +1 -1
- package/dist/tools/categories.d.ts.map +1 -1
- package/dist/tools/categories.js +2 -1
- package/dist/tools/categories.js.map +1 -1
- package/dist/tools/dataset.d.ts.map +1 -1
- package/dist/tools/dataset.js +22 -10
- package/dist/tools/dataset.js.map +1 -1
- package/dist/tools/fetch-actor-details.d.ts.map +1 -1
- package/dist/tools/fetch-actor-details.js +1 -1
- package/dist/tools/fetch-actor-details.js.map +1 -1
- package/dist/tools/get-actor-output.d.ts.map +1 -1
- package/dist/tools/get-actor-output.js +4 -21
- package/dist/tools/get-actor-output.js.map +1 -1
- package/dist/tools/key_value_store.d.ts.map +1 -1
- package/dist/tools/key_value_store.js +22 -10
- package/dist/tools/key_value_store.js.map +1 -1
- package/dist/tools/run.d.ts.map +1 -1
- package/dist/tools/run.js +22 -10
- package/dist/tools/run.js.map +1 -1
- package/dist/tools/store_collection.d.ts.map +1 -1
- package/dist/tools/store_collection.js +1 -1
- package/dist/tools/store_collection.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types.d.ts +2 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/skyfire.d.ts +12 -0
- package/dist/utils/skyfire.d.ts.map +1 -0
- package/dist/utils/skyfire.js +19 -0
- package/dist/utils/skyfire.js.map +1 -0
- package/manifest.json +1 -1
- package/package.json +1 -1
- package/server.json +1 -1
- package/dist/utils/widgets.d.ts.map +0 -1
- package/dist/utils/widgets.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/actor/server.ts"],"names":[],"mappings":"AAWA,OAAO,OAAO,MAAM,SAAS,CAAC;AAW9B,wBAAgB,gBAAgB,CAC5B,IAAI,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/actor/server.ts"],"names":[],"mappings":"AAWA,OAAO,OAAO,MAAM,SAAS,CAAC;AAW9B,wBAAgB,gBAAgB,CAC5B,IAAI,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAwSjB"}
|
package/dist/actor/server.js
CHANGED
|
@@ -78,6 +78,9 @@ export function createExpressApp(host) {
|
|
|
78
78
|
const telemetryEnabled = (_b = (_a = parseBooleanFromString(telemetryEnabledParam)) !== null && _a !== void 0 ? _a : parseBooleanFromString(process.env.TELEMETRY_ENABLED)) !== null && _b !== void 0 ? _b : true;
|
|
79
79
|
const uiModeParam = urlParams.get('ui');
|
|
80
80
|
const uiMode = uiModeParam !== null && uiModeParam !== void 0 ? uiModeParam : process.env.UI_MODE;
|
|
81
|
+
// Extract payment mode parameter - if payment=skyfire, enable skyfire mode
|
|
82
|
+
const paymentParam = urlParams.get('payment');
|
|
83
|
+
const skyfireMode = paymentParam === 'skyfire';
|
|
81
84
|
const mcpServer = new ActorsMcpServer({
|
|
82
85
|
taskStore,
|
|
83
86
|
setupSigintHandler: false,
|
|
@@ -86,6 +89,7 @@ export function createExpressApp(host) {
|
|
|
86
89
|
enabled: telemetryEnabled,
|
|
87
90
|
},
|
|
88
91
|
uiMode,
|
|
92
|
+
skyfireMode,
|
|
89
93
|
});
|
|
90
94
|
const transport = new SSEServerTransport(Routes.MESSAGE, res);
|
|
91
95
|
// Generate a unique session ID for this SSE connection
|
|
@@ -200,6 +204,9 @@ export function createExpressApp(host) {
|
|
|
200
204
|
const telemetryEnabled = (_d = (_c = parseBooleanFromString(telemetryEnabledParam)) !== null && _c !== void 0 ? _c : parseBooleanFromString(process.env.TELEMETRY_ENABLED)) !== null && _d !== void 0 ? _d : true;
|
|
201
205
|
const uiModeParam = urlParams.get('ui');
|
|
202
206
|
const uiMode = uiModeParam !== null && uiModeParam !== void 0 ? uiModeParam : process.env.UI_MODE;
|
|
207
|
+
// Extract payment mode parameter - if payment=skyfire, enable skyfire mode
|
|
208
|
+
const paymentParam = urlParams.get('payment');
|
|
209
|
+
const skyfireMode = paymentParam === 'skyfire';
|
|
203
210
|
const mcpServer = new ActorsMcpServer({
|
|
204
211
|
taskStore,
|
|
205
212
|
setupSigintHandler: false,
|
|
@@ -209,6 +216,7 @@ export function createExpressApp(host) {
|
|
|
209
216
|
enabled: telemetryEnabled,
|
|
210
217
|
},
|
|
211
218
|
uiMode,
|
|
219
|
+
skyfireMode,
|
|
212
220
|
});
|
|
213
221
|
// Load MCP server tools
|
|
214
222
|
const apifyToken = process.env.APIFY_TOKEN;
|
package/dist/actor/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/actor/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/actor/server.ts"],"names":[],"mappings":"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"}
|
package/dist/apify-client.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { ApifyClientOptions } from 'apify';
|
|
2
2
|
import { ApifyClient as _ApifyClient } from 'apify-client';
|
|
3
|
+
import type { ActorsMcpServer } from './mcp/server.js';
|
|
4
|
+
import type { ApifyToken } from './types.js';
|
|
3
5
|
type ExtendedApifyClientOptions = Omit<ApifyClientOptions, 'token'> & {
|
|
4
6
|
token?: string | null | undefined;
|
|
5
7
|
skyfirePayId?: string;
|
|
@@ -8,5 +10,15 @@ export declare function getApifyAPIBaseUrl(): string;
|
|
|
8
10
|
export declare class ApifyClient extends _ApifyClient {
|
|
9
11
|
constructor(options: ExtendedApifyClientOptions);
|
|
10
12
|
}
|
|
13
|
+
/**
|
|
14
|
+
* Creates ApifyClient with appropriate credentials based on Skyfire mode.
|
|
15
|
+
* In Skyfire mode, uses skyfire-pay-id from args; otherwise uses apifyToken.
|
|
16
|
+
*
|
|
17
|
+
* @param apifyMcpServer - The MCP server instance with configuration options
|
|
18
|
+
* @param args - Tool arguments that may contain skyfire-pay-id
|
|
19
|
+
* @param apifyToken - Standard Apify token for non-Skyfire mode
|
|
20
|
+
* @returns ApifyClient instance configured for the appropriate mode
|
|
21
|
+
*/
|
|
22
|
+
export declare function createApifyClientWithSkyfireSupport(apifyMcpServer: ActorsMcpServer, args: Record<string, unknown>, apifyToken: ApifyToken): ApifyClient;
|
|
11
23
|
export {};
|
|
12
24
|
//# sourceMappingURL=apify-client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apify-client.d.ts","sourceRoot":"","sources":["../src/apify-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAChD,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"apify-client.d.ts","sourceRoot":"","sources":["../src/apify-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAChD,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,cAAc,CAAC;AAI3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,KAAK,0BAA0B,GAAG,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,GAAG;IAClE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAcF,wBAAgB,kBAAkB,IAAI,MAAM,CAI3C;AAED,qBAAa,WAAY,SAAQ,YAAY;gBAC7B,OAAO,EAAE,0BAA0B;CAiClD;AAED;;;;;;;;GAQG;AACH,wBAAgB,mCAAmC,CAC/C,cAAc,EAAE,eAAe,EAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,UAAU,EAAE,UAAU,GACvB,WAAW,CAIb"}
|
package/dist/apify-client.js
CHANGED
|
@@ -53,4 +53,18 @@ export class ApifyClient extends _ApifyClient {
|
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* Creates ApifyClient with appropriate credentials based on Skyfire mode.
|
|
58
|
+
* In Skyfire mode, uses skyfire-pay-id from args; otherwise uses apifyToken.
|
|
59
|
+
*
|
|
60
|
+
* @param apifyMcpServer - The MCP server instance with configuration options
|
|
61
|
+
* @param args - Tool arguments that may contain skyfire-pay-id
|
|
62
|
+
* @param apifyToken - Standard Apify token for non-Skyfire mode
|
|
63
|
+
* @returns ApifyClient instance configured for the appropriate mode
|
|
64
|
+
*/
|
|
65
|
+
export function createApifyClientWithSkyfireSupport(apifyMcpServer, args, apifyToken) {
|
|
66
|
+
return apifyMcpServer.options.skyfireMode && typeof args['skyfire-pay-id'] === 'string'
|
|
67
|
+
? new ApifyClient({ skyfirePayId: args['skyfire-pay-id'] })
|
|
68
|
+
: new ApifyClient({ token: apifyToken });
|
|
69
|
+
}
|
|
56
70
|
//# sourceMappingURL=apify-client.js.map
|
package/dist/apify-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apify-client.js","sourceRoot":"","sources":["../src/apify-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,cAAc,CAAC;AAG3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"apify-client.js","sourceRoot":"","sources":["../src/apify-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,cAAc,CAAC;AAG3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAS/C;;;;GAIG;AACH,SAAS,YAAY,CAAC,MAA0B;;IAC5C,MAAM,aAAa,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IACpC,aAAa,CAAC,OAAO,GAAG,MAAA,aAAa,CAAC,OAAO,mCAAI,EAAE,CAAC;IACpD,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,GAAG,MAAA,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,mCAAI,EAAE,KAAK,iBAAiB,EAAE,CAAC;IAC3G,OAAO,aAAa,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,kBAAkB;IAC9B,wHAAwH;IACxH,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB;QAAE,OAAO,uBAAuB,CAAC;IACjE,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,uBAAuB,CAAC;AACrE,CAAC;AAED,MAAM,OAAO,WAAY,SAAQ,YAAY;IACzC,YAAY,OAAmC;;QAC3C;;;;;WAKG;QACH,IAAI,CAAA,MAAA,OAAO,CAAC,KAAK,0CAAE,WAAW,EAAE,MAAK,kBAAkB,IAAI,OAAO,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YAChF,6CAA6C;YAC7C,OAAO,OAAO,CAAC,KAAK,CAAC;QACzB,CAAC;QAED,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,EAAE,GAAG,OAAO,CAAC;QACnD,MAAM,mBAAmB,GAAG,CAAC,YAAY,CAAC,CAAC;QAC3C;;WAEG;QACH,IAAI,YAAY,EAAE,CAAC;YACf,mBAAmB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;;gBAChC,MAAM,aAAa,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpC,aAAa,CAAC,OAAO,GAAG,MAAA,aAAa,CAAC,OAAO,mCAAI,EAAE,CAAC;gBACpD,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,YAAY,CAAC;gBACvD,OAAO,aAAa,CAAC;YACzB,CAAC,CAAC,CAAC;QACP,CAAC;QAED,KAAK,CAAC;YACF,sDAAsD;YACtD,GAAG,aAAmC;YACtC,OAAO,EAAE,kBAAkB,EAAE;YAC7B,mBAAmB;SACtB,CAAC,CAAC;IACP,CAAC;CACJ;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,mCAAmC,CAC/C,cAA+B,EAC/B,IAA6B,EAC7B,UAAsB;IAEtB,OAAO,cAAc,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,QAAQ;QACnF,CAAC,CAAC,IAAI,WAAW,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAC3D,CAAC,CAAC,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACjD,CAAC"}
|
package/dist/const.d.ts
CHANGED
|
@@ -45,6 +45,11 @@ export declare const SKYFIRE_SELLER_ID: string | undefined;
|
|
|
45
45
|
export declare const SKYFIRE_TOOL_INSTRUCTIONS: string;
|
|
46
46
|
export declare const SKYFIRE_PAY_ID_PROPERTY_DESCRIPTION = "Skyfire PAY token ID used for billing purposes.";
|
|
47
47
|
export declare const SKYFIRE_README_CONTENT: string;
|
|
48
|
+
/**
|
|
49
|
+
* Set of internal tool names that require Skyfire PAY token ID in Skyfire mode.
|
|
50
|
+
* These tools interact with Actor runs, datasets, or key-value stores and need billing support.
|
|
51
|
+
*/
|
|
52
|
+
export declare const SKYFIRE_ENABLED_TOOLS: Set<HelperTools>;
|
|
48
53
|
export declare const CALL_ACTOR_MCP_MISSING_TOOL_NAME_MSG = "When calling an MCP server Actor, you must specify the tool name in the actor parameter as \"{actorName}:{toolName}\" in the \"actor\" input property.";
|
|
49
54
|
export declare const ACTOR_CACHE_MAX_SIZE = 500;
|
|
50
55
|
export declare const ACTOR_CACHE_TTL_SECS: number;
|
package/dist/const.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"const.d.ts","sourceRoot":"","sources":["../src/const.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,uBAAuB,OAAQ,CAAC;AAE7C,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAC1C,eAAO,MAAM,4BAA4B,MAAM,CAAC;AAGhD,eAAO,MAAM,uBAAuB,OAAQ,CAAC;AAG7C;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,QAAQ,CAAC;AAG3C,eAAO,MAAM,WAAW,qBAAqB,CAAC;AAC9C,eAAO,MAAM,cAAc,UAAU,CAAC;AAGtC,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AAErD,oBAAY,WAAW;IACnB,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,iBAAiB,wBAAwB;IACzC,gBAAgB,qBAAqB;IACrC,gBAAgB,oBAAoB;IACpC,cAAc,kBAAkB;IAChC,cAAc,kBAAkB;IAChC,kBAAkB,uBAAuB;IACzC,WAAW,gBAAgB;IAC3B,gBAAgB,qBAAqB;IACrC,iBAAiB,sBAAsB;IACvC,kBAAkB,uBAAuB;IACzC,wBAAwB,6BAA6B;IACrD,mBAAmB,wBAAwB;IAC3C,wBAAwB,6BAA6B;IACrD,0BAA0B,+BAA+B;IACzD,YAAY,kBAAkB;IAC9B,WAAW,sBAAsB;IACjC,UAAU,qBAAqB;IAC/B,iBAAiB,sBAAsB;CAC1C;AAED,eAAO,MAAM,eAAe,0BAA0B,CAAC;AACvD,eAAO,MAAM,kCAAkC,UAA2C,CAAC;AAC3F,eAAO,MAAM,+BAA+B,8vBAQgM,CAAC;AAE7O,eAAO,MAAM,QAAQ;;CAIpB,CAAC;AAEF,eAAO,MAAM,sBAAsB,IAAM,CAAC;AAC1C,eAAO,MAAM,iBAAiB,oBAAwC,CAAC;AAEvE,eAAO,MAAM,yBAAyB,QAAisB,CAAC;AAExuB,eAAO,MAAM,mCAAmC,oDAAoD,CAAC;AAErG,eAAO,MAAM,sBAAsB,QAA0wB,CAAC;AAE9yB,eAAO,MAAM,oCAAoC,2JAAuJ,CAAC;AAGzM,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,oBAAoB,QAAU,CAAC;AAC5C,eAAO,MAAM,yBAAyB,MAAM,CAAC;AAC7C,eAAO,MAAM,yBAAyB,QAAU,CAAC;AACjD,eAAO,MAAM,gCAAgC,QAAS,CAAC;AACvD,eAAO,MAAM,gCAAgC,MAAM,CAAC;AACpD,eAAO,MAAM,yBAAyB,MAAM,CAAC;AAC7C,eAAO,MAAM,yBAAyB,QAAU,CAAC;AACjD,eAAO,MAAM,mBAAmB,MAAM,CAAC;AACvC,eAAO,MAAM,mBAAmB,QAAU,CAAC;AAE3C,eAAO,MAAM,mBAAmB;IAC5B,oBAAoB;;;IAGpB,kCAAkC;;IAElC,iCAAiC;;CAE3B,CAAC;AAEX;;;GAGG;AACH,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAE3C,eAAO,MAAM,uBAAuB,SAAS,CAAC;AAE9C,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;EAoCf,CAAC;AAEX,eAAO,MAAM,mBAAmB,4DAGtB,CAAC;AAEX,eAAO,MAAM,iCAAiC,OAAQ,CAAC;AAEvD,eAAO,MAAM,eAAe,sBAAsB,CAAC;AACnD,eAAO,MAAM,aAAa,0BAA0B,CAAC;AAGrD,eAAO,MAAM,aAAa;;;CAGhB,CAAC;AAEX,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAC9C,eAAO,MAAM,qBAAqB,QAAqB,CAAC;AAMxD,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAE1C,eAAO,MAAM,yBAAyB,OAAQ,CAAC;AAG/C;;;GAGG;AACH,eAAO,MAAM,WAAW;;;;;CAKd,CAAC;AAGX,eAAO,MAAM,iCAAiC,mCAAoC,CAAC;AAEnF,eAAO,MAAM,mBAAmB,+0GAsD/B,CAAC"}
|
|
1
|
+
{"version":3,"file":"const.d.ts","sourceRoot":"","sources":["../src/const.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,uBAAuB,OAAQ,CAAC;AAE7C,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAC1C,eAAO,MAAM,4BAA4B,MAAM,CAAC;AAGhD,eAAO,MAAM,uBAAuB,OAAQ,CAAC;AAG7C;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,QAAQ,CAAC;AAG3C,eAAO,MAAM,WAAW,qBAAqB,CAAC;AAC9C,eAAO,MAAM,cAAc,UAAU,CAAC;AAGtC,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AAErD,oBAAY,WAAW;IACnB,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,iBAAiB,wBAAwB;IACzC,gBAAgB,qBAAqB;IACrC,gBAAgB,oBAAoB;IACpC,cAAc,kBAAkB;IAChC,cAAc,kBAAkB;IAChC,kBAAkB,uBAAuB;IACzC,WAAW,gBAAgB;IAC3B,gBAAgB,qBAAqB;IACrC,iBAAiB,sBAAsB;IACvC,kBAAkB,uBAAuB;IACzC,wBAAwB,6BAA6B;IACrD,mBAAmB,wBAAwB;IAC3C,wBAAwB,6BAA6B;IACrD,0BAA0B,+BAA+B;IACzD,YAAY,kBAAkB;IAC9B,WAAW,sBAAsB;IACjC,UAAU,qBAAqB;IAC/B,iBAAiB,sBAAsB;CAC1C;AAED,eAAO,MAAM,eAAe,0BAA0B,CAAC;AACvD,eAAO,MAAM,kCAAkC,UAA2C,CAAC;AAC3F,eAAO,MAAM,+BAA+B,8vBAQgM,CAAC;AAE7O,eAAO,MAAM,QAAQ;;CAIpB,CAAC;AAEF,eAAO,MAAM,sBAAsB,IAAM,CAAC;AAC1C,eAAO,MAAM,iBAAiB,oBAAwC,CAAC;AAEvE,eAAO,MAAM,yBAAyB,QAAisB,CAAC;AAExuB,eAAO,MAAM,mCAAmC,oDAAoD,CAAC;AAErG,eAAO,MAAM,sBAAsB,QAA0wB,CAAC;AAE9yB;;;GAGG;AACH,eAAO,MAAM,qBAAqB,kBAYhC,CAAC;AAEH,eAAO,MAAM,oCAAoC,2JAAuJ,CAAC;AAGzM,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,oBAAoB,QAAU,CAAC;AAC5C,eAAO,MAAM,yBAAyB,MAAM,CAAC;AAC7C,eAAO,MAAM,yBAAyB,QAAU,CAAC;AACjD,eAAO,MAAM,gCAAgC,QAAS,CAAC;AACvD,eAAO,MAAM,gCAAgC,MAAM,CAAC;AACpD,eAAO,MAAM,yBAAyB,MAAM,CAAC;AAC7C,eAAO,MAAM,yBAAyB,QAAU,CAAC;AACjD,eAAO,MAAM,mBAAmB,MAAM,CAAC;AACvC,eAAO,MAAM,mBAAmB,QAAU,CAAC;AAE3C,eAAO,MAAM,mBAAmB;IAC5B,oBAAoB;;;IAGpB,kCAAkC;;IAElC,iCAAiC;;CAE3B,CAAC;AAEX;;;GAGG;AACH,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAE3C,eAAO,MAAM,uBAAuB,SAAS,CAAC;AAE9C,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;EAoCf,CAAC;AAEX,eAAO,MAAM,mBAAmB,4DAGtB,CAAC;AAEX,eAAO,MAAM,iCAAiC,OAAQ,CAAC;AAEvD,eAAO,MAAM,eAAe,sBAAsB,CAAC;AACnD,eAAO,MAAM,aAAa,0BAA0B,CAAC;AAGrD,eAAO,MAAM,aAAa;;;CAGhB,CAAC;AAEX,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAC9C,eAAO,MAAM,qBAAqB,QAAqB,CAAC;AAMxD,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAE1C,eAAO,MAAM,yBAAyB,OAAQ,CAAC;AAG/C;;;GAGG;AACH,eAAO,MAAM,WAAW;;;;;CAKd,CAAC;AAGX,eAAO,MAAM,iCAAiC,mCAAoC,CAAC;AAEnF,eAAO,MAAM,mBAAmB,+0GAsD/B,CAAC"}
|
package/dist/const.js
CHANGED
|
@@ -62,6 +62,23 @@ export const SKYFIRE_SELLER_ID = process.env.SKYFIRE_SELLER_SERVICE_ID;
|
|
|
62
62
|
export const SKYFIRE_TOOL_INSTRUCTIONS = `To run the Actor, you need to provide a Skyfire payment ID in the \`skyfire-pay-id\` input property. You first need to create the Skyfire PAY token by calling the \`create-pay-token\` tool from the Skyfire MCP server and then provide the created token in the \`skyfire-pay-id\` input property when calling Actor tool. The Skyfire PAY token is used for billing purposes and needs to be charged with at least ${SKYFIRE_MIN_CHARGE_USD} USD.${SKYFIRE_SELLER_ID ? ` The Skyfire seller ID for Apify MCP server is "${SKYFIRE_SELLER_ID}".` : ''} When retrieving Actor output using the \`get-actor-output\` tool, you also need to provide the same Skyfire PAY token ID in the \`skyfire-pay-id\` input property.`;
|
|
63
63
|
export const SKYFIRE_PAY_ID_PROPERTY_DESCRIPTION = `Skyfire PAY token ID used for billing purposes.`;
|
|
64
64
|
export const SKYFIRE_README_CONTENT = `The Apify MCP Server allows clients to interact with Apify Actors, storage, and documentation. Before running any Apify Actor, you need to set up a Skyfire PAY token for billing purposes. To set up the PAY token you need to use the create-pay-token tool from the Skyfire MCP server. The PAY token must be charged with a minimum of ${SKYFIRE_MIN_CHARGE_USD} USD to be valid.${SKYFIRE_SELLER_ID ? ` The Skyfire seller ID for Apify MCP server is "${SKYFIRE_SELLER_ID}".` : ''} When running an Actor using the call-actor tool, you must provide the Skyfire PAY token ID in the \`skyfire-pay-id\` input property. Similarly, when retrieving Actor output using the get-actor-output tool, you must also provide the same Skyfire PAY token ID in the \`skyfire-pay-id\` input property.`;
|
|
65
|
+
/**
|
|
66
|
+
* Set of internal tool names that require Skyfire PAY token ID in Skyfire mode.
|
|
67
|
+
* These tools interact with Actor runs, datasets, or key-value stores and need billing support.
|
|
68
|
+
*/
|
|
69
|
+
export const SKYFIRE_ENABLED_TOOLS = new Set([
|
|
70
|
+
HelperTools.ACTOR_CALL,
|
|
71
|
+
HelperTools.ACTOR_OUTPUT_GET,
|
|
72
|
+
HelperTools.ACTOR_RUNS_GET,
|
|
73
|
+
HelperTools.ACTOR_RUNS_LOG,
|
|
74
|
+
HelperTools.ACTOR_RUNS_ABORT,
|
|
75
|
+
HelperTools.DATASET_GET,
|
|
76
|
+
HelperTools.DATASET_GET_ITEMS,
|
|
77
|
+
HelperTools.DATASET_SCHEMA_GET,
|
|
78
|
+
HelperTools.KEY_VALUE_STORE_GET,
|
|
79
|
+
HelperTools.KEY_VALUE_STORE_KEYS_GET,
|
|
80
|
+
HelperTools.KEY_VALUE_STORE_RECORD_GET,
|
|
81
|
+
]);
|
|
65
82
|
export const CALL_ACTOR_MCP_MISSING_TOOL_NAME_MSG = `When calling an MCP server Actor, you must specify the tool name in the actor parameter as "{actorName}:{toolName}" in the "actor" input property.`;
|
|
66
83
|
// Cache
|
|
67
84
|
export const ACTOR_CACHE_MAX_SIZE = 500;
|
package/dist/const.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"const.js","sourceRoot":"","sources":["../src/const.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"const.js","sourceRoot":"","sources":["../src/const.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4DAA4D,CAAC;AAE5F,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAyB/E,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4DAA4D,CAAC;AAE5F,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAyB/E,OAAO,EAAE,WAAW,EAAuC,MAAM,oBAAoB,CAAC;AAsBtF,OAAO,KAAK,EAER,sBAAsB,EAMtB,SAAS,EAEZ,MAAM,aAAa,CAAC;AAiBrB;;GAEG;AACH,qBAAa,eAAe;IACxB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC9C,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,eAAe,CAAU;IACjC,SAAgB,OAAO,EAAE,sBAAsB,CAAC;IAChD,SAAgB,SAAS,EAAE,SAAS,CAAC;IAGrC,OAAO,CAAC,gBAAgB,CAAwB;IAChD,OAAO,CAAC,YAAY,CAAuC;IAG3D,OAAO,CAAC,gBAAgB,CAA2C;gBAEvD,OAAO,GAAE,sBAA2B;IA2DhD;;OAEG;IACH,OAAO,CAAC,cAAc;IAetB;;;OAGG;IACI,aAAa,IAAI,MAAM,EAAE;IAIhC;;;;;;;MAOE;IACK,2BAA2B,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,IAAI;IAOzE;;;MAGE;IACK,6BAA6B;IAOpC;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAM7B;;;OAGG;IACI,kBAAkB,IAAI,MAAM,EAAE;IAMrC;;;OAGG;IACH,OAAO,CAAC,yBAAyB;IAQjC;;;OAGG;IACI,gBAAgB,IAAI,MAAM,EAAE;IAInC;;;;;MAKE;IACW,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW;IA6B1E;;;;;;OAMG;IACU,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAQzG;;;;;;OAMG;IACU,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW;IAQnE;OACG;IACI,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,+BAA+B,UAAQ,GAAG,MAAM,EAAE;IAahG;;;;;OAKG;IACI,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,+BAA+B,UAAQ;IAwC9E,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,qBAAqB;IAoB7B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAyC3B;;QAEI;IACJ,OAAO,CAAC,iBAAiB;IAuFzB,OAAO,CAAC,iBAAiB;IAuTzB;;;;;;;;OAQG;IACH,OAAO,CAAC,yBAAyB;IAoBjC;;;;;;;;;;;OAWG;YAEW,wBAAwB;YA+KxB,oBAAoB;IAmClC;;OAEG;YACW,cAAc;IA4CtB,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAoB/B"}
|
package/dist/mcp/server.js
CHANGED
|
@@ -6,9 +6,11 @@ import { InMemoryTaskStore } from '@modelcontextprotocol/sdk/experimental/tasks/
|
|
|
6
6
|
import { Server } from '@modelcontextprotocol/sdk/server/index.js';
|
|
7
7
|
import { CallToolRequestSchema, CallToolResultSchema, CancelTaskRequestSchema, ErrorCode, GetPromptRequestSchema, GetTaskPayloadRequestSchema, GetTaskRequestSchema, ListPromptsRequestSchema, ListResourcesRequestSchema, ListResourceTemplatesRequestSchema, ListTasksRequestSchema, ListToolsRequestSchema, McpError, ReadResourceRequestSchema, ServerNotificationSchema, SetLevelRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
|
|
8
8
|
import log from '@apify/log';
|
|
9
|
-
import { ApifyClient } from '../apify-client.js';
|
|
10
|
-
import { ALLOWED_TASK_TOOL_EXECUTION_MODES, APIFY_MCP_URL, DEFAULT_TELEMETRY_ENABLED, DEFAULT_TELEMETRY_ENV, HelperTools, SERVER_INSTRUCTIONS, SERVER_NAME, SERVER_VERSION,
|
|
9
|
+
import { ApifyClient, createApifyClientWithSkyfireSupport } from '../apify-client.js';
|
|
10
|
+
import { ALLOWED_TASK_TOOL_EXECUTION_MODES, APIFY_MCP_URL, DEFAULT_TELEMETRY_ENABLED, DEFAULT_TELEMETRY_ENV, HelperTools, SERVER_INSTRUCTIONS, SERVER_NAME, SERVER_VERSION, SKYFIRE_ENABLED_TOOLS, SKYFIRE_PAY_ID_PROPERTY_DESCRIPTION, SKYFIRE_TOOL_INSTRUCTIONS, TOOL_STATUS, } from '../const.js';
|
|
11
11
|
import { prompts } from '../prompts/index.js';
|
|
12
|
+
import { createResourceService } from '../resources/resource_service.js';
|
|
13
|
+
import { resolveAvailableWidgets } from '../resources/widgets.js';
|
|
12
14
|
import { getTelemetryEnv, trackToolCall } from '../telemetry.js';
|
|
13
15
|
import { callActorGetDataset, defaultTools, getActorsAsTools, toolCategories } from '../tools/index.js';
|
|
14
16
|
import { decodeDotPropertyNames } from '../tools/utils.js';
|
|
@@ -17,11 +19,11 @@ import { parseBooleanFromString } from '../utils/generic.js';
|
|
|
17
19
|
import { logHttpError } from '../utils/logging.js';
|
|
18
20
|
import { buildMCPResponse } from '../utils/mcp.js';
|
|
19
21
|
import { createProgressTracker } from '../utils/progress.js';
|
|
22
|
+
import { validateSkyfirePayId } from '../utils/skyfire.js';
|
|
20
23
|
import { getToolStatusFromError } from '../utils/tool-status.js';
|
|
21
24
|
import { cloneToolEntry, getToolPublicFieldOnly } from '../utils/tools.js';
|
|
22
25
|
import { getUserIdFromTokenCached } from '../utils/userid-cache.js';
|
|
23
26
|
import { getPackageVersion } from '../utils/version.js';
|
|
24
|
-
import { resolveAvailableWidgets } from '../utils/widgets.js';
|
|
25
27
|
import { connectMCPClient } from './client.js';
|
|
26
28
|
import { EXTERNAL_TOOL_CALL_TIMEOUT_MSEC, LOG_LEVEL_MAP } from './const.js';
|
|
27
29
|
import { isTaskCancelled, processParamsGetTools } from './utils.js';
|
|
@@ -322,8 +324,7 @@ export class ActorsMcpServer {
|
|
|
322
324
|
let modified = false;
|
|
323
325
|
// Handle Skyfire mode modifications
|
|
324
326
|
if (this.options.skyfireMode && (wrap.type === 'actor'
|
|
325
|
-
|| (wrap.type === 'internal' && wrap.name
|
|
326
|
-
|| (wrap.type === 'internal' && wrap.name === HelperTools.ACTOR_OUTPUT_GET))) {
|
|
327
|
+
|| (wrap.type === 'internal' && SKYFIRE_ENABLED_TOOLS.has(wrap.name)))) {
|
|
327
328
|
// Add Skyfire instructions to description if not already present
|
|
328
329
|
if (clonedWrap.description && !clonedWrap.description.includes(SKYFIRE_TOOL_INSTRUCTIONS)) {
|
|
329
330
|
clonedWrap.description += `\n\n${SKYFIRE_TOOL_INSTRUCTIONS}`;
|
|
@@ -406,103 +407,19 @@ export class ActorsMcpServer {
|
|
|
406
407
|
});
|
|
407
408
|
}
|
|
408
409
|
setupResourceHandlers() {
|
|
410
|
+
const resourceService = createResourceService({
|
|
411
|
+
skyfireMode: this.options.skyfireMode,
|
|
412
|
+
uiMode: this.options.uiMode,
|
|
413
|
+
getAvailableWidgets: () => this.availableWidgets,
|
|
414
|
+
});
|
|
409
415
|
this.server.setRequestHandler(ListResourcesRequestSchema, async () => {
|
|
410
|
-
|
|
411
|
-
/**
|
|
412
|
-
* Return the usage guide resource only if Skyfire mode is enabled.
|
|
413
|
-
*/
|
|
414
|
-
if (this.options.skyfireMode) {
|
|
415
|
-
resources.push({
|
|
416
|
-
uri: 'file://readme.md',
|
|
417
|
-
name: 'readme',
|
|
418
|
-
description: `Apify MCP Server usage guide. Read this to understand how to use the server, especially in Skyfire mode before interacting with it.`,
|
|
419
|
-
mimeType: 'text/markdown',
|
|
420
|
-
});
|
|
421
|
-
}
|
|
422
|
-
if (this.options.uiMode === 'openai') {
|
|
423
|
-
// Only register widgets that are available
|
|
424
|
-
for (const widget of this.availableWidgets.values()) {
|
|
425
|
-
if (widget.exists) {
|
|
426
|
-
resources.push({
|
|
427
|
-
uri: widget.uri,
|
|
428
|
-
name: widget.name,
|
|
429
|
-
description: widget.description,
|
|
430
|
-
mimeType: 'text/html+skybridge',
|
|
431
|
-
_meta: widget.meta,
|
|
432
|
-
});
|
|
433
|
-
}
|
|
434
|
-
}
|
|
435
|
-
}
|
|
436
|
-
return { resources };
|
|
416
|
+
return await resourceService.listResources();
|
|
437
417
|
});
|
|
438
418
|
this.server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
|
|
439
|
-
|
|
440
|
-
if (this.options.skyfireMode && uri === 'file://readme.md') {
|
|
441
|
-
return {
|
|
442
|
-
contents: [{
|
|
443
|
-
uri: 'file://readme.md',
|
|
444
|
-
mimeType: 'text/markdown',
|
|
445
|
-
text: SKYFIRE_README_CONTENT,
|
|
446
|
-
}],
|
|
447
|
-
};
|
|
448
|
-
}
|
|
449
|
-
if (this.options.uiMode === 'openai' && uri.startsWith('ui://widget/')) {
|
|
450
|
-
const widget = this.availableWidgets.get(uri);
|
|
451
|
-
if (!widget || !widget.exists) {
|
|
452
|
-
return {
|
|
453
|
-
contents: [{
|
|
454
|
-
uri,
|
|
455
|
-
mimeType: 'text/plain',
|
|
456
|
-
text: `Widget ${uri} is not available. ${!widget ? 'Not found in registry.' : `File not found at ${widget.jsPath}`}`,
|
|
457
|
-
}],
|
|
458
|
-
};
|
|
459
|
-
}
|
|
460
|
-
try {
|
|
461
|
-
log.debug('Reading widget file', { uri, jsPath: widget.jsPath });
|
|
462
|
-
const fs = await import('node:fs');
|
|
463
|
-
const widgetJs = fs.readFileSync(widget.jsPath, 'utf-8');
|
|
464
|
-
const widgetHtml = `<!DOCTYPE html>
|
|
465
|
-
<html lang="en">
|
|
466
|
-
<head>
|
|
467
|
-
<meta charset="UTF-8" />
|
|
468
|
-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
469
|
-
<title>${widget.title}</title>
|
|
470
|
-
</head>
|
|
471
|
-
<body>
|
|
472
|
-
<div id="root"></div>
|
|
473
|
-
<script type="module">${widgetJs}</script>
|
|
474
|
-
</body>
|
|
475
|
-
</html>`;
|
|
476
|
-
return {
|
|
477
|
-
contents: [{
|
|
478
|
-
uri,
|
|
479
|
-
mimeType: 'text/html+skybridge',
|
|
480
|
-
text: widgetHtml,
|
|
481
|
-
html: widgetHtml,
|
|
482
|
-
_meta: widget.meta,
|
|
483
|
-
}],
|
|
484
|
-
};
|
|
485
|
-
}
|
|
486
|
-
catch (error) {
|
|
487
|
-
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
488
|
-
return {
|
|
489
|
-
contents: [{
|
|
490
|
-
uri,
|
|
491
|
-
mimeType: 'text/plain',
|
|
492
|
-
text: `Failed to load widget: ${errorMessage}`,
|
|
493
|
-
}],
|
|
494
|
-
};
|
|
495
|
-
}
|
|
496
|
-
}
|
|
497
|
-
return {
|
|
498
|
-
contents: [{
|
|
499
|
-
uri, mimeType: 'text/plain', text: `Resource ${uri} not found`,
|
|
500
|
-
}],
|
|
501
|
-
};
|
|
419
|
+
return await resourceService.readResource(request.params.uri);
|
|
502
420
|
});
|
|
503
421
|
this.server.setRequestHandler(ListResourceTemplatesRequestSchema, async () => {
|
|
504
|
-
|
|
505
|
-
return { resourceTemplates: [] };
|
|
422
|
+
return await resourceService.listResourceTemplates();
|
|
506
423
|
});
|
|
507
424
|
}
|
|
508
425
|
/**
|
|
@@ -732,6 +649,7 @@ Please remove the "task" parameter from the tool call request or use a different
|
|
|
732
649
|
progressToken,
|
|
733
650
|
extra,
|
|
734
651
|
mcpSessionId,
|
|
652
|
+
userRentedActorIds,
|
|
735
653
|
});
|
|
736
654
|
});
|
|
737
655
|
// Return task immediately; execution continues asynchronously
|
|
@@ -741,6 +659,14 @@ Please remove the "task" parameter from the tool call request or use a different
|
|
|
741
659
|
const startTime = Date.now();
|
|
742
660
|
let toolStatus = TOOL_STATUS.SUCCEEDED;
|
|
743
661
|
try {
|
|
662
|
+
// Centralized skyfire validation for tools that require it
|
|
663
|
+
if (tool.requiresSkyfirePayId) {
|
|
664
|
+
const skyfireError = validateSkyfirePayId(this, args);
|
|
665
|
+
if (skyfireError) {
|
|
666
|
+
toolStatus = TOOL_STATUS.SOFT_FAIL;
|
|
667
|
+
return skyfireError;
|
|
668
|
+
}
|
|
669
|
+
}
|
|
744
670
|
// Handle internal tool
|
|
745
671
|
if (tool.type === 'internal') {
|
|
746
672
|
// Only create progress tracker for call-actor tool
|
|
@@ -822,19 +748,11 @@ Please verify the server URL is correct and accessible, and ensure you have a va
|
|
|
822
748
|
}
|
|
823
749
|
// Handle actor tool
|
|
824
750
|
if (tool.type === 'actor') {
|
|
825
|
-
if (this.options.skyfireMode && args['skyfire-pay-id'] === undefined) {
|
|
826
|
-
return buildMCPResponse({ texts: [SKYFIRE_TOOL_INSTRUCTIONS] });
|
|
827
|
-
}
|
|
828
751
|
// Create progress tracker if progressToken is available
|
|
829
752
|
const progressTracker = createProgressTracker(progressToken, extra.sendNotification);
|
|
830
753
|
const callOptions = { memory: tool.memoryMbytes };
|
|
831
|
-
|
|
832
|
-
|
|
833
|
-
*/
|
|
834
|
-
const { 'skyfire-pay-id': skyfirePayId, ...actorArgs } = args;
|
|
835
|
-
const apifyClient = this.options.skyfireMode && typeof skyfirePayId === 'string'
|
|
836
|
-
? new ApifyClient({ skyfirePayId })
|
|
837
|
-
: new ApifyClient({ token: apifyToken });
|
|
754
|
+
const { 'skyfire-pay-id': _skyfirePayId, ...actorArgs } = args;
|
|
755
|
+
const apifyClient = createApifyClientWithSkyfireSupport(this, args, apifyToken);
|
|
838
756
|
try {
|
|
839
757
|
log.info('Calling Actor', { actorName: tool.actorFullName, input: actorArgs });
|
|
840
758
|
const callResult = await callActorGetDataset(tool.actorFullName, actorArgs, apifyClient, callOptions, progressTracker, extra.signal);
|
|
@@ -917,7 +835,7 @@ Please verify the tool name and ensure the tool is properly registered.`;
|
|
|
917
835
|
*/
|
|
918
836
|
async executeToolAndUpdateTask(params) {
|
|
919
837
|
var _a;
|
|
920
|
-
const { taskId, tool, args, apifyToken, progressToken, extra, mcpSessionId } = params;
|
|
838
|
+
const { taskId, tool, args, apifyToken, progressToken, extra, mcpSessionId, userRentedActorIds } = params;
|
|
921
839
|
let toolStatus = TOOL_STATUS.SUCCEEDED;
|
|
922
840
|
const startTime = Date.now();
|
|
923
841
|
log.debug('[executeToolAndUpdateTask] Starting task execution', {
|
|
@@ -929,23 +847,6 @@ Please verify the tool name and ensure the tool is properly registered.`;
|
|
|
929
847
|
// This avoids re-fetching user data in the error handler.
|
|
930
848
|
const { telemetryData, userId } = await this.prepareTelemetryData(tool, mcpSessionId, apifyToken);
|
|
931
849
|
try {
|
|
932
|
-
// Only support actor tool types for long-running tasks
|
|
933
|
-
if (tool.type !== 'actor') {
|
|
934
|
-
const msg = `Tool "${tool.name}" does not support long-running task execution. Only actor tools are supported in task mode.`;
|
|
935
|
-
log.softFail(msg, { statusCode: 400 });
|
|
936
|
-
await this.server.sendLoggingMessage({ level: 'error', data: msg });
|
|
937
|
-
toolStatus = TOOL_STATUS.SOFT_FAIL;
|
|
938
|
-
await this.taskStore.storeTaskResult(taskId, 'failed', {
|
|
939
|
-
content: [{
|
|
940
|
-
type: 'text',
|
|
941
|
-
text: msg,
|
|
942
|
-
}],
|
|
943
|
-
isError: true,
|
|
944
|
-
internalToolStatus: toolStatus,
|
|
945
|
-
}, mcpSessionId);
|
|
946
|
-
this.finalizeAndTrackTelemetry(telemetryData, userId, startTime, toolStatus);
|
|
947
|
-
return;
|
|
948
|
-
}
|
|
949
850
|
// Check if task was already cancelled before we start execution.
|
|
950
851
|
// Critical: if a client cancels the task immediately after creation (race condition),
|
|
951
852
|
// attempting to transition from 'cancelled' (terminal state) to 'working' will fail in the SDK
|
|
@@ -965,18 +866,49 @@ Please verify the tool name and ensure the tool is properly registered.`;
|
|
|
965
866
|
await this.taskStore.updateTaskStatus(taskId, 'working', undefined, mcpSessionId);
|
|
966
867
|
// Execute the tool and get the result
|
|
967
868
|
let result = {};
|
|
968
|
-
//
|
|
969
|
-
if (
|
|
970
|
-
|
|
971
|
-
|
|
869
|
+
// Centralized skyfire validation for tools that require it
|
|
870
|
+
if (tool.requiresSkyfirePayId) {
|
|
871
|
+
const skyfireError = validateSkyfirePayId(this, args);
|
|
872
|
+
if (skyfireError) {
|
|
873
|
+
result = skyfireError;
|
|
874
|
+
toolStatus = TOOL_STATUS.SOFT_FAIL;
|
|
875
|
+
}
|
|
972
876
|
}
|
|
973
|
-
|
|
877
|
+
// Handle internal tool execution in task mode
|
|
878
|
+
if (toolStatus === TOOL_STATUS.SUCCEEDED && tool.type === 'internal') {
|
|
879
|
+
const progressTracker = createProgressTracker(progressToken, extra.sendNotification, taskId);
|
|
880
|
+
log.info('Calling internal tool for task', { taskId, name: tool.name, input: args });
|
|
881
|
+
const res = await tool.call({
|
|
882
|
+
args,
|
|
883
|
+
extra,
|
|
884
|
+
apifyMcpServer: this,
|
|
885
|
+
mcpServer: this.server,
|
|
886
|
+
apifyToken,
|
|
887
|
+
userRentedActorIds,
|
|
888
|
+
progressTracker,
|
|
889
|
+
});
|
|
890
|
+
if (progressTracker) {
|
|
891
|
+
progressTracker.stop();
|
|
892
|
+
}
|
|
893
|
+
// If tool provided internal status, use it; otherwise infer from isError flag
|
|
894
|
+
const { internalToolStatus, ...rest } = res;
|
|
895
|
+
if (internalToolStatus !== undefined) {
|
|
896
|
+
toolStatus = internalToolStatus;
|
|
897
|
+
}
|
|
898
|
+
else if ('isError' in rest && rest.isError) {
|
|
899
|
+
toolStatus = TOOL_STATUS.FAILED;
|
|
900
|
+
}
|
|
901
|
+
else {
|
|
902
|
+
toolStatus = TOOL_STATUS.SUCCEEDED;
|
|
903
|
+
}
|
|
904
|
+
result = rest;
|
|
905
|
+
}
|
|
906
|
+
// Handle actor tool execution in task mode
|
|
907
|
+
if (toolStatus === TOOL_STATUS.SUCCEEDED && tool.type === 'actor') {
|
|
974
908
|
const progressTracker = createProgressTracker(progressToken, extra.sendNotification, taskId);
|
|
975
909
|
const callOptions = { memory: tool.memoryMbytes };
|
|
976
|
-
const { 'skyfire-pay-id':
|
|
977
|
-
const apifyClient = this
|
|
978
|
-
? new ApifyClient({ skyfirePayId })
|
|
979
|
-
: new ApifyClient({ token: apifyToken });
|
|
910
|
+
const { 'skyfire-pay-id': _skyfirePayId, ...actorArgs } = args;
|
|
911
|
+
const apifyClient = createApifyClientWithSkyfireSupport(this, args, apifyToken);
|
|
980
912
|
log.info('Calling Actor for task', { taskId, actorName: tool.actorFullName, input: actorArgs });
|
|
981
913
|
const callResult = await callActorGetDataset(tool.actorFullName, actorArgs, apifyClient, callOptions, progressTracker, extra.signal);
|
|
982
914
|
if (!callResult) {
|