添加启动时加载插件

uyoufu · May 14, 2022 · 1a5e32a · 1a5e32a
1 parent 056fc37
commit 1a5e32a
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 27 deletions.
diff --git a/MSAddinTest/Core/Command/RunPluginCommand.cs b/MSAddinTest/Core/Command/RunPluginCommand.cs
@@ -1,7 +1,10 @@
-using MSAddinTest.MSTestInterface;
+using Bentley.MstnPlatformNET;
+using MSAddinTest.MSTestInterface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.ExceptionServices;
+using System.Security;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -27,16 +30,30 @@ public RunPluginCommand(string excutorName)
             _args = new MSTestArg();
         }
 
+        /// <summary>
+        /// 特性控制可以跨程序集捕获异常
+        /// </summary>
+        /// <returns></returns>
+        //[HandleProcessCorruptedStateExceptions,SecurityCritical]
         public override FuncResult Start()
         {
             int executorsCount = 0;
-            foreach (var kv in PluginContainer)
+
+            // 全部包裹在 TryCatch中
+            try
+            {
+                foreach (var kv in PluginContainer)
+                {
+                    var result = kv.Value.Execute(_executorName, _args);
+                    if (result.Data is int count) executorsCount += count;
+                }
+            }
+            catch (Exception ex)
             {
-                var result = kv.Value.Execute(_executorName, _args);
-                if (result.Data is int count) executorsCount += count;
+                MessageCenter.Instance.ShowErrorMessage(ex.Message, ex.StackTrace, true);
             }
 
-            if(executorsCount == 0)
+            if (executorsCount == 0)
             {
                 MessageBox.Show($"未找到名为{_executorName}的执行器");
             }

diff --git a/MSAddinTest/Core/Executor/AddinExecutor.cs b/MSAddinTest/Core/Executor/AddinExecutor.cs
@@ -24,8 +24,8 @@ public override void Execute(IMSTestArg pluginArg)
             {
                 string unparsedParams = string.Empty;
                 if (pluginArg is MSTestArg arg) unparsedParams = arg.UnparsedParams;
-                MethodInfo.Invoke(null, new object[] { unparsedParams });
 
+                MethodInfo.Invoke(null, new object[] { unparsedParams });
             }
             catch (Exception ex)
             {

diff --git a/MSAddinTest/Core/Loader/PluginAssemblyLoader.cs b/MSAddinTest/Core/Loader/PluginAssemblyLoader.cs
@@ -57,7 +57,6 @@ public FuncResult LoadAssembly()
                 else
                     _lastFileHash = newFileHash;
 
-
                 // 读取文件然后加载
                 byte[] bytes = File.ReadAllBytes(Setup.DllFullPath);
                 var assembly = Assembly.Load(bytes);

diff --git a/MSAddinTest/Core/Loader/PluginAssemblyLoader_Events.cs b/MSAddinTest/Core/Loader/PluginAssemblyLoader_Events.cs
@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace MSAddinTest.Core.Loader
 {
@@ -19,12 +20,18 @@ private void RegistryEvents()
             appDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
             appDomain.TypeResolve += AppDomain_TypeResolve;
             appDomain.UnhandledException += CurrentDomain_UnhandledException;
+            appDomain.FirstChanceException += AppDomain_FirstChanceException;
+        }
+
+        private void AppDomain_FirstChanceException(object sender, System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs e)
+        {
+            //MessageBox.Show(e.Exception.Message);
         }
 
         #region 加载需要的程序集
         private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            ;
+            MessageBox.Show(e.ExceptionObject.ToString());
         }
 
         // 某个类型未找到时，去加载类型

diff --git a/MSAddinTest/Core/Loader/PluginAssemblyLoader_Methods.cs b/MSAddinTest/Core/Loader/PluginAssemblyLoader_Methods.cs
@@ -46,6 +46,8 @@ public FuncResult Execute(string name, IMSTestArg arg)
         /// </summary>
         public void Reload()
         {
+            // 先对原来的 keyin 执行卸载程序
+
             LoadAssembly();
         }
     }

diff --git a/MSAddinTest/Index/MSAddin.cs b/MSAddinTest/Index/MSAddin.cs
@@ -1,4 +1,5 @@
 using Bentley.MstnPlatformNET;
+using MSAddinTest.Core.Command;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,6 +29,10 @@ protected override int Run(string[] commandLine)
 
             MessageCenter.Instance.ShowInfoMessage("MSAddintTest 加载成功!","",false);
 
+            // 加载自启动插件
+            var cmd = new LoadPluginsWhenStartupCommand();
+            Core.PluginManager.Manager.InvokeCommand(cmd);
+
             return 0;
         }
     }

diff --git a/MSAddinTest/MSTestInterface/MSTest_Addin.cs b/MSAddinTest/MSTestInterface/MSTest_Addin.cs
@@ -20,6 +20,11 @@ protected MSTest_Addin(IntPtr mdlDescriptor) { }
         /// 子类用于初始化
         /// </summary>
         /// <param name="addinArg"></param>
-        public abstract void Init(AddIn addIn);
+        public virtual void Init(AddIn addIn) { }
+
+        /// <summary>
+        /// 卸载后手动清除向 Addin 中添加的一些事件
+        /// </summary>
+        public virtual void Unloaded() { }
     }
 }
diff --git a/MSUtils/Class1.cs b/MSUtils/Class1.cs
diff --git a/MSUtils/MSUtils.csproj b/MSUtils/MSUtils.csproj
@@ -59,7 +59,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Class1.cs" />
+    <Compile Include="TestClass.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/MSUtils/TestClass.cs b/MSUtils/TestClass.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MSUtils
+{
+    public class TestClass
+    {
+        public static void NullException()
+        {
+            throw new NullReferenceException("test exception in reference");
+        }
+    }
+}
diff --git a/Readme.md b/Readme.md
@@ -67,11 +67,15 @@ internal class PluginAddin : MSTest_Addin
 
     }
 
+    // 重写初始化方法，获取 addin 参数
     public override void Init(AddIn addin)
     {
         Instance = addin;
         Run(new string[] { });
     }
+
+    // 在这个方法中释放资源
+    public overrride void Unloaded() { }
 
     protected override int Run(string[] commandLine)
     {
@@ -260,7 +264,7 @@ dllName.autoLoad=true,autoReload=true
 
 通过向默认域中加载不同版本的程序集来实现 DLL 版本的重载。为了可以重新编译已加载的 DLL，需要保证加载的 DLL 在被加载后不被锁定，本程序采用从内存的加载方式实现了这个需求。
 
-该实现是一种伪热加载的实现方法，每次加载的 Dll 都会驻留在内存中，卸载的时候某个程序集时，只是丢弃了其引用，并没有从内存里释放。
+该实现是一种伪热加载的实现方法，每次加载的 Dll 都会驻留在内存中，卸载某个程序集时，只是丢弃了其引用，并没有从内存里释放。
 
 可能有人要问了，为什么采用这种方式呢？
 
@@ -278,7 +282,7 @@ dllName.autoLoad=true,autoReload=true
 
 ## UI
 
-本插件预留了 UI 接口，但短期内不会实现。
+本插件预留了 UI 接口，但短期内不会实现。欢迎同志们 PR。
 
 ## 参考
 

diff --git a/TestAddinPlugin/TestAddinPlugin.csproj b/TestAddinPlugin/TestAddinPlugin.csproj
@@ -101,5 +101,11 @@
       <LogicalName>CommandTable.xml</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MSUtils\MSUtils.csproj">
+      <Project>{E687EF99-6F1E-4255-A31F-F235257A9391}</Project>
+      <Name>MSUtils</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/TestAddinPlugin/TestStaticMethodExecutor.cs b/TestAddinPlugin/TestStaticMethodExecutor.cs
@@ -2,6 +2,7 @@
 using Bentley.GeometryNET;
 using Bentley.MstnPlatformNET;
 using MSAddinTest.MSTestInterface;
+using MSUtils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -47,10 +48,11 @@ public static object NewElement(IMSTestArg arg)
             return true;
         }
 
-        [MSTest("ref")]
+        [MSTest("exception")]
         public static object TestReference(IMSTestArg arg)
-        {           
-            return true;
+        {
+            TestClass.NullException();
+            return false;
         }
     }
 }