agents 0.5.1 → 0.7.0

package/dist/mcp/index.js

@@ -1,5 +1,5 @@
 import { MessageType } from "../types.js";
-import "../client-connection-CGMuV62J.js";
+import { a as RPC_DO_PREFIX, i as RPCServerTransport, r as RPCClientTransport } from "../client-connection-D3Wcd6Q6.js";
 import { Agent, getAgentByName, getCurrentAgent } from "../index.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
@@ -161,7 +161,6 @@ const createStreamingHttpHandler = (basePath, namespace, options = {}) => {
 					[MCP_MESSAGE_HEADER]: Buffer.from(JSON.stringify(messages)).toString("base64"),
 					Upgrade: "websocket"
 				} });
-				if (ctx.props) agent.updateProps(ctx.props);
 				const ws = (await agent.fetch(req)).webSocket;
 				if (!ws) {
 					console.error("Failed to establish WebSocket connection");
@@ -263,7 +262,6 @@ const createStreamingHttpHandler = (basePath, namespace, options = {}) => {
 				request.headers.forEach((v, k) => {
 					existingHeaders[k] = v;
 				});
-				if (ctx.props) agent.updateProps(ctx.props);
 				const ws = (await agent.fetch(new Request(request.url, { headers: {
 					...existingHeaders,
 					[MCP_HTTP_METHOD_HEADER]: "GET",
@@ -371,9 +369,9 @@ const createLegacySseHandler = (basePath, namespace, options = {}) => {
 			request.headers.forEach((value, key) => {
 				existingHeaders[key] = value;
 			});
-			if (ctx.props) agent.updateProps(ctx.props);
 			const ws = (await agent.fetch(new Request(request.url, { headers: {
 				...existingHeaders,
+				[MCP_HTTP_METHOD_HEADER]: "SSE",
 				Upgrade: "websocket"
 			} }))).webSocket;
 			if (!ws) {
@@ -458,11 +456,12 @@ const createLegacySseHandler = (basePath, namespace, options = {}) => {
 	};
 };
 function corsHeaders(_request, corsOptions = {}) {
-	const origin = "*";
+	const origin = corsOptions.origin || "*";
+	const headers = corsOptions.headers || "Content-Type, Accept, Authorization, mcp-session-id, mcp-protocol-version";
 	return {
-		"Access-Control-Allow-Headers": corsOptions.headers || "Content-Type, Accept, mcp-session-id, mcp-protocol-version",
+		"Access-Control-Allow-Headers": headers,
 		"Access-Control-Allow-Methods": corsOptions.methods || "GET, POST, DELETE, OPTIONS",
-		"Access-Control-Allow-Origin": corsOptions.origin || origin,
+		"Access-Control-Allow-Origin": origin,
 		"Access-Control-Expose-Headers": corsOptions.exposeHeaders || "mcp-session-id",
 		"Access-Control-Max-Age": (corsOptions.maxAge || 86400).toString()
 	};
@@ -1283,6 +1282,9 @@ function experimental_createMcpHandler(server, options = {}) {
 //#endregion
 //#region src/mcp/index.ts
 var McpAgent = class McpAgent extends Agent {
+	shouldSendProtocolMessages(_connection, ctx) {
+		return !ctx.request.headers.get(MCP_HTTP_METHOD_HEADER);
+	}
 	async setInitializeRequest(initializeRequest) {
 		await this.ctx.storage.put("initializeRequest", initializeRequest);
 	}
@@ -1290,14 +1292,15 @@ var McpAgent = class McpAgent extends Agent {
 		return this.ctx.storage.get("initializeRequest");
 	}
 	/** Read the transport type for this agent.
-	* This relies on the naming scheme being `sse:${sessionId}`
-	* or `streamable-http:${sessionId}`.
+	* This relies on the naming scheme being `sse:${sessionId}`,
+	* `streamable-http:${sessionId}`, or `rpc:${sessionId}`.
 	*/
 	getTransportType() {
 		const [t, ..._] = this.name.split(":");
 		switch (t) {
 			case "sse": return "sse";
 			case "streamable-http": return "streamable-http";
+			case "rpc": return "rpc";
 			default: throw new Error("Invalid transport type. McpAgent must be addressed with a valid protocol.");
 		}
 	}
@@ -1316,6 +1319,22 @@ var McpAgent = class McpAgent extends Agent {
 		if (websockets.length === 0) return null;
 		return websockets[0];
 	}
+	/**
+	* Returns options for configuring the RPC server transport.
+	* Override this method to customize RPC transport behavior (e.g., timeout).
+	*
+	* @example
+	* ```typescript
+	* class MyMCP extends McpAgent {
+	*   protected getRpcTransportOptions() {
+	*     return { timeout: 120000 }; // 2 minutes
+	*   }
+	* }
+	* ```
+	*/
+	getRpcTransportOptions() {
+		return {};
+	}
 	/** Returns a new transport matching the type of the Agent. */
 	initTransport() {
 		switch (this.getTransportType()) {
@@ -1327,6 +1346,7 @@ var McpAgent = class McpAgent extends Agent {
 				};
 				return transport;
 			}
+			case "rpc": return new RPCServerTransport(this.getRpcTransportOptions());
 		}
 	}
 	/** Update and store the props */
@@ -1345,6 +1365,7 @@ var McpAgent = class McpAgent extends Agent {
 		await this.init();
 		const server = await this.server;
 		this._transport = this.initTransport();
+		if (!this._transport) throw new Error("Failed to initialize transport");
 		await server.connect(this._transport);
 		await this.reinitializeServer();
 	}
@@ -1472,6 +1493,25 @@ var McpAgent = class McpAgent extends Agent {
 		}
 		return false;
 	}
+	/**
+	* Handle an RPC message for MCP
+	* This method is called by the RPC stub to process MCP messages
+	* @param message The JSON-RPC message(s) to handle
+	* @returns The response message(s) or undefined
+	*/
+	async handleMcpMessage(message) {
+		if (!this._transport) {
+			this.props = await this.ctx.storage.get("props");
+			await this.init();
+			const server = await this.server;
+			this._transport = this.initTransport();
+			if (!this._transport) throw new Error("Failed to initialize transport");
+			await server.connect(this._transport);
+			await this.reinitializeServer();
+		}
+		if (!(this._transport instanceof RPCServerTransport)) throw new Error("Expected RPC transport");
+		return await this._transport.handle(message);
+	}
 	/** Return a handler for the given path for this MCP.
 	* Defaults to Streamable HTTP transport.
 	*/
@@ -1511,5 +1551,5 @@ var McpAgent = class McpAgent extends Agent {
 };
 
 //#endregion
-export { ElicitRequestSchema, McpAgent, SSEEdgeClientTransport, StreamableHTTPEdgeClientTransport, WorkerTransport, createMcpHandler, experimental_createMcpHandler, getMcpAuthContext };
+export { ElicitRequestSchema, McpAgent, RPCClientTransport, RPCServerTransport, RPC_DO_PREFIX, SSEEdgeClientTransport, StreamableHTTPEdgeClientTransport, WorkerTransport, createMcpHandler, experimental_createMcpHandler, getMcpAuthContext };
 //# sourceMappingURL=index.js.map