|
@@ -10,7 +10,15 @@ from tasks.base_task import BaseTask, Time
|
|
|
from datetime import datetime, time
|
|
from datetime import datetime, time
|
|
|
|
|
|
|
|
from module.logger import logger
|
|
from module.logger import logger
|
|
|
-from module.exception import TaskEnd, RequestHumanTakeover
|
|
|
|
|
|
|
+from module.exception import (TaskEnd,
|
|
|
|
|
+ RequestHumanTakeover,
|
|
|
|
|
+ GameNotRunningError,
|
|
|
|
|
+ GameStuckError,
|
|
|
|
|
+ GameTooManyClickError)
|
|
|
|
|
+
|
|
|
|
|
+# 桌面客户端「启动+登录」的就地重试轮数:Restart 就是负责启动客户端的任务,
|
|
|
|
|
+# 起不来必须自己扛住,抛给调度器会形成无限重启循环
|
|
|
|
|
+DESKTOP_RESTART_ATTEMPTS = 3
|
|
|
|
|
|
|
|
|
|
|
|
|
class ScriptTask(LoginHandler):
|
|
class ScriptTask(LoginHandler):
|
|
@@ -30,15 +38,22 @@ class ScriptTask(LoginHandler):
|
|
|
|
|
|
|
|
def app_start(self):
|
|
def app_start(self):
|
|
|
logger.hr('App start')
|
|
logger.hr('App start')
|
|
|
|
|
+ if self.device.is_desktop:
|
|
|
|
|
+ self._desktop_start_and_login()
|
|
|
|
|
+ return
|
|
|
self.device.app_start()
|
|
self.device.app_start()
|
|
|
self.app_handle_login()
|
|
self.app_handle_login()
|
|
|
# self.ensure_no_unfinished_campaign()
|
|
# self.ensure_no_unfinished_campaign()
|
|
|
|
|
|
|
|
def app_restart(self):
|
|
def app_restart(self):
|
|
|
logger.hr('App restart')
|
|
logger.hr('App restart')
|
|
|
- self.device.app_stop()
|
|
|
|
|
- self.device.app_start()
|
|
|
|
|
- self.app_handle_login()
|
|
|
|
|
|
|
+ if self.device.is_desktop:
|
|
|
|
|
+ # 客户端可能刚被自动拉起(停在登录页),先停再起会白关一次
|
|
|
|
|
+ self._desktop_start_and_login()
|
|
|
|
|
+ else:
|
|
|
|
|
+ self.device.app_stop()
|
|
|
|
|
+ self.device.app_start()
|
|
|
|
|
+ self.app_handle_login()
|
|
|
|
|
|
|
|
# self.config.task_delay(server_update=True)
|
|
# self.config.task_delay(server_update=True)
|
|
|
self.set_next_run(task='Restart', success=True, finish=True, server=True)
|
|
self.set_next_run(task='Restart', success=True, finish=True, server=True)
|
|
@@ -55,6 +70,30 @@ class ScriptTask(LoginHandler):
|
|
|
else:
|
|
else:
|
|
|
self.custom_next_run(task='Restart', custom_time=Time(12, 0), time_delta=1)
|
|
self.custom_next_run(task='Restart', custom_time=Time(12, 0), time_delta=1)
|
|
|
|
|
|
|
|
|
|
+ def _desktop_start_and_login(self) -> None:
|
|
|
|
|
+ """桌面模式:拉起客户端并登录,客户端窗口丢失时就地重拉,不把异常抛给调度器。
|
|
|
|
|
+
|
|
|
|
|
+ Restart 就是负责启动客户端的任务:GameNotRunningError 抛出去会被 script.py
|
|
|
|
|
+ 接住再 task_call('Restart'),形成无限重启循环(每轮日志都「正常」,比直接崩
|
|
|
|
|
+ 更难排查),所以必须在这里就地消化。登录流程自身的失败重试由 app_handle_login
|
|
|
|
|
+ 内部完成(它会关掉客户端再重拉),这里只补「客户端窗口丢失」这一类重拉。
|
|
|
|
|
+ """
|
|
|
|
|
+ for attempt in range(1, DESKTOP_RESTART_ATTEMPTS + 1):
|
|
|
|
|
+ try:
|
|
|
|
|
+ self.device.app_start()
|
|
|
|
|
+ self.app_handle_login()
|
|
|
|
|
+ return
|
|
|
|
|
+ except (GameNotRunningError, GameStuckError, GameTooManyClickError) as e:
|
|
|
|
|
+ logger.warning(f'桌面客户端启动后仍未就绪(第 {attempt}/{DESKTOP_RESTART_ATTEMPTS} 轮): {e}')
|
|
|
|
|
+ # 每轮失败都清掉本轮客户端,否则残留窗口会干扰下一轮的新窗口识别
|
|
|
|
|
+ logger.info('清理本轮残留客户端')
|
|
|
|
|
+ if not self.device.desktop_stop_client():
|
|
|
|
|
+ # 关不掉就别重建:残留窗口会让下一轮绑错句柄,越试越乱
|
|
|
|
|
+ logger.critical('桌面客户端无法关闭,残留进程会干扰重建,请手动结束该进程')
|
|
|
|
|
+ raise RequestHumanTakeover
|
|
|
|
|
+ logger.critical(f'桌面客户端连续 {DESKTOP_RESTART_ATTEMPTS} 轮启动失败,请检查客户端与机器状态')
|
|
|
|
|
+ raise RequestHumanTakeover
|
|
|
|
|
+
|
|
|
def delay_pending_tasks(self) -> bool:
|
|
def delay_pending_tasks(self) -> bool:
|
|
|
"""
|
|
"""
|
|
|
周三更新游戏的时候延迟
|
|
周三更新游戏的时候延迟
|