react-native-email-imap-smtp 0.3.32 → 0.3.34

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

@@ -13,6 +13,8 @@ import jakarta.mail.search.*
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileOutputStream
+import java.net.Inet4Address
+import java.net.InetAddress
 import java.security.cert.X509Certificate
 import java.time.ZoneId
 import java.time.ZonedDateTime
@@ -67,9 +69,24 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
     ctx.socketFactory
   }
 
+  /** 解析 host 为「优先 IPv4」的地址：
+   *   - 默认走 IPv4，避免 JavaMail 优先选 IPv6 导致模拟器等无 IPv6 出站路由的环境连接超时；
+   *   - 若域名无 IPv4（纯 IPv6-only 网络），回退用第一个地址（可能是 IPv6），保证仍可连接。
+   *   解析失败则回退原 host。 */
+  private fun resolveIpv4(host: String): String {
+    return try {
+      val addrs = InetAddress.getAllByName(host)
+      addrs.firstOrNull { it is Inet4Address }?.hostAddress
+        ?: addrs.firstOrNull()?.hostAddress
+        ?: host
+    } catch (_: Exception) {
+      host
+    }
+  }
+
   private fun imapSession(config: ConnectionConfig): Session {
     val props = Properties().apply {
-      put("mail.imap.host", config.host)
+      put("mail.imap.host", resolveIpv4(config.host))
       put("mail.imap.port", config.port.toInt().toString())
       put("mail.imap.connectiontimeout", config.timeout.toInt().toString())
       put("mail.imap.timeout", config.timeout.toInt().toString())
@@ -104,7 +121,7 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
 
   private fun smtpSession(config: SmtpConnectionConfig): Session {
     val props = Properties().apply {
-      put("mail.smtp.host", config.host)
+      put("mail.smtp.host", resolveIpv4(config.host))
       put("mail.smtp.port", config.port.toInt().toString())
       put("mail.smtp.auth", "true")
       put("mail.smtp.connectiontimeout", config.timeout.toInt().toString())
@@ -348,7 +365,7 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
       // fullData=false（列表阶段）：只取元数据，不读附件内容，避免列表下载全部附件
       val info =
         if (fullData) readAttachmentData(part as BodyPart, fileName, contentId, isInline, disp)
-        else readAttachmentMeta(part, fileName, contentId, isInline, disp)
+        else readAttachmentMeta(part as BodyPart, fileName, contentId, isInline, disp)
       if (isInline && contentId != null) {
         onEmbedded(fileName)
       }
@@ -1038,7 +1055,7 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
     return Promise.async {
       val folder = ensureFolderOpen()
       // 批量：解析目标邮件（本地代理，不触发网络）后一次 STORE 设置 SEEN
-      val msgs = uids.mapNotNull { uid ->
+      val msgs = uids.toList().mapNotNull { uid ->
         try { folder.getMessageByUID(uid.toLong()) } catch (_: Exception) { null }
       }
       if (msgs.isEmpty()) return@async
@@ -1055,7 +1072,7 @@ class EmailImapSmtp : HybridEmailImapSmtpSpec() {
   override fun imapMarkAsFlagged(uids: DoubleArray, flagged: Boolean): Promise<Unit> {
     return Promise.async {
       val folder = ensureFolderOpen()
-      val msgs = uids.mapNotNull { uid ->
+      val msgs = uids.toList().mapNotNull { uid ->
         try { folder.getMessageByUID(uid.toLong()) } catch (_: Exception) { null }
       }
       if (msgs.isEmpty()) return@async

package/package.json

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