ryland 11 місяців тому
батько
коміт
ab21a37db5

+ 3 - 2
module/device/control.py

@@ -4,6 +4,7 @@ from module.base.timer import Timer
 from module.base.utils import *
 # from module.device.method.hermit import Hermit
 # from module.device.method.maatouch import MaaTouch
+from module.device.env import IS_WINDOWS
 from module.device.method.minitouch import Minitouch
 from module.device.method.adb import Adb
 from module.device.method.scrcpy import Scrcpy
@@ -22,7 +23,7 @@ class Control(Minitouch, Adb, Scrcpy, Window):
             'ADB': self.click_adb,
             'uiautomator2': self.click_uiautomator2,
             'minitouch': self.click_minitouch,
-            'window_message': self.click_window_message
+            'window_message': self.click_window_message if IS_WINDOWS else None,
             # 'Hermit': self.click_hermit,
             # 'MaaTouch': self.click_maatouch,
         }
@@ -33,7 +34,7 @@ class Control(Minitouch, Adb, Scrcpy, Window):
             'ADB': self.long_click_adb,
             'uiautomator2': self.long_click_uiautomator2,
             'minitouch': self.long_click_minitouch,
-            'window_message': self.long_click_window_message,
+            'window_message': self.long_click_window_message if IS_WINDOWS else None,
             'scrcpy': self.long_click_scrcpy
             # 'Hermit': self.click_hermit,
             # 'MaaTouch': self.click_maatouch,

+ 2 - 1
module/device/screenshot.py

@@ -11,6 +11,7 @@ from PIL import Image
 from module.base.decorator import cached_property
 from module.base.timer import Timer
 from module.base.utils import get_color, image_size, limit_in, save_image
+from module.device.env import IS_WINDOWS
 from module.device.method.adb import Adb
 from module.device.method.windows import Window
 from module.device.method.droidcast import DroidCast
@@ -43,7 +44,7 @@ class Screenshot(Adb, DroidCast, Scrcpy, Window, NemuIpc):
             'DroidCast': self.screenshot_droidcast,
             'DroidCast_raw': self.screenshot_droidcast_raw,
             'scrcpy': self.screenshot_scrcpy,
-            'window_background': self.screenshot_window_background,
+            'window_background': self.screenshot_window_background if IS_WINDOWS else None,
             'nemu_ipc': self.screenshot_nemu_ipc
         }
 

+ 18 - 5
module/server/script_process.py

@@ -2,6 +2,8 @@
 # @author runhey
 # 脚本进程
 # github https://github.com/runhey
+import sys, os
+import signal
 import multiprocessing
 from asyncio import QueueEmpty, CancelledError, sleep
 from enum import Enum
@@ -10,12 +12,14 @@ from module.logger import logger
 
 from module.server.script_websocket import ScriptWSManager
 
+
 class ScriptState(int, Enum):
     INACTIVE = 0
     RUNNING = 1
     WARNING = 2
     UPDATING = 3
 
+
 class ScriptProcess(ScriptWSManager):
 
     def __init__(self, config_name: str) -> None:
@@ -26,9 +30,6 @@ class ScriptProcess(ScriptWSManager):
         self.state: ScriptState = ScriptState.INACTIVE
         self._process = None
 
-
-
-
     async def start(self):
         self.state = ScriptState.RUNNING
         await self.broadcast_state({"state": self.state})
@@ -40,10 +41,10 @@ class ScriptProcess(ScriptWSManager):
         self._process = multiprocessing.Process(target=func,
                                                 args=(self.config_name, self.state_queue, self.log_pipe_in,),
                                                 name=self.config_name,
-                                                daemon=True)
+                                                daemon=True
+                                                )
         self._process.start()
 
-
     async def stop(self):
         self.state = ScriptState.INACTIVE
         await self.broadcast_state({"state": self.state})
@@ -54,6 +55,10 @@ class ScriptProcess(ScriptWSManager):
             logger.warning(f'Script {self.config_name} is not running')
             return
         self._process.terminate()
+        self._process.join(timeout=0.7)
+        if self._process.is_alive():
+            logger.error(f'Script {self.config_name} subprocess terminate failed')
+            self._process.kill()
         self._process = None
 
     async def coroutine_broadcast_state(self):
@@ -114,6 +119,14 @@ class ScriptProcess(ScriptWSManager):
 
 
 def func(config: str, state_queue: multiprocessing.Queue, log_pipe_in) -> None:
+    def signal_handler(signum, frame):
+        logger.info(f'Script {config} received signal {signum}, exiting gracefully')
+        log_pipe_in.close()
+        state_queue.close()
+        sys.exit(0)
+
+    signal.signal(signal.SIGTERM, signal_handler)
+    signal.signal(signal.SIGINT, signal_handler)
 
     def start_log() -> None:
         try:

+ 1 - 1
requirements-in.txt

@@ -17,7 +17,7 @@ cn2an==0.5.23
 # Web
 paho-mqtt==1.6.1
 fastapi==0.104.1
-uvicorn==0.23.2
+uvicorn==0.38.0
 websockets==11.0.3
 zerorpc==0.6.3
 pydantic==2.10.0