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

package/server/lib/imapHandler.js

@@ -23,6 +23,8 @@ exports.moveEmails = moveEmails;
 exports.copyEmails = copyEmails;
 exports.deleteEmails = deleteEmails;
 exports.expunge = expunge;
+exports.isConnectionError = isConnectionError;
+exports.isSessionClosed = isSessionClosed;
 exports.fetchAttachment = fetchAttachment;
 exports.fetchAllAttachments = fetchAllAttachments;
 exports.startIdle = startIdle;
@@ -42,6 +44,12 @@ function getSession(sessionId) {
     }
     return s;
 }
+/** 取会话并确保连接存活：若已断开则静默重建新 ImapFlow 并重选邮箱，再返回（静默重连入口） */
+async function ensureSession(sessionId) {
+    const s = getSession(sessionId);
+    await ensureConnected(s);
+    return s;
+}
 function flagsSetToArray(flags) {
     if (!flags)
         return [];
@@ -212,7 +220,7 @@ async function disconnect(sessionId) {
 }
 // ─── 列出邮箱 ──────────────────────────────────────────────
 async function listMailboxes(sessionId) {
-    const s = getSession(sessionId);
+    const s = await ensureSession(sessionId);
     const list = await s.client.list();
     return list.map((mbox) => ({
         name: mbox.name,
@@ -224,7 +232,7 @@ async function listMailboxes(sessionId) {
 }
 // ─── 选择邮箱 ──────────────────────────────────────────────
 async function selectMailbox(sessionId, mailbox, readOnly) {
-    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 });
@@ -266,7 +274,7 @@ async function selectMailbox(sessionId, mailbox, readOnly) {
 }
 // ─── 刷新邮箱 ──────────────────────────────────────────────
 async function refreshMailbox(sessionId) {
-    const s = getSession(sessionId);
+    const s = await ensureSession(sessionId);
     const mailbox = s.currentMailbox ?? 'INBOX';
     const lock = await s.client.getMailboxLock(mailbox);
     try {
@@ -307,7 +315,7 @@ async function refreshMailbox(sessionId) {
 }
 // ─── 获取文件夹列表 ─────────────────────────────────────────
 async function fetchFolders(sessionId) {
-    const s = getSession(sessionId);
+    const s = await ensureSession(sessionId);
     const list = await s.client.list();
     const folders = list.map((mbox) => ({
         name: mbox.name,
@@ -346,32 +354,77 @@ async function fetchFolders(sessionId) {
 }
 // ─── 创建/删除/重命名/订阅文件夹 ──────────────────────────
 async function createFolder(sessionId, folderName) {
-    const s = getSession(sessionId);
+    const s = await ensureSession(sessionId);
     await s.client.mailboxCreate(folderName);
 }
 async function deleteFolder(sessionId, folderName) {
-    const s = getSession(sessionId);
+    const s = await ensureSession(sessionId);
     await s.client.mailboxDelete(folderName);
 }
 async function renameFolder(sessionId, oldName, newName) {
-    const s = getSession(sessionId);
+    const s = await ensureSession(sessionId);
     await s.client.mailboxRename(oldName, newName);
 }
 async function subscribeFolder(sessionId, folderName) {
-    const s = getSession(sessionId);
+    const s = await ensureSession(sessionId);
     await s.client.mailboxSubscribe(folderName);
 }
 async function unsubscribeFolder(sessionId, folderName) {
-    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) {
+    const out = {};
+    function walk(node, prefix) {
+        if (node.childNodes && node.childNodes.length > 0) {
+            node.childNodes.forEach((child, i) => {
+                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, charset) {
+    const cs = String(charset || 'utf-8').toLowerCase().replace(/"/g, '').trim();
+    try {
+        const iconv = require('iconv-lite');
+        if (iconv.encodingExists(cs))
+            return iconv.decode(buf, cs);
+    }
+    catch {
+        /* 降级到 Buffer.toString */
+    }
+    try {
+        return buf.toString(cs);
+    }
+    catch {
+        return buf.toString('utf-8');
+    }
+}
 async function fetchEmails(sessionId, options) {
-    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
+            : await s.client.mailboxOpen(mailbox);
         s.currentMailbox = mailbox;
         const total = mbox.exists ?? 0;
         // 构建查询范围
@@ -417,7 +470,8 @@ async function fetchEmails(sessionId, options) {
                 df.before = new Date(options.before);
             range = { ...range, ...df };
         }
-        // 构建 fetch fields
+        // 构建 fetch fields（默认不拉全文；正文用第二段只取 text 部分，跳过附件下载）
+        const needBody = options.fetchBody !== false;
         const fields = {
             uid: true,
             flags: true,
@@ -427,19 +481,57 @@ async function fetchEmails(sessionId, options) {
             internalDate: true,
             headers: true,
         };
-        if (options.fetchBody !== false) {
-            fields.source = true;
-        }
-        const messages = [];
+        // 第一段：元数据（含 bodyStructure），随后推导正文 part key
+        const entries = [];
+        const byUid = new Map();
         let seq = 0;
+        let textParts = null;
         for await (const msg of s.client.fetch(range, fields, fetchOpts)) {
             seq++;
-            let body;
-            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 = [];
+            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 }) => {
+            let body;
+            if (needBody && bodyPartsMap && textParts) {
+                const getPart = (key) => 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;
     }
@@ -449,7 +541,7 @@ async function fetchEmails(sessionId, options) {
 }
 // ─── 按UID获取单封邮件 ─────────────────────────────────────
 async function fetchEmailByUID(sessionId, uid) {
-    const s = getSession(sessionId);
+    const s = await ensureSession(sessionId);
     for await (const msg of s.client.fetch({ uid: String(uid) }, {
         uid: true,
         flags: true,
@@ -467,11 +559,15 @@ async function fetchEmailByUID(sessionId, uid) {
 }
 // ─── 搜索邮件 ──────────────────────────────────────────────
 async function searchEmails(sessionId, criteria) {
-    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 = {};
         if (criteria.text)
             searchQuery.text = criteria.text;
@@ -529,6 +625,8 @@ async function searchEmails(sessionId, criteria) {
         if (criteria.limit && criteria.limit > 0) {
             uids = uids.slice(0, criteria.limit);
         }
+        // 只取元数据 + 只拉 text 正文（不下载附件），与 fetchEmails 一致
+        const needBody = criteria.fetchBody !== false;
         const fields = {
             uid: true,
             flags: true,
@@ -538,15 +636,57 @@ async function searchEmails(sessionId, criteria) {
             internalDate: true,
             headers: true,
         };
-        if (criteria.fetchBody !== false)
-            fields.source = true;
-        const messages = [];
+        // 第一段：元数据（含 bodyStructure），随后推导正文 part key
+        const entries = [];
+        const byUid = new Map();
         let seq = 0;
+        let textParts = null;
         for await (const msg of s.client.fetch({ uid: uids.join(',') }, 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 = [];
+            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(',') }, { 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 }) => {
+            let body;
+            if (needBody && bodyPartsMap && textParts) {
+                const getPart = (key) => 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 {
@@ -555,62 +695,52 @@ async function searchEmails(sessionId, criteria) {
 }
 // ─── 标记操作 ──────────────────────────────────────────────
 async function markAsRead(sessionId, uids, silent) {
-    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,
+    });
 }
 async function markAsFlagged(sessionId, uids, flagged) {
-    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 });
     }
 }
 async function moveEmails(sessionId, uids, destinationMailbox) {
-    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,
+    });
 }
 async function copyEmails(sessionId, uids, destinationMailbox) {
-    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,
+    });
 }
 async function deleteEmails(sessionId, uids) {
-    const s = getSession(sessionId);
-    const success = [];
-    const failed = [];
-    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) {
+        return {
+            success: [],
+            failed: uids,
+            error: err?.message ?? 'Delete failed',
+        };
     }
-    return { success, failed };
 }
 async function expunge(sessionId) {
-    const s = getSession(sessionId);
+    const s = await ensureSession(sessionId);
     const mailbox = s.currentMailbox ?? 'INBOX';
     const lock = await s.client.getMailboxLock(mailbox);
     try {
@@ -634,7 +764,17 @@ async function ensureConnected(s) {
     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) {
     if (!s.config) {
         throw new Error('IMAP connection lost, but no config to reconnect');
     }
@@ -655,6 +795,16 @@ async function ensureConnected(s) {
         logger: false,
     });
     await newClient.connect();
+    // 重连期间若会话已被显式断开，则放弃这条新连接
+    if (!s.connected) {
+        try {
+            await newClient.logout();
+        }
+        catch {
+            /* ignore */
+        }
+        return;
+    }
     s.client = newClient;
     s.connected = true;
     // 重建后需重新选中原邮箱（download/fetch 依赖当前 mailbox）
@@ -663,6 +813,24 @@ async function ensureConnected(s) {
     }
     console.log('[ensureConnected] reconnected, mailbox:', s.currentMailbox);
 }
+// ─── 断线判定（供路由层决定是否自动重试）──────────────────
+/** 判断错误是否为连接断开类（message + code），供路由层决定是否重连重试 */
+function isConnectionError(err) {
+    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（不该自动重连）。 */
+function isSessionClosed(sessionId) {
+    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(p, ms, label) {
     return new Promise((resolve, reject) => {
@@ -677,7 +845,9 @@ async function fetchAttachment(sessionId, uid, partId) {
         // 同时降低被 20s 超时误判的风险。不要设到接近无上限——imapflow 靠
         // 「块是否被填满」(chunk.length >= chunkSize) 判断是否还有更多，
         // 服务器若截断超大单次响应，会被误判为已结束 → 附件被静默截断。
-        const download = await withTimeout(s.client.download(String(uid), partId, { uid: true, chunkSize: 1024 * 1024 }), 20000, `download ${partId}`);
+        // 分块大小默认 1MB，可由连接配置 downloadChunkSize 覆盖（与 Android 对齐）
+        const chunkSize = s.config?.downloadChunkSize ?? 1024 * 1024;
+        const download = await withTimeout(s.client.download(String(uid), partId, { uid: true, chunkSize }), 20000, `download ${partId}`);
         const chunks = [];
         for await (const chunk of download.content) {
             chunks.push(chunk);
@@ -712,7 +882,7 @@ async function fetchAttachment(sessionId, uid, partId) {
     }
 }
 async function fetchAllAttachments(sessionId, uid) {
-    const s = getSession(sessionId);
+    const s = await ensureSession(sessionId);
     // 确保已选中 mailbox（download() 依赖 this.mailbox，未选中会静默返回 {}）
     const mailbox = s.currentMailbox ?? 'INBOX';
     if (!s.client.mailbox || s.client.mailbox.path !== mailbox) {
@@ -841,7 +1011,7 @@ function stopIdle(sessionId) {
 }
 // ─── Quota ─────────────────────────────────────────────────
 async function getQuota(sessionId, root) {
-    const s = getSession(sessionId);
+    const s = await ensureSession(sessionId);
     const quota = await s.client.getQuota(root);
     if (!quota) {
         return {
@@ -862,7 +1032,7 @@ async function getQuota(sessionId, root) {
 }
 // ─── Append ───────────────────────────────────────────────
 async function appendMessage(sessionId, mailbox, rawMimeData, flags) {
-    const s = getSession(sessionId);
+    const s = await ensureSession(sessionId);
     const content = Buffer.from(rawMimeData, 'base64');
     // APPENDLIMIT（RFC 7889）：服务器接受的最大单封邮件字节数。
     // imapflow 已把它解析成数字；未通告时返回 boolean|undefined → 跳过检查。