Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 14:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve eternal TODO with ASF API update routine

Browse Source
This commit is contained in:
Łukasz Domeradzki
2024-10-12 21:03:11 +02:00
parent f427b89617
commit f32fafdf15
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ArchiSteamFarm/Core/ASF.cs
View File

@@ -36,6 +36,7 @@ using System.Threading;
using System.Threading.Tasks;
using ArchiSteamFarm.Helpers;
using ArchiSteamFarm.IPC;
using ArchiSteamFarm.IPC.Controllers.Api;
using ArchiSteamFarm.Localization;
using ArchiSteamFarm.NLog;
using ArchiSteamFarm.Plugins;
@@ -894,11 +895,14 @@ public static class ASF {
if (kestrelWasRunning) {
// We disable ArchiKestrel here as the update process moves the core files and might result in IPC crash
// TODO: It might fail if the update was triggered from the API, this should be something to improve in the future, by changing the structure into request -> return response -> finish update
ASFController.PendingVersionUpdate = newVersion;
try {
await ArchiKestrel.Stop().ConfigureAwait(false);
} catch (Exception e) {
ArchiLogger.LogGenericWarningException(e);
} finally {
ASFController.PendingVersionUpdate = null;
}
}

28
ArchiSteamFarm/IPC/Controllers/Api/ASFController.cs
View File

@@ -34,11 +34,22 @@ using ArchiSteamFarm.Localization;
using ArchiSteamFarm.Steam.Interaction;
using ArchiSteamFarm.Storage;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Hosting;
namespace ArchiSteamFarm.IPC.Controllers.Api;
[Route("Api/ASF")]
public sealed class ASFController : ArchiController {
internal static Version? PendingVersionUpdate { get; set; }
private readonly IHostApplicationLifetime ApplicationLifetime;
public ASFController(IHostApplicationLifetime applicationLifetime) {
ArgumentNullException.ThrowIfNull(applicationLifetime);
ApplicationLifetime = applicationLifetime;
}
/// <summary>
/// Encrypts data with ASF encryption mechanisms using provided details.
/// </summary>
@@ -185,7 +196,22 @@ public sealed class ASFController : ArchiController {
return BadRequest(new GenericResponse(false, Strings.FormatErrorIsInvalid(nameof(request.Channel))));
}
(bool success, string? message, Version? version) = await Actions.Update(request.Channel, request.Forced).ConfigureAwait(false);
// Update process can result in kestrel shutdown request, just before patching the files
// In this case, we have very little opportunity to do anything, especially we will not have access to the return value of the action
// That's because update action will synchronously stop the kestrel, and wait for it before proceeding with an update, and that'll wait for us finishing the request, never happening
// Therefore, we'll allow this action to proceed while listening for application shutdown request, if it happens, we'll do our best by getting alternative signal that update is proceeding
bool success;
string? message = null;
Version? version;
try {
(success, message, version) = await Task.Run(() => Actions.Update(request.Channel, request.Forced), ApplicationLifetime.ApplicationStopping).ConfigureAwait(false);
} catch (TaskCanceledException e) {
// It's almost guaranteed that this is the result of update process requesting kestrel shutdown
// However, we're still going to check PendingVersionUpdate, which should be set by the update process as alternative way to inform us about pending update
version = PendingVersionUpdate;
success = version != null;
}
if (string.IsNullOrEmpty(message)) {
message = success ? Strings.Success : Strings.WarningFailed;