Compare commits

..
9 Commits
Author SHA1 Message Date
kislovdm 06f2ebb1ac maxconn
.NET Core Desktop / build (Debug) (push) Has been cancelled
2026-04-27 01:02:02 +03:00
kislovdm 9912ca8ba4 maxconn
.NET Core Desktop / build (Debug) (push) Has been cancelled
2026-04-27 00:57:20 +03:00
kislovdm 427f16cde0 maxconn
.NET Core Desktop / build (Debug) (push) Has been cancelled
2026-04-27 00:53:56 +03:00
kislovdm fe8abb589f maxconn
.NET Core Desktop / build (Debug) (push) Has been cancelled
2026-04-27 00:49:24 +03:00
kislovdm ae787373dc releases
.NET Core Desktop / build (Debug) (push) Has been cancelled
2026-04-27 00:48:17 +03:00
kislovdm 4f2fe7b292 releases
.NET Core Desktop / build (Debug) (push) Has been cancelled
2026-04-27 00:47:40 +03:00
kislovdm 635a489cc1 releases
.NET Core Desktop / build (Debug) (push) Has been cancelled
2026-04-27 00:44:39 +03:00
kislovdm 5b82edb9ee releases
.NET Core Desktop / build (Debug) (push) Has been cancelled
2026-04-27 00:44:01 +03:00
kislovdm 84e0fbb959 releases
.NET Core Desktop / build (Debug) (push) Has been cancelled
2026-04-27 00:36:21 +03:00
5 changed files with 45 additions and 11 deletions
-1
View File
@@ -1,5 +1,4 @@
name: .NET Core Desktop name: .NET Core Desktop
permissions: write-all
on: on:
push: push:
+1 -1
View File
@@ -1 +1 @@
1.0.4 1.0.13
+4 -4
View File
@@ -6,10 +6,10 @@
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
<RootNamespace>MonsterMonitor</RootNamespace> <RootNamespace>MonsterMonitor</RootNamespace>
<AssemblyName>MonsterMonitor</AssemblyName> <AssemblyName>MonsterMonitor</AssemblyName>
<AssemblyVersion>1.0.4</AssemblyVersion> <AssemblyVersion>1.0.13</AssemblyVersion>
<Version>1.0.4</Version> <Version>1.0.13</Version>
<FileVersion>1.0.4</FileVersion> <FileVersion>1.0.13</FileVersion>
<InformationalVersion>1.0.4</InformationalVersion> <InformationalVersion>1.0.13</InformationalVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Costura.Fody" Version="6.0.0"> <PackageReference Include="Costura.Fody" Version="6.0.0">
@@ -28,6 +28,7 @@ namespace MonsterMonitor.Services
var config = "users admin:CL:" + password + "\r\n" + var config = "users admin:CL:" + password + "\r\n" +
"auth strong\r\n" + "auth strong\r\n" +
"maxconn 2000\r\n" +
$"socks -i127.0.0.1 -p{port}"; $"socks -i127.0.0.1 -p{port}";
var configPath = GetConfigPath(); var configPath = GetConfigPath();
+39 -5
View File
@@ -13,6 +13,7 @@ namespace MonsterMonitor.UI
private readonly Button _btnSettings = new Button(); private readonly Button _btnSettings = new Button();
private readonly Button _btnExit = new Button(); private readonly Button _btnExit = new Button();
private readonly NotifyIcon _notifyIcon = new NotifyIcon(); private readonly NotifyIcon _notifyIcon = new NotifyIcon();
private readonly Timer _updateTimer = new Timer();
private readonly Icon _trayIcon; private readonly Icon _trayIcon;
private readonly LogService _log = new LogService(); private readonly LogService _log = new LogService();
private readonly PowerManagementService _power = new PowerManagementService(); private readonly PowerManagementService _power = new PowerManagementService();
@@ -20,6 +21,7 @@ namespace MonsterMonitor.UI
private AppController _controller; private AppController _controller;
private AppSettings _settings; private AppSettings _settings;
private bool _allowClose; private bool _allowClose;
private bool _isUpdateCheckRunning;
public MainForm() public MainForm()
{ {
@@ -43,7 +45,8 @@ namespace MonsterMonitor.UI
_controller = new AppController(_log, _power); _controller = new AppController(_log, _power);
_updateService = new GitHubUpdateService(_log); _updateService = new GitHubUpdateService(_log);
RestartServices(); RestartServices();
_ = RunUpdateCheckAsync(); ConfigureUpdateTimer();
_ = RunUpdateCheckAsync(true);
} }
private void BuildUi() private void BuildUi()
@@ -148,6 +151,8 @@ namespace MonsterMonitor.UI
} }
_notifyIcon.Visible = false; _notifyIcon.Visible = false;
_updateTimer.Stop();
_updateTimer.Dispose();
_controller?.Dispose(); _controller?.Dispose();
_trayIcon?.Dispose(); _trayIcon?.Dispose();
} }
@@ -168,11 +173,40 @@ namespace MonsterMonitor.UI
_console.ScrollToCaret(); _console.ScrollToCaret();
} }
private async Task RunUpdateCheckAsync() private void ConfigureUpdateTimer()
{ {
// Небольшая задержка, чтобы окно и лог уже успели инициализироваться. _updateTimer.Interval = (int)TimeSpan.FromHours(1).TotalMilliseconds;
await Task.Delay(1000); _updateTimer.Tick += async (_, __) => await RunUpdateCheckAsync(false);
await _updateService.CheckAndPrepareUpdateAsync(); _updateTimer.Start();
_log.Info("Автопроверка обновлений включена (раз в 1 час).");
}
private async Task RunUpdateCheckAsync(bool isInitialCheck)
{
if (_isUpdateCheckRunning)
{
return;
}
try
{
_isUpdateCheckRunning = true;
if (isInitialCheck)
{
// Небольшая задержка, чтобы окно и лог уже успели инициализироваться.
await Task.Delay(1000);
}
else
{
_log.Info("Плановая проверка обновлений...");
}
await _updateService.CheckAndPrepareUpdateAsync();
}
finally
{
_isUpdateCheckRunning = false;
}
} }
private static Color GetColor(LogLevel level) private static Color GetColor(LogLevel level)