сборкка Common

ReleaseUpdater.Common/Options.cs

@@ -0,0 +1,34 @@
+using ArgumentsToolkit;
+
+namespace ReleaseUpdater.Common;
+
+/// <summary>Параметры CLI для Updater.exe.</summary>
+public sealed class Options
+{
+    [Option(nameof(ZipPath), "z", "Путь к скачанному архиву (.zip).", true)]
+    /// <summary>Путь к скачанному архиву (.zip).</summary>
+    public string ZipPath { get; set; }
+
+    [Option(nameof(InstallPath), "i", "Целевой каталог установки.", true)]
+    /// <summary>Целевой каталог установки.</summary>
+    public string InstallPath { get; set; }
+
+    [Option(nameof(AppExe), "a", "Имя исполняемого файла приложения для перезапуска", true)]
+    /// <summary>Имя исполняемого файла приложения для перезапуска (e.g., MyBot.exe).</summary>
+    public string AppExe { get; set; }
+
+    [Option(nameof(RestartDelayMs), "rd", "Миллисекунды ожидания перед перезапуском", false, 500)]
+    /// <summary>Необязательно: подождите миллисекунды перед перезапуском.</summary>
+    public int RestartDelayMs { get; set; } = 500;
+
+    [Option(nameof(UpdateDelayMs), "ud", "Миллисекунды ожидания перед обновления", false, 500)]
+    /// <summary>Необязательно: подождите миллисекунды перед запуском обновления.</summary>
+    public int UpdateDelayMs { get; set; } = 500;
+
+    [Option(nameof(WaitProcess), "wp", "PID процесса, завершение которого необходимо дождаться", false)]
+    /// <summary>Необязательно: дождаться завершения процесса.</summary>
+    public int? WaitProcess { get; set; } = null;
+
+    public static string Usage =>
+        "Usage: Updater.exe --zip <path.zip> --installPath <dir> --appExe <file.exe> [--restartDelayMs <int>] [--updateDelayMs <int>] [--waitProcess <int>]";
+}

ReleaseUpdater.Common/ReleaseUpdater.Common.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+	  <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ArgumentsToolkit.Core" Version="0.0.3" />
+  </ItemGroup>
+
+</Project>

ReleaseUpdater.slnx

@@ -2,6 +2,8 @@
   <Folder Name="/Элементы решения/">
     <File Path="README.MD" />
   </Folder>
+  <Project Path="ReleaseUpdater.Common/ReleaseUpdater.Common.csproj" Id="e8c120b2-6520-4652-bb85-00fcfa8077b7" />
   <Project Path="ReleaseUpdater/ReleaseUpdater.csproj" />
+  <Project Path="Updater.Test/Updater.Test.csproj" />
   <Project Path="Updater/Updater.csproj" />
 </Solution>

ReleaseUpdater/ReleaseProvider.cs

@@ -6,7 +6,7 @@ namespace ReleaseUpdater;
 /// <summary>
 /// Провайдер для получения информации о релизах из Github / Gitea API.
 /// </summary>
-public sealed class GiteaReleaseProvider
+public sealed class ReleaseProvider
 {
     private static readonly JsonSerializerOptions JsonOpts = new(JsonSerializerDefaults.Web);
 

ReleaseUpdater/ReleaseUpdater.csproj

@@ -6,4 +6,22 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="ArgumentsToolkit.Core" Version="0.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ReleaseUpdater.Common\ReleaseUpdater.Common.csproj"
+					  PrivateAssets="none"
+					  IncludeAssets="all" 
+					  />
+  </ItemGroup>
+	
+	<Target Name="CopyProjectReferencesToPackage" AfterTargets="Pack">
+		<ItemGroup>
+			<BuildOutputInPackage Include="$(OutputPath)ReleaseUpdater.Common.dll"
+								  TargetPath="lib\net8.0\ReleaseUpdater.Common.dll" />
+		</ItemGroup>
+	</Target>
+
 </Project>

ReleaseUpdater/ReleaseUpdaterFacade.cs

@@ -29,7 +29,7 @@ public static class ReleaseUpdaterFacade
     /// </summary>
     public static async Task<IReadOnlyList<string>> GetVersionsAsync(string apiUrl, string? token = null)
     {
-        var provider = new GiteaReleaseProvider();
+        var provider = new ReleaseProvider();
         var releases = await provider.GetReleasesAsync(apiUrl, token);
         return releases.Select(r => r.TagName).ToList();
     }
@@ -42,7 +42,7 @@ public static class ReleaseUpdaterFacade
     {
         try
         {
-            var provider = new GiteaReleaseProvider();
+            var provider = new ReleaseProvider();
             var release = await provider.FindReleaseAsync(apiUrl, versionOrLatest, token)
                           ?? throw new Exception("Release not found");
 
@@ -72,11 +72,11 @@ public static class ReleaseUpdaterFacade
     /// Обновление через внешний Updater.exe.
     /// </summary>
     public static async Task UpdateWithExternalAsync(
-        string apiUrl, string? token, string installPath, string appExe, string versionOrLatest = "latest", string? updaterExePath = null)
+        string apiUrl, string? token, string installPath, string appExe, string versionOrLatest = "latest", string? updaterExePath = null, bool exitCurrentApp = false)
     {
         try
         {
-            var provider = new GiteaReleaseProvider();
+            var provider = new ReleaseProvider();
             var release = await provider.FindReleaseAsync(apiUrl, versionOrLatest, token)
                           ?? throw new Exception("Release not found");
 
@@ -88,8 +88,28 @@ public static class ReleaseUpdaterFacade
 
             BeforeInstall?.Invoke();
 
+
             if (updaterExePath == null) updaterExePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Updater.exe");
-            var args = $"--zip \"{zipPath}\" --installPath \"{installPath}\" --appExe \"{appExe}\"";
+
+            if (installPath.EndsWith("\\"))
+            {
+                installPath = installPath[0..(installPath.Length - 1)];
+            }
+
+            var updaterOptions = new Common.Options()
+            {
+                ZipPath = zipPath,
+                InstallPath = installPath,
+                AppExe = appExe,
+            };
+
+            if (exitCurrentApp)
+            {
+                int pid = Process.GetCurrentProcess().Id;
+                updaterOptions.WaitProcess = pid;
+            }
+
+            var args = ArgumentsToolkit.ArgumentsParser.ToArguments(updaterOptions, true);
 
             var process = Process.Start(new ProcessStartInfo
             {
@@ -99,6 +119,8 @@ public static class ReleaseUpdaterFacade
                 WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory
             });
 
+            if (exitCurrentApp) { Environment.Exit(0); }
+
             process?.WaitForExit();
 
             if (process?.ExitCode == 0)

Updater.Test/Program.cs

@@ -0,0 +1,21 @@
+using ReleaseUpdater;
+
+namespace Updater.Test;
+
+internal class Program
+{
+    static async Task Main(string[] args)
+    {
+
+        string installPath = AppDomain.CurrentDomain.BaseDirectory;
+        string appExe = "RetailUpdatesBot.exe";
+        string updaterPath = Path.Combine(installPath, "Tools\\Updater.exe");
+
+        var url = "https://git.frigat.duckdns.org/api/v1/repos/automacon/RetailUpdatesBot/releases";
+        var APIKey = "0552a77699d7506711946fc71cc6635515726bd1"; //токен
+
+        await ReleaseUpdaterFacade.UpdateWithExternalAsync(url, APIKey, installPath, appExe, "latest", updaterPath, true);
+
+        Console.ReadKey();
+    }
+}

Updater.Test/Updater.Test.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ReleaseUpdater\ReleaseUpdater.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Tools\Updater.exe">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

Updater/Core/ExitCodes.cs

@@ -0,0 +1,15 @@
+namespace Updater.Core;
+
+public static class ExitCodes
+{
+    /// <summary>Успешное обновление.</summary>
+    public const int Ok = 0;
+    /// <summary>Неверные аргументы командной строки.</summary>
+    public const int InvalidArgs = 2;
+    /// <summary>Ошибка извлечения.</summary>
+    public const int ExtractFailed = 3;
+    /// <summary>Ошибка установки (копировать/заменить).</summary>
+    public const int InstallFailed = 4;
+    /// <summary>Ошибка перезапуска.</summary>
+    public const int RestartFailed = 5;
+}

Updater/Core/Options.cs

@@ -1,66 +0,0 @@
-namespace Updater.Core;
-
-/// <summary>Параметры CLI для Updater.exe.</summary>
-public sealed class Options
-{
-    /// <summary>Путь к скачанному архиву (.zip).</summary>
-    public required string ZipPath { get; init; }
-
-    /// <summary>Целевой каталог установки.</summary>
-    public required string InstallPath { get; init; }
-
-    /// <summary>Имя исполняемого файла приложения для перезапуска (e.g., MyBot.exe).</summary>
-    public required string AppExe { get; init; }
-
-    /// <summary>Необязательно: подождите миллисекунды перед перезапуском (льготный период).</summary>
-    public int RestartDelayMs { get; init; } = 500;
-
-    public static string Usage =>
-        "Usage: Updater.exe --zip <path.zip> --installPath <dir> --appExe <file.exe> [--restartDelayMs <int>]";
-
-    /// <summary>Папрсинг CLI аргументов в Options.</summary>
-    public static Options Parse(string[] args)
-    {
-        var dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-        for (int i = 0; i < args.Length; i++)
-        {
-            if (!args[i].StartsWith("--")) continue;
-            var key = args[i][2..];
-            var val = (i + 1 < args.Length && !args[i + 1].StartsWith("--")) ? args[i + 1] : "true";
-            dict[key] = val;
-        }
-
-        var zip = Require(dict, "zip");
-        var install = Require(dict, "installPath");
-        var exe = Require(dict, "appExe");
-
-        if (!File.Exists(zip)) throw new FileNotFoundException("Zip not found", zip);
-        Directory.CreateDirectory(install);
-
-        return new Options
-        {
-            ZipPath = Path.GetFullPath(zip),
-            InstallPath = Path.GetFullPath(install),
-            AppExe = exe,
-            RestartDelayMs = dict.TryGetValue("restartDelayMs", out var d) && int.TryParse(d, out var n) ? n : 500
-        };
-    }
-
-    private static string Require(IDictionary<string, string> dict, string key)
-        => dict.TryGetValue(key, out var v) && !string.IsNullOrWhiteSpace(v)
-           ? v : throw new ArgumentException($"Missing --{key}");
-}
-
-public static class ExitCodes
-{
-    /// <summary>Успешное обновление.</summary>
-    public const int Ok = 0;
-    /// <summary>Неверные аргументы командной строки.</summary>
-    public const int InvalidArgs = 2;
-    /// <summary>Ошибка извлечения.</summary>
-    public const int ExtractFailed = 3;
-    /// <summary>Ошибка установки (копировать/заменить).</summary>
-    public const int InstallFailed = 4;
-    /// <summary>Ошибка перезапуска.</summary>
-    public const int RestartFailed = 5;
-}

Updater/Core/UpdaterApp.cs

@@ -1,4 +1,6 @@
-namespace Updater.Core;
+using ReleaseUpdater.Common;
+
+namespace Updater.Core;
 
 /// <summary>
 /// Управляет потоком обновлений: извлечение, установка, перезапуск.

Updater/Program.cs

@@ -1,4 +1,6 @@
-using Updater.Core;
+using ReleaseUpdater.Common;
+using System.Diagnostics;
+using Updater.Core;
 
 namespace Updater;
 
@@ -7,23 +9,43 @@ internal sealed class Program
     static int Main(string[] args)
     {
         var logger = new ConsoleLogger();
-        Options? options;
+
-        try
+        var parseResult = ArgumentsToolkit.ArgumentsParser.Parse<Options>(args);
+
+        if (!parseResult.Success)
         {
-            options = Options.Parse(args);
+            logger.Error($"Arguments error:");
-        }
+            parseResult.Errors.ForEach(t => logger.Error(t.Message));
-        catch (Exception ex)
-        {
-            logger.Error($"Arguments error: {ex.Message}");
-            Console.WriteLine(Options.Usage);
             return ExitCodes.InvalidArgs;
         }
 
+        var options = parseResult.Value!;
+
+        Thread.Sleep(options.UpdateDelayMs);
+
+        if (options.WaitProcess != null)
+            try
+            {
+                using (var proc = Process.GetProcessById(options.WaitProcess.Value))
+                {
+                    logger.Info($"Waiting for the process to complete {options.WaitProcess}...");
+                    proc.WaitForExit(); // блокирует выполнение до завершения процесса
+                    logger.Info("Process is completed.");
+                }
+            }
+            catch (ArgumentException)
+            {
+                logger.Info($"Process with PID {options.WaitProcess} not found.");
+            }
+
+
         var extractor = new ZipExtractor(logger);
         var installer = new SafeFileInstaller(logger);
         var procMgr = new ProcessManager(logger);
         var app = new UpdaterApp(logger, extractor, installer, procMgr);
 
-        return app.Run(options);
+
+        var exitCode = app.Run(options);
+        return exitCode;
     }
 }

Updater/Updater.csproj

@@ -7,4 +7,12 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="ArgumentsToolkit" Version="0.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ReleaseUpdater.Common\ReleaseUpdater.Common.csproj" />
+  </ItemGroup>
+
 </Project>

nuget.config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="Gitea_FrigaT" value="https://git.frigat.duckdns.org/api/packages/FrigaT/nuget/index.json" />
+  </packageSources>
+  <packageSourceCredentials>
+    <GiteaFeed>
+      <add key="Username" value="FrigaT" />
+      <add key="ClearTextPassword" value="e5a0d9cc9684bbb4bf8d3f12fd2d0b43f9b0f336" />
+    </GiteaFeed>
+  </packageSourceCredentials>
+</configuration>