Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple account feature #331

Closed
wants to merge 1 commit into from
Closed

Multiple account feature #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 65 additions & 5 deletions src/main/java/com/github/manolo8/darkbot/backpage/BackpageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import com.github.manolo8.darkbot.Main;
import com.github.manolo8.darkbot.core.api.Capability;
import com.github.manolo8.darkbot.core.manager.HeroManager;
import com.github.manolo8.darkbot.extensions.plugins.PluginIssue;
import com.github.manolo8.darkbot.modules.DisconnectModule;
import com.github.manolo8.darkbot.utils.Time;
import com.github.manolo8.darkbot.utils.http.Http;
import com.github.manolo8.darkbot.utils.http.Method;
Expand All @@ -24,6 +26,8 @@
import java.net.URL;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
Expand Down Expand Up @@ -75,6 +79,20 @@ public BackpageManager(Main main, ConfigAPI configAPI) {
setDaemon(true);
}

private BackpageManager(LoginData loginData) {
legacyHangarManager = null;
hangarManager = null;
auctionManager = null;
novaManager = null;
main = null;
setLoginData(loginData);
}

public Collection<Integer> getAccountIds() {
if(loginData == null || loginData.isEmpty() || !loginData.get().hasAnotherAccounts()) return Collections.emptyList();
return loginData.get().getAccounts().keySet();
}

private static String getRandomAction() {
return ACTIONS[(int) (Math.random() * ACTIONS.length)];
}
Expand All @@ -84,6 +102,34 @@ private static String getRandomAction() {
public void run() {
while (true) {
Time.sleep(100);
if(userId != 0
&& main.config.MISCELLANEOUS.LINKED_ACCOUNT_TO_CONFIG != 0
&& userId != main.config.MISCELLANEOUS.LINKED_ACCOUNT_TO_CONFIG
&& loginData != null
&& loginData.isPresent()
&& loginData.get().hasAnotherAccounts()
&& loginData.get().getAccounts().containsKey(main.config.MISCELLANEOUS.LINKED_ACCOUNT_TO_CONFIG)
) {
boolean isRunning = main.isRunning();
if (isRunning && !(main.getModule() instanceof DisconnectModule))
main.setModule(new DisconnectModule(-10101L, "Switching account"));
if (!isRunning || main.guiManager.lostConnection.isVisible()) {
main.setRunning(false);
synchronized (main.pluginHandler.getBackgroundLock()) {
main.pluginHandler.updatePlugins();
loginData.get().switchAccount(main.config.MISCELLANEOUS.LINKED_ACCOUNT_TO_CONFIG);
this.isInvalid();
Main.API.handleRefresh();
LoginData targetLoginData = loginData.get().getAccounts().get(main.config.MISCELLANEOUS.LINKED_ACCOUNT_TO_CONFIG);
sidLastUpdate = System.currentTimeMillis();
sidNextUpdate = targetLoginData.nextUpdate;
sidStatus = targetLoginData.status;
HeroManager.instance.playerInfo.username = "";
}
if (isRunning) main.setRunning(true);
}
if (main.getModule() instanceof DisconnectModule) continue;
}

synchronized (main.pluginHandler.getBackgroundLock()) {
for (Task task : tasks) {
Expand Down Expand Up @@ -113,10 +159,24 @@ public void run() {
}

this.hangarManager.tick();
if (System.currentTimeMillis() > sidNextUpdate) {
int waitTime = sidCheck();
sidLastUpdate = System.currentTimeMillis();
sidNextUpdate = sidLastUpdate + (int) (waitTime + waitTime * Math.random());
if (loginData.isPresent()) {
LoginData loginDataInstance = loginData.get();

if (System.currentTimeMillis() > sidNextUpdate) {
int waitTime = sidCheck();
sidLastUpdate = System.currentTimeMillis();
sidNextUpdate = sidLastUpdate + (int) (waitTime + waitTime * Math.random());
loginDataInstance.getAccounts().get(userId).nextUpdate = sidNextUpdate;
}

if (loginDataInstance.hasAnotherAccounts())
for (LoginData backgroundLoginData : loginDataInstance.getAccounts().values())
if (System.currentTimeMillis() > backgroundLoginData.nextUpdate) {
BackpageManager backpageManager = new BackpageManager(backgroundLoginData);
int waitTime = backpageManager.sidCheck();
backgroundLoginData.nextUpdate = System.currentTimeMillis() + (int) (waitTime + waitTime * Math.random());
backgroundLoginData.status = backpageManager.sidStatus;
}
}

if (System.currentTimeMillis() > checkDrones) {
Expand Down Expand Up @@ -178,7 +238,7 @@ private boolean isInvalid() {
this.instanceURI = tryParse(this.instance);
}
}
return sid == null || instance == null || sid.isEmpty() || instance.isEmpty() || this.userId == 0;
return !isInstanceValid();
}

private URI tryParse(String uri) {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/github/manolo8/darkbot/config/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.github.manolo8.darkbot.config;

import com.github.manolo8.darkbot.config.actions.Condition;
import com.github.manolo8.darkbot.config.types.suppliers.AccountSupplier;
import com.github.manolo8.darkbot.config.types.suppliers.BrowserApi;
import com.github.manolo8.darkbot.config.types.suppliers.DisplayFlag;
import com.github.manolo8.darkbot.config.types.suppliers.LanguageSupplier;
Expand Down Expand Up @@ -31,6 +32,7 @@
import eu.darkbot.api.game.items.SelectableItem;
import eu.darkbot.api.game.other.GameMap;
import eu.darkbot.api.managers.HeroAPI;
import eu.darkbot.shared.config.ProfileNames;
import eu.darkbot.shared.modules.LootCollectorModule;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -193,6 +195,7 @@ public static class Miscellaneous {
public @Option boolean REFRESH_AFTER_REVIVE = false;
public @Option @Number(max = 60 * 12, step = 10) int REFRESH_TIME = 60;
public @Option @Number(max = 60 * 12, step = 10) int PAUSE_FOR = 0;
public @Option @Dropdown(options = ProfileNames.class) String CONFIG_AFTER_PAUSE;
public @Option boolean RESET_REFRESH = true;
public @Option boolean SOLVE_BACKPAGE_CAPTCHA = false;
public @Option @Visibility(Level.INTERMEDIATE) boolean UPDATE_STATS_WHILE_PAUSED = true;
Expand All @@ -203,6 +206,7 @@ public static class Miscellaneous {
public @Option @Visibility(Level.INTERMEDIATE) boolean AVOID_MINES = true;
public @Option @Visibility(Level.INTERMEDIATE) boolean AVOID_RADIATION = true;
public @Option @Visibility(Level.INTERMEDIATE) boolean USERNAME_ON_TITLE = false;
public @Option @Visibility(Level.ADVANCED) @Dropdown(options = AccountSupplier.class) int LINKED_ACCOUNT_TO_CONFIG = 0;
public @Option @Visibility(Level.ADVANCED) boolean AUTO_REFINE = false;
}

Expand Down
43 changes: 43 additions & 0 deletions src/main/java/com/github/manolo8/darkbot/config/types/suppliers/AccountSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package com.github.manolo8.darkbot.config.types.suppliers;

import com.github.manolo8.darkbot.backpage.BackpageManager;
import com.github.manolo8.darkbot.config.PlayerInfo;
import com.github.manolo8.darkbot.core.manager.HeroManager;
import eu.darkbot.api.config.annotations.Dropdown;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;

public class AccountSupplier implements Dropdown.Options<Integer> {
private final BackpageManager backpageManager;
private final HeroManager heroManager;
public AccountSupplier(BackpageManager backpageManager, HeroManager heroManager) {
this.backpageManager = backpageManager;
this.heroManager = heroManager;
}
@Override
public Collection<Integer> options() {
List<Integer> ids = new ArrayList<>();
ids.add(0);
ids.addAll(backpageManager.getAccountIds());
return ids;
}

@Override
public @NotNull String getText(@Nullable Integer option) {
if(Integer.valueOf(0).equals(option)) return "(none)";
PlayerInfo info = heroManager.main.config.PLAYER_INFOS.get(option);
if(info != null) return info.getUsername();
return Objects.toString(option);
}

@Override
public @Nullable String getTooltip(@Nullable Integer option) {
if(Integer.valueOf(0).equals(option)) return null;
return "User ID: " + option;
}
}
12 changes: 8 additions & 4 deletions src/main/java/com/github/manolo8/darkbot/core/api/GameAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class GameAPIImpl<
protected final EnumSet<Capability> capabilities;

protected final String version;

protected final Main main;
private final ConfigAPI config;

protected final LoginData loginData; // Used only if api supports LOGIN
Expand Down Expand Up @@ -94,7 +94,7 @@ public GameAPIImpl(StartupParams params,
interaction.getVersion() + "i" +
direct.getVersion() + "d";

Main main = HeroManager.instance.main;
main = HeroManager.instance.main;
config = main.configHandler;

this.loginData = hasCapability(Capability.LOGIN) ? LoginUtils.performUserLogin(params) : null;
Expand Down Expand Up @@ -133,14 +133,18 @@ protected void tryRelogin() {

try {
System.out.println("Reloading, updating flash vars/preloader");
LoginUtils.findPreloader(loginData);
synchronized (main.pluginHandler.getBackgroundLock()) {
LoginUtils.findPreloader(loginData);
}
} catch (IOException e) {
System.out.println("Failed to find preloader, aborting re-login");
e.printStackTrace();
lastFailedLogin = System.currentTimeMillis();
} catch (LoginUtils.WrongCredentialsException e) {
// SID probably expired, time to log in again
performRelogin();
synchronized (main.pluginHandler.getBackgroundLock()) {
performRelogin();
}
}
}

Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/github/manolo8/darkbot/core/manager/HeroManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public class HeroManager extends Player implements Manager, HeroAPI {
private long configTime;
private long formationTime;
private long portalTime;
private int previousId;

public HeroManager(Main main,
SettingsManager settingsManager,
Expand Down Expand Up @@ -112,6 +113,11 @@ public void install(BotInstaller botInstaller) {
public void tick() {
long address = API.readMemoryLong(staticAddress);
if (this.address != address) update(address);
if (getId() != previousId) {
playerInfo.username = "";
playerInfo.clanTag = "";
previousId = getId();
}

update();

Expand Down
7 changes: 6 additions & 1 deletion src/main/java/com/github/manolo8/darkbot/modules/DisconnectModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ public void tickStopped() {
// Bot done. Pause "forever" (unless a behaviour restarts it).
if (pauseTime == null) main.setRunning(false);
else if (pauseTime == 0) goBack();
else {
// -10101 is a magic number for preventing automatic switching config after manual switch while bot was active
else if(pauseTime == -10101L) refreshing = true;
else if (main.config.MISCELLANEOUS.CONFIG_AFTER_PAUSE != null && I18n.get("module.disconnect.reason.break").equals(reason)) {
main.configChange.send(main.config.MISCELLANEOUS.CONFIG_AFTER_PAUSE);
refreshing = true;
} else {
pauseUntil = System.currentTimeMillis() + pauseTime;
main.setRunning(false);
}
Expand Down
Loading
Loading