Merge remote-tracking branch 'upstream/dev' into JsonRevise

Author: taooceros

Flow.Launcher.Core/Plugin/PluginAssemblyLoader.cs

@@ -1,5 +1,6 @@
 using Flow.Launcher.Infrastructure;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -11,17 +12,23 @@ internal class PluginAssemblyLoader : AssemblyLoadContext
     {
         private readonly AssemblyDependencyResolver dependencyResolver;
 
-        private readonly AssemblyDependencyResolver referencedPluginPackageDependencyResolver;
-
         private readonly AssemblyName assemblyName;
 
+        private static readonly List<Assembly> loadedAssembly;
+
+        static PluginAssemblyLoader()
+        {
+            loadedAssembly = new List<Assembly>(AppDomain.CurrentDomain.GetAssemblies());
+            AppDomain.CurrentDomain.AssemblyLoad += (sender, args) =>
+            {
+                loadedAssembly.Add(args.LoadedAssembly);
+            };
+        }
+
         internal PluginAssemblyLoader(string assemblyFilePath)
         {
             dependencyResolver = new AssemblyDependencyResolver(assemblyFilePath);
             assemblyName = new AssemblyName(Path.GetFileNameWithoutExtension(assemblyFilePath));
-
-            referencedPluginPackageDependencyResolver =
-                new AssemblyDependencyResolver(Path.Combine(Constant.ProgramDirectory, "Flow.Launcher.Plugin.dll"));
         }
 
         internal Assembly LoadAssemblyAndDependencies()
@@ -33,10 +40,10 @@ protected override Assembly Load(AssemblyName assemblyName)
         {
             string assemblyPath = dependencyResolver.ResolveAssemblyToPath(assemblyName);
 
-            // When resolving dependencies, ignore assembly depenedencies that already exits with Flow.Launcher.Plugin
-            // Otherwise will get unexpected behaviour with plugins, e.g. JsonIgnore attribute not honored in WebSearch or other plugins
-            // that use Newtonsoft.Json
-            if (assemblyPath == null || ExistsInReferencedPluginPackage(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;
 
             return LoadFromAssemblyPath(assemblyPath);
@@ -45,13 +52,14 @@ protected override Assembly Load(AssemblyName assemblyName)
         internal Type FromAssemblyGetTypeOfInterface(Assembly assembly, params Type[] types)
         {
             var allTypes = assembly.ExportedTypes;
-
             return allTypes.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Intersect(types).Any());
         }
 
-        internal bool ExistsInReferencedPluginPackage(AssemblyName assemblyName)
+        internal bool ExistsInReferencedPackage(AssemblyName assemblyName)
         {
-            return referencedPluginPackageDependencyResolver.ResolveAssemblyToPath(assemblyName) != null;
+            if (loadedAssembly.Any(a => a.FullName == assemblyName.FullName))
+                return true;
+            return false;
         }
     }
-}
+}

Flow.Launcher.Core/Updater.cs

@@ -87,7 +87,7 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
                     UpdateManager.RestartApp(Constant.ApplicationFileName);
                 }
             }
-            catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException || e is TaskCanceledException)
+            catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException || e.InnerException is TimeoutException)
             {
                 Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
                 api.ShowMsg(api.GetTranslation("update_flowlauncher_fail"),

Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs

@@ -125,8 +125,7 @@ private async Task<IEnumerable<Result>> SuggestionsAsync(string keyword, string
             {
                 var suggestions = await source.Suggestions(keyword, token).ConfigureAwait(false);
 
-                if (token.IsCancellationRequested)
-                    return null;
+                token.ThrowIfCancellationRequested();
 
                 var resultsFromSuggestion = suggestions?.Select(o => new Result
                 {

Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Baidu.cs

@@ -25,16 +25,17 @@ public override async Task<List<string>> Suggestions(string query, CancellationT
                 const string api = "http://suggestion.baidu.com/su?json=1&wd=";
                 result = await Http.GetAsync(api + Uri.EscapeUriString(query), token).ConfigureAwait(false);
             }
-            catch (TaskCanceledException)
+            catch (Exception e) when (e is HttpRequestException || e.InnerException is TimeoutException)
             {
+                Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
                 return null;
             }
-            catch (HttpRequestException e)
+            catch (OperationCanceledException)
             {
-                Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
                 return null;
             }
 
+
             if (string.IsNullOrEmpty(result)) return new List<string>();
             Match match = _reg.Match(result);
             if (match.Success)
@@ -44,7 +45,7 @@ public override async Task<List<string>> Suggestions(string query, CancellationT
                 {
                     json = JsonDocument.Parse(match.Groups[1].Value);
                 }
-                catch(JsonException e)
+                catch (JsonException e)
                 {
                     Log.Exception("|Baidu.Suggestions|can't parse suggestions", e);
                     return new List<string>();

Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs

@@ -40,13 +40,13 @@ public override async Task<List<string>> Suggestions(string query, CancellationT
 
 
             }
-            catch (TaskCanceledException)
+            catch (Exception e) when (e is HttpRequestException || e.InnerException is TimeoutException)
             {
-                return new List<string>();
+                Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
+                return null;
             }
-            catch (HttpRequestException e)
+            catch (OperationCanceledException)
             {
-                Log.Exception("|Bing.Suggestions|Can't get suggestion from Bing", e);
                 return new List<string>();
             }
             catch (JsonException e)

Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs

@@ -22,7 +22,7 @@ public override async Task<List<string>> Suggestions(string query, CancellationT
 
                 using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeUriString(query)).ConfigureAwait(false);
 
-                using var json = await JsonDocument.ParseAsync(resultStream);
+                using var json = await JsonDocument.ParseAsync(resultStream, cancellationToken: token);
 
                 if (json == null)
                     return new List<string>();
@@ -32,13 +32,13 @@ public override async Task<List<string>> Suggestions(string query, CancellationT
                 return results.EnumerateArray().Select(o => o.GetString()).ToList();
 
             }
-            catch (TaskCanceledException)
+            catch (Exception e) when (e is HttpRequestException || e.InnerException is TimeoutException)
             {
-                return new List<string>();
+                Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
+                return null;
             }
-            catch (HttpRequestException e)
+            catch (OperationCanceledException)
             {
-                Log.Exception("|Google.Suggestions|Can't get suggestion from google", e);
                 return new List<string>();
             }
             catch (JsonException e)

Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json

@@ -25,7 +25,7 @@
   "Name": "Web Searches",
   "Description": "Provide the web search ability",
   "Author": "qianlifeng",
-  "Version": "1.3.2",
+  "Version": "1.3.3",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.WebSearch.dll",