@bobfrankston/mailx 1.0.152 → 1.0.154

package/bin/mailx.js

@@ -399,16 +399,17 @@ async function runSetup() {
             const { gDriveFindOrCreateFolder, getCloudProvider } = await import("@bobfrankston/mailx-settings/cloud.js");
             const folderId = await gDriveFindOrCreateFolder();
             if (folderId) {
+                console.log(`  Drive folder: My Drive/mailx/ (${folderId})`);
                 const gdrive = getCloudProvider("gdrive", folderId);
                 if (gdrive) {
-                    // Check for existing accounts on Drive
-                    const existing = await gdrive.read("accounts.jsonc") || await gdrive.read("settings.jsonc");
+                    // Read accounts.jsonc (canonical) — ignore legacy settings.jsonc
+                    const existing = await gdrive.read("accounts.jsonc");
                     if (existing) {
                         const { parse: parseJsonc } = await import("jsonc-parser");
                         const data = parseJsonc(existing);
                         const accts = data?.accounts || (Array.isArray(data) ? data : []);
                         if (accts.length > 0) {
-                            console.log(`\nFound ${accts.length} existing account(s) on Google Drive!`);
+                            console.log(`\nFound ${accts.length} existing account(s) on Google Drive (My Drive/mailx/accounts.jsonc):`);
                             for (const a of accts)
                                 console.log(`  • ${a.label || a.name || a.email}`);
                             // Save config pointing to Drive — no prompts needed
@@ -685,7 +686,7 @@ async function main() {
     });
     // Wait for WebView2 initialization before starting IMAP (stdin writes during init crash wry)
     await new Promise(r => setTimeout(r, 2000));
-    // Add accounts and start sync
+    // Register all accounts (OAuth may open browser for Gmail — event loop stays free for IPC)
     for (const account of settings.accounts) {
         if (!account.enabled)
             continue;
@@ -697,6 +698,7 @@ async function main() {
             console.error(`  Failed: ${account.id}: ${e.message}`);
         }
     }
+    // Start sync in background — don't block
     if (settings.accounts.some(a => a.enabled)) {
         imapManager.syncAll().catch(e => console.error(`  Sync error: ${e.message}`));
     }

package/client/app.js

@@ -898,7 +898,19 @@ optAutocomplete?.addEventListener("change", () => {
     }).catch(() => { });
 });
 const isApp = typeof mailxapi !== "undefined" && mailxapi?.isApp;
-const versionPromise = getVersion();
+// Retry getVersion — IPC may not be ready on first call
+async function getVersionWithRetry() {
+    for (let i = 0; i < 5; i++) {
+        try {
+            return await getVersion();
+        }
+        catch {
+            await new Promise(r => setTimeout(r, 1000));
+        }
+    }
+    return { version: "?", storage: {} };
+}
+const versionPromise = getVersionWithRetry();
 versionPromise.then((d) => {
     const el = document.getElementById("app-version");
     const storage = d.storage || {};
@@ -907,10 +919,10 @@ versionPromise.then((d) => {
         : "";
     if (el) {
         el.textContent = `mailx v${d.version}${storageLabel}${isApp ? "" : " [browser]"}`;
-        // Tooltip: show cloud path and access mode on hover
+        // Tooltip: show Drive path on hover
         if (storage.provider && storage.provider !== "local") {
-            const modeDesc = storage.mode === "api" ? "API" : "mount";
-            el.title = `${storage.cloudPath || storage.provider} (${modeDesc})`;
+            const drivePath = storage.cloudPath ? `My Drive/${storage.cloudPath}/` : storage.provider;
+            el.title = drivePath;
         }
     }
     if (d.settingsError) {

package/client/lib/mailxapi.js

@@ -19,7 +19,7 @@
             var timer = setTimeout(function() {
                 delete _callbacks[id];
                 reject(new Error("mailxapi timeout: " + action));
-            }, 30000);
+            }, 120000);
             _callbacks[id] = { resolve: resolve, reject: reject, timer: timer };
             var msg = Object.assign({ _action: action, _cbid: id }, params || {});
             if (window.ipc && window.ipc.postMessage) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.152",
+  "version": "1.0.154",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -23,7 +23,7 @@
     "@bobfrankston/iflow": "^1.0.53",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/msger": "^0.1.202",
+    "@bobfrankston/msger": "^0.1.204",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -108,7 +108,7 @@ export class ImapManager extends EventEmitter {
     connectionBackoff = new Map();
     /** Per-account connection semaphore — limits concurrent IMAP connections */
     connectionSemaphore = new Map();
-    static MAX_CONNECTIONS = 5; // sync, fetch, IDLE, outbox, sync-actions
+    static MAX_CONNECTIONS = 2; // 1 for all operations (sequential), 1 for IDLE
     constructor(db) {
         super();
         this.db = db;

package/packages/mailx-settings/index.js

@@ -78,13 +78,11 @@ function getSharedDir() {
             if (resolved)
                 return resolved;
         }
-        // Nothing mounted — save last provider entry for API fallback (log once)
+        // Set pending cloud config for API access
         if (!pendingCloudConfig) {
             const lastProvider = [...entries].reverse().find(e => typeof e !== "string");
-            if (lastProvider) {
+            if (lastProvider)
                 pendingCloudConfig = lastProvider;
-                console.log(`  No cloud drive mounted — will try ${lastProvider.provider} API`);
-            }
         }
     }
     // Legacy settingsPath no longer used for shared dir — use loadLegacySettings() for reading only.
@@ -388,7 +386,7 @@ export function loadAccounts() {
         }
         const raw = accounts.accounts || accounts;
         const globalName = accounts.name || "";
-        const result = raw.map((a) => normalizeAccount(a, globalName));
+        const result = deduplicateAccounts(raw.map((a) => normalizeAccount(a, globalName)));
         return applyAccountOverrides(result);
     }
     // Legacy: read from settings.jsonc
@@ -397,6 +395,27 @@ export function loadAccounts() {
         return applyAccountOverrides(legacy.accounts.map((a) => normalizeAccount(a, legacy.name)));
     return DEFAULT_ACCOUNTS;
 }
+/** Normalize email for dedup — Gmail ignores dots before @ */
+function normalizeEmail(email) {
+    const [local, domain] = email.toLowerCase().split("@");
+    if (!domain)
+        return email.toLowerCase();
+    if (domain === "gmail.com" || domain === "googlemail.com") {
+        return local.replace(/\./g, "") + "@gmail.com";
+    }
+    return `${local}@${domain}`;
+}
+/** Remove duplicate accounts (same email after normalization) */
+function deduplicateAccounts(accounts) {
+    const seen = new Set();
+    return accounts.filter(a => {
+        const key = normalizeEmail(a.email);
+        if (seen.has(key))
+            return false;
+        seen.add(key);
+        return true;
+    });
+}
 /** Apply local per-account overrides (enabled, etc.) */
 function applyAccountOverrides(accounts) {
     const localConfig = readLocalConfig();
@@ -430,14 +449,7 @@ export async function loadAccountsAsync() {
                 return applyAccountOverrides(raw.map((a) => normalizeAccount(a, globalName)));
             }
         }
-        // Also try legacy settings.jsonc
-        const legacy = await cloudRead("settings.jsonc");
-        if (legacy) {
-            const data = parseJsonc(legacy);
-            if (data?.accounts) {
-                return applyAccountOverrides(data.accounts.map((a) => normalizeAccount(a, data.name)));
-            }
-        }
+        // Legacy settings.jsonc is no longer read — use accounts.jsonc only
     }
     return [];
 }