Merge branch 'dev' into search-open-explorer-window-tweaks

Author: stefnotch

.github/workflows/stale.yml

@@ -0,0 +1,26 @@
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v4
+        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
+          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-pr-labels: 'keep-fresh,awaiting-approval,work-in-progress'

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

@@ -2,6 +2,8 @@
 using Flow.Launcher.Infrastructure.Logger;
 using System;
 using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -10,43 +12,43 @@ namespace Flow.Launcher.Core.ExternalPlugins
 {
     public static class PluginsManifest
     {
-        static PluginsManifest()
-        {
-            UpdateTask = UpdateManifestAsync();
-        }
-
-        public static List<UserPlugin> UserPlugins { get; private set; } = new List<UserPlugin>();
-
-        public static Task UpdateTask { get; private set; }
+        private const string manifestFileUrl = "https://cdn.jsdelivr.net/gh/Flow-Launcher/Flow.Launcher.PluginsManifest@plugin_api_v2/plugins.json";
 
         private static readonly SemaphoreSlim manifestUpdateLock = new(1);
 
-        public static Task UpdateManifestAsync()
-        {
-            if (manifestUpdateLock.CurrentCount == 0)
-            {
-                return UpdateTask;
-            }
+        private static string latestEtag = "";
 
-            return UpdateTask = DownloadManifestAsync();
-        }
+        public static List<UserPlugin> UserPlugins { get; private set; } = new List<UserPlugin>();
 
-        private async static Task DownloadManifestAsync()
+        public static async Task UpdateManifestAsync(CancellationToken token = default)
         {
             try
             {
-                await manifestUpdateLock.WaitAsync().ConfigureAwait(false);
+                await manifestUpdateLock.WaitAsync(token).ConfigureAwait(false);
+
+                var request = new HttpRequestMessage(HttpMethod.Get, manifestFileUrl);
+                request.Headers.Add("If-None-Match", latestEtag);
+
+                var response = await Http.SendAsync(request, token).ConfigureAwait(false);
 
-                await using var jsonStream = await Http.GetStreamAsync("https://raw.githubusercontent.com/Flow-Launcher/Flow.Launcher.PluginsManifest/plugin_api_v2/plugins.json")
-                                 .ConfigureAwait(false);
+                if (response.StatusCode == HttpStatusCode.OK)
+                {
+                    Log.Info($"|PluginsManifest.{nameof(UpdateManifestAsync)}|Fetched plugins from manifest repo");
 
-                UserPlugins = await JsonSerializer.DeserializeAsync<List<UserPlugin>>(jsonStream).ConfigureAwait(false);
+                    var json = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false);
+
+                    UserPlugins = await JsonSerializer.DeserializeAsync<List<UserPlugin>>(json, cancellationToken: token).ConfigureAwait(false);
+
+                    latestEtag = response.Headers.ETag.Tag;
+                }
+                else if (response.StatusCode != HttpStatusCode.NotModified)
+                {
+                    Log.Warn($"|PluginsManifest.{nameof(UpdateManifestAsync)}|Http response for manifest file was {response.StatusCode}");
+                }
             }
             catch (Exception e)
             {
-                Log.Exception("|PluginManagement.GetManifest|Encountered error trying to download plugins manifest", e);
-
-                UserPlugins = new List<UserPlugin>();
+                Log.Exception($"|PluginsManifest.{nameof(UpdateManifestAsync)}|Http request failed", e);
             }
             finally
             {

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>
     <OutputType>Library</OutputType>
@@ -53,7 +53,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Droplex" Version="1.4.0" />
+    <PackageReference Include="Droplex" Version="1.4.1" />
     <PackageReference Include="FSharp.Core" Version="5.0.2" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.3" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" />

Flow.Launcher.Core/Plugin/ExecutablePlugin.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -22,18 +21,23 @@ public ExecutablePlugin(string filename)
                 RedirectStandardOutput = true,
                 RedirectStandardError = true
             };
+            
+            // required initialisation for below request calls 
+            _startInfo.ArgumentList.Add(string.Empty);
         }
 
         protected override Task<Stream> RequestAsync(JsonRPCRequestModel request, CancellationToken token = default)
         {
-            _startInfo.Arguments = $"\"{request}\"";
+            // since this is not static, request strings will build up in ArgumentList if index is not specified
+            _startInfo.ArgumentList[0] = request.ToString();
             return ExecuteAsync(_startInfo, token);
         }
 
         protected override string Request(JsonRPCRequestModel rpcRequest, CancellationToken token = default)
         {
-            _startInfo.Arguments = $"\"{rpcRequest}\"";
+            // since this is not static, request strings will build up in ArgumentList if index is not specified
+            _startInfo.ArgumentList[0] = rpcRequest.ToString();
             return Execute(_startInfo);
         }
     }
-}
+}

Flow.Launcher.Core/Plugin/JsonPRCModel.cs

@@ -93,4 +93,4 @@ public class JsonRPCResult : Result
 
         public Dictionary<string, object> SettingsChange { get; set; }
     }
-}
+}

Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

@@ -115,7 +115,7 @@ private List<Result> ParseResults(JsonRPCQueryResponseModel queryResponseModel)
 
             foreach (var result in queryResponseModel.Result)
             {
-                result.Action = c =>
+                result.AsyncAction = async c =>
                 {
                     UpdateSettings(result.SettingsChange);
 
@@ -133,15 +133,15 @@ private List<Result> ParseResults(JsonRPCQueryResponseModel queryResponseModel)
                     }
                     else
                     {
-                        var actionResponse = Request(result.JsonRPCAction);
+                        var actionResponse = await RequestAsync(result.JsonRPCAction);
 
-                        if (string.IsNullOrEmpty(actionResponse))
+                        if (actionResponse.Length == 0)
                         {
                             return !result.JsonRPCAction.DontHideAfterAction;
                         }
 
-                        var jsonRpcRequestModel =
-                            JsonSerializer.Deserialize<JsonRPCRequestModel>(actionResponse, options);
+                        var jsonRpcRequestModel = await
+                            JsonSerializer.DeserializeAsync<JsonRPCRequestModel>(actionResponse, options);
 
                         if (jsonRpcRequestModel?.Method?.StartsWith("Flow.Launcher.") ?? false)
                         {
@@ -166,19 +166,20 @@ private List<Result> ParseResults(JsonRPCQueryResponseModel queryResponseModel)
         private void ExecuteFlowLauncherAPI(string method, object[] parameters)
         {
             var parametersTypeArray = parameters.Select(param => param.GetType()).ToArray();
-            MethodInfo methodInfo = PluginManager.API.GetType().GetMethod(method, parametersTypeArray);
-            if (methodInfo != null)
+            var methodInfo = typeof(IPublicAPI).GetMethod(method, parametersTypeArray);
+            if (methodInfo == null)
+            {
+                return;
+            }
+            try
+            {
+                methodInfo.Invoke(PluginManager.API, parameters);
+            }
+            catch (Exception)
             {
-                try
-                {
-                    methodInfo.Invoke(PluginManager.API, parameters);
-                }
-                catch (Exception)
-                {
 #if (DEBUG)
-                    throw;
+                throw;
 #endif
-                }
             }
         }
 
@@ -241,7 +242,7 @@ protected string Execute(ProcessStartInfo startInfo)
         protected async Task<Stream> ExecuteAsync(ProcessStartInfo startInfo, CancellationToken token = default)
         {
             Process process = null;
-            bool disposed = false;
+            using var exitTokenSource = new CancellationTokenSource();
             try
             {
                 process = Process.Start(startInfo);
@@ -251,6 +252,7 @@ protected async Task<Stream> ExecuteAsync(ProcessStartInfo startInfo, Cancellati
                     return Stream.Null;
                 }
 
+
                 await using var source = process.StandardOutput.BaseStream;
 
                 var buffer = BufferManager.GetStream();
@@ -259,7 +261,7 @@ protected async Task<Stream> ExecuteAsync(ProcessStartInfo startInfo, Cancellati
                 {
                     // ReSharper disable once AccessToModifiedClosure
                     // Manually Check whether disposed
-                    if (!disposed && !process.HasExited)
+                    if (!exitTokenSource.IsCancellationRequested && !process.HasExited)
                         process.Kill();
                 });
 
@@ -302,8 +304,8 @@ protected async Task<Stream> ExecuteAsync(ProcessStartInfo startInfo, Cancellati
             }
             finally
             {
+                exitTokenSource.Cancel();
                 process?.Dispose();
-                disposed = true;
             }
         }
 
@@ -354,7 +356,9 @@ public virtual async Task InitAsync(PluginInitContext context)
             this.context = context;
             await InitSettingAsync();
         }
-        private static readonly Thickness settingControlMargin = new(10);
+        private static readonly Thickness settingControlMargin = new(10, 4, 10, 4);
+        private static readonly Thickness settingPanelMargin = new(15, 20, 15, 20);
+        private static readonly Thickness settingTextBlockMargin = new(10, 4, 10, 4);
         private JsonRpcConfigurationModel _settingsTemplate;
         public Control CreateSettingPanel()
         {
@@ -363,22 +367,23 @@ public Control CreateSettingPanel()
             var settingWindow = new UserControl();
             var mainPanel = new StackPanel
             {
-                Margin = settingControlMargin,
-                Orientation = Orientation.Vertical
+                Margin = settingPanelMargin, Orientation = Orientation.Vertical
             };
             settingWindow.Content = mainPanel;
 
             foreach (var (type, attribute) in _settingsTemplate.Body)
             {
                 var panel = new StackPanel
                 {
-                    Orientation = Orientation.Horizontal,
-                    Margin = settingControlMargin
+                    Orientation = Orientation.Horizontal, Margin = settingControlMargin
                 };
-                var name = new Label()
+                var name = new TextBlock()
                 {
-                    Content = attribute.Label,
-                    Margin = settingControlMargin
+                    Text = attribute.Label,
+                    Width = 120,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    Margin = settingControlMargin,
+                    TextWrapping = TextWrapping.WrapWithOverflow
                 };
 
                 FrameworkElement contentControl;
@@ -390,8 +395,8 @@ public Control CreateSettingPanel()
                             contentControl = new TextBlock
                             {
                                 Text = attribute.Description.Replace("\\r\\n", "\r\n"),
-                                Margin = settingControlMargin,
-                                MaxWidth = 400,
+                                Margin = settingTextBlockMargin,
+                                MaxWidth = 500,
                                 TextWrapping = TextWrapping.WrapWithOverflow
                             };
                             break;

Flow.Launcher.Core/Plugin/PluginAssemblyLoader.cs

@@ -15,20 +15,6 @@ internal class PluginAssemblyLoader : AssemblyLoadContext
 
         private readonly AssemblyName assemblyName;
 
-        private static readonly ConcurrentDictionary<string, byte> loadedAssembly;
-
-        static PluginAssemblyLoader()
-        {
-            var currentAssemblies = AppDomain.CurrentDomain.GetAssemblies();
-            loadedAssembly = new ConcurrentDictionary<string, byte>(
-                currentAssemblies.Select(x => new KeyValuePair<string, byte>(x.FullName, default)));
-
-            AppDomain.CurrentDomain.AssemblyLoad += (sender, args) =>
-            {
-                loadedAssembly[args.LoadedAssembly.FullName] = default;
-            };
-        }
-
         internal PluginAssemblyLoader(string assemblyFilePath)
         {
             dependencyResolver = new AssemblyDependencyResolver(assemblyFilePath);
@@ -47,21 +33,15 @@ protected override Assembly Load(AssemblyName assemblyName)
             // When resolving dependencies, ignore assembly depenedencies that already exits with Flow.Launcher
             // Otherwise duplicate assembly will be loaded and some weird behavior will occur, such as WinRT.Runtime.dll
             // will fail due to loading multiple versions in process, each with their own static instance of registration state
-            if (assemblyPath == null || ExistsInReferencedPackage(assemblyName))
-                return null;
+            var existAssembly = Default.Assemblies.FirstOrDefault(x => x.FullName == assemblyName.FullName);
 
-            return LoadFromAssemblyPath(assemblyPath);
+            return existAssembly ?? (assemblyPath == null ? null : LoadFromAssemblyPath(assemblyPath));
         }
 
         internal Type FromAssemblyGetTypeOfInterface(Assembly assembly, Type type)
         {
             var allTypes = assembly.ExportedTypes;
             return allTypes.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Any(t => t == type));
         }
-
-        internal bool ExistsInReferencedPackage(AssemblyName assemblyName)
-        {
-            return loadedAssembly.ContainsKey(assemblyName.FullName);
-        }
     }
 }

Flow.Launcher.Core/Plugin/QueryBuilder.cs

@@ -16,21 +16,21 @@ public static Query Build(string text, Dictionary<string, PluginPair> nonGlobalP
                 return null;
             }
 
-            var rawQuery = string.Join(Query.TermSeparator, terms);
+            var rawQuery = text;
             string actionKeyword, search;
             string possibleActionKeyword = terms[0];
             string[] searchTerms;
 
             if (nonGlobalPlugins.TryGetValue(possibleActionKeyword, out var pluginPair) && !pluginPair.Metadata.Disabled)
             { // use non global plugin for query
                 actionKeyword = possibleActionKeyword;
-                search = terms.Length > 1 ? rawQuery[(actionKeyword.Length + 1)..] : string.Empty;
+                search = terms.Length > 1 ? rawQuery[(actionKeyword.Length + 1)..].TrimStart() : string.Empty;
                 searchTerms = terms[1..];
             }
             else
             { // non action keyword
                 actionKeyword = string.Empty;
-                search = rawQuery;
+                search = rawQuery.TrimStart();
                 searchTerms = terms;
             }