|
14 | 14 | using CurvaLauncher.Plugins; |
15 | 15 | using CurvaLauncher.PluginInteraction; |
16 | 16 | using System.Diagnostics; |
| 17 | +using System.IO.Compression; |
| 18 | +using System.Runtime.Loader; |
17 | 19 |
|
18 | 20 | namespace CurvaLauncher.Services; |
19 | 21 |
|
@@ -50,65 +52,123 @@ private void CoreLoadPlugins(out List<PluginInstance> plugins) |
50 | 52 | plugins = new List<PluginInstance>(); |
51 | 53 |
|
52 | 54 | var dir = EnsurePluginDirectory(); |
53 | | - var dllFiles = dir.GetFiles("*.dll"); |
54 | 55 |
|
55 | 56 | AppConfig config = _configService.Config; |
56 | 57 |
|
57 | | - foreach (FileInfo dllFile in dllFiles) |
58 | | - if (CoreLoadPlugin(config, dllFile.FullName, out PluginInstance? plugin)) |
| 58 | + foreach (var dllFile in dir.GetFiles("*.dll")) |
| 59 | + { |
| 60 | + if (CoreLoadDllPlugin(config, dllFile.FullName, out PluginInstance? plugin)) |
| 61 | + { |
| 62 | + plugins.Add(plugin); |
| 63 | + } |
| 64 | + } |
| 65 | + |
| 66 | + foreach (var zipFile in dir.GetFiles("*.zip")) |
| 67 | + { |
| 68 | + if (CoreLoadZipPlugin(config, zipFile.FullName, out PluginInstance? plugin)) |
59 | 69 | { |
60 | 70 | plugins.Add(plugin); |
61 | 71 | } |
| 72 | + } |
62 | 73 | } |
63 | 74 |
|
64 | | - private bool CoreLoadPlugin(AppConfig config, string dllFilePath, [NotNullWhen(true)] out PluginInstance? pluginInstance) |
| 75 | + private bool CoreLoadPluginFromAssembly(AppConfig config, Assembly assembly, [NotNullWhen(true)] out PluginInstance? pluginInstance) |
65 | 76 | { |
66 | 77 | pluginInstance = null; |
67 | 78 |
|
68 | | - try |
69 | | - { |
70 | | - var assembly = Assembly.LoadFile(dllFilePath); |
71 | | - |
72 | | - Type? pluginType = assembly.ExportedTypes |
| 79 | + Type? pluginType = assembly.ExportedTypes |
73 | 80 | .Where(type => type.IsAssignableTo(typeof(ISyncPlugin)) || type.IsAssignableTo(typeof(IAsyncPlugin))) |
74 | 81 | .FirstOrDefault(); |
75 | 82 |
|
76 | | - if (pluginType == null) |
77 | | - return false; |
| 83 | + if (pluginType == null) |
| 84 | + return false; |
78 | 85 |
|
79 | | - if (!PluginInstance.TryCreate(pluginType, out pluginInstance)) |
80 | | - return false; |
| 86 | + if (!PluginInstance.TryCreate(pluginType, out pluginInstance)) |
| 87 | + return false; |
81 | 88 |
|
82 | | - var typeName = pluginType.FullName!; |
| 89 | + var typeName = pluginType.FullName!; |
83 | 90 |
|
84 | | - if (config.Plugins.TryGetValue(typeName, out var pluginConfig)) |
85 | | - { |
86 | | - var props = pluginInstance.Plugin.GetType().GetProperties() |
| 91 | + if (config.Plugins.TryGetValue(typeName, out var pluginConfig)) |
| 92 | + { |
| 93 | + var props = pluginInstance.Plugin.GetType().GetProperties() |
87 | 94 | .Where(p => p.GetCustomAttribute<PluginOptionAttribute>() is not null |
88 | 95 | || p.GetCustomAttribute<PluginI18nOptionAttribute>() is not null); |
89 | 96 |
|
90 | | - if (pluginConfig.Options != null) |
| 97 | + if (pluginConfig.Options != null) |
| 98 | + { |
| 99 | + foreach (var property in props) |
91 | 100 | { |
92 | | - foreach (var property in props) |
| 101 | + if (pluginConfig.Options.TryGetPropertyValue(property.Name, out var value)) |
93 | 102 | { |
94 | | - if (pluginConfig.Options.TryGetPropertyValue(property.Name, out var value)) |
95 | | - { |
96 | | - var type = property.PropertyType; |
97 | | - var val = JsonSerializer.Deserialize(value, type); |
98 | | - property.SetValue(pluginInstance.Plugin, val); |
99 | | - } |
| 103 | + var type = property.PropertyType; |
| 104 | + var val = JsonSerializer.Deserialize(value, type); |
| 105 | + property.SetValue(pluginInstance.Plugin, val); |
100 | 106 | } |
101 | 107 | } |
102 | | - |
103 | | - pluginInstance.IsEnabled = pluginConfig.IsEnabled; |
104 | | - pluginInstance.Weight = pluginConfig.Weight; |
105 | 108 | } |
106 | | - else |
| 109 | + |
| 110 | + pluginInstance.IsEnabled = pluginConfig.IsEnabled; |
| 111 | + pluginInstance.Weight = pluginConfig.Weight; |
| 112 | + } |
| 113 | + else |
| 114 | + { |
| 115 | + pluginInstance.IsEnabled = true; |
| 116 | + } |
| 117 | + |
| 118 | + return true; |
| 119 | + } |
| 120 | + |
| 121 | + private bool CoreLoadDllPlugin(AppConfig config, string dllFilePath, [NotNullWhen(true)] out PluginInstance? pluginInstance) |
| 122 | + { |
| 123 | + pluginInstance = null; |
| 124 | + |
| 125 | + try |
| 126 | + { |
| 127 | + var assembly = Assembly.LoadFile(dllFilePath); |
| 128 | + return CoreLoadPluginFromAssembly(config, assembly, out pluginInstance); |
| 129 | + } |
| 130 | + catch (Exception ex) |
| 131 | + { |
| 132 | + Debug.WriteLine($"Plugin load failed, {ex}"); |
| 133 | + return false; |
| 134 | + } |
| 135 | + } |
| 136 | + |
| 137 | + private bool CoreLoadZipPlugin(AppConfig config, string zipFilePath, [NotNullWhen(true)] out PluginInstance? pluginInstance) |
| 138 | + { |
| 139 | + pluginInstance = null; |
| 140 | + |
| 141 | + try |
| 142 | + { |
| 143 | + using var zipFile = File.OpenRead(zipFilePath); |
| 144 | + using var zipArchive = new ZipArchive(zipFile, ZipArchiveMode.Read); |
| 145 | + var assemblyLoadContext = new AssemblyLoadContext(null, false); |
| 146 | + |
| 147 | + foreach (var entry in zipArchive.Entries) |
107 | 148 | { |
108 | | - pluginInstance.IsEnabled = true; |
| 149 | + if (!entry.FullName.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) |
| 150 | + { |
| 151 | + continue; |
| 152 | + } |
| 153 | + |
| 154 | + using var entryStream = entry.Open(); |
| 155 | + |
| 156 | + try |
| 157 | + { |
| 158 | + var assembly = assemblyLoadContext.LoadFromStream(entryStream); |
| 159 | + |
| 160 | + if (pluginInstance is null) |
| 161 | + { |
| 162 | + CoreLoadPluginFromAssembly(config, assembly, out pluginInstance); |
| 163 | + } |
| 164 | + } |
| 165 | + catch (Exception ex) |
| 166 | + { |
| 167 | + Debug.WriteLine($"DLL load failed, {ex}"); |
| 168 | + } |
109 | 169 | } |
110 | 170 |
|
111 | | - return true; |
| 171 | + return pluginInstance is not null; |
112 | 172 | } |
113 | 173 | catch (Exception ex) |
114 | 174 | { |
|
0 commit comments