修复邮箱自动获取验证码功能

.env.example

@@ -27,6 +27,7 @@ EMAIL_DOMAINS=xxx.xx
 EMAIL_USERNAME=xxx
 # 临时邮箱PIN码（如果需要）
 EMAIL_PIN=
+#EMAIL_CODE_TYPE=INPUT #验证码获取方式INPUT 或者 API
 
 # ===== ZMail配置 =====
 # ZMail API地址

get_email_code.py

@@ -1,4 +1,9 @@
 from logger import info, error
+# 添加warn函数作为info的包装
+def warn(message):
+    """警告日志函数"""
+    info(f"警告: {message}")
+
 import time
 import re
 import requests
@@ -17,34 +22,64 @@ from config import (
 
 
 class EmailVerificationHandler:
-    def __init__(self, username=None, domain=None, pin=None):
+    def __init__(self, username=None, domain=None, pin=None, use_proxy=False):
         self.email = EMAIL_TYPE
         self.username = username or EMAIL_USERNAME
         self.domain = domain or EMAIL_DOMAIN
         self.session = requests.Session()
         self.emailApi = EMAIL_API
-        self.emailExtension = f"@{self.domain}"
+        self.emailExtension = self.domain
         self.pin = pin or EMAIL_PIN
+        if self.pin == "":
+            info("注意: 邮箱PIN码为空")
         if self.email == "tempemail":
             info(
-                f"初始化邮箱验证器成功: {self.username}{self.emailExtension} pin: {self.pin}"
+                f"初始化邮箱验证器成功: {self.username}@{self.domain} pin: {self.pin}"
             )
         elif self.email == "zmail":
             info(
                 f"初始化邮箱验证器成功: {self.emailApi}"
             )
+        
+        # 添加代理支持
+        if use_proxy and EMAIL_PROXY_ENABLED:
+            proxy = {
+                "http": f"{EMAIL_PROXY_ADDRESS}",
+                "https": f"{EMAIL_PROXY_ADDRESS}",
+            }
+            self.session.proxies.update(proxy)
+            info(f"已启用代理: {EMAIL_PROXY_ADDRESS}")
+
     def check(self):
-        mail_list_url = f"https://tempmail.plus/api/mails?email={self.username}{self.emailExtension}&limit=20&epin={self.pin}"
+        mail_list_url = f"https://tempmail.plus/api/mails?email={self.username}%40{self.domain}&limit=20&epin={self.pin}"
         try:
-            mail_list_response = self.session.get(mail_list_url, timeout=10)  # 添加超时参数
-            mail_list_data = mail_list_response.json()
-            time.sleep(0.5)
-            if not mail_list_data.get("result"):
-                return True
+            # 增加超时时间并添加错误重试
+            for retry in range(3):
+                try:
+                    info(f"请求URL (尝试 {retry+1}/3): {mail_list_url}")
+                    mail_list_response = self.session.get(mail_list_url, timeout=30)  # 增加超时时间到30秒
+                    mail_list_data = mail_list_response.json()
+                    time.sleep(0.5)
+                    
+                    # 修正判断逻辑：当result为true时才是成功
+                    if mail_list_data.get("result") == True:
+                        info(f"成功获取邮件列表数据: 共{mail_list_data.get('count', 0)}封邮件")
+                        return True
+                    else:
+                        error(f"API返回结果中无result字段或result为false: {mail_list_data}")
+                        return False
+                    
+                except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as e:
+                    if retry < 2:  # 如果不是最后一次尝试
+                        warn(f"请求超时或连接错误，正在重试... ({retry+1}/3)")
+                        time.sleep(2)  # 增加重试间隔
+                    else:
+                        raise  # 最后一次尝试失败，抛出异常
         except requests.exceptions.Timeout:
             error("获取邮件列表超时")
         except requests.exceptions.ConnectionError:
             error("获取邮件列表连接错误")
+            info(f'{mail_list_url}')
         except Exception as e:
             error(f"获取邮件列表发生错误: {str(e)}")
         return False
@@ -64,32 +99,50 @@ class EmailVerificationHandler:
         """
         # 如果邮箱验证码获取方式为输入，则直接返回输入的验证码
         if EMAIL_CODE_TYPE == "INPUT":
+            info("EMAIL_CODE_TYPE设为INPUT，跳过自动获取，直接手动输入")
             return self.prompt_manual_code()
-            
+        
         max_retries = max_retries or EMAIL_VERIFICATION_RETRIES
         wait_time = wait_time or EMAIL_VERIFICATION_WAIT
         info(f"开始获取邮箱验证码=>最大重试次数:{max_retries}, 等待时间:{wait_time}")
+        
+        # 验证邮箱类型是否支持
+        if self.email not in ["tempemail", "zmail"]:
+            error(f"不支持的邮箱类型: {self.email}，支持的类型为: tempemail, zmail")
+            warn("自动切换到手动输入模式")
+            return self.prompt_manual_code()
+        
         for attempt in range(max_retries):
             try:
-                info(f"当前EMail类型为： {EMAIL_TYPE}")
+                info(f"当前EMail类型为： {self.email}")
+                code = None
+                mail_id = None
+                
                 if self.email == "tempemail":
                     code, mail_id = self.get_tempmail_email_code(source_email)
                 elif self.email == "zmail":
                     code, mail_id = self.get_zmail_email_code(source_email)
+                
                 if code:
                     info(f"成功获取验证码: {code}")
                     return code
-                if attempt < max_retries - 1:
-                    info(
-                        f"未找到验证码，{wait_time}秒后重试 ({attempt + 1}/{max_retries})..."
-                    )
+                elif attempt < max_retries - 1:
+                    info(f"未找到验证码，{wait_time}秒后重试 ({attempt + 1}/{max_retries})...")
                     time.sleep(wait_time)
+                else:
+                    info(f"已达到最大重试次数({max_retries})，未找到验证码")
             except Exception as e:
                 error(f"获取验证码失败: {str(e)}")
                 if attempt < max_retries - 1:
                     info(f"将在{wait_time}秒后重试...")
                     time.sleep(wait_time)
+                else:
+                    error(f"已达到最大重试次数({max_retries})，获取验证码失败")
 
+        # 所有自动尝试都失败后，询问是否手动输入
+        response = input("自动获取验证码失败，是否手动输入? (y/n): ").lower()
+        if response == 'y':
+            return self.prompt_manual_code()
         return None
 
     # 手动输入验证码
@@ -102,15 +155,75 @@ class EmailVerificationHandler:
     def get_tempmail_email_code(self, source_email=None):
         info("开始获取邮件列表")
         # 获取邮件列表
-        mail_list_url = f"https://tempmail.plus/api/mails?email={self.username}{self.emailExtension}&limit=20&epin={self.pin}"
+        mail_list_url = f"https://tempmail.plus/api/mails?email={self.username}%40{self.domain}&limit=20&epin={self.pin}"
         try:
-            mail_list_response = self.session.get(
-                mail_list_url, timeout=10
-            )  # 添加超时参数
-            mail_list_data = mail_list_response.json()
-            time.sleep(0.5)
-            if not mail_list_data.get("result"):
+            # 增加错误重试和超时时间
+            for retry in range(3):
+                try:
+                    info(f"请求邮件列表 (尝试 {retry+1}/3): {mail_list_url}")
+                    mail_list_response = self.session.get(
+                        mail_list_url, timeout=30
+                    )
+                    mail_list_data = mail_list_response.json()
+                    time.sleep(0.5)
+                    
+                    # 修正判断逻辑
+                    if mail_list_data.get("result") == True:
+                        info(f"成功获取邮件列表: 共{mail_list_data.get('count', 0)}封邮件")
+                        # 继续处理
+                    else:
+                        error(f"API返回失败结果: {mail_list_data}")
+                        return None, None
+                    
+                    break  # 成功获取数据，跳出重试循环
+                except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as e:
+                    if retry < 2:  # 如果不是最后一次尝试
+                        warn(f"请求超时或连接错误，正在重试... ({retry+1}/3)")
+                        time.sleep(2 * (retry + 1))  # 递增的等待时间
+                    else:
+                        raise  # 最后一次尝试失败，抛出异常
+        
+            # 获取最新邮件的ID
+            first_id = mail_list_data.get("first_id")
+            if not first_id:
                 return None, None
+            info(f"开始获取邮件详情: {first_id}")
+            # 获取具体邮件内容
+            mail_detail_url = f"https://tempmail.plus/api/mails/{first_id}?email={self.username}%40{self.domain}&epin={self.pin}"
+            try:
+                mail_detail_response = self.session.get(
+                    mail_detail_url, timeout=10
+                )  # 添加超时参数
+                mail_detail_data = mail_detail_response.json()
+                time.sleep(0.5)
+                if not mail_detail_data.get("result"):
+                    return None, None
+            except requests.exceptions.Timeout:
+                error("获取邮件详情超时")
+                return None, None
+            except requests.exceptions.ConnectionError:
+                error("获取邮件详情连接错误")
+                return None, None
+            except Exception as e:
+                error(f"获取邮件详情发生错误: {str(e)}")
+                return None, None
+
+            # 从邮件文本中提取6位数字验证码
+            mail_text = mail_detail_data.get("text", "")
+
+            # 如果提供了source_email，确保邮件内容中包含该邮箱地址
+            if source_email and source_email.lower() not in mail_text.lower():
+                error(f"邮件内容不包含指定的邮箱地址: {source_email}")
+            else:
+                info(f"邮件内容包含指定的邮箱地址: {source_email}")
+
+            code_match = re.search(r"(?<![a-zA-Z@.])\b\d{6}\b", mail_text)
+
+            if code_match:
+                # 清理邮件
+                self._cleanup_mail(first_id)
+                return code_match.group(), first_id
+            return None, None
         except requests.exceptions.Timeout:
             error("获取邮件列表超时")
             return None, None
@@ -121,53 +234,11 @@ class EmailVerificationHandler:
             error(f"获取邮件列表发生错误: {str(e)}")
             return None, None
 
-        # 获取最新邮件的ID
-        first_id = mail_list_data.get("first_id")
-        if not first_id:
-            return None, None
-        info(f"开始获取邮件详情: {first_id}")
-        # 获取具体邮件内容
-        mail_detail_url = f"https://tempmail.plus/api/mails/{first_id}?email={self.username}{self.emailExtension}&epin={self.pin}"
-        try:
-            mail_detail_response = self.session.get(
-                mail_detail_url, timeout=10
-            )  # 添加超时参数
-            mail_detail_data = mail_detail_response.json()
-            time.sleep(0.5)
-            if not mail_detail_data.get("result"):
-                return None, None
-        except requests.exceptions.Timeout:
-            error("获取邮件详情超时")
-            return None, None
-        except requests.exceptions.ConnectionError:
-            error("获取邮件详情连接错误")
-            return None, None
-        except Exception as e:
-            error(f"获取邮件详情发生错误: {str(e)}")
-            return None, None
-
-        # 从邮件文本中提取6位数字验证码
-        mail_text = mail_detail_data.get("text", "")
-
-        # 如果提供了source_email，确保邮件内容中包含该邮箱地址
-        if source_email and source_email.lower() not in mail_text.lower():
-            error(f"邮件内容不包含指定的邮箱地址: {source_email}")
-        else:
-            info(f"邮件内容包含指定的邮箱地址: {source_email}")
-
-        code_match = re.search(r"(?<![a-zA-Z@.])\b\d{6}\b", mail_text)
-
-        if code_match:
-            # 清理邮件
-            self._cleanup_mail(first_id)
-            return code_match.group(), first_id
-        return None, None
-
     def _cleanup_mail(self, first_id):
         # 构造删除请求的URL和数据
         delete_url = "https://tempmail.plus/api/mails/"
         payload = {
-            "email": f"{self.username}{self.emailExtension}",
+            "email": f"{self.username}@{self.domain}",
             "first_id": first_id,
             "epin": self.pin,
         }
@@ -299,3 +370,94 @@ class EmailVerificationHandler:
         else:
             error("未找到验证码")
             return None, None
+
+    def diagnose_email_setup(self):
+        """诊断邮箱设置并显示可能的问题"""
+        issues = []
+        
+        # 检查邮箱类型
+        if self.email not in ["tempemail", "zmail"]:
+            issues.append(f"不支持的邮箱类型: {self.email}")
+        
+        # 检查邮箱用户名
+        if not self.username:
+            issues.append("邮箱用户名为空")
+        
+        # 检查域名
+        if not self.domain:
+            issues.append("邮箱域名为空")
+        
+        # 检查获取验证码类型
+        if EMAIL_CODE_TYPE == "INPUT":
+            issues.append("EMAIL_CODE_TYPE设为INPUT，将跳过自动获取")
+        
+        info("----- 邮箱设置诊断 -----")
+        info(f"邮箱类型: {self.email}")
+        info(f"邮箱地址: {self.username}@{self.domain}")
+        info(f"验证码获取方式: {EMAIL_CODE_TYPE}")
+        
+        if issues:
+            warn("发现以下问题:")
+            for issue in issues:
+                warn(f"- {issue}")
+        else:
+            info("未发现明显问题")
+        
+        return issues
+
+if __name__ == "__main__":
+    import argparse
+    
+    # 添加代码检查并显示配置值
+    info(f"当前配置: EMAIL_TYPE={EMAIL_TYPE}, EMAIL_CODE_TYPE={EMAIL_CODE_TYPE}")
+    
+    # 如果EMAIL_CODE_TYPE为INPUT则警告用户
+    if EMAIL_CODE_TYPE == "INPUT":
+        warn("EMAIL_CODE_TYPE设为INPUT将会跳过自动获取验证码，直接手动输入")
+        # 给用户选择是否临时更改为自动模式
+        response = input("是否临时更改为自动模式? (y/n): ").lower()
+        if response == 'y':
+            EMAIL_CODE_TYPE = "AUTO"
+            info("已临时更改为自动模式")
+    
+    parser = argparse.ArgumentParser(description='测试邮箱验证码获取功能')
+    parser.add_argument('--username', default=EMAIL_USERNAME, help='邮箱用户名')
+    parser.add_argument('--domain', default=EMAIL_DOMAIN, help='邮箱域名')
+    parser.add_argument('--pin', default=EMAIL_PIN, help='邮箱PIN码（可以为空）')
+    parser.add_argument('--source', help='来源邮箱（可选）')
+    parser.add_argument('--type', default=EMAIL_TYPE, choices=['tempemail', 'zmail'], help='邮箱类型')
+    parser.add_argument('--proxy', action='store_true', help='是否使用代理')
+    args = parser.parse_args()
+    
+    # 覆盖全局EMAIL_TYPE以便测试不同类型
+    from config import EMAIL_TYPE
+    if args.type != EMAIL_TYPE:
+        info(f"覆盖EMAIL_TYPE从{EMAIL_TYPE}到{args.type}")
+        EMAIL_TYPE = args.type
+    
+    # 创建邮箱验证处理器
+    handler = EmailVerificationHandler(
+        username=args.username, 
+        domain=args.domain, 
+        pin=args.pin,
+        use_proxy=args.proxy
+    )
+    
+    # 诊断邮箱设置
+    handler.diagnose_email_setup()
+    
+    # 测试检查邮箱
+    info("测试检查邮箱...")
+    check_result = handler.check()
+    info(f"检查结果: {'成功' if check_result else '失败'}")
+    
+    # 测试获取验证码
+    info("测试获取验证码...")
+    code = handler.get_verification_code(source_email=args.source)
+    
+    if code:
+        info(f"成功获取验证码: {code}")
+    else:
+        error("获取验证码失败")
+    
+    info("测试完成")

requirements.txt

@@ -9,4 +9,5 @@ python-dotenv==1.0.0
 psycopg2-binary==2.9.9
 playwright==1.41.2
 aiosqlite==0.21.0
-fake-useragent==2.1.0
+fake-useragent==2.1.0
+python-multipart