Исправлена нагрузка на проц

.github/workflows/dotnet-desktop.yml

@@ -1,5 +1,4 @@
 name: .NET Core Desktop
-permissions: write-all
 
 on: 
   push:
@@ -43,8 +42,6 @@ jobs:
     - name: Create Release
       id: create_release
       uses: actions/create-release@v1
-      permissions:
-        contents: write
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -56,8 +53,6 @@ jobs:
     - name: Upload Release Asset
       id: upload-release-asset 
       uses: actions/upload-release-asset@v1
-      permissions:
-        contents: write
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

.semver.txt

@@ -1 +1 @@
-1.0.6
+1.0.23

README.md

@@ -1 +1,79 @@
-"# monster_monitor_v2" 
+# Monster Monitor v2
+
+Windows-приложение (WinForms, .NET Framework 4.7.2) для мониторинга процесса `ss.exe`, поддержки SSH-туннеля и контроля состояния сервисов с логированием в UI.
+
+## Возможности
+
+- мониторинг и автоподдержка процесса `ss.exe`;
+- управление SSH-туннелем;
+- предотвращение засыпания системы во время работы;
+- логирование событий в консоль приложения;
+- хранение настроек в локальном профиле пользователя;
+- автообновление через GitHub Releases (с проверкой раз в час);
+- поддержка proxy для запросов к GitHub API и скачивания релизов.
+
+## Требования
+
+- Windows 10+;
+- .NET Framework 4.7.2 (target `net472`);
+- доступ к GitHub (напрямую или через proxy).
+
+## Сборка и запуск
+
+Из корня репозитория:
+
+```powershell
+dotnet build .\src\MonsterMonitor\MonsterMonitor.csproj
+dotnet run --project .\src\MonsterMonitor\MonsterMonitor.csproj
+```
+
+Или откройте `src/MonsterMonitor.sln` в Visual Studio и запустите проект `MonsterMonitor`.
+
+## Настройки
+
+Настройки сохраняются в:
+
+`%LOCALAPPDATA%\MonsterMonitor\settings.ini`
+
+Основные параметры:
+
+- `SshHost`, `SshPort`, `SshUsername`, `SshPasswordProtected`;
+- `RemotePort`, `LocalPort`;
+- `MaxPingFailures`, `ReconnectTimeoutSec`;
+- `SsProcessPath`, `SsArguments`;
+- `Proxy` — адрес proxy для GitHub-запросов (пример: `http://host:port`).
+
+Часть паролей хранится в защищенном виде через DPAPI.
+
+## Автообновление
+
+Приложение проверяет новые версии в GitHub репозитории:
+
+- owner: `monster1025`
+- repo: `monster_monitor_v2`
+
+Логика:
+
+1. Определяется текущая версия приложения.
+2. Получается последняя версия релиза из GitHub.
+3. Если версия новее текущей — скачивается `.zip`-ассет релиза.
+4. Обновление подготавливается в директории приложения:
+   - `.\update\<version>\update.zip`
+   - `.\update\<version>\extracted`
+   - `.\update\<version>\apply_update.bat`
+5. Пользователю предлагается перезапустить приложение для применения обновления.
+
+Периодичность проверки: каждые 60 минут (и первичная проверка после старта приложения).
+
+## Интерфейс
+
+- Главное окно:
+  - кнопка `Настройки`;
+  - кнопка `Выход`;
+  - консоль логов (уровни: Debug/Info/Warn/Error).
+- При сворачивании окно уходит в трей.
+
+## Примечания
+
+- Для автообновления релиз должен содержать `.zip`-ассет с файлами приложения.
+- Если `/releases/latest` недоступен, используется fallback на список релизов `/releases`.

release.cmd

@@ -23,6 +23,7 @@ git tag -m "Version v%VERSION%: %~1" -a v%VERSION%
 git push origin v%VERSION%
 
 git push --tags
+git push
 GOTO End
 pause
 

src/MonsterMonitor/Models/AppSettings.cs

@@ -21,6 +21,7 @@ namespace MonsterMonitor.Models
         public int LocalPort { get; set; } = 7829;
         public int MaxPingFailures { get; set; } = 3;
         public int ReconnectTimeoutSec { get; set; } = 45;
+        public string Proxy { get; set; } = string.Empty;
         public string SsProcessPath { get; set; } = Path.Combine("App_Data", "ss", "ss.exe");
         public string SsArguments { get; set; } = string.Empty;
 
@@ -163,6 +164,7 @@ namespace MonsterMonitor.Models
             result.LocalPort = GetInt(map, nameof(LocalPort), result.LocalPort);
             result.MaxPingFailures = GetInt(map, nameof(MaxPingFailures), result.MaxPingFailures);
             result.ReconnectTimeoutSec = GetInt(map, nameof(ReconnectTimeoutSec), result.ReconnectTimeoutSec);
+            result.Proxy = Get(map, nameof(Proxy), result.Proxy);
             result.SsProcessPath = Get(map, nameof(SsProcessPath), result.SsProcessPath);
             result.SsArguments = Get(map, nameof(SsArguments), result.SsArguments);
 
@@ -191,6 +193,7 @@ namespace MonsterMonitor.Models
                 $"{nameof(LocalPort)}={LocalPort}",
                 $"{nameof(MaxPingFailures)}={MaxPingFailures}",
                 $"{nameof(ReconnectTimeoutSec)}={ReconnectTimeoutSec}",
+                $"{nameof(Proxy)}={Proxy}",
                 $"{nameof(SsProcessPath)}={SsProcessPath}",
                 $"{nameof(SsArguments)}={SsArguments}"
             };

src/MonsterMonitor/MonsterMonitor.csproj

@@ -5,11 +5,11 @@
     <UseWindowsForms>true</UseWindowsForms>
     <LangVersion>7.3</LangVersion>
     <RootNamespace>MonsterMonitor</RootNamespace>
-    <AssemblyName>MonsterMonitor</AssemblyName>
-    <AssemblyVersion>1.0.6</AssemblyVersion>
-    <Version>1.0.6</Version>
-    <FileVersion>1.0.6</FileVersion>
-    <InformationalVersion>1.0.6</InformationalVersion>
+    <AssemblyName>devenv</AssemblyName>
+    <AssemblyVersion>1.0.23</AssemblyVersion>
+    <Version>1.0.23</Version>
+    <FileVersion>1.0.23</FileVersion>
+    <InformationalVersion>1.0.23</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Costura.Fody" Version="6.0.0">

src/MonsterMonitor/Program.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Windows.Forms;
 using MonsterMonitor.UI;
 
@@ -6,9 +7,21 @@ namespace MonsterMonitor
 {
     internal static class Program
     {
+        private const string SingleInstanceMutexName = @"Global\MonsterMonitor_v2_SingleInstance";
+        private const string ActivateEventName = @"Global\MonsterMonitor_v2_Activate";
+
         [STAThread]
         private static void Main()
         {
+            var createdNew = false;
+            using (var mutex = new Mutex(true, SingleInstanceMutexName, out createdNew))
+            {
+                if (!createdNew)
+                {
+                    TrySignalExistingInstance();
+                    return;
+                }
+
             Application.ThreadException += (sender, args) =>
             {
                 MessageBox.Show(
@@ -29,7 +42,38 @@ namespace MonsterMonitor
 
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new MainForm());
+                using (var activateEvent = new EventWaitHandle(false, EventResetMode.AutoReset, ActivateEventName))
+                {
+                    var form = new MainForm();
+                    ThreadPool.RegisterWaitForSingleObject(
+                        activateEvent,
+                        (state, timedOut) =>
+                        {
+                            var mainForm = state as MainForm;
+                            mainForm?.RestoreAndActivateFromExternalSignal();
+                        },
+                        form,
+                        Timeout.Infinite,
+                        false);
+
+                    Application.Run(form);
+                }
+            }
+        }
+
+        private static void TrySignalExistingInstance()
+        {
+            try
+            {
+                using (var activateEvent = EventWaitHandle.OpenExisting(ActivateEventName))
+                {
+                    activateEvent.Set();
+                }
+            }
+            catch
+            {
+                // Если не удалось отправить сигнал, просто завершаем второй инстанс.
+            }
         }
     }
 }

src/MonsterMonitor/Services/AppController.cs

@@ -10,6 +10,7 @@ namespace MonsterMonitor.Services
         private readonly SsConfigService _ssConfig;
         private ProcessMonitorService _processMonitor;
         private SshTunnelService _sshTunnel;
+        private IAuthMonitor _authMonitor;
 
         public AppController(LogService log, PowerManagementService power)
         {
@@ -25,10 +26,12 @@ namespace MonsterMonitor.Services
             _power.PreventSleep();
             _processMonitor = new ProcessMonitorService(_log);
             _sshTunnel = new SshTunnelService(_log);
+            _authMonitor = new AuthMonitor(settings);
 
             _ssConfig.EnsureConfig(settings);
             _processMonitor.Start(settings.SsProcessPath, settings.SsArguments);
             _sshTunnel.Start(settings);
+            _ = _authMonitor.StartMonitor();
 
             _log.Info("Сервисы приложения запущены.");
         }
@@ -38,6 +41,9 @@ namespace MonsterMonitor.Services
             _sshTunnel?.Dispose();
             _sshTunnel = null;
 
+            _authMonitor?.StopMonitor();
+            _authMonitor = null;
+
             _processMonitor?.Dispose();
             _processMonitor = null;
 

src/MonsterMonitor/Services/AuthMonitor.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using MonsterMonitor.Models;
@@ -20,6 +21,8 @@ namespace MonsterMonitor.Services
         static extern int GetWindowText(IntPtr hWnd, StringBuilder text, int count);
 
         private readonly AppSettings _settings;
+        private CancellationTokenSource _monitorCancellation;
+        private Task _monitorTask;
 
         public AuthMonitor(AppSettings settings)
         {
@@ -36,12 +39,39 @@ namespace MonsterMonitor.Services
 
         public async Task StartMonitor()
         {
-            _ = Task.Run(async () => await CheckProcess());
+            StopMonitor();
+            _monitorCancellation = new CancellationTokenSource();
+            _monitorTask = Task.Run(async () => await CheckProcess(_monitorCancellation.Token));
+            await Task.CompletedTask;
         }
 
-        private async Task CheckProcess()
+        public void StopMonitor()
         {
-            while (true)
+            if (_monitorCancellation == null)
+            {
+                return;
+            }
+
+            _monitorCancellation.Cancel();
+            try
+            {
+                _monitorTask?.Wait(TimeSpan.FromSeconds(1));
+            }
+            catch
+            {
+                // Ignore shutdown errors.
+            }
+            finally
+            {
+                _monitorCancellation.Dispose();
+                _monitorCancellation = null;
+                _monitorTask = null;
+            }
+        }
+
+        private async Task CheckProcess(CancellationToken token)
+        {
+            while (!token.IsCancellationRequested)
             {
                 try
                 {
@@ -70,7 +100,14 @@ namespace MonsterMonitor.Services
                     MessageBox.Show(ex.Message + ex.StackTrace);
                 }
 
-                await Task.Delay(TimeSpan.FromSeconds(3));
+                try
+                {
+                    await Task.Delay(TimeSpan.FromSeconds(3), token);
+                }
+                catch (TaskCanceledException)
+                {
+                    break;
+                }
             }
         }
     }
@@ -78,5 +115,6 @@ namespace MonsterMonitor.Services
     public interface IAuthMonitor
     {
         Task StartMonitor();
+        void StopMonitor();
     }
 }

src/MonsterMonitor/Services/GitHubUpdateService.cs

@@ -5,11 +5,13 @@ using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Net;
+using System.Reflection;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Json;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using MonsterMonitor.Models;
 
 namespace MonsterMonitor.Services
 {
@@ -20,10 +22,12 @@ namespace MonsterMonitor.Services
         private const string GithubToken = "";
 
         private readonly LogService _log;
+        private readonly AppSettings _settings;
 
-        public GitHubUpdateService(LogService log)
+        public GitHubUpdateService(LogService log, AppSettings settings)
         {
             _log = log;
+            _settings = settings;
         }
 
         public async Task CheckAndPrepareUpdateAsync()
@@ -63,8 +67,8 @@ namespace MonsterMonitor.Services
                     return;
                 }
 
-                var tempRoot = Path.Combine(Path.GetTempPath(), "MonsterMonitorUpdate");
-                var packageDir = Path.Combine(tempRoot, latestVersion.ToString());
+                var appDir = AppDomain.CurrentDomain.BaseDirectory;
+                var packageDir = Path.Combine(appDir, "update", latestVersion.ToString());
                 var packageZip = Path.Combine(packageDir, "update.zip");
                 var extractDir = Path.Combine(packageDir, "extracted");
                 Directory.CreateDirectory(packageDir);
@@ -80,7 +84,6 @@ namespace MonsterMonitor.Services
                 ZipFile.ExtractToDirectory(packageZip, extractDir);
                 _log.Info("Архив обновления распакован.");
 
-                var appDir = AppDomain.CurrentDomain.BaseDirectory;
                 var exePath = Application.ExecutablePath;
                 var updaterBat = Path.Combine(packageDir, "apply_update.bat");
                 File.WriteAllText(updaterBat, BuildUpdaterScript(appDir, extractDir, exePath), Encoding.ASCII);
@@ -114,15 +117,51 @@ namespace MonsterMonitor.Services
             }
         }
 
-        private static Version GetCurrentVersion()
+        private Version GetCurrentVersion()
         {
-            Version version;
-            if (!Version.TryParse(Application.ProductVersion, out version))
+            var fileVersion = TryParseVersion(FileVersionInfo.GetVersionInfo(Application.ExecutablePath).ProductVersion);
+            if (fileVersion != null)
             {
-                version = new Version(1, 0, 0, 0);
+                return fileVersion;
             }
 
-            return version;
+            var assemblyVersion = Assembly.GetExecutingAssembly().GetName().Version;
+            if (assemblyVersion != null)
+            {
+                return assemblyVersion;
+            }
+
+            var productVersion = TryParseVersion(Application.ProductVersion);
+            if (productVersion != null)
+            {
+                return productVersion;
+            }
+
+            _log.Warn("Не удалось определить текущую версию приложения, использую 1.0.0.");
+            return new Version(1, 0, 0, 0);
+        }
+
+        private static Version TryParseVersion(string raw)
+        {
+            if (string.IsNullOrWhiteSpace(raw))
+            {
+                return null;
+            }
+
+            var value = raw.Trim();
+            var plusIndex = value.IndexOf('+');
+            if (plusIndex > 0)
+            {
+                value = value.Substring(0, plusIndex);
+            }
+
+            if (value.StartsWith("v", StringComparison.OrdinalIgnoreCase))
+            {
+                value = value.Substring(1);
+            }
+
+            Version version;
+            return Version.TryParse(value, out version) ? version : null;
         }
 
         private static Version ParseVersion(string rawVersion)
@@ -266,7 +305,7 @@ namespace MonsterMonitor.Services
             return asset.DownloadUrl ?? string.Empty;
         }
 
-        private static HttpWebRequest CreateGithubRequest(string url, string accept)
+        private HttpWebRequest CreateGithubRequest(string url, string accept)
         {
             var request = (HttpWebRequest)WebRequest.Create(url);
             request.Method = "GET";
@@ -277,10 +316,26 @@ namespace MonsterMonitor.Services
             {
                 request.Headers.Add("Authorization", "Bearer " + GithubToken);
             }
+            if (!string.IsNullOrWhiteSpace(_settings.Proxy))
+            {
+                request.Proxy = GetProxy(_settings.Proxy);
+            }
 
             return request;
         }
 
+        private WebProxy GetProxy(string proxyUri)
+        {
+            var proxy = new WebProxy(new Uri(proxyUri), false);
+            var cc = new CredentialCache();
+            cc.Add(
+                new Uri(proxyUri),
+                "Negotiate", // if we don't set it to "Kerberos" we get error 407 with ---> the function requested is not supported.
+                CredentialCache.DefaultNetworkCredentials);
+            proxy.Credentials = cc;
+            return proxy;
+        }
+
         private static string BuildUpdaterScript(string appDir, string extractDir, string exePath)
         {
             return "@echo off" + Environment.NewLine +

src/MonsterMonitor/Services/SsConfigService.cs

@@ -28,6 +28,7 @@ namespace MonsterMonitor.Services
 
             var config = "users admin:CL:" + password + "\r\n" +
                          "auth strong\r\n" +
+                         "maxconn 2000\r\n" +
                          $"socks -i127.0.0.1 -p{port}";
 
             var configPath = GetConfigPath();

src/MonsterMonitor/Services/SshTunnelService.cs

@@ -32,7 +32,16 @@ namespace MonsterMonitor.Services
         public void Start(AppSettings settings)
         {
             _settings = settings;
+            try
+            {
                 Connect();
+            }
+            catch (Exception ex)
+            {
+                _log.Error("Не удалось запустить SSH-туннель с первого раза: " + ex.Message);
+                ReconnectSoon();
+            }
+
             StartMonitor();
         }
 

src/MonsterMonitor/UI/MainForm.cs

@@ -1,14 +1,19 @@
-using System;
-using System.Drawing;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using MonsterMonitor.Models;
 using MonsterMonitor.Services;
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace MonsterMonitor.UI
 {
     public sealed class MainForm : Form
     {
+        private const int EmGetFirstVisibleLine = 0x00CE;
+        private const int EmLineScroll = 0x00B6;
+
         private readonly RichTextBox _console = new RichTextBox();
         private readonly Button _btnSettings = new Button();
         private readonly Button _btnExit = new Button();
@@ -25,7 +30,7 @@ namespace MonsterMonitor.UI
 
         public MainForm()
         {
-            Text = string.Format("Monster Monitor v{0}", Application.ProductVersion);
+            Text = string.Format("Monster Monitor v{0}", System.Windows.Forms.Application.ProductVersion);
             Width = 980;
             Height = 620;
             StartPosition = FormStartPosition.CenterScreen;
@@ -43,7 +48,7 @@ namespace MonsterMonitor.UI
 
             _settings = AppSettings.Load();
             _controller = new AppController(_log, _power);
-            _updateService = new GitHubUpdateService(_log);
+            _updateService = new GitHubUpdateService(_log, _settings);
             RestartServices();
             ConfigureUpdateTimer();
             _ = RunUpdateCheckAsync(true);
@@ -135,6 +140,33 @@ namespace MonsterMonitor.UI
             Activate();
         }
 
+        public void RestoreAndActivateFromExternalSignal()
+        {
+            if (InvokeRequired)
+            {
+                BeginInvoke(new Action(RestoreAndActivateFromExternalSignal));
+                return;
+            }
+
+            _log.Info("Получен сигнал активации от второго инстанса.");
+
+            if (!Visible)
+            {
+                Show();
+            }
+
+            if (WindowState == FormWindowState.Minimized)
+            {
+                WindowState = FormWindowState.Normal;
+            }
+
+            // Небольшой трюк для надежного вывода окна на передний план.
+            TopMost = true;
+            Activate();
+            TopMost = false;
+            Focus();
+        }
+
         private void ExitApplication()
         {
             _allowClose = true;
@@ -159,19 +191,64 @@ namespace MonsterMonitor.UI
 
         private void AppendLog(LogEntry entry)
         {
+            if (_console.Text.Length > 100000)
+            {
+                _console.ResetText();
+            }
+            System.Windows.Forms.Application.DoEvents();
+
             if (InvokeRequired)
             {
                 BeginInvoke(new Action<LogEntry>(AppendLog), entry);
                 return;
             }
+            System.Windows.Forms.Application.DoEvents();
+
+            var wasNearBottom = IsConsoleNearBottom();
+            var firstVisibleLineBeforeAppend = GetFirstVisibleLine(_console);
 
             _console.SelectionStart = _console.TextLength;
             _console.SelectionLength = 0;
             _console.SelectionColor = GetColor(entry.Level);
             _console.AppendText($"[{entry.Timestamp:HH:mm:ss}] [{entry.Level}] {entry.Message}{Environment.NewLine}");
             _console.SelectionColor = _console.ForeColor;
+            System.Windows.Forms.Application.DoEvents();
+
+            if (wasNearBottom)
+            {
                 _console.ScrollToCaret();
+                return;
             }
+            System.Windows.Forms.Application.DoEvents();
+
+            var firstVisibleLineAfterAppend = GetFirstVisibleLine(_console);
+            var linesToRestore = firstVisibleLineBeforeAppend - firstVisibleLineAfterAppend;
+            if (linesToRestore != 0)
+            {
+                SendMessage(_console.Handle, EmLineScroll, IntPtr.Zero, (IntPtr)linesToRestore);
+            }
+            System.Windows.Forms.Application.DoEvents();
+        }
+
+        private bool IsConsoleNearBottom()
+        {
+            if (_console.TextLength == 0)
+            {
+                return true;
+            }
+
+            var bottomLeftPoint = new Point(1, Math.Max(0, _console.ClientSize.Height - 1));
+            var lastVisibleCharIndex = _console.GetCharIndexFromPosition(bottomLeftPoint);
+            return lastVisibleCharIndex >= _console.TextLength - 2;
+        }
+
+        private static int GetFirstVisibleLine(RichTextBox richTextBox)
+        {
+            return SendMessage(richTextBox.Handle, EmGetFirstVisibleLine, IntPtr.Zero, IntPtr.Zero).ToInt32();
+        }
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        private static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
 
         private void ConfigureUpdateTimer()
         {

src/MonsterMonitor/UI/SettingsForm.cs

@@ -17,6 +17,7 @@ namespace MonsterMonitor.UI
         private readonly NumericUpDown _numLocalPort = new NumericUpDown();
         private readonly NumericUpDown _numMaxFailures = new NumericUpDown();
         private readonly NumericUpDown _numReconnectTimeout = new NumericUpDown();
+        private readonly TextBox _txtProxy = new TextBox();
         private readonly TextBox _txtSsPath = new TextBox();
         private readonly TextBox _txtSsArgs = new TextBox();
         private readonly TextBox _txtSystemPassword = new TextBox();
@@ -30,7 +31,7 @@ namespace MonsterMonitor.UI
             _settings = settings;
             Text = "Настройки";
             Width = 560;
-            Height = 520;
+            Height = 560;
             FormBorderStyle = FormBorderStyle.FixedDialog;
             MaximizeBox = false;
             MinimizeBox = false;
@@ -47,7 +48,7 @@ namespace MonsterMonitor.UI
                 Dock = DockStyle.Fill,
                 Padding = new Padding(10),
                 ColumnCount = 2,
-                RowCount = 14
+                RowCount = 15
             };
             panel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 44f));
             panel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 56f));
@@ -65,10 +66,11 @@ namespace MonsterMonitor.UI
             AddRow(panel, "Локальный порт:", _numLocalPort, 6);
             AddRow(panel, "Макс. потерь:", _numMaxFailures, 7);
             AddRow(panel, "Таймаут reconnect (сек):", _numReconnectTimeout, 8);
-            AddRow(panel, "Путь к ss:", _txtSsPath, 9);
-            AddRow(panel, "Аргументы ss:", _txtSsArgs, 10);
-            BuildSystemPasswordRow(panel, 11);
-            BuildThreeProxyPasswordRow(panel, 12);
+            AddRow(panel, "Прокси (http://host:port):", _txtProxy, 9);
+            AddRow(panel, "Путь к ss:", _txtSsPath, 10);
+            AddRow(panel, "Аргументы ss:", _txtSsArgs, 11);
+            BuildSystemPasswordRow(panel, 12);
+            BuildThreeProxyPasswordRow(panel, 13);
 
             foreach (var num in new[] { _numSshPort, _numRemotePort, _numLocalPort })
             {
@@ -93,7 +95,7 @@ namespace MonsterMonitor.UI
 
             buttonsPanel.Controls.Add(btnSave);
             buttonsPanel.Controls.Add(btnCancel);
-            panel.Controls.Add(buttonsPanel, 0, 13);
+            panel.Controls.Add(buttonsPanel, 0, 14);
             panel.SetColumnSpan(buttonsPanel, 2);
         }
 
@@ -200,6 +202,7 @@ namespace MonsterMonitor.UI
             _numLocalPort.Value = _settings.LocalPort;
             _numMaxFailures.Value = _settings.MaxPingFailures;
             _numReconnectTimeout.Value = _settings.ReconnectTimeoutSec;
+            _txtProxy.Text = _settings.Proxy;
             _txtSsPath.Text = _settings.SsProcessPath;
             _txtSsArgs.Text = _settings.SsArguments;
             _txtSystemPassword.Text = _settings.GetSystemPassword();
@@ -223,6 +226,7 @@ namespace MonsterMonitor.UI
             _settings.LocalPort = (int)_numLocalPort.Value;
             _settings.MaxPingFailures = (int)_numMaxFailures.Value;
             _settings.ReconnectTimeoutSec = (int)_numReconnectTimeout.Value;
+            _settings.Proxy = _txtProxy.Text.Trim();
             _settings.SsProcessPath = string.IsNullOrWhiteSpace(_txtSsPath.Text)
                 ? System.IO.Path.Combine("App_Data", "ss", "ss.exe")
                 : _txtSsPath.Text.Trim();