diff --git a/src/CatLib.Core.NetStandard/CatLib.Core.NetStandard.csproj b/src/CatLib.Core.NetStandard/CatLib.Core.NetStandard.csproj index 8d4a8d8..31b2042 100644 --- a/src/CatLib.Core.NetStandard/CatLib.Core.NetStandard.csproj +++ b/src/CatLib.Core.NetStandard/CatLib.Core.NetStandard.csproj @@ -41,7 +41,7 @@ ..\..\build\NetStandard2.0\ ..\..\build\NetStandard2.0\netstandard2.0\CatLib.Core.xml - TRACE;RELEASE;NETSTANDARD2_0;CATLIB;RELEASE;NETSTANDARD2_0 + TRACE;CATLIB;CATLIB_PERFORMANCE;RELEASE;NETSTANDARD2_0;RELEASE;NETSTANDARD2_0;RELEASE;NETSTANDARD2_0 @@ -67,6 +67,7 @@ + diff --git a/src/CatLib.Core.Tests/CatLib/ApplicationTests.cs b/src/CatLib.Core.Tests/CatLib/ApplicationTests.cs index 7be5d7d..db48dbc 100644 --- a/src/CatLib.Core.Tests/CatLib/ApplicationTests.cs +++ b/src/CatLib.Core.Tests/CatLib/ApplicationTests.cs @@ -106,6 +106,28 @@ public void NoBootstrapInit() }); } + /// + /// 测试终止程序 + /// + [TestMethod] + public void TestTerminate() + { + var app = new Application(); + var oldApp = App.Handler; + var num = 0; + oldApp.On(ApplicationEvents.OnTerminate, () => + { + Assert.AreEqual(0, num++); + }); + oldApp.On(ApplicationEvents.OnTerminated, () => + { + Assert.AreEqual(1, num++); + }); + App.Terminate(); + Assert.AreNotEqual(oldApp, App.Handler); + Assert.AreEqual(2, num); + } + /// /// 获取版本号测试 /// diff --git a/src/CatLib.Core.Tests/Properties/AssemblyInfo.cs b/src/CatLib.Core.Tests/Properties/AssemblyInfo.cs index 55b2209..c7469b8 100644 --- a/src/CatLib.Core.Tests/Properties/AssemblyInfo.cs +++ b/src/CatLib.Core.Tests/Properties/AssemblyInfo.cs @@ -25,5 +25,5 @@ [assembly: Guid("3c9f4024-910c-4881-a04d-34a6c3a09019")] -[assembly: AssemblyVersion("1.2.1.0")] -[assembly: AssemblyFileVersion("1.2.1.0")] +[assembly: AssemblyVersion("1.2.2.0")] +[assembly: AssemblyFileVersion("1.2.2.0")] diff --git a/src/CatLib.Core.Tests/Support/Container/BindDataTests.cs b/src/CatLib.Core.Tests/Support/Container/BindDataTests.cs index 627abc4..da4261f 100644 --- a/src/CatLib.Core.Tests/Support/Container/BindDataTests.cs +++ b/src/CatLib.Core.Tests/Support/Container/BindDataTests.cs @@ -124,7 +124,7 @@ public void CheckIllegalAlias() public void CanOnRelease() { var container = new Container(); - var bindData = new BindData(container, "CanAddOnRelease", (app, param) => "hello world", true); + var bindData = container.Bind("CanAddOnRelease", (app, param) => "hello world", true); bindData.OnRelease((bind, obj) => { @@ -132,8 +132,21 @@ public void CanOnRelease() Assert.AreSame(bindData, bind); }); + // double check + bindData.OnRelease((obj) => + { + Assert.AreEqual("Test", obj); + }); + + var isCall = false; + bindData.OnRelease(()=> + { + isCall = true; + }); + container.Instance("CanAddOnRelease", "Test"); container.Release("CanAddOnRelease"); + Assert.AreEqual(true, isCall); } /// /// 检查无效的解决事件传入参数 @@ -142,7 +155,7 @@ public void CanOnRelease() public void CheckIllegalRelease() { var container = new Container(); - var bindData = new BindData(container, "CheckIllegalRelease", (app, param) => "hello world", false); + var bindData = container.Bind("CheckIllegalRelease", (app, param) => "hello world", false); ExceptionAssert.Throws(() => { @@ -151,7 +164,7 @@ public void CheckIllegalRelease() ExceptionAssert.Throws(() => { - bindData.OnRelease((bind, obj) => + bindData.OnRelease((obj) => { Assert.Fail(); }); @@ -163,6 +176,17 @@ public void CheckIllegalRelease() #endregion #region OnResolving + + [TestMethod] + public void TestAddOnResolvingWithExtend() + { + var container = new Container(); + var bindData = new BindData(container, "CanAddOnResolving", (app, param) => "hello world", false); + bindData.OnResolving((obj) => Assert.AreEqual("hello world", obj)); + var data = bindData.TriggerResolving("hello world"); + Assert.AreEqual("hello world", data); + } + /// /// 是否能追加到解决事件 /// diff --git a/src/CatLib.Core.Tests/Support/Container/ContainerHelperTests.cs b/src/CatLib.Core.Tests/Support/Container/ContainerHelperTests.cs index ffd2ab0..727ce14 100644 --- a/src/CatLib.Core.Tests/Support/Container/ContainerHelperTests.cs +++ b/src/CatLib.Core.Tests/Support/Container/ContainerHelperTests.cs @@ -309,6 +309,17 @@ public void TestWatchLambdaNoParam() Assert.AreEqual(true, isCall); } + [TestMethod] + public void TestReleaseWithObject() + { + var container = new Container(); + container.Instance("abc"); + container.Instance(10); + Assert.AreEqual(true, container.Release("abc", 10, null)); + object[] data = null; + Assert.AreEqual(true, container.Release(data)); + } + /// /// 生成容器 /// diff --git a/src/CatLib.Core.Tests/Support/Container/ContainerTests.cs b/src/CatLib.Core.Tests/Support/Container/ContainerTests.cs index 0af74b7..cffff69 100644 --- a/src/CatLib.Core.Tests/Support/Container/ContainerTests.cs +++ b/src/CatLib.Core.Tests/Support/Container/ContainerTests.cs @@ -33,6 +33,7 @@ public void CanTagService() ExceptionAssert.DoesNotThrow(() => { container.Tag("TestTag", "service1", "service2"); + container.Tag("TestTag"); }); } @@ -1016,9 +1017,12 @@ public void CanMakeWithResolve() bind.OnResolving((bindData, obj) => "local resolve"); container.OnResolving((bindData, obj) => obj + " global resolve"); + var isTrigger = false; + container.OnResolving((obj) => isTrigger = true); var result = container.Make(container.Type2Service(typeof(MakeTestClassDependency))); + Assert.AreEqual(true, isTrigger); Assert.AreEqual("local resolve global resolve", result); } @@ -2261,7 +2265,7 @@ public void TestFlushAndInstance() var container = new Application(); container.Instance(container); - container.OnRelease((_, __) => + container.OnRelease((__) => { container.Instance(container); }); diff --git a/src/CatLib.Core/CatLib.Core.csproj b/src/CatLib.Core/CatLib.Core.csproj index 1b15f77..657a067 100644 --- a/src/CatLib.Core/CatLib.Core.csproj +++ b/src/CatLib.Core/CatLib.Core.csproj @@ -26,7 +26,7 @@ pdbonly true ..\..\build\Net35\ - TRACE;CATLIB + TRACE;CATLIB;CATLIB_PERFORMANCE prompt 4 true @@ -46,6 +46,7 @@ + diff --git a/src/CatLib.Core/CatLib/App.cs b/src/CatLib.Core/CatLib/App.cs index 74b5a5a..45e52a0 100644 --- a/src/CatLib.Core/CatLib/App.cs +++ b/src/CatLib.Core/CatLib/App.cs @@ -57,6 +57,14 @@ public static IApplication Handler #endregion #region Application API + /// + /// 终止CatLib框架 + /// + public static void Terminate() + { + Handler.Terminate(); + } + /// /// 注册服务提供者 /// @@ -359,7 +367,11 @@ public static bool HasBind(string service) /// 是否已经静态化 public static bool HasInstance() { +#if CATLIB_PERFORMANCE + return Facade.HasInstance || Handler.HasInstance(); +#else return Handler.HasInstance(); +#endif } /// @@ -654,9 +666,9 @@ public static string Type2Service(Type type) { return Handler.Type2Service(type); } - #endregion +#endregion - #region Container Extend API +#region Container Extend API /// /// 获取服务的绑定数据,如果绑定不存在则返回null /// @@ -1004,6 +1016,16 @@ public static void Unbind() Handler.Unbind(); } + /// + /// 为一个服务定义一个标记 + /// + /// 服务 + /// 标记名 + public static void Tag(string tag) + { + Handler.Tag(tag); + } + /// /// 静态化一个服务,实例值会经过解决修饰器 /// @@ -1023,6 +1045,16 @@ public static bool Release() return Handler.Release(); } + /// + /// 根据实例对象释放静态化实例 + /// + /// 需要释放静态化实例对象 + /// 只要有一个没有释放成功那么返回false + public static bool Release(params object[] instances) + { + return Handler.Release(instances); + } + /// /// 以依赖注入形式调用一个方法 /// @@ -1123,7 +1155,11 @@ public static Action Wrap(Action method, params /// 服务实例 public static TService Make(params object[] userParams) { +#if CATLIB_PERFORMANCE return Facade.Make(userParams); +#else + return Handler.Make(userParams); +#endif } /// @@ -1147,6 +1183,26 @@ public static Func Factory(params object[] userParams) return () => Make(userParams); } + /// + /// 当静态服务被释放时 + /// + /// 处理释放时的回调 + /// 当前容器实例 + public static IContainer OnRelease(Action callback) + { + return Handler.OnRelease(callback); + } + + /// + /// 当服务被解决时，生成的服务会经过注册的回调函数 + /// + /// 回调函数 + /// 当前容器对象 + public static IContainer OnResolving(Action callback) + { + return Handler.OnResolving(callback); + } + /// /// 关注指定的服务，当服务触发重定义时调用指定对象的指定方法 /// 调用是以依赖注入的形式进行的 @@ -1213,6 +1269,6 @@ public static string Type2Service() { return Handler.Type2Service(); } - #endregion +#endregion } } \ No newline at end of file diff --git a/src/CatLib.Core/CatLib/Application.cs b/src/CatLib.Core/CatLib/Application.cs index 9f93629..1d2f3b6 100644 --- a/src/CatLib.Core/CatLib/Application.cs +++ b/src/CatLib.Core/CatLib/Application.cs @@ -24,7 +24,7 @@ public class Application : Container, IApplication /// /// 版本号 /// - private readonly Version version = new Version("1.2.1"); + private readonly Version version = new Version("1.2.2"); /// /// 框架启动流程 @@ -55,6 +55,16 @@ public enum StartProcess /// 初始化完成 /// Inited = 4, + + /// + /// 框架终止之前 + /// + Terminate = 5, + + /// + /// 框架终止之后 + /// + Terminated = 6, } /// @@ -91,6 +101,7 @@ public StartProcess Process { return process; } + private set { process = value; } } /// @@ -143,13 +154,26 @@ public Application() DebugLevel = DebugLevels.Prod; } + /// + /// 终止CatLib框架 + /// + public virtual void Terminate() + { + Process = StartProcess.Terminate; + Trigger(ApplicationEvents.OnTerminate, this); + Flush(); + App.Handler = null; + Process = StartProcess.Terminated; + Trigger(ApplicationEvents.OnTerminated, this); + } + /// /// 引导程序 /// /// 引导程序 /// CatLib实例 /// 当引导类型为null时引发 - public void Bootstrap(params IBootstrap[] bootstraps) + public virtual void Bootstrap(params IBootstrap[] bootstraps) { Guard.Requires(bootstraps != null); @@ -158,7 +182,7 @@ public void Bootstrap(params IBootstrap[] bootstraps) return; } - process = StartProcess.Bootstrap; + Process = StartProcess.Bootstrap; var sorting = new SortSet(); @@ -175,7 +199,7 @@ public void Bootstrap(params IBootstrap[] bootstraps) } } - process = StartProcess.Bootstraped; + Process = StartProcess.Bootstraped; bootstrapped = true; Trigger(ApplicationEvents.OnBootstraped, this); } @@ -184,7 +208,7 @@ public void Bootstrap(params IBootstrap[] bootstraps) /// 初始化 /// /// 没有调用Bootstrap(...)就尝试初始化时触发 - public void Init() + public virtual void Init() { if (!bootstrapped) { @@ -196,7 +220,7 @@ public void Init() return; } - process = StartProcess.Initing; + Process = StartProcess.Initing; foreach (var provider in serviceProviders) { @@ -205,7 +229,7 @@ public void Init() } inited = true; - process = StartProcess.Inited; + Process = StartProcess.Inited; Trigger(ApplicationEvents.OnStartCompleted, this); } @@ -215,7 +239,7 @@ public void Init() /// /// 注册服务提供者 /// 服务提供者被重复注册时触发 - public void Register(IServiceProvider provider) + public virtual void Register(IServiceProvider provider) { Guard.Requires(provider != null); diff --git a/src/CatLib.Core/CatLib/ApplicationEvents.cs b/src/CatLib.Core/CatLib/ApplicationEvents.cs index 421b13c..12d9145 100644 --- a/src/CatLib.Core/CatLib/ApplicationEvents.cs +++ b/src/CatLib.Core/CatLib/ApplicationEvents.cs @@ -30,5 +30,15 @@ public sealed class ApplicationEvents /// 当程序启动完成 /// public static readonly string OnStartCompleted = "CatLib.ApplicationEvents.OnStartCompleted"; + + /// + /// 当程序终止之前 + /// + public static readonly string OnTerminate = "CatLib.ApplicationEvents.OnTerminate"; + + /// + /// 当程序终止之后 + /// + public static readonly string OnTerminated = "CatLib.ApplicationEvents.OnTerminated"; } } \ No newline at end of file diff --git a/src/CatLib.Core/CatLib/Facade.cs b/src/CatLib.Core/CatLib/Facade.cs index 3455bc9..eb486c4 100644 --- a/src/CatLib.Core/CatLib/Facade.cs +++ b/src/CatLib.Core/CatLib/Facade.cs @@ -65,6 +65,16 @@ public static TService Instance get { return Make(); } } + /// + /// 是否拥有门面实例 + /// 如果为非静态绑定那么永远返回false + /// 门面实例判断不能代替:Container.HasInstance + /// + internal static bool HasInstance + { + get { return binder != null && binder.IsStatic && !released && instance != null; } + } + /// /// 构建一个服务实例 /// @@ -72,12 +82,7 @@ public static TService Instance /// 服务实例 internal static TService Make(params object[] userParams) { - if (binder != null && binder.IsStatic && !released && instance != null) - { - return instance; - } - - return Resolve(userParams); + return HasInstance ? instance : Resolve(userParams); } /// diff --git a/src/CatLib.Core/CatLib/IApplication.cs b/src/CatLib.Core/CatLib/IApplication.cs index 24e9626..f0fa1cd 100644 --- a/src/CatLib.Core/CatLib/IApplication.cs +++ b/src/CatLib.Core/CatLib/IApplication.cs @@ -82,5 +82,10 @@ public interface IApplication : IContainer, IDispatcher /// 调试等级 /// DebugLevels DebugLevel { get; set; } + + /// + /// 终止CatLib框架 + /// + void Terminate(); } } diff --git a/src/CatLib.Core/Properties/AssemblyInfo.cs b/src/CatLib.Core/Properties/AssemblyInfo.cs index 3aa7d16..6d514b6 100644 --- a/src/CatLib.Core/Properties/AssemblyInfo.cs +++ b/src/CatLib.Core/Properties/AssemblyInfo.cs @@ -26,8 +26,8 @@ [assembly: Guid("4204658e-81fd-4106-a347-890cd369c8a4")] -[assembly: AssemblyVersion("1.2.1.0")] -[assembly: AssemblyFileVersion("1.2.1.0")] +[assembly: AssemblyVersion("1.2.2.0")] +[assembly: AssemblyFileVersion("1.2.2.0")] [assembly: InternalsVisibleTo("Assembly-CSharp-Editor"), InternalsVisibleTo("Assembly-CSharp-Editor-firstpass"), diff --git a/src/CatLib.Core/Support/Container/BindDataExtend.cs b/src/CatLib.Core/Support/Container/BindDataExtend.cs new file mode 100644 index 0000000..5ea0efc --- /dev/null +++ b/src/CatLib.Core/Support/Container/BindDataExtend.cs @@ -0,0 +1,67 @@ +/* + * This file is part of the CatLib package. + * + * (c) Yu Bin + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * Document: http://catlib.io/ + */ + +using System; + +namespace CatLib +{ + /// + /// 绑定数据拓展 + /// + public static class BindDataExtend + { + /// + /// 解决服务时触发的回调 + /// + /// 绑定数据 + /// 解决事件 + /// 服务绑定数据 + public static IBindData OnResolving(this IBindData bindData, Action action) + { + Guard.Requires(action != null); + return bindData.OnResolving((_, instance) => + { + action(instance); + return instance; + }); + } + + /// + /// 当静态服务被释放时 + /// + /// 绑定数据 + /// 处理事件 + /// 服务绑定数据 + public static IBindData OnRelease(this IBindData bindData, Action action) + { + Guard.Requires(action != null); + return bindData.OnRelease((_, instance) => + { + action(instance); + }); + } + + /// + /// 当静态服务被释放时 + /// + /// 绑定数据 + /// 处理事件 + /// 服务绑定数据 + public static IBindData OnRelease(this IBindData bindData, Action action) + { + Guard.Requires(action != null); + return bindData.OnRelease((_, __) => + { + action(); + }); + } + } +} diff --git a/src/CatLib.Core/Support/Container/ContainerExtend.cs b/src/CatLib.Core/Support/Container/ContainerExtend.cs index 3c7d923..321c754 100644 --- a/src/CatLib.Core/Support/Container/ContainerExtend.cs +++ b/src/CatLib.Core/Support/Container/ContainerExtend.cs @@ -456,6 +456,17 @@ public static void Unbind(this IContainer container) container.Unbind(container.Type2Service(typeof(TService))); } + /// + /// 为一个服务定义一个标记 + /// + /// 服务 + /// 服务容器 + /// 标记名 + public static void Tag(this IContainer container, string tag) + { + container.Tag(tag, container.Type2Service(typeof(TService))); + } + /// /// 静态化一个服务,实例值会经过解决修饰器 /// @@ -477,6 +488,36 @@ public static bool Release(this IContainer container) return container.Release(container.Type2Service(typeof(TService))); } + /// + /// 根据实例对象释放静态化实例 + /// + /// 服务容器 + /// 需要释放静态化实例对象 + /// 只要有一个没有释放成功那么返回false + public static bool Release(this IContainer container, params object[] instances) + { + var released = true; + if (instances == null) + { + return released; + } + + foreach (var instance in instances) + { + if (instance == null) + { + continue; + } + + if (!container.Release(container.Type2Service(instance.GetType()))) + { + released = false; + } + } + + return released; + } + /// /// 以依赖注入的形式调用一个方法 /// @@ -650,6 +691,34 @@ public static Func Factory(this IContainer container, params return () => (TService)container.Make(container.Type2Service(typeof(TService)), userParams); } + /// + /// 当静态服务被释放时 + /// + /// 服务容器 + /// 处理释放时的回调 + /// 当前容器实例 + public static IContainer OnRelease(this IContainer container, Action callback) + { + Guard.Requires(callback != null); + return container.OnRelease((_, instance) => callback(instance)); + } + + /// + /// 当服务被解决时，生成的服务会经过注册的回调函数 + /// + /// 服务容器 + /// 回调函数 + /// 当前容器对象 + public static IContainer OnResolving(this IContainer container, Action callback) + { + Guard.Requires(callback != null); + return container.OnResolving((_, instance) => + { + callback(instance); + return instance; + }); + } + /// /// 关注指定的服务，当服务触发重定义时调用指定对象的指定方法 /// 调用是以依赖注入的形式进行的