agents 0.0.53 → 0.0.54
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/mcp/client.d.ts +59 -20
- package/dist/mcp/client.js +233 -30
- package/dist/mcp/client.js.map +1 -1
- package/package.json +6 -1
package/dist/mcp/client.d.ts
CHANGED
|
@@ -1,32 +1,40 @@
|
|
|
1
1
|
import * as zod from 'zod';
|
|
2
|
-
import { Tool, Prompt
|
|
2
|
+
import { Tool, Prompt, Resource, ResourceTemplate, ServerCapabilities, ClientCapabilities, CallToolRequest, CallToolResultSchema, CompatibilityCallToolResultSchema, ReadResourceRequest, GetPromptRequest } from '@modelcontextprotocol/sdk/types.js';
|
|
3
3
|
import { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
|
4
|
-
import {
|
|
4
|
+
import { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
|
|
5
5
|
import { RequestOptions } from '@modelcontextprotocol/sdk/shared/protocol.js';
|
|
6
|
+
import { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
|
|
6
7
|
|
|
7
8
|
declare class MCPClientConnection {
|
|
9
|
+
url: URL;
|
|
8
10
|
private info;
|
|
11
|
+
private options;
|
|
9
12
|
client: Client;
|
|
10
|
-
|
|
11
|
-
connected: boolean;
|
|
13
|
+
connectionState: "authenticating" | "connecting" | "ready" | "discovering" | "failed";
|
|
12
14
|
instructions?: string;
|
|
13
15
|
tools: Tool[];
|
|
14
|
-
prompts: Prompt
|
|
16
|
+
prompts: Prompt[];
|
|
15
17
|
resources: Resource[];
|
|
16
18
|
resourceTemplates: ResourceTemplate[];
|
|
17
19
|
serverCapabilities: ServerCapabilities | undefined;
|
|
18
|
-
constructor(url: URL, info: ConstructorParameters<typeof Client>[0],
|
|
20
|
+
constructor(url: URL, info: ConstructorParameters<typeof Client>[0], options?: {
|
|
19
21
|
transport: SSEClientTransportOptions;
|
|
20
22
|
client: ConstructorParameters<typeof Client>[1];
|
|
21
23
|
capabilities: ClientCapabilities;
|
|
22
24
|
});
|
|
23
|
-
|
|
25
|
+
/**
|
|
26
|
+
* Initialize a client connection
|
|
27
|
+
*
|
|
28
|
+
* @param code Optional OAuth code to initialize the connection with if auth hasn't been initialized
|
|
29
|
+
* @returns
|
|
30
|
+
*/
|
|
31
|
+
init(code?: string, clientId?: string): Promise<void>;
|
|
24
32
|
/**
|
|
25
33
|
* Notification handler registration
|
|
26
34
|
*/
|
|
27
35
|
registerTools(): Promise<Tool[]>;
|
|
28
36
|
registerResources(): Promise<Resource[]>;
|
|
29
|
-
registerPrompts(): Promise<Prompt
|
|
37
|
+
registerPrompts(): Promise<Prompt[]>;
|
|
30
38
|
registerResourceTemplates(): Promise<ResourceTemplate[]>;
|
|
31
39
|
fetchTools(): Promise<{
|
|
32
40
|
[x: string]: unknown;
|
|
@@ -67,11 +75,28 @@ declare class MCPClientConnection {
|
|
|
67
75
|
}[]>;
|
|
68
76
|
}
|
|
69
77
|
|
|
78
|
+
interface AgentsOAuthProvider extends OAuthClientProvider {
|
|
79
|
+
authUrl: string | undefined;
|
|
80
|
+
clientId: string | undefined;
|
|
81
|
+
}
|
|
82
|
+
|
|
70
83
|
/**
|
|
71
84
|
* Utility class that aggregates multiple MCP clients into one
|
|
72
85
|
*/
|
|
73
86
|
declare class MCPClientManager {
|
|
87
|
+
private name;
|
|
88
|
+
private version;
|
|
89
|
+
private auth?;
|
|
74
90
|
mcpConnections: Record<string, MCPClientConnection>;
|
|
91
|
+
/**
|
|
92
|
+
* @param name Name of the MCP client
|
|
93
|
+
* @param version Version of the MCP Client
|
|
94
|
+
* @param auth Auth paramters if being used to create a DurableObjectOAuthClientProvider
|
|
95
|
+
*/
|
|
96
|
+
constructor(name: string, version: string, auth?: {
|
|
97
|
+
baseCallbackUri: string;
|
|
98
|
+
storage: DurableObjectStorage;
|
|
99
|
+
} | undefined);
|
|
75
100
|
/**
|
|
76
101
|
* Connect to and register an MCP server
|
|
77
102
|
*
|
|
@@ -79,11 +104,25 @@ declare class MCPClientManager {
|
|
|
79
104
|
* @param clientConfig Client config
|
|
80
105
|
* @param capabilities Client capabilities (i.e. if the client supports roots/sampling)
|
|
81
106
|
*/
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
107
|
+
connect(url: string, opts?: {
|
|
108
|
+
reconnect?: {
|
|
109
|
+
id: string;
|
|
110
|
+
oauthClientId?: string;
|
|
111
|
+
oauthCode?: string;
|
|
112
|
+
};
|
|
113
|
+
transport?: SSEClientTransportOptions & {
|
|
114
|
+
authProvider: AgentsOAuthProvider;
|
|
115
|
+
};
|
|
116
|
+
client?: ConstructorParameters<typeof Client>[1];
|
|
117
|
+
capabilities?: ClientCapabilities;
|
|
118
|
+
}): Promise<{
|
|
119
|
+
id: string;
|
|
120
|
+
authUrl: string | undefined;
|
|
121
|
+
}>;
|
|
122
|
+
isCallbackRequest(req: Request): boolean;
|
|
123
|
+
handleCallbackRequest(req: Request): Promise<{
|
|
124
|
+
serverId: string;
|
|
125
|
+
}>;
|
|
87
126
|
/**
|
|
88
127
|
* @returns namespaced list of tools
|
|
89
128
|
*/
|
|
@@ -104,7 +143,7 @@ declare class MCPClientManager {
|
|
|
104
143
|
* Namespaced version of callTool
|
|
105
144
|
*/
|
|
106
145
|
callTool(params: CallToolRequest["params"] & {
|
|
107
|
-
|
|
146
|
+
serverId: string;
|
|
108
147
|
}, resultSchema: typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema, options: RequestOptions): Promise<zod.objectOutputType<zod.objectUtil.extendShape<{
|
|
109
148
|
_meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
|
|
110
149
|
}, {
|
|
@@ -239,7 +278,7 @@ declare class MCPClientManager {
|
|
|
239
278
|
* Namespaced version of readResource
|
|
240
279
|
*/
|
|
241
280
|
readResource(params: ReadResourceRequest["params"] & {
|
|
242
|
-
|
|
281
|
+
serverId: string;
|
|
243
282
|
}, options: RequestOptions): Promise<zod.objectOutputType<zod.objectUtil.extendShape<{
|
|
244
283
|
_meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
|
|
245
284
|
}, {
|
|
@@ -279,7 +318,7 @@ declare class MCPClientManager {
|
|
|
279
318
|
* Namespaced version of getPrompt
|
|
280
319
|
*/
|
|
281
320
|
getPrompt(params: GetPromptRequest["params"] & {
|
|
282
|
-
|
|
321
|
+
serverId: string;
|
|
283
322
|
}, options: RequestOptions): Promise<zod.objectOutputType<zod.objectUtil.extendShape<{
|
|
284
323
|
_meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
|
|
285
324
|
}, {
|
|
@@ -658,16 +697,16 @@ declare class MCPClientManager {
|
|
|
658
697
|
}
|
|
659
698
|
type NamespacedData = {
|
|
660
699
|
tools: (Tool & {
|
|
661
|
-
|
|
700
|
+
serverId: string;
|
|
662
701
|
})[];
|
|
663
702
|
prompts: (Prompt & {
|
|
664
|
-
|
|
703
|
+
serverId: string;
|
|
665
704
|
})[];
|
|
666
705
|
resources: (Resource & {
|
|
667
|
-
|
|
706
|
+
serverId: string;
|
|
668
707
|
})[];
|
|
669
708
|
resourceTemplates: (ResourceTemplate & {
|
|
670
|
-
|
|
709
|
+
serverId: string;
|
|
671
710
|
})[];
|
|
672
711
|
};
|
|
673
712
|
declare function getNamespacedData<T extends keyof NamespacedData>(mcpClients: Record<string, MCPClientConnection>, type: T): NamespacedData[T];
|
package/dist/mcp/client.js
CHANGED
|
@@ -9,12 +9,17 @@ var SSEEdgeClientTransport = class extends SSEClientTransport {
|
|
|
9
9
|
* Creates a new EdgeSSEClientTransport, which overrides fetch to be compatible with the CF workers environment
|
|
10
10
|
*/
|
|
11
11
|
constructor(url, options) {
|
|
12
|
-
const fetchOverride = (
|
|
12
|
+
const fetchOverride = async (fetchUrl, fetchInit = {}) => {
|
|
13
|
+
const headers = await this.authHeaders();
|
|
13
14
|
const workerOptions = {
|
|
14
|
-
...
|
|
15
|
+
...fetchInit,
|
|
16
|
+
headers: {
|
|
17
|
+
...fetchInit?.headers,
|
|
18
|
+
...headers
|
|
19
|
+
}
|
|
15
20
|
};
|
|
16
21
|
delete workerOptions.mode;
|
|
17
|
-
return
|
|
22
|
+
return fetch(fetchUrl, workerOptions);
|
|
18
23
|
};
|
|
19
24
|
super(url, {
|
|
20
25
|
...options,
|
|
@@ -22,7 +27,17 @@ var SSEEdgeClientTransport = class extends SSEClientTransport {
|
|
|
22
27
|
fetch: fetchOverride
|
|
23
28
|
}
|
|
24
29
|
});
|
|
25
|
-
this.
|
|
30
|
+
this.authProvider = options.authProvider;
|
|
31
|
+
}
|
|
32
|
+
async authHeaders() {
|
|
33
|
+
if (this.authProvider) {
|
|
34
|
+
const tokens = await this.authProvider.tokens();
|
|
35
|
+
if (tokens) {
|
|
36
|
+
return {
|
|
37
|
+
Authorization: `Bearer ${tokens.access_token}`
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
}
|
|
26
41
|
}
|
|
27
42
|
};
|
|
28
43
|
|
|
@@ -34,24 +49,46 @@ import {
|
|
|
34
49
|
} from "@modelcontextprotocol/sdk/types.js";
|
|
35
50
|
import { Client } from "@modelcontextprotocol/sdk/client/index.js";
|
|
36
51
|
var MCPClientConnection = class {
|
|
37
|
-
constructor(url, info,
|
|
52
|
+
constructor(url, info, options = { transport: {}, client: {}, capabilities: {} }) {
|
|
53
|
+
this.url = url;
|
|
38
54
|
this.info = info;
|
|
39
|
-
this.
|
|
40
|
-
this.
|
|
41
|
-
this.client.registerCapabilities(opts.capabilities);
|
|
42
|
-
this.connected = false;
|
|
55
|
+
this.options = options;
|
|
56
|
+
this.connectionState = "connecting";
|
|
43
57
|
this.tools = [];
|
|
44
58
|
this.prompts = [];
|
|
45
59
|
this.resources = [];
|
|
46
60
|
this.resourceTemplates = [];
|
|
61
|
+
this.client = new Client(info, options.client);
|
|
62
|
+
this.client.registerCapabilities(options.capabilities);
|
|
47
63
|
}
|
|
48
|
-
|
|
49
|
-
|
|
64
|
+
/**
|
|
65
|
+
* Initialize a client connection
|
|
66
|
+
*
|
|
67
|
+
* @param code Optional OAuth code to initialize the connection with if auth hasn't been initialized
|
|
68
|
+
* @returns
|
|
69
|
+
*/
|
|
70
|
+
async init(code, clientId) {
|
|
71
|
+
try {
|
|
72
|
+
const transport = new SSEEdgeClientTransport(
|
|
73
|
+
this.url,
|
|
74
|
+
this.options.transport
|
|
75
|
+
);
|
|
76
|
+
if (code) {
|
|
77
|
+
await transport.finishAuth(code);
|
|
78
|
+
}
|
|
79
|
+
await this.client.connect(transport);
|
|
80
|
+
} catch (e) {
|
|
81
|
+
if (e.toString().includes("Unauthorized")) {
|
|
82
|
+
this.connectionState = "authenticating";
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
this.connectionState = "failed";
|
|
86
|
+
throw e;
|
|
87
|
+
}
|
|
88
|
+
this.connectionState = "discovering";
|
|
50
89
|
this.serverCapabilities = await this.client.getServerCapabilities();
|
|
51
90
|
if (!this.serverCapabilities) {
|
|
52
|
-
throw new Error(
|
|
53
|
-
`The MCP Server ${this.info.name} failed to return server capabilities`
|
|
54
|
-
);
|
|
91
|
+
throw new Error("The MCP Server failed to return server capabilities");
|
|
55
92
|
}
|
|
56
93
|
const [instructions, tools, resources, prompts, resourceTemplates] = await Promise.all([
|
|
57
94
|
this.client.getInstructions(),
|
|
@@ -65,6 +102,7 @@ var MCPClientConnection = class {
|
|
|
65
102
|
this.resources = resources;
|
|
66
103
|
this.prompts = prompts;
|
|
67
104
|
this.resourceTemplates = resourceTemplates;
|
|
105
|
+
this.connectionState = "ready";
|
|
68
106
|
}
|
|
69
107
|
/**
|
|
70
108
|
* Notification handler registration
|
|
@@ -165,9 +203,109 @@ var MCPClientConnection = class {
|
|
|
165
203
|
}
|
|
166
204
|
};
|
|
167
205
|
|
|
206
|
+
// src/mcp/do-oauth-client-provider.ts
|
|
207
|
+
var DurableObjectOAuthClientProvider = class {
|
|
208
|
+
constructor(storage, clientName, sessionId, redirectUrl, clientId_) {
|
|
209
|
+
this.storage = storage;
|
|
210
|
+
this.clientName = clientName;
|
|
211
|
+
this.sessionId = sessionId;
|
|
212
|
+
this.redirectUrl = redirectUrl;
|
|
213
|
+
this.clientId_ = clientId_;
|
|
214
|
+
}
|
|
215
|
+
get clientMetadata() {
|
|
216
|
+
return {
|
|
217
|
+
redirect_uris: [this.redirectUrl],
|
|
218
|
+
token_endpoint_auth_method: "none",
|
|
219
|
+
grant_types: ["authorization_code", "refresh_token"],
|
|
220
|
+
response_types: ["code"],
|
|
221
|
+
client_name: this.clientName,
|
|
222
|
+
client_uri: "example.com"
|
|
223
|
+
};
|
|
224
|
+
}
|
|
225
|
+
get clientId() {
|
|
226
|
+
if (!this.clientId_) {
|
|
227
|
+
throw new Error("no clientId");
|
|
228
|
+
}
|
|
229
|
+
return this.clientId_;
|
|
230
|
+
}
|
|
231
|
+
set clientId(clientId_) {
|
|
232
|
+
this.clientId_ = clientId_;
|
|
233
|
+
}
|
|
234
|
+
keyPrefix(clientId) {
|
|
235
|
+
return `/${this.clientName}/${this.sessionId}/${clientId}`;
|
|
236
|
+
}
|
|
237
|
+
clientInfoKey(clientId) {
|
|
238
|
+
return `${this.keyPrefix(clientId)}/client_info/`;
|
|
239
|
+
}
|
|
240
|
+
async clientInformation() {
|
|
241
|
+
if (!this.clientId_) {
|
|
242
|
+
return void 0;
|
|
243
|
+
}
|
|
244
|
+
return await this.storage.get(
|
|
245
|
+
this.clientInfoKey(this.clientId)
|
|
246
|
+
) ?? void 0;
|
|
247
|
+
}
|
|
248
|
+
async saveClientInformation(clientInformation) {
|
|
249
|
+
await this.storage.put(
|
|
250
|
+
this.clientInfoKey(clientInformation.client_id),
|
|
251
|
+
clientInformation
|
|
252
|
+
);
|
|
253
|
+
this.clientId = clientInformation.client_id;
|
|
254
|
+
}
|
|
255
|
+
tokenKey(clientId) {
|
|
256
|
+
return `${this.keyPrefix(clientId)}/token`;
|
|
257
|
+
}
|
|
258
|
+
async tokens() {
|
|
259
|
+
if (!this.clientId_) {
|
|
260
|
+
return void 0;
|
|
261
|
+
}
|
|
262
|
+
return await this.storage.get(this.tokenKey(this.clientId)) ?? void 0;
|
|
263
|
+
}
|
|
264
|
+
async saveTokens(tokens) {
|
|
265
|
+
await this.storage.put(this.tokenKey(this.clientId), tokens);
|
|
266
|
+
}
|
|
267
|
+
get authUrl() {
|
|
268
|
+
return this.authUrl_;
|
|
269
|
+
}
|
|
270
|
+
/**
|
|
271
|
+
* Because this operates on the server side (but we need browser auth), we send this url back to the user
|
|
272
|
+
* and require user interact to initiate the redirect flow
|
|
273
|
+
*/
|
|
274
|
+
async redirectToAuthorization(authUrl) {
|
|
275
|
+
const client_id = authUrl.searchParams.get("client_id");
|
|
276
|
+
if (client_id) {
|
|
277
|
+
authUrl.searchParams.append("state", client_id);
|
|
278
|
+
}
|
|
279
|
+
this.authUrl_ = authUrl.toString();
|
|
280
|
+
}
|
|
281
|
+
codeVerifierKey(clientId) {
|
|
282
|
+
return `${this.keyPrefix(clientId)}/code_verifier`;
|
|
283
|
+
}
|
|
284
|
+
async saveCodeVerifier(verifier) {
|
|
285
|
+
await this.storage.put(this.codeVerifierKey(this.clientId), verifier);
|
|
286
|
+
}
|
|
287
|
+
async codeVerifier() {
|
|
288
|
+
const codeVerifier = await this.storage.get(
|
|
289
|
+
this.codeVerifierKey(this.clientId)
|
|
290
|
+
);
|
|
291
|
+
if (!codeVerifier) {
|
|
292
|
+
throw new Error("No code verifier found");
|
|
293
|
+
}
|
|
294
|
+
return codeVerifier;
|
|
295
|
+
}
|
|
296
|
+
};
|
|
297
|
+
|
|
168
298
|
// src/mcp/client.ts
|
|
169
299
|
var MCPClientManager = class {
|
|
170
|
-
|
|
300
|
+
/**
|
|
301
|
+
* @param name Name of the MCP client
|
|
302
|
+
* @param version Version of the MCP Client
|
|
303
|
+
* @param auth Auth paramters if being used to create a DurableObjectOAuthClientProvider
|
|
304
|
+
*/
|
|
305
|
+
constructor(name, version, auth) {
|
|
306
|
+
this.name = name;
|
|
307
|
+
this.version = version;
|
|
308
|
+
this.auth = auth;
|
|
171
309
|
this.mcpConnections = {};
|
|
172
310
|
}
|
|
173
311
|
/**
|
|
@@ -177,14 +315,82 @@ var MCPClientManager = class {
|
|
|
177
315
|
* @param clientConfig Client config
|
|
178
316
|
* @param capabilities Client capabilities (i.e. if the client supports roots/sampling)
|
|
179
317
|
*/
|
|
180
|
-
async
|
|
181
|
-
|
|
318
|
+
async connect(url, opts = {}) {
|
|
319
|
+
const id = opts.reconnect?.id ?? crypto.randomUUID();
|
|
320
|
+
if (this.auth) {
|
|
321
|
+
console.warn(
|
|
322
|
+
"Using .auth configuration to generate an oauth provider, this is temporary and will be removed in the next version. Instead use transport.authProvider to provide an auth provider"
|
|
323
|
+
);
|
|
324
|
+
}
|
|
325
|
+
const authProvider = this.auth ? new DurableObjectOAuthClientProvider(
|
|
326
|
+
this.auth.storage,
|
|
327
|
+
this.name,
|
|
328
|
+
id,
|
|
329
|
+
`${this.auth.baseCallbackUri}/${id}`,
|
|
330
|
+
opts.reconnect?.oauthClientId
|
|
331
|
+
) : opts.transport?.authProvider;
|
|
332
|
+
this.mcpConnections[id] = new MCPClientConnection(
|
|
333
|
+
new URL(url),
|
|
334
|
+
{
|
|
335
|
+
name: this.name,
|
|
336
|
+
version: this.version
|
|
337
|
+
},
|
|
338
|
+
{
|
|
339
|
+
transport: {
|
|
340
|
+
...opts.transport,
|
|
341
|
+
authProvider
|
|
342
|
+
},
|
|
343
|
+
client: opts.client ?? {},
|
|
344
|
+
capabilities: opts.client ?? {}
|
|
345
|
+
}
|
|
346
|
+
);
|
|
347
|
+
await this.mcpConnections[id].init(
|
|
348
|
+
opts.reconnect?.oauthCode,
|
|
349
|
+
opts.reconnect?.oauthClientId
|
|
350
|
+
);
|
|
351
|
+
return {
|
|
352
|
+
id,
|
|
353
|
+
authUrl: authProvider?.authUrl
|
|
354
|
+
};
|
|
355
|
+
}
|
|
356
|
+
isCallbackRequest(req) {
|
|
357
|
+
if (this.auth?.baseCallbackUri) {
|
|
358
|
+
return req.url.startsWith(this.auth.baseCallbackUri) && req.method === "GET";
|
|
359
|
+
}
|
|
360
|
+
return false;
|
|
361
|
+
}
|
|
362
|
+
async handleCallbackRequest(req) {
|
|
363
|
+
const url = new URL(req.url);
|
|
364
|
+
const code = url.searchParams.get("code");
|
|
365
|
+
const clientId = url.searchParams.get("state");
|
|
366
|
+
let serverId = req.url.replace(this.auth.baseCallbackUri, "").split("?")[0];
|
|
367
|
+
serverId = serverId.replaceAll("/", "");
|
|
368
|
+
if (!code) {
|
|
369
|
+
throw new Error("Unauthorized: no code provided");
|
|
370
|
+
}
|
|
371
|
+
if (!clientId) {
|
|
372
|
+
throw new Error("Unauthorized: no state provided");
|
|
373
|
+
}
|
|
374
|
+
if (this.mcpConnections[serverId] === void 0) {
|
|
375
|
+
throw new Error(`Could not find serverId: ${serverId}`);
|
|
376
|
+
}
|
|
377
|
+
if (this.mcpConnections[serverId].connectionState !== "authenticating") {
|
|
182
378
|
throw new Error(
|
|
183
|
-
|
|
379
|
+
"Failed to authenticate: the client isn't in the `authenticating` state"
|
|
184
380
|
);
|
|
185
381
|
}
|
|
186
|
-
this.mcpConnections[
|
|
187
|
-
await this.
|
|
382
|
+
const serverUrl = this.mcpConnections[serverId].url.toString();
|
|
383
|
+
await this.connect(serverUrl, {
|
|
384
|
+
reconnect: {
|
|
385
|
+
id: serverId,
|
|
386
|
+
oauthClientId: clientId,
|
|
387
|
+
oauthCode: code
|
|
388
|
+
}
|
|
389
|
+
});
|
|
390
|
+
if (this.mcpConnections[serverId].connectionState === "authenticating") {
|
|
391
|
+
throw new Error("Failed to authenticate: client failed to initialize");
|
|
392
|
+
}
|
|
393
|
+
return { serverId };
|
|
188
394
|
}
|
|
189
395
|
/**
|
|
190
396
|
* @returns namespaced list of tools
|
|
@@ -214,8 +420,8 @@ var MCPClientManager = class {
|
|
|
214
420
|
* Namespaced version of callTool
|
|
215
421
|
*/
|
|
216
422
|
callTool(params, resultSchema, options) {
|
|
217
|
-
const unqualifiedName = params.name.replace(`${params.
|
|
218
|
-
return this.mcpConnections[params.
|
|
423
|
+
const unqualifiedName = params.name.replace(`${params.serverId}.`, "");
|
|
424
|
+
return this.mcpConnections[params.serverId].client.callTool(
|
|
219
425
|
{
|
|
220
426
|
...params,
|
|
221
427
|
name: unqualifiedName
|
|
@@ -228,7 +434,7 @@ var MCPClientManager = class {
|
|
|
228
434
|
* Namespaced version of readResource
|
|
229
435
|
*/
|
|
230
436
|
readResource(params, options) {
|
|
231
|
-
return this.mcpConnections[params.
|
|
437
|
+
return this.mcpConnections[params.serverId].client.readResource(
|
|
232
438
|
params,
|
|
233
439
|
options
|
|
234
440
|
);
|
|
@@ -237,7 +443,7 @@ var MCPClientManager = class {
|
|
|
237
443
|
* Namespaced version of getPrompt
|
|
238
444
|
*/
|
|
239
445
|
getPrompt(params, options) {
|
|
240
|
-
return this.mcpConnections[params.
|
|
446
|
+
return this.mcpConnections[params.serverId].client.getPrompt(
|
|
241
447
|
params,
|
|
242
448
|
options
|
|
243
449
|
);
|
|
@@ -247,15 +453,12 @@ function getNamespacedData(mcpClients, type) {
|
|
|
247
453
|
const sets = Object.entries(mcpClients).map(([name, conn]) => {
|
|
248
454
|
return { name, data: conn[type] };
|
|
249
455
|
});
|
|
250
|
-
const namespacedData = sets.flatMap(({ name:
|
|
456
|
+
const namespacedData = sets.flatMap(({ name: serverId, data }) => {
|
|
251
457
|
return data.map((item) => {
|
|
252
458
|
return {
|
|
253
459
|
...item,
|
|
254
|
-
// we add a
|
|
255
|
-
|
|
256
|
-
serverName: `${serverName}`,
|
|
257
|
-
// qualified name
|
|
258
|
-
name: `${serverName}.${item.name}`
|
|
460
|
+
// we add a serverId so we can easily pull it out and send the tool call to the right server
|
|
461
|
+
serverId
|
|
259
462
|
};
|
|
260
463
|
});
|
|
261
464
|
});
|
package/dist/mcp/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/mcp/sse-edge.ts","../../src/mcp/client-connection.ts","../../src/mcp/client.ts"],"sourcesContent":["import {\n SSEClientTransport,\n type SSEClientTransportOptions,\n} from \"@modelcontextprotocol/sdk/client/sse.js\";\n\nexport class SSEEdgeClientTransport extends SSEClientTransport {\n /**\n * Creates a new EdgeSSEClientTransport, which overrides fetch to be compatible with the CF workers environment\n */\n constructor(\n private url: URL,\n options: SSEClientTransportOptions\n ) {\n // biome-ignore lint/suspicious/noExplicitAny: Overriding fetch, type doesn't matter here\n const fetchOverride = (url: any, options = {}) => {\n const workerOptions = {\n ...options,\n };\n // Remove unsupported properties\n // @ts-ignore\n // biome-ignore lint/performance/noDelete: workaround for workers environment\n delete workerOptions.mode;\n\n // Call the original fetch with fixed options\n return global.fetch(url, workerOptions);\n };\n\n super(url, {\n ...options,\n eventSourceInit: {\n fetch: fetchOverride,\n },\n });\n }\n}\n","import { SSEEdgeClientTransport } from \"./sse-edge\";\n\nimport {\n ToolListChangedNotificationSchema,\n type ClientCapabilities,\n type Resource,\n type Tool,\n type Prompt,\n ResourceListChangedNotificationSchema,\n PromptListChangedNotificationSchema,\n type ListToolsResult,\n type ListResourcesResult,\n type ListPromptsResult,\n type ServerCapabilities,\n type ResourceTemplate,\n type ListResourceTemplatesResult,\n} from \"@modelcontextprotocol/sdk/types.js\";\nimport { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport type {\n SSEClientTransport,\n SSEClientTransportOptions,\n} from \"@modelcontextprotocol/sdk/client/sse.js\";\n\nexport class MCPClientConnection {\n client: Client;\n transport: SSEClientTransport;\n connected: boolean;\n instructions?: string;\n tools: Tool[];\n prompts: Prompt[];\n resources: Resource[];\n resourceTemplates: ResourceTemplate[];\n serverCapabilities: ServerCapabilities | undefined;\n\n constructor(\n url: URL,\n private info: ConstructorParameters<typeof Client>[0],\n opts: {\n transport: SSEClientTransportOptions;\n client: ConstructorParameters<typeof Client>[1];\n capabilities: ClientCapabilities;\n } = { transport: {}, client: {}, capabilities: {} }\n ) {\n this.transport = new SSEEdgeClientTransport(url, opts.transport);\n this.client = new Client(info, opts.client);\n this.client.registerCapabilities(opts.capabilities);\n this.connected = false;\n this.tools = [];\n this.prompts = [];\n this.resources = [];\n this.resourceTemplates = [];\n }\n\n async init() {\n await this.client.connect(this.transport);\n\n this.serverCapabilities = await this.client.getServerCapabilities();\n if (!this.serverCapabilities) {\n throw new Error(\n `The MCP Server ${this.info.name} failed to return server capabilities`\n );\n }\n\n const [instructions, tools, resources, prompts, resourceTemplates] =\n await Promise.all([\n this.client.getInstructions(),\n this.registerTools(),\n this.registerResources(),\n this.registerPrompts(),\n this.registerResourceTemplates(),\n ]);\n\n this.instructions = instructions;\n this.tools = tools;\n this.resources = resources;\n this.prompts = prompts;\n this.resourceTemplates = resourceTemplates;\n }\n\n /**\n * Notification handler registration\n */\n async registerTools(): Promise<Tool[]> {\n if (!this.serverCapabilities || !this.serverCapabilities.tools) {\n return [];\n }\n\n if (this.serverCapabilities.tools.listChanged) {\n this.client.setNotificationHandler(\n ToolListChangedNotificationSchema,\n async (_notification) => {\n this.tools = await this.fetchTools();\n }\n );\n }\n\n return this.fetchTools();\n }\n\n async registerResources(): Promise<Resource[]> {\n if (!this.serverCapabilities || !this.serverCapabilities.resources) {\n return [];\n }\n\n if (this.serverCapabilities.resources.listChanged) {\n this.client.setNotificationHandler(\n ResourceListChangedNotificationSchema,\n async (_notification) => {\n this.resources = await this.fetchResources();\n }\n );\n }\n\n return this.fetchResources();\n }\n\n async registerPrompts(): Promise<Prompt[]> {\n if (!this.serverCapabilities || !this.serverCapabilities.prompts) {\n return [];\n }\n\n if (this.serverCapabilities.prompts.listChanged) {\n this.client.setNotificationHandler(\n PromptListChangedNotificationSchema,\n async (_notification) => {\n this.prompts = await this.fetchPrompts();\n }\n );\n }\n\n return this.fetchPrompts();\n }\n\n async registerResourceTemplates(): Promise<ResourceTemplate[]> {\n if (!this.serverCapabilities || !this.serverCapabilities.resources) {\n return [];\n }\n\n return this.fetchResourceTemplates();\n }\n\n async fetchTools() {\n let toolsAgg: Tool[] = [];\n let toolsResult: ListToolsResult = { tools: [] };\n do {\n toolsResult = await this.client.listTools({\n cursor: toolsResult.nextCursor,\n });\n toolsAgg = toolsAgg.concat(toolsResult.tools);\n } while (toolsResult.nextCursor);\n return toolsAgg;\n }\n\n async fetchResources() {\n let resourcesAgg: Resource[] = [];\n let resourcesResult: ListResourcesResult = { resources: [] };\n do {\n resourcesResult = await this.client.listResources({\n cursor: resourcesResult.nextCursor,\n });\n resourcesAgg = resourcesAgg.concat(resourcesResult.resources);\n } while (resourcesResult.nextCursor);\n return resourcesAgg;\n }\n\n async fetchPrompts() {\n let promptsAgg: Prompt[] = [];\n let promptsResult: ListPromptsResult = { prompts: [] };\n do {\n promptsResult = await this.client.listPrompts({\n cursor: promptsResult.nextCursor,\n });\n promptsAgg = promptsAgg.concat(promptsResult.prompts);\n } while (promptsResult.nextCursor);\n return promptsAgg;\n }\n\n async fetchResourceTemplates() {\n let templatesAgg: ResourceTemplate[] = [];\n let templatesResult: ListResourceTemplatesResult = {\n resourceTemplates: [],\n };\n do {\n templatesResult = await this.client.listResourceTemplates({\n cursor: templatesResult.nextCursor,\n });\n templatesAgg = templatesAgg.concat(templatesResult.resourceTemplates);\n } while (templatesResult.nextCursor);\n return templatesAgg;\n }\n}\n","import { MCPClientConnection } from \"./client-connection\";\n\nimport type {\n ClientCapabilities,\n CallToolRequest,\n CallToolResultSchema,\n CompatibilityCallToolResultSchema,\n ReadResourceRequest,\n GetPromptRequest,\n Tool,\n Resource,\n ResourceTemplate,\n} from \"@modelcontextprotocol/sdk/types.js\";\nimport type { SSEClientTransportOptions } from \"@modelcontextprotocol/sdk/client/sse.js\";\nimport type { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport type { RequestOptions } from \"@modelcontextprotocol/sdk/shared/protocol.js\";\n\n/**\n * Utility class that aggregates multiple MCP clients into one\n */\nexport class MCPClientManager {\n public mcpConnections: Record<string, MCPClientConnection> = {};\n\n /**\n * Connect to and register an MCP server\n *\n * @param transportConfig Transport config\n * @param clientConfig Client config\n * @param capabilities Client capabilities (i.e. if the client supports roots/sampling)\n */\n async connectToServer(\n url: URL,\n info: ConstructorParameters<typeof Client>[0],\n opts: {\n transport: SSEClientTransportOptions;\n client: ConstructorParameters<typeof Client>[1];\n capabilities: ClientCapabilities;\n } = { transport: {}, client: {}, capabilities: {} }\n ) {\n if (info.name in this.mcpConnections) {\n throw new Error(\n `An existing MCP client has already been registered under the name \"${info.name}\". The MCP client name must be unique.`\n );\n }\n\n this.mcpConnections[info.name] = new MCPClientConnection(url, info, opts);\n await this.mcpConnections[info.name].init();\n }\n\n /**\n * @returns namespaced list of tools\n */\n listTools(): NamespacedData[\"tools\"] {\n return getNamespacedData(this.mcpConnections, \"tools\");\n }\n\n /**\n * @returns namespaced list of prompts\n */\n listPrompts(): NamespacedData[\"prompts\"] {\n return getNamespacedData(this.mcpConnections, \"prompts\");\n }\n\n /**\n * @returns namespaced list of tools\n */\n listResources(): NamespacedData[\"resources\"] {\n return getNamespacedData(this.mcpConnections, \"resources\");\n }\n\n /**\n * @returns namespaced list of resource templates\n */\n listResourceTemplates(): NamespacedData[\"resourceTemplates\"] {\n return getNamespacedData(this.mcpConnections, \"resourceTemplates\");\n }\n\n /**\n * Namespaced version of callTool\n */\n callTool(\n params: CallToolRequest[\"params\"] & { serverName: string },\n resultSchema:\n | typeof CallToolResultSchema\n | typeof CompatibilityCallToolResultSchema,\n options: RequestOptions\n ) {\n const unqualifiedName = params.name.replace(`${params.serverName}.`, \"\");\n return this.mcpConnections[params.serverName].client.callTool(\n {\n ...params,\n name: unqualifiedName,\n },\n resultSchema,\n options\n );\n }\n\n /**\n * Namespaced version of readResource\n */\n readResource(\n params: ReadResourceRequest[\"params\"] & { serverName: string },\n options: RequestOptions\n ) {\n return this.mcpConnections[params.serverName].client.readResource(\n params,\n options\n );\n }\n\n /**\n * Namespaced version of getPrompt\n */\n getPrompt(\n params: GetPromptRequest[\"params\"] & { serverName: string },\n options: RequestOptions\n ) {\n return this.mcpConnections[params.serverName].client.getPrompt(\n params,\n options\n );\n }\n}\n\ntype NamespacedData = {\n tools: (Tool & { serverName: string })[];\n prompts: (Prompt & { serverName: string })[];\n resources: (Resource & { serverName: string })[];\n resourceTemplates: (ResourceTemplate & { serverName: string })[];\n};\n\nexport function getNamespacedData<T extends keyof NamespacedData>(\n mcpClients: Record<string, MCPClientConnection>,\n type: T\n): NamespacedData[T] {\n const sets = Object.entries(mcpClients).map(([name, conn]) => {\n return { name, data: conn[type] };\n });\n\n const namespacedData = sets.flatMap(({ name: serverName, data }) => {\n return data.map((item) => {\n return {\n ...item,\n // we add a servername so we can easily pull it out and convert between qualified<->unqualified name\n // just in case the server name or item name includes a \".\"\n serverName: `${serverName}`,\n // qualified name\n name: `${serverName}.${item.name}`,\n };\n });\n });\n\n return namespacedData as NamespacedData[T]; // Type assertion needed due to TS limitations with conditional return types\n}\n"],"mappings":"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","names":["url","options"]}
|
|
1
|
+
{"version":3,"sources":["../../src/mcp/sse-edge.ts","../../src/mcp/client-connection.ts","../../src/mcp/do-oauth-client-provider.ts","../../src/mcp/client.ts"],"sourcesContent":["import {\n SSEClientTransport,\n type SSEClientTransportOptions,\n} from \"@modelcontextprotocol/sdk/client/sse.js\";\nimport type { OAuthClientProvider } from \"@modelcontextprotocol/sdk/client/auth.js\";\n\nexport class SSEEdgeClientTransport extends SSEClientTransport {\n private authProvider: OAuthClientProvider | undefined;\n /**\n * Creates a new EdgeSSEClientTransport, which overrides fetch to be compatible with the CF workers environment\n */\n constructor(url: URL, options: SSEClientTransportOptions) {\n const fetchOverride: typeof fetch = async (\n fetchUrl: RequestInfo | URL,\n fetchInit: RequestInit = {}\n ) => {\n // add auth headers\n const headers = await this.authHeaders();\n const workerOptions = {\n ...fetchInit,\n headers: {\n ...fetchInit?.headers,\n ...headers,\n },\n };\n\n // Remove unsupported properties\n // biome-ignore lint/performance/noDelete: workaround for workers environment\n delete workerOptions.mode;\n\n // Call the original fetch with fixed options\n return fetch(fetchUrl, workerOptions);\n };\n\n super(url, {\n ...options,\n eventSourceInit: {\n fetch: fetchOverride,\n },\n });\n this.authProvider = options.authProvider;\n }\n\n async authHeaders() {\n if (this.authProvider) {\n const tokens = await this.authProvider.tokens();\n if (tokens) {\n return {\n Authorization: `Bearer ${tokens.access_token}`,\n };\n }\n }\n }\n}\n","import { SSEEdgeClientTransport } from \"./sse-edge\";\n\nimport {\n ToolListChangedNotificationSchema,\n type ClientCapabilities,\n type Resource,\n type Tool,\n type Prompt,\n ResourceListChangedNotificationSchema,\n PromptListChangedNotificationSchema,\n type ListToolsResult,\n type ListResourcesResult,\n type ListPromptsResult,\n type ServerCapabilities,\n type ResourceTemplate,\n type ListResourceTemplatesResult,\n} from \"@modelcontextprotocol/sdk/types.js\";\nimport { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport type { SSEClientTransportOptions } from \"@modelcontextprotocol/sdk/client/sse.js\";\n\nexport class MCPClientConnection {\n client: Client;\n connectionState:\n | \"authenticating\"\n | \"connecting\"\n | \"ready\"\n | \"discovering\"\n | \"failed\" = \"connecting\";\n instructions?: string;\n tools: Tool[] = [];\n prompts: Prompt[] = [];\n resources: Resource[] = [];\n resourceTemplates: ResourceTemplate[] = [];\n serverCapabilities: ServerCapabilities | undefined;\n\n constructor(\n public url: URL,\n private info: ConstructorParameters<typeof Client>[0],\n private options: {\n transport: SSEClientTransportOptions;\n client: ConstructorParameters<typeof Client>[1];\n capabilities: ClientCapabilities;\n } = { transport: {}, client: {}, capabilities: {} }\n ) {\n this.client = new Client(info, options.client);\n this.client.registerCapabilities(options.capabilities);\n }\n\n /**\n * Initialize a client connection\n *\n * @param code Optional OAuth code to initialize the connection with if auth hasn't been initialized\n * @returns\n */\n async init(code?: string, clientId?: string) {\n try {\n const transport = new SSEEdgeClientTransport(\n this.url,\n this.options.transport\n );\n if (code) {\n await transport.finishAuth(code);\n }\n await this.client.connect(transport);\n // biome-ignore lint/suspicious/noExplicitAny: allow for the error check here\n } catch (e: any) {\n if (e.toString().includes(\"Unauthorized\")) {\n // unauthorized, we should wait for the user to authenticate\n this.connectionState = \"authenticating\";\n return;\n }\n this.connectionState = \"failed\";\n throw e;\n }\n\n this.connectionState = \"discovering\";\n\n this.serverCapabilities = await this.client.getServerCapabilities();\n if (!this.serverCapabilities) {\n throw new Error(\"The MCP Server failed to return server capabilities\");\n }\n\n const [instructions, tools, resources, prompts, resourceTemplates] =\n await Promise.all([\n this.client.getInstructions(),\n this.registerTools(),\n this.registerResources(),\n this.registerPrompts(),\n this.registerResourceTemplates(),\n ]);\n\n this.instructions = instructions;\n this.tools = tools;\n this.resources = resources;\n this.prompts = prompts;\n this.resourceTemplates = resourceTemplates;\n\n this.connectionState = \"ready\";\n }\n\n /**\n * Notification handler registration\n */\n async registerTools(): Promise<Tool[]> {\n if (!this.serverCapabilities || !this.serverCapabilities.tools) {\n return [];\n }\n\n if (this.serverCapabilities.tools.listChanged) {\n this.client.setNotificationHandler(\n ToolListChangedNotificationSchema,\n async (_notification) => {\n this.tools = await this.fetchTools();\n }\n );\n }\n\n return this.fetchTools();\n }\n\n async registerResources(): Promise<Resource[]> {\n if (!this.serverCapabilities || !this.serverCapabilities.resources) {\n return [];\n }\n\n if (this.serverCapabilities.resources.listChanged) {\n this.client.setNotificationHandler(\n ResourceListChangedNotificationSchema,\n async (_notification) => {\n this.resources = await this.fetchResources();\n }\n );\n }\n\n return this.fetchResources();\n }\n\n async registerPrompts(): Promise<Prompt[]> {\n if (!this.serverCapabilities || !this.serverCapabilities.prompts) {\n return [];\n }\n\n if (this.serverCapabilities.prompts.listChanged) {\n this.client.setNotificationHandler(\n PromptListChangedNotificationSchema,\n async (_notification) => {\n this.prompts = await this.fetchPrompts();\n }\n );\n }\n\n return this.fetchPrompts();\n }\n\n async registerResourceTemplates(): Promise<ResourceTemplate[]> {\n if (!this.serverCapabilities || !this.serverCapabilities.resources) {\n return [];\n }\n\n return this.fetchResourceTemplates();\n }\n\n async fetchTools() {\n let toolsAgg: Tool[] = [];\n let toolsResult: ListToolsResult = { tools: [] };\n do {\n toolsResult = await this.client.listTools({\n cursor: toolsResult.nextCursor,\n });\n toolsAgg = toolsAgg.concat(toolsResult.tools);\n } while (toolsResult.nextCursor);\n return toolsAgg;\n }\n\n async fetchResources() {\n let resourcesAgg: Resource[] = [];\n let resourcesResult: ListResourcesResult = { resources: [] };\n do {\n resourcesResult = await this.client.listResources({\n cursor: resourcesResult.nextCursor,\n });\n resourcesAgg = resourcesAgg.concat(resourcesResult.resources);\n } while (resourcesResult.nextCursor);\n return resourcesAgg;\n }\n\n async fetchPrompts() {\n let promptsAgg: Prompt[] = [];\n let promptsResult: ListPromptsResult = { prompts: [] };\n do {\n promptsResult = await this.client.listPrompts({\n cursor: promptsResult.nextCursor,\n });\n promptsAgg = promptsAgg.concat(promptsResult.prompts);\n } while (promptsResult.nextCursor);\n return promptsAgg;\n }\n\n async fetchResourceTemplates() {\n let templatesAgg: ResourceTemplate[] = [];\n let templatesResult: ListResourceTemplatesResult = {\n resourceTemplates: [],\n };\n do {\n templatesResult = await this.client.listResourceTemplates({\n cursor: templatesResult.nextCursor,\n });\n templatesAgg = templatesAgg.concat(templatesResult.resourceTemplates);\n } while (templatesResult.nextCursor);\n return templatesAgg;\n }\n}\n","import type { OAuthClientProvider } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type {\n OAuthTokens,\n OAuthClientMetadata,\n OAuthClientInformation,\n OAuthClientInformationFull,\n} from \"@modelcontextprotocol/sdk/shared/auth.js\";\n\n// A slight extension to the standard OAuthClientProvider interface because `redirectToAuthorization` doesn't give us the interface we need\nexport interface AgentsOAuthProvider extends OAuthClientProvider {\n authUrl: string | undefined;\n clientId: string | undefined;\n}\n\nexport class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {\n private authUrl_: string | undefined;\n\n constructor(\n public storage: DurableObjectStorage,\n public clientName: string,\n public sessionId: string,\n public redirectUrl: string,\n private clientId_?: string\n ) {}\n\n get clientMetadata(): OAuthClientMetadata {\n return {\n redirect_uris: [this.redirectUrl],\n token_endpoint_auth_method: \"none\",\n grant_types: [\"authorization_code\", \"refresh_token\"],\n response_types: [\"code\"],\n client_name: this.clientName,\n client_uri: \"example.com\",\n };\n }\n\n get clientId() {\n if (!this.clientId_) {\n throw new Error(\"no clientId\");\n }\n return this.clientId_;\n }\n\n set clientId(clientId_: string) {\n this.clientId_ = clientId_;\n }\n\n keyPrefix(clientId: string) {\n return `/${this.clientName}/${this.sessionId}/${clientId}`;\n }\n\n clientInfoKey(clientId: string) {\n return `${this.keyPrefix(clientId)}/client_info/`;\n }\n\n async clientInformation(): Promise<OAuthClientInformation | undefined> {\n if (!this.clientId_) {\n return undefined;\n }\n return (\n (await this.storage.get<OAuthClientInformation>(\n this.clientInfoKey(this.clientId)\n )) ?? undefined\n );\n }\n\n async saveClientInformation(\n clientInformation: OAuthClientInformationFull\n ): Promise<void> {\n await this.storage.put(\n this.clientInfoKey(clientInformation.client_id),\n clientInformation\n );\n this.clientId = clientInformation.client_id;\n }\n\n tokenKey(clientId: string) {\n return `${this.keyPrefix(clientId)}/token`;\n }\n\n async tokens(): Promise<OAuthTokens | undefined> {\n if (!this.clientId_) {\n return undefined;\n }\n return (\n (await this.storage.get<OAuthTokens>(this.tokenKey(this.clientId))) ??\n undefined\n );\n }\n\n async saveTokens(tokens: OAuthTokens): Promise<void> {\n await this.storage.put(this.tokenKey(this.clientId), tokens);\n }\n\n get authUrl() {\n return this.authUrl_;\n }\n\n /**\n * Because this operates on the server side (but we need browser auth), we send this url back to the user\n * and require user interact to initiate the redirect flow\n */\n async redirectToAuthorization(authUrl: URL): Promise<void> {\n // We want to track the client ID in state here because the typescript SSE client sometimes does\n // a dynamic client registration AFTER generating this redirect URL.\n const client_id = authUrl.searchParams.get(\"client_id\");\n if (client_id) {\n authUrl.searchParams.append(\"state\", client_id);\n }\n this.authUrl_ = authUrl.toString();\n }\n\n codeVerifierKey(clientId: string) {\n return `${this.keyPrefix(clientId)}/code_verifier`;\n }\n\n async saveCodeVerifier(verifier: string): Promise<void> {\n await this.storage.put(this.codeVerifierKey(this.clientId), verifier);\n }\n\n async codeVerifier(): Promise<string> {\n const codeVerifier = await this.storage.get<string>(\n this.codeVerifierKey(this.clientId)\n );\n if (!codeVerifier) {\n throw new Error(\"No code verifier found\");\n }\n return codeVerifier;\n }\n}\n","import { MCPClientConnection } from \"./client-connection\";\n\nimport type {\n ClientCapabilities,\n CallToolRequest,\n CallToolResultSchema,\n CompatibilityCallToolResultSchema,\n ReadResourceRequest,\n GetPromptRequest,\n Tool,\n Resource,\n Prompt,\n ResourceTemplate,\n} from \"@modelcontextprotocol/sdk/types.js\";\nimport type { SSEClientTransportOptions } from \"@modelcontextprotocol/sdk/client/sse.js\";\nimport type { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport type { RequestOptions } from \"@modelcontextprotocol/sdk/shared/protocol.js\";\nimport {\n DurableObjectOAuthClientProvider,\n type AgentsOAuthProvider,\n} from \"./do-oauth-client-provider\";\n\n/**\n * Utility class that aggregates multiple MCP clients into one\n */\nexport class MCPClientManager {\n public mcpConnections: Record<string, MCPClientConnection> = {};\n\n /**\n * @param name Name of the MCP client\n * @param version Version of the MCP Client\n * @param auth Auth paramters if being used to create a DurableObjectOAuthClientProvider\n */\n constructor(\n private name: string,\n private version: string,\n private auth?: { baseCallbackUri: string; storage: DurableObjectStorage }\n ) {}\n\n /**\n * Connect to and register an MCP server\n *\n * @param transportConfig Transport config\n * @param clientConfig Client config\n * @param capabilities Client capabilities (i.e. if the client supports roots/sampling)\n */\n async connect(\n url: string,\n opts: {\n // Allows you to reconnect to a server (in the case of a auth reconnect)\n // Doesn't handle session reconnection\n reconnect?: {\n id: string;\n oauthClientId?: string;\n oauthCode?: string;\n };\n // we're overriding authProvider here because we want to be able to access the auth URL\n transport?: SSEClientTransportOptions & {\n authProvider: AgentsOAuthProvider;\n };\n client?: ConstructorParameters<typeof Client>[1];\n capabilities?: ClientCapabilities;\n } = {}\n ): Promise<{ id: string; authUrl: string | undefined }> {\n const id = opts.reconnect?.id ?? crypto.randomUUID();\n\n // if we have global auth for the manager AND there's no authProvider override\n // then let's setup an auth provider\n\n if (this.auth) {\n console.warn(\n \"Using .auth configuration to generate an oauth provider, this is temporary and will be removed in the next version. Instead use transport.authProvider to provide an auth provider\"\n );\n }\n\n const authProvider: AgentsOAuthProvider | undefined = this.auth\n ? new DurableObjectOAuthClientProvider(\n this.auth.storage,\n this.name,\n id,\n `${this.auth.baseCallbackUri}/${id}`,\n opts.reconnect?.oauthClientId\n )\n : opts.transport?.authProvider;\n\n this.mcpConnections[id] = new MCPClientConnection(\n new URL(url),\n {\n name: this.name,\n version: this.version,\n },\n {\n transport: {\n ...opts.transport,\n authProvider,\n },\n client: opts.client ?? {},\n capabilities: opts.client ?? {},\n }\n );\n\n await this.mcpConnections[id].init(\n opts.reconnect?.oauthCode,\n opts.reconnect?.oauthClientId\n );\n\n return {\n id,\n authUrl: authProvider?.authUrl,\n };\n }\n\n isCallbackRequest(req: Request): boolean {\n if (this.auth?.baseCallbackUri) {\n return (\n req.url.startsWith(this.auth.baseCallbackUri) && req.method === \"GET\"\n );\n }\n return false;\n }\n\n async handleCallbackRequest(req: Request) {\n const url = new URL(req.url);\n const code = url.searchParams.get(\"code\");\n const clientId = url.searchParams.get(\"state\");\n let serverId = req.url\n .replace(this.auth!.baseCallbackUri, \"\")\n .split(\"?\")[0];\n serverId = serverId.replaceAll(\"/\", \"\");\n if (!code) {\n throw new Error(\"Unauthorized: no code provided\");\n }\n if (!clientId) {\n throw new Error(\"Unauthorized: no state provided\");\n }\n\n if (this.mcpConnections[serverId] === undefined) {\n throw new Error(`Could not find serverId: ${serverId}`);\n }\n\n if (this.mcpConnections[serverId].connectionState !== \"authenticating\") {\n throw new Error(\n \"Failed to authenticate: the client isn't in the `authenticating` state\"\n );\n }\n\n // reconnect to server with authorization\n const serverUrl = this.mcpConnections[serverId].url.toString();\n await this.connect(serverUrl, {\n reconnect: {\n id: serverId,\n oauthClientId: clientId,\n oauthCode: code,\n },\n });\n\n if (this.mcpConnections[serverId].connectionState === \"authenticating\") {\n throw new Error(\"Failed to authenticate: client failed to initialize\");\n }\n\n return { serverId };\n }\n\n /**\n * @returns namespaced list of tools\n */\n listTools(): NamespacedData[\"tools\"] {\n return getNamespacedData(this.mcpConnections, \"tools\");\n }\n\n /**\n * @returns namespaced list of prompts\n */\n listPrompts(): NamespacedData[\"prompts\"] {\n return getNamespacedData(this.mcpConnections, \"prompts\");\n }\n\n /**\n * @returns namespaced list of tools\n */\n listResources(): NamespacedData[\"resources\"] {\n return getNamespacedData(this.mcpConnections, \"resources\");\n }\n\n /**\n * @returns namespaced list of resource templates\n */\n listResourceTemplates(): NamespacedData[\"resourceTemplates\"] {\n return getNamespacedData(this.mcpConnections, \"resourceTemplates\");\n }\n\n /**\n * Namespaced version of callTool\n */\n callTool(\n params: CallToolRequest[\"params\"] & { serverId: string },\n resultSchema:\n | typeof CallToolResultSchema\n | typeof CompatibilityCallToolResultSchema,\n options: RequestOptions\n ) {\n const unqualifiedName = params.name.replace(`${params.serverId}.`, \"\");\n return this.mcpConnections[params.serverId].client.callTool(\n {\n ...params,\n name: unqualifiedName,\n },\n resultSchema,\n options\n );\n }\n\n /**\n * Namespaced version of readResource\n */\n readResource(\n params: ReadResourceRequest[\"params\"] & { serverId: string },\n options: RequestOptions\n ) {\n return this.mcpConnections[params.serverId].client.readResource(\n params,\n options\n );\n }\n\n /**\n * Namespaced version of getPrompt\n */\n getPrompt(\n params: GetPromptRequest[\"params\"] & { serverId: string },\n options: RequestOptions\n ) {\n return this.mcpConnections[params.serverId].client.getPrompt(\n params,\n options\n );\n }\n}\n\ntype NamespacedData = {\n tools: (Tool & { serverId: string })[];\n prompts: (Prompt & { serverId: string })[];\n resources: (Resource & { serverId: string })[];\n resourceTemplates: (ResourceTemplate & { serverId: string })[];\n};\n\nexport function getNamespacedData<T extends keyof NamespacedData>(\n mcpClients: Record<string, MCPClientConnection>,\n type: T\n): NamespacedData[T] {\n const sets = Object.entries(mcpClients).map(([name, conn]) => {\n return { name, data: conn[type] };\n });\n\n const namespacedData = sets.flatMap(({ name: serverId, data }) => {\n return data.map((item) => {\n return {\n ...item,\n // we add a serverId so we can easily pull it out and send the tool call to the right server\n serverId,\n };\n });\n });\n\n return namespacedData as NamespacedData[T]; // Type assertion needed due to TS limitations with conditional return types\n}\n"],"mappings":"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","names":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "agents",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.54",
|
|
4
4
|
"main": "src/index.ts",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"scripts": {
|
|
@@ -52,6 +52,11 @@
|
|
|
52
52
|
"types": "./dist/mcp/client.d.ts",
|
|
53
53
|
"require": "./dist/mcp/client.js",
|
|
54
54
|
"import": "./dist/mcp/client.js"
|
|
55
|
+
},
|
|
56
|
+
"./mcp/do-oauth-client-provider": {
|
|
57
|
+
"types": "./dist/mcp/do-oauth-client-provider.d.ts",
|
|
58
|
+
"require": "./dist/mcp/do-oauth-client-provider.js",
|
|
59
|
+
"import": "./dist/mcp/do-oauth-client-provider.js"
|
|
55
60
|
}
|
|
56
61
|
},
|
|
57
62
|
"keywords": [],
|