Skip to content

fix(breakhandler): synchronize login lifecycle #1572

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

Closed
chsami wants to merge 1 commit into from
Closed

fix(breakhandler): synchronize login lifecycle #1572

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
53 changes: 29 additions & 24 deletions ...t/src/main/java/net/runelite/client/plugins/microbot/accountselector/AutoLoginScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,23 +235,29 @@ private void handleLoginExtendedSleepState(AutoLoginConfig config) {
* Initiates intelligent login based on configuration.
*/
private void initiateLogin(AutoLoginConfig config) {
if (!BreakHandlerScript.tryAcquireLoginLock()) {
log.debug("Login sequence currently locked by break handler; skipping auto login attempt");
return;
}

try {
// start login watchdog if enabled and not already started
if (config.enableLoginWatchdog() && loginWatchdogStartTime == null) {
loginWatchdogStartTime = Instant.now();
log.info("Login watchdog started for {} minutes", config.loginWatchdogTimeout());
}


if (Microbot.isLoggedIn()) {
return;
}

int targetWorld = -1;

boolean membersOnly = config.membersOnly();

// use world selection mode if no preferred world or preferred world not accessible

if (targetWorld == -1) {
switch (config.worldSelectionMode()) {
case CURRENT_PREFERRED_WORLD:
boolean isAccessible = Rs2WorldUtil.canAccessWorld(config.world());

if (isAccessible) {
targetWorld = config.world();
log.info("Using preferred world: {}", targetWorld);
Expand All @@ -260,28 +266,28 @@ private void initiateLogin(AutoLoginConfig config) {
boolean isMemberFromProfile = activeProfile != null && activeProfile.isMember();
boolean isLocalPlayerAvailable = Microbot.getClient()!=null && Microbot.getClient().getLocalPlayer() != null;
boolean isMemberFromClient = Microbot.getClient()!=null && Microbot.getClient().getLocalPlayer() != null ? Rs2Player.isMember() : false;
log.error("Preferred world {} is not accessible,\n\t ->check if we have member access set in profile(current value {}), or when logged in, have we member access ? (LocalPlayer? {}, isMember? {})",
config.usePreferredWorld(), isMemberFromProfile, isLocalPlayerAvailable, isMemberFromClient);
log.error("Preferred world {} is not accessible,\n\t ->check if we have member access set in profile (current value {}), or when logged in, have we member access ? (LocalPlayer? {}, isMember? {})",
config.usePreferredWorld(), isMemberFromProfile, isLocalPlayerAvailable, isMemberFromClient);

}
// no specific world selection - use default login
break;

case RANDOM_WORLD:
targetWorld = Rs2WorldUtil.getRandomAccessibleWorldFromRegion(
config.regionPreference().getWorldRegion(),
config.avoidEmptyWorlds(),
config.avoidOvercrowdedWorlds(),membersOnly);
break;

case BEST_POPULATION:
targetWorld = Rs2WorldUtil.getBestAccessibleWorldForLogin(
false,
config.regionPreference().getWorldRegion(),
config.avoidEmptyWorlds(),
config.avoidOvercrowdedWorlds(),
config.avoidOvercrowdedWorlds(),
membersOnly);
break;

case BEST_PING:
targetWorld = Rs2WorldUtil.getBestAccessibleWorldForLogin(
true,
Expand All @@ -291,7 +297,7 @@ private void initiateLogin(AutoLoginConfig config) {
membersOnly
);
break;

case REGIONAL_RANDOM:
targetWorld = Rs2WorldUtil.getRandomAccessibleWorldFromRegion(
config.regionPreference().getWorldRegion(),
Expand All @@ -300,38 +306,37 @@ private void initiateLogin(AutoLoginConfig config) {
membersOnly
);
break;

default:
// fallback to legacy behavior
targetWorld = Login.getRandomWorld(Rs2Player.isMember());
targetWorld = Login.getRandomWorld(Rs2Player.isMember());
if(!Rs2WorldUtil.canAccessWorld(targetWorld)) {
log.warn("Randomly selected world {} is not accessible, using default world {}", targetWorld, config.world());
targetWorld = config.world();
}
}
break;
}
}

// perform login attempt and track retry state

retryCount++;
lastLoginAttemptTime = Instant.now();

if (targetWorld != -1) {
log.info("Attempting login to selected world: {} (attempt {})", targetWorld, retryCount);
new Login(targetWorld);
} else {
log.info("Using default login (current world or last used) (attempt {})", retryCount);
new Login();
}



} catch (Exception ex) {
log.error("Error during intelligent login", ex);
retryCount++;
lastLoginAttemptTime = Instant.now();
} finally {
BreakHandlerScript.releaseLoginLock();
}
}

/**
* Transitions to a new login state.
*/
Expand Down
Loading