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

Fix: Enhance error handling and timeout management across various modules; improve validation and documentation

Browse Source
This commit is contained in:
LightZirconite
2025-11-08 18:52:31 +01:00
parent ca356075fa
commit 5e322af2c0
13 changed files with 341 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/browser/Browser.ts
View File

@@ -18,9 +18,14 @@ class Browser {
if (process.env.AUTO_INSTALL_BROWSERS === '1') {
try {
const { execSync } = await import('child_process')
execSync('npx playwright install chromium', { stdio: 'ignore' })
// FIXED: Add timeout to prevent indefinite blocking
this.bot.log(this.bot.isMobile, 'BROWSER', 'Auto-installing Chromium...', 'log')
execSync('npx playwright install chromium', { stdio: 'ignore', timeout: 120000 })
this.bot.log(this.bot.isMobile, 'BROWSER', 'Chromium installed successfully', 'log')
} catch (e) {
this.bot.log(this.bot.isMobile, 'BROWSER', `Auto-install failed: ${e instanceof Error ? e.message : String(e)}`, 'warn')
// FIXED: Improved error logging (no longer silent)
const errorMsg = e instanceof Error ? e.message : String(e)
this.bot.log(this.bot.isMobile, 'BROWSER', `Auto-install failed: ${errorMsg}`, 'warn')
}
}

23
src/browser/BrowserFunc.ts
View File

@@ -182,10 +182,20 @@ export default class BrowserFunc {
/**
* Reload page with retry logic
* FIXED: Added global timeout to prevent infinite retry loops
*/
private async reloadPageWithRetry(page: Page, maxAttempts: number): Promise<void> {
const startTime = Date.now()
const MAX_TOTAL_TIME_MS = 30000 // 30 seconds max total
let lastError: unknown = null
for (let attempt = 1; attempt <= maxAttempts; attempt++) {
// Check global timeout
if (Date.now() - startTime > MAX_TOTAL_TIME_MS) {
this.bot.log(this.bot.isMobile, 'GET-DASHBOARD-DATA', `Reload retry exceeded total timeout (${MAX_TOTAL_TIME_MS}ms)`, 'warn')
break
}
try {
await page.reload({ waitUntil: 'domcontentloaded' })
await this.bot.utils.wait(this.bot.isMobile ? TIMEOUTS.LONG : TIMEOUTS.MEDIUM)
@@ -231,6 +241,7 @@ export default class BrowserFunc {
/**
* Parse dashboard object from script content
* FIXED: Added format validation before JSON.parse
*/
private async parseDashboardFromScript(page: Page, scriptContent: string): Promise<DashboardData | null> {
return await page.evaluate((scriptContent: string) => {
@@ -244,7 +255,17 @@ export default class BrowserFunc {
const match = regex.exec(scriptContent)
if (match && match[1]) {
try {
return JSON.parse(match[1])
const jsonStr = match[1]
// Validate basic JSON structure before parsing
if (!jsonStr.trim().startsWith('{') || !jsonStr.trim().endsWith('}')) {
continue
}
const parsed = JSON.parse(jsonStr)
// Validate it's actually an object
if (typeof parsed !== 'object' || parsed === null) {
continue
}
return parsed
} catch (e) {
continue
}