@bobfrankston/mailx 1.0.166 → 1.0.168

package/bin/mailx.js

@@ -201,7 +201,7 @@ if (importMode) {
     const wrapper = { accounts: merged };
     if (data?.name)
         wrapper.name = data.name;
-    saveAccounts(merged);
+    await saveAccounts(merged);
     console.log(`Saved ${merged.length} account(s). Run 'mailx' to start.`);
     process.exit(0);
 }

package/client/components/message-list.js

@@ -86,6 +86,8 @@ export function reloadCurrentFolder() {
 }
 /** Load unified inbox (all accounts) */
 export async function loadUnifiedInbox(autoSelect = true) {
+    if (autoSelect)
+        clearViewer();
     unifiedMode = true;
     currentPage = 1;
     totalMessages = 0;

package/client/index.html

@@ -46,11 +46,11 @@
                 <span class="tb-icon">↻</span> Sync
             </button>
             <div class="tb-menu" id="restart-menu">
-                <button class="tb-btn" id="btn-restart" title="Restart server and reload page">
+                <button class="tb-btn" id="btn-restart" title="Reload">
                     <span class="tb-icon">⚡</span> Restart ▾
                 </button>
                 <div class="tb-menu-dropdown" id="restart-dropdown" hidden>
-                    <button class="tb-menu-item" id="btn-restart-quick" title="Restart the server process">Restart server</button>
+                    <button class="tb-menu-item" id="btn-restart-quick" title="Reload the page">Reload</button>
                     <button class="tb-menu-item" id="btn-rebuild" title="Wipe local DB and message cache, re-download everything. Accounts and settings are preserved. Safe and fast.">Rebuild local cache</button>
                     <hr class="tb-menu-sep">
                     <span class="tb-menu-hint">CLI: mailx --rebuild for full reset</span>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.166",
+  "version": "1.0.168",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,7 @@
     "@bobfrankston/iflow-node": "^0.1.1",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/msger": "^0.1.216",
+    "@bobfrankston/msger": "^0.1.218",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

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

@@ -113,7 +113,7 @@ export declare function getSyncPending(): {
 export declare function allowRemoteContent(params: {
     type: string;
     value: string;
-}): void;
+}): Promise<void>;
 export declare function getSettings(): import("@bobfrankston/mailx-types").MailxSettings;
 export declare function saveSettingsData(data: any): void;
 export declare function rebuildSearchIndex(): number;

package/packages/mailx-core/index.js

@@ -312,7 +312,7 @@ export async function syncAll() {
 export function getSyncPending() {
     return { pending: db.getTotalPendingSyncCount() };
 }
-export function allowRemoteContent(params) {
+export async function allowRemoteContent(params) {
     const list = loadAllowlist();
     if (params.type === "sender" && !list.senders.includes(params.value))
         list.senders.push(params.value);
@@ -324,7 +324,7 @@ export function allowRemoteContent(params) {
         if (!list.recipients.includes(params.value))
             list.recipients.push(params.value);
     }
-    saveAllowlist(list);
+    await saveAllowlist(list);
 }
 export function getSettings() {
     return loadSettings();

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

@@ -94,7 +94,7 @@ export declare class ImapManager extends EventEmitter {
      *  If message count changed, triggers inbox sync for that account. */
     private lastInboxCounts;
     private quickCheckRunning;
-    /** Check a single account's inbox */
+    /** Check a single account's inbox — uses its own connection, never blocked by sync */
     quickInboxCheckAccount(accountId: string): Promise<void>;
     /** Check all accounts (used by legacy callers) */
     quickInboxCheck(): Promise<void>;

package/packages/mailx-imap/index.js

@@ -318,12 +318,27 @@ export class ImapManager extends EventEmitter {
         // For OAuth accounts, provide a tokenProvider using oauthsupport
         let tokenProvider;
         if (account.imap.auth === "oauth2" || (!account.imap.password && account.imap.host?.includes("gmail"))) {
-            const credPath = path.join(getConfigDir(), "google-credentials.json");
+            // Find Google OAuth credentials — check ~/.mailx first, then iflow-direct package
+            let credPath = path.join(getConfigDir(), "google-credentials.json");
+            if (!fs.existsSync(credPath)) {
+                try {
+                    const pkgDir = path.dirname(import.meta.resolve("@bobfrankston/iflow-direct").replace("file:///", "").replace("file://", ""));
+                    for (const name of ["iflow-credentials.json"]) {
+                        const p = path.join(pkgDir, name);
+                        if (fs.existsSync(p)) {
+                            credPath = p;
+                            break;
+                        }
+                    }
+                }
+                catch { /* iflow-direct not resolvable */ }
+            }
             const tokenDir = path.join(getConfigDir(), "tokens", account.imap.user.replace(/[@.]/g, "_"));
             tokenProvider = async () => {
                 const result = await authenticateOAuth(credPath, {
                     scope: "https://mail.google.com/ https://www.googleapis.com/auth/contacts.readonly",
                     tokenDirectory: tokenDir,
+                    credentialsKey: "installed",
                     loginHint: account.imap.user,
                 });
                 return result?.access_token || "";
@@ -811,31 +826,39 @@ export class ImapManager extends EventEmitter {
      *  If message count changed, triggers inbox sync for that account. */
     lastInboxCounts = new Map();
     quickCheckRunning = new Set(); // per-account guard
-    /** Check a single account's inbox */
+    /** Check a single account's inbox — uses its own connection, never blocked by sync */
     async quickInboxCheckAccount(accountId) {
-        if (this.quickCheckRunning.has(accountId) || this.syncing || this.inboxSyncing)
+        if (this.quickCheckRunning.has(accountId))
             return;
         if (this.reauthenticating.has(accountId))
             return;
         this.quickCheckRunning.add(accountId);
+        let client = null;
         try {
             const inbox = this.db.getFolders(accountId).find(f => f.specialUse === "inbox");
             if (!inbox)
                 return;
-            await this.withConnection(accountId, async (client) => {
-                const count = await client.getMessagesCount("INBOX");
-                const prev = this.lastInboxCounts.get(accountId) ?? count;
-                this.lastInboxCounts.set(accountId, count);
-                if (count !== prev) {
-                    console.log(`  [check] ${accountId} INBOX: ${prev} → ${count}`);
-                    await this.syncFolder(accountId, inbox.id, client);
-                }
-            });
+            client = this.newClient(accountId);
+            const count = await client.getMessagesCount("INBOX");
+            const prev = this.lastInboxCounts.get(accountId) ?? count;
+            this.lastInboxCounts.set(accountId, count);
+            if (count !== prev) {
+                console.log(`  [check] ${accountId} INBOX: ${prev} → ${count}`);
+                await this.syncFolder(accountId, inbox.id, client);
+            }
+            await client.logout();
+            client = null;
         }
         catch {
             // Lightweight check — silently ignore errors
         }
         finally {
+            if (client) {
+                try {
+                    await client.logout();
+                }
+                catch { /* */ }
+            }
             this.quickCheckRunning.delete(accountId);
         }
     }
@@ -853,7 +876,8 @@ export class ImapManager extends EventEmitter {
         //   Password (Dovecot etc): every 60s — conservative, 20-connection limit
         // IDLE gives instant notification when working; STATUS is the fallback.
         for (const [accountId] of this.configs) {
-            const interval = this.isOAuthAccount(accountId) ? 15000 : 60000;
+            const QUICK_CHECK_INTERVAL = 2500; // STATUS INBOX is one command, very cheap
+            const interval = QUICK_CHECK_INTERVAL;
             const timer = setInterval(() => {
                 this.quickInboxCheckAccount(accountId).catch(() => { });
             }, interval);

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

@@ -20,7 +20,7 @@ export declare class MailxService {
     getMessages(accountId: string, folderId: number, page?: number, pageSize?: number, sort?: string, sortDir?: string, search?: string): any;
     getMessage(accountId: string, uid: number, allowRemote?: boolean, folderId?: number): Promise<any>;
     updateFlags(accountId: string, uid: number, flags: string[]): Promise<void>;
-    allowRemoteContent(type: "sender" | "domain" | "recipient", value: string): void;
+    allowRemoteContent(type: "sender" | "domain" | "recipient", value: string): Promise<void>;
     search(q: string, page?: number, pageSize?: number, scope?: string, accountId?: string, folderId?: number): Promise<any>;
     rebuildSearchIndex(): number;
     getSyncPending(): {

package/packages/mailx-service/index.js

@@ -213,7 +213,7 @@ export class MailxService {
         await this.imapManager.updateFlagsLocal(accountId, uid, envelope?.folderId || 0, flags);
     }
     // ── Remote content allow-list ──
-    allowRemoteContent(type, value) {
+    async allowRemoteContent(type, value) {
         const list = loadAllowlist();
         if (type === "sender" && !list.senders.includes(value))
             list.senders.push(value);
@@ -225,7 +225,7 @@ export class MailxService {
             if (!list.recipients.includes(value))
                 list.recipients.push(value);
         }
-        saveAllowlist(list);
+        await saveAllowlist(list);
         console.log(`  [allow] Added ${type}: ${value}`);
     }
     // ── Search ──
@@ -571,7 +571,7 @@ export class MailxService {
             account.smtp = { host: detected.smtpHost, port: 587, tls: true, auth: detected.auth, user: email };
         }
         account.id = domain.split(".")[0] || "account";
-        saveAccounts([account]);
+        await saveAccounts([account]);
         // Re-read normalized settings and register
         const settings = loadSettings();
         for (const acct of settings.accounts) {
@@ -603,7 +603,7 @@ export class MailxService {
         if (restored.length === 0) {
             return { ok: false, error: "Could not parse cached account configs" };
         }
-        saveAccounts(restored);
+        await saveAccounts(restored);
         for (const acct of restored) {
             try {
                 await this.imapManager.addAccount(acct);

package/packages/mailx-settings/cloud.js

@@ -31,7 +31,7 @@ function findGoogleCredentials() {
         let dir = import.meta.dirname;
         for (let i = 0; i < 5; i++) {
             for (const pkg of ["iflow-direct", "iflow"]) {
-                for (const name of ["iflow-credentials.json", "credentials.json"]) {
+                for (const name of ["iflow-credentials.json"]) {
                     const p = path.join(dir, "node_modules", "@bobfrankston", pkg, name);
                     if (fs.existsSync(p))
                         return p;

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

@@ -65,7 +65,8 @@ export declare function loadAccounts(): AccountConfig[];
 /** Load accounts with cloud API fallback (async — use when cloud settings may not be mounted) */
 export declare function loadAccountsAsync(): Promise<AccountConfig[]>;
 /** Save account configs */
-export declare function saveAccounts(accounts: AccountConfig[]): void;
+/** Save accounts — merges with cloud copy by email (multi-client safe) */
+export declare function saveAccounts(accounts: AccountConfig[]): Promise<void>;
 /** Load preferences (shared + local overrides, with legacy fallback) */
 export declare function loadPreferences(): typeof DEFAULT_PREFERENCES;
 /** Save preferences */
@@ -76,12 +77,12 @@ export declare function loadAutocomplete(): AutocompleteSettings;
 export declare function saveAutocomplete(settings: AutocompleteSettings): void;
 /** Load remote content allow-list */
 export declare function loadAllowlist(): typeof DEFAULT_ALLOWLIST;
-/** Save allow-list */
-export declare function saveAllowlist(list: typeof DEFAULT_ALLOWLIST): void;
+/** Save allow-list — merges with existing cloud copy (multi-client safe) */
+export declare function saveAllowlist(list: typeof DEFAULT_ALLOWLIST): Promise<void>;
 /** Load settings — unified view combining all files (backward compatible) */
 export declare function loadSettings(): MailxSettings;
 /** Save settings — writes to split files */
-export declare function saveSettings(settings: MailxSettings): void;
+export declare function saveSettings(settings: MailxSettings): Promise<void>;
 /** Get the local store base path */
 export declare function getStorePath(): string;
 /** Get the local data directory (DB, store, etc.) */

package/packages/mailx-settings/index.js

@@ -454,7 +454,26 @@ export async function loadAccountsAsync() {
     return [];
 }
 /** Save account configs */
-export function saveAccounts(accounts) {
+/** Save accounts — merges with cloud copy by email (multi-client safe) */
+export async function saveAccounts(accounts) {
+    // Merge with cloud: keep all accounts, deduplicate by normalized email
+    try {
+        const cloudContent = await cloudRead("accounts.jsonc");
+        if (cloudContent) {
+            const cloud = parseJsonc(cloudContent);
+            const cloudAccts = cloud?.accounts || (Array.isArray(cloud) ? cloud : []);
+            if (cloudAccts.length > 0) {
+                const seen = new Set(accounts.map(a => normalizeEmail(a.email)));
+                for (const ca of cloudAccts) {
+                    if (ca.email && !seen.has(normalizeEmail(ca.email))) {
+                        accounts.push(ca);
+                        seen.add(normalizeEmail(ca.email));
+                    }
+                }
+            }
+        }
+    }
+    catch { /* cloud read failed — save local version */ }
     saveFile("accounts.jsonc", { accounts });
 }
 /** Load preferences (shared + local overrides, with legacy fallback) */
@@ -496,9 +515,26 @@ export function saveAutocomplete(settings) {
 export function loadAllowlist() {
     return loadFile("allowlist.jsonc", DEFAULT_ALLOWLIST);
 }
-/** Save allow-list */
-export function saveAllowlist(list) {
-    saveFile("allowlist.jsonc", list);
+/** Save allow-list — merges with existing cloud copy (multi-client safe) */
+export async function saveAllowlist(list) {
+    // Read current cloud version and merge (other clients may have added entries)
+    let merged = { ...list };
+    try {
+        const cloudContent = await cloudRead("allowlist.jsonc");
+        if (cloudContent) {
+            const cloud = parseJsonc(cloudContent);
+            if (cloud) {
+                const mergeArrays = (local, remote) => [...new Set([...local, ...remote])];
+                merged = {
+                    senders: mergeArrays(list.senders || [], cloud.senders || []),
+                    domains: mergeArrays(list.domains || [], cloud.domains || []),
+                    recipients: mergeArrays(list.recipients || [], cloud.recipients || []),
+                };
+            }
+        }
+    }
+    catch { /* cloud read failed — save local version */ }
+    saveFile("allowlist.jsonc", merged);
 }
 // ── Legacy compatibility ──
 function loadLegacySettings() {
@@ -529,8 +565,8 @@ export function loadSettings() {
     };
 }
 /** Save settings — writes to split files */
-export function saveSettings(settings) {
-    saveAccounts(settings.accounts);
+export async function saveSettings(settings) {
+    await saveAccounts(settings.accounts);
     savePreferences({ ui: settings.ui, sync: settings.sync });
 }
 /** Get the local store base path */