Merge pull request #363 from Flow-Launcher/dev

Release 1.8.0 | Plugin 2.0.0

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

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>
     <OutputType>Library</OutputType>
@@ -16,7 +16,7 @@
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\Output\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -53,14 +53,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Droplex" Version="1.3.1" />
     <PackageReference Include="FSharp.Core" Version="4.7.1" />
     <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/Plugin/ExecutablePlugin.cs

@@ -1,5 +1,8 @@
 using System;
 using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Core.Plugin
@@ -21,17 +24,17 @@ public ExecutablePlugin(string filename)
             };
         }
 
-        protected override string ExecuteQuery(Query query)
+        protected override Task<Stream> ExecuteQueryAsync(Query query, CancellationToken token)
         {
             JsonRPCServerRequestModel request = new JsonRPCServerRequestModel
             {
                 Method = "query",
-                Parameters = new object[] { query.Search },
+                Parameters = new object[] {query.Search},
             };
 
             _startInfo.Arguments = $"\"{request}\"";
 
-            return Execute(_startInfo);
+            return ExecuteAsync(_startInfo, token);
         }
 
         protected override string ExecuteCallback(JsonRPCRequestModel rpcRequest)
@@ -40,10 +43,12 @@ protected override string ExecuteCallback(JsonRPCRequestModel rpcRequest)
             return Execute(_startInfo);
         }
 
-        protected override string ExecuteContextMenu(Result selectedResult) {
-            JsonRPCServerRequestModel request = new JsonRPCServerRequestModel {
+        protected override string ExecuteContextMenu(Result selectedResult)
+        {
+            JsonRPCServerRequestModel request = new JsonRPCServerRequestModel
+            {
                 Method = "contextmenu",
-                Parameters = new object[] { selectedResult.ContextData },
+                Parameters = new object[] {selectedResult.ContextData},
             };
 
             _startInfo.Arguments = $"\"{request}\"";

Flow.Launcher.Core/Plugin/JsonPRCModel.cs

@@ -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; }
 
@@ -45,57 +42,23 @@ public class JsonRPCQueryResponseModel : JsonRPCResponseModel
     {
         [JsonPropertyName("result")]
         public new List<JsonRPCResult> Result { get; set; }
-    }
 
-    public class JsonRPCRequestModel : JsonRPCModelBase
+        public string DebugMessage { get; set; }
+    }
+
+    public class JsonRPCRequestModel
     {
         public string Method { get; set; }
 
         public object[] Parameters { get; set; }
 
-        public override string ToString()
+        private static readonly JsonSerializerOptions options = new()
         {
-            string rpc = string.Empty;
-            if (Parameters != null && Parameters.Length > 0)
-            {
-                string parameters = Parameters.Aggregate("[", (current, o) => current + (GetParameterByType(o) + ","));
-                parameters = parameters.Substring(0, parameters.Length - 1) + "]";
-                rpc = string.Format(@"{{\""method\"":\""{0}\"",\""parameters\"":{1}", Method, parameters);
-            }
-            else
-            {
-                rpc = string.Format(@"{{\""method\"":\""{0}\"",\""parameters\"":[]", Method);
-            }
-
-            return rpc;
-
-        }
-
-        private string GetParameterByType(object parameter)
-        {
-            if (parameter == null) {
-                return "null";
-            }
-            if (parameter is string)
-            {
-                return string.Format(@"\""{0}\""", ReplaceEscapes(parameter.ToString()));
-            }
-            if (parameter is int || parameter is float || parameter is double)
-            {
-                return string.Format(@"{0}", parameter);
-            }
-            if (parameter is bool)
-            {
-                return string.Format(@"{0}", parameter.ToString().ToLower());
-            }
-            return parameter.ToString();
-        }
-
-        private string ReplaceEscapes(string str)
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+        };
+        public override string ToString()
         {
-            return str.Replace(@"\", @"\\") //Escapes in ProcessStartInfo
-                .Replace(@"\", @"\\") //Escapes itself when passed to client
-                .Replace(@"""", @"\\""""");
+            return JsonSerializer.Serialize(this, options);
         }
     }
 
@@ -104,11 +67,7 @@ private string ReplaceEscapes(string str)
     /// </summary>
     public class JsonRPCServerRequestModel : JsonRPCRequestModel
     {
-        public override string ToString()
-        {
-            string rpc = base.ToString();
-            return rpc + "}";
-        }
+
     }
 
     /// <summary>
@@ -117,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>
@@ -134,4 +87,4 @@ public class JsonRPCResult : Result
     {
         public JsonRPCClientRequestModel JsonRPCAction { get; set; }
     }
-}
+}