@zaclinley/dsh-mailharbor 0.12.0 → 0.12.2

package/lib/index.js

@@ -170,8 +170,15 @@ function flagsOf(value) {
 function isSeen(flags) {
   return flags.some((flag) => flag.toLowerCase() === "\\seen");
 }
+function isInlineImage(attachment) {
+  const type = String(attachment.contentType ?? "").toLowerCase();
+  if (!type.startsWith("image/")) return false;
+  const disposition = String(attachment.contentDisposition ?? "").toLowerCase();
+  const cid = String(attachment.cid ?? "");
+  return disposition === "inline" || cid !== "" && disposition !== "attachment";
+}
 function attachmentList(parsed) {
-  return (parsed.attachments ?? []).map((attachment, index) => ({
+  return (parsed.attachments ?? []).filter((attachment) => !isInlineImage(attachment)).map((attachment, index) => ({
     id: String(index),
     filename: String(attachment.filename ?? "attachment"),
     contentType: String(attachment.contentType ?? "application/octet-stream"),
@@ -992,6 +999,13 @@ function ensureMailSchema(file) {
       db.exec(FTS);
     } catch {
     }
+    const columns = db.prepare("PRAGMA table_info(attachments)").all();
+    if (!columns.some((column) => column.name === "content_id")) {
+      db.exec("ALTER TABLE attachments ADD COLUMN content_id TEXT");
+    }
+    if (!columns.some((column) => column.name === "disposition")) {
+      db.exec("ALTER TABLE attachments ADD COLUMN disposition TEXT");
+    }
   } finally {
     db.close();
   }
@@ -1019,6 +1033,27 @@ var MailDatabase = class {
     this.db.exec("PRAGMA busy_timeout = 3000");
     return this.db;
   }
+  /** Whether the backup has added inline-image columns yet. */
+  hasAttachmentColumns() {
+    try {
+      const columns = this.open().prepare("PRAGMA table_info(attachments)").all();
+      return columns.some((column) => column.name === "content_id");
+    } catch {
+      return false;
+    }
+  }
+  attachmentCountSql() {
+    if (!this.hasAttachmentColumns()) {
+      return "(SELECT COUNT(*) FROM attachments a WHERE a.email_id = e.id) AS attachment_count";
+    }
+    return `(SELECT COUNT(*) FROM attachments a
+          WHERE a.email_id = e.id
+            AND NOT (a.content_type LIKE 'image/%' AND (
+              a.disposition = 'inline'
+              OR (a.content_id IS NOT NULL AND a.content_id <> '' AND a.disposition IS NOT 'attachment')
+              OR lower(a.filename) GLOB 'image[0-9]*'
+            ))) AS attachment_count`;
+  }
   close() {
     if (this.db === void 0) return;
     try {
@@ -1066,6 +1101,23 @@ var MailDatabase = class {
       where.push("e.date >= ?");
       params.push(query.since);
     }
+    if (query.unread !== void 0) {
+      const mids = query.unread.mids.slice(0, 500);
+      const ids = query.unread.ids.slice(0, 500);
+      if (mids.length === 0 && ids.length === 0) {
+        return { items: [], total: 0, offset, limit };
+      }
+      const parts = [];
+      if (mids.length > 0) {
+        parts.push(`e.message_id IN (${mids.map(() => "?").join(",")})`);
+        params.push(...mids);
+      }
+      if (ids.length > 0) {
+        parts.push(`e.id IN (${ids.map(() => "?").join(",")})`);
+        params.push(...ids);
+      }
+      where.push(`(${parts.join(" OR ")})`);
+    }
     const text2 = String(query.query ?? "").trim();
     if (text2 !== "") {
       const tokens = text2.split(/\s+/).filter(Boolean);
@@ -1089,7 +1141,7 @@ var MailDatabase = class {
     const clause = where.length === 0 ? "" : `WHERE ${where.join(" AND ")}`;
     const columns = `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,
+        ${this.attachmentCountSql()},
         substr(COALESCE(e.body_text, ''), 1, 240) AS snippet`;
     const total = Number(
       db.prepare(`SELECT COUNT(*) AS count FROM emails e ${clause}`).get(...params)?.count ?? 0
@@ -1144,7 +1196,7 @@ var MailDatabase = class {
     const clause = `WHERE ${where.join(" AND ")}`;
     const columns = `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,
+        ${this.attachmentCountSql()},
         substr(COALESCE(e.body_text, ''), 1, 240) AS snippet`;
     const total = Number(
       db.prepare(`SELECT COUNT(*) AS count FROM emails e ${clause}`).get(...params)?.count ?? 0
@@ -1152,6 +1204,28 @@ var MailDatabase = class {
     const rows = db.prepare(`${columns} FROM emails e ${clause} ORDER BY e.date DESC, e.id DESC LIMIT ?`).all(...params, limit);
     return { items: rows.map((row) => rowToSummary(row)), total, offset: 0, limit };
   }
+  /** Number of unread keys that still exist in this backup. */
+  countUnread(keys) {
+    const mids = keys.mids.slice(0, 500);
+    const ids = keys.ids.slice(0, 500);
+    if (mids.length === 0 && ids.length === 0) return 0;
+    const parts = [];
+    const params = [];
+    if (mids.length > 0) {
+      parts.push(`message_id IN (${mids.map(() => "?").join(",")})`);
+      params.push(...mids);
+    }
+    if (ids.length > 0) {
+      parts.push(`id IN (${ids.map(() => "?").join(",")})`);
+      params.push(...ids);
+    }
+    try {
+      const row = this.open().prepare(`SELECT COUNT(*) AS count FROM emails WHERE ${parts.join(" OR ")}`).get(...params);
+      return Number(row?.count ?? 0);
+    } catch {
+      return 0;
+    }
+  }
   get(localId) {
     const db = this.open();
     const row = db.prepare(
@@ -1160,7 +1234,20 @@ var MailDatabase = class {
          FROM emails WHERE id = ?`
     ).get(localId);
     if (row === void 0) return void 0;
-    const attachments = db.prepare("SELECT id, filename, content_type, size FROM attachments WHERE email_id = ? ORDER BY id").all(localId).map((item) => ({
+    const cidText = String(row.body_html ?? "").toLowerCase();
+    const attachmentColumns = this.hasAttachmentColumns() ? "id, filename, content_type, size, content_id, disposition" : "id, filename, content_type, size";
+    const attachments = db.prepare(`SELECT ${attachmentColumns} FROM attachments WHERE email_id = ? ORDER BY id`).all(localId).filter((item) => {
+      const type = String(item.content_type ?? "").toLowerCase();
+      if (!type.startsWith("image/")) return true;
+      const disposition = String(item.disposition ?? "").toLowerCase();
+      const contentId = String(item.content_id ?? "").toLowerCase();
+      if (disposition === "inline") return false;
+      if (contentId !== "" && disposition !== "attachment") return false;
+      const filename = String(item.filename ?? "").toLowerCase();
+      if (filename !== "" && cidText.includes(`cid:${filename}`)) return false;
+      if (/^image\d+\.[a-z0-9]+$/.test(filename)) return false;
+      return true;
+    }).map((item) => ({
       id: String(item.id),
       filename: String(item.filename ?? "attachment"),
       contentType: String(item.content_type ?? "application/octet-stream"),
@@ -1318,10 +1405,57 @@ var BackupEngine = class {
   runtime;
   credentials;
   batchSize;
+  onFlags;
   constructor(runtime, credentials, options = {}) {
     this.runtime = runtime;
     this.credentials = credentials;
     this.batchSize = options.batchSize ?? BATCH;
+    this.onFlags = options.onFlags;
+  }
+  /** Mirror IMAP \Seen flags into the local unread store. */
+  async reconcileReadState(client) {
+    if (this.onFlags === void 0) return;
+    const exists = Number(client.mailbox?.exists ?? 0);
+    if (exists === 0) return;
+    const entries = /* @__PURE__ */ new Map();
+    const add = (messageId, unread) => {
+      if (messageId !== "") entries.set(`mid:${messageId}`, unread);
+    };
+    const flagsOf2 = (flags) => [...flags ?? []].map((flag) => String(flag).toLowerCase());
+    const start = Math.max(1, exists - 299);
+    try {
+      for await (const message of client.fetch(`${String(start)}:${String(exists)}`, {
+        uid: true,
+        envelope: true,
+        flags: true
+      })) {
+        const messageId = normalizeId(message.envelope?.messageId);
+        add(messageId, !flagsOf2(message.flags).includes("\\seen"));
+      }
+    } catch {
+    }
+    try {
+      const unseen = await client.search({ seen: false }, { uid: true });
+      const uids = (Array.isArray(unseen) ? unseen : []).map(Number).filter((uid) => Number.isFinite(uid));
+      for (let index = 0; index < uids.length; index += 200) {
+        const range = uids.slice(index, index + 200).join(",");
+        if (range === "") continue;
+        for await (const message of client.fetch(
+          range,
+          { uid: true, envelope: true, flags: true },
+          { uid: true }
+        )) {
+          const messageId = normalizeId(
+            message.envelope?.messageId
+          );
+          add(messageId, true);
+        }
+      }
+    } catch {
+    }
+    if (entries.size > 0) {
+      this.onFlags([...entries.entries()].map(([key, unread]) => ({ key, unread })));
+    }
   }
   attachmentsDir() {
     return this.runtime.attachments;
@@ -1377,7 +1511,7 @@ var BackupEngine = class {
     const emailId = Number(inserted.lastInsertRowid);
     const attachments = parsed.attachments ?? [];
     const insertAttachment = db.prepare(
-      "INSERT INTO attachments (email_id, filename, content_type, size, hash) VALUES (?, ?, ?, ?, ?)"
+      "INSERT INTO attachments (email_id, filename, content_type, size, hash, content_id, disposition) VALUES (?, ?, ?, ?, ?, ?, ?)"
     );
     for (const attachment of attachments) {
       const data = attachment.content;
@@ -1388,7 +1522,9 @@ var BackupEngine = class {
         String(attachment.filename ?? "attachment"),
         String(attachment.contentType ?? "application/octet-stream"),
         stored.size,
-        stored.hash
+        stored.hash,
+        attachment.cid === void 0 ? null : String(attachment.cid).replace(/^<|>$/g, ""),
+        attachment.contentDisposition === void 0 ? null : String(attachment.contentDisposition)
       );
     }
     try {
@@ -1468,6 +1604,7 @@ var BackupEngine = class {
             abortIfNeeded(signal);
             const batch = uids.slice(offset, offset + this.batchSize);
             db.exec("BEGIN");
+            const flagEntries = [];
             try {
               let batchLastUid = committedUid;
               for await (const message of client.fetch(
@@ -1488,6 +1625,13 @@ var BackupEngine = class {
                   boxAdded += added;
                   newCount += added;
                   batchLastUid = Math.max(batchLastUid, Number(message.uid));
+                  const messageId = normalizeId(parsed.messageId ?? "");
+                  if (messageId !== "") {
+                    const flags = [...message.flags ?? []].map(
+                      (flag) => String(flag).toLowerCase()
+                    );
+                    flagEntries.push({ key: `mid:${messageId}`, unread: !flags.includes("\\seen") });
+                  }
                 } catch (error) {
                   failCount += 1;
                   emit({
@@ -1498,6 +1642,7 @@ var BackupEngine = class {
               }
               this.saveState(db, path, uidValidity, batchLastUid);
               db.exec("COMMIT");
+              if (flagEntries.length > 0) this.onFlags?.(flagEntries);
               committedUid = batchLastUid;
               emit({ mailbox: path, added: boxAdded, message: `${path}: \u5DF2\u65B0\u589E ${String(boxAdded)} \u5C01` });
             } catch (error) {
@@ -1505,6 +1650,7 @@ var BackupEngine = class {
               throw error;
             }
           }
+          if (path.toUpperCase() === "INBOX") await this.reconcileReadState(client);
           mailboxes.push({ name: path, added: boxAdded });
           emit({ mailbox: path, added: boxAdded, message: `${path}: \u65B0\u589E ${String(boxAdded)} \u5C01` });
         } finally {
@@ -2444,7 +2590,7 @@ ${conversation.trim()}
 }
 
 // src/host/version.ts
-var VERSION = "0.12.0";
+var VERSION = "0.12.2";
 
 // src/host/api.ts
 init_smtp();
@@ -2547,7 +2693,14 @@ function buildRouter(runtime) {
       const items = await listServer(runtime, account, mailbox, query, limit, offset);
       return { ...items, offset, limit };
     }
-    const page = runtime.database(account).list({ mailbox: mailbox === "" ? "all" : mailbox, query, offset, limit });
+    const unreadOnly = url.searchParams.get("unread") === "1";
+    const page = runtime.database(account).list({
+      mailbox: mailbox === "" ? "all" : mailbox,
+      query,
+      offset,
+      limit,
+      ...unreadOnly ? { unread: unreadKeys(runtime, account) } : {}
+    });
     return { ...page, items: page.items.map((item) => localSummary(runtime, account, item)) };
   });
   router.get("/messages/lookup", ({ url }) => {
@@ -2643,21 +2796,13 @@ function buildRouter(runtime) {
   router.get("/unread", async ({ url }) => {
     const requested = url.searchParams.get("accountId");
     const accounts = requested === null || requested === "" || requested === "all" ? runtime.current.accounts.filter((item) => item.enabled !== false) : [accountById(runtime, requested)];
-    let server = 0;
-    let answered = 0;
-    await Promise.all(
-      accounts.map(async (account) => {
-        if (!runtime.hasCredentials(account)) return;
-        try {
-          const result = await runtime.provider(account).unseen();
-          server += result.count;
-          answered += 1;
-        } catch {
-        }
-      })
-    );
-    if (answered > 0) return { unread: server, source: "server" };
-    const local = accounts.reduce((sum, account) => sum + runtime.readState(account).count(), 0);
+    const local = accounts.reduce((sum, account) => {
+      try {
+        return sum + runtime.database(account).countUnread(unreadKeys(runtime, account));
+      } catch {
+        return sum;
+      }
+    }, 0);
     return { unread: local, source: "local" };
   });
   router.get("/accounts", () => ({ accounts: runtime.current.accounts }));
@@ -3350,6 +3495,18 @@ function projectView(project) {
     updatedAt: project.updatedAt
   };
 }
+function unreadKeys(runtime, account) {
+  const mids = [];
+  const ids = [];
+  for (const key of runtime.readState(account).list()) {
+    if (key.startsWith("mid:")) mids.push(key.slice(4));
+    else if (key.startsWith("local:")) {
+      const id = Number(key.slice(6));
+      if (Number.isFinite(id)) ids.push(id);
+    }
+  }
+  return { mids, ids };
+}
 function localSummary(runtime, account, row) {
   const store = runtime.readState(account);
   const key = row.messageId !== void 0 && row.messageId !== "" ? `mid:${row.messageId}` : `local:${row.id}`;
@@ -4492,7 +4649,11 @@ var MailHarborRuntime = class {
       exitCode: null
     };
     const job = { status, controller, promise: Promise.resolve() };
-    const engine = new BackupEngine(accountRuntime(account), this.credentialsFor(account));
+    const engine = new BackupEngine(accountRuntime(account), this.credentialsFor(account), {
+      onFlags: (entries) => {
+        this.readState(account).sync(entries);
+      }
+    });
     job.promise = (async () => {
       try {
         const result = await engine.run({