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

package/nitrogen/generated/android/kotlin/com/margelo/nitro/emailimapsmtp/ConnectionConfig.kt

@@ -47,7 +47,10 @@ data class ConnectionConfig(
   val checkCertificate: Boolean,
   @DoNotStrip
   @Keep
-  val debug: Boolean
+  val debug: Boolean,
+  @DoNotStrip
+  @Keep
+  val downloadChunkSize: Double?
 ) {
   /* primary constructor */
 
@@ -64,6 +67,7 @@ data class ConnectionConfig(
       && Objects.deepEquals(this.timeout, other.timeout)
       && Objects.deepEquals(this.checkCertificate, other.checkCertificate)
       && Objects.deepEquals(this.debug, other.debug)
+      && Objects.deepEquals(this.downloadChunkSize, other.downloadChunkSize)
   }
 
   override fun hashCode(): Int {
@@ -77,7 +81,8 @@ data class ConnectionConfig(
       accessToken,
       timeout,
       checkCertificate,
-      debug
+      debug,
+      downloadChunkSize
     ).contentDeepHashCode()
   }
 
@@ -89,8 +94,8 @@ data class ConnectionConfig(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(host: String, port: Double, username: String, password: String, tls: Boolean, authType: String, accessToken: String?, timeout: Double, checkCertificate: Boolean, debug: Boolean): ConnectionConfig {
-      return ConnectionConfig(host, port, username, password, tls, authType, accessToken, timeout, checkCertificate, debug)
+    private fun fromCpp(host: String, port: Double, username: String, password: String, tls: Boolean, authType: String, accessToken: String?, timeout: Double, checkCertificate: Boolean, debug: Boolean, downloadChunkSize: Double?): ConnectionConfig {
+      return ConnectionConfig(host, port, username, password, tls, authType, accessToken, timeout, checkCertificate, debug, downloadChunkSize)
     }
   }
 }

package/nitrogen/generated/ios/EmailImapSmtp-Swift-Cxx-Bridge.hpp

@@ -217,6 +217,21 @@ namespace margelo::nitro::emailimapsmtp::bridge::swift {
     return Func_void_std__exception_ptr_Wrapper(std::move(value));
   }
   
+  // pragma MARK: std::optional<double>
+  /**
+   * Specialized version of `std::optional<double>`.
+   */
+  using std__optional_double_ = std::optional<double>;
+  inline std::optional<double> create_std__optional_double_(const double& value) noexcept {
+    return std::optional<double>(value);
+  }
+  inline bool has_value_std__optional_double_(const std::optional<double>& optional) noexcept {
+    return optional.has_value();
+  }
+  inline double get_std__optional_double_(const std::optional<double>& optional) noexcept {
+    return optional.value();
+  }
+  
   // pragma MARK: std::shared_ptr<Promise<void>>
   /**
    * Specialized version of `std::shared_ptr<Promise<void>>`.
@@ -467,21 +482,6 @@ namespace margelo::nitro::emailimapsmtp::bridge::swift {
     return Func_void_std__vector_EmailMessage__Wrapper(std::move(value));
   }
   
-  // pragma MARK: std::optional<double>
-  /**
-   * Specialized version of `std::optional<double>`.
-   */
-  using std__optional_double_ = std::optional<double>;
-  inline std::optional<double> create_std__optional_double_(const double& value) noexcept {
-    return std::optional<double>(value);
-  }
-  inline bool has_value_std__optional_double_(const std::optional<double>& optional) noexcept {
-    return optional.has_value();
-  }
-  inline double get_std__optional_double_(const std::optional<double>& optional) noexcept {
-    return optional.value();
-  }
-  
   // pragma MARK: std::variant<nitro::NullType, EmailMessage>
   /**
    * Wrapper struct for `std::variant<nitro::NullType, EmailMessage>`.

package/nitrogen/generated/ios/swift/ConnectionConfig.swift

@@ -18,14 +18,20 @@ public extension ConnectionConfig {
   /**
    * Create a new instance of `ConnectionConfig`.
    */
-  init(host: String, port: Double, username: String, password: String, tls: Bool, authType: String, accessToken: String?, timeout: Double, checkCertificate: Bool, debug: Bool) {
+  init(host: String, port: Double, username: String, password: String, tls: Bool, authType: String, accessToken: String?, timeout: Double, checkCertificate: Bool, debug: Bool, downloadChunkSize: Double?) {
     self.init(std.string(host), port, std.string(username), std.string(password), tls, std.string(authType), { () -> bridge.std__optional_std__string_ in
       if let __unwrappedValue = accessToken {
         return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
       } else {
         return .init()
       }
-    }(), timeout, checkCertificate, debug)
+    }(), timeout, checkCertificate, debug, { () -> bridge.std__optional_double_ in
+      if let __unwrappedValue = downloadChunkSize {
+        return bridge.create_std__optional_double_(__unwrappedValue)
+      } else {
+        return .init()
+      }
+    }())
   }
 
   @inline(__always)
@@ -84,4 +90,16 @@ public extension ConnectionConfig {
   var debug: Bool {
     return self.__debug
   }
+  
+  @inline(__always)
+  var downloadChunkSize: Double? {
+    return { () -> Double? in
+      if bridge.has_value_std__optional_double_(self.__downloadChunkSize) {
+        let __unwrapped = bridge.get_std__optional_double_(self.__downloadChunkSize)
+        return __unwrapped
+      } else {
+        return nil
+      }
+    }()
+  }
 }

package/nitrogen/generated/shared/c++/ConnectionConfig.hpp

@@ -50,10 +50,11 @@ namespace margelo::nitro::emailimapsmtp {
     double timeout     SWIFT_PRIVATE;
     bool checkCertificate     SWIFT_PRIVATE;
     bool debug     SWIFT_PRIVATE;
+    std::optional<double> downloadChunkSize     SWIFT_PRIVATE;
 
   public:
     ConnectionConfig() = default;
-    explicit ConnectionConfig(std::string host, double port, std::string username, std::string password, bool tls, std::string authType, std::optional<std::string> accessToken, double timeout, bool checkCertificate, bool debug): host(host), port(port), username(username), password(password), tls(tls), authType(authType), accessToken(accessToken), timeout(timeout), checkCertificate(checkCertificate), debug(debug) {}
+    explicit ConnectionConfig(std::string host, double port, std::string username, std::string password, bool tls, std::string authType, std::optional<std::string> accessToken, double timeout, bool checkCertificate, bool debug, std::optional<double> downloadChunkSize): host(host), port(port), username(username), password(password), tls(tls), authType(authType), accessToken(accessToken), timeout(timeout), checkCertificate(checkCertificate), debug(debug), downloadChunkSize(downloadChunkSize) {}
 
   public:
     friend bool operator==(const ConnectionConfig& lhs, const ConnectionConfig& rhs) = default;
@@ -78,7 +79,8 @@ namespace margelo::nitro {
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "accessToken"))),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "timeout"))),
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "checkCertificate"))),
-        JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "debug")))
+        JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "debug"))),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "downloadChunkSize")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::emailimapsmtp::ConnectionConfig& arg) {
@@ -93,6 +95,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "timeout"), JSIConverter<double>::toJSI(runtime, arg.timeout));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "checkCertificate"), JSIConverter<bool>::toJSI(runtime, arg.checkCertificate));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "debug"), JSIConverter<bool>::toJSI(runtime, arg.debug));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "downloadChunkSize"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.downloadChunkSize));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -113,6 +116,7 @@ namespace margelo::nitro {
       if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "timeout")))) return false;
       if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "checkCertificate")))) return false;
       if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "debug")))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "downloadChunkSize")))) return false;
       return true;
     }
   };

package/package.json

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

package/server/lib/imapHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imapHandler.d.ts","sourceRoot":"","sources":["../src/imapHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"imapHandler.d.ts","sourceRoot":"","sources":["../src/imapHandler.ts"],"names":[],"mappings":"AAoJA,wBAAsB,OAAO,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CA8CvD;AAID,wBAAsB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWjE;AAID,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAUrE;AAID,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,GAAG,CAAC,CAyCd;AAID,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAwCpE;AAID,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAuCpE;AAID,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAGf;AAmDD,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,GAAG,GACX,OAAO,CAAC,GAAG,EAAE,CAAC,CAmIhB;AAID,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAoBrB;AAID,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,GAAG,GACZ,OAAO,CAAC,GAAG,EAAE,CAAC,CA4IhB;AAID,wBAAsB,UAAU,CAC9B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC,CAQf;AAED,wBAAsB,UAAU,CAC9B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,wBAAsB,UAAU,CAC9B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EAAE,GACb,OAAO,CAAC,GAAG,CAAC,CAad;AAED,wBAAsB,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9D;AAuDD,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CA8CrB;AAED,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,GAAG,EAAE,CAAC,CAoIhB;AAMD,wBAAgB,SAAS,CACvB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,CAAC,YAAY,EAAE,GAAG,KAAK,IAAI,GACpC,IAAI,CAEN;AAED,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAEhD;AAID,wBAAsB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAmB7E;AAID,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,GACrB,OAAO,CAAC,GAAG,CAAC,CA2Bd;AAID,wBAAgB,gBAAgB,IAAI,MAAM,EAAE,CAE3C"}

package/server/lib/imapHandler.js

@@ -366,12 +366,57 @@ async function unsubscribeFolder(sessionId, folderName) {
     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 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 +462,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 +473,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);
             }
-            messages.push(buildEmailObject(msg, seq, body));
         }
+        // 第二段：只取 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;
+                }
+            }
+        }
+        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;
     }
@@ -471,7 +555,11 @@ async function searchEmails(sessionId, criteria) {
     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 +617,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 +628,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 {
@@ -556,58 +688,48 @@ 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,
-        });
-    }
+    // 批量：一条 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 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,
-        });
-    }
+    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,
-        });
-    }
+    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);
-        }
+    // 批量：一次 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);
@@ -677,7 +799,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);