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

package/server/src/imapHandler.ts

@@ -14,6 +14,8 @@ interface ImapSession {
   currentMailbox?: string;
   /** 连接配置（host/port/auth 等），用于断线后重建新实例 */
   config?: any;
+  /** 进行中的重连 Promise（并发请求共享，避免重连风暴） */
+  reconnecting?: Promise<void> | null;
 }
 
 const sessions = new Map<string, ImapSession>();
@@ -28,6 +30,13 @@ function getSession(sessionId: string): ImapSession {
   return s;
 }
 
+/** 取会话并确保连接存活：若已断开则静默重建新 ImapFlow 并重选邮箱，再返回（静默重连入口） */
+async function ensureSession(sessionId: string): Promise<ImapSession> {
+  const s = getSession(sessionId);
+  await ensureConnected(s);
+  return s;
+}
+
 function flagsSetToArray(flags: Set<string> | undefined): string[] {
   if (!flags) return [];
   return Array.from(flags);
@@ -212,7 +221,7 @@ export async function disconnect(sessionId: string): Promise<void> {
 // ─── 列出邮箱 ──────────────────────────────────────────────
 
 export async function listMailboxes(sessionId: string): Promise<any[]> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   const list = await s.client.list();
   return list.map((mbox) => ({
     name: mbox.name,
@@ -230,7 +239,7 @@ export async function selectMailbox(
   mailbox: string,
   readOnly: boolean
 ): Promise<any> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   const lock = await s.client.getMailboxLock(mailbox);
   try {
     const mbox = await s.client.mailboxOpen(mailbox, { readOnly });
@@ -275,7 +284,7 @@ export async function selectMailbox(
 // ─── 刷新邮箱 ──────────────────────────────────────────────
 
 export async function refreshMailbox(sessionId: string): Promise<any> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   const mailbox = s.currentMailbox ?? 'INBOX';
   const lock = await s.client.getMailboxLock(mailbox);
   try {
@@ -319,7 +328,7 @@ export async function refreshMailbox(sessionId: string): Promise<any> {
 // ─── 获取文件夹列表 ─────────────────────────────────────────
 
 export async function fetchFolders(sessionId: string): Promise<any[]> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   const list = await s.client.list();
 
   const folders = list.map((mbox) => ({
@@ -365,7 +374,7 @@ export async function createFolder(
   sessionId: string,
   folderName: string
 ): Promise<void> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   await s.client.mailboxCreate(folderName);
 }
 
@@ -373,7 +382,7 @@ export async function deleteFolder(
   sessionId: string,
   folderName: string
 ): Promise<void> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   await s.client.mailboxDelete(folderName);
 }
 
@@ -382,7 +391,7 @@ export async function renameFolder(
   oldName: string,
   newName: string
 ): Promise<void> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   await s.client.mailboxRename(oldName, newName);
 }
 
@@ -390,7 +399,7 @@ export async function subscribeFolder(
   sessionId: string,
   folderName: string
 ): Promise<void> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   await s.client.mailboxSubscribe(folderName);
 }
 
@@ -398,22 +407,74 @@ export async function unsubscribeFolder(
   sessionId: string,
   folderName: string
 ): Promise<void> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   await s.client.mailboxUnsubscribe(folderName);
 }
 
 // ─── 获取邮件 ──────────────────────────────────────────────
 
+/** 从 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
 ): Promise<any[]> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   const mailbox = options.mailbox ?? 'INBOX';
 
   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 +517,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 +528,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);
       }
-      messages.push(buildEmailObject(msg, seq, body));
     }
 
+    // 第二段：只取 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;
+        }
+      }
+    }
+
+    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 {
@@ -495,7 +602,7 @@ export async function fetchEmailByUID(
   sessionId: string,
   uid: number
 ): Promise<any | null> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   for await (const msg of s.client.fetch(
     { uid: String(uid) },
     {
@@ -522,12 +629,17 @@ export async function searchEmails(
   sessionId: string,
   criteria: any
 ): Promise<any[]> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   const mailbox = criteria.mailbox ?? 'INBOX';
 
   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 +688,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 +699,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();
@@ -612,13 +777,12 @@ export async function markAsRead(
   uids: number[],
   silent: boolean
 ): Promise<void> {
-  const s = getSession(sessionId);
-  for (const uid of uids) {
-    await s.client.messageFlagsAdd({ uid: String(uid) }, ['\\Seen'], {
-      silent,
-      uid: true,
-    });
-  }
+  const s = await ensureSession(sessionId);
+  // 批量：一条 range 命令完成所有 UID，避免逐封往返
+  await s.client.messageFlagsAdd({ uid: uids.join(',') }, ['\\Seen'], {
+    silent,
+    uid: true,
+  });
 }
 
 export async function markAsFlagged(
@@ -626,17 +790,12 @@ export async function markAsFlagged(
   uids: number[],
   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 s = await ensureSession(sessionId);
+  const range = { uid: uids.join(',') };
+  if (flagged) {
+    await s.client.messageFlagsAdd(range, ['\\Flagged'], { uid: true });
+  } else {
+    await s.client.messageFlagsRemove(range, ['\\Flagged'], { uid: true });
   }
 }
 
@@ -645,12 +804,10 @@ export async function moveEmails(
   uids: number[],
   destinationMailbox: string
 ): Promise<void> {
-  const s = getSession(sessionId);
-  for (const uid of uids) {
-    await s.client.messageMove({ uid: String(uid) }, destinationMailbox, {
-      uid: true,
-    });
-  }
+  const s = await ensureSession(sessionId);
+  await s.client.messageMove({ uid: uids.join(',') }, destinationMailbox, {
+    uid: true,
+  });
 }
 
 export async function copyEmails(
@@ -658,34 +815,32 @@ export async function copyEmails(
   uids: number[],
   destinationMailbox: string
 ): Promise<void> {
-  const s = getSession(sessionId);
-  for (const uid of uids) {
-    await s.client.messageCopy({ uid: String(uid) }, destinationMailbox, {
-      uid: true,
-    });
-  }
+  const s = await ensureSession(sessionId);
+  await s.client.messageCopy({ uid: uids.join(',') }, destinationMailbox, {
+    uid: true,
+  });
 }
 
 export async function deleteEmails(
   sessionId: string,
   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);
-    }
+  const s = await ensureSession(sessionId);
+  // 批量：一次 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> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   const mailbox = s.currentMailbox ?? 'INBOX';
   const lock = await s.client.getMailboxLock(mailbox);
   try {
@@ -705,12 +860,23 @@ export async function expunge(sessionId: string): Promise<void> {
  *  ⚠️ 不要用 s.client.connected 判断（该属性不存在，永远是 undefined），
  *     要用 isClosed + state。
  */
-async function ensureConnected(s: any): Promise<void> {
+async function ensureConnected(s: ImapSession): Promise<void> {
   const client = s.client;
   const alive = !client.isClosed && client.state !== client.states.LOGOUT;
   if (alive) return;
 
-  // 连接已关闭 → 重建新实例
+  // 连接已关闭 → 重建新实例。并发安全：多个请求同时发现断开时
+  // 共享同一个重连 Promise（s.reconnecting），只真正重连一次，避免重连风暴。
+  if (s.reconnecting) {
+    return s.reconnecting;
+  }
+  s.reconnecting = doReconnect(s).finally(() => {
+    s.reconnecting = null;
+  });
+  return s.reconnecting;
+}
+
+async function doReconnect(s: ImapSession): Promise<void> {
   if (!s.config) {
     throw new Error('IMAP connection lost, but no config to reconnect');
   }
@@ -731,6 +897,15 @@ async function ensureConnected(s: any): Promise<void> {
     logger: false,
   });
   await newClient.connect();
+  // 重连期间若会话已被显式断开，则放弃这条新连接
+  if (!s.connected) {
+    try {
+      await newClient.logout();
+    } catch {
+      /* ignore */
+    }
+    return;
+  }
   s.client = newClient;
   s.connected = true;
   // 重建后需重新选中原邮箱（download/fetch 依赖当前 mailbox）
@@ -740,6 +915,26 @@ async function ensureConnected(s: any): Promise<void> {
   console.log('[ensureConnected] reconnected, mailbox:', s.currentMailbox);
 }
 
+// ─── 断线判定（供路由层决定是否自动重试）──────────────────
+
+/** 判断错误是否为连接断开类（message + code），供路由层决定是否重连重试 */
+export function isConnectionError(err: any): boolean {
+  if (!err) return false;
+  const msg = String(err?.message ?? '').toLowerCase();
+  const code = String(err?.code ?? '').toLowerCase();
+  const re =
+    /connection closed|connection lost|disconnected|socket closed|socket hang up|econnreset|etimedout|econnrefused|broken pipe|server closed|closed connection|network error|operation timed out/i;
+  return re.test(msg) || re.test(code);
+}
+
+/** 会话客户端是否已死（补充判断：message 未命中但客户端确实断了，也应重连重试）。
+ *  会话不存在或已被显式断开 → 返回 false（不该自动重连）。 */
+export function isSessionClosed(sessionId: string): boolean {
+  const s = sessions.get(sessionId);
+  if (!s || !s.connected) return false;
+  return s.client.isClosed || s.client.state === s.client.states.LOGOUT;
+}
+
 /** 给 Promise 加超时，避免死连接上无限挂起 */
 function withTimeout<T>(p: Promise<T>, ms: number, label: string): Promise<T> {
   return new Promise<T>((resolve, reject) => {
@@ -763,8 +958,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}`,
     );
@@ -805,7 +1002,7 @@ export async function fetchAllAttachments(
   sessionId: string,
   uid: number
 ): Promise<any[]> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
 
   // 确保已选中 mailbox（download() 依赖 this.mailbox，未选中会静默返回 {}）
   const mailbox = s.currentMailbox ?? 'INBOX';
@@ -956,7 +1153,7 @@ export function stopIdle(sessionId: string): void {
 // ─── Quota ─────────────────────────────────────────────────
 
 export async function getQuota(sessionId: string, root?: string): Promise<any> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   const quota = await s.client.getQuota(root);
   if (!quota) {
     return {
@@ -984,7 +1181,7 @@ export async function appendMessage(
   rawMimeData: string,
   flags: string[] | null
 ): Promise<any> {
-  const s = getSession(sessionId);
+  const s = await ensureSession(sessionId);
   const content = Buffer.from(rawMimeData, 'base64');
 
   // APPENDLIMIT（RFC 7889）：服务器接受的最大单封邮件字节数。

package/server/src/imapflow.d.ts

@@ -0,0 +1,31 @@
+// ============================================================
+// imapflow 类型补充声明（module augmentation）
+// ============================================================
+//
+// imapflow v1.5.0 的官方 .d.ts（lib/imap-flow.d.ts）未声明以下运行时属性，
+// 但源码 lib/imap-flow.js 中确实存在（this.isClosed / this.state / this.states）：
+//   - isClosed: boolean        连接已关闭时为 true
+//   - states: { ... }          连接状态常量枚举
+//   - state: number            当前连接状态值（对应 states 中的常量）
+//
+// 通过 declare module 合并到 ImapFlow 类上，避免用 any 绕过类型检查。
+// 不要删除本文件：断线检测（ensureConnected / isSessionClosed）依赖这些字段。
+// ============================================================
+
+import 'imapflow';
+
+declare module 'imapflow' {
+  interface ImapFlow {
+    /** 连接是否已关闭（服务器断开后为 true） */
+    isClosed: boolean;
+    /** 当前连接状态值（对应 states 中的常量） */
+    state: number;
+    /** 连接状态常量枚举：NOT_AUTHENTICATED / AUTHENTICATED / SELECTED / LOGOUT */
+    states: {
+      NOT_AUTHENTICATED: number;
+      AUTHENTICATED: number;
+      SELECTED: number;
+      LOGOUT: number;
+    };
+  }
+}