@zaclinley/dsh-mailharbor 0.19.0 → 0.19.1

package/lib/index.js

@@ -1124,6 +1124,11 @@ function ensureMailSchema(file) {
     if (!emailColumns.some((column) => column.name === "refs_indexed")) {
       db.exec("ALTER TABLE emails ADD COLUMN refs_indexed INTEGER DEFAULT 0");
     }
+    try {
+      db.exec("CREATE INDEX IF NOT EXISTS idx_emails_in_reply ON emails(in_reply_to)");
+      db.exec("CREATE INDEX IF NOT EXISTS idx_emails_message_id_lower ON emails(lower(message_id))");
+    } catch {
+    }
   } finally {
     db.close();
   }
@@ -1135,6 +1140,7 @@ var MailDatabase = class {
   ftsChecked = false;
   ftsAvailable = false;
   threadRefs = /* @__PURE__ */ new Map();
+  threadCache = /* @__PURE__ */ new Map();
   constructor(file, options = {}) {
     this.file = file;
     this.options = options;
@@ -1189,6 +1195,7 @@ var MailDatabase = class {
     }
     this.db = void 0;
     this.threadRefs.clear();
+    this.threadCache.clear();
   }
   status() {
     try {
@@ -1392,9 +1399,15 @@ var MailDatabase = class {
     const normalize2 = (value) => value.replace(/^(\s*(re|fw|fwd|回复|转发)\s*[:：]\s*)+/gi, "").replace(/\s+/g, " ").trim().toLowerCase();
     const base = normalize2(seed.subject);
     if (base === "") return [];
+    const cacheKey = `${seed.messageId ?? ""}|${base}`;
+    const cached = this.threadCache.get(cacheKey);
+    if (cached !== void 0 && Date.now() - cached.at < 3e4) return cached.items;
     const seedIdForQuery = (seed.messageId ?? "").replace(/^<|>$/g, "").toLowerCase();
     const candidates = this.threadCandidates(base, limit, seedIdForQuery);
-    if (candidates.length <= 1) return candidates;
+    if (candidates.length <= 1) {
+      this.threadCache.set(cacheKey, { at: Date.now(), items: candidates });
+      return candidates;
+    }
     const refs = this.referencesFor(candidates.slice(0, 120).map((item) => Number(item.id)));
     const byMessageId = /* @__PURE__ */ new Map();
     for (const item of candidates) {
@@ -1432,7 +1445,10 @@ var MailDatabase = class {
         refs: [...refs.entries()].slice(0, 3)
       });
     }
-    if (edges === 0) return candidates;
+    if (edges === 0) {
+      this.threadCache.set(cacheKey, { at: Date.now(), items: candidates });
+      return candidates;
+    }
     const seen = /* @__PURE__ */ new Set();
     const queue = [byMessageId.get(startId)];
     while (queue.length > 0) {
@@ -1443,24 +1459,27 @@ var MailDatabase = class {
         if (!seen.has(next)) queue.push(next);
       }
     }
-    if (seen.size <= 1) return candidates;
-    return candidates.filter((item) => seen.has(Number(item.id)));
+    const result = seen.size <= 1 ? candidates : candidates.filter((item) => seen.has(Number(item.id)));
+    this.threadCache.set(cacheKey, { at: Date.now(), items: result });
+    return result;
   }
   /** Subject candidates via a distinctive token, not FTS (punctuation-safe). */
   threadCandidates(base, limit, seedId = "") {
     const normalize2 = (value) => value.replace(/^(\s*(re|fw|fwd|回复|转发)\s*[:：]\s*)+/gi, "").replace(/\s+/g, " ").trim().toLowerCase();
     const words = base.split(/[^\p{L}\p{N}]+/u).filter((word) => word.length >= 3);
     const token = words.sort((left, right) => right.length - left.length)[0] ?? base.slice(0, 8);
-    const pattern = `%${token.replace(/[%_]/g, "\\$&")}%`;
-    try {
-      const rows = this.open().prepare(
-        `SELECT e.id, e.mailbox, e.uid, e.subject, e.from_name, e.from_addr, e.to_addr, e.cc,
+    const select = `SELECT e.id, e.mailbox, e.uid, e.subject, e.from_name, e.from_addr, e.to_addr, e.cc,
                   e.message_id, e.date, length(e.body_text) AS text_length,
                   (SELECT COUNT(*) FROM attachments a WHERE a.email_id = e.id) AS attachment_count,
                   substr(COALESCE(e.body_text, ''), 1, 240) AS snippet
-           FROM emails e WHERE lower(e.subject) LIKE ? ESCAPE '\\'
-           ORDER BY e.date DESC LIMIT ?`
-      ).all(pattern, 500);
+           FROM emails e`;
+    try {
+      const ftsQuery = `subject:"${token.replace(/"/g, '""')}"`;
+      const rows = this.open().prepare(
+        `${select} JOIN emails_fts f ON f.rowid = e.id
+           WHERE emails_fts MATCH ?
+           ORDER BY e.date DESC LIMIT 500`
+      ).all(ftsQuery);
       const items = rows.map((row) => rowToSummary(row)).filter((item) => normalize2(item.subject) === base);
       if (seedId !== "" && this.hasRefColumns()) {
         const linked = this.open().prepare(
@@ -1469,9 +1488,9 @@ var MailDatabase = class {
                     (SELECT COUNT(*) FROM attachments a WHERE a.email_id = e.id) AS attachment_count,
                     substr(COALESCE(e.body_text, ''), 1, 240) AS snippet
              FROM emails e
-             WHERE lower(e.in_reply_to) = ? OR lower(e."references") LIKE ? ESCAPE '\\'
+             WHERE e.in_reply_to = ?
              ORDER BY e.date DESC LIMIT 100`
-        ).all(seedId, `%${seedId.replace(/[%_]/g, "\\$&")}%`);
+        ).all(seedId);
         const known = new Set(items.map((item) => item.id));
         try {
           const seedRow = this.open().prepare(
@@ -1512,7 +1531,8 @@ var MailDatabase = class {
       }
       return items.slice(0, limit);
     } catch {
-      return [];
+      const page = this.list({ mailbox: "all", query: base, limit: Math.min(500, limit * 2) });
+      return page.items.filter((item) => normalize2(item.subject) === base).slice(0, limit);
     }
   }
   /** Read (and cache) In-Reply-To / References for a set of local ids. */
@@ -1522,11 +1542,11 @@ var MailDatabase = class {
       const placeholders = missing.map(() => "?").join(",");
       try {
         const withRefs = this.hasRefColumns();
-        const columns = withRefs ? 'id, message_id, raw_eml, in_reply_to, "references"' : "id, message_id, raw_eml";
+        const columns = withRefs ? 'id, message_id, in_reply_to, "references", refs_indexed' : "id, message_id, raw_eml";
         const rows = this.open().prepare(`SELECT ${columns} FROM emails WHERE id IN (${placeholders})`).all(...missing);
+        const needRaw = [];
         for (const row of rows) {
           const id = Number(row.id);
-          const raw = row.raw_eml;
           const refs = [];
           for (const stored of [row.references ?? "", row.in_reply_to ?? ""]) {
             for (const found of String(stored).split(/\s+/)) {
@@ -1534,16 +1554,28 @@ var MailDatabase = class {
               if (value.includes("@")) refs.push(value);
             }
           }
-          if (refs.length === 0 && raw !== void 0 && raw !== null) {
-            for (const header of ["references", "in-reply-to"]) {
-              for (const found of headerIds(raw, header)) refs.push(found);
-            }
+          if (refs.length === 0 && (!withRefs || Number(row.refs_indexed ?? 0) !== 1)) {
+            needRaw.push(id);
           }
           this.threadRefs.set(id, {
             messageId: String(row.message_id ?? "").replace(/^<|>$/g, "").toLowerCase(),
             refs: [...new Set(refs)]
           });
         }
+        if (needRaw.length > 0) {
+          const marks = needRaw.map(() => "?").join(",");
+          const rawRows = this.open().prepare(`SELECT id, raw_eml FROM emails WHERE id IN (${marks})`).all(...needRaw);
+          for (const row of rawRows) {
+            const id = Number(row.id);
+            const entry = this.threadRefs.get(id);
+            if (entry === void 0 || row.raw_eml === null || row.raw_eml === void 0) continue;
+            const refs = [...entry.refs];
+            for (const header of ["references", "in-reply-to"]) {
+              for (const found of headerIds(row.raw_eml, header)) refs.push(found);
+            }
+            this.threadRefs.set(id, { ...entry, refs: [...new Set(refs)] });
+          }
+        }
       } catch {
       }
     }
@@ -2972,7 +3004,7 @@ ${conversation.trim()}
 }
 
 // src/host/version.ts
-var VERSION = "0.19.0";
+var VERSION = "0.19.1";
 
 // src/host/api.ts
 init_smtp();