Asynchronous Loading & Initialization Plugin Model to Improve Window Startup Speed

Flow.Launcher.Core/Plugin/IResultUpdateRegister.cs

@@ -0,0 +1,12 @@
+using Flow.Launcher.Plugin;
+
+namespace Flow.Launcher.Core.Plugin;
+
+public interface IResultUpdateRegister
+{
+    /// <summary>
+    /// Register a plugin to receive results updated event.
+    /// </summary>
+    /// <param name="pair"></param>
+    void RegisterResultsUpdatedEvent(PluginPair pair);
+}

Flow.Launcher.Core/Resource/Internationalization.cs

@@ -367,6 +367,22 @@ public static void UpdatePluginMetadataTranslations()
             }
         }
 
+        public static void UpdatePluginMetadataTranslation(PluginPair p)
+        {
+            // Update plugin metadata name & description
+            if (p.Plugin is not IPluginI18n pluginI18N) return;
+            try
+            {
+                p.Metadata.Name = pluginI18N.GetTranslatedPluginTitle();
+                p.Metadata.Description = pluginI18N.GetTranslatedPluginDescription();
+                pluginI18N.OnCultureInfoChanged(CultureInfo.CurrentCulture);
+            }
+            catch (Exception e)
+            {
+                API.LogException(ClassName, $"Failed for <{p.Metadata.Name}>", e);
+            }
+        }
+
         #endregion
     }
 }

Flow.Launcher.Infrastructure/DialogJump/DialogJump.cs

@@ -13,6 +13,7 @@
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.UI.Accessibility;
+using System.Collections.Concurrent;
 
 namespace Flow.Launcher.Infrastructure.DialogJump
 {
@@ -64,12 +65,12 @@
 
         private static HWND _mainWindowHandle = HWND.Null;
 
-        private static readonly Dictionary<DialogJumpExplorerPair, IDialogJumpExplorerWindow> _dialogJumpExplorers = new();
+        private static readonly ConcurrentDictionary<DialogJumpExplorerPair, IDialogJumpExplorerWindow> _dialogJumpExplorers = new();
 
         private static DialogJumpExplorerPair _lastExplorer = null;
         private static readonly object _lastExplorerLock = new();
 
-        private static readonly Dictionary<DialogJumpDialogPair, IDialogJumpDialogWindow> _dialogJumpDialogs = new();
+        private static readonly ConcurrentDictionary<DialogJumpDialogPair, IDialogJumpDialogWindow> _dialogJumpDialogs = new();
 
         private static IDialogJumpDialogWindow _dialogWindow = null;
         private static readonly object _dialogWindowLock = new();
@@ -105,22 +106,13 @@
 
         #region Initialize & Setup
 
-        public static void InitializeDialogJump(IList<DialogJumpExplorerPair> dialogJumpExplorers,
-            IList<DialogJumpDialogPair> dialogJumpDialogs)
+        public static void InitializeDialogJump()
         {
             if (_initialized) return;
 
-            // Initialize Dialog Jump explorers & dialogs
-            _dialogJumpExplorers.Add(WindowsDialogJumpExplorer, null);
-            foreach (var explorer in dialogJumpExplorers)
-            {
-                _dialogJumpExplorers.Add(explorer, null);
-            }
-            _dialogJumpDialogs.Add(WindowsDialogJumpDialog, null);
-            foreach (var dialog in dialogJumpDialogs)
-            {
-                _dialogJumpDialogs.Add(dialog, null);
-            }
+            // Initialize preinstalled Dialog Jump explorers & dialogs
+            _dialogJumpExplorers.TryAdd(WindowsDialogJumpExplorer, null);
+            _dialogJumpDialogs.TryAdd(WindowsDialogJumpDialog, null);
 
             // Initialize main window handle
             _mainWindowHandle = Win32Helper.GetMainWindowHandle();
@@ -135,6 +127,29 @@
             _initialized = true;
         }
 
+        public static void InitializeDialogJumpPlugin(PluginPair pair)
+        {
+            // Add Dialog Jump explorers & dialogs
+            if (pair.Plugin is IDialogJumpExplorer explorer)
+            {
+                var dialogJumpExplorer = new DialogJumpExplorerPair
+                {
+                    Plugin = explorer,
+                    Metadata = pair.Metadata
+                };
+                _dialogJumpExplorers.TryAdd(dialogJumpExplorer, null);
+            }
+            else if (pair.Plugin is IDialogJumpDialog dialog)
+            {
+                var dialogJumpDialog = new DialogJumpDialogPair
+                {
+                    Plugin = dialog,
+                    Metadata = pair.Metadata
+                };
+                _dialogJumpDialogs.TryAdd(dialogJumpDialog, null);
+            }
+        }
+
         public static void SetupDialogJump(bool enabled)
         {
             if (enabled == _enabled) return;
@@ -162,22 +177,22 @@
                 }
                 if (!_locationChangeHook.IsNull)
                 {
                     PInvoke.UnhookWinEvent(_locationChangeHook);
                     _locationChangeHook = HWINEVENTHOOK.Null;
                 }
                 if (!_destroyChangeHook.IsNull)
                 {
                     PInvoke.UnhookWinEvent(_destroyChangeHook);
                     _destroyChangeHook = HWINEVENTHOOK.Null;
                 }
                 if (!_hideChangeHook.IsNull)
                 {
                     PInvoke.UnhookWinEvent(_hideChangeHook);
                     _hideChangeHook = HWINEVENTHOOK.Null;
                 }
                 if (!_dialogEndChangeHook.IsNull)
                 {
                     PInvoke.UnhookWinEvent(_dialogEndChangeHook);
                     _dialogEndChangeHook = HWINEVENTHOOK.Null;
                 }
 
@@ -318,7 +333,7 @@
                         if (API.PluginModified(explorer.Metadata.ID) || // Plugin is modified
                             explorer.Metadata.Disabled) continue; // Plugin is disabled
 
                         var explorerWindow = explorer.Plugin.CheckExplorerWindow(hWnd);
                         if (explorerWindow != null)
                         {
                             _dialogJumpExplorers[explorer] = explorerWindow;

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -171,7 +171,7 @@ public interface IPublicAPI
         string GetTranslation(string key);
 
         /// <summary>
-        /// Get all loaded plugins
+        /// Get all initialized plugins
         /// </summary>
         /// <returns></returns>
         List<PluginPair> GetAllPlugins();

Flow.Launcher/App.xaml.cs

@@ -181,12 +181,14 @@
                 // So set to OnExplicitShutdown to prevent the application from shutting down before main window is created
                 Current.ShutdownMode = ShutdownMode.OnExplicitShutdown;
 
+                // Setup log level before any logging is done
                 Log.SetLogLevel(_settings.LogLevel);
 
                 // Update dynamic resources base on settings
                 Current.Resources["SettingWindowFont"] = new FontFamily(_settings.SettingWindowFont);
                 Current.Resources["ContentControlThemeFontFamily"] = new FontFamily(_settings.SettingWindowFont);
 
+                // Initialize notification system before any notification api is called
                 Notification.Install();
 
                 // Enable Win32 dark mode if the system is in dark mode before creating all windows
@@ -195,6 +197,7 @@
                 // Initialize language before portable clean up since it needs translations
                 await Ioc.Default.GetRequiredService<Internationalization>().InitializeLanguageAsync();
 
+                // Clean up after portability update
                 Ioc.Default.GetRequiredService<Portable>().PreStartCleanUpAfterPortabilityUpdate();
 
                 API.LogInfo(ClassName, "Begin Flow Launcher startup ----------------------------------------------------");
@@ -206,50 +209,57 @@
 
                 var imageLoadertask = ImageLoader.InitializeAsync();
 
-                AbstractPluginEnvironment.PreStartPluginExecutablePathUpdate(_settings);
-
-                PluginManager.LoadPlugins(_settings.PluginSettings);
-
-                // Register ResultsUpdated event after all plugins are loaded
-                Ioc.Default.GetRequiredService<MainViewModel>().RegisterResultsUpdatedEvent();
-
                 Http.Proxy = _settings.Proxy;
 
                 // Initialize plugin manifest before initializing plugins so that they can use the manifest instantly
                 await API.UpdatePluginManifestAsync();
 
-                await PluginManager.InitializePluginsAsync();
-
-                // Update plugin titles after plugins are initialized with their api instances
-                Internationalization.UpdatePluginMetadataTranslations();
-
                 await imageLoadertask;
 
                 _mainWindow = new MainWindow();
 
                 Current.MainWindow = _mainWindow;
                 Current.MainWindow.Title = Constant.FlowLauncher;
 
+                // Initialize quick jump before hotkey mapper since hotkey mapper will register quick jump hotkey
+                // Initialize quick jump after main window is created so that it can access main window handle
+                DialogJump.InitializeDialogJump();
+                DialogJump.SetupDialogJump(_settings.EnableDialogJump);
+
                 // Initialize hotkey mapper instantly after main window is created because
                 // it will steal focus from main window which causes window hide
                 HotKeyMapper.Initialize();
 
                 // Initialize theme for main window
                 Ioc.Default.GetRequiredService<Theme>().ChangeTheme();
 
-                DialogJump.InitializeDialogJump(PluginManager.GetDialogJumpExplorers(), PluginManager.GetDialogJumpDialogs());
-                DialogJump.SetupDialogJump(_settings.EnableDialogJump);
-
                 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
                 RegisterExitEvents();
 
                 AutoStartup();
                 AutoUpdates();
-                AutoPluginUpdates();
 
                 API.SaveAppAllSettings();
-                API.LogInfo(ClassName, "End Flow Launcher startup ----------------------------------------------------");
+                API.LogInfo(ClassName, "End Flow Launcher startup ------------------------------------------------------");
+
+                _ = API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
+                {
+                    API.LogInfo(ClassName, "Begin plugin initialization ----------------------------------------------------");
+
+                    AbstractPluginEnvironment.PreStartPluginExecutablePathUpdate(_settings);
+
+                    var allPlugins = PluginManager.LoadPlugins(_settings.PluginSettings);
+
+                    await PluginManager.InitializePluginsAsync(allPlugins, _mainVM);
+
+                    AutoPluginUpdates();
+
+                    // Save all settings since we possibly update the plugin environment paths
+                    API.SaveAppAllSettings();
+
+                    API.LogInfo(ClassName, "End plugin initialization ------------------------------------------------------");
+                });
             });
         }
 

Flow.Launcher/MainWindow.xaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Linq;
 using System.Media;
@@ -66,7 +66,7 @@
         private MediaPlayer animationSoundWMP;
         private SoundPlayer animationSoundWPF;
 
         // Window WndProc
         private HwndSource _hwndSource;
         private int _initialWidth;
         private int _initialHeight;
@@ -115,7 +115,7 @@
         {
             var handle = Win32Helper.GetWindowHandle(this, true);
             _hwndSource = HwndSource.FromHwnd(handle);
             _hwndSource.AddHook(WndProc);
             Win32Helper.HideFromAltTab(this);
             Win32Helper.DisableControlBox(this);
         }
@@ -373,7 +373,7 @@
         {
             try
             {
                 _hwndSource.RemoveHook(WndProc);
             }
             catch (Exception)
             {
@@ -476,7 +476,7 @@
                             && QueryTextBox.CaretIndex == QueryTextBox.Text.Length)
                         {
                             var queryWithoutActionKeyword =
-                                QueryBuilder.Build(QueryTextBox.Text.Trim(), PluginManager.NonGlobalPlugins)?.Search;
+                                QueryBuilder.Build(QueryTextBox.Text.Trim(), PluginManager.GetNonGlobalPlugins())?.Search;
 
                             if (FilesFolders.IsLocationPathString(queryWithoutActionKeyword))
                             {
@@ -775,7 +775,7 @@
                 Header = App.API.GetTranslation("iconTrayOpen") + " (" + _settings.Hotkey + ")",
                 Icon = openIcon
             };
             var gamemodeIcon = new FontIcon { Glyph = "\ue7fc" };
             var gamemode = new MenuItem
             {
                 Header = App.API.GetTranslation("GameMode"),
@@ -822,7 +822,7 @@
 
         public void UpdatePosition()
         {
             // Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
             if (_viewModel.IsDialogJumpWindowUnderDialog())
             {
                 InitializeDialogJumpPosition();
@@ -846,7 +846,7 @@
 
         private void InitializePosition()
         {
             // Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
             InitializePositionInner();
             InitializePositionInner();
             return;

Flow.Launcher/PublicAPIInstance.cs

@@ -251,7 +251,7 @@ private static async Task<Exception> RetryActionOnSTAThreadAsync(Action action,
 
         public string GetTranslation(string key) => Internationalization.GetTranslation(key);
 
-        public List<PluginPair> GetAllPlugins() => PluginManager.AllPlugins.ToList();
+        public List<PluginPair> GetAllPlugins() => PluginManager.GetAllInitializedPlugins();
 
         public MatchResult FuzzySearch(string query, string stringToCompare) =>
             StringMatcher.FuzzySearch(query, stringToCompare);

Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginsViewModel.cs

@@ -114,8 +114,9 @@ public string FilterText
         }
     }
 
-    private IList<PluginViewModel>? _pluginViewModels;
-    public IList<PluginViewModel> PluginViewModels => _pluginViewModels ??= PluginManager.AllPlugins
+    private List<PluginViewModel>? _pluginViewModels;
+    // Get all initialized plugins and ignore those that are not initialized
+    public List<PluginViewModel> PluginViewModels => _pluginViewModels ??= App.API.GetAllPlugins()
         .OrderBy(plugin => plugin.Metadata.Disabled)
         .ThenBy(plugin => plugin.Metadata.Name)
         .Select(plugin => new PluginViewModel

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -27,7 +27,7 @@
 
 namespace Flow.Launcher.ViewModel
 {
-    public partial class MainViewModel : BaseModel, ISavable, IDisposable
+    public partial class MainViewModel : BaseModel, ISavable, IDisposable, IResultUpdateRegister
     {
         #region Private Fields
 
@@ -274,52 +274,50 @@ void continueAction(Task t)
             }
         }
 
-        public void RegisterResultsUpdatedEvent()
+        public void RegisterResultsUpdatedEvent(PluginPair pair)
         {
-            foreach (var pair in PluginManager.GetResultUpdatePlugin())
+            if (pair.Plugin is not IResultUpdated plugin) return;
+
+            plugin.ResultsUpdated += (s, e) =>
             {
-                var plugin = (IResultUpdated)pair.Plugin;
-                plugin.ResultsUpdated += (s, e) =>
+                if (e.Query.RawQuery != QueryText || e.Token.IsCancellationRequested)
                 {
-                    if (e.Query.RawQuery != QueryText || e.Token.IsCancellationRequested)
-                    {
-                        return;
-                    }
+                    return;
+                }
 
-                    var token = e.Token == default ? _updateToken : e.Token;
+                var token = e.Token == default ? _updateToken : e.Token;
 
-                    IReadOnlyList<Result> resultsCopy;
-                    if (e.Results == null)
-                    {
-                        resultsCopy = _emptyResult;
-                    }
-                    else
-                    {
-                        // make a clone to avoid possible issue that plugin will also change the list and items when updating view model
-                        resultsCopy = DeepCloneResults(e.Results, false, token);
-                    }
+                IReadOnlyList<Result> resultsCopy;
+                if (e.Results == null)
+                {
+                    resultsCopy = _emptyResult;
+                }
+                else
+                {
+                    // make a clone to avoid possible issue that plugin will also change the list and items when updating view model
+                    resultsCopy = DeepCloneResults(e.Results, false, token);
+                }
 
-                    foreach (var result in resultsCopy)
+                foreach (var result in resultsCopy)
+                {
+                    if (string.IsNullOrEmpty(result.BadgeIcoPath))
                     {
-                        if (string.IsNullOrEmpty(result.BadgeIcoPath))
-                        {
-                            result.BadgeIcoPath = pair.Metadata.IcoPath;
-                        }
+                        result.BadgeIcoPath = pair.Metadata.IcoPath;
                     }
+                }
 
-                    PluginManager.UpdatePluginMetadata(resultsCopy, pair.Metadata, e.Query);
+                PluginManager.UpdatePluginMetadata(resultsCopy, pair.Metadata, e.Query);
 
-                    if (token.IsCancellationRequested) return;
+                if (token.IsCancellationRequested) return;
 
-                    App.API.LogDebug(ClassName, $"Update results for plugin <{pair.Metadata.Name}>");
+                App.API.LogDebug(ClassName, $"Update results for plugin <{pair.Metadata.Name}>");
 
-                    if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(resultsCopy, pair.Metadata, e.Query,
-                        token)))
-                    {
-                        App.API.LogError(ClassName, "Unable to add item to Result Update Queue");
-                    }
-                };
-            }
+                if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(resultsCopy, pair.Metadata, e.Query,
+                    token)))
+                {
+                    App.API.LogError(ClassName, "Unable to add item to Result Update Queue");
+                }
+            };
         }
 
         private async Task RegisterClockAndDateUpdateAsync()
@@ -439,7 +437,7 @@ private void LoadContextMenu()
         [RelayCommand]
         private void Backspace(object index)
         {
-            var query = QueryBuilder.Build(QueryText.Trim(), PluginManager.NonGlobalPlugins);
+            var query = QueryBuilder.Build(QueryText.Trim(), PluginManager.GetNonGlobalPlugins());
 
             // GetPreviousExistingDirectory does not require trailing '\', otherwise will return empty string
             var path = FilesFolders.GetPreviousExistingDirectory((_) => true, query.Search.TrimEnd('\\'));
@@ -1329,7 +1327,7 @@ private static List<Result> GetHistoryItems(IEnumerable<HistoryItem> historyItem
 
         private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, bool reSelect = true)
         {
-            _updateSource?.Cancel();
+            await _updateSource?.CancelAsync();
 
             App.API.LogDebug(ClassName, $"Start query with text: <{QueryText}>");
 
@@ -1575,7 +1573,7 @@ private async Task<Query> ConstructQueryAsync(string queryText, IEnumerable<Cust
         {
             if (string.IsNullOrWhiteSpace(queryText))
             {
-                return QueryBuilder.Build(string.Empty, PluginManager.NonGlobalPlugins);
+                return QueryBuilder.Build(string.Empty, PluginManager.GetNonGlobalPlugins());
             }
 
             var queryBuilder = new StringBuilder(queryText);
@@ -1595,7 +1593,7 @@ private async Task<Query> ConstructQueryAsync(string queryText, IEnumerable<Cust
             // Applying builtin shortcuts
             await BuildQueryAsync(builtInShortcuts, queryBuilder, queryBuilderTmp);
 
-            return QueryBuilder.Build(queryBuilder.ToString().Trim(), PluginManager.NonGlobalPlugins);
+            return QueryBuilder.Build(queryBuilder.ToString().Trim(), PluginManager.GetNonGlobalPlugins());
         }
 
         private async Task BuildQueryAsync(IEnumerable<BaseBuiltinShortcutModel> builtInShortcuts,
@@ -1908,7 +1906,7 @@ public async Task SetupDialogJumpAsync(nint handle)
             if (DialogJump.DialogJumpWindowPosition == DialogJumpWindowPositions.UnderDialog)
             {
                 // Cancel the previous Dialog Jump task
-                _dialogJumpSource?.Cancel();
+                await _dialogJumpSource?.CancelAsync();
 
                 // Create a new cancellation token source
                 _dialogJumpSource = new CancellationTokenSource();