♻️ refactor(tasks): 优化自动瞄准与移动任务调度与睡眠检查

Author: BnanZ0

.gitignore

@@ -78,4 +78,4 @@ mod/*
 
 # 忽略vscode插件文件
 .history/
-oooook
+ook

src/globals.py

@@ -4,6 +4,7 @@
 from qfluentwidgets import DoubleSpinBox
 from PySide6.QtWidgets import QApplication
 from ok import Logger, og
+from threading import Event
 
 logger = Logger.get_logger(__name__)
 
@@ -33,6 +34,7 @@ def __init__(self, exit_event):
         self.pynput_keyboard = None
         self._thread_pool_executor_max_workers = 0
         self.thread_pool_executor = None
+        self.thread_pool_exit_event = Event()
         self.shared_frame = None
         exit_event.bind_stop(self)
         self.init_pynput()
@@ -65,30 +67,66 @@ def on_click(self, x, y, button, pressed):
     def on_press(self, key):
         self.pressed.emit(key)
 
-    def get_thread_pool_executor(self, max_workers=4):
+    def get_thread_pool_executor(self, max_workers=6):
         """
         获取全局执行器。
-
         如果请求的 max_workers 大于当前值，将安全地重建线程池。
         """
         if self.thread_pool_executor is not None and max_workers > self._thread_pool_executor_max_workers:
             logger.info(
                 f"thread pool max_workers not enough, reset max_workers {self._thread_pool_executor_max_workers} -> {max_workers}")
-            self.shutdown_task_executor()
+            self.shutdown_thread_pool_executor()
 
         if self.thread_pool_executor is None:
             logger.info(f"create thread pool executor, max_workers: {max_workers}")
+            self.thread_pool_exit_event.clear() 
             self.thread_pool_executor = concurrent.futures.ThreadPoolExecutor(max_workers=max_workers)
             self._thread_pool_executor_max_workers = max_workers
 
         return self.thread_pool_executor
 
     def shutdown_thread_pool_executor(self):
         if self.thread_pool_executor is not None:
+            logger.info("Shutting down thread pool executor...")
+            self.thread_pool_exit_event.set()
             self.thread_pool_executor.shutdown(wait=False, cancel_futures=True)
             self.thread_pool_executor = None
             self._thread_pool_executor_max_workers = 0
 
+    def submit_periodic_task(self, delay, task, *args, **kwargs):
+        """
+        提交一个循环任务到线程池。
+        如果要停止循环，任务函数应返回 False。
+        
+        :param task: 要执行的函数
+        :param delay: 每次执行后的间隔时间（秒）
+        :param args: 位置参数
+        :param kwargs: 关键字参数
+        """
+        executor = self.get_thread_pool_executor()
+
+        def loop_wrapper():
+            logger.debug(f"Periodic task {task.__name__} started.")
+            
+            while not self.thread_pool_exit_event.is_set():
+                should_stop = False
+                try:
+                    if task(*args, **kwargs) is False:
+                        should_stop = True
+                except Exception as e:
+                    logger.error(f"Error in periodic task {task.__name__}: {e}")
+
+                if should_stop:
+                    logger.debug(f"Periodic task {task.__name__} decided to stop.")
+                    break
+        
+                if self.thread_pool_exit_event.wait(timeout=delay):
+                    logger.debug(f"Periodic task {task.__name__} received stop signal.")
+                    break
+            
+            logger.debug(f"Periodic task {task.__name__} stopped.")
+
+        executor.submit(loop_wrapper)
 
 if __name__ == "__main__":
     glbs = Globals(exit_event=None)

src/tasks/BaseDNATask.py

@@ -95,7 +95,14 @@ def f_search_box(self) -> Box:
 
     @property
     def thread_pool_executor(self) -> ThreadPoolExecutor:
+        if og.my_app is None:
+            return None
         return og.my_app.get_thread_pool_executor()
+
+    def submit_periodic_task(self, delay, task, *args, **kwargs):
+        if og.my_app is None:
+            return None
+        return og.my_app.submit_periodic_task(delay, task, *args, **kwargs)
 
     @property
     def shared_frame(self) -> np.ndarray:

src/tasks/trigger/AutoAimTask.py

@@ -1,4 +1,5 @@
 from contextlib import contextmanager
+import time
 
 from ok import TriggerTask, Logger, og
 from src.scene.DNAScene import DNAScene
@@ -69,7 +70,7 @@ def run(self):
 
         if self.manual_activate and not self.running:
             self.running = True
-            self.handler.post(self.do_aim)
+            self.submit_periodic_task(0.01, self.do_aim)
 
         return
 
@@ -89,24 +90,27 @@ def do_aim(self):
         except CharDeadException:
             self.log_error("Characters dead", notify=True)
             self.running = False
-            return
+            return False
         except TriggerDeactivateException as e:
             logger.info(f"auto_aim_task_deactivate {e}")
             self.running = False
-            return
-        self.handler.post(self.do_aim)
+            return False
 
     def sleep_check(self, sec, check_signal_flag=True):
-        remaining = sec
-        step = 0.2
-        while remaining > 0:
+        if sec <= 0:
+            return
+        end_time = time.perf_counter() + sec
+        step = 0.01
+        while True:
+            remaining = end_time - time.perf_counter()
+            if remaining <= 0:
+                break
             s = step if remaining > step else remaining
-            self.sleep(s)
-            remaining -= s
+            time.sleep(s)
+            if not self.manual_activate or not self._enabled or self.paused:
+                raise TriggerDeactivateException
             if self._should_interrupt(check_signal_flag):
                 self.switch_state()
-            if not self.manual_activate:
-                raise TriggerDeactivateException
 
     def _should_interrupt(self, check_signal_flag: bool) -> bool:
         """检查是否应该中断当前操作"""

src/tasks/trigger/AutoMoveTask.py

@@ -1,4 +1,5 @@
 from contextlib import contextmanager
+import time
 
 from ok import TriggerTask, Logger, og
 from src.scene.DNAScene import DNAScene
@@ -64,7 +65,7 @@ def run(self):
 
         if self.manual_activate and not self.running:
             self.running = True
-            self.handler.post(self.do_move)
+            self.submit_periodic_task(0.005, self.do_move)
 
     @contextmanager
     def left_click_scope(self):
@@ -82,20 +83,23 @@ def do_move(self):
         except TriggerDeactivateException as e:
             logger.info(f"auto_aim_task_deactivate {e}")
             self.running = False
-            return
-        self.handler.post(self.do_move)
+            return False
 
     def sleep_check(self, sec, check_signal_flag=True):
-        remaining = sec
-        step = 0.1
-        while remaining > 0:
+        if sec <= 0:
+            return
+        end_time = time.perf_counter() + sec
+        step = 0.01
+        while True:
+            remaining = end_time - time.perf_counter()
+            if remaining <= 0:
+                break
             s = step if remaining > step else remaining
-            self.sleep(s)
-            remaining -= s
+            time.sleep(s)
+            if not self.manual_activate or not self._enabled or self.paused:
+                raise TriggerDeactivateException
             if self._should_interrupt(check_signal_flag):
                 self.switch_state()
-            if not self.manual_activate:
-                raise TriggerDeactivateException
 
     def _should_interrupt(self, check_signal_flag: bool) -> bool:
         """检查是否应该中断当前操作"""