@bobfrankston/mailx 1.0.233 → 1.0.235

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1344,"width":2151,"x":1060,"y":329}
+{"height":1344,"width":2151,"x":656,"y":239}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.233",
+  "version": "1.0.235",
   "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.22",
-    "@bobfrankston/msger": "^0.1.295",
+    "@bobfrankston/msger": "^0.1.297",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -78,7 +78,7 @@
       "@bobfrankston/iflow-node": "^0.1.2",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.22",
-      "@bobfrankston/msger": "^0.1.295",
+      "@bobfrankston/msger": "^0.1.297",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -1009,9 +1009,15 @@ export class ImapManager extends EventEmitter {
         // the previous high. upsertMessage's primary-key dedup handles it.
         void highestUid;
         let stored = 0;
-        this.db.beginTransaction();
-        try {
-            for (const msg of msgs) {
+        let errors = 0;
+        // Don't wrap the whole batch in one transaction: a single bad row
+        // would roll back the entire batch. E.g. a message with a malformed
+        // Date header gave `new Date(rawStr).getTime() === NaN`, SQLite
+        // coerced that to NULL, the NOT NULL constraint failed, and the
+        // whole Gmail sync lost 200 messages per tick. Now each row runs
+        // standalone — bad rows are logged and skipped.
+        for (const msg of msgs) {
+            try {
                 const flags = [];
                 if (msg.seen)
                     flags.push("\\Seen");
@@ -1021,12 +1027,20 @@ export class ImapManager extends EventEmitter {
                     flags.push("\\Answered");
                 if (msg.draft)
                     flags.push("\\Draft");
+                // Sanitize date: reject NaN (from malformed RFC 822 Date headers)
+                // and fall back to "now" so the message still lands in the DB.
+                let dateMs = Date.now();
+                if (msg.date instanceof Date) {
+                    const t = msg.date.getTime();
+                    if (Number.isFinite(t))
+                        dateMs = t;
+                }
                 this.db.upsertMessage({
                     accountId, folderId, uid: msg.uid,
                     messageId: msg.messageId || "",
                     inReplyTo: msg.inReplyTo || "",
                     references: msg.references || [],
-                    date: msg.date instanceof Date ? msg.date.getTime() : Date.now(),
+                    date: dateMs,
                     subject: msg.subject || "",
                     from: toEmailAddress(msg.from?.[0] || {}),
                     to: toEmailAddresses(msg.to || []),
@@ -1035,12 +1049,15 @@ export class ImapManager extends EventEmitter {
                 });
                 stored++;
             }
-            this.db.commitTransaction();
-        }
-        catch (e) {
-            this.db.rollbackTransaction();
-            console.error(`  [api] storeApiMessages error: ${e.message}`);
+            catch (e) {
+                errors++;
+                if (errors <= 3) {
+                    console.error(`  [api] upsert ${accountId}/${folderId}/${msg.uid} (${msg.messageId}): ${e.message}`);
+                }
+            }
         }
+        if (errors > 0)
+            console.error(`  [api] storeApiMessages: ${errors} of ${msgs.length} rows failed (${stored} stored)`);
         return stored;
     }
     /** Kill and recreate the persistent ops connection */
@@ -1957,6 +1974,8 @@ export class ImapManager extends EventEmitter {
         const ccMatch = raw.match(/^Cc:\s*(.+)$/mi);
         const bccMatch = raw.match(/^Bcc:\s*(.+)$/mi);
         const fromMatch = raw.match(/^From:\s*(.+)$/mi);
+        const subjectMatch = raw.match(/^Subject:\s*(.+)$/mi);
+        const messageIdMatch = raw.match(/^Message-ID:\s*(<[^>]+>)/mi);
         const recipients = [
             ...(toMatch ? parseAddrs(toMatch[1]) : []),
             ...(ccMatch ? parseAddrs(ccMatch[1]) : []),
@@ -1965,9 +1984,22 @@ export class ImapManager extends EventEmitter {
         const sender = fromMatch ? (parseAddrs(fromMatch[1])[0] || account.email) : account.email;
         if (recipients.length === 0)
             throw new Error("No recipients");
+        // Dedup: skip if this Message-ID has already been sent. Prevents the
+        // outbox from re-sending the same file across crash/restart cycles.
+        // Without this, a queued .ltr that was mid-delivery when mailx crashed
+        // would be re-sent on every startup until the rename loop completed.
+        const messageId = messageIdMatch ? messageIdMatch[1] : "";
+        if (messageId && this.db.hasSentMessage(messageId)) {
+            console.log(`  [smtp] ${accountId}: SKIP ${messageId} — already in sent_log`);
+            return; // caller will move the file to sent/ without re-sending
+        }
         const rawToSend = raw.replace(/^Bcc:.*\r?\n/mi, "");
         this.saveSendingCopy(accountId, rawToSend, "sent");
         await transport.sendMail({ envelope: { from: sender, to: recipients }, raw: rawToSend });
+        // Record the successful send so future attempts dedupe against it.
+        if (messageId) {
+            this.db.recordSent(messageId, accountId, subjectMatch?.[1]?.trim() || "", recipients);
+        }
         console.log(`  [smtp] ${accountId}: sent to ${recipients.join(", ")}`);
     }
     /** Process Outbox — send pending messages with flag-based interlock */

package/packages/mailx-store/db.d.ts

@@ -7,6 +7,11 @@ import type { MessageEnvelope, Folder, EmailAddress, PagedResult, MessageQuery }
 export declare class MailxDB {
     private db;
     constructor(dbDir: string);
+    /** Has this Message-ID already been sent? Used to prevent the outbox from
+     *  re-sending the same raw file across crash/restart cycles. */
+    hasSentMessage(messageId: string): boolean;
+    /** Record a successfully sent message so future attempts are skipped. */
+    recordSent(messageId: string, accountId: string, subject: string, recipients: string[]): void;
     /** Idempotently add a column to a table if it's missing. */
     private addColumnIfMissing;
     /** Compute a thread id for an incoming message. Strategy:

package/packages/mailx-store/db.js

@@ -62,6 +62,14 @@ const SCHEMA = `
     CREATE INDEX IF NOT EXISTS idx_messages_thread_id
         ON messages(account_id, thread_id);
 
+    CREATE TABLE IF NOT EXISTS sent_log (
+        message_id TEXT PRIMARY KEY,
+        account_id TEXT NOT NULL,
+        subject TEXT DEFAULT '',
+        recipients TEXT DEFAULT '',
+        sent_at INTEGER NOT NULL
+    );
+
     CREATE TABLE IF NOT EXISTS queue (
         id INTEGER PRIMARY KEY AUTOINCREMENT,
         status TEXT NOT NULL DEFAULT 'pending',
@@ -137,6 +145,26 @@ export class MailxDB {
         }
         catch { /* already exists */ }
     }
+    // ── Sent-log (dedup) ──
+    /** Has this Message-ID already been sent? Used to prevent the outbox from
+     *  re-sending the same raw file across crash/restart cycles. */
+    hasSentMessage(messageId) {
+        if (!messageId)
+            return false;
+        const row = this.db.prepare("SELECT 1 FROM sent_log WHERE message_id = ? LIMIT 1").get(messageId);
+        return !!row;
+    }
+    /** Record a successfully sent message so future attempts are skipped. */
+    recordSent(messageId, accountId, subject, recipients) {
+        if (!messageId)
+            return;
+        try {
+            this.db.prepare("INSERT INTO sent_log (message_id, account_id, subject, recipients, sent_at) VALUES (?, ?, ?, ?, ?) ON CONFLICT(message_id) DO NOTHING").run(messageId, accountId, subject || "", recipients.join(", "), Date.now());
+        }
+        catch (e) {
+            console.error(`  [sent_log] failed to record ${messageId}: ${e.message}`);
+        }
+    }
     /** Idempotently add a column to a table if it's missing. */
     addColumnIfMissing(table, column, sqlType) {
         try {