@bobfrankston/mailx 1.0.43 → 1.0.45

package/bin/mailx.js

@@ -27,9 +27,10 @@ const verbose = hasFlag("verbose");
 
 const setupMode = hasFlag("setup");
 const addMode = hasFlag("add");
+const testMode = hasFlag("test");
 
 // Validate arguments
-const knownFlags = ["server", "no-browser", "verbose", "external", "kill", "v", "version", "setup", "add"];
+const knownFlags = ["server", "no-browser", "verbose", "external", "kill", "v", "version", "setup", "add", "test"];
 for (const arg of args) {
     const flag = arg.replace(/^--?/, "");
     if (arg.startsWith("-") && !knownFlags.includes(flag)) {
@@ -291,21 +292,60 @@ async function runSetup() {
         sync: { intervalMinutes: 5, historyDays: 0 },
     };
 
-    // Detect mounted cloud drive to save settings to
+    const domain = account.email.split("@")[1]?.toLowerCase() || "";
+    const isGmail = domain === "gmail.com" || domain === "googlemail.com";
+
+    // Ask where to store settings
     const mountedDrive = findMountedDrive();
+    let storageChoice = "local";
+
     if (mountedDrive) {
+        const useCloud = await prompt(`Store settings on ${mountedDrive.provider} (syncs across machines)? [Y/n]: `);
+        if (!useCloud || useCloud.toLowerCase() !== "n") storageChoice = mountedDrive.provider;
+    } else if (isGmail) {
+        const useGDrive = await prompt("Store settings on Google Drive (syncs across machines, editable via drive.google.com)? [Y/n]: ");
+        if (!useGDrive || useGDrive.toLowerCase() !== "n") storageChoice = "gdrive-api";
+    }
+
+    fs.mkdirSync(mailxDir, { recursive: true });
+
+    if (storageChoice === "gdrive-api") {
+        // Save to Google Drive via API (not mounted)
+        console.log("\nSaving settings to Google Drive via API...");
+        try {
+            const { getCloudProvider } = await import("../packages/mailx-settings/cloud.js");
+            const gdrive = getCloudProvider("gdrive");
+            if (gdrive) {
+                const content = JSON.stringify(settings, null, 2);
+                const ok = await gdrive.write("home/.mailx/settings.jsonc", content);
+                if (ok) {
+                    console.log("Settings saved to Google Drive: home/.mailx/settings.jsonc");
+                    const config = { sharedDir: { provider: "gdrive", path: "home/.mailx" } };
+                    fs.writeFileSync(path.join(mailxDir, "config.jsonc"), JSON.stringify(config, null, 2));
+                    console.log("Local config created pointing to Google Drive.");
+                } else {
+                    console.log("Google Drive write failed — saving locally instead.");
+                    fs.writeFileSync(path.join(mailxDir, "settings.jsonc"), JSON.stringify(settings, null, 2));
+                }
+            } else {
+                console.log("Google Drive API not available — saving locally.");
+                fs.writeFileSync(path.join(mailxDir, "settings.jsonc"), JSON.stringify(settings, null, 2));
+            }
+        } catch (e) {
+            console.log(`Google Drive error: ${e.message} — saving locally.`);
+            fs.writeFileSync(path.join(mailxDir, "settings.jsonc"), JSON.stringify(settings, null, 2));
+        }
+    } else if (storageChoice !== "local" && mountedDrive) {
+        // Save to mounted cloud drive
         console.log(`\nSaving settings to ${mountedDrive.provider} at ${mountedDrive.dir}...`);
         fs.mkdirSync(mountedDrive.dir, { recursive: true });
         fs.writeFileSync(path.join(mountedDrive.dir, "settings.jsonc"), JSON.stringify(settings, null, 2));
-        // Create local config pointing to cloud
-        fs.mkdirSync(mailxDir, { recursive: true });
         const config = { sharedDir: { provider: mountedDrive.provider, path: "home/.mailx" } };
         fs.writeFileSync(path.join(mailxDir, "config.jsonc"), JSON.stringify(config, null, 2));
         console.log("Settings saved to cloud drive + local config created.");
     } else {
         // Save locally
         console.log(`\nSaving settings to ${mailxDir}...`);
-        fs.mkdirSync(mailxDir, { recursive: true });
         fs.writeFileSync(path.join(mailxDir, "settings.jsonc"), JSON.stringify(settings, null, 2));
     }
 
@@ -330,11 +370,108 @@ function findMountedDrive() {
     return null;
 }
 
+/** Test account connectivity — IMAP connect, SMTP send, sync round-trip */
+async function runTest() {
+    console.log("\nmailx — connection test\n");
+
+    // Start server in-process to access settings
+    console.log("Loading settings...");
+    const { loadSettings, getSharedDir } = await import("../packages/mailx-settings/index.js");
+    const { initLocalConfig } = await import("../packages/mailx-settings/index.js");
+    initLocalConfig();
+    const settings = loadSettings();
+
+    if (settings.accounts.length === 0) {
+        console.log("No accounts configured. Run: mailx -setup");
+        process.exit(1);
+    }
+
+    console.log(`Shared dir: ${getSharedDir()}`);
+    console.log(`Accounts: ${settings.accounts.map(a => `${a.label || a.name} <${a.email}>`).join(", ")}\n`);
+
+    for (const account of settings.accounts) {
+        if (!account.enabled) { console.log(`  ${account.label || account.id}: SKIPPED (disabled)\n`); continue; }
+
+        console.log(`Testing ${account.label || account.id} (${account.email}):`);
+
+        // Test IMAP
+        try {
+            const { ImapClient, createAutoImapConfig } = await import("@bobfrankston/iflow");
+            const config = createAutoImapConfig({
+                server: account.imap.host,
+                port: account.imap.port,
+                username: account.imap.user,
+                password: account.imap.password
+            });
+            const client = new ImapClient(config);
+            const folders = await client.getFolderList();
+            await client.logout();
+            console.log(`  IMAP: OK (${folders.length} folders)`);
+        } catch (e) {
+            console.log(`  IMAP: FAILED — ${e.message}`);
+        }
+
+        // Test SMTP
+        try {
+            const { createTransport } = await import("nodemailer");
+            let smtpAuth;
+            if (account.smtp.auth === "password") {
+                smtpAuth = { user: account.smtp.user, pass: account.smtp.password };
+            } else if (account.smtp.auth === "oauth2") {
+                // Try to get OAuth token
+                const { ImapClient, createAutoImapConfig } = await import("@bobfrankston/iflow");
+                const config = createAutoImapConfig({
+                    server: account.imap.host,
+                    port: account.imap.port,
+                    username: account.imap.user,
+                });
+                if (config.tokenProvider) {
+                    const accessToken = await config.tokenProvider();
+                    smtpAuth = { type: "OAuth2", user: account.smtp.user, accessToken };
+                }
+            }
+            const transport = createTransport({
+                host: account.smtp.host,
+                port: account.smtp.port,
+                secure: account.smtp.port === 465,
+                auth: smtpAuth,
+                tls: { rejectUnauthorized: false },
+            });
+            await transport.verify();
+            console.log(`  SMTP: OK`);
+
+            // Send test message to self
+            const testSubject = `mailx test — ${new Date().toLocaleString()}`;
+            await transport.sendMail({
+                from: `${account.name} <${account.email}>`,
+                to: account.email,
+                subject: testSubject,
+                text: `This is a test message from mailx -test.\nSent: ${new Date().toISOString()}\nAccount: ${account.id}`,
+            });
+            console.log(`  SEND: OK — test message sent to ${account.email}`);
+            console.log(`  Subject: "${testSubject}"`);
+        } catch (e) {
+            console.log(`  SMTP: FAILED — ${e.message}`);
+        }
+
+        console.log();
+    }
+
+    console.log("Test complete. Check your inbox for the test message(s).");
+    process.exit(0);
+}
+
 async function main() {
     log(`Platform: ${process.platform} ${process.arch}`);
     log(`Node: ${process.version}`);
     log(`Mode: ${serverMode ? "server" : setupMode ? "setup" : "auto-detect"}`);
 
+    // Test connectivity
+    if (testMode) {
+        await runTest();
+        return;
+    }
+
     // Add account to existing config
     if (addMode) {
         const account = await promptForAccount();

package/client/app.js

@@ -614,8 +614,9 @@ optFlagged?.addEventListener("change", () => {
 const isApp = typeof mailxapi !== "undefined" && mailxapi?.isApp;
 fetch("/api/version").then(r => r.json()).then(d => {
     const el = document.getElementById("app-version");
+    const driveName = d.drive === "local" ? "" : ` [${d.drive?.split(/[/\\]/).pop() || d.drive}]`;
     if (el)
-        el.textContent = `mailx s${d.server}/c${d.client}${isApp ? "" : " [browser]"}`;
+        el.textContent = `mailx s${d.server}/c${d.client}${driveName}${isApp ? "" : " [browser]"}`;
 }).catch(async () => {
     // Server not running — try to start it if we're in the app
     const startupStatus = document.getElementById("startup-status");

package/client/compose/compose.js

@@ -17,6 +17,8 @@ const editor = new Quill("#compose-editor", {
         ]
     }
 });
+// Make toolbar buttons non-tabbable so Tab goes straight to editor body
+document.querySelectorAll(".ql-toolbar button, .ql-toolbar select, .ql-toolbar .ql-picker-label").forEach(el => el.setAttribute("tabindex", "-1"));
 // ── Populate from init data ──
 const fromSelect = document.getElementById("compose-from-select");
 const fromCustom = document.getElementById("compose-from-custom");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,7 +20,7 @@
     "postinstall": "node launcher/builder/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow": "^1.0.23",
+    "@bobfrankston/iflow": "^1.0.25",
     "@bobfrankston/miscinfo": "^1.0.6",
     "@bobfrankston/oauthsupport": "^1.0.11",
     "@bobfrankston/rust-builder": "^0.1.2",

package/packages/mailx-server/index.js

@@ -9,7 +9,7 @@ import * as fs from "node:fs";
 import { MailxDB } from "@bobfrankston/mailx-store";
 import { ImapManager } from "@bobfrankston/mailx-imap";
 import { createApiRouter } from "@bobfrankston/mailx-api";
-import { loadSettings, getConfigDir, initLocalConfig } from "@bobfrankston/mailx-settings";
+import { loadSettings, getConfigDir, getSharedDir, initLocalConfig } from "@bobfrankston/mailx-settings";
 import { ports } from "@bobfrankston/miscinfo";
 import { createServer } from "node:http";
 const PORT = ports.mailx;
@@ -81,7 +81,12 @@ app.use("/node_modules", express.static(path.join(rootDir, "node_modules"), { et
 // Mount API
 const apiRouter = createApiRouter(db, imapManager);
 app.use("/api", apiRouter);
-app.get("/api/version", (req, res) => res.json({ server: SERVER_VERSION, client: CLIENT_VERSION, theme: settings.ui?.theme || "system" }));
+app.get("/api/version", (req, res) => {
+    const sharedDir = getSharedDir();
+    const localDir = getConfigDir();
+    const drive = sharedDir === localDir ? "local" : sharedDir;
+    res.json({ server: SERVER_VERSION, client: CLIENT_VERSION, theme: settings.ui?.theme || "system", drive });
+});
 app.get("/status", (req, res) => {
     const accounts = db.getAccounts();
     const pendingSync = db.getTotalPendingSyncCount();