откат

.semver.txt

@@ -1 +1 @@
-1.0.18
+1.0.26

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/MonsterMonitor.csproj

@@ -6,10 +6,10 @@
     <LangVersion>7.3</LangVersion>
     <RootNamespace>MonsterMonitor</RootNamespace>
     <AssemblyName>devenv</AssemblyName>
-    <AssemblyVersion>1.0.18</AssemblyVersion>
+    <AssemblyVersion>1.0.26</AssemblyVersion>
-    <Version>1.0.18</Version>
+    <Version>1.0.26</Version>
-    <FileVersion>1.0.18</FileVersion>
+    <FileVersion>1.0.26</FileVersion>
-    <InformationalVersion>1.0.18</InformationalVersion>
+    <InformationalVersion>1.0.26</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/SshTunnelService.cs

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

src/MonsterMonitor/UI/MainForm.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using MonsterMonitor.Models;
@@ -9,6 +10,9 @@ 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();
@@ -135,6 +139,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;
@@ -165,14 +196,49 @@ namespace MonsterMonitor.UI
                 return;
             }
 
+            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;
-            _console.ScrollToCaret();
+
+            if (wasNearBottom)
+            {
+                _console.ScrollToCaret();
+                return;
+            }
+
+            var firstVisibleLineAfterAppend = GetFirstVisibleLine(_console);
+            var linesToRestore = firstVisibleLineBeforeAppend - firstVisibleLineAfterAppend;
+            if (linesToRestore != 0)
+            {
+                SendMessage(_console.Handle, EmLineScroll, IntPtr.Zero, (IntPtr)linesToRestore);
+            }
         }
 
+        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()
         {
             _updateTimer.Interval = (int)TimeSpan.FromHours(1).TotalMilliseconds;