@bobfrankston/rmfmail 1.1.129 → 1.1.130

package/packages/mailx-imap/index.ts

@@ -4166,11 +4166,95 @@ export class ImapManager extends EventEmitter {
     private outboxBackoff = new Map<string, number>(); // accountId → next retry timestamp
     private outboxBackoffDelay = new Map<string, number>(); // 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. */
+    private routeGeneralOutboxFile(filePath: string): string | null {
+        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. */
+    private routeGeneralOutbox(): void {
+        const root = path.join(getConfigDir(), "outbox");
+        if (!fs.existsSync(root)) return;
+        let entries: fs.Dirent[] = [];
+        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: any) {
+                console.error(`  [outbox] Failed to route ${ent.name}: ${e.message}`);
+            }
+        }
+    }
+
     startOutboxWorker(): void {
         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/packages/mailx-imap/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bobfrankston/mailx-imap",
-      "version": "0.1.57",
+      "version": "0.1.58",
       "license": "ISC",
       "dependencies": {
         "@bobfrankston/iflow-direct": "^0.1.27",

package/packages/mailx-imap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",

package/packages/mailx-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",