react-native-email-imap-smtp 0.3.29 → 0.3.30

package/android/src/main/java/com/margelo/nitro/emailimapsmtp/EmailImapSmtp.kt

@@ -277,6 +277,45 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
     )
   }
 
+  /**
+   * 与 Web 端(imapflow bodyStructure walk)对齐的附件叶子判定：
+   *  disposition=attachment / 有 filename / 非 text 类型 → 视为附件。
+   *  内嵌 CID 资源走 onEmbedded；其余（含内嵌无 CID）走 onAttachment。
+   */
+  private fun handleAttachmentLeaf(
+    part: Part,
+    onEmbedded: (String) -> Unit,
+    onAttachment: (AttachmentInfo) -> Unit,
+  ) {
+    val disp = part.disposition ?: ""
+    val isAttachment = disp.equals(Part.ATTACHMENT, ignoreCase = true)
+    val isInline = disp.equals(Part.INLINE, ignoreCase = true)
+    val contentId = (part as? MimeBodyPart)?.contentID
+    val fileName = part.fileName ?: contentId ?: "unnamed"
+    // 非 text 类型（无 disposition/无 contentId）也应作为附件，与 Web 端对齐
+    val primary = part.contentType?.substringBefore('/')?.trim()?.lowercase() ?: ""
+    val isNonText = primary.isNotEmpty() && primary != "text" && primary != "multipart"
+    if (isAttachment || isInline || contentId != null || isNonText) {
+      val info = readAttachmentData(part as BodyPart, fileName, contentId, isInline, disp)
+      if (isInline && contentId != null) {
+        onEmbedded(fileName)
+      }
+      if (isAttachment || (isInline && contentId == null) || (isNonText && !isInline)) {
+        onAttachment(info)
+      }
+    }
+  }
+
+  /** 判断是否为「附件样」叶子（有 attachment/inline disposition、filename 或 contentId）。
+   *  用于 text 类型正文分支先判定附件、再当作正文（与 Web 端 imapflow walk 对齐）。 */
+  private fun isAttachmentLike(part: Part): Boolean {
+    val disp = part.disposition ?: ""
+    if (disp.equals(Part.ATTACHMENT, ignoreCase = true) || disp.equals(Part.INLINE, ignoreCase = true)) return true
+    if (part.fileName != null) return true
+    if ((part as? MimeBodyPart)?.contentID != null) return true
+    return false
+  }
+
   private fun parseBodyParts(
     part: Part,
     onText: (String) -> Unit,
@@ -285,19 +324,35 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
     onAttachment: (AttachmentInfo) -> Unit,
   ) {
     if (part.isMimeType("text/plain")) {
-      onText(part.content?.toString() ?: "")
+      // text/plain 也可能是附件（带 attachment disposition / filename / name）：
+      // 先判定附件，再当作正文。与 Web 端一致（1.txt/2.txt 等 text/plain 附件）。
+      if (isAttachmentLike(part)) {
+        handleAttachmentLeaf(part, onEmbedded, onAttachment)
+      } else {
+        onText(part.content?.toString() ?: "")
+      }
     } else if (part.isMimeType("text/html")) {
-      onHtml(part.content?.toString() ?: "")
+      if (isAttachmentLike(part)) {
+        handleAttachmentLeaf(part, onEmbedded, onAttachment)
+      } else {
+        onHtml(part.content?.toString() ?: "")
+      }
     } else if (part.isMimeType("multipart/alternative")) {
       val mp = part.content as? Multipart ?: return
       var foundHtml = false
       var foundText = false
       for (i in 0 until mp.count) {
         val bp = mp.getBodyPart(i)
-        if (bp.isMimeType("text/html") && !foundHtml) {
+        if (bp.isMimeType("text/html") && !foundHtml && !isAttachmentLike(bp)) {
           onHtml(bp.content?.toString() ?: ""); foundHtml = true
-        } else if (bp.isMimeType("text/plain") && !foundText) {
+        } else if (bp.isMimeType("text/plain") && !foundText && !isAttachmentLike(bp)) {
           onText(bp.content?.toString() ?: ""); foundText = true
+        } else if (bp.isMimeType("multipart/*")) {
+          // alternative 内嵌套的子 multipart（related/mixed 等）→ 递归，不遗漏附件
+          parseBodyParts(bp, onText, onHtml, onEmbedded, onAttachment)
+        } else {
+          // alternative 内的非正文叶子（内嵌图/附件）→ 附件判定
+          handleAttachmentLeaf(bp, onEmbedded, onAttachment)
         }
       }
     } else if (part.isMimeType("multipart/*")) {
@@ -306,21 +361,7 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
         parseBodyParts(mp.getBodyPart(i), onText, onHtml, onEmbedded, onAttachment)
       }
     } else {
-      val disp = part.disposition ?: ""
-      val isAttachment = disp.equals(Part.ATTACHMENT, ignoreCase = true)
-      val isInline = disp.equals(Part.INLINE, ignoreCase = true)
-      val contentId = (part as? MimeBodyPart)?.contentID
-      val fileName = part.fileName ?: contentId ?: "unnamed"
-
-      if (isAttachment || isInline || contentId != null) {
-        val info = readAttachmentData(part as BodyPart, fileName, contentId, isInline, disp)
-        if (isInline && contentId != null) {
-          onEmbedded(fileName)
-        }
-        if (isAttachment || (isInline && contentId == null)) {
-          onAttachment(info)
-        }
-      }
+      handleAttachmentLeaf(part, onEmbedded, onAttachment)
     }
   }
 
@@ -1131,45 +1172,42 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
 
   @Suppress("UNCHECKED_CAST")
   private fun findAttachmentByPartId(msg: Message, partId: String): AttachmentInfo? {
-    val content = msg.content
-    if (content is Multipart) {
-      for (i in 0 until content.count) {
-        val part = content.getBodyPart(i)
-        val disp = part.disposition ?: Part.ATTACHMENT
-        if (disp.equals(Part.ATTACHMENT, ignoreCase = true) || disp.equals(Part.INLINE, ignoreCase = true)) {
-          val fileName = part.fileName ?: "attachment_$i"
-          if (fileName == partId || i.toString() == partId) {
-            return readAttachmentData(part, fileName, (part as? MimeBodyPart)?.contentID,
-              disp.equals(Part.INLINE, ignoreCase = true), disp)
-          }
-        }
-        if (part.content is Multipart) {
-          @Suppress("UNCHECKED_CAST")
-          return findAttachmentByPartId(part as Message, partId)
-        }
-      }
-    }
-    return null
+    // 与 collectAttachments 同一套附件判定，按 partId（或文件名）匹配
+    val all = mutableListOf<AttachmentInfo>()
+    collectAttachments(msg, all)
+    return all.firstOrNull { it.partId == partId || it.filename == partId }
   }
 
   @Suppress("UNCHECKED_CAST")
   private fun collectAttachments(msg: Message, result: MutableList<AttachmentInfo>) {
-    val content = msg.content
-    if (content is Multipart) {
-      for (i in 0 until content.count) {
-        val part = content.getBodyPart(i)
-        val disp = part.disposition ?: Part.ATTACHMENT
-        if (disp.equals(Part.ATTACHMENT, ignoreCase = true) || disp.equals(Part.INLINE, ignoreCase = true)) {
-          result.add(readAttachmentData(part, part.fileName ?: "attachment_$i",
-            (part as? MimeBodyPart)?.contentID,
-            disp.equals(Part.INLINE, ignoreCase = true), disp))
-        }
-        if (part.content is Multipart) {
-          @Suppress("UNCHECKED_CAST")
-          collectAttachments(part as Message, result)
+    // 与 Web 端(imapflow bodyStructure walk)完全一致的附件收集：
+    //  递归所有 multipart 子节点到叶子，只收「附件叶子」，跳过纯文本正文
+    //  （text/plain、text/html 且无 attachment disposition/filename）。
+    //  不做任何正文提取——正文由 note_profile.json 决定。
+    fun walk(part: Part) {
+      val content = part.content
+      if (content is Multipart) {
+        for (i in 0 until content.count) {
+          walk(content.getBodyPart(i))
         }
+        return
+      }
+      // 叶子：与 Web 端 `isAttachment || primary !== 'text'` 等价
+      val disp = part.disposition ?: ""
+      val isAtt = disp.equals(Part.ATTACHMENT, ignoreCase = true)
+      val hasName = part.fileName != null
+      val primary = part.contentType?.substringBefore('/')?.trim()?.lowercase() ?: ""
+      val isTextLeaf = primary == "text" && !isAtt && !hasName
+      if (!isTextLeaf) {
+        val contentId = (part as? MimeBodyPart)?.contentID
+        val fileName = part.fileName ?: contentId ?: "unnamed"
+        result.add(
+          readAttachmentData(part as BodyPart, fileName, contentId,
+            disp.equals(Part.INLINE, ignoreCase = true), disp)
+        )
       }
     }
+    walk(msg)
   }
 
   // ═══ IMAP — IDLE ═══════════════════════════════════════════

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-email-imap-smtp",
-  "version": "0.3.29",
+  "version": "0.3.30",
   "description": "The best of imap and smtp client of react native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",