Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow async/await when intercepting synchronous methods #27

Closed
wants to merge 8 commits into from
Closed

Allow async/await when intercepting synchronous methods #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
32ae7ab
Fix issue 25
ndrwrbgs Nov 5, 2017
1e3ca2c
Make things async
JSkimming Nov 5, 2017
f7c83f4
SAVEPOINT [skip ci]
JSkimming Nov 5, 2017
fba6d5c
Use a local function for wrapping proceed
JSkimming Nov 11, 2017
83018c8
Wrap InterceptAsync when intercepting synchronous methods
JSkimming Nov 12, 2017
7dbd2cd
SAVEPOINT [skip ci]
JSkimming Nov 5, 2017
a9c20ff
Merge branch 'fixIssue25' into async-with-sync
JSkimming Nov 12, 2017
021d26b
More hacking [skip ci]
JSkimming Nov 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion castle.core.asyncinterceptor.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.3
VisualStudioVersion = 15.0.27004.2006
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F820D2E2-6C9C-4165-9C13-C77B2737A5AC}"
EndProject
Expand All @@ -11,6 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CE54F76E-8
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Core.AsyncInterceptor.Tests", "test\Castle.Core.AsyncInterceptor.Tests\Castle.Core.AsyncInterceptor.Tests.csproj", "{25AAC675-D2A0-4D20-97C8-FF1E28307E6E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Core", "..\Core\src\Castle.Core\Castle.Core.csproj", "{DA7FD5D8-6394-4650-9095-A3EEF700B9C8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -25,12 +27,20 @@ Global
{25AAC675-D2A0-4D20-97C8-FF1E28307E6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25AAC675-D2A0-4D20-97C8-FF1E28307E6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25AAC675-D2A0-4D20-97C8-FF1E28307E6E}.Release|Any CPU.Build.0 = Release|Any CPU
{DA7FD5D8-6394-4650-9095-A3EEF700B9C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA7FD5D8-6394-4650-9095-A3EEF700B9C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA7FD5D8-6394-4650-9095-A3EEF700B9C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DA7FD5D8-6394-4650-9095-A3EEF700B9C8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{51BA6816-5FDB-4AE7-A473-4C5CF1C1FAF4} = {F820D2E2-6C9C-4165-9C13-C77B2737A5AC}
{25AAC675-D2A0-4D20-97C8-FF1E28307E6E} = {CE54F76E-8913-4BBA-ADF3-A50777F55419}
{DA7FD5D8-6394-4650-9095-A3EEF700B9C8} = {F820D2E2-6C9C-4165-9C13-C77B2737A5AC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7A10CB6D-F097-4F45-8CCA-FCBA06750817}
EndGlobalSection
EndGlobal
1 change: 0 additions & 1 deletion src/Castle.Core.AsyncInterceptor/AsyncDeterminationInterceptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ private enum MethodType
/// Intercepts a method <paramref name="invocation"/>.
/// </summary>
/// <param name="invocation">The method invocation.</param>
[DebuggerStepThrough]
public virtual void Intercept(IInvocation invocation)
{
MethodType methodType = GetMethodType(invocation.Method.ReturnType);
Expand Down
88 changes: 82 additions & 6 deletions src/Castle.Core.AsyncInterceptor/AsyncInterceptorBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void IAsyncInterceptor.InterceptSynchronous(IInvocation invocation)
/// <param name="invocation">The method invocation.</param>
void IAsyncInterceptor.InterceptAsynchronous(IInvocation invocation)
{
invocation.ReturnValue = InterceptAsync(invocation, ProceedAsynchronous);
invocation.ReturnValue = InterceptAsyncWrapper(invocation, ProceedAsynchronous);
}

/// <summary>
Expand All @@ -60,7 +60,7 @@ void IAsyncInterceptor.InterceptAsynchronous(IInvocation invocation)
/// <param name="invocation">The method invocation.</param>
void IAsyncInterceptor.InterceptAsynchronous<TResult>(IInvocation invocation)
{
invocation.ReturnValue = InterceptAsync(invocation, ProceedAsynchronous<TResult>);
invocation.ReturnValue = InterceptAsyncWrapper(invocation, ProceedAsynchronous<TResult>);
}

/// <summary>
Expand Down Expand Up @@ -90,12 +90,22 @@ private static GenericSynchronousHandler CreateHandler(Type returnType)

private static void InterceptSynchronousVoid(AsyncInterceptorBase me, IInvocation invocation)
{
Task task = me.InterceptAsync(invocation, ProceedSynchronous);
Task task = me.InterceptAsyncWrapper(invocation, ProceedSynchronous);

// If the intercept task has yet to complete, wait for it.
if (!task.IsCompleted)
{
Task.Run(() => task).Wait();
try
{
bool completed = Task.Run(async () => await task.ConfigureAwait(false)).Wait(2000);
if (!completed)
{
throw new Exception("I got sick of waiting 1.");
}
}
catch (AggregateException)
{
}
}

if (task.IsFaulted)
Expand All @@ -106,12 +116,22 @@ private static void InterceptSynchronousVoid(AsyncInterceptorBase me, IInvocatio

private static void InterceptSynchronousResult<TResult>(AsyncInterceptorBase me, IInvocation invocation)
{
Task task = me.InterceptAsync(invocation, ProceedSynchronous<TResult>);
Task<TResult> task = me.InterceptAsyncWrapper(invocation, ProceedSynchronous<TResult>);

// If the intercept task has yet to complete, wait for it.
if (!task.IsCompleted)
{
Task.Run(() => task).Wait();
try
{
bool completed = Task.Run(async () => await task.ConfigureAwait(false)).Wait(2000);
if (!completed)
{
throw new Exception("I got sick of waiting 2.");
}
}
catch (AggregateException)
{
}
}

if (task.IsFaulted)
Expand Down Expand Up @@ -182,5 +202,61 @@ private static async Task<TResult> ProceedAsynchronous<TResult>(IInvocation invo
TResult result = await originalReturnValue.ConfigureAwait(false);
return result;
}

private Task InterceptAsyncWrapper(IInvocation invocation, Func<IInvocation, Task> proceed)
{
// Do not return from this method until proceed is called or the implementor is finished
TaskCompletionSource<object> canReturnTcs = new TaskCompletionSource<object>();
Task ProceedWrapper(IInvocation innerInvocation)
{
// "until proceed is called"
Task result = proceed(innerInvocation);
canReturnTcs.TrySetResult(null);
return result;
}

// Will block until implementorTask's first await
Task implementorTask = InterceptAsync(invocation, ProceedWrapper);

// "or the implementor is finished"
implementorTask.ContinueWith(_ => canReturnTcs.TrySetResult(null));

bool completed = canReturnTcs.Task.Wait(2000);
if (!completed)
{
throw new Exception("I got sick of waiting 3.");
}

return implementorTask;
}

private Task<TResult> InterceptAsyncWrapper<TResult>(
IInvocation invocation,
Func<IInvocation, Task<TResult>> proceed)
{
// Do not return from this method until proceed is called or the implementor is finished
TaskCompletionSource<object> canReturnTcs = new TaskCompletionSource<object>();
Task<TResult> ProceedWrapper(IInvocation innerInvocation)
{
// "until proceed is called"
Task<TResult> result = proceed(innerInvocation);
canReturnTcs.TrySetResult(null);
return result;
}

// Will block until implementorTask's first await
Task<TResult> implementorTask = InterceptAsync(invocation, ProceedWrapper);

// "or the implementor is finished"
implementorTask.ContinueWith(_ => canReturnTcs.TrySetResult(null));

bool completed = canReturnTcs.Task.Wait(2000);
if (!completed)
{
throw new Exception("I got sick of waiting 4.");
}

return implementorTask;
}
}
}
5 changes: 4 additions & 1 deletion src/Castle.Core.AsyncInterceptor/Castle.Core.AsyncInterceptor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<AdditionalFiles Include="stylecop.json" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Core\src\Castle.Core\Castle.Core.csproj" />
</ItemGroup>

</Project>
62 changes: 31 additions & 31 deletions test/Castle.Core.AsyncInterceptor.Tests/AsyncExceptionInterceptorShould.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Castle.DynamicProxy
public abstract class WhenExceptionInterceptingSynchronousVoidMethodsBase
{
private const string MethodName = nameof(IInterfaceToProxy.SynchronousVoidExceptionMethod);
private readonly List<string> _log = new List<string>();
private readonly ListLogger _log = new ListLogger();
private readonly IInterfaceToProxy _proxy;

protected WhenExceptionInterceptingSynchronousVoidMethodsBase(int msDelay)
Expand All @@ -37,35 +37,35 @@ public void ShouldLog3Entries()
Assert.Equal(MethodName + ":Exception", ex.Message);
}

[Fact]
public void ShouldAllowProcessingPriorToInvocation()
{
// Act
Assert.Throws<InvalidOperationException>(() => _proxy.SynchronousVoidExceptionMethod());

// Assert
Assert.Equal(MethodName + ":StartingVoidInvocation", _log[0]);
}

[Fact]
public void ShouldAllowExceptionHandling()
{
// Act
InvalidOperationException ex =
Assert.Throws<InvalidOperationException>(() => _proxy.SynchronousVoidExceptionMethod());

// Assert
Assert.Equal(MethodName + ":VoidExceptionThrown:" + ex.Message, _log[2]);
}
////[Fact]
////public void ShouldAllowProcessingPriorToInvocation()
////{
//// // Act
//// Assert.Throws<InvalidOperationException>(() => _proxy.SynchronousVoidExceptionMethod());

//// // Assert
//// Assert.Equal(MethodName + ":StartingVoidInvocation", _log[0]);
////}

////[Fact]
////public void ShouldAllowExceptionHandling()
////{
//// // Act
//// InvalidOperationException ex =
//// Assert.Throws<InvalidOperationException>(() => _proxy.SynchronousVoidExceptionMethod());

//// // Assert
//// Assert.Equal(MethodName + ":VoidExceptionThrown:" + ex.Message, _log[2]);
////}
}

public class WhenExceptionInterceptingSynchronousVoidMethodsWithNoDelay
: WhenExceptionInterceptingSynchronousVoidMethodsBase
{
public WhenExceptionInterceptingSynchronousVoidMethodsWithNoDelay() : base(0)
{
}
}
////public class WhenExceptionInterceptingSynchronousVoidMethodsWithNoDelay
//// : WhenExceptionInterceptingSynchronousVoidMethodsBase
////{
//// public WhenExceptionInterceptingSynchronousVoidMethodsWithNoDelay() : base(0)
//// {
//// }
////}

public class WhenExceptionInterceptingSynchronousVoidMethodsWithADelay
: WhenExceptionInterceptingSynchronousVoidMethodsBase
Expand All @@ -78,7 +78,7 @@ public WhenExceptionInterceptingSynchronousVoidMethodsWithADelay() : base(10)
public abstract class WhenExceptionInterceptingSynchronousResultMethodsBase
{
private const string MethodName = nameof(IInterfaceToProxy.SynchronousResultExceptionMethod);
private readonly List<string> _log = new List<string>();
private readonly ListLogger _log = new ListLogger();
private readonly IInterfaceToProxy _proxy;

protected WhenExceptionInterceptingSynchronousResultMethodsBase(int msDelay)
Expand Down Expand Up @@ -143,7 +143,7 @@ public WhenExceptionInterceptingSynchronousResultMethodsWithADelay() : base(10)
public abstract class WhenExceptionInterceptingAsynchronousVoidMethodsBase
{
private const string MethodName = nameof(IInterfaceToProxy.AsynchronousVoidExceptionMethod);
private readonly List<string> _log = new List<string>();
private readonly ListLogger _log = new ListLogger();
private readonly IInterfaceToProxy _proxy;

protected WhenExceptionInterceptingAsynchronousVoidMethodsBase(int msDelay)
Expand Down Expand Up @@ -211,7 +211,7 @@ public WhenExceptionInterceptingAsynchronousVoidMethodsWithADelay() : base(10)
public abstract class WhenExceptionInterceptingAsynchronousResultMethodsBase
{
private const string MethodName = nameof(IInterfaceToProxy.AsynchronousResultExceptionMethod);
private readonly List<string> _log = new List<string>();
private readonly ListLogger _log = new ListLogger();
private readonly IInterfaceToProxy _proxy;

protected WhenExceptionInterceptingAsynchronousResultMethodsBase(int msDelay)
Expand Down
40 changes: 20 additions & 20 deletions test/Castle.Core.AsyncInterceptor.Tests/AsyncInterceptorBaseShould.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Castle.DynamicProxy
public abstract class WhenInterceptingSynchronousVoidMethodsBase
{
private const string MethodName = nameof(IInterfaceToProxy.SynchronousVoidMethod);
private readonly List<string> _log = new List<string>();
private readonly ListLogger _log = new ListLogger();
private readonly IInterfaceToProxy _proxy;

protected WhenInterceptingSynchronousVoidMethodsBase(int msDelay)
Expand Down Expand Up @@ -73,7 +73,7 @@ public WhenInterceptingSynchronousVoidMethodsWithADelay() : base(10)
public abstract class WhenInterceptingSynchronousResultMethodsBase
{
private const string MethodName = nameof(IInterfaceToProxy.SynchronousResultMethod);
private readonly List<string> _log = new List<string>();
private readonly ListLogger _log = new ListLogger();
private readonly IInterfaceToProxy _proxy;

protected WhenInterceptingSynchronousResultMethodsBase(int msDelay)
Expand Down Expand Up @@ -133,7 +133,7 @@ public WhenInterceptingSynchronousResultMethodsWithADelay() : base(10)
public abstract class WhenInterceptingAsynchronousVoidMethodsBase
{
private const string MethodName = nameof(IInterfaceToProxy.AsynchronousVoidMethod);
private readonly List<string> _log = new List<string>();
private readonly ListLogger _log = new ListLogger();
private readonly IInterfaceToProxy _proxy;

protected WhenInterceptingAsynchronousVoidMethodsBase(int msDelay)
Expand All @@ -153,25 +153,25 @@ public async Task ShouldLog4Entries()
Assert.Equal(4, _log.Count);
}

[Fact]
public async Task ShouldAllowProcessingPriorToInvocation()
{
// Act
await _proxy.AsynchronousVoidMethod().ConfigureAwait(false);
////[Fact]
////public async Task ShouldAllowProcessingPriorToInvocation()
////{
//// // Act
//// await _proxy.AsynchronousVoidMethod().ConfigureAwait(false);

// Assert
Assert.Equal($"{MethodName}:StartingVoidInvocation", _log[0]);
}
//// // Assert
//// Assert.Equal($"{MethodName}:StartingVoidInvocation", _log[0]);
////}

[Fact]
public async Task ShouldAllowProcessingAfterInvocation()
{
// Act
await _proxy.AsynchronousVoidMethod().ConfigureAwait(false);
////[Fact]
////public async Task ShouldAllowProcessingAfterInvocation()
////{
//// // Act
//// await _proxy.AsynchronousVoidMethod().ConfigureAwait(false);

// Assert
Assert.Equal($"{MethodName}:CompletedVoidInvocation", _log[3]);
}
//// // Assert
//// Assert.Equal($"{MethodName}:CompletedVoidInvocation", _log[3]);
////}
}

public class WhenInterceptingAsynchronousVoidMethodsWithNoDelay
Expand All @@ -193,7 +193,7 @@ public WhenInterceptingAsynchronousVoidMethodsWithADelay() : base(10)
public abstract class WhenInterceptingAsynchronousResultMethodsBase
{
private const string MethodName = nameof(IInterfaceToProxy.AsynchronousResultMethod);
private readonly List<string> _log = new List<string>();
private readonly ListLogger _log = new ListLogger();
private readonly IInterfaceToProxy _proxy;

protected WhenInterceptingAsynchronousResultMethodsBase(int msDelay)
Expand Down
Loading