@bobfrankston/mailx 1.0.184 → 1.0.186

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1344,"width":1946,"x":172,"y":85}
+{"height":1344,"width":1586,"x":793,"y":81}

package/client/android.html

@@ -15,7 +15,7 @@
             "@bobfrankston/mailx-store-web": "../packages/mailx-store-web/index.js",
             "@bobfrankston/mailx-store-web/": "../packages/mailx-store-web/",
             "@bobfrankston/mailx-types": "../packages/mailx-types/index.js",
-            "sql.js": "../node_modules/sql.js/dist/sql-wasm.js"
+            "sql.js": "../packages/mailx-store-web/sql-wasm-esm.js"
         }
     }
     </script>

package/client/app.js

@@ -268,16 +268,15 @@ async function openCompose(mode) {
     // Auto-detect reply From: if the message was delivered to an identity domain,
     // reply from that address instead of the default account address.
     // Identity domains configured per-account in accounts.jsonc (identityDomains array).
-    // Default identity domains for bob.ma account:
-    const identityDomains = ["bob.ma", "frankston.com"];
+    const account = accounts.find((a) => a.id === accountId);
+    const identityDomains = account?.identityDomains || [];
     function detectReplyFrom() {
-        if (!msg)
+        if (!msg || identityDomains.length === 0)
             return undefined;
-        // Check deliveredTo first (most reliable), then To addresses
         const candidates = [msg.deliveredTo, ...(msg.to || []).map((a) => a.address)].filter(Boolean);
         for (const addr of candidates) {
             const domain = addr.split("@")[1]?.toLowerCase();
-            if (domain && identityDomains.some(d => domain === d || domain.endsWith(`.${d}`))) {
+            if (domain && identityDomains.some((d) => domain === d.toLowerCase())) {
                 return addr;
             }
         }
@@ -306,14 +305,10 @@ async function openCompose(mode) {
     }
     // Store init data for compose window to pick up
     sessionStorage.setItem("composeInit", JSON.stringify(init));
-    // IPC mode: navigate in same window (popups don't have custom protocol)
-    // HTTP mode: open as popup window
-    if (typeof mailxapi !== "undefined") {
-        window.location.href = "compose/compose.html";
-    }
-    else {
-        window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
-    }
+    // Open compose — always as popup via window.open().
+    // In IPC mode, msger's new_window_req_handler allows msger.localhost popups.
+    // DO NOT use window.location.href — msger exits on navigation.
+    window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
 }
 function quoteBody(msg) {
     const date = new Date(msg.date).toLocaleString();
@@ -585,10 +580,16 @@ onWsEvent((event) => {
             break;
         }
         case "folderCountsChanged": {
-            // Update folder badges only — never reload the message list or touch the viewer.
-            // The list refreshes when the user clicks a folder or presses Sync.
+            // Update folder badges + silently refresh message list (preserves selection and viewer)
             updateFolderCounts();
             updateNewMessageCount();
+            // Debounced silent reload — preserves scroll position, selection, and viewer
+            if (reloadDebounceTimer)
+                clearTimeout(reloadDebounceTimer);
+            reloadDebounceTimer = setTimeout(() => {
+                reloadDebounceTimer = null;
+                reloadCurrentFolder();
+            }, 2000);
             // Sync finished — re-enable sync button
             const syncBtn = document.getElementById("btn-sync");
             if (syncBtn) {

package/client/components/folder-tree.js

@@ -2,7 +2,7 @@
  * Folder tree component -- renders account folders with hierarchy,
  * expand/collapse, and optional unified inbox.
  */
-import { getAccounts, getFolders, moveMessage, moveMessages, markFolderRead, createFolder, renameFolder, deleteFolder, emptyFolder, setupAccount, getVersion } from "../lib/api-client.js";
+import { getAccounts, getFolders, moveMessage, moveMessages, markFolderRead, createFolder, renameFolder, deleteFolder, emptyFolder, setupAccount, getDeviceAccounts, getVersion } from "../lib/api-client.js";
 import { showContextMenu } from "./context-menu.js";
 let onFolderSelect;
 let onUnifiedInbox = null;
@@ -357,8 +357,9 @@ async function loadFolderTree(container) {
             if (mainBody) {
                 mainBody.innerHTML = `<div style="padding:2rem;line-height:1.8;max-width:500px">
                     <h2 style="margin-bottom:1rem">Welcome to mailx</h2>
+                    <div id="setup-device-accounts"></div>
                     <div id="setup-cloud-status"></div>
-                    <p>Add your email account to get started.</p>
+                    <p id="setup-form-intro">Add your email account to get started.</p>
                     <form id="setup-form" style="margin-top:1rem">
                         <label style="display:block;margin-bottom:0.5rem">
                             Your name
@@ -462,6 +463,41 @@ async function loadFolderTree(container) {
                         </div>`;
                     }
                 }).catch(() => { });
+                // On Android, check for device Google accounts and show picker
+                getDeviceAccounts().then(async (deviceAccounts) => {
+                    const pickerEl = document.getElementById("setup-device-accounts");
+                    if (!pickerEl || deviceAccounts.length === 0)
+                        return;
+                    const formEl = document.getElementById("setup-form");
+                    const introEl = document.getElementById("setup-form-intro");
+                    if (introEl)
+                        introEl.textContent = "Select an account:";
+                    if (formEl)
+                        formEl.style.display = "none";
+                    pickerEl.innerHTML = deviceAccounts.map((a) => `<button class="device-account-btn" data-email="${a.email}" data-name="${a.name}" style="display:block;width:100%;padding:0.75rem 1rem;margin-bottom:0.5rem;background:var(--color-bg-surface);color:var(--color-text);border:1px solid var(--color-border);border-radius:6px;cursor:pointer;font-size:1rem;text-align:left">${a.email}</button>`).join("") + `<button id="setup-show-form" style="margin-top:0.5rem;padding:0.5rem 1rem;background:none;color:var(--color-text-muted);border:none;cursor:pointer;font-size:0.9rem">Use a different account...</button>`;
+                    pickerEl.querySelectorAll(".device-account-btn").forEach((btn) => {
+                        btn.addEventListener("click", async () => {
+                            const email = btn.dataset.email || "";
+                            const name = btn.dataset.name || "";
+                            pickerEl.innerHTML = `<div style="padding:0.5rem;color:var(--color-text-muted)">Setting up ${email}...</div>`;
+                            const result = await setupAccount(name, email, "");
+                            if (result?.ok) {
+                                pickerEl.innerHTML = `<div style="padding:0.5rem;color:var(--color-accent)">${result.message || "Account added!"}</div>`;
+                                setTimeout(() => location.reload(), 2000);
+                            }
+                            else {
+                                pickerEl.innerHTML = `<div style="padding:0.5rem;color:#f55">${result?.error || "Setup failed"}</div>`;
+                            }
+                        });
+                    });
+                    document.getElementById("setup-show-form")?.addEventListener("click", () => {
+                        pickerEl.style.display = "none";
+                        if (formEl)
+                            formEl.style.display = "block";
+                        if (introEl)
+                            introEl.textContent = "Add your email account to get started.";
+                    });
+                }).catch(() => { });
             }
             // Dismiss startup overlay
             const overlay = document.getElementById("startup-overlay");

package/client/components/message-viewer.js

@@ -144,12 +144,7 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
                         draftFolderId: msg.folderId,
                     };
                     sessionStorage.setItem("composeInit", JSON.stringify(init));
-                    if (typeof window.mailxapi !== "undefined") {
-                        window.location.href = "compose/compose.html";
-                    }
-                    else {
-                        window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
-                    }
+                    window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
                 };
             }
             else {

package/client/compose/compose.js

@@ -5,14 +5,9 @@
  */
 import { createEditor } from "./editor.js";
 import { getVersion, getSettings, getAccounts, searchContacts, sendMessage, saveDraft as apiSaveDraft, deleteDraft } from "../lib/api-client.js";
-/** Close compose — navigate back in IPC mode, window.close() in HTTP mode */
+/** Close compose window */
 function closeCompose() {
-    if (typeof window.mailxapi !== "undefined") {
-        window.location.href = "../index.html";
-    }
-    else {
-        closeCompose();
-    }
+    window.close();
 }
 // ── Load editor scripts dynamically ──
 function loadScript(src) {
@@ -258,14 +253,24 @@ function parseAddrs(s) {
     });
 }
 function applyInit(init) {
-    // Populate From dropdown
-    populateFromSelect(init.accounts, init.accountId);
-    // Auto-detect reply From: if fromAddress is set (identity domain match),
-    // use it as the From address via the "Other..." custom field
-    if (init.fromAddress) {
-        fromSelect.value = "__custom__";
-        fromCustom.hidden = false;
-        fromCustom.value = init.fromAddress;
+    // If identity domain matched, add as first option in dropdown
+    const replyAddr = init.fromAddress;
+    const account = init.accounts.find(a => a.id === init.accountId);
+    const displayName = account?.name || "";
+    if (replyAddr) {
+        // Insert identity address as first option, selected
+        const idOpt = document.createElement("option");
+        idOpt.value = init.accountId;
+        idOpt.textContent = `${displayName} <${replyAddr}>`;
+        idOpt.dataset.email = replyAddr;
+        idOpt.dataset.name = displayName;
+        idOpt.selected = true;
+        // Populate rest of dropdown, then prepend identity option
+        populateFromSelect(init.accounts, "");
+        fromSelect.prepend(idOpt);
+    }
+    else {
+        populateFromSelect(init.accounts, init.accountId);
     }
     toInput.value = formatAddrs(init.to);
     ccInput.value = formatAddrs(init.cc);

package/client/lib/api-client.js

@@ -309,6 +309,11 @@ export function setupAccount(name, email, password) {
         return getIpc().setupAccount?.(name, email, password);
     return api("/setup", { method: "POST", body: JSON.stringify({ name, email, password }) });
 }
+export async function getDeviceAccounts() {
+    if (hasIPC())
+        return getIpc().getDeviceAccounts?.() ?? [];
+    return [];
+}
 // Legacy exports for backward compatibility
 export const connectWebSocket = connectEvents;
 export const onWsEvent = onEvent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.184",
+  "version": "1.0.186",
   "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.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.21",
-    "@bobfrankston/msger": "^0.1.234",
+    "@bobfrankston/msger": "^0.1.236",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -12,8 +12,10 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { simpleParser } from "mailparser";
 import { GmailApiProvider } from "./providers/gmail-api.js";
-import { createTransport } from "nodemailer";
 import * as os from "node:os";
+// Well-known ports — no magic numbers
+const SMTP_PORT_STARTTLS = 587;
+const SMTP_PORT_IMPLICIT_TLS = 465;
 /** Extract full error detail with provenance */
 function imapError(err) {
     const msg = err.message || err.reason || err.code || (typeof err === "string" ? err : "");
@@ -1734,21 +1736,27 @@ export class ImapManager extends EventEmitter {
         const account = settings.accounts.find(a => a.id === accountId);
         if (!account?.smtp)
             throw new Error(`No SMTP config for ${accountId}`);
+        // SMTP auth: use explicit SMTP credentials, fall back to IMAP credentials
         let smtpAuth;
-        if (account.smtp.auth === "password") {
-            smtpAuth = { user: account.smtp.user, pass: account.smtp.password };
+        const smtpAuthType = account.smtp.auth || (account.imap?.password ? "password" : undefined);
+        if (smtpAuthType === "password") {
+            smtpAuth = {
+                user: account.smtp.user || account.imap?.user || account.email,
+                pass: account.smtp.password || account.imap?.password,
+            };
         }
-        else if (account.smtp.auth === "oauth2") {
+        else if (smtpAuthType === "oauth2") {
             const accessToken = await this.getOAuthToken(accountId);
             if (!accessToken)
                 throw new Error("OAuth token not available");
-            smtpAuth = { type: "OAuth2", user: account.smtp.user, accessToken };
+            smtpAuth = { type: "OAuth2", user: account.smtp.user || account.imap?.user || account.email, accessToken };
         }
         const { createTransport } = await import("nodemailer");
+        const smtpPort = account.smtp.port || SMTP_PORT_STARTTLS;
         const transport = createTransport({
-            host: account.smtp.host,
-            port: account.smtp.port,
-            secure: account.smtp.port === 465,
+            host: account.smtp.host || account.imap?.host,
+            port: smtpPort,
+            secure: smtpPort === SMTP_PORT_IMPLICIT_TLS, // 465 = implicit TLS, 587 = STARTTLS
             auth: smtpAuth,
             tls: { rejectUnauthorized: false },
         });
@@ -1824,52 +1832,10 @@ export class ImapManager extends EventEmitter {
                     await client.removeFlags(outboxFolder.path, uid, [sendingFlag]);
                     continue;
                 }
-                // Send via SMTP
+                // Send via shared SMTP method
                 try {
-                    let smtpAuth;
-                    if (account.smtp.auth === "password") {
-                        smtpAuth = { user: account.smtp.user, pass: account.smtp.password };
-                    }
-                    else if (account.smtp.auth === "oauth2") {
-                        const accessToken = await this.getOAuthToken(accountId);
-                        if (!accessToken)
-                            throw new Error("OAuth token not available — re-authenticate");
-                        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 },
-                    });
-                    // Parse recipients from raw message headers for SMTP envelope
-                    const toMatch = msg.source.match(/^To:\s*(.+)$/mi);
-                    const ccMatch = msg.source.match(/^Cc:\s*(.+)$/mi);
-                    const bccMatch = msg.source.match(/^Bcc:\s*(.+)$/mi);
-                    const fromMatch = msg.source.match(/^From:\s*(.+)$/mi);
-                    const parseAddrs = (s) => s.match(/[\w.+-]+@[\w.-]+/g) || [];
-                    const recipients = [
-                        ...(toMatch ? parseAddrs(toMatch[1]) : []),
-                        ...(ccMatch ? parseAddrs(ccMatch[1]) : []),
-                        ...(bccMatch ? parseAddrs(bccMatch[1]) : []),
-                    ];
-                    const sender = fromMatch ? (parseAddrs(fromMatch[1])[0] || account.email) : account.email;
-                    if (recipients.length === 0) {
-                        console.error(`  [outbox] No recipients in UID ${uid} — permanent failure`);
-                        await client.removeFlags(outboxFolder.path, uid, [sendingFlag]);
-                        await client.addFlags(outboxFolder.path, uid, ["$PermanentFailure"]);
-                        continue;
-                    }
-                    // Strip Bcc header from raw message before sending
-                    const rawToSend = msg.source.replace(/^Bcc:.*\r?\n/mi, "");
-                    // Save debug copy before sending
-                    this.saveSendingCopy(accountId, rawToSend, `sent-${uid}`);
-                    await transport.sendMail({
-                        raw: rawToSend,
-                        envelope: { from: sender, to: recipients },
-                    });
-                    console.log(`  [outbox] Sent UID ${uid} → ${recipients.join(", ")}`);
+                    await this.sendRawViaSMTP(accountId, msg.source);
+                    console.log(`  [outbox] Sent UID ${uid}`);
                     // Delete from Outbox FIRST to prevent double-send if move-to-Sent fails.
                     // The message is already sent via SMTP — worst case we lose the Sent copy,
                     // which is better than sending the message twice.

package/packages/mailx-store-web/android-bootstrap.js

@@ -14,7 +14,7 @@
 import { WebMailxDB } from "./db.js";
 import { WebMessageStore } from "./web-message-store.js";
 import { WebMailxService } from "./web-service.js";
-import { loadAccounts, clearSettings } from "./web-settings.js";
+import { loadAccounts, saveAccounts, clearSettings } from "./web-settings.js";
 import { GmailApiWebProvider } from "./gmail-api-web.js";
 // ── State ──
 let db;
@@ -327,7 +327,49 @@ function installBridge() {
         },
         getAutocompleteSettings: () => service.getAutocompleteSettings(),
         saveAutocompleteSettings: async (settings) => { await service.saveAutocompleteSettings(settings); return { ok: true }; },
-        setupAccount: async () => ({ ok: false, error: "Use desktop for initial setup" }),
+        getDeviceAccounts: async () => {
+            const bridge = window._nativeBridge;
+            if (bridge?.app?.getDeviceAccounts) {
+                return bridge.app.getDeviceAccounts();
+            }
+            return [];
+        },
+        setupAccount: async (name, email, _password) => {
+            try {
+                if (!email || !email.includes("@")) {
+                    return { ok: false, error: "Email address required" };
+                }
+                const domain = email.split("@")[1].toLowerCase();
+                const id = domain.split(".")[0] || "account";
+                const account = {
+                    id,
+                    name: name || email.split("@")[0],
+                    email,
+                    enabled: true,
+                    imap: { host: `imap.${domain}`, port: 993, tls: true, auth: "oauth2", user: email },
+                    smtp: { host: `smtp.${domain}`, port: 587, tls: true, auth: "oauth2", user: email },
+                };
+                // Apply known provider defaults
+                if (domain === "gmail.com" || domain === "googlemail.com") {
+                    account.label = "Gmail";
+                    account.imap = { host: "imap.gmail.com", port: 993, tls: true, auth: "oauth2", user: email };
+                    account.smtp = { host: "smtp.gmail.com", port: 587, tls: true, auth: "oauth2", user: email };
+                }
+                const existing = await loadAccounts();
+                if (existing.some(a => a.email === email)) {
+                    return { ok: true, message: "Account already exists" };
+                }
+                existing.push(account);
+                await saveAccounts(existing);
+                await syncManager.addAccount(account);
+                db.upsertAccount(account.id, account.name, account.email, JSON.stringify(account));
+                console.log(`[android] Account added: ${email}`);
+                return { ok: true, message: `Added ${email}. Syncing...` };
+            }
+            catch (e) {
+                return { ok: false, error: e.message };
+            }
+        },
         repairAccounts: async () => ({ ok: false, error: "Use desktop for repair" }),
         resetStore: () => resetStore(),
         restart: () => { location.reload(); },

package/packages/mailx-store-web/sql-wasm-esm.js

@@ -0,0 +1,10 @@
+// ESM wrapper for sql.js (UMD) — loads as classic script, re-exports the global
+await new Promise((resolve, reject) => {
+    const s = document.createElement("script");
+    s.src = new URL("../../node_modules/sql.js/dist/sql-wasm.js", import.meta.url).href;
+    s.onload = resolve;
+    s.onerror = reject;
+    document.head.appendChild(s);
+});
+const initSqlJs = globalThis.initSqlJs;
+export default initSqlJs;