Rewrite to signalr

ElectronNET.API/BridgeSettings.cs

@@ -11,14 +11,25 @@ public static class BridgeSettings
  /// <value>
  /// The socket port.
  /// </value>
- public static string SocketPort { get; internal set; }
+ public static string SocketPort { get; set; }
 
  /// <summary>
  /// Gets the web port.
  /// </summary>
  /// <value>
  /// The web port.
  /// </value>
- public static string WebPort { get; internal set; }
+ public static string WebPort { get; set; }
+
+ /// <summary>
+ /// Manually set the port values instead of using the UseElectron extension method
+ /// </summary>
+ /// <param name="socketPort"></param>
+ /// <param name="webPort"></param>
+ public static void InitializePorts(int socketPort, int webPort)
+ {
+ SocketPort = socketPort.ToString();
+ WebPort = webPort.ToString();
+ }
  }
 }

ElectronNET.API/BrowserView.cs

@@ -1,4 +1,5 @@
 using ElectronNET.API.Entities;
+using Microsoft.AspNetCore.SignalR;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
@@ -31,29 +32,19 @@ public class BrowserView
  /// 
  /// (experimental)
  /// </summary>
- public Rectangle Bounds
+ public async Task<Rectangle> GetBoundsAsync()
  {
- get
- {
- return Task.Run<Rectangle>(() =>
- {
- var taskCompletionSource = new TaskCompletionSource<Rectangle>();
-
- BridgeConnector.Socket.On("browserView-getBounds-reply", (result) =>
- {
- BridgeConnector.Socket.Off("browserView-getBounds-reply");
- taskCompletionSource.SetResult((Rectangle)result);
- });
-
- BridgeConnector.Socket.Emit("browserView-getBounds", Id);
+ var signalrResult = await SignalrSerializeHelper.GetSignalrResultJObject("browserView-getBounds", Id);
+ return ((JObject)signalrResult).ToObject<Rectangle>();
+ }
 
-  return taskCompletionSource.Task;
-  }).Result;
-  }
-  set
-  {
-  BridgeConnector.Socket.Emit("browserView-setBounds", Id, JObject.FromObject(value, _jsonSerializer));
- }
+ /// <summary>
+ /// Set the bounds of the current view inside the window
+ /// </summary>
+ /// <param name="value"></param>
+ public async void SetBounds(Rectangle value)
+ {
+ await Electron.SignalrElectron.Clients.All.SendAsync("browserView-setBounds", Id, JObject.FromObject(value, _jsonSerializer));
  }
 
  /// <summary>
@@ -72,9 +63,9 @@ internal BrowserView(int id)
  /// (experimental)
  /// </summary>
  /// <param name="options"></param>
- public void SetAutoResize(AutoResizeOptions options)
+ public async void SetAutoResize(AutoResizeOptions options)
  {
- BridgeConnector.Socket.Emit("browserView-setAutoResize", Id, JObject.FromObject(options, _jsonSerializer));
+ await Electron.SignalrElectron.Clients.All.SendAsync("browserView-setAutoResize", Id, JObject.FromObject(options, _jsonSerializer));
  }
 
  /// <summary>
@@ -83,9 +74,9 @@ public void SetAutoResize(AutoResizeOptions options)
  /// (experimental)
  /// </summary>
  /// <param name="color">Color in #aarrggbb or #argb form. The alpha channel is optional.</param>
- public void SetBackgroundColor(string color)
+ public async void SetBackgroundColor(string color)
  {
- BridgeConnector.Socket.Emit("browserView-setBackgroundColor", Id, color);
+ await Electron.SignalrElectron.Clients.All.SendAsync("browserView-setBackgroundColor", Id, color);
  }
 
  private JsonSerializer _jsonSerializer = new JsonSerializer()