@bobfrankston/mailx 1.0.64 → 1.0.69

package/packages/mailx-imap/index.d.ts

@@ -30,6 +30,8 @@ export declare class ImapManager extends EventEmitter {
     constructor(db: MailxDB);
     /** Get OAuth access token for an account (for SMTP auth) */
     getOAuthToken(accountId: string): Promise<string | null>;
+    /** Accounts currently re-authenticating — all operations skip these */
+    private reauthenticating;
     /** Force re-authentication for an OAuth account — deletes cached IMAP token, triggers browser consent */
     reauthenticate(accountId: string): Promise<boolean>;
     /** Delete a message directly on the IMAP server (for stuck outbox messages not in local DB) */

package/packages/mailx-imap/index.js

@@ -72,29 +72,42 @@ export class ImapManager extends EventEmitter {
             return null;
         return config.tokenProvider();
     }
+    /** Accounts currently re-authenticating — all operations skip these */
+    reauthenticating = new Set();
     /** Force re-authentication for an OAuth account — deletes cached IMAP token, triggers browser consent */
     async reauthenticate(accountId) {
-        const settings = loadSettings();
-        const account = settings.accounts.find(a => a.id === accountId);
-        if (!account)
-            return false;
-        // Delete only the IMAP token (not contacts — separate scope, separate consent)
-        const accountDir = account.imap.user.replace(/[@.]/g, "_");
-        const tokenDir = path.join(getConfigDir(), "tokens", accountDir);
-        const tokenPath = path.join(tokenDir, "token.json");
-        if (fs.existsSync(tokenPath)) {
-            fs.unlinkSync(tokenPath);
-            console.log(`  [reauth] Deleted ${tokenPath}`);
-        }
-        // Re-register the account to get a fresh config with new tokenProvider
-        this.configs.delete(accountId);
-        await this.addAccount(account);
-        // Trigger the OAuth flow by requesting a token
+        if (this.reauthenticating.has(accountId))
+            return false; // already in progress
+        this.reauthenticating.add(accountId);
         try {
-            const token = await this.getOAuthToken(accountId);
-            if (token) {
+            const settings = loadSettings();
+            const account = settings.accounts.find(a => a.id === accountId);
+            if (!account)
+                return false;
+            // Stop IDLE watcher for this account
+            const stopWatcher = this.watchers.get(accountId);
+            if (stopWatcher) {
+                try {
+                    await stopWatcher();
+                }
+                catch { /* */ }
+                this.watchers.delete(accountId);
+            }
+            // Delete only the IMAP token (not contacts — separate scope, separate consent)
+            const accountDir = account.imap.user.replace(/[@.]/g, "_");
+            const tokenDir = path.join(getConfigDir(), "tokens", accountDir);
+            const tokenPath = path.join(tokenDir, "token.json");
+            if (fs.existsSync(tokenPath)) {
+                fs.unlinkSync(tokenPath);
+                console.log(`  [reauth] Deleted ${tokenPath}`);
+            }
+            // Re-register the account to get a fresh config with new tokenProvider
+            this.configs.delete(accountId);
+            await this.addAccount(account);
+            // addAccount already pre-validates the token (opens browser if needed)
+            const config = this.configs.get(accountId);
+            if (config?.tokenProvider) {
                 console.log(`  [reauth] ${accountId}: success`);
-                // Trigger a sync now that auth works
                 this.syncInbox().catch(() => { });
                 return true;
             }
@@ -102,6 +115,9 @@ export class ImapManager extends EventEmitter {
         catch (e) {
             console.error(`  [reauth] ${accountId}: ${e.message}`);
         }
+        finally {
+            this.reauthenticating.delete(accountId);
+        }
         return false;
     }
     /** Delete a message directly on the IMAP server (for stuck outbox messages not in local DB) */
@@ -137,6 +153,8 @@ export class ImapManager extends EventEmitter {
     }
     /** Create a fresh ImapClient for an account (disposable, single-use) */
     createClient(accountId) {
+        if (this.reauthenticating.has(accountId))
+            throw new Error(`Account ${accountId} is re-authenticating`);
         const config = this.configs.get(accountId);
         if (!config)
             throw new Error(`No config for account ${accountId}`);
@@ -539,6 +557,8 @@ export class ImapManager extends EventEmitter {
     lastInboxCounts = new Map();
     async quickInboxCheck() {
         for (const [accountId] of this.configs) {
+            if (this.reauthenticating.has(accountId))
+                continue;
             let client = null;
             try {
                 const inbox = this.db.getFolders(accountId).find(f => f.specialUse === "inbox");