Todo: 修改因exe_token错误导致的不断重连问题
Todo: 修改打包中.bat打包文件与测试打包脚本不一致问题 New: 新增installer安装包环境搭建数据
This commit is contained in:
@@ -35,10 +35,11 @@ class WebSocketManager:
|
||||
'success': None,
|
||||
'error': None,
|
||||
'platform_connected': None,
|
||||
'token_error': None,
|
||||
}
|
||||
|
||||
def set_callbacks(self, log: Callable = None, success: Callable = None, error: Callable = None,
|
||||
platform_connected: Callable = None): # ← 新增参数
|
||||
platform_connected: Callable = None, token_error: Callable = None):
|
||||
"""设置回调函数"""
|
||||
if log:
|
||||
self.callbacks['log'] = log
|
||||
@@ -48,6 +49,8 @@ class WebSocketManager:
|
||||
self.callbacks['error'] = error
|
||||
if platform_connected: # ← 新增
|
||||
self.callbacks['platform_connected'] = platform_connected
|
||||
if token_error:
|
||||
self.callbacks['token_error'] = token_error
|
||||
|
||||
def _log(self, message: str, level: str = "INFO"):
|
||||
"""内部日志方法"""
|
||||
@@ -84,33 +87,49 @@ class WebSocketManager:
|
||||
backend = get_backend_client()
|
||||
|
||||
if backend:
|
||||
# 3 如果有客户端更新token并重连
|
||||
backend.set_token(token)
|
||||
# 检查现有客户端是否因token错误而停止
|
||||
if backend.should_stop:
|
||||
self._log("检测到客户端因token错误已停止,创建新的客户端", "INFO")
|
||||
# 断开旧客户端
|
||||
backend.disconnect()
|
||||
# 清除旧客户端引用
|
||||
set_backend_client(None)
|
||||
backend = None
|
||||
else:
|
||||
# 3 如果有客户端更新token并重连
|
||||
backend.set_token(token)
|
||||
|
||||
# 设置回调函数
|
||||
def _on_backend_success():
|
||||
try:
|
||||
self._log("连接服务成功", "SUCCESS")
|
||||
if self.callbacks['success']:
|
||||
self.callbacks['success']()
|
||||
except Exception as e:
|
||||
self._log(f"成功回调执行失败: {e}", "ERROR")
|
||||
|
||||
# 设置回调函数
|
||||
def _on_backend_success():
|
||||
try:
|
||||
self._log("连接服务成功", "SUCCESS")
|
||||
if self.callbacks['success']:
|
||||
self.callbacks['success']()
|
||||
except Exception as e:
|
||||
self._log(f"成功回调执行失败: {e}", "ERROR")
|
||||
def _on_backend_login(platform_name: str, store_id: str, cookies: str):
|
||||
self._log(
|
||||
f"收到后端登录指令: 平台={platform_name}, 店铺={store_id}, cookies_len={len(cookies) if cookies else 0}",
|
||||
"INFO")
|
||||
self._handle_platform_login(platform_name, store_id, cookies)
|
||||
|
||||
def _on_backend_login(platform_name: str, store_id: str, cookies: str):
|
||||
self._log(
|
||||
f"收到后端登录指令: 平台={platform_name}, 店铺={store_id}, cookies_len={len(cookies) if cookies else 0}",
|
||||
"INFO")
|
||||
self._handle_platform_login(platform_name, store_id, cookies)
|
||||
def _on_token_error(error_content: str):
|
||||
self._log(f"Token验证失败: {error_content}", "ERROR")
|
||||
if self.callbacks['token_error']:
|
||||
self.callbacks['token_error'](error_content)
|
||||
|
||||
backend.set_callbacks(success=_on_backend_success, login=_on_backend_login)
|
||||
backend.set_callbacks(success=_on_backend_success, login=_on_backend_login, token_error=_on_token_error)
|
||||
|
||||
if not backend.is_connected:
|
||||
backend.connect()
|
||||
|
||||
self.backend_client = backend
|
||||
self._log("令牌已提交,已连接后端。等待后端下发平台cookies后自动连接平台...", "SUCCESS")
|
||||
return True
|
||||
|
||||
if not backend.is_connected:
|
||||
backend.connect()
|
||||
|
||||
self.backend_client = backend
|
||||
self._log("令牌已提交,已连接后端。等待后端下发平台cookies后自动连接平台...", "SUCCESS")
|
||||
return True
|
||||
else:
|
||||
# 如果没有现有客户端或客户端被重置,创建新的
|
||||
if not backend:
|
||||
|
||||
backend = BackendClient.from_exe_token(token)
|
||||
|
||||
@@ -128,7 +147,12 @@ class WebSocketManager:
|
||||
except Exception as e:
|
||||
self._log(f"成功回调执行失败: {e}", "ERROR")
|
||||
|
||||
backend.set_callbacks(login=_on_backend_login, success=_on_backend_success)
|
||||
def _on_token_error(error_content: str):
|
||||
self._log(f"Token验证失败: {error_content}", "ERROR")
|
||||
if self.callbacks['token_error']:
|
||||
self.callbacks['token_error'](error_content)
|
||||
|
||||
backend.set_callbacks(login=_on_backend_login, success=_on_backend_success, token_error=_on_token_error)
|
||||
backend.connect()
|
||||
|
||||
set_backend_client(backend)
|
||||
@@ -402,6 +426,11 @@ class WebSocketManager:
|
||||
self._log("🔄 开始执行 start_with_cookies", "DEBUG")
|
||||
result = asyncio.run(listener.start_with_cookies(store_id=store_id, cookies=data))
|
||||
self._log(f"📊 start_with_cookies 执行结果: {result}", "DEBUG")
|
||||
|
||||
# Cookie启动成功时也要通知GUI
|
||||
if result:
|
||||
self._log("✅ [PDD] Cookie启动成功,平台连接已建立", "SUCCESS")
|
||||
self._notify_platform_connected("拼多多")
|
||||
|
||||
# 根据实际登录结果上报状态给后端
|
||||
if self.backend_client and result not in ["need_verification_code", "verification_code_error", "login_failure"]:
|
||||
|
||||
Reference in New Issue
Block a user