LightZirconite/Microsoft-Rewards-Bot
1
1
Fork 0
mirror of https://github.com/LightZirconite/Microsoft-Rewards-Bot.git synced 2026-01-11 17:56:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add recovery handling for navigation errors and conditional HTTP 400 checks in login flow

Browse Source
This commit is contained in:
LightZirconite
2025-11-04 23:04:59 +01:00
parent 0afd1e990c
commit d89816c817
1 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/functions/Login.ts
View File

@@ -107,6 +107,7 @@ export class Login {
// Try initial navigation with error handling for chrome-error interruption // Try initial navigation with error handling for chrome-error interruption
let navigationSucceeded = false let navigationSucceeded = false
let recoveryUsed = false
try { try {
await page.goto('https://www.bing.com/rewards/dashboard', { await page.goto('https://www.bing.com/rewards/dashboard', {
waitUntil: 'domcontentloaded', waitUntil: 'domcontentloaded',
@@ -127,6 +128,7 @@ export class Login {
try { try {
await page.reload({ waitUntil: 'domcontentloaded', timeout: navigationTimeout }) await page.reload({ waitUntil: 'domcontentloaded', timeout: navigationTimeout })
navigationSucceeded = true navigationSucceeded = true
recoveryUsed = true
this.bot.log(this.bot.isMobile, 'LOGIN', 'Recovery successful via reload') this.bot.log(this.bot.isMobile, 'LOGIN', 'Recovery successful via reload')
} catch (reloadError) { } catch (reloadError) {
// Last resort: try goto again // Last resort: try goto again
@@ -149,17 +151,19 @@ export class Login {
throw new Error('Failed to navigate to dashboard after multiple attempts') throw new Error('Failed to navigate to dashboard after multiple attempts')
} }
// Additional check for HTTP 400 in page content // Only check for HTTP 400 if recovery was NOT used (to avoid double reload)
await this.bot.utils.wait(500) if (!recoveryUsed) {
const content = await page.content().catch(() => '') await this.bot.utils.wait(500)
const hasHttp400 = content.includes('HTTP ERROR 400') || const content = await page.content().catch(() => '')
content.includes('This page isn\'t working') || const hasHttp400 = content.includes('HTTP ERROR 400') ||
content.includes('Cette page ne fonctionne pas') content.includes('This page isn\'t working') ||
content.includes('Cette page ne fonctionne pas')
if (hasHttp400) { if (hasHttp400) {
this.bot.log(this.bot.isMobile, 'LOGIN', 'HTTP 400 detected in content, reloading...', 'warn') this.bot.log(this.bot.isMobile, 'LOGIN', 'HTTP 400 detected in content, reloading...', 'warn')
await page.reload({ waitUntil: 'domcontentloaded', timeout: navigationTimeout }) await page.reload({ waitUntil: 'domcontentloaded', timeout: navigationTimeout })
await this.bot.utils.wait(1000) await this.bot.utils.wait(1000)
}
} }
await this.disableFido(page) await this.disableFido(page)
@@ -215,6 +219,7 @@ export class Login {
// Try initial navigation with error handling // Try initial navigation with error handling
let navigationSucceeded = false let navigationSucceeded = false
let recoveryUsed = false
try { try {
await page.goto(url.href, { waitUntil: 'domcontentloaded', timeout: navigationTimeout }) await page.goto(url.href, { waitUntil: 'domcontentloaded', timeout: navigationTimeout })
navigationSucceeded = true navigationSucceeded = true
@@ -228,6 +233,7 @@ export class Login {
try { try {
await page.reload({ waitUntil: 'domcontentloaded', timeout: navigationTimeout }) await page.reload({ waitUntil: 'domcontentloaded', timeout: navigationTimeout })
navigationSucceeded = true navigationSucceeded = true
recoveryUsed = true
this.bot.log(this.bot.isMobile, 'LOGIN-APP', 'OAuth recovery successful') this.bot.log(this.bot.isMobile, 'LOGIN-APP', 'OAuth recovery successful')
} catch (reloadError) { } catch (reloadError) {
await this.bot.utils.wait(1500) await this.bot.utils.wait(1500)
@@ -243,17 +249,19 @@ export class Login {
throw new Error('Failed to navigate to OAuth page') throw new Error('Failed to navigate to OAuth page')
} }
// Check for HTTP 400 // Only check HTTP 400 if recovery was NOT used
await this.bot.utils.wait(500) if (!recoveryUsed) {
const content = await page.content().catch(() => '') await this.bot.utils.wait(500)
const hasHttp400 = content.includes('HTTP ERROR 400') || const content = await page.content().catch(() => '')
content.includes('This page isn\'t working') || const hasHttp400 = content.includes('HTTP ERROR 400') ||
content.includes('Cette page ne fonctionne pas') content.includes('This page isn\'t working') ||
content.includes('Cette page ne fonctionne pas')
if (hasHttp400) { if (hasHttp400) {
this.bot.log(this.bot.isMobile, 'LOGIN-APP', 'HTTP 400 detected, reloading...', 'warn') this.bot.log(this.bot.isMobile, 'LOGIN-APP', 'HTTP 400 detected, reloading...', 'warn')
await page.reload({ waitUntil: 'domcontentloaded', timeout: navigationTimeout }) await page.reload({ waitUntil: 'domcontentloaded', timeout: navigationTimeout })
await this.bot.utils.wait(1000) await this.bot.utils.wait(1000)
}
} }
const start = Date.now() const start = Date.now()
this.bot.log(this.bot.isMobile, 'LOGIN-APP', 'Authorizing mobile scope...') this.bot.log(this.bot.isMobile, 'LOGIN-APP', 'Authorizing mobile scope...')
@@ -351,6 +359,7 @@ export class Login {
// Try navigation with error recovery // Try navigation with error recovery
let navigationSucceeded = false let navigationSucceeded = false
let recoveryUsed = false
try { try {
await page.goto(homeUrl, { timeout: navigationTimeout }) await page.goto(homeUrl, { timeout: navigationTimeout })
navigationSucceeded = true navigationSucceeded = true
@@ -364,6 +373,7 @@ export class Login {
try { try {
await page.reload({ waitUntil: 'domcontentloaded', timeout: navigationTimeout }) await page.reload({ waitUntil: 'domcontentloaded', timeout: navigationTimeout })
navigationSucceeded = true navigationSucceeded = true
recoveryUsed = true
} catch (reloadError) { } catch (reloadError) {
await this.bot.utils.wait(1500) await this.bot.utils.wait(1500)
await page.goto(homeUrl, { timeout: navigationTimeout }) await page.goto(homeUrl, { timeout: navigationTimeout })
@@ -378,17 +388,19 @@ export class Login {
await page.waitForLoadState('domcontentloaded').catch(logError('LOGIN', 'DOMContentLoaded timeout', this.bot.isMobile)) await page.waitForLoadState('domcontentloaded').catch(logError('LOGIN', 'DOMContentLoaded timeout', this.bot.isMobile))
// Check for HTTP 400 // Only check HTTP 400 if recovery was NOT used
await this.bot.utils.wait(500) if (!recoveryUsed) {
const content = await page.content().catch(() => '') await this.bot.utils.wait(500)
const hasHttp400 = content.includes('HTTP ERROR 400') || const content = await page.content().catch(() => '')
content.includes('This page isn\'t working') || const hasHttp400 = content.includes('HTTP ERROR 400') ||
content.includes('Cette page ne fonctionne pas') content.includes('This page isn\'t working') ||
content.includes('Cette page ne fonctionne pas')
if (hasHttp400) { if (hasHttp400) {
this.bot.log(this.bot.isMobile, 'LOGIN', 'HTTP 400 on session check, reloading...', 'warn') this.bot.log(this.bot.isMobile, 'LOGIN', 'HTTP 400 on session check, reloading...', 'warn')
await page.reload({ waitUntil: 'domcontentloaded', timeout: navigationTimeout }) await page.reload({ waitUntil: 'domcontentloaded', timeout: navigationTimeout })
await this.bot.utils.wait(1000) await this.bot.utils.wait(1000)
}
} }
await this.bot.browser.utils.reloadBadPage(page) await this.bot.browser.utils.reloadBadPage(page)
await this.bot.utils.wait(250) await this.bot.utils.wait(250)