This commit is contained in:
2026-01-25 06:10:05 +08:00
parent ccff201fde
commit c2aa9785cb
2 changed files with 47 additions and 16 deletions

View File

@@ -955,8 +955,8 @@ def run_payment_flow(page, email, step_callback=None):
time.sleep(1)
except Exception as e:
error_msg = str(e)
if _is_connection_lost(error_msg) or _is_shutdown_requested():
log_progress("[!] 检测到停止请求,中断支付流程")
if _is_connection_lost(error_msg):
log_progress("[!] 浏览器连接断开")
return {"stopped": True}
log_progress(f"[X] 邮箱填写失败: {e}")
log_progress(f"当前URL: {page.url}")
@@ -1141,9 +1141,9 @@ def run_payment_flow(page, email, step_callback=None):
except Exception as e:
error_msg = str(e)
# 检查是否是连接断开(由 /stop 命令导致)
if _is_connection_lost(error_msg) or _is_shutdown_requested():
log_status("停止", "[!] 检测到停止请求,支付流程已中断")
# 只有连接断开才认为是停止请求,普通异常按错误处理
if _is_connection_lost(error_msg):
log_status("停止", "[!] 浏览器连接断开,支付流程已中断")
return {"stopped": True}
log_status("错误", f"[X] 支付流程异常: {e}")
return None
@@ -2109,10 +2109,10 @@ def run_single_registration(progress_callback=None, step_callback=None) -> dict:
except Exception as e:
error_msg = str(e)
# 检查是否是连接断开(由 /stop 命令导致)
if _is_connection_lost(error_msg) or _is_shutdown_requested():
log_status("停止", "[!] 注册被用户停止")
return {"success": False, "error": "用户停止", "stopped": True, "account": email, "password": password}
# 只有连接断开才认为是停止请求
if _is_connection_lost(error_msg):
log_status("停止", "[!] 浏览器连接断开")
return {"success": False, "error": "浏览器连接断开", "stopped": True, "account": email, "password": password}
log_status("错误", f"注册异常: {e}")
return {"success": False, "error": str(e), "account": email, "password": password}
finally:
@@ -2278,12 +2278,13 @@ def run_single_registration_api(progress_callback=None, step_callback=None, prox
log_status("失败", "注册成功但支付/获取token失败")
return {"success": False, "error": "支付流程失败", "account": email, "password": password}
except Exception as e:
error_msg = str(e)
if _is_connection_lost(error_msg) or _is_shutdown_requested():
log_status("停止", "[!] 注册被用户停止")
return {"success": False, "error": "用户停止", "stopped": True, "account": email, "password": password}
# 只有连接断开才认为是停止请求
if _is_connection_lost(error_msg):
log_status("停止", "[!] 浏览器连接断开")
return {"success": False, "error": "浏览器连接断开", "stopped": True, "account": email, "password": password}
log_status("错误", f"注册异常: {e}")
return {"success": False, "error": str(e), "account": email, "password": password}
finally: