Preparation for close #2 #3

Author: vertigra

service_info.json

@@ -1,7 +1,7 @@
 {
   "services": {
     "name": "RemotePythonExecution",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "projectType": "DotnetProject",
     "dependencies": []
   },

src/RemotePythonExecution.Interface/IAppSettingService.cs

@@ -1,6 +1,6 @@
 namespace RemotePythonExecution.Interface.IAppSettingsServiceDependency
 {
-    public class SourceCodeSavePaths
+    public class SourceCodeSavePath
     {
         public string Windows { get; set; } = "";
         public string Linux { get; set; } = "";

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

@@ -0,0 +1,12 @@
+using RemotePythonExecution.Interface.IAppSettingsServiceDependency;
+
+namespace RemotePythonExecution.Services
+{
+    public class AppSettings
+    {
+        public ServerSettings ServerSettings { get; set; } = new ServerSettings();
+        public PythonPaths PythonPaths { get; set; } = new PythonPaths();
+        public SourceCodeSavePath SourceCodeSavePath { get; set ; } = new SourceCodeSavePath();
+
+    }
+}

src/RemotePythonExecution.Services/AppSettingService.cs

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using RemotePythonExecution.Interface;
 using System;
 using System.Collections.Generic;
@@ -18,7 +19,7 @@ public class RemotePythonExecutionService : BackgroundService
         #region Services
 
         private readonly ILogger<RemotePythonExecutionService> mLogger;
-        private readonly IAppSettingService mAppSettingService;
+        private readonly IOptionsMonitor<AppSettings> mAppSettingsMonitor;
 
         #endregion
 
@@ -29,11 +30,6 @@ public class RemotePythonExecutionService : BackgroundService
         private bool mIsOutputEnded = false;
         private bool mIsProcessEnded = false;
         public Guid CurrentConnectionGuid;
-
-        private string InterpreterPath = "";
-        private string WorkingDirrectoryPath = "";
-        private string SourceCodeSavePaths = "";
-
         private bool mIsDisposed;
 
         #endregion
@@ -43,18 +39,20 @@ public class RemotePythonExecutionService : BackgroundService
         public RemotePythonExecutionService(IServiceProvider serviceProvider) 
         {
             mLogger = serviceProvider.GetRequiredService<ILogger<RemotePythonExecutionService>>();
-            mAppSettingService = serviceProvider.GetRequiredService<IAppSettingService>();
+            mAppSettingsMonitor = serviceProvider.GetRequiredService<IOptionsMonitor<AppSettings>>();
 
-            string ip =mAppSettingService.ServerSettings.Ip;
-            int port =mAppSettingService.ServerSettings.Port;
+
+            string ip = mAppSettingsMonitor.CurrentValue.ServerSettings.Ip;
+            int port = mAppSettingsMonitor.CurrentValue.ServerSettings.Port;
 
             mTcpServer = new WatsonTcpServer(ip, port);
+            mAppSettingsMonitor.OnChange(OnChangeSettings);
 
             Subscribe();
 
             mTcpServer.Start();
 
-            SetPath();
+            SetPath(mAppSettingsMonitor.CurrentValue);
 
             mLogger.LogInformation("Server runing on {ip}:{port}", ip, port);
         }
@@ -82,6 +80,10 @@ private void UnSubscribe()
         #endregion
 
         #region Events
+        private void OnChangeSettings(AppSettings settings, string arg2)
+        {
+            SetPath(settings);
+        }
 
         private void ClientConnected(object sender, ConnectionEventArgs e)
         {   
@@ -167,13 +169,13 @@ private void ProcessErrorDataReceived(object sender, DataReceivedEventArgs e)
             }
         }
 
-        private void ProcessOutputDataReceived(object sender, DataReceivedEventArgs e)
+        private async void ProcessOutputDataReceived(object sender, DataReceivedEventArgs e)
         {
-            if (!string.IsNullOrEmpty(e.Data))
+            if (!(e.Data == null))
             {
                 try
                 {
-                    mTcpServer.SendAsync(CurrentConnectionGuid, e.Data);
+                    await mTcpServer.SendAsync(CurrentConnectionGuid, e.Data, start: 0);
                     mLogger.LogDebug("{data}", e.Data);
                     mIsOutputEnded = false;
                 }
@@ -242,35 +244,91 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
         #endregion
 
+
+        #region Private fields
+
+        private string mInterpreterPath = string.Empty;
+        private string InterpreterPath
+        {
+            get { return mInterpreterPath; }
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                    return;
+
+                if (value.Equals(mInterpreterPath))
+                    return;
+
+                mInterpreterPath = value;
+                mLogger.LogDebug("New path for {name} register with values {value}", nameof(InterpreterPath), InterpreterPath);
+            }
+        }
+
+        private string mWorkingDirrectoryPath = string.Empty;
+        private string WorkingDirrectoryPath
+        {
+            get { return mWorkingDirrectoryPath; }
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                    return;
+
+                if (value.Equals(mWorkingDirrectoryPath))
+                    return;
+
+                mWorkingDirrectoryPath = value;
+                mLogger.LogDebug("New path for {name} register with values {value}", nameof(WorkingDirrectoryPath), WorkingDirrectoryPath);
+            }
+        }
+
+        private string mSourceCodeSavePath = string.Empty;
+        private string SourceCodeSavePath
+        {
+            get { return mSourceCodeSavePath; }
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                    return;
+
+                if (value.Equals(mSourceCodeSavePath))
+                    return;
+
+                mSourceCodeSavePath = value;
+                mLogger.LogDebug("New path for {name} register with values {value}", nameof(SourceCodeSavePath), SourceCodeSavePath);
+            }
+
+        }
+
+        #endregion
         #region Private methods
 
-        private void SetPath()
+        private void SetPath(AppSettings appSettings)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                SourceCodeSavePaths = mAppSettingService.SourceCodeSavePaths.Windows;
-                InterpreterPath = mAppSettingService.PythonPaths.InterpreterPath.Windows;
-                WorkingDirrectoryPath = mAppSettingService.PythonPaths.WorkingDirrectoryPath.Windows;
+                SourceCodeSavePath = appSettings.SourceCodeSavePath.Windows;
+                InterpreterPath = appSettings.PythonPaths.InterpreterPath.Windows;
+                WorkingDirrectoryPath = appSettings.PythonPaths.WorkingDirrectoryPath.Windows;
                 return;
             }
 
-            SourceCodeSavePaths = mAppSettingService.SourceCodeSavePaths.Linux;
-            InterpreterPath = mAppSettingService.PythonPaths.InterpreterPath.Linux;
-            WorkingDirrectoryPath = mAppSettingService.PythonPaths.WorkingDirrectoryPath.Linux;
+            SourceCodeSavePath = appSettings.SourceCodeSavePath.Linux;
+            InterpreterPath = appSettings.PythonPaths.InterpreterPath.Linux;
+            WorkingDirrectoryPath = appSettings.PythonPaths.WorkingDirrectoryPath.Linux;
         }
 
         private void SaveCodeAndStartProcess(string code, bool withDebug)
         {
-            File.WriteAllText(SourceCodeSavePaths, code);
+            File.WriteAllText(SourceCodeSavePath, code);
             Task.Run(() => StartProcess(withDebug: withDebug));
         }
 
         private void StartProcess(bool withDebug = false)
         {
-            string arg = string.Format($"-u -m {Path.GetFileNameWithoutExtension(SourceCodeSavePaths)}");
+            string arg = string.Format($"-u -m {Path.GetFileNameWithoutExtension(SourceCodeSavePath)}");
 
             if (withDebug)
-                arg = string.Format($"-u -m pdb {SourceCodeSavePaths}");
+                arg = string.Format($"-u -m pdb {SourceCodeSavePath}");
 
             ProcessStartInfo proccesInfo = new()
             {

src/RemotePythonExecution.Services/AppSettings.cs

@@ -21,17 +21,16 @@ static async Task Main(string[] args)
                 .ConfigureAppConfiguration((context, config) =>
                 {
                     config.Sources.Clear();
-                    config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
+                    config.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true);
                 })
 
                 .ConfigureServices((context, services) =>
                 {
                     services.AddAdamDefaultArgumentsParser(args);
 
-                    AppSettingService options = new();
-                    context.Configuration.GetRequiredSection("AppSettingsOptions").Bind(options);
-                    services.AddSingleton<IAppSettingService>(options);
-
+                    AppSettings options = new();
+                    services.Configure<AppSettings>(context.Configuration.GetRequiredSection(nameof(AppSettings)));
+                    
                     services.AddLogging(loggingBuilder =>
                     {
                         Logger logger = new LoggerConfiguration()

src/RemotePythonExecution.Services/RemotePythonExecutionService.cs

@@ -2,7 +2,7 @@
   "Serilog": {
     "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
     "MinimumLevel": {
-      "Default": "Information",
+      "Default": "Debug",
       "Override": {
         "Microsoft": "Warning",
         "System": "Warning"
@@ -38,7 +38,7 @@
     ]
   },
 
-  "AppSettingsOptions": {
+  "AppSettings": {
     "PythonPaths": {
       "InterpreterPath": {
         "Windows": "C:\\Users\\Professional\\Downloads\\python-3.13.0-embed-amd64\\python.exe",
@@ -51,7 +51,7 @@
       }
     },
 
-    "SourceCodeSavePaths": {
+    "SourceCodeSavePath": {
       "Windows": "C:\\Users\\Professional\\Downloads\\python-3.13.0-embed-amd64\\test2.py",
       "Linux": "/home/adam/adam/remote_python.py"
     },