feat: 新插件加载逻辑, 插件模板

OrgEleCho · Jan 23, 2025 · 100a1a5 · 100a1a5
1 parent a13bcdb
commit 100a1a5
Show file tree

Hide file tree

Showing 49 changed files with 418 additions and 448 deletions.
diff --git a/...er.Plugins.SHLoadIndirectStringList/CurvaLauncher.Plugins.SHLoadIndirectStringList.fsproj b/...er.Plugins.SHLoadIndirectStringList/CurvaLauncher.Plugins.SHLoadIndirectStringList.fsproj
@@ -1,37 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="..\..\Plugins\Plugin.props" />
+
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>net8.0-windows</TargetFramework>
 
     <!-- 自动复制NuGet包到输出目录 -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="SHLoadIndirectStringList.fs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\CurvaLauncher.Plugins\CurvaLauncher.Plugins.csproj" />
+    <Content Include="Manifest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="8.0.101" />
   </ItemGroup>
 
-
-  <Target Name="CopyFSharpCore" AfterTargets="Build">
-    <Copy SourceFiles="$(OutDir)\FSharp.Core.dll" DestinationFiles="..\..\CurvaLauncher\bin\$(Configuration)\$(TargetFramework)\Libraries\FSharp.Core.dll"></Copy>
-  </Target>
-
-  <Target Name="CopyOutputDebug" AfterTargets="Build" Condition="'$(Configuration)'=='Debug'">
-    <Copy SourceFiles="$(OutDir)\$(MSBuildProjectName).dll" DestinationFiles="..\..\CurvaLauncher\bin\$(Configuration)\$(TargetFramework)\Plugins\$(MSBuildProjectName).dll"></Copy>
-    <Copy SourceFiles="$(OutDir)\$(MSBuildProjectName).pdb" DestinationFiles="..\..\CurvaLauncher\bin\$(Configuration)\$(TargetFramework)\Plugins\$(MSBuildProjectName).pdb"></Copy>
-  </Target>
-
-  <Target Name="CopyOutputRelease" AfterTargets="Build" Condition="'$(Configuration)'=='Release'">
-    <Copy SourceFiles="$(OutDir)\$(MSBuildProjectName).dll" DestinationFiles="..\..\CurvaLauncher\bin\$(Configuration)\$(TargetFramework)\AdditionalPlugins\$(MSBuildProjectName).dll"></Copy>
-  </Target>
+  <Import Project="..\..\Plugins\PackAfterBuild.targets" />
 
 </Project>
diff --git a/src/AdditionalPlugins/CurvaLauncher.Plugins.SHLoadIndirectStringList/Manifest.json b/src/AdditionalPlugins/CurvaLauncher.Plugins.SHLoadIndirectStringList/Manifest.json
@@ -0,0 +1,4 @@
+{
+  "ID": "SHLoadIndirectStringList",
+  "Assembly": "CurvaLauncher.Plugins.SHLoadIndirectStringList.dll"
+}
diff --git a/...itionalPlugins/CurvaLauncher.Plugins.SHLoadIndirectStringList/SHLoadIndirectStringList.fs b/...itionalPlugins/CurvaLauncher.Plugins.SHLoadIndirectStringList/SHLoadIndirectStringList.fs
@@ -31,20 +31,6 @@ type public StringQueryResult(title, desc, weight) =
 type public SHLoadIndirectStringPlugin(context: CurvaLauncherContext) = 
     inherit SyncPlugin(context)
 
-    static do
-        AppDomain.CurrentDomain.add_AssemblyResolve(fun _ args ->
-            let asmName = new AssemblyName(args.Name)
-            let dllName = "FSharp.Core.dll"
-            if asmName.Name = "FSharp.Core" then
-                [|
-                    (Path.Combine(AppContext.BaseDirectory, dllName))
-                    (Path.Combine(AppContext.BaseDirectory, "Libraries", dllName));
-                    (Path.Combine(Directory.GetCurrentDirectory(), dllName))
-                |].Where(File.Exists).First() |> Assembly.LoadFrom
-            else
-                null
-        )
-
     [<DllImport("shlwapi.dll", EntryPoint = "SHLoadIndirectString", CharSet = CharSet.Unicode, ExactSpelling = true)>]
     static extern uint SHLoadIndirectString(string pszSource, char& pszOutBuf, int cchOutBuf, nativeint ppvReserved)
 

diff --git a/src/CurvaLauncher.Plugins/PluginAssemblyLoadContext.cs b/src/CurvaLauncher.Plugins/PluginAssemblyLoadContext.cs
@@ -0,0 +1,29 @@
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Loader;
+
+namespace CurvaLauncher.Plugins;
+
+public sealed class PluginAssemblyLoadContext : AssemblyLoadContext
+{
+    private readonly AssemblyDependencyResolver resolver;
+
+    public PluginAssemblyLoadContext(string pluginID, string dllPath)
+        : base($"ZipPlugin ALC - {pluginID}")
+    {
+        resolver = new(dllPath);
+    }
+
+    protected override Assembly? Load(AssemblyName assemblyName)
+    {
+        string? resolvedPath = resolver.ResolveAssemblyToPath(assemblyName);
+        return resolvedPath is not null ? LoadFromAssemblyPath(resolvedPath) : null;
+    }
+
+    protected override nint LoadUnmanagedDll(string unmanagedDllName)
+    {
+        string? resolvedPath = resolver.ResolveUnmanagedDllToPath(unmanagedDllName);
+        return resolvedPath is not null ? LoadUnmanagedDllFromPath(resolvedPath) : IntPtr.Zero;
+    }
+}
diff --git a/src/CurvaLauncher.Plugins/PluginManifest.cs b/src/CurvaLauncher.Plugins/PluginManifest.cs
@@ -0,0 +1,3 @@
+namespace CurvaLauncher.Plugins;
+
+public sealed record PluginManifest(string ID, string Assembly);
diff --git a/src/CurvaLauncher.Plugins/PluginTypeAttribute.cs b/src/CurvaLauncher.Plugins/PluginTypeAttribute.cs
@@ -0,0 +1,12 @@
+namespace CurvaLauncher.Plugins;
+
+[AttributeUsage(AttributeTargets.Assembly)]
+public sealed class PluginTypeAttribute : Attribute
+{
+    public Type PluginType { get; private set; }
+
+    public PluginTypeAttribute(Type pluginType)
+    {
+        PluginType = pluginType;
+    }
+}
diff --git a/src/CurvaLauncher.sln b/src/CurvaLauncher.sln
@@ -39,13 +39,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CurvaLauncher.Plugins.Every
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F36EDE5B-9C67-44F4-87A9-792390FECF85}"
 	ProjectSection(SolutionItems) = preProject
+		Plugins\CopyAfterBuild.targets = Plugins\CopyAfterBuild.targets
 		CurvaLauncher.props = CurvaLauncher.props
+		Plugins\PackAfterBuild.targets = Plugins\PackAfterBuild.targets
+		Plugins\Plugin.props = Plugins\Plugin.props
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{45D0660D-436E-4419-AEB9-B6ED5BC3E0ED}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurvaLauncher.PluginTemplate", "Templates\CurvaLauncher.PluginTemplate\CurvaLauncher.PluginTemplate.csproj", "{702E5FF3-99D0-4FD3-86E2-04C0A2E82560}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -174,14 +173,6 @@ Global
 		{C7AC6C75-89C6-42E5-8D2A-D06994949F05}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C7AC6C75-89C6-42E5-8D2A-D06994949F05}.Release|x64.ActiveCfg = Release|x64
 		{C7AC6C75-89C6-42E5-8D2A-D06994949F05}.Release|x64.Build.0 = Release|x64
-		{702E5FF3-99D0-4FD3-86E2-04C0A2E82560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{702E5FF3-99D0-4FD3-86E2-04C0A2E82560}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{702E5FF3-99D0-4FD3-86E2-04C0A2E82560}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{702E5FF3-99D0-4FD3-86E2-04C0A2E82560}.Debug|x64.Build.0 = Debug|Any CPU
-		{702E5FF3-99D0-4FD3-86E2-04C0A2E82560}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{702E5FF3-99D0-4FD3-86E2-04C0A2E82560}.Release|Any CPU.Build.0 = Release|Any CPU
-		{702E5FF3-99D0-4FD3-86E2-04C0A2E82560}.Release|x64.ActiveCfg = Release|Any CPU
-		{702E5FF3-99D0-4FD3-86E2-04C0A2E82560}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -198,7 +189,6 @@ Global
 		{F3F6F783-4636-457F-80E1-CC489F524B43} = {BAACD50D-2F94-4A65-8B13-49031D617CAC}
 		{8CFC1C29-51AA-45ED-A91F-01F513182002} = {4A86F98E-B276-4F75-9847-8D0E4280D887}
 		{C7AC6C75-89C6-42E5-8D2A-D06994949F05} = {BAACD50D-2F94-4A65-8B13-49031D617CAC}
-		{702E5FF3-99D0-4FD3-86E2-04C0A2E82560} = {45D0660D-436E-4419-AEB9-B6ED5BC3E0ED}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3FC4E11A-3D67-43DE-84D8-DCA1841F0D71}

diff --git a/src/CurvaLauncher/App.xaml.cs b/src/CurvaLauncher/App.xaml.cs
@@ -52,7 +52,6 @@ private static IServiceProvider BuildServiceProvider()
             services.AddSingleton<HotkeyService>();
             services.AddSingleton<PluginService>();
             services.AddSingleton<ConfigService>();
-            services.AddSingleton<LibraryService>();
             services.AddSingleton<ThemeService>();
             services.AddSingleton<I18nService>();
             services.AddTransient<PageService>();
@@ -81,8 +80,6 @@ protected override void OnStartup(StartupEventArgs e)
                 .GetRequiredService<HotkeyService>();
             var themeService = ServiceProvider
                 .GetRequiredService<ThemeService>();
-            var libraryService = ServiceProvider
-                .GetRequiredService<LibraryService>();
             var globalizationService = ServiceProvider
                 .GetRequiredService<I18nService>();
 
@@ -91,9 +88,6 @@ protected override void OnStartup(StartupEventArgs e)
             //new WindowInteropHelper(mainWindow)
             //    .EnsureHandle();
 
-            // 加载库
-            libraryService.Setup();
-
             // 加载插件
             pluginService.LoadAllPlugins();
 
@@ -215,7 +209,7 @@ public static void ShowLauncherWithQuery(string queryText)
 
         public static void CloseLauncher()
         {
-            var mainWindow = 
+            var mainWindow =
                 ServiceProvider.GetRequiredService<MainWindow>();
 
             mainWindow.ViewModel.QueryText = string.Empty;

diff --git a/src/CurvaLauncher/Services/LibraryService.cs b/src/CurvaLauncher/Services/LibraryService.cs
diff --git a/src/CurvaLauncher/Services/PluginService.cs b/src/CurvaLauncher/Services/PluginService.cs
@@ -6,16 +6,14 @@
 using System.Linq;
 using System.Reflection;
 using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization.Metadata;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Input;
 using CurvaLauncher.Models;
 using CurvaLauncher.Plugins;
-using CurvaLauncher.PluginInteraction;
 using System.Diagnostics;
 using System.IO.Compression;
 using System.Runtime.Loader;
+using IOPath = System.IO.Path;
 
 namespace CurvaLauncher.Services;
 
@@ -141,34 +139,20 @@ private bool CoreLoadZipPlugin(AppConfig config, string zipFilePath, [NotNullWhe
         try
         {
             using var zipFile = File.OpenRead(zipFilePath);
-            using var zipArchive = new ZipArchive(zipFile, ZipArchiveMode.Read);
-            var assemblyLoadContext = new AssemblyLoadContext(null, false);
-
-            foreach (var entry in zipArchive.Entries)
-            {
-                if (!entry.FullName.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
-                {
-                    continue;
-                }
-
-                using var entryStream = entry.Open();
-
-                try
-                {
-                    var assembly = assemblyLoadContext.LoadFromStream(entryStream);
-
-                    if (pluginInstance is null)
-                    {
-                        CoreLoadPluginFromAssembly(config, assembly, out pluginInstance);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Debug.WriteLine($"DLL load failed, {ex}");
-                }
-            }
-
-            return pluginInstance is not null;
+            string extractDir = IOPath.Combine(".cache", IOPath.GetFileNameWithoutExtension(zipFilePath));
+            if (Directory.Exists(extractDir))
+                Directory.Delete(extractDir, true);
+            ZipFile.ExtractToDirectory(zipFile, extractDir);
+
+            var manifestJson = File.ReadAllText(IOPath.Combine(extractDir, "Manifest.json"));
+            var manifest = JsonSerializer.Deserialize<PluginManifest>(manifestJson);
+            if (manifest is null)
+                return false;
+
+            var assemblyPath = IOPath.GetFullPath(IOPath.Combine(extractDir, manifest.Assembly));
+            var alc = new PluginAssemblyLoadContext(manifest.ID, assemblyPath);
+            Assembly assembly = alc.LoadFromAssemblyPath(assemblyPath);
+            return CoreLoadPluginFromAssembly(config, assembly, out pluginInstance);
         }
         catch (Exception ex)
         {

diff --git a/src/Plugins/CopyAfterBuild.targets b/src/Plugins/CopyAfterBuild.targets
@@ -0,0 +1,13 @@
+<Project>
+
+  <Target Name="CopyOutput" AfterTargets="Build">
+    <ItemGroup>
+      <_CompileOutput Include="$(OutputPath)\**"/>
+    </ItemGroup>
+
+    <Copy SourceFiles="@(_CompileOutput)"
+          DestinationFolder="..\..\CurvaLauncher\bin\$(Configuration)\$(TargetFramework)\Plugins\%(RecursiveDir)"
+          SkipUnchangedFiles="true"/>
+  </Target>
+
+</Project>
diff --git a/src/Plugins/CurvaLauncher.Plugins.Calculator/AssemblyInfo.cs b/src/Plugins/CurvaLauncher.Plugins.Calculator/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+using CurvaLauncher.Plugins;
+using CurvaLauncher.Plugins.Calculator;
+
+[assembly: PluginType(typeof(CalculatorPlugin))]
diff --git a/src/Plugins/CurvaLauncher.Plugins.Calculator/CurvaLauncher.Plugins.Calculator.csproj b/src/Plugins/CurvaLauncher.Plugins.Calculator/CurvaLauncher.Plugins.Calculator.csproj
@@ -1,5 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="..\Plugin.props" />
+
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -8,10 +10,6 @@
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\CurvaLauncher.Plugins\CurvaLauncher.Plugins.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -27,12 +25,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <Target Name="CopyOutput" AfterTargets="Build">
-    <Copy SourceFiles="$(OutDir)\$(MSBuildProjectName).dll" DestinationFiles="..\..\CurvaLauncher\bin\$(Configuration)\$(TargetFramework)\Plugins\$(MSBuildProjectName).dll"></Copy>
-  </Target>
+  <Import Project="..\CopyAfterBuild.targets" />
 
-  <Target Name="CopyOutputPdb" AfterTargets="Build" Condition="'$(Configuration)'=='Debug'">
-    <Copy SourceFiles="$(OutDir)\$(MSBuildProjectName).pdb" DestinationFiles="..\..\CurvaLauncher\bin\$(Configuration)\$(TargetFramework)\Plugins\$(MSBuildProjectName).pdb"></Copy>
-  </Target>
-
 </Project>
diff --git a/src/Plugins/CurvaLauncher.Plugins.Everything/AssemblyInfo.cs b/src/Plugins/CurvaLauncher.Plugins.Everything/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+using CurvaLauncher.Plugins;
+using CurvaLauncher.Plugins.Everything;
+
+[assembly: PluginType(typeof(EverythingPlugin))]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		namespace CurvaLauncher.Plugins;

		public sealed record PluginManifest(string ID, string Assembly);