Fix GPTMail code polling defaults and HF timeout stability

.env.example

@@ -27,10 +27,14 @@ ADMIN_KEY=your-admin-secret-key
 # 配置保存在 data/settings.yaml
 # ============================================
 
+# 注册验证码轮询参数（可选，适合云环境/HuggingFace）
+# REGISTER_CODE_TIMEOUT_SECONDS=60
+# REGISTER_CODE_INTERVAL_SECONDS=5
+
 # ============================================
 # 账户配置
 # ============================================
 # 使用 accounts.json 文件
 # 账户配置保存在 accounts.json 文件中
 # 首次启动时会自动创建空配置
-# 请在管理面板中添加账户，或直接编辑 accounts.json
+# 请在管理面板中添加账户，或直接编辑 accounts.json

core/config.py

@@ -231,7 +231,7 @@ class ConfigManager:
             freemail_domain=str(basic_data.get("freemail_domain") or "").strip(),
             mail_proxy_enabled=_parse_bool(basic_data.get("mail_proxy_enabled"), False),
             gptmail_base_url=str(basic_data.get("gptmail_base_url") or "https://mail.chatgpt.org.uk").strip(),
-            gptmail_api_key=str(basic_data.get("gptmail_api_key") or "").strip(),
+            gptmail_api_key=str(basic_data.get("gptmail_api_key") or "gpt-test").strip(),
             gptmail_verify_ssl=_parse_bool(basic_data.get("gptmail_verify_ssl"), True),
             gptmail_domain=str(basic_data.get("gptmail_domain") or "").strip(),
             cfmail_base_url=str(basic_data.get("cfmail_base_url") or "").strip(),

core/gemini_automation.py

@@ -293,17 +293,28 @@ class GeminiAutomation:
             self._save_screenshot(page, "code_input_missing")
             return {"success": False, "error": "code input not found"}
 
-        # Step 5: 轮询邮件获取验证码（3次，每次5秒间隔）
-        self._log("info", "📬 等待邮箱验证码...")
-        code = mail_client.poll_for_code(timeout=15, interval=5, since_time=task_start_time)
+        # Step 5: 轮询邮件获取验证码（云环境默认延长，支持环境变量覆盖）
+        try:
+            code_timeout = int(str(os.getenv("REGISTER_CODE_TIMEOUT_SECONDS", "60")).strip() or "60")
+        except Exception:
+            code_timeout = 60
+        try:
+            code_interval = int(str(os.getenv("REGISTER_CODE_INTERVAL_SECONDS", "5")).strip() or "5")
+        except Exception:
+            code_interval = 5
+        code_timeout = max(15, code_timeout)
+        code_interval = max(2, code_interval)
+
+        self._log("info", f"📬 等待邮箱验证码... (timeout={code_timeout}s, interval={code_interval}s)")
+        code = mail_client.poll_for_code(timeout=code_timeout, interval=code_interval, since_time=task_start_time)
 
         if not code:
             self._log("warning", "⚠️ 验证码超时，等待后重新发送...")
             time.sleep(random.uniform(12, 18))
             # 尝试点击重新发送按钮
             if self._click_resend_code_button(page):
-                # 再次轮询验证码（3次，每次5秒间隔）
-                code = mail_client.poll_for_code(timeout=15, interval=5, since_time=task_start_time)
+                # 再次轮询验证码
+                code = mail_client.poll_for_code(timeout=code_timeout, interval=code_interval, since_time=task_start_time)
                 if not code:
                     self._log("error", "❌ 重新发送后仍未收到验证码")
                     self._save_screenshot(page, "code_timeout_after_resend")

core/gptmail_client.py

@@ -74,6 +74,22 @@ class GPTMailClient:
                 pass
         return res
 
+    @staticmethod
+    def _normalize_unix_ts(value: Any) -> Optional[float]:
+        """兼容秒/毫秒时间戳，统一转换为秒。"""
+        if value in (None, ""):
+            return None
+        try:
+            ts = float(str(value).strip())
+        except Exception:
+            return None
+        # 毫秒时间戳降级为秒
+        if ts > 1e12:
+            ts /= 1000.0
+        if ts <= 0:
+            return None
+        return ts
+
     def generate_email(self, domain: Optional[str] = None) -> Optional[str]:
         """生成一个新的邮箱地址。"""
         if not self.base_url:
@@ -151,7 +167,11 @@ class GPTMailClient:
                 self._log("info", "📭 邮箱为空，暂无邮件")
                 return None
 
-            emails = sorted(emails, key=lambda item: int(item.get("timestamp") or 0), reverse=True)
+            emails = sorted(
+                emails,
+                key=lambda item: self._normalize_unix_ts(item.get("timestamp")) or 0,
+                reverse=True,
+            )
             self._log("info", f"📨 收到 {len(emails)} 封邮件，开始检查验证码...")
 
             for msg in emails:
@@ -161,12 +181,14 @@ class GPTMailClient:
 
                 ts = msg.get("timestamp")
                 if since_time and ts:
-                    try:
-                        msg_time = datetime.fromtimestamp(int(ts)).astimezone().replace(tzinfo=None)
-                        if msg_time < since_time:
-                            continue
-                    except Exception:
-                        pass
+                    ts_value = self._normalize_unix_ts(ts)
+                    if ts_value:
+                        try:
+                            msg_time = datetime.fromtimestamp(ts_value)
+                            if msg_time < since_time:
+                                continue
+                        except Exception:
+                            pass
 
                 content = (msg.get("content") or "") + (msg.get("html_content") or "")
                 code = extract_verification_code(content)
@@ -203,17 +225,24 @@ class GPTMailClient:
         if not self.email:
             return None
 
-        max_retries = max(1, timeout // interval)
+        timeout = max(1, int(timeout))
+        interval = max(1, int(interval))
+        max_retries = max(1, timeout // interval + 1)
         self._log("info", f"⏱️ 开始轮询验证码 (超时 {timeout}秒, 间隔 {interval}秒, 最多 {max_retries} 次)")
 
-        for i in range(1, max_retries + 1):
-            self._log("info", f"🔄 第 {i}/{max_retries} 次轮询...")
+        deadline = time.monotonic() + timeout
+        attempt = 0
+        while True:
+            attempt += 1
+            self._log("info", f"🔄 第 {attempt}/{max_retries} 次轮询...")
             code = self.fetch_verification_code(since_time=since_time)
             if code:
                 self._log("info", f"🎉 验证码获取成功: {code}")
                 return code
-            if i < max_retries:
-                time.sleep(interval)
+            now = time.monotonic()
+            if now >= deadline:
+                break
+            time.sleep(min(interval, max(0.0, deadline - now)))
 
-        self._log("error", "❌ 验证码获取超时")
+        self._log("error", f"❌ 验证码获取超时 ({timeout}秒)")
         return None