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

Approach the problem in better way

Browse Source 
The general problem is a mix of a few things: The fact that we don't have much time before steam network disconnects us, if we connect to it and not send log in request in acceptable time, the fact that Steam API might be unavailable and not provide us with server time, and the fact that we must know that time to generate valid tokens.
Previous solution would simply generate token immediately without asking Steam API, and schedule update in background for later, so even if we had incorrect time and failure of first try, second try would usually come with the right clock. If not, eventually we'd succeed anyway.
However, it's possible to slightly improve that - we can generate 2FA code BEFORE even connecting to steam network, this way we have time to ask Steam API, and in worst case of API timeout we'll simply try with our own clock anyway, and if it succeeds, timeframe before connecting and sending logon request should be small enough to fit - in worst case of being on the edge of 30 seconds, we'll simply try again later.
Perhaps it'd also make sense to modify slightly MobileAuthenticator to block and wait in case code is expiring in less than 5 seconds, that could be cool too!
This commit is contained in:
JustArchi
2016-09-16 23:09:09 +02:00
parent feb80fbf49
commit 160bfd612f
1 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
ArchiSteamFarm/Bot.cs
View File

@@ -361,9 +361,7 @@ namespace ArchiSteamFarm {
KeepRunning = false;
if (SteamClient.IsConnected) {
lock (SteamClient) {
SteamClient.Disconnect();
}
Disconnect();
}
Events.OnBotShutdown();
@@ -523,18 +521,35 @@ namespace ArchiSteamFarm {
}
Logging.LogGenericWarning("Connection to Steam Network lost, reconnecting...", BotName);
Connect(true).Forget();
}
}
Task.Run(async () => {
await LimitLoginRequestsAsync().ConfigureAwait(false);
private async Task Connect(bool force = false) {
if (!force && (!KeepRunning || SteamClient.IsConnected)) {
return;
}
if (!IsConnectedAndLoggedOn) {
return;
}
// Use limiter only when user is not providing 2FA token by himself
if (string.IsNullOrEmpty(TwoFactorCode) && (BotDatabase.MobileAuthenticator != null)) {
await LimitLoginRequestsAsync().ConfigureAwait(false);
lock (SteamClient) {
SteamClient.Connect();
}
}).Forget();
// In this case, we can also use ASF 2FA for providing 2FA token, even if it's not required
TwoFactorCode = await BotDatabase.MobileAuthenticator.GenerateToken().ConfigureAwait(false);
}
lock (SteamClient) {
if (!force && (!KeepRunning || SteamClient.IsConnected)) {
return;
}
SteamClient.Connect();
}
}
private void Disconnect() {
lock (SteamClient) {
SteamClient.Disconnect();
}
}
@@ -545,10 +560,7 @@ namespace ArchiSteamFarm {
Logging.LogGenericInfo("Starting...", BotName);
}
await LimitLoginRequestsAsync().ConfigureAwait(false);
lock (SteamClient) {
SteamClient.Connect();
}
await Connect().ConfigureAwait(false);
}
private bool IsMaster(ulong steamID) {
@@ -1596,7 +1608,7 @@ namespace ArchiSteamFarm {
ArchiHandler.PlayGames(BotConfig.GamesPlayedWhileIdle, BotConfig.CustomGamePlayedWhileIdle);
}
private async void OnConnected(SteamClient.ConnectedCallback callback) {
private void OnConnected(SteamClient.ConnectedCallback callback) {
if (callback == null) {
Logging.LogNullError(nameof(callback), BotName);
return;
@@ -1611,9 +1623,7 @@ namespace ArchiSteamFarm {
if (!KeepRunning) {
Logging.LogGenericInfo("Disconnecting...", BotName);
lock (SteamClient) {
SteamClient.Disconnect();
}
Disconnect();
return;
}
@@ -1634,11 +1644,6 @@ namespace ArchiSteamFarm {
Logging.LogGenericInfo("Logging in...", BotName);
// If we have ASF 2FA enabled, we can always provide TwoFactorCode, and save a request
if (BotDatabase.MobileAuthenticator != null) {
TwoFactorCode = await BotDatabase.MobileAuthenticator.GenerateToken().ConfigureAwait(false);
}
SteamUser.LogOnDetails logOnDetails = new SteamUser.LogOnDetails {
Username = BotConfig.SteamLogin,
Password = BotConfig.SteamPassword,
@@ -1695,19 +1700,7 @@ namespace ArchiSteamFarm {
}
Logging.LogGenericInfo("Reconnecting...", BotName);
// 2FA tokens are expiring soon, don't use limiter when user is providing one
if ((TwoFactorCode == null) || (BotDatabase.MobileAuthenticator != null)) {
await LimitLoginRequestsAsync().ConfigureAwait(false);
if (!KeepRunning || SteamClient.IsConnected) {
return;
}
}
lock (SteamClient) {
SteamClient.Connect();
}
await Connect().ConfigureAwait(false);
}
private void OnFreeLicense(SteamApps.FreeLicenseCallback callback) {
@@ -1920,7 +1913,7 @@ namespace ArchiSteamFarm {
return;
}
// Reset one-time-only access tokens
// Always reset one-time-only access tokens
AuthCode = TwoFactorCode = null;
switch (callback.Result) {