Potential cluster fix & Browser close fix

Keyword "potentially"

Author: TheNetsky

README.md

@@ -2,7 +2,6 @@
 [![Latest Build](https://img.shields.io/github/actions/workflow/status/TheNetsky/Microsoft-Rewards-Script/auto-release.yml?branch=v3&style=for-the-badge&label=Latest%20Build)](https://github.com/TheNetsky/Microsoft-Rewards-Script/actions/workflows/auto-release.yml)
 [![Docker](https://img.shields.io/badge/Docker-GHCR-blue?style=for-the-badge&logo=docker)](https://github.com/TheNetsky/Microsoft-Rewards-Script/pkgs/container/microsoft-rewards-script)
 
-
 > [!CAUTION]
 > V3.x does not support the new Bing Rewards interface!
 >
@@ -27,6 +26,7 @@
 Works on Windows, Linux, macOS, and WSL.
 
 ### Get the script
+
 ```bash
 git clone https://github.com/TheNetsky/Microsoft-Rewards-Script.git
 cd Microsoft-Rewards-Script
@@ -35,7 +35,7 @@ cd Microsoft-Rewards-Script
 Or, download the latest release ZIP and extract it.
 
 > [!TIP]
-> **Docker users:** optionally skip the clone step when using the prebuilt image. You only need a valid `accounts.json` and `config.json` locally. They can be placed anywhere. 
+> **Docker users:** optionally skip the clone step when using the prebuilt image. You only need a valid `accounts.json` and `config.json` locally. They can be placed anywhere.
 > Update the `volumes` section in [`compose.yaml`](./compose.yaml) to point to your files (e.g., `/your/path/to/accounts.json:/usr/src/microsoft-rewards-script/dist/accounts.json:ro`).
 
 ### Create accounts.json and config.json
@@ -53,13 +53,15 @@ Copy, rename, and edit your account and configuration files before deploying the
 > You must rebuild your script after making any changes to accounts.json and config.json.
 
 ### Build and run the script (bare metal)
+
 ```bash
 npm run pre-build
 npm run build
 npm run start
 ```
 
 ### Build and run the script (Docker)
+
 ```bash
 docker compose up -d
 ```

src/browser/BrowserFunc.ts

@@ -293,29 +293,33 @@ export default class BrowserFunc {
     }
 
     async closeBrowser(browser: BrowserContext, email: string) {
+        const rootBrowser = (browser as any).browser?.() || null
+
         try {
+            // Try to save cookies
             const cookies = await browser.cookies()
-
-            // Save cookies
-            this.bot.logger.debug(
-                this.bot.isMobile,
-                'CLOSE-BROWSER',
-                `Saving ${cookies.length} cookies to session folder!`
-            )
+            this.bot.logger.debug(this.bot.isMobile, 'CLOSE-BROWSER', `Saving ${cookies.length} cookies.`)
             await saveSessionData(this.bot.config.sessionPath, cookies, email, this.bot.isMobile)
 
             await this.bot.utils.wait(2000)
-
-            // Close browser
-            await browser.close()
-            this.bot.logger.info(this.bot.isMobile, 'CLOSE-BROWSER', 'Browser closed cleanly!')
         } catch (error) {
-            this.bot.logger.error(
-                this.bot.isMobile,
-                'CLOSE-BROWSER',
-                `An error occurred: ${error instanceof Error ? error.message : String(error)}`
-            )
-            throw error
+            this.bot.logger.error(this.bot.isMobile, 'CLOSE-BROWSER', `Failed to save session: ${error}`)
+        } finally {
+            try {
+                await browser.close()
+
+                if (rootBrowser) {
+                    await rootBrowser.close().catch(() => {})
+                }
+
+                this.bot.logger.info(this.bot.isMobile, 'CLOSE-BROWSER', 'All browser resources closed.')
+            } catch (closeError) {
+                this.bot.logger.warn(
+                    this.bot.isMobile,
+                    'CLOSE-BROWSER',
+                    'Shutdown encountered an error, but process exiting.'
+                )
+            }
         }
     }
 

src/index.ts

@@ -142,7 +142,7 @@ export class MicrosoftRewardsBot {
 
         if (this.config.clusters > 1) {
             if (cluster.isPrimary) {
-                this.runMaster(runStartTime)
+                await this.runMaster(runStartTime)
             } else {
                 this.runWorker(runStartTime)
             }
@@ -151,14 +151,15 @@ export class MicrosoftRewardsBot {
         }
     }
 
-    private runMaster(runStartTime: number): void {
+    private async runMaster(runStartTime: number): Promise<void> {
         void this.logger.info('main', 'CLUSTER-PRIMARY', `Primary process started | PID: ${process.pid}`)
 
         const rawChunks = this.utils.chunkArray(this.accounts, this.config.clusters)
         const accountChunks = rawChunks.filter(c => c && c.length > 0)
         this.activeWorkers = accountChunks.length
 
         const allAccountStats: AccountStats[] = []
+        let hadWorkerFailure = false
 
         for (const chunk of accountChunks) {
             const worker = cluster.fork()
@@ -170,12 +171,11 @@ export class MicrosoftRewardsBot {
                 }
 
                 const log = msg.__ipcLog
-
                 if (log && typeof log.content === 'string') {
-                    const config = this.config
-                    const webhook = config.webhook
-                    const content = log.content
-                    const level = log.level
+                    const { webhook } = this.config
+                    const { content, level } = log
+
+                    // Webhooks, for later expansion?
                     if (webhook.discord?.enabled && webhook.discord.url) {
                         sendDiscord(webhook.discord.url, content, level)
                     }
@@ -184,23 +184,35 @@ export class MicrosoftRewardsBot {
                     }
                 }
             })
+
+            // Startup delay for clusters due to resource usage
+            if (accountChunks.indexOf(chunk) !== accountChunks.length - 1) {
+                await this.utils.wait(5000)
+            }
         }
 
-        const onWorkerDone = async (label: 'exit' | 'disconnect', worker: Worker, code?: number): Promise<void> => {
+        const onWorkerExit = async (worker: Worker, code?: number, signal?: string): Promise<void> => {
             const { pid } = worker.process
-            this.activeWorkers -= 1
 
             if (!pid || this.exitedWorkers.includes(pid)) {
                 return
-            } else {
-                this.exitedWorkers.push(pid)
+            }
+
+            this.exitedWorkers.push(pid)
+            this.activeWorkers -= 1
+
+            // exit 0 = good, exit 1 = crash
+            const failed = (code ?? 0) !== 0 || Boolean(signal)
+            if (failed) {
+                hadWorkerFailure = true
             }
 
             this.logger.warn(
                 'main',
-                `CLUSTER-WORKER-${label.toUpperCase()}`,
-                `Worker ${worker.process?.pid ?? '?'} ${label} | Code: ${code ?? 'n/a'} | Active workers: ${this.activeWorkers}`
+                'CLUSTER-WORKER-EXIT',
+                `Worker ${pid} exit | Code: ${code ?? 'n/a'} | Signal: ${signal ?? 'n/a'} | Active workers: ${this.activeWorkers}`
             )
+
             if (this.activeWorkers <= 0) {
                 const totalCollectedPoints = allAccountStats.reduce((sum, s) => sum + s.collectedPoints, 0)
                 const totalInitialPoints = allAccountStats.reduce((sum, s) => sum + s.initialPoints, 0)
@@ -213,40 +225,50 @@ export class MicrosoftRewardsBot {
                     `Completed all accounts | Accounts processed: ${allAccountStats.length} | Total points collected: +${totalCollectedPoints} | Old total: ${totalInitialPoints} → New total: ${totalFinalPoints} | Total runtime: ${totalDurationMinutes}min`,
                     'green'
                 )
+
                 await flushAllWebhooks()
-                process.exit(code ?? 0)
+
+                process.exit(hadWorkerFailure ? 1 : 0)
             }
         }
 
-        cluster.on('exit', (worker, code) => {
-            void onWorkerDone('exit', worker, code)
+        cluster.on('exit', (worker, code, signal) => {
+            void onWorkerExit(worker, code ?? undefined, signal ?? undefined)
         })
+
         cluster.on('disconnect', worker => {
-            void onWorkerDone('disconnect', worker, undefined)
+            const pid = worker.process?.pid
+            this.logger.warn('main', 'CLUSTER-WORKER-DISCONNECT', `Worker ${pid ?? '?'} disconnected`) // <-- Warning only
         })
     }
 
     private runWorker(runStartTimeFromMaster?: number): void {
         void this.logger.info('main', 'CLUSTER-WORKER-START', `Worker spawned | PID: ${process.pid}`)
+
         process.on('message', async ({ chunk, runStartTime }: { chunk: Account[]; runStartTime: number }) => {
             void this.logger.info(
                 'main',
                 'CLUSTER-WORKER-TASK',
                 `Worker ${process.pid} received ${chunk.length} accounts.`
             )
+
             try {
                 const stats = await this.runTasks(chunk, runStartTime ?? runStartTimeFromMaster ?? Date.now())
+
+                // Send and flush before exit
                 if (process.send) {
                     process.send({ __stats: stats })
                 }
 
-                process.disconnect()
+                await flushAllWebhooks()
+                process.exit(0)
             } catch (error) {
                 this.logger.error(
                     'main',
                     'CLUSTER-WORKER-ERROR',
                     `Worker task crash: ${error instanceof Error ? error.message : String(error)}`
                 )
+
                 await flushAllWebhooks()
                 process.exit(1)
             }
@@ -334,7 +356,7 @@ export class MicrosoftRewardsBot {
             }
         }
 
-        if (this.config.clusters <= 1 && !cluster.isWorker) {
+        if (this.config.clusters <= 1 && cluster.isPrimary) {
             const totalCollectedPoints = accountStats.reduce((sum, s) => sum + s.collectedPoints, 0)
             const totalInitialPoints = accountStats.reduce((sum, s) => sum + s.initialPoints, 0)
             const totalFinalPoints = accountStats.reduce((sum, s) => sum + s.finalPoints, 0)
@@ -348,7 +370,7 @@ export class MicrosoftRewardsBot {
             )
 
             await flushAllWebhooks()
-            process.exit()
+            process.exit(0)
         }
 
         return accountStats