dan/Toolkit2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure messengers can be used in scopes

Browse Source
This commit is contained in:
Dan Clark
2024-12-03 09:55:26 +00:00
parent 1ac2db25e0
commit 9b9330c8cc
6 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toolkit.Foundation/AsyncHandlerInitialization.cs
+8 -6
View File
@@ -3,15 +3,16 @@ using Microsoft.Extensions.DependencyInjection;
namespace Toolkit.Foundation; namespace Toolkit.Foundation;
public class AsyncHandlerInitialization<TMessage, TResponse, THandler>(IServiceProvider provider) : public class AsyncHandlerInitialization<TMessage, TResponse, THandler>(IMessenger messenger,
IServiceProvider provider) :
IInitialization where THandler : class, IAsyncHandler<TMessage, TResponse> IInitialization where THandler : class, IAsyncHandler<TMessage, TResponse>
where TMessage : class where TMessage : class
{ {
public void Initialize() public void Initialize()
{ {
if (!StrongReferenceMessenger.Default.IsRegistered<AsyncResponseEventArgs<TMessage, TResponse>>(provider)) if (!messenger.IsRegistered<AsyncResponseEventArgs<TMessage, TResponse>>(provider))
{ {
StrongReferenceMessenger.Default.Register<IServiceProvider, AsyncResponseEventArgs<TMessage, TResponse>>(provider, messenger.Register<IServiceProvider, AsyncResponseEventArgs<TMessage, TResponse>>(provider,
(provider, args) => (provider, args) =>
{ {
IEnumerable<IAsyncHandler<TMessage, TResponse>> handlers = provider.GetServices<IAsyncHandler<TMessage, TResponse>>(); IEnumerable<IAsyncHandler<TMessage, TResponse>> handlers = provider.GetServices<IAsyncHandler<TMessage, TResponse>>();
@@ -30,15 +31,16 @@ public class AsyncHandlerInitialization<TMessage, TResponse, THandler>(IServiceP
} }
} }
public class AsyncHandlerInitialization<TMessage, THandler>(IServiceProvider provider) : public class AsyncHandlerInitialization<TMessage, THandler>(IMessenger messenger,
IServiceProvider provider) :
IInitialization where THandler : class, IAsyncHandler<TMessage> IInitialization where THandler : class, IAsyncHandler<TMessage>
where TMessage : class where TMessage : class
{ {
public void Initialize() public void Initialize()
{ {
if (!StrongReferenceMessenger.Default.IsRegistered<AsyncResponseEventArgs<TMessage, Unit>>(provider)) if (!messenger.IsRegistered<AsyncResponseEventArgs<TMessage, Unit>>(provider))
{ {
StrongReferenceMessenger.Default.Register<IServiceProvider, AsyncResponseEventArgs<TMessage, Unit>>(provider, messenger.Register<IServiceProvider, AsyncResponseEventArgs<TMessage, Unit>>(provider,
(provider, args) => (provider, args) =>
{ {
IEnumerable<IAsyncHandler<TMessage>> handlers = provider.GetServices<IAsyncHandler<TMessage>>(); IEnumerable<IAsyncHandler<TMessage>> handlers = provider.GetServices<IAsyncHandler<TMessage>>();
Toolkit.Foundation/AsyncHandlerKeyedInitialization.cs
+9 -6
View File
@@ -3,15 +3,17 @@ using Microsoft.Extensions.DependencyInjection;
namespace Toolkit.Foundation; namespace Toolkit.Foundation;
public class AsyncHandlerKeyedInitialization<TMessage, THandler>(string key, IServiceProvider provider) : public class AsyncHandlerKeyedInitialization<TMessage, THandler>(string key,
IMessenger messenger,
IServiceProvider provider) :
IInitialization where THandler : class, IAsyncHandler<TMessage> IInitialization where THandler : class, IAsyncHandler<TMessage>
where TMessage : class where TMessage : class
{ {
public void Initialize() public void Initialize()
{ {
if (!StrongReferenceMessenger.Default.IsRegistered<AsyncResponseEventArgs<TMessage, Unit>, string>(provider, key)) if (!messenger.IsRegistered<AsyncResponseEventArgs<TMessage, Unit>, string>(provider, key))
{ {
StrongReferenceMessenger.Default.Register<IServiceProvider, AsyncResponseEventArgs<TMessage, Unit>, string>(provider, key, messenger.Register<IServiceProvider, AsyncResponseEventArgs<TMessage, Unit>, string>(provider, key,
(provider, args) => (provider, args) =>
{ {
IEnumerable<IAsyncHandler<TMessage>> handlers = provider.GetKeyedServices<IAsyncHandler<TMessage>>(key); IEnumerable<IAsyncHandler<TMessage>> handlers = provider.GetKeyedServices<IAsyncHandler<TMessage>>(key);
@@ -30,15 +32,16 @@ public class AsyncHandlerKeyedInitialization<TMessage, THandler>(string key, ISe
} }
} }
public class AsyncHandlerKeyedInitialization<TMessage, TResponse, THandler>(string key, IServiceProvider provider) : public class AsyncHandlerKeyedInitialization<TMessage, TResponse, THandler>(string key, IMessenger messenger,
IServiceProvider provider) :
IInitialization where THandler : class, IAsyncHandler<TMessage, TResponse> IInitialization where THandler : class, IAsyncHandler<TMessage, TResponse>
where TMessage : class where TMessage : class
{ {
public void Initialize() public void Initialize()
{ {
if (!StrongReferenceMessenger.Default.IsRegistered<AsyncResponseEventArgs<TMessage, TResponse>, string>(provider, key)) if (!messenger.IsRegistered<AsyncResponseEventArgs<TMessage, TResponse>, string>(provider, key))
{ {
StrongReferenceMessenger.Default.Register<IServiceProvider, AsyncResponseEventArgs<TMessage, TResponse>, string>(provider, key, messenger.Register<IServiceProvider, AsyncResponseEventArgs<TMessage, TResponse>, string>(provider, key,
(provider, args) => (provider, args) =>
{ {
IEnumerable<IAsyncHandler<TMessage, TResponse>> handlers = provider.GetKeyedServices<IAsyncHandler<TMessage, TResponse>>(key); IEnumerable<IAsyncHandler<TMessage, TResponse>> handlers = provider.GetKeyedServices<IAsyncHandler<TMessage, TResponse>>(key);
Toolkit.Foundation/DefaultHostBuilder.cs
+1 -1
View File
@@ -22,7 +22,7 @@ public class DefaultHostBuilder :
ComponentHostCollection>(); ComponentHostCollection>();
services.AddSingleton<IDisposer, Disposer>(); services.AddSingleton<IDisposer, Disposer>();
services.AddSingleton<IMessenger, StrongReferenceMessenger>(_ => StrongReferenceMessenger.Default); services.AddScoped<IMessenger, StrongReferenceMessenger>();
services.AddTransient<IValidation, Validation>(); services.AddTransient<IValidation, Validation>();
services.AddTransient<IValidatorCollection, ValidatorCollection>(); services.AddTransient<IValidatorCollection, ValidatorCollection>();
Toolkit.Foundation/HandlerInitialization.cs
+8 -6
View File
@@ -3,15 +3,16 @@ using Microsoft.Extensions.DependencyInjection;
namespace Toolkit.Foundation; namespace Toolkit.Foundation;
public class HandlerInitialization<TMessage, TResponse, THandler>(IServiceProvider provider) : public class HandlerInitialization<TMessage, TResponse, THandler>(IMessenger messenger,
IServiceProvider provider) :
IInitialization where THandler : class, IHandler<TMessage, TResponse> IInitialization where THandler : class, IHandler<TMessage, TResponse>
where TMessage : class where TMessage : class
{ {
public void Initialize() public void Initialize()
{ {
if (!StrongReferenceMessenger.Default.IsRegistered<ResponseEventArgs<TMessage, TResponse>>(provider)) if (!messenger.IsRegistered<ResponseEventArgs<TMessage, TResponse>>(provider))
{ {
StrongReferenceMessenger.Default.Register<IServiceProvider, ResponseEventArgs<TMessage, TResponse>>(provider, messenger.Register<IServiceProvider, ResponseEventArgs<TMessage, TResponse>>(provider,
(provider, args) => (provider, args) =>
{ {
IEnumerable<IHandler<TMessage, TResponse>> handlers = provider.GetServices<IHandler<TMessage, TResponse>>(); IEnumerable<IHandler<TMessage, TResponse>> handlers = provider.GetServices<IHandler<TMessage, TResponse>>();
@@ -31,15 +32,16 @@ public class HandlerInitialization<TMessage, TResponse, THandler>(IServiceProvid
} }
public class HandlerInitialization<TMessage, THandler>(IServiceProvider provider) : public class HandlerInitialization<TMessage, THandler>(IMessenger messenger,
IServiceProvider provider) :
IInitialization where THandler : class, IHandler<TMessage> IInitialization where THandler : class, IHandler<TMessage>
where TMessage : class where TMessage : class
{ {
public void Initialize() public void Initialize()
{ {
if (!StrongReferenceMessenger.Default.IsRegistered<TMessage>(provider)) if (!messenger.IsRegistered<TMessage>(provider))
{ {
StrongReferenceMessenger.Default.Register<IServiceProvider, TMessage>(provider, messenger.Register<IServiceProvider, TMessage>(provider,
(provider, args) => (provider, args) =>
{ {
IEnumerable<IHandler<TMessage>> handlers = provider.GetServices<IHandler<TMessage>>(); IEnumerable<IHandler<TMessage>> handlers = provider.GetServices<IHandler<TMessage>>();
Toolkit.Foundation/HandlerKeyedInitialization.cs
+10 -6
View File
@@ -3,15 +3,17 @@ using Microsoft.Extensions.DependencyInjection;
namespace Toolkit.Foundation; namespace Toolkit.Foundation;
public class HandlerKeyedInitialization<TMessage, THandler>(string key, IServiceProvider provider) : public class HandlerKeyedInitialization<TMessage, THandler>(string key,
IMessenger messenger,
IServiceProvider provider) :
IInitialization where THandler : class, IHandler<TMessage> IInitialization where THandler : class, IHandler<TMessage>
where TMessage : class where TMessage : class
{ {
public void Initialize() public void Initialize()
{ {
if (!StrongReferenceMessenger.Default.IsRegistered<TMessage, string>(provider, key)) if (!messenger.IsRegistered<TMessage, string>(provider, key))
{ {
StrongReferenceMessenger.Default.Register<IServiceProvider, TMessage, string>(provider, key, messenger.Register<IServiceProvider, TMessage, string>(provider, key,
(provider, args) => (provider, args) =>
{ {
IEnumerable<IHandler<TMessage>> handlers = provider.GetKeyedServices<IHandler<TMessage>>(key); IEnumerable<IHandler<TMessage>> handlers = provider.GetKeyedServices<IHandler<TMessage>>(key);
@@ -41,15 +43,17 @@ public class HandlerKeyedInitialization<TMessage, THandler>(string key, IService
} }
} }
public class HandlerKeyedInitialization<TMessage, TResponse, THandler>(string key, IServiceProvider provider) : public class HandlerKeyedInitialization<TMessage, TResponse, THandler>(string key,
IMessenger messenger,
IServiceProvider provider) :
IInitialization where THandler : class, IHandler<TMessage, TResponse> IInitialization where THandler : class, IHandler<TMessage, TResponse>
where TMessage : class where TMessage : class
{ {
public void Initialize() public void Initialize()
{ {
if (!StrongReferenceMessenger.Default.IsRegistered<ResponseEventArgs<TMessage, TResponse>, string>(provider, key)) if (!messenger.IsRegistered<ResponseEventArgs<TMessage, TResponse>, string>(provider, key))
{ {
StrongReferenceMessenger.Default.Register<IServiceProvider, ResponseEventArgs<TMessage, TResponse>, string>(provider, key, messenger.Register<IServiceProvider, ResponseEventArgs<TMessage, TResponse>, string>(provider, key,
(provider, args) => (provider, args) =>
{ {
IEnumerable<IHandler<TMessage, TResponse>> handlers = provider.GetKeyedServices<IHandler<TMessage, TResponse>>(key); IEnumerable<IHandler<TMessage, TResponse>> handlers = provider.GetKeyedServices<IHandler<TMessage, TResponse>>(key);
Toolkit.Windows/WndProc.cs
+1
View File
@@ -38,6 +38,7 @@ public class WndProc(IMessenger messenger) :
PInvoke.DestroyWindow((HWND)Handle); PInvoke.DestroyWindow((HWND)Handle);
} }
private LRESULT HandleWndProc(HWND hWnd, uint msg, private LRESULT HandleWndProc(HWND hWnd, uint msg,
WPARAM wParam, LPARAM lParam) WPARAM wParam, LPARAM lParam)
{ {