@bobfrankston/rmfmail 1.1.195 → 1.1.197

package/bin/mailx.ts

@@ -399,7 +399,7 @@ function pidIsMailx(pid: number): boolean {
 // on an old UI with no indication that the install has been upgraded.
 // Skip this logic for command-only flags (kill, rebuild, setup, ...) and for
 // the internal --daemon respawn.
-const __commandFlags = ["kill", "v", "version", "setup", "add", "test", "rebuild", "repair", "recover", "fix-flags", "import", "log", "reauth"];
+const __commandFlags = ["kill", "v", "version", "setup", "add", "test", "rebuild", "repair", "recover", "fix-flags", "relink-bodies", "import", "log", "reauth"];
 const __isCommandInvocation = process.argv.slice(2).some(a => __commandFlags.includes(a.replace(/^--?/, "")));
 // `--another` opts out of the replace-on-launch sweep so the user can run
 // multiple rmfmail instances side by side (testing, parallel sessions, etc.).
@@ -473,7 +473,7 @@ const recoverMode = hasFlag("recover");
 const importMode = hasFlag("import");
 
 // Validate arguments
-const knownFlags = ["verbose", "kill", "v", "version", "setup", "add", "test", "rebuild", "repair", "recover", "fix-flags", "log", "import", "email", "mail", "daemon", "reauth", "mailto", "register-mailto", "unregister-mailto", "allow-elevated", "another", "server", "no-browser", "debug-server", "send", "account"];
+const knownFlags = ["verbose", "kill", "v", "version", "setup", "add", "test", "rebuild", "repair", "recover", "fix-flags", "relink-bodies", "log", "import", "email", "mail", "daemon", "reauth", "mailto", "register-mailto", "unregister-mailto", "allow-elevated", "another", "server", "no-browser", "debug-server", "send", "account"];
 for (const arg of args) {
     // Strip a leading -/-- and any `=value` suffix before checking.
     const flag = arg.replace(/^--?/, "").split("=")[0];
@@ -1027,6 +1027,79 @@ if (hasFlag("fix-flags")) {
     process.exit(0);
 }
 
+// Relink message bodies from on-disk .eml files by Message-ID (no network).
+// Heals the body_path cross-wiring from the pre-1.1.196 updateBodyMeta bug:
+// the .eml files on disk are correct; only the DB pointers were wrong. Match
+// each file to its row by Message-ID and repair body_path — far cheaper than
+// clearing 55k pointers and re-downloading from the server (Bob 2026-05-29).
+if (hasFlag("relink-bodies")) {
+    const { getConfigDir, getStorePath } = await import("@bobfrankston/mailx-settings");
+    const dbDir = getConfigDir();
+    const storePath = getStorePath();
+    const dbPath = path.join(dbDir, "mailx.db");
+    if (!fs.existsSync(dbPath)) { console.error("No database found."); process.exit(1); }
+    if (!fs.existsSync(storePath)) { console.error(`No mailxstore at ${storePath}.`); process.exit(1); }
+    const { DatabaseSync } = await import("node:sqlite");
+    const db = new DatabaseSync(dbPath);
+    db.exec("PRAGMA journal_mode = WAL");
+    console.log("Relinking bodies from on-disk .eml by Message-ID (local-only)...");
+
+    const readMsgId = (p: string): string => {
+        try {
+            const fd = fs.openSync(p, "r");
+            const buf = Buffer.alloc(8192);
+            const n = fs.readSync(fd, buf, 0, 8192, 0);
+            fs.closeSync(fd);
+            const head = buf.slice(0, n).toString("utf-8");
+            const end = head.search(/\r?\n\r?\n/);
+            const hdr = end >= 0 ? head.slice(0, end) : head;
+            const m = hdr.match(/^Message-I[dD]:[ \t]*(.*(?:\r?\n[ \t]+.*)*)/im);
+            return m ? m[1].replace(/\r?\n[ \t]+/g, " ").trim().replace(/^<|>$/g, "") : "";
+        } catch { return ""; }
+    };
+
+    // 1. Index every .eml by account + Message-ID → relative path.
+    const midToPath = new Map<string, string>(); // key: `${acct}\x00${mid}`
+    let scanned = 0;
+    const accountDirs = fs.readdirSync(storePath, { withFileTypes: true })
+        .filter(d => d.isDirectory()).map(d => d.name);
+    const walk = (acct: string, dir: string): void => {
+        for (const e of fs.readdirSync(dir, { withFileTypes: true })) {
+            const p = path.join(dir, e.name);
+            if (e.isDirectory()) { walk(acct, p); continue; }
+            if (!e.isFile() || !e.name.endsWith(".eml")) continue;
+            scanned++;
+            const mid = readMsgId(p);
+            if (!mid) continue;
+            const key = `${acct}\x00${mid}`;
+            if (!midToPath.has(key)) midToPath.set(key, path.relative(storePath, p).replace(/\\/g, "/"));
+            if (scanned % 5000 === 0) console.log(`  scanned ${scanned} .eml...`);
+        }
+    };
+    for (const acct of accountDirs) walk(acct, path.join(storePath, acct));
+    console.log(`  indexed ${midToPath.size} unique Message-IDs from ${scanned} .eml files`);
+
+    // 2. For each row with a Message-ID, point body_path at the matching .eml
+    //    (or clear it when no file on disk matches → re-fetch on demand).
+    const rows = db.prepare("SELECT id, account_id, message_id, body_path FROM messages WHERE message_id IS NOT NULL AND message_id != ''").all() as any[];
+    const upd = db.prepare("UPDATE messages SET body_path = ?, body_parsed_at = NULL WHERE id = ?");
+    let relinked = 0, already = 0, cleared = 0;
+    for (const r of rows) {
+        const mid = String(r.message_id).replace(/^<|>$/g, "");
+        const correct = midToPath.get(`${r.account_id}\x00${mid}`);
+        if (correct) {
+            if (r.body_path !== correct) { upd.run(correct, r.id); relinked++; }
+            else already++;
+        } else if (r.body_path) {
+            upd.run("", r.id); cleared++;
+        }
+    }
+    db.close();
+    console.log(`Relink done: ${relinked} repaired, ${already} already correct, ${cleared} cleared (no matching .eml → will re-fetch).`);
+    console.log("  Run 'rmfmail' to start the daemon.");
+    process.exit(0);
+}
+
 // Import accounts from a local file into GDrive
 if (importMode) {
     const importPath = args.find(a => !a.startsWith("-"));

package/client/android-bootstrap.bundle.js

@@ -5213,8 +5213,10 @@ var WebMailxDB = class {
   updateMessageFlags(accountId, folderId, uid, flags) {
     this.run("UPDATE messages SET flags_json = ? WHERE account_id = ? AND folder_id = ? AND uid = ?", [JSON.stringify(flags), accountId, folderId, uid]);
   }
-  updateBodyPath(accountId, uid, bodyPath) {
-    this.run("UPDATE messages SET body_path = ? WHERE account_id = ? AND uid = ?", [bodyPath, accountId, uid]);
+  /** folderId REQUIRED — see main mailx-store/db.ts: a (account, uid) write
+   *  cross-wires body_path across every folder sharing the numeric UID. */
+  updateBodyPath(accountId, folderId, uid, bodyPath) {
+    this.run("UPDATE messages SET body_path = ? WHERE account_id = ? AND folder_id = ? AND uid = ?", [bodyPath, accountId, folderId, uid]);
   }
   getMessagesWithoutBody(accountId, limit = 50) {
     return this.all("SELECT uid, folder_id as folderId FROM messages WHERE account_id = ? AND (body_path IS NULL OR body_path NOT LIKE 'idb:%') ORDER BY (size IS NULL OR size = 0), size ASC, date DESC LIMIT ?", [accountId, limit]);
@@ -9779,7 +9781,7 @@ var AndroidSyncManager = class {
               await new Promise((r) => setTimeout(r, rateLimitCooldownUntil - now));
             }
             if (await this.bodyStore.hasMessage(accountId, m.folderId, m.uid)) {
-              this.db.updateBodyPath(accountId, m.uid, `idb:${accountId}/${m.folderId}/${m.uid}`);
+              this.db.updateBodyPath(accountId, m.folderId, m.uid, `idb:${accountId}/${m.folderId}/${m.uid}`);
               progressedThisBatch = true;
               continue;
             }
@@ -9991,7 +9993,7 @@ var AndroidSyncManager = class {
     }
     const raw = new TextEncoder().encode(msg.source);
     await this.bodyStore.putMessage(accountId, folderId, uid, raw);
-    this.db.updateBodyPath(accountId, uid, `idb:${accountId}/${folderId}/${uid}`);
+    this.db.updateBodyPath(accountId, folderId, uid, `idb:${accountId}/${folderId}/${uid}`);
     console.log(`[fetchBody] fetched + cached ${accountId}/${folderId}/${uid} (${raw.byteLength} bytes, ${Date.now() - t0}ms)`);
     return raw;
   }