Fix multiple areas that should return a int, not a string (was also w…

…rong in socketio version) -> Should fix most areas with system.text.json

ElectronNET.API/App.cs

@@ -1064,8 +1064,7 @@ public async void SetAppUserModelId(string id)
         /// <returns>Result of import. Value of 0 indicates success.</returns>
         public async Task<int> ImportCertificateAsync(ImportCertificateOptions options, CancellationToken cancellationToken = default)
         {
-            var signalrResult = await SignalrSerializeHelper.GetSignalrResultString("appImportCertificate", JObject.FromObject(options, _jsonSerializer));
-            return int.Parse(signalrResult);
+            return await SignalrSerializeHelper.GetSignalrResultInt("appImportCertificate", JObject.FromObject(options, _jsonSerializer));
         }
 
         /// <summary>
@@ -1115,8 +1114,7 @@ public async Task<bool> SetBadgeCountAsync(int count, CancellationToken cancella
         /// <param name="cancellationToken">The cancellation token.</param>
         public async Task<int> GetBadgeCountAsync(CancellationToken cancellationToken = default)
         {
-            var signalrResult = await SignalrSerializeHelper.GetSignalrResultString("appGetBadgeCount");
-            return int.Parse(signalrResult);
+            return await SignalrSerializeHelper.GetSignalrResultInt("appGetBadgeCount");
         }
 
         /// <summary>

ElectronNET.API/BrowserWindow.cs

@@ -1876,8 +1876,7 @@ public async void SetParentWindow(BrowserWindow parent)
         /// <returns></returns>
         public async Task<BrowserWindow> GetParentWindowAsync()
         {
-            string parentId = await SignalrSerializeHelper.GetSignalrResultString("browserWindowGetParentWindow", Id);
-            var browserWindowId = int.Parse(parentId.ToString());
+            int browserWindowId = await SignalrSerializeHelper.GetSignalrResultInt("browserWindowGetParentWindow", Id);
             var browserWindow = Electron.WindowManager.BrowserWindows.ToList().Single(x => x.Id == browserWindowId);
             return browserWindow;
         }

ElectronNET.API/Dock.cs

@@ -53,8 +53,7 @@ internal static Dock Instance
         /// <returns>Return an ID representing the request.</returns>
         public async Task<int> BounceAsync(DockBounceType type, CancellationToken cancellationToken = default)
         {
-            var result = await SignalrSerializeHelper.GetSignalrResultString("dock-bounce", type.GetDescription());
-            return int.Parse(result);
+            return await SignalrSerializeHelper.GetSignalrResultInt("dock-bounce", type.GetDescription());
         }
 
         /// <summary>

ElectronNET.API/Extensions/SignalrSerializeHelper.cs

@@ -903,5 +903,145 @@ public static async Task<JArray> GetSignalrResultJArray(string signalrCommand, J
             return result;
         }
 
+        public static async Task<int> GetSignalrResultInt(string signalrCommand)
+        {
+            var taskCompletionSource = new TaskCompletionSource<int>();
+            var guid = Guid.NewGuid();
+            HubElectron.ClientResponsesInt.TryAdd(guid, taskCompletionSource);
+            await Electron.SignalrElectron.Clients.All.SendAsync(signalrCommand, guid.ToString());
+
+            int result;
+            try
+            {
+                var task = taskCompletionSource.Task;
+                if (await Task.WhenAny(task, Task.Delay(5000)) == task)
+                {
+                    result = await task;
+                }
+                else
+                {
+                    throw new ArgumentNullException();
+                }
+            }
+            finally
+            {
+                HubElectron.ClientResponsesInt.TryRemove(guid, out taskCompletionSource);
+            }
+
+            return result;
+        }
+
+        public static async Task<int> GetSignalrResultInt(string signalrCommand, int parameter1)
+        {
+            var taskCompletionSource = new TaskCompletionSource<int>();
+            var guid = Guid.NewGuid();
+            HubElectron.ClientResponsesInt.TryAdd(guid, taskCompletionSource);
+            await Electron.SignalrElectron.Clients.All.SendAsync(signalrCommand, guid.ToString(), parameter1);
+
+            int result;
+            try
+            {
+                var task = taskCompletionSource.Task;
+                if (await Task.WhenAny(task, Task.Delay(5000)) == task)
+                {
+                    result = await task;
+                }
+                else
+                {
+                    throw new ArgumentNullException();
+                }
+            }
+            finally
+            {
+                HubElectron.ClientResponsesInt.TryRemove(guid, out taskCompletionSource);
+            }
+
+            return result;
+        }
+
+        public static async Task<int> GetSignalrResultInt(string signalrCommand, string parameter1)
+        {
+            var taskCompletionSource = new TaskCompletionSource<int>();
+            var guid = Guid.NewGuid();
+            HubElectron.ClientResponsesInt.TryAdd(guid, taskCompletionSource);
+            await Electron.SignalrElectron.Clients.All.SendAsync(signalrCommand, guid.ToString(), parameter1);
+
+            int result;
+            try
+            {
+                var task = taskCompletionSource.Task;
+                if (await Task.WhenAny(task, Task.Delay(5000)) == task)
+                {
+                    result = await task;
+                }
+                else
+                {
+                    throw new ArgumentNullException();
+                }
+            }
+            finally
+            {
+                HubElectron.ClientResponsesInt.TryRemove(guid, out taskCompletionSource);
+            }
+
+            return result;
+        }
+
+        public static async Task<int> GetSignalrResultInt(string signalrCommand, JObject parameter1)
+        {
+            var taskCompletionSource = new TaskCompletionSource<int>();
+            var guid = Guid.NewGuid();
+            HubElectron.ClientResponsesInt.TryAdd(guid, taskCompletionSource);
+            await Electron.SignalrElectron.Clients.All.SendAsync(signalrCommand, guid.ToString(), parameter1);
+
+            int result;
+            try
+            {
+                var task = taskCompletionSource.Task;
+                if (await Task.WhenAny(task, Task.Delay(5000)) == task)
+                {
+                    result = await task;
+                }
+                else
+                {
+                    throw new ArgumentNullException();
+                }
+            }
+            finally
+            {
+                HubElectron.ClientResponsesInt.TryRemove(guid, out taskCompletionSource);
+            }
+
+            return result;
+        }
+
+        public static async Task<int> GetSignalrResultInt(string signalrCommand, JObject parameter1, string parameter2)
+        {
+            var taskCompletionSource = new TaskCompletionSource<int>();
+            var guid = Guid.NewGuid();
+            HubElectron.ClientResponsesInt.TryAdd(guid, taskCompletionSource);
+            await Electron.SignalrElectron.Clients.All.SendAsync(signalrCommand, guid.ToString(), parameter1, parameter2);
+
+            int result;
+            try
+            {
+                var task = taskCompletionSource.Task;
+                if (await Task.WhenAny(task, Task.Delay(5000)) == task)
+                {
+                    result = await task;
+                }
+                else
+                {
+                    throw new ArgumentNullException();
+                }
+            }
+            finally
+            {
+                HubElectron.ClientResponsesInt.TryRemove(guid, out taskCompletionSource);
+            }
+
+            return result;
+        }
+
     }
 }