Skip to content

dependency issue fix #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0XC7R wants to merge 1 commit into
base: main
Choose a base branch
from
Open

dependency issue fix #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 103 additions & 16 deletions Pulsar.Server/Plugins/PluginManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Loader;
using System.Threading;
using System.Threading.Tasks;

Expand All @@ -28,20 +29,20 @@ public void LoadFrom(string folder)
{
try
{
if (!Directory.Exists(folder))
if (!Directory.Exists(folder))
{
Directory.CreateDirectory(folder);
_context.Log("Created plugin directory: " + folder);
}

var enabledDlls = Directory.EnumerateFiles(folder, "*.dll", SearchOption.TopDirectoryOnly)
.Where(f => !f.EndsWith(".disabled", StringComparison.OrdinalIgnoreCase))
.Where(f => !IsClientPluginFile(f))
.OrderBy(Path.GetFileName)
.ToList();

_context.Log($"Found {enabledDlls.Count} enabled DLL files in: {folder}");

foreach (var dll in enabledDlls)
{
_context.Log("Attempting to load: " + Path.GetFileName(dll));
Expand Down Expand Up @@ -87,7 +88,7 @@ private void OnFileChanged(object sender, FileSystemEventArgs e)
return;
}
_context.Log($"File {e.ChangeType}: {e.Name}");
Task.Delay(500).ContinueWith(_ =>
Task.Delay(500).ContinueWith(_ =>
{
try
{
Expand All @@ -108,7 +109,7 @@ private void OnFileRenamed(object sender, RenamedEventArgs e)
return;
}
_context.Log($"File renamed: {e.OldName} -> {e.Name}");
Task.Delay(500).ContinueWith(_ =>
Task.Delay(500).ContinueWith(_ =>
{
try
{
Expand Down Expand Up @@ -151,7 +152,7 @@ public void ReloadPlugins()
_context.Log("Plugin directory does not exist: " + folder);
return;
}

var enabledDlls = Directory.EnumerateFiles(folder, "*.dll", SearchOption.TopDirectoryOnly)
.Where(f => !f.EndsWith(".disabled", StringComparison.OrdinalIgnoreCase))
.Where(f => !IsClientPluginFile(f))
Expand All @@ -163,7 +164,7 @@ public void ReloadPlugins()
var newPlugins = new List<string>();
var removedPlugins = new List<string>();

var pluginsToRemove = _plugins.Where(p =>
var pluginsToRemove = _plugins.Where(p =>
{
var dllName = p.GetType().Assembly.GetName().Name + ".dll";
return !currentDllNames.Contains(dllName);
Expand All @@ -172,13 +173,13 @@ public void ReloadPlugins()
foreach (var plugin in pluginsToRemove)
{
removedPlugins.Add(plugin.Name);

if (plugin is IUIExtensionPlugin uiPlugin)
{
UIExtensionManager.UnregisterUIExtension(uiPlugin);
_context.Log("Unregistered UI extension: " + plugin.Name);
}

_plugins.Remove(plugin);
_context.Log($"Plugin removed: {plugin.Name}");
}
Expand All @@ -195,14 +196,14 @@ public void ReloadPlugins()
if (newPlugins.Count > 0 || removedPlugins.Count > 0)
{
var changes = new List<string>();

if (newPlugins.Count > 0)
{
var pluginList = string.Join(", ", newPlugins.Take(5));
var moreText = newPlugins.Count > 5 ? $" and {newPlugins.Count - 5} more" : "";
changes.Add($"Added {newPlugins.Count} plugin{(newPlugins.Count > 1 ? "s" : "")}: {pluginList}{moreText}");
}

if (removedPlugins.Count > 0)
{
var removedList = string.Join(", ", removedPlugins.Take(5));
Expand All @@ -216,7 +217,7 @@ public void ReloadPlugins()
{
_context.Log($"Plugin scan complete: {_plugins.Count} plugins loaded");
}

PluginsChanged?.Invoke(this, EventArgs.Empty);
}
catch (Exception ex)
Expand All @@ -227,7 +228,7 @@ public void ReloadPlugins()
}
}

private string TryLoadDll(string path)
/*private string TryLoadDll(string path)
{
try
{
Expand All @@ -241,6 +242,7 @@ private string TryLoadDll(string path)
var alreadyLoaded = _plugins.Any(p =>
{
var loadedDllName = p.GetType().Assembly.GetName().Name + ".dll";
_context.Log(loadedDllName);
return string.Equals(loadedDllName, dllName, StringComparison.OrdinalIgnoreCase);
});

Expand All @@ -254,11 +256,15 @@ private string TryLoadDll(string path)
string loadedPlugin = null;
foreach (var t in types)
{
_context.Log($"type name of assembly ({asm.FullName}):" + t.FullName);
_context.Log($"Path: {path}");
var pluginName = TryInit(t, Path.GetFileName(path));
if (!string.IsNullOrEmpty(pluginName))
loadedPlugin = pluginName;
}
return loadedPlugin;


}
catch (ReflectionTypeLoadException rtle)
{
Expand All @@ -271,8 +277,89 @@ private string TryLoadDll(string path)
_context.Log("Plugin load error: " + ex.Message);
}
return null;
}*/

private string TryLoadDll(string path)
{
if (IsClientPluginFile(path))
{
_context.Log($"Skipping client plugin assembly for server load: {Path.GetFileName(path)}");
return null;
}

AssemblyLoadContext loadContext = new AssemblyLoadContext("PluginLoadContext", true);
AppDomain.CurrentDomain.AssemblyResolve += OnAssemblyResolve; // Resolves assemblies for the dll that is being loaded

var dllName = Path.GetFileName(path);
var alreadyLoaded = _plugins.Any(p =>
{
var loadedDllName = p.GetType().Assembly.GetName().Name + ".dll";
_context.Log(loadedDllName);
return string.Equals(loadedDllName, dllName, StringComparison.OrdinalIgnoreCase);
});

if (alreadyLoaded)
{
return null;
}

try
{
using MemoryStream executableStream = new(File.ReadAllBytes(path));

// Load the assembly from the memory stream
Assembly assembly = loadContext.LoadFromStream(executableStream);

// Retrieve types that implement IServerPlugin
var types = assembly.GetTypes().Where(t => !t.IsAbstract && typeof(IServerPlugin).IsAssignableFrom(t));

string loadedPlugin = null;
foreach (var t in types)
{
_context.Log($"Initiating following type: {t.FullName}");
var pluginName = TryInit(t, Path.GetFileName(path));
if (!string.IsNullOrEmpty(pluginName))
loadedPlugin = pluginName;
}

return loadedPlugin;
}
catch (ReflectionTypeLoadException rtle)
{
_context.Log("Plugin load error (ReflectionTypeLoadException): " + rtle.Message);
foreach (var e in rtle.LoaderExceptions)
_context.Log(" " + e?.Message);
}
catch (FileNotFoundException fnfe)
{
_context.Log($"File not found: {fnfe.Message}");
}
catch (Exception ex)
{
_context.Log("Plugin load error: " + ex.Message);
}
finally
{
AppDomain.CurrentDomain.AssemblyResolve -= OnAssemblyResolve; // Remove the event handler
}

return null;
}

private Assembly OnAssemblyResolve(object sender, ResolveEventArgs args)
{
// Attempt to resolve the assembly from the same directory as the plugin
var assemblyPath = Path.Combine(Path.GetDirectoryName(args.Name), $"{new AssemblyName(args.Name).Name}.dll");
if (File.Exists(assemblyPath))
{
return Assembly.LoadFrom(assemblyPath);
}

return null; // Unable to resolve
}



private string TryInit(Type t, string source)
{
try
Expand All @@ -282,15 +369,15 @@ private string TryInit(Type t, string source)
p.Initialize(_context);
_plugins.Add(p);
_context.Log("Loaded plugin '" + p.Name + "' " + p.Version + " from " + source);

if (p is IUIExtensionPlugin uiPlugin)
{
UIExtensionManager.RegisterUIExtension(uiPlugin);
_context.Log("Registered UI extension: " + p.Name);
}

PluginsChanged?.Invoke(this, EventArgs.Empty);

return p.Name;
}
}
Expand Down