#279, #295 仍有问题，重构 (#306)

PurplestViper · web-flow · commit cddd61616941 · 2023-05-23T17:38:38.000+08:00
diff --git a/src/AspectCore.Abstractions/DynamicProxy/AspectExceptionWrapper.cs b/src/AspectCore.Abstractions/DynamicProxy/AspectExceptionWrapper.cs
diff --git a/src/AspectCore.Abstractions/DynamicProxy/AspectInvalidCastException.cs b/src/AspectCore.Abstractions/DynamicProxy/AspectInvalidCastException.cs
@@ -0,0 +1,7 @@
+﻿namespace AspectCore.DynamicProxy
+{
+    public class AspectInvalidCastException : AspectInvocationException
+    {
+        public AspectInvalidCastException(AspectContext aspectContext, string message) : base(aspectContext, message) { }
+    }
+}
diff --git a/src/AspectCore.Abstractions/DynamicProxy/AspectInvalidOperationException.cs b/src/AspectCore.Abstractions/DynamicProxy/AspectInvalidOperationException.cs
@@ -0,0 +1,7 @@
+﻿namespace AspectCore.DynamicProxy
+{
+    public class AspectInvalidOperationException : AspectInvocationException
+    {
+        public AspectInvalidOperationException(AspectContext aspectContext, string message) : base(aspectContext, message) { }
+    }
+}
diff --git a/src/AspectCore.Abstractions/DynamicProxy/AspectInvocationException.cs b/src/AspectCore.Abstractions/DynamicProxy/AspectInvocationException.cs
@@ -6,8 +6,12 @@ public class AspectInvocationException : Exception
     {
         public AspectContext AspectContext { get; }
 
+        public AspectInvocationException(AspectContext aspectContext, string message) : this(aspectContext, message, null) { }
+
         public AspectInvocationException(AspectContext aspectContext, Exception innerException)
-            : base($"Exception has been thrown by the aspect of an invocation. ---> {innerException?.Message}.", innerException)
+            : this(aspectContext, $"Exception has been thrown by the aspect of an invocation. ---> {innerException?.Message}.", innerException) { }
+
+        public AspectInvocationException(AspectContext aspectContext, string message, Exception innerException) : base(message, innerException)
         {
             AspectContext = aspectContext;
         }
diff --git a/src/AspectCore.Abstractions/DynamicProxy/IAspectExceptionWrapper.cs b/src/AspectCore.Abstractions/DynamicProxy/IAspectExceptionWrapper.cs
diff --git a/src/AspectCore.Core/DependencyInjection/ServiceContext.cs b/src/AspectCore.Core/DependencyInjection/ServiceContext.cs
@@ -1,10 +1,10 @@
-﻿using System;
+﻿using AspectCore.Configuration;
+using AspectCore.DynamicProxy;
+using AspectCore.DynamicProxy.Parameters;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using AspectCore.Configuration;
-using AspectCore.DynamicProxy;
-using AspectCore.DynamicProxy.Parameters;
 
 namespace AspectCore.DependencyInjection
 {
@@ -99,8 +99,6 @@ private void AddInternalServices()
                 Scopeds.AddType<IParameterInterceptorSelector, ParameterInterceptorSelector>();
             if (!Contains(typeof(IAspectCachingProvider)))
                 Singletons.AddType<IAspectCachingProvider, AspectCachingProvider>();
-            if (!Contains(typeof(IAspectExceptionWrapper)))
-                Transients.AddType<IAspectExceptionWrapper, AspectExceptionWrapper>();
         }
 
         public int Count => _collection.Count;
diff --git a/src/AspectCore.Core/DynamicProxy/AspectActivator.cs b/src/AspectCore.Core/DynamicProxy/AspectActivator.cs
@@ -1,5 +1,7 @@
-﻿using AspectCore.Core.Utils;
+﻿using AspectCore.Configuration;
+using AspectCore.Core.Utils;
 using System;
+using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
 
 namespace AspectCore.DynamicProxy
@@ -9,14 +11,13 @@ internal sealed class AspectActivator : IAspectActivator
     {
         private readonly IAspectContextFactory _aspectContextFactory;
         private readonly IAspectBuilderFactory _aspectBuilderFactory;
-        private readonly IAspectExceptionWrapper _aspectExceptionWrapper;
+        private readonly IAspectConfiguration _aspectConfiguration;
 
-        public AspectActivator(IAspectContextFactory aspectContextFactory, IAspectBuilderFactory aspectBuilderFactory,
-            IAspectExceptionWrapper aspectExceptionWrapper)
+        public AspectActivator(IAspectContextFactory aspectContextFactory, IAspectBuilderFactory aspectBuilderFactory, IAspectConfiguration aspectConfiguration)
         {
             _aspectContextFactory = aspectContextFactory;
             _aspectBuilderFactory = aspectBuilderFactory;
-            _aspectExceptionWrapper = aspectExceptionWrapper;
+            _aspectConfiguration = aspectConfiguration;
         }
 
         public TResult Invoke<TResult>(AspectActivatorContext activatorContext)
@@ -28,8 +29,7 @@ public TResult Invoke<TResult>(AspectActivatorContext activatorContext)
                 var task = aspectBuilder.Build()(context);
                 if (task.IsFaulted)
                 {
-                    _aspectExceptionWrapper.Wrap(context, task.Exception.InnerException);
-                    return default;
+                    ExceptionDispatchInfo.Capture(task.Exception.InnerException).Throw();
                 }
                 if (!task.IsCompleted)
                 {
@@ -42,12 +42,13 @@ public TResult Invoke<TResult>(AspectActivatorContext activatorContext)
             }
             catch (Exception ex)
             {
-                _aspectExceptionWrapper.Wrap(context, ex);
-                return default;
+                if (!_aspectConfiguration.ThrowAspectException || ex is AspectInvocationException _)
+                    throw;
+
+                throw new AspectInvocationException(context, ex);
             }
             finally
             {
-                _aspectExceptionWrapper.ThrowIfFailed();
                 _aspectContextFactory.ReleaseContext(context);
             }
         }
@@ -62,8 +63,7 @@ public async Task<TResult> InvokeTask<TResult>(AspectActivatorContext activatorC
 
                 if (invoke.IsFaulted)
                 {
-                    _aspectExceptionWrapper.Wrap(context, invoke.Exception.InnerException);
-                    return default;
+                    ExceptionDispatchInfo.Capture(invoke.Exception.InnerException).Throw();
                 }
 
                 if (!invoke.IsCompleted)
@@ -80,19 +80,18 @@ public async Task<TResult> InvokeTask<TResult>(AspectActivatorContext activatorC
                     case Task _:
                         return default;
                     default:
-                        _aspectExceptionWrapper.Wrap(context, new InvalidCastException(
-                            $"Unable to cast object of type '{context.ReturnValue.GetType()}' to type '{typeof(Task<TResult>)}'."));
-                        return default;
+                        throw new AspectInvalidCastException(context, $"Unable to cast object of type '{context.ReturnValue.GetType()}' to type '{typeof(Task<TResult>)}'.");
                 }
             }
             catch (Exception ex)
             {
-                _aspectExceptionWrapper.Wrap(context, ex);
-                return default;
+                if (!_aspectConfiguration.ThrowAspectException || ex is AspectInvocationException _) 
+                    throw;
+
+                throw new AspectInvocationException(context, ex);
             }
             finally
             {
-                _aspectExceptionWrapper.ThrowIfFailed();
                 _aspectContextFactory.ReleaseContext(context);
             }
         }
@@ -107,8 +106,7 @@ public async ValueTask<TResult> InvokeValueTask<TResult>(AspectActivatorContext
                 
                 if (invoke.IsFaulted)
                 {
-                    _aspectExceptionWrapper.Wrap(context, invoke.Exception.InnerException);
-                    return default;
+                    ExceptionDispatchInfo.Capture(invoke.Exception.InnerException).Throw();
                 }
                 
                 if (!invoke.IsCompleted)
@@ -125,19 +123,18 @@ public async ValueTask<TResult> InvokeValueTask<TResult>(AspectActivatorContext
                     case ValueTask task:
                         return default;
                     default:
-                        _aspectExceptionWrapper.Wrap(context, new InvalidCastException(
-                            $"Unable to cast object of type '{context.ReturnValue.GetType()}' to type '{typeof(ValueTask<TResult>)}'."));
-                        return default;
+                        throw new AspectInvalidCastException(context, $"Unable to cast object of type '{context.ReturnValue.GetType()}' to type '{typeof(ValueTask<TResult>)}'.");
                 }
             }
             catch (Exception ex)
             {
-                _aspectExceptionWrapper.Wrap(context, ex);
-                return default;
+                if (!_aspectConfiguration.ThrowAspectException || ex is AspectInvocationException _)
+                    throw;
+
+                throw new AspectInvocationException(context, ex);
             }
             finally
             {
-                _aspectExceptionWrapper.ThrowIfFailed();
                 _aspectContextFactory.ReleaseContext(context);
             }
         }
diff --git a/src/AspectCore.Core/DynamicProxy/AspectActivatorFactory.cs b/src/AspectCore.Core/DynamicProxy/AspectActivatorFactory.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using AspectCore.Configuration;
+using System;
 
 namespace AspectCore.DynamicProxy
 {
@@ -7,18 +8,18 @@ public sealed class AspectActivatorFactory : IAspectActivatorFactory
     {
         private readonly IAspectContextFactory _aspectContextFactory;
         private readonly IAspectBuilderFactory _aspectBuilderFactory;
-        private readonly IAspectExceptionWrapper _aspectExceptionWrapper;
+        private readonly IAspectConfiguration _aspectConfiguration;
 
-        public AspectActivatorFactory(IAspectContextFactory aspectContextFactory, IAspectBuilderFactory aspectBuilderFactory, IAspectExceptionWrapper aspectExceptionWrapper)
+        public AspectActivatorFactory(IAspectContextFactory aspectContextFactory, IAspectBuilderFactory aspectBuilderFactory, IAspectConfiguration aspectConfiguration)
         {
             _aspectContextFactory = aspectContextFactory ?? throw new ArgumentNullException(nameof(aspectContextFactory));
             _aspectBuilderFactory = aspectBuilderFactory ?? throw new ArgumentNullException(nameof(aspectBuilderFactory));
-            _aspectExceptionWrapper = aspectExceptionWrapper ?? throw new ArgumentNullException(nameof(aspectExceptionWrapper));
+            _aspectConfiguration = aspectConfiguration ?? throw new ArgumentNullException(nameof(aspectConfiguration));
         }
 
         public IAspectActivator Create()
         {
-            return new AspectActivator(_aspectContextFactory, _aspectBuilderFactory, _aspectExceptionWrapper);
+            return new AspectActivator(_aspectContextFactory, _aspectBuilderFactory, _aspectConfiguration);
         }
     }
 }
diff --git a/src/AspectCore.Core/DynamicProxy/Extensions/AspectContextRuntimeExtensions.cs b/src/AspectCore.Core/DynamicProxy/Extensions/AspectContextRuntimeExtensions.cs
@@ -82,7 +82,7 @@ public static Task<object> UnwrapAsyncReturnValue(this AspectContext aspectConte
 
             if (!aspectContext.IsAsync())
             {
-                throw new AspectInvocationException(aspectContext, new InvalidOperationException("This operation only support asynchronous method."));
+                throw new AspectInvalidOperationException(aspectContext, "This operation only support asynchronous method.");
             }
 
             var returnValue = aspectContext.ReturnValue;
diff --git a/src/AspectCore.Extensions.Autofac/ContainerBuilderExtensions.cs b/src/AspectCore.Extensions.Autofac/ContainerBuilderExtensions.cs
@@ -1,18 +1,11 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using AspectCore.Configuration;
+﻿using AspectCore.Configuration;
+using AspectCore.DependencyInjection;
 using AspectCore.DynamicProxy;
 using AspectCore.DynamicProxy.Parameters;
-using AspectCore.DependencyInjection;
 using Autofac;
-using Autofac.Core;
-using Autofac.Core.Activators;
-using Autofac.Core.Activators.Delegate;
-using Autofac.Core.Activators.Reflection;
 using Autofac.Core.Resolving.Pipeline;
-using AParameter = Autofac.Core.Parameter;
+using System;
+using System.Linq;
 
 namespace AspectCore.Extensions.Autofac
 {
@@ -58,7 +51,6 @@ public static ContainerBuilder RegisterDynamicProxy(this ContainerBuilder contai
             containerBuilder.RegisterType<AspectBuilderFactory>().As<IAspectBuilderFactory>().SingleInstance();
             containerBuilder.RegisterType<ProxyTypeGenerator>().As<IProxyTypeGenerator>().SingleInstance();
             containerBuilder.RegisterType<AspectCachingProvider>().As<IAspectCachingProvider>().SingleInstance();
-            containerBuilder.RegisterType<AspectExceptionWrapper>().As<IAspectExceptionWrapper>().InstancePerDependency();
 
             //全局注册中间件
             containerBuilder.ComponentRegistryBuilder.Registered += (sender, args) =>
diff --git a/src/AspectCore.Extensions.DependencyInjection/ServiceCollectionExtensions.cs b/src/AspectCore.Extensions.DependencyInjection/ServiceCollectionExtensions.cs
@@ -1,11 +1,11 @@
-﻿using System;
-using System.Linq;
-using AspectCore.Configuration;
+﻿using AspectCore.Configuration;
+using AspectCore.DependencyInjection;
 using AspectCore.DynamicProxy;
 using AspectCore.DynamicProxy.Parameters;
-using AspectCore.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using System;
+using System.Linq;
 
 namespace AspectCore.Extensions.DependencyInjection
 {
@@ -59,7 +59,6 @@ internal static IServiceCollection TryAddDynamicProxyServices(this IServiceColle
             services.TryAddSingleton<IAspectBuilderFactory, AspectBuilderFactory>();
             services.TryAddSingleton<IProxyTypeGenerator, ProxyTypeGenerator>();
             services.TryAddSingleton<IAspectCachingProvider, AspectCachingProvider>();
-            services.TryAddTransient<IAspectExceptionWrapper, AspectExceptionWrapper>();
 
             services.AddSingleton<IInterceptorSelector, ConfigureInterceptorSelector>();
             services.AddSingleton<IInterceptorSelector, AttributeInterceptorSelector>();
diff --git a/src/AspectCore.Extensions.LightInject/ContainerBuilderExtensions.cs b/src/AspectCore.Extensions.LightInject/ContainerBuilderExtensions.cs
@@ -1,12 +1,11 @@
-﻿using System;
-using System.Collections.Concurrent;
-using System.Linq;
-using System.Reflection;
-using AspectCore.Configuration;
+﻿using AspectCore.Configuration;
 using AspectCore.DependencyInjection;
 using AspectCore.DynamicProxy;
 using AspectCore.DynamicProxy.Parameters;
 using LightInject;
+using System;
+using System.Linq;
+using System.Reflection;
 using IServiceContainer = LightInject.IServiceContainer;
 
 namespace AspectCore.Extensions.LightInject
@@ -72,8 +71,7 @@ public static IServiceContainer RegisterDynamicProxy(this IServiceContainer cont
                 .AddSingleton<IAspectValidatorBuilder, AspectValidatorBuilder>()
                 .AddSingleton<IAspectBuilderFactory, AspectBuilderFactory>()
                 .AddSingleton<IProxyTypeGenerator, ProxyTypeGenerator>()
-                .AddSingleton<IAspectCachingProvider, AspectCachingProvider>()
-                .AddTransient(typeof(IAspectExceptionWrapper), typeof(AspectExceptionWrapper));
+                .AddSingleton<IAspectCachingProvider, AspectCachingProvider>();
 
             var aspectValidator = new AspectValidatorBuilder(aspectConfig).Build();
             container.Decorate(aspectValidator.CreateDecorator());
diff --git a/src/AspectCore.Extensions.Windsor/AspectCoreFacility.cs b/src/AspectCore.Extensions.Windsor/AspectCoreFacility.cs
@@ -1,13 +1,13 @@
-﻿using System;
-using System.Linq;
-using AspectCore.Configuration;
+﻿using AspectCore.Configuration;
+using AspectCore.DependencyInjection;
 using AspectCore.DynamicProxy;
 using AspectCore.DynamicProxy.Parameters;
-using AspectCore.DependencyInjection;
 using Castle.Core;
 using Castle.Core.Configuration;
 using Castle.MicroKernel;
 using Castle.MicroKernel.Registration;
+using System;
+using System.Linq;
 
 namespace AspectCore.Extensions.Windsor
 {
@@ -36,7 +36,6 @@ public void Init(IKernel kernel, IConfiguration facilityConfig)
                 Component.For<IInterceptorCollector>().ImplementedBy<InterceptorCollector>().LifestyleSingleton(),
                 Component.For<IAspectContextFactory>().ImplementedBy<AspectContextFactory>().LifestyleSingleton(),
                 Component.For<IAspectCachingProvider>().ImplementedBy<AspectCachingProvider>().LifestyleSingleton(),
-                Component.For<IAspectExceptionWrapper>().ImplementedBy<AspectExceptionWrapper>().LifestyleTransient(),
                 Component.For<IAspectActivatorFactory>().ImplementedBy<AspectActivatorFactory>().LifestyleSingleton(),
                 Component.For<IAspectValidatorBuilder>().ImplementedBy<AspectValidatorBuilder>().LifestyleSingleton(),
                 Component.For<IPropertyInjectorFactory>().ImplementedBy<PropertyInjectorFactory>().LifestyleSingleton(),
diff --git a/src/AspectCore.Extensions.Windsor/DynamicProxyInterceptor.cs b/src/AspectCore.Extensions.Windsor/DynamicProxyInterceptor.cs
diff --git a/tests/AspectCore.Tests/DynamicProxy/ThrowExceptionDirectlyTests.cs b/tests/AspectCore.Tests/DynamicProxy/ThrowExceptionDirectlyTests.cs

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,12 @@ public class AspectInvocationException : Exception`
`6`	`6`	`{`
`7`	`7`	`public AspectContext AspectContext { get; }`
`8`	`8`
	`9`	`+ public AspectInvocationException(AspectContext aspectContext, string message) : this(aspectContext, message, null) { }`
	`10`	`+`
`9`	`11`	`public AspectInvocationException(AspectContext aspectContext, Exception innerException)`
`10`		`- : base($"Exception has been thrown by the aspect of an invocation. ---> {innerException?.Message}.", innerException)`
	`12`	`+ : this(aspectContext, $"Exception has been thrown by the aspect of an invocation. ---> {innerException?.Message}.", innerException) { }`
	`13`	`+`
	`14`	`+ public AspectInvocationException(AspectContext aspectContext, string message, Exception innerException) : base(message, innerException)`
`11`	`15`	`{`
`12`	`16`	`AspectContext = aspectContext;`
`13`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`		`-using AspectCore.Core.Utils;`
	`1`	`+using AspectCore.Configuration;`
	`2`	`+using AspectCore.Core.Utils;`
`2`	`3`	`using System;`
	`4`	`+using System.Runtime.ExceptionServices;`
`3`	`5`	`using System.Threading.Tasks;`
`4`	`6`
`5`	`7`	`namespace AspectCore.DynamicProxy`
`@@ -9,14 +11,13 @@ internal sealed class AspectActivator : IAspectActivator`
`9`	`11`	`{`
`10`	`12`	`private readonly IAspectContextFactory _aspectContextFactory;`
`11`	`13`	`private readonly IAspectBuilderFactory _aspectBuilderFactory;`
`12`		`- private readonly IAspectExceptionWrapper _aspectExceptionWrapper;`
	`14`	`+ private readonly IAspectConfiguration _aspectConfiguration;`
`13`	`15`
`14`		`- public AspectActivator(IAspectContextFactory aspectContextFactory, IAspectBuilderFactory aspectBuilderFactory,`
`15`		`- IAspectExceptionWrapper aspectExceptionWrapper)`
	`16`	`+ public AspectActivator(IAspectContextFactory aspectContextFactory, IAspectBuilderFactory aspectBuilderFactory, IAspectConfiguration aspectConfiguration)`
`16`	`17`	`{`
`17`	`18`	`_aspectContextFactory = aspectContextFactory;`
`18`	`19`	`_aspectBuilderFactory = aspectBuilderFactory;`
`19`		`- _aspectExceptionWrapper = aspectExceptionWrapper;`
	`20`	`+ _aspectConfiguration = aspectConfiguration;`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`public TResult Invoke<TResult>(AspectActivatorContext activatorContext)`
`@@ -28,8 +29,7 @@ public TResult Invoke<TResult>(AspectActivatorContext activatorContext)`
`28`	`29`	`var task = aspectBuilder.Build()(context);`
`29`	`30`	`if (task.IsFaulted)`
`30`	`31`	`{`
`31`		`- _aspectExceptionWrapper.Wrap(context, task.Exception.InnerException);`
`32`		`- return default;`
	`32`	`+ ExceptionDispatchInfo.Capture(task.Exception.InnerException).Throw();`
`33`	`33`	`}`
`34`	`34`	`if (!task.IsCompleted)`
`35`	`35`	`{`
`@@ -42,12 +42,13 @@ public TResult Invoke<TResult>(AspectActivatorContext activatorContext)`
`42`	`42`	`}`
`43`	`43`	`catch (Exception ex)`
`44`	`44`	`{`
`45`		`- _aspectExceptionWrapper.Wrap(context, ex);`
`46`		`- return default;`
	`45`	`+ if (!_aspectConfiguration.ThrowAspectException \|\| ex is AspectInvocationException _)`
	`46`	`+ throw;`
	`47`	`+`
	`48`	`+ throw new AspectInvocationException(context, ex);`
`47`	`49`	`}`
`48`	`50`	`finally`
`49`	`51`	`{`
`50`		`- _aspectExceptionWrapper.ThrowIfFailed();`
`51`	`52`	`_aspectContextFactory.ReleaseContext(context);`
`52`	`53`	`}`
`53`	`54`	`}`
`@@ -62,8 +63,7 @@ public async Task<TResult> InvokeTask<TResult>(AspectActivatorContext activatorC`
`62`	`63`
`63`	`64`	`if (invoke.IsFaulted)`
`64`	`65`	`{`
`65`		`- _aspectExceptionWrapper.Wrap(context, invoke.Exception.InnerException);`
`66`		`- return default;`
	`66`	`+ ExceptionDispatchInfo.Capture(invoke.Exception.InnerException).Throw();`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`if (!invoke.IsCompleted)`
`@@ -80,19 +80,18 @@ public async Task<TResult> InvokeTask<TResult>(AspectActivatorContext activatorC`
`80`	`80`	`case Task _:`
`81`	`81`	`return default;`
`82`	`82`	`default:`
`83`		`- _aspectExceptionWrapper.Wrap(context, new InvalidCastException(`
`84`		`- $"Unable to cast object of type '{context.ReturnValue.GetType()}' to type '{typeof(Task<TResult>)}'."));`
`85`		`- return default;`
	`83`	`+ throw new AspectInvalidCastException(context, $"Unable to cast object of type '{context.ReturnValue.GetType()}' to type '{typeof(Task<TResult>)}'.");`
`86`	`84`	`}`
`87`	`85`	`}`
`88`	`86`	`catch (Exception ex)`
`89`	`87`	`{`
`90`		`- _aspectExceptionWrapper.Wrap(context, ex);`
`91`		`- return default;`
	`88`	`+ if (!_aspectConfiguration.ThrowAspectException \|\| ex is AspectInvocationException _)`
	`89`	`+ throw;`
	`90`	`+`
	`91`	`+ throw new AspectInvocationException(context, ex);`
`92`	`92`	`}`
`93`	`93`	`finally`
`94`	`94`	`{`
`95`		`- _aspectExceptionWrapper.ThrowIfFailed();`
`96`	`95`	`_aspectContextFactory.ReleaseContext(context);`
`97`	`96`	`}`
`98`	`97`	`}`
`@@ -107,8 +106,7 @@ public async ValueTask<TResult> InvokeValueTask<TResult>(AspectActivatorContext`
`107`	`106`
`108`	`107`	`if (invoke.IsFaulted)`
`109`	`108`	`{`
`110`		`- _aspectExceptionWrapper.Wrap(context, invoke.Exception.InnerException);`
`111`		`- return default;`
	`109`	`+ ExceptionDispatchInfo.Capture(invoke.Exception.InnerException).Throw();`
`112`	`110`	`}`
`113`	`111`
`114`	`112`	`if (!invoke.IsCompleted)`
`@@ -125,19 +123,18 @@ public async ValueTask<TResult> InvokeValueTask<TResult>(AspectActivatorContext`
`125`	`123`	`case ValueTask task:`
`126`	`124`	`return default;`
`127`	`125`	`default:`
`128`		`- _aspectExceptionWrapper.Wrap(context, new InvalidCastException(`
`129`		`- $"Unable to cast object of type '{context.ReturnValue.GetType()}' to type '{typeof(ValueTask<TResult>)}'."));`
`130`		`- return default;`
	`126`	`+ throw new AspectInvalidCastException(context, $"Unable to cast object of type '{context.ReturnValue.GetType()}' to type '{typeof(ValueTask<TResult>)}'.");`
`131`	`127`	`}`
`132`	`128`	`}`
`133`	`129`	`catch (Exception ex)`
`134`	`130`	`{`
`135`		`- _aspectExceptionWrapper.Wrap(context, ex);`
`136`		`- return default;`
	`131`	`+ if (!_aspectConfiguration.ThrowAspectException \|\| ex is AspectInvocationException _)`
	`132`	`+ throw;`
	`133`	`+`
	`134`	`+ throw new AspectInvocationException(context, ex);`
`137`	`135`	`}`
`138`	`136`	`finally`
`139`	`137`	`{`
`140`		`- _aspectExceptionWrapper.ThrowIfFailed();`
`141`	`138`	`_aspectContextFactory.ReleaseContext(context);`
`142`	`139`	`}`
`143`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System;`
	`1`	`+using AspectCore.Configuration;`
	`2`	`+using System;`
`2`	`3`
`3`	`4`	`namespace AspectCore.DynamicProxy`
`4`	`5`	`{`
`@@ -7,18 +8,18 @@ public sealed class AspectActivatorFactory : IAspectActivatorFactory`
`7`	`8`	`{`
`8`	`9`	`private readonly IAspectContextFactory _aspectContextFactory;`
`9`	`10`	`private readonly IAspectBuilderFactory _aspectBuilderFactory;`
`10`		`- private readonly IAspectExceptionWrapper _aspectExceptionWrapper;`
	`11`	`+ private readonly IAspectConfiguration _aspectConfiguration;`
`11`	`12`
`12`		`- public AspectActivatorFactory(IAspectContextFactory aspectContextFactory, IAspectBuilderFactory aspectBuilderFactory, IAspectExceptionWrapper aspectExceptionWrapper)`
	`13`	`+ public AspectActivatorFactory(IAspectContextFactory aspectContextFactory, IAspectBuilderFactory aspectBuilderFactory, IAspectConfiguration aspectConfiguration)`
`13`	`14`	`{`
`14`	`15`	`_aspectContextFactory = aspectContextFactory ?? throw new ArgumentNullException(nameof(aspectContextFactory));`
`15`	`16`	`_aspectBuilderFactory = aspectBuilderFactory ?? throw new ArgumentNullException(nameof(aspectBuilderFactory));`
`16`		`- _aspectExceptionWrapper = aspectExceptionWrapper ?? throw new ArgumentNullException(nameof(aspectExceptionWrapper));`
	`17`	`+ _aspectConfiguration = aspectConfiguration ?? throw new ArgumentNullException(nameof(aspectConfiguration));`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`public IAspectActivator Create()`
`20`	`21`	`{`
`21`		`- return new AspectActivator(_aspectContextFactory, _aspectBuilderFactory, _aspectExceptionWrapper);`
	`22`	`+ return new AspectActivator(_aspectContextFactory, _aspectBuilderFactory, _aspectConfiguration);`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public static Task<object> UnwrapAsyncReturnValue(this AspectContext aspectConte`
`82`	`82`
`83`	`83`	`if (!aspectContext.IsAsync())`
`84`	`84`	`{`
`85`		`- throw new AspectInvocationException(aspectContext, new InvalidOperationException("This operation only support asynchronous method."));`
	`85`	`+ throw new AspectInvalidOperationException(aspectContext, "This operation only support asynchronous method.");`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`var returnValue = aspectContext.ReturnValue;`