Skip to content

Commit 529dd8b

Browse files
authored
Merge pull request #664 from atesgoral/fix/http-client-handler-error-echo
fix: keep HTTP client handler exception details local
2 parents 02905d6 + d49394f commit 529dd8b

3 files changed

Lines changed: 18 additions & 7 deletions

File tree

‎docs/_client/transports.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@ since servers deliver requests that are not tied to a client request on that str
184184
a JSON-RPC `-32601` (method not found) error. To handle methods other than `elicitation/create`, register directly on the transport with
185185
`http_transport.on_server_request("method/name") { |params| ... }`.
186186

187+
If a handler raises an unexpected exception, the HTTP transport answers with JSON-RPC error `-32603`, `Internal error`.
188+
The exception class and message are written to local stderr, not sent to the server.
189+
187190
On a [modern](/client/lifecycle/) connection servers cannot send requests at all; the same
188191
registered handlers instead drive the requests embedded in `input_required` results,
189192
as documented on [Multi Round-Trip Requests](/client/mrtr/).

‎lib/mcp/client/http.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1196,12 +1196,13 @@ def dispatch_server_request(message)
11961196
error: { code: e.code, message: e.message },
11971197
}
11981198
rescue StandardError => e
1199+
warn("MCP::Client::HTTP: error handling #{message["method"]} request: #{e.class}: #{e.message.dump}")
11991200
{
12001201
jsonrpc: JsonRpcHandler::Version::V2_0,
12011202
id: message["id"],
12021203
error: {
12031204
code: JsonRpcHandler::ErrorCode::INTERNAL_ERROR,
1204-
message: "Internal error handling #{message["method"]} request: #{e.message}",
1205+
message: "Internal error",
12051206
},
12061207
}
12071208
end

‎test/mcp/client/http_test.rb‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1660,6 +1660,9 @@ def test_send_request_answers_unregistered_server_request_with_method_not_found
16601660
end
16611661

16621662
def test_send_request_answers_raising_handler_with_internal_error
1663+
original_verbose = $VERBOSE
1664+
$VERBOSE = false
1665+
16631666
request = {
16641667
jsonrpc: "2.0",
16651668
id: "test_id",
@@ -1671,7 +1674,7 @@ def test_send_request_answers_raising_handler_with_internal_error
16711674
jsonrpc: "2.0",
16721675
id: 9,
16731676
method: "elicitation/create",
1674-
params: {},
1677+
params: { message: "boom\r\n\e[31m" },
16751678
}
16761679
tool_result = { jsonrpc: "2.0", id: "test_id", result: { content: [] } }
16771680
sse_body = "event: message\ndata: #{server_request.to_json}\n\n" \
@@ -1688,20 +1691,24 @@ def test_send_request_answers_raising_handler_with_internal_error
16881691
expected_error_response = {
16891692
jsonrpc: "2.0",
16901693
id: 9,
1691-
error: { code: -32603, message: "Internal error handling elicitation/create request: boom" },
1694+
error: { code: -32603, message: "Internal error" },
16921695
}
16931696
error_stub = stub_request(:post, url).with(
16941697
body: expected_error_response.to_json,
16951698
).to_return(
16961699
status: 202, body: "",
16971700
)
16981701

1699-
client.on_server_request("elicitation/create") { raise "boom" }
1702+
client.on_server_request("elicitation/create") { |params| raise params["message"] }
17001703

1701-
response = client.send_request(request: request)
1704+
assert_output("", "MCP::Client::HTTP: error handling elicitation/create request: RuntimeError: \"boom\\r\\n\\e[31m\"\n") do
1705+
response = client.send_request(request: request)
17021706

1703-
assert_equal({ "content" => [] }, response["result"])
1704-
assert_requested(error_stub)
1707+
assert_equal({ "content" => [] }, response["result"])
1708+
assert_requested(error_stub)
1709+
end
1710+
ensure
1711+
$VERBOSE = original_verbose
17051712
end
17061713

17071714
def test_send_request_answers_server_request_error_with_its_code

0 commit comments

Comments
 (0)