Finally make JSONRPC Bidirection work

Author: taooceros

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

@@ -12,7 +12,7 @@ namespace Flow.Launcher.Core.ExternalPlugins
 {
     public static class PluginsManifest
     {
-        private const string manifestFileUrl = "https://cdn.jsdelivr.net/gh/Flow-Launcher/Flow.Launcher.PluginsManifest@plugin_api_v2/plugins.json";
+        private const string manifestFileUrl = "https://jsdelivr.bobocdn.tk/gh/Flow-Launcher/Flow.Launcher.PluginsManifest@plugin_api_v2/plugins.json";
 
         private static readonly SemaphoreSlim manifestUpdateLock = new(1);
 

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

@@ -64,9 +64,5 @@
     <ProjectReference Include="..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />
     <ProjectReference Include="..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <Folder Include="Helper" />
-  </ItemGroup>
 
 </Project>

Flow.Launcher.Core/Plugin/JsonRPCPluginBase.cs

@@ -41,9 +41,11 @@ internal abstract class JsonRPCPluginBase : IAsyncPlugin, IContextMenu, ISetting
 
         private int RequestId { get; set; }
 
-        private string SettingConfigurationPath => Path.Combine(Context.CurrentPluginMetadata.PluginDirectory, "SettingsTemplate.yaml");
+        private string SettingConfigurationPath =>
+            Path.Combine(Context.CurrentPluginMetadata.PluginDirectory, "SettingsTemplate.yaml");
 
-        private string SettingPath => Path.Combine(DataLocation.PluginSettingsDirectory, Context.CurrentPluginMetadata.Name, "Settings.json");
+        private string SettingPath => Path.Combine(DataLocation.PluginSettingsDirectory,
+            Context.CurrentPluginMetadata.Name, "Settings.json");
 
         public abstract List<Result> LoadContextMenus(Result selectedResult);
 
@@ -57,10 +59,7 @@ internal abstract class JsonRPCPluginBase : IAsyncPlugin, IContextMenu, ISetting
             // see: https://github.com/dotnet/runtime/issues/39152
             IgnoreNullValues = true,
 #pragma warning restore SYSLIB0020 // Type or member is obsolete
-            Converters =
-            {
-                new JsonObjectConverter()
-            }
+            Converters = { new JsonObjectConverter() }
         };
 
         protected static readonly JsonSerializerOptions RequestSerializeOption = new()
@@ -83,9 +82,9 @@ protected List<Result> ParseResults(JsonRPCQueryResponseModel queryResponseModel
 
             foreach (var result in queryResponseModel.Result)
             {
-                result.AsyncAction = async c =>
+                result.AsyncAction = async _ =>
                 {
-                    Settings.UpdateSettings(result.SettingsChange);
+                    Settings?.UpdateSettings(result.SettingsChange);
 
                     return await ExecuteResultAsync(result);
                 };
@@ -95,7 +94,7 @@ protected List<Result> ParseResults(JsonRPCQueryResponseModel queryResponseModel
 
             results.AddRange(queryResponseModel.Result);
 
-            Settings.UpdateSettings(queryResponseModel.SettingsChanges);
+            Settings?.UpdateSettings(queryResponseModel.SettingsChanges);
 
             return results;
         }
@@ -130,18 +129,18 @@ private async Task InitSettingAsync()
             if (!File.Exists(SettingConfigurationPath))
                 return;
 
-            var deserializer = new DeserializerBuilder().WithNamingConvention(CamelCaseNamingConvention.Instance).Build();
-            var configuration = deserializer.Deserialize<JsonRpcConfigurationModel>(await File.ReadAllTextAsync(SettingConfigurationPath));
+            var deserializer = new DeserializerBuilder().WithNamingConvention(CamelCaseNamingConvention.Instance)
+                .Build();
+            var configuration =
+                deserializer.Deserialize<JsonRpcConfigurationModel>(
+                    await File.ReadAllTextAsync(SettingConfigurationPath));
 
             Settings ??= new PortableSettings
             {
-                Configuration = configuration,
-                SettingPath = SettingPath,
-                API = Context.API
+                Configuration = configuration, SettingPath = SettingPath, API = Context.API
             };
 
             await Settings.InitializeAsync();
-
         }
 
         public virtual async Task InitAsync(PluginInitContext context)
@@ -154,10 +153,10 @@ public void Save()
         {
             Settings?.Save();
         }
+
         public Control CreateSettingPanel()
         {
             return Settings.CreateSettingPanel();
         }
     }
-
 }

Flow.Launcher.Core/Plugin/JsonRPCPluginV2.cs

@@ -1,26 +1,22 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
-using System.Text.Json;
 using System.Threading;
-using System.Threading.Channels;
 using System.Threading.Tasks;
-using System.Windows.Controls;
 using Flow.Launcher.Core.Plugin.JsonRPCV2Models;
 using Flow.Launcher.Plugin;
 using StreamJsonRpc;
 
 
 namespace Flow.Launcher.Core.Plugin
 {
-    internal abstract class JsonRpcPluginV2 : JsonRPCPluginBase
+    internal abstract class JsonRPCPluginV2 : JsonRPCPluginBase, IDisposable
     {
         public abstract string SupportedLanguage { get; set; }
 
         public const string JsonRpc = "JsonRPC";
 
-        protected abstract JsonRpc Rpc { get; set; }
+        protected abstract JsonRpc RPC { get; set; }
 
         protected StreamReader ErrorStream { get; set; }
 
@@ -29,7 +25,8 @@ protected override async Task<bool> ExecuteResultAsync(JsonRPCResult result)
         {
             try
             {
-                var res = await Rpc.InvokeAsync<JsonRPCExecuteResponse>(result.JsonRPCAction.Method, argument: result.JsonRPCAction.Parameters);
+                var res = await RPC.InvokeAsync<JsonRPCExecuteResponse>(result.JsonRPCAction.Method,
+                    argument: result.JsonRPCAction.Parameters);
 
                 return res.Hide;
             }
@@ -43,15 +40,17 @@ public override async Task<List<Result>> QueryAsync(Query query, CancellationTok
         {
             try
             {
-                var res = await Rpc.InvokeAsync<JsonRPCQueryResponseModel>("query", query);
+                var res = await RPC.InvokeWithCancellationAsync<JsonRPCQueryResponseModel>("query", 
+                    new[] { query },
+                    token);
 
                 var results = ParseResults(res);
 
                 return results;
             }
             catch
             {
-                return new List<Result>();
+                 return new List<Result>();
             }
         }
 
@@ -72,5 +71,11 @@ async Task ReadErrorAsync()
                 }
             }
         }
+
+        public void Dispose()
+        {
+            RPC?.Dispose();
+            ErrorStream?.Dispose();
+        }
     }
 }

Flow.Launcher.Core/Plugin/JsonRPCV2Models/JsonRPCExecuteResponse.cs

@@ -1,4 +1,4 @@
 namespace Flow.Launcher.Core.Plugin.JsonRPCV2Models
 {
-    public record JsonRPCExecuteResponse(bool Hide = true);
+    public abstract record JsonRPCExecuteResponse(bool Hide = true);
 }