mailcode 0.1.2__tar.gz → 0.1.4__tar.gz

{mailcode-0.1.2 → mailcode-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mailcode
-Version: 0.1.2
+Version: 0.1.4
 Summary: Email ↔ AI Agent bidirectional remote command bridge
 License: MIT
 Requires-Python: >=3.9

mailcode-0.1.4/mailcode/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.4"

{mailcode-0.1.2 → mailcode-0.1.4}/mailcode/relay/email_listener.py

@@ -6,6 +6,7 @@ import json
 import random
 import re
 import socket
+import time
 import threading
 import logging
 from datetime import datetime, timedelta
@@ -83,6 +84,10 @@ class IMAPListener:
         self._active_idle_mail: Optional[imaplib.IMAP4_SSL] = None
         self._stopped = threading.Event()
 
+        # 预判性重连: QQ 邮箱约 2h 静默断连, 提前至 90min 主动重建连接
+        self.FORCED_RECONNECT_INTERVAL = 5400  # 秒, 可被测试覆盖改写
+        self._last_connect_time = time.monotonic()
+
     def stop(self):
         """向监听循环发出干净退出信号。从信号处理程序调用。
 
@@ -120,8 +125,10 @@ class IMAPListener:
 
     def _save_state(self, state: dict):
         """原子写 state 到 state.json。state 应包含 processed_uids + sent_messages。"""
-        with open(self.state_path, "w", encoding="utf-8") as f:
+        tmp_path = self.state_path.with_suffix(self.state_path.suffix + ".tmp")
+        with open(tmp_path, "w", encoding="utf-8") as f:
             json.dump(state, f, ensure_ascii=False, indent=2)
+        tmp_path.replace(self.state_path)
 
     def _prune_old_sent_messages(self):
         """清理 7 天前的 sent_messages, 限制 processed_uids 上限。"""
@@ -228,7 +235,22 @@ class IMAPListener:
         except Exception:
             pass
 
-        return not self._idle_ready.is_set()
+        got_event = not self._idle_ready.is_set()
+
+        # 超时后必须退出 idle_thread, 否则主线程后续的 NOOP/SELECT 会与
+        # idle_thread 中阻塞的 mail.idle_response() 撞协议, 导致 socket error.
+        if not got_event:
+            self._idle_ready.clear()
+            try:
+                mail.idle_done()
+            except Exception:
+                pass
+            _t = self._idle_thread
+            self._idle_thread = None
+            if _t and _t.is_alive():
+                _t.join(timeout=3)
+
+        return got_event
 
     def _wait_for_idle_new(self, mail: imaplib.IMAP4_SSL) -> bool:
         """Py3.13+ IDLE 路径: 同步 `with mail.idle(duration=...)` 等待.
@@ -352,6 +374,11 @@ class IMAPListener:
             if owns_connection:
                 mail = self._connect()
             mail.select("INBOX")
+            # NOOP 刷新任何残留的挂起响应, 避免后续 SEARCH 读到错误响应
+            try:
+                mail.noop()
+            except Exception:
+                pass
 
             status, messages = mail.search(None, "UNSEEN")
             if status != "OK":
@@ -359,11 +386,12 @@ class IMAPListener:
 
             uids = messages[0].split()
             if not uids:
+                logger.info("SEARCH UNSEEN 无结果 (可能收到非新邮件的 IMAP 通知)")
                 return results
 
             for uid_bytes in uids:
                 uid = uid_bytes.decode()
-                status, msg_data = mail.fetch(uid_bytes, "(RFC822)")
+                status, msg_data = mail.fetch(uid_bytes, "(BODY.PEEK[])")
                 if status != "OK":
                     continue
 
@@ -377,9 +405,11 @@ class IMAPListener:
                 in_reply_to = msg.get("In-Reply-To", "")
 
                 if self._is_own_message(msg):
+                    logger.debug(f"跳过自身邮件: {subject}")
                     continue
 
                 if self._is_duplicate(msg_id, uid):
+                    logger.debug(f"跳过重复邮件: UID={uid} MsgID={msg_id}")
                     continue
 
                 sender_email = parseaddr(from_header)[1].lower() or from_header.lower()
@@ -394,6 +424,7 @@ class IMAPListener:
                     logger.info(f"邮件认证状态 [{sender_email}]: {auth_reason}")
 
                 if not self.security_checker.is_sender_allowed(sender_email):
+                    logger.info(f"发件人不在白名单中 [{sender_email}], 已跳过")
                     continue
 
                 body = self._extract_body(msg)
@@ -539,6 +570,7 @@ class IMAPListener:
         finally:
             print("监听器已停止")
             if not dry_run:
+                self._prune_old_sent_messages()
                 self._save_state({
                     "processed_uids": list(self.processed_uids),
                     "sent_messages": self.sent_messages,
@@ -548,31 +580,48 @@ class IMAPListener:
         if not self.security_checker.config.get("allowed_senders"):
             logger.warning("发件人白名单为空，所有邮件将被拒绝处理。请在配置文件中设置 allowed_senders")
         self._init_baseline()
+        self._prune_old_sent_messages()
         self._save_state({
             "processed_uids": list(self.processed_uids),
             "sent_messages": self.sent_messages,
         })
         iteration = 0
+        backoff = _Backoff()
         while not self._stopped.is_set():
             iteration += 1
             if max_iterations and iteration > max_iterations:
                 break
 
-            emails = self.fetch_unread_emails(dry_run=dry_run)
+            try:
+                emails = self.fetch_unread_emails(dry_run=dry_run)
 
-            for email_entry in emails:
-                if dry_run:
-                    continue
+                for email_entry in emails:
+                    if dry_run:
+                        continue
 
-                success, message = self.process_email(email_entry, dry_run=dry_run)
-                status_icon = "OK" if success else "FAIL"
-                logger.info(f"{status_icon} {message}")
+                    success, message = self.process_email(email_entry, dry_run=dry_run)
+                    status_icon = "OK" if success else "FAIL"
+                    logger.info(f"{status_icon} {message}")
 
-            if not dry_run:
-                self._save_state({
-                    "processed_uids": list(self.processed_uids),
-                    "sent_messages": self.sent_messages,
-                })
+                self._prune_old_sent_messages()
+                if not dry_run:
+                    self._save_state({
+                        "processed_uids": list(self.processed_uids),
+                        "sent_messages": self.sent_messages,
+                    })
+
+                backoff.reset()
+
+            except (ConnectionError, EOFError, socket.timeout, imaplib.IMAP4.abort) as e:
+                delay = backoff.next_delay()
+                self._log_connection_error(e, attempt=backoff._n, next_delay=delay)
+                if self._stopped.wait(timeout=delay):
+                    break
+                continue
+            except imaplib.IMAP4.error as e:
+                host = self.imap_config.get("host", "?")
+                logger.error(f"IMAP 协议错误, 放弃轮询 [{host}]: {e}")
+                break
 
             if self._stopped.wait(timeout=self.check_interval):
                 break
@@ -581,6 +630,7 @@ class IMAPListener:
         if not self.security_checker.config.get("allowed_senders"):
             logger.warning("发件人白名单为空，所有邮件将被拒绝处理。请在配置文件中设置 allowed_senders")
         self._init_baseline()
+        self._prune_old_sent_messages()
         self._save_state({
             "processed_uids": list(self.processed_uids),
             "sent_messages": self.sent_messages,
@@ -609,6 +659,8 @@ class IMAPListener:
 
         iteration = 0
         backoff = _Backoff()
+        HEALTH_CHECK_INTERVAL = 60  # 秒: IDLE 健康检查周期
+        health_check_every = max(1, HEALTH_CHECK_INTERVAL // self._idle_timeout)
 
         try:
             while not self._stopped.is_set():
@@ -630,13 +682,49 @@ class IMAPListener:
                             break
                         mail = self._reconnect()
                         mail.select("INBOX")
+                        try:
+                            mail.noop()
+                        except Exception:
+                            pass
+                        self._last_connect_time = time.monotonic()
+                        logger.info("IDLE 收到事件, 已重连")
 
                     if self._stopped.is_set():
                         break
 
+                    # 健康检查: 每 60s 一次 NOOP 探测死连接
+                    # 必须在 got_event 分支之后 (mail 是重连后的新连接),
+                    # 避免与 _wait_for_idle_old 后台 IDLE daemon 线程撞协议
+                    if iteration % health_check_every == 0:
+                        logger.debug(f"IDLE 健康检查 iter={iteration}")
+                        try:
+                            mail.noop()
+                        except (ConnectionError, EOFError, socket.timeout, imaplib.IMAP4.abort) as e:
+                            logger.warning(f"IDLE 健康检查失败 ({type(e).__name__}), 触发重连")
+                            raise
+
+                    # 预判性重连: QQ 邮箱约 2h 静默断连, 提前至 FORCED_RECONNECT_INTERVAL 秒主动重建
+                    if not got_event and time.monotonic() - self._last_connect_time >= self.FORCED_RECONNECT_INTERVAL:
+                        logger.info("预判性重连: 连接已持续 %d 秒", self.FORCED_RECONNECT_INTERVAL)
+                        mail = self._reconnect()
+                        mail.select("INBOX")
+                        try:
+                            mail.noop()
+                        except Exception:
+                            pass
+                        self._last_connect_time = time.monotonic()
+
                     # 复用现有连接, 避免每轮 fetch 再开一个 (163 反滥用触发点)
                     emails = self.fetch_unread_emails(dry_run=dry_run, mail=mail)
 
+                    # 重连后首轮 fetch 若拉到累积未读, 显式记录
+                    if iteration <= health_check_every + 1 and emails:
+                        logger.info(f"重连后首轮 fetch 拉到 {len(emails)} 封累积未读")
+
+                    # got_event 但无结果: 可能是非新邮件的 IMAP 通知 (flag 变更/BYE/keepalive)
+                    if got_event and not emails:
+                        logger.info("IDLE 事件后无新邮件 (可能为非新邮件的 IMAP 通知)")
+
                     for email_entry in emails:
                         if dry_run:
                             continue
@@ -646,6 +734,7 @@ class IMAPListener:
                         logger.info(f"{status_icon} {message}")
 
                     if not dry_run:
+                        self._prune_old_sent_messages()
                         self._save_state({
                             "processed_uids": list(self.processed_uids),
                             "sent_messages": self.sent_messages,
@@ -663,6 +752,12 @@ class IMAPListener:
                     try:
                         mail = self._reconnect()
                         mail.select("INBOX")
+                        try:
+                            mail.noop()
+                        except Exception:
+                            pass
+                        self._last_connect_time = time.monotonic()
+                        logger.info("退避重连成功, 准备拉取累积未读")
                     except imaplib.IMAP4.error as auth_err:
                         # 重连时再认证失败 = 配置问题, 放弃
                         logger.error(f"IMAP 认证失败, 放弃重试: {auth_err}")

{mailcode-0.1.2 → mailcode-0.1.4}/mailcode/utils/claude_runner.py

@@ -11,12 +11,12 @@ from typing import Optional
 
 logger = logging.getLogger(__name__)
 
-# claude -p 子进程超时 (秒)
-CLAUDE_TIMEOUT_SECONDS = 300
+# claude 子进程超时 (秒) — 默认 24h, 覆盖定时任务写长文的场景
+CLAUDE_TIMEOUT_SECONDS = 86400
 
 
 def call_claude(prompt: str, cwd: str = "") -> Optional[str]:
-    """调用 ``claude -p`` 子进程。失败返回 None。
+    """调用 ``claude`` 子进程 (stdin 传 prompt)。失败返回 None。
 
     Args:
         prompt: 完整 prompt
@@ -25,18 +25,19 @@ def call_claude(prompt: str, cwd: str = "") -> Optional[str]:
     cwd = cwd or str(Path.home())
     try:
         result = subprocess.run(
-            ["claude", "-p", prompt, "--dangerously-skip-permissions"],
+            ["claude", "--dangerously-skip-permissions"],
+            input=prompt,
             capture_output=True,
             text=True,
             timeout=CLAUDE_TIMEOUT_SECONDS,
             cwd=cwd,
         )
         if result.returncode != 0:
-            logger.error("claude -p 失败: %s", result.stderr[:500])
+            logger.error("claude stdin 失败: %s", result.stderr[:500])
             return None
         return result.stdout.strip()
     except subprocess.TimeoutExpired:
-        logger.error("claude -p 超时")
+        logger.error("claude stdin 超时")
         return None
     except FileNotFoundError:
         logger.error("claude 命令未找到, 请确保已安装 Claude Code")

{mailcode-0.1.2 → mailcode-0.1.4}/mailcode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mailcode
-Version: 0.1.2
+Version: 0.1.4
 Summary: Email ↔ AI Agent bidirectional remote command bridge
 License: MIT
 Requires-Python: >=3.9

{mailcode-0.1.2 → mailcode-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mailcode"
-version = "0.1.2"
+version = "0.1.4"
 description = "Email ↔ AI Agent bidirectional remote command bridge"
 requires-python = ">=3.9"
 license = {text = "MIT"}

mailcode-0.1.2/mailcode/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.2"