Merge pull request #633 from Flow-Launcher/JsonPRCExceptionHandle

Adjust JsonRPCPlugin.cs Exception Handling

Author: jjw24

Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

@@ -40,15 +40,7 @@ internal abstract class JsonRPCPlugin : IAsyncPlugin, IContextMenu
         public List<Result> LoadContextMenus(Result selectedResult)
         {
             var output = ExecuteContextMenu(selectedResult);
-            try
-            {
-                return DeserializedResult(output);
-            }
-            catch (Exception e)
-            {
-                Log.Exception($"|JsonRPCPlugin.LoadContextMenus|Exception on result <{selectedResult}>", e);
-                return null;
-            }
+            return DeserializedResult(output);
         }
 
         private static readonly JsonSerializerOptions options = new()
@@ -65,23 +57,10 @@ private async Task<List<Result>> DeserializedResultAsync(Stream output)
         {
             if (output == Stream.Null) return null;
 
-            try
-            {
-                var queryResponseModel =
-                    await JsonSerializer.DeserializeAsync<JsonRPCQueryResponseModel>(output, options);
-
-                return ParseResults(queryResponseModel);
-            }
-            catch (JsonException e)
-            {
-                Log.Exception(GetType().FullName, "Unexpected Json Input", e);
-            }
-            finally
-            {
-                await output.DisposeAsync();
-            }
+            var queryResponseModel =
+                await JsonSerializer.DeserializeAsync<JsonRPCQueryResponseModel>(output, options);
 
-            return null;
+            return ParseResults(queryResponseModel);
         }
 
         private List<Result> DeserializedResult(string output)
@@ -249,7 +228,7 @@ protected async Task<Stream> ExecuteAsync(ProcessStartInfo startInfo, Cancellati
                 await using var source = process.StandardOutput.BaseStream;
 
                 var buffer = BufferManager.GetStream();
-                
+
                 token.Register(() =>
                 {
                     // ReSharper disable once AccessToModifiedClosure
@@ -274,30 +253,27 @@ protected async Task<Stream> ExecuteAsync(ProcessStartInfo startInfo, Cancellati
 
                 token.ThrowIfCancellationRequested();
 
+                if (buffer.Length == 0)
+                {
+                    var errorMessage = process.StandardError.EndOfStream ? 
+                        "Empty JSONRPC Response" : 
+                        await process.StandardError.ReadToEndAsync();
+                    throw new InvalidDataException($"{context.CurrentPluginMetadata.Name}|{errorMessage}");
+                }
+
                 if (!process.StandardError.EndOfStream)
                 {
                     using var standardError = process.StandardError;
                     var error = await standardError.ReadToEndAsync();
 
                     if (!string.IsNullOrEmpty(error))
                     {
-                        Log.Error($"|JsonRPCPlugin.ExecuteAsync|{error}");
-                        return Stream.Null;
+                        Log.Error($"|{context.CurrentPluginMetadata.Name}.{nameof(ExecuteAsync)}|{error}");
                     }
-
-                    Log.Error("|JsonRPCPlugin.ExecuteAsync|Empty standard output and standard error.");
-                    return Stream.Null;
                 }
 
                 return buffer;
             }
-            catch (Exception e)
-            {
-                Log.Exception(
-                    $"|JsonRPCPlugin.ExecuteAsync|Exception for filename <{startInfo.FileName}> with argument <{startInfo.Arguments}>",
-                    e);
-                return Stream.Null;
-            }
             finally
             {
                 process?.Dispose();
@@ -307,20 +283,8 @@ protected async Task<Stream> ExecuteAsync(ProcessStartInfo startInfo, Cancellati
 
         public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
         {
-            try
-            {
-                var output = await ExecuteQueryAsync(query, token);
-                return await DeserializedResultAsync(output);
-            }
-            catch (OperationCanceledException)
-            {
-                return null;
-            }
-            catch (Exception e)
-            {
-                Log.Exception($"|JsonRPCPlugin.Query|Exception when query <{query}>", e);
-                return null;
-            }
+            var output = await ExecuteQueryAsync(query, token);
+            return await DeserializedResultAsync(output);
         }
 
         public virtual Task InitAsync(PluginInitContext context)
@@ -329,4 +293,4 @@ public virtual Task InitAsync(PluginInitContext context)
             return Task.CompletedTask;
         }
     }
-}
+}