Optimize JsonRpcMessage deserialization with single-pass parsing

src/ModelContextProtocol.Core/Protocol/JsonRpcMessage.cs

@@ -1,6 +1,8 @@
 using ModelContextProtocol.Server;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
 namespace ModelContextProtocol.Protocol;
@@ -70,6 +72,8 @@ private protected JsonRpcMessage()
     [EditorBrowsable(EditorBrowsableState.Never)]
     public sealed class Converter : JsonConverter<JsonRpcMessage>
     {
+        private const string JsonRpcVersion = "2.0";
+
         /// <inheritdoc/>
         public override JsonRpcMessage? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
@@ -78,53 +82,131 @@ public sealed class Converter : JsonConverter<JsonRpcMessage>
                 throw new JsonException("Expected StartObject token");
             }
 
-            using var doc = JsonDocument.ParseValue(ref reader);
-            var root = doc.RootElement;
+            // Local variables for parsed message data
+            bool hasJsonRpc = false;
+            RequestId id = default;
+            string? method = null;
+            JsonNode? parameters = null;
+            JsonRpcErrorDetail? error = null;
+            JsonNode? result = null;
+            bool hasResult = false;
 
-            // All JSON-RPC messages must have a jsonrpc property with value "2.0"
-            if (!root.TryGetProperty("jsonrpc", out var versionProperty) ||
-                versionProperty.GetString() != "2.0")
+            while (true)
             {
-                throw new JsonException("Invalid or missing jsonrpc version");
-            }
+                bool success = reader.Read();
+                Debug.Assert(success, "custom converters are guaranteed to be passed fully buffered objects");
 
-            // Determine the message type based on the presence of id, method, and error properties
-            bool hasId = root.TryGetProperty("id", out _);
-            bool hasMethod = root.TryGetProperty("method", out _);
-            bool hasError = root.TryGetProperty("error", out _);
-
-            var rawText = root.GetRawText();
-
-            // Messages with an id but no method are responses
-            if (hasId && !hasMethod)
-            {
-                // Messages with an error property are error responses
-                if (hasError)
+                if (reader.TokenType is JsonTokenType.EndObject)
                 {
-                    return JsonSerializer.Deserialize(rawText, options.GetTypeInfo<JsonRpcError>());
+                    break;
                 }
 
-                // Messages with a result property are success responses
-                if (root.TryGetProperty("result", out _))
+                Debug.Assert(reader.TokenType is JsonTokenType.PropertyName);
+                string propertyName = reader.GetString()!;
+
+                success = reader.Read();
+                Debug.Assert(success, "custom converters are guaranteed to be passed fully buffered objects");
+
+                switch (propertyName)
                 {
-                    return JsonSerializer.Deserialize(rawText, options.GetTypeInfo<JsonRpcResponse>());
+                    case "jsonrpc":
+                        // Validate that the value is "2.0" without allocating a string
+                        if (!reader.ValueTextEquals("2.0"u8))
+                        {
+                            throw new JsonException("Invalid jsonrpc version");
+                        }
+                        hasJsonRpc = true;
+                        break;
+
+                    case "id":
+                        id = JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<RequestId>());
+                        break;
+
+                    case "method":
+                        method = reader.GetString();
+                        break;
+
+                    case "params":
+                        parameters = JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<JsonNode>());
+                        break;
+
+                    case "error":
+                        error = JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<JsonRpcErrorDetail>());
+                        break;
+
+                    case "result":
+                        result = JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<JsonNode>());
+                        hasResult = true;
+                        break;
+
+                    default:
+                        // Skip unknown properties
+                        reader.Skip();
+                        break;
                 }
+            }
 
-                throw new JsonException("Response must have either result or error");
+            // All JSON-RPC messages must have a jsonrpc property with value "2.0"
+            if (!hasJsonRpc)
+            {
+                throw new JsonException("Missing jsonrpc version");
             }
 
-            // Messages with a method but no id are notifications
-            if (hasMethod && !hasId)
+            // Determine message type based on presence of id and method properties
+            if (method is not null)
             {
-                return JsonSerializer.Deserialize(rawText, options.GetTypeInfo<JsonRpcNotification>());
+                if (id.Id is not null)
+                {
+                    // Messages with both method and id are requests
+                    return new JsonRpcRequest
+                    {
+                        JsonRpc = JsonRpcVersion,
+                        Id = id,
+                        Method = method,
+                        Params = parameters
+                    };
+                }
+                else
+                {
+                    // Messages with a method but no id are notifications
+                    return new JsonRpcNotification
+                    {
+                        JsonRpc = JsonRpcVersion,
+                        Method = method,
+                        Params = parameters
+                    };
+                }
             }
 
-            // Messages with both method and id are requests
-            if (hasMethod && hasId)
+            if (id.Id is not null)
             {
-                return JsonSerializer.Deserialize(rawText, options.GetTypeInfo<JsonRpcRequest>());
+                if (hasResult)
+                {
+                    // Messages with a result and id are success responses
+                    return new JsonRpcResponse
+                    {
+                        JsonRpc = JsonRpcVersion,
+                        Id = id,
+                        Result = result
+                    };
+                }
+
+                if (error is not null)
+                {
+                    // Messages with an error and id are error responses
+                    return new JsonRpcError
+                    {
+                        JsonRpc = JsonRpcVersion,
+                        Id = id,
+                        Error = error
+                    };
+                }
+
+                // Error: Messages with an id but no method, error, or result are invalid
+                throw new JsonException("Response must have either result or error");
             }
 
+            // Error: Messages with neither id nor method are invalid
             throw new JsonException("Invalid JSON-RPC message format");
         }