## Motivation and Context Resolves #398. `JsonRpcHandler` returned `"id": null` for JSON-RPC envelope errors (wrong or missing `jsonrpc` version, non-string `method`) even when the incoming payload carried a concrete, valid request id. From the client's perspective the original request stayed pending forever, since no response with the matching id ever arrived: ``` {"jsonrpc":"1.0","id":3,"method":"ping","params":{}} => {"jsonrpc":"2.0","id":null,"error":{"code":-32600,...}} ``` Per JSON-RPC 2.0 (Response object, `id`), the response id MUST be the same as the request's id; null is reserved for requests whose id could not be detected (e.g. Parse error). The envelope validation in `process_request` runs after JSON parsing with the request hash in hand, so the id is detectable - it was simply discarded by passing the `:unknown_id` sentinel unconditionally. The fix passes the request's id to `error_response` whenever the request carries one. The existing guards keep every other case intact: `error_response` already nils out ids that fail validation (so a type-invalid or pattern-violating id still yields `"id": null`, preserving the XSS-prevention policy on echoed ids), and the `:unknown_id` sentinel is kept for requests without an id so an Invalid Request error still produces a null-id response, matching the spec's own example. Parse errors and non-object requests are unchanged (null is correct there), and batch entries pick up the fix automatically since each entry goes through `process_request`. For reference, the TypeScript and Python SDKs currently respond with `"id": null` in these cases as well, because both validate the whole message against a schema (zod / pydantic) before extracting the id. This change is driven by the JSON-RPC 2.0 requirement rather than parity; the Ruby transport layer already echoes the request id where recoverable (`invalid_request_response(request_id:)` in `StreamableHTTPTransport`), and this closes the remaining gap in `JsonRpcHandler`. ## How Has This Been Tested? - Reproduced the three payloads from #398 before and after the fix; they now return `"id":3`, `"id":4`, and `"id":8` respectively - New and updated unit tests covering: id preserved for wrong version, missing `jsonrpc`, numeric `method`, and `rpc.`-prefixed `method`; id preserved for an invalid entry inside a batch; null id kept for requests without an id, with an explicit null id, and with an id that fails validation ## Breaking Changes None in the protocol sense - this aligns the error responses with JSON-RPC 2.0. Clients that matched `"id": null` on these envelope errors will now see the request's own id, which is what allows them to correlate the error with the pending request.
189 lines
6 KiB
Ruby
189 lines
6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "json"
|
|
|
|
module JsonRpcHandler
|
|
class Version
|
|
V1_0 = "1.0"
|
|
V2_0 = "2.0"
|
|
end
|
|
|
|
class ErrorCode
|
|
INVALID_REQUEST = -32600
|
|
METHOD_NOT_FOUND = -32601
|
|
INVALID_PARAMS = -32602
|
|
INTERNAL_ERROR = -32603
|
|
PARSE_ERROR = -32700
|
|
end
|
|
|
|
DEFAULT_ALLOWED_ID_CHARACTERS = /\A[a-zA-Z0-9_-]+\z/
|
|
|
|
# Sentinel return value from a handler. When a handler returns this,
|
|
# `process_request` emits no JSON-RPC response for the request,
|
|
# matching the notification-style semantics (id is ignored).
|
|
NO_RESPONSE = Object.new.freeze
|
|
|
|
extend self
|
|
|
|
def handle(request, id_validation_pattern: DEFAULT_ALLOWED_ID_CHARACTERS, &method_finder)
|
|
if request.is_a?(Array)
|
|
return error_response(id: :unknown_id, id_validation_pattern: id_validation_pattern, error: {
|
|
code: ErrorCode::INVALID_REQUEST,
|
|
message: "Invalid Request",
|
|
data: "Request is an empty array",
|
|
}) if request.empty?
|
|
|
|
# Handle batch requests
|
|
responses = request.map { |req| process_request(req, id_validation_pattern: id_validation_pattern, &method_finder) }.compact
|
|
|
|
# A single item is hoisted out of the array
|
|
return responses.first if responses.one?
|
|
|
|
# An empty array yields nil
|
|
responses if responses.any?
|
|
elsif request.is_a?(Hash)
|
|
# Handle single request
|
|
process_request(request, id_validation_pattern: id_validation_pattern, &method_finder)
|
|
else
|
|
error_response(id: :unknown_id, id_validation_pattern: id_validation_pattern, error: {
|
|
code: ErrorCode::INVALID_REQUEST,
|
|
message: "Invalid Request",
|
|
data: "Request must be an array or a hash",
|
|
})
|
|
end
|
|
end
|
|
|
|
def handle_json(request_json, id_validation_pattern: DEFAULT_ALLOWED_ID_CHARACTERS, &method_finder)
|
|
begin
|
|
request = JSON.parse(request_json, symbolize_names: true)
|
|
response = handle(request, id_validation_pattern: id_validation_pattern, &method_finder)
|
|
rescue JSON::ParserError
|
|
response = error_response(id: :unknown_id, id_validation_pattern: id_validation_pattern, error: {
|
|
code: ErrorCode::PARSE_ERROR,
|
|
message: "Parse error",
|
|
data: "Invalid JSON",
|
|
})
|
|
end
|
|
|
|
response&.to_json
|
|
end
|
|
|
|
def process_request(request, id_validation_pattern:, &method_finder)
|
|
id = request[:id]
|
|
|
|
error = if !valid_version?(request[:jsonrpc])
|
|
"JSON-RPC version must be 2.0"
|
|
elsif !valid_id?(id, id_validation_pattern)
|
|
"Request ID must match validation pattern, or be an integer or null"
|
|
elsif !valid_method_name?(request[:method])
|
|
'Method name must be a string and not start with "rpc."'
|
|
end
|
|
|
|
# Per JSON-RPC 2.0 (Response object, `id`), the error response must carry
|
|
# the same id as the request when the id could be detected; null is only
|
|
# for requests whose id could not be determined. `error_response` nils out
|
|
# ids that fail validation, and the `:unknown_id` sentinel keeps a response
|
|
# (with a null id) being emitted when the request carried no id at all.
|
|
return error_response(id: id.nil? ? :unknown_id : id, id_validation_pattern: id_validation_pattern, error: {
|
|
code: ErrorCode::INVALID_REQUEST,
|
|
message: "Invalid Request",
|
|
data: error,
|
|
}) if error
|
|
|
|
method_name = request[:method]
|
|
params = request[:params]
|
|
|
|
unless valid_params?(params)
|
|
return error_response(id: id, id_validation_pattern: id_validation_pattern, error: {
|
|
code: ErrorCode::INVALID_PARAMS,
|
|
message: "Invalid params",
|
|
data: "Method parameters must be an array or an object or null",
|
|
})
|
|
end
|
|
|
|
begin
|
|
method = method_finder.call(method_name, id)
|
|
|
|
if method.nil?
|
|
return error_response(id: id, id_validation_pattern: id_validation_pattern, error: {
|
|
code: ErrorCode::METHOD_NOT_FOUND,
|
|
message: "Method not found",
|
|
data: method_name,
|
|
})
|
|
end
|
|
|
|
result = method.call(params)
|
|
return if result.equal?(NO_RESPONSE)
|
|
|
|
success_response(id: id, result: result)
|
|
rescue MCP::Server::RequestHandlerError => e
|
|
handle_request_error(e, id, id_validation_pattern)
|
|
rescue StandardError => e
|
|
error_response(id: id, id_validation_pattern: id_validation_pattern, error: {
|
|
code: ErrorCode::INTERNAL_ERROR,
|
|
message: "Internal error",
|
|
data: e.message,
|
|
})
|
|
end
|
|
end
|
|
|
|
def handle_request_error(error, id, id_validation_pattern)
|
|
if error.respond_to?(:error_code) && error.error_code
|
|
code = error.error_code
|
|
message = error.message
|
|
else
|
|
error_type = error.respond_to?(:error_type) ? error.error_type : nil
|
|
|
|
code, message = case error_type
|
|
when :invalid_request then [ErrorCode::INVALID_REQUEST, "Invalid Request"]
|
|
when :invalid_params then [ErrorCode::INVALID_PARAMS, "Invalid params"]
|
|
when :parse_error then [ErrorCode::PARSE_ERROR, "Parse error"]
|
|
when :internal_error then [ErrorCode::INTERNAL_ERROR, "Internal error"]
|
|
else [ErrorCode::INTERNAL_ERROR, "Internal error"]
|
|
end
|
|
end
|
|
|
|
data = error.respond_to?(:error_data) && error.error_data ? error.error_data : error.message
|
|
|
|
error_response(id: id, id_validation_pattern: id_validation_pattern, error: {
|
|
code: code,
|
|
message: message,
|
|
data: data,
|
|
})
|
|
end
|
|
|
|
def valid_version?(version)
|
|
version == Version::V2_0
|
|
end
|
|
|
|
def valid_id?(id, pattern = nil)
|
|
return true if id.nil? || id.is_a?(Integer)
|
|
return false unless id.is_a?(String)
|
|
|
|
pattern ? id.match?(pattern) : true
|
|
end
|
|
|
|
def valid_method_name?(method)
|
|
method.is_a?(String) && !method.start_with?("rpc.")
|
|
end
|
|
|
|
def valid_params?(params)
|
|
params.nil? || params.is_a?(Array) || params.is_a?(Hash)
|
|
end
|
|
|
|
def success_response(id:, result:)
|
|
{
|
|
jsonrpc: Version::V2_0,
|
|
id: id,
|
|
result: result,
|
|
} unless id.nil?
|
|
end
|
|
|
|
def error_response(id:, id_validation_pattern:, error:)
|
|
{
|
|
jsonrpc: Version::V2_0,
|
|
id: valid_id?(id, id_validation_pattern) ? id : nil,
|
|
error: error.compact,
|
|
} unless id.nil?
|
|
end
|
|
end
|