@bobfrankston/mailx-store 0.1.16 → 0.1.18

package/db.js

@@ -7,7 +7,29 @@ import { DatabaseSync } from "node:sqlite";
 import { randomUUID } from "node:crypto";
 import * as path from "node:path";
 import * as fs from "node:fs";
+// libmime has no @types; declare module for the one symbol we use.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const _libmimeMod = await import("libmime");
 import { CONTACT_RULES } from "@bobfrankston/mailx-types";
+/** RFC 2047 encoded-word decode. mailparser handles the standard cases
+ *  (Subject, unquoted display names) but leaves encoded-words inside
+ *  quoted-strings raw because they're RFC-strictly forbidden there —
+ *  in practice senders do it anyway. Running libmime.decodeWords as a
+ *  uniform pass over every header string at the storage seam means
+ *  every code path (IMAP fetch, Gmail API, manual insert, eml replay)
+ *  gets the same treatment. Safe on already-decoded strings (no `=?`
+ *  markers → no-op). */
+const _libmime = _libmimeMod.default || _libmimeMod;
+function decodeHeaderWords(s) {
+    if (!s || s.indexOf("=?") < 0)
+        return s || "";
+    try {
+        return _libmime.decodeWords(s);
+    }
+    catch {
+        return s;
+    }
+}
 /** Addresses that have no business in autocomplete. Patterns load from
  *  contact-rules.jsonc in mailx-types — a single source of truth shipped
  *  with every release. To change the rules edit the JSONC and rebuild. */
@@ -1191,6 +1213,20 @@ export class MailxDB {
         return true;
     }
     upsertMessage(msg) {
+        // Uniform RFC 2047 encoded-word decode at the storage seam. Every
+        // path that lands a message here (IMAP fetch, Gmail API, manual
+        // insert) gets the same treatment — no per-callsite patches.
+        // mailparser handles many cases but not encoded-words inside
+        // quoted-strings (RFC-strictly forbidden, common in the wild). Run
+        // libmime over Subject and every address display name once; safe
+        // to call on already-decoded text (no `=?...?=` markers → no-op).
+        msg.subject = decodeHeaderWords(msg.subject);
+        if (msg.from)
+            msg.from = { name: decodeHeaderWords(msg.from.name || ""), address: msg.from.address || "" };
+        if (msg.to)
+            msg.to = msg.to.map(a => ({ name: decodeHeaderWords(a.name || ""), address: a.address || "" }));
+        if (msg.cc)
+            msg.cc = msg.cc.map(a => ({ name: decodeHeaderWords(a.name || ""), address: a.address || "" }));
         const existing = this.db.prepare("SELECT id, provider_id FROM messages WHERE account_id = ? AND folder_id = ? AND uid = ?").get(msg.accountId, msg.folderId, msg.uid);
         if (existing) {
             // Backfill provider_id on existing rows that predate this column —
@@ -2301,10 +2337,19 @@ export class MailxDB {
                 scopeWhere += " AND " + extraWhere.join(" AND ");
                 scopeParams.push(...extraParams);
             }
-            const countRow = this.db.prepare(`SELECT COUNT(*) as cnt FROM messages m
-                 JOIN messages_fts fts ON m.id = fts.rowid
-                 LEFT JOIN folders f ON f.id = m.folder_id AND f.account_id = m.account_id
-                 WHERE messages_fts MATCH ?${scopeWhere}`).get(ftsQuery, ...scopeParams);
+            // Cap COUNT at 1001 — a bare `SELECT COUNT(*)` on FTS5 has to
+            // enumerate every match, which for a common term ("ieee", "the")
+            // can be tens of thousands of rows and several seconds. We never
+            // paginate past a few hundred in the UI anyway, so capping the
+            // count is invisible to the user and turns search from
+            // multi-second to sub-second. UI shows "1000+" when cnt === 1001.
+            const countRow = this.db.prepare(`SELECT COUNT(*) as cnt FROM (
+                    SELECT 1 FROM messages m
+                    JOIN messages_fts fts ON m.id = fts.rowid
+                    LEFT JOIN folders f ON f.id = m.folder_id AND f.account_id = m.account_id
+                    WHERE messages_fts MATCH ?${scopeWhere}
+                    LIMIT 1001
+                 )`).get(ftsQuery, ...scopeParams);
             const total = countRow?.cnt || 0;
             const rows = this.db.prepare(`SELECT m.*, f.name AS folder_name FROM messages m
                  JOIN messages_fts fts ON m.id = fts.rowid

package/package.json

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