Close #2 #3

Author: vertigra

src/RemotePythonExecution.Interface/IAppSettingsServiceDependency/InterpreterPath.cs renamed to src/RemotePythonExecution.Interface/AppSettingsDependency/InterpreterPath.cs

@@ -1,4 +1,4 @@
-namespace RemotePythonExecution.Interface.IAppSettingsServiceDependency
+namespace RemotePythonExecution.Interface.AppSettingsDependency
 {
     public class InterpreterPath
     {

src/RemotePythonExecution.Interface/IAppSettingsServiceDependency/PythonPaths.cs renamed to src/RemotePythonExecution.Interface/AppSettingsDependency/PythonPaths.cs

@@ -1,4 +1,4 @@
-namespace RemotePythonExecution.Interface.IAppSettingsServiceDependency
+namespace RemotePythonExecution.Interface.AppSettingsDependency
 {
     public class PythonPaths
     {

src/RemotePythonExecution.Interface/AppSettingsDependency/ServerSettings.cs

@@ -0,0 +1,8 @@
+namespace RemotePythonExecution.Interface.AppSettingsDependency
+{
+    public class ServerSettings
+    {
+        public string Ip { get; set; } = "0.0.0.0";
+        public int Port { get; set; } = 19000;
+    }
+}

src/RemotePythonExecution.Interface/IAppSettingsServiceDependency/SourceCodeSavePath.cs renamed to src/RemotePythonExecution.Interface/AppSettingsDependency/SourceCodeSavePath.cs

@@ -1,4 +1,4 @@
-namespace RemotePythonExecution.Interface.IAppSettingsServiceDependency
+namespace RemotePythonExecution.Interface.AppSettingsDependency
 {
     public class SourceCodeSavePath
     {

src/RemotePythonExecution.Interface/IAppSettingsServiceDependency/WorkingDirrectoryPath.cs renamed to src/RemotePythonExecution.Interface/AppSettingsDependency/WorkingDirrectoryPath.cs

@@ -1,4 +1,4 @@
-namespace RemotePythonExecution.Interface.IAppSettingsServiceDependency
+namespace RemotePythonExecution.Interface.AppSettingsDependency
 {
     public class WorkingDirrectoryPath
     {

src/RemotePythonExecution.Interface/IAppSettingsServiceDependency/ServerSettings.cs

@@ -1,4 +1,4 @@
-using RemotePythonExecution.Interface.IAppSettingsServiceDependency;
+using RemotePythonExecution.Interface.AppSettingsDependency;
 
 namespace RemotePythonExecution.Services
 {

src/RemotePythonExecution.Services/AppSettings.cs

@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Net.Sockets;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -25,13 +26,17 @@ public class RemotePythonExecutionService : BackgroundService
 
         #region Var
 
-        private readonly WatsonTcpServer mTcpServer;
+        private WatsonTcpServer mTcpServer;
         private Process mProcess;
         private bool mIsOutputEnded = false;
         private bool mIsProcessEnded = false;
         public Guid CurrentConnectionGuid;
         private bool mIsDisposed;
 
+        private string mInterpreterPath = string.Empty;
+        private string mWorkingDirrectoryPath = string.Empty;
+        private string mSourceCodeSavePath = string.Empty;
+
         #endregion
 
         #region ~
@@ -41,20 +46,20 @@ public RemotePythonExecutionService(IServiceProvider serviceProvider)
             mLogger = serviceProvider.GetRequiredService<ILogger<RemotePythonExecutionService>>();
             mAppSettingsMonitor = serviceProvider.GetRequiredService<IOptionsMonitor<AppSettings>>();
 
+            Ip = mAppSettingsMonitor.CurrentValue.ServerSettings.Ip;
+            Port = mAppSettingsMonitor.CurrentValue.ServerSettings.Port;
 
-            string ip = mAppSettingsMonitor.CurrentValue.ServerSettings.Ip;
-            int port = mAppSettingsMonitor.CurrentValue.ServerSettings.Port;
 
-            mTcpServer = new WatsonTcpServer(ip, port);
+            SetPath(mAppSettingsMonitor.CurrentValue);
+            //SetServerAddress(mAppSettingsMonitor.CurrentValue);
+
+            mTcpServer = new WatsonTcpServer(Ip, Port);
             mAppSettingsMonitor.OnChange(OnChangeSettings);
 
             Subscribe();
-
             mTcpServer.Start();
+            mLogger.LogInformation("Server runing on {ip}:{port}", Ip, Port);
 
-            SetPath(mAppSettingsMonitor.CurrentValue);
-
-            mLogger.LogInformation("Server runing on {ip}:{port}", ip, port);
         }
 
         #endregion
@@ -67,22 +72,27 @@ private void Subscribe()
             mTcpServer.Events.ClientDisconnected += ClientDisconnected;
             mTcpServer.Events.MessageReceived += MessageReceived;
             mTcpServer.Events.ExceptionEncountered += ExceptionEncountered;
+            //mTcpServer.Events.ServerStopped += ServerStopped;
         }
 
         private void UnSubscribe()
         {
             mTcpServer.Events.ClientConnected -= ClientConnected;
             mTcpServer.Events.ClientDisconnected -= ClientDisconnected;
             mTcpServer.Events.MessageReceived -= MessageReceived;
-            mTcpServer.Events.ExceptionEncountered -= ExceptionEncountered; 
+            mTcpServer.Events.ExceptionEncountered -= ExceptionEncountered;
+            //mTcpServer.Events.ServerStopped -= ServerStopped;
+
         }
 
         #endregion
 
         #region Events
+
         private void OnChangeSettings(AppSettings settings, string arg2)
         {
             SetPath(settings);
+            SetServerAddress(settings);
         }
 
         private void ClientConnected(object sender, ConnectionEventArgs e)
@@ -107,9 +117,18 @@ private void ExceptionEncountered(object sender, ExceptionEventArgs e)
             if (e.Exception is IOException)
                 return;
 
+            if (e.Exception is SocketException)
+                return;
+
             mLogger.LogError("Error happened {errorMessage}", e.Exception);
         }
 
+        private void ServerStopped(object sender, EventArgs e)
+        {
+            mIsOutputEnded = true;
+            mIsProcessEnded = true;
+        }
+
         private void MessageReceived(object sender, MessageReceivedEventArgs e)
         {
             Dictionary<string, object> metadata = e.Metadata;
@@ -179,6 +198,10 @@ private async void ProcessOutputDataReceived(object sender, DataReceivedEventArg
                     mLogger.LogDebug("{data}", e.Data);
                     mIsOutputEnded = false;
                 }
+                catch (TaskCanceledException)
+                {
+                    mLogger.LogError("Task was canceled");
+                }
                 catch (Exception exp)
                 {
                     mLogger.LogError("Catch happened {exp}", exp);
@@ -244,10 +267,8 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
         #endregion
 
-
         #region Private fields
 
-        private string mInterpreterPath = string.Empty;
         private string InterpreterPath
         {
             get { return mInterpreterPath; }
@@ -264,7 +285,6 @@ private string InterpreterPath
             }
         }
 
-        private string mWorkingDirrectoryPath = string.Empty;
         private string WorkingDirrectoryPath
         {
             get { return mWorkingDirrectoryPath; }
@@ -280,8 +300,7 @@ private string WorkingDirrectoryPath
                 mLogger.LogDebug("New path for {name} register with values {value}", nameof(WorkingDirrectoryPath), WorkingDirrectoryPath);
             }
         }
-
-        private string mSourceCodeSavePath = string.Empty;
+        
         private string SourceCodeSavePath
         {
             get { return mSourceCodeSavePath; }
@@ -299,9 +318,76 @@ private string SourceCodeSavePath
 
         }
 
+        private string mIp = string.Empty;
+        private string Ip
+        {
+            get { return mIp; }
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    mIp = "0.0.0.0";
+                    return;
+                }
+
+                if (value.Equals(mIp))
+                    return;
+
+                mIp = value;
+                mLogger.LogDebug("New ip for server register with values {value}", Ip);
+
+                OnServerAddressChange();
+            }
+        }
+
+
+        private int mPort;    
+
+        private int Port
+        {
+            get { return mPort; }
+            set
+            {
+                if (value.Equals(mPort))
+                    return;
+
+                mPort = value;
+                mLogger.LogDebug("New port for server register with values {value}", Port);
+
+                OnServerAddressChange();
+            }
+        }
+
         #endregion
+
         #region Private methods
 
+        private void OnServerAddressChange()
+        {
+            if (mTcpServer == null)
+                return;
+
+            if(mTcpServer.IsListening)
+            {
+                if(mTcpServer.Connections != 0)
+                {
+                    mIsOutputEnded = true;
+                    mIsProcessEnded = true;
+                    //mTcpServer.DisconnectClientsAsync();
+                }
+                    
+
+                mTcpServer.Stop();
+                UnSubscribe();
+                //mTcpServer?.Dispose();
+            }
+
+            mTcpServer = new WatsonTcpServer(Ip, Port);
+            Subscribe();
+            mTcpServer.Start();
+            mLogger.LogInformation("Server runing on {ip}:{port}", Ip, Port);
+        }
+
         private void SetPath(AppSettings appSettings)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -317,6 +403,12 @@ private void SetPath(AppSettings appSettings)
             WorkingDirrectoryPath = appSettings.PythonPaths.WorkingDirrectoryPath.Linux;
         }
 
+        private void SetServerAddress(AppSettings appSettings)
+        {
+            Ip = appSettings.ServerSettings.Ip;
+            Port = appSettings.ServerSettings.Port;
+        }
+
         private void SaveCodeAndStartProcess(string code, bool withDebug)
         {
             File.WriteAllText(SourceCodeSavePath, code);

src/RemotePythonExecution.Services/RemotePythonExecutionService.cs

@@ -38,6 +38,7 @@
     ]
   },
 
+  /* All settings supported to change without restarting the application (hot reload) */
   "AppSettings": {
     "PythonPaths": {
       "InterpreterPath": {
@@ -58,8 +59,10 @@
 
     "ServerSettings": {
       /* Specify the ip interface on which the server will run. To listen to all interfaces, specify 0.0.0.0 or leave the field empty. */
+      /* A change during code execution will result in disconnection all clients*/
       "Ip": "",
       /* Specify the port on which the server will be running. The default port is 19000 */
+      /* A change during code execution will result in disconnection all clients*/
       "Port": 19000
     }
   }