Skip to content

Commit 6868ef1

Browse files
committed
update selenium & chrome driver
1 parent b22b011 commit 6868ef1

File tree

6 files changed

+19
-29
lines changed

6 files changed

+19
-29
lines changed

TbsCore/Core/WebBrowserInfo.cs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private void SetupChromeDriver(Access.Access access, string username, string ser
8383

8484
// So websites (Travian) can't detect the bot
8585
options.AddExcludedArgument("enable-automation");
86-
options.AddAdditionalCapability("useAutomationExtension", false);
86+
options.AddAdditionalOption("useAutomationExtension", false);
8787
options.AddArgument("--disable-blink-features=AutomationControlled");
8888
options.AddArgument("--disable-features=UserAgentClientHint");
8989
options.AddArguments("--disable-logging");
@@ -187,21 +187,6 @@ public string GetBearerToken()
187187
return (string)js.ExecuteScript("for(let field in Travian) { if (Travian[field].length == 32) return Travian[field]; }");
188188
}
189189

190-
public IWebElement FindElementById(string element)
191-
{
192-
return Driver.FindElementById(element);
193-
}
194-
195-
public IWebElement FindElementByXPath(string xPath)
196-
{
197-
return Driver.FindElementByXPath(xPath);
198-
}
199-
200-
public ITargetLocator SwitchTo()
201-
{
202-
return Driver.SwitchTo();
203-
}
204-
205190
/// <summary>
206191
/// catch (WebDriverException e) when (e.Message.Contains("chrome not reachable") || e.Message.Contains("no such window:"))
207192
/// </summary>

TbsCore/Tasks/LowLevel/ChangeVillageName.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Collections.Generic;
1+
using OpenQA.Selenium;
2+
using System.Collections.Generic;
23
using System.Threading.Tasks;
34
using TbsCore.Helpers;
45
using TbsCore.Models.AccModels;
@@ -59,11 +60,11 @@ public override async Task<TaskRes> Execute(Account acc)
5960
// Empty text box
6061
await DriverHelper.WriteByName(acc, $"dname[{change.Item1}]=", "");
6162
//insert new name into the textbox
62-
acc.Wb.FindElementByXPath($"//input[@name='dname[{change.Item1}]=']").SendKeys(change.Item2);
63+
acc.Wb.Driver.FindElement(By.XPath($"//input[@name='dname[{change.Item1}]=']")).SendKeys(change.Item2);
6364
}
6465

6566
await Task.Delay(AccountHelper.Delay(acc));
66-
acc.Wb.FindElementById("btn_ok").Click(); //click save button
67+
acc.Wb.Driver.FindElement(By.Id("btn_ok")).Click(); //click save button
6768

6869
return TaskRes.Executed;
6970
}

TbsCore/Tasks/LowLevel/SendFarmlist.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using HtmlAgilityPack;
2+
using OpenQA.Selenium;
23
using System;
34
using System.Collections.Generic;
45
using System.Linq;
@@ -87,7 +88,7 @@ public override async Task<TaskRes> Execute(Account acc)
8788

8889
case ServerVersionEnum.T4_5:
8990
var startRaid = flNode.Descendants("button").FirstOrDefault(x => x.HasClass("startButton"));
90-
acc.Wb.FindElementById(startRaid.Id).Click();
91+
acc.Wb.Driver.FindElement(By.Id(startRaid.Id)).Click();
9192
break;
9293
}
9394

TbsCore/TbsCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<PackageReference Include="OpenQA.Selenium.Chrome.ChromeDriverExtensions" Version="1.2.0" />
2424
<PackageReference Include="RestSharp" Version="107.3.0" />
2525
<PackageReference Include="Selenium.Support" Version="3.141.0" />
26-
<PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
26+
<PackageReference Include="Selenium.WebDriver" Version="4.1.0" />
2727
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
2828
<PackageReference Include="Serilog.Sinks.Map" Version="1.0.2" />
2929
</ItemGroup>

TbsCore/packages.lock.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@
7878
},
7979
"Selenium.WebDriver": {
8080
"type": "Direct",
81-
"requested": "[3.141.0, )",
82-
"resolved": "3.141.0",
83-
"contentHash": "wPqzXO3f79DzqauTZSzLMKiaBCN0Z2Mv7KvWP+hnV6EL88zh/pJJnFtdIR1X5wa3hsTOpF/bBJs45rz7kArsiA==",
81+
"requested": "[4.1.0, )",
82+
"resolved": "4.1.0",
83+
"contentHash": "d4smisz4a/wJCM2TzkKTl+BLfvZUTvaobhKElDfCVZlvY8ThsC8VAoBNWTlg1H/GGzIP//yVGko/W0FILTgkYA==",
8484
"dependencies": {
85-
"Newtonsoft.Json": "10.0.3"
85+
"Newtonsoft.Json": "12.0.3"
8686
}
8787
},
8888
"Serilog.Sinks.File": {
@@ -308,8 +308,8 @@
308308
},
309309
"Newtonsoft.Json": {
310310
"type": "Transitive",
311-
"resolved": "12.0.2",
312-
"contentHash": "rTK0s2EKlfHsQsH6Yx2smvcTCeyoDNgCW7FEYyV01drPlh2T243PR2DiDXqtC5N4GDm4Ma/lkxfW5a/4793vbA=="
311+
"resolved": "12.0.3",
312+
"contentHash": "6mgjfnRB4jKMlzHSl+VD+oUc1IebOZabkbyWj2RiTgWwYPPuaK1H97G1sHqGwPlS5npiF5Q0OrxN1wni2n5QWg=="
313313
},
314314
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
315315
"type": "Transitive",

TravBotSharp/TbsWinForms.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -680,11 +680,14 @@
680680
<PackageReference Include="RestSharp">
681681
<Version>107.3.0</Version>
682682
</PackageReference>
683+
<PackageReference Include="Selenium.Support">
684+
<Version>4.1.0</Version>
685+
</PackageReference>
683686
<PackageReference Include="Selenium.WebDriver">
684-
<Version>3.141.0</Version>
687+
<Version>4.1.0</Version>
685688
</PackageReference>
686689
<PackageReference Include="Selenium.WebDriver.ChromeDriver">
687-
<Version>100.0.4896.6000</Version>
690+
<Version>101.0.4951.4100</Version>
688691
</PackageReference>
689692
<PackageReference Include="Serilog">
690693
<Version>2.10.0</Version>

0 commit comments

Comments
 (0)