Merge branch 'dev' into volume

Author: flooxo

.github/workflows/default_plugins.yml

@@ -18,7 +18,7 @@ jobs:
           dotnet-version: 7.0.x
 
       - name: Determine New Plugin Updates
-        uses: dorny/paths-filter@v2
+        uses: dorny/paths-filter@v3
         id: changes
         with:
           filters: |

.github/workflows/stale.yml

@@ -6,6 +6,11 @@ on:
   schedule:
     - cron: '30 1 * * *'
 
+env:
+  days-before-stale: 60
+  days-before-close: 7
+  exempt-issue-labels: 'keep-fresh'
+
 jobs:
   stale:
     runs-on: ubuntu-latest
@@ -15,12 +20,12 @@ jobs:
     steps:
       - uses: actions/stale@v9
         with:
-          stale-issue-message: 'This issue is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
-          days-before-stale: 45
-          days-before-close: 7
+          stale-issue-message: 'This issue is stale because it has been open ${{ env.days-before-stale }} days with no activity. Remove stale label or comment or this will be closed in ${{ env.days-before-stale }} days.\n\nAlternatively this issue can be kept open by adding one of the following labels:\n${{ env.exempt-issue-labels }}'
+          days-before-stale: ${{ env.days-before-stale }}
+          days-before-close: ${{ env.days-before-close }}
           days-before-pr-close: -1
           exempt-all-milestones: true
           close-issue-message: 'This issue was closed because it has been stale for 7 days with no activity. If you feel this issue still needs attention please feel free to reopen.'
           stale-pr-label: 'no-pr-activity'
-          exempt-issue-labels: 'keep-fresh'
+          exempt-issue-labels: ${{ env.exempt-issue-labels }}
           exempt-pr-labels: 'keep-fresh,awaiting-approval,work-in-progress'

Flow.Launcher.Core/ExternalPlugins/CommunityPluginSource.cs

@@ -5,6 +5,8 @@
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Json;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -16,6 +18,11 @@ public record CommunityPluginSource(string ManifestFileUrl)
 
         private List<UserPlugin> plugins = new();
 
+        private static JsonSerializerOptions PluginStoreItemSerializationOption = new JsonSerializerOptions()
+        {
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault
+        };
+
         /// <summary>
         /// Fetch and deserialize the contents of a plugins.json file found at <see cref="ManifestFileUrl"/>.
         /// We use conditional http requests to keep repeat requests fast.
@@ -32,12 +39,15 @@ public async Task<List<UserPlugin>> FetchAsync(CancellationToken token)
 
             request.Headers.Add("If-None-Match", latestEtag);
 
-            using var response = await Http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false);
+            using var response = await Http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token)
+                .ConfigureAwait(false);
 
             if (response.StatusCode == HttpStatusCode.OK)
             {
-                this.plugins = await response.Content.ReadFromJsonAsync<List<UserPlugin>>(cancellationToken: token).ConfigureAwait(false);
-                this.latestEtag = response.Headers.ETag.Tag;
+                this.plugins = await response.Content
+                    .ReadFromJsonAsync<List<UserPlugin>>(PluginStoreItemSerializationOption, cancellationToken: token)
+                    .ConfigureAwait(false);
+                this.latestEtag = response.Headers.ETag?.Tag;
 
                 Log.Info(nameof(CommunityPluginSource), $"Loaded {this.plugins.Count} plugins from {ManifestFileUrl}");
                 return this.plugins;
@@ -49,7 +59,8 @@ public async Task<List<UserPlugin>> FetchAsync(CancellationToken token)
             }
             else
             {
-                Log.Warn(nameof(CommunityPluginSource), $"Failed to load resource {ManifestFileUrl} with response {response.StatusCode}");
+                Log.Warn(nameof(CommunityPluginSource),
+                    $"Failed to load resource {ManifestFileUrl} with response {response.StatusCode}");
                 throw new Exception($"Failed to load resource {ManifestFileUrl} with response {response.StatusCode}");
             }
         }

Flow.Launcher.Core/ExternalPlugins/UserPlugin.cs

@@ -14,8 +14,8 @@ public record UserPlugin
         public string UrlDownload { get; set; }
         public string UrlSourceCode { get; set; }
         public string IcoPath { get; set; }
-        public DateTime LatestReleaseDate { get; set; }
-        public DateTime DateAdded { get; set; }
+        public DateTime? LatestReleaseDate { get; set; }
+        public DateTime? DateAdded { get; set; }
 
     }
 }

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

@@ -55,9 +55,10 @@
   <ItemGroup>
     <PackageReference Include="Droplex" Version="1.7.0" />
     <PackageReference Include="FSharp.Core" Version="7.0.401" />
-    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
+    <PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.2.1" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
-    <PackageReference Include="StreamJsonRpc" Version="2.17.8" />
+    <PackageReference Include="StreamJsonRpc" Version="2.17.11" />
   </ItemGroup>
 
   <ItemGroup>

Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

@@ -37,7 +37,7 @@ public async Task InitializeAsync()
             _storage = new JsonStorage<ConcurrentDictionary<string, object>>(SettingPath);
             Settings = await _storage.LoadAsync();
 
-            if (Settings != null || Configuration == null)
+            if (Configuration == null)
             {
                 return;
             }

Flow.Launcher.Core/Plugin/NodePlugin.cs

@@ -28,20 +28,21 @@ public NodePlugin(string filename)
 
         protected override Task<Stream> RequestAsync(JsonRPCRequestModel request, CancellationToken token = default)
         {
-            _startInfo.ArgumentList[1] = JsonSerializer.Serialize(request);
+            _startInfo.ArgumentList[1] = JsonSerializer.Serialize(request, RequestSerializeOption);
             return ExecuteAsync(_startInfo, token);
         }
 
         protected override string Request(JsonRPCRequestModel rpcRequest, CancellationToken token = default)
         {
             // since this is not static, request strings will build up in ArgumentList if index is not specified
-            _startInfo.ArgumentList[1] = JsonSerializer.Serialize(rpcRequest);
+            _startInfo.ArgumentList[1] = JsonSerializer.Serialize(rpcRequest, RequestSerializeOption);
             return Execute(_startInfo);
         }
 
         public override async Task InitAsync(PluginInitContext context)
         {
             _startInfo.ArgumentList.Add(context.CurrentPluginMetadata.ExecuteFilePath);
+            _startInfo.ArgumentList.Add(string.Empty);
             _startInfo.WorkingDirectory = context.CurrentPluginMetadata.PluginDirectory;
             await base.InitAsync(context);
         }

Flow.Launcher.Core/Plugin/ProcessStreamPluginV2.cs

@@ -5,12 +5,24 @@
 using System.Threading.Tasks;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Plugin;
+using Meziantou.Framework.Win32;
 using Nerdbank.Streams;
 
 namespace Flow.Launcher.Core.Plugin
 {
     internal abstract class ProcessStreamPluginV2 : JsonRPCPluginV2
     {
+        private static JobObject _jobObject = new JobObject();
+
+        static ProcessStreamPluginV2()
+        {
+            _jobObject.SetLimits(new JobObjectLimits()
+            {
+                Flags = JobObjectLimitFlags.KillOnJobClose | JobObjectLimitFlags.DieOnUnhandledException
+            });
+            
+            _jobObject.AssignProcess(Process.GetCurrentProcess());
+        }
 
         public override string SupportedLanguage { get; set; }
         protected sealed override IDuplexPipe ClientPipe { get; set; }
@@ -30,22 +42,22 @@ public override async Task InitAsync(PluginInitContext context)
 
             ClientProcess = Process.Start(StartInfo);
             ArgumentNullException.ThrowIfNull(ClientProcess);
-
+            
             SetupPipe(ClientProcess);
 
             ErrorStream = ClientProcess.StandardError;
 
             await base.InitAsync(context);
         }
-        
+
         private void SetupPipe(Process process)
         {
             var (reader, writer) = (PipeReader.Create(process.StandardOutput.BaseStream),
                 PipeWriter.Create(process.StandardInput.BaseStream));
             ClientPipe = new DuplexPipe(reader, writer);
         }
-        
-        
+
+
         public override async Task ReloadDataAsync()
         {
             var oldProcess = ClientProcess;
@@ -57,8 +69,8 @@ public override async Task ReloadDataAsync()
             await oldProcess.WaitForExitAsync();
             oldProcess.Dispose();
         }
-        
-        
+
+
         public override async ValueTask DisposeAsync()
         {
             ClientProcess.Kill(true);

Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj

@@ -14,10 +14,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>4.1.1</Version>
-    <PackageVersion>4.1.1</PackageVersion>
-    <AssemblyVersion>4.1.1</AssemblyVersion>
-    <FileVersion>4.1.1</FileVersion>
+    <Version>4.2.0</Version>
+    <PackageVersion>4.2.0</PackageVersion>
+    <AssemblyVersion>4.2.0</AssemblyVersion>
+    <FileVersion>4.2.0</FileVersion>
     <PackageId>Flow.Launcher.Plugin</PackageId>
     <Authors>Flow-Launcher</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

Flow.Launcher/Converters/BoolToIMEConversionModeConverter.cs

@@ -9,18 +9,11 @@ internal class BoolToIMEConversionModeConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value is bool v)
+            return value switch
             {
-                if (v)
-                {
-                    return ImeConversionModeValues.Alphanumeric;
-                }
-                else
-                {
-                    return ImeConversionModeValues.DoNotCare;
-                }
-            }
-            return ImeConversionModeValues.DoNotCare;
+                true => ImeConversionModeValues.Alphanumeric,
+                _ => ImeConversionModeValues.DoNotCare
+            };
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -33,18 +26,11 @@ internal class BoolToIMEStateConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value is bool v)
+            return value switch
             {
-                if (v)
-                {
-                    return InputMethodState.Off;
-                }
-                else
-                {
-                    return InputMethodState.DoNotCare;
-                }
-            }
-            return InputMethodState.DoNotCare;
+                true => InputMethodState.Off,
+                _ => InputMethodState.DoNotCare
+            };
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)