Fix ConnectionLostException for JsonRPC v2 plugins

Author: Jack251970

Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

@@ -1,16 +1,15 @@
-using Flow.Launcher.Core.Resource;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Plugin;
 using Microsoft.IO;
-using System.Windows;
 
 namespace Flow.Launcher.Core.Plugin
 {
@@ -20,7 +19,7 @@ namespace Flow.Launcher.Core.Plugin
     /// </summary>
     internal abstract class JsonRPCPlugin : JsonRPCPluginBase
     {
-        public const string JsonRPC = "JsonRPC";
+        public new const string JsonRPC = "JsonRPC";
 
         protected abstract Task<Stream> RequestAsync(JsonRPCRequestModel rpcRequest, CancellationToken token = default);
         protected abstract string Request(JsonRPCRequestModel rpcRequest, CancellationToken token = default);
@@ -29,9 +28,6 @@ internal abstract class JsonRPCPlugin : JsonRPCPluginBase
 
         private int RequestId { get; set; }
 
-        private string SettingConfigurationPath => Path.Combine(Context.CurrentPluginMetadata.PluginDirectory, "SettingsTemplate.yaml");
-        private string SettingPath => Path.Combine(Context.CurrentPluginMetadata.PluginSettingsDirectoryPath, "Settings.json");
-
         public override List<Result> LoadContextMenus(Result selectedResult)
         {
             var request = new JsonRPCRequestModel(RequestId++, 
@@ -57,13 +53,6 @@ public override List<Result> LoadContextMenus(Result selectedResult)
             }
         };
 
-        private static readonly JsonSerializerOptions settingSerializeOption = new()
-        {
-            WriteIndented = true
-        };
-
-        private readonly Dictionary<string, FrameworkElement> _settingControls = new();
-
         private async Task<List<Result>> DeserializedResultAsync(Stream output)
         {
             await using (output)
@@ -122,7 +111,6 @@ protected override async Task<bool> ExecuteResultAsync(JsonRPCResult result)
             return !result.JsonRPCAction.DontHideAfterAction;
         }
 
-
         /// <summary>
         /// Execute external program and return the output
         /// </summary>

Flow.Launcher.Core/Plugin/JsonRPCPluginBase.cs

@@ -1,11 +1,11 @@
-using Flow.Launcher.Core.Resource;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Plugin;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;

Flow.Launcher.Core/Plugin/JsonRPCPluginV2.cs

@@ -10,7 +10,6 @@
 using StreamJsonRpc;
 using IAsyncDisposable = System.IAsyncDisposable;
 
-
 namespace Flow.Launcher.Core.Plugin
 {
     internal abstract class JsonRPCPluginV2 : JsonRPCPluginBase, IAsyncDisposable, IAsyncReloadable, IResultUpdated
@@ -23,7 +22,6 @@ internal abstract class JsonRPCPluginV2 : JsonRPCPluginBase, IAsyncDisposable, I
 
         private JsonRpc RPC { get; set; }
 
-
         protected override async Task<bool> ExecuteResultAsync(JsonRPCResult result)
         {
             var res = await RPC.InvokeAsync<JsonRPCExecuteResponse>(result.JsonRPCAction.Method,
@@ -55,7 +53,6 @@ public override async Task<List<Result>> QueryAsync(Query query, CancellationTok
             return results;
         }
 
-
         public override async Task InitAsync(PluginInitContext context)
         {
             await base.InitAsync(context);
@@ -88,7 +85,6 @@ protected enum MessageHandlerType
 
         protected abstract MessageHandlerType MessageHandler { get; }
 
-
         private void SetupJsonRPC()
         {
             var formatter = new SystemTextJsonFormatter { JsonSerializerOptions = RequestSerializeOption };
@@ -118,9 +114,16 @@ public virtual async Task ReloadDataAsync()
             {
                 await RPC.InvokeAsync("reload_data", Context);
             }
-            catch (RemoteMethodNotFoundException e)
+            catch (RemoteMethodNotFoundException)
+            {
+            }
+            catch (ConnectionLostException)
             {
             }
+            catch (Exception e)
+            {
+                Context.API.LogException(nameof(JsonRPCPluginV2), "Failed to call reload_data", e);
+            }
         }
 
         public virtual async ValueTask DisposeAsync()
@@ -129,8 +132,15 @@ public virtual async ValueTask DisposeAsync()
             {
                 await RPC.InvokeAsync("close");
             }
-            catch (RemoteMethodNotFoundException e)
+            catch (RemoteMethodNotFoundException)
+            {
+            }
+            catch (ConnectionLostException)
+            {
+            }
+            catch (Exception e)
             {
+                Context.API.LogException(nameof(JsonRPCPluginV2), "Failed to call close", e);
             }
             finally
             {