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

Fix kestrel deadlock in update procedure when using update command

Browse Source
This commit is contained in:
Łukasz Domeradzki
2024-11-10 15:36:41 +01:00
parent 9058898f3b
commit 540408a3d0
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ArchiSteamFarm/IPC/Controllers/Api/CommandController.cs
View File

@@ -23,6 +23,7 @@
using System;
using System.Net;
using System.Threading;
using System.Threading.Tasks;
using ArchiSteamFarm.Core;
using ArchiSteamFarm.IPC.Requests;
@@ -31,11 +32,20 @@ using ArchiSteamFarm.Localization;
using ArchiSteamFarm.Steam;
using ArchiSteamFarm.Storage;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Hosting;
namespace ArchiSteamFarm.IPC.Controllers.Api;
[Route("Api/Command")]
public sealed class CommandController : ArchiController {
private readonly IHostApplicationLifetime ApplicationLifetime;
public CommandController(IHostApplicationLifetime applicationLifetime) {
ArgumentNullException.ThrowIfNull(applicationLifetime);
ApplicationLifetime = applicationLifetime;
}
/// <summary>
/// Executes a command.
/// </summary>
@@ -72,8 +82,28 @@ public sealed class CommandController : ArchiController {
command = command[commandPrefix.Length..];
}
string? response = await targetBot.Commands.Response(EAccess.Owner, command).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 command
// That's because update command 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 command to proceed while listening for application shutdown request, if it happens, we'll do our best by getting alternative signal that update is proceeding
TaskCompletionSource<bool> applicationStopping = new();
return Ok(new GenericResponse<string>(response));
CancellationTokenRegistration applicationStoppingRegistration = ApplicationLifetime.ApplicationStopping.Register(() => applicationStopping.SetResult(true));
await using (applicationStoppingRegistration.ConfigureAwait(false)) {
Task<string?> commandTask = targetBot.Commands.Response(EAccess.Owner, command);
string? response;
if (await Task.WhenAny(commandTask, applicationStopping.Task).ConfigureAwait(false) == commandTask) {
response = await commandTask.ConfigureAwait(false);
} else {
// 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
response = ASFController.PendingVersionUpdate != null ? Strings.PatchingFiles : Strings.Exiting;
}
return Ok(new GenericResponse<string>(response));
}
}
}