diff --git a/Flow.Launcher.Core/Plugin/JsonPRCModel.cs b/Flow.Launcher.Core/Plugin/JsonPRCModel.cs index 2b3bd61b0..5232e46da 100644 --- a/Flow.Launcher.Core/Plugin/JsonPRCModel.cs +++ b/Flow.Launcher.Core/Plugin/JsonPRCModel.cs @@ -30,12 +30,8 @@ namespace Flow.Launcher.Core.Plugin public string Data { get; set; } } - public class JsonRPCModelBase - { - public int Id { get; set; } - } - public class JsonRPCResponseModel : JsonRPCModelBase + public class JsonRPCResponseModel { public string Result { get; set; } @@ -49,18 +45,20 @@ namespace Flow.Launcher.Core.Plugin public string DebugMessage { get; set; } } - - public class JsonRPCRequestModel : JsonRPCModelBase + + public class JsonRPCRequestModel { - [JsonPropertyName("method")] public string Method { get; set; } - [JsonPropertyName("parameters")] public object[] Parameters { get; set; } + private static readonly JsonSerializerOptions options = new() + { + PropertyNamingPolicy = JsonNamingPolicy.CamelCase + }; public override string ToString() { - return JsonSerializer.Serialize(this); + return JsonSerializer.Serialize(this, options); } } @@ -77,7 +75,6 @@ namespace Flow.Launcher.Core.Plugin /// public class JsonRPCClientRequestModel : JsonRPCRequestModel { - [JsonPropertyName("dontHideAfterAction")] public bool DontHideAfterAction { get; set; } } diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs b/Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs index 65f8fc608..152173749 100644 --- a/Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs +++ b/Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs @@ -47,8 +47,9 @@ namespace Flow.Launcher.Core.Plugin } } - private static readonly JsonSerializerOptions _options = new() + private static readonly JsonSerializerOptions options = new() { + PropertyNameCaseInsensitive = true, Converters = { new JsonObjectConverter() @@ -60,7 +61,7 @@ namespace Flow.Launcher.Core.Plugin if (output == Stream.Null) return null; var queryResponseModel = await - JsonSerializer.DeserializeAsync(output, _options); + JsonSerializer.DeserializeAsync(output, options); return ParseResults(queryResponseModel); } @@ -70,7 +71,7 @@ namespace Flow.Launcher.Core.Plugin if (string.IsNullOrEmpty(output)) return null; var queryResponseModel = - JsonSerializer.Deserialize(output, _options); + JsonSerializer.Deserialize(output, options); return ParseResults(queryResponseModel); } @@ -110,7 +111,7 @@ namespace Flow.Launcher.Core.Plugin return !result.JsonRPCAction.DontHideAfterAction; } - var jsonRpcRequestModel = JsonSerializer.Deserialize(actionResponse, _options); + var jsonRpcRequestModel = JsonSerializer.Deserialize(actionResponse, options); if (jsonRpcRequestModel?.Method?.StartsWith("Flow.Launcher.") ?? false) {