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

Handle edge case of session invalidation during heartbeats

Browse Source
This commit is contained in:
Archi
2022-12-23 16:34:42 +01:00
parent 71a52eb3b2
commit 1daa6728f6
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ArchiSteamFarm.OfficialPlugins.ItemsMatcher/Backend.cs
View File

@@ -95,15 +95,13 @@ internal static class Backend {
return (response.StatusCode, response.Content?.Result ?? ImmutableHashSet<ListedUser>.Empty);
}
internal static async Task<HttpStatusCode?> HeartBeatForListing(Bot bot) {
internal static async Task<BasicResponse?> HeartBeatForListing(Bot bot) {
ArgumentNullException.ThrowIfNull(bot);
Uri request = new(ArchiNet.URL, "/Api/Listing/HeartBeat");
HeartBeatRequest data = new(ASF.GlobalDatabase?.Identifier ?? Guid.NewGuid(), bot.SteamID);
BasicResponse? response = await bot.ArchiWebHandler.WebBrowser.UrlPost(request, data: data, requestOptions: WebBrowser.ERequestOptions.ReturnClientErrors).ConfigureAwait(false);
return response?.StatusCode;
return await bot.ArchiWebHandler.WebBrowser.UrlPost(request, data: data, requestOptions: WebBrowser.ERequestOptions.ReturnRedirections | WebBrowser.ERequestOptions.ReturnClientErrors).ConfigureAwait(false);
}
}

22
ArchiSteamFarm.OfficialPlugins.ItemsMatcher/RemoteCommunication.cs
View File

@@ -327,13 +327,29 @@ internal sealed class RemoteCommunication : IAsyncDisposable, IDisposable {
}
try {
HttpStatusCode? response = await Backend.HeartBeatForListing(Bot).ConfigureAwait(false);
BasicResponse? response = await Backend.HeartBeatForListing(Bot).ConfigureAwait(false);
if (!response.HasValue) {
if (response == null) {
// This is actually a network failure, we should keep sending heartbeats for now
return;
}
if (response.Value.IsClientErrorCode()) {
if (response.StatusCode.IsRedirectionCode()) {
ShouldSendHeartBeats = false;
if (response.FinalUri.Host != ArchiWebHandler.SteamCommunityURL.Host) {
ASF.ArchiLogger.LogGenericError(string.Format(CultureInfo.CurrentCulture, Strings.WarningUnknownValuePleaseReport, nameof(response.FinalUri), response.FinalUri));
return;
}
// We've expected the result, not the redirection to the sign in, we need to authenticate again
SignedInWithSteam = false;
return;
}
if (response.StatusCode.IsClientErrorCode()) {
ShouldSendHeartBeats = false;
return;