-
Notifications
You must be signed in to change notification settings - Fork 344
fix(mcp): make provider clients Worker-safe #238
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| import { afterEach, describe, expect, it, vi } from "vitest"; | ||
| import { validateJumpServerCredential } from "./runtime.ts"; | ||
|
|
||
| afterEach(() => { | ||
| vi.unstubAllGlobals(); | ||
| }); | ||
|
|
||
| describe("JumpServer MCP runtime", () => { | ||
| it("uses Streamable HTTP with Worker-safe tool schema validation", async () => { | ||
| const credential = { | ||
| mcpEndpoint: "https://jumpserver.example.com/mcp", | ||
| token: "jumpserver-token", | ||
| }; | ||
|
|
||
| // Warm the SDK's Node-only Zod fast path so this test isolates tool output validation. | ||
| await validateJumpServerCredential(credential, createStreamableMcpFetch()); | ||
| vi.stubGlobal("Function", function disabledFunctionConstructor() { | ||
| throw new EvalError("Code generation from strings disallowed for this context"); | ||
| }); | ||
|
|
||
| const result = await validateJumpServerCredential(credential, createStreamableMcpFetch()); | ||
|
|
||
| expect(result.metadata).toMatchObject({ | ||
| mcpEndpoint: "https://jumpserver.example.com/mcp", | ||
| availableActions: ["assets_assets_list"], | ||
| }); | ||
| }); | ||
|
|
||
| it("falls back to legacy SSE when Streamable HTTP is unavailable", async () => { | ||
| const requests: Array<{ method: string; pathname: string }> = []; | ||
|
|
||
| const result = await validateJumpServerCredential( | ||
| { | ||
| mcpEndpoint: "https://jumpserver.example.com/sse", | ||
| token: "jumpserver-token", | ||
| }, | ||
| createLegacySseMcpFetch(requests), | ||
| ); | ||
|
|
||
| expect(result.metadata).toMatchObject({ | ||
| mcpEndpoint: "https://jumpserver.example.com/sse", | ||
| availableActions: ["assets_assets_list"], | ||
| }); | ||
| expect(requests).toContainEqual({ method: "POST", pathname: "/sse" }); | ||
| expect(requests).toContainEqual({ method: "GET", pathname: "/sse" }); | ||
| expect(requests).toContainEqual({ method: "POST", pathname: "/messages" }); | ||
| }); | ||
| }); | ||
|
|
||
| function createStreamableMcpFetch(): typeof fetch { | ||
| return vi.fn(async (_input: RequestInfo | URL, init?: RequestInit): Promise<Response> => { | ||
| const method = init?.method ?? "GET"; | ||
| if (method === "GET") { | ||
| return new Response(null, { status: 405 }); | ||
| } | ||
|
|
||
| const request = readRequest(init); | ||
| if (!("id" in request)) { | ||
| return new Response(null, { status: 202 }); | ||
| } | ||
|
|
||
| const result = | ||
| request.method === "initialize" | ||
| ? { | ||
| protocolVersion: "2025-03-26", | ||
| capabilities: {}, | ||
| serverInfo: { name: "jumpserver", version: "1.0.0" }, | ||
| } | ||
| : { | ||
| tools: [ | ||
| { | ||
| name: "assets_assets_list", | ||
| inputSchema: { type: "object" }, | ||
| outputSchema: { type: "object" }, | ||
| }, | ||
| ], | ||
| }; | ||
|
|
||
| return new Response(JSON.stringify({ jsonrpc: "2.0", id: request.id, result }), { | ||
| headers: { | ||
| "content-type": "application/json", | ||
| "mcp-session-id": "test-session", | ||
| }, | ||
| }); | ||
| }) as typeof fetch; | ||
| } | ||
|
|
||
| function createLegacySseMcpFetch(requests: Array<{ method: string; pathname: string }>): typeof fetch { | ||
| const encoder = new TextEncoder(); | ||
| let streamController: ReadableStreamDefaultController<Uint8Array> | undefined; | ||
|
|
||
| return vi.fn(async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => { | ||
| const url = new URL(input instanceof Request ? input.url : input.toString()); | ||
| const method = init?.method ?? "GET"; | ||
| requests.push({ method, pathname: url.pathname }); | ||
|
|
||
| if (method === "POST" && url.pathname === "/sse") { | ||
| return new Response(null, { status: 405 }); | ||
| } | ||
| if (method === "GET") { | ||
| return new Response( | ||
| new ReadableStream<Uint8Array>({ | ||
| start(controller) { | ||
| streamController = controller; | ||
| controller.enqueue(encoder.encode("event: endpoint\ndata: /messages?session_id=test-session\n\n")); | ||
| }, | ||
| }), | ||
| { headers: { "content-type": "text/event-stream" } }, | ||
| ); | ||
| } | ||
|
|
||
| const request = readRequest(init); | ||
| if ("id" in request) { | ||
| const result = | ||
| request.method === "initialize" | ||
| ? { | ||
| protocolVersion: "2024-11-05", | ||
| capabilities: {}, | ||
| serverInfo: { name: "jumpserver", version: "1.0.0" }, | ||
| } | ||
| : { | ||
| tools: [ | ||
| { | ||
| name: "assets_assets_list", | ||
| inputSchema: { type: "object" }, | ||
| }, | ||
| ], | ||
| }; | ||
| streamController!.enqueue( | ||
| encoder.encode(`event: message\ndata: ${JSON.stringify({ jsonrpc: "2.0", id: request.id, result })}\n\n`), | ||
| ); | ||
| } | ||
| return new Response(null, { status: 202 }); | ||
| }) as typeof fetch; | ||
| } | ||
|
|
||
| function readRequest(init?: RequestInit): Record<string, unknown> { | ||
| return typeof init?.body === "string" ? (JSON.parse(init.body) as Record<string, unknown>) : {}; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
Placeholder still models the legacy
/sseendpoint.The description now presents Streamable HTTP as primary, but
placeholder(Line 25) still showshttps://jumpserver-mcp.example.com/sse, which could nudge users toward configuring the legacy endpoint first. Consider using a/mcp-style example to match the now-preferred transport.✏️ Suggested placeholder update
📝 Committable suggestion
🤖 Prompt for AI Agents