This commit is contained in:
2025-11-10 19:57:43 +01:00
parent aeaffeb7ca
commit 04a1a4c0a4
5 changed files with 9 additions and 67 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "microsoft-rewards-bot", "name": "microsoft-rewards-bot",
"version": "2.56.2", "version": "2.56.4",
"description": "Automate Microsoft Rewards points collection", "description": "Automate Microsoft Rewards points collection",
"private": true, "private": true,
"main": "index.js", "main": "index.js",

View File

@@ -58,14 +58,11 @@ class Browser {
'--disk-cache-size=1' '--disk-cache-size=1'
] : [] ] : []
// IMPROVED: Add channel option to stabilize rebrowser-playwright
browser = await playwright.chromium.launch({ browser = await playwright.chromium.launch({
headless, headless,
...(proxyConfig && { proxy: proxyConfig }), ...(proxyConfig && { proxy: proxyConfig }),
args: [...baseArgs, ...linuxStabilityArgs], args: [...baseArgs, ...linuxStabilityArgs],
timeout: isLinux ? 90000 : 60000, timeout: isLinux ? 90000 : 60000
// Use chromium channel for better stability with rebrowser-playwright
channel: undefined as unknown as undefined
}) })
} catch (e: unknown) { } catch (e: unknown) {
const msg = (e instanceof Error ? e.message : String(e)) const msg = (e instanceof Error ? e.message : String(e))
@@ -83,63 +80,7 @@ class Browser {
const sessionData = await loadSessionData(this.bot.config.sessionPath, email, this.bot.isMobile, saveFingerprint) const sessionData = await loadSessionData(this.bot.config.sessionPath, email, this.bot.isMobile, saveFingerprint)
const fingerprint = sessionData.fingerprint ? sessionData.fingerprint : await this.generateFingerprint() const fingerprint = sessionData.fingerprint ? sessionData.fingerprint : await this.generateFingerprint()
const context = await newInjectedContext(browser as unknown as import('playwright').Browser, { fingerprint: fingerprint })
// Check if fingerprint injection is enabled (can be disabled to avoid session closed errors)
const enableInjection = this.bot.config.fingerprinting?.enableInjection !== false
// FIXED: Add error handling and retry logic for fingerprint injection
let context: BrowserContext | undefined
if (!enableInjection) {
// Fallback: use plain context without fingerprint injection
this.bot.log(this.bot.isMobile, 'BROWSER', 'Fingerprint injection disabled, using plain context', 'warn')
context = await browser.newContext({
ignoreHTTPSErrors: true,
bypassCSP: true,
userAgent: fingerprint.fingerprint.navigator.userAgent,
viewport: this.bot.isMobile
? { width: 390, height: 844 }
: { width: 1280, height: 800 }
}) as unknown as BrowserContext
} else {
// Use fingerprint injection with retry logic
let retries = 3
while (retries > 0) {
try {
context = await newInjectedContext(browser as unknown as import('playwright').Browser, {
fingerprint: fingerprint,
// Add context options to prevent premature closure
newContextOptions: {
ignoreHTTPSErrors: true,
bypassCSP: true
}
})
break
} catch (e) {
retries--
if (retries === 0) {
this.bot.log(this.bot.isMobile, 'BROWSER', `Fingerprint injection failed after retries: ${e instanceof Error ? e.message : String(e)}`, 'error')
this.bot.log(this.bot.isMobile, 'BROWSER', 'Falling back to plain context without fingerprint injection', 'warn')
// Final fallback: use plain context
context = await browser.newContext({
ignoreHTTPSErrors: true,
bypassCSP: true,
userAgent: fingerprint.fingerprint.navigator.userAgent,
viewport: this.bot.isMobile
? { width: 390, height: 844 }
: { width: 1280, height: 800 }
}) as unknown as BrowserContext
break
}
this.bot.log(this.bot.isMobile, 'BROWSER', `Fingerprint injection failed, retrying... (${retries} left)`, 'warn')
await new Promise(resolve => setTimeout(resolve, 1000))
}
}
}
if (!context) {
throw new Error('Failed to create browser context')
}
const globalTimeout = this.bot.config.browser?.globalTimeout ?? 30000 const globalTimeout = this.bot.config.browser?.globalTimeout ?? 30000
context.setDefaultTimeout(typeof globalTimeout === 'number' ? globalTimeout : this.bot.utils.stringToMs(globalTimeout)) context.setDefaultTimeout(typeof globalTimeout === 'number' ? globalTimeout : this.bot.utils.stringToMs(globalTimeout))

View File

@@ -96,9 +96,7 @@
"saveFingerprint": { "saveFingerprint": {
"mobile": true, "mobile": true,
"desktop": true "desktop": true
}, }
// Set to false if you encounter "session closed" errors with fingerprint injection
"enableInjection": true
}, },
// === PROXY === // === PROXY ===

View File

@@ -45,7 +45,6 @@ export interface ConfigBrowser {
export interface ConfigFingerprinting { export interface ConfigFingerprinting {
saveFingerprint?: ConfigSaveFingerprint; saveFingerprint?: ConfigSaveFingerprint;
enableInjection?: boolean; // Enable fingerprint injection (default: true, set to false if session closed errors occur)
} }
export interface ConfigSearchSettings { export interface ConfigSearchSettings {

View File

@@ -53,7 +53,11 @@ function shouldReportError(errorMessage: string): boolean {
/invalid.*configuration/i, /invalid.*configuration/i,
/missing.*required.*field/i, /missing.*required.*field/i,
/port.*already.*in.*use/i, /port.*already.*in.*use/i,
/eaddrinuse/i /eaddrinuse/i,
// Rebrowser-playwright expected errors (benign, non-fatal)
/rebrowser-patches.*cannot get world/i,
/session closed.*rebrowser/i,
/addScriptToEvaluateOnNewDocument.*session closed/i
] ]
// Don't report user configuration errors // Don't report user configuration errors