Merge pull request #466 from Flow-Launcher/fixFlowCallback

Add Customized Object Converter, fix Length issue

Author: jjw24

Flow.Launcher.Core/Plugin/JsonPRCModel.cs

@@ -13,6 +13,7 @@
  * 
  */
 
+using Flow.Launcher.Core.Resource;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;
@@ -108,6 +109,7 @@ public class JsonRPCServerRequestModel : JsonRPCRequestModel
     /// </summary>
     public class JsonRPCClientRequestModel : JsonRPCRequestModel
     {
+        [JsonPropertyName("dontHideAfterAction")]
         public bool DontHideAfterAction { get; set; }
     }
 

Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

@@ -1,4 +1,5 @@
-using System;
+using Flow.Launcher.Core.Resource;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -45,13 +46,14 @@ public List<Result> LoadContextMenus(Result selectedResult)
             }
         }
 
+        private static readonly JsonSerializerOptions _options = new() {Converters = {new JsonObjectConverter()}};
 
         private async Task<List<Result>> DeserializedResultAsync(Stream output)
         {
             if (output == Stream.Null) return null;
 
-            JsonRPCQueryResponseModel queryResponseModel = await
-                JsonSerializer.DeserializeAsync<JsonRPCQueryResponseModel>(output);
+            var queryResponseModel = await
+                JsonSerializer.DeserializeAsync<JsonRPCQueryResponseModel>(output, _options);
 
             return ParseResults(queryResponseModel);
         }
@@ -60,11 +62,12 @@ private List<Result> DeserializedResult(string output)
         {
             if (string.IsNullOrEmpty(output)) return null;
 
-            JsonRPCQueryResponseModel queryResponseModel =
-                JsonSerializer.Deserialize<JsonRPCQueryResponseModel>(output);
+            var queryResponseModel =
+                JsonSerializer.Deserialize<JsonRPCQueryResponseModel>(output, _options);
             return ParseResults(queryResponseModel);
         }
 
+
         private List<Result> ParseResults(JsonRPCQueryResponseModel queryResponseModel)
         {
             var results = new List<Result>();
@@ -85,7 +88,7 @@ private List<Result> ParseResults(JsonRPCQueryResponseModel queryResponseModel)
                     {
                         if (result.JsonRPCAction.Method.StartsWith("Flow.Launcher."))
                         {
-                            ExecuteFlowLauncherAPI(result.JsonRPCAction.Method.Substring(4),
+                            ExecuteFlowLauncherAPI(result.JsonRPCAction.Method[14..],
                                 result.JsonRPCAction.Parameters);
                         }
                         else

Flow.Launcher.Core/Resource/JsonObjectConverter.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Flow.Launcher.Core.Resource
+{
+    public class JsonObjectConverter : JsonConverter<object>
+    {
+        public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            switch (reader.TokenType)
+            {
+                case JsonTokenType.True:
+                    return true;
+                case JsonTokenType.False:
+                    return false;
+                case JsonTokenType.Number when reader.TryGetInt32(out var i):
+                    return i;
+                case JsonTokenType.Number when reader.TryGetInt64(out var l):
+                    return l;
+                case JsonTokenType.Number:
+                    return reader.GetDouble();
+                case JsonTokenType.String when reader.TryGetDateTime(out DateTime datetime):
+                    return datetime;
+                case JsonTokenType.String:
+                    return reader.GetString();
+                default:
+                    // Use JsonElement as fallback.
+                    // Newtonsoft uses JArray or JObject.
+                    using (var document = JsonDocument.ParseValue(ref reader))
+                    {
+                        return document.RootElement.Clone();
+                    }
+            }
+        }
+
+        public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOptions options)
+        {
+            throw new InvalidOperationException("Should not get here.");
+        }
+    }
+}