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

Fix: Enable auto-update for configuration and enhance task execution handling for multi-pass runs

Browse Source
This commit is contained in:
LightZirconite
2025-11-08 18:32:58 +01:00
parent 6b687a1018
commit 52fbbd79b1
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.jsonc
View File

@@ -151,7 +151,7 @@
// "github-api" = Downloads ZIP from GitHub (no Git needed, no conflicts, recommended) // "github-api" = Downloads ZIP from GitHub (no Git needed, no conflicts, recommended)
"docker": false, // Update Docker containers if using Docker "docker": false, // Update Docker containers if using Docker
"scriptPath": "setup/update/update.mjs", "scriptPath": "setup/update/update.mjs",
"autoUpdateConfig": false, // Update config.jsonc from remote (keeps your settings if false) "autoUpdateConfig": true, // Update config.jsonc from remote (keeps your settings if false)
"autoUpdateAccounts": false // Update accounts file from remote (NEVER recommended, keeps your accounts) "autoUpdateAccounts": false // Update accounts file from remote (NEVER recommended, keeps your accounts)
}, },

20
src/index.ts
View File

@@ -226,7 +226,7 @@ export class MicrosoftRewardsBot {
if (passes > 1) { if (passes > 1) {
log('main', 'MAIN', `Starting pass ${pass}/${passes}`) log('main', 'MAIN', `Starting pass ${pass}/${passes}`)
} }
await this.runTasks(this.accounts) await this.runTasks(this.accounts, pass, passes)
if (pass < passes) { if (pass < passes) {
log('main', 'MAIN', `Completed pass ${pass}/${passes}. Waiting before next pass...`) log('main', 'MAIN', `Completed pass ${pass}/${passes}. Waiting before next pass...`)
await this.utils.wait(TIMEOUTS.ONE_MINUTE) await this.utils.wait(TIMEOUTS.ONE_MINUTE)
@@ -376,7 +376,7 @@ export class MicrosoftRewardsBot {
if (passes > 1) { if (passes > 1) {
log('main', 'MAIN-WORKER', `Starting pass ${pass}/${passes}`) log('main', 'MAIN-WORKER', `Starting pass ${pass}/${passes}`)
} }
await this.runTasks(chunk) await this.runTasks(chunk, pass, passes)
if (pass < passes) { if (pass < passes) {
log('main', 'MAIN-WORKER', `Completed pass ${pass}/${passes}. Waiting before next pass...`) log('main', 'MAIN-WORKER', `Completed pass ${pass}/${passes}. Waiting before next pass...`)
await this.utils.wait(TIMEOUTS.ONE_MINUTE) await this.utils.wait(TIMEOUTS.ONE_MINUTE)
@@ -385,12 +385,14 @@ export class MicrosoftRewardsBot {
}) })
} }
private async runTasks(accounts: Account[]) { private async runTasks(accounts: Account[], currentPass: number = 1, totalPasses: number = 1) {
// Check if all accounts are already completed and prompt user // Check if all accounts are already completed and prompt user
// BUT skip this check for multi-pass runs (passes > 1) OR if not on first pass
const accountDayKey = this.utils.getFormattedDate() const accountDayKey = this.utils.getFormattedDate()
const allCompleted = accounts.every(acc => this.shouldSkipAccount(acc.email, accountDayKey)) const allCompleted = accounts.every(acc => this.shouldSkipAccount(acc.email, accountDayKey))
if (allCompleted && accounts.length > 0) { // Only check completion on first pass and if not doing multiple passes
if (allCompleted && accounts.length > 0 && currentPass === 1 && totalPasses === 1) {
log('main','TASK',`All accounts already completed on ${accountDayKey}`, 'warn', 'yellow') log('main','TASK',`All accounts already completed on ${accountDayKey}`, 'warn', 'yellow')
const shouldReset = await this.promptResetJobState() const shouldReset = await this.promptResetJobState()
if (shouldReset) { if (shouldReset) {
@@ -400,6 +402,10 @@ export class MicrosoftRewardsBot {
log('main','TASK','Keeping existing job state - exiting', 'log') log('main','TASK','Keeping existing job state - exiting', 'log')
return return
} }
} else if (allCompleted && accounts.length > 0 && currentPass > 1) {
// Multi-pass mode: clear job state for this pass to allow re-running
log('main','TASK',`Pass ${currentPass}/${totalPasses}: Clearing job state to allow account re-run`, 'log', 'cyan')
this.resetAllJobStates()
} }
for (const account of accounts) { for (const account of accounts) {
@@ -414,10 +420,16 @@ export class MicrosoftRewardsBot {
break break
} }
const currentDayKey = this.utils.getFormattedDate() const currentDayKey = this.utils.getFormattedDate()
// Note: shouldSkipAccount already returns false for multi-pass runs (passesPerRun > 1)
if (this.shouldSkipAccount(account.email, currentDayKey)) { if (this.shouldSkipAccount(account.email, currentDayKey)) {
log('main','TASK',`Skipping account ${account.email}: already completed on ${currentDayKey} (job-state resume)`, 'warn') log('main','TASK',`Skipping account ${account.email}: already completed on ${currentDayKey} (job-state resume)`, 'warn')
continue continue
} }
// Log pass info for multi-pass runs
if (totalPasses > 1) {
log('main','TASK',`[Pass ${currentPass}/${totalPasses}] Processing account ${account.email}`, 'log', 'cyan')
}
// Reset compromised state per account // Reset compromised state per account
this.compromisedModeActive = false this.compromisedModeActive = false
this.compromisedReason = undefined this.compromisedReason = undefined