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

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;
+    };
+  }
+}

package/server/src/index.ts

@@ -168,6 +168,28 @@ app.use((req, _res, next) => {
 // IMAP Routes
 // ══════════════════════════════════════════════════════════════
 
+// ─── 带静默重连的 IMAP 读操作包装 ─────────────────────────
+
+/** 连接类错误 → 静默重连（fn 内部 ensureSession 会自动重连）→ 同参数重试一次。
+ *  只用于读操作；写操作不自动重试（避免断线重试造成重复执行）。 */
+async function withImapReconnect<T>(
+  sessionId: string,
+  fn: () => Promise<T>
+): Promise<T> {
+  try {
+    return await fn();
+  } catch (err: any) {
+    if (imap.isConnectionError(err) || imap.isSessionClosed(sessionId)) {
+      console.log(
+        '[imap] connection error, auto-reconnect & retry:',
+        err?.message
+      );
+      return await fn(); // 只重试一次；再失败则向上抛
+    }
+    throw err;
+  }
+}
+
 // ─── 连接 ─────────────────────────────────────────────────
 
 app.post('/api/imap/connect', async (req, res) => {
@@ -192,7 +214,9 @@ app.post('/api/imap/disconnect', async (req, res) => {
 
 app.post('/api/imap/listMailboxes', async (req, res) => {
   try {
-    const result = await imap.listMailboxes(req.body.sessionId);
+    const result = await withImapReconnect(req.body.sessionId, () =>
+      imap.listMailboxes(req.body.sessionId)
+    );
     res.json(result);
   } catch (err: any) {
     res.status(500).json({ error: err.message });
@@ -201,10 +225,12 @@ app.post('/api/imap/listMailboxes', async (req, res) => {
 
 app.post('/api/imap/selectMailbox', async (req, res) => {
   try {
-    const result = await imap.selectMailbox(
-      req.body.sessionId,
-      req.body.mailbox,
-      req.body.readOnly ?? false
+    const result = await withImapReconnect(req.body.sessionId, () =>
+      imap.selectMailbox(
+        req.body.sessionId,
+        req.body.mailbox,
+        req.body.readOnly ?? false
+      )
     );
     res.json(result);
   } catch (err: any) {
@@ -214,7 +240,9 @@ app.post('/api/imap/selectMailbox', async (req, res) => {
 
 app.post('/api/imap/refreshMailbox', async (req, res) => {
   try {
-    const result = await imap.refreshMailbox(req.body.sessionId);
+    const result = await withImapReconnect(req.body.sessionId, () =>
+      imap.refreshMailbox(req.body.sessionId)
+    );
     res.json(result);
   } catch (err: any) {
     res.status(500).json({ error: err.message });
@@ -223,7 +251,9 @@ app.post('/api/imap/refreshMailbox', async (req, res) => {
 
 app.post('/api/imap/fetchFolders', async (req, res) => {
   try {
-    const result = await imap.fetchFolders(req.body.sessionId);
+    const result = await withImapReconnect(req.body.sessionId, () =>
+      imap.fetchFolders(req.body.sessionId)
+    );
     res.json(result);
   } catch (err: any) {
     res.status(500).json({ error: err.message });
@@ -283,7 +313,9 @@ app.post('/api/imap/unsubscribeFolder', async (req, res) => {
 
 app.post('/api/imap/fetchEmails', async (req, res) => {
   try {
-    const result = await imap.fetchEmails(req.body.sessionId, req.body.options);
+    const result = await withImapReconnect(req.body.sessionId, () =>
+      imap.fetchEmails(req.body.sessionId, req.body.options)
+    );
     res.json(result);
   } catch (err: any) {
     res.status(500).json({ error: err.message });
@@ -292,7 +324,9 @@ app.post('/api/imap/fetchEmails', async (req, res) => {
 
 app.post('/api/imap/fetchEmailByUID', async (req, res) => {
   try {
-    const result = await imap.fetchEmailByUID(req.body.sessionId, req.body.uid);
+    const result = await withImapReconnect(req.body.sessionId, () =>
+      imap.fetchEmailByUID(req.body.sessionId, req.body.uid)
+    );
     res.json(result);
   } catch (err: any) {
     res.status(500).json({ error: err.message });
@@ -301,9 +335,8 @@ app.post('/api/imap/fetchEmailByUID', async (req, res) => {
 
 app.post('/api/imap/searchEmails', async (req, res) => {
   try {
-    const result = await imap.searchEmails(
-      req.body.sessionId,
-      req.body.criteria
+    const result = await withImapReconnect(req.body.sessionId, () =>
+      imap.searchEmails(req.body.sessionId, req.body.criteria)
     );
     res.json(result);
   } catch (err: any) {
@@ -400,9 +433,8 @@ app.post('/api/imap/fetchAttachment', async (req, res) => {
 
 app.post('/api/imap/fetchAllAttachments', async (req, res) => {
   try {
-    const result = await imap.fetchAllAttachments(
-      req.body.sessionId,
-      req.body.uid
+    const result = await withImapReconnect(req.body.sessionId, () =>
+      imap.fetchAllAttachments(req.body.sessionId, req.body.uid)
     );
     res.json(result);
   } catch (err: any) {
@@ -437,7 +469,9 @@ app.post('/api/imap/stopIdle', async (req, res) => {
 
 app.post('/api/imap/getQuota', async (req, res) => {
   try {
-    const result = await imap.getQuota(req.body.sessionId, req.body.root);
+    const result = await withImapReconnect(req.body.sessionId, () =>
+      imap.getQuota(req.body.sessionId, req.body.root)
+    );
     res.json(result);
   } catch (err: any) {
     res.status(500).json({ error: err.message });