@zaclinley/dsh-mailharbor 0.11.0 → 0.12.1

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 {
@@ -1089,7 +1124,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 +1179,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
@@ -1160,7 +1195,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"),
@@ -1377,7 +1425,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 +1436,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 {
@@ -2444,7 +2494,7 @@ ${conversation.trim()}
 }
 
 // src/host/version.ts
-var VERSION = "0.11.0";
+var VERSION = "0.12.1";
 
 // src/host/api.ts
 init_smtp();