Merge pull request #1327 from runhey/dev

Automated PR 2025.12.25

Author: runhey

README.md

@@ -84,7 +84,7 @@ OAS 在其基础上进行了如下优化：
 相对于其他的游戏，阴阳师玩家总体而言对脚本这类工具具有极高的排斥性。树大招风，无论你是否喜欢 OAS ，我们都希望你不在互联网上进行宣传，这保护 OAS , 也保护开发者们。
 
 为此保持较高的入群门槛: 
-#### QQ交流群: 465946275
+#### QQ交流群: 1群465946275 2群1076565458
 - 你的QQ等级必须大于32级(🌞🌞)，注册时间超过一年，低等级账号成分复杂，还请见谅。
 - 你必须拥有一个 Github 账户来点一个 **Star** (这并不影响你入群后取消Star)，同样的要求注册时间过半年。
 - 入群验证填入你的 Github `username`(不是`name`)，无需在意问题是什么，由QQ机器人审核(机器永远的对的)。

module/device/control.py

@@ -4,6 +4,7 @@
 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 @@ def click_methods(self):
             '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 @@ def long_click_methods(self):
             '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,

module/device/screenshot.py

@@ -11,6 +11,7 @@
 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 @@ def screenshot_methods(self):
             '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
         }
 

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.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 @@ def __init__(self, config_name: str) -> None:
         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 @@ async def start(self):
         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 @@ async def stop(self):
             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 @@ async def coroutine_broadcast_log(self):
 
 
 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:

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

requirements.txt

@@ -5,7 +5,6 @@
 #    pip-compile --annotation-style=line --output-file=requirements.txt requirements-in.txt
 #
 
-
 adbutils==0.11.0          # via -r requirements-in.txt, uiautomator2
 annotated-types==0.7.0    # via pydantic
 anyio==3.7.1              # via fastapi, starlette
@@ -80,7 +79,7 @@ typing-extensions==4.12.2  # via fastapi, pydantic, pydantic-core, uvicorn
 uiautomator2==2.16.17     # via -r requirements-in.txt
 uiautomator2cache==0.3.0.1  # via -r requirements-in.txt
 urllib3==2.1.0            # via requests
-uvicorn==0.23.2           # via -r requirements-in.txt
+uvicorn==0.38.0           # via -r requirements-in.txt
 websockets==11.0.3        # via -r requirements-in.txt
 whichcraft==0.6.1         # via adbutils, uiautomator2
 wrapt==1.15.0             # via -r requirements-in.txt, deprecated