@bobfrankston/mailx 1.0.173 → 1.0.175

package/bin/mailx.js

@@ -740,10 +740,13 @@ async function main() {
         console.log(`${reason} — shutting down`);
         imapManager.stopPeriodicSync();
         imapManager.stopOutboxWorker();
+        // 3s hard timeout — don't hang on broken IMAP connections
+        const forceExit = setTimeout(() => { console.log("Forced exit"); process.exit(0); }, 3000);
         try {
             await imapManager.shutdown();
         }
         catch { /* proceed */ }
+        clearTimeout(forceExit);
         db.close();
         process.exit(0);
     }

package/client/.msger-window.json

@@ -0,0 +1 @@
+{"height":1047,"width":1844,"x":664,"y":330}

package/client/app.js

@@ -286,8 +286,14 @@ async function openCompose(mode) {
     }
     // Store init data for compose window to pick up
     sessionStorage.setItem("composeInit", JSON.stringify(init));
-    // Use relative URL so it works with both HTTP and custom protocol (msger://)
-    window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
+    // 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");
+    }
 }
 function quoteBody(msg) {
     const date = new Date(msg.date).toLocaleString();

package/client/components/message-viewer.js

@@ -135,7 +135,12 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
                         draftFolderId: msg.folderId,
                     };
                     sessionStorage.setItem("composeInit", JSON.stringify(init));
-                    window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
+                    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");
+                    }
                 };
             }
             else {

package/client/compose/compose.js

@@ -5,6 +5,15 @@
  */
 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 */
+function closeCompose() {
+    if (typeof window.mailxapi !== "undefined") {
+        window.location.href = "../index.html";
+    }
+    else {
+        closeCompose();
+    }
+}
 // ── Load editor scripts dynamically ──
 function loadScript(src) {
     return new Promise((resolve, reject) => {
@@ -349,7 +358,7 @@ document.getElementById("btn-send")?.addEventListener("click", async () => {
         if (draftUid) {
             deleteDraft(getFromAccountId(), draftUid).catch(() => { });
         }
-        window.close();
+        closeCompose();
     }
     catch (e) {
         btn.disabled = false;

package/client/compose/editor.js

@@ -8,9 +8,12 @@ function createQuillEditor(container) {
         placeholder: "Write your message...",
         modules: {
             toolbar: [
+                [{ font: [] }, { size: ["small", false, "large", "huge"] }],
                 [{ header: [1, 2, 3, false] }],
                 ["bold", "italic", "underline", "strike"],
+                [{ color: [] }, { background: [] }],
                 [{ list: "ordered" }, { list: "bullet" }],
+                [{ align: [] }],
                 ["blockquote", "link", "image"],
                 ["clean"]
             ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.173",
+  "version": "1.0.175",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,11 +20,11 @@
     "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow-direct": "^0.1.4",
+    "@bobfrankston/iflow-direct": "^0.1.5",
     "@bobfrankston/iflow-node": "^0.1.1",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/msger": "^0.1.222",
+    "@bobfrankston/msger": "^0.1.224",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

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

@@ -184,6 +184,8 @@ export declare class ImapManager extends EventEmitter {
     queueOutgoing(accountId: string, rawMessage: string | Buffer): Promise<void>;
     /** Process local file queue — move to IMAP Outbox when server is reachable */
     private processLocalQueue;
+    /** Send a raw RFC 2822 message via SMTP for a given account */
+    private sendRawViaSMTP;
     /** Process Outbox — send pending messages with flag-based interlock */
     processOutbox(accountId: string): Promise<void>;
     /** Start background Outbox worker — runs immediately then every 10 seconds */

package/packages/mailx-imap/index.js

@@ -291,8 +291,15 @@ export class ImapManager extends EventEmitter {
         const client = this.opsClients.get(accountId);
         this.opsClients.delete(accountId);
         if (client) {
+            // Force-close: don't wait for LOGOUT on a possibly dead socket
             try {
-                await (client._realLogout || client.logout)();
+                const timeout = new Promise(r => setTimeout(r, 2000));
+                await Promise.race([(client._realLogout || client.logout)(), timeout]);
+            }
+            catch { /* */ }
+            // Destroy underlying socket if still open
+            try {
+                client.destroy?.();
             }
             catch { /* */ }
             console.log(`  [conn] ${accountId}: disconnected`);
@@ -1674,6 +1681,23 @@ export class ImapManager extends EventEmitter {
         const files = fs.readdirSync(localQueue).filter(f => f.endsWith(".ltr"));
         if (files.length === 0)
             return;
+        // Gmail/API accounts: send directly via SMTP from local queue (no IMAP outbox)
+        if (this.isGmailAccount(accountId)) {
+            for (const file of files) {
+                const filePath = path.join(localQueue, file);
+                const raw = fs.readFileSync(filePath, "utf-8");
+                try {
+                    await this.sendRawViaSMTP(accountId, raw);
+                    fs.unlinkSync(filePath);
+                    console.log(`  [outbox] Sent local ${file} via SMTP`);
+                }
+                catch (e) {
+                    console.error(`  [outbox] Send failed for ${file}: ${e.message}`);
+                }
+            }
+            return;
+        }
+        // IMAP accounts: append to IMAP Outbox for multi-machine interlock
         try {
             const outboxPath = await this.ensureOutbox(accountId);
             const client = await this.createClientWithLimit(accountId);
@@ -1697,6 +1721,48 @@ export class ImapManager extends EventEmitter {
             // IMAP still unreachable — leave files for next attempt
         }
     }
+    /** Send a raw RFC 2822 message via SMTP for a given account */
+    async sendRawViaSMTP(accountId, raw) {
+        const settings = loadSettings();
+        const account = settings.accounts.find(a => a.id === accountId);
+        if (!account?.smtp)
+            throw new Error(`No SMTP config for ${accountId}`);
+        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");
+            smtpAuth = { type: "OAuth2", user: account.smtp.user, accessToken };
+        }
+        const { createTransport } = await import("nodemailer");
+        const transport = createTransport({
+            host: account.smtp.host,
+            port: account.smtp.port,
+            secure: account.smtp.port === 465,
+            auth: smtpAuth,
+            tls: { rejectUnauthorized: false },
+        });
+        const parseAddrs = (s) => s.match(/[\w.+-]+@[\w.-]+/g) || [];
+        const toMatch = raw.match(/^To:\s*(.+)$/mi);
+        const ccMatch = raw.match(/^Cc:\s*(.+)$/mi);
+        const bccMatch = raw.match(/^Bcc:\s*(.+)$/mi);
+        const fromMatch = raw.match(/^From:\s*(.+)$/mi);
+        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)
+            throw new Error("No recipients");
+        const rawToSend = raw.replace(/^Bcc:.*\r?\n/mi, "");
+        this.saveSendingCopy(accountId, rawToSend, "sent");
+        await transport.sendMail({ envelope: { from: sender, to: recipients }, raw: rawToSend });
+        console.log(`  [smtp] ${accountId}: sent to ${recipients.join(", ")}`);
+    }
     /** Process Outbox — send pending messages with flag-based interlock */
     async processOutbox(accountId) {
         const outboxFolder = this.findFolder(accountId, "outbox");
@@ -1705,7 +1771,7 @@ export class ImapManager extends EventEmitter {
         // Skip if this account's sync is failing — don't pile up connections
         if (this.connectionBackoff.has(accountId) && Date.now() < (this.connectionBackoff.get(accountId) || 0))
             return;
-        // Gmail uses SMTP for sending (not IMAP outbox) — skip IMAP outbox check
+        // Gmail: skip IMAP outbox check — sending handled by processLocalQueue which sends directly via SMTP
         if (this.isGmailAccount(accountId))
             return;
         const settings = loadSettings();

package/sending/gmail/20260407_210213-queued.eml

@@ -0,0 +1,58 @@
+From: Bob Frankston <Bob.Frankston@Gmail.com>
+To: David P. Reed <dpreed@deepplum.com>
+Cc: Brian DeLacey <bdelacey@gmail.com>
+Bcc: bob@bob.ma
+Subject: Re: Converting POPFile from perl to Python
+Date: Wed, 08 Apr 2026 01:02:13 GMT
+Message-ID: <1775610133517.ug0o0gii4wm@Gmail.com>
+MIME-Version: 1.0
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: base64
+
+PHA+SSdtIHJlc3BvbmRpbmcgdXNpbmcgbXkgZW1haWwgcHJvZ3JhbS48L3A+PHA+PGJyPjwvcD48
+cD5UaGVyZSBpcyBzbyBtdWNoIHRvIGNhdGNoIHVwIHdpdGggLS0gdGhlIGdvb2QgYW5kIHRoZSBi
+YWQuIE9uZSBvYnNlcnZhdGlvbiBpcyB0aGF0IGl0IGxlYXJuZWQgdG8gbXVjaCB0byBwcm9ncmFt
+IGxpa2UgYSBodW1hbiBhbmQgbm90IGVub3VnaC4gT25lIGh1bW9yb3VzIHRoaW5nIGlzIHdoZW4g
+aXQgZXN0aW1hdGVzIGEgdGFzayB3aWxsIHRha2UgYSB3ZWVrIGJ1dCBpdCBkb2VzIGl0IGluIGZp
+dmUgbWludXRlcyBiZWNhdXNlIGl0IGlzIHVzaW5nIHN0YW5kYXJkIG1lYXN1cmVzLiBJdCdzIGRl
+c2lnbiBzZW5zZSBpcyBmdXJzaGl0IGJ1dCBpZiB5b3Ugd29yayB3aXRoIGl0IGFuZCBnZXQgcGFz
+dCB0aGUgSmVuZ2EgbW9kZSB5b3UgY2FuIGdldCBsb3RzIGRvbmUuIEZvciBleGFtcGxlLCBpbWFw
+IGRvZXNuJ3Qgd29yayB3ZWxsIHdpdGggZ21haWwgYnV0IGl0IHNhaWQgdGhhdCBhZGRpbmcgZ21h
+aWwgd2FzIGEgbWFqb3IgcHJvamVjdCBidXQgSSBzYWlkIGRvIGl0IGFueXdheSBhbmQgZml2ZSBt
+aW51dGVzIGxhdGVyIGl0IHdhcyBkb25lLiBucG0gaW5zdGFsbCAtZyBAYm9iZnJhbmtzdG9uL21h
+aWx4IGlzbid0IHF1aXQgcmVhZHkgZm9yIHByaW1lIHRpbWUuPC9wPjxwPjxicj48L3A+PHA+U3Rp
+bGwgYSBodWdlIHRvZG8gbGlzdCAoaW4gdGhlIG1haWx4IGRpciBpZiB5b3UncmUgY3VyaW91cy4g
+SXQgd2lsbCB3YW50IHRvIHN0YXJ0IHdpdGggYSBnbWFpbCBhZGRyZXNzIGFuZCBjcmVhdGVzIGEg
+bWFpbHggZGlyZWN0b3J5IG9uIGdkcml2ZS4gQSBnYWluLCBzdGlsbCBsb3RzIG9mIGlzc3VlcyB3
+aGljaCB5b3UgY2FuIHJlcG9ydCB0byBtZSBidXQgaXQgaXMgY29taW5nIHRvZ2V0aGVyLjwvcD48
+cD48YnI+PC9wPjxwPk9uIDQvNy8yMDI2LCA1OjA0OjU3IFBNLCBEYXZpZCBQLiBSZWVkICZsdDtk
+cHJlZWRAZGVlcHBsdW0uY29tJmd0OyB3cm90ZTo8L3A+PGRpdiBjbGFzcz0icWwtY29kZS1ibG9j
+ay1jb250YWluZXIiIHNwZWxsY2hlY2s9ImZhbHNlIj48ZGl2IGNsYXNzPSJxbC1jb2RlLWJsb2Nr
+IiBkYXRhLWxhbmd1YWdlPSJwbGFpbiI+Rmlyc3Qgb3ZlcmFsbCB0ZXN0IGJlZ2FuIGxvb3Bpbmcg
+Zm9yZXZlci4gSSBzdG9wcGVkIGl0LCBhbmQgaW5xdWlyZWQgd2hhdCB0aGUgaGVsbCwgYW5kPC9k
+aXY+PGRpdiBjbGFzcz0icWwtY29kZS1ibG9jayIgZGF0YS1sYW5ndWFnZT0icGxhaW4iPmhlcmUg
+aXMgd2hhdCBpdCBzYXlzLiBHYWFoLiBUaGlzIGlzIG5vdCBleHBsYWluaW5nIG11Y2gsIGFuZCBp
+dCB3cm90ZSB0aGlzIGNvZGUuLi48L2Rpdj48ZGl2IGNsYXNzPSJxbC1jb2RlLWJsb2NrIiBkYXRh
+LWxhbmd1YWdlPSJwbGFpbiI+PGJyPjwvZGl2PjxkaXYgY2xhc3M9InFsLWNvZGUtYmxvY2siIGRh
+dGEtbGFuZ3VhZ2U9InBsYWluIj4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLTwvZGl2Pjxk
+aXYgY2xhc3M9InFsLWNvZGUtYmxvY2siIGRhdGEtbGFuZ3VhZ2U9InBsYWluIj5UaGUgdGVzdCBo
+YW5ncyBiZWNhdXNlICNoYW5kbGVDbGllbnQgaW4gUE9QM1Byb3h5IHRocm93cyBiZWZvcmUgc2Vu
+ZGluZyB0aGUgYmFubmVyLiBUaGUgY3VscHJpdCBpcyB0aGlzIGRlYWQgY29kZTo8L2Rpdj48ZGl2
+IGNsYXNzPSJxbC1jb2RlLWJsb2NrIiBkYXRhLWxhbmd1YWdlPSJwbGFpbiI+PGJyPjwvZGl2Pjxk
+aXYgY2xhc3M9InFsLWNvZGUtYmxvY2siIGRhdGEtbGFuZ3VhZ2U9InBsYWluIj4gIGNvbnN0IGNs
+aWVudFdyaXRlciA9IG5ldyBXcml0YWJsZVN0cmVhbURlZmF1bHRXcml0ZXIoPC9kaXY+PGRpdiBj
+bGFzcz0icWwtY29kZS1ibG9jayIgZGF0YS1sYW5ndWFnZT0icGxhaW4iPiAgICBjbGllbnQud3Jp
+dGFibGUuZ2V0V3JpdGVyKCkucmVsZWFzZUxvY2soKSBhcyB1bmtub3duIGFzIFdyaXRhYmxlU3Ry
+ZWFtPC9kaXY+PGRpdiBjbGFzcz0icWwtY29kZS1ibG9jayIgZGF0YS1sYW5ndWFnZT0icGxhaW4i
+PiAgKTs8L2Rpdj48ZGl2IGNsYXNzPSJxbC1jb2RlLWJsb2NrIiBkYXRhLWxhbmd1YWdlPSJwbGFp
+biI+PGJyPjwvZGl2PjxkaXYgY2xhc3M9InFsLWNvZGUtYmxvY2siIGRhdGEtbGFuZ3VhZ2U9InBs
+YWluIj4gIHJlbGVhc2VMb2NrKCkgcmV0dXJucyB2b2lkLiBQYXNzaW5nIHZvaWQgdG8gV3JpdGFi
+bGVTdHJlYW1EZWZhdWx0V3JpdGVyIHRocm93cyBhIFR5cGVFcnJvciwgd2hpY2ggaXMgc3dhbGxv
+d2VkIGJ5IHRoZTwvZGl2PjxkaXYgY2xhc3M9InFsLWNvZGUtYmxvY2siIGRhdGEtbGFuZ3VhZ2U9
+InBsYWluIj4gIGFjY2VwdCBsb29wJ3MgLmNhdGNoIOKAlCBzbyB0aGUgY2xpZW50IG5ldmVyIHJl
+Y2VpdmVzIHRoZSBiYW5uZXIgYW5kIHdhaXRzIGZvcmV2ZXIuIGNsaWVudFdyaXRlciBpcyBhbHNv
+IG5ldmVyIHVzZWQuPC9kaXY+PGRpdiBjbGFzcz0icWwtY29kZS1ibG9jayIgZGF0YS1sYW5ndWFn
+ZT0icGxhaW4iPiAgRml4OjwvZGl2PjxkaXYgY2xhc3M9InFsLWNvZGUtYmxvY2siIGRhdGEtbGFu
+Z3VhZ2U9InBsYWluIj48YnI+PC9kaXY+PGRpdiBjbGFzcz0icWwtY29kZS1ibG9jayIgZGF0YS1s
+YW5ndWFnZT0icGxhaW4iPjxicj48L2Rpdj48ZGl2IGNsYXNzPSJxbC1jb2RlLWJsb2NrIiBkYXRh
+LWxhbmd1YWdlPSJwbGFpbiI+PGJyPjwvZGl2PjwvZGl2Pg==