fix event names for when there are more than one window, view or webcontent Id

Author: theolivenbaum

ElectronNET.API/BridgeConnector.cs

@@ -153,7 +153,7 @@ public static void Once<T>(string eventString, Action<T> fn)
 
         public static async Task<T> OnResult<T>(string triggerEvent, string completedEvent, params object[] args)
         {
-            string eventKey = triggerEvent;
+            string eventKey = completedEvent;
 
             if (args is object && args.Length > 0) // If there are arguments passed, we generate a unique event key with the arguments
                                                    // this allow us to wait for previous events first before registering new ones
@@ -166,7 +166,7 @@ public static async Task<T> OnResult<T>(string triggerEvent, string completedEve
                 eventKey = $"{eventKey}-{(uint)hash.ToHashCode()}";
             }
 
-            if (EventTasks<T>.TryGetOrAdd(triggerEvent, eventKey, out var taskCompletionSource, out var waitThisFirstAndThenTryAgain))
+            if (EventTasks<T>.TryGetOrAdd(completedEvent, eventKey, out var taskCompletionSource, out var waitThisFirstAndThenTryAgain))
             {
                 if (waitThisFirstAndThenTryAgain is object)
                 {
@@ -192,7 +192,7 @@ public static async Task<T> OnResult<T>(string triggerEvent, string completedEve
                     {
                         Off(completedEvent);
                         taskCompletionSource.SetResult(result);
-                        EventTasks<T>.DoneWith(triggerEvent, eventKey, taskCompletionSource);
+                        EventTasks<T>.DoneWith(completedEvent, eventKey, taskCompletionSource);
                     });
 
                     Emit(triggerEvent, args);
@@ -205,21 +205,56 @@ public static async Task<T> OnResult<T>(string triggerEvent, string completedEve
 
         public static async Task<T> OnResult<T>(string triggerEvent, string completedEvent, CancellationToken cancellationToken, params object[] args)
         {
-            var taskCompletionSource = new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);
+            string eventKey = completedEvent;
 
-            using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
+            if (args is object && args.Length > 0) // If there are arguments passed, we generate a unique event key with the arguments
+                                                   // this allow us to wait for previous events first before registering new ones
             {
+                var hash = new HashCode();
+                foreach (var obj in args)
+                {
+                    hash.Add(obj);
+                }
+                eventKey = $"{eventKey}-{(uint)hash.ToHashCode()}";
+            }
+
+            if (EventTasks<T>.TryGetOrAdd(completedEvent, eventKey, out var taskCompletionSource, out var waitThisFirstAndThenTryAgain))
+            {
+                if (waitThisFirstAndThenTryAgain is object)
+                {
+                    //There was a pending call with different parameters, so we need to wait that first and then call here again
+                    try
+                    {
+                        await Task.Run(() => waitThisFirstAndThenTryAgain, cancellationToken);
+                    }
+                    catch
+                    {
+                        //Ignore any exceptions here so we can set a new event below
+                        //The exception will also be visible to the original first caller due to taskCompletionSource.Task
+                    }
 
-                On<T>(completedEvent, (result) =>
+                    //Try again to set the event
+                    return await OnResult<T>(triggerEvent, completedEvent, cancellationToken, args);
+                }
+                else
                 {
-                    Off(completedEvent);
-                    taskCompletionSource.SetResult(result);
-                });
+                    using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
+                    {
+                        //A new TaskCompletionSource was added, so we need to register the completed event here
 
-                Emit(triggerEvent, args);
+                        On<T>(completedEvent, (result) =>
+                        {
+                            Off(completedEvent);
+                            taskCompletionSource.SetResult(result);
+                            EventTasks<T>.DoneWith(completedEvent, eventKey, taskCompletionSource);
+                        });
 
-                return await taskCompletionSource.Task.ConfigureAwait(false);
+                        Emit(triggerEvent, args);
+                    }
+                }
             }
+
+            return await taskCompletionSource.Task;
         }
         private static SocketIO Socket
         {

ElectronNET.API/BrowserView.cs

@@ -31,7 +31,7 @@ public class BrowserView
         /// 
         /// (experimental)
         /// </summary>
-        public Task<Rectangle> GetBoundsAsync() => BridgeConnector.OnResult<Rectangle>("browserView-getBounds", "browserView-getBounds-reply", Id);
+        public Task<Rectangle> GetBoundsAsync() => BridgeConnector.OnResult<Rectangle>("browserView-getBounds", "browserView-getBounds-reply" + Id, Id);
 
         public void SetBounds(Rectangle value)
         {