Introduce Event aggregator

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSelectionBinding.cs

@@ -12,15 +12,18 @@ public class ArcGISSelectionBinding : ISelectionBinding
   public string Name => "selectionBinding";
   public IBrowserBridge Parent { get; }
 
-  public ArcGISSelectionBinding(IBrowserBridge parent, MapMembersUtils mapMemberUtils)
+  public ArcGISSelectionBinding(
+    IBrowserBridge parent,
+    MapMembersUtils mapMemberUtils,
+    ITopLevelExceptionHandler topLevelExceptionHandler
+  )
   {
     _mapMemberUtils = mapMemberUtils;
     Parent = parent;
-    var topLevelHandler = parent.TopLevelExceptionHandler;
 
     // example: https://github.com/Esri/arcgis-pro-sdk-community-samples/blob/master/Map-Authoring/QueryBuilderControl/DefinitionQueryDockPaneViewModel.cs
     // MapViewEventArgs args = new(MapView.Active);
-    TOCSelectionChangedEvent.Subscribe(_ => topLevelHandler.CatchUnhandled(OnSelectionChanged), true);
+    TOCSelectionChangedEvent.Subscribe(_ => topLevelExceptionHandler.CatchUnhandled(OnSelectionChanged), true);
   }
 
   private void OnSelectionChanged()

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs

@@ -15,6 +15,7 @@
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Exceptions;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
@@ -69,7 +70,9 @@ public ArcGISSendBinding(
     ILogger<ArcGISSendBinding> logger,
     IArcGISConversionSettingsFactory arcGisConversionSettingsFactory,
     MapMembersUtils mapMemberUtils,
-    IThreadContext threadContext
+    IThreadContext threadContext,
+    IEventAggregator eventAggregator,
+    ITopLevelExceptionHandler topLevelExceptionHandler
   )
   {
     _store = store;
@@ -79,18 +82,20 @@ IThreadContext threadContext
     _sendConversionCache = sendConversionCache;
     _operationProgressManager = operationProgressManager;
     _logger = logger;
-    _topLevelExceptionHandler = parent.TopLevelExceptionHandler;
+    _topLevelExceptionHandler = topLevelExceptionHandler;
     _arcGISConversionSettingsFactory = arcGisConversionSettingsFactory;
     _mapMemberUtils = mapMemberUtils;
     _threadContext = threadContext;
 
     Parent = parent;
     Commands = new SendBindingUICommands(parent);
     SubscribeToArcGISEvents();
-    _store.DocumentChanged += (_, _) =>
-    {
-      _sendConversionCache.ClearCache();
-    };
+    eventAggregator
+      .GetEvent<DocumentChangedEvent>()
+      .Subscribe(_ =>
+      {
+        _sendConversionCache.ClearCache();
+      });
   }
 
   private void SubscribeToArcGISEvents()
@@ -201,23 +206,23 @@ private void SubscribeToAnyDataSourceChange(Table layerTable)
   {
     RowCreatedEvent.Subscribe(
       (args) =>
-        Parent.TopLevelExceptionHandler.FireAndForget(async () =>
+        _topLevelExceptionHandler.FireAndForget(async () =>
         {
           await OnRowChanged(args);
         }),
       layerTable
     );
     RowChangedEvent.Subscribe(
       (args) =>
-        Parent.TopLevelExceptionHandler.FireAndForget(async () =>
+        _topLevelExceptionHandler.FireAndForget(async () =>
         {
           await OnRowChanged(args);
         }),
       layerTable
     );
     RowDeletedEvent.Subscribe(
       (args) =>
-        Parent.TopLevelExceptionHandler.FireAndForget(async () =>
+        _topLevelExceptionHandler.FireAndForget(async () =>
         {
           await OnRowChanged(args);
         }),

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs

@@ -3,6 +3,7 @@
 using Speckle.Connectors.ArcGIS.Utils;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Sdk;
@@ -21,18 +22,21 @@ public class BasicConnectorBinding : IBasicConnectorBinding
   private readonly DocumentModelStore _store;
   private readonly ISpeckleApplication _speckleApplication;
 
-  public BasicConnectorBinding(DocumentModelStore store, IBrowserBridge parent, ISpeckleApplication speckleApplication)
+  public BasicConnectorBinding(
+    DocumentModelStore store,
+    IBrowserBridge parent,
+    ISpeckleApplication speckleApplication,
+    IEventAggregator eventAggregator
+  )
   {
     _store = store;
     _speckleApplication = speckleApplication;
     Parent = parent;
     Commands = new BasicConnectorBindingCommands(parent);
 
-    _store.DocumentChanged += (_, _) =>
-      parent.TopLevelExceptionHandler.FireAndForget(async () =>
-      {
-        await Commands.NotifyDocumentChanged();
-      });
+    eventAggregator
+      .GetEvent<DocumentChangedEvent>()
+      .Subscribe(async _ => await Commands.NotifyDocumentChanged().ConfigureAwait(false));
   }
 
   public string GetSourceApplicationName() => _speckleApplication.Slug;

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/DependencyInjection/ArcGISConnectorModule.cs

@@ -37,7 +37,6 @@ public static void AddArcGIS(this IServiceCollection serviceCollection)
     serviceCollection.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
     serviceCollection.AddSingleton<IBasicConnectorBinding, BasicConnectorBinding>();
 
-    serviceCollection.RegisterTopLevelExceptionHandler();
     serviceCollection.AddSingleton(DefaultTraversal.CreateTraversalFunc());
 
     // register send operation and dependencies

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/ArcGISThreadContext.cs

@@ -1,4 +1,4 @@
-using ArcGIS.Desktop.Framework.Threading.Tasks;
+using ArcGIS.Desktop.Framework.Threading.Tasks;
 using Speckle.Connectors.Common.Threading;
 
 namespace Speckle.Connectors.ArcGIS.Utils;

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/ArcGisDocumentStore.cs

@@ -4,6 +4,7 @@
 using ArcGIS.Desktop.Mapping.Events;
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
 
@@ -12,15 +13,18 @@ namespace Speckle.Connectors.ArcGIS.Utils;
 public class ArcGISDocumentStore : DocumentModelStore
 {
   private readonly IThreadContext _threadContext;
+  private readonly IEventAggregator _eventAggregator;
 
   public ArcGISDocumentStore(
     IJsonSerializer jsonSerializer,
     ITopLevelExceptionHandler topLevelExceptionHandler,
-    IThreadContext threadContext
+    IThreadContext threadContext,
+    IEventAggregator eventAggregator
   )
     : base(jsonSerializer)
   {
     _threadContext = threadContext;
+    _eventAggregator = eventAggregator;
     ActiveMapViewChangedEvent.Subscribe(a => topLevelExceptionHandler.CatchUnhandled(() => OnMapViewChanged(a)), true);
     ProjectSavingEvent.Subscribe(
       _ =>
@@ -44,7 +48,7 @@ IThreadContext threadContext
     {
       IsDocumentInit = true;
       LoadState();
-      OnDocumentChanged();
+      eventAggregator.GetEvent<DocumentChangedEvent>().Publish(new object());
     }
   }
 
@@ -78,7 +82,7 @@ private void OnMapViewChanged(ActiveMapViewChangedEventArgs args)
 
     IsDocumentInit = true;
     LoadState();
-    OnDocumentChanged();
+    _eventAggregator.GetEvent<DocumentChangedEvent>().Publish(new object());
   }
 
   protected override void HostAppSaveState(string modelCardState) =>

Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs

@@ -4,6 +4,7 @@
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Sdk;
@@ -31,6 +32,7 @@ public AutocadBasicConnectorBinding(
     IAccountManager accountManager,
     ISpeckleApplication speckleApplication,
     ILogger<AutocadBasicConnectorBinding> logger,
+    IEventAggregator eventAggregator,
     IThreadContext threadContext
   )
   {
@@ -39,8 +41,9 @@ IThreadContext threadContext
     _accountManager = accountManager;
     _speckleApplication = speckleApplication;
     Commands = new BasicConnectorBindingCommands(parent);
-    _store.DocumentChanged += (_, _) =>
-      parent.TopLevelExceptionHandler.FireAndForget(async () =>
+    eventAggregator
+      .GetEvent<DocumentChangedEvent>()
+      .Subscribe(async _ =>
       {
         await Commands.NotifyDocumentChanged();
       });

Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSelectionBinding.cs

@@ -18,9 +18,13 @@ public class AutocadSelectionBinding : ISelectionBinding
 
   public IBrowserBridge Parent { get; }
 
-  public AutocadSelectionBinding(IBrowserBridge parent, IThreadContext threadContext)
+  public AutocadSelectionBinding(
+    IBrowserBridge parent,
+    IThreadContext threadContext,
+    ITopLevelExceptionHandler topLevelExceptionHandler
+  )
   {
-    _topLevelExceptionHandler = parent.TopLevelExceptionHandler;
+    _topLevelExceptionHandler = topLevelExceptionHandler;
     Parent = parent;
     _threadContext = threadContext;
 

Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs

@@ -1,4 +1,4 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using Autodesk.AutoCAD.DatabaseServices;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -11,6 +11,7 @@
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Exceptions;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
@@ -60,7 +61,9 @@ protected AutocadSendBaseBinding(
     IOperationProgressManager operationProgressManager,
     ILogger<AutocadSendBinding> logger,
     ISpeckleApplication speckleApplication,
-    IThreadContext threadContext
+    ITopLevelExceptionHandler topLevelExceptionHandler,
+    IThreadContext threadContext,
+    IEventAggregator eventAggregator
   )
   {
     _store = store;
@@ -73,7 +76,7 @@ IThreadContext threadContext
     _logger = logger;
     _speckleApplication = speckleApplication;
     _threadContext = threadContext;
-    _topLevelExceptionHandler = parent.TopLevelExceptionHandler;
+    _topLevelExceptionHandler = topLevelExceptionHandler;
     Parent = parent;
     Commands = new SendBindingUICommands(parent);
 
@@ -86,10 +89,8 @@ IThreadContext threadContext
       SubscribeToObjectChanges(Application.DocumentManager.CurrentDocument);
     }
     // Since ids of the objects generates from same seed, we should clear the cache always whenever doc swapped.
-    _store.DocumentChanged += (_, _) =>
-    {
-      _sendConversionCache.ClearCache();
-    };
+
+    eventAggregator.GetEvent<DocumentChangedEvent>().Subscribe(_ => _sendConversionCache.ClearCache());
   }
 
   private readonly List<string> _docSubsTracker = new();

Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs

@@ -6,6 +6,7 @@
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Converters.Autocad;
@@ -30,7 +31,9 @@ public AutocadSendBinding(
     ILogger<AutocadSendBinding> logger,
     IAutocadConversionSettingsFactory autocadConversionSettingsFactory,
     ISpeckleApplication speckleApplication,
-    IThreadContext threadContext
+    ITopLevelExceptionHandler topLevelExceptionHandler,
+    IThreadContext threadContext,
+    IEventAggregator eventAggregator
   )
     : base(
       store,
@@ -43,7 +46,9 @@ IThreadContext threadContext
       operationProgressManager,
       logger,
       speckleApplication,
-      threadContext
+      topLevelExceptionHandler,
+      threadContext,
+      eventAggregator
     )
   {
     _autocadConversionSettingsFactory = autocadConversionSettingsFactory;

Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/SharedRegistration.cs

@@ -61,8 +61,6 @@ public static void AddAutocadBase(this IServiceCollection serviceCollection)
     serviceCollection.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
     serviceCollection.AddSingleton<IBasicConnectorBinding, AutocadBasicConnectorBinding>();
     serviceCollection.AddSingleton<IBinding, ConfigBinding>();
-
-    serviceCollection.RegisterTopLevelExceptionHandler();
   }
 
   public static void LoadSend(this IServiceCollection serviceCollection)

Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadDocumentModelStore.cs

@@ -1,4 +1,5 @@
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
 
@@ -9,15 +10,18 @@ public class AutocadDocumentStore : DocumentModelStore
   private readonly string _nullDocumentName = "Null Doc";
   private string _previousDocName;
   private readonly AutocadDocumentManager _autocadDocumentManager;
+  private readonly IEventAggregator _eventAggregator;
 
   public AutocadDocumentStore(
     IJsonSerializer jsonSerializer,
     AutocadDocumentManager autocadDocumentManager,
-    ITopLevelExceptionHandler topLevelExceptionHandler
+    ITopLevelExceptionHandler topLevelExceptionHandler,
+    IEventAggregator eventAggregator
   )
     : base(jsonSerializer)
   {
     _autocadDocumentManager = autocadDocumentManager;
+    _eventAggregator = eventAggregator;
     _previousDocName = _nullDocumentName;
 
     // POC: Will be addressed to move it into AutocadContext!
@@ -48,7 +52,7 @@ private void OnDocChangeInternal(Document? doc)
 
     _previousDocName = currentDocName;
     LoadState();
-    OnDocumentChanged();
+    _eventAggregator.GetEvent<DocumentChangedEvent>().Publish(new object());
   }
 
   protected override void LoadState()

Connectors/Autocad/Speckle.Connectors.Civil3dShared/Bindings/Civil3dSendBinding.cs

@@ -7,6 +7,7 @@
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Converters.Autocad;
@@ -34,7 +35,9 @@ public Civil3dSendBinding(
     ICivil3dConversionSettingsFactory civil3dConversionSettingsFactory,
     IAutocadConversionSettingsFactory autocadConversionSettingsFactory,
     ISpeckleApplication speckleApplication,
-    IThreadContext threadContext
+    ITopLevelExceptionHandler topLevelExceptionHandler,
+    IThreadContext threadContext,
+    IEventAggregator eventAggregator
   )
     : base(
       store,
@@ -47,7 +50,9 @@ IThreadContext threadContext
       operationProgressManager,
       logger,
       speckleApplication,
-      threadContext
+      topLevelExceptionHandler,
+      threadContext,
+      eventAggregator
     )
   {
     _civil3dConversionSettingsFactory = civil3dConversionSettingsFactory;

Connectors/CSi/Speckle.Connectors.CSiShared/ServiceRegistration.cs

@@ -43,8 +43,6 @@ public static IServiceCollection AddCsi(this IServiceCollection services)
     services.AddScoped<IRootObjectBuilder<ICsiWrapper>, CsiRootObjectBuilder>();
     services.AddScoped<SendOperation<ICsiWrapper>>();
 
-    services.RegisterTopLevelExceptionHandler();
-
     return services;
   }
 }