agents 0.0.0-1f6598e → 0.0.0-21915e1
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/ai-chat-agent.d.ts +49 -4
- package/dist/ai-chat-agent.js +127 -65
- package/dist/ai-chat-agent.js.map +1 -1
- package/dist/ai-react.d.ts +13 -0
- package/dist/ai-react.js +25 -18
- package/dist/ai-react.js.map +1 -1
- package/dist/ai-types.d.ts +5 -0
- package/dist/chunk-BZXOAZUX.js +106 -0
- package/dist/chunk-BZXOAZUX.js.map +1 -0
- package/dist/{chunk-YMUU7QHV.js → chunk-CFTLYEEK.js} +326 -138
- package/dist/chunk-CFTLYEEK.js.map +1 -0
- package/dist/chunk-IFXSRTKF.js +465 -0
- package/dist/chunk-IFXSRTKF.js.map +1 -0
- package/dist/chunk-VCSB47AK.js +116 -0
- package/dist/chunk-VCSB47AK.js.map +1 -0
- package/dist/client.d.ts +15 -1
- package/dist/client.js +6 -126
- package/dist/client.js.map +1 -1
- package/dist/index.d.ts +120 -17
- package/dist/index.js +8 -8
- package/dist/mcp/client.d.ts +105 -36
- package/dist/mcp/client.js +3 -465
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/do-oauth-client-provider.d.ts +41 -0
- package/dist/mcp/do-oauth-client-provider.js +7 -0
- package/dist/mcp/index.d.ts +45 -5
- package/dist/mcp/index.js +600 -158
- package/dist/mcp/index.js.map +1 -1
- package/dist/react.d.ts +85 -5
- package/dist/react.js +34 -22
- package/dist/react.js.map +1 -1
- package/dist/schedule.js +0 -2
- package/dist/schedule.js.map +1 -1
- package/dist/serializable.d.ts +32 -0
- package/dist/serializable.js +1 -0
- package/dist/serializable.js.map +1 -0
- package/package.json +25 -5
- package/src/index.ts +389 -58
- package/dist/chunk-HMLY7DHA.js +0 -16
- package/dist/chunk-YMUU7QHV.js.map +0 -1
- /package/dist/{chunk-HMLY7DHA.js.map → mcp/do-oauth-client-provider.js.map} +0 -0
package/dist/mcp/index.js
CHANGED
|
@@ -1,48 +1,56 @@
|
|
|
1
1
|
import {
|
|
2
2
|
Agent
|
|
3
|
-
} from "../chunk-
|
|
4
|
-
import
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
__privateMethod,
|
|
8
|
-
__privateSet
|
|
9
|
-
} from "../chunk-HMLY7DHA.js";
|
|
3
|
+
} from "../chunk-CFTLYEEK.js";
|
|
4
|
+
import "../chunk-IFXSRTKF.js";
|
|
5
|
+
import "../chunk-BZXOAZUX.js";
|
|
6
|
+
import "../chunk-VCSB47AK.js";
|
|
10
7
|
|
|
11
8
|
// src/mcp/index.ts
|
|
12
9
|
import { DurableObject } from "cloudflare:workers";
|
|
13
|
-
import {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
10
|
+
import {
|
|
11
|
+
InitializeRequestSchema,
|
|
12
|
+
isJSONRPCError,
|
|
13
|
+
isJSONRPCNotification,
|
|
14
|
+
isJSONRPCRequest,
|
|
15
|
+
isJSONRPCResponse,
|
|
16
|
+
JSONRPCMessageSchema
|
|
17
|
+
} from "@modelcontextprotocol/sdk/types.js";
|
|
18
|
+
var MAXIMUM_MESSAGE_SIZE_BYTES = 4 * 1024 * 1024;
|
|
19
|
+
function corsHeaders(request, corsOptions = {}) {
|
|
20
|
+
const origin = "*";
|
|
21
|
+
return {
|
|
22
|
+
"Access-Control-Allow-Origin": corsOptions.origin || origin,
|
|
23
|
+
"Access-Control-Allow-Methods": corsOptions.methods || "GET, POST, OPTIONS",
|
|
24
|
+
"Access-Control-Allow-Headers": corsOptions.headers || "Content-Type, mcp-session-id",
|
|
25
|
+
"Access-Control-Max-Age": (corsOptions.maxAge || 86400).toString(),
|
|
26
|
+
"Access-Control-Expose-Headers": corsOptions.exposeHeaders || "mcp-session-id"
|
|
22
27
|
};
|
|
28
|
+
}
|
|
29
|
+
function isDurableObjectNamespace(namespace) {
|
|
30
|
+
return typeof namespace === "object" && namespace !== null && "newUniqueId" in namespace && typeof namespace.newUniqueId === "function" && "idFromName" in namespace && typeof namespace.idFromName === "function";
|
|
31
|
+
}
|
|
32
|
+
function handleCORS(request, corsOptions) {
|
|
23
33
|
if (request.method === "OPTIONS") {
|
|
24
|
-
return new Response(null, { headers: corsHeaders });
|
|
34
|
+
return new Response(null, { headers: corsHeaders(request, corsOptions) });
|
|
25
35
|
}
|
|
26
36
|
return null;
|
|
27
37
|
}
|
|
28
|
-
var
|
|
29
|
-
var McpTransport = class {
|
|
38
|
+
var McpSSETransport = class {
|
|
30
39
|
constructor(getWebSocket) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
__privateSet(this, _getWebSocket, getWebSocket);
|
|
40
|
+
this._started = false;
|
|
41
|
+
this._getWebSocket = getWebSocket;
|
|
34
42
|
}
|
|
35
43
|
async start() {
|
|
36
|
-
if (
|
|
44
|
+
if (this._started) {
|
|
37
45
|
throw new Error("Transport already started");
|
|
38
46
|
}
|
|
39
|
-
|
|
47
|
+
this._started = true;
|
|
40
48
|
}
|
|
41
49
|
async send(message) {
|
|
42
|
-
if (!
|
|
50
|
+
if (!this._started) {
|
|
43
51
|
throw new Error("Transport not started");
|
|
44
52
|
}
|
|
45
|
-
const websocket =
|
|
53
|
+
const websocket = this._getWebSocket();
|
|
46
54
|
if (!websocket) {
|
|
47
55
|
throw new Error("WebSocket not connected");
|
|
48
56
|
}
|
|
@@ -57,39 +65,88 @@ var McpTransport = class {
|
|
|
57
65
|
this.onclose?.();
|
|
58
66
|
}
|
|
59
67
|
};
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
68
|
+
var McpStreamableHttpTransport = class {
|
|
69
|
+
constructor(getWebSocketForMessageID, notifyResponseIdSent) {
|
|
70
|
+
this._started = false;
|
|
71
|
+
this._getWebSocketForMessageID = getWebSocketForMessageID;
|
|
72
|
+
this._notifyResponseIdSent = notifyResponseIdSent;
|
|
73
|
+
this._getWebSocketForGetRequest = () => null;
|
|
74
|
+
}
|
|
75
|
+
async start() {
|
|
76
|
+
if (this._started) {
|
|
77
|
+
throw new Error("Transport already started");
|
|
78
|
+
}
|
|
79
|
+
this._started = true;
|
|
80
|
+
}
|
|
81
|
+
async send(message) {
|
|
82
|
+
if (!this._started) {
|
|
83
|
+
throw new Error("Transport not started");
|
|
84
|
+
}
|
|
85
|
+
let websocket = null;
|
|
86
|
+
if (isJSONRPCResponse(message) || isJSONRPCError(message)) {
|
|
87
|
+
websocket = this._getWebSocketForMessageID(message.id.toString());
|
|
88
|
+
if (!websocket) {
|
|
89
|
+
throw new Error(
|
|
90
|
+
`Could not find WebSocket for message id: ${message.id}`
|
|
91
|
+
);
|
|
92
|
+
}
|
|
93
|
+
} else if (isJSONRPCRequest(message)) {
|
|
94
|
+
websocket = this._getWebSocketForGetRequest();
|
|
95
|
+
} else if (isJSONRPCNotification(message)) {
|
|
96
|
+
websocket = null;
|
|
97
|
+
}
|
|
98
|
+
try {
|
|
99
|
+
websocket?.send(JSON.stringify(message));
|
|
100
|
+
if (isJSONRPCResponse(message)) {
|
|
101
|
+
this._notifyResponseIdSent(message.id.toString());
|
|
102
|
+
}
|
|
103
|
+
} catch (error) {
|
|
104
|
+
this.onerror?.(error);
|
|
105
|
+
throw error;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
async close() {
|
|
109
|
+
this.onclose?.();
|
|
110
|
+
}
|
|
111
|
+
};
|
|
112
|
+
var McpAgent = class _McpAgent extends DurableObject {
|
|
113
|
+
constructor(ctx, env) {
|
|
114
|
+
var _a;
|
|
115
|
+
super(ctx, env);
|
|
116
|
+
this._status = "zero";
|
|
117
|
+
this._transportType = "unset";
|
|
118
|
+
this._requestIdToConnectionId = /* @__PURE__ */ new Map();
|
|
76
119
|
this.initRun = false;
|
|
120
|
+
const self = this;
|
|
121
|
+
this._agent = new (_a = class extends Agent {
|
|
122
|
+
onStateUpdate(state, source) {
|
|
123
|
+
return self.onStateUpdate(state, source);
|
|
124
|
+
}
|
|
125
|
+
async onMessage(connection, message) {
|
|
126
|
+
return self.onMessage(connection, message);
|
|
127
|
+
}
|
|
128
|
+
}, _a.options = {
|
|
129
|
+
hibernate: true
|
|
130
|
+
}, _a)(ctx, env);
|
|
131
|
+
}
|
|
132
|
+
get mcp() {
|
|
133
|
+
return this._agent.mcp;
|
|
77
134
|
}
|
|
78
135
|
get state() {
|
|
79
|
-
return
|
|
136
|
+
return this._agent.state;
|
|
80
137
|
}
|
|
81
138
|
sql(strings, ...values) {
|
|
82
|
-
return
|
|
139
|
+
return this._agent.sql(strings, ...values);
|
|
83
140
|
}
|
|
84
141
|
setState(state) {
|
|
85
|
-
return
|
|
142
|
+
return this._agent.setState(state);
|
|
86
143
|
}
|
|
87
144
|
onStateUpdate(state, source) {
|
|
88
145
|
}
|
|
89
146
|
async onStart() {
|
|
90
147
|
var _a;
|
|
91
148
|
const self = this;
|
|
92
|
-
|
|
149
|
+
this._agent = new (_a = class extends Agent {
|
|
93
150
|
constructor() {
|
|
94
151
|
super(...arguments);
|
|
95
152
|
this.initialState = self.initialState;
|
|
@@ -97,26 +154,57 @@ var McpAgent = class extends DurableObject {
|
|
|
97
154
|
onStateUpdate(state, source) {
|
|
98
155
|
return self.onStateUpdate(state, source);
|
|
99
156
|
}
|
|
157
|
+
async onMessage(connection, event) {
|
|
158
|
+
return self.onMessage(connection, event);
|
|
159
|
+
}
|
|
100
160
|
}, _a.options = {
|
|
101
161
|
hibernate: true
|
|
102
|
-
}, _a)(this.ctx, this.env)
|
|
162
|
+
}, _a)(this.ctx, this.env);
|
|
103
163
|
this.props = await this.ctx.storage.get("props");
|
|
104
|
-
await this.
|
|
105
|
-
|
|
106
|
-
|
|
164
|
+
this._transportType = await this.ctx.storage.get(
|
|
165
|
+
"transportType"
|
|
166
|
+
);
|
|
167
|
+
await this._init(this.props);
|
|
168
|
+
const server = await this.server;
|
|
169
|
+
if (this._transportType === "sse") {
|
|
170
|
+
this._transport = new McpSSETransport(() => this.getWebSocket());
|
|
171
|
+
await server.connect(this._transport);
|
|
172
|
+
} else if (this._transportType === "streamable-http") {
|
|
173
|
+
this._transport = new McpStreamableHttpTransport(
|
|
174
|
+
(id) => this.getWebSocketForResponseID(id),
|
|
175
|
+
(id) => this._requestIdToConnectionId.delete(id)
|
|
176
|
+
);
|
|
177
|
+
await server.connect(this._transport);
|
|
178
|
+
}
|
|
107
179
|
}
|
|
108
180
|
async _init(props) {
|
|
109
|
-
await this.ctx.storage.put("props", props);
|
|
181
|
+
await this.ctx.storage.put("props", props ?? {});
|
|
182
|
+
if (!this.ctx.storage.get("transportType")) {
|
|
183
|
+
await this.ctx.storage.put("transportType", "unset");
|
|
184
|
+
}
|
|
110
185
|
this.props = props;
|
|
111
186
|
if (!this.initRun) {
|
|
112
187
|
this.initRun = true;
|
|
113
188
|
await this.init();
|
|
114
189
|
}
|
|
115
190
|
}
|
|
191
|
+
async setInitialized() {
|
|
192
|
+
await this.ctx.storage.put("initialized", true);
|
|
193
|
+
}
|
|
194
|
+
async isInitialized() {
|
|
195
|
+
return await this.ctx.storage.get("initialized") === true;
|
|
196
|
+
}
|
|
197
|
+
async _initialize() {
|
|
198
|
+
await this.ctx.blockConcurrencyWhile(async () => {
|
|
199
|
+
this._status = "starting";
|
|
200
|
+
await this.onStart();
|
|
201
|
+
this._status = "started";
|
|
202
|
+
});
|
|
203
|
+
}
|
|
116
204
|
// Allow the worker to fetch a websocket connection to the agent
|
|
117
205
|
async fetch(request) {
|
|
118
|
-
if (
|
|
119
|
-
await
|
|
206
|
+
if (this._status !== "started") {
|
|
207
|
+
await this._initialize();
|
|
120
208
|
}
|
|
121
209
|
if (request.headers.get("Upgrade") !== "websocket") {
|
|
122
210
|
return new Response("Expected WebSocket Upgrade request", {
|
|
@@ -124,18 +212,42 @@ var McpAgent = class extends DurableObject {
|
|
|
124
212
|
});
|
|
125
213
|
}
|
|
126
214
|
const url = new URL(request.url);
|
|
127
|
-
const
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
215
|
+
const path = url.pathname;
|
|
216
|
+
const server = await this.server;
|
|
217
|
+
switch (path) {
|
|
218
|
+
case "/sse": {
|
|
219
|
+
const websockets = this.ctx.getWebSockets();
|
|
220
|
+
if (websockets.length > 0) {
|
|
221
|
+
return new Response("Websocket already connected", { status: 400 });
|
|
222
|
+
}
|
|
223
|
+
await this.ctx.storage.put("transportType", "sse");
|
|
224
|
+
this._transportType = "sse";
|
|
225
|
+
if (!this._transport) {
|
|
226
|
+
this._transport = new McpSSETransport(() => this.getWebSocket());
|
|
227
|
+
await server.connect(this._transport);
|
|
228
|
+
}
|
|
229
|
+
return this._agent.fetch(request);
|
|
230
|
+
}
|
|
231
|
+
case "/streamable-http": {
|
|
232
|
+
if (!this._transport) {
|
|
233
|
+
this._transport = new McpStreamableHttpTransport(
|
|
234
|
+
(id) => this.getWebSocketForResponseID(id),
|
|
235
|
+
(id) => this._requestIdToConnectionId.delete(id)
|
|
236
|
+
);
|
|
237
|
+
await server.connect(this._transport);
|
|
238
|
+
}
|
|
239
|
+
await this.ctx.storage.put("transportType", "streamable-http");
|
|
240
|
+
this._transportType = "streamable-http";
|
|
241
|
+
return this._agent.fetch(request);
|
|
242
|
+
}
|
|
243
|
+
default:
|
|
244
|
+
return new Response(
|
|
245
|
+
"Internal Server Error: Expected /sse or /streamable-http path",
|
|
246
|
+
{
|
|
247
|
+
status: 500
|
|
248
|
+
}
|
|
249
|
+
);
|
|
133
250
|
}
|
|
134
|
-
const response = await __privateGet(this, _agent).fetch(request);
|
|
135
|
-
__privateSet(this, _connected, true);
|
|
136
|
-
__privateSet(this, _transport, new McpTransport(() => this.getWebSocket()));
|
|
137
|
-
await this.server.connect(__privateGet(this, _transport));
|
|
138
|
-
return response;
|
|
139
251
|
}
|
|
140
252
|
getWebSocket() {
|
|
141
253
|
const websockets = this.ctx.getWebSockets();
|
|
@@ -144,73 +256,90 @@ var McpAgent = class extends DurableObject {
|
|
|
144
256
|
}
|
|
145
257
|
return websockets[0];
|
|
146
258
|
}
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
259
|
+
getWebSocketForResponseID(id) {
|
|
260
|
+
const connectionId = this._requestIdToConnectionId.get(id);
|
|
261
|
+
if (connectionId === void 0) {
|
|
262
|
+
return null;
|
|
150
263
|
}
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
const contentLength = Number.parseInt(
|
|
159
|
-
request.headers.get("content-length") || "0",
|
|
160
|
-
10
|
|
264
|
+
return this._agent.getConnection(connectionId) ?? null;
|
|
265
|
+
}
|
|
266
|
+
// All messages received here. This is currently never called
|
|
267
|
+
async onMessage(connection, event) {
|
|
268
|
+
if (this._transportType !== "streamable-http") {
|
|
269
|
+
const err = new Error(
|
|
270
|
+
"Internal Server Error: Expected streamable-http protocol"
|
|
161
271
|
);
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
272
|
+
this._transport?.onerror?.(err);
|
|
273
|
+
return;
|
|
274
|
+
}
|
|
275
|
+
let message;
|
|
276
|
+
try {
|
|
277
|
+
const data = typeof event === "string" ? event : new TextDecoder().decode(event);
|
|
278
|
+
message = JSONRPCMessageSchema.parse(JSON.parse(data));
|
|
279
|
+
} catch (error) {
|
|
280
|
+
this._transport?.onerror?.(error);
|
|
281
|
+
return;
|
|
282
|
+
}
|
|
283
|
+
if (isJSONRPCRequest(message)) {
|
|
284
|
+
this._requestIdToConnectionId.set(message.id.toString(), connection.id);
|
|
285
|
+
}
|
|
286
|
+
this._transport?.onmessage?.(message);
|
|
287
|
+
}
|
|
288
|
+
// All messages received over SSE after the initial connection has been established
|
|
289
|
+
// will be passed here
|
|
290
|
+
async onSSEMcpMessage(sessionId, request) {
|
|
291
|
+
if (this._status !== "started") {
|
|
292
|
+
await this._initialize();
|
|
293
|
+
}
|
|
294
|
+
if (this._transportType !== "sse") {
|
|
295
|
+
return new Error("Internal Server Error: Expected SSE protocol");
|
|
296
|
+
}
|
|
297
|
+
try {
|
|
167
298
|
const message = await request.json();
|
|
168
299
|
let parsedMessage;
|
|
169
300
|
try {
|
|
170
301
|
parsedMessage = JSONRPCMessageSchema.parse(message);
|
|
171
302
|
} catch (error) {
|
|
172
|
-
|
|
303
|
+
this._transport?.onerror?.(error);
|
|
173
304
|
throw error;
|
|
174
305
|
}
|
|
175
|
-
|
|
176
|
-
return
|
|
306
|
+
this._transport?.onmessage?.(parsedMessage);
|
|
307
|
+
return null;
|
|
177
308
|
} catch (error) {
|
|
178
|
-
|
|
179
|
-
|
|
309
|
+
console.error("Error forwarding message to SSE:", error);
|
|
310
|
+
this._transport?.onerror?.(error);
|
|
311
|
+
return error;
|
|
180
312
|
}
|
|
181
313
|
}
|
|
182
|
-
//
|
|
314
|
+
// Delegate all websocket events to the underlying agent
|
|
183
315
|
async webSocketMessage(ws, event) {
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
const data = typeof event === "string" ? event : new TextDecoder().decode(event);
|
|
187
|
-
message = JSONRPCMessageSchema.parse(JSON.parse(data));
|
|
188
|
-
} catch (error) {
|
|
189
|
-
__privateGet(this, _transport)?.onerror?.(error);
|
|
190
|
-
return;
|
|
191
|
-
}
|
|
192
|
-
if (__privateGet(this, _status) !== "started") {
|
|
193
|
-
await __privateMethod(this, _McpAgent_instances, initialize_fn).call(this);
|
|
316
|
+
if (this._status !== "started") {
|
|
317
|
+
await this._initialize();
|
|
194
318
|
}
|
|
195
|
-
|
|
319
|
+
return await this._agent.webSocketMessage(ws, event);
|
|
196
320
|
}
|
|
197
321
|
// WebSocket event handlers for hibernation support
|
|
198
322
|
async webSocketError(ws, error) {
|
|
199
|
-
if (
|
|
200
|
-
await
|
|
323
|
+
if (this._status !== "started") {
|
|
324
|
+
await this._initialize();
|
|
201
325
|
}
|
|
202
|
-
|
|
326
|
+
return await this._agent.webSocketError(ws, error);
|
|
203
327
|
}
|
|
204
328
|
async webSocketClose(ws, code, reason, wasClean) {
|
|
205
|
-
if (
|
|
206
|
-
await
|
|
329
|
+
if (this._status !== "started") {
|
|
330
|
+
await this._initialize();
|
|
207
331
|
}
|
|
208
|
-
|
|
209
|
-
__privateSet(this, _connected, false);
|
|
332
|
+
return await this._agent.webSocketClose(ws, code, reason, wasClean);
|
|
210
333
|
}
|
|
211
334
|
static mount(path, {
|
|
212
335
|
binding = "MCP_OBJECT",
|
|
213
336
|
corsOptions
|
|
337
|
+
} = {}) {
|
|
338
|
+
return _McpAgent.serveSSE(path, { binding, corsOptions });
|
|
339
|
+
}
|
|
340
|
+
static serveSSE(path, {
|
|
341
|
+
binding = "MCP_OBJECT",
|
|
342
|
+
corsOptions
|
|
214
343
|
} = {}) {
|
|
215
344
|
let pathname = path;
|
|
216
345
|
if (path === "/") {
|
|
@@ -219,26 +348,40 @@ var McpAgent = class extends DurableObject {
|
|
|
219
348
|
const basePattern = new URLPattern({ pathname });
|
|
220
349
|
const messagePattern = new URLPattern({ pathname: `${pathname}/message` });
|
|
221
350
|
return {
|
|
222
|
-
|
|
351
|
+
async fetch(request, env, ctx) {
|
|
223
352
|
const corsResponse = handleCORS(request, corsOptions);
|
|
224
353
|
if (corsResponse) return corsResponse;
|
|
225
354
|
const url = new URL(request.url);
|
|
226
|
-
const
|
|
355
|
+
const bindingValue = env[binding];
|
|
356
|
+
if (bindingValue == null || typeof bindingValue !== "object") {
|
|
357
|
+
console.error(
|
|
358
|
+
`Could not find McpAgent binding for ${binding}. Did you update your wrangler configuration?`
|
|
359
|
+
);
|
|
360
|
+
return new Response("Invalid binding", { status: 500 });
|
|
361
|
+
}
|
|
362
|
+
if (!isDurableObjectNamespace(bindingValue)) {
|
|
363
|
+
return new Response("Invalid binding", { status: 500 });
|
|
364
|
+
}
|
|
365
|
+
const namespace = bindingValue;
|
|
227
366
|
if (request.method === "GET" && basePattern.test(url)) {
|
|
228
367
|
const sessionId = url.searchParams.get("sessionId") || namespace.newUniqueId().toString();
|
|
229
368
|
const { readable, writable } = new TransformStream();
|
|
230
369
|
const writer = writable.getWriter();
|
|
231
370
|
const encoder = new TextEncoder();
|
|
371
|
+
const endpointUrl = new URL(request.url);
|
|
372
|
+
endpointUrl.pathname = encodeURI(`${pathname}/message`);
|
|
373
|
+
endpointUrl.searchParams.set("sessionId", sessionId);
|
|
374
|
+
const relativeUrlWithSession = endpointUrl.pathname + endpointUrl.search + endpointUrl.hash;
|
|
232
375
|
const endpointMessage = `event: endpoint
|
|
233
|
-
data: ${
|
|
376
|
+
data: ${relativeUrlWithSession}
|
|
234
377
|
|
|
235
378
|
`;
|
|
236
379
|
writer.write(encoder.encode(endpointMessage));
|
|
237
|
-
const id = namespace.
|
|
380
|
+
const id = namespace.idFromName(`sse:${sessionId}`);
|
|
238
381
|
const doStub = namespace.get(id);
|
|
239
382
|
await doStub._init(ctx.props);
|
|
240
383
|
const upgradeUrl = new URL(request.url);
|
|
241
|
-
upgradeUrl.
|
|
384
|
+
upgradeUrl.pathname = "/sse";
|
|
242
385
|
const response = await doStub.fetch(
|
|
243
386
|
new Request(upgradeUrl, {
|
|
244
387
|
headers: {
|
|
@@ -252,44 +395,55 @@ data: ${encodeURI(`${pathname}/message`)}?sessionId=${sessionId}
|
|
|
252
395
|
if (!ws) {
|
|
253
396
|
console.error("Failed to establish WebSocket connection");
|
|
254
397
|
await writer.close();
|
|
255
|
-
return
|
|
398
|
+
return new Response("Failed to establish WebSocket connection", {
|
|
399
|
+
status: 500
|
|
400
|
+
});
|
|
256
401
|
}
|
|
257
402
|
ws.accept();
|
|
258
|
-
ws.addEventListener("message",
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
403
|
+
ws.addEventListener("message", (event) => {
|
|
404
|
+
async function onMessage(event2) {
|
|
405
|
+
try {
|
|
406
|
+
const message = JSON.parse(event2.data);
|
|
407
|
+
const result = JSONRPCMessageSchema.safeParse(message);
|
|
408
|
+
if (!result.success) {
|
|
409
|
+
return;
|
|
410
|
+
}
|
|
411
|
+
const messageText = `event: message
|
|
266
412
|
data: ${JSON.stringify(result.data)}
|
|
267
413
|
|
|
268
414
|
`;
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
415
|
+
await writer.write(encoder.encode(messageText));
|
|
416
|
+
} catch (error) {
|
|
417
|
+
console.error("Error forwarding message to SSE:", error);
|
|
418
|
+
}
|
|
272
419
|
}
|
|
420
|
+
onMessage(event).catch(console.error);
|
|
273
421
|
});
|
|
274
|
-
ws.addEventListener("error",
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
422
|
+
ws.addEventListener("error", (error) => {
|
|
423
|
+
async function onError(error2) {
|
|
424
|
+
try {
|
|
425
|
+
await writer.close();
|
|
426
|
+
} catch (e) {
|
|
427
|
+
}
|
|
278
428
|
}
|
|
429
|
+
onError(error).catch(console.error);
|
|
279
430
|
});
|
|
280
|
-
ws.addEventListener("close",
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
431
|
+
ws.addEventListener("close", () => {
|
|
432
|
+
async function onClose() {
|
|
433
|
+
try {
|
|
434
|
+
await writer.close();
|
|
435
|
+
} catch (error) {
|
|
436
|
+
console.error("Error closing SSE connection:", error);
|
|
437
|
+
}
|
|
285
438
|
}
|
|
439
|
+
onClose().catch(console.error);
|
|
286
440
|
});
|
|
287
441
|
return new Response(readable, {
|
|
288
442
|
headers: {
|
|
289
443
|
"Content-Type": "text/event-stream",
|
|
290
444
|
"Cache-Control": "no-cache",
|
|
291
445
|
Connection: "keep-alive",
|
|
292
|
-
|
|
446
|
+
...corsHeaders(request, corsOptions)
|
|
293
447
|
}
|
|
294
448
|
});
|
|
295
449
|
}
|
|
@@ -301,38 +455,326 @@ data: ${JSON.stringify(result.data)}
|
|
|
301
455
|
{ status: 400 }
|
|
302
456
|
);
|
|
303
457
|
}
|
|
304
|
-
const
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
}
|
|
310
|
-
|
|
311
|
-
"
|
|
312
|
-
|
|
458
|
+
const contentType = request.headers.get("content-type") || "";
|
|
459
|
+
if (!contentType.includes("application/json")) {
|
|
460
|
+
return new Response(`Unsupported content-type: ${contentType}`, {
|
|
461
|
+
status: 400
|
|
462
|
+
});
|
|
463
|
+
}
|
|
464
|
+
const contentLength = Number.parseInt(
|
|
465
|
+
request.headers.get("content-length") || "0",
|
|
466
|
+
10
|
|
313
467
|
);
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
468
|
+
if (contentLength > MAXIMUM_MESSAGE_SIZE_BYTES) {
|
|
469
|
+
return new Response(
|
|
470
|
+
`Request body too large: ${contentLength} bytes`,
|
|
471
|
+
{
|
|
472
|
+
status: 400
|
|
473
|
+
}
|
|
474
|
+
);
|
|
475
|
+
}
|
|
476
|
+
const id = namespace.idFromName(`sse:${sessionId}`);
|
|
477
|
+
const doStub = namespace.get(id);
|
|
478
|
+
const error = await doStub.onSSEMcpMessage(sessionId, request);
|
|
479
|
+
if (error) {
|
|
480
|
+
return new Response(error.message, {
|
|
481
|
+
status: 400,
|
|
482
|
+
headers: {
|
|
483
|
+
"Content-Type": "text/event-stream",
|
|
484
|
+
"Cache-Control": "no-cache",
|
|
485
|
+
Connection: "keep-alive",
|
|
486
|
+
...corsHeaders(request, corsOptions)
|
|
487
|
+
}
|
|
488
|
+
});
|
|
489
|
+
}
|
|
490
|
+
return new Response("Accepted", {
|
|
491
|
+
status: 202,
|
|
492
|
+
headers: {
|
|
493
|
+
"Content-Type": "text/event-stream",
|
|
494
|
+
"Cache-Control": "no-cache",
|
|
495
|
+
Connection: "keep-alive",
|
|
496
|
+
...corsHeaders(request, corsOptions)
|
|
497
|
+
}
|
|
318
498
|
});
|
|
319
499
|
}
|
|
320
500
|
return new Response("Not Found", { status: 404 });
|
|
321
501
|
}
|
|
322
502
|
};
|
|
323
503
|
}
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
504
|
+
static serve(path, {
|
|
505
|
+
binding = "MCP_OBJECT",
|
|
506
|
+
corsOptions
|
|
507
|
+
} = {}) {
|
|
508
|
+
let pathname = path;
|
|
509
|
+
if (path === "/") {
|
|
510
|
+
pathname = "/*";
|
|
511
|
+
}
|
|
512
|
+
const basePattern = new URLPattern({ pathname });
|
|
513
|
+
return {
|
|
514
|
+
async fetch(request, env, ctx) {
|
|
515
|
+
const corsResponse = handleCORS(request, corsOptions);
|
|
516
|
+
if (corsResponse) {
|
|
517
|
+
return corsResponse;
|
|
518
|
+
}
|
|
519
|
+
const url = new URL(request.url);
|
|
520
|
+
const bindingValue = env[binding];
|
|
521
|
+
if (bindingValue == null || typeof bindingValue !== "object") {
|
|
522
|
+
console.error(
|
|
523
|
+
`Could not find McpAgent binding for ${binding}. Did you update your wrangler configuration?`
|
|
524
|
+
);
|
|
525
|
+
return new Response("Invalid binding", { status: 500 });
|
|
526
|
+
}
|
|
527
|
+
if (!isDurableObjectNamespace(bindingValue)) {
|
|
528
|
+
return new Response("Invalid binding", { status: 500 });
|
|
529
|
+
}
|
|
530
|
+
const namespace = bindingValue;
|
|
531
|
+
if (request.method === "POST" && basePattern.test(url)) {
|
|
532
|
+
const acceptHeader = request.headers.get("accept");
|
|
533
|
+
if (!acceptHeader?.includes("application/json") || !acceptHeader.includes("text/event-stream")) {
|
|
534
|
+
const body2 = JSON.stringify({
|
|
535
|
+
jsonrpc: "2.0",
|
|
536
|
+
error: {
|
|
537
|
+
code: -32e3,
|
|
538
|
+
message: "Not Acceptable: Client must accept both application/json and text/event-stream"
|
|
539
|
+
},
|
|
540
|
+
id: null
|
|
541
|
+
});
|
|
542
|
+
return new Response(body2, { status: 406 });
|
|
543
|
+
}
|
|
544
|
+
const ct = request.headers.get("content-type");
|
|
545
|
+
if (!ct || !ct.includes("application/json")) {
|
|
546
|
+
const body2 = JSON.stringify({
|
|
547
|
+
jsonrpc: "2.0",
|
|
548
|
+
error: {
|
|
549
|
+
code: -32e3,
|
|
550
|
+
message: "Unsupported Media Type: Content-Type must be application/json"
|
|
551
|
+
},
|
|
552
|
+
id: null
|
|
553
|
+
});
|
|
554
|
+
return new Response(body2, { status: 415 });
|
|
555
|
+
}
|
|
556
|
+
const contentLength = Number.parseInt(
|
|
557
|
+
request.headers.get("content-length") ?? "0",
|
|
558
|
+
10
|
|
559
|
+
);
|
|
560
|
+
if (contentLength > MAXIMUM_MESSAGE_SIZE_BYTES) {
|
|
561
|
+
const body2 = JSON.stringify({
|
|
562
|
+
jsonrpc: "2.0",
|
|
563
|
+
error: {
|
|
564
|
+
code: -32e3,
|
|
565
|
+
message: `Request body too large. Maximum size is ${MAXIMUM_MESSAGE_SIZE_BYTES} bytes`
|
|
566
|
+
},
|
|
567
|
+
id: null
|
|
568
|
+
});
|
|
569
|
+
return new Response(body2, { status: 413 });
|
|
570
|
+
}
|
|
571
|
+
let sessionId = request.headers.get("mcp-session-id");
|
|
572
|
+
let rawMessage;
|
|
573
|
+
try {
|
|
574
|
+
rawMessage = await request.json();
|
|
575
|
+
} catch (error) {
|
|
576
|
+
const body2 = JSON.stringify({
|
|
577
|
+
jsonrpc: "2.0",
|
|
578
|
+
error: {
|
|
579
|
+
code: -32700,
|
|
580
|
+
message: "Parse error: Invalid JSON"
|
|
581
|
+
},
|
|
582
|
+
id: null
|
|
583
|
+
});
|
|
584
|
+
return new Response(body2, { status: 400 });
|
|
585
|
+
}
|
|
586
|
+
let arrayMessage;
|
|
587
|
+
if (Array.isArray(rawMessage)) {
|
|
588
|
+
arrayMessage = rawMessage;
|
|
589
|
+
} else {
|
|
590
|
+
arrayMessage = [rawMessage];
|
|
591
|
+
}
|
|
592
|
+
let messages = [];
|
|
593
|
+
for (const msg of arrayMessage) {
|
|
594
|
+
if (!JSONRPCMessageSchema.safeParse(msg).success) {
|
|
595
|
+
const body2 = JSON.stringify({
|
|
596
|
+
jsonrpc: "2.0",
|
|
597
|
+
error: {
|
|
598
|
+
code: -32700,
|
|
599
|
+
message: "Parse error: Invalid JSON-RPC message"
|
|
600
|
+
},
|
|
601
|
+
id: null
|
|
602
|
+
});
|
|
603
|
+
return new Response(body2, { status: 400 });
|
|
604
|
+
}
|
|
605
|
+
}
|
|
606
|
+
messages = arrayMessage.map((msg) => JSONRPCMessageSchema.parse(msg));
|
|
607
|
+
const isInitializationRequest = messages.some(
|
|
608
|
+
(msg) => InitializeRequestSchema.safeParse(msg).success
|
|
609
|
+
);
|
|
610
|
+
if (isInitializationRequest && sessionId) {
|
|
611
|
+
const body2 = JSON.stringify({
|
|
612
|
+
jsonrpc: "2.0",
|
|
613
|
+
error: {
|
|
614
|
+
code: -32600,
|
|
615
|
+
message: "Invalid Request: Initialization requests must not include a sessionId"
|
|
616
|
+
},
|
|
617
|
+
id: null
|
|
618
|
+
});
|
|
619
|
+
return new Response(body2, { status: 400 });
|
|
620
|
+
}
|
|
621
|
+
if (isInitializationRequest && messages.length > 1) {
|
|
622
|
+
const body2 = JSON.stringify({
|
|
623
|
+
jsonrpc: "2.0",
|
|
624
|
+
error: {
|
|
625
|
+
code: -32600,
|
|
626
|
+
message: "Invalid Request: Only one initialization request is allowed"
|
|
627
|
+
},
|
|
628
|
+
id: null
|
|
629
|
+
});
|
|
630
|
+
return new Response(body2, { status: 400 });
|
|
631
|
+
}
|
|
632
|
+
if (!isInitializationRequest && !sessionId) {
|
|
633
|
+
const body2 = JSON.stringify({
|
|
634
|
+
jsonrpc: "2.0",
|
|
635
|
+
error: {
|
|
636
|
+
code: -32e3,
|
|
637
|
+
message: "Bad Request: Mcp-Session-Id header is required"
|
|
638
|
+
},
|
|
639
|
+
id: null
|
|
640
|
+
});
|
|
641
|
+
return new Response(body2, { status: 400 });
|
|
642
|
+
}
|
|
643
|
+
sessionId = sessionId ?? namespace.newUniqueId().toString();
|
|
644
|
+
const id = namespace.idFromName(`streamable-http:${sessionId}`);
|
|
645
|
+
const doStub = namespace.get(id);
|
|
646
|
+
const isInitialized = await doStub.isInitialized();
|
|
647
|
+
if (isInitializationRequest) {
|
|
648
|
+
await doStub._init(ctx.props);
|
|
649
|
+
await doStub.setInitialized();
|
|
650
|
+
} else if (!isInitialized) {
|
|
651
|
+
const body2 = JSON.stringify({
|
|
652
|
+
jsonrpc: "2.0",
|
|
653
|
+
error: {
|
|
654
|
+
code: -32001,
|
|
655
|
+
message: "Session not found"
|
|
656
|
+
},
|
|
657
|
+
id: null
|
|
658
|
+
});
|
|
659
|
+
return new Response(body2, { status: 404 });
|
|
660
|
+
}
|
|
661
|
+
const { readable, writable } = new TransformStream();
|
|
662
|
+
const writer = writable.getWriter();
|
|
663
|
+
const encoder = new TextEncoder();
|
|
664
|
+
const upgradeUrl = new URL(request.url);
|
|
665
|
+
upgradeUrl.pathname = "/streamable-http";
|
|
666
|
+
const response = await doStub.fetch(
|
|
667
|
+
new Request(upgradeUrl, {
|
|
668
|
+
headers: {
|
|
669
|
+
Upgrade: "websocket",
|
|
670
|
+
// Required by PartyServer
|
|
671
|
+
"x-partykit-room": sessionId
|
|
672
|
+
}
|
|
673
|
+
})
|
|
674
|
+
);
|
|
675
|
+
const ws = response.webSocket;
|
|
676
|
+
if (!ws) {
|
|
677
|
+
console.error("Failed to establish WebSocket connection");
|
|
678
|
+
await writer.close();
|
|
679
|
+
const body2 = JSON.stringify({
|
|
680
|
+
jsonrpc: "2.0",
|
|
681
|
+
error: {
|
|
682
|
+
code: -32001,
|
|
683
|
+
message: "Failed to establish WebSocket connection"
|
|
684
|
+
},
|
|
685
|
+
id: null
|
|
686
|
+
});
|
|
687
|
+
return new Response(body2, { status: 500 });
|
|
688
|
+
}
|
|
689
|
+
const requestIds = /* @__PURE__ */ new Set();
|
|
690
|
+
ws.accept();
|
|
691
|
+
ws.addEventListener("message", (event) => {
|
|
692
|
+
async function onMessage(event2) {
|
|
693
|
+
try {
|
|
694
|
+
const data = typeof event2.data === "string" ? event2.data : new TextDecoder().decode(event2.data);
|
|
695
|
+
const message = JSON.parse(data);
|
|
696
|
+
const result = JSONRPCMessageSchema.safeParse(message);
|
|
697
|
+
if (!result.success) {
|
|
698
|
+
return;
|
|
699
|
+
}
|
|
700
|
+
if (isJSONRPCResponse(result.data) || isJSONRPCError(result.data)) {
|
|
701
|
+
requestIds.delete(result.data.id);
|
|
702
|
+
}
|
|
703
|
+
const messageText = `event: message
|
|
704
|
+
data: ${JSON.stringify(result.data)}
|
|
705
|
+
|
|
706
|
+
`;
|
|
707
|
+
await writer.write(encoder.encode(messageText));
|
|
708
|
+
if (requestIds.size === 0) {
|
|
709
|
+
ws.close();
|
|
710
|
+
}
|
|
711
|
+
} catch (error) {
|
|
712
|
+
console.error("Error forwarding message to SSE:", error);
|
|
713
|
+
}
|
|
714
|
+
}
|
|
715
|
+
onMessage(event).catch(console.error);
|
|
716
|
+
});
|
|
717
|
+
ws.addEventListener("error", (error) => {
|
|
718
|
+
async function onError(error2) {
|
|
719
|
+
try {
|
|
720
|
+
await writer.close();
|
|
721
|
+
} catch (e) {
|
|
722
|
+
}
|
|
723
|
+
}
|
|
724
|
+
onError(error).catch(console.error);
|
|
725
|
+
});
|
|
726
|
+
ws.addEventListener("close", () => {
|
|
727
|
+
async function onClose() {
|
|
728
|
+
try {
|
|
729
|
+
await writer.close();
|
|
730
|
+
} catch (error) {
|
|
731
|
+
console.error("Error closing SSE connection:", error);
|
|
732
|
+
}
|
|
733
|
+
}
|
|
734
|
+
onClose().catch(console.error);
|
|
735
|
+
});
|
|
736
|
+
const hasOnlyNotificationsOrResponses = messages.every(
|
|
737
|
+
(msg) => isJSONRPCNotification(msg) || isJSONRPCResponse(msg)
|
|
738
|
+
);
|
|
739
|
+
if (hasOnlyNotificationsOrResponses) {
|
|
740
|
+
for (const message of messages) {
|
|
741
|
+
ws.send(JSON.stringify(message));
|
|
742
|
+
}
|
|
743
|
+
ws.close();
|
|
744
|
+
return new Response(null, {
|
|
745
|
+
status: 202,
|
|
746
|
+
headers: corsHeaders(request, corsOptions)
|
|
747
|
+
});
|
|
748
|
+
}
|
|
749
|
+
for (const message of messages) {
|
|
750
|
+
if (isJSONRPCRequest(message)) {
|
|
751
|
+
requestIds.add(message.id);
|
|
752
|
+
}
|
|
753
|
+
ws.send(JSON.stringify(message));
|
|
754
|
+
}
|
|
755
|
+
return new Response(readable, {
|
|
756
|
+
headers: {
|
|
757
|
+
"Content-Type": "text/event-stream",
|
|
758
|
+
"Cache-Control": "no-cache",
|
|
759
|
+
Connection: "keep-alive",
|
|
760
|
+
"mcp-session-id": sessionId,
|
|
761
|
+
...corsHeaders(request, corsOptions)
|
|
762
|
+
},
|
|
763
|
+
status: 200
|
|
764
|
+
});
|
|
765
|
+
}
|
|
766
|
+
const body = JSON.stringify({
|
|
767
|
+
jsonrpc: "2.0",
|
|
768
|
+
error: {
|
|
769
|
+
code: -32e3,
|
|
770
|
+
message: "Method not allowed"
|
|
771
|
+
},
|
|
772
|
+
id: null
|
|
773
|
+
});
|
|
774
|
+
return new Response(body, { status: 405 });
|
|
775
|
+
}
|
|
776
|
+
};
|
|
777
|
+
}
|
|
336
778
|
};
|
|
337
779
|
export {
|
|
338
780
|
McpAgent
|