@bobfrankston/mailx 1.0.184 → 1.0.185

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;
             }
         }
@@ -585,10 +584,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/compose/compose.js

@@ -258,14 +258,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.184",
+  "version": "1.0.185",
   "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.