@bobfrankston/mailx 1.0.141 → 1.0.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.141",
+  "version": "1.0.142",
   "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.52",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/msger": "^0.1.195",
+    "@bobfrankston/msger": "^0.1.196",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

package/packages/mailx-api/index.js

@@ -150,7 +150,31 @@ export function createApiRouter(db, imapManager) {
             if (detected?.cloud) {
                 await initCloudConfig(detected.cloud);
             }
-            // Build account config
+            // Check if cloud config found existing accounts (e.g., from GDrive mount or API)
+            let accounts = loadAccounts();
+            if (accounts.length === 0) {
+                accounts = await loadAccountsAsync();
+            }
+            if (accounts.length > 0) {
+                // Existing accounts found on cloud — use them, don't create new
+                console.log(`  Found ${accounts.length} existing account(s) from cloud settings`);
+                const settings = loadSettings();
+                for (const acct of settings.accounts) {
+                    if (!acct.enabled)
+                        continue;
+                    try {
+                        await imapManager.addAccount(acct);
+                        console.log(`  Account loaded: ${acct.label || acct.name} (${acct.id})`);
+                    }
+                    catch (e) {
+                        console.error(`  Account ${acct.id} error: ${e.message}`);
+                    }
+                }
+                imapManager.syncAll().catch(() => { });
+                res.json({ ok: true, message: `Loaded ${accounts.length} existing account(s) from cloud settings.` });
+                return;
+            }
+            // No existing accounts — build new account config
             const account = { email, name: name || email.split("@")[0] };
             if (password)
                 account.password = password;
@@ -159,11 +183,6 @@ export function createApiRouter(db, imapManager) {
                 account.imap = { host: detected.imapHost, port: 993, tls: true, auth: detected.auth, user: email };
                 account.smtp = { host: detected.smtpHost, port: 587, tls: true, auth: detected.auth, user: email };
             }
-            // Load existing accounts — try cloud API in case home/.mailx already exists on Drive
-            let accounts = loadAccounts();
-            if (accounts.length === 0) {
-                accounts = await loadAccountsAsync();
-            }
             const id = domain.split(".")[0] || "account";
             if (accounts.some((a) => a.email === email)) {
                 res.json({ ok: false, error: "Account already exists" });

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

@@ -91,7 +91,7 @@ export { getSharedDir };
 /** Initialize local config if it doesn't exist */
 export declare function initLocalConfig(sharedDir?: string, storePath?: string): void;
 /** Initialize config with Google Drive cloud storage.
- *  Finds or creates the app-owned "mailx" folder on Drive and stores its ID. */
+ *  Checks for existing settings on GDrive mount first, then falls back to API folder. */
 export declare function initCloudConfig(provider?: "gdrive"): Promise<void>;
 declare const DEFAULT_SETTINGS: MailxSettings;
 /** Get historyDays for an account: per-account override > system override > shared default */

package/packages/mailx-settings/index.js

@@ -548,22 +548,33 @@ export function initLocalConfig(sharedDir, storePath) {
     atomicWrite(LOCAL_CONFIG_PATH, config);
 }
 /** Initialize config with Google Drive cloud storage.
- *  Finds or creates the app-owned "mailx" folder on Drive and stores its ID. */
+ *  Checks for existing settings on GDrive mount first, then falls back to API folder. */
 export async function initCloudConfig(provider = "gdrive") {
     const existing = readLocalConfig();
     if (existing.sharedDir)
         return; // Already configured
-    // Find or create the "mailx" folder on Google Drive
+    // Check if settings already exist on a GDrive mount (e.g., home/.mailx from a previous setup)
+    const home = process.env.USERPROFILE || process.env.HOME || "";
+    const mountPaths = [
+        path.join(home, "Google Drive", "My Drive", "home", ".mailx"),
+        path.join(home, "Google Drive Streaming", "My Drive", "home", ".mailx"),
+    ];
+    for (const mountPath of mountPaths) {
+        if (fs.existsSync(path.join(mountPath, "accounts.jsonc")) || fs.existsSync(path.join(mountPath, "settings.jsonc"))) {
+            console.log(`  Found existing settings on GDrive mount: ${mountPath}`);
+            const sharedDir = { provider, path: "home/.mailx" };
+            const config = { ...existing, sharedDir, storePath: existing.storePath || DEFAULT_STORE_PATH };
+            fs.mkdirSync(LOCAL_DIR, { recursive: true });
+            atomicWrite(LOCAL_CONFIG_PATH, config);
+            return;
+        }
+    }
+    // No mount — find or create the "mailx" folder via Drive API
     const folderId = await gDriveFindOrCreateFolder();
     const sharedDir = { provider, path: "mailx", folderId: folderId || undefined };
-    const config = {
-        ...existing,
-        sharedDir: sharedDir,
-        storePath: existing.storePath || DEFAULT_STORE_PATH,
-    };
+    const config = { ...existing, sharedDir, storePath: existing.storePath || DEFAULT_STORE_PATH };
     fs.mkdirSync(LOCAL_DIR, { recursive: true });
     atomicWrite(LOCAL_CONFIG_PATH, config);
-    // Set up cloud API fallback immediately
     pendingCloudConfig = sharedDir;
     console.log(`  Initialized cloud config: ${provider} (folder ID: ${folderId || "pending"})`);
 }