welsonjs/WelsonJS.Augmented/WelsonJS.Launcher/JsonRpc2Dispatcher.cs
Namhyeon, Go 3eea89f5a3 Fix JSON-RPC dispatcher callback params
Reordered the parameters for the JSON-RPC dispatch callback to ensure the serializer and request id are passed in the correct positions. Updated the Func signature in JsonRpc2Dispatcher.cs to include the int id parameter before the CancellationToken, and adjusted the invocation/lambda in JsonRpc2.cs to match (method, ser, id, ct), preventing parameter mismatches when handling requests.
2026-03-16 21:17:51 +09:00

85 lines
2.6 KiB
C#

// JsonRpc2Dispatcher.cs
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: 2025 Catswords OSS and WelsonJS Contributors
// https://github.com/gnh1201/welsonjs
//
using log4net;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace WelsonJS.Launcher
{
public sealed class JsonRpc2Request
{
public string Version;
public string Method;
}
public sealed class JsonRpc2Exception : Exception
{
public JsonRpc2Exception(string message) : base(message) { }
public JsonRpc2Exception(string message, Exception inner) : base(message, inner) { }
}
public sealed class JsonRpc2Dispatcher
{
private readonly ILog _logger;
public JsonRpc2Dispatcher(ILog logger)
{
_logger = logger;
}
public async Task<string> HandleAsync(
string requestBody,
Func<string, JsSerializer, int, CancellationToken, Task<string>> dispatchMethodAsync,
CancellationToken ct)
{
if (string.IsNullOrEmpty(requestBody))
throw new JsonRpc2Exception("Empty request body");
if (dispatchMethodAsync == null)
throw new ArgumentNullException("dispatchMethodAsync");
using (var ser = new JsSerializer())
{
int id = ser.Load(requestBody);
try
{
string version = ser.ExtractFrom(id, "jsonrpc");
if (!string.Equals(version, "2.0", StringComparison.Ordinal))
throw new JsonRpc2Exception("Unsupported JSON-RPC version: " + version);
string method = ser.ExtractFrom(id, "method");
if (string.IsNullOrEmpty(method))
throw new JsonRpc2Exception("Missing method");
var req = new JsonRpc2Request
{
Version = version,
Method = method
};
return await dispatchMethodAsync(req.Method, ser, id, ct);
}
catch (JsonRpc2Exception)
{
throw;
}
catch (Exception ex)
{
if (_logger != null)
_logger.Error("[JsonRpc2] Parse error", ex);
throw new JsonRpc2Exception("Parse error", ex);
}
finally
{
ser.Unload(id);
}
}
}
}
}