Merge branch 'feature/secure-connection' of https://github.com/ElectronNET/Electron.NET into feature/secure-connection

Author: FlorianRappl

docs/SignalR-Authentication-Guide.md docs/Dev/Authentication.mddocs/SignalR-Authentication-Guide.md renamed to docs/Dev/Authentication.md

@@ -4,7 +4,7 @@ namespace ElectronNET.API.Bridge
     using System.Threading.Tasks;
 
     /// <summary>
-    /// Common interface for communication facades (SocketIO and SignalR).
+    /// Common interface for communication facades.
     /// Provides methods for bidirectional communication between .NET and Electron.
     /// </summary>
     internal interface ISocketConnection : IDisposable

docs/SignalR-Implementation-Summary.md

@@ -3,21 +3,29 @@
 namespace ElectronNET.API;
 
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using ElectronNET.API.Bridge;
 using ElectronNET.API.Serialization;
 using SocketIO.Serializer.SystemTextJson;
 using SocketIO = SocketIOClient.SocketIO;
+using SocketIOOptions = SocketIOClient.SocketIOOptions;
 
 internal class SocketIOConnection : ISocketConnection
 {
     private readonly SocketIO _socket;
     private readonly object _lockObj = new object();
     private bool _isDisposed;
 
-    public SocketIOConnection(string uri)
+    public SocketIOConnection(string uri, string authorization)
     {
-        _socket = new SocketIO(uri);
+        _socket = new SocketIO(uri, new SocketIOOptions
+        {
+            ExtraHeaders = new Dictionary<string, string>
+            {
+                ["authorization"] = authorization
+            },
+        });
         _socket.Serializer = new SystemTextJsonSerializer(ElectronJson.Options);
         // Use default System.Text.Json serializer from SocketIOClient.
         // Outgoing args are normalized to camelCase via SerializeArg in Emit.

docs/SignalR-Startup-Mode.md

@@ -14,7 +14,6 @@ public static bool IsUnpackaged(this StartupMethod method)
             {
                 case StartupMethod.UnpackedElectronFirst:
                 case StartupMethod.UnpackedDotnetFirst:
-                case StartupMethod.UnpackedDotnetFirstSignalR:
                     return true;
                 default:
                     return false;

src/ElectronNET.API/Bridge/ISocketConnection.cs

@@ -26,6 +26,8 @@ public class ProcessRunner : IDisposable
         private readonly StringBuilder stdOut = new StringBuilder(4 * 1024);
         private readonly StringBuilder stdErr = new StringBuilder(4 * 1024);
 
+        public event EventHandler<string> LineReceived;
+
         private volatile ManualResetEvent stdOutEvent;
         private volatile ManualResetEvent stdErrEvent;
         private volatile Stopwatch stopwatch;
@@ -571,6 +573,7 @@ private void Process_OutputDataReceived(object sender, DataReceivedEventArgs e)
             if (e.Data != null)
             {
                 Console.WriteLine("|| " + e.Data);
+                LineReceived?.Invoke(this, e.Data);
             }
             else
             {

src/ElectronNET.API/Bridge/SocketIOConnection.cs

@@ -14,7 +14,6 @@ internal class RuntimeControllerDotNetFirst : RuntimeControllerBase
     {
         private ElectronProcessBase electronProcess;
         private SocketBridgeService socketBridge;
-        private int? port;
 
         public RuntimeControllerDotNetFirst()
         {
@@ -42,19 +41,13 @@ protected override Task StartCore()
             var isUnPacked = ElectronNetRuntime.StartupMethod.IsUnpackaged();
             var electronBinaryName = ElectronNetRuntime.ElectronExecutable;
             var args = string.Format("{0} {1}", ElectronNetRuntime.ElectronExtraArguments, Environment.CommandLine).Trim();
-            this.port = ElectronNetRuntime.ElectronSocketPort;
-
-            if (!this.port.HasValue)
-            {
-                this.port = PortHelper.GetFreePort(ElectronNetRuntime.DefaultSocketPort);
-                ElectronNetRuntime.ElectronSocketPort = this.port;
-            }
+            var port = ElectronNetRuntime.ElectronSocketPort ?? 0;
 
             Console.Error.WriteLine("[StartCore]: isUnPacked: {0}", isUnPacked);
             Console.Error.WriteLine("[StartCore]: electronBinaryName: {0}", electronBinaryName);
             Console.Error.WriteLine("[StartCore]: args: {0}", args);
 
-            this.electronProcess = new ElectronProcessActive(isUnPacked, electronBinaryName, args, this.port.Value);
+            this.electronProcess = new ElectronProcessActive(isUnPacked, electronBinaryName, args, port);
             this.electronProcess.Ready += this.ElectronProcess_Ready;
             this.electronProcess.Stopped += this.ElectronProcess_Stopped;
 
@@ -64,8 +57,9 @@ protected override Task StartCore()
 
         private void ElectronProcess_Ready(object sender, EventArgs e)
         {
+            var port = ElectronNetRuntime.ElectronSocketPort.Value;
             this.TransitionState(LifetimeState.Started);
-            this.socketBridge = new SocketBridgeService(this.port!.Value);
+            this.socketBridge = new SocketBridgeService(port, "");
             this.socketBridge.Ready += this.SocketBridge_Ready;
             this.socketBridge.Stopped += this.SocketBridge_Stopped;
             this.socketBridge.Start();

src/ElectronNET.API/Common/Extensions.cs

@@ -49,7 +49,7 @@ protected override Task StartCore()
             }
 
             this.TransitionState(LifetimeState.Starting);
-            this.socketBridge = new SocketBridgeService(this.port!.Value);
+            this.socketBridge = new SocketBridgeService(this.port!.Value, "");
             this.socketBridge.Ready += this.SocketBridge_Ready;
             this.socketBridge.Stopped += this.SocketBridge_Stopped;
             this.socketBridge.Start();

src/ElectronNET.API/Common/ProcessRunner.cs

@@ -33,23 +33,5 @@ public enum StartupMethod
         ///     On the command lines, this is "unpackeddotnet"
         /// </remarks>
         UnpackedDotnetFirst,
-
-        /// <summary>Packaged Electron app where DotNet launches Electron and uses SignalR for communication.</summary>
-        /// <remarks>
-        ///     DotNet starts first on port 0 (dynamic), launches Electron with the actual URL,
-        ///     and uses SignalR instead of socket.io for bidirectional communication.
-        ///     Optimized for Blazor Server scenarios. ASP.NET Core only.
-        ///     On the command lines, this is "dotnetpackedsignalr"
-        /// </remarks>
-        PackagedDotnetFirstSignalR,
-
-        /// <summary>Unpackaged execution where DotNet launches Electron and uses SignalR for communication.</summary>
-        /// <remarks>
-        ///     Similar to PackagedDotnetFirstSignalR but for debugging scenarios.
-        ///     DotNet starts first on port 0 (dynamic), launches Electron with the actual URL,
-        ///     and uses SignalR instead of socket.io for bidirectional communication.
-        ///     On the command lines, this is "unpackeddotnetsignalr"
-        /// </remarks>
-        UnpackedDotnetFirstSignalR,
     }
 }