From dc85d86ea1db7608368eadbfee80f7618653f42d Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Sun, 15 Jan 2023 15:39:57 -0500
Subject: Enable in-process restarting

---
 Emby.Server.Implementations/Plugins/PluginManager.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'Emby.Server.Implementations/Plugins/PluginManager.cs')

diff --git a/Emby.Server.Implementations/Plugins/PluginManager.cs b/Emby.Server.Implementations/Plugins/PluginManager.cs
index 14e7c22696..6ef66f2b5d 100644
--- a/Emby.Server.Implementations/Plugins/PluginManager.cs
+++ b/Emby.Server.Implementations/Plugins/PluginManager.cs
@@ -5,6 +5,7 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Reflection;
+using System.Runtime.Loader;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -30,6 +31,7 @@ namespace Emby.Server.Implementations.Plugins
     {
         private readonly string _pluginsPath;
         private readonly Version _appVersion;
+        private readonly AssemblyLoadContext _assemblyLoadContext;
         private readonly JsonSerializerOptions _jsonOptions;
         private readonly ILogger<PluginManager> _logger;
         private readonly IApplicationHost _appHost;
@@ -76,6 +78,8 @@ namespace Emby.Server.Implementations.Plugins
             _appHost = appHost;
             _minimumVersion = new Version(0, 0, 0, 1);
             _plugins = Directory.Exists(_pluginsPath) ? DiscoverPlugins().ToList() : new List<LocalPlugin>();
+
+            _assemblyLoadContext = new AssemblyLoadContext("PluginContext", true);
         }
 
         private IHttpClientFactory HttpClientFactory
@@ -124,7 +128,7 @@ namespace Emby.Server.Implementations.Plugins
                     Assembly assembly;
                     try
                     {
-                        assembly = Assembly.LoadFrom(file);
+                        assembly = _assemblyLoadContext.LoadFromAssemblyPath(file);
 
                         // Load all required types to verify that the plugin will load
                         assembly.GetTypes();
@@ -156,6 +160,12 @@ namespace Emby.Server.Implementations.Plugins
             }
         }
 
+        /// <inheritdoc />
+        public void UnloadAssemblies()
+        {
+            _assemblyLoadContext.Unload();
+        }
+
         /// <summary>
         /// Creates all the plugin instances.
         /// </summary>
-- 
cgit v1.2.3


From a48f18887468015876a8b056f15b68d6ef49ce04 Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Sun, 15 Jan 2023 17:00:38 -0500
Subject: Use separate assembly load contexts per plugin

---
 Emby.Server.Implementations/Plugins/PluginManager.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'Emby.Server.Implementations/Plugins/PluginManager.cs')

diff --git a/Emby.Server.Implementations/Plugins/PluginManager.cs b/Emby.Server.Implementations/Plugins/PluginManager.cs
index 6ef66f2b5d..3be20e7e3f 100644
--- a/Emby.Server.Implementations/Plugins/PluginManager.cs
+++ b/Emby.Server.Implementations/Plugins/PluginManager.cs
@@ -31,7 +31,7 @@ namespace Emby.Server.Implementations.Plugins
     {
         private readonly string _pluginsPath;
         private readonly Version _appVersion;
-        private readonly AssemblyLoadContext _assemblyLoadContext;
+        private readonly List<AssemblyLoadContext> _assemblyLoadContexts;
         private readonly JsonSerializerOptions _jsonOptions;
         private readonly ILogger<PluginManager> _logger;
         private readonly IApplicationHost _appHost;
@@ -79,7 +79,7 @@ namespace Emby.Server.Implementations.Plugins
             _minimumVersion = new Version(0, 0, 0, 1);
             _plugins = Directory.Exists(_pluginsPath) ? DiscoverPlugins().ToList() : new List<LocalPlugin>();
 
-            _assemblyLoadContext = new AssemblyLoadContext("PluginContext", true);
+            _assemblyLoadContexts = new List<AssemblyLoadContext>();
         }
 
         private IHttpClientFactory HttpClientFactory
@@ -128,7 +128,10 @@ namespace Emby.Server.Implementations.Plugins
                     Assembly assembly;
                     try
                     {
-                        assembly = _assemblyLoadContext.LoadFromAssemblyPath(file);
+                        var assemblyLoadContext = new AssemblyLoadContext($"{plugin.Name} ${plugin.Version}", true);
+                        _assemblyLoadContexts.Add(assemblyLoadContext);
+
+                        assembly = assemblyLoadContext.LoadFromAssemblyPath(file);
 
                         // Load all required types to verify that the plugin will load
                         assembly.GetTypes();
@@ -163,7 +166,10 @@ namespace Emby.Server.Implementations.Plugins
         /// <inheritdoc />
         public void UnloadAssemblies()
         {
-            _assemblyLoadContext.Unload();
+            foreach (var assemblyLoadContext in _assemblyLoadContexts)
+            {
+                assemblyLoadContext.Unload();
+            }
         }
 
         /// <summary>
-- 
cgit v1.2.3


From 577d396649f44a26f9f8bf291a58994d414e23a6 Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Sun, 15 Jan 2023 17:35:36 -0500
Subject: Use custom plugin assembly load context

---
 .../Plugins/PluginLoadContext.cs                   | 33 ++++++++++++++++++++++
 .../Plugins/PluginManager.cs                       |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 Emby.Server.Implementations/Plugins/PluginLoadContext.cs

(limited to 'Emby.Server.Implementations/Plugins/PluginManager.cs')

diff --git a/Emby.Server.Implementations/Plugins/PluginLoadContext.cs b/Emby.Server.Implementations/Plugins/PluginLoadContext.cs
new file mode 100644
index 0000000000..d04e9cf685
--- /dev/null
+++ b/Emby.Server.Implementations/Plugins/PluginLoadContext.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.Loader;
+
+namespace Emby.Server.Implementations.Plugins;
+
+/// <summary>
+/// A custom <see cref="AssemblyLoadContext"/> for loading Jellyfin plugins.
+/// </summary>
+public class PluginLoadContext : AssemblyLoadContext
+{
+    private readonly AssemblyDependencyResolver _resolver;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PluginLoadContext"/> class.
+    /// </summary>
+    /// <param name="path">The path of the plugin assembly.</param>
+    public PluginLoadContext(string path) : base(true)
+    {
+        _resolver = new AssemblyDependencyResolver(path);
+    }
+
+    /// <inheritdoc />
+    protected override Assembly? Load(AssemblyName assemblyName)
+    {
+        var assemblyPath = _resolver.ResolveAssemblyToPath(assemblyName);
+        if (assemblyPath is not null)
+        {
+            return LoadFromAssemblyPath(assemblyPath);
+        }
+
+        return null;
+    }
+}
diff --git a/Emby.Server.Implementations/Plugins/PluginManager.cs b/Emby.Server.Implementations/Plugins/PluginManager.cs
index 3be20e7e3f..f2212f4dcb 100644
--- a/Emby.Server.Implementations/Plugins/PluginManager.cs
+++ b/Emby.Server.Implementations/Plugins/PluginManager.cs
@@ -128,7 +128,7 @@ namespace Emby.Server.Implementations.Plugins
                     Assembly assembly;
                     try
                     {
-                        var assemblyLoadContext = new AssemblyLoadContext($"{plugin.Name} ${plugin.Version}", true);
+                        var assemblyLoadContext = new PluginLoadContext(file);
                         _assemblyLoadContexts.Add(assemblyLoadContext);
 
                         assembly = assemblyLoadContext.LoadFromAssemblyPath(file);
-- 
cgit v1.2.3