@bobfrankston/mailx-imap 0.1.56 → 0.1.58

package/index.d.ts

@@ -473,6 +473,21 @@ export declare class ImapManager extends EventEmitter {
     /** Start background Outbox worker — runs immediately then every 10 seconds */
     private outboxBackoff;
     private outboxBackoffDelay;
+    /** Route a file dropped into the general `~/.rmfmail/outbox/` (no acct
+     *  subdir) to one of the configured accounts. Match order:
+     *   1. `From:` address matches an `account.email` exactly (case-insensitive).
+     *   2. `From:` domain matches a known-provider domain → first account whose
+     *      domain matches (gmail.com / googlemail.com → first Gmail account;
+     *      outlook.com / hotmail.com / live.com → first Outlook account).
+     *   3. Default = first account with an explicit IMAP override host (i.e.,
+     *      not one of the known providers). Bob's bobma is the prototype.
+     *  Returns the routed accountId or null if no candidate exists. */
+    private routeGeneralOutboxFile;
+    /** Scan the general outbox (`~/.rmfmail/outbox/*.ltr|*.eml` — no acct
+     *  subdir) and route each file into the appropriate per-account dir. Runs
+     *  once per outboxLoop tick before the per-account sweep, so a file
+     *  manually dropped at the root gets handed off the same tick. */
+    private routeGeneralOutbox;
     startOutboxWorker(): void;
     /** Stop Outbox worker */
     stopOutboxWorker(): void;

package/index.js

@@ -3195,6 +3195,15 @@ export class ImapManager extends EventEmitter {
                             }
                             continue;
                         }
+                        // Success — clear the in-flight delete/move
+                        // suppression (see the IMAP branch below for the
+                        // full rationale). After a move the local row lives
+                        // at the TARGET folder, so the (uid, folder) lookup
+                        // uses targetFolderId.
+                        if (action.action === "move") {
+                            this.db.clearTombstoneForUid(accountId, action.uid, action.targetFolderId);
+                            this.db.clearMessagePendingDelete(accountId, action.uid, action.targetFolderId);
+                        }
                         this.db.completeSyncAction(action.id);
                     }
                     catch (e) {
@@ -3204,7 +3213,11 @@ export class ImapManager extends EventEmitter {
                             // Terminal failure on delete/move → clear tombstone
                             // so the row reappears on next sync (server still
                             // has it). Same rationale as the IMAP branch below.
-                            if (action.action === "delete" || action.action === "move") {
+                            if (action.action === "move") {
+                                this.db.clearTombstoneForUid(accountId, action.uid, action.targetFolderId);
+                                this.db.clearMessagePendingDelete(accountId, action.uid, action.targetFolderId);
+                            }
+                            else if (action.action === "delete") {
                                 this.db.clearTombstoneForUid(accountId, action.uid, action.folderId);
                             }
                             this.db.completeSyncAction(action.id);
@@ -3280,6 +3293,22 @@ export class ImapManager extends EventEmitter {
                             break;
                         }
                     }
+                    // Success: the local action reached the server. Lift the
+                    // in-flight delete/move suppression so the destination
+                    // folder syncs the moved message under its real
+                    // post-move UID. hasTombstone's documented contract is
+                    // "cleared on successful action complete OR permanent
+                    // failure" — only the failure half had been wired, so a
+                    // successful move left a Message-ID tombstone alive for
+                    // 30 days, blocking the Trash folder from ever storing
+                    // the message (and resurrecting it once the tombstone
+                    // finally aged out). After a move the local row lives at
+                    // the TARGET folder, so the (uid, folder) lookup uses
+                    // targetFolderId.
+                    if (action.action === "move") {
+                        this.db.clearTombstoneForUid(accountId, action.uid, action.targetFolderId);
+                        this.db.clearMessagePendingDelete(accountId, action.uid, action.targetFolderId);
+                    }
                     this.db.completeSyncAction(action.id);
                 }
                 catch (e) {
@@ -3296,7 +3325,13 @@ export class ImapManager extends EventEmitter {
                         // reflecting "your action didn't take, here it is
                         // again." Applies to delete + move; flags/append
                         // never tombstone.
-                        if (action.action === "delete" || action.action === "move") {
+                        if (action.action === "move") {
+                            // Local row is at the TARGET folder (the local
+                            // move committed; only the server move failed).
+                            this.db.clearTombstoneForUid(accountId, action.uid, action.targetFolderId);
+                            this.db.clearMessagePendingDelete(accountId, action.uid, action.targetFolderId);
+                        }
+                        else if (action.action === "delete") {
                             this.db.clearTombstoneForUid(accountId, action.uid, action.folderId);
                         }
                         this.db.completeSyncAction(action.id);
@@ -4178,11 +4213,113 @@ export class ImapManager extends EventEmitter {
     /** Start background Outbox worker — runs immediately then every 10 seconds */
     outboxBackoff = new Map(); // accountId → next retry timestamp
     outboxBackoffDelay = new Map(); // accountId → current delay ms
+    /** Route a file dropped into the general `~/.rmfmail/outbox/` (no acct
+     *  subdir) to one of the configured accounts. Match order:
+     *   1. `From:` address matches an `account.email` exactly (case-insensitive).
+     *   2. `From:` domain matches a known-provider domain → first account whose
+     *      domain matches (gmail.com / googlemail.com → first Gmail account;
+     *      outlook.com / hotmail.com / live.com → first Outlook account).
+     *   3. Default = first account with an explicit IMAP override host (i.e.,
+     *      not one of the known providers). Bob's bobma is the prototype.
+     *  Returns the routed accountId or null if no candidate exists. */
+    routeGeneralOutboxFile(filePath) {
+        let raw = "";
+        try {
+            raw = fs.readFileSync(filePath, "utf-8");
+        }
+        catch {
+            return null;
+        }
+        const fromMatch = raw.match(/^From:\s*(?:[^<\n]*<\s*)?([^\s<>@]+@[^\s<>]+)/mi);
+        const fromAddr = (fromMatch?.[1] || "").toLowerCase().replace(/[>\s].*$/, "");
+        const fromDomain = fromAddr.split("@")[1] || "";
+        const settings = loadSettings();
+        const accounts = settings.accounts || [];
+        // 1. exact email match
+        if (fromAddr) {
+            const m = accounts.find(a => (a.email || "").toLowerCase() === fromAddr);
+            if (m)
+                return m.id;
+        }
+        // 2. known-provider domain match
+        const GMAIL_DOMAINS = new Set(["gmail.com", "googlemail.com"]);
+        const OUTLOOK_DOMAINS = new Set(["outlook.com", "hotmail.com", "live.com", "msn.com"]);
+        if (fromDomain) {
+            if (GMAIL_DOMAINS.has(fromDomain)) {
+                const m = accounts.find(a => GMAIL_DOMAINS.has((a.email || "").split("@")[1]?.toLowerCase() || ""));
+                if (m)
+                    return m.id;
+            }
+            if (OUTLOOK_DOMAINS.has(fromDomain)) {
+                const m = accounts.find(a => OUTLOOK_DOMAINS.has((a.email || "").split("@")[1]?.toLowerCase() || ""));
+                if (m)
+                    return m.id;
+            }
+        }
+        // 3. default: first account on a non-known-provider domain (i.e. one
+        // whose IMAP host was explicitly configured rather than auto-detected).
+        const KNOWN_PROVIDER_DOMAINS = new Set([
+            ...GMAIL_DOMAINS, ...OUTLOOK_DOMAINS,
+            "yahoo.com", "aol.com", "icloud.com", "me.com", "mac.com",
+        ]);
+        const override = accounts.find(a => {
+            const d = (a.email || "").split("@")[1]?.toLowerCase() || "";
+            return d && !KNOWN_PROVIDER_DOMAINS.has(d);
+        });
+        if (override)
+            return override.id;
+        // Last resort — any account at all
+        return accounts[0]?.id || null;
+    }
+    /** Scan the general outbox (`~/.rmfmail/outbox/*.ltr|*.eml` — no acct
+     *  subdir) and route each file into the appropriate per-account dir. Runs
+     *  once per outboxLoop tick before the per-account sweep, so a file
+     *  manually dropped at the root gets handed off the same tick. */
+    routeGeneralOutbox() {
+        const root = path.join(getConfigDir(), "outbox");
+        if (!fs.existsSync(root))
+            return;
+        let entries = [];
+        try {
+            entries = fs.readdirSync(root, { withFileTypes: true });
+        }
+        catch {
+            return;
+        }
+        for (const ent of entries) {
+            if (!ent.isFile())
+                continue;
+            if (!/\.(ltr|eml)$/i.test(ent.name))
+                continue;
+            const filePath = path.join(root, ent.name);
+            const accountId = this.routeGeneralOutboxFile(filePath);
+            if (!accountId) {
+                console.error(`  [outbox] No account candidate for ${ent.name} — leaving in general outbox`);
+                continue;
+            }
+            const acctDir = path.join(root, accountId);
+            try {
+                fs.mkdirSync(acctDir, { recursive: true });
+            }
+            catch { /* */ }
+            try {
+                fs.renameSync(filePath, path.join(acctDir, ent.name));
+                console.log(`  [outbox] Routed ${ent.name} → ${accountId}/`);
+            }
+            catch (e) {
+                console.error(`  [outbox] Failed to route ${ent.name}: ${e.message}`);
+            }
+        }
+    }
     startOutboxWorker() {
         if (this.outboxInterval)
             return;
         const processAll = async () => {
             const now = Date.now();
+            // Auto-route any files dropped into the general (acct-agnostic)
+            // outbox — they move into `outbox/<accountId>/` before the
+            // per-account sweep picks them up below.
+            this.routeGeneralOutbox();
             for (const [accountId] of this.configs) {
                 // Skip accounts in backoff
                 const retryAfter = this.outboxBackoff.get(accountId) || 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.56",
+  "version": "0.1.58",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -11,7 +11,7 @@
   "dependencies": {
     "@bobfrankston/mailx-types": "^0.1.18",
     "@bobfrankston/mailx-settings": "^0.1.22",
-    "@bobfrankston/mailx-store": "^0.1.33",
+    "@bobfrankston/mailx-store": "^0.1.34",
     "@bobfrankston/iflow-direct": "^0.1.50",
     "@bobfrankston/tcp-transport": "^0.1.6",
     "@bobfrankston/smtp-direct": "^0.1.8",
@@ -39,7 +39,7 @@
     "dependencies": {
       "@bobfrankston/mailx-types": "^0.1.18",
       "@bobfrankston/mailx-settings": "^0.1.22",
-      "@bobfrankston/mailx-store": "^0.1.33",
+      "@bobfrankston/mailx-store": "^0.1.34",
       "@bobfrankston/iflow-direct": "^0.1.50",
       "@bobfrankston/tcp-transport": "^0.1.6",
       "@bobfrankston/smtp-direct": "^0.1.8",