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

package/server/src/imapHandler.ts

@@ -404,6 +404,53 @@ export async function unsubscribeFolder(
 
 // ─── 获取邮件 ──────────────────────────────────────────────
 
+/** 从 bodyStructure 推导 text/plain 与 text/html 的 part key 与字符集（与 fetchAllAttachments 的 walk 同构） */
+function findTextParts(
+  bs: any
+): {
+  plain?: { key: string; charset?: string };
+  html?: { key: string; charset?: string };
+} {
+  const out: {
+    plain?: { key: string; charset?: string };
+    html?: { key: string; charset?: string };
+  } = {};
+  function walk(node: any, prefix: string) {
+    if (node.childNodes && node.childNodes.length > 0) {
+      node.childNodes.forEach((child: any, i: number) => {
+        walk(child, prefix ? `${prefix}.${i + 1}` : `${i + 1}`);
+      });
+      return;
+    }
+    const type = String(node.type || '').toLowerCase();
+    const sub = String(node.subType || '').toLowerCase();
+    const charset = node.parameters?.charset;
+    if (type === 'text' && sub === 'plain' && !out.plain) {
+      out.plain = { key: prefix || '1', charset };
+    } else if (type === 'text' && sub === 'html' && !out.html) {
+      out.html = { key: prefix || '1', charset };
+    }
+  }
+  walk(bs, '');
+  return out;
+}
+
+/** 解码 text part 内容（传输编码已由 imapflow 解码；这里处理字符集，GBK 等用 iconv-lite） */
+function decodePartText(buf: Buffer, charset?: string): string {
+  const cs = String(charset || 'utf-8').toLowerCase().replace(/"/g, '').trim();
+  try {
+    const iconv = require('iconv-lite') as any;
+    if (iconv.encodingExists(cs)) return iconv.decode(buf, cs);
+  } catch {
+    /* 降级到 Buffer.toString */
+  }
+  try {
+    return buf.toString(cs as BufferEncoding);
+  } catch {
+    return buf.toString('utf-8');
+  }
+}
+
 export async function fetchEmails(
   sessionId: string,
   options: any
@@ -413,7 +460,12 @@ export async function fetchEmails(
 
   const lock = await s.client.getMailboxLock(mailbox);
   try {
-    const mbox = await s.client.mailboxOpen(mailbox);
+    // 已选中同一邮箱时跳过 SELECT，避免重复往返
+    const alreadySelected =
+      s.client.mailbox && s.client.mailbox.path === mailbox;
+    const mbox = alreadySelected
+      ? (s.client.mailbox as any)
+      : await s.client.mailboxOpen(mailbox);
     s.currentMailbox = mailbox;
     const total = mbox.exists ?? 0;
 
@@ -456,7 +508,8 @@ export async function fetchEmails(
       range = { ...range, ...df };
     }
 
-    // 构建 fetch fields
+    // 构建 fetch fields（默认不拉全文；正文用第二段只取 text 部分，跳过附件下载）
+    const needBody = options.fetchBody !== false;
     const fields: any = {
       uid: true,
       flags: true,
@@ -466,22 +519,67 @@ export async function fetchEmails(
       internalDate: true,
       headers: true,
     };
-    if (options.fetchBody !== false) {
-      fields.source = true;
-    }
 
-    const messages: any[] = [];
+    // 第一段：元数据（含 bodyStructure），随后推导正文 part key
+    const entries: any[] = [];
+    const byUid = new Map<number, any>();
     let seq = 0;
-
+    let textParts: {
+      plain?: { key: string; charset?: string };
+      html?: { key: string; charset?: string };
+    } | null = null;
     for await (const msg of s.client.fetch(range, fields, fetchOpts)) {
       seq++;
-      let body: { text?: string; html?: string } | undefined;
-      if (msg.source) {
-        body = await parseSource(msg.source);
+      const entry = { msg, seq };
+      entries.push(entry);
+      byUid.set(msg.uid, entry);
+      if (needBody && !textParts && msg.bodyStructure) {
+        textParts = findTextParts(msg.bodyStructure);
+      }
+    }
+
+    // 第二段：只取 text/plain 与 text/html 正文（不下载附件）
+    if (needBody && textParts && (textParts.plain || textParts.html)) {
+      const bodyParts: any[] = [];
+      if (textParts.plain) bodyParts.push({ key: textParts.plain.key });
+      if (textParts.html) bodyParts.push({ key: textParts.html.key });
+      for await (const b of s.client.fetch(
+        range,
+        { uid: true, bodyParts },
+        fetchOpts
+      )) {
+        const entry = byUid.get(b.uid);
+        if (entry && b.bodyParts) {
+          entry.bodyPartsMap = b.bodyParts;
+        }
       }
-      messages.push(buildEmailObject(msg, seq, body));
     }
 
+    const messages = entries.map(({ msg, seq: seqNo, bodyPartsMap }: any) => {
+      let body: { text?: string; html?: string } | undefined;
+      if (needBody && bodyPartsMap && textParts) {
+        const getPart = (key: string) =>
+          bodyPartsMap.get(key) ?? bodyPartsMap.get(key.toUpperCase());
+        if (textParts.plain) {
+          const buf = getPart(textParts.plain.key);
+          if (buf)
+            body = {
+              ...(body ?? {}),
+              text: decodePartText(buf, textParts.plain.charset),
+            };
+        }
+        if (textParts.html) {
+          const buf = getPart(textParts.html.key);
+          if (buf)
+            body = {
+              ...(body ?? {}),
+              html: decodePartText(buf, textParts.html.charset),
+            };
+        }
+      }
+      return buildEmailObject(msg, seqNo, body);
+    });
+
     messages.sort((a, b) => b.uid - a.uid);
     return messages;
   } finally {
@@ -527,7 +625,12 @@ export async function searchEmails(
 
   const lock = await s.client.getMailboxLock(mailbox);
   try {
-    await s.client.mailboxOpen(mailbox);
+    // 已选中同一邮箱时跳过 SELECT
+    const alreadySelected =
+      s.client.mailbox && s.client.mailbox.path === mailbox;
+    if (!alreadySelected) {
+      await s.client.mailboxOpen(mailbox);
+    }
 
     const searchQuery: SearchObject = {};
 
@@ -576,6 +679,8 @@ export async function searchEmails(
       uids = uids.slice(0, criteria.limit);
     }
 
+    // 只取元数据 + 只拉 text 正文（不下载附件），与 fetchEmails 一致
+    const needBody = criteria.fetchBody !== false;
     const fields: any = {
       uid: true,
       flags: true,
@@ -585,20 +690,71 @@ export async function searchEmails(
       internalDate: true,
       headers: true,
     };
-    if (criteria.fetchBody !== false) fields.source = true;
 
-    const messages: any[] = [];
+    // 第一段：元数据（含 bodyStructure），随后推导正文 part key
+    const entries: any[] = [];
+    const byUid = new Map<number, any>();
     let seq = 0;
+    let textParts: {
+      plain?: { key: string; charset?: string };
+      html?: { key: string; charset?: string };
+    } | null = null;
     for await (const msg of s.client.fetch(
       { uid: uids.join(',') as any },
       fields,
       { uid: true }
     )) {
       seq++;
-      const body = msg.source ? await parseSource(msg.source) : undefined;
-      messages.push(buildEmailObject(msg, seq, body));
+      const entry = { msg, seq };
+      entries.push(entry);
+      byUid.set(msg.uid, entry);
+      if (needBody && !textParts && msg.bodyStructure) {
+        textParts = findTextParts(msg.bodyStructure);
+      }
+    }
+
+    // 第二段：只取 text/plain 与 text/html 正文（不下载附件）
+    if (needBody && textParts && (textParts.plain || textParts.html)) {
+      const bodyParts: any[] = [];
+      if (textParts.plain) bodyParts.push({ key: textParts.plain.key });
+      if (textParts.html) bodyParts.push({ key: textParts.html.key });
+      for await (const b of s.client.fetch(
+        { uid: uids.join(',') as any },
+        { uid: true, bodyParts },
+        { uid: true }
+      )) {
+        const entry = byUid.get(b.uid);
+        if (entry && b.bodyParts) {
+          entry.bodyPartsMap = b.bodyParts;
+        }
+      }
     }
 
+    const messages = entries.map(({ msg, seq: seqNo, bodyPartsMap }: any) => {
+      let body: { text?: string; html?: string } | undefined;
+      if (needBody && bodyPartsMap && textParts) {
+        const getPart = (key: string) =>
+          bodyPartsMap.get(key) ?? bodyPartsMap.get(key.toUpperCase());
+        if (textParts.plain) {
+          const buf = getPart(textParts.plain.key);
+          if (buf)
+            body = {
+              ...(body ?? {}),
+              text: decodePartText(buf, textParts.plain.charset),
+            };
+        }
+        if (textParts.html) {
+          const buf = getPart(textParts.html.key);
+          if (buf)
+            body = {
+              ...(body ?? {}),
+              html: decodePartText(buf, textParts.html.charset),
+            };
+        }
+      }
+      return buildEmailObject(msg, seqNo, body);
+    });
+
     return messages;
   } finally {
     lock.release();
@@ -613,12 +769,11 @@ export async function markAsRead(
   silent: boolean
 ): Promise<void> {
   const s = getSession(sessionId);
-  for (const uid of uids) {
-    await s.client.messageFlagsAdd({ uid: String(uid) }, ['\\Seen'], {
-      silent,
-      uid: true,
-    });
-  }
+  // 批量：一条 range 命令完成所有 UID，避免逐封往返
+  await s.client.messageFlagsAdd({ uid: uids.join(',') }, ['\\Seen'], {
+    silent,
+    uid: true,
+  });
 }
 
 export async function markAsFlagged(
@@ -627,16 +782,11 @@ export async function markAsFlagged(
   flagged: boolean
 ): Promise<void> {
   const s = getSession(sessionId);
-  for (const uid of uids) {
-    if (flagged) {
-      await s.client.messageFlagsAdd({ uid: String(uid) }, ['\\Flagged'], {
-        uid: true,
-      });
-    } else {
-      await s.client.messageFlagsRemove({ uid: String(uid) }, ['\\Flagged'], {
-        uid: true,
-      });
-    }
+  const range = { uid: uids.join(',') };
+  if (flagged) {
+    await s.client.messageFlagsAdd(range, ['\\Flagged'], { uid: true });
+  } else {
+    await s.client.messageFlagsRemove(range, ['\\Flagged'], { uid: true });
   }
 }
 
@@ -646,11 +796,9 @@ export async function moveEmails(
   destinationMailbox: string
 ): Promise<void> {
   const s = getSession(sessionId);
-  for (const uid of uids) {
-    await s.client.messageMove({ uid: String(uid) }, destinationMailbox, {
-      uid: true,
-    });
-  }
+  await s.client.messageMove({ uid: uids.join(',') }, destinationMailbox, {
+    uid: true,
+  });
 }
 
 export async function copyEmails(
@@ -659,11 +807,9 @@ export async function copyEmails(
   destinationMailbox: string
 ): Promise<void> {
   const s = getSession(sessionId);
-  for (const uid of uids) {
-    await s.client.messageCopy({ uid: String(uid) }, destinationMailbox, {
-      uid: true,
-    });
-  }
+  await s.client.messageCopy({ uid: uids.join(',') }, destinationMailbox, {
+    uid: true,
+  });
 }
 
 export async function deleteEmails(
@@ -671,17 +817,17 @@ export async function deleteEmails(
   uids: number[]
 ): Promise<any> {
   const s = getSession(sessionId);
-  const success: number[] = [];
-  const failed: number[] = [];
-  for (const uid of uids) {
-    try {
-      await s.client.messageDelete({ uid: String(uid) }, { uid: true });
-      success.push(uid);
-    } catch {
-      failed.push(uid);
-    }
+  // 批量：一次 messageDelete 完成；失败则整批计入 failed（不再逐封往返）
+  try {
+    await s.client.messageDelete({ uid: uids.join(',') }, { uid: true });
+    return { success: uids, failed: [] };
+  } catch (err: any) {
+    return {
+      success: [],
+      failed: uids,
+      error: err?.message ?? 'Delete failed',
+    };
   }
-  return { success, failed };
 }
 
 export async function expunge(sessionId: string): Promise<void> {
@@ -763,8 +909,10 @@ export async function fetchAttachment(
     // 同时降低被 20s 超时误判的风险。不要设到接近无上限——imapflow 靠
     // 「块是否被填满」(chunk.length >= chunkSize) 判断是否还有更多，
     // 服务器若截断超大单次响应，会被误判为已结束 → 附件被静默截断。
+    // 分块大小默认 1MB，可由连接配置 downloadChunkSize 覆盖（与 Android 对齐）
+    const chunkSize = s.config?.downloadChunkSize ?? 1024 * 1024;
     const download = await withTimeout(
-      s.client.download(String(uid), partId, { uid: true, chunkSize: 1024 * 1024 }),
+      s.client.download(String(uid), partId, { uid: true, chunkSize }),
       20000,
       `download ${partId}`,
     );

package/src/EmailImapSmtp.nitro.ts

@@ -45,6 +45,8 @@ export interface ConnectionConfig {
   checkCertificate: boolean;
   /** 是否输出调试日志 */
   debug: boolean;
+  /** 下载分块大小（字节），默认 1048576（1MB）；调大可提升大附件下载速度 */
+  downloadChunkSize?: number;
 }
 
 /**

package/src/native.ts

@@ -51,6 +51,7 @@ export async function imapConnect(
     timeout: config.timeout ?? 30000,
     checkCertificate: config.checkCertificate ?? true,
     debug: config.debug ?? false,
+    downloadChunkSize: config.downloadChunkSize,
   }) as Promise<IMAPConnectionResult>;
 }
 

package/src/types.ts

@@ -51,6 +51,12 @@ export interface IMAPConfig {
   checkCertificate?: boolean;
   /** 是否在控制台输出调试日志 */
   debug?: boolean;
+  /**
+   * 下载分块大小（字节），默认 1048576（1MB）。
+   * Web 与 Android 通用：调大可减少大附件的分段请求次数、提升下载速度。
+   * 建议 256KB ~ 4MB；过大可能被服务器截断单次响应。
+   */
+  downloadChunkSize?: number;
 }
 
 /**