Merge remote-tracking branch 'upstream/dev' into imageOptimize

Author: taooceros

.github/ISSUE_TEMPLATE/discussion.md renamed to .github/ISSUE_TEMPLATE/discussion.md.not_used

@@ -53,15 +53,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Droplex" Version="1.2.0" />
+    <PackageReference Include="Droplex" Version="1.3.1" />
     <PackageReference Include="FSharp.Core" Version="4.7.1" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.3" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />
     <ProjectReference Include="..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />

Flow.Launcher.Core/Flow.Launcher.Core.csproj

@@ -1,5 +1,4 @@
-
-/* We basically follow the Json-RPC 2.0 spec (http://www.jsonrpc.org/specification) to invoke methods between Flow Launcher and other plugins, 
+/* We basically follow the Json-RPC 2.0 spec (http://www.jsonrpc.org/specification) to invoke methods between Flow Launcher and other plugins, 
  * like python or other self-execute program. But, we added addtional infos (proxy and so on) into rpc request. Also, we didn't use the
  * "id" and "jsonrpc" in the request, since it's not so useful in our request model.
  * 
@@ -13,10 +12,12 @@
  * 
  */
 
+using Flow.Launcher.Core.Resource;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;
 using Flow.Launcher.Plugin;
+using System.Text.Json;
 
 namespace Flow.Launcher.Core.Plugin
 {
@@ -29,12 +30,8 @@ public class JsonRPCErrorModel
         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; }
 
@@ -48,45 +45,20 @@ public class JsonRPCQueryResponseModel : JsonRPCResponseModel
 
         public string DebugMessage { get; set; }
     }
-
-    public class JsonRPCRequestModel : JsonRPCModelBase
+    
+    public class JsonRPCRequestModel
     {
         public string Method { get; set; }
 
         public object[] Parameters { get; set; }
 
-        public override string ToString()
-        {
-            string rpc = string.Empty;
-            if (Parameters != null && Parameters.Length > 0)
-            {
-                string parameters = $"[{string.Join(',', Parameters.Select(GetParameterByType))}]";
-                rpc = $@"{{\""method\"":\""{Method}\"",\""parameters\"":{parameters}";
-            }
-            else
-            {
-                rpc = $@"{{\""method\"":\""{Method}\"",\""parameters\"":[]";
-            }
-
-            return rpc;
-
-        }
-
-        private string GetParameterByType(object parameter)
-        => parameter switch
+        private static readonly JsonSerializerOptions options = new()
         {
-            null => "null",
-            string _ => $@"\""{ReplaceEscapes(parameter.ToString())}\""",
-            bool _ => $@"{parameter.ToString().ToLower()}",
-            _ => parameter.ToString()
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase
         };
-
-
-    private string ReplaceEscapes(string str)
+        public override string ToString()
         {
-            return str.Replace(@"\", @"\\") //Escapes in ProcessStartInfo
-                .Replace(@"\", @"\\") //Escapes itself when passed to client
-                .Replace(@"""", @"\\""""");
+            return JsonSerializer.Serialize(this, options);
         }
     }
 
@@ -95,11 +67,7 @@ private string ReplaceEscapes(string str)
     /// </summary>
     public class JsonRPCServerRequestModel : JsonRPCRequestModel
     {
-        public override string ToString()
-        {
-            string rpc = base.ToString();
-            return rpc + "}";
-        }
+
     }
 
     /// <summary>
@@ -108,12 +76,6 @@ public override string ToString()
     public class JsonRPCClientRequestModel : JsonRPCRequestModel
     {
         public bool DontHideAfterAction { get; set; }
-
-        public override string ToString()
-        {
-            string rpc = base.ToString();
-            return rpc + "}";
-        }
     }
 
     /// <summary>
@@ -125,4 +87,4 @@ public class JsonRPCResult : Result
     {
         public JsonRPCClientRequestModel JsonRPCAction { get; set; }
     }
-}
+}