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

Improve InvalidPassword/RateLimitExceeded procedure

Browse Source 
Previously we had this awful "assume rate limit if invalid password" because Steam used to do this falsely for rate limits as well.

Since I can no longer reproduce this false behaviour with latest network, I assume that Valve corrected whatever they had broken back then and the network will properly tell us RLE in RLE condition, and invalid password when account credentials are invalid.

There is still case for invalid account credentials when login key is invalid, and we should still handle that one gracefully.
This commit is contained in:
JustArchi
2019-06-23 02:05:49 +02:00
parent b2eabe93d9
commit 08926aa2f1
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ArchiSteamFarm/Bot.cs
View File

@@ -65,8 +65,6 @@ namespace ArchiSteamFarm {
private static readonly SemaphoreSlim LoginRateLimitingSemaphore = new SemaphoreSlim(1, 1);
private static readonly SemaphoreSlim LoginSemaphore = new SemaphoreSlim(1, 1);
private static bool LoginRateLimited;
[JsonIgnore]
[PublicAPI]
public readonly Actions Actions;
@@ -2033,6 +2031,7 @@ namespace ArchiSteamFarm {
switch (lastLogOnResult) {
case EResult.AccountDisabled:
case EResult.InvalidPassword when string.IsNullOrEmpty(BotDatabase.LoginKey):
// Do not attempt to reconnect, those failures are permanent
return;
case EResult.Invalid:
@@ -2042,11 +2041,6 @@ namespace ArchiSteamFarm {
break;
case EResult.InvalidPassword:
// If we didn't use login key, it's nearly always rate limiting
if (string.IsNullOrEmpty(BotDatabase.LoginKey)) {
goto case EResult.RateLimitExceeded;
}
await BotDatabase.SetLoginKey().ConfigureAwait(false);
ArchiLogger.LogGenericInfo(Strings.BotRemovedExpiredLoginKey);
@@ -2061,22 +2055,12 @@ namespace ArchiSteamFarm {
case EResult.RateLimitExceeded:
ArchiLogger.LogGenericInfo(string.Format(Strings.BotRateLimitExceeded, TimeSpan.FromMinutes(LoginCooldownInMinutes).ToHumanReadable()));
if (LoginRateLimited) {
if (!await LoginRateLimitingSemaphore.WaitAsync(1000 * WebBrowser.MaxTries).ConfigureAwait(false)) {
break;
}
await LoginRateLimitingSemaphore.WaitAsync().ConfigureAwait(false);
try {
if (LoginRateLimited) {
break;
}
LoginRateLimited = true;
await Task.Delay(LoginCooldownInMinutes * 60 * 1000).ConfigureAwait(false);
LoginRateLimited = false;
} finally {
LoginRateLimitingSemaphore.Release();
}
@@ -2350,6 +2334,7 @@ namespace ArchiSteamFarm {
switch (callback.Result) {
case EResult.AccountDisabled:
case EResult.InvalidPassword when string.IsNullOrEmpty(BotDatabase.LoginKey):
// Those failures are permanent, we should Stop() the bot if any of those happen
ArchiLogger.LogGenericWarning(string.Format(Strings.BotUnableToLogin, callback.Result, callback.ExtendedResult));
Stop();