Compare commits

...

11 Commits

Author SHA1 Message Date
JustArchi
7587ff024c Add more debugging for SK2 2016-03-13 21:22:52 +01:00
JustArchi
06778c9bb0 Misc 2016-03-13 20:56:23 +01:00
JustArchi
7a97045412 Add ForceHttp 2016-03-13 20:19:52 +01:00
JustArchi
5d9bedfd28 Misc 2016-03-13 18:16:43 +01:00
JustArchi
575992c25d Increase HttpTimeout to 60 2016-03-13 17:03:15 +01:00
JustArchi
72db5bc9f3 We don't need that delay anymore 2016-03-12 17:03:53 +01:00
JustArchi
b015720a3e Add workaround for Volvo fuckup, #135 2016-03-12 17:02:02 +01:00
JustArchi
84a6d4501b Bump 2016-03-12 06:39:08 +01:00
JustArchi
07049e71c0 Misc 2016-03-12 06:01:55 +01:00
JustArchi
4710d9c1eb Add support for WinAuth, #144 2016-03-12 05:58:51 +01:00
JustArchi
d08462745a I swear no more bumps tonight 2016-03-11 21:42:16 +01:00
11 changed files with 188 additions and 71 deletions

View File

@@ -34,6 +34,10 @@ using System.Threading.Tasks;
namespace ArchiSteamFarm { namespace ArchiSteamFarm {
internal sealed class ArchiWebHandler { internal sealed class ArchiWebHandler {
private const string SteamCommunity = "steamcommunity.com";
private static string SteamCommunityURL = "https://" + SteamCommunity;
private static int Timeout = 30 * 1000; private static int Timeout = 30 * 1000;
private readonly Bot Bot; private readonly Bot Bot;
@@ -43,6 +47,7 @@ namespace ArchiSteamFarm {
internal static void Init() { internal static void Init() {
Timeout = Program.GlobalConfig.HttpTimeout * 1000; Timeout = Program.GlobalConfig.HttpTimeout * 1000;
SteamCommunityURL = (Program.GlobalConfig.ForceHttp ? "http://" : "https://") + SteamCommunity;
} }
internal ArchiWebHandler(Bot bot) { internal ArchiWebHandler(Bot bot) {
@@ -91,7 +96,7 @@ namespace ArchiSteamFarm {
sessionkey: Encoding.ASCII.GetString(WebUtility.UrlEncodeToBytes(cryptedSessionKey, 0, cryptedSessionKey.Length)), sessionkey: Encoding.ASCII.GetString(WebUtility.UrlEncodeToBytes(cryptedSessionKey, 0, cryptedSessionKey.Length)),
encrypted_loginkey: Encoding.ASCII.GetString(WebUtility.UrlEncodeToBytes(cryptedLoginKey, 0, cryptedLoginKey.Length)), encrypted_loginkey: Encoding.ASCII.GetString(WebUtility.UrlEncodeToBytes(cryptedLoginKey, 0, cryptedLoginKey.Length)),
method: WebRequestMethods.Http.Post, method: WebRequestMethods.Http.Post,
secure: true secure: !Program.GlobalConfig.ForceHttp
); );
} catch (Exception e) { } catch (Exception e) {
Logging.LogGenericException(e, Bot.BotName); Logging.LogGenericException(e, Bot.BotName);
@@ -126,7 +131,7 @@ namespace ArchiSteamFarm {
HtmlDocument htmlDocument = null; HtmlDocument htmlDocument = null;
for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) { for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) {
htmlDocument = await WebBrowser.UrlGetToHtmlDocument("https://steamcommunity.com/my/profile", Cookie).ConfigureAwait(false); htmlDocument = await WebBrowser.UrlGetToHtmlDocument(SteamCommunityURL + "/my/profile", Cookie).ConfigureAwait(false);
} }
if (htmlDocument == null) { if (htmlDocument == null) {
@@ -163,7 +168,7 @@ namespace ArchiSteamFarm {
response = iEconService.GetTradeOffers( response = iEconService.GetTradeOffers(
get_received_offers: 1, get_received_offers: 1,
active_only: 1, active_only: 1,
secure: true secure: !Program.GlobalConfig.ForceHttp
); );
} catch (Exception e) { } catch (Exception e) {
Logging.LogGenericException(e, Bot.BotName); Logging.LogGenericException(e, Bot.BotName);
@@ -180,7 +185,7 @@ namespace ArchiSteamFarm {
foreach (KeyValue trade in response["trade_offers_received"].Children) { foreach (KeyValue trade in response["trade_offers_received"].Children) {
Steam.TradeOffer tradeOffer = new Steam.TradeOffer { Steam.TradeOffer tradeOffer = new Steam.TradeOffer {
tradeofferid = trade["tradeofferid"].AsString(), tradeofferid = trade["tradeofferid"].AsString(),
accountid_other = trade["accountid_other"].AsInteger(), accountid_other = (uint) trade["accountid_other"].AsUnsignedLong(), // TODO: Correct this when SK2 with https://github.com/SteamRE/SteamKit/pull/255 gets released
trade_offer_state = trade["trade_offer_state"].AsEnum<Steam.TradeOffer.ETradeOfferState>() trade_offer_state = trade["trade_offer_state"].AsEnum<Steam.TradeOffer.ETradeOfferState>()
}; };
foreach (KeyValue item in trade["items_to_give"].Children) { foreach (KeyValue item in trade["items_to_give"].Children) {
@@ -219,7 +224,7 @@ namespace ArchiSteamFarm {
return false; return false;
} }
string request = "https://steamcommunity.com/gid/" + clanID; string request = SteamCommunityURL + "/gid/" + clanID;
Dictionary<string, string> data = new Dictionary<string, string>(2) { Dictionary<string, string> data = new Dictionary<string, string>(2) {
{"sessionID", sessionID}, {"sessionID", sessionID},
@@ -249,7 +254,7 @@ namespace ArchiSteamFarm {
return false; return false;
} }
string referer = "https://steamcommunity.com/tradeoffer/" + tradeID; string referer = SteamCommunityURL + "/tradeoffer/" + tradeID;
string request = referer + "/accept"; string request = referer + "/accept";
Dictionary<string, string> data = new Dictionary<string, string>(3) { Dictionary<string, string> data = new Dictionary<string, string>(3) {
@@ -285,7 +290,7 @@ namespace ArchiSteamFarm {
response = iEconService.DeclineTradeOffer( response = iEconService.DeclineTradeOffer(
tradeofferid: tradeID.ToString(), tradeofferid: tradeID.ToString(),
method: WebRequestMethods.Http.Post, method: WebRequestMethods.Http.Post,
secure: true secure: !Program.GlobalConfig.ForceHttp
); );
} catch (Exception e) { } catch (Exception e) {
Logging.LogGenericException(e, Bot.BotName); Logging.LogGenericException(e, Bot.BotName);
@@ -304,7 +309,7 @@ namespace ArchiSteamFarm {
internal async Task<List<Steam.Item>> GetMyTradableInventory() { internal async Task<List<Steam.Item>> GetMyTradableInventory() {
JObject jObject = null; JObject jObject = null;
for (byte i = 0; i < WebBrowser.MaxRetries && jObject == null; i++) { for (byte i = 0; i < WebBrowser.MaxRetries && jObject == null; i++) {
jObject = await WebBrowser.UrlGetToJObject("https://steamcommunity.com/my/inventory/json/753/6?trading=1", Cookie).ConfigureAwait(false); jObject = await WebBrowser.UrlGetToJObject(SteamCommunityURL + "/my/inventory/json/753/6?trading=1", Cookie).ConfigureAwait(false);
} }
if (jObject == null) { if (jObject == null) {
@@ -362,7 +367,7 @@ namespace ArchiSteamFarm {
}); });
} }
string referer = "https://steamcommunity.com/tradeoffer/new"; string referer = SteamCommunityURL + "/tradeoffer/new";
string request = referer + "/send"; string request = referer + "/send";
foreach (Steam.TradeOfferRequest trade in trades) { foreach (Steam.TradeOfferRequest trade in trades) {
@@ -396,7 +401,7 @@ namespace ArchiSteamFarm {
HtmlDocument htmlDocument = null; HtmlDocument htmlDocument = null;
for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) { for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) {
htmlDocument = await WebBrowser.UrlGetToHtmlDocument("https://steamcommunity.com/profiles/" + SteamID + "/badges?l=english&p=" + page, Cookie).ConfigureAwait(false); htmlDocument = await WebBrowser.UrlGetToHtmlDocument(SteamCommunityURL + "/profiles/" + SteamID + "/badges?l=english&p=" + page, Cookie).ConfigureAwait(false);
} }
if (htmlDocument == null) { if (htmlDocument == null) {
@@ -414,7 +419,7 @@ namespace ArchiSteamFarm {
HtmlDocument htmlDocument = null; HtmlDocument htmlDocument = null;
for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) { for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) {
htmlDocument = await WebBrowser.UrlGetToHtmlDocument("https://steamcommunity.com/profiles/" + SteamID + "/gamecards/" + appID + "?l=english", Cookie).ConfigureAwait(false); htmlDocument = await WebBrowser.UrlGetToHtmlDocument(SteamCommunityURL + "/profiles/" + SteamID + "/gamecards/" + appID + "?l=english", Cookie).ConfigureAwait(false);
} }
if (htmlDocument == null) { if (htmlDocument == null) {
@@ -432,7 +437,7 @@ namespace ArchiSteamFarm {
HttpResponseMessage response = null; HttpResponseMessage response = null;
for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) { for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
response = await WebBrowser.UrlGet("https://steamcommunity.com/profiles/" + SteamID + "/inventory", Cookie).ConfigureAwait(false); response = await WebBrowser.UrlGet(SteamCommunityURL + "/profiles/" + SteamID + "/inventory", Cookie).ConfigureAwait(false);
} }
if (response == null) { if (response == null) {
@@ -453,9 +458,12 @@ namespace ArchiSteamFarm {
{ "pin", parentalPin } { "pin", parentalPin }
}; };
string referer = SteamCommunityURL;
string request = referer + "/parental/ajaxunlock";
HttpResponseMessage response = null; HttpResponseMessage response = null;
for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) { for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
response = await WebBrowser.UrlPost("https://steamcommunity.com/parental/ajaxunlock", data, Cookie, "https://steamcommunity.com/").ConfigureAwait(false); response = await WebBrowser.UrlPost(request, data, Cookie, referer).ConfigureAwait(false);
} }
if (response == null) { if (response == null) {

View File

@@ -172,26 +172,16 @@ namespace ArchiSteamFarm {
SentryFile = botPath + ".bin"; SentryFile = botPath + ".bin";
// Support and convert SDA files // Support and convert SDA files
if (BotDatabase.SteamGuardAccount == null && File.Exists(botPath + ".maFile")) { string maFilePath = botPath + ".maFile";
Logging.LogGenericInfo("Converting SDA .maFile into ASF format...", botName); if (BotDatabase.SteamGuardAccount == null && File.Exists(maFilePath)) {
try { ImportAuthenticator(maFilePath);
BotDatabase.SteamGuardAccount = JsonConvert.DeserializeObject<SteamGuardAccount>(File.ReadAllText(botPath + ".maFile"));
File.Delete(botPath + ".maFile");
Logging.LogGenericInfo("Success!", botName);
} catch (Exception e) {
Logging.LogGenericException(e, botName);
}
} }
// Initialize // Initialize
SteamClient = new SteamClient(); SteamClient = new SteamClient();
if (Program.GlobalConfig.Debug && !Debugging.NetHookAlreadyInitialized) { if (Program.GlobalConfig.Debug && !Debugging.NetHookAlreadyInitialized && Directory.Exists(Program.DebugDirectory)) {
try { try {
if (Directory.Exists(Program.DebugDirectory)) {
Directory.Delete(Program.DebugDirectory, true);
}
Directory.CreateDirectory(Program.DebugDirectory);
SteamClient.DebugNetworkListener = new NetHookNetworkListener(Program.DebugDirectory); SteamClient.DebugNetworkListener = new NetHookNetworkListener(Program.DebugDirectory);
Debugging.NetHookAlreadyInitialized = true; Debugging.NetHookAlreadyInitialized = true;
} catch (Exception e) { } catch (Exception e) {
@@ -298,8 +288,7 @@ namespace ArchiSteamFarm {
} }
internal async Task Restart() { internal async Task Restart() {
Stop(); await Stop().ConfigureAwait(false);
await Utilities.SleepAsync(500).ConfigureAwait(false);
await Start().ConfigureAwait(false); await Start().ConfigureAwait(false);
} }
@@ -308,7 +297,7 @@ namespace ArchiSteamFarm {
await ResponseSendTrade().ConfigureAwait(false); await ResponseSendTrade().ConfigureAwait(false);
} }
if (BotConfig.ShutdownOnFarmingFinished) { if (BotConfig.ShutdownOnFarmingFinished) {
Shutdown(); await Shutdown().ConfigureAwait(false);
} }
} }
@@ -346,7 +335,7 @@ namespace ArchiSteamFarm {
case "!statusall": case "!statusall":
return ResponseStatusAll(); return ResponseStatusAll();
case "!stop": case "!stop":
return ResponseStop(); return await ResponseStop().ConfigureAwait(false);
case "!update": case "!update":
await Program.CheckForUpdate().ConfigureAwait(false); await Program.CheckForUpdate().ConfigureAwait(false);
return "Done!"; return "Done!";
@@ -389,7 +378,7 @@ namespace ArchiSteamFarm {
case "!status": case "!status":
return ResponseStatus(args[1]); return ResponseStatus(args[1]);
case "!stop": case "!stop":
return ResponseStop(args[1]); return await ResponseStop(args[1]).ConfigureAwait(false);
default: default:
return "Unrecognized command: " + args[0]; return "Unrecognized command: " + args[0];
} }
@@ -416,22 +405,87 @@ namespace ArchiSteamFarm {
SteamClient.Connect(); SteamClient.Connect();
} }
private void Stop() { private async Task Stop() {
if (!SteamClient.IsConnected) { if (!SteamClient.IsConnected) {
return; return;
} }
Logging.LogGenericInfo("Stopping...", BotName); Logging.LogGenericInfo("Stopping...", BotName);
for (byte i = 0; i < WebBrowser.MaxRetries && SteamClient.IsConnected; i++) {
SteamClient.Disconnect(); SteamClient.Disconnect();
await Utilities.SleepAsync(1000).ConfigureAwait(false);
} }
private void Shutdown() { if (SteamClient.IsConnected) {
Logging.LogGenericWarning("Could not stop this bot instance!", BotName);
} else {
Logging.LogGenericInfo("Stopped!", BotName);
}
}
private async Task Shutdown() {
KeepRunning = false; KeepRunning = false;
Stop(); await Stop().ConfigureAwait(false);
Program.OnBotShutdown(); Program.OnBotShutdown();
} }
private void ImportAuthenticator(string maFilePath) {
if (BotDatabase.SteamGuardAccount != null || !File.Exists(maFilePath)) {
return;
}
Logging.LogGenericInfo("Converting SDA .maFile into ASF format...", BotName);
try {
BotDatabase.SteamGuardAccount = JsonConvert.DeserializeObject<SteamGuardAccount>(File.ReadAllText(maFilePath));
File.Delete(maFilePath);
Logging.LogGenericInfo("Success!", BotName);
} catch (Exception e) {
Logging.LogGenericException(e, BotName);
return;
}
// If this is SDA file, then we should already have everything ready
if (BotDatabase.SteamGuardAccount.Session != null) {
Logging.LogGenericInfo("Successfully finished importing mobile authenticator!", BotName);
return;
}
// But here we're dealing with WinAuth authenticator
Logging.LogGenericInfo("ASF requires a few more steps to complete authenticator import...", BotName);
InitializeLoginAndPassword();
UserLogin userLogin = new UserLogin(BotConfig.SteamLogin, BotConfig.SteamPassword);
LoginResult loginResult;
while ((loginResult = userLogin.DoLogin()) != LoginResult.LoginOkay) {
switch (loginResult) {
case LoginResult.Need2FA:
userLogin.TwoFactorCode = Program.GetUserInput(BotName, Program.EUserInputType.TwoFactorAuthentication);
break;
default:
Logging.LogGenericError("Unhandled situation: " + loginResult, BotName);
return;
}
}
if (userLogin.Session == null) {
BotDatabase.SteamGuardAccount = null;
Logging.LogGenericError("Session is invalid, linking can't be completed!", BotName);
return;
}
BotDatabase.SteamGuardAccount.FullyEnrolled = true;
BotDatabase.SteamGuardAccount.Session = userLogin.Session;
if (string.IsNullOrEmpty(BotDatabase.SteamGuardAccount.DeviceID)) {
BotDatabase.SteamGuardAccount.DeviceID = Program.GetUserInput(BotName, Program.EUserInputType.DeviceID);
}
BotDatabase.Save();
Logging.LogGenericInfo("Successfully finished importing mobile authenticator!", BotName);
}
private string ResponseStatus() { private string ResponseStatus() {
if (CardsFarmer.CurrentGamesFarming.Count > 0) { if (CardsFarmer.CurrentGamesFarming.Count > 0) {
return "Bot " + BotName + " is currently farming appIDs: " + string.Join(", ", CardsFarmer.CurrentGamesFarming) + " and has a total of " + CardsFarmer.GamesToFarm.Count + " games left to farm."; return "Bot " + BotName + " is currently farming appIDs: " + string.Join(", ", CardsFarmer.CurrentGamesFarming) + " and has a total of " + CardsFarmer.GamesToFarm.Count + " games left to farm.";
@@ -868,16 +922,16 @@ namespace ArchiSteamFarm {
return await bot.ResponseStart().ConfigureAwait(false); return await bot.ResponseStart().ConfigureAwait(false);
} }
private string ResponseStop() { private async Task<string> ResponseStop() {
if (!KeepRunning) { if (!KeepRunning) {
return "That bot instance is already inactive!"; return "That bot instance is already inactive!";
} }
Shutdown(); await Shutdown().ConfigureAwait(false);
return "Done!"; return "Done!";
} }
private static string ResponseStop(string botName) { private static async Task<string> ResponseStop(string botName) {
if (string.IsNullOrEmpty(botName)) { if (string.IsNullOrEmpty(botName)) {
return null; return null;
} }
@@ -887,7 +941,7 @@ namespace ArchiSteamFarm {
return "Couldn't find any bot named " + botName + "!"; return "Couldn't find any bot named " + botName + "!";
} }
return bot.ResponseStop(); return await bot.ResponseStop().ConfigureAwait(false);
} }
private void HandleCallbacks() { private void HandleCallbacks() {
@@ -923,6 +977,9 @@ namespace ArchiSteamFarm {
} }
Logging.LogGenericInfo("Linking new ASF MobileAuthenticator...", BotName); Logging.LogGenericInfo("Linking new ASF MobileAuthenticator...", BotName);
InitializeLoginAndPassword();
UserLogin userLogin = new UserLogin(BotConfig.SteamLogin, BotConfig.SteamPassword); UserLogin userLogin = new UserLogin(BotConfig.SteamLogin, BotConfig.SteamPassword);
LoginResult loginResult; LoginResult loginResult;
while ((loginResult = userLogin.DoLogin()) != LoginResult.LoginOkay) { while ((loginResult = userLogin.DoLogin()) != LoginResult.LoginOkay) {
@@ -985,6 +1042,16 @@ namespace ArchiSteamFarm {
SteamFriends.JoinChat(BotConfig.SteamMasterClanID); SteamFriends.JoinChat(BotConfig.SteamMasterClanID);
} }
private void InitializeLoginAndPassword() {
if (string.IsNullOrEmpty(BotConfig.SteamLogin)) {
BotConfig.SteamLogin = Program.GetUserInput(BotName, Program.EUserInputType.Login);
}
if (string.IsNullOrEmpty(BotConfig.SteamPassword) && string.IsNullOrEmpty(BotDatabase.LoginKey)) {
BotConfig.SteamPassword = Program.GetUserInput(BotName, Program.EUserInputType.Password);
}
}
private void OnConnected(SteamClient.ConnectedCallback callback) { private void OnConnected(SteamClient.ConnectedCallback callback) {
if (callback == null) { if (callback == null) {
return; return;
@@ -1013,13 +1080,7 @@ namespace ArchiSteamFarm {
} }
} }
if (string.IsNullOrEmpty(BotConfig.SteamLogin)) { InitializeLoginAndPassword();
BotConfig.SteamLogin = Program.GetUserInput(BotName, Program.EUserInputType.Login);
}
if (string.IsNullOrEmpty(BotConfig.SteamPassword) && string.IsNullOrEmpty(BotDatabase.LoginKey)) {
BotConfig.SteamPassword = Program.GetUserInput(BotName, Program.EUserInputType.Password);
}
SteamUser.LogOn(new SteamUser.LogOnDetails { SteamUser.LogOn(new SteamUser.LogOnDetails {
Username = BotConfig.SteamLogin, Username = BotConfig.SteamLogin,
@@ -1245,14 +1306,7 @@ namespace ArchiSteamFarm {
// Support and convert SDA files // Support and convert SDA files
string maFilePath = Path.Combine(Program.ConfigDirectory, callback.ClientSteamID.ConvertToUInt64() + ".maFile"); string maFilePath = Path.Combine(Program.ConfigDirectory, callback.ClientSteamID.ConvertToUInt64() + ".maFile");
if (BotDatabase.SteamGuardAccount == null && File.Exists(maFilePath)) { if (BotDatabase.SteamGuardAccount == null && File.Exists(maFilePath)) {
Logging.LogGenericInfo("Converting SDA .maFile into ASF format...", BotName); ImportAuthenticator(maFilePath);
try {
BotDatabase.SteamGuardAccount = JsonConvert.DeserializeObject<SteamGuardAccount>(File.ReadAllText(maFilePath));
File.Delete(maFilePath);
Logging.LogGenericInfo("Success!", BotName);
} catch (Exception e) {
Logging.LogGenericException(e, BotName);
}
} }
if (BotConfig.UseAsfAsMobileAuthenticator && TwoFactorAuth == null && BotDatabase.SteamGuardAccount == null) { if (BotConfig.UseAsfAsMobileAuthenticator && TwoFactorAuth == null && BotDatabase.SteamGuardAccount == null) {
@@ -1300,7 +1354,7 @@ namespace ArchiSteamFarm {
break; break;
default: // Unexpected result, shutdown immediately default: // Unexpected result, shutdown immediately
Logging.LogGenericWarning("Unable to login to Steam: " + callback.Result, BotName); Logging.LogGenericWarning("Unable to login to Steam: " + callback.Result, BotName);
Shutdown(); await Shutdown().ConfigureAwait(false);
break; break;
} }
} }

View File

@@ -91,7 +91,7 @@ namespace ArchiSteamFarm {
// This constructor is used only by deserializer // This constructor is used only by deserializer
private BotDatabase() { } private BotDatabase() { }
private void Save() { internal void Save() {
lock (FilePath) { lock (FilePath) {
try { try {
File.WriteAllText(FilePath, JsonConvert.SerializeObject(this)); File.WriteAllText(FilePath, JsonConvert.SerializeObject(this));

View File

@@ -399,7 +399,7 @@ namespace ArchiSteamFarm {
await StartFarming().ConfigureAwait(false); await StartFarming().ConfigureAwait(false);
} }
private async Task<bool?> ShouldFarm(ulong appID) { private async Task<bool?> ShouldFarm(uint appID) {
if (appID == 0) { if (appID == 0) {
return false; return false;
} }
@@ -425,12 +425,12 @@ namespace ArchiSteamFarm {
bool? keepFarming = await ShouldFarm(appID).ConfigureAwait(false); bool? keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
for (ushort farmingTime = 0; farmingTime <= 60 * Program.GlobalConfig.MaxFarmingTime && keepFarming.GetValueOrDefault(true); farmingTime += Program.GlobalConfig.FarmingDelay) { for (ushort farmingTime = 0; farmingTime <= 60 * Program.GlobalConfig.MaxFarmingTime && keepFarming.GetValueOrDefault(true); farmingTime += Program.GlobalConfig.FarmingDelay) {
Logging.LogGenericInfo("Still farming: " + appID, Bot.BotName);
if (FarmResetEvent.WaitOne(60 * 1000 * Program.GlobalConfig.FarmingDelay)) { if (FarmResetEvent.WaitOne(60 * 1000 * Program.GlobalConfig.FarmingDelay)) {
success = false; success = false;
break; break;
} }
keepFarming = await ShouldFarm(appID).ConfigureAwait(false); keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
Logging.LogGenericInfo("Still farming: " + appID, Bot.BotName);
} }
Bot.ResetGamesPlayed(); Bot.ResetGamesPlayed();

View File

@@ -22,6 +22,10 @@
*/ */
using SteamKit2;
using System;
using System.IO;
namespace ArchiSteamFarm { namespace ArchiSteamFarm {
internal static class Debugging { internal static class Debugging {
#if DEBUG #if DEBUG
@@ -33,5 +37,27 @@ namespace ArchiSteamFarm {
internal static bool IsReleaseBuild => !IsDebugBuild; internal static bool IsReleaseBuild => !IsDebugBuild;
internal static bool NetHookAlreadyInitialized { get; set; } = false; internal static bool NetHookAlreadyInitialized { get; set; } = false;
internal sealed class DebugListener : IDebugListener {
private readonly string FilePath;
internal DebugListener(string filePath) {
if (string.IsNullOrEmpty(filePath)) {
return;
}
FilePath = filePath;
}
public void WriteLine(string category, string msg) {
lock (FilePath) {
try {
File.AppendAllText(FilePath, category + " | " + msg + Environment.NewLine);
} catch (Exception e) {
Logging.LogGenericException(e);
}
}
}
}
} }
} }

View File

@@ -66,7 +66,10 @@ namespace ArchiSteamFarm {
internal byte InventoryLimiterDelay { get; private set; } = 3; internal byte InventoryLimiterDelay { get; private set; } = 3;
[JsonProperty(Required = Required.DisallowNull)] [JsonProperty(Required = Required.DisallowNull)]
internal byte HttpTimeout { get; private set; } = 30; internal bool ForceHttp { get; private set; } = false;
[JsonProperty(Required = Required.DisallowNull)]
internal byte HttpTimeout { get; private set; } = 60;
[JsonProperty(Required = Required.DisallowNull)] [JsonProperty(Required = Required.DisallowNull)]
internal string WCFHostname { get; private set; } = "localhost"; internal string WCFHostname { get; private set; } = "localhost";

View File

@@ -81,7 +81,7 @@ namespace ArchiSteamFarm {
internal string tradeofferid { get; set; } internal string tradeofferid { get; set; }
[JsonProperty(Required = Required.Always)] [JsonProperty(Required = Required.Always)]
internal int accountid_other { get; set; } internal uint accountid_other { get; set; }
[JsonProperty(Required = Required.Always)] [JsonProperty(Required = Required.Always)]
internal ETradeOfferState trade_offer_state { get; set; } internal ETradeOfferState trade_offer_state { get; set; }
@@ -97,7 +97,7 @@ namespace ArchiSteamFarm {
internal ulong OtherSteamID64 { internal ulong OtherSteamID64 {
get { get {
if (_OtherSteamID64 == 0 && accountid_other != 0) { if (_OtherSteamID64 == 0 && accountid_other != 0) {
_OtherSteamID64 = new SteamID((uint) accountid_other, EUniverse.Public, EAccountType.Individual).ConvertToUInt64(); _OtherSteamID64 = new SteamID(accountid_other, EUniverse.Public, EAccountType.Individual).ConvertToUInt64();
} }
return _OtherSteamID64; return _OtherSteamID64;

View File

@@ -71,9 +71,8 @@ namespace ArchiSteamFarm {
Log("[!] EXCEPTION: " + previousMethodName + "() <" + botName + "> " + exception.Message); Log("[!] EXCEPTION: " + previousMethodName + "() <" + botName + "> " + exception.Message);
Log("[!] StackTrace: " + exception.StackTrace); Log("[!] StackTrace: " + exception.StackTrace);
Exception innerException = exception.InnerException; if (exception.InnerException != null) {
if (innerException != null) { LogGenericException(exception.InnerException, botName, previousMethodName);
LogGenericException(innerException, botName, previousMethodName);
} }
} }
@@ -119,7 +118,9 @@ namespace ArchiSteamFarm {
// Write on console only when not awaiting response from user // Write on console only when not awaiting response from user
if (!Program.ConsoleIsBusy) { if (!Program.ConsoleIsBusy) {
try {
Console.Write(loggedMessage); Console.Write(loggedMessage);
} catch { }
} }
if (LogToFile.GetValueOrDefault()) { if (LogToFile.GetValueOrDefault()) {
@@ -129,7 +130,6 @@ namespace ArchiSteamFarm {
} catch (Exception e) { } catch (Exception e) {
LogToFile = false; LogToFile = false;
LogGenericException(e); LogGenericException(e);
LogToFile = true;
} }
} }
} }

View File

@@ -35,6 +35,8 @@ using System.Threading.Tasks;
namespace ArchiSteamFarm { namespace ArchiSteamFarm {
internal static class Program { internal static class Program {
internal enum EUserInputType : byte { internal enum EUserInputType : byte {
Unknown,
DeviceID,
Login, Login,
Password, Password,
PhoneNumber, PhoneNumber,
@@ -46,12 +48,13 @@ namespace ArchiSteamFarm {
} }
internal enum EMode : byte { internal enum EMode : byte {
Unknown,
Normal, // Standard most common usage Normal, // Standard most common usage
Client, // WCF client only Client, // WCF client only
Server // Normal + WCF server Server // Normal + WCF server
} }
private const string GithubReleaseURL = "https://api.github.com/repos/JustArchi/ArchiSteamFarm/releases"; private const string GithubReleaseURL = "https://api.github.com/repos/JustArchi/ArchiSteamFarm/releases"; // GitHub API is HTTPS only
internal const string ASF = "ASF"; internal const string ASF = "ASF";
internal const string ConfigDirectory = "config"; internal const string ConfigDirectory = "config";
@@ -277,10 +280,17 @@ namespace ArchiSteamFarm {
} }
internal static string GetUserInput(string botLogin, EUserInputType userInputType, string extraInformation = null) { internal static string GetUserInput(string botLogin, EUserInputType userInputType, string extraInformation = null) {
if (userInputType == EUserInputType.Unknown) {
return null;
}
string result; string result;
lock (ConsoleLock) { lock (ConsoleLock) {
ConsoleIsBusy = true; ConsoleIsBusy = true;
switch (userInputType) { switch (userInputType) {
case EUserInputType.DeviceID:
Console.Write("<" + botLogin + "> Please enter your Device ID (including \"android:\"): ");
break;
case EUserInputType.Login: case EUserInputType.Login:
Console.Write("<" + botLogin + "> Please enter your login: "); Console.Write("<" + botLogin + "> Please enter your login: ");
break; break;
@@ -307,6 +317,9 @@ namespace ArchiSteamFarm {
case EUserInputType.TwoFactorAuthentication: case EUserInputType.TwoFactorAuthentication:
Console.Write("<" + botLogin + "> Please enter your 2 factor auth code from your authenticator app: "); Console.Write("<" + botLogin + "> Please enter your 2 factor auth code from your authenticator app: ");
break; break;
default:
Console.Write("<" + botLogin + "> Please enter not documented yet value of \"" + userInputType + "\": ");
break;
} }
result = Console.ReadLine(); result = Console.ReadLine();
Console.Clear(); // For security purposes Console.Clear(); // For security purposes
@@ -425,6 +438,18 @@ namespace ArchiSteamFarm {
} }
} }
// If debugging is on, we prepare debug directory prior to running
if (GlobalConfig.Debug) {
if (Directory.Exists(Program.DebugDirectory)) {
Directory.Delete(Program.DebugDirectory, true);
Thread.Sleep(1000); // Dirty workaround giving Windows some time to sync
}
Directory.CreateDirectory(Program.DebugDirectory);
SteamKit2.DebugLog.AddListener(new Debugging.DebugListener(Path.Combine(Program.DebugDirectory, "debug.txt")));
SteamKit2.DebugLog.Enabled = true;
}
// Parse args // Parse args
ParseArgs(args); ParseArgs(args);

View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.7")] [assembly: AssemblyVersion("2.0.0.9")]
[assembly: AssemblyFileVersion("2.0.0.7")] [assembly: AssemblyFileVersion("2.0.0.9")]

View File

@@ -8,7 +8,8 @@
"AccountPlayingDelay": 5, "AccountPlayingDelay": 5,
"LoginLimiterDelay": 7, "LoginLimiterDelay": 7,
"InventoryLimiterDelay": 3, "InventoryLimiterDelay": 3,
"HttpTimeout": 30, "ForceHttp": false,
"HttpTimeout": 60,
"WCFHostname": "localhost", "WCFHostname": "localhost",
"WCFPort": 1242, "WCFPort": 1242,
"Statistics": true, "Statistics": true,