Merge pull request #2453 from Flow-Launcher/jsonrpcv2

JsonRPCV2 Small revision

Author: jjw24

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

@@ -57,7 +57,7 @@
     <PackageReference Include="FSharp.Core" Version="7.0.401" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
-    <PackageReference Include="StreamJsonRpc" Version="2.16.36" />
+    <PackageReference Include="StreamJsonRpc" Version="2.17.8" />
   </ItemGroup>
 
   <ItemGroup>

Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

@@ -15,11 +15,11 @@ public class JsonRPCPluginSettings
 
         public required string SettingPath { get; init; }
         public Dictionary<string, FrameworkElement> SettingControls { get; } = new();
-        
+
         public IReadOnlyDictionary<string, object> Inner => Settings;
         protected ConcurrentDictionary<string, object> Settings { get; set; }
         public required IPublicAPI API { get; init; }
-        
+
         private JsonStorage<ConcurrentDictionary<string, object>> _storage;
 
         // maybe move to resource?
@@ -37,26 +37,26 @@ public async Task InitializeAsync()
             _storage = new JsonStorage<ConcurrentDictionary<string, object>>(SettingPath);
             Settings = await _storage.LoadAsync();
 
-            if (Settings != null)
+            if (Settings != null || Configuration == null)
             {
                 return;
             }
 
-            foreach (var (type, attributes) in Configuration.Body) 
+            foreach (var (type, attributes) in Configuration.Body)
             {
                 if (attributes.Name == null)
                 {
                     continue;
                 }
-                
+
                 if (!Settings.ContainsKey(attributes.Name))
                 {
                     Settings[attributes.Name] = attributes.DefaultValue;
                 }
             }
         }
 
-       
+
         public void UpdateSettings(IReadOnlyDictionary<string, object> settings)
         {
             if (settings == null || settings.Count == 0)
@@ -80,34 +80,35 @@ public void UpdateSettings(IReadOnlyDictionary<string, object> settings)
                             comboBox.Dispatcher.Invoke(() => comboBox.SelectedItem = value);
                             break;
                         case CheckBox checkBox:
-                            checkBox.Dispatcher.Invoke(() => checkBox.IsChecked = value is bool isChecked ? isChecked : bool.Parse(value as string ?? string.Empty));
+                            checkBox.Dispatcher.Invoke(() =>
+                                checkBox.IsChecked = value is bool isChecked
+                                    ? isChecked
+                                    : bool.Parse(value as string ?? string.Empty));
                             break;
                     }
                 }
             }
+
             Save();
         }
-        
+
         public async Task SaveAsync()
         {
             await _storage.SaveAsync();
         }
-        
+
         public void Save()
         {
             _storage.Save();
         }
-        
+
         public Control CreateSettingPanel()
         {
-            if (Settings == null)
+            if (Settings == null || Settings.Count == 0)
                 return new();
 
             var settingWindow = new UserControl();
-            var mainPanel = new Grid
-            {
-                Margin = settingPanelMargin, VerticalAlignment = VerticalAlignment.Center
-            };
+            var mainPanel = new Grid { Margin = settingPanelMargin, VerticalAlignment = VerticalAlignment.Center };
 
             ColumnDefinition gridCol1 = new ColumnDefinition();
             ColumnDefinition gridCol2 = new ColumnDefinition();
@@ -242,10 +243,7 @@ public Control CreateSettingPanel()
                             Margin = new Thickness(10, 0, 0, 0), Content = "Browse"
                         };
 
-                        var dockPanel = new DockPanel()
-                        {
-                            Margin = settingControlMargin
-                        };
+                        var dockPanel = new DockPanel() { Margin = settingControlMargin };
 
                         DockPanel.SetDock(Btn, Dock.Right);
                         dockPanel.Children.Add(Btn);
@@ -352,7 +350,10 @@ public Control CreateSettingPanel()
                     case "checkbox":
                         var checkBox = new CheckBox
                         {
-                            IsChecked = Settings[attribute.Name] is bool isChecked ? isChecked : bool.Parse(attribute.DefaultValue),
+                            IsChecked =
+                                Settings[attribute.Name] is bool isChecked
+                                    ? isChecked
+                                    : bool.Parse(attribute.DefaultValue),
                             Margin = settingCheckboxMargin,
                             HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
                             ToolTip = attribute.Description
@@ -375,14 +376,12 @@ public Control CreateSettingPanel()
 
                         break;
                     case "hyperlink":
-                        var hyperlink = new Hyperlink
-                        {
-                            ToolTip = attribute.Description, NavigateUri = attribute.url
-                        };
+                        var hyperlink = new Hyperlink { ToolTip = attribute.Description, NavigateUri = attribute.url };
 
                         var linkbtn = new System.Windows.Controls.Button
                         {
-                            HorizontalAlignment = System.Windows.HorizontalAlignment.Right, Margin = settingControlMargin
+                            HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
+                            Margin = settingControlMargin
                         };
 
                         linkbtn.Content = attribute.urlLabel;
@@ -408,12 +407,9 @@ public Control CreateSettingPanel()
                 mainPanel.Children.Add(panel);
                 mainPanel.Children.Add(contentControl);
                 rowCount++;
-
             }
 
             return settingWindow;
         }
-
-
     }
 }

Flow.Launcher.Core/Plugin/JsonRPCPluginV2.cs

@@ -91,7 +91,7 @@ async Task ReadErrorAsync()
 
         private void SetupJsonRPC()
         {
-            var formatter = new JsonMessageFormatter();
+            var formatter = new SystemTextJsonFormatter { JsonSerializerOptions = RequestSerializeOption };
             var handler = new NewLineDelimitedMessageHandler(ClientPipe,
                 formatter);
 
@@ -100,10 +100,8 @@ private void SetupJsonRPC()
             RPC.AddLocalRpcMethod("UpdateResults", new Action<string, JsonRPCQueryResponseModel>((rawQuery, response) =>
             {
                 var results = ParseResults(response);
-                ResultsUpdated?.Invoke(this, new ResultUpdatedEventArgs { Query = new Query()
-                {
-                    RawQuery = rawQuery
-                }, Results = results });
+                ResultsUpdated?.Invoke(this,
+                    new ResultUpdatedEventArgs { Query = new Query() { RawQuery = rawQuery }, Results = results });
             }));
             RPC.SynchronizationContext = null;
             RPC.StartListening();